From 356e4b66652ef668980e995d1fde54bcaf9a8fed Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Thu, 19 Jun 2014 11:37:46 +0200
Subject: [PATCH 001/616] Update manager.php

add caching to getUserGroupIds
---
 lib/private/group/manager.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 3613c7547bd..fc90d4cb643 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -179,7 +179,7 @@ class Manager extends PublicEmitter {
 				$groups[$groupId] = $this->get($groupId);
 			}
 		}
-		$this->cachedUserGroups[$uid] = array_values($groups);
+		$this->cachedUserGroups[$uid] = $groups;
 		return $this->cachedUserGroups[$uid];
 	}
 	/**
@@ -187,6 +187,9 @@ class Manager extends PublicEmitter {
 	 * @return array with group names
 	 */
 	public function getUserGroupIds($user) {
+		if (isset($this->cachedUserGroups[$uid])) {
+			return array_keys($this->cachedUserGroups[$uid]);
+		}
 		$groupIds = array();
 		foreach ($this->backends as $backend) {
 			$groupIds = array_merge($groupIds, $backend->getUserGroups($user->getUID()));
-- 
GitLab


From 18c7c94b7a2aafbcf3578e5aa76cc937b0e31538 Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Thu, 19 Jun 2014 11:41:29 +0200
Subject: [PATCH 002/616] Update manager.php

added description and blank lines in getUserGroupIds
---
 lib/private/group/manager.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index fc90d4cb643..e6470ae3a4e 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -182,7 +182,9 @@ class Manager extends PublicEmitter {
 		$this->cachedUserGroups[$uid] = $groups;
 		return $this->cachedUserGroups[$uid];
 	}
+	
 	/**
+	 * get a list of group ids for a user
 	 * @param \OC\User\User $user
 	 * @return array with group names
 	 */
@@ -193,7 +195,6 @@ class Manager extends PublicEmitter {
 		$groupIds = array();
 		foreach ($this->backends as $backend) {
 			$groupIds = array_merge($groupIds, $backend->getUserGroups($user->getUID()));
-			
 		}
 		return $groupIds;
 	}
-- 
GitLab


From c95416897331fc637ba0c4ae0672c5f4da514627 Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Thu, 19 Jun 2014 13:28:37 +0200
Subject: [PATCH 003/616] Update manager.php

defined $uid in getUserGroupIds
---
 lib/private/group/manager.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index e6470ae3a4e..e0b563ad488 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -189,6 +189,7 @@ class Manager extends PublicEmitter {
 	 * @return array with group names
 	 */
 	public function getUserGroupIds($user) {
+		$uid = $user->getUID();
 		if (isset($this->cachedUserGroups[$uid])) {
 			return array_keys($this->cachedUserGroups[$uid]);
 		}
-- 
GitLab


From 14fcd681723e068a3398b9065a2bad4756e9b5f2 Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Thu, 19 Jun 2014 19:35:10 +0200
Subject: [PATCH 004/616] Update manager.php

---
 lib/private/group/manager.php | 34 +++++++++++++++++++++++++---------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index e0b563ad488..ae20af7448f 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -47,6 +47,12 @@ class Manager extends PublicEmitter {
 	 */
 	private $cachedUserGroups = array();
 
+	/**
+	 * @var string[]
+	 */
+	private $cachedUserGroupIds = array();
+
+
 	/**
 	 * @param \OC\User\Manager $userManager
 	 */
@@ -176,7 +182,7 @@ class Manager extends PublicEmitter {
 		foreach ($this->backends as $backend) {
 			$groupIds = $backend->getUserGroups($uid);
 			foreach ($groupIds as $groupId) {
-				$groups[$groupId] = $this->get($groupId);
+				$groups[] = $this->get($groupId);
 			}
 		}
 		$this->cachedUserGroups[$uid] = $groups;
@@ -186,18 +192,28 @@ class Manager extends PublicEmitter {
 	/**
 	 * get a list of group ids for a user
 	 * @param \OC\User\User $user
-	 * @return array with group names
+	 * @return array with group ids
 	 */
 	public function getUserGroupIds($user) {
-		$uid = $user->getUID();
-		if (isset($this->cachedUserGroups[$uid])) {
-			return array_keys($this->cachedUserGroups[$uid]);
-		}
 		$groupIds = array();
-		foreach ($this->backends as $backend) {
-			$groupIds = array_merge($groupIds, $backend->getUserGroups($user->getUID()));
+		$userId = $user->getUID();
+		if (isset($this->cachedUserGroupIds[$userId])) {
+			return $this->cachedUserGroupIds[$userId];
+		}
+		if (isset($this->cachedUserGroups[$userId])) {
+			foreach($this->cachedUserGroups[$userId] as $group)
+			{
+				$groupIds[] = $group->getGID();
+			}
+		}
+		else
+		{
+			foreach ($this->backends as $backend) {
+				$groupIds = array_merge($groupIds, $backend->getUserGroups($userId));
+			}
 		}
-		return $groupIds;
+		$this->cachedUserGroupIds[$userId] = $groupIds;
+		return $this->cachedUserGroupIds[$userId];
 	}
 
 	/**
-- 
GitLab


From 6a3d6d3e4b2107e4e9612146006237cd8fa5f253 Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Thu, 19 Jun 2014 20:32:37 +0200
Subject: [PATCH 005/616] Update manager.php

---
 lib/private/group/manager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index ae20af7448f..9bb5b39c794 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -182,10 +182,10 @@ class Manager extends PublicEmitter {
 		foreach ($this->backends as $backend) {
 			$groupIds = $backend->getUserGroups($uid);
 			foreach ($groupIds as $groupId) {
-				$groups[] = $this->get($groupId);
+				$groups[$groupId] = $this->get($groupId);
 			}
 		}
-		$this->cachedUserGroups[$uid] = $groups;
+		$this->cachedUserGroups[$uid] = array_values($groups);
 		return $this->cachedUserGroups[$uid];
 	}
 	
-- 
GitLab


From 405e89f45a515a825efdb673326f57e661331b19 Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Sat, 21 Jun 2014 16:06:11 +0200
Subject: [PATCH 006/616] Update manager.php

---
 lib/private/group/manager.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 9bb5b39c794..b91f6e53ebf 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -60,24 +60,32 @@ class Manager extends PublicEmitter {
 		$this->userManager = $userManager;
 		$cachedGroups = & $this->cachedGroups;
 		$cachedUserGroups = & $this->cachedUserGroups;
-		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
+		$cachedUserGroupIds = & $this->cachedUserGroupIds;
+		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups, &$cachedUserGroupIds) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			unset($cachedGroups[$group->getGID()]);
 			$cachedUserGroups = array();
+			$Position = array_search($group->getGID(), $cachedUserGroupIds);
+			if($Position !== false)
+			{
+				unset($cachedUserGroupIds[$Position]);
+			}
 		});
-		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
+		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups, &$cachedUserGroupIds) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			$cachedUserGroups = array();
+			$cachedUserGroupIds = array();
 		});
-		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
+		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups, &$cachedUserGroupIds) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			$cachedUserGroups = array();
+			$cachedUserGroupIds = array();
 		});
 	}
 
-- 
GitLab


From 24e397afd23531be46b63ce09af0d490342e343b Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Mon, 23 Jun 2014 14:47:19 +0200
Subject: [PATCH 007/616] clean up function getUserGroupIds

clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds
---
 lib/private/group/manager.php | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index b91f6e53ebf..61226f60b3c 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -68,8 +68,7 @@ class Manager extends PublicEmitter {
 			unset($cachedGroups[$group->getGID()]);
 			$cachedUserGroups = array();
 			$Position = array_search($group->getGID(), $cachedUserGroupIds);
-			if($Position !== false)
-			{
+			if($Position !== false) {
 				unset($cachedUserGroupIds[$Position]);
 			}
 		});
@@ -194,6 +193,7 @@ class Manager extends PublicEmitter {
 			}
 		}
 		$this->cachedUserGroups[$uid] = array_values($groups);
+		$this->cachedUserGroupIds[$uid] = array_keys($groups);
 		return $this->cachedUserGroups[$uid];
 	}
 	
@@ -209,13 +209,10 @@ class Manager extends PublicEmitter {
 			return $this->cachedUserGroupIds[$userId];
 		}
 		if (isset($this->cachedUserGroups[$userId])) {
-			foreach($this->cachedUserGroups[$userId] as $group)
-			{
+			foreach($this->cachedUserGroups[$userId] as $group) {
 				$groupIds[] = $group->getGID();
 			}
-		}
-		else
-		{
+		} else {
 			foreach ($this->backends as $backend) {
 				$groupIds = array_merge($groupIds, $backend->getUserGroups($userId));
 			}
-- 
GitLab


From 11ccb57fc7f3048706b001777307ac35d7f0a9db Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Mon, 23 Jun 2014 15:59:27 +0200
Subject: [PATCH 008/616] modified caching mechanism in getUserGroupIds

removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId
---
 lib/private/group/manager.php | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 61226f60b3c..94616bfe4f4 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -47,11 +47,6 @@ class Manager extends PublicEmitter {
 	 */
 	private $cachedUserGroups = array();
 
-	/**
-	 * @var string[]
-	 */
-	private $cachedUserGroupIds = array();
-
 
 	/**
 	 * @param \OC\User\Manager $userManager
@@ -60,31 +55,24 @@ class Manager extends PublicEmitter {
 		$this->userManager = $userManager;
 		$cachedGroups = & $this->cachedGroups;
 		$cachedUserGroups = & $this->cachedUserGroups;
-		$cachedUserGroupIds = & $this->cachedUserGroupIds;
-		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups, &$cachedUserGroupIds) {
+		$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			unset($cachedGroups[$group->getGID()]);
 			$cachedUserGroups = array();
-			$Position = array_search($group->getGID(), $cachedUserGroupIds);
-			if($Position !== false) {
-				unset($cachedUserGroupIds[$Position]);
-			}
 		});
-		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups, &$cachedUserGroupIds) {
+		$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			$cachedUserGroups = array();
-			$cachedUserGroupIds = array();
 		});
-		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups, &$cachedUserGroupIds) {
+		$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
 			/**
 			 * @var \OC\Group\Group $group
 			 */
 			$cachedUserGroups = array();
-			$cachedUserGroupIds = array();
 		});
 	}
 
@@ -192,8 +180,7 @@ class Manager extends PublicEmitter {
 				$groups[$groupId] = $this->get($groupId);
 			}
 		}
-		$this->cachedUserGroups[$uid] = array_values($groups);
-		$this->cachedUserGroupIds[$uid] = array_keys($groups);
+		$this->cachedUserGroups[$uid] = $groups;
 		return $this->cachedUserGroups[$uid];
 	}
 	
@@ -205,20 +192,14 @@ class Manager extends PublicEmitter {
 	public function getUserGroupIds($user) {
 		$groupIds = array();
 		$userId = $user->getUID();
-		if (isset($this->cachedUserGroupIds[$userId])) {
-			return $this->cachedUserGroupIds[$userId];
-		}
 		if (isset($this->cachedUserGroups[$userId])) {
-			foreach($this->cachedUserGroups[$userId] as $group) {
-				$groupIds[] = $group->getGID();
-			}
+			return array_keys($this->cachedUserGroups[$userId]);
 		} else {
 			foreach ($this->backends as $backend) {
 				$groupIds = array_merge($groupIds, $backend->getUserGroups($userId));
 			}
 		}
-		$this->cachedUserGroupIds[$userId] = $groupIds;
-		return $this->cachedUserGroupIds[$userId];
+		return $groupIds;
 	}
 
 	/**
-- 
GitLab


From de53bee9b38a4a757d7b24d7d0e70311e07358b5 Mon Sep 17 00:00:00 2001
From: macjohnny <estebanmarin@gmx.ch>
Date: Tue, 24 Jun 2014 16:27:38 +0200
Subject: [PATCH 009/616] adapted tests for a groupId indexed group array

---
 tests/lib/group/manager.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php
index 6799a598d42..c4a7ede42d3 100644
--- a/tests/lib/group/manager.php
+++ b/tests/lib/group/manager.php
@@ -190,7 +190,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
 
 		$groups = $manager->search('1');
 		$this->assertEquals(1, count($groups));
-		$group1 = $groups[0];
+		$group1 = reset($groups);
 		$this->assertEquals('group1', $group1->getGID());
 	}
 
@@ -229,8 +229,8 @@ class Manager extends \PHPUnit_Framework_TestCase {
 
 		$groups = $manager->search('1');
 		$this->assertEquals(2, count($groups));
-		$group1 = $groups[0];
-		$group12 = $groups[1];
+		$group1 = reset($groups);
+		$group12 = next($groups);
 		$this->assertEquals('group1', $group1->getGID());
 		$this->assertEquals('group12', $group12->getGID());
 	}
@@ -270,8 +270,8 @@ class Manager extends \PHPUnit_Framework_TestCase {
 
 		$groups = $manager->search('1', 2, 1);
 		$this->assertEquals(2, count($groups));
-		$group1 = $groups[0];
-		$group12 = $groups[1];
+		$group1 = reset($groups);
+		$group12 = next($groups);
 		$this->assertEquals('group1', $group1->getGID());
 		$this->assertEquals('group12', $group12->getGID());
 	}
@@ -300,7 +300,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
 
 		$groups = $manager->getUserGroups(new User('user1', $userBackend));
 		$this->assertEquals(1, count($groups));
-		$group1 = $groups[0];
+		$group1 = reset($groups);
 		$this->assertEquals('group1', $group1->getGID());
 	}
 
@@ -340,8 +340,8 @@ class Manager extends \PHPUnit_Framework_TestCase {
 
 		$groups = $manager->getUserGroups(new User('user1', $userBackend));
 		$this->assertEquals(2, count($groups));
-		$group1 = $groups[0];
-		$group2 = $groups[1];
+		$group1 = reset($groups);
+		$group2 = next($groups);
 		$this->assertEquals('group1', $group1->getGID());
 		$this->assertEquals('group2', $group2->getGID());
 	}
@@ -439,7 +439,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
 		// check result
 		$groups = $manager->getUserGroups($user1);
 		$this->assertEquals(1, count($groups));
-		$group1 = $groups[0];
+		$group1 = reset($groups);
 		$this->assertEquals('group1', $group1->getGID());
 	}
 
@@ -480,7 +480,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
 		$user1 = new User('user1', null);
 		$groups = $manager->getUserGroups($user1);
 		$this->assertEquals(1, count($groups));
-		$group1 = $groups[0];
+		$group1 = reset($groups);
 		$this->assertEquals('group1', $group1->getGID());
 
 		// remove user
-- 
GitLab


From aeb9cfc6c94913f7a4dbda3ccba0cf9761426bb3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 28 Aug 2014 12:34:29 +0200
Subject: [PATCH 010/616] make sure class file is loaded once

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

diff --git a/lib/private/migrate.php b/lib/private/migrate.php
index 8d88181ca19..8351155aa55 100644
--- a/lib/private/migrate.php
+++ b/lib/private/migrate.php
@@ -62,7 +62,7 @@ class OC_Migrate{
 		foreach($apps as $app) {
 			$path = OC_App::getAppPath($app) . '/appinfo/migrate.php';
 			if( file_exists( $path ) ) {
-				include $path;
+				include_once $path;
 			}
 		}
 	}
-- 
GitLab


From 4ed926b954ba30c81c48b87eff04789dc205dd5d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 18 Sep 2014 17:12:35 +0200
Subject: [PATCH 011/616] fix retrievel of group members and cache group
 members

---
 apps/user_ldap/group_ldap.php | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 0d3a70575ba..f225ed6651e 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -29,6 +29,11 @@ use OCA\user_ldap\lib\BackendUtility;
 class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	protected $enabled = false;
 
+	/**
+	 * @var string[] $cachedGroupMembers array of users with gid as key
+	 */
+	protected $cachedGroupMembers = array();
+
 	public function __construct(Access $access) {
 		parent::__construct($access);
 		$filter = $this->access->connection->ldapGroupFilter;
@@ -56,6 +61,21 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 
 		$userDN = $this->access->username2dn($uid);
+
+		if(isset($this->cachedGroupMembers[$gid])) {
+			$isInGroup = in_array($userDN, $this->groupMembers[$gid]);
+			return $isInGroup;
+		}
+
+		$cacheKeyMembers = 'inGroup-members:'.$gid;
+		if($this->access->connection->isCached($cacheKeyMembers)) {
+			$members = $this->access->connection->getFromCache($cacheKeyMembers);
+			$this->cachedGroupMembers[$gid] = $members;
+			$isInGroup = in_array($userDN, $members);
+			$this->access->connection->writeToCache($cacheKey, $isInGroup);
+			return $isInGroup;
+		}
+
 		$groupDN = $this->access->groupname2dn($gid);
 		// just in case
 		if(!$groupDN || !$userDN) {
@@ -70,8 +90,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 
 		//usually, LDAP attributes are said to be case insensitive. But there are exceptions of course.
-		$members = array_keys($this->_groupMembers($groupDN));
-		if(!$members) {
+		$members = $this->_groupMembers($groupDN);
+		$members = array_keys($members); // uids are returned as keys
+		if(!is_array($members) || count($members) === 0) {
 			$this->access->connection->writeToCache($cacheKey, false);
 			return false;
 		}
@@ -93,6 +114,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 
 		$isInGroup = in_array($userDN, $members);
 		$this->access->connection->writeToCache($cacheKey, $isInGroup);
+		$this->access->connection->writeToCache($cacheKeyMembers, $members);
+		$this->cachedGroupMembers[$gid] = $members;
 
 		return $isInGroup;
 	}
-- 
GitLab


From fd9b79b218c171a201940c31068808fb3ccc6383 Mon Sep 17 00:00:00 2001
From: Martin Konrad <info@martin-konrad.net>
Date: Tue, 30 Sep 2014 03:23:00 +0200
Subject: [PATCH 012/616] Add a CLI command that deletes an LDAP config

With this change LDAP configurations can be managed completely from
the command line.
---
 apps/user_ldap/appinfo/register_command.php |  1 +
 apps/user_ldap/command/deleteconfig.php     | 44 +++++++++++++++++++++
 apps/user_ldap/lib/helper.php               |  3 --
 3 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 apps/user_ldap/command/deleteconfig.php

diff --git a/apps/user_ldap/appinfo/register_command.php b/apps/user_ldap/appinfo/register_command.php
index 639597fdb83..f65b9773388 100644
--- a/apps/user_ldap/appinfo/register_command.php
+++ b/apps/user_ldap/appinfo/register_command.php
@@ -10,3 +10,4 @@ $application->add(new OCA\user_ldap\Command\ShowConfig());
 $application->add(new OCA\user_ldap\Command\SetConfig());
 $application->add(new OCA\user_ldap\Command\TestConfig());
 $application->add(new OCA\user_ldap\Command\CreateEmptyConfig());
+$application->add(new OCA\user_ldap\Command\DeleteConfig());
diff --git a/apps/user_ldap/command/deleteconfig.php b/apps/user_ldap/command/deleteconfig.php
new file mode 100644
index 00000000000..f8b834a6465
--- /dev/null
+++ b/apps/user_ldap/command/deleteconfig.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (c) 2014 Martin Konrad <info@martin-konrad.net>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\user_ldap\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use \OCA\user_ldap\lib\Helper;
+
+class DeleteConfig extends Command {
+
+	protected function configure() {
+		$this
+			->setName('ldap:delete-config')
+			->setDescription('deletes an existing LDAP configuration')
+			->addArgument(
+					'configID',
+					InputArgument::REQUIRED,
+					'the configuration ID'
+				     )
+		;
+	}
+
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$configPrefix = $input->getArgument('configID');;
+
+		$success = Helper::deleteServerConfiguration($configPrefix);
+
+		if($success) {
+			$output->writeln("Deleted configuration with configID '{$configPrefix}'");
+		} else {
+			$output->writeln("Cannot delete configuration with configID '{$configPrefix}'");
+		}
+	}
+}
diff --git a/apps/user_ldap/lib/helper.php b/apps/user_ldap/lib/helper.php
index ecda49f73fc..282f4549e3b 100644
--- a/apps/user_ldap/lib/helper.php
+++ b/apps/user_ldap/lib/helper.php
@@ -111,9 +111,6 @@ class Helper {
 	 * @return bool true on success, false otherwise
 	 */
 	static public function deleteServerConfiguration($prefix) {
-		//just to be on the safe side
-		\OCP\User::checkAdminUser();
-
 		if(!in_array($prefix, self::getServerConfigurationPrefixes())) {
 			return false;
 		}
-- 
GitLab


From 9a63693227b3fd7a44fe3f89d2ab6149992f69e4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 19 Aug 2014 18:01:58 +0200
Subject: [PATCH 013/616] properly cancel a Paginated Results operation in
 order to avoid protocol errors, fixes #10526

---
 apps/user_ldap/lib/access.php | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 570f445650d..392c0957d64 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -36,8 +36,16 @@ class Access extends LDAPUtility implements user\IUserTools {
 	//never ever check this var directly, always use getPagedSearchResultState
 	protected $pagedSearchedSuccessful;
 
+	/**
+	 * @var string[] $cookies an array of returned Paged Result cookies
+	 */
 	protected $cookies = array();
 
+	/**
+	 * @var string $lastCookie the last cookie returned from a Paged Results
+	 * operation, defaults to an empty string
+	 */
+	protected $lastCookie = '';
 
 	public function __construct(Connection $connection, ILDAPWrapper $ldap,
 		user\Manager $userManager) {
@@ -84,7 +92,9 @@ class Access extends LDAPUtility implements user\IUserTools {
 			\OCP\Util::writeLog('user_ldap', 'LDAP resource not available.', \OCP\Util::DEBUG);
 			return false;
 		}
-		//all or nothing! otherwise we get in trouble with.
+		//Cancel possibly running Paged Results operation, otherwise we run in
+		//LDAP protocol errors
+		$this->abandonPagedSearch();
 		$dn = $this->DNasBaseParameter($dn);
 		$rr = @$this->ldap->read($cr, $dn, $filter, array($attr));
 		if(!$this->ldap->isResource($rr)) {
@@ -805,9 +815,6 @@ class Access extends LDAPUtility implements user\IUserTools {
 		$linkResources = array_pad(array(), count($base), $cr);
 		$sr = $this->ldap->search($linkResources, $base, $filter, $attr);
 		$error = $this->ldap->errno($cr);
-		if ($pagedSearchOK) {
-			$this->ldap->controlPagedResult($cr, 999999, false, "");
-		}
 		if(!is_array($sr) || $error !== 0) {
 			\OCP\Util::writeLog('user_ldap',
 				'Error when searching: '.$this->ldap->error($cr).
@@ -1365,6 +1372,19 @@ class Access extends LDAPUtility implements user\IUserTools {
 		return $belongsToBase;
 	}
 
+	/**
+	 * resets a running Paged Search operation
+	 */
+	private function abandonPagedSearch() {
+		if(count($this->cookies) > 0) {
+			$cr = $this->connection->getConnectionResource();
+			$this->ldap->controlPagedResult($cr, 0, false, $this->lastCookie);
+			$this->getPagedSearchResultState();
+			$this->lastCookie = '';
+			$this->cookies = array();
+		}
+	}
+
 	/**
 	 * get a cookie for the next LDAP paged search
 	 * @param string $base a string with the base DN for the search
@@ -1403,6 +1423,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 		if(!empty($cookie)) {
 			$cacheKey = 'lc' . crc32($base) . '-' . crc32($filter) . '-' .intval($limit) . '-' . intval($offset);
 			$this->cookies[$cacheKey] = $cookie;
+			$this->lastCookie = $cookie;
 		}
 	}
 
-- 
GitLab


From 53ec32807abbde7854bcfe54b3c85797d62ec4a6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 18 Sep 2014 17:00:51 +0200
Subject: [PATCH 014/616] abandon ongoing paged search before starting a new
 one

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

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 392c0957d64..760d23bf44c 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1376,7 +1376,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 	 * resets a running Paged Search operation
 	 */
 	private function abandonPagedSearch() {
-		if(count($this->cookies) > 0) {
+		if(!empty($this->lastCookie)) {
 			$cr = $this->connection->getConnectionResource();
 			$this->ldap->controlPagedResult($cr, 0, false, $this->lastCookie);
 			$this->getPagedSearchResultState();
@@ -1475,9 +1475,8 @@ class Access extends LDAPUtility implements user\IUserTools {
 					}
 				}
 				if(!is_null($cookie)) {
-					if($offset > 0) {
-						\OCP\Util::writeLog('user_ldap', 'Cookie '.CRC32($cookie), \OCP\Util::INFO);
-					}
+					//since offset = 0, this is a new search. We abandon other searches that might be ongoing.
+					$this->abandonPagedSearch();
 					$pagedSearchOK = $this->ldap->controlPagedResult(
 						$this->connection->getConnectionResource(), $limit,
 						false, $cookie);
-- 
GitLab


From 2b9696efaea3029cfb20a6d9c931901e8aeaaef1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 30 Sep 2014 13:13:52 +0200
Subject: [PATCH 015/616] abandond paged search only if PHP supports them

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

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 760d23bf44c..50874ae7a15 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1376,7 +1376,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 	 * resets a running Paged Search operation
 	 */
 	private function abandonPagedSearch() {
-		if(!empty($this->lastCookie)) {
+		if($this->connection->hasPagedResultSupport) {
 			$cr = $this->connection->getConnectionResource();
 			$this->ldap->controlPagedResult($cr, 0, false, $this->lastCookie);
 			$this->getPagedSearchResultState();
-- 
GitLab


From 96d9e0eb5b52ce13015c1c1843dbad8b2c218236 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 30 Sep 2014 14:08:43 +0200
Subject: [PATCH 016/616] Remove uneeded slicing of element

The "*/*" provider has been removed. This is therefore not needed anymore and leads to unexpected bugs.

Please notice that this is only relevant for master.
---
 lib/private/preview.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index c93f5d5516f..60653a3b118 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -812,9 +812,7 @@ class Preview {
 			self::initProviders();
 		}
 
-		//remove last element because it has the mimetype *
-		$providers = array_slice(self::$providers, 0, -1);
-		foreach ($providers as $supportedMimeType => $provider) {
+		foreach (self::$providers as $supportedMimeType => $provider) {
 			if (preg_match($supportedMimeType, $mimeType)) {
 				return true;
 			}
-- 
GitLab


From f9e085b020e73b1cae350823b0d108b7b122cc56 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 30 Sep 2014 17:00:25 +0200
Subject: [PATCH 017/616] init a new paged search on read operations to satisfy
 OpenLDAP

---
 apps/user_ldap/lib/access.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 50874ae7a15..68641b7a298 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -95,6 +95,9 @@ class Access extends LDAPUtility implements user\IUserTools {
 		//Cancel possibly running Paged Results operation, otherwise we run in
 		//LDAP protocol errors
 		$this->abandonPagedSearch();
+		// openLDAP requires that we init a new Paged Search. Not needed by AD,
+		// but does not hurt either.
+		$this->initPagedSearch($filter, array($dn), $attr, 1, 0);
 		$dn = $this->DNasBaseParameter($dn);
 		$rr = @$this->ldap->read($cr, $dn, $filter, array($attr));
 		if(!$this->ldap->isResource($rr)) {
-- 
GitLab


From 6de8531ace81087ca7177b80dba710806952e753 Mon Sep 17 00:00:00 2001
From: Clark Tomlinson <fallen013@gmail.com>
Date: Tue, 23 Sep 2014 11:17:31 -0400
Subject: [PATCH 018/616] fixing windows max depth test

---
 tests/lib/files/view.php | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 522535946a5..8d56ecd9003 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -588,19 +588,32 @@ class View extends \PHPUnit_Framework_TestCase {
 		$rootView = new \OC\Files\View('');
 
 		$longPath = '';
-		// 4000 is the maximum path length in file_cache.path
+		$ds = DIRECTORY_SEPARATOR;
+		/*
+		 * 4096 is the maximum path length in file_cache.path in *nix
+		 * 1024 is the max path length in mac
+		 * 228 is the max path length in windows
+		 */
 		$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
-		$depth = (4000 / 57);
+		$tmpdirLength = strlen(\OC_Helper::tmpFolder());
+		if (\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped();
+			$depth = ((260 - $tmpdirLength) / 57);
+		}elseif(\OC_Util::runningOnMac()){
+			$depth = ((1024 - $tmpdirLength) / 57);
+		} else {
+			$depth = ((4000 - $tmpdirLength) / 57);
+		}
 		foreach (range(0, $depth - 1) as $i) {
-			$longPath .= '/' . $folderName;
+			$longPath .= $ds . $folderName;
 			$result = $rootView->mkdir($longPath);
 			$this->assertTrue($result, "mkdir failed on $i - path length: " . strlen($longPath));
 
-			$result = $rootView->file_put_contents($longPath . '/test.txt', 'lorem');
+			$result = $rootView->file_put_contents($longPath . "{$ds}test.txt", 'lorem');
 			$this->assertEquals(5, $result, "file_put_contents failed on $i");
 
 			$this->assertTrue($rootView->file_exists($longPath));
-			$this->assertTrue($rootView->file_exists($longPath . '/test.txt'));
+			$this->assertTrue($rootView->file_exists($longPath . "{$ds}test.txt"));
 		}
 
 		$cache = $storage->getCache();
@@ -617,7 +630,7 @@ class View extends \PHPUnit_Framework_TestCase {
 			$this->assertTrue(is_array($cachedFile), "No cache entry for file at $i");
 			$this->assertEquals('test.txt', $cachedFile['name'], "Wrong cache entry for file at $i");
 
-			$longPath .= '/' . $folderName;
+			$longPath .= $ds . $folderName;
 		}
 	}
 
-- 
GitLab


From 6c502e11f8a199bfbcda833efb2e16497895ae42 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 1 Oct 2014 11:55:53 +0200
Subject: [PATCH 019/616] make scrutinizer happy, very minor changes

---
 apps/user_ldap/lib/access.php       | 2 +-
 apps/user_ldap/lib/ildapwrapper.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 68641b7a298..159b0d73000 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -97,7 +97,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 		$this->abandonPagedSearch();
 		// openLDAP requires that we init a new Paged Search. Not needed by AD,
 		// but does not hurt either.
-		$this->initPagedSearch($filter, array($dn), $attr, 1, 0);
+		$this->initPagedSearch($filter, array($dn), array($attr), 1, 0);
 		$dn = $this->DNasBaseParameter($dn);
 		$rr = @$this->ldap->read($cr, $dn, $filter, array($attr));
 		if(!$this->ldap->isResource($rr)) {
diff --git a/apps/user_ldap/lib/ildapwrapper.php b/apps/user_ldap/lib/ildapwrapper.php
index 590f6d7ac7a..a64bcd6b95b 100644
--- a/apps/user_ldap/lib/ildapwrapper.php
+++ b/apps/user_ldap/lib/ildapwrapper.php
@@ -51,7 +51,7 @@ interface ILDAPWrapper {
 	 * @param resource $link LDAP link resource
 	 * @param int $pageSize number of results per page
 	 * @param bool $isCritical Indicates whether the pagination is critical of not.
-	 * @param array $cookie structure sent by LDAP server
+	 * @param string $cookie structure sent by LDAP server
 	 * @return bool true on success, false otherwise
 	 */
 	public function controlPagedResult($link, $pageSize, $isCritical, $cookie);
-- 
GitLab


From 3b3ad0bc4f745c8cdef5354a8661529f831bcd67 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 1 Oct 2014 21:44:36 +0200
Subject: [PATCH 020/616] fix changed variable name

---
 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 f225ed6651e..b8ca041bce3 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -63,7 +63,7 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		$userDN = $this->access->username2dn($uid);
 
 		if(isset($this->cachedGroupMembers[$gid])) {
-			$isInGroup = in_array($userDN, $this->groupMembers[$gid]);
+			$isInGroup = in_array($userDN, $this->cachedGroupMembers[$gid]);
 			return $isInGroup;
 		}
 
-- 
GitLab


From 67292a534587e3490762aa5db9716517cab079fa Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 7 Oct 2014 16:29:06 +0200
Subject: [PATCH 021/616] add checkbox for experienced users to server tab

---
 apps/user_ldap/css/settings.css                 |  9 +++++++++
 apps/user_ldap/lib/configuration.php            |  3 +++
 apps/user_ldap/templates/part.wizard-server.php | 11 +++++++++++
 3 files changed, 23 insertions(+)

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 3051cc8058e..48a8626ea9a 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -6,6 +6,7 @@
 .tablerow {
 	display: table-row;
 	white-space: nowrap;
+	text-align: left;
 }
 
 .tablerow input, .tablerow textarea {
@@ -16,6 +17,10 @@
 	height: 15px;
 }
 
+#ldap .tablerow label {
+	margin-left: 3px;
+}
+
 .invisible {
 	visibility: hidden;
 }
@@ -103,6 +108,10 @@
 	vertical-align: bottom;
 }
 
+#ldap input[type=checkbox] {
+	width: 15px !important;
+}
+
 select[multiple=multiple] + button {
 	height: 28px;
 	padding-top: 6px !important;
diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index 4cb00561b3f..75d3d5ea04d 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -69,6 +69,7 @@ class Configuration {
 		'ldapConfigurationActive' => false,
 		'ldapAttributesForUserSearch' => null,
 		'ldapAttributesForGroupSearch' => null,
+		'ldapExperiencedAdmin' => false,
 		'homeFolderNamingRule' => null,
 		'hasPagedResultSupport' => false,
 		'hasMemberOfFilterSupport' => false,
@@ -391,6 +392,7 @@ class Configuration {
 			'last_jpegPhoto_lookup'				=> 0,
 			'ldap_nested_groups'		        => 0,
 			'ldap_paging_size'					=> 500,
+			'ldap_experienced_admin'            => 0,
 		);
 	}
 
@@ -444,6 +446,7 @@ class Configuration {
 			'last_jpegPhoto_lookup'				=> 'lastJpegPhotoLookup',
 			'ldap_nested_groups'                => 'ldapNestedGroups',
 			'ldap_paging_size'                  => 'ldapPagingSize',
+			'ldap_experienced_admin'            => 'ldapExperiencedAdmin'
 		);
 		return $array;
 	}
diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 422faad028b..b829c775ad0 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -69,6 +69,17 @@
 				</textarea>
 			</div>
 
+			<div class="tablerow left">
+				<label for="ldap_experienced_admin" class="tablecell">
+					<?php p($l->t('I am familiar with LDAP?'));?>
+				</label>
+
+				<input type="checkbox" id="ldap_experienced_admin" value="1"
+					name="ldap_experienced_admin" class="tablecell lwautosave"
+					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>"
+					/>
+			</div>
+
 			<div class="tablerow">
 				<div class="tablecell ldapWizardInfo invisible">&nbsp;
 				</div>
-- 
GitLab


From efd940133b759fb30e7d150fdc147e6a7e4faa28 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 7 Oct 2014 16:45:22 +0200
Subject: [PATCH 022/616] must be empty not auto

---
 apps/user_ldap/appinfo/update.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 1e706ce869b..5fad23de4f6 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -19,7 +19,7 @@ foreach($configPrefixes as $config) {
 		'user_ldap', $config.'ldap_uuid_user_attribute', 'not existing');
 	if($state === 'non existing') {
 		$value = \OCP\Config::getAppValue(
-			'user_ldap', $config.'ldap_uuid_attribute', 'auto');
+			'user_ldap', $config.'ldap_uuid_attribute', '');
 		\OCP\Config::setAppValue(
 			'user_ldap', $config.'ldap_uuid_user_attribute', $value);
 		\OCP\Config::setAppValue(
@@ -30,7 +30,7 @@ foreach($configPrefixes as $config) {
 		'user_ldap', $config.'ldap_expert_uuid_user_attr', 'not existing');
 	if($state === 'non existing') {
 		$value = \OCP\Config::getAppValue(
-			'user_ldap', $config.'ldap_expert_uuid_attr', 'auto');
+			'user_ldap', $config.'ldap_expert_uuid_attr', '');
 		\OCP\Config::setAppValue(
 			'user_ldap', $config.'ldap_expert_uuid_user_attr', $value);
 		\OCP\Config::setAppValue(
-- 
GitLab


From 3ff4c8e3fc5d6249b559b3cd1b4a01ba02bd5c34 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 7 Oct 2014 17:28:09 +0200
Subject: [PATCH 023/616] sets user filters to raw mode when marking user as
 experienced

---
 apps/user_ldap/js/experiencedAdmin.js | 59 +++++++++++++++++++++++++++
 apps/user_ldap/js/settings.js         |  6 +++
 apps/user_ldap/settings.php           |  1 +
 3 files changed, 66 insertions(+)
 create mode 100644 apps/user_ldap/js/experiencedAdmin.js

diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js
new file mode 100644
index 00000000000..2d500f301b0
--- /dev/null
+++ b/apps/user_ldap/js/experiencedAdmin.js
@@ -0,0 +1,59 @@
+/**
+ * Copyright (c) 2014, Arthur Schiwon <blizzz@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * controls behaviour depend on whether the admin is experienced in LDAP or not.
+ *
+ * @class
+ * @param {object} wizard the LDAP Wizard object
+ * @param {boolean} initialState whether the admin is experienced or not
+ */
+function ExperiencedAdmin(wizard, initialState) {
+	this.wizard = wizard;
+	this.isExperienced = false;
+}
+
+
+/**
+ * toggles whether the admin is an experienced one or not
+ *
+ * @param {boolean} whether the admin is experienced or not
+ */
+ExperiencedAdmin.prototype.toggle = function(isExperienced) {
+	this.isExperienced = isExperienced;
+	if(this.isExperienced) {
+		this.enableRawMode();
+	}
+};
+
+/**
+* answers whether the admin is an experienced one or not
+*
+* @return {boolean} whether the admin is experienced or not
+*/
+ExperiencedAdmin.prototype.isExperienced = function() {
+	return this.isExperienced;
+};
+
+/**
+ * switches all LDAP filters from Assisted to Raw mode.
+ */
+ExperiencedAdmin.prototype.enableRawMode = function	() {
+	containers = {
+		'toggleRawUserFilter' : '#rawGroupFilterContainer',
+		'toggleRawLoginFilter': '#rawLoginFilterContainer',
+		'toggleRawUserFilter' : '#rawUserFilterContainer'
+	};
+
+//	containers.forEach(function(container, method) {
+	for(method in containers) {
+		if($(containers[method]).hasClass('invisible')) {
+			this.wizard[method]();
+		}
+	};
+
+
+};
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index fd84ca1980b..5982d65ad6c 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -931,4 +931,10 @@ $(document).ready(function() {
 			LdapConfiguration.refreshConfig();
 		}
 	});
+
+	expAdminCB = $('#ldap_experienced_admin');
+	LdapWizard.admin = new ExperiencedAdmin(LdapWizard, expAdminCB.is(':checked'));
+	expAdminCB.change(function() {
+		LdapWizard.admin.toggle($(this).is(':checked'));
+	});
 });
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index e7cdd0d926a..1e588b1cd85 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -26,6 +26,7 @@
 OC_Util::checkAdminUser();
 
 OCP\Util::addScript('user_ldap', 'ldapFilter');
+OCP\Util::addScript('user_ldap', 'experiencedAdmin');
 OCP\Util::addScript('user_ldap', 'settings');
 OCP\Util::addScript('core', 'jquery.multiselect');
 OCP\Util::addStyle('user_ldap', 'settings');
-- 
GitLab


From 5b5e9d148e6bab6ae4b78cebd35686e44703216c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 8 Oct 2014 10:56:06 +0200
Subject: [PATCH 024/616] check if I can create a file at the location

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

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 3fe0ef0b7de..120df345dda 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -376,7 +376,7 @@ class Trashbin {
 				// if location no longer exists, restore file in the root directory
 				if ($location !== '/' &&
 					(!$view->is_dir('files' . $location) ||
-						!$view->isUpdatable('files' . $location))
+						!$view->isCreatable('files' . $location))
 				) {
 					$location = '';
 				}
-- 
GitLab


From b6fc7f5599a08ab047e10775b4071514c7cd170d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 8 Oct 2014 11:38:39 +0200
Subject: [PATCH 025/616] Objectlasses, Groups and Attributes are now loaded
 only in assisted mode and only once

---
 apps/user_ldap/js/experiencedAdmin.js |  3 +-
 apps/user_ldap/js/ldapFilter.js       | 43 +++++++++++++++++++++++++--
 apps/user_ldap/js/settings.js         | 39 ++++++++++++++++++------
 3 files changed, 72 insertions(+), 13 deletions(-)

diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js
index 2d500f301b0..96b4bcad6c9 100644
--- a/apps/user_ldap/js/experiencedAdmin.js
+++ b/apps/user_ldap/js/experiencedAdmin.js
@@ -43,12 +43,11 @@ ExperiencedAdmin.prototype.isExperienced = function() {
  */
 ExperiencedAdmin.prototype.enableRawMode = function	() {
 	containers = {
-		'toggleRawUserFilter' : '#rawGroupFilterContainer',
+		'toggleRawGroupFilter': '#rawGroupFilterContainer',
 		'toggleRawLoginFilter': '#rawLoginFilterContainer',
 		'toggleRawUserFilter' : '#rawUserFilterContainer'
 	};
 
-//	containers.forEach(function(container, method) {
 	for(method in containers) {
 		if($(containers[method]).hasClass('invisible')) {
 			this.wizard[method]();
diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index e9f60e7ba3c..cd03ff9b5bf 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -1,19 +1,30 @@
 /* global LdapWizard */
 
-function LdapFilter(target)  {
+function LdapFilter(target, determineModeCallback)  {
 	this.locked = true;
 	this.target = false;
 	this.mode = LdapWizard.filterModeAssisted;
 	this.lazyRunCompose = false;
+	this.determineModeCallback = determineModeCallback;
+	this.foundFeatures = false;
+	this.activated = false;
 
 	if( target === 'User' ||
 		target === 'Login' ||
 		target === 'Group') {
 		this.target = target;
-		this.determineMode();
 	}
 }
 
+LdapFilter.prototype.activate = function() {
+	if(this.activated) {
+		return;
+	}
+	this.activated = true;
+
+	this.determineMode();
+}
+
 LdapFilter.prototype.compose = function(callback) {
 	var action;
 
@@ -82,6 +93,7 @@ LdapFilter.prototype.determineMode = function() {
 					filter.mode + '« of type ' + typeof filter.mode);
 			}
 			filter.unlock();
+			filter.determineModeCallback(filter.mode);
 		},
 		function () {
 			//on error case get back to default i.e. Assisted
@@ -90,10 +102,17 @@ LdapFilter.prototype.determineMode = function() {
 				filter.mode = LdapWizard.filterModeAssisted;
 			}
 			filter.unlock();
+			filter.determineModeCallback(filter.mode);
 		}
 	);
 };
 
+LdapFilter.prototype.setMode = function(mode) {
+	if(mode === LdapWizard.filterModeAssisted || mode === LdapWizard.filterModeRaw) {
+		this.mode = mode;
+	}
+}
+
 LdapFilter.prototype.unlock = function() {
 	this.locked = false;
 	if(this.lazyRunCompose) {
@@ -101,3 +120,23 @@ LdapFilter.prototype.unlock = function() {
 		this.compose();
 	}
 };
+
+LdapFilter.prototype.findFeatures = function() {
+	if(!this.foundFeatures && !this.locked && this.mode === LdapWizard.filterModeAssisted) {
+		this.foundFeatures = true;
+		if(this.target === 'User') {
+			objcEl = 'ldap_userfilter_objectclass';
+			avgrEl = 'ldap_userfilter_groups';
+		} else if (this.target === 'Group') {
+			objcEl = 'ldap_groupfilter_objectclass';
+			avgrEl = 'ldap_groupfilter_groups';
+		} else if (this.target === 'Login') {
+			LdapWizard.findAttributes();
+			return;
+		} else {
+			return false;
+		}
+		LdapWizard.findObjectClasses(objcEl, this.target);
+		LdapWizard.findAvailableGroups(avgrEl, this.target + "s");
+	}
+}
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 5982d65ad6c..cf7223d3fa0 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -530,23 +530,21 @@ var LdapWizard = {
 	isConfigurationActiveControlLocked: true,
 
 	init: function() {
+		LdapWizard.instantiateFilters();
 		LdapWizard.basicStatusCheck();
 		LdapWizard.functionalityCheck();
 		LdapWizard.isConfigurationActiveControlLocked = false;
 	},
 
 	initGroupFilter: function() {
-		LdapWizard.groupFilter = new LdapFilter('Group');
-		LdapWizard.findObjectClasses('ldap_groupfilter_objectclass', 'Group');
-		LdapWizard.findAvailableGroups('ldap_groupfilter_groups', 'Groups');
+		LdapWizard.groupFilter.activate();
 		LdapWizard.countGroups();
 	},
 
 	/** init login filter tab section **/
 
 	initLoginFilter: function() {
-		LdapWizard.loginFilter = new LdapFilter('Login');
-		LdapWizard.findAttributes();
+		LdapWizard.loginFilter.activate();
 	},
 
 	postInitLoginFilter: function() {
@@ -571,15 +569,30 @@ var LdapWizard = {
 
 	/** init user filter tab section **/
 
+	instantiateFilters: function() {
+		delete LdapWizard.userFilter;
+		LdapWizard.userFilter = new LdapFilter('User', function(mode) {
+			LdapWizard.userFilter.findFeatures();
+		});
+
+		delete LdapWizard.loginFilter;
+		LdapWizard.loginFilter = new LdapFilter('Login', function(mode) {
+			LdapWizard.loginFilter.findFeatures();
+		});
+
+		delete LdapWizard.groupFilter;
+		LdapWizard.groupFilter = new LdapFilter('Group', function(mode) {
+			LdapWizard.groupFilter.findFeatures();
+		});
+	},
+
 	userFilterObjectClassesHasRun: false,
 	userFilterAvailableGroupsHasRun: false,
 
 	initUserFilter: function() {
 		LdapWizard.userFilterObjectClassesHasRun = false;
 		LdapWizard.userFilterAvailableGroupsHasRun = false;
-		LdapWizard.userFilter = new LdapFilter('User');
-		LdapWizard.findObjectClasses('ldap_userfilter_objectclass', 'User');
-		LdapWizard.findAvailableGroups('ldap_userfilter_groups', 'Users');
+		LdapWizard.userFilter.activate();
 	},
 
 	postInitUserFilter: function() {
@@ -713,9 +726,12 @@ var LdapWizard = {
 	},
 
 	toggleRawFilter: function(container, moc, mg, stateVar, modeKey) {
+		var isUser = moc.indexOf('user') >= 0;
+		var filter = isUser ? LdapWizard.userFilter : LdapWizard.groupFilter;
 		//moc = multiselect objectclass
 		//mg = mutliselect groups
 		if($(container).hasClass('invisible')) {
+			filter.setMode(LdapWizard.filterModeRaw);
 			$(container).removeClass('invisible');
 			$(moc).multiselect('disable');
 			if($(mg).multiselect().attr('disabled') == 'disabled') {
@@ -726,11 +742,13 @@ var LdapWizard = {
 			$(mg).multiselect('disable');
 			LdapWizard._save({ id: modeKey }, LdapWizard.filterModeRaw);
 		} else {
+			filter.setMode(LdapWizard.filterModeAssisted);
+			filter.findFeatures();
 			$(container).addClass('invisible');
 			$(mg).multiselect(LdapWizard[stateVar]);
 			$(moc).multiselect('enable');
 			LdapWizard._save({ id: modeKey }, LdapWizard.filterModeAssisted);
-			if(moc.indexOf('user') >= 0) {
+			if(isUser) {
 				LdapWizard.blacklistRemove('ldap_userlist_filter');
 				LdapWizard.userFilter.compose(LdapWizard.detectEmailAttribute);
 			} else {
@@ -764,6 +782,8 @@ var LdapWizard = {
 			property = false;
 			mode = LdapWizard.filterModeAssisted;
 		}
+		LdapWizard.loginFilter.setMode(mode);
+		LdapWizard.loginFilter.findFeatures();
 		$('#ldap_loginfilter_attributes').multiselect(action);
 		$('#ldap_loginfilter_email').prop('disabled', property);
 		$('#ldap_loginfilter_username').prop('disabled', property);
@@ -837,6 +857,7 @@ $(document).ready(function() {
 	LdapWizard.initMultiSelect($('#ldap_groupfilter_objectclass'),
 							   'ldap_groupfilter_objectclass',
 							   t('user_ldap', 'Select object classes'));
+
 	$('.lwautosave').change(function() { LdapWizard.save(this); });
 	$('#toggleRawUserFilter').click(LdapWizard.toggleRawUserFilter);
 	$('#toggleRawGroupFilter').click(LdapWizard.toggleRawGroupFilter);
-- 
GitLab


From 7ba787e649de83da03ea1809d54d74fedc31a9ea Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 8 Oct 2014 13:06:18 +0200
Subject: [PATCH 026/616] user and group counts are only upated on demand in
 experienced mode

---
 apps/user_ldap/css/settings.css               |  4 ++
 apps/user_ldap/js/experiencedAdmin.js         | 46 +++++++++++++++++--
 apps/user_ldap/js/ldapFilter.js               | 15 +++++-
 apps/user_ldap/js/settings.js                 | 34 +++++++++++---
 .../templates/part.wizard-groupfilter.php     |  7 ++-
 .../templates/part.wizard-userfilter.php      |  7 ++-
 6 files changed, 98 insertions(+), 15 deletions(-)

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 48a8626ea9a..0dfcf474256 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -82,6 +82,10 @@
 	margin: 5px;
 }
 
+.ldap_count {
+	line-height: 45px;
+}
+
 .ldapSettingControls {
 	margin-top: 3px;
 }
diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js
index 96b4bcad6c9..4b30ed44d00 100644
--- a/apps/user_ldap/js/experiencedAdmin.js
+++ b/apps/user_ldap/js/experiencedAdmin.js
@@ -13,7 +13,10 @@
  */
 function ExperiencedAdmin(wizard, initialState) {
 	this.wizard = wizard;
-	this.isExperienced = false;
+	this.isExperienced = initialState;
+	if(this.isExperienced) {
+		this.hideEntryCounters();
+	}
 }
 
 
@@ -22,10 +25,13 @@ function ExperiencedAdmin(wizard, initialState) {
  *
  * @param {boolean} whether the admin is experienced or not
  */
-ExperiencedAdmin.prototype.toggle = function(isExperienced) {
+ExperiencedAdmin.prototype.setExperienced = function(isExperienced) {
 	this.isExperienced = isExperienced;
 	if(this.isExperienced) {
 		this.enableRawMode();
+		this.hideEntryCounters();
+	} else {
+		this.showEntryCounters();
 	}
 };
 
@@ -41,7 +47,7 @@ ExperiencedAdmin.prototype.isExperienced = function() {
 /**
  * switches all LDAP filters from Assisted to Raw mode.
  */
-ExperiencedAdmin.prototype.enableRawMode = function	() {
+ExperiencedAdmin.prototype.enableRawMode = function() {
 	containers = {
 		'toggleRawGroupFilter': '#rawGroupFilterContainer',
 		'toggleRawLoginFilter': '#rawLoginFilterContainer',
@@ -53,6 +59,40 @@ ExperiencedAdmin.prototype.enableRawMode = function	() {
 			this.wizard[method]();
 		}
 	};
+};
+
+ExperiencedAdmin.prototype.updateUserTab = function(mode) {
+	this._updateTab(mode, $('#ldap_user_count'));
+}
 
+ExperiencedAdmin.prototype.updateGroupTab = function(mode) {
+	this._updateTab(mode, $('#ldap_group_count'));
+}
 
+ExperiencedAdmin.prototype._updateTab = function(mode, $countEl) {
+	if(mode === LdapWizard.filterModeAssisted) {
+		$countEl.removeClass('hidden');
+	} else if(!this.isExperienced) {
+		$countEl.removeClass('hidden');
+	} else {
+		$countEl.addClass('hidden');
+	}
+}
+
+/**
+ * hide user and group counters, they will be displayed on demand only
+ */
+ExperiencedAdmin.prototype.hideEntryCounters = function() {
+	$('#ldap_user_count').addClass('hidden');
+	$('#ldap_group_count').addClass('hidden');
+	$('.ldapGetEntryCount').removeClass('hidden');
+};
+
+/**
+* shows user and group counters, they will be displayed on demand only
+*/
+ExperiencedAdmin.prototype.showEntryCounters = function() {
+	$('#ldap_user_count').removeClass('hidden');
+	$('#ldap_group_count').removeClass('hidden');
+	$('.ldapGetEntryCount').addClass('hidden');
 };
diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index cd03ff9b5bf..2d3ca8b3691 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -113,6 +113,10 @@ LdapFilter.prototype.setMode = function(mode) {
 	}
 }
 
+LdapFilter.prototype.getMode = function() {
+	return this.mode;
+}
+
 LdapFilter.prototype.unlock = function() {
 	this.locked = false;
 	if(this.lazyRunCompose) {
@@ -122,6 +126,7 @@ LdapFilter.prototype.unlock = function() {
 };
 
 LdapFilter.prototype.findFeatures = function() {
+	//TODO: reset this.foundFeatures when any base DN changes
 	if(!this.foundFeatures && !this.locked && this.mode === LdapWizard.filterModeAssisted) {
 		this.foundFeatures = true;
 		if(this.target === 'User') {
@@ -139,4 +144,12 @@ LdapFilter.prototype.findFeatures = function() {
 		LdapWizard.findObjectClasses(objcEl, this.target);
 		LdapWizard.findAvailableGroups(avgrEl, this.target + "s");
 	}
-}
+};
+
+LdapFilter.prototype.updateCount = function() {
+	if(this.target === 'User') {
+		LdapWizard.countUsers();
+	} else if (this.target === 'Group') {
+		LdapWizard.countGroups();
+	}
+};
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index cf7223d3fa0..9878a2e326e 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -317,27 +317,30 @@ var LdapWizard = {
 		}
 	},
 
-	_countThings: function(method) {
+	_countThings: function(method, spinnerID) {
 		param = 'action='+method+
 				'&ldap_serverconfig_chooser='+
 				encodeURIComponent($('#ldap_serverconfig_chooser').val());
 
+		LdapWizard.showSpinner(spinnerID);
 		LdapWizard.ajax(param,
 			function(result) {
 				LdapWizard.applyChanges(result);
+				LdapWizard.hideSpinner(spinnerID);
 			},
 			function (result) {
-				// error handling
+				OC.Notification.show('Counting the entries failed with, ' + result.message);
+				LdapWizard.hideSpinner(spinnerID);
 			}
 		);
 	},
 
 	countGroups: function() {
-		LdapWizard._countThings('countGroups');
+		LdapWizard._countThings('countGroups', '#ldap_group_count');
 	},
 
 	countUsers: function() {
-		LdapWizard._countThings('countUsers');
+		LdapWizard._countThings('countUsers', '#ldap_user_count');
 	},
 
 	detectEmailAttribute: function() {
@@ -531,6 +534,7 @@ var LdapWizard = {
 
 	init: function() {
 		LdapWizard.instantiateFilters();
+		LdapWizard.admin.setExperienced($('#ldap_experienced_admin').is(':checked'));
 		LdapWizard.basicStatusCheck();
 		LdapWizard.functionalityCheck();
 		LdapWizard.isConfigurationActiveControlLocked = false;
@@ -574,6 +578,13 @@ var LdapWizard = {
 		LdapWizard.userFilter = new LdapFilter('User', function(mode) {
 			LdapWizard.userFilter.findFeatures();
 		});
+		$('#rawUserFilterContainer .ldapGetEntryCount').click(function(event) {
+			event.preventDefault();
+			$('#ldap_user_count').text('');
+			LdapWizard.userFilter.updateCount();
+			LdapWizard.detectEmailAttribute();
+			$('#ldap_user_count').removeClass('hidden');
+		});
 
 		delete LdapWizard.loginFilter;
 		LdapWizard.loginFilter = new LdapFilter('Login', function(mode) {
@@ -584,6 +595,13 @@ var LdapWizard = {
 		LdapWizard.groupFilter = new LdapFilter('Group', function(mode) {
 			LdapWizard.groupFilter.findFeatures();
 		});
+		$('#rawGroupFilterContainer .ldapGetEntryCount').click(function(event) {
+			event.preventDefault();
+			$('#ldap_group_count').text('');
+			LdapWizard.groupFilter.updateCount();
+			LdapWizard.detectGroupMemberAssoc();
+			$('#ldap_group_count').removeClass('hidden');
+		});
 	},
 
 	userFilterObjectClassesHasRun: false,
@@ -638,10 +656,10 @@ var LdapWizard = {
 			}
 		}
 
-		if(triggerObj.id == 'ldap_userlist_filter') {
+		if(triggerObj.id == 'ldap_userlist_filter' && !LdapWizard.admin.isExperienced()) {
 			LdapWizard.countUsers();
 			LdapWizard.detectEmailAttribute();
-		} else if(triggerObj.id == 'ldap_group_filter') {
+		} else if(triggerObj.id == 'ldap_group_filter' && !LdapWizard.admin.isExperienced()) {
 			LdapWizard.countGroups();
 			LdapWizard.detectGroupMemberAssoc();
 		}
@@ -766,6 +784,7 @@ var LdapWizard = {
 								   'groupFilterGroupSelectState',
 								   'ldapGroupFilterMode'
   								);
+		LdapWizard.admin.updateGroupTab(LdapWizard.groupFilter.getMode());
 	},
 
 	toggleRawLoginFilter: function() {
@@ -801,6 +820,7 @@ var LdapWizard = {
 								   'userFilterGroupSelectState',
 								   'ldapUserFilterMode'
   								);
+		LdapWizard.admin.updateUserTab(LdapWizard.userFilter.getMode());
 	},
 
 	updateStatusIndicator: function(isComplete) {
@@ -956,6 +976,6 @@ $(document).ready(function() {
 	expAdminCB = $('#ldap_experienced_admin');
 	LdapWizard.admin = new ExperiencedAdmin(LdapWizard, expAdminCB.is(':checked'));
 	expAdminCB.change(function() {
-		LdapWizard.admin.toggle($(this).is(':checked'));
+		LdapWizard.admin.setExperienced($(this).is(':checked'));
 	});
 });
diff --git a/apps/user_ldap/templates/part.wizard-groupfilter.php b/apps/user_ldap/templates/part.wizard-groupfilter.php
index e460997b1bf..1953d2eaa6e 100644
--- a/apps/user_ldap/templates/part.wizard-groupfilter.php
+++ b/apps/user_ldap/templates/part.wizard-groupfilter.php
@@ -30,13 +30,16 @@
 			placeholder="<?php p($l->t('Raw LDAP filter'));?>"
 			title="<?php p($l->t('The filter specifies which LDAP groups shall have access to the %s instance.', $theme->getName()));?>"
 			/>
+			<button class="ldapGetEntryCount hidden" name="ldapGetEntryCount" type="button">
+				<?php p($l->t('Test Filter'));?>
+			</button>
 		</p>
 		<p>
 			<div class="ldapWizardInfo invisible">&nbsp;</div>
 		</p>
-		<p>
+		<p class="ldap_count">
 			<span id="ldap_group_count">0 <?php p($l->t('groups found'));?></span>
 		</p>
 		<?php print_unescaped($_['wizardControls']); ?>
 	</div>
-</fieldset>
\ No newline at end of file
+</fieldset>
diff --git a/apps/user_ldap/templates/part.wizard-userfilter.php b/apps/user_ldap/templates/part.wizard-userfilter.php
index eff9f89ce2c..99a6e75370b 100644
--- a/apps/user_ldap/templates/part.wizard-userfilter.php
+++ b/apps/user_ldap/templates/part.wizard-userfilter.php
@@ -30,13 +30,16 @@
 			placeholder="<?php p($l->t('Raw LDAP filter'));?>"
 			title="<?php p($l->t('The filter specifies which LDAP users shall have access to the %s instance.', $theme->getName()));?>"
 			/>
+			<button class="ldapGetEntryCount hidden" name="ldapGetEntryCount" type="button">
+				<?php p($l->t('Test Filter'));?>
+			</button>
 		</p>
 		<p>
 			<div class="ldapWizardInfo invisible">&nbsp;</div>
 		</p>
-		<p>
+		<p class="ldap_count">
 			<span id="ldap_user_count">0 <?php p($l->t('users found'));?></span>
 		</p>
 		<?php print_unescaped($_['wizardControls']); ?>
 	</div>
-</fieldset>
\ No newline at end of file
+</fieldset>
-- 
GitLab


From 29b0e9bfbcec985b191dc14926db849419081435 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 8 Oct 2014 13:29:13 +0200
Subject: [PATCH 027/616] confirmation before switching to assisted mode when
 admin is experienced

---
 apps/user_ldap/js/settings.js | 115 +++++++++++++++++++++++-----------
 1 file changed, 77 insertions(+), 38 deletions(-)

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 9878a2e326e..8ea303302ae 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -776,51 +776,90 @@ var LdapWizard = {
 		}
 	},
 
+	onToggleRawFilterConfirmation: function(currentMode, callback) {
+		if(!LdapWizard.admin.isExperienced
+			|| currentMode === LdapWizard.filterModeAssisted
+		) {
+			return callback(true);
+		}
+
+		var confirmed = OCdialogs.confirm(
+			'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?',
+			'Mode switch',
+			callback
+		);
+	},
+
 	toggleRawGroupFilter: function() {
-		LdapWizard.blacklistRemove('ldap_group_filter');
-		LdapWizard.toggleRawFilter('#rawGroupFilterContainer',
-								   '#ldap_groupfilter_objectclass',
-								   '#ldap_groupfilter_groups',
-								   'groupFilterGroupSelectState',
-								   'ldapGroupFilterMode'
-  								);
-		LdapWizard.admin.updateGroupTab(LdapWizard.groupFilter.getMode());
+		LdapWizard.onToggleRawFilterConfirmation(
+			LdapWizard.groupFilter.getMode(),
+			function(confirmed) {
+				if(confirmed !== true) {
+					return;
+				}
+
+				LdapWizard.blacklistRemove('ldap_group_filter');
+				LdapWizard.toggleRawFilter('#rawGroupFilterContainer',
+										   '#ldap_groupfilter_objectclass',
+										   '#ldap_groupfilter_groups',
+										   'groupFilterGroupSelectState',
+										   'ldapGroupFilterMode'
+		  								);
+				LdapWizard.admin.updateGroupTab(LdapWizard.groupFilter.getMode());
+			}
+		);
 	},
 
 	toggleRawLoginFilter: function() {
-		LdapWizard.blacklistRemove('ldap_login_filter');
-		container = '#rawLoginFilterContainer';
-		if($(container).hasClass('invisible')) {
-			$(container).removeClass('invisible');
-			action = 'disable';
-			property = 'disabled';
-			mode = LdapWizard.filterModeRaw;
-		} else {
-			$(container).addClass('invisible');
-			action = 'enable';
-			property = false;
-			mode = LdapWizard.filterModeAssisted;
-		}
-		LdapWizard.loginFilter.setMode(mode);
-		LdapWizard.loginFilter.findFeatures();
-		$('#ldap_loginfilter_attributes').multiselect(action);
-		$('#ldap_loginfilter_email').prop('disabled', property);
-		$('#ldap_loginfilter_username').prop('disabled', property);
-		LdapWizard._save({ id: 'ldapLoginFilterMode' }, mode);
-		if(action == 'enable') {
-			LdapWizard.loginFilter.compose();
-		}
+		LdapWizard.onToggleRawFilterConfirmation(
+			LdapWizard.loginFilter.getMode(),
+			function(confirmed) {
+				if(confirmed !== true) {
+					return;
+				}
+
+				LdapWizard.blacklistRemove('ldap_login_filter');
+				container = '#rawLoginFilterContainer';
+				if($(container).hasClass('invisible')) {
+					$(container).removeClass('invisible');
+					action = 'disable';
+					property = 'disabled';
+					mode = LdapWizard.filterModeRaw;
+				} else {
+					$(container).addClass('invisible');
+					action = 'enable';
+					property = false;
+					mode = LdapWizard.filterModeAssisted;
+				}
+				LdapWizard.loginFilter.setMode(mode);
+				LdapWizard.loginFilter.findFeatures();
+				$('#ldap_loginfilter_attributes').multiselect(action);
+				$('#ldap_loginfilter_email').prop('disabled', property);
+				$('#ldap_loginfilter_username').prop('disabled', property);
+				LdapWizard._save({ id: 'ldapLoginFilterMode' }, mode);
+				if(action == 'enable') {
+					LdapWizard.loginFilter.compose();
+				}
+			}
+		);
 	},
 
 	toggleRawUserFilter: function() {
-		LdapWizard.blacklistRemove('ldap_userlist_filter');
-		LdapWizard.toggleRawFilter('#rawUserFilterContainer',
-								   '#ldap_userfilter_objectclass',
-								   '#ldap_userfilter_groups',
-								   'userFilterGroupSelectState',
-								   'ldapUserFilterMode'
-  								);
-		LdapWizard.admin.updateUserTab(LdapWizard.userFilter.getMode());
+		LdapWizard.onToggleRawFilterConfirmation(
+			LdapWizard.userFilter.getMode(),
+			function(confirmed) {
+				if(confirmed === true) {
+					LdapWizard.blacklistRemove('ldap_userlist_filter');
+					LdapWizard.toggleRawFilter('#rawUserFilterContainer',
+											   '#ldap_userfilter_objectclass',
+											   '#ldap_userfilter_groups',
+											   'userFilterGroupSelectState',
+											   'ldapUserFilterMode'
+			  								);
+					LdapWizard.admin.updateUserTab(LdapWizard.userFilter.getMode());
+				}
+			}
+		);
 	},
 
 	updateStatusIndicator: function(isComplete) {
-- 
GitLab


From 8abe441d4ad345a94cd8170e8c691871ce648380 Mon Sep 17 00:00:00 2001
From: michag86 <micha_g@arcor.de>
Date: Wed, 8 Oct 2014 14:05:06 +0200
Subject: [PATCH 028/616] cleanup group admin(s) on deleteGroup

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

diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index e6a5565b20e..fb2dceee7a7 100644
--- a/lib/private/group/database.php
+++ b/lib/private/group/database.php
@@ -84,6 +84,10 @@ class OC_Group_Database extends OC_Group_Backend {
 		$stmt = OC_DB::prepare( "DELETE FROM `*PREFIX*group_user` WHERE `gid` = ?" );
 		$stmt->execute( array( $gid ));
 
+		// Delete the group-groupadmin relation
+		$stmt = OC_DB::prepare( "DELETE FROM `*PREFIX*group_admin` WHERE `gid` = ?" );
+		$stmt->execute( array( $gid ));
+
 		return true;
 	}
 
-- 
GitLab


From 0610937ac3ccd491b2e62133edbf76f1bb151467 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 25 Sep 2014 20:17:52 +0200
Subject: [PATCH 029/616] Added filesystem hooks for mount/unmount ext storage

---
 apps/files_external/lib/config.php | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 952463b8015..2a32d239b4c 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -495,6 +495,10 @@ class OC_Mount_Config {
 		}
 
 		$mountPoints = self::readData($isPersonal ? OCP\User::getUser() : NULL);
+		// who else loves multi-dimensional array ?
+		$isNew = !isset($mountPoints[$mountType]) ||
+			!isset($mountPoints[$mountType][$applicable]) ||
+			!isset($mountPoints[$mountType][$applicable][$mountPoint]);
 		$mountPoints = self::mergeMountPoints($mountPoints, $mount, $mountType);
 
 		// Set default priority if none set
@@ -510,7 +514,19 @@ class OC_Mount_Config {
 
 		self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);
 
-		return self::getBackendStatus($class, $classOptions, $isPersonal);
+		$result = self::getBackendStatus($class, $classOptions, $isPersonal);
+		if ($result && $isNew) {
+			\OC_Hook::emit(
+				\OC\Files\Filesystem::CLASSNAME,
+				'add_mount_point',
+				array(
+					'path' => $mountPoint,
+					'type' => $mountType,
+					'applicable' => $applicable
+				)
+			);
+		}
+		return $result;
 	}
 
 	/**
@@ -543,6 +559,15 @@ class OC_Mount_Config {
 			}
 		}
 		self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);
+		\OC_Hook::emit(
+			\OC\Files\Filesystem::CLASSNAME,
+			'remove_mount_point',
+			array(
+				'path' => $mountPoint,
+				'type' => $mountType,
+				'applicable' => $applicable
+			)
+		);
 		return true;
 	}
 
-- 
GitLab


From 6585eaa5df7a4481638a334926743d496f243d65 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 26 Sep 2014 12:51:25 +0200
Subject: [PATCH 030/616] Added failing unit tests for mount config hooks

---
 apps/files_external/lib/config.php        |  16 +--
 apps/files_external/tests/mountconfig.php | 134 ++++++++++++++++++++++
 lib/private/files/filesystem.php          |   5 +
 3 files changed, 147 insertions(+), 8 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 2a32d239b4c..0b5e833a704 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -518,11 +518,11 @@ class OC_Mount_Config {
 		if ($result && $isNew) {
 			\OC_Hook::emit(
 				\OC\Files\Filesystem::CLASSNAME,
-				'add_mount_point',
+				\OC\Files\Filesystem::signal_create_mount,
 				array(
-					'path' => $mountPoint,
-					'type' => $mountType,
-					'applicable' => $applicable
+					\OC\Files\Filesystem::signal_param_path => $mountPoint,
+					\OC\Files\Filesystem::signal_param_mount_type => $mountType,
+					\OC\Files\Filesystem::signal_param_users => $applicable,
 				)
 			);
 		}
@@ -561,11 +561,11 @@ class OC_Mount_Config {
 		self::writeData($isPersonal ? OCP\User::getUser() : NULL, $mountPoints);
 		\OC_Hook::emit(
 			\OC\Files\Filesystem::CLASSNAME,
-			'remove_mount_point',
+			\OC\Files\Filesystem::signal_delete_mount,
 			array(
-				'path' => $mountPoint,
-				'type' => $mountType,
-				'applicable' => $applicable
+				\OC\Files\Filesystem::signal_param_path => $mountPoint,
+				\OC\Files\Filesystem::signal_param_mount_type => $mountType,
+				\OC\Files\Filesystem::signal_param_users => $applicable,
 			)
 		);
 		return true;
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index fc482823843..0fa1e4e46e7 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -26,6 +26,42 @@ class Test_Mount_Config_Dummy_Storage {
 	}
 }
 
+class Test_Mount_Config_Hook_Test {
+	static $signal;
+	static $params;
+
+	public static function setUpHooks() {
+		self::clear();
+		\OCP\Util::connectHook(
+			\OC\Files\Filesystem::CLASSNAME,
+			\OC\Files\Filesystem::signal_create_mount,
+			'\Test_Mount_Config_Hook_Test', 'createHookCallback');
+		\OCP\Util::connectHook(
+			\OC\Files\Filesystem::CLASSNAME,
+			\OC\Files\Filesystem::signal_delete_mount,
+			'\Test_Mount_Config_Hook_Test', 'deleteHookCallback');
+	}
+
+	public static function clear() {
+		self::$signal = null;
+		self::$params = null;
+	}
+
+	public static function createHookCallback($params) {
+		self::$signal = \OC\Files\Filesystem::signal_create_mount;
+		self::$params = $params;
+	}
+
+	public static function deleteHookCallback($params) {
+		self::$signal = \OC\Files\Filesystem::signal_create_mount;
+		self::$params = $params;
+	}
+
+	public static function getLastCall() {
+		return array(self::$signal, self::$params);
+	}
+}
+
 /**
  * Class Test_Mount_Config
  */
@@ -77,9 +113,11 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		);
 
 		OC_Mount_Config::$skipTest = true;
+		Test_Mount_Config_Hook_Test::setupHooks();
 	}
 
 	public function tearDown() {
+		Test_Mount_Config_Hook_Test::clear();
 		OC_Mount_Config::$skipTest = false;
 
 		\OC_User::deleteUser(self::TEST_USER2);
@@ -337,6 +375,102 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array_keys($options), array_keys($savedOptions));
 	}
 
+	public function testHooks() {
+		$mountPoint = '/test';
+		$mountType = 'user';
+		$applicable = 'all';
+		$isPersonal = false;
+
+		$mountConfig = array(
+			'host' => 'smbhost',
+			'user' => 'smbuser',
+			'password' => 'smbpassword',
+			'share' => 'smbshare',
+			'root' => 'smbroot'
+		);
+
+		// write config
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				$mountPoint,
+				'\OC\Files\Storage\SMB',
+				$mountConfig,
+				$mountType,
+				$applicable,
+				$isPersonal
+			)
+		);
+
+		list($hookName, $params) = Test_Mount_Config_Hook_Test::getLastCall();
+		$this->assertEquals(
+			\OC\Files\Filesystem::signal_create_mount,
+			$hookName
+		);
+		$this->assertEquals(
+			$mountPoint,
+			$params[\OC\Files\Filesystem::signal_param_path]
+		);
+		$this->assertEquals(
+			$mountType,
+			$params[\OC\Files\Filesystem::signal_param_mount_type]
+		);
+		$this->assertEquals(
+			$applicable,
+			$params[\OC\Files\Filesystem::signal_param_mount_users]
+		);
+
+		Test_Mount_Config_Hook_Test::clear();
+
+		// edit
+		$mountConfig['host'] = 'anothersmbhost';
+		$this->assertTrue(
+			OC_Mount_Config::addMountPoint(
+				$mountPoint,
+				'\OC\Files\Storage\SMB',
+				$mountConfig,
+				$mountType,
+				$applicable,
+				$isPersonal
+			)
+		);
+
+		// hook must not be called on edit
+		list($hookName, $params) = Test_Mount_Config_Hook_Test::getLastCall();
+		$this->assertEquals(
+			null,
+			$hookName
+		);
+
+		Test_Mount_Config_Hook_Test::clear();
+
+		$this->assertTrue(
+			OC_Mount_Config::removeMountPoint(
+				'/ext',
+				$mountType,
+				$applicable,
+				$isPersonal
+			)
+		);
+
+		list($hookName, $params) = Test_Mount_Config_Hook_Test::getLastCall();
+		$this->assertEquals(
+			\OC\Files\Filesystem::signal_delete_mount,
+			$hookName
+		);
+		$this->assertEquals(
+			$mountPoint,
+			$params[\OC\Files\Filesystem::signal_param_path]
+		);
+		$this->assertEquals(
+			$mountType,
+			$params[\OC\Files\Filesystem::signal_param_mount_type]
+		);
+		$this->assertEquals(
+			$applicable,
+			$params[\OC\Files\Filesystem::signal_param_mount_users]
+		);
+	}
+
 	/**
 	 * Test password obfuscation
 	 */
diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index db46bcfd1ea..cdbbbf3d3cd 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -158,6 +158,11 @@ class Filesystem {
 	 */
 	const signal_param_run = 'run';
 
+	const signal_create_mount = 'create_mount';
+	const signal_delete_mount = 'delete_mount';
+	const signal_param_mount_type = 'mounttype';
+	const signal_param_users = 'users';
+
 	/**
 	 * @var \OC\Files\Storage\Loader $loader
 	 */
-- 
GitLab


From 12ac3a800df10cada530c57659bd9fdbc770079b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 28 Sep 2014 16:13:52 +0200
Subject: [PATCH 031/616] Expose getAppKeys trough \OCP\IConfig

---
 lib/private/allconfig.php | 9 +++++++++
 lib/public/iconfig.php    | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/private/allconfig.php b/lib/private/allconfig.php
index 721ec337ff8..7ebff7cf2db 100644
--- a/lib/private/allconfig.php
+++ b/lib/private/allconfig.php
@@ -43,6 +43,15 @@ class AllConfig implements \OCP\IConfig {
 		\OCP\Config::deleteSystemValue($key);
 	}
 
+	/**
+	 * Get all keys stored for an app
+	 *
+	 * @param string $appName the appName that we stored the value under
+	 * @return string[] the keys stored for the app
+	 */
+	public function getAppKeys($appName) {
+		return \OC::$server->getAppConfig()->getKeys($appName);
+	}
 
 	/**
 	 * Writes a new app wide value
diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
index 755da09ee6b..404cf030dee 100644
--- a/lib/public/iconfig.php
+++ b/lib/public/iconfig.php
@@ -58,6 +58,13 @@ interface IConfig {
 	 */
 	public function deleteSystemValue($key);
 
+	/**
+	 * Get all keys stored for an app
+	 *
+	 * @param string $appName the appName that we stored the value under
+	 * @return string[] the keys stored for the app
+	 */
+	public function getAppKeys($appName);
 
 	/**
 	 * Writes a new app wide value
-- 
GitLab


From 9a5d0f6084c7ecb491e4a1c971b125ac57eeb5da Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 28 Sep 2014 16:32:27 +0200
Subject: [PATCH 032/616] Fix add/remove mountpoint hooks

---
 apps/files_external/lib/config.php        | 6 ++++--
 apps/files_external/tests/mountconfig.php | 8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 0b5e833a704..604700ccf57 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -463,6 +463,7 @@ class OC_Mount_Config {
 										 $priority = null) {
 		$backends = self::getBackends();
 		$mountPoint = OC\Files\Filesystem::normalizePath($mountPoint);
+		$relMountPoint = $mountPoint;
 		if ($mountPoint === '' || $mountPoint === '/') {
 			// can't mount at root folder
 			return false;
@@ -520,7 +521,7 @@ class OC_Mount_Config {
 				\OC\Files\Filesystem::CLASSNAME,
 				\OC\Files\Filesystem::signal_create_mount,
 				array(
-					\OC\Files\Filesystem::signal_param_path => $mountPoint,
+					\OC\Files\Filesystem::signal_param_path => $relMountPoint,
 					\OC\Files\Filesystem::signal_param_mount_type => $mountType,
 					\OC\Files\Filesystem::signal_param_users => $applicable,
 				)
@@ -539,6 +540,7 @@ class OC_Mount_Config {
 	*/
 	public static function removeMountPoint($mountPoint, $mountType, $applicable, $isPersonal = false) {
 		// Verify that the mount point applies for the current user
+		$relMountPoints = $mountPoint;
 		if ($isPersonal) {
 			if ($applicable != OCP\User::getUser()) {
 				return false;
@@ -563,7 +565,7 @@ class OC_Mount_Config {
 			\OC\Files\Filesystem::CLASSNAME,
 			\OC\Files\Filesystem::signal_delete_mount,
 			array(
-				\OC\Files\Filesystem::signal_param_path => $mountPoint,
+				\OC\Files\Filesystem::signal_param_path => $relMountPoints,
 				\OC\Files\Filesystem::signal_param_mount_type => $mountType,
 				\OC\Files\Filesystem::signal_param_users => $applicable,
 			)
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index 0fa1e4e46e7..c11e48b82f3 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -53,7 +53,7 @@ class Test_Mount_Config_Hook_Test {
 	}
 
 	public static function deleteHookCallback($params) {
-		self::$signal = \OC\Files\Filesystem::signal_create_mount;
+		self::$signal = \OC\Files\Filesystem::signal_delete_mount;
 		self::$params = $params;
 	}
 
@@ -416,7 +416,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		);
 		$this->assertEquals(
 			$applicable,
-			$params[\OC\Files\Filesystem::signal_param_mount_users]
+			$params[\OC\Files\Filesystem::signal_param_users]
 		);
 
 		Test_Mount_Config_Hook_Test::clear();
@@ -445,7 +445,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 
 		$this->assertTrue(
 			OC_Mount_Config::removeMountPoint(
-				'/ext',
+				$mountPoint,
 				$mountType,
 				$applicable,
 				$isPersonal
@@ -467,7 +467,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		);
 		$this->assertEquals(
 			$applicable,
-			$params[\OC\Files\Filesystem::signal_param_mount_users]
+			$params[\OC\Files\Filesystem::signal_param_users]
 		);
 	}
 
-- 
GitLab


From 5d7bd8be422d9e9904500869182d344f18aa8710 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 28 Sep 2014 17:09:07 +0200
Subject: [PATCH 033/616] Add EtagPropagator to handle etag changes when
 external storages are changed

---
 apps/files_external/lib/etagpropagator.php   | 107 ++++++
 apps/files_external/tests/etagpropagator.php | 328 +++++++++++++++++++
 2 files changed, 435 insertions(+)
 create mode 100644 apps/files_external/lib/etagpropagator.php
 create mode 100644 apps/files_external/tests/etagpropagator.php

diff --git a/apps/files_external/lib/etagpropagator.php b/apps/files_external/lib/etagpropagator.php
new file mode 100644
index 00000000000..00571657504
--- /dev/null
+++ b/apps/files_external/lib/etagpropagator.php
@@ -0,0 +1,107 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OCA\Files_External;
+
+use OC\Files\Filesystem;
+
+class EtagPropagator {
+	/**
+	 * @var \OCP\IUser
+	 */
+	protected $user;
+
+	/**
+	 * @var \OC\Files\Cache\ChangePropagator
+	 */
+	protected $changePropagator;
+
+	/**
+	 * @var \OCP\IConfig
+	 */
+	protected $config;
+
+	/**
+	 * @param \OCP\IUser $user
+	 * @param \OC\Files\Cache\ChangePropagator $changePropagator
+	 * @param \OCP\IConfig $config
+	 */
+	public function __construct($user, $changePropagator, $config) {
+		$this->user = $user;
+		$this->changePropagator = $changePropagator;
+		$this->config = $config;
+	}
+
+	public function propagateDirtyMountPoints($time = null) {
+		if ($time === null) {
+			$time = time();
+		}
+		$mountPoints = $this->getDirtyMountPoints();
+		foreach ($mountPoints as $mountPoint) {
+			$this->changePropagator->addChange($mountPoint);
+			$this->config->setUserValue($this->user->getUID(), 'files_external', $mountPoint, $time);
+		}
+		if (count($mountPoints)) {
+			$this->changePropagator->propagateChanges($time);
+		}
+	}
+
+	/**
+	 * Get all mountpoints we need to update the etag for
+	 *
+	 * @return string[]
+	 */
+	protected function getDirtyMountPoints() {
+		$dirty = array();
+		$mountPoints = $this->config->getAppKeys('files_external');
+		foreach ($mountPoints as $mountPoint) {
+			if (substr($mountPoint, 0, 1) === '/') {
+				$updateTime = $this->config->getAppValue('files_external', $mountPoint);
+				$userTime = $this->config->getUserValue($this->user->getUID(), 'files_external', $mountPoint);
+				if ($updateTime > $userTime) {
+					$dirty[] = $mountPoint;
+				}
+			}
+		}
+		return $dirty;
+	}
+
+	/**
+	 * @param string $mountPoint
+	 * @param int $time
+	 */
+	protected function markDirty($mountPoint, $time = null) {
+		if ($time === null) {
+			$time = time();
+		}
+		$this->config->setAppValue('files_external', $mountPoint, $time);
+	}
+
+	/**
+	 * Update etags for mount points for known user
+	 * For global or group mount points, updating the etag for every user is not feasible
+	 * instead we mark the mount point as dirty and update the etag when the filesystem is loaded for the user
+	 *
+	 * @param array $params
+	 * @param int $time
+	 */
+	public function updateHook($params, $time = null) {
+		if ($time === null) {
+			$time = time();
+		}
+		$users = $params[Filesystem::signal_param_users];
+		$type = $params[Filesystem::signal_param_mount_type];
+		$mountPoint = $params[Filesystem::signal_param_path];
+		if ($type === \OC_Mount_Config::MOUNT_TYPE_GROUP or $users === 'all') {
+			$this->markDirty($mountPoint, $time);
+		} else {
+			$this->changePropagator->addChange($mountPoint);
+			$this->changePropagator->propagateChanges($time);
+		}
+	}
+}
diff --git a/apps/files_external/tests/etagpropagator.php b/apps/files_external/tests/etagpropagator.php
new file mode 100644
index 00000000000..7fa1863f962
--- /dev/null
+++ b/apps/files_external/tests/etagpropagator.php
@@ -0,0 +1,328 @@
+<?php
+/**
+ * Copyright (c) 2014 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 Tests\Files_External;
+
+use OC\Files\Filesystem;
+use OC\User\User;
+
+class EtagPropagator extends \PHPUnit_Framework_TestCase {
+	protected function getUser() {
+		return new User(uniqid(), null);
+	}
+
+	/**
+	 * @return \PHPUnit_Framework_MockObject_MockObject | \OC\Files\Cache\ChangePropagator
+	 */
+	protected function getChangePropagator() {
+		return $this->getMockBuilder('\OC\Files\Cache\ChangePropagator')
+			->disableOriginalConstructor()
+			->getMock();
+	}
+
+	/**
+	 * @return \PHPUnit_Framework_MockObject_MockObject | \OCP\IConfig
+	 */
+	protected function getConfig() {
+		$appConfig = array();
+		$userConfig = array();
+		$mock = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$mock->expects($this->any())
+			->method('getAppValue')
+			->will($this->returnCallback(function ($appId, $key, $default = null) use (&$appConfig) {
+				if (isset($appConfig[$appId]) and isset($appConfig[$appId][$key])) {
+					return $appConfig[$appId][$key];
+				} else {
+					return $default;
+				}
+			}));
+		$mock->expects($this->any())
+			->method('setAppValue')
+			->will($this->returnCallback(function ($appId, $key, $value) use (&$appConfig) {
+				if (!isset($appConfig[$appId])) {
+					$appConfig[$appId] = array();
+				}
+				$appConfig[$appId][$key] = $value;
+			}));
+		$mock->expects($this->any())
+			->method('getAppKeys')
+			->will($this->returnCallback(function ($appId) use (&$appConfig) {
+				if (!isset($appConfig[$appId])) {
+					$appConfig[$appId] = array();
+				}
+				return array_keys($appConfig[$appId]);
+			}));
+
+		$mock->expects($this->any())
+			->method('getUserValue')
+			->will($this->returnCallback(function ($userId, $appId, $key, $default = null) use (&$userConfig) {
+				if (isset($userConfig[$userId]) and isset($userConfig[$userId][$appId]) and isset($userConfig[$userId][$appId][$key])) {
+					return $userConfig[$userId][$appId][$key];
+				} else {
+					return $default;
+				}
+			}));
+		$mock->expects($this->any())
+			->method('setUserValue')
+			->will($this->returnCallback(function ($userId, $appId, $key, $value) use (&$userConfig) {
+				if (!isset($userConfig[$userId])) {
+					$userConfig[$userId] = array();
+				}
+				if (!isset($userConfig[$userId][$appId])) {
+					$userConfig[$userId][$appId] = array();
+				}
+				$userConfig[$userId][$appId][$key] = $value;
+			}));
+
+		return $mock;
+	}
+
+	public function testSingleUserMount() {
+		$time = time();
+		$user = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		$changePropagator->expects($this->once())
+			->method('addChange')
+			->with('/test');
+		$changePropagator->expects($this->once())
+			->method('propagateChanges')
+			->with($time);
+
+		$propagator->updateHook(array(
+			Filesystem::signal_param_path => '/test',
+			Filesystem::signal_param_mount_type => \OC_Mount_Config::MOUNT_TYPE_USER,
+			Filesystem::signal_param_users => $user->getUID(),
+		), $time);
+	}
+
+	public function testGlobalMountNoDirectUpdate() {
+		$time = time();
+		$user = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		// not updated directly
+		$changePropagator->expects($this->never())
+			->method('addChange');
+		$changePropagator->expects($this->never())
+			->method('propagateChanges');
+
+		$propagator->updateHook(array(
+			Filesystem::signal_param_path => '/test',
+			Filesystem::signal_param_mount_type => \OC_Mount_Config::MOUNT_TYPE_USER,
+			Filesystem::signal_param_users => 'all',
+		), $time);
+
+		// mount point marked as dirty
+		$this->assertEquals(array('/test'), $config->getAppKeys('files_external'));
+		$this->assertEquals($time, $config->getAppValue('files_external', '/test'));
+	}
+
+	public function testGroupMountNoDirectUpdate() {
+		$time = time();
+		$user = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		// not updated directly
+		$changePropagator->expects($this->never())
+			->method('addChange');
+		$changePropagator->expects($this->never())
+			->method('propagateChanges');
+
+		$propagator->updateHook(array(
+			Filesystem::signal_param_path => '/test',
+			Filesystem::signal_param_mount_type => \OC_Mount_Config::MOUNT_TYPE_GROUP,
+			Filesystem::signal_param_users => 'test',
+		), $time);
+
+		// mount point marked as dirty
+		$this->assertEquals(array('/test'), $config->getAppKeys('files_external'));
+		$this->assertEquals($time, $config->getAppValue('files_external', '/test'));
+	}
+
+	public function testGlobalMountNoDirtyMountPoint() {
+		$time = time();
+		$user = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		$changePropagator->expects($this->never())
+			->method('addChange');
+		$changePropagator->expects($this->never())
+			->method('propagateChanges');
+
+		$propagator->propagateDirtyMountPoints($time);
+
+		$this->assertEquals(0, $config->getUserValue($user->getUID(), 'files_external', '/test', 0));
+	}
+
+	public function testGlobalMountDirtyMountPointFirstTime() {
+		$time = time();
+		$user = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		$config->setAppValue('files_external', '/test', $time - 10);
+
+		$changePropagator->expects($this->once())
+			->method('addChange')
+			->with('/test');
+		$changePropagator->expects($this->once())
+			->method('propagateChanges')
+			->with($time);
+
+		$propagator->propagateDirtyMountPoints($time);
+
+		$this->assertEquals($time, $config->getUserValue($user->getUID(), 'files_external', '/test'));
+	}
+
+	public function testGlobalMountNonDirtyMountPoint() {
+		$time = time();
+		$user = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		$config->setAppValue('files_external', '/test', $time - 10);
+		$config->setUserValue($user->getUID(), 'files_external', '/test', $time - 10);
+
+		$changePropagator->expects($this->never())
+			->method('addChange');
+		$changePropagator->expects($this->never())
+			->method('propagateChanges');
+
+		$propagator->propagateDirtyMountPoints($time);
+
+		$this->assertEquals($time - 10, $config->getUserValue($user->getUID(), 'files_external', '/test'));
+	}
+
+	public function testGlobalMountNonDirtyMountPointOtherUser() {
+		$time = time();
+		$user = $this->getUser();
+		$user2 = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		$config->setAppValue('files_external', '/test', $time - 10);
+		$config->setUserValue($user2->getUID(), 'files_external', '/test', $time - 10);
+
+		$changePropagator->expects($this->once())
+			->method('addChange')
+			->with('/test');
+		$changePropagator->expects($this->once())
+			->method('propagateChanges')
+			->with($time);
+
+		$propagator->propagateDirtyMountPoints($time);
+
+		$this->assertEquals($time, $config->getUserValue($user->getUID(), 'files_external', '/test'));
+	}
+
+	public function testGlobalMountDirtyMountPointSecondTime() {
+		$time = time();
+		$user = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		$config->setAppValue('files_external', '/test', $time - 10);
+		$config->setUserValue($user->getUID(), 'files_external', '/test', $time - 20);
+
+		$changePropagator->expects($this->once())
+			->method('addChange')
+			->with('/test');
+		$changePropagator->expects($this->once())
+			->method('propagateChanges')
+			->with($time);
+
+		$propagator->propagateDirtyMountPoints($time);
+
+		$this->assertEquals($time, $config->getUserValue($user->getUID(), 'files_external', '/test'));
+	}
+
+	public function testGlobalMountMultipleUsers() {
+		$time = time();
+		$config = $this->getConfig();
+		$user1 = $this->getUser();
+		$user2 = $this->getUser();
+		$user3 = $this->getUser();
+		$changePropagator1 = $this->getChangePropagator();
+		$changePropagator2 = $this->getChangePropagator();
+		$changePropagator3 = $this->getChangePropagator();
+		$propagator1 = new \OCA\Files_External\EtagPropagator($user1, $changePropagator1, $config);
+		$propagator2 = new \OCA\Files_External\EtagPropagator($user2, $changePropagator2, $config);
+		$propagator3 = new \OCA\Files_External\EtagPropagator($user3, $changePropagator3, $config);
+
+		$config->setAppValue('files_external', '/test', $time - 10);
+
+		$changePropagator1->expects($this->once())
+			->method('addChange')
+			->with('/test');
+		$changePropagator1->expects($this->once())
+			->method('propagateChanges')
+			->with($time);
+
+		$propagator1->propagateDirtyMountPoints($time);
+
+		$this->assertEquals($time, $config->getUserValue($user1->getUID(), 'files_external', '/test'));
+		$this->assertEquals(0, $config->getUserValue($user2->getUID(), 'files_external', '/test', 0));
+		$this->assertEquals(0, $config->getUserValue($user3->getUID(), 'files_external', '/test', 0));
+
+		$changePropagator2->expects($this->once())
+			->method('addChange')
+			->with('/test');
+		$changePropagator2->expects($this->once())
+			->method('propagateChanges')
+			->with($time);
+
+		$propagator2->propagateDirtyMountPoints($time);
+
+		$this->assertEquals($time, $config->getUserValue($user1->getUID(), 'files_external', '/test'));
+		$this->assertEquals($time, $config->getUserValue($user2->getUID(), 'files_external', '/test', 0));
+		$this->assertEquals(0, $config->getUserValue($user3->getUID(), 'files_external', '/test', 0));
+	}
+
+	public function testGlobalMountMultipleDirtyMountPoints() {
+		$time = time();
+		$user = $this->getUser();
+		$config = $this->getConfig();
+		$changePropagator = $this->getChangePropagator();
+		$propagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, $config);
+
+		$config->setAppValue('files_external', '/test', $time - 10);
+		$config->setAppValue('files_external', '/foo', $time - 50);
+		$config->setAppValue('files_external', '/bar', $time - 70);
+
+		$config->setUserValue($user->getUID(), 'files_external', '/foo', $time - 70);
+		$config->setUserValue($user->getUID(), 'files_external', '/bar', $time - 70);
+
+		$changePropagator->expects($this->exactly(2))
+			->method('addChange');
+		$changePropagator->expects($this->once())
+			->method('propagateChanges')
+			->with($time);
+
+		$propagator->propagateDirtyMountPoints($time);
+
+		$this->assertEquals($time, $config->getUserValue($user->getUID(), 'files_external', '/test'));
+		$this->assertEquals($time, $config->getUserValue($user->getUID(), 'files_external', '/foo'));
+		$this->assertEquals($time - 70, $config->getUserValue($user->getUID(), 'files_external', '/bar'));
+	}
+}
-- 
GitLab


From 1030f0a7638dd355ae514c51cf17fe7ff65461b2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 29 Sep 2014 13:46:27 +0200
Subject: [PATCH 034/616] Hookup the etag propagator

---
 apps/files_external/lib/config.php         | 16 ++++++++++++++++
 apps/files_external/lib/etagpropagator.php |  1 +
 2 files changed, 17 insertions(+)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 604700ccf57..92bb891ca21 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -118,6 +118,22 @@ class OC_Mount_Config {
 			}
 			$manager->addMount($mount);
 		}
+
+		if ($data['user']) {
+			$user = \OC::$server->getUserManager()->get($data['user']);
+			$userView = new \OC\Files\View('/' . $user->getUID() . '/files');
+			$changePropagator = new \OC\Files\Cache\ChangePropagator($userView);
+			$etagPropagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, \OC::$server->getConfig());
+			$etagPropagator->propagateDirtyMountPoints();
+			\OCP\Util::connectHook(
+				\OC\Files\Filesystem::CLASSNAME,
+				\OC\Files\Filesystem::signal_create_mount,
+				$etagPropagator, 'updateHook');
+			\OCP\Util::connectHook(
+				\OC\Files\Filesystem::CLASSNAME,
+				\OC\Files\Filesystem::signal_delete_mount,
+				$etagPropagator, 'updateHook');
+		}
 	}
 
 	/**
diff --git a/apps/files_external/lib/etagpropagator.php b/apps/files_external/lib/etagpropagator.php
index 00571657504..35bf8328cad 100644
--- a/apps/files_external/lib/etagpropagator.php
+++ b/apps/files_external/lib/etagpropagator.php
@@ -97,6 +97,7 @@ class EtagPropagator {
 		$users = $params[Filesystem::signal_param_users];
 		$type = $params[Filesystem::signal_param_mount_type];
 		$mountPoint = $params[Filesystem::signal_param_path];
+		$mountPoint = Filesystem::normalizePath($mountPoint);
 		if ($type === \OC_Mount_Config::MOUNT_TYPE_GROUP or $users === 'all') {
 			$this->markDirty($mountPoint, $time);
 		} else {
-- 
GitLab


From bcf654127fc5ea56596fe1329b5d92c8599fe7e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 30 Sep 2014 12:28:44 +0200
Subject: [PATCH 035/616] More phpdoc

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

diff --git a/apps/files_external/lib/etagpropagator.php b/apps/files_external/lib/etagpropagator.php
index 35bf8328cad..64a121447a3 100644
--- a/apps/files_external/lib/etagpropagator.php
+++ b/apps/files_external/lib/etagpropagator.php
@@ -37,6 +37,11 @@ class EtagPropagator {
 		$this->config = $config;
 	}
 
+	/**
+	 * Propagate the etag changes for all mountpoints marked as dirty and mark the mountpoints as clean
+	 *
+	 * @param int $time
+	 */
 	public function propagateDirtyMountPoints($time = null) {
 		if ($time === null) {
 			$time = time();
-- 
GitLab


From 26e242a8a4480f813d6d1ad15f3bf5c2f5025b48 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 7 Oct 2014 16:41:37 +0200
Subject: [PATCH 036/616] Added PHP docs for etag propagator

---
 apps/files_external/lib/etagpropagator.php | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/apps/files_external/lib/etagpropagator.php b/apps/files_external/lib/etagpropagator.php
index 64a121447a3..80a3849b150 100644
--- a/apps/files_external/lib/etagpropagator.php
+++ b/apps/files_external/lib/etagpropagator.php
@@ -10,6 +10,16 @@ namespace OCA\Files_External;
 
 use OC\Files\Filesystem;
 
+/**
+ * Updates the etag of parent folders whenever a new external storage mount
+ * point has been created or deleted. Updates need to be triggered using
+ * the updateHook() method.
+ *
+ * There are two modes of operation:
+ * - for personal mount points, the etag is propagated directly
+ * - for system mount points, a dirty flag is saved in the configuration and
+ * the etag will be updated the next time propagateDirtyMountPoints() is called
+ */
 class EtagPropagator {
 	/**
 	 * @var \OCP\IUser
@@ -27,8 +37,10 @@ class EtagPropagator {
 	protected $config;
 
 	/**
-	 * @param \OCP\IUser $user
-	 * @param \OC\Files\Cache\ChangePropagator $changePropagator
+	 * @param \OCP\IUser $user current user, must match the propagator's
+	 * user
+	 * @param \OC\Files\Cache\ChangePropagator $changePropagator change propagator
+	 * initialized with a view for $user
 	 * @param \OCP\IConfig $config
 	 */
 	public function __construct($user, $changePropagator, $config) {
@@ -91,9 +103,10 @@ class EtagPropagator {
 	 * Update etags for mount points for known user
 	 * For global or group mount points, updating the etag for every user is not feasible
 	 * instead we mark the mount point as dirty and update the etag when the filesystem is loaded for the user
+	 * For personal mount points, the change is propagated directly
 	 *
-	 * @param array $params
-	 * @param int $time
+	 * @param array $params hook parameters
+	 * @param int $time update time to use when marking a mount point as dirty
 	 */
 	public function updateHook($params, $time = null) {
 		if ($time === null) {
-- 
GitLab


From 39aa5868ac970253a1edc3d4fc90763a44c85100 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 8 Oct 2014 14:55:47 +0200
Subject: [PATCH 037/616] rename internal var name to avoid collision

---
 apps/user_ldap/js/experiencedAdmin.js | 12 ++++++------
 apps/user_ldap/js/settings.js         |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js
index 4b30ed44d00..bd674a37d6c 100644
--- a/apps/user_ldap/js/experiencedAdmin.js
+++ b/apps/user_ldap/js/experiencedAdmin.js
@@ -13,8 +13,8 @@
  */
 function ExperiencedAdmin(wizard, initialState) {
 	this.wizard = wizard;
-	this.isExperienced = initialState;
-	if(this.isExperienced) {
+	this._isExperienced = initialState;
+	if(this._isExperienced) {
 		this.hideEntryCounters();
 	}
 }
@@ -26,8 +26,8 @@ function ExperiencedAdmin(wizard, initialState) {
  * @param {boolean} whether the admin is experienced or not
  */
 ExperiencedAdmin.prototype.setExperienced = function(isExperienced) {
-	this.isExperienced = isExperienced;
-	if(this.isExperienced) {
+	this._isExperienced = isExperienced;
+	if(this._isExperienced) {
 		this.enableRawMode();
 		this.hideEntryCounters();
 	} else {
@@ -41,7 +41,7 @@ ExperiencedAdmin.prototype.setExperienced = function(isExperienced) {
 * @return {boolean} whether the admin is experienced or not
 */
 ExperiencedAdmin.prototype.isExperienced = function() {
-	return this.isExperienced;
+	return this._isExperienced;
 };
 
 /**
@@ -72,7 +72,7 @@ ExperiencedAdmin.prototype.updateGroupTab = function(mode) {
 ExperiencedAdmin.prototype._updateTab = function(mode, $countEl) {
 	if(mode === LdapWizard.filterModeAssisted) {
 		$countEl.removeClass('hidden');
-	} else if(!this.isExperienced) {
+	} else if(!this._isExperienced) {
 		$countEl.removeClass('hidden');
 	} else {
 		$countEl.addClass('hidden');
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 8ea303302ae..04b4b91d1f1 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -777,7 +777,7 @@ var LdapWizard = {
 	},
 
 	onToggleRawFilterConfirmation: function(currentMode, callback) {
-		if(!LdapWizard.admin.isExperienced
+		if(!LdapWizard.admin.isExperienced()
 			|| currentMode === LdapWizard.filterModeAssisted
 		) {
 			return callback(true);
-- 
GitLab


From ab3535855fef82783faae50286045b644bbf6d79 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 8 Oct 2014 15:04:29 +0200
Subject: [PATCH 038/616] more beautiful white spaces

---
 apps/user_ldap/lib/configuration.php | 176 +++++++++++++--------------
 1 file changed, 88 insertions(+), 88 deletions(-)

diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index 75d3d5ea04d..28e456ae2ef 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -346,52 +346,52 @@ class Configuration {
 	 */
 	public function getDefaults() {
 		return array(
-			'ldap_host'							=> '',
-			'ldap_port'							=> '',
-			'ldap_backup_host'					=> '',
-			'ldap_backup_port'					=> '',
-			'ldap_override_main_server'			=> '',
-			'ldap_dn'							=> '',
-			'ldap_agent_password'				=> '',
-			'ldap_base'							=> '',
-			'ldap_base_users'					=> '',
-			'ldap_base_groups'					=> '',
-			'ldap_userlist_filter'				=> '',
-			'ldap_user_filter_mode'				=> 0,
-			'ldap_userfilter_objectclass'		=> '',
-			'ldap_userfilter_groups'			=> '',
-			'ldap_login_filter'					=> '',
-			'ldap_login_filter_mode'			=> 0,
-			'ldap_loginfilter_email'			=> 0,
-			'ldap_loginfilter_username'			=> 1,
-			'ldap_loginfilter_attributes'		=> '',
-			'ldap_group_filter'					=> '',
-			'ldap_group_filter_mode'			=> 0,
-			'ldap_groupfilter_objectclass'		=> '',
-			'ldap_groupfilter_groups'			=> '',
-			'ldap_display_name'					=> 'displayName',
-			'ldap_group_display_name'			=> 'cn',
-			'ldap_tls'							=> 1,
-			'ldap_nocase'						=> 0,
-			'ldap_quota_def'					=> '',
-			'ldap_quota_attr'					=> '',
-			'ldap_email_attr'					=> '',
-			'ldap_group_member_assoc_attribute'	=> 'uniqueMember',
-			'ldap_cache_ttl'					=> 600,
-			'ldap_uuid_user_attribute'			=> 'auto',
-			'ldap_uuid_group_attribute'			=> 'auto',
-			'home_folder_naming_rule'			=> '',
-			'ldap_turn_off_cert_check'			=> 0,
-			'ldap_configuration_active'			=> 0,
-			'ldap_attributes_for_user_search'	=> '',
-			'ldap_attributes_for_group_search'	=> '',
-			'ldap_expert_username_attr'			=> '',
-			'ldap_expert_uuid_user_attr'		=> '',
-			'ldap_expert_uuid_group_attr'		=> '',
-			'has_memberof_filter_support'		=> 0,
-			'last_jpegPhoto_lookup'				=> 0,
-			'ldap_nested_groups'		        => 0,
-			'ldap_paging_size'					=> 500,
+			'ldap_host'                         => '',
+			'ldap_port'                         => '',
+			'ldap_backup_host'                  => '',
+			'ldap_backup_port'                  => '',
+			'ldap_override_main_server'         => '',
+			'ldap_dn'                           => '',
+			'ldap_agent_password'               => '',
+			'ldap_base'                         => '',
+			'ldap_base_users'                   => '',
+			'ldap_base_groups'                  => '',
+			'ldap_userlist_filter'              => '',
+			'ldap_user_filter_mode'             => 0,
+			'ldap_userfilter_objectclass'       => '',
+			'ldap_userfilter_groups'            => '',
+			'ldap_login_filter'                 => '',
+			'ldap_login_filter_mode'            => 0,
+			'ldap_loginfilter_email'            => 0,
+			'ldap_loginfilter_username'         => 1,
+			'ldap_loginfilter_attributes'       => '',
+			'ldap_group_filter'                 => '',
+			'ldap_group_filter_mode'            => 0,
+			'ldap_groupfilter_objectclass'      => '',
+			'ldap_groupfilter_groups'           => '',
+			'ldap_display_name'                 => 'displayName',
+			'ldap_group_display_name'           => 'cn',
+			'ldap_tls'                          => 1,
+			'ldap_nocase'                       => 0,
+			'ldap_quota_def'                    => '',
+			'ldap_quota_attr'                   => '',
+			'ldap_email_attr'                   => '',
+			'ldap_group_member_assoc_attribute' => 'uniqueMember',
+			'ldap_cache_ttl'                    => 600,
+			'ldap_uuid_user_attribute'          => 'auto',
+			'ldap_uuid_group_attribute'         => 'auto',
+			'home_folder_naming_rule'           => '',
+			'ldap_turn_off_cert_check'          => 0,
+			'ldap_configuration_active'         => 0,
+			'ldap_attributes_for_user_search'   => '',
+			'ldap_attributes_for_group_search'  => '',
+			'ldap_expert_username_attr'         => '',
+			'ldap_expert_uuid_user_attr'        => '',
+			'ldap_expert_uuid_group_attr'       => '',
+			'has_memberof_filter_support'       => 0,
+			'last_jpegPhoto_lookup'             => 0,
+			'ldap_nested_groups'                => 0,
+			'ldap_paging_size'                  => 500,
 			'ldap_experienced_admin'            => 0,
 		);
 	}
@@ -402,48 +402,48 @@ class Configuration {
 	public function getConfigTranslationArray() {
 		//TODO: merge them into one representation
 		static $array = array(
-			'ldap_host'							=> 'ldapHost',
-			'ldap_port'							=> 'ldapPort',
-			'ldap_backup_host'					=> 'ldapBackupHost',
-			'ldap_backup_port'					=> 'ldapBackupPort',
-			'ldap_override_main_server' 		=> 'ldapOverrideMainServer',
-			'ldap_dn'							=> 'ldapAgentName',
-			'ldap_agent_password'				=> 'ldapAgentPassword',
-			'ldap_base'							=> 'ldapBase',
-			'ldap_base_users'					=> 'ldapBaseUsers',
-			'ldap_base_groups'					=> 'ldapBaseGroups',
-			'ldap_userfilter_objectclass' 		=> 'ldapUserFilterObjectclass',
-			'ldap_userfilter_groups'	 		=> 'ldapUserFilterGroups',
-			'ldap_userlist_filter'				=> 'ldapUserFilter',
-			'ldap_user_filter_mode'				=> 'ldapUserFilterMode',
-			'ldap_login_filter'					=> 'ldapLoginFilter',
-			'ldap_login_filter_mode'			=> 'ldapLoginFilterMode',
-			'ldap_loginfilter_email'			=> 'ldapLoginFilterEmail',
-			'ldap_loginfilter_username'			=> 'ldapLoginFilterUsername',
-			'ldap_loginfilter_attributes'		=> 'ldapLoginFilterAttributes',
-			'ldap_group_filter'					=> 'ldapGroupFilter',
-			'ldap_group_filter_mode'			=> 'ldapGroupFilterMode',
-			'ldap_groupfilter_objectclass'		=> 'ldapGroupFilterObjectclass',
-			'ldap_groupfilter_groups'			=> 'ldapGroupFilterGroups',
-			'ldap_display_name'					=> 'ldapUserDisplayName',
-			'ldap_group_display_name'			=> 'ldapGroupDisplayName',
-			'ldap_tls'							=> 'ldapTLS',
-			'ldap_nocase'						=> 'ldapNoCase',
-			'ldap_quota_def'					=> 'ldapQuotaDefault',
-			'ldap_quota_attr'					=> 'ldapQuotaAttribute',
-			'ldap_email_attr'					=> 'ldapEmailAttribute',
-			'ldap_group_member_assoc_attribute'	=> 'ldapGroupMemberAssocAttr',
-			'ldap_cache_ttl'					=> 'ldapCacheTTL',
-			'home_folder_naming_rule' 			=> 'homeFolderNamingRule',
-			'ldap_turn_off_cert_check' 			=> 'turnOffCertCheck',
-			'ldap_configuration_active' 		=> 'ldapConfigurationActive',
-			'ldap_attributes_for_user_search' 	=> 'ldapAttributesForUserSearch',
-			'ldap_attributes_for_group_search'	=> 'ldapAttributesForGroupSearch',
-			'ldap_expert_username_attr' 		=> 'ldapExpertUsernameAttr',
-			'ldap_expert_uuid_user_attr' 		=> 'ldapExpertUUIDUserAttr',
-			'ldap_expert_uuid_group_attr'		=> 'ldapExpertUUIDGroupAttr',
-			'has_memberof_filter_support'		=> 'hasMemberOfFilterSupport',
-			'last_jpegPhoto_lookup'				=> 'lastJpegPhotoLookup',
+			'ldap_host'                         => 'ldapHost',
+			'ldap_port'                         => 'ldapPort',
+			'ldap_backup_host'                  => 'ldapBackupHost',
+			'ldap_backup_port'                  => 'ldapBackupPort',
+			'ldap_override_main_server'         => 'ldapOverrideMainServer',
+			'ldap_dn'                           => 'ldapAgentName',
+			'ldap_agent_password'               => 'ldapAgentPassword',
+			'ldap_base'                         => 'ldapBase',
+			'ldap_base_users'                   => 'ldapBaseUsers',
+			'ldap_base_groups'                  => 'ldapBaseGroups',
+			'ldap_userfilter_objectclass'       => 'ldapUserFilterObjectclass',
+			'ldap_userfilter_groups'            => 'ldapUserFilterGroups',
+			'ldap_userlist_filter'              => 'ldapUserFilter',
+			'ldap_user_filter_mode'             => 'ldapUserFilterMode',
+			'ldap_login_filter'                 => 'ldapLoginFilter',
+			'ldap_login_filter_mode'            => 'ldapLoginFilterMode',
+			'ldap_loginfilter_email'            => 'ldapLoginFilterEmail',
+			'ldap_loginfilter_username'         => 'ldapLoginFilterUsername',
+			'ldap_loginfilter_attributes'       => 'ldapLoginFilterAttributes',
+			'ldap_group_filter'                 => 'ldapGroupFilter',
+			'ldap_group_filter_mode'            => 'ldapGroupFilterMode',
+			'ldap_groupfilter_objectclass'      => 'ldapGroupFilterObjectclass',
+			'ldap_groupfilter_groups'           => 'ldapGroupFilterGroups',
+			'ldap_display_name'                 => 'ldapUserDisplayName',
+			'ldap_group_display_name'           => 'ldapGroupDisplayName',
+			'ldap_tls'                          => 'ldapTLS',
+			'ldap_nocase'                       => 'ldapNoCase',
+			'ldap_quota_def'                    => 'ldapQuotaDefault',
+			'ldap_quota_attr'                   => 'ldapQuotaAttribute',
+			'ldap_email_attr'                   => 'ldapEmailAttribute',
+			'ldap_group_member_assoc_attribute' => 'ldapGroupMemberAssocAttr',
+			'ldap_cache_ttl'                    => 'ldapCacheTTL',
+			'home_folder_naming_rule'           => 'homeFolderNamingRule',
+			'ldap_turn_off_cert_check'          => 'turnOffCertCheck',
+			'ldap_configuration_active'         => 'ldapConfigurationActive',
+			'ldap_attributes_for_user_search'   => 'ldapAttributesForUserSearch',
+			'ldap_attributes_for_group_search'  => 'ldapAttributesForGroupSearch',
+			'ldap_expert_username_attr'         => 'ldapExpertUsernameAttr',
+			'ldap_expert_uuid_user_attr'        => 'ldapExpertUUIDUserAttr',
+			'ldap_expert_uuid_group_attr'       => 'ldapExpertUUIDGroupAttr',
+			'has_memberof_filter_support'       => 'hasMemberOfFilterSupport',
+			'last_jpegPhoto_lookup'             => 'lastJpegPhotoLookup',
 			'ldap_nested_groups'                => 'ldapNestedGroups',
 			'ldap_paging_size'                  => 'ldapPagingSize',
 			'ldap_experienced_admin'            => 'ldapExperiencedAdmin'
-- 
GitLab


From bb424802c8f6e8fd0e7fbe28e000400a5b0660f3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 8 Oct 2014 15:09:02 +0200
Subject: [PATCH 039/616] Prevent button click when enter key is pressed in
 LDAP wizard

Pressing enter in the LDAP wizard will trigger a click on the first
button. In the main page it would trigger the delete dialog, which is
quite inconvenient.

Added a type attribute to suppress this behavior.
---
 apps/user_ldap/templates/part.settingcontrols.php | 2 +-
 apps/user_ldap/templates/part.wizard-server.php   | 2 +-
 apps/user_ldap/templates/settings.php             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index ddf65e8a754..bcccb59a7dd 100644
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -1,6 +1,6 @@
 <div class="ldapSettingControls">
 	<input class="ldap_submit" value="<?php p($l->t('Save'));?>" type="submit">
-	<button class="ldap_action_test_connection" name="ldap_action_test_connection">
+	<button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection">
 		<?php p($l->t('Test Configuration'));?>
 	</button>
 	<a href="<?php p(\OC_Helper::linkToDocs('admin-ldap')); ?>"
diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 422faad028b..bee2b874178 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -24,7 +24,7 @@
 		?>
 		<option value="NEW"><?php p($l->t('Add Server Configuration'));?></option>
 		</select>
-		<button id="ldap_action_delete_configuration"
+		<button type="button" id="ldap_action_delete_configuration"
 			name="ldap_action_delete_configuration"><?php p($l->t('Delete Configuration'));?></button>
 		</p>
 
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 38043fb34a8..6a02b795258 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -59,7 +59,7 @@
 		<p class="ldapIndent"><label for="ldap_expert_uuid_group_attr"><?php p($l->t('UUID Attribute for Groups:'));?></label><input type="text" id="ldap_expert_uuid_group_attr" name="ldap_expert_uuid_group_attr" data-default="<?php p($_['ldap_expert_uuid_group_attr_default']); ?>" /></p>
 		<p><strong><?php p($l->t('Username-LDAP User Mapping'));?></strong></p>
 		<p class="ldapIndent"><?php p($l->t('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.'));?></p>
-		<p class="ldapIndent"><button id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p>
+		<p class="ldapIndent"><button type="button" id="ldap_action_clear_user_mappings" name="ldap_action_clear_user_mappings"><?php p($l->t('Clear Username-LDAP User Mapping'));?></button><br/><button type="button" id="ldap_action_clear_group_mappings" name="ldap_action_clear_group_mappings"><?php p($l->t('Clear Groupname-LDAP Group Mapping'));?></button></p>
 		<?php print_unescaped($_['settingControls']); ?>
 	</fieldset>
 	</div>
-- 
GitLab


From 02985c9ec5bb4c9f79754ac696d6aec12722436d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 8 Oct 2014 16:20:52 +0200
Subject: [PATCH 040/616] smaller corrections to make scruitinizer happier, no
 effective changes

---
 apps/user_ldap/js/experiencedAdmin.js | 14 ++++++++------
 apps/user_ldap/js/ldapFilter.js       | 11 ++++++-----
 apps/user_ldap/js/settings.js         |  4 ++--
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js
index bd674a37d6c..fac8dd6470f 100644
--- a/apps/user_ldap/js/experiencedAdmin.js
+++ b/apps/user_ldap/js/experiencedAdmin.js
@@ -4,6 +4,8 @@
  * See the COPYING-README file.
  */
 
+/* global LdapWizard */
+
 /**
  * controls behaviour depend on whether the admin is experienced in LDAP or not.
  *
@@ -48,26 +50,26 @@ ExperiencedAdmin.prototype.isExperienced = function() {
  * switches all LDAP filters from Assisted to Raw mode.
  */
 ExperiencedAdmin.prototype.enableRawMode = function() {
-	containers = {
+	var containers = {
 		'toggleRawGroupFilter': '#rawGroupFilterContainer',
 		'toggleRawLoginFilter': '#rawLoginFilterContainer',
 		'toggleRawUserFilter' : '#rawUserFilterContainer'
 	};
 
-	for(method in containers) {
+	for(var method in containers) {
 		if($(containers[method]).hasClass('invisible')) {
 			this.wizard[method]();
 		}
-	};
+	}
 };
 
 ExperiencedAdmin.prototype.updateUserTab = function(mode) {
 	this._updateTab(mode, $('#ldap_user_count'));
-}
+};
 
 ExperiencedAdmin.prototype.updateGroupTab = function(mode) {
 	this._updateTab(mode, $('#ldap_group_count'));
-}
+};
 
 ExperiencedAdmin.prototype._updateTab = function(mode, $countEl) {
 	if(mode === LdapWizard.filterModeAssisted) {
@@ -77,7 +79,7 @@ ExperiencedAdmin.prototype._updateTab = function(mode, $countEl) {
 	} else {
 		$countEl.addClass('hidden');
 	}
-}
+};
 
 /**
  * hide user and group counters, they will be displayed on demand only
diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 2d3ca8b3691..5b93d81f371 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -1,6 +1,6 @@
 /* global LdapWizard */
 
-function LdapFilter(target, determineModeCallback)  {
+function LdapFilter(target, determineModeCallback) {
 	this.locked = true;
 	this.target = false;
 	this.mode = LdapWizard.filterModeAssisted;
@@ -14,7 +14,7 @@ function LdapFilter(target, determineModeCallback)  {
 		target === 'Group') {
 		this.target = target;
 	}
-}
+};
 
 LdapFilter.prototype.activate = function() {
 	if(this.activated) {
@@ -23,7 +23,7 @@ LdapFilter.prototype.activate = function() {
 	this.activated = true;
 
 	this.determineMode();
-}
+};
 
 LdapFilter.prototype.compose = function(callback) {
 	var action;
@@ -111,11 +111,11 @@ LdapFilter.prototype.setMode = function(mode) {
 	if(mode === LdapWizard.filterModeAssisted || mode === LdapWizard.filterModeRaw) {
 		this.mode = mode;
 	}
-}
+};
 
 LdapFilter.prototype.getMode = function() {
 	return this.mode;
-}
+};
 
 LdapFilter.prototype.unlock = function() {
 	this.locked = false;
@@ -129,6 +129,7 @@ LdapFilter.prototype.findFeatures = function() {
 	//TODO: reset this.foundFeatures when any base DN changes
 	if(!this.foundFeatures && !this.locked && this.mode === LdapWizard.filterModeAssisted) {
 		this.foundFeatures = true;
+		var objcEl, avgrEl;
 		if(this.target === 'User') {
 			objcEl = 'ldap_userfilter_objectclass';
 			avgrEl = 'ldap_userfilter_groups';
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 04b4b91d1f1..f5b8081497f 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -694,8 +694,8 @@ var LdapWizard = {
 			values = values + "\n" + resultObj[i].value;
 		}
 		LdapWizard._save($('#'+originalObj)[0], $.trim(values));
-		if(originalObj == 'ldap_userfilter_objectclass'
-		   || originalObj == 'ldap_userfilter_groups') {
+		if(originalObj === 'ldap_userfilter_objectclass'
+		   || originalObj === 'ldap_userfilter_groups') {
 			LdapWizard.userFilter.compose(LdapWizard.detectEmailAttribute);
 			//when user filter is changed afterwards, login filter needs to
 			//be adjusted, too
-- 
GitLab


From 48980fbc460f76ddeb1cfeb6d801213f7c63f7f2 Mon Sep 17 00:00:00 2001
From: MTRichards <matt@owncloud.com>
Date: Wed, 8 Oct 2014 20:44:09 -0400
Subject: [PATCH 041/616] Updated info.xml with description

Updated the description of the app for the app panel.
---
 apps/user_ldap/appinfo/info.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 34a711a906f..2b069d14e3d 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -2,10 +2,10 @@
 <info>
 	<id>user_ldap</id>
 	<name>LDAP user and group backend</name>
-	<description>Authenticate users and groups through LDAP, such as OpenLDAP
-	    or Active Directory.
+	<description>This application enables administrators to connect ownCloud to an LDAP-based user directory for authentication and provisioning users, groups and user attributes. Admins can configure this application to connect to one or more LDAP directories or Active Directories via an LDAP interface. Attributes such as user quota, email, avatar pictures, group memberships and more can be pulled into ownCloud from a directory with the appropriate queries and filters.
+
+A user logs into ownCloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. ownCloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then ownCloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation.
 
-		This app is not compatible with the WebDAV user backend.
 	</description>
 	<licence>AGPL</licence>
 	<author>Dominik Schmidt and Arthur Schiwon</author>
-- 
GitLab


From d532683e20316ef6773d479aa5f577aff045efe5 Mon Sep 17 00:00:00 2001
From: MTRichards <matt@owncloud.com>
Date: Wed, 8 Oct 2014 20:48:00 -0400
Subject: [PATCH 042/616] Updated info.xml app description

Added new app description
Removed links to CE documentation
---
 apps/files_encryption/appinfo/info.xml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 2208cc73483..62596087db8 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -2,14 +2,16 @@
 <info>
 	<id>files_encryption</id>
 	<name>Server-side Encryption</name>
-	<description>This app encrypts and decrypts your data on the server. This means that a malicious administrator could intercept your data or encryption keys. The main purpose of server-side encryption is to encrypt files stored on externally mounted storages. The administrator of the external storage will not be able to access your encryption keys or your unencrypted data. Before you activate the app, please read up on encryption in the User and Administrator Manual</description>
+	<description>
+	This application encrypts all files accessed by ownCloud at rest, wherever they are stored. As an example, with this application enabled, external cloud based Amazon S3 storage will be encrypted, protecting this data on storage outside of the control of the Admin. When this application is enabled for the first time, all files are encrypted as users log in and are prompted for their password. The recommended recovery key option enables recovery of files in case the key is lost. 
+	Note that this app encrypts all files that are touched by ownCloud, so external storage providers and applications such as SharePoint will see new files encrypted when they are accessed. Encryption is based on AES 128 or 256 bit keys. More information is available in the Encryption documentation 
+	</description>
 	<licence>AGPL</licence>
 	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
 	<requiremin>4</requiremin>
 	<shipped>true</shipped>
 	<documentation>
-		<user>http://doc.owncloud.org/server/7.0/user_manual/files/encryption.html</user>
-		<admin>http://doc.owncloud.org/server/7.0/admin_manual/configuration/configuration_encryption.html</admin>
+
 	</documentation>
 	<rememberlogin>false</rememberlogin>
 	<types>
-- 
GitLab


From fc0ae29be50c3e35d5db9abf5b4c08c22c8d87d3 Mon Sep 17 00:00:00 2001
From: MTRichards <matt@owncloud.com>
Date: Wed, 8 Oct 2014 20:49:22 -0400
Subject: [PATCH 043/616] Updated info.xml app description

Added larger app description
---
 apps/files_external/appinfo/info.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index b8bada8e743..ee572561e7c 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -2,7 +2,11 @@
 <info>
 	<id>files_external</id>
 	<name>External storage support</name>
-	<description>Mount external storage sources</description>
+	<description>
+	This application enables administrators to configure connections to external storage  provides, such as FTP servers, S3 or SWIFT object stores, Google Drive, Dropbox, other ownCloud servers, WebDAV servers and more. Administrators can choose in the GUI which type of storage to enable, and can mount these storage locations for a user, a group, or the entire system. Users will see a new folder appear in their root ownCloud directory, and then can then access and use it like any other ownCloud folder. External Storage also allows users to share files stored in these external location. In these cases, the credentials for the owner of the file are used then the recipient requests the file from external storage, thereby ensuring that the recipient can get at the file that was shared. 
+	
+	In addition to the GUI, it is possible to configure external storage manually at the command line. This option provides the advanced user with more flexibility for configuring bulk external storage mounts, as well as setting mount priorities. More information is available in the External Storage GUI documentation and the External Storage Configuration File documentation.
+	</description>
 	<licence>AGPL</licence>
 	<author>Robin Appelman, Michael Gapczynski, Vincent Petry</author>
 	<requiremin>4.93</requiremin>
-- 
GitLab


From 3a2d50b76f07211cca69154f065bb871d6ec7d88 Mon Sep 17 00:00:00 2001
From: MTRichards <matt@owncloud.com>
Date: Wed, 8 Oct 2014 21:07:12 -0400
Subject: [PATCH 044/616] Updated info.xml app description

Made app description paralell in structure to other app descriptions
---
 apps/files_trashbin/appinfo/info.xml | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index 41b14c21a06..35b3e5bc4be 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -3,18 +3,9 @@
 	<id>files_trashbin</id>
 	<name>Deleted files</name>
 	<description>
-	ownCloud keeps a copy of your deleted files in case you need them again. 
-	To make sure that the user doesn't run out of memory the deleted files app
-	manages the size of the deleted files for the user. By default deleted files
-	stay in the trash bin for 90 days. ownCloud checks the age of the files
-	every time a new files gets moved to the deleted files and remove all files
-	older than 180 days. The user can adjust this value in the config.php by
-	setting the "trashbin_retention_obligation" value.
+This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to their ownCloud file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.
+To prevent a user from running out of disk space, the ownCloud Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, ownCloud deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation 
 
-	Beside that the delted files app take care to never use more that 50% of
-	your currently available free space. If your deleted files exceed this limit
-	ownCloud deletes the oldest versions until it meets the memory usage limit
-	again.
 	</description>
 	<licence>AGPL</licence>
 	<author>Bjoern Schiessle</author>
-- 
GitLab


From 511ad6e1069b94c930ea412865cb14cb8f73c8f2 Mon Sep 17 00:00:00 2001
From: MTRichards <matt@owncloud.com>
Date: Wed, 8 Oct 2014 21:08:20 -0400
Subject: [PATCH 045/616] Forgot a '.'

---
 apps/files_trashbin/appinfo/info.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index 35b3e5bc4be..f15056908f1 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -4,7 +4,7 @@
 	<name>Deleted files</name>
 	<description>
 This application enables users to restore files that were deleted from the system. It displays a list of deleted files in the web interface, and has options to restore those deleted files back to their ownCloud file directories or remove them permanently from the system. Restoring a file also restores related file versions, if the versions application is enabled. When a file is deleted from a share, it can be restored in the same manner, though it is no longer shared. By default, these files remain in the trash bin for 30 days.
-To prevent a user from running out of disk space, the ownCloud Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, ownCloud deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation 
+To prevent a user from running out of disk space, the ownCloud Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, ownCloud deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation.
 
 	</description>
 	<licence>AGPL</licence>
-- 
GitLab


From f5119778325419eeeb59caf8b269674b451d4d9a Mon Sep 17 00:00:00 2001
From: MTRichards <matt@owncloud.com>
Date: Wed, 8 Oct 2014 21:24:54 -0400
Subject: [PATCH 046/616] Updated info.xml app description

Added updates description
---
 apps/files_sharing/appinfo/info.xml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index c32a24ecd29..d6f7e4b1320 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -2,7 +2,11 @@
 <info>
 	<id>files_sharing</id>
 	<name>Share Files</name>
-	<description>File sharing between users</description>
+	<description>
+		This application enables users to share files within ownCloud. If enabled, the admin can choose which groups can share files. The applicable users can then share files and folders with other users and groups within ownCloud. In addition, if the admin enables the share link feature, an external link can be used to share files with other users outside of ownCloud. Admins can also enforce passwords, expirations dates, and enable server to server sharing via share links, as well as sharing from mobile devices.
+Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the ownCloud Documentation.
+
+	</description>
 	<licence>AGPL</licence>
 	<author>Michael Gapczynski, Bjoern Schiessle</author>
 	<requiremin>4.93</requiremin>
-- 
GitLab


From c7f936cdcb368de9ab0b6d4d2df11f0a3be6b93d Mon Sep 17 00:00:00 2001
From: MTRichards <matt@owncloud.com>
Date: Wed, 8 Oct 2014 21:27:40 -0400
Subject: [PATCH 047/616] Updated info.xml with

Added description in line with other apps.
---
 apps/files_versions/appinfo/info.xml | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index d16c1bd1a24..605ef5ccc37 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -7,23 +7,9 @@
 	<requiremin>4.93</requiremin>
 	<shipped>true</shipped>
 	<description>
-	ownCloud supports simple version control for files.	The versioning app
-	expires old versions automatically to make sure that
-	the user doesn't run out of space. The following pattern is used to delete
-	old versions:
-	For the first 10 seconds ownCloud keeps one version every 2 seconds;
-	For the first hour ownCloud keeps one version every minute;
-	For the first 24 hours ownCloud keeps one version every hour;
-	For the first 30 days ownCloud keeps one version every day;
-	After the first 30 days ownCloud keeps one version every week.
+	This application enables ownCloud to automatically maintain older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user’s directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. ownCloud then automatically manages the versions folder to ensure the user doesn’t run out of Quota because of versions.
+In addition to the expiry of versions, ownCloud’s versions app makes certain never to use more than 50% of the user’s currently available free space. If stored versions exceed this limit, ownCloud will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation. 
 
-	The versions are adjusted along this pattern every time a new version gets
-	created.
-
-	Beside that the version app takes care to never use more that 50% of the users
-	currently available free space. If the stored versions exceed this limit
-	ownCloud deletes the oldest versions until it meets the memory usage limit
-	again.
 	</description>
 	<types>
 		<filesystem/>
-- 
GitLab


From 295c46ccb5ed9f43da2326d8a15c06d4e305a377 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 9 Oct 2014 01:55:33 -0400
Subject: [PATCH 048/616] [tx-robot] updated from transifex

---
 apps/files/l10n/fr.php               |  2 +-
 apps/files_encryption/l10n/ar.php    |  9 ++--
 apps/files_encryption/l10n/ast.php   |  9 ++--
 apps/files_encryption/l10n/az.php    |  3 +-
 apps/files_encryption/l10n/bg_BG.php |  9 ++--
 apps/files_encryption/l10n/ca.php    |  9 ++--
 apps/files_encryption/l10n/cs_CZ.php |  9 ++--
 apps/files_encryption/l10n/da.php    |  9 ++--
 apps/files_encryption/l10n/de.php    |  9 ++--
 apps/files_encryption/l10n/de_CH.php |  9 ++--
 apps/files_encryption/l10n/de_DE.php |  9 ++--
 apps/files_encryption/l10n/el.php    |  9 ++--
 apps/files_encryption/l10n/en_GB.php |  9 ++--
 apps/files_encryption/l10n/es.php    |  9 ++--
 apps/files_encryption/l10n/es_AR.php |  9 ++--
 apps/files_encryption/l10n/es_MX.php |  9 ++--
 apps/files_encryption/l10n/et_EE.php |  9 ++--
 apps/files_encryption/l10n/eu.php    |  9 ++--
 apps/files_encryption/l10n/fa.php    |  9 ++--
 apps/files_encryption/l10n/fi_FI.php |  5 +-
 apps/files_encryption/l10n/fr.php    |  9 ++--
 apps/files_encryption/l10n/gl.php    |  9 ++--
 apps/files_encryption/l10n/hr.php    |  9 ++--
 apps/files_encryption/l10n/hu_HU.php |  9 ++--
 apps/files_encryption/l10n/id.php    |  9 ++--
 apps/files_encryption/l10n/it.php    |  9 ++--
 apps/files_encryption/l10n/ja.php    |  9 ++--
 apps/files_encryption/l10n/ko.php    |  9 ++--
 apps/files_encryption/l10n/lt_LT.php |  9 ++--
 apps/files_encryption/l10n/nb_NO.php |  9 ++--
 apps/files_encryption/l10n/nl.php    |  9 ++--
 apps/files_encryption/l10n/pl.php    |  9 ++--
 apps/files_encryption/l10n/pt_BR.php |  9 ++--
 apps/files_encryption/l10n/pt_PT.php |  9 ++--
 apps/files_encryption/l10n/ro.php    |  9 ++--
 apps/files_encryption/l10n/ru.php    |  9 ++--
 apps/files_encryption/l10n/sk_SK.php |  9 ++--
 apps/files_encryption/l10n/sl.php    |  9 ++--
 apps/files_encryption/l10n/sv.php    |  9 ++--
 apps/files_encryption/l10n/tr.php    |  9 ++--
 apps/files_encryption/l10n/vi.php    |  9 ++--
 apps/files_encryption/l10n/zh_CN.php |  9 ++--
 apps/files_encryption/l10n/zh_TW.php |  9 ++--
 core/l10n/fr.php                     |  2 +-
 l10n/templates/core.pot              |  2 +-
 l10n/templates/files.pot             |  8 +--
 l10n/templates/files_encryption.pot  | 80 ++++++++++++++++++----------
 l10n/templates/files_external.pot    |  2 +-
 l10n/templates/files_sharing.pot     |  2 +-
 l10n/templates/files_trashbin.pot    |  2 +-
 l10n/templates/files_versions.pot    |  2 +-
 l10n/templates/lib.pot               |  2 +-
 l10n/templates/private.pot           |  2 +-
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/templates/user_webdavauth.pot   |  2 +-
 lib/l10n/af_ZA.php                   |  1 +
 lib/l10n/fr.php                      |  2 +-
 58 files changed, 234 insertions(+), 249 deletions(-)

diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 31e39b419b5..9a94174a617 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -91,6 +91,6 @@ $TRANSLATIONS = array(
 "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 permise par ce serveur.",
 "Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
-"Currently scanning" => "Analyse en cours de traitement"
+"Currently scanning" => "Analyse en cours"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index 1e3b4aaec4f..d73b87da816 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+"Recovery key successfully disabled" => "تم تعطيل مفتاح الاستعادة بنجاح",
 "Password successfully changed." => "تم تغيير كلمة المرور بنجاح.",
 "Could not change the password. Maybe the old password was not correct." => "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
 "Private key password successfully updated." => "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
 "Could not update the private key password. Maybe the old password was not correct." => "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+"File recovery settings updated" => "اعدادات ملف الاستعادة تم تحديثه",
+"Could not update file recovery" => "تعذر تحديث ملف الاستعادة",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "مفتاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور في الاعدادات الشخصية لإستعادة الوصول الى ملفاتك المشفرة.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
@@ -35,8 +36,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "كلمة المرور الحالية الخاصة بالدخول",
 "Update Private Key Password" => "تحديث كلمة المرور لـ المفتاح الخاص",
 "Enable password recovery:" => "تفعيل استعادة كلمة المرور:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور",
-"File recovery settings updated" => "اعدادات ملف الاستعادة تم تحديثه",
-"Could not update file recovery" => "تعذر تحديث ملف الاستعادة"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور"
 );
 $PLURAL_FORMS = "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_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php
index abc41b36f37..0c037c67c59 100644
--- a/apps/files_encryption/l10n/ast.php
+++ b/apps/files_encryption/l10n/ast.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Habilitóse la recuperación de ficheros",
-"Could not enable recovery key. Please check your recovery key password!" => "Nun pudo habilitase la clave de recuperación. Por favor comprueba la contraseña.",
-"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
 "Could not disable recovery key. Please check your recovery key password!" => "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
 "Password successfully changed." => "Camudóse la contraseña",
 "Could not change the password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
 "Private key password successfully updated." => "Contraseña de clave privada anovada correchamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.",
+"File recovery settings updated" => "Opciones de recuperación de ficheros anovada",
+"Could not update file recovery" => "Nun pudo anovase la recuperación de ficheros",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.",
 "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.",
@@ -36,8 +37,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Contraseña d'accesu actual",
 "Update Private Key Password" => "Anovar Contraseña de Clave Privada",
 "Enable password recovery:" => "Habilitar la recuperación de contraseña:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña",
-"File recovery settings updated" => "Opciones de recuperación de ficheros anovada",
-"Could not update file recovery" => "Nun pudo anovase la recuperación de ficheros"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/az.php b/apps/files_encryption/l10n/az.php
index 887bf07565c..8a9993ad40f 100644
--- a/apps/files_encryption/l10n/az.php
+++ b/apps/files_encryption/l10n/az.php
@@ -1,9 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Bərpa açarı uğurla aktivləşdi",
-"Could not enable recovery key. Please check your recovery key password!" => "Geriqaytarılma açarının aktivləşdirilməsi mümkün olmadı. Xahiş olunur geriqaytarılma açarı üçün tələb edilən şifrəni yoxlayasınız.",
-"Recovery key successfully disabled" => "Bərpa açarı uğurla söndürüldü",
 "Could not disable recovery key. Please check your recovery key password!" => "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
+"Recovery key successfully disabled" => "Bərpa açarı uğurla söndürüldü",
 "Password successfully changed." => "Şifrə uğurla dəyişdirildi.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sizin gizli açarınız doğru deyil! Təxmin edilir ki, sizin şifrə %s-dən kənarda dəyişdirilib(misal üçün sizin koorporativ qovluq). Siz öz şifrələnmiş fayllarınıza yetkinizi bərpa etmək üçün, öz şifrənizi şəxsi quraşdırmalarınızda yeniləyə bilərsiniz.",
 "Unknown error. Please check your system settings or contact your administrator" => "Tanınmayan səhv. Xahiş olunur sistem quraşdırmalarınızı yoxlayın yada öz inzibatçınızla əlaqə yaradın",
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index fc6b40de0a8..46d1519e74b 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
+"Recovery key successfully disabled" => "Успешно изключване на ключа за възстановяване.",
 "Password successfully changed." => "Паролата е успешно променена.",
 "Could not change the password. Maybe the old password was not correct." => "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
 "Private key password successfully updated." => "Успешно променена тайната парола за ключа.",
 "Could not update the private key password. Maybe the old password was not correct." => "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.",
+"File recovery settings updated" => "Настройките за възстановяване на файлове са променени.",
+"Could not update file recovery" => "Неуспешна промяна на настройките за възстановяване на файлове.",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Текуща парола за вписване",
 "Update Private Key Password" => "Промени Тайната Парола за Ключа",
 "Enable password recovery:" => "Включи опцията възстановяване на паролата:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола.",
-"File recovery settings updated" => "Настройките за възстановяване на файлове са променени.",
-"Could not update file recovery" => "Неуспешна промяна на настройките за възстановяване на файлове."
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index c3eb258a4d8..f83fdd215c0 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "La clau de recuperació s'ha activat",
-"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ó!",
+"Recovery key successfully disabled" => "La clau de recuperació s'ha descativat",
 "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.",
 "Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
+"File recovery settings updated" => "S'han  actualitzat els arranjaments de recuperació de fitxers",
+"Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'aplicació d'encriptació  no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Contrasenya d'accés actual",
 "Update Private Key Password" => "Actualitza la contrasenya de clau privada",
 "Enable password recovery:" => "Habilita la recuperació de contrasenya:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya",
-"File recovery settings updated" => "S'han  actualitzat els arranjaments de recuperació de fitxers",
-"Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 0b3e1c48bee..115e1553566 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Záchranný klíč byl úspěšně povolen",
-"Could not enable recovery key. Please check your recovery key password!" => "Nepodařilo se povolit záchranný klíč. Zkontrolujte prosím vaše heslo záchranného klíče!",
-"Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
 "Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
+"Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
 "Password successfully changed." => "Heslo bylo úspěšně změněno.",
 "Could not change the password. Maybe the old password was not correct." => "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
 "Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
+"File recovery settings updated" => "Možnosti záchrany souborů aktualizovány",
+"Could not update file recovery" => "Nelze nastavit záchranu souborů",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno vně systému %s (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Aktuální přihlašovací heslo",
 "Update Private Key Password" => "Změnit heslo soukromého klíče",
 "Enable password recovery:" => "Povolit obnovu hesla:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo",
-"File recovery settings updated" => "Možnosti záchrany souborů aktualizovány",
-"Could not update file recovery" => "Nelze nastavit záchranu souborů"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index dc2cf9e2475..b3ff68ecfad 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Gendannelsesnøgle aktiveret med succes",
-"Could not enable recovery key. Please check your recovery key password!" => "Kunne ikke aktivere gendannelsesnøgle. Kontroller venligst dit gendannelsesnøgle kodeord!",
-"Recovery key successfully disabled" => "Gendannelsesnøgle deaktiveret succesfuldt",
 "Could not disable recovery key. Please check your recovery key password!" => "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
+"Recovery key successfully disabled" => "Gendannelsesnøgle deaktiveret succesfuldt",
 "Password successfully changed." => "Kodeordet blev ændret succesfuldt",
 "Could not change the password. Maybe the old password was not correct." => "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
 "Private key password successfully updated." => "Privat nøgle kodeord succesfuldt opdateret.",
 "Could not update the private key password. Maybe the old password was not correct." => "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
+"File recovery settings updated" => "Filgendannelsesindstillinger opdateret",
+"Could not update file recovery" => "Kunne ikke opdatere filgendannelse",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
 "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 felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Nuvrende login kodeord",
 "Update Private Key Password" => "Opdater Privat Nøgle Kodeord",
 "Enable password recovery:" => "Aktiver kodeord gendannelse:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord",
-"File recovery settings updated" => "Filgendannelsesindstillinger opdateret",
-"Could not update file recovery" => "Kunne ikke opdatere filgendannelse"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 392a66393a9..44277f2bf89 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
-"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
-"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
 "Password successfully changed." => "Dein Passwort wurde geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
 "Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
 "Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
+"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
+"Could not update file recovery" => "Dateiwiederherstellung konnte nicht aktualisiert werden",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Aktuelles Passwort",
 "Update Private Key Password" => "Passwort für den privaten Schlüssel aktualisieren",
 "Enable password recovery:" => "Passwortwiederherstellung aktivieren:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst",
-"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
-"Could not update file recovery" => "Dateiwiederherstellung konnte nicht aktualisiert werden"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de_CH.php b/apps/files_encryption/l10n/de_CH.php
index 67abceee267..2c5b51a2da7 100644
--- a/apps/files_encryption/l10n/de_CH.php
+++ b/apps/files_encryption/l10n/de_CH.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
-"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
-"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
 "Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
 "Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
 "Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
 "Missing requirements." => "Fehlende Voraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
@@ -25,8 +26,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Momentanes Login-Passwort",
 "Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
 "Enable password recovery:" => "Die Passwort-Wiederherstellung aktivieren:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
-"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
-"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 85470cd8abf..3fc71671ae1 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
-"Could not enable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht aktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
-"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
 "Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
 "Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
 "Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Datei-Besitzer, dass er die Datei nochmals mit Ihnen teilt.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Momentanes Login-Passwort",
 "Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
 "Enable password recovery:" => "Die Passwort-Wiederherstellung aktivieren:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben.",
-"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
-"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden."
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index c208b25ebad..ad9091e2d5b 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
+"Recovery key successfully disabled" => "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
 "Password successfully changed." => "Ο κωδικός αλλάχτηκε επιτυχώς.",
 "Could not change the password. Maybe the old password was not correct." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
 "Private key password successfully updated." => "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
 "Could not update the private key password. Maybe the old password was not correct." => "Αποτυχία ενημέρωσης του κωδικού για το προσωπικό κλειδί. Ενδεχομένως ο παλιός κωδικός δεν ήταν σωστός.",
+"File recovery settings updated" => "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
+"Could not update file recovery" => "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Το προσωπικό σας κλειδί δεν είναι έγκυρο! Πιθανόν ο κωδικός σας να άλλαξε έξω από το %s (π.χ. τη λίστα διευθύνσεων της εταιρείας σας). Μπορείτε να ενημερώσετε το προσωπικό σας κλειδί επαναφοράς κωδικού στις προσωπικές σας ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Τρέχον συνθηματικό πρόσβασης",
 "Update Private Key Password" => "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
 "Enable password recovery:" => "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας",
-"File recovery settings updated" => "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
-"Could not update file recovery" => "Αποτυχία ενημέρωσης ανάκτησης αρχείων"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
index 21f69496183..a9bf8caf750 100644
--- a/apps/files_encryption/l10n/en_GB.php
+++ b/apps/files_encryption/l10n/en_GB.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Recovery key enabled successfully",
-"Could not enable recovery key. Please check your recovery key password!" => "Could not enable recovery key. Please check your recovery key password!",
-"Recovery key successfully disabled" => "Recovery key disabled successfully",
 "Could not disable recovery key. Please check your recovery key password!" => "Could not disable recovery key. Please check your recovery key password!",
+"Recovery key successfully disabled" => "Recovery key disabled successfully",
 "Password successfully changed." => "Password changed successfully.",
 "Could not change the password. Maybe the old password was not correct." => "Could not change the password. Maybe the old password was incorrect.",
 "Private key password successfully updated." => "Private key password updated successfully.",
 "Could not update the private key password. Maybe the old password was not correct." => "Could not update the private key password. Maybe the old password was not correct.",
+"File recovery settings updated" => "File recovery settings updated",
+"Could not update file recovery" => "Could not update file recovery",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Current login password",
 "Update Private Key Password" => "Update Private Key Password",
 "Enable password recovery:" => "Enable password recovery:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss",
-"File recovery settings updated" => "File recovery settings updated",
-"Could not update file recovery" => "Could not update file recovery"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 3c4f89a09ab..dcf2960583e 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
-"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
-"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
 "Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
 "Password successfully changed." => "Su contraseña ha sido cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
 "Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
+"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Contraseña de acceso actual",
 "Update Private Key Password" => "Actualizar Contraseña de Clave Privada",
 "Enable password recovery:" => "Habilitar la recuperación de contraseña:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña",
-"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
-"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index b32a76e1b39..ee68ff6b707 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Se habilitó la recuperación de archivos",
-"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor, comprobá tu contraseña.",
-"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
 "Could not disable recovery key. Please check your recovery key password!" => "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
 "Password successfully changed." => "Tu contraseña fue cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
 "Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
+"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
+"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.",
 "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.",
@@ -33,8 +34,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Contraseña actual",
 "Update Private Key Password" => "Actualizar contraseña de la clave privada",
 "Enable password recovery:" => "Habilitar recuperación de contraseña:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña",
-"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
-"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_MX.php b/apps/files_encryption/l10n/es_MX.php
index ddd9737a901..d678144de8d 100644
--- a/apps/files_encryption/l10n/es_MX.php
+++ b/apps/files_encryption/l10n/es_MX.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
-"Could not enable recovery key. Please check your recovery key password!" => "No se pudo habilitar la clave de recuperación. Por favor compruebe su contraseña.",
-"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
 "Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
 "Password successfully changed." => "Su contraseña ha sido cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
 "Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
+"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
 "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.",
@@ -32,8 +33,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Contraseña de acceso actual",
 "Update Private Key Password" => "Actualizar Contraseña de Clave Privada",
 "Enable password recovery:" => "Habilitar la recuperación de contraseña:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña",
-"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
-"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index bbf0ee4dca3..3f1df4cc306 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
-"Could not enable recovery key. Please check your recovery key password!" => "Ei suutnud lubada taastevõtit. Palun kontrolli oma taastevõtme parooli!",
-"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
 "Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
 "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.",
 "Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.",
 "Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
+"File recovery settings updated" => "Faili taaste seaded uuendatud",
+"Could not update file recovery" => "Ei suuda uuendada taastefaili",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Praegune sisselogimise parool",
 "Update Private Key Password" => "Uuenda privaatse võtme parooli",
 "Enable password recovery:" => "Luba parooli taaste:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul",
-"File recovery settings updated" => "Faili taaste seaded uuendatud",
-"Could not update file recovery" => "Ei suuda uuendada taastefaili"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 69de4a25b1b..41dddf6846f 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Berreskuratze gakoa behar bezala gaitua",
-"Could not enable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako gaitu. Egiaztatu berreskuratze gako pasahitza!",
-"Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
 "Could not disable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
+"Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
 "Password successfully changed." => "Pasahitza behar bezala aldatu da.",
 "Could not change the password. Maybe the old password was not correct." => "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
 "Private key password successfully updated." => "Gako pasahitz pribatu behar bezala eguneratu da.",
 "Could not update the private key password. Maybe the old password was not correct." => "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
+"File recovery settings updated" => "Fitxategi berreskuratze ezarpenak eguneratuak",
+"Could not update file recovery" => "Ezin da fitxategi berreskuratzea eguneratu",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Sartzeko oraingo pasahitza",
 "Update Private Key Password" => "Eguneratu gako pasahitza pribatua",
 "Enable password recovery:" => "Gaitu pasahitzaren berreskuratzea:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan",
-"File recovery settings updated" => "Fitxategi berreskuratze ezarpenak eguneratuak",
-"Could not update file recovery" => "Ezin da fitxategi berreskuratzea eguneratu"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 2c3a2261baa..54143f0df49 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
+"Recovery key successfully disabled" => "کلید بازیابی با موفقیت غیر فعال شده است.",
 "Password successfully changed." => "رمزعبور با موفقیت تغییر یافت.",
 "Could not change the password. Maybe the old password was not correct." => "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
 "Private key password successfully updated." => "رمزعبور کلید خصوصی با موفقیت به روز شد.",
 "Could not update the private key password. Maybe the old password was not correct." => "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
+"File recovery settings updated" => "تنظیمات بازیابی فایل به روز شده است.",
+"Could not update file recovery" => "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.",
 "Missing requirements." => "نیازمندی های گمشده",
 "Following users are not set up for encryption:" => "کاربران زیر برای رمزنگاری تنظیم نشده اند",
 "Encryption" => "رمزگذاری",
@@ -24,8 +25,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "رمزعبور فعلی",
 "Update Private Key Password" => "به روز رسانی رمزعبور کلید خصوصی",
 "Enable password recovery:" => "فعال سازی بازیابی رمزعبور:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید.",
-"File recovery settings updated" => "تنظیمات بازیابی فایل به روز شده است.",
-"Could not update file recovery" => "به روز رسانی بازیابی فایل را نمی تواند انجام دهد."
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 1b545da4dc5..338cdb457ad 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,10 +1,10 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Palautusavain kytketty päälle onnistuneesti",
-"Could not enable recovery key. Please check your recovery key password!" => "Palautusavaimen käyttöönotto epäonnistui. Tarkista palautusavaimesi salasana!",
 "Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
 "Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
 "Private key password successfully updated." => "Yksityisen avaimen salasana päivitetty onnistuneesti.",
+"File recovery settings updated" => "Tiedostopalautuksen asetukset päivitetty",
 "Unknown error. Please check your system settings or contact your administrator" => "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
 "Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
 "Initial encryption started... This can take some time. Please wait." => "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
@@ -26,7 +26,6 @@ $TRANSLATIONS = array(
 "Old log-in password" => "Vanha kirjautumis-salasana",
 "Current log-in password" => "Nykyinen kirjautumis-salasana",
 "Update Private Key Password" => "Päivitä yksityisen avaimen salasana",
-"Enable password recovery:" => "Ota salasanan palautus käyttöön:",
-"File recovery settings updated" => "Tiedostopalautuksen asetukset päivitetty"
+"Enable password recovery:" => "Ota salasanan palautus käyttöön:"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index c78f6aaabd6..a8ae53507c9 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Clé de récupération activée avec succès",
-"Could not enable recovery key. Please check your recovery key password!" => "Impossible d'activer la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
-"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
 "Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
+"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
 "Password successfully changed." => "Mot de passe changé avec succès ",
 "Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
 "Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
+"File recovery settings updated" => "Paramètres de récupération de fichiers mis à jour",
+"Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clef privée est invalide ! Votre mot de passe a probablement été modifié hors de %s (ex. votre annuaire d'entreprise). Vous pouvez mettre à jour le mot de passe de votre clef privée dans les paramètres personnels pour pouvoir récupérer l'accès à vos fichiers chiffrés.",
 "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 de ce fichier de le repartager avec vous.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Actuel mot de passe de connexion",
 "Update Private Key Password" => "Mettre à jour le mot de passe de votre clé privée",
 "Enable password recovery:" => "Activer la récupération du mot de passe :",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe",
-"File recovery settings updated" => "Paramètres de récupération de fichiers mis à jour",
-"Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index 7498d0728b8..b41396bc53f 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Activada satisfactoriamente a chave de recuperación",
-"Could not enable recovery key. Please check your recovery key password!" => "Non foi posíbel activar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
-"Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
 "Could not disable recovery key. Please check your recovery key password!" => "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+"Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
 "Password successfully changed." => "O contrasinal foi cambiado satisfactoriamente",
 "Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
 "Private key password successfully updated." => "A chave privada foi actualizada correctamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
+"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
+"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Non se iniciou a aplicación de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala para que tamén se inicie a aplicación de cifrado.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior do %s (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Contrasinal actual de acceso",
 "Update Private Key Password" => "Actualizar o contrasinal da chave privada",
 "Enable password recovery:" => "Activar o  contrasinal de recuperación:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal",
-"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
-"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/hr.php b/apps/files_encryption/l10n/hr.php
index a6a1f164b7f..6c26c63de90 100644
--- a/apps/files_encryption/l10n/hr.php
+++ b/apps/files_encryption/l10n/hr.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Ključ za oporavak uspješno aktiviran",
-"Could not enable recovery key. Please check your recovery key password!" => "Ključ za oporavak nije moguće aktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
-"Recovery key successfully disabled" => "Ključ za ooravak uspješno deaktiviran",
 "Could not disable recovery key. Please check your recovery key password!" => "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
+"Recovery key successfully disabled" => "Ključ za ooravak uspješno deaktiviran",
 "Password successfully changed." => "Lozinka uspješno promijenjena.",
 "Could not change the password. Maybe the old password was not correct." => "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
 "Private key password successfully updated." => "Lozinka privatnog ključa uspješno ažurirana.",
 "Could not update the private key password. Maybe the old password was not correct." => "Lozinku privatnog ključa nije moguće promijeniti. Možda stara je stara lozinka bila neispravna.",
+"File recovery settings updated" => "Ažurirane postavke za oporavak datoteke",
+"Could not update file recovery" => "Oporavak datoteke nije moguće ažurirati",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Vaš privatni ključ nije ispravan! Vjerojatno je vaša lozinka promijenjena izvan %s(npr. vašega korporativnog direktorija). Lozinku svoga privatnog ključa možete ažuriratiu svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Aktualna lozinka za prijavu",
 "Update Private Key Password" => "Ažurirajte lozinku privatnog ključa",
 "Enable password recovery:" => "Omogućite oporavak lozinke:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama",
-"File recovery settings updated" => "Ažurirane postavke za oporavak datoteke",
-"Could not update file recovery" => "Oporavak datoteke nije moguće ažurirati"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama"
 );
 $PLURAL_FORMS = "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_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 6cb781af49e..4cd3275a9df 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "A helyreállítási kulcs sikeresen bekapcsolva",
-"Could not enable recovery key. Please check your recovery key password!" => "A helyreállítási kulcsot nem lehetett engedélyezni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
-"Recovery key successfully disabled" => "A helyreállítási kulcs sikeresen kikapcsolva",
 "Could not disable recovery key. Please check your recovery key password!" => "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
+"Recovery key successfully disabled" => "A helyreállítási kulcs sikeresen kikapcsolva",
 "Password successfully changed." => "A jelszót sikeresen megváltoztattuk.",
 "Could not change the password. Maybe the old password was not correct." => "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
 "Private key password successfully updated." => "A személyes kulcsának jelszava frissítésre került.",
 "Could not update the private key password. Maybe the old password was not correct." => "A személyes kulcsa jelszavát nem lehetett frissíteni. Lehet, hogy hibás volt a régi jelszó.",
+"File recovery settings updated" => "A fájlhelyreállítási beállítások frissültek",
+"Could not update file recovery" => "A fájlhelyreállítás nem frissíthető",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can 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. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.",
 "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!",
@@ -33,8 +34,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Jelenlegi bejelentkezési jelszó",
 "Update Private Key Password" => "A személyest kulcs jelszó frissítése",
 "Enable password recovery:" => "Jelszó-visszaállítás bekapcsolása",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát",
-"File recovery settings updated" => "A fájlhelyreállítási beállítások frissültek",
-"Could not update file recovery" => "A fájlhelyreállítás nem frissíthető"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index 868b9cabfa1..aa948efcfc9 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Kunci pemulihan berhasil diaktifkan",
-"Could not enable recovery key. Please check your recovery key password!" => "Tidak dapat mengaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
-"Recovery key successfully disabled" => "Kunci pemulihan berhasil dinonaktifkan",
 "Could not disable recovery key. Please check your recovery key password!" => "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
+"Recovery key successfully disabled" => "Kunci pemulihan berhasil dinonaktifkan",
 "Password successfully changed." => "Sandi berhasil diubah",
 "Could not change the password. Maybe the old password was not correct." => "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
 "Private key password successfully updated." => "Sandi kunci privat berhasil diperbarui.",
 "Could not update the private key password. Maybe the old password was not correct." => "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
+"File recovery settings updated" => "Pengaturan pemulihan berkas diperbarui",
+"Could not update file recovery" => "Tidak dapat memperbarui pemulihan berkas",
 "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.",
 "Missing requirements." => "Persyaratan yang hilang.",
 "Following users are not set up for encryption:" => "Pengguna berikut belum diatur untuk enkripsi:",
@@ -29,8 +30,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Sandi masuk saat ini",
 "Update Private Key Password" => "Perbarui Sandi Kunci Privat",
 "Enable password recovery:" => "Aktifkan sandi pemulihan:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi",
-"File recovery settings updated" => "Pengaturan pemulihan berkas diperbarui",
-"Could not update file recovery" => "Tidak dapat memperbarui pemulihan berkas"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 01f31c8106d..819d0a42794 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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 ripristinata 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.",
+"Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
 "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.",
 "Private key password successfully updated." => "Password della chiave privata aggiornata correttamente.",
 "Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
+"File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
+"Could not update file recovery" => "Impossibile aggiornare il ripristino dei file",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Password di accesso attuale",
 "Update Private Key Password" => "Aggiorna la password della chiave privata",
 "Enable password recovery:" => "Abilita il ripristino della password:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password",
-"File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
-"Could not update file recovery" => "Impossibile aggiornare il ripristino dei file"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
index e9950b3ac97..a1b3bc2ae9f 100644
--- a/apps/files_encryption/l10n/ja.php
+++ b/apps/files_encryption/l10n/ja.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
+"Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
 "Password successfully changed." => "パスワードを変更できました。",
 "Could not change the password. Maybe the old password was not correct." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
 "Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
 "Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
+"File recovery settings updated" => "ファイルリカバリ設定を更新しました",
+"Could not update file recovery" => "ファイルリカバリを更新できませんでした",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "プライベートキーが有効ではありません！パスワードが%sの外部で変更された(例: 共同ディレクトリ)と思われます。個人設定でプライベートキーのパスワードを更新して、暗号化ファイルへのアクセスを回復することができます。",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "現在のログインパスワード",
 "Update Private Key Password" => "秘密鍵のパスワードを更新",
 "Enable password recovery:" => "パスワードリカバリを有効に:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。",
-"File recovery settings updated" => "ファイルリカバリ設定を更新しました",
-"Could not update file recovery" => "ファイルリカバリを更新できませんでした"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index f93c66bc4f2..2c32d0aea61 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해주세요!",
+"Recovery key successfully disabled" => "복구 키가 성공적으로 비활성화 되었습니다",
 "Password successfully changed." => "암호가 성공적으로 변경되었습니다",
 "Could not change the password. Maybe the old password was not correct." => "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
 "Private key password successfully updated." => "개인 키 암호가 성공적으로 업데이트 됨.",
 "Could not update the private key password. Maybe the old password was not correct." => "개인 키 암호를 업데이트할 수 없습니다. 이전 암호가 올바르지 않은 것 같습니다.",
+"File recovery settings updated" => "파일 복구 설정 업데이트됨",
+"Could not update file recovery" => "파일 복구를 업데이트할 수 없습니다",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "개인 키가 올바르지 않습니다! 암호가 %s(예: 회사 디렉터리) 외부에서 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
@@ -32,8 +33,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "현재 로그인 암호",
 "Update Private Key Password" => "개인 키 암호 업데이트",
 "Enable password recovery:" => "암호 복구 사용:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다",
-"File recovery settings updated" => "파일 복구 설정 업데이트됨",
-"Could not update file recovery" => "파일 복구를 업데이트할 수 없습니다"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index 1fdba43f9e7..d776abd2d70 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Atkūrimo raktas sėkmingai įjungtas",
-"Could not enable recovery key. Please check your recovery key password!" => "Neišėjo įjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
-"Recovery key successfully disabled" => "Atkūrimo raktas sėkmingai išjungtas",
 "Could not disable recovery key. Please check your recovery key password!" => "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+"Recovery key successfully disabled" => "Atkūrimo raktas sėkmingai išjungtas",
 "Password successfully changed." => "Slaptažodis sėkmingai pakeistas",
 "Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
 "Private key password successfully updated." => "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
+"File recovery settings updated" => "Failų atkūrimo nustatymai pakeisti",
+"Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
 "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ą.",
@@ -32,8 +33,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Dabartinis prisijungimo slaptažodis",
 "Update Private Key Password" => "Atnaujinti privataus rakto slaptažodį",
 "Enable password recovery:" => "Įjungti slaptažodžio atkūrimą:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį.",
-"File recovery settings updated" => "Failų atkūrimo nustatymai pakeisti",
-"Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
 );
 $PLURAL_FORMS = "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_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index 408af4c60f0..e13297dccb8 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Gjenopprettingsnøkkel aktivert",
-"Could not enable recovery key. Please check your recovery key password!" => "Klarte ikke å aktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
-"Recovery key successfully disabled" => "Gjenopprettingsnøkkel ble deaktivert",
 "Could not disable recovery key. Please check your recovery key password!" => "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+"Recovery key successfully disabled" => "Gjenopprettingsnøkkel ble deaktivert",
 "Password successfully changed." => "Passordet ble endret.",
 "Could not change the password. Maybe the old password was not correct." => "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
 "Private key password successfully updated." => "Passord for privat nøkkel ble oppdatert.",
 "Could not update the private key password. Maybe the old password was not correct." => "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.",
+"File recovery settings updated" => "Innstillinger for gjenoppretting av filer ble oppdatert",
+"Could not update file recovery" => "Klarte ikke å oppdatere gjenoppretting av filer",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Nåværende påloggingspassord",
 "Update Private Key Password" => "Oppdater passord for privat nøkkel",
 "Enable password recovery:" => "Aktiver gjenoppretting av passord:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt.",
-"File recovery settings updated" => "Innstillinger for gjenoppretting av filer ble oppdatert",
-"Could not update file recovery" => "Klarte ikke å oppdatere gjenoppretting av filer"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 4c3f925621b..09b5e5147eb 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
-"Could not enable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet activeren. Controleer het wachtwoord van uw herstelsleutel!",
-"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
 "Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
+"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
 "Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
 "Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
 "Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
+"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
+"Could not update file recovery" => "Kon bestandsherstel niet bijwerken",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Uw privésleutel is niet geldig! Waarschijnlijk is uw wachtwoord gewijzigd buiten %s (bijv. uw corporate directory). U kunt uw privésleutel wachtwoord in uw persoonlijke instellingen bijwerken om toegang te krijgen tot uw versleutelde bestanden.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Huidige wachtwoord",
 "Update Private Key Password" => "Bijwerken wachtwoord Privésleutel",
 "Enable password recovery:" => "Activeren wachtwoord herstel:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is",
-"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
-"Could not update file recovery" => "Kon bestandsherstel niet bijwerken"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index 5129dbafb20..d34df8a6959 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Klucz odzyskiwania włączony",
-"Could not enable recovery key. Please check your recovery key password!" => "Nie można włączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
-"Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
 "Could not disable recovery key. Please check your recovery key password!" => "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+"Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
 "Password successfully changed." => "Zmiana hasła udana.",
 "Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
 "Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
+"File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
+"Could not update file recovery" => "Nie można zmienić pliku odzyskiwania",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Klucz prywatny nie jest poprawny! Prawdopodobnie Twoje hasło zostało zmienione poza %s (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Bieżące hasło logowania",
 "Update Private Key Password" => "Aktualizacja hasła klucza prywatnego",
 "Enable password recovery:" => "Włącz hasło odzyskiwania:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła",
-"File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
-"Could not update file recovery" => "Nie można zmienić pliku odzyskiwania"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
 );
 $PLURAL_FORMS = "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_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index 3b6895c0216..a06f4b78426 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
-"Could not enable recovery key. Please check your recovery key password!" => "Impossível habilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
-"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
 "Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
 "Password successfully changed." => "Senha alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
 "Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
 "Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
+"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
+"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora de %s (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
 "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. Poe favoe peça ao dono do arquivo para compartilha-lo com você.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Senha de login atual",
 "Update Private Key Password" => "Atualizar Senha de Chave Privada",
 "Enable password recovery:" => "Habilitar recuperação de senha:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha",
-"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
-"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index a34f78c1eea..a79d2d0681e 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "A chave de recuperação foi ativada com sucesso",
-"Could not enable recovery key. Please check your recovery key password!" => "Não foi possível ativar a chave de recuperação. Por favor, verifique a sua senha da chave de recuperação!",
-"Recovery key successfully disabled" => "A chave de recuperação foi desativada com sucesso",
 "Could not disable recovery key. Please check your recovery key password!" => "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
+"Recovery key successfully disabled" => "A chave de recuperação foi desativada com sucesso",
 "Password successfully changed." => "Senha alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
 "Private key password successfully updated." => "A senha da chave privada foi atualizada com sucesso. ",
 "Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha da chave privada. A senha antiga poderia não estar correta.",
+"File recovery settings updated" => "As definições da recuperação de ficheiro foram atualizadas",
+"Could not update file recovery" => "Não foi possível atualizar a recuperação de ficheiro",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "A app de encriptação não foi inicializada! A app de encriptação poderá ter sido reativada durante a sua sessão. Por favor, tente terminar a sessão e iniciá-la de seguida para inicializar a app de encriptação.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A sua chave privada não é válida! Provavelmente a senha foi alterada fora do %s (ex. a sua diretoria corporativa). Pode atualizar a sua senha da chave privada nas definições pessoais para recuperar o acesso aos seus ficheiros encriptados. ",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Senha de iniciar sessão atual",
 "Update Private Key Password" => "Atualizar Senha da Chave Privada ",
 "Enable password recovery:" => "Ativar a recuperação da senha:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao ativar esta opção, irá poder obter o acesso aos seus ficheiros encriptados, se perder a senha",
-"File recovery settings updated" => "As definições da recuperação de ficheiro foram atualizadas",
-"Could not update file recovery" => "Não foi possível atualizar a recuperação de ficheiro"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao ativar esta opção, irá poder obter o acesso aos seus ficheiros encriptados, se perder a senha"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index 92cf92c2cd3..b1da7c9bb75 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,19 +1,18 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Cheia de recupeare a fost activata cu succes",
-"Could not enable recovery key. Please check your recovery key password!" => "Nu s-a putut activa cheia de recuperare. Verifica parola de recuperare!",
-"Recovery key successfully disabled" => "Cheia de recuperare dezactivata cu succes",
 "Could not disable recovery key. Please check your recovery key password!" => "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!",
+"Recovery key successfully disabled" => "Cheia de recuperare dezactivata cu succes",
 "Password successfully changed." => "Parola a fost modificată cu succes.",
 "Could not change the password. Maybe the old password was not correct." => "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
 "Private key password successfully updated." => "Cheia privata a fost actualizata cu succes",
 "Could not update the private key password. Maybe the old password was not correct." => "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.",
+"File recovery settings updated" => "Setarile pentru recuperarea fisierelor au fost actualizate",
+"Could not update file recovery" => "Nu am putut actualiza recuperarea de fisiere",
 "Encryption" => "Încriptare",
 "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",
 "Enabled" => "Activat",
 "Disabled" => "Dezactivat",
-"Change Password" => "Schimbă parola",
-"File recovery settings updated" => "Setarile pentru recuperarea fisierelor au fost actualizate",
-"Could not update file recovery" => "Nu am putut actualiza recuperarea de fisiere"
+"Change Password" => "Schimbă parola"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 6f2fab89304..80d996d2828 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
+"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
 "Password successfully changed." => "Пароль изменен удачно.",
 "Could not change the password. Maybe the old password was not correct." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
 "Private key password successfully updated." => "Пароль секретного ключа успешно обновлён.",
 "Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
+"File recovery settings updated" => "Настройки файла восстановления обновлены",
+"Could not update file recovery" => "Невозможно обновить файл восстановления",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Не могу расшифровать файл, возможно это опубликованный файл. Пожалуйста, попросите владельца файла поделиться им  с вами еще раз.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Текущйи пароль для входа",
 "Update Private Key Password" => "Обновить пароль от секретного ключа",
 "Enable password recovery:" => "Включить восстановление пароля:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля",
-"File recovery settings updated" => "Настройки файла восстановления обновлены",
-"Could not update file recovery" => "Невозможно обновить файл восстановления"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
 );
 $PLURAL_FORMS = "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_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 4f59f8c0440..49ff28bd0c2 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Záchranný kľúč bol úspešne povolený",
-"Could not enable recovery key. Please check your recovery key password!" => "Nepodarilo sa povoliť záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
-"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
 "Could not disable recovery key. Please check your recovery key password!" => "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
 "Password successfully changed." => "Heslo úspešne zmenené.",
 "Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
 "Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
 "Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+"File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
+"Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná počas vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš súkromný kľúč nie je platný! Možno bolo vaše heslo zmenené mimo %s (napr. firemný priečinok). Môžete si aktualizovať heslo svojho ​​súkromného kľúča vo vašom osobnom nastavení, ak si chcete obnoviť prístup k šifrovaným súborom.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Súčasné prihlasovacie heslo",
 "Update Private Key Password" => "Aktualizovať heslo súkromného kľúča",
 "Enable password recovery:" => "Povoliť obnovu hesla:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo",
-"File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
-"Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index aeaf80ac6ca..5ae55fbb414 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Ključ za obnovitev gesla je uspešno nastavljen",
-"Could not enable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni mogoče nastaviti. Preverite ključ!",
-"Recovery key successfully disabled" => "Ključ za obnovitev gesla je uspešno onemogočen",
 "Could not disable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
+"Recovery key successfully disabled" => "Ključ za obnovitev gesla je uspešno onemogočen",
 "Password successfully changed." => "Geslo je uspešno spremenjeno.",
 "Could not change the password. Maybe the old password was not correct." => "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
 "Private key password successfully updated." => "Zasebni ključ za geslo je uspešno posodobljen.",
 "Could not update the private key password. Maybe the old password was not correct." => "Zasebnega ključa za geslo ni mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
+"File recovery settings updated" => "Nastavitve obnavljanja dokumentov so posodobljene",
+"Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Program za šifriranje ni začet. Morda je bil program ponovno omogočen šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zasebni ključ ni veljaven. Najverjetneje je bilo geslo spremenjeno izven %s (najverjetneje je to poslovna mapa). Geslo lahko posodobite med osebnimi nastavitvami in s tem obnovite dostop do šifriranih datotek.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Trenutno geslo",
 "Update Private Key Password" => "Posodobi zasebni ključ",
 "Enable password recovery:" => "Omogoči obnovitev gesla:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da boste geslo pozabili.",
-"File recovery settings updated" => "Nastavitve obnavljanja dokumentov so posodobljene",
-"Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da boste geslo pozabili."
 );
 $PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index 70c417666bf..cfdda4fdcd7 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Återställningsnyckeln har framgångsrikt aktiverats",
-"Could not enable recovery key. Please check your recovery key password!" => "Kunde inte aktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
-"Recovery key successfully disabled" => "Återställningsnyckeln har framgångsrikt inaktiverats",
 "Could not disable recovery key. Please check your recovery key password!" => "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+"Recovery key successfully disabled" => "Återställningsnyckeln har framgångsrikt inaktiverats",
 "Password successfully changed." => "Ändringen av lösenordet lyckades.",
 "Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
 "Private key password successfully updated." => "Den privata nyckelns lösenord uppdaterades utan problem.",
 "Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
+"File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
+"Could not update file recovery" => "Kunde inte uppdatera filåterställning",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför %s (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
 "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.",
@@ -35,8 +36,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Nuvarande inloggningslösenord",
 "Update Private Key Password" => "Uppdatera lösenordet för din privata nyckel",
 "Enable password recovery:" => "Aktivera lösenordsåterställning",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord",
-"File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
-"Could not update file recovery" => "Kunde inte uppdatera filåterställning"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 7055859a33d..78e1447ada7 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Kurtarma anahtarı başarıyla etkinleştirildi",
-"Could not enable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı etkinleştirilemedi. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
-"Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
 "Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+"Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
 "Password successfully changed." => "Parola başarıyla değiştirildi.",
 "Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
 "Private key password successfully updated." => "Özel anahtar parolası başarıyla güncellendi.",
 "Could not update the private key password. Maybe the old password was not correct." => "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
+"File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
+"Could not update file recovery" => "Dosya kurtarma güncellenemedi",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
 "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.",
@@ -37,8 +38,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Geçerli oturum açma parolası",
 "Update Private Key Password" => "Özel Anahtar Parolasını Güncelle",
 "Enable password recovery:" => "Parola kurtarmayı etkinleştir:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır",
-"File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
-"Could not update file recovery" => "Dosya kurtarma güncellenemedi"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index dc8108e6308..3c3078283bd 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "Recovery key successfully enabled" => "Khóa khôi phục kích hoạt thành công",
-"Could not enable recovery key. Please check your recovery key password!" => "Không thể kích hoạt khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
-"Recovery key successfully disabled" => "Vô hiệu hóa khóa khôi phục thành công",
 "Could not disable recovery key. Please check your recovery key password!" => "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
+"Recovery key successfully disabled" => "Vô hiệu hóa khóa khôi phục thành công",
 "Password successfully changed." => "Đã đổi mật khẩu.",
 "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",
 "Could not update the private key password. Maybe the old password was not correct." => "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng",
+"File recovery settings updated" => "Đã cập nhật thiết lập khôi phục tập tin ",
+"Could not update file recovery" => "Không thể cập nhật khôi phục tập tin",
 "Encryption" => "Mã hóa",
 "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",
 "Enabled" => "Bật",
@@ -18,8 +19,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "Mật khẩu đăng nhập hiện tại",
 "Update Private Key Password" => "Cập nhật mật khẩu khóa cá nhân",
 "Enable password recovery:" => "Kích hoạt khôi phục mật khẩu:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu",
-"File recovery settings updated" => "Đã cập nhật thiết lập khôi phục tập tin ",
-"Could not update file recovery" => "Không thể cập nhật khôi phục tập tin"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 1b736f1470f..c20263f923e 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "不能禁用恢复密钥。请检查恢复密钥密码！",
+"Recovery key successfully disabled" => "恢复密钥成功禁用",
 "Password successfully changed." => "密码修改成功。",
 "Could not change the password. Maybe the old password was not correct." => "不能修改密码。旧密码可能不正确。",
 "Private key password successfully updated." => "私钥密码成功更新。",
 "Could not update the private key password. Maybe the old password was not correct." => "无法更新私钥密码。可能旧密码不正确。",
+"File recovery settings updated" => "文件恢复设置已更新",
+"Could not update file recovery" => "不能更新文件恢复",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私有密钥无效！也许是您在 %s 外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
@@ -35,8 +36,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "当前登录密码",
 "Update Private Key Password" => "更新私钥密码",
 "Enable password recovery:" => "启用密码恢复：",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "启用该项将允许你在密码丢失后取回您的加密文件",
-"File recovery settings updated" => "文件恢复设置已更新",
-"Could not update file recovery" => "不能更新文件恢复"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "启用该项将允许你在密码丢失后取回您的加密文件"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 32e5fb17bcf..0c283fc28bd 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,13 +1,14 @@
 <?php
 $TRANSLATIONS = array(
 "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!" => "無法停用還原金鑰。請檢查您的還原金鑰密碼!",
+"Recovery key successfully disabled" => "還原金鑰已成功停用",
 "Password successfully changed." => "成功變更密碼。",
 "Could not change the password. Maybe the old password was not correct." => "無法變更密碼，或許是輸入的舊密碼不正確。",
 "Private key password successfully updated." => "私人金鑰密碼已成功更新。",
 "Could not update the private key password. Maybe the old password was not correct." => "無法更新私人金鑰密碼。可能舊的密碼不正確。",
+"File recovery settings updated" => "檔案還原設定已更新",
+"Could not update file recovery" => "無法更新檔案還原設定",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "加密功能未初始化!可能加密功能需要重新啟用在現在的連線上。請試著登出再登入來初始化加密功能。",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私人金鑰不正確!可能您的密碼已經變更在外部的 %s (例如:您的企業目錄)。您可以在您的個人設定中更新私人金鑰密碼來還原存取您的加密檔案。",
 "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。",
@@ -34,8 +35,6 @@ $TRANSLATIONS = array(
 "Current log-in password" => "目前的登入密碼",
 "Update Private Key Password" => "更新私人金鑰密碼",
 "Enable password recovery:" => "啟用密碼還原:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案",
-"File recovery settings updated" => "檔案還原設定已更新",
-"Could not update file recovery" => "無法更新檔案還原設定"
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 89b666a5cca..e13b85f74ed 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -116,7 +116,7 @@ $TRANSLATIONS = array(
 "Updating {productName} to version {version}, this may take a while." => "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
 "Please reload the page." => "Veuillez recharger la page.",
 "The update was unsuccessful." => "La mise à jour a échoué.",
-"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes maintenant redirigé vers ownCloud.",
+"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes maintenant redirigé(e) 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 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.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 31ca65cdd60..76abecd74d8 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 50b95a7d07d..dcff7b9ed63 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ajax/list.php:38
+#: ajax/list.php:39
 msgid "Storage not available"
 msgstr ""
 
-#: ajax/list.php:45
+#: ajax/list.php:47
 msgid "Storage invalid"
 msgstr ""
 
-#: ajax/list.php:52
+#: ajax/list.php:55
 msgid "Unknown error"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 58586e91ea1..da7d5227eb5 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,28 +17,54 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ajax/adminrecovery.php:19
+msgid "Unknown error"
+msgstr ""
+
+#: ajax/adminrecovery.php:23
+msgid "Missing recovery key password"
+msgstr ""
+
 #: ajax/adminrecovery.php:29
-msgid "Recovery key successfully enabled"
+msgid "Please repeat the recovery key password"
 msgstr ""
 
-#: ajax/adminrecovery.php:34
-msgid "Could not enable recovery key. Please check your recovery key password!"
+#: ajax/adminrecovery.php:35 ajax/changeRecoveryPassword.php:46
+msgid ""
+"Repeated recovery key password does not match the provided recovery key "
+"password"
 msgstr ""
 
-#: ajax/adminrecovery.php:48
-msgid "Recovery key successfully disabled"
+#: ajax/adminrecovery.php:49
+msgid "Recovery key successfully enabled"
 msgstr ""
 
-#: ajax/adminrecovery.php:53
+#: ajax/adminrecovery.php:51 ajax/adminrecovery.php:64
 msgid ""
 "Could not disable recovery key. Please check your recovery key password!"
 msgstr ""
 
-#: ajax/changeRecoveryPassword.php:50
+#: ajax/adminrecovery.php:62
+msgid "Recovery key successfully disabled"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:28
+msgid "Please provide the old recovery password"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:34
+msgid "Please provide a new recovery password"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:40
+msgid "Please repeat the new recovery password"
+msgstr ""
+
+#: ajax/changeRecoveryPassword.php:76
 msgid "Password successfully changed."
 msgstr ""
 
-#: ajax/changeRecoveryPassword.php:52
+#: ajax/changeRecoveryPassword.php:78
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
@@ -52,6 +78,14 @@ msgid ""
 "correct."
 msgstr ""
 
+#: ajax/userrecovery.php:44
+msgid "File recovery settings updated"
+msgstr ""
+
+#: ajax/userrecovery.php:46
+msgid "Could not update file recovery"
+msgstr ""
+
 #: files/error.php:16
 msgid ""
 "Encryption app not initialized! Maybe the encryption app was re-enabled "
@@ -122,39 +156,39 @@ msgid ""
 "Enable recovery key (allow to recover users files in case of password loss):"
 msgstr ""
 
-#: templates/settings-admin.php:12
+#: templates/settings-admin.php:13
 msgid "Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:15
+#: templates/settings-admin.php:16
 msgid "Repeat Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:23 templates/settings-personal.php:53
+#: templates/settings-admin.php:24 templates/settings-personal.php:54
 msgid "Enabled"
 msgstr ""
 
-#: templates/settings-admin.php:32 templates/settings-personal.php:62
+#: templates/settings-admin.php:33 templates/settings-personal.php:63
 msgid "Disabled"
 msgstr ""
 
-#: templates/settings-admin.php:37
+#: templates/settings-admin.php:38
 msgid "Change recovery key password:"
 msgstr ""
 
-#: templates/settings-admin.php:43
+#: templates/settings-admin.php:45
 msgid "Old Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:50
+#: templates/settings-admin.php:52
 msgid "New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:56
+#: templates/settings-admin.php:58
 msgid "Repeat New Recovery key password"
 msgstr ""
 
-#: templates/settings-admin.php:61
+#: templates/settings-admin.php:63
 msgid "Change Password"
 msgstr ""
 
@@ -188,16 +222,8 @@ msgstr ""
 msgid "Enable password recovery:"
 msgstr ""
 
-#: templates/settings-personal.php:45
+#: templates/settings-personal.php:46
 msgid ""
 "Enabling this option will allow you to reobtain access to your encrypted "
 "files in case of password loss"
 msgstr ""
-
-#: templates/settings-personal.php:63
-msgid "File recovery settings updated"
-msgstr ""
-
-#: templates/settings-personal.php:64
-msgid "Could not update file recovery"
-msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 0b2da126aa5..3244e5bde92 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c7b98245c16..88b523191c7 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 75f38a4de4d..755c09d36e5 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index a69c67fae1d..91f1f8ec980 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index d8b515d8b9e..e5a6939cdc1 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index e03ca3d48c9..eecda989a9a 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 4fcbc380df7..8f57390666a 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 396ddc13500..71a497053ee 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index eb7edb19459..6bcab78b2c7 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-08 01:54-0400\n"
+"POT-Creation-Date: 2014-10-09 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/af_ZA.php b/lib/l10n/af_ZA.php
index 459493a61f0..3f3095ccb9a 100644
--- a/lib/l10n/af_ZA.php
+++ b/lib/l10n/af_ZA.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "web services under your control" => "webdienste onder jou beheer",
 "_%n minute ago_::_%n minutes ago_" => array("",""),
 "_%n hour ago_::_%n hours ago_" => array("","%n ure gelede"),
+"today" => "vandag",
 "_%n day go_::_%n days ago_" => array("","%n dae gelede"),
 "_%n month ago_::_%n months ago_" => array("","%n maande gelede")
 );
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 744d8ba8617..f63205bec9a 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -5,7 +5,7 @@ $TRANSLATIONS = array(
 "See %s" => "Voir %s",
 "This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire de configuration%s.",
 "Sample configuration detected" => "Configuration d'exemple détectée",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Il a été détecté que le configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas supporté. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
+"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Il a été détecté que la configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas pris en charge. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
 "Help" => "Aide",
 "Personal" => "Personnel",
 "Settings" => "Paramètres",
-- 
GitLab


From f7fc0067e0a33efd8ad9196867f18b44fee99b6f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 9 Oct 2014 11:06:48 +0200
Subject: [PATCH 049/616] Revert "[WIP] fix retrieval of group members and
 cache group members"

---
 apps/user_ldap/group_ldap.php | 27 ++-------------------------
 1 file changed, 2 insertions(+), 25 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index b8ca041bce3..0d3a70575ba 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -29,11 +29,6 @@ use OCA\user_ldap\lib\BackendUtility;
 class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	protected $enabled = false;
 
-	/**
-	 * @var string[] $cachedGroupMembers array of users with gid as key
-	 */
-	protected $cachedGroupMembers = array();
-
 	public function __construct(Access $access) {
 		parent::__construct($access);
 		$filter = $this->access->connection->ldapGroupFilter;
@@ -61,21 +56,6 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 
 		$userDN = $this->access->username2dn($uid);
-
-		if(isset($this->cachedGroupMembers[$gid])) {
-			$isInGroup = in_array($userDN, $this->cachedGroupMembers[$gid]);
-			return $isInGroup;
-		}
-
-		$cacheKeyMembers = 'inGroup-members:'.$gid;
-		if($this->access->connection->isCached($cacheKeyMembers)) {
-			$members = $this->access->connection->getFromCache($cacheKeyMembers);
-			$this->cachedGroupMembers[$gid] = $members;
-			$isInGroup = in_array($userDN, $members);
-			$this->access->connection->writeToCache($cacheKey, $isInGroup);
-			return $isInGroup;
-		}
-
 		$groupDN = $this->access->groupname2dn($gid);
 		// just in case
 		if(!$groupDN || !$userDN) {
@@ -90,9 +70,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 
 		//usually, LDAP attributes are said to be case insensitive. But there are exceptions of course.
-		$members = $this->_groupMembers($groupDN);
-		$members = array_keys($members); // uids are returned as keys
-		if(!is_array($members) || count($members) === 0) {
+		$members = array_keys($this->_groupMembers($groupDN));
+		if(!$members) {
 			$this->access->connection->writeToCache($cacheKey, false);
 			return false;
 		}
@@ -114,8 +93,6 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 
 		$isInGroup = in_array($userDN, $members);
 		$this->access->connection->writeToCache($cacheKey, $isInGroup);
-		$this->access->connection->writeToCache($cacheKeyMembers, $members);
-		$this->cachedGroupMembers[$gid] = $members;
 
 		return $isInGroup;
 	}
-- 
GitLab


From 9f036e776ef40553845c47dacaae0d5af02383c9 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 9 Oct 2014 11:15:56 +0200
Subject: [PATCH 050/616] bump version

---
 apps/user_ldap/appinfo/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index 17b2ccd9bf9..6f2743d65dc 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.4.3
+0.4.4
-- 
GitLab


From 36d22825e0797eedd1c239a70bbb385fa8ac7042 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 9 Oct 2014 13:22:14 +0200
Subject: [PATCH 051/616] Clear enabled apps cache after loading authentication
 app

Since getEnabledApps() depends on an authentication app to be loaded,
especially in the case of LDAP, the cache from getEnabledApps() is now
cleared to make sure that subsequent calls will properly return apps
that were enabled for groups.
This is because getEnabledApps() uses the inGroups() function from the
group manager provided by LDAP or any other authentication app.
---
 lib/private/app.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/private/app.php b/lib/private/app.php
index 3eed9e3c443..73f9a2ddd42 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -93,6 +93,13 @@ class OC_App {
 				throw new \OC\NeedsUpdateException();
 			}
 			require_once $app . '/appinfo/app.php';
+			if (self::isType($app, array('authentication'))) {
+				// since authentication apps affect the "is app enabled for group" check,
+				// the enabled apps cache needs to be cleared to make sure that the
+				// next time getEnableApps() is called it will also include apps that were
+				// enabled for groups
+				self::$enabledAppsCache = array();
+			}
 		}
 	}
 
-- 
GitLab


From 59f9107dd9497d2eb9bd61f5eb8d893dd8fcb766 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 9 Oct 2014 14:58:53 +0200
Subject: [PATCH 052/616] Log warning when no uid was found for user

In some incomplete setups (like mine) it can happen that the uid
attribute of users is missing.

To be able to find out that something is wrong, a debug message is now
logged when it has not been found.
---
 apps/user_ldap/group_ldap.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 0d3a70575ba..48d097c3600 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -283,6 +283,10 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 			$uid = $userDN;
 		} else if(strtolower($this->access->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
 			$result = $this->access->readAttribute($userDN, 'uid');
+			if ($result === false) {
+				\OCP\Util::writeLog('user_ldap', 'No uid attribute found for DN ' . $userDN . ' on '.
+					$this->access->connection->ldapHost, \OCP\Util::DEBUG);
+			}
 			$uid = $result[0];
 		} else {
 			// just in case
-- 
GitLab


From 2d03019c91ab8d07dfbfb1e54db86d0c4978ab9a Mon Sep 17 00:00:00 2001
From: Tony Zelenoff <antonz@parallels.com>
Date: Thu, 9 Oct 2014 17:15:12 +0400
Subject: [PATCH 053/616] Urlencode file name before passing it to cURL

Large file helper use cURL to determine file sizes. Thus filenames must be
urlencoded in case special symbols like '#' can cause BadRequest errors.

Signed-off-by: Tony Zelenoff <antonz@parallels.com>
---
 lib/private/largefilehelper.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php
index 2c35feefc8b..d5b7946feff 100644
--- a/lib/private/largefilehelper.php
+++ b/lib/private/largefilehelper.php
@@ -101,7 +101,8 @@ class LargeFileHelper {
 	*/
 	public function getFileSizeViaCurl($filename) {
 		if (function_exists('curl_init')) {
-			$ch = curl_init("file://$filename");
+			$fencoded = urlencode($filename);
+			$ch = curl_init("file://$fencoded");
 			curl_setopt($ch, CURLOPT_NOBODY, true);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 			curl_setopt($ch, CURLOPT_HEADER, true);
-- 
GitLab


From 16cd74906501faf15946d2506037cba90cca7882 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 9 Oct 2014 15:00:36 +0200
Subject: [PATCH 054/616] Add support for keys in the info.xml

This allows to have links to different doc base URLs

a.
---
 apps/files/appinfo/info.xml            |  3 +++
 apps/files_encryption/appinfo/info.xml |  3 ++-
 apps/files_external/appinfo/info.xml   |  3 +++
 apps/files_trashbin/appinfo/info.xml   |  3 +++
 apps/files_versions/appinfo/info.xml   |  3 +++
 apps/user_ldap/appinfo/info.xml        |  2 +-
 lib/private/app.php                    | 10 +++++++++-
 7 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 7f222c0cc7d..8586c6794f2 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -16,4 +16,7 @@
 		<files>appinfo/remote.php</files>
 		<webdav>appinfo/remote.php</webdav>
 	</remote>
+	<documentation>
+		<user>user-files</user>
+	</documentation>
 </info>
diff --git a/apps/files_encryption/appinfo/info.xml b/apps/files_encryption/appinfo/info.xml
index 62596087db8..6fcef693bed 100644
--- a/apps/files_encryption/appinfo/info.xml
+++ b/apps/files_encryption/appinfo/info.xml
@@ -11,7 +11,8 @@
 	<requiremin>4</requiremin>
 	<shipped>true</shipped>
 	<documentation>
-
+		<user>user-encryption</user>
+		<admin>admin-encryption</admin>
 	</documentation>
 	<rememberlogin>false</rememberlogin>
 	<types>
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index ee572561e7c..6acb58960d4 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -11,6 +11,9 @@
 	<author>Robin Appelman, Michael Gapczynski, Vincent Petry</author>
 	<requiremin>4.93</requiremin>
 	<shipped>true</shipped>
+	<documentation>
+		<admin>admin-external-storage</admin>
+	</documentation>
 	<types>
 		<filesystem/>
 	</types>
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index f15056908f1..8735b61e2db 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -15,5 +15,8 @@ To prevent a user from running out of disk space, the ownCloud Deleted files app
 	<types>
 		<filesystem/>
 	</types>
+	<documentation>
+		<user>user-trashbin</user>
+	</documentation>
 	<ocsid>166052</ocsid>
 </info>
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index 605ef5ccc37..9aed8069b9b 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -14,6 +14,9 @@ In addition to the expiry of versions, ownCloud’s versions app makes certain n
 	<types>
 		<filesystem/>
 	</types>
+	<documentation>
+		<user>user-versions</user>
+	</documentation>
 	<default_enable/>
 	<ocsid>166053</ocsid>
 </info>
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 2b069d14e3d..a1a934f0140 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -15,7 +15,7 @@ A user logs into ownCloud with their LDAP or AD credentials, and is granted acce
 		<authentication/>
 	</types>
 	<documentation>
-		<admin>http://doc.owncloud.org/server/7.0/go.php?to=admin-ldap</admin>
+		<admin>admin-ldap</admin>
 	</documentation>
 	<ocsid>166061</ocsid>
 </info>
diff --git a/lib/private/app.php b/lib/private/app.php
index 3eed9e3c443..1d406fb967e 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -659,7 +659,15 @@ class OC_App {
 				$data[$child->getName()] = substr($xml, 13, -14); //script <description> tags
 			} elseif ($child->getName() == 'documentation') {
 				foreach ($child as $subChild) {
-					$data["documentation"][$subChild->getName()] = (string)$subChild;
+					$url = (string) $subChild;
+
+					// If it is not an absolute URL we assume it is a key
+					// i.e. admin-ldap will get converted to go.php?to=admin-ldap
+					if(!\OC::$server->getHTTPHelper()->isHTTPURL($url)) {
+						$url = OC_Helper::linkToDocs($url);
+					}
+
+					$data["documentation"][$subChild->getName()] = $url;
 				}
 			} else {
 				$data[$child->getName()] = (string)$child;
-- 
GitLab


From 2cf01027976117cab824a54971a7b97e4c8e0b9d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 9 Oct 2014 17:17:50 +0200
Subject: [PATCH 055/616] fix triggering of group update counts. improves the
 basic code which is also responsible for user counts. i did not find
 regressions, please doublecheck

---
 apps/user_ldap/js/ldapFilter.js | 19 +++++++++----------
 apps/user_ldap/js/settings.js   | 10 ++++++----
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 5b93d81f371..6b62604efb7 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -14,7 +14,7 @@ function LdapFilter(target, determineModeCallback) {
 		target === 'Group') {
 		this.target = target;
 	}
-};
+}
 
 LdapFilter.prototype.activate = function() {
 	if(this.activated) {
@@ -33,6 +33,11 @@ LdapFilter.prototype.compose = function(callback) {
 		return false;
 	}
 
+	if(this.mode === LdapWizard.filterModeRaw) {
+		//Raw filter editing, i.e. user defined filter, don't compose
+		return;
+	}
+
 	if(this.target === 'User') {
 		action = 'getUserListFilter';
 	} else if(this.target === 'Login') {
@@ -41,11 +46,6 @@ LdapFilter.prototype.compose = function(callback) {
 		action = 'getGroupFilter';
 	}
 
-	if(!$('#raw'+this.target+'FilterContainer').hasClass('invisible')) {
-		//Raw filter editing, i.e. user defined filter, don't compose
-		return;
-	}
-
 	var param = 'action='+action+
 		'&ldap_serverconfig_chooser='+
 		encodeURIComponent($('#ldap_serverconfig_chooser').val());
@@ -55,10 +55,9 @@ LdapFilter.prototype.compose = function(callback) {
 	LdapWizard.ajax(param,
 		function(result) {
 			LdapWizard.applyChanges(result);
-			if(filter.target === 'User') {
-				LdapWizard.countUsers();
-			} else if(filter.target === 'Group') {
-				LdapWizard.countGroups();
+			console.log(filter.mode);
+			filter.updateCount();
+			if(filter.target === 'Group') {
 				LdapWizard.detectGroupMemberAssoc();
 			}
 			if(typeof callback !== 'undefined') {
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index f5b8081497f..be643c81b4b 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -542,7 +542,6 @@ var LdapWizard = {
 
 	initGroupFilter: function() {
 		LdapWizard.groupFilter.activate();
-		LdapWizard.countGroups();
 	},
 
 	/** init login filter tab section **/
@@ -576,6 +575,9 @@ var LdapWizard = {
 	instantiateFilters: function() {
 		delete LdapWizard.userFilter;
 		LdapWizard.userFilter = new LdapFilter('User', function(mode) {
+			if(mode === LdapWizard.filterModeAssisted) {
+				LdapWizard.groupFilter.updateCount();
+			}
 			LdapWizard.userFilter.findFeatures();
 		});
 		$('#rawUserFilterContainer .ldapGetEntryCount').click(function(event) {
@@ -593,6 +595,9 @@ var LdapWizard = {
 
 		delete LdapWizard.groupFilter;
 		LdapWizard.groupFilter = new LdapFilter('Group', function(mode) {
+			if(mode === LdapWizard.filterModeAssisted) {
+				LdapWizard.groupFilter.updateCount();
+			}
 			LdapWizard.groupFilter.findFeatures();
 		});
 		$('#rawGroupFilterContainer .ldapGetEntryCount').click(function(event) {
@@ -617,7 +622,6 @@ var LdapWizard = {
 		if(LdapWizard.userFilterObjectClassesHasRun &&
 			LdapWizard.userFilterAvailableGroupsHasRun) {
 			LdapWizard.userFilter.compose(LdapWizard.detectEmailAttribute);
-			LdapWizard.countUsers();
 		}
 	},
 
@@ -657,10 +661,8 @@ var LdapWizard = {
 		}
 
 		if(triggerObj.id == 'ldap_userlist_filter' && !LdapWizard.admin.isExperienced()) {
-			LdapWizard.countUsers();
 			LdapWizard.detectEmailAttribute();
 		} else if(triggerObj.id == 'ldap_group_filter' && !LdapWizard.admin.isExperienced()) {
-			LdapWizard.countGroups();
 			LdapWizard.detectGroupMemberAssoc();
 		}
 
-- 
GitLab


From 6f83b537fe17bba29b13f8052506e63ed3dbfa9a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 9 Oct 2014 17:56:27 +0200
Subject: [PATCH 056/616] remove debug output

---
 apps/user_ldap/js/ldapFilter.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 6b62604efb7..7fcf8bfb28b 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -55,7 +55,6 @@ LdapFilter.prototype.compose = function(callback) {
 	LdapWizard.ajax(param,
 		function(result) {
 			LdapWizard.applyChanges(result);
-			console.log(filter.mode);
 			filter.updateCount();
 			if(filter.target === 'Group') {
 				LdapWizard.detectGroupMemberAssoc();
-- 
GitLab


From 8e077cf1a4f1ff52aaaaaf359d6c85778fa51702 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 9 Oct 2014 19:15:58 +0200
Subject: [PATCH 057/616] make sure that we always delete oldest first

---
 apps/files_versions/lib/versions.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 7fadf81426b..bdb26896948 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -517,6 +517,9 @@ class Storage {
 			// but always keep the two latest versions
 			$numOfVersions = count($allVersions) -2 ;
 			$i = 0;
+			// sort oldest first and make sure that we start at the first element
+			ksort($allVersions);
+			reset($allVersions);
 			while ($availableSpace < 0 && $i < $numOfVersions) {
 				$version = current($allVersions);
 				\OC_Hook::emit('\OCP\Versions', 'preDelete', array('path' => $version['path'].'.v'.$version['version']));
-- 
GitLab


From 7238cb601c6c2b11a188aa34352b1eb7836394d2 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 8 Oct 2014 23:01:46 +0200
Subject: [PATCH 058/616] apply @carlaschroder's changes from
 owncloud/documentation#594

---
 config/config.sample.php | 376 ++++++++++++++++++++++-----------------
 1 file changed, 216 insertions(+), 160 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 5a3c07886f9..0186a90625e 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -16,6 +16,7 @@
  *    also to this line
  *  * everything between the ` *\/` and the next `/**` will be treated as the
  *    config option
+ *  * use RST syntax
  */
 
 /**
@@ -42,56 +43,74 @@ $CONFIG = array(
 'instanceid' => '',
 
 /**
- * Define the salt used to hash the user passwords. All your user passwords are
- * lost if you lose this string.
+ * The salt used to hash all passwords, auto-generated by the ownCloud
+ * installer. (There are also per-user salts.) If you lose this salt you lose
+ * all your passwords.
  */
 'passwordsalt' => '',
 
 /**
- * List of trusted domains, to prevent host header poisoning ownCloud is only
- * using these Host headers
+ * Your list of trusted domains that users can log into. Specifying trusted
+ * domains prevents host header poisoning. Do not remove this, as it performs
+ * necessary security checks.
  */
 'trusted_domains' => array('demo.example.org', 'otherdomain.example.org:8080'),
 
 /**
- * The directory where the user data is stored, default to data in the ownCloud
- * directory. The sqlite database is also stored here, when sqlite is used.
+ * Where user files are stored; this defaults to ``data/`` in the ownCloud
+ * directory. The SQLite database is also stored here, when you use SQLite.
  */
 'datadirectory' => '',
 
 /**
- * Type of database, can be sqlite, mysql or pgsql
+ * The current version number of your ownCloud installation. This is set up
+ * during installation and update, so you shouldn't need to change it.
+ */
+'version' => '',
+
+/**
+ * Identifies the database used with this installation: ``sqlite``, ``mysql``,
+ * ``pgsql``, ``oci``, or ``mssql``.
  */
 'dbtype' => 'sqlite',
 
 /**
- * Host running the ownCloud database. To specify a port use 'HOSTNAME:####'; to
- * specify a unix sockets use 'localhost:/path/to/socket'.
+ * Your host server name, for example ``localhost``, ``hostname``,
+ * ``hostname.example.com``, or the IP address. To specify a port use
+ * ``hostname:####``; to specify a Unix socket use
+ * ``localhost:/path/to/socket``.
  */
 'dbhost' => '',
 
 /**
- * Name of the ownCloud database
+ * The name of the ownCloud database for your installation. The default name is
+ * ``owncloud``, and you may give it any arbitrary name at installation when
+ * your database is MySQL, MariaDB, or PostgreSQL.
  */
 'dbname' => 'owncloud',
 
 /**
- * User to access the ownCloud database
+ * The user that ownCloud uses to write to the database. This must be unique
+ * across ownCloud instances using the same SQL database. This is set up during
+ * installation, so you shouldn't need to change it.
  */
 'dbuser' => '',
 
 /**
- * Password to access the ownCloud database
+ * The password for the database user. This is set up during installation, so
+ * you shouldn't need to change it.
  */
 'dbpassword' => '',
 
 /**
- * Prefix for the ownCloud tables in the database
+ * Prefix for the ownCloud tables in the database.
  */
 'dbtableprefix' => '',
 
 /**
- * Flag to indicate ownCloud is successfully installed (true = installed)
+ * Indicates whether the ownCloud instance was installed successfully; ``true``
+ * indicates a successful installation, and ``false`` indicates an unsuccessful
+ * installation.
  */
 'installed' => false,
 
@@ -104,51 +123,57 @@ $CONFIG = array(
  */
 
 /**
- * Optional ownCloud default language - overrides automatic language detection
- * on public pages like login or shared items. This has no effect on the user's
- * language preference configured under 'personal -> language' once they have
- * logged in
+ * This sets the default language on your ownCloud server, using ISO_639-1
+ * language codes such as ``en`` for English, ``de`` for German, and ``fr`` for
+ * French. It overrides automatic language detection on public pages like login
+ * or shared items. User's language preferences configured under "personal ->
+ * language" override this setting after they have logged in.
  */
 'default_language' => 'en',
 
 /**
- * Default app to open on login.
- *
- * This can be a comma-separated list of app ids. If the first app is not
- * enabled for the current user, it will try with the second one and so on. If
- * no enabled app could be found, the 'files' app will be displayed instead.
+ * Set the default app to open on login. Use the app names as they appear in the
+ * URL after clicking them in the Apps menu, such as documents, calendar, and
+ * gallery. You can use a comma-separated list of app names, so if the first
+ * app is not enabled for a user then ownCloud will try the second one, and so
+ * on. If no enabled apps are found it defaults to the Files app.
  */
 'defaultapp' => 'files',
 
 /**
- * Enable the help menu item in the settings
+ * ``true`` enables the Help menu item in the user menu (top left of the
+ * ownCloud Web interface). ``false`` removes the Help item.
  */
 'knowledgebaseenabled' => true,
 
 /**
- * Specifies whether avatars should be enabled
+ * ``true`` enables avatars, or user profile photos. These appear on the User
+ * page and on user's Personal pages. ``false`` disables them.
  */
 'enable_avatars' => true,
 
 /**
- * Allow user to change his display name, if it is supported by the back-end
+ * ``true`` allows users to change their display names (on their Personal
+ * pages), and ``false`` prevents them from changing their display names.
  */
 'allow_user_to_change_display_name' => true,
 
 /**
- * Lifetime of the remember login cookie, default is 15 days
+ * Lifetime of the remember login cookie, which is set when the user clicks the
+ * ``remember`` checkbox on the login screen. The default is 15 days, expressed
+ * in seconds.
  */
 'remember_login_cookie_lifetime' => 60*60*24*15,
 
 /**
- * Life time of a session after inactivity
+ * The lifetime of a session after inactivity; the default is 24 hours,
+ * expressed in seconds.
  */
 'session_lifetime' => 60 * 60 * 24,
 
 /**
- * Enable/disable session keep alive when a user is logged in in the Web UI.
- * This is achieved by sending a 'heartbeat' to the server to prevent the
- * session timing out.
+ * Enable or disable session keep-alive when a user is logged in to the Web UI.
+ * Enabling this sends a "heartbeat" to the server to keep it from timing out.
  */
 'session_keepalive' => true,
 
@@ -160,7 +185,9 @@ $CONFIG = array(
 'skeletondirectory' => '',
 
 /**
- * TODO
+ * The ``user_backends`` app allows you to configure alternate authentication
+ * backends. Supported backends are IMAP (OC_User_IMAP), SMB (OC_User_SMB), and
+ * FTP (OC_User_FTP).
  */
 'user_backends' => array(
 	array(
@@ -178,72 +205,88 @@ $CONFIG = array(
  */
 
 /**
- * Domain name used by ownCloud for the sender mail address, e.g.
- * no-reply@example.com
+ * The return address that you want to appear on emails sent by the ownCloud
+ * server, for example ``oc-admin@example.com``, substituting your own domain,
+ * of course.
  */
 'mail_domain' => 'example.com',
 
 /**
- * FROM address used by ownCloud for the sender mail address, e.g.
- * owncloud@example.com
- *
- * This setting overwrites the built in 'sharing-noreply' and
- * 'lostpassword-noreply' FROM addresses, that ownCloud uses
+ * FROM address that overrides the built-in ``sharing-noreply`` and
+ * ``lostpassword-noreply`` FROM addresses.
  */
 'mail_from_address' => 'owncloud',
 
 /**
- * Enable SMTP class debugging
+ * Enable SMTP class debugging.
  */
 'mail_smtpdebug' => false,
 
 /**
- * Mode to use for sending mail, can be sendmail, smtp, qmail or php, see
- * PHPMailer docs
+ * Which mode to use for sending mail: ``sendmail``, ``smtp``, ``qmail`` or
+ * ``php``.
+ *
+ * If you are using local or remote SMTP, set this to ``smtp``.
+ *
+ * If you are using PHP mail you must have an installed and working email system
+ * on the server. The program used to send email is defined in the ``php.ini``
+ * file.
+ *
+ * For the ``sendmail`` option you need an installed and working email system on
+ * the server, with ``/usr/sbin/sendmail`` installed on your Unix system.
+ *
+ * For ``qmail`` the binary is /var/qmail/bin/sendmail, and it must be installed
+ * on your Unix system.
  */
 'mail_smtpmode' => 'sendmail',
 
 /**
- * Host to use for sending mail, depends on mail_smtpmode if this is used
+ * This depends on ``mail_smtpmode``. Specified the IP address of your mail
+ * server host. This may contain multiple hosts separated by a semi-colon. If
+ * you need to specify the port number append it to the IP address separated by
+ * a colon, like this: ``127.0.0.1:24``.
  */
 'mail_smtphost' => '127.0.0.1',
 
 /**
- * Port to use for sending mail, depends on mail_smtpmode if this is used
+ * This depends on ``mail_smtpmode``. Specify the port for sending mail.
  */
 'mail_smtpport' => 25,
 
 /**
- * SMTP server timeout in seconds for sending mail, depends on mail_smtpmode if
- * this is used
+ * This depends on ``mail_smtpmode``. This set an SMTP server timeout, in
+ * seconds. You may need to increase this if you are running an anti-malware or
+ * spam scanner.
  */
 'mail_smtptimeout' => 10,
 
 /**
- * SMTP connection prefix or sending mail, depends on mail_smtpmode if this is
- * used. Can be '', 'ssl' or 'tls'
+ * This depends on ``mail_smtpmode``. Specify when you are using ``ssl`` or
+ * ``tls``, or leave empty for no encryption.
  */
 'mail_smtpsecure' => '',
 
 /**
- * Authentication needed to send mail, depends on mail_smtpmode if this is used
- * (false = disable authentication)
+ * This depends on ``mail_smtpmode``. Change this to ``true`` if your mail
+ * server requires authentication.
  */
 'mail_smtpauth' => false,
 
 /**
- * Authentication type needed to send mail, depends on mail_smtpmode if this is
- * used Can be LOGIN (default), PLAIN or NTLM
+ * This depends on ``mail_smtpmode``. If SMTP authentication is required, choose
+ * the authentication type as ``LOGIN`` (default) or ``PLAIN``.
  */
 'mail_smtpauthtype' => 'LOGIN',
 
 /**
- * Username to use for sendmail mail, depends on mail_smtpauth if this is used
+ * This depends on ``mail_smtpauth``. Specify the username for authenticating to
+ * the SMTP server.
  */
 'mail_smtpname' => '',
 
 /**
- * Password to use for sendmail mail, depends on mail_smtpauth if this is used
+ * This depends on ``mail_smtpauth``. Specify the password for authenticating to
+ * the SMTP server.
  */
 'mail_smtppassword' => '',
 
@@ -254,40 +297,48 @@ $CONFIG = array(
 
 /**
  * The automatic hostname detection of ownCloud can fail in certain reverse
- * proxy and CLI/cron situations. This option allows to manually override the
- * automatic detection. You can also add a port. For example
- * 'www.example.com:88'
+ * proxy and CLI/cron situations. This option allows you to manually override
+ * the automatic detection; for example ``www.example.com``, or specify the port
+ * ``www.example.com:8080``.
  */
 'overwritehost' => '',
 
 /**
- * The automatic protocol detection of ownCloud can fail in certain reverse
- * proxy and CLI/cron situations. This option allows to manually override the
- * protocol detection. For example 'https'
+ * When generating URLs, ownCloud attempts to detect whether the server is
+ * accessed via ``https`` or ``http``. However, if ownCloud is behind a proxy
+ * and the proxy handles the ``https`` calls, ownCloud would not know that
+ * ``ssl`` is in use, which would result in incorrect URLs being generated.
+ * Valid values are ``http`` and ``https``.
  */
 'overwriteprotocol' => '',
 
 /**
- * The automatic webroot detection of ownCloud can fail in certain reverse proxy
- * and CLI/cron situations. This option allows to manually override the
- * automatic detection. For example '/domain.tld/ownCloud'. The value '/' can be
- * used to remove the root.
+ * ownCloud attempts to detect the webroot for generating URLs automatically.
+ * For example, if ``www.example.com/owncloud`` is the URL pointing to the
+ * ownCloud instance, the webroot is ``/owncloud``. When proxies are in use, it
+ * may be difficult for ownCloud to detect this parameter, resulting in invalid
+ * URLs.
  */
 'overwritewebroot' => '',
 
 /**
- * The automatic detection of ownCloud can fail in certain reverse proxy and
- * CLI/cron situations. This option allows to define a manually override
- * condition as regular expression for the remote ip address. For example
- * '^10\.0\.0\.[1-3]$'
+ * This option allows you to define a manual override condition as a regular
+ * expression for the remote IP address. For example, defining a range of IP
+ * addresses starting with ``10.`` and ending with 1 to 3: ``^10\.0\.0\.[1-3]$``
  */
 'overwritecondaddr' => '',
 
 /**
- * A proxy to use to connect to the internet. For example 'myproxy.org:88'
+ * The URL of your proxy server, for example ``proxy.example.com:8081``.
  */
 'proxy' => '',
 
+/**
+ * The optional authentication for the proxy to use to connect to the internet.
+ * The format is: ``username:password``.
+ */
+'proxyuserpwd' => '',
+
 
 /**
  * Deleted Items
@@ -296,14 +347,14 @@ $CONFIG = array(
  */
 
 /**
- * How long should ownCloud keep deleted files in the trash bin, default value:
- * 30 days
+ * When the delete app is enabled (default), this is the number of days a file
+ * will be kept in the trash bin. Default is 30 days.
  */
 'trashbin_retention_obligation' => 30,
 
 /**
- * Disable/Enable auto expire for the trash bin, by default auto expire is
- * enabled
+ * Disable or enable auto-expiration for the trash bin. By default
+ * auto-expiration is enabled.
  */
 'trashbin_auto_expire' => true,
 
@@ -311,35 +362,37 @@ $CONFIG = array(
 /**
  * ownCloud Verifications
  *
- * ownCloud performs several verification checks. There are two options, 'true'
- * and 'false'.
+ * ownCloud performs several verification checks. There are two options,
+ * ``true`` and ``false``.
  */
 
 /**
- * Ensure that 3rdparty applications follows coding guidelines
+ * Check 3rd party apps to make sure they are using the private API and not the
+ * public API. If the app uses the public API it cannot be installed.
  */
 'appcodechecker' => true,
 
 /**
- * Check if ownCloud is up to date and shows a notification if a new version is
- * available
+ * Check if ownCloud is up-to-date.
  */
 'updatechecker' => true,
 
 /**
- * Are we connected to the internet or are we running in a closed network?
+ * Is ownCloud connected to the Internet or running in a closed network?
  */
 'has_internet_connection' => true,
 
 /**
- * Check if the ownCloud WebDAV server is working correctly. Can be disabled if
- * not needed in special situations
+ * Allows ownCloud to verify a working WebDAV connection. This is done by
+ * attempting to make a WebDAV request from PHP.
  */
 'check_for_working_webdav' => true,
 
 /**
- * Check if .htaccess protection of data is working correctly. Can be disabled
- * if not needed in special situations
+ * Verifies whether the ``.htaccess`` file may be modified by ownCloud. If set
+ * to ``false``, this check will not be performed. If the file cannot be
+ * modified, items such as large file uploads cannot be performed. This check
+ * only affects Apache servers.
  */
 'check_for_working_htaccess' => true,
 
@@ -349,54 +402,51 @@ $CONFIG = array(
  */
 
 /**
- * Place to log to, can be 'owncloud' and 'syslog' (owncloud is log menu item in
- * admin menu)
+ * By default the ownCloud logs are sent to the ``owncloud.log`` file in the
+ * default ownCloud data directory. If syslogging is desired, set this parameter
+ * to ``syslog``.
  */
 'log_type' => 'owncloud',
 
 /**
- * File for the ownCloud logger to log to, (default is owncloud.log in the data
- * dir)
+ * Change the ownCloud logfile name from ``owncloud.log`` to something else.
  */
 'logfile' => 'owncloud.log',
 
 /**
- * Loglevel to start logging at. 0 = DEBUG, 1 = INFO, 2 = WARN, 3 = ERROR
- * (default is WARN)
+ * Valid values are: 0 = Debug, 1 = Info, 2 = Warning, 3 = Error. The default
+ * value is Warning.
  */
 'loglevel' => 2,
 
 /**
- * date format to be used while writing to the ownCloud logfile
+ * This uses PHP.date formatting; see http://php.net/manual/en/function.date.php
  */
 'logdateformat' => 'F d, Y H:i:s',
 
 /**
- * timezone used while writing to the ownCloud logfile (default: UTC)
+ * The default timezone for logfiles is UTC. You may change this; see
+ * http://php.net/manual/en/timezones.php
  */
 'logtimezone' => 'Europe/Berlin',
 
 /**
- * Append all database queries and parameters to the log file. (watch out, this
- * option can increase the size of your log file)
+ * Append all database queries and parameters to the log file. Use this only for
+ * debugging, as your logfile will become huge.
  */
 'log_query' => false,
 
 /**
- * Whether ownCloud should log the last successfull cron exec
+ * Log successful cron runs.
  */
 'cron_log' => true,
 
 /**
- * Configure the size in bytes log rotation should happen, 0 or false disables
- * the rotation. This rotates the current ownCloud logfile to a new name, this
- * way the total log usage will stay limited and older entries are available for
- * a while longer. The total disk usage is twice the configured size.
- *
- * WARNING: When you use this, the log entries will eventually be lost.
- *
- * Example: To set this to 100 MiB, use the value: 104857600 (1024*1024*100
- * bytes).
+ * Enables log rotation and limits the total size of logfiles. The default is 0,
+ * or no rotation. Specify a size in bytes, for example 50000000 (50 megabytes).
+ * A new logfile is created with a new name when the old logfile reaches your
+ * limit. The total size of all logfiles is double the
+ * ``log_rotate_sizerotation`` value.
  */
 'log_rotate_size' => false,
 
@@ -408,17 +458,21 @@ $CONFIG = array(
  */
 
 /**
- * Path to the parent directory of the 3rdparty directory
+ * 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.
  */
 '3rdpartyroot' => '',
 
 /**
- * URL to the parent directory of the 3rdparty directory, as seen by the browser
+ * If you have an alternate ``3rdpartyroot``, you must also configure the URL as
+ * seen by a Web browser.
  */
 '3rdpartyurl' => '',
 
 /**
- * links to custom clients
+ * This section is for configuring the download links for ownCloud clients, as
+ * seen in the first-run wizard and on Personal pages.
  */
 'customclient_desktop' =>
 	'http://owncloud.org/sync-clients/',
@@ -434,25 +488,24 @@ $CONFIG = array(
  */
 
 /**
- * Enable installing apps from the appstore
+ * When enabled, admins may install apps from the ownCloud app store.
  */
 'appstoreenabled' => true,
 
 /**
- * URL of the appstore to use, server should understand OCS
+ * The URL of the appstore to use.
  */
 'appstoreurl' => 'https://api.owncloud.com/v1',
 
 /**
- * Set an array of path for your apps directories
- *
- * key 'path' is for the fs path and the key 'url' is for the http path to your
- * applications paths. 'writable' indicates whether the user can install apps in
- * this folder. You must have at least 1 app folder writable or you must set the
- * parameter 'appstoreenabled' to false
+ * Use the ``apps_paths`` parameter to set the location of the Apps directory,
+ * which should be scanned for available apps, and where user-specific apps
+ * should be installed from the Apps store. The ``path`` defines the absolute
+ * file system path to the app folder. The key ``url`` defines the HTTP web path
+ * to that folder, starting from the ownCloud web root. The key ``writable``
+ * indicates if a user can install apps in that folder.
  */
 'apps_paths' => array(
-
 	array(
 		'path'=> '/var/www/owncloud/apps',
 		'url' => '/apps',
@@ -478,15 +531,20 @@ $CONFIG = array(
  */
 'enable_previews' => true,
 /**
- * the max width of a generated preview, if value is null, there is no limit
+ * The maximum width, in pixels, of a preview. A value of ``null`` means there
+ * is no limit.
  */
 'preview_max_x' => null,
 /**
- * the max height of a generated preview, if value is null, there is no limit
+ * The maximum height, in pixels, of a preview. A value of ``null`` means there
+ * is no limit.
  */
 'preview_max_y' => null,
 /**
- * the max factor to scale a preview, default is set to 10
+ * If a lot of small pictures are stored on the ownCloud instance and the
+ * preview system generates blurry previews, you might want to consider setting
+ * a maximum scale factor. By default, pictures are upscaled to 10 times the
+ * original size. A value of ``1`` or ``null`` disables scaling.
  */
 'preview_max_scale_factor' => 10,
 /**
@@ -494,7 +552,7 @@ $CONFIG = array(
  */
 'preview_libreoffice_path' => '/usr/bin/libreoffice',
 /**
- * cl parameters for libreoffice / openoffice
+ * Use this if LibreOffice requires additional arguments.
  */
 'preview_office_cl_parameters' =>
 	' --headless --nologo --nofirststartwizard --invisible --norestore '.
@@ -552,7 +610,8 @@ $CONFIG = array(
 'maintenance' => false,
 
 /**
- * whether usage of the instance should be restricted to admin users only
+ * When set to ``true``, the ownCloud instance will be unavailable for all users
+ * who are not in the ``admin`` group.
  */
 'singleuser' => false,
 
@@ -562,12 +621,13 @@ $CONFIG = array(
  */
 
 /**
- * Force use of HTTPS connection (true = use HTTPS)
+ * Change this to ``true`` to require HTTPS for all connections, and to reject
+ * HTTP requests.
  */
 'forcessl' => false,
 
 /**
- * Extra SSL options to be used for configuration
+ * Extra SSL options to be used for configuration.
  */
 'openssl' => array(
 	'config' => '/absolute/location/of/openssl.cnf',
@@ -585,30 +645,33 @@ $CONFIG = array(
 'blacklisted_files' => array('.htaccess'),
 
 /**
- * define default folder for shared files and folders
+ * Define a default folder for shared files and folders other than root.
  */
 'share_folder' => '/',
 
 /**
- * Theme to use for ownCloud
+ * If you are applying a theme to ownCloud, enter the name of the theme here.
+ * The default location for themes is ``owncloud/themes/``.
  */
 'theme' => '',
 
 /**
- * Enable/disable X-Frame-Restriction
- *
- * HIGH SECURITY RISK IF DISABLED
+ * X-Frame-Restriction is a header which prevents browsers from showing the site
+ * inside an iframe. This may be used to prevent clickjacking. It is risky to
+ * disable this, so leave it set at ``true``.
  */
 'xframe_restriction' => true,
 
 /**
- * default cipher used for file encryption, currently we support AES-128-CFB and
- * AES-256-CFB
+ * The default cipher for encrypting files. Currently AES-128-CFB and
+ * AES-256-CFB are supported.
  */
 'cipher' => 'AES-256-CFB',
 
 /**
- * memcached servers (Only used when xCache, APC and APCu are absent.)
+ * Server details for one or more memcached servers to use for memory caching.
+ * Memcache is only used if other memory cache options (xcache, apc, apcu) are
+ * not available.
  */
 'memcached_servers' => array(
 	// hostname, port and optional weight. Also see:
@@ -619,50 +682,55 @@ $CONFIG = array(
 ),
 
 /**
- * Location of the cache folder, defaults to 'data/$user/cache' where '$user' is
- * the current user.
- *
- * When specified, the format will change to '$cache_path/$user' where
- * '$cache_path' is the configured cache directory and '$user' is the user.
+ * Location of the cache folder, defaults to ``data/$user/cache`` where
+ * ``$user`` is the current user. When specified, the format will change to
+ * ``$cache_path/$user`` where ``$cache_path`` is the configured cache directory
+ * and ``$user`` is the user.
  */
 'cache_path' => '',
 
 /**
  * EXPERIMENTAL: option whether to include external storage in quota
- * calculation, defaults to false
+ * calculation, defaults to false.
  */
 'quota_include_external_storage' => false,
 
 /**
- * specifies how often the filesystem is checked for changes made outside
- * ownCloud
+ * Specifies how often the filesystem is checked for changes made outside
+ * ownCloud.
  *
- * 0 -> never check the filesystem for outside changes, provides a performance
+ * 0 -> Never check the filesystem for outside changes, provides a performance
  * increase when it's certain that no changes are made directly to the
  * filesystem
  *
- * 1 -> check each file or folder at most once per request, recommended for
- * general use if outside changes might happen
+ * 1 -> Check each file or folder at most once per request, reccomended for
+ * general use if outside changes might happen.
  *
- * 2 -> check every time the filesystem is used, causes a performance hit when
- * using external storages, not recommended for regular use
+ * 2 -> Check every time the filesystem is used, causes a performance hit when
+ * using external storages, not recomended for regular use.
  */
 'filesystem_check_changes' => 1,
 
 /**
- * where mount.json file should be stored
+ * All css and js files will be served by the web server statically in one js
+ * file and one css file.
+ */
+'asset-pipeline.enabled' => false,
+
+/**
+ * Where ``mount.json`` file should be stored, defaults to ``data/mount.json``
  */
 'mount_file' => 'data/mount.json',
 
 /**
- * If true, prevent ownCloud from changing the cache due to changes in the
- * filesystem for all storage
+ * When ``true``, prevent ownCloud from changing the cache due to changes in the
+ * filesystem for all storage.
  */
 'filesystem_cache_readonly' => false,
 
 /**
  * The example below shows how to configure ownCloud to store all files in a
- * swift object storage
+ * swift object storage.
  *
  * It is important to note that ownCloud in object store mode will expect
  * exclusive access to the object store container because it only stores the
@@ -711,7 +779,7 @@ $CONFIG = array(
 
 
 /**
- * Forgotten ones
+ * All other config options
  */
 
 /**
@@ -720,12 +788,6 @@ $CONFIG = array(
  */
 'secret' => '',
 
-/**
- * The optional authentication for the proxy to use to connect to the internet.
- * The format is: [username]:[password]
- */
-'proxyuserpwd' => '',
-
 /**
  * List of trusted proxy servers
  */
@@ -746,10 +808,4 @@ $CONFIG = array(
  */
 'copied_sample_config' => true,
 
-/**
- * all css and js files will be served by the web server statically in one js
- * file and ons css file
- */
-'asset-pipeline.enabled' => false,
-
 );
-- 
GitLab


From 090bf44ab6ec9e4dea395701e34a4cc76733ea78 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 8 Oct 2014 23:02:20 +0200
Subject: [PATCH 059/616] Additional changes to config.sample.php and typo
 fixes

---
 config/config.sample.php | 61 +++++++++++++++++++++-------------------
 1 file changed, 32 insertions(+), 29 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 0186a90625e..02958ace0c2 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -20,7 +20,7 @@
  */
 
 /**
- * Only enable this for local development and not in productive environments
+ * Only enable this for local development and not in production environments
  * This will disable the minifier and outputs some additional debug informations
  */
 define('DEBUG', true);
@@ -38,7 +38,7 @@ $CONFIG = array(
 
 /**
  * This is a unique identifier for your ownCloud installation, created
- * automatically by the installer.
+ * automatically by the installer. Do not change it.
  */
 'instanceid' => '',
 
@@ -83,9 +83,8 @@ $CONFIG = array(
 'dbhost' => '',
 
 /**
- * The name of the ownCloud database for your installation. The default name is
- * ``owncloud``, and you may give it any arbitrary name at installation when
- * your database is MySQL, MariaDB, or PostgreSQL.
+ * The name of the ownCloud database, which is set during installation. You
+ * should not need to change this.
  */
 'dbname' => 'owncloud',
 
@@ -141,14 +140,15 @@ $CONFIG = array(
 'defaultapp' => 'files',
 
 /**
- * ``true`` enables the Help menu item in the user menu (top left of the
+ * ``true`` enables the Help menu item in the user menu (top right of the
  * ownCloud Web interface). ``false`` removes the Help item.
  */
 'knowledgebaseenabled' => true,
 
 /**
  * ``true`` enables avatars, or user profile photos. These appear on the User
- * page and on user's Personal pages. ``false`` disables them.
+ * page, on user's Personal pages and are used by some apps (contacts, mail,
+ * etc). ``false`` disables them.
  */
 'enable_avatars' => true,
 
@@ -324,7 +324,8 @@ $CONFIG = array(
 /**
  * This option allows you to define a manual override condition as a regular
  * expression for the remote IP address. For example, defining a range of IP
- * addresses starting with ``10.`` and ending with 1 to 3: ``^10\.0\.0\.[1-3]$``
+ * addresses starting with ``10.0.0.`` and ending with 1 to 3:
+ * ``^10\.0\.0\.[1-3]$``
  */
 'overwritecondaddr' => '',
 
@@ -341,13 +342,13 @@ $CONFIG = array(
 
 
 /**
- * Deleted Items
+ * Deleted Items (trash bin)
  *
  * These parameters control the Deleted files app.
  */
 
 /**
- * When the delete app is enabled (default), this is the number of days a file
+ * When the trash bin app is enabled (default), this is the number of days a file
  * will be kept in the trash bin. Default is 30 days.
  */
 'trashbin_retention_obligation' => 30,
@@ -368,12 +369,13 @@ $CONFIG = array(
 
 /**
  * Check 3rd party apps to make sure they are using the private API and not the
- * public API. If the app uses the public API it cannot be installed.
+ * public API. If the app uses the private API it cannot be installed.
  */
 'appcodechecker' => true,
 
 /**
- * Check if ownCloud is up-to-date.
+ * Check if ownCloud is up-to-date and shows a notification if a new version is
+ * available.
  */
 'updatechecker' => true,
 
@@ -389,10 +391,11 @@ $CONFIG = array(
 'check_for_working_webdav' => true,
 
 /**
- * Verifies whether the ``.htaccess`` file may be modified by ownCloud. If set
- * to ``false``, this check will not be performed. If the file cannot be
- * modified, items such as large file uploads cannot be performed. This check
- * only affects Apache servers.
+ * This is a crucial security check on Apache servers that should always be set
+ * to ``true``. This verifies that the ``.htaccess`` file is writable and works.
+ * If it is not, then any options controlled by ``.htaccess``, such as large
+ * file uploads, will not work. It also runs checks on the ``data/`` directory,
+ * which verifies that it can't be accessed directly through the web server.
  */
 'check_for_working_htaccess' => true,
 
@@ -414,8 +417,8 @@ $CONFIG = array(
 'logfile' => 'owncloud.log',
 
 /**
- * Valid values are: 0 = Debug, 1 = Info, 2 = Warning, 3 = Error. The default
- * value is Warning.
+ * Loglevel to start logging at. Valid values are: 0 = Debug, 1 = Info, 2 =
+ * Warning, 3 = Error. The default value is Warning.
  */
 'loglevel' => 2,
 
@@ -443,9 +446,9 @@ $CONFIG = array(
 
 /**
  * Enables log rotation and limits the total size of logfiles. The default is 0,
- * or no rotation. Specify a size in bytes, for example 50000000 (50 megabytes).
- * A new logfile is created with a new name when the old logfile reaches your
- * limit. The total size of all logfiles is double the
+ * or no rotation. Specify a size in bytes, for example 104857600 (100 megabytes
+ * = 100 * 1024 * 1024 bytes). A new logfile is created with a new name when the
+ * old logfile reaches your limit. The total size of all logfiles is double the
  * ``log_rotate_sizerotation`` value.
  */
 'log_rotate_size' => false,
@@ -503,7 +506,7 @@ $CONFIG = array(
  * should be installed from the Apps store. The ``path`` defines the absolute
  * file system path to the app folder. The key ``url`` defines the HTTP web path
  * to that folder, starting from the ownCloud web root. The key ``writable``
- * indicates if a user can install apps in that folder.
+ * indicates if a web server can write files to that folder.
  */
 'apps_paths' => array(
 	array(
@@ -548,11 +551,11 @@ $CONFIG = array(
  */
 'preview_max_scale_factor' => 10,
 /**
- * custom path for libreoffice / openoffice binary
+ * custom path for LibreOffice/OpenOffice binary
  */
 'preview_libreoffice_path' => '/usr/bin/libreoffice',
 /**
- * Use this if LibreOffice requires additional arguments.
+ * Use this if LibreOffice/OpenOffice requires additional arguments.
  */
 'preview_office_cl_parameters' =>
 	' --headless --nologo --nofirststartwizard --invisible --norestore '.
@@ -657,7 +660,7 @@ $CONFIG = array(
 
 /**
  * X-Frame-Restriction is a header which prevents browsers from showing the site
- * inside an iframe. This may be used to prevent clickjacking. It is risky to
+ * inside an iframe. This is be used to prevent clickjacking. It is risky to
  * disable this, so leave it set at ``true``.
  */
 'xframe_restriction' => true,
@@ -703,17 +706,17 @@ $CONFIG = array(
  * increase when it's certain that no changes are made directly to the
  * filesystem
  *
- * 1 -> Check each file or folder at most once per request, reccomended for
+ * 1 -> Check each file or folder at most once per request, recommended for
  * general use if outside changes might happen.
  *
  * 2 -> Check every time the filesystem is used, causes a performance hit when
- * using external storages, not recomended for regular use.
+ * using external storages, not recommended for regular use.
  */
 'filesystem_check_changes' => 1,
 
 /**
  * All css and js files will be served by the web server statically in one js
- * file and one css file.
+ * file and one css file if this is set to ``true``.
  */
 'asset-pipeline.enabled' => false,
 
@@ -804,7 +807,7 @@ $CONFIG = array(
  * configuration. DO NOT ADD THIS SWITCH TO YOUR CONFIGURATION!
  *
  * If you, brave person, have read until here be aware that you should not
- * modify *ANY* settings in this file without reading the documentation
+ * modify *ANY* settings in this file without reading the documentation.
  */
 'copied_sample_config' => true,
 
-- 
GitLab


From 2cc26c90226af5372aef33c80d876b9b259b1d62 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 10 Oct 2014 01:55:10 -0400
Subject: [PATCH 060/616] [tx-robot] updated from transifex

---
 apps/files/l10n/fr.php               |  2 +-
 apps/files/l10n/zh_TW.php            |  2 ++
 apps/files_encryption/l10n/ar.php    |  1 +
 apps/files_encryption/l10n/ast.php   |  1 +
 apps/files_encryption/l10n/az.php    |  1 +
 apps/files_encryption/l10n/bg_BG.php |  1 +
 apps/files_encryption/l10n/bn_BD.php |  1 +
 apps/files_encryption/l10n/ca.php    |  1 +
 apps/files_encryption/l10n/cs_CZ.php |  7 +++++++
 apps/files_encryption/l10n/da.php    |  7 +++++++
 apps/files_encryption/l10n/de.php    | 17 ++++++++++++-----
 apps/files_encryption/l10n/de_CH.php |  1 +
 apps/files_encryption/l10n/de_DE.php | 27 +++++++++++++++++----------
 apps/files_encryption/l10n/el.php    |  1 +
 apps/files_encryption/l10n/en_GB.php |  7 +++++++
 apps/files_encryption/l10n/eo.php    |  1 +
 apps/files_encryption/l10n/es.php    |  1 +
 apps/files_encryption/l10n/es_AR.php |  1 +
 apps/files_encryption/l10n/es_CL.php |  5 +++++
 apps/files_encryption/l10n/es_MX.php |  1 +
 apps/files_encryption/l10n/et_EE.php |  1 +
 apps/files_encryption/l10n/eu.php    |  1 +
 apps/files_encryption/l10n/fa.php    |  1 +
 apps/files_encryption/l10n/fi_FI.php |  1 +
 apps/files_encryption/l10n/fr.php    |  1 +
 apps/files_encryption/l10n/gl.php    |  1 +
 apps/files_encryption/l10n/he.php    |  1 +
 apps/files_encryption/l10n/hr.php    |  1 +
 apps/files_encryption/l10n/hu_HU.php |  1 +
 apps/files_encryption/l10n/ia.php    |  5 +++++
 apps/files_encryption/l10n/id.php    |  1 +
 apps/files_encryption/l10n/it.php    |  1 +
 apps/files_encryption/l10n/ja.php    |  1 +
 apps/files_encryption/l10n/ka_GE.php |  1 +
 apps/files_encryption/l10n/km.php    |  1 +
 apps/files_encryption/l10n/ko.php    |  1 +
 apps/files_encryption/l10n/lb.php    |  2 +-
 apps/files_encryption/l10n/lt_LT.php |  1 +
 apps/files_encryption/l10n/lv.php    |  1 +
 apps/files_encryption/l10n/mk.php    |  1 +
 apps/files_encryption/l10n/nb_NO.php |  1 +
 apps/files_encryption/l10n/nl.php    |  7 +++++++
 apps/files_encryption/l10n/nn_NO.php |  1 +
 apps/files_encryption/l10n/pa.php    |  2 +-
 apps/files_encryption/l10n/pl.php    |  1 +
 apps/files_encryption/l10n/pt_BR.php |  3 +++
 apps/files_encryption/l10n/pt_PT.php |  1 +
 apps/files_encryption/l10n/ro.php    |  1 +
 apps/files_encryption/l10n/ru.php    |  1 +
 apps/files_encryption/l10n/sk_SK.php |  1 +
 apps/files_encryption/l10n/sl.php    |  1 +
 apps/files_encryption/l10n/sq.php    |  1 +
 apps/files_encryption/l10n/sv.php    |  1 +
 apps/files_encryption/l10n/th_TH.php |  1 +
 apps/files_encryption/l10n/tr.php    |  7 +++++++
 apps/files_encryption/l10n/ug.php    |  1 +
 apps/files_encryption/l10n/uk.php    |  1 +
 apps/files_encryption/l10n/ur_PK.php |  5 +++++
 apps/files_encryption/l10n/vi.php    |  1 +
 apps/files_encryption/l10n/zh_CN.php |  1 +
 apps/files_encryption/l10n/zh_HK.php |  1 +
 apps/files_encryption/l10n/zh_TW.php |  1 +
 apps/files_sharing/l10n/fr.php       |  6 +++---
 apps/user_ldap/l10n/da.php           |  6 +++---
 core/l10n/da.php                     |  2 +-
 core/l10n/fr.php                     |  2 +-
 core/l10n/zh_TW.php                  | 24 ++++++++++++++++++++++--
 l10n/templates/core.pot              |  2 +-
 l10n/templates/files.pot             |  2 +-
 l10n/templates/files_encryption.pot  |  2 +-
 l10n/templates/files_external.pot    | 12 ++++++------
 l10n/templates/files_sharing.pot     |  2 +-
 l10n/templates/files_trashbin.pot    |  2 +-
 l10n/templates/files_versions.pot    |  2 +-
 l10n/templates/lib.pot               | 16 ++++++++--------
 l10n/templates/private.pot           | 16 ++++++++--------
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/templates/user_webdavauth.pot   |  2 +-
 lib/l10n/fr.php                      |  8 ++++----
 lib/l10n/zh_TW.php                   | 21 ++++++++++++++++++++-
 settings/l10n/da.php                 |  4 ++--
 settings/l10n/fr.php                 | 26 +++++++++++++-------------
 83 files changed, 234 insertions(+), 79 deletions(-)
 create mode 100644 apps/files_encryption/l10n/es_CL.php
 create mode 100644 apps/files_encryption/l10n/ia.php
 create mode 100644 apps/files_encryption/l10n/ur_PK.php

diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 9a94174a617..e4f7d93aeed 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -85,7 +85,7 @@ $TRANSLATIONS = array(
 "Text file" => "Fichier texte",
 "New folder" => "Nouveau dossier",
 "Folder" => "Dossier",
-"From link" => "Depuis le lien",
+"From link" => "Depuis un lien",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
 "Download" => "Télécharger",
 "Upload too large" => "Téléversement trop volumineux",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 67084f28a55..394283b9621 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Unknown error" => "未知的錯誤",
 "Could not move %s - File with this name already exists" => "無法移動 %s ，同名的檔案已經存在",
 "Could not move %s" => "無法移動 %s",
+"Permission denied" => "存取被拒",
 "File name cannot be empty." => "檔名不能為空",
 "\"%s\" is an invalid file name." => "%s 是不合法的檔名。",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 \\ / < > : \" | ? * 字元",
@@ -70,6 +71,7 @@ $TRANSLATIONS = array(
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。",
 "{dirs} and {files}" => "{dirs} 和 {files}",
+"%s could not be renamed as it has been deleted" => "%s 已經被刪除了所以無法重新命名",
 "%s could not be renamed" => "無法重新命名 %s",
 "Upload (max. %s)" => "上傳（至多 %s）",
 "File handling" => "檔案處理",
diff --git a/apps/files_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
index d73b87da816..7cda7379693 100644
--- a/apps/files_encryption/l10n/ar.php
+++ b/apps/files_encryption/l10n/ar.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "خطأ غير معروف. ",
 "Recovery key successfully enabled" => "تم بنجاح تفعيل مفتاح الاستعادة",
 "Could not disable recovery key. Please check your recovery key password!" => "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
 "Recovery key successfully disabled" => "تم تعطيل مفتاح الاستعادة بنجاح",
diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php
index 0c037c67c59..d03ebb47b62 100644
--- a/apps/files_encryption/l10n/ast.php
+++ b/apps/files_encryption/l10n/ast.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Fallu desconocíu",
 "Recovery key successfully enabled" => "Habilitóse la recuperación de ficheros",
 "Could not disable recovery key. Please check your recovery key password!" => "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
 "Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
diff --git a/apps/files_encryption/l10n/az.php b/apps/files_encryption/l10n/az.php
index 8a9993ad40f..2cc8bd67df4 100644
--- a/apps/files_encryption/l10n/az.php
+++ b/apps/files_encryption/l10n/az.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Bəlli olmayan səhv baş verdi",
 "Recovery key successfully enabled" => "Bərpa açarı uğurla aktivləşdi",
 "Could not disable recovery key. Please check your recovery key password!" => "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
 "Recovery key successfully disabled" => "Bərpa açarı uğurla söndürüldü",
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index 46d1519e74b..0dce15dafd6 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Непозната грешка.",
 "Recovery key successfully enabled" => "Успешно включване на опцията ключ за възстановяване.",
 "Could not disable recovery key. Please check your recovery key password!" => "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
 "Recovery key successfully disabled" => "Успешно изключване на ключа за възстановяване.",
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
index 3d4c848d6ef..addbb917953 100644
--- a/apps/files_encryption/l10n/bn_BD.php
+++ b/apps/files_encryption/l10n/bn_BD.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "অজানা জটিলতা",
 "Recovery key successfully enabled" => "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
 "Recovery key successfully disabled" => "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
 "Password successfully changed." => "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
index f83fdd215c0..9d3d95c05cf 100644
--- a/apps/files_encryption/l10n/ca.php
+++ b/apps/files_encryption/l10n/ca.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Error desconegut",
 "Recovery key successfully enabled" => "La clau de recuperació s'ha activat",
 "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ó!",
 "Recovery key successfully disabled" => "La clau de recuperació s'ha descativat",
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 115e1553566..a0e7274926a 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,8 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Neznámá chyba",
+"Missing recovery key password" => "Chybí heslo klíče pro obnovu",
+"Please repeat the recovery key password" => "Zopakujte prosím heslo klíče pro obnovu",
+"Repeated recovery key password does not match the provided recovery key password" => "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
 "Recovery key successfully enabled" => "Záchranný klíč byl úspěšně povolen",
 "Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
 "Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
+"Please provide the old recovery password" => "Zapište prosím staré heslo pro obnovu",
+"Please provide a new recovery password" => "Zapište prosím nové heslo pro obnovu",
+"Please repeat the new recovery password" => "Zopakujte prosím nové heslo pro obnovu",
 "Password successfully changed." => "Heslo bylo úspěšně změněno.",
 "Could not change the password. Maybe the old password was not correct." => "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
 "Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index b3ff68ecfad..f63fa217dce 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -1,8 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Ukendt fejl",
+"Missing recovery key password" => "Der mangler kodeord for gendannelsesnøgle",
+"Please repeat the recovery key password" => "Gentag venligst kodeordet for gendannelsesnøglen",
+"Repeated recovery key password does not match the provided recovery key password" => "Det gentagne kodeord for gendannelsesnøglen stemmer ikke med det angivne kodeord for gendannelsesnøglen",
 "Recovery key successfully enabled" => "Gendannelsesnøgle aktiveret med succes",
 "Could not disable recovery key. Please check your recovery key password!" => "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
 "Recovery key successfully disabled" => "Gendannelsesnøgle deaktiveret succesfuldt",
+"Please provide the old recovery password" => "Angiv venligst det gamle kodeord for gendannelsesnøglen",
+"Please provide a new recovery password" => "Angiv venligst et nyt kodeord til gendannelse",
+"Please repeat the new recovery password" => "Gentag venligst det nye kodeord til gendannelse",
 "Password successfully changed." => "Kodeordet blev ændret succesfuldt",
 "Could not change the password. Maybe the old password was not correct." => "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
 "Private key password successfully updated." => "Privat nøgle kodeord succesfuldt opdateret.",
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
index 44277f2bf89..cd6d8ea9a28 100644
--- a/apps/files_encryption/l10n/de.php
+++ b/apps/files_encryption/l10n/de.php
@@ -1,8 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Unbekannter Fehler",
+"Missing recovery key password" => "Schlüsselpasswort zur Wiederherstellung fehlt",
+"Please repeat the recovery key password" => "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+"Repeated recovery key password does not match the provided recovery key password" => "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
 "Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
 "Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
+"Please provide the old recovery password" => "Bitte das alte Passwort zur Wiederherstellung eingeben",
+"Please provide a new recovery password" => "Bitte das alte Passwort zur Wiederherstellung eingeben",
+"Please repeat the new recovery password" => "Bitte das neue Passwort zur Wiederherstellung wiederholen",
 "Password successfully changed." => "Dein Passwort wurde geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
 "Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
@@ -17,10 +24,10 @@ $TRANSLATIONS = array(
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
 "Initial encryption started... This can take some time. Please wait." => "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
-"Initial encryption running... Please try again later." => "Initiale Verschlüsselung läuft... Bitte versuche es später wieder.",
-"Go directly to your %spersonal settings%s." => "Wechsle direkt zu Deinen %spersonal settings%s.",
+"Initial encryption running... Please try again later." => "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.",
+"Go directly to your %spersonal settings%s." => "Direkt zu Deinen %spersonal settings%s wechseln.",
 "Encryption" => "Verschlüsselung",
-"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 melden Dich nochmals ab und wieder an.",
+"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.",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
 "Recovery key password" => "Wiederherstellungsschlüssel-Passwort",
 "Repeat Recovery key password" => "Schlüssel-Passwort zur Wiederherstellung wiederholen",
@@ -31,8 +38,8 @@ $TRANSLATIONS = array(
 "New Recovery key password" => "Neues Wiederherstellungsschlüssel-Passwort",
 "Repeat New Recovery key password" => "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
 "Change Password" => "Passwort ändern",
-"Your private key password no longer matches your log-in password." => "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen.",
-"Set your old private key password to your current log-in password:" => "Setze Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Login-Passwort:",
+"Your private key password no longer matches your log-in password." => "Das Privatschlüsselpasswort darf nicht länger mit dem Anmeldepasswort übereinstimmen.",
+"Set your old private key password to your current log-in password:" => "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
 "Old log-in password" => "Altes Login Passwort",
 "Current log-in password" => "Aktuelles Passwort",
diff --git a/apps/files_encryption/l10n/de_CH.php b/apps/files_encryption/l10n/de_CH.php
index 2c5b51a2da7..9c2af0c93c6 100644
--- a/apps/files_encryption/l10n/de_CH.php
+++ b/apps/files_encryption/l10n/de_CH.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Unbekannter Fehler",
 "Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
 "Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
index 3fc71671ae1..b16a4003e87 100644
--- a/apps/files_encryption/l10n/de_DE.php
+++ b/apps/files_encryption/l10n/de_DE.php
@@ -1,8 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Unbekannter Fehler",
+"Missing recovery key password" => "Schlüsselpasswort zur Wiederherstellung fehlt",
+"Please repeat the recovery key password" => "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+"Repeated recovery key password does not match the provided recovery key password" => "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
 "Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
 "Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
 "Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+"Please provide the old recovery password" => "Bitte das alte Passwort zur Wiederherstellung eingeben",
+"Please provide a new recovery password" => "Bitte das neue Passwort zur Wiederherstellung eingeben",
+"Please repeat the new recovery password" => "Bitte das neue Passwort zur Wiederherstellung wiederholen",
 "Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
 "Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
 "Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
@@ -11,31 +18,31 @@ $TRANSLATIONS = array(
 "Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
 "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
 "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Datei-Besitzer, dass er die Datei nochmals mit Ihnen teilt.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Dateibesitzer, dass er die Datei nochmals mit Ihnen teilt.",
 "Unknown error. Please check your system settings or contact your administrator" => "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
 "Missing requirements." => "Fehlende Voraussetzungen",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
 "Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
-"Initial encryption started... This can take some time. Please wait." => "Anfangsverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
-"Initial encryption running... Please try again later." => "Anfangsverschlüsselung läuft... Bitte versuchen Sie es später wieder.",
+"Initial encryption started... This can take some time. Please wait." => "Anfangsverschlüsselung gestartet … Dieses kann einige Zeit dauern. Bitte warten.",
+"Initial encryption running... Please try again later." => "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
 "Go directly to your %spersonal settings%s." => "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
 "Encryption" => "Verschlüsselung",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden sich nochmals ab und wieder an.",
+"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
 "Recovery key password" => "Wiederherstellungschlüsselpasswort",
-"Repeat Recovery key password" => "Schlüssel-Passwort zur Wiederherstellung wiederholen",
+"Repeat Recovery key password" => "Schlüsselpasswort zur Wiederherstellung wiederholen",
 "Enabled" => "Aktiviert",
 "Disabled" => "Deaktiviert",
 "Change recovery key password:" => "Wiederherstellungsschlüsselpasswort ändern",
 "Old Recovery key password" => "Altes Wiederherstellungsschlüsselpasswort",
 "New Recovery key password" => "Neues Wiederherstellungsschlüsselpasswort ",
-"Repeat New Recovery key password" => "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
+"Repeat New Recovery key password" => "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
 "Change Password" => "Passwort ändern",
-"Your private key password no longer matches your log-in password." => "Das Privatschlüsselpasswort darf nicht länger mit den Login-Passwort übereinstimmen.",
-"Set your old private key password to your current log-in password:" => "Setzen Sie Ihr altes Privatschlüsselpasswort auf Ihr aktuelles LogIn-Passwort:",
+"Your private key password no longer matches your log-in password." => "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
+"Set your old private key password to your current log-in password:" => "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
-"Old log-in password" => "Altes Login-Passwort",
-"Current log-in password" => "Momentanes Login-Passwort",
+"Old log-in password" => "Altes Anmeldepasswort",
+"Current log-in password" => "Aktuelles Anmeldepasswort",
 "Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
 "Enable password recovery:" => "Die Passwort-Wiederherstellung aktivieren:",
 "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index ad9091e2d5b..e1fabbb169c 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Άγνωστο σφάλμα",
 "Recovery key successfully enabled" => "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
 "Could not disable recovery key. Please check your recovery key password!" => "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
 "Recovery key successfully disabled" => "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
index a9bf8caf750..7a9b248bc43 100644
--- a/apps/files_encryption/l10n/en_GB.php
+++ b/apps/files_encryption/l10n/en_GB.php
@@ -1,8 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Unknown error",
+"Missing recovery key password" => "Missing recovery key password",
+"Please repeat the recovery key password" => "Please repeat the recovery key password",
+"Repeated recovery key password does not match the provided recovery key password" => "Repeated recovery key password does not match the provided recovery key password",
 "Recovery key successfully enabled" => "Recovery key enabled successfully",
 "Could not disable recovery key. Please check your recovery key password!" => "Could not disable recovery key. Please check your recovery key password!",
 "Recovery key successfully disabled" => "Recovery key disabled successfully",
+"Please provide the old recovery password" => "Please provide the old recovery password",
+"Please provide a new recovery password" => "Please provide a new recovery password",
+"Please repeat the new recovery password" => "Please repeat the new recovery password",
 "Password successfully changed." => "Password changed successfully.",
 "Could not change the password. Maybe the old password was not correct." => "Could not change the password. Maybe the old password was incorrect.",
 "Private key password successfully updated." => "Private key password updated successfully.",
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
index 95ccafffe06..e8d50132128 100644
--- a/apps/files_encryption/l10n/eo.php
+++ b/apps/files_encryption/l10n/eo.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Nekonata eraro",
 "Password successfully changed." => "La pasvorto sukcese ŝanĝiĝis.",
 "Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
 "Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index dcf2960583e..164db17f4a7 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Error desconocido",
 "Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
 "Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
 "Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
index ee68ff6b707..d82e5fe0144 100644
--- a/apps/files_encryption/l10n/es_AR.php
+++ b/apps/files_encryption/l10n/es_AR.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Error desconocido",
 "Recovery key successfully enabled" => "Se habilitó la recuperación de archivos",
 "Could not disable recovery key. Please check your recovery key password!" => "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
 "Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
diff --git a/apps/files_encryption/l10n/es_CL.php b/apps/files_encryption/l10n/es_CL.php
new file mode 100644
index 00000000000..10621479ff2
--- /dev/null
+++ b/apps/files_encryption/l10n/es_CL.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Unknown error" => "Error desconocido"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_MX.php b/apps/files_encryption/l10n/es_MX.php
index d678144de8d..e25d34796e5 100644
--- a/apps/files_encryption/l10n/es_MX.php
+++ b/apps/files_encryption/l10n/es_MX.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Error desconocido",
 "Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
 "Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
 "Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 3f1df4cc306..0d786b6ce7d 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Tundmatu viga",
 "Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
 "Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
 "Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 41dddf6846f..2927008113e 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Errore ezezaguna",
 "Recovery key successfully enabled" => "Berreskuratze gakoa behar bezala gaitua",
 "Could not disable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
 "Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
index 54143f0df49..113bf65ca37 100644
--- a/apps/files_encryption/l10n/fa.php
+++ b/apps/files_encryption/l10n/fa.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "خطای نامشخص",
 "Recovery key successfully enabled" => "کلید بازیابی با موفقیت فعال شده است.",
 "Could not disable recovery key. Please check your recovery key password!" => "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
 "Recovery key successfully disabled" => "کلید بازیابی با موفقیت غیر فعال شده است.",
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
index 338cdb457ad..93ecf4c1ea7 100644
--- a/apps/files_encryption/l10n/fi_FI.php
+++ b/apps/files_encryption/l10n/fi_FI.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Tuntematon virhe",
 "Recovery key successfully enabled" => "Palautusavain kytketty päälle onnistuneesti",
 "Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
 "Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index a8ae53507c9..44919fbc0a3 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Erreur Inconnue ",
 "Recovery key successfully enabled" => "Clé de récupération activée avec succès",
 "Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
 "Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
index b41396bc53f..bf1cea07093 100644
--- a/apps/files_encryption/l10n/gl.php
+++ b/apps/files_encryption/l10n/gl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Produciuse un erro descoñecido",
 "Recovery key successfully enabled" => "Activada satisfactoriamente a chave de recuperación",
 "Could not disable recovery key. Please check your recovery key password!" => "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
 "Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
index ca8783d1964..fe514f5b01d 100644
--- a/apps/files_encryption/l10n/he.php
+++ b/apps/files_encryption/l10n/he.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "שגיאה בלתי ידועה",
 "Encryption" => "הצפנה"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/hr.php b/apps/files_encryption/l10n/hr.php
index 6c26c63de90..663c7940e46 100644
--- a/apps/files_encryption/l10n/hr.php
+++ b/apps/files_encryption/l10n/hr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Nepoznata pogreška",
 "Recovery key successfully enabled" => "Ključ za oporavak uspješno aktiviran",
 "Could not disable recovery key. Please check your recovery key password!" => "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
 "Recovery key successfully disabled" => "Ključ za ooravak uspješno deaktiviran",
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
index 4cd3275a9df..6c77da95331 100644
--- a/apps/files_encryption/l10n/hu_HU.php
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Ismeretlen hiba",
 "Recovery key successfully enabled" => "A helyreállítási kulcs sikeresen bekapcsolva",
 "Could not disable recovery key. Please check your recovery key password!" => "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
 "Recovery key successfully disabled" => "A helyreállítási kulcs sikeresen kikapcsolva",
diff --git a/apps/files_encryption/l10n/ia.php b/apps/files_encryption/l10n/ia.php
new file mode 100644
index 00000000000..513184ba1cd
--- /dev/null
+++ b/apps/files_encryption/l10n/ia.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Unknown error" => "Error Incognite"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index aa948efcfc9..c31c3e52089 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Galat tidak diketahui",
 "Recovery key successfully enabled" => "Kunci pemulihan berhasil diaktifkan",
 "Could not disable recovery key. Please check your recovery key password!" => "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
 "Recovery key successfully disabled" => "Kunci pemulihan berhasil dinonaktifkan",
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index 819d0a42794..d727ba16123 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Errore sconosciuto",
 "Recovery key successfully enabled" => "Chiave di ripristino abilitata 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.",
 "Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
index a1b3bc2ae9f..61a2f085a08 100644
--- a/apps/files_encryption/l10n/ja.php
+++ b/apps/files_encryption/l10n/ja.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "不明なエラー",
 "Recovery key successfully enabled" => "リカバリ用のキーを正常に有効にしました",
 "Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
 "Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
index d0634634778..f426e9b5ce7 100644
--- a/apps/files_encryption/l10n/ka_GE.php
+++ b/apps/files_encryption/l10n/ka_GE.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "უცნობი შეცდომა",
 "Encryption" => "ენკრიპცია"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/km.php b/apps/files_encryption/l10n/km.php
index e095f96faa3..9c700dfec15 100644
--- a/apps/files_encryption/l10n/km.php
+++ b/apps/files_encryption/l10n/km.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "មិន​ស្គាល់​កំហុស",
 "Password successfully changed." => "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
 "Could not change the password. Maybe the old password was not correct." => "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
 "Encryption" => "កូដនីយកម្ម",
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
index 2c32d0aea61..d90a98448f9 100644
--- a/apps/files_encryption/l10n/ko.php
+++ b/apps/files_encryption/l10n/ko.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "알 수 없는 오류",
 "Recovery key successfully enabled" => "복구 키가 성공적으로 활성화되었습니다",
 "Could not disable recovery key. Please check your recovery key password!" => "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해주세요!",
 "Recovery key successfully disabled" => "복구 키가 성공적으로 비활성화 되었습니다",
diff --git a/apps/files_encryption/l10n/lb.php b/apps/files_encryption/l10n/lb.php
index a33f4969b09..d9287f6dec9 100644
--- a/apps/files_encryption/l10n/lb.php
+++ b/apps/files_encryption/l10n/lb.php
@@ -1,5 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "Speicheren..."
+"Unknown error" => "Et ass en onbekannte Fehler opgetrueden"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
index d776abd2d70..837ace4a607 100644
--- a/apps/files_encryption/l10n/lt_LT.php
+++ b/apps/files_encryption/l10n/lt_LT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Neatpažinta klaida",
 "Recovery key successfully enabled" => "Atkūrimo raktas sėkmingai įjungtas",
 "Could not disable recovery key. Please check your recovery key password!" => "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
 "Recovery key successfully disabled" => "Atkūrimo raktas sėkmingai išjungtas",
diff --git a/apps/files_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
index cbf8b7cbdaf..367eac18795 100644
--- a/apps/files_encryption/l10n/lv.php
+++ b/apps/files_encryption/l10n/lv.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Nezināma kļūda",
 "Encryption" => "Šifrēšana"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
index 08a88ff1bbf..1a1e18f2231 100644
--- a/apps/files_encryption/l10n/mk.php
+++ b/apps/files_encryption/l10n/mk.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Непозната грешка",
 "Password successfully changed." => "Лозинката е успешно променета.",
 "Could not change the password. Maybe the old password was not correct." => "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
 "Missing requirements." => "Барања кои недостасуваат.",
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
index e13297dccb8..343aeba9f08 100644
--- a/apps/files_encryption/l10n/nb_NO.php
+++ b/apps/files_encryption/l10n/nb_NO.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Ukjent feil",
 "Recovery key successfully enabled" => "Gjenopprettingsnøkkel aktivert",
 "Could not disable recovery key. Please check your recovery key password!" => "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
 "Recovery key successfully disabled" => "Gjenopprettingsnøkkel ble deaktivert",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
index 09b5e5147eb..3dd7665d729 100644
--- a/apps/files_encryption/l10n/nl.php
+++ b/apps/files_encryption/l10n/nl.php
@@ -1,8 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Onbekende fout",
+"Missing recovery key password" => "Ontbrekende wachtwoord herstelsleutel",
+"Please repeat the recovery key password" => "Herhaal het herstelsleutel wachtwoord",
+"Repeated recovery key password does not match the provided recovery key password" => "Het herhaalde herstelsleutel wachtwoord kwam niet overeen met het eerdere herstelsleutel wachtwoord ",
 "Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
 "Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
 "Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
+"Please provide the old recovery password" => "Geef het oude herstelwachtwoord op",
+"Please provide a new recovery password" => "Geef een nieuw herstelwachtwoord op",
+"Please repeat the new recovery password" => "Herhaal het nieuwe herstelwachtwoord",
 "Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
 "Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
 "Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
index c472655c8b0..042104c5fb5 100644
--- a/apps/files_encryption/l10n/nn_NO.php
+++ b/apps/files_encryption/l10n/nn_NO.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Ukjend feil",
 "Encryption" => "Kryptering"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/pa.php b/apps/files_encryption/l10n/pa.php
index 58670990409..771dd8b4497 100644
--- a/apps/files_encryption/l10n/pa.php
+++ b/apps/files_encryption/l10n/pa.php
@@ -1,5 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saving..." => "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ"
+"Unknown error" => "ਅਣਜਾਣ ਗਲਤੀ"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index d34df8a6959..b7a66462ef2 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Nieznany błąd",
 "Recovery key successfully enabled" => "Klucz odzyskiwania włączony",
 "Could not disable recovery key. Please check your recovery key password!" => "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
 "Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index a06f4b78426..b5403e7a4ea 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Erro desconhecido",
+"Missing recovery key password" => "Senha da chave de recuperação em falta",
+"Please repeat the recovery key password" => "Por favor, repita a senha da chave de recuperação",
 "Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
 "Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
 "Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index a79d2d0681e..aede53f6414 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Erro Desconhecido",
 "Recovery key successfully enabled" => "A chave de recuperação foi ativada com sucesso",
 "Could not disable recovery key. Please check your recovery key password!" => "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
 "Recovery key successfully disabled" => "A chave de recuperação foi desativada com sucesso",
diff --git a/apps/files_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
index b1da7c9bb75..07b12b0f8a8 100644
--- a/apps/files_encryption/l10n/ro.php
+++ b/apps/files_encryption/l10n/ro.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Eroare necunoscută",
 "Recovery key successfully enabled" => "Cheia de recupeare a fost activata cu succes",
 "Could not disable recovery key. Please check your recovery key password!" => "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!",
 "Recovery key successfully disabled" => "Cheia de recuperare dezactivata cu succes",
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 80d996d2828..16c0f05cc71 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Неизвестная ошибка",
 "Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
 "Could not disable recovery key. Please check your recovery key password!" => "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
 "Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
index 49ff28bd0c2..2a35448539f 100644
--- a/apps/files_encryption/l10n/sk_SK.php
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Neznáma chyba",
 "Recovery key successfully enabled" => "Záchranný kľúč bol úspešne povolený",
 "Could not disable recovery key. Please check your recovery key password!" => "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
 "Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 5ae55fbb414..7c0f438fe4e 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Neznana napaka",
 "Recovery key successfully enabled" => "Ključ za obnovitev gesla je uspešno nastavljen",
 "Could not disable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
 "Recovery key successfully disabled" => "Ključ za obnovitev gesla je uspešno onemogočen",
diff --git a/apps/files_encryption/l10n/sq.php b/apps/files_encryption/l10n/sq.php
index f53db8e151c..85cb322bd8c 100644
--- a/apps/files_encryption/l10n/sq.php
+++ b/apps/files_encryption/l10n/sq.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Gabim panjohur",
 "Encryption" => "Kodifikimi"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
index cfdda4fdcd7..896e53b1397 100644
--- a/apps/files_encryption/l10n/sv.php
+++ b/apps/files_encryption/l10n/sv.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Okänt fel",
 "Recovery key successfully enabled" => "Återställningsnyckeln har framgångsrikt aktiverats",
 "Could not disable recovery key. Please check your recovery key password!" => "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
 "Recovery key successfully disabled" => "Återställningsnyckeln har framgångsrikt inaktiverats",
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
index cc670e425a6..12555767d4f 100644
--- a/apps/files_encryption/l10n/th_TH.php
+++ b/apps/files_encryption/l10n/th_TH.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
 "Encryption" => "การเข้ารหัส"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
index 78e1447ada7..7d5553ee649 100644
--- a/apps/files_encryption/l10n/tr.php
+++ b/apps/files_encryption/l10n/tr.php
@@ -1,8 +1,15 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Bilinmeyen hata",
+"Missing recovery key password" => "Eksik kurtarma anahtarı parolası",
+"Please repeat the recovery key password" => "Lütfen kurtarma anahtarı parolasını yenileyin",
+"Repeated recovery key password does not match the provided recovery key password" => "Yenilenen kurtarma anahtarı parolası, belirtilen kurtarma anahtarı parolası ile eşleşmiyor",
 "Recovery key successfully enabled" => "Kurtarma anahtarı başarıyla etkinleştirildi",
 "Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
 "Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
+"Please provide the old recovery password" => "Lütfen eski kurtarma parolasını girin",
+"Please provide a new recovery password" => "Lütfen yeni bir kurtarma parolası girin",
+"Please repeat the new recovery password" => "Lütfen yeni kurtarma parolasını yenileyin",
 "Password successfully changed." => "Parola başarıyla değiştirildi.",
 "Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
 "Private key password successfully updated." => "Özel anahtar parolası başarıyla güncellendi.",
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
index da9144bb930..b05008575f8 100644
--- a/apps/files_encryption/l10n/ug.php
+++ b/apps/files_encryption/l10n/ug.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "يوچۇن خاتالىق",
 "Encryption" => "شىفىرلاش"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 179987a8567..a2f67ebec75 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Невідома помилка",
 "Encryption" => "Шифрування",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
 "Change Password" => "Змінити Пароль"
diff --git a/apps/files_encryption/l10n/ur_PK.php b/apps/files_encryption/l10n/ur_PK.php
new file mode 100644
index 00000000000..fab26a330e9
--- /dev/null
+++ b/apps/files_encryption/l10n/ur_PK.php
@@ -0,0 +1,5 @@
+<?php
+$TRANSLATIONS = array(
+"Unknown error" => "غیر معروف خرابی"
+);
+$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
index 3c3078283bd..65c4bcf1f71 100644
--- a/apps/files_encryption/l10n/vi.php
+++ b/apps/files_encryption/l10n/vi.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "Lỗi chưa biết",
 "Recovery key successfully enabled" => "Khóa khôi phục kích hoạt thành công",
 "Could not disable recovery key. Please check your recovery key password!" => "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
 "Recovery key successfully disabled" => "Vô hiệu hóa khóa khôi phục thành công",
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index c20263f923e..74d7a36f569 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "未知错误",
 "Recovery key successfully enabled" => "恢复密钥成功启用",
 "Could not disable recovery key. Please check your recovery key password!" => "不能禁用恢复密钥。请检查恢复密钥密码！",
 "Recovery key successfully disabled" => "恢复密钥成功禁用",
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
index c9480c429f5..ea559b6f0db 100644
--- a/apps/files_encryption/l10n/zh_HK.php
+++ b/apps/files_encryption/l10n/zh_HK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "不明錯誤",
 "Encryption" => "加密",
 "Enabled" => "啟用",
 "Disabled" => "停用",
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
index 0c283fc28bd..d4028b58310 100644
--- a/apps/files_encryption/l10n/zh_TW.php
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Unknown error" => "未知的錯誤",
 "Recovery key successfully enabled" => "還原金鑰已成功開啟",
 "Could not disable recovery key. Please check your recovery key password!" => "無法停用還原金鑰。請檢查您的還原金鑰密碼!",
 "Recovery key successfully disabled" => "還原金鑰已成功停用",
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 27dd4bcbc67..608f8a4cc24 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -9,7 +9,7 @@ $TRANSLATIONS = array(
 "Shared by link" => "Partagés par lien",
 "No files have been shared with you yet." => "Aucun fichier n'est partagé avec vous pour l'instant.",
 "You haven't shared any files yet." => "Vous ne partagez pas de fichier pour l'instant.",
-"You haven't shared any files by link yet." => "Vous n'avez aucun partage de fichier par lien pour le moment.",
+"You haven't shared any files by link yet." => "Vous ne partagez pas de fichier par lien pour l'instant.",
 "Do you want to add the remote share {name} from {owner}@{remote}?" => "Voulez-vous ajouter le partage distant {name} de  {owner}@{remote} ?",
 "Remote share" => "Partage distant",
 "Remote share password" => "Mot de passe du partage distant",
@@ -34,7 +34,7 @@ $TRANSLATIONS = array(
 "Download %s" => "Télécharger %s",
 "Direct link" => "Lien direct",
 "Remote Shares" => "Partages distants",
-"Allow other instances to mount public links shared from this server" => "Autoriser d'autres instances à monter des liens publics, partagés depuis ce serveur",
-"Allow users to mount public link shares" => "Autoriser des utilisateurs à monter des liens de partages publics"
+"Allow other instances to mount public links shared from this server" => "Autoriser d'autres instances à monter les liens publics partagés depuis ce serveur",
+"Allow users to mount public link shares" => "Autoriser vos utilisateurs à monter les liens publics"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 401a5ca0598..31dbd08d1b3 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -78,9 +78,9 @@ $TRANSLATIONS = array(
 "Connection Settings" => "Forbindelsesindstillinger ",
 "Configuration Active" => "Konfiguration Aktiv",
 "When unchecked, this configuration will be skipped." => "Hvis der ikke er markeret, så springes denne konfiguration over.",
-"Backup (Replica) Host" => "Backup (Replika) Vært",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Opgiv en ikke obligatorisk backup server. Denne skal være en replikation af hoved-LDAP/AD serveren.",
-"Backup (Replica) Port" => "Backup (Replika) Port",
+"Backup (Replica) Host" => "Vært for sikkerhedskopier (replika)",
+"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Angiv valgfrit en vært for sikkerhedskopiering. Dette skal være en replikering af den primære LDAP/AD-server.",
+"Backup (Replica) Port" => "Port for sikkerhedskopi (replika)",
 "Disable Main Server" => "Deaktiver Hovedserver",
 "Only connect to the replica server." => "Forbind kun til replika serveren.",
 "Case insensitive LDAP server (Windows)" => "LDAP-server som ikke er versalfølsom (Windows)",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index eab26ee2ce7..8eace7d1662 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -201,7 +201,7 @@ $TRANSLATIONS = array(
 "%s will be updated to version %s." => "%s vil blive opdateret til version %s.",
 "The following apps will be disabled:" => "Følgende apps bliver deaktiveret:",
 "The theme %s has been disabled." => "Temaet, %s, er blevet deaktiveret.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Venligst sikrer dig en backup af databasen, config-mappen og data-mappen inden vi fortsætter.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
 "Start update" => "Begynd opdatering",
 "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
 "This %s instance is currently being updated, which may take a while." => "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index e13b85f74ed..e307542a902 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -8,7 +8,7 @@ $TRANSLATIONS = array(
 "Checked database schema update for apps" => "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
 "Updated \"%s\" to %s" => "Mise à jour de « %s » vers %s",
 "Disabled incompatible apps: %s" => "Applications incompatibles désactivées : %s",
-"No image or file provided" => "Aucune image ou fichier fourni",
+"No image or file provided" => "Aucun fichier fourni",
 "Unknown filetype" => "Type de fichier inconnu",
 "Invalid image" => "Image non valable",
 "No temporary profile picture available, try again" => "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 851663c5bd6..a431c6670da 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -68,6 +68,7 @@ $TRANSLATIONS = array(
 "Strong password" => "很強的密碼",
 "Your web server is not yet properly setup to allow files 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 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." => "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。",
+"Error occurred while checking server setup" => "檢查伺服器配置時發生錯誤",
 "Shared" => "已分享",
 "Shared with {recipients}" => "與 {recipients} 分享",
 "Share" => "分享",
@@ -79,6 +80,7 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} 已經和您分享",
 "Share with user or group …" => "與用戶或群組分享",
 "Share link" => "分享連結",
+"The public link will expire no later than {days} days after it is created" => "這個公開連結會在 {days} 天內失效",
 "Password protect" => "密碼保護",
 "Choose a password for the public link" => "為公開連結選一個密碼",
 "Allow Public Upload" => "允許任何人上傳",
@@ -86,6 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "寄出",
 "Set expiration date" => "指定到期日",
 "Expiration date" => "到期日",
+"Adding user..." => "新增使用者……",
 "group" => "群組",
 "Resharing is not allowed" => "不允許重新分享",
 "Shared in {item} with {user}" => "已和 {user} 分享 {item}",
@@ -103,7 +106,7 @@ $TRANSLATIONS = array(
 "Sending ..." => "正在傳送…",
 "Email sent" => "Email 已寄出",
 "Warning" => "警告",
-"The object type is not specified." => "未指定物件類型。",
+"The object type is not specified." => "未指定物件類型",
 "Enter new" => "輸入新的",
 "Delete" => "刪除",
 "Add" => "增加",
@@ -141,9 +144,23 @@ $TRANSLATIONS = array(
 "Error favoriting" => "加入最愛時出錯",
 "Error unfavoriting" => "從最愛移除出錯",
 "Access forbidden" => "存取被拒",
+"File not found" => "找不到檔案",
+"The specified document has not been found on the server." => "該文件不存在於伺服器上",
+"You can click here to return to %s." => "點這裡以回到 %s",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n",
 "The share will expire on %s." => "這個分享將會於 %s 過期",
 "Cheers!" => "太棒了！",
+"The server encountered an internal error and was unable to complete your request." => "伺服器遭遇內部錯誤，無法完成您的要求",
+"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節",
+"More details can be found in the server log." => "伺服器記錄檔裡面有更多細節",
+"Technical details" => "技術細節",
+"Remote Address: %s" => "遠端位置：%s",
+"Request ID: %s" => "請求編號：%s",
+"Code: %s" => "代碼：%s",
+"Message: %s" => "訊息：%s",
+"File: %s" => "檔案：%s",
+"Line: %s" => "行數：%s",
+"Trace" => "追蹤",
 "Security Warning" => "安全性警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "請更新 PHP 以安全地使用 %s。",
@@ -163,6 +180,7 @@ $TRANSLATIONS = array(
 "SQLite will be used as database. For larger installations we recommend to change this." => "將會使用 SQLite 作為資料庫，在大型安裝中建議使用其他種資料庫",
 "Finish setup" => "完成設定",
 "Finishing …" => "即將完成…",
+"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "這個應用程式需要 Javascript 才能正常運作，請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
 "%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。",
 "Log out" => "登出",
 "Server side authentication failed!" => "伺服器端認證失敗！",
@@ -185,6 +203,8 @@ $TRANSLATIONS = array(
 "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:" => "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令："
+"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "在大型安裝上，為了避免升級請求逾時，你也可以在安裝目錄執行下列指令：",
+"This %s instance is currently being updated, which may take a while." => "正在更新這個 %s 安裝，需要一段時間",
+"This page will refresh itself when the %s instance is available again." => "%s 安裝恢復可用之後，本頁會自動重新整理"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 76abecd74d8..cba4e0c5541 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index dcff7b9ed63..070e41764db 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index da7d5227eb5..492d189e51f 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 3244e5bde92..73239cab7e4 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -235,29 +235,29 @@ msgstr ""
 msgid "Saved"
 msgstr ""
 
-#: lib/config.php:670
+#: lib/config.php:713
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:680
+#: lib/config.php:723
 msgid " and "
 msgstr ""
 
-#: lib/config.php:702
+#: lib/config.php:745
 #, php-format
 msgid ""
 "<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."
 msgstr ""
 
-#: lib/config.php:704
+#: lib/config.php:747
 #, php-format
 msgid ""
 "<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."
 msgstr ""
 
-#: lib/config.php:706
+#: lib/config.php:749
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 88b523191c7..78cadd4d53d 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 755c09d36e5..54760486261 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 91f1f8ec980..2e9739c9328 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index e5a6939cdc1..0eb1eb19e58 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,34 +51,34 @@ msgid ""
 "before performing changes on config.php"
 msgstr ""
 
-#: private/app.php:391
+#: private/app.php:398
 msgid "Help"
 msgstr ""
 
-#: private/app.php:404
+#: private/app.php:411
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:415
+#: private/app.php:422
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:427
+#: private/app.php:434
 msgid "Users"
 msgstr ""
 
-#: private/app.php:440
+#: private/app.php:447
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:1135
+#: private/app.php:1150
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: private/app.php:1147
+#: private/app.php:1162
 msgid "No app name specified"
 msgstr ""
 
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index eecda989a9a..00ee07f1c2a 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,34 +18,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: app.php:391
+#: app.php:398
 msgid "Help"
 msgstr ""
 
-#: app.php:404
+#: app.php:411
 msgid "Personal"
 msgstr ""
 
-#: app.php:415
+#: app.php:422
 msgid "Settings"
 msgstr ""
 
-#: app.php:427
+#: app.php:434
 msgid "Users"
 msgstr ""
 
-#: app.php:440
+#: app.php:447
 msgid "Admin"
 msgstr ""
 
-#: app.php:1135
+#: app.php:1150
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: app.php:1147
+#: app.php:1162
 msgid "No app name specified"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8f57390666a..20af4dbd583 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 71a497053ee..6a35c1c7bd4 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 6bcab78b2c7..186e862c160 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-09 01:54-0400\n"
+"POT-Creation-Date: 2014-10-10 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index f63205bec9a..7c26c973f6f 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -61,16 +61,16 @@ $TRANSLATIONS = array(
 "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, seul les liens protégés sont autorisées.",
-"Sharing %s failed, because sharing with links is not allowed" => "Le partage de %s a échoué car un partage de lien n'est pas permis",
+"Sharing %s failed, because sharing with links is not allowed" => "Le partage de %s a échoué car le partage par lien n'est pas permis",
 "Share type %s is not valid for %s" => "Le type de partage %s n'est pas valide pour %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Le réglage des permissions pour %s a échoué car les permissions dépassent celle accordée à %s",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Le réglage des permissions pour %s a échoué car les permissions dépassent celles accordées à %s",
 "Setting permissions for %s failed, because the item was not found" => "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Impossible de configurer la date d'expiration. Un partage ne peut expirer plus de %s après sa date de début.",
+"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Impossible de configurer la date d'expiration. Un partage ne peut expirer plus de %s après sa création",
 "Cannot set expiration date. Expiration date is in the past" => "Impossible de configurer la date d'expiration. La date d'expiration est dans le passé.",
 "Sharing backend %s must implement the interface OCP\\Share_Backend" => "L'emplacement du partage %s doit implémenter l'interface OCP\\Share_Backend",
 "Sharing backend %s not found" => "Emplacement de partage %s introuvable",
 "Sharing backend for %s not found" => "L'emplacement du partage %s est introuvable",
-"Sharing %s failed, because the user %s is the original sharer" => "Le partage de %s a échoué car l'utilisateur %s est déjà l'utilisateur à l'origine du partage.",
+"Sharing %s failed, because the user %s is the original sharer" => "Le partage de %s a échoué car l'utilisateur %s est l'utilisateur à l'origine du partage.",
 "Sharing %s failed, because the permissions exceed permissions granted to %s" => "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s",
 "Sharing %s failed, because resharing is not allowed" => "Le partage de %s a échoué car le repartage n'est pas autorisé",
 "Sharing %s failed, because the sharing backend for %s could not find its source" => "Le partage %s a échoué parce que la source n'a été trouvée pour le partage %s.",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index c72bd00e2e7..d6a9d6fabfe 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -1,11 +1,17 @@
 <?php
 $TRANSLATIONS = array(
 "Cannot write into \"config\" directory!" => "無法寫入 config 目錄！",
+"This can usually be fixed by giving the webserver write access to the config directory" => "允許網頁伺服器寫入設定目錄通常可以解決這個問題",
+"See %s" => "見 %s",
+"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "%s允許網頁伺服器寫入設定目錄%s通常可以解決這個問題",
+"Sample configuration detected" => "偵測到範本設定",
+"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "看來您直接複製了範本設定來使用，這可能會毀掉你的安裝，請閱讀說明文件後對 config.php 進行適當的修改",
 "Help" => "說明",
 "Personal" => "個人",
 "Settings" => "設定",
 "Users" => "使用者",
 "Admin" => "管理",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。",
 "No app name specified" => "沒有指定應用程式名稱",
 "Unknown filetype" => "未知的檔案類型",
 "Invalid image" => "無效的圖片",
@@ -25,20 +31,31 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "應用程式未啟用",
 "Authentication error" => "認證錯誤",
 "Token expired. Please reload page." => "Token 過期，請重新整理頁面。",
+"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 資料庫名稱不能包含小數點",
 "MS SQL username and/or password not valid: %s" => "MS SQL 使用者和/或密碼無效：%s",
 "You need to enter either an existing account or the administrator." => "您必須輸入一個現有的帳號或管理員帳號。",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB 使用者或密碼不正確",
 "DB Error: \"%s\"" => "資料庫錯誤：\"%s\"",
 "Offending command was: \"%s\"" => "有問題的指令是：\"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB 使用者 '%s'@'localhost' 已經存在",
+"Drop this user from MySQL/MariaDB" => "自 MySQL/MariaDB 刪除這個使用者",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB 使用者 '%s'@'%%' 已經存在",
+"Drop this user from MySQL/MariaDB." => "自 MySQL/MariaDB 刪除這個使用者",
 "Oracle connection could not be established" => "無法建立 Oracle 資料庫連線",
 "Oracle username and/or password not valid" => "Oracle 用戶名和/或密碼無效",
 "Offending command was: \"%s\", name: %s, password: %s" => "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
 "PostgreSQL username and/or password not valid" => "PostgreSQL 用戶名和/或密碼無效",
 "Set an admin username." => "設定管理員帳號。",
 "Set an admin password." => "設定管理員密碼。",
+"Can't create or write into the data directory %s" => "無法建立或寫入資料目錄 %s",
 "%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",
+"Sharing %s failed, because the user %s is the item owner" => "分享 %s 失敗，因為 %s 才是此項目的擁有者",
+"Sharing %s failed, because the user %s does not exist" => "分享 %s 失敗，因為使用者 %s 不存在",
 "Could not find category \"%s\"" => "找不到分類：\"%s\"",
 "seconds ago" => "幾秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"),
@@ -51,6 +68,8 @@ $TRANSLATIONS = array(
 "last year" => "去年",
 "years ago" => "幾年前",
 "A valid username must be provided" => "必須提供一個有效的用戶名",
-"A valid password must be provided" => "一定要提供一個有效的密碼"
+"A valid password must be provided" => "一定要提供一個有效的密碼",
+"The username is already being used" => "這個使用者名稱已經有人使用了",
+"No database drivers (sqlite, mysql, or postgresql) installed." => "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 78f34de1c24..dcffc58e31a 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -26,7 +26,7 @@ $TRANSLATIONS = array(
 "Invalid email" => "Ugyldig e-mailadresse",
 "Unable to delete group" => "Gruppen kan ikke slettes",
 "Unable to delete user" => "Bruger kan ikke slettes",
-"Backups restored successfully" => "Backups succesfuld genskabt ",
+"Backups restored successfully" => "Genskabelsen af sikkerhedskopierne blev gennemført",
 "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
 "Language changed" => "Sprog ændret",
 "Invalid request" => "Ugyldig forespørgsel",
@@ -210,7 +210,7 @@ $TRANSLATIONS = array(
 "The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
 "Log-in password" => "Log-in kodeord",
 "Decrypt all Files" => "Dekrypter alle Filer ",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Din krypteringsmøgler er flyttet til en backup lokation . hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent hvis du er sikker på at alle filer er dekrypteret korrekt.",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
 "Restore Encryption Keys" => "Genopret Krypteringsnøgler",
 "Delete Encryption Keys" => "Slet Krypteringsnøgler",
 "Show storage location" => "Vis placering af lageret",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 6a077f66c27..1e8d2837ff6 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -130,18 +130,18 @@ $TRANSLATIONS = array(
 "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.",
 "Sharing" => "Partage",
 "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 via des liens",
-"Enforce password protection" => "Appliquer la protection par mot de passe",
+"Allow users to share via link" => "Autoriser les utilisateurs à partager par lien",
+"Enforce password protection" => "Obliger la protection par mot de passe",
 "Allow public uploads" => "Autoriser les téléversements publics",
 "Set default expiration date" => "Spécifier la date d'expiration par défaut",
-"Expire after " => "Expire après",
+"Expire after " => "Expiration après ",
 "days" => "jours",
-"Enforce expiration date" => "Impose la date d'expiration",
+"Enforce expiration date" => "Imposer la date d'expiration",
 "Allow resharing" => "Autoriser le repartage",
-"Restrict users to only share with users in their groups" => "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs de leurs groupes",
-"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer une notification par courriel concernant les fichiers partagés",
-"Exclude groups from sharing" => "Exclure  les groupes du partage",
-"These groups will still be able to receive shares, but not to initiate them." => "Ces groupes restent autorisés à partager, mais ne peuvent pas les initier",
+"Restrict users to only share with users in their groups" => "N'autoriser les partages qu'entre membres de même groupes",
+"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les fichiers partagés",
+"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 profiter des partages faits par d'autres. ",
 "Security" => "Sécurité",
 "Enforce HTTPS" => "Forcer HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
@@ -156,7 +156,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Informations d'identification",
 "SMTP Username" => "Nom d'utilisateur SMTP",
 "SMTP Password" => "Mot de passe SMTP",
-"Test email settings" => "Paramètres de test d'e-mail",
+"Test email settings" => "Tester les paramètres e-mail",
 "Send email" => "Envoyer un e-mail",
 "Log" => "Log",
 "Log level" => "Niveau de log",
@@ -166,7 +166,7 @@ $TRANSLATIONS = array(
 "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>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Ajoutez votre application",
 "More Apps" => "Plus d'applications…",
-"Select an App" => "Sélectionner une Application",
+"Select an App" => "Sélectionnez une Application",
 "Documentation:" => "Documentation :",
 "See application page at apps.owncloud.com" => "Voir la page de l'application sur apps.owncloud.com",
 "See application website" => "Voir le site web de l'application",
@@ -192,13 +192,13 @@ $TRANSLATIONS = array(
 "Your email address" => "Votre adresse e-mail",
 "Fill in an email address to enable password recovery and receive notifications" => "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
 "Profile picture" => "Photo de profil",
-"Upload new" => "Télécharger nouveau",
-"Select new from Files" => "Sélectionner un nouveau depuis les documents",
+"Upload new" => "Téléverser une nouvelle",
+"Select new from Files" => "Sélectionner une nouvelle depuis les Fichiers",
 "Remove image" => "Supprimer l'image",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
 "Your avatar is provided by your original account." => "Votre avatar est fourni par votre compte original.",
 "Cancel" => "Annuler",
-"Choose as profile image" => "Choisir en temps que photo de profil ",
+"Choose as profile image" => "Choisir en tant que photo de profil ",
 "Language" => "Langue",
 "Help translate" => "Aidez à traduire",
 "SSL root certificates" => "Certificats racine SSL",
-- 
GitLab


From f31d4caf57c46d648180184868d92f4780ba4b35 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 10 Oct 2014 11:49:45 +0200
Subject: [PATCH 061/616] coding style, no effective code changes

---
 apps/user_ldap/js/settings.js | 48 +++++++++++++++++------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index be643c81b4b..5c696000f5c 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -122,7 +122,7 @@ var LdapConfiguration = {
 			OC.filePath('user_ldap','ajax','clearMappings.php'),
 			'ldap_clear_mapping='+encodeURIComponent(mappingSubject),
 			function(result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					OC.dialogs.info(
 						t('user_ldap', 'mappings cleared'),
 						t('user_ldap', 'Success')
@@ -154,7 +154,7 @@ var LdapWizard = {
 			OC.filePath('user_ldap','ajax','wizard.php'),
 			param,
 			function(result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					fnOnSuccess(result);
 				} else {
 					fnOnError(result);
@@ -164,7 +164,7 @@ var LdapWizard = {
 	},
 
 	applyChanges: function (result) {
-		for (id in result.changes) {
+		for (var id in result.changes) {
 			LdapWizard.blacklistAdd(id);
 			if(id.indexOf('count') > 0) {
 				$('#'+id).text(result.changes[id]);
@@ -200,7 +200,7 @@ var LdapWizard = {
 
 	blacklistAdd: function(id) {
 		obj = $('#'+id);
-		if(!(obj[0].hasOwnProperty('multiple') && obj[0]['multiple'] == true)) {
+		if(!(obj[0].hasOwnProperty('multiple') && obj[0]['multiple'] === true)) {
 			//no need to blacklist multiselect
 			LdapWizard.saveBlacklist[id] = true;
 			return true;
@@ -375,7 +375,7 @@ var LdapWizard = {
 		LdapWizard.ajax(param,
 			function(result) {
 				$('#ldap_loginfilter_attributes').find('option').remove();
-				for (i in result.options['ldap_loginfilter_attributes']) {
+				for (var i in result.options['ldap_loginfilter_attributes']) {
 					//FIXME: move HTML into template
 					attr = result.options['ldap_loginfilter_attributes'][i];
 					$('#ldap_loginfilter_attributes').append(
@@ -411,7 +411,7 @@ var LdapWizard = {
 		LdapWizard.ajax(param,
 			function(result) {
 				$('#'+multisel).find('option').remove();
-				for (i in result.options[multisel]) {
+				for (var i in result.options[multisel]) {
 					//FIXME: move HTML into template
 					objc = result.options[multisel][i];
 					$('#'+multisel).append("<option value='"+objc+"'>"+objc+"</option>");
@@ -438,7 +438,7 @@ var LdapWizard = {
 			function (result) {
 				LdapWizard.hideSpinner('#'+multisel);
 				$('#'+multisel).multiselect('disable');
-				if(type == 'Users') {
+				if(type === 'Users') {
 					LdapWizard.userFilterAvailableGroupsHasRun = true;
 					LdapWizard.postInitUserFilter();
 				}
@@ -447,7 +447,7 @@ var LdapWizard = {
 	},
 
 	findObjectClasses: function(multisel, type) {
-		if(type != 'User' && type != 'Group') {
+		if(type !== 'User' && type !== 'Group') {
 			return false;
 		}
 		param = 'action=determine'+encodeURIComponent(type)+'ObjectClasses'+
@@ -458,7 +458,7 @@ var LdapWizard = {
 		LdapWizard.ajax(param,
 			function(result) {
 				$('#'+multisel).find('option').remove();
-				for (i in result.options[multisel]) {
+				for (var i in result.options[multisel]) {
 					//FIXME: move HTML into template
 					objc = result.options[multisel][i];
 					$('#'+multisel).append("<option value='"+objc+"'>"+objc+"</option>");
@@ -479,7 +479,7 @@ var LdapWizard = {
 			},
 			function (result) {
 				LdapWizard.hideSpinner('#'+multisel);
-				if(type == 'User') {
+				if(type === 'User') {
 					LdapWizard.userFilterObjectClassesHasRun = true;
 					LdapWizard.postInitUserFilter();
 				}
@@ -649,10 +649,10 @@ var LdapWizard = {
 	processChanges: function(triggerObj) {
 		LdapWizard.hideInfoBox();
 
-		if(triggerObj.id == 'ldap_host'
-		   || triggerObj.id == 'ldap_port'
-		   || triggerObj.id == 'ldap_dn'
-		   || triggerObj.id == 'ldap_agent_password') {
+		if(triggerObj.id === 'ldap_host'
+		   || triggerObj.id === 'ldap_port'
+		   || triggerObj.id === 'ldap_dn'
+		   || triggerObj.id === 'ldap_agent_password') {
 			LdapWizard.checkPort();
 			if($('#ldap_port').val()) {
 				//if Port is already set, check BaseDN
@@ -660,14 +660,14 @@ var LdapWizard = {
 			}
 		}
 
-		if(triggerObj.id == 'ldap_userlist_filter' && !LdapWizard.admin.isExperienced()) {
+		if(triggerObj.id === 'ldap_userlist_filter' && !LdapWizard.admin.isExperienced()) {
 			LdapWizard.detectEmailAttribute();
-		} else if(triggerObj.id == 'ldap_group_filter' && !LdapWizard.admin.isExperienced()) {
+		} else if(triggerObj.id === 'ldap_group_filter' && !LdapWizard.admin.isExperienced()) {
 			LdapWizard.detectGroupMemberAssoc();
 		}
 
-		if(triggerObj.id == 'ldap_loginfilter_username'
-		   || triggerObj.id == 'ldap_loginfilter_email') {
+		if(triggerObj.id === 'ldap_loginfilter_username'
+		   || triggerObj.id === 'ldap_loginfilter_email') {
 			LdapWizard.loginFilter.compose();
 		}
 
@@ -705,10 +705,10 @@ var LdapWizard = {
 				LdapWizard.initLoginFilter();
 			}
 			LdapWizard.loginFilter.compose();
-		} else if(originalObj == 'ldap_loginfilter_attributes') {
+		} else if(originalObj === 'ldap_loginfilter_attributes') {
 			LdapWizard.loginFilter.compose();
-		} else if(originalObj == 'ldap_groupfilter_objectclass'
-		   || originalObj == 'ldap_groupfilter_groups') {
+		} else if(originalObj === 'ldap_groupfilter_objectclass'
+		   || originalObj === 'ldap_groupfilter_groups') {
 			LdapWizard.groupFilter.compose();
 		}
 	},
@@ -723,7 +723,7 @@ var LdapWizard = {
 			OC.filePath('user_ldap','ajax','wizard.php'),
 			param,
 			function(result) {
-				if(result.status == 'success') {
+				if(result.status === 'success') {
 					LdapWizard.processChanges(object);
 				} else {
 // 					alert('Oooooooooooh :(');
@@ -754,7 +754,7 @@ var LdapWizard = {
 			filter.setMode(LdapWizard.filterModeRaw);
 			$(container).removeClass('invisible');
 			$(moc).multiselect('disable');
-			if($(mg).multiselect().attr('disabled') == 'disabled') {
+			if($(mg).multiselect().attr('disabled') === 'disabled') {
 				LdapWizard[stateVar] = 'disable';
 			} else {
 				LdapWizard[stateVar] = 'enable';
@@ -839,7 +839,7 @@ var LdapWizard = {
 				$('#ldap_loginfilter_email').prop('disabled', property);
 				$('#ldap_loginfilter_username').prop('disabled', property);
 				LdapWizard._save({ id: 'ldapLoginFilterMode' }, mode);
-				if(action == 'enable') {
+				if(action === 'enable') {
 					LdapWizard.loginFilter.compose();
 				}
 			}
-- 
GitLab


From 3431d547a9834dce70fab8a835862bb276c8575b Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 1 Oct 2014 15:13:10 +0200
Subject: [PATCH 062/616] fix performance issues

---
 apps/files_sharing/lib/share/folder.php |  47 +++++++++++
 apps/files_sharing/tests/backend.php    | 105 ++++++++++++++++++++++++
 lib/private/share/share.php             |  74 +++++++++++++----
 3 files changed, 208 insertions(+), 18 deletions(-)
 create mode 100644 apps/files_sharing/tests/backend.php

diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 4426beec636..2671f5738b7 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -21,6 +21,53 @@
 
 class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share_Backend_Collection {
 
+	/**
+	 * get shared parents
+	 *
+	 * @param int $itemSource item source ID
+	 * @param string $shareWith with whom should the item be shared
+	 * @return array with shares
+	 */
+	public function getParents($itemSource, $shareWith = null) {
+		$result = array();
+		$parent = $this->getParentId($itemSource);
+		while ($parent) {
+			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith);
+			if ($shares) {
+				foreach ($shares as $share) {
+					$name = substr($share['path'], strrpos($share['path'], '/') + 1);
+					$share['collection']['path'] = $name;
+					$share['collection']['item_type'] = 'folder';
+					$share['file_path'] = $name;
+					$displayNameOwner = \OCP\User::getDisplayName($share['uid_owner']);
+					$displayNameShareWith = \OCP\User::getDisplayName($share['share_with']);
+					$share['displayname_owner'] = ($displayNameOwner) ? $displayNameOwner : $share['uid_owner'];
+					$share['share_with_displayname'] = ($displayNameShareWith) ? $displayNameShareWith : $share['uid_owner'];
+
+					$result[] = $share;
+				}
+			}
+			$parent = $this->getParentId($parent);
+		}
+
+		return $result;
+	}
+
+	/**
+	 * get file cache ID of parent
+	 *
+	 * @param int $child file cache ID of child
+	 * @return mixed parent ID or null
+	 */
+	private function getParentId($child) {
+		$query = \OC_DB::prepare('SELECT `parent` FROM `*PREFIX*filecache` WHERE `fileid` = ?');
+		$result = $query->execute(array($child));
+		$row = $result->fetchRow();
+		$parent = ($row) ? $row['parent'] : null;
+
+		return $parent;
+	}
+
 	public function getChildren($itemSource) {
 		$children = array();
 		$parents = array($itemSource);
diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php
new file mode 100644
index 00000000000..9653713a9f9
--- /dev/null
+++ b/apps/files_sharing/tests/backend.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle
+ * @copyright 2014 Bjoern Schiessle <schiessle@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/>.
+ *
+ */
+
+require_once __DIR__ . '/base.php';
+
+use OCA\Files\Share;
+
+/**
+ * Class Test_Files_Sharing
+ */
+class Test_Files_Sharing_Backend extends Test_Files_Sharing_Base {
+
+	const TEST_FOLDER_NAME = '/folder_share_api_test';
+
+	public $folder;
+	public $subfolder;
+	public $subsubfolder;
+
+	function setUp() {
+		parent::setUp();
+
+		$this->folder = self::TEST_FOLDER_NAME;
+		$this->subfolder  = '/subfolder_share_backend_test';
+		$this->subsubfolder = '/subsubfolder_share_backend_test';
+
+		$this->filename = '/share-backend-test.txt';
+
+		// save file with content
+		$this->view->file_put_contents($this->filename, $this->data);
+		$this->view->mkdir($this->folder);
+		$this->view->mkdir($this->folder . $this->subfolder);
+		$this->view->mkdir($this->folder . $this->subfolder . $this->subsubfolder);
+		$this->view->file_put_contents($this->folder.$this->filename, $this->data);
+		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
+		$this->view->file_put_contents($this->folder . $this->subfolder . $this->subsubfolder . $this->filename, $this->data);
+	}
+
+	function tearDown() {
+		$this->view->unlink($this->filename);
+		$this->view->deleteAll($this->folder);
+
+		parent::tearDown();
+	}
+
+	function testGetParents() {
+
+		$fileinfo1 = $this->view->getFileInfo($this->folder);
+		$fileinfo2 = $this->view->getFileInfo($this->folder . $this->subfolder . $this->subsubfolder);
+		$fileinfo3 = $this->view->getFileInfo($this->folder . $this->subfolder . $this->subsubfolder . $this->filename);
+
+		$this->assertTrue(\OCP\Share::shareItem('folder', $fileinfo1['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				self::TEST_FILES_SHARING_API_USER2, 31));
+		$this->assertTrue(\OCP\Share::shareItem('folder', $fileinfo2['fileid'], \OCP\Share::SHARE_TYPE_USER,
+				self::TEST_FILES_SHARING_API_USER3, 31));
+
+		$backend = new \OC_Share_Backend_Folder();
+
+		$result = $backend->getParents($fileinfo3['fileid']);
+		$this->assertSame(2, count($result));
+
+		$count1 = 0;
+		$count2 = 0;
+		foreach($result as $r) {
+			if ($r['path'] === 'files' . $this->folder) {
+				$this->assertSame(ltrim($this->folder, '/'), $r['collection']['path']);
+				$count1++;
+			} elseif ($r['path'] === 'files' . $this->folder . $this->subfolder . $this->subsubfolder) {
+				$this->assertSame(ltrim($this->subsubfolder, '/'), $r['collection']['path']);
+				$count2++;
+			} else {
+				$this->assertTrue(false, 'unexpected result');
+			}
+		}
+
+		$this->assertSame(1, $count1);
+		$this->assertSame(1, $count2);
+
+		$result1 = $backend->getParents($fileinfo3['fileid'], self::TEST_FILES_SHARING_API_USER3);
+		$this->assertSame(1, count($result1));
+		$elemet = reset($result1);
+		$this->assertSame('files' . $this->folder . $this->subfolder . $this->subsubfolder ,$elemet['path']);
+		$this->assertSame(ltrim($this->subsubfolder, '/') ,$elemet['collection']['path']);
+
+	}
+
+}
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index d861f0510e4..e580acc19c6 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -295,8 +295,17 @@ class Share extends \OC\Share\Constants {
 		$shares = array();
 
 		$column = ($itemType === 'file' || $itemType === 'folder') ? 'file_source' : 'item_source';
+		if ($itemType === 'file' || $itemType === 'folder') {
+			$column = 'file_source';
+			$where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE';
+		} else {
+			$column = 'item_source';
+			$where = 'WHERE';
+		}
+
+		$select = self::createSelectStatement(self::FORMAT_NONE, true);
 
-		$where = ' `' . $column . '` = ? AND `item_type` = ? ';
+		$where .= ' `' . $column . '` = ? AND `item_type` = ? ';
 		$arguments = array($itemSource, $itemType);
 		// for link shares $user === null
 		if ($user !== null) {
@@ -304,13 +313,7 @@ class Share extends \OC\Share\Constants {
 			$arguments[] = $user;
 		}
 
-		// first check if there is a db entry for the specific user
-		$query = \OC_DB::prepare(
-				'SELECT *
-					FROM
-					`*PREFIX*share`
-					WHERE' . $where
-				);
+		$query = \OC_DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` '. $where);
 
 		$result = \OC_DB::executeAudited($query, $arguments);
 
@@ -323,7 +326,7 @@ class Share extends \OC\Share\Constants {
 			$groups = \OC_Group::getUserGroups($user);
 
 			$query = \OC_DB::prepare(
-					'SELECT `file_target`, `permissions`, `expiration`
+					'SELECT *
 						FROM
 						`*PREFIX*share`
 						WHERE
@@ -1296,7 +1299,7 @@ class Share extends \OC\Share\Constants {
 		}
 		if (isset($item)) {
 			$collectionTypes = self::getCollectionItemTypes($itemType);
-			if ($includeCollections && $collectionTypes) {
+			if ($includeCollections && $collectionTypes && !in_array('folder', $collectionTypes)) {
 				$where .= ' AND (';
 			} else {
 				$where .= ' AND';
@@ -1320,7 +1323,7 @@ class Share extends \OC\Share\Constants {
 				}
 			}
 			$queryArgs[] = $item;
-			if ($includeCollections && $collectionTypes) {
+			if ($includeCollections && $collectionTypes && !in_array('folder', $collectionTypes)) {
 				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
 				$where .= ' OR `item_type` IN ('.$placeholders.'))';
 				$queryArgs = array_merge($queryArgs, $collectionTypes);
@@ -1434,7 +1437,7 @@ class Share extends \OC\Share\Constants {
 							$mounts[$row['storage']] = current($mountPoints);
 						}
 					}
-					if ($mounts[$row['storage']]) {
+					if (!empty($mounts[$row['storage']])) {
 						$path = $mounts[$row['storage']]->getMountPoint().$row['path'];
 						$relPath = substr($path, $root); // path relative to data/user
 						$row['path'] = rtrim($relPath, '/');
@@ -1482,7 +1485,7 @@ class Share extends \OC\Share\Constants {
 					}
 				}
 				// Check if this is a collection of the requested item type
-				if ($includeCollections && $collectionTypes && in_array($row['item_type'], $collectionTypes)) {
+				if ($includeCollections && $collectionTypes && $row['item_type'] !== 'folder' && in_array($row['item_type'], $collectionTypes)) {
 					if (($collectionBackend = self::getBackend($row['item_type']))
 						&& $collectionBackend instanceof \OCP\Share_Backend_Collection) {
 						// Collections can be inside collections, check if the item is a collection
@@ -1542,6 +1545,15 @@ class Share extends \OC\Share\Constants {
 						$toRemove = $switchedItems[$toRemove];
 					}
 					unset($items[$toRemove]);
+				} elseif ($includeCollections && $collectionTypes && in_array($row['item_type'], $collectionTypes)) {
+					// FIXME: Thats a dirty hack to improve file sharing performance,
+					// see github issue #10588 for more details
+					// Need to find a solution which works for all back-ends
+					$collectionBackend = self::getBackend($row['item_type']);
+					$sharedParents = $collectionBackend->getParents($row['item_source']);
+					foreach ($sharedParents as $parent) {
+						$collectionItems[] = $parent;
+					}
 				}
 			}
 			if (!empty($collectionItems)) {
@@ -1549,6 +1561,20 @@ class Share extends \OC\Share\Constants {
 			}
 
 			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,
+			// see github issue #10588 for more details
+			// Need to find a solution which works for all back-ends
+			$collectionItems = array();
+			$collectionBackend = self::getBackend('folder');
+			$sharedParents = $collectionBackend->getParents($item, $shareWith);
+			foreach ($sharedParents as $parent) {
+				$collectionItems[] = $parent;
+			}
+			if ($limit === 1) {
+				return reset($collectionItems);
+			}
+			return self::formatResult($collectionItems, $column, $backend, $format, $parameters);
 		}
 
 		return array();
@@ -1804,6 +1830,8 @@ class Share extends \OC\Share\Constants {
 		$l = \OC::$server->getL10N('lib');
 		$result = array();
 
+		$column = ($itemType === 'file' || $itemType === 'folder') ? 'file_source' : 'item_source';
+
 		$checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true);
 		if ($checkReshare) {
 			// Check if attempting to share back to owner
@@ -1826,12 +1854,22 @@ class Share extends \OC\Share\Constants {
 				} else {
 					// TODO Don't check if inside folder
 					$result['parent'] = $checkReshare['id'];
-					$result['itemSource'] = $checkReshare['item_source'];
-					$result['fileSource'] = $checkReshare['file_source'];
-					$result['suggestedItemTarget'] = $checkReshare['item_target'];
-					$result['suggestedFileTarget'] = $checkReshare['file_target'];
-					$result['filePath'] = $checkReshare['file_target'];
 					$result['expirationDate'] = min($expirationDate, $checkReshare['expiration']);
+					// only suggest the same name as new target if it is a reshare of the
+					// same file/folder and not the reshare of a child
+					if ($checkReshare[$column] === $itemSource) {
+						$result['filePath'] = $checkReshare['file_target'];
+						$result['itemSource'] = $checkReshare['item_source'];
+						$result['fileSource'] = $checkReshare['file_source'];
+						$result['suggestedItemTarget'] = $checkReshare['item_target'];
+						$result['suggestedFileTarget'] = $checkReshare['file_target'];
+					} else {
+						$result['filePath'] = ($backend instanceof \OCP\Share_Backend_File_Dependent) ? $backend->getFilePath($itemSource, $uidOwner) : null;
+						$result['suggestedItemTarget'] = null;
+						$result['suggestedFileTarget'] = null;
+						$result['itemSource'] = $itemSource;
+						$result['fileSource'] = ($backend instanceof \OCP\Share_Backend_File_Dependent) ? $itemSource : null;
+					}
 				}
 			} else {
 				$message = 'Sharing %s failed, because resharing is not allowed';
-- 
GitLab


From ea7975ac8ba94b3dfcd3f61ff74847de97a881b4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 10 Oct 2014 13:30:03 +0200
Subject: [PATCH 063/616] always abort running ajax request when the method is
 fired up again

---
 apps/user_ldap/js/settings.js | 40 ++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 5c696000f5c..75a4830b28e 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -148,9 +148,15 @@ var LdapWizard = {
 	userFilter: false,
 	loginFilter: false,
 	groupFilter: false,
+	ajaxRequests: {},
 
-	ajax: function(param, fnOnSuccess, fnOnError) {
-		$.post(
+	ajax: function(param, fnOnSuccess, fnOnError, reqID) {
+		if(reqID !== undefined) {
+			if(LdapWizard.ajaxRequests.hasOwnProperty(reqID)) {
+				LdapWizard.ajaxRequests[reqID].abort();
+			}
+		}
+		var request = $.post(
 			OC.filePath('user_ldap','ajax','wizard.php'),
 			param,
 			function(result) {
@@ -161,6 +167,9 @@ var LdapWizard = {
 				}
 			}
 		);
+		if(reqID !== undefined) {
+			LdapWizard.ajaxRequests[reqID] = request;
+		}
 	},
 
 	applyChanges: function (result) {
@@ -244,7 +253,8 @@ var LdapWizard = {
 					LdapWizard.showInfoBox(t('user_ldap', 'Please specify a Base DN'));
 					LdapWizard.showInfoBox(t('user_ldap', 'Could not determine Base DN'));
 					$('#ldap_base').prop('disabled', false);
-				}
+				},
+				'guessBaseDN'
 			);
 		}
 	},
@@ -274,7 +284,8 @@ var LdapWizard = {
 					LdapWizard.hideSpinner('#ldap_port');
 					$('#ldap_port').prop('disabled', false);
 					LdapWizard.showInfoBox(t('user_ldap', 'Please specify the port'));
-				}
+				},
+				'guessPortAndTLS'
 			);
 		}
 	},
@@ -323,7 +334,7 @@ var LdapWizard = {
 				encodeURIComponent($('#ldap_serverconfig_chooser').val());
 
 		LdapWizard.showSpinner(spinnerID);
-		LdapWizard.ajax(param,
+		var request = LdapWizard.ajax(param,
 			function(result) {
 				LdapWizard.applyChanges(result);
 				LdapWizard.hideSpinner(spinnerID);
@@ -331,7 +342,8 @@ var LdapWizard = {
 			function (result) {
 				OC.Notification.show('Counting the entries failed with, ' + result.message);
 				LdapWizard.hideSpinner(spinnerID);
-			}
+			},
+			method
 		);
 	},
 
@@ -348,7 +360,7 @@ var LdapWizard = {
 				'&ldap_serverconfig_chooser='+
 				encodeURIComponent($('#ldap_serverconfig_chooser').val());
 		//runs in the background, no callbacks necessary
-		LdapWizard.ajax(param, LdapWizard.applyChanges, function(){});
+		LdapWizard.ajax(param, LdapWizard.applyChanges, function(){}, 'detectEmailAttribute');
 	},
 
 	detectGroupMemberAssoc: function() {
@@ -362,7 +374,8 @@ var LdapWizard = {
 			},
 			function (result) {
 				// error handling
-			}
+			},
+			'determineGroupMemberAssoc'
 		);
 	},
 
@@ -395,12 +408,13 @@ var LdapWizard = {
 									{noneSelectedText : 'No attributes found'});
 				$('#ldap_loginfilter_attributes').multiselect('disable');
 				LdapWizard.hideSpinner('#ldap_loginfilter_attributes');
-			}
+			},
+			'determineAttributes'
 		);
 	},
 
 	findAvailableGroups: function(multisel, type) {
-		if(type != 'Users' && type != 'Groups') {
+		if(type !== 'Users' && type !== 'Groups') {
 			return false;
 		}
 		param = 'action=determineGroupsFor'+encodeURIComponent(type)+
@@ -442,7 +456,8 @@ var LdapWizard = {
 					LdapWizard.userFilterAvailableGroupsHasRun = true;
 					LdapWizard.postInitUserFilter();
 				}
-			}
+			},
+			'findAvailableGroupsFor' + type
 		);
 	},
 
@@ -484,7 +499,8 @@ var LdapWizard = {
 					LdapWizard.postInitUserFilter();
 				}
 				//TODO: error handling
-			}
+			},
+			'determine' + type + 'ObjectClasses'
 		);
 	},
 
-- 
GitLab


From 836f0839e53baa7c7d8561dec1bf0d36813c715d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 10 Oct 2014 13:41:32 +0200
Subject: [PATCH 064/616] show a spinner next to test filter button when the
 test is running

---
 apps/user_ldap/js/ldapFilter.js |  6 +++---
 apps/user_ldap/js/settings.js   | 32 +++++++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 7fcf8bfb28b..bb66c1df2ee 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -145,10 +145,10 @@ LdapFilter.prototype.findFeatures = function() {
 	}
 };
 
-LdapFilter.prototype.updateCount = function() {
+LdapFilter.prototype.updateCount = function(doneCallback) {
 	if(this.target === 'User') {
-		LdapWizard.countUsers();
+		LdapWizard.countUsers(doneCallback);
 	} else if (this.target === 'Group') {
-		LdapWizard.countGroups();
+		LdapWizard.countGroups(doneCallback);
 	}
 };
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 75a4830b28e..6e936a91091 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -328,7 +328,7 @@ var LdapWizard = {
 		}
 	},
 
-	_countThings: function(method, spinnerID) {
+	_countThings: function(method, spinnerID, doneCallback) {
 		param = 'action='+method+
 				'&ldap_serverconfig_chooser='+
 				encodeURIComponent($('#ldap_serverconfig_chooser').val());
@@ -338,21 +338,27 @@ var LdapWizard = {
 			function(result) {
 				LdapWizard.applyChanges(result);
 				LdapWizard.hideSpinner(spinnerID);
+				if(doneCallback !== undefined) {
+					doneCallback(method);
+				}
 			},
 			function (result) {
 				OC.Notification.show('Counting the entries failed with, ' + result.message);
 				LdapWizard.hideSpinner(spinnerID);
+				if(doneCallback !== undefined) {
+					doneCallback(method);
+				}
 			},
 			method
 		);
 	},
 
-	countGroups: function() {
-		LdapWizard._countThings('countGroups', '#ldap_group_count');
+	countGroups: function(doneCallback) {
+		LdapWizard._countThings('countGroups', '#ldap_group_count', doneCallback);
 	},
 
-	countUsers: function() {
-		LdapWizard._countThings('countUsers', '#ldap_user_count');
+	countUsers: function(doneCallback) {
+		LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
 	},
 
 	detectEmailAttribute: function() {
@@ -586,6 +592,16 @@ var LdapWizard = {
 		});
 	},
 
+	hideTestSpinner:function (countMethod) {
+		var selector;
+		if(countMethod === 'countUsers') {
+			selector = '#rawUserFilterContainer .ldapGetEntryCount';
+		} else {
+			selector = '#rawGroupFilterContainer .ldapGetEntryCount';
+		}
+		LdapWizard.hideSpinner(selector);
+	},
+
 	/** init user filter tab section **/
 
 	instantiateFilters: function() {
@@ -599,7 +615,8 @@ var LdapWizard = {
 		$('#rawUserFilterContainer .ldapGetEntryCount').click(function(event) {
 			event.preventDefault();
 			$('#ldap_user_count').text('');
-			LdapWizard.userFilter.updateCount();
+			LdapWizard.showSpinner('#rawUserFilterContainer .ldapGetEntryCount');
+			LdapWizard.userFilter.updateCount(LdapWizard.hideTestSpinner);
 			LdapWizard.detectEmailAttribute();
 			$('#ldap_user_count').removeClass('hidden');
 		});
@@ -619,7 +636,8 @@ var LdapWizard = {
 		$('#rawGroupFilterContainer .ldapGetEntryCount').click(function(event) {
 			event.preventDefault();
 			$('#ldap_group_count').text('');
-			LdapWizard.groupFilter.updateCount();
+			LdapWizard.showSpinner('#rawGroupFilterContainer .ldapGetEntryCount');
+			LdapWizard.groupFilter.updateCount(LdapWizard.hideTestSpinner);
 			LdapWizard.detectGroupMemberAssoc();
 			$('#ldap_group_count').removeClass('hidden');
 		});
-- 
GitLab


From 527e1d001f7ef2d7b624dfa2df5efea0382e84f1 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 9 Oct 2014 15:38:40 +0200
Subject: [PATCH 065/616] try to get path from filesystem

---
 apps/files_sharing/lib/share/file.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index dacdb9308be..a5b4e75bceb 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -49,6 +49,11 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 			$path = $this->path;
 			$this->path = null;
 			return $path;
+		} else {
+			$path = \OC\Files\Filesystem::getPath($itemSource);
+			if ($path) {
+				return $path;
+			}
 		}
 		return false;
 	}
-- 
GitLab


From 6775c9ed32432bd3324f7c6191d50c6de44c3d4b Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Fri, 10 Oct 2014 09:42:58 -0700
Subject: [PATCH 066/616] small corrections to config.sample.php

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

diff --git a/config/config.sample.php b/config/config.sample.php
index 02958ace0c2..63206938988 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -40,27 +40,32 @@ $CONFIG = array(
  * This is a unique identifier for your ownCloud installation, created
  * automatically by the installer. Do not change it.
  */
-'instanceid' => '',
+'instanceid' => 'd3c944a9a',
 
 /**
  * The salt used to hash all passwords, auto-generated by the ownCloud
  * installer. (There are also per-user salts.) If you lose this salt you lose
  * all your passwords.
  */
-'passwordsalt' => '',
+'passwordsalt' => 'd3c944a9af095aa08f',
 
 /**
  * Your list of trusted domains that users can log into. Specifying trusted
  * domains prevents host header poisoning. Do not remove this, as it performs
  * necessary security checks.
  */
-'trusted_domains' => array('demo.example.org', 'otherdomain.example.org:8080'),
+'trusted_domains' => 
+  array (
+    0 => 'demo.example.org',
+    1 => 'otherdomain.example.org:8080',
+  ),
+
 
 /**
  * Where user files are stored; this defaults to ``data/`` in the ownCloud
  * directory. The SQLite database is also stored here, when you use SQLite.
  */
-'datadirectory' => '',
+'datadirectory' => '/var/www/owncloud/data',
 
 /**
  * The current version number of your ownCloud installation. This is set up
@@ -642,10 +647,11 @@ $CONFIG = array(
  */
 
 /**
- * Blacklist a specific file and disallow the upload of files with this name
+ * Blacklist a specific file or files and disallow the upload of files 
+ * with this name
  * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING.
  */
-'blacklisted_files' => array('.htaccess'),
+'blacklisted_files' => array('filename1', 'filename2'),
 
 /**
  * Define a default folder for shared files and folders other than root.
-- 
GitLab


From a0db01ecd3f10476751eea258176ef742bbdacd3 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 11 Oct 2014 01:55:02 -0400
Subject: [PATCH 067/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/it.php    | 12 +++++--
 apps/files_encryption/l10n/pt_BR.php |  4 +++
 core/l10n/fr.php                     |  4 +--
 core/l10n/sv.php                     |  6 ++++
 l10n/templates/core.pot              |  2 +-
 l10n/templates/files.pot             |  2 +-
 l10n/templates/files_encryption.pot  |  2 +-
 l10n/templates/files_external.pot    |  2 +-
 l10n/templates/files_sharing.pot     |  2 +-
 l10n/templates/files_trashbin.pot    |  2 +-
 l10n/templates/files_versions.pot    |  2 +-
 l10n/templates/lib.pot               | 48 ++++++++++++++--------------
 l10n/templates/private.pot           | 48 ++++++++++++++--------------
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/templates/user_webdavauth.pot   |  2 +-
 settings/l10n/sv.php                 |  3 ++
 17 files changed, 82 insertions(+), 63 deletions(-)

diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
index d727ba16123..24fd9e99dd0 100644
--- a/apps/files_encryption/l10n/it.php
+++ b/apps/files_encryption/l10n/it.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Errore sconosciuto",
-"Recovery key successfully enabled" => "Chiave di ripristino abilitata 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.",
-"Recovery key successfully disabled" => "Chiave di ripristinata disabilitata correttamente",
+"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",
+"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 recupero disabilitata correttamente",
+"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",
 "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.",
 "Private key password successfully updated." => "Password della chiave privata aggiornata correttamente.",
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
index b5403e7a4ea..50b0e8421e6 100644
--- a/apps/files_encryption/l10n/pt_BR.php
+++ b/apps/files_encryption/l10n/pt_BR.php
@@ -3,9 +3,13 @@ $TRANSLATIONS = array(
 "Unknown error" => "Erro desconhecido",
 "Missing recovery key password" => "Senha da chave de recuperação em falta",
 "Please repeat the recovery key password" => "Por favor, repita a senha da chave de recuperação",
+"Repeated recovery key password does not match the provided recovery key password" => "A senha repetidas da chave de valorização não corresponde a senha da chave de recuperação prevista",
 "Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
 "Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
 "Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
+"Please provide the old recovery password" => "Por favor, forneça a antiga senha de recuperação",
+"Please provide a new recovery password" => "Por favor, forneça a nova senha de recuperação",
+"Please repeat the new recovery password" => "Por favor, repita a nova senha de recuperação",
 "Password successfully changed." => "Senha alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
 "Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index e307542a902..861fb4d54f6 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -12,7 +12,7 @@ $TRANSLATIONS = array(
 "Unknown filetype" => "Type de fichier inconnu",
 "Invalid image" => "Image non valable",
 "No temporary profile picture available, try again" => "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
-"No crop data provided" => "Aucune donnée de rognage fournie",
+"No crop data provided" => "Aucune donnée de recadrage fournie",
 "Sunday" => "Dimanche",
 "Monday" => "Lundi",
 "Tuesday" => "Mardi",
@@ -40,7 +40,7 @@ $TRANSLATIONS = array(
 "Saving..." => "Enregistrement…",
 "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." => "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
-"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 ?",
+"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(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
 "I know what I'm doing" => "Je sais ce que je fais",
 "Reset password" => "Réinitialiser le mot de passe",
 "Password can not be changed. Please contact your administrator." => "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 489ce234e45..389fbd15758 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -4,6 +4,7 @@ $TRANSLATIONS = array(
 "Turned on maintenance mode" => "Aktiverade underhållsläge",
 "Turned off maintenance mode" => "Deaktiverade underhållsläge",
 "Updated database" => "Uppdaterade databasen",
+"Updated \"%s\" to %s" => "Uppdaterade \"%s\" till %s",
 "Disabled incompatible apps: %s" => "Inaktiverade inkompatibla appar: %s",
 "No image or file provided" => "Ingen bild eller fil har tillhandahållits",
 "Unknown filetype" => "Okänd filtyp",
@@ -65,6 +66,7 @@ $TRANSLATIONS = array(
 "Strong password" => "Starkt lösenord",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
 "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." => "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner.",
+"Error occurred while checking server setup" => "Ett fel inträffade när en kontroll utav servens setup gjordes",
 "Shared" => "Delad",
 "Shared with {recipients}" => "Delad med {recipients}",
 "Share" => "Dela",
@@ -84,6 +86,7 @@ $TRANSLATIONS = array(
 "Send" => "Skicka",
 "Set expiration date" => "Sätt utgångsdatum",
 "Expiration date" => "Utgångsdatum",
+"Adding user..." => "Lägger till användare...",
 "group" => "Grupp",
 "Resharing is not allowed" => "Dela vidare är inte tillåtet",
 "Shared in {item} with {user}" => "Delad i {item} med {user}",
@@ -139,6 +142,7 @@ $TRANSLATIONS = array(
 "Error favoriting" => "Fel favorisering",
 "Error unfavoriting" => "Fel av favorisering ",
 "Access forbidden" => "Åtkomst förbjuden",
+"File not found" => "Filen kunde inte hittas",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
 "The share will expire on %s." => "Utdelningen kommer att upphöra %s.",
 "Cheers!" => "Ha de fint!",
@@ -176,6 +180,8 @@ $TRANSLATIONS = array(
 "Thank you for your patience." => "Tack för ditt tålamod.",
 "You are accessing the server from an untrusted domain." => "Du ansluter till servern från en osäker domän.",
 "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
+"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
+"Add \"%s\" as trusted domain" => "Lägg till \"%s\" som en trusted domain",
 "%s will be updated to version %s." => "%s kommer att uppdateras till version %s.",
 "The following apps will be disabled:" => "Följande appar kommer att inaktiveras:",
 "The theme %s has been disabled." => "Temat  %s har blivit inaktiverat.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index cba4e0c5541..b174f012459 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 070e41764db..9daf121e7e7 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 492d189e51f..6e1010d39f2 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 73239cab7e4..6a8d435d3ae 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 78cadd4d53d..3f93248b37e 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 54760486261..ad5333e278e 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 2e9739c9328..788257a6eb7 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 0eb1eb19e58..0d05d0be970 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -273,126 +273,126 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:505
+#: private/share/share.php:508
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:512
+#: private/share/share.php:515
 #, php-format
 msgid "You are not allowed to share %s"
 msgstr ""
 
-#: private/share/share.php:542
+#: private/share/share.php:545
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:548
+#: private/share/share.php:551
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:557
+#: private/share/share.php:560
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: private/share/share.php:570 private/share/share.php:598
+#: private/share/share.php:573 private/share/share.php:601
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:578
+#: private/share/share.php:581
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:585
+#: private/share/share.php:588
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:639
+#: private/share/share.php:642
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: private/share/share.php:668
+#: private/share/share.php:671
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:675
+#: private/share/share.php:678
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:899
+#: private/share/share.php:902
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:960
+#: private/share/share.php:963
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:998
+#: private/share/share.php:1001
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: private/share/share.php:1006
+#: private/share/share.php:1009
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: private/share/share.php:1132
+#: private/share/share.php:1135
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:1139
+#: private/share/share.php:1142
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:1145
+#: private/share/share.php:1148
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1812
+#: private/share/share.php:1840
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1822
+#: private/share/share.php:1850
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1838
+#: private/share/share.php:1876
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1852
+#: private/share/share.php:1890
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1866
+#: private/share/share.php:1904
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 00ee07f1c2a..a713f8c6763 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -232,126 +232,126 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: share/share.php:505
+#: share/share.php:508
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: share/share.php:512
+#: share/share.php:515
 #, php-format
 msgid "You are not allowed to share %s"
 msgstr ""
 
-#: share/share.php:542
+#: share/share.php:545
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: share/share.php:548
+#: share/share.php:551
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: share/share.php:557
+#: share/share.php:560
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: share/share.php:570 share/share.php:598
+#: share/share.php:573 share/share.php:601
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: share/share.php:578
+#: share/share.php:581
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: share/share.php:585
+#: share/share.php:588
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: share/share.php:639
+#: share/share.php:642
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: share/share.php:668
+#: share/share.php:671
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: share/share.php:675
+#: share/share.php:678
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: share/share.php:899
+#: share/share.php:902
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: share/share.php:960
+#: share/share.php:963
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: share/share.php:998
+#: share/share.php:1001
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: share/share.php:1006
+#: share/share.php:1009
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: share/share.php:1132
+#: share/share.php:1135
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: share/share.php:1139
+#: share/share.php:1142
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: share/share.php:1145
+#: share/share.php:1148
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: share/share.php:1812
+#: share/share.php:1840
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: share/share.php:1822
+#: share/share.php:1850
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: share/share.php:1838
+#: share/share.php:1876
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: share/share.php:1852
+#: share/share.php:1890
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: share/share.php:1866
+#: share/share.php:1904
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 20af4dbd583..caf2f5c4856 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 6a35c1c7bd4..6b4d282c388 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 186e862c160..196e7094269 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-10 01:54-0400\n"
+"POT-Creation-Date: 2014-10-11 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index f38b8ac2cb1..5a8271d7933 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
 "Unable to change password" => "Kunde inte ändra lösenord",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
+"Add trusted domain" => "Lägg till trusted domain",
 "Sending..." => "Skickar...",
 "All" => "Alla",
 "User Documentation" => "Användardokumentation",
@@ -65,6 +67,7 @@ $TRANSLATIONS = array(
 "So-so password" => "Okej lösenord",
 "Good password" => "Bra lösenord",
 "Strong password" => "Starkt lösenord",
+"Valid until {date}" => "Giltig t.o.m. {date}",
 "Delete" => "Radera",
 "Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
 "Delete encryption keys permanently." => "Radera krypteringsnycklar permanent",
-- 
GitLab


From 257cf1fc34e3054ec5b5926fba2199200dbbc442 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Sat, 11 Oct 2014 15:10:54 +0200
Subject: [PATCH 068/616] Page size calculation based on real page height

This is fix for https://github.com/owncloud/core/issues/10060
Instead of hard coding page size as 20 items, we check real page height, and divide by 50 (height of one row).
This will allow to load fewer items on small screens and enough items on large screens (4k, portrait orientation, etc.).
Also checking page height on every load to respond on browser window resizing,
---
 apps/files/js/filelist.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 86cba29e76c..eafef6c2a5e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -49,8 +49,10 @@
 		fileSummary: null,
 		initialized: false,
 
-		// number of files per page
-		pageSize: 20,
+		// number of files per page, calculated dynamically
+		pageSize: function() {
+			return Math.ceil($('#app-content').height() / 50);
+		},
 
 		/**
 		 * Array of files in the current folder.
@@ -496,7 +498,7 @@
 		 */
 		_nextPage: function(animate) {
 			var index = this.$fileList.children().length,
-				count = this.pageSize,
+				count = this.pageSize(),
 				tr,
 				fileData,
 				newTrs = [],
@@ -1189,7 +1191,7 @@
 			// if there are less elements visible than one page
 			// but there are still pending elements in the array,
 			// then directly append the next page
-			if (lastIndex < this.files.length && lastIndex < this.pageSize) {
+			if (lastIndex < this.files.length && lastIndex < this.pageSize()) {
 				this._nextPage(true);
 			}
 
-- 
GitLab


From a3635fedbbc18093ec36958fc9d3104decc02b23 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 12 Oct 2014 01:54:39 -0400
Subject: [PATCH 069/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/bg_BG.php |  6 ++++
 core/l10n/zh_CN.php                  | 27 ++++++++++++++-
 l10n/templates/core.pot              |  2 +-
 l10n/templates/files.pot             |  2 +-
 l10n/templates/files_encryption.pot  |  2 +-
 l10n/templates/files_external.pot    |  2 +-
 l10n/templates/files_sharing.pot     |  2 +-
 l10n/templates/files_trashbin.pot    |  2 +-
 l10n/templates/files_versions.pot    |  2 +-
 l10n/templates/lib.pot               |  2 +-
 l10n/templates/private.pot           |  2 +-
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/templates/user_webdavauth.pot   |  2 +-
 lib/l10n/zh_TW.php                   | 49 +++++++++++++++++++++++++++-
 settings/l10n/zh_CN.php              | 15 +++++++++
 16 files changed, 107 insertions(+), 14 deletions(-)

diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
index 0dce15dafd6..43d089671cb 100644
--- a/apps/files_encryption/l10n/bg_BG.php
+++ b/apps/files_encryption/l10n/bg_BG.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Непозната грешка.",
+"Missing recovery key password" => "Липсва парола за възстановяване",
+"Please repeat the recovery key password" => "Повтори новата парола за възстановяване",
+"Repeated recovery key password does not match the provided recovery key password" => "Повторената парола за възстановяване не съвпада със зададената парола за възстановяване",
 "Recovery key successfully enabled" => "Успешно включване на опцията ключ за възстановяване.",
 "Could not disable recovery key. Please check your recovery key password!" => "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
 "Recovery key successfully disabled" => "Успешно изключване на ключа за възстановяване.",
+"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." => "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
 "Private key password successfully updated." => "Успешно променена тайната парола за ключа.",
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 24390dec4a1..3f177994c22 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -5,6 +5,8 @@ $TRANSLATIONS = array(
 "Turned off maintenance mode" => "关闭维护模式",
 "Updated database" => "数据库已更新",
 "Checked database schema update" => "已经检查数据库架构更新",
+"Checked database schema update for apps" => "已经检查数据库架构更新",
+"Updated \"%s\" to %s" => "更新 \"%s\" 为 %s",
 "Disabled incompatible apps: %s" => "禁用不兼容应用：%s",
 "No image or file provided" => "没有提供图片或文件",
 "Unknown filetype" => "未知的文件类型",
@@ -66,6 +68,7 @@ $TRANSLATIONS = array(
 "Strong password" => "强密码",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
 "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." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
+"Error occurred while checking server setup" => "当检查服务器启动时出错",
 "Shared" => "已共享",
 "Shared with {recipients}" => "由{recipients}分享",
 "Share" => "分享",
@@ -85,6 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "发送",
 "Set expiration date" => "设置过期日期",
 "Expiration date" => "过期日期",
+"Adding user..." => "添加用户中...",
 "group" => "组",
 "Resharing is not allowed" => "不允许二次共享",
 "Shared in {item} with {user}" => "在 {item} 与 {user} 共享。",
@@ -140,9 +144,23 @@ $TRANSLATIONS = array(
 "Error favoriting" => "收藏时出错",
 "Error unfavoriting" => "删除收藏时出错",
 "Access forbidden" => "访问禁止",
+"File not found" => "文件未找到",
+"The specified document has not been found on the server." => "在服务器上没找到指定的文件。",
+"You can click here to return to %s." => "你可以点击这里返回 %s。",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n",
 "The share will expire on %s." => "此分享将在 %s 过期。",
 "Cheers!" => "干杯！",
+"The server encountered an internal error and was unable to complete your request." => "服务器发送一个内部错误并且无法完成你的请求。",
+"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
+"More details can be found in the server log." => "更多细节能在服务器日志中找到。",
+"Technical details" => "技术细节",
+"Remote Address: %s" => "远程地址： %s",
+"Request ID: %s" => "请求 ID: %s",
+"Code: %s" => "代码: %s",
+"Message: %s" => "消息: %s",
+"File: %s" => "文件: %s",
+"Line: %s" => "行: %s",
+"Trace" => "追踪",
 "Security Warning" => "安全警告",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "为保证安全使用 %s 请更新您的PHP。",
@@ -162,6 +180,7 @@ $TRANSLATIONS = array(
 "SQLite will be used as database. For larger installations we recommend to change this." => "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
 "Finish setup" => "安装完成",
 "Finishing …" => "正在结束 ...",
+"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
 "%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。",
 "Log out" => "注销",
 "Server side authentication failed!" => "服务端验证失败！",
@@ -176,10 +195,16 @@ $TRANSLATIONS = array(
 "Contact your system administrator if this message persists or appeared unexpectedly." => "如果这个消息一直存在或不停出现，请联系你的系统管理员。",
 "Thank you for your patience." => "感谢让你久等了。",
 "You are accessing the server from an untrusted domain." => "您正在访问来自不信任域名的服务器。",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
+"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
+"Add \"%s\" as trusted domain" => "添加 \"%s\"为信任域",
 "%s will be updated to version %s." => "%s 将会更新到版本 %s。",
 "The following apps will be disabled:" => "以下应用将会被禁用：",
 "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" => "开始更新"
+"Start update" => "开始更新",
+"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：",
+"This %s instance is currently being updated, which may take a while." => "当前ownCloud实例 %s 正在更新，可能需要一段时间。",
+"This page will refresh itself when the %s instance is available again." => "当实例 %s 再次可用时这个页面将刷新。"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index b174f012459..d5f77e328d1 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 9daf121e7e7..3833c867033 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 6e1010d39f2..15a0bcd972b 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 6a8d435d3ae..99b4c06106c 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 3f93248b37e..f288dfeb120 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index ad5333e278e..15e0d042f9e 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 788257a6eb7..0c2d2b62680 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 0d05d0be970..9f5bba4540a 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index a713f8c6763..35f5986aea2 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index caf2f5c4856..c48b6d1380c 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 6b4d282c388..b64c2992c19 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 196e7094269..49123db5b68 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-11 01:54-0400\n"
+"POT-Creation-Date: 2014-10-12 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index d6a9d6fabfe..84cb621ce24 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -56,6 +56,25 @@ $TRANSLATIONS = array(
 "You are not allowed to share %s" => "你不被允許分享 %s",
 "Sharing %s failed, because the user %s is the item owner" => "分享 %s 失敗，因為 %s 才是此項目的擁有者",
 "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 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" => "您必須為公開連結設定一組密碼，我們只允許受密碼保護的連結",
+"Sharing %s failed, because sharing with links is not allowed" => "分享 %s 失敗，因為目前不允許使用連結分享",
+"Share type %s is not valid for %s" => "分享類型 %s 對於 %s 來說無效",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "為 %s 設定權限失敗，因為欲設定的權限超出開放給 %s 的範圍",
+"Setting permissions for %s failed, because the item was not found" => "為 %s 設定權限失敗，因為找不到該項目",
+"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "無法設定到期日，在分享之後，到期日不能設定為 %s 之後",
+"Cannot set expiration date. Expiration date is in the past" => "無法設定過去的日期為到期日",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "分享後端 %s 必須實作 OCP\\Share_Backend interface",
+"Sharing backend %s not found" => "找不到分享後端 %s",
+"Sharing backend for %s not found" => "找不到 %s 的分享後端",
+"Sharing %s failed, because the user %s is the original sharer" => "分享 %s 失敗，因為使用者 %s 即是原本的分享者",
+"Sharing %s failed, because the permissions exceed permissions granted to %s" => "分享 %s 失敗，因為權限設定超出了授權給 %s 的範圍",
+"Sharing %s failed, because resharing is not allowed" => "分享 %s 失敗，不允許重複分享",
+"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\"",
 "seconds ago" => "幾秒前",
 "_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"),
@@ -67,9 +86,37 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n 個月前"),
 "last year" => "去年",
 "years ago" => "幾年前",
+"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" => "一定要提供一個有效的密碼",
 "The username is already being used" => "這個使用者名稱已經有人使用了",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)"
+"No database drivers (sqlite, mysql, or postgresql) installed." => "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)",
+"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "通常藉由%s開放網頁伺服器對根目錄的權限%s就可以修正權限問題",
+"Cannot write into \"config\" directory" => "無法寫入 config 目錄",
+"Cannot write into \"apps\" directory" => "無法寫入 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." => "通常藉由%s開放網頁伺服器對 apps 目錄的權限%s或是在設定檔中關閉 appstore 就可以修正這個問題",
+"Cannot create \"data\" directory (%s)" => "無法建立 data 目錄 (%s)",
+"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "通常藉由<a href=\"%s\" target=\"_blank\">開放網頁伺服器對根目錄的權限</a>就可以修正權限問題",
+"Setting locale to %s failed" => "設定語系為 %s 失敗",
+"Please install one of these locales on your system and restart your webserver." => "請在系統中安裝這些語系的其中一個，然後重啓網頁伺服器",
+"Please ask your server administrator to install the module." => "請詢問系統管理員來安裝這些模組",
+"PHP module %s not installed." => "未安裝 PHP 模組 %s",
+"PHP %s or higher is required." => "需要 PHP %s 或更高版本",
+"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "請詢問系統管理員將 PHP 升級至最新版，目前的 PHP 版本已經不再被 ownCloud 和 PHP 社群支援",
+"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP 安全模式已經啟動，ownCloud 需要您將它關閉才能正常運作",
+"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP 安全模式已經被棄用，並且在大多數狀況下無助於提升安全性，它應該被關閉。請詢問系統管理員將其在 php.ini 或網頁伺服器當中關閉。",
+"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes 已經被啟用，ownCloud 需要您將其關閉以正常運作",
+"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes 功能在大多數狀況下不會使用到，已經被上游棄用，因此它應該被停用。請詢問系統管理員將其在 php.ini 或網頁伺服器當中停用。",
+"PHP modules have been installed, but they are still listed as missing?" => "你已經安裝了指定的 PHP 模組，可是還是顯示為找不到嗎？",
+"Please ask your server administrator to restart the web server." => "請聯絡您的系統管理員重新啟動網頁伺服器",
+"PostgreSQL >= 9 required" => "需要 PostgreSQL 版本 >= 9",
+"Please upgrade your database version" => "請升級您的資料庫版本",
+"Error occurred while checking PostgreSQL version" => "檢查 PostgreSQL 版本時發生錯誤",
+"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "請確定您的 PostgreSQL 版本 >= 9，或是看看記錄檔是否有更詳細的訊息",
+"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "請將該目錄權限設定為 0770 ，以免其他使用者讀取",
+"Data directory (%s) is readable by other users" => "資料目錄 (%s) 可以被其他使用者讀取",
+"Data directory (%s) is invalid" => "資料目錄 (%s) 無效",
+"Please check that the data directory contains a file \".ocdata\" in its root." => "請確保資料目錄當中包含一個 .ocdata 的檔案",
+"Could not obtain lock type %d on \"%s\"." => "無法取得鎖定：類型 %d ，檔案 %s"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index d02a9f620ad..3c2dca4c0b1 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -40,6 +40,8 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "错误的管理员恢复密码。请检查密码并重试。",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "后端不支持修改密码，但是用户的加密密码已成功更新。",
 "Unable to change password" => "不能更改密码",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "你真的希望添加 \"{domain}\" 为信任域？",
+"Add trusted domain" => "添加信任域",
 "Sending..." => "正在发送...",
 "All" => "全部",
 "User Documentation" => "用户文档",
@@ -65,6 +67,7 @@ $TRANSLATIONS = array(
 "So-so password" => "一般强度的密码",
 "Good password" => "较强的密码",
 "Strong password" => "强密码",
+"Valid until {date}" => "有效期至 {date}",
 "Delete" => "删除",
 "Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
 "Delete encryption keys permanently." => "永久删除加密密钥。",
@@ -107,10 +110,16 @@ $TRANSLATIONS = array(
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
 "Your PHP version is outdated" => "您的 PHP 版本不是最新版",
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "您的 PHP 版本已过期。强烈建议更新至 5.3.8 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。",
+"PHP charset is not set to UTF-8" => "PHP字符集没有设置为UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP字符集没有设置为UTF-8。这会导致非ASC||字符的文件名出现乱码。我们强烈建议修改php.ini文件中的'default_charset' 的值为 'UTF-8'",
 "Locale not working" => "本地化无法工作",
 "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 to install the required packages on your system to support one of the following locales: %s." => "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
+"URL generation in notification emails" => "在通知邮件里生成URL",
+"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
+"Connectivity checks" => "网络连接检查",
+"No problems found" => "未发现问题",
 "Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
 "Cron" => "计划任务",
 "Last cron was executed at %s." => "上次定时任务执行于 %s。",
@@ -193,6 +202,10 @@ $TRANSLATIONS = array(
 "Language" => "语言",
 "Help translate" => "帮助翻译",
 "SSL root certificates" => "SSL根证书",
+"Common Name" => "通用名称",
+"Valid until" => "有效期至",
+"Issued By" => "授权由",
+"Valid until %s" => "有效期至 %s",
 "Import Root Certificate" => "导入根证书",
 "The encryption app is no longer enabled, please decrypt all your files" => "加密 app 不再被启用，请解密您所有的文件",
 "Log-in password" => "登录密码",
@@ -200,6 +213,8 @@ $TRANSLATIONS = array(
 "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
 "Restore Encryption Keys" => "恢复加密密钥",
 "Delete Encryption Keys" => "删除加密密钥",
+"Show storage location" => "显示存储位置",
+"Show last log in" => "显示最后登录",
 "Login Name" => "登录名称",
 "Create" => "创建",
 "Admin Recovery Password" => "管理恢复密码",
-- 
GitLab


From 4b9465b937a7754d2b58a77cf8f12adeaccef993 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 13 Oct 2014 01:54:35 -0400
Subject: [PATCH 070/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/da.php   | 2 +-
 l10n/templates/core.pot             | 2 +-
 l10n/templates/files.pot            | 2 +-
 l10n/templates/files_encryption.pot | 2 +-
 l10n/templates/files_external.pot   | 2 +-
 l10n/templates/files_sharing.pot    | 2 +-
 l10n/templates/files_trashbin.pot   | 2 +-
 l10n/templates/files_versions.pot   | 2 +-
 l10n/templates/lib.pot              | 2 +-
 l10n/templates/private.pot          | 2 +-
 l10n/templates/settings.pot         | 2 +-
 l10n/templates/user_ldap.pot        | 2 +-
 l10n/templates/user_webdavauth.pot  | 2 +-
 settings/l10n/da.php                | 2 +-
 settings/l10n/fr.php                | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
index f63fa217dce..d47b88487dc 100644
--- a/apps/files_encryption/l10n/da.php
+++ b/apps/files_encryption/l10n/da.php
@@ -23,7 +23,7 @@ $TRANSLATIONS = array(
 "Missing requirements." => "Manglende betingelser.",
 "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
 "Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:",
-"Initial encryption started... This can take some time. Please wait." => "Førstegangskryptering er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
+"Initial encryption started... This can take some time. Please wait." => "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
 "Initial encryption running... Please try again later." => "Kryptering foretages... Prøv venligst igen senere.",
 "Go directly to your %spersonal settings%s." => "Gå direkte til dine %spersonlige indstillinger%s.",
 "Encryption" => "Kryptering",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d5f77e328d1..2deb44c1b30 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 3833c867033..a3d68ce1dcb 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 15a0bcd972b..c23c3508aff 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 99b4c06106c..1426cba24ae 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index f288dfeb120..b240d545a69 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 15e0d042f9e..dd727868f8a 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 0c2d2b62680..636dce12182 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 9f5bba4540a..334d673904b 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 35f5986aea2..6329d562857 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c48b6d1380c..f8f99e1b636 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index b64c2992c19..b6cd7852312 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 49123db5b68..8d9aad981f4 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-12 01:54-0400\n"
+"POT-Creation-Date: 2014-10-13 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index dcffc58e31a..bfb599bb09c 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -179,7 +179,7 @@ $TRANSLATIONS = array(
 "Commercial Support" => "Kommerciel support",
 "Get the apps to sync your files" => "Hent applikationerne for at synkronisere dine filer",
 "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Hvis du vil støtte projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spred budskabet</a>!",
-"Show First Run Wizard again" => "Vis Første Kørsels Guiden igen.",
+"Show First Run Wizard again" => "Vis guiden for første kørsel igen.",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
 "Password" => "Kodeord",
 "Your password was changed" => "Din adgangskode blev ændret",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 1e8d2837ff6..96c38db5d4d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -141,7 +141,7 @@ $TRANSLATIONS = array(
 "Restrict users to only share with users in their groups" => "N'autoriser les partages qu'entre membres de même groupes",
 "Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les fichiers partagés",
 "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 profiter des partages faits par d'autres. ",
+"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. ",
 "Security" => "Sécurité",
 "Enforce HTTPS" => "Forcer HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
-- 
GitLab


From 6cbabdf217f55df3655143aa82b6e5e74650df05 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 13 Oct 2014 12:54:21 +0200
Subject: [PATCH 071/616] Fixed array detection on public download

When downloading a folder called "0001" PHP should fallback to parsing
it as string and properly detect that it is not a JSON array.
---
 apps/files_sharing/public.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 5c75168d9a9..4320c105103 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -114,7 +114,7 @@ if (isset($path)) {
 			$files = $_GET['files'];
 			$files_list = json_decode($files);
 			// in case we get only a single file
-			if ($files_list === NULL ) {
+			if (!is_array($files_list)) {
 				$files_list = array($files);
 			}
 			OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
-- 
GitLab


From 19de425a509be555ac90a20ba4051cdd70606495 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Oct 2014 13:09:05 +0200
Subject: [PATCH 072/616] Use the cached fileinfo to get creatable permissions

---
 lib/private/connector/sabre/directory.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 597fbdae0cc..1b6d1f363b8 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -84,7 +84,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
 	 * @return void
 	 */
 	public function createDirectory($name) {
-		if (!$this->fileView->isCreatable($this->path)) {
+		if (!$this->info->isCreatable()) {
 			throw new \Sabre\DAV\Exception\Forbidden();
 		}
 
-- 
GitLab


From 912fbfab0192f0e523fcf8ef34d462dd8f379335 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Oct 2014 13:11:48 +0200
Subject: [PATCH 073/616] Unset the cached active user when using a different
 session object

---
 lib/private/user/session.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index 5517e08a25d..b9c341b4ae9 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -91,8 +91,8 @@ class Session implements IUserSession, Emitter {
 		// fetch the deprecated \OC::$session if it changed for backwards compatibility
 		if (isset(\OC::$session) && \OC::$session !== $this->session) {
 			\OC::$server->getLogger()->warning(
-				'One of your installed apps still seems to use the deprecated '.
-				'\OC::$session and has replaced it with a new instance. Please file a bug against it.'.
+				'One of your installed apps still seems to use the deprecated ' .
+				'\OC::$session and has replaced it with a new instance. Please file a bug against it.' .
 				'Closing and replacing session in UserSession instance.'
 			);
 			$this->setSession(\OC::$session);
@@ -110,6 +110,7 @@ class Session implements IUserSession, Emitter {
 			$this->session->close();
 		}
 		$this->session = $session;
+		$this->activeUser = null;
 
 		// maintain deprecated \OC::$session
 		if (\OC::$session !== $this->session) {
@@ -195,7 +196,7 @@ class Session implements IUserSession, Emitter {
 	public function login($uid, $password) {
 		$this->manager->emit('\OC\User', 'preLogin', array($uid, $password));
 		$user = $this->manager->checkPassword($uid, $password);
-		if($user !== false) {
+		if ($user !== false) {
 			if (!is_null($user)) {
 				if ($user->isEnabled()) {
 					$this->setUser($user);
@@ -221,7 +222,7 @@ class Session implements IUserSession, Emitter {
 	public function loginWithCookie($uid, $currentToken) {
 		$this->manager->emit('\OC\User', 'preRememberedLogin', array($uid));
 		$user = $this->manager->get($uid);
-		if(is_null($user)) {
+		if (is_null($user)) {
 			// user does not exist
 			return false;
 		}
@@ -229,7 +230,7 @@ class Session implements IUserSession, Emitter {
 		// get stored tokens
 		$tokens = \OC_Preferences::getKeys($uid, 'login_token');
 		// test cookies token against stored tokens
-		if(!in_array($currentToken, $tokens, true)) {
+		if (!in_array($currentToken, $tokens, true)) {
 			return false;
 		}
 		// replace successfully used token with a new one
@@ -275,13 +276,13 @@ class Session implements IUserSession, Emitter {
 		unset($_COOKIE["oc_username"]); //TODO: DI
 		unset($_COOKIE["oc_token"]);
 		unset($_COOKIE["oc_remember_login"]);
-		setcookie('oc_username', '', time()-3600, \OC::$WEBROOT);
-		setcookie('oc_token', '', time()-3600, \OC::$WEBROOT);
-		setcookie('oc_remember_login', '', time()-3600, \OC::$WEBROOT);
+		setcookie('oc_username', '', time() - 3600, \OC::$WEBROOT);
+		setcookie('oc_token', '', time() - 3600, \OC::$WEBROOT);
+		setcookie('oc_remember_login', '', time() - 3600, \OC::$WEBROOT);
 		// old cookies might be stored under /webroot/ instead of /webroot
 		// and Firefox doesn't like it!
-		setcookie('oc_username', '', time()-3600, \OC::$WEBROOT . '/');
-		setcookie('oc_token', '', time()-3600, \OC::$WEBROOT . '/');
-		setcookie('oc_remember_login', '', time()-3600, \OC::$WEBROOT . '/');
+		setcookie('oc_username', '', time() - 3600, \OC::$WEBROOT . '/');
+		setcookie('oc_token', '', time() - 3600, \OC::$WEBROOT . '/');
+		setcookie('oc_remember_login', '', time() - 3600, \OC::$WEBROOT . '/');
 	}
 }
-- 
GitLab


From 50841f8307648baccd26cf4df6fbacaad4865191 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 13 Oct 2014 15:03:44 +0200
Subject: [PATCH 074/616] Close session when loading apps

Otherwise the session is blocked while all remote apps are loaded. This can be very annoying especially when apps.owncloud.com is down or not reachable.
---
 settings/apps.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/settings/apps.php b/settings/apps.php
index 6021574cbb3..b725c87b0ab 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -22,6 +22,7 @@
 */
 
 OC_Util::checkAdminUser();
+\OC::$server->getSession()->close();
 
 // Load the files we need
 OCP\Util::addStyle('settings', 'settings' );
-- 
GitLab


From c6c9a51b111acbec51b6dcbaa3cba7497631a2ab Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 13 Oct 2014 14:49:16 +0200
Subject: [PATCH 075/616] distinguish between file dependent shares and other
 shares

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

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index e580acc19c6..5314e09b8de 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -293,9 +293,10 @@ class Share extends \OC\Share\Constants {
 	public static function getItemSharedWithUser($itemType, $itemSource, $user) {
 
 		$shares = array();
+		$fileDependend = false;
 
-		$column = ($itemType === 'file' || $itemType === 'folder') ? 'file_source' : 'item_source';
 		if ($itemType === 'file' || $itemType === 'folder') {
+			$fileDependend = true;
 			$column = 'file_source';
 			$where = 'INNER JOIN `*PREFIX*filecache` ON `file_source` = `*PREFIX*filecache`.`fileid` WHERE';
 		} else {
@@ -303,7 +304,7 @@ class Share extends \OC\Share\Constants {
 			$where = 'WHERE';
 		}
 
-		$select = self::createSelectStatement(self::FORMAT_NONE, true);
+		$select = self::createSelectStatement(self::FORMAT_NONE, $fileDependend);
 
 		$where .= ' `' . $column . '` = ? AND `item_type` = ? ';
 		$arguments = array($itemSource, $itemType);
-- 
GitLab


From d485c0098d58454b8dbd25e574a363a500244942 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 13 Oct 2014 15:52:48 +0200
Subject: [PATCH 076/616] Retrieve storage numeric id earlier when still
 available

The numeric id is only available before the storage entry is deleted, so
get it at that time.
---
 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 a38656d8499..d7d57811a7d 100644
--- a/lib/private/files/cache/storage.php
+++ b/lib/private/files/cache/storage.php
@@ -105,10 +105,10 @@ class Storage {
 	 */
 	public static function remove($storageId) {
 		$storageId = self::adjustStorageId($storageId);
+		$numericId = self::getNumericStorageId($storageId);
 		$sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?';
 		\OC_DB::executeAudited($sql, array($storageId));
 
-		$numericId = self::getNumericStorageId($storageId);
 		if (!is_null($numericId)) {
 			$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `storage` = ?';
 			\OC_DB::executeAudited($sql, array($numericId));
-- 
GitLab


From 7dd4314feabb6d2bda676b96a3e9f3f23c23ae4d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Oct 2014 16:31:26 +0200
Subject: [PATCH 077/616] Add unit test

---
 tests/lib/user/session.php | 96 +++++++++++++++++++++++++-------------
 1 file changed, 63 insertions(+), 33 deletions(-)

diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
index 2845a9c964a..5126049d77f 100644
--- a/tests/lib/user/session.php
+++ b/tests/lib/user/session.php
@@ -9,6 +9,9 @@
 
 namespace Test\User;
 
+use OC\Session\Memory;
+use OC\User\User;
+
 class Session extends \PHPUnit_Framework_TestCase {
 	public function testGetUser() {
 		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
@@ -54,26 +57,26 @@ class Session extends \PHPUnit_Framework_TestCase {
 		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
 		$session->expects($this->exactly(2))
 			->method('set')
-			->with($this->callback(function($key) {
-						switch($key) {
-							case 'user_id':
-							case 'loginname':
-								return true;
-								break;
-							default:
-								return false;
-								break;
-						}
-					},
-					'foo'));
+			->with($this->callback(function ($key) {
+					switch ($key) {
+						case 'user_id':
+						case 'loginname':
+							return true;
+							break;
+						default:
+							return false;
+							break;
+					}
+				},
+				'foo'));
 
 		$managerMethods = get_class_methods('\OC\User\Manager');
 		//keep following methods intact in order to ensure hooks are
 		//working
 		$doNotMock = array('__construct', 'emit', 'listen');
-		foreach($doNotMock as $methodName) {
+		foreach ($doNotMock as $methodName) {
 			$i = array_search($methodName, $managerMethods, true);
-			if($i !== false) {
+			if ($i !== false) {
 				unset($managerMethods[$i]);
 			}
 		}
@@ -110,9 +113,9 @@ class Session extends \PHPUnit_Framework_TestCase {
 		//keep following methods intact in order to ensure hooks are
 		//working
 		$doNotMock = array('__construct', 'emit', 'listen');
-		foreach($doNotMock as $methodName) {
+		foreach ($doNotMock as $methodName) {
 			$i = array_search($methodName, $managerMethods, true);
-			if($i !== false) {
+			if ($i !== false) {
 				unset($managerMethods[$i]);
 			}
 		}
@@ -145,9 +148,9 @@ class Session extends \PHPUnit_Framework_TestCase {
 		//keep following methods intact in order to ensure hooks are
 		//working
 		$doNotMock = array('__construct', 'emit', 'listen');
-		foreach($doNotMock as $methodName) {
+		foreach ($doNotMock as $methodName) {
 			$i = array_search($methodName, $managerMethods, true);
-			if($i !== false) {
+			if ($i !== false) {
 				unset($managerMethods[$i]);
 			}
 		}
@@ -192,23 +195,23 @@ class Session extends \PHPUnit_Framework_TestCase {
 		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
 		$session->expects($this->exactly(1))
 			->method('set')
-			->with($this->callback(function($key) {
-						switch($key) {
-							case 'user_id':
-								return true;
-							default:
-								return false;
-						}
-					},
-					'foo'));
+			->with($this->callback(function ($key) {
+					switch ($key) {
+						case 'user_id':
+							return true;
+						default:
+							return false;
+					}
+				},
+				'foo'));
 
 		$managerMethods = get_class_methods('\OC\User\Manager');
 		//keep following methods intact in order to ensure hooks are
 		//working
 		$doNotMock = array('__construct', 'emit', 'listen');
-		foreach($doNotMock as $methodName) {
+		foreach ($doNotMock as $methodName) {
 			$i = array_search($methodName, $managerMethods, true);
-			if($i !== false) {
+			if ($i !== false) {
 				unset($managerMethods[$i]);
 			}
 		}
@@ -254,9 +257,9 @@ class Session extends \PHPUnit_Framework_TestCase {
 		//keep following methods intact in order to ensure hooks are
 		//working
 		$doNotMock = array('__construct', 'emit', 'listen');
-		foreach($doNotMock as $methodName) {
+		foreach ($doNotMock as $methodName) {
 			$i = array_search($methodName, $managerMethods, true);
-			if($i !== false) {
+			if ($i !== false) {
 				unset($managerMethods[$i]);
 			}
 		}
@@ -296,9 +299,9 @@ class Session extends \PHPUnit_Framework_TestCase {
 		//keep following methods intact in order to ensure hooks are
 		//working
 		$doNotMock = array('__construct', 'emit', 'listen');
-		foreach($doNotMock as $methodName) {
+		foreach ($doNotMock as $methodName) {
 			$i = array_search($methodName, $managerMethods, true);
-			if($i !== false) {
+			if ($i !== false) {
 				unset($managerMethods[$i]);
 			}
 		}
@@ -327,4 +330,31 @@ class Session extends \PHPUnit_Framework_TestCase {
 
 		$this->assertSame($granted, false);
 	}
+
+	public function testActiveUserAfterSetSession() {
+		$users = array(
+			'foo' => new User('foo', null),
+			'bar' => new User('bar', null)
+		);
+
+		$manager = $this->getMockBuilder('\OC\User\Manager')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$manager->expects($this->any())
+			->method('get')
+			->will($this->returnCallback(function ($uid) use ($users) {
+				return $users[$uid];
+			}));
+
+		$session = new Memory('');
+		$session->set('user_id', 'foo');
+		$userSession = new \OC\User\Session($manager, $session);
+		$this->assertEquals($users['foo'], $userSession->getUser());
+
+		$session2 = new Memory('');
+		$session2->set('user_id', 'bar');
+		$userSession->setSession($session2);
+		$this->assertEquals($users['bar'], $userSession->getUser());
+	}
 }
-- 
GitLab


From ab5149f5df332a41f88973ecdc0a9b7ba24a5423 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 13 Oct 2014 17:15:58 +0200
Subject: [PATCH 078/616] Allow specifying protocol in ext storage OC config

Allow specifying a protocol in the host field when mounting another
ownCloud instance. Note that this was already possible with the WebDAV
config but this bug made it inconsistent.
---
 apps/files_external/lib/owncloud.php          |  8 ++
 .../tests/owncloudfunctions.php               | 83 +++++++++++++++++++
 lib/private/files/storage/dav.php             |  4 +-
 3 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 apps/files_external/tests/owncloudfunctions.php

diff --git a/apps/files_external/lib/owncloud.php b/apps/files_external/lib/owncloud.php
index 98314102a64..04a1e959eb0 100644
--- a/apps/files_external/lib/owncloud.php
+++ b/apps/files_external/lib/owncloud.php
@@ -22,6 +22,14 @@ class OwnCloud extends \OC\Files\Storage\DAV{
 		// extract context path from host if specified
 		// (owncloud install path on host)
 		$host = $params['host'];
+		// strip protocol
+		if (substr($host, 0, 8) == "https://") {
+			$host = substr($host, 8);
+			$params['secure'] = true;
+		} else if (substr($host, 0, 7) == "http://") {
+			$host = substr($host, 7);
+			$params['secure'] = false;
+		}
 		$contextPath = '';
 		$hostSlashPos = strpos($host, '/');
 		if ($hostSlashPos !== false){
diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/owncloudfunctions.php
new file mode 100644
index 00000000000..57608fff0cf
--- /dev/null
+++ b/apps/files_external/tests/owncloudfunctions.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Copyright (c) 2014 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\Files\Storage;
+
+class OwnCloudFunctions extends \PHPUnit_Framework_TestCase {
+
+	function configUrlProvider() {
+		return array(
+			array(
+				array(
+					'host' => 'testhost',
+					'root' => 'testroot',
+					'secure' => false
+				),
+				'http://testhost/remote.php/webdav/testroot/',
+			),
+			array(
+				array(
+					'host' => 'testhost',
+					'root' => 'testroot',
+					'secure' => true
+				),
+				'https://testhost/remote.php/webdav/testroot/',
+			),
+			array(
+				array(
+					'host' => 'http://testhost',
+					'root' => 'testroot',
+					'secure' => false
+				),
+				'http://testhost/remote.php/webdav/testroot/',
+			),
+			array(
+				array(
+					'host' => 'https://testhost',
+					'root' => 'testroot',
+					'secure' => false
+				),
+				'https://testhost/remote.php/webdav/testroot/',
+			),
+			array(
+				array(
+					'host' => 'https://testhost/testroot',
+					'root' => '',
+					'secure' => false
+				),
+				'https://testhost/testroot/remote.php/webdav/',
+			),
+			array(
+				array(
+					'host' => 'https://testhost/testroot',
+					'root' => 'subdir',
+					'secure' => false
+				),
+				'https://testhost/testroot/remote.php/webdav/subdir/',
+			),
+			array(
+				array(
+					'host' => 'http://testhost/testroot',
+					'root' => 'subdir',
+					'secure' => true
+				),
+				'http://testhost/testroot/remote.php/webdav/subdir/',
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider configUrlProvider
+	 */
+	public function testConfig($config, $expectedUri) {
+		$config['user'] = 'someuser';
+		$config['password'] = 'somepassword';
+		$instance = new \OC\Files\Storage\OwnCloud($config);
+		$this->assertEquals($expectedUri, $instance->createBaseUri());
+	}
+}
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index a0ef79a7b32..7f53704e94f 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -58,7 +58,7 @@ class DAV extends \OC\Files\Storage\Common {
 				$this->root .= '/';
 			}
 		} else {
-			throw new \Exception();
+			throw new \Exception('Invalid webdav storage configuration');
 		}
 	}
 
@@ -85,7 +85,7 @@ class DAV extends \OC\Files\Storage\Common {
 		return 'webdav::' . $this->user . '@' . $this->host . '/' . $this->root;
 	}
 
-	protected function createBaseUri() {
+	public function createBaseUri() {
 		$baseUri = 'http';
 		if ($this->secure) {
 			$baseUri .= 's';
-- 
GitLab


From 7f1ba86789acea5c5c5f72067ced062044216ee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 13 Oct 2014 17:49:40 +0200
Subject: [PATCH 079/616] fix flickering users

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

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 00d2a920cbf..b4c2aa4d7c0 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -355,7 +355,7 @@ $(document).ready(function() {
 		$(tr).find('td').last().removeAttr('style');
 		$(tr).removeAttr('id');
 		$(this).remove();
-		addSelect2($('tr:not(#addMountPoint) .applicableUsers'));
+		addSelect2(tr.find('.applicableUsers'));
 	});
 
 	function suggestMountPoint(defaultMountPoint) {
-- 
GitLab


From 7535b098519759074d96a9881f388f1621b983d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 13 Oct 2014 18:40:57 +0200
Subject: [PATCH 080/616] cleanup variable names and duplicate jQuery selectors

---
 apps/files_external/js/settings.js | 156 +++++++++++++++--------------
 1 file changed, 80 insertions(+), 76 deletions(-)

diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index b4c2aa4d7c0..75d45ae1924 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -19,28 +19,28 @@ function getSelection($row) {
 	return values;
 }
 
-function highlightBorder(element, highlight) {
-	$(element).toggleClass('warning-input', highlight);
+function highlightBorder($element, highlight) {
+	$element.toggleClass('warning-input', highlight);
 	return highlight;
 }
 
-function highlightInput(input) {
-	if ($(input).attr('type') === 'text' || $(input).attr('type') === 'password') {
-		return highlightBorder(input,
-			($(input).val() === '' && !$(input).hasClass('optional')));
+function highlightInput($input) {
+	if ($input.attr('type') === 'text' || $input.attr('type') === 'password') {
+		return highlightBorder($input,
+			($input.val() === '' && !$input.hasClass('optional')));
 	}
 }
 
 OC.MountConfig={
-	saveStorage:function(tr, callback) {
-		var mountPoint = $(tr).find('.mountPoint input').val();
-		var oldMountPoint = $(tr).find('.mountPoint input').data('mountpoint');
+	saveStorage:function($tr, callback) {
+		var mountPoint = $tr.find('.mountPoint input').val();
+		var oldMountPoint = $tr.find('.mountPoint input').data('mountpoint');
 		if (mountPoint === '') {
 			return false;
 		}
-		var statusSpan = $(tr).closest('tr').find('.status span');
-		var backendClass = $(tr).find('.backend').data('class');
-		var configuration = $(tr).find('.configuration input');
+		var statusSpan = $tr.find('.status span');
+		var backendClass = $tr.find('.backend').data('class');
+		var configuration = $tr.find('.configuration input');
 		var addMountPoint = true;
 		if (configuration.length < 1) {
 			return false;
@@ -62,14 +62,14 @@ OC.MountConfig={
 			}
 		});
 		if ($('#externalStorage').data('admin') === true) {
-			var multiselect = getSelection($(tr));
+			var multiselect = getSelection($tr);
 		}
 		if (addMountPoint) {
 			var status = false;
 			if ($('#externalStorage').data('admin') === true) {
 				var isPersonal = false;
-				var oldGroups = $(tr).find('.applicable').data('applicable-groups');
-				var oldUsers = $(tr).find('.applicable').data('applicable-users');
+				var oldGroups = $tr.find('.applicable').data('applicable-groups');
+				var oldUsers = $tr.find('.applicable').data('applicable-users');
 				var groups = [];
 				var users = [];
 				$.each(multiselect, function(index, value) {
@@ -102,7 +102,7 @@ OC.MountConfig={
 							oldMountPoint: oldMountPoint
 						},
 						success: function(result) {
-							$(tr).find('.mountPoint input').data('mountpoint', mountPoint);
+							$tr.find('.mountPoint input').data('mountpoint', mountPoint);
 							status = updateStatus(statusSpan, result);
 							if (callback) {
 								callback(status);
@@ -116,8 +116,8 @@ OC.MountConfig={
 						}
 					});
 				});
-				$(tr).find('.applicable').data('applicable-groups', groups);
-				$(tr).find('.applicable').data('applicable-users', users);
+				$tr.find('.applicable').data('applicable-groups', groups);
+				$tr.find('.applicable').data('applicable-users', users);
 				var mountType = 'group';
 				$.each(oldGroups, function(index, applicable) {
 					$.ajax({type: 'POST',
@@ -163,7 +163,7 @@ OC.MountConfig={
 						oldMountPoint: oldMountPoint
 					},
 					success: function(result) {
-						$(tr).find('.mountPoint input').data('mountpoint', mountPoint);
+						$tr.find('.mountPoint input').data('mountpoint', mountPoint);
 						status = updateStatus(statusSpan, result);
 						if (callback) {
 							callback(status);
@@ -183,20 +183,23 @@ OC.MountConfig={
 };
 
 $(document).ready(function() {
+	var $externalStorage = $('#externalStorage');
+
 	//initialize hidden input field with list of users and groups
-	$('#externalStorage').find('tr:not(#addMountPoint)').each(function(i,tr) {
-		var applicable = $(tr).find('.applicable');
-		if (applicable.length > 0) {
-			var groups = applicable.data('applicable-groups');
+	$externalStorage.find('tr:not(#addMountPoint)').each(function(i,tr) {
+		var $tr = $(tr);
+		var $applicable = $tr.find('.applicable');
+		if ($applicable.length > 0) {
+			var groups = $applicable.data('applicable-groups');
 			var groupsId = [];
 			$.each(groups, function () {
-				groupsId.push(this+"(group)");
+				groupsId.push(this + '(group)');
 			});
-			var users = applicable.data('applicable-users');
+			var users = $applicable.data('applicable-users');
 			if (users.indexOf('all') > -1) {
-				$(tr).find('.applicableUsers').val('');
+				$tr.find('.applicableUsers').val('');
 			} else {
-				$(tr).find('.applicableUsers').val(groupsId.concat(users).join(','));
+				$tr.find('.applicableUsers').val(groupsId.concat(users).join(','));
 			}
 		}
 	});
@@ -221,7 +224,7 @@ $(document).ready(function() {
 						};
 					},
 					results: function (data, page) {
-						if (data.status === "success") {
+						if (data.status === 'success') {
 
 							var results = [];
 							var userCount = 0; // users is an object
@@ -256,10 +259,10 @@ $(document).ready(function() {
 						type: 'POST',
 						contentType: 'application/json',
 						data: JSON.stringify(users),
-						dataType: "json"
+						dataType: 'json'
 					}).done(function(data) {
 						var results = [];
-						if (data.status === "success") {
+						if (data.status === 'success') {
 							$.each(data.users, function(user, displayname) {
 								if (displayname !== false) {
 									results.push({name:user, displayname:displayname, type:'user'});
@@ -294,9 +297,9 @@ $(document).ready(function() {
 					}
 				},
 				escapeMarkup: function (m) { return m; } // we escape the markup in formatResult and formatSelection
-			}).on("select2-loaded", function() {
-				$.each($(".avatardiv"), function(i, div) {
-					$div = $(div);
+			}).on('select2-loaded', function() {
+				$.each($('.avatardiv'), function(i, div) {
+					var $div = $(div);
 					if ($div.data('type') === 'user') {
 						$div.avatar($div.data('name'),32);
 					}
@@ -306,21 +309,21 @@ $(document).ready(function() {
 	}
 	addSelect2($('tr:not(#addMountPoint) .applicableUsers'));
 	
-	$('#externalStorage').on('change', '#selectBackend', function() {
-		var tr = $(this).closest("tr");
-		$('#externalStorage tbody').append($(tr).clone());
-		$('#externalStorage tbody tr').last().find('.mountPoint input').val('');
+	$externalStorage.on('change', '#selectBackend', function() {
+		var $tr = $(this).closest('tr');
+		$externalStorage.find('tbody').append($tr.clone());
+		$externalStorage.find('tbody tr').last().find('.mountPoint input').val('');
 		var selected = $(this).find('option:selected').text();
 		var backendClass = $(this).val();
-		$(tr).find('.backend').text(selected);
-		if ($(tr).find('.mountPoint input').val() === '') {
-			$(tr).find('.mountPoint input').val(suggestMountPoint(selected));
+		$tr.find('.backend').text(selected);
+		if ($tr.find('.mountPoint input').val() === '') {
+			$tr.find('.mountPoint input').val(suggestMountPoint(selected));
 		}
-		$(tr).addClass(backendClass);
-		$(tr).find('.status').append('<span></span>');
-		$(tr).find('.backend').data('class', backendClass);
+		$tr.addClass(backendClass);
+		$tr.find('.status').append('<span></span>');
+		$tr.find('.backend').data('class', backendClass);
 		var configurations = $(this).data('configurations');
-		var td = $(tr).find('td.configuration');
+		var $td = $tr.find('td.configuration');
 		$.each(configurations, function(backend, parameters) {
 			if (backend === backendClass) {
 				$.each(parameters['configuration'], function(parameter, placeholder) {
@@ -342,20 +345,20 @@ $(document).ready(function() {
 						newElement = $('<input type="text" class="added' + class_string + '" data-parameter="'+parameter+'" placeholder="'+placeholder+'" />');
 					}
 					highlightInput(newElement);
-					td.append(newElement);
+					$td.append(newElement);
 				});
-				if (parameters['custom'] && $('#externalStorage tbody tr.'+backendClass.replace(/\\/g, '\\\\')).length === 1) {
+				if (parameters['custom'] && $externalStorage.find('tbody tr.'+backendClass.replace(/\\/g, '\\\\')).length === 1) {
 					OC.addScript('files_external', parameters['custom']);
 				}
-				td.children().not('[type=hidden]').first().focus();
+				$td.children().not('[type=hidden]').first().focus();
 				return false;
 			}
 		});
-		$(tr).find('td').last().attr('class', 'remove');
-		$(tr).find('td').last().removeAttr('style');
-		$(tr).removeAttr('id');
+		$tr.find('td').last().attr('class', 'remove');
+		$tr.find('td').last().removeAttr('style');
+		$tr.removeAttr('id');
 		$(this).remove();
-		addSelect2(tr.find('.applicableUsers'));
+		addSelect2($tr.find('.applicableUsers'));
 	});
 
 	function suggestMountPoint(defaultMountPoint) {
@@ -369,7 +372,7 @@ $(document).ready(function() {
 		var match = true;
 		while (match && i < 20) {
 			match = false;
-			$('#externalStorage tbody td.mountPoint input').each(function(index, mountPoint) {
+			$externalStorage.find('tbody td.mountPoint input').each(function(index, mountPoint) {
 				if ($(mountPoint).val() === defaultMountPoint+append) {
 					match = true;
 					return false;
@@ -385,54 +388,54 @@ $(document).ready(function() {
 		return defaultMountPoint+append;
 	}
 
-	$('#externalStorage').on('paste', 'td input', function() {
-		var tr = $(this).closest("tr");
-		var me = this;
+	$externalStorage.on('paste', 'td input', function() {
+		var $me = $(this);
+		var $tr = $me.closest('tr');
 		setTimeout(function() {
-			highlightInput($(me));
-			OC.MountConfig.saveStorage(tr);
+			highlightInput($me);
+			OC.MountConfig.saveStorage($tr);
 		}, 20);
 	});
 
 	var timer;
 
-	$('#externalStorage').on('keyup', 'td input', function() {
+	$externalStorage.on('keyup', 'td input', function() {
 		clearTimeout(timer);
-		var tr = $(this).closest("tr");
+		var $tr = $(this).closest('tr');
 		highlightInput($(this));
 		if ($(this).val) {
 			timer = setTimeout(function() {
-				OC.MountConfig.saveStorage(tr);
+				OC.MountConfig.saveStorage($tr);
 			}, 2000);
 		}
 	});
 
-	$('#externalStorage').on('change', 'td input:checkbox', function() {
-		OC.MountConfig.saveStorage($(this).closest("tr"));
+	$externalStorage.on('change', 'td input:checkbox', function() {
+		OC.MountConfig.saveStorage($(this).closest('tr'));
 	});
 
-	$('#externalStorage').on('change', '.applicable', function() {
-		OC.MountConfig.saveStorage($(this).closest("tr"));
+	$externalStorage.on('change', '.applicable', function() {
+		OC.MountConfig.saveStorage($(this).closest('tr'));
 	});
 
-	$('#externalStorage').on('click', '.status>span', function() {
-		OC.MountConfig.saveStorage($(this).closest("tr"));
+	$externalStorage.on('click', '.status>span', function() {
+		OC.MountConfig.saveStorage($(this).closest('tr'));
 	});
 
 	$('#sslCertificate').on('click', 'td.remove>img', function() {
-		var $tr = $(this).closest("tr");
+		var $tr = $(this).closest('tr');
 		$.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), {cert: $tr.attr('id')});
 		$tr.remove();
 		return true;
 	});
 
-	$('#externalStorage').on('click', 'td.remove>img', function() {
-		var tr = $(this).closest('tr');
-		var mountPoint = $(tr).find('.mountPoint input').val();
+	$externalStorage.on('click', 'td.remove>img', function() {
+		var $tr = $(this).closest('tr');
+		var mountPoint = $tr.find('.mountPoint input').val();
 
-		if ($('#externalStorage').data('admin') === true) {
+		if ($externalStorage.data('admin') === true) {
 			var isPersonal = false;
-			var multiselect = getSelection($(tr));
+			var multiselect = getSelection($tr);
 			$.each(multiselect, function(index, value) {
 				var pos = value.indexOf('(group)');
 				if (pos != -1) {
@@ -450,10 +453,11 @@ $(document).ready(function() {
 			var isPersonal = true;
 			$.post(OC.filePath('files_external', 'ajax', 'removeMountPoint.php'), { mountPoint: mountPoint, mountType: mountType, applicable: applicable, isPersonal: isPersonal });
 		}
-		$(tr).remove();
+		$tr.remove();
 	});
 
-	$('#allowUserMounting').bind('change', function() {
+	var $allowUserMounting = $('#allowUserMounting');
+	$allowUserMounting.bind('change', function() {
 		OC.msg.startSaving('#userMountingMsg');
 		if (this.checked) {
 			OC.AppConfig.setValue('files_external', 'allow_user_mounting', 'yes');
@@ -475,8 +479,8 @@ $(document).ready(function() {
 
 		// disable allowUserMounting
 		if(userMountingBackends.length === 0) {
-			$('#allowUserMounting').prop('checked', false);
-			$('#allowUserMounting').trigger('change');
+			$allowUserMounting.prop('checked', false);
+			$allowUserMounting.trigger('change');
 
 		}
 	});
-- 
GitLab


From b33cb0e342cd379bfd5601ce8adbae1b69a9e8e4 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Mon, 8 Sep 2014 23:38:46 +0200
Subject: [PATCH 081/616] Fix a comment.

---
 lib/public/itags.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/public/itags.php b/lib/public/itags.php
index 1cba07e9b53..4bfceb8d799 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -162,11 +162,11 @@ interface ITags {
 	public function unTag($objid, $tag);
 
 	/**
-	* Delete tags from the
+	* Delete tags from the database
 	*
 	* @param string[] $names An array of tags to delete
 	* @return bool Returns false on error
 	*/
 	public function delete($names);
 
-}
\ No newline at end of file
+}
-- 
GitLab


From a67803fb5df02e7e8924d245d8609aa746a59889 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Mon, 6 Oct 2014 21:06:46 +0200
Subject: [PATCH 082/616] Test Tags::getFavorites().

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

diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 976b4b4fdc8..3eba470a509 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -160,7 +160,9 @@ class Test_Tags extends PHPUnit_Framework_TestCase {
 	public function testFavorite() {
 		$tagger = $this->tagMgr->load($this->objectType);
 		$this->assertTrue($tagger->addToFavorites(1));
+		$this->assertEquals(array(1), $tagger->getFavorites());
 		$this->assertTrue($tagger->removeFromFavorites(1));
+		$this->assertEquals(array(), $tagger->getFavorites());
 	}
 
 }
-- 
GitLab


From 3e5d725502e403df5a5af4a197f4b94d147efccf Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Tue, 30 Sep 2014 12:19:08 +0200
Subject: [PATCH 083/616] Test addMultiple() with $sync=true.

---
 lib/private/tags.php |  1 +
 tests/lib/tags.php   | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/private/tags.php b/lib/private/tags.php
index 0e58789ecd5..ca04953e42c 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -357,6 +357,7 @@ class Tags implements \OCP\ITags {
 						\OCP\Util::ERROR);
 				}
 			}
+
 			// reload tags to get the proper ids.
 			$this->loadTags();
 			// Loop through temporarily cached objectid/tagname pairs
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 3eba470a509..9195587f1dd 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -84,7 +84,36 @@ class Test_Tags extends PHPUnit_Framework_TestCase {
 			$this->assertTrue($tagger->hasTag($tag));
 		}
 
-		$this->assertCount(4, $tagger->getTags(), 'Not all tags added');
+		$tagMaps = $tagger->getTags();
+		$this->assertCount(4, $tagMaps, 'Not all tags added');
+		foreach($tagMaps as $tagMap) {
+			$this->assertEquals(null, $tagMap['id']);
+		}
+
+		// As addMultiple has been called without $sync=true, the tags aren't
+		// saved to the database, so they're gone when we reload $tagger:
+
+		$tagger = $this->tagMgr->load($this->objectType);
+		$this->assertEquals(0, count($tagger->getTags()));
+
+		// Now, we call addMultiple() with $sync=true so the tags will be
+		// be saved to the database.
+		$result = $tagger->addMultiple($tags, true);
+		$this->assertTrue((bool)$result);
+
+		$tagMaps = $tagger->getTags();
+		foreach($tagMaps as $tagMap) {
+			$this->assertNotEquals(null, $tagMap['id']);
+		}
+
+		// Reload the tagger.
+		$tagger = $this->tagMgr->load($this->objectType);
+
+		foreach($tags as $tag) {
+			$this->assertTrue($tagger->hasTag($tag));
+		}
+
+		$this->assertCount(4, $tagger->getTags(), 'Not all previously saved tags found');
 	}
 
 	public function testIsEmpty() {
-- 
GitLab


From cf6fb2c2e49718ad4b9120d42db28b42fb2ff038 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Thu, 2 Oct 2014 16:08:24 +0200
Subject: [PATCH 084/616] Remove redundant null initializations.

---
 lib/private/tagmanager.php | 4 ++--
 lib/private/tags.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/private/tagmanager.php b/lib/private/tagmanager.php
index 9a371a11253..72648e9b932 100644
--- a/lib/private/tagmanager.php
+++ b/lib/private/tagmanager.php
@@ -40,7 +40,7 @@ class TagManager implements \OCP\ITagManager {
 	 *
 	 * @var string
 	 */
-	private $user = null;
+	private $user;
 
 	/**
 	* Constructor.
@@ -65,4 +65,4 @@ class TagManager implements \OCP\ITagManager {
 		return new Tags($this->user, $type, $defaultTags);
 	}
 
-}
\ No newline at end of file
+}
diff --git a/lib/private/tags.php b/lib/private/tags.php
index ca04953e42c..b1bd3b13d45 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -55,14 +55,14 @@ class Tags implements \OCP\ITags {
 	 *
 	 * @var string
 	 */
-	private $type = null;
+	private $type;
 
 	/**
 	 * User
 	 *
 	 * @var string
 	 */
-	private $user = null;
+	private $user;
 
 	const TAG_TABLE = '*PREFIX*vcategory';
 	const RELATION_TABLE = '*PREFIX*vcategory_to_object';
-- 
GitLab


From 5471189fe6b8d2b4ef2608a57b7ea24518a1dcb8 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Mon, 8 Sep 2014 19:58:43 +0200
Subject: [PATCH 085/616] Implement Tag and TagMapper classes.

Subclassed from \OCP\AppFramework\Db\Entity and Mapper,
respectively. This will allow us to also deal with shared tags.
---
 lib/private/server.php            |   7 +-
 lib/private/tagging/tag.php       |  85 +++++++++++++++
 lib/private/tagging/tagmapper.php |  77 +++++++++++++
 lib/private/tagmanager.php        |  17 ++-
 lib/private/tags.php              | 172 ++++++++++++++----------------
 tests/lib/tags.php                |   3 +-
 6 files changed, 262 insertions(+), 99 deletions(-)
 create mode 100644 lib/private/tagging/tag.php
 create mode 100644 lib/private/tagging/tagmapper.php

diff --git a/lib/private/server.php b/lib/private/server.php
index 7fa06298b29..ff34cfdccb6 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -14,6 +14,7 @@ use OC\Security\Crypto;
 use OC\Security\SecureRandom;
 use OCP\IServerContainer;
 use OCP\ISession;
+use OC\Tagging\TagMapper;
 
 /**
  * Class Server
@@ -68,9 +69,13 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('PreviewManager', function ($c) {
 			return new PreviewManager();
 		});
+		$this->registerService('TagMapper', function($c) {
+			return new TagMapper($c->getDb());
+		});
 		$this->registerService('TagManager', function ($c) {
+			$tagMapper = $c->query('TagMapper');
 			$user = \OC_User::getUser();
-			return new TagManager($user);
+			return new TagManager($tagMapper, $user);
 		});
 		$this->registerService('RootFolder', function ($c) {
 			// TODO: get user and user manager from container as well
diff --git a/lib/private/tagging/tag.php b/lib/private/tagging/tag.php
new file mode 100644
index 00000000000..d0cd6bbb966
--- /dev/null
+++ b/lib/private/tagging/tag.php
@@ -0,0 +1,85 @@
+<?php
+/**
+* ownCloud - Tag class
+*
+* @author Bernhard Reiter
+* @copyright 2014 Bernhard Reiter <ockham@raz.or.at>
+*
+* 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/>.
+*
+*/
+
+namespace OC\Tagging;
+
+use \OCP\AppFramework\Db\Entity;
+
+/**
+ * Class to represent a tag.
+ *
+ * @method string getOwner()
+ * @method void setOwner(string $owner)
+ * @method string getType()
+ * @method void setType(string $type)
+ * @method string getName()
+ * @method void setName(string $name)
+ */
+class Tag extends Entity {
+
+	protected $owner;
+	protected $type;
+	protected $name;
+
+	/**
+	* Constructor.
+	*
+	* @param string $owner The tag's owner
+	* @param string $type The type of item this tag is used for
+	* @param string $name The tag's name
+	*/
+	public function __construct($owner = null, $type = null, $name = null) {
+		$this->setOwner($owner);
+		$this->setType($type);
+		$this->setName($name);
+	}
+
+	/**
+	 * Transform a database columnname to a property
+	 * @param string $columnName the name of the column
+	 * @return string the property name
+	 */
+	public function columnToProperty($columnName){
+		if ($columnName === 'category') {
+		    return 'name';
+		} elseif ($columnName === 'uid') {
+		    return 'owner';
+		} else {
+		    return parent::columnToProperty($columnName);
+		}
+	}
+
+	/**
+	 * Transform a property to a database column name
+	 * @param string $property the name of the property
+	 * @return string the column name
+	 */
+	public function propertyToColumn($property){
+		if ($property === 'name') {
+		    return 'category';
+		} elseif ($property === 'owner') {
+		    return 'uid';
+		} else {
+		    return parent::propertyToColumn($property);
+		}
+	}
+}
diff --git a/lib/private/tagging/tagmapper.php b/lib/private/tagging/tagmapper.php
new file mode 100644
index 00000000000..b5929e2618c
--- /dev/null
+++ b/lib/private/tagging/tagmapper.php
@@ -0,0 +1,77 @@
+<?php
+/**
+* ownCloud - TagMapper class
+*
+* @author Bernhard Reiter
+* @copyright 2014 Bernhard Reiter <ockham@raz.or.at>
+*
+* 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/>.
+*
+*/
+
+namespace OC\Tagging;
+
+use \OCP\AppFramework\Db\Mapper,
+    \OCP\AppFramework\Db\DoesNotExistException,
+    \OCP\IDb;
+
+/**
+ * Thin wrapper around \OCP\AppFramework\Db\Mapper.
+ */
+class TagMapper extends Mapper {
+
+	/**
+	* Constructor.
+	*
+	* @param IDb $db Instance of the Db abstraction layer.
+	*/
+	public function __construct(IDb $db) {
+		parent::__construct($db, 'vcategory', 'OC\Tagging\Tag');
+	}
+
+	/**
+	* Load tags from the database.
+	*
+	* @param array|string $owners The user(s) whose tags we are going to load.
+	* @param string $type The type of item for which we are loading tags.
+	* @return array An array of Tag objects.
+	*/
+	public function loadTags($owners, $type) {
+		if(!is_array($owners)) {
+			$owners = array($owners);
+		}
+
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+			. 'WHERE `uid` IN (' . str_repeat('?,', count($owners)-1) . '?) AND `type` = ? ORDER BY `category`';
+		return $this->findEntities($sql, array_merge($owners, array($type)));
+	}
+
+	/**
+	* Check if a given Tag object already exists in the database.
+	*
+	* @param Tag $tag The tag to look for in the database.
+	* @return bool
+	*/
+	public function tagExists($tag) {
+		$sql = 'SELECT `id`, `uid`, `type`, `category` FROM `' . $this->getTableName() . '` '
+			. 'WHERE `uid` = ? AND `type` = ? AND `category` = ?';
+		try {
+			$this->findEntity($sql, array($tag->getOwner(), $tag->getType(), $tag->getName()));
+		} catch (DoesNotExistException $e) {
+			return false;
+		}
+		return true;
+	}
+}
+
diff --git a/lib/private/tagmanager.php b/lib/private/tagmanager.php
index 72648e9b932..7a3216de032 100644
--- a/lib/private/tagmanager.php
+++ b/lib/private/tagmanager.php
@@ -33,6 +33,8 @@
 
 namespace OC;
 
+use OC\Tagging\TagMapper;
+
 class TagManager implements \OCP\ITagManager {
 
 	/**
@@ -42,13 +44,22 @@ class TagManager implements \OCP\ITagManager {
 	 */
 	private $user;
 
+	/**
+	 * TagMapper
+	 *
+	 * @var TagMapper
+	 */
+	private $mapper;
+
 	/**
 	* Constructor.
 	*
-	* @param string $user The user whos data the object will operate on.
+	* @param TagMapper $mapper Instance of the TagMapper abstraction layer.
+	* @param string $user The user whose data the object will operate on.
 	*/
-	public function __construct($user) {
+	public function __construct(TagMapper $mapper, $user) {
 
+		$this->mapper = $mapper;
 		$this->user = $user;
 
 	}
@@ -62,7 +73,7 @@ class TagManager implements \OCP\ITagManager {
 	* @return \OCP\ITags
 	*/
 	public function load($type, $defaultTags=array()) {
-		return new Tags($this->user, $type, $defaultTags);
+		return new Tags($this->mapper, $this->user, $type, $defaultTags);
 	}
 
 }
diff --git a/lib/private/tags.php b/lib/private/tags.php
index b1bd3b13d45..5a962c4891d 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -34,6 +34,9 @@
 
 namespace OC;
 
+use \OC\Tagging\Tag,
+    \OC\Tagging\TagMapper;
+
 class Tags implements \OCP\ITags {
 
 	/**
@@ -64,6 +67,13 @@ class Tags implements \OCP\ITags {
 	 */
 	private $user;
 
+	/**
+	 * The Mapper we're using to communicate our Tag objects to the database.
+	 *
+	 * @var TagMapper
+	 */
+	private $mapper;
+
 	const TAG_TABLE = '*PREFIX*vcategory';
 	const RELATION_TABLE = '*PREFIX*vcategory_to_object';
 
@@ -72,10 +82,13 @@ class Tags implements \OCP\ITags {
 	/**
 	* Constructor.
 	*
-	* @param string $user The user whos data the object will operate on.
-	* @param string $type
+	* @param TagMapper $mapper Instance of the TagMapper abstraction layer.
+	* @param string $user The user whose data the object will operate on.
+	* @param string $type The type of items for which tags will be loaded.
+	* @param array $defaultTags Tags that should be created at construction.
 	*/
-	public function __construct($user, $type, $defaultTags = array()) {
+	public function __construct(TagMapper $mapper, $user, $type, $defaultTags = array()) {
+		$this->mapper = $mapper;
 		$this->user = $user;
 		$this->type = $type;
 		$this->loadTags($defaultTags);
@@ -86,27 +99,13 @@ class Tags implements \OCP\ITags {
 	*
 	*/
 	protected function loadTags($defaultTags=array()) {
-		$this->tags = array();
-		$result = null;
-		$sql = 'SELECT `id`, `category` FROM `' . self::TAG_TABLE . '` '
-			. 'WHERE `uid` = ? AND `type` = ? ORDER BY `category`';
 		try {
-			$stmt = \OCP\DB::prepare($sql);
-			$result = $stmt->execute(array($this->user, $this->type));
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('core', __METHOD__. ', DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
-			}
+			$this->tags = $this->mapper->loadTags(array($this->user), $this->type);
 		} catch(\Exception $e) {
 			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
 				\OCP\Util::ERROR);
 		}
 
-		if(!is_null($result)) {
-			while( $row = $result->fetchRow()) {
-				$this->tags[$row['id']] = $row['category'];
-			}
-		}
-
 		if(count($defaultTags) > 0 && count($this->tags) === 0) {
 			$this->addMultiple($defaultTags, true);
 		}
@@ -127,10 +126,10 @@ class Tags implements \OCP\ITags {
 	/**
 	* Get the tags for a specific user.
 	*
-	* This returns an array with id/name maps:
+	* This returns an array with maps containing each tag's properties:
 	* [
-	* 	['id' => 0, 'name' = 'First tag'],
-	* 	['id' => 1, 'name' = 'Second tag'],
+	* 	['id' => 0, 'name' = 'First tag', 'owner' = 'User', 'type' => 'tagtype'],
+	* 	['id' => 1, 'name' = 'Shared tag', 'owner' = 'Other user', 'type' => 'tagtype'],
 	* ]
 	*
 	* @return array
@@ -140,16 +139,19 @@ class Tags implements \OCP\ITags {
 			return array();
 		}
 
-		$tags = array_values($this->tags);
-		uasort($tags, 'strnatcasecmp');
+		usort($this->tags, function($a, $b) {
+			return strnatcasecmp($a->getName(), $b->getName());
+		});
 		$tagMap = array();
 
-		foreach($tags as $tag) {
-			if($tag !== self::TAG_FAVORITE) {
+		foreach($this->tags as $tag) {
+			if($tag->getName() !== self::TAG_FAVORITE) {
 				$tagMap[] = array(
-					'id' => $this->array_searchi($tag, $this->tags),
-					'name' => $tag
-					);
+					'id'    => $tag->getId(),
+					'name'  => $tag->getName(),
+					'owner' => $tag->getOwner(),
+					'type'  => $tag->getType()
+				);
 			}
 		}
 		return $tagMap;
@@ -174,7 +176,7 @@ class Tags implements \OCP\ITags {
 				\OCP\Util::writeLog('core', __METHOD__.', Cannot use empty tag names', \OCP\Util::DEBUG);
 				return false;
 			}
-			$tagId = $this->array_searchi($tag, $this->tags);
+			$tagId = $this->getTagId($tag);
 		}
 
 		if($tagId === false) {
@@ -217,7 +219,7 @@ class Tags implements \OCP\ITags {
 	* @return bool
 	*/
 	public function hasTag($name) {
-		return $this->in_arrayi($name, $this->tags);
+		return $this->getTagId($name) !== false;
 	}
 
 	/**
@@ -233,35 +235,21 @@ class Tags implements \OCP\ITags {
 			\OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
 			return false;
 		}
-		if($this->hasTag($name)) {
+		if($this->hasTag($name)) { // FIXME
 			\OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG);
 			return false;
 		}
 		try {
-			$result = \OCP\DB::insertIfNotExist(
-				self::TAG_TABLE,
-				array(
-					'uid' => $this->user,
-					'type' => $this->type,
-					'category' => $name,
-				)
-			);
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
-				return false;
-			} elseif((int)$result === 0) {
-				\OCP\Util::writeLog('core', __METHOD__.', Tag already exists: ' . $name, \OCP\Util::DEBUG);
-				return false;
-			}
+			$tag = new Tag($this->user, $this->type, $name);
+			$tag = $this->mapper->insert($tag);
+			$this->tags[] = $tag;
 		} catch(\Exception $e) {
 			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
 				\OCP\Util::ERROR);
 			return false;
 		}
-		$id = \OCP\DB::insertid(self::TAG_TABLE);
-		\OCP\Util::writeLog('core', __METHOD__.', id: ' . $id, \OCP\Util::DEBUG);
-		$this->tags[$id] = $name;
-		return $id;
+		\OCP\Util::writeLog('core', __METHOD__.', id: ' . $tag->getId(), \OCP\Util::DEBUG);
+		return $tag->getId();
 	}
 
 	/**
@@ -280,27 +268,21 @@ class Tags implements \OCP\ITags {
 			return false;
 		}
 
-		$id = $this->array_searchi($from, $this->tags);
-		if($id === false) {
+		$key = $this->array_searchi($from, $this->tags); // FIXME: owner. or renameById() ?
+		if($key === false) {
 			\OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG);
 			return false;
 		}
 
-		$sql = 'UPDATE `' . self::TAG_TABLE . '` SET `category` = ? '
-			. 'WHERE `uid` = ? AND `type` = ? AND `id` = ?';
 		try {
-			$stmt = \OCP\DB::prepare($sql);
-			$result = $stmt->execute(array($to, $this->user, $this->type, $id));
-			if (\OCP\DB::isError($result)) {
-				\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
-				return false;
-			}
+			$tag = $this->tags[$key];
+			$tag->setName($to);
+			$this->tags[$key] = $this->mapper->update($tag);
 		} catch(\Exception $e) {
 			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
 				\OCP\Util::ERROR);
 			return false;
 		}
-		$this->tags[$id] = $to;
 		return true;
 	}
 
@@ -322,9 +304,8 @@ class Tags implements \OCP\ITags {
 
 		$newones = array();
 		foreach($names as $name) {
-			if(($this->in_arrayi(
-				$name, $this->tags) == false) && $name !== '') {
-				$newones[] = $name;
+			if(!$this->hasTag($name) && $name !== '') {
+				$newones[] = new Tag($this->user, $this->type, $name);
 			}
 			if(!is_null($id) ) {
 				// Insert $objectid, $categoryid  pairs if not exist.
@@ -346,12 +327,9 @@ class Tags implements \OCP\ITags {
 		if(is_array($this->tags)) {
 			foreach($this->tags as $tag) {
 				try {
-					\OCP\DB::insertIfNotExist(self::TAG_TABLE,
-						array(
-							'uid' => $this->user,
-							'type' => $this->type,
-							'category' => $tag,
-						));
+					if (!$this->mapper->tagExists($tag)) {
+						$this->mapper->insert($tag);
+					}
 				} catch(\Exception $e) {
 					\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
 						\OCP\Util::ERROR);
@@ -366,7 +344,7 @@ class Tags implements \OCP\ITags {
 			// For some reason this is needed or array_search(i) will return 0..?
 			ksort($tags);
 			foreach(self::$relations as $relation) {
-				$tagId = $this->array_searchi($relation['tag'], $tags);
+				$tagId = $this->getTagId($relation['tag']);
 				\OCP\Util::writeLog('core', __METHOD__ . 'catid, ' . $relation['tag'] . ' ' . $tagId, \OCP\Util::DEBUG);
 				if($tagId) {
 					try {
@@ -527,7 +505,7 @@ class Tags implements \OCP\ITags {
 			if(!$this->hasTag($tag)) {
 				$this->add($tag);
 			}
-			$tagId =  $this->array_searchi($tag, $this->tags);
+			$tagId =  $this->getTagId($tag);
 		} else {
 			$tagId = $tag;
 		}
@@ -560,7 +538,7 @@ class Tags implements \OCP\ITags {
 				\OCP\Util::writeLog('core', __METHOD__.', Tag name is empty', \OCP\Util::DEBUG);
 				return false;
 			}
-			$tagId =  $this->array_searchi($tag, $this->tags);
+			$tagId =  $this->getTagId($tag);
 		} else {
 			$tagId = $tag;
 		}
@@ -579,7 +557,7 @@ class Tags implements \OCP\ITags {
 	}
 
 	/**
-	* Delete tags from the
+	* Delete tags from the database.
 	*
 	* @param string[] $names An array of tags to delete
 	* @return bool Returns false on error
@@ -598,20 +576,17 @@ class Tags implements \OCP\ITags {
 			$id = null;
 
 			if($this->hasTag($name)) {
-				$id = $this->array_searchi($name, $this->tags);
-				unset($this->tags[$id]);
-			}
-			try {
-				$stmt = \OCP\DB::prepare('DELETE FROM `' . self::TAG_TABLE . '` WHERE '
-					. '`uid` = ? AND `type` = ? AND `category` = ?');
-				$result = $stmt->execute(array($this->user, $this->type, $name));
-				if (\OCP\DB::isError($result)) {
-					\OCP\Util::writeLog('core', __METHOD__. 'DB error: ' . \OCP\DB::getErrorMessage($result), \OCP\Util::ERROR);
+				$key = $this->array_searchi($name, $this->tags);
+				$tag = $this->tags[$key];
+				$id = $tag->getId();
+				unset($this->tags[$key]);
+				try {
+					$this->mapper->delete($tag);
+				} catch(\Exception $e) {
+					\OCP\Util::writeLog('core', __METHOD__ . ', exception: '
+						. $e->getMessage(), \OCP\Util::ERROR);
+					return false;
 				}
-			} catch(\Exception $e) {
-				\OCP\Util::writeLog('core', __METHOD__ . ', exception: '
-					. $e->getMessage(), \OCP\Util::ERROR);
-				return false;
 			}
 			if(!is_null($id) && $id !== false) {
 				try {
@@ -635,19 +610,28 @@ class Tags implements \OCP\ITags {
 		return true;
 	}
 
-	// case-insensitive in_array
-	private function in_arrayi($needle, $haystack) {
+	// case-insensitive array_search
+	protected function array_searchi($needle, $haystack, $mem='getName') {
 		if(!is_array($haystack)) {
 			return false;
 		}
-		return in_array(strtolower($needle), array_map('strtolower', $haystack));
+		return array_search(strtolower($needle), array_map(
+			function($tag) use($mem) {
+				return strtolower(call_user_func(array($tag, $mem)));
+			}, $haystack)
+		);
 	}
 
-	// case-insensitive array_search
-	private function array_searchi($needle, $haystack) {
-		if(!is_array($haystack)) {
+	/**
+	* Get a tag's ID.
+	*
+	* @param string $name The tag name to look for.
+	* @return string The tag's id or false if it hasn't been saved yet.
+	*/
+	private function getTagId($name) {
+		if (($key = $this->array_searchi($name, $this->tags)) === false) {
 			return false;
 		}
-		return array_search(strtolower($needle), array_map('strtolower', $haystack));
+		return $this->tags[$key]->getId();
 	}
 }
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 9195587f1dd..4d9b8558fd3 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -34,7 +34,8 @@ class Test_Tags extends PHPUnit_Framework_TestCase {
 		$this->objectType = uniqid('type_');
 		OC_User::createUser($this->user, 'pass');
 		OC_User::setUserId($this->user);
-		$this->tagMgr = new OC\TagManager($this->user);
+		$this->tagMapper = new OC\Tagging\TagMapper(new OC\AppFramework\Db\Db());
+		$this->tagMgr = new OC\TagManager($this->tagMapper, $this->user);
 
 	}
 
-- 
GitLab


From 7963125c41b00b7e454c0fcb1406df0cabb42de0 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Sat, 4 Oct 2014 14:08:20 +0200
Subject: [PATCH 086/616] Remove two obsolete try...catch blocks.

---
 lib/private/tags.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lib/private/tags.php b/lib/private/tags.php
index 5a962c4891d..aceb88355c8 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -99,12 +99,7 @@ class Tags implements \OCP\ITags {
 	*
 	*/
 	protected function loadTags($defaultTags=array()) {
-		try {
-			$this->tags = $this->mapper->loadTags(array($this->user), $this->type);
-		} catch(\Exception $e) {
-			\OCP\Util::writeLog('core', __METHOD__.', exception: '.$e->getMessage(),
-				\OCP\Util::ERROR);
-		}
+		$this->tags = $this->mapper->loadTags(array($this->user), $this->type);
 
 		if(count($defaultTags) > 0 && count($this->tags) === 0) {
 			$this->addMultiple($defaultTags, true);
@@ -580,13 +575,10 @@ class Tags implements \OCP\ITags {
 				$tag = $this->tags[$key];
 				$id = $tag->getId();
 				unset($this->tags[$key]);
-				try {
-					$this->mapper->delete($tag);
-				} catch(\Exception $e) {
-					\OCP\Util::writeLog('core', __METHOD__ . ', exception: '
-						. $e->getMessage(), \OCP\Util::ERROR);
-					return false;
-				}
+				$this->mapper->delete($tag);
+			} else {
+				\OCP\Util::writeLog('core', __METHOD__ . 'Cannot delete tag ' . $name
+					. ': not found.', \OCP\Util::ERROR);
 			}
 			if(!is_null($id) && $id !== false) {
 				try {
-- 
GitLab


From 7e9baafc5341bda5b8b86700f90d896b43b85185 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Tue, 16 Sep 2014 00:20:52 +0200
Subject: [PATCH 087/616] Add option to include tags for shared items.

---
 lib/private/share/share.php |  53 +++++++++++++-
 lib/private/tagmanager.php  |   5 +-
 lib/private/tags.php        | 137 +++++++++++++++++++++++++++++++-----
 lib/public/itagmanager.php  |   5 +-
 lib/public/itags.php        |  10 +++
 tests/lib/share/backend.php |   3 +-
 tests/lib/tags.php          |  24 +++++++
 7 files changed, 214 insertions(+), 23 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 5314e09b8de..b827b84a9bc 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1181,7 +1181,7 @@ class Share extends \OC\Share\Constants {
 			}
 		}
 		// TODO Add option for collections to be collection of themselves, only 'folder' does it now...
-		if (!self::getBackend($itemType) instanceof \OCP\Share_Backend_Collection || $itemType != 'folder') {
+		if (isset(self::$backendTypes[$itemType]) && (!self::getBackend($itemType) instanceof \OCP\Share_Backend_Collection || $itemType != 'folder')) {
 			unset($collectionTypes[0]);
 		}
 		// Return array if collections were found or the item type is a
@@ -1192,6 +1192,57 @@ class Share extends \OC\Share\Constants {
 		return false;
 	}
 
+	/**
+	* Get the owners of items shared with a user.
+	*
+	* @param string $user The user the items are shared with.
+	* @param string $type The type of the items shared with the user.
+	* @param boolean $includeCollections Include collection item types (optional)
+	* @param boolean $includeOwner include owner in the list of users the item is shared with (optional)
+	* @return array
+	*/
+	public static function getSharedItemsOwners($user, $type, $includeCollections = false, $includeOwner = false) {
+		// First, we find out if $type is part of a collection (and if that collection is part of
+		// another one and so on).
+		$collectionTypes = array();
+		if (!$includeCollections || !$collectionTypes = self::getCollectionItemTypes($type)) {
+			$collectionTypes[] = $type;
+		}
+
+		// Of these collection types, along with our original $type, we make a
+		// list of the ones for which a sharing backend has been registered.
+		// FIXME: Ideally, we wouldn't need to nest getItemsSharedWith in this loop but just call it
+		// with its $includeCollections parameter set to true. Unfortunately, this fails currently.
+		$allMaybeSharedItems = array();
+		foreach ($collectionTypes as $collectionType) {
+			if (isset(self::$backends[$collectionType])) {
+				$allMaybeSharedItems[$collectionType] = self::getItemsSharedWithUser(
+					$collectionType,
+					$user,
+					self::FORMAT_NONE
+				);
+			}
+		}
+
+		$owners = array();
+		if ($includeOwner) {
+			$owners[] = $user;
+		}
+
+		// We take a look at all shared items of the given $type (or of the collections it is part of)
+		// and find out their owners. Then, we gather the tags for the original $type from all owners,
+		// and return them as elements of a list that look like "Tag (owner)".
+		foreach ($allMaybeSharedItems as $collectionType => $maybeSharedItems) {
+			foreach ($maybeSharedItems as $sharedItem) {
+				if (isset($sharedItem['id'])) { //workaround for https://github.com/owncloud/core/issues/2814
+					$owners[] = $sharedItem['uid_owner'];
+				}
+			}
+		}
+
+		return $owners;
+	}
+
 	/**
 	 * Get shared items from the database
 	 * @param string $itemType
diff --git a/lib/private/tagmanager.php b/lib/private/tagmanager.php
index 7a3216de032..d5bff04acff 100644
--- a/lib/private/tagmanager.php
+++ b/lib/private/tagmanager.php
@@ -70,10 +70,11 @@ class TagManager implements \OCP\ITagManager {
 	* @see \OCP\ITags
 	* @param string $type The type identifier e.g. 'contact' or 'event'.
 	* @param array $defaultTags An array of default tags to be used if none are stored.
+	* @param boolean $includeShared Whether to include tags for items shared with this user by others.
 	* @return \OCP\ITags
 	*/
-	public function load($type, $defaultTags=array()) {
-		return new Tags($this->mapper, $this->user, $type, $defaultTags);
+	public function load($type, $defaultTags=array(), $includeShared=false) {
+		return new Tags($this->mapper, $this->user, $type, $defaultTags, $includeShared);
 	}
 
 }
diff --git a/lib/private/tags.php b/lib/private/tags.php
index aceb88355c8..82a4aa4d02f 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -67,6 +67,21 @@ class Tags implements \OCP\ITags {
 	 */
 	private $user;
 
+	/**
+	 * Are we including tags for shared items?
+	 *
+	 * @var bool
+	 */
+	private $includeShared = false;
+
+	/**
+	 * The current user, plus any owners of the items shared with the current
+	 * user, if $this->includeShared === true.
+	 *
+	 * @var array
+	 */
+	private $owners = array();
+
 	/**
 	 * The Mapper we're using to communicate our Tag objects to the database.
 	 *
@@ -74,6 +89,14 @@ class Tags implements \OCP\ITags {
 	 */
 	private $mapper;
 
+	/**
+	 * The sharing backend for objects of $this->type. Required if
+	 * $this->includeShared === true to determine ownership of items.
+	 *
+	 * @var \OCP\Share_Backend
+	 */
+	private $backend;
+
 	const TAG_TABLE = '*PREFIX*vcategory';
 	const RELATION_TABLE = '*PREFIX*vcategory_to_object';
 
@@ -86,11 +109,18 @@ class Tags implements \OCP\ITags {
 	* @param string $user The user whose data the object will operate on.
 	* @param string $type The type of items for which tags will be loaded.
 	* @param array $defaultTags Tags that should be created at construction.
+	* @param boolean $includeShared Whether to include tags for items shared with this user by others.
 	*/
-	public function __construct(TagMapper $mapper, $user, $type, $defaultTags = array()) {
+	public function __construct(TagMapper $mapper, $user, $type, $defaultTags = array(), $includeShared = false) {
 		$this->mapper = $mapper;
 		$this->user = $user;
 		$this->type = $type;
+		$this->includeShared = $includeShared;
+		$this->owners = array($this->user);
+		if ($this->includeShared) {
+			$this->owners = array_merge($this->owners, \OC\Share\Share::getSharedItemsOwners($this->user, $this->type, true));
+			$this->backend = \OC\Share\Share::getBackend($this->type);
+		}
 		$this->loadTags($defaultTags);
 	}
 
@@ -99,14 +129,13 @@ class Tags implements \OCP\ITags {
 	*
 	*/
 	protected function loadTags($defaultTags=array()) {
-		$this->tags = $this->mapper->loadTags(array($this->user), $this->type);
+		$this->tags = $this->mapper->loadTags($this->owners, $this->type);
 
 		if(count($defaultTags) > 0 && count($this->tags) === 0) {
 			$this->addMultiple($defaultTags, true);
 		}
 		\OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true),
 			\OCP\Util::DEBUG);
-
 	}
 
 	/**
@@ -153,6 +182,21 @@ class Tags implements \OCP\ITags {
 
 	}
 
+	/**
+	* Return only the tags owned by the given user, omitting any tags shared
+	* by other users.
+	*
+	* @param string $user The user whose tags are to be checked.
+	* @return array An array of Tag objects.
+	*/
+	public function getTagsForUser($user) {
+		return array_filter($this->tags,
+			function($tag) use($user) {
+				return $tag->getOwner() === $user;
+			}
+		);
+	}
+
 	/**
 	* Get the a list if items tagged with $tag.
 	*
@@ -200,7 +244,22 @@ class Tags implements \OCP\ITags {
 
 		if(!is_null($result)) {
 			while( $row = $result->fetchRow()) {
-				$ids[] = (int)$row['objid'];
+				$id = (int)$row['objid'];
+
+				if ($this->includeShared) {
+					// We have to check if we are really allowed to access the
+					// items that are tagged with $tag. To that end, we ask the
+					// corresponding sharing backend if the item identified by $id
+					// is owned by any of $this->owners.
+					foreach ($this->owners as $owner) {
+						if ($this->backend->isValidSource($id, $owner)) {
+							$ids[] = $id;
+							break;
+						}
+					}
+				} else {
+					$ids[] = $id;
+				}
 			}
 		}
 
@@ -208,9 +267,22 @@ class Tags implements \OCP\ITags {
 	}
 
 	/**
-	* Checks whether a tag is already saved.
+	* Checks whether a tag is saved for the given user,
+	* disregarding the ones shared with him or her.
 	*
-	* @param string $name The name to check for.
+	* @param string $name The tag name to check for.
+	* @param string $user The user whose tags are to be checked.
+	* @return bool
+	*/
+	public function userHasTag($name, $user) {
+		$key = $this->array_searchi($name, $this->getTagsForUser($user));
+		return ($key !== false) ? $this->tags[$key]->getId() : false;
+	}
+
+	/**
+	* Checks whether a tag is saved for or shared with the current user.
+	*
+	* @param string $name The tag name to check for.
 	* @return bool
 	*/
 	public function hasTag($name) {
@@ -230,7 +302,7 @@ class Tags implements \OCP\ITags {
 			\OCP\Util::writeLog('core', __METHOD__.', Cannot add an empty tag', \OCP\Util::DEBUG);
 			return false;
 		}
-		if($this->hasTag($name)) { // FIXME
+		if($this->userHasTag($name, $this->user)) {
 			\OCP\Util::writeLog('core', __METHOD__.', name: ' . $name. ' exists already', \OCP\Util::DEBUG);
 			return false;
 		}
@@ -263,7 +335,11 @@ class Tags implements \OCP\ITags {
 			return false;
 		}
 
-		$key = $this->array_searchi($from, $this->tags); // FIXME: owner. or renameById() ?
+		if (is_numeric($from)) {
+			$key = $this->getTagById($from);
+		} else {
+			$key = $this->getTagByName($from);
+		}
 		if($key === false) {
 			\OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG);
 			return false;
@@ -285,7 +361,7 @@ class Tags implements \OCP\ITags {
 	* Add a list of new tags.
 	*
 	* @param string[] $names A string with a name or an array of strings containing
-	* the name(s) of the to add.
+	* the name(s) of the tag(s) to add.
 	* @param bool $sync When true, save the tags
 	* @param int|null $id int Optional object id to add to this|these tag(s)
 	* @return bool Returns false on error.
@@ -467,7 +543,7 @@ class Tags implements \OCP\ITags {
 	* @return boolean
 	*/
 	public function addToFavorites($objid) {
-		if(!$this->hasTag(self::TAG_FAVORITE)) {
+		if(!$this->userHasTag(self::TAG_FAVORITE, $this->user)) {
 			$this->add(self::TAG_FAVORITE);
 		}
 		return $this->tagAs($objid, self::TAG_FAVORITE);
@@ -554,7 +630,7 @@ class Tags implements \OCP\ITags {
 	/**
 	* Delete tags from the database.
 	*
-	* @param string[] $names An array of tags to delete
+	* @param string[] $names An array of tags (names or IDs) to delete
 	* @return bool Returns false on error
 	*/
 	public function delete($names) {
@@ -570,8 +646,12 @@ class Tags implements \OCP\ITags {
 		foreach($names as $name) {
 			$id = null;
 
-			if($this->hasTag($name)) {
-				$key = $this->array_searchi($name, $this->tags);
+			if (is_numeric($name)) {
+				$key = $this->getTagById($name);
+			} else {
+				$key = $this->getTagByName($name);
+			}
+			if ($key !== false) {
 				$tag = $this->tags[$key];
 				$id = $tag->getId();
 				unset($this->tags[$key]);
@@ -618,12 +698,35 @@ class Tags implements \OCP\ITags {
 	* Get a tag's ID.
 	*
 	* @param string $name The tag name to look for.
-	* @return string The tag's id or false if it hasn't been saved yet.
+	* @return string|bool The tag's id or false if no matching tag is found.
 	*/
 	private function getTagId($name) {
-		if (($key = $this->array_searchi($name, $this->tags)) === false) {
-			return false;
+		$key = $this->array_searchi($name, $this->tags);
+		if ($key !== false) {
+			return $this->tags[$key]->getId();
 		}
-		return $this->tags[$key]->getId();
+		return false;
+	}
+
+	/**
+	* Get a tag by its name.
+	*
+	* @param string $name The tag name.
+	* @return integer|bool The tag object's offset within the $this->tags
+	*                      array or false if it doesn't exist.
+	*/
+	private function getTagByName($name) {
+		return $this->array_searchi($name, $this->tags, 'getName');
+	}
+
+	/**
+	* Get a tag by its ID.
+	*
+	* @param string $id The tag ID to look for.
+	* @return integer|bool The tag object's offset within the $this->tags
+	*                      array or false if it doesn't exist.
+	*/
+	private function getTagById($id) {
+		return $this->array_searchi($id, $this->tags, 'getId');
 	}
 }
diff --git a/lib/public/itagmanager.php b/lib/public/itagmanager.php
index 40487de42b4..54daa5cc1cb 100644
--- a/lib/public/itagmanager.php
+++ b/lib/public/itagmanager.php
@@ -48,8 +48,9 @@ interface ITagManager {
 	* @see \OCP\ITags
 	* @param string $type The type identifier e.g. 'contact' or 'event'.
 	* @param array $defaultTags An array of default tags to be used if none are stored.
+	* @param boolean $includeShared Whether to include tags for items shared with this user by others.
 	* @return \OCP\ITags
 	*/
-	public function load($type, $defaultTags=array());
+	public function load($type, $defaultTags=array(), $includeShared=false);
 
-}
\ No newline at end of file
+}
diff --git a/lib/public/itags.php b/lib/public/itags.php
index 4bfceb8d799..6076ddb4d02 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -84,6 +84,16 @@ interface ITags {
 	*/
 	public function hasTag($name);
 
+	/**
+	* Checks whether a tag is saved for the given user,
+	* disregarding the ones shared with him or her.
+	*
+	* @param string $name The tag name to check for.
+	* @param string $user The user whose tags are to be checked.
+	* @return bool
+	*/
+	public function userHasTag($name, $user);
+
 	/**
 	* Add a new tag.
 	*
diff --git a/tests/lib/share/backend.php b/tests/lib/share/backend.php
index 50ce24e07b6..61b8f262a42 100644
--- a/tests/lib/share/backend.php
+++ b/tests/lib/share/backend.php
@@ -29,9 +29,10 @@ class Test_Share_Backend implements OCP\Share_Backend {
 
 	private $testItem1 = 'test.txt';
 	private $testItem2 = 'share.txt';
+	private $testId = 1;
 
 	public function isValidSource($itemSource, $uidOwner) {
-		if ($itemSource == $this->testItem1 || $itemSource == $this->testItem2) {
+		if ($itemSource == $this->testItem1 || $itemSource == $this->testItem2 || $itemSource == 1) {
 			return true;
 		}
 	}
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 4d9b8558fd3..455b99120ab 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -195,4 +195,28 @@ class Test_Tags extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(array(), $tagger->getFavorites());
 	}
 
+	public function testShareTags() {
+		$test_tag = 'TestTag';
+		OCP\Share::registerBackend('test', 'Test_Share_Backend');
+
+		$tagger = $this->tagMgr->load('test');
+		$tagger->tagAs(1, $test_tag);
+
+		$other_user = uniqid('user2_');
+		OC_User::createUser($other_user, 'pass');
+
+		OC_User::setUserId($other_user);
+		$other_tagMgr = new OC\TagManager($this->tagMapper, $other_user);
+		$other_tagger = $other_tagMgr->load('test');
+		$this->assertFalse($other_tagger->hasTag($test_tag));
+
+		OC_User::setUserId($this->user);
+		OCP\Share::shareItem('test', 1, OCP\Share::SHARE_TYPE_USER, $other_user, OCP\PERMISSION_READ);
+
+		OC_User::setUserId($other_user);
+		$other_tagger = $other_tagMgr->load('test', array(), true); // Update tags, load shared ones.
+		$this->assertTrue($other_tagger->hasTag($test_tag));
+		$this->assertContains(1, $other_tagger->getIdsForTag($test_tag));
+	}
+
 }
-- 
GitLab


From 226d7233e17b114ac86d50900f4ee778f6192d7a Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Fri, 3 Oct 2014 19:32:39 +0200
Subject: [PATCH 088/616] In Tags::rename($from, $to), check if there already
 is a tag named $to.

---
 lib/private/tags.php | 7 ++++++-
 tests/lib/tags.php   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/private/tags.php b/lib/private/tags.php
index 82a4aa4d02f..5768f19cf21 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -344,9 +344,14 @@ class Tags implements \OCP\ITags {
 			\OCP\Util::writeLog('core', __METHOD__.', tag: ' . $from. ' does not exist', \OCP\Util::DEBUG);
 			return false;
 		}
+		$tag = $this->tags[$key];
+
+		if($this->userHasTag($to, $tag->getOwner())) {
+			\OCP\Util::writeLog('core', __METHOD__.', A tag named ' . $to. ' already exists for user ' . $tag->getOwner() . '.', \OCP\Util::DEBUG);
+			return false;
+		}
 
 		try {
-			$tag = $this->tags[$key];
 			$tag->setName($to);
 			$this->tags[$key] = $this->mapper->update($tag);
 		} catch(\Exception $e) {
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 455b99120ab..2f7a1e817f8 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -150,8 +150,8 @@ class Test_Tags extends PHPUnit_Framework_TestCase {
 		$this->assertTrue($tagger->rename('Wrok', 'Work'));
 		$this->assertTrue($tagger->hasTag('Work'));
 		$this->assertFalse($tagger->hastag('Wrok'));
-		$this->assertFalse($tagger->rename('Wrok', 'Work'));
-
+		$this->assertFalse($tagger->rename('Wrok', 'Work')); // Rename non-existant tag.
+		$this->assertFalse($tagger->rename('Work', 'Family')); // Collide with existing tag.
 	}
 
 	public function testTagAs() {
-- 
GitLab


From bc265e8b527c50dc7c63fbff7e43483ed1d2c891 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Fri, 10 Oct 2014 23:18:43 +0200
Subject: [PATCH 089/616] Make loading of tags from DB more explicit.

---
 lib/private/tags.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/lib/private/tags.php b/lib/private/tags.php
index 5768f19cf21..05fb117036a 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -121,14 +121,6 @@ class Tags implements \OCP\ITags {
 			$this->owners = array_merge($this->owners, \OC\Share\Share::getSharedItemsOwners($this->user, $this->type, true));
 			$this->backend = \OC\Share\Share::getBackend($this->type);
 		}
-		$this->loadTags($defaultTags);
-	}
-
-	/**
-	* Load tags from db.
-	*
-	*/
-	protected function loadTags($defaultTags=array()) {
 		$this->tags = $this->mapper->loadTags($this->owners, $this->type);
 
 		if(count($defaultTags) > 0 && count($this->tags) === 0) {
@@ -413,7 +405,9 @@ class Tags implements \OCP\ITags {
 			}
 
 			// reload tags to get the proper ids.
-			$this->loadTags();
+			$this->tags = $this->mapper->loadTags($this->owners, $this->type);
+			\OCP\Util::writeLog('core', __METHOD__.', tags: ' . print_r($this->tags, true),
+				\OCP\Util::DEBUG);
 			// Loop through temporarily cached objectid/tagname pairs
 			// and save relations.
 			$tags = $this->tags;
-- 
GitLab


From 17701796480ae1fd53222fa4e59d5fa1b79648db Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Mon, 13 Oct 2014 22:30:36 +0200
Subject: [PATCH 090/616] Add getTag() function for accessing of a single tag.

---
 lib/private/tags.php | 38 ++++++++++++++++++++++++++++++++------
 lib/public/itags.php |  9 +++++++++
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/lib/private/tags.php b/lib/private/tags.php
index 05fb117036a..1065ba2ef98 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -139,6 +139,21 @@ class Tags implements \OCP\ITags {
 		return count($this->tags) === 0;
 	}
 
+	/**
+	* Returns an array mapping a given tag's properties to its values:
+	* ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
+	*
+	* @param string $id The ID of the tag that is going to be mapped
+	* @return array|false
+	*/
+	public function getTag($id) {
+		$key = $this->getTagById($id);
+		if ($key !== false) {
+			return $this->tagMap($this->tags[$key]);
+		}
+		return false;
+	}
+
 	/**
 	* Get the tags for a specific user.
 	*
@@ -162,12 +177,7 @@ class Tags implements \OCP\ITags {
 
 		foreach($this->tags as $tag) {
 			if($tag->getName() !== self::TAG_FAVORITE) {
-				$tagMap[] = array(
-					'id'    => $tag->getId(),
-					'name'  => $tag->getName(),
-					'owner' => $tag->getOwner(),
-					'type'  => $tag->getType()
-				);
+				$tagMap[] = $this->tagMap($tag);
 			}
 		}
 		return $tagMap;
@@ -728,4 +738,20 @@ class Tags implements \OCP\ITags {
 	private function getTagById($id) {
 		return $this->array_searchi($id, $this->tags, 'getId');
 	}
+
+	/**
+	* Returns an array mapping a given tag's properties to its values:
+	* ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
+	*
+	* @param Tag $tag The tag that is going to be mapped
+	* @return array
+	*/
+	private function tagMap(Tag $tag) {
+		return array(
+			'id'    => $tag->getId(),
+			'name'  => $tag->getName(),
+			'owner' => $tag->getOwner(),
+			'type'  => $tag->getType()
+		);
+	}
 }
diff --git a/lib/public/itags.php b/lib/public/itags.php
index 6076ddb4d02..2b09dcb5685 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -53,6 +53,15 @@ interface ITags {
 	*/
 	public function isEmpty();
 
+	/**
+	* Returns an array mapping a given tag's properties to its values:
+	* ['id' => 0, 'name' = 'Tag', 'owner' = 'User', 'type' => 'tagtype']
+	*
+	* @param string $id The ID of the tag that is going to be mapped
+	* @return array|false
+	*/
+	public function getTag($id);
+
 	/**
 	* Get the tags for a specific user.
 	*
-- 
GitLab


From b416f7d8acabebec94e771394b9e3d69c69cadd5 Mon Sep 17 00:00:00 2001
From: Bernhard Reiter <ockham@raz.or.at>
Date: Mon, 13 Oct 2014 23:12:18 +0200
Subject: [PATCH 091/616] PHPDoc fixes as suggested by @MorrisJobke.

---
 lib/private/tagging/tag.php       | 4 ++++
 lib/private/tagging/tagmapper.php | 2 +-
 lib/private/tags.php              | 4 ++--
 lib/public/itags.php              | 4 ++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/private/tagging/tag.php b/lib/private/tagging/tag.php
index d0cd6bbb966..3ea9fbac20b 100644
--- a/lib/private/tagging/tag.php
+++ b/lib/private/tagging/tag.php
@@ -55,8 +55,11 @@ class Tag extends Entity {
 
 	/**
 	 * Transform a database columnname to a property
+	 *
 	 * @param string $columnName the name of the column
 	 * @return string the property name
+	 * @todo migrate existing database columns to the correct names
+	 * to be able to drop this direct mapping
 	 */
 	public function columnToProperty($columnName){
 		if ($columnName === 'category') {
@@ -70,6 +73,7 @@ class Tag extends Entity {
 
 	/**
 	 * Transform a property to a database column name
+	 *
 	 * @param string $property the name of the property
 	 * @return string the column name
 	 */
diff --git a/lib/private/tagging/tagmapper.php b/lib/private/tagging/tagmapper.php
index b5929e2618c..6c9bec7aa52 100644
--- a/lib/private/tagging/tagmapper.php
+++ b/lib/private/tagging/tagmapper.php
@@ -27,7 +27,7 @@ use \OCP\AppFramework\Db\Mapper,
     \OCP\IDb;
 
 /**
- * Thin wrapper around \OCP\AppFramework\Db\Mapper.
+ * Mapper for Tag entity
  */
 class TagMapper extends Mapper {
 
diff --git a/lib/private/tags.php b/lib/private/tags.php
index 1065ba2ef98..bab3d495282 100644
--- a/lib/private/tags.php
+++ b/lib/private/tags.php
@@ -324,7 +324,7 @@ class Tags implements \OCP\ITags {
 	/**
 	* Rename tag.
 	*
-	* @param string $from The name of the existing tag
+	* @param string|integer $from The name or ID of the existing tag
 	* @param string $to The new name of the tag.
 	* @return bool
 	*/
@@ -639,7 +639,7 @@ class Tags implements \OCP\ITags {
 	/**
 	* Delete tags from the database.
 	*
-	* @param string[] $names An array of tags (names or IDs) to delete
+	* @param string[]|integer[] $names An array of tags (names or IDs) to delete
 	* @return bool Returns false on error
 	*/
 	public function delete($names) {
diff --git a/lib/public/itags.php b/lib/public/itags.php
index 2b09dcb5685..4514746bbe8 100644
--- a/lib/public/itags.php
+++ b/lib/public/itags.php
@@ -114,7 +114,7 @@ interface ITags {
 	/**
 	* Rename tag.
 	*
-	* @param string $from The name of the existing tag
+	* @param string|integer $from The name or ID of the existing tag
 	* @param string $to The new name of the tag.
 	* @return bool
 	*/
@@ -183,7 +183,7 @@ interface ITags {
 	/**
 	* Delete tags from the database
 	*
-	* @param string[] $names An array of tags to delete
+	* @param string[]|integer[] $names An array of tags (names or IDs) to delete
 	* @return bool Returns false on error
 	*/
 	public function delete($names);
-- 
GitLab


From 0407bc097895355b90bc722e8b58afb27a40d538 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 13 Oct 2014 11:18:24 +0200
Subject: [PATCH 092/616] Set overwritemailurl* configs on setup

Correctly use overwritemailurl value when generating absolute urls in CLI

Fix #11500

Rename the config to *cli

Add overwrite.cli.url to the sample config

Revert separator fix, fixes unit test
---
 config/config.sample.php     | 7 +++++++
 lib/private/setup.php        | 2 +-
 lib/private/urlgenerator.php | 4 ++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 02958ace0c2..0a21978ba2b 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -329,6 +329,13 @@ $CONFIG = array(
  */
 'overwritecondaddr' => '',
 
+/**
+ * Use this configuration parameter to specify the base url for any urls which are
+ * generated within ownCloud using any kind of command line tools (cron or occ).
+ * The value should contain the full base URL: ``https://www.example.com/owncloud``
+ */
+'overwrite.cli.url' => '',
+
 /**
  * The URL of your proxy server, for example ``proxy.example.com:8081``.
  */
diff --git a/lib/private/setup.php b/lib/private/setup.php
index b1b3388f81b..75dc1987ee6 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -86,7 +86,7 @@ class OC_Setup {
 		//write the config file
 		\OC::$server->getConfig()->setSystemValue('trusted_domains', $trustedDomains);
 		\OC::$server->getConfig()->setSystemValue('datadirectory', $datadir);
-		\OC::$server->getConfig()->setSystemValue('overwritewebroot', OC::$WEBROOT);
+		\OC::$server->getConfig()->setSystemValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT);
 		\OC::$server->getConfig()->setSystemValue('dbtype', $dbtype);
 		\OC::$server->getConfig()->setSystemValue('version', implode('.', OC_Util::getVersion()));
 
diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
index f5ec9803edb..e50e9eed6af 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -162,6 +162,10 @@ class URLGenerator implements IURLGenerator {
 	public function getAbsoluteURL($url) {
 		$separator = $url[0] === '/' ? '' : '/';
 
+		if (\OC::$CLI && !defined('PHPUNIT_RUN')) {
+			return rtrim($this->config->getSystemValue('overwrite.cli.url'), '/') . '/' . ltrim($url, '/');
+		}
+
 		// The ownCloud web root can already be prepended.
 		$webRoot = substr($url, 0, strlen(\OC::$WEBROOT)) === \OC::$WEBROOT
 			? ''
-- 
GitLab


From 4b5c7d3d9d783e2b905659e581474b270b3c4796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 14 Oct 2014 06:36:53 +0200
Subject: [PATCH 093/616] adding cache control headers for css and js - fixes
 #11496

---
 .htaccess | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.htaccess b/.htaccess
index ee4d5af1d85..e45810d0a05 100644
--- a/.htaccess
+++ b/.htaccess
@@ -38,3 +38,8 @@ Options -Indexes
 <IfModule pagespeed_module>
         ModPagespeed Off
 </IfModule>
+<IfModule mod_headers.c>
+  <FilesMatch ".(css|js)$">
+    Header set Cache-Control "max-age=7200, public"
+  </FilesMatch>
+</IfModule>
-- 
GitLab


From 526abf1ad6024294e88c48d66ed70dedb080d8e9 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 14 Oct 2014 01:54:28 -0400
Subject: [PATCH 094/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/ja.php   |  6 ++++
 core/l10n/ja.php                    |  1 +
 core/l10n/nb_NO.php                 |  2 +-
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              | 48 ++++++++++++++---------------
 l10n/templates/private.pot          | 48 ++++++++++++++---------------
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 settings/l10n/fr.php                |  8 ++---
 16 files changed, 70 insertions(+), 63 deletions(-)

diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
index 61a2f085a08..9e4517d63cd 100644
--- a/apps/files_encryption/l10n/ja.php
+++ b/apps/files_encryption/l10n/ja.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "不明なエラー",
+"Missing recovery key password" => "復旧キーのパスワードがありません",
+"Please repeat the recovery key password" => "復旧キーのパスワードをもう一度入力",
+"Repeated recovery key password does not match the provided recovery key password" => "入力された復旧キーのパスワードが一致しません。",
 "Recovery key successfully enabled" => "リカバリ用のキーを正常に有効にしました",
 "Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
 "Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
+"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." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
 "Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index ac700a97d4a..dedf3b759b4 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -88,6 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "送信",
 "Set expiration date" => "有効期限を設定",
 "Expiration date" => "有効期限",
+"Adding user..." => "ユーザー追加中...",
 "group" => "グループ",
 "Resharing is not allowed" => "再共有は許可されていません",
 "Shared in {item} with {user}" => "{item} 内で {user} と共有中",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index e51697320e5..1074ad1b217 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -66,7 +66,7 @@ $TRANSLATIONS = array(
 "So-so password" => "So-so-passord",
 "Good password" => "Bra passord",
 "Strong password" => "Sterkt passord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettservev er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke funkere.",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettserver er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke fungere.",
 "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." => "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
 "Error occurred while checking server setup" => "Feil oppstod ved sjekking av server-oppsett",
 "Shared" => "Delt",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 2deb44c1b30..0cac9dd446c 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index a3d68ce1dcb..457a5ca0566 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index c23c3508aff..0173a314c02 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 1426cba24ae..53441ce6c48 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index b240d545a69..15dceb256e3 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index dd727868f8a..c9ab8d9785e 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 636dce12182..ac4241695c9 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 334d673904b..2079d1a4a6d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -273,126 +273,126 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: private/share/share.php:508
+#: private/share/share.php:509
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: private/share/share.php:515
+#: private/share/share.php:516
 #, php-format
 msgid "You are not allowed to share %s"
 msgstr ""
 
-#: private/share/share.php:545
+#: private/share/share.php:546
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: private/share/share.php:551
+#: private/share/share.php:552
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: private/share/share.php:560
+#: private/share/share.php:561
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: private/share/share.php:573 private/share/share.php:601
+#: private/share/share.php:574 private/share/share.php:602
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: private/share/share.php:581
+#: private/share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: private/share/share.php:588
+#: private/share/share.php:589
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: private/share/share.php:642
+#: private/share/share.php:643
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: private/share/share.php:671
+#: private/share/share.php:672
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:678
+#: private/share/share.php:679
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:902
+#: private/share/share.php:903
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:963
+#: private/share/share.php:964
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:1001
+#: private/share/share.php:1002
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: private/share/share.php:1009
+#: private/share/share.php:1010
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: private/share/share.php:1135
+#: private/share/share.php:1136
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:1142
+#: private/share/share.php:1143
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:1148
+#: private/share/share.php:1149
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1840
+#: private/share/share.php:1841
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1850
+#: private/share/share.php:1851
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1876
+#: private/share/share.php:1877
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1890
+#: private/share/share.php:1891
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1904
+#: private/share/share.php:1905
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 6329d562857..a41340342b1 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -232,126 +232,126 @@ msgstr ""
 msgid "%s shared »%s« with you"
 msgstr ""
 
-#: share/share.php:508
+#: share/share.php:509
 #, php-format
 msgid "Sharing %s failed, because the file does not exist"
 msgstr ""
 
-#: share/share.php:515
+#: share/share.php:516
 #, php-format
 msgid "You are not allowed to share %s"
 msgstr ""
 
-#: share/share.php:545
+#: share/share.php:546
 #, php-format
 msgid "Sharing %s failed, because the user %s is the item owner"
 msgstr ""
 
-#: share/share.php:551
+#: share/share.php:552
 #, php-format
 msgid "Sharing %s failed, because the user %s does not exist"
 msgstr ""
 
-#: share/share.php:560
+#: share/share.php:561
 #, php-format
 msgid ""
 "Sharing %s failed, because the user %s is not a member of any groups that %s "
 "is a member of"
 msgstr ""
 
-#: share/share.php:573 share/share.php:601
+#: share/share.php:574 share/share.php:602
 #, php-format
 msgid "Sharing %s failed, because this item is already shared with %s"
 msgstr ""
 
-#: share/share.php:581
+#: share/share.php:582
 #, php-format
 msgid "Sharing %s failed, because the group %s does not exist"
 msgstr ""
 
-#: share/share.php:588
+#: share/share.php:589
 #, php-format
 msgid "Sharing %s failed, because %s is not a member of the group %s"
 msgstr ""
 
-#: share/share.php:642
+#: share/share.php:643
 msgid ""
 "You need to provide a password to create a public link, only protected links "
 "are allowed"
 msgstr ""
 
-#: share/share.php:671
+#: share/share.php:672
 #, php-format
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: share/share.php:678
+#: share/share.php:679
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: share/share.php:902
+#: share/share.php:903
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: share/share.php:963
+#: share/share.php:964
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: share/share.php:1001
+#: share/share.php:1002
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: share/share.php:1009
+#: share/share.php:1010
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: share/share.php:1135
+#: share/share.php:1136
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: share/share.php:1142
+#: share/share.php:1143
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: share/share.php:1148
+#: share/share.php:1149
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: share/share.php:1840
+#: share/share.php:1841
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: share/share.php:1850
+#: share/share.php:1851
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: share/share.php:1876
+#: share/share.php:1877
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: share/share.php:1890
+#: share/share.php:1891
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: share/share.php:1904
+#: share/share.php:1905
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index f8f99e1b636..82ebe7df4fa 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index b6cd7852312..a2483f773c5 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 8d9aad981f4..e85687618fb 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-13 01:54-0400\n"
+"POT-Creation-Date: 2014-10-14 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 96c38db5d4d..6c82b4e266b 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -37,7 +37,7 @@ $TRANSLATIONS = array(
 "Wrong password" => "Mot de passe incorrect",
 "No user supplied" => "Aucun utilisateur fourni",
 "Please provide an admin recovery password, otherwise all user data will be lost" => "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
-"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données invalide. Veuillez vérifier le mot de passe et essayer à nouveau.",
+"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
 "Unable to change password" => "Impossible de modifier le mot de passe",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
@@ -139,7 +139,7 @@ $TRANSLATIONS = array(
 "Enforce expiration date" => "Imposer la date d'expiration",
 "Allow resharing" => "Autoriser le repartage",
 "Restrict users to only share with users in their groups" => "N'autoriser les partages qu'entre membres de même groupes",
-"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les fichiers partagés",
+"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
 "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. ",
 "Security" => "Sécurité",
@@ -192,8 +192,8 @@ $TRANSLATIONS = array(
 "Your email address" => "Votre adresse e-mail",
 "Fill in an email address to enable password recovery and receive notifications" => "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
 "Profile picture" => "Photo de profil",
-"Upload new" => "Téléverser une nouvelle",
-"Select new from Files" => "Sélectionner une nouvelle depuis les Fichiers",
+"Upload new" => "Nouvelle depuis votre ordinateur",
+"Select new from Files" => "Nouvelle depuis les Fichiers",
 "Remove image" => "Supprimer l'image",
 "Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
 "Your avatar is provided by your original account." => "Votre avatar est fourni par votre compte original.",
-- 
GitLab


From bf84cd4bccceaaccd0209cacfbad474bbd448348 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 14 Oct 2014 12:58:00 +0200
Subject: [PATCH 095/616] Add darwin to if block

Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
---
 lib/private/largefilehelper.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php
index d5b7946feff..f925a4457f2 100644
--- a/lib/private/largefilehelper.php
+++ b/lib/private/largefilehelper.php
@@ -151,7 +151,7 @@ class LargeFileHelper {
 			$result = null;
 			if (strpos($os, 'linux') !== false) {
 				$result = $this->exec("stat -c %s $arg");
-			} else if (strpos($os, 'bsd') !== false) {
+			} else if (strpos($os, 'bsd') !== false || strpos($os, 'darwin') !== false) {
 				$result = $this->exec("stat -f %z $arg");
 			} else if (strpos($os, 'win') !== false) {
 				$result = $this->exec("for %F in ($arg) do @echo %~zF");
-- 
GitLab


From 1b3feb710d59c39a044447159e7b06624b16dd6e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Sun, 12 Oct 2014 18:40:10 +0200
Subject: [PATCH 096/616] Use `rawurlencode` since this seems to be expected by
 cURL

Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405
---
 lib/private/largefilehelper.php                               | 2 +-
 .../data/str\303\244ng\303\251 filename (duplicate #2).txt"   | 4 ++++
 tests/lib/largefilehelpergetfilesize.php                      | 4 ++--
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100644 "tests/data/str\303\244ng\303\251 filename (duplicate #2).txt"

diff --git a/lib/private/largefilehelper.php b/lib/private/largefilehelper.php
index d5b7946feff..33f32255f3b 100644
--- a/lib/private/largefilehelper.php
+++ b/lib/private/largefilehelper.php
@@ -101,7 +101,7 @@ class LargeFileHelper {
 	*/
 	public function getFileSizeViaCurl($filename) {
 		if (function_exists('curl_init')) {
-			$fencoded = urlencode($filename);
+			$fencoded = rawurlencode($filename);
 			$ch = curl_init("file://$fencoded");
 			curl_setopt($ch, CURLOPT_NOBODY, true);
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
diff --git "a/tests/data/str\303\244ng\303\251 filename (duplicate #2).txt" "b/tests/data/str\303\244ng\303\251 filename (duplicate #2).txt"
new file mode 100644
index 00000000000..b62c3fb2ffd
--- /dev/null
+++ "b/tests/data/str\303\244ng\303\251 filename (duplicate #2).txt"	
@@ -0,0 +1,4 @@
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
+Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
\ No newline at end of file
diff --git a/tests/lib/largefilehelpergetfilesize.php b/tests/lib/largefilehelpergetfilesize.php
index 21a0aa9a233..58571d641e0 100644
--- a/tests/lib/largefilehelpergetfilesize.php
+++ b/tests/lib/largefilehelpergetfilesize.php
@@ -20,8 +20,8 @@ class LargeFileHelperGetFileSize extends \PHPUnit_Framework_TestCase {
 	public function setUp() {
 		parent::setUp();
 		$ds = DIRECTORY_SEPARATOR;
-		$this->filename = dirname(__DIR__) . "{$ds}data{$ds}data.tar.gz";
-		$this->fileSize = 4195;
+		$this->filename = dirname(__DIR__) . "{$ds}data{$ds}strängé filename (duplicate #2).txt";
+		$this->fileSize = 446;
 		$this->helper = new \OC\LargeFileHelper;
 	}
 
-- 
GitLab


From 13b1b45ee4bab5b832ca3a1602b4c4fb6d391f86 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 3 Oct 2014 15:14:22 +0200
Subject: [PATCH 097/616] Refactor MailSettings controller

- Do not store the password (fixes https://github.com/owncloud/core/issues/11385)
- Refactor to AppFramework
- Add unit tests

Conflicts:
	settings/admin/controller.php
---
 settings/admin/controller.php                 | 123 -----------
 settings/application.php                      |  70 +++++++
 .../controller/mailsettingscontroller.php     | 166 +++++++++++++++
 settings/css/settings.css                     |   4 +-
 settings/js/admin.js                          |  12 +-
 settings/routes.php                           |  17 +-
 settings/templates/admin.php                  | 149 ++++++-------
 tests/phpunit-autotest.xml                    |   1 +
 .../controller/mailsettingscontrollertest.php | 196 ++++++++++++++++++
 9 files changed, 531 insertions(+), 207 deletions(-)
 delete mode 100644 settings/admin/controller.php
 create mode 100644 settings/application.php
 create mode 100644 settings/controller/mailsettingscontroller.php
 create mode 100644 tests/settings/controller/mailsettingscontrollertest.php

diff --git a/settings/admin/controller.php b/settings/admin/controller.php
deleted file mode 100644
index 395bc7c6e49..00000000000
--- a/settings/admin/controller.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-/**
-* @author Joas Schilling
-* @copyright 2014 Joas Schilling nickvergessen@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/>.
-*/
-
-namespace OC\Settings\Admin;
-
-class Controller {
-	/**
-	 * Set mail settings
-	 */
-	public static function setMailSettings() {
-		\OC_Util::checkAdminUser();
-		\OCP\JSON::callCheck();
-
-		$l = \OC::$server->getL10N('settings');
-
-		$smtp_settings = array(
-			'mail_domain'		=> null,
-			'mail_from_address'	=> null,
-			'mail_smtpmode'			=> array('sendmail', 'smtp', 'qmail', 'php'),
-			'mail_smtpsecure'		=> array('', 'ssl', 'tls'),
-			'mail_smtphost'		=> null,
-			'mail_smtpport'		=> null,
-			'mail_smtpauthtype'		=> array('LOGIN', 'PLAIN', 'NTLM'),
-			'mail_smtpauth'			=> true,
-			'mail_smtpname'		=> null,
-			'mail_smtppassword'	=> null,
-		);
-
-		foreach ($smtp_settings as $setting => $validate) {
-			if (!$validate) {
-				if (!isset($_POST[$setting]) || $_POST[$setting] === '') {
-					\OC_Config::deleteKey( $setting );
-				} else {
-					\OC_Config::setValue( $setting, $_POST[$setting] );
-				}
-			}
-			else if (is_bool($validate)) {
-				if (!empty($_POST[$setting])) {
-					\OC_Config::setValue( $setting, (bool) $_POST[$setting] );
-				} else {
-					\OC_Config::deleteKey( $setting );
-				}
-			}
-			else if (is_array($validate)) {
-				if (!isset($_POST[$setting]) || $_POST[$setting] === '') {
-					\OC_Config::deleteKey( $setting );
-				} else if (in_array($_POST[$setting], $validate)) {
-					\OC_Config::setValue( $setting, $_POST[$setting] );
-				} else {
-					$message = $l->t('Invalid value supplied for %s', array(self::getFieldname($setting, $l)));
-					\OC_JSON::error( array( "data" => array( "message" => $message)) );
-					exit;
-				}
-			}
-		}
-
-		\OC_JSON::success(array("data" => array( "message" => $l->t("Saved") )));
-	}
-
-	/**
-	 * Send a mail to test the settings
-	 */
-	public static function sendTestMail() {
-		\OC_Util::checkAdminUser();
-		\OCP\JSON::callCheck();
-
-		$l = \OC::$server->getL10N('settings');
-		$email = \OC_Preferences::getValue(\OC_User::getUser(), 'settings', 'email', '');
-		if (!empty($email)) {
-			$defaults = new \OC_Defaults();
-
-			try {
-				\OC_Mail::send($email, \OC_User::getDisplayName(),
-					$l->t('test email settings'),
-					$l->t('If you received this email, the settings seem to be correct.'),
-					\OCP\Util::getDefaultEmailAddress('no-reply'), $defaults->getName());
-			} catch (\Exception $e) {
-				$message = $l->t('A problem occurred while sending the e-mail. Please revisit your settings.');
-				\OC_JSON::error( array( "data" => array( "message" => $message)) );
-				exit;
-			}
-
-			\OC_JSON::success(array("data" => array( "message" => $l->t("Email sent") )));
-		} else {
-			$message = $l->t('You need to set your user email before being able to send test emails.');
-			\OC_JSON::error( array( "data" => array( "message" => $message)) );
-		}
-	}
-
-	/**
-	 * Get the field name to use it in error messages
-	 *
-	 * @param string $setting
-	 * @param \OC_L10N $l
-	 * @return string
-	 */
-	public static function getFieldname($setting, $l) {
-		switch ($setting) {
-			case 'mail_smtpmode':
-				return $l->t( 'Send mode' );
-			case 'mail_smtpsecure':
-				return $l->t( 'Encryption' );
-			case 'mail_smtpauthtype':
-				return $l->t( 'Authentication method' );
-		}
-	}
-}
diff --git a/settings/application.php b/settings/application.php
new file mode 100644
index 00000000000..b17ca01c2f3
--- /dev/null
+++ b/settings/application.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * @author Lukas Reschke
+ * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Settings;
+
+use OC\AppFramework\Utility\SimpleContainer;
+use OC\Settings\Controller\MailSettingsController;
+use \OCP\AppFramework\App;
+use \OCP\Util;
+
+/**
+ * @package OC\Settings
+ */
+class Application extends App {
+
+
+	/**
+	 * @param array $urlParams
+	 */
+	public function __construct(array $urlParams=array()){
+		parent::__construct('settings', $urlParams);
+
+		$container = $this->getContainer();
+
+		/**
+		 * Controllers
+		 */
+		$container->registerService('MailSettingsController', function(SimpleContainer $c) {
+			return new MailSettingsController(
+				$c->query('AppName'),
+				$c->query('Request'),
+				$c->query('L10N'),
+				$c->query('Config'),
+				$c->query('UserSession'),
+				$c->query('Defaults'),
+				$c->query('Mail'),
+				$c->query('DefaultMailAddress')
+			);
+		});
+
+		/**
+		 * Core class wrappers
+		 */
+		$container->registerService('Config', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getConfig();
+		});
+		$container->registerService('L10N', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getL10N('settings');
+		});
+		$container->registerService('UserSession', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getUserSession();
+		});
+		$container->registerService('Mail', function(SimpleContainer $c) {
+			return new \OC_Mail;
+		});
+		$container->registerService('Defaults', function(SimpleContainer $c) {
+			return new \OC_Defaults;
+		});
+		$container->registerService('DefaultMailAddress', function(SimpleContainer $c) {
+			return Util::getDefaultEmailAddress('no-reply');
+		});
+	}
+}
diff --git a/settings/controller/mailsettingscontroller.php b/settings/controller/mailsettingscontroller.php
new file mode 100644
index 00000000000..1cfb10c6fe9
--- /dev/null
+++ b/settings/controller/mailsettingscontroller.php
@@ -0,0 +1,166 @@
+<?php
+/**
+* @author Joas Schilling
+* @author Lukas Reschke
+* @copyright 2014 Joas Schilling nickvergessen@owncloud.com
+*
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Settings\Controller;
+
+use OC\User\Session;
+use \OCP\AppFramework\Controller;
+use OCP\IRequest;
+use OCP\IL10N;
+use OCP\IConfig;
+
+/**
+ * @package OC\Settings\Controller
+ */
+class MailSettingsController extends Controller {
+
+	/** @var \OCP\IL10N */
+	private $l10n;
+	/** @var \OCP\IConfig */
+	private $config;
+	/** @var Session */
+	private $userSession;
+	/** @var \OC_Defaults */
+	private $defaults;
+	/** @var \OC_Mail */
+	private $mail;
+	/** @var string */
+	private $defaultMailAddress;
+
+	/**
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param IL10N $l10n
+	 * @param IConfig $config
+	 * @param Session $userSession
+	 * @param \OC_Defaults $defaults
+	 * @param \OC_Mail $mail
+	 * @param string $defaultMailAddress
+	 */
+	public function __construct($appName,
+								IRequest $request,
+								IL10N $l10n,
+								IConfig $config,
+								Session $userSession,
+								\OC_Defaults $defaults,
+								\OC_Mail $mail,
+								$defaultMailAddress) {
+		parent::__construct($appName, $request);
+		$this->l10n = $l10n;
+		$this->config = $config;
+		$this->userSession = $userSession;
+		$this->defaults = $defaults;
+		$this->mail = $mail;
+		$this->defaultMailAddress = $defaultMailAddress;
+	}
+
+	/**
+	 * Sets the email settings
+	 * @param string $mail_domain
+	 * @param string $mail_from_address
+	 * @param string $mail_smtpmode
+	 * @param string $mail_smtpsecure
+	 * @param string $mail_smtphost
+	 * @param string $mail_smtpauthtype
+	 * @param int $mail_smtpauth
+	 * @param string $mail_smtpport
+	 * @return array
+	 */
+	public function setMailSettings($mail_domain,
+									$mail_from_address,
+									$mail_smtpmode,
+									$mail_smtpsecure,
+									$mail_smtphost,
+									$mail_smtpauthtype,
+									$mail_smtpauth,
+									$mail_smtpport) {
+
+		$params = get_defined_vars();
+		foreach($params as $key => $value) {
+			if(empty($value)) {
+				$this->config->deleteSystemValue($key);
+			} else {
+				$this->config->setSystemValue($key, $value);
+			}
+		}
+
+		// Delete passwords from config in case no auth is specified
+		if($params['mail_smtpauth'] !== 1) {
+			$this->config->deleteSystemValue('mail_smtpname');
+			$this->config->deleteSystemValue('mail_smtppassword');
+		}
+
+		return array('data' =>
+			array('message' =>
+				(string) $this->l10n->t('Saved')
+			),
+			'status' => 'success'
+		);
+	}
+
+	/**
+	 * Store the credentials used for SMTP in the config
+	 * @param string $mail_smtpname
+	 * @param string $mail_smtppassword
+	 * @return array
+	 */
+	public function storeCredentials($mail_smtpname, $mail_smtppassword) {
+		$this->config->setSystemValue('mail_smtpname', $mail_smtpname);
+		$this->config->setSystemValue('mail_smtppassword', $mail_smtppassword);
+
+		return array('data' =>
+			array('message' =>
+				(string) $this->l10n->t('Saved')
+			),
+			'status' => 'success'
+		);
+	}
+
+	/**
+	 * Send a mail to test the settings
+	 * @return array
+	 */
+	public function sendTestMail() {
+		$email = $this->config->getUserValue($this->userSession->getUser()->getUID(), $this->appName, 'email', '');
+		if (!empty($email)) {
+			try {
+				$this->mail->send($email, $this->userSession->getUser()->getDisplayName(),
+					$this->l10n->t('test email settings'),
+					$this->l10n->t('If you received this email, the settings seems to be correct.'),
+					$this->defaultMailAddress,
+					$this->defaults->getName()
+				);
+			} catch (\Exception $e) {
+				return array('data' =>
+					array('message' =>
+						(string) $this->l10n->t('A problem occurred while sending the e-mail. Please revisit your settings.'),
+					),
+					'status' => 'error'
+				);
+			}
+
+			return array('data' =>
+				array('message' =>
+					(string) $this->l10n->t('Email sent')
+				),
+				'status' => 'success'
+			);
+		}
+
+		return array('data' =>
+			array('message' =>
+				(string) $this->l10n->t('You need to set your user email before being able to send test emails.'),
+			),
+			'status' => 'error'
+		);
+	}
+
+}
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 581904591d0..d89c50e4114 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -178,12 +178,12 @@ span.securitywarning, span.connectionwarning, .setupwarning {
 	padding-left: 56px;
 }
 
-#mail_settings p label:first-child {
+.mail_settings p label:first-child {
 	display: inline-block;
 	width: 300px;
 	text-align: right;
 }
-#mail_settings p select:nth-child(2) {
+.mail_settings p select:nth-child(2) {
 	width: 143px;
 }
 #mail_smtpport {
diff --git a/settings/js/admin.js b/settings/js/admin.js
index d8cdae9d11b..09e8a1d6916 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -103,14 +103,22 @@ $(document).ready(function(){
 		}
 	});
 
-	$('#mail_settings').change(function(){
+	$('#mail_general_settings').change(function(){
 		OC.msg.startSaving('#mail_settings_msg');
-		var post = $( "#mail_settings" ).serialize();
+		var post = $( "#mail_general_settings" ).serialize();
 		$.post(OC.generateUrl('/settings/admin/mailsettings'), post, function(data){
 			OC.msg.finishedSaving('#mail_settings_msg', data);
 		});
 	});
 
+	$('#mail_credentials_settings_submit').click(function(){
+		OC.msg.startSaving('#mail_settings_msg');
+		var post = $( "#mail_credentials_settings" ).serialize();
+		$.post(OC.generateUrl('/settings/admin/mailsettings/credentials'), post, function(data){
+			OC.msg.finishedSaving('#mail_settings_msg', data);
+		});
+	});
+
 	$('#sendtestemail').click(function(event){
 		event.preventDefault();
 		OC.msg.startAction('#sendtestmail_msg', t('settings', 'Sending...'));
diff --git a/settings/routes.php b/settings/routes.php
index 25a8b1da7e0..7068c0df723 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -6,7 +6,16 @@
  * See the COPYING-README file.
  */
 
-/** @var $this OCP\Route\IRouter */
+namespace OC\Settings;
+
+$application = new Application();
+$application->registerRoutes($this, array('routes' =>array(
+	array('name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'),
+	array('name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'),
+	array('name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'),
+)));
+
+/** @var $this \OCP\Route\IRouter */
 
 // Settings pages
 $this->create('settings_help', '/settings/help')
@@ -88,12 +97,6 @@ $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
 	->actionInclude('settings/ajax/getlog.php');
 $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
 	->actionInclude('settings/ajax/setloglevel.php');
-$this->create('settings_mail_settings', '/settings/admin/mailsettings')
-	->post()
-	->action('OC\Settings\Admin\Controller', 'setMailSettings');
-$this->create('settings_admin_mail_test', '/settings/admin/mailtest')
-	->post()
-	->action('OC\Settings\Admin\Controller', 'sendTestMail');
 $this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
 	->actionInclude('settings/ajax/setsecurity.php');
 $this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d6bb298caef..6b4623173af 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -333,87 +333,90 @@ if ($_['suggestedOverwriteWebroot']) {
 	</p>
 </div>
 
-<div class="section"><form id="mail_settings">
-	<h2><?php p($l->t('Email Server'));?></h2>
-
-	<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
-
-	<p>
-		<label for="mail_smtpmode"><?php p($l->t( 'Send mode' )); ?></label>
-		<select name='mail_smtpmode' id='mail_smtpmode'>
-			<?php foreach ($mail_smtpmode as $smtpmode):
-				$selected = '';
-				if ($smtpmode == $_['mail_smtpmode']):
-					$selected = 'selected="selected"';
-				endif; ?>
-				<option value='<?php p($smtpmode)?>' <?php p($selected) ?>><?php p($smtpmode) ?></option>
-			<?php endforeach;?>
-		</select>
-
-		<label id="mail_smtpsecure_label" for="mail_smtpsecure"
-			   <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-			<?php p($l->t( 'Encryption' )); ?>
-		</label>
-		<select name="mail_smtpsecure" id="mail_smtpsecure"
-				<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-			<?php foreach ($mail_smtpsecure as $secure => $name):
-				$selected = '';
-				if ($secure == $_['mail_smtpsecure']):
-					$selected = 'selected="selected"';
-				endif; ?>
-				<option value='<?php p($secure)?>' <?php p($selected) ?>><?php p($name) ?></option>
-			<?php endforeach;?>
-		</select>
-	</p>
-
-	<p>
-		<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
-		<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p($l->t('mail'))?>"
-			   value='<?php p($_['mail_from_address']) ?>' />
-		@
-		<input type="text" name='mail_domain' id="mail_domain" placeholder="example.com"
-			   value='<?php p($_['mail_domain']) ?>' />
-	</p>
+<div class="section">
+	<form id="mail_general_settings" class="mail_settings">
+		<h2><?php p($l->t('Email Server'));?></h2>
+
+		<p><?php p($l->t('This is used for sending out notifications.')); ?> <span id="mail_settings_msg" class="msg"></span></p>
+
+		<p>
+			<label for="mail_smtpmode"><?php p($l->t( 'Send mode' )); ?></label>
+			<select name='mail_smtpmode' id='mail_smtpmode'>
+				<?php foreach ($mail_smtpmode as $smtpmode):
+					$selected = '';
+					if ($smtpmode == $_['mail_smtpmode']):
+						$selected = 'selected="selected"';
+					endif; ?>
+					<option value='<?php p($smtpmode)?>' <?php p($selected) ?>><?php p($smtpmode) ?></option>
+				<?php endforeach;?>
+			</select>
+
+			<label id="mail_smtpsecure_label" for="mail_smtpsecure"
+				   <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+				<?php p($l->t( 'Encryption' )); ?>
+			</label>
+			<select name="mail_smtpsecure" id="mail_smtpsecure"
+					<?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+				<?php foreach ($mail_smtpsecure as $secure => $name):
+					$selected = '';
+					if ($secure == $_['mail_smtpsecure']):
+						$selected = 'selected="selected"';
+					endif; ?>
+					<option value='<?php p($secure)?>' <?php p($selected) ?>><?php p($name) ?></option>
+				<?php endforeach;?>
+			</select>
+		</p>
 
-	<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-		<label for="mail_smtpauthtype"><?php p($l->t( 'Authentication method' )); ?></label>
-		<select name='mail_smtpauthtype' id='mail_smtpauthtype'>
-			<?php foreach ($mail_smtpauthtype as $authtype => $name):
-				$selected = '';
-				if ($authtype == $_['mail_smtpauthtype']):
-					$selected = 'selected="selected"';
-				endif; ?>
-				<option value='<?php p($authtype)?>' <?php p($selected) ?>><?php p($name) ?></option>
-			<?php endforeach;?>
-		</select>
-
-		<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" value="1"
-			   <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
-		<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
-	</p>
+		<p>
+			<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
+			<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p($l->t('mail'))?>"
+				   value='<?php p($_['mail_from_address']) ?>' />
+			<input type="text" name='mail_domain' id="mail_domain" placeholder="example.com"
+				   value='<?php p($_['mail_domain']) ?>' />
+		</p>
 
-	<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-		<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
-		<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="smtp.example.com"
-			   value='<?php p($_['mail_smtphost']) ?>' />
-		:
-		<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>"
-			   value='<?php p($_['mail_smtpport']) ?>' />
-	</p>
+		<p id="setting_smtpauth" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+			<label for="mail_smtpauthtype"><?php p($l->t( 'Authentication method' )); ?></label>
+			<select name='mail_smtpauthtype' id='mail_smtpauthtype'>
+				<?php foreach ($mail_smtpauthtype as $authtype => $name):
+					$selected = '';
+					if ($authtype == $_['mail_smtpauthtype']):
+						$selected = 'selected="selected"';
+					endif; ?>
+					<option value='<?php p($authtype)?>' <?php p($selected) ?>><?php p($name) ?></option>
+				<?php endforeach;?>
+			</select>
+
+			<input type="checkbox" name="mail_smtpauth" id="mail_smtpauth" value="1"
+				   <?php if ($_['mail_smtpauth']) print_unescaped('checked="checked"'); ?> />
+			<label for="mail_smtpauth"><?php p($l->t( 'Authentication required' )); ?></label>
+		</p>
 
-	<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
-		<label for="mail_smtpname"><?php p($l->t( 'Credentials' )); ?></label>
-		<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
-			   value='<?php p($_['mail_smtpname']) ?>' />
-		<input type="password" name='mail_smtppassword' id="mail_smtppassword"
-			   placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
-	</p>
+		<p id="setting_smtphost" <?php if ($_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+			<label for="mail_smtphost"><?php p($l->t( 'Server address' )); ?></label>
+			<input type="text" name='mail_smtphost' id="mail_smtphost" placeholder="smtp.example.com"
+				   value='<?php p($_['mail_smtphost']) ?>' />
+			:
+			<input type="text" name='mail_smtpport' id="mail_smtpport" placeholder="<?php p($l->t('Port'))?>"
+				   value='<?php p($_['mail_smtpport']) ?>' />
+		</p>
+	</form>
+	<form class="mail_settings" id="mail_credentials_settings">
+		<p id="mail_credentials" <?php if (!$_['mail_smtpauth'] || $_['mail_smtpmode'] != 'smtp') print_unescaped(' class="hidden"'); ?>>
+			<label for="mail_smtpname"><?php p($l->t( 'Credentials' )); ?></label>
+			<input type="text" name='mail_smtpname' id="mail_smtpname" placeholder="<?php p($l->t('SMTP Username'))?>"
+				   value='<?php p($_['mail_smtpname']) ?>' />
+			<input type="password" name='mail_smtppassword' id="mail_smtppassword"
+				   placeholder="<?php p($l->t('SMTP Password'))?>" value='<?php p($_['mail_smtppassword']) ?>' />
+			<input id="mail_credentials_settings_submit" type="button" value="<?php p($l->t('Store credentials')) ?>">
+		</p>
+	</form>
 
 	<br />
 	<em><?php p($l->t( 'Test email settings' )); ?></em>
 	<input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t( 'Send email' )); ?>"/>
 	<span id="sendtestmail_msg" class="msg"></span>
-</form></div>
+</div>
 
 <div class="section">
 	<h2><?php p($l->t('Log'));?></h2>
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 872ff2c2596..3805bb1ac79 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -8,6 +8,7 @@
 >
 	<testsuite name='ownCloud'>
 		<directory suffix='.php'>lib/</directory>
+		<directory suffix='.php'>settings/</directory>
 		<file>apps.php</file>
 	</testsuite>
 	<!-- filters for code coverage -->
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
new file mode 100644
index 00000000000..5a1add95449
--- /dev/null
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -0,0 +1,196 @@
+<?php
+/**
+ * @author Lukas Reschke
+ * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Settings\Controller;
+
+use \OC\Settings\Application;
+
+/**
+ * @package OC\Settings\Controller
+ */
+class MailSettingscontrollerTest extends \PHPUnit_Framework_TestCase {
+
+	private $container;
+
+	protected function setUp() {
+		$app = new Application();
+		$this->container = $app->getContainer();
+		$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->container['L10N'] = $this->getMockBuilder('\OCP\IL10N')
+			->disableOriginalConstructor()->getMock();
+		$this->container['AppName'] = 'settings';
+		$this->container['UserSession'] = $this->getMockBuilder('\OC\User\Session')
+			->disableOriginalConstructor()->getMock();
+		$this->container['Mail'] = $this->getMockBuilder('\OC_Mail')
+			->disableOriginalConstructor()->getMock();
+		$this->container['Defaults'] = $this->getMockBuilder('\OC_Defaults')
+			->disableOriginalConstructor()->getMock();
+		$this->container['DefaultMailAddress'] = 'no-reply@owncloud.com';
+	}
+
+	public function testSetMailSettings() {
+		$this->container['L10N']
+			->expects($this->exactly(2))
+			->method('t')
+			->will($this->returnValue('Saved'));
+
+		/**
+		 * FIXME: Use the following block once Jenkins uses PHPUnit >= 4.1
+		 */
+		/*
+		$this->container['Config']
+			->expects($this->exactly(15))
+			->method('setSystemValue')
+			->withConsecutive(
+				array($this->equalTo('mail_domain'), $this->equalTo('owncloud.com')),
+				array($this->equalTo('mail_from_address'), $this->equalTo('demo@owncloud.com')),
+				array($this->equalTo('mail_smtpmode'), $this->equalTo('smtp')),
+				array($this->equalTo('mail_smtpsecure'), $this->equalTo('ssl')),
+				array($this->equalTo('mail_smtphost'), $this->equalTo('mx.owncloud.org')),
+				array($this->equalTo('mail_smtpauthtype'), $this->equalTo('NTLM')),
+				array($this->equalTo('mail_smtpauth'), $this->equalTo(1)),
+				array($this->equalTo('mail_smtpport'), $this->equalTo('25')),
+				array($this->equalTo('mail_domain'), $this->equalTo('owncloud.com')),
+				array($this->equalTo('mail_from_address'), $this->equalTo('demo@owncloud.com')),
+				array($this->equalTo('mail_smtpmode'), $this->equalTo('smtp')),
+				array($this->equalTo('mail_smtpsecure'), $this->equalTo('ssl')),
+				array($this->equalTo('mail_smtphost'), $this->equalTo('mx.owncloud.org')),
+				array($this->equalTo('mail_smtpauthtype'), $this->equalTo('NTLM')),
+				array($this->equalTo('mail_smtpport'), $this->equalTo('25'))
+			);
+		 */
+
+		$this->container['Config']
+			->expects($this->exactly(15))
+			->method('setSystemValue');
+
+		/**
+		 * FIXME: Use the following block once Jenkins uses PHPUnit >= 4.1
+		 */
+		/*
+		$this->container['Config']
+			->expects($this->exactly(3))
+			->method('deleteSystemValue')
+			->withConsecutive(
+				array($this->equalTo('mail_smtpauth')),
+				array($this->equalTo('mail_smtpname')),
+				array($this->equalTo('mail_smtppassword'))
+			);
+		*/
+		$this->container['Config']
+			->expects($this->exactly(3))
+			->method('deleteSystemValue');
+
+		// With authentication
+		$response = $this->container['MailSettingsController']->setMailSettings(
+			'owncloud.com',
+			'demo@owncloud.com',
+			'smtp',
+			'ssl',
+			'mx.owncloud.org',
+			'NTLM',
+			1,
+			'25'
+		);
+		$expectedResponse = array('data' => array('message' =>'Saved'), 'status' => 'success');
+		$this->assertSame($expectedResponse, $response);
+
+		// Without authentication (testing the deletion of the stored password)
+		$response = $this->container['MailSettingsController']->setMailSettings(
+			'owncloud.com',
+			'demo@owncloud.com',
+			'smtp',
+			'ssl',
+			'mx.owncloud.org',
+			'NTLM',
+			0,
+			'25'
+		);
+		$expectedResponse = array('data' => array('message' =>'Saved'), 'status' => 'success');
+		$this->assertSame($expectedResponse, $response);
+
+	}
+
+	public function testStoreCredentials() {
+		$this->container['L10N']
+			->expects($this->once())
+			->method('t')
+			->will($this->returnValue('Saved'));
+
+		/**
+		 * FIXME: Use this block once Jenkins uses PHPUnit >= 4.1
+		 */
+		/*
+		$this->container['Config']
+			->expects($this->exactly(2))
+			->method('setSystemValue')
+			->withConsecutive(
+				array($this->equalTo('mail_smtpname'), $this->equalTo('UsernameToStore')),
+				array($this->equalTo('mail_smtppassword'), $this->equalTo('PasswordToStore'))
+			);
+		*/
+		$this->container['Config']
+			->expects($this->exactly(2))
+			->method('setSystemValue');
+
+		$response = $this->container['MailSettingsController']->storeCredentials('UsernameToStore', 'PasswordToStore');
+		$expectedResponse = array('data' => array('message' =>'Saved'), 'status' => 'success');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testSendTestMail() {
+		$user = $this->getMockBuilder('\OC\User\User')
+			->disableOriginalConstructor()
+			->getMock();
+		$user->expects($this->any())
+			->method('getUID')
+			->will($this->returnValue('Werner'));
+		$user->expects($this->any())
+			->method('getDisplayName')
+			->will($this->returnValue('Werner Brösel'));
+
+		$this->container['L10N']
+			->expects($this->any())
+			->method('t')
+			->will(
+				$this->returnValueMap(
+					array(
+						array('You need to set your user email before being able to send test emails.', array(),
+							'You need to set your user email before being able to send test emails.'),
+						array('A problem occurred while sending the e-mail. Please revisit your settings.', array(),
+							'A problem occurred while sending the e-mail. Please revisit your settings.'),
+						array('Email sent', array(), 'Email sent'),
+						array('test email settings', array(), 'test email settings'),
+						array('If you received this email, the settings seems to be correct.', array(),
+							'If you received this email, the settings seems to be correct.')
+					)
+				));
+		$this->container['UserSession']
+			->expects($this->any())
+			->method('getUser')
+			->will($this->returnValue($user));
+
+		// Ensure that it fails when no mail address has been specified
+		$response = $this->container['MailSettingsController']->sendTestMail();
+		$expectedResponse = array('data' => array('message' =>'You need to set your user email before being able to send test emails.'), 'status' => 'error');
+		$this->assertSame($expectedResponse, $response);
+
+		// If no exception is thrown it should work
+		$this->container['Config']
+			->expects($this->any())
+			->method('getUserValue')
+			->will($this->returnValue('mail@example.invalid'));
+		$response = $this->container['MailSettingsController']->sendTestMail();
+		$expectedResponse = array('data' => array('message' =>'Email sent'), 'status' => 'success');
+		$this->assertSame($expectedResponse, $response);
+	}
+
+}
\ No newline at end of file
-- 
GitLab


From d3eebad59104355bb6e07c9f63a6fa868f5a2c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 14 Oct 2014 04:49:29 +0200
Subject: [PATCH 098/616] fixing typos

---
 settings/controller/mailsettingscontroller.php | 2 +-
 settings/templates/admin.php                   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/settings/controller/mailsettingscontroller.php b/settings/controller/mailsettingscontroller.php
index 1cfb10c6fe9..583aa98dc8e 100644
--- a/settings/controller/mailsettingscontroller.php
+++ b/settings/controller/mailsettingscontroller.php
@@ -141,7 +141,7 @@ class MailSettingsController extends Controller {
 			} catch (\Exception $e) {
 				return array('data' =>
 					array('message' =>
-						(string) $this->l10n->t('A problem occurred while sending the e-mail. Please revisit your settings.'),
+						(string) $this->l10n->t('A problem occurred while sending the email. Please revise your settings.'),
 					),
 					'status' => 'error'
 				);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 6b4623173af..2ea5d824909 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -6,6 +6,7 @@
  */
 /**
  * @var array $_
+ * @var \OCP\IL10N $l
  */
 $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
 $levelLabels = array(
-- 
GitLab


From c26e9c675aa6c7fec64f63349c6f25ddbe264d7a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 14 Oct 2014 17:39:27 +0200
Subject: [PATCH 099/616] show Spinner when stuff is being saved

---
 apps/user_ldap/css/settings.css                  | 8 ++++++++
 apps/user_ldap/js/settings.js                    | 9 ++++++++-
 apps/user_ldap/templates/part.wizardcontrols.php | 1 +
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 0dfcf474256..2353bfe1bfd 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -123,6 +123,14 @@ select[multiple=multiple] + button {
 	max-width: 40%;
 }
 
+#ldap .ldap_saving {
+	margin-right: 15px;
+	color: orange;
+	font-weight: bold;
+}
+
+#ldap .ldap_saving img { height: 15px; }
+
 .ldap_config_state_indicator_sign {
 	display: inline-block;
 	height: 16px;
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 6e936a91091..1972447970f 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -747,7 +747,10 @@ var LdapWizard = {
 		}
 	},
 
+	saveProcesses: 0,
 	_save: function(object, value) {
+		$('#ldap .ldap_saving').removeClass('hidden');
+		LdapWizard.saveProcesses += 1;
 		param = 'cfgkey='+encodeURIComponent(object.id)+
 				'&cfgval='+encodeURIComponent(value)+
 				'&action=save'+
@@ -757,10 +760,14 @@ var LdapWizard = {
 			OC.filePath('user_ldap','ajax','wizard.php'),
 			param,
 			function(result) {
+				LdapWizard.saveProcesses -= 1;
+				if(LdapWizard.saveProcesses === 0) {
+					$('#ldap .ldap_saving').addClass('hidden');
+				}
 				if(result.status === 'success') {
 					LdapWizard.processChanges(object);
 				} else {
-// 					alert('Oooooooooooh :(');
+					console.log('Could not save value for ' + object.id);
 				}
 			}
 		);
diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index 33e1614c9c6..90d558e72d1 100644
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -1,4 +1,5 @@
 <div class="ldapWizardControls">
+	<span class="ldap_saving hidden"><?php p($l->t('Saving'));?> <img class="wizSpinner" src="<?php p(image_path('core', 'loading.gif')); ?>"/></span>
 	<span class="ldap_config_state_indicator"></span> <span class="ldap_config_state_indicator_sign"></span>
 	<button class="ldap_action_back invisible" name="ldap_action_back"
 			type="button">
-- 
GitLab


From a8a0bcaffced7ba39c5c2c539191442a9c2e55da Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Tue, 14 Oct 2014 10:00:20 -0700
Subject: [PATCH 100/616] some small tweaks

---
 config/config.sample.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 63206938988..4266e8a7172 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -5,8 +5,9 @@
  * configuration options and their usage.
  *
  * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK
- * YOUR INSTANCE. Instead, manually copy configurations switches that you
- * consider important for your instance to your configuration.
+ * YOUR INSTANCE. Instead, manually copy configuration switches that you
+ * consider important for your instance to your working ``config.php``, and 
+ * apply configuration options that are pertinent for your instance.
  *
  * This file is used to generate the config documentation. Please consider
  * following requirements of the current parser:
@@ -38,14 +39,17 @@ $CONFIG = array(
 
 /**
  * This is a unique identifier for your ownCloud installation, created
- * automatically by the installer. Do not change it.
+ * automatically by the installer. This example is for documentation only,
+ * and you should never use it because it will not work. A valid ``instanceid``
+ * is created when you install ownCloud.
  */
 'instanceid' => 'd3c944a9a',
 
 /**
  * The salt used to hash all passwords, auto-generated by the ownCloud
  * installer. (There are also per-user salts.) If you lose this salt you lose
- * all your passwords.
+ * all your passwords. This example is for documentation only,
+ * and you should never use it.
  */
 'passwordsalt' => 'd3c944a9af095aa08f',
 
@@ -56,8 +60,8 @@ $CONFIG = array(
  */
 'trusted_domains' => 
   array (
-    0 => 'demo.example.org',
-    1 => 'otherdomain.example.org:8080',
+    'demo.example.org',
+    'otherdomain.example.org:8080',
   ),
 
 
@@ -535,7 +539,12 @@ $CONFIG = array(
  */
 
 /**
- * TODO
+ * By default, ownCloud can generate previews for the following filetypes:
+ * Images files
+ * Covers of MP3 files
+ * Text documents
+ * Valid values are ``true``, to enable previews, or 
+ * ``false``, to disable previews
  */
 'enable_previews' => true,
 /**
@@ -648,10 +657,10 @@ $CONFIG = array(
 
 /**
  * Blacklist a specific file or files and disallow the upload of files 
- * with this name
+ * with this name. ``.htaccess`` is blocked by default.
  * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING.
  */
-'blacklisted_files' => array('filename1', 'filename2'),
+'blacklisted_files' => array('.htaccess'),
 
 /**
  * Define a default folder for shared files and folders other than root.
-- 
GitLab


From 887d6155b850340a0ad26f489445bbd1c305b393 Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Tue, 14 Oct 2014 16:57:45 -0700
Subject: [PATCH 101/616] commented out instanceid and passwordsalt

---
 config/config.sample.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 4266e8a7172..7d0b73f0cfa 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -42,16 +42,18 @@ $CONFIG = array(
  * automatically by the installer. This example is for documentation only,
  * and you should never use it because it will not work. A valid ``instanceid``
  * is created when you install ownCloud.
+ *
+ * 'instanceid' => 'd3c944a9a',
  */
-'instanceid' => 'd3c944a9a',
 
-/**
+ /**
  * The salt used to hash all passwords, auto-generated by the ownCloud
  * installer. (There are also per-user salts.) If you lose this salt you lose
  * all your passwords. This example is for documentation only,
  * and you should never use it.
+ *
+ *'passwordsalt' => 'd3c944a9af095aa08f',
  */
-'passwordsalt' => 'd3c944a9af095aa08f',
 
 /**
  * Your list of trusted domains that users can log into. Specifying trusted
-- 
GitLab


From 3b3affa1ef26cb55706b851fc1a13206845754e4 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 15 Oct 2014 01:54:26 -0400
Subject: [PATCH 102/616] [tx-robot] updated from transifex

---
 l10n/templates/core.pot             | 2 +-
 l10n/templates/files.pot            | 2 +-
 l10n/templates/files_encryption.pot | 2 +-
 l10n/templates/files_external.pot   | 2 +-
 l10n/templates/files_sharing.pot    | 2 +-
 l10n/templates/files_trashbin.pot   | 2 +-
 l10n/templates/files_versions.pot   | 2 +-
 l10n/templates/lib.pot              | 2 +-
 l10n/templates/private.pot          | 2 +-
 l10n/templates/settings.pot         | 2 +-
 l10n/templates/user_ldap.pot        | 2 +-
 l10n/templates/user_webdavauth.pot  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 0cac9dd446c..56bd81f5ed0 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 457a5ca0566..9db13ceae78 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 0173a314c02..b1e72576274 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 53441ce6c48..baf301fe311 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 15dceb256e3..c11029d9613 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index c9ab8d9785e..98b003aa9cc 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index ac4241695c9..8392ced7028 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 2079d1a4a6d..93c8a72b0f3 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index a41340342b1..827bb1b738b 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 82ebe7df4fa..c8777ac52ba 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index a2483f773c5..e4c0491d364 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index e85687618fb..5d6cccfe60e 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-14 01:54-0400\n"
+"POT-Creation-Date: 2014-10-15 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
GitLab


From 704ffaa6a37730f02a3359e8e8f0a0070f0e0d31 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 15 Oct 2014 10:14:20 +0200
Subject: [PATCH 103/616] Use body element when animating scroll in public page

In the public page the scroll container is the window instead of a div.
The $(window) object doesn't support animating the scroll property, so
the $('body') element is used instead.
---
 apps/files/js/filelist.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 86cba29e76c..c70c866c634 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1919,7 +1919,13 @@
 
 			// Animation
 			var _this = this;
-			this.$container.animate({
+			var $scrollContainer = this.$container;
+			if ($scrollContainer[0] === window) {
+				// need to use "body" to animate scrolling
+				// when the scroll container is the window
+				$scrollContainer = $('body');
+			}
+			$scrollContainer.animate({
 				// Scrolling to the top of the new element
 				scrollTop: currentOffset + $fileRow.offset().top - $fileRow.height() * 2 - additionalOffset
 			}, {
-- 
GitLab


From d18da08a1a118344dd378855579baaea1f843011 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 15 Oct 2014 12:30:31 +0200
Subject: [PATCH 104/616] set password field placeholder back if passward was
 disabled

---
 core/js/share.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/js/share.js b/core/js/share.js
index 5632ecba971..1de990f379b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -1025,6 +1025,7 @@ $(document).ready(function() {
 			$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();
-- 
GitLab


From 4385188920772d0f39656cc1d9a8012b173acabf Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 15 Oct 2014 12:41:53 +0200
Subject: [PATCH 105/616] show busy cursor and lock tabs on save

---
 apps/user_ldap/css/settings.css |  4 ++++
 apps/user_ldap/js/settings.js   | 39 +++++++++++++++++++++++++--------
 2 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 2353bfe1bfd..8f339451c64 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -123,6 +123,10 @@ select[multiple=multiple] + button {
 	max-width: 40%;
 }
 
+.save-cursor {
+	cursor: wait;
+}
+
 #ldap .ldap_saving {
 	margin-right: 15px;
 	color: orange;
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 1972447970f..73cace33758 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -188,21 +188,34 @@ var LdapWizard = {
 		}
 	},
 
+	enableTabs: function() {
+		//do not use this function directly, use basicStatusCheck instead.
+		if(LdapWizard.saveProcesses === 0) {
+			$('.ldap_action_continue').removeAttr('disabled');
+			$('.ldap_action_back').removeAttr('disabled');
+			$('#ldapSettings').tabs('option', 'disabled', []);
+		}
+	},
+
+	disableTabs: function() {
+		$('.ldap_action_continue').attr('disabled', 'disabled');
+		$('.ldap_action_back').attr('disabled', 'disabled');
+		$('#ldapSettings').tabs('option', 'disabled', [1, 2, 3, 4, 5]);
+	},
+
 	basicStatusCheck: function() {
 		//criterias to continue from the first tab
 		// - host, port, user filter, agent dn, password, base dn
-		host	= $('#ldap_host').val();
-		port	= $('#ldap_port').val();
-		agent	= $('#ldap_dn').val();
-		pwd		= $('#ldap_agent_password').val();
-		base	= $('#ldap_base').val();
+		var host  = $('#ldap_host').val();
+		var port  = $('#ldap_port').val();
+		var agent = $('#ldap_dn').val();
+		var pwd   = $('#ldap_agent_password').val();
+		var base  = $('#ldap_base').val();
 
 		if((host && port  && base) && ((!agent && !pwd) || (agent && pwd))) {
-			$('.ldap_action_continue').removeAttr('disabled');
-			$('#ldapSettings').tabs('option', 'disabled', []);
+			LdapWizard.enableTabs();
 		} else {
-			$('.ldap_action_continue').attr('disabled', 'disabled');
-			$('#ldapSettings').tabs('option', 'disabled', [1, 2, 3, 4, 5]);
+			LdapWizard.disableTabs();
 		}
 	},
 
@@ -751,6 +764,8 @@ var LdapWizard = {
 	_save: function(object, value) {
 		$('#ldap .ldap_saving').removeClass('hidden');
 		LdapWizard.saveProcesses += 1;
+		$('#ldap *').addClass('save-cursor');
+		LdapWizard.disableTabs();
 		param = 'cfgkey='+encodeURIComponent(object.id)+
 				'&cfgval='+encodeURIComponent(value)+
 				'&action=save'+
@@ -763,6 +778,12 @@ var LdapWizard = {
 				LdapWizard.saveProcesses -= 1;
 				if(LdapWizard.saveProcesses === 0) {
 					$('#ldap .ldap_saving').addClass('hidden');
+					console.log('switch cursor');
+					console.log($('#ldap *').css('cursor'));
+					$('#ldap *').removeClass('save-cursor');
+					//enable the tabs again, if everything is OK
+					LdapWizard.basicStatusCheck();
+					console.log($('#ldap *').css('cursor'));
 				}
 				if(result.status === 'success') {
 					LdapWizard.processChanges(object);
-- 
GitLab


From ab6890b854cbe94d0ed816365b9acaf11f6eaa1f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 15 Oct 2014 12:51:46 +0200
Subject: [PATCH 106/616] instead of dis/enabling tabs on save, cancel tab
 change. avoids noisy ui

---
 apps/user_ldap/js/settings.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 73cace33758..25b39ae71f0 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -675,6 +675,10 @@ var LdapWizard = {
 	/** end of init user filter tab section **/
 
 	onTabChange: function(event, ui) {
+		if(LdapWizard.saveProcesses  > 0) {
+			//do not allow to switch tabs as long as a save process is active
+			return false;
+		}
 		newTabIndex = 0;
 		if(ui.newTab[0].id === '#ldapWizard2') {
 			LdapWizard.initUserFilter();
@@ -765,7 +769,6 @@ var LdapWizard = {
 		$('#ldap .ldap_saving').removeClass('hidden');
 		LdapWizard.saveProcesses += 1;
 		$('#ldap *').addClass('save-cursor');
-		LdapWizard.disableTabs();
 		param = 'cfgkey='+encodeURIComponent(object.id)+
 				'&cfgval='+encodeURIComponent(value)+
 				'&action=save'+
@@ -778,11 +781,7 @@ var LdapWizard = {
 				LdapWizard.saveProcesses -= 1;
 				if(LdapWizard.saveProcesses === 0) {
 					$('#ldap .ldap_saving').addClass('hidden');
-					console.log('switch cursor');
-					console.log($('#ldap *').css('cursor'));
 					$('#ldap *').removeClass('save-cursor');
-					//enable the tabs again, if everything is OK
-					LdapWizard.basicStatusCheck();
 					console.log($('#ldap *').css('cursor'));
 				}
 				if(result.status === 'success') {
-- 
GitLab


From 6ccda2ae9890d079b4e7c77b3f04e89b63209ef3 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 15 Oct 2014 11:23:42 +0200
Subject: [PATCH 107/616] Add app version to JS and CSS

This leads to the regeneration of the hash in case a single application is updated.

Fixes https://github.com/owncloud/core/issues/11374
---
 lib/private/templatelayout.php | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index e9172fd2da5..0f8c056139b 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -14,6 +14,8 @@ use Assetic\Filter\CssImportFilter;
 
 class OC_TemplateLayout extends OC_Template {
 
+	private static $versionHash = '';
+
 	/**
 	 * @param string $renderas
 	 * @param string $appid application id
@@ -70,26 +72,25 @@ class OC_TemplateLayout extends OC_Template {
 			parent::__construct('core', 'layout.base');
 		}
 
-		$versionParameter = '?v=' . md5(implode(OC_Util::getVersion()));
+		if(empty(self::$versionHash)) {
+			self::$versionHash = md5(implode(',', OC_App::getAppVersions()));
+		}
+		
 		$useAssetPipeline = $this->isAssetPipelineEnabled();
 		if ($useAssetPipeline) {
-
-			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
-
+			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
 			$this->generateAssets();
-
 		} else {
-
 			// Add the js files
 			$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 			$this->assign('jsfiles', array(), false);
 			if (OC_Config::getValue('installed', false) && $renderas!='error') {
-				$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config') . $versionParameter);
+				$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
 			}
 			foreach($jsfiles as $info) {
 				$web = $info[1];
 				$file = $info[2];
-				$this->append( 'jsfiles', $web.'/'.$file . $versionParameter);
+				$this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash);
 			}
 
 			// Add the css files
@@ -99,7 +100,7 @@ class OC_TemplateLayout extends OC_Template {
 				$web = $info[1];
 				$file = $info[2];
 
-				$this->append( 'cssfiles', $web.'/'.$file . $versionParameter);
+				$this->append( 'cssfiles', $web.'/'.$file . '?v=' . self::$versionHash);
 			}
 		}
 	}
-- 
GitLab


From 6ec9c99d48571103eafb0997cd3434baa421ccbf Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Wed, 15 Oct 2014 14:16:17 +0200
Subject: [PATCH 108/616] Use this.$el instead of the absolute selector

---
 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 eafef6c2a5e..b8df55760be 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -51,7 +51,7 @@
 
 		// number of files per page, calculated dynamically
 		pageSize: function() {
-			return Math.ceil($('#app-content').height() / 50);
+			return Math.ceil(this.$el.height() / 50);
 		},
 
 		/**
-- 
GitLab


From 239bff5766c42e94e430dfdc4233ac4115c516ec Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 15 Oct 2014 14:05:18 +0200
Subject: [PATCH 109/616] strip whitespace from the beginning and end of the
 display name to avoid empty display names

---
 lib/private/user/user.php | 14 ++++++++++--
 tests/lib/user/user.php   | 46 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index 993fb4c0c64..452261a75ff 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -89,8 +89,17 @@ class User implements IUser {
 	 */
 	public function getDisplayName() {
 		if (!isset($this->displayName)) {
+			$displayName = '';
 			if ($this->backend and $this->backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
-				$this->displayName = $this->backend->getDisplayName($this->uid);
+				// get display name and strip whitespace from the beginning and end of it
+				$backendDisplayName = $this->backend->getDisplayName($this->uid);
+				if (is_string($backendDisplayName)) {
+					$displayName = trim($backendDisplayName);
+				}
+			}
+
+			if (!empty($displayName)) {
+				$this->displayName = $displayName;
 			} else {
 				$this->displayName = $this->uid;
 			}
@@ -105,7 +114,8 @@ class User implements IUser {
 	 * @return bool
 	 */
 	public function setDisplayName($displayName) {
-		if ($this->canChangeDisplayName()) {
+		$displayName = trim($displayName);
+		if ($this->canChangeDisplayName() && !empty($displayName)) {
 			$this->displayName = $displayName;
 			$result = $this->backend->setDisplayName($this->uid, $displayName);
 			return $result !== false;
diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index 3f90432c6b0..7a1db861c98 100644
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -32,6 +32,28 @@ class User extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('Foo', $user->getDisplayName());
 	}
 
+	/**
+	 * if the display name contain whitespaces only, we expect the uid as result
+	 */
+	public function testDisplayNameEmpty() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Backend');
+		$backend->expects($this->once())
+			->method('getDisplayName')
+			->with($this->equalTo('foo'))
+			->will($this->returnValue('  '));
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->with($this->equalTo(\OC_USER_BACKEND_GET_DISPLAYNAME))
+			->will($this->returnValue(true));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertEquals('foo', $user->getDisplayName());
+	}
+
 	public function testDisplayNameNotSupported() {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
@@ -305,6 +327,30 @@ class User extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals('Foo',$user->getDisplayName());
 	}
 
+	/**
+	 * don't allow display names containing whitespaces only
+	 */
+	public function testSetDisplayNameEmpty() {
+		/**
+		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
+		 */
+		$backend = $this->getMock('\OC_User_Database');
+
+		$backend->expects($this->any())
+			->method('implementsActions')
+			->will($this->returnCallback(function ($actions) {
+				if ($actions === \OC_USER_BACKEND_SET_DISPLAYNAME) {
+					return true;
+				} else {
+					return false;
+				}
+			}));
+
+		$user = new \OC\User\User('foo', $backend);
+		$this->assertFalse($user->setDisplayName(' '));
+		$this->assertEquals('foo',$user->getDisplayName());
+	}
+
 	public function testSetDisplayNameNotSupported() {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
-- 
GitLab


From 33ada11a648276986d7c0a6e21da27cd10b8823e Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Wed, 15 Oct 2014 14:55:24 +0200
Subject: [PATCH 110/616] Use function call for FileList.pageSize

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

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 5fcf99d24af..df268fea6de 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -350,7 +350,7 @@ var createDragShadow = function(event) {
 	}
 
 	// do not show drag shadow for too many files
-	var selectedFiles = _.first(FileList.getSelectedFiles(), FileList.pageSize);
+	var selectedFiles = _.first(FileList.getSelectedFiles(), FileList.pageSize());
 	selectedFiles = _.sortBy(selectedFiles, FileList._fileInfoCompare);
 
 	if (!isDragSelected && selectedFiles.length === 1) {
-- 
GitLab


From 9de874f01533522f4c028214e85ff8363e8f2164 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Wed, 15 Oct 2014 15:06:35 +0200
Subject: [PATCH 111/616] this.$el is not the same as $('#app-content')

That is why we use `this.$el.parent()` instead
---
 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 b8df55760be..2fbaf71c120 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -51,7 +51,7 @@
 
 		// number of files per page, calculated dynamically
 		pageSize: function() {
-			return Math.ceil(this.$el.height() / 50);
+			return Math.ceil(this.$el.parent().height() / 50);
 		},
 
 		/**
-- 
GitLab


From 5033fc4e5249d996800af64afc6488088f3fc220 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Wed, 15 Oct 2014 15:09:01 +0200
Subject: [PATCH 112/616] Stub for pageSize, because now it is dynamically
 calculated

---
 apps/files/tests/js/filelistSpec.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 94b52b395e5..e3cff352803 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -20,7 +20,7 @@
 */
 
 describe('OCA.Files.FileList tests', function() {
-	var testFiles, alertStub, notificationStub, fileList;
+	var testFiles, alertStub, notificationStub, fileList, pageSizeStub;
 	var bcResizeStub;
 
 	/**
@@ -120,7 +120,7 @@ describe('OCA.Files.FileList tests', function() {
 			size: 250,
 			etag: '456'
 		}];
-
+		pageSizeStub = sinon.stub(OCA.File.FileList.prototype, 'pageSize').returns(20);
 		fileList = new OCA.Files.FileList($('#app-content-files'));
 	});
 	afterEach(function() {
@@ -130,6 +130,7 @@ describe('OCA.Files.FileList tests', function() {
 		notificationStub.restore();
 		alertStub.restore();
 		bcResizeStub.restore();
+		pageSizeStub.restore();
 	});
 	describe('Getters', function() {
 		it('Returns the current directory', function() {
-- 
GitLab


From b091394a90a22767ec08259eb19a2b0d0294c25d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 14 Aug 2014 15:48:38 +0200
Subject: [PATCH 113/616] introduce new app page layout

filter installed and not-installed apps properly

kill unneeded file

load category 'Installed' on page load

adding documentation links

new apps mgmt: first style adjustment

apps mgmt: only show license and preview if they exist

adding buttons

new apps mgmt: fix for mobile

use app icon if available

new apps mgmt: position enable/disable toggle to the right

new apps mgmt: proper display of icons or previews

new apps mgmt: fix loading spinner

reenable group selection for apps

new apps mgmt: position enable button normally again

new apps mgmt: clarify wording from 'Installed' to 'Enabled'

reintroduce enable/disable

Move rating image path generation to client-side

Move expression outside of l10n

fix group handling

add buttons for 'More apps' and 'Add your app' again

disable changed date of app for now

adding recommended label

style 'Recommended' app tag

fixing php warning

sort by rating

adding meta-category 'Recommended'

 Only show existing documentation links

lacy loading of screenshots

making group based app activation work again

adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'

adding app.svg for all core apps

query string '?installed' is not longer needed

update and uninstall is back + error feedback

remove unneeded parameter

fix alignment of 'recommended' label
---
 apps/files_encryption/img/app.svg |  51 ++++
 apps/files_external/img/app.svg   | 212 +++++++++++++
 apps/files_sharing/img/app.svg    |  54 ++++
 apps/files_trashbin/img/app.svg   |  54 ++++
 apps/files_versions/img/app.svg   | 103 +++++++
 apps/user_ldap/img/app.svg        |  61 ++++
 apps/user_webdavauth/img/app.svg  |  61 ++++
 core/img/rating/s0.png            | Bin 0 -> 299 bytes
 core/img/rating/s1.png            | Bin 299 -> 441 bytes
 core/img/rating/s10.png           | Bin 557 -> 464 bytes
 core/img/rating/s11.png           | Bin 464 -> 0 bytes
 core/img/rating/s2.png            | Bin 441 -> 594 bytes
 core/img/rating/s3.png            | Bin 594 -> 620 bytes
 core/img/rating/s4.png            | Bin 620 -> 602 bytes
 core/img/rating/s5.png            | Bin 602 -> 621 bytes
 core/img/rating/s6.png            | Bin 621 -> 603 bytes
 core/img/rating/s7.png            | Bin 603 -> 621 bytes
 core/img/rating/s8.png            | Bin 621 -> 584 bytes
 core/img/rating/s9.png            | Bin 584 -> 557 bytes
 core/templates/layout.user.php    |   2 +-
 lib/private/app.php               | 118 ++++---
 lib/private/installer.php         |   3 +-
 lib/private/ocsclient.php         |   2 +
 settings/ajax/apps/categories.php |  30 ++
 settings/ajax/apps/index.php      |  65 ++++
 settings/ajax/apps/ocs.php        |  68 -----
 settings/ajax/updateapp.php       |  21 +-
 settings/apps.php                 |  21 +-
 settings/css/settings.css         |  61 +++-
 settings/js/apps-custom.php       |  26 --
 settings/js/apps.js               | 491 ++++++++++++++----------------
 settings/js/old-apps.js           |   0
 settings/routes.php               |   8 +-
 settings/templates/apps.php       | 127 ++++----
 34 files changed, 1135 insertions(+), 504 deletions(-)
 create mode 100644 apps/files_encryption/img/app.svg
 create mode 100644 apps/files_external/img/app.svg
 create mode 100644 apps/files_sharing/img/app.svg
 create mode 100644 apps/files_trashbin/img/app.svg
 create mode 100644 apps/files_versions/img/app.svg
 create mode 100644 apps/user_ldap/img/app.svg
 create mode 100644 apps/user_webdavauth/img/app.svg
 create mode 100644 core/img/rating/s0.png
 delete mode 100644 core/img/rating/s11.png
 create mode 100644 settings/ajax/apps/categories.php
 create mode 100644 settings/ajax/apps/index.php
 delete mode 100644 settings/ajax/apps/ocs.php
 delete mode 100644 settings/js/apps-custom.php
 create mode 100644 settings/js/old-apps.js

diff --git a/apps/files_encryption/img/app.svg b/apps/files_encryption/img/app.svg
new file mode 100644
index 00000000000..1157c71c66e
--- /dev/null
+++ b/apps/files_encryption/img/app.svg
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xml:space="preserve"
+   height="16px"
+   width="16px"
+   version="1.1"
+   y="0px"
+   x="0px"
+   viewBox="0 0 71 100"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="app.svg"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-21.423729"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><path
+     d="m8 1c-2.2091 0-4 1.7909-4 4v2h-1v7h10v-7h-1v-2c0-2.2091-1.791-4-4-4zm0 2c1.1046 0 2 0.89543 2 2v2h-4v-2c0-1.1046 0.8954-2 2-2z"
+     transform="matrix(6.25,0,0,6.25,-14.5,0)"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1" /><path
+     style="fill:none"
+     d="m 3.0644068,10.508475 0,-3.4576275 0.4655371,0 0.465537,0 0.049537,-1.2033899 C 4.1094633,4.2818838 4.1578923,4.0112428 4.4962182,3.3259708 4.7075644,2.8978935 4.9002217,2.6327599 5.2605792,2.2740624 6.7855365,0.75613022 8.9920507,0.69157582 10.623172,2.1171729 c 0.384104,0.3357058 0.882069,1.0763131 1.054177,1.5678422 0.147302,0.4206856 0.262873,1.6086448 0.266436,2.7387137 l 0.002,0.6271187 0.508474,0 0.508475,0 0,3.4576275 0,3.457627 -4.9491527,0 -4.9491525,0 0,-3.457627 z M 10.065882,6.3559322 c -0.02012,-0.3822034 -0.04774,-0.7076271 -0.0614,-0.7231639 -0.013653,-0.015537 -0.024824,0.281921 -0.024824,0.661017 l 0,0.6892655 -1.9630041,0 -1.963004,0 -0.023717,-0.4576271 -0.023717,-0.4576271 -0.013279,0.4915254 -0.013279,0.4915255 2.0613978,0 2.0613972,0 -0.03657,-0.6949153 0,0 z M 6.5396275,3.7118644 C 6.648082,3.5720339 6.7197092,3.4576271 6.6987988,3.4576271 c -0.062956,0 -0.5835446,0.6841947 -0.5835446,0.7669359 0,0.042237 0.051116,0.00136 0.1135916,-0.090834 0.062475,-0.092195 0.2023271,-0.2820343 0.3107817,-0.4218648 z M 9.7498983,4.0169492 C 9.6961899,3.9144068 9.5352369,3.723769 9.392225,3.5933098 L 9.1322034,3.356111 9.3784249,3.6272081 c 0.1354218,0.1491033 0.2814105,0.3397411 0.3244192,0.4236394 0.043009,0.083898 0.093162,0.1525423 0.1114515,0.1525423 0.01829,0 -0.010689,-0.083898 -0.064397,-0.1864406 l 0,0 z M 7.3032896,3.1315382 C 7.2704731,3.0987216 6.877102,3.3089557 6.8306315,3.3841466 6.8091904,3.4188389 6.911918,3.3813452 7.0589148,3.300827 7.2059117,3.2203088 7.3158803,3.1441289 7.3032896,3.1315382 l 0,0 z"
+     id="path3007"
+     inkscape:connector-curvature="0"
+     transform="matrix(6.25,0,0,6.25,-14.5,0)" /></svg>
\ No newline at end of file
diff --git a/apps/files_external/img/app.svg b/apps/files_external/img/app.svg
new file mode 100644
index 00000000000..df1bfd163ff
--- /dev/null
+++ b/apps/files_external/img/app.svg
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="32px"
+   width="32px"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="app.svg">
+  <metadata
+     id="metadata80">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview78"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="-13.559322"
+     inkscape:cy="16"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4">
+    <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"
+         id="stop7" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".23529"
+         offset=".0097359"
+         id="stop9" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".15686"
+         offset=".99001"
+         id="stop11" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".39216"
+         offset="1"
+         id="stop13" />
+    </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"
+         id="stop16" />
+      <stop
+         stop-color="#5d9fcd"
+         offset="1"
+         id="stop18" />
+    </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"
+         id="stop21" />
+      <stop
+         offset=".5"
+         id="stop23" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop25" />
+    </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"
+         id="stop28" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop30" />
+    </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"
+         id="stop33" />
+      <stop
+         stop-opacity="0"
+         offset="1"
+         id="stop35" />
+    </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"
+         id="stop38" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".23529"
+         offset=".11063"
+         id="stop40" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".15686"
+         offset=".99001"
+         id="stop42" />
+      <stop
+         stop-color="#fff"
+         stop-opacity=".39216"
+         offset="1"
+         id="stop44" />
+    </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"
+         id="stop47" />
+      <stop
+         stop-color="#d8d8d8"
+         offset="1"
+         id="stop49" />
+    </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"
+         id="stop52" />
+      <stop
+         stop-opacity=".27826"
+         offset="1"
+         id="stop54" />
+    </linearGradient>
+  </defs>
+  <path
+     d="m 14.902928,3.2372882 4.76117,4.5146377 -7.141758,6.7719561 4.761174,4.514639 7.141756,-6.771956 4.761171,4.514636 V 3.2372882 H 14.902928 z M 5.3805857,5.4946057 C 4.0617412,5.4946057 3,6.501372 3,7.7519259 V 25.810477 c 0,1.250555 1.0617412,2.257319 2.3805857,2.257319 H 24.42527 c 1.318844,0 2.380584,-1.006764 2.380584,-2.257319 v -6.771956 l -2.380584,-2.25732 v 9.029276 H 5.3805857 V 7.7519259 H 14.902928 L 12.52234,5.4946057 H 5.3805857 z"
+     id="path76"
+     inkscape:connector-curvature="0"
+     style="opacity:0.7;fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/apps/files_sharing/img/app.svg b/apps/files_sharing/img/app.svg
new file mode 100644
index 00000000000..d64e44b70b0
--- /dev/null
+++ b/apps/files_sharing/img/app.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="app.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-6.6440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path6"
+     d="m 12.228,1 c -1.3565,0 -2.4592,1.0977 -2.4592,2.4542 0,0.075 0.0084,0.1504 0.0149,0.2236 L 5.0491,6.0923 C 4.62,5.7256 4.06299,5.506 3.4544,5.506 c -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.477 l 4.8637,2.4741 c -0.0024,0.044 -0.0099,0.089 -0.0099,0.1342 0,1.3565 1.1027,2.4542 2.4592,2.4542 1.3565,0 2.4542,-1.0977 2.4542,-2.4542 0,-1.3565 -1.0977,-2.4592 -2.4542,-2.4592 -0.63653,0 -1.218,0.2437 -1.6544,0.6409 l -4.6953,-2.4 C 5.89722,8.2047 5.91308,8.0781 5.91308,7.95 c 0,-0.072 -0.0089,-0.1437 -0.0149,-0.2137 l 4.7395,-2.4145 c 0.42802,0.3627 0.98488,0.5813 1.5898,0.5813 1.3565,0 2.4542,-1.1027 2.4542,-2.4592 0,-1.3565 -1.0977,-2.4542 -2.4542,-2.4542 z"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/apps/files_trashbin/img/app.svg b/apps/files_trashbin/img/app.svg
new file mode 100644
index 00000000000..b749f9879e6
--- /dev/null
+++ b/apps/files_trashbin/img/app.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="app.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-6.6440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <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"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/apps/files_versions/img/app.svg b/apps/files_versions/img/app.svg
new file mode 100644
index 00000000000..862b0a6885e
--- /dev/null
+++ b/apps/files_versions/img/app.svg
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   version="1.0"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="app.svg">
+  <metadata
+     id="metadata20">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs18" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-6.6440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <rect
+     rx=".5"
+     ry=".5"
+     height="4"
+     width="4"
+     y="1"
+     x="1"
+     id="rect4"
+     style="fill:#ffffff;fill-opacity:1" />
+  <rect
+     rx=".5"
+     ry=".5"
+     height="1"
+     width="9"
+     y="2"
+     x="6"
+     id="rect6"
+     style="fill:#ffffff;fill-opacity:1" />
+  <rect
+     rx=".5"
+     ry=".5"
+     height="4"
+     width="4"
+     y="6"
+     x="1"
+     id="rect8"
+     style="fill:#ffffff;fill-opacity:1" />
+  <rect
+     rx=".5"
+     ry=".5"
+     height="1"
+     width="9"
+     y="7"
+     x="6"
+     id="rect10"
+     style="fill:#ffffff;fill-opacity:1" />
+  <rect
+     rx=".5"
+     ry=".5"
+     height="4"
+     width="4"
+     y="11"
+     x="1"
+     id="rect12"
+     style="fill:#ffffff;fill-opacity:1" />
+  <rect
+     rx=".5"
+     ry=".5"
+     height="1"
+     width="9"
+     y="12"
+     x="6"
+     id="rect14"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/apps/user_ldap/img/app.svg b/apps/user_ldap/img/app.svg
new file mode 100644
index 00000000000..63a065afdc7
--- /dev/null
+++ b/apps/user_ldap/img/app.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   version="1.0"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="app.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-6.6440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <rect
+     style="color:#000000"
+     fill-opacity="0"
+     height="97.986"
+     width="163.31"
+     y="-32.993"
+     x="-62.897"
+     id="rect4" />
+  <path
+     style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;fill:#ffffff;fill-opacity:1"
+     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"
+     id="path6" />
+</svg>
diff --git a/apps/user_webdavauth/img/app.svg b/apps/user_webdavauth/img/app.svg
new file mode 100644
index 00000000000..63a065afdc7
--- /dev/null
+++ b/apps/user_webdavauth/img/app.svg
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   height="16"
+   width="16"
+   version="1.0"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="app.svg">
+  <metadata
+     id="metadata12">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs10" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1014"
+     id="namedview8"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-6.6440678"
+     inkscape:cy="8"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <rect
+     style="color:#000000"
+     fill-opacity="0"
+     height="97.986"
+     width="163.31"
+     y="-32.993"
+     x="-62.897"
+     id="rect4" />
+  <path
+     style="block-progression:tb;color:#000000;text-transform:none;text-indent:0;fill:#ffffff;fill-opacity:1"
+     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"
+     id="path6" />
+</svg>
diff --git a/core/img/rating/s0.png b/core/img/rating/s0.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d5014106e5a6a966af40025839cc05180b53ee7
GIT binary patch
literal 299
zcmV+`0o4A9P)<h;3K|Lk000e1NJLTq003YB000sM0{{R3R$Rux0000RP)t-s0002R
z#l_6b%+}V{-rnBl=jZP3?)LWf|NsBR(bNV20004WQchC<K<3zH0002KNkl<ZC{vxx
zF;2rk5J1r{)-f$d2xCwvt^G?Mv8InmK^qAU;EI}~QxLaa!xW>hH`2g==JvAG*Cry3
zOSy^oc)mvOX#;`Fm*lvC*p+(xt@Bjc)K69|@9<fR`Z})@b(&PAD^pb+R|!(l2%o@e
zjv;@q6IhKQ&yb2aJTwTBIfes(M&!9g?2PaTaLzH5Cef+G2v9ZKBs$go^=fVs$%mKN
x1DL0XCUNr!Z+8H3Vt3ypdVtHa`X>ExegH*1NhYG6P@ez*002ovPDHLkV1hr)gaiNp

literal 0
HcmV?d00001

diff --git a/core/img/rating/s1.png b/core/img/rating/s1.png
index 9d5014106e5a6a966af40025839cc05180b53ee7..6846c8771f5036d485e913851f962582365fdd97 100644
GIT binary patch
delta 427
zcmV;c0aX600=WZ_7=H)@0001!tSi6(004?mOjJbx0070s#mvmi*4EbDs43pw-ruh=
z<G4fRwm9a!Lg&I-=fra7=jZ9hLFva#>dQv!&WG&0BJ9t3?ZPna&PnaiTJFO^?(XjI
z#VPN|Pw&-C@y##s&QtN+fAQR!^3X-{)mZY@Rr1_d^53xZ)_*|s*;@79UH0K(_V)Jo
z-kkUAwfF42`}NrW|Njf)a_0a500DGTPE!Ct=GbNc007-dL_t(IPrcOH4uU`o1<>o%
zx{l%k0&d`j`~Ux*9Ys)iGu8XT<j|yTh5-C6m#{(yMFIk<5GfMQKG_cnNsj<;RcTA4
zM>zUBCVnGJtbatOMbPtiiR(*j4~{}9Atn_<FkNR^mPC|CNCseLA`Ozvr~B<}78wbV
zxjM?HP$5a*&mIlL9$V#wIwWbQNpx>eS}}(L0n1(*4PDdn?(K6=1p-E%H=f9gm(Mr9
zDHQ@b@jPzd`Lj-ifM(pPciC-LkgH%N0ve5hdstH|$Rrr6M!@EID1WnI<?ucIG&iHK
V6VKV!xaR->002ovPDHLkV1mZb+r$6>

delta 284
zcmV+%0ptF;1FHg%7=Hu<00011T*kow000|MOjJbx0070s#mvmi*4EbE-rncu=kD(A
z_V)Jw|Nq6&)CK?m00DGTPE!Ct=GbNc006#8L_t(2Q=QB)PQySDK+!MOF)c?3V^Aoq
z{YxLQrjJNL8wn2JikhQS5Vu~#6r-;<(!hV__OjI1CL)bXxqpfHc)mvOX#;`Fm*lvC
z*p+(xt@Bjc)K69|@9<fR`Z})@b(&PAD^pb+R|!(l2%o@ejv;@q6IhKQ&yb2aJTwTB
zIfes(M&!9g?2PaTaLzH5Cef+G2v9ZKBs$go^=fVs$%mKN1DL0XCUNr!Z+8H3Vt3yp
idVtHa`X>ExeiZ;kJxL~_o=~3v0000<MNUMnLSTYXHG|mz

diff --git a/core/img/rating/s10.png b/core/img/rating/s10.png
index b9c190f8ce79bda4534869080eaff7d689c5d387..c674569c3899f3d8a4e141fcfe08abb69fd19072 100644
GIT binary patch
delta 296
zcmV+@0oVSm1keMJBptv|OjJbx007K@4bh7k(~lz7nJd|yCEchg-Ks^AO(BtSKasOG
zfA`*;_v^Ly?7aK+*!%V7{P^!@&isu40004WQchC<K<3zH0002KNkl<ZI8VLEU0Q-b
z7(n4;C5<Jc7Saz>lMdRTpnw%vru*NOSM7kWb9J5<{;l7GC_$Qt5(no>L4str8w(QO
zu4&?#5dCb^*frI<7!PhAH^;7tboJ4;dTr(XJbO1<sg4OKR{O6!_uks63Dv1<0v=qO
z=ib`rEeuZG6ELbP?`;&B;3z>*#<jOL(t0RDFiVp8a`|+xuSEzZS&@yjG5Sh`;3m_-
u-E+SmUWgDV^$PHE*%Kl7{F{XciFO8M$yJ;nJ|@-x0000<MNUMnLSTX}<&K5`

delta 392
zcmV;30eAk;1FZy*Bq`WXOjJbx0070s#ms;W%*@Quiy708BG#EJ*4Eb9oh99<Dc!0?
z-rnAkK_LU@=jV}PKLhUW?vbH3fA;qF_uicM>$Ugny!-Xo`}OAh`0xM!|GH7Dvj6}9
z0d!JMQvg8b*k%9#0Ru@yK~y-)y_8#Xf-n$;X=xjgcp+Yp(kjuYu~ty=S_|Iw|NkS&
zpiUfoTs<$zd=GnaHk&BQ)3n<HqTU^Yjsu8Lvi_Fy2^>OZ!oZo&i*N`fe<G}T5ZEm+
zq$6Ddn{mhH!F1pkGr8~49s(gD-CV^t(*Fy?aO%2k@0SvcArLw%PT=>K|HGl{GWJOg
ze1Je|B!txCxkq0-j38rH)6fneD6YS{-a=s(1!a~+wLJ_H22y=xV$Z}m2+0E>5kQ`!
zmgBU$-D-uTfl$<+o2O9nMtrY8C?y|2NKB9_8Du@8m20V#@dku+F-DRB#tpI5-(SIy
mslG@Ci_7K*5Z(K-AD|QM%U#B~Q%Dv70000<MNUMnLSTYfCctn2

diff --git a/core/img/rating/s11.png b/core/img/rating/s11.png
deleted file mode 100644
index c674569c3899f3d8a4e141fcfe08abb69fd19072..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 464
zcmV;>0WbcEP)<h;3K|Lk000e1NJLTq003YB000sQ0{{R3ldLPi0002MP)t-s0002Y
zfDO@$8Pks<)|o5Woh99<Dc!0?->)&^wlw3oL*%<k<h^F)tvKbjIOe@V=D#`T!dmCV
za_F!n>9ZT@vmoilLFva#>BnyBwJYk$f$Gaf>%Bzl&6(@YhwQu}?7v9t&w1^_FzwDs
z?a*57(yQ*nLGHs#@5L$a$WQOpOz_J&@y##s&QtN*qVe2+@!Xp7&_(jqSn}3Y^4wSQ
z->~%7K=j#K_1<0f;bQmRocHUs_w2m;_1OFM=KT2YXU_bM00001bW%=J06^y0W&i*H
zzDYzuR5(w)$X!~3Ko~&bV<n9xqZZN+Q<DzbprC*iSf=~ml~?V6uXA;t7yhl^gD63o
zh!O|qN<o5Tw;Kx*->zxmnGpSK)7UlDx)={`A2-LYiFEbRwr%D8JbO1<sg4OKR{O6!
z_uks63Dv1<0v=qO=ib`rEeuZG6ELbP?`;&B;3z>*#<jOL(t0RDFiVp8a`|+xuSEzZ
zS&@yjG5Sh`;3m_--E+SmUWgDV^$PHE*%Kl7{F{XciFO8M$yJ;nJ|@-x0000<MNUMn
GLSTXz`tn!+

diff --git a/core/img/rating/s2.png b/core/img/rating/s2.png
index 6846c8771f5036d485e913851f962582365fdd97..2f132cc5fa1e390131bab916c26b0c861799a228 100644
GIT binary patch
delta 524
zcmV+n0`vX31JVSLB!AdYOjJbx0070s#ms;W%*@Quiy708BG#EJ*4Eb9oh99<Dc!0?
z-rnBduQB4bG~>8K<hx4by=LXDIOVoD=DkAZzd7f^TIa-a=jZ3>uqElU8|kwk>Bd3n
z$4u$RZtArw>dArX%SP+HMC;9&>&}PlydvzsNbJvf?ZPna&Lv6h&|2-%tM0==?!!y&
z?(Xl!DeuTn@6}B3%Q^AQFY(S(@!O)2fG~gi_2&He@Bjb*x>2jM00001bW%=J06^y0
zW&i*IC`m*?R5(w)(%VvlFc1ddRn!!N2hwUpJb+>gR-hK`K`ljV>-)cv8!1uYj-dYq
z$$azAu*(4OZ+Tx-C<~h-fWWB`A<Ypie1BA;kPzM!0XWlXr$mHQCaF#E>d$6&_ZNS0
zLMfq5(A#5R`?K+V(%CyWe^?3%u|g>M3gwv+K`?kq({vm~z4*>$hJl0wP`a*(s1PO@
z%wLAXDDu2h*ECjw)>CL0e10eq=FCs=1)gW!nEEQGyqMQAMZ&Zv_=P;na`k0Fa*pp>
zZ2}nC6R`kehmv@)CsikauH*Fj{fk@^wkt_2DrWidN7p8Rqd1A%%yrpLxra@40@#n4
zetg+#nOl-XgHo}qIsq8QwK%S}HzjEr7YEli)Cu6ZxZFw#E0_B8r}+e<@GBH5b(R<a
O0000<MNUMnLSTZ{DH0w4

delta 370
zcmV-&0ge9B1i1r{BwUJ6OjJbx0070s#mvmi*4EbDs43pw-ruh=<G4fRwm9a!Lg&I-
z=fra7=jZ9hLFva#>dQv!&WG&0BJ9t3?ZPna&PnaiTJFO^?(XjI#VPN|Pw&-C@y##s
z&Qp=dFn|C5{|n=C=Kufz0d!JMQvg8b*k%9#0NqJMK~y+Tz0}zbf<O!f(CgH?j^Y9W
zZs3Od|NovHMNoM&)%(Ka(4=jK0Q@bNutEn#0s^WKDH6^;*$)ayj{t8~X-lL>IQly#
zej`h)M5jg2^LL5sOKcC0LMb686+$pwXIYj+lz&G^24H3)4U){K`|WHN83~cOI?AU|
zAxYoQ9u34ETjhm1Bx$EfbZ<~vF^2*H%U&7{UDNXJ?Q>5B0!E%Up2&-r&o{p*6#_c(
zJZ|6lvrdJ8X56ZG*=<&kt6(Jp8jXQ_SW_#=7^_CW=6NW8vti}%J^eH{qpuUs+19w{
Q01E&B07*qoM6N<$f)ClXiU0rr

diff --git a/core/img/rating/s3.png b/core/img/rating/s3.png
index 2f132cc5fa1e390131bab916c26b0c861799a228..55e917f92e65d0c79f4f8e0c3c658274a91bc705 100644
GIT binary patch
delta 353
zcmV-n0iOQS1ndN`6#;)jNkl<ZI8VLQ+fsut5C-5?)GY=Nq*bi-0E#VGfm*Z&6<V#W
z@Bc<7mU7CC$&CItFyHJlyO06k-}1Q-DG+F`N&vns5(<Q>1Pjj_34~US0#qabdpd0i
zBus*+Nbv3@NvB&Uf}}zg5*7M*_B&oOevDfON0(2_67f-xSaW|)0qa77@&x|iB~8<D
z81|wEhZ;tSFbg9#6Cngqnpon&>}@y<L)SfbOk-6djRjHr;*<?0Pb?Q+%AV%B?K@Ln
zm1$kJUNq}fAeQEYy&<>VcJyV1cwJGJk0wh1qt1jcK<ROn_#DM?ur{m95<u6sd;R{^
z8QrfEt1X@A?BiL<6TnFnM@{NDbgxQ3mGxG60yvDQetO+#m^)P>eA%3M6Hy@m!?@*_
zo89d?S=v@knr5jH!0YDbUZmpB8wfYQq(99!$_g{RsHVf!00000NkvXXu0mjfJo2Ac

delta 327
zcmV-N0l5C`1kwbs6#;)JNkl<ZI8VLO+fsut5C-5?)D(jU(rQFJfMN?)pcd^xEk$eV
z`@fMJDN*5$p#KHQeDlw+%K-3id0$j03!5W=z^M=+%@Hhoe^jE75Z)94IMZpTM1)i(
zsZH?e&t`V_7jZ%<p-s@+V_^HU@qN<SJ2-z>3JS48DESKInG%0NFnCJSbR0#!_|9d9
zfrJB4x~_?+5GEPSUxvdd^1M^mG**JvQ)n1`ekc*<%un$Jo@d>d`YNZqnAb8z!n7y&
zg*?l0^<_bFj_+D+0vOp7u>fO-l6bKvRVRS1<MjIdixajhNh~U6`SC~BCV-<jiQCL|
z*-p8KO?3j;kC{JyeA#N5TarYBQn9Q$0T{-$IIgxgC21NL2iG>#3E;W7+)4^7m-_Ul
Z`2?fzD-<eqmKXp4002ovPDHLkV1fX;m+Jrk

diff --git a/core/img/rating/s4.png b/core/img/rating/s4.png
index 55e917f92e65d0c79f4f8e0c3c658274a91bc705..fa76c311c693e9a9ae27100dcb5584d798884224 100644
GIT binary patch
delta 335
zcmV-V0kHn;1lk0!6#;)RNkl<ZI8VLQYfpnP6b9g<RXZ$R=%$Ex0j(Q2fjM*+6-4Le
z|NlppjZKqDX-V|`0L_!U<g^d~{w*I98Onm11mHU|gmF!RiRTTfDZtpQMF7rt+^Qyw
z*M^fLc=M9PZdZ|s3Bg2}-XDG2ONRGxYwzIvVOl}~Z()MxA!dIjPvG~S(li~0VJEtC
zsjmM{d?rGQW^n{^#1r>kU;6zpWbD*6^jQfNgCQP%{gfx3GcV;&W6ZiSv{@-Fx{GF}
zLOjh8KMrPDt~M3WYP9dB903gMQ9doDhaxhUTPKPH&~}_ow|j9ycSTgZJoMuumm`3q
zD2|%cb?J_XR$oU4QY3)=h-$}|jfSx$qP#>%zJEmm(Dm#5cD21JB829D7!z$M62S9v
haVw%=Z6Qg2nlE0xITvwN4ekH{002ovPDHLkV1j(=m~8+6

delta 353
zcmV-n0iOQa1ndN`6#;)jNkl<ZI8VLQ+fsut5C-5?)GY=Nq*bi-0E#VGfm*Z&6<V#W
z@Bc<7mU7CC$&CItFyHJlyO06k-}1Q-DG+F`N&vns5(<Q>1Pjj_34~US0#qabdpd0i
zBus*+Nbv3@NvB&Uf}}zg5*7M*_B&oOevDfON0(2_67f-xSaW|)0qa77@&x|iB~8<D
z81|wEhZ;tSFbg9#6Cngqnpon&>}@y<L)SfbOk-6djRjHr;*<?0Pb?Q+%AV%B?K@Ln
zm1$kJUNq}fAeQEYy&<>VcJyV1cwJGJk0wh1qt1jcK<ROn_#DM?ur{m95<u6sd;R{^
z8QrfEt1X@A?BiL<6TnFnM@{NDbgxQ3mGxG60yvDQetO+#m^)P>eA%3M6Hy@m!?@*_
zo89d?S=v@knr5jH!0YDbUZmpB8wfYQq(99!$_g{RsHVf!00000NkvXXu0mjfNBW;%

diff --git a/core/img/rating/s5.png b/core/img/rating/s5.png
index fa76c311c693e9a9ae27100dcb5584d798884224..8856309f8384e3a4c073f201232a3a74033a2c4c 100644
GIT binary patch
delta 354
zcmV-o0iFKZ1nmT{6#;)kNkl<ZI8VLQ*;2wV6b9g<RSz|FA)v9=rPT^WY>S{QY72_s
z`@fNiY)YM++~|MP%r|o~f746>{w?ogBZ><&G9rM6Z$wxiG$I&BQP+e}tWk_61mF(_
zRTC<dLo^|Hjk3(E84yGEg9I{?-X0rXl=bdA)xCrBhl!q4J7j-iq$rjfAwz<o(R#}B
zyq6^P^e*6zqbHn4lB~%XL)4Q@r!{<Ox056cPlK{E)srQIXniP}cO^*XEXw6*7`iuQ
zdrHu3ax|mab`;4}`tmqJ*A46mMQU_4xooQ?fUeh9Z8<+ANmX0j5V1H7EdkVgzus(K
zobX+e<oLHsKL1*t1OXhSowUM(fbWp>HN3tXK>+(Hw~sGNrScX@Ouhe-)IN+P0LQsj
zkE`uX0}|H8k}OLY5Ww?dace}YpK)AR{6>G8PvAX4z&lS&jQ{`u07*qoM6N<$f;Y9H
AG5`Po

delta 335
zcmV-V0kHn<1lk0!6#;)RNkl<ZI8VLQYfpnP6b9g<RXZ$R=%$Ex0j(Q2fjM*+6-4Le
z|NlppjZKqDX-V|`0L_!U<g^d~{w*I98Onm11mHU|gmF!RiRTTfDZtpQMF7rt+^Qyw
z*M^fLc=M9PZdZ|s3Bg2}-XDG2ONRGxYwzIvVOl}~Z()MxA!dIjPvG~S(li~0VJEtC
zsjmM{d?rGQW^n{^#1r>kU;6zpWbD*6^jQfNgCQP%{gfx3GcV;&W6ZiSv{@-Fx{GF}
zLOjh8KMrPDt~M3WYP9dB903gMQ9doDhaxhUTPKPH&~}_ow|j9ycSTgZJoMuumm`3q
zD2|%cb?J_XR$oU4QY3)=h-$}|jfSx$qP#>%zJEmm(Dm#5cD21JB829D7!z$M62S9v
haVw%=Z6Qg2nlE0xITvwN4ekH{002ovPDHLkV1j-*m~H?7

diff --git a/core/img/rating/s6.png b/core/img/rating/s6.png
index 8856309f8384e3a4c073f201232a3a74033a2c4c..4112e14fde236a03a0a2f6a22cbb3f543a101739 100644
GIT binary patch
delta 336
zcmV-W0k8h;1lt6#6#;)SNkl<ZI8VLO+fu?n3<ls|qXyi1U_ooeL#rzkv0E(4L8YPy
zzW*C}K|yCIwc8oZRpz_+CzAyDxB8eAq;ZgkfR<a3nDY=OzTYcE0ki!(0q$^ED@4pI
z^QI8q{L!f1C_pv~!6KX9A6s>Q)W7f6_72V;ruiulf>|&#GYfxvyoS)~JjHR`*SZ<r
zdD60SlVBl45|(Twg#dIruP;%gwNj^E#hT@(WL6>~X8K%10M7h4inLPBO{F|Dp?Taq
zY`m5LR0n;nmE(BjsTnP&{SHeZpjRJgr5q^_4ar_?Lu3)qaNTCReQ_dp4Jo-N{rLM7
z0*=CNSe2e9cMM2r`7o44z<wyp$Css2Wy_G5nS>xB$|AtBt^wd`d()7JYyhxnBa49N
iMRRLN!Ag@xe_CG;LPr{%8l*Y^0000<MNUMnLSTZ<wwc`k

delta 354
zcmV-o0iFKa1nmT{6#;)kNkl<ZI8VLQ*;2wV6b9g<RSz|FA)v9=rPT^WY>S{QY72_s
z`@fNiY)YM++~|MP%r|o~f746>{w?ogBZ><&G9rM6Z$wxiG$I&BQP+e}tWk_61mF(_
zRTC<dLo^|Hjk3(E84yGEg9I{?-X0rXl=bdA)xCrBhl!q4J7j-iq$rjfAwz<o(R#}B
zyq6^P^e*6zqbHn4lB~%XL)4Q@r!{<Ox056cPlK{E)srQIXniP}cO^*XEXw6*7`iuQ
zdrHu3ax|mab`;4}`tmqJ*A46mMQU_4xooQ?fUeh9Z8<+ANmX0j5V1H7EdkVgzus(K
zobX+e<oLHsKL1*t1OXhSowUM(fbWp>HN3tXK>+(Hw~sGNrScX@Ouhe-)IN+P0LQsj
zkE`uX0}|H8k}OLY5Ww?dace}YpK)AR{6>G8PvAX4z&lS&jQ{`u07*qoM6N<$f;ktV
AGXMYp

diff --git a/core/img/rating/s7.png b/core/img/rating/s7.png
index 4112e14fde236a03a0a2f6a22cbb3f543a101739..ce25cf58df99412a628825ba56f841145d6f53e6 100644
GIT binary patch
delta 354
zcmV-o0iFKa1nmT{6#;)kNkl<ZI8VLQ+fsut5C-5?)GY=Nq*X*bfMN?)pcd^x1<~62
z{%>R=ltXhxW^`}Je8c=~!UDj*)z?Cn0)aA-0DN1PP#_cu7M?eeBs4ZCK!E`4`Mf7d
zLcfUO7CyWrvHEgEkTl3Z(xlI4-|~{_W86D9x_nx;Cf+a-BjbM*uxun)C-6rvX_`*M
za1cE>RMT1$7R88lP6$D)5vzFg{x%+mq3fPIy0&Uf3M)kAn^Vz#omgFXDZ9^g%{yIP
zwWmBR%PD_CgIINEZ11jVI_gq_cv=-!ZlIPA6Klp>qx4vYc(>Ki80!P7&r#pD2gBjj
z8Qqs5mROtn;uTsejZfhuilZ)d9J(h%zj-B<GgJ}4VMNu_>rO}Cks-p5q$D0qngpO}
zxBPOmyDdkCvQ?6z7@Gv}x?bGNQuTihgvH<159}yU!=3}7_5c6?07*qoM6N<$f`jX#
A-v9sr

delta 336
zcmV-W0k8h;1lt6#6#;)SNkl<ZI8VLO+fu?n3<ls|qXyi1U_ooeL#rzkv0E(4L8YPy
zzW*C}K|yCIwc8oZRpz_+CzAyDxB8eAq;ZgkfR<a3nDY=OzTYcE0ki!(0q$^ED@4pI
z^QI8q{L!f1C_pv~!6KX9A6s>Q)W7f6_72V;ruiulf>|&#GYfxvyoS)~JjHR`*SZ<r
zdD60SlVBl45|(Twg#dIruP;%gwNj^E#hT@(WL6>~X8K%10M7h4inLPBO{F|Dp?Taq
zY`m5LR0n;nmE(BjsTnP&{SHeZpjRJgr5q^_4ar_?Lu3)qaNTCReQ_dp4Jo-N{rLM7
z0*=CNSe2e9cMM2r`7o44z<wyp$Css2Wy_G5nS>xB$|AtBt^wd`d()7JYyhxnBa49N
iMRRLN!Ag@xe_CG;LPr{%8l*Y^0000<MNUMnLSTZ<wwc`k

diff --git a/core/img/rating/s8.png b/core/img/rating/s8.png
index ce25cf58df99412a628825ba56f841145d6f53e6..3197f23785f55472924cbc41bceb4ed7664896ec 100644
GIT binary patch
delta 317
zcmV-D0mA<61jq!i6#;)9Nkl<ZI8VKl*;a!v5QayirkJ>pRuORl#TKkUE!steqP6w?
z-^j2Pl*>WC3&{Bn=g-U#0QfgPm+h&<YbXHMY)?_zP_T5INn6UJRD<7`^Lei=MQO8z
zcPEOBemhE|j8Rq-AJ4AgMAOHxcW`w1v_dIQW>ZEpn3iPu?&yCdj^nBC4}u3vaE?*3
za>k1MYEa>5@ird&zHOgdDqo{iQ9hB#>sP)3TsX0O&bIYCRaqldzC)g$KuLEd8?|-a
zQdVfSX`q%56JwUvA;d9WY2|?G=csR*gW>S%Ozh)T@ruchPvIm8gRZbFv4>ZiGen@`
zFc8Y=b*H25;8ism%~(1msNnoIz1{3?;}s#<e@G)+Q1MzW?(xcNEdG{nwQyA(O)U{h
P00000NkvXXu0mjf<<6U(

delta 354
zcmV-o0iFKH1nmT{6#;)kNkl<ZI8VLQ+fsut5C-5?)GY=Nq*X*bfMN?)pcd^x1<~62
z{%>R=ltXhxW^`}Je8c=~!UDj*)z?Cn0)aA-0DN1PP#_cu7M?eeBs4ZCK!E`4`Mf7d
zLcfUO7CyWrvHEgEkTl3Z(xlI4-|~{_W86D9x_nx;Cf+a-BjbM*uxun)C-6rvX_`*M
za1cE>RMT1$7R88lP6$D)5vzFg{x%+mq3fPIy0&Uf3M)kAn^Vz#omgFXDZ9^g%{yIP
zwWmBR%PD_CgIINEZ11jVI_gq_cv=-!ZlIPA6Klp>qx4vYc(>Ki80!P7&r#pD2gBjj
z8Qqs5mROtn;uTsejZfhuilZ)d9J(h%zj-B<GgJ}4VMNu_>rO}Cks-p5q$D0qngpO}
zxBPOmyDdkCvQ?6z7@Gv}x?bGNQuTihgvH<159}yU!=3}7_5c6?07*qoM6N<$f@!6q
A%m4rY

diff --git a/core/img/rating/s9.png b/core/img/rating/s9.png
index 3197f23785f55472924cbc41bceb4ed7664896ec..b9c190f8ce79bda4534869080eaff7d689c5d387 100644
GIT binary patch
delta 290
zcmV+-0p0${1g!+H6#;((Nkl<ZILp11TXTXi5QS-J8<BV+UXao%(WtRjQ1My|-u3_g
zBgvpn9DH0oFUfoldvZ3LD9Y2c+XABA9fOVoh)}Zrmh%Z5LT19ina_)G2qhw{c@Wqw
zFr*`00-JHi=D~E}7c;r<(H;UJA>CZXH`4zL!*J@lZSR*7j3IvzIx9}#_m}^}q3bgC
zNez5}Kx!m})Z@8FUp$N;V^-794j?G5zq;N+VHO2tmPNHa3=#%XePv?L#5oAb10fMW
zo}-rIw7cDEg`|N{)SsKDQ1X1QKqw_2KuAoGDj8%wqLpi@l<@|HbTLMf0mcon)Zbsh
okg2{%28+w)2M`+F`?4RP6Ya}g#<^2S761SM07*qoM6N<$g0(J#`Tzg`

delta 317
zcmV-D0mA;R1jq!i6#;)9Nkl<ZI8VKl*;a!v5QayirkJ>pRuORl#TKkUE!steqP6w?
z-^j2Pl*>WC3&{Bn=g-U#0QfgPm+h&<YbXHMY)?_zP_T5INn6UJRD<7`^Lei=MQO8z
zcPEOBemhE|j8Rq-AJ4AgMAOHxcW`w1v_dIQW>ZEpn3iPu?&yCdj^nBC4}u3vaE?*3
za>k1MYEa>5@ird&zHOgdDqo{iQ9hB#>sP)3TsX0O&bIYCRaqldzC)g$KuLEd8?|-a
zQdVfSX`q%56JwUvA;d9WY2|?G=csR*gW>S%Ozh)T@ruchPvIm8gRZbFv4>ZiGen@`
zFc8Y=b*H25;8ism%~(1msNnoIz1{3?;}s#<e@G)+Q1MzW?(xcNEdG{nwQyA(O)U{h
P00000NkvXXu0mjfmX4cU

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 04cb6eb9def..9445175efcf 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -119,7 +119,7 @@
 				<!-- show "More apps" link to app administration directly in app navigation, as last entry -->
 				<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
 					<li id="apps-management">
-						<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
+						<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps')); ?>" title=""
 							<?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
 							<img class="app-icon svg" alt="" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
 							<div class="icon-loading-dark" style="display:none;"></div>
diff --git a/lib/private/app.php b/lib/private/app.php
index a356139044c..95a8a7302d9 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -815,7 +815,7 @@ class OC_App {
 	 * Lists all apps, this is used in apps.php
 	 * @return array
 	 */
-	public static function listAllApps() {
+	public static function listAllApps($onlyLocal = false) {
 		$installedApps = OC_App::getAllApps();
 
 		//TODO which apps do we want to blacklist and how do we integrate
@@ -823,6 +823,7 @@ class OC_App {
 
 		$blacklist = array('files'); //we don't want to show configuration for these
 		$appList = array();
+		$l = \OC::$server->getL10N('core');
 
 		foreach ($installedApps as $app) {
 			if (array_search($app, $blacklist) === false) {
@@ -849,24 +850,36 @@ class OC_App {
 
 				if(isset($info['shipped']) and ($info['shipped'] == 'true')) {
 					$info['internal'] = true;
-					$info['internallabel'] = 'Internal App';
-					$info['internalclass'] = '';
+					$info['internallabel'] = $l->t('Recommended');
+					$info['internalclass'] = 'recommendedapp';
 					$info['removable'] = false;
 				} else {
 					$info['internal'] = false;
-					$info['internallabel'] = '3rd Party';
-					$info['internalclass'] = 'externalapp';
 					$info['removable'] = true;
 				}
 
 				$info['update'] = OC_Installer::isUpdateAvailable($app);
 
-				$info['preview'] = OC_Helper::imagePath('settings', 'trans.png');
+				$appIcon = self::getAppPath($app) . '/img/' . $app.'.svg';
+				if (file_exists($appIcon)) {
+					$info['preview'] = OC_Helper::imagePath($app, $app.'.svg');
+					$info['previewAsIcon'] = true;
+				} else {
+					$appIcon = self::getAppPath($app) . '/img/app.svg';
+					if (file_exists($appIcon)) {
+						$info['preview'] = OC_Helper::imagePath($app, 'app.svg');
+						$info['previewAsIcon'] = true;
+					}
+				}
 				$info['version'] = OC_App::getAppVersion($app);
 				$appList[] = $info;
 			}
 		}
-		$remoteApps = OC_App::getAppstoreApps();
+		if ($onlyLocal) {
+			$remoteApps = array();
+		} else {
+			$remoteApps = OC_App::getAppstoreApps();
+		}
 		if ($remoteApps) {
 			// Remove duplicates
 			foreach ($appList as $app) {
@@ -898,9 +911,11 @@ class OC_App {
 			}
 
 			// priority 3: recommended
-			if ($a['internalclass'] != $b['internalclass']) {
-				$aTemp = ($a['internalclass'] == 'recommendedapp' ? 1 : 0);
-				$bTemp = ($b['internalclass'] == 'recommendedapp' ? 1 : 0);
+			$internalClassA = isset($a['internalclass']) ? $a['internalclass'] : '';
+			$internalClassB = isset($b['internalclass']) ? $b['internalclass'] : '';
+			if ($internalClassA != $internalClassB) {
+				$aTemp = ($internalClassA == 'recommendedapp' ? 1 : 0);
+				$bTemp = ($internalClassB == 'recommendedapp' ? 1 : 0);
 				return ($bTemp - $aTemp);
 			}
 
@@ -917,63 +932,40 @@ class OC_App {
 	 * @return array, multi-dimensional array of apps.
 	 *     Keys: id, name, type, typename, personid, license, detailpage, preview, changed, description
 	 */
-	public static function getAppstoreApps($filter = 'approved') {
-		$categoryNames = OC_OCSClient::getCategories();
-		if (is_array($categoryNames)) {
-			// Check that categories of apps were retrieved correctly
-			if (!$categories = array_keys($categoryNames)) {
+	public static function getAppstoreApps($filter = 'approved', $category = null) {
+		$categories = array($category);
+		if (is_null($category)) {
+			$categoryNames = OC_OCSClient::getCategories();
+			if (is_array($categoryNames)) {
+				// Check that categories of apps were retrieved correctly
+				if (!$categories = array_keys($categoryNames)) {
+					return false;
+				}
+			} else {
 				return false;
 			}
+		}
 
-			$page = 0;
-			$remoteApps = OC_OCSClient::getApplications($categories, $page, $filter);
-			$app1 = array();
-			$i = 0;
-			foreach ($remoteApps as $app) {
-				$app1[$i] = $app;
-				$app1[$i]['author'] = $app['personid'];
-				$app1[$i]['ocs_id'] = $app['id'];
-				$app1[$i]['internal'] = $app1[$i]['active'] = 0;
-				$app1[$i]['update'] = false;
-				$app1[$i]['groups'] = false;
-				$app1[$i]['removable'] = false;
-				if ($app['label'] == 'recommended') {
-					$app1[$i]['internallabel'] = 'Recommended';
-					$app1[$i]['internalclass'] = 'recommendedapp';
-				} else {
-					$app1[$i]['internallabel'] = '3rd Party';
-					$app1[$i]['internalclass'] = 'externalapp';
-				}
-
-
-				// rating img
-				if ($app['score'] < 5) {
-					$img = OC_Helper::imagePath( "core", "rating/s1.png" );
-				} elseif ($app['score'] < 15) {
-					$img = OC_Helper::imagePath( "core", "rating/s2.png" );
-				} elseif($app['score'] < 25) {
-					$img = OC_Helper::imagePath( "core", "rating/s3.png" );
-				} elseif($app['score'] < 35) {
-					$img = OC_Helper::imagePath( "core", "rating/s4.png" );
-				} elseif($app['score'] < 45) {
-					$img = OC_Helper::imagePath( "core", "rating/s5.png" );
-				} elseif($app['score'] < 55) {
-					$img = OC_Helper::imagePath( "core", "rating/s6.png" );
-				} elseif($app['score'] < 65) {
-					$img = OC_Helper::imagePath( "core", "rating/s7.png" );
-				} elseif($app['score'] < 75) {
-					$img = OC_Helper::imagePath( "core", "rating/s8.png" );
-				} elseif($app['score'] < 85) {
-					$img = OC_Helper::imagePath( "core", "rating/s9.png" );
-				} elseif($app['score'] < 95) {
-					$img = OC_Helper::imagePath( "core", "rating/s10.png" );
-				} elseif($app['score'] < 100) {
-					$img = OC_Helper::imagePath( "core", "rating/s11.png" );
-				}
-
-				$app1[$i]['score'] = '<img src="' . $img . '"> Score: ' . $app['score'] . '%';
-				$i++;
+		$page = 0;
+		$remoteApps = OC_OCSClient::getApplications($categories, $page, $filter);
+		$app1 = array();
+		$i = 0;
+		$l = \OC::$server->getL10N('core');
+		foreach ($remoteApps as $app) {
+			$app1[$i] = $app;
+			$app1[$i]['author'] = $app['personid'];
+			$app1[$i]['ocs_id'] = $app['id'];
+			$app1[$i]['internal'] = $app1[$i]['active'] = 0;
+			$app1[$i]['update'] = false;
+			$app1[$i]['groups'] = false;
+			$app1[$i]['score'] = $app['score'];
+			$app1[$i]['removable'] = false;
+			if ($app['label'] == 'recommended') {
+				$app1[$i]['internallabel'] = $l->t('Recommended');
+				$app1[$i]['internalclass'] = 'recommendedapp';
 			}
+
+			$i++;
 		}
 
 		if (empty($app1)) {
diff --git a/lib/private/installer.php b/lib/private/installer.php
index 02e2190aaf2..cd1d8ce392f 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -201,11 +201,10 @@ class OC_Installer{
 	/**
 	 * update an app by it's id
 	 * @param integer $ocsid
-	 * @param bool $isShipped
 	 * @return bool
 	 * @throws Exception
 	 */
-	public static function updateAppByOCSId($ocsid, $isShipped=false) {
+	public static function updateAppByOCSId($ocsid) {
 		$appdata = OC_OCSClient::getApplication($ocsid);
 		$download = OC_OCSClient::getApplicationDownload($ocsid, 1);
 
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index dc147dea0c9..8ceb43f4c1f 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -142,9 +142,11 @@ class OC_OCSClient{
 			$app['license']=(string)$tmp[$i]->license;
 			$app['detailpage']=(string)$tmp[$i]->detailpage;
 			$app['preview']=(string)$tmp[$i]->smallpreviewpic1;
+			$app['preview-full']=(string)$tmp[$i]->previewpic1;
 			$app['changed']=strtotime($tmp[$i]->changed);
 			$app['description']=(string)$tmp[$i]->description;
 			$app['score']=(string)$tmp[$i]->score;
+			$app['downloads'] = $tmp[$i]->downloads;
 
 			$apps[]=$app;
 		}
diff --git a/settings/ajax/apps/categories.php b/settings/ajax/apps/categories.php
new file mode 100644
index 00000000000..3bde28be99b
--- /dev/null
+++ b/settings/ajax/apps/categories.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+OC_JSON::checkAdminUser();
+
+$l = OC_L10N::get('settings');
+
+$categories = array(
+	array('id' => 0, 'displayName' => (string)$l->t('Enabled') ),
+	array('id' => 1, 'displayName' => (string)$l->t('Not enabled') ),
+);
+
+if(OC_Config::getValue('appstoreenabled', true)) {
+	$categories[] = array('id' => 2, 'displayName' => (string)$l->t('Recommended') );
+	// apps from external repo via OCS
+	$ocs = OC_OCSClient::getCategories();
+	foreach($ocs as $k => $v) {
+		$categories[] = array(
+			'id' => $k,
+			'displayName' => str_replace('ownCloud ', '', $v)
+		);
+	}
+}
+
+OCP\JSON::success($categories);
diff --git a/settings/ajax/apps/index.php b/settings/ajax/apps/index.php
new file mode 100644
index 00000000000..24fba8be312
--- /dev/null
+++ b/settings/ajax/apps/index.php
@@ -0,0 +1,65 @@
+<?php
+/**
+ * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+OC_JSON::checkAdminUser();
+
+$l = OC_L10N::get('settings');
+
+$category = intval($_GET['category']);
+$apps = array();
+
+switch($category) {
+	// installed apps
+	case 0:
+		$apps = \OC_App::listAllApps(true);
+		$apps = array_filter($apps, function($app) {
+			return $app['active'];
+		});
+		break;
+	// not-installed apps
+	case 1:
+		$apps = \OC_App::listAllApps(true);
+		$apps = array_filter($apps, function($app) {
+			return !$app['active'];
+		});
+		break;
+	default:
+		if ($category === 2) {
+			$apps = \OC_App::getAppstoreApps('approved');
+			$apps = array_filter($apps, function($app) {
+				return isset($app['internalclass']) && $app['internalclass'] === 'recommendedapp';
+			});
+		} else {
+			$apps = \OC_App::getAppstoreApps('approved', $category);
+		}
+		if (!$apps) {
+			$apps = array();
+		}
+		usort($apps, function ($a, $b) {
+			$a = (int)$a['score'];
+			$b = (int)$b['score'];
+			if ($a === $b) {
+				return 0;
+			}
+			return ($a > $b) ? -1 : 1;
+		});
+		break;
+}
+
+// fix groups to be an array
+$apps = array_map(function($app){
+	$groups = array();
+	if (is_string($app['groups'])) {
+		$groups = json_decode($app['groups']);
+	}
+	$app['groups'] = $groups;
+	$app['canUnInstall'] = !$app['active'] && $app['removable'];
+	return $app;
+}, $apps);
+
+OCP\JSON::success(array("apps" => $apps));
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
deleted file mode 100644
index aad0690e01c..00000000000
--- a/settings/ajax/apps/ocs.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OC_JSON::checkAdminUser();
-
-$l = \OC::$server->getL10N('settings');
-
-if(OC_Config::getValue('appstoreenabled', true)==false) {
-	OCP\JSON::success(array('type' => 'external', 'data' => array()));
-}
-
-$enabledApps=OC_App::getEnabledApps();
-
-if(is_null($enabledApps)) {
-	OCP\JSON::error(array('data' => array('message' => $l->t('Unable to load list from App Store'))));
-}
-
-$apps=array();
-
-// apps from external repo via OCS
-$categoryNames=OC_OCSClient::getCategories();
-if(is_array($categoryNames)) {
-	$categories=array_keys($categoryNames);
-	$page=0;
-	$filter='approved';
-	$externalApps=OC_OCSClient::getApplications($categories, $page, $filter);
-	foreach($externalApps as $app) {
-		// show only external apps that aren't enabled yet
-		$local=false;
-		foreach($enabledApps as $a) {
-			if($a === $app['name']) {
-				$local=true;
-			}
-		}
-
-		if(!$local) {
-			if($app['preview'] === '') {
-				$pre=OC_Helper::imagePath('settings', 'trans.png');
-			} else {
-				$pre=$app['preview'];
-			}
-			if($app['label'] === 'recommended') {
-				$label='3rd Party';
-			} else {
-				$label='Recommended';
-			}
-			$apps[]=array(
-				'name'=>$app['name'],
-				'id'=>$app['id'],
-				'active'=>false,
-				'description'=>$app['description'],
-				'author'=>$app['personid'],
-				'license'=>$app['license'],
-				'preview'=>$pre,
-				'internal'=>false,
-				'internallabel'=>$label,
-				'update'=>false,
-			);
-		}
-	}
-}
-
-OCP\JSON::success(array('type' => 'external', 'data' => $apps));
diff --git a/settings/ajax/updateapp.php b/settings/ajax/updateapp.php
index 6375a41024a..3e28c65285d 100644
--- a/settings/ajax/updateapp.php
+++ b/settings/ajax/updateapp.php
@@ -12,30 +12,33 @@ if (!array_key_exists('appid', $_POST)) {
 	OCP\JSON::error(array(
 		'message' => 'No AppId given!'
 	));
-	exit;
+	return;
 }
 
 $appId = $_POST['appid'];
 
 if (!is_numeric($appId)) {
-	$appId = OC_Appconfig::getValue($appId, 'ocsid', null);
-	$isShipped = OC_App::isShipped($appId);
-
+	$appId = \OC::$server->getAppConfig()->getValue($appId, 'ocsid', null);
 	if ($appId === null) {
 		OCP\JSON::error(array(
 			'message' => 'No OCS-ID found for app!'
 		));
 		exit;
 	}
-} else {
-	$isShipped = false;
 }
 
 $appId = OC_App::cleanAppId($appId);
 
-\OC_Config::setValue('maintenance', true);
-$result = OC_Installer::updateAppByOCSId($appId, $isShipped);
-\OC_Config::setValue('maintenance', false);
+$config = \OC::$server->getConfig();
+$config->setSystemValue('maintenance', true);
+try {
+	$result = OC_Installer::updateAppByOCSId($appId);
+	$config->setSystemValue('maintenance', false);
+} catch(Exception $ex) {
+	$config->setSystemValue('maintenance', false);
+	OC_JSON::error(array("data" => array( "message" => $ex->getMessage() )));
+	return;
+}
 
 if($result !== false) {
 	OC_JSON::success(array('data' => array('appid' => $appId)));
diff --git a/settings/apps.php b/settings/apps.php
index b725c87b0ab..2d6f3c4c697 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -25,21 +25,14 @@ OC_Util::checkAdminUser();
 \OC::$server->getSession()->close();
 
 // Load the files we need
-OCP\Util::addStyle('settings', 'settings' );
-OCP\Util::addScript('settings', 'settings');
-OCP\Util::addScript('core', 'select2/select2');
-OCP\Util::addStyle('core', 'select2/select2');
-OC_App::setActiveNavigationEntry( "core_apps" );
-
-$combinedApps = OC_App::listAllApps();
+\OCP\Util::addScript('handlebars-v1.3.0');
+\OCP\Util::addScript("settings", "settings");
+\OCP\Util::addStyle("settings", "settings");
+\OCP\Util::addScript('core', 'select2/select2');
+\OCP\Util::addStyle('core', 'select2/select2');
+\OCP\Util::addScript("settings", "apps");
+\OC_App::setActiveNavigationEntry( "core_apps" );
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
-
-$tmpl->assign('apps', $combinedApps);
-
-$appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
-
-$tmpl->assign('appid', $appid);
-
 $tmpl->printPage();
 
diff --git a/settings/css/settings.css b/settings/css/settings.css
index 581904591d0..bc6001ddf8e 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -128,7 +128,11 @@ input.userFilter {width: 200px;}
 .ie8 table.hascontrols{border-collapse:collapse;width: 100%;}
 .ie8 table.hascontrols tbody tr{border-collapse:collapse;border: 1px solid #ddd !important;}
 
+
+
+
 /* APPS */
+
 .appinfo { margin: 1em 40px; }
 #app-navigation {
 	padding-bottom: 0px;
@@ -139,11 +143,62 @@ input.userFilter {width: 200px;}
 #app-navigation.appwarning:hover {
 	background: #fbb;
 }
-small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;}
-small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 3px;}
-small.externalapp.list, small.recommendedapp.list { position: absolute; right: 10px; top: 12px; }
+
+.recommendedapp {
+	font-size: 11px;
+	background-position: left center;
+	padding-left: 18px;
+	vertical-align: top;
+}
 span.version { margin-left:1em; margin-right:1em; color:#555; }
 
+#app-navigation .app-external,
+.app-version,
+.recommendedapp {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	filter: alpha(opacity=50);
+	opacity: .5;
+}
+
+#apps-list {
+	position: relative;
+	height: 100%;
+}
+.section {
+	position: relative;
+}
+.app-image {
+	float: left;
+	padding-right: 10px;
+	width: 80px;
+	height: 80px;
+}
+.app-image img {
+	max-width: 80px;
+	max-height: 80px;
+}
+.app-image-icon img {
+	background-color: #ccc;
+	width: 60px;
+	padding: 10px;
+	border-radius: 3px;
+}
+.app-name,
+.app-version,
+.app-score,
+.recommendedapp {
+	display: inline-block;
+}
+.app-description {
+	clear: both;
+}
+.app-description pre {
+	white-space: pre-line;
+}
+
+#app-category-2 {
+	border-bottom: 1px solid #e8e8e8;
+}
 
 /* Transition to complete width! */
 .app:hover, .app:active { max-width: inherit; }
diff --git a/settings/js/apps-custom.php b/settings/js/apps-custom.php
deleted file mode 100644
index 2b2f256b39f..00000000000
--- a/settings/js/apps-custom.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Lukas Reschke <lukas@statuscode.ch>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Check if admin user
-OC_Util::checkAdminUser();
-
-// Set the content type to JS
-header('Content-type: application/javascript');
-
-// Disallow caching
-header("Cache-Control: no-cache, must-revalidate"); 
-header("Expires: Sat, 26 Jul 1997 05:00:00 GMT"); 
-
-$combinedApps = OC_App::listAllApps();
-
-foreach($combinedApps as $app) {
-	echo("appData_".$app['id']."=".json_encode($app));
-	echo("\n");
-}
-
-echo ("var appid =".json_encode($_GET['appid']).";");
diff --git a/settings/js/apps.js b/settings/js/apps.js
index 22bac1eaf3e..328c57db8ed 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -1,225 +1,235 @@
-/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * Copyright (c) 2012, Thomas Tanghus <thomas@tanghus.net>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
+/* global Handlebars */
+
+Handlebars.registerHelper('score', function() {
+	if(this.score) {
+		var score = Math.round( this.score / 10 );
+		var imageName = 'rating/s' + score + '.png';
+		
+		return new Handlebars.SafeString('<img src="' + OC.imagePath('core', imageName) + '">');
+	}
+	return new Handlebars.SafeString('');
+});
 
 OC.Settings = OC.Settings || {};
 OC.Settings.Apps = OC.Settings.Apps || {
-	setupGroupsSelect: function() {
-		OC.Settings.setupGroupsSelect($('#group_select'), {
+	setupGroupsSelect: function($elements) {
+		OC.Settings.setupGroupsSelect($elements, {
 			placeholder: t('core', 'All')
 		});
 	},
-	loadApp:function(app) {
-		var page = $('#app-content');
-		page.find('p.license').show();
-		page.find('span.name').text(app.name);
-		page.find('small.externalapp').text(app.internallabel);
-		if (app.version) {
-			page.find('span.version').text(app.version);
-		} else {
-			page.find('span.version').text('');
-		}
-		page.find('span.score').html(app.score);
-		page.find('p.description').text(app.description);
-		page.find('img.preview').attr('src', app.preview);
-		if (app.preview && app.preview.length) {
-			page.find('img.preview').show();
-		} else {
-			page.find('img.preview').hide();
-		}
-		page.find('small.externalapp').attr('style', 'visibility:visible');
-		page.find('span.author').text(app.author);
-
-		// FIXME licenses of downloaded apps go into app.licence, licenses of not-downloaded apps into app.license
-		var appLicense = '';
-		if (typeof(app.licence) !== 'undefined') {
-			appLicense = app.licence;
-		} else if (typeof(app.license) !== 'undefined') {
-			appLicense = app.license;
-		}
-		page.find('span.licence').text(appLicense);
-
-		var userDocumentation = false;
-		var adminDocumentation = false;
-		if (typeof(app.documentation) !== 'undefined') {
-			if (typeof(app.documentation.user) !== 'undefined') {
-				userDocumentation = true;
-				page.find('span.userDocumentation').html("<a id='userDocumentation' href='" + app.documentation.user + "'>" + t('settings', 'User Documentation') + "</a>");
-				page.find('p.documentation').show();
-			}
-			else {
-				page.find('span.userDocumentation').empty();
-				userDocumentation = false;
-			}
-			if (typeof(app.documentation.admin) !== 'undefined') {
-				adminDocumentation = true;
-				page.find('span.adminDocumentation').html("<a id='adminDocumentation' href='" + app.documentation.admin + "'>" + t('settings', 'Admin Documentation') + "</a>");
-				page.find('p.documentation').show();
-			}
-			else {
-				page.find('span.adminDocumentation').empty();
-				adminDocumentation = false;
-			}
 
-			if(userDocumentation && adminDocumentation) {
-				page.find('span.comma').remove();
-				page.find('span.userDocumentation').after('<span class="comma">, </span>');
-			}
-			else {
-				page.find('span.comma').remove();
+	State: {
+		currentCategory: null,
+		apps: null
+	},
+
+	loadCategories: function() {
+		var categories = [
+			{displayName: 'Enabled', id: '0'}
+		];
+
+		var source   = $("#categories-template").html();
+		var template = Handlebars.compile(source);
+		var html = template(categories);
+		$('#apps-categories').html(html);
+
+		OC.Settings.Apps.loadCategory(0);
+
+		$.ajax(OC.generateUrl('settings/apps/categories'), {
+			data:{},
+			type:'GET',
+			success:function (jsondata) {
+				var html = template(jsondata);
+				$('#apps-categories').html(html);
+				$('#app-category-' + OC.Settings.Apps.State.currentCategory).addClass('active');
+			},
+			complete: function() {
+				$('#app-navigation').removeClass('icon-loading');
 			}
-		}
-		else {
-			page.find('p.documentation').hide();
-		}
+		});
 
-		if (typeof(app.website) !== 'undefined') {
-			page.find('p.website').show();
-			page.find('a#websitelink').attr('href', app.website);
-		}
+	},
 
-		if (app.update !== false) {
-			page.find('input.update').show();
-			page.find('input.update').data('appid', app.id);
-			page.find('input.update').attr('value',t('settings', 'Update to {appversion}', {appversion:app.update}));
-		} else {
-			page.find('input.update').hide();
+	loadCategory: function(categoryId) {
+		if (OC.Settings.Apps.State.currentCategory === categoryId) {
+			return;
 		}
+		$('#apps-list')
+			.addClass('icon-loading')
+			.html('');
+		$('#app-category-' + OC.Settings.Apps.State.currentCategory).removeClass('active');
+		$('#app-category-' + categoryId).addClass('active');
+		OC.Settings.Apps.State.currentCategory = categoryId;
 
-		if (app.removable !== false && app.active === false) {
-			page.find('a.uninstall').show();
-			page.find('a.uninstall').data('appid', app.id);
-			page.find('a.uninstall').attr('value', t('settings', 'Uninstall App'));
-		} else {
-			page.find('a.uninstall').hide();
+		$.ajax(OC.generateUrl('settings/apps/list?category={categoryId}', {
+			categoryId: categoryId
+		}), {
+			data:{},
+			type:'GET',
+			success:function (apps) {
+				OC.Settings.Apps.State.apps = _.indexBy(apps.apps, 'id');
+				var source   = $("#app-template").html();
+				var template = Handlebars.compile(source);
+
+				_.each(apps.apps, function(app) {
+					OC.Settings.Apps.renderApp(app, template, null);
+				});
+			},
+			complete: function() {
+				$('#apps-list').removeClass('icon-loading');
+			}
+		});
+	},
+
+	renderApp: function(app, template, selector) {
+		if (!template) {
+			var source   = $("#app-template").html();
+			template = Handlebars.compile(source);
+		}
+		if (typeof app === 'string') {
+			app = OC.Settings.Apps.State.apps[app];
 		}
 
-		page.find('input.enable').show();
-		page.find('input.enable').val((app.active) ? t('settings', 'Disable') : t('settings', 'Enable'));
-		page.find('input.enable').data('appid', app.id);
-		page.find('input.enable').data('active', app.active);
-		if (app.internal === false) {
-			page.find('span.score').show();
-			page.find('p.appstore').show();
-			page.find('a#appstorelink').attr('href', 'http://apps.owncloud.com/content/show.php?content=' + app.id);
-			page.find('small.externalapp').hide();
+		var html = template(app);
+		if (selector) {
+			selector.html(html);
 		} else {
-			page.find('p.appslink').hide();
-			page.find('span.score').hide();
+			$('#apps-list').append(html);
 		}
-		if (typeof($('#app-navigation ul li[data-id="'+app.id+'"]').data('errormsg')) !== "undefined") {
-			page.find(".warning").show();
-			page.find(".warning").text($('#app-navigation ul li[data-id="'+app.id+'"]').data('errormsg'));
-		} else {
-			page.find(".warning").hide();
+
+		var page = $('#app-' + app.id);
+
+		// image loading kung-fu
+		if (app.preview) {
+			var currentImage = new Image();
+			currentImage.src = app.preview;
+
+			currentImage.onload = function() {
+				page.find('.app-image')
+					.append(this)
+					.fadeIn();
+			};
 		}
 
+		// set group select properly
 		if(OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||
 			OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) {
-			page.find("#groups_enable").hide();
-			page.find("label[for='groups_enable']").hide();
-			page.find("#groups_enable").attr('checked', null);
+			page.find(".groups-enable").hide();
+			page.find("label[for='groups_enable-"+app.id+"']").hide();
+			page.find(".groups-enable").attr('checked', null);
 		} else {
+			page.find('#group_select').val((app.groups || []).join(','));
 			if (app.active) {
 				if (app.groups.length) {
-					OC.Settings.Apps.setupGroupsSelect();
-					$('#group_select').select2('val', app.groups || []);
-					page.find("#groups_enable").attr('checked','checked');
+					OC.Settings.Apps.setupGroupsSelect(page.find('#group_select'));
+					page.find(".groups-enable").attr('checked','checked');
 				} else {
-					page.find("#groups_enable").attr('checked', null);
+					page.find(".groups-enable").attr('checked', null);
 				}
-				page.find("#groups_enable").show();
-				page.find("label[for='groups_enable']").show();
+				page.find(".groups-enable").show();
+				page.find("label[for='groups_enable-"+app.id+"']").show();
 			} else {
-				page.find("#groups_enable").hide();
-				page.find("label[for='groups_enable']").hide();
+				page.find(".groups-enable").hide();
+				page.find("label[for='groups_enable-"+app.id+"']").hide();
 			}
 		}
 	},
-	enableApp:function(appid, active, element, groups) {
+
+	isType: function(app, type){
+		return app.types && app.types.indexOf(type) !== -1;
+	},
+
+	enableApp:function(appId, active, element, groups) {
+		OC.Settings.Apps.hideErrorMessage(appId);
 		groups = groups || [];
-		var appitem=$('#app-navigation ul li[data-id="'+appid+'"]');
+		var appItem = $('div#app-'+appId+'');
 		element.val(t('settings','Please wait....'));
 		if(active && !groups.length) {
-			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) {
+			$.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appId},function(result) {
 				if(!result || result.status !== 'success') {
 					if (result.data && result.data.message) {
-						OC.Settings.Apps.showErrorMessage(result.data.message);
-						appitem.data('errormsg', result.data.message);
+						OC.Settings.Apps.showErrorMessage(appId, result.data.message);
+						appItem.data('errormsg', result.data.message);
 					} else {
-						OC.Settings.Apps.showErrorMessage(t('settings', 'Error while disabling app'));
-						appitem.data('errormsg', t('settings', 'Error while disabling app'));
+						OC.Settings.Apps.showErrorMessage(appId, t('settings', 'Error while disabling app'));
+						appItem.data('errormsg', t('settings', 'Error while disabling app'));
 					}
 					element.val(t('settings','Disable'));
-					appitem.addClass('appwarning');
-				}
-				else {
-					appitem.data('active',false);
-					appitem.data('groups', '');
+					appItem.addClass('appwarning');
+				} else {
+					appItem.data('active',false);
+					appItem.data('groups', '');
 					element.data('active',false);
-					OC.Settings.Apps.removeNavigation(appid);
-					appitem.removeClass('active');
+					OC.Settings.Apps.removeNavigation(appId);
+					appItem.removeClass('active');
 					element.val(t('settings','Enable'));
-					element.parent().find("#groups_enable").hide();
-					element.parent().find("label[for='groups_enable']").hide();
-					var app = OC.get('appData_' + appid);
-					app.active = false;
+					element.parent().find(".groups-enable").hide();
+					element.parent().find("#groups_enable-"+appId).hide();
+					element.parent().find("label[for='groups_enable-"+appId+"']").hide();
+					element.parent().find('#group_select').hide().val(null);
+					OC.Settings.Apps.State.apps[appId].active = false;
 				}
 			},'json');
 		} else {
-			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid: appid, groups: groups},function(result) {
+			$.post(OC.filePath('settings','ajax','enableapp.php'),{appid: appId, groups: groups},function(result) {
 				if(!result || result.status !== 'success') {
 					if (result.data && result.data.message) {
-						OC.Settings.Apps.showErrorMessage(result.data.message);
-						appitem.data('errormsg', result.data.message);
+						OC.Settings.Apps.showErrorMessage(appId, result.data.message);
+						appItem.data('errormsg', result.data.message);
 					} else {
-						OC.Settings.Apps.showErrorMessage(t('settings', 'Error while enabling app'));
-						appitem.data('errormsg', t('settings', 'Error while disabling app'));
+						OC.Settings.Apps.showErrorMessage(appId, t('settings', 'Error while enabling app'));
+						appItem.data('errormsg', t('settings', 'Error while disabling app'));
 					}
 					element.val(t('settings','Enable'));
-					appitem.addClass('appwarning');
+					appItem.addClass('appwarning');
 				} else {
-					OC.Settings.Apps.addNavigation(appid);
-					appitem.data('active',true);
+					OC.Settings.Apps.addNavigation(appId);
+					appItem.data('active',true);
 					element.data('active',true);
-					appitem.addClass('active');
+					appItem.addClass('active');
 					element.val(t('settings','Disable'));
-					var app = OC.get('appData_' + appid);
+					var app = OC.Settings.Apps.State.apps[appId];
 					app.active = true;
+
 					if (OC.Settings.Apps.isType(app, 'filesystem') || OC.Settings.Apps.isType(app, 'prelogin') ||
 						OC.Settings.Apps.isType(app, 'authentication') || OC.Settings.Apps.isType(app, 'logging')) {
-						element.parent().find("#groups_enable").hide();
-						element.parent().find("label[for='groups_enable']").hide();
+						element.parent().find(".groups-enable").attr('checked', null);
+						element.parent().find("#groups_enable-"+appId).hide();
+						element.parent().find("label[for='groups_enable-"+appId+"']").hide();
+						element.parent().find(".groups-enable").hide();
+						element.parent().find("#groups_enable-"+appId).hide();
+						element.parent().find("label[for='groups_enable-"+appId+"']").hide();
+						element.parent().find('#group_select').hide().val(null);
 					} else {
-						element.parent().find("#groups_enable").show();
-						element.parent().find("label[for='groups_enable']").show();
+						element.parent().find("#groups_enable-"+appId).show();
+						element.parent().find("label[for='groups_enable-"+appId+"']").show();
 						if (groups) {
-							appitem.data('groups', JSON.stringify(groups));
+							appItem.data('groups', JSON.stringify(groups));
 						} else {
-							appitem.data('groups', '');
+							appItem.data('groups', '');
 						}
 					}
 				}
 			},'json')
-			.fail(function() {
-				OC.Settings.Apps.showErrorMessage(t('settings', 'Error while enabling app'));
-				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'));
-			});
+				.fail(function() {
+					OC.Settings.Apps.showErrorMessage(appId, t('settings', 'Error while enabling app'));
+					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'));
+				});
 		}
 	},
-	updateApp:function(appid, element) {
+
+	updateApp:function(appId, element) {
+		var oldButtonText = element.val();
 		element.val(t('settings','Updating....'));
-		$.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appid},function(result) {
+		OC.Settings.Apps.hideErrorMessage(appId);
+		$.post(OC.filePath('settings','ajax','updateapp.php'),{appid:appId},function(result) {
 			if(!result || result.status !== 'success') {
-				OC.Settings.Apps.showErrorMessage(t('settings','Error while updating app'),t('settings','Error'));
-				element.val(t('settings','Update'));
+				OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while updating app'));
+				element.val(oldButtonText);
 			}
 			else {
 				element.val(t('settings','Updated'));
@@ -227,42 +237,25 @@ OC.Settings.Apps = OC.Settings.Apps || {
 			}
 		},'json');
 	},
-	uninstallApp:function(appid, element) {
+
+	uninstallApp:function(appId, element) {
+		OC.Settings.Apps.hideErrorMessage(appId);
 		element.val(t('settings','Uninstalling ....'));
-		$.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appid},function(result) {
+		$.post(OC.filePath('settings','ajax','uninstallapp.php'),{appid:appId},function(result) {
 			if(!result || result.status !== 'success') {
-				OC.Settings.Apps.showErrorMessage(t('settings','Error while uninstalling app'),t('settings','Error'));
+				OC.Settings.Apps.showErrorMessage(appId, t('settings','Error while uninstalling app'));
 				element.val(t('settings','Uninstall'));
 			} else {
-				OC.Settings.Apps.removeNavigation(appid);
-				var appItem = $('#app-navigation li').filterAttr('data-id', appid);
-				appItem.removeClass('active');
+				OC.Settings.Apps.removeNavigation(appId);
+				element.parent().fadeOut(function() {
+					element.remove();
+				});
 			}
 		},'json');
 	},
 
-	insertApp:function(appdata) {
-		var applist = $('#app-navigation ul li');
-		var app =
-				$('<li data-id="' + appdata.id + '" data-type="external" data-installed="0">'
-				+ '<a class="app externalapp" href="' + OC.filePath('settings', 'apps', 'index.php') + '&appid=' + appdata.id+'">'
-				+ appdata.name+'</a><small class="externalapp list">3rd party</small></li>');
-		app.data('app', appdata);
-		var added = false;
-		applist.each(function() {
-			if(!parseInt($(this).data('installed')) && $(this).find('a').text().toLowerCase() > appdata.name.toLowerCase()) {
-				$(this).before(app);
-				added = true;
-				return false; // dang, remember this to get out of loop
-			}
-		});
-		if(!added) {
-			applist.last().after(app);
-		}
-		return app;
-	},
-	removeNavigation: function(appid){
-		$.getJSON(OC.filePath('settings', 'ajax', 'navigationdetect.php'), {app: appid}).done(function(response){
+	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++){
@@ -310,107 +303,87 @@ OC.Settings.Apps = OC.Settings.Apps || {
 							.animate({opacity: 1})
 							.animate({opacity: 0.75});
 
-						if (!SVGSupport() && entry.icon.match(/\.svg$/i)) {
+						if (!OC.Util.hasSVGSupport() && entry.icon.match(/\.svg$/i)) {
 							$(img).addClass('svg');
-							replaceSVG();
+							OC.Util.replaceSVG();
 						}
 					}
 				}
 			}
 		});
 	},
-	showErrorMessage: function(message) {
-		$('.appinfo .warning').show();
-		$('.appinfo .warning').text(message);
+
+	showErrorMessage: function(appId, message) {
+		$('div#app-'+appId+' .warning')
+			.show()
+			.text(message);
 	},
-	isType: function(app, type){
-		return app.types && app.types.indexOf(type) !== -1;
+
+	hideErrorMessage: function(appId) {
+		$('div#app-'+appId+' .warning')
+			.hide()
+			.text('');
 	}
+
 };
 
-$(document).ready(function(){
-	$('#app-navigation ul li').each(function(index,li){
-		var app = OC.get('appData_'+$(li).data('id'));
-		if (app) {
-			app.groups= $(li).data('groups') || [];
-		}
-		$(li).data('app',app);
-		$(this).find('span.hidden').remove();
-	});
-	$('#app-navigation ul li').keydown(function(event) {
-		if (event.which === 13 || event.which === 32) {
-			$(event.target).click();
-		}
-		return false;
-	});
+$(document).ready(function () {
+	OC.Settings.Apps.loadCategories();
 
-	$(document).on('click', '#app-navigation', function(event){
-		var tgt = $(event.target);
-		if (tgt.is('li') || tgt.is('a')) {
-			var item = tgt.is('li') ? $(tgt) : $(tgt).parent();
-			var app = item.data('app');
-			OC.Settings.Apps.loadApp(app);
-			$('#app-navigation .selected').removeClass('selected');
-			item.addClass('selected');
-		}
-		return false;
+	$(document).on('click', 'ul#apps-categories li', function () {
+		var categoryId = $(this).data('categoryId');
+		OC.Settings.Apps.loadCategory(categoryId);
 	});
-	$('#app-content input.enable').click(function(){
+
+	$(document).on('click', '#apps-list input.enable', function () {
+		var appId = $(this).data('appid');
 		var element = $(this);
-		var appid=$(this).data('appid');
-		var active=$(this).data('active');
-		if(appid) {
-			OC.Settings.Apps.enableApp(appid, active, element);
-		}
+		var active = $(this).data('active');
+
+		OC.Settings.Apps.enableApp(appId, active, element);
 	});
-	$('#app-content input.update').click(function(){
+
+	$(document).on('click', '#apps-list input.uninstall', function () {
+		var appId = $(this).data('appid');
 		var element = $(this);
-		var appid=$(this).data('appid');
-		if(appid) {
-			OC.Settings.Apps.updateApp(appid, element);
-		}
+
+		OC.Settings.Apps.uninstallApp(appId, element);
 	});
-	$('#app-content a.uninstall').click(function(){
+
+	$(document).on('click', '#apps-list input.update', function () {
+		var appId = $(this).data('appid');
 		var element = $(this);
-		var appid=$(this).data('appid');
-		if(appid) {
-			OC.Settings.Apps.uninstallApp(appid, element);
-		}
+
+		OC.Settings.Apps.updateApp(appId, element);
 	});
 
-	$('#group_select').change(function(ev) {
-		var element = $('#app-content input.enable');
-		// getting an array of values from select2
-		var groups = ev.val || [];
-		var appid = element.data('appid');
-		if (appid) {
-			OC.Settings.Apps.enableApp(appid, false, element, groups);
-			var li = $('[data-id="'+appid+'"]');
-			var app = OC.get('appData_' + $(li).data('id'));
-			app.groups = groups;
-			li.data('groups', groups);
-			li.attr('data-groups', JSON.stringify(groups));
+	$(document).on('change', '#group_select', function() {
+		var element = $(this).parent().find('input.enable');
+		var groups = $(this).val();
+		if (groups && groups !== '') {
+			groups = groups.split(',');
+		} else {
+			groups = [];
 		}
-	});
 
-	if(appid) {
-		var item = $('#app-navigation ul li[data-id="'+appid+'"]');
-		if(item) {
-			item.trigger('click');
-			item.addClass('active');
-			$('#app-navigation').animate({scrollTop: item.offset().top-70}, 'slow','swing');
+		var appId = element.data('appid');
+		if (appId) {
+			OC.Settings.Apps.enableApp(appId, false, element, groups);
+			OC.Settings.Apps.State.apps[appId].groups = groups;
 		}
-	}
+	});
 
-	$("#groups_enable").change(function() {
-		var $select = $('#group_select');
+	$(document).on('change', ".groups-enable", function() {
+		var $select = $(this).parent().find('#group_select');
 		$select.val('');
+
 		if (this.checked) {
-			OC.Settings.Apps.setupGroupsSelect();
-		}
-		else {
+			OC.Settings.Apps.setupGroupsSelect($select);
+		} else {
 			$select.select2('destroy');
 		}
+
 		$select.change();
 	});
+
 });
diff --git a/settings/js/old-apps.js b/settings/js/old-apps.js
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/settings/routes.php b/settings/routes.php
index 25a8b1da7e0..d942e540360 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -69,10 +69,12 @@ $this->create('settings_cert_post', '/settings/ajax/addRootCertificate')
 $this->create('settings_cert_remove', '/settings/ajax/removeRootCertificate')
 	->actionInclude('settings/ajax/removeRootCertificate.php');
 // apps
-$this->create('settings_ajax_apps_ocs', '/settings/ajax/apps/ocs.php')
-	->actionInclude('settings/ajax/apps/ocs.php');
 $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
 	->actionInclude('settings/ajax/enableapp.php');
+$this->create('settings_ajax_load_app_categories', '/settings/apps/categories')
+	->actionInclude('settings/ajax/apps/categories.php');
+$this->create('settings_ajax_load_apps', '/settings/apps/list')
+	->actionInclude('settings/ajax/apps/index.php');
 $this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php')
 	->actionInclude('settings/ajax/disableapp.php');
 $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
@@ -81,8 +83,6 @@ $this->create('settings_ajax_uninstallapp', '/settings/ajax/uninstallapp.php')
 	->actionInclude('settings/ajax/uninstallapp.php');
 $this->create('settings_ajax_navigationdetect', '/settings/ajax/navigationdetect.php')
 	->actionInclude('settings/ajax/navigationdetect.php');
-$this->create('apps_custom', '/settings/js/apps-custom.js')
-	->actionInclude('settings/js/apps-custom.php');
 // admin
 $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
 	->actionInclude('settings/ajax/getlog.php');
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 5199d3fd7c7..1ad37000f39 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -1,65 +1,82 @@
-<?php /**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */?>
- <script type="text/javascript"
-	src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script>
- <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script>
+<script id="categories-template" type="text/x-handlebars-template">
+{{#each this}}
+	<li id="app-category-{{id}}" data-category-id="{{id}}"><a>{{displayName}}</a></li>
+{{/each}}
 
-<div id="app-navigation">
-	<ul class="applist">
-		<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
-		<li>
-			<a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a>
-		</li>
-		<?php endif; ?>
+<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
+	<li>
+		<a class="app-external" target="_blank" href="http://apps.owncloud.com/?xsortmode=high"><?php p($l->t('More apps'));?> …</a>
+	</li>
+	<li>
+		<a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your app'));?> …</a>
+	</li>
+<?php endif; ?>
+</script>
 
-		<?php foreach($_['apps'] as $app):?>
-		<li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>" data-groups="<?php p($app['groups']) ?>"
-			<?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?>
-				data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1">
-			<a class="app<?php if(!$app['internal']) p(' externalapp') ?>"
-				href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a>
-			<?php  if(!$app['internal'])
-				print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?>
-		</li>
-		<?php endforeach;?>
-
-		<?php if(OC_Config::getValue('appstoreenabled', true) === true): ?>
-		<li>
-			<a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a>
-		</li>
-		<?php endif; ?>
-	</ul>
-</div>
-<div id="app-content">
-	<div class="appinfo">
-	<h3><strong><span class="name"><?php p($l->t('Select an App'));?></span></strong><span
-		class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3>
-	<span class="score"></span>
-	<p class="description"></p>
-	<p class="documentation hidden">
+<script id="app-template" type="text/x-handlebars">
+	<div class="section" id="app-{{id}}">
+	{{#if preview}}
+	<div class="app-image{{#if previewAsIcon}} app-image-icon{{/if}} hidden">
+	</div>
+	{{/if}}
+	<h2 class="app-name"><a href="{{detailpage}}" target="_blank">{{name}}</a></h2>
+	<div class="app-version"> {{version}}</div>
+	<div class="app-author"><?php p($l->t('by')); ?> {{author}}
+		{{#if license}}
+		({{license}}-<?php p($l->t('licensed')); ?>)
+		{{/if}}
+	</div>
+	{{#if score}}
+	<div class="app-score">{{{score}}}</div>
+	{{/if}}
+	{{#if internalclass}}
+	<div class="{{internalclass}} icon-checkmark">{{internallabel}}</div>
+	{{/if}}
+	<div class="app-detailpage"></div>
+	<div class="app-description"><pre>{{description}}</pre></div>
+	<!--<div class="app-changed">{{changed}}</div>-->
+	{{#if documentation}}
+	<p class="documentation">
 		<?php p($l->t("Documentation:"));?>
-		<span class="userDocumentation appslink"></span>
-		<span class="adminDocumentation appslink"></span>
+		{{#if documentation.user}}
+		<span class="userDocumentation appslink">
+		<a id='userDocumentation' href='{{documentation.user}}' target="_blank"><?php p($l->t("User Documentation"));?></a>
+		</span>
+		{{/if}}
+
+		{{#if documentation.admin}}
+		<span class="adminDocumentation appslink">
+		<a id='adminDocumentation' href='{{documentation.admin}}' target="_blank"><?php p($l->t("Admin Documentation"));?></a>
+		</span>
+		{{/if}}
 	</p>
-	<img src="" class="preview hidden" />
-	<p class="appslink appstore hidden"><a id="appstorelink" href="#" target="_blank"><?php
-		p($l->t('See application page at apps.owncloud.com'));?></a></p>
-	<p class="appslink website hidden"><a id="websitelink" href="#" target="_blank"><?php
-		p($l->t('See application website'));?></a></p>
-	<p class="license hidden"><?php
-		print_unescaped($l->t('<span class="licence"></span>-licensed by <span class="author"></span>'));?></p>
-	<input class="enable hidden" type="submit" />
-	<input class="update hidden" type="submit" value="<?php p($l->t('Update')); ?>" />
-	<a class="uninstall hidden" href="#"><?php p($l->t('Uninstall')); ?></a>
-	<br />
-	<input class="hidden" type="checkbox" id="groups_enable"/>
-	<label class="hidden" for="groups_enable"><?php p($l->t('Enable only for specific groups')); ?></label>
+	{{/if}}
+	{{#if update}}
+	<input class="update" type="submit" value="<?php p($l->t('Update to %s', array('{{update}}'))); ?>" data-appid="{{id}}" />
+	{{/if}}
+	{{#if active}}
+	<input class="enable" type="submit" data-appid="{{id}}" data-active="true" value="<?php p($l->t("Disable"));?>"/>
+	<input type="checkbox" class="groups-enable" id="groups_enable-{{id}}"/>
+	<label for="groups_enable-{{id}}"><?php p($l->t('Enable only for specific groups')); ?></label>
 	<br />
 	<input type="hidden" id="group_select" title="<?php p($l->t('All')); ?>" style="width: 200px">
+	{{else}}
+	<input class="enable" type="submit" data-appid="{{id}}" data-active="false" value="<?php p($l->t("Enable"));?>"/>
+	{{/if}}
+	{{#if canUnInstall}}
+	<input class="uninstall" type="submit" value="<?php p($l->t('Uninstall App')); ?>" data-appid="{{id}}" />
+	{{/if}}
 
 	<div class="warning hidden"></div>
+
 	</div>
+</script>
+
+<div id="app-navigation" class="icon-loading">
+	<ul id="apps-categories">
+
+	</ul>
+</div>
+<div id="app-content">
+	<div id="apps-list" class="icon-loading"></div>
 </div>
-- 
GitLab


From da27797e8d99931a299d1a8811d43d30053c69f6 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Wed, 15 Oct 2014 15:24:03 +0200
Subject: [PATCH 114/616] Even better - usage of this.$container instead of
 this.$el.parent()

---
 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 2fbaf71c120..ca2ce1a1831 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -51,7 +51,7 @@
 
 		// number of files per page, calculated dynamically
 		pageSize: function() {
-			return Math.ceil(this.$el.parent().height() / 50);
+			return Math.ceil(this.$container.height() / 50);
 		},
 
 		/**
-- 
GitLab


From c27fd94ec806d5b4c3e3328e1e57e668e5d7f46c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 15 Oct 2014 16:59:28 +0200
Subject: [PATCH 115/616] in cli mode return true for isHtaccessWorking

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

diff --git a/lib/private/util.php b/lib/private/util.php
index 304db827a1a..c0a68c56223 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -986,7 +986,7 @@ class OC_Util {
 	 * file in the data directory and trying to access via http
 	 */
 	public static function isHtaccessWorking() {
-		if (!OC::$server->getConfig()->getSystemValue('check_for_working_htaccess', true)) {
+		if (\OC::$CLI || !OC::$server->getConfig()->getSystemValue('check_for_working_htaccess', true)) {
 			return true;
 		}
 
-- 
GitLab


From b7db454ffffe88e59cc1f2a553b91fa8fae44041 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 15 Oct 2014 17:28:18 +0200
Subject: [PATCH 116/616] remove debug output

---
 apps/user_ldap/js/settings.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 25b39ae71f0..1627528200f 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -782,7 +782,6 @@ var LdapWizard = {
 				if(LdapWizard.saveProcesses === 0) {
 					$('#ldap .ldap_saving').addClass('hidden');
 					$('#ldap *').removeClass('save-cursor');
-					console.log($('#ldap *').css('cursor'));
 				}
 				if(result.status === 'success') {
 					LdapWizard.processChanges(object);
-- 
GitLab


From c714e9bf02f58130005babf66d56f5e34e084187 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 15 Oct 2014 17:44:41 +0200
Subject: [PATCH 117/616] rephrase xp'ed user mode label

---
 apps/user_ldap/templates/part.wizard-server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index b829c775ad0..2952062c2f9 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -71,7 +71,7 @@
 
 			<div class="tablerow left">
 				<label for="ldap_experienced_admin" class="tablecell">
-					<?php p($l->t('I am familiar with LDAP?'));?>
+					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?>
 				</label>
 
 				<input type="checkbox" id="ldap_experienced_admin" value="1"
-- 
GitLab


From 63145f57654447fd07659f8a0ec1f98bf59a4d34 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Wed, 15 Oct 2014 19:17:21 +0200
Subject: [PATCH 118/616] Typo

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

diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index e3cff352803..850977ed467 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -120,7 +120,7 @@ describe('OCA.Files.FileList tests', function() {
 			size: 250,
 			etag: '456'
 		}];
-		pageSizeStub = sinon.stub(OCA.File.FileList.prototype, 'pageSize').returns(20);
+		pageSizeStub = sinon.stub(OCA.Files.FileList.prototype, 'pageSize').returns(20);
 		fileList = new OCA.Files.FileList($('#app-content-files'));
 	});
 	afterEach(function() {
-- 
GitLab


From 8198e70f24e2645904471c19f514a4e0408f4d74 Mon Sep 17 00:00:00 2001
From: Nazar Mokrynskyi <nazar@mokrynskyi.com>
Date: Wed, 15 Oct 2014 19:18:35 +0200
Subject: [PATCH 119/616] Changed fileList.pageSize to function call

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

diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 850977ed467..83cf1f428b2 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -815,7 +815,7 @@ describe('OCA.Files.FileList tests', function() {
 			fileList.$fileList.on('fileActionsReady', handler);
 			fileList._nextPage();
 			expect(handler.calledOnce).toEqual(true);
-			expect(handler.getCall(0).args[0].$files.length).toEqual(fileList.pageSize);
+			expect(handler.getCall(0).args[0].$files.length).toEqual(fileList.pageSize());
 		});
 		it('does not trigger "fileActionsReady" event after single add with silent argument', function() {
 			var handler = sinon.stub();
-- 
GitLab


From e4227658d9d80725620ab33b68de5c26c8ed67ad Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 15 Oct 2014 21:59:16 +0200
Subject: [PATCH 120/616] Migrate new app settings to AppFramework

Let's migrate those two new files.
---
 settings/ajax/apps/categories.php             |  30 ----
 settings/ajax/apps/index.php                  |  65 ---------
 settings/application.php                      |  10 +-
 settings/controller/appsettingscontroller.php | 132 ++++++++++++++++++
 settings/routes.php                           |   6 +-
 5 files changed, 143 insertions(+), 100 deletions(-)
 delete mode 100644 settings/ajax/apps/categories.php
 delete mode 100644 settings/ajax/apps/index.php
 create mode 100644 settings/controller/appsettingscontroller.php

diff --git a/settings/ajax/apps/categories.php b/settings/ajax/apps/categories.php
deleted file mode 100644
index 3bde28be99b..00000000000
--- a/settings/ajax/apps/categories.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OC_JSON::checkAdminUser();
-
-$l = OC_L10N::get('settings');
-
-$categories = array(
-	array('id' => 0, 'displayName' => (string)$l->t('Enabled') ),
-	array('id' => 1, 'displayName' => (string)$l->t('Not enabled') ),
-);
-
-if(OC_Config::getValue('appstoreenabled', true)) {
-	$categories[] = array('id' => 2, 'displayName' => (string)$l->t('Recommended') );
-	// apps from external repo via OCS
-	$ocs = OC_OCSClient::getCategories();
-	foreach($ocs as $k => $v) {
-		$categories[] = array(
-			'id' => $k,
-			'displayName' => str_replace('ownCloud ', '', $v)
-		);
-	}
-}
-
-OCP\JSON::success($categories);
diff --git a/settings/ajax/apps/index.php b/settings/ajax/apps/index.php
deleted file mode 100644
index 24fba8be312..00000000000
--- a/settings/ajax/apps/index.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-OC_JSON::checkAdminUser();
-
-$l = OC_L10N::get('settings');
-
-$category = intval($_GET['category']);
-$apps = array();
-
-switch($category) {
-	// installed apps
-	case 0:
-		$apps = \OC_App::listAllApps(true);
-		$apps = array_filter($apps, function($app) {
-			return $app['active'];
-		});
-		break;
-	// not-installed apps
-	case 1:
-		$apps = \OC_App::listAllApps(true);
-		$apps = array_filter($apps, function($app) {
-			return !$app['active'];
-		});
-		break;
-	default:
-		if ($category === 2) {
-			$apps = \OC_App::getAppstoreApps('approved');
-			$apps = array_filter($apps, function($app) {
-				return isset($app['internalclass']) && $app['internalclass'] === 'recommendedapp';
-			});
-		} else {
-			$apps = \OC_App::getAppstoreApps('approved', $category);
-		}
-		if (!$apps) {
-			$apps = array();
-		}
-		usort($apps, function ($a, $b) {
-			$a = (int)$a['score'];
-			$b = (int)$b['score'];
-			if ($a === $b) {
-				return 0;
-			}
-			return ($a > $b) ? -1 : 1;
-		});
-		break;
-}
-
-// fix groups to be an array
-$apps = array_map(function($app){
-	$groups = array();
-	if (is_string($app['groups'])) {
-		$groups = json_decode($app['groups']);
-	}
-	$app['groups'] = $groups;
-	$app['canUnInstall'] = !$app['active'] && $app['removable'];
-	return $app;
-}, $apps);
-
-OCP\JSON::success(array("apps" => $apps));
diff --git a/settings/application.php b/settings/application.php
index b17ca01c2f3..99d78aff2cc 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -11,6 +11,7 @@
 namespace OC\Settings;
 
 use OC\AppFramework\Utility\SimpleContainer;
+use OC\Settings\Controller\AppSettingsController;
 use OC\Settings\Controller\MailSettingsController;
 use \OCP\AppFramework\App;
 use \OCP\Util;
@@ -44,7 +45,14 @@ class Application extends App {
 				$c->query('DefaultMailAddress')
 			);
 		});
-
+		$container->registerService('AppSettingsController', function(SimpleContainer $c) {
+			return new AppSettingsController(
+				$c->query('AppName'),
+				$c->query('Request'),
+				$c->query('L10N'),
+				$c->query('Config')
+			);
+		});
 		/**
 		 * Core class wrappers
 		 */
diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php
new file mode 100644
index 00000000000..27205400aff
--- /dev/null
+++ b/settings/controller/appsettingscontroller.php
@@ -0,0 +1,132 @@
+<?php
+/**
+ * @author Lukas Reschke
+ * @author Thomas Müller
+ * @copyright 2014 Lukas Reschke lukas@owncloud.com, 2014 Thomas Müller deepdiver@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Settings\Controller;
+
+use \OCP\AppFramework\Controller;
+use OCP\IRequest;
+use OCP\IL10N;
+use OCP\IConfig;
+
+/**
+ * @package OC\Settings\Controller
+ */
+class AppSettingsController extends Controller {
+
+	/** @var \OCP\IL10N */
+	private $l10n;
+	/** @var IConfig */
+	private $config;
+
+	/**
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param IL10N $l10n
+	 * @param IConfig $config
+	 */
+	public function __construct($appName,
+								IRequest $request,
+								IL10N $l10n,
+								IConfig $config) {
+		parent::__construct($appName, $request);
+		$this->l10n = $l10n;
+		$this->config = $config;
+	}
+
+	/**
+	 * Get all available categories
+	 * @return array
+	 */
+	public function listCategories() {
+
+		$categories = array(
+			array('id' => 0, 'displayName' => (string)$this->l10n->t('Enabled') ),
+			array('id' => 1, 'displayName' => (string)$this->l10n->t('Not enabled') ),
+		);
+
+		if($this->config->getSystemValue('appstoreenabled', true)) {
+			$categories[] = array('id' => 2, 'displayName' => (string)$this->l10n->t('Recommended') );
+			// apps from external repo via OCS
+			$ocs = \OC_OCSClient::getCategories();
+			foreach($ocs as $k => $v) {
+				$categories[] = array(
+					'id' => $k,
+					'displayName' => str_replace('ownCloud ', '', $v)
+				);
+			}
+		}
+
+		$categories['status'] = 'success';
+
+		return $categories;
+	}
+
+	/**
+	 * Get all available categories
+	 * @param int $category
+	 * @return array
+	 */
+	public function listApps($category = 0) {
+		$apps = array();
+
+		switch($category) {
+			// installed apps
+			case 0:
+				$apps = \OC_App::listAllApps(true);
+				$apps = array_filter($apps, function($app) {
+					return $app['active'];
+				});
+				break;
+			// not-installed apps
+			case 1:
+				$apps = \OC_App::listAllApps(true);
+				$apps = array_filter($apps, function($app) {
+					return !$app['active'];
+				});
+				break;
+			default:
+				if ($category === 2) {
+					$apps = \OC_App::getAppstoreApps('approved');
+					$apps = array_filter($apps, function($app) {
+						return isset($app['internalclass']) && $app['internalclass'] === 'recommendedapp';
+					});
+				} else {
+					$apps = \OC_App::getAppstoreApps('approved', $category);
+				}
+				if (!$apps) {
+					$apps = array();
+				}
+				usort($apps, function ($a, $b) {
+					$a = (int)$a['score'];
+					$b = (int)$b['score'];
+					if ($a === $b) {
+						return 0;
+					}
+					return ($a > $b) ? -1 : 1;
+				});
+				break;
+		}
+
+		// fix groups to be an array
+		$apps = array_map(function($app){
+			$groups = array();
+			if (is_string($app['groups'])) {
+				$groups = json_decode($app['groups']);
+			}
+			$app['groups'] = $groups;
+			$app['canUnInstall'] = !$app['active'] && $app['removable'];
+			return $app;
+		}, $apps);
+
+		return array('apps' => $apps, 'status' => 'success');
+	}
+
+}
diff --git a/settings/routes.php b/settings/routes.php
index b91b085f3a1..82167ea6396 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -13,6 +13,8 @@ $application->registerRoutes($this, array('routes' =>array(
 	array('name' => 'MailSettings#setMailSettings', 'url' => '/settings/admin/mailsettings', 'verb' => 'POST'),
 	array('name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'),
 	array('name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'),
+	array('name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'),
+	array('name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET')
 )));
 
 /** @var $this \OCP\Route\IRouter */
@@ -80,10 +82,6 @@ $this->create('settings_cert_remove', '/settings/ajax/removeRootCertificate')
 // apps
 $this->create('settings_ajax_enableapp', '/settings/ajax/enableapp.php')
 	->actionInclude('settings/ajax/enableapp.php');
-$this->create('settings_ajax_load_app_categories', '/settings/apps/categories')
-	->actionInclude('settings/ajax/apps/categories.php');
-$this->create('settings_ajax_load_apps', '/settings/apps/list')
-	->actionInclude('settings/ajax/apps/index.php');
 $this->create('settings_ajax_disableapp', '/settings/ajax/disableapp.php')
 	->actionInclude('settings/ajax/disableapp.php');
 $this->create('settings_ajax_updateapp', '/settings/ajax/updateapp.php')
-- 
GitLab


From c8d8578d1aac26373060e401cf50e734007c0b1c Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 16 Oct 2014 01:56:30 -0400
Subject: [PATCH 121/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/ru.php   |   6 +
 apps/files_encryption/l10n/sl.php   |   6 +
 l10n/templates/core.pot             |   2 +-
 l10n/templates/files.pot            |   2 +-
 l10n/templates/files_encryption.pot |   2 +-
 l10n/templates/files_external.pot   |   2 +-
 l10n/templates/files_sharing.pot    |   2 +-
 l10n/templates/files_trashbin.pot   |   2 +-
 l10n/templates/files_versions.pot   |   2 +-
 l10n/templates/lib.pot              |  30 +--
 l10n/templates/private.pot          |  30 +--
 l10n/templates/settings.pot         | 332 ++++++++++++++--------------
 l10n/templates/user_ldap.pot        |   2 +-
 l10n/templates/user_webdavauth.pot  |   2 +-
 lib/l10n/sl.php                     |   1 +
 settings/l10n/ar.php                |  32 +--
 settings/l10n/ast.php               |  37 +---
 settings/l10n/az.php                |  31 +--
 settings/l10n/bg_BG.php             |  37 +---
 settings/l10n/bn_BD.php             |  24 +-
 settings/l10n/bn_IN.php             |   1 -
 settings/l10n/ca.php                |  37 +---
 settings/l10n/cs_CZ.php             |  37 +---
 settings/l10n/cy_GB.php             |   5 +-
 settings/l10n/da.php                |  37 +---
 settings/l10n/de.php                |  37 +---
 settings/l10n/de_AT.php             |   1 -
 settings/l10n/de_CH.php             |  21 +-
 settings/l10n/de_DE.php             |  37 +---
 settings/l10n/el.php                |  37 +---
 settings/l10n/en_GB.php             |  37 +---
 settings/l10n/eo.php                |  30 +--
 settings/l10n/es.php                |  37 +---
 settings/l10n/es_AR.php             |  35 +--
 settings/l10n/es_CL.php             |   1 -
 settings/l10n/es_MX.php             |  19 +-
 settings/l10n/et_EE.php             |  37 +---
 settings/l10n/eu.php                |  37 +---
 settings/l10n/fa.php                |  33 +--
 settings/l10n/fi_FI.php             |  37 +---
 settings/l10n/fr.php                |  37 +---
 settings/l10n/gl.php                |  37 +---
 settings/l10n/he.php                |  19 +-
 settings/l10n/hi.php                |   2 -
 settings/l10n/hr.php                |  37 +---
 settings/l10n/hu_HU.php             |  37 +---
 settings/l10n/ia.php                |   8 +-
 settings/l10n/id.php                |  34 +--
 settings/l10n/is.php                |  16 +-
 settings/l10n/it.php                |  37 +---
 settings/l10n/ja.php                |  37 +---
 settings/l10n/ka_GE.php             |  17 +-
 settings/l10n/km.php                |  29 +--
 settings/l10n/ko.php                |  28 +--
 settings/l10n/ku_IQ.php             |   4 +-
 settings/l10n/lb.php                |   8 +-
 settings/l10n/lt_LT.php             |  19 +-
 settings/l10n/lv.php                |  17 +-
 settings/l10n/mk.php                |  31 +--
 settings/l10n/ms_MY.php             |   5 -
 settings/l10n/nb_NO.php             |  37 +---
 settings/l10n/nl.php                |  37 +---
 settings/l10n/nn_NO.php             |  19 +-
 settings/l10n/oc.php                |   6 -
 settings/l10n/pa.php                |   3 +-
 settings/l10n/pl.php                |  37 +---
 settings/l10n/pt_BR.php             |  37 +---
 settings/l10n/pt_PT.php             |  37 +---
 settings/l10n/ro.php                |  28 +--
 settings/l10n/ru.php                |  37 +---
 settings/l10n/si_LK.php             |   7 +-
 settings/l10n/sk_SK.php             |  37 +---
 settings/l10n/sl.php                |  39 ++--
 settings/l10n/sq.php                |  21 +-
 settings/l10n/sr.php                |  17 +-
 settings/l10n/sr@latin.php          |   4 +-
 settings/l10n/sv.php                |  37 +---
 settings/l10n/ta_LK.php             |  10 +-
 settings/l10n/te.php                |   1 -
 settings/l10n/th_TH.php             |  17 +-
 settings/l10n/tr.php                |  37 +---
 settings/l10n/ug.php                |  13 +-
 settings/l10n/uk.php                |  17 +-
 settings/l10n/ur_PK.php             |   3 +-
 settings/l10n/vi.php                |  17 +-
 settings/l10n/zh_CN.php             |  37 +---
 settings/l10n/zh_HK.php             |   6 +-
 settings/l10n/zh_TW.php             |  35 +--
 88 files changed, 776 insertions(+), 1453 deletions(-)

diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
index 16c0f05cc71..0a4e2cbbc27 100644
--- a/apps/files_encryption/l10n/ru.php
+++ b/apps/files_encryption/l10n/ru.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Неизвестная ошибка",
+"Missing recovery key password" => "Отсутствует пароль восстановления ключа",
+"Please repeat the recovery key password" => "Пожалуйста, повторите пароль восстановления ключа",
+"Repeated recovery key password does not match the provided recovery key password" => "Пароль восстановления ключа и его повтор не совпадают",
 "Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
 "Could not disable recovery key. Please check your recovery key password!" => "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
 "Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
+"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." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
 "Private key password successfully updated." => "Пароль секретного ключа успешно обновлён.",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 7c0f438fe4e..83fef18ea0a 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Neznana napaka",
+"Missing recovery key password" => "Manjka ključ za obnovitev",
+"Please repeat the recovery key password" => "Ponovite vpis ključa za obnovitev",
+"Repeated recovery key password does not match the provided recovery key password" => "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa",
 "Recovery key successfully enabled" => "Ključ za obnovitev gesla je uspešno nastavljen",
 "Could not disable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
 "Recovery key successfully disabled" => "Ključ za obnovitev gesla je uspešno onemogočen",
+"Please provide the old recovery password" => "Vpišite star ključ za obnovitev",
+"Please provide a new recovery password" => "Vpišite nov ključ za obnovitev",
+"Please repeat the new recovery password" => "Ponovno vpišite nov ključ za obnovitev",
 "Password successfully changed." => "Geslo je uspešno spremenjeno.",
 "Could not change the password. Maybe the old password was not correct." => "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
 "Private key password successfully updated." => "Zasebni ključ za geslo je uspešno posodobljen.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 56bd81f5ed0..3e78dc82191 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 9db13ceae78..1ea7e4373d5 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index b1e72576274..224bce06504 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index baf301fe311..2255ee24545 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c11029d9613..2167e5aca0e 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 98b003aa9cc..a01bae342af 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 8392ced7028..e964ff4a625 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 93c8a72b0f3..04fb0566568 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -71,14 +71,18 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:1150
+#: private/app.php:853 private/app.php:964
+msgid "Recommended"
+msgstr ""
+
+#: private/app.php:1142
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: private/app.php:1162
+#: private/app.php:1154
 msgid "No app name specified"
 msgstr ""
 
@@ -103,48 +107,48 @@ msgstr ""
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: private/installer.php:235
+#: private/installer.php:234
 msgid "No source specified when installing app"
 msgstr ""
 
-#: private/installer.php:243
+#: private/installer.php:242
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: private/installer.php:248
+#: private/installer.php:247
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: private/installer.php:256
+#: private/installer.php:255
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: private/installer.php:270
+#: private/installer.php:269
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: private/installer.php:308
+#: private/installer.php:307
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: private/installer.php:314
+#: private/installer.php:313
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: private/installer.php:320
+#: private/installer.php:319
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: private/installer.php:326
+#: private/installer.php:325
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: private/installer.php:339
+#: private/installer.php:338
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 827bb1b738b..6e3c68dcf06 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,14 +38,18 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: app.php:1150
+#: app.php:853 app.php:964
+msgid "Recommended"
+msgstr ""
+
+#: app.php:1142
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: app.php:1162
+#: app.php:1154
 msgid "No app name specified"
 msgstr ""
 
@@ -70,48 +74,48 @@ msgstr ""
 msgid "Can't create app folder. Please fix permissions. %s"
 msgstr ""
 
-#: installer.php:235
+#: installer.php:234
 msgid "No source specified when installing app"
 msgstr ""
 
-#: installer.php:243
+#: installer.php:242
 msgid "No href specified when installing app from http"
 msgstr ""
 
-#: installer.php:248
+#: installer.php:247
 msgid "No path specified when installing app from local file"
 msgstr ""
 
-#: installer.php:256
+#: installer.php:255
 #, php-format
 msgid "Archives of type %s are not supported"
 msgstr ""
 
-#: installer.php:270
+#: installer.php:269
 msgid "Failed to open archive when installing app"
 msgstr ""
 
-#: installer.php:308
+#: installer.php:307
 msgid "App does not provide an info.xml file"
 msgstr ""
 
-#: installer.php:314
+#: installer.php:313
 msgid "App can't be installed because of not allowed code in the App"
 msgstr ""
 
-#: installer.php:320
+#: installer.php:319
 msgid ""
 "App can't be installed because it is not compatible with this version of "
 "ownCloud"
 msgstr ""
 
-#: installer.php:326
+#: installer.php:325
 msgid ""
 "App can't be installed because it contains the <shipped>true</shipped> tag "
 "which is not allowed for non shipped apps"
 msgstr ""
 
-#: installer.php:339
+#: installer.php:338
 msgid ""
 "App can't be installed because the version in info.xml/version is not the "
 "same as the version reported from the app store"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c8777ac52ba..88d3e5eed92 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,50 +17,16 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: admin/controller.php:66
-#, php-format
-msgid "Invalid value supplied for %s"
-msgstr ""
-
-#: admin/controller.php:73
-msgid "Saved"
-msgstr ""
-
-#: admin/controller.php:90
-msgid "test email settings"
+#: ajax/apps/categories.php:14
+msgid "Enabled"
 msgstr ""
 
-#: admin/controller.php:91
-msgid "If you received this email, the settings seem to be correct."
-msgstr ""
-
-#: admin/controller.php:94
-msgid ""
-"A problem occurred while sending the e-mail. Please revisit your settings."
-msgstr ""
-
-#: admin/controller.php:99
-msgid "Email sent"
-msgstr ""
-
-#: admin/controller.php:101
-msgid "You need to set your user email before being able to send test emails."
-msgstr ""
-
-#: admin/controller.php:116 templates/admin.php:342
-msgid "Send mode"
-msgstr ""
-
-#: admin/controller.php:118 templates/admin.php:355 templates/personal.php:198
-msgid "Encryption"
-msgstr ""
-
-#: admin/controller.php:120 templates/admin.php:379
-msgid "Authentication method"
+#: ajax/apps/categories.php:15
+msgid "Not enabled"
 msgstr ""
 
-#: ajax/apps/ocs.php:20
-msgid "Unable to load list from App Store"
+#: ajax/apps/categories.php:19
+msgid "Recommended"
 msgstr ""
 
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
@@ -160,7 +126,7 @@ msgstr ""
 msgid "Unable to remove user from group %s"
 msgstr ""
 
-#: ajax/updateapp.php:44
+#: ajax/updateapp.php:47
 msgid "Couldn't update app."
 msgstr ""
 
@@ -192,87 +158,89 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
-#: js/admin.js:6
-msgid "Are you really sure you want add \"{domain}\" as trusted domain?"
+#: controller/mailsettingscontroller.php:103
+#: controller/mailsettingscontroller.php:121
+msgid "Saved"
 msgstr ""
 
-#: js/admin.js:7
-msgid "Add trusted domain"
+#: controller/mailsettingscontroller.php:136
+msgid "test email settings"
 msgstr ""
 
-#: js/admin.js:116
-msgid "Sending..."
+#: controller/mailsettingscontroller.php:137
+msgid "If you received this email, the settings seems to be correct."
 msgstr ""
 
-#: js/apps.js:12 templates/apps.php:61
-msgid "All"
+#: controller/mailsettingscontroller.php:144
+msgid ""
+"A problem occurred while sending the email. Please revise your settings."
 msgstr ""
 
-#: js/apps.js:50 templates/help.php:7
-msgid "User Documentation"
+#: controller/mailsettingscontroller.php:152
+msgid "Email sent"
 msgstr ""
 
-#: js/apps.js:59
-msgid "Admin Documentation"
+#: controller/mailsettingscontroller.php:160
+msgid "You need to set your user email before being able to send test emails."
 msgstr ""
 
-#: js/apps.js:87
-msgid "Update to {appversion}"
+#: js/admin.js:6
+msgid "Are you really sure you want add \"{domain}\" as trusted domain?"
 msgstr ""
 
-#: js/apps.js:95
-msgid "Uninstall App"
+#: js/admin.js:7
+msgid "Add trusted domain"
 msgstr ""
 
-#: js/apps.js:101 js/apps.js:156 js/apps.js:189
-msgid "Disable"
+#: js/admin.js:124
+msgid "Sending..."
 msgstr ""
 
-#: js/apps.js:101 js/apps.js:165 js/apps.js:182 js/apps.js:213
-msgid "Enable"
+#: js/apps.js:17 templates/apps.php:62
+msgid "All"
 msgstr ""
 
-#: js/apps.js:145
+#: js/apps.js:146
 msgid "Please wait...."
 msgstr ""
 
-#: js/apps.js:153 js/apps.js:154 js/apps.js:180
+#: js/apps.js:154 js/apps.js:155 js/apps.js:181
 msgid "Error while disabling app"
 msgstr ""
 
-#: js/apps.js:179 js/apps.js:208 js/apps.js:209
-msgid "Error while enabling app"
+#: js/apps.js:157 js/apps.js:190 templates/apps.php:58
+msgid "Disable"
 msgstr ""
 
-#: js/apps.js:218
-msgid "Updating...."
+#: js/apps.js:165 js/apps.js:183 js/apps.js:220 templates/apps.php:64
+msgid "Enable"
 msgstr ""
 
-#: js/apps.js:221
-msgid "Error while updating app"
+#: js/apps.js:180 js/apps.js:215 js/apps.js:216
+msgid "Error while enabling app"
 msgstr ""
 
-#: js/apps.js:221 js/apps.js:234
-msgid "Error"
+#: js/apps.js:227
+msgid "Updating...."
 msgstr ""
 
-#: js/apps.js:222 templates/apps.php:55
-msgid "Update"
+#: js/apps.js:231
+msgid "Error while updating app"
 msgstr ""
 
-#: js/apps.js:225
+#: js/apps.js:235
 msgid "Updated"
 msgstr ""
 
-#: js/apps.js:231
+#: js/apps.js:243
 msgid "Uninstalling ...."
 msgstr ""
 
-#: js/apps.js:234
+#: js/apps.js:246
 msgid "Error while uninstalling app"
 msgstr ""
 
-#: js/apps.js:235 templates/apps.php:56
+#: js/apps.js:247
 msgid "Uninstall"
 msgstr ""
 
@@ -385,62 +353,62 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
-#: templates/admin.php:12
+#: templates/admin.php:13
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:14
 msgid "Info, warnings, errors and fatal issues"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Warnings, errors and fatal issues"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:16
 msgid "Errors and fatal issues"
 msgstr ""
 
-#: templates/admin.php:16
+#: templates/admin.php:17
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:20 templates/admin.php:27
+#: templates/admin.php:21 templates/admin.php:28
 msgid "None"
 msgstr ""
 
-#: templates/admin.php:21
+#: templates/admin.php:22
 msgid "Login"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:23
 msgid "Plain"
 msgstr ""
 
-#: templates/admin.php:23
+#: templates/admin.php:24
 msgid "NT LAN Manager"
 msgstr ""
 
-#: templates/admin.php:28
+#: templates/admin.php:29
 msgid "SSL"
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:30
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:51 templates/admin.php:65
+#: templates/admin.php:52 templates/admin.php:66
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:55
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server "
 "to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:68
+#: templates/admin.php:69
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -449,91 +417,91 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:79
+#: templates/admin.php:80
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:82
+#: templates/admin.php:83
 msgid ""
 "PHP is apparently setup to strip inline doc blocks. This will make several "
 "core apps inaccessible."
 msgstr ""
 
-#: templates/admin.php:83
+#: templates/admin.php:84
 msgid ""
 "This is probably caused by a cache/accelerator such as Zend OPcache or "
 "eAccelerator."
 msgstr ""
 
-#: templates/admin.php:94
+#: templates/admin.php:95
 msgid "Database Performance Info"
 msgstr ""
 
-#: templates/admin.php:97
+#: templates/admin.php:98
 msgid ""
 "SQLite is used as database. For larger installations we recommend to change "
 "this. To migrate to another database use the command line tool: 'occ db:"
 "convert-type'"
 msgstr ""
 
-#: templates/admin.php:108
+#: templates/admin.php:109
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:111
+#: templates/admin.php:112
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:122
+#: templates/admin.php:123
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:125
+#: templates/admin.php:126
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:136
+#: templates/admin.php:137
 msgid "PHP charset is not set to UTF-8"
 msgstr ""
 
-#: templates/admin.php:139
+#: templates/admin.php:140
 msgid ""
 "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII "
 "characters in file names. We highly recommend to change the value of "
 "'default_charset' php.ini to 'UTF-8'."
 msgstr ""
 
-#: templates/admin.php:150
+#: templates/admin.php:151
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:155
+#: templates/admin.php:156
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:159
+#: templates/admin.php:160
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:163
+#: templates/admin.php:164
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:174
+#: templates/admin.php:175
 msgid "URL generation in notification emails"
 msgstr ""
 
-#: templates/admin.php:177
+#: templates/admin.php:178
 #, php-format
 msgid ""
 "If your installation is not installed in the root of the domain and uses "
@@ -542,198 +510,214 @@ msgid ""
 "to the webroot path of your installation (Suggested: \"%s\")"
 msgstr ""
 
-#: templates/admin.php:185
+#: templates/admin.php:186
 msgid "Connectivity checks"
 msgstr ""
 
-#: templates/admin.php:187
+#: templates/admin.php:188
 msgid "No problems found"
 msgstr ""
 
-#: templates/admin.php:191
+#: templates/admin.php:192
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:201
+#: templates/admin.php:202
 msgid "Cron"
 msgstr ""
 
-#: templates/admin.php:208
+#: templates/admin.php:209
 #, php-format
 msgid "Last cron was executed at %s."
 msgstr ""
 
-#: templates/admin.php:211
+#: templates/admin.php:212
 #, php-format
 msgid ""
 "Last cron was executed at %s. This is more than an hour ago, something seems "
 "wrong."
 msgstr ""
 
-#: templates/admin.php:215
+#: templates/admin.php:216
 msgid "Cron was not executed yet!"
 msgstr ""
 
-#: templates/admin.php:225
+#: templates/admin.php:226
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:233
+#: templates/admin.php:234
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:241
+#: templates/admin.php:242
 msgid "Use system's cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:246
+#: templates/admin.php:247
 msgid "Sharing"
 msgstr ""
 
-#: templates/admin.php:250
+#: templates/admin.php:251
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:255
+#: templates/admin.php:256
 msgid "Allow users to share via link"
 msgstr ""
 
-#: templates/admin.php:261
+#: templates/admin.php:262
 msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:264
+#: templates/admin.php:265
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:268
+#: templates/admin.php:269
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:272
+#: templates/admin.php:273
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:275
+#: templates/admin.php:276
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:278
+#: templates/admin.php:279
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:283
+#: templates/admin.php:284
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:288
+#: templates/admin.php:289
 msgid "Restrict users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:293
+#: templates/admin.php:294
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:298
+#: templates/admin.php:299
 msgid "Exclude groups from sharing"
 msgstr ""
 
-#: templates/admin.php:303
+#: templates/admin.php:304
 msgid ""
 "These groups will still be able to receive shares, but not to initiate them."
 msgstr ""
 
-#: templates/admin.php:308
+#: templates/admin.php:309
 msgid "Security"
 msgstr ""
 
-#: templates/admin.php:319
+#: templates/admin.php:320
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:321
+#: templates/admin.php:322
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:327
+#: templates/admin.php:328
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:337
+#: templates/admin.php:339
 msgid "Email Server"
 msgstr ""
 
-#: templates/admin.php:339
+#: templates/admin.php:341
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:370
+#: templates/admin.php:344
+msgid "Send mode"
+msgstr ""
+
+#: templates/admin.php:357 templates/personal.php:198
+msgid "Encryption"
+msgstr ""
+
+#: templates/admin.php:372
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:371
+#: templates/admin.php:373
 msgid "mail"
 msgstr ""
 
-#: templates/admin.php:392
+#: templates/admin.php:380
+msgid "Authentication method"
+msgstr ""
+
+#: templates/admin.php:393
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:396
+#: templates/admin.php:397
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:400
+#: templates/admin.php:401
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:405
+#: templates/admin.php:407
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:406
+#: templates/admin.php:408
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:409
+#: templates/admin.php:411
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:413
+#: templates/admin.php:412
+msgid "Store credentials"
+msgstr ""
+
+#: templates/admin.php:417
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:414
+#: templates/admin.php:418
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:419
+#: templates/admin.php:423
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:420
+#: templates/admin.php:424
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:452
+#: templates/admin.php:456
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:453
+#: templates/admin.php:457
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:459 templates/personal.php:247
+#: templates/admin.php:463 templates/personal.php:247
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:463 templates/personal.php:250
+#: templates/admin.php:467 templates/personal.php:250
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -742,39 +726,47 @@ msgid ""
 "General Public License\">AGPL</abbr></a>."
 msgstr ""
 
-#: templates/apps.php:14
-msgid "Add your App"
+#: templates/apps.php:8
+msgid "More apps"
+msgstr ""
+
+#: templates/apps.php:11
+msgid "Add your app"
 msgstr ""
 
-#: templates/apps.php:31
-msgid "More Apps"
+#: templates/apps.php:24
+msgid "by"
 msgstr ""
 
-#: templates/apps.php:38
-msgid "Select an App"
+#: templates/apps.php:26
+msgid "licensed"
 msgstr ""
 
-#: templates/apps.php:43
+#: templates/apps.php:40
 msgid "Documentation:"
 msgstr ""
 
-#: templates/apps.php:49
-msgid "See application page at apps.owncloud.com"
+#: templates/apps.php:43 templates/help.php:7
+msgid "User Documentation"
 msgstr ""
 
-#: templates/apps.php:51
-msgid "See application website"
+#: templates/apps.php:49
+msgid "Admin Documentation"
 msgstr ""
 
-#: templates/apps.php:53
-msgid ""
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+#: templates/apps.php:55
+#, php-format
+msgid "Update to %s"
 msgstr ""
 
-#: templates/apps.php:59
+#: templates/apps.php:60
 msgid "Enable only for specific groups"
 msgstr ""
 
+#: templates/apps.php:67
+msgid "Uninstall App"
+msgstr ""
+
 #: templates/help.php:13
 msgid "Administrator Documentation"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index e4c0491d364..7421a8e8092 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 5d6cccfe60e..e776c57e516 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-15 01:54-0400\n"
+"POT-Creation-Date: 2014-10-16 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index af92aac057d..1ae1628fdbd 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -83,6 +83,7 @@ $TRANSLATIONS = array(
 "No database drivers (sqlite, mysql, or postgresql) installed." => "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).",
 "Cannot write into \"config\" directory" => "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!",
 "Cannot write into \"apps\" directory" => "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!",
+"Setting locale to %s failed" => "Nastavljanje jezikovnih določil na %s je spodletelo.",
 "Please ask your server administrator to install the module." => "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
 "PHP module %s not installed." => "Modul PHP %s ni nameščen.",
 "PHP %s or higher is required." => "Zahtevana je različica PHP %s ali višja.",
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index ab69d19317c..93c2ae997f8 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,15 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "ادخال خاطئ لقيمة %s",
-"Saved" => "حفظ",
-"test email settings" => "إعدادات البريد التجريبي",
-"If you received this email, the settings seem to be correct." => "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "حدث خطأ اثناء ارسال البريد الالكتروني ، الرجاء مراجعة اعداداتك",
-"Email sent" => "تم ارسال البريد الالكتروني",
-"Send mode" => "وضعية الإرسال",
-"Encryption" => "التشفير",
-"Authentication method" => "أسلوب التطابق",
-"Unable to load list from App Store" => "فشل تحميل القائمة من الآب ستور",
 "Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "Your full name has been changed." => "اسمك الكامل تم تغييره.",
 "Unable to change full name" => "لم يتم التمكن من تغيير اسمك الكامل",
@@ -32,21 +22,19 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
 "Unable to change password" => "لا يمكن تغيير كلمة المرور",
+"Saved" => "حفظ",
+"test email settings" => "إعدادات البريد التجريبي",
+"Email sent" => "تم ارسال البريد الالكتروني",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
 "Sending..." => "جاري الارسال ...",
 "All" => "الكل",
-"User Documentation" => "كتاب توثيق المستخدم",
-"Update to {appversion}" => "تم التحديث الى ",
-"Uninstall App" => "أزالة تطبيق",
-"Disable" => "إيقاف",
-"Enable" => "تفعيل",
 "Please wait...." => "الرجاء الانتظار ...",
 "Error while disabling app" => "خطا عند تعطيل البرنامج",
+"Disable" => "إيقاف",
+"Enable" => "تفعيل",
 "Error while enabling app" => "خطا عند تفعيل البرنامج ",
 "Updating...." => "جاري التحديث ...",
 "Error while updating app" => "حصل خطأ أثناء تحديث التطبيق",
-"Error" => "خطأ",
-"Update" => "حدث",
 "Updated" => "تم التحديث بنجاح",
 "Uninstalling ...." => "جاري إلغاء التثبيت ...",
 "Uninstall" => "ألغاء التثبيت",
@@ -102,6 +90,9 @@ $TRANSLATIONS = array(
 "Forces the clients to connect to %s via an encrypted connection." => "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
 "Email Server" => "خادم البريد الالكتروني",
+"Send mode" => "وضعية الإرسال",
+"Encryption" => "التشفير",
+"Authentication method" => "أسلوب التطابق",
 "Server address" => "عنوان الخادم",
 "Port" => "المنفذ",
 "Log" => "سجل",
@@ -110,12 +101,9 @@ $TRANSLATIONS = array(
 "Less" => "أقل",
 "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>." => "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
-"Add your App" => "أضف تطبيقاتك",
-"More Apps" => "المزيد من التطبيقات",
-"Select an App" => "إختر تطبيقاً",
 "Documentation:" => "التوثيق",
-"See application page at apps.owncloud.com" => "راجع صفحة التطبيق على apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ترخيص من قبل <span class=\"author\"></span>",
+"User Documentation" => "كتاب توثيق المستخدم",
+"Uninstall App" => "أزالة تطبيق",
 "Administrator Documentation" => "كتاب توثيق المدير",
 "Online Documentation" => "توثيق متوفر على الشبكة",
 "Forum" => "منتدى",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 61e82b0886d..bc79b9e49b0 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Introdúxose un valor non válidu pa %s",
-"Saved" => "Guardáu",
-"test email settings" => "probar configuración de corréu",
-"If you received this email, the settings seem to be correct." => "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Hebo un problema al unviar el mensaxe. Revisa la configuración.",
-"Email sent" => "Corréu-e unviáu",
-"You need to set your user email before being able to send test emails." => "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
-"Send mode" => "Mou d'unviu",
-"Encryption" => "Cifráu",
-"Authentication method" => "Métodu d'autenticación",
-"Unable to load list from App Store" => "Nun pudo cargase la llista dende'l App Store",
 "Authentication error" => "Fallu d'autenticación",
 "Your full name has been changed." => "Camudóse'l nome completu.",
 "Unable to change full name" => "Nun pue camudase'l nome completu",
@@ -40,21 +29,19 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
 "Unable to change password" => "Nun pudo camudase la contraseña",
+"Saved" => "Guardáu",
+"test email settings" => "probar configuración de corréu",
+"Email sent" => "Corréu-e unviáu",
+"You need to set your user email before being able to send test emails." => "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
 "Sending..." => "Unviando...",
 "All" => "Toos",
-"User Documentation" => "Documentación d'usuariu",
-"Admin Documentation" => "Documentación p'alministradores",
-"Update to {appversion}" => "Anovar a {appversion}",
-"Uninstall App" => "Desinstalar aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
 "Please wait...." => "Espera, por favor....",
 "Error while disabling app" => "Fallu mientres se desactivaba l'aplicación",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
 "Error while enabling app" => "Fallu mientres s'activaba l'aplicación",
 "Updating...." => "Anovando....",
 "Error while updating app" => "Fallu mientres s'anovaba l'aplicación",
-"Error" => "Fallu",
-"Update" => "Anovar",
 "Updated" => "Anováu",
 "Uninstalling ...." => "Desinstalando ...",
 "Error while uninstalling app" => "Fallu mientres se desinstalaba l'aplicación",
@@ -139,8 +126,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
 "Email Server" => "Sirvidor de corréu-e",
 "This is used for sending out notifications." => "Esto úsase pa unviar notificaciones.",
+"Send mode" => "Mou d'unviu",
+"Encryption" => "Cifráu",
 "From address" => "Dende la direición",
 "mail" => "corréu",
+"Authentication method" => "Métodu d'autenticación",
 "Authentication required" => "Necesítase autenticación",
 "Server address" => "Direición del sirvidor",
 "Port" => "Puertu",
@@ -155,14 +145,11 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Amiesta la to aplicación",
-"More Apps" => "Más aplicaciones",
-"Select an App" => "Esbillar una aplicación",
 "Documentation:" => "Documentación:",
-"See application page at apps.owncloud.com" => "Ver la páxina d'aplicaciones en apps.owncloud.com",
-"See application website" => "Ver sitiu web de l'aplicación",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-llicencia otorgada por <span class=\"author\"></span>",
+"User Documentation" => "Documentación d'usuariu",
+"Admin Documentation" => "Documentación p'alministradores",
 "Enable only for specific groups" => "Habilitar namái pa grupos específicos",
+"Uninstall App" => "Desinstalar aplicación",
 "Administrator Documentation" => "Documentación d'alministrador",
 "Online Documentation" => "Documentación en llinia",
 "Forum" => "Foru",
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
index 0c17c66ba56..95156f184f1 100644
--- a/settings/l10n/az.php
+++ b/settings/l10n/az.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "%s üçün yalnış təyinat mənimsədildi",
-"Saved" => "Saxlanıldı",
-"test email settings" => "sınaq məktubu quraşdırmaları",
-"If you received this email, the settings seem to be correct." => "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Məktubun göndərilməsində səhv baş verdi. Xahiş edirik öz configlərinizə yenidən baxasınız.",
-"Email sent" => "Məktub göndərildi",
-"You need to set your user email before being able to send test emails." => "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
-"Send mode" => "Göndərmə rejimi",
-"Encryption" => "Şifrələnmə",
-"Authentication method" => "Qeydiyyat metodikası",
-"Unable to load list from App Store" => "Listi App Store-dan yükləmək mümkün deyil",
 "Authentication error" => "Təyinat metodikası",
 "Your full name has been changed." => "Sizin tam adınız dəyişdirildi.",
 "Unable to change full name" => "Tam adı dəyişmək olmur",
@@ -40,22 +29,20 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.",
 "Unable to change password" => "Şifrəni dəyişmək olmur",
+"Saved" => "Saxlanıldı",
+"test email settings" => "sınaq məktubu quraşdırmaları",
+"Email sent" => "Məktub göndərildi",
+"You need to set your user email before being able to send test emails." => "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
 "Add trusted domain" => "İnamlı domainlərə əlavə et",
 "Sending..." => "Göndərilir...",
-"User Documentation" => "İstifadəçi sənədləri",
-"Admin Documentation" => "İnzibatçı sənədləri",
-"Update to {appversion}" => "{appversion} -a yenilə",
-"Uninstall App" => "Proqram təminatını sil",
-"Disable" => "Dayandır",
-"Enable" => "İşə sal",
 "Please wait...." => "Xahiş olunur gözləyəsiniz.",
 "Error while disabling app" => "Proqram təminatını dayandırdıqda səhv baş verdi",
+"Disable" => "Dayandır",
+"Enable" => "İşə sal",
 "Error while enabling app" => "Proqram təminatını işə saldıqda səhv baş verdi",
 "Updating...." => "Yenilənir...",
 "Error while updating app" => "Proqram təminatı yeniləndikdə səhv baş verdi",
-"Error" => "Səhv",
-"Update" => "Yenilənmə",
 "Updated" => "Yeniləndi",
 "Uninstalling ...." => "Silinir...",
 "Error while uninstalling app" => "Proqram təminatını sildikdə səhv baş verdi",
@@ -102,7 +89,13 @@ $TRANSLATIONS = array(
 "Module 'fileinfo' missing" => "'fileinfo' modulu çatışmır",
 "Your PHP version is outdated" => "Sizin PHP versiyası köhnəlib",
 "PHP charset is not set to UTF-8" => "PHP simvol tipi UTF-8 deyil",
+"Send mode" => "Göndərmə rejimi",
+"Encryption" => "Şifrələnmə",
+"Authentication method" => "Qeydiyyat metodikası",
 "More" => "Yenə",
+"User Documentation" => "İstifadəçi sənədləri",
+"Admin Documentation" => "İnzibatçı sənədləri",
+"Uninstall App" => "Proqram təminatını sil",
 "Get the apps to sync your files" => "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
 "Password" => "Şifrə",
 "Change password" => "Şifrəni dəyiş",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 335c81f81f0..82cad890e4e 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Зададена е невалидна стойност за %s.",
-"Saved" => "Запис",
-"test email settings" => "провери имейл настройките",
-"If you received this email, the settings seem to be correct." => "Ако си получил този имейл, настройките са правилни.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
-"Email sent" => "Имейлът е изпратен",
-"You need to set your user email before being able to send test emails." => "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
-"Send mode" => "Режим на изпращане",
-"Encryption" => "Криптиране",
-"Authentication method" => "Метод за отризиране",
-"Unable to load list from App Store" => "Неуспешен опит за зареждане на списъка от Магазина за Програми.",
 "Authentication error" => "Възникна проблем с идентификацията",
 "Your full name has been changed." => "Пълното ти име е променено.",
 "Unable to change full name" => "Неуспешна промяна на пълното име.",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
 "Unable to change password" => "Неуспешна смяна на паролата.",
+"Saved" => "Запис",
+"test email settings" => "провери имейл настройките",
+"Email sent" => "Имейлът е изпратен",
+"You need to set your user email before being able to send test emails." => "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
 "Add trusted domain" => "Добави сигурен домейн",
 "Sending..." => "Изпращане...",
 "All" => "Всички",
-"User Documentation" => "Потребителска Документация",
-"Admin Documentation" => "Админ Документация",
-"Update to {appversion}" => "Обновяване до {appversion}.",
-"Uninstall App" => "Премахни Приложението",
-"Disable" => "Изключено",
-"Enable" => "Включено",
 "Please wait...." => "Моля изчакайте....",
 "Error while disabling app" => "Грешка при изключването на приложението",
+"Disable" => "Изключено",
+"Enable" => "Включено",
 "Error while enabling app" => "Грешка при включване на приложението",
 "Updating...." => "Обновява се...",
 "Error while updating app" => "Грешка при обновяване на приложението.",
-"Error" => "Грешка",
-"Update" => "Обновяване",
 "Updated" => "Обновено",
 "Uninstalling ...." => "Премахване ...",
 "Error while uninstalling app" => "Грешка при премахването на приложението.",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Моля свържи се с твоя %s през HTTPS, за да включиш или изключиш SSL задължаването.",
 "Email Server" => "Имейл Сървър",
 "This is used for sending out notifications." => "Това се използва за изпращане на уведомления.",
+"Send mode" => "Режим на изпращане",
+"Encryption" => "Криптиране",
 "From address" => "От адрес",
 "mail" => "поща",
+"Authentication method" => "Метод за отризиране",
 "Authentication required" => "Нужна е идентификация",
 "Server address" => "Адрес на сървъра",
 "Port" => "Порт",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "По-малко",
 "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>." => "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Дабави свое Приложение",
-"More Apps" => "Още Приложения",
-"Select an App" => "Избери Приложение",
 "Documentation:" => "Документация:",
-"See application page at apps.owncloud.com" => "Виж страницата на приложението на apps.owncloud.com.",
-"See application website" => "Виж страницата на приложението",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лицензиран от<span class=\"author\"></span>",
+"User Documentation" => "Потребителска Документация",
+"Admin Documentation" => "Админ Документация",
 "Enable only for specific groups" => "Включи само за определени групи",
+"Uninstall App" => "Премахни Приложението",
 "Administrator Documentation" => "Административна Документация",
 "Online Documentation" => "Документация в Интернет",
 "Forum" => "Форум",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 58b2a245e32..558510daf3c 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,13 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "%s এর জন্য অবৈধ ভ্যাল্যু প্রদান করা হয়েছৈ",
-"Saved" => "সংরক্ষণ করা হলো",
-"test email settings" => "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
-"If you received this email, the settings seem to be correct." => "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
-"Email sent" => "ই-মেইল পাঠানো হয়েছে",
-"Send mode" => "পাঠানো মোড",
-"Encryption" => "সংকেতায়ন",
-"Unable to load list from App Store" => "অ্যাপস্টোর থেকে তালিকা লোড করতে সক্ষম নয়",
 "Authentication error" => "অনুমোদন ঘটিত সমস্যা",
 "Your full name has been changed." => "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
 "Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
@@ -28,16 +20,16 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "অ্যাপ নবায়ন করা গেলনা।",
 "Wrong password" => "ভুল কুটশব্দ",
 "No user supplied" => "ব্যবহারকারী দেয়া হয়নি",
+"Saved" => "সংরক্ষণ করা হলো",
+"test email settings" => "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
+"Email sent" => "ই-মেইল পাঠানো হয়েছে",
 "All" => "সবাই",
-"User Documentation" => "ব্যবহারকারী সহায়িকা",
+"Error while disabling app" => "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
 "Disable" => "নিষ্ক্রিয়",
 "Enable" => "সক্রিয় ",
-"Error while disabling app" => "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
 "Error while enabling app" => "অ্যাপ কার্যকর করতে সমস্যা দেখা দিয়েছে  ",
 "Updating...." => "নবায়ন করা হচ্ছে....",
 "Error while updating app" => "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে  ",
-"Error" => "সমস্যা",
-"Update" => "পরিবর্ধন",
 "Updated" => "নবায়নকৃত",
 "Strong password" => "শক্তিশালী কুটশব্দ",
 "Valid until {date}" => "বৈধতা বলবৎ আছে {তারিখ} অবধি ",
@@ -59,6 +51,8 @@ $TRANSLATIONS = array(
 "Enforce expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
 "Security" => "নিরাপত্তা",
 "Email Server" => "ইমেইল সার্ভার",
+"Send mode" => "পাঠানো মোড",
+"Encryption" => "সংকেতায়ন",
 "From address" => "হইতে ঠিকানা",
 "mail" => "মেইল",
 "Server address" => "সার্ভার ঠিকানা",
@@ -68,11 +62,7 @@ $TRANSLATIONS = array(
 "Less" => "কম",
 "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>." => "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
-"Add your App" => "আপনার অ্যাপটি যোগ করুন",
-"More Apps" => "আরও অ্যাপ",
-"Select an App" => "অ্যাপ নির্বাচন করুন",
-"See application page at apps.owncloud.com" => "apps.owncloud.com এ অ্যাপ্লিকেসন পৃষ্ঠা দেখুন",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-লাইসেন্সধারী <span class=\"author\"></span>",
+"User Documentation" => "ব্যবহারকারী সহায়িকা",
 "Administrator Documentation" => "প্রশাসক সহায়িকা",
 "Online Documentation" => "অনলাইন সহায়িকা",
 "Forum" => "ফোরাম",
diff --git a/settings/l10n/bn_IN.php b/settings/l10n/bn_IN.php
index 9e3ce7f906b..325b868b117 100644
--- a/settings/l10n/bn_IN.php
+++ b/settings/l10n/bn_IN.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Saved" => "সংরক্ষিত",
-"Error" => "ভুল",
 "Delete" => "মুছে ফেলা",
 "Get the apps to sync your files" => "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
 "Cancel" => "বাতিল করা",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 8a488402b48..895091738ec 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "El valor proporcionat no és vàlid per %s",
-"Saved" => "Desat",
-"test email settings" => "prova l'arranjament del correu",
-"If you received this email, the settings seem to be correct." => "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Hi ha hagut un problema en enviar el correu. Comproveu-ne l'arranjament.",
-"Email sent" => "El correu electrónic s'ha enviat",
-"You need to set your user email before being able to send test emails." => "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
-"Send mode" => "Mode d'enviament",
-"Encryption" => "Xifrat",
-"Authentication method" => "Mètode d'autenticació",
-"Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
 "Authentication error" => "Error d'autenticació",
 "Your full name has been changed." => "El vostre nom complet ha canviat.",
 "Unable to change full name" => "No s'ha pogut canviar el nom complet",
@@ -40,21 +29,19 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
 "Unable to change password" => "No es pot canviar la contrasenya",
+"Saved" => "Desat",
+"test email settings" => "prova l'arranjament del correu",
+"Email sent" => "El correu electrónic s'ha enviat",
+"You need to set your user email before being able to send test emails." => "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
 "Sending..." => "Enviant...",
 "All" => "Tots",
-"User Documentation" => "Documentació d'usuari",
-"Admin Documentation" => "Documentació d'administrador",
-"Update to {appversion}" => "Actualitza a {appversion}",
-"Uninstall App" => "Desinstal·la l'aplicació",
-"Disable" => "Desactiva",
-"Enable" => "Habilita",
 "Please wait...." => "Espereu...",
 "Error while disabling app" => "Error en desactivar l'aplicació",
+"Disable" => "Desactiva",
+"Enable" => "Habilita",
 "Error while enabling app" => "Error en activar l'aplicació",
 "Updating...." => "Actualitzant...",
 "Error while updating app" => "Error en actualitzar l'aplicació",
-"Error" => "Error",
-"Update" => "Actualitza",
 "Updated" => "Actualitzada",
 "Uninstalling ...." => "Desintal·lant ...",
 "Error while uninstalling app" => "Error en desinstal·lar l'aplicació",
@@ -138,8 +125,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
 "Email Server" => "Servidor de correu",
 "This is used for sending out notifications." => "S'usa per enviar notificacions.",
+"Send mode" => "Mode d'enviament",
+"Encryption" => "Xifrat",
 "From address" => "Des de l'adreça",
 "mail" => "correu electrònic",
+"Authentication method" => "Mètode d'autenticació",
 "Authentication required" => "Es requereix autenticació",
 "Server address" => "Adreça del servidor",
 "Port" => "Port",
@@ -154,14 +144,11 @@ $TRANSLATIONS = array(
 "Less" => "Menys",
 "Version" => "Versió",
 "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>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Afegiu la vostra aplicació",
-"More Apps" => "Més aplicacions",
-"Select an App" => "Seleccioneu una aplicació",
 "Documentation:" => "Documentació:",
-"See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
-"See application website" => "Mostra la web de l'aplicació",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
+"User Documentation" => "Documentació d'usuari",
+"Admin Documentation" => "Documentació d'administrador",
 "Enable only for specific groups" => "Activa només per grups específics",
+"Uninstall App" => "Desinstal·la l'aplicació",
 "Administrator Documentation" => "Documentació d'administrador",
 "Online Documentation" => "Documentació en línia",
 "Forum" => "Fòrum",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index dbbabb4a10f..7f7d43fc05b 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Uvedena nesprávná hodnota pro %s",
-"Saved" => "Uloženo",
-"test email settings" => "otestovat nastavení e-mailu",
-"If you received this email, the settings seem to be correct." => "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Při odesílání e-mailu nastala chyba. Překontrolujte vaše nastavení.",
-"Email sent" => "E-mail odeslán",
-"You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
-"Send mode" => "Mód odesílání",
-"Encryption" => "Šifrování",
-"Authentication method" => "Metoda ověření",
-"Unable to load list from App Store" => "Nelze načíst seznam z App Store",
 "Authentication error" => "Chyba přihlášení",
 "Your full name has been changed." => "Vaše celé jméno bylo změněno.",
 "Unable to change full name" => "Nelze změnit celé jméno",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
 "Unable to change password" => "Změna hesla se nezdařila",
+"Saved" => "Uloženo",
+"test email settings" => "otestovat nastavení e-mailu",
+"Email sent" => "E-mail odeslán",
+"You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
 "Add trusted domain" => "Přidat důvěryhodnou doménu",
 "Sending..." => "Odesílání...",
 "All" => "Vše",
-"User Documentation" => "Uživatelská dokumentace",
-"Admin Documentation" => "Dokumentace pro administrátory",
-"Update to {appversion}" => "Aktualizovat na {appversion}",
-"Uninstall App" => "Odinstalovat aplikaci",
-"Disable" => "Zakázat",
-"Enable" => "Povolit",
 "Please wait...." => "Čekejte prosím...",
 "Error while disabling app" => "Chyba při zakazování aplikace",
+"Disable" => "Zakázat",
+"Enable" => "Povolit",
 "Error while enabling app" => "Chyba při povolování aplikace",
 "Updating...." => "Aktualizuji...",
 "Error while updating app" => "Chyba při aktualizaci aplikace",
-"Error" => "Chyba",
-"Update" => "Aktualizovat",
 "Updated" => "Aktualizováno",
 "Uninstalling ...." => "Probíhá odinstalace ...",
 "Error while uninstalling app" => "Chyba při odinstalaci aplikace",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL.",
 "Email Server" => "E-mailový server",
 "This is used for sending out notifications." => "Toto se používá pro odesílání upozornění.",
+"Send mode" => "Mód odesílání",
+"Encryption" => "Šifrování",
 "From address" => "Adresa odesílatele",
 "mail" => "e-mail",
+"Authentication method" => "Metoda ověření",
 "Authentication required" => "Vyžadováno ověření",
 "Server address" => "Adresa serveru",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Méně",
 "Version" => "Verze",
 "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>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Přidat Vaši aplikaci",
-"More Apps" => "Více aplikací",
-"Select an App" => "Vyberte aplikaci",
 "Documentation:" => "Dokumentace:",
-"See application page at apps.owncloud.com" => "Více na stránce s aplikacemi na apps.owncloud.com",
-"See application website" => "Prohlédněte si webovou stránku aplikace",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
+"User Documentation" => "Uživatelská dokumentace",
+"Admin Documentation" => "Dokumentace pro administrátory",
 "Enable only for specific groups" => "Povolit pouze pro vybrané skupiny",
+"Uninstall App" => "Odinstalovat aplikaci",
 "Administrator Documentation" => "Dokumentace správce",
 "Online Documentation" => "Online dokumentace",
 "Forum" => "Fórum",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 4fcfa2cfc72..0efe0361c84 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -1,10 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Anfonwyd yr e-bost",
-"Encryption" => "Amgryptiad",
 "Authentication error" => "Gwall dilysu",
 "Invalid request" => "Cais annilys",
-"Error" => "Gwall",
+"Email sent" => "Anfonwyd yr e-bost",
 "Delete" => "Dileu",
 "Groups" => "Grwpiau",
 "undo" => "dadwneud",
@@ -13,6 +11,7 @@ $TRANSLATIONS = array(
 "Login" => "Mewngofnodi",
 "Security Warning" => "Rhybudd Diogelwch",
 "Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
+"Encryption" => "Amgryptiad",
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
 "Email" => "E-bost",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index bfb599bb09c..0631c6f73af 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Ugyldig værdi anført for %s",
-"Saved" => "Gemt",
-"test email settings" => "test e-mailindstillinger",
-"If you received this email, the settings seem to be correct." => "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Der opstod et problem under afsendelse af e-mailen. Gennemse venligst dine indstillinger påny.",
-"Email sent" => "E-mail afsendt",
-"You need to set your user email before being able to send test emails." => "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
-"Send mode" => "Tilstand for afsendelse",
-"Encryption" => "Kryptering",
-"Authentication method" => "Godkendelsesmetode",
-"Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
 "Authentication error" => "Adgangsfejl",
 "Your full name has been changed." => "Dit fulde navn er blevet ændret.",
 "Unable to change full name" => "Ikke i stand til at ændre dit fulde navn",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
 "Unable to change password" => "Kunne ikke ændre kodeord",
+"Saved" => "Gemt",
+"test email settings" => "test e-mailindstillinger",
+"Email sent" => "E-mail afsendt",
+"You need to set your user email before being able to send test emails." => "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
 "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",
 "Sending..." => "Sender...",
 "All" => "Alle",
-"User Documentation" => "Brugerdokumentation",
-"Admin Documentation" => "Administrator Dokumentation",
-"Update to {appversion}" => "Opdatér til {appversion}",
-"Uninstall App" => "Afinstallér app",
-"Disable" => "Deaktiver",
-"Enable" => "Aktiver",
 "Please wait...." => "Vent venligst...",
 "Error while disabling app" => "Kunne ikke deaktivere app",
+"Disable" => "Deaktiver",
+"Enable" => "Aktiver",
 "Error while enabling app" => "Kunne ikke aktivere app",
 "Updating...." => "Opdaterer....",
 "Error while updating app" => "Der opstod en fejl under app opgraderingen",
-"Error" => "Fejl",
-"Update" => "Opdater",
 "Updated" => "Opdateret",
 "Uninstalling ...." => "Afinstallerer...",
 "Error while uninstalling app" => "Fejl under afinstallering af app",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
 "Email Server" => "E-mailserver",
 "This is used for sending out notifications." => "Dette anvendes til udsendelse af notifikationer.",
+"Send mode" => "Tilstand for afsendelse",
+"Encryption" => "Kryptering",
 "From address" => "Fra adresse",
 "mail" => "mail",
+"Authentication method" => "Godkendelsesmetode",
 "Authentication required" => "Godkendelse påkrævet",
 "Server address" => "Serveradresse",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Mindre",
 "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>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Tilføj din App",
-"More Apps" => "Flere Apps",
-"Select an App" => "Vælg en App",
 "Documentation:" => "Dokumentation:",
-"See application page at apps.owncloud.com" => "Se applikationens side på apps.owncloud.com",
-"See application website" => "Se programmets websted",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenseret af <span class=\"author\"></span>",
+"User Documentation" => "Brugerdokumentation",
+"Admin Documentation" => "Administrator Dokumentation",
 "Enable only for specific groups" => "Aktivér kun for udvalgte grupper",
+"Uninstall App" => "Afinstallér app",
 "Administrator Documentation" => "Administrator Dokumentation",
 "Online Documentation" => "Online dokumentation",
 "Forum" => "Forum",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index a6ce83fc552..2756b6da584 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Ungültiger Wert für %s übermittelt",
-"Saved" => "Gespeichert",
-"test email settings" => "E-Mail-Einstellungen testen",
-"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen",
-"Email sent" => "E-Mail wurde verschickt",
-"You need to set your user email before being able to send test emails." => "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.",
-"Send mode" => "Sende-Modus",
-"Encryption" => "Verschlüsselung",
-"Authentication method" => "Authentifizierungsmethode",
-"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Your full name has been changed." => "Dein vollständiger Name ist geändert worden.",
 "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
 "Unable to change password" => "Passwort konnte nicht geändert werden",
+"Saved" => "Gespeichert",
+"test email settings" => "E-Mail-Einstellungen testen",
+"Email sent" => "E-Mail wurde verschickt",
+"You need to set your user email before being able to send test emails." => "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
 "Add trusted domain" => "Vertrauenswürdige Domain hinzufügen",
 "Sending..." => "Sende...",
 "All" => "Alle",
-"User Documentation" => "Dokumentation für Benutzer",
-"Admin Documentation" => "Admin-Dokumentation",
-"Update to {appversion}" => "Aktualisiere zu {appversion}",
-"Uninstall App" => "App deinstallieren",
-"Disable" => "Deaktivieren",
-"Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten...",
 "Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Disable" => "Deaktivieren",
+"Enable" => "Aktivieren",
 "Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
 "Updating...." => "Aktualisierung...",
 "Error while updating app" => "Fehler beim Aktualisieren der App",
-"Error" => "Fehler",
-"Update" => "Aktualisierung durchführen",
 "Updated" => "Aktualisiert",
 "Uninstalling ...." => "Deinstalliere ....",
 "Error while uninstalling app" => "Fehler beim Deinstallieren der App",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
 "Email Server" => "E-Mail-Server",
 "This is used for sending out notifications." => "Dies wird zum Senden von Benachrichtigungen verwendet.",
+"Send mode" => "Sende-Modus",
+"Encryption" => "Verschlüsselung",
 "From address" => "Absender-Adresse",
 "mail" => "Mail",
+"Authentication method" => "Authentifizierungsmethode",
 "Authentication required" => "Authentifizierung benötigt",
 "Server address" => "Adresse des Servers",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "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.",
-"Add your App" => "Füge Deine Anwendung hinzu",
-"More Apps" => "Weitere Anwendungen",
-"Select an App" => "Wähle eine Anwendung aus",
 "Documentation:" => "Dokumentation:",
-"See application page at apps.owncloud.com" => "Weitere Anwendungen findest Du auf apps.owncloud.com",
-"See application website" => "Siehe Anwendungs-Website",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"User Documentation" => "Dokumentation für Benutzer",
+"Admin Documentation" => "Admin-Dokumentation",
 "Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren",
+"Uninstall App" => "App deinstallieren",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
index 34177f8053c..2f4be525fe2 100644
--- a/settings/l10n/de_AT.php
+++ b/settings/l10n/de_AT.php
@@ -1,7 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Invalid request" => "Fehlerhafte Anfrage",
-"Error" => "Fehler",
 "Delete" => "Löschen",
 "never" => "niemals",
 "__language_name__" => "Deutsch (Österreich)",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 154a3799f7e..0139b3b0970 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -1,9 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "Gespeichert",
-"Email sent" => "Email gesendet",
-"Encryption" => "Verschlüsselung",
-"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Group already exists" => "Die Gruppe existiert bereits",
 "Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
@@ -17,18 +13,16 @@ $TRANSLATIONS = array(
 "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",
-"User Documentation" => "Dokumentation für Benutzer",
-"Update to {appversion}" => "Update zu {appversion}",
-"Disable" => "Deaktivieren",
-"Enable" => "Aktivieren",
 "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",
-"Error" => "Fehler",
-"Update" => "Update durchführen",
 "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.",
@@ -59,6 +53,7 @@ $TRANSLATIONS = array(
 "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.",
+"Encryption" => "Verschlüsselung",
 "Server address" => "Adresse des Servers",
 "Port" => "Port",
 "Log" => "Log",
@@ -67,11 +62,7 @@ $TRANSLATIONS = array(
 "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.",
-"Add your App" => "Fügen Sie Ihre Anwendung hinzu",
-"More Apps" => "Weitere Anwendungen",
-"Select an App" => "Wählen Sie eine Anwendung aus",
-"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"User Documentation" => "Dokumentation für Benutzer",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 9435dcf30a9..8760da2006e 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Ungültiger Wert für %s übermittelt",
-"Saved" => "Gespeichert",
-"test email settings" => "E-Mail-Einstellungen testen",
-"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, scheinen die Einstellungen richtig zu sein.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
-"Email sent" => "E-Mail gesendet",
-"You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
-"Send mode" => "Sendemodus",
-"Encryption" => "Verschlüsselung",
-"Authentication method" => "Legitimierungsmethode",
-"Unable to load list from App Store" => "Die Liste der Anwendungen im Store konnte nicht geladen werden.",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Your full name has been changed." => "Ihr vollständiger Name ist geändert worden.",
 "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
 "Unable to change password" => "Passwort konnte nicht geändert werden",
+"Saved" => "Gespeichert",
+"test email settings" => "E-Mail-Einstellungen testen",
+"Email sent" => "E-Mail gesendet",
+"You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
 "Add trusted domain" => "Vertrauenswürdige Domain hinzufügen",
 "Sending..." => "Wird gesendet …",
 "All" => "Alle",
-"User Documentation" => "Dokumentation für Benutzer",
-"Admin Documentation" => "Dokumentation für Administratoren",
-"Update to {appversion}" => "Update zu {appversion}",
-"Uninstall App" => "App deinstallieren",
-"Disable" => "Deaktivieren",
-"Enable" => "Aktivieren",
 "Please wait...." => "Bitte warten....",
 "Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+"Disable" => "Deaktivieren",
+"Enable" => "Aktivieren",
 "Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
 "Updating...." => "Update...",
 "Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
-"Error" => "Fehler",
-"Update" => "Update durchführen",
 "Updated" => "Aktualisiert",
 "Uninstalling ...." => "Wird deinstalliert …",
 "Error while uninstalling app" => "Fehler beim Deinstallieren der App",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "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.",
 "Email Server" => "E-Mail-Server",
 "This is used for sending out notifications." => "Dies wird für das Senden von Benachrichtigungen verwendet.",
+"Send mode" => "Sendemodus",
+"Encryption" => "Verschlüsselung",
 "From address" => "Absender-Adresse",
 "mail" => "Mail",
+"Authentication method" => "Legitimierungsmethode",
 "Authentication required" => "Authentifizierung benötigt",
 "Server address" => "Adresse des Servers",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "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.",
-"Add your App" => "Fügen Sie Ihre Anwendung hinzu",
-"More Apps" => "Weitere Anwendungen",
-"Select an App" => "Wählen Sie eine Anwendung aus",
 "Documentation:" => "Dokumentation:",
-"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
-"See application website" => "Siehe Anwendungs-Website",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
+"User Documentation" => "Dokumentation für Benutzer",
+"Admin Documentation" => "Dokumentation für Administratoren",
 "Enable only for specific groups" => "Nur für bestimmte Gruppen aktivieren",
+"Uninstall App" => "App deinstallieren",
 "Administrator Documentation" => "Dokumentation für Administratoren",
 "Online Documentation" => "Online-Dokumentation",
 "Forum" => "Forum",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 16c2b16e7f3..20e5279c0af 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Άκυρη τιμή για το %s",
-"Saved" => "Αποθηκεύτηκαν",
-"test email settings" => "δοκιμή ρυθμίσεων email",
-"If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Παρουσιάστηκε σφάλμα κατά την αποστολή e-mail. Παρακαλώ ελέγξτε τις ρυθμίσεις σας.",
-"Email sent" => "Το Email απεστάλη ",
-"You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
-"Send mode" => "Κατάσταση αποστολής",
-"Encryption" => "Κρυπτογράφηση",
-"Authentication method" => "Μέθοδος πιστοποίησης",
-"Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Your full name has been changed." => "Το πλήρες όνομά σας άλλαξε.",
 "Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
 "Unable to change password" => "Αδυναμία αλλαγής συνθηματικού",
+"Saved" => "Αποθηκεύτηκαν",
+"test email settings" => "δοκιμή ρυθμίσεων email",
+"Email sent" => "Το Email απεστάλη ",
+"You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
 "Add trusted domain" => "Προσθέστε αξιόπιστη περιοχή",
 "Sending..." => "Αποστέλεται...",
 "All" => "Όλες",
-"User Documentation" => "Τεκμηρίωση Χρήστη",
-"Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
-"Update to {appversion}" => "Ενημέρωση σε {appversion}",
-"Uninstall App" => "Απεγκατάσταση Εφαρμογής",
-"Disable" => "Απενεργοποίηση",
-"Enable" => "Ενεργοποίηση",
 "Please wait...." => "Παρακαλώ περιμένετε...",
 "Error while disabling app" => "Σφάλμα κατά την απενεργοποίηση εισόδου",
+"Disable" => "Απενεργοποίηση",
+"Enable" => "Ενεργοποίηση",
 "Error while enabling app" => "Σφάλμα κατά την ενεργοποίηση της εφαρμογής",
 "Updating...." => "Ενημέρωση...",
 "Error while updating app" => "Σφάλμα κατά την ενημέρωση της εφαρμογής",
-"Error" => "Σφάλμα",
-"Update" => "Ενημέρωση",
 "Updated" => "Ενημερώθηκε",
 "Uninstalling ...." => "Απεγκατάσταση ....",
 "Error while uninstalling app" => "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.",
 "Email Server" => "Διακομιστής Email",
 "This is used for sending out notifications." => "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
+"Send mode" => "Κατάσταση αποστολής",
+"Encryption" => "Κρυπτογράφηση",
 "From address" => "Από τη διεύθυνση",
 "mail" => "ταχυδρομείο",
+"Authentication method" => "Μέθοδος πιστοποίησης",
 "Authentication required" => "Απαιτείται πιστοποίηση",
 "Server address" => "Διεύθυνση διακομιστή",
 "Port" => "Θύρα",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Λιγότερα",
 "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>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Προσθέστε Δικιά σας Εφαρμογή",
-"More Apps" => "Περισσότερες Εφαρμογές",
-"Select an App" => "Επιλέξτε μια Εφαρμογή",
 "Documentation:" => "Τεκμηρίωση:",
-"See application page at apps.owncloud.com" => "Δείτε την σελίδα εφαρμογών στο apps.owncloud.com",
-"See application website" => "Δείτε την ιστοσελίδα της εφαρμογής",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Άδεια χρήσης <span class=\"licence\"></span> από <span class=\"author\"></span>",
+"User Documentation" => "Τεκμηρίωση Χρήστη",
+"Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
 "Enable only for specific groups" => "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
+"Uninstall App" => "Απεγκατάσταση Εφαρμογής",
 "Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
 "Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
 "Forum" => "Φόρουμ",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 101c94c2880..942b51d2002 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Invalid value supplied for %s",
-"Saved" => "Saved",
-"test email settings" => "test email settings",
-"If you received this email, the settings seem to be correct." => "If you received this email, the settings seem to be correct.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "A problem occurred whilst sending the e-mail. Please revisit your settings.",
-"Email sent" => "Email sent",
-"You need to set your user email before being able to send test emails." => "You need to set your user email before being able to send test emails.",
-"Send mode" => "Send mode",
-"Encryption" => "Encryption",
-"Authentication method" => "Authentication method",
-"Unable to load list from App Store" => "Unable to load list from App Store",
 "Authentication error" => "Authentication error",
 "Your full name has been changed." => "Your full name has been changed.",
 "Unable to change full name" => "Unable to change full name",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Incorrect admin recovery password. Please check the password and try again.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
 "Unable to change password" => "Unable to change password",
+"Saved" => "Saved",
+"test email settings" => "test email settings",
+"Email sent" => "Email sent",
+"You need to set your user email before being able to send test emails." => "You need to set your user email before being able to send test emails.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Are you really sure you want add \"{domain}\" as a trusted domain?",
 "Add trusted domain" => "Add trusted domain",
 "Sending..." => "Sending...",
 "All" => "All",
-"User Documentation" => "User Documentation",
-"Admin Documentation" => "Admin Documentation",
-"Update to {appversion}" => "Update to {appversion}",
-"Uninstall App" => "Uninstall App",
-"Disable" => "Disable",
-"Enable" => "Enable",
 "Please wait...." => "Please wait....",
 "Error while disabling app" => "Error whilst disabling app",
+"Disable" => "Disable",
+"Enable" => "Enable",
 "Error while enabling app" => "Error whilst enabling app",
 "Updating...." => "Updating....",
 "Error while updating app" => "Error whilst updating app",
-"Error" => "Error",
-"Update" => "Update",
 "Updated" => "Updated",
 "Uninstalling ...." => "Uninstalling...",
 "Error while uninstalling app" => "Error whilst uninstalling app",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
 "Email Server" => "Email Server",
 "This is used for sending out notifications." => "This is used for sending out notifications.",
+"Send mode" => "Send mode",
+"Encryption" => "Encryption",
 "From address" => "From address",
 "mail" => "mail",
+"Authentication method" => "Authentication method",
 "Authentication required" => "Authentication required",
 "Server address" => "Server address",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Less",
 "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>." => "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 Licence\">AGPL</abbr></a>.",
-"Add your App" => "Add your App",
-"More Apps" => "More Apps",
-"Select an App" => "Select an App",
 "Documentation:" => "Documentation:",
-"See application page at apps.owncloud.com" => "See application page at apps.owncloud.com",
-"See application website" => "See application website",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"User Documentation" => "User Documentation",
+"Admin Documentation" => "Admin Documentation",
 "Enable only for specific groups" => "Enable only for specific groups",
+"Uninstall App" => "Uninstall App",
 "Administrator Documentation" => "Administrator Documentation",
 "Online Documentation" => "Online Documentation",
 "Forum" => "Forum",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 53724f9bc6c..ddfa33a6f6a 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,11 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "Konservita",
-"Email sent" => "La retpoŝtaĵo sendiĝis",
-"Send mode" => "Sendi pli",
-"Encryption" => "Ĉifrado",
-"Authentication method" => "Aŭtentiga metodo",
-"Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
 "Authentication error" => "Aŭtentiga eraro",
 "Your full name has been changed." => "Via plena nomo ŝanĝitas.",
 "Unable to change full name" => "Ne eblis ŝanĝi la plenan nomon",
@@ -26,21 +20,17 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "Ne eblis ĝisdatigi la aplikaĵon.",
 "Wrong password" => "Malĝusta pasvorto",
 "Unable to change password" => "Ne eblis ŝanĝi la pasvorton",
+"Saved" => "Konservita",
+"Email sent" => "La retpoŝtaĵo sendiĝis",
 "Sending..." => "Sendante...",
 "All" => "Ĉio",
-"User Documentation" => "Dokumentaro por uzantoj",
-"Admin Documentation" => "Administra dokumentaro",
-"Update to {appversion}" => "Ĝisdatigi al {appversion}",
-"Uninstall App" => "Malinstali aplikaĵon",
-"Disable" => "Malkapabligi",
-"Enable" => "Kapabligi",
 "Please wait...." => "Bonvolu atendi...",
 "Error while disabling app" => "Eraris malkapabligo de aplikaĵo",
+"Disable" => "Malkapabligi",
+"Enable" => "Kapabligi",
 "Error while enabling app" => "Eraris kapabligo de aplikaĵo",
 "Updating...." => "Ĝisdatigata...",
 "Error while updating app" => "Eraris ĝisdatigo de la aplikaĵo",
-"Error" => "Eraro",
-"Update" => "Ĝisdatigi",
 "Updated" => "Ĝisdatigita",
 "Uninstalling ...." => "Malinstalante...",
 "Error while uninstalling app" => "Eraris malinstalo de aplikaĵo",
@@ -88,8 +78,11 @@ $TRANSLATIONS = array(
 "Allow resharing" => "Kapabligi rekunhavigon",
 "Security" => "Sekuro",
 "Email Server" => "Retpoŝtoservilo",
+"Send mode" => "Sendi pli",
+"Encryption" => "Ĉifrado",
 "From address" => "El adreso",
 "mail" => "retpoŝto",
+"Authentication method" => "Aŭtentiga metodo",
 "Authentication required" => "Aŭtentiĝo nepras",
 "Server address" => "Servila adreso",
 "Port" => "Pordo",
@@ -103,14 +96,11 @@ $TRANSLATIONS = array(
 "Less" => "Malpli",
 "Version" => "Eldono",
 "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>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Aldonu vian aplikaĵon",
-"More Apps" => "Pli da aplikaĵoj",
-"Select an App" => "Elekti aplikaĵon",
 "Documentation:" => "Dokumentaro:",
-"See application page at apps.owncloud.com" => "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com",
-"See application website" => "Vidi la TTT-ejon de la aplikaĵo",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"</span>-permesilhavigita de <span class=\"author\"></span>",
+"User Documentation" => "Dokumentaro por uzantoj",
+"Admin Documentation" => "Administra dokumentaro",
 "Enable only for specific groups" => "Kapabligi nur por specifajn grupojn",
+"Uninstall App" => "Malinstali aplikaĵon",
 "Administrator Documentation" => "Dokumentaro por administrantoj",
 "Online Documentation" => "Reta dokumentaro",
 "Forum" => "Forumo",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 661f20d3181..1a7ad06db4a 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Se introdujo un valor inválido para %s",
-"Saved" => "Guardado",
-"test email settings" => "probar configuración de correo",
-"If you received this email, the settings seem to be correct." => "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocurrió un problema la enviar el mensaje. Revise la configuración.",
-"Email sent" => "Correo electrónico enviado",
-"You need to set your user email before being able to send test emails." => "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
-"Send mode" => "Modo de envío",
-"Encryption" => "Cifrado",
-"Authentication method" => "Método de autenticación",
-"Unable to load list from App Store" => "No se pudo cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
 "Your full name has been changed." => "Se ha cambiado su nombre completo.",
 "Unable to change full name" => "No se puede cambiar el nombre completo",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "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.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
 "Unable to change password" => "No se ha podido cambiar la contraseña",
+"Saved" => "Guardado",
+"test email settings" => "probar configuración de correo",
+"Email sent" => "Correo electrónico enviado",
+"You need to set your user email before being able to send test emails." => "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
 "Add trusted domain" => "Agregar dominio de confianza",
 "Sending..." => "Enviando...",
 "All" => "Todos",
-"User Documentation" => "Documentación de usuario",
-"Admin Documentation" => "Documentación para administradores",
-"Update to {appversion}" => "Actualizar a {appversion}",
-"Uninstall App" => "Desinstalar aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
 "Please wait...." => "Espere, por favor....",
 "Error while disabling app" => "Error mientras se desactivaba la aplicación",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
 "Error while enabling app" => "Error mientras se activaba la aplicación",
 "Updating...." => "Actualizando....",
 "Error while updating app" => "Error mientras se actualizaba la aplicación",
-"Error" => "Error",
-"Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Uninstalling ...." => "Desinstalando...",
 "Error while uninstalling app" => "Error al desinstalar la aplicación",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
 "Email Server" => "Servidor de correo electrónico",
 "This is used for sending out notifications." => "Esto se usa para enviar notificaciones.",
+"Send mode" => "Modo de envío",
+"Encryption" => "Cifrado",
 "From address" => "Desde la dirección",
 "mail" => "correo electrónico",
+"Authentication method" => "Método de autenticación",
 "Authentication required" => "Se necesita autenticación",
 "Server address" => "Dirección del servidor",
 "Port" => "Puerto",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Añade tu aplicación",
-"More Apps" => "Más aplicaciones",
-"Select an App" => "Seleccionar una aplicación",
 "Documentation:" => "Documentación:",
-"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
-"See application website" => "Ver sitio web de la aplicación",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
+"User Documentation" => "Documentación de usuario",
+"Admin Documentation" => "Documentación para administradores",
 "Enable only for specific groups" => "Activar solamente para grupos específicos",
+"Uninstall App" => "Desinstalar aplicación",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 98082c72a80..5262fdf249e 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Parámetro suministrado invalido para %s",
-"Saved" => "Guardado",
-"test email settings" => "Configuración de correo de prueba.",
-"If you received this email, the settings seem to be correct." => "Si recibió este correo, la configuración parece estar correcta.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Un problema ocurrió cuando se intentó enviar el correo electrónico. Por favor revea su configuración.",
-"Email sent" => "e-mail mandado",
-"You need to set your user email before being able to send test emails." => "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
-"Send mode" => "Modo de envio",
-"Encryption" => "Encriptación",
-"Authentication method" => "Método de autenticación",
-"Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error al autenticar",
 "Your full name has been changed." => "Su nombre completo ha sido cambiado.",
 "Unable to change full name" => "Imposible cambiar el nombre completo",
@@ -33,20 +22,19 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.",
 "Unable to change password" => "Imposible cambiar la contraseña",
+"Saved" => "Guardado",
+"test email settings" => "Configuración de correo de prueba.",
+"Email sent" => "e-mail mandado",
+"You need to set your user email before being able to send test emails." => "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
 "Sending..." => "Enviando...",
 "All" => "Todos",
-"User Documentation" => "Documentación de Usuario",
-"Admin Documentation" => "Documentación de Administrador.",
-"Update to {appversion}" => "Actualizar a {appversion}",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
 "Please wait...." => "Por favor, esperá....",
 "Error while disabling app" => "Se ha producido un error mientras se deshabilitaba la aplicación",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
 "Error while enabling app" => "Se ha producido un error mientras se habilitaba la aplicación",
 "Updating...." => "Actualizando....",
 "Error while updating app" => "Error al actualizar App",
-"Error" => "Error",
-"Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccionar una imágen de perfil",
 "Very weak password" => "Contraseña muy débil.",
@@ -104,7 +92,10 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
 "Email Server" => "Servidor de correo electrónico",
 "This is used for sending out notifications." => "Esto es usado para enviar notificaciones.",
+"Send mode" => "Modo de envio",
+"Encryption" => "Encriptación",
 "From address" => "Dirección remitente",
+"Authentication method" => "Método de autenticación",
 "Authentication required" => "Autentificación requerida",
 "Server address" => "Dirección del servidor",
 "Port" => "Puerto",
@@ -119,13 +110,9 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Añadí tu App",
-"More Apps" => "Más Apps",
-"Select an App" => "Elegí una App",
 "Documentation:" => "Documentación:",
-"See application page at apps.owncloud.com" => "Mirá la web de aplicaciones apps.owncloud.com",
-"See application website" => "Ver sitio web de la aplicación",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\">",
+"User Documentation" => "Documentación de Usuario",
+"Admin Documentation" => "Documentación de Administrador.",
 "Administrator Documentation" => "Documentación de Administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
diff --git a/settings/l10n/es_CL.php b/settings/l10n/es_CL.php
index bdf34e62979..fc5e328f3bc 100644
--- a/settings/l10n/es_CL.php
+++ b/settings/l10n/es_CL.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Error" => "Error",
 "Password" => "Clave",
 "Cancel" => "Cancelar",
 "Username" => "Usuario"
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 1bb88e959cd..96352aa5ed8 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Correo electrónico enviado",
-"Encryption" => "Cifrado",
-"Unable to load list from App Store" => "No se pudo cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
 "Your full name has been changed." => "Se ha cambiado su nombre completo.",
 "Unable to change full name" => "No se puede cambiar el nombre completo",
@@ -24,18 +21,15 @@ $TRANSLATIONS = array(
 "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.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
 "Unable to change password" => "No se ha podido cambiar la contraseña",
+"Email sent" => "Correo electrónico enviado",
 "All" => "Todos",
-"User Documentation" => "Documentación de usuario",
-"Update to {appversion}" => "Actualizado a {appversion}",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
 "Please wait...." => "Espere, por favor....",
 "Error while disabling app" => "Error mientras se desactivaba la aplicación",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
 "Error while enabling app" => "Error mientras se activaba la aplicación",
 "Updating...." => "Actualizando....",
 "Error while updating app" => "Error mientras se actualizaba la aplicación",
-"Error" => "Error",
-"Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Select a profile picture" => "Seleccionar una imagen de perfil",
 "Delete" => "Eliminar",
@@ -80,6 +74,7 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+"Encryption" => "Cifrado",
 "Server address" => "Dirección del servidor",
 "Port" => "Puerto",
 "Log" => "Registro",
@@ -88,11 +83,7 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Añade tu aplicación",
-"More Apps" => "Más aplicaciones",
-"Select an App" => "Seleccionar una aplicación",
-"See application page at apps.owncloud.com" => "Ver la página de aplicaciones en apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencia otorgada por <span class=\"author\"></span>",
+"User Documentation" => "Documentación de usuario",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
 "Forum" => "Foro",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 11e72734092..1256d74e24d 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Sisestatud sobimatu väärtus %s jaoks",
-"Saved" => "Salvestatud",
-"test email settings" => "testi e-posti seadeid",
-"If you received this email, the settings seem to be correct." => "Kui said selle kirja, siis on seadistus korrektne.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
-"Email sent" => "E-kiri on saadetud",
-"You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
-"Send mode" => "Saatmise viis",
-"Encryption" => "Krüpteerimine",
-"Authentication method" => "Autentimise meetod",
-"Unable to load list from App Store" => "App Store'i nimekirja laadimine ebaõnnestus",
 "Authentication error" => "Autentimise viga",
 "Your full name has been changed." => "Sinu täispikk nimi on muudetud.",
 "Unable to change full name" => "Täispika nime muutmine ebaõnnestus",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
 "Unable to change password" => "Ei suuda parooli muuta",
+"Saved" => "Salvestatud",
+"test email settings" => "testi e-posti seadeid",
+"Email sent" => "E-kiri on saadetud",
+"You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
 "Add trusted domain" => "Lis ausaldusväärne domeen",
 "Sending..." => "Saadan...",
 "All" => "Kõik",
-"User Documentation" => "Kasutaja dokumentatsioon",
-"Admin Documentation" => "Admin dokumentatsioon",
-"Update to {appversion}" => "Uuenda versioonile {appversion}",
-"Uninstall App" => "Eemada rakend",
-"Disable" => "Lülita välja",
-"Enable" => "Lülita sisse",
 "Please wait...." => "Palun oota...",
 "Error while disabling app" => "Viga rakenduse keelamisel",
+"Disable" => "Lülita välja",
+"Enable" => "Lülita sisse",
 "Error while enabling app" => "Viga rakenduse lubamisel",
 "Updating...." => "Uuendamine...",
 "Error while updating app" => "Viga rakenduse uuendamisel",
-"Error" => "Viga",
-"Update" => "Uuenda",
 "Updated" => "Uuendatud",
 "Uninstalling ...." => "Eemaldan...",
 "Error while uninstalling app" => "Viga rakendi eemaldamisel",
@@ -146,8 +133,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
 "Email Server" => "Postiserver",
 "This is used for sending out notifications." => "Seda kasutatakse teadete välja saatmiseks.",
+"Send mode" => "Saatmise viis",
+"Encryption" => "Krüpteerimine",
 "From address" => "Saatja aadress",
 "mail" => "e-mail",
+"Authentication method" => "Autentimise meetod",
 "Authentication required" => "Autentimine on vajalik",
 "Server address" => "Serveri aadress",
 "Port" => "Port",
@@ -162,14 +152,11 @@ $TRANSLATIONS = array(
 "Less" => "Vähem",
 "Version" => "Versioon",
 "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>." => "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
-"Add your App" => "Lisa oma rakendus",
-"More Apps" => "Veel rakendusi",
-"Select an App" => "Vali programm",
 "Documentation:" => "Dokumentatsioon:",
-"See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com",
-"See application website" => "Vaata rakendi veebilehte",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
+"User Documentation" => "Kasutaja dokumentatsioon",
+"Admin Documentation" => "Admin dokumentatsioon",
 "Enable only for specific groups" => "Luba ainult kindlad grupid",
+"Uninstall App" => "Eemada rakend",
 "Administrator Documentation" => "Administraatori dokumentatsioon",
 "Online Documentation" => "Online dokumentatsioon",
 "Forum" => "Foorum",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 284b3ffdec3..1c2153d24ac 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "%s-entzako baliogabea",
-"Saved" => "Gordeta",
-"test email settings" => "probatu eposta ezarpenak",
-"If you received this email, the settings seem to be correct." => "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Arazo bat gertatu da eposta bidaltzean. Berrikusi zure ezarpenak.",
-"Email sent" => "Eposta bidalia",
-"You need to set your user email before being able to send test emails." => "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
-"Send mode" => "Bidaltzeko modua",
-"Encryption" => "Enkriptazioa",
-"Authentication method" => "Autentifikazio metodoa",
-"Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Authentication error" => "Autentifikazio errorea",
 "Your full name has been changed." => "Zure izena aldatu egin da.",
 "Unable to change full name" => "Ezin izan da izena aldatu",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
 "Unable to change password" => "Ezin izan da pasahitza aldatu",
+"Saved" => "Gordeta",
+"test email settings" => "probatu eposta ezarpenak",
+"Email sent" => "Eposta bidalia",
+"You need to set your user email before being able to send test emails." => "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
 "Add trusted domain" => "Gehitu domeinu fidagarria",
 "Sending..." => "Bidaltzen...",
 "All" => "Denak",
-"User Documentation" => "Erabiltzaile dokumentazioa",
-"Admin Documentation" => "Administrazio dokumentazioa",
-"Update to {appversion}" => "Eguneratu {appversion}-ra",
-"Uninstall App" => "Desinstalatu aplikazioa",
-"Disable" => "Ez-gaitu",
-"Enable" => "Gaitu",
 "Please wait...." => "Itxoin mesedez...",
 "Error while disabling app" => "Erroea izan da aplikazioa desgaitzerakoan",
+"Disable" => "Ez-gaitu",
+"Enable" => "Gaitu",
 "Error while enabling app" => "Erroea izan da aplikazioa gaitzerakoan",
 "Updating...." => "Eguneratzen...",
 "Error while updating app" => "Errorea aplikazioa eguneratzen zen bitartean",
-"Error" => "Errorea",
-"Update" => "Eguneratu",
 "Updated" => "Eguneratuta",
 "Uninstalling ...." => "Desinstalatzen ...",
 "Error while uninstalling app" => "Erroea izan da aplikazioa desinstalatzerakoan",
@@ -145,8 +132,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
 "Email Server" => "Eposta zerbitzaria",
 "This is used for sending out notifications." => "Hau jakinarazpenak bidaltzeko erabiltzen da.",
+"Send mode" => "Bidaltzeko modua",
+"Encryption" => "Enkriptazioa",
 "From address" => "Helbidetik",
 "mail" => "posta",
+"Authentication method" => "Autentifikazio metodoa",
 "Authentication required" => "Autentikazioa beharrezkoa",
 "Server address" => "Zerbitzariaren helbidea",
 "Port" => "Portua",
@@ -161,14 +151,11 @@ $TRANSLATIONS = array(
 "Less" => "Gutxiago",
 "Version" => "Bertsioa",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
-"Add your App" => "Gehitu zure aplikazioa",
-"More Apps" => "Aplikazio gehiago",
-"Select an App" => "Aukeratu aplikazio bat",
 "Documentation:" => "Dokumentazioa:",
-"See application page at apps.owncloud.com" => "Ikusi aplikazioaren orria apps.owncloud.com orrian",
-"See application website" => "Ikusi aplikazioaren webgunea",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
+"User Documentation" => "Erabiltzaile dokumentazioa",
+"Admin Documentation" => "Administrazio dokumentazioa",
 "Enable only for specific groups" => "Baimendu bakarri talde espezifikoetarako",
+"Uninstall App" => "Desinstalatu aplikazioa",
 "Administrator Documentation" => "Administratzaile dokumentazioa",
 "Online Documentation" => "Online dokumentazioa",
 "Forum" => "Foroa",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index c72e83bb8ad..840de096558 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,13 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "مقدار ارائه شده برای %s معتبر نیست",
-"Saved" => "ذخیره شد",
-"test email settings" => "تنظیمات ایمیل آزمایشی",
-"Email sent" => "ایمیل ارسال شد",
-"Send mode" => "حالت ارسال",
-"Encryption" => "رمزگذاری",
-"Authentication method" => "روش احراز هویت",
-"Unable to load list from App Store" => "قادر به بارگذاری لیست از فروشگاه اپ نیستم",
 "Authentication error" => "خطا در اعتبار سنجی",
 "Your full name has been changed." => "نام کامل شما تغییر یافت",
 "Unable to change full name" => "امکان تغییر نام کامل وجود ندارد",
@@ -33,21 +25,18 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.",
 "Unable to change password" => "نمی‌توان رمز را تغییر داد",
+"Saved" => "ذخیره شد",
+"test email settings" => "تنظیمات ایمیل آزمایشی",
+"Email sent" => "ایمیل ارسال شد",
 "Sending..." => "در حال ارسال...",
 "All" => "همه",
-"User Documentation" => "مستندات کاربر",
-"Admin Documentation" => "مستند سازی مدیر",
-"Update to {appversion}" => "بهنگام شده به  {appversion}",
-"Uninstall App" => "حذف برنامه",
-"Disable" => "غیرفعال",
-"Enable" => "فعال",
 "Please wait...." => "لطفا صبر کنید ...",
 "Error while disabling app" => "خطا در هنگام غیر فعال سازی برنامه",
+"Disable" => "غیرفعال",
+"Enable" => "فعال",
 "Error while enabling app" => "خطا در هنگام فعال سازی برنامه",
 "Updating...." => "در حال بروز رسانی...",
 "Error while updating app" => "خطا در هنگام بهنگام سازی برنامه",
-"Error" => "خطا",
-"Update" => "به روز رسانی",
 "Updated" => "بروز رسانی انجام شد",
 "Uninstalling ...." => "در حال حذف...",
 "Error while uninstalling app" => "خطا در هنگام حذف برنامه....",
@@ -119,8 +108,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید.",
 "Email Server" => "سرور ایمیل",
 "This is used for sending out notifications." => "این برای ارسال هشدار ها استفاده می شود",
+"Send mode" => "حالت ارسال",
+"Encryption" => "رمزگذاری",
 "From address" => "آدرس فرستنده",
 "mail" => "ایمیل",
+"Authentication method" => "روش احراز هویت",
 "Authentication required" => "احراز هویت مورد نیاز است",
 "Server address" => "آدرس سرور",
 "Port" => "درگاه",
@@ -135,14 +127,11 @@ $TRANSLATIONS = array(
 "Less" => "کم‌تر",
 "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>." => "توسعه یافته به وسیله ی  <a href=\"http://ownCloud.org/contact\" target=\"_blank\">انجمن ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">کد اصلی</a> مجاز زیر گواهی <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "برنامه خود را بیافزایید",
-"More Apps" => "برنامه های بیشتر",
-"Select an App" => "یک برنامه انتخاب کنید",
 "Documentation:" => "مستند سازی:",
-"See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
-"See application website" => "مشاهده وب سایت برنامه",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-مجاز از طرف <span class=\"author\"></span>",
+"User Documentation" => "مستندات کاربر",
+"Admin Documentation" => "مستند سازی مدیر",
 "Enable only for specific groups" => "فعال سازی تنها برای گروه های خاص",
+"Uninstall App" => "حذف برنامه",
 "Administrator Documentation" => "مستندات مدیر",
 "Online Documentation" => "مستندات آنلاین",
 "Forum" => "انجمن",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 9b09f0fbadd..e5c1ce516c0 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Virheellinen arvo kohdassa %s",
-"Saved" => "Tallennettu",
-"test email settings" => "testaa sähköpostiasetukset",
-"If you received this email, the settings seem to be correct." => "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.",
-"Email sent" => "Sähköposti lähetetty",
-"You need to set your user email before being able to send test emails." => "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
-"Send mode" => "Lähetystila",
-"Encryption" => "Salaus",
-"Authentication method" => "Tunnistautumistapa",
-"Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
 "Authentication error" => "Tunnistautumisvirhe",
 "Your full name has been changed." => "Koko nimesi on muutettu.",
 "Unable to change full name" => "Koko nimen muuttaminen epäonnistui",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
 "Unable to change password" => "Salasanan vaihto ei onnistunut",
+"Saved" => "Tallennettu",
+"test email settings" => "testaa sähköpostiasetukset",
+"Email sent" => "Sähköposti lähetetty",
+"You need to set your user email before being able to send test emails." => "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
 "Add trusted domain" => "Lisää luotettu toimialue",
 "Sending..." => "Lähetetään...",
 "All" => "Kaikki",
-"User Documentation" => "Käyttäjäohjeistus",
-"Admin Documentation" => "Ylläpitäjän ohjeistus",
-"Update to {appversion}" => "Päivitä versioon {appversion}",
-"Uninstall App" => "Poista sovelluksen asennus",
-"Disable" => "Poista käytöstä",
-"Enable" => "Käytä",
 "Please wait...." => "Odota hetki...",
 "Error while disabling app" => "Virhe poistaessa sovellusta käytöstä",
+"Disable" => "Poista käytöstä",
+"Enable" => "Käytä",
 "Error while enabling app" => "Virhe ottaessa sovellusta käyttöön",
 "Updating...." => "Päivitetään...",
 "Error while updating app" => "Virhe sovellusta päivittäessä",
-"Error" => "Virhe",
-"Update" => "Päivitä",
 "Updated" => "Päivitetty",
 "Uninstalling ...." => "Poistetaan asennusta....",
 "Error while uninstalling app" => "Virhe sovellusta poistaessa",
@@ -141,7 +128,10 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
 "Email Server" => "Sähköpostipalvelin",
 "This is used for sending out notifications." => "Tätä käytetään ilmoitusten lähettämiseen.",
+"Send mode" => "Lähetystila",
+"Encryption" => "Salaus",
 "From address" => "Lähettäjän osoite",
+"Authentication method" => "Tunnistautumistapa",
 "Authentication required" => "Tunnistautuminen vaaditaan",
 "Server address" => "Palvelimen osoite",
 "Port" => "Portti",
@@ -156,14 +146,11 @@ $TRANSLATIONS = array(
 "Less" => "Vähemmän",
 "Version" => "Versio",
 "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>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
-"Add your App" => "Lisää sovelluksesi",
-"More Apps" => "Lisää sovelluksia",
-"Select an App" => "Valitse sovellus",
 "Documentation:" => "Ohjeistus:",
-"See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
-"See application website" => "Lue lisää sovelluksen sivustolta",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
+"User Documentation" => "Käyttäjäohjeistus",
+"Admin Documentation" => "Ylläpitäjän ohjeistus",
 "Enable only for specific groups" => "Salli vain tietyille ryhmille",
+"Uninstall App" => "Poista sovelluksen asennus",
 "Administrator Documentation" => "Ylläpito-ohjeistus",
 "Online Documentation" => "Verkko-ohjeistus",
 "Forum" => "Keskustelupalsta",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 6c82b4e266b..a498030a15e 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Valeur fournie pour %s non valable",
-"Saved" => "Sauvegardé",
-"test email settings" => "tester les paramètres d'e-mail",
-"If you received this email, the settings seem to be correct." => "Si vous recevez cet email, c'est que les paramètres sont corrects",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres.",
-"Email sent" => "Email envoyé",
-"You need to set your user email before being able to send test emails." => "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
-"Send mode" => "Mode d'envoi",
-"Encryption" => "Chiffrement",
-"Authentication method" => "Méthode d'authentification",
-"Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
 "Authentication error" => "Erreur d'authentification",
 "Your full name has been changed." => "Votre nom complet a été modifié.",
 "Unable to change full name" => "Impossible de changer le nom complet",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
 "Unable to change password" => "Impossible de modifier le mot de passe",
+"Saved" => "Sauvegardé",
+"test email settings" => "tester les paramètres d'e-mail",
+"Email sent" => "Email envoyé",
+"You need to set your user email before being able to send test emails." => "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
 "Add trusted domain" => "Ajouter un domaine de confiance",
 "Sending..." => "Envoi en cours...",
 "All" => "Tous",
-"User Documentation" => "Documentation utilisateur",
-"Admin Documentation" => "Documentation administrateur",
-"Update to {appversion}" => "Mettre à jour vers {appversion}",
-"Uninstall App" => "Désinstaller l'application",
-"Disable" => "Désactiver",
-"Enable" => "Activer",
 "Please wait...." => "Veuillez patienter…",
 "Error while disabling app" => "Erreur lors de la désactivation de l'application",
+"Disable" => "Désactiver",
+"Enable" => "Activer",
 "Error while enabling app" => "Erreur lors de l'activation de l'application",
 "Updating...." => "Mise à jour...",
 "Error while updating app" => "Erreur lors de la mise à jour de l'application",
-"Error" => "Erreur",
-"Update" => "Mettre à jour",
 "Updated" => "Mise à jour effectuée avec succès",
 "Uninstalling ...." => "Désintallation...",
 "Error while uninstalling app" => "Erreur lors de la désinstallation de l'application",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
 "Email Server" => "Serveur mail",
 "This is used for sending out notifications." => "Ceci est utilisé pour l'envoi des notifications.",
+"Send mode" => "Mode d'envoi",
+"Encryption" => "Chiffrement",
 "From address" => "Adresse source",
 "mail" => "courriel",
+"Authentication method" => "Méthode d'authentification",
 "Authentication required" => "Authentification requise",
 "Server address" => "Adresse du serveur",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Moins",
 "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>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Ajoutez votre application",
-"More Apps" => "Plus d'applications…",
-"Select an App" => "Sélectionnez une Application",
 "Documentation:" => "Documentation :",
-"See application page at apps.owncloud.com" => "Voir la page de l'application sur apps.owncloud.com",
-"See application website" => "Voir le site web de l'application",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
+"User Documentation" => "Documentation utilisateur",
+"Admin Documentation" => "Documentation administrateur",
 "Enable only for specific groups" => "Activer uniquement pour certains groupes",
+"Uninstall App" => "Désinstaller l'application",
 "Administrator Documentation" => "Documentation administrateur",
 "Online Documentation" => "Documentation en ligne",
 "Forum" => "Forum",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 58e8f14feac..c2fac946544 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Forneceu un valor incorrecto para %s",
-"Saved" => "Gardado",
-"test email settings" => "correo de proba dos axustes",
-"If you received this email, the settings seem to be correct." => "Se recibiu este correo, semella que a configuración é correcta.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Produciuse un problema ao enviar o correo. Revise os seus axustes.",
-"Email sent" => "Correo enviado",
-"You need to set your user email before being able to send test emails." => "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
-"Send mode" => "Modo de envío",
-"Encryption" => "Cifrado",
-"Authentication method" => "Método de autenticación",
-"Unable to load list from App Store" => "Non foi posíbel cargar a lista desde a App Store",
 "Authentication error" => "Produciuse un erro de autenticación",
 "Your full name has been changed." => "O seu nome completo foi cambiado",
 "Unable to change full name" => "Non é posíbel cambiar o nome completo",
@@ -40,21 +29,19 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
 "Unable to change password" => "Non é posíbel cambiar o contrasinal",
+"Saved" => "Gardado",
+"test email settings" => "correo de proba dos axustes",
+"Email sent" => "Correo enviado",
+"You need to set your user email before being able to send test emails." => "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
 "Sending..." => "Enviando...",
 "All" => "Todo",
-"User Documentation" => "Documentación do usuario",
-"Admin Documentation" => "Documentación do administrador",
-"Update to {appversion}" => "Actualizar á {appversion}",
-"Uninstall App" => "Desinstalar unha aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
 "Please wait...." => "Agarde...",
 "Error while disabling app" => "Produciuse un erro ao desactivar a aplicación",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
 "Error while enabling app" => "Produciuse un erro ao activar a aplicación",
 "Updating...." => "Actualizando...",
 "Error while updating app" => "Produciuse un erro mentres actualizaba a aplicación",
-"Error" => "Erro",
-"Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Uninstalling ...." => "Desinstalando ...",
 "Error while uninstalling app" => "Produciuse un erro ao desinstalar o aplicatvo",
@@ -143,8 +130,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
 "Email Server" => "Servidor de correo",
 "This is used for sending out notifications." => "Isto utilizase para o envío de notificacións.",
+"Send mode" => "Modo de envío",
+"Encryption" => "Cifrado",
 "From address" => "Desde o enderezo",
 "mail" => "correo",
+"Authentication method" => "Método de autenticación",
 "Authentication required" => "Requírese autenticación",
 "Server address" => "Enderezo do servidor",
 "Port" => "Porto",
@@ -159,14 +149,11 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Engada a súa aplicación",
-"More Apps" => "Máis aplicacións",
-"Select an App" => "Escolla unha aplicación",
 "Documentation:" => "Documentación:",
-"See application page at apps.owncloud.com" => "Consulte a páxina da aplicación en apps.owncloud.com",
-"See application website" => "Vexa o sitio web da aplicación",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por<span class=\"author\"></span>",
+"User Documentation" => "Documentación do usuario",
+"Admin Documentation" => "Documentación do administrador",
 "Enable only for specific groups" => "Activar só para grupos específicos",
+"Uninstall App" => "Desinstalar unha aplicación",
 "Administrator Documentation" => "Documentación do administrador",
 "Online Documentation" => "Documentación na Rede",
 "Forum" => "Foro",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index d3624c983fd..e761cead850 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -1,9 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "נשמר",
-"Email sent" => "הודעת הדוא״ל נשלחה",
-"Encryption" => "הצפנה",
-"Unable to load list from App Store" => "לא ניתן לטעון רשימה מה־App Store",
 "Authentication error" => "שגיאת הזדהות",
 "Group already exists" => "הקבוצה כבר קיימת",
 "Unable to add group" => "לא ניתן להוסיף קבוצה",
@@ -17,16 +13,14 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "לא ניתן להוסיף משתמש לקבוצה %s",
 "Unable to remove user from group %s" => "לא ניתן להסיר משתמש מהקבוצה %s",
 "Couldn't update app." => "לא ניתן לעדכן את היישום.",
+"Saved" => "נשמר",
+"Email sent" => "הודעת הדוא״ל נשלחה",
 "All" => "הכל",
-"User Documentation" => "תיעוד משתמש",
-"Update to {appversion}" => "עדכון לגרסה {appversion}",
+"Please wait...." => "נא להמתין…",
 "Disable" => "בטל",
 "Enable" => "הפעלה",
-"Please wait...." => "נא להמתין…",
 "Updating...." => "מתבצע עדכון…",
 "Error while updating app" => "אירעה שגיאה בעת עדכון היישום",
-"Error" => "שגיאה",
-"Update" => "עדכון",
 "Updated" => "מעודכן",
 "Delete" => "מחיקה",
 "Groups" => "קבוצות",
@@ -51,6 +45,7 @@ $TRANSLATIONS = array(
 "Allow resharing" => "לאפשר שיתוף מחדש",
 "Security" => "אבטחה",
 "Enforce HTTPS" => "לאלץ HTTPS",
+"Encryption" => "הצפנה",
 "Server address" => "כתובת שרת",
 "Port" => "פורט",
 "Credentials" => "פרטי גישה",
@@ -60,11 +55,7 @@ $TRANSLATIONS = array(
 "Less" => "פחות",
 "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>." => "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "הוספת היישום שלך",
-"More Apps" => "יישומים נוספים",
-"Select an App" => "בחירת יישום",
-"See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "ברישיון <span class=\"licence\"></span>לטובת <span class=\"author\"></span>",
+"User Documentation" => "תיעוד משתמש",
 "Administrator Documentation" => "תיעוד מנהלים",
 "Online Documentation" => "תיעוד מקוון",
 "Forum" => "פורום",
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index c19ac7e1018..a328b3700aa 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,8 +1,6 @@
 <?php
 $TRANSLATIONS = array(
 "Email sent" => "ईमेल भेज दिया गया है ",
-"Error" => "त्रुटि",
-"Update" => "अद्यतन",
 "Security Warning" => "सुरक्षा चेतावनी ",
 "More" => "और अधिक",
 "Password" => "पासवर्ड",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 6007bbbefca..d37f8beccf2 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Neispravna vrijednost dostavljena za %s",
-"Saved" => "Spremljeno",
-"test email settings" => "Postavke za testiranje e-pošte",
-"If you received this email, the settings seem to be correct." => "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Za vrijeme slanja e-pošte pojavio se problem. Molimo ponovno posjetite svoje postavke.",
-"Email sent" => "E-pošta je poslana",
-"You need to set your user email before being able to send test emails." => "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
-"Send mode" => "Način rada za slanje",
-"Encryption" => "Šifriranje",
-"Authentication method" => "Postupak autentikacije",
-"Unable to load list from App Store" => "Popis iz App Store-a nije moguće učitati.",
 "Authentication error" => "Pogrešna autentikacija",
 "Your full name has been changed." => "Vaše puno ime je promijenjeno.",
 "Unable to change full name" => "Puno ime nije moguće promijeniti.",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
 "Unable to change password" => "Promjena lozinke nije moguća",
+"Saved" => "Spremljeno",
+"test email settings" => "Postavke za testiranje e-pošte",
+"Email sent" => "E-pošta je poslana",
+"You need to set your user email before being able to send test emails." => "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
 "Add trusted domain" => "Dodajte pouzdanu domenu",
 "Sending..." => "Slanje...",
 "All" => "Sve",
-"User Documentation" => "Korisnička dokumentacija",
-"Admin Documentation" => "Admin dokumentacija",
-"Update to {appversion}" => "Ažurirajte u {appversion}",
-"Uninstall App" => "Deinstalirajte app",
-"Disable" => "Onemogućite",
-"Enable" => "Omogućite",
 "Please wait...." => "Molimo pričekajte...",
 "Error while disabling app" => "Pogreška pri onemogućavanju app",
+"Disable" => "Onemogućite",
+"Enable" => "Omogućite",
 "Error while enabling app" => "Pogreška pri omogućavanju app",
 "Updating...." => "Ažuriranje...",
 "Error while updating app" => "Pogreška pri ažuriranju app",
-"Error" => "Pogreška",
-"Update" => "Ažurirajte",
 "Updated" => "Ažurirano",
 "Uninstalling ...." => "Deinstaliranje....",
 "Error while uninstalling app" => "Pogreška pri deinstaliranju app",
@@ -146,8 +133,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
 "Email Server" => "Poslužitelj e-pošte",
 "This is used for sending out notifications." => "Ovo se koristi za slanje notifikacija.",
+"Send mode" => "Način rada za slanje",
+"Encryption" => "Šifriranje",
 "From address" => "S adrese",
 "mail" => "pošta",
+"Authentication method" => "Postupak autentikacije",
 "Authentication required" => "Potrebna autentikacija",
 "Server address" => "Adresa poslužitelja",
 "Port" => "Priključak",
@@ -162,14 +152,11 @@ $TRANSLATIONS = array(
 "Less" => "Manje",
 "Version" => "Verzija",
 "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>." => "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
-"Add your App" => "Dodajte svoje aplikacije",
-"More Apps" => "Više aplikacija",
-"Select an App" => "Odaberite jednu aplikaciju",
 "Documentation:" => "Dokumentacija:",
-"See application page at apps.owncloud.com" => "Vidite stranicu aplikacija na apps.owncloud.com",
-"See application website" => "Vidite web mjesto aplikacija",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencirano <span class=\"author\"></span>",
+"User Documentation" => "Korisnička dokumentacija",
+"Admin Documentation" => "Admin dokumentacija",
 "Enable only for specific groups" => "Omogućite samo za specifične grupe",
+"Uninstall App" => "Deinstalirajte app",
 "Administrator Documentation" => "Dokumentacija administratora",
 "Online Documentation" => "Online dokumentacija",
 "Forum" => "Forum",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index c0bf40f00fe..2f1d9db9e85 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Érvénytelen adatot adott meg erre: %s",
-"Saved" => "Elmentve",
-"test email settings" => "e-mail beállítások ellenőrzése",
-"If you received this email, the settings seem to be correct." => "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Hiba történt az e-mail küldésekor. Kérjük ellenőrizze a beállításokat!",
-"Email sent" => "Az e-mailt elküldtük",
-"You need to set your user email before being able to send test emails." => "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
-"Send mode" => "Küldési mód",
-"Encryption" => "Titkosítás",
-"Authentication method" => "A felhasználóazonosítás módszere",
-"Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
 "Authentication error" => "Azonosítási hiba",
 "Your full name has been changed." => "Az Ön teljes nevét módosítottuk.",
 "Unable to change full name" => "Nem sikerült megváltoztatni a teljes nevét",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "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!",
 "Back-end doesn't support password change, but the users 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",
+"Saved" => "Elmentve",
+"test email settings" => "e-mail beállítások ellenőrzése",
+"Email sent" => "Az e-mailt elküldtük",
+"You need to set your user email before being able to send test emails." => "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
 "Add trusted domain" => "Megbízható tartomány hozzáadása",
 "Sending..." => "Küldés...",
 "All" => "Mind",
-"User Documentation" => "Felhasználói leírás",
-"Admin Documentation" => "Adminisztrátori leírás",
-"Update to {appversion}" => "Frissítés erre a verzióra: {appversion}",
-"Uninstall App" => "Az alkalmazás eltávolítása",
-"Disable" => "Letiltás",
-"Enable" => "Engedélyezés",
 "Please wait...." => "Kérem várjon...",
 "Error while disabling app" => "Hiba az alkalmazás letiltása közben",
+"Disable" => "Letiltás",
+"Enable" => "Engedélyezés",
 "Error while enabling app" => "Hiba az alkalmazás engedélyezése közben",
 "Updating...." => "Frissítés folyamatban...",
 "Error while updating app" => "Hiba történt az alkalmazás frissítése közben",
-"Error" => "Hiba",
-"Update" => "Frissítés",
 "Updated" => "Frissítve",
 "Uninstalling ...." => "Eltávolítás ...",
 "Error while uninstalling app" => "Hiba történt az alkalmazás eltávolítása közben",
@@ -145,8 +132,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Kérjük, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
 "Email Server" => "E-mail kiszolgáló",
 "This is used for sending out notifications." => "Ezt használjuk a jelentések kiküldésére.",
+"Send mode" => "Küldési mód",
+"Encryption" => "Titkosítás",
 "From address" => "A feladó címe",
 "mail" => "mail",
+"Authentication method" => "A felhasználóazonosítás módszere",
 "Authentication required" => "Felhasználóazonosítás szükséges",
 "Server address" => "A kiszolgáló címe",
 "Port" => "Port",
@@ -161,14 +151,11 @@ $TRANSLATIONS = array(
 "Less" => "Kevesebb",
 "Version" => "Verzió",
 "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>." => "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
-"Add your App" => "Az alkalmazás hozzáadása",
-"More Apps" => "További alkalmazások",
-"Select an App" => "Válasszon egy alkalmazást",
 "Documentation:" => "Leírások:",
-"See application page at apps.owncloud.com" => "Lásd apps.owncloud.com, alkalmazások oldal",
-"See application website" => "Lásd az alkalmazások weboldalát",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-a jogtuladonos <span class=\"author\"></span>",
+"User Documentation" => "Felhasználói leírás",
+"Admin Documentation" => "Adminisztrátori leírás",
 "Enable only for specific groups" => "Csak bizonyos csoportok számára tegyük elérhetővé",
+"Uninstall App" => "Az alkalmazás eltávolítása",
 "Administrator Documentation" => "Üzemeltetői leírás",
 "Online Documentation" => "Online leírás",
 "Forum" => "Fórum",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 608beddbe61..b2f50db8cb6 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -1,11 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "Salveguardate",
-"Email sent" => "Message de e-posta inviate",
 "Language changed" => "Linguage cambiate",
 "Invalid request" => "Requesta invalide",
-"Error" => "Error",
-"Update" => "Actualisar",
+"Saved" => "Salveguardate",
+"Email sent" => "Message de e-posta inviate",
 "Very weak password" => "Contrasigno multo debile",
 "Weak password" => "Contrasigno debile",
 "So-so password" => "Contrasigno passabile",
@@ -18,8 +16,6 @@ $TRANSLATIONS = array(
 "Security Warning" => "Aviso de securitate",
 "Log" => "Registro",
 "More" => "Plus",
-"Add your App" => "Adder tu application",
-"Select an App" => "Selectionar un app",
 "Get the apps to sync your files" => "Obtene le apps (applicationes) pro synchronizar tu files",
 "Password" => "Contrasigno",
 "Unable to change your password" => "Non pote cambiar tu contrasigno",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index f21e0fa082b..08544547ddd 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,15 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "Disimpan",
-"test email settings" => "pengaturan email percobaan",
-"If you received this email, the settings seem to be correct." => "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Terjadi masalah saat mengirim email. Mohon tinjau ulang pengaturan Anda.",
-"Email sent" => "Email terkirim",
-"You need to set your user email before being able to send test emails." => "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
-"Send mode" => "Modus kirim",
-"Encryption" => "Enkripsi",
-"Authentication method" => "Metode otentikasi",
-"Unable to load list from App Store" => "Tidak dapat memuat daftar dari App Store",
 "Authentication error" => "Galat saat autentikasi",
 "Your full name has been changed." => "Nama lengkap Anda telah diubah",
 "Unable to change full name" => "Tidak dapat mengubah nama lengkap",
@@ -30,20 +20,19 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
 "Unable to change password" => "Tidak dapat mengubah sandi",
+"Saved" => "Disimpan",
+"test email settings" => "pengaturan email percobaan",
+"Email sent" => "Email terkirim",
+"You need to set your user email before being able to send test emails." => "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
 "Sending..." => "Mengirim",
 "All" => "Semua",
-"User Documentation" => "Dokumentasi Pengguna",
-"Admin Documentation" => "Dokumentasi Admin",
-"Update to {appversion}" => "Perbarui ke {appversion}",
-"Disable" => "Nonaktifkan",
-"Enable" => "Aktifkan",
 "Please wait...." => "Mohon tunggu....",
 "Error while disabling app" => "Galat saat menonaktifkan aplikasi",
+"Disable" => "Nonaktifkan",
+"Enable" => "Aktifkan",
 "Error while enabling app" => "Galat saat mengakifkan aplikasi",
 "Updating...." => "Memperbarui....",
 "Error while updating app" => "Gagal ketika memperbarui aplikasi",
-"Error" => "Galat",
-"Update" => "Perbarui",
 "Updated" => "Diperbarui",
 "Select a profile picture" => "Pilih foto profil",
 "Very weak password" => "Sandi sangat lemah",
@@ -101,7 +90,10 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
 "Email Server" => "Server Email",
 "This is used for sending out notifications." => "Ini digunakan untuk mengirim notifikasi keluar.",
+"Send mode" => "Modus kirim",
+"Encryption" => "Enkripsi",
 "From address" => "Dari alamat",
+"Authentication method" => "Metode otentikasi",
 "Authentication required" => "Diperlukan otentikasi",
 "Server address" => "Alamat server",
 "Port" => "port",
@@ -116,13 +108,9 @@ $TRANSLATIONS = array(
 "Less" => "Ciutkan",
 "Version" => "Versi",
 "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>." => "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Tambahkan Aplikasi Anda",
-"More Apps" => "Aplikasi Lainnya",
-"Select an App" => "Pilih Aplikasi",
 "Documentation:" => "Dokumentasi:",
-"See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
-"See application website" => "Kunjungi situs web aplikasi",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-dilisensikan oleh <span class=\"author\"></span>",
+"User Documentation" => "Dokumentasi Pengguna",
+"Admin Documentation" => "Dokumentasi Admin",
 "Administrator Documentation" => "Dokumentasi Administrator",
 "Online Documentation" => "Dokumentasi Online",
 "Forum" => "Forum",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index dc82b74006f..b28a15cf903 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Tölvupóstur sendur",
-"Encryption" => "Dulkóðun",
-"Unable to load list from App Store" => "Ekki tókst að hlaða lista frá forrita síðu",
 "Authentication error" => "Villa við auðkenningu",
 "Group already exists" => "Hópur er þegar til",
 "Unable to add group" => "Ekki tókst að bæta við hóp",
@@ -15,13 +12,11 @@ $TRANSLATIONS = array(
 "Admins can't remove themself from the admin group" => "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
 "Unable to add user to group %s" => "Ekki tókst að bæta notenda við hópinn %s",
 "Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s",
-"User Documentation" => "Notenda handbók",
+"Email sent" => "Tölvupóstur sendur",
+"Please wait...." => "Andartak....",
 "Disable" => "Gera óvirkt",
 "Enable" => "Virkja",
-"Please wait...." => "Andartak....",
 "Updating...." => "Uppfæri...",
-"Error" => "Villa",
-"Update" => "Uppfæra",
 "Updated" => "Uppfært",
 "Delete" => "Eyða",
 "Groups" => "Hópar",
@@ -31,16 +26,13 @@ $TRANSLATIONS = array(
 "__language_name__" => "__nafn_tungumáls__",
 "None" => "Ekkert",
 "Security Warning" => "Öryggis aðvörun",
+"Encryption" => "Dulkóðun",
 "Server address" => "Host nafn netþjóns",
 "More" => "Meira",
 "Less" => "Minna",
 "Version" => "Útgáfa",
 "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>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Bæta við forriti",
-"More Apps" => "Fleiri forrit",
-"Select an App" => "Veldu forrit",
-"See application page at apps.owncloud.com" => "Skoða síðu forrits hjá apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-leyfi skráð af <span class=\"author\"></span>",
+"User Documentation" => "Notenda handbók",
 "Administrator Documentation" => "Stjórnenda handbók",
 "Online Documentation" => "Handbók á netinu",
 "Forum" => "Vefspjall",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index d7cb337f41a..d140819e454 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Valore non valido fornito per %s",
-"Saved" => "Salvato",
-"test email settings" => "prova impostazioni email",
-"If you received this email, the settings seem to be correct." => "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.",
-"Email sent" => "Email inviata",
-"You need to set your user email before being able to send test emails." => "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
-"Send mode" => "Modalità di invio",
-"Encryption" => "Cifratura",
-"Authentication method" => "Metodo di autenticazione",
-"Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
 "Authentication error" => "Errore di autenticazione",
 "Your full name has been changed." => "Il tuo nome completo è stato cambiato.",
 "Unable to change full name" => "Impossibile cambiare il nome completo",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
 "Unable to change password" => "Impossibile cambiare la password",
+"Saved" => "Salvato",
+"test email settings" => "prova impostazioni email",
+"Email sent" => "Email inviata",
+"You need to set your user email before being able to send test emails." => "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
 "Add trusted domain" => "Aggiungi dominio attendibile",
 "Sending..." => "Invio in corso...",
 "All" => "Tutti",
-"User Documentation" => "Documentazione utente",
-"Admin Documentation" => "Documentazione di amministrazione",
-"Update to {appversion}" => "Aggiorna a {appversion}",
-"Uninstall App" => "Disinstalla applicazione",
-"Disable" => "Disabilita",
-"Enable" => "Abilita",
 "Please wait...." => "Attendere...",
 "Error while disabling app" => "Errore durante la disattivazione",
+"Disable" => "Disabilita",
+"Enable" => "Abilita",
 "Error while enabling app" => "Errore durante l'attivazione",
 "Updating...." => "Aggiornamento in corso...",
 "Error while updating app" => "Errore durante l'aggiornamento",
-"Error" => "Errore",
-"Update" => "Aggiorna",
 "Updated" => "Aggiornato",
 "Uninstalling ...." => "Disinstallazione...",
 "Error while uninstalling app" => "Errore durante la disinstallazione dell'applicazione",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
 "Email Server" => "Server di posta",
 "This is used for sending out notifications." => "Viene utilizzato per inviare le notifiche.",
+"Send mode" => "Modalità di invio",
+"Encryption" => "Cifratura",
 "From address" => "Indirizzo mittente",
 "mail" => "posta",
+"Authentication method" => "Metodo di autenticazione",
 "Authentication required" => "Autenticazione richiesta",
 "Server address" => "Indirizzo del server",
 "Port" => "Porta",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Meno",
 "Version" => "Versione",
 "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>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Aggiungi la tua applicazione",
-"More Apps" => "Altre applicazioni",
-"Select an App" => "Seleziona un'applicazione",
 "Documentation:" => "Documentazione:",
-"See application page at apps.owncloud.com" => "Vedere la pagina dell'applicazione su apps.owncloud.com",
-"See application website" => "Visita il sito web dell'applicazione",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
+"User Documentation" => "Documentazione utente",
+"Admin Documentation" => "Documentazione di amministrazione",
 "Enable only for specific groups" => "Abilita solo per gruppi specifici",
+"Uninstall App" => "Disinstalla applicazione",
 "Administrator Documentation" => "Documentazione amministratore",
 "Online Documentation" => "Documentazione in linea",
 "Forum" => "Forum",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index a9b02663797..c3a828206dc 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "%s に提供された無効な値",
-"Saved" => "保存されました",
-"test email settings" => "メール設定をテスト",
-"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "メールの送信中に問題が発生しました。設定を再考してください。",
-"Email sent" => "メールを送信しました",
-"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
-"Send mode" => "送信モード",
-"Encryption" => "暗号化",
-"Authentication method" => "認証方法",
-"Unable to load list from App Store" => "アプリストアからリストをロードできません",
 "Authentication error" => "認証エラー",
 "Your full name has been changed." => "名前を変更しました。",
 "Unable to change full name" => "名前を変更できません",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
 "Unable to change password" => "パスワードを変更できません",
+"Saved" => "保存されました",
+"test email settings" => "メール設定をテスト",
+"Email sent" => "メールを送信しました",
+"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
 "Add trusted domain" => "信頼するドメイン名に追加",
 "Sending..." => "送信中…",
 "All" => "すべて",
-"User Documentation" => "ユーザードキュメント",
-"Admin Documentation" => "管理者ドキュメント",
-"Update to {appversion}" => "{appversion} にアップデート",
-"Uninstall App" => "アプリをアンインストール",
-"Disable" => "無効",
-"Enable" => "有効にする",
 "Please wait...." => "しばらくお待ちください。",
 "Error while disabling app" => "アプリ無効化中にエラーが発生",
+"Disable" => "無効",
+"Enable" => "有効にする",
 "Error while enabling app" => "アプリを有効にする際にエラーが発生",
 "Updating...." => "更新中....",
 "Error while updating app" => "アプリの更新中にエラーが発生",
-"Error" => "エラー",
-"Update" => "アップデート",
 "Updated" => "アップデート済み",
 "Uninstalling ...." => "アンインストール中 ....",
 "Error while uninstalling app" => "アプリをアンインストール中にエラーが発生",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
 "Email Server" => "メールサーバー",
 "This is used for sending out notifications." => "これは通知の送信に使われます。",
+"Send mode" => "送信モード",
+"Encryption" => "暗号化",
 "From address" => "送信元アドレス",
 "mail" => "メール",
+"Authentication method" => "認証方法",
 "Authentication required" => "認証を必要とする",
 "Server address" => "サーバーアドレス",
 "Port" => "ポート",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "閉じる",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
-"Add your App" => "アプリを追加",
-"More Apps" => "さらにアプリを表示",
-"Select an App" => "アプリを選択してください",
 "Documentation:" => "ドキュメント:",
-"See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
-"See application website" => "アプリケーションのウェブサイトを見る",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
+"User Documentation" => "ユーザードキュメント",
+"Admin Documentation" => "管理者ドキュメント",
 "Enable only for specific groups" => "特定のグループのみ有効に",
+"Uninstall App" => "アプリをアンインストール",
 "Administrator Documentation" => "管理者ドキュメント",
 "Online Documentation" => "オンラインドキュメント",
 "Forum" => "フォーラム",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index 5637b417956..bea73e94943 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "იმეილი გაიგზავნა",
-"Encryption" => "ენკრიპცია",
-"Unable to load list from App Store" => "აპლიკაციების სია ვერ ჩამოიტვირთა App Store",
 "Authentication error" => "ავთენტიფიკაციის შეცდომა",
 "Group already exists" => "ჯგუფი უკვე არსებობს",
 "Unable to add group" => "ჯგუფის დამატება ვერ მოხერხდა",
@@ -16,16 +13,13 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "მომხმარებლის დამატება ვერ მოხეხდა ჯგუფში %s",
 "Unable to remove user from group %s" => "მომხმარებლის წაშლა ვერ მოხეხდა ჯგუფიდან %s",
 "Couldn't update app." => "ვერ მოხერხდა აპლიკაციის განახლება.",
+"Email sent" => "იმეილი გაიგზავნა",
 "All" => "ყველა",
-"User Documentation" => "მომხმარებლის დოკუმენტაცია",
-"Update to {appversion}" => "განაახლე {appversion}–მდე",
+"Please wait...." => "დაიცადეთ....",
 "Disable" => "გამორთვა",
 "Enable" => "ჩართვა",
-"Please wait...." => "დაიცადეთ....",
 "Updating...." => "მიმდინარეობს განახლება....",
 "Error while updating app" => "შეცდომა აპლიკაციის განახლების დროს",
-"Error" => "შეცდომა",
-"Update" => "განახლება",
 "Updated" => "განახლებულია",
 "Delete" => "წაშლა",
 "Groups" => "ჯგუფები",
@@ -52,6 +46,7 @@ $TRANSLATIONS = array(
 "Allow resharing" => "გადაზიარების დაშვება",
 "Security" => "უსაფრთხოება",
 "Enforce HTTPS" => "HTTPS–ის ჩართვა",
+"Encryption" => "ენკრიპცია",
 "Server address" => "სერვერის მისამართი",
 "Port" => "პორტი",
 "Credentials" => "იუზერ/პაროლი",
@@ -61,11 +56,7 @@ $TRANSLATIONS = array(
 "Less" => "უფრო ნაკლები",
 "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>." => "წარმოებულია <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.",
-"Add your App" => "დაამატე შენი აპლიკაცია",
-"More Apps" => "უფრო მეტი აპლიკაციები",
-"Select an App" => "აირჩიეთ აპლიკაცია",
-"See application page at apps.owncloud.com" => "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>",
+"User Documentation" => "მომხმარებლის დოკუმენტაცია",
 "Administrator Documentation" => "ადმინისტრატორის დოკუმენტაცია",
 "Online Documentation" => "ონლაინ დოკუმენტაცია",
 "Forum" => "ფორუმი",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index da1f5872741..74df3711c0d 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -1,13 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "បាន​រក្សាទុក",
-"test email settings" => "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
-"If you received this email, the settings seem to be correct." => "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "មាន​កំហុស​កើត​ឡើង​នៅ​ពេល​កំពុង​ផ្ញើ​អ៊ីមែល​ចេញ។ សូម​មើល​ការ​កំណត់​របស់​អ្នក​ម្ដង​ទៀត។",
-"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
-"You need to set your user email before being able to send test emails." => "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
-"Encryption" => "កូដនីយកម្ម",
-"Unable to load list from App Store" => "មិនអាចផ្ទុកបញ្ជីកម្មវិធីពី App Store",
 "Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
 "Group already exists" => "មាន​ក្រុម​នេះ​រួច​ហើយ",
 "Unable to add group" => "មិន​អាច​បន្ថែម​ក្រុម",
@@ -22,18 +14,17 @@ $TRANSLATIONS = array(
 "Unable to remove user from group %s" => "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ​ពី​ក្រុម​ %s",
 "Couldn't update app." => "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
 "Wrong password" => "ខុស​ពាក្យ​សម្ងាត់",
+"Saved" => "បាន​រក្សាទុក",
+"test email settings" => "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
+"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
+"You need to set your user email before being able to send test emails." => "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
 "Sending..." => "កំពុង​ផ្ញើ...",
-"User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
-"Admin Documentation" => "កម្រង​ឯកសារ​អភិបាល",
-"Update to {appversion}" => "ធ្វើ​បច្ចុប្បន្នភាព​ទៅ {appversion}",
-"Disable" => "បិទ",
-"Enable" => "បើក",
 "Please wait...." => "សូម​រង់​ចាំ....",
 "Error while disabling app" => "មាន​កំហុស​ពេល​កំពុង​បិទកម្មវិធី",
+"Disable" => "បិទ",
+"Enable" => "បើក",
 "Updating...." => "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
 "Error while updating app" => "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
-"Error" => "កំហុស",
-"Update" => "ធ្វើ​បច្ចុប្បន្នភាព",
 "Updated" => "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
 "Select a profile picture" => "ជ្រើស​រូបភាព​ប្រវត្តិរូប",
 "Very weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
@@ -69,6 +60,7 @@ $TRANSLATIONS = array(
 "Security" => "សុវត្ថិភាព",
 "Enforce HTTPS" => "បង្ខំ HTTPS",
 "Email Server" => "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+"Encryption" => "កូដនីយកម្ម",
 "From address" => "ពី​អាសយដ្ឋាន",
 "Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
 "Port" => "ច្រក",
@@ -79,11 +71,8 @@ $TRANSLATIONS = array(
 "Less" => "តិច",
 "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>." => "សរសេរ​កម្មវិធី​ដោយ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">សហគមន៍ ownCloud</a> ហើយ <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> គឺ​ស្ថិត​ក្នុង​អាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។",
-"Add your App" => "បន្ថែម​កម្មវិធី​របស់​អ្នក",
-"More Apps" => "កម្មវិធី​ច្រើន​ទៀត",
-"Select an App" => "ជ្រើស​កម្មវិធី​មួយ",
-"See application page at apps.owncloud.com" => "សូម​មើក​កម្មវិធី​ផ្សេងៗ​លើទំព័រ apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-អាជ្ញា​ប័ណ្ណ​ដោយ <span class=\"author\"></span>",
+"User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+"Admin Documentation" => "កម្រង​ឯកសារ​អភិបាល",
 "Administrator Documentation" => "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
 "Online Documentation" => "ឯកសារ Online",
 "Forum" => "វេទិកាពិភាក្សា",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index cc1448f1d2f..689c6d27bde 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,10 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "저장됨",
-"Email sent" => "이메일 발송됨",
-"Encryption" => "암호화",
-"Authentication method" => "인증 방법",
-"Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
 "Authentication error" => "인증 오류",
 "Your full name has been changed." => "전체 이름이 변경되었습니다.",
 "Unable to change full name" => "전체 이름을 변경할 수 없음",
@@ -28,21 +23,17 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.",
 "Unable to change password" => "암호를 변경할 수 없음",
+"Saved" => "저장됨",
+"Email sent" => "이메일 발송됨",
 "Sending..." => "보내는 중...",
 "All" => "모두",
-"User Documentation" => "사용자 문서",
-"Admin Documentation" => "운영자 문서",
-"Update to {appversion}" => "버전 {appversion}(으)로 업데이트",
-"Uninstall App" => "앱 제거",
-"Disable" => "사용 안함",
-"Enable" => "사용함",
 "Please wait...." => "기다려 주십시오....",
 "Error while disabling app" => "앱을 비활성화하는 중 오류 발생",
+"Disable" => "사용 안함",
+"Enable" => "사용함",
 "Error while enabling app" => "앱을 활성화하는 중 오류 발생",
 "Updating...." => "업데이트 중....",
 "Error while updating app" => "앱을 업데이트하는 중 오류 발생",
-"Error" => "오류",
-"Update" => "업데이트",
 "Updated" => "업데이트됨",
 "Uninstalling ...." => "제거 하는 중 ....",
 "Error while uninstalling app" => "앱을 제거하는 중 오류 발생",
@@ -104,7 +95,9 @@ $TRANSLATIONS = array(
 "Forces the clients to connect to %s via an encrypted connection." => "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
 "Email Server" => "전자우편 서버",
+"Encryption" => "암호화",
 "From address" => "보낸 이 주소",
+"Authentication method" => "인증 방법",
 "Authentication required" => "인증 필요함",
 "Server address" => "서버 주소",
 "Port" => "포트",
@@ -119,14 +112,11 @@ $TRANSLATIONS = array(
 "Less" => "덜 중요함",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
-"Add your App" => "내 앱 추가",
-"More Apps" => "더 많은 앱",
-"Select an App" => "앱 선택",
 "Documentation:" => "문서",
-"See application page at apps.owncloud.com" => "apps.owncloud.com에 있는 앱 페이지를 참고하십시오",
-"See application website" => "어플리케이션 웹사이트 보기",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-라이선스됨: <span class=\"author\"></span>",
+"User Documentation" => "사용자 문서",
+"Admin Documentation" => "운영자 문서",
 "Enable only for specific groups" => "특정 그룹에만 허용",
+"Uninstall App" => "앱 제거",
 "Administrator Documentation" => "관리자 문서",
 "Online Documentation" => "온라인 문서",
 "Forum" => "포럼",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index b5c40ae0a1f..01ca81e68c2 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -1,12 +1,10 @@
 <?php
 $TRANSLATIONS = array(
-"Encryption" => "نهێنیکردن",
 "Invalid request" => "داواکارى نادروستە",
 "Enable" => "چالاککردن",
-"Error" => "هه‌ڵه",
-"Update" => "نوێکردنه‌وه",
 "None" => "هیچ",
 "Login" => "چوونەژوورەوە",
+"Encryption" => "نهێنیکردن",
 "Server address" => "ناونیشانی ڕاژه",
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 214ed9d2bc5..82edc1748db 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Email geschéckt",
-"Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
 "Authentication error" => "Authentifikatioun's Fehler",
 "Group already exists" => "Group existeiert schon.",
 "Unable to add group" => "Onmeiglech Grupp beizefügen.",
@@ -13,11 +11,10 @@ $TRANSLATIONS = array(
 "Invalid request" => "Ongülteg Requête",
 "Admins can't remove themself from the admin group" => "Admins kennen sech selwer net aus enger Admin Group läschen.",
 "Unable to add user to group %s" => "Onmeiglech User an Grupp ze sätzen %s",
+"Email sent" => "Email geschéckt",
 "All" => "All",
 "Disable" => "Ofschalten",
 "Enable" => "Aschalten",
-"Error" => "Fehler",
-"Update" => "Update",
 "Delete" => "Läschen",
 "Groups" => "Gruppen",
 "undo" => "réckgängeg man",
@@ -33,9 +30,6 @@ $TRANSLATIONS = array(
 "Log" => "Log",
 "More" => "Méi",
 "Less" => "Manner",
-"Add your App" => "Setz deng App bei",
-"Select an App" => "Wiel eng Applikatioun aus",
-"See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
 "Password" => "Passwuert",
 "Unable to change your password" => "Konnt däin Passwuert net änneren",
 "Current password" => "Momentan 't Passwuert",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index bc8a9127a17..ebc255c461e 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Laiškas išsiųstas",
-"Encryption" => "Šifravimas",
-"Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
 "Authentication error" => "Autentikacijos klaida",
 "Group already exists" => "Grupė jau egzistuoja",
 "Unable to add group" => "Nepavyko pridėti grupės",
@@ -22,18 +19,15 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
 "Unable to change password" => "Nepavyksta pakeisti slaptažodžio",
+"Email sent" => "Laiškas išsiųstas",
 "All" => "Viskas",
-"User Documentation" => "Naudotojo dokumentacija",
-"Update to {appversion}" => "Atnaujinti iki {appversion}",
-"Disable" => "Išjungti",
-"Enable" => "Įjungti",
 "Please wait...." => "Prašome palaukti...",
 "Error while disabling app" => "Klaida išjungiant programą",
+"Disable" => "Išjungti",
+"Enable" => "Įjungti",
 "Error while enabling app" => "Klaida įjungiant programą",
 "Updating...." => "Atnaujinama...",
 "Error while updating app" => "Įvyko klaida atnaujinant programą",
-"Error" => "Klaida",
-"Update" => "Atnaujinti",
 "Updated" => "Atnaujinta",
 "Select a profile picture" => "Pažymėkite profilio paveikslėlį",
 "Delete" => "Ištrinti",
@@ -69,6 +63,7 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Reikalauti HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
+"Encryption" => "Šifravimas",
 "Server address" => "Serverio adresas",
 "Port" => "Prievadas",
 "Log" => "Žurnalas",
@@ -77,11 +72,7 @@ $TRANSLATIONS = array(
 "Less" => "Mažiau",
 "Version" => "Versija",
 "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>." => "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Pridėti programėlę",
-"More Apps" => "Daugiau aplikacijų",
-"Select an App" => "Pasirinkite programą",
-"See application page at apps.owncloud.com" => "Žiūrėti programos puslapį svetainėje apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
+"User Documentation" => "Naudotojo dokumentacija",
 "Administrator Documentation" => "Administratoriaus dokumentacija",
 "Online Documentation" => "Dokumentacija tinkle",
 "Forum" => "Forumas",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 256e35076f1..2fde1034818 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Vēstule nosūtīta",
-"Encryption" => "Šifrēšana",
-"Unable to load list from App Store" => "Nevar lejupielādēt sarakstu no lietotņu veikala",
 "Authentication error" => "Autentifikācijas kļūda",
 "Group already exists" => "Grupa jau eksistē",
 "Unable to add group" => "Nevar pievienot grupu",
@@ -16,16 +13,13 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Nevar pievienot lietotāju grupai %s",
 "Unable to remove user from group %s" => "Nevar izņemt lietotāju no grupas %s",
 "Couldn't update app." => "Nevarēja atjaunināt lietotni.",
+"Email sent" => "Vēstule nosūtīta",
 "All" => "Visi",
-"User Documentation" => "Lietotāja dokumentācija",
-"Update to {appversion}" => "Atjaunināt uz {appversion}",
+"Please wait...." => "Lūdzu, uzgaidiet....",
 "Disable" => "Deaktivēt",
 "Enable" => "Aktivēt",
-"Please wait...." => "Lūdzu, uzgaidiet....",
 "Updating...." => "Atjaunina....",
 "Error while updating app" => "Kļūda, atjauninot lietotni",
-"Error" => "Kļūda",
-"Update" => "Atjaunināt",
 "Updated" => "Atjaunināta",
 "Delete" => "Dzēst",
 "Decrypting files... Please wait, this can take some time." => "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
@@ -57,6 +51,7 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Uzspiest HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
+"Encryption" => "Šifrēšana",
 "Server address" => "Servera adrese",
 "Port" => "Ports",
 "Credentials" => "Akreditācijas dati",
@@ -66,11 +61,7 @@ $TRANSLATIONS = array(
 "Less" => "Mazāk",
 "Version" => "Versija",
 "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>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Pievieno savu lietotni",
-"More Apps" => "Vairāk lietotņu",
-"Select an App" => "Izvēlies lietotni",
-"See application page at apps.owncloud.com" => "Apskati lietotņu lapu — apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencēts no <span class=\"author\"></span>",
+"User Documentation" => "Lietotāja dokumentācija",
 "Administrator Documentation" => "Administratora dokumentācija",
 "Online Documentation" => "Tiešsaistes dokumentācija",
 "Forum" => "Forums",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 229bd0a16e4..bc90e8d343d 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,13 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Неправилна вредност е доставена за %s",
-"Saved" => "Снимено",
-"test email settings" => "провери ги нагодувањата за електронска пошта",
-"Email sent" => "Е-порака пратена",
-"Send mode" => "Мод на испраќање",
-"Encryption" => "Енкрипција",
-"Authentication method" => "Метод на автентификација",
-"Unable to load list from App Store" => "Неможам да вчитам листа од App Store",
 "Authentication error" => "Грешка во автентикација",
 "Your full name has been changed." => "Вашето целосно име е променето.",
 "Unable to change full name" => "Не можам да го променам целото име",
@@ -29,20 +21,18 @@ $TRANSLATIONS = array(
 "Wrong password" => "Погрешна лозинка",
 "No user supplied" => "Нема корисничко име",
 "Unable to change password" => "Вашата лозинка неможе да се смени",
+"Saved" => "Снимено",
+"test email settings" => "провери ги нагодувањата за електронска пошта",
+"Email sent" => "Е-порака пратена",
 "Sending..." => "Испраќам...",
 "All" => "Сите",
-"User Documentation" => "Корисничка документација",
-"Admin Documentation" => "Админстраторска документација",
-"Update to {appversion}" => "Надгради на {appversion}",
-"Disable" => "Оневозможи",
-"Enable" => "Овозможи",
 "Please wait...." => "Ве молам почекајте ...",
 "Error while disabling app" => "Грешка при исклучувањето на апликацијата",
+"Disable" => "Оневозможи",
+"Enable" => "Овозможи",
 "Error while enabling app" => "Грешка при вклучувањето на апликацијата",
 "Updating...." => "Надградувам ...",
 "Error while updating app" => "Грешка додека ја надградувам апликацијата",
-"Error" => "Грешка",
-"Update" => "Ажурирај",
 "Updated" => "Надграден",
 "Select a profile picture" => "Одбери фотографија за профилот",
 "Very weak password" => "Многу слаба лозинка",
@@ -97,8 +87,11 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Наметни HTTPS",
 "Email Server" => "Сервер за електронска пошта",
 "This is used for sending out notifications." => "Ова се користи за испраќање на известувања.",
+"Send mode" => "Мод на испраќање",
+"Encryption" => "Енкрипција",
 "From address" => "Од адреса",
 "mail" => "Електронска пошта",
+"Authentication method" => "Метод на автентификација",
 "Authentication required" => "Потребна е автентификација",
 "Server address" => "Адреса на сервер",
 "Port" => "Порта",
@@ -113,13 +106,9 @@ $TRANSLATIONS = array(
 "Less" => "Помалку",
 "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>." => "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Додадете ја Вашата апликација",
-"More Apps" => "Повеќе аппликации",
-"Select an App" => "Избери аппликација",
 "Documentation:" => "Документација:",
-"See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
-"See application website" => "Види го веб сајтот на апликацијата",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирано од <span class=\"author\"></span>",
+"User Documentation" => "Корисничка документација",
+"Admin Documentation" => "Админстраторска документација",
 "Enable only for specific groups" => "Овозможи само на специфицирани групи",
 "Administrator Documentation" => "Администраторска документација",
 "Online Documentation" => "Документација на интернет",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 690b92bc732..98869363e95 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -7,8 +7,6 @@ $TRANSLATIONS = array(
 "Invalid request" => "Permintaan tidak sah",
 "Disable" => "Nyahaktif",
 "Enable" => "Aktif",
-"Error" => "Ralat",
-"Update" => "Kemaskini",
 "Delete" => "Padam",
 "Groups" => "Kumpulan",
 "never" => "jangan",
@@ -19,9 +17,6 @@ $TRANSLATIONS = array(
 "Log" => "Log",
 "Log level" => "Tahap Log",
 "More" => "Lanjutan",
-"Add your App" => "Tambah apps anda",
-"Select an App" => "Pilih aplikasi",
-"See application page at apps.owncloud.com" => "Lihat halaman applikasi di apps.owncloud.com",
 "Password" => "Kata laluan",
 "Unable to change your password" => "Gagal mengubah kata laluan anda ",
 "Current password" => "Kata laluan semasa",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 68f827ac2c0..f10f8e8fe44 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Ugyldig verdi angitt for %s",
-"Saved" => "Lagret",
-"test email settings" => "Test av innstillinger for e-post",
-"If you received this email, the settings seem to be correct." => "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Et problem oppstod under sending av e-posten. Sjekk innstillingene.",
-"Email sent" => "E-post sendt",
-"You need to set your user email before being able to send test emails." => "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
-"Send mode" => "Sendemåte",
-"Encryption" => "Kryptering",
-"Authentication method" => "Autentiseringsmetode",
-"Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
 "Authentication error" => "Autentiseringsfeil",
 "Your full name has been changed." => "Ditt fulle navn er blitt endret.",
 "Unable to change full name" => "Klarte ikke å endre fullt navn",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
 "Unable to change password" => "Kunne ikke endre passord",
+"Saved" => "Lagret",
+"test email settings" => "Test av innstillinger for e-post",
+"Email sent" => "E-post sendt",
+"You need to set your user email before being able to send test emails." => "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
 "Add trusted domain" => "Legg til et tiltrodd domene",
 "Sending..." => "Sender...",
 "All" => "Alle",
-"User Documentation" => "Brukerdokumentasjon",
-"Admin Documentation" => "Admin-dokumentasjon",
-"Update to {appversion}" => "Oppdater til {appversion}",
-"Uninstall App" => "Avinstaller app",
-"Disable" => "Deaktiver ",
-"Enable" => "Aktiver",
 "Please wait...." => "Vennligst vent...",
 "Error while disabling app" => "Deaktivering av app feilet",
+"Disable" => "Deaktiver ",
+"Enable" => "Aktiver",
 "Error while enabling app" => "Aktivering av app feilet",
 "Updating...." => "Oppdaterer...",
 "Error while updating app" => "Feil ved oppdatering av app",
-"Error" => "Feil",
-"Update" => "Oppdater",
 "Updated" => "Oppdatert",
 "Uninstalling ...." => "Avinstallerer ....",
 "Error while uninstalling app" => "Feil ved avinstallering av app",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
 "Email Server" => "E-postserver",
 "This is used for sending out notifications." => "Dette brukes for utsending av varsler.",
+"Send mode" => "Sendemåte",
+"Encryption" => "Kryptering",
 "From address" => "Fra adresse",
 "mail" => "e-post",
+"Authentication method" => "Autentiseringsmetode",
 "Authentication required" => "Autentisering kreves",
 "Server address" => "Server-adresse",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Mindre",
 "Version" => "Versjon",
 "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>." => "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Legg til din App",
-"More Apps" => "Flere apper",
-"Select an App" => "Velg en app",
 "Documentation:" => "Dokumentasjon:",
-"See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
-"See application website" => "Vis applikasjonens nettsted",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensiert av <span class=\"author\"></span>",
+"User Documentation" => "Brukerdokumentasjon",
+"Admin Documentation" => "Admin-dokumentasjon",
 "Enable only for specific groups" => "Aktiver kun for visse grupper",
+"Uninstall App" => "Avinstaller app",
 "Administrator Documentation" => "Dokumentasjon for administratorer",
 "Online Documentation" => "Online dokumentasjon",
 "Forum" => "Forum",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 07c5f66bc9c..666b34981f6 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Ongeldige waarde voor %s",
-"Saved" => "Bewaard",
-"test email settings" => "test e-mailinstellingen",
-"If you received this email, the settings seem to be correct." => "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
-"Email sent" => "E-mail verzonden",
-"You need to set your user email before being able to send test emails." => "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
-"Send mode" => "Verstuurmodus",
-"Encryption" => "Versleuteling",
-"Authentication method" => "Authenticatiemethode",
-"Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
 "Authentication error" => "Authenticatie fout",
 "Your full name has been changed." => "Uw volledige naam is gewijzigd.",
 "Unable to change full name" => "Kan de volledige naam niet wijzigen",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
 "Unable to change password" => "Kan wachtwoord niet wijzigen",
+"Saved" => "Bewaard",
+"test email settings" => "test e-mailinstellingen",
+"Email sent" => "E-mail verzonden",
+"You need to set your user email before being able to send test emails." => "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
 "Add trusted domain" => "Vertrouwd domein toevoegen",
 "Sending..." => "Versturen...",
 "All" => "Alle",
-"User Documentation" => "Gebruikersdocumentatie",
-"Admin Documentation" => "Beheerdocumentatie",
-"Update to {appversion}" => "Bijwerken naar {appversion}",
-"Uninstall App" => "De-installeren app",
-"Disable" => "Uitschakelen",
-"Enable" => "Activeer",
 "Please wait...." => "Even geduld aub....",
 "Error while disabling app" => "Fout tijdens het uitzetten van het programma",
+"Disable" => "Uitschakelen",
+"Enable" => "Activeer",
 "Error while enabling app" => "Fout tijdens het aanzetten van het programma",
 "Updating...." => "Bijwerken....",
 "Error while updating app" => "Fout bij bijwerken app",
-"Error" => "Fout",
-"Update" => "Bijwerken",
 "Updated" => "Bijgewerkt",
 "Uninstalling ...." => "De-installeren ...",
 "Error while uninstalling app" => "Fout bij de-installeren app",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
 "Email Server" => "E-mailserver",
 "This is used for sending out notifications." => "Dit wordt gestuurd voor het verzenden van meldingen.",
+"Send mode" => "Verstuurmodus",
+"Encryption" => "Versleuteling",
 "From address" => "Afzenderadres",
 "mail" => "e-mail",
+"Authentication method" => "Authenticatiemethode",
 "Authentication required" => "Authenticatie vereist",
 "Server address" => "Server adres",
 "Port" => "Poort",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Minder",
 "Version" => "Versie",
 "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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "App toevoegen",
-"More Apps" => "Meer apps",
-"Select an App" => "Selecteer een app",
 "Documentation:" => "Documentatie:",
-"See application page at apps.owncloud.com" => "Zie de applicatiepagina op apps.owncloud.com",
-"See application website" => "Zie website van de applicatie",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
+"User Documentation" => "Gebruikersdocumentatie",
+"Admin Documentation" => "Beheerdocumentatie",
 "Enable only for specific groups" => "Alleen voor bepaalde groepen activeren",
+"Uninstall App" => "De-installeren app",
 "Administrator Documentation" => "Beheerdersdocumentatie",
 "Online Documentation" => "Online documentatie",
 "Forum" => "Forum",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index cc0f2438f3b..b8d0d23ca84 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "E-post sendt",
-"Encryption" => "Kryptering",
-"Unable to load list from App Store" => "Klarer ikkje å lasta inn liste fra app-butikken",
 "Authentication error" => "Autentiseringsfeil",
 "Group already exists" => "Gruppa finst allereie",
 "Unable to add group" => "Klarte ikkje leggja til gruppa",
@@ -22,18 +19,15 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
 "Unable to change password" => "Klarte ikkje å endra passordet",
+"Email sent" => "E-post sendt",
 "All" => "Alle",
-"User Documentation" => "Brukardokumentasjon",
-"Update to {appversion}" => "Oppdater til {appversion}",
-"Disable" => "Slå av",
-"Enable" => "Slå på",
 "Please wait...." => "Ver venleg og vent …",
 "Error while disabling app" => "Klarte ikkje å skru av programmet",
+"Disable" => "Slå av",
+"Enable" => "Slå på",
 "Error while enabling app" => "Klarte ikkje å skru på programmet",
 "Updating...." => "Oppdaterer …",
 "Error while updating app" => "Feil ved oppdatering av app",
-"Error" => "Feil",
-"Update" => "Oppdater",
 "Updated" => "Oppdatert",
 "Select a profile picture" => "Vel eit profilbilete",
 "Very weak password" => "Veldig svakt passord",
@@ -67,6 +61,7 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Krev HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
+"Encryption" => "Kryptering",
 "Server address" => "Tenaradresse",
 "Log" => "Logg",
 "Log level" => "Log nivå",
@@ -74,11 +69,7 @@ $TRANSLATIONS = array(
 "Less" => "Mindre",
 "Version" => "Utgåve",
 "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>." => "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Legg til din app",
-"More Apps" => "Fleire app-ar",
-"Select an App" => "Vel eit program",
-"See application page at apps.owncloud.com" => "Sjå programsida på apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Lisensiert under <span class=\"licence\"></span> av <span class=\"author\"></span>",
+"User Documentation" => "Brukardokumentasjon",
 "Administrator Documentation" => "Administratordokumentasjon",
 "Online Documentation" => "Dokumentasjon på nett",
 "Forum" => "Forum",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 5ed02ec8f42..4fc9968a384 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Pas possible de cargar la tièra dempuèi App Store",
 "Authentication error" => "Error d'autentificacion",
 "Group already exists" => "Lo grop existís ja",
 "Unable to add group" => "Pas capable d'apondre  un grop",
@@ -14,7 +13,6 @@ $TRANSLATIONS = array(
 "Unable to remove user from group %s" => "Pas capable de tira un usancièr del grop %s",
 "Disable" => "Desactiva",
 "Enable" => "Activa",
-"Error" => "Error",
 "Delete" => "Escafa",
 "Groups" => "Grops",
 "undo" => "defar",
@@ -28,10 +26,6 @@ $TRANSLATIONS = array(
 "Sharing" => "Al partejar",
 "Log" => "Jornal",
 "More" => "Mai d'aquò",
-"Add your App" => "Ajusta ton App",
-"Select an App" => "Selecciona una applicacion",
-"See application page at apps.owncloud.com" => "Agacha la pagina d'applications en cò de apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licençiat per <span class=\"author\"></span>",
 "Password" => "Senhal",
 "Your password was changed" => "Ton senhal a cambiat",
 "Unable to change your password" => "Pas possible de cambiar ton senhal",
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php
index 94b807624a9..5d651a78dd8 100644
--- a/settings/l10n/pa.php
+++ b/settings/l10n/pa.php
@@ -1,11 +1,10 @@
 <?php
 $TRANSLATIONS = array(
 "Language changed" => "ਭਾਸ਼ਾ ਬਦਲੀ",
+"Please wait...." => "...ਉਡੀਕੋ ਜੀ",
 "Disable" => "ਬੰਦ",
 "Enable" => "ਚਾਲੂ",
-"Please wait...." => "...ਉਡੀਕੋ ਜੀ",
 "Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
-"Error" => "ਗਲਤੀ",
 "Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ",
 "Delete" => "ਹਟਾਓ",
 "Groups" => "ਗਰੁੱਪ",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index d5720a62139..3e2ca7d26e1 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Nieprawidłowa wartość %s",
-"Saved" => "Zapisano",
-"test email settings" => "przetestuj ustawienia email",
-"If you received this email, the settings seem to be correct." => "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Pojawił się problem podczas wysyłania e-mail. Proszę sprawdzić ponownie ustawienia",
-"Email sent" => "E-mail wysłany",
-"You need to set your user email before being able to send test emails." => "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
-"Send mode" => "Tryb wysyłki",
-"Encryption" => "Szyfrowanie",
-"Authentication method" => "Metoda autentykacji",
-"Unable to load list from App Store" => "Nie można wczytać listy aplikacji",
 "Authentication error" => "Błąd uwierzytelniania",
 "Your full name has been changed." => "Twoja pełna nazwa została zmieniona.",
 "Unable to change full name" => "Nie można zmienić pełnej nazwy",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
 "Unable to change password" => "Nie można zmienić hasła",
+"Saved" => "Zapisano",
+"test email settings" => "przetestuj ustawienia email",
+"Email sent" => "E-mail wysłany",
+"You need to set your user email before being able to send test emails." => "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
 "Add trusted domain" => "Dodaj zaufaną domenę",
 "Sending..." => "Wysyłam...",
 "All" => "Wszystkie",
-"User Documentation" => "Dokumentacja użytkownika",
-"Admin Documentation" => "Dokumentacja Administratora",
-"Update to {appversion}" => "Aktualizacja do {appversion}",
-"Uninstall App" => "Odinstaluj aplikację",
-"Disable" => "Wyłącz",
-"Enable" => "Włącz",
 "Please wait...." => "Proszę czekać...",
 "Error while disabling app" => "Błąd podczas wyłączania aplikacji",
+"Disable" => "Wyłącz",
+"Enable" => "Włącz",
 "Error while enabling app" => "Błąd podczas włączania aplikacji",
 "Updating...." => "Aktualizacja w toku...",
 "Error while updating app" => "Błąd podczas aktualizacji aplikacji",
-"Error" => "Błąd",
-"Update" => "Aktualizuj",
 "Updated" => "Zaktualizowano",
 "Uninstalling ...." => "Odinstalowywanie....",
 "Error while uninstalling app" => "Błąd przy odinstalowywaniu aplikacji",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
 "Email Server" => "Serwer pocztowy",
 "This is used for sending out notifications." => "To jest używane do wysyłania powiadomień",
+"Send mode" => "Tryb wysyłki",
+"Encryption" => "Szyfrowanie",
 "From address" => "Z adresu",
 "mail" => "mail",
+"Authentication method" => "Metoda autentykacji",
 "Authentication required" => "Wymagana autoryzacja",
 "Server address" => "Adres Serwera",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Mniej",
 "Version" => "Wersja",
 "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>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Dodaj swoją aplikację",
-"More Apps" => "Więcej aplikacji",
-"Select an App" => "Zaznacz aplikację",
 "Documentation:" => "Dokumentacja:",
-"See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
-"See application website" => "Zobacz na stronie aplikacji",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
+"User Documentation" => "Dokumentacja użytkownika",
+"Admin Documentation" => "Dokumentacja Administratora",
 "Enable only for specific groups" => "Włącz tylko dla określonych grup",
+"Uninstall App" => "Odinstaluj aplikację",
 "Administrator Documentation" => "Dokumentacja administratora",
 "Online Documentation" => "Dokumentacja online",
 "Forum" => "Forum",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 3ab79191e27..2e9a1a2c016 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Valor inválido fornecido para %s",
-"Saved" => "Salvo",
-"test email settings" => "testar configurações de email",
-"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail, as configurações parecem estar corretas.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocorreu um problema ao enviar o e-mail. Por favor, reveja suas configurações.",
-"Email sent" => "E-mail enviado",
-"You need to set your user email before being able to send test emails." => "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
-"Send mode" => "Modo enviar",
-"Encryption" => "Criptografia",
-"Authentication method" => "Método de autenticação",
-"Unable to load list from App Store" => "Não foi possível carregar lista da App Store",
 "Authentication error" => "Erro de autenticação",
 "Your full name has been changed." => "Seu nome completo foi alterado.",
 "Unable to change full name" => "Não é possível alterar o nome completo",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
 "Unable to change password" => "Impossível modificar senha",
+"Saved" => "Salvo",
+"test email settings" => "testar configurações de email",
+"Email sent" => "E-mail enviado",
+"You need to set your user email before being able to send test emails." => "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
 "Add trusted domain" => "Adicionar domínio confiável",
 "Sending..." => "Enviando...",
 "All" => "Todos",
-"User Documentation" => "Documentação de Usuário",
-"Admin Documentation" => "Documentação de Administrador",
-"Update to {appversion}" => "Atualizar para {appversion}",
-"Uninstall App" => "Desinstalar Aplicativo",
-"Disable" => "Desabilitar",
-"Enable" => "Habilitar",
 "Please wait...." => "Por favor, aguarde...",
 "Error while disabling app" => "Erro enquanto desabilitava o aplicativo",
+"Disable" => "Desabilitar",
+"Enable" => "Habilitar",
 "Error while enabling app" => "Erro enquanto habilitava o aplicativo",
 "Updating...." => "Atualizando...",
 "Error while updating app" => "Erro ao atualizar aplicativo",
-"Error" => "Erro",
-"Update" => "Atualizar",
 "Updated" => "Atualizado",
 "Uninstalling ...." => "Desinstalando ...",
 "Error while uninstalling app" => "Erro enquanto desinstalava aplicativo",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
 "Email Server" => "Servidor de Email",
 "This is used for sending out notifications." => "Isto é usado para o envio de notificações.",
+"Send mode" => "Modo enviar",
+"Encryption" => "Criptografia",
 "From address" => "Do Endereço",
 "mail" => "email",
+"Authentication method" => "Método de autenticação",
 "Authentication required" => "Autenticação é requerida",
 "Server address" => "Endereço do servidor",
 "Port" => "Porta",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versão",
 "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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Adicione seu Aplicativo",
-"More Apps" => "Mais Apps",
-"Select an App" => "Selecione um Aplicativo",
 "Documentation:" => "Documentação:",
-"See application page at apps.owncloud.com" => "Ver página do aplicativo em apps.owncloud.com",
-"See application website" => "Consulte o site aplicação",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"User Documentation" => "Documentação de Usuário",
+"Admin Documentation" => "Documentação de Administrador",
 "Enable only for specific groups" => "Ativar apenas para grupos específicos",
+"Uninstall App" => "Desinstalar Aplicativo",
 "Administrator Documentation" => "Documentação de Administrador",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index ac318109742..d4a24cf29bd 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Valor dado a %s éinválido",
-"Saved" => "Guardado",
-"test email settings" => "testar configurações de email",
-"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail as configurações parecem estar correctas",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Ocorreu um erro ao enviar o email. Por favor verifique as definições.",
-"Email sent" => "E-mail enviado",
-"You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
-"Send mode" => "Modo de envio",
-"Encryption" => "Encriptação",
-"Authentication method" => "Método de autenticação",
-"Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
 "Authentication error" => "Erro na autenticação",
 "Your full name has been changed." => "O seu nome completo foi alterado.",
 "Unable to change full name" => "Não foi possível alterar o seu nome completo",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
 "Unable to change password" => "Não foi possível alterar a sua password",
+"Saved" => "Guardado",
+"test email settings" => "testar configurações de email",
+"Email sent" => "E-mail enviado",
+"You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
 "Add trusted domain" => "Adicionar domínio confiável ",
 "Sending..." => "A enviar...",
 "All" => "Todos",
-"User Documentation" => "Documentação de Utilizador",
-"Admin Documentation" => "Documentação de administrador.",
-"Update to {appversion}" => "Actualizar para a versão {appversion}",
-"Uninstall App" => "Desinstalar aplicação",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
 "Please wait...." => "Por favor aguarde...",
 "Error while disabling app" => "Erro enquanto desactivava a aplicação",
+"Disable" => "Desactivar",
+"Enable" => "Activar",
 "Error while enabling app" => "Erro enquanto activava a aplicação",
 "Updating...." => "A Actualizar...",
 "Error while updating app" => "Erro enquanto actualizava a aplicação",
-"Error" => "Erro",
-"Update" => "Actualizar",
 "Updated" => "Actualizado",
 "Uninstalling ...." => "Desinstalando ....",
 "Error while uninstalling app" => "Erro durante a desinstalação da aplicação",
@@ -147,8 +134,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
 "Email Server" => "Servidor de email",
 "This is used for sending out notifications." => "Isto é utilizado para enviar notificações",
+"Send mode" => "Modo de envio",
+"Encryption" => "Encriptação",
 "From address" => "Do endereço",
 "mail" => "Correio",
+"Authentication method" => "Método de autenticação",
 "Authentication required" => "Autenticação necessária",
 "Server address" => "Endereço do servidor",
 "Port" => "Porto",
@@ -163,14 +153,11 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versão",
 "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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Adicione a sua aplicação",
-"More Apps" => "Mais Aplicações",
-"Select an App" => "Selecione uma aplicação",
 "Documentation:" => "Documentação:",
-"See application page at apps.owncloud.com" => "Ver a página da aplicação em apps.owncloud.com",
-"See application website" => "Ver site da aplicação",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
+"User Documentation" => "Documentação de Utilizador",
+"Admin Documentation" => "Documentação de administrador.",
 "Enable only for specific groups" => "Activar só para grupos específicos",
+"Uninstall App" => "Desinstalar aplicação",
 "Administrator Documentation" => "Documentação de administrador.",
 "Online Documentation" => "Documentação Online",
 "Forum" => "Fórum",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 4b566a4486a..3bc87d1f8c6 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,13 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "Salvat",
-"test email settings" => "verifică setările de e-mail",
-"If you received this email, the settings seem to be correct." => "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
-"Email sent" => "Mesajul a fost expediat",
-"Send mode" => "Modul de expediere",
-"Encryption" => "Încriptare",
-"Authentication method" => "Modul de autentificare",
-"Unable to load list from App Store" => "Imposibil de actualizat lista din  App Store.",
 "Authentication error" => "Eroare la autentificare",
 "Your full name has been changed." => "Numele tău complet a fost schimbat.",
 "Unable to change full name" => "Nu s-a puput schimba numele complet",
@@ -29,19 +21,18 @@ $TRANSLATIONS = array(
 "Wrong password" => "Parolă greșită",
 "No user supplied" => "Nici un utilizator furnizat",
 "Unable to change password" => "Imposibil de schimbat parola",
+"Saved" => "Salvat",
+"test email settings" => "verifică setările de e-mail",
+"Email sent" => "Mesajul a fost expediat",
 "Sending..." => "Se expediază...",
 "All" => "Toate ",
-"User Documentation" => "Documentație utilizator",
-"Update to {appversion}" => "Actualizat la {versiuneaaplicaţiei}",
-"Disable" => "Dezactivați",
-"Enable" => "Activare",
 "Please wait...." => "Aşteptaţi vă rog....",
 "Error while disabling app" => "Eroare în timpul dezactivării aplicației",
+"Disable" => "Dezactivați",
+"Enable" => "Activare",
 "Error while enabling app" => "Eroare în timpul activării applicației",
 "Updating...." => "Actualizare în curs....",
 "Error while updating app" => "Eroare în timpul actualizării aplicaţiei",
-"Error" => "Eroare",
-"Update" => "Actualizare",
 "Updated" => "Actualizat",
 "Select a profile picture" => "Selectează o imagine de profil",
 "Very weak password" => "Parolă foarte slabă",
@@ -80,6 +71,9 @@ $TRANSLATIONS = array(
 "Allow users to send mail notification for shared files" => "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
 "Security" => "Securitate",
 "Forces the clients to connect to %s via an encrypted connection." => "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
+"Send mode" => "Modul de expediere",
+"Encryption" => "Încriptare",
+"Authentication method" => "Modul de autentificare",
 "Server address" => "Adresa server-ului",
 "Port" => "Portul",
 "SMTP Username" => "Nume utilizator SMTP",
@@ -92,11 +86,7 @@ $TRANSLATIONS = array(
 "Less" => "Mai puțin",
 "Version" => "Versiunea",
 "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>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Adaugă aplicația ta",
-"More Apps" => "Mai multe aplicații",
-"Select an App" => "Selectează o aplicație",
-"See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licențiat <span class=\"author\"></span>",
+"User Documentation" => "Documentație utilizator",
 "Administrator Documentation" => "Documentație administrator",
 "Online Documentation" => "Documentație online",
 "Forum" => "Forum",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index e9f41756919..b1559c0c14e 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Неверное значение для %s",
-"Saved" => "Сохранено",
-"test email settings" => "проверить настройки почты",
-"If you received this email, the settings seem to be correct." => "Если вы получили это письмо, настройки верны.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Произошла ошибка при отправке сообщения электронной почты, пожалуйста, пожалуйста проверьте настройки.",
-"Email sent" => "Письмо отправлено",
-"You need to set your user email before being able to send test emails." => "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
-"Send mode" => "Отправить сообщение",
-"Encryption" => "Шифрование",
-"Authentication method" => "Метод проверки подлинности",
-"Unable to load list from App Store" => "Не удалось загрузить список из App Store",
 "Authentication error" => "Ошибка аутентификации",
 "Your full name has been changed." => "Ваше полное имя было изменено.",
 "Unable to change full name" => "Невозможно изменить полное имя",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
 "Unable to change password" => "Невозможно изменить пароль",
+"Saved" => "Сохранено",
+"test email settings" => "проверить настройки почты",
+"Email sent" => "Письмо отправлено",
+"You need to set your user email before being able to send test emails." => "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
 "Add trusted domain" => "Добавить доверенный домен",
 "Sending..." => "Отправляется ...",
 "All" => "Все",
-"User Documentation" => "Пользовательская документация",
-"Admin Documentation" => "Документация администратора",
-"Update to {appversion}" => "Обновить до {версия приложения}",
-"Uninstall App" => "Удалить приложение",
-"Disable" => "Выключить",
-"Enable" => "Включить",
 "Please wait...." => "Подождите...",
 "Error while disabling app" => "Ошибка отключения приложения",
+"Disable" => "Выключить",
+"Enable" => "Включить",
 "Error while enabling app" => "Ошибка включения приложения",
 "Updating...." => "Обновление...",
 "Error while updating app" => "Ошибка при обновлении приложения",
-"Error" => "Ошибка",
-"Update" => "Обновить",
 "Updated" => "Обновлено",
 "Uninstalling ...." => "Удаление ...",
 "Error while uninstalling app" => "Ошибка при удалении приложения.",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить обязательные SSL подключения.",
 "Email Server" => "Почтовый сервер",
 "This is used for sending out notifications." => "Используется для отправки уведомлений.",
+"Send mode" => "Отправить сообщение",
+"Encryption" => "Шифрование",
 "From address" => "Адрес отправителя",
 "mail" => "почта",
+"Authentication method" => "Метод проверки подлинности",
 "Authentication required" => "Требуется аутентификация ",
 "Server address" => "Адрес сервера",
 "Port" => "Порт",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Меньше",
 "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>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Добавить приложение",
-"More Apps" => "Больше приложений",
-"Select an App" => "Выберите приложение",
 "Documentation:" => "Документация:",
-"See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
-"See application website" => "См. сайт приложений",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
+"User Documentation" => "Пользовательская документация",
+"Admin Documentation" => "Документация администратора",
 "Enable only for specific groups" => "Включить только для этих групп",
+"Uninstall App" => "Удалить приложение",
 "Administrator Documentation" => "Документация администратора",
 "Online Documentation" => "Online документация",
 "Forum" => "Форум",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 36686372978..5c63346a64d 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Encryption" => "ගුප්ත කේතනය",
 "Authentication error" => "සත්‍යාපන දෝෂයක්",
 "Group already exists" => "කණ්ඩායම දැනටමත් තිබේ",
 "Unable to add group" => "කාණඩයක් එක් කළ නොහැකි විය",
@@ -14,8 +13,6 @@ $TRANSLATIONS = array(
 "Unable to remove user from group %s" => "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
 "Disable" => "අක්‍රිය කරන්න",
 "Enable" => "සක්‍රිය කරන්න",
-"Error" => "දෝෂයක්",
-"Update" => "යාවත්කාල කිරීම",
 "Delete" => "මකා දමන්න",
 "Groups" => "කණ්ඩායම්",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
@@ -26,15 +23,13 @@ $TRANSLATIONS = array(
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Sharing" => "හුවමාරු කිරීම",
 "Allow resharing" => "යළි යළිත් හුවමාරුවට අවසර දෙමි",
+"Encryption" => "ගුප්ත කේතනය",
 "Server address" => "සේවාදායකයේ ලිපිනය",
 "Port" => "තොට",
 "Log" => "ලඝුව",
 "More" => "වැඩි",
 "Less" => "අඩු",
 "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>." => "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
-"Add your App" => "යෙදුමක් එක් කිරීම",
-"More Apps" => "තවත් යෙදුම්",
-"Select an App" => "යෙදුමක් තොරන්න",
 "Password" => "මුර පදය",
 "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
 "Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index eb70ba50973..281434452ee 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Zadaná neplatná hodnota pre %s",
-"Saved" => "Uložené",
-"test email settings" => "nastavenia testovacieho emailu",
-"If you received this email, the settings seem to be correct." => "Ak ste dostali tento email, nastavenie je správne.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia.",
-"Email sent" => "Email odoslaný",
-"You need to set your user email before being able to send test emails." => "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
-"Send mode" => "Mód odosielania",
-"Encryption" => "Šifrovanie",
-"Authentication method" => "Autentifikačná metóda",
-"Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store",
 "Authentication error" => "Chyba autentifikácie",
 "Your full name has been changed." => "Vaše meno a priezvisko bolo zmenené.",
 "Unable to change full name" => "Nemožno zmeniť meno a priezvisko",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
 "Unable to change password" => "Zmena hesla sa nepodarila",
+"Saved" => "Uložené",
+"test email settings" => "nastavenia testovacieho emailu",
+"Email sent" => "Email odoslaný",
+"You need to set your user email before being able to send test emails." => "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
 "Add trusted domain" => "Pridať dôveryhodnú doménu",
 "Sending..." => "Odosielam...",
 "All" => "Všetky",
-"User Documentation" => "Príručka používateľa",
-"Admin Documentation" => "Príručka administrátora",
-"Update to {appversion}" => "Aktualizovať na {appversion}",
-"Uninstall App" => "Odinštalovanie aplikácie",
-"Disable" => "Zakázať",
-"Enable" => "Zapnúť",
 "Please wait...." => "Čakajte prosím...",
 "Error while disabling app" => "Chyba pri zakázaní aplikácie",
+"Disable" => "Zakázať",
+"Enable" => "Zapnúť",
 "Error while enabling app" => "Chyba pri povoľovaní aplikácie",
 "Updating...." => "Aktualizujem...",
 "Error while updating app" => "chyba pri aktualizácii aplikácie",
-"Error" => "Chyba",
-"Update" => "Aktualizovať",
 "Updated" => "Aktualizované",
 "Uninstalling ...." => "Prebieha odinštalovanie...",
 "Error while uninstalling app" => "Chyba pri odinštalovaní aplikácie",
@@ -146,8 +133,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
 "Email Server" => "Email server",
 "This is used for sending out notifications." => "Používa sa na odosielanie upozornení.",
+"Send mode" => "Mód odosielania",
+"Encryption" => "Šifrovanie",
 "From address" => "Z adresy",
 "mail" => "email",
+"Authentication method" => "Autentifikačná metóda",
 "Authentication required" => "Vyžaduje sa overenie",
 "Server address" => "Adresa servera",
 "Port" => "Port",
@@ -162,14 +152,11 @@ $TRANSLATIONS = array(
 "Less" => "Menej",
 "Version" => "Verzia",
 "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>." => "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Pridať vašu aplikáciu",
-"More Apps" => "Viac aplikácií",
-"Select an App" => "Vyberte aplikáciu",
 "Documentation:" => "Dokumentácia:",
-"See application page at apps.owncloud.com" => "Pozrite si stránku aplikácií na apps.owncloud.com",
-"See application website" => "Pozrite si webstránku aplikácie",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencované <span class=\"author\"></span>",
+"User Documentation" => "Príručka používateľa",
+"Admin Documentation" => "Príručka administrátora",
 "Enable only for specific groups" => "Povoliť len pre vybrané skupiny",
+"Uninstall App" => "Odinštalovanie aplikácie",
 "Administrator Documentation" => "Príručka administrátora",
 "Online Documentation" => "Online príručka",
 "Forum" => "Fórum",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 7ae016dd97e..1efc9f8661a 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Navedena je napačna vrednost za %s",
-"Saved" => "Shranjeno",
-"test email settings" => "preizkusi nastavitve elektronske pošte",
-"If you received this email, the settings seem to be correct." => "Če ste prejeli to sporočilo, so nastavitve pravilne.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Prišlo je do napake med pošiljanjem sporočila na elektronski naslov. Spremeniti je treba nastavitve.",
-"Email sent" => "Elektronska pošta je poslana",
-"You need to set your user email before being able to send test emails." => "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
-"Send mode" => "Način pošiljanja",
-"Encryption" => "Šifriranje",
-"Authentication method" => "Način overitve",
-"Unable to load list from App Store" => "Ni mogoče naložiti seznama iz programskega središča",
 "Authentication error" => "Napaka med overjanjem",
 "Your full name has been changed." => "Vaše polno ime je spremenjeno.",
 "Unable to change full name" => "Ni mogoče spremeniti polnega imena",
@@ -37,22 +26,20 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
 "Unable to change password" => "Ni mogoče spremeniti gesla",
+"Saved" => "Shranjeno",
+"test email settings" => "preizkusi nastavitve elektronske pošte",
+"Email sent" => "Elektronska pošta je poslana",
+"You need to set your user email before being able to send test emails." => "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
 "Add trusted domain" => "Dodaj varno domeno",
 "Sending..." => "Poteka pošiljanje ...",
 "All" => "Vsi",
-"User Documentation" => "Uporabniška dokumentacija",
-"Admin Documentation" => "Skrbniška dokumentacija",
-"Update to {appversion}" => "Posodobi na {appversion}",
-"Uninstall App" => "Odstrani program",
-"Disable" => "Onemogoči",
-"Enable" => "Omogoči",
 "Please wait...." => "Počakajte ...",
 "Error while disabling app" => "Napaka onemogočanja programa",
+"Disable" => "Onemogoči",
+"Enable" => "Omogoči",
 "Error while enabling app" => "Napaka omogočanja programa",
 "Updating...." => "Poteka posodabljanje ...",
 "Error while updating app" => "Prišlo je do napake med posodabljanjem programa.",
-"Error" => "Napaka",
-"Update" => "Posodobi",
 "Updated" => "Posodobljeno",
 "Uninstalling ...." => "Odstranjevanje namestitve ...",
 "Error while uninstalling app" => "Prišlo je do napake med odstranjevanjem programa.",
@@ -63,6 +50,7 @@ $TRANSLATIONS = array(
 "So-so password" => "Slabo geslo",
 "Good password" => "Dobro geslo",
 "Strong password" => "Odlično geslo",
+"Valid until {date}" => "Veljavno do {date}",
 "Delete" => "Izbriši",
 "Decrypting files... Please wait, this can take some time." => "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
 "Delete encryption keys permanently." => "Trajno izbriše šifrirne ključe",
@@ -102,6 +90,7 @@ $TRANSLATIONS = array(
 "System locale can not be set to a one which supports UTF-8." => "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
 "This means that there might be problems with certain characters in file names." => "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
+"Connectivity checks" => "Preverjanje povezav",
 "Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
 "Cron" => "Periodično opravilo",
 "Last cron was executed at %s." => "Zadnje opravilo cron je bilo izvedeno ob %s.",
@@ -125,6 +114,9 @@ $TRANSLATIONS = array(
 "Forces the clients to connect to %s via an encrypted connection." => "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
 "Email Server" => "Poštni strežnik",
+"Send mode" => "Način pošiljanja",
+"Encryption" => "Šifriranje",
+"Authentication method" => "Način overitve",
 "Authentication required" => "Zahtevana je overitev",
 "Server address" => "Naslov strežnika",
 "Port" => "Vrata",
@@ -139,14 +131,11 @@ $TRANSLATIONS = array(
 "Less" => "Manj",
 "Version" => "Različica",
 "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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
-"Add your App" => "Dodaj program",
-"More Apps" => "Več programov",
-"Select an App" => "Izbor programa",
 "Documentation:" => "Dokumentacija:",
-"See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com",
-"See application website" => "Oglejte si spletno stran programa",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem <span class=\"author\"></span>",
+"User Documentation" => "Uporabniška dokumentacija",
+"Admin Documentation" => "Skrbniška dokumentacija",
 "Enable only for specific groups" => "Omogoči le za posamezne skupine",
+"Uninstall App" => "Odstrani program",
 "Administrator Documentation" => "Skrbniška dokumentacija",
 "Online Documentation" => "Spletna dokumentacija",
 "Forum" => "Forum",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 4ba1a87b855..8c505d99700 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -1,10 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Saved" => "U ruajt",
-"Email sent" => "Email-i u dërgua",
-"Send mode" => "Mënyra e dërgimit",
-"Encryption" => "Kodifikimi",
-"Unable to load list from App Store" => "E pamundur të shkarkohet lista nga App Store",
 "Authentication error" => "Gabim autentifikimi",
 "Group already exists" => "Grupi ekziston",
 "Unable to add group" => "E pamundur të shtohet grupi",
@@ -20,17 +15,15 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "E pamundur të përditësohet app.",
 "Wrong password" => "Fjalëkalim i gabuar",
 "Unable to change password" => "Fjalëkalimi nuk mund të ndryshohet",
+"Saved" => "U ruajt",
+"Email sent" => "Email-i u dërgua",
 "Sending..." => "Duke dërguar",
 "All" => "Të gjitha",
-"User Documentation" => "Dokumentacion përdoruesi",
-"Update to {appversion}" => "Përditësim për {appversion}",
+"Please wait...." => "Ju lutem prisni...",
 "Disable" => "Çaktivizo",
 "Enable" => "Aktivizo",
-"Please wait...." => "Ju lutem prisni...",
 "Updating...." => "Duke përditësuar...",
 "Error while updating app" => "Gabim gjatë përditësimit të app",
-"Error" => "Gabim",
-"Update" => "Përditësim",
 "Updated" => "I përditësuar",
 "Select a profile picture" => "Zgjidh një foto profili",
 "Delete" => "Fshi",
@@ -63,6 +56,8 @@ $TRANSLATIONS = array(
 "Allow resharing" => "Lejo ri-ndarjen",
 "Security" => "Siguria",
 "Enforce HTTPS" => "Detyro HTTPS",
+"Send mode" => "Mënyra e dërgimit",
+"Encryption" => "Kodifikimi",
 "From address" => "Nga adresa",
 "mail" => "postë",
 "Server address" => "Adresa e serverit",
@@ -75,12 +70,8 @@ $TRANSLATIONS = array(
 "Less" => "M'pak",
 "Version" => "Versioni",
 "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>." => "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Shtoni apliakcionin tuaj",
-"More Apps" => "Apliakcione të tjera",
-"Select an App" => "Zgjidhni një Aplikacion",
 "Documentation:" => "Dokumentacioni:",
-"See application page at apps.owncloud.com" => "Shihni faqen e aplikacionit tek apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensuar nga <span class=\"author\"></span>",
+"User Documentation" => "Dokumentacion përdoruesi",
 "Administrator Documentation" => "Dokumentacion administratori",
 "Online Documentation" => "Dokumentacion online",
 "Forum" => "Forumi",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index f5bd74c80f3..ff0c9f80464 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Порука је послата",
-"Encryption" => "Шифровање",
-"Unable to load list from App Store" => "Грешка приликом учитавања списка из Складишта Програма",
 "Authentication error" => "Грешка при провери идентитета",
 "Group already exists" => "Група већ постоји",
 "Unable to add group" => "Не могу да додам групу",
@@ -16,15 +13,12 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Не могу да додам корисника у групу %s",
 "Unable to remove user from group %s" => "Не могу да уклоним корисника из групе %s",
 "Couldn't update app." => "Не могу да ажурирам апликацију.",
-"User Documentation" => "Корисничка документација",
-"Update to {appversion}" => "Ажурирај на {appversion}",
+"Email sent" => "Порука је послата",
+"Please wait...." => "Сачекајте…",
 "Disable" => "Искључи",
 "Enable" => "Омогући",
-"Please wait...." => "Сачекајте…",
 "Updating...." => "Ажурирам…",
 "Error while updating app" => "Грешка при ажурирању апликације",
-"Error" => "Грешка",
-"Update" => "Ажурирај",
 "Updated" => "Ажурирано",
 "Delete" => "Обриши",
 "Groups" => "Групе",
@@ -50,6 +44,7 @@ $TRANSLATIONS = array(
 "Allow resharing" => "Дозволи поновно дељење",
 "Security" => "Безбедност",
 "Enforce HTTPS" => "Наметни HTTPS",
+"Encryption" => "Шифровање",
 "Server address" => "Адреса сервера",
 "Port" => "Порт",
 "Log" => "Бележење",
@@ -58,11 +53,7 @@ $TRANSLATIONS = array(
 "Less" => "Мање",
 "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>." => "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>.",
-"Add your App" => "Додајте ваш програм",
-"More Apps" => "Више програма",
-"Select an App" => "Изаберите програм",
-"See application page at apps.owncloud.com" => "Погледајте страницу са програмима на apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-лиценцирао <span class=\"author\"></span>",
+"User Documentation" => "Корисничка документација",
 "Administrator Documentation" => "Администраторска документација",
 "Online Documentation" => "Мрежна документација",
 "Forum" => "Форум",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 4246180575a..2d3e61065c8 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -1,10 +1,9 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Email poslat",
 "Authentication error" => "Greška pri autentifikaciji",
 "Language changed" => "Jezik je izmenjen",
 "Invalid request" => "Neispravan zahtev",
-"Error" => "Greška",
+"Email sent" => "Email poslat",
 "Very weak password" => "Veoma slaba lozinka",
 "Weak password" => "Slaba lozinka",
 "So-so password" => "Osrednja lozinka",
@@ -13,7 +12,6 @@ $TRANSLATIONS = array(
 "Delete" => "Obriši",
 "Groups" => "Grupe",
 "Security Warning" => "Bezbednosno upozorenje",
-"Select an App" => "Izaberite program",
 "Password" => "Lozinka",
 "Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
 "Current password" => "Trenutna lozinka",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 5a8271d7933..9e1d4f71313 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "Ogiltigt värde gavs för %s",
-"Saved" => "Sparad",
-"test email settings" => "testa e-post inställningar",
-"If you received this email, the settings seem to be correct." => "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "Ett problem har uppstått under tiden e-post sändes. Vänligen se över dina inställningar.",
-"Email sent" => "E-post skickat",
-"You need to set your user email before being able to send test emails." => "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
-"Send mode" => "Sändningsläge",
-"Encryption" => "Kryptering",
-"Authentication method" => "Autentiseringsmetod",
-"Unable to load list from App Store" => "Kan inte ladda listan från App Store",
 "Authentication error" => "Fel vid autentisering",
 "Your full name has been changed." => "Hela ditt namn har ändrats",
 "Unable to change full name" => "Kunde inte ändra hela namnet",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
 "Unable to change password" => "Kunde inte ändra lösenord",
+"Saved" => "Sparad",
+"test email settings" => "testa e-post inställningar",
+"Email sent" => "E-post skickat",
+"You need to set your user email before being able to send test emails." => "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
 "Add trusted domain" => "Lägg till trusted domain",
 "Sending..." => "Skickar...",
 "All" => "Alla",
-"User Documentation" => "Användardokumentation",
-"Admin Documentation" => "Administratörsdokumentation",
-"Update to {appversion}" => "Uppdatera till {appversion}",
-"Uninstall App" => "Avinstallera Applikation",
-"Disable" => "Deaktivera",
-"Enable" => "Aktivera",
 "Please wait...." => "Var god vänta...",
 "Error while disabling app" => "Fel vid inaktivering av app",
+"Disable" => "Deaktivera",
+"Enable" => "Aktivera",
 "Error while enabling app" => "Fel vid aktivering av app",
 "Updating...." => "Uppdaterar...",
 "Error while updating app" => "Fel uppstod vid uppdatering av appen",
-"Error" => "Fel",
-"Update" => "Uppdatera",
 "Updated" => "Uppdaterad",
 "Uninstalling ...." => "Avinstallerar ....",
 "Error while uninstalling app" => "Ett fel inträffade när applikatonen avinstallerades",
@@ -139,8 +126,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL",
 "Email Server" => "E-postserver",
 "This is used for sending out notifications." => "Detta används för att skicka ut notifieringar.",
+"Send mode" => "Sändningsläge",
+"Encryption" => "Kryptering",
 "From address" => "Från adress",
 "mail" => "mail",
+"Authentication method" => "Autentiseringsmetod",
 "Authentication required" => "Autentisering krävs",
 "Server address" => "Serveradress",
 "Port" => "Port",
@@ -155,14 +145,11 @@ $TRANSLATIONS = array(
 "Less" => "Mindre",
 "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>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Lägg till din applikation",
-"More Apps" => "Fler Appar",
-"Select an App" => "Välj en App",
 "Documentation:" => "Dokumentation:",
-"See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
-"See application website" => "Se applikationens webbplats",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
+"User Documentation" => "Användardokumentation",
+"Admin Documentation" => "Administratörsdokumentation",
 "Enable only for specific groups" => "Aktivera endast för specifika grupper",
+"Uninstall App" => "Avinstallera Applikation",
 "Administrator Documentation" => "Administratörsdokumentation",
 "Online Documentation" => "Onlinedokumentation",
 "Forum" => "Forum",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index ba97e43684c..a4c8c850ddc 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Encryption" => "மறைக்குறியீடு",
-"Unable to load list from App Store" => "செயலி சேமிப்பிலிருந்து பட்டியலை ஏற்றமுடியாதுள்ளது",
 "Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
 "Group already exists" => "குழு ஏற்கனவே உள்ளது",
 "Unable to add group" => "குழுவை சேர்க்க முடியாது",
@@ -16,8 +14,6 @@ $TRANSLATIONS = array(
 "All" => "எல்லாம்",
 "Disable" => "இயலுமைப்ப",
 "Enable" => "இயலுமைப்படுத்துக",
-"Error" => "வழு",
-"Update" => "இற்றைப்படுத்தல்",
 "Delete" => "நீக்குக",
 "Groups" => "குழுக்கள்",
 "undo" => "முன் செயல் நீக்கம் ",
@@ -27,17 +23,13 @@ $TRANSLATIONS = array(
 "None" => "ஒன்றுமில்லை",
 "Login" => "புகுபதிகை",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
+"Encryption" => "மறைக்குறியீடு",
 "Server address" => "சேவையக முகவரி",
 "Port" => "துறை ",
 "Credentials" => "சான்று ஆவணங்கள்",
 "More" => "மேலதிக",
 "Less" => "குறைவான",
 "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>." => "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>.",
-"Add your App" => "உங்களுடைய செயலியை சேர்க்க",
-"More Apps" => "மேலதிக செயலிகள்",
-"Select an App" => "செயலி ஒன்றை தெரிவுசெய்க",
-"See application page at apps.owncloud.com" => "apps.owncloud.com இல் செயலி பக்கத்தை பார்க்க",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"அனுமதிப்பத்திரம்\"></span>-அனுமதி பெற்ற <span class=\"ஆசிரியர்\"></span>",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
 "Password" => "கடவுச்சொல்",
 "Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
index 5161863f13f..d5f2c6c8d16 100644
--- a/settings/l10n/te.php
+++ b/settings/l10n/te.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Error" => "పొరపాటు",
 "Delete" => "తొలగించు",
 "Server address" => "సేవకి చిరునామా",
 "More" => "మరిన్ని",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 4e1f48f26a7..3cc80ffbd67 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "ส่งอีเมล์แล้ว",
-"Encryption" => "การเข้ารหัส",
-"Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
 "Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
 "Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
 "Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
@@ -16,16 +13,13 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
 "Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
 "Couldn't update app." => "ไม่สามารถอัพเดทแอปฯ",
+"Email sent" => "ส่งอีเมล์แล้ว",
 "All" => "ทั้งหมด",
-"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
-"Update to {appversion}" => "อัพเดทไปเป็นรุ่น {appversion}",
+"Please wait...." => "กรุณารอสักครู่...",
 "Disable" => "ปิดใช้งาน",
 "Enable" => "เปิดใช้งาน",
-"Please wait...." => "กรุณารอสักครู่...",
 "Updating...." => "กำลังอัพเดทข้อมูล...",
 "Error while updating app" => "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
-"Error" => "ข้อผิดพลาด",
-"Update" => "อัพเดท",
 "Updated" => "อัพเดทแล้ว",
 "Delete" => "ลบ",
 "Groups" => "กลุ่ม",
@@ -41,6 +35,7 @@ $TRANSLATIONS = array(
 "Sharing" => "การแชร์ข้อมูล",
 "Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
 "Allow resharing" => "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
+"Encryption" => "การเข้ารหัส",
 "Server address" => "ที่อยู่เซิร์ฟเวอร์",
 "Port" => "พอร์ต",
 "Credentials" => "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
@@ -50,11 +45,7 @@ $TRANSLATIONS = array(
 "Less" => "น้อย",
 "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>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "เพิ่มแอปของคุณ",
-"More Apps" => "แอปฯอื่นเพิ่มเติม",
-"Select an App" => "เลือก App",
-"See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
+"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
 "Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
 "Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
 "Forum" => "กระดานสนทนา",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index ce7f7cd5b19..3e1ad733de8 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "%s için geçersiz değer sağlandı",
-"Saved" => "Kaydedildi",
-"test email settings" => "e-posta ayarlarını sına",
-"If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "E-posta gönderilirken bir hata oluştu. Lütfen ayarlarınıza tekrar bakın.",
-"Email sent" => "E-posta gönderildi",
-"You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
-"Send mode" => "Gönderme kipi",
-"Encryption" => "Şifreleme",
-"Authentication method" => "Kimlik doğrulama yöntemi",
-"Unable to load list from App Store" => "Uygulama Mağazası'ndan liste yüklenemiyor",
 "Authentication error" => "Kimlik doğrulama hatası",
 "Your full name has been changed." => "Tam adınız değiştirildi.",
 "Unable to change full name" => "Tam adınız değiştirilirken hata",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
 "Unable to change password" => "Parola değiştirilemiyor",
+"Saved" => "Kaydedildi",
+"test email settings" => "e-posta ayarlarını sına",
+"Email sent" => "E-posta gönderildi",
+"You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
 "Add trusted domain" => "Güvenilir alan adı ekle",
 "Sending..." => "Gönderiliyor...",
 "All" => "Tümü",
-"User Documentation" => "Kullanıcı Belgelendirmesi",
-"Admin Documentation" => "Yönetici Belgelendirmesi",
-"Update to {appversion}" => "{appversion} sürümüne güncelle",
-"Uninstall App" => "Uygulamayı Kaldır",
-"Disable" => "Devre Dışı Bırak",
-"Enable" => "Etkinleştir",
 "Please wait...." => "Lütfen bekleyin....",
 "Error while disabling app" => "Uygulama devre dışı bırakılırken hata",
+"Disable" => "Devre Dışı Bırak",
+"Enable" => "Etkinleştir",
 "Error while enabling app" => "Uygulama etkinleştirilirken hata",
 "Updating...." => "Güncelleniyor....",
 "Error while updating app" => "Uygulama güncellenirken hata",
-"Error" => "Hata",
-"Update" => "Güncelle",
 "Updated" => "Güncellendi",
 "Uninstalling ...." => "Kaldırılıyor ....",
 "Error while uninstalling app" => "Uygulama kaldırılırken hata",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.",
 "Email Server" => "E-Posta Sunucusu",
 "This is used for sending out notifications." => "Bu, bildirimler gönderilirken kullanılır.",
+"Send mode" => "Gönderme kipi",
+"Encryption" => "Şifreleme",
 "From address" => "Kimden adresi",
 "mail" => "posta",
+"Authentication method" => "Kimlik doğrulama yöntemi",
 "Authentication required" => "Kimlik doğrulama gerekli",
 "Server address" => "Sunucu adresi",
 "Port" => "Port",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "Daha az",
 "Version" => "Sürüm",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
-"Add your App" => "Uygulamanızı Ekleyin",
-"More Apps" => "Daha Fazla Uygulama",
-"Select an App" => "Bir Uygulama Seçin",
 "Documentation:" => "Belgelendirme:",
-"See application page at apps.owncloud.com" => "Uygulamanın sayfasına apps.owncloud.com adresinden bakın ",
-"See application website" => "Uygulama web sitesine bakın",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> ile lisanslayan: <span class=\"author\"></span>",
+"User Documentation" => "Kullanıcı Belgelendirmesi",
+"Admin Documentation" => "Yönetici Belgelendirmesi",
 "Enable only for specific groups" => "Sadece belirli gruplar için etkinleştir",
+"Uninstall App" => "Uygulamayı Kaldır",
 "Administrator Documentation" => "Yönetici Belgelendirmesi",
 "Online Documentation" => "Çevrimiçi Belgelendirme",
 "Forum" => "Forum",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index f1d2abbe148..64f8a61c781 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -1,7 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Encryption" => "شىفىرلاش",
-"Unable to load list from App Store" => "ئەپ بازىرىدىن تىزىمنى يۈكلىيەلمىدى",
 "Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
 "Group already exists" => "گۇرۇپپا مەۋجۇت",
 "Unable to add group" => "گۇرۇپپا قوشقىلى بولمايدۇ",
@@ -16,15 +14,11 @@ $TRANSLATIONS = array(
 "Unable to remove user from group %s" => "ئىشلەتكۈچىنى %s گۇرۇپپىدىن چىقىرىۋېتەلمەيدۇ",
 "Couldn't update app." => "ئەپنى يېڭىلىيالمايدۇ.",
 "All" => "ھەممىسى",
-"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
-"Update to {appversion}" => "{appversion} غا يېڭىلايدۇ",
+"Please wait...." => "سەل كۈتۈڭ…",
 "Disable" => "چەكلە",
 "Enable" => "قوزغات",
-"Please wait...." => "سەل كۈتۈڭ…",
 "Updating...." => "يېڭىلاۋاتىدۇ…",
 "Error while updating app" => "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى",
-"Error" => "خاتالىق",
-"Update" => "يېڭىلا",
 "Updated" => "يېڭىلاندى",
 "Delete" => "ئۆچۈر",
 "Groups" => "گۇرۇپپا",
@@ -43,6 +37,7 @@ $TRANSLATIONS = array(
 "Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
 "Sharing" => "ھەمبەھىر",
 "Security" => "بىخەتەرلىك",
+"Encryption" => "شىفىرلاش",
 "Server address" => "مۇلازىمېتىر ئادرىسى",
 "Port" => "ئېغىز",
 "Log" => "خاتىرە",
@@ -50,9 +45,7 @@ $TRANSLATIONS = array(
 "More" => "تېخىمۇ كۆپ",
 "Less" => "ئاز",
 "Version" => "نەشرى",
-"Add your App" => "ئەپىڭىزنى قوشۇڭ",
-"More Apps" => "تېخىمۇ كۆپ ئەپلەر",
-"Select an App" => "بىر ئەپ تاللاڭ",
+"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
 "Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
 "Online Documentation" => "توردىكى قوللانما",
 "Forum" => "مۇنبەر",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 24b1a734745..904ce92ea8b 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Ел. пошта надіслана",
-"Encryption" => "Шифрування",
-"Unable to load list from App Store" => "Не вдалося завантажити список з App Store",
 "Authentication error" => "Помилка автентифікації",
 "Group already exists" => "Група вже існує",
 "Unable to add group" => "Не вдалося додати групу",
@@ -16,16 +13,13 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Не вдалося додати користувача у групу %s",
 "Unable to remove user from group %s" => "Не вдалося видалити користувача із групи %s",
 "Couldn't update app." => "Не вдалося оновити програму. ",
+"Email sent" => "Ел. пошта надіслана",
 "All" => "Всі",
-"User Documentation" => "Документація Користувача",
-"Update to {appversion}" => "Оновити до {appversion}",
+"Please wait...." => "Зачекайте, будь ласка...",
 "Disable" => "Вимкнути",
 "Enable" => "Включити",
-"Please wait...." => "Зачекайте, будь ласка...",
 "Updating...." => "Оновлюється...",
 "Error while updating app" => "Помилка при оновленні програми",
-"Error" => "Помилка",
-"Update" => "Оновити",
 "Updated" => "Оновлено",
 "Very weak password" => "Дуже слабкий пароль",
 "Weak password" => "Слабкий пароль",
@@ -56,6 +50,7 @@ $TRANSLATIONS = array(
 "Allow resharing" => "Дозволити перевідкривати спільний доступ",
 "Security" => "Безпека",
 "Enforce HTTPS" => "Примусове застосування HTTPS",
+"Encryption" => "Шифрування",
 "Server address" => "Адреса сервера",
 "Port" => "Порт",
 "Credentials" => "Облікові дані",
@@ -65,11 +60,7 @@ $TRANSLATIONS = array(
 "Less" => "Менше",
 "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>." => "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Додати свою програму",
-"More Apps" => "Більше програм",
-"Select an App" => "Вибрати додаток",
-"See application page at apps.owncloud.com" => "Перегляньте сторінку програм на apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>",
+"User Documentation" => "Документація Користувача",
 "Administrator Documentation" => "Документація Адміністратора",
 "Online Documentation" => "Он-Лайн Документація",
 "Forum" => "Форум",
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
index 39973159745..17e7d843f3f 100644
--- a/settings/l10n/ur_PK.php
+++ b/settings/l10n/ur_PK.php
@@ -1,8 +1,7 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "ارسال شدہ ای میل ",
 "Invalid request" => "غلط درخواست",
-"Error" => "ایرر",
+"Email sent" => "ارسال شدہ ای میل ",
 "Very weak password" => "بہت کمزور پاسورڈ",
 "Weak password" => "کمزور پاسورڈ",
 "So-so password" => "نص نص پاسورڈ",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 85a909eeefa..cbddc4b7347 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,8 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Email sent" => "Email đã được gửi",
-"Encryption" => "Mã hóa",
-"Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
 "Authentication error" => "Lỗi xác thực",
 "Your full name has been changed." => "Họ và tên đã được thay đổi.",
 "Unable to change full name" => "Họ và tên không thể đổi ",
@@ -18,16 +15,13 @@ $TRANSLATIONS = array(
 "Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
 "Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
 "Couldn't update app." => "Không thể cập nhật ứng dụng",
+"Email sent" => "Email đã được gửi",
 "All" => "Tất cả",
-"User Documentation" => "Tài liệu người sử dụng",
-"Update to {appversion}" => "Cập nhật lên {appversion}",
+"Please wait...." => "Xin hãy đợi...",
 "Disable" => "Tắt",
 "Enable" => "Bật",
-"Please wait...." => "Xin hãy đợi...",
 "Updating...." => "Đang cập nhật...",
 "Error while updating app" => "Lỗi khi cập nhật ứng dụng",
-"Error" => "Lỗi",
-"Update" => "Cập nhật",
 "Updated" => "Đã cập nhật",
 "Delete" => "Xóa",
 "Groups" => "Nhóm",
@@ -44,6 +38,7 @@ $TRANSLATIONS = array(
 "Sharing" => "Chia sẻ",
 "Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
 "Allow resharing" => "Cho phép chia sẻ lại",
+"Encryption" => "Mã hóa",
 "Server address" => "Địa chỉ máy chủ",
 "Port" => "Cổng",
 "Credentials" => "Giấy chứng nhận",
@@ -52,11 +47,7 @@ $TRANSLATIONS = array(
 "Less" => "ít",
 "Version" => "Phiên bản",
 "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>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Thêm ứng dụng của bạn",
-"More Apps" => "Nhiều ứng dụng hơn",
-"Select an App" => "Chọn một ứng dụng",
-"See application page at apps.owncloud.com" => "Xem nhiều ứng dụng hơn tại apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>",
+"User Documentation" => "Tài liệu người sử dụng",
 "Administrator Documentation" => "Tài liệu quản trị",
 "Online Documentation" => "Tài liệu trực tuyến",
 "Forum" => "Diễn đàn",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 3c2dca4c0b1..393902ac375 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "%s 获得了无效值",
-"Saved" => "已保存",
-"test email settings" => "测试电子邮件设置",
-"If you received this email, the settings seem to be correct." => "如果您收到了这封邮件，看起来设置没有问题。",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "发送电子邮件时发生了问题。请检查您的设置。",
-"Email sent" => "邮件已发送",
-"You need to set your user email before being able to send test emails." => "在发送测试邮件前您需要设置您的用户电子邮件。",
-"Send mode" => "发送模式",
-"Encryption" => "加密",
-"Authentication method" => "认证方法",
-"Unable to load list from App Store" => "无法从应用商店载入列表",
 "Authentication error" => "认证错误",
 "Your full name has been changed." => "您的全名已修改。",
 "Unable to change full name" => "无法修改全名",
@@ -40,23 +29,21 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "错误的管理员恢复密码。请检查密码并重试。",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "后端不支持修改密码，但是用户的加密密码已成功更新。",
 "Unable to change password" => "不能更改密码",
+"Saved" => "已保存",
+"test email settings" => "测试电子邮件设置",
+"Email sent" => "邮件已发送",
+"You need to set your user email before being able to send test emails." => "在发送测试邮件前您需要设置您的用户电子邮件。",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "你真的希望添加 \"{domain}\" 为信任域？",
 "Add trusted domain" => "添加信任域",
 "Sending..." => "正在发送...",
 "All" => "全部",
-"User Documentation" => "用户文档",
-"Admin Documentation" => "管理员文档",
-"Update to {appversion}" => "更新至 {appversion}",
-"Uninstall App" => "下载应用",
-"Disable" => "禁用",
-"Enable" => "开启",
 "Please wait...." => "请稍等....",
 "Error while disabling app" => "禁用 app 时出错",
+"Disable" => "禁用",
+"Enable" => "开启",
 "Error while enabling app" => "启用 app 时出错",
 "Updating...." => "正在更新....",
 "Error while updating app" => "更新 app 时出错",
-"Error" => "错误",
-"Update" => "更新",
 "Updated" => "已更新",
 "Uninstalling ...." => "卸载中....",
 "Error while uninstalling app" => "卸载应用时发生了一个错误",
@@ -148,8 +135,11 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
 "Email Server" => "电子邮件服务器",
 "This is used for sending out notifications." => "这被用于发送通知。",
+"Send mode" => "发送模式",
+"Encryption" => "加密",
 "From address" => "来自地址",
 "mail" => "邮件",
+"Authentication method" => "认证方法",
 "Authentication required" => "需要认证",
 "Server address" => "服务器地址",
 "Port" => "端口",
@@ -164,14 +154,11 @@ $TRANSLATIONS = array(
 "Less" => "更少",
 "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>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
-"Add your App" => "增加应用",
-"More Apps" => "更多应用",
-"Select an App" => "选择一个应用",
 "Documentation:" => "文档：",
-"See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
-"See application website" => "参见应用程序网站",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
+"User Documentation" => "用户文档",
+"Admin Documentation" => "管理员文档",
 "Enable only for specific groups" => "仅对特定的组开放",
+"Uninstall App" => "下载应用",
 "Administrator Documentation" => "管理员文档",
 "Online Documentation" => "在线文档",
 "Forum" => "论坛",
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 1ad784d87dd..4927561edc6 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -1,15 +1,12 @@
 <?php
 $TRANSLATIONS = array(
+"Wrong password" => "密碼錯誤",
 "Saved" => "已儲存",
 "Email sent" => "郵件已傳",
-"Encryption" => "加密",
-"Wrong password" => "密碼錯誤",
 "Sending..." => "發送中...",
 "Disable" => "停用",
 "Enable" => "啟用",
 "Updating...." => "更新中....",
-"Error" => "錯誤",
-"Update" => "更新",
 "Updated" => "已更新",
 "Delete" => "刪除",
 "Groups" => "群組",
@@ -17,6 +14,7 @@ $TRANSLATIONS = array(
 "Login" => "登入",
 "SSL" => "SSL",
 "TLS" => "TLS",
+"Encryption" => "加密",
 "Port" => "連接埠",
 "More" => "更多",
 "Password" => "密碼",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 0ea23f25c86..d861294620f 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,16 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Invalid value supplied for %s" => "無效的提供值 %s",
-"Saved" => "已儲存",
-"test email settings" => "測試郵件設定",
-"If you received this email, the settings seem to be correct." => "假如您收到這個郵件，此設定看起來是正確的。",
-"A problem occurred while sending the e-mail. Please revisit your settings." => "當寄出郵件時發生問題。請重新檢視您的設定。",
-"Email sent" => "Email 已寄出",
-"You need to set your user email before being able to send test emails." => "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
-"Send mode" => "寄送模式",
-"Encryption" => "加密",
-"Authentication method" => "驗證方式",
-"Unable to load list from App Store" => "無法從 App Store 讀取清單",
 "Authentication error" => "認證錯誤",
 "Your full name has been changed." => "您的全名已變更。",
 "Unable to change full name" => "無法變更全名",
@@ -35,20 +24,19 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "錯誤的管理者還原密碼",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "後端不支援變更密碼，但成功更新使用者的加密金鑰",
 "Unable to change password" => "無法修改密碼",
+"Saved" => "已儲存",
+"test email settings" => "測試郵件設定",
+"Email sent" => "Email 已寄出",
+"You need to set your user email before being able to send test emails." => "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
 "Sending..." => "寄送中...",
 "All" => "所有",
-"User Documentation" => "用戶說明文件",
-"Admin Documentation" => "管理者文件",
-"Update to {appversion}" => "更新至 {appversion}",
-"Disable" => "停用",
-"Enable" => "啟用",
 "Please wait...." => "請稍候...",
 "Error while disabling app" => "停用應用程式錯誤",
+"Disable" => "停用",
+"Enable" => "啟用",
 "Error while enabling app" => "啓用應用程式錯誤",
 "Updating...." => "更新中...",
 "Error while updating app" => "更新應用程式錯誤",
-"Error" => "錯誤",
-"Update" => "更新",
 "Updated" => "已更新",
 "Select a profile picture" => "選擇大頭貼",
 "Very weak password" => "非常弱的密碼",
@@ -109,7 +97,10 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。",
 "Email Server" => "郵件伺服器",
 "This is used for sending out notifications." => "這是使用於寄送通知。",
+"Send mode" => "寄送模式",
+"Encryption" => "加密",
 "From address" => "寄件地址",
+"Authentication method" => "驗證方式",
 "Authentication required" => "必須驗證",
 "Server address" => "伺服器位址",
 "Port" => "連接埠",
@@ -124,13 +115,9 @@ $TRANSLATIONS = array(
 "Less" => "更少",
 "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>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。",
-"Add your App" => "添加你的 App",
-"More Apps" => "更多Apps",
-"Select an App" => "選擇一個應用程式",
 "Documentation:" => "文件:",
-"See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
-"See application website" => "檢視應用程式網站",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准: <span class=\"author\"></span>",
+"User Documentation" => "用戶說明文件",
+"Admin Documentation" => "管理者文件",
 "Administrator Documentation" => "管理者說明文件",
 "Online Documentation" => "線上說明文件",
 "Forum" => "論壇",
-- 
GitLab


From 0254a3c406f2a945e2b01bbde3044d5a60751750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 10 Oct 2014 18:26:43 +0200
Subject: [PATCH 122/616] make trashbin compatible with objectstore, replace
 glob with search in cache, make unknown free space work like unlimited free
 space

---
 apps/files_trashbin/lib/trashbin.php | 18 +++++++++++++-----
 lib/private/files/view.php           | 10 ++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 120df345dda..73bb87955c7 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -745,6 +745,9 @@ class Trashbin {
 		if ($quota === null || $quota === 'none') {
 			$quota = \OC\Files\Filesystem::free_space('/');
 			$softQuota = false;
+			if ($quota === \OC\Files\SPACE_UNKNOWN) {
+				$quota = 0;
+			}
 		} else {
 			$quota = \OCP\Util::computerFileSize($quota);
 		}
@@ -911,24 +914,29 @@ class Trashbin {
 	 *
 	 * @param string $filename name of the file which should be restored
 	 * @param int $timestamp timestamp when the file was deleted
+	 * @return array
 	 */
 	private static function getVersionsFromTrash($filename, $timestamp) {
 		$view = new \OC\Files\View('/' . \OCP\User::getUser() . '/files_trashbin/versions');
-		$versionsName = $view->getLocalFile($filename) . '.v';
-		$escapedVersionsName = preg_replace('/(\*|\?|\[)/', '[$1]', $versionsName);
 		$versions = array();
+
+		//force rescan of versions, local storage may not have updated the cache
+		/** @var \OC\Files\Storage\Storage $storage */
+		list($storage, ) = $view->resolvePath('/');
+		$storage->getScanner()->scan('');
+
 		if ($timestamp) {
 			// fetch for old versions
-			$matches = glob($escapedVersionsName . '*.d' . $timestamp);
+			$matches = $view->searchRaw($filename . '.v%.d' . $timestamp);
 			$offset = -strlen($timestamp) - 2;
 		} else {
-			$matches = glob($escapedVersionsName . '*');
+			$matches = $view->searchRaw($filename . '.v%');
 		}
 
 		if (is_array($matches)) {
 			foreach ($matches as $ma) {
 				if ($timestamp) {
-					$parts = explode('.v', substr($ma, 0, $offset));
+					$parts = explode('.v', substr($ma['path'], 0, $offset));
 					$versions[] = (end($parts));
 				} else {
 					$parts = explode('.v', $ma);
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 95f3e9a2c7f..3d3406af94e 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1109,6 +1109,16 @@ class View {
 		return $this->searchCommon('%' . $query . '%', 'search');
 	}
 
+	/**
+	 * search for files with the name matching $query
+	 *
+	 * @param string $query
+	 * @return FileInfo[]
+	 */
+	public function searchRaw($query) {
+		return $this->searchCommon($query, 'search');
+	}
+
 	/**
 	 * search for files by mimetype
 	 *
-- 
GitLab


From 7b15fcc3f8fb0cf61e3d5d8748b5396bcd2745c2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 16 Oct 2014 12:08:05 +0200
Subject: [PATCH 123/616] left-align checkbox on server tab

---
 apps/user_ldap/templates/part.wizard-server.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 2952062c2f9..4412f4b1f38 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -70,14 +70,13 @@
 			</div>
 
 			<div class="tablerow left">
-				<label for="ldap_experienced_admin" class="tablecell">
-					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?>
-				</label>
-
 				<input type="checkbox" id="ldap_experienced_admin" value="1"
 					name="ldap_experienced_admin" class="tablecell lwautosave"
 					title="<?php p($l->t('Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.'));?>"
 					/>
+				<label for="ldap_experienced_admin" class="tablecell">
+					<?php p($l->t('Manually enter LDAP filters (recommended for large directories)'));?>
+				</label>
 			</div>
 
 			<div class="tablerow">
-- 
GitLab


From c71deea0d53e4dfe6b17cb5d28ddd695b7ee3e67 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 16 Oct 2014 12:26:26 +0200
Subject: [PATCH 124/616] Fix SPACE_UNKNOWN constant

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

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 73bb87955c7..63962296416 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -745,7 +745,7 @@ class Trashbin {
 		if ($quota === null || $quota === 'none') {
 			$quota = \OC\Files\Filesystem::free_space('/');
 			$softQuota = false;
-			if ($quota === \OC\Files\SPACE_UNKNOWN) {
+			if ($quota === \OCP\Files\FileInfo::SPACE_UNKNOWN) {
 				$quota = 0;
 			}
 		} else {
-- 
GitLab


From 9cfbf7ed1c92b262984488eaa9cee5df88419d5b Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 16 Oct 2014 12:13:16 +0200
Subject: [PATCH 125/616] Fix SVG icons

FIXME: Ugly hack to prevent SVG of being returned if the SVG
provider is not enabled.
This is required because the preview system is designed in a
bad way and relies on opt-in with asterisks (i.e. image/*)
which will lead to the fact that a SVG will also match the image
provider.

Conflicts:
	lib/private/preview.php
---
 apps/files_sharing/js/public.js |  2 +-
 lib/private/preview.php         | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index b3036254401..c4b5508692e 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -85,7 +85,7 @@ OCA.Sharing.PublicApp = {
 		};
 
 		var img = $('<img class="publicpreview">');
-		if (previewSupported === 'true' || mimetype.substr(0, mimetype.indexOf('/')) === 'image') {
+		if (previewSupported === 'true' || mimetype.substr(0, mimetype.indexOf('/')) === 'image' && mimetype !== 'image/svg+xml') {
 			img.attr('src', OC.filePath('files_sharing', 'ajax', 'publicpreview.php') + '?' + OC.buildQueryString(params));
 			img.appendTo('#imgframe');
 		} else if (mimetype.substr(0, mimetype.indexOf('/')) !== 'video') {
diff --git a/lib/private/preview.php b/lib/private/preview.php
index e9bfb3b9285..00f18219531 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -814,8 +814,19 @@ class Preview {
 			self::initProviders();
 		}
 
-		foreach (self::$providers as $supportedMimeType => $provider) {
-			if (preg_match($supportedMimeType, $mimeType)) {
+		// FIXME: Ugly hack to prevent SVG of being returned if the SVG
+		// provider is not enabled.
+		// This is required because the preview system is designed in a
+		// bad way and relies on opt-in with asterisks (i.e. image/*)
+		// which will lead to the fact that a SVG will also match the image
+		// provider.
+		if($mimeType === 'image/svg+xml' && !array_key_exists('/image\/svg\+xml/', self::$providers)) {
+			return false;
+		}
+
+		//remove last element because it has the mimetype *
+		foreach(self::$providers as $supportedMimetype => $provider) {
+			if(preg_match($supportedMimetype, $mimeType)) {
 				return true;
 			}
 		}
-- 
GitLab


From 4deb57bfaeacd2eee510ee37797d5e9b504d9888 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 16 Oct 2014 12:40:09 +0200
Subject: [PATCH 126/616] Remove insane comment

---
 lib/private/preview.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 00f18219531..f8b19f11cb0 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -824,7 +824,6 @@ class Preview {
 			return false;
 		}
 
-		//remove last element because it has the mimetype *
 		foreach(self::$providers as $supportedMimetype => $provider) {
 			if(preg_match($supportedMimetype, $mimeType)) {
 				return true;
-- 
GitLab


From a04159090fcba6a503d749014c39b81a75dd2f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 16 Oct 2014 13:29:51 +0200
Subject: [PATCH 127/616] include the apps' versions hash to invalidate the
 cached assets

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

diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 0f8c056139b..9f996e19f81 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -203,6 +203,8 @@ class OC_TemplateLayout extends OC_Template {
 		}, $files);
 
 		sort($files);
+		// include the apps' versions hash to invalidate the cached assets
+		$files[]= self::$versionHash;
 		return hash('md5', implode('', $files));
 	}
 
-- 
GitLab


From 4f2422ffbe5027d2308968e25c9bf8f3fe40131f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 16 Oct 2014 15:24:28 +0200
Subject: [PATCH 128/616] fixing typo in English source string

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

diff --git a/settings/controller/mailsettingscontroller.php b/settings/controller/mailsettingscontroller.php
index 583aa98dc8e..d050a5ea03e 100644
--- a/settings/controller/mailsettingscontroller.php
+++ b/settings/controller/mailsettingscontroller.php
@@ -134,7 +134,7 @@ class MailSettingsController extends Controller {
 			try {
 				$this->mail->send($email, $this->userSession->getUser()->getDisplayName(),
 					$this->l10n->t('test email settings'),
-					$this->l10n->t('If you received this email, the settings seems to be correct.'),
+					$this->l10n->t('If you received this email, the settings seem to be correct.'),
 					$this->defaultMailAddress,
 					$this->defaults->getName()
 				);
-- 
GitLab


From 85023543825a2c340cef82942b4c27b28275fb2d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 16 Oct 2014 15:41:45 +0200
Subject: [PATCH 129/616] Fix unit test

Regression introduced with https://github.com/owncloud/core/pull/11615
---
 tests/settings/controller/mailsettingscontrollertest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index 5a1add95449..ff3d1d93a1b 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -169,8 +169,8 @@ class MailSettingscontrollerTest extends \PHPUnit_Framework_TestCase {
 							'A problem occurred while sending the e-mail. Please revisit your settings.'),
 						array('Email sent', array(), 'Email sent'),
 						array('test email settings', array(), 'test email settings'),
-						array('If you received this email, the settings seems to be correct.', array(),
-							'If you received this email, the settings seems to be correct.')
+						array('If you received this email, the settings seem to be correct.', array(),
+							'If you received this email, the settings seem to be correct.')
 					)
 				));
 		$this->container['UserSession']
@@ -193,4 +193,4 @@ class MailSettingscontrollerTest extends \PHPUnit_Framework_TestCase {
 		$this->assertSame($expectedResponse, $response);
 	}
 
-}
\ No newline at end of file
+}
-- 
GitLab


From f7097faf82604a6d8b89eed9d1d5ea3d0843e4f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 17 Oct 2013 20:16:27 +0200
Subject: [PATCH 130/616] Special treatment for Oracle

---
 lib/private/db/mdb2schemamanager.php | 13 +++++++------
 lib/private/db/migrator.php          | 29 +++++++++++++++++++++++-----
 lib/private/db/oraclemigrator.php    | 14 ++++++++++++++
 lib/private/db/sqlitemigrator.php    |  6 ++++--
 4 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index a07c421b9b8..ea1e512002d 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -58,20 +58,21 @@ class MDB2SchemaManager {
 	 * @return \OC\DB\Migrator
 	 */
 	public function getMigrator() {
+		$random = \OC::$server->getSecureRandom()->getMediumStrengthGenerator();
 		$platform = $this->conn->getDatabasePlatform();
 		if ($platform instanceof SqlitePlatform) {
 			$config = \OC::$server->getConfig();
-			return new SQLiteMigrator($this->conn, $config);
+			return new SQLiteMigrator($this->conn, $random, $config);
 		} else if ($platform instanceof OraclePlatform) {
-			return new OracleMigrator($this->conn);
+			return new OracleMigrator($this->conn, $random);
 		} else if ($platform instanceof MySqlPlatform) {
-			return new MySQLMigrator($this->conn);
+			return new MySQLMigrator($this->conn, $random);
 		} else if ($platform instanceof SQLServerPlatform) {
-			return new MsSqlMigrator($this->conn);
+			return new MsSqlMigrator($this->conn, $random);
 		} else if ($platform instanceof PostgreSqlPlatform) {
-			return new Migrator($this->conn);
+			return new Migrator($this->conn, $random);
 		} else {
-			return new NoCheckMigrator($this->conn);
+			return new NoCheckMigrator($this->conn, $random);
 		}
 	}
 
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php
index d05f8455551..31c648a9b65 100644
--- a/lib/private/db/migrator.php
+++ b/lib/private/db/migrator.php
@@ -14,18 +14,27 @@ use \Doctrine\DBAL\Schema\Table;
 use \Doctrine\DBAL\Schema\Schema;
 use \Doctrine\DBAL\Schema\SchemaConfig;
 use \Doctrine\DBAL\Schema\Comparator;
+use OCP\Security\ISecureRandom;
 
 class Migrator {
+
 	/**
 	 * @var \Doctrine\DBAL\Connection $connection
 	 */
 	protected $connection;
 
+	/**
+	 * @var ISecureRandom
+	 */
+	private $random;
+
 	/**
 	 * @param \Doctrine\DBAL\Connection $connection
+	 * @param ISecureRandom $random
 	 */
-	public function __construct(\Doctrine\DBAL\Connection $connection) {
+	public function __construct(\Doctrine\DBAL\Connection $connection, ISecureRandom $random) {
 		$this->connection = $connection;
+		$this->random = $random;
 	}
 
 	/**
@@ -45,8 +54,7 @@ class Migrator {
 		$script = '';
 		$sqls = $schemaDiff->toSql($this->connection->getDatabasePlatform());
 		foreach ($sqls as $sql) {
-			$script .= $sql . ';';
-			$script .= PHP_EOL;
+			$script .= $this->convertStatementToScript($sql);
 		}
 
 		return $script;
@@ -84,7 +92,7 @@ class Migrator {
 	 * @return string
 	 */
 	protected function generateTemporaryTableName($name) {
-		return 'oc_' . $name . '_' . \OCP\Util::generateRandomBytes(13);
+		return 'oc_' . $name . '_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
 	}
 
 	/**
@@ -135,7 +143,7 @@ class Migrator {
 				$indexName = $index->getName();
 			} else {
 				// avoid conflicts in index names
-				$indexName = 'oc_' . \OCP\Util::generateRandomBytes(13);
+				$indexName = 'oc_' . $this->random->generate(13, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS);
 			}
 			$newIndexes[] = new Index($indexName, $index->getColumns(), $index->isUnique(), $index->isPrimary());
 		}
@@ -201,4 +209,15 @@ class Migrator {
 	protected function dropTable($name) {
 		$this->connection->exec('DROP TABLE ' . $this->connection->quoteIdentifier($name));
 	}
+
+	/**
+	 * @param $statement
+	 * @return string
+	 */
+	protected function convertStatementToScript($statement) {
+		$script = $statement . ';';
+		$script .= PHP_EOL;
+		$script .= PHP_EOL;
+		return $script;
+	}
 }
diff --git a/lib/private/db/oraclemigrator.php b/lib/private/db/oraclemigrator.php
index 1a8df2def9c..b80295cbd60 100644
--- a/lib/private/db/oraclemigrator.php
+++ b/lib/private/db/oraclemigrator.php
@@ -37,4 +37,18 @@ class OracleMigrator extends NoCheckMigrator {
 	protected function generateTemporaryTableName($name) {
 		return 'oc_' . uniqid();
 	}
+
+	/**
+	 * @param $statement
+	 * @return string
+	 */
+	protected function convertStatementToScript($statement) {
+		if (substr($statement, -1) === ';') {
+			return $statement . PHP_EOL . '/' . PHP_EOL;
+		}
+		$script = $statement . ';';
+		$script .= PHP_EOL;
+		$script .= PHP_EOL;
+		return $script;
+	}
 }
diff --git a/lib/private/db/sqlitemigrator.php b/lib/private/db/sqlitemigrator.php
index 18e9d19d5ee..848e4986571 100644
--- a/lib/private/db/sqlitemigrator.php
+++ b/lib/private/db/sqlitemigrator.php
@@ -10,6 +10,7 @@ namespace OC\DB;
 
 use Doctrine\DBAL\DBALException;
 use Doctrine\DBAL\Schema\Schema;
+use OCP\Security\ISecureRandom;
 
 class SQLiteMigrator extends Migrator {
 
@@ -20,10 +21,11 @@ class SQLiteMigrator extends Migrator {
 
 	/**
 	 * @param \Doctrine\DBAL\Connection $connection
+	 * @param ISecureRandom $random
 	 * @param \OCP\IConfig $config
 	 */
-	public function __construct(\Doctrine\DBAL\Connection $connection, \OCP\IConfig $config) {
-		parent::__construct($connection);
+	public function __construct(\Doctrine\DBAL\Connection $connection, ISecureRandom $random, \OCP\IConfig $config) {
+		parent::__construct($connection, $random);
 		$this->config = $config;
 	}
 
-- 
GitLab


From 53e0cf2f74af236f6121b5aedfd1e06d93902674 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 16 Oct 2014 21:45:09 +0200
Subject: [PATCH 131/616] Add a try catch block

This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
---
 lib/private/app.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index 95a8a7302d9..faaadef3857 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -1101,13 +1101,17 @@ class OC_App {
 			return $versions; // when function is used besides in checkUpgrade
 		}
 		$versions = array();
-		$query = OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig`'
-			. ' WHERE `configkey` = \'installed_version\'');
-		$result = $query->execute();
-		while ($row = $result->fetchRow()) {
-			$versions[$row['appid']] = $row['configvalue'];
+		try {
+			$query = OC_DB::prepare('SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig`'
+				. ' WHERE `configkey` = \'installed_version\'');
+			$result = $query->execute();
+			while ($row = $result->fetchRow()) {
+				$versions[$row['appid']] = $row['configvalue'];
+			}
+			return $versions;
+		} catch (\Exception $e) {
+			return array();
 		}
-		return $versions;
 	}
 
 
-- 
GitLab


From 852c7ef9daf307f8de4db97bb00dc4487957b0de Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 16 Oct 2014 22:04:24 +0200
Subject: [PATCH 132/616] Use l10n on this string as well

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

diff --git a/core/templates/exception.php b/core/templates/exception.php
index cf0e4c74825..144359a16d9 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -3,7 +3,7 @@
 	/** @var OC_L10N $l */
 ?>
 <span class="error error-wide">
-	<h2><strong><?php p('Internal Server Error') ?></strong></h2>
+	<h2><strong><?php p($l->t('Internal Server Error')) ?></strong></h2>
 		<p><?php p($l->t('The server encountered an internal error and was unable to complete your request.')) ?></p>
 		<p><?php p($l->t('Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.')) ?></p>
 		<p><?php p($l->t('More details can be found in the server log.')) ?></p>
-- 
GitLab


From dd747440394b397d3f12a4eb938fe86ad344cb78 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 17 Oct 2014 00:35:51 +0200
Subject: [PATCH 133/616] read config.sample.php options and whitespace fixes

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

diff --git a/config/config.sample.php b/config/config.sample.php
index 597f01c802c..e54591d62e4 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -6,7 +6,7 @@
  *
  * DO NOT COMPLETELY BASE YOUR CONFIGURATION FILE ON THIS SAMPLE. THIS MAY BREAK
  * YOUR INSTANCE. Instead, manually copy configuration switches that you
- * consider important for your instance to your working ``config.php``, and 
+ * consider important for your instance to your working ``config.php``, and
  * apply configuration options that are pertinent for your instance.
  *
  * This file is used to generate the config documentation. Please consider
@@ -45,6 +45,7 @@ $CONFIG = array(
  *
  * 'instanceid' => 'd3c944a9a',
  */
+'instanceid' => '',
 
  /**
  * The salt used to hash all passwords, auto-generated by the ownCloud
@@ -54,13 +55,14 @@ $CONFIG = array(
  *
  *'passwordsalt' => 'd3c944a9af095aa08f',
  */
+'passwordsalt' => '',
 
 /**
  * Your list of trusted domains that users can log into. Specifying trusted
  * domains prevents host header poisoning. Do not remove this, as it performs
  * necessary security checks.
  */
-'trusted_domains' => 
+'trusted_domains' =>
   array (
     'demo.example.org',
     'otherdomain.example.org:8080',
@@ -552,7 +554,7 @@ $CONFIG = array(
  * Images files
  * Covers of MP3 files
  * Text documents
- * Valid values are ``true``, to enable previews, or 
+ * Valid values are ``true``, to enable previews, or
  * ``false``, to disable previews
  */
 'enable_previews' => true,
@@ -665,7 +667,7 @@ $CONFIG = array(
  */
 
 /**
- * Blacklist a specific file or files and disallow the upload of files 
+ * Blacklist a specific file or files and disallow the upload of files
  * with this name. ``.htaccess`` is blocked by default.
  * WARNING: USE THIS ONLY IF YOU KNOW WHAT YOU ARE DOING.
  */
-- 
GitLab


From 72c2ee9f9c2454ddd770667153112e1808d07b78 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 17 Oct 2014 00:57:35 +0200
Subject: [PATCH 134/616] fix the RST syntax of config.sample.php

---
 config/config.sample.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index e54591d62e4..621e5df80b3 100755
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -551,9 +551,11 @@ $CONFIG = array(
 
 /**
  * By default, ownCloud can generate previews for the following filetypes:
- * Images files
- * Covers of MP3 files
- * Text documents
+ *
+ * - Images files
+ * - Covers of MP3 files
+ * - Text documents
+ *
  * Valid values are ``true``, to enable previews, or
  * ``false``, to disable previews
  */
-- 
GitLab


From 92f2914335643d6a2701963c21b5c51e421c1996 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 17 Oct 2014 01:58:25 -0400
Subject: [PATCH 135/616] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/et_EE.php   |  1 +
 core/l10n/de.php                    |  4 +-
 core/l10n/et_EE.php                 |  9 ++++
 l10n/templates/core.pot             |  6 ++-
 l10n/templates/files.pot            | 30 ++++++-------
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  4 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              | 18 ++++----
 l10n/templates/private.pot          | 18 ++++----
 l10n/templates/settings.pot         |  4 +-
 l10n/templates/user_ldap.pot        | 65 +++++++++++++++++++----------
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/cs_CZ.php                  |  1 +
 lib/l10n/da.php                     |  1 +
 lib/l10n/en_GB.php                  |  1 +
 lib/l10n/es.php                     |  1 +
 lib/l10n/et_EE.php                  |  2 +
 lib/l10n/fi_FI.php                  |  1 +
 lib/l10n/it.php                     |  1 +
 lib/l10n/nl.php                     |  1 +
 lib/l10n/pt_BR.php                  |  1 +
 lib/l10n/sv.php                     |  1 +
 lib/l10n/tr.php                     |  1 +
 settings/l10n/ar.php                |  2 +
 settings/l10n/ast.php               |  2 +
 settings/l10n/az.php                |  1 +
 settings/l10n/bg_BG.php             |  2 +
 settings/l10n/bn_BD.php             |  2 +
 settings/l10n/bn_IN.php             |  1 +
 settings/l10n/ca.php                |  3 ++
 settings/l10n/cs_CZ.php             | 10 +++++
 settings/l10n/cy_GB.php             |  1 +
 settings/l10n/da.php                | 10 +++++
 settings/l10n/de.php                |  3 ++
 settings/l10n/de_AT.php             |  2 +
 settings/l10n/de_CH.php             |  3 ++
 settings/l10n/de_DE.php             |  3 ++
 settings/l10n/el.php                |  2 +
 settings/l10n/en_GB.php             | 10 +++++
 settings/l10n/eo.php                |  2 +
 settings/l10n/es.php                | 11 ++++-
 settings/l10n/es_AR.php             |  2 +
 settings/l10n/es_MX.php             |  2 +
 settings/l10n/et_EE.php             | 12 ++++++
 settings/l10n/eu.php                |  3 ++
 settings/l10n/fa.php                |  2 +
 settings/l10n/fi_FI.php             | 10 +++++
 settings/l10n/fr.php                |  2 +
 settings/l10n/gl.php                |  3 ++
 settings/l10n/he.php                |  2 +
 settings/l10n/hr.php                |  2 +
 settings/l10n/hu_HU.php             |  2 +
 settings/l10n/ia.php                |  1 +
 settings/l10n/id.php                |  2 +
 settings/l10n/is.php                |  1 +
 settings/l10n/it.php                | 10 +++++
 settings/l10n/ja.php                |  3 ++
 settings/l10n/ka_GE.php             |  1 +
 settings/l10n/km.php                |  2 +
 settings/l10n/ko.php                |  2 +
 settings/l10n/ku_IQ.php             |  1 +
 settings/l10n/lb.php                |  1 +
 settings/l10n/lt_LT.php             |  3 ++
 settings/l10n/lv.php                |  2 +
 settings/l10n/mk.php                |  2 +
 settings/l10n/ms_MY.php             |  1 +
 settings/l10n/nb_NO.php             |  2 +
 settings/l10n/nl.php                | 10 +++++
 settings/l10n/nn_NO.php             |  1 +
 settings/l10n/oc.php                |  1 +
 settings/l10n/pl.php                |  3 ++
 settings/l10n/pt_BR.php             | 10 +++++
 settings/l10n/pt_PT.php             |  2 +
 settings/l10n/ro.php                |  2 +
 settings/l10n/ru.php                |  3 ++
 settings/l10n/si_LK.php             |  1 +
 settings/l10n/sk_SK.php             |  3 ++
 settings/l10n/sl.php                |  2 +
 settings/l10n/sq.php                |  1 +
 settings/l10n/sr.php                |  1 +
 settings/l10n/sr@latin.php          |  1 +
 settings/l10n/sv.php                |  7 ++++
 settings/l10n/ta_LK.php             |  1 +
 settings/l10n/th_TH.php             |  1 +
 settings/l10n/tr.php                | 10 +++++
 settings/l10n/ug.php                |  1 +
 settings/l10n/uk.php                |  1 +
 settings/l10n/vi.php                |  2 +
 settings/l10n/zh_CN.php             |  3 ++
 settings/l10n/zh_HK.php             |  1 +
 settings/l10n/zh_TW.php             |  3 ++
 94 files changed, 329 insertions(+), 69 deletions(-)

diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index d0fb98e4ee2..e087af6b9e3 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "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",
 "Couldn't add remote share" => "Ei suutnud lisada kaugjagamist",
 "Shared with you" => "Sinuga jagatud",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index ada6e70080d..013b6538d52 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -151,10 +151,10 @@ $TRANSLATIONS = array(
 "The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
 "Cheers!" => "Hallo!",
 "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 sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, gebe bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.",
+"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, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
 "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",
+"Remote Address: %s" => "IP Adresse: %s",
 "Request ID: %s" => "Anforderungskennung: %s",
 "Code: %s" => "Code: %s",
 "Message: %s" => "Nachricht: %s",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 4b9ac3f93b6..58b0955838c 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -87,6 +87,7 @@ $TRANSLATIONS = array(
 "Send" => "Saada",
 "Set expiration date" => "Määra aegumise kuupäev",
 "Expiration date" => "Aegumise kuupäev",
+"Adding user..." => "Kasutaja lisamine...",
 "group" => "grupp",
 "Resharing is not allowed" => "Edasijagamine pole lubatud",
 "Shared in {item} with {user}" => "Jagatud {item} kasutajaga {user}",
@@ -142,9 +143,17 @@ $TRANSLATIONS = array(
 "Error favoriting" => "Viga lemmikuks lisamisel",
 "Error unfavoriting" => "Viga lemmikutest eemaldamisel",
 "Access forbidden" => "Ligipääs on keelatud",
+"File not found" => "Faili ei leitud",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
 "The share will expire on %s." => "Jagamine aegub %s.",
 "Cheers!" => "Terekest!",
+"Technical details" => "Tehnilised andmed",
+"Remote Address: %s" => "Kaugaadress: %s",
+"Request ID: %s" => "Päringu ID: %s",
+"Code: %s" => "Kood: %s",
+"Message: %s" => "Sõnum: %s",
+"File: %s" => "Fail: %s",
+"Line: %s" => "Rida: %s",
 "Security Warning" => "Turvahoiatus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
 "Please update your PHP installation to use %s securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 3e78dc82191..906b7e43e05 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -662,6 +662,10 @@ msgstr ""
 msgid "Cheers!"
 msgstr ""
 
+#: templates/exception.php:6
+msgid "Internal Server Error"
+msgstr ""
+
 #: templates/exception.php:7
 msgid ""
 "The server encountered an internal error and was unable to complete your "
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 1ea7e4373d5..eba92a24e2e 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -198,7 +198,7 @@ msgstr ""
 msgid "URL cannot be empty"
 msgstr ""
 
-#: js/file-upload.js:579 js/filelist.js:1308
+#: js/file-upload.js:579 js/filelist.js:1310
 msgid "{new_name} already exists"
 msgstr ""
 
@@ -238,59 +238,59 @@ msgstr ""
 msgid "Rename"
 msgstr ""
 
-#: js/filelist.js:698 js/filelist.js:1854
+#: js/filelist.js:700 js/filelist.js:1856
 msgid "Pending"
 msgstr ""
 
-#: js/filelist.js:1259
+#: js/filelist.js:1261
 msgid "Error moving file."
 msgstr ""
 
-#: js/filelist.js:1267
+#: js/filelist.js:1269
 msgid "Error moving file"
 msgstr ""
 
-#: js/filelist.js:1267
+#: js/filelist.js:1269
 msgid "Error"
 msgstr ""
 
-#: js/filelist.js:1356
+#: js/filelist.js:1358
 msgid "Could not rename file"
 msgstr ""
 
-#: js/filelist.js:1478
+#: js/filelist.js:1480
 msgid "Error deleting file."
 msgstr ""
 
-#: js/filelist.js:1580 templates/list.php:61
+#: js/filelist.js:1582 templates/list.php:61
 msgid "Name"
 msgstr ""
 
-#: js/filelist.js:1581 templates/list.php:72
+#: js/filelist.js:1583 templates/list.php:72
 msgid "Size"
 msgstr ""
 
-#: js/filelist.js:1582 templates/list.php:75
+#: js/filelist.js:1584 templates/list.php:75
 msgid "Modified"
 msgstr ""
 
-#: js/filelist.js:1592 js/filesummary.js:141 js/filesummary.js:168
+#: js/filelist.js:1594 js/filesummary.js:141 js/filesummary.js:168
 msgid "%n folder"
 msgid_plural "%n folders"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1598 js/filesummary.js:142 js/filesummary.js:169
+#: js/filelist.js:1600 js/filesummary.js:142 js/filesummary.js:169
 msgid "%n file"
 msgid_plural "%n files"
 msgstr[0] ""
 msgstr[1] ""
 
-#: js/filelist.js:1655 templates/list.php:47
+#: js/filelist.js:1657 templates/list.php:47
 msgid "You don’t have permission to upload or create files here"
 msgstr ""
 
-#: js/filelist.js:1747 js/filelist.js:1786
+#: js/filelist.js:1749 js/filelist.js:1788
 msgid "Uploading %n file"
 msgid_plural "Uploading %n files"
 msgstr[0] ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 224bce06504..98f7be5807d 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 2255ee24545..f433ff0bd24 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 2167e5aca0e..a29849d9e1f 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index a01bae342af..48b0e1a32f9 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:962 lib/trashbin.php:964
+#: lib/trashbin.php:970 lib/trashbin.php:972
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index e964ff4a625..41eb7e9f696 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 04fb0566568..158825a0039 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -75,14 +75,14 @@ msgstr ""
 msgid "Recommended"
 msgstr ""
 
-#: private/app.php:1142
+#: private/app.php:1146
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: private/app.php:1154
+#: private/app.php:1158
 msgid "No app name specified"
 msgstr ""
 
@@ -373,36 +373,36 @@ msgstr ""
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1841
+#: private/share/share.php:1892
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1851
+#: private/share/share.php:1902
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1877
+#: private/share/share.php:1928
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1891
+#: private/share/share.php:1942
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1905
+#: private/share/share.php:1956
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: private/tags.php:183
+#: private/tags.php:226
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 6e3c68dcf06..af72bbcc67c 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -42,14 +42,14 @@ msgstr ""
 msgid "Recommended"
 msgstr ""
 
-#: app.php:1142
+#: app.php:1146
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: app.php:1154
+#: app.php:1158
 msgid "No app name specified"
 msgstr ""
 
@@ -332,36 +332,36 @@ msgstr ""
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: share/share.php:1841
+#: share/share.php:1892
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: share/share.php:1851
+#: share/share.php:1902
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: share/share.php:1877
+#: share/share.php:1928
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: share/share.php:1891
+#: share/share.php:1942
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: share/share.php:1905
+#: share/share.php:1956
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
 msgstr ""
 
-#: tags.php:183
+#: tags.php:226
 #, php-format
 msgid "Could not find category \"%s\""
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 88d3e5eed92..d9f6c4e953a 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -168,7 +168,7 @@ msgid "test email settings"
 msgstr ""
 
 #: controller/mailsettingscontroller.php:137
-msgid "If you received this email, the settings seems to be correct."
+msgid "If you received this email, the settings seem to be correct."
 msgstr ""
 
 #: controller/mailsettingscontroller.php:144
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 7421a8e8092..11eb8e19829 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -91,55 +91,55 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: js/settings.js:244
+#: js/settings.js:266
 msgid "Please specify a Base DN"
 msgstr ""
 
-#: js/settings.js:245
+#: js/settings.js:267
 msgid "Could not determine Base DN"
 msgstr ""
 
-#: js/settings.js:276
+#: js/settings.js:299
 msgid "Please specify the port"
 msgstr ""
 
-#: js/settings.js:792
+#: js/settings.js:933
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:801
+#: js/settings.js:942
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:810
+#: js/settings.js:951
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:827 js/settings.js:836
+#: js/settings.js:968 js/settings.js:977
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:830 js/settings.js:839
+#: js/settings.js:971 js/settings.js:980
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:833
+#: js/settings.js:974
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:860
+#: js/settings.js:1002
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:867
+#: js/settings.js:1009
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:876
+#: js/settings.js:1018
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:877
+#: js/settings.js:1019
 msgid "Confirm Deletion"
 msgstr ""
 
@@ -165,19 +165,19 @@ msgstr ""
 msgid "Invalid Host"
 msgstr ""
 
-#: settings.php:52
+#: settings.php:53
 msgid "Server"
 msgstr ""
 
-#: settings.php:53
+#: settings.php:54
 msgid "User Filter"
 msgstr ""
 
-#: settings.php:54
+#: settings.php:55
 msgid "Login Filter"
 msgstr ""
 
-#: settings.php:55
+#: settings.php:56
 msgid "Group Filter"
 msgstr ""
 
@@ -189,7 +189,7 @@ msgstr ""
 msgid "Test Configuration"
 msgstr ""
 
-#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:14
+#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:15
 msgid "Help"
 msgstr ""
 
@@ -226,7 +226,12 @@ msgid ""
 "The filter specifies which LDAP groups shall have access to the %s instance."
 msgstr ""
 
-#: templates/part.wizard-groupfilter.php:38
+#: templates/part.wizard-groupfilter.php:34
+#: templates/part.wizard-userfilter.php:34
+msgid "Test Filter"
+msgstr ""
+
+#: templates/part.wizard-groupfilter.php:41
 msgid "groups found"
 msgstr ""
 
@@ -309,6 +314,16 @@ msgstr ""
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
+#: templates/part.wizard-server.php:75
+msgid ""
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some "
+"LDAP knowledge."
+msgstr ""
+
+#: templates/part.wizard-server.php:78
+msgid "Manually enter LDAP filters (recommended for large directories)"
+msgstr ""
+
 #: templates/part.wizard-userfilter.php:4
 #, php-format
 msgid "Limit %s access to users meeting these criteria:"
@@ -320,15 +335,19 @@ msgid ""
 "The filter specifies which LDAP users shall have access to the %s instance."
 msgstr ""
 
-#: templates/part.wizard-userfilter.php:38
+#: templates/part.wizard-userfilter.php:41
 msgid "users found"
 msgstr ""
 
-#: templates/part.wizardcontrols.php:5
+#: templates/part.wizardcontrols.php:2
+msgid "Saving"
+msgstr ""
+
+#: templates/part.wizardcontrols.php:6
 msgid "Back"
 msgstr ""
 
-#: templates/part.wizardcontrols.php:8
+#: templates/part.wizardcontrols.php:9
 msgid "Continue"
 msgstr ""
 
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index e776c57e516..c7c51d7919b 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-16 01:54-0400\n"
+"POT-Creation-Date: 2014-10-17 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 244fc53fbf3..a8143d4e431 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Nastavení",
 "Users" => "Uživatelé",
 "Admin" => "Administrace",
+"Recommended" => "Doporučené",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikace \\\"%s\\\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.",
 "No app name specified" => "Nebyl zadan název aplikace",
 "Unknown filetype" => "Neznámý typ souboru",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 1568d72e3a6..8ae7d847a09 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Indstillinger",
 "Users" => "Brugere",
 "Admin" => "Admin",
+"Recommended" => "Anbefalet",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App'en \\\"%s\\\" kan ikke installeres, da den ikke er kompatible med denne version af ownCloud.",
 "No app name specified" => "Intet app-navn angivet",
 "Unknown filetype" => "Ukendt filtype",
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
index da3cacfce98..5a3ba3a6c54 100644
--- a/lib/l10n/en_GB.php
+++ b/lib/l10n/en_GB.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Settings",
 "Users" => "Users",
 "Admin" => "Admin",
+"Recommended" => "Recommended",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud.",
 "No app name specified" => "No app name specified",
 "Unknown filetype" => "Unknown filetype",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 04253fc7b0c..553ccd519fd 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Ajustes",
 "Users" => "Usuarios",
 "Admin" => "Administración",
+"Recommended" => "Recomendado",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "La aplicación \\\"%s\\\" no se puede instalar porque no es compatible con esta versión de ownCloud.",
 "No app name specified" => "No se ha especificado nombre de la aplicación",
 "Unknown filetype" => "Tipo de archivo desconocido",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 8adc51dd118..5dd406ac399 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Seaded",
 "Users" => "Kasutajad",
 "Admin" => "Admin",
+"Recommended" => "Soovitatud",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Rakendit \\\"%s\\\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
 "No app name specified" => "Ühegi rakendi nime pole määratletud",
 "Unknown filetype" => "Tundmatu failitüüp",
@@ -50,6 +51,7 @@ $TRANSLATIONS = array(
 "PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged",
 "Set an admin username." => "Määra admin kasutajanimi.",
 "Set an admin password." => "Määra admini parool.",
+"Can't create or write into the data directory %s" => "Ei suuda luua või kirjutada andmete kataloogi %s",
 "%s shared »%s« with you" => "%s jagas sinuga »%s«",
 "Sharing %s failed, because the file does not exist" => "%s jagamine ebaõnnestus, kuna faili pole olemas",
 "You are not allowed to share %s" => "Sul pole lubatud %s jagada",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index b002ab02495..5c9a6442c76 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -10,6 +10,7 @@ $TRANSLATIONS = array(
 "Settings" => "Asetukset",
 "Users" => "Käyttäjät",
 "Admin" => "Ylläpito",
+"Recommended" => "Suositeltu",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Sovellusta \\\"%s\\\" ei voi asentaa, koska se ei ole yhteensopiva tämän ownCloud-version kanssa.",
 "No app name specified" => "Sovelluksen nimeä ei määritelty",
 "Unknown filetype" => "Tuntematon tiedostotyyppi",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 1d71816d32c..c9eaff8a35c 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Impostazioni",
 "Users" => "Utenti",
 "Admin" => "Admin",
+"Recommended" => "Consigliata",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'applicazione \\\"%s\\\" non può essere installata poiché non è compatibile con questa versione di ownCloud.",
 "No app name specified" => "Il nome dell'applicazione non è specificato",
 "Unknown filetype" => "Tipo di file sconosciuto",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index f7a91d2785d..f5a81dd6ee3 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Instellingen",
 "Users" => "Gebruikers",
 "Admin" => "Beheerder",
+"Recommended" => "Aanbevolen",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.",
 "No app name specified" => "De app naam is niet gespecificeerd.",
 "Unknown filetype" => "Onbekend bestandsformaat",
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 57152025794..d0dc9078128 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Configurações",
 "Users" => "Usuários",
 "Admin" => "Admin",
+"Recommended" => "Recomendado",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do ownCloud.",
 "No app name specified" => "O nome do aplicativo não foi especificado.",
 "Unknown filetype" => "Tipo de arquivo desconhecido",
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 6558e3bb02e..c042b6af6cb 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -8,6 +8,7 @@ $TRANSLATIONS = array(
 "Settings" => "Inställningar",
 "Users" => "Användare",
 "Admin" => "Admin",
+"Recommended" => "Rekomenderad",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Applikationen  \\\"%s\\\" kan inte installeras då en inte är kompatibel med denna version utav ownCloud.",
 "No app name specified" => "Inget appnamn angivet",
 "Unknown filetype" => "Okänd filtyp",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
index aba1e7db1cc..4477efd07cc 100644
--- a/lib/l10n/tr.php
+++ b/lib/l10n/tr.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Ayarlar",
 "Users" => "Kullanıcılar",
 "Admin" => "Yönetici",
+"Recommended" => "Önerilen",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "ownCloud yazılımının bu sürümü ile uyumlu  olmadığı için \\\"%s\\\" uygulaması kurulamaz.",
 "No app name specified" => "Uygulama adı belirtilmedi",
 "Unknown filetype" => "Bilinmeyen dosya türü",
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 93c2ae997f8..a0d684713fc 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "مفعلة",
 "Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "Your full name has been changed." => "اسمك الكامل تم تغييره.",
 "Unable to change full name" => "لم يتم التمكن من تغيير اسمك الكامل",
@@ -101,6 +102,7 @@ $TRANSLATIONS = array(
 "Less" => "أقل",
 "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>." => "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
+"by" => "من قبل",
 "Documentation:" => "التوثيق",
 "User Documentation" => "كتاب توثيق المستخدم",
 "Uninstall App" => "أزالة تطبيق",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index bc79b9e49b0..b6877bc6a80 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Habilitar",
 "Authentication error" => "Fallu d'autenticación",
 "Your full name has been changed." => "Camudóse'l nome completu.",
 "Unable to change full name" => "Nun pue camudase'l nome completu",
@@ -145,6 +146,7 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "por",
 "Documentation:" => "Documentación:",
 "User Documentation" => "Documentación d'usuariu",
 "Admin Documentation" => "Documentación p'alministradores",
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
index 95156f184f1..25abf7fa642 100644
--- a/settings/l10n/az.php
+++ b/settings/l10n/az.php
@@ -93,6 +93,7 @@ $TRANSLATIONS = array(
 "Encryption" => "Şifrələnmə",
 "Authentication method" => "Qeydiyyat metodikası",
 "More" => "Yenə",
+"by" => "onunla",
 "User Documentation" => "İstifadəçi sənədləri",
 "Admin Documentation" => "İnzibatçı sənədləri",
 "Uninstall App" => "Proqram təminatını sil",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 82cad890e4e..5833725a4e1 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Включено",
 "Authentication error" => "Възникна проблем с идентификацията",
 "Your full name has been changed." => "Пълното ти име е променено.",
 "Unable to change full name" => "Неуспешна промяна на пълното име.",
@@ -154,6 +155,7 @@ $TRANSLATIONS = array(
 "Less" => "По-малко",
 "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>." => "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "от",
 "Documentation:" => "Документация:",
 "User Documentation" => "Потребителска Документация",
 "Admin Documentation" => "Админ Документация",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 558510daf3c..ffab9f10b87 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "কার্যকর",
 "Authentication error" => "অনুমোদন ঘটিত সমস্যা",
 "Your full name has been changed." => "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
 "Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
@@ -62,6 +63,7 @@ $TRANSLATIONS = array(
 "Less" => "কম",
 "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>." => "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
+"by" => "কর্তৃক",
 "User Documentation" => "ব্যবহারকারী সহায়িকা",
 "Administrator Documentation" => "প্রশাসক সহায়িকা",
 "Online Documentation" => "অনলাইন সহায়িকা",
diff --git a/settings/l10n/bn_IN.php b/settings/l10n/bn_IN.php
index 325b868b117..160df13779d 100644
--- a/settings/l10n/bn_IN.php
+++ b/settings/l10n/bn_IN.php
@@ -2,6 +2,7 @@
 $TRANSLATIONS = array(
 "Saved" => "সংরক্ষিত",
 "Delete" => "মুছে ফেলা",
+"by" => "দ্বারা",
 "Get the apps to sync your files" => "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
 "Cancel" => "বাতিল করা",
 "Username" => "ইউজারনেম"
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 895091738ec..bf431e43fbd 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Activat",
 "Authentication error" => "Error d'autenticació",
 "Your full name has been changed." => "El vostre nom complet ha canviat.",
 "Unable to change full name" => "No s'ha pogut canviar el nom complet",
@@ -144,6 +145,8 @@ $TRANSLATIONS = array(
 "Less" => "Menys",
 "Version" => "Versió",
 "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>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Més aplicacions",
+"by" => "per",
 "Documentation:" => "Documentació:",
 "User Documentation" => "Documentació d'usuari",
 "Admin Documentation" => "Documentació d'administrador",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 7f7d43fc05b..42cd49ef70d 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Povoleno",
+"Not enabled" => "Vypnuto",
+"Recommended" => "Doporučeno",
 "Authentication error" => "Chyba přihlášení",
 "Your full name has been changed." => "Vaše celé jméno bylo změněno.",
 "Unable to change full name" => "Nelze změnit celé jméno",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Změna hesla se nezdařila",
 "Saved" => "Uloženo",
 "test email settings" => "otestovat nastavení e-mailu",
+"A problem occurred while sending the email. Please revise your settings." => "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.",
 "Email sent" => "E-mail odeslán",
 "You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
@@ -146,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Přihlašovací údaje",
 "SMTP Username" => "SMTP uživatelské jméno ",
 "SMTP Password" => "SMTP heslo",
+"Store credentials" => "Ukládat přihlašovací údaje",
 "Test email settings" => "Otestovat nastavení e-mailu",
 "Send email" => "Odeslat e-mail",
 "Log" => "Záznam",
@@ -154,9 +159,14 @@ $TRANSLATIONS = array(
 "Less" => "Méně",
 "Version" => "Verze",
 "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>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Více aplikací",
+"Add your app" => "Přidat vlastní aplikaci",
+"by" => "sdílí",
+"licensed" => "licencováno",
 "Documentation:" => "Dokumentace:",
 "User Documentation" => "Uživatelská dokumentace",
 "Admin Documentation" => "Dokumentace pro administrátory",
+"Update to %s" => "Aktualizovat na %s",
 "Enable only for specific groups" => "Povolit pouze pro vybrané skupiny",
 "Uninstall App" => "Odinstalovat aplikaci",
 "Administrator Documentation" => "Dokumentace správce",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index 0efe0361c84..e8928d6fc27 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "Security Warning" => "Rhybudd Diogelwch",
 "Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
 "Encryption" => "Amgryptiad",
+"by" => "gan",
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
 "Email" => "E-bost",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 0631c6f73af..f87af958df3 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Aktiveret",
+"Not enabled" => "Slået fra",
+"Recommended" => "Anbefalet",
 "Authentication error" => "Adgangsfejl",
 "Your full name has been changed." => "Dit fulde navn er blevet ændret.",
 "Unable to change full name" => "Ikke i stand til at ændre dit fulde navn",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Kunne ikke ændre kodeord",
 "Saved" => "Gemt",
 "test email settings" => "test e-mailindstillinger",
+"A problem occurred while sending the email. Please revise your settings." => "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.",
 "Email sent" => "E-mail afsendt",
 "You need to set your user email before being able to send test emails." => "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
 "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?",
@@ -146,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Brugeroplysninger",
 "SMTP Username" => "SMTP Brugernavn",
 "SMTP Password" => "SMTP Kodeord",
+"Store credentials" => "Gem brugeroplysninger",
 "Test email settings" => "Test e-mail-indstillinger",
 "Send email" => "Send e-mail",
 "Log" => "Log",
@@ -154,9 +159,14 @@ $TRANSLATIONS = array(
 "Less" => "Mindre",
 "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>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Flere programmer",
+"Add your app" => "Tilføj din app",
+"by" => "af",
+"licensed" => "licenseret",
 "Documentation:" => "Dokumentation:",
 "User Documentation" => "Brugerdokumentation",
 "Admin Documentation" => "Administrator Dokumentation",
+"Update to %s" => "Opdatér til %s",
 "Enable only for specific groups" => "Aktivér kun for udvalgte grupper",
 "Uninstall App" => "Afinstallér app",
 "Administrator Documentation" => "Administrator Dokumentation",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 2756b6da584..52ecaf1e121 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Aktiviert",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Your full name has been changed." => "Dein vollständiger Name ist geändert worden.",
 "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
@@ -154,6 +155,8 @@ $TRANSLATIONS = array(
 "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",
 "Documentation:" => "Dokumentation:",
 "User Documentation" => "Dokumentation für Benutzer",
 "Admin Documentation" => "Admin-Dokumentation",
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
index 2f4be525fe2..f82d87ef739 100644
--- a/settings/l10n/de_AT.php
+++ b/settings/l10n/de_AT.php
@@ -6,6 +6,8 @@ $TRANSLATIONS = array(
 "__language_name__" => "Deutsch (Österreich)",
 "Server address" => "Adresse des Servers",
 "Port" => "Port",
+"More apps" => "Mehr Apps",
+"by" => "von",
 "Password" => "Passwort",
 "Email" => "E-Mail",
 "Cancel" => "Abbrechen",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 0139b3b0970..f6e38644691 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Group already exists" => "Die Gruppe existiert bereits",
 "Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
@@ -62,6 +63,8 @@ $TRANSLATIONS = array(
 "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",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 8760da2006e..5e8a5083ca7 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Your full name has been changed." => "Ihr vollständiger Name ist geändert worden.",
 "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
@@ -154,6 +155,8 @@ $TRANSLATIONS = array(
 "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",
 "Documentation:" => "Dokumentation:",
 "User Documentation" => "Dokumentation für Benutzer",
 "Admin Documentation" => "Dokumentation für Administratoren",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 20e5279c0af..f9caf6e22d8 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Ενεργοποιημένο",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Your full name has been changed." => "Το πλήρες όνομά σας άλλαξε.",
 "Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
@@ -154,6 +155,7 @@ $TRANSLATIONS = array(
 "Less" => "Λιγότερα",
 "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>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "από",
 "Documentation:" => "Τεκμηρίωση:",
 "User Documentation" => "Τεκμηρίωση Χρήστη",
 "Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 942b51d2002..17a959b4197 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Enabled",
+"Not enabled" => "Not enabled",
+"Recommended" => "Recommended",
 "Authentication error" => "Authentication error",
 "Your full name has been changed." => "Your full name has been changed.",
 "Unable to change full name" => "Unable to change full name",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Unable to change password",
 "Saved" => "Saved",
 "test email settings" => "test email settings",
+"A problem occurred while sending the email. Please revise your settings." => "A problem occurred whilst sending the email. Please revise your settings.",
 "Email sent" => "Email sent",
 "You need to set your user email before being able to send test emails." => "You need to set your user email before being able to send test emails.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Are you really sure you want add \"{domain}\" as a trusted domain?",
@@ -146,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Credentials",
 "SMTP Username" => "SMTP Username",
 "SMTP Password" => "SMTP Password",
+"Store credentials" => "Store credentials",
 "Test email settings" => "Test email settings",
 "Send email" => "Send email",
 "Log" => "Log",
@@ -154,9 +159,14 @@ $TRANSLATIONS = array(
 "Less" => "Less",
 "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>." => "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 Licence\">AGPL</abbr></a>.",
+"More apps" => "More apps",
+"Add your app" => "Add your app",
+"by" => "by",
+"licensed" => "licensed",
 "Documentation:" => "Documentation:",
 "User Documentation" => "User Documentation",
 "Admin Documentation" => "Admin Documentation",
+"Update to %s" => "Update to %s",
 "Enable only for specific groups" => "Enable only for specific groups",
 "Uninstall App" => "Uninstall App",
 "Administrator Documentation" => "Administrator Documentation",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index ddfa33a6f6a..3d8fac31ef0 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Kapabligita",
 "Authentication error" => "Aŭtentiga eraro",
 "Your full name has been changed." => "Via plena nomo ŝanĝitas.",
 "Unable to change full name" => "Ne eblis ŝanĝi la plenan nomon",
@@ -96,6 +97,7 @@ $TRANSLATIONS = array(
 "Less" => "Malpli",
 "Version" => "Eldono",
 "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>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "de",
 "Documentation:" => "Dokumentaro:",
 "User Documentation" => "Dokumentaro por uzantoj",
 "Admin Documentation" => "Administra dokumentaro",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 1a7ad06db4a..12d84a7f0a3 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Habilitar",
+"Not enabled" => "No habilitado",
+"Recommended" => "Recomendado",
 "Authentication error" => "Error de autenticación",
 "Your full name has been changed." => "Se ha cambiado su nombre completo.",
 "Unable to change full name" => "No se puede cambiar el nombre completo",
@@ -30,7 +33,8 @@ $TRANSLATIONS = array(
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
 "Unable to change password" => "No se ha podido cambiar la contraseña",
 "Saved" => "Guardado",
-"test email settings" => "probar configuración de correo",
+"test email settings" => "probar configuración de correo electrónico",
+"A problem occurred while sending the email. Please revise your settings." => "Ocurrió un problema al mandar el mensaje. Revise la configuración.",
 "Email sent" => "Correo electrónico enviado",
 "You need to set your user email before being able to send test emails." => "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
@@ -146,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Credenciales",
 "SMTP Username" => "Nombre de usuario SMTP",
 "SMTP Password" => "Contraseña SMTP",
+"Store credentials" => "Almacenar credenciales",
 "Test email settings" => "Probar configuración de correo electrónico",
 "Send email" => "Enviar mensaje",
 "Log" => "Registro",
@@ -154,9 +159,13 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Más aplicaciones",
+"Add your app" => "Agregue su aplicación",
+"by" => "por",
 "Documentation:" => "Documentación:",
 "User Documentation" => "Documentación de usuario",
 "Admin Documentation" => "Documentación para administradores",
+"Update to %s" => "Actualizado a %s",
 "Enable only for specific groups" => "Activar solamente para grupos específicos",
 "Uninstall App" => "Desinstalar aplicación",
 "Administrator Documentation" => "Documentación de administrador",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 5262fdf249e..b8a1109b560 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Habilitado",
 "Authentication error" => "Error al autenticar",
 "Your full name has been changed." => "Su nombre completo ha sido cambiado.",
 "Unable to change full name" => "Imposible cambiar el nombre completo",
@@ -110,6 +111,7 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "por",
 "Documentation:" => "Documentación:",
 "User Documentation" => "Documentación de Usuario",
 "Admin Documentation" => "Documentación de Administrador.",
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 96352aa5ed8..600b804d827 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Habilitar",
 "Authentication error" => "Error de autenticación",
 "Your full name has been changed." => "Se ha cambiado su nombre completo.",
 "Unable to change full name" => "No se puede cambiar el nombre completo",
@@ -83,6 +84,7 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "por",
 "User Documentation" => "Documentación de usuario",
 "Administrator Documentation" => "Documentación de administrador",
 "Online Documentation" => "Documentación en línea",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 1256d74e24d..a821995edf7 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Sisse lülitatud",
+"Not enabled" => "Pole sisse lülitatud",
+"Recommended" => "Soovitatud",
 "Authentication error" => "Autentimise viga",
 "Your full name has been changed." => "Sinu täispikk nimi on muudetud.",
 "Unable to change full name" => "Täispika nime muutmine ebaõnnestus",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Ei suuda parooli muuta",
 "Saved" => "Salvestatud",
 "test email settings" => "testi e-posti seadeid",
+"A problem occurred while sending the email. Please revise your settings." => "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
 "Email sent" => "E-kiri on saadetud",
 "You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
@@ -105,6 +109,8 @@ $TRANSLATIONS = array(
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
 "URL generation in notification emails" => "URL-ide loomine teavituskirjades",
 "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
+"Connectivity checks" => "Ühenduse kontrollimine",
+"No problems found" => "Ühtegi probleemi ei leitud",
 "Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
 "Cron" => "Cron",
 "Last cron was executed at %s." => "Cron käivitati viimati %s.",
@@ -144,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Kasutajatunnused",
 "SMTP Username" => "SMTP kasutajatunnus",
 "SMTP Password" => "SMTP parool",
+"Store credentials" => "Säilita kasutajaandmed",
 "Test email settings" => "Testi e-posti seadeid",
 "Send email" => "Saada kiri",
 "Log" => "Logi",
@@ -152,9 +159,14 @@ $TRANSLATIONS = array(
 "Less" => "Vähem",
 "Version" => "Versioon",
 "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>." => "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
+"More apps" => "Rohkem rakendusi",
+"Add your app" => "Lisa oma rakendus",
+"by" => "lisas",
+"licensed" => "litsenseeritud",
 "Documentation:" => "Dokumentatsioon:",
 "User Documentation" => "Kasutaja dokumentatsioon",
 "Admin Documentation" => "Admin dokumentatsioon",
+"Update to %s" => "Uuenda versioonile %s",
 "Enable only for specific groups" => "Luba ainult kindlad grupid",
 "Uninstall App" => "Eemada rakend",
 "Administrator Documentation" => "Administraatori dokumentatsioon",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 1c2153d24ac..87ace49275a 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Gaitua",
 "Authentication error" => "Autentifikazio errorea",
 "Your full name has been changed." => "Zure izena aldatu egin da.",
 "Unable to change full name" => "Ezin izan da izena aldatu",
@@ -151,6 +152,8 @@ $TRANSLATIONS = array(
 "Less" => "Gutxiago",
 "Version" => "Bertsioa",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
+"More apps" => "App gehiago",
+"by" => " Egilea:",
 "Documentation:" => "Dokumentazioa:",
 "User Documentation" => "Erabiltzaile dokumentazioa",
 "Admin Documentation" => "Administrazio dokumentazioa",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 840de096558..b964c18c51a 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "فعال شده",
 "Authentication error" => "خطا در اعتبار سنجی",
 "Your full name has been changed." => "نام کامل شما تغییر یافت",
 "Unable to change full name" => "امکان تغییر نام کامل وجود ندارد",
@@ -127,6 +128,7 @@ $TRANSLATIONS = array(
 "Less" => "کم‌تر",
 "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>." => "توسعه یافته به وسیله ی  <a href=\"http://ownCloud.org/contact\" target=\"_blank\">انجمن ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">کد اصلی</a> مجاز زیر گواهی <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "با",
 "Documentation:" => "مستند سازی:",
 "User Documentation" => "مستندات کاربر",
 "Admin Documentation" => "مستند سازی مدیر",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index e5c1ce516c0..41044847b7f 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Käytössä",
+"Not enabled" => "Ei käytössä",
+"Recommended" => "Suositeltu",
 "Authentication error" => "Tunnistautumisvirhe",
 "Your full name has been changed." => "Koko nimesi on muutettu.",
 "Unable to change full name" => "Koko nimen muuttaminen epäonnistui",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Salasanan vaihto ei onnistunut",
 "Saved" => "Tallennettu",
 "test email settings" => "testaa sähköpostiasetukset",
+"A problem occurred while sending the email. Please revise your settings." => "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.",
 "Email sent" => "Sähköposti lähetetty",
 "You need to set your user email before being able to send test emails." => "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
@@ -138,6 +142,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Tilitiedot",
 "SMTP Username" => "SMTP-käyttäjätunnus",
 "SMTP Password" => "SMTP-salasana",
+"Store credentials" => "Säilytä tilitiedot",
 "Test email settings" => "Testaa sähköpostiasetukset",
 "Send email" => "Lähetä sähköpostiviesti",
 "Log" => "Loki",
@@ -146,9 +151,14 @@ $TRANSLATIONS = array(
 "Less" => "Vähemmän",
 "Version" => "Versio",
 "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>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
+"More apps" => "Lisää sovelluksia",
+"Add your app" => "Lisää sovelluksesi",
+"by" => " Kirjoittaja:",
+"licensed" => "lisensoitu",
 "Documentation:" => "Ohjeistus:",
 "User Documentation" => "Käyttäjäohjeistus",
 "Admin Documentation" => "Ylläpitäjän ohjeistus",
+"Update to %s" => "Päivitä versioon %s",
 "Enable only for specific groups" => "Salli vain tietyille ryhmille",
 "Uninstall App" => "Poista sovelluksen asennus",
 "Administrator Documentation" => "Ylläpito-ohjeistus",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index a498030a15e..2ec79e78f9f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Activer",
 "Authentication error" => "Erreur d'authentification",
 "Your full name has been changed." => "Votre nom complet a été modifié.",
 "Unable to change full name" => "Impossible de changer le nom complet",
@@ -154,6 +155,7 @@ $TRANSLATIONS = array(
 "Less" => "Moins",
 "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>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "par",
 "Documentation:" => "Documentation :",
 "User Documentation" => "Documentation utilisateur",
 "Admin Documentation" => "Documentation administrateur",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index c2fac946544..1cdb75b866e 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Activado",
 "Authentication error" => "Produciuse un erro de autenticación",
 "Your full name has been changed." => "O seu nome completo foi cambiado",
 "Unable to change full name" => "Non é posíbel cambiar o nome completo",
@@ -149,6 +150,8 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versión",
 "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>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Máis aplicativos",
+"by" => "por",
 "Documentation:" => "Documentación:",
 "User Documentation" => "Documentación do usuario",
 "Admin Documentation" => "Documentación do administrador",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index e761cead850..8974c1fb1e1 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -55,6 +55,8 @@ $TRANSLATIONS = array(
 "Less" => "פחות",
 "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>." => "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "יישומים נוספים",
+"by" => "על ידי",
 "User Documentation" => "תיעוד משתמש",
 "Administrator Documentation" => "תיעוד מנהלים",
 "Online Documentation" => "תיעוד מקוון",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index d37f8beccf2..f1552304226 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Aktivirano",
 "Authentication error" => "Pogrešna autentikacija",
 "Your full name has been changed." => "Vaše puno ime je promijenjeno.",
 "Unable to change full name" => "Puno ime nije moguće promijeniti.",
@@ -152,6 +153,7 @@ $TRANSLATIONS = array(
 "Less" => "Manje",
 "Version" => "Verzija",
 "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>." => "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
+"by" => "od strane",
 "Documentation:" => "Dokumentacija:",
 "User Documentation" => "Korisnička dokumentacija",
 "Admin Documentation" => "Admin dokumentacija",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 2f1d9db9e85..5021adf908b 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Bekapcsolva",
 "Authentication error" => "Azonosítási hiba",
 "Your full name has been changed." => "Az Ön teljes nevét módosítottuk.",
 "Unable to change full name" => "Nem sikerült megváltoztatni a teljes nevét",
@@ -151,6 +152,7 @@ $TRANSLATIONS = array(
 "Less" => "Kevesebb",
 "Version" => "Verzió",
 "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>." => "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
+"by" => "közreadta:",
 "Documentation:" => "Leírások:",
 "User Documentation" => "Felhasználói leírás",
 "Admin Documentation" => "Adminisztrátori leírás",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index b2f50db8cb6..f348af78212 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Security Warning" => "Aviso de securitate",
 "Log" => "Registro",
 "More" => "Plus",
+"by" => "per",
 "Get the apps to sync your files" => "Obtene le apps (applicationes) pro synchronizar tu files",
 "Password" => "Contrasigno",
 "Unable to change your password" => "Non pote cambiar tu contrasigno",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 08544547ddd..4ecc8d992ce 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Diaktifkan",
 "Authentication error" => "Galat saat autentikasi",
 "Your full name has been changed." => "Nama lengkap Anda telah diubah",
 "Unable to change full name" => "Tidak dapat mengubah nama lengkap",
@@ -108,6 +109,7 @@ $TRANSLATIONS = array(
 "Less" => "Ciutkan",
 "Version" => "Versi",
 "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>." => "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "oleh",
 "Documentation:" => "Dokumentasi:",
 "User Documentation" => "Dokumentasi Pengguna",
 "Admin Documentation" => "Dokumentasi Admin",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index b28a15cf903..263926500d5 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Less" => "Minna",
 "Version" => "Útgáfa",
 "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>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "af",
 "User Documentation" => "Notenda handbók",
 "Administrator Documentation" => "Stjórnenda handbók",
 "Online Documentation" => "Handbók á netinu",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index d140819e454..fc680f1e150 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Abilitata",
+"Not enabled" => "Non abilitata",
+"Recommended" => "Consigliata",
 "Authentication error" => "Errore di autenticazione",
 "Your full name has been changed." => "Il tuo nome completo è stato cambiato.",
 "Unable to change full name" => "Impossibile cambiare il nome completo",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Impossibile cambiare la password",
 "Saved" => "Salvato",
 "test email settings" => "prova impostazioni email",
+"A problem occurred while sending the email. Please revise your settings." => "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.",
 "Email sent" => "Email inviata",
 "You need to set your user email before being able to send test emails." => "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
@@ -146,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Credenziali",
 "SMTP Username" => "Nome utente SMTP",
 "SMTP Password" => "Password SMTP",
+"Store credentials" => "Memorizza le credenziali",
 "Test email settings" => "Prova impostazioni email",
 "Send email" => "Invia email",
 "Log" => "Log",
@@ -154,9 +159,14 @@ $TRANSLATIONS = array(
 "Less" => "Meno",
 "Version" => "Versione",
 "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>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Altre applicazioni",
+"Add your app" => "Aggiungi la tua applicazione",
+"by" => "di",
+"licensed" => "sotto licenza",
 "Documentation:" => "Documentazione:",
 "User Documentation" => "Documentazione utente",
 "Admin Documentation" => "Documentazione di amministrazione",
+"Update to %s" => "Aggiornato a %s",
 "Enable only for specific groups" => "Abilita solo per gruppi specifici",
 "Uninstall App" => "Disinstalla applicazione",
 "Administrator Documentation" => "Documentazione amministratore",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index c3a828206dc..cdbf329662f 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "有効",
 "Authentication error" => "認証エラー",
 "Your full name has been changed." => "名前を変更しました。",
 "Unable to change full name" => "名前を変更できません",
@@ -154,6 +155,8 @@ $TRANSLATIONS = array(
 "Less" => "閉じる",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
+"More apps" => "他のアプリ",
+"by" => "により",
 "Documentation:" => "ドキュメント:",
 "User Documentation" => "ユーザードキュメント",
 "Admin Documentation" => "管理者ドキュメント",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index bea73e94943..f59e85d144d 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -56,6 +56,7 @@ $TRANSLATIONS = array(
 "Less" => "უფრო ნაკლები",
 "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>." => "წარმოებულია <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.",
+"by" => "მიერ",
 "User Documentation" => "მომხმარებლის დოკუმენტაცია",
 "Administrator Documentation" => "ადმინისტრატორის დოკუმენტაცია",
 "Online Documentation" => "ონლაინ დოკუმენტაცია",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index 74df3711c0d..d51bd4b7b84 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "បាន​បើក",
 "Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
 "Group already exists" => "មាន​ក្រុម​នេះ​រួច​ហើយ",
 "Unable to add group" => "មិន​អាច​បន្ថែម​ក្រុម",
@@ -71,6 +72,7 @@ $TRANSLATIONS = array(
 "Less" => "តិច",
 "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>." => "សរសេរ​កម្មវិធី​ដោយ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">សហគមន៍ ownCloud</a> ហើយ <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> គឺ​ស្ថិត​ក្នុង​អាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។",
+"by" => "ដោយ",
 "User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
 "Admin Documentation" => "កម្រង​ឯកសារ​អភិបាល",
 "Administrator Documentation" => "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 689c6d27bde..ebea9e4432c 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "활성화",
 "Authentication error" => "인증 오류",
 "Your full name has been changed." => "전체 이름이 변경되었습니다.",
 "Unable to change full name" => "전체 이름을 변경할 수 없음",
@@ -112,6 +113,7 @@ $TRANSLATIONS = array(
 "Less" => "덜 중요함",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
+"by" => "작성:",
 "Documentation:" => "문서",
 "User Documentation" => "사용자 문서",
 "Admin Documentation" => "운영자 문서",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 01ca81e68c2..947831a7044 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -6,6 +6,7 @@ $TRANSLATIONS = array(
 "Login" => "چوونەژوورەوە",
 "Encryption" => "نهێنیکردن",
 "Server address" => "ناونیشانی ڕاژه",
+"by" => "له‌لایه‌ن",
 "Password" => "وشەی تێپەربو",
 "New password" => "وشەی نهێنی نوێ",
 "Email" => "ئیمه‌یل",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 82edc1748db..eb7fd44b5e5 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "Log" => "Log",
 "More" => "Méi",
 "Less" => "Manner",
+"by" => "vun",
 "Password" => "Passwuert",
 "Unable to change your password" => "Konnt däin Passwuert net änneren",
 "Current password" => "Momentan 't Passwuert",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index ebc255c461e..2617679390b 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Įjungta",
 "Authentication error" => "Autentikacijos klaida",
 "Group already exists" => "Grupė jau egzistuoja",
 "Unable to add group" => "Nepavyko pridėti grupės",
@@ -72,6 +73,8 @@ $TRANSLATIONS = array(
 "Less" => "Mažiau",
 "Version" => "Versija",
 "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>." => "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Daugiau programų",
+"by" => " ",
 "User Documentation" => "Naudotojo dokumentacija",
 "Administrator Documentation" => "Administratoriaus dokumentacija",
 "Online Documentation" => "Dokumentacija tinkle",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 2fde1034818..4182bad26e9 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -61,6 +61,8 @@ $TRANSLATIONS = array(
 "Less" => "Mazāk",
 "Version" => "Versija",
 "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>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Vairāk programmu",
+"by" => "līdz",
 "User Documentation" => "Lietotāja dokumentācija",
 "Administrator Documentation" => "Administratora dokumentācija",
 "Online Documentation" => "Tiešsaistes dokumentācija",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index bc90e8d343d..c3e062caeee 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Овозможен",
 "Authentication error" => "Грешка во автентикација",
 "Your full name has been changed." => "Вашето целосно име е променето.",
 "Unable to change full name" => "Не можам да го променам целото име",
@@ -106,6 +107,7 @@ $TRANSLATIONS = array(
 "Less" => "Помалку",
 "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>." => "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "од",
 "Documentation:" => "Документација:",
 "User Documentation" => "Корисничка документација",
 "Admin Documentation" => "Админстраторска документација",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 98869363e95..c20dcae9ea0 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
 "Log" => "Log",
 "Log level" => "Tahap Log",
 "More" => "Lanjutan",
+"by" => "oleh",
 "Password" => "Kata laluan",
 "Unable to change your password" => "Gagal mengubah kata laluan anda ",
 "Current password" => "Kata laluan semasa",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index f10f8e8fe44..a501571d2b7 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Aktiv",
 "Authentication error" => "Autentiseringsfeil",
 "Your full name has been changed." => "Ditt fulle navn er blitt endret.",
 "Unable to change full name" => "Klarte ikke å endre fullt navn",
@@ -154,6 +155,7 @@ $TRANSLATIONS = array(
 "Less" => "Mindre",
 "Version" => "Versjon",
 "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>." => "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "av",
 "Documentation:" => "Dokumentasjon:",
 "User Documentation" => "Brukerdokumentasjon",
 "Admin Documentation" => "Admin-dokumentasjon",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 666b34981f6..6f6c47bef23 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Geactiveerd",
+"Not enabled" => "Niet ingeschakeld",
+"Recommended" => "Aanbevolen",
 "Authentication error" => "Authenticatie fout",
 "Your full name has been changed." => "Uw volledige naam is gewijzigd.",
 "Unable to change full name" => "Kan de volledige naam niet wijzigen",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Kan wachtwoord niet wijzigen",
 "Saved" => "Bewaard",
 "test email settings" => "test e-mailinstellingen",
+"A problem occurred while sending the email. Please revise your settings." => "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
 "Email sent" => "E-mail verzonden",
 "You need to set your user email before being able to send test emails." => "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
@@ -146,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Inloggegevens",
 "SMTP Username" => "SMTP gebruikersnaam",
 "SMTP Password" => "SMTP wachtwoord",
+"Store credentials" => "Opslaan inloggegevens",
 "Test email settings" => "Test e-mailinstellingen",
 "Send email" => "Versturen e-mail",
 "Log" => "Log",
@@ -154,9 +159,14 @@ $TRANSLATIONS = array(
 "Less" => "Minder",
 "Version" => "Versie",
 "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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Meer applicaties",
+"Add your app" => "Voeg uw app toe",
+"by" => "door",
+"licensed" => "gelicenseerd",
 "Documentation:" => "Documentatie:",
 "User Documentation" => "Gebruikersdocumentatie",
 "Admin Documentation" => "Beheerdocumentatie",
+"Update to %s" => "Bijgewerkt naar %s",
 "Enable only for specific groups" => "Alleen voor bepaalde groepen activeren",
 "Uninstall App" => "De-installeren app",
 "Administrator Documentation" => "Beheerdersdocumentatie",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index b8d0d23ca84..0c4a196313f 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -69,6 +69,7 @@ $TRANSLATIONS = array(
 "Less" => "Mindre",
 "Version" => "Utgåve",
 "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>." => "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "av",
 "User Documentation" => "Brukardokumentasjon",
 "Administrator Documentation" => "Administratordokumentasjon",
 "Online Documentation" => "Dokumentasjon på nett",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index 4fc9968a384..fba58f1b559 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -26,6 +26,7 @@ $TRANSLATIONS = array(
 "Sharing" => "Al partejar",
 "Log" => "Jornal",
 "More" => "Mai d'aquò",
+"by" => "per",
 "Password" => "Senhal",
 "Your password was changed" => "Ton senhal a cambiat",
 "Unable to change your password" => "Pas possible de cambiar ton senhal",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 3e2ca7d26e1..63ed6451779 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Włączone",
 "Authentication error" => "Błąd uwierzytelniania",
 "Your full name has been changed." => "Twoja pełna nazwa została zmieniona.",
 "Unable to change full name" => "Nie można zmienić pełnej nazwy",
@@ -154,6 +155,8 @@ $TRANSLATIONS = array(
 "Less" => "Mniej",
 "Version" => "Wersja",
 "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>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Więcej aplikacji",
+"by" => "przez",
 "Documentation:" => "Dokumentacja:",
 "User Documentation" => "Dokumentacja użytkownika",
 "Admin Documentation" => "Dokumentacja Administratora",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 2e9a1a2c016..e591ae84830 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Habilitado",
+"Not enabled" => "Desabilitado",
+"Recommended" => "Recomendado",
 "Authentication error" => "Erro de autenticação",
 "Your full name has been changed." => "Seu nome completo foi alterado.",
 "Unable to change full name" => "Não é possível alterar o nome completo",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Impossível modificar senha",
 "Saved" => "Salvo",
 "test email settings" => "testar configurações de email",
+"A problem occurred while sending the email. Please revise your settings." => "Ocorreu um problema ao enviar o e-mail. Por favor, revise suas configurações.",
 "Email sent" => "E-mail enviado",
 "You need to set your user email before being able to send test emails." => "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
@@ -146,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Credenciais",
 "SMTP Username" => "Nome do Usuário SMTP",
 "SMTP Password" => "Senha SMTP",
+"Store credentials" => "Armazenar credenciais",
 "Test email settings" => "Configurações de e-mail de teste",
 "Send email" => "Enviar email",
 "Log" => "Registro",
@@ -154,9 +159,14 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versão",
 "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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Mais aplicativos",
+"Add your app" => "Adicionar seu aplicativo",
+"by" => "por",
+"licensed" => "licenciado",
 "Documentation:" => "Documentação:",
 "User Documentation" => "Documentação de Usuário",
 "Admin Documentation" => "Documentação de Administrador",
+"Update to %s" => "Atualizado para %s",
 "Enable only for specific groups" => "Ativar apenas para grupos específicos",
 "Uninstall App" => "Desinstalar Aplicativo",
 "Administrator Documentation" => "Documentação de Administrador",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index d4a24cf29bd..503439bd02b 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Ativada",
 "Authentication error" => "Erro na autenticação",
 "Your full name has been changed." => "O seu nome completo foi alterado.",
 "Unable to change full name" => "Não foi possível alterar o seu nome completo",
@@ -153,6 +154,7 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versão",
 "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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "por",
 "Documentation:" => "Documentação:",
 "User Documentation" => "Documentação de Utilizador",
 "Admin Documentation" => "Documentação de administrador.",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 3bc87d1f8c6..5beed941db2 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Activat",
 "Authentication error" => "Eroare la autentificare",
 "Your full name has been changed." => "Numele tău complet a fost schimbat.",
 "Unable to change full name" => "Nu s-a puput schimba numele complet",
@@ -86,6 +87,7 @@ $TRANSLATIONS = array(
 "Less" => "Mai puțin",
 "Version" => "Versiunea",
 "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>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "după",
 "User Documentation" => "Documentație utilizator",
 "Administrator Documentation" => "Documentație administrator",
 "Online Documentation" => "Documentație online",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index b1559c0c14e..a729ad6525b 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Включено",
 "Authentication error" => "Ошибка аутентификации",
 "Your full name has been changed." => "Ваше полное имя было изменено.",
 "Unable to change full name" => "Невозможно изменить полное имя",
@@ -154,6 +155,8 @@ $TRANSLATIONS = array(
 "Less" => "Меньше",
 "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>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Ещё приложения",
+"by" => ":",
 "Documentation:" => "Документация:",
 "User Documentation" => "Пользовательская документация",
 "Admin Documentation" => "Документация администратора",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 5c63346a64d..744c60a610b 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "More" => "වැඩි",
 "Less" => "අඩු",
 "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>." => "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
+"by" => "විසින්",
 "Password" => "මුර පදය",
 "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
 "Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 281434452ee..5a449528c0d 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Povolené",
 "Authentication error" => "Chyba autentifikácie",
 "Your full name has been changed." => "Vaše meno a priezvisko bolo zmenené.",
 "Unable to change full name" => "Nemožno zmeniť meno a priezvisko",
@@ -152,6 +153,8 @@ $TRANSLATIONS = array(
 "Less" => "Menej",
 "Version" => "Verzia",
 "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>." => "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Viac aplikácií",
+"by" => "od",
 "Documentation:" => "Dokumentácia:",
 "User Documentation" => "Príručka používateľa",
 "Admin Documentation" => "Príručka administrátora",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 1efc9f8661a..ce5ead36ef2 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Omogočeno",
 "Authentication error" => "Napaka med overjanjem",
 "Your full name has been changed." => "Vaše polno ime je spremenjeno.",
 "Unable to change full name" => "Ni mogoče spremeniti polnega imena",
@@ -131,6 +132,7 @@ $TRANSLATIONS = array(
 "Less" => "Manj",
 "Version" => "Različica",
 "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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
+"by" => "od",
 "Documentation:" => "Dokumentacija:",
 "User Documentation" => "Uporabniška dokumentacija",
 "Admin Documentation" => "Skrbniška dokumentacija",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 8c505d99700..5d1961b2271 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "Less" => "M'pak",
 "Version" => "Versioni",
 "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>." => "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "nga",
 "Documentation:" => "Dokumentacioni:",
 "User Documentation" => "Dokumentacion përdoruesi",
 "Administrator Documentation" => "Dokumentacion administratori",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index ff0c9f80464..8086949a7ec 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -53,6 +53,7 @@ $TRANSLATIONS = array(
 "Less" => "Мање",
 "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>." => "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>.",
+"by" => "од",
 "User Documentation" => "Корисничка документација",
 "Administrator Documentation" => "Администраторска документација",
 "Online Documentation" => "Мрежна документација",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 2d3e61065c8..7116283bed3 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -12,6 +12,7 @@ $TRANSLATIONS = array(
 "Delete" => "Obriši",
 "Groups" => "Grupe",
 "Security Warning" => "Bezbednosno upozorenje",
+"by" => "od",
 "Password" => "Lozinka",
 "Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
 "Current password" => "Trenutna lozinka",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 9e1d4f71313..df6969d9df8 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Aktiverad",
+"Not enabled" => "Inte aktiverad",
+"Recommended" => "Rekomenderad",
 "Authentication error" => "Fel vid autentisering",
 "Your full name has been changed." => "Hela ditt namn har ändrats",
 "Unable to change full name" => "Kunde inte ändra hela namnet",
@@ -145,9 +148,12 @@ $TRANSLATIONS = array(
 "Less" => "Mindre",
 "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>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Fler appar",
+"by" => "av",
 "Documentation:" => "Dokumentation:",
 "User Documentation" => "Användardokumentation",
 "Admin Documentation" => "Administratörsdokumentation",
+"Update to %s" => "Uppdatera till %s",
 "Enable only for specific groups" => "Aktivera endast för specifika grupper",
 "Uninstall App" => "Avinstallera Applikation",
 "Administrator Documentation" => "Administratörsdokumentation",
@@ -156,6 +162,7 @@ $TRANSLATIONS = array(
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Kommersiell support",
 "Get the apps to sync your files" => "Skaffa apparna för att synkronisera dina filer",
+"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Om du vill stödja projektet\n<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">hjälp till med utvecklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sprid budskapet vidare</a>!",
 "Show First Run Wizard again" => "Visa Första uppstarts-guiden igen",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
 "Password" => "Lösenord",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index a4c8c850ddc..1c628363232 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "More" => "மேலதிக",
 "Less" => "குறைவான",
 "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>." => "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>.",
+"by" => "மூலம்",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
 "Password" => "கடவுச்சொல்",
 "Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 3cc80ffbd67..407307cd763 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -45,6 +45,7 @@ $TRANSLATIONS = array(
 "Less" => "น้อย",
 "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>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "โดย",
 "User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
 "Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
 "Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 3e1ad733de8..76afe9b6aff 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,5 +1,8 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Etkin",
+"Not enabled" => "Etkin değil",
+"Recommended" => "Önerilen",
 "Authentication error" => "Kimlik doğrulama hatası",
 "Your full name has been changed." => "Tam adınız değiştirildi.",
 "Unable to change full name" => "Tam adınız değiştirilirken hata",
@@ -31,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Parola değiştirilemiyor",
 "Saved" => "Kaydedildi",
 "test email settings" => "e-posta ayarlarını sına",
+"A problem occurred while sending the email. Please revise your settings." => "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.",
 "Email sent" => "E-posta gönderildi",
 "You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
@@ -146,6 +150,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Kimlik Bilgileri",
 "SMTP Username" => "SMTP Kullanıcı Adı",
 "SMTP Password" => "SMTP Parolası",
+"Store credentials" => "Kimlik bilgilerini depola",
 "Test email settings" => "E-posta ayarlarını sına",
 "Send email" => "E-posta gönder",
 "Log" => "Günlük",
@@ -154,9 +159,14 @@ $TRANSLATIONS = array(
 "Less" => "Daha az",
 "Version" => "Sürüm",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
+"More apps" => "Daha fazla Uygulama",
+"Add your app" => "Uygulamanızı ekleyin",
+"by" => "oluşturan",
+"licensed" => "lisanslı",
 "Documentation:" => "Belgelendirme:",
 "User Documentation" => "Kullanıcı Belgelendirmesi",
 "Admin Documentation" => "Yönetici Belgelendirmesi",
+"Update to %s" => "%s sürümüne güncelle",
 "Enable only for specific groups" => "Sadece belirli gruplar için etkinleştir",
 "Uninstall App" => "Uygulamayı Kaldır",
 "Administrator Documentation" => "Yönetici Belgelendirmesi",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index 64f8a61c781..ddf67ce8ebe 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -45,6 +45,7 @@ $TRANSLATIONS = array(
 "More" => "تېخىمۇ كۆپ",
 "Less" => "ئاز",
 "Version" => "نەشرى",
+"by" => "سەنئەتكار",
 "User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
 "Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
 "Online Documentation" => "توردىكى قوللانما",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 904ce92ea8b..8b26272e6e6 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -60,6 +60,7 @@ $TRANSLATIONS = array(
 "Less" => "Менше",
 "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>." => "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "по",
 "User Documentation" => "Документація Користувача",
 "Administrator Documentation" => "Документація Адміністратора",
 "Online Documentation" => "Он-Лайн Документація",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index cbddc4b7347..6b0fc92c26d 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Bật",
 "Authentication error" => "Lỗi xác thực",
 "Your full name has been changed." => "Họ và tên đã được thay đổi.",
 "Unable to change full name" => "Họ và tên không thể đổi ",
@@ -47,6 +48,7 @@ $TRANSLATIONS = array(
 "Less" => "ít",
 "Version" => "Phiên bản",
 "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>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"by" => "bởi",
 "User Documentation" => "Tài liệu người sử dụng",
 "Administrator Documentation" => "Tài liệu quản trị",
 "Online Documentation" => "Tài liệu trực tuyến",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 393902ac375..b5bf164fb80 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "开启",
 "Authentication error" => "认证错误",
 "Your full name has been changed." => "您的全名已修改。",
 "Unable to change full name" => "无法修改全名",
@@ -154,6 +155,8 @@ $TRANSLATIONS = array(
 "Less" => "更少",
 "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>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
+"More apps" => "更多应用",
+"by" => "被",
 "Documentation:" => "文档：",
 "User Documentation" => "用户文档",
 "Admin Documentation" => "管理员文档",
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 4927561edc6..6139dad2795 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "啟用",
 "Wrong password" => "密碼錯誤",
 "Saved" => "已儲存",
 "Email sent" => "郵件已傳",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index d861294620f..bf636d10807 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,5 +1,6 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "已啓用",
 "Authentication error" => "認證錯誤",
 "Your full name has been changed." => "您的全名已變更。",
 "Unable to change full name" => "無法變更全名",
@@ -115,6 +116,8 @@ $TRANSLATIONS = array(
 "Less" => "更少",
 "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>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。",
+"More apps" => "更多 Apps",
+"by" => "由",
 "Documentation:" => "文件:",
 "User Documentation" => "用戶說明文件",
 "Admin Documentation" => "管理者文件",
-- 
GitLab


From 4611520c7fbb9269c6232e7f4047bb5f5dd1610c Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 15 Oct 2014 17:15:45 +0200
Subject: [PATCH 136/616] first steps of sidebar for personal and admin
 settings

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

diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 871a0ec9e39..86f2c28319b 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -7,6 +7,15 @@
 /** @var $_ array */
 ?>
 
+<div id="app-navigation">
+<!--	<?php foreach($_['forms'] as $form) {
+		print_unescaped($form);
+	};?>
+-->
+</div>
+
+<div id="app-content">
+
 <div class="clientsbox center">
 	<h2><?php p($l->t('Get the apps to sync your files'));?></h2>
 	<a href="<?php p($_['clients']['desktop']); ?>" target="_blank">
@@ -254,3 +263,7 @@ if($_['passwordChangeSupported']) {
 <div class="section credits-footer">
 	<p><?php print_unescaped($theme->getShortFooter()); ?></p>
 </div>
+
+
+
+</div>
-- 
GitLab


From 04323fbc19524926973550cc2aa0ab0331a4ca0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 16 Oct 2014 18:01:48 +0200
Subject: [PATCH 137/616] implement sidebar fro personal settings - bad kung-fu

---
 core/css/apps.css               |  2 +-
 settings/personal.php           | 35 ++++++++++++++++++++++++++++++---
 settings/templates/personal.php | 21 +++++++++++++-------
 3 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/core/css/apps.css b/core/css/apps.css
index 35487bee598..898259ed9d5 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -479,7 +479,7 @@ button.loading {
 	border-top: 1px solid #ddd;
 }
 /* no top border for first settings item */
-.section:first-child {
+#app-content > .section:first-child {
 	border-top: none;
 }
 .section h2 {
diff --git a/settings/personal.php b/settings/personal.php
index e6f53d62704..ecbec887da8 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -101,9 +101,38 @@ $tmpl->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
 $tmpl->assign('avatarChangeSupported', OC_User::canUserChangeAvatar(OC_User::getUser()));
 $tmpl->assign('certs', $certificateManager->listCertificates());
 
+// add hardcoded forms from the template
+$l = OC_L10N::get('settings');
+$formsAndMore = array();
+$formsAndMore[]= array( 'anchor' => 'passwordform', 'section-name' => $l->t('Personal Info') );
+
 $forms=OC_App::getForms('personal');
-$tmpl->assign('forms', array());
-foreach($forms as $form) {
-	$tmpl->append('forms', $form);
+
+$formsMap = array_map(function($form){
+	if (preg_match('%(<h2[^>]*>.*?</h2>)%i', $form, $regs)) {
+		$sectionName = str_replace('<h2>', '', $regs[0]);
+		$sectionName = str_replace('</h2>', '', $sectionName);
+		$anchor = strtolower($sectionName);
+		$anchor = str_replace(' ', '-', $anchor);
+
+		return array(
+			'anchor' => $anchor,
+			'section-name' => $sectionName,
+			'form' => $form
+		);
+	}
+	return array(
+		'form' => $form
+	);
+}, $forms);
+
+$formsAndMore = array_merge($formsAndMore, $formsMap);
+
+// add bottom hardcoded forms from the template
+$formsAndMore[]= array( 'anchor' => 'ssl-root-certificates', 'section-name' => $l->t('SSL root certificates') );
+if($enableDecryptAll) {
+	$formsAndMore[]= array( 'anchor' => 'encryption', 'section-name' => $l->t('Encryption') );
 }
+
+$tmpl->assign('forms', $formsAndMore);
 $tmpl->printPage();
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index 86f2c28319b..b3a26acdb69 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -8,10 +8,15 @@
 ?>
 
 <div id="app-navigation">
-<!--	<?php foreach($_['forms'] as $form) {
-		print_unescaped($form);
-	};?>
--->
+	<ul>
+	<?php foreach($_['forms'] as $form) {
+		if (isset($form['anchor'])) {
+			$anchor = '#' . $form['anchor'];
+			$sectionName = $form['section-name'];
+			print_unescaped("<li><a href='$anchor'>$sectionName</a></li>");
+		}
+	}?>
+	</ul>
 </div>
 
 <div id="app-content">
@@ -159,10 +164,12 @@ if($_['passwordChangeSupported']) {
 </form>
 
 <?php foreach($_['forms'] as $form) {
-	print_unescaped($form);
+	if (isset($form['form'])) {?>
+	<div id="<?php isset($form['anchor']) ? print_unescaped($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+	<?php }
 };?>
 
-<div class="section">
+<div id="ssl-root-certificates" class="section">
 	<h2><?php p($l->t('SSL root certificates')); ?></h2>
 	<table id="sslCertificate" class="grid">
 		<thead>
@@ -201,7 +208,7 @@ if($_['passwordChangeSupported']) {
 </div>
 
 <?php if($_['enableDecryptAll']): ?>
-<div class="section">
+<div id="encryption" class="section">
 
 	<h2>
 		<?php p( $l->t( 'Encryption' ) ); ?>
-- 
GitLab


From 479424a4590ce99235fe5741828f90926bda4487 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 17 Oct 2014 10:35:24 +0200
Subject: [PATCH 138/616] Add some basic sanitization

Better to be safe than sorry ;)
---
 settings/templates/personal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index b3a26acdb69..cc04de5ec38 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -13,7 +13,7 @@
 		if (isset($form['anchor'])) {
 			$anchor = '#' . $form['anchor'];
 			$sectionName = $form['section-name'];
-			print_unescaped("<li><a href='$anchor'>$sectionName</a></li>");
+			print_unescaped(sprintf("<li><a href='%s'>%s</a></li>", OC_Util::sanitizeHTML($anchor), OC_Util::sanitizeHTML($sectionName)));
 		}
 	}?>
 	</ul>
@@ -165,7 +165,7 @@ if($_['passwordChangeSupported']) {
 
 <?php foreach($_['forms'] as $form) {
 	if (isset($form['form'])) {?>
-	<div id="<?php isset($form['anchor']) ? print_unescaped($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+	<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
 	<?php }
 };?>
 
-- 
GitLab


From af335a39f182631324cea90cdba85b200aa7fb2d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 17 Oct 2014 11:06:49 +0200
Subject: [PATCH 139/616] Add PHPDoc about sanitization of "insertIfNotExist"

Let's document this potential pitfall properly.
---
 lib/private/db/adapter.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 6742ccdbb45..972008776f6 100644
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -42,7 +42,7 @@ class Adapter {
 	/**
 	 * insert the @input values when they do not exist yet
 	 * @param string $table name
-	 * @param array $input key->value pairs
+	 * @param array $input key->value pair, key has to be sanitized properly
 	 * @return int count of inserted rows
 	 */
 	public function insertIfNotExist($table, $input) {
-- 
GitLab


From d37eee09a580cffdcc54b8f71b345622e221d528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 17 Oct 2014 11:46:22 +0200
Subject: [PATCH 140/616] fixing usage of EncryptionException

---
 apps/files_encryption/lib/crypt.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index c4fc29db03a..59b191097af 100755
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -24,6 +24,7 @@
  */
 
 namespace OCA\Encryption;
+use OCA\Encryption\Exceptions\EncryptionException;
 
 /**
  * Class for common cryptography functionality
@@ -289,9 +290,9 @@ class Crypt {
 			$padded = self::addPadding($catfile);
 
 			return $padded;
-		} catch (OCA\Encryption\Exceptions\EncryptionException $e) {
-			$message = 'Could not encrypt file content (code: ' . $e->getCode . '): ';
-			\OCP\Util::writeLog('files_encryption', $message . $e->getMessage, \OCP\Util::ERROR);
+		} catch (EncryptionException $e) {
+			$message = 'Could not encrypt file content (code: ' . $e->getCode() . '): ';
+			\OCP\Util::writeLog('files_encryption', $message . $e->getMessage(), \OCP\Util::ERROR);
 			return false;
 		}
 
-- 
GitLab


From 93b0f1a3bff98f3b9aa9f2e0ca2db4bc23ca3746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 6 Oct 2014 12:38:59 +0200
Subject: [PATCH 141/616] adding cssmin and jssmin(minify)

adding argument deleteSelf to rmdirr() - if false the directory itself will not be deleted only it's content

adding repair step to clean the asset cache after upgrade + coding style adjustments
---
 3rdparty                                     |   2 +-
 lib/private/helper.php                       |  17 ++-
 lib/private/repair.php                       |  26 ++--
 lib/private/template.php                     |  34 +++++-
 lib/private/template/templatefilelocator.php |   2 +
 lib/private/templatelayout.php               | 119 +++++++++----------
 lib/repair/assetcache.php                    |  30 +++++
 7 files changed, 148 insertions(+), 82 deletions(-)
 create mode 100644 lib/repair/assetcache.php

diff --git a/3rdparty b/3rdparty
index 5db359cb710..635aaf81d0d 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 5db359cb710c51747d3fb78b605f8b8cdcd1e605
+Subproject commit 635aaf81d0d97f000c9d4b90fc5a3240d05cf371
diff --git a/lib/private/helper.php b/lib/private/helper.php
index ea91cc57516..823e82ceeb1 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -402,9 +402,10 @@ class OC_Helper {
 	/**
 	 * Recursive deletion of folders
 	 * @param string $dir path to the folder
+	 * @param bool $deleteSelf if set to false only the content of the folder will be deleted
 	 * @return bool
 	 */
-	static function rmdirr($dir) {
+	static function rmdirr($dir, $deleteSelf = true) {
 		if (is_dir($dir)) {
 			$files = new RecursiveIteratorIterator(
 				new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS),
@@ -419,15 +420,19 @@ class OC_Helper {
 					unlink($fileInfo->getRealPath());
 				}
 			}
-			rmdir($dir);
+			if ($deleteSelf) {
+				rmdir($dir);
+			}
 		} elseif (file_exists($dir)) {
-			unlink($dir);
+			if ($deleteSelf) {
+				unlink($dir);
+			}
 		}
-		if (file_exists($dir)) {
-			return false;
-		} else {
+		if (!$deleteSelf) {
 			return true;
 		}
+
+		return !file_exists($dir);
 	}
 
 	/**
diff --git a/lib/private/repair.php b/lib/private/repair.php
index c7db8b2617d..081aeb32c66 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -10,6 +10,13 @@ namespace OC;
 
 use OC\Hooks\BasicEmitter;
 use OC\Hooks\Emitter;
+use OC\Repair\AssetCache;
+use OC\Repair\Collation;
+use OC\Repair\InnoDB;
+use OC\Repair\RepairConfig;
+use OC\Repair\RepairLegacyStorages;
+use OC\Repair\RepairMimeTypes;
+use OC\Repair\SearchLuceneTables;
 
 class Repair extends BasicEmitter {
 	/**
@@ -69,9 +76,10 @@ class Repair extends BasicEmitter {
 	 */
 	public static function getRepairSteps() {
 		return array(
-			new \OC\Repair\RepairMimeTypes(),
-			new \OC\Repair\RepairLegacyStorages(\OC::$server->getConfig(), \OC_DB::getConnection()),
-			new \OC\Repair\RepairConfig(),
+			new RepairMimeTypes(),
+			new RepairLegacyStorages(\OC::$server->getConfig(), \OC_DB::getConnection()),
+			new RepairConfig(),
+			new AssetCache()
 		);
 	}
 
@@ -83,14 +91,14 @@ class Repair extends BasicEmitter {
 	 */
 	public static function getBeforeUpgradeRepairSteps() {
 		$steps = array(
-			new \OC\Repair\InnoDB(),
-			new \OC\Repair\Collation(\OC::$server->getConfig(), \OC_DB::getConnection()),
-			new \OC\Repair\SearchLuceneTables()
+			new InnoDB(),
+			new Collation(\OC::$server->getConfig(), \OC_DB::getConnection()),
+			new SearchLuceneTables()
 		);
 
 		//There is no need to delete all previews on every single update
-		//only 7.0.0 thru 7.0.2 generated broken previews
-		$currentVersion = \OC_Config::getValue('version');
+		//only 7.0.0 through 7.0.2 generated broken previews
+		$currentVersion = \OC::$server->getConfig()->getSystemValue('version');
 		if (version_compare($currentVersion, '7.0.0.0', '>=') &&
 			version_compare($currentVersion, '7.0.2.2', '<=')) {
 			$steps[] = new \OC\Repair\Preview();
@@ -102,7 +110,7 @@ class Repair extends BasicEmitter {
 	/**
 	 * {@inheritDoc}
 	 *
-	 * Redeclared as public to allow invocation from within the closure above in php 5.3
+	 * Re-declared as public to allow invocation from within the closure above in php 5.3
 	 */
 	public function emit($scope, $method, $arguments = array()) {
 		parent::emit($scope, $method, $arguments);
diff --git a/lib/private/template.php b/lib/private/template.php
index fce26117ede..fe0cde53ff1 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -198,8 +198,8 @@ class OC_Template extends \OC\Template\Base {
 	 * Includes another template. use <?php echo $this->inc('template'); ?> to
 	 * do this.
 	 */
-	public function inc( $file, $additionalparams = null ) {
-		return $this->load($this->path.$file.'.php', $additionalparams);
+	public function inc( $file, $additionalParams = null ) {
+		return $this->load($this->path.$file.'.php', $additionalParams);
 	}
 
 	/**
@@ -277,4 +277,34 @@ class OC_Template extends \OC\Template\Base {
 		$content->printPage();
 		die();
 	}
+
+	/**
+	 * @return bool
+	 */
+	public static function isAssetPipelineEnabled() {
+		// asset management enabled?
+		$useAssetPipeline = \OC::$server->getConfig()->getSystemValue('asset-pipeline.enabled', false);
+		if (!$useAssetPipeline) {
+			return false;
+		}
+
+		// assets folder exists?
+		$assetDir = \OC::$SERVERROOT . '/assets';
+		if (!is_dir($assetDir)) {
+			if (!mkdir($assetDir)) {
+				\OCP\Util::writeLog('assets',
+					"Folder <$assetDir> does not exist and/or could not be generated.", \OCP\Util::ERROR);
+				return false;
+			}
+		}
+
+		// assets folder can be accessed?
+		if (!touch($assetDir."/.oc")) {
+			\OCP\Util::writeLog('assets',
+				"Folder <$assetDir> could not be accessed.", \OCP\Util::ERROR);
+			return false;
+		}
+		return $useAssetPipeline;
+	}
+
 }
diff --git a/lib/private/template/templatefilelocator.php b/lib/private/template/templatefilelocator.php
index 4676fceb37d..8e9f3bd8100 100644
--- a/lib/private/template/templatefilelocator.php
+++ b/lib/private/template/templatefilelocator.php
@@ -24,6 +24,8 @@ class TemplateFileLocator {
 
 	/**
 	 * @param string $template
+	 * @return string
+	 * @throws \Exception
 	 */
 	public function find( $template ) {
 		if ($template === '') {
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 9f996e19f81..10abff6267a 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -2,8 +2,10 @@
 use Assetic\Asset\AssetCollection;
 use Assetic\Asset\FileAsset;
 use Assetic\AssetWriter;
-use Assetic\Filter\CssRewriteFilter;
 use Assetic\Filter\CssImportFilter;
+use Assetic\Filter\CssMinFilter;
+use Assetic\Filter\CssRewriteFilter;
+use Assetic\Filter\JSMinFilter;
 
 /**
  * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
@@ -17,13 +19,22 @@ class OC_TemplateLayout extends OC_Template {
 	private static $versionHash = '';
 
 	/**
-	 * @param string $renderas
-	 * @param string $appid application id
+	 * @var \OCP\IConfig
+	 */
+	private $config;
+
+	/**
+	 * @param string $renderAs
+	 * @param string $appId application id
 	 */
-	public function __construct( $renderas, $appid = '' ) {
+	public function __construct( $renderAs, $appId = '' ) {
+
+		// yes - should be injected ....
+		$this->config = \OC::$server->getConfig();
+
 		// Decide which page we show
 
-		if( $renderas == 'user' ) {
+		if( $renderAs == 'user' ) {
 			parent::__construct( 'core', 'layout.user' );
 			if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) {
 				$this->assign('bodyid', 'body-settings');
@@ -32,9 +43,12 @@ class OC_TemplateLayout extends OC_Template {
 			}
 
 			// Update notification
-			if(OC_Config::getValue('updatechecker', true) === true) {
-				$data=OC_Updater::check();
-				if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array() && OC_User::isAdminUser(OC_User::getUser())) {
+			if($this->config->getSystemValue('updatechecker', true) === true &&
+				OC_User::isAdminUser(OC_User::getUser())) {
+				$updater = new \OC\Updater();
+				$data = $updater->check('http://apps.owncloud.com/updater.php');
+
+				if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {
 					$this->assign('updateAvailable', true);
 					$this->assign('updateVersion', $data['versionstring']);
 					$this->assign('updateLink', $data['web']);
@@ -47,7 +61,7 @@ class OC_TemplateLayout extends OC_Template {
 
 			// Add navigation entry
 			$this->assign( 'application', '', false );
-			$this->assign( 'appid', $appid );
+			$this->assign( 'appid', $appId );
 			$navigation = OC_App::getNavigation();
 			$this->assign( 'navigation', $navigation);
 			$this->assign( 'settingsnavigation', OC_App::getSettingsNavigation());
@@ -57,15 +71,15 @@ class OC_TemplateLayout extends OC_Template {
 					break;
 				}
 			}
-			$user_displayname = OC_User::getDisplayName();
-			$this->assign( 'user_displayname', $user_displayname );
+			$userDisplayName = OC_User::getDisplayName();
+			$this->assign( 'user_displayname', $userDisplayName );
 			$this->assign( 'user_uid', OC_User::getUser() );
 			$this->assign( 'appsmanagement_active', strpos(OC_Request::requestUri(), OC_Helper::linkToRoute('settings_apps')) === 0 );
-			$this->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
-		} else if ($renderas == 'error') {
+			$this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true));
+		} else if ($renderAs == 'error') {
 			parent::__construct('core', 'layout.guest', '', false);
 			$this->assign('bodyid', 'body-login');
-		} else if ($renderas == 'guest') {
+		} else if ($renderAs == 'guest') {
 			parent::__construct('core', 'layout.guest');
 			$this->assign('bodyid', 'body-login');
 		} else {
@@ -76,27 +90,27 @@ class OC_TemplateLayout extends OC_Template {
 			self::$versionHash = md5(implode(',', OC_App::getAppVersions()));
 		}
 		
-		$useAssetPipeline = $this->isAssetPipelineEnabled();
+		$useAssetPipeline = self::isAssetPipelineEnabled();
 		if ($useAssetPipeline) {
 			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
 			$this->generateAssets();
 		} else {
 			// Add the js files
-			$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
+			$jsFiles = self::findJavascriptFiles(OC_Util::$scripts);
 			$this->assign('jsfiles', array(), false);
-			if (OC_Config::getValue('installed', false) && $renderas!='error') {
+			if ($this->config->getSystemValue('installed', false) && $renderAs != 'error') {
 				$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
 			}
-			foreach($jsfiles as $info) {
+			foreach($jsFiles as $info) {
 				$web = $info[1];
 				$file = $info[2];
 				$this->append( 'jsfiles', $web.'/'.$file . '?v=' . self::$versionHash);
 			}
 
 			// Add the css files
-			$cssfiles = self::findStylesheetFiles(OC_Util::$styles);
+			$cssFiles = self::findStylesheetFiles(OC_Util::$styles);
 			$this->assign('cssfiles', array());
-			foreach($cssfiles as $info) {
+			foreach($cssFiles as $info) {
 				$web = $info[1];
 				$file = $info[2];
 
@@ -113,10 +127,10 @@ class OC_TemplateLayout extends OC_Template {
 		// Read the selected theme from the config file
 		$theme = OC_Util::getTheme();
 
-		// Read the detected formfactor and use the right file name.
-		$fext = self::getFormFactorExtension();
+		// Read the detected form factor and use the right file name.
+		$formFactorExt = self::getFormFactorExtension();
 
-		$locator = new \OC\Template\CSSResourceLocator( $theme, $fext,
+		$locator = new \OC\Template\CSSResourceLocator( $theme, $formFactorExt,
 			array( OC::$SERVERROOT => OC::$WEBROOT ),
 			array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT ));
 		$locator->find($styles);
@@ -131,18 +145,17 @@ class OC_TemplateLayout extends OC_Template {
 		// Read the selected theme from the config file
 		$theme = OC_Util::getTheme();
 
-		// Read the detected formfactor and use the right file name.
-		$fext = self::getFormFactorExtension();
+		// Read the detected form factor and use the right file name.
+		$formFactorExt = self::getFormFactorExtension();
 
-		$locator = new \OC\Template\JSResourceLocator( $theme, $fext,
+		$locator = new \OC\Template\JSResourceLocator( $theme, $formFactorExt,
 			array( OC::$SERVERROOT => OC::$WEBROOT ),
 			array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT ));
 		$locator->find($scripts);
 		return $locator->getResources();
 	}
 
-	public function generateAssets()
-	{
+	public function generateAssets() {
 		$jsFiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$jsHash = self::hashScriptNames($jsFiles);
 
@@ -150,7 +163,13 @@ class OC_TemplateLayout extends OC_Template {
 			$jsFiles = array_map(function ($item) {
 				$root = $item[0];
 				$file = $item[2];
-				return new FileAsset($root . '/' . $file, array(), $root, $file);
+				// no need to minifiy minified files
+				if (substr($file, -strlen('.min.js')) === '.min.js') {
+					return new FileAsset($root . '/' . $file, array(), $root, $file);
+				}
+				return new FileAsset($root . '/' . $file, array(
+					new JSMinFilter()
+				), $root, $file);
 			}, $jsFiles);
 			$jsCollection = new AssetCollection($jsFiles);
 			$jsCollection->setTargetPath("assets/$jsHash.js");
@@ -170,12 +189,13 @@ class OC_TemplateLayout extends OC_Template {
 				$sourceRoot =  \OC::$SERVERROOT;
 				$sourcePath = substr($assetPath, strlen(\OC::$SERVERROOT));
 				return new FileAsset(
-					$assetPath, 
+					$assetPath,
 					array(
-						new CssRewriteFilter(), 
+						new CssRewriteFilter(),
+						new CssMinFilter(),
 						new CssImportFilter()
 					),
-					$sourceRoot, 
+					$sourceRoot,
 					$sourcePath
 				);
 			}, $cssFiles);
@@ -194,8 +214,8 @@ class OC_TemplateLayout extends OC_Template {
 	 * @param array $files
 	 * @return string
 	 */
-	private static function hashScriptNames($files)
-	{
+	private static function hashScriptNames($files) {
+
 		$files = array_map(function ($item) {
 			$root = $item[0];
 			$file = $item[2];
@@ -204,36 +224,7 @@ class OC_TemplateLayout extends OC_Template {
 
 		sort($files);
 		// include the apps' versions hash to invalidate the cached assets
-		$files[]= self::$versionHash;
+		$files[] = self::$versionHash;
 		return hash('md5', implode('', $files));
 	}
-
-	/**
-	 * @return bool
-	 */
-	private function isAssetPipelineEnabled() {
-		// asset management enabled?
-		$useAssetPipeline = OC_Config::getValue('asset-pipeline.enabled', false);
-		if (!$useAssetPipeline) {
-			return false;
-		}
-
-		// assets folder exists?
-		$assetDir = \OC::$SERVERROOT . '/assets';
-		if (!is_dir($assetDir)) {
-			if (!mkdir($assetDir)) {
-				\OCP\Util::writeLog('assets',
-					"Folder <$assetDir> does not exist and/or could not be generated.", \OCP\Util::ERROR);
-				return false;
-			}
-		}
-
-		// assets folder can be accessed?
-		if (!touch($assetDir."/.oc")) {
-			\OCP\Util::writeLog('assets',
-				"Folder <$assetDir> could not be accessed.", \OCP\Util::ERROR);
-			return false;
-		}
-		return $useAssetPipeline;
-	}
 }
diff --git a/lib/repair/assetcache.php b/lib/repair/assetcache.php
new file mode 100644
index 00000000000..d7677a10d11
--- /dev/null
+++ b/lib/repair/assetcache.php
@@ -0,0 +1,30 @@
+<?php
+/**
+ * Copyright (c) 2014 Thomas Müller <deepdiver@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Repair;
+
+use Doctrine\DBAL\Platforms\MySqlPlatform;
+use OC\Hooks\BasicEmitter;
+
+class AssetCache extends BasicEmitter implements \OC\RepairStep {
+
+	public function getName() {
+		return 'Clear asset cache after upgrade';
+	}
+
+	public function run() {
+		if (!\OC_Template::isAssetPipelineEnabled()) {
+			$this->emit('\OC\Repair', 'info', array('Asset pipeline disabled -> nothing to do'));
+			return;
+		}
+		$assetDir = \OC::$SERVERROOT . '/assets';
+		\OC_Helper::rmdirr($assetDir, false);
+		$this->emit('\OC\Repair', 'info', array('Asset cache cleared.'));
+	}
+}
+
-- 
GitLab


From 27c22f071d3f9a3dd6aa99e4e7cddb8e725a1ddf Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 17 Oct 2014 12:28:27 +0200
Subject: [PATCH 142/616] Encapsulate require_once to avoid name space bleedind

The script required by require_once might use variable names like $app
which will conflict with the code that follows.

This fix encapsulates require_once into its own function to avoid such
issues.
---
 lib/private/app.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index faaadef3857..a97db7b5e53 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -92,7 +92,7 @@ class OC_App {
 			if ($checkUpgrade and self::shouldUpgrade($app)) {
 				throw new \OC\NeedsUpdateException();
 			}
-			require_once $app . '/appinfo/app.php';
+			self::requireAppFile($app);
 			if (self::isType($app, array('authentication'))) {
 				// since authentication apps affect the "is app enabled for group" check,
 				// the enabled apps cache needs to be cleared to make sure that the
@@ -103,6 +103,16 @@ class OC_App {
 		}
 	}
 
+	/**
+	 * Load app.php from the given app
+	 *
+	 * @param string $app app name
+	 */
+	private static function requireAppFile($app) {
+		// encapsulated here to avoid variable scope conflicts
+		require_once $app . '/appinfo/app.php';
+	}
+
 	/**
 	 * check if an app is of a specific type
 	 *
-- 
GitLab


From 9aa809debf44a5b1f125fe3f32162235230eaae5 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 17 Oct 2014 15:07:14 +0200
Subject: [PATCH 143/616] update 3rdparty to match master - just adds the merge
 commit

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 635aaf81d0d..f6d7a519e4d 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 635aaf81d0d97f000c9d4b90fc5a3240d05cf371
+Subproject commit f6d7a519e4dca5189963abb15e5c9858b03bf98d
-- 
GitLab


From 446cebf492afd2bedebfca38b8681eb0ef2433a2 Mon Sep 17 00:00:00 2001
From: Craig Morrissey <craig@owncloud.com>
Date: Fri, 17 Oct 2014 11:55:32 -0400
Subject: [PATCH 144/616] adjust autocomplete behavior for sharing menu

---
 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 1de990f379b..d9ae0168129 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -444,7 +444,7 @@ OC.Share={
 					}
 				});
 			}
-			$('#shareWith').autocomplete({minLength: 1, source: function(search, response) {
+			$('#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, itemShares: OC.Share.itemShares }, function(result) {
-- 
GitLab


From 5170dc3ae6c09f9c0a261e976caae21f61a17c23 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 18 Sep 2014 17:12:35 +0200
Subject: [PATCH 145/616] fix retrievel of group members and cache group
 members

fix changed variable name
---
 apps/user_ldap/group_ldap.php | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 48d097c3600..8a6084b6c8f 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -29,6 +29,11 @@ use OCA\user_ldap\lib\BackendUtility;
 class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	protected $enabled = false;
 
+	/**
+	 * @var string[] $cachedGroupMembers array of users with gid as key
+	 */
+	protected $cachedGroupMembers = array();
+
 	public function __construct(Access $access) {
 		parent::__construct($access);
 		$filter = $this->access->connection->ldapGroupFilter;
@@ -56,6 +61,21 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 
 		$userDN = $this->access->username2dn($uid);
+
+		if(isset($this->cachedGroupMembers[$gid])) {
+			$isInGroup = in_array($userDN, $this->cachedGroupMembers[$gid]);
+			return $isInGroup;
+		}
+
+		$cacheKeyMembers = 'inGroup-members:'.$gid;
+		if($this->access->connection->isCached($cacheKeyMembers)) {
+			$members = $this->access->connection->getFromCache($cacheKeyMembers);
+			$this->cachedGroupMembers[$gid] = $members;
+			$isInGroup = in_array($userDN, $members);
+			$this->access->connection->writeToCache($cacheKey, $isInGroup);
+			return $isInGroup;
+		}
+
 		$groupDN = $this->access->groupname2dn($gid);
 		// just in case
 		if(!$groupDN || !$userDN) {
@@ -70,8 +90,9 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 
 		//usually, LDAP attributes are said to be case insensitive. But there are exceptions of course.
-		$members = array_keys($this->_groupMembers($groupDN));
-		if(!$members) {
+		$members = $this->_groupMembers($groupDN);
+		$members = array_keys($members); // uids are returned as keys
+		if(!is_array($members) || count($members) === 0) {
 			$this->access->connection->writeToCache($cacheKey, false);
 			return false;
 		}
@@ -93,6 +114,8 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 
 		$isInGroup = in_array($userDN, $members);
 		$this->access->connection->writeToCache($cacheKey, $isInGroup);
+		$this->access->connection->writeToCache($cacheKeyMembers, $members);
+		$this->cachedGroupMembers[$gid] = $members;
 
 		return $isInGroup;
 	}
-- 
GitLab


From a7a532f58a8476cb83e8d11f527e1f19d82ef135 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 10 Oct 2014 18:58:39 +0200
Subject: [PATCH 146/616] with several backends, more than limit can be
 returned

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

diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 816e7b427f5..33a1904dddf 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -237,7 +237,7 @@ class Manager extends PublicEmitter implements IGroupManager {
 					}
 				}
 				$searchOffset += $searchLimit;
-			} while(count($groupUsers) < $searchLimit+$offset && count($filteredUsers) === $searchLimit);
+			} while(count($groupUsers) < $searchLimit+$offset && count($filteredUsers) >= $searchLimit);
 
 			if($limit === -1) {
 				$groupUsers = array_slice($groupUsers, $offset);
-- 
GitLab


From 4e8c7570d40fd8862b3b45b08d21bc1967779f01 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 10 Oct 2014 21:29:11 +0200
Subject: [PATCH 147/616] make performance less bad. Still far from good, but
 at least it works

---
 apps/user_ldap/group_ldap.php | 36 ++++++++++++++++++++++++++++-------
 apps/user_ldap/lib/access.php |  2 +-
 lib/private/group/manager.php |  5 ++---
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 8a6084b6c8f..e8d268d3df2 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -34,6 +34,11 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 	 */
 	protected $cachedGroupMembers = array();
 
+	/**
+	 * @var string[] $cachedGroupsByMember array of groups with uid as key
+	 */
+	protected $cachedGroupsByMember = array();
+
 	public function __construct(Access $access) {
 		parent::__construct($access);
 		$filter = $this->access->connection->ldapGroupFilter;
@@ -98,16 +103,28 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 		}
 
 		//extra work if we don't get back user DNs
-		//TODO: this can be done with one LDAP query
 		if(strtolower($this->access->connection->ldapGroupMemberAssocAttr) === 'memberuid') {
 			$dns = array();
+			$filterParts = array();
+			$bytes = 0;
 			foreach($members as $mid) {
 				$filter = str_replace('%uid', $mid, $this->access->connection->ldapLoginFilter);
-				$ldap_users = $this->access->fetchListOfUsers($filter, 'dn');
-				if(count($ldap_users) < 1) {
-					continue;
+				$filterParts[] = $filter;
+				$bytes += strlen($filter);
+				if($bytes >= 9000000) {
+					// AD has a default input buffer of 10 MB, we do not want
+					// to take even the chance to exceed it
+					$filter = $this->access->combineFilterWithOr($filterParts);
+					$bytes = 0;
+					$filterParts = array();
+					$users = $this->access->fetchListOfUsers($filter, 'dn', count($filterParts));
+					$dns = array_merge($dns, $users);
 				}
-				$dns[] = $ldap_users[0];
+			}
+			if(count($filterParts) > 0) {
+				$filter = $this->access->combineFilterWithOr($filterParts);
+				$users = $this->access->fetchListOfUsers($filter, 'dn', count($filterParts));
+				$dns = array_merge($dns, $users);
 			}
 			$members = $dns;
 		}
@@ -316,8 +333,13 @@ class GROUP_LDAP extends BackendUtility implements \OCP\GroupInterface {
 			$uid = $userDN;
 		}
 
-		$groups = array_values($this->getGroupsByMember($uid));
-		$groups = $this->access->ownCloudGroupNames($groups);
+		if(isset($this->cachedGroupsByMember[$uid])) {
+			$groups = $this->cachedGroupsByMember[$uid];
+		} else {
+			$groups = array_values($this->getGroupsByMember($uid));
+			$groups = $this->access->ownCloudGroupNames($groups);
+			$this->cachedGroupsByMember[$uid] = $groups;
+		}
 
 		$primaryGroup = $this->getUserPrimaryGroup($userDN);
 		if($primaryGroup !== false) {
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 159b0d73000..44162e32d47 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1359,7 +1359,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 	 * @param string[] $bases array containing the allowed base DN or DNs
 	 * @return bool
 	 */
-	private function isDNPartOfBase($dn, $bases) {
+	public function isDNPartOfBase($dn, $bases) {
 		$belongsToBase = false;
 		$bases = $this->sanitizeDN($bases);
 
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 33a1904dddf..417be79ab30 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -223,10 +223,9 @@ class Manager extends PublicEmitter implements IGroupManager {
 		if(!empty($search)) {
 			// only user backends have the capability to do a complex search for users
 			$searchOffset = 0;
+			$searchLimit = $limit * 100;
 			if($limit === -1) {
-				$searchLimit = $group->count('');
-			} else {
-				$searchLimit = $limit * 2;
+				$searchLimit = 500;
 			}
 
 			do {
-- 
GitLab


From e16122f2a1da89b95101808e9f32cea8f267a2d4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 16 Oct 2014 16:08:59 +0200
Subject: [PATCH 148/616] add one simple cache test

---
 apps/user_ldap/tests/group_ldap.php | 33 +++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index c4aed25a1cc..d1262e4f5b8 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -59,10 +59,7 @@ class Test_Group_Ldap extends \PHPUnit_Framework_TestCase {
 	private function enableGroups($access) {
 		$access->connection->expects($this->any())
 			   ->method('__get')
-			   ->will($this->returnCallback(function($name) {
-// 					if($name === 'ldapLoginFilter') {
-// 						return '%uid';
-// 					}
+			   ->will($this->returnCallback(function() {
 					return 1;
 			   }));
 	}
@@ -269,4 +266,32 @@ class Test_Group_Ldap extends \PHPUnit_Framework_TestCase {
 		$this->assertSame(false, $gid);
 	}
 
+	/**
+	 * tests whether Group Backend behaves correctly when cache with uid and gid
+	 * is hit
+	 */
+	public function testInGroupHitsUidGidCache() {
+		$access = $this->getAccessMock();
+		$this->enableGroups($access);
+
+		$uid = 'someUser';
+		$gid = 'someGroup';
+		$cacheKey = 'inGroup'.$uid.':'.$gid;
+		$access->connection->expects($this->once())
+			->method('isCached')
+			->with($cacheKey)
+			->will($this->returnValue(true));
+
+		$access->connection->expects($this->once())
+			->method('getFromCache')
+			->with($cacheKey)
+			->will($this->returnValue(true));
+
+		$access->expects($this->never())
+			->method('username2dn');
+
+		$groupBackend = new GroupLDAP($access);
+		$groupBackend->inGroup($uid, $gid);
+	}
+
 }
-- 
GitLab


From 7ff7a49f3d4913b3165ca7148e089eae8574b27b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 17 Oct 2014 20:53:09 +0200
Subject: [PATCH 149/616] adjust group manager tests

---
 tests/lib/group/manager.php | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php
index e4b3a522767..8fd19513c0a 100644
--- a/tests/lib/group/manager.php
+++ b/tests/lib/group/manager.php
@@ -369,15 +369,6 @@ class Manager extends \PHPUnit_Framework_TestCase {
                                 }
                         }));
 
-		$backend->expects($this->once())
-			->method('implementsActions')
-			->will($this->returnValue(true));
-
-		$backend->expects($this->once())
-			->method('countUsersInGroup')
-			->with('testgroup', '')
-			->will($this->returnValue(2));
-
 		/**
 		 * @var \OC\User\Manager $userManager
 		 */
@@ -496,9 +487,9 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->with('testgroup')
 			->will($this->returnValue(true));
 
-                $backend->expects($this->any())
-			->method('InGroup')
-			->will($this->returnCallback(function($uid, $gid) {
+        $backend->expects($this->any())
+			->method('inGroup')
+			->will($this->returnCallback(function($uid) {
                                 switch($uid) {
                                         case 'user1' : return false;
                                         case 'user2' : return true;
@@ -521,9 +512,12 @@ class Manager extends \PHPUnit_Framework_TestCase {
 			->with('user3')
 			->will($this->returnCallback(function($search, $limit, $offset) use ($userBackend) {
                                 switch($offset) {
-                                        case 0 : return array('user3' => new User('user3', $userBackend),
-                                                        'user33' => new User('user33', $userBackend));
-                                        case 2 : return array('user333' => new User('user333', $userBackend));
+                                        case 0 :
+											return array(
+												'user3' => new User('user3', $userBackend),
+                                                'user33' => new User('user33', $userBackend),
+												'user333' => new User('user333', $userBackend)
+											);
                                 }
                         }));
 
-- 
GitLab


From 68dd1edbfedd238e39234ff6304eeaba90217155 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 18 Oct 2014 01:55:30 -0400
Subject: [PATCH 150/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/es.php    |  6 ++++++
 apps/files_encryption/l10n/et_EE.php |  6 ++++++
 apps/user_ldap/l10n/cs_CZ.php        |  4 ++++
 apps/user_ldap/l10n/de.php           |  4 ++++
 apps/user_ldap/l10n/de_DE.php        |  4 ++++
 apps/user_ldap/l10n/es.php           |  4 ++++
 apps/user_ldap/l10n/et_EE.php        |  4 ++++
 apps/user_ldap/l10n/fi_FI.php        |  7 ++++++-
 apps/user_ldap/l10n/it.php           |  4 ++++
 apps/user_ldap/l10n/nl.php           |  4 ++++
 apps/user_ldap/l10n/pt_BR.php        |  4 ++++
 apps/user_ldap/l10n/tr.php           |  4 ++++
 core/l10n/cs_CZ.php                  |  1 +
 core/l10n/de.php                     |  1 +
 core/l10n/de_DE.php                  |  1 +
 core/l10n/es.php                     |  1 +
 core/l10n/et_EE.php                  |  5 +++++
 core/l10n/fi_FI.php                  |  2 ++
 core/l10n/it.php                     |  1 +
 core/l10n/nl.php                     |  1 +
 core/l10n/pt_BR.php                  |  1 +
 core/l10n/sl.php                     |  3 +++
 core/l10n/tr.php                     |  1 +
 l10n/templates/core.pot              | 20 ++++++++++----------
 l10n/templates/files.pot             |  2 +-
 l10n/templates/files_encryption.pot  |  2 +-
 l10n/templates/files_external.pot    |  8 ++++----
 l10n/templates/files_sharing.pot     |  2 +-
 l10n/templates/files_trashbin.pot    |  2 +-
 l10n/templates/files_versions.pot    |  2 +-
 l10n/templates/lib.pot               | 18 +++++++++---------
 l10n/templates/private.pot           | 18 +++++++++---------
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/templates/user_webdavauth.pot   |  2 +-
 lib/l10n/de.php                      |  1 +
 lib/l10n/de_DE.php                   |  1 +
 settings/l10n/ar.php                 |  1 +
 settings/l10n/ast.php                |  1 +
 settings/l10n/az.php                 |  1 +
 settings/l10n/bg_BG.php              |  1 +
 settings/l10n/bn_BD.php              |  1 +
 settings/l10n/ca.php                 |  1 +
 settings/l10n/cs_CZ.php              |  1 +
 settings/l10n/da.php                 |  1 +
 settings/l10n/de.php                 |  8 ++++++++
 settings/l10n/de_DE.php              |  8 ++++++++
 settings/l10n/el.php                 |  1 +
 settings/l10n/en_GB.php              |  1 +
 settings/l10n/es.php                 |  2 ++
 settings/l10n/es_AR.php              |  1 +
 settings/l10n/et_EE.php              |  1 +
 settings/l10n/eu.php                 |  1 +
 settings/l10n/fi_FI.php              |  1 +
 settings/l10n/fr.php                 |  1 +
 settings/l10n/gl.php                 |  1 +
 settings/l10n/hr.php                 |  1 +
 settings/l10n/hu_HU.php              |  1 +
 settings/l10n/id.php                 |  1 +
 settings/l10n/it.php                 |  1 +
 settings/l10n/ja.php                 |  1 +
 settings/l10n/km.php                 |  1 +
 settings/l10n/nb_NO.php              |  1 +
 settings/l10n/nl.php                 |  1 +
 settings/l10n/pl.php                 |  1 +
 settings/l10n/pt_BR.php              |  1 +
 settings/l10n/pt_PT.php              |  1 +
 settings/l10n/ro.php                 |  1 +
 settings/l10n/ru.php                 |  1 +
 settings/l10n/sk_SK.php              |  1 +
 settings/l10n/sl.php                 |  1 +
 settings/l10n/sv.php                 |  1 +
 settings/l10n/tr.php                 |  1 +
 settings/l10n/zh_CN.php              |  1 +
 settings/l10n/zh_TW.php              |  1 +
 75 files changed, 167 insertions(+), 41 deletions(-)

diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 164db17f4a7..d26aa449b3b 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Error desconocido",
+"Missing recovery key password" => "Falta contraseña de recuperacion.",
+"Please repeat the recovery key password" => "Por favor repita la contraseña de recuperacion",
+"Repeated recovery key password does not match the provided recovery key password" => "la contraseña de recuperacion repetida no es igual a la contraseña de recuperacion",
 "Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
 "Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
 "Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
+"Please provide the old recovery password" => "Por favor ingrese su antigua contraseña de recuperacion",
+"Please provide a new recovery password" => "Por favor ingrese una nueva contraseña de recuperacion",
+"Please repeat the new recovery password" => "Por favor repita su nueva contraseña de recuperacion",
 "Password successfully changed." => "Su contraseña ha sido cambiada",
 "Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
 "Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
index 0d786b6ce7d..7362c61bc71 100644
--- a/apps/files_encryption/l10n/et_EE.php
+++ b/apps/files_encryption/l10n/et_EE.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Tundmatu viga",
+"Missing recovery key password" => "Muuda taastevõtme parool",
+"Please repeat the recovery key password" => "Palun korda uut taastevõtme parooli",
+"Repeated recovery key password does not match the provided recovery key password" => "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
 "Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
 "Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
 "Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
+"Please provide the old recovery password" => "Palun sisesta vana taastevõtme parool",
+"Please provide a new recovery password" => "Palun sisesta uus taastevõtme parool",
+"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.",
 "Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.",
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index e3b76799fb1..03e3ac578c3 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Edituj filtr přímo",
 "Raw LDAP filter" => "Původní filtr LDAP",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
+"Test Filter" => "Otestovat filtr",
 "groups found" => "nalezené skupiny",
 "Users login with this attribute:" => "Uživatelé se přihlašují s tímto atributem:",
 "LDAP Username:" => "LDAP uživatelské jméno:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
 "One Base DN per line" => "Jedna základní DN na řádku",
 "You can specify Base DN for users and groups in the Advanced tab" => "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.",
+"Manually enter LDAP filters (recommended for large directories)" => "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)",
 "Limit %s access to users meeting these criteria:" => "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
 "users found" => "nalezení uživatelé",
+"Saving" => "Ukládá se",
 "Back" => "Zpět",
 "Continue" => "Pokračovat",
 "Expert" => "Expertní",
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index fec908a8d48..e2915b85425 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Original-Filter stattdessen bearbeiten",
 "Raw LDAP filter" => "Original LDAP-Filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
+"Test Filter" => "Test-Filter",
 "groups found" => "Gruppen gefunden",
 "Users login with this attribute:" => "Nutzeranmeldung mit diesem Merkmal:",
 "LDAP Username:" => "LDAP-Benutzername:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für 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" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.",
+"Manually enter LDAP filters (recommended for large directories)" => "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)",
 "Limit %s access to users meeting these criteria:" => "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
 "users found" => "Benutzer gefunden",
+"Saving" => "Speichern",
 "Back" => "Zurück",
 "Continue" => "Fortsetzen",
 "Expert" => "Experte",
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
index 118f482014f..ed1755d54a0 100644
--- a/apps/user_ldap/l10n/de_DE.php
+++ b/apps/user_ldap/l10n/de_DE.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Original-Filter stattdessen bearbeiten",
 "Raw LDAP filter" => "Original LDAP-Filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
+"Test Filter" => "Test-Filter",
 "groups found" => "Gruppen gefunden",
 "Users login with this attribute:" => "Nutzeranmeldung mit diesem Merkmal:",
 "LDAP Username:" => "LDAP-Benutzername:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "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",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.",
+"Manually enter LDAP filters (recommended for large directories)" => "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)",
 "Limit %s access to users meeting these criteria:" => "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
 "users found" => "Benutzer gefunden",
+"Saving" => "Speichern",
 "Back" => "Zurück",
 "Continue" => "Fortsetzen",
 "Expert" => "Experte",
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index f58efd3a4d9..f85c1a67283 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Editar el filtro en bruto en su lugar",
 "Raw LDAP filter" => "Filtro LDAP en bruto",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "El filtro especifica que grupos LDAP tendrán acceso a %s.",
+"Test Filter" => "Filtro de prueba",
 "groups found" => "grupos encontrados",
 "Users login with this attribute:" => "Los usuarios inician sesión con este atributo:",
 "LDAP Username:" => "Nombre de usuario LDAP:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
 "One Base DN per line" => "Un DN Base por línea",
 "You can specify Base DN for users and groups in the Advanced tab" => "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Evita peticiones automaticas al LDAP. Mejor para grandes configuraciones, pero requiere algun conocimiento de LDAP",
+"Manually enter LDAP filters (recommended for large directories)" => "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
 "Limit %s access to users meeting these criteria:" => "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
 "users found" => "usuarios encontrados",
+"Saving" => "Guardando",
 "Back" => "Atrás",
 "Continue" => "Continuar",
 "Expert" => "Experto",
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index 394bcd19289..feeef699fac 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Selle asemel muuda filtrit",
 "Raw LDAP filter" => "LDAP filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
+"Test Filter" => "Testi filtrit",
 "groups found" => "gruppi leitud",
 "Users login with this attribute:" => "Logimiseks kasutatkse atribuuti: ",
 "LDAP Username:" => "LDAP kasutajanimi:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
 "One Base DN per line" => "Üks baas-DN rea kohta",
 "You can specify Base DN for users and groups in the Advanced tab" => "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.",
+"Manually enter LDAP filters (recommended for large directories)" => "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
 "Limit %s access to users meeting these criteria:" => "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
 "users found" => "kasutajat leitud",
+"Saving" => "Salvestamine",
 "Back" => "Tagasi",
 "Continue" => "Jätka",
 "Expert" => "Ekspert",
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 2fedc2a9460..8768c6e989f 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -45,6 +45,7 @@ $TRANSLATIONS = array(
 "Advanced" => "Lisäasetukset",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.",
 "Connection Settings" => "Yhteysasetukset",
+"Backup (Replica) Host" => "Varmuuskopioinnin (replikointi) palvelin",
 "Backup (Replica) Port" => "Varmuuskopioinnin (replikoinnin) portti",
 "Disable Main Server" => "Poista pääpalvelin käytöstä",
 "Only connect to the replica server." => "Yhdistä vain replikointipalvelimeen.",
@@ -57,8 +58,12 @@ $TRANSLATIONS = array(
 "Group Display Name Field" => "Ryhmän \"näytettävä nimi\"-kenttä",
 "Base Group Tree" => "Ryhmien juuri",
 "Group-Member association" => "Ryhmän ja jäsenen assosiaatio (yhteys)",
+"Quota Field" => "Kiintiökenttä",
+"Quota Default" => "Oletuskiintiö",
 "in bytes" => "tavuissa",
 "Email Field" => "Sähköpostikenttä",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
+"User Home Folder Naming Rule" => "Käyttäjän kotihakemiston nimeämissääntö",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.",
+"Internal Username" => "Sisäinen käyttäjänimi"
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index ef88ea765d8..34e93fd778e 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Modifica invece il filtro grezzo",
 "Raw LDAP filter" => "Filtro LDAP grezzo",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
+"Test Filter" => "Prova filtro",
 "groups found" => "gruppi trovati",
 "Users login with this attribute:" => "Utenti con questo attributo:",
 "LDAP Username:" => "Nome utente LDAP:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
 "One Base DN per line" => "Un DN base per riga",
 "You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.",
+"Manually enter LDAP filters (recommended for large directories)" => "Digita manualmente i filtri LDAP (consigliato per directory grandi)",
 "Limit %s access to users meeting these criteria:" => "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
 "users found" => "utenti trovati",
+"Saving" => "Salvataggio",
 "Back" => "Indietro",
 "Continue" => "Continua",
 "Expert" => "Esperto",
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
index 5fbdfb39c50..ccf109d4d48 100644
--- a/apps/user_ldap/l10n/nl.php
+++ b/apps/user_ldap/l10n/nl.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Bewerk raw filter",
 "Raw LDAP filter" => "Raw 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.",
+"Test Filter" => "Testfilter",
 "groups found" => "groepen gevonden",
 "Users login with this attribute:" => "Gebruikers loggen in met dit attribuut:",
 "LDAP Username:" => "LDAP Username:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
 "One Base DN per line" => "Een Base DN per regel",
 "You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Voorkom automatische LDAP opvragingen. Weliswaar beter voor grote installaties, maar vergt LDAP kennis.",
+"Manually enter LDAP filters (recommended for large directories)" => "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)",
 "Limit %s access to users meeting these criteria:" => "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
 "users found" => "gebruikers gevonden",
+"Saving" => "Opslaan",
 "Back" => "Terug",
 "Continue" => "Verder",
 "Expert" => "Expert",
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
index 6e5a1663e2d..870cc7ebca9 100644
--- a/apps/user_ldap/l10n/pt_BR.php
+++ b/apps/user_ldap/l10n/pt_BR.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Editar filtro raw ao invéz",
 "Raw LDAP filter" => "Filtro LDAP Raw",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
+"Test Filter" => "Filtro Teste",
 "groups found" => "grupos encontrados",
 "Users login with this attribute:" => "Usuários entrar com este atributo:",
 "LDAP Username:" => "Usuário LDAP:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.",
 "One Base DN per line" => "Uma base DN por linha",
 "You can specify Base DN for users and groups in the Advanced tab" => "Você pode especificar DN Base para usuários e grupos na guia Avançada",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Evita pedidos LDAP automáticos. Melhor para configurações maiores, mas requer algum conhecimento LDAP.",
+"Manually enter LDAP filters (recommended for large directories)" => "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)",
 "Limit %s access to users meeting these criteria:" => "Limitar o acesso %s para usuários que satisfazem esses critérios:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
 "users found" => "usuários encontrados",
+"Saving" => "Salvando",
 "Back" => "Voltar",
 "Continue" => "Continuar",
 "Expert" => "Especialista",
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
index 4a10b141dbc..3527870032b 100644
--- a/apps/user_ldap/l10n/tr.php
+++ b/apps/user_ldap/l10n/tr.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Bunun yerine ham filtreyi düzenle",
 "Raw LDAP filter" => "Ham LDAP filtresi",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
+"Test Filter" => "Filtreyi Test Et",
 "groups found" => "grup bulundu",
 "Users login with this attribute:" => "Kullanıcılar şu öznitelikle oturum açarlar:",
 "LDAP Username:" => "LDAP Kullanıcı Adı:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
 "One Base DN per line" => "Her satırda tek bir Base DN",
 "You can specify Base DN for users and groups in the Advanced tab" => "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.",
+"Manually enter LDAP filters (recommended for large directories)" => "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)",
 "Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
 "users found" => "kullanıcı bulundu",
+"Saving" => "Kaydediliyor",
 "Back" => "Geri",
 "Continue" => "Devam et",
 "Expert" => "Uzman",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 79ac796e611..ac7642f6c86 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n",
 "The share will expire on %s." => "Sdílení vyprší %s.",
 "Cheers!" => "Ať slouží!",
+"Internal Server Error" => "Vnitřní chyba serveru",
 "The server encountered an internal error and was unable to complete your request." => "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
 "More details can be found in the server log." => "Více podrobností k nalezení v serverovém logu.",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 013b6538d52..5aa1dc14a9a 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
 "The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
 "Cheers!" => "Hallo!",
+"Internal Server Error" => "Interner Server-Fehler",
 "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, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
 "More details can be found in the server log." => "Weitere Details können im Serverprotokoll gefunden werden.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 84d15a31de7..f50b3d6b07b 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s hat %s mit Ihnen geteilt.\nAnsehen: %s\n\n",
 "The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
 "Cheers!" => "Noch einen schönen Tag!",
+"Internal Server Error" => "Interner Server-Fehler",
 "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 wenden Sie sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, geben Sie bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.",
 "More details can be found in the server log." => "Weitere Details können im Serverprotokoll gefunden werden.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 7c720aa563e..c7ca3c1580d 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
 "The share will expire on %s." => "El objeto dejará de ser compartido el %s.",
 "Cheers!" => "¡Saludos!",
+"Internal Server Error" => "Error interno del servidor",
 "The server encountered an internal error and was unable to complete your request." => "El servidor ha encontrado un error y no puede completar la solicitud.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Por favor contacte con el administrador del servidor si este error reaparece multiples veces. Por favor incluya los detalles tecnicos que se muestran acontinuación.",
 "More details can be found in the server log." => "Mas detalles pueden verse en el log del servidor.",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 58b0955838c..3035ee91877 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -68,6 +68,7 @@ $TRANSLATIONS = array(
 "Strong password" => "Väga hea parool",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
 "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." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
+"Error occurred while checking server setup" => "Serveri seadete kontrolimisel tekkis viga",
 "Shared" => "Jagatud",
 "Shared with {recipients}" => "Jagatud {recipients}",
 "Share" => "Jaga",
@@ -144,9 +145,13 @@ $TRANSLATIONS = array(
 "Error unfavoriting" => "Viga lemmikutest eemaldamisel",
 "Access forbidden" => "Ligipääs on keelatud",
 "File not found" => "Faili ei leitud",
+"The specified document has not been found on the server." => "Määratud dokumenti serverist ei leitud.",
+"You can click here to return to %s." => "%s tagasi minemiseks võid sa siia klikkida.",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
 "The share will expire on %s." => "Jagamine aegub %s.",
 "Cheers!" => "Terekest!",
+"Internal Server Error" => "Serveri sisemine viga",
+"More details can be found in the server log." => "Lisainfot võib leida serveri logist.",
 "Technical details" => "Tehnilised andmed",
 "Remote Address: %s" => "Kaugaadress: %s",
 "Request ID: %s" => "Päringu ID: %s",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 1b97801264a..e72bc5b8e7d 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -149,6 +149,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
 "The share will expire on %s." => "Jakaminen päättyy %s.",
 "Cheers!" => "Kippis!",
+"Internal Server Error" => "Sisäinen palvelinvirhe",
 "The server encountered an internal error and was unable to complete your request." => "Palvelin kohtasi sisäisen virheen, eikä pystynyt viimeistelmään pyyntöäsi.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Ota yhteys palvelimen ylläpitäjään, jos tämä virhe ilmenee useita kertoja. Lisää yhteydenottoosi alla olevat tekniset tiedot.",
 "More details can be found in the server log." => "Lisätietoja on palvelimen lokitiedostossa.",
@@ -159,6 +160,7 @@ $TRANSLATIONS = array(
 "Message: %s" => "Viesti: %s",
 "File: %s" => "Tiedosto: %s",
 "Line: %s" => "Rivi: %s",
+"Trace" => "Jälki",
 "Security Warning" => "Turvallisuusvaroitus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 67114a321bb..ae3fd59861f 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
 "The share will expire on %s." => "La condivisione scadrà il %s.",
 "Cheers!" => "Saluti!",
+"Internal Server Error" => "Errore interno del server",
 "The server encountered an internal error and was unable to complete your request." => "Il server ha riscontrato un errore interno e non è stato in grado di completare la tua richiesta.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Contatta l'amministratore del server se questo errore riappare più volte, includendo i dettagli tecnici sotto riportati nella tua segnalazione.",
 "More details can be found in the server log." => "Ulteriori dettagli sono disponibili nel log del server.",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 581db3a6216..b6c3b5ce401 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
 "The share will expire on %s." => "De share vervalt op %s.",
 "Cheers!" => "Proficiat!",
+"Internal Server Error" => "Interne serverfout",
 "The server encountered an internal error and was unable to complete your request." => "De server ontdekte een interne fout en kon uw aanvraag niet verder uitvoeren.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Neem contact op mer de serverbeheerder als deze fout meerdere keren optreedt en neem de onderstaande technische details op in uw melding.",
 "More details can be found in the server log." => "Meer details in de serverlogging,",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 505dc24c10a..7d653d12dd4 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com você.\nVeja isto: %s\n\n",
 "The share will expire on %s." => "O compartilhamento irá expirar em %s.",
 "Cheers!" => "Saúde!",
+"Internal Server Error" => "Erro Interno do Servidor",
 "The server encountered an internal error and was unable to complete your request." => "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Entre em contato com o administrador do servidor se este erro reaparece várias vezes, por favor, inclua os detalhes técnicos abaixo em seu relatório.",
 "More details can be found in the server log." => "Mais detalhes podem ser encontrados no log do servidor.",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index b6a7b9206f2..20a8d9b8fc0 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -150,7 +150,9 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n",
 "The share will expire on %s." => "Povezava souporabe bo potekla %s.",
 "Cheers!" => "Na zdravje!",
+"Internal Server Error" => "Notranja  napaka strežnika",
 "The server encountered an internal error and was unable to complete your request." => "Prišlo je do notranje napake, zato ni mogoče končati zahteve.",
+"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.",
 "More details can be found in the server log." => "Več podrobnosti je zabeleženih v dnevniku strežnika.",
 "Technical details" => "Tehnične podrobnosti",
 "Remote Address: %s" => "Oddaljen naslov: %s",
@@ -159,6 +161,7 @@ $TRANSLATIONS = array(
 "Message: %s" => "Sporočilo: %s",
 "File: %s" => "Datoteka: %s",
 "Line: %s" => "Vrstica: %s",
+"Trace" => "Sledenje povezav",
 "Security Warning" => "Varnostno opozorilo",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index 50a7a798f13..7a1def5d18b 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n",
 "The share will expire on %s." => "Bu paylaşım %s tarihinde sona erecek.",
 "Cheers!" => "Hoşça kalın!",
+"Internal Server Error" => "Dahili Sunucu Hatası",
 "The server encountered an internal error and was unable to complete your request." => "Sunucu dahili bir hatayla karşılaştı ve isteğinizi tamamlayamadı.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Eğer bu hata birden çok kez oluştuysa, lütfen sunucu yöneticisine aşağıdaki teknik ayrıntılar ile birlikte iletişime geçin.",
 "More details can be found in the server log." => "Daha fazla ayrıntı sunucu günlüğünde bulanabilir.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 906b7e43e05..94749ff90c5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -327,12 +327,12 @@ msgstr ""
 msgid "Share"
 msgstr ""
 
-#: js/share.js:326 js/share.js:340 js/share.js:347 js/share.js:1076
+#: js/share.js:326 js/share.js:340 js/share.js:347 js/share.js:1077
 #: templates/installation.php:10
 msgid "Error"
 msgstr ""
 
-#: js/share.js:328 js/share.js:1139
+#: js/share.js:328 js/share.js:1140
 msgid "Error while sharing"
 msgstr ""
 
@@ -369,7 +369,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:402
+#: js/share.js:402 js/share.js:1028
 msgid "Choose a password for the public link"
 msgstr ""
 
@@ -441,27 +441,27 @@ msgstr ""
 msgid "delete"
 msgstr ""
 
-#: js/share.js:1057
+#: js/share.js:1058
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:1076
+#: js/share.js:1077
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:1097
+#: js/share.js:1098
 msgid "Error setting expiration date"
 msgstr ""
 
-#: js/share.js:1126
+#: js/share.js:1127
 msgid "Sending ..."
 msgstr ""
 
-#: js/share.js:1137
+#: js/share.js:1138
 msgid "Email sent"
 msgstr ""
 
-#: js/share.js:1161
+#: js/share.js:1162
 msgid "Warning"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index eba92a24e2e..3f8c9bcd765 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 98f7be5807d..5fa921b478f 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index f433ff0bd24..57acac707cc 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -223,15 +223,15 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: js/settings.js:208
+#: js/settings.js:211
 msgid "All users. Type to select user or group."
 msgstr ""
 
-#: js/settings.js:291
+#: js/settings.js:294
 msgid "(group)"
 msgstr ""
 
-#: js/settings.js:467 js/settings.js:474
+#: js/settings.js:471 js/settings.js:478
 msgid "Saved"
 msgstr ""
 
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index a29849d9e1f..2c46f6bac7a 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 48b0e1a32f9..f1f574596cb 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 41eb7e9f696..70596151d88 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 158825a0039..1090f6ab6d6 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,38 +51,38 @@ msgid ""
 "before performing changes on config.php"
 msgstr ""
 
-#: private/app.php:398
+#: private/app.php:408
 msgid "Help"
 msgstr ""
 
-#: private/app.php:411
+#: private/app.php:421
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:422
+#: private/app.php:432
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:434
+#: private/app.php:444
 msgid "Users"
 msgstr ""
 
-#: private/app.php:447
+#: private/app.php:457
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:853 private/app.php:964
+#: private/app.php:863 private/app.php:974
 msgid "Recommended"
 msgstr ""
 
-#: private/app.php:1146
+#: private/app.php:1156
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: private/app.php:1158
+#: private/app.php:1168
 msgid "No app name specified"
 msgstr ""
 
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index af72bbcc67c..3c0326285e7 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: app.php:398
+#: app.php:408
 msgid "Help"
 msgstr ""
 
-#: app.php:411
+#: app.php:421
 msgid "Personal"
 msgstr ""
 
-#: app.php:422
+#: app.php:432
 msgid "Settings"
 msgstr ""
 
-#: app.php:434
+#: app.php:444
 msgid "Users"
 msgstr ""
 
-#: app.php:447
+#: app.php:457
 msgid "Admin"
 msgstr ""
 
-#: app.php:853 app.php:964
+#: app.php:863 app.php:974
 msgid "Recommended"
 msgstr ""
 
-#: app.php:1146
+#: app.php:1156
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: app.php:1158
+#: app.php:1168
 msgid "No app name specified"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d9f6c4e953a..c992afe6c8f 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 11eb8e19829..11102d14b00 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index c7c51d7919b..0a434a5797a 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-17 01:54-0400\n"
+"POT-Creation-Date: 2014-10-18 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index e2586d286ed..ac359e34f52 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Einstellungen",
 "Users" => "Benutzer",
 "Admin" => "Administration",
+"Recommended" => "Empfohlen",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \\\"%s\\\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
 "No app name specified" => "Es wurde kein Applikation-Name angegeben",
 "Unknown filetype" => "Unbekannter Dateityp",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index 98f74eee4d5..006f28d6066 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Einstellungen",
 "Users" => "Benutzer",
 "Admin" => "Administrator",
+"Recommended" => "Empfohlen",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App »%s« kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.",
 "No app name specified" => "Es wurde kein Applikation-Name angegeben",
 "Unknown filetype" => "Unbekannter Dateityp",
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index a0d684713fc..3bd242df07d 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "لا يمكن تغيير كلمة المرور",
 "Saved" => "حفظ",
 "test email settings" => "إعدادات البريد التجريبي",
+"If you received this email, the settings seem to be correct." => "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
 "Email sent" => "تم ارسال البريد الالكتروني",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
 "Sending..." => "جاري الارسال ...",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index b6877bc6a80..6daed3ecf05 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Nun pudo camudase la contraseña",
 "Saved" => "Guardáu",
 "test email settings" => "probar configuración de corréu",
+"If you received this email, the settings seem to be correct." => "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
 "Email sent" => "Corréu-e unviáu",
 "You need to set your user email before being able to send test emails." => "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
 "Sending..." => "Unviando...",
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
index 25abf7fa642..1241cf06dfe 100644
--- a/settings/l10n/az.php
+++ b/settings/l10n/az.php
@@ -31,6 +31,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Şifrəni dəyişmək olmur",
 "Saved" => "Saxlanıldı",
 "test email settings" => "sınaq məktubu quraşdırmaları",
+"If you received this email, the settings seem to be correct." => "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
 "Email sent" => "Məktub göndərildi",
 "You need to set your user email before being able to send test emails." => "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 5833725a4e1..52c311039d6 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Неуспешна смяна на паролата.",
 "Saved" => "Запис",
 "test email settings" => "провери имейл настройките",
+"If you received this email, the settings seem to be correct." => "Ако си получил този имейл, настройките са правилни.",
 "Email sent" => "Имейлът е изпратен",
 "You need to set your user email before being able to send test emails." => "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index ffab9f10b87..e5711e81014 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -23,6 +23,7 @@ $TRANSLATIONS = array(
 "No user supplied" => "ব্যবহারকারী দেয়া হয়নি",
 "Saved" => "সংরক্ষণ করা হলো",
 "test email settings" => "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
+"If you received this email, the settings seem to be correct." => "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
 "Email sent" => "ই-মেইল পাঠানো হয়েছে",
 "All" => "সবাই",
 "Error while disabling app" => "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index bf431e43fbd..accca49c7fc 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "No es pot canviar la contrasenya",
 "Saved" => "Desat",
 "test email settings" => "prova l'arranjament del correu",
+"If you received this email, the settings seem to be correct." => "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
 "Email sent" => "El correu electrónic s'ha enviat",
 "You need to set your user email before being able to send test emails." => "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
 "Sending..." => "Enviant...",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 42cd49ef70d..31189dc4633 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Změna hesla se nezdařila",
 "Saved" => "Uloženo",
 "test email settings" => "otestovat nastavení e-mailu",
+"If you received this email, the settings seem to be correct." => "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
 "A problem occurred while sending the email. Please revise your settings." => "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.",
 "Email sent" => "E-mail odeslán",
 "You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index f87af958df3..61f4516f2a9 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Kunne ikke ændre kodeord",
 "Saved" => "Gemt",
 "test email settings" => "test e-mailindstillinger",
+"If you received this email, the settings seem to be correct." => "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
 "A problem occurred while sending the email. Please revise your settings." => "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.",
 "Email sent" => "E-mail afsendt",
 "You need to set your user email before being able to send test emails." => "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 52ecaf1e121..240b1c0f63d 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Aktiviert",
+"Not enabled" => "Nicht aktiviert",
+"Recommended" => "Empfohlen",
 "Authentication error" => "Fehler bei der Anmeldung",
 "Your full name has been changed." => "Dein vollständiger Name ist geändert worden.",
 "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
@@ -32,6 +34,8 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Passwort konnte nicht geändert werden",
 "Saved" => "Gespeichert",
 "test email settings" => "E-Mail-Einstellungen testen",
+"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
+"A problem occurred while sending the email. Please revise your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen.",
 "Email sent" => "E-Mail wurde verschickt",
 "You need to set your user email before being able to send test emails." => "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
@@ -147,6 +151,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Zugangsdaten",
 "SMTP Username" => "SMTP Benutzername",
 "SMTP Password" => "SMTP Passwort",
+"Store credentials" => "Anmeldeinformationen speichern",
 "Test email settings" => "Teste E-Mail-Einstellungen",
 "Send email" => "Sende E-Mail",
 "Log" => "Log",
@@ -156,10 +161,13 @@ $TRANSLATIONS = array(
 "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",
+"Add your app" => "Fügen Sie Ihre App hinzu",
 "by" => "von",
+"licensed" => "Lizenziert",
 "Documentation:" => "Dokumentation:",
 "User Documentation" => "Dokumentation für Benutzer",
 "Admin Documentation" => "Admin-Dokumentation",
+"Update to %s" => "Aktualisierung auf %s",
 "Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren",
 "Uninstall App" => "App deinstallieren",
 "Administrator Documentation" => "Dokumentation für Administratoren",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 5e8a5083ca7..563a99ec364 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Aktiviert",
+"Not enabled" => "Nicht aktiviert",
+"Recommended" => "Empfohlen",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Your full name has been changed." => "Ihr vollständiger Name ist geändert worden.",
 "Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
@@ -32,6 +34,8 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Passwort konnte nicht geändert werden",
 "Saved" => "Gespeichert",
 "test email settings" => "E-Mail-Einstellungen testen",
+"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, scheinen die Einstellungen richtig zu sein.",
+"A problem occurred while sending the email. Please revise your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
 "Email sent" => "E-Mail gesendet",
 "You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
@@ -147,6 +151,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Zugangsdaten",
 "SMTP Username" => "SMTP Benutzername",
 "SMTP Password" => "SMTP Passwort",
+"Store credentials" => "Anmeldeinformationen speichern",
 "Test email settings" => "E-Mail-Einstellungen testen",
 "Send email" => "E-Mail senden",
 "Log" => "Log",
@@ -156,10 +161,13 @@ $TRANSLATIONS = array(
 "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",
+"Add your app" => "Füge Deine App hinzu",
 "by" => "von",
+"licensed" => "Lizenziert",
 "Documentation:" => "Dokumentation:",
 "User Documentation" => "Dokumentation für Benutzer",
 "Admin Documentation" => "Dokumentation für Administratoren",
+"Update to %s" => "Aktualisierung auf %s",
 "Enable only for specific groups" => "Nur für bestimmte Gruppen aktivieren",
 "Uninstall App" => "App deinstallieren",
 "Administrator Documentation" => "Dokumentation für Administratoren",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index f9caf6e22d8..93115ef2178 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Αδυναμία αλλαγής συνθηματικού",
 "Saved" => "Αποθηκεύτηκαν",
 "test email settings" => "δοκιμή ρυθμίσεων email",
+"If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
 "Email sent" => "Το Email απεστάλη ",
 "You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 17a959b4197..321e652649e 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Unable to change password",
 "Saved" => "Saved",
 "test email settings" => "test email settings",
+"If you received this email, the settings seem to be correct." => "If you received this email, the settings seem to be correct.",
 "A problem occurred while sending the email. Please revise your settings." => "A problem occurred whilst sending the email. Please revise your settings.",
 "Email sent" => "Email sent",
 "You need to set your user email before being able to send test emails." => "You need to set your user email before being able to send test emails.",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 12d84a7f0a3..7cd822bff53 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "No se ha podido cambiar la contraseña",
 "Saved" => "Guardado",
 "test email settings" => "probar configuración de correo electrónico",
+"If you received this email, the settings seem to be correct." => "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
 "A problem occurred while sending the email. Please revise your settings." => "Ocurrió un problema al mandar el mensaje. Revise la configuración.",
 "Email sent" => "Correo electrónico enviado",
 "You need to set your user email before being able to send test emails." => "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
@@ -162,6 +163,7 @@ $TRANSLATIONS = array(
 "More apps" => "Más aplicaciones",
 "Add your app" => "Agregue su aplicación",
 "by" => "por",
+"licensed" => "licenciado",
 "Documentation:" => "Documentación:",
 "User Documentation" => "Documentación de usuario",
 "Admin Documentation" => "Documentación para administradores",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index b8a1109b560..6bb1c20f38a 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -25,6 +25,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Imposible cambiar la contraseña",
 "Saved" => "Guardado",
 "test email settings" => "Configuración de correo de prueba.",
+"If you received this email, the settings seem to be correct." => "Si recibió este correo, la configuración parece estar correcta.",
 "Email sent" => "e-mail mandado",
 "You need to set your user email before being able to send test emails." => "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
 "Sending..." => "Enviando...",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index a821995edf7..d1515065bc4 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Ei suuda parooli muuta",
 "Saved" => "Salvestatud",
 "test email settings" => "testi e-posti seadeid",
+"If you received this email, the settings seem to be correct." => "Kui said selle kirja, siis on seadistus korrektne.",
 "A problem occurred while sending the email. Please revise your settings." => "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
 "Email sent" => "E-kiri on saadetud",
 "You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 87ace49275a..fe62796e1ac 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Ezin izan da pasahitza aldatu",
 "Saved" => "Gordeta",
 "test email settings" => "probatu eposta ezarpenak",
+"If you received this email, the settings seem to be correct." => "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
 "Email sent" => "Eposta bidalia",
 "You need to set your user email before being able to send test emails." => "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 41044847b7f..e82bc039f22 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Salasanan vaihto ei onnistunut",
 "Saved" => "Tallennettu",
 "test email settings" => "testaa sähköpostiasetukset",
+"If you received this email, the settings seem to be correct." => "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
 "A problem occurred while sending the email. Please revise your settings." => "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.",
 "Email sent" => "Sähköposti lähetetty",
 "You need to set your user email before being able to send test emails." => "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 2ec79e78f9f..d0cb2ba0a3f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Impossible de modifier le mot de passe",
 "Saved" => "Sauvegardé",
 "test email settings" => "tester les paramètres d'e-mail",
+"If you received this email, the settings seem to be correct." => "Si vous recevez cet email, c'est que les paramètres sont corrects",
 "Email sent" => "Email envoyé",
 "You need to set your user email before being able to send test emails." => "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 1cdb75b866e..6886b876ed8 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Non é posíbel cambiar o contrasinal",
 "Saved" => "Gardado",
 "test email settings" => "correo de proba dos axustes",
+"If you received this email, the settings seem to be correct." => "Se recibiu este correo, semella que a configuración é correcta.",
 "Email sent" => "Correo enviado",
 "You need to set your user email before being able to send test emails." => "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
 "Sending..." => "Enviando...",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index f1552304226..1fe1adb36a0 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Promjena lozinke nije moguća",
 "Saved" => "Spremljeno",
 "test email settings" => "Postavke za testiranje e-pošte",
+"If you received this email, the settings seem to be correct." => "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
 "Email sent" => "E-pošta je poslana",
 "You need to set your user email before being able to send test emails." => "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 5021adf908b..a404340941c 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Nem sikerült megváltoztatni a jelszót",
 "Saved" => "Elmentve",
 "test email settings" => "e-mail beállítások ellenőrzése",
+"If you received this email, the settings seem to be correct." => "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
 "Email sent" => "Az e-mailt elküldtük",
 "You need to set your user email before being able to send test emails." => "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 4ecc8d992ce..441586a0f1a 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -23,6 +23,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Tidak dapat mengubah sandi",
 "Saved" => "Disimpan",
 "test email settings" => "pengaturan email percobaan",
+"If you received this email, the settings seem to be correct." => "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
 "Email sent" => "Email terkirim",
 "You need to set your user email before being able to send test emails." => "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
 "Sending..." => "Mengirim",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index fc680f1e150..9b523c87ff3 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Impossibile cambiare la password",
 "Saved" => "Salvato",
 "test email settings" => "prova impostazioni email",
+"If you received this email, the settings seem to be correct." => "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
 "A problem occurred while sending the email. Please revise your settings." => "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.",
 "Email sent" => "Email inviata",
 "You need to set your user email before being able to send test emails." => "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index cdbf329662f..9d70f721c38 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "パスワードを変更できません",
 "Saved" => "保存されました",
 "test email settings" => "メール設定をテスト",
+"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
 "Email sent" => "メールを送信しました",
 "You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index d51bd4b7b84..67703a0ed2d 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -17,6 +17,7 @@ $TRANSLATIONS = array(
 "Wrong password" => "ខុស​ពាក្យ​សម្ងាត់",
 "Saved" => "បាន​រក្សាទុក",
 "test email settings" => "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
+"If you received this email, the settings seem to be correct." => "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
 "Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
 "You need to set your user email before being able to send test emails." => "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
 "Sending..." => "កំពុង​ផ្ញើ...",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index a501571d2b7..14ecd314946 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Kunne ikke endre passord",
 "Saved" => "Lagret",
 "test email settings" => "Test av innstillinger for e-post",
+"If you received this email, the settings seem to be correct." => "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
 "Email sent" => "E-post sendt",
 "You need to set your user email before being able to send test emails." => "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 6f6c47bef23..b9f3e2ed89d 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Kan wachtwoord niet wijzigen",
 "Saved" => "Bewaard",
 "test email settings" => "test e-mailinstellingen",
+"If you received this email, the settings seem to be correct." => "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
 "A problem occurred while sending the email. Please revise your settings." => "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
 "Email sent" => "E-mail verzonden",
 "You need to set your user email before being able to send test emails." => "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 63ed6451779..4dac77e30b4 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Nie można zmienić hasła",
 "Saved" => "Zapisano",
 "test email settings" => "przetestuj ustawienia email",
+"If you received this email, the settings seem to be correct." => "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
 "Email sent" => "E-mail wysłany",
 "You need to set your user email before being able to send test emails." => "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index e591ae84830..7544c8d83c3 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Impossível modificar senha",
 "Saved" => "Salvo",
 "test email settings" => "testar configurações de email",
+"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail, as configurações parecem estar corretas.",
 "A problem occurred while sending the email. Please revise your settings." => "Ocorreu um problema ao enviar o e-mail. Por favor, revise suas configurações.",
 "Email sent" => "E-mail enviado",
 "You need to set your user email before being able to send test emails." => "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 503439bd02b..6c1e9c8b53a 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Não foi possível alterar a sua password",
 "Saved" => "Guardado",
 "test email settings" => "testar configurações de email",
+"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail as configurações parecem estar correctas",
 "Email sent" => "E-mail enviado",
 "You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 5beed941db2..1e8c073d36b 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -24,6 +24,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Imposibil de schimbat parola",
 "Saved" => "Salvat",
 "test email settings" => "verifică setările de e-mail",
+"If you received this email, the settings seem to be correct." => "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
 "Email sent" => "Mesajul a fost expediat",
 "Sending..." => "Se expediază...",
 "All" => "Toate ",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index a729ad6525b..49ae9a28a9a 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Невозможно изменить пароль",
 "Saved" => "Сохранено",
 "test email settings" => "проверить настройки почты",
+"If you received this email, the settings seem to be correct." => "Если вы получили это письмо, настройки верны.",
 "Email sent" => "Письмо отправлено",
 "You need to set your user email before being able to send test emails." => "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 5a449528c0d..900a707a62c 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Zmena hesla sa nepodarila",
 "Saved" => "Uložené",
 "test email settings" => "nastavenia testovacieho emailu",
+"If you received this email, the settings seem to be correct." => "Ak ste dostali tento email, nastavenie je správne.",
 "Email sent" => "Email odoslaný",
 "You need to set your user email before being able to send test emails." => "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index ce5ead36ef2..a9298d61f9e 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -29,6 +29,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Ni mogoče spremeniti gesla",
 "Saved" => "Shranjeno",
 "test email settings" => "preizkusi nastavitve elektronske pošte",
+"If you received this email, the settings seem to be correct." => "Če ste prejeli to sporočilo, so nastavitve pravilne.",
 "Email sent" => "Elektronska pošta je poslana",
 "You need to set your user email before being able to send test emails." => "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
 "Add trusted domain" => "Dodaj varno domeno",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index df6969d9df8..a87611b59f4 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Kunde inte ändra lösenord",
 "Saved" => "Sparad",
 "test email settings" => "testa e-post inställningar",
+"If you received this email, the settings seem to be correct." => "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
 "Email sent" => "E-post skickat",
 "You need to set your user email before being able to send test emails." => "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 76afe9b6aff..66b84e079e0 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -34,6 +34,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "Parola değiştirilemiyor",
 "Saved" => "Kaydedildi",
 "test email settings" => "e-posta ayarlarını sına",
+"If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
 "A problem occurred while sending the email. Please revise your settings." => "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.",
 "Email sent" => "E-posta gönderildi",
 "You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index b5bf164fb80..8e05cd4f7d8 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -32,6 +32,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "不能更改密码",
 "Saved" => "已保存",
 "test email settings" => "测试电子邮件设置",
+"If you received this email, the settings seem to be correct." => "如果您收到了这封邮件，看起来设置没有问题。",
 "Email sent" => "邮件已发送",
 "You need to set your user email before being able to send test emails." => "在发送测试邮件前您需要设置您的用户电子邮件。",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "你真的希望添加 \"{domain}\" 为信任域？",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index bf636d10807..86a2661404b 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -27,6 +27,7 @@ $TRANSLATIONS = array(
 "Unable to change password" => "無法修改密碼",
 "Saved" => "已儲存",
 "test email settings" => "測試郵件設定",
+"If you received this email, the settings seem to be correct." => "假如您收到這個郵件，此設定看起來是正確的。",
 "Email sent" => "Email 已寄出",
 "You need to set your user email before being able to send test emails." => "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
 "Sending..." => "寄送中...",
-- 
GitLab


From 245ae7e07116b1d4942479f4a935dac63b10a2f4 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 19 Oct 2014 01:54:36 -0400
Subject: [PATCH 151/616] [tx-robot] updated from transifex

---
 apps/files/l10n/uk.php              |  3 +++
 apps/files_external/l10n/uk.php     |  9 ++++++-
 apps/user_ldap/l10n/da.php          |  4 +++
 core/l10n/da.php                    |  1 +
 core/l10n/uk.php                    | 38 ++++++++++++++++++++++++++++-
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              |  2 +-
 l10n/templates/private.pot          |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 settings/l10n/uk.php                |  1 +
 18 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index dc9e4b64c14..626c713eca5 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Storage not available" => "Сховище не доступне",
+"Storage invalid" => "Неправильне сховище",
 "Unknown error" => "Невідома помилка",
 "Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
 "Could not move %s" => "Не вдалося перемістити %s",
@@ -41,6 +43,7 @@ $TRANSLATIONS = array(
 "Error fetching URL" => "Помилка отримання URL",
 "Share" => "Поділитися",
 "Delete" => "Видалити",
+"Disconnect storage" => "Від’єднати сховище",
 "Unshare" => "Закрити доступ",
 "Delete permanently" => "Видалити назавжди",
 "Rename" => "Перейменувати",
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index 0674d3f6175..4a761d5c676 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -8,6 +8,10 @@ $TRANSLATIONS = array(
 "Host" => "Хост",
 "Username" => "Ім'я користувача",
 "Password" => "Пароль",
+"OpenStack Object Storage" => "OpenStack Object Storage",
+"Region (optional 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)",
 "Share" => "Поділитися",
 "URL" => "URL",
 "Access granted" => "Доступ дозволено",
@@ -15,12 +19,15 @@ $TRANSLATIONS = array(
 "Grant access" => "Дозволити доступ",
 "Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive",
 "Personal" => "Особисте",
+"You don't have any external storages" => "У вас немає зовнішніх сховищ",
 "Name" => "Ім'я",
+"Storage type" => "Тип сховища",
 "External Storage" => "Зовнішні сховища",
 "Folder name" => "Ім'я теки",
 "Configuration" => "Налаштування",
 "Add storage" => "Додати сховище",
 "Delete" => "Видалити",
-"Enable User External Storage" => "Активувати користувацькі зовнішні сховища"
+"Enable User External Storage" => "Активувати користувацькі зовнішні сховища",
+"Allow users to mount the following external storage" => "Дозволити користувачам монтувати наступні зовнішні сховища"
 );
 $PLURAL_FORMS = "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_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
index 31dbd08d1b3..d76395ab3ba 100644
--- a/apps/user_ldap/l10n/da.php
+++ b/apps/user_ldap/l10n/da.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Redigér det rå filter i stedet",
 "Raw LDAP filter" => "Råt LDAP-filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
+"Test Filter" => "Testfilter",
 "groups found" => "grupper blev fundet",
 "Users login with this attribute:" => "Brugeres login med dette attribut:",
 "LDAP Username:" => "LDAP-brugernavn:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "For anonym adgang, skal du lade DN og Adgangskode tomme.",
 "One Base DN per line" => "Ét Base DN per linje",
 "You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.",
+"Manually enter LDAP filters (recommended for large directories)" => "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
 "Limit %s access to users meeting these criteria:" => "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
 "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.",
 "users found" => "brugere blev fundet",
+"Saving" => "Gemmer",
 "Back" => "Tilbage",
 "Continue" => "Videre",
 "Expert" => "Ekspert",
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 8eace7d1662..ce415eca549 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej med dig\n\nDette blot for at lade dig vide, at %s har delt %s med dig.\nSe det her: %s\n\n",
 "The share will expire on %s." => "Delingen vil udløbe om %s.",
 "Cheers!" => "Hej!",
+"Internal Server Error" => "Intern serverfejl",
 "The server encountered an internal error and was unable to complete your request." => "Servern stødte på en intern fejl og var ikke i stand til at fuldføre din forespørgsel.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontakt venligst serveradministratoren, hvis denne fejl gentager sig flere gange - medtag venligst de tekniske detaljer nedenfor i din rapport.",
 "More details can be found in the server log." => "Flere detaljer kan fås i serverloggen.",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index ce15a2b2e9a..baebf63cae0 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -4,6 +4,10 @@ $TRANSLATIONS = array(
 "Turned on maintenance mode" => "Увімкнено захищений режим",
 "Turned off maintenance mode" => "Вимкнено захищений режим",
 "Updated database" => "Базу даних оновлено",
+"Checked database schema update" => "Перевірено оновлення схеми бази даних",
+"Checked database schema update for apps" => "Перевірено оновлення схеми бази даних для додатків",
+"Updated \"%s\" to %s" => "Оновлено \"%s\" до %s",
+"Disabled incompatible apps: %s" => "Вимкнені несумісні додатки: %s",
 "No image or file provided" => "Немає наданого зображення або файлу",
 "Unknown filetype" => "Невідомий тип файлу",
 "Invalid image" => "Невірне зображення",
@@ -31,8 +35,15 @@ $TRANSLATIONS = array(
 "Settings" => "Налаштування",
 "File" => "Файл",
 "Folder" => "Тека",
+"Image" => "Зображення",
+"Audio" => "Аудіо",
 "Saving..." => "Зберігаю...",
+"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 /> Ви дійсно хочете продовжити?",
+"I know what I'm doing" => "Я знаю що роблю",
 "Reset password" => "Скинути пароль",
+"Password can not be changed. Please contact your administrator." => "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
 "No" => "Ні",
 "Yes" => "Так",
 "Choose" => "Обрати",
@@ -42,6 +53,7 @@ $TRANSLATIONS = array(
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
 "One file conflict" => "Один файловий конфлікт",
 "New Files" => "Нових Файлів",
+"Already existing files" => "Файли що вже існують",
 "Which files do you want to keep?" => "Які файли ви хочете залишити?",
 "If you select both versions, the copied file will have a number added to its name." => "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я.",
 "Cancel" => "Відмінити",
@@ -51,10 +63,14 @@ $TRANSLATIONS = array(
 "Error loading file exists template" => "Помилка при завантаженні файлу існуючого шаблону",
 "Very weak password" => "Дуже слабкий пароль",
 "Weak password" => "Слабкий пароль",
+"So-so password" => "Такий собі пароль",
 "Good password" => "Добрий пароль",
 "Strong password" => "Надійний пароль",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
+"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." => "Цей сервер не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх сховищ, повідомлення про оновлення або встановлення допоміжних програм не будуть працювати. Віддалений доступ до файлів та надсилання повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.",
+"Error occurred while checking server setup" => "При перевірці налаштувань серверу сталася помилка",
 "Shared" => "Опубліковано",
+"Shared with {recipients}" => "Опубліковано для {recipients}",
 "Share" => "Поділитися",
 "Error" => "Помилка",
 "Error while sharing" => "Помилка під час публікації",
@@ -64,12 +80,15 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "{owner} опублікував для Вас",
 "Share with user or group …" => "Поділитися з користувачем або групою ...",
 "Share link" => "Опублікувати посилання",
+"The public link will expire no later than {days} days after it is created" => "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
 "Password protect" => "Захистити паролем",
+"Choose a password for the public link" => "Оберіть пароль для опублікованого посилання",
 "Allow Public Upload" => "Дозволити Публічне Завантаження",
 "Email link to person" => "Ел. пошта належить Пану",
 "Send" => "Надіслати",
 "Set expiration date" => "Встановити термін дії",
 "Expiration date" => "Термін дії",
+"Adding user..." => "Додавання користувача...",
 "group" => "група",
 "Resharing is not allowed" => "Пере-публікація не дозволяється",
 "Shared in {item} with {user}" => "Опубліковано {item} для {user}",
@@ -95,6 +114,7 @@ $TRANSLATIONS = array(
 "Error loading dialog template: {error}" => "Помилка при завантаженні шаблону діалогу: {error}",
 "No tags selected for deletion." => "Жодних тегів не обрано для видалення.",
 "Please reload the page." => "Будь ласка, перезавантажте сторінку.",
+"The update was unsuccessful." => "Оновлення завершилось невдачею.",
 "The update was successful. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
 "%s password reset" => "%s пароль скинуто",
 "Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
@@ -104,7 +124,9 @@ $TRANSLATIONS = array(
 "Yes, I really want to reset my password now" => "Так, я справді бажаю скинути мій пароль зараз",
 "Reset" => "Перевстановити",
 "New password" => "Новий пароль",
+"New Password" => "Новий пароль",
 "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
+"For the best results, please consider using a GNU/Linux server instead." => "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
 "Personal" => "Особисте",
 "Users" => "Користувачі",
 "Apps" => "Додатки",
@@ -118,9 +140,21 @@ $TRANSLATIONS = array(
 "Error favoriting" => "Помилка позначення улюблених",
 "Error unfavoriting" => "Помилка зняття позначки улюблених",
 "Access forbidden" => "Доступ заборонено",
+"File not found" => "Файл не знайдено",
+"The specified document has not been found on the server." => "Не вдалось знайти вказаний документ на сервері.",
+"You can click here to return to %s." => "Ви можете натиснути тут для повернення до %s.",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Агов,\n\nпросто щоб ви знали, що %s поділився %s з вами.\nПодивіться: %s\n\n",
 "The share will expire on %s." => "Доступ до спільних даних вичерпається %s.",
 "Cheers!" => "Будьмо!",
+"Internal Server Error" => "Внутрішня помилка серверу",
+"More details can be found in the server log." => "Більше деталей може бути в журналі серверу.",
+"Technical details" => "Технічні деталі",
+"Remote Address: %s" => "Віддалена Адреса: %s",
+"Code: %s" => "Код: %s",
+"Message: %s" => "Повідомлення: %s",
+"File: %s" => "Файл: %s",
+"Line: %s" => "Рядок: %s",
+"Trace" => "Трасування",
 "Security Warning" => "Попередження про небезпеку",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Будь ласка, оновіть вашу інсталяцію PHP для використання %s безпеки.",
@@ -128,6 +162,7 @@ $TRANSLATIONS = array(
 "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
 "Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>",
 "Password" => "Пароль",
+"Storage & database" => "Сховище і база даних",
 "Data folder" => "Каталог даних",
 "Configure the database" => "Налаштування бази даних",
 "Database user" => "Користувач бази даних",
@@ -148,6 +183,7 @@ $TRANSLATIONS = array(
 "This ownCloud instance is currently in single user mode." => "Цей екземпляр OwnCloud зараз працює в монопольному режимі одного користувача",
 "This means only administrators can use the instance." => "Це означає, що лише адміністратори можуть використовувати цей екземпляр.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Зверніться до системного адміністратора, якщо це повідомлення зберігається або з'являєтья несподівано.",
-"Thank you for your patience." => "Дякуємо за ваше терпіння."
+"Thank you for your patience." => "Дякуємо за ваше терпіння.",
+"Start update" => "Почати оновлення"
 );
 $PLURAL_FORMS = "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/l10n/templates/core.pot b/l10n/templates/core.pot
index 94749ff90c5..3bba1296947 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 3f8c9bcd765..7adfeb95da1 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 5fa921b478f..2d341eb565c 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 57acac707cc..8a993abc4bf 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 2c46f6bac7a..43bd6b45e91 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index f1f574596cb..e75d735984e 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 70596151d88..8e1741c07d6 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 1090f6ab6d6..b3ba8672954 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 3c0326285e7..af19f30661d 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c992afe6c8f..2efc1482e8d 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 11102d14b00..0b50fd56cdb 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 0a434a5797a..de6a8934a69 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-18 01:54-0400\n"
+"POT-Creation-Date: 2014-10-19 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 8b26272e6e6..7cf556cab9f 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -23,6 +23,7 @@ $TRANSLATIONS = array(
 "Updated" => "Оновлено",
 "Very weak password" => "Дуже слабкий пароль",
 "Weak password" => "Слабкий пароль",
+"So-so password" => "Такий собі пароль",
 "Good password" => "Добрий пароль",
 "Strong password" => "Надійний пароль",
 "Delete" => "Видалити",
-- 
GitLab


From e318858152683b23bac6bc646c557c2420bee2cf Mon Sep 17 00:00:00 2001
From: jknockaert <jasper@knockaert.nl>
Date: Sun, 19 Oct 2014 22:27:15 +0200
Subject: [PATCH 152/616] rework getFileSize

---
 apps/files_encryption/lib/util.php | 73 ++++++++++++++++++------------
 1 file changed, 45 insertions(+), 28 deletions(-)

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 33c2f88b0fd..3cf83703295 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -385,15 +385,24 @@ class Util {
 			&& $this->isEncryptedPath($path)
 		) {
 
-			$offset = 0;
+			$cipher = Helper::getCipher();
+			$realSize = 0;
+
+			// get the size from filesystem
+			$size = $this->view->filesize($path);
+
+			// open stream
+			$stream = fopen($path, "r");
+
+			// if the file contains a encryption header we
+			// we set the cipher
+			// and we update the size
 			if ($this->containHeader($path)) {
-				$offset = Crypt::BLOCKSIZE;
+				$header = fread($stream,Crypt::BLOCKSIZE);
+				$cipher = Crypt::getCipher($header);
+				$size -= Crypt::BLOCKSIZE;
 			}
 
-			// get the size from filesystem if the file contains a encryption header we
-			// we substract it
-			$size = $this->view->filesize($path) - $offset;
-
 			// fast path, else the calculation for $lastChunkNr is bogus
 			if ($size === 0) {
 				\OC_FileProxy::$enabled = $proxyStatus;
@@ -403,37 +412,45 @@ class Util {
 			// calculate last chunk nr
 			// next highest is end of chunks, one subtracted is last one
 			// we have to read the last chunk, we can't just calculate it (because of padding etc)
-			$lastChunkNr = ceil($size/ Crypt::BLOCKSIZE) - 1;
-			$lastChunkSize = $size - ($lastChunkNr * Crypt::BLOCKSIZE);
-
-			// open stream
-			$stream = fopen('crypt://' . $path, "r");
+			$lastChunkNr = ceil($size/Crypt::BLOCKSIZE)-1;
 
 			if (is_resource($stream)) {
 				// calculate last chunk position
-				$lastChunckPos = ($lastChunkNr * Crypt::BLOCKSIZE);
+				$lastChunkPos = ($lastChunkNr * Crypt::BLOCKSIZE);
 
-				// seek to end
-				if (@fseek($stream, $lastChunckPos) === -1) {
-					// storage doesn't support fseek, we need a local copy
-					fclose($stream);
-					$localFile = $this->view->getLocalFile($path);
-					Helper::addTmpFileToMapper($localFile, $path);
-					$stream = fopen('crypt://' . $localFile, "r");
-					if (fseek($stream, $lastChunckPos) === -1) {
-						// if fseek also fails on the local storage, than
-						// there is nothing we can do
-						fclose($stream);
-						\OCP\Util::writeLog('Encryption library', 'couldn\'t determine size of "' . $path, \OCP\Util::ERROR);
-						return $result;
+				// get the content of the last chunk
+				$lastChunkContentEncrypted='';
+				$count=Crypt::BLOCKSIZE;
+				if (@fseek($stream, $lastChunkPos, SEEK_CUR) === 0) {
+					$realSize+=$lastChunkNr*6126;
+					while ($count>0) {
+						$data=fread($stream,Crypt::BLOCKSIZE);
+						$count=strlen($data);
+						$lastChunkContentEncrypted.=$data;
+					}
+				} else {
+					while ($count>0) {
+						if(strlen($lastChunkContentEncrypted)>Crypt::BLOCKSIZE) {
+							$realSize+=6126;
+							$lastChunkContentEncrypted=substr($lastChunkContentEncrypted,Crypt::BLOCKSIZE);
+						}
+						$data=fread($stream,Crypt::BLOCKSIZE);
+						$count=strlen($data);
+						$lastChunkContentEncrypted.=$data;
 					}
 				}
 
-				// get the content of the last chunk
-				$lastChunkContent = fread($stream, $lastChunkSize);
+				$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+				$privateKey = $session->getPrivateKey();
+				$plainKeyfile = $this->decryptKeyfile($path, $privateKey);
+				$shareKey = Keymanager::getShareKey($this->view, $this->keyId, $this, $path);
+
+				$plainKey = Crypt::multiKeyDecrypt($plainKeyfile, $shareKey, $privateKey);
+				
+				$lastChunkContent=Crypt::symmetricDecryptFileContent($lastChunkContentEncrypted, $plainKey, $cipher);
 
 				// calc the real file size with the size of the last chunk
-				$realSize = (($lastChunkNr * 6126) + strlen($lastChunkContent));
+				$realSize += strlen($lastChunkContent);
 
 				// store file size
 				$result = $realSize;
-- 
GitLab


From 3be57d0169eaa2bc95f25c3ed070bdc9940a1531 Mon Sep 17 00:00:00 2001
From: jknockaert <jasper@knockaert.nl>
Date: Sun, 19 Oct 2014 22:54:34 +0200
Subject: [PATCH 153/616] small fix

---
 apps/files_encryption/lib/util.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 3cf83703295..410d3dd1255 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -398,7 +398,8 @@ class Util {
 			// we set the cipher
 			// and we update the size
 			if ($this->containHeader($path)) {
-				$header = fread($stream,Crypt::BLOCKSIZE);
+				$data = fread($stream,Crypt::BLOCKSIZE);
+				$header = Crypt::parseHeader($data);
 				$cipher = Crypt::getCipher($header);
 				$size -= Crypt::BLOCKSIZE;
 			}
-- 
GitLab


From 1b7e9d66b31553f6a257638c868fd16f1a8e8e4b Mon Sep 17 00:00:00 2001
From: jknockaert <jasper@knockaert.nl>
Date: Mon, 20 Oct 2014 00:28:41 +0200
Subject: [PATCH 154/616] ok; still some bugs that had to be fixed

---
 apps/files_encryption/lib/util.php | 74 ++++++++++++++----------------
 1 file changed, 35 insertions(+), 39 deletions(-)

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 410d3dd1255..75cf78c5f94 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -392,59 +392,55 @@ class Util {
 			$size = $this->view->filesize($path);
 
 			// open stream
-			$stream = fopen($path, "r");
-
-			// if the file contains a encryption header we
-			// we set the cipher
-			// and we update the size
-			if ($this->containHeader($path)) {
-				$data = fread($stream,Crypt::BLOCKSIZE);
-				$header = Crypt::parseHeader($data);
-				$cipher = Crypt::getCipher($header);
-				$size -= Crypt::BLOCKSIZE;
-			}
+			$stream = $this->view->fopen($path, "r");
 
-			// fast path, else the calculation for $lastChunkNr is bogus
-			if ($size === 0) {
-				\OC_FileProxy::$enabled = $proxyStatus;
-				return 0;
-			}
+			if (is_resource($stream)) {
 
-			// calculate last chunk nr
-			// next highest is end of chunks, one subtracted is last one
-			// we have to read the last chunk, we can't just calculate it (because of padding etc)
-			$lastChunkNr = ceil($size/Crypt::BLOCKSIZE)-1;
+				// if the file contains a encryption header we
+				// we set the cipher
+				// and we update the size
+				if ($this->containHeader($path)) {
+					$data = fread($stream,Crypt::BLOCKSIZE);
+					$header = Crypt::parseHeader($data);
+					$cipher = Crypt::getCipher($header);
+					$size -= Crypt::BLOCKSIZE;
+				}
+
+				// fast path, else the calculation for $lastChunkNr is bogus
+				if ($size === 0) {
+					\OC_FileProxy::$enabled = $proxyStatus;
+					return 0;
+				}
+
+				// calculate last chunk nr
+				// next highest is end of chunks, one subtracted is last one
+				// we have to read the last chunk, we can't just calculate it (because of padding etc)
+				$lastChunkNr = ceil($size/Crypt::BLOCKSIZE)-1;
 
-			if (is_resource($stream)) {
 				// calculate last chunk position
 				$lastChunkPos = ($lastChunkNr * Crypt::BLOCKSIZE);
 
 				// get the content of the last chunk
-				$lastChunkContentEncrypted='';
-				$count=Crypt::BLOCKSIZE;
 				if (@fseek($stream, $lastChunkPos, SEEK_CUR) === 0) {
 					$realSize+=$lastChunkNr*6126;
-					while ($count>0) {
-						$data=fread($stream,Crypt::BLOCKSIZE);
-						$count=strlen($data);
-						$lastChunkContentEncrypted.=$data;
-					}
-				} else {
-					while ($count>0) {
-						if(strlen($lastChunkContentEncrypted)>Crypt::BLOCKSIZE) {
-							$realSize+=6126;
-							$lastChunkContentEncrypted=substr($lastChunkContentEncrypted,Crypt::BLOCKSIZE);
-						}
-						$data=fread($stream,Crypt::BLOCKSIZE);
-						$count=strlen($data);
-						$lastChunkContentEncrypted.=$data;
+				}
+				$lastChunkContentEncrypted='';
+				$count=Crypt::BLOCKSIZE;
+				while ($count>0) {
+					$data=fread($stream,Crypt::BLOCKSIZE);
+					$count=strlen($data);
+					$lastChunkContentEncrypted.=$data;
+					if(strlen($lastChunkContentEncrypted)>Crypt::BLOCKSIZE) {
+						$realSize+=6126;
+						$lastChunkContentEncrypted=substr($lastChunkContentEncrypted,Crypt::BLOCKSIZE);
 					}
 				}
 
+				$relPath = \OCA\Encryption\Helper::stripUserFilesPath($path);
 				$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
 				$privateKey = $session->getPrivateKey();
-				$plainKeyfile = $this->decryptKeyfile($path, $privateKey);
-				$shareKey = Keymanager::getShareKey($this->view, $this->keyId, $this, $path);
+				$plainKeyfile = $this->decryptKeyfile($relPath, $privateKey);
+				$shareKey = Keymanager::getShareKey($this->view, $this->keyId, $this, $relPath);
 
 				$plainKey = Crypt::multiKeyDecrypt($plainKeyfile, $shareKey, $privateKey);
 				
-- 
GitLab


From 87da62072b6df177bceb0c78c350458e0df86d0a Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 20 Oct 2014 01:54:34 -0400
Subject: [PATCH 155/616] [tx-robot] updated from transifex

---
 apps/files/l10n/uk.php              |  12 ++-
 apps/files_encryption/l10n/fr.php   |   6 ++
 apps/files_encryption/l10n/uk.php   |   1 +
 apps/files_external/l10n/uk.php     |   1 +
 apps/files_sharing/l10n/uk.php      |  23 ++++-
 apps/user_ldap/l10n/bg_BG.php       |   4 +
 apps/user_ldap/l10n/fr.php          |   4 +
 apps/user_ldap/l10n/uk.php          |  71 +++++++++++++-
 apps/user_webdavauth/l10n/uk.php    |   1 +
 core/l10n/bg_BG.php                 |   1 +
 core/l10n/fr.php                    |   1 +
 core/l10n/hu_HU.php                 |  13 +++
 core/l10n/uk.php                    |  24 ++++-
 l10n/templates/core.pot             |   2 +-
 l10n/templates/files.pot            |   2 +-
 l10n/templates/files_encryption.pot |   2 +-
 l10n/templates/files_external.pot   |   2 +-
 l10n/templates/files_sharing.pot    |   2 +-
 l10n/templates/files_trashbin.pot   |   2 +-
 l10n/templates/files_versions.pot   |   2 +-
 l10n/templates/lib.pot              |   2 +-
 l10n/templates/private.pot          |   2 +-
 l10n/templates/settings.pot         |   2 +-
 l10n/templates/user_ldap.pot        |   2 +-
 l10n/templates/user_webdavauth.pot  |   2 +-
 lib/l10n/bg_BG.php                  |   1 +
 lib/l10n/fr.php                     |   1 +
 lib/l10n/uk.php                     |   1 +
 settings/l10n/bg_BG.php             |   8 ++
 settings/l10n/fr.php                |   8 ++
 settings/l10n/uk.php                | 140 ++++++++++++++++++++++++++++
 31 files changed, 325 insertions(+), 20 deletions(-)

diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 626c713eca5..866097faba6 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -5,17 +5,21 @@ $TRANSLATIONS = array(
 "Unknown error" => "Невідома помилка",
 "Could not move %s - File with this name already exists" => "Не вдалося перемістити %s - Файл з таким ім'ям вже існує",
 "Could not move %s" => "Не вдалося перемістити %s",
+"Permission denied" => "Доступ заборонено",
 "File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
 "\"%s\" is an invalid file name." => "\"%s\" - це некоректне ім'я файлу.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
 "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. Оберіть інше ім'я.",
+"Not a valid source" => "Недійсне джерело",
 "Server is not allowed to open URLs, please check the server configuration" => "Серверу заборонено відкривати посилання, перевірте конфігурацію",
+"The file exceeds your quota by %s" => "Файл перевищує вашу квоту на %s",
 "Error while downloading %s to %s" => "Помилка завантаження %s до %s",
 "Error when creating the file" => "Помилка створення файлу",
 "Folder name cannot be empty." => "Ім'я теки не може бути порожнім.",
 "Error when creating the folder" => "Помилка створення теки",
 "Unable to set upload directory." => "Не вдалося встановити каталог завантаження.",
+"Invalid Token" => "Невірний Маркер",
 "No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
 "There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ",
@@ -56,8 +60,8 @@ $TRANSLATIONS = array(
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
-"_%n folder_::_%n folders_" => array("%n тека","%n тека","%n теки"),
-"_%n file_::_%n files_" => array("%n файл","%n файлів","%n файли"),
+"_%n folder_::_%n folders_" => array("%n тека","%n тек","%n тек"),
+"_%n file_::_%n files_" => array("%n файл","%n файлів","%n файлів"),
 "You don’t have permission to upload or create files here" => "У вас недостатньо прав для завантаження або створення файлів тут",
 "_Uploading %n file_::_Uploading %n files_" => array("Завантаження %n файлу","Завантаження %n файлів","Завантаження %n файлів"),
 "\"{name}\" is an invalid file name." => "\"{name}\" - некоректне ім'я файлу.",
@@ -66,11 +70,13 @@ $TRANSLATIONS = array(
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
 "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
 "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.",
+"{dirs} and {files}" => "{dirs} і {files}",
+"%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: " => "макс.можливе:",
+"max. possible: " => "макс. можливе:",
 "Save" => "Зберегти",
 "WebDAV" => "WebDAV",
 "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Для доступу до файлів через WebDAV використовуйте <a href=\"%s\" target=\"_blank\">це посилання</a>",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 44919fbc0a3..8c3e0ded613 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Erreur Inconnue ",
+"Missing recovery key password" => "Clef de de récupération de mot de passe manquante",
+"Please repeat the recovery key password" => "Répétez le mot de passe de la clé de récupération",
+"Repeated recovery key password does not match the provided recovery key password" => "Le mot de passe répété de la clé de récupération ne correspond pas au mot de passe de la clé de récupération donné",
 "Recovery key successfully enabled" => "Clé de récupération activée avec succès",
 "Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
 "Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
+"Please provide the old recovery password" => "Veuillez entrer l'ancien mot de passe de récupération",
+"Please provide a new recovery password" => "Veuillez entrer un nouveau mot de passe de récupération",
+"Please repeat the new recovery password" => "Veuillez répéter le nouveau mot de passe de récupération",
 "Password successfully changed." => "Mot de passe changé avec succès ",
 "Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
 "Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index a2f67ebec75..42c6cd39a61 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -3,6 +3,7 @@ $TRANSLATIONS = array(
 "Unknown error" => "Невідома помилка",
 "Encryption" => "Шифрування",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+"Enabled" => "Увімкнено",
 "Change Password" => "Змінити Пароль"
 );
 $PLURAL_FORMS = "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/uk.php b/apps/files_external/l10n/uk.php
index 4a761d5c676..7ad93be519a 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -19,6 +19,7 @@ $TRANSLATIONS = array(
 "Grant access" => "Дозволити доступ",
 "Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive",
 "Personal" => "Особисте",
+"Saved" => "Збереженно",
 "You don't have any external storages" => "У вас немає зовнішніх сховищ",
 "Name" => "Ім'я",
 "Storage type" => "Тип сховища",
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
index 48297bcf2b3..da1fe1acdd1 100644
--- a/apps/files_sharing/l10n/uk.php
+++ b/apps/files_sharing/l10n/uk.php
@@ -1,19 +1,40 @@
 <?php
 $TRANSLATIONS = array(
+"Server to server sharing is not enabled on this server" => "На даному сервері вимкнута можливість передачі даних між серверами",
+"The mountpoint name contains invalid characters." => "Ім'я точки монтування містить неприпустимі символи.",
+"Invalid or untrusted SSL certificate" => "Недійсній або не довірений SSL-сертифікат",
+"Couldn't add remote share" => "Неможливо додати віддалену загальну теку",
+"Shared with you" => "Доступне для вас",
+"Shared with others" => "Доступне для інших",
+"Shared by link" => "Доступне за посиланням",
+"No files have been shared with you yet." => "Доступні для вас файли відсутні.",
+"You haven't shared any files yet." => "Ви не маєте загальнодоступних файлів.",
+"You haven't shared any files by link yet." => "Ви ще не відкрили доступ за посиланням для жодного з файлів.",
+"Do you want to add the remote share {name} from {owner}@{remote}?" => "Додати віддалену загальну теку {name} з {owner}@{remote}?",
+"Remote share" => "Віддалена загальна тека",
+"Remote share password" => "Пароль для віддаленої загальної теки",
 "Cancel" => "Відмінити",
+"Add remote share" => "Додати віддалену загальну теку",
+"No ownCloud installation found at {remote}" => "Не знайдено ownCloud на {remote}",
+"Invalid ownCloud url" => "Невірний ownCloud URL",
 "Shared by" => "Опубліковано",
 "This share is password-protected" => "Цей ресурс обміну захищений паролем",
 "The password is wrong. Try again." => "Невірний пароль. Спробуйте ще раз.",
 "Password" => "Пароль",
 "Name" => "Ім'я",
+"Share time" => "Дата публікації",
 "Sorry, this link doesn’t seem to work anymore." => "На жаль, посилання більше не працює.",
 "Reasons might be:" => "Можливі причини:",
 "the item was removed" => "цей пункт був вилучений",
 "the link expired" => "посилання застаріло",
 "sharing is disabled" => "обмін заборонений",
 "For more info, please ask the person who sent this link." => "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.",
+"Add to your ownCloud" => "Додати до вашого ownCloud",
 "Download" => "Завантажити",
 "Download %s" => "Завантажити %s",
-"Direct link" => "Пряме посилання"
+"Direct link" => "Пряме посилання",
+"Remote Shares" => "Віддалені загальні теки",
+"Allow other instances to mount public links shared from this server" => "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері",
+"Allow users to mount public link shares" => "Дозволити користувачам монтувати монтувати посилання на загальні теки"
 );
 $PLURAL_FORMS = "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_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
index dfd9db5438b..9873a7d1f5c 100644
--- a/apps/user_ldap/l10n/bg_BG.php
+++ b/apps/user_ldap/l10n/bg_BG.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Промени raw филтъра",
 "Raw LDAP filter" => "Raw LDAP филтър",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
+"Test Filter" => "Тестов Филтър",
 "groups found" => "открити групи",
 "Users login with this attribute:" => "Потребителски профили с този атрибут:",
 "LDAP Username:" => "LDAP Потребителско Име:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "За анонимен достъп, остави DN и Парола празни.",
 "One Base DN per line" => "По един Base DN на ред",
 "You can specify Base DN for users and groups in the Advanced tab" => "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.",
+"Manually enter LDAP filters (recommended for large directories)" => "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
 "Limit %s access to users meeting these criteria:" => "Ограничи достъпа на %s до потребители покриващи следните критерии:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
 "users found" => "открити потребители",
+"Saving" => "Записване",
 "Back" => "Назад",
 "Continue" => "Продължи",
 "Expert" => "Експерт",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 7083cbb2906..8d515fe5a15 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Éditer le filtre raw à la place",
 "Raw LDAP filter" => "Filtre Raw LDAP",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Le filtre spécifie quels groupes LDAP doivent avoir accès à l'instance %s.",
+"Test Filter" => "Filtre de test",
 "groups found" => "groupes trouvés",
 "Users login with this attribute:" => "Utilisateurs se connectant avec cet attribut :",
 "LDAP Username:" => "Nom d'utilisateur LDAP :",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
 "One Base DN per line" => "Un DN racine par ligne",
 "You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Évite les requêtes LDAP automatiques. Mieux pour les grosses installations, mais demande des connaissances en LDAP.",
+"Manually enter LDAP filters (recommended for large directories)" => "Entrée manuelle des filtres LDAP (recommandé pour les gros dossiers)",
 "Limit %s access to users meeting these criteria:" => "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
 "users found" => "utilisateurs trouvés",
+"Saving" => "Enregistrement...",
 "Back" => "Retour",
 "Continue" => "Poursuivre",
 "Expert" => "Expert",
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
index 19d37a282b7..7259fc8ba13 100644
--- a/apps/user_ldap/l10n/uk.php
+++ b/apps/user_ldap/l10n/uk.php
@@ -1,26 +1,63 @@
 <?php
 $TRANSLATIONS = array(
+"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." => "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.",
+"The configuration is invalid. Please have a look at the logs for further details." => "Конфігурація є недійсною. Будь ласка, дивіться журнали для отримання додаткової інформації.",
+"No action specified" => "Ніяких дій не вказано",
+"No configuration specified" => "Немає конфігурації",
+"No data specified" => "Немає даних",
+" Could not set configuration %s" => "Не вдалося встановити конфігурацію %s",
 "Deletion failed" => "Видалення не було виконано",
 "Take over settings from recent server configuration?" => "Застосувати налаштування  з останньої конфігурації сервера ?",
 "Keep settings?" => "Зберегти налаштування ?",
+"{nthServer}. Server" => "{nthServer}. Сервер",
 "Cannot add server configuration" => "Неможливо додати конфігурацію сервера",
+"mappings cleared" => "відображення очищається",
 "Success" => "Успіх",
 "Error" => "Помилка",
+"Please specify a Base DN" => "Введіть Base DN",
+"Could not determine Base DN" => "Не вдалося визначити Base DN",
+"Please specify the port" => "Будь ласка, вкажіть порт",
+"Configuration OK" => "Конфігурація OK",
+"Configuration incorrect" => "Невірна конфігурація",
+"Configuration incomplete" => "Конфігурація неповна",
 "Select groups" => "Оберіть групи",
+"Select object classes" => "Виберіть класи об'єктів",
+"Select attributes" => "Виберіть атрибути",
 "Connection test succeeded" => "Перевірка з'єднання пройшла успішно",
 "Connection test failed" => "Перевірка з'єднання завершилась неуспішно",
 "Do you really want to delete the current Server Configuration?" => "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
 "Confirm Deletion" => "Підтвердіть Видалення",
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
+"_%s group found_::_%s groups found_" => array(" %s група знайдена "," %s груп знайдено ","%s груп знайдено "),
+"_%s user found_::_%s users found_" => array("%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"),
+"Could not find the desired feature" => "Не вдалося знайти потрібну функцію",
+"Invalid Host" => "Невірний Host",
+"Server" => "Сервер",
+"User Filter" => "Користувацький Фільтр",
+"Login Filter" => "Фільтр Входу",
 "Group Filter" => "Фільтр Груп",
 "Save" => "Зберегти",
 "Test Configuration" => "Тестове налаштування",
 "Help" => "Допомога",
+"Groups meeting these criteria are available in %s:" => "Групи, що відповідають цим критеріям доступні в %s:",
+"only those object classes:" => "тільки ці об'єктні класи:",
+"only from those groups:" => "тільки з цих груп:",
+"Edit raw filter instead" => "Редагувати початковий фільтр",
+"Raw LDAP filter" => "Початковий LDAP фільтр",
+"The filter specifies which LDAP groups shall have access to the %s instance." => "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
+"Test Filter" => "Тест Фільтр",
+"groups found" => "знайдені групи",
+"Users login with this attribute:" => "Вхід користувачів з цим атрибутом:",
+"LDAP Username:" => "LDAP Ім’я користувача:",
+"LDAP Email Address:" => "LDAP E-mail адрес:",
+"Other Attributes:" => "Інші Атрібути:",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"",
+"1. Server" => "1. Сервер",
+"%s. Server:" => "%s. Сервер:",
 "Add Server Configuration" => "Додати налаштування Сервера",
+"Delete Configuration" => "Видалити Конфігурацію",
 "Host" => "Хост",
 "You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
 "Port" => "Порт",
@@ -30,9 +67,17 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Для анонімного доступу, залиште DN і Пароль порожніми.",
 "One Base DN per line" => "Один Base DN на одній строчці",
 "You can specify Base DN for users and groups in the Advanced tab" => "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Уникати автоматичні запити LDAP. Краще для великих установок, але вимагає деякого LDAP знання.",
+"Manually enter LDAP filters (recommended for large directories)" => "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)",
+"Limit %s access to users meeting these criteria:" => "Обмежити %s доступ до користувачів, що відповідають цим критеріям:",
+"The filter specifies which LDAP users shall have access to the %s instance." => "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.",
+"users found" => "користувачів знайдено",
+"Saving" => "Збереження",
 "Back" => "Назад",
 "Continue" => "Продовжити",
+"Expert" => "Експерт",
 "Advanced" => "Додатково",
+"<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
 "Connection Settings" => "Налаштування З'єднання",
 "Configuration Active" => "Налаштування Активне",
@@ -41,26 +86,46 @@ $TRANSLATIONS = array(
 "Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера.",
 "Backup (Replica) Port" => "Порт сервера для резервних копій",
 "Disable Main Server" => "Вимкнути Головний Сервер",
+"Only connect to the replica server." => "Підключити тільки до сервера реплік.",
+"Case insensitive LDAP server (Windows)" => "Без урахування регістра LDAP сервер (Windows)",
 "Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.",
+"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Не рекомендується, використовувати його тільки для тестування!\nЯкщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший %s сервер.",
 "Cache Time-To-Live" => "Час актуальності Кеша",
 "in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.",
 "Directory Settings" => "Налаштування Каталога",
 "User Display Name Field" => "Поле, яке відображає Ім'я Користувача",
+"The LDAP attribute to use to generate the user's display name." => "Атрибут LDAP, який використовується для генерації імен користувачів.",
 "Base User Tree" => "Основне Дерево Користувачів",
 "One User Base DN per line" => "Один Користувач Base DN на одній строчці",
 "User Search Attributes" => "Пошукові Атрибути Користувача",
 "Optional; one attribute per line" => "Додатково; один атрибут на строчку",
 "Group Display Name Field" => "Поле, яке відображає Ім'я Групи",
+"The LDAP attribute to use to generate the groups's display name." => "Атрибут LDAP, який використовується для генерації імен груп.",
 "Base Group Tree" => "Основне Дерево Груп",
 "One Group Base DN per line" => "Одна Група Base DN на одній строчці",
 "Group Search Attributes" => "Пошукові Атрибути Групи",
 "Group-Member association" => "Асоціація Група-Член",
+"Nested Groups" => "Вкладені Групи",
+"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "При включенні, групи, які містять групи підтримуються. (Працює тільки якщо атрибут члена групи містить DNS.)",
+"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.)" => "Підкачка використовується для сторінкових пошуків LDAP, які можуть повертати громіздкі результати кількісті користувачів або груп. (Установка його 0 відключає вивантаженя пошуку LDAP в таких ситуаціях.)",
 "Special Attributes" => "Спеціальні Атрибути",
 "Quota Field" => "Поле Квоти",
 "Quota Default" => "Квота за замовчанням",
 "in bytes" => "в байтах",
 "Email Field" => "Поле Ел. пошти",
 "User Home Folder Naming Rule" => "Правило іменування домашньої теки користувача",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
+"Internal Username" => "Внутрішня Ім'я користувача",
+"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." => "За замовчуванням внутрішнє ім'я користувача буде створено з атрибуту UUID. Таким чином ім'я користувача є унікальним і не потребує перетворення символів. Внутрішнє ім'я користувача може складатися лише з наступних символів: [A-Za-z0-9 _ @ -.]. Інші символи заміняються відповідними з таблиці ASCII або пропускаються. При збігу до імені буде додано або збільшено число. Внутрішнє ім'я користувача використовується для внутрішньої ідентифікації користувача. Це також ім'я за замовчуванням для домашньої теки користувача та частина віддалених URL, наприклад, для всіх сервісів *DAV. За допомогою цієї установки можна змінити поведінку за замовчуванням. Для досягнення поведінки, що була до OwnCloud 5, введіть атрибут ім'я користувача, що відображається,  в наступне поле. Залиште порожнім для режиму за замовчуванням. Зміни будуть діяти тільки для нових підключень (доданих) користувачів LDAP.",
+"Internal Username Attribute:" => "Внутрішня Ім'я користувача, Атрибут:",
+"Override UUID detection" => "Перекрити вивід 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." => "За замовчуванням ownCloud визначає атрибут UUID автоматично. Цей атрибут використовується для того, щоб достовірно ідентифікувати користувачів і групи LDAP. Також на підставі атрибута UUID створюється внутрішнє ім'я користувача, якщо вище не вказано інакше. Ви можете перевизначити це налаштування та вказати свій атрибут за вибором. Ви повинні упевнитися, що обраний вами атрибут може бути вибраний для користувачів і груп, а також те, що він унікальний. Залиште поле порожнім для поведінки за замовчуванням. Зміни вступлять в силу тільки для нових підключених (доданих) користувачів і груп LDAP.",
+"UUID Attribute for Users:" => "UUID Атрибут для користувачів:",
+"UUID Attribute for Groups:" => "UUID Атрибут для груп:",
+"Username-LDAP User Mapping" => "Картографія Імен користувачів-LDAP ",
+"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." => "ownCloud використовує імена користувачів для зберігання і призначення метаданих. Для точної ідентифікації і розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатору UUID користувача LDAP. Крім цього кешується розрізнювальне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо розрізнювальне ім'я було змінене, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується скрізь в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язано до конфігурації, він вплине на всі LDAP-підключення! Ні в якому разі не рекомендується скидати прив'язки, якщо система вже знаходиться в експлуатації, тільки на етапі тестування.",
+"Clear Username-LDAP User Mapping" => "Очистити картографію Імен користувачів-LDAP",
+"Clear Groupname-LDAP Group Mapping" => "Очистити картографію Імен груп-LDAP"
 );
 $PLURAL_FORMS = "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.php b/apps/user_webdavauth/l10n/uk.php
index b548b01951b..1b1463e5b75 100644
--- a/apps/user_webdavauth/l10n/uk.php
+++ b/apps/user_webdavauth/l10n/uk.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "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, як неправильні облікові дані, а всі інші відповіді, вважатимуться правильними."
 );
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
index 70eb05afd16..717eba17d6c 100644
--- a/core/l10n/bg_BG.php
+++ b/core/l10n/bg_BG.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здрасти,\n\nсамо да те уведомя, че %s сподели %s с теб.\nРазгледай го: %s\n\n",
 "The share will expire on %s." => "Споделянето ще изтече на %s.",
 "Cheers!" => "Поздрави!",
+"Internal Server Error" => "Вътрешна системна грешка",
 "The server encountered an internal error and was unable to complete your request." => "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
 "More details can be found in the server log." => "Допълнителна информация може да бъде открита в сървърните доклади.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 861fb4d54f6..ea6736a1648 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Bonjour,\n\nNous vous informons que %s a partagé %s avec vous.\nConsultez-le : %s\n",
 "The share will expire on %s." => "Le partage expirera le %s.",
 "Cheers!" => "À bientôt !",
+"Internal Server Error" => "Erreur interne du serveur",
 "The server encountered an internal error and was unable to complete your request." => "Le serveur a rencontré une erreur interne et est incapable d'exécuter votre requête.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Veuillez contacter l'administrateur du serveur si cette erreur apparaît plusieurs fois. Veuillez joindre les détails techniques à votre rapport.",
 "More details can be found in the server log." => "Le fichier journal du serveur peut fournir plus de renseignements.",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index f9d5f012e9a..b5e28333cc9 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -68,6 +68,7 @@ $TRANSLATIONS = array(
 "Strong password" => "Erős jelszó",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
 "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." => "A kiszolgálónak nem működik az internetkapcsolata. Ez azt jelenti, hogy bizonyos funkciók nem fognak működni, mint pl. külső tárolók becsatolása, automatikus frissítési értesítések vagy más fejlesztők /3rd party/ által írt alkalmazások telepítése. Az állományok távolról történő elérése valamint e-mail értesítések küldése szintén lehet, hogy nem fog működni. Javasoljuk, hogy engedélyezze a kiszolgáló internetelérését, ha az összes funkciót szeretné használni.",
+"Error occurred while checking server setup" => "Hiba történt a szerver beállítások ellenőrzése közben",
 "Shared" => "Megosztott",
 "Shared with {recipients}" => "Megosztva ővelük: {recipients}",
 "Share" => "Megosztás",
@@ -87,6 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "Küldjük el",
 "Set expiration date" => "Legyen lejárati idő",
 "Expiration date" => "A lejárati idő",
+"Adding user..." => "Felhasználó hozzáadása...",
 "group" => "csoport",
 "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",
@@ -142,9 +144,20 @@ $TRANSLATIONS = array(
 "Error favoriting" => "Hiba a kedvencekhez adáskor",
 "Error unfavoriting" => "Hiba a kedvencekből törléskor",
 "Access forbidden" => "A hozzáférés nem engedélyezett",
+"File not found" => "Fájl nem található",
+"The specified document has not been found on the server." => "A meghatározott dokumentum nem található a szerveren.",
+"You can click here to return to %s." => "Ide kattintva visszatérhetsz ide: %s.",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
 "The share will expire on %s." => "A megosztás lejár ekkor %s",
 "Cheers!" => "Üdv.",
+"Internal Server Error" => "Belső szerver hiba",
+"Technical details" => "Technikai adatok",
+"Remote Address: %s" => "Távoli cím: %s",
+"Request ID: %s" => "Kérelem azonosító: %s",
+"Code: %s" => "Kód: %s",
+"Message: %s" => "Üzenet: %s",
+"File: %s" => "Fájl: %s",
+"Line: %s" => "Sor: %s",
 "Security Warning" => "Biztonsági figyelmeztetés",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index baebf63cae0..591198fd7d9 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -113,9 +113,13 @@ $TRANSLATIONS = array(
 "Edit tags" => "Редагувати теги",
 "Error loading dialog template: {error}" => "Помилка при завантаженні шаблону діалогу: {error}",
 "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. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
+"Couldn't reset password because the token is invalid" => "Неможливо скинути пароль, бо маркер є недійсним",
+"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 пароль скинуто",
 "Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
 "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
@@ -147,9 +151,12 @@ $TRANSLATIONS = array(
 "The share will expire on %s." => "Доступ до спільних даних вичерпається %s.",
 "Cheers!" => "Будьмо!",
 "Internal Server Error" => "Внутрішня помилка серверу",
+"The server encountered an internal error and was unable to complete your request." => "На сервері сталася внутрішня помилка, тому він не зміг виконати ваш запит.",
+"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Будь ласка, зверніться до адміністратора сервера, якщо ця помилка з'являється кілька разів, будь ласка, вкажіть технічні подробиці нижче в звіті.",
 "More details can be found in the server log." => "Більше деталей може бути в журналі серверу.",
 "Technical details" => "Технічні деталі",
 "Remote Address: %s" => "Віддалена Адреса: %s",
+"Request ID: %s" => "Запит ID: %s",
 "Code: %s" => "Код: %s",
 "Message: %s" => "Повідомлення: %s",
 "File: %s" => "Файл: %s",
@@ -165,17 +172,21 @@ $TRANSLATIONS = array(
 "Storage & database" => "Сховище і база даних",
 "Data folder" => "Каталог даних",
 "Configure the database" => "Налаштування бази даних",
+"Only %s is available." => "Тільки %s доступно.",
 "Database user" => "Користувач бази даних",
 "Database password" => "Пароль для бази даних",
 "Database name" => "Назва бази даних",
 "Database tablespace" => "Таблиця бази даних",
 "Database host" => "Хост бази даних",
+"SQLite will be used as database. For larger installations we recommend to change this." => "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
 "Finish setup" => "Завершити налаштування",
 "Finishing …" => "Завершується ...",
+"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
 "%s is available. Get more information on how to update." => "%s доступний. Отримай більше інформації про те, як оновити.",
 "Log out" => "Вихід",
 "Server side authentication failed!" => "Помилка аутентифікації на боці Сервера !",
 "Please contact your administrator." => "Будь ласка, зверніться до вашого Адміністратора.",
+"Forgot your password? Reset it!" => "Забули ваш пароль? Скиньте його!",
 "remember" => "запам'ятати",
 "Log in" => "Вхід",
 "Alternative Logins" => "Альтернативні Логіни",
@@ -184,6 +195,17 @@ $TRANSLATIONS = array(
 "This means only administrators can use the instance." => "Це означає, що лише адміністратори можуть використовувати цей екземпляр.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Зверніться до системного адміністратора, якщо це повідомлення зберігається або з'являєтья несподівано.",
 "Thank you for your patience." => "Дякуємо за ваше терпіння.",
-"Start update" => "Почати оновлення"
+"You are accessing the server from an untrusted domain." => "Ви зайшли на сервер з ненадійного домену.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходится в файлі config/config.sample.php.",
+"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
+"Add \"%s\" as trusted domain" => "Додати \"%s\" як довірений",
+"%s will be updated to version %s." => "%s буде оновлено до версії %s.",
+"The following apps will be disabled:" => "Наступні додатки будуть відключені:",
+"The theme %s has been disabled." => "Тему %s було вимкнено.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Перш ніж продовжити, будь ласка, переконайтеся, що база даних, папка конфігурації і папка даних були дубльовані.",
+"Start update" => "Почати оновлення",
+"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Щоб уникнути великих таймаутів з більш тяжкими встановленнями, ви можете виконати наступну команду відносно директорії встановлення:",
+"This %s instance is currently being updated, which may take a while." => "Цей %s екземпляр нині оновлюється, що може зайняти деякий час.",
+"This page will refresh itself when the %s instance is available again." => "Ця сторінка автоматично перезавантажиться коли екземпляр %s стане знову доступний."
 );
 $PLURAL_FORMS = "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/l10n/templates/core.pot b/l10n/templates/core.pot
index 3bba1296947..5829a00e76b 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 7adfeb95da1..e7e1feaecc4 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 2d341eb565c..ee9c156693f 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 8a993abc4bf..fcb737cf643 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 43bd6b45e91..cb49d8aa143 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index e75d735984e..522777c38ac 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 8e1741c07d6..0636d381a88 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index b3ba8672954..69e8f167803 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index af19f30661d..6c14b1f749d 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 2efc1482e8d..91618d6887c 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 0b50fd56cdb..569ac70cbe6 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index de6a8934a69..cb4b5d18c90 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-19 01:54-0400\n"
+"POT-Creation-Date: 2014-10-20 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
index 3b247952ede..caa7a558d57 100644
--- a/lib/l10n/bg_BG.php
+++ b/lib/l10n/bg_BG.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Настройки",
 "Users" => "Потребители",
 "Admin" => "Админ",
+"Recommended" => "Препоръчано",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Приложението \\\"%s\\\" не може да бъде инсталирано, защото не е съвместимо с тази версия на ownCloud.",
 "No app name specified" => "Не е зададено име на преложението",
 "Unknown filetype" => "Непознат тип файл.",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 7c26c973f6f..3e07893f749 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Paramètres",
 "Users" => "Utilisateurs",
 "Admin" => "Administration",
+"Recommended" => "Recommandé",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \\\"%s\\\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.",
 "No app name specified" => "Aucun nom d'application spécifié",
 "Unknown filetype" => "Type de fichier inconnu",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 6832b707cb4..45df303d1e9 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Settings" => "Налаштування",
 "Users" => "Користувачі",
 "Admin" => "Адмін",
+"Recommended" => "Рекомендуємо",
 "Unknown filetype" => "Невідомий тип файлу",
 "Invalid image" => "Невірне зображення",
 "web services under your control" => "підконтрольні Вам веб-сервіси",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 52c311039d6..b8388944756 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Включено",
+"Not enabled" => "Изключено",
+"Recommended" => "Препоръчано",
 "Authentication error" => "Възникна проблем с идентификацията",
 "Your full name has been changed." => "Пълното ти име е променено.",
 "Unable to change full name" => "Неуспешна промяна на пълното име.",
@@ -33,6 +35,7 @@ $TRANSLATIONS = array(
 "Saved" => "Запис",
 "test email settings" => "провери имейл настройките",
 "If you received this email, the settings seem to be correct." => "Ако си получил този имейл, настройките са правилни.",
+"A problem occurred while sending the email. Please revise your settings." => "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
 "Email sent" => "Имейлът е изпратен",
 "You need to set your user email before being able to send test emails." => "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
@@ -148,6 +151,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Потр. име и парола",
 "SMTP Username" => "SMTP Потребителско Име",
 "SMTP Password" => "SMTP Парола",
+"Store credentials" => "Запазвай креденциите",
 "Test email settings" => "Настройки на проверяващия имейл",
 "Send email" => "Изпрати имейл",
 "Log" => "Доклад",
@@ -156,10 +160,14 @@ $TRANSLATIONS = array(
 "Less" => "По-малко",
 "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>." => "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Още приложения",
+"Add your app" => "Добавете Ваше приложение",
 "by" => "от",
+"licensed" => "лицензирано",
 "Documentation:" => "Документация:",
 "User Documentation" => "Потребителска Документация",
 "Admin Documentation" => "Админ Документация",
+"Update to %s" => "Обнови до %s",
 "Enable only for specific groups" => "Включи само за определени групи",
 "Uninstall App" => "Премахни Приложението",
 "Administrator Documentation" => "Административна Документация",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index d0cb2ba0a3f..e4931523d8f 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Activer",
+"Not enabled" => "Désactivé",
+"Recommended" => "Recommandé",
 "Authentication error" => "Erreur d'authentification",
 "Your full name has been changed." => "Votre nom complet a été modifié.",
 "Unable to change full name" => "Impossible de changer le nom complet",
@@ -33,6 +35,7 @@ $TRANSLATIONS = array(
 "Saved" => "Sauvegardé",
 "test email settings" => "tester les paramètres d'e-mail",
 "If you received this email, the settings seem to be correct." => "Si vous recevez cet email, c'est que les paramètres sont corrects",
+"A problem occurred while sending the email. Please revise your settings." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres.",
 "Email sent" => "Email envoyé",
 "You need to set your user email before being able to send test emails." => "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
@@ -148,6 +151,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Informations d'identification",
 "SMTP Username" => "Nom d'utilisateur SMTP",
 "SMTP Password" => "Mot de passe SMTP",
+"Store credentials" => "Identifiants du magasin",
 "Test email settings" => "Tester les paramètres e-mail",
 "Send email" => "Envoyer un e-mail",
 "Log" => "Log",
@@ -156,10 +160,14 @@ $TRANSLATIONS = array(
 "Less" => "Moins",
 "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>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Plus d'applications",
+"Add your app" => "Ajouter votre application",
 "by" => "par",
+"licensed" => "Sous licence",
 "Documentation:" => "Documentation :",
 "User Documentation" => "Documentation utilisateur",
 "Admin Documentation" => "Documentation administrateur",
+"Update to %s" => "Mise à jour jusqu'à %s",
 "Enable only for specific groups" => "Activer uniquement pour certains groupes",
 "Uninstall App" => "Désinstaller l'application",
 "Administrator Documentation" => "Documentation administrateur",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 7cf556cab9f..427fd91f3e7 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -1,74 +1,182 @@
 <?php
 $TRANSLATIONS = array(
+"Enabled" => "Увімкнено",
+"Not enabled" => "Вимкнено",
+"Recommended" => "Рекомендуємо",
 "Authentication error" => "Помилка автентифікації",
+"Your full name has been changed." => "Ваше ім'я було змінене",
+"Unable to change full name" => "Неможливо змінити ім'я",
 "Group already exists" => "Група вже існує",
 "Unable to add group" => "Не вдалося додати групу",
+"Files decrypted successfully" => "Файли розшифровані успішно",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+"Couldn't decrypt your files, check your password and try again" => "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
+"Encryption keys deleted permanently" => "Ключі шифрування видалені назавжди",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+"Couldn't remove app." => "Неможливо видалити додаток.",
 "Email saved" => "Адресу збережено",
 "Invalid email" => "Невірна адреса",
 "Unable to delete group" => "Не вдалося видалити групу",
 "Unable to delete user" => "Не вдалося видалити користувача",
+"Backups restored successfully" => "Резервна копія успішно відновлена",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
 "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." => "Не вдалося оновити програму. ",
+"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." => "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
+"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Система не підтримує зміни пароля, але ключ шифрування користувача успішно оновлено.",
+"Unable to change password" => "Неможливо змінити пароль",
+"Saved" => "Збереженно",
+"test email settings" => "перевірити налаштування електронної пошти",
+"If you received this email, the settings seem to be correct." => "Якщо ви отримали цього листа, налаштування вірні.",
+"A problem occurred while sending the email. Please revise your settings." => "Під час надсилання листа виникли проблеми. Будь ласка перевірте налаштування.",
 "Email sent" => "Ел. пошта надіслана",
+"You need to set your user email before being able to send test emails." => "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ви дійсно бажаєте додати \"{domain}\" як довірений домен?",
+"Add trusted domain" => "Додати довірений домен",
+"Sending..." => "Надсилання...",
 "All" => "Всі",
 "Please wait...." => "Зачекайте, будь ласка...",
+"Error while disabling app" => "Помилка відключення додатка",
 "Disable" => "Вимкнути",
 "Enable" => "Включити",
+"Error while enabling app" => "Помилка підключення додатка",
 "Updating...." => "Оновлюється...",
 "Error while updating app" => "Помилка при оновленні програми",
 "Updated" => "Оновлено",
+"Uninstalling ...." => "Видалення...",
+"Error while uninstalling app" => "Помилка видалення додатка",
+"Uninstall" => "Видалити",
+"Select a profile picture" => "Обрати зображення облікового запису",
 "Very weak password" => "Дуже слабкий пароль",
 "Weak password" => "Слабкий пароль",
 "So-so password" => "Такий собі пароль",
 "Good password" => "Добрий пароль",
 "Strong password" => "Надійний пароль",
+"Valid until {date}" => "Дійсно до {date}",
 "Delete" => "Видалити",
+"Decrypting files... Please wait, this can take some time." => "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
+"Delete encryption keys permanently." => "Видалити ключі шифрування назавжди.",
+"Restore encryption keys." => "Відновити ключі шифрування.",
 "Groups" => "Групи",
+"Unable to delete {objName}" => "Не вдалося видалити {objName}",
+"Error creating group" => "Помилка створення групи",
+"A valid group name must be provided" => "Потрібно задати вірне ім'я групи",
+"deleted {groupName}" => "видалено {groupName}",
 "undo" => "відмінити",
 "Group Admin" => "Адміністратор групи",
 "never" => "ніколи",
+"deleted {userName}" => "видалено {userName}",
 "add group" => "додати групу",
 "A valid username must be provided" => "Потрібно задати вірне ім'я користувача",
 "Error creating user" => "Помилка при створенні користувача",
 "A valid password must be provided" => "Потрібно задати вірний пароль",
+"Warning: Home directory for user \"{user}\" already exists" => "Попередження: домашня тека користувача \"{user}\" вже існує",
 "__language_name__" => "__language_name__",
+"Everything (fatal issues, errors, warnings, info, debug)" => "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
+"Info, warnings, errors and fatal issues" => "Інформаційні, попередження, помилки та критичні проблеми",
+"Warnings, errors and fatal issues" => "Попередження, помилки та критичні проблеми",
+"Errors and fatal issues" => "Помилки та критичні проблеми",
+"Fatal issues only" => "Тільки критичні проблеми",
 "None" => "Жоден",
 "Login" => "Логін",
+"Plain" => "Звичайний",
+"NT LAN Manager" => "Менеджер NT LAN",
+"SSL" => "SSL",
+"TLS" => "TLS",
 "Security Warning" => "Попередження про небезпеку",
+"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Ви звертаєтесь до %s за допомогою HTTP. Ми наполегливо рекомендуємо вам налаштувати сервер на використання HTTPS.",
+"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." => "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
 "Setup Warning" => "Попередження при Налаштуванні",
+"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.",
+"Database Performance Info" => "Інформація продуктивності баз даних",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "В якості бази даних використовується SQLite. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-type'",
 "Module 'fileinfo' missing" => "Модуль 'fileinfo' відсутній",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.",
+"Your PHP version is outdated" => "Ваш версія PHP застаріла",
+"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Ваш версія PHP застаріла. Ми наполегливо рекомендуємо оновитися до версії 5.3.8 або новішої, оскільки старі версії працюють не правильно.  ",
+"PHP charset is not set to UTF-8" => "Кодування PHP не співпадає з UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Кодування PHP не співпадає з UTF-8. Це може викликати проблеми іменами файлів, які містять нелатинські символи. Ми наполегливо рекомендуємо змінити значення перемінної default_charset у файлі php.ini на UTF-8.",
 "Locale not working" => "Локалізація не працює",
+"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 to install the required packages on your system to support one of the following locales: %s." => "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
+"URL generation in notification emails" => "Генерування URL для повідомлень в електроних листах",
+"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
+"Connectivity checks" => "Перевірка з'єднання",
+"No problems found" => "Проблем не виявленно",
 "Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
 "Cron" => "Cron",
+"Last cron was executed at %s." => "Останню cron-задачу було запущено: %s.",
+"Last cron was executed at %s. This is more than an hour ago, 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 хвилин.",
 "Sharing" => "Спільний доступ",
 "Allow apps to use the Share API" => "Дозволити програмам використовувати API спільного доступу",
+"Allow users to share via link" => "Дозволити користувачам ділитися через посилання",
+"Enforce password protection" => "Захист паролем обов'язковий",
+"Allow public uploads" => "Дозволити публічне завантаження",
+"Set default expiration date" => "Встановити термін дії за замовчуванням",
+"Expire after " => "Скінчиться через",
+"days" => "днів",
+"Enforce expiration date" => "Термін дії обов'язково",
 "Allow resharing" => "Дозволити перевідкривати спільний доступ",
+"Restrict users to only share with users in their groups" => "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
+"Allow users to send mail notification for shared files" => "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
+"Exclude groups from sharing" => "Виключити групи зі спільного доступу",
+"These groups will still be able to receive shares, but not to initiate them." => "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
 "Security" => "Безпека",
 "Enforce HTTPS" => "Примусове застосування HTTPS",
+"Forces the clients to connect to %s via an encrypted connection." => "Зобов'язати клієнтів під'єднуватись до %s через шифроване з'єднання.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Будь ласка, під'єднайтесь до цього %s за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
+"Email Server" => "Сервер електронної пошти",
+"This is used for sending out notifications." => "Використовується для відсилання повідомлень.",
+"Send mode" => "Надіслати повідомлення",
 "Encryption" => "Шифрування",
+"From address" => "Адреса відправника",
+"mail" => "пошта",
+"Authentication method" => "Метод перевірки автентифікації",
+"Authentication required" => "Потрібна аутентифікація",
 "Server address" => "Адреса сервера",
 "Port" => "Порт",
 "Credentials" => "Облікові дані",
+"SMTP Username" => "Ім'я користувача SMTP",
+"SMTP Password" => "Пароль SMTP",
+"Store credentials" => "Зберігання облікових даних",
+"Test email settings" => "Перевірити налаштування електронної пошти",
+"Send email" => "Надіслати листа",
 "Log" => "Протокол",
 "Log level" => "Рівень протоколювання",
 "More" => "Більше",
 "Less" => "Менше",
 "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>." => "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Більше додатків",
+"Add your app" => "Додати свій додаток",
 "by" => "по",
+"licensed" => "Ліцензовано",
+"Documentation:" => "Документація:",
 "User Documentation" => "Документація Користувача",
+"Admin Documentation" => "Документація Адміністратора",
+"Update to %s" => "Оновити до %s",
+"Enable only for specific groups" => "Включити тільки для конкретних груп",
+"Uninstall App" => "Видалити додаток",
 "Administrator Documentation" => "Документація Адміністратора",
 "Online Documentation" => "Он-Лайн Документація",
 "Forum" => "Форум",
 "Bugtracker" => "БагТрекер",
 "Commercial Support" => "Комерційна підтримка",
 "Get the apps to sync your files" => "Отримати додатки для синхронізації ваших файлів",
+"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Якщо ви бажаєте підтримати прект\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥target=\"_blank\">приєднуйтесь до розробки</a>\n⇥⇥або\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥target=\"_blank\">розкажіть про нас</a>!",
 "Show First Run Wizard again" => "Показувати Майстер Налаштувань знову",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
 "Password" => "Пароль",
@@ -77,20 +185,52 @@ $TRANSLATIONS = array(
 "Current password" => "Поточний пароль",
 "New password" => "Новий пароль",
 "Change password" => "Змінити пароль",
+"Full Name" => "Повне Ім'я",
 "Email" => "Ел.пошта",
 "Your email address" => "Ваша адреса електронної пошти",
+"Fill in an email address to enable password recovery and receive notifications" => "Введіть адресу електронної пошти, щоб ввімкнути відновлення паролю та отримання повідомлень",
+"Profile picture" => "Зображення облікового запису",
+"Upload new" => "Завантажити нове",
+"Select new from Files" => "Обрати із завантажених файлів",
+"Remove image" => "Видалити зображення",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Допустимі формати: png і jpg. Якщо зображення не квадратне, то ви зможете його обрізати.",
+"Your avatar is provided by your original account." => "Буде використано аватар вашого оригінального облікового запису.",
 "Cancel" => "Відмінити",
+"Choose as profile image" => "Обрати зображенням облікового запису",
 "Language" => "Мова",
 "Help translate" => "Допомогти з перекладом",
 "SSL root certificates" => "SSL корневі сертифікати",
+"Common Name" => "Ім'я:",
+"Valid until" => "Дійсно до",
+"Issued By" => "Виданий",
+"Valid until %s" => "Дійсно до %s",
 "Import Root Certificate" => "Імпортувати корневі сертифікати",
+"The encryption app is no longer enabled, please decrypt all your files" => "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
+"Log-in password" => "Пароль входу",
+"Decrypt all Files" => "Розшифрувати всі файли",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
+"Restore Encryption Keys" => "Відновити ключі шифрування",
+"Delete Encryption Keys" => "Видалити ключі шифрування",
+"Show storage location" => "Показати місцезнаходження сховища",
+"Show last log in" => "Показати останній вхід в систему",
 "Login Name" => "Ім'я Логіну",
 "Create" => "Створити",
+"Admin Recovery Password" => "Пароль адміністратора для відновлення",
+"Enter the recovery password in order to recover the users files during password change" => "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
+"Search Users and Groups" => "Шукати користувачів та групи",
+"Add Group" => "Додати групу",
+"Group" => "Група",
+"Everyone" => "Всі",
+"Admins" => "Адміністратори",
 "Default Quota" => "Квота за замовчуванням",
+"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
 "Unlimited" => "Необмежено",
 "Other" => "Інше",
 "Username" => "Ім'я користувача",
 "Quota" => "Квота",
+"Storage Location" => "Місцезнаходження сховища",
+"Last Login" => "Останній вхід",
+"change full name" => "змінити ім'я",
 "set new password" => "встановити новий пароль",
 "Default" => "За замовчуванням"
 );
-- 
GitLab


From 9b0f0df7f52d16e71d40834035dd840ad4fa86b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 29 Aug 2014 14:36:00 +0200
Subject: [PATCH 156/616] make skeleton compatible with objectstore

suspend encryption proxy when copying skeleton
---
 apps/files_sharing/tests/base.php             |  4 +-
 .../objectstore/homeobjectstorestorage.php    |  6 ---
 lib/private/server.php                        | 15 ++++++
 lib/private/util.php                          | 46 ++++++++++---------
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 738ba3493ba..84de6006fdb 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -126,9 +126,9 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 		}
 
 		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
+		\OC::$server->getUserSession()->setUser(null);
 		\OC\Files\Filesystem::tearDown();
-		\OC_User::setUserId($user);
+		\OC::$server->getUserSession()->login($user, $password);
 		\OC_Util::setupFS($user);
 	}
 
diff --git a/lib/private/files/objectstore/homeobjectstorestorage.php b/lib/private/files/objectstore/homeobjectstorestorage.php
index 947fc496b20..14fc604a7f0 100644
--- a/lib/private/files/objectstore/homeobjectstorestorage.php
+++ b/lib/private/files/objectstore/homeobjectstorestorage.php
@@ -34,12 +34,6 @@ class HomeObjectStoreStorage extends ObjectStoreStorage implements \OCP\Files\IH
 		}
 		$this->user = $params['user'];
 		parent::__construct($params);
-
-
-		//initialize cache with root directory in cache
-		if ( ! $this->is_dir('files') ) {
-			$this->mkdir('files');
-		}
 	}
 
 	public function getId () {
diff --git a/lib/private/server.php b/lib/private/server.php
index ff34cfdccb6..d2728d2b6ef 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -291,6 +291,8 @@ class Server extends SimpleContainer implements IServerContainer {
 				return null;
 			}
 			$userId = $user->getUID();
+		} else {
+			$user = $this->getUserManager()->get($userId);
 		}
 		$dir = '/' . $userId;
 		$root = $this->getRootFolder();
@@ -305,6 +307,19 @@ class Server extends SimpleContainer implements IServerContainer {
 		$dir = '/files';
 		if (!$folder->nodeExists($dir)) {
 			$folder = $folder->newFolder($dir);
+
+			if (\OCP\App::isEnabled('files_encryption')) {
+				// disable encryption proxy to prevent recursive calls
+				$proxyStatus = \OC_FileProxy::$enabled;
+				\OC_FileProxy::$enabled = false;
+			}
+
+			\OC_Util::copySkeleton($user, $folder);
+
+			if (\OCP\App::isEnabled('files_encryption')) {
+				// re-enable proxy - our work is done
+				\OC_FileProxy::$enabled = $proxyStatus;
+			}
 		} else {
 			$folder = $folder->get($dir);
 		}
diff --git a/lib/private/util.php b/lib/private/util.php
index c0a68c56223..d6515872c5a 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -115,16 +115,6 @@ class OC_Util {
 				return $storage;
 			});
 
-			// copy skeleton for local storage only
-			if (!isset($objectStore)) {
-				$userRoot = OC_User::getHome($user);
-				$userDirectory = $userRoot . '/files';
-				if (!is_dir($userDirectory)) {
-					mkdir($userDirectory, 0755, true);
-					OC_Util::copySkeleton($userDirectory);
-				}
-			}
-
 			$userDir = '/' . $user . '/files';
 
 			//jail the user into his "home" directory
@@ -133,6 +123,9 @@ class OC_Util {
 			$fileOperationProxy = new OC_FileProxy_FileOperations();
 			OC_FileProxy::register($fileOperationProxy);
 
+			//trigger creation of user home and /files folder
+			\OC::$server->getUserFolder($user);
+
 			OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir));
 		}
 		return true;
@@ -208,33 +201,44 @@ class OC_Util {
 	}
 
 	/**
-	 * copies the user skeleton files into the fresh user home files
+	 * copies the skeleton to the users /files
 	 *
-	 * @param string $userDirectory
+	 * @param \OC\User\User $user
+	 * @param \OCP\Files\Folder $userDirectory
 	 */
-	public static function copySkeleton($userDirectory) {
-		$skeletonDirectory = OC_Config::getValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
+	public static function copySkeleton(\OC\User\User $user, \OCP\Files\Folder $userDirectory) {
+
+		$skeletonDirectory = \OCP\Config::getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton');
+
 		if (!empty($skeletonDirectory)) {
-			OC_Util::copyr($skeletonDirectory, $userDirectory);
+			\OCP\Util::writeLog(
+				'files_skeleton',
+				'copying skeleton for '.$user->getUID().' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'),
+				\OCP\Util::DEBUG
+			);
+			self::copyr($skeletonDirectory, $userDirectory);
+			// update the file cache
+			$userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE);
 		}
 	}
 
 	/**
-	 * copies a directory recursively
+	 * copies a directory recursively by using streams
 	 *
 	 * @param string $source
-	 * @param string $target
+	 * @param \OCP\Files\Folder $target
 	 * @return void
 	 */
-	public static function copyr($source, $target) {
+	public static function copyr($source, \OCP\Files\Folder $target) {
 		$dir = opendir($source);
-		@mkdir($target);
 		while (false !== ($file = readdir($dir))) {
 			if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 				if (is_dir($source . '/' . $file)) {
-					OC_Util::copyr($source . '/' . $file, $target . '/' . $file);
+					$child = $target->newFolder($file);
+					self::copyr($source . '/' . $file, $child);
 				} else {
-					copy($source . '/' . $file, $target . '/' . $file);
+					$child = $target->newFile($file);
+					stream_copy_to_stream(fopen($source . '/' . $file,'r'), $child->fopen('w'));
 				}
 			}
 		}
-- 
GitLab


From ca0e3fdfea51d8db52341c3866102e7058abc9c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 8 Oct 2014 18:02:42 +0200
Subject: [PATCH 157/616] throw exception in writeBack, the returned boolean is
 checked nowhere

---
 lib/private/files/objectstore/objectstorestorage.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php
index 241864bcccd..ae8bff52896 100644
--- a/lib/private/files/objectstore/objectstorestorage.php
+++ b/lib/private/files/objectstore/objectstorestorage.php
@@ -349,7 +349,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 
 	public function writeBack($tmpFile) {
 		if (!isset(self::$tmpFiles[$tmpFile])) {
-			return false;
+			return;
 		}
 
 		$path = self::$tmpFiles[$tmpFile];
@@ -375,9 +375,8 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 		} catch (\Exception $ex) {
 			$this->getCache()->remove($path);
 			\OCP\Util::writeLog('objectstore', 'Could not create object: ' . $ex->getMessage(), \OCP\Util::ERROR);
-			return false;
+			throw $ex; // make this bubble up
 		}
-		return true;
 	}
 
 	/**
-- 
GitLab


From cb3a4d22b17ee3dd016faf52530b8f888cef5723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 10 Oct 2014 15:34:19 +0200
Subject: [PATCH 158/616] make tests compatible with hook based skeleton
 generation

---
 apps/files_encryption/lib/helper.php       |  2 +-
 apps/files_encryption/tests/crypt.php      |  8 ++++++
 apps/files_encryption/tests/helper.php     | 18 +++++++-----
 apps/files_encryption/tests/hooks.php      |  8 ++++++
 apps/files_encryption/tests/keymanager.php |  8 ++++++
 apps/files_encryption/tests/proxy.php      |  8 ++++++
 apps/files_encryption/tests/share.php      |  8 ++++++
 apps/files_encryption/tests/stream.php     |  8 ++++++
 apps/files_encryption/tests/trashbin.php   |  8 ++++++
 apps/files_encryption/tests/util.php       |  9 ++++++
 apps/files_encryption/tests/webdav.php     |  8 ++++++
 apps/files_sharing/tests/base.php          | 33 +++++++++++-----------
 12 files changed, 102 insertions(+), 24 deletions(-)

diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index ab19938d633..6f4eb4aaf3b 100755
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -461,7 +461,7 @@ class Helper {
 			} else {
 				\OC_Log::write(
 					'Encryption library',
-					'No share key found for user "' . $user . '" for file "' . $pathOld . '"',
+					'No share key found for user "' . $user . '" for file "' . $fileName . '"',
 					\OC_Log::WARN
 				);
 			}
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 1bebb3cd36c..a89754d4a14 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -102,6 +102,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	public static function tearDownAfterClass() {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	/**
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
index b94fdeb4d6c..df7ff8cdb11 100644
--- a/apps/files_encryption/tests/helper.php
+++ b/apps/files_encryption/tests/helper.php
@@ -20,18 +20,27 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
 	const TEST_ENCRYPTION_HELPER_USER1 = "test-helper-user1";
 	const TEST_ENCRYPTION_HELPER_USER2 = "test-helper-user2";
 
-	public static function setUpBeforeClass() {
+	public function setUp() {
 		// create test user
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2, true);
 		\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1, true);
 	}
 
-	public static function tearDownAfterClass() {
+	public function tearDown() {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1);
 		\OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2);
+	}
+
+	public static function tearDownAfterClass() {
+
 		\OC_Hook::clear();
 		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	/**
@@ -157,11 +166,6 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
 				$result
 			);
 		}
-
-		// clean up
-		$rootView->unlink($baseDir);
-		\Test_Encryption_Util::logoutHelper();
-		\OC_User::deleteUser($userName);
 	}
 
 }
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index 14d44fe5bb3..c7353deee22 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -117,6 +117,14 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 		\OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	function testDisableHook() {
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index e8a9d7dda53..ad7d2cfcd45 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -98,6 +98,14 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		if (self::$stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
 		}
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	/**
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 42637a52e04..56d6cd2f736 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -89,6 +89,14 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 	public static function tearDownAfterClass() {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1);
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	/**
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 1cd7cfc738b..f4ce94b7ee9 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -124,6 +124,14 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 254c5e87ed1..b8c18fbe049 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -96,6 +96,14 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 	public static function tearDownAfterClass() {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	function testStreamOptions() {
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index ae0974431be..5890292cd7b 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -110,6 +110,14 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	public static function tearDownAfterClass() {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	/**
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 811530546e8..d5bfb86a2e4 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -124,9 +124,18 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
 		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER2);
 		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+
 		//cleanup groups
 		\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP1);
 		\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP2);
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	public static function setupHooks() {
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index c46d3bf0899..cc0cff9aa5c 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -108,6 +108,14 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	public static function tearDownAfterClass() {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->rmdir('public-keys');
+		$view->rmdir('owncloud_private_key');
 	}
 
 	/**
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/base.php
index 84de6006fdb..6bc02ec2008 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/base.php
@@ -37,7 +37,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 
 	const TEST_FILES_SHARING_API_GROUP1 = "test-share-group1";
 
-	public $stateFilesEncryption;
+	public static $stateFilesEncryption;
 	public $filename;
 	public $data;
 	/**
@@ -48,6 +48,13 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 	public $subfolder;
 
 	public static function setUpBeforeClass() {
+
+		// remember files_encryption state
+		self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption');
+
+		//we don't want to tests with app files_encryption enabled
+		\OC_App::disable('files_encryption');
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -70,29 +77,16 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 
 	function setUp() {
 
+		$this->assertFalse(\OC_App::isEnabled('files_encryption'));
+
 		//login as user1
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 
 		$this->data = 'foobar';
 		$this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
-		// remember files_encryption state
-		$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
-
-		 //we don't want to tests with app files_encryption enabled
-		\OC_App::disable('files_encryption');
-
-
-		$this->assertTrue(!\OC_App::isEnabled('files_encryption'));
 	}
 
 	function tearDown() {
-		// reset app files_encryption
-		if ($this->stateFilesEncryption) {
-			\OC_App::enable('files_encryption');
-		} else {
-			\OC_App::disable('files_encryption');
-		}
-
 		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`');
 		$query->execute();
 	}
@@ -106,6 +100,13 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 
 		// delete group
 		\OC_Group::deleteGroup(self::TEST_FILES_SHARING_API_GROUP1);
+
+		// reset app files_encryption
+		if (self::$stateFilesEncryption) {
+			\OC_App::enable('files_encryption');
+		} else {
+			\OC_App::disable('files_encryption');
+		}
 	}
 
 	/**
-- 
GitLab


From d38050cf52a623a0a4d29044bb50d3c247c8245c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 3 Oct 2014 01:16:57 +0200
Subject: [PATCH 159/616] Add an EventLogger interface to allow apps to get a
 log of the request timeline

---
 lib/private/debug/dummyeventlogger.php | 40 ++++++++++++
 lib/private/debug/event.php            | 86 ++++++++++++++++++++++++++
 lib/private/debug/eventlogger.php      | 36 +++++++++++
 lib/private/server.php                 | 32 ++++++++--
 lib/public/debug/ievent.php            | 36 +++++++++++
 lib/public/debug/ieventlogger.php      | 31 ++++++++++
 lib/public/iservercontainer.php        |  7 +++
 7 files changed, 262 insertions(+), 6 deletions(-)
 create mode 100644 lib/private/debug/dummyeventlogger.php
 create mode 100644 lib/private/debug/event.php
 create mode 100644 lib/private/debug/eventlogger.php
 create mode 100644 lib/public/debug/ievent.php
 create mode 100644 lib/public/debug/ieventlogger.php

diff --git a/lib/private/debug/dummyeventlogger.php b/lib/private/debug/dummyeventlogger.php
new file mode 100644
index 00000000000..7aa4c21b674
--- /dev/null
+++ b/lib/private/debug/dummyeventlogger.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Debug;
+
+use OCP\Debug\IEventLogger;
+
+/**
+ * Dummy event logger that doesn't actually log anything
+ */
+class DummyEventLogger implements IEventLogger {
+	/**
+	 * Mark the start of an event
+	 *
+	 * @param $id
+	 * @param $description
+	 */
+	public function start($id, $description) {
+	}
+
+	/**
+	 * Mark the end of an event
+	 *
+	 * @param $id
+	 */
+	public function end($id) {
+	}
+
+	/**
+	 * @return \OCP\Debug\IEvent[]
+	 */
+	public function getEvents(){
+		return array();
+	}
+}
diff --git a/lib/private/debug/event.php b/lib/private/debug/event.php
new file mode 100644
index 00000000000..b03fdeabc14
--- /dev/null
+++ b/lib/private/debug/event.php
@@ -0,0 +1,86 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Debug;
+
+use OCP\Debug\IEvent;
+
+class Event implements IEvent {
+	/**
+	 * @var string
+	 */
+	protected $id;
+
+	/**
+	 * @var float
+	 */
+	protected $start;
+
+	/**
+	 * @var float
+	 */
+	protected $end;
+
+	/**
+	 * @var string
+	 */
+	protected $description;
+
+	/**
+	 * @param string $id
+	 * @param string $description
+	 * @param float $start
+	 */
+	public function __construct($id, $description, $start) {
+		$this->id = $id;
+		$this->description = $description;
+		$this->start = $start;
+	}
+
+	/**
+	 * @param float $time
+	 */
+	public function end($time) {
+		$this->end = $time;
+	}
+
+	/**
+	 * @return float
+	 */
+	public function getStart() {
+		return $this->start;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getId() {
+		return $this->id;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDescription() {
+		return $this->description;
+	}
+
+	/**
+	 * @return float
+	 */
+	public function getEnd() {
+		return $this->end;
+	}
+
+	/**
+	 * @return float
+	 */
+	public function getDuration() {
+		return $this->end - $this->start;
+	}
+}
diff --git a/lib/private/debug/eventlogger.php b/lib/private/debug/eventlogger.php
new file mode 100644
index 00000000000..2127a624ed5
--- /dev/null
+++ b/lib/private/debug/eventlogger.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Debug;
+
+use OCP\Debug\IEventLogger;
+
+class EventLogger implements IEventLogger {
+	/**
+	 * @var \OC\Debug\Event[]
+	 */
+	private $events = array();
+
+	public function start($id, $description) {
+		$this->events[$id] = new Event($id, $description, microtime(true));
+	}
+
+	public function end($id) {
+		if (isset($this->events[$id])) {
+			$timing = $this->events[$id];
+			$timing->end(microtime(true));
+		}
+	}
+
+	/**
+	 * @return \OCP\Debug\IEvent[]
+	 */
+	public function getEvents() {
+		return $this->events;
+	}
+}
diff --git a/lib/private/server.php b/lib/private/server.php
index d2728d2b6ef..263f9919023 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,12 +6,14 @@ use OC\AppFramework\Http\Request;
 use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
+use OC\Debug\EventLogger;
 use OC\Security\CertificateManager;
 use OC\DB\ConnectionWrapper;
 use OC\Files\Node\Root;
 use OC\Files\View;
 use OC\Security\Crypto;
 use OC\Security\SecureRandom;
+use OC\Debug\DummyEventLogger;
 use OCP\IServerContainer;
 use OCP\ISession;
 use OC\Tagging\TagMapper;
@@ -24,7 +26,6 @@ use OC\Tagging\TagMapper;
  * TODO: hookup all manager classes
  */
 class Server extends SimpleContainer implements IServerContainer {
-
 	function __construct() {
 		$this->registerService('ContactsManager', function ($c) {
 			return new ContactsManager();
@@ -59,8 +60,8 @@ class Server extends SimpleContainer implements IServerContainer {
 					'env' => $_ENV,
 					'cookies' => $_COOKIE,
 					'method' => (isset($_SERVER) && isset($_SERVER['REQUEST_METHOD']))
-							? $_SERVER['REQUEST_METHOD']
-							: null,
+						? $_SERVER['REQUEST_METHOD']
+						: null,
 					'urlParams' => $urlParams,
 					'requesttoken' => $requestToken,
 				), $stream
@@ -208,10 +209,10 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('Search', function ($c) {
 			return new Search();
 		});
-		$this->registerService('SecureRandom', function($c) {
+		$this->registerService('SecureRandom', function ($c) {
 			return new SecureRandom();
 		});
-		$this->registerService('Crypto', function($c) {
+		$this->registerService('Crypto', function ($c) {
 			return new Crypto(\OC::$server->getConfig(), \OC::$server->getSecureRandom());
 		});
 		$this->registerService('Db', function ($c) {
@@ -221,6 +222,13 @@ class Server extends SimpleContainer implements IServerContainer {
 			$config = $c->query('AllConfig');
 			return new HTTPHelper($config);
 		});
+		$this->registerService('EventLogger', function ($c) {
+			if (defined('DEBUG') and DEBUG) {
+				return new EventLogger();
+			} else {
+				return new DummyEventLogger();
+			}
+		});
 	}
 
 	/**
@@ -285,7 +293,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OCP\Files\Folder
 	 */
 	function getUserFolder($userId = null) {
-		if($userId === null) {
+		if ($userId === null) {
 			$user = $this->getUserSession()->getUser();
 			if (!$user) {
 				return null;
@@ -528,6 +536,7 @@ class Server extends SimpleContainer implements IServerContainer {
 
 	/**
 	 * Returns an instance of the HTTP helper class
+	 *
 	 * @return \OC\HTTPHelper
 	 */
 	function getHTTPHelper() {
@@ -559,4 +568,15 @@ class Server extends SimpleContainer implements IServerContainer {
 	function createEventSource() {
 		return new \OC_EventSource();
 	}
+
+	/**
+	 * Get the active event logger
+	 *
+	 * The returned logger only logs data when debug mode is enabled
+	 *
+	 * @return \OCP\Debug\IEventLogger
+	 */
+	function getEventLogger() {
+		return $this->query('EventLogger');
+	}
 }
diff --git a/lib/public/debug/ievent.php b/lib/public/debug/ievent.php
new file mode 100644
index 00000000000..1cebb274e58
--- /dev/null
+++ b/lib/public/debug/ievent.php
@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OCP\Debug;
+
+interface IEvent {
+	/**
+	 * @return string
+	 */
+	public function getId();
+
+	/**
+	 * @return string
+	 */
+	public function getDescription();
+
+	/**
+	 * @return float
+	 */
+	public function getStart();
+
+	/**
+	 * @return float
+	 */
+	public function getEnd();
+
+	/**
+	 * @return float
+	 */
+	public function getDuration();
+}
diff --git a/lib/public/debug/ieventlogger.php b/lib/public/debug/ieventlogger.php
new file mode 100644
index 00000000000..7a7bff521db
--- /dev/null
+++ b/lib/public/debug/ieventlogger.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OCP\Debug;
+
+interface IEventLogger {
+	/**
+	 * Mark the start of an event
+	 *
+	 * @param string $id
+	 * @param string $description
+	 */
+	public function start($id, $description);
+
+	/**
+	 * Mark the end of an event
+	 *
+	 * @param string $id
+	 */
+	public function end($id);
+
+	/**
+	 * @return \OCP\Debug\IEvent[]
+	 */
+	public function getEvents();
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index a093ff3a640..57bbf628993 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -248,4 +248,11 @@ interface IServerContainer {
 	 * @return \OC\HTTPHelper
 	 */
 	function getHTTPHelper();
+
+	/**
+	 * Get the active event logger
+	 *
+	 * @return \OCP\Debug\IEventLogger
+	 */
+	function getEventLogger();
 }
-- 
GitLab


From b71d1d3616115653eb928489093fc2581d830cf5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 3 Oct 2014 01:35:07 +0200
Subject: [PATCH 160/616] Add QueryLogger interface to allow apps to get a list
 of used queries

---
 lib/private/debug/dummyquerylogger.php | 31 ++++++++++++++
 lib/private/debug/query.php            | 57 ++++++++++++++++++++++++++
 lib/private/debug/querylogger.php      | 47 +++++++++++++++++++++
 lib/private/server.php                 | 20 +++++++++
 lib/public/debug/iquery.php            | 26 ++++++++++++
 lib/public/debug/iquerylogger.php      | 27 ++++++++++++
 lib/public/iservercontainer.php        |  9 ++++
 7 files changed, 217 insertions(+)
 create mode 100644 lib/private/debug/dummyquerylogger.php
 create mode 100644 lib/private/debug/query.php
 create mode 100644 lib/private/debug/querylogger.php
 create mode 100644 lib/public/debug/iquery.php
 create mode 100644 lib/public/debug/iquerylogger.php

diff --git a/lib/private/debug/dummyquerylogger.php b/lib/private/debug/dummyquerylogger.php
new file mode 100644
index 00000000000..0c2664e4001
--- /dev/null
+++ b/lib/private/debug/dummyquerylogger.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Debug;
+
+use OCP\Debug\IQueryLogger;
+
+class DummyQueryLogger implements IQueryLogger {
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @param array $types
+	 */
+	public function startQuery($sql, array $params = null, array $types = null) {
+	}
+
+	public function stopQuery() {
+	}
+
+	/**
+	 * @return \OCP\Debug\IQuery[]
+	 */
+	public function getQueries() {
+		return array();
+	}
+}
diff --git a/lib/private/debug/query.php b/lib/private/debug/query.php
new file mode 100644
index 00000000000..351c7d9daca
--- /dev/null
+++ b/lib/private/debug/query.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Debug;
+
+use OCP\Debug\IQuery;
+
+class Query implements IQuery {
+	private $sql;
+
+	private $params;
+
+	private $start;
+
+	private $end;
+
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @param int $start
+	 */
+	public function __construct($sql, $params, $start) {
+		$this->sql = $sql;
+		$this->params = $params;
+		$this->start = $start;
+	}
+
+	public function end($time) {
+		$this->end = $time;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getParams() {
+		return $this->params;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSql() {
+		return $this->sql;
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getDuration() {
+		return $this->end - $this->start;
+	}
+}
diff --git a/lib/private/debug/querylogger.php b/lib/private/debug/querylogger.php
new file mode 100644
index 00000000000..990188da975
--- /dev/null
+++ b/lib/private/debug/querylogger.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Debug;
+
+use OCP\Debug\IQueryLogger;
+
+class QueryLogger implements IQueryLogger {
+	/**
+	 * @var \OC\Debug\Query
+	 */
+	protected $activeQuery;
+
+	/**
+	 * @var \OC\Debug\Query[]
+	 */
+	protected $queries = array();
+
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @param array $types
+	 */
+	public function startQuery($sql, array $params = null, array $types = null) {
+		$this->activeQuery = new Query($sql, $params, microtime(true));
+	}
+
+	public function stopQuery() {
+		if ($this->activeQuery) {
+			$this->activeQuery->end(microtime(true));
+			$this->queries[] = $this->activeQuery;
+			$this->activeQuery = null;
+		}
+	}
+
+	/**
+	 * @return \OCP\Debug\IQuery[]
+	 */
+	public function getQueries() {
+		return $this->queries;
+	}
+}
diff --git a/lib/private/server.php b/lib/private/server.php
index 263f9919023..c0b94a5b4c3 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,7 +6,9 @@ use OC\AppFramework\Http\Request;
 use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
+use OC\Debug\DummyQueryLogger;
 use OC\Debug\EventLogger;
+use OC\Debug\QueryLogger;
 use OC\Security\CertificateManager;
 use OC\DB\ConnectionWrapper;
 use OC\Files\Node\Root;
@@ -229,6 +231,13 @@ class Server extends SimpleContainer implements IServerContainer {
 				return new DummyEventLogger();
 			}
 		});
+		$this->registerService('QueryLogger', function ($c) {
+			if (defined('DEBUG') and DEBUG) {
+				return new QueryLogger();
+			} else {
+				return new DummyQueryLogger();
+			}
+		});
 	}
 
 	/**
@@ -579,4 +588,15 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getEventLogger() {
 		return $this->query('EventLogger');
 	}
+
+	/**
+	 * Get the active query logger
+	 *
+	 * The returned logger only logs data when debug mode is enabled
+	 *
+	 * @return \OCP\Debug\IQueryLogger
+	 */
+	function getQueryLogger() {
+		return $this->query('EventLogger');
+	}
 }
diff --git a/lib/public/debug/iquery.php b/lib/public/debug/iquery.php
new file mode 100644
index 00000000000..070c4d61196
--- /dev/null
+++ b/lib/public/debug/iquery.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OCP\Debug;
+
+interface IQuery {
+	/**
+	 * @return string
+	 */
+	public function getSql();
+
+	/**
+	 * @return array
+	 */
+	public function getParams();
+
+	/**
+	 * @return float
+	 */
+	public function getDuration();
+}
diff --git a/lib/public/debug/iquerylogger.php b/lib/public/debug/iquerylogger.php
new file mode 100644
index 00000000000..fe8eae089da
--- /dev/null
+++ b/lib/public/debug/iquerylogger.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OCP\Debug;
+
+use Doctrine\DBAL\Logging\SQLLogger;
+
+interface IQueryLogger extends SQLLogger {
+	/**
+	 * @param string $sql
+	 * @param array $params
+	 * @param array $types
+	 */
+	public function startQuery($sql, array $params = null, array $types = null);
+
+	public function stopQuery();
+
+	/**
+	 * @return \OCP\Debug\IQuery[]
+	 */
+	public function getQueries();
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 57bbf628993..97ff74385a2 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -255,4 +255,13 @@ interface IServerContainer {
 	 * @return \OCP\Debug\IEventLogger
 	 */
 	function getEventLogger();
+
+	/**
+	 * Get the active query logger
+	 *
+	 * The returned logger only logs data when debug mode is enabled
+	 *
+	 * @return \OCP\Debug\IQueryLogger
+	 */
+	function getQueryLogger();
 }
-- 
GitLab


From 2790bda4f8d6452e65e28935cee62e1ab5468acf Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 3 Oct 2014 01:36:31 +0200
Subject: [PATCH 161/616] Activate the query logger on connect

---
 lib/private/db.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/db.php b/lib/private/db.php
index 80163415a90..ba069977d35 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -91,6 +91,7 @@ class OC_DB {
 
 		try {
 			self::$connection = $factory->getConnection($type, $connectionParams);
+			self::$connection->getConfiguration()->setSQLLogger(\OC::$server->getQueryLogger());
 		} catch(\Doctrine\DBAL\DBALException $e) {
 			OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
 			OC_User::setUserId(null);
-- 
GitLab


From 6e08014781ea0099d7e4466dd48d80af63d8ab69 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 3 Oct 2014 20:39:09 +0200
Subject: [PATCH 162/616] Rename namespace to Diagnostics

---
 .../{debug => diagnostics}/dummyeventlogger.php    |  6 +++---
 .../{debug => diagnostics}/dummyquerylogger.php    |  6 +++---
 lib/private/{debug => diagnostics}/event.php       |  4 ++--
 lib/private/{debug => diagnostics}/eventlogger.php |  8 ++++----
 lib/private/{debug => diagnostics}/query.php       |  4 ++--
 lib/private/{debug => diagnostics}/querylogger.php | 10 +++++-----
 lib/private/server.php                             | 14 +++++++-------
 lib/public/{debug => diagnostics}/ievent.php       |  2 +-
 lib/public/{debug => diagnostics}/ieventlogger.php |  4 ++--
 lib/public/{debug => diagnostics}/iquery.php       |  2 +-
 lib/public/{debug => diagnostics}/iquerylogger.php |  4 ++--
 lib/public/iservercontainer.php                    |  4 ++--
 12 files changed, 34 insertions(+), 34 deletions(-)
 rename lib/private/{debug => diagnostics}/dummyeventlogger.php (85%)
 rename lib/private/{debug => diagnostics}/dummyquerylogger.php (83%)
 rename lib/private/{debug => diagnostics}/event.php (95%)
 rename lib/private/{debug => diagnostics}/eventlogger.php (82%)
 rename lib/private/{debug => diagnostics}/query.php (93%)
 rename lib/private/{debug => diagnostics}/querylogger.php (83%)
 rename lib/public/{debug => diagnostics}/ievent.php (94%)
 rename lib/public/{debug => diagnostics}/ieventlogger.php (88%)
 rename lib/public/{debug => diagnostics}/iquery.php (93%)
 rename lib/public/{debug => diagnostics}/iquerylogger.php (88%)

diff --git a/lib/private/debug/dummyeventlogger.php b/lib/private/diagnostics/dummyeventlogger.php
similarity index 85%
rename from lib/private/debug/dummyeventlogger.php
rename to lib/private/diagnostics/dummyeventlogger.php
index 7aa4c21b674..f1386d2e88c 100644
--- a/lib/private/debug/dummyeventlogger.php
+++ b/lib/private/diagnostics/dummyeventlogger.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IEventLogger;
+use OCP\Diagnostics\IEventLogger;
 
 /**
  * Dummy event logger that doesn't actually log anything
@@ -32,7 +32,7 @@ class DummyEventLogger implements IEventLogger {
 	}
 
 	/**
-	 * @return \OCP\Debug\IEvent[]
+	 * @return \OCP\Diagnostics\IEvent[]
 	 */
 	public function getEvents(){
 		return array();
diff --git a/lib/private/debug/dummyquerylogger.php b/lib/private/diagnostics/dummyquerylogger.php
similarity index 83%
rename from lib/private/debug/dummyquerylogger.php
rename to lib/private/diagnostics/dummyquerylogger.php
index 0c2664e4001..1617b204e90 100644
--- a/lib/private/debug/dummyquerylogger.php
+++ b/lib/private/diagnostics/dummyquerylogger.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IQueryLogger;
+use OCP\Diagnostics\IQueryLogger;
 
 class DummyQueryLogger implements IQueryLogger {
 	/**
@@ -23,7 +23,7 @@ class DummyQueryLogger implements IQueryLogger {
 	}
 
 	/**
-	 * @return \OCP\Debug\IQuery[]
+	 * @return \OCP\Diagnostics\IQuery[]
 	 */
 	public function getQueries() {
 		return array();
diff --git a/lib/private/debug/event.php b/lib/private/diagnostics/event.php
similarity index 95%
rename from lib/private/debug/event.php
rename to lib/private/diagnostics/event.php
index b03fdeabc14..063c0c49dc2 100644
--- a/lib/private/debug/event.php
+++ b/lib/private/diagnostics/event.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IEvent;
+use OCP\Diagnostics\IEvent;
 
 class Event implements IEvent {
 	/**
diff --git a/lib/private/debug/eventlogger.php b/lib/private/diagnostics/eventlogger.php
similarity index 82%
rename from lib/private/debug/eventlogger.php
rename to lib/private/diagnostics/eventlogger.php
index 2127a624ed5..46084a1d496 100644
--- a/lib/private/debug/eventlogger.php
+++ b/lib/private/diagnostics/eventlogger.php
@@ -6,13 +6,13 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IEventLogger;
+use OCP\Diagnostics\IEventLogger;
 
 class EventLogger implements IEventLogger {
 	/**
-	 * @var \OC\Debug\Event[]
+	 * @var \OC\Diagnostics\Event[]
 	 */
 	private $events = array();
 
@@ -28,7 +28,7 @@ class EventLogger implements IEventLogger {
 	}
 
 	/**
-	 * @return \OCP\Debug\IEvent[]
+	 * @return \OCP\Diagnostics\IEvent[]
 	 */
 	public function getEvents() {
 		return $this->events;
diff --git a/lib/private/debug/query.php b/lib/private/diagnostics/query.php
similarity index 93%
rename from lib/private/debug/query.php
rename to lib/private/diagnostics/query.php
index 351c7d9daca..d50d7592636 100644
--- a/lib/private/debug/query.php
+++ b/lib/private/diagnostics/query.php
@@ -6,9 +6,9 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IQuery;
+use OCP\Diagnostics\IQuery;
 
 class Query implements IQuery {
 	private $sql;
diff --git a/lib/private/debug/querylogger.php b/lib/private/diagnostics/querylogger.php
similarity index 83%
rename from lib/private/debug/querylogger.php
rename to lib/private/diagnostics/querylogger.php
index 990188da975..1f80f907173 100644
--- a/lib/private/debug/querylogger.php
+++ b/lib/private/diagnostics/querylogger.php
@@ -6,18 +6,18 @@
  * See the COPYING-README file.
  */
 
-namespace OC\Debug;
+namespace OC\Diagnostics;
 
-use OCP\Debug\IQueryLogger;
+use OCP\Diagnostics\IQueryLogger;
 
 class QueryLogger implements IQueryLogger {
 	/**
-	 * @var \OC\Debug\Query
+	 * @var \OC\Diagnostics\Query
 	 */
 	protected $activeQuery;
 
 	/**
-	 * @var \OC\Debug\Query[]
+	 * @var \OC\Diagnostics\Query[]
 	 */
 	protected $queries = array();
 
@@ -39,7 +39,7 @@ class QueryLogger implements IQueryLogger {
 	}
 
 	/**
-	 * @return \OCP\Debug\IQuery[]
+	 * @return \OCP\Diagnostics\IQuery[]
 	 */
 	public function getQueries() {
 		return $this->queries;
diff --git a/lib/private/server.php b/lib/private/server.php
index c0b94a5b4c3..7b8ed2cabf5 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,16 +6,16 @@ use OC\AppFramework\Http\Request;
 use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
-use OC\Debug\DummyQueryLogger;
-use OC\Debug\EventLogger;
-use OC\Debug\QueryLogger;
+use OC\Diagnostics\DummyQueryLogger;
+use OC\Diagnostics\EventLogger;
+use OC\Diagnostics\QueryLogger;
 use OC\Security\CertificateManager;
 use OC\DB\ConnectionWrapper;
 use OC\Files\Node\Root;
 use OC\Files\View;
 use OC\Security\Crypto;
 use OC\Security\SecureRandom;
-use OC\Debug\DummyEventLogger;
+use OC\Diagnostics\DummyEventLogger;
 use OCP\IServerContainer;
 use OCP\ISession;
 use OC\Tagging\TagMapper;
@@ -583,7 +583,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 *
 	 * The returned logger only logs data when debug mode is enabled
 	 *
-	 * @return \OCP\Debug\IEventLogger
+	 * @return \OCP\Diagnostics\IEventLogger
 	 */
 	function getEventLogger() {
 		return $this->query('EventLogger');
@@ -594,9 +594,9 @@ class Server extends SimpleContainer implements IServerContainer {
 	 *
 	 * The returned logger only logs data when debug mode is enabled
 	 *
-	 * @return \OCP\Debug\IQueryLogger
+	 * @return \OCP\Diagnostics\IQueryLogger
 	 */
 	function getQueryLogger() {
-		return $this->query('EventLogger');
+		return $this->query('QueryLogger');
 	}
 }
diff --git a/lib/public/debug/ievent.php b/lib/public/diagnostics/ievent.php
similarity index 94%
rename from lib/public/debug/ievent.php
rename to lib/public/diagnostics/ievent.php
index 1cebb274e58..a2a3461f68a 100644
--- a/lib/public/debug/ievent.php
+++ b/lib/public/diagnostics/ievent.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
 
 interface IEvent {
 	/**
diff --git a/lib/public/debug/ieventlogger.php b/lib/public/diagnostics/ieventlogger.php
similarity index 88%
rename from lib/public/debug/ieventlogger.php
rename to lib/public/diagnostics/ieventlogger.php
index 7a7bff521db..fa5880bfea6 100644
--- a/lib/public/debug/ieventlogger.php
+++ b/lib/public/diagnostics/ieventlogger.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
 
 interface IEventLogger {
 	/**
@@ -25,7 +25,7 @@ interface IEventLogger {
 	public function end($id);
 
 	/**
-	 * @return \OCP\Debug\IEvent[]
+	 * @return \OCP\Diagnostics\IEvent[]
 	 */
 	public function getEvents();
 }
diff --git a/lib/public/debug/iquery.php b/lib/public/diagnostics/iquery.php
similarity index 93%
rename from lib/public/debug/iquery.php
rename to lib/public/diagnostics/iquery.php
index 070c4d61196..f1111e069bb 100644
--- a/lib/public/debug/iquery.php
+++ b/lib/public/diagnostics/iquery.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
 
 interface IQuery {
 	/**
diff --git a/lib/public/debug/iquerylogger.php b/lib/public/diagnostics/iquerylogger.php
similarity index 88%
rename from lib/public/debug/iquerylogger.php
rename to lib/public/diagnostics/iquerylogger.php
index fe8eae089da..0fba9eb8b10 100644
--- a/lib/public/debug/iquerylogger.php
+++ b/lib/public/diagnostics/iquerylogger.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Debug;
+namespace OCP\Diagnostics;
 
 use Doctrine\DBAL\Logging\SQLLogger;
 
@@ -21,7 +21,7 @@ interface IQueryLogger extends SQLLogger {
 	public function stopQuery();
 
 	/**
-	 * @return \OCP\Debug\IQuery[]
+	 * @return \OCP\Diagnostics\IQuery[]
 	 */
 	public function getQueries();
 }
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 97ff74385a2..55c2c89b710 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -252,7 +252,7 @@ interface IServerContainer {
 	/**
 	 * Get the active event logger
 	 *
-	 * @return \OCP\Debug\IEventLogger
+	 * @return \OCP\Diagnostics\IEventLogger
 	 */
 	function getEventLogger();
 
@@ -261,7 +261,7 @@ interface IServerContainer {
 	 *
 	 * The returned logger only logs data when debug mode is enabled
 	 *
-	 * @return \OCP\Debug\IQueryLogger
+	 * @return \OCP\Diagnostics\IQueryLogger
 	 */
 	function getQueryLogger();
 }
-- 
GitLab


From 1e69f5e7ac3414f307aac16842655a34a2f3c709 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 3 Oct 2014 22:13:55 +0200
Subject: [PATCH 163/616] Log some basic events

---
 lib/base.php                      | 14 ++++++++++----
 lib/private/app.php               |  2 ++
 lib/private/diagnostics/event.php |  3 +++
 lib/private/route/router.php      |  4 ++++
 lib/private/server.php            |  1 +
 lib/private/util.php              |  4 ++++
 6 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 0086531e523..1201e46d542 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -454,6 +454,11 @@ class OC {
 		self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
 		spl_autoload_register(array(self::$loader, 'load'));
 
+		// setup the basic server
+		self::$server = new \OC\Server();
+		self::initPaths();
+		\OC::$server->getEventLogger()->start('boot', 'Initialize');
+
 		// set some stuff
 		//ob_start();
 		error_reporting(E_ALL | E_STRICT);
@@ -469,7 +474,6 @@ class OC {
 		if (get_magic_quotes_gpc() == 1) {
 			ini_set('magic_quotes_runtime', 0);
 		}
-
 		//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
@@ -485,9 +489,9 @@ class OC {
 		@ini_set('file_uploads', '50');
 
 		self::handleAuthHeaders();
-		self::initPaths();
 		self::registerAutoloaderCache();
 
+
 		OC_Util::isSetLocaleWorking();
 
 		// setup 3rdparty autoloader
@@ -516,9 +520,8 @@ class OC {
 		stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
 		stream_wrapper_register('oc', 'OC\Files\Stream\OC');
 
-		// setup the basic server
-		self::$server = new \OC\Server();
 
+		\OC::$server->getEventLogger()->start('init_session', 'Initialize session');
 		self::initTemplateEngine();
 		OC_App::loadApps(array('session'));
 		if (self::$CLI) {
@@ -526,6 +529,7 @@ class OC {
 		} else {
 			self::initSession();
 		}
+		\OC::$server->getEventLogger()->end('init_session');
 		self::checkConfig();
 		self::checkInstalled();
 		self::checkSSL();
@@ -612,6 +616,7 @@ class OC {
 
 			exit();
 		}
+		\OC::$server->getEventLogger()->end('boot');
 	}
 
 	private static function registerLocalAddressBook() {
@@ -701,6 +706,7 @@ class OC {
 	 * Handle the request
 	 */
 	public static function handleRequest() {
+		\OC::$server->getEventLogger()->start('handle_request', 'Handle request');
 		// load all the classpaths from the enabled apps so they are available
 		// in the routing files of each app
 		OC::loadAppClassPaths();
diff --git a/lib/private/app.php b/lib/private/app.php
index a97db7b5e53..8fcffbad950 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -89,6 +89,7 @@ class OC_App {
 	 */
 	public static function loadApp($app, $checkUpgrade = true) {
 		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)) {
 				throw new \OC\NeedsUpdateException();
 			}
@@ -100,6 +101,7 @@ class OC_App {
 				// enabled for groups
 				self::$enabledAppsCache = array();
 			}
+			\OC::$server->getEventLogger()->end('load_app_' . $app);
 		}
 	}
 
diff --git a/lib/private/diagnostics/event.php b/lib/private/diagnostics/event.php
index 063c0c49dc2..af5d2ff8840 100644
--- a/lib/private/diagnostics/event.php
+++ b/lib/private/diagnostics/event.php
@@ -81,6 +81,9 @@ class Event implements IEvent {
 	 * @return float
 	 */
 	public function getDuration() {
+		if (!$this->end) {
+			$this->end = microtime(true);
+		}
 		return $this->end - $this->start;
 	}
 }
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index aa3d05dcb85..fd6d9939184 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -202,6 +202,7 @@ class Router implements IRouter {
 	 * @return void
 	 */
 	public function match($url) {
+		\OC::$server->getEventLogger()->start('load_routes', 'Load routes');
 		if (substr($url, 0, 6) === '/apps/') {
 			// empty string / 'apps' / $app / rest of the route
 			list(, , $app,) = explode('/', $url, 4);
@@ -216,6 +217,7 @@ class Router implements IRouter {
 		} else {
 			$this->loadRoutes();
 		}
+		\OC::$server->getEventLogger()->end('load_routes');
 
 		$matcher = new UrlMatcher($this->root, $this->context);
 		try {
@@ -236,6 +238,7 @@ class Router implements IRouter {
 			}
 		}
 
+		\OC::$server->getEventLogger()->start('run_route', 'Run route');
 		if (isset($parameters['action'])) {
 			$action = $parameters['action'];
 			if (!is_callable($action)) {
@@ -249,6 +252,7 @@ class Router implements IRouter {
 		} else {
 			throw new \Exception('no action available');
 		}
+		\OC::$server->getEventLogger()->end('run_route');
 	}
 
 	/**
diff --git a/lib/private/server.php b/lib/private/server.php
index 7b8ed2cabf5..496c26e2503 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -225,6 +225,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			return new HTTPHelper($config);
 		});
 		$this->registerService('EventLogger', function ($c) {
+			/** @var Server $c */
 			if (defined('DEBUG') and DEBUG) {
 				return new EventLogger();
 			} else {
diff --git a/lib/private/util.php b/lib/private/util.php
index d6515872c5a..858138f58fe 100755
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -64,6 +64,8 @@ class OC_Util {
 			return false;
 		}
 
+		\OC::$server->getEventLogger()->start('setup_fs', 'Setup filesystem');
+
 		// If we are not forced to load a specific user we load the one that is logged in
 		if ($user == "" && OC_User::isLoggedIn()) {
 			$user = OC_User::getUser();
@@ -88,6 +90,7 @@ class OC_Util {
 		}
 
 		if ($user != '' && !OCP\User::userExists($user)) {
+			\OC::$server->getEventLogger()->end('setup_fs');
 			return false;
 		}
 
@@ -128,6 +131,7 @@ class OC_Util {
 
 			OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $userDir));
 		}
+		\OC::$server->getEventLogger()->end('setup_fs');
 		return true;
 	}
 
-- 
GitLab


From 4a8358bc509ed4f7771ae68f69fafed811a7e568 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 14 Oct 2014 15:49:00 +0200
Subject: [PATCH 164/616] Rename to NullQueryLogger

---
 .../{dummyeventlogger.php => nulleventlogger.php}         | 2 +-
 .../{dummyquerylogger.php => nullquerylogger.php}         | 2 +-
 lib/private/server.php                                    | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename lib/private/diagnostics/{dummyeventlogger.php => nulleventlogger.php} (92%)
 rename lib/private/diagnostics/{dummyquerylogger.php => nullquerylogger.php} (91%)

diff --git a/lib/private/diagnostics/dummyeventlogger.php b/lib/private/diagnostics/nulleventlogger.php
similarity index 92%
rename from lib/private/diagnostics/dummyeventlogger.php
rename to lib/private/diagnostics/nulleventlogger.php
index f1386d2e88c..fd71ee9e110 100644
--- a/lib/private/diagnostics/dummyeventlogger.php
+++ b/lib/private/diagnostics/nulleventlogger.php
@@ -13,7 +13,7 @@ use OCP\Diagnostics\IEventLogger;
 /**
  * Dummy event logger that doesn't actually log anything
  */
-class DummyEventLogger implements IEventLogger {
+class NullEventLogger implements IEventLogger {
 	/**
 	 * Mark the start of an event
 	 *
diff --git a/lib/private/diagnostics/dummyquerylogger.php b/lib/private/diagnostics/nullquerylogger.php
similarity index 91%
rename from lib/private/diagnostics/dummyquerylogger.php
rename to lib/private/diagnostics/nullquerylogger.php
index 1617b204e90..8467b4dd26c 100644
--- a/lib/private/diagnostics/dummyquerylogger.php
+++ b/lib/private/diagnostics/nullquerylogger.php
@@ -10,7 +10,7 @@ namespace OC\Diagnostics;
 
 use OCP\Diagnostics\IQueryLogger;
 
-class DummyQueryLogger implements IQueryLogger {
+class NullQueryLogger implements IQueryLogger {
 	/**
 	 * @param string $sql
 	 * @param array $params
diff --git a/lib/private/server.php b/lib/private/server.php
index 496c26e2503..f7ffee484ea 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -6,7 +6,7 @@ use OC\AppFramework\Http\Request;
 use OC\AppFramework\Db\Db;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Cache\UserCache;
-use OC\Diagnostics\DummyQueryLogger;
+use OC\Diagnostics\NullQueryLogger;
 use OC\Diagnostics\EventLogger;
 use OC\Diagnostics\QueryLogger;
 use OC\Security\CertificateManager;
@@ -15,7 +15,7 @@ use OC\Files\Node\Root;
 use OC\Files\View;
 use OC\Security\Crypto;
 use OC\Security\SecureRandom;
-use OC\Diagnostics\DummyEventLogger;
+use OC\Diagnostics\NullEventLogger;
 use OCP\IServerContainer;
 use OCP\ISession;
 use OC\Tagging\TagMapper;
@@ -229,14 +229,14 @@ class Server extends SimpleContainer implements IServerContainer {
 			if (defined('DEBUG') and DEBUG) {
 				return new EventLogger();
 			} else {
-				return new DummyEventLogger();
+				return new NullEventLogger();
 			}
 		});
 		$this->registerService('QueryLogger', function ($c) {
 			if (defined('DEBUG') and DEBUG) {
 				return new QueryLogger();
 			} else {
-				return new DummyQueryLogger();
+				return new NullQueryLogger();
 			}
 		});
 	}
-- 
GitLab


From beb1c6ad74015a8065d0ee00c6dba24cdc699477 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 15 Oct 2014 13:14:13 +0200
Subject: [PATCH 165/616] Allow adding events that hapend before the event
 logger was loaded

---
 lib/private/diagnostics/eventlogger.php     | 5 +++++
 lib/private/diagnostics/nulleventlogger.php | 5 ++++-
 lib/public/diagnostics/ieventlogger.php     | 8 ++++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/private/diagnostics/eventlogger.php b/lib/private/diagnostics/eventlogger.php
index 46084a1d496..9e557ebd304 100644
--- a/lib/private/diagnostics/eventlogger.php
+++ b/lib/private/diagnostics/eventlogger.php
@@ -27,6 +27,11 @@ class EventLogger implements IEventLogger {
 		}
 	}
 
+	public function log($id, $description, $start, $end) {
+		$this->events[$id] = new Event($id, $description, $start);
+		$this->events[$id]->end($end);
+	}
+
 	/**
 	 * @return \OCP\Diagnostics\IEvent[]
 	 */
diff --git a/lib/private/diagnostics/nulleventlogger.php b/lib/private/diagnostics/nulleventlogger.php
index fd71ee9e110..bf203cbfefd 100644
--- a/lib/private/diagnostics/nulleventlogger.php
+++ b/lib/private/diagnostics/nulleventlogger.php
@@ -31,10 +31,13 @@ class NullEventLogger implements IEventLogger {
 	public function end($id) {
 	}
 
+	public function log($id, $description, $start, $end) {
+	}
+
 	/**
 	 * @return \OCP\Diagnostics\IEvent[]
 	 */
-	public function getEvents(){
+	public function getEvents() {
 		return array();
 	}
 }
diff --git a/lib/public/diagnostics/ieventlogger.php b/lib/public/diagnostics/ieventlogger.php
index fa5880bfea6..cd9f2768ca3 100644
--- a/lib/public/diagnostics/ieventlogger.php
+++ b/lib/public/diagnostics/ieventlogger.php
@@ -24,6 +24,14 @@ interface IEventLogger {
 	 */
 	public function end($id);
 
+	/**
+	 * @param string $id
+	 * @param string $description
+	 * @param float $start
+	 * @param float $end
+	 */
+	public function log($id, $description, $start, $end);
+
 	/**
 	 * @return \OCP\Diagnostics\IEvent[]
 	 */
-- 
GitLab


From 9fd234f63f2e576c996bed69f2e9972aeff945e8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 15 Oct 2014 13:53:19 +0200
Subject: [PATCH 166/616] Log some additional events

---
 lib/base.php                 | 3 +++
 lib/private/route/router.php | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 1201e46d542..ef654e916ea 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -444,6 +444,7 @@ class OC {
 
 	public static function init() {
 		// register autoloader
+		$loaderStart = microtime(true);
 		require_once __DIR__ . '/autoloader.php';
 		self::$loader = new \OC\Autoloader();
 		self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
@@ -453,10 +454,12 @@ class OC {
 		self::$loader->registerPrefix('Patchwork', '3rdparty');
 		self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
 		spl_autoload_register(array(self::$loader, 'load'));
+		$loaderEnd = microtime(true);
 
 		// setup the basic server
 		self::$server = new \OC\Server();
 		self::initPaths();
+		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
 		\OC::$server->getEventLogger()->start('boot', 'Initialize');
 
 		// set some stuff
diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index fd6d9939184..645d6141964 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -106,6 +106,7 @@ class Router implements IRouter {
 	 * @return void
 	 */
 	public function loadRoutes($app = null) {
+		$requestedApp = $app;
 		if ($this->loaded) {
 			return;
 		}
@@ -123,6 +124,7 @@ class Router implements IRouter {
 				$routingFiles = array();
 			}
 		}
+		\OC::$server->getEventLogger()->start('loadroutes' . $requestedApp, 'Loading Routes');
 		foreach ($routingFiles as $app => $file) {
 			if (!isset($this->loadedApps[$app])) {
 				$this->loadedApps[$app] = true;
@@ -145,6 +147,7 @@ class Router implements IRouter {
 			$collection->addPrefix('/ocs');
 			$this->root->addCollection($collection);
 		}
+		\OC::$server->getEventLogger()->end('loadroutes' . $requestedApp);
 	}
 
 	/**
@@ -202,7 +205,6 @@ class Router implements IRouter {
 	 * @return void
 	 */
 	public function match($url) {
-		\OC::$server->getEventLogger()->start('load_routes', 'Load routes');
 		if (substr($url, 0, 6) === '/apps/') {
 			// empty string / 'apps' / $app / rest of the route
 			list(, , $app,) = explode('/', $url, 4);
@@ -217,7 +219,6 @@ class Router implements IRouter {
 		} else {
 			$this->loadRoutes();
 		}
-		\OC::$server->getEventLogger()->end('load_routes');
 
 		$matcher = new UrlMatcher($this->root, $this->context);
 		try {
-- 
GitLab


From 6af0e76a03b59e82a30e80ea726b274e431a9b61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 17 Oct 2014 11:42:10 +0200
Subject: [PATCH 167/616] remove legacy class OC_Updater

---
 lib/private/legacy/updater.php | 19 -------------------
 lib/private/templatelayout.php |  2 +-
 lib/private/updater.php        |  6 +++++-
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 lib/private/legacy/updater.php

diff --git a/lib/private/legacy/updater.php b/lib/private/legacy/updater.php
deleted file mode 100644
index 190748066c6..00000000000
--- a/lib/private/legacy/updater.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * provides an interface to all search providers
- *
- * @deprecated use \OC\Updater instead
- */
-class OC_Updater {
-	public static function check() {
-		$updater = new \OC\Updater();
-		return $updater->check('http://apps.owncloud.com/updater.php');
-	}
-}
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 10abff6267a..62c897fa9ce 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -46,7 +46,7 @@ class OC_TemplateLayout extends OC_Template {
 			if($this->config->getSystemValue('updatechecker', true) === true &&
 				OC_User::isAdminUser(OC_User::getUser())) {
 				$updater = new \OC\Updater();
-				$data = $updater->check('http://apps.owncloud.com/updater.php');
+				$data = $updater->check();
 
 				if(isset($data['version']) && $data['version'] != '' and $data['version'] !== Array()) {
 					$this->assign('updateAvailable', true);
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 3eb2cd4ec4c..38a281cd2f8 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -66,13 +66,17 @@ class Updater extends BasicEmitter {
 	 * @param string $updaterUrl the url to check, i.e. 'http://apps.owncloud.com/updater.php'
 	 * @return array|bool
 	 */
-	public function check($updaterUrl) {
+	public function check($updaterUrl = null) {
 
 		// Look up the cache - it is invalidated all 30 minutes
 		if ((\OC_Appconfig::getValue('core', 'lastupdatedat') + 1800) > time()) {
 			return json_decode(\OC_Appconfig::getValue('core', 'lastupdateResult'), true);
 		}
 
+		if (is_null($updaterUrl)) {
+			$updaterUrl = 'https://apps.owncloud.com/updater.php';
+		}
+
 		\OC_Appconfig::setValue('core', 'lastupdatedat', time());
 
 		if (\OC_Appconfig::getValue('core', 'installedat', '') == '') {
-- 
GitLab


From d9907b6fa3c1523ee19bc6c3d888a0d71521819e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 17 Oct 2014 12:08:31 +0200
Subject: [PATCH 168/616] move some deprecated usage of OC_Config and
 OC_AppConfig to \OC::server

---
 apps/files_sharing/ajax/list.php |  2 +-
 apps/files_sharing/tests/api.php | 22 +++++++++++-----------
 core/ajax/appconfig.php          | 15 ++++++++-------
 cron.php                         |  6 +++---
 lib/base.php                     |  2 +-
 5 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/apps/files_sharing/ajax/list.php b/apps/files_sharing/ajax/list.php
index 93964c5ed5b..7e2e54a1bd9 100644
--- a/apps/files_sharing/ajax/list.php
+++ b/apps/files_sharing/ajax/list.php
@@ -76,7 +76,7 @@ $data['dirToken'] = $linkItem['token'];
 $permissions = $linkItem['permissions'];
 
 // if globally disabled
-if (OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
+if (\OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
 	// only allow reading
 	$permissions = \OCP\PERMISSION_READ;
 }
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index fd3d25564b6..035aa1b6a5b 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -180,7 +180,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 		// sharing file to a user should work if shareapi_exclude_groups is set
 		// to no
-		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
 		$_POST['path'] = $this->filename;
 		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
 		$_POST['shareType'] = \OCP\Share::SHARE_TYPE_USER;
@@ -204,8 +204,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$this->assertTrue($result);
 
 		// exclude groups, but not the group the user belongs to. Sharing should still work
-		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'yes');
-		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'yes');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', 'admin,group1,group2');
 
 		$_POST['path'] = $this->filename;
 		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
@@ -230,7 +230,7 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$this->assertTrue($result);
 
 		// now we exclude the group the user belongs to ('group'), sharing should fail now
-		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', 'admin,group');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', 'admin,group');
 
 		$_POST['path'] = $this->filename;
 		$_POST['shareWith'] = \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2;
@@ -241,8 +241,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		$this->assertFalse($result->succeeded());
 
 		// cleanup
-		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups', 'no');
-		\OC_Appconfig::setValue('core', 'shareapi_exclude_groups_list', '');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups_list', '');
 	}
 
 
@@ -1209,9 +1209,9 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 
 	public function testDefaultExpireDate() {
 		\Test_Files_Sharing_Api::loginHelper(\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER1);
-		\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'yes');
-		\OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'yes');
-		\OC_Appconfig::setValue('core', 'shareapi_expire_after_n_days', '2');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_default_expire_date', 'yes');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_enforce_expire_date', 'yes');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_expire_after_n_days', '2');
 
 		// default expire date is set to 2 days
 		// the time when the share was created is set to 3 days in the past
@@ -1255,8 +1255,8 @@ class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
 		//cleanup
 		$result = \OCP\Share::unshare('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2);
 		$this->assertTrue($result);
-		\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'no');
-		\OC_Appconfig::setValue('core', 'shareapi_enforce_expire_date', 'no');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_default_expire_date', 'no');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_enforce_expire_date', 'no');
 
 	}
 }
diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 05b7572c6d7..7d73185dae6 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -24,27 +24,28 @@ if($app === 'core' && isset($_POST['key']) &&(substr($_POST['key'],0,7) === 'rem
 }
 
 $result=false;
+$appConfig = \OC::$server->getAppConfig();
 switch($action) {
 	case 'getValue':
-		$result=OC_Appconfig::getValue($app, $_GET['key'], $_GET['defaultValue']);
+		$result=$appConfig->getValue($app, $_GET['key'], $_GET['defaultValue']);
 		break;
 	case 'setValue':
-		$result=OC_Appconfig::setValue($app, $_POST['key'], $_POST['value']);
+		$result=$appConfig->setValue($app, $_POST['key'], $_POST['value']);
 		break;
 	case 'getApps':
-		$result=OC_Appconfig::getApps();
+		$result=$appConfig->getApps();
 		break;
 	case 'getKeys':
-		$result=OC_Appconfig::getKeys($app);
+		$result=$appConfig->getKeys($app);
 		break;
 	case 'hasKey':
-		$result=OC_Appconfig::hasKey($app, $_GET['key']);
+		$result=$appConfig->hasKey($app, $_GET['key']);
 		break;
 	case 'deleteKey':
-		$result=OC_Appconfig::deleteKey($app, $_POST['key']);
+		$result=$appConfig->deleteKey($app, $_POST['key']);
 		break;
 	case 'deleteApp':
-		$result=OC_Appconfig::deleteApp($app);
+		$result=$appConfig->deleteApp($app);
 		break;
 }
 OC_JSON::success(array('data'=>$result));
diff --git a/cron.php b/cron.php
index e77cc885aba..8344e551680 100644
--- a/cron.php
+++ b/cron.php
@@ -132,9 +132,9 @@ try {
 
 	// done!
 	TemporaryCronClass::$sent = true;
-	// Log the successfull cron exec
-	if (OC_Config::getValue('cron_log', true)) {
-		OC_Appconfig::setValue('core', 'lastcron', time());
+	// Log the successful cron execution
+	if (\OC::$server->getConfig()->getSystemValue('cron_log', true)) {
+		\OC::$server->getAppConfig()->setValue('core', 'lastcron', time());
 	}
 	exit();
 
diff --git a/lib/base.php b/lib/base.php
index 0086531e523..5ba8d3829ca 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -573,7 +573,7 @@ class OC {
 		register_shutdown_function(array('OC_Helper', 'cleanTmp'));
 
 		if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) {
-			if (OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
+			if (\OC::$server->getAppConfig()->getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
 				OC_Util::addScript('backgroundjobs');
 			}
 		}
-- 
GitLab


From c8e8945efbac31605b6cb80723992b8bfdbd259c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 13 Oct 2014 17:44:57 +0200
Subject: [PATCH 169/616] implement localizations based on punic

---
 3rdparty              |   2 +-
 core/js/config.php    |   4 +-
 core/l10n/l10n-de.php |   7 ---
 core/l10n/l10n-en.php |   7 ---
 core/l10n/l10n-es.php |   7 ---
 lib/private/l10n.php  | 106 ++++++++++++++++++------------------------
 tests/lib/l10n.php    |  52 +++++++++++++++++++--
 7 files changed, 95 insertions(+), 90 deletions(-)
 delete mode 100644 core/l10n/l10n-de.php
 delete mode 100644 core/l10n/l10n-en.php
 delete mode 100644 core/l10n/l10n-es.php

diff --git a/3rdparty b/3rdparty
index f6d7a519e4d..0c0fb2a67df 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit f6d7a519e4dca5189963abb15e5c9858b03bf98d
+Subproject commit 0c0fb2a67dfa0392ebcea2fab558513f00006258
diff --git a/core/js/config.php b/core/js/config.php
index 6994f2ed8a2..52405725f23 100644
--- a/core/js/config.php
+++ b/core/js/config.php
@@ -39,7 +39,7 @@ $array = array(
 	"oc_isadmin" => OC_User::isAdminUser(OC_User::getUser()) ? 'true' : 'false',
 	"oc_webroot" => "\"".OC::$WEBROOT."\"",
 	"oc_appswebroots" =>  str_replace('\\/', '/', json_encode($apps_paths)), // Ugly unescape slashes waiting for better solution
-	"datepickerFormatDate" => json_encode($l->l('jsdate', 'jsdate')),
+	"datepickerFormatDate" => json_encode($l->getDateFormat()),
 	"dayNames" =>  json_encode(
 		array(
 			(string)$l->t('Sunday'),
@@ -67,7 +67,7 @@ $array = array(
 			(string)$l->t('December')
 		)
 	),
-	"firstDay" => json_encode($l->l('firstday', 'firstday')) ,
+	"firstDay" => json_encode($l->getFirstWeekDay()) ,
 	"oc_config" => json_encode(
 		array(
 			'session_lifetime'	=> min(\OCP\Config::getSystemValue('session_lifetime', ini_get('session.gc_maxlifetime')), ini_get('session.gc_maxlifetime')),
diff --git a/core/l10n/l10n-de.php b/core/l10n/l10n-de.php
deleted file mode 100644
index 77d35af4936..00000000000
--- a/core/l10n/l10n-de.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$LOCALIZATIONS = array(
-	'jsdate' => 'dd.mm.yy',
-	'date' => '%d.%m.%Y',
-	'datetime' => '%d.%m.%Y %H:%M:%S',
-	'time' => '%H:%M:%S',
-	'firstday' => 0 );
diff --git a/core/l10n/l10n-en.php b/core/l10n/l10n-en.php
deleted file mode 100644
index 9ee748bee23..00000000000
--- a/core/l10n/l10n-en.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$LOCALIZATIONS = array(
-	'jsdate' => 'MM d, yy',
-	'date' => '%B %e, %Y',
-	'datetime' => '%B %e, %Y %H:%M',
-	'time' => '%H:%M:%S',
-	'firstday' => 0 );
diff --git a/core/l10n/l10n-es.php b/core/l10n/l10n-es.php
deleted file mode 100644
index 13db2ec5d4c..00000000000
--- a/core/l10n/l10n-es.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$LOCALIZATIONS = array(
-	'jsdate' => "d 'de' MM 'de' yy",
-	'date' => '%e de %B de %Y',
-	'datetime' => '%e de %B de %Y %H:%M',
-	'time' => '%H:%M:%S',
-	'firstday' => 1 );
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 57886a796cd..0b20eafea32 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -61,16 +61,6 @@ class OC_L10N implements \OCP\IL10N {
 	 */
 	private $plural_form_function = null;
 
-	/**
-	 * Localization
-	 */
-	private $localizations = array(
-		'jsdate' => 'dd.mm.yy',
-		'date' => '%d.%m.%Y',
-		'datetime' => '%d.%m.%Y %H:%M:%S',
-		'time' => '%H:%M:%S',
-		'firstday' => 0);
-
 	/**
 	 * get an L10N instance
 	 * @param string $app
@@ -126,13 +116,10 @@ class OC_L10N implements \OCP\IL10N {
 
 		// Use cache if possible
 		if(array_key_exists($app.'::'.$lang, self::$cache)) {
-
 			$this->translations = self::$cache[$app.'::'.$lang]['t'];
-			$this->localizations = self::$cache[$app.'::'.$lang]['l'];
-		}
-		else{
+		} else{
 			$i18ndir = self::findI18nDir($app);
-			// Localization is in /l10n, Texts are in $i18ndir
+			// Texts are in $i18ndir
 			// (Just no need to define date/time format etc. twice)
 			if((OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
 				|| OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/')
@@ -162,16 +149,7 @@ class OC_L10N implements \OCP\IL10N {
 				}
 			}
 
-			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php') && OC_Helper::isSubDirectory(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')) {
-				// Include the file, save the data from $CONFIG
-				include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php';
-				if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) {
-					$this->localizations = array_merge($this->localizations, $LOCALIZATIONS);
-				}
-			}
-
 			self::$cache[$app.'::'.$lang]['t'] = $this->translations;
-			self::$cache[$app.'::'.$lang]['l'] = $this->localizations;
 		}
 	}
 
@@ -312,17 +290,6 @@ class OC_L10N implements \OCP\IL10N {
 		return $this->plural_form_function;
 	}
 
-	/**
-	 * get localizations
-	 * @return array Fetch all localizations
-	 *
-	 * Returns an associative array with all localizations
-	 */
-	public function getLocalizations() {
-		$this->init();
-		return $this->localizations;
-	}
-
 	/**
 	 * Localization
 	 * @param string $type Type of localization
@@ -334,45 +301,45 @@ class OC_L10N implements \OCP\IL10N {
 	 * Implemented types:
 	 *  - date
 	 *    - Creates a date
-	 *    - l10n-field: date
 	 *    - params: timestamp (int/string)
 	 *  - datetime
 	 *    - Creates date and time
-	 *    - l10n-field: datetime
 	 *    - params: timestamp (int/string)
 	 *  - time
 	 *    - Creates a time
-	 *    - l10n-field: time
 	 *    - params: timestamp (int/string)
 	 */
-	public function l($type, $data) {
+	public function l($type, $data, $options = array()) {
+		if ($type === 'firstday') {
+			return $this->getFirstWeekDay();
+		}
+		if ($type === 'jsdate') {
+			return $this->getDateFormat();
+		}
+
 		$this->init();
+		$value = new DateTime();
+		if($data instanceof DateTime) {
+			$value = $data;
+		} elseif(is_string($data) && !is_numeric($data)) {
+			$data = strtotime($data);
+			$value->setTimestamp($data);
+		} else {
+			$value->setTimestamp($data);
+		}
+		$locale = self::findLanguage();
+		$options = array_merge(array('width' => 'long'), $options);
+		$width = $options['width'];
 		switch($type) {
-			// If you add something don't forget to add it to $localizations
-			// at the top of the page
 			case 'date':
+				return Punic\Calendar::formatDate($value, $width, $locale);
+				break;
 			case 'datetime':
+				return Punic\Calendar::formatDatetime($value, $width, $locale);
+				break;
 			case 'time':
-				if($data instanceof DateTime) {
-					$data = $data->getTimestamp();
-				} elseif(is_string($data) && !is_numeric($data)) {
-					$data = strtotime($data);
-				}
-				$locales = array(self::findLanguage());
-				if (strlen($locales[0]) == 2) {
-					$locales[] = $locales[0].'_'.strtoupper($locales[0]);
-				}
-				setlocale(LC_TIME, $locales);
-				$format = $this->localizations[$type];
-				// Check for Windows to find and replace the %e modifier correctly
-				if (strtoupper(substr(PHP_OS, 0, 3)) == 'WIN') {
-					$format = preg_replace('#(?<!%)((?:%%)*)%e#', '\1%#d', $format);
-				}
-				return strftime($format, $data);
+				return Punic\Calendar::formatTime($value, $width, $locale);
 				break;
-			case 'firstday':
-			case 'jsdate':
-				return $this->localizations[$type];
 			default:
 				return false;
 		}
@@ -495,7 +462,7 @@ class OC_L10N implements \OCP\IL10N {
 	/**
 	 * find the l10n directory
 	 * @param string $app App that needs to be translated
-	 * @return directory
+	 * @return string directory
 	 */
 	protected static function findI18nDir($app) {
 		// find the i18n dir
@@ -547,4 +514,21 @@ class OC_L10N implements \OCP\IL10N {
 		}
 		return false;
 	}
+
+	/**
+	 * @return string
+	 * @throws \Punic\Exception\ValueNotInList
+	 */
+	public function getDateFormat() {
+		$locale = self::findLanguage();
+		return Punic\Calendar::getDateFormat('short', $locale);
+	}
+
+	/**
+	 * @return int
+	 */
+	public function getFirstWeekDay() {
+		$locale = self::findLanguage();
+		return Punic\Calendar::getFirstWeekday($locale);
+	}
 }
diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php
index 5ddf2290c35..26ad87b60f6 100644
--- a/tests/lib/l10n.php
+++ b/tests/lib/l10n.php
@@ -52,17 +52,59 @@ class Test_L10n extends PHPUnit_Framework_TestCase {
 		$this->assertEquals('5 oken', (string)$l->n('%n window', '%n windows', 5));
 	}
 
+	public function localizationDataProvider() {
+		return array(
+			// timestamp as string
+			array('February 13, 2009 at 11:31:30 PM GMT+0', 'en', 'datetime', '1234567890'),
+			array('13. Februar 2009 um 23:31:30 GMT+0', 'de', 'datetime', '1234567890'),
+			array('February 13, 2009', 'en', 'date', '1234567890'),
+			array('13. Februar 2009', 'de', 'date', '1234567890'),
+			array('11:31:30 PM GMT+0', 'en', 'time', '1234567890'),
+			array('23:31:30 GMT+0', 'de', 'time', '1234567890'),
+
+			// timestamp as int
+			array('February 13, 2009 at 11:31:30 PM GMT+0', 'en', 'datetime', 1234567890),
+			array('13. Februar 2009 um 23:31:30 GMT+0', 'de', 'datetime', 1234567890),
+			array('February 13, 2009', 'en', 'date', 1234567890),
+			array('13. Februar 2009', 'de', 'date', 1234567890),
+			array('11:31:30 PM GMT+0', 'en', 'time', 1234567890),
+			array('23:31:30 GMT+0', 'de', 'time', 1234567890),
+
+			// DateTime object
+			array('February 13, 2009 at 11:31:30 PM GMT+0', 'en', 'datetime', new DateTime('@1234567890')),
+			array('13. Februar 2009 um 23:31:30 GMT+0', 'de', 'datetime', new DateTime('@1234567890')),
+			array('February 13, 2009', 'en', 'date', new DateTime('@1234567890')),
+			array('13. Februar 2009', 'de', 'date', new DateTime('@1234567890')),
+			array('11:31:30 PM GMT+0', 'en', 'time', new DateTime('@1234567890')),
+			array('23:31:30 GMT+0', 'de', 'time', new DateTime('@1234567890')),
+		);
+	}
+
 	/**
-	 * Issue #4360: Do not call strtotime() on numeric strings.
+	 * @dataProvider localizationDataProvider
 	 */
-	public function testNumericStringToDateTime() {
+	public function testNumericStringLocalization($expectedDate, $lang, $type, $value) {
 		$l = new OC_L10N('test');
-		$this->assertSame('February 13, 2009 23:31', $l->l('datetime', '1234567890'));
+		$l->forceLanguage($lang);
+		$this->assertSame($expectedDate, $l->l($type, $value));
+	}
+
+	public function firstDayDataProvider() {
+		return array(
+			array(1, 'de'),
+			array(0, 'en'),
+		);
 	}
 
-	public function testNumericToDateTime() {
+	/**
+	 * @dataProvider firstDayDataProvider
+	 * @param $expected
+	 * @param $lang
+	 */
+	public function testFirstWeekDay($expected, $lang) {
 		$l = new OC_L10N('test');
-		$this->assertSame('February 13, 2009 23:31', $l->l('datetime', 1234567890));
+		$l->forceLanguage($lang);
+		$this->assertSame($expected, $l->l('firstday', 'firstday'));
 	}
 
 	/**
-- 
GitLab


From a359fe7e6a7e43c2253aeca96b594dc25bece3d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 17 Oct 2014 10:50:46 +0200
Subject: [PATCH 170/616] adding unit tests for en_GB and en-GB - just to
 verify

---
 tests/lib/l10n.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php
index 26ad87b60f6..a97fa22f05c 100644
--- a/tests/lib/l10n.php
+++ b/tests/lib/l10n.php
@@ -77,6 +77,14 @@ class Test_L10n extends PHPUnit_Framework_TestCase {
 			array('13. Februar 2009', 'de', 'date', new DateTime('@1234567890')),
 			array('11:31:30 PM GMT+0', 'en', 'time', new DateTime('@1234567890')),
 			array('23:31:30 GMT+0', 'de', 'time', new DateTime('@1234567890')),
+
+			// en_GB
+			array('13 February 2009 at 23:31:30 GMT+0', 'en_GB', 'datetime', new DateTime('@1234567890')),
+			array('13 February 2009', 'en_GB', 'date', new DateTime('@1234567890')),
+			array('23:31:30 GMT+0', 'en_GB', 'time', new DateTime('@1234567890')),
+			array('13 February 2009 at 23:31:30 GMT+0', 'en-GB', 'datetime', new DateTime('@1234567890')),
+			array('13 February 2009', 'en-GB', 'date', new DateTime('@1234567890')),
+			array('23:31:30 GMT+0', 'en-GB', 'time', new DateTime('@1234567890')),
 		);
 	}
 
-- 
GitLab


From 7b94c7f9c1d2dd8115506d90f04f9e3e2f989cf5 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 20 Oct 2014 12:37:32 +0200
Subject: [PATCH 171/616] Refer to relative path instead of absolute path

There is no need to refer to the absolute path here if we can use the relative one.

Conflicts:
	lib/private/templatelayout.php
---
 lib/private/templatelayout.php | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 10abff6267a..558ddad4af2 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -157,7 +157,7 @@ class OC_TemplateLayout extends OC_Template {
 
 	public function generateAssets() {
 		$jsFiles = self::findJavascriptFiles(OC_Util::$scripts);
-		$jsHash = self::hashScriptNames($jsFiles);
+		$jsHash = self::hashFileNames($jsFiles);
 
 		if (!file_exists("assets/$jsHash.js")) {
 			$jsFiles = array_map(function ($item) {
@@ -179,7 +179,7 @@ class OC_TemplateLayout extends OC_Template {
 		}
 
 		$cssFiles = self::findStylesheetFiles(OC_Util::$styles);
-		$cssHash = self::hashScriptNames($cssFiles);
+		$cssHash = self::hashFileNames($cssFiles);
 
 		if (!file_exists("assets/$cssHash.css")) {
 			$cssFiles = array_map(function ($item) {
@@ -210,17 +210,30 @@ class OC_TemplateLayout extends OC_Template {
 		$this->append('cssfiles', OC_Helper::linkTo('assets', "$cssHash.css"));
 	}
 
+	/**
+	 * Converts the absolute filepath to a relative path from \OC::$SERVERROOT
+	 * @param string $filePath Absolute path
+	 * @return string Relative path
+	 * @throws Exception If $filePath is not under \OC::$SERVERROOT
+	 */
+	public static function convertToRelativePath($filePath) {
+		$relativePath = explode(\OC::$SERVERROOT, $filePath);
+		if(count($relativePath) !== 2) {
+			throw new \Exception('$filePath is not under the \OC::$SERVERROOT');
+		}
+
+		return $relativePath[1];
+	}
+
 	/**
 	 * @param array $files
 	 * @return string
 	 */
-	private static function hashScriptNames($files) {
 
-		$files = array_map(function ($item) {
-			$root = $item[0];
-			$file = $item[2];
-			return $root . '/' . $file;
-		}, $files);
+	private static function hashFileNames($files) {
+		foreach($files as $i => $file) {
+			$files[$i] = self::convertToRelativePath($file[0]).'/'.$file[2];
+		}
 
 		sort($files);
 		// include the apps' versions hash to invalidate the cached assets
-- 
GitLab


From 8f8abdbaeef7bcaff1f822714a7f227933cc43c1 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 15 Oct 2014 13:43:04 +0200
Subject: [PATCH 172/616] Add unit tests for convertToRelativePath

---
 lib/private/request.php      |  2 +-
 tests/lib/templatelayout.php | 44 ++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 tests/lib/templatelayout.php

diff --git a/lib/private/request.php b/lib/private/request.php
index fa446837a97..1cfa4a150c5 100755
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -245,7 +245,7 @@ class OC_Request {
 	 * @return string Path info or false when not found
 	 */
 	public static function getRawPathInfo() {
-		$requestUri = $_SERVER['REQUEST_URI'];
+		$requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
 		// remove too many leading slashes - can be caused by reverse proxy configuration
 		if (strpos($requestUri, '/') === 0) {
 			$requestUri = '/' . ltrim($requestUri, '/');
diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php
new file mode 100644
index 00000000000..f87db4fa54b
--- /dev/null
+++ b/tests/lib/templatelayout.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Test;
+
+/**
+ * @package OC\Test
+ */
+class OC_TemplateLayout extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * Contains valid file paths in the scheme array($absolutePath, $expectedPath)
+	 * @return array
+	 */
+	public function validFilePathProvider() {
+		return array(
+			array(\OC::$SERVERROOT . '/apps/files/js/fancyJS.js', '/apps/files/js/fancyJS.js'),
+			array(\OC::$SERVERROOT. '/test.js', '/test.js'),
+			array(\OC::$SERVERROOT . '/core/test.js', '/core/test.js'),
+			array(\OC::$SERVERROOT, ''),
+		);
+	}
+
+	/**
+	 * @dataProvider validFilePathProvider
+	 */
+	public function testConvertToRelativePath($absolutePath, $expected) {
+		$relativePath = \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($absolutePath));
+		$this->assertEquals($expected, $relativePath);
+	}
+
+	/**
+	 * @expectedException \Exception
+	 * @expectedExceptionMessage $filePath is not under the \OC::$SERVERROOT
+	 */
+	public function testInvalidConvertToRelativePath() {
+		\Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array('/this/file/is/invalid'));
+	}
+}
-- 
GitLab


From 4ce3c25c5c90725e203a8fc2ab24eb5d7cc514bb Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 20 Oct 2014 13:35:23 +0200
Subject: [PATCH 173/616] Add "$_SERVER['REQUEST_URI']" to fix the unit tests

Let's hope that works
---
 tests/lib/templatelayout.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php
index f87db4fa54b..87e5f1b50bd 100644
--- a/tests/lib/templatelayout.php
+++ b/tests/lib/templatelayout.php
@@ -30,6 +30,9 @@ class OC_TemplateLayout extends \PHPUnit_Framework_TestCase {
 	 * @dataProvider validFilePathProvider
 	 */
 	public function testConvertToRelativePath($absolutePath, $expected) {
+		$_SERVER['REQUEST_URI'] = $expected;
+		$_SERVER['SCRIPT_NAME'] = '/';
+
 		$relativePath = \Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($absolutePath));
 		$this->assertEquals($expected, $relativePath);
 	}
@@ -39,6 +42,10 @@ class OC_TemplateLayout extends \PHPUnit_Framework_TestCase {
 	 * @expectedExceptionMessage $filePath is not under the \OC::$SERVERROOT
 	 */
 	public function testInvalidConvertToRelativePath() {
-		\Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array('/this/file/is/invalid'));
+		$invalidFile = '/this/file/is/invalid';
+		$_SERVER['REQUEST_URI'] = $invalidFile;
+		$_SERVER['SCRIPT_NAME'] = '/';
+
+		\Test_Helper::invokePrivate(new \OC_TemplateLayout('user'), 'convertToRelativePath', array($invalidFile));
 	}
 }
-- 
GitLab


From f52ed231b38fa3d0b8a6d22ad94bd60cbede4a63 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 20 Oct 2014 16:20:24 +0200
Subject: [PATCH 174/616] Hide SQLite information on setup when autoconfig is
 used

---
 core/templates/installation.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/templates/installation.php b/core/templates/installation.php
index b74d4caf107..9ef63dbfe8c 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -147,7 +147,9 @@
 		<?php endif; ?>
 	<?php endif; ?>
 
+	<?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 	<p id="sqliteInformation" class="info"><?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.'));?></p>
+	<?php endif ?>
 
 	<div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>
 </form>
-- 
GitLab


From 51976b2729a496cb2aa79d844f00d27112a66930 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 20 Oct 2014 17:11:08 +0200
Subject: [PATCH 175/616] Add proper setup and teardown

Properly restore REQUEST_URI and SCRIPT_NAME after test runs
---
 tests/lib/templatelayout.php | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php
index 87e5f1b50bd..0335c7c88ee 100644
--- a/tests/lib/templatelayout.php
+++ b/tests/lib/templatelayout.php
@@ -13,6 +13,23 @@ namespace OC\Test;
  */
 class OC_TemplateLayout extends \PHPUnit_Framework_TestCase {
 
+	private $oldServerUri;
+	private $oldScriptName;
+
+	public function setUp() {
+		$this->oldServerURI = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null;
+		$this->oldScriptName = $_SERVER['SCRIPT_NAME'];
+	}
+
+	public function tearDown() {
+		if ($this->oldServerURI === null) {
+			unset($_SERVER['REQUEST_URI']);
+		} else {
+			$_SERVER['REQUEST_URI'] = $this->oldServerURI;
+		}
+		$_SERVER['SCRIPT_NAME'] = $this->oldScriptName;
+	}
+
 	/**
 	 * Contains valid file paths in the scheme array($absolutePath, $expectedPath)
 	 * @return array
-- 
GitLab


From f451ecb8d848636f37d8c80f1f12ab3c695c136f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 20 Oct 2014 20:00:34 +0200
Subject: [PATCH 176/616] URLEncode filenames to be compatible with special
 characters

---
 apps/files/controller/apicontroller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php
index 01f9086c27d..89d24a5c47f 100644
--- a/apps/files/controller/apicontroller.php
+++ b/apps/files/controller/apicontroller.php
@@ -32,7 +32,7 @@ class ApiController extends Controller {
 	 *
 	 * @param int $x
 	 * @param int $y
-	 * @param string $file
+	 * @param string $file URL-encoded filename
 	 * @return JSONResponse|DownloadResponse
 	 */
 	public function getThumbnail($x, $y, $file) {
@@ -41,9 +41,9 @@ class ApiController extends Controller {
 		}
 
 		try {
-			$preview = new Preview('', 'files', $file, $x, $y, true);
+			$preview = new Preview('', 'files', urldecode($file), $x, $y, true);
 			echo($preview->showPreview('image/png'));
-			return new DownloadResponse($file.'.png', 'image/png');
+			return new DownloadResponse(urldecode($file).'.png', 'image/png');
 		} catch (\Exception $e) {
 			return new JSONResponse('File not found.', Http::STATUS_NOT_FOUND);
 		}
-- 
GitLab


From d277ef6ac265a108a19ca725c4eea68b29e0e472 Mon Sep 17 00:00:00 2001
From: jknockaert <jasper@knockaert.nl>
Date: Mon, 20 Oct 2014 23:04:11 +0200
Subject: [PATCH 177/616] bugfixes

---
 apps/files_encryption/lib/util.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 75cf78c5f94..fcfcbb83f7f 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -435,15 +435,16 @@ class Util {
 						$lastChunkContentEncrypted=substr($lastChunkContentEncrypted,Crypt::BLOCKSIZE);
 					}
 				}
-
+				fclose($stream);
 				$relPath = \OCA\Encryption\Helper::stripUserFilesPath($path);
-				$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
+				$shareKey = Keymanager::getShareKey($this->view, $this->keyId, $this, $relPath);
+				if($shareKey===false) {
+					return $result;
+				}
+				$session = new \OCA\Encryption\Session($this->view);
 				$privateKey = $session->getPrivateKey();
 				$plainKeyfile = $this->decryptKeyfile($relPath, $privateKey);
-				$shareKey = Keymanager::getShareKey($this->view, $this->keyId, $this, $relPath);
-
 				$plainKey = Crypt::multiKeyDecrypt($plainKeyfile, $shareKey, $privateKey);
-				
 				$lastChunkContent=Crypt::symmetricDecryptFileContent($lastChunkContentEncrypted, $plainKey, $cipher);
 
 				// calc the real file size with the size of the last chunk
-- 
GitLab


From da44150a1584d4684eced96f7757016c0e27944b Mon Sep 17 00:00:00 2001
From: jknockaert <jasper@knockaert.nl>
Date: Mon, 20 Oct 2014 23:25:54 +0200
Subject: [PATCH 178/616] small fix

---
 apps/files_encryption/lib/util.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index fcfcbb83f7f..c98e21cdcb7 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -439,6 +439,7 @@ class Util {
 				$relPath = \OCA\Encryption\Helper::stripUserFilesPath($path);
 				$shareKey = Keymanager::getShareKey($this->view, $this->keyId, $this, $relPath);
 				if($shareKey===false) {
+					\OC_FileProxy::$enabled = $proxyStatus;
 					return $result;
 				}
 				$session = new \OCA\Encryption\Session($this->view);
-- 
GitLab


From 8485743e336c6995d80ce6d0f3021e9b6a54556a Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 21 Oct 2014 01:55:45 -0400
Subject: [PATCH 179/616] [tx-robot] updated from transifex

---
 apps/files/l10n/uk.php               |  4 +-
 apps/files_encryption/l10n/fr.php    |  4 +-
 apps/files_encryption/l10n/pt_PT.php |  6 +++
 apps/files_external/l10n/pt_PT.php   |  3 ++
 apps/files_sharing/l10n/pt_PT.php    |  1 +
 apps/user_ldap/l10n/en_GB.php        |  4 ++
 apps/user_ldap/l10n/fr.php           |  6 +--
 apps/user_ldap/l10n/pt_PT.php        |  4 ++
 core/l10n/en_GB.php                  |  1 +
 core/l10n/et_EE.php                  |  7 +++-
 core/l10n/pt_PT.php                  |  5 +++
 l10n/templates/core.pot              |  8 ++--
 l10n/templates/files.pot             |  2 +-
 l10n/templates/files_encryption.pot  |  2 +-
 l10n/templates/files_external.pot    |  2 +-
 l10n/templates/files_sharing.pot     |  2 +-
 l10n/templates/files_trashbin.pot    |  2 +-
 l10n/templates/files_versions.pot    |  2 +-
 l10n/templates/lib.pot               | 58 ++++++++++++++--------------
 l10n/templates/private.pot           | 58 ++++++++++++++--------------
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/templates/user_webdavauth.pot   |  2 +-
 lib/l10n/fr.php                      |  2 +-
 lib/l10n/pt_PT.php                   |  1 +
 lib/l10n/uk.php                      |  2 +
 settings/l10n/fr.php                 | 10 ++---
 settings/l10n/pt_PT.php              | 11 ++++++
 28 files changed, 128 insertions(+), 85 deletions(-)

diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index 866097faba6..f2927738a1e 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -60,8 +60,8 @@ $TRANSLATIONS = array(
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
-"_%n folder_::_%n folders_" => array("%n тека","%n тек","%n тек"),
-"_%n file_::_%n files_" => array("%n файл","%n файлів","%n файлів"),
+"_%n folder_::_%n folders_" => array("%n тека ","теки : %n ","теки : %n "),
+"_%n file_::_%n files_" => array("%n файл ","файли : %n ","файли : %n "),
 "You don’t have permission to upload or create files here" => "У вас недостатньо прав для завантаження або створення файлів тут",
 "_Uploading %n file_::_Uploading %n files_" => array("Завантаження %n файлу","Завантаження %n файлів","Завантаження %n файлів"),
 "\"{name}\" is an invalid file name." => "\"{name}\" - некоректне ім'я файлу.",
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
index 8c3e0ded613..2ca5eec48f0 100644
--- a/apps/files_encryption/l10n/fr.php
+++ b/apps/files_encryption/l10n/fr.php
@@ -1,9 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Erreur Inconnue ",
-"Missing recovery key password" => "Clef de de récupération de mot de passe manquante",
+"Missing recovery key password" => "Mot de passe de la clef de récupération manquant",
 "Please repeat the recovery key password" => "Répétez le mot de passe de la clé de récupération",
-"Repeated recovery key password does not match the provided recovery key password" => "Le mot de passe répété de la clé de récupération ne correspond pas au mot de passe de la clé de récupération donné",
+"Repeated recovery key password does not match the provided recovery key password" => "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.",
 "Recovery key successfully enabled" => "Clé de récupération activée avec succès",
 "Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
 "Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
index aede53f6414..e52165492d9 100644
--- a/apps/files_encryption/l10n/pt_PT.php
+++ b/apps/files_encryption/l10n/pt_PT.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Erro Desconhecido",
+"Missing recovery key password" => "Palavra-passe de recuperação em falta",
+"Please repeat the recovery key password" => "Repita a palavra-passe de recuperação",
+"Repeated recovery key password does not match the provided recovery key password" => "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
 "Recovery key successfully enabled" => "A chave de recuperação foi ativada com sucesso",
 "Could not disable recovery key. Please check your recovery key password!" => "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
 "Recovery key successfully disabled" => "A chave de recuperação foi desativada com sucesso",
+"Please provide the old recovery password" => "Escreva a palavra-passe de recuperação antiga",
+"Please provide a new recovery password" => "Escreva a nova palavra-passe de recuperação",
+"Please repeat the new recovery password" => "Escreva de novo a nova palavra-passe de recuperação",
 "Password successfully changed." => "Senha alterada com sucesso.",
 "Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
 "Private key password successfully updated." => "A senha da chave privada foi atualizada com sucesso. ",
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
index 9a12aebae45..185b5ef6cee 100644
--- a/apps/files_external/l10n/pt_PT.php
+++ b/apps/files_external/l10n/pt_PT.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Amazon S3 and compliant" => "Amazon S3 e compatível",
 "Access Key" => "Chave de acesso",
 "Secret Key" => "Chave Secreta",
+"Hostname" => "Hostname",
 "Port" => "Porta",
 "Region" => "Região",
 "Enable SSL" => "Activar SSL",
@@ -35,6 +36,7 @@ $TRANSLATIONS = array(
 "Password (required for OpenStack Object Storage)" => "Senha (necessária para OpenStack Object Storage)",
 "Service Name (required for OpenStack Object Storage)" => "Nome do Serviço (necessário para OpenStack Object Storage)",
 "URL of identity endpoint (required for OpenStack Object Storage)" => "Nome do Serviço (necessário para OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds" => "Timeout de pedidos HTTP em segundos",
 "Share" => "Partilhar",
 "SMB / CIFS using OC login" => "SMB / CIFS utilizando o início de sessão OC",
 "Username as share" => "Utilizar nome de utilizador como partilha",
@@ -47,6 +49,7 @@ $TRANSLATIONS = array(
 "Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
 "Personal" => "Pessoal",
 "System" => "Sistema",
+"All users. Type to select user or group." => "Todos os utilizadores. Digite para seleccionar utilizador ou grupo.",
 "(group)" => "(grupo)",
 "Saved" => "Guardado",
 "<b>Note:</b> " => "<b>Aviso:</b> ",
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
index fc5c7cabec5..59acb2d243a 100644
--- a/apps/files_sharing/l10n/pt_PT.php
+++ b/apps/files_sharing/l10n/pt_PT.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Server to server sharing is not enabled on this server" => "A partilha entre servidores não se encontra disponível",
+"The mountpoint name contains invalid characters." => "O nome de mountpoint contém caracteres inválidos.",
 "Invalid or untrusted SSL certificate" => "Certificado SSL inválido ou não confiável",
 "Couldn't add remote share" => "Ocorreu um erro ao adicionar a partilha remota",
 "Shared with you" => "Partilhado consigo ",
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
index cde3795bb6f..35a0e8d3ef9 100644
--- a/apps/user_ldap/l10n/en_GB.php
+++ b/apps/user_ldap/l10n/en_GB.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Edit raw filter instead",
 "Raw LDAP filter" => "Raw LDAP filter",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "The filter specifies which LDAP groups shall have access to the %s instance.",
+"Test Filter" => "Test Filter",
 "groups found" => "groups found",
 "Users login with this attribute:" => "Users login with this attribute:",
 "LDAP Username:" => "LDAP Username:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "For anonymous access, leave DN and Password empty.",
 "One Base DN per line" => "One Base DN per line",
 "You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.",
+"Manually enter LDAP filters (recommended for large directories)" => "Manually enter LDAP filters (recommended for large directories)",
 "Limit %s access to users meeting these criteria:" => "Limit %s access to users meeting these criteria:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "The filter specifies which LDAP users shall have access to the %s instance.",
 "users found" => "users found",
+"Saving" => "Saving",
 "Back" => "Back",
 "Continue" => "Continue",
 "Expert" => "Expert",
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 8d515fe5a15..0108c0e54bc 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -47,7 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Éditer le filtre raw à la place",
 "Raw LDAP filter" => "Filtre Raw LDAP",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Le filtre spécifie quels groupes LDAP doivent avoir accès à l'instance %s.",
-"Test Filter" => "Filtre de test",
+"Test Filter" => "Test du filtre",
 "groups found" => "groupes trouvés",
 "Users login with this attribute:" => "Utilisateurs se connectant avec cet attribut :",
 "LDAP Username:" => "Nom d'utilisateur LDAP :",
@@ -67,8 +67,8 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
 "One Base DN per line" => "Un DN racine par ligne",
 "You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Évite les requêtes LDAP automatiques. Mieux pour les grosses installations, mais demande des connaissances en LDAP.",
-"Manually enter LDAP filters (recommended for large directories)" => "Entrée manuelle des filtres LDAP (recommandé pour les gros dossiers)",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Évite les requêtes LDAP automatiques. Mieux pour les installations de grande ampleur, mais demande des connaissances en LDAP.",
+"Manually enter LDAP filters (recommended for large directories)" => "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
 "Limit %s access to users meeting these criteria:" => "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
 "users found" => "utilisateurs trouvés",
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
index fb4836c78b0..5f20348486b 100644
--- a/apps/user_ldap/l10n/pt_PT.php
+++ b/apps/user_ldap/l10n/pt_PT.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Editar filtro raw em vez disso",
 "Raw LDAP filter" => "Filtro LDAP Raw",
 "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.",
+"Test Filter" => "Testar Filtro",
 "groups found" => "grupos encontrados",
 "Users login with this attribute:" => "Utilizadores entrar com este atributo:",
 "LDAP Username:" => "Nome de utilizador LDAP:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "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",
+"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.",
 "users found" => "utilizadores encontrados",
+"Saving" => "Guardando",
 "Back" => "Voltar",
 "Continue" => "Continuar",
 "Expert" => "Perito",
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
index 06d1e37ca77..831a0dd511f 100644
--- a/core/l10n/en_GB.php
+++ b/core/l10n/en_GB.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
 "The share will expire on %s." => "The share will expire on %s.",
 "Cheers!" => "Cheers!",
+"Internal Server Error" => "Internal Server Error",
 "The server encountered an internal error and was unable to complete your request." => "The server encountered an internal error and was unable to complete your request.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
 "More details can be found in the server log." => "More details can be found in the server log.",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 3035ee91877..2aa5d95d18e 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -151,6 +151,8 @@ $TRANSLATIONS = array(
 "The share will expire on %s." => "Jagamine aegub %s.",
 "Cheers!" => "Terekest!",
 "Internal Server Error" => "Serveri sisemine viga",
+"The server encountered an internal error and was unable to complete your request." => "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.",
+"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.",
 "More details can be found in the server log." => "Lisainfot võib leida serveri logist.",
 "Technical details" => "Tehnilised andmed",
 "Remote Address: %s" => "Kaugaadress: %s",
@@ -159,6 +161,7 @@ $TRANSLATIONS = array(
 "Message: %s" => "Sõnum: %s",
 "File: %s" => "Fail: %s",
 "Line: %s" => "Rida: %s",
+"Trace" => "Jälita",
 "Security Warning" => "Turvahoiatus",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
 "Please update your PHP installation to use %s securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
@@ -201,6 +204,8 @@ $TRANSLATIONS = array(
 "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",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:"
+"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:",
+"This %s instance is currently being updated, which may take a while." => "Seda %s ownCloud instantsi hetkel uuendatakse, see võib võtta veidi aega.",
+"This page will refresh itself when the %s instance is available again." => "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index fdd1cfb5513..229ecfbccb5 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -68,6 +68,7 @@ $TRANSLATIONS = array(
 "Strong password" => "Password muito forte",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
 "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." => "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
+"Error occurred while checking server setup" => "Ocorreu um erro durante a verificação da configuração do servidor",
 "Shared" => "Partilhado",
 "Shared with {recipients}" => "Partilhado com {recipients}",
 "Share" => "Partilhar",
@@ -149,7 +150,10 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
 "The share will expire on %s." => "Esta partilha vai expirar em %s.",
 "Cheers!" => "Parabéns!",
+"Internal Server Error" => "Erro Interno do Servidor",
 "The server encountered an internal error and was unable to complete your request." => "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Entra em contacto com o administrador do servidor se este erro aparecer várias vezes, inclui também os detalhes técnicos abaixo no seu contacto.",
+"More details can be found in the server log." => "Mais detalhes podem ser encontrados no log do servidor.",
 "Technical details" => "Detalhes técnicos",
 "Remote Address: %s" => "Endereço remoto: %s",
 "Request ID: %s" => "ID do Pedido: %s",
@@ -157,6 +161,7 @@ $TRANSLATIONS = array(
 "Message: %s" => "Mensagem: %s",
 "File: %s" => "Ficheiro: %s",
 "Line: %s" => "Linha: %s",
+"Trace" => "Trace",
 "Security Warning" => "Aviso de Segurança",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 5829a00e76b..aef8e464cd5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -792,17 +792,17 @@ msgstr ""
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:150
+#: templates/installation.php:151
 msgid ""
 "SQLite will be used as database. For larger installations we recommend to "
 "change this."
 msgstr ""
 
-#: templates/installation.php:152
+#: templates/installation.php:154
 msgid "Finish setup"
 msgstr ""
 
-#: templates/installation.php:152
+#: templates/installation.php:154
 msgid "Finishing …"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index e7e1feaecc4..b2e43c8e205 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ee9c156693f..079ed7f85ab 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index fcb737cf643..815a84e8b8a 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index cb49d8aa143..07546d52bb2 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 522777c38ac..101b4a57b71 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 0636d381a88..b1d6fb906be 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 69e8f167803..793e7c0f937 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "See %s"
 msgstr ""
 
-#: base.php:209 private/util.php:453
+#: base.php:209 private/util.php:457
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
@@ -473,144 +473,144 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: private/util.php:438
+#: private/util.php:442
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: private/util.php:445
+#: private/util.php:449
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: private/util.php:452
+#: private/util.php:456
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: private/util.php:466
+#: private/util.php:470
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: private/util.php:467
+#: private/util.php:471
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: private/util.php:482
+#: private/util.php:486
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: private/util.php:483
+#: private/util.php:487
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: private/util.php:500
+#: private/util.php:504
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: private/util.php:503
+#: private/util.php:507
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: private/util.php:532
+#: private/util.php:536
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: private/util.php:552
+#: private/util.php:556
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: private/util.php:560
+#: private/util.php:564
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: private/util.php:561
+#: private/util.php:565
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: private/util.php:572
+#: private/util.php:576
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:573
+#: private/util.php:577
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:580
+#: private/util.php:584
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:581
+#: private/util.php:585
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:595
+#: private/util.php:599
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: private/util.php:596
+#: private/util.php:600
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: private/util.php:626
+#: private/util.php:630
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: private/util.php:627
+#: private/util.php:631
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: private/util.php:634
+#: private/util.php:638
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: private/util.php:635
+#: private/util.php:639
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: private/util.php:700
+#: private/util.php:704
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: private/util.php:709
+#: private/util.php:713
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: private/util.php:730
+#: private/util.php:734
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: private/util.php:731
+#: private/util.php:735
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 6c14b1f749d..d6960e54646 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -432,151 +432,151 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: util.php:438
+#: util.php:442
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: util.php:445
+#: util.php:449
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: util.php:452
+#: util.php:456
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: util.php:453
+#: util.php:457
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
 "config directory%s."
 msgstr ""
 
-#: util.php:466
+#: util.php:470
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: util.php:467
+#: util.php:471
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: util.php:482
+#: util.php:486
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: util.php:483
+#: util.php:487
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: util.php:500
+#: util.php:504
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: util.php:503
+#: util.php:507
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: util.php:532
+#: util.php:536
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: util.php:552
+#: util.php:556
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: util.php:560
+#: util.php:564
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: util.php:561
+#: util.php:565
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: util.php:572
+#: util.php:576
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:573
+#: util.php:577
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:580
+#: util.php:584
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:581
+#: util.php:585
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:595
+#: util.php:599
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: util.php:596
+#: util.php:600
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: util.php:626
+#: util.php:630
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: util.php:627
+#: util.php:631
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: util.php:634
+#: util.php:638
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: util.php:635
+#: util.php:639
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: util.php:700
+#: util.php:704
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: util.php:709
+#: util.php:713
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: util.php:730
+#: util.php:734
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: util.php:731
+#: util.php:735
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 91618d6887c..6dd60aa218c 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 569ac70cbe6..5a479a27a9a 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index cb4b5d18c90..c00dfd1ab86 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-20 01:54-0400\n"
+"POT-Creation-Date: 2014-10-21 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index 3e07893f749..8a61c6ff8ad 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -11,7 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Paramètres",
 "Users" => "Utilisateurs",
 "Admin" => "Administration",
-"Recommended" => "Recommandé",
+"Recommended" => "Recommandée",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \\\"%s\\\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.",
 "No app name specified" => "Aucun nom d'application spécifié",
 "Unknown filetype" => "Type de fichier inconnu",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index 20cfef8a2cb..f475fe934a6 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Configurações",
 "Users" => "Utilizadores",
 "Admin" => "Admin",
+"Recommended" => "Recomendado",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "A Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do owncloud.",
 "No app name specified" => "O nome da aplicação não foi especificado",
 "Unknown filetype" => "Ficheiro desconhecido",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 45df303d1e9..7c507a00dd7 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -1,5 +1,7 @@
 <?php
 $TRANSLATIONS = array(
+"Cannot write into \"config\" directory!" => "Не можу писати у каталог \"config\"!",
+"Sample configuration detected" => "Виявлено приклад конфігурації",
 "Help" => "Допомога",
 "Personal" => "Особисте",
 "Settings" => "Налаштування",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index e4931523d8f..2d0dd54c1d7 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"Enabled" => "Activer",
-"Not enabled" => "Désactivé",
-"Recommended" => "Recommandé",
+"Enabled" => "Activée",
+"Not enabled" => "Désactivée",
+"Recommended" => "Recommandée",
 "Authentication error" => "Erreur d'authentification",
 "Your full name has been changed." => "Votre nom complet a été modifié.",
 "Unable to change full name" => "Impossible de changer le nom complet",
@@ -151,7 +151,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Informations d'identification",
 "SMTP Username" => "Nom d'utilisateur SMTP",
 "SMTP Password" => "Mot de passe SMTP",
-"Store credentials" => "Identifiants du magasin",
+"Store credentials" => "Enregistrer les identifiants",
 "Test email settings" => "Tester les paramètres e-mail",
 "Send email" => "Envoyer un e-mail",
 "Log" => "Log",
@@ -167,7 +167,7 @@ $TRANSLATIONS = array(
 "Documentation:" => "Documentation :",
 "User Documentation" => "Documentation utilisateur",
 "Admin Documentation" => "Documentation administrateur",
-"Update to %s" => "Mise à jour jusqu'à %s",
+"Update to %s" => "Mettre à niveau vers la version %s",
 "Enable only for specific groups" => "Activer uniquement pour certains groupes",
 "Uninstall App" => "Désinstaller l'application",
 "Administrator Documentation" => "Documentation administrateur",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 6c1e9c8b53a..2eb87b14443 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Ativada",
+"Not enabled" => "Desactivado",
+"Recommended" => "Recomendado",
 "Authentication error" => "Erro na autenticação",
 "Your full name has been changed." => "O seu nome completo foi alterado.",
 "Unable to change full name" => "Não foi possível alterar o seu nome completo",
@@ -33,6 +35,7 @@ $TRANSLATIONS = array(
 "Saved" => "Guardado",
 "test email settings" => "testar configurações de email",
 "If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail as configurações parecem estar correctas",
+"A problem occurred while sending the email. Please revise your settings." => "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
 "Email sent" => "E-mail enviado",
 "You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
@@ -107,6 +110,7 @@ $TRANSLATIONS = array(
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
 "URL generation in notification emails" => "Geração URL em e-mails de notificação",
 "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
+"Connectivity checks" => "Verificações de conectividade",
 "No problems found" => "Nenhum problema encontrado",
 "Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
 "Cron" => "Cron",
@@ -147,6 +151,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Credenciais",
 "SMTP Username" => "Nome de utilizador SMTP",
 "SMTP Password" => "Password SMTP",
+"Store credentials" => "Armazenar credenciais",
 "Test email settings" => "Testar configurações de email",
 "Send email" => "Enviar email",
 "Log" => "Registo",
@@ -155,10 +160,14 @@ $TRANSLATIONS = array(
 "Less" => "Menos",
 "Version" => "Versão",
 "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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Mais aplicações",
+"Add your app" => "Adicione a sua aplicação",
 "by" => "por",
+"licensed" => "licenciado",
 "Documentation:" => "Documentação:",
 "User Documentation" => "Documentação de Utilizador",
 "Admin Documentation" => "Documentação de administrador.",
+"Update to %s" => "Actualizar para %s",
 "Enable only for specific groups" => "Activar só para grupos específicos",
 "Uninstall App" => "Desinstalar aplicação",
 "Administrator Documentation" => "Documentação de administrador.",
@@ -191,7 +200,9 @@ $TRANSLATIONS = array(
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
 "SSL root certificates" => "Certificados SSL de raiz",
+"Common Name" => "Nome Comum",
 "Valid until" => "Válido até",
+"Issued By" => "Emitido Por",
 "Valid until %s" => "Válido até %s",
 "Import Root Certificate" => "Importar Certificado Root",
 "The encryption app is no longer enabled, please decrypt all your files" => "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
-- 
GitLab


From 1c9004409b70461b61d9e6491584f1de6399a2be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 21 Oct 2014 12:58:26 +0200
Subject: [PATCH 180/616] guess mimetype on touch

---
 apps/files_external/lib/amazons3.php | 4 +++-
 apps/files_external/lib/swift.php    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 808de16c8a8..ae306fac420 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -457,11 +457,13 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				));
 				$this->testTimeout();
 			} else {
+				$mimeType = \OC_Helper::getMimetypeDetector()->detectPath($path);
 				$this->connection->putObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path),
 					'Metadata' => $metadata,
-					'Body' => ''
+					'Body' => '',
+					'ContentType' => $mimeType
 				));
 				$this->testTimeout();
 			}
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 6a1e12986fb..22a18202512 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -406,7 +406,8 @@ class Swift extends \OC\Files\Storage\Common {
 			$object->saveMetadata($metadata);
 			return true;
 		} else {
-			$customHeaders = array('content-type' => 'text/plain');
+			$mimeType = \OC_Helper::getMimetypeDetector()->detectPath($path);
+			$customHeaders = array('content-type' => $mimeType);
 			$metadataHeaders = DataObject::stockHeaders($metadata);
 			$allHeaders = $customHeaders + $metadataHeaders;
 			$this->container->uploadObject($path, '', $allHeaders);
-- 
GitLab


From 2814a294c8a80b179c1087eb5a09ced555c3aca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 21 Oct 2014 14:10:57 +0200
Subject: [PATCH 181/616] call initPaths() right before the server is
 instantiated

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

diff --git a/lib/base.php b/lib/base.php
index ef654e916ea..fd3493782ad 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -457,8 +457,8 @@ class OC {
 		$loaderEnd = microtime(true);
 
 		// setup the basic server
-		self::$server = new \OC\Server();
 		self::initPaths();
+		self::$server = new \OC\Server();
 		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
 		\OC::$server->getEventLogger()->start('boot', 'Initialize');
 
-- 
GitLab


From 69db442c4981baf895625017558d70408c61e269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 21 Oct 2014 16:05:35 +0200
Subject: [PATCH 182/616] fixing expected values for formatDate() unit tests

---
 tests/lib/util.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/lib/util.php b/tests/lib/util.php
index 600b794d8b8..9a3185b3f79 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -29,7 +29,7 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 		date_default_timezone_set("UTC");
 
 		$result = OC_Util::formatDate(1350129205);
-		$expected = 'October 13, 2012 11:53';
+		$expected = 'October 13, 2012 at 11:53:25 AM GMT+0';
 		$this->assertEquals($expected, $result);
 
 		$result = OC_Util::formatDate(1102831200, true);
@@ -41,7 +41,7 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 		date_default_timezone_set("UTC");
 
 		$result = OC_Util::formatDate(1350129205, false, 'Europe/Berlin');
-		$expected = 'October 13, 2012 13:53';
+		$expected = 'October 13, 2012 at 1:53:25 PM GMT+0';
 		$this->assertEquals($expected, $result);
 	}
 
@@ -57,7 +57,7 @@ class Test_Util extends PHPUnit_Framework_TestCase {
 
 		\OC::$server->getSession()->set('timezone', 3);
 		$result = OC_Util::formatDate(1350129205, false);
-		$expected = 'October 13, 2012 14:53';
+		$expected = 'October 13, 2012 at 2:53:25 PM GMT+0';
 		$this->assertEquals($expected, $result);
 	}
 
-- 
GitLab


From 916e710ece8ee99c634551701d0b79d5398882de Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 22 Oct 2014 01:55:22 -0400
Subject: [PATCH 183/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/uk.php   | 43 ++++++++++++++++++++++++++++-
 apps/files_external/l10n/uk.php     | 39 ++++++++++++++++++++++++++
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              |  2 +-
 l10n/templates/private.pot          |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/uk.php                     |  9 ++++++
 settings/l10n/cs_CZ.php             |  2 +-
 16 files changed, 103 insertions(+), 14 deletions(-)

diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
index 42c6cd39a61..674d5445bb7 100644
--- a/apps/files_encryption/l10n/uk.php
+++ b/apps/files_encryption/l10n/uk.php
@@ -1,9 +1,50 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Невідома помилка",
+"Missing recovery key password" => "Відсутній пароль ключа відновлення",
+"Please repeat the recovery key password" => "Введіть ще раз пароль для ключа відновлення",
+"Repeated recovery key password does not match the provided recovery key password" => "Введені паролі ключа відновлення не співпадають",
+"Recovery key successfully enabled" => "Ключ відновлення підключено",
+"Could not disable recovery key. Please check your recovery key password!" => "Не вдалося відключити ключ відновлення. Будь ласка, перевірте пароль ключа відновлення!",
+"Recovery key successfully disabled" => "Ключ відновлення відключено",
+"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." => "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+"Private key password successfully updated." => "Пароль секретного ключа оновлено.",
+"Could not update the private key password. Maybe the old password was not correct." => "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.",
+"File recovery settings updated" => "Налаштування файла відновлення оновлено",
+"Could not update file recovery" => "Не вдалося оновити файл відновлення ",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретний ключ не дійсний! Ймовірно ваш пароль був змінений ззовні %s (наприклад, корпоративний каталог). Ви можете оновити секретний ключ в особистих налаштуваннях на сторінці відновлення доступу до зашифрованих файлів.",
+"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
+"Unknown error. Please check your system settings or contact your administrator" => "Невідома помилка. Будь ласка, перевірте налаштування системи або зверніться до адміністратора.",
+"Missing requirements." => "Відсутні вимоги.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Будь ласка, впевніться, що встановлена версія PHP 5.3.3 або новіша, а також, що OpenSSL та інші розширення PHP підключені та вірно налаштовані. На даний момент додаток шифрування відключений.",
+"Following users are not set up for encryption:" => "Для наступних користувачів шифрування не налаштоване:",
+"Initial encryption started... This can take some time. Please wait." => "Початкове шифрування почалося... Це може зайняти деякий час. Будь ласка, почекайте.",
+"Initial encryption running... Please try again later." => "Початкове шифрування працює... Це може зайняти деякий час. Будь ласка, почекайте.",
+"Go directly to your %spersonal settings%s." => "Перейти навпростець до ваших %spersonal settings%s.",
 "Encryption" => "Шифрування",
 "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+"Enable recovery key (allow to recover users files in case of password loss):" => "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):",
+"Recovery key password" => "Пароль ключа відновлення",
+"Repeat Recovery key password" => "Введіть ще раз пароль ключа відновлення",
 "Enabled" => "Увімкнено",
-"Change Password" => "Змінити Пароль"
+"Disabled" => "Вимкнено",
+"Change recovery key password:" => "Змінити пароль ключа відновлення:",
+"Old Recovery key password" => "Старий пароль ключа відновлення",
+"New Recovery key password" => "Новий пароль ключа відновлення",
+"Repeat New Recovery key password" => "Введіть ще раз новий пароль ключа відновлення",
+"Change Password" => "Змінити Пароль",
+"Your private key password no longer matches your log-in password." => "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
+"Set your old private key password to your current log-in password:" => "Замініть старий пароль від закритого ключа на новий пароль входу:",
+" 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" => "Поточний пароль входу",
+"Update Private Key Password" => "Оновити пароль для закритого ключа",
+"Enable password recovery:" => "Ввімкнути відновлення паролю:",
+"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю"
 );
 $PLURAL_FORMS = "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/uk.php b/apps/files_external/l10n/uk.php
index 7ad93be519a..2c0c3081a5f 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -1,31 +1,70 @@
 <?php
 $TRANSLATIONS = array(
+"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Помилка при отримані токенів. Перевірте правильність вашого секретного ключа та ключ додатка.",
+"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Помилка при отримані токена доступу. Перевірте правильність вашого секретного ключа та ключ додатка.",
 "Please provide a valid Dropbox app key and secret." => "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
+"Step 1 failed. Exception: %s" => "1-й крок невдалий. Виключення: %s",
+"Step 2 failed. Exception: %s" => "2-й крок невдалий. Виключення: %s",
 "External storage" => "Зовнішнє сховище",
+"Local" => "Локально",
 "Location" => "Місце",
+"Amazon S3" => "Amazon S3",
+"Key" => "Ключ",
+"Secret" => "Секрет",
+"Bucket" => "Кошик",
+"Amazon S3 and compliant" => "Amazon S3 та сумісний",
+"Access Key" => "Ключ доступа",
+"Secret Key" => "Секретний ключ",
+"Hostname" => "Ім'я хоста",
 "Port" => "Порт",
 "Region" => "Регіон",
+"Enable SSL" => "Включити SSL",
+"Enable Path Style" => "Включити стиль шляху",
+"App key" => "Ключ додатку",
+"App secret" => "Секретний ключ додатку",
 "Host" => "Хост",
 "Username" => "Ім'я користувача",
 "Password" => "Пароль",
+"Root" => "Батьківський каталог",
+"Secure ftps://" => "Захищений ftps://",
+"Client ID" => "Ідентифікатор клієнта",
+"Client secret" => "Ключ клієнта",
 "OpenStack Object Storage" => "OpenStack Object Storage",
 "Region (optional for OpenStack Object Storage)" => "Регіон (опціонально для OpenStack Object Storage)",
+"API Key (required for Rackspace Cloud Files)" => "Ключ API (обов'язково для Rackspace Cloud Files)",
+"Tenantname (required for OpenStack Object Storage)" => "Ім'я орендатора (обов'язково для OpenStack Object Storage)",
 "Password (required for OpenStack Object Storage)" => "Пароль (обов’язково для OpenStack Object Storage)",
 "Service Name (required for OpenStack Object Storage)" => "Назва сервісу (обов’язково для OpenStack Object Storage)",
+"URL of identity endpoint (required for OpenStack Object Storage)" => "URL підтвердження кінцевої точки (обов'язково для OpenStack Object Storage)",
+"Timeout of HTTP requests in seconds" => "Тайм-аут HTTP запитів на секунду",
 "Share" => "Поділитися",
+"SMB / CIFS using OC login" => "SMB / CIFS з використанням логіна OC",
+"Username as share" => "Ім'я для відкритого доступу",
 "URL" => "URL",
+"Secure https://" => "Захищений https://",
+"Remote subfolder" => "Віддалений підкаталог",
 "Access granted" => "Доступ дозволено",
 "Error configuring Dropbox storage" => "Помилка при налаштуванні сховища Dropbox",
 "Grant access" => "Дозволити доступ",
 "Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive",
 "Personal" => "Особисте",
+"System" => "Система",
+"All users. Type to select user or group." => "Всі користувачі. Введіть ім'я користувача або групи.",
+"(group)" => "(група)",
 "Saved" => "Збереженно",
+"<b>Note:</b> " => "<b>Примітка:</b>",
+" and " => "та",
+"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
+"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
+"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
 "You don't have any external storages" => "У вас немає зовнішніх сховищ",
 "Name" => "Ім'я",
 "Storage type" => "Тип сховища",
+"Scope" => "Область",
 "External Storage" => "Зовнішні сховища",
 "Folder name" => "Ім'я теки",
 "Configuration" => "Налаштування",
+"Available for" => "Доступний для",
 "Add storage" => "Додати сховище",
 "Delete" => "Видалити",
 "Enable User External Storage" => "Активувати користувацькі зовнішні сховища",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index aef8e464cd5..bb688f4b822 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index b2e43c8e205..85bcc6e9e38 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 079ed7f85ab..1ed72859ac1 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 815a84e8b8a..de40b8e4104 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 07546d52bb2..ce322589b9b 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 101b4a57b71..a96d07ab85f 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index b1d6fb906be..de554c9148f 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 793e7c0f937..e2624fb4a1e 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index d6960e54646..2a22b412e4c 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 6dd60aa218c..017a2103699 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 5a479a27a9a..f25ec075da4 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index c00dfd1ab86..a02461b3eb2 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-21 01:54-0400\n"
+"POT-Creation-Date: 2014-10-22 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 7c507a00dd7..6a151d62026 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -1,16 +1,25 @@
 <?php
 $TRANSLATIONS = array(
 "Cannot write into \"config\" directory!" => "Не можу писати у каталог \"config\"!",
+"This can usually be fixed by giving the webserver write access to the config directory" => "Зазвичай це можна виправити, надавши веб-серверу права на запис в теці конфігурації",
+"See %s" => "Перегляд %s",
+"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Зазвичай це можна виправити, %sнадавши веб-серверу права на запис в теці конфігурації%s.",
 "Sample configuration detected" => "Виявлено приклад конфігурації",
+"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Була виявлена конфігурація з прикладу. Це може нашкодити вашій системі та не підтримується. Будь ласка, зверніться до документації перед внесенням змін в файл config.php",
 "Help" => "Допомога",
 "Personal" => "Особисте",
 "Settings" => "Налаштування",
 "Users" => "Користувачі",
 "Admin" => "Адмін",
 "Recommended" => "Рекомендуємо",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Додаток \\\"%s\\\" не встановлено через несумісність з даною версією  ownCloud.",
+"No app name specified" => "Не вказано ім'я додатку",
 "Unknown filetype" => "Невідомий тип файлу",
 "Invalid image" => "Невірне зображення",
 "web services under your control" => "підконтрольні Вам веб-сервіси",
+"App directory already exists" => "Тека додатку вже існує",
+"Can't create app folder. Please fix permissions. %s" => "Неможливо створити теку додатку. Будь ласка, виправте права доступу. %s",
+"No source specified when installing app" => "Не вказано джерело при встановлені додатку",
 "Application is not enabled" => "Додаток не увімкнений",
 "Authentication error" => "Помилка автентифікації",
 "Token expired. Please reload page." => "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 31189dc4633..44d3141eda1 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -137,7 +137,7 @@ $TRANSLATIONS = array(
 "Security" => "Zabezpečení",
 "Enforce HTTPS" => "Vynutit HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vynutí připojování klientů k %s šifrovaným spojením.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Připojte se k %s skrze HTTPS pro povolení nebo zakázání vynucování SSL.",
+"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
 "Email Server" => "E-mailový server",
 "This is used for sending out notifications." => "Toto se používá pro odesílání upozornění.",
 "Send mode" => "Mód odesílání",
-- 
GitLab


From b7718bc212e7579ad15c51d48447ff4eca44bff6 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 21 Oct 2014 16:19:54 +0200
Subject: [PATCH 184/616] always use the correct share type

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

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b827b84a9bc..48b1a531621 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1781,12 +1781,12 @@ class Share extends \OC\Share\Constants {
 
 			} elseif(!$sourceExists && !$isGroupShare)  {
 
-				$itemTarget = Helper::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $user,
+				$itemTarget = Helper::generateTarget($itemType, $itemSource, $shareType, $user,
 					$uidOwner, $suggestedItemTarget, $parent);
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
-							$fileTarget = Helper::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $user,
+							$fileTarget = Helper::generateTarget('file', $filePath, $shareType, $user,
 								$uidOwner, $suggestedFileTarget, $parent);
 							if ($fileTarget != $groupFileTarget) {
 								$parentFolders[$user]['folder'] = $fileTarget;
@@ -1796,7 +1796,7 @@ class Share extends \OC\Share\Constants {
 							$parent = $parentFolder[$user]['id'];
 						}
 					} else {
-						$fileTarget = Helper::generateTarget('file', $filePath, self::SHARE_TYPE_USER,
+						$fileTarget = Helper::generateTarget('file', $filePath, $shareType,
 							$user, $uidOwner, $suggestedFileTarget, $parent);
 					}
 				} else {
-- 
GitLab


From 72f99f5041fc4b217a4a5c3683444ee86d3ac878 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 10 Sep 2014 13:07:16 +0200
Subject: [PATCH 185/616] Remove \OC\DB\ConnectionWrapper, have
 \OC\DB\Connection implement \OCP\IDBConnection directly instead

---
 lib/private/db/connection.php        | 12 +---
 lib/private/db/connectionwrapper.php | 99 ----------------------------
 lib/private/server.php               |  2 +-
 3 files changed, 3 insertions(+), 110 deletions(-)
 delete mode 100644 lib/private/db/connectionwrapper.php

diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index b7981fcd691..f91175511b0 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -11,8 +11,9 @@ use Doctrine\DBAL\Driver;
 use Doctrine\DBAL\Configuration;
 use Doctrine\DBAL\Cache\QueryCacheProfile;
 use Doctrine\Common\EventManager;
+use OCP\IDBConnection;
 
-class Connection extends \Doctrine\DBAL\Connection {
+class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 	/**
 	 * @var string $tablePrefix
 	 */
@@ -185,13 +186,4 @@ class Connection extends \Doctrine\DBAL\Connection {
 	protected function replaceTablePrefix($statement) {
 		return str_replace( '*PREFIX*', $this->tablePrefix, $statement );
 	}
-
-	public function enableQueryStatementCaching() {
-		$this->cachingQueryStatementEnabled = true;
-	}
-
-	public function disableQueryStatementCaching() {
-		$this->cachingQueryStatementEnabled = false;
-		$this->preparedQueries = array();
-	}
 }
diff --git a/lib/private/db/connectionwrapper.php b/lib/private/db/connectionwrapper.php
deleted file mode 100644
index 132e76666ab..00000000000
--- a/lib/private/db/connectionwrapper.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Thomas Müller <deepdiver@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\DB;
-
-
-class ConnectionWrapper implements \OCP\IDBConnection {
-
-	private $connection;
-
-	public function __construct(Connection $conn) {
-		$this->connection = $conn;
-	}
-
-	/**
-	 * Used to the owncloud database access away
-	 * @param string $sql the sql query with ? placeholder for params
-	 * @param int $limit the maximum number of rows
-	 * @param int $offset from which row we want to start
-	 * @return \Doctrine\DBAL\Driver\Statement The prepared statement.
-	 */
-	public function prepare($sql, $limit = null, $offset = null)
-	{
-		return $this->connection->prepare($sql, $limit, $offset);
-	}
-
-	/**
-	 * Used to get the id of the just inserted element
-	 * @param string $table the name of the table where we inserted the item
-	 * @return string the id of the inserted element
-	 */
-	public function lastInsertId($table = null)
-	{
-		return $this->connection->lastInsertId($table);
-	}
-
-	/**
-	 * Insert a row if a matching row doesn't exists.
-	 * @param string $table The table name (will replace *PREFIX*) to perform the replace on.
-	 * @param array $input
-	 *
-	 * The input array if in the form:
-	 *
-	 * array ( 'id' => array ( 'value' => 6,
-	 *    'key' => true
-	 *    ),
-	 *    'name' => array ('value' => 'Stoyan'),
-	 *    'family' => array ('value' => 'Stefanov'),
-	 *    'birth_date' => array ('value' => '1975-06-20')
-	 *    );
-	 * @return bool
-	 *
-	 */
-	public function insertIfNotExist($table, $input)
-	{
-		return $this->connection->insertIfNotExist($table, $input);
-	}
-
-	/**
-	 * Start a transaction
-	 * @return bool TRUE on success or FALSE on failure
-	 */
-	public function beginTransaction()
-	{
-		return $this->connection->beginTransaction();
-	}
-
-	/**
-	 * Commit the database changes done during a transaction that is in progress
-	 * @return bool TRUE on success or FALSE on failure
-	 */
-	public function commit()
-	{
-		return $this->connection->commit();
-	}
-
-	/**
-	 * Rollback the database changes done during a transaction that is in progress
-	 * @return bool TRUE on success or FALSE on failure
-	 */
-	public function rollBack()
-	{
-		return $this->connection->rollBack();
-	}
-
-	/**
-	 * Gets the error code and message as a string for logging
-	 * @return string
-	 */
-	public function getError()
-	{
-		return $this->connection->getError();
-	}
-}
diff --git a/lib/private/server.php b/lib/private/server.php
index f7ffee484ea..26d540ab239 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -469,7 +469,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OCP\IDBConnection
 	 */
 	function getDatabaseConnection() {
-		return new ConnectionWrapper(\OC_DB::getConnection());
+		return \OC_DB::getConnection();
 	}
 
 	/**
-- 
GitLab


From 97a6f5c46b508cca2c6b55c062945fee5da7f834 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 10 Sep 2014 13:07:51 +0200
Subject: [PATCH 186/616] Extend \OCP\IDBConnection to cover more use cases

---
 lib/public/idbconnection.php | 64 ++++++++++++++++++++++++++++++++++--
 1 file changed, 61 insertions(+), 3 deletions(-)

diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
index 3e6624e07e9..d7cce2e818b 100644
--- a/lib/public/idbconnection.php
+++ b/lib/public/idbconnection.php
@@ -43,6 +43,32 @@ interface IDBConnection {
 	 */
 	public function prepare($sql, $limit=null, $offset=null);
 
+	/**
+	 * Executes an, optionally parameterized, SQL query.
+	 *
+	 * If the query is parameterized, a prepared statement is used.
+	 * If an SQLLogger is configured, the execution is logged.
+	 *
+	 * @param string $query The SQL query to execute.
+	 * @param string[] $params The parameters to bind to the query, if any.
+	 * @param array $types The types the previous parameters are in.
+	 * @return \Doctrine\DBAL\Driver\Statement The executed statement.
+	 */
+	public function executeQuery($query, array $params = array(), $types = array());
+
+	/**
+	 * Executes an SQL INSERT/UPDATE/DELETE query with the given parameters
+	 * and returns the number of affected rows.
+	 *
+	 * This method supports PDO binding types as well as DBAL mapping types.
+	 *
+	 * @param string $query The SQL query.
+	 * @param array $params The query parameters.
+	 * @param array $types The parameter types.
+	 * @return integer The number of affected rows.
+	 */
+	public function executeUpdate($query, array $params = array(), array $types = array());
+
 	/**
 	 * Used to get the id of the just inserted element
 	 * @param string $table the name of the table where we inserted the item
@@ -71,19 +97,16 @@ interface IDBConnection {
 
 	/**
 	 * Start a transaction
-	 * @return bool TRUE on success or FALSE on failure
 	 */
 	public function beginTransaction();
 
 	/**
 	 * Commit the database changes done during a transaction that is in progress
-	 * @return bool TRUE on success or FALSE on failure
 	 */
 	public function commit();
 
 	/**
 	 * Rollback the database changes done during a transaction that is in progress
-	 * @return bool TRUE on success or FALSE on failure
 	 */
 	public function rollBack();
 
@@ -92,4 +115,39 @@ interface IDBConnection {
 	 * @return string
 	 */
 	public function getError();
+
+	/**
+	 * Fetch the SQLSTATE associated with the last database operation.
+	 *
+	 * @return integer The last error code.
+	 */
+	public function errorCode();
+
+	/**
+	 * Fetch extended error information associated with the last database operation.
+	 *
+	 * @return array The last error information.
+	 */
+	public function errorInfo();
+
+	/**
+	 * Establishes the connection with the database.
+	 *
+	 * @return bool
+	 */
+	public function connect();
+
+	/**
+	 * Close the database connection
+	 */
+	public function close();
+
+	/**
+	 * Quotes a given input parameter.
+	 *
+	 * @param mixed $input Parameter to be quoted.
+	 * @param int $type Type of the parameter.
+	 * @return string The quoted parameter.
+	 */
+	public function quote($input, $type = \PDO::PARAM_STR);
 }
-- 
GitLab


From d4e929c37a70291e33c9a686e6e5576bd2a3dd86 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 10 Sep 2014 13:11:04 +0200
Subject: [PATCH 187/616] Remove implicit prepared statement cache and get the
 connection from the server container in \OC_DB

---
 core/command/maintenance/repair.php  |  4 ----
 lib/private/db.php                   | 35 +++++++---------------------
 lib/private/db/connection.php        | 16 +------------
 lib/private/db/connectionfactory.php | 13 -----------
 lib/private/preferences.php          |  6 ++---
 lib/private/updater.php              |  1 -
 6 files changed, 13 insertions(+), 62 deletions(-)

diff --git a/core/command/maintenance/repair.php b/core/command/maintenance/repair.php
index 9af5996b2e1..7c0cf71d3b6 100644
--- a/core/command/maintenance/repair.php
+++ b/core/command/maintenance/repair.php
@@ -35,10 +35,6 @@ class Repair extends Command {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		// TODO: inject DB connection/factory when possible
-		$connection = \OC_DB::getConnection();
-		$connection->disableQueryStatementCaching();
-
 		$maintenanceMode = $this->config->getValue('maintenance', false);
 		$this->config->setValue('maintenance', true);
 
diff --git a/lib/private/db.php b/lib/private/db.php
index ba069977d35..381ed93e81e 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -110,10 +110,9 @@ class OC_DB {
 	 * The existing database connection is closed and connected again
 	 */
 	public static function reconnect() {
-		if(self::$connection) {
-			self::$connection->close();
-			self::$connection->connect();
-		}
+		$connection = \OC::$server->getDatabaseConnection();
+		$connection->close();
+		$connection->connect();
 	}
 
 	/**
@@ -146,7 +145,7 @@ class OC_DB {
 	 * SQL query via Doctrine prepare(), needs to be execute()'d!
 	 */
 	static public function prepare( $query , $limit = null, $offset = null, $isManipulation = null) {
-		self::connect();
+		$connection = \OC::$server->getDatabaseConnection();
 
 		if ($isManipulation === null) {
 			//try to guess, so we return the number of rows on manipulations
@@ -155,7 +154,7 @@ class OC_DB {
 
 		// return the result
 		try {
-			$result = self::$connection->prepare($query, $limit, $offset);
+			$result =$connection->prepare($query, $limit, $offset);
 		} catch (\Doctrine\DBAL\DBALException $e) {
 			throw new \DatabaseException($e->getMessage(), $query);
 		}
@@ -252,8 +251,7 @@ class OC_DB {
 	 * cause trouble!
 	 */
 	public static function insertid($table=null) {
-		self::connect();
-		return self::$connection->lastInsertId($table);
+		return \OC::$server->getDatabaseConnection()->lastInsertId($table);
 	}
 
 	/**
@@ -263,24 +261,21 @@ class OC_DB {
 	 * @return boolean number of updated rows
 	 */
 	public static function insertIfNotExist($table, $input) {
-		self::connect();
-		return self::$connection->insertIfNotExist($table, $input);
+		return \OC::$server->getDatabaseConnection()->insertIfNotExist($table, $input);
 	}
 
 	/**
 	 * Start a transaction
 	 */
 	public static function beginTransaction() {
-		self::connect();
-		self::$connection->beginTransaction();
+		return \OC::$server->getDatabaseConnection()->beginTransaction();
 	}
 
 	/**
 	 * Commit the database changes done during a transaction that is in progress
 	 */
 	public static function commit() {
-		self::connect();
-		self::$connection->commit();
+		return \OC::$server->getDatabaseConnection()->commit();
 	}
 
 	/**
@@ -414,18 +409,6 @@ class OC_DB {
 		return '';
 	}
 
-	/**
-	 * @param bool $enabled
-	 */
-	static public function enableCaching($enabled) {
-		self::connect();
-		if ($enabled) {
-			self::$connection->enableQueryStatementCaching();
-		} else {
-			self::$connection->disableQueryStatementCaching();
-		}
-	}
-
 	/**
 	 * Checks if a table exists in the database - the database prefix will be prepended
 	 *
diff --git a/lib/private/db/connection.php b/lib/private/db/connection.php
index f91175511b0..a6cdf858899 100644
--- a/lib/private/db/connection.php
+++ b/lib/private/db/connection.php
@@ -24,13 +24,6 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 	 */
 	protected $adapter;
 
-	/**
-	 * @var \Doctrine\DBAL\Driver\Statement[] $preparedQueries
-	 */
-	protected $preparedQueries = array();
-
-	protected $cachingQueryStatementEnabled = true;
-
 	/**
 	 * Initializes a new instance of the Connection class.
 	 *
@@ -70,9 +63,6 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 			$platform = $this->getDatabasePlatform();
 			$statement = $platform->modifyLimitQuery($statement, $limit, $offset);
 		} else {
-			if (isset($this->preparedQueries[$statement]) && $this->cachingQueryStatementEnabled) {
-				return $this->preparedQueries[$statement];
-			}
 			$origStatement = $statement;
 		}
 		$statement = $this->replaceTablePrefix($statement);
@@ -81,11 +71,7 @@ class Connection extends \Doctrine\DBAL\Connection implements IDBConnection {
 		if(\OC_Config::getValue( 'log_query', false)) {
 			\OC_Log::write('core', 'DB prepare : '.$statement, \OC_Log::DEBUG);
 		}
-		$result = parent::prepare($statement);
-		if (is_null($limit) && $this->cachingQueryStatementEnabled) {
-			$this->preparedQueries[$origStatement] = $result;
-		}
-		return $result;
+		return parent::prepare($statement);
 	}
 
 	/**
diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php
index 589a1c0affd..a5260c1a4c5 100644
--- a/lib/private/db/connectionfactory.php
+++ b/lib/private/db/connectionfactory.php
@@ -98,19 +98,6 @@ class ConnectionFactory {
 			new \Doctrine\DBAL\Configuration(),
 			$eventManager
 		);
-		switch ($normalizedType) {
-			case 'sqlite3':
-				// Sqlite doesn't handle query caching and schema changes
-				// TODO: find a better way to handle this
-				/** @var $connection \OC\DB\Connection */
-				$connection->disableQueryStatementCaching();
-				break;
-			case 'oci':
-				// oracle seems to have issues with cached statements which have been closed
-				/** @var $connection \OC\DB\Connection */
-				$connection->disableQueryStatementCaching();
-				break;
-		}
 		return $connection;
 	}
 
diff --git a/lib/private/preferences.php b/lib/private/preferences.php
index a849cc23e1a..cdaa207449d 100644
--- a/lib/private/preferences.php
+++ b/lib/private/preferences.php
@@ -36,7 +36,7 @@
 
 namespace OC;
 
-use \OC\DB\Connection;
+use OCP\IDBConnection;
 
 
 /**
@@ -61,9 +61,9 @@ class Preferences {
 	protected $cache = array();
 
 	/**
-	 * @param \OC\DB\Connection $conn
+	 * @param \OCP\IDBConnection $conn
 	 */
-	public function __construct(Connection $conn) {
+	public function __construct(IDBConnection $conn) {
 		$this->conn = $conn;
 	}
 
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 38a281cd2f8..c4c70a3cc4a 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -129,7 +129,6 @@ class Updater extends BasicEmitter {
 	 * @return bool true if the operation succeeded, false otherwise
 	 */
 	public function upgrade() {
-		\OC_DB::enableCaching(false);
 		\OC_Config::setValue('maintenance', true);
 
 		$installedVersion = \OC_Config::getValue('version', '0.0.0');
-- 
GitLab


From 2ae6a0d96d45e2270a9c06bbfc91d1733fa9fce3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 10 Sep 2014 13:24:49 +0200
Subject: [PATCH 188/616] Move creating the database connection to the server
 container

---
 lib/private/appframework/db/db.php   | 52 +++++++++++++---------
 lib/private/db.php                   | 65 +---------------------------
 lib/private/db/connectionfactory.php | 37 ++++++++++++++++
 lib/private/server.php               | 21 ++++++++-
 4 files changed, 90 insertions(+), 85 deletions(-)

diff --git a/lib/private/appframework/db/db.php b/lib/private/appframework/db/db.php
index fc77a38f814..91572ad9e5a 100644
--- a/lib/private/appframework/db/db.php
+++ b/lib/private/appframework/db/db.php
@@ -30,28 +30,40 @@ use \OCP\IDb;
  * Small Facade for being able to inject the database connection for tests
  */
 class Db implements IDb {
+	/**
+	 * @var \OCP\IDBConnection
+	 */
+	protected $connection;
 
+	/**
+	 * @param \OCP\IDBConnection $connection
+	 */
+	public function __construct($connection) {
+		$this->connection = $connection;
+	}
 
-    /**
-     * Used to abstract the owncloud database access away
-     * @param string $sql the sql query with ? placeholder for params
-     * @param int $limit the maximum number of rows
-     * @param int $offset from which row we want to start
-     * @return \OC_DB_StatementWrapper prepared SQL query
-     */
-    public function prepareQuery($sql, $limit=null, $offset=null){
-        return \OCP\DB::prepare($sql, $limit, $offset);
-    }
-
-
-    /**
-     * Used to get the id of the just inserted element
-     * @param string $tableName the name of the table where we inserted the item
-     * @return int the id of the inserted element
-     */
-    public function getInsertId($tableName){
-        return \OCP\DB::insertid($tableName);
-    }
+	/**
+	 * Used to abstract the owncloud database access away
+	 *
+	 * @param string $sql the sql query with ? placeholder for params
+	 * @param int $limit the maximum number of rows
+	 * @param int $offset from which row we want to start
+	 * @return \OC_DB_StatementWrapper prepared SQL query
+	 */
+	public function prepareQuery($sql, $limit = null, $offset = null) {
+		return $this->connection->prepare($sql, $limit, $offset);
+	}
+
+
+	/**
+	 * Used to get the id of the just inserted element
+	 *
+	 * @param string $tableName the name of the table where we inserted the item
+	 * @return int the id of the inserted element
+	 */
+	public function getInsertId($tableName) {
+		return $this->connection->lastInsertId($tableName);
+	}
 
 
 }
diff --git a/lib/private/db.php b/lib/private/db.php
index 381ed93e81e..59d61ffa297 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -46,66 +46,6 @@ class OC_DB {
 	 */
 	static private $connection; //the preferred connection to use, only Doctrine
 
-	/**
-	 * connects to the database
-	 * @return boolean|null true if connection can be established or false on error
-	 *
-	 * Connects to the database as specified in config.php
-	 */
-	public static function connect() {
-		if(self::$connection) {
-			return true;
-		}
-
-		$type = OC_Config::getValue('dbtype', 'sqlite');
-		$factory = new \OC\DB\ConnectionFactory();
-		if (!$factory->isValidType($type)) {
-			return false;
-		}
-
-		$connectionParams = array(
-			'user' => OC_Config::getValue('dbuser', ''),
-			'password' => OC_Config::getValue('dbpassword', ''),
-		);
-		$name = OC_Config::getValue('dbname', 'owncloud');
-
-		if ($factory->normalizeType($type) === 'sqlite3') {
-			$datadir = OC_Config::getValue("datadirectory", OC::$SERVERROOT.'/data');
-			$connectionParams['path'] = $datadir.'/'.$name.'.db';
-		} else {
-			$host = OC_Config::getValue('dbhost', '');
-			if (strpos($host, ':')) {
-				// Host variable may carry a port or socket.
-				list($host, $portOrSocket) = explode(':', $host, 2);
-				if (ctype_digit($portOrSocket)) {
-					$connectionParams['port'] = $portOrSocket;
-				} else {
-					$connectionParams['unix_socket'] = $portOrSocket;
-				}
-			}
-			$connectionParams['host'] = $host;
-			$connectionParams['dbname'] = $name;
-		}
-
-		$connectionParams['tablePrefix'] = OC_Config::getValue('dbtableprefix', 'oc_');
-
-		try {
-			self::$connection = $factory->getConnection($type, $connectionParams);
-			self::$connection->getConfiguration()->setSQLLogger(\OC::$server->getQueryLogger());
-		} catch(\Doctrine\DBAL\DBALException $e) {
-			OC_Log::write('core', $e->getMessage(), OC_Log::FATAL);
-			OC_User::setUserId(null);
-
-			// send http status 503
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			OC_Template::printErrorPage('Failed to connect to database');
-			die();
-		}
-
-		return true;
-	}
-
 	/**
 	 * The existing database connection is closed and connected again
 	 */
@@ -116,11 +56,10 @@ class OC_DB {
 	}
 
 	/**
-	 * @return \OC\DB\Connection
+	 * @return \OCP\IDBConnection
 	 */
 	static public function getConnection() {
-		self::connect();
-		return self::$connection;
+		return \OC::$server->getDatabaseConnection();
 	}
 
 	/**
diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php
index a5260c1a4c5..1f676f1fca2 100644
--- a/lib/private/db/connectionfactory.php
+++ b/lib/private/db/connectionfactory.php
@@ -118,4 +118,41 @@ class ConnectionFactory {
 		$normalizedType = $this->normalizeType($type);
 		return isset($this->defaultConnectionParams[$normalizedType]);
 	}
+
+	/**
+	 * Create the connection parameters for the config
+	 *
+	 * @param \OCP\IConfig $config
+	 * @return array
+	 */
+	public function createConnectionParams($config) {
+		$type = $config->getSystemValue('dbtype', 'sqlite');
+
+		$connectionParams = array(
+			'user' => $config->getSystemValue('dbuser', ''),
+			'password' => $config->getSystemValue('dbpassword', ''),
+		);
+		$name = $config->getSystemValue('dbname', 'owncloud');
+
+		if ($this->normalizeType($type) === 'sqlite3') {
+			$datadir = $config->getSystemValue("datadirectory", \OC::$SERVERROOT . '/data');
+			$connectionParams['path'] = $datadir . '/' . $name . '.db';
+		} else {
+			$host = $config->getSystemValue('dbhost', '');
+			if (strpos($host, ':')) {
+				// Host variable may carry a port or socket.
+				list($host, $portOrSocket) = explode(':', $host, 2);
+				if (ctype_digit($portOrSocket)) {
+					$connectionParams['port'] = $portOrSocket;
+				} else {
+					$connectionParams['unix_socket'] = $portOrSocket;
+				}
+			}
+			$connectionParams['host'] = $host;
+			$connectionParams['dbname'] = $name;
+		}
+
+		$connectionParams['tablePrefix'] = $config->getSystemValue('dbtableprefix', 'oc_');
+		return $connectionParams;
+	}
 }
diff --git a/lib/private/server.php b/lib/private/server.php
index 26d540ab239..b0d63af1554 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -217,8 +217,25 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('Crypto', function ($c) {
 			return new Crypto(\OC::$server->getConfig(), \OC::$server->getSecureRandom());
 		});
+		$this->registerService('DatabaseConnection', function ($c) {
+			/**
+			 * @var Server $c
+			 */
+			$factory = new \OC\DB\ConnectionFactory();
+			$type = $c->getConfig()->getSystemValue('dbtype', 'sqlite');
+			if (!$factory->isValidType($type)) {
+				throw new \DatabaseException('Invalid database type');
+			}
+			$connectionParams = $factory->createConnectionParams($c->getConfig());
+			$connection = $factory->getConnection($type, $connectionParams);
+			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
+			return $connection;
+		});
 		$this->registerService('Db', function ($c) {
-			return new Db();
+			/**
+			 * @var Server $c
+			 */
+			return new Db($c->getDatabaseConnection());
 		});
 		$this->registerService('HTTPHelper', function (SimpleContainer $c) {
 			$config = $c->query('AllConfig');
@@ -469,7 +486,7 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return \OCP\IDBConnection
 	 */
 	function getDatabaseConnection() {
-		return \OC_DB::getConnection();
+		return $this->query('DatabaseConnection');
 	}
 
 	/**
-- 
GitLab


From e6f6cdd19fe2b9726fd85a684b9f624e509e3994 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 10 Sep 2014 13:33:59 +0200
Subject: [PATCH 189/616] Bit more cleanup

---
 lib/private/db.php                   | 35 ++++++++--------------------
 lib/private/db/mdb2schemamanager.php |  5 ++--
 lib/public/idbconnection.php         |  8 +++++++
 3 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/lib/private/db.php b/lib/private/db.php
index 59d61ffa297..9b904a1518f 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -41,19 +41,6 @@ class DatabaseException extends Exception {
  * Doctrine with some adaptions.
  */
 class OC_DB {
-	/**
-	 * @var \OC\DB\Connection $connection
-	 */
-	static private $connection; //the preferred connection to use, only Doctrine
-
-	/**
-	 * The existing database connection is closed and connected again
-	 */
-	public static function reconnect() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$connection->close();
-		$connection->connect();
-	}
 
 	/**
 	 * @return \OCP\IDBConnection
@@ -69,7 +56,7 @@ class OC_DB {
 	 */
 	private static function getMDB2SchemaManager()
 	{
-		return new \OC\DB\MDB2SchemaManager(self::getConnection());
+		return new \OC\DB\MDB2SchemaManager(\OC::$server->getDatabaseConnection());
 	}
 
 	/**
@@ -282,17 +269,17 @@ class OC_DB {
 	 * @param string $tableName the table to drop
 	 */
 	public static function dropTable($tableName) {
-
+		$connection = \OC::$server->getDatabaseConnection();
 		$tableName = OC_Config::getValue('dbtableprefix', 'oc_' ) . trim($tableName);
 
-		self::$connection->beginTransaction();
+		$connection->beginTransaction();
 
-		$platform = self::$connection->getDatabasePlatform();
+		$platform = $connection->getDatabasePlatform();
 		$sql = $platform->getDropTableSQL($platform->quoteIdentifier($tableName));
 
-		self::$connection->query($sql);
+		$connection->executeQuery($sql);
 
-		self::$connection->commit();
+		$connection->commit();
 	}
 
 	/**
@@ -332,8 +319,8 @@ class OC_DB {
 	}
 
 	public static function getErrorCode($error) {
-		$code = self::$connection->errorCode();
-		return $code;
+		$connection = \OC::$server->getDatabaseConnection();
+		return $connection->errorCode();
 	}
 	/**
 	 * returns the error code and message as a string for logging
@@ -342,10 +329,8 @@ class OC_DB {
 	 * @return string
 	 */
 	public static function getErrorMessage($error) {
-		if (self::$connection) {
-			return self::$connection->getError();
-		}
-		return '';
+		$connection = \OC::$server->getDatabaseConnection();
+		return $connection->getError();
 	}
 
 	/**
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index a07c421b9b8..fb3230e93af 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -21,7 +21,7 @@ class MDB2SchemaManager {
 	protected $conn;
 
 	/**
-	 * @param \OC\DB\Connection $conn
+	 * @param \OCP\IDBConnection $conn
 	 */
 	public function __construct($conn) {
 		$this->conn = $conn;
@@ -154,7 +154,8 @@ class MDB2SchemaManager {
 		$this->conn->commit();
 
 		if ($this->conn->getDatabasePlatform() instanceof SqlitePlatform) {
-			\OC_DB::reconnect();
+			$this->conn->close();
+			$this->conn->connect();
 		}
 		return true;
 	}
diff --git a/lib/public/idbconnection.php b/lib/public/idbconnection.php
index d7cce2e818b..ce17d293e86 100644
--- a/lib/public/idbconnection.php
+++ b/lib/public/idbconnection.php
@@ -150,4 +150,12 @@ interface IDBConnection {
 	 * @return string The quoted parameter.
 	 */
 	public function quote($input, $type = \PDO::PARAM_STR);
+
+	/**
+	 * Gets the DatabasePlatform instance that provides all the metadata about
+	 * the platform this driver connects to.
+	 *
+	 * @return \Doctrine\DBAL\Platforms\AbstractPlatform The database platform.
+	 */
+	public function getDatabasePlatform();
 }
-- 
GitLab


From d83b11d34acf5baf0d7c8618aa3ca21d501d8cf7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 20 Oct 2014 15:09:00 +0200
Subject: [PATCH 190/616] Use statements wrapper in \OCP\IDB

---
 lib/private/appframework/db/db.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/private/appframework/db/db.php b/lib/private/appframework/db/db.php
index 91572ad9e5a..fb30505d05a 100644
--- a/lib/private/appframework/db/db.php
+++ b/lib/private/appframework/db/db.php
@@ -51,7 +51,9 @@ class Db implements IDb {
 	 * @return \OC_DB_StatementWrapper prepared SQL query
 	 */
 	public function prepareQuery($sql, $limit = null, $offset = null) {
-		return $this->connection->prepare($sql, $limit, $offset);
+		$isManipulation = \OC_DB::isManipulation($sql);
+		$statement = $this->connection->prepare($sql, $limit, $offset);
+		return new \OC_DB_StatementWrapper($statement, $isManipulation);
 	}
 
 
-- 
GitLab


From 0dcb83203910a8de5bcfaca8cbad9fef1845a2ea Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 20 Oct 2014 15:09:19 +0200
Subject: [PATCH 191/616] Fix tags unit test

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

diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 2f7a1e817f8..57b64f1cd36 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -34,7 +34,7 @@ class Test_Tags extends PHPUnit_Framework_TestCase {
 		$this->objectType = uniqid('type_');
 		OC_User::createUser($this->user, 'pass');
 		OC_User::setUserId($this->user);
-		$this->tagMapper = new OC\Tagging\TagMapper(new OC\AppFramework\Db\Db());
+		$this->tagMapper = new OC\Tagging\TagMapper(\OC::$server->getDb());
 		$this->tagMgr = new OC\TagManager($this->tagMapper, $this->user);
 
 	}
-- 
GitLab


From 075e8d8e8658913e1c5b8869f3e457fa6db2d847 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 21 Oct 2014 16:18:44 +0200
Subject: [PATCH 192/616] Lazy initialize external storages

Fixed the following external storages to not connect in the constructor,
but do it on-demand when getConnection() is called.
- S3
- SWIFT
- SFTP
---
 apps/files_external/lib/amazons3.php | 100 +++++++++++----------
 apps/files_external/lib/dropbox.php  |   1 +
 apps/files_external/lib/ftp.php      |   2 +-
 apps/files_external/lib/google.php   |   1 +
 apps/files_external/lib/sftp.php     |  39 +++++---
 apps/files_external/lib/swift.php    | 127 +++++++++++++++++----------
 6 files changed, 163 insertions(+), 107 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index ae306fac420..da919236f8f 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -111,34 +111,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$params['port'] = ($params['use_ssl'] === 'false') ? 80 : 443;
 		}
 		$base_url = $scheme . '://' . $params['hostname'] . ':' . $params['port'] . '/';
-
-		$this->connection = S3Client::factory(array(
-			'key' => $params['key'],
-			'secret' => $params['secret'],
-			'base_url' => $base_url,
-			'region' => $params['region']
-		));
-
-		if (!$this->connection->isValidBucketName($this->bucket)) {
-			throw new \Exception("The configured bucket name is invalid.");
-		}
-
-		if (!$this->connection->doesBucketExist($this->bucket)) {
-			try {
-				$this->connection->createBucket(array(
-					'Bucket' => $this->bucket
-				));
-				$this->connection->waitUntilBucketExists(array(
-					'Bucket' => $this->bucket,
-					'waiter.interval' => 1,
-					'waiter.max_attempts' => 15
-				));
-				$this->testTimeout();
-			} catch (S3Exception $e) {
-				\OCP\Util::logException('files_external', $e);
-				throw new \Exception('Creation of bucket failed. '.$e->getMessage());
-			}
-		}
 	}
 
 	/**
@@ -181,7 +153,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		}
 
 		try {
-			$this->connection->putObject(array(
+			$this->getConnection()->putObject(array(
 				'Bucket' => $this->bucket,
 				'Key' => $path . '/',
 				'ContentType' => 'httpd/unix-directory'
@@ -216,7 +188,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 
 	protected function clearBucket() {
 		try {
-			$this->connection->clearBucket($this->bucket);
+			$this->getConnection()->clearBucket($this->bucket);
 			return true;
 			// clearBucket() is not working with Ceph, so if it fails we try the slower approach
 		} catch (\Exception $e) {
@@ -237,9 +209,9 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			// to delete all objects prefixed with the path.
 			do {
 				// instead of the iterator, manually loop over the list ...
-				$objects = $this->connection->listObjects($params);
+				$objects = $this->getConnection()->listObjects($params);
 				// ... so we can delete the files in batches
-				$this->connection->deleteObjects(array(
+				$this->getConnection()->deleteObjects(array(
 					'Bucket' => $this->bucket,
 					'Objects' => $objects['Contents']
 				));
@@ -264,7 +236,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 
 		try {
 			$files = array();
-			$result = $this->connection->getIterator('ListObjects', array(
+			$result = $this->getConnection()->getIterator('ListObjects', array(
 				'Bucket' => $this->bucket,
 				'Delimiter' => '/',
 				'Prefix' => $path
@@ -299,7 +271,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				$stat['size'] = -1; //unknown
 				$stat['mtime'] = time() - $this->rescanDelay * 1000;
 			} else {
-				$result = $this->connection->headObject(array(
+				$result = $this->getConnection()->headObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $path
 				));
@@ -328,10 +300,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		}
 
 		try {
-			if ($this->connection->doesObjectExist($this->bucket, $path)) {
+			if ($this->getConnection()->doesObjectExist($this->bucket, $path)) {
 				return 'file';
 			}
-			if ($this->connection->doesObjectExist($this->bucket, $path.'/')) {
+			if ($this->getConnection()->doesObjectExist($this->bucket, $path.'/')) {
 				return 'dir';
 			}
 		} catch (S3Exception $e) {
@@ -350,7 +322,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		}
 
 		try {
-			$this->connection->deleteObject(array(
+			$this->getConnection()->deleteObject(array(
 				'Bucket' => $this->bucket,
 				'Key' => $path
 			));
@@ -373,7 +345,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				self::$tmpFiles[$tmpFile] = $path;
 
 				try {
-					$this->connection->getObject(array(
+					$this->getConnection()->getObject(array(
 						'Bucket' => $this->bucket,
 						'Key' => $path,
 						'SaveAs' => $tmpFile
@@ -421,7 +393,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			return 'httpd/unix-directory';
 		} else if ($this->file_exists($path)) {
 			try {
-				$result = $this->connection->headObject(array(
+				$result = $this->getConnection()->headObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $path
 				));
@@ -449,7 +421,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				if ($fileType === 'dir' && ! $this->isRoot($path)) {
 					$path .= '/';
 				}
-				$this->connection->copyObject(array(
+				$this->getConnection()->copyObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path),
 					'Metadata' => $metadata,
@@ -458,7 +430,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				$this->testTimeout();
 			} else {
 				$mimeType = \OC_Helper::getMimetypeDetector()->detectPath($path);
-				$this->connection->putObject(array(
+				$this->getConnection()->putObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path),
 					'Metadata' => $metadata,
@@ -481,7 +453,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 
 		if ($this->is_file($path1)) {
 			try {
-				$this->connection->copyObject(array(
+				$this->getConnection()->copyObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $this->cleanKey($path2),
 					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1)
@@ -495,7 +467,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$this->remove($path2);
 
 			try {
-				$this->connection->copyObject(array(
+				$this->getConnection()->copyObject(array(
 					'Bucket' => $this->bucket,
 					'Key' => $path2 . '/',
 					'CopySource' => S3Client::encodeKey($this->bucket . '/' . $path1 . '/')
@@ -553,7 +525,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	}
 
 	public function test() {
-		$test = $this->connection->getBucketAcl(array(
+		$test = $this->getConnection()->getBucketAcl(array(
 			'Bucket' => $this->bucket,
 		));
 		if (isset($test) && !is_null($test->getPath('Owner/ID'))) {
@@ -566,7 +538,45 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		return $this->id;
 	}
 
+	/**
+	 * Returns the connection
+	 *
+	 * @return S3Client connected client
+	 * @throws \Exception if connection could not be made
+	 */
 	public function getConnection() {
+		if (!is_null($this->connection)) {
+			return $this->connection;
+		}
+
+		$this->connection = S3Client::factory(array(
+			'key' => $params['key'],
+			'secret' => $params['secret'],
+			'base_url' => $base_url,
+			'region' => $params['region']
+		));
+
+		if (!$this->connection->isValidBucketName($this->bucket)) {
+			throw new \Exception("The configured bucket name is invalid.");
+		}
+
+		if (!$this->connection->doesBucketExist($this->bucket)) {
+			try {
+				$this->connection->createBucket(array(
+					'Bucket' => $this->bucket
+				));
+				$this->connection->waitUntilBucketExists(array(
+					'Bucket' => $this->bucket,
+					'waiter.interval' => 1,
+					'waiter.max_attempts' => 15
+				));
+				$this->testTimeout();
+			} catch (S3Exception $e) {
+				\OCP\Util::logException('files_external', $e);
+				throw new \Exception('Creation of bucket failed. '.$e->getMessage());
+			}
+		}
+
 		return $this->connection;
 	}
 
@@ -576,7 +586,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		}
 
 		try {
-			$this->connection->putObject(array(
+			$this->getConnection()->putObject(array(
 				'Bucket' => $this->bucket,
 				'Key' => $this->cleanKey(self::$tmpFiles[$tmpFile]),
 				'SourceFile' => $tmpFile,
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 9f297d22dcb..cc1e628f851 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -44,6 +44,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $this->root;
 			$oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
 			$oauth->setToken($params['token'], $params['token_secret']);
+			// note: Dropbox_API connection is lazy
 			$this->dropbox = new \Dropbox_API($oauth, 'auto');
 		} else {
 			throw new \Exception('Creating \OC\Files\Storage\Dropbox storage failed');
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 2650a94f85e..4a995d21157 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -39,7 +39,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 				$this->root .= '/';
 			}
 		} else {
-			throw new \Exception();
+			throw new \Exception('Creating \OC\Files\Storage\FTP storage failed');
 		}
 		
 	}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 5d238a363de..62b0f182e98 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -52,6 +52,7 @@ class Google extends \OC\Files\Storage\Common {
 			$client->setScopes(array('https://www.googleapis.com/auth/drive'));
 			$client->setUseObjects(true);
 			$client->setAccessToken($params['token']);
+			// note: API connection is lazy
 			$this->service = new \Google_DriveService($client);
 			$token = json_decode($params['token'], true);
 			$this->id = 'google::'.substr($params['client_id'], 0, 30).$token['created'];
diff --git a/apps/files_external/lib/sftp.php b/apps/files_external/lib/sftp.php
index aec56d088d5..f0a6f145422 100644
--- a/apps/files_external/lib/sftp.php
+++ b/apps/files_external/lib/sftp.php
@@ -53,6 +53,18 @@ class SFTP extends \OC\Files\Storage\Common {
 		if (substr($this->root, -1, 1) != '/') {
 			$this->root .= '/';
 		}
+	}
+
+	/**
+	 * Returns the connection.
+	 *
+	 * @return \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 \Net_SFTP($this->host);
@@ -71,6 +83,7 @@ class SFTP extends \OC\Files\Storage\Common {
 		if (!$this->client->login($this->user, $this->password)) {
 			throw new \Exception('Login failed');
 		}
+		return $this->client;
 	}
 
 	public function test() {
@@ -81,7 +94,7 @@ class SFTP extends \OC\Files\Storage\Common {
 		) {
 			return false;
 		}
-		return $this->client->nlist() !== false;
+		return $this->getConnection()->nlist() !== false;
 	}
 
 	public function getId(){
@@ -149,7 +162,7 @@ class SFTP extends \OC\Files\Storage\Common {
 
 	public function mkdir($path) {
 		try {
-			return $this->client->mkdir($this->absPath($path));
+			return $this->getConnection()->mkdir($this->absPath($path));
 		} catch (\Exception $e) {
 			return false;
 		}
@@ -157,7 +170,7 @@ class SFTP extends \OC\Files\Storage\Common {
 
 	public function rmdir($path) {
 		try {
-			return $this->client->delete($this->absPath($path), true);
+			return $this->getConnection()->delete($this->absPath($path), true);
 		} catch (\Exception $e) {
 			return false;
 		}
@@ -165,7 +178,7 @@ class SFTP extends \OC\Files\Storage\Common {
 
 	public function opendir($path) {
 		try {
-			$list = $this->client->nlist($this->absPath($path));
+			$list = $this->getConnection()->nlist($this->absPath($path));
 			if ($list === false) {
 				return false;
 			}
@@ -186,7 +199,7 @@ class SFTP extends \OC\Files\Storage\Common {
 
 	public function filetype($path) {
 		try {
-			$stat = $this->client->stat($this->absPath($path));
+			$stat = $this->getConnection()->stat($this->absPath($path));
 			if ($stat['type'] == NET_SFTP_TYPE_REGULAR) {
 				return 'file';
 			}
@@ -202,7 +215,7 @@ class SFTP extends \OC\Files\Storage\Common {
 
 	public function file_exists($path) {
 		try {
-			return $this->client->stat($this->absPath($path)) !== false;
+			return $this->getConnection()->stat($this->absPath($path)) !== false;
 		} catch (\Exception $e) {
 			return false;
 		}
@@ -210,7 +223,7 @@ class SFTP extends \OC\Files\Storage\Common {
 
 	public function unlink($path) {
 		try {
-			return $this->client->delete($this->absPath($path), true);
+			return $this->getConnection()->delete($this->absPath($path), true);
 		} catch (\Exception $e) {
 			return false;
 		}
@@ -237,7 +250,7 @@ class SFTP extends \OC\Files\Storage\Common {
 				case 'x+':
 				case 'c':
 				case 'c+':
-					$context = stream_context_create(array('sftp' => array('session' => $this->client)));
+					$context = stream_context_create(array('sftp' => array('session' => $this->getConnection())));
 					return fopen($this->constructUrl($path), $mode, false, $context);
 			}
 		} catch (\Exception $e) {
@@ -251,7 +264,7 @@ class SFTP extends \OC\Files\Storage\Common {
 				return false;
 			}
 			if (!$this->file_exists($path)) {
-				$this->client->put($this->absPath($path), '');
+				$this->getConnection()->put($this->absPath($path), '');
 			} else {
 				return false;
 			}
@@ -262,11 +275,11 @@ class SFTP extends \OC\Files\Storage\Common {
 	}
 
 	public function getFile($path, $target) {
-		$this->client->get($path, $target);
+		$this->getConnection()->get($path, $target);
 	}
 
 	public function uploadFile($path, $target) {
-		$this->client->put($target, $path, NET_SFTP_LOCAL_FILE);
+		$this->getConnection()->put($target, $path, NET_SFTP_LOCAL_FILE);
 	}
 
 	public function rename($source, $target) {
@@ -274,7 +287,7 @@ class SFTP extends \OC\Files\Storage\Common {
 			if (!$this->is_dir($target) && $this->file_exists($target)) {
 				$this->unlink($target);
 			}
-			return $this->client->rename(
+			return $this->getConnection()->rename(
 				$this->absPath($source),
 				$this->absPath($target)
 			);
@@ -285,7 +298,7 @@ class SFTP extends \OC\Files\Storage\Common {
 
 	public function stat($path) {
 		try {
-			$stat = $this->client->stat($this->absPath($path));
+			$stat = $this->getConnection()->stat($this->absPath($path));
 
 			$mtime = $stat ? $stat['mtime'] : -1;
 			$size = $stat ? $stat['size'] : 0;
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 22a18202512..79effc04874 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -48,6 +48,12 @@ class Swift extends \OC\Files\Storage\Common {
 	 * @var string
 	 */
 	private $bucket;
+	/**
+	 * Connection parameters
+	 *
+	 * @var array
+	 */
+	private $params;
 	/**
 	 * @var array
 	 */
@@ -86,7 +92,7 @@ class Swift extends \OC\Files\Storage\Common {
 	 */
 	private function doesObjectExist($path) {
 		try {
-			$this->container->getPartialObject($path);
+			$this->getContainer()->getPartialObject($path);
 			return true;
 		} catch (ClientErrorResponseException $e) {
 			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -113,41 +119,7 @@ class Swift extends \OC\Files\Storage\Common {
 			$params['service_name'] = 'cloudFiles';
 		}
 
-		$settings = array(
-			'username' => $params['user'],
-		);
-
-		if (!empty($params['password'])) {
-			$settings['password'] = $params['password'];
-		} else if (!empty($params['key'])) {
-			$settings['apiKey'] = $params['key'];
-		}
-
-		if (!empty($params['tenant'])) {
-			$settings['tenantName'] = $params['tenant'];
-		}
-
-		if (!empty($params['timeout'])) {
-			$settings['timeout'] = $params['timeout'];
-		}
-
-		if (isset($settings['apiKey'])) {
-			$this->anchor = new Rackspace($params['url'], $settings);
-		} else {
-			$this->anchor = new OpenStack($params['url'], $settings);
-		}
-
-		$this->connection = $this->anchor->objectStoreService($params['service_name'], $params['region']);
-
-		try {
-			$this->container = $this->connection->getContainer($this->bucket);
-		} catch (ClientErrorResponseException $e) {
-			$this->container = $this->connection->createContainer($this->bucket);
-		}
-
-		if (!$this->file_exists('.')) {
-			$this->mkdir('.');
-		}
+		$this->params = $params;
 	}
 
 	public function mkdir($path) {
@@ -165,7 +137,7 @@ class Swift extends \OC\Files\Storage\Common {
 			$customHeaders = array('content-type' => 'httpd/unix-directory');
 			$metadataHeaders = DataObject::stockHeaders(array());
 			$allHeaders = $customHeaders + $metadataHeaders;
-			$this->container->uploadObject($path, '', $allHeaders);
+			$this->getContainer()->uploadObject($path, '', $allHeaders);
 		} catch (Exceptions\CreateUpdateError $e) {
 			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
 			return false;
@@ -205,7 +177,7 @@ class Swift extends \OC\Files\Storage\Common {
 		}
 
 		try {
-			$this->container->dataObject()->setName($path . '/')->delete();
+			$this->getContainer()->dataObject()->setName($path . '/')->delete();
 		} catch (Exceptions\DeleteError $e) {
 			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
 			return false;
@@ -228,7 +200,7 @@ class Swift extends \OC\Files\Storage\Common {
 		try {
 			$files = array();
 			/** @var OpenCloud\Common\Collection $objects */
-			$objects = $this->container->objectList(array(
+			$objects = $this->getContainer()->objectList(array(
 				'prefix' => $path,
 				'delimiter' => '/'
 			));
@@ -261,7 +233,7 @@ class Swift extends \OC\Files\Storage\Common {
 
 		try {
 			/** @var DataObject $object */
-			$object = $this->container->getPartialObject($path);
+			$object = $this->getContainer()->getPartialObject($path);
 		} catch (ClientErrorResponseException $e) {
 			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
 			return false;
@@ -314,7 +286,7 @@ class Swift extends \OC\Files\Storage\Common {
 		}
 
 		try {
-			$this->container->dataObject()->setName($path)->delete();
+			$this->getContainer()->dataObject()->setName($path)->delete();
 		} catch (ClientErrorResponseException $e) {
 			\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
 			return false;
@@ -332,7 +304,7 @@ class Swift extends \OC\Files\Storage\Common {
 				$tmpFile = \OC_Helper::tmpFile();
 				self::$tmpFiles[$tmpFile] = $path;
 				try {
-					$object = $this->container->getObject($path);
+					$object = $this->getContainer()->getObject($path);
 				} catch (ClientErrorResponseException $e) {
 					\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
 					return false;
@@ -385,7 +357,7 @@ class Swift extends \OC\Files\Storage\Common {
 		if ($this->is_dir($path)) {
 			return 'httpd/unix-directory';
 		} else if ($this->file_exists($path)) {
-			$object = $this->container->getPartialObject($path);
+			$object = $this->getContainer()->getPartialObject($path);
 			return $object->getContentType();
 		}
 		return false;
@@ -402,7 +374,7 @@ class Swift extends \OC\Files\Storage\Common {
 				$path .= '/';
 			}
 
-			$object = $this->container->getPartialObject($path);
+			$object = $this->getContainer()->getPartialObject($path);
 			$object->saveMetadata($metadata);
 			return true;
 		} else {
@@ -410,7 +382,7 @@ class Swift extends \OC\Files\Storage\Common {
 			$customHeaders = array('content-type' => $mimeType);
 			$metadataHeaders = DataObject::stockHeaders($metadata);
 			$allHeaders = $customHeaders + $metadataHeaders;
-			$this->container->uploadObject($path, '', $allHeaders);
+			$this->getContainer()->uploadObject($path, '', $allHeaders);
 			return true;
 		}
 	}
@@ -426,7 +398,7 @@ class Swift extends \OC\Files\Storage\Common {
 			$this->unlink($path2);
 
 			try {
-				$source = $this->container->getPartialObject($path1);
+				$source = $this->getContainer()->getPartialObject($path1);
 				$source->copy($this->bucket . '/' . $path2);
 			} catch (ClientErrorResponseException $e) {
 				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -439,7 +411,7 @@ class Swift extends \OC\Files\Storage\Common {
 			$this->unlink($path2);
 
 			try {
-				$source = $this->container->getPartialObject($path1 . '/');
+				$source = $this->getContainer()->getPartialObject($path1 . '/');
 				$source->copy($this->bucket . '/' . $path2 . '/');
 			} catch (ClientErrorResponseException $e) {
 				\OCP\Util::writeLog('files_external', $e->getMessage(), \OCP\Util::ERROR);
@@ -497,16 +469,75 @@ class Swift extends \OC\Files\Storage\Common {
 		return $this->id;
 	}
 
+	/**
+	 * Returns the connection
+	 *
+	 * @return OpenCloud\ObjectStore\Service connected client
+	 * @throws \Exception if connection could not be made
+	 */
 	public function getConnection() {
+		if (!is_null($this->connection)) {
+			return $this->connection;
+		}
+
+		$settings = array(
+			'username' => $this->params['user'],
+		);
+
+		if (!empty($this->params['password'])) {
+			$settings['password'] = $this->params['password'];
+		} else if (!empty($this->params['key'])) {
+			$settings['apiKey'] = $this->params['key'];
+		}
+
+		if (!empty($this->params['tenant'])) {
+			$settings['tenantName'] = $this->params['tenant'];
+		}
+
+		if (!empty($this->params['timeout'])) {
+			$settings['timeout'] = $this->params['timeout'];
+		}
+
+		if (isset($settings['apiKey'])) {
+			$this->anchor = new Rackspace($this->params['url'], $settings);
+		} else {
+			$this->anchor = new OpenStack($this->params['url'], $settings);
+		}
+
+		$this->connection = $this->anchor->objectStoreService($this->params['service_name'], $this->params['region']);
+
 		return $this->connection;
 	}
 
+	/**
+	 * Returns the initialized object store container.
+	 *
+	 * @return OpenCloud\ObjectStore\Resource\Container
+	 */
+	public function getContainer() {
+		if (!is_null($this->container)) {
+			return $this->container;
+		}
+
+		try {
+			$this->container = $this->getConnection()->getContainer($this->bucket);
+		} catch (ClientErrorResponseException $e) {
+			$this->container = $this->getConnection()->createContainer($this->bucket);
+		}
+
+		if (!$this->file_exists('.')) {
+			$this->mkdir('.');
+		}
+
+		return $this->container;
+	}
+
 	public function writeBack($tmpFile) {
 		if (!isset(self::$tmpFiles[$tmpFile])) {
 			return false;
 		}
 		$fileData = fopen($tmpFile, 'r');
-		$this->container->uploadObject(self::$tmpFiles[$tmpFile], $fileData);
+		$this->getContainer()->uploadObject(self::$tmpFiles[$tmpFile], $fileData);
 		unlink($tmpFile);
 	}
 
-- 
GitLab


From 02c5933af8d185cbef4eacc7f732566767fb9b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 21 Oct 2014 14:53:10 +0200
Subject: [PATCH 193/616] introduce SessionMiddleWare to control session
 handling via an annotation

---
 .../dependencyinjection/dicontainer.php       | 13 ++-
 .../middleware/sessionmiddleware.php          | 70 +++++++++++++++
 .../middleware/sessionmiddlewaretest.php      | 89 +++++++++++++++++++
 3 files changed, 171 insertions(+), 1 deletion(-)
 create mode 100644 lib/private/appframework/middleware/sessionmiddleware.php
 create mode 100644 tests/lib/appframework/middleware/sessionmiddlewaretest.php

diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index e7efa3fa219..f7fee347215 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -31,6 +31,7 @@ use OC\AppFramework\Core\API;
 use OC\AppFramework\Middleware\MiddlewareDispatcher;
 use OC\AppFramework\Middleware\Security\SecurityMiddleware;
 use OC\AppFramework\Middleware\Security\CORSMiddleware;
+use OC\AppFramework\Middleware\SessionMiddleware;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\AppFramework\Utility\TimeFactory;
 use OC\AppFramework\Utility\ControllerMethodReflector;
@@ -67,9 +68,10 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 		 */
 		$this['Request'] = $this->share(function($c) {
 			/** @var $c SimpleContainer */
-			/** @var $server IServerContainer */
+			/** @var $server SimpleContainer */
 			$server = $c->query('ServerContainer');
 			$server->registerParameter('urlParams', $c['urlParams']);
+			/** @var $server IServerContainer */
 			return $server->getRequest();
 		});
 
@@ -115,6 +117,14 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			);
 		});
 
+		$this['SessionMiddleware'] = $this->share(function($c) use ($app) {
+			return new SessionMiddleware(
+				$c['Request'],
+				$c['ControllerMethodReflector'],
+				$app->getServer()->getSession()
+			);
+		});
+
 		$middleWares = &$this->middleWares;
 		$this['MiddlewareDispatcher'] = $this->share(function($c) use (&$middleWares) {
 			$dispatcher = new MiddlewareDispatcher();
@@ -125,6 +135,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 				$dispatcher->registerMiddleware($c[$middleWare]);
 			}
 
+			$dispatcher->registerMiddleware($c['SessionMiddleware']);
 			return $dispatcher;
 		});
 
diff --git a/lib/private/appframework/middleware/sessionmiddleware.php b/lib/private/appframework/middleware/sessionmiddleware.php
new file mode 100644
index 00000000000..d50880f3739
--- /dev/null
+++ b/lib/private/appframework/middleware/sessionmiddleware.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Thomas Müller <deepdiver@owncloud.com>
+ * @copyright Thomas Müller 2014
+ */
+
+namespace OC\AppFramework\Middleware;
+
+use OC\AppFramework\Utility\ControllerMethodReflector;
+use OCP\IRequest;
+use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Middleware;
+use OCP\ISession;
+
+class SessionMiddleware extends Middleware {
+
+	/**
+	 * @var IRequest
+	 */
+	private $request;
+
+	/**
+	 * @var ControllerMethodReflector
+	 */
+	private $reflector;
+
+	/**
+	 * @param IRequest $request
+	 * @param ControllerMethodReflector $reflector
+	 */
+	public function __construct(IRequest $request,
+								ControllerMethodReflector $reflector,
+								ISession $session
+) {
+		$this->request = $request;
+		$this->reflector = $reflector;
+		$this->session = $session;
+	}
+
+	/**
+	 * @param \OCP\AppFramework\Controller $controller
+	 * @param string $methodName
+	 */
+	public function beforeController($controller, $methodName) {
+		$useSession = $this->reflector->hasAnnotation('UseSession');
+		if (!$useSession) {
+			$this->session->close();
+		}
+	}
+
+	/**
+	 * @param \OCP\AppFramework\Controller $controller
+	 * @param string $methodName
+	 * @param Response $response
+	 * @return Response
+	 */
+	public function afterController($controller, $methodName, Response $response){
+		$useSession = $this->reflector->hasAnnotation('UseSession');
+		if ($useSession) {
+			$this->session->close();
+		}
+		return $response;
+	}
+
+}
diff --git a/tests/lib/appframework/middleware/sessionmiddlewaretest.php b/tests/lib/appframework/middleware/sessionmiddlewaretest.php
new file mode 100644
index 00000000000..13e558bf21a
--- /dev/null
+++ b/tests/lib/appframework/middleware/sessionmiddlewaretest.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later. See the COPYING file.
+ *
+ * @author Thomas Müller <deepdiver@owncloud.com>
+ * @copyright Thomas Müller 2014
+ */
+
+
+namespace OC\AppFramework\Middleware\Security;
+
+use OC\AppFramework\Http\Request;
+use OC\AppFramework\Middleware\SessionMiddleware;
+use OC\AppFramework\Utility\ControllerMethodReflector;
+use OCP\AppFramework\Http\Response;
+
+
+class SessionMiddlewareTest extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var ControllerMethodReflector
+	 */
+	private $reflector;
+
+	/**
+	 * @var Request
+	 */
+	private $request;
+
+	protected function setUp() {
+		$this->request = new Request();
+		$this->reflector = new ControllerMethodReflector();
+	}
+
+	/**
+	 * @UseSession
+	 */
+	public function testSessionNotClosedOnBeforeController() {
+		$session = $this->getSessionMock(0);
+
+		$this->reflector->reflect($this, __FUNCTION__);
+		$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
+		$middleware->beforeController($this, __FUNCTION__);
+	}
+
+	/**
+	 * @UseSession
+	 */
+	public function testSessionClosedOnAfterController() {
+		$session = $this->getSessionMock(1);
+
+		$this->reflector->reflect($this, __FUNCTION__);
+		$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
+		$middleware->afterController($this, __FUNCTION__, new Response());
+	}
+
+	public function testSessionClosedOnBeforeController() {
+		$session = $this->getSessionMock(1);
+
+		$this->reflector->reflect($this, __FUNCTION__);
+		$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
+		$middleware->beforeController($this, __FUNCTION__);
+	}
+
+	public function testSessionNotClosedOnAfterController() {
+		$session = $this->getSessionMock(0);
+
+		$this->reflector->reflect($this, __FUNCTION__);
+		$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
+		$middleware->afterController($this, __FUNCTION__, new Response());
+	}
+
+	/**
+	 * @return mixed
+	 */
+	private function getSessionMock($expectedCloseCount) {
+		$session = $this->getMockBuilder('\OC\Session\Memory')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$session->expects($this->exactly($expectedCloseCount))
+			->method('close');
+		return $session;
+	}
+
+}
-- 
GitLab


From e0342db47cc95a1032086a82650d2bdc7814ae57 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 22 Oct 2014 13:28:08 +0200
Subject: [PATCH 194/616] set up FS by username, not login name\!

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

diff --git a/lib/private/user.php b/lib/private/user.php
index 641a329b0dd..e02a0aaa1fc 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -234,7 +234,7 @@ class OC_User {
 		session_regenerate_id(true);
 		$result = self::getUserSession()->login($uid, $password);
 		if ($result) {
-			OC_Util::setupFS($uid);
+			OC_Util::setupFS(self::getUserSession()->getUser()->getUID());
 		}
 		return $result;
 	}
-- 
GitLab


From 993376fb6f62772554e0f35b04f52468021a6cab Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 22 Oct 2014 13:36:57 +0200
Subject: [PATCH 195/616] better variable name

---
 lib/private/user.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/private/user.php b/lib/private/user.php
index e02a0aaa1fc..3c23c19b015 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -224,16 +224,17 @@ class OC_User {
 
 	/**
 	 * Try to login a user
-	 * @param string $uid The username of the user to log in
+	 * @param string $loginname The login name of the user to log in
 	 * @param string $password The password of the user
 	 * @return boolean|null
 	 *
 	 * Log in a user and regenerate a new session - if the password is ok
 	 */
-	public static function login($uid, $password) {
+	public static function login($loginname, $password) {
 		session_regenerate_id(true);
-		$result = self::getUserSession()->login($uid, $password);
+		$result = self::getUserSession()->login($loginname, $password);
 		if ($result) {
+			//we need to pass the user name, which may differ from login name
 			OC_Util::setupFS(self::getUserSession()->getUser()->getUID());
 		}
 		return $result;
-- 
GitLab


From be06937e65495293a97a1d8ada36d7d8f87cfe44 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 22 Oct 2014 15:07:16 +0200
Subject: [PATCH 196/616] Use mixed as type

Actually query() returns value of the type "mixed" (as is also stated in the interface) - this is purely there to make our IDEs and Scrutinizer happier.
---
 .../appframework/utility/simplecontainer.php        | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index 1ad06b9ab23..a2d90138dfa 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -11,14 +11,17 @@ class SimpleContainer extends \Pimple implements \OCP\IContainer {
 
 	/**
 	 * @param string $name name of the service to query for
-	 * @return object registered service for the given $name
+	 * @return mixed registered service for the given $name
 	 */
 	public function query($name) {
 		return $this->offsetGet($name);
 	}
 
-	function registerParameter($name, $value)
-	{
+	/**
+	 * @param string $name
+	 * @param mixed $value
+	 */
+	function registerParameter($name, $value) {
 		$this[$name] = $value;
 	}
 
@@ -29,9 +32,9 @@ class SimpleContainer extends \Pimple implements \OCP\IContainer {
 	 *
 	 * @param string $name name of the service to register another backend for
 	 * @param \Closure $closure the closure to be called on service creation
+	 * @param bool $shared
 	 */
-	function registerService($name, \Closure $closure, $shared = true)
-	{
+	function registerService($name, \Closure $closure, $shared = true) {
 		if ($shared) {
 			$this[$name] = \Pimple::share($closure);
 		} else {
-- 
GitLab


From 3b42d3cfeddf522c89534544b4f9a9f162b2ff61 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 22 Oct 2014 18:12:21 +0200
Subject: [PATCH 197/616] Close session for avatar get

This somehow blocked the "Users" UI for me when having a lot of users. - Shouldn't hurt here.
---
 core/avatar/controller.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/avatar/controller.php b/core/avatar/controller.php
index 03eb9da1dc5..ca055f5fd75 100644
--- a/core/avatar/controller.php
+++ b/core/avatar/controller.php
@@ -12,6 +12,7 @@ class Controller {
 	public static function getAvatar($args) {
 		\OC_JSON::checkLoggedIn();
 		\OC_JSON::callCheck();
+		\OC::$server->getSession()->close();
 
 		$user = stripslashes($args['user']);
 		$size = (int)$args['size'];
-- 
GitLab


From 52684c86e593e169619d2574c55d285e050eea7b Mon Sep 17 00:00:00 2001
From: Sebastian Bolt <sebastian.bolt@gmx.de>
Date: Wed, 22 Oct 2014 22:08:55 +0200
Subject: [PATCH 198/616] "Group admin" default label (issue #7706)

Changed the column header to "Group Admin for" and the default value of
the multiselect box to "no group" if user is not a groupadmin for any
group.
---
 settings/js/users/users.js                 | 2 +-
 settings/templates/users/part.userlist.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index 0cb5fe3e15c..f7ac5dc752d 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -50,7 +50,7 @@ var UserList = {
 			.data('username', username)
 			.data('user-groups', groups);
 		if ($tr.find('td.subadmins').length > 0) {
-			subAdminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'Group Admin') + '">')
+			subAdminSelect = $('<select multiple="multiple" class="subadminsselect multiselect button" data-placehoder="subadmins" title="' + t('settings', 'no group') + '">')
 				.data('username', username)
 				.data('user-groups', groups)
 				.data('subadmin', subadmin);
diff --git a/settings/templates/users/part.userlist.php b/settings/templates/users/part.userlist.php
index 25b17275858..964aef600a2 100644
--- a/settings/templates/users/part.userlist.php
+++ b/settings/templates/users/part.userlist.php
@@ -9,7 +9,7 @@
 			<th id="headerPassword"><?php p($l->t( 'Password' )); ?></th>
 			<th id="headerGroups"><?php p($l->t( 'Groups' )); ?></th>
 			<?php if(is_array($_['subadmins']) || $_['subadmins']): ?>
-			<th id="headerSubAdmins"><?php p($l->t('Group Admin')); ?></th>
+			<th id="headerSubAdmins"><?php p($l->t('Group Admin for')); ?></th>
 			<?php endif;?>
 			<th id="headerQuota"><?php p($l->t('Quota')); ?></th>
 			<th id="headerStorageLocation"><?php p($l->t('Storage Location')); ?></th>
@@ -38,7 +38,7 @@
 					class="groupsselect"
 					data-username="<?php p($user['name']) ;?>"
 					data-user-groups="<?php p(json_encode($user['groups'])) ;?>"
-					data-placeholder="groups" title="<?php p($l->t('Groups'))?>"
+					data-placeholder="groups" title="<?php p($l->t('no group'))?>"
 					multiple="multiple">
 						<?php foreach($_["adminGroup"] as $adminGroup): ?>
 						<option value="<?php p($adminGroup['name']);?>"><?php p($adminGroup['name']); ?></option>
@@ -54,7 +54,7 @@
 						class="subadminsselect"
 						data-username="<?php p($user['name']) ;?>"
 						data-subadmin="<?php p(json_encode($user['subadmin']));?>"
-						data-placeholder="subadmins" title="<?php p($l->t('Group Admin'))?>"
+						data-placeholder="subadmins" title="<?php p($l->t('no group'))?>"
 						multiple="multiple">
 						<?php foreach($_["subadmingroups"] as $group): ?>
 							<option value="<?php p($group);?>"><?php p($group);?></option>
-- 
GitLab


From 71dce48bd3f4d75156be30670f2e6752c0cb97c5 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 22 Oct 2014 21:48:22 +0200
Subject: [PATCH 199/616] Fix S3 connection

---
 apps/files_external/lib/amazons3.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index da919236f8f..22128eb19c0 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -45,6 +45,10 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	 * @var array
 	 */
 	private static $tmpFiles = array();
+	/**
+	 * @var array
+	 */
+	private $params;
 	/**
 	 * @var bool
 	 */
@@ -101,7 +105,6 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		$this->updateLegacyId($params);
 
 		$this->bucket = $params['bucket'];
-		$scheme = ($params['use_ssl'] === 'false') ? 'http' : 'https';
 		$this->test = isset($params['test']);
 		$this->timeout = (!isset($params['timeout'])) ? 15 : $params['timeout'];
 		$this->rescanDelay = (!isset($params['rescanDelay'])) ? 10 : $params['rescanDelay'];
@@ -110,7 +113,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 		if (!isset($params['port']) || $params['port'] === '') {
 			$params['port'] = ($params['use_ssl'] === 'false') ? 80 : 443;
 		}
-		$base_url = $scheme . '://' . $params['hostname'] . ':' . $params['port'] . '/';
+		$this->params = $params;
 	}
 
 	/**
@@ -549,11 +552,14 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			return $this->connection;
 		}
 
+		$scheme = ($this->params['use_ssl'] === 'false') ? 'http' : 'https';
+		$base_url = $scheme . '://' . $this->params['hostname'] . ':' . $this->params['port'] . '/';
+
 		$this->connection = S3Client::factory(array(
-			'key' => $params['key'],
-			'secret' => $params['secret'],
+			'key' => $this->params['key'],
+			'secret' => $this->params['secret'],
 			'base_url' => $base_url,
-			'region' => $params['region']
+			'region' => $this->params['region']
 		));
 
 		if (!$this->connection->isValidBucketName($this->bucket)) {
-- 
GitLab


From 188effa43365b90583d60b5fdc9410e3be444061 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 22 Oct 2014 23:00:30 +0200
Subject: [PATCH 200/616] Fix S3 folder creation for new AWS API

This also fixes the unit tests
---
 apps/files_external/lib/amazons3.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index ae306fac420..32669612890 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -184,6 +184,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			$this->connection->putObject(array(
 				'Bucket' => $this->bucket,
 				'Key' => $path . '/',
+				'Body' => '',
 				'ContentType' => 'httpd/unix-directory'
 			));
 			$this->testTimeout();
-- 
GitLab


From e75c2edba609fd5e91be1c7b929380c6245af583 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 23 Oct 2014 01:55:51 -0400
Subject: [PATCH 201/616] [tx-robot] updated from transifex

---
 apps/files/l10n/hu_HU.php           |  1 +
 apps/files_sharing/l10n/el.php      |  1 +
 apps/files_sharing/l10n/hu_HU.php   |  1 +
 apps/files_trashbin/l10n/ro.php     |  1 +
 apps/files_versions/l10n/ro.php     |  5 +-
 apps/user_ldap/l10n/hu_HU.php       |  3 +
 apps/user_ldap/l10n/id.php          |  1 +
 core/l10n/id.php                    | 63 ++++++++++++++++---
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              | 78 +++++++++++------------
 l10n/templates/private.pot          | 74 +++++++++++-----------
 l10n/templates/settings.pot         | 98 +++++++++++++++--------------
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/hu_HU.php                  |  2 +
 lib/l10n/ro.php                     | 13 +++-
 settings/l10n/ar.php                |  2 +-
 settings/l10n/ast.php               |  4 +-
 settings/l10n/az.php                |  2 +-
 settings/l10n/bg_BG.php             |  4 +-
 settings/l10n/bn_BD.php             |  4 +-
 settings/l10n/ca.php                |  4 +-
 settings/l10n/cs_CZ.php             |  4 +-
 settings/l10n/cy_GB.php             |  2 +-
 settings/l10n/da.php                |  4 +-
 settings/l10n/de.php                |  4 +-
 settings/l10n/de_CH.php             |  4 +-
 settings/l10n/de_DE.php             |  4 +-
 settings/l10n/el.php                |  4 +-
 settings/l10n/en_GB.php             |  4 +-
 settings/l10n/eo.php                |  4 +-
 settings/l10n/es.php                |  4 +-
 settings/l10n/es_AR.php             |  4 +-
 settings/l10n/es_MX.php             |  4 +-
 settings/l10n/et_EE.php             |  4 +-
 settings/l10n/eu.php                |  4 +-
 settings/l10n/fa.php                |  4 +-
 settings/l10n/fi_FI.php             |  4 +-
 settings/l10n/fr.php                |  4 +-
 settings/l10n/gl.php                |  4 +-
 settings/l10n/he.php                |  4 +-
 settings/l10n/hr.php                |  4 +-
 settings/l10n/hu_HU.php             |  5 +-
 settings/l10n/id.php                |  4 +-
 settings/l10n/is.php                |  4 +-
 settings/l10n/it.php                |  4 +-
 settings/l10n/ja.php                |  4 +-
 settings/l10n/ka_GE.php             |  4 +-
 settings/l10n/km.php                |  2 +-
 settings/l10n/ko.php                |  4 +-
 settings/l10n/ku_IQ.php             |  2 +-
 settings/l10n/lt_LT.php             |  4 +-
 settings/l10n/lv.php                |  4 +-
 settings/l10n/mk.php                |  4 +-
 settings/l10n/nb_NO.php             |  4 +-
 settings/l10n/nl.php                |  4 +-
 settings/l10n/nn_NO.php             |  2 +-
 settings/l10n/pl.php                |  4 +-
 settings/l10n/pt_BR.php             |  4 +-
 settings/l10n/pt_PT.php             |  4 +-
 settings/l10n/ro.php                |  5 +-
 settings/l10n/ru.php                |  4 +-
 settings/l10n/si_LK.php             |  4 +-
 settings/l10n/sk_SK.php             |  4 +-
 settings/l10n/sl.php                |  4 +-
 settings/l10n/sq.php                |  2 +-
 settings/l10n/sr.php                |  2 +-
 settings/l10n/sv.php                |  4 +-
 settings/l10n/ta_LK.php             |  4 +-
 settings/l10n/th_TH.php             |  4 +-
 settings/l10n/tr.php                |  4 +-
 settings/l10n/ug.php                |  2 +-
 settings/l10n/uk.php                |  4 +-
 settings/l10n/vi.php                |  4 +-
 settings/l10n/zh_CN.php             |  4 +-
 settings/l10n/zh_HK.php             |  2 +-
 settings/l10n/zh_TW.php             |  4 +-
 83 files changed, 332 insertions(+), 253 deletions(-)

diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 1a8d2a6f548..7aef457b4a0 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Unknown error" => "Ismeretlen hiba",
 "Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
 "Could not move %s" => "Nem sikerült %s áthelyezése",
+"Permission denied" => "Engedély megtagadva ",
 "File name cannot be empty." => "A fájlnév nem lehet semmi.",
 "\"%s\" is an invalid file name." => "\"%s\" érvénytelen, mint fájlnév.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index d12f4b56166..a4d8e35d90e 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Server to server sharing is not enabled on this server" => "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
+"The mountpoint name contains invalid characters." => "Το όνομα σημείου προσάρτησης περιέχει μη έγκυρους χαρακτήρες.",
 "Invalid or untrusted SSL certificate" => "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL",
 "Couldn't add remote share" => "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
 "Shared with you" => "Διαμοιρασμένο με εσάς",
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
index 0194e0aa6b3..aee8a5151d7 100644
--- a/apps/files_sharing/l10n/hu_HU.php
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Server to server sharing is not enabled on this server" => "A kiszolgálók közötti megosztás nincs engedélyezve ezen a kiszolgálón",
+"The mountpoint name contains invalid characters." => "A csatlakozási pont neve érvénytelen karaktereket tartalmaz ",
 "Invalid or untrusted SSL certificate" => "Érvénytelen vagy nem megbízható az SSL tanúsítvány",
 "Couldn't add remote share" => "A távoli megosztás nem hozható létre",
 "Shared with you" => "Velem osztották meg",
diff --git a/apps/files_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
index b00f37615f8..eb8d6b81b7d 100644
--- a/apps/files_trashbin/l10n/ro.php
+++ b/apps/files_trashbin/l10n/ro.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Deleted files" => "Sterge fisierele",
+"Restore" => "Restabilire",
 "Error" => "Eroare",
 "Name" => "Nume",
 "Delete" => "Șterge"
diff --git a/apps/files_versions/l10n/ro.php b/apps/files_versions/l10n/ro.php
index 5151b1dceb9..cc8c6e19311 100644
--- a/apps/files_versions/l10n/ro.php
+++ b/apps/files_versions/l10n/ro.php
@@ -1,6 +1,9 @@
 <?php
 $TRANSLATIONS = array(
 "Could not revert: %s" => "Nu a putut reveni: %s",
-"Versions" => "Versiuni"
+"Versions" => "Versiuni",
+"More versions..." => "Mai multe versiuni...",
+"No other versions available" => "Nu există alte versiuni disponibile",
+"Restore" => "Restabilire"
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
index af7100da1a9..fb1f1f9cdcf 100644
--- a/apps/user_ldap/l10n/hu_HU.php
+++ b/apps/user_ldap/l10n/hu_HU.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Inkább közvetlenül megadom a szűrési kifejezést:",
 "Raw LDAP filter" => "Az LDAP szűrőkifejezés",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
+"Test Filter" => "Test szűrő ",
 "groups found" => "csoport van",
 "Users login with this attribute:" => "A felhasználók ezzel az attribútummal jelentkeznek be:",
 "LDAP Username:" => "LDAP felhasználónév:",
@@ -66,9 +67,11 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
 "One Base DN per line" => "Soronként egy DN-gyökér",
 "You can specify Base DN for users and groups in the Advanced tab" => "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára",
+"Manually enter LDAP filters (recommended for large directories)" => "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)",
 "Limit %s access to users meeting these criteria:" => "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
 "users found" => "felhasználó van",
+"Saving" => "Mentés",
 "Back" => "Vissza",
 "Continue" => "Folytatás",
 "Expert" => "Profi",
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index b6e581952fa..11cefeb18db 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -16,6 +16,7 @@ $TRANSLATIONS = array(
 "Confirm Deletion" => "Konfirmasi Penghapusan",
 "_%s group found_::_%s groups found_" => array(""),
 "_%s user found_::_%s users found_" => array(""),
+"Server" => "Server",
 "Group Filter" => "saringan grup",
 "Save" => "Simpan",
 "Test Configuration" => "Uji Konfigurasi",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index d10a08ec70d..2dfeab8c2a7 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -4,8 +4,12 @@ $TRANSLATIONS = array(
 "Turned on maintenance mode" => "Hidupkan mode perawatan",
 "Turned off maintenance mode" => "Matikan mode perawatan",
 "Updated database" => "Basis data terbaru",
-"No image or file provided" => "Tidak ada gambar atau file yang disediakan",
-"Unknown filetype" => "Tipe berkas tak dikenal",
+"Checked database schema update" => "Pembaruan skema basis data terperiksa",
+"Checked database schema update for apps" => "Pembaruan skema basis data terperiksa untuk aplikasi",
+"Updated \"%s\" to %s" => "Terbaru \"%s\" sampai %s",
+"Disabled incompatible apps: %s" => "Aplikasi tidak kompatibel yang dinonaktifkan: %s",
+"No image or file provided" => "Tidak ada gambar atau berkas yang disediakan",
+"Unknown filetype" => "Tipe berkas tidak dikenal",
 "Invalid image" => "Gambar tidak sah",
 "No temporary profile picture available, try again" => "Tidak ada gambar profil sementara yang tersedia, coba lagi",
 "No crop data provided" => "Tidak ada data krop tersedia",
@@ -32,8 +36,14 @@ $TRANSLATIONS = array(
 "File" => "Berkas",
 "Folder" => "Folder",
 "Image" => "gambar",
+"Audio" => "Audio",
 "Saving..." => "Menyimpan...",
-"Reset password" => "Atur ulang sandi",
+"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?",
+"I know what I'm doing" => "Saya tahu apa yang saya lakukan",
+"Reset password" => "Setel ulang sandi",
+"Password can not be changed. Please contact your administrator." => "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
 "No" => "Tidak",
 "Yes" => "Ya",
 "Choose" => "Pilih",
@@ -57,7 +67,9 @@ $TRANSLATIONS = array(
 "Good password" => "Sandi baik",
 "Strong password" => "Sandi kuat",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
+"Error occurred while checking server setup" => "Kesalahan tidak terduga saat memeriksa setelan server",
 "Shared" => "Dibagikan",
+"Shared with {recipients}" => "Dibagikan dengan {recipients}",
 "Share" => "Bagikan",
 "Error" => "Galat",
 "Error while sharing" => "Galat ketika membagikan",
@@ -67,17 +79,21 @@ $TRANSLATIONS = array(
 "Shared with you by {owner}" => "Dibagikan dengan anda oleh {owner}",
 "Share with user or group …" => "Bagikan dengan pengguna atau grup ...",
 "Share link" => "Bagikan tautan",
+"The public link will expire no later than {days} days after it is created" => "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
 "Password protect" => "Lindungi dengan sandi",
+"Choose a password for the public link" => "Tetapkan sandi untuk tautan publik",
 "Allow Public Upload" => "Izinkan Unggahan Publik",
 "Email link to person" => "Emailkan tautan ini ke orang",
 "Send" => "Kirim",
 "Set expiration date" => "Atur tanggal kedaluwarsa",
 "Expiration date" => "Tanggal kedaluwarsa",
+"Adding user..." => "Menambahkan pengguna...",
 "group" => "grup",
 "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",
+"can share" => "dapat berbagi",
 "can edit" => "dapat sunting",
 "access control" => "kontrol akses",
 "create" => "buat",
@@ -93,12 +109,17 @@ $TRANSLATIONS = array(
 "Enter new" => "Masukkan baru",
 "Delete" => "Hapus",
 "Add" => "Tambah",
-"Edit tags" => "Sunting tag",
+"Edit tags" => "Sunting label",
 "Error loading dialog template: {error}" => "Galat memuat templat dialog: {error}",
-"No tags selected for deletion." => "Tidak ada tag yang terpilih untuk dihapus.",
+"No tags selected for deletion." => "Tidak ada label yang dipilih untuk dihapus.",
+"Updating {productName} to version {version}, this may take a while." => "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
 "Please reload the page." => "Silakan muat ulang halaman.",
+"The update was unsuccessful." => "Pembaruan tidak berhasil",
 "The update was successful. Redirecting you to ownCloud now." => "Pembaruan sukses. Anda akan diarahkan ulang ke ownCloud.",
-"%s password reset" => "%s sandi diatur ulang",
+"Couldn't reset password because the token is invalid" => "Tidak dapat menyetel ulang sandi karena token tidak sah",
+"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",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
 "Username" => "Nama pengguna",
@@ -106,6 +127,7 @@ $TRANSLATIONS = array(
 "Yes, I really want to reset my password now" => "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
 "Reset" => "Atur Ulang",
 "New password" => "Sandi baru",
+"New Password" => "Sandi Baru",
 "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
 "For the best results, please consider using a GNU/Linux server instead." => "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
 "Personal" => "Pribadi",
@@ -121,9 +143,24 @@ $TRANSLATIONS = array(
 "Error favoriting" => "Galat saat memberikan sebagai favorit",
 "Error unfavoriting" => "Galat saat menghapus sebagai favorit",
 "Access forbidden" => "Akses ditolak",
+"File not found" => "Berkas tidak ditemukan",
+"The specified document has not been found on the server." => "Dokumen yang diminta tidak tersedia pada server.",
+"You can click here to return to %s." => "Anda dapat klik disini unutk kembali ke %s.",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hai,\n\nhanya supaya anda tahu bahwa %s membagikan %s dengan anda.\nLihat: %s\n\n",
 "The share will expire on %s." => "Pembagian akan berakhir pada %s.",
 "Cheers!" => "Horee!",
+"Internal Server Error" => "Kesalahan Server Internal",
+"The server encountered an internal error and was unable to complete your request." => "Server mengalami kesalahan internal dan tidak dapat menyelesaikan permintaan Anda.",
+"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Silahkan hubungi administrator server jika kesalahan ini muncul kembali berulang kali, harap sertakan rincian teknis di bawah ini dalam laporan Anda.",
+"More details can be found in the server log." => "Rincian lebih lengkap dapat ditemukan di log server.",
+"Technical details" => "Rincian teknis",
+"Remote Address: %s" => "Alamat remote: %s",
+"Request ID: %s" => "ID Permintaan: %s",
+"Code: %s" => "Kode: %s",
+"Message: %s" => "Pesan: %s",
+"File: %s" => "Berkas: %s",
+"Line: %s" => "Baris: %s",
+"Trace" => "Jejak",
 "Security Warning" => "Peringatan Keamanan",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Silakan perbarui instalasi PHP anda untuk menggunakan %s dengan aman.",
@@ -134,23 +171,35 @@ $TRANSLATIONS = array(
 "Storage & database" => "Penyimpanan & Basis data",
 "Data folder" => "Folder data",
 "Configure the database" => "Konfigurasikan basis data",
+"Only %s is available." => "Hanya %s yang tersedia",
 "Database user" => "Pengguna basis data",
 "Database password" => "Sandi basis data",
 "Database name" => "Nama basis data",
 "Database tablespace" => "Tablespace basis data",
 "Database host" => "Host basis data",
+"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
 "Finish setup" => "Selesaikan instalasi",
 "Finishing …" => "Menyelesaikan ...",
+"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
 "%s is available. Get more information on how to update." => "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
 "Log out" => "Keluar",
 "Server side authentication failed!" => "Otentikasi dari sisi server gagal!",
 "Please contact your administrator." => "Silahkan hubungi administrator anda.",
+"Forgot your password? Reset it!" => "Lupa sandi Anda? Setel 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.",
 "This means only administrators can use the instance." => "Ini berarti hanya administrator yang dapat menggunakan ownCloud.",
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
-"Thank you for your patience." => "Terima kasih atas kesabaran anda."
+"Thank you for your patience." => "Terima kasih atas kesabaran anda.",
+"You are accessing the server from an untrusted domain." => "Anda mengakses server dari domain yang tidak terpercaya.",
+"Add \"%s\" as trusted domain" => "tambahkan \"%s\" sebagai domain terpercaya",
+"%s will be updated to version %s." => "%s akan diperbarui ke versi %s.",
+"The following apps will be disabled:" => "Aplikasi berikut akan dinonaktifkan:",
+"The theme %s has been disabled." => "Tema %s telah dinonaktfkan.",
+"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
+"Start update" => "Jalankan pembaruan"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index bb688f4b822..fe7b0ba43c5 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 85bcc6e9e38..f42df4573a6 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 1ed72859ac1..ad0000c211f 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index de40b8e4104..063d89b4fb5 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index ce322589b9b..29db6b93756 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index a96d07ab85f..19b9ce16993 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index de554c9148f..73288085831 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index e2624fb4a1e..5c3c6184e5a 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,56 +33,56 @@ msgstr ""
 msgid "See %s"
 msgstr ""
 
-#: base.php:209 private/util.php:457
+#: base.php:209 private/util.php:461
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
 "config directory%s."
 msgstr ""
 
-#: base.php:587
+#: base.php:594
 msgid "Sample configuration detected"
 msgstr ""
 
-#: base.php:588
+#: base.php:595
 msgid ""
 "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"
 msgstr ""
 
-#: private/app.php:408
+#: private/app.php:410
 msgid "Help"
 msgstr ""
 
-#: private/app.php:421
+#: private/app.php:423
 msgid "Personal"
 msgstr ""
 
-#: private/app.php:432
+#: private/app.php:434
 msgid "Settings"
 msgstr ""
 
-#: private/app.php:444
+#: private/app.php:446
 msgid "Users"
 msgstr ""
 
-#: private/app.php:457
+#: private/app.php:459
 msgid "Admin"
 msgstr ""
 
-#: private/app.php:863 private/app.php:974
+#: private/app.php:865 private/app.php:976
 msgid "Recommended"
 msgstr ""
 
-#: private/app.php:1156
+#: private/app.php:1158
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: private/app.php:1168
+#: private/app.php:1170
 msgid "No app name specified"
 msgstr ""
 
@@ -473,144 +473,144 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: private/util.php:442
+#: private/util.php:446
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: private/util.php:449
+#: private/util.php:453
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: private/util.php:456
+#: private/util.php:460
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: private/util.php:470
+#: private/util.php:474
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: private/util.php:471
+#: private/util.php:475
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: private/util.php:486
+#: private/util.php:490
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: private/util.php:487
+#: private/util.php:491
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: private/util.php:504
+#: private/util.php:508
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: private/util.php:507
+#: private/util.php:511
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: private/util.php:536
+#: private/util.php:540
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: private/util.php:556
+#: private/util.php:560
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: private/util.php:564
+#: private/util.php:568
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: private/util.php:565
+#: private/util.php:569
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: private/util.php:576
+#: private/util.php:580
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:577
+#: private/util.php:581
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:584
+#: private/util.php:588
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:585
+#: private/util.php:589
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:599
+#: private/util.php:603
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: private/util.php:600
+#: private/util.php:604
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: private/util.php:630
+#: private/util.php:634
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: private/util.php:631
+#: private/util.php:635
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: private/util.php:638
+#: private/util.php:642
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: private/util.php:639
+#: private/util.php:643
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: private/util.php:704
+#: private/util.php:708
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: private/util.php:713
+#: private/util.php:717
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: private/util.php:734
+#: private/util.php:738
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: private/util.php:735
+#: private/util.php:739
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 2a22b412e4c..922f82d205a 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,38 +18,38 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: app.php:408
+#: app.php:410
 msgid "Help"
 msgstr ""
 
-#: app.php:421
+#: app.php:423
 msgid "Personal"
 msgstr ""
 
-#: app.php:432
+#: app.php:434
 msgid "Settings"
 msgstr ""
 
-#: app.php:444
+#: app.php:446
 msgid "Users"
 msgstr ""
 
-#: app.php:457
+#: app.php:459
 msgid "Admin"
 msgstr ""
 
-#: app.php:863 app.php:974
+#: app.php:865 app.php:976
 msgid "Recommended"
 msgstr ""
 
-#: app.php:1156
+#: app.php:1158
 #, php-format
 msgid ""
 "App \\\"%s\\\" can't be installed because it is not compatible with this "
 "version of ownCloud."
 msgstr ""
 
-#: app.php:1168
+#: app.php:1170
 msgid "No app name specified"
 msgstr ""
 
@@ -432,151 +432,151 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: util.php:442
+#: util.php:446
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: util.php:449
+#: util.php:453
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: util.php:456
+#: util.php:460
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: util.php:457
+#: util.php:461
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
 "config directory%s."
 msgstr ""
 
-#: util.php:470
+#: util.php:474
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: util.php:471
+#: util.php:475
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: util.php:486
+#: util.php:490
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: util.php:487
+#: util.php:491
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: util.php:504
+#: util.php:508
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: util.php:507
+#: util.php:511
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: util.php:536
+#: util.php:540
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: util.php:556
+#: util.php:560
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: util.php:564
+#: util.php:568
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: util.php:565
+#: util.php:569
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: util.php:576
+#: util.php:580
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:577
+#: util.php:581
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:584
+#: util.php:588
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:585
+#: util.php:589
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:599
+#: util.php:603
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: util.php:600
+#: util.php:604
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: util.php:630
+#: util.php:634
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: util.php:631
+#: util.php:635
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: util.php:638
+#: util.php:642
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: util.php:639
+#: util.php:643
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: util.php:704
+#: util.php:708
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: util.php:713
+#: util.php:717
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: util.php:734
+#: util.php:738
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: util.php:735
+#: util.php:739
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 017a2103699..ad7793b6f14 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -273,7 +273,7 @@ msgid "Valid until {date}"
 msgstr ""
 
 #: js/personal.js:333 js/personal.js:334 js/users/users.js:75
-#: templates/personal.php:179 templates/personal.php:180
+#: templates/personal.php:195 templates/personal.php:196
 #: templates/users/part.grouplist.php:46 templates/users/part.userlist.php:108
 msgid "Delete"
 msgstr ""
@@ -353,6 +353,18 @@ msgstr ""
 msgid "__language_name__"
 msgstr ""
 
+#: personal.php:107
+msgid "Personal Info"
+msgstr ""
+
+#: personal.php:132 templates/personal.php:173
+msgid "SSL root certificates"
+msgstr ""
+
+#: personal.php:134 templates/admin.php:357 templates/personal.php:214
+msgid "Encryption"
+msgstr ""
+
 #: templates/admin.php:13
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
 msgstr ""
@@ -645,10 +657,6 @@ msgstr ""
 msgid "Send mode"
 msgstr ""
 
-#: templates/admin.php:357 templates/personal.php:198
-msgid "Encryption"
-msgstr ""
-
 #: templates/admin.php:372
 msgid "From address"
 msgstr ""
@@ -713,11 +721,11 @@ msgstr ""
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:463 templates/personal.php:247
+#: templates/admin.php:463 templates/personal.php:263
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:467 templates/personal.php:250
+#: templates/admin.php:467 templates/personal.php:266
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
@@ -787,11 +795,11 @@ msgstr ""
 msgid "Commercial Support"
 msgstr ""
 
-#: templates/personal.php:11
+#: templates/personal.php:25
 msgid "Get the apps to sync your files"
 msgstr ""
 
-#: templates/personal.php:24
+#: templates/personal.php:38
 msgid ""
 "If you want to support the project\n"
 "\t\t<a href=\"https://owncloud.org/contribute\"\n"
@@ -801,147 +809,143 @@ msgid ""
 "\t\t\ttarget=\"_blank\">spread the word</a>!"
 msgstr ""
 
-#: templates/personal.php:34
+#: templates/personal.php:48
 msgid "Show First Run Wizard again"
 msgstr ""
 
-#: templates/personal.php:43
+#: templates/personal.php:57
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
 msgstr ""
 
-#: templates/personal.php:54 templates/users/part.createuser.php:8
+#: templates/personal.php:68 templates/users/part.createuser.php:8
 #: templates/users/part.userlist.php:9
 msgid "Password"
 msgstr ""
 
-#: templates/personal.php:55
+#: templates/personal.php:69
 msgid "Your password was changed"
 msgstr ""
 
-#: templates/personal.php:56
+#: templates/personal.php:70
 msgid "Unable to change your password"
 msgstr ""
 
-#: templates/personal.php:58
+#: templates/personal.php:72
 msgid "Current password"
 msgstr ""
 
-#: templates/personal.php:61
+#: templates/personal.php:75
 msgid "New password"
 msgstr ""
 
-#: templates/personal.php:65
+#: templates/personal.php:79
 msgid "Change password"
 msgstr ""
 
-#: templates/personal.php:77 templates/users/part.userlist.php:8
+#: templates/personal.php:91 templates/users/part.userlist.php:8
 msgid "Full Name"
 msgstr ""
 
-#: templates/personal.php:92
+#: templates/personal.php:106
 msgid "Email"
 msgstr ""
 
-#: templates/personal.php:94
+#: templates/personal.php:108
 msgid "Your email address"
 msgstr ""
 
-#: templates/personal.php:97
+#: templates/personal.php:111
 msgid ""
 "Fill in an email address to enable password recovery and receive "
 "notifications"
 msgstr ""
 
-#: templates/personal.php:105
+#: templates/personal.php:119
 msgid "Profile picture"
 msgstr ""
 
-#: templates/personal.php:110
+#: templates/personal.php:124
 msgid "Upload new"
 msgstr ""
 
-#: templates/personal.php:112
+#: templates/personal.php:126
 msgid "Select new from Files"
 msgstr ""
 
-#: templates/personal.php:113
+#: templates/personal.php:127
 msgid "Remove image"
 msgstr ""
 
-#: templates/personal.php:114
+#: templates/personal.php:128
 msgid "Either png or jpg. Ideally square but you will be able to crop it."
 msgstr ""
 
-#: templates/personal.php:116
+#: templates/personal.php:130
 msgid "Your avatar is provided by your original account."
 msgstr ""
 
-#: templates/personal.php:120
+#: templates/personal.php:134
 msgid "Cancel"
 msgstr ""
 
-#: templates/personal.php:121
+#: templates/personal.php:135
 msgid "Choose as profile image"
 msgstr ""
 
-#: templates/personal.php:127 templates/personal.php:128
+#: templates/personal.php:141 templates/personal.php:142
 msgid "Language"
 msgstr ""
 
-#: templates/personal.php:147
+#: templates/personal.php:161
 msgid "Help translate"
 msgstr ""
 
-#: templates/personal.php:157
-msgid "SSL root certificates"
-msgstr ""
-
-#: templates/personal.php:160
+#: templates/personal.php:176
 msgid "Common Name"
 msgstr ""
 
-#: templates/personal.php:161
+#: templates/personal.php:177
 msgid "Valid until"
 msgstr ""
 
-#: templates/personal.php:162
+#: templates/personal.php:178
 msgid "Issued By"
 msgstr ""
 
-#: templates/personal.php:171
+#: templates/personal.php:187
 #, php-format
 msgid "Valid until %s"
 msgstr ""
 
-#: templates/personal.php:190
+#: templates/personal.php:206
 msgid "Import Root Certificate"
 msgstr ""
 
-#: templates/personal.php:204
+#: templates/personal.php:220
 msgid "The encryption app is no longer enabled, please decrypt all your files"
 msgstr ""
 
-#: templates/personal.php:210
+#: templates/personal.php:226
 msgid "Log-in password"
 msgstr ""
 
-#: templates/personal.php:215
+#: templates/personal.php:231
 msgid "Decrypt all Files"
 msgstr ""
 
-#: templates/personal.php:225
+#: templates/personal.php:241
 msgid ""
 "Your encryption keys are moved to a backup location. If something went wrong "
 "you can restore the keys. Only delete them permanently if you are sure that "
 "all files are decrypted correctly."
 msgstr ""
 
-#: templates/personal.php:229
+#: templates/personal.php:245
 msgid "Restore Encryption Keys"
 msgstr ""
 
-#: templates/personal.php:233
+#: templates/personal.php:249
 msgid "Delete Encryption Keys"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index f25ec075da4..d94352b34f3 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index a02461b3eb2..e5b3a3047c5 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-22 01:54-0400\n"
+"POT-Creation-Date: 2014-10-23 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index 146f3a2bc5d..60d5897df6c 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Beállítások",
 "Users" => "Felhasználók",
 "Admin" => "Adminsztráció",
+"Recommended" => "Ajánlott",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => " \\\"%s\\\" alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen változatával.",
 "No app name specified" => "Nincs az alkalmazás név megadva.",
 "Unknown filetype" => "Ismeretlen file tipús",
@@ -50,6 +51,7 @@ $TRANSLATIONS = array(
 "PostgreSQL username and/or password not valid" => "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
 "Set an admin username." => "Állítson be egy felhasználói nevet az adminisztrációhoz.",
 "Set an admin password." => "Állítson be egy jelszót az adminisztrációhoz.",
+"Can't create or write into the data directory %s" => "Nem sikerült  létrehozni vagy irni  a \"data\" könyvtárba %s",
 "%s shared »%s« with you" => "%s megosztotta Önnel ezt:  »%s«",
 "Sharing %s failed, because the file does not exist" => "%s megosztása sikertelen, mert a fájl nem létezik",
 "You are not allowed to share %s" => "Önnek nincs jogosultsága %s megosztására",
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 67cddf642ad..20817232f8e 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -1,10 +1,14 @@
 <?php
 $TRANSLATIONS = array(
+"Cannot write into \"config\" directory!" => "Nu se poate scrie în folderul \"config\"!",
+"See %s" => "Vezi %s",
 "Help" => "Ajutor",
 "Personal" => "Personal",
 "Settings" => "Setări",
 "Users" => "Utilizatori",
 "Admin" => "Admin",
+"Recommended" => "Recomandat",
+"No app name specified" => "Niciun nume de aplicație specificat",
 "Unknown filetype" => "Tip fișier necunoscut",
 "Invalid image" => "Imagine invalidă",
 "web services under your control" => "servicii web controlate de tine",
@@ -12,6 +16,7 @@ $TRANSLATIONS = array(
 "Authentication error" => "Eroare la autentificare",
 "Token expired. Please reload page." => "Token expirat. Te rugăm să reîncarci pagina.",
 "Unknown user" => "Utilizator necunoscut",
+"%s enter the database name." => "%s introduceți numele bazei de date",
 "MS SQL username and/or password not valid: %s" => "Nume utilizator și/sau parolă MS SQL greșită: %s",
 "MySQL/MariaDB username and/or password not valid" => "Nume utilizator și/sau parolă MySQL/MariaDB greșită",
 "DB Error: \"%s\"" => "Eroare Bază de Date: \"%s\"",
@@ -19,10 +24,13 @@ $TRANSLATIONS = array(
 "Drop this user from MySQL/MariaDB" => "Șterge acest utilizator din MySQL/MariaDB",
 "MySQL/MariaDB user '%s'@'%%' already exists" => "Utilizatorul MySQL/MariaDB '%s'@'%%' deja există.",
 "Drop this user from MySQL/MariaDB." => "Șterge acest utilizator din MySQL/MariaDB.",
+"Oracle connection could not be established" => "Conexiunea Oracle nu a putut fi stabilită",
 "PostgreSQL username and/or password not valid" => "Nume utilizator și/sau parolă PostgreSQL greșită",
 "Set an admin username." => "Setează un nume de administrator.",
 "Set an admin password." => "Setează o parolă de administrator.",
 "%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
+"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\"",
 "seconds ago" => "secunde în urmă",
 "_%n minute ago_::_%n minutes ago_" => array("","","acum %n minute"),
@@ -35,6 +43,9 @@ $TRANSLATIONS = array(
 "last year" => "ultimul an",
 "years ago" => "ani în urmă",
 "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ă"
+"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",
+"Cannot write into \"config\" directory" => "Nu se poate scrie în folderul \"config\"",
+"Cannot write into \"apps\" directory" => "Nu se poate scrie în folderul \"apps\""
 );
 $PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 3bd242df07d..4e4524e4fe3 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -57,6 +57,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "يجب ادخال كلمة مرور صحيحة",
 "Warning: Home directory for user \"{user}\" already exists" => "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا",
 "__language_name__" => "__language_name__",
+"Encryption" => "التشفير",
 "Everything (fatal issues, errors, warnings, info, debug)" => "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)",
 "Info, warnings, errors and fatal issues" => "معلومات , تحذيرات , اخطاء , مشاكل فادحة ",
 "Warnings, errors and fatal issues" => "تحذيرات , اخطاء , مشاكل فادحة ",
@@ -93,7 +94,6 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
 "Email Server" => "خادم البريد الالكتروني",
 "Send mode" => "وضعية الإرسال",
-"Encryption" => "التشفير",
 "Authentication method" => "أسلوب التطابق",
 "Server address" => "عنوان الخادم",
 "Port" => "المنفذ",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 6daed3ecf05..87b653350ac 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Tien d'apurrise una contraseña válida",
 "Warning: Home directory for user \"{user}\" already exists" => "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
 "__language_name__" => "Asturianu",
+"SSL root certificates" => "Certificaos raíz SSL",
+"Encryption" => "Cifráu",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Too (Información, Avisos, Fallos, debug y problemes fatales)",
 "Info, warnings, errors and fatal issues" => "Información, Avisos, Fallos y problemes fatales",
 "Warnings, errors and fatal issues" => "Avisos, fallos y problemes fatales",
@@ -129,7 +131,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Sirvidor de corréu-e",
 "This is used for sending out notifications." => "Esto úsase pa unviar notificaciones.",
 "Send mode" => "Mou d'unviu",
-"Encryption" => "Cifráu",
 "From address" => "Dende la direición",
 "mail" => "corréu",
 "Authentication method" => "Métodu d'autenticación",
@@ -182,7 +183,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Esbillar como imaxe de perfil",
 "Language" => "Llingua",
 "Help translate" => "Ayúdanos nes traducciones",
-"SSL root certificates" => "Certificaos raíz SSL",
 "Import Root Certificate" => "Importar certificáu raíz",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
 "Log-in password" => "Contraseña d'accesu",
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
index 1241cf06dfe..62ff78c9a83 100644
--- a/settings/l10n/az.php
+++ b/settings/l10n/az.php
@@ -73,6 +73,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Düzgün şifrə daxil edilməlidir",
 "Warning: Home directory for user \"{user}\" already exists" => "Xəbərdarlıq: \"{user}\" istfadəçisi üçün ev qovluğu artıq mövcuddur.",
 "__language_name__" => "__AZ_Azerbaijan__",
+"Encryption" => "Şifrələnmə",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
 "Info, warnings, errors and fatal issues" => "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
 "Warnings, errors and fatal issues" => "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
@@ -91,7 +92,6 @@ $TRANSLATIONS = array(
 "Your PHP version is outdated" => "Sizin PHP versiyası köhnəlib",
 "PHP charset is not set to UTF-8" => "PHP simvol tipi UTF-8 deyil",
 "Send mode" => "Göndərmə rejimi",
-"Encryption" => "Şifrələnmə",
 "Authentication method" => "Qeydiyyat metodikası",
 "More" => "Yenə",
 "by" => "onunla",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index b8388944756..85b4ed32035 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Валидна парола трябва да бъде зададена.",
 "Warning: Home directory for user \"{user}\" already exists" => "Предупреждение: Личната директория на потребителя \"{user}\" вече съществува.",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL root сертификати",
+"Encryption" => "Криптиране",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
 "Info, warnings, errors and fatal issues" => "Информация, предупреждения, грешки и фатални проблеми",
 "Warnings, errors and fatal issues" => "Предупреждения, грешки и фатални проблеми",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Имейл Сървър",
 "This is used for sending out notifications." => "Това се използва за изпращане на уведомления.",
 "Send mode" => "Режим на изпращане",
-"Encryption" => "Криптиране",
 "From address" => "От адрес",
 "mail" => "поща",
 "Authentication method" => "Метод за отризиране",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Избери като аватар",
 "Language" => "Език",
 "Help translate" => "Помогни с превода",
-"SSL root certificates" => "SSL root сертификати",
 "Common Name" => "Познато Име",
 "Valid until" => "Валиден до",
 "Issued By" => "Издаден От",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index e5711e81014..2067c0d9be9 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -41,6 +41,8 @@ $TRANSLATIONS = array(
 "Group Admin" => "গোষ্ঠী প্রশাসক",
 "never" => "কখনোই নয়",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL  রুট সনদপত্র",
+"Encryption" => "সংকেতায়ন",
 "None" => "কোনটিই নয়",
 "Login" => "প্রবেশ",
 "Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
@@ -54,7 +56,6 @@ $TRANSLATIONS = array(
 "Security" => "নিরাপত্তা",
 "Email Server" => "ইমেইল সার্ভার",
 "Send mode" => "পাঠানো মোড",
-"Encryption" => "সংকেতায়ন",
 "From address" => "হইতে ঠিকানা",
 "mail" => "মেইল",
 "Server address" => "সার্ভার ঠিকানা",
@@ -85,7 +86,6 @@ $TRANSLATIONS = array(
 "Cancel" => "বাতির",
 "Language" => "ভাষা",
 "Help translate" => "অনুবাদ করতে সহায়তা করুন",
-"SSL root certificates" => "SSL  রুট সনদপত্র",
 "Import Root Certificate" => "রুট সনদপত্রটি আমদানি করুন",
 "Login Name" => "প্রবেশ",
 "Create" => "তৈরী কর",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index accca49c7fc..70af970d51a 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Heu de facilitar una contrasenya vàlida",
 "Warning: Home directory for user \"{user}\" already exists" => "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
 "__language_name__" => "Català",
+"SSL root certificates" => "Certificats SSL root",
+"Encryption" => "Xifrat",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tot (problemes fatals, errors, avisos, informació, depuració)",
 "Info, warnings, errors and fatal issues" => "Informació, avisos, errors i problemes fatals",
 "Warnings, errors and fatal issues" => "Avisos, errors i problemes fatals",
@@ -128,7 +130,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de correu",
 "This is used for sending out notifications." => "S'usa per enviar notificacions.",
 "Send mode" => "Mode d'enviament",
-"Encryption" => "Xifrat",
 "From address" => "Des de l'adreça",
 "mail" => "correu electrònic",
 "Authentication method" => "Mètode d'autenticació",
@@ -182,7 +183,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Selecciona com a imatge de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajudeu-nos amb la traducció",
-"SSL root certificates" => "Certificats SSL root",
 "Import Root Certificate" => "Importa certificat root",
 "The encryption app is no longer enabled, please decrypt all your files" => "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
 "Log-in password" => "Contrasenya d'accés",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 44d3141eda1..8aa6c59f37c 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Musíte zadat platné heslo",
 "Warning: Home directory for user \"{user}\" already exists" => "Varování: Osobní složka uživatele \"{user}\" již existuje.",
 "__language_name__" => "Česky",
+"SSL root certificates" => "Kořenové certifikáty SSL",
+"Encryption" => "Šifrování",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Vše (fatální problémy, chyby, varování, informační, ladící)",
 "Info, warnings, errors and fatal issues" => "Informace, varování, chyby a fatální problémy",
 "Warnings, errors and fatal issues" => "Varování, chyby a fatální problémy",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-mailový server",
 "This is used for sending out notifications." => "Toto se používá pro odesílání upozornění.",
 "Send mode" => "Mód odesílání",
-"Encryption" => "Šifrování",
 "From address" => "Adresa odesílatele",
 "mail" => "e-mail",
 "Authentication method" => "Metoda ověření",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vybrat jako profilový obrázek",
 "Language" => "Jazyk",
 "Help translate" => "Pomoci s překladem",
-"SSL root certificates" => "Kořenové certifikáty SSL",
 "Common Name" => "Common Name",
 "Valid until" => "Platný do",
 "Issued By" => "Vydal",
diff --git a/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
index e8928d6fc27..22f740c86b7 100644
--- a/settings/l10n/cy_GB.php
+++ b/settings/l10n/cy_GB.php
@@ -7,11 +7,11 @@ $TRANSLATIONS = array(
 "Groups" => "Grwpiau",
 "undo" => "dadwneud",
 "never" => "byth",
+"Encryption" => "Amgryptiad",
 "None" => "Dim",
 "Login" => "Mewngofnodi",
 "Security Warning" => "Rhybudd Diogelwch",
 "Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
-"Encryption" => "Amgryptiad",
 "by" => "gan",
 "Password" => "Cyfrinair",
 "New password" => "Cyfrinair newydd",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 61f4516f2a9..461f3b8c4e6 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "En gyldig adgangskode skal angives",
 "Warning: Home directory for user \"{user}\" already exists" => "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede",
 "__language_name__" => "Dansk",
+"SSL root certificates" => "SSL-rodcertifikater",
+"Encryption" => "Kryptering",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
 "Info, warnings, errors and fatal issues" => "Info, advarsler, fejl og alvorlige fejl",
 "Warnings, errors and fatal issues" => "Advarsler, fejl og alvorlige fejl",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-mailserver",
 "This is used for sending out notifications." => "Dette anvendes til udsendelse af notifikationer.",
 "Send mode" => "Tilstand for afsendelse",
-"Encryption" => "Kryptering",
 "From address" => "Fra adresse",
 "mail" => "mail",
 "Authentication method" => "Godkendelsesmetode",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vælg som profilbillede",
 "Language" => "Sprog",
 "Help translate" => "Hjælp med oversættelsen",
-"SSL root certificates" => "SSL-rodcertifikater",
 "Common Name" => "Almindeligt navn",
 "Valid until" => "Gyldig indtil",
 "Issued By" => "Udstedt af",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 240b1c0f63d..a775d7e104d 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
 "__language_name__" => "Deutsch (Persönlich)",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Encryption" => "Verschlüsselung",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
 "Info, warnings, errors and fatal issues" => "Infos, Warnungen, Fehler und fatale Probleme",
 "Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-Mail-Server",
 "This is used for sending out notifications." => "Dies wird zum Senden von Benachrichtigungen verwendet.",
 "Send mode" => "Sende-Modus",
-"Encryption" => "Verschlüsselung",
 "From address" => "Absender-Adresse",
 "mail" => "Mail",
 "Authentication method" => "Authentifizierungsmethode",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Als Profilbild wählen",
 "Language" => "Sprache",
 "Help translate" => "Hilf bei der Übersetzung",
-"SSL root certificates" => "SSL-Root-Zertifikate",
 "Common Name" => "Zuname",
 "Valid until" => "Gültig bis",
 "Issued By" => "Ausgestellt von:",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index f6e38644691..3aaec32f497 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -36,6 +36,8 @@ $TRANSLATIONS = array(
 "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.",
@@ -54,7 +56,6 @@ $TRANSLATIONS = array(
 "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.",
-"Encryption" => "Verschlüsselung",
 "Server address" => "Adresse des Servers",
 "Port" => "Port",
 "Log" => "Log",
@@ -85,7 +86,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Abbrechen",
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
-"SSL root certificates" => "SSL-Root-Zertifikate",
 "Import Root Certificate" => "Root-Zertifikate importieren",
 "Log-in password" => "Login-Passwort",
 "Decrypt all Files" => "Alle Dateien entschlüsseln",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 563a99ec364..075dedea2fd 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
 "__language_name__" => "Deutsch (Förmlich: Sie)",
+"SSL root certificates" => "SSL-Root-Zertifikate",
+"Encryption" => "Verschlüsselung",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
 "Info, warnings, errors and fatal issues" => "Infos, Warnungen, Fehler und fatale Probleme",
 "Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-Mail-Server",
 "This is used for sending out notifications." => "Dies wird für das Senden von Benachrichtigungen verwendet.",
 "Send mode" => "Sendemodus",
-"Encryption" => "Verschlüsselung",
 "From address" => "Absender-Adresse",
 "mail" => "Mail",
 "Authentication method" => "Legitimierungsmethode",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Als Profilbild wählen",
 "Language" => "Sprache",
 "Help translate" => "Helfen Sie bei der Übersetzung",
-"SSL root certificates" => "SSL-Root-Zertifikate",
 "Common Name" => "Zuname",
 "Valid until" => "Gültig bis",
 "Issued By" => "Ausgestellt von:",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 93115ef2178..f8053cff072 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό",
 "Warning: Home directory for user \"{user}\" already exists" => "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη",
 "__language_name__" => "__όνομα_γλώσσας__",
+"SSL root certificates" => "Πιστοποιητικά SSL root",
+"Encryption" => "Κρυπτογράφηση",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)",
 "Info, warnings, errors and fatal issues" => "Πληροφορίες, προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
 "Warnings, errors and fatal issues" => "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
@@ -138,7 +140,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Διακομιστής Email",
 "This is used for sending out notifications." => "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
 "Send mode" => "Κατάσταση αποστολής",
-"Encryption" => "Κρυπτογράφηση",
 "From address" => "Από τη διεύθυνση",
 "mail" => "ταχυδρομείο",
 "Authentication method" => "Μέθοδος πιστοποίησης",
@@ -191,7 +192,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Επιλογή εικόνας προφίλ",
 "Language" => "Γλώσσα",
 "Help translate" => "Βοηθήστε στη μετάφραση",
-"SSL root certificates" => "Πιστοποιητικά SSL root",
 "Common Name" => "Κοινό Όνομα",
 "Valid until" => "Έγκυρο έως",
 "Issued By" => "Έκδόθηκε από",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 321e652649e..7b3d5cba97d 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "A valid password must be provided",
 "Warning: Home directory for user \"{user}\" already exists" => "Warning: Home directory for user \"{user}\" already exists",
 "__language_name__" => "English (British English)",
+"SSL root certificates" => "SSL root certificates",
+"Encryption" => "Encryption",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Everything (fatal issues, errors, warnings, info, debug)",
 "Info, warnings, errors and fatal issues" => "Info, warnings, errors and fatal issues",
 "Warnings, errors and fatal issues" => "Warnings, errors and fatal issues",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Email Server",
 "This is used for sending out notifications." => "This is used for sending out notifications.",
 "Send mode" => "Send mode",
-"Encryption" => "Encryption",
 "From address" => "From address",
 "mail" => "mail",
 "Authentication method" => "Authentication method",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Choose as profile image",
 "Language" => "Language",
 "Help translate" => "Help translate",
-"SSL root certificates" => "SSL root certificates",
 "Common Name" => "Common Name",
 "Valid until" => "Valid until",
 "Issued By" => "Issued By",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 3d8fac31ef0..e373b724d15 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -57,6 +57,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Valida pasvorto devas proviziĝi",
 "Warning: Home directory for user \"{user}\" already exists" => "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
 "__language_name__" => "Esperanto",
+"SSL root certificates" => "Radikaj SSL-atestoj",
+"Encryption" => "Ĉifrado",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
 "Info, warnings, errors and fatal issues" => "Informoj, avertoj, eraroj kaj fatalaĵoj",
 "Warnings, errors and fatal issues" => "Avertoj, eraroj kaj fatalaĵoj",
@@ -80,7 +82,6 @@ $TRANSLATIONS = array(
 "Security" => "Sekuro",
 "Email Server" => "Retpoŝtoservilo",
 "Send mode" => "Sendi pli",
-"Encryption" => "Ĉifrado",
 "From address" => "El adreso",
 "mail" => "retpoŝto",
 "Authentication method" => "Aŭtentiga metodo",
@@ -128,7 +129,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Elekti kiel profilan bildon",
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
-"SSL root certificates" => "Radikaj SSL-atestoj",
 "Import Root Certificate" => "Enporti radikan ateston",
 "Log-in password" => "Ensaluta pasvorto",
 "Decrypt all Files" => "Malĉifri ĉiujn dosierojn",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 7cd822bff53..cb299e433c3 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Se debe proporcionar una contraseña válida",
 "Warning: Home directory for user \"{user}\" already exists" => "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
 "__language_name__" => "Castellano",
+"SSL root certificates" => "Certificados raíz SSL",
+"Encryption" => "Cifrado",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Todo (Información, Avisos, Errores, debug y problemas fatales)",
 "Info, warnings, errors and fatal issues" => "Información, Avisos, Errores y problemas fatales",
 "Warnings, errors and fatal issues" => "Advertencias, errores y problemas fatales",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de correo electrónico",
 "This is used for sending out notifications." => "Esto se usa para enviar notificaciones.",
 "Send mode" => "Modo de envío",
-"Encryption" => "Cifrado",
 "From address" => "Desde la dirección",
 "mail" => "correo electrónico",
 "Authentication method" => "Método de autenticación",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Seleccionar como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
-"SSL root certificates" => "Certificados raíz SSL",
 "Common Name" => "Nombre común",
 "Valid until" => "Válido hasta",
 "Issued By" => "Emitido por",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index 6bb1c20f38a..ae966928fbe 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -56,6 +56,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Debe ingresar una contraseña válida",
 "Warning: Home directory for user \"{user}\" already exists" => "Advertencia: El directorio Home del usuario \"{user}\" ya existe",
 "__language_name__" => "Castellano (Argentina)",
+"SSL root certificates" => "certificados SSL raíz",
+"Encryption" => "Encriptación",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Todo (notificaciones fatales, errores, advertencias, info, debug)",
 "Info, warnings, errors and fatal issues" => "Info, advertencias, errores y notificaciones fatales",
 "Warnings, errors and fatal issues" => "Advertencias, errores y notificaciones fatales",
@@ -95,7 +97,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de correo electrónico",
 "This is used for sending out notifications." => "Esto es usado para enviar notificaciones.",
 "Send mode" => "Modo de envio",
-"Encryption" => "Encriptación",
 "From address" => "Dirección remitente",
 "Authentication method" => "Método de autenticación",
 "Authentication required" => "Autentificación requerida",
@@ -144,7 +145,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Elegir como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayudanos a traducir",
-"SSL root certificates" => "certificados SSL raíz",
 "Import Root Certificate" => "Importar certificado raíz",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
 "Log-in password" => "Clave de acceso",
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 600b804d827..88c11e224fd 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -45,6 +45,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Se debe proporcionar una contraseña válida",
 "Warning: Home directory for user \"{user}\" already exists" => "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
 "__language_name__" => "Español (México)",
+"SSL root certificates" => "Certificados raíz SSL",
+"Encryption" => "Cifrado",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Todo (Información, Avisos, Errores, debug y problemas fatales)",
 "Info, warnings, errors and fatal issues" => "Información, Avisos, Errores y problemas fatales",
 "Warnings, errors and fatal issues" => "Advertencias, errores y problemas fatales",
@@ -75,7 +77,6 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Forzar HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
-"Encryption" => "Cifrado",
 "Server address" => "Dirección del servidor",
 "Port" => "Puerto",
 "Log" => "Registro",
@@ -113,7 +114,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Seleccionar como imagen de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ayúdanos a traducir",
-"SSL root certificates" => "Certificados raíz SSL",
 "Import Root Certificate" => "Importar certificado raíz",
 "The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
 "Log-in password" => "Contraseña de acceso",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index d1515065bc4..d4a0a158068 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Sisesta nõuetele vastav parool",
 "Warning: Home directory for user \"{user}\" already exists" => "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
 "__language_name__" => "Eesti",
+"SSL root certificates" => "SSL root sertifikaadid",
+"Encryption" => "Krüpteerimine",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
 "Info, warnings, errors and fatal issues" => "Info, hoiatused, veateted ja tõsised probleemid",
 "Warnings, errors and fatal issues" => "Hoiatused, veateated ja tõsised probleemid",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Postiserver",
 "This is used for sending out notifications." => "Seda kasutatakse teadete välja saatmiseks.",
 "Send mode" => "Saatmise viis",
-"Encryption" => "Krüpteerimine",
 "From address" => "Saatja aadress",
 "mail" => "e-mail",
 "Authentication method" => "Autentimise meetod",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vali profiilipildiks",
 "Language" => "Keel",
 "Help translate" => "Aita tõlkida",
-"SSL root certificates" => "SSL root sertifikaadid",
 "Common Name" => "Üldnimetus",
 "Valid until" => "Kehtib kuni",
 "Issued By" => "isas",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index fe62796e1ac..e11e160d31e 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -75,6 +75,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Baliozko pasahitza eman behar da",
 "Warning: Home directory for user \"{user}\" already exists" => "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
 "__language_name__" => "Euskara",
+"SSL root certificates" => "SSL erro ziurtagiriak",
+"Encryption" => "Enkriptazioa",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
 "Info, warnings, errors and fatal issues" => "Informazioa, abisuak, erroreak eta arazo larriak.",
 "Warnings, errors and fatal issues" => "Abisuak, erroreak eta arazo larriak",
@@ -135,7 +137,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Eposta zerbitzaria",
 "This is used for sending out notifications." => "Hau jakinarazpenak bidaltzeko erabiltzen da.",
 "Send mode" => "Bidaltzeko modua",
-"Encryption" => "Enkriptazioa",
 "From address" => "Helbidetik",
 "mail" => "posta",
 "Authentication method" => "Autentifikazio metodoa",
@@ -189,7 +190,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Profil irudi bezala aukeratu",
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
-"SSL root certificates" => "SSL erro ziurtagiriak",
 "Import Root Certificate" => "Inportatu erro ziurtagiria",
 "The encryption app is no longer enabled, please decrypt all your files" => "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
 "Log-in password" => "Saioa hasteko pasahitza",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index b964c18c51a..fec5c92f62c 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -67,6 +67,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "رمز عبور صحیح باید وارد شود",
 "Warning: Home directory for user \"{user}\" already exists" => "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "گواهی های اصلی SSL ",
+"Encryption" => "رمزگذاری",
 "Everything (fatal issues, errors, warnings, info, debug)" => "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)",
 "Info, warnings, errors and fatal issues" => "اطلاعات، اخطارها، خطاها، مشکلات اساسی",
 "Warnings, errors and fatal issues" => "اخطارها، خطاها، مشکلات مهلک",
@@ -110,7 +112,6 @@ $TRANSLATIONS = array(
 "Email Server" => "سرور ایمیل",
 "This is used for sending out notifications." => "این برای ارسال هشدار ها استفاده می شود",
 "Send mode" => "حالت ارسال",
-"Encryption" => "رمزگذاری",
 "From address" => "آدرس فرستنده",
 "mail" => "ایمیل",
 "Authentication method" => "روش احراز هویت",
@@ -160,7 +161,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "یک تصویر پروفایل انتخاب کنید",
 "Language" => "زبان",
 "Help translate" => "به ترجمه آن کمک کنید",
-"SSL root certificates" => "گواهی های اصلی SSL ",
 "Import Root Certificate" => "وارد کردن گواهی اصلی",
 "Log-in password" => "رمز ورود",
 "Decrypt all Files" => "تمام فایلها رمزگشایی شود",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index e82bc039f22..cffcb39a185 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Anna kelvollinen salasana",
 "Warning: Home directory for user \"{user}\" already exists" => "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio",
 "__language_name__" => "_kielen_nimi_",
+"SSL root certificates" => "SSL-juurivarmenteet",
+"Encryption" => "Salaus",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
 "Info, warnings, errors and fatal issues" => "Tiedot, varoitukset, virheet ja vakavat ongelmat",
 "Warnings, errors and fatal issues" => "Varoitukset, virheet ja vakavat ongelmat",
@@ -134,7 +136,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Sähköpostipalvelin",
 "This is used for sending out notifications." => "Tätä käytetään ilmoitusten lähettämiseen.",
 "Send mode" => "Lähetystila",
-"Encryption" => "Salaus",
 "From address" => "Lähettäjän osoite",
 "Authentication method" => "Tunnistautumistapa",
 "Authentication required" => "Tunnistautuminen vaaditaan",
@@ -191,7 +192,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Valitse profiilikuvaksi",
 "Language" => "Kieli",
 "Help translate" => "Auta kääntämisessä",
-"SSL root certificates" => "SSL-juurivarmenteet",
 "Valid until" => "Kelvollinen",
 "Issued By" => " Myöntänyt",
 "Valid until %s" => "Kelvollinen %s asti",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 2d0dd54c1d7..f876f92ef8a 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Un mot de passe valide doit être saisi",
 "Warning: Home directory for user \"{user}\" already exists" => "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
 "__language_name__" => "Français",
+"SSL root certificates" => "Certificats racine SSL",
+"Encryption" => "Chiffrement",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
 "Info, warnings, errors and fatal issues" => "Informations, avertissements, erreurs et erreurs fatales",
 "Warnings, errors and fatal issues" => "Avertissements, erreurs et erreurs fatales",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Serveur mail",
 "This is used for sending out notifications." => "Ceci est utilisé pour l'envoi des notifications.",
 "Send mode" => "Mode d'envoi",
-"Encryption" => "Chiffrement",
 "From address" => "Adresse source",
 "mail" => "courriel",
 "Authentication method" => "Méthode d'authentification",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Choisir en tant que photo de profil ",
 "Language" => "Langue",
 "Help translate" => "Aidez à traduire",
-"SSL root certificates" => "Certificats racine SSL",
 "Common Name" => "Nom d'usage",
 "Valid until" => "Valide jusqu'à",
 "Issued By" => "Délivré par",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 6886b876ed8..3a33c6965d6 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -73,6 +73,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Debe fornecer un contrasinal",
 "Warning: Home directory for user \"{user}\" already exists" => "Aviso: O directorio persoal para o usuario «{user}» xa existe",
 "__language_name__" => "Galego",
+"SSL root certificates" => "Certificados raíz SSL",
+"Encryption" => "Cifrado",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Todo (problemas críticos, erros, avisos, información, depuración)",
 "Info, warnings, errors and fatal issues" => "Información, avisos, erros e problemas críticos",
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas críticos",
@@ -133,7 +135,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de correo",
 "This is used for sending out notifications." => "Isto utilizase para o envío de notificacións.",
 "Send mode" => "Modo de envío",
-"Encryption" => "Cifrado",
 "From address" => "Desde o enderezo",
 "mail" => "correo",
 "Authentication method" => "Método de autenticación",
@@ -187,7 +188,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Escolla unha imaxe para o perfil",
 "Language" => "Idioma",
 "Help translate" => "Axude na tradución",
-"SSL root certificates" => "Certificados raíz SSL",
 "Import Root Certificate" => "Importar o certificado raíz",
 "The encryption app is no longer enabled, please decrypt all your files" => "A aplicación de cifrado non está activada, descifre todos os ficheiros",
 "Log-in password" => "Contrasinal de acceso",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 8974c1fb1e1..e9824dabdb4 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "יצירת המשתמש נכשלה",
 "A valid password must be provided" => "יש לספק ססמה תקנית",
 "__language_name__" => "עברית",
+"SSL root certificates" => "שורש אישורי אבטחת SSL ",
+"Encryption" => "הצפנה",
 "None" => "כלום",
 "Login" => "התחברות",
 "Security Warning" => "אזהרת אבטחה",
@@ -45,7 +47,6 @@ $TRANSLATIONS = array(
 "Allow resharing" => "לאפשר שיתוף מחדש",
 "Security" => "אבטחה",
 "Enforce HTTPS" => "לאלץ HTTPS",
-"Encryption" => "הצפנה",
 "Server address" => "כתובת שרת",
 "Port" => "פורט",
 "Credentials" => "פרטי גישה",
@@ -78,7 +79,6 @@ $TRANSLATIONS = array(
 "Cancel" => "ביטול",
 "Language" => "פה",
 "Help translate" => "עזרה בתרגום",
-"SSL root certificates" => "שורש אישורי אבטחת SSL ",
 "Import Root Certificate" => "ייבוא אישור אבטחת שורש",
 "Login Name" => "שם כניסה",
 "Create" => "יצירה",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 1fe1adb36a0..5718a5261c7 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Nužno je navesti valjanu lozinku",
 "Warning: Home directory for user \"{user}\" already exists" => "Upozorenje: Osnovni direktorij za korisnika \"{user}\" već postoji",
 "__language_name__" => "__jezik_naziv___",
+"SSL root certificates" => "SSL Root certifikati",
+"Encryption" => "Šifriranje",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
 "Info, warnings, errors and fatal issues" => "Informacije, upozorenja, pogreške i kobni problemi",
 "Warnings, errors and fatal issues" => "Upozorenja, pogreške i kobni problemi",
@@ -136,7 +138,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Poslužitelj e-pošte",
 "This is used for sending out notifications." => "Ovo se koristi za slanje notifikacija.",
 "Send mode" => "Način rada za slanje",
-"Encryption" => "Šifriranje",
 "From address" => "S adrese",
 "mail" => "pošta",
 "Authentication method" => "Postupak autentikacije",
@@ -189,7 +190,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Odaberite kao sliku profila",
 "Language" => "Jezik",
 "Help translate" => "Pomozite prevesti",
-"SSL root certificates" => "SSL Root certifikati",
 "Common Name" => "Common Name",
 "Valid until" => "Valid until",
 "Issued By" => "Issued By",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index a404340941c..9da8ffb70d7 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Bekapcsolva",
+"Recommended" => "Ajánlott",
 "Authentication error" => "Azonosítási hiba",
 "Your full name has been changed." => "Az Ön teljes nevét módosítottuk.",
 "Unable to change full name" => "Nem sikerült megváltoztatni a teljes nevét",
@@ -75,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Érvényes jelszót kell megadnia",
 "Warning: Home directory for user \"{user}\" already exists" => "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára  már létezik",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL tanúsítványok",
+"Encryption" => "Titkosítás",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
 "Info, warnings, errors and fatal issues" => "Információk, figyelmeztetések, hibák és végzetes hibák",
 "Warnings, errors and fatal issues" => "Figyelmeztetések, hibák és végzetes hibák",
@@ -135,7 +138,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-mail kiszolgáló",
 "This is used for sending out notifications." => "Ezt használjuk a jelentések kiküldésére.",
 "Send mode" => "Küldési mód",
-"Encryption" => "Titkosítás",
 "From address" => "A feladó címe",
 "mail" => "mail",
 "Authentication method" => "A felhasználóazonosítás módszere",
@@ -188,7 +190,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Válasszuk ki profilképnek",
 "Language" => "Nyelv",
 "Help translate" => "Segítsen a fordításban!",
-"SSL root certificates" => "SSL tanúsítványok",
 "Import Root Certificate" => "SSL tanúsítványok importálása",
 "The encryption app is no longer enabled, please decrypt all your files" => "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
 "Log-in password" => "Bejelentkezési jelszó",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 441586a0f1a..644f4e7806e 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -54,6 +54,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Tuliskan sandi yang valid",
 "Warning: Home directory for user \"{user}\" already exists" => "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "Sertifikat root SSL",
+"Encryption" => "Enkripsi",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
 "Info, warnings, errors and fatal issues" => "Info, peringatan, galat dan masalah fatal",
 "Warnings, errors and fatal issues" => "Peringatan, galat dan masalah fatal",
@@ -93,7 +95,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Server Email",
 "This is used for sending out notifications." => "Ini digunakan untuk mengirim notifikasi keluar.",
 "Send mode" => "Modus kirim",
-"Encryption" => "Enkripsi",
 "From address" => "Dari alamat",
 "Authentication method" => "Metode otentikasi",
 "Authentication required" => "Diperlukan otentikasi",
@@ -142,7 +143,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Pilih sebagai gambar profil",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
-"SSL root certificates" => "Sertifikat root SSL",
 "Import Root Certificate" => "Impor Sertifikat Root",
 "The encryption app is no longer enabled, please decrypt all your files" => "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
 "Log-in password" => "Sandi masuk",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index 263926500d5..a4def1bdc47 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -24,9 +24,10 @@ $TRANSLATIONS = array(
 "Group Admin" => "Hópstjóri",
 "never" => "aldrei",
 "__language_name__" => "__nafn_tungumáls__",
+"SSL root certificates" => "SSL rótar skilríki",
+"Encryption" => "Dulkóðun",
 "None" => "Ekkert",
 "Security Warning" => "Öryggis aðvörun",
-"Encryption" => "Dulkóðun",
 "Server address" => "Host nafn netþjóns",
 "More" => "Meira",
 "Less" => "Minna",
@@ -51,7 +52,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Hætta við",
 "Language" => "Tungumál",
 "Help translate" => "Hjálpa við þýðingu",
-"SSL root certificates" => "SSL rótar skilríki",
 "Import Root Certificate" => "Flytja inn rótar skilríki",
 "Create" => "Búa til",
 "Unlimited" => "Ótakmarkað",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 9b523c87ff3..f1a5a50ec49 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Deve essere fornita una password valida",
 "Warning: Home directory for user \"{user}\" already exists" => "Avviso: la cartella home dell'utente \"{user}\" esiste già",
 "__language_name__" => "Italiano",
+"SSL root certificates" => "Certificati SSL radice",
+"Encryption" => "Cifratura",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
 "Info, warnings, errors and fatal issues" => "Informazioni, avvisi, errori e problemi gravi",
 "Warnings, errors and fatal issues" => "Avvisi, errori e problemi gravi",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Server di posta",
 "This is used for sending out notifications." => "Viene utilizzato per inviare le notifiche.",
 "Send mode" => "Modalità di invio",
-"Encryption" => "Cifratura",
 "From address" => "Indirizzo mittente",
 "mail" => "posta",
 "Authentication method" => "Metodo di autenticazione",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Scegli come immagine del profilo",
 "Language" => "Lingua",
 "Help translate" => "Migliora la traduzione",
-"SSL root certificates" => "Certificati SSL radice",
 "Common Name" => "Nome comune",
 "Valid until" => "Valido fino al",
 "Issued By" => "Emesso da",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index 9d70f721c38..cbbccb4013b 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "有効なパスワードを指定する必要があります",
 "Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
 "__language_name__" => "Japanese (日本語)",
+"SSL root certificates" => "SSLルート証明書",
+"Encryption" => "暗号化",
 "Everything (fatal issues, errors, warnings, info, debug)" => "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
 "Info, warnings, errors and fatal issues" => "情報、警告、エラー、致命的な問題",
 "Warnings, errors and fatal issues" => "警告、エラー、致命的な問題",
@@ -138,7 +140,6 @@ $TRANSLATIONS = array(
 "Email Server" => "メールサーバー",
 "This is used for sending out notifications." => "これは通知の送信に使われます。",
 "Send mode" => "送信モード",
-"Encryption" => "暗号化",
 "From address" => "送信元アドレス",
 "mail" => "メール",
 "Authentication method" => "認証方法",
@@ -192,7 +193,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "プロファイル画像として選択",
 "Language" => "言語",
 "Help translate" => "翻訳に協力する",
-"SSL root certificates" => "SSLルート証明書",
 "Common Name" => "コモンネーム",
 "Valid until" => "有効期限",
 "Issued By" => "発行元",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index f59e85d144d..f656b7e87f8 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -31,6 +31,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "შეცდომა მომხმარებლის შექმნისას",
 "A valid password must be provided" => "უნდა მიუთითოთ არსებული პაროლი",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL root სერთიფიკატები",
+"Encryption" => "ენკრიპცია",
 "None" => "არა",
 "Login" => "ლოგინი",
 "Security Warning" => "უსაფრთხოების გაფრთხილება",
@@ -46,7 +48,6 @@ $TRANSLATIONS = array(
 "Allow resharing" => "გადაზიარების დაშვება",
 "Security" => "უსაფრთხოება",
 "Enforce HTTPS" => "HTTPS–ის ჩართვა",
-"Encryption" => "ენკრიპცია",
 "Server address" => "სერვერის მისამართი",
 "Port" => "პორტი",
 "Credentials" => "იუზერ/პაროლი",
@@ -77,7 +78,6 @@ $TRANSLATIONS = array(
 "Cancel" => "უარყოფა",
 "Language" => "ენა",
 "Help translate" => "თარგმნის დახმარება",
-"SSL root certificates" => "SSL root სერთიფიკატები",
 "Import Root Certificate" => "Root სერთიფიკატის იმპორტირება",
 "Login Name" => "მომხმარებლის სახელი",
 "Create" => "შექმნა",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index 67703a0ed2d..dcb718b3b73 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -45,6 +45,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
 "A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
 "__language_name__" => "__language_name__",
+"Encryption" => "កូដនីយកម្ម",
 "None" => "គ្មាន",
 "Login" => "ចូល",
 "SSL" => "SSL",
@@ -62,7 +63,6 @@ $TRANSLATIONS = array(
 "Security" => "សុវត្ថិភាព",
 "Enforce HTTPS" => "បង្ខំ HTTPS",
 "Email Server" => "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
-"Encryption" => "កូដនីយកម្ម",
 "From address" => "ពី​អាសយដ្ឋាន",
 "Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
 "Port" => "ច្រក",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index ebea9e4432c..8913ae043b9 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -60,6 +60,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "올바른 암호를 입력해야 함",
 "Warning: Home directory for user \"{user}\" already exists" => "경고: 사용자 \"{user}\"의 홈 디렉터리가 이미 존재합니다",
 "__language_name__" => "한국어",
+"SSL root certificates" => "SSL 루트 인증서",
+"Encryption" => "암호화",
 "Everything (fatal issues, errors, warnings, info, debug)" => "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
 "Info, warnings, errors and fatal issues" => "정보, 경고, 오류, 치명적 문제",
 "Warnings, errors and fatal issues" => "경고, 오류, 치명적 문제",
@@ -96,7 +98,6 @@ $TRANSLATIONS = array(
 "Forces the clients to connect to %s via an encrypted connection." => "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
 "Email Server" => "전자우편 서버",
-"Encryption" => "암호화",
 "From address" => "보낸 이 주소",
 "Authentication method" => "인증 방법",
 "Authentication required" => "인증 필요함",
@@ -146,7 +147,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "프로필 이미지로 사용",
 "Language" => "언어",
 "Help translate" => "번역 돕기",
-"SSL root certificates" => "SSL 루트 인증서",
 "Import Root Certificate" => "루트 인증서 가져오기",
 "The encryption app is no longer enabled, please decrypt all your files" => "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
 "Log-in password" => "로그인 암호",
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
index 947831a7044..2a0ca54def8 100644
--- a/settings/l10n/ku_IQ.php
+++ b/settings/l10n/ku_IQ.php
@@ -2,9 +2,9 @@
 $TRANSLATIONS = array(
 "Invalid request" => "داواکارى نادروستە",
 "Enable" => "چالاککردن",
+"Encryption" => "نهێنیکردن",
 "None" => "هیچ",
 "Login" => "چوونەژوورەوە",
-"Encryption" => "نهێنیکردن",
 "Server address" => "ناونیشانی ڕاژه",
 "by" => "له‌لایه‌ن",
 "Password" => "وشەی تێپەربو",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 2617679390b..1404622d35c 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -43,6 +43,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Slaptažodis turi būti tinkamas",
 "Warning: Home directory for user \"{user}\" already exists" => "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja",
 "__language_name__" => "Lietuvių",
+"SSL root certificates" => "SSL sertifikatas",
+"Encryption" => "Šifravimas",
 "Fatal issues only" => "Tik kritinės problemos",
 "None" => "Nieko",
 "Login" => "Prisijungti",
@@ -64,7 +66,6 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Reikalauti HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
-"Encryption" => "Šifravimas",
 "Server address" => "Serverio adresas",
 "Port" => "Prievadas",
 "Log" => "Žurnalas",
@@ -102,7 +103,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Pasirinkite profilio paveiksliuką",
 "Language" => "Kalba",
 "Help translate" => "Padėkite išversti",
-"SSL root certificates" => "SSL sertifikatas",
 "Import Root Certificate" => "Įkelti pagrindinį sertifikatą",
 "Log-in password" => "Prisijungimo slaptažodis",
 "Decrypt all Files" => "Iššifruoti visus failus",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 4182bad26e9..e736ba17149 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -32,6 +32,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Kļūda, veidojot lietotāju",
 "A valid password must be provided" => "Jānorāda derīga parole",
 "__language_name__" => "__valodas_nosaukums__",
+"SSL root certificates" => "SSL saknes sertifikāti",
+"Encryption" => "Šifrēšana",
 "None" => "Nav",
 "Login" => "Ierakstīties",
 "Security Warning" => "Brīdinājums par drošību",
@@ -51,7 +53,6 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Uzspiest HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
-"Encryption" => "Šifrēšana",
 "Server address" => "Servera adrese",
 "Port" => "Ports",
 "Credentials" => "Akreditācijas dati",
@@ -83,7 +84,6 @@ $TRANSLATIONS = array(
 "Cancel" => "Atcelt",
 "Language" => "Valoda",
 "Help translate" => "Palīdzi tulkot",
-"SSL root certificates" => "SSL saknes sertifikāti",
 "Import Root Certificate" => "Importēt saknes sertifikātus",
 "Log-in password" => "Pieslēgšanās parole",
 "Decrypt all Files" => "Atšifrēt visus failus",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index c3e062caeee..3968ea60c71 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -55,6 +55,8 @@ $TRANSLATIONS = array(
 "Error creating user" => "Грешка при креирање на корисникот",
 "A valid password must be provided" => "Мора да се обезбеди валидна лозинка",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL root сертификати",
+"Encryption" => "Енкрипција",
 "Info, warnings, errors and fatal issues" => "Информации, предупредувања, грешки и фатални работи",
 "Warnings, errors and fatal issues" => "Предупредувања, грешки и фатални работи",
 "Errors and fatal issues" => "Грешки и фатални работи",
@@ -89,7 +91,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Сервер за електронска пошта",
 "This is used for sending out notifications." => "Ова се користи за испраќање на известувања.",
 "Send mode" => "Мод на испраќање",
-"Encryption" => "Енкрипција",
 "From address" => "Од адреса",
 "mail" => "Електронска пошта",
 "Authentication method" => "Метод на автентификација",
@@ -139,7 +140,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Одбери фотографија за профилот",
 "Language" => "Јазик",
 "Help translate" => "Помогни во преводот",
-"SSL root certificates" => "SSL root сертификати",
 "Import Root Certificate" => "Увези",
 "Log-in password" => "Лозинка за најавување",
 "Decrypt all Files" => "Дешифрирај ги сите датотеки",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 14ecd314946..6aa70d2543f 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Oppgi et gyldig passord",
 "Warning: Home directory for user \"{user}\" already exists" => "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL rotsertifikater",
+"Encryption" => "Kryptering",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alt (fatale problemer, feil, advarsler, info, debug)",
 "Info, warnings, errors and fatal issues" => "Info, advarsler, feil og fatale problemer",
 "Warnings, errors and fatal issues" => "Advarsler, feil og fatale problemer",
@@ -138,7 +140,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-postserver",
 "This is used for sending out notifications." => "Dette brukes for utsending av varsler.",
 "Send mode" => "Sendemåte",
-"Encryption" => "Kryptering",
 "From address" => "Fra adresse",
 "mail" => "e-post",
 "Authentication method" => "Autentiseringsmetode",
@@ -191,7 +192,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Velg som profilbilde",
 "Language" => "Språk",
 "Help translate" => "Bidra til oversettelsen",
-"SSL root certificates" => "SSL rotsertifikater",
 "Common Name" => "Vanlig navn",
 "Valid until" => "Gyldig til",
 "Issued By" => "Utstedt av",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index b9f3e2ed89d..c9c3d343e5a 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
 "Warning: Home directory for user \"{user}\" already exists" => "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al",
 "__language_name__" => "Nederlands",
+"SSL root certificates" => "SSL root certificaten",
+"Encryption" => "Versleuteling",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
 "Info, warnings, errors and fatal issues" => "Info, waarschuwingen, fouten en fatale problemen",
 "Warnings, errors and fatal issues" => "Waarschuwingen, fouten en fatale problemen",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-mailserver",
 "This is used for sending out notifications." => "Dit wordt gestuurd voor het verzenden van meldingen.",
 "Send mode" => "Verstuurmodus",
-"Encryption" => "Versleuteling",
 "From address" => "Afzenderadres",
 "mail" => "e-mail",
 "Authentication method" => "Authenticatiemethode",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Kies als profielafbeelding",
 "Language" => "Taal",
 "Help translate" => "Help met vertalen",
-"SSL root certificates" => "SSL root certificaten",
 "Common Name" => "Common Name",
 "Valid until" => "Geldig tot",
 "Issued By" => "Uitgegeven door",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 0c4a196313f..8b71081e651 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -43,6 +43,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "Feil ved oppretting av brukar",
 "A valid password must be provided" => "Du må oppgje eit gyldig passord",
 "__language_name__" => "Nynorsk",
+"Encryption" => "Kryptering",
 "Login" => "Logg inn",
 "Security Warning" => "Tryggleiksåtvaring",
 "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." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
@@ -61,7 +62,6 @@ $TRANSLATIONS = array(
 "Enforce HTTPS" => "Krev HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
-"Encryption" => "Kryptering",
 "Server address" => "Tenaradresse",
 "Log" => "Logg",
 "Log level" => "Log nivå",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 4dac77e30b4..061d9a6efcc 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Należy podać prawidłowe hasło",
 "Warning: Home directory for user \"{user}\" already exists" => "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
 "__language_name__" => "polski",
+"SSL root certificates" => "Główny certyfikat SSL",
+"Encryption" => "Szyfrowanie",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
 "Info, warnings, errors and fatal issues" => "Informacje, ostrzeżenia, błędy i poważne problemy",
 "Warnings, errors and fatal issues" => "Ostrzeżenia, błędy i poważne problemy",
@@ -138,7 +140,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Serwer pocztowy",
 "This is used for sending out notifications." => "To jest używane do wysyłania powiadomień",
 "Send mode" => "Tryb wysyłki",
-"Encryption" => "Szyfrowanie",
 "From address" => "Z adresu",
 "mail" => "mail",
 "Authentication method" => "Metoda autentykacji",
@@ -192,7 +193,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Wybierz zdjęcie profilu",
 "Language" => "Język",
 "Help translate" => "Pomóż w tłumaczeniu",
-"SSL root certificates" => "Główny certyfikat SSL",
 "Common Name" => "Nazwa CN",
 "Valid until" => "Ważny do",
 "Issued By" => "Wydany przez",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 7544c8d83c3..800ac705af3 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Forneça uma senha válida",
 "Warning: Home directory for user \"{user}\" already exists" => "Aviso: O diretório home para o usuário \"{user}\" já existe",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "Certificados SSL raíz",
+"Encryption" => "Criptografia",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (questões fatais, erros, avisos, informações, depuração)",
 "Info, warnings, errors and fatal issues" => "Informações, avisos, erros e problemas fatais",
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de Email",
 "This is used for sending out notifications." => "Isto é usado para o envio de notificações.",
 "Send mode" => "Modo enviar",
-"Encryption" => "Criptografia",
 "From address" => "Do Endereço",
 "mail" => "email",
 "Authentication method" => "Método de autenticação",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Escolha como imagem para o perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
-"SSL root certificates" => "Certificados SSL raíz",
 "Common Name" => "Nome",
 "Valid until" => "Válido até",
 "Issued By" => "Emitido Por",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index 2eb87b14443..f273ddc035d 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Uma password válida deve ser fornecida",
 "Warning: Home directory for user \"{user}\" already exists" => "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "Certificados SSL de raiz",
+"Encryption" => "Encriptação",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (problemas fatais, erros, avisos, informação, depuração)",
 "Info, warnings, errors and fatal issues" => "Informação, avisos, erros e problemas fatais",
 "Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Servidor de email",
 "This is used for sending out notifications." => "Isto é utilizado para enviar notificações",
 "Send mode" => "Modo de envio",
-"Encryption" => "Encriptação",
 "From address" => "Do endereço",
 "mail" => "Correio",
 "Authentication method" => "Método de autenticação",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Escolha uma fotografia de perfil",
 "Language" => "Idioma",
 "Help translate" => "Ajude a traduzir",
-"SSL root certificates" => "Certificados SSL de raiz",
 "Common Name" => "Nome Comum",
 "Valid until" => "Válido até",
 "Issued By" => "Emitido Por",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 1e8c073d36b..feb4b902843 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Activat",
+"Recommended" => "Recomandat",
 "Authentication error" => "Eroare la autentificare",
 "Your full name has been changed." => "Numele tău complet a fost schimbat.",
 "Unable to change full name" => "Nu s-a puput schimba numele complet",
@@ -53,6 +54,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Trebuie să furnizaţi o parolă validă",
 "Warning: Home directory for user \"{user}\" already exists" => "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există",
 "__language_name__" => "_language_name_",
+"SSL root certificates" => "Certificate SSL root",
+"Encryption" => "Încriptare",
 "None" => "Niciuna",
 "Login" => "Autentificare",
 "SSL" => "SSL",
@@ -74,7 +77,6 @@ $TRANSLATIONS = array(
 "Security" => "Securitate",
 "Forces the clients to connect to %s via an encrypted connection." => "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
 "Send mode" => "Modul de expediere",
-"Encryption" => "Încriptare",
 "Authentication method" => "Modul de autentificare",
 "Server address" => "Adresa server-ului",
 "Port" => "Portul",
@@ -115,7 +117,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Alege drept imagine de profil",
 "Language" => "Limba",
 "Help translate" => "Ajută la traducere",
-"SSL root certificates" => "Certificate SSL root",
 "Import Root Certificate" => "Importă certificat root",
 "Log-in password" => "Parolă",
 "Decrypt all Files" => "Decriptează toate fișierele",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 49ae9a28a9a..0a376bd9e45 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Укажите валидный пароль",
 "Warning: Home directory for user \"{user}\" already exists" => "Предупреждение: домашняя папка пользователя \"{user}\" уже существует",
 "__language_name__" => "Русский ",
+"SSL root certificates" => "Корневые сертификаты SSL",
+"Encryption" => "Шифрование",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
 "Info, warnings, errors and fatal issues" => "Информационные, предупреждения, ошибки и критические проблемы",
 "Warnings, errors and fatal issues" => "Предупреждения, ошибки и критические проблемы",
@@ -138,7 +140,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Почтовый сервер",
 "This is used for sending out notifications." => "Используется для отправки уведомлений.",
 "Send mode" => "Отправить сообщение",
-"Encryption" => "Шифрование",
 "From address" => "Адрес отправителя",
 "mail" => "почта",
 "Authentication method" => "Метод проверки подлинности",
@@ -192,7 +193,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Установить как аватар",
 "Language" => "Язык",
 "Help translate" => "Помочь с переводом",
-"SSL root certificates" => "Корневые сертификаты SSL",
 "Common Name" => "Общее Имя",
 "Valid until" => "Действительно до",
 "Issued By" => "Выдан",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 744c60a610b..207b11f3fa8 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -18,12 +18,13 @@ $TRANSLATIONS = array(
 "undo" => "නිෂ්ප්‍රභ කරන්න",
 "Group Admin" => "කාණ්ඩ පරිපාලක",
 "never" => "කවදාවත්",
+"SSL root certificates" => "SSL මූල සහතිකයන්",
+"Encryption" => "ගුප්ත කේතනය",
 "None" => "කිසිවක් නැත",
 "Login" => "ප්‍රවිශ්ටය",
 "Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Sharing" => "හුවමාරු කිරීම",
 "Allow resharing" => "යළි යළිත් හුවමාරුවට අවසර දෙමි",
-"Encryption" => "ගුප්ත කේතනය",
 "Server address" => "සේවාදායකයේ ලිපිනය",
 "Port" => "තොට",
 "Log" => "ලඝුව",
@@ -42,7 +43,6 @@ $TRANSLATIONS = array(
 "Cancel" => "එපා",
 "Language" => "භාෂාව",
 "Help translate" => "පරිවර්ථන සහය",
-"SSL root certificates" => "SSL මූල සහතිකයන්",
 "Import Root Certificate" => "මූල සහතිකය ආයාත කරන්න",
 "Login Name" => "ප්‍රවිශ්ටය",
 "Create" => "තනන්න",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 900a707a62c..8a479e18d11 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Musíte zadať platné heslo",
 "Warning: Home directory for user \"{user}\" already exists" => "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
 "__language_name__" => "Slovensky",
+"SSL root certificates" => "Koreňové SSL certifikáty",
+"Encryption" => "Šifrovanie",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
 "Info, warnings, errors and fatal issues" => "Info, upozornenia, chyby a fatálne problémy",
 "Warnings, errors and fatal issues" => "Upozornenia, chyby a fatálne problémy",
@@ -136,7 +138,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Email server",
 "This is used for sending out notifications." => "Používa sa na odosielanie upozornení.",
 "Send mode" => "Mód odosielania",
-"Encryption" => "Šifrovanie",
 "From address" => "Z adresy",
 "mail" => "email",
 "Authentication method" => "Autentifikačná metóda",
@@ -190,7 +191,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Vybrať ako avatara",
 "Language" => "Jazyk",
 "Help translate" => "Pomôcť s prekladom",
-"SSL root certificates" => "Koreňové SSL certifikáty",
 "Common Name" => "Bežný názov",
 "Valid until" => "Platný do",
 "Issued By" => "Vydal",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index a9298d61f9e..1c723728112 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -69,6 +69,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Navedeno mora biti veljavno geslo",
 "Warning: Home directory for user \"{user}\" already exists" => "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
 "__language_name__" => "Slovenščina",
+"SSL root certificates" => "Korenska potrdila SSL",
+"Encryption" => "Šifriranje",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
 "Info, warnings, errors and fatal issues" => "Podrobnosti, opozorila, napake in usodne dogodke",
 "Warnings, errors and fatal issues" => "Opozorila, napake in usodne dogodke",
@@ -117,7 +119,6 @@ $TRANSLATIONS = array(
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
 "Email Server" => "Poštni strežnik",
 "Send mode" => "Način pošiljanja",
-"Encryption" => "Šifriranje",
 "Authentication method" => "Način overitve",
 "Authentication required" => "Zahtevana je overitev",
 "Server address" => "Naslov strežnika",
@@ -167,7 +168,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Izberi kot sliko profila",
 "Language" => "Jezik",
 "Help translate" => "Sodelujte pri prevajanju",
-"SSL root certificates" => "Korenska potrdila SSL",
 "Common Name" => "Splošno ime",
 "Valid until" => "Veljavno do",
 "Import Root Certificate" => "Uvozi korensko potrdilo",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index 5d1961b2271..f4b914a2343 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -38,6 +38,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "Gabim gjatë krijimit të përdoruesit",
 "A valid password must be provided" => "Duhet të jepni një fjalëkalim te vlefshëm",
 "__language_name__" => "Shqip",
+"Encryption" => "Kodifikimi",
 "None" => "Asgjë",
 "Login" => "Hyr",
 "Security Warning" => "Njoftim për sigurinë",
@@ -57,7 +58,6 @@ $TRANSLATIONS = array(
 "Security" => "Siguria",
 "Enforce HTTPS" => "Detyro HTTPS",
 "Send mode" => "Mënyra e dërgimit",
-"Encryption" => "Kodifikimi",
 "From address" => "Nga adresa",
 "mail" => "postë",
 "Server address" => "Adresa e serverit",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 8086949a7ec..e136628990d 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "Грешка при прављењу корисника",
 "A valid password must be provided" => "Морате унети исправну лозинку",
 "__language_name__" => "__language_name__",
+"Encryption" => "Шифровање",
 "None" => "Ништа",
 "Login" => "Пријави ме",
 "Security Warning" => "Сигурносно упозорење",
@@ -44,7 +45,6 @@ $TRANSLATIONS = array(
 "Allow resharing" => "Дозволи поновно дељење",
 "Security" => "Безбедност",
 "Enforce HTTPS" => "Наметни HTTPS",
-"Encryption" => "Шифровање",
 "Server address" => "Адреса сервера",
 "Port" => "Порт",
 "Log" => "Бележење",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index a87611b59f4..e1b82c55b92 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -78,6 +78,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Ett giltigt lösenord måste anges",
 "Warning: Home directory for user \"{user}\" already exists" => "Varning: Hem katalogen för varje användare \"{användare}\" finns redan",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL rotcertifikat",
+"Encryption" => "Kryptering",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Allting (allvarliga fel, fel, varningar, info, debug)",
 "Info, warnings, errors and fatal issues" => "Info, varningar och allvarliga fel",
 "Warnings, errors and fatal issues" => "Varningar, fel och allvarliga fel",
@@ -131,7 +133,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-postserver",
 "This is used for sending out notifications." => "Detta används för att skicka ut notifieringar.",
 "Send mode" => "Sändningsläge",
-"Encryption" => "Kryptering",
 "From address" => "Från adress",
 "mail" => "mail",
 "Authentication method" => "Autentiseringsmetod",
@@ -186,7 +187,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Välj som profilbild",
 "Language" => "Språk",
 "Help translate" => "Hjälp att översätta",
-"SSL root certificates" => "SSL rotcertifikat",
 "Import Root Certificate" => "Importera rotcertifikat",
 "The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
 "Log-in password" => "Inloggningslösenord",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 1c628363232..27c70d55756 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -20,10 +20,11 @@ $TRANSLATIONS = array(
 "Group Admin" => "குழு நிர்வாகி",
 "never" => "ஒருபோதும்",
 "__language_name__" => "_மொழி_பெயர்_",
+"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
+"Encryption" => "மறைக்குறியீடு",
 "None" => "ஒன்றுமில்லை",
 "Login" => "புகுபதிகை",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
-"Encryption" => "மறைக்குறியீடு",
 "Server address" => "சேவையக முகவரி",
 "Port" => "துறை ",
 "Credentials" => "சான்று ஆவணங்கள்",
@@ -43,7 +44,6 @@ $TRANSLATIONS = array(
 "Cancel" => "இரத்து செய்க",
 "Language" => "மொழி",
 "Help translate" => "மொழிபெயர்க்க உதவி",
-"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
 "Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க",
 "Login Name" => "புகுபதிகை",
 "Create" => "உருவாக்குக",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 407307cd763..c4ec7b915c5 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -27,6 +27,8 @@ $TRANSLATIONS = array(
 "Group Admin" => "ผู้ดูแลกลุ่ม",
 "never" => "ไม่ต้องเลย",
 "__language_name__" => "ภาษาไทย",
+"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+"Encryption" => "การเข้ารหัส",
 "None" => "ไม่มี",
 "Login" => "เข้าสู่ระบบ",
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
@@ -35,7 +37,6 @@ $TRANSLATIONS = array(
 "Sharing" => "การแชร์ข้อมูล",
 "Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
 "Allow resharing" => "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
-"Encryption" => "การเข้ารหัส",
 "Server address" => "ที่อยู่เซิร์ฟเวอร์",
 "Port" => "พอร์ต",
 "Credentials" => "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
@@ -66,7 +67,6 @@ $TRANSLATIONS = array(
 "Cancel" => "ยกเลิก",
 "Language" => "ภาษา",
 "Help translate" => "ช่วยกันแปล",
-"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
 "Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
 "Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
 "Create" => "สร้าง",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 66b84e079e0..ce8d003aa05 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı",
 "Warning: Home directory for user \"{user}\" already exists" => "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
 "__language_name__" => "Türkçe",
+"SSL root certificates" => "SSL kök sertifikaları",
+"Encryption" => "Şifreleme",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
 "Info, warnings, errors and fatal issues" => "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
 "Warnings, errors and fatal issues" => "Uyarılar, hatalar ve ciddi sorunlar",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "E-Posta Sunucusu",
 "This is used for sending out notifications." => "Bu, bildirimler gönderilirken kullanılır.",
 "Send mode" => "Gönderme kipi",
-"Encryption" => "Şifreleme",
 "From address" => "Kimden adresi",
 "mail" => "posta",
 "Authentication method" => "Kimlik doğrulama yöntemi",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Profil resmi olarak seç",
 "Language" => "Dil",
 "Help translate" => "Çevirilere yardım edin",
-"SSL root certificates" => "SSL kök sertifikaları",
 "Common Name" => "Ortak Ad",
 "Valid until" => "Geçerlilik",
 "Issued By" => "Veren",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index ddf67ce8ebe..b86ea3e1d27 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -30,6 +30,7 @@ $TRANSLATIONS = array(
 "Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
 "A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
 "__language_name__" => "ئۇيغۇرچە",
+"Encryption" => "شىفىرلاش",
 "None" => "يوق",
 "Login" => "تىزىمغا كىرىڭ",
 "Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
@@ -37,7 +38,6 @@ $TRANSLATIONS = array(
 "Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
 "Sharing" => "ھەمبەھىر",
 "Security" => "بىخەتەرلىك",
-"Encryption" => "شىفىرلاش",
 "Server address" => "مۇلازىمېتىر ئادرىسى",
 "Port" => "ئېغىز",
 "Log" => "خاتىرە",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 427fd91f3e7..f287731305f 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -79,6 +79,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Потрібно задати вірний пароль",
 "Warning: Home directory for user \"{user}\" already exists" => "Попередження: домашня тека користувача \"{user}\" вже існує",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL корневі сертифікати",
+"Encryption" => "Шифрування",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
 "Info, warnings, errors and fatal issues" => "Інформаційні, попередження, помилки та критичні проблеми",
 "Warnings, errors and fatal issues" => "Попередження, помилки та критичні проблеми",
@@ -141,7 +143,6 @@ $TRANSLATIONS = array(
 "Email Server" => "Сервер електронної пошти",
 "This is used for sending out notifications." => "Використовується для відсилання повідомлень.",
 "Send mode" => "Надіслати повідомлення",
-"Encryption" => "Шифрування",
 "From address" => "Адреса відправника",
 "mail" => "пошта",
 "Authentication method" => "Метод перевірки автентифікації",
@@ -199,7 +200,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Обрати зображенням облікового запису",
 "Language" => "Мова",
 "Help translate" => "Допомогти з перекладом",
-"SSL root certificates" => "SSL корневі сертифікати",
 "Common Name" => "Ім'я:",
 "Valid until" => "Дійсно до",
 "Issued By" => "Виданий",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 6b0fc92c26d..88ebd775579 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -30,6 +30,8 @@ $TRANSLATIONS = array(
 "Group Admin" => "Nhóm quản trị",
 "never" => "không thay đổi",
 "__language_name__" => "__Ngôn ngữ___",
+"SSL root certificates" => "Chứng chỉ SSL root",
+"Encryption" => "Mã hóa",
 "None" => "Không gì cả",
 "Login" => "Đăng nhập",
 "Security Warning" => "Cảnh bảo bảo mật",
@@ -39,7 +41,6 @@ $TRANSLATIONS = array(
 "Sharing" => "Chia sẻ",
 "Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
 "Allow resharing" => "Cho phép chia sẻ lại",
-"Encryption" => "Mã hóa",
 "Server address" => "Địa chỉ máy chủ",
 "Port" => "Cổng",
 "Credentials" => "Giấy chứng nhận",
@@ -73,7 +74,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Chọn hình ảnh như hồ sơ cá nhân",
 "Language" => "Ngôn ngữ",
 "Help translate" => "Hỗ trợ dịch thuật",
-"SSL root certificates" => "Chứng chỉ SSL root",
 "Import Root Certificate" => "Nhập Root Certificate",
 "Login Name" => "Tên đăng nhập",
 "Create" => "Tạo",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 8e05cd4f7d8..3e465ed4d79 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -76,6 +76,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "必须提供合法的密码",
 "Warning: Home directory for user \"{user}\" already exists" => "警告：用户 \"{user}\" 的家目录已存在",
 "__language_name__" => "简体中文",
+"SSL root certificates" => "SSL根证书",
+"Encryption" => "加密",
 "Everything (fatal issues, errors, warnings, info, debug)" => "所有（灾难性问题，错误，警告，信息，调试）",
 "Info, warnings, errors and fatal issues" => "信息，警告，错误和灾难性问题",
 "Warnings, errors and fatal issues" => "警告，错误和灾难性问题",
@@ -138,7 +140,6 @@ $TRANSLATIONS = array(
 "Email Server" => "电子邮件服务器",
 "This is used for sending out notifications." => "这被用于发送通知。",
 "Send mode" => "发送模式",
-"Encryption" => "加密",
 "From address" => "来自地址",
 "mail" => "邮件",
 "Authentication method" => "认证方法",
@@ -192,7 +193,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "用作头像",
 "Language" => "语言",
 "Help translate" => "帮助翻译",
-"SSL root certificates" => "SSL根证书",
 "Common Name" => "通用名称",
 "Valid until" => "有效期至",
 "Issued By" => "授权由",
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
index 6139dad2795..c969e884037 100644
--- a/settings/l10n/zh_HK.php
+++ b/settings/l10n/zh_HK.php
@@ -11,11 +11,11 @@ $TRANSLATIONS = array(
 "Updated" => "已更新",
 "Delete" => "刪除",
 "Groups" => "群組",
+"Encryption" => "加密",
 "None" => "空",
 "Login" => "登入",
 "SSL" => "SSL",
 "TLS" => "TLS",
-"Encryption" => "加密",
 "Port" => "連接埠",
 "More" => "更多",
 "Password" => "密碼",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 86a2661404b..8bab4c57ed3 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -58,6 +58,8 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "一定要提供一個有效的密碼",
 "Warning: Home directory for user \"{user}\" already exists" => "警告：使用者 {user} 的家目錄已經存在",
 "__language_name__" => "__language_name__",
+"SSL root certificates" => "SSL 根憑證",
+"Encryption" => "加密",
 "Everything (fatal issues, errors, warnings, info, debug)" => "全部(嚴重問題,錯誤,警告,資訊,除錯)",
 "Info, warnings, errors and fatal issues" => "資訊,警告,錯誤和嚴重問題",
 "Warnings, errors and fatal issues" => "警告,錯誤和嚴重問題",
@@ -100,7 +102,6 @@ $TRANSLATIONS = array(
 "Email Server" => "郵件伺服器",
 "This is used for sending out notifications." => "這是使用於寄送通知。",
 "Send mode" => "寄送模式",
-"Encryption" => "加密",
 "From address" => "寄件地址",
 "Authentication method" => "驗證方式",
 "Authentication required" => "必須驗證",
@@ -150,7 +151,6 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "設定為大頭貼",
 "Language" => "語言",
 "Help translate" => "幫助翻譯",
-"SSL root certificates" => "SSL 根憑證",
 "Import Root Certificate" => "匯入根憑證",
 "The encryption app is no longer enabled, please decrypt all your files" => "加密的軟體不能長時間啟用，請解密所有您的檔案",
 "Log-in password" => "登入密碼",
-- 
GitLab


From fa9a7442005e66d73923a88ad905f21eb714291f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 23 Oct 2014 14:04:38 +0200
Subject: [PATCH 202/616] Update 3rdparty submodule

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 0c0fb2a67df..94179d9d70b 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 0c0fb2a67dfa0392ebcea2fab558513f00006258
+Subproject commit 94179d9d70b6be43ff4251941034cd2735d10f4e
-- 
GitLab


From 5aab98c4bf1904f9886c4fe091546f9edab1fb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 23 Oct 2014 14:32:37 +0200
Subject: [PATCH 203/616] disable database migration unit tests for MSSQL

---
 tests/lib/db/mdb2schemamanager.php | 10 ++++++++--
 tests/lib/db/migrator.php          | 11 ++++++++---
 tests/lib/dbschema.php             | 14 +++++++++++---
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php
index dd9ee3adb8e..527b2cba648 100644
--- a/tests/lib/db/mdb2schemamanager.php
+++ b/tests/lib/db/mdb2schemamanager.php
@@ -9,6 +9,9 @@
 
 namespace Test\DB;
 
+use Doctrine\DBAL\Platforms\OraclePlatform;
+use Doctrine\DBAL\Platforms\SQLServerPlatform;
+
 class MDB2SchemaManager extends \PHPUnit_Framework_TestCase {
 
 	public function tearDown() {
@@ -22,11 +25,14 @@ class MDB2SchemaManager extends \PHPUnit_Framework_TestCase {
 
 	public function testAutoIncrement() {
 
-		if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') === 'oci') {
+		$connection = \OC_DB::getConnection();
+		if ($connection->getDatabasePlatform() instanceof OraclePlatform) {
 			$this->markTestSkipped('Adding auto increment columns in Oracle is not supported.');
 		}
+		if ($connection->getDatabasePlatform() instanceof SQLServerPlatform) {
+			$this->markTestSkipped('DB migration tests are not supported on MSSQL');
+		}
 
-		$connection = \OC_DB::getConnection();
 		$manager = new \OC\DB\MDB2SchemaManager($connection);
 
 		$manager->createDbFromStructure(__DIR__ . '/ts-autoincrement-before.xml');
diff --git a/tests/lib/db/migrator.php b/tests/lib/db/migrator.php
index 2e49086bd63..09742a53eb4 100644
--- a/tests/lib/db/migrator.php
+++ b/tests/lib/db/migrator.php
@@ -10,6 +10,8 @@
 namespace Test\DB;
 
 use \Doctrine\DBAL\DBALException;
+use Doctrine\DBAL\Platforms\OraclePlatform;
+use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use \Doctrine\DBAL\Schema\Schema;
 use \Doctrine\DBAL\Schema\SchemaConfig;
 
@@ -28,8 +30,11 @@ class Migrator extends \PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		$this->connection = \OC_DB::getConnection();
-		if ($this->connection->getDriver() instanceof \Doctrine\DBAL\Driver\OCI8\Driver) {
-			$this->markTestSkipped('DB migration tests arent supported on OCI');
+		if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
+			$this->markTestSkipped('DB migration tests are not supported on OCI');
+		}
+		if ($this->connection->getDatabasePlatform() instanceof SQLServerPlatform) {
+			$this->markTestSkipped('DB migration tests are not supported on MSSQL');
 		}
 		$this->manager = new \OC\DB\MDB2SchemaManager($this->connection);
 		$this->tableName = 'test_' . uniqid();
@@ -73,7 +78,7 @@ class Migrator extends \PHPUnit_Framework_TestCase {
 	 */
 	public function testDuplicateKeyUpgrade() {
 		if ($this->isSQLite()) {
-			$this->markTestSkipped('sqlite doesnt throw errors when creating a new key on existing data');
+			$this->markTestSkipped('sqlite does not throw errors when creating a new key on existing data');
 		}
 		list($startSchema, $endSchema) = $this->getDuplicateKeySchemas();
 		$migrator = $this->manager->getMigrator();
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index c07e32a404e..d31bd34124e 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Copyright (c) 2012 Bart Visscher <bartv@thisnet.nl>
  * This file is licensed under the Affero General Public License version 3 or
@@ -6,6 +7,8 @@
  * See the COPYING-README file.
  */
 
+use OCP\Security\ISecureRandom;
+
 class Test_DBSchema extends PHPUnit_Framework_TestCase {
 	protected $schema_file = 'static://test_db_scheme';
 	protected $schema_file2 = 'static://test_db_scheme2';
@@ -16,7 +19,8 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 		$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
 		$dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml';
 
-		$r = '_'.OC_Util::generateRandomBytes(4).'_';
+		$r = '_' . \OC::$server->getSecureRandom()->getMediumStrengthGenerator()->
+			generate(4, ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_DIGITS) . '_';
 		$content = file_get_contents( $dbfile );
 		$content = str_replace( '*dbprefix*', '*dbprefix*'.$r, $content );
 		file_put_contents( $this->schema_file, $content );
@@ -38,6 +42,10 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 	 * @medium
 	 */
 	public function testSchema() {
+		$platform = \OC_DB::getConnection()->getDatabasePlatform();
+		if ($platform instanceof \Doctrine\DBAL\Platforms\SQLServerPlatform) {
+			$this->markTestSkipped("Test not relevant on MSSQL");
+		}
 		$this->doTestSchemaCreating();
 		$this->doTestSchemaChanging();
 		$this->doTestSchemaDumping();
@@ -80,8 +88,8 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 	 * @param string $table
 	 */
 	public function assertTableNotExist($table) {
-		$type=OC_Config::getValue( "dbtype", "sqlite" );
-		if( $type == 'sqlite' || $type == 'sqlite3' ) {
+		$platform = \OC_DB::getConnection()->getDatabasePlatform();
+		if ($platform instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
 			// sqlite removes the tables after closing the DB
 			$this->assertTrue(true);
 		} else {
-- 
GitLab


From ca5abe57440e415b1a6b99d7461dacab21b67b71 Mon Sep 17 00:00:00 2001
From: Clark Tomlinson <fallen013@gmail.com>
Date: Wed, 22 Oct 2014 10:38:17 -0400
Subject: [PATCH 204/616] Setting moment locale based on user selection

---
 core/js/js.js                   |  6 ++++++
 core/templates/layout.base.php  | 12 ++++++------
 core/templates/layout.guest.php | 12 ++++++------
 core/templates/layout.user.php  | 12 ++++++------
 lib/private/templatelayout.php  |  5 ++++-
 5 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 566a3d4d8cd..94b78a2e9a9 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -966,6 +966,12 @@ function object(o) {
  */
 function initCore() {
 
+	/**
+	 * Set users local to moment.js as soon as possible
+	 */
+	moment.locale($('html').prop('lang'));
+
+
 	/**
 	 * Calls the server periodically to ensure that session doesn't
 	 * time out
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 963bf4cf545..3325bc9165e 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]-->
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 
 	<head>
 		<title>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index da40fd83ad8..0ad2ea4d807 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]-->
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 
 	<head data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9445175efcf..645a4c30656 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false"><![endif]-->
-<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false"><![endif]-->
-<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false"><![endif]-->
-<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false"><!--<![endif]-->
+<!--[if lt IE 7]><html class="ng-csp ie ie6 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>"><![endif]-->
+<!--[if IE 7]><html class="ng-csp ie ie7 lte9 lte8 lte7" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 8]><html class="ng-csp ie ie8 lte9 lte8" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if IE 9]><html class="ng-csp ie ie9 lte9" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if gt IE 9]><html class="ng-csp ie" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><![endif]-->
+<!--[if !IE]><!--><html class="ng-csp" data-placeholder-focus="false" lang="<?php p($_['language']); ?>" ><!--<![endif]-->
 
 	<head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>">
 		<title>
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index f5f079c8b2a..b294cef55e7 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -33,7 +33,6 @@ class OC_TemplateLayout extends OC_Template {
 		$this->config = \OC::$server->getConfig();
 
 		// Decide which page we show
-
 		if( $renderAs == 'user' ) {
 			parent::__construct( 'core', 'layout.user' );
 			if(in_array(OC_APP::getCurrentApp(), array('settings','admin', 'help'))!==false) {
@@ -84,7 +83,11 @@ class OC_TemplateLayout extends OC_Template {
 			$this->assign('bodyid', 'body-login');
 		} else {
 			parent::__construct('core', 'layout.base');
+
 		}
+		// Send the language to our layouts
+		$this->assign('language', OC_L10N::findLanguage());
+
 
 		if(empty(self::$versionHash)) {
 			self::$versionHash = md5(implode(',', OC_App::getAppVersions()));
-- 
GitLab


From c30b7f8197df6cb5a5a99737d4303d41e797f322 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 23 Oct 2014 23:03:14 +0200
Subject: [PATCH 205/616] Remove unreachable statement

---
 lib/private/share/share.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 48b1a531621..b7b05dab8ef 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -672,7 +672,6 @@ class Share extends \OC\Share\Constants {
 			$message_t = $l->t('Sharing %s failed, because sharing with links is not allowed', array($itemSourceName));
 			\OC_Log::write('OCP\Share', sprintf($message, $itemSourceName), \OC_Log::ERROR);
 			throw new \Exception($message_t);
-			return false;
 		} else {
 			// Future share types need to include their own conditions
 			$message = 'Share type %s is not valid for %s';
-- 
GitLab


From 729dffed5ec924492962a41b4697ca05ad40da79 Mon Sep 17 00:00:00 2001
From: kondou <kondou@ts.unde.re>
Date: Sat, 15 Mar 2014 15:27:48 +0100
Subject: [PATCH 206/616] Load avatar in header via PHP

* fix #7484
* use UID, css, and div instead of span
---
 core/css/header.css            |  2 ++
 core/js/avatar.js              | 10 ----------
 core/templates/layout.user.php | 10 +++++++---
 lib/private/helper.php         | 15 +++++++++++++++
 lib/private/templatelayout.php |  3 ++-
 5 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/core/css/header.css b/core/css/header.css
index f83ef451ce6..33eb7e25cc6 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -239,6 +239,8 @@
 	display: inline-block;
 	margin-right: 5px;
 	cursor: pointer;
+	height: 32px;
+	width: 32px;
 }
 #header .avatardiv img {
 	opacity: 1;
diff --git a/core/js/avatar.js b/core/js/avatar.js
index 6835f6ef0ac..8ff136d67ca 100644
--- a/core/js/avatar.js
+++ b/core/js/avatar.js
@@ -1,15 +1,5 @@
 $(document).ready(function(){
 	if (OC.currentUser) {
-		var callback = function() {
-			// do not show display name on mobile when profile picture is present
-			if($('#header .avatardiv').children().length > 0) {
-				$('#header .avatardiv').addClass('avatardiv-shown');
-			}
-		};
-
-		$('#header .avatardiv').avatar(
-			OC.currentUser, 32, undefined, true, callback
-		);
 		// Personal settings
 		$('#avatar .avatardiv').avatar(OC.currentUser, 128);
 	}
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9445175efcf..09630435b77 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -65,13 +65,17 @@
 			</a>
 			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			<div id="settings" class="svg">
-				<span id="expand" tabindex="0" role="link">
+				<div id="expand" tabindex="0" role="link">
 					<?php if ($_['enableAvatars']): ?>
-					<div class="avatardiv"></div>
+					<div class="avatardiv"<?php if (!$_['userAvatarSet']) { print_unescaped(' style="display: none"'); } ?>>
+						<?php if ($_['userAvatarSet']): ?>
+							<img src="<?php p(link_to('', 'index.php').'/avatar/'.$_['user_uid'].'/32?requesttoken='.$_['requesttoken']); ?>">
+						<?php endif; ?>
+					</div>
 					<?php endif; ?>
 					<span id="expandDisplayName"><?php  p(trim($_['user_displayname']) != '' ? $_['user_displayname'] : $_['user_uid']) ?></span>
 					<img class="svg" alt="" src="<?php print_unescaped(image_path('', 'actions/caret.svg')); ?>" />
-				</span>
+				</div>
 				<div id="expanddiv">
 				<ul>
 				<?php foreach($_['settingsnavigation'] as $entry):?>
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 823e82ceeb1..628af14fa08 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -279,6 +279,21 @@ class OC_Helper {
 		return self::linkToRoute( 'core_ajax_public_preview', array('x' => 36, 'y' => 36, 'file' => $path, 't' => $token));
 	}
 
+	/**
+	 * shows whether the user has an avatar
+	 * @param string $user username
+	 * @return bool avatar set or not
+	**/
+	public static function userAvatarSet($user) {
+		$avatar = new \OC_Avatar($user);
+		$image = $avatar->get(1);
+		if ($image instanceof \OC_Image) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
 	/**
 	 * Make a human file size
 	 * @param int $bytes file size in bytes
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index f5f079c8b2a..cbaadd5768f 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -76,6 +76,7 @@ class OC_TemplateLayout extends OC_Template {
 			$this->assign( 'user_uid', OC_User::getUser() );
 			$this->assign( 'appsmanagement_active', strpos(OC_Request::requestUri(), OC_Helper::linkToRoute('settings_apps')) === 0 );
 			$this->assign('enableAvatars', $this->config->getSystemValue('enable_avatars', true));
+			$this->assign('userAvatarSet', \OC_Helper::userAvatarSet(OC_User::getUser()));
 		} else if ($renderAs == 'error') {
 			parent::__construct('core', 'layout.guest', '', false);
 			$this->assign('bodyid', 'body-login');
@@ -89,7 +90,7 @@ class OC_TemplateLayout extends OC_Template {
 		if(empty(self::$versionHash)) {
 			self::$versionHash = md5(implode(',', OC_App::getAppVersions()));
 		}
-		
+
 		$useAssetPipeline = self::isAssetPipelineEnabled();
 		if ($useAssetPipeline) {
 			$this->append( 'jsfiles', OC_Helper::linkToRoute('js_config', array('v' => self::$versionHash)));
-- 
GitLab


From a10b25587f938b80c6e8c2efd1493c0036f3cb2e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 23 Oct 2014 23:51:05 +0200
Subject: [PATCH 207/616] add avatardiv-shown class to bring back mobile style

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

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 09630435b77..d0c6f9c38f5 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -67,7 +67,7 @@
 			<div id="settings" class="svg">
 				<div id="expand" tabindex="0" role="link">
 					<?php if ($_['enableAvatars']): ?>
-					<div class="avatardiv"<?php if (!$_['userAvatarSet']) { print_unescaped(' style="display: none"'); } ?>>
+					<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown"'); } else { print_unescaped('" style="display: none"'); } ?>>
 						<?php if ($_['userAvatarSet']): ?>
 							<img src="<?php p(link_to('', 'index.php').'/avatar/'.$_['user_uid'].'/32?requesttoken='.$_['requesttoken']); ?>">
 						<?php endif; ?>
-- 
GitLab


From 3efac5a4f2e8bd5cd0884598244929c2028c1894 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 24 Oct 2014 00:10:22 +0200
Subject: [PATCH 208/616] Prevent division by zero

Potentially fixes https://github.com/owncloud/core/issues/11742
---
 apps/files/ajax/newfile.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 392fc5bd1c8..b4d91514a2a 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -33,7 +33,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 
 		case STREAM_NOTIFY_PROGRESS:
 			if ($bytes_transferred > 0) {
-				if (!isset($filesize)) {
+				if (!isset($filesize) || $filesize === 0) {
 				} else {
 					$progress = (int)(($bytes_transferred/$filesize)*100);
 					if($progress>$lastsize) { //limit the number or messages send
-- 
GitLab


From 9babcfb9e22cb09f0d0af759b6491c45ff2f2278 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 24 Oct 2014 01:55:11 -0400
Subject: [PATCH 209/616] [tx-robot] updated from transifex

---
 apps/files/l10n/id.php              | 37 +++++++++++++++++++++--------
 apps/files_encryption/l10n/el.php   |  6 +++++
 apps/files_external/l10n/el.php     |  5 +++-
 apps/user_ldap/l10n/el.php          |  4 ++++
 apps/user_ldap/l10n/ko.php          |  3 +++
 core/l10n/el.php                    |  3 +++
 core/l10n/id.php                    | 12 +++++++---
 l10n/templates/core.pot             | 16 ++++++-------
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              | 28 +++++++++++-----------
 l10n/templates/private.pot          | 28 +++++++++++-----------
 l10n/templates/settings.pot         | 11 +++++----
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/el.php                     |  2 ++
 settings/l10n/ar.php                |  1 -
 settings/l10n/ast.php               |  1 -
 settings/l10n/az.php                |  1 -
 settings/l10n/bg_BG.php             |  1 -
 settings/l10n/bn_BD.php             |  1 -
 settings/l10n/ca.php                |  1 -
 settings/l10n/cs_CZ.php             |  2 +-
 settings/l10n/da.php                |  2 +-
 settings/l10n/de.php                |  2 +-
 settings/l10n/de_CH.php             |  1 -
 settings/l10n/de_DE.php             |  2 +-
 settings/l10n/el.php                |  9 ++++++-
 settings/l10n/en_GB.php             |  2 +-
 settings/l10n/eo.php                |  1 -
 settings/l10n/es.php                |  4 ++--
 settings/l10n/es_AR.php             |  1 -
 settings/l10n/es_MX.php             |  1 -
 settings/l10n/et_EE.php             |  1 -
 settings/l10n/eu.php                |  1 -
 settings/l10n/fa.php                |  1 -
 settings/l10n/fi_FI.php             |  3 ++-
 settings/l10n/fr.php                |  1 -
 settings/l10n/gl.php                |  1 -
 settings/l10n/he.php                |  1 -
 settings/l10n/hr.php                |  1 -
 settings/l10n/hu_HU.php             |  1 -
 settings/l10n/id.php                |  2 +-
 settings/l10n/is.php                |  1 -
 settings/l10n/it.php                |  2 +-
 settings/l10n/ja.php                |  1 -
 settings/l10n/ka_GE.php             |  1 -
 settings/l10n/km.php                |  1 -
 settings/l10n/ko.php                |  1 -
 settings/l10n/lb.php                |  1 -
 settings/l10n/lt_LT.php             |  1 -
 settings/l10n/lv.php                |  1 -
 settings/l10n/mk.php                |  1 -
 settings/l10n/nb_NO.php             |  1 -
 settings/l10n/nl.php                |  2 +-
 settings/l10n/nn_NO.php             |  1 -
 settings/l10n/oc.php                |  1 -
 settings/l10n/pa.php                |  1 -
 settings/l10n/pl.php                |  1 -
 settings/l10n/pt_BR.php             |  1 -
 settings/l10n/pt_PT.php             |  2 +-
 settings/l10n/ro.php                |  1 -
 settings/l10n/ru.php                |  1 -
 settings/l10n/si_LK.php             |  1 -
 settings/l10n/sk_SK.php             |  1 -
 settings/l10n/sl.php                |  1 -
 settings/l10n/sq.php                |  1 -
 settings/l10n/sr.php                |  1 -
 settings/l10n/sv.php                |  1 -
 settings/l10n/ta_LK.php             |  1 -
 settings/l10n/th_TH.php             |  1 -
 settings/l10n/tr.php                |  1 -
 settings/l10n/ug.php                |  1 -
 settings/l10n/uk.php                |  1 -
 settings/l10n/vi.php                |  1 -
 settings/l10n/zh_CN.php             |  1 -
 settings/l10n/zh_TW.php             |  1 -
 81 files changed, 130 insertions(+), 124 deletions(-)

diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index b8b362d5b48..259025b7e88 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -1,20 +1,27 @@
 <?php
 $TRANSLATIONS = array(
-"Unknown error" => "Galat tidak diketahui",
+"Storage not available" => "Penyimpanan tidak tersedia",
+"Storage invalid" => "Penyimpanan tidak sah",
+"Unknown error" => "Kesalahan tidak diketahui",
 "Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
 "Could not move %s" => "Tidak dapat memindahkan %s",
+"Permission denied" => "Perizinan ditolak",
 "File name cannot be empty." => "Nama berkas tidak boleh kosong.",
+"\"%s\" is an invalid file name." => "\"%s\" adalah sebuah nama berkas yang tidak sah.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
+"The target folder has been moved or deleted." => "Folder tujuan telah dipindahkan atau dihapus.",
 "The name %s is already used in the folder %s. Please choose a different name." => "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
 "Not a valid source" => "Sumber tidak sah",
-"Error while downloading %s to %s" => "Galat saat mengunduh %s ke %s",
-"Error when creating the file" => "Galat saat membuat berkas",
+"Server is not allowed to open URLs, please check the server configuration" => "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server",
+"The file exceeds your quota by %s" => "Berkas melampaui kuota Anda oleh %s",
+"Error while downloading %s to %s" => "Kesalahan saat mengunduh %s ke %s",
+"Error when creating the file" => "Kesalahan saat membuat berkas",
 "Folder name cannot be empty." => "Nama folder tidak bolh kosong.",
-"Error when creating the folder" => "Galat saat membuat folder",
+"Error when creating the folder" => "Kesalahan saat membuat folder",
 "Unable to set upload directory." => "Tidak dapat mengatur folder unggah",
 "Invalid Token" => "Token tidak sah",
-"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Galat tidak dikenal.",
-"There is no error, the file uploaded with success" => "Tidak ada galat, berkas sukses diunggah",
+"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Kesalahan tidak dikenal.",
+"There is no error, the file uploaded with success" => "Tidak ada kesalahan, berkas sukses diunggah",
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML.",
 "The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian",
@@ -26,7 +33,10 @@ $TRANSLATIONS = array(
 "Upload failed. Could not get file info." => "Unggah gagal. Tidak mendapatkan informasi berkas.",
 "Invalid directory." => "Direktori tidak valid.",
 "Files" => "Berkas",
+"All files" => "Semua berkas",
 "Unable to upload {filename} as it is a directory or has 0 bytes" => "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte",
+"Total file size {size1} exceeds upload limit {size2}" => "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}",
+"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa",
 "Upload cancelled." => "Pengunggahan dibatalkan.",
 "Could not get result from server." => "Tidak mendapatkan hasil dari server.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
@@ -34,16 +44,19 @@ $TRANSLATIONS = array(
 "{new_name} already exists" => "{new_name} sudah ada",
 "Could not create file" => "Tidak dapat membuat berkas",
 "Could not create folder" => "Tidak dapat membuat folder",
+"Error fetching URL" => "Kesalahan saat mengambil URL",
 "Share" => "Bagikan",
 "Delete" => "Hapus",
+"Disconnect storage" => "Memutuskan penyimpaan",
 "Unshare" => "Batalkan berbagi",
 "Delete permanently" => "Hapus secara permanen",
 "Rename" => "Ubah nama",
 "Pending" => "Menunggu",
-"Error moving file" => "Galat saat memindahkan berkas",
-"Error" => "Galat",
+"Error moving file." => "Kesalahan saat memindahkan berkas.",
+"Error moving file" => "Kesalahan saat memindahkan berkas",
+"Error" => "Kesalahan ",
 "Could not rename file" => "Tidak dapat mengubah nama berkas",
-"Error deleting file." => "Galat saat menghapus berkas.",
+"Error deleting file." => "Kesalahan saat menghapus berkas.",
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
@@ -51,13 +64,16 @@ $TRANSLATIONS = array(
 "_%n file_::_%n files_" => array("%n berkas"),
 "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_" => array("Mengunggah %n berkas"),
+"\"{name}\" is an invalid file name." => "\"{name}\" adalah nama berkas yang tidak sah.",
 "Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
 "Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
 "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",
 "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
 "{dirs} and {files}" => "{dirs} dan {files}",
+"%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)",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran pengunggahan maksimum",
 "max. possible: " => "Kemungkinan maks.:",
@@ -74,6 +90,7 @@ $TRANSLATIONS = array(
 "Download" => "Unduh",
 "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."
+"Files are being scanned, please wait." => "Berkas sedang dipindai, silakan tunggu.",
+"Currently scanning" => "Pemindaian terbaru"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
index e1fabbb169c..5d293e7a06f 100644
--- a/apps/files_encryption/l10n/el.php
+++ b/apps/files_encryption/l10n/el.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Άγνωστο σφάλμα",
+"Missing recovery key password" => "Λείπει το κλειδί επαναφοράς κωδικού",
+"Please repeat the recovery key password" => "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
+"Repeated recovery key password does not match the provided recovery key password" => "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
 "Recovery key successfully enabled" => "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
 "Could not disable recovery key. Please check your recovery key password!" => "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
 "Recovery key successfully disabled" => "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
+"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." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
 "Private key password successfully updated." => "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index a4ad04b34f8..626b2d07a49 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -15,6 +15,7 @@ $TRANSLATIONS = array(
 "Amazon S3 and compliant" => "Amazon S3 και συμμορφούμενα",
 "Access Key" => "Κλειδί πρόσβασης",
 "Secret Key" => "Μυστικό κλειδί",
+"Hostname" => "Όνομα Υπολογιστή",
 "Port" => "Θύρα",
 "Region" => "Περιοχή",
 "Enable SSL" => "Ενεργοποίηση SSL",
@@ -35,18 +36,20 @@ $TRANSLATIONS = array(
 "Password (required for OpenStack Object Storage)" => "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
 "Service Name (required for OpenStack Object Storage)" => "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
 "URL of identity endpoint (required for OpenStack Object Storage)" => "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+"Timeout of HTTP requests in seconds" => "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
 "Share" => "Διαμοιράστε",
 "SMB / CIFS using OC login" => "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
 "Username as share" => "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
 "URL" => "URL",
 "Secure https://" => "Ασφαλής σύνδεση https://",
 "Remote subfolder" => "Απομακρυσμένος υποφάκελος",
-"Access granted" => "Προσβαση παρασχέθηκε",
+"Access granted" => "Πρόσβαση παρασχέθηκε",
 "Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
 "Grant access" => "Παροχή πρόσβασης",
 "Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
 "Personal" => "Προσωπικά",
 "System" => "Σύστημα",
+"All users. Type to select user or group." => "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
 "(group)" => "(ομάδα)",
 "Saved" => "Αποθηκεύτηκαν",
 "<b>Note:</b> " => "<b>Σημείωση:</b> ",
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index c2f854ceb31..0022c367dd5 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
 "Raw LDAP filter" => "Πρωτογενές φίλτρο ",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
+"Test Filter" => "Φίλτρο Ελέγχου",
 "groups found" => "ομάδες βρέθηκαν",
 "Users login with this attribute:" => "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:",
 "LDAP Username:" => "Όνομα χρήστη LDAP:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
 "One Base DN per line" => "Ένα DN Βάσης ανά γραμμή ",
 "You can specify Base DN for users and groups in the Advanced tab" => "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Αποφυγή αυτόματων αιτημάτων LDAP. Προτιμότερο για μεγαλύτερες εγκαταστάσεις, αλλά απαιτεί κάποιες γνώσεις  LDAP.",
+"Manually enter LDAP filters (recommended for large directories)" => "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
 "Limit %s access to users meeting these criteria:" => "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
 "users found" => "χρήστες βρέθηκαν",
+"Saving" => "Αποθήκευση",
 "Back" => "Επιστροφή",
 "Continue" => "Συνέχεια",
 "Expert" => "Ειδικός",
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
index 575d3c8a1ca..21013328dc1 100644
--- a/apps/user_ldap/l10n/ko.php
+++ b/apps/user_ldap/l10n/ko.php
@@ -30,6 +30,9 @@ $TRANSLATIONS = array(
 "_%s user found_::_%s users found_" => array("사용자 %s명 찾음"),
 "Could not find the desired feature" => "필요한 기능을 찾을 수 없음",
 "Invalid Host" => "잘못된 호스트",
+"Server" => "서버",
+"User Filter" => "사용자 필터",
+"Login Filter" => "로그인 필터",
 "Group Filter" => "그룹 필터",
 "Save" => "저장",
 "Test Configuration" => "설정 시험",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 462dd3bb829..c48ac9a4909 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -150,15 +150,18 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Γειά χαρά,\n\nαπλά σας ενημερώνω πως ο %s μοιράστηκε το %s με εσάς.\nΔείτε το: %s\n\n",
 "The share will expire on %s." => "Ο διαμοιρασμός θα λήξει σε %s.",
 "Cheers!" => "Χαιρετισμούς!",
+"Internal Server Error" => "Εσωτερικό Σφάλμα Διακομιστή",
 "The server encountered an internal error and was unable to complete your request." => "Ο διακομιστής αντιμετώπισε ένα εσωτερικό σφάλμα και δεν μπόρεσε να ολοκληρώσει το αίτημά σας.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Παρακαλώ επικοινωνήστε με το διαχειριστή του διακομιστή, εάν αυτό το σφάλμα επανεμφανίζεται πολλές φορές, παρακαλούμε να συμπεριλάβετε τις τεχνικές λεπτομέρειες παρακάτω στην αναφορά σας.",
 "More details can be found in the server log." => "Περισσότερες λεπτομέρειες μπορείτε να βρείτε στο αρχείο καταγραφής του διακομιστή.",
 "Technical details" => "Τεχνικές λεπτομέρειες",
 "Remote Address: %s" => "Απομακρυσμένη Διεύθυνση: %s",
+"Request ID: %s" => "Αίτημα ID: %s",
 "Code: %s" => "Κωδικός: %s",
 "Message: %s" => "Μήνυμα: %s",
 "File: %s" => "Αρχείο: %s",
 "Line: %s" => "Γραμμή: %s",
+"Trace" => "Ανίχνευση",
 "Security Warning" => "Προειδοποίηση Ασφαλείας",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Η PHP ειναι ευαλωτη στην NULL Byte επιθεση (CVE-2006-7243)",
 "Please update your PHP installation to use %s securely." => "Παρακαλώ ενημερώστε την εγκατάσταση της PHP ώστε να χρησιμοποιήσετε το %s με ασφάλεια.",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 2dfeab8c2a7..558bc161e06 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -49,7 +49,7 @@ $TRANSLATIONS = array(
 "Choose" => "Pilih",
 "Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
 "Ok" => "Oke",
-"Error loading message template: {error}" => "Galat memuat templat pesan: {error}",
+"Error loading message template: {error}" => "Kesalahan memuat templat pesan: {error}",
 "_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
 "One file conflict" => "Satu berkas konflik",
 "New Files" => "Berkas Baru",
@@ -60,13 +60,14 @@ $TRANSLATIONS = array(
 "Continue" => "Lanjutkan",
 "(all selected)" => "(semua terpilih)",
 "({count} selected)" => "({count} terpilih)",
-"Error loading file exists template" => "Galat memuat templat berkas yang sudah ada",
+"Error loading file exists template" => "Kesalahan memuat templat berkas yang sudah ada",
 "Very weak password" => "Sandi sangat lemah",
 "Weak password" => "Sandi lemah",
 "So-so password" => "Sandi lumayan",
 "Good password" => "Sandi baik",
 "Strong password" => "Sandi kuat",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
+"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." => "Server ini tidak memiliki koneksi internet. Hal ini berarti bahwa beberapa fitur seperti mengaitkan penyimpanan eksternal, pemberitahuan tentang pembaruan atau instalasi aplikasi pihak ke-3 tidak akan bisa. Mengakses berkas dari remote dan mengirim email notifikasi juga tidak akan bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda menginginkan semua fitur.",
 "Error occurred while checking server setup" => "Kesalahan tidak terduga saat memeriksa setelan server",
 "Shared" => "Dibagikan",
 "Shared with {recipients}" => "Dibagikan dengan {recipients}",
@@ -195,11 +196,16 @@ $TRANSLATIONS = array(
 "Contact your system administrator if this message persists or appeared unexpectedly." => "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
 "Thank you for your patience." => "Terima kasih atas kesabaran anda.",
 "You are accessing the server from an untrusted domain." => "Anda mengakses server dari domain yang tidak terpercaya.",
+"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
+"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
 "Add \"%s\" as trusted domain" => "tambahkan \"%s\" sebagai domain terpercaya",
 "%s will be updated to version %s." => "%s akan diperbarui ke versi %s.",
 "The following apps will be disabled:" => "Aplikasi berikut akan dinonaktifkan:",
 "The theme %s has been disabled." => "Tema %s telah dinonaktfkan.",
 "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
-"Start update" => "Jalankan pembaruan"
+"Start update" => "Jalankan pembaruan",
+"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
+"This %s instance is currently being updated, which may take a while." => "Instansi %s ini sedang melakukan pembaruan, ini memerlukan beberapa waktu.",
+"This page will refresh itself when the %s instance is available again." => "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index fe7b0ba43c5..ce2d0f3b905 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,23 +53,23 @@ msgstr ""
 msgid "Disabled incompatible apps: %s"
 msgstr ""
 
-#: avatar/controller.php:69
+#: avatar/controller.php:70
 msgid "No image or file provided"
 msgstr ""
 
-#: avatar/controller.php:86
+#: avatar/controller.php:87
 msgid "Unknown filetype"
 msgstr ""
 
-#: avatar/controller.php:90
+#: avatar/controller.php:91
 msgid "Invalid image"
 msgstr ""
 
-#: avatar/controller.php:120 avatar/controller.php:147
+#: avatar/controller.php:121 avatar/controller.php:148
 msgid "No temporary profile picture available, try again"
 msgstr ""
 
-#: avatar/controller.php:140
+#: avatar/controller.php:141
 msgid "No crop data provided"
 msgstr ""
 
@@ -585,7 +585,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:58 templates/layout.user.php:127
+#: strings.php:7 templates/layout.user.php:58 templates/layout.user.php:131
 msgid "Apps"
 msgstr ""
 
@@ -819,7 +819,7 @@ msgstr ""
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:89 templates/singleuser.user.php:8
+#: templates/layout.user.php:93 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index f42df4573a6..acc3df0975f 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index ad0000c211f..f13f7db1fe7 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 063d89b4fb5..27747918ec0 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 29db6b93756..e3c2b742085 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 19b9ce16993..e3ceade6a60 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 73288085831..00cbdd1d96b 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 5c3c6184e5a..51dab33b695 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -330,73 +330,73 @@ msgstr ""
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: private/share/share.php:679
+#: private/share/share.php:678
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: private/share/share.php:903
+#: private/share/share.php:902
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:964
+#: private/share/share.php:963
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: private/share/share.php:1002
+#: private/share/share.php:1001
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: private/share/share.php:1010
+#: private/share/share.php:1009
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: private/share/share.php:1136
+#: private/share/share.php:1135
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: private/share/share.php:1143
+#: private/share/share.php:1142
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: private/share/share.php:1149
+#: private/share/share.php:1148
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: private/share/share.php:1892
+#: private/share/share.php:1891
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: private/share/share.php:1902
+#: private/share/share.php:1901
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: private/share/share.php:1928
+#: private/share/share.php:1927
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: private/share/share.php:1942
+#: private/share/share.php:1941
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: private/share/share.php:1956
+#: private/share/share.php:1955
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 922f82d205a..dbe66fd272b 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -289,73 +289,73 @@ msgstr ""
 msgid "Sharing %s failed, because sharing with links is not allowed"
 msgstr ""
 
-#: share/share.php:679
+#: share/share.php:678
 #, php-format
 msgid "Share type %s is not valid for %s"
 msgstr ""
 
-#: share/share.php:903
+#: share/share.php:902
 #, php-format
 msgid ""
 "Setting permissions for %s failed, because the permissions exceed "
 "permissions granted to %s"
 msgstr ""
 
-#: share/share.php:964
+#: share/share.php:963
 #, php-format
 msgid "Setting permissions for %s failed, because the item was not found"
 msgstr ""
 
-#: share/share.php:1002
+#: share/share.php:1001
 #, php-format
 msgid ""
 "Cannot set expiration date. Shares cannot expire later than %s after they "
 "have been shared"
 msgstr ""
 
-#: share/share.php:1010
+#: share/share.php:1009
 msgid "Cannot set expiration date. Expiration date is in the past"
 msgstr ""
 
-#: share/share.php:1136
+#: share/share.php:1135
 #, php-format
 msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
 msgstr ""
 
-#: share/share.php:1143
+#: share/share.php:1142
 #, php-format
 msgid "Sharing backend %s not found"
 msgstr ""
 
-#: share/share.php:1149
+#: share/share.php:1148
 #, php-format
 msgid "Sharing backend for %s not found"
 msgstr ""
 
-#: share/share.php:1892
+#: share/share.php:1891
 #, php-format
 msgid "Sharing %s failed, because the user %s is the original sharer"
 msgstr ""
 
-#: share/share.php:1902
+#: share/share.php:1901
 #, php-format
 msgid ""
 "Sharing %s failed, because the permissions exceed permissions granted to %s"
 msgstr ""
 
-#: share/share.php:1928
+#: share/share.php:1927
 #, php-format
 msgid "Sharing %s failed, because resharing is not allowed"
 msgstr ""
 
-#: share/share.php:1942
+#: share/share.php:1941
 #, php-format
 msgid ""
 "Sharing %s failed, because the sharing backend for %s could not find its "
 "source"
 msgstr ""
 
-#: share/share.php:1956
+#: share/share.php:1955
 #, php-format
 msgid ""
 "Sharing %s failed, because the file could not be found in the file cache"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index ad7793b6f14..27d2250a725 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -292,7 +292,6 @@ msgstr ""
 
 #: js/settings.js:27 js/users/users.js:49
 #: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
-#: templates/users/part.userlist.php:41
 msgid "Groups"
 msgstr ""
 
@@ -316,9 +315,9 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/users/users.js:53 templates/users/part.userlist.php:12
+#: js/users/users.js:53 templates/users/part.userlist.php:41
 #: templates/users/part.userlist.php:57
-msgid "Group Admin"
+msgid "no group"
 msgstr ""
 
 #: js/users/users.js:96 templates/users/part.userlist.php:98
@@ -1016,6 +1015,10 @@ msgstr ""
 msgid "Username"
 msgstr ""
 
+#: templates/users/part.userlist.php:12
+msgid "Group Admin for"
+msgstr ""
+
 #: templates/users/part.userlist.php:14
 msgid "Quota"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index d94352b34f3..9f983dfae79 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index e5b3a3047c5..020319f295b 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-23 01:54-0400\n"
+"POT-Creation-Date: 2014-10-24 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index 83ad773a23b..2814328efdb 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Ρυθμίσεις",
 "Users" => "Χρήστες",
 "Admin" => "Διαχείριση",
+"Recommended" => "Προτείνεται",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση του ownCloud.",
 "No app name specified" => "Δεν προδιορίστηκε όνομα εφαρμογής",
 "Unknown filetype" => "Άγνωστος τύπος αρχείου",
@@ -50,6 +51,7 @@ $TRANSLATIONS = array(
 "PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
 "Set an admin username." => "Εισάγετε όνομα χρήστη διαχειριστή.",
 "Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.",
+"Can't create or write into the data directory %s" => "Αδύνατη η δημιουργία ή συγγραφή στον κατάλογο δεδομένων %s",
 "%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",
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index 4e4524e4fe3..bd62f1f1165 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -49,7 +49,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
 "Groups" => "مجموعات",
 "undo" => "تراجع",
-"Group Admin" => "مدير المجموعة",
 "never" => "بتاتا",
 "add group" => "اضافة مجموعة",
 "A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
index 87b653350ac..d6a56328ff9 100644
--- a/settings/l10n/ast.php
+++ b/settings/l10n/ast.php
@@ -64,7 +64,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Hai d'escribir un nome de grupu válidu",
 "deleted {groupName}" => "desaniciáu {groupName}",
 "undo" => "desfacer",
-"Group Admin" => "Alministrador del Grupu",
 "never" => "enxamás",
 "deleted {userName}" => "desaniciáu {userName}",
 "add group" => "amestar Grupu",
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
index 62ff78c9a83..24c06054c7b 100644
--- a/settings/l10n/az.php
+++ b/settings/l10n/az.php
@@ -64,7 +64,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Düzgün qrup adı təyin edilməlidir",
 "deleted {groupName}" => "{groupName} silindi",
 "undo" => "geriyə",
-"Group Admin" => "Qrup İnzibatçısı",
 "never" => "heç vaxt",
 "deleted {userName}" => "{userName} silindi",
 "add group" => "qrupu əlavə et",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 85b4ed32035..23fbf6589ff 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Очаква се валидно име на група",
 "deleted {groupName}" => "{groupName} изтрит",
 "undo" => "възтановяване",
-"Group Admin" => "Админ Група",
 "never" => "никога",
 "deleted {userName}" => "{userName} изтрит",
 "add group" => "нова група",
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
index 2067c0d9be9..58839489eab 100644
--- a/settings/l10n/bn_BD.php
+++ b/settings/l10n/bn_BD.php
@@ -38,7 +38,6 @@ $TRANSLATIONS = array(
 "Delete" => "মুছে",
 "Groups" => "গোষ্ঠীসমূহ",
 "undo" => "ক্রিয়া প্রত্যাহার",
-"Group Admin" => "গোষ্ঠী প্রশাসক",
 "never" => "কখনোই নয়",
 "__language_name__" => "__language_name__",
 "SSL root certificates" => "SSL  রুট সনদপত্র",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 70af970d51a..19fb76d29a2 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -64,7 +64,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Heu de facilitar un nom de grup vàlid",
 "deleted {groupName}" => "eliminat {groupName}",
 "undo" => "desfés",
-"Group Admin" => "Grup Admin",
 "never" => "mai",
 "deleted {userName}" => "eliminat {userName}",
 "add group" => "afegeix grup",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 8aa6c59f37c..8c8b4e4692d 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Musíte zadat platný název skupiny",
 "deleted {groupName}" => "smazána {groupName}",
 "undo" => "vrátit zpět",
-"Group Admin" => "Správa skupiny",
 "never" => "nikdy",
 "deleted {userName}" => "smazán {userName}",
 "add group" => "přidat skupinu",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Musíte zadat platné heslo",
 "Warning: Home directory for user \"{user}\" already exists" => "Varování: Osobní složka uživatele \"{user}\" již existuje.",
 "__language_name__" => "Česky",
+"Personal Info" => "Osobní informace",
 "SSL root certificates" => "Kořenové certifikáty SSL",
 "Encryption" => "Šifrování",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Vše (fatální problémy, chyby, varování, informační, ladící)",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 461f3b8c4e6..802b70cc0b5 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Et gyldigt gruppenavn skal angives ",
 "deleted {groupName}" => "slettede {groupName}",
 "undo" => "fortryd",
-"Group Admin" => "Gruppe Administrator",
 "never" => "aldrig",
 "deleted {userName}" => "slettede {userName}",
 "add group" => "Tilføj gruppe",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "En gyldig adgangskode skal angives",
 "Warning: Home directory for user \"{user}\" already exists" => "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede",
 "__language_name__" => "Dansk",
+"Personal Info" => "Personlige oplysninger",
 "SSL root certificates" => "SSL-rodcertifikater",
 "Encryption" => "Kryptering",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index a775d7e104d..c8c8cc32a2b 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
 "deleted {groupName}" => "{groupName} gelöscht",
 "undo" => "rückgängig machen",
-"Group Admin" => "Gruppenadministrator",
 "never" => "niemals",
 "deleted {userName}" => "{userName} gelöscht",
 "add group" => "Gruppe hinzufügen",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
 "__language_name__" => "Deutsch (Persönlich)",
+"Personal Info" => "Persönliche Informationen",
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Encryption" => "Verschlüsselung",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
index 3aaec32f497..08ff1847dd8 100644
--- a/settings/l10n/de_CH.php
+++ b/settings/l10n/de_CH.php
@@ -29,7 +29,6 @@ $TRANSLATIONS = array(
 "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",
-"Group Admin" => "Gruppenadministrator",
 "never" => "niemals",
 "add group" => "Gruppe hinzufügen",
 "A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 075dedea2fd..1a5da377b77 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
 "deleted {groupName}" => "{groupName} gelöscht",
 "undo" => "rückgängig machen",
-"Group Admin" => "Gruppenadministrator",
 "never" => "niemals",
 "deleted {userName}" => "{userName} gelöscht",
 "add group" => "Gruppe hinzufügen",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
 "Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
 "__language_name__" => "Deutsch (Förmlich: Sie)",
+"Personal Info" => "Persönliche Informationen",
 "SSL root certificates" => "SSL-Root-Zertifikate",
 "Encryption" => "Verschlüsselung",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index f8053cff072..71e7c9ce387 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Ενεργοποιημένο",
+"Not enabled" => "Μη ενεργοποιημένο",
+"Recommended" => "Προτείνεται",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Your full name has been changed." => "Το πλήρες όνομά σας άλλαξε.",
 "Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
@@ -33,6 +35,7 @@ $TRANSLATIONS = array(
 "Saved" => "Αποθηκεύτηκαν",
 "test email settings" => "δοκιμή ρυθμίσεων email",
 "If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
+"A problem occurred while sending the email. Please revise your settings." => "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του email. Παρακαλώ αναθεωρήστε τις ρυθμίσεις σας.",
 "Email sent" => "Το Email απεστάλη ",
 "You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
@@ -67,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
 "deleted {groupName}" => "διαγραφή {groupName}",
 "undo" => "αναίρεση",
-"Group Admin" => "Ομάδα Διαχειριστών",
 "never" => "ποτέ",
 "deleted {userName}" => "διαγραφή {userName}",
 "add group" => "προσθήκη ομάδας",
@@ -76,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό",
 "Warning: Home directory for user \"{user}\" already exists" => "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη",
 "__language_name__" => "__όνομα_γλώσσας__",
+"Personal Info" => "Προσωπικές Πληροφορίες",
 "SSL root certificates" => "Πιστοποιητικά SSL root",
 "Encryption" => "Κρυπτογράφηση",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)",
@@ -149,6 +152,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Πιστοποιητικά",
 "SMTP Username" => "Όνομα χρήστη SMTP",
 "SMTP Password" => "Συνθηματικό SMTP",
+"Store credentials" => "Διαπιστευτήρια αποθήκευσης",
 "Test email settings" => "Δοκιμή ρυθμίσεων email",
 "Send email" => "Αποστολή email",
 "Log" => "Καταγραφές",
@@ -157,10 +161,13 @@ $TRANSLATIONS = array(
 "Less" => "Λιγότερα",
 "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>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Περισσότερες εφαρμογές",
+"Add your app" => "Προσθέστε την Εφαρμογή σας ",
 "by" => "από",
 "Documentation:" => "Τεκμηρίωση:",
 "User Documentation" => "Τεκμηρίωση Χρήστη",
 "Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
+"Update to %s" => "Ενημέρωση σε %s",
 "Enable only for specific groups" => "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
 "Uninstall App" => "Απεγκατάσταση Εφαρμογής",
 "Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index 7b3d5cba97d..dc8faf2b877 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "A valid group name must be provided",
 "deleted {groupName}" => "deleted {groupName}",
 "undo" => "undo",
-"Group Admin" => "Group Admin",
 "never" => "never",
 "deleted {userName}" => "deleted {userName}",
 "add group" => "add group",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "A valid password must be provided",
 "Warning: Home directory for user \"{user}\" already exists" => "Warning: Home directory for user \"{user}\" already exists",
 "__language_name__" => "English (British English)",
+"Personal Info" => "Personal Info",
 "SSL root certificates" => "SSL root certificates",
 "Encryption" => "Encryption",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Everything (fatal issues, errors, warnings, info, debug)",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index e373b724d15..44506ad4e3c 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
 "Groups" => "Grupoj",
 "deleted {groupName}" => "{groupName} foriĝis",
 "undo" => "malfari",
-"Group Admin" => "Grupadministranto",
 "never" => "neniam",
 "deleted {userName}" => "{userName} foriĝis",
 "add group" => "aldoni grupon",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index cb299e433c3..36825fd90f0 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Enabled" => "Habilitar",
+"Enabled" => "Habilitado",
 "Not enabled" => "No habilitado",
 "Recommended" => "Recomendado",
 "Authentication error" => "Error de autenticación",
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Se debe dar un nombre válido para el grupo ",
 "deleted {groupName}" => "borrado {groupName}",
 "undo" => "deshacer",
-"Group Admin" => "Administrador del Grupo",
 "never" => "nunca",
 "deleted {userName}" => "borrado {userName}",
 "add group" => "añadir Grupo",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Se debe proporcionar una contraseña válida",
 "Warning: Home directory for user \"{user}\" already exists" => "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
 "__language_name__" => "Castellano",
+"Personal Info" => "Información personal",
 "SSL root certificates" => "Certificados raíz SSL",
 "Encryption" => "Cifrado",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Todo (Información, Avisos, Errores, debug y problemas fatales)",
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
index ae966928fbe..1b27515d77d 100644
--- a/settings/l10n/es_AR.php
+++ b/settings/l10n/es_AR.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
 "Groups" => "Grupos",
 "undo" => "deshacer",
-"Group Admin" => "Grupo Administrador",
 "never" => "nunca",
 "add group" => "agregar grupo",
 "A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
index 88c11e224fd..4db87b4e68b 100644
--- a/settings/l10n/es_MX.php
+++ b/settings/l10n/es_MX.php
@@ -37,7 +37,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
 "Groups" => "Grupos",
 "undo" => "deshacer",
-"Group Admin" => "Administrador del Grupo",
 "never" => "nunca",
 "add group" => "añadir Grupo",
 "A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index d4a0a158068..e38cb7ff242 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Sisesta nõuetele vastav grupi nimi",
 "deleted {groupName}" => "kustutatud {groupName}",
 "undo" => "tagasi",
-"Group Admin" => "Grupi admin",
 "never" => "mitte kunagi",
 "deleted {userName}" => "kustutatud {userName}",
 "add group" => "lisa grupp",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index e11e160d31e..6df2823064e 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -66,7 +66,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Baliozko talde izena eman behar da",
 "deleted {groupName}" => "{groupName} ezbatuta",
 "undo" => "desegin",
-"Group Admin" => "Talde administradorea",
 "never" => "inoiz",
 "deleted {userName}" => "{userName} ezabatuta",
 "add group" => "gehitu taldea",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index fec5c92f62c..ef65cc8b78c 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -58,7 +58,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "نام کاربری معتبر می بایست وارد شود",
 "deleted {groupName}" => "گروه {groupName} حذف شد",
 "undo" => "بازگشت",
-"Group Admin" => "گروه مدیران",
 "never" => "هرگز",
 "deleted {userName}" => "کاربر {userName} حذف شد",
 "add group" => "افزودن گروه",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index cffcb39a185..f423410b725 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Anna kelvollinen ryhmän nimi",
 "deleted {groupName}" => "poistettu {groupName}",
 "undo" => "kumoa",
-"Group Admin" => "Ryhmän ylläpitäjä",
 "never" => "ei koskaan",
 "deleted {userName}" => "poistettu {userName}",
 "add group" => "lisää ryhmä",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Anna kelvollinen salasana",
 "Warning: Home directory for user \"{user}\" already exists" => "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio",
 "__language_name__" => "_kielen_nimi_",
+"Personal Info" => "Henkilökohtaiset tiedot",
 "SSL root certificates" => "SSL-juurivarmenteet",
 "Encryption" => "Salaus",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
@@ -199,6 +199,7 @@ $TRANSLATIONS = array(
 "The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
 "Log-in password" => "Kirjautumissalasana",
 "Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
 "Restore Encryption Keys" => "Palauta salausavaimet",
 "Delete Encryption Keys" => "Poista salausavaimet",
 "Show storage location" => "Näytä tallennustilan sijainti",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index f876f92ef8a..988321b82d3 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Vous devez spécifier un nom de groupe valide",
 "deleted {groupName}" => "{groupName} supprimé",
 "undo" => "annuler",
-"Group Admin" => "Admin Groupe",
 "never" => "jamais",
 "deleted {userName}" => "{userName} supprimé",
 "add group" => "ajouter un groupe",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 3a33c6965d6..1399257d9c5 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -64,7 +64,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Debe fornecer un nome de grupo",
 "deleted {groupName}" => "{groupName} foi eliminado",
 "undo" => "desfacer",
-"Group Admin" => "Grupo Admin",
 "never" => "nunca",
 "deleted {userName}" => "{userName} foi eliminado",
 "add group" => "engadir un grupo",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index e9824dabdb4..0e626c9059a 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -25,7 +25,6 @@ $TRANSLATIONS = array(
 "Delete" => "מחיקה",
 "Groups" => "קבוצות",
 "undo" => "ביטול",
-"Group Admin" => "מנהל הקבוצה",
 "never" => "לעולם לא",
 "add group" => "הוספת קבוצה",
 "A valid username must be provided" => "יש לספק שם משתמש תקני",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 5718a5261c7..1c6e178abdd 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Nužno je navesti valjani naziv grupe",
 "deleted {groupName}" => "izbrisana {groupName}",
 "undo" => "poništite",
-"Group Admin" => "Group Admin",
 "never" => "nikad",
 "deleted {userName}" => "izbrisano {userName}",
 "add group" => "dodajte grupu",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 9da8ffb70d7..9049326a12a 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Érvényes csoportnevet kell megadni",
 "deleted {groupName}" => "törölve: {groupName}",
 "undo" => "visszavonás",
-"Group Admin" => "Csoportadminisztrátor",
 "never" => "soha",
 "deleted {userName}" => "törölve: {userName}",
 "add group" => "csoport hozzáadása",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 644f4e7806e..579a7129703 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat.",
 "Groups" => "Grup",
 "undo" => "urungkan",
-"Group Admin" => "Admin Grup",
 "never" => "tidak pernah",
 "add group" => "tambah grup",
 "A valid username must be provided" => "Tuliskan nama pengguna yang valid",
@@ -87,6 +86,7 @@ $TRANSLATIONS = array(
 "Sharing" => "Berbagi",
 "Allow apps to use the Share API" => "Izinkan aplikasi untuk menggunakan API Pembagian",
 "Allow public uploads" => "Izinkan unggahan publik",
+"days" => "hari",
 "Allow resharing" => "Izinkan pembagian ulang",
 "Security" => "Keamanan",
 "Enforce HTTPS" => "Selalu Gunakan HTTPS",
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
index a4def1bdc47..45f15f8dab3 100644
--- a/settings/l10n/is.php
+++ b/settings/l10n/is.php
@@ -21,7 +21,6 @@ $TRANSLATIONS = array(
 "Delete" => "Eyða",
 "Groups" => "Hópar",
 "undo" => "afturkalla",
-"Group Admin" => "Hópstjóri",
 "never" => "aldrei",
 "__language_name__" => "__nafn_tungumáls__",
 "SSL root certificates" => "SSL rótar skilríki",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index f1a5a50ec49..e7ecb9a69a1 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Deve essere fornito un nome valido per il gruppo",
 "deleted {groupName}" => "{groupName} eliminato",
 "undo" => "annulla",
-"Group Admin" => "Gruppi amministrati",
 "never" => "mai",
 "deleted {userName}" => "{userName} eliminato",
 "add group" => "aggiungi gruppo",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Deve essere fornita una password valida",
 "Warning: Home directory for user \"{user}\" already exists" => "Avviso: la cartella home dell'utente \"{user}\" esiste già",
 "__language_name__" => "Italiano",
+"Personal Info" => "Informazioni personali",
 "SSL root certificates" => "Certificati SSL radice",
 "Encryption" => "Cifratura",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index cbbccb4013b..f91bb756add 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "有効なグループ名を指定する必要があります",
 "deleted {groupName}" => "{groupName} を削除しました",
 "undo" => "元に戻す",
-"Group Admin" => "グループ管理者",
 "never" => "なし",
 "deleted {userName}" => "{userName} を削除しました",
 "add group" => "グループを追加",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
index f656b7e87f8..3e2a50a6fdf 100644
--- a/settings/l10n/ka_GE.php
+++ b/settings/l10n/ka_GE.php
@@ -24,7 +24,6 @@ $TRANSLATIONS = array(
 "Delete" => "წაშლა",
 "Groups" => "ჯგუფები",
 "undo" => "დაბრუნება",
-"Group Admin" => "ჯგუფის ადმინისტრატორი",
 "never" => "არასდროს",
 "add group" => "ჯგუფის დამატება",
 "A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
index dcb718b3b73..3e7522dcf9e 100644
--- a/settings/l10n/km.php
+++ b/settings/l10n/km.php
@@ -38,7 +38,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
 "Groups" => "ក្រុ",
 "undo" => "មិន​ធ្វើ​វិញ",
-"Group Admin" => "ក្រុម​អ្នក​គ្រប់គ្រង",
 "never" => "មិនដែរ",
 "add group" => "បន្ថែម​ក្រុម",
 "A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 8913ae043b9..247460cf82c 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -51,7 +51,6 @@ $TRANSLATIONS = array(
 "Error creating group" => "그룹을 생성하던 중 오류가 발생하였습니다",
 "deleted {groupName}" => "{groupName} 삭제됨",
 "undo" => "실행 취소",
-"Group Admin" => "그룹 관리자",
 "never" => "없음",
 "deleted {userName}" => "{userName} 삭제됨",
 "add group" => "그룹 추가",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index eb7fd44b5e5..25cd41b29f5 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -18,7 +18,6 @@ $TRANSLATIONS = array(
 "Delete" => "Läschen",
 "Groups" => "Gruppen",
 "undo" => "réckgängeg man",
-"Group Admin" => "Gruppen Admin",
 "never" => "ni",
 "__language_name__" => "__language_name__",
 "Login" => "Login",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 1404622d35c..9a08ccb55a4 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -35,7 +35,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
 "Groups" => "Grupės",
 "undo" => "anuliuoti",
-"Group Admin" => "Grupės administratorius",
 "never" => "niekada",
 "add group" => "pridėti grupę",
 "A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index e736ba17149..f1c38f60e19 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -25,7 +25,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
 "Groups" => "Grupas",
 "undo" => "atsaukt",
-"Group Admin" => "Grupas administrators",
 "never" => "nekad",
 "add group" => "pievienot grupu",
 "A valid username must be provided" => "Jānorāda derīgs lietotājvārds",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 3968ea60c71..f24fbd6e06d 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -48,7 +48,6 @@ $TRANSLATIONS = array(
 "Error creating group" => "Грешка при креирање на група",
 "A valid group name must be provided" => "Мора да се обезбеди валидно име на група",
 "undo" => "врати",
-"Group Admin" => "Администратор на група",
 "never" => "никогаш",
 "add group" => "додади група",
 "A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 6aa70d2543f..08e1a3dbc60 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Et gyldig gruppenavn må oppgis",
 "deleted {groupName}" => "slettet {groupName}",
 "undo" => "angre",
-"Group Admin" => "Gruppeadministrator",
 "never" => "aldri",
 "deleted {userName}" => "slettet {userName}",
 "add group" => "legg til gruppe",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index c9c3d343e5a..c7538e1300f 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Er moet een geldige groepsnaam worden opgegeven",
 "deleted {groupName}" => "verwijderd {groupName}",
 "undo" => "ongedaan maken",
-"Group Admin" => "Groep beheerder",
 "never" => "geen",
 "deleted {userName}" => "verwijderd {userName}",
 "add group" => "toevoegen groep",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
 "Warning: Home directory for user \"{user}\" already exists" => "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al",
 "__language_name__" => "Nederlands",
+"Personal Info" => "Persoonlijke info",
 "SSL root certificates" => "SSL root certificaten",
 "Encryption" => "Versleuteling",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 8b71081e651..7fd2eb96d8e 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -36,7 +36,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
 "Groups" => "Grupper",
 "undo" => "angra",
-"Group Admin" => "Gruppestyrar",
 "never" => "aldri",
 "add group" => "legg til gruppe",
 "A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
index fba58f1b559..6c41061bbe7 100644
--- a/settings/l10n/oc.php
+++ b/settings/l10n/oc.php
@@ -16,7 +16,6 @@ $TRANSLATIONS = array(
 "Delete" => "Escafa",
 "Groups" => "Grops",
 "undo" => "defar",
-"Group Admin" => "Grop Admin",
 "never" => "jamai",
 "__language_name__" => "__language_name__",
 "Login" => "Login",
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php
index 5d651a78dd8..2bfd1e44999 100644
--- a/settings/l10n/pa.php
+++ b/settings/l10n/pa.php
@@ -9,7 +9,6 @@ $TRANSLATIONS = array(
 "Delete" => "ਹਟਾਓ",
 "Groups" => "ਗਰੁੱਪ",
 "undo" => "ਵਾਪਸ",
-"Group Admin" => "ਗਰੁੱਪ ਐਡਮਿਨ",
 "add group" => "ਗਰੁੱਪ ਸ਼ਾਮਲ",
 "__language_name__" => "__ਭਾਸ਼ਾ_ਨਾਂ__",
 "Login" => "ਲਾਗਇਨ",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 061d9a6efcc..01e3c5afe96 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Należy podać prawidłową nazwę grupy",
 "deleted {groupName}" => "usunięto {groupName}",
 "undo" => "cofnij",
-"Group Admin" => "Administrator grupy",
 "never" => "nigdy",
 "deleted {userName}" => "usunięto {userName}",
 "add group" => "dodaj grupę",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 800ac705af3..dce1fab40a4 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Um nome de grupo válido deve ser fornecido",
 "deleted {groupName}" => "eliminado {groupName}",
 "undo" => "desfazer",
-"Group Admin" => "Grupo Administrativo",
 "never" => "nunca",
 "deleted {userName}" => "eliminado {userName}",
 "add group" => "adicionar grupo",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index f273ddc035d..e06715c061b 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Um nome válido do grupo tem de ser fornecido",
 "deleted {groupName}" => "apagar {Nome do grupo}",
 "undo" => "desfazer",
-"Group Admin" => "Grupo Administrador",
 "never" => "nunca",
 "deleted {userName}" => "apagar{utilizador}",
 "add group" => "Adicionar grupo",
@@ -79,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Uma password válida deve ser fornecida",
 "Warning: Home directory for user \"{user}\" already exists" => "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
 "__language_name__" => "__language_name__",
+"Personal Info" => "Informação Pessoal",
 "SSL root certificates" => "Certificados SSL de raiz",
 "Encryption" => "Encriptação",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (problemas fatais, erros, avisos, informação, depuração)",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index feb4b902843..a0cf5139e52 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -46,7 +46,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
 "Groups" => "Grupuri",
 "undo" => "Anulează ultima acțiune",
-"Group Admin" => "Grupul Admin ",
 "never" => "niciodată",
 "add group" => "adăugaţi grupul",
 "A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 0a376bd9e45..7e3c8368951 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Введите правильное имя группы",
 "deleted {groupName}" => "удалено {groupName}",
 "undo" => "отмена",
-"Group Admin" => "Администратор группы",
 "never" => "никогда",
 "deleted {userName}" => "удалён {userName}",
 "add group" => "добавить группу",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index 207b11f3fa8..e254e447640 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -16,7 +16,6 @@ $TRANSLATIONS = array(
 "Delete" => "මකා දමන්න",
 "Groups" => "කණ්ඩායම්",
 "undo" => "නිෂ්ප්‍රභ කරන්න",
-"Group Admin" => "කාණ්ඩ පරිපාලක",
 "never" => "කවදාවත්",
 "SSL root certificates" => "SSL මූල සහතිකයන්",
 "Encryption" => "ගුප්ත කේතනය",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index 8a479e18d11..5dcfdf6c9dc 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Musíte zadať platný názov skupiny",
 "deleted {groupName}" => "vymazaná {groupName}",
 "undo" => "vrátiť",
-"Group Admin" => "Správca skupiny",
 "never" => "nikdy",
 "deleted {userName}" => "vymazané {userName}",
 "add group" => "pridať skupinu",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 1c723728112..90858ab4360 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -61,7 +61,6 @@ $TRANSLATIONS = array(
 "Unable to delete {objName}" => "Ni mogoče izbrisati {objName}",
 "Error creating group" => "Napaka ustvarjanja skupine",
 "undo" => "razveljavi",
-"Group Admin" => "Skrbnik skupine",
 "never" => "nikoli",
 "add group" => "dodaj skupino",
 "A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
index f4b914a2343..e09d1ed128b 100644
--- a/settings/l10n/sq.php
+++ b/settings/l10n/sq.php
@@ -30,7 +30,6 @@ $TRANSLATIONS = array(
 "Groups" => "Grupet",
 "deleted {groupName}" => "u fshi {groupName}",
 "undo" => "anullo veprimin",
-"Group Admin" => "Grupi Admin",
 "never" => "asnjëherë",
 "deleted {userName}" => "u fshi {userName}",
 "add group" => "shto grup",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index e136628990d..eced1165e82 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -23,7 +23,6 @@ $TRANSLATIONS = array(
 "Delete" => "Обриши",
 "Groups" => "Групе",
 "undo" => "опозови",
-"Group Admin" => "Управник групе",
 "never" => "никада",
 "add group" => "додај групу",
 "A valid username must be provided" => "Морате унети исправно корисничко име",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index e1b82c55b92..60ca3488e04 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -69,7 +69,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Ett giltigt gruppnamn måste anges",
 "deleted {groupName}" => "raderade {groupName} ",
 "undo" => "ångra",
-"Group Admin" => "Gruppadministratör",
 "never" => "aldrig",
 "deleted {userName}" => "raderade {userName}",
 "add group" => "lägg till grupp",
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
index 27c70d55756..7d7df14e9d3 100644
--- a/settings/l10n/ta_LK.php
+++ b/settings/l10n/ta_LK.php
@@ -17,7 +17,6 @@ $TRANSLATIONS = array(
 "Delete" => "நீக்குக",
 "Groups" => "குழுக்கள்",
 "undo" => "முன் செயல் நீக்கம் ",
-"Group Admin" => "குழு நிர்வாகி",
 "never" => "ஒருபோதும்",
 "__language_name__" => "_மொழி_பெயர்_",
 "SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index c4ec7b915c5..5abacd4f4b1 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -24,7 +24,6 @@ $TRANSLATIONS = array(
 "Delete" => "ลบ",
 "Groups" => "กลุ่ม",
 "undo" => "เลิกทำ",
-"Group Admin" => "ผู้ดูแลกลุ่ม",
 "never" => "ไม่ต้องเลย",
 "__language_name__" => "ภาษาไทย",
 "SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index ce8d003aa05..7432e486d99 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Geçerli bir grup adı mutlaka sağlanmalı",
 "deleted {groupName}" => "{groupName} silindi",
 "undo" => "geri al",
-"Group Admin" => "Grup Yöneticisi",
 "never" => "hiçbir zaman",
 "deleted {userName}" => "{userName} silindi",
 "add group" => "grup ekle",
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
index b86ea3e1d27..0bd29895d96 100644
--- a/settings/l10n/ug.php
+++ b/settings/l10n/ug.php
@@ -23,7 +23,6 @@ $TRANSLATIONS = array(
 "Delete" => "ئۆچۈر",
 "Groups" => "گۇرۇپپا",
 "undo" => "يېنىۋال",
-"Group Admin" => "گۇرۇپپا باشقۇرغۇچى",
 "never" => "ھەرگىز",
 "add group" => "گۇرۇپپا قوش",
 "A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index f287731305f..68369d782ff 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -70,7 +70,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Потрібно задати вірне ім'я групи",
 "deleted {groupName}" => "видалено {groupName}",
 "undo" => "відмінити",
-"Group Admin" => "Адміністратор групи",
 "never" => "ніколи",
 "deleted {userName}" => "видалено {userName}",
 "add group" => "додати групу",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 88ebd775579..5abff6a4e6b 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -27,7 +27,6 @@ $TRANSLATIONS = array(
 "Delete" => "Xóa",
 "Groups" => "Nhóm",
 "undo" => "lùi lại",
-"Group Admin" => "Nhóm quản trị",
 "never" => "không thay đổi",
 "__language_name__" => "__Ngôn ngữ___",
 "SSL root certificates" => "Chứng chỉ SSL root",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 3e465ed4d79..49c8021e2a5 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -67,7 +67,6 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "请提供一个有效的组名称",
 "deleted {groupName}" => "已删除 {groupName}",
 "undo" => "撤销",
-"Group Admin" => "组管理员",
 "never" => "从不",
 "deleted {userName}" => "已删除 {userName}",
 "add group" => "增加组",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 8bab4c57ed3..20a10a926ac 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -50,7 +50,6 @@ $TRANSLATIONS = array(
 "Decrypting files... Please wait, this can take some time." => "檔案解密中，請稍候。",
 "Groups" => "群組",
 "undo" => "復原",
-"Group Admin" => "群組管理員",
 "never" => "永不",
 "add group" => "新增群組",
 "A valid username must be provided" => "必須提供一個有效的用戶名",
-- 
GitLab


From cbd130bed0164095ab3432b9c92111fad8a9f7ac Mon Sep 17 00:00:00 2001
From: libasys <sebastian.doell@libasys.de>
Date: Tue, 27 May 2014 10:38:56 +0200
Subject: [PATCH 210/616] adding missing email address for principal

* fix #8515
* add mail only if it exists
---
 lib/private/connector/sabre/principal.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/private/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php
index 9bad3b9df16..c674e2aa779 100644
--- a/lib/private/connector/sabre/principal.php
+++ b/lib/private/connector/sabre/principal.php
@@ -26,11 +26,17 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
 
 		if ($prefixPath == 'principals') {
 			foreach(OC_User::getUsers() as $user) {
+
 				$user_uri = 'principals/'.$user;
 				$principals[] = array(
 					'uri' => $user_uri,
 					'{DAV:}displayname' => $user,
 				);
+
+				$email= \OCP\Config::getUserValue($user, 'settings', 'email');
+				if($email) {
+					$principals['{http://sabredav.org/ns}email-address'] = $email;
+				}
 			}
 		}
 
@@ -49,10 +55,16 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
 		list($prefix, $name) = explode('/', $path);
 
 		if ($prefix == 'principals' && OC_User::userExists($name)) {
+
 			return array(
 				'uri' => 'principals/'.$name,
 				'{DAV:}displayname' => $name,
 			);
+
+			$email= \OCP\Config::getUserValue($user, 'settings', 'email');
+			if($email) {
+				$principals['{http://sabredav.org/ns}email-address'] = $email;
+			}
 		}
 
 		return null;
-- 
GitLab


From 2d2a4741ce7ef88c0291b2822b5cc767ebda5f46 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 24 Oct 2014 11:14:51 +0200
Subject: [PATCH 211/616] Make files non executable

There is not much sense in having these files marked executable, we should avoid that.
---
 apps/files_encryption/lib/crypt.php         | 0
 apps/files_encryption/lib/helper.php        | 0
 apps/files_encryption/lib/keymanager.php    | 0
 apps/files_external/lib/config.php          | 0
 apps/files_external/lib/dropbox.php         | 0
 apps/files_external/personal.php            | 0
 apps/user_webdavauth/appinfo/app.php        | 0
 apps/user_webdavauth/appinfo/info.xml       | 0
 apps/user_webdavauth/settings.php           | 0
 apps/user_webdavauth/templates/settings.php | 0
 apps/user_webdavauth/user_webdavauth.php    | 0
 config/.htaccess                            | 0
 config/config.sample.php                    | 0
 core/js/select2/select2_locale_zh-TW.js     | 0
 core/js/snap.js                             | 0
 index.php                                   | 0
 lib/private/activitymanager.php             | 0
 lib/private/preview.php                     | 0
 lib/private/previewmanager.php              | 0
 lib/private/request.php                     | 0
 lib/private/util.php                        | 0
 settings/admin.php                          | 0
 22 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 apps/files_encryption/lib/crypt.php
 mode change 100755 => 100644 apps/files_encryption/lib/helper.php
 mode change 100755 => 100644 apps/files_encryption/lib/keymanager.php
 mode change 100755 => 100644 apps/files_external/lib/config.php
 mode change 100755 => 100644 apps/files_external/lib/dropbox.php
 mode change 100755 => 100644 apps/files_external/personal.php
 mode change 100755 => 100644 apps/user_webdavauth/appinfo/app.php
 mode change 100755 => 100644 apps/user_webdavauth/appinfo/info.xml
 mode change 100755 => 100644 apps/user_webdavauth/settings.php
 mode change 100755 => 100644 apps/user_webdavauth/templates/settings.php
 mode change 100755 => 100644 apps/user_webdavauth/user_webdavauth.php
 mode change 100755 => 100644 config/.htaccess
 mode change 100755 => 100644 config/config.sample.php
 mode change 100755 => 100644 core/js/select2/select2_locale_zh-TW.js
 mode change 100755 => 100644 core/js/snap.js
 mode change 100755 => 100644 index.php
 mode change 100755 => 100644 lib/private/activitymanager.php
 mode change 100755 => 100644 lib/private/preview.php
 mode change 100755 => 100644 lib/private/previewmanager.php
 mode change 100755 => 100644 lib/private/request.php
 mode change 100755 => 100644 lib/private/util.php
 mode change 100755 => 100644 settings/admin.php

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
old mode 100755
new mode 100644
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
old mode 100755
new mode 100644
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
old mode 100755
new mode 100644
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
old mode 100755
new mode 100644
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
old mode 100755
new mode 100644
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
old mode 100755
new mode 100644
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
old mode 100755
new mode 100644
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
old mode 100755
new mode 100644
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
old mode 100755
new mode 100644
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
old mode 100755
new mode 100644
diff --git a/config/.htaccess b/config/.htaccess
old mode 100755
new mode 100644
diff --git a/config/config.sample.php b/config/config.sample.php
old mode 100755
new mode 100644
diff --git a/core/js/select2/select2_locale_zh-TW.js b/core/js/select2/select2_locale_zh-TW.js
old mode 100755
new mode 100644
diff --git a/core/js/snap.js b/core/js/snap.js
old mode 100755
new mode 100644
diff --git a/index.php b/index.php
old mode 100755
new mode 100644
diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
old mode 100755
new mode 100644
diff --git a/lib/private/preview.php b/lib/private/preview.php
old mode 100755
new mode 100644
diff --git a/lib/private/previewmanager.php b/lib/private/previewmanager.php
old mode 100755
new mode 100644
diff --git a/lib/private/request.php b/lib/private/request.php
old mode 100755
new mode 100644
diff --git a/lib/private/util.php b/lib/private/util.php
old mode 100755
new mode 100644
diff --git a/settings/admin.php b/settings/admin.php
old mode 100755
new mode 100644
-- 
GitLab


From 83c74b80ad826af60d894ba91bb1e56fd2005d32 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Oct 2014 17:33:36 +0200
Subject: [PATCH 212/616] Add \OC\TempManager to handle creating and cleaning
 temporary files

---
 lib/private/server.php          |  13 +++
 lib/private/tempmanager.php     | 146 ++++++++++++++++++++++++++++++++
 lib/public/iservercontainer.php |   7 ++
 lib/public/itempmanager.php     |  38 +++++++++
 tests/lib/tempmanager.php       | 143 +++++++++++++++++++++++++++++++
 5 files changed, 347 insertions(+)
 create mode 100644 lib/private/tempmanager.php
 create mode 100644 lib/public/itempmanager.php
 create mode 100644 tests/lib/tempmanager.php

diff --git a/lib/private/server.php b/lib/private/server.php
index b0d63af1554..34fd8ab48fd 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -256,6 +256,10 @@ class Server extends SimpleContainer implements IServerContainer {
 				return new NullQueryLogger();
 			}
 		});
+		$this->registerService('TempManager', function ($c) {
+			/** @var Server $c */
+			return new TempManager(get_temp_dir(), $c->getLogger());
+		});
 	}
 
 	/**
@@ -617,4 +621,13 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getQueryLogger() {
 		return $this->query('QueryLogger');
 	}
+
+	/**
+	 * Get the manager for temporary files and folders
+	 *
+	 * @return \OCP\ITempManager
+	 */
+	function getTempManager() {
+		return $this->query('TempManager');
+	}
 }
diff --git a/lib/private/tempmanager.php b/lib/private/tempmanager.php
new file mode 100644
index 00000000000..a3bb07f9d63
--- /dev/null
+++ b/lib/private/tempmanager.php
@@ -0,0 +1,146 @@
+<?php
+
+/**
+ * Copyright (c) 2014 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 OC;
+
+use OCP\ILogger;
+use OCP\ITempManager;
+
+class TempManager implements ITempManager {
+	/**
+	 * Current temporary files and folders
+	 *
+	 * @var string[]
+	 */
+	protected $current = array();
+
+	/**
+	 * i.e. /tmp on linux systems
+	 *
+	 * @var string
+	 */
+	protected $tmpBaseDir;
+
+	/**
+	 * @var \OCP\ILogger
+	 */
+	protected $log;
+
+	/**
+	 * @param string $baseDir
+	 * @param \OCP\ILogger $logger
+	 */
+	public function __construct($baseDir, ILogger $logger) {
+		$this->tmpBaseDir = $baseDir;
+		$this->log = $logger;
+	}
+
+	protected function generatePath($postFix) {
+		return $this->tmpBaseDir . '/oc_tmp_' . md5(time() . rand()) . $postFix;
+	}
+
+	/**
+	 * Create a temporary file and return the path
+	 *
+	 * @param string $postFix
+	 * @return string
+	 */
+	public function getTemporaryFile($postFix = '') {
+		$file = $this->generatePath($postFix);
+		if (is_writable($this->tmpBaseDir)) {
+			touch($file);
+			$this->current[] = $file;
+			return $file;
+		} else {
+			$this->log->warning(
+				'Can not create a temporary file in directory {dir}. Check it exists and has correct permissions',
+				array(
+					'dir' => $this->tmpBaseDir
+				)
+			);
+			return false;
+		}
+	}
+
+	/**
+	 * Create a temporary folder and return the path
+	 *
+	 * @param string $postFix
+	 * @return string
+	 */
+	public function getTemporaryFolder($postFix = '') {
+		$path = $this->generatePath($postFix);
+		if (is_writable($this->tmpBaseDir)) {
+			mkdir($path);
+			$this->current[] = $path;
+			return $path . '/';
+		} else {
+			$this->log->warning(
+				'Can not create a temporary folder in directory {dir}. Check it exists and has correct permissions',
+				array(
+					'dir' => $this->tmpBaseDir
+				)
+			);
+			return false;
+		}
+	}
+
+	/**
+	 * Remove the temporary files and folders generated during this request
+	 */
+	public function clean() {
+		$this->cleanFiles($this->current);
+	}
+
+	protected function cleanFiles($files) {
+		foreach ($files as $file) {
+			if (file_exists($file)) {
+				try {
+					\OC_Helper::rmdirr($file);
+				} catch (\UnexpectedValueException $ex) {
+					$this->log->warning(
+						"Error deleting temporary file/folder: {file} - Reason: {error}",
+						array(
+							'file' => $file,
+							'error' => $ex->getMessage()
+						)
+					);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Remove old temporary files and folders that were failed to be cleaned
+	 */
+	public function cleanOld() {
+		$this->cleanFiles($this->getOldFiles());
+	}
+
+	/**
+	 * Get all temporary files and folders generated by oc older than an hour
+	 *
+	 * @return string[]
+	 */
+	protected function getOldFiles() {
+		$cutOfTime = time() - 3600;
+		$files = array();
+		$dh = opendir($this->tmpBaseDir);
+		while (($file = readdir($dh)) !== false) {
+			if (substr($file, 0, 7) === 'oc_tmp_') {
+				$path = $this->tmpBaseDir . '/' . $file;
+				$mtime = filemtime($path);
+				if ($mtime < $cutOfTime) {
+					$files[] = $path;
+				}
+			}
+		}
+		return $files;
+	}
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 55c2c89b710..c1592551978 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -264,4 +264,11 @@ interface IServerContainer {
 	 * @return \OCP\Diagnostics\IQueryLogger
 	 */
 	function getQueryLogger();
+
+	/**
+	 * Get the manager for temporary files and folders
+	 *
+	 * @return \OCP\ITempManager
+	 */
+	function getTempManager();
 }
diff --git a/lib/public/itempmanager.php b/lib/public/itempmanager.php
new file mode 100644
index 00000000000..ebd94978038
--- /dev/null
+++ b/lib/public/itempmanager.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * Copyright (c) 2014 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 OCP;
+
+interface ITempManager {
+	/**
+	 * Create a temporary file and return the path
+	 *
+	 * @param string $postFix
+	 * @return string
+	 */
+	public function getTemporaryFile($postFix = '');
+
+	/**
+	 * Create a temporary folder and return the path
+	 *
+	 * @param string $postFix
+	 * @return string
+	 */
+	public function getTemporaryFolder($postFix = '');
+
+	/**
+	 * Remove the temporary files and folders generated during this request
+	 */
+	public function clean();
+
+	/**
+	 * Remove old temporary files and folders that were failed to be cleaned
+	 */
+	public function cleanOld();
+}
diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
new file mode 100644
index 00000000000..f16fbce2c7c
--- /dev/null
+++ b/tests/lib/tempmanager.php
@@ -0,0 +1,143 @@
+<?php
+
+/**
+ * Copyright (c) 2014 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;
+
+use OC\Log;
+
+class NullLogger extends Log {
+	public function __construct($logger = null) {
+		//disable original constructor
+	}
+
+	public function log($level, $message, array $context = array()) {
+		//noop
+	}
+}
+
+class TempManager extends \PHPUnit_Framework_TestCase {
+	protected $baseDir;
+
+	public function setUp() {
+		$this->baseDir = get_temp_dir() . '/oc_tmp_test';
+		if (!is_dir($this->baseDir)) {
+			mkdir($this->baseDir);
+		}
+	}
+
+	public function tearDown() {
+		\OC_Helper::rmdirr($this->baseDir);
+	}
+
+	/**
+	 * @param \Psr\Log\LoggerInterface $logger
+	 * @return \OC\TempManager
+	 */
+	protected function getManager($logger = null) {
+		if (!$logger) {
+			$logger = new NullLogger();
+		}
+		return new \OC\TempManager($this->baseDir, $logger);
+	}
+
+	public function testGetFile() {
+		$manager = $this->getManager();
+		$file = $manager->getTemporaryFile('.txt');
+		$this->assertStringEndsWith('.txt', $file);
+		$this->assertTrue(is_file($file));
+		$this->assertTrue(is_writable($file));
+
+		file_put_contents($file, 'bar');
+		$this->assertEquals('bar', file_get_contents($file));
+	}
+
+	public function testGetFolder() {
+		$manager = $this->getManager();
+		$folder = $manager->getTemporaryFolder();
+		$this->assertStringEndsWith('/', $folder);
+		$this->assertTrue(is_dir($folder));
+		$this->assertTrue(is_writable($folder));
+
+		file_put_contents($folder . 'foo.txt', 'bar');
+		$this->assertEquals('bar', file_get_contents($folder . 'foo.txt'));
+	}
+
+	public function testCleanFiles() {
+		$manager = $this->getManager();
+		$file1 = $manager->getTemporaryFile('.txt');
+		$file2 = $manager->getTemporaryFile('.txt');
+		$this->assertTrue(file_exists($file1));
+		$this->assertTrue(file_exists($file2));
+
+		$manager->clean();
+
+		$this->assertFalse(file_exists($file1));
+		$this->assertFalse(file_exists($file2));
+	}
+
+	public function testCleanFolder() {
+		$manager = $this->getManager();
+		$folder1 = $manager->getTemporaryFolder();
+		$folder2 = $manager->getTemporaryFolder();
+		touch($folder1 . 'foo.txt');
+		touch($folder1 . 'bar.txt');
+		$this->assertTrue(file_exists($folder1));
+		$this->assertTrue(file_exists($folder2));
+		$this->assertTrue(file_exists($folder1 . 'foo.txt'));
+		$this->assertTrue(file_exists($folder1 . 'bar.txt'));
+
+		$manager->clean();
+
+		$this->assertFalse(file_exists($folder1));
+		$this->assertFalse(file_exists($folder2));
+		$this->assertFalse(file_exists($folder1 . 'foo.txt'));
+		$this->assertFalse(file_exists($folder1 . 'bar.txt'));
+	}
+
+	public function testCleanOld() {
+		$manager = $this->getManager();
+		$oldFile = $manager->getTemporaryFile('.txt');
+		$newFile = $manager->getTemporaryFile('.txt');
+		$folder = $manager->getTemporaryFolder();
+		$nonOcFile = $this->baseDir . '/foo.txt';
+		file_put_contents($nonOcFile, 'bar');
+
+		$past = time() - 2 * 3600;
+		touch($oldFile, $past);
+		touch($folder, $past);
+		touch($nonOcFile, $past);
+
+		$manager2 = $this->getManager();
+		$manager2->cleanOld();
+		$this->assertFalse(file_exists($oldFile));
+		$this->assertFalse(file_exists($folder));
+		$this->assertTrue(file_exists($nonOcFile));
+		$this->assertTrue(file_exists($newFile));
+	}
+
+	public function testLogCantCreateFile() {
+		$logger = $this->getMock('\Test\NullLogger');
+		$manager = $this->getManager($logger);
+		chmod($this->baseDir, 0500);
+		$logger->expects($this->once())
+			->method('warning')
+			->with($this->stringContains('Can not create a temporary file in directory'));
+		$this->assertFalse($manager->getTemporaryFile('.txt'));
+	}
+
+	public function testLogCantCreateFolder() {
+		$logger = $this->getMock('\Test\NullLogger');
+		$manager = $this->getManager($logger);
+		chmod($this->baseDir, 0500);
+		$logger->expects($this->once())
+			->method('warning')
+			->with($this->stringContains('Can not create a temporary folder in directory'));
+		$this->assertFalse($manager->getTemporaryFolder());
+	}
+}
-- 
GitLab


From 0b9629778393436a7858ccf8211ef44c1e446f61 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 22 Oct 2014 17:36:52 +0200
Subject: [PATCH 213/616] Use the TempManager to handle temporary files

---
 cron.php               |   3 +-
 lib/base.php           |   3 +-
 lib/private/helper.php | 121 ++---------------------------------------
 3 files changed, 7 insertions(+), 120 deletions(-)

diff --git a/cron.php b/cron.php
index 8344e551680..bcbb298de55 100644
--- a/cron.php
+++ b/cron.php
@@ -71,8 +71,7 @@ try {
 	// Handle unexpected errors
 	register_shutdown_function('handleUnexpectedShutdown');
 
-	// Delete temp folder
-	OC_Helper::cleanTmpNoClean();
+	\OC::$server->getTempManager()->cleanOld();
 
 	// Exit if background jobs are disabled!
 	$appmode = OC_BackgroundJob::getExecutionType();
diff --git a/lib/base.php b/lib/base.php
index 23f0e594510..4af5b515006 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -577,7 +577,8 @@ class OC {
 		self::registerLocalAddressBook();
 
 		//make sure temporary files are cleaned up
-		register_shutdown_function(array('OC_Helper', 'cleanTmp'));
+		$tmpManager = \OC::$server->getTempManager();
+		register_shutdown_function(array($tmpManager, 'clean'));
 
 		if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) {
 			if (\OC::$server->getAppConfig()->getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
diff --git a/lib/private/helper.php b/lib/private/helper.php
index 628af14fa08..5b1d31bfc59 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -25,7 +25,6 @@
  * Collection of useful functions
  */
 class OC_Helper {
-	private static $tmpFiles = array();
 	private static $mimetypeIcons = array();
 	private static $mimetypeDetector;
 	private static $templateManager;
@@ -593,136 +592,24 @@ class OC_Helper {
 	 *
 	 * @param string $postfix
 	 * @return string
+	 * @deprecated Use the TempManager instead
 	 *
 	 * temporary files are automatically cleaned up after the script is finished
 	 */
 	public static function tmpFile($postfix = '') {
-		$file = get_temp_dir() . '/' . md5(time() . rand()) . $postfix;
-		$fh = fopen($file, 'w');
-		if ($fh!==false){
-			fclose($fh);
-			self::$tmpFiles[] = $file;
-		} else {
-			OC_Log::write(
-				'OC_Helper',
-				sprintf(
-					'Can not create a temporary file in directory %s. Check it exists and has correct permissions',
-					get_temp_dir()
-				),
-				OC_Log::WARN
-			);
-			$file = false;
-		}
-		return $file;
-	}
-
-	/**
-	 * move a file to oc-noclean temp dir
-	 *
-	 * @param string $filename
-	 * @return mixed
-	 *
-	 */
-	public static function moveToNoClean($filename = '') {
-		if ($filename == '') {
-			return false;
-		}
-		$tmpDirNoClean = get_temp_dir() . '/oc-noclean/';
-		if (!file_exists($tmpDirNoClean) || !is_dir($tmpDirNoClean)) {
-			if (file_exists($tmpDirNoClean)) {
-				unlink($tmpDirNoClean);
-			}
-			mkdir($tmpDirNoClean);
-		}
-		$newname = $tmpDirNoClean . basename($filename);
-		if (rename($filename, $newname)) {
-			return $newname;
-		} else {
-			return false;
-		}
+		return \OC::$server->getTempManager()->getTemporaryFile($postfix);
 	}
 
 	/**
 	 * create a temporary folder with an unique filename
 	 *
 	 * @return string
+	 * @deprecated Use the TempManager instead
 	 *
 	 * temporary files are automatically cleaned up after the script is finished
 	 */
 	public static function tmpFolder() {
-		$path = get_temp_dir() . DIRECTORY_SEPARATOR . md5(time() . rand());
-		mkdir($path);
-		self::$tmpFiles[] = $path;
-		return $path . DIRECTORY_SEPARATOR;
-	}
-
-	/**
-	 * remove all files created by self::tmpFile
-	 */
-	public static function cleanTmp() {
-		$leftoversFile = get_temp_dir() . '/oc-not-deleted';
-		if (file_exists($leftoversFile)) {
-			$leftovers = file($leftoversFile);
-			foreach ($leftovers as $file) {
-				try {
-					self::rmdirr($file);
-				} catch (UnexpectedValueException $ex) {
-					// not really much we can do here anymore
-					if (!is_null(\OC::$server)) {
-						$message = $ex->getMessage();
-						\OC::$server->getLogger()->error("Error deleting file/folder: $file - Reason: $message",
-							array('app' => 'core'));
-					}
-				}
-			}
-			unlink($leftoversFile);
-		}
-
-		foreach (self::$tmpFiles as $file) {
-			if (file_exists($file)) {
-				try {
-					if (!self::rmdirr($file)) {
-						file_put_contents($leftoversFile, $file . "\n", FILE_APPEND);
-					}
-				} catch (UnexpectedValueException $ex) {
-					// not really much we can do here anymore
-					if (!is_null(\OC::$server)) {
-						$message = $ex->getMessage();
-						\OC::$server->getLogger()->error("Error deleting file/folder: $file - Reason: $message",
-							array('app' => 'core'));
-					}
-				}
-			}
-		}
-	}
-
-	/**
-	 * remove all files in PHP /oc-noclean temp dir
-	 */
-	public static function cleanTmpNoClean() {
-		$tmpDirNoCleanName=get_temp_dir() . '/oc-noclean/';
-		if(file_exists($tmpDirNoCleanName) && is_dir($tmpDirNoCleanName)) {
-			$files=scandir($tmpDirNoCleanName);
-			foreach($files as $file) {
-				$fileName = $tmpDirNoCleanName . $file;
-				if (!\OC\Files\Filesystem::isIgnoredDir($file) && filemtime($fileName) + 600 < time()) {
-					unlink($fileName);
-				}
-			}
-			// if oc-noclean is empty delete it
-			$isTmpDirNoCleanEmpty = true;
-			$tmpDirNoClean = opendir($tmpDirNoCleanName);
-			if(is_resource($tmpDirNoClean)) {
-				while (false !== ($file = readdir($tmpDirNoClean))) {
-					if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
-						$isTmpDirNoCleanEmpty = false;
-					}
-				}
-			}
-			if ($isTmpDirNoCleanEmpty) {
-				rmdir($tmpDirNoCleanName);
-			}
-		}
+		return \OC::$server->getTempManager()->getTemporaryFolder();
 	}
 
 	/**
-- 
GitLab


From d060180140923ac054b252f0cbd821063a53f5b7 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 23 Oct 2014 23:27:15 +0200
Subject: [PATCH 214/616] Use function outside of loop

Otherwise the function is executed n times which is a lot of overhead
---
 apps/files_external/lib/config.php                         | 7 ++++---
 apps/user_ldap/lib/wizard.php                              | 3 ++-
 apps/user_ldap/settings.php                                | 4 ++--
 .../appframework/middleware/middlewaredispatcher.php       | 5 +++--
 lib/private/arrayparser.php                                | 4 +++-
 lib/private/db/statementwrapper.php                        | 3 ++-
 lib/private/ocsclient.php                                  | 5 +++--
 lib/private/vobject.php                                    | 3 ++-
 8 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 92bb891ca21..5378137e1d3 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -716,10 +716,11 @@ class OC_Mount_Config {
 				}
 			}
 
-			if (count($dependencyGroup) > 0) {
+			$dependencyGroupCount = count($dependencyGroup);
+			if ($dependencyGroupCount > 0) {
 				$backends = '';
-				for ($i = 0; $i < count($dependencyGroup); $i++) {
-					if ($i > 0 && $i === count($dependencyGroup) - 1) {
+				for ($i = 0; $i < $dependencyGroupCount; $i++) {
+					if ($i > 0 && $i === $dependencyGroupCount - 1) {
 						$backends .= $l->t(' and ');
 					} elseif ($i > 0) {
 						$backends .= ', ';
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index e2a85ea5eb9..1d7701440e9 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -685,7 +685,8 @@ class Wizard extends LDAPUtility {
 			$this->ldap->getDN($cr, $er);
 			$attrs = $this->ldap->getAttributes($cr, $er);
 			$result = array();
-			for($i = 0; $i < count($possibleAttrs); $i++) {
+			$possibleAttrsCount = count($possibleAttrs);
+			for($i = 0; $i < $possibleAttrsCount; $i++) {
 				if(isset($attrs[$possibleAttrs[$i]])) {
 					$result[$possibleAttrs[$i]] = $attrs[$possibleAttrs[$i]]['count'];
 				}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 1e588b1cd85..ca61a53b196 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -54,8 +54,8 @@ $wizTabs[] = array('tpl' => 'part.wizard-server',      'cap' => $l->t('Server'))
 $wizTabs[] = array('tpl' => 'part.wizard-userfilter',  'cap' => $l->t('User Filter'));
 $wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => $l->t('Login Filter'));
 $wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => $l->t('Group Filter'));
-
-for($i = 0; $i < count($wizTabs); $i++) {
+$wizTabsCount = count($wizTabs);
+for($i = 0; $i < $wizTabsCount; $i++) {
 	$tab = new OCP\Template('user_ldap', $wizTabs[$i]['tpl']);
 	if($i === 0) {
 		$tab->assign('serverConfigurationPrefixes', $prefixes);
diff --git a/lib/private/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php
index dcb63a8e552..41eef4aedb9 100644
--- a/lib/private/appframework/middleware/middlewaredispatcher.php
+++ b/lib/private/appframework/middleware/middlewaredispatcher.php
@@ -82,8 +82,9 @@ class MiddlewareDispatcher {
 	 */
 	public function beforeController(Controller $controller, $methodName){
 		// we need to count so that we know which middlewares we have to ask in
-		// case theres an exception
-		for($i=0; $i<count($this->middlewares); $i++){
+		// case there is an exception
+		$middlewareCount = count($this->middlewares);
+		for($i = 0; $i < $middlewareCount; $i++){
 			$this->middlewareCounter++;
 			$middleware = $this->middlewares[$i];
 			$middleware->beforeController($controller, $methodName);
diff --git a/lib/private/arrayparser.php b/lib/private/arrayparser.php
index a5e1f6653fc..dab1817c2ed 100644
--- a/lib/private/arrayparser.php
+++ b/lib/private/arrayparser.php
@@ -182,7 +182,9 @@ class ArrayParser {
 		if (substr($body, -1, 1) !== ',') {
 			$body .= ',';
 		}
-		for ($i = 0; $i < strlen($body); $i++) {
+
+		$bodyLength = strlen($body);
+		for ($i = 0; $i < $bodyLength; $i++) {
 			$char = substr($body, $i, 1);
 			if ($char === '\\') {
 				if ($escaped) {
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index 93fabc147ca..ad63de98e93 100644
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -89,9 +89,10 @@ class OC_DB_StatementWrapper {
 			$cArg = 0;
 
 			$inSubstring = false;
+			$queryLength = strlen($query);
 
 			// Create new query
-			for ($i = 0; $i < strlen ($query); $i++) {
+			for ($i = 0; $i < $queryLength; $i++) {
 				if ($inSubstring == false) {
 					// Defines when we should start inserting values
 					if (substr ($query, $i, 9) == 'SUBSTRING') {
diff --git a/lib/private/ocsclient.php b/lib/private/ocsclient.php
index 8ceb43f4c1f..351027d8018 100644
--- a/lib/private/ocsclient.php
+++ b/lib/private/ocsclient.php
@@ -129,8 +129,9 @@ class OC_OCSClient{
 		$data = simplexml_load_string($xml);
 		libxml_disable_entity_loader($loadEntities);
 
-		$tmp=$data->data->content;
-		for($i = 0; $i < count($tmp); $i++) {
+		$tmp = $data->data->content;
+		$tmpCount = count($tmp);
+		for($i = 0; $i < $tmpCount; $i++) {
 			$app=array();
 			$app['id']=(string)$tmp[$i]->id;
 			$app['name']=(string)$tmp[$i]->name;
diff --git a/lib/private/vobject.php b/lib/private/vobject.php
index 94e3470ff08..9d121c17d79 100644
--- a/lib/private/vobject.php
+++ b/lib/private/vobject.php
@@ -72,7 +72,8 @@ class OC_VObject{
 	 */
 	public static function unescapeSemicolons($value) {
 		$array = explode(';', $value);
-		for($i=0;$i<count($array);$i++) {
+		$arrayCount = count($array);
+		for($i = 0; $i < $arrayCount; $i++) {
 			if(substr($array[$i], -2, 2)=="\\\\") {
 				if(isset($array[$i+1])) {
 					$array[$i] = substr($array[$i], 0, count($array[$i])-2).';'.$array[$i+1];
-- 
GitLab


From 0a3f57f832213d5b4f6678581d7c2bc8d6832542 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 2 Oct 2014 17:37:33 +0200
Subject: [PATCH 215/616] Pass the cached data to the filesystem watcher

---
 lib/private/files/cache/watcher.php | 11 +++++++----
 lib/private/files/view.php          | 26 ++++++++++++++------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/lib/private/files/cache/watcher.php b/lib/private/files/cache/watcher.php
index 5a4f53fb73d..f4572895b09 100644
--- a/lib/private/files/cache/watcher.php
+++ b/lib/private/files/cache/watcher.php
@@ -55,11 +55,14 @@ class Watcher {
 	 * check $path for updates
 	 *
 	 * @param string $path
-	 * @return boolean|array true if path was updated, otherwise the cached data is returned
+	 * @param array $cachedEntry
+	 * @return boolean true if path was updated
 	 */
-	public function checkUpdate($path) {
+	public function checkUpdate($path, $cachedEntry = null) {
 		if ($this->watchPolicy === self::CHECK_ALWAYS or ($this->watchPolicy === self::CHECK_ONCE and array_search($path, $this->checkedPaths) === false)) {
-			$cachedEntry = $this->cache->get($path);
+			if (is_null($cachedEntry)) {
+				$cachedEntry = $this->cache->get($path);
+			}
 			$this->checkedPaths[] = $path;
 			if ($this->storage->hasUpdated($path, $cachedEntry['storage_mtime'])) {
 				if ($this->storage->is_dir($path)) {
@@ -73,7 +76,7 @@ class Watcher {
 				$this->cache->correctFolderSize($path);
 				return true;
 			}
-			return $cachedEntry;
+			return false;
 		} else {
 			return false;
 		}
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 3d3406af94e..a9577b193c7 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -313,7 +313,7 @@ class View {
 		if (!$result) {
 			// If create file fails because of permissions on external storage like SMB folders,
 			// check file exists and return false if not.
-			if(!$this->file_exists($path)){
+			if (!$this->file_exists($path)) {
 				return false;
 			}
 			if (is_null($mtime)) {
@@ -891,22 +891,23 @@ class View {
 		if ($storage) {
 			$cache = $storage->getCache($internalPath);
 
-			if (!$cache->inCache($internalPath)) {
+			$data = $cache->get($internalPath);
+			$watcher = $storage->getWatcher($internalPath);
+
+			// if the file is not in the cache or needs to be updated, trigger the scanner and reload the data
+			if (!$data) {
 				if (!$storage->file_exists($internalPath)) {
 					return false;
 				}
 				$scanner = $storage->getScanner($internalPath);
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
-			} else {
-				$watcher = $storage->getWatcher($internalPath);
-				$data = $watcher->checkUpdate($internalPath);
-			}
-
-			if (!is_array($data)) {
+				$data = $cache->get($internalPath);
+			} else if ($watcher->checkUpdate($internalPath, $data)) {
 				$data = $cache->get($internalPath);
 			}
 
 			if ($data and isset($data['fileid'])) {
+				// upgrades from oc6 or lower might not have the permissions set in the file cache
 				if ($data['permissions'] === 0) {
 					$data['permissions'] = $storage->getPermissions($data['path']);
 					$cache->update($data['fileid'], array('permissions' => $data['permissions']));
@@ -956,8 +957,9 @@ class View {
 		if (!Filesystem::isValidPath($directory)) {
 			return $result;
 		}
-		$path = Filesystem::normalizePath($this->fakeRoot . '/' . $directory);
-		list($storage, $internalPath) = Filesystem::resolvePath($path);
+		$path = $this->getAbsolutePath($directory);
+		/** @var \OC\Files\Storage\Storage $storage */
+		list($storage, $internalPath) = $this->resolvePath($directory);
 		if ($storage) {
 			$cache = $storage->getCache($internalPath);
 			$user = \OC_User::getUser();
@@ -975,7 +977,7 @@ class View {
 			 * @var \OC\Files\FileInfo[] $files
 			 */
 			$files = array();
-			$contents = $cache->getFolderContents($internalPath, $folderId); //TODO: mimetype_filter
+			$contents = $cache->getFolderContentsById($folderId); //TODO: mimetype_filter
 			foreach ($contents as $content) {
 				if ($content['permissions'] === 0) {
 					$content['permissions'] = $storage->getPermissions($content['path']);
@@ -1213,7 +1215,7 @@ class View {
 	 * @return string|null
 	 */
 	public function getPath($id) {
-		$id = (int) $id;
+		$id = (int)$id;
 		$manager = Filesystem::getMountManager();
 		$mounts = $manager->findIn($this->fakeRoot);
 		$mounts[] = $manager->find($this->fakeRoot);
-- 
GitLab


From 6ed9f53fcdba3ec4b3e934f731ea0437329ab9b0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 14 Oct 2014 15:45:10 +0200
Subject: [PATCH 216/616] also update shared watcher

---
 apps/files_sharing/lib/watcher.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/watcher.php b/apps/files_sharing/lib/watcher.php
index 11d3ce1cabd..5357119ab6c 100644
--- a/apps/files_sharing/lib/watcher.php
+++ b/apps/files_sharing/lib/watcher.php
@@ -30,9 +30,11 @@ class Shared_Watcher extends Watcher {
 	 * check $path for updates
 	 *
 	 * @param string $path
+	 * @param array $cachedEntry
+	 * @return boolean true if path was updated
 	 */
-	public function checkUpdate($path) {
-		if (parent::checkUpdate($path) === true) {
+	public function checkUpdate($path, $cachedEntry = null) {
+		if (parent::checkUpdate($path, $cachedEntry) === true) {
 			// since checkUpdate() has already updated the size of the subdirs,
 			// only apply the update to the owner's parent dirs
 
-- 
GitLab


From 4438c7de1d0a66bb2c4eaff3bd718e5c946caa6f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 16 Oct 2014 15:17:12 +0200
Subject: [PATCH 217/616] Fix shared cache getFolderContents

---
 apps/files_sharing/lib/cache.php | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index e4fd85fd2a7..270ed704bbd 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -145,26 +145,23 @@ class Shared_Cache extends Cache {
 	/**
 	 * get the metadata of all files stored in $folder
 	 *
-	 * @param string $folder
+	 * @param string $folderId
 	 * @return array
 	 */
-	public function getFolderContents($folder) {
-
-		if ($folder === false) {
-			$folder = '';
-		}
-
-		$dir = ($folder !== '') ? $folder . '/' : '';
-
-		$cache = $this->getSourceCache($folder);
+	public function getFolderContentsById($folderId) {
+		$cache = $this->getSourceCache('');
 		if ($cache) {
-			$parent = $this->storage->getFile($folder);
-			$sourceFolderContent = $cache->getFolderContents($this->files[$folder]);
-			foreach ($sourceFolderContent as $key => $c) {
-				$sourceFolderContent[$key]['path'] = $dir . $c['name'];
-				$sourceFolderContent[$key]['uid_owner'] = $parent['uid_owner'];
-				$sourceFolderContent[$key]['displayname_owner'] = \OC_User::getDisplayName($parent['uid_owner']);
-				$sourceFolderContent[$key]['permissions'] = $sourceFolderContent[$key]['permissions'] & $this->storage->getPermissions($dir . $c['name']);
+			$owner = $this->storage->getSharedFrom();
+			$parentPath = $this->getPathById($folderId);
+			if ($parentPath !== '') {
+				$parentPath .= '/';
+			}
+			$sourceFolderContent = $cache->getFolderContentsById($folderId);
+			foreach ($sourceFolderContent as &$c) {
+				$c['path'] = ltrim($parentPath . $c['name'], '/');
+				$c['uid_owner'] = $owner;
+				$c['displayname_owner'] = \OC_User::getDisplayName($owner);
+				$c['permissions'] = $c['permissions'] & $this->storage->getPermissions(false);
 			}
 
 			return $sourceFolderContent;
-- 
GitLab


From 16cfca6a5fb3db897246e6ac9ccb7420cf256240 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 16 Oct 2014 15:17:36 +0200
Subject: [PATCH 218/616] Better reuse of cache data for getFolderContents

---
 lib/private/files/view.php | 17 +++++++++++------
 tests/lib/files/view.php   |  5 +++--
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index a9577b193c7..5f5f29ded4f 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -964,15 +964,20 @@ class View {
 			$cache = $storage->getCache($internalPath);
 			$user = \OC_User::getUser();
 
-			if ($cache->getStatus($internalPath) < Cache\Cache::COMPLETE) {
+			$data = $cache->get($internalPath);
+			$watcher = $storage->getWatcher($internalPath);
+			if (!$data or $data['size'] === -1) {
+				if (!$storage->file_exists($internalPath)) {
+					return array();
+				}
 				$scanner = $storage->getScanner($internalPath);
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
-			} else {
-				$watcher = $storage->getWatcher($internalPath);
-				$watcher->checkUpdate($internalPath);
+				$data = $cache->get($internalPath);
+			} else if ($watcher->checkUpdate($internalPath, $data)) {
+				$data = $cache->get($internalPath);
 			}
 
-			$folderId = $cache->getId($internalPath);
+			$folderId = $data['fileid'];
 			/**
 			 * @var \OC\Files\FileInfo[] $files
 			 */
@@ -1034,7 +1039,7 @@ class View {
 									break;
 								}
 							}
-							$rootEntry['path'] = substr($path . '/' . $rootEntry['name'], strlen($user) + 2); // full path without /$user/
+							$rootEntry['path'] = substr(Filesystem::normalizePath($path . '/' . $rootEntry['name']), strlen($user) + 2); // full path without /$user/
 
 							// if sharing was disabled for the user we remove the share permissions
 							if (\OCP\Util::isSharingDisabledForUser()) {
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 8d56ecd9003..5f030f29fa7 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -177,8 +177,9 @@ class View extends \PHPUnit_Framework_TestCase {
 
 	function testCacheIncompleteFolder() {
 		$storage1 = $this->getTestStorage(false);
-		\OC\Files\Filesystem::mount($storage1, array(), '/');
-		$rootView = new \OC\Files\View('');
+		\OC\Files\Filesystem::clearMounts();
+		\OC\Files\Filesystem::mount($storage1, array(), '/incomplete');
+		$rootView = new \OC\Files\View('/incomplete');
 
 		$entries = $rootView->getDirectoryContent('/');
 		$this->assertEquals(3, count($entries));
-- 
GitLab


From b3a04840b54464457298807d6609d525d68d8953 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 24 Oct 2014 14:13:40 +0200
Subject: [PATCH 219/616] Add type hinting to functions

It's only reasonable to have proper type hinting here which might even help us to catch bugs.
---
 apps/files/lib/helper.php            | 11 +++--
 apps/files_encryption/lib/helper.php | 10 ++--
 apps/files_external/lib/config.php   |  2 +-
 apps/files_trashbin/lib/trashbin.php | 35 ++++++++++----
 lib/private/db/mdb2schemamanager.php |  2 +-
 lib/private/files.php                |  2 +-
 lib/private/files/mount/manager.php  |  2 +-
 lib/private/preview.php              |  2 +-
 lib/private/server.php               | 68 +++++++++-------------------
 lib/private/util.php                 |  4 +-
 10 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index e4bfcb4e9ee..aa5a2f8c68a 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -8,6 +8,8 @@
 
 namespace OCA\Files;
 
+use OCP\Files\FileInfo;
+
 /**
  * Helper class for manipulating file information
  */
@@ -58,7 +60,7 @@ class Helper
 	 * @param \OCP\Files\FileInfo $b file
 	 * @return int -1 if $a must come before $b, 1 otherwise
 	 */
-	public static function compareFileNames($a, $b) {
+	public static function compareFileNames(FileInfo $a, FileInfo $b) {
 		$aType = $a->getType();
 		$bType = $b->getType();
 		if ($aType === 'dir' and $bType !== 'dir') {
@@ -77,7 +79,7 @@ class Helper
 	 * @param \OCP\Files\FileInfo $b file
 	 * @return int -1 if $a must come before $b, 1 otherwise
 	 */
-	public static function compareTimestamp($a, $b) {
+	public static function compareTimestamp(FileInfo $a, FileInfo $b) {
 		$aTime = $a->getMTime();
 		$bTime = $b->getMTime();
 		return $aTime - $bTime;
@@ -90,7 +92,7 @@ class Helper
 	 * @param \OCP\Files\FileInfo $b file
 	 * @return int -1 if $a must come before $b, 1 otherwise
 	 */
-	public static function compareSize($a, $b) {
+	public static function compareSize(FileInfo $a, FileInfo $b) {
 		$aSize = $a->getSize();
 		$bSize = $b->getSize();
 		return ($aSize < $bSize) ? -1 : 1;
@@ -102,7 +104,7 @@ class Helper
 	 * @param \OCP\Files\FileInfo $i
 	 * @return array formatted file info
 	 */
-	public static function formatFileInfo($i) {
+	public static function formatFileInfo(FileInfo $i) {
 		$entry = array();
 
 		$entry['id'] = $i['fileid'];
@@ -147,6 +149,7 @@ class Helper
 	/**
 	 * Format file info for JSON
 	 * @param \OCP\Files\FileInfo[] $fileInfos file infos
+	 * @return array
 	 */
 	public static function formatFileInfos($fileInfos) {
 		$files = array();
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 6f4eb4aaf3b..53c380ab2b3 100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -89,7 +89,7 @@ class Helper {
 	 * @param string $password
 	 * @return bool
 	 */
-	public static function setupUser($util, $password) {
+	public static function setupUser(Util $util, $password) {
 		// Check files_encryption infrastructure is ready for action
 		if (!$util->ready()) {
 
@@ -333,7 +333,7 @@ class Helper {
 	 * @param string $path
 	 * @param \OC\Files\View $view
 	 */
-	public static function mkdirr($path, $view) {
+	public static function mkdirr($path, \OC\Files\View $view) {
 		$dirname = \OC\Files\Filesystem::normalizePath(dirname($path));
 		$dirParts = explode('/', $dirname);
 		$dir = "";
@@ -348,8 +348,10 @@ class Helper {
 	/**
 	 * redirect to a error page
 	 * @param Session $session
+	 * @param int|null $errorCode
+	 * @throws \Exception
 	 */
-	public static function redirectToErrorPage($session, $errorCode = null) {
+	public static function redirectToErrorPage(Session $session, $errorCode = null) {
 
 		if ($errorCode === null) {
 			$init = $session->getInitialized();
@@ -439,7 +441,7 @@ class Helper {
 	 * @param \OC\Files\View $rootView root view, relative to data/
 	 * @return array list of share key files, path relative to data/$user
 	 */
-	public static function findShareKeys($filePath, $shareKeyPath, $rootView) {
+	public static function findShareKeys($filePath, $shareKeyPath,  \OC\Files\View $rootView) {
 		$result = array();
 
 		$user = \OCP\User::getUser();
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 5378137e1d3..fa44e446d96 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -740,7 +740,7 @@ class OC_Mount_Config {
 	 * @param string $backend
 	 * @return string
 	 */
-	private static function getSingleDependencyMessage($l, $module, $backend) {
+	private static function getSingleDependencyMessage(OC_L10N $l, $module, $backend) {
 		switch (strtolower($module)) {
 			case 'curl':
 				return $l->t('<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.', $backend);
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 63962296416..3d90791108e 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -434,10 +434,10 @@ class Trashbin {
 	 * @param string $filename name of file once it was deleted
 	 * @param string $uniqueFilename new file name to restore the file without overwriting existing files
 	 * @param string $location location if file
-	 * @param int $timestamp deleteion time
-	 *
+	 * @param int $timestamp deletion time
+	 * @return bool
 	 */
-	private static function restoreVersions($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
+	private static function restoreVersions(\OC\Files\View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
 
 		if (\OCP\App::isEnabled('files_versions')) {
 			// disable proxy to prevent recursive calls
@@ -488,10 +488,10 @@ class Trashbin {
 	 * @param string $filename name of file
 	 * @param string $uniqueFilename new file name to restore the file without overwriting existing files
 	 * @param string $location location of file
-	 * @param int $timestamp deleteion time
-	 *
+	 * @param int $timestamp deletion time
+	 * @return bool
 	 */
-	private static function restoreEncryptionKeys($view, $file, $filename, $uniqueFilename, $location, $timestamp) {
+	private static function restoreEncryptionKeys(\OC\Files\View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
 		// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$user = \OCP\User::getUser();
@@ -639,8 +639,12 @@ class Trashbin {
 
 	/**
 	 * @param \OC\Files\View $view
+	 * @param $file
+	 * @param $filename
+	 * @param $timestamp
+	 * @return int
 	 */
-	private static function deleteVersions($view, $file, $filename, $timestamp) {
+	private static function deleteVersions(\OC\Files\View $view, $file, $filename, $timestamp) {
 		$size = 0;
 		if (\OCP\App::isEnabled('files_versions')) {
 			$user = \OCP\User::getUser();
@@ -664,8 +668,12 @@ class Trashbin {
 
 	/**
 	 * @param \OC\Files\View $view
+	 * @param $file
+	 * @param $filename
+	 * @param $timestamp
+	 * @return int
 	 */
-	private static function deleteEncryptionKeys($view, $file, $filename, $timestamp) {
+	private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp) {
 		$size = 0;
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$user = \OCP\User::getUser();
@@ -879,8 +887,10 @@ class Trashbin {
 	 * @param string $source source path, relative to the users files directory
 	 * @param string $destination destination path relative to the users root directoy
 	 * @param \OC\Files\View $view file view for the users root directory
+	 * @return int
+	 * @throws Exceptions\CopyRecursiveException
 	 */
-	private static function copy_recursive($source, $destination, $view) {
+	private static function copy_recursive($source, $destination, \OC\Files\View $view) {
 		$size = 0;
 		if ($view->is_dir($source)) {
 			$view->mkdir($destination);
@@ -955,7 +965,7 @@ class Trashbin {
 	 * @param \OC\Files\View $view filesystem view relative to users root directory
 	 * @return string with unique extension
 	 */
-	private static function getUniqueFilename($location, $filename, $view) {
+	private static function getUniqueFilename($location, $filename, \OC\Files\View $view) {
 		$ext = pathinfo($filename, PATHINFO_EXTENSION);
 		$name = pathinfo($filename, PATHINFO_FILENAME);
 		$l = \OC::$server->getL10N('files_trashbin');
@@ -1036,6 +1046,7 @@ class Trashbin {
 	/**
 	 * check if trash bin is empty for a given user
 	 * @param string $user
+	 * @return bool
 	 */
 	public static function isEmpty($user) {
 
@@ -1050,6 +1061,10 @@ class Trashbin {
 		return true;
 	}
 
+	/**
+	 * @param $path
+	 * @return string
+	 */
 	public static function preview_icon($path) {
 		return \OC_Helper::linkToRoute('core_ajax_trashbin_preview', array('x' => 36, 'y' => 36, 'file' => $path));
 	}
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index 3c367f144db..1f2dbbe70d1 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -147,7 +147,7 @@ class MDB2SchemaManager {
 	 * @param \Doctrine\DBAL\Schema\Schema $schema
 	 * @return bool
 	 */
-	private function executeSchemaChange($schema) {
+	private function executeSchemaChange(\Doctrine\DBAL\Schema\Schema $schema) {
 		$this->conn->beginTransaction();
 		foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
 			$this->conn->query($sql);
diff --git a/lib/private/files.php b/lib/private/files.php
index a983f6f32f5..571d3215caa 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -195,7 +195,7 @@ class OC_Files {
 	 * @param ZipStreamer $zip
 	 * @param string $internalDir
 	 */
-	public static function zipAddDir($dir, $zip, $internalDir='') {
+	public static function zipAddDir($dir, ZipStreamer $zip, $internalDir='') {
 		$dirname=basename($dir);
 		$rootDir = $internalDir.$dirname;
 		if (!empty($rootDir)) {
diff --git a/lib/private/files/mount/manager.php b/lib/private/files/mount/manager.php
index e5180cfe173..0ccf42941de 100644
--- a/lib/private/files/mount/manager.php
+++ b/lib/private/files/mount/manager.php
@@ -19,7 +19,7 @@ class Manager {
 	/**
 	 * @param Mount $mount
 	 */
-	public function addMount($mount) {
+	public function addMount(Mount $mount) {
 		$this->mounts[$mount->getMountPoint()] = $mount;
 	}
 
diff --git a/lib/private/preview.php b/lib/private/preview.php
index f8b19f11cb0..dbbe173bf80 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -779,7 +779,7 @@ class Preview {
 	 * @param \OC\Files\FileInfo $file
 	 * @return bool
 	 */
-	public static function isAvailable($file) {
+	public static function isAvailable(\OC\Files\FileInfo $file) {
 		if (!\OC_Config::getValue('enable_previews', true)) {
 			return false;
 		}
diff --git a/lib/private/server.php b/lib/private/server.php
index b0d63af1554..ac0eb7b4cf9 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -72,15 +72,15 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('PreviewManager', function ($c) {
 			return new PreviewManager();
 		});
-		$this->registerService('TagMapper', function($c) {
+		$this->registerService('TagMapper', function(Server $c) {
 			return new TagMapper($c->getDb());
 		});
-		$this->registerService('TagManager', function ($c) {
+		$this->registerService('TagManager', function (Server $c) {
 			$tagMapper = $c->query('TagMapper');
 			$user = \OC_User::getUser();
 			return new TagManager($tagMapper, $user);
 		});
-		$this->registerService('RootFolder', function ($c) {
+		$this->registerService('RootFolder', function (Server $c) {
 			// TODO: get user and user manager from container as well
 			$user = \OC_User::getUser();
 			/** @var $c SimpleContainer */
@@ -90,28 +90,16 @@ class Server extends SimpleContainer implements IServerContainer {
 			$view = new View();
 			return new Root($manager, $view, $user);
 		});
-		$this->registerService('UserManager', function ($c) {
-			/**
-			 * @var SimpleContainer $c
-			 * @var \OC\AllConfig $config
-			 */
-			$config = $c->query('AllConfig');
+		$this->registerService('UserManager', function (Server $c) {
+			$config = $c->getConfig();
 			return new \OC\User\Manager($config);
 		});
-		$this->registerService('GroupManager', function ($c) {
-			/**
-			 * @var SimpleContainer $c
-			 * @var \OC\User\Manager $userManager
-			 */
-			$userManager = $c->query('UserManager');
+		$this->registerService('GroupManager', function (Server $c) {
+			$userManager = $c->getUserManager();
 			return new \OC\Group\Manager($userManager);
 		});
-		$this->registerService('UserSession', function ($c) {
-			/**
-			 * @var SimpleContainer $c
-			 * @var \OC\User\Manager $manager
-			 */
-			$manager = $c->query('UserManager');
+		$this->registerService('UserSession', function (Server $c) {
+			$manager = $c->getUserManager();
 			$userSession = new \OC\User\Session($manager, new \OC\Session\Memory(''));
 			$userSession->listen('\OC\User', 'preCreateUser', function ($uid, $password) {
 				\OC_Hook::emit('OC_User', 'pre_createUser', array('run' => true, 'uid' => $uid, 'password' => $password));
@@ -160,9 +148,8 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('L10NFactory', function ($c) {
 			return new \OC\L10N\Factory();
 		});
-		$this->registerService('URLGenerator', function ($c) {
-			/** @var $c SimpleContainer */
-			$config = $c->query('AllConfig');
+		$this->registerService('URLGenerator', function (Server $c) {
+			$config = $c->getConfig();
 			return new \OC\URLGenerator($config);
 		});
 		$this->registerService('AppHelper', function ($c) {
@@ -181,7 +168,7 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('AvatarManager', function ($c) {
 			return new AvatarManager();
 		});
-		$this->registerService('Logger', function ($c) {
+		$this->registerService('Logger', function (Server $c) {
 			/** @var $c SimpleContainer */
 			$logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud');
 			$logger = 'OC_Log_' . ucfirst($logClass);
@@ -189,17 +176,11 @@ class Server extends SimpleContainer implements IServerContainer {
 
 			return new Log($logger);
 		});
-		$this->registerService('JobList', function ($c) {
-			/**
-			 * @var Server $c
-			 */
+		$this->registerService('JobList', function (Server $c) {
 			$config = $c->getConfig();
 			return new \OC\BackgroundJob\JobList($c->getDatabaseConnection(), $config);
 		});
-		$this->registerService('Router', function ($c) {
-			/**
-			 * @var Server $c
-			 */
+		$this->registerService('Router', function (Server $c) {
 			$cacheFactory = $c->getMemCacheFactory();
 			if ($cacheFactory->isAvailable()) {
 				$router = new \OC\Route\CachingRouter($cacheFactory->create('route'));
@@ -214,13 +195,10 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('SecureRandom', function ($c) {
 			return new SecureRandom();
 		});
-		$this->registerService('Crypto', function ($c) {
-			return new Crypto(\OC::$server->getConfig(), \OC::$server->getSecureRandom());
+		$this->registerService('Crypto', function (Server $c) {
+			return new Crypto($c->getConfig(), $c->getSecureRandom());
 		});
-		$this->registerService('DatabaseConnection', function ($c) {
-			/**
-			 * @var Server $c
-			 */
+		$this->registerService('DatabaseConnection', function (Server $c) {
 			$factory = new \OC\DB\ConnectionFactory();
 			$type = $c->getConfig()->getSystemValue('dbtype', 'sqlite');
 			if (!$factory->isValidType($type)) {
@@ -231,18 +209,14 @@ class Server extends SimpleContainer implements IServerContainer {
 			$connection->getConfiguration()->setSQLLogger($c->getQueryLogger());
 			return $connection;
 		});
-		$this->registerService('Db', function ($c) {
-			/**
-			 * @var Server $c
-			 */
+		$this->registerService('Db', function (Server $c) {
 			return new Db($c->getDatabaseConnection());
 		});
-		$this->registerService('HTTPHelper', function (SimpleContainer $c) {
-			$config = $c->query('AllConfig');
+		$this->registerService('HTTPHelper', function (Server $c) {
+			$config = $c->getConfig();
 			return new HTTPHelper($config);
 		});
-		$this->registerService('EventLogger', function ($c) {
-			/** @var Server $c */
+		$this->registerService('EventLogger', function (Server $c) {
 			if (defined('DEBUG') and DEBUG) {
 				return new EventLogger();
 			} else {
diff --git a/lib/private/util.php b/lib/private/util.php
index 858138f58fe..d600f8a5e64 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -420,7 +420,7 @@ class OC_Util {
 	 * @param \OCP\IConfig $config
 	 * @return array arrays with error messages and hints
 	 */
-	public static function checkServer($config) {
+	public static function checkServer(\OCP\IConfig $config) {
 		$l = \OC::$server->getL10N('lib');
 		$errors = array();
 		$CONFIG_DATADIRECTORY = $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data');
@@ -1309,7 +1309,7 @@ class OC_Util {
 	 * @param \OCP\IConfig $config
 	 * @return bool whether the core or any app needs an upgrade
 	 */
-	public static function needUpgrade($config) {
+	public static function needUpgrade(\OCP\IConfig $config) {
 		if ($config->getSystemValue('installed', false)) {
 			$installedVersion = $config->getSystemValue('version', '0.0.0');
 			$currentVersion = implode('.', OC_Util::getVersion());
-- 
GitLab


From f901c5ff08328f3e27547c4a96fcf360d6a92e58 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 24 Oct 2014 15:49:55 +0200
Subject: [PATCH 220/616] Fix PHPDoc and remove explicit type hint

---
 lib/private/db/mdb2schemamanager.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index 1f2dbbe70d1..632e320576c 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -144,10 +144,10 @@ class MDB2SchemaManager {
 	}
 
 	/**
-	 * @param \Doctrine\DBAL\Schema\Schema $schema
+	 * @param \Doctrine\DBAL\Schema\Schema|\Doctrine\DBAL\Schema\SchemaDiff $schema
 	 * @return bool
 	 */
-	private function executeSchemaChange(\Doctrine\DBAL\Schema\Schema $schema) {
+	private function executeSchemaChange($schema) {
 		$this->conn->beginTransaction();
 		foreach ($schema->toSql($this->conn->getDatabasePlatform()) as $sql) {
 			$this->conn->query($sql);
-- 
GitLab


From 283c10f010f5da4ca0b6b7658ac1fa730b8858bf Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 24 Oct 2014 16:07:45 +0200
Subject: [PATCH 221/616] Generate stable etags for local files

---
 lib/private/files/storage/local.php | 21 ++++++++++
 tests/lib/files/storage/local.php   | 59 +++++++++++++++++++----------
 2 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 0a612ae505b..1c5fafc12fa 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -90,6 +90,7 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function stat($path) {
+			clearstatcache();
 			$fullPath = $this->datadir . $path;
 			$statResult = stat($fullPath);
 			if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
@@ -276,5 +277,25 @@ if (\OC_Util::runningOnWindows()) {
 		public function isLocal() {
 			return true;
 		}
+
+		/**
+		 * get the ETag for a file or folder
+		 *
+		 * @param string $path
+		 * @return string
+		 */
+		public function getETag($path) {
+			if ($this->is_file($path)) {
+				$stat = $this->stat($path);
+				return md5(
+					$stat['mtime'] .
+					$stat['ino'] .
+					$stat['dev'] .
+					$stat['size']
+				);
+			} else {
+				return parent::getETag($path);
+			}
+		}
 	}
 }
diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php
index 1aad138aa33..8fd9f0648ad 100644
--- a/tests/lib/files/storage/local.php
+++ b/tests/lib/files/storage/local.php
@@ -1,24 +1,24 @@
 <?php
 /**
-* ownCloud
-*
-* @author Robin Appelman
-* @copyright 2012 Robin Appelman icewind@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/>.
-*
-*/
+ * ownCloud
+ *
+ * @author Robin Appelman
+ * @copyright 2012 Robin Appelman icewind@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/>.
+ *
+ */
 
 namespace Test\Files\Storage;
 
@@ -27,13 +27,30 @@ class Local extends Storage {
 	 * @var string tmpDir
 	 */
 	private $tmpDir;
+
 	public function setUp() {
-		$this->tmpDir=\OC_Helper::tmpFolder();
-		$this->instance=new \OC\Files\Storage\Local(array('datadir'=>$this->tmpDir));
+		$this->tmpDir = \OC_Helper::tmpFolder();
+		$this->instance = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
 	}
 
 	public function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
 	}
+
+	public function testStableEtag() {
+		$this->instance->file_put_contents('test.txt', 'foobar');
+		$etag1 = $this->instance->getETag('test.txt');
+		$etag2 = $this->instance->getETag('test.txt');
+		$this->assertEquals($etag1, $etag2);
+	}
+
+	public function testEtagChange() {
+		$this->instance->file_put_contents('test.txt', 'foo');
+		$this->instance->touch('test.txt', time() - 2);
+		$etag1 = $this->instance->getETag('test.txt');
+		$this->instance->file_put_contents('test.txt', 'bar');
+		$etag2 = $this->instance->getETag('test.txt');
+		$this->assertNotEquals($etag1, $etag2);
+	}
 }
 
-- 
GitLab


From 9c1015b790560439b039c0cf7e162b316fe3a2f7 Mon Sep 17 00:00:00 2001
From: Dan Bartram <daneybartram@gmail.com>
Date: Fri, 24 Oct 2014 17:44:06 +0100
Subject: [PATCH 222/616] Add missing DB rollback functionality

---
 lib/private/db.php | 7 +++++++
 lib/public/db.php  | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/lib/private/db.php b/lib/private/db.php
index 9b904a1518f..b820281b8a3 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -204,6 +204,13 @@ class OC_DB {
 		return \OC::$server->getDatabaseConnection()->commit();
 	}
 
+	/**
+	 * Rollback the database changes done during a transaction that is in progress
+	 */
+	public static function rollback() {
+		return \OC::$server->getDatabaseConnection()->rollback();
+	}
+
 	/**
 	 * saves database schema to xml file
 	 * @param string $file name of file
diff --git a/lib/public/db.php b/lib/public/db.php
index ba3a4724ce0..e8fc817106e 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -96,6 +96,13 @@ class DB {
 		\OC_DB::commit();
 	}
 
+	/**
+	 * Rollback the database changes done during a transaction that is in progress
+	 */
+	public static function rollback() {
+		\OC_DB::rollback();
+	}
+
 	/**
 	 * Check if a result is an error, works with Doctrine
 	 * @param mixed $result
-- 
GitLab


From 3652f02e48ff6b45e7455c52892dfae66f773517 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 25 Oct 2014 01:54:35 -0400
Subject: [PATCH 223/616] [tx-robot] updated from transifex

---
 apps/user_ldap/l10n/sl.php          |   4 ++
 l10n/templates/core.pot             |   2 +-
 l10n/templates/files.pot            |   2 +-
 l10n/templates/files_encryption.pot |   2 +-
 l10n/templates/files_external.pot   |  10 +--
 l10n/templates/files_sharing.pot    |   2 +-
 l10n/templates/files_trashbin.pot   |   2 +-
 l10n/templates/files_versions.pot   |   2 +-
 l10n/templates/lib.pot              |   6 +-
 l10n/templates/private.pot          |   2 +-
 l10n/templates/settings.pot         |   2 +-
 l10n/templates/user_ldap.pot        |   6 +-
 l10n/templates/user_webdavauth.pot  |   2 +-
 lib/l10n/id.php                     |  69 +++++++++++++++++--
 settings/l10n/cs_CZ.php             |   2 +
 settings/l10n/de.php                |   2 +
 settings/l10n/de_DE.php             |   2 +
 settings/l10n/en_GB.php             |   2 +
 settings/l10n/es.php                |   1 +
 settings/l10n/fi_FI.php             |   2 +
 settings/l10n/id.php                | 102 ++++++++++++++++++++++++----
 settings/l10n/nl.php                |   2 +
 settings/l10n/pt_BR.php             |   3 +
 settings/l10n/pt_PT.php             |   2 +
 24 files changed, 195 insertions(+), 38 deletions(-)

diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 4eb7dfce597..e37caa2fd92 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -47,6 +47,7 @@ $TRANSLATIONS = array(
 "Edit raw filter instead" => "Uredi surov filter",
 "Raw LDAP filter" => "Surovi filter LDAP",
 "The filter specifies which LDAP groups shall have access to the %s instance." => "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
+"Test Filter" => "Preizkusi filter",
 "groups found" => "najdenih skupin",
 "Users login with this attribute:" => "Uporabniki se prijavijo z atributom:",
 "LDAP Username:" => "Uporabniško ime LDAP:",
@@ -66,9 +67,12 @@ $TRANSLATIONS = array(
 "For anonymous access, leave DN and Password empty." => "Za brezimni dostop naj bosta polji imena in gesla prazni.",
 "One Base DN per line" => "Eno osnovno enolično ime na vrstico",
 "You can specify Base DN for users and groups in the Advanced tab" => "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.",
+"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Preusmeri samodejne zahteve LDAP. Nastavitev je priporočljiva za obsežnejše namestitve, vendar zahteva nekaj znanja o delu z LDAP.",
+"Manually enter LDAP filters (recommended for large directories)" => "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).",
 "Limit %s access to users meeting these criteria:" => "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
 "users found" => "najdenih uporabnikov",
+"Saving" => "Poteka shranjevanje ...",
 "Back" => "Nazaj",
 "Continue" => "Nadaljuj",
 "Expert" => "Napredno",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ce2d0f3b905..e2ab14df2b8 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index acc3df0975f..0e4ff9f66d7 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index f13f7db1fe7..b0b3c4c6efd 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 27747918ec0..21385e04b8d 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -239,25 +239,25 @@ msgstr ""
 msgid "<b>Note:</b> "
 msgstr ""
 
-#: lib/config.php:723
+#: lib/config.php:724
 msgid " and "
 msgstr ""
 
-#: lib/config.php:745
+#: lib/config.php:746
 #, php-format
 msgid ""
 "<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."
 msgstr ""
 
-#: lib/config.php:747
+#: lib/config.php:748
 #, php-format
 msgid ""
 "<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."
 msgstr ""
 
-#: lib/config.php:749
+#: lib/config.php:750
 #, php-format
 msgid ""
 "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please "
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index e3c2b742085..bb31db083c1 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index e3ceade6a60..3a7d75b8c89 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 00cbdd1d96b..d865450334a 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 51dab33b695..68023f8ec8d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,11 +40,11 @@ msgid ""
 "config directory%s."
 msgstr ""
 
-#: base.php:594
+#: base.php:595
 msgid "Sample configuration detected"
 msgstr ""
 
-#: base.php:595
+#: base.php:596
 msgid ""
 "It has been detected that the sample configuration has been copied. This can "
 "break your installation and is unsupported. Please read the documentation "
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index dbe66fd272b..496a1fd7c79 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 27d2250a725..3459a4ca43e 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 9f983dfae79..c2dfb8e6e52 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -157,11 +157,11 @@ msgid_plural "%s users found"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/wizard.php:394 lib/wizard.php:1130
+#: lib/wizard.php:394 lib/wizard.php:1131
 msgid "Could not find the desired feature"
 msgstr ""
 
-#: lib/wizard.php:937 lib/wizard.php:949
+#: lib/wizard.php:938 lib/wizard.php:950
 msgid "Invalid Host"
 msgstr ""
 
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 020319f295b..20add24e00b 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-24 01:54-0400\n"
+"POT-Creation-Date: 2014-10-25 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 796772d410f..9e2e9282f7d 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -1,10 +1,18 @@
 <?php
 $TRANSLATIONS = array(
+"Cannot write into \"config\" directory!" => "Tidak dapat menulis kedalam direktori \"config\"!",
+"This can usually be fixed by giving the webserver write access to the config directory" => "Hal ini biasanya dapat diperbaiki dengan memberikan akses tulis bagi situs web ke direktori config",
+"See %s" => "Lihat %s",
+"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori config.",
+"Sample configuration detected" => "Konfigurasi sampel ditemukan",
+"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php",
 "Help" => "Bantuan",
 "Personal" => "Pribadi",
 "Settings" => "Pengaturan",
 "Users" => "Pengguna",
 "Admin" => "Admin",
+"Recommended" => "Direkomendasikan",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikasi \\\"%s\\\" tidak dapat diinstal karena tidak kompatibel denga versi ownCloud ini.",
 "No app name specified" => "Tidak ada nama apl yang ditentukan",
 "Unknown filetype" => "Tipe berkas tak dikenal",
 "Invalid image" => "Gambar tidak sah",
@@ -24,20 +32,46 @@ $TRANSLATIONS = array(
 "Application is not enabled" => "Aplikasi tidak diaktifkan",
 "Authentication error" => "Galat saat otentikasi",
 "Token expired. Please reload page." => "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
+"Unknown user" => "Pengguna tidak dikenal",
 "%s enter the database username." => "%s masukkan nama pengguna basis data.",
 "%s enter the database name." => "%s masukkan nama basis data.",
 "%s you may not use dots in the database name" => "%s anda tidak boleh menggunakan karakter titik pada nama basis data",
 "MS SQL username and/or password not valid: %s" => "Nama pengguna dan/atau sandi MySQL tidak sah: %s",
 "You need to enter either an existing account or the administrator." => "Anda harus memasukkan akun yang sudah ada atau administrator.",
-"DB Error: \"%s\"" => "Galat Basis Data: \"%s\"",
+"MySQL/MariaDB username and/or password not valid" => "Nama pengguna dan/atau sandi MySQL/MariaDB tidak sah",
+"DB Error: \"%s\"" => "Kesalahan Basis Data: \"%s\"",
 "Offending command was: \"%s\"" => "Perintah yang bermasalah: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "'%s'@'localhost' pengguna MySQL/MariaDB sudah ada.",
+"Drop this user from MySQL/MariaDB" => "Drop pengguna ini dari MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "'%s'@'%%' pengguna MySQL/MariaDB sudah ada.",
+"Drop this user from MySQL/MariaDB." => "Drop pengguna ini dari MySQL/MariaDB.",
 "Oracle connection could not be established" => "Koneksi Oracle tidak dapat dibuat",
 "Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak sah",
 "Offending command was: \"%s\", name: %s, password: %s" => "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
 "PostgreSQL username and/or password not valid" => "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
-"Set an admin username." => "Atur nama pengguna admin.",
-"Set an admin password." => "Atur sandi admin.",
+"Set an admin username." => "Tetapkan nama pengguna admin.",
+"Set an admin password." => "Tetapkan sandi admin.",
+"Can't create or write into the data directory %s" => "Tidak dapat membuat atau menulis kedalam direktori data %s",
 "%s shared »%s« with you" => "%s membagikan »%s« dengan anda",
+"Sharing %s failed, because the file does not exist" => "Gagal membagikan %s, karena berkas tidak ada",
+"You are not allowed to share %s" => "Anda tidak diizinkan untuk membagikan %s",
+"Sharing %s failed, because the user %s is the item owner" => "Gagal membagikan %s, karena pengguna %s adalah pemilik item",
+"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 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",
+"Sharing %s failed, because sharing with links is not allowed" => "Gagal membagikan %s, karena berbag dengan tautan tidak diizinkan",
+"Share type %s is not valid for %s" => "Barbagi tipe %s tidak sah untuk %s",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Pengaturan perizinan untuk %s gagal, karena karena izin melebihi izin yang diberikan untuk %s",
+"Setting permissions for %s failed, because the item was not found" => "Pengaturan perizinan untuk %s gagal, karena item tidak ditemukan",
+"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Tidak dapat menyetel tanggal kadaluarsa. Pembagian tidak dapat kadaluarsa lebih lambat dari %s setelah mereka dibagikan.",
+"Cannot set expiration date. Expiration date is in the past" => "Tidak dapat menyetel tanggal kadaluarsa. Tanggal kadaluarsa dimasa lalu",
+"Sharing %s failed, because the user %s is the original sharer" => "Gagal berbagi %s. karena pengguna %s adalah yang membagikan pertama",
+"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Gagal membagikan %s, karena izin melebihi izin yang diberikan untuk %s",
+"Sharing %s failed, because resharing is not allowed" => "Gagal berbagi %s, karena membagikan ulang tidak diizinkan",
+"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\"",
 "seconds ago" => "beberapa detik yang lalu",
 "_%n minute ago_::_%n minutes ago_" => array("%n menit yang lalu"),
@@ -49,7 +83,34 @@ $TRANSLATIONS = array(
 "_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
 "last year" => "tahun kemarin",
 "years ago" => "beberapa tahun lalu",
+"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"
+"A valid password must be provided" => "Tuliskan sandi yang valid",
+"The username is already being used" => "Nama pengguna ini telah digunakan",
+"No database drivers (sqlite, mysql, or postgresql) installed." => "Tidak ada driver (sqlite, mysql, or postgresql) yang terinstal.",
+"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Perizinan biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori root.",
+"Cannot write into \"config\" directory" => "Tidak dapat menulis kedalam direktori \"config\"",
+"Cannot write into \"apps\" directory" => "Tidak dapat menulis kedalam direktori \"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." => "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori apps atau menonaktifkan toko aplikasi didalam berkas config.",
+"Cannot create \"data\" directory (%s)" => "Tidak dapat membuat direktori (%s) \"data\"",
+"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Hal ini biasanya dapat diperbaiki dengan <a href=\"%s\" target=\"_blank\">memberikan akses tulis bagi situs web ke direktori root</a>.",
+"Setting locale to %s failed" => "Pengaturan lokal ke %s gagal",
+"Please install one of these locales on your system and restart your webserver." => "Mohon instal paling tidak satu lokal pada sistem Anda dan jalankan ulang server web.",
+"Please ask your server administrator to install the module." => "Mohon tanyakan administrator Anda untuk menginstal module.",
+"PHP module %s not installed." => "Module PHP %s tidak terinstal.",
+"PHP %s or higher is required." => "Diperlukan PHP %s atau yang lebih tinggi.",
+"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Mohon tanyakan administrator Anda untuk memperbarui PHP ke versi terkini. Versi PHP Anda tidak lagi didukung oleh ownCloud dan komunitas PHP.",
+"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode diaktifkan. ownCloud memerlukan ini untuk dinonaktifkan untuk dapat bekerja dengan banar.",
+"PHP modules have been installed, but they are still listed as missing?" => "Modul PHP telah terinstal, tetapi mereka terlihat tidak ada?",
+"Please ask your server administrator to restart the web server." => "Mohon minta administrator Anda untuk menjalankan ulang server web.",
+"PostgreSQL >= 9 required" => "Diperlukan PostgreSQL >= 9",
+"Please upgrade your database version" => "Mohon perbarui versi basis data Anda",
+"Error occurred while checking PostgreSQL version" => "Terjadi kesalahan saat memeriksa versi PostgreSQL",
+"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Pastikan bahwa Anda memiliki PostgreSQL >= 9 atau periksa log untuk informasi lebih lanjut tentang kesalahan",
+"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Mohon ubah perizinan menjadi 0770 sehingga direktori tersebut tidak dapat dilihat oleh pengguna lain.",
+"Data directory (%s) is readable by other users" => "Direktori data (%s) dapat dibaca oleh pengguna lain",
+"Data directory (%s) is invalid" => "Direktori data (%s) tidak sah",
+"Please check that the data directory contains a file \".ocdata\" in its root." => "Mohon periksa apakah direktori data berisi sebuah berkas \".ocdata\".",
+"Could not obtain lock type %d on \"%s\"." => "Tidak bisa memperoleh jenis kunci %d pada \"%s\"."
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 8c8b4e4692d..0b003082c50 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Musíte zadat platný název skupiny",
 "deleted {groupName}" => "smazána {groupName}",
 "undo" => "vrátit zpět",
+"no group" => "není ve skupině",
 "never" => "nikdy",
 "deleted {userName}" => "smazán {userName}",
 "add group" => "přidat skupinu",
@@ -227,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Neomezeně",
 "Other" => "Jiný",
 "Username" => "Uživatelské jméno",
+"Group Admin for" => "Administrátor skupiny ",
 "Quota" => "Kvóta",
 "Storage Location" => "Umístění úložiště",
 "Last Login" => "Poslední přihlášení",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index c8c8cc32a2b..19d18f82061 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
 "deleted {groupName}" => "{groupName} gelöscht",
 "undo" => "rückgängig machen",
+"no group" => "Keine Gruppe",
 "never" => "niemals",
 "deleted {userName}" => "{userName} gelöscht",
 "add group" => "Gruppe hinzufügen",
@@ -227,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
 "Username" => "Benutzername",
+"Group Admin for" => "Gruppenadministrator für",
 "Quota" => "Quota",
 "Storage Location" => "Speicherort",
 "Last Login" => "Letzte Anmeldung",
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
index 1a5da377b77..25328f377e3 100644
--- a/settings/l10n/de_DE.php
+++ b/settings/l10n/de_DE.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
 "deleted {groupName}" => "{groupName} gelöscht",
 "undo" => "rückgängig machen",
+"no group" => "Keine Gruppe",
 "never" => "niemals",
 "deleted {userName}" => "{userName} gelöscht",
 "add group" => "Gruppe hinzufügen",
@@ -227,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Unbegrenzt",
 "Other" => "Andere",
 "Username" => "Benutzername",
+"Group Admin for" => "Gruppenadministrator für",
 "Quota" => "Kontingent",
 "Storage Location" => "Speicherort",
 "Last Login" => "Letzte Anmeldung",
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
index dc8faf2b877..86101c029c0 100644
--- a/settings/l10n/en_GB.php
+++ b/settings/l10n/en_GB.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "A valid group name must be provided",
 "deleted {groupName}" => "deleted {groupName}",
 "undo" => "undo",
+"no group" => "no group",
 "never" => "never",
 "deleted {userName}" => "deleted {userName}",
 "add group" => "add group",
@@ -227,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Unlimited",
 "Other" => "Other",
 "Username" => "Username",
+"Group Admin for" => "Group Admin for",
 "Quota" => "Quota",
 "Storage Location" => "Storage Location",
 "Last Login" => "Last Login",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 36825fd90f0..adf474cda01 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -227,6 +227,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Ilimitado",
 "Other" => "Otro",
 "Username" => "Nombre de usuario",
+"Group Admin for" => "Grupo administrador para",
 "Quota" => "Cuota",
 "Storage Location" => "Ubicación de almacenamiento",
 "Last Login" => "Último inicio de sesión",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index f423410b725..e09c2d019c5 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Anna kelvollinen ryhmän nimi",
 "deleted {groupName}" => "poistettu {groupName}",
 "undo" => "kumoa",
+"no group" => "ei ryhmää",
 "never" => "ei koskaan",
 "deleted {userName}" => "poistettu {userName}",
 "add group" => "lisää ryhmä",
@@ -217,6 +218,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Rajoittamaton",
 "Other" => "Muu",
 "Username" => "Käyttäjätunnus",
+"Group Admin for" => "Ryhmäylläpitäjä kohteille",
 "Quota" => "Kiintiö",
 "Storage Location" => "Tallennustilan sijainti",
 "Last Login" => "Viimeisin kirjautuminen",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index 579a7129703..639d62b7114 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,15 +1,25 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Diaktifkan",
-"Authentication error" => "Galat saat autentikasi",
+"Not enabled" => "Tidak diaktifkan",
+"Recommended" => "Direkomendasikan",
+"Authentication error" => "Terjadi kesalahan saat otentikasi",
 "Your full name has been changed." => "Nama lengkap Anda telah diubah",
 "Unable to change full name" => "Tidak dapat mengubah nama lengkap",
 "Group already exists" => "Grup sudah ada",
 "Unable to add group" => "Tidak dapat menambah grup",
+"Files decrypted successfully" => "Berkas berhasil dideskripsi",
+"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
+"Couldn't decrypt your files, check your password and try again" => "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
+"Encryption keys deleted permanently" => "Kunci enkripsi dihapus secara permanen",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
+"Couldn't remove app." => "Tidak dapat menghapus aplikasi.",
 "Email saved" => "Email disimpan",
 "Invalid email" => "Email tidak valid",
 "Unable to delete group" => "Tidak dapat menghapus grup",
 "Unable to delete user" => "Tidak dapat menghapus pengguna",
+"Backups restored successfully" => "Cadangan berhasil dipulihkan",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
 "Language changed" => "Bahasa telah diubah",
 "Invalid request" => "Permintaan tidak valid",
 "Admins can't remove themself from the admin group" => "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
@@ -18,41 +28,58 @@ $TRANSLATIONS = array(
 "Couldn't update app." => "Tidak dapat memperbarui aplikasi.",
 "Wrong password" => "Sandi salah",
 "No user supplied" => "Tidak ada pengguna yang diberikan",
+"Please provide an admin recovery password, otherwise all user data will be lost" => "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
 "Wrong admin recovery password. Please check the password and try again." => "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
 "Unable to change password" => "Tidak dapat mengubah sandi",
 "Saved" => "Disimpan",
 "test email settings" => "pengaturan email percobaan",
 "If you received this email, the settings seem to be correct." => "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
+"A problem occurred while sending the email. Please revise your settings." => "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
 "Email sent" => "Email terkirim",
 "You need to set your user email before being able to send test emails." => "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
+"Add trusted domain" => "Tambah domain terpercaya",
 "Sending..." => "Mengirim",
 "All" => "Semua",
 "Please wait...." => "Mohon tunggu....",
-"Error while disabling app" => "Galat saat menonaktifkan aplikasi",
+"Error while disabling app" => "Terjadi kesalahan saat menonaktifkan aplikasi",
 "Disable" => "Nonaktifkan",
 "Enable" => "Aktifkan",
-"Error while enabling app" => "Galat saat mengakifkan aplikasi",
+"Error while enabling app" => "Terjadi kesalahan saat mengakifkan aplikasi",
 "Updating...." => "Memperbarui....",
-"Error while updating app" => "Gagal ketika memperbarui aplikasi",
+"Error while updating app" => "Terjadi kesalahan saat memperbarui aplikasi",
 "Updated" => "Diperbarui",
+"Uninstalling ...." => "Mencopot ...",
+"Error while uninstalling app" => "Terjadi kesalahan saat mencopot aplikasi",
+"Uninstall" => "Copot",
 "Select a profile picture" => "Pilih foto profil",
 "Very weak password" => "Sandi sangat lemah",
 "Weak password" => "Sandi lemah",
 "So-so password" => "Sandi lumayan",
 "Good password" => "Sandi baik",
 "Strong password" => "Sandi kuat",
+"Valid until {date}" => "Berlaku sampai {date}",
 "Delete" => "Hapus",
-"Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Modon tunggu, ini memerlukan beberapa saat.",
+"Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
+"Delete encryption keys permanently." => "Hapus kunci enkripsi secara permanen.",
+"Restore encryption keys." => "memulihkan kunci enkripsi.",
 "Groups" => "Grup",
+"Unable to delete {objName}" => "Tidak dapat menghapus {objName}",
+"Error creating group" => "Terjadi kesalahan saat membuat grup",
+"A valid group name must be provided" => "Harus memberikan nama grup yang benar.",
+"deleted {groupName}" => "menghapus {groupName}",
 "undo" => "urungkan",
+"no group" => "tanpa grup",
 "never" => "tidak pernah",
+"deleted {userName}" => "menghapus {userName}",
 "add group" => "tambah grup",
-"A valid username must be provided" => "Tuliskan nama pengguna yang valid",
-"Error creating user" => "Gagal membuat pengguna",
-"A valid password must be provided" => "Tuliskan sandi yang valid",
+"A valid username must be provided" => "Harus memberikan nama pengguna yang benar",
+"Error creating user" => "Terjadi kesalahan saat membuat pengguna",
+"A valid password must be provided" => "Harus memberikan sandi yang benar",
 "Warning: Home directory for user \"{user}\" already exists" => "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada",
 "__language_name__" => "__language_name__",
+"Personal Info" => "Info Pribadi",
 "SSL root certificates" => "Sertifikat root SSL",
 "Encryption" => "Enkripsi",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
@@ -69,25 +96,47 @@ $TRANSLATIONS = array(
 "Security Warning" => "Peringatan Keamanan",
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya.",
 "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." => "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver.",
-"Setup Warning" => "Peringatan Persiapan",
-"Module 'fileinfo' missing" => "Module 'fileinfo' tidak ada",
+"Setup Warning" => "Peringatan Pengaturan",
+"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Tampaknya pengaturan PHP 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.",
+"Database Performance Info" => "Info Performa Basis Data",
+"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
+"Module 'fileinfo' missing" => "Modul 'fileinfo' tidak ada",
 "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.",
 "Your PHP version is outdated" => "Versi PHP telah usang",
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar.",
+"PHP charset is not set to UTF-8" => "Charset PHP tidak disetel ke UTF-8",
+"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Charset PHP tidak disetel ke UTF-8. Hal ini dapat menyebabkan masalah besar dengan karakter non-ASCII di nama berkas. Kami sangat merekomendasikan untuk mengubah nilai 'default_charset' php.ini ke 'UTF-8'.",
 "Locale not working" => "Kode pelokalan tidak berfungsi",
 "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 to install the required packages on your system to support one of the following locales: %s." => "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
+"URL generation in notification emails" => "URL dibuat dalam email pemberitahuan",
+"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+"Connectivity checks" => "Pemeriksaan konektivitas",
+"No problems found" => "Masalah tidak ditemukan",
 "Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
 "Cron" => "Cron",
 "Last cron was executed at %s." => "Cron terakhir dieksekusi pada %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
+"Cron was not executed yet!" => "Cron masih belum dieksekusi!",
 "Execute one task with each page loaded" => "Jalankan tugas setiap kali halaman dimuat",
 "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.",
 "Sharing" => "Berbagi",
 "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",
+"Enforce password protection" => "Berlakukan perlindungan sandi",
 "Allow public uploads" => "Izinkan unggahan publik",
+"Set default expiration date" => "Atur tanggal kadaluarsa default",
+"Expire after " => "Kadaluarsa setelah",
 "days" => "hari",
+"Enforce expiration date" => "Berlakukan tanggal kadaluarsa",
 "Allow resharing" => "Izinkan pembagian ulang",
+"Restrict users to only share with users in their groups" => "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
+"Allow users to send mail notification for shared files" => "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
+"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.",
 "Security" => "Keamanan",
 "Enforce HTTPS" => "Selalu Gunakan HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
@@ -96,6 +145,7 @@ $TRANSLATIONS = array(
 "This is used for sending out notifications." => "Ini digunakan untuk mengirim notifikasi keluar.",
 "Send mode" => "Modus kirim",
 "From address" => "Dari alamat",
+"mail" => "email",
 "Authentication method" => "Metode otentikasi",
 "Authentication required" => "Diperlukan otentikasi",
 "Server address" => "Alamat server",
@@ -103,24 +153,32 @@ $TRANSLATIONS = array(
 "Credentials" => "Kredensial",
 "SMTP Username" => "Nama pengguna SMTP",
 "SMTP Password" => "Sandi SMTP",
+"Store credentials" => "Simpan kredensial",
 "Test email settings" => "Pengaturan email percobaan",
 "Send email" => "Kirim email",
-"Log" => "Catat",
-"Log level" => "Level pencatatan",
+"Log" => "Log",
+"Log level" => "Level log",
 "More" => "Lainnya",
 "Less" => "Ciutkan",
 "Version" => "Versi",
 "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>." => "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"More apps" => "Lebih banyak aplikasi",
+"Add your app" => "Tambah aplikasi Anda",
 "by" => "oleh",
+"licensed" => "dilisensikan",
 "Documentation:" => "Dokumentasi:",
 "User Documentation" => "Dokumentasi Pengguna",
 "Admin Documentation" => "Dokumentasi Admin",
+"Update to %s" => "Perbarui ke %s",
+"Enable only for specific groups" => "Aktifkan hanya untuk grup tertentu",
+"Uninstall App" => "Copot aplikasi",
 "Administrator Documentation" => "Dokumentasi Administrator",
 "Online Documentation" => "Dokumentasi Online",
 "Forum" => "Forum",
 "Bugtracker" => "Bugtracker",
 "Commercial Support" => "Dukungan Komersial",
 "Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
 "Show First Run Wizard again" => "Tampilkan Penuntun Konfigurasi Awal",
 "You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
 "Password" => "Sandi",
@@ -137,29 +195,45 @@ $TRANSLATIONS = array(
 "Upload new" => "Unggah baru",
 "Select new from Files" => "Pilih baru dari Berkas",
 "Remove image" => "Hapus gambar",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Bisa png atau jpg. Idealnya berbentuk persegi tetapi jika tidak Anda bisa memotongnya nanti.",
+"Either png or jpg. Ideally square but you will be able to crop it." => "Boleh png atau jpg. Idealnya berbentuk persegi tetapi jika tidak, Anda bisa memotongnya nanti.",
 "Your avatar is provided by your original account." => "Avatar disediakan oleh akun asli Anda.",
 "Cancel" => "Batal",
 "Choose as profile image" => "Pilih sebagai gambar profil",
 "Language" => "Bahasa",
 "Help translate" => "Bantu menerjemahkan",
+"Common Name" => "Nama umum",
+"Valid until" => "Berlaku sampai",
+"Issued By" => "Diterbitkan oleh",
+"Valid until %s" => "Berlaku sampai %s",
 "Import Root Certificate" => "Impor Sertifikat Root",
 "The encryption app is no longer enabled, please decrypt all your files" => "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
 "Log-in password" => "Sandi masuk",
 "Decrypt all Files" => "Deskripsi semua Berkas",
+"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
+"Restore Encryption Keys" => "Pulihkan Kunci Enkripsi",
+"Delete Encryption Keys" => "Hapus Kuncu Enkripsi",
+"Show storage location" => "Tampilkan kolasi penyimpanan",
+"Show last log in" => "Tampilkan masuk terakhir",
 "Login Name" => "Nama Masuk",
 "Create" => "Buat",
 "Admin Recovery Password" => "Sandi pemulihan Admin",
 "Enter the recovery password in order to recover the users files during password change" => "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
+"Search Users and Groups" => "Telusuri Pengguna dan Grup",
+"Add Group" => "Tambah Grup",
 "Group" => "Grup",
+"Everyone" => "Semua orang",
+"Admins" => "Admin",
 "Default Quota" => "Kuota default",
 "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
 "Unlimited" => "Tak terbatas",
 "Other" => "Lainnya",
 "Username" => "Nama pengguna",
+"Group Admin for" => "Grup Admin untuk",
 "Quota" => "Quota",
+"Storage Location" => "Lokasi Penyimpanan",
+"Last Login" => "Masuk Terakhir",
 "change full name" => "ubah nama lengkap",
 "set new password" => "setel sandi baru",
-"Default" => "Baku"
+"Default" => "Default"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index c7538e1300f..081dc50c80e 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Er moet een geldige groepsnaam worden opgegeven",
 "deleted {groupName}" => "verwijderd {groupName}",
 "undo" => "ongedaan maken",
+"no group" => "geen groep",
 "never" => "geen",
 "deleted {userName}" => "verwijderd {userName}",
 "add group" => "toevoegen groep",
@@ -227,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Ongelimiteerd",
 "Other" => "Anders",
 "Username" => "Gebruikersnaam",
+"Group Admin for" => "Groepsbeheerder voor",
 "Quota" => "Limieten",
 "Storage Location" => "Opslaglocatie",
 "Last Login" => "Laatste inlog",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index dce1fab40a4..4b7cfb6ed76 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Um nome de grupo válido deve ser fornecido",
 "deleted {groupName}" => "eliminado {groupName}",
 "undo" => "desfazer",
+"no group" => "nenhum grupo",
 "never" => "nunca",
 "deleted {userName}" => "eliminado {userName}",
 "add group" => "adicionar grupo",
@@ -78,6 +79,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Forneça uma senha válida",
 "Warning: Home directory for user \"{user}\" already exists" => "Aviso: O diretório home para o usuário \"{user}\" já existe",
 "__language_name__" => "__language_name__",
+"Personal Info" => "Informação Pessoal",
 "SSL root certificates" => "Certificados SSL raíz",
 "Encryption" => "Criptografia",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (questões fatais, erros, avisos, informações, depuração)",
@@ -226,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
 "Username" => "Nome de Usuário",
+"Group Admin for" => "Grupo Admin para",
 "Quota" => "Cota",
 "Storage Location" => "Local de Armazenamento",
 "Last Login" => "Último Login",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index e06715c061b..363cf1959f7 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Um nome válido do grupo tem de ser fornecido",
 "deleted {groupName}" => "apagar {Nome do grupo}",
 "undo" => "desfazer",
+"no group" => "sem grupo",
 "never" => "nunca",
 "deleted {userName}" => "apagar{utilizador}",
 "add group" => "Adicionar grupo",
@@ -227,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Ilimitado",
 "Other" => "Outro",
 "Username" => "Nome de utilizador",
+"Group Admin for" => "Administrador de Grupo para",
 "Quota" => "Quota",
 "Storage Location" => "Localização do Armazenamento",
 "Last Login" => "Ultimo acesso",
-- 
GitLab


From be32e562e3abb0a2205b56b01e7dc15e88e17e38 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Sat, 25 Oct 2014 12:00:56 +0200
Subject: [PATCH 224/616] drop unneeded hint

---
 lib/private/server.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/private/server.php b/lib/private/server.php
index ac0eb7b4cf9..a6d506e9b27 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -169,7 +169,6 @@ class Server extends SimpleContainer implements IServerContainer {
 			return new AvatarManager();
 		});
 		$this->registerService('Logger', function (Server $c) {
-			/** @var $c SimpleContainer */
 			$logClass = $c->query('AllConfig')->getSystemValue('log_type', 'owncloud');
 			$logger = 'OC_Log_' . ucfirst($logClass);
 			call_user_func(array($logger, 'init'));
-- 
GitLab


From 214af9523ae3ebc9ce0e2dec73fda48fc28e4378 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 26 Oct 2014 01:54:32 -0400
Subject: [PATCH 225/616] [tx-robot] updated from transifex

---
 apps/files_external/l10n/fr.php     |  2 +-
 apps/files_external/l10n/ja.php     |  2 +-
 apps/user_ldap/l10n/id.php          | 65 +++++++++++++++++++++++------
 apps/user_ldap/l10n/ja.php          |  2 +-
 core/l10n/ja.php                    |  6 +--
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  4 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  4 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              |  2 +-
 l10n/templates/private.pot          |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/ja.php                     |  3 +-
 lib/l10n/uk.php                     | 27 ++++++++++++
 settings/l10n/bg_BG.php             |  3 ++
 settings/l10n/fr.php                |  3 ++
 settings/l10n/ja.php                |  7 ++--
 settings/l10n/tr.php                |  3 ++
 settings/l10n/uk.php                |  3 ++
 24 files changed, 117 insertions(+), 37 deletions(-)

diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
index 405bc4f680c..67f2f321bfb 100644
--- a/apps/files_external/l10n/fr.php
+++ b/apps/files_external/l10n/fr.php
@@ -1,6 +1,6 @@
 <?php
 $TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clef Dropbox ainsi que le mot de passe.",
+"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
 "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
 "Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
 "Step 1 failed. Exception: %s" => "L’étape 1 a échoué. Erreur: %s",
diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php
index 494708e63dd..f4601bb7daf 100644
--- a/apps/files_external/l10n/ja.php
+++ b/apps/files_external/l10n/ja.php
@@ -49,7 +49,7 @@ $TRANSLATIONS = array(
 "Error configuring Google Drive storage" => "Googleドライブストレージの設定エラー",
 "Personal" => "個人",
 "System" => "システム",
-"All users. Type to select user or group." => "全てのユーザー．ユーザー、グループを追加",
+"All users. Type to select user or group." => "すべてのユーザー．ユーザー、グループを追加",
 "(group)" => "(グループ)",
 "Saved" => "保存されました",
 "<b>Note:</b> " => "<b>注意:</b> ",
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
index 11cefeb18db..01cf269d68d 100644
--- a/apps/user_ldap/l10n/id.php
+++ b/apps/user_ldap/l10n/id.php
@@ -1,38 +1,77 @@
 <?php
 $TRANSLATIONS = array(
+"Failed to clear the mappings." => "Gagal membersihkan pemetaan.",
 "Failed to delete the server configuration" => "Gagal menghapus konfigurasi server",
 "The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
+"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan periksa pengaturan server dan kredensial.",
+"The configuration is invalid. Please have a look at the logs for further details." => "Konfigurasi tidak sah. Silakan lihat log untuk rincian lebh lanjut.",
+"No action specified" => "Tidak ada tindakan yang ditetapkan",
+"No configuration specified" => "Tidak ada konfigurasi yang ditetapkan",
+"No data specified" => "Tidak ada data yang ditetapkan",
+" Could not set configuration %s" => "Tidak dapat menyetel konfigurasi %s",
 "Deletion failed" => "Penghapusan gagal",
-"Take over settings from recent server configuration?" => "Ambil alih pengaturan dari konfigurasi server saat ini?",
+"Take over settings from recent server configuration?" => "Mengambil alih pengaturan dari konfigurasi server saat ini?",
 "Keep settings?" => "Biarkan pengaturan?",
+"{nthServer}. Server" => "{nthServer}. Server",
 "Cannot add server configuration" => "Gagal menambah konfigurasi server",
-"Success" => "Sukses",
-"Error" => "Galat",
+"mappings cleared" => "pemetaan dibersihkan",
+"Success" => "Berhasil",
+"Error" => "Kesalahan",
+"Please specify a Base DN" => "Sialakan menetapkan Base DN",
+"Could not determine Base DN" => "Tidak dapat menetakan Base DN",
+"Please specify the port" => "Silakan tetapkan port",
+"Configuration OK" => "Konfigurasi Oke",
+"Configuration incorrect" => "Konfigurasi salah",
+"Configuration incomplete" => "Konfigurasi tidak lengkap",
 "Select groups" => "Pilih grup",
-"Connection test succeeded" => "Tes koneksi sukses",
-"Connection test failed" => "Tes koneksi gagal",
-"Do you really want to delete the current Server Configuration?" => "Anda ingin menghapus Konfigurasi Server saat ini?",
+"Select object classes" => "Pilik kelas obyek",
+"Select attributes" => "Pilih atribut",
+"Connection test succeeded" => "Pemeriksaan koneksi berhasil",
+"Connection test failed" => "Pemeriksaan koneksi gagal",
+"Do you really want to delete the current Server Configuration?" => "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
 "Confirm Deletion" => "Konfirmasi Penghapusan",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
+"_%s group found_::_%s groups found_" => array("%s grup ditemukan"),
+"_%s user found_::_%s users found_" => array("%s pengguna ditemukan"),
+"Could not find the desired feature" => "Tidak dapat menemukan fitur yang diinginkan",
+"Invalid Host" => "Host tidak sah",
 "Server" => "Server",
-"Group Filter" => "saringan grup",
+"User Filter" => "Penyaring Pengguna",
+"Login Filter" => "Penyaring Masuk",
+"Group Filter" => "Penyaring grup",
 "Save" => "Simpan",
 "Test Configuration" => "Uji Konfigurasi",
 "Help" => "Bantuan",
+"Groups meeting these criteria are available in %s:" => "Grup memenuhi kriteria ini tersedia di %s:",
+"only those object classes:" => "hanya kelas objek:",
+"only from those groups:" => "hanya dari kelompok:",
+"Edit raw filter instead" => "Sunting penyaring raw",
+"Raw LDAP filter" => "Penyaring LDAP raw",
+"Test Filter" => "Uji Penyaring",
+"groups found" => "grup ditemukan",
+"Users login with this attribute:" => "Login pengguna dengan atribut ini:",
+"LDAP Username:" => "Nama pengguna LDAP:",
+"LDAP Email Address:" => "Alamat Email LDAP:",
+"Other Attributes:" => "Atribut Lain:",
+"1. Server" => "1. Server",
+"%s. Server:" => "%s. Server:",
 "Add Server Configuration" => "Tambah Konfigurasi Server",
+"Delete Configuration" => "Hapus Konfigurasi",
 "Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://",
-"Port" => "port",
-"User DN" => "User DN",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
+"Port" => "Port",
+"User DN" => "Pengguna 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." => "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
 "Password" => "Sandi",
 "For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
 "One Base DN per line" => "Satu Base DN per baris",
 "You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
+"Manually enter LDAP filters (recommended for large directories)" => "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)",
+"Limit %s access to users meeting these criteria:" => "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:",
+"users found" => "pengguna ditemukan",
+"Saving" => "Menyimpan",
 "Back" => "Kembali",
 "Continue" => "Lanjutkan",
+"Expert" => "Lanjutan",
 "Advanced" => "Lanjutan",
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
 "Connection Settings" => "Pengaturan Koneksi",
diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php
index 7b4240c2acf..01430106847 100644
--- a/apps/user_ldap/l10n/ja.php
+++ b/apps/user_ldap/l10n/ja.php
@@ -120,7 +120,7 @@ $TRANSLATIONS = array(
 "UUID Attribute for Users:" => "ユーザーのUUID属性:",
 "UUID Attribute for Groups:" => "グループの UUID 属性:",
 "Username-LDAP User Mapping" => "ユーザー名とLDAPユーザのマッピング",
-"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." => "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+"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." => "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、すべてのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
 "Clear Username-LDAP User Mapping" => "ユーザー名とLDAPユーザーのマッピングをクリアする",
 "Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする"
 );
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
index dedf3b759b4..450e3adc2e3 100644
--- a/core/l10n/ja.php
+++ b/core/l10n/ja.php
@@ -66,8 +66,8 @@ $TRANSLATIONS = array(
 "So-so password" => "まずまずのパスワード",
 "Good password" => "良好なパスワード",
 "Strong password" => "強いパスワード",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
-"This server has no working internet connection. This means that some of the features like mounting 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." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、Webサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+"This server has no working internet connection. This means that some of the features like mounting 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." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。すべての機能を利用したい場合は、このサーバーがインターネット接続できるようにすることをお勧めします。",
 "Error occurred while checking server setup" => "サーバー設定のチェック中にエラーが発生しました",
 "Shared" => "共有中",
 "Shared with {recipients}" => "{recipients} と共有",
@@ -88,7 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "送信",
 "Set expiration date" => "有効期限を設定",
 "Expiration date" => "有効期限",
-"Adding user..." => "ユーザー追加中...",
+"Adding user..." => "ユーザーを追加しています...",
 "group" => "グループ",
 "Resharing is not allowed" => "再共有は許可されていません",
 "Shared in {item} with {user}" => "{item} 内で {user} と共有中",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e2ab14df2b8..8cb3ef3ef9f 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 0e4ff9f66d7..ff3de09b1cf 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -340,7 +340,7 @@ msgstr ""
 msgid "%s could not be renamed"
 msgstr ""
 
-#: lib/helper.php:23 templates/list.php:25
+#: lib/helper.php:25 templates/list.php:25
 #, php-format
 msgid "Upload (max. %s)"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index b0b3c4c6efd..9341399a925 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 21385e04b8d..336354c3e14 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index bb31db083c1..69ab20a7911 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 3a7d75b8c89..7ed0e50ada7 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -39,7 +39,7 @@ msgstr ""
 msgid "Error"
 msgstr ""
 
-#: lib/trashbin.php:970 lib/trashbin.php:972
+#: lib/trashbin.php:980 lib/trashbin.php:982
 msgid "restored"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index d865450334a..4a503def85b 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 68023f8ec8d..99e589c9b5e 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 496a1fd7c79..f4bea1ddb83 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 3459a4ca43e..444931677be 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index c2dfb8e6e52..51432d90b88 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 20add24e00b..a8b9234798e 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-25 01:54-0400\n"
+"POT-Creation-Date: 2014-10-26 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
index 445702069f1..ca54f105377 100644
--- a/lib/l10n/ja.php
+++ b/lib/l10n/ja.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "設定",
 "Users" => "ユーザー",
 "Admin" => "管理",
+"Recommended" => "推奨",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "アプリ \\\"%s\\\" をインストールできません。現在のownCloudのバージョンと互換性がありません。",
 "No app name specified" => "アプリ名が未指定",
 "Unknown filetype" => "不明なファイルタイプ",
@@ -108,7 +109,7 @@ $TRANSLATIONS = array(
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "マジッククォートは有効です。ownCloudを適切に動作させるには無効にする必要があります。",
 "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "マジッククォートは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
 "PHP modules have been installed, but they are still listed as missing?" => "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？",
-"Please ask your server administrator to restart the web server." => "サーバー管理者にWEBサーバーを再起動するよう依頼してください。",
+"Please ask your server administrator to restart the web server." => "サーバー管理者にWebサーバーを再起動するよう依頼してください。",
 "PostgreSQL >= 9 required" => "PostgreSQL >= 9 が必要です",
 "Please upgrade your database version" => "新しいバージョンのデータベースにアップグレードしてください",
 "Error occurred while checking PostgreSQL version" => "PostgreSQL のバージョンチェック中にエラーが発生しました",
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 6a151d62026..cf8678c40c5 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -20,22 +20,49 @@ $TRANSLATIONS = array(
 "App directory already exists" => "Тека додатку вже існує",
 "Can't create app folder. Please fix permissions. %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" => "Не вказано шлях при встановлені додатку з локального файлу",
+"Archives of type %s are not supported" => "Архіви %s не підтримуються",
+"Failed to open archive when installing app" => "Неможливо відкрити архів при встановлені додатку",
+"App does not provide an info.xml file" => "Додаток не має файл info.xml",
+"App can't be installed because of not allowed code in the App" => "Неможливо встановити додаток. Він містить заборонений код",
+"App can't be installed because it is not compatible with this version of ownCloud" => "Неможливо встановити додаток, він є несумісним з даною версією ownCloud",
+"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Неможливо встановити додаток, оскільки він містить параметр <shipped>true</shipped> заборонений додаткам, що не входять в поставку ",
+"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Неможливо встановити додаток. Версія в файлі info.xml/version не співпадає з заявленою в магазині додатків",
 "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 не можна використовувати крапки в назві бази даних",
 "MS SQL username and/or password not valid: %s" => "MS SQL ім'я користувача та/або пароль не дійсні: %s",
 "You need to enter either an existing account or the administrator." => "Вам потрібно ввести або існуючий обліковий запис або administrator.",
+"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB ім'я користувача та/або пароль не дійсні",
 "DB Error: \"%s\"" => "Помилка БД: \"%s\"",
 "Offending command was: \"%s\"" => "Команда, що викликала проблему: \"%s\"",
+"MySQL/MariaDB user '%s'@'localhost' exists already." => "Користувач MySQL/MariaDB '%s'@'localhost' вже існує.",
+"Drop this user from MySQL/MariaDB" => "Видалити цього користувача з MySQL/MariaDB",
+"MySQL/MariaDB user '%s'@'%%' already exists" => "Користувач MySQL/MariaDB '%s'@'%%' вже існує",
+"Drop this user from MySQL/MariaDB." => "Видалити цього користувача з MySQL/MariaDB.",
+"Oracle connection could not be established" => "Не можемо з'єднатися з Oracle ",
 "Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні",
 "Offending command was: \"%s\", name: %s, password: %s" => "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
 "PostgreSQL username and/or password not valid" => "PostgreSQL ім'я користувача та/або пароль не дійсні",
 "Set an admin username." => "Встановіть ім'я адміністратора.",
 "Set an admin password." => "Встановіть пароль адміністратора.",
+"Can't create or write into the data directory %s" => "Неможливо створити або записати каталог даних %s",
 "%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",
+"Sharing %s failed, because the user %s is the item owner" => "Не вдалося поділитися з %s, оскільки %s вже є володарем",
+"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 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" => "Вам необхідно задати пароль для створення публічного посилання. Дозволені лише захищені посилання",
+"Sharing %s failed, because sharing with links is not allowed" => "Не вдалося поділитися %s, оскільки публічний доступ через посилання заборонений",
 "Could not find category \"%s\"" => "Не вдалося знайти категорію \"%s\"",
 "seconds ago" => "секунди тому",
 "_%n minute ago_::_%n minutes ago_" => array("","","%n хвилин тому"),
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 23fbf6589ff..786ad676868 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Очаква се валидно име на група",
 "deleted {groupName}" => "{groupName} изтрит",
 "undo" => "възтановяване",
+"no group" => "няма група",
 "never" => "никога",
 "deleted {userName}" => "{userName} изтрит",
 "add group" => "нова група",
@@ -78,6 +79,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Валидна парола трябва да бъде зададена.",
 "Warning: Home directory for user \"{user}\" already exists" => "Предупреждение: Личната директория на потребителя \"{user}\" вече съществува.",
 "__language_name__" => "__language_name__",
+"Personal Info" => "Лична Информация",
 "SSL root certificates" => "SSL root сертификати",
 "Encryption" => "Криптиране",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
@@ -226,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Неограничено",
 "Other" => "Друга...",
 "Username" => "Потребителско Име",
+"Group Admin for" => "Групов администратор за",
 "Quota" => "Квота",
 "Storage Location" => "Място за Запис",
 "Last Login" => "Последно Вписване",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 988321b82d3..0b1afd93e81 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Vous devez spécifier un nom de groupe valide",
 "deleted {groupName}" => "{groupName} supprimé",
 "undo" => "annuler",
+"no group" => "Aucun groupe",
 "never" => "jamais",
 "deleted {userName}" => "{userName} supprimé",
 "add group" => "ajouter un groupe",
@@ -78,6 +79,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Un mot de passe valide doit être saisi",
 "Warning: Home directory for user \"{user}\" already exists" => "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
 "__language_name__" => "Français",
+"Personal Info" => "Informations personnelles",
 "SSL root certificates" => "Certificats racine SSL",
 "Encryption" => "Chiffrement",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
@@ -226,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Illimité",
 "Other" => "Autre",
 "Username" => "Nom d'utilisateur",
+"Group Admin for" => "Groupe administrateur pour",
 "Quota" => "Quota",
 "Storage Location" => "Emplacement du Stockage",
 "Last Login" => "Dernière Connexion",
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
index f91bb756add..8d0770a1745 100644
--- a/settings/l10n/ja.php
+++ b/settings/l10n/ja.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "有効",
+"Recommended" => "推奨",
 "Authentication error" => "認証エラー",
 "Your full name has been changed." => "名前を変更しました。",
 "Unable to change full name" => "名前を変更できません",
@@ -31,7 +32,7 @@ $TRANSLATIONS = array(
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
 "Unable to change password" => "パスワードを変更できません",
 "Saved" => "保存されました",
-"test email settings" => "メール設定をテスト",
+"test email settings" => "メール設定のテスト",
 "If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
 "Email sent" => "メールを送信しました",
 "You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
@@ -137,7 +138,7 @@ $TRANSLATIONS = array(
 "Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
 "Email Server" => "メールサーバー",
-"This is used for sending out notifications." => "これは通知の送信に使われます。",
+"This is used for sending out notifications." => "通知を送信する際に使用します。",
 "Send mode" => "送信モード",
 "From address" => "送信元アドレス",
 "mail" => "メール",
@@ -148,7 +149,7 @@ $TRANSLATIONS = array(
 "Credentials" => "資格情報",
 "SMTP Username" => "SMTP ユーザー名",
 "SMTP Password" => "SMTP パスワード",
-"Test email settings" => "メール設定をテスト",
+"Test email settings" => "メール設定のテスト",
 "Send email" => "メールを送信",
 "Log" => "ログ",
 "Log level" => "ログレベル",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 7432e486d99..23a0f1dcdd4 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Geçerli bir grup adı mutlaka sağlanmalı",
 "deleted {groupName}" => "{groupName} silindi",
 "undo" => "geri al",
+"no group" => "grup yok",
 "never" => "hiçbir zaman",
 "deleted {userName}" => "{userName} silindi",
 "add group" => "grup ekle",
@@ -78,6 +79,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı",
 "Warning: Home directory for user \"{user}\" already exists" => "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
 "__language_name__" => "Türkçe",
+"Personal Info" => "Kişisel Bilgi",
 "SSL root certificates" => "SSL kök sertifikaları",
 "Encryption" => "Şifreleme",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
@@ -226,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Sınırsız",
 "Other" => "Diğer",
 "Username" => "Kullanıcı Adı",
+"Group Admin for" => "Grup Yöneticisi",
 "Quota" => "Kota",
 "Storage Location" => "Depolama Konumu",
 "Last Login" => "Son Giriş",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 68369d782ff..39cb54a4f1a 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Потрібно задати вірне ім'я групи",
 "deleted {groupName}" => "видалено {groupName}",
 "undo" => "відмінити",
+"no group" => "без групи",
 "never" => "ніколи",
 "deleted {userName}" => "видалено {userName}",
 "add group" => "додати групу",
@@ -78,6 +79,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Потрібно задати вірний пароль",
 "Warning: Home directory for user \"{user}\" already exists" => "Попередження: домашня тека користувача \"{user}\" вже існує",
 "__language_name__" => "__language_name__",
+"Personal Info" => "Особиста інформація",
 "SSL root certificates" => "SSL корневі сертифікати",
 "Encryption" => "Шифрування",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
@@ -226,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Необмежено",
 "Other" => "Інше",
 "Username" => "Ім'я користувача",
+"Group Admin for" => "Адміністратор групи",
 "Quota" => "Квота",
 "Storage Location" => "Місцезнаходження сховища",
 "Last Login" => "Останній вхід",
-- 
GitLab


From 5d391910c52309d7c538a2494927b3720dc06d0a Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 27 Oct 2014 01:54:28 -0400
Subject: [PATCH 226/616] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/id.php      | 14 ++++++++++++--
 apps/user_ldap/l10n/ar.php          | 26 +++++++++++++++++++++++++-
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              |  2 +-
 l10n/templates/private.pot          |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/sl.php                     | 21 +++++++++++++++++++++
 settings/l10n/el.php                |  1 +
 settings/l10n/fr.php                |  2 +-
 settings/l10n/sl.php                | 26 ++++++++++++++++++++++++++
 18 files changed, 98 insertions(+), 16 deletions(-)

diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
index c591cbad7f3..10ff3cf0530 100644
--- a/apps/files_sharing/l10n/id.php
+++ b/apps/files_sharing/l10n/id.php
@@ -1,13 +1,20 @@
 <?php
 $TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Berbagi server ke server tidaj diaktifkan pada server ini",
+"Server to server sharing is not enabled on this server" => "Berbagi server ke server tidak diaktifkan pada server ini",
+"The mountpoint name contains invalid characters." => "Nama titik kait berisi karakter yang tidak sah.",
+"Invalid or untrusted SSL certificate" => "Sertifikast SSL tidak sah atau tidak terpercaya",
+"Couldn't add remote share" => "Tidak dapat menambahkan berbagi remote",
 "Shared with you" => "Dibagikan dengan Anda",
 "Shared with others" => "Dibagikan dengan lainnya",
 "Shared by link" => "Dibagikan dengan tautan",
 "No files have been shared with you yet." => "Tidak ada berkas yang dibagikan kepada Anda.",
 "You haven't shared any files yet." => "Anda belum berbagi berkas apapun.",
 "You haven't shared any files by link yet." => "Anda belum berbagi berkas dengan tautan satupun.",
+"Do you want to add the remote share {name} from {owner}@{remote}?" => "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
+"Remote share" => "Berbagi remote",
+"Remote share password" => "Sandi berbagi remote",
 "Cancel" => "Batal",
+"Add remote share" => "Tambah berbagi remote",
 "No ownCloud installation found at {remote}" => "Tidak ada instalasi ownCloud yang ditemukan di {remote}",
 "Invalid ownCloud url" => "URL ownCloud tidak sah",
 "Shared by" => "Dibagikan oleh",
@@ -17,14 +24,17 @@ $TRANSLATIONS = array(
 "Name" => "Nama",
 "Share time" => "Bagikan waktu",
 "Sorry, this link doesn’t seem to work anymore." => "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
-"Reasons might be:" => "Alasan mungkin:",
+"Reasons might be:" => "Alasan yang mungkin:",
 "the item was removed" => "item telah dihapus",
 "the link expired" => "tautan telah kadaluarsa",
 "sharing is disabled" => "berbagi dinonaktifkan",
 "For more info, please ask the person who sent this link." => "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
+"Add to your ownCloud" => "Tambahkan ke ownCloud Anda",
 "Download" => "Unduh",
 "Download %s" => "Unduh %s",
 "Direct link" => "Tautan langsung",
+"Remote Shares" => "Berbagi Remote",
+"Allow other instances to mount public links shared from this server" => "Izinkan instansi lain untuk mengaitkan tautan publik untuk dibagikan dari server ini",
 "Allow users to mount public link shares" => "Izinkan pengguna untuk mengaitkan tautan berbagi publik"
 );
 $PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
index 1b0b1e8d413..e10ada32d55 100644
--- a/apps/user_ldap/l10n/ar.php
+++ b/apps/user_ldap/l10n/ar.php
@@ -1,12 +1,36 @@
 <?php
 $TRANSLATIONS = array(
+"Failed to clear the mappings." => "فشل مسح الارتباطات (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." => "الإعدادات صحيحة، لكن لم ينجح الارتباط. يرجى التأكد من إعدادات الخادم وبيانات التحقق من الدخول.",
+"The configuration is invalid. Please have a look at the logs for further details." => "الإعدادات غير صحيحة. يرجى الاطلاع على سجلات المتابعة للمزيد من التفاصيل.",
+"No action specified" => "لم يتم تحديد الإجراء",
+"No configuration specified" => "لم يتم تحديد الإعدادات.",
+"No data specified" => "لم يتم تحديد البيانات.",
+" Could not set configuration %s" => "تعذر تنفيذ الإعداد %s",
 "Deletion failed" => "فشل الحذف",
+"Take over settings from recent server configuration?" => "الحصول على الخصائص من آخر إعدادات في الخادم؟",
+"Keep settings?" => "الاحتفاظ بالخصائص والإعدادات؟",
+"{nthServer}. Server" => "الخادم {nthServer}.",
+"Cannot add server configuration" => "تعذر إضافة الإعدادات للخادم.",
+"mappings cleared" => "تم مسح الارتباطات (mappings)",
 "Success" => "نجاح",
 "Error" => "خطأ",
+"Please specify a Base DN" => "يرجى تحديد اسم نطاق أساسي Base DN",
+"Could not determine Base DN" => "تعذر التحقق من اسم النطاق الأساسي Base DN",
+"Please specify the port" => "يرجى تحديد المنفذ",
+"Configuration OK" => "الإعدادات صحيحة",
+"Configuration incorrect" => "الإعدادات غير صحيحة",
+"Configuration incomplete" => "الإعدادات غير مكتملة",
 "Select groups" => "إختر مجموعة",
-"_%s group found_::_%s groups found_" => array("","","","","",""),
+"Select object classes" => "اختر أصناف المكونات",
+"Select attributes" => "اختر الخصائص",
+"Connection test succeeded" => "تم اختبار الاتصال بنجاح",
+"Connection test failed" => "فشل اختبار الاتصال",
+"Do you really want to delete the current Server Configuration?" => "هل ترغب فعلاً في حذف إعدادات الخادم الحالي؟",
+"Confirm Deletion" => "تأكيد الحذف",
+"_%s group found_::_%s groups found_" => array("لا توجد مجموعات: %s","تم إيجاد %s مجموعة واحدة","تم إيجاد %s مجموعتين","تم إيجاد %s مجموعات","تم إيجاد %s مجموعة","تم إيجاد %s مجموعة/مجموعات"),
 "_%s user found_::_%s users found_" => array("","","","","",""),
 "Save" => "حفظ",
 "Help" => "المساعدة",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 8cb3ef3ef9f..7d1f8371936 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index ff3de09b1cf..b7a65d3a2bf 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 9341399a925..998d5a9494b 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 336354c3e14..34fbcd3b6c0 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 69ab20a7911..1aba20829be 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 7ed0e50ada7..fd8b4427d2c 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 4a503def85b..909e1300d71 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 99e589c9b5e..e0090d64eb8 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index f4bea1ddb83..5373b5c248b 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 444931677be..88ff7016873 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 51432d90b88..7ff5ef5249a 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index a8b9234798e..0e813ab1ae3 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-26 01:54-0400\n"
+"POT-Creation-Date: 2014-10-27 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 1ae1628fdbd..c004483c0eb 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -1,13 +1,18 @@
 <?php
 $TRANSLATIONS = array(
 "Cannot write into \"config\" directory!" => "Mapa 'config' nima določenih ustreznih dovoljenj za pisanje!",
+"This can usually be fixed by giving the webserver write access to the config directory" => "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo.",
 "See %s" => "Oglejte si %s",
+"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Napako je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo%s.",
 "Sample configuration detected" => "Zaznana je neustrezna preizkusna nastavitev",
+"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Zaznano je, da je bila v sistem kopirana datoteka z enostavno nastavitvijo. To lahko vpliva na namestitev in zato možnost ni podprta. Pred spremembami datoteke config.php si natančno preberite dokumentacijo.",
 "Help" => "Pomoč",
 "Personal" => "Osebno",
 "Settings" => "Nastavitve",
 "Users" => "Uporabniki",
 "Admin" => "Skrbništvo",
+"Recommended" => "Priporočljivo",
+"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Programnika \\\"%s\\\" ni mogoče namestiti, ker različica programa ni skladna z različico okolja ownCloud.",
 "No app name specified" => "Ni podanega imena programa",
 "Unknown filetype" => "Neznana vrsta datoteke",
 "Invalid image" => "Neveljavna slika",
@@ -46,6 +51,7 @@ $TRANSLATIONS = array(
 "PostgreSQL username and/or password not valid" => "Uporabniško ime ali geslo PostgreSQL ni veljavno",
 "Set an admin username." => "Nastavi uporabniško ime skrbnika.",
 "Set an admin password." => "Nastavi geslo skrbnika.",
+"Can't create or write into the data directory %s" => "Ni mogoče zapisati podatkov v podatkovno mapo %s",
 "%s shared »%s« with you" => "%s je omogočil souporabo »%s«",
 "Sharing %s failed, because the file does not exist" => "Souporaba %s je spodletela, ker ta datoteka ne obstaja",
 "You are not allowed to share %s" => "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
@@ -55,9 +61,14 @@ $TRANSLATIONS = array(
 "Sharing %s failed, because this item is already shared with %s" => "Nastavljanje souporabe %s je spodletela, ker je ima uporabnik %s predmet že v souporabi.",
 "Sharing %s failed, because the group %s does not exist" => "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja.",
 "Sharing %s failed, because %s is not a member of the group %s" => "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s.",
+"You need to provide a password to create a public link, only protected links are allowed" => "Navesti je treba geslo za ustvarjanje javne povezave, saj so dovoljene le zaščitene.",
 "Sharing %s failed, because sharing with links is not allowed" => "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena.",
 "Share type %s is not valid for %s" => "Vrsta souporabe %s za %s ni veljavna.",
+"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Nastavljanje dovoljenj za %s je spodletelo, saj ta presegajo dovoljenja dodeljena uporabniku %s.",
+"Setting permissions for %s failed, because the item was not found" => "Nastavljanje dovoljenj za %s je spodletelo, ker predmeta ni mogoče najti.",
+"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Ni mogoče določiti datuma preteka. Ni dovoljeno, da so mape ali datoteke, dodeljene v souporabo, v souporabi po %s.",
 "Cannot set expiration date. Expiration date is in the past" => "Ni mogoče nastaviti datuma preteka. Ta datum je že preteklost.",
+"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend",
 "Sharing backend %s not found" => "Ozadnjega programa %s za souporabo ni mogoče najti",
 "Sharing backend for %s not found" => "Ozadnjega programa za souporabo za %s ni mogoče najti",
 "Sharing %s failed, because the user %s is the original sharer" => "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s omogočil souporabo predmeta.",
@@ -81,18 +92,28 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Navedeno mora biti veljavno geslo",
 "The username is already being used" => "Vpisano uporabniško ime je že v uporabi",
 "No database drivers (sqlite, mysql, or postgresql) installed." => "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).",
+"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Dovoljenja je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje korensko mapo%s.",
 "Cannot write into \"config\" directory" => "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!",
 "Cannot write into \"apps\" directory" => "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!",
+"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku %s za pisanje v mapo programov %s, ali pa z onemogočanjem nameščanja programov v nastavitveni datoteki.",
+"Cannot create \"data\" directory (%s)" => "Ni mogoče ustvariti\"podatkovne\" mape (%s)",
+"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Napako je mogoče odpraviti z  <a href=\"%s\" target=\"_blank\">dodelitvijo dovoljenja spletnemu strežniku za pisanje v korensko mapo</a>.",
 "Setting locale to %s failed" => "Nastavljanje jezikovnih določil na %s je spodletelo.",
+"Please install one of these locales on your system and restart your webserver." => "Namestiti je treba podporo za vsaj eno od navedenih jezikovnih določil v sistemu in nato ponovno zagnati spletni strežnik.",
 "Please ask your server administrator to install the module." => "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
 "PHP module %s not installed." => "Modul PHP %s ni nameščen.",
 "PHP %s or higher is required." => "Zahtevana je različica PHP %s ali višja.",
 "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Obvestite skrbnika strežnika, da je treba posodobiti okolje PHP na najnovejšo različico. Trenutno nameščene različice skupnost PHP in ownCloud ne podpira več.",
+"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Omogočen je varni način PHP. Za pravilno delovanje system ownCloud je treba možnost onemogočiti.",
+"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Možnost varnega načina PHP je opuščena in jo je priporočljivo onemogočiti. Stopite v stik s skrbnikom sistema oziroma onemogočite možnost v datoteki php.ini ali med nastavitvami spletnega strežnika.",
+"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Omogočena je možnost Magic Quotes. Za pravilno delovanje sistema ownCloud je treba možnost onemogočiti.",
+"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Možnost Magic Quotes je opuščena in jo je priporočljivo onemogočiti. Stopite v stik s skrbnikom sistema oziroma onemogočite možnost v datoteki php.ini ali med nastavitvami spletnega strežnika.",
 "PHP modules have been installed, but they are still listed as missing?" => "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
 "Please ask your server administrator to restart the web server." => "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
 "PostgreSQL >= 9 required" => "Zahtevana je različica PostgreSQL >= 9.",
 "Please upgrade your database version" => "Posodobite različico podatkovne zbirke.",
 "Error occurred while checking PostgreSQL version" => "Prišlo je do napake med preverjanjem različice PostgreSQL.",
+"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Prepričajte se, da je nameščena različica PostgreSQL >= 9 in preverite dnevniški zapis za več podrobnosti o napaki.",
 "Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Spremenite dovoljenja mape na 0770 in s tem onemogočite branje vsebine drugim uporabnikom.",
 "Data directory (%s) is readable by other users" => "Podatkovna mapa (%s) ima določena dovoljenja za branje skupine.",
 "Data directory (%s) is invalid" => "Podatkovna mapa (%s) ni veljavna.",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 71e7c9ce387..82fefc35c61 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
 "deleted {groupName}" => "διαγραφή {groupName}",
 "undo" => "αναίρεση",
+"no group" => "καμια ομάδα",
 "never" => "ποτέ",
 "deleted {userName}" => "διαγραφή {userName}",
 "add group" => "προσθήκη ομάδας",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 0b1afd93e81..41c5635bb68 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -228,7 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Illimité",
 "Other" => "Autre",
 "Username" => "Nom d'utilisateur",
-"Group Admin for" => "Groupe administrateur pour",
+"Group Admin for" => "Administrateur de groupe pour",
 "Quota" => "Quota",
 "Storage Location" => "Emplacement du Stockage",
 "Last Login" => "Dernière Connexion",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 90858ab4360..914c5890551 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Omogočeno",
+"Not enabled" => "Ni omogočeno",
+"Recommended" => "Priporočljivo",
 "Authentication error" => "Napaka med overjanjem",
 "Your full name has been changed." => "Vaše polno ime je spremenjeno.",
 "Unable to change full name" => "Ni mogoče spremeniti polnega imena",
@@ -9,12 +11,15 @@ $TRANSLATIONS = array(
 "Files decrypted successfully" => "Datoteke so uspešno odšifrirane",
 "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
 "Couldn't decrypt your files, check your password and try again" => "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
+"Encryption keys deleted permanently" => "Šifrirni ključi so trajno izbrisani",
+"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ni mogoče trajno izbrisati šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
 "Couldn't remove app." => "Ni mogoče odstraniti programa.",
 "Email saved" => "Elektronski naslov je shranjen",
 "Invalid email" => "Neveljaven elektronski naslov",
 "Unable to delete group" => "Skupine ni mogoče izbrisati",
 "Unable to delete user" => "Uporabnika ni mogoče izbrisati",
 "Backups restored successfully" => "Varnostne kopije so uspešno obnovljene.",
+"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Ni mogoče obnoviti šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
 "Language changed" => "Jezik je spremenjen",
 "Invalid request" => "Neveljavna zahteva",
 "Admins can't remove themself from the admin group" => "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
@@ -30,8 +35,10 @@ $TRANSLATIONS = array(
 "Saved" => "Shranjeno",
 "test email settings" => "preizkusi nastavitve elektronske pošte",
 "If you received this email, the settings seem to be correct." => "Če ste prejeli to sporočilo, so nastavitve pravilne.",
+"A problem occurred while sending the email. Please revise your settings." => "Prišlo je do napake med pošiljanjem sporočila na elektronski naslov. Spremeniti je treba nastavitve.",
 "Email sent" => "Elektronska pošta je poslana",
 "You need to set your user email before being able to send test emails." => "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
+"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?",
 "Add trusted domain" => "Dodaj varno domeno",
 "Sending..." => "Poteka pošiljanje ...",
 "All" => "Vsi",
@@ -60,14 +67,19 @@ $TRANSLATIONS = array(
 "Groups" => "Skupine",
 "Unable to delete {objName}" => "Ni mogoče izbrisati {objName}",
 "Error creating group" => "Napaka ustvarjanja skupine",
+"A valid group name must be provided" => "Navedeno mora biti veljavno ime skupine",
+"deleted {groupName}" => "izbrisano {groupName}",
 "undo" => "razveljavi",
+"no group" => "ni skupine",
 "never" => "nikoli",
+"deleted {userName}" => "izbrisano {userName}",
 "add group" => "dodaj skupino",
 "A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
 "Error creating user" => "Napaka ustvarjanja uporabnika",
 "A valid password must be provided" => "Navedeno mora biti veljavno geslo",
 "Warning: Home directory for user \"{user}\" already exists" => "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
 "__language_name__" => "Slovenščina",
+"Personal Info" => "Osebni podatki",
 "SSL root certificates" => "Korenska potrdila SSL",
 "Encryption" => "Šifriranje",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
@@ -85,15 +97,18 @@ $TRANSLATIONS = array(
 "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola HTTPS.",
 "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." => "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo .",
 "Setup Warning" => "Opozorilo nastavitve",
+"Database Performance Info" => "Podrobnosti delovanja podatkovne zbirke",
 "Module 'fileinfo' missing" => "Manjka modul 'fileinfo'.",
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
 "Your PHP version is outdated" => "Nameščena različica PHP je zastarela",
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
+"PHP charset is not set to UTF-8" => "Jezikovni znakovni nabor PHP ni določen kot UTF-8",
 "Locale not working" => "Jezikovne prilagoditve ne delujejo.",
 "System locale can not be set to a one which supports UTF-8." => "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
 "This means that there might be problems with certain characters in file names." => "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
 "Connectivity checks" => "Preverjanje povezav",
+"No problems found" => "Ni zaznanih težav",
 "Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
 "Cron" => "Periodično opravilo",
 "Last cron was executed at %s." => "Zadnje opravilo cron je bilo izvedeno ob %s.",
@@ -103,6 +118,7 @@ $TRANSLATIONS = array(
 "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
 "Sharing" => "Souporaba",
 "Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
+"Allow users to share via link" => "Uporabnikom dovoli omogočanje souporabe s povezavami",
 "Enforce password protection" => "Vsili zaščito z geslom",
 "Allow public uploads" => "Dovoli javno pošiljanje datotek v oblak",
 "Set default expiration date" => "Nastavitev privzetega datuma poteka",
@@ -110,6 +126,7 @@ $TRANSLATIONS = array(
 "days" => "dneh",
 "Enforce expiration date" => "Vsili datum preteka",
 "Allow resharing" => "Dovoli nadaljnjo souporabo",
+"Restrict users to only share with users in their groups" => "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
 "Allow users to send mail notification for shared files" => "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
 "Exclude groups from sharing" => "Izloči skupine iz souporabe",
 "Security" => "Varnost",
@@ -117,7 +134,9 @@ $TRANSLATIONS = array(
 "Forces the clients to connect to %s via an encrypted connection." => "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
 "Email Server" => "Poštni strežnik",
+"This is used for sending out notifications." => "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
 "Send mode" => "Način pošiljanja",
+"From address" => "Naslov pošiljatelja",
 "Authentication method" => "Način overitve",
 "Authentication required" => "Zahtevana je overitev",
 "Server address" => "Naslov strežnika",
@@ -125,6 +144,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Poverila",
 "SMTP Username" => "Uporabniško ime SMTP",
 "SMTP Password" => "Geslo SMTP",
+"Store credentials" => "Shrani poverila",
 "Test email settings" => "Preizkus nastavitev elektronske pošte",
 "Send email" => "Pošlji elektronsko sporočilo",
 "Log" => "Dnevnik",
@@ -133,10 +153,13 @@ $TRANSLATIONS = array(
 "Less" => "Manj",
 "Version" => "Različica",
 "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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
+"More apps" => "Več programov",
+"Add your app" => "Dodajte program",
 "by" => "od",
 "Documentation:" => "Dokumentacija:",
 "User Documentation" => "Uporabniška dokumentacija",
 "Admin Documentation" => "Skrbniška dokumentacija",
+"Update to %s" => "Posodobi na %s",
 "Enable only for specific groups" => "Omogoči le za posamezne skupine",
 "Uninstall App" => "Odstrani program",
 "Administrator Documentation" => "Skrbniška dokumentacija",
@@ -175,6 +198,7 @@ $TRANSLATIONS = array(
 "Decrypt all Files" => "Odšifriraj vse datoteke",
 "Restore Encryption Keys" => "Obnovi šifrirne ključe",
 "Delete Encryption Keys" => "Izbriši šifrirne ključe",
+"Show last log in" => "Pokaži podatke zadnje prijave",
 "Login Name" => "Prijavno ime",
 "Create" => "Ustvari",
 "Admin Recovery Password" => "Obnovitev skrbniškega gesla",
@@ -189,7 +213,9 @@ $TRANSLATIONS = array(
 "Unlimited" => "Neomejeno",
 "Other" => "Drugo",
 "Username" => "Uporabniško ime",
+"Group Admin for" => "Skrbnik skupine za",
 "Quota" => "Količinska omejitev",
+"Storage Location" => "Mesto shrambe",
 "Last Login" => "Zadnja prijava",
 "change full name" => "Spremeni polno ime",
 "set new password" => "nastavi novo geslo",
-- 
GitLab


From e16a58220d1e82beb29ab6fe6102710dcc2ad27a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Oct 2014 12:30:29 +0100
Subject: [PATCH 227/616] allow passing driver options, fixes #11718

---
 lib/private/db/connectionfactory.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php
index 1f676f1fca2..f6253e09b95 100644
--- a/lib/private/db/connectionfactory.php
+++ b/lib/private/db/connectionfactory.php
@@ -153,6 +153,13 @@ class ConnectionFactory {
 		}
 
 		$connectionParams['tablePrefix'] = $config->getSystemValue('dbtableprefix', 'oc_');
+
+		//additional driver options, eg. for mysql ssl
+		$driverOptions = $config->getSystemValue('dbdriveroptions', null);
+		if ($driverOptions) {
+			$connectionParams['driverOptions'] = $driverOptions;
+		}
+
 		return $connectionParams;
 	}
 }
-- 
GitLab


From f7c393fa9f86730cd74fcce9d26bdce008514c7f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 27 Oct 2014 13:38:40 +0100
Subject: [PATCH 228/616] Fix PHPDoc

Stop my IDE and Scrutinizer from complaining.
---
 lib/public/iconfig.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/public/iconfig.php b/lib/public/iconfig.php
index 404cf030dee..554fee5b22f 100644
--- a/lib/public/iconfig.php
+++ b/lib/public/iconfig.php
@@ -46,7 +46,7 @@ interface IConfig {
 	 * Looks up a system wide defined value
 	 *
 	 * @param string $key the key of the value, under which it was saved
-	 * @param string $default the default value to be returned if the value isn't set
+	 * @param mixed $default the default value to be returned if the value isn't set
 	 * @return mixed the value or $default
 	 */
 	public function getSystemValue($key, $default = '');
-- 
GitLab


From de72aff2c1303b848cbf6fa49ea3d8a466344491 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Oct 2014 14:43:31 +0100
Subject: [PATCH 229/616] add driver options to config samples

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

diff --git a/config/config.sample.php b/config/config.sample.php
index 621e5df80b3..268b7cc9d08 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -119,6 +119,13 @@ $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',
+),
+
 /**
  * Indicates whether the ownCloud instance was installed successfully; ``true``
  * indicates a successful installation, and ``false`` indicates an unsuccessful
-- 
GitLab


From 05b2a037f227a7ebe0bf8e9325c271d698f02e1b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 27 Oct 2014 15:58:23 +0100
Subject: [PATCH 230/616] dont fail with 500 if configured display name
 attribute is not set

---
 apps/user_ldap/tests/user_ldap.php | 24 ++++++++++++++++++++++--
 apps/user_ldap/user_ldap.php       |  8 +++++++-
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index e51f6cb5bb9..c89edc33fa9 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -98,9 +98,10 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Prepares the Access mock for checkPassword tests
 	 * @param \OCA\user_ldap\lib\Access $access mock
+	 * @param bool noDisplayName
 	 * @return void
 	 */
-	private function prepareAccessForCheckPassword(&$access) {
+	private function prepareAccessForCheckPassword(&$access, $noDisplayName = false) {
 		$access->expects($this->once())
 			   ->method('escapeFilterPart')
 			   ->will($this->returnCallback(function($uid) {
@@ -125,10 +126,14 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
 					return array();
 			   }));
 
+		$retVal = 'gunslinger';
+		if($noDisplayName === true) {
+			$retVal = false;
+		}
 		$access->expects($this->any())
 			   ->method('dn2username')
 			   ->with($this->equalTo('dnOfRoland,dc=test'))
-			   ->will($this->returnValue('gunslinger'));
+			   ->will($this->returnValue($retVal));
 
 		$access->expects($this->any())
 			   ->method('stringResemblesDN')
@@ -178,6 +183,21 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse($result);
 	}
 
+	public function testCheckPasswordNoDisplayName() {
+		$access = $this->getAccessMock();
+
+		$this->prepareAccessForCheckPassword($access, true);
+		$access->expects($this->once())
+			->method('username2dn')
+			->will($this->returnValue(false));
+
+		$backend = new UserLDAP($access);
+		\OC_User::useBackend($backend);
+
+		$result = $backend->checkPassword('roland', 'dt19');
+		$this->assertFalse($result);
+	}
+
 	public function testCheckPasswordPublicAPI() {
 		$access = $this->getAccessMock();
 		$this->prepareAccessForCheckPassword($access);
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index ae4dfec5118..6e244311d4a 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -64,8 +64,14 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 			return false;
 		}
 		$dn = $ldap_users[0];
-
 		$user = $this->access->userManager->get($dn);
+		if(is_null($user)) {
+			\OCP\Util::writeLog('user_ldap',
+				'LDAP Login: Could not get user object for DN ' . $dn .
+				'. Maybe the LDAP entry has no set display name attribute?',
+				\OCP\Util::WARN);
+			return false;
+		}
 		if($user->getUsername() !== false) {
 			//are the credentials OK?
 			if(!$this->access->areCredentialsValid($dn, $password)) {
-- 
GitLab


From 21d825ed6c11425d36a143f8ed63f1e3852d0aeb Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 27 Oct 2014 16:27:12 +0100
Subject: [PATCH 231/616] Properly catch 503 storage not available in
 getQuotaInfo

When doing a PROPFIND on the root and one of the mount points is not
available, the returned quota attributes will now be zero.

This fix prevents the expected exception to make the whole call fail.
---
 lib/private/connector/sabre/directory.php | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 1b6d1f363b8..0d35c7d528e 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -205,13 +205,17 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
 	 * @return array
 	 */
 	public function getQuotaInfo() {
-		$path = \OC\Files\Filesystem::getView()->getRelativePath($this->info->getPath());
-		$storageInfo = OC_Helper::getStorageInfo($path);
-		return array(
-			$storageInfo['used'],
-			$storageInfo['free']
-		);
-
+		try {
+			$path = \OC\Files\Filesystem::getView()->getRelativePath($this->info->getPath());
+			$storageInfo = OC_Helper::getStorageInfo($path);
+			return array(
+				$storageInfo['used'],
+				$storageInfo['free']
+			);
+		}
+		catch (\OCP\Files\StorageNotAvailableException $e) {
+			return array(0, 0);
+		}
 	}
 
 	/**
-- 
GitLab


From 3f63f4b6b13a358e13a0c5ebd2f85b918b8c410f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 13 Oct 2014 13:14:07 +0200
Subject: [PATCH 232/616] Only mount the storages for the user once

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

diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index cdbbbf3d3cd..51a241a4e33 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -45,6 +45,7 @@ class Filesystem {
 	 */
 	static private $defaultInstance;
 
+	static private $usersSetup = array();
 
 	/**
 	 * classname which used for hooks handling
@@ -321,7 +322,10 @@ class Filesystem {
 		if ($user == '') {
 			$user = \OC_User::getUser();
 		}
-		$parser = new \OC\ArrayParser();
+		if (isset(self::$usersSetup[$user])) {
+			return;
+		}
+		self::$usersSetup[$user] = true;
 
 		$root = \OC_User::getHome($user);
 
-- 
GitLab


From d0ce600eecb96361e1a8ebab853dc4dbadf7c1e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 27 Oct 2014 20:48:47 +0100
Subject: [PATCH 233/616] On Windows platform we have no stable etag generation
 - yet

---
 tests/lib/files/storage/local.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php
index 8fd9f0648ad..37462941d0c 100644
--- a/tests/lib/files/storage/local.php
+++ b/tests/lib/files/storage/local.php
@@ -38,6 +38,10 @@ class Local extends Storage {
 	}
 
 	public function testStableEtag() {
+		if (\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('On Windows platform we have no stable etag generation - yet');
+		}
+
 		$this->instance->file_put_contents('test.txt', 'foobar');
 		$etag1 = $this->instance->getETag('test.txt');
 		$etag2 = $this->instance->getETag('test.txt');
@@ -45,6 +49,10 @@ class Local extends Storage {
 	}
 
 	public function testEtagChange() {
+		if (\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('On Windows platform we have no stable etag generation - yet');
+		}
+
 		$this->instance->file_put_contents('test.txt', 'foo');
 		$this->instance->touch('test.txt', time() - 2);
 		$etag1 = $this->instance->getETag('test.txt');
-- 
GitLab


From 233c49f4b9fc90f5bd023420ed899439fb413db0 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 27 Oct 2014 12:51:26 +0100
Subject: [PATCH 234/616] Make supported DBs configurable within config.php

This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake.

To test this play around with the new configuration parameter "supportedDatabases".
---
 config/config.sample.php  |  17 +++++++
 core/setup/controller.php |  49 ++++++++----------
 lib/base.php              |   2 +-
 lib/private/setup.php     | 103 +++++++++++++++++++++++++++++++++++++-
 lib/private/util.php      |   9 ++--
 tests/lib/setup.php       | 103 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 248 insertions(+), 35 deletions(-)
 create mode 100644 tests/lib/setup.php

diff --git a/config/config.sample.php b/config/config.sample.php
index 621e5df80b3..78bbfff8c85 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -800,6 +800,23 @@ $CONFIG = array(
 	),
 ),
 
+/**
+ * Database types that are supported for installation
+ * Available:
+ * 	- sqlite (SQLite3)
+ * 	- mysql (MySQL)
+ * 	- pgsql (PostgreSQL)
+ * 	- oci (Oracle)
+ * 	- mssql (Microsoft SQL Server)
+ */
+'supportedDatabases' => array(
+	'sqlite',
+	'mysql',
+	'pgsql',
+	'oci',
+	'mssql'
+),
+
 /**
  * Custom CSP policy, changing this will overwrite the standard policy
  */
diff --git a/core/setup/controller.php b/core/setup/controller.php
index 53f247e9769..628a4b0349f 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Copyright (c) 2013 Bart Visscher <bartv@thisnet.nl>
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -8,7 +9,19 @@
 
 namespace OC\Core\Setup;
 
+use OCP\IConfig;
+
 class Controller {
+	/** @var \OCP\IConfig */
+	protected $config;
+
+	/**
+	 * @param IConfig $config
+	 */
+	function __construct(IConfig $config) {
+		$this->config = $config;
+	}
+
 	public function run($post) {
 		// Check for autosetup:
 		$post = $this->loadAutoConfig($post);
@@ -87,28 +100,10 @@ class Controller {
 	 * in case of errors/warnings
 	 */
 	public function getSystemInfo() {
-		$hasSQLite = class_exists('SQLite3');
-		$hasMySQL = is_callable('mysql_connect');
-		$hasPostgreSQL = is_callable('pg_connect');
-		$hasOracle = is_callable('oci_connect');
-		$hasMSSQL = is_callable('sqlsrv_connect');
-		$databases = array();
-		if ($hasSQLite) {
-			$databases['sqlite'] = 'SQLite';
-		}
-		if ($hasMySQL) {
-			$databases['mysql'] = 'MySQL/MariaDB';
-		}
-		if ($hasPostgreSQL) {
-			$databases['pgsql'] = 'PostgreSQL';
-		}
-		if ($hasOracle) {
-			$databases['oci'] = 'Oracle';
-		}
-		if ($hasMSSQL) {
-			$databases['mssql'] = 'MS SQL';
-		}
-		$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
+		$setup = new \OC_Setup($this->config);
+		$databases = $setup->getSupportedDatabases();
+
+		$datadir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$vulnerableToNullByte = false;
 		if(@file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)
 			$vulnerableToNullByte = true;
@@ -150,11 +145,11 @@ class Controller {
 		}
 
 		return array(
-			'hasSQLite' => $hasSQLite,
-			'hasMySQL' => $hasMySQL,
-			'hasPostgreSQL' => $hasPostgreSQL,
-			'hasOracle' => $hasOracle,
-			'hasMSSQL' => $hasMSSQL,
+			'hasSQLite' => isset($databases['sqlite']),
+			'hasMySQL' => isset($databases['mysql']),
+			'hasPostgreSQL' => isset($databases['postgre']),
+			'hasOracle' => isset($databases['oci']),
+			'hasMSSQL' => isset($databases['mssql']),
 			'databases' => $databases,
 			'directory' => $datadir,
 			'htaccessWorking' => $htaccessWorking,
diff --git a/lib/base.php b/lib/base.php
index 23f0e594510..22916c259fc 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -716,7 +716,7 @@ class OC {
 
 		// Check if ownCloud is installed or in maintenance (update) mode
 		if (!OC_Config::getValue('installed', false)) {
-			$controller = new OC\Core\Setup\Controller();
+			$controller = new OC\Core\Setup\Controller(\OC::$server->getConfig());
 			$controller->run($_POST);
 			exit();
 		}
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 75dc1987ee6..8945c2c03f1 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -1,9 +1,27 @@
 <?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+use OCP\IConfig;
 
 class DatabaseSetupException extends \OC\HintException {
 }
 
 class OC_Setup {
+	/** @var IConfig */
+	protected $config;
+
+	/**
+	 * @param IConfig $config
+	 */
+	function __construct(IConfig $config) {
+		$this->config = $config;
+	}
+
 	static $dbSetupClasses = array(
 		'mysql' => '\OC\Setup\MySQL',
 		'pgsql' => '\OC\Setup\PostgreSQL',
@@ -13,10 +31,93 @@ class OC_Setup {
 		'sqlite3' => '\OC\Setup\Sqlite',
 	);
 
+	/**
+	 * @return OC_L10N
+	 */
 	public static function getTrans(){
 		return \OC::$server->getL10N('lib');
 	}
 
+	/**
+	 * Wrapper around the "class_exists" PHP function to be able to mock it
+	 * @param string $name
+	 * @return bool
+	 */
+	public function class_exists($name) {
+		return class_exists($name);
+	}
+
+	/**
+	 * Wrapper around the "is_callable" PHP function to be able to mock it
+	 * @param string $name
+	 * @return bool
+	 */
+	public function is_callable($name) {
+		return is_callable($name);
+	}
+
+	/**
+	 * Get the available and supported databases of this instance
+	 *
+	 * @throws Exception
+	 * @return array
+	 */
+	public function getSupportedDatabases() {
+		$availableDatabases = array(
+			'sqlite' =>  array(
+				'type' => 'class',
+				'call' => 'SQLite3',
+				'name' => 'SQLite'
+			),
+			'mysql' => array(
+				'type' => 'function',
+				'call' => 'mysql_connect',
+				'name' => 'MySQL/MariaDB'
+			),
+			'pgsql' => array(
+				'type' => 'function',
+				'call' => 'oci_connect',
+				'name' => 'PostgreSQL'
+			),
+			'oci' => array(
+				'type' => 'function',
+				'call' => 'oci_connect',
+				'name' => 'Oracle'
+			),
+			'mssql' => array(
+				'type' => 'function',
+				'call' => 'sqlsrv_connect',
+				'name' => 'MS SQL'
+			)
+		);
+		$configuredDatabases = $this->config->getSystemValue('supportedDatabases', array('sqlite', 'mysql', 'pgsql', 'oci', 'mssql'));
+		if(!is_array($configuredDatabases)) {
+			throw new Exception('Supported databases are not properly configured.');
+		}
+
+		$supportedDatabases = array();
+
+		foreach($configuredDatabases as $database) {
+			if(array_key_exists($database, $availableDatabases)) {
+				$working = false;
+				if($availableDatabases[$database]['type'] === 'class') {
+					$working = $this->class_exists($availableDatabases[$database]['call']);
+				} elseif ($availableDatabases[$database]['type'] === 'function') {
+					$working = $this->is_callable($availableDatabases[$database]['call']);
+				}
+				if($working) {
+					$supportedDatabases[$database] = $availableDatabases[$database]['name'];
+				}
+			}
+		}
+
+		return $supportedDatabases;
+	}
+
+	/**
+	 * @param $options
+	 * @return array
+	 */
 	public static function install($options) {
 		$l = self::getTrans();
 
@@ -59,7 +160,7 @@ class OC_Setup {
 		}
 
 		//no errors, good
-		if(    isset($options['trusted_domains'])
+		if(isset($options['trusted_domains'])
 		    && is_array($options['trusted_domains'])) {
 			$trustedDomains = $options['trusted_domains'];
 		} else {
diff --git a/lib/private/util.php b/lib/private/util.php
index 858138f58fe..dd131e41310 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -436,12 +436,9 @@ class OC_Util {
 		}
 
 		$webServerRestart = false;
-		//check for database drivers
-		if (!(is_callable('sqlite_open') or class_exists('SQLite3'))
-			and !is_callable('mysql_connect')
-			and !is_callable('pg_connect')
-			and !is_callable('oci_connect')
-		) {
+		$setup = new OC_Setup($config);
+		$availableDatabases = $setup->getSupportedDatabases();
+		if (empty($availableDatabases)) {
 			$errors[] = array(
 				'error' => $l->t('No database drivers (sqlite, mysql, or postgresql) installed.'),
 				'hint' => '' //TODO: sane hint
diff --git a/tests/lib/setup.php b/tests/lib/setup.php
new file mode 100644
index 00000000000..2c1569dd800
--- /dev/null
+++ b/tests/lib/setup.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+use OCP\IConfig;
+
+class Test_OC_Setup extends PHPUnit_Framework_TestCase {
+
+	/** @var IConfig */
+	protected $config;
+	/** @var \OC_Setup */
+	protected $setupClass;
+
+	public function setUp() {
+		$this->config = $this->getMock('\OCP\IConfig');
+		$this->setupClass = $this->getMock('\OC_Setup', array('class_exists', 'is_callable'), array($this->config));
+	}
+
+	public function testGetSupportedDatabasesWithOneWorking() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->will($this->returnValue(
+				array('sqlite', 'mysql', 'oci')
+			));
+		$this->setupClass
+			->expects($this->once())
+			->method('class_exists')
+			->will($this->returnValue(true));
+		$this->setupClass
+			->expects($this->exactly(2))
+			->method('is_callable')
+			->will($this->returnValue(false));
+		$result = $this->setupClass->getSupportedDatabases();
+		$expectedResult = array(
+			'sqlite' => 'SQLite'
+		);
+
+		$this->assertSame($expectedResult, $result);
+	}
+
+	public function testGetSupportedDatabasesWithNoWorking() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->will($this->returnValue(
+				array('sqlite', 'mysql', 'oci', 'pgsql')
+			));
+		$this->setupClass
+			->expects($this->once())
+			->method('class_exists')
+			->will($this->returnValue(false));
+		$this->setupClass
+			->expects($this->exactly(3))
+			->method('is_callable')
+			->will($this->returnValue(false));
+		$result = $this->setupClass->getSupportedDatabases();
+
+		$this->assertSame(array(), $result);
+	}
+
+	public function testGetSupportedDatabasesWitAllWorking() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->will($this->returnValue(
+				array('sqlite', 'mysql', 'pgsql', 'oci', 'mssql')
+			));
+		$this->setupClass
+			->expects($this->once())
+			->method('class_exists')
+			->will($this->returnValue(true));
+		$this->setupClass
+			->expects($this->exactly(4))
+			->method('is_callable')
+			->will($this->returnValue(true));
+		$result = $this->setupClass->getSupportedDatabases();
+		$expectedResult = array(
+			'sqlite' => 'SQLite',
+			'mysql' => 'MySQL/MariaDB',
+			'pgsql' => 'PostgreSQL',
+			'oci' => 'Oracle',
+			'mssql' => 'MS SQL'
+		);
+		$this->assertSame($expectedResult, $result);
+	}
+
+	/**
+	 * @expectedException \Exception
+	 * @expectedExceptionMessage Supported databases are not properly configured.
+	 */
+	public function testGetSupportedDatabaseException() {
+		$this->config
+			->expects($this->once())
+			->method('getSystemValue')
+			->will($this->returnValue('NotAnArray'));
+		$this->setupClass->getSupportedDatabases();
+	}
+}
\ No newline at end of file
-- 
GitLab


From 79778d6a5118f3d024d1d4c1e001fba8fba13423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 27 Oct 2014 19:53:12 +0100
Subject: [PATCH 235/616] code cleanup during review :+1:

---
 core/setup/controller.php | 16 ++++++++--------
 lib/private/setup.php     | 34 +++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/core/setup/controller.php b/core/setup/controller.php
index 628a4b0349f..f5f05348fd1 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -103,7 +103,7 @@ class Controller {
 		$setup = new \OC_Setup($this->config);
 		$databases = $setup->getSupportedDatabases();
 
-		$datadir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
+		$dataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT.'/data');
 		$vulnerableToNullByte = false;
 		if(@file_exists(__FILE__."\0Nullbyte")) { // Check if the used PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)
 			$vulnerableToNullByte = true;
@@ -114,25 +114,25 @@ class Controller {
 		// Create data directory to test whether the .htaccess works
 		// Notice that this is not necessarily the same data directory as the one
 		// that will effectively be used.
-		@mkdir($datadir);
-		if (is_dir($datadir) && is_writable($datadir)) {
+		@mkdir($dataDir);
+		$htAccessWorking = true;
+		if (is_dir($dataDir) && is_writable($dataDir)) {
 			// Protect data directory here, so we can test if the protection is working
 			\OC_Setup::protectDataDirectory();
 
 			try {
-				$htaccessWorking = \OC_Util::isHtaccessWorking();
+				$htAccessWorking = \OC_Util::isHtaccessWorking();
 			} catch (\OC\HintException $e) {
 				$errors[] = array(
 					'error' => $e->getMessage(),
 					'hint' => $e->getHint()
 				);
-				$htaccessWorking = false;
+				$htAccessWorking = false;
 			}
 		}
 
 		if (\OC_Util::runningOnMac()) {
 			$l10n = \OC::$server->getL10N('core');
-			$themeName = \OC_Util::getTheme();
 			$theme = new \OC_Defaults();
 			$errors[] = array(
 				'error' => $l10n->t(
@@ -151,8 +151,8 @@ class Controller {
 			'hasOracle' => isset($databases['oci']),
 			'hasMSSQL' => isset($databases['mssql']),
 			'databases' => $databases,
-			'directory' => $datadir,
-			'htaccessWorking' => $htaccessWorking,
+			'directory' => $dataDir,
+			'htaccessWorking' => $htAccessWorking,
 			'vulnerableToNullByte' => $vulnerableToNullByte,
 			'errors' => $errors,
 		);
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 8945c2c03f1..b82e0be72e8 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -90,7 +90,8 @@ class OC_Setup {
 				'name' => 'MS SQL'
 			)
 		);
-		$configuredDatabases = $this->config->getSystemValue('supportedDatabases', array('sqlite', 'mysql', 'pgsql', 'oci', 'mssql'));
+		$configuredDatabases = $this->config->getSystemValue('supportedDatabases',
+			array('sqlite', 'mysql', 'pgsql', 'oci', 'mssql'));
 		if(!is_array($configuredDatabases)) {
 			throw new Exception('Supported databases are not properly configured.');
 		}
@@ -122,7 +123,7 @@ class OC_Setup {
 		$l = self::getTrans();
 
 		$error = array();
-		$dbtype = $options['dbtype'];
+		$dbType = $options['dbtype'];
 
 		if(empty($options['adminlogin'])) {
 			$error[] = $l->t('Set an admin username.');
@@ -134,25 +135,25 @@ class OC_Setup {
 			$options['directory'] = OC::$SERVERROOT."/data";
 		}
 
-		if (!isset(self::$dbSetupClasses[$dbtype])) {
-			$dbtype = 'sqlite';
+		if (!isset(self::$dbSetupClasses[$dbType])) {
+			$dbType = 'sqlite';
 		}
 
 		$username = htmlspecialchars_decode($options['adminlogin']);
 		$password = htmlspecialchars_decode($options['adminpass']);
-		$datadir = htmlspecialchars_decode($options['directory']);
+		$dataDir = htmlspecialchars_decode($options['directory']);
 
-		$class = self::$dbSetupClasses[$dbtype];
+		$class = self::$dbSetupClasses[$dbType];
 		/** @var \OC\Setup\AbstractDatabase $dbSetup */
 		$dbSetup = new $class(self::getTrans(), 'db_structure.xml');
 		$error = array_merge($error, $dbSetup->validate($options));
 
 		// validate the data directory
 		if (
-			(!is_dir($datadir) and !mkdir($datadir)) or
-			!is_writable($datadir)
+			(!is_dir($dataDir) and !mkdir($dataDir)) or
+			!is_writable($dataDir)
 		) {
-			$error[] = $l->t("Can't create or write into the data directory %s", array($datadir));
+			$error[] = $l->t("Can't create or write into the data directory %s", array($dataDir));
 		}
 
 		if(count($error) != 0) {
@@ -168,12 +169,12 @@ class OC_Setup {
 		}
 
 		if (OC_Util::runningOnWindows()) {
-			$datadir = rtrim(realpath($datadir), '\\');
+			$dataDir = rtrim(realpath($dataDir), '\\');
 		}
 
-		//use sqlite3 when available, otherise sqlite2 will be used.
-		if($dbtype=='sqlite' and class_exists('SQLite3')) {
-			$dbtype='sqlite3';
+		//use sqlite3 when available, otherwise sqlite2 will be used.
+		if($dbType=='sqlite' and class_exists('SQLite3')) {
+			$dbType='sqlite3';
 		}
 
 		//generate a random salt that is used to salt the local user passwords
@@ -186,9 +187,9 @@ class OC_Setup {
 
 		//write the config file
 		\OC::$server->getConfig()->setSystemValue('trusted_domains', $trustedDomains);
-		\OC::$server->getConfig()->setSystemValue('datadirectory', $datadir);
+		\OC::$server->getConfig()->setSystemValue('datadirectory', $dataDir);
 		\OC::$server->getConfig()->setSystemValue('overwrite.cli.url', \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost() . OC::$WEBROOT);
-		\OC::$server->getConfig()->setSystemValue('dbtype', $dbtype);
+		\OC::$server->getConfig()->setSystemValue('dbtype', $dbType);
 		\OC::$server->getConfig()->setSystemValue('version', implode('.', OC_Util::getVersion()));
 
 		try {
@@ -211,8 +212,7 @@ class OC_Setup {
 		//create the user and group
 		try {
 			OC_User::createUser($username, $password);
-		}
-		catch(Exception $exception) {
+		} catch(Exception $exception) {
 			$error[] = $exception->getMessage();
 		}
 
-- 
GitLab


From 23873d80fe1bf7c47a991acbbcf52e68c9aebf83 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 28 Oct 2014 01:55:38 -0400
Subject: [PATCH 236/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/id.php   | 20 +++++++--
 apps/files_encryption/l10n/pl.php   |  1 +
 l10n/templates/core.pot             |  6 +--
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              | 64 ++++++++++++++---------------
 l10n/templates/private.pot          | 64 ++++++++++++++---------------
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/pl.php                     |  2 +
 settings/l10n/da.php                |  2 +
 settings/l10n/es.php                |  1 +
 settings/l10n/fr.php                |  8 ++--
 settings/l10n/it.php                |  2 +
 settings/l10n/pl.php                |  9 ++++
 settings/l10n/sl.php                | 13 ++++--
 21 files changed, 123 insertions(+), 87 deletions(-)

diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
index c31c3e52089..c1d171d1fc0 100644
--- a/apps/files_encryption/l10n/id.php
+++ b/apps/files_encryption/l10n/id.php
@@ -1,19 +1,31 @@
 <?php
 $TRANSLATIONS = array(
-"Unknown error" => "Galat tidak diketahui",
+"Unknown error" => "Kesalahan tidak diketahui",
+"Missing recovery key password" => "Sandi kunci pemuliahan hilang",
+"Please repeat the recovery key password" => "Silakan ulangi sandi kunci pemulihan",
+"Repeated recovery key password does not match the provided recovery key password" => "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
 "Recovery key successfully enabled" => "Kunci pemulihan berhasil diaktifkan",
 "Could not disable recovery key. Please check your recovery key password!" => "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
 "Recovery key successfully disabled" => "Kunci pemulihan berhasil dinonaktifkan",
+"Please provide the old recovery password" => "Mohon berikan sandi pemulihan lama",
+"Please provide a new recovery password" => "Mohon berikan sandi pemulihan baru",
+"Please repeat the new recovery password" => "Silakan ulangi sandi pemulihan baru",
 "Password successfully changed." => "Sandi berhasil diubah",
 "Could not change the password. Maybe the old password was not correct." => "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
 "Private key password successfully updated." => "Sandi kunci privat berhasil diperbarui.",
 "Could not update the private key password. Maybe the old password was not correct." => "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
 "File recovery settings updated" => "Pengaturan pemulihan berkas diperbarui",
 "Could not update file recovery" => "Tidak dapat memperbarui pemulihan berkas",
+"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
+"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.",
 "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.",
-"Missing requirements." => "Persyaratan yang hilang.",
+"Unknown error. Please check your system settings or contact your administrator" => "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator",
+"Missing requirements." => "Persyaratan tidak terpenuhi.",
+"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Pastikan bahwa PHP 5.3.3 atau yang lebih baru telah diinstal dan OpenSSL bersama ekstensi PHP telah diaktifkan dan dikonfigurasi dengan benar. Untuk saat ini, aplikasi enkripsi akan dinonaktifkan.",
 "Following users are not set up for encryption:" => "Pengguna berikut belum diatur untuk enkripsi:",
-"Initial encryption started... This can take some time. Please wait." => "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+"Initial encryption started... This can take some time. Please wait." => "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+"Initial encryption running... Please try again later." => "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
+"Go directly to your %spersonal settings%s." => "Langsung ke %spengaturan pribadi%s Anda.",
 "Encryption" => "Enkripsi",
 "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",
 "Enable recovery key (allow to recover users files in case of password loss):" => "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
@@ -26,6 +38,8 @@ $TRANSLATIONS = array(
 "New Recovery key password" => "Sandi kunci Pemulihan Baru",
 "Repeat New Recovery key password" => "Ulangi sandi kunci Pemulihan baru",
 "Change Password" => "Ubah sandi",
+"Your private key password no longer matches your log-in password." => "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
+"Set your old private key password to your current log-in password:" => "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
 " If you don't remember your old password you can ask your administrator to recover your files." => "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
 "Old log-in password" => "Sandi masuk yang lama",
 "Current log-in password" => "Sandi masuk saat ini",
diff --git a/apps/files_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
index b7a66462ef2..c52c3ddee99 100644
--- a/apps/files_encryption/l10n/pl.php
+++ b/apps/files_encryption/l10n/pl.php
@@ -1,6 +1,7 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Nieznany błąd",
+"Please repeat the recovery key password" => "Proszę powtórz nowe hasło klucza odzyskiwania",
 "Recovery key successfully enabled" => "Klucz odzyskiwania włączony",
 "Could not disable recovery key. Please check your recovery key password!" => "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
 "Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 7d1f8371936..db83a13d3ef 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -566,14 +566,14 @@ msgstr ""
 msgid "New Password"
 msgstr ""
 
-#: setup/controller.php:144
+#: setup/controller.php:139
 #, php-format
 msgid ""
 "Mac OS X is not supported and %s will not work properly on this platform. "
 "Use it at your own risk! "
 msgstr ""
 
-#: setup/controller.php:148
+#: setup/controller.php:143
 msgid "For the best results, please consider using a GNU/Linux server instead."
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index b7a65d3a2bf..fae34af9b91 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 998d5a9494b..7f9ff02a5e2 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 34fbcd3b6c0..2c745157a39 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 1aba20829be..8b413120455 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index fd8b4427d2c..499fc47b987 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 909e1300d71..d1ad5c42f3c 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index e0090d64eb8..dd7839e7b0c 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "See %s"
 msgstr ""
 
-#: base.php:209 private/util.php:461
+#: base.php:209 private/util.php:458
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
@@ -258,15 +258,15 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: private/setup.php:27
+#: private/setup.php:129
 msgid "Set an admin username."
 msgstr ""
 
-#: private/setup.php:30
+#: private/setup.php:132
 msgid "Set an admin password."
 msgstr ""
 
-#: private/setup.php:54
+#: private/setup.php:156
 #, php-format
 msgid "Can't create or write into the data directory %s"
 msgstr ""
@@ -473,144 +473,144 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: private/util.php:446
+#: private/util.php:443
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: private/util.php:453
+#: private/util.php:450
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: private/util.php:460
+#: private/util.php:457
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: private/util.php:474
+#: private/util.php:471
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: private/util.php:475
+#: private/util.php:472
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: private/util.php:490
+#: private/util.php:487
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: private/util.php:491
+#: private/util.php:488
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: private/util.php:508
+#: private/util.php:505
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: private/util.php:511
+#: private/util.php:508
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: private/util.php:540
+#: private/util.php:537
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: private/util.php:560
+#: private/util.php:557
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: private/util.php:568
+#: private/util.php:565
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: private/util.php:569
+#: private/util.php:566
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: private/util.php:580
+#: private/util.php:577
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:581
+#: private/util.php:578
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:588
+#: private/util.php:585
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:589
+#: private/util.php:586
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:603
+#: private/util.php:600
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: private/util.php:604
+#: private/util.php:601
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: private/util.php:634
+#: private/util.php:631
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: private/util.php:635
+#: private/util.php:632
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: private/util.php:642
+#: private/util.php:639
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: private/util.php:643
+#: private/util.php:640
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: private/util.php:708
+#: private/util.php:705
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: private/util.php:717
+#: private/util.php:714
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: private/util.php:738
+#: private/util.php:735
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: private/util.php:739
+#: private/util.php:736
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 5373b5c248b..d5836a75d3f 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -218,15 +218,15 @@ msgstr ""
 msgid "PostgreSQL username and/or password not valid"
 msgstr ""
 
-#: setup.php:27
+#: setup.php:129
 msgid "Set an admin username."
 msgstr ""
 
-#: setup.php:30
+#: setup.php:132
 msgid "Set an admin password."
 msgstr ""
 
-#: setup.php:54
+#: setup.php:156
 #, php-format
 msgid "Can't create or write into the data directory %s"
 msgstr ""
@@ -432,151 +432,151 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: util.php:446
+#: util.php:443
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: util.php:453
+#: util.php:450
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: util.php:460
+#: util.php:457
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: util.php:461
+#: util.php:458
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
 "config directory%s."
 msgstr ""
 
-#: util.php:474
+#: util.php:471
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: util.php:475
+#: util.php:472
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: util.php:490
+#: util.php:487
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: util.php:491
+#: util.php:488
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: util.php:508
+#: util.php:505
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: util.php:511
+#: util.php:508
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: util.php:540
+#: util.php:537
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: util.php:560
+#: util.php:557
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: util.php:568
+#: util.php:565
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: util.php:569
+#: util.php:566
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: util.php:580
+#: util.php:577
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:581
+#: util.php:578
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:588
+#: util.php:585
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:589
+#: util.php:586
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:603
+#: util.php:600
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: util.php:604
+#: util.php:601
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: util.php:634
+#: util.php:631
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: util.php:635
+#: util.php:632
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: util.php:642
+#: util.php:639
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: util.php:643
+#: util.php:640
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: util.php:708
+#: util.php:705
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: util.php:717
+#: util.php:714
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: util.php:738
+#: util.php:735
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: util.php:739
+#: util.php:736
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 88ff7016873..a176064439c 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:55-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 7ff5ef5249a..edc4143ba34 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 0e813ab1ae3..eb6a314a5a6 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-27 01:54-0400\n"
+"POT-Creation-Date: 2014-10-28 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 4b73fffa6cf..81c844f6d5f 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Ustawienia",
 "Users" => "Użytkownicy",
 "Admin" => "Administrator",
+"Recommended" => "Polecane",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikacja  \\\"%s\\\" nie może zostać zainstalowana ponieważ nie jest kompatybilna z tą wersją ownCloud.",
 "No app name specified" => "Nie określono nazwy aplikacji",
 "Unknown filetype" => "Nieznany typ pliku",
@@ -50,6 +51,7 @@ $TRANSLATIONS = array(
 "PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
 "Set an admin username." => "Ustaw nazwę administratora.",
 "Set an admin password." => "Ustaw hasło administratora.",
+"Can't create or write into the data directory %s" => "Nie można tworzyć ani zapisywać w katalogu %s",
 "%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
 "Sharing %s failed, because the file does not exist" => "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
 "You are not allowed to share %s" => "Nie masz uprawnień aby udostępnić %s",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 802b70cc0b5..814f809e10e 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Et gyldigt gruppenavn skal angives ",
 "deleted {groupName}" => "slettede {groupName}",
 "undo" => "fortryd",
+"no group" => "ingen gruppe",
 "never" => "aldrig",
 "deleted {userName}" => "slettede {userName}",
 "add group" => "Tilføj gruppe",
@@ -227,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Ubegrænset",
 "Other" => "Andet",
 "Username" => "Brugernavn",
+"Group Admin for" => "Gruppeadministrator for",
 "Quota" => "Kvote",
 "Storage Location" => "Placering af lageret",
 "Last Login" => "Seneste login",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index adf474cda01..91fdbe2f3e1 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Se debe dar un nombre válido para el grupo ",
 "deleted {groupName}" => "borrado {groupName}",
 "undo" => "deshacer",
+"no group" => "sin grupo",
 "never" => "nunca",
 "deleted {userName}" => "borrado {userName}",
 "add group" => "añadir Grupo",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 41c5635bb68..56c89bc412d 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,8 +1,8 @@
 <?php
 $TRANSLATIONS = array(
-"Enabled" => "Activée",
-"Not enabled" => "Désactivée",
-"Recommended" => "Recommandée",
+"Enabled" => "Activées",
+"Not enabled" => "Désactivées",
+"Recommended" => "Recommandées",
 "Authentication error" => "Erreur d'authentification",
 "Your full name has been changed." => "Votre nom complet a été modifié.",
 "Unable to change full name" => "Impossible de changer le nom complet",
@@ -190,7 +190,7 @@ $TRANSLATIONS = array(
 "Full Name" => "Nom complet",
 "Email" => "Adresse mail",
 "Your email address" => "Votre adresse e-mail",
-"Fill in an email address to enable password recovery and receive notifications" => "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
+"Fill in an email address to enable password recovery and receive notifications" => "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
 "Profile picture" => "Photo de profil",
 "Upload new" => "Nouvelle depuis votre ordinateur",
 "Select new from Files" => "Nouvelle depuis les Fichiers",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index e7ecb9a69a1..727017740ae 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -70,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Deve essere fornito un nome valido per il gruppo",
 "deleted {groupName}" => "{groupName} eliminato",
 "undo" => "annulla",
+"no group" => "nessun gruppo",
 "never" => "mai",
 "deleted {userName}" => "{userName} eliminato",
 "add group" => "aggiungi gruppo",
@@ -227,6 +228,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Illimitata",
 "Other" => "Altro",
 "Username" => "Nome utente",
+"Group Admin for" => "Gruppo di amministrazione per",
 "Quota" => "Quote",
 "Storage Location" => "Posizione di archiviazione",
 "Last Login" => "Ultimo accesso",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 01e3c5afe96..481fec558b6 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Enabled" => "Włączone",
+"Not enabled" => "Nie włączone",
+"Recommended" => "Polecane",
 "Authentication error" => "Błąd uwierzytelniania",
 "Your full name has been changed." => "Twoja pełna nazwa została zmieniona.",
 "Unable to change full name" => "Nie można zmienić pełnej nazwy",
@@ -33,6 +35,7 @@ $TRANSLATIONS = array(
 "Saved" => "Zapisano",
 "test email settings" => "przetestuj ustawienia email",
 "If you received this email, the settings seem to be correct." => "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
+"A problem occurred while sending the email. Please revise your settings." => "Pojawił się problem podczas wysyłania email. Proszę sprawdzić ponownie ustawienia",
 "Email sent" => "E-mail wysłany",
 "You need to set your user email before being able to send test emails." => "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
@@ -67,6 +70,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Należy podać prawidłową nazwę grupy",
 "deleted {groupName}" => "usunięto {groupName}",
 "undo" => "cofnij",
+"no group" => "brak grupy",
 "never" => "nigdy",
 "deleted {userName}" => "usunięto {userName}",
 "add group" => "dodaj grupę",
@@ -75,6 +79,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Należy podać prawidłowe hasło",
 "Warning: Home directory for user \"{user}\" already exists" => "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
 "__language_name__" => "polski",
+"Personal Info" => "Informacje osobiste",
 "SSL root certificates" => "Główny certyfikat SSL",
 "Encryption" => "Szyfrowanie",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
@@ -157,10 +162,13 @@ $TRANSLATIONS = array(
 "Version" => "Wersja",
 "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>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "More apps" => "Więcej aplikacji",
+"Add your app" => "Dodaj twoją aplikację",
 "by" => "przez",
+"licensed" => "Licencja",
 "Documentation:" => "Dokumentacja:",
 "User Documentation" => "Dokumentacja użytkownika",
 "Admin Documentation" => "Dokumentacja Administratora",
+"Update to %s" => "Aktualizuj do %s",
 "Enable only for specific groups" => "Włącz tylko dla określonych grup",
 "Uninstall App" => "Odinstaluj aplikację",
 "Administrator Documentation" => "Dokumentacja administratora",
@@ -219,6 +227,7 @@ $TRANSLATIONS = array(
 "Unlimited" => "Bez limitu",
 "Other" => "Inne",
 "Username" => "Nazwa użytkownika",
+"Group Admin for" => "Grupa Admin dla",
 "Quota" => "Udział",
 "Storage Location" => "Lokalizacja magazynu",
 "Last Login" => "Ostatnio zalogowany",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 914c5890551..9866e44afa0 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -111,11 +111,12 @@ $TRANSLATIONS = array(
 "No problems found" => "Ni zaznanih težav",
 "Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
 "Cron" => "Periodično opravilo",
-"Last cron was executed at %s." => "Zadnje opravilo cron je bilo izvedeno ob %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Zadnje opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
-"Cron was not executed yet!" => "Opravilo Cron še ni zagnano!",
+"Last cron was executed at %s." => "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
+"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Zadnje periodično opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
+"Cron was not executed yet!" => "Periodično opravilo cron še ni zagnano!",
 "Execute one task with each page loaded" => "Izvedi eno nalogo z vsako naloženo stranjo.",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+"Use system's cron service to call the cron.php file every 15 minutes." => "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
 "Sharing" => "Souporaba",
 "Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
 "Allow users to share via link" => "Uporabnikom dovoli omogočanje souporabe s povezavami",
@@ -129,6 +130,7 @@ $TRANSLATIONS = array(
 "Restrict users to only share with users in their groups" => "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
 "Allow users to send mail notification for shared files" => "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
 "Exclude groups from sharing" => "Izloči skupine iz souporabe",
+"These groups will still be able to receive shares, but not to initiate them." => "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
 "Security" => "Varnost",
 "Enforce HTTPS" => "Zahtevaj uporabo HTTPS",
 "Forces the clients to connect to %s via an encrypted connection." => "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
@@ -192,12 +194,15 @@ $TRANSLATIONS = array(
 "Help translate" => "Sodelujte pri prevajanju",
 "Common Name" => "Splošno ime",
 "Valid until" => "Veljavno do",
+"Issued By" => "Izdajatelj",
+"Valid until %s" => "Veljavno do %s",
 "Import Root Certificate" => "Uvozi korensko potrdilo",
 "The encryption app is no longer enabled, please decrypt all your files" => "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
 "Log-in password" => "Prijavno geslo",
 "Decrypt all Files" => "Odšifriraj vse datoteke",
 "Restore Encryption Keys" => "Obnovi šifrirne ključe",
 "Delete Encryption Keys" => "Izbriši šifrirne ključe",
+"Show storage location" => "Pokaži mesto shrambe",
 "Show last log in" => "Pokaži podatke zadnje prijave",
 "Login Name" => "Prijavno ime",
 "Create" => "Ustvari",
-- 
GitLab


From 510d0b2cf3c108447f42fcb119560175134fb0f6 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 28 Oct 2014 11:15:58 +0100
Subject: [PATCH 237/616] Fix the "addHeader($tag, $attributes, $text)" methods
 to not ignore the $text parameter

Also support closing tags with no text content given

Conflicts:
	lib/private/template.php
---
 core/templates/layout.base.php  | 10 +---------
 core/templates/layout.guest.php | 11 +----------
 core/templates/layout.user.php  | 10 +---------
 lib/private/template.php        | 27 +++++++++++++++++++++------
 lib/private/util.php            |  6 +++---
 lib/public/util.php             |  6 ++++--
 6 files changed, 31 insertions(+), 39 deletions(-)

diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index 3325bc9165e..2b496c23246 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -21,15 +21,7 @@
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
-		<?php foreach ($_['headers'] as $header): ?>
-			<?php
-				print_unescaped('<'.$header['tag'].' ');
-				foreach ($header['attributes'] as $name => $value) {
-					print_unescaped("$name='$value' ");
-				};
-				print_unescaped('/>');
-			?>
-		<?php endforeach; ?>
+		<?php print_unescaped($_['headers']); ?>
 	</head>
 	<body id="body-public">
 		<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 0ad2ea4d807..763af4dc1d2 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -22,16 +22,7 @@
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
-
-		<?php foreach($_['headers'] as $header): ?>
-			<?php
-				print_unescaped('<'.$header['tag'].' ');
-				foreach($header['attributes'] as $name=>$value) {
-					print_unescaped("$name='$value' ");
-				};
-				print_unescaped('/>');
-			?>
-		<?php endforeach; ?>
+		<?php print_unescaped($_['headers']); ?>
 	</head>
 	<body id="<?php p($_['bodyid']);?>">
 		<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 6164d16ac17..9f94344b21b 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -29,15 +29,7 @@
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script>
 		<?php endforeach; ?>
-		<?php foreach($_['headers'] as $header): ?>
-			<?php
-				print_unescaped('<'.$header['tag'].' ');
-				foreach($header['attributes'] as $name=>$value) {
-					print_unescaped("$name='$value' ");
-				};
-				print_unescaped('/>');
-			?>
-		<?php endforeach; ?>
+		<?php print_unescaped($_['headers']); ?>
 	</head>
 	<body id="<?php p($_['bodyid']);?>">
 	<noscript><div id="nojavascript"><div><?php print_unescaped($l->t('This application requires JavaScript for correct operation. Please <a href="http://enable-javascript.com/" target="_blank">enable JavaScript</a> and reload the page.')); ?></div></div></noscript>
diff --git a/lib/private/template.php b/lib/private/template.php
index fe0cde53ff1..9ad9d5466db 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -158,10 +158,15 @@ class OC_Template extends \OC\Template\Base {
 	 * Add a custom element to the header
 	 * @param string $tag tag name of the element
 	 * @param array $attributes array of attributes for the element
-	 * @param string $text the text content for the element
+	 * @param string $text the text content for the element. If $text is null then the
+	 * element will be written as empty element. So use "" to get a closing tag.
 	 */
-	public function addHeader( $tag, $attributes, $text='') {
-		$this->headers[]=array('tag'=>$tag,'attributes'=>$attributes, 'text'=>$text);
+	public function addHeader($tag, $attributes, $text=null) {
+		$this->headers[]= array(
+			'tag' => $tag,
+			'attributes' => $attributes,
+			'text' => $text
+		);
 	}
 
 	/**
@@ -178,12 +183,22 @@ class OC_Template extends \OC\Template\Base {
 			$page = new OC_TemplateLayout($this->renderas, $this->app);
 
 			// Add custom headers
-			$page->assign('headers', $this->headers, false);
+			$headers = '';
 			foreach(OC_Util::$headers as $header) {
-				$page->append('headers', $header);
+				$headers .= '<'.OC_Util::sanitizeHTML($header['tag']);
+				foreach($header['attributes'] as $name=>$value) {
+					$headers .= ' "'.OC_Util::sanitizeHTML($name).'"="'.OC_Util::sanitizeHTML($value).'"';
+				}
+				if ($header['text'] !== null) {
+					$headers .= '>'.OC_Util::sanitizeHTML($header['text']).'</'.OC_Util::sanitizeHTML($header['tag']).'>';
+				} else {
+					$headers .= '/>';
+				}
 			}
 
-			$page->assign( "content", $data, false );
+			$page->assign('headers', $headers, false);
+
+			$page->assign('content', $data, false );
 			return $page->fetchPage();
 		}
 		else{
diff --git a/lib/private/util.php b/lib/private/util.php
index 6cd982c222e..b949406690e 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -370,13 +370,13 @@ class OC_Util {
 
 	/**
 	 * Add a custom element to the header
-	 *
+	 * If $text is null then the element will be written as empty element.
+	 * So use "" to get a closing tag.
 	 * @param string $tag tag name of the element
 	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
-	 * @return void
 	 */
-	public static function addHeader($tag, $attributes, $text = '') {
+	public static function addHeader($tag, $attributes, $text=null) {
 		self::$headers[] = array(
 			'tag' => $tag,
 			'attributes' => $attributes,
diff --git a/lib/public/util.php b/lib/public/util.php
index 4c4a84af240..e40fdcfae79 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -138,12 +138,14 @@ class Util {
 
 	/**
 	 * Add a custom element to the header
+	 * If $text is null then the element will be written as empty element.
+	 * So use "" to get a closing tag.
 	 * @param string $tag tag name of the element
 	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
 	 */
-	public static function addHeader( $tag, $attributes, $text='') {
-		\OC_Util::addHeader( $tag, $attributes, $text );
+	public static function addHeader($tag, $attributes, $text=null) {
+		\OC_Util::addHeader($tag, $attributes, $text);
 	}
 
 	/**
-- 
GitLab


From 0e3f2055d2375643b468766c1accfe14857155d4 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 28 Jul 2014 18:48:17 -0700
Subject: [PATCH 238/616] use Composer autoloader not OC for non-Composer
 3rdparty (#9643)

Composer's autoloader is rather better than the OwnCloud autoloader's
handling of non-OC classes. Plus we can rely on upstream Composer to
maintain it and not worry about it ourselves.

With this change, we drop the bits of OwnCloud's autoloader that
handled non-OC classes, and register the classes that were being
handled by that code with Composer's autoloader instead. As these
dependencies are converted to actually being managed by Composer,
the explicit registrations can be dropped as they won't be needed
any more.

Since OwnCloud's autoloader isn't going to handle non-OC classes any
more, we no longer need to test to make sure it does it right.

drop unneeded registerPrefix() and registerClass() from autoloader

Now we're not handling anything but OC's own classes, these are
unnecessary.

error out if composer autoloader is not found (thanks bantu)

We're never going to be able to work without the autoloader, if it's not
there we should just throw our hands up and surrender.
---
 lib/autoloader.php       | 28 ----------------------------
 lib/base.php             | 34 ++++++++++++++++++----------------
 tests/lib/autoloader.php | 15 ---------------
 3 files changed, 18 insertions(+), 59 deletions(-)

diff --git a/lib/autoloader.php b/lib/autoloader.php
index 54f01d9be94..f5927128820 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -21,26 +21,6 @@ class Autoloader {
 	 */
 	protected $memoryCache;
 
-	/**
-	 * Add a custom prefix to the autoloader
-	 *
-	 * @param string $prefix
-	 * @param string $path
-	 */
-	public function registerPrefix($prefix, $path) {
-		$this->prefixPaths[$prefix] = $path;
-	}
-
-	/**
-	 * Add a custom classpath to the autoloader
-	 *
-	 * @param string $class
-	 * @param string $path
-	 */
-	public function registerClass($class, $path) {
-		$this->classPaths[$class] = $path;
-	}
-
 	/**
 	 * disable the usage of the global classpath \OC::$CLASSPATH
 	 */
@@ -99,14 +79,6 @@ class Autoloader {
 			$paths[] = 'tests/lib/' . strtolower(str_replace('_', '/', substr($class, 5)) . '.php');
 		} elseif (strpos($class, 'Test\\') === 0) {
 			$paths[] = 'tests/lib/' . strtolower(str_replace('\\', '/', substr($class, 5)) . '.php');
-		} else {
-			foreach ($this->prefixPaths as $prefix => $dir) {
-				if (0 === strpos($class, $prefix)) {
-					$path = str_replace('\\', '/', $class) . '.php';
-					$path = str_replace('_', '/', $path);
-					$paths[] = $dir . '/' . $path;
-				}
-			}
 		}
 		return $paths;
 	}
diff --git a/lib/base.php b/lib/base.php
index 4a5f4e77a59..50e415c334c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -447,17 +447,27 @@ class OC {
 		$loaderStart = microtime(true);
 		require_once __DIR__ . '/autoloader.php';
 		self::$loader = new \OC\Autoloader();
-		self::$loader->registerPrefix('Doctrine\\Common', 'doctrine/common/lib');
-		self::$loader->registerPrefix('Doctrine\\DBAL', 'doctrine/dbal/lib');
-		self::$loader->registerPrefix('Symfony\\Component\\Routing', 'symfony/routing');
-		self::$loader->registerPrefix('Symfony\\Component\\Console', 'symfony/console');
-		self::$loader->registerPrefix('Patchwork', '3rdparty');
-		self::$loader->registerPrefix('Pimple', '3rdparty/Pimple');
 		spl_autoload_register(array(self::$loader, 'load'));
 		$loaderEnd = microtime(true);
 
-		// setup the basic server
 		self::initPaths();
+
+		// setup 3rdparty autoloader
+		$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
+		if (file_exists($vendorAutoLoad)) {
+			$loader = require_once $vendorAutoLoad;
+			$loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple');
+			$loader->add('Doctrine\\Common',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/common/lib');
+			$loader->add('Doctrine\\DBAL',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/dbal/lib');
+			$loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
+			$loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
+			$loader->add('Patchwork',OC::$THIRDPARTYROOT . '/3rdparty');
+		} else {
+			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
+			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
+		}
+
+		// setup the basic server
 		self::$server = new \OC\Server();
 		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
 		\OC::$server->getEventLogger()->start('boot', 'Initialize');
@@ -494,17 +504,9 @@ class OC {
 		self::handleAuthHeaders();
 		self::registerAutoloaderCache();
 
-
-		OC_Util::isSetLocaleWorking();
-
-		// setup 3rdparty autoloader
-		$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
-		if (file_exists($vendorAutoLoad)) {
-			require_once $vendorAutoLoad;
-		}
-
 		// initialize intl fallback is necessary
 		\Patchwork\Utf8\Bootup::initIntl();
+		OC_Util::isSetLocaleWorking();
 
 		if (!defined('PHPUNIT_RUN')) {
 			OC\Log\ErrorHandler::setLogger(OC_Log::$object);
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index 314a8ebee8d..46172647249 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -30,21 +30,6 @@ class AutoLoader extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(array('private/legacy/files.php', 'private/files.php'), $this->loader->findClass('OC_Files'));
 	}
 
-	public function testClassPath() {
-		$this->loader->registerClass('Foo\Bar', 'foobar.php');
-		$this->assertEquals(array('foobar.php'), $this->loader->findClass('Foo\Bar'));
-	}
-
-	public function testPrefixNamespace() {
-		$this->loader->registerPrefix('Foo', 'foo');
-		$this->assertEquals(array('foo/Foo/Bar.php'), $this->loader->findClass('Foo\Bar'));
-	}
-
-	public function testPrefix() {
-		$this->loader->registerPrefix('Foo_', 'foo');
-		$this->assertEquals(array('foo/Foo/Bar.php'), $this->loader->findClass('Foo_Bar'));
-	}
-
 	public function testLoadTestNamespace() {
 		$this->assertEquals(array('tests/lib/foo/bar.php'), $this->loader->findClass('Test\Foo\Bar'));
 	}
-- 
GitLab


From c93ddf77b9e75b9e38764ad4360d82600eae3096 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 23 Oct 2014 15:28:26 +0200
Subject: [PATCH 239/616] Use composer autoloader to load Patchwork

---
 3rdparty     | 2 +-
 lib/base.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/3rdparty b/3rdparty
index 94179d9d70b..f4b9191a5f8 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 94179d9d70b6be43ff4251941034cd2735d10f4e
+Subproject commit f4b9191a5f825a4285bff4b8478537a20997534c
diff --git a/lib/base.php b/lib/base.php
index 50e415c334c..3d374f12f7d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -461,7 +461,6 @@ class OC {
 			$loader->add('Doctrine\\DBAL',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/dbal/lib');
 			$loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
 			$loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
-			$loader->add('Patchwork',OC::$THIRDPARTYROOT . '/3rdparty');
 		} else {
 			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
 			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
@@ -525,7 +524,6 @@ class OC {
 		stream_wrapper_register('quota', 'OC\Files\Stream\Quota');
 		stream_wrapper_register('oc', 'OC\Files\Stream\OC');
 
-
 		\OC::$server->getEventLogger()->start('init_session', 'Initialize session');
 		self::initTemplateEngine();
 		OC_App::loadApps(array('session'));
-- 
GitLab


From 2974d4d3809c75eb3f69474b892fbc12fbe691c9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 28 Oct 2014 15:13:29 +0100
Subject: [PATCH 240/616] Reset the users setup after clearing mounts

---
 lib/private/files/filesystem.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index 51a241a4e33..c7dc99c55cb 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -431,6 +431,7 @@ class Filesystem {
 	 */
 	public static function clearMounts() {
 		if (self::$mounts) {
+			self::$usersSetup = array();
 			self::$mounts->clear();
 		}
 	}
-- 
GitLab


From 46c2909c785267fc1c71cf2aa635d467ab2cded5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 21 Oct 2014 15:30:23 +0200
Subject: [PATCH 241/616] Update doctrine/dbal to 2.5

---
 3rdparty     | 2 +-
 lib/base.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/3rdparty b/3rdparty
index f4b9191a5f8..e726a92d4af 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit f4b9191a5f825a4285bff4b8478537a20997534c
+Subproject commit e726a92d4af699fcb1085d7219dcfbbbb953da83
diff --git a/lib/base.php b/lib/base.php
index 3d374f12f7d..049f4216ee1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -457,8 +457,6 @@ class OC {
 		if (file_exists($vendorAutoLoad)) {
 			$loader = require_once $vendorAutoLoad;
 			$loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple');
-			$loader->add('Doctrine\\Common',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/common/lib');
-			$loader->add('Doctrine\\DBAL',OC::$THIRDPARTYROOT . '/3rdparty/doctrine/dbal/lib');
 			$loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
 			$loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
 		} else {
-- 
GitLab


From 4faee4011d2e6918d46384f6eaf86b06222eaf3c Mon Sep 17 00:00:00 2001
From: jknockaert <jasper@knockaert.nl>
Date: Tue, 28 Oct 2014 19:19:10 +0100
Subject: [PATCH 242/616] initialisation of cipher

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

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index c98e21cdcb7..ce5e8c8b54c 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -385,7 +385,7 @@ class Util {
 			&& $this->isEncryptedPath($path)
 		) {
 
-			$cipher = Helper::getCipher();
+			$cipher = 'AES-128-CFB';
 			$realSize = 0;
 
 			// get the size from filesystem
-- 
GitLab


From cb944814d9be6e7b7bcff6e41e25a34ecc36fa40 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 29 Oct 2014 01:54:45 -0400
Subject: [PATCH 243/616] [tx-robot] updated from transifex

---
 apps/files/l10n/eu.php              |  1 +
 apps/files_encryption/l10n/eu.php   |  6 ++++++
 apps/files_external/l10n/eu.php     |  4 ++++
 apps/files_sharing/l10n/eu.php      |  2 ++
 apps/user_ldap/l10n/eu.php          |  1 +
 core/l10n/eu.php                    | 22 +++++++++++++++++++++-
 core/l10n/ru.php                    |  1 +
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              |  2 +-
 l10n/templates/private.pot          |  2 +-
 l10n/templates/settings.pot         | 26 +++++++++++++-------------
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/eu.php                     |  2 ++
 settings/l10n/eu.php                | 15 ++++++++++++++-
 21 files changed, 76 insertions(+), 26 deletions(-)

diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index c7d5ceec02d..012e5f214a8 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -5,6 +5,7 @@ $TRANSLATIONS = array(
 "Unknown error" => "Errore ezezaguna",
 "Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
 "Could not move %s" => "Ezin dira fitxategiak mugitu %s",
+"Permission denied" => "Baimena Ukatua",
 "File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
 "\"%s\" is an invalid file name." => "\"%s\" ez da fitxategi izen baliogarria.",
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
index 2927008113e..90a943a2356 100644
--- a/apps/files_encryption/l10n/eu.php
+++ b/apps/files_encryption/l10n/eu.php
@@ -1,9 +1,15 @@
 <?php
 $TRANSLATIONS = array(
 "Unknown error" => "Errore ezezaguna",
+"Missing recovery key password" => "Berreskurapen gakoaren pasahitza falta da",
+"Please repeat the recovery key password" => "Mesedez errepikatu berreskuratze gakoaren pasahitza",
+"Repeated recovery key password does not match the provided recovery key password" => "Errepikatutako berreskuratze gakoaren pasahitza ez dator bat berreskuratze gakoaren pasahitzarekin",
 "Recovery key successfully enabled" => "Berreskuratze gakoa behar bezala gaitua",
 "Could not disable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
 "Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
+"Please provide the old recovery password" => "Mesedez sartu berreskuratze pasahitz zaharra",
+"Please provide a new recovery password" => "Mesedez sartu berreskuratze pasahitz berria",
+"Please repeat the new recovery password" => "Mesedez errepikatu berreskuratze pasahitz berria",
 "Password successfully changed." => "Pasahitza behar bezala aldatu da.",
 "Could not change the password. Maybe the old password was not correct." => "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
 "Private key password successfully updated." => "Gako pasahitz pribatu behar bezala eguneratu da.",
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index 63ae83daaaa..9ebf51e49cf 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -14,6 +14,7 @@ $TRANSLATIONS = array(
 "Amazon S3 and compliant" => "Amazon S3 eta baliokideak",
 "Access Key" => "Sarbide gakoa",
 "Secret Key" => "Giltza Sekretua",
+"Hostname" => "Ostalari izena",
 "Port" => "Portua",
 "Region" => "Eskualdea",
 "Enable SSL" => "Gaitu SSL",
@@ -34,6 +35,7 @@ $TRANSLATIONS = array(
 "Password (required for OpenStack Object Storage)" => "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
 "Service Name (required for OpenStack Object Storage)" => "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
 "URL of identity endpoint (required for OpenStack Object Storage)" => "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+"Timeout of HTTP requests in seconds" => "HTTP eskarien gehienezko denbora segundutan",
 "Share" => "Partekatu",
 "SMB / CIFS using OC login" => "SMB / CIFS saioa hasteko OC erabiliz",
 "Username as share" => "Erabiltzaile izena elkarbanaketa bezala",
@@ -46,6 +48,8 @@ $TRANSLATIONS = array(
 "Error configuring Google Drive storage" => "Errore bat egon da Google Drive konfiguratzean",
 "Personal" => "Pertsonala",
 "System" => "Sistema",
+"All users. Type to select user or group." => "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
+"(group)" => "(taldea)",
 "Saved" => "Gordeta",
 "<b>Note:</b> " => "<b>Oharra:</b>",
 " and " => "eta",
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 4bb54e12501..935609eb0df 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -1,6 +1,8 @@
 <?php
 $TRANSLATIONS = array(
 "Server to server sharing is not enabled on this server" => "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
+"The mountpoint name contains invalid characters." => "Montatze puntuaren izenak baliogabeko karaktereak ditu.",
+"Invalid or untrusted SSL certificate" => "SSL ziurtagiri baliogabea edo fidagaitza",
 "Couldn't add remote share" => "Ezin izan da hurruneko elkarbanaketa gehitu",
 "Shared with you" => "Zurekin elkarbanatuta",
 "Shared with others" => "Beste batzuekin elkarbanatuta",
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index 7c1cf938913..83a80f2e1db 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -68,6 +68,7 @@ $TRANSLATIONS = array(
 "Limit %s access to users meeting these criteria:" => "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
 "The filter specifies which LDAP users shall have access to the %s instance." => "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
 "users found" => "erabiltzaile aurkituta",
+"Saving" => "Gordetzen",
 "Back" => "Atzera",
 "Continue" => "Jarraitu",
 "Expert" => "Aditua",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 4ff2b6f2aae..e2fef47647f 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -68,6 +68,7 @@ $TRANSLATIONS = array(
 "Strong password" => "Pasahitz sendoa",
 "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
 "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." => "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+"Error occurred while checking server setup" => "Errore bat gertatu da zerbitzariaren konfigurazioa egiaztatzerakoan.",
 "Shared" => "Elkarbanatuta",
 "Shared with {recipients}" => "{recipients}-rekin partekatua.",
 "Share" => "Elkarbanatu",
@@ -87,6 +88,7 @@ $TRANSLATIONS = array(
 "Send" => "Bidali",
 "Set expiration date" => "Ezarri muga data",
 "Expiration date" => "Muga data",
+"Adding user..." => "Erabiltzailea gehitzen...",
 "group" => "taldea",
 "Resharing is not allowed" => "Berriz elkarbanatzea ez dago baimendua",
 "Shared in {item} with {user}" => "{user}ekin {item}-n elkarbanatuta",
@@ -142,9 +144,24 @@ $TRANSLATIONS = array(
 "Error favoriting" => "Errorea gogokoetara gehitzerakoan",
 "Error unfavoriting" => "Errorea gogokoetatik kentzerakoan",
 "Access forbidden" => "Sarrera debekatuta",
+"File not found" => "Ez da fitxategia aurkitu",
+"The specified document has not been found on the server." => "Zehaztutako dokumentua ez da zerbitzarian aurkitu.",
+"You can click here to return to %s." => "Hemen klika dezakezu %sra itzultzeko.",
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
 "The share will expire on %s." => "Elkarbanaketa %s-n iraungiko da.",
 "Cheers!" => "Ongi izan!",
+"Internal Server Error" => "Zerbitzariaren Barne Errorea",
+"The server encountered an internal error and was unable to complete your request." => "Zerbitzariak barne errore bat izan du eta ez da gai izan zure eskaria osatzeko.",
+"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Mesedez harremanetan jarri zerbitzariaren kudeatzailearekin errore hau aldi askotan agertzekotan, mesedez gehitu beheko zehaztapen teknikoak zure txostenean.",
+"More details can be found in the server log." => "Zehaztapen gehiago zerbitzariaren egunerokoan aurki daitezke.",
+"Technical details" => "Arazo teknikoak",
+"Remote Address: %s" => "Urruneko Helbidea: %s",
+"Request ID: %s" => "Eskariaren IDa: %s",
+"Code: %s" => "Kodea: %s",
+"Message: %s" => "Mezua: %s",
+"File: %s" => "Fitxategia: %s",
+"Line: %s" => "Lerroa: %s",
+"Trace" => "Arrastoa",
 "Security Warning" => "Segurtasun abisua",
 "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
 "Please update your PHP installation to use %s securely." => "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
@@ -164,6 +181,7 @@ $TRANSLATIONS = array(
 "SQLite will be used as database. For larger installations we recommend to change this." => "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
 "Finish setup" => "Bukatu konfigurazioa",
 "Finishing …" => "Bukatzen...",
+"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Aplikazio honek ongi funtzionatzeko JavaScript behar du. Mesedez  <a href=\"http://enable-javascript.com/\" target=\"_blank\">gaitu JavaScript</a> eta birkargatu orri hau.",
 "%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
 "Log out" => "Saioa bukatu",
 "Server side authentication failed!" => "Zerbitzari aldeko autentifikazioak huts egin du!",
@@ -186,6 +204,8 @@ $TRANSLATIONS = array(
 "The theme %s has been disabled." => "%s gaia desgaitu da.",
 "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
 "Start update" => "Hasi eguneraketa",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:"
+"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:",
+"This %s instance is currently being updated, which may take a while." => "%s instantzia hau eguneratzen ari da, honek denbora har dezake.",
+"This page will refresh itself when the %s instance is available again." => "Orri honek bere burua eguneratuko du %s instantzia berriz prest dagoenean."
 );
 $PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 3528de072a2..aef239fd288 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -150,6 +150,7 @@ $TRANSLATIONS = array(
 "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здравствуйте,\n\n%s предоставил Вам доступ к %s.\nПосмотреть: %s\n\n",
 "The share will expire on %s." => "Доступ будет закрыт %s",
 "Cheers!" => "Удачи!",
+"Internal Server Error" => "Внутренняя ошибка сервера",
 "The server encountered an internal error and was unable to complete your request." => "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
 "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
 "More details can be found in the server log." => "Больше деталей может быть найдено в журнале сервера.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index db83a13d3ef..19da0eb1bc2 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index fae34af9b91..5c3ce3328c9 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 7f9ff02a5e2..c2190c33129 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 2c745157a39..0e58511397c 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 8b413120455..c6cd18c7da6 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 499fc47b987..0cbf30da9be 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index d1ad5c42f3c..c7bd658b6ab 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index dd7839e7b0c..21a4b38ba7d 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:55-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index d5836a75d3f..d91728a8629 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:55-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index a176064439c..0e40aa992ef 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:55-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,18 +17,6 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/apps/categories.php:14
-msgid "Enabled"
-msgstr ""
-
-#: ajax/apps/categories.php:15
-msgid "Not enabled"
-msgstr ""
-
-#: ajax/apps/categories.php:19
-msgid "Recommended"
-msgstr ""
-
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
@@ -158,6 +146,18 @@ msgstr ""
 msgid "Unable to change password"
 msgstr ""
 
+#: controller/appsettingscontroller.php:51
+msgid "Enabled"
+msgstr ""
+
+#: controller/appsettingscontroller.php:52
+msgid "Not enabled"
+msgstr ""
+
+#: controller/appsettingscontroller.php:56
+msgid "Recommended"
+msgstr ""
+
 #: controller/mailsettingscontroller.php:103
 #: controller/mailsettingscontroller.php:121
 msgid "Saved"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index edc4143ba34..46767a0ecb9 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index eb6a314a5a6..544f02631db 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 6.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-28 01:54-0400\n"
+"POT-Creation-Date: 2014-10-29 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index ce3512d1532..b7b609d3754 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -11,6 +11,7 @@ $TRANSLATIONS = array(
 "Settings" => "Ezarpenak",
 "Users" => "Erabiltzaileak",
 "Admin" => "Admin",
+"Recommended" => "Aholkatuta",
 "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "\\\"%s\\\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako.",
 "No app name specified" => "Ez da aplikazioaren izena zehaztu",
 "Unknown filetype" => "Fitxategi mota ezezaguna",
@@ -50,6 +51,7 @@ $TRANSLATIONS = array(
 "PostgreSQL username and/or password not valid" => "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
 "Set an admin username." => "Ezarri administraziorako erabiltzaile izena.",
 "Set an admin password." => "Ezarri administraziorako pasahitza.",
+"Can't create or write into the data directory %s" => "Ezin da %s datu karpeta sortu edo bertan idatzi ",
 "%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
 "Sharing %s failed, because the file does not exist" => "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
 "You are not allowed to share %s" => "Ez zadue %s elkarbanatzeko baimendua",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 6df2823064e..2818e94db4e 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,6 +1,5 @@
 <?php
 $TRANSLATIONS = array(
-"Enabled" => "Gaitua",
 "Authentication error" => "Autentifikazio errorea",
 "Your full name has been changed." => "Zure izena aldatu egin da.",
 "Unable to change full name" => "Ezin izan da izena aldatu",
@@ -30,9 +29,12 @@ $TRANSLATIONS = array(
 "Wrong admin recovery password. Please check the password and try again." => "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
 "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
 "Unable to change password" => "Ezin izan da pasahitza aldatu",
+"Enabled" => "Gaitua",
+"Recommended" => "Aholkatuta",
 "Saved" => "Gordeta",
 "test email settings" => "probatu eposta ezarpenak",
 "If you received this email, the settings seem to be correct." => "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
+"A problem occurred while sending the email. Please revise your settings." => "Arazo bat gertatu da eposta bidaltzean. Berrikusi zure ezarpenak.",
 "Email sent" => "Eposta bidalia",
 "You need to set your user email before being able to send test emails." => "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
 "Are you really sure you want add \"{domain}\" as trusted domain?" => "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
@@ -56,6 +58,7 @@ $TRANSLATIONS = array(
 "So-so password" => "Halamoduzko pasahitza",
 "Good password" => "Pasahitz ona",
 "Strong password" => "Pasahitz sendoa",
+"Valid until {date}" => "{date} arte baliogarria",
 "Delete" => "Ezabatu",
 "Decrypting files... Please wait, this can take some time." => "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
 "Delete encryption keys permanently." => "Ezabatu enkriptatze gakoak behin betiko",
@@ -66,6 +69,7 @@ $TRANSLATIONS = array(
 "A valid group name must be provided" => "Baliozko talde izena eman behar da",
 "deleted {groupName}" => "{groupName} ezbatuta",
 "undo" => "desegin",
+"no group" => "talderik ez",
 "never" => "inoiz",
 "deleted {userName}" => "{userName} ezabatuta",
 "add group" => "gehitu taldea",
@@ -74,6 +78,7 @@ $TRANSLATIONS = array(
 "A valid password must be provided" => "Baliozko pasahitza eman behar da",
 "Warning: Home directory for user \"{user}\" already exists" => "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
 "__language_name__" => "Euskara",
+"Personal Info" => "Informazio Pertsonala",
 "SSL root certificates" => "SSL erro ziurtagiriak",
 "Encryption" => "Enkriptazioa",
 "Everything (fatal issues, errors, warnings, info, debug)" => "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
@@ -107,6 +112,8 @@ $TRANSLATIONS = array(
 "We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
 "URL generation in notification emails" => "URL sorrera jakinarazpen mezuetan",
 "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+"Connectivity checks" => "Konexio egiaztapenak",
+"No problems found" => "Ez da problemarik aurkitu",
 "Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
 "Cron" => "Cron",
 "Last cron was executed at %s." => "Azken cron-a  %s-etan exekutatu da",
@@ -145,6 +152,7 @@ $TRANSLATIONS = array(
 "Credentials" => "Kredentzialak",
 "SMTP Username" => "SMTP erabiltzaile-izena",
 "SMTP Password" => "SMTP pasahitza",
+"Store credentials" => "Gorde kredentzialak",
 "Test email settings" => "Probatu eposta ezarpenak",
 "Send email" => "Bidali eposta",
 "Log" => "Log",
@@ -154,10 +162,12 @@ $TRANSLATIONS = array(
 "Version" => "Bertsioa",
 "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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
 "More apps" => "App gehiago",
+"Add your app" => "Gehitu zure aplikazioa",
 "by" => " Egilea:",
 "Documentation:" => "Dokumentazioa:",
 "User Documentation" => "Erabiltzaile dokumentazioa",
 "Admin Documentation" => "Administrazio dokumentazioa",
+"Update to %s" => "Eguneratu %sra",
 "Enable only for specific groups" => "Baimendu bakarri talde espezifikoetarako",
 "Uninstall App" => "Desinstalatu aplikazioa",
 "Administrator Documentation" => "Administratzaile dokumentazioa",
@@ -189,6 +199,7 @@ $TRANSLATIONS = array(
 "Choose as profile image" => "Profil irudi bezala aukeratu",
 "Language" => "Hizkuntza",
 "Help translate" => "Lagundu itzultzen",
+"Issued By" => "Honek bidalita",
 "Import Root Certificate" => "Inportatu erro ziurtagiria",
 "The encryption app is no longer enabled, please decrypt all your files" => "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
 "Log-in password" => "Saioa hasteko pasahitza",
@@ -196,6 +207,8 @@ $TRANSLATIONS = array(
 "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
 "Restore Encryption Keys" => "Lehenera itzazu enkriptatze gakoak.",
 "Delete Encryption Keys" => "Ezabatu enkriptatze gakoak",
+"Show storage location" => "Erakutsi biltegiaren kokapena",
+"Show last log in" => "Erakutsi azkeneko saio hasiera",
 "Login Name" => "Sarrera Izena",
 "Create" => "Sortu",
 "Admin Recovery Password" => "Administratzailearen pasahitza berreskuratzea",
-- 
GitLab


From 0696099bad56727d96c60f6221fe02dc7c71f511 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Tue, 28 Oct 2014 16:34:04 +0100
Subject: [PATCH 244/616] add dataresponse

fix docstrings

adjust copyright date

another copyright date update

another header update

implement third headers argument, fix indention, fix docstrings

fix docstrings
---
 lib/private/appframework/http/dispatcher.php  |  5 +-
 lib/public/appframework/controller.php        | 14 ++-
 lib/public/appframework/http/dataresponse.php | 79 +++++++++++++++++
 lib/public/appframework/http/response.php     | 14 ++-
 .../controller/ControllerTest.php             | 22 +++++
 .../appframework/http/DataResponseTest.php    | 87 +++++++++++++++++++
 .../lib/appframework/http/DispatcherTest.php  | 74 ++++++++++++----
 tests/lib/appframework/http/ResponseTest.php  | 26 ++++--
 8 files changed, 292 insertions(+), 29 deletions(-)
 create mode 100644 lib/public/appframework/http/dataresponse.php
 create mode 100644 tests/lib/appframework/http/DataResponseTest.php

diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
index 7f2717951a5..29a661d5743 100644
--- a/lib/private/appframework/http/dispatcher.php
+++ b/lib/private/appframework/http/dispatcher.php
@@ -30,6 +30,7 @@ use \OC\AppFramework\Utility\ControllerMethodReflector;
 
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\Response;
+use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
 
 
@@ -154,8 +155,8 @@ class Dispatcher {
 
 		$response = call_user_func_array(array($controller, $methodName), $arguments);
 
-		// format response if not of type response
-		if(!($response instanceof Response)) {
+		// format response
+		if($response instanceof DataResponse || !($response instanceof Response)) {
 
 			// get format from the url format or request format parameter
 			$format = $this->request->getParam('format');
diff --git a/lib/public/appframework/controller.php b/lib/public/appframework/controller.php
index b22eb73343a..398304e6feb 100644
--- a/lib/public/appframework/controller.php
+++ b/lib/public/appframework/controller.php
@@ -29,6 +29,7 @@ namespace OCP\AppFramework;
 
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
 
 
@@ -63,8 +64,17 @@ abstract class Controller {
 
 		// default responders
 		$this->responders = array(
-			'json' => function ($response) {
-				return new JSONResponse($response);
+			'json' => function ($data) {
+				if ($data instanceof DataResponse) {
+					$response = new JSONResponse(
+						$data->getData(),
+						$data->getStatus()
+					);
+					$response->setHeaders($data->getHeaders());
+					return $response;
+				} else {
+					return new JSONResponse($data);
+				}
 			}
 		);
 	}
diff --git a/lib/public/appframework/http/dataresponse.php b/lib/public/appframework/http/dataresponse.php
new file mode 100644
index 00000000000..5c21de325e1
--- /dev/null
+++ b/lib/public/appframework/http/dataresponse.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2014 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/>.
+ *
+ */
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * AppFramework\HTTP\DataResponse class
+ */
+
+namespace OCP\AppFramework\Http;
+
+use OCP\AppFramework\Http;
+
+/**
+ * A generic DataResponse class that is used to return generic data responses
+ * for responders to transform
+ */
+class DataResponse extends Response {
+
+	/**
+	 * response data
+	 * @var array|object
+	 */
+	protected $data;
+
+
+	/**
+	 * @param array|object $data the object or array that should be transformed
+	 * @param int $statusCode the Http status code, defaults to 200
+	 * @param array $headers additional key value based headers
+	 */
+	public function __construct($data=array(), $statusCode=Http::STATUS_OK,
+	                            array $headers=array()) {
+		$this->data = $data;
+		$this->setStatus($statusCode);
+		$this->setHeaders(array_merge($this->getHeaders(), $headers));
+	}
+
+
+	/**
+	 * Sets values in the data json array
+	 * @param array|object $data an array or object which will be transformed
+	 * @return DataResponse Reference to this object
+	 */
+	public function setData($data){
+		$this->data = $data;
+
+		return $this;
+	}
+
+
+	/**
+	 * Used to get the set parameters
+	 * @return array the data
+	 */
+	public function getData(){
+		return $this->data;
+	}
+
+
+}
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
index 20e936bb860..354911fee21 100644
--- a/lib/public/appframework/http/response.php
+++ b/lib/public/appframework/http/response.php
@@ -93,7 +93,7 @@ class Response {
 	 */
 	public function addHeader($name, $value) {
 		$name = trim($name);  // always remove leading and trailing whitespace
-		                      // to be able to reliably check for security 
+		                      // to be able to reliably check for security
 		                      // headers
 
 		if(is_null($value)) {
@@ -106,6 +106,18 @@ class Response {
 	}
 
 
+	/**
+	 * Set the headers
+	 * @param array key value header pairs
+	 * @return Response Reference to this object
+	 */
+	public function setHeaders($headers) {
+		$this->headers = $headers;
+
+		return $this;
+	}
+
+
 	/**
 	 * Returns the set headers
 	 * @return array the headers
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index e97ec548939..0de94ff5b70 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -27,6 +27,7 @@ namespace OCP\AppFramework;
 use OC\AppFramework\Http\Request;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\DataResponse;
 
 
 class ChildController extends Controller {
@@ -45,6 +46,12 @@ class ChildController extends Controller {
 
 		return $in;
 	}
+
+	public function customDataResponse($in) {
+		$response = new DataResponse($in, 300);
+		$response->addHeader('test', 'something');
+		return $response;
+	}
 };
 
 class ControllerTest extends \PHPUnit_Framework_TestCase {
@@ -161,6 +168,21 @@ class ControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 
+	public function testFormatDataResponseJSON() {
+		$expectedHeaders = array(
+			'test' => 'something',
+			'Cache-Control' => 'no-cache, must-revalidate'
+		);
+
+		$response = $this->controller->customDataResponse(array('hi'));
+		$response = $this->controller->buildResponse($response, 'json');
+
+		$this->assertEquals(array('hi'), $response->getData());
+		$this->assertEquals(300, $response->getStatus());
+		$this->assertEquals($expectedHeaders, $response->getHeaders());
+	}
+
+
 	public function testCustomFormatter() {
 		$response = $this->controller->custom('hi');
 		$response = $this->controller->buildResponse($response, 'json');
diff --git a/tests/lib/appframework/http/DataResponseTest.php b/tests/lib/appframework/http/DataResponseTest.php
new file mode 100644
index 00000000000..961327c978c
--- /dev/null
+++ b/tests/lib/appframework/http/DataResponseTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * ownCloud - App Framework
+ *
+ * @author Bernhard Posselt
+ * @copyright 2014 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/>.
+ *
+ */
+
+
+namespace OC\AppFramework\Http;
+
+
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http;
+
+
+class DataResponseTest extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var DataResponse
+	 */
+	private $response;
+
+	protected function setUp() {
+		$this->response = new DataResponse();
+	}
+
+
+	public function testSetData() {
+		$params = array('hi', 'yo');
+		$this->response->setData($params);
+
+		$this->assertEquals(array('hi', 'yo'), $this->response->getData());
+	}
+
+
+	public function testConstructorAllowsToSetData() {
+		$data = array('hi');
+		$code = 300;
+		$response = new DataResponse($data, $code);
+
+		$this->assertEquals($data, $response->getData());
+		$this->assertEquals($code, $response->getStatus());
+	}
+
+
+	public function testConstructorAllowsToSetHeaders() {
+		$data = array('hi');
+		$code = 300;
+		$headers = array('test' => 'something');
+		$response = new DataResponse($data, $code, $headers);
+
+		$expectedHeaders = array('Cache-Control' => 'no-cache, must-revalidate');
+		$expectedHeaders = array_merge($expectedHeaders, $headers);
+
+		$this->assertEquals($data, $response->getData());
+		$this->assertEquals($code, $response->getStatus());
+		$this->assertEquals($expectedHeaders, $response->getHeaders());
+	}
+
+
+	public function testChainability() {
+		$params = array('hi', 'yo');
+		$this->response->setData($params)
+			->setStatus(Http::STATUS_NOT_FOUND);
+
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $this->response->getStatus());
+		$this->assertEquals(array('hi', 'yo'), $this->response->getData());
+	}
+
+
+}
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index 9d5ec09a293..f082ddc8b3a 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -28,6 +28,7 @@ use OC\AppFramework\Middleware\MiddlewareDispatcher;
 use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
+use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Controller;
 
 
@@ -46,6 +47,18 @@ class TestController extends Controller {
 		});
 		return array($int, $bool, $test, $test2);
 	}
+
+
+	/**
+	 * @param int $int
+	 * @param bool $bool
+	 */
+	public function execDataResponse($int, $bool, $test=4, $test2=1) {
+		return new DataResponse(array(
+			'text' => array($int, $bool, $test, $test2)
+		));
+	}
+
 }
 
 
@@ -84,7 +97,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 		$this->controller = $this->getMock(
 			'\OCP\AppFramework\Controller',
 			array($this->controllerMethod), array($app, $request));
-		
+
 		$this->request = $this->getMockBuilder(
 			'\OC\AppFramework\Http\Request')
 			->disableOriginalConstructor()
@@ -96,7 +109,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 			$this->http, $this->middlewareDispatcher, $this->reflector,
 			$this->request
 		);
-		
+
 		$this->response = $this->getMockBuilder(
 			'\OCP\AppFramework\Http\Response')
 			->disableOriginalConstructor()
@@ -111,7 +124,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 	 * @param string $out
 	 * @param string $httpHeaders
 	 */
-	private function setMiddlewareExpectations($out=null, 
+	private function setMiddlewareExpectations($out=null,
 		$httpHeaders=null, $responseHeaders=array(),
 		$ex=false, $catchEx=true) {
 
@@ -119,20 +132,20 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 			$exception = new \Exception();
 			$this->middlewareDispatcher->expects($this->once())
 				->method('beforeController')
-				->with($this->equalTo($this->controller), 
+				->with($this->equalTo($this->controller),
 					$this->equalTo($this->controllerMethod))
 				->will($this->throwException($exception));
 			if($catchEx) {
 				$this->middlewareDispatcher->expects($this->once())
 					->method('afterException')
-					->with($this->equalTo($this->controller), 
+					->with($this->equalTo($this->controller),
 						$this->equalTo($this->controllerMethod),
 						$this->equalTo($exception))
 					->will($this->returnValue($this->response));
 			} else {
 				$this->middlewareDispatcher->expects($this->once())
 					->method('afterException')
-					->with($this->equalTo($this->controller), 
+					->with($this->equalTo($this->controller),
 						$this->equalTo($this->controllerMethod),
 						$this->equalTo($exception))
 					->will($this->returnValue(null));
@@ -141,7 +154,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 		} else {
 			$this->middlewareDispatcher->expects($this->once())
 				->method('beforeController')
-				->with($this->equalTo($this->controller), 
+				->with($this->equalTo($this->controller),
 					$this->equalTo($this->controllerMethod));
 			$this->controller->expects($this->once())
 				->method($this->controllerMethod)
@@ -165,38 +178,38 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 			->will($this->returnValue($responseHeaders));
 		$this->http->expects($this->once())
 			->method('getStatusHeader')
-			->with($this->equalTo(Http::STATUS_OK), 
+			->with($this->equalTo(Http::STATUS_OK),
 				$this->equalTo($this->lastModified),
 				$this->equalTo($this->etag))
 			->will($this->returnValue($httpHeaders));
-		
+
 		$this->middlewareDispatcher->expects($this->once())
 			->method('afterController')
-			->with($this->equalTo($this->controller), 
+			->with($this->equalTo($this->controller),
 				$this->equalTo($this->controllerMethod),
 				$this->equalTo($this->response))
 			->will($this->returnValue($this->response));
 
 		$this->middlewareDispatcher->expects($this->once())
 			->method('afterController')
-			->with($this->equalTo($this->controller), 
+			->with($this->equalTo($this->controller),
 				$this->equalTo($this->controllerMethod),
 				$this->equalTo($this->response))
 			->will($this->returnValue($this->response));
 
 		$this->middlewareDispatcher->expects($this->once())
 			->method('beforeOutput')
-			->with($this->equalTo($this->controller), 
+			->with($this->equalTo($this->controller),
 				$this->equalTo($this->controllerMethod),
 				$this->equalTo($out))
-			->will($this->returnValue($out));		
+			->will($this->returnValue($out));
 	}
 
 
 	public function testDispatcherReturnsArrayWith2Entries() {
 		$this->setMiddlewareExpectations();
 
-		$response = $this->dispatcher->dispatch($this->controller, 
+		$response = $this->dispatcher->dispatch($this->controller,
 			$this->controllerMethod);
 		$this->assertNull($response[0]);
 		$this->assertEquals(array(), $response[1]);
@@ -210,7 +223,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 		$responseHeaders = array('hell' => 'yeah');
 		$this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders);
 
-		$response = $this->dispatcher->dispatch($this->controller, 
+		$response = $this->dispatcher->dispatch($this->controller,
 			$this->controllerMethod);
 
 		$this->assertEquals($httpHeaders, $response[0]);
@@ -227,9 +240,9 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 		$out = 'yo';
 		$httpHeaders = 'Http';
 		$responseHeaders = array('hell' => 'yeah');
-		$this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true);		
+		$this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true);
 
-		$response = $this->dispatcher->dispatch($this->controller, 
+		$response = $this->dispatcher->dispatch($this->controller,
 			$this->controllerMethod);
 
 		$this->assertEquals($httpHeaders, $response[0]);
@@ -249,7 +262,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 		$this->setMiddlewareExpectations($out, $httpHeaders, $responseHeaders, true, false);
 
 		$this->setExpectedException('\Exception');
-		$response = $this->dispatcher->dispatch($this->controller, 
+		$response = $this->dispatcher->dispatch($this->controller,
 			$this->controllerMethod);
 
 	}
@@ -342,6 +355,31 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 	}
 
 
+	public function testResponseTransformsDataResponse() {
+		$this->request = new Request(array(
+			'post' => array(
+				'int' => '3',
+				'bool' => 'false'
+			),
+			'urlParams' => array(
+				'format' => 'json'
+			),
+			'method' => 'GET'
+		));
+		$this->dispatcher = new Dispatcher(
+			$this->http, $this->middlewareDispatcher, $this->reflector,
+			$this->request
+		);
+		$controller = new TestController('app', $this->request);
+
+		// reflector is supposed to be called once
+		$this->dispatcherPassthrough();
+		$response = $this->dispatcher->dispatch($controller, 'execDataResponse');
+
+		$this->assertEquals('{"text":[3,false,4,1]}', $response[2]);
+	}
+
+
 	public function testResponseTransformedByAcceptHeader() {
 		$this->request = new Request(array(
 			'post' => array(
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index e83fe9e2d84..b1dddd9ebc7 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -48,10 +48,24 @@ class ResponseTest extends \PHPUnit_Framework_TestCase {
 	}
 
 
+	function testSetHeaders(){
+		$expected = array(
+			'Last-Modified' => 1,
+			'ETag' => 3,
+			'Something-Else' => 'hi'
+		);
+
+		$this->childResponse->setHeaders($expected);
+		$headers = $this->childResponse->getHeaders();
+
+		$this->assertEquals($expected, $headers);
+	}
+
+
 	public function testAddHeaderValueNullDeletesIt(){
 		$this->childResponse->addHeader('hello', 'world');
 		$this->childResponse->addHeader('hello', null);
-		$this->assertEquals(1, count($this->childResponse->getHeaders()));	
+		$this->assertEquals(1, count($this->childResponse->getHeaders()));
 	}
 
 
@@ -93,18 +107,18 @@ class ResponseTest extends \PHPUnit_Framework_TestCase {
 
 	public function testCacheSecondsZero() {
 		$this->childResponse->cacheFor(0);
-		
+
 		$headers = $this->childResponse->getHeaders();
-		$this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']);	
+		$this->assertEquals('no-cache, must-revalidate', $headers['Cache-Control']);
 	}
 
 
 	public function testCacheSeconds() {
 		$this->childResponse->cacheFor(33);
-		
+
 		$headers = $this->childResponse->getHeaders();
-		$this->assertEquals('max-age=33, must-revalidate', 
-			$headers['Cache-Control']);	
+		$this->assertEquals('max-age=33, must-revalidate',
+			$headers['Cache-Control']);
 	}
 
 
-- 
GitLab


From f67123c5a498e45a08900987b10779c7c60af601 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 17 Oct 2014 14:17:39 +0200
Subject: [PATCH 245/616] l10n.pl now generates js files as well

---
 l10n/init.sh |  5 -----
 l10n/l10n.pl | 10 ++++++++++
 2 files changed, 10 insertions(+), 5 deletions(-)
 delete mode 100755 l10n/init.sh

diff --git a/l10n/init.sh b/l10n/init.sh
deleted file mode 100755
index 98195bf01bf..00000000000
--- a/l10n/init.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-for resource in calendar contacts core files media gallery settings
-do
-tx set --auto-local -r owncloud.$resource "<lang>/$resource.po" --source-lang en --source-file templates/$resource.pot --execute
-done
diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index 10df5f8f803..8b12f1abaed 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -142,6 +142,7 @@ elsif( $task eq 'write' ){
 			my $array = Locale::PO->load_file_asarray( $input );
 			# Create array
 			my @strings = ();
+			my @js_strings = ();
 			my $plurals;
 
 			foreach my $string ( @{$array} ){
@@ -160,11 +161,13 @@ elsif( $task eq 'write' ){
 					}
 
 					push( @strings, "\"$identifier\" => array(".join(",", @variants).")");
+					push( @js_strings, "\"$identifier\" : [".join(",", @variants)."]");
 				}
 				else{
 					# singular translations
 					next if $string->msgstr() eq '""';
 					push( @strings, $string->msgid()." => ".$string->msgstr());
+					push( @js_strings, $string->msgid()." : ".$string->msgstr());
 				}
 			}
 			next if $#strings == -1; # Skip empty files
@@ -179,6 +182,13 @@ elsif( $task eq 'write' ){
 			print OUT join( ",\n", @strings );
 			print OUT "\n);\n\$PLURAL_FORMS = \"$plurals\";\n";
 			close( OUT );
+
+			open( OUT, ">$language.js" );
+			print OUT "OC.L10N.register(\n    \"$app\",\n    {\n    ";
+			print OUT join( ",\n    ", @js_strings );
+			print OUT "\n},\n\"$plurals\");\n";
+			close( OUT );
+
 		}
 		chdir( $whereami );
 	}
-- 
GitLab


From ec1a73fab9aa6b71b502ee45f4d0dd4f20661930 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 17 Oct 2014 19:47:37 +0200
Subject: [PATCH 246/616] Added OC.L10N namespace with translation functions

Added addTranslations and fixed de.js file

Fixed de.js to use OC.L10N.register() and use to correct expected
format.

Added JS unit tests for OC.L10N class

Include translations JS script for all apps
---
 apps/files/index.php                  |   1 +
 apps/files_encryption/appinfo/app.php |   1 +
 apps/files_external/appinfo/app.php   |   2 +
 apps/files_sharing/appinfo/app.php    |   1 +
 apps/files_trashbin/appinfo/app.php   |   2 +
 apps/files_versions/appinfo/app.php   |   1 +
 apps/user_ldap/appinfo/app.php        |   1 +
 apps/user_webdavauth/appinfo/app.php  |   2 +
 core/js/core.json                     |   1 +
 core/js/js.js                         | 125 +-----------------
 core/js/l10n.js                       | 178 ++++++++++++++++++++++++++
 core/js/tests/specHelper.js           |   9 --
 core/js/tests/specs/l10nSpec.js       | 101 +++++++++++++++
 lib/base.php                          |   1 +
 lib/private/template/functions.php    |  16 +++
 lib/private/util.php                  |  22 +++-
 lib/public/util.php                   |   9 ++
 17 files changed, 343 insertions(+), 130 deletions(-)
 create mode 100644 core/js/l10n.js
 create mode 100644 core/js/tests/specs/l10nSpec.js

diff --git a/apps/files/index.php b/apps/files/index.php
index bc74e17aee1..4142a02b97e 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -28,6 +28,7 @@ OCP\User::checkLoggedIn();
 OCP\Util::addStyle('files', 'files');
 OCP\Util::addStyle('files', 'upload');
 OCP\Util::addStyle('files', 'mobile');
+OCP\Util::addTranslations('files');
 OCP\Util::addscript('files', 'app');
 OCP\Util::addscript('files', 'file-upload');
 OCP\Util::addscript('files', 'jquery.iframe-transport');
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 922d9885164..aa709fbac65 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -14,6 +14,7 @@ OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
 OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyEncryptException'] = 'files_encryption/lib/exceptions.php';
 OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyDecryptException'] = 'files_encryption/lib/exceptions.php';
 
+\OCP\Util::addTranslations('files_encryption');
 \OCP\Util::addscript('files_encryption', 'encryption');
 \OCP\Util::addscript('files_encryption', 'detect-migration');
 
diff --git a/apps/files_external/appinfo/app.php b/apps/files_external/appinfo/app.php
index 3486b8db51b..ea14f7adbcf 100644
--- a/apps/files_external/appinfo/app.php
+++ b/apps/files_external/appinfo/app.php
@@ -21,6 +21,8 @@ OC::$CLASSPATH['OC\Files\Storage\SFTP'] = 'files_external/lib/sftp.php';
 OC::$CLASSPATH['OC_Mount_Config'] = 'files_external/lib/config.php';
 OC::$CLASSPATH['OCA\Files\External\Api'] = 'files_external/lib/api.php';
 
+OCP\Util::addTranslations('files_external');
+
 OCP\App::registerAdmin('files_external', 'settings');
 if (OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes') == 'yes') {
 	OCP\App::registerPersonal('files_external', 'personal');
diff --git a/apps/files_sharing/appinfo/app.php b/apps/files_sharing/appinfo/app.php
index f2c454a9ae2..a01f8d98c7d 100644
--- a/apps/files_sharing/appinfo/app.php
+++ b/apps/files_sharing/appinfo/app.php
@@ -22,6 +22,7 @@ OC::$CLASSPATH['OCA\Files_Sharing\Exceptions\BrokenPath'] = 'files_sharing/lib/e
 OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
 OCP\Share::registerBackend('folder', 'OC_Share_Backend_Folder', 'file');
 
+OCP\Util::addTranslations('files_sharing');
 OCP\Util::addScript('files_sharing', 'share');
 OCP\Util::addScript('files_sharing', 'external');
 
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index fe428121a25..7df52da6314 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,6 +1,8 @@
 <?php
 $l = \OC::$server->getL10N('files_trashbin');
 
+OCP\Util::addTranslations('files_trashbin');
+
 OC::$CLASSPATH['OCA\Files_Trashbin\Exceptions\CopyRecursiveException'] = 'files_trashbin/lib/exceptions.php';
 
 // register hooks
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 8c517d4d0ff..78de1528f32 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -5,6 +5,7 @@ OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'files_versions/lib/versions.php'
 OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php';
 OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'files_versions/lib/capabilities.php';
 
+OCP\Util::addTranslations('files_versions');
 OCP\Util::addscript('files_versions', 'versions');
 OCP\Util::addStyle('files_versions', 'versions');
 
diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index a26c7709d41..8f9fbc5129b 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -54,6 +54,7 @@ $entry = array(
 	'href' => OCP\Util::linkTo( 'user_ldap', 'settings.php' ),
 	'name' => 'LDAP'
 );
+OCP\Util::addTranslations('user_ldap');
 
 OCP\Backgroundjob::registerJob('OCA\user_ldap\lib\Jobs');
 if(OCP\App::isEnabled('user_webdavauth')) {
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index 3cd227bddbe..125f5f40654 100644
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -28,6 +28,8 @@ OC_APP::registerAdmin('user_webdavauth', 'settings');
 OC_User::registerBackend("WEBDAVAUTH");
 OC_User::useBackend( "WEBDAVAUTH" );
 
+OCP\Util::addTranslations('user_webdavauth');
+
 // add settings page to navigation
 $entry = array(
 	'id' => "user_webdavauth_settings",
diff --git a/core/js/core.json b/core/js/core.json
index caff2b05252..e2da1402888 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -13,6 +13,7 @@
 		"jquery.ocdialog.js",
 		"oc-dialogs.js",
 		"js.js",
+		"l10n.js",
 		"share.js",
 		"octemplate.js",
 		"eventsource.js",
diff --git a/core/js/js.js b/core/js/js.js
index 94b78a2e9a9..7f657f0e945 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -37,121 +37,6 @@ if (
 	}
 }
 
-function initL10N(app) {
-	if (!( t.cache[app] )) {
-		$.ajax(OC.filePath('core', 'ajax', 'translations.php'), {
-			// TODO a proper solution for this without sync ajax calls
-			async: false,
-			data: {'app': app},
-			type: 'POST',
-			success: function (jsondata) {
-				t.cache[app] = jsondata.data;
-				t.plural_form = jsondata.plural_form;
-			}
-		});
-
-		// Bad answer ...
-		if (!( t.cache[app] )) {
-			t.cache[app] = [];
-		}
-	}
-	if (typeof t.plural_function[app] === 'undefined') {
-		t.plural_function[app] = function (n) {
-			var p = (n !== 1) ? 1 : 0;
-			return { 'nplural' : 2, 'plural' : p };
-		};
-
-		/**
-		 * code below has been taken from jsgettext - which is LGPL licensed
-		 * https://developer.berlios.de/projects/jsgettext/
-		 * http://cvs.berlios.de/cgi-bin/viewcvs.cgi/jsgettext/jsgettext/lib/Gettext.js
-		 */
-		var pf_re = new RegExp('^(\\s*nplurals\\s*=\\s*[0-9]+\\s*;\\s*plural\\s*=\\s*(?:\\s|[-\\?\\|&=!<>+*/%:;a-zA-Z0-9_\\(\\)])+)', 'm');
-		if (pf_re.test(t.plural_form)) {
-			//ex english: "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-			//pf = "nplurals=2; plural=(n != 1);";
-			//ex russian: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2)
-			//pf = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)";
-			var pf = t.plural_form;
-			if (! /;\s*$/.test(pf)) {
-				pf = pf.concat(';');
-			}
-			/* We used to use eval, but it seems IE has issues with it.
-			 * We now use "new Function", though it carries a slightly
-			 * bigger performance hit.
-			var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };';
-			Gettext._locale_data[domain].head.plural_func = eval("("+code+")");
-			 */
-			var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };';
-			t.plural_function[app] = new Function("n", code);
-		} else {
-			console.log("Syntax error in language file. Plural-Forms header is invalid ["+t.plural_forms+"]");
-		}
-	}
-}
-/**
- * translate a string
- * @param {string} app the id of the app for which to translate the string
- * @param {string} text the string to translate
- * @param [vars] FIXME
- * @param {number} [count] number to replace %n with
- * @return {string}
- */
-function t(app, text, vars, count){
-	initL10N(app);
-	var _build = function (text, vars, count) {
-		return text.replace(/%n/g, count).replace(/{([^{}]*)}/g,
-			function (a, b) {
-				var r = vars[b];
-				return typeof r === 'string' || typeof r === 'number' ? r : a;
-			}
-		);
-	};
-	var translation = text;
-	if( typeof( t.cache[app][text] ) !== 'undefined' ){
-		translation = t.cache[app][text];
-	}
-
-	if(typeof vars === 'object' || count !== undefined ) {
-		return _build(translation, vars, count);
-	} else {
-		return translation;
-	}
-}
-t.cache = {};
-// different apps might or might not redefine the nplurals function correctly
-// this is to make sure that a "broken" app doesn't mess up with the
-// other app's plural function
-t.plural_function = {};
-
-/**
- * translate a string
- * @param {string} app the id of the app for which to translate the string
- * @param {string} text_singular the string to translate for exactly one object
- * @param {string} text_plural the string to translate for n objects
- * @param {number} count number to determine whether to use singular or plural
- * @param [vars] FIXME
- * @return {string} Translated string
- */
-function n(app, text_singular, text_plural, count, vars) {
-	initL10N(app);
-	var identifier = '_' + text_singular + '_::_' + text_plural + '_';
-	if( typeof( t.cache[app][identifier] ) !== 'undefined' ){
-		var translation = t.cache[app][identifier];
-		if ($.isArray(translation)) {
-			var plural = t.plural_function[app](count);
-			return t(app, translation[plural.plural], vars, count);
-		}
-	}
-
-	if(count === 1) {
-		return t(app, text_singular, vars, count);
-	}
-	else{
-		return t(app, text_plural, vars, count);
-	}
-}
-
 /**
 * Sanitizes a HTML string by replacing all potential dangerous characters with HTML entities
 * @param {string} s String to sanitize
@@ -584,11 +469,13 @@ OC.search.currentResult=-1;
 OC.search.lastQuery='';
 OC.search.lastResults={};
 //translations for result type ids, can be extended by apps
+// FIXME: move to later in the init process, after translations were loaded
+
 OC.search.resultTypes={
-	file: t('core','File'),
-	folder: t('core','Folder'),
-	image: t('core','Image'),
-	audio: t('core','Audio')
+	file: 'File', //t('core','File'),
+	folder: 'Folder', //t('core','Folder'),
+	image: 'Image', //t('core','Image'),
+	audio: 'Audio' //t('core','Audio')
 };
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
diff --git a/core/js/l10n.js b/core/js/l10n.js
new file mode 100644
index 00000000000..e375b7eca80
--- /dev/null
+++ b/core/js/l10n.js
@@ -0,0 +1,178 @@
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+/**
+ * L10N namespace with localization functions.
+ *
+ * @namespace
+ */
+OC.L10N = {
+	/**
+	 * String bundles with app name as key.
+	 * @type {Object.<String,String>}
+	 */
+	_bundles: {},
+
+	/**
+	 * Plural functions, key is app name and value is function.
+	 * @type {Object.<String,Function>}
+	 */
+	_pluralFunctions: {},
+
+	/**
+	 * Register an app's translation bundle.
+	 *
+	 * @param {String} appName name of the app
+	 * @param {Object<String,String>} strings bundle
+	 * @param {{Function|String}} [pluralForm] optional plural function or plural string
+	 */
+	register: function(appName, bundle, pluralForm) {
+		this._bundles[appName] = bundle || {};
+
+		if (_.isFunction(pluralForm)) {
+			this._pluralFunctions[appName] = pluralForm;
+		} else {
+			// generate plural function based on form
+			this._pluralFunctions[appName] = this._generatePluralFunction(pluralForm);
+		}
+	},
+
+	/**
+	 * Generates a plural function based on the given plural form.
+	 * If an invalid form has been given, returns a default function.
+	 *
+	 * @param {String} pluralForm plural form
+	 */
+	_generatePluralFunction: function(pluralForm) {
+		// default func
+		var func = function (n) {
+			var p = (n !== 1) ? 1 : 0;
+			return { 'nplural' : 2, 'plural' : p };
+		};
+
+		if (!pluralForm) {
+			console.warn('Missing plural form in language file');
+			return func;
+		}
+
+		/**
+		 * code below has been taken from jsgettext - which is LGPL licensed
+		 * https://developer.berlios.de/projects/jsgettext/
+		 * http://cvs.berlios.de/cgi-bin/viewcvs.cgi/jsgettext/jsgettext/lib/Gettext.js
+		 */
+		var pf_re = new RegExp('^(\\s*nplurals\\s*=\\s*[0-9]+\\s*;\\s*plural\\s*=\\s*(?:\\s|[-\\?\\|&=!<>+*/%:;a-zA-Z0-9_\\(\\)])+)', 'm');
+		if (pf_re.test(pluralForm)) {
+			//ex english: "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+			//pf = "nplurals=2; plural=(n != 1);";
+			//ex russian: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10< =4 && (n%100<10 or n%100>=20) ? 1 : 2)
+			//pf = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)";
+			var pf = pluralForm;
+			if (! /;\s*$/.test(pf)) {
+				pf = pf.concat(';');
+			}
+			/* We used to use eval, but it seems IE has issues with it.
+			 * We now use "new Function", though it carries a slightly
+			 * bigger performance hit.
+			var code = 'function (n) { var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) }; };';
+			Gettext._locale_data[domain].head.plural_func = eval("("+code+")");
+			 */
+			var code = 'var plural; var nplurals; '+pf+' return { "nplural" : nplurals, "plural" : (plural === true ? 1 : plural ? plural : 0) };';
+			func = new Function("n", code);
+		} else {
+			console.warn('Invalid plural form in language file: "' + pluralForm + '"');
+		}
+		return func;
+	},
+
+	/**
+	 * Translate a string
+	 * @param {string} app the id of the app for which to translate the string
+	 * @param {string} text the string to translate
+	 * @param [vars] map of placeholder key to value
+	 * @param {number} [count] number to replace %n with
+	 * @return {string}
+	 */
+	translate: function(app, text, vars, count) {
+		// TODO: cache this function to avoid inline recreation
+		// of the same function over and over again in case
+		// translate() is used in a loop
+		var _build = function (text, vars, count) {
+			return text.replace(/%n/g, count).replace(/{([^{}]*)}/g,
+				function (a, b) {
+					var r = vars[b];
+					return typeof r === 'string' || typeof r === 'number' ? r : a;
+				}
+			);
+		};
+		var translation = text;
+		var bundle = this._bundles[app] || {};
+		var value = bundle[text];
+		if( typeof(value) !== 'undefined' ){
+			translation = value;
+		}
+
+		if(typeof vars === 'object' || count !== undefined ) {
+			return _build(translation, vars, count);
+		} else {
+			return translation;
+		}
+	},
+
+	/**
+	 * Translate a plural string
+	 * @param {string} app the id of the app for which to translate the string
+	 * @param {string} text_singular the string to translate for exactly one object
+	 * @param {string} text_plural the string to translate for n objects
+	 * @param {number} count number to determine whether to use singular or plural
+	 * @param [vars] map of placeholder key to value
+	 * @return {string} Translated string
+	 */
+	translatePlural: function(app, textSingular, textPlural, count, vars) {
+		var identifier = '_' + textSingular + '_::_' + textPlural + '_';
+		var bundle = this._bundles[app] || {};
+		var value = bundle[identifier];
+		if( typeof(value) !== 'undefined' ){
+			var translation = value;
+			if ($.isArray(translation)) {
+				var plural = this._pluralFunctions[app](count);
+				return this.translate(app, translation[plural.plural], vars, count);
+			}
+		}
+
+		if(count === 1) {
+			return this.translate(app, textSingular, vars, count);
+		}
+		else{
+			return this.translate(app, textPlural, vars, count);
+		}
+	}
+};
+
+/**
+ * translate a string
+ * @param {string} app the id of the app for which to translate the string
+ * @param {string} text the string to translate
+ * @param [vars] map of placeholder key to value
+ * @param {number} [count] number to replace %n with
+ * @return {string}
+ */
+window.t = _.bind(OC.L10N.translate, OC.L10N);
+
+/**
+ * translate a string
+ * @param {string} app the id of the app for which to translate the string
+ * @param {string} text_singular the string to translate for exactly one object
+ * @param {string} text_plural the string to translate for n objects
+ * @param {number} count number to determine whether to use singular or plural
+ * @param [vars] map of placeholder key to value
+ * @return {string} Translated string
+ */
+window.n = _.bind(OC.L10N.translatePlural, OC.L10N);
+
diff --git a/core/js/tests/specHelper.js b/core/js/tests/specHelper.js
index b62a0efe40d..4111b6763d9 100644
--- a/core/js/tests/specHelper.js
+++ b/core/js/tests/specHelper.js
@@ -113,15 +113,6 @@ window.isPhantom = /phantom/i.test(navigator.userAgent);
 		// must use fake responses for expected calls
 		fakeServer = sinon.fakeServer.create();
 
-		// return fake translations as they might be requested for many test runs
-		fakeServer.respondWith(/\/index.php\/core\/ajax\/translations.php$/, [
-				200, {
-					"Content-Type": "application/json"
-				},
-				'{"data": [], "plural_form": "nplurals=2; plural=(n != 1);"}'
-			]
-		);
-
 		// make it globally available, so that other tests can define
 		// custom responses
 		window.fakeServer = fakeServer;
diff --git a/core/js/tests/specs/l10nSpec.js b/core/js/tests/specs/l10nSpec.js
new file mode 100644
index 00000000000..d5b0363ea38
--- /dev/null
+++ b/core/js/tests/specs/l10nSpec.js
@@ -0,0 +1,101 @@
+/**
+ * Copyright (c) 2014 Vincent Petry <pvince81@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+describe('OC.L10N tests', function() {
+	var TEST_APP = 'jsunittestapp';
+
+	afterEach(function() {
+		delete OC.L10N._bundles[TEST_APP];
+	});
+
+	describe('text translation', function() {
+		beforeEach(function() {
+			OC.L10N.register(TEST_APP, {
+				'Hello world!': 'Hallo Welt!',
+				'Hello {name}, the weather is {weather}': 'Hallo {name}, das Wetter ist {weather}',
+				'sunny': 'sonnig'
+			});
+		});
+		it('returns untranslated text when no bundle exists', function() {
+			delete OC.L10N._bundles[TEST_APP];
+			expect(t(TEST_APP, 'unknown text')).toEqual('unknown text');
+		});
+		it('returns untranslated text when no key exists', function() {
+			expect(t(TEST_APP, 'unknown text')).toEqual('unknown text');
+		});
+		it('returns translated text when key exists', function() {
+			expect(t(TEST_APP, 'Hello world!')).toEqual('Hallo Welt!');
+		});
+		it('returns translated text with placeholder', function() {
+			expect(
+				t(TEST_APP, 'Hello {name}, the weather is {weather}', {name: 'Steve', weather: t(TEST_APP, 'sunny')})
+			).toEqual('Hallo Steve, das Wetter ist sonnig');
+		});
+	});
+	describe('plurals', function() {
+		function checkPlurals() {
+			expect(
+				n(TEST_APP, 'download %n file', 'download %n files', 0)
+			).toEqual('0 Dateien herunterladen');
+			expect(
+				n(TEST_APP, 'download %n file', 'download %n files', 1)
+			).toEqual('1 Datei herunterladen');
+			expect(
+				n(TEST_APP, 'download %n file', 'download %n files', 2)
+			).toEqual('2 Dateien herunterladen');
+			expect(
+				n(TEST_APP, 'download %n file', 'download %n files', 1024)
+			).toEqual('1024 Dateien herunterladen');
+		}
+
+		it('generates plural for default text when translation does not exist', function() {
+			OC.L10N.register(TEST_APP, {
+			});
+			expect(
+				n(TEST_APP, 'download %n file', 'download %n files', 0)
+			).toEqual('download 0 files');
+			expect(
+				n(TEST_APP, 'download %n file', 'download %n files', 1)
+			).toEqual('download 1 file');
+			expect(
+				n(TEST_APP, 'download %n file', 'download %n files', 2)
+			).toEqual('download 2 files');
+			expect(
+				n(TEST_APP, 'download %n file', 'download %n files', 1024)
+			).toEqual('download 1024 files');
+		});
+		it('generates plural with default function when no forms specified', function() {
+			OC.L10N.register(TEST_APP, {
+				'_download %n file_::_download %n files_':
+					['%n Datei herunterladen', '%n Dateien herunterladen']
+			});
+			checkPlurals();
+		});
+		it('generates plural with generated function when forms is specified', function() {
+			OC.L10N.register(TEST_APP, {
+				'_download %n file_::_download %n files_':
+					['%n Datei herunterladen', '%n Dateien herunterladen']
+			}, 'nplurals=2; plural=(n != 1);');
+			checkPlurals();
+		});
+		it('generates plural with function when forms is specified as function', function() {
+			OC.L10N.register(TEST_APP, {
+				'_download %n file_::_download %n files_':
+					['%n Datei herunterladen', '%n Dateien herunterladen']
+			}, function(n) {
+				return {
+					nplurals: 2,
+					plural: (n !== 1) ? 1 : 0
+				};
+			});
+			checkPlurals();
+		});
+	});
+});
diff --git a/lib/base.php b/lib/base.php
index 3d374f12f7d..3554911abb9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -338,6 +338,7 @@ class OC {
 		OC_Util::addScript("jquery.ocdialog");
 		OC_Util::addScript("oc-dialogs");
 		OC_Util::addScript("js");
+		OC_Util::addScript("l10n");
 		OC_Util::addScript("octemplate");
 		OC_Util::addScript("eventsource");
 		OC_Util::addScript("config");
diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index cbe751e59b5..8c94b7cf345 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -55,6 +55,22 @@ function style($app, $file) {
 	}
 }
 
+/**
+ * Shortcut for adding translations to a page
+ * @param string $app the appname
+ * @param string|string[] $file the filename,
+ * if an array is given it will add all styles
+ */
+function translation($app, $file) {
+	if(is_array($file)) {
+		foreach($file as $f) {
+			OC_Util::addStyle($app, $f);
+		}
+	} else {
+		OC_Util::addStyle($app, $file);
+	}
+}
+
 /**
  * Shortcut for HTML imports
  * @param string $app the appname
diff --git a/lib/private/util.php b/lib/private/util.php
index 6cd982c222e..5105bb22931 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -333,7 +333,7 @@ class OC_Util {
 	/**
 	 * add a javascript file
 	 *
-	 * @param string $application
+	 * @param string $application application id
 	 * @param string|null $file filename
 	 * @return void
 	 */
@@ -349,10 +349,28 @@ class OC_Util {
 		}
 	}
 
+	/**
+	 * add a translation JS file
+	 *
+	 * @param string $application application id
+	 * @param string $languageCode language code, defaults to the current language
+	 */
+	public static function addTranslations($application, $languageCode = null) {
+		if (is_null($languageCode)) {
+			$l = new \OC_L10N($application);
+			$languageCode = $l->getLanguageCode($application);
+		}
+		if (!empty($application)) {
+			self::$scripts[] = "$application/l10n/$languageCode";
+		} else {
+			self::$scripts[] = "js/$languageCode";
+		}
+	}
+
 	/**
 	 * add a css file
 	 *
-	 * @param string $application
+	 * @param string $application application id
 	 * @param string|null $file filename
 	 * @return void
 	 */
diff --git a/lib/public/util.php b/lib/public/util.php
index 4c4a84af240..22ded1d0fc5 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -136,6 +136,15 @@ class Util {
 		\OC_Util::addScript( $application, $file );
 	}
 
+	/**
+	 * Add a translation JS file
+	 * @param string $application application id
+	 * @param string $languageCode language code, defaults to the current locale
+	 */
+	public static function addTranslations($application, $languageCode = null) {
+		\OC_Util::addTranslations($application, $languageCode);
+	}
+
 	/**
 	 * Add a custom element to the header
 	 * @param string $tag tag name of the element
-- 
GitLab


From a589d61b78fbfedad8fcf3ee59522b2e95de48ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 20 Oct 2014 13:43:29 +0200
Subject: [PATCH 247/616] in case a translation javascript is not found we no
 longer bail out

remove translation.php
---
 core/ajax/translations.php                 | 30 ----------------------
 core/routes.php                            |  3 ---
 lib/private/l10n.php                       | 11 --------
 lib/private/template/jsresourcelocator.php |  4 +++
 lib/private/util.php                       |  2 +-
 5 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 core/ajax/translations.php

diff --git a/core/ajax/translations.php b/core/ajax/translations.php
deleted file mode 100644
index c296cea572a..00000000000
--- a/core/ajax/translations.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
-* ownCloud - ajax frontend
-*
-* @author Jakob Sack
-* @copyright 2011 Jakob Sack kde@jakobsack.de
-*
-* 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/>.
-*
-*/
-
-$app = isset($_POST["app"]) ? $_POST["app"] : "";
-
-$app = OC_App::cleanAppId($app);
-
-$l = \OC::$server->getL10N($app);
-
-OC_JSON::success(array('data' => $l->getTranslations(), 'plural_form' => $l->getPluralFormString()));
diff --git a/core/routes.php b/core/routes.php
index a9d5387bc14..92545d0322e 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -30,9 +30,6 @@ $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
 // Share
 $this->create('core_ajax_share', '/core/ajax/share.php')
 	->actionInclude('core/ajax/share.php');
-// Translations
-$this->create('core_ajax_translations', '/core/ajax/translations.php')
-	->actionInclude('core/ajax/translations.php');
 // Tags
 $this->create('core_tags_tags', '/tags/{type}')
 	->get()
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 0b20eafea32..ee144cd221c 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -265,17 +265,6 @@ class OC_L10N implements \OCP\IL10N {
 		return $this->translations;
 	}
 
-	/**
-	 * getPluralFormString
-	 * @return string containing the gettext "Plural-Forms"-string
-	 *
-	 * Returns a string like "nplurals=2; plural=(n != 1);"
-	 */
-	public function getPluralFormString() {
-		$this->init();
-		return $this->plural_form_string;
-	}
-
 	/**
 	 * getPluralFormFunction
 	 * @return string the plural form function
diff --git a/lib/private/template/jsresourcelocator.php b/lib/private/template/jsresourcelocator.php
index f8fe3817ce6..507f31327a6 100644
--- a/lib/private/template/jsresourcelocator.php
+++ b/lib/private/template/jsresourcelocator.php
@@ -35,6 +35,10 @@ class JSResourceLocator extends ResourceLocator {
 		) {
 			return;
 		}
+		// missing translations files fill be ignored
+		if (strpos($script, "l10n/") === 0) {
+			return;
+		}
 		throw new \Exception('js file not found: script:'.$script);
 	}
 
diff --git a/lib/private/util.php b/lib/private/util.php
index 5105bb22931..9b8a7a5bc40 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -363,7 +363,7 @@ class OC_Util {
 		if (!empty($application)) {
 			self::$scripts[] = "$application/l10n/$languageCode";
 		} else {
-			self::$scripts[] = "js/$languageCode";
+			self::$scripts[] = "l10n/$languageCode";
 		}
 	}
 
-- 
GitLab


From d71cd680dd6133ad254fd296319aeab6deb77686 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 24 Oct 2014 12:50:54 +0200
Subject: [PATCH 248/616] Include core translations

Moved search result type translations to search.js

Load JS translations earlier

Translations need to be loaded earlier to make sure that some JS files
like search.js get access to translations at this time.

This requires the template initialization to be moved to after session
initialization, because only after the session we have access to the
current language.
---
 core/js/js.js       |  9 ---------
 lib/base.php        |  3 ++-
 search/js/result.js | 19 ++++++++++++++++++-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 7f657f0e945..b1a61ddf502 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -468,15 +468,6 @@ OC.search.customResults={};
 OC.search.currentResult=-1;
 OC.search.lastQuery='';
 OC.search.lastResults={};
-//translations for result type ids, can be extended by apps
-// FIXME: move to later in the init process, after translations were loaded
-
-OC.search.resultTypes={
-	file: 'File', //t('core','File'),
-	folder: 'Folder', //t('core','Folder'),
-	image: 'Image', //t('core','Image'),
-	audio: 'Audio' //t('core','Audio')
-};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
diff --git a/lib/base.php b/lib/base.php
index 3554911abb9..9a181fafded 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -339,6 +339,7 @@ class OC {
 		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");
@@ -526,7 +527,6 @@ class OC {
 		stream_wrapper_register('oc', 'OC\Files\Stream\OC');
 
 		\OC::$server->getEventLogger()->start('init_session', 'Initialize session');
-		self::initTemplateEngine();
 		OC_App::loadApps(array('session'));
 		if (self::$CLI) {
 			self::$session = new \OC\Session\Memory('');
@@ -534,6 +534,7 @@ class OC {
 			self::initSession();
 		}
 		\OC::$server->getEventLogger()->end('init_session');
+		self::initTemplateEngine();
 		self::checkConfig();
 		self::checkInstalled();
 		self::checkSSL();
diff --git a/search/js/result.js b/search/js/result.js
index 13be0b552bf..fe84aecde3e 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2014
+ *
+ * This file is licensed under the Affero General Public License version 3
+ * or later.
+ *
+ * See the COPYING-README file.
+ *
+ */
+
+//translations for result type ids, can be extended by apps
+OC.search.resultTypes={
+	file: t('core','File'),
+	folder: t('core','Folder'),
+	image: t('core','Image'),
+	audio: t('core','Audio')
+};
 OC.search.catagorizeResults=function(results){
 	var types={};
 	for(var i=0;i<results.length;i++){
@@ -118,4 +135,4 @@ OC.search.renderCurrent=function(){
 		$('#searchresults tr.result').removeClass('current');
 		$(result).addClass('current');
 	}
-};
\ No newline at end of file
+};
-- 
GitLab


From 2f19de11e4c77b0f9195c3868960d8105541359f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 24 Oct 2014 13:53:01 +0200
Subject: [PATCH 249/616] adding console command to generate javascript
 translation files based on existing php translation files read server side
 translations from json files

---
 core/command/l10n/createjs.php | 120 +++++++++++++++++++++++++++++++++
 core/register_command.php      |   1 +
 l10n/l10n.pl                   |  19 ++++--
 lib/private/l10n.php           |  64 +++++++++---------
 tests/data/l10n/cs.json        |   6 ++
 tests/data/l10n/cs.php         |   5 --
 tests/data/l10n/de.json        |   6 ++
 tests/data/l10n/de.php         |   5 --
 tests/data/l10n/ru.json        |   6 ++
 tests/data/l10n/ru.php         |   5 --
 tests/lib/l10n.php             |   6 +-
 11 files changed, 187 insertions(+), 56 deletions(-)
 create mode 100644 core/command/l10n/createjs.php
 create mode 100644 tests/data/l10n/cs.json
 delete mode 100644 tests/data/l10n/cs.php
 create mode 100644 tests/data/l10n/de.json
 delete mode 100644 tests/data/l10n/de.php
 create mode 100644 tests/data/l10n/ru.json
 delete mode 100644 tests/data/l10n/ru.php

diff --git a/core/command/l10n/createjs.php b/core/command/l10n/createjs.php
new file mode 100644
index 00000000000..f7d232bcc37
--- /dev/null
+++ b/core/command/l10n/createjs.php
@@ -0,0 +1,120 @@
+<?php
+/**
+ * Copyright (c) 2013 Robin Appelman <icewind@owncloud.com> and
+ * Copyright (c) 2014 Stephen Colebrook <scolebrook@mac.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\Command\L10n;
+
+use DirectoryIterator;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class CreateJs extends Command {
+
+	protected function configure() {
+		$this
+			->setName('l10n:createjs')
+			->setDescription('Create javascript translation files for a given app')
+			->addArgument(
+				'app',
+				InputOption::VALUE_REQUIRED,
+				'name of the app'
+			)
+			->addArgument(
+				'lang',
+				InputOption::VALUE_OPTIONAL,
+				'name of the language'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output) {
+		$app = $input->getArgument('app');
+		$lang = $input->getArgument('lang');
+
+		$path = \OC_App::getAppPath($app);
+		if ($path === false) {
+			$output->writeln("The app <$app> is unknown.");
+			return;
+		}
+		$languages = $lang;
+		if (empty($lang)) {
+			$languages= $this->getAllLanguages($path);
+		}
+
+		foreach($languages as $lang) {
+			$this->writeFiles($app, $path, $lang, $output);
+		}
+	}
+
+	private function getAllLanguages($path) {
+		$result = array();
+		foreach (new DirectoryIterator("$path/l10n") as $fileInfo) {
+			if($fileInfo->isDot()) {
+				continue;
+			}
+			if($fileInfo->isDir()) {
+				continue;
+			}
+			if($fileInfo->getExtension() !== 'php') {
+				continue;
+			}
+			$result[]= substr($fileInfo->getBasename(), 0, -4);
+		}
+
+		return $result;
+	}
+
+	private function writeFiles($app, $path, $lang, OutputInterface $output) {
+		list($translations, $plurals) = $this->loadTranslations($path, $lang);
+		$this->writeJsFile($app, $path, $lang, $output, $translations, $plurals);
+		$this->writeJsonFile($path, $lang, $output, $translations, $plurals);
+	}
+
+	private function writeJsFile($app, $path, $lang, OutputInterface $output, $translations, $plurals) {
+		$jsFile = "$path/l10n/$lang.js";
+		if (file_exists($jsFile)) {
+			$output->writeln("File already exists: $jsFile");
+			return;
+		}
+		$content = "OC.L10N.register(\n    \"$app\",\n    {\n    ";
+		$jsTrans = array();
+		foreach ($translations as $id => $val) {
+			if (is_array($val)) {
+				$val = '[ ' . join(',', $val) . ']';
+			}
+			$jsTrans[] = "\"$id\" : \"$val\"";
+		}
+		$content .= join(",\n    ", $jsTrans);
+		$content .= "\n},\n\"$plurals\");\n";
+
+		file_put_contents($jsFile, $content);
+		$output->writeln("Javascript translation file generated: $jsFile");
+	}
+
+	private function writeJsonFile($path, $lang, OutputInterface $output, $translations, $plurals) {
+		$jsFile = "$path/l10n/$lang.json";
+		if (file_exists($jsFile)) {
+			$output->writeln("File already exists: $jsFile");
+			return;
+		}
+		$content = array('translations' => $translations, 'pluralForm' => $plurals);
+		file_put_contents($jsFile, json_encode($content));
+		$output->writeln("Json translation file generated: $jsFile");
+	}
+
+	private function loadTranslations($path, $lang) {
+		$phpFile = "$path/l10n/$lang.php";
+		$TRANSLATIONS = array();
+		$PLURAL_FORMS = '';
+		require $phpFile;
+
+		return array($TRANSLATIONS, $PLURAL_FORMS);
+	}
+}
diff --git a/core/register_command.php b/core/register_command.php
index aaf10d946b2..c5d9b6e342d 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -22,4 +22,5 @@ $application->add(new OC\Core\Command\Maintenance\Repair($repair, OC_Config::get
 $application->add(new OC\Core\Command\User\Report());
 $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
 $application->add(new OC\Core\Command\User\LastSeen());
+$application->add(new OC\Core\Command\L10n\CreateJs());
 
diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index 8b12f1abaed..7443a5f941d 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -120,7 +120,7 @@ if( $task eq 'read' ){
 			my $language = ( $file =~ /\.js$/ ? 'Python' : 'PHP');
 			my $joinexisting = ( -e $output ? '--join-existing' : '');
 			print "    Reading $file\n";
-			`xgettext --output="$output" $joinexisting $keywords --language=$language "$file" --add-comments=TRANSLATORS --from-code=UTF-8 --package-version="6.0.0" --package-name="ownCloud Core" --msgid-bugs-address="translations\@owncloud.org"`;
+			`xgettext --output="$output" $joinexisting $keywords --language=$language "$file" --add-comments=TRANSLATORS --from-code=UTF-8 --package-version="8.0.0" --package-name="ownCloud Core" --msgid-bugs-address="translations\@owncloud.org"`;
 		}
 		chdir( $whereami );
 	}
@@ -176,19 +176,24 @@ elsif( $task eq 'write' ){
 				s/\$/\\\$/g;
 			}
 
-			# Write PHP file
-			open( OUT, ">$language.php" );
-			print OUT "<?php\n\$TRANSLATIONS = array(\n";
-			print OUT join( ",\n", @strings );
-			print OUT "\n);\n\$PLURAL_FORMS = \"$plurals\";\n";
-			close( OUT );
+            # delete old php file
+            unlink "$language.php";
 
+			# Write js file
 			open( OUT, ">$language.js" );
 			print OUT "OC.L10N.register(\n    \"$app\",\n    {\n    ";
 			print OUT join( ",\n    ", @js_strings );
 			print OUT "\n},\n\"$plurals\");\n";
 			close( OUT );
 
+			# Write json file
+			open( OUT, ">$language.json" );
+			print OUT "{ \"translations\": ";
+			print OUT "{\n    ";
+			print OUT join( ",\n    ", @js_strings );
+			print OUT "\n},\"pluralForm\" :\"$plurals\"\n}";
+			close( OUT );
+
 		}
 		chdir( $whereami );
 	}
diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index ee144cd221c..ab94d017a25 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -54,12 +54,12 @@ class OC_L10N implements \OCP\IL10N {
 	/**
 	 * Plural forms (string)
 	 */
-	private $plural_form_string = 'nplurals=2; plural=(n != 1);';
+	private $pluralFormString = 'nplurals=2; plural=(n != 1);';
 
 	/**
 	 * Plural forms (function)
 	 */
-	private $plural_form_function = null;
+	private $pluralFormFunction = null;
 
 	/**
 	 * get an L10N instance
@@ -90,16 +90,26 @@ class OC_L10N implements \OCP\IL10N {
 
 	/**
 	 * @param string $transFile
+	 * @return bool
 	 */
-	public function load($transFile) {
+	public function load($transFile, $mergeTranslations = false) {
 		$this->app = true;
-		include $transFile;
-		if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
-			$this->translations = $TRANSLATIONS;
+
+		$json = json_decode(file_get_contents($transFile), true);
+		if (!is_array($json)) {
+			return false;
 		}
-		if(isset($PLURAL_FORMS)) {
-			$this->plural_form_string = $PLURAL_FORMS;
+
+		$this->pluralFormString = $json['pluralForm'];
+		$translations = $json['translations'];
+
+		if ($mergeTranslations) {
+			$this->translations = array_merge($this->translations, $translations);
+		} else {
+			$this->translations = $translations;
 		}
+
+		return true;
 	}
 
 	protected function init() {
@@ -118,35 +128,27 @@ class OC_L10N implements \OCP\IL10N {
 		if(array_key_exists($app.'::'.$lang, self::$cache)) {
 			$this->translations = self::$cache[$app.'::'.$lang]['t'];
 		} else{
-			$i18ndir = self::findI18nDir($app);
+			$i18nDir = self::findI18nDir($app);
+			$transFile = strip_tags($i18nDir).strip_tags($lang).'.json';
 			// Texts are in $i18ndir
 			// (Just no need to define date/time format etc. twice)
-			if((OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/core/l10n/')
-				|| OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/')
-				|| OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')
-				|| OC_Helper::isSubDirectory($i18ndir.$lang.'.php', OC_App::getAppPath($app).'/l10n/')
+			if((OC_Helper::isSubDirectory($transFile, OC::$SERVERROOT.'/core/l10n/')
+				|| OC_Helper::isSubDirectory($transFile, OC::$SERVERROOT.'/lib/l10n/')
+				|| OC_Helper::isSubDirectory($transFile, OC::$SERVERROOT.'/settings')
+				|| OC_Helper::isSubDirectory($transFile, OC_App::getAppPath($app).'/l10n/')
 				)
-				&& file_exists($i18ndir.$lang.'.php')) {
-				// Include the file, save the data from $CONFIG
-				$transFile = strip_tags($i18ndir).strip_tags($lang).'.php';
-				include $transFile;
-				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
-					$this->translations = $TRANSLATIONS;
+				&& file_exists($transFile)) {
+				// load the translations file
+				if($this->load($transFile)) {
 					//merge with translations from theme
 					$theme = OC_Config::getValue( "theme" );
 					if (!is_null($theme)) {
 						$transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT));
 						if (file_exists($transFile)) {
-							include $transFile;
-							if (isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
-								$this->translations = array_merge($this->translations, $TRANSLATIONS);
-							}
+							$this->load($transFile, true);
 						}
 					}
 				}
-				if(isset($PLURAL_FORMS)) {
-					$this->plural_form_string = $PLURAL_FORMS;
-				}
 			}
 
 			self::$cache[$app.'::'.$lang]['t'] = $this->translations;
@@ -273,10 +275,10 @@ class OC_L10N implements \OCP\IL10N {
 	 */
 	public function getPluralFormFunction() {
 		$this->init();
-		if(is_null($this->plural_form_function)) {
-			$this->plural_form_function = $this->createPluralFormFunction($this->plural_form_string);
+		if(is_null($this->pluralFormFunction)) {
+			$this->pluralFormFunction = $this->createPluralFormFunction($this->pluralFormString);
 		}
-		return $this->plural_form_function;
+		return $this->pluralFormFunction;
 	}
 
 	/**
@@ -479,8 +481,8 @@ class OC_L10N implements \OCP\IL10N {
 		if(is_dir($dir)) {
 			$files=scandir($dir);
 			foreach($files as $file) {
-				if(substr($file, -4, 4) === '.php' && substr($file, 0, 4) !== 'l10n') {
-					$i = substr($file, 0, -4);
+				if(substr($file, -5, 5) === '.json' && substr($file, 0, 4) !== 'l10n') {
+					$i = substr($file, 0, -5);
 					$available[] = $i;
 				}
 			}
diff --git a/tests/data/l10n/cs.json b/tests/data/l10n/cs.json
new file mode 100644
index 00000000000..c86f41aa077
--- /dev/null
+++ b/tests/data/l10n/cs.json
@@ -0,0 +1,6 @@
+{
+	"translations" : {
+		"_%n window_::_%n windows_" : ["%n okno", "%n okna", "%n oken"]
+	},
+	"pluralForm" :	"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
diff --git a/tests/data/l10n/cs.php b/tests/data/l10n/cs.php
deleted file mode 100644
index de106ede026..00000000000
--- a/tests/data/l10n/cs.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-	"_%n window_::_%n windows_" => array("%n okno", "%n okna", "%n oken")
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/tests/data/l10n/de.json b/tests/data/l10n/de.json
new file mode 100644
index 00000000000..c2b6f34c081
--- /dev/null
+++ b/tests/data/l10n/de.json
@@ -0,0 +1,6 @@
+{
+	"translations" : {
+		"_%n file_::_%n files_": ["%n Datei", "%n Dateien"]
+	},
+	"pluralForm" :	"nplurals=2; plural=(n != 1);"
+}
diff --git a/tests/data/l10n/de.php b/tests/data/l10n/de.php
deleted file mode 100644
index 93c9ab4209e..00000000000
--- a/tests/data/l10n/de.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-	"_%n file_::_%n files_" => array("%n Datei", "%n Dateien")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/tests/data/l10n/ru.json b/tests/data/l10n/ru.json
new file mode 100644
index 00000000000..177b14a6b20
--- /dev/null
+++ b/tests/data/l10n/ru.json
@@ -0,0 +1,6 @@
+{
+	"translations" : {
+		"_%n file_::_%n files_" : ["%n файл", "%n файла", "%n файлов"]
+	},
+	"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/tests/data/l10n/ru.php b/tests/data/l10n/ru.php
deleted file mode 100644
index b778e8d79af..00000000000
--- a/tests/data/l10n/ru.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-	"_%n file_::_%n files_" => array("%n файл", "%n файла", "%n файлов")
-);
-$PLURAL_FORMS = "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/tests/lib/l10n.php b/tests/lib/l10n.php
index a97fa22f05c..df86fcfda81 100644
--- a/tests/lib/l10n.php
+++ b/tests/lib/l10n.php
@@ -10,7 +10,7 @@ class Test_L10n extends PHPUnit_Framework_TestCase {
 
 	public function testGermanPluralTranslations() {
 		$l = new OC_L10N('test');
-		$transFile = OC::$SERVERROOT.'/tests/data/l10n/de.php';
+		$transFile = OC::$SERVERROOT.'/tests/data/l10n/de.json';
 
 		$l->load($transFile);
 		$this->assertEquals('1 Datei', (string)$l->n('%n file', '%n files', 1));
@@ -19,7 +19,7 @@ class Test_L10n extends PHPUnit_Framework_TestCase {
 
 	public function testRussianPluralTranslations() {
 		$l = new OC_L10N('test');
-		$transFile = OC::$SERVERROOT.'/tests/data/l10n/ru.php';
+		$transFile = OC::$SERVERROOT.'/tests/data/l10n/ru.json';
 
 		$l->load($transFile);
 		$this->assertEquals('1 файл', (string)$l->n('%n file', '%n files', 1));
@@ -44,7 +44,7 @@ class Test_L10n extends PHPUnit_Framework_TestCase {
 
 	public function testCzechPluralTranslations() {
 		$l = new OC_L10N('test');
-		$transFile = OC::$SERVERROOT.'/tests/data/l10n/cs.php';
+		$transFile = OC::$SERVERROOT.'/tests/data/l10n/cs.json';
 
 		$l->load($transFile);
 		$this->assertEquals('1 okno', (string)$l->n('%n window', '%n windows', 1));
-- 
GitLab


From 9d1be0bbaf7d8af442fc8d908baff743cc823a98 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 28 Oct 2014 15:57:08 +0100
Subject: [PATCH 250/616] get the source path and owner in a pre hook and the
 target path and owner in a post hook

---
 apps/files_versions/lib/hooks.php      | 33 ++++++++++++---
 apps/files_versions/lib/versions.php   | 46 +++++++++++++++++---
 apps/files_versions/tests/versions.php | 58 +++++++++++++++++++++++++-
 3 files changed, 124 insertions(+), 13 deletions(-)

diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 1a584232ba7..024cb6a3c39 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -16,12 +16,14 @@ class Hooks {
 
 	public static function connectHooks() {
 		// Listen to write signals
-		\OCP\Util::connectHook('OC_Filesystem', 'write', "OCA\Files_Versions\Hooks", "write_hook");
+		\OCP\Util::connectHook('OC_Filesystem', 'write', 'OCA\Files_Versions\Hooks', 'write_hook');
 		// Listen to delete and rename signals
-		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', "OCA\Files_Versions\Hooks", "remove_hook");
-		\OCP\Util::connectHook('OC_Filesystem', 'delete', "OCA\Files_Versions\Hooks", "pre_remove_hook");
-		\OCP\Util::connectHook('OC_Filesystem', 'rename', "OCA\Files_Versions\Hooks", "rename_hook");
-		\OCP\Util::connectHook('OC_Filesystem', 'copy', "OCA\Files_Versions\Hooks", "copy_hook");
+		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Files_Versions\Hooks', 'remove_hook');
+		\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Files_Versions\Hooks', 'pre_remove_hook');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_rename', 'OCA\Files_Versions\Hooks', 'rename_hook');
+		\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');
 	}
 
 	/**
@@ -102,4 +104,25 @@ class Hooks {
 		}
 	}
 
+	/**
+	 * Remember owner and the owner path of the source file.
+	 * If the file already exists, then it was a upload of a existing file
+	 * over the web interface and we call Storage::store() directly
+	 *
+	 * @param array $params array with oldpath and newpath
+	 *
+	 */
+	public static function pre_renameOrCopy_hook($params) {
+		if (\OCP\App::isEnabled('files_versions')) {
+
+			$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
+			if ($view->file_exists($params['newpath'])) {
+				Storage::store($params['newpath']);
+			} else {
+				Storage::setSourcePathAndUser($params['oldpath']);
+			}
+
+		}
+	}
+
 }
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index bdb26896948..35e79569cda 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -24,6 +24,8 @@ class Storage {
 	// files for which we can remove the versions after the delete operation was successful
 	private static $deletedFiles = array();
 
+	private static $sourcePathAndUser = array();
+
 	private static $max_versions_per_interval = array(
 		//first 10sec, one version every 2sec
 		1 => array('intervalEndsAfter' => 10,      'step' => 2),
@@ -50,6 +52,34 @@ class Storage {
 		return array($uid, $filename);
 	}
 
+	/**
+	 * remeber the owner and the owner path of the source file
+	 *
+	 * @param string $source source path
+	 */
+	public static function setSourcePathAndUser($source) {
+		list($uid, $path) = self::getUidAndFilename($source);
+		self::$sourcePathAndUser[$source] = array('uid' => $uid, 'path' => $path);
+	}
+
+	/**
+	 * gets the owner and the owner path from the source path
+	 *
+	 * @param string $source source path
+	 * @return array with user id and path
+	 */
+	public static function getSourcePathAndUser($source) {
+
+		if (isset(self::$sourcePathAndUser[$source])) {
+			$uid = self::$sourcePathAndUser[$source]['uid'];
+			$path = self::$sourcePathAndUser[$source]['path'];
+			unset(self::$sourcePathAndUser[$source]);
+		} else {
+			$uid = $path = false;
+		}
+		return array($uid, $path);
+	}
+
 	/**
 	 * get current size of all versions from a given user
 	 *
@@ -180,16 +210,20 @@ class Storage {
 	 * @param string $operation can be 'copy' or 'rename'
 	 */
 	public static function renameOrCopy($old_path, $new_path, $operation) {
-		list($uid, $oldpath) = self::getUidAndFilename($old_path);
+		list($uid, $oldpath) = self::getSourcePathAndUser($old_path);
+
+		// it was a upload of a existing file if no old path exists
+		// in this case the pre-hook already called the store method and we can
+		// stop here
+		if ($oldpath === false) {
+			return true;
+		}
+
 		list($uidn, $newpath) = self::getUidAndFilename($new_path);
 		$versions_view = new \OC\Files\View('/'.$uid .'/files_versions');
 		$files_view = new \OC\Files\View('/'.$uid .'/files');
 
-		// if the file already exists than it was a upload of a existing file
-		// over the web interface -> store() is the right function we need here
-		if ($files_view->file_exists($newpath)) {
-			return self::store($new_path);
-		}
+
 
 		if ( $files_view->is_dir($oldpath) && $versions_view->is_dir($oldpath) ) {
 			$versions_view->$operation($oldpath, $newpath);
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 558c8dfcb8a..6dfba6bcf23 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -30,18 +30,28 @@ require_once __DIR__ . '/../lib/versions.php';
 class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 
 	const TEST_VERSIONS_USER = 'test-versions-user';
+	const TEST_VERSIONS_USER2 = 'test-versions-user2';
 	const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
 
 	private $rootView;
 
 	public static function setUpBeforeClass() {
+
+		// clear share hooks
+		\OC_Hook::clear('OCP\\Share');
+		\OC::registerShareHooks();
+		\OCA\Files_Versions\Hooks::connectHooks();
+		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+
 		// create test user
+		self::loginHelper(self::TEST_VERSIONS_USER2, true);
 		self::loginHelper(self::TEST_VERSIONS_USER, true);
 	}
 
 	public static function tearDownAfterClass() {
 		// cleanup test user
 		\OC_User::deleteUser(self::TEST_VERSIONS_USER);
+		\OC_User::deleteUser(self::TEST_VERSIONS_USER2);
 	}
 
 	function setUp() {
@@ -222,7 +232,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		$this->rootView->file_put_contents($v2, 'version2');
 
 		// execute rename hook of versions app
-		\OCA\Files_Versions\Storage::renameOrCopy("test.txt", "test2.txt", 'rename');
+		\OC\Files\Filesystem::rename("test.txt", "test2.txt");
 
 		$this->assertFalse($this->rootView->file_exists($v1));
 		$this->assertFalse($this->rootView->file_exists($v2));
@@ -234,6 +244,50 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		\OC\Files\Filesystem::unlink('test2.txt');
 	}
 
+	function testRenameInSharedFolder() {
+
+		\OC\Files\Filesystem::mkdir('folder1');
+		\OC\Files\Filesystem::mkdir('folder1/folder2');
+		\OC\Files\Filesystem::file_put_contents("folder1/test.txt", "test file");
+
+		$fileInfo = \OC\Files\Filesystem::getFileInfo('folder1');
+
+		$t1 = time();
+		// second version is two weeks older, this way we make sure that no
+		// version will be expired
+		$t2 = $t1 - 60 * 60 * 24 * 14;
+
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT . '/folder1');
+		// create some versions
+		$v1 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t1;
+		$v2 = self::USERS_VERSIONS_ROOT . '/folder1/test.txt.v' . $t2;
+		$v1Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT . '/folder1/folder2/test.txt.v' . $t2;
+
+		$this->rootView->file_put_contents($v1, 'version1');
+		$this->rootView->file_put_contents($v2, 'version2');
+
+		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_VERSIONS_USER2, OCP\PERMISSION_ALL);
+
+		self::loginHelper(self::TEST_VERSIONS_USER2);
+
+		$this->assertTrue(\OC\Files\Filesystem::file_exists('folder1/test.txt'));
+
+		// execute rename hook of versions app
+		\OC\Files\Filesystem::rename('/folder1/test.txt', '/folder1/folder2/test.txt');
+
+		self::loginHelper(self::TEST_VERSIONS_USER2);
+
+		$this->assertFalse($this->rootView->file_exists($v1));
+		$this->assertFalse($this->rootView->file_exists($v2));
+
+		$this->assertTrue($this->rootView->file_exists($v1Renamed));
+		$this->assertTrue($this->rootView->file_exists($v2Renamed));
+
+		//cleanup
+		\OC\Files\Filesystem::unlink('/folder1/folder2/test.txt');
+	}
+
 	function testCopy() {
 
 		\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
@@ -253,7 +307,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		$this->rootView->file_put_contents($v2, 'version2');
 
 		// execute copy hook of versions app
-		\OCA\Files_Versions\Storage::renameOrCopy("test.txt", "test2.txt", 'copy');
+		\OC\Files\Filesystem::copy("test.txt", "test2.txt");
 
 		$this->assertTrue($this->rootView->file_exists($v1));
 		$this->assertTrue($this->rootView->file_exists($v2));
-- 
GitLab


From 206cb5ba632baa70a0317f5412c306708e4788d1 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 28 Oct 2014 23:32:57 +0100
Subject: [PATCH 251/616] Fix typo

---
 apps/files_versions/lib/versions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 35e79569cda..82e0ecc3e2f 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -53,7 +53,7 @@ class Storage {
 	}
 
 	/**
-	 * remeber the owner and the owner path of the source file
+	 * Remember the owner and the owner path of the source file
 	 *
 	 * @param string $source source path
 	 */
@@ -63,7 +63,7 @@ class Storage {
 	}
 
 	/**
-	 * gets the owner and the owner path from the source path
+	 * Gets the owner and the owner path from the source path
 	 *
 	 * @param string $source source path
 	 * @return array with user id and path
-- 
GitLab


From 9f7c571e401b5a1a59c0ae9faa119da98aa4a184 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 17 Oct 2014 14:20:02 +0200
Subject: [PATCH 252/616] update all translation files to js and json

---
 apps/files/l10n/ach.js                  |   8 +
 apps/files/l10n/ach.json                |   6 +
 apps/files/l10n/ach.php                 |   7 -
 apps/files/l10n/ady.js                  |   8 +
 apps/files/l10n/ady.json                |   6 +
 apps/files/l10n/ady.php                 |   7 -
 apps/files/l10n/af.js                   |   8 +
 apps/files/l10n/af.json                 |   1 +
 apps/files/l10n/af.php                  |   7 -
 apps/files/l10n/af_ZA.js                |  11 ++
 apps/files/l10n/af_ZA.json              |   9 +
 apps/files/l10n/af_ZA.php               |  10 -
 apps/files/l10n/ak.js                   |   8 +
 apps/files/l10n/ak.json                 |   6 +
 apps/files/l10n/ak.php                  |   7 -
 apps/files/l10n/am_ET.js                |   8 +
 apps/files/l10n/am_ET.json              |   6 +
 apps/files/l10n/am_ET.php               |   7 -
 apps/files/l10n/ar.js                   |  67 +++++++
 apps/files/l10n/ar.json                 |  65 +++++++
 apps/files/l10n/ar.php                  |  66 -------
 apps/files/l10n/ast.js                  |  95 ++++++++++
 apps/files/l10n/ast.json                |  93 +++++++++
 apps/files/l10n/ast.php                 |  94 ----------
 apps/files/l10n/az.js                   |  64 +++++++
 apps/files/l10n/az.json                 |  62 ++++++
 apps/files/l10n/az.php                  |  63 -------
 apps/files/l10n/be.js                   |   9 +
 apps/files/l10n/be.json                 |   7 +
 apps/files/l10n/be.php                  |   8 -
 apps/files/l10n/bg_BG.js                |  97 ++++++++++
 apps/files/l10n/bg_BG.json              |  95 ++++++++++
 apps/files/l10n/bg_BG.php               |  96 ----------
 apps/files/l10n/bn_BD.js                |  68 +++++++
 apps/files/l10n/bn_BD.json              |  66 +++++++
 apps/files/l10n/bn_BD.php               |  67 -------
 apps/files/l10n/bn_IN.js                |  33 ++++
 apps/files/l10n/bn_IN.json              |  31 +++
 apps/files/l10n/bn_IN.php               |  32 ----
 apps/files/l10n/bs.js                   |  14 ++
 apps/files/l10n/bs.json                 |  12 ++
 apps/files/l10n/bs.php                  |  13 --
 apps/files/l10n/ca.js                   |  96 ++++++++++
 apps/files/l10n/ca.json                 |  94 ++++++++++
 apps/files/l10n/ca.php                  |  95 ----------
 apps/files/l10n/ca@valencia.js          |   8 +
 apps/files/l10n/ca@valencia.json        |   6 +
 apps/files/l10n/ca@valencia.php         |   7 -
 apps/files/l10n/cs_CZ.js                |  97 ++++++++++
 apps/files/l10n/cs_CZ.json              |  95 ++++++++++
 apps/files/l10n/cs_CZ.php               |  96 ----------
 apps/files/l10n/cy_GB.js                |  51 +++++
 apps/files/l10n/cy_GB.json              |  49 +++++
 apps/files/l10n/cy_GB.php               |  50 -----
 apps/files/l10n/da.js                   |  97 ++++++++++
 apps/files/l10n/da.json                 |  95 ++++++++++
 apps/files/l10n/da.php                  |  96 ----------
 apps/files/l10n/de.js                   |  97 ++++++++++
 apps/files/l10n/de.json                 |  95 ++++++++++
 apps/files/l10n/de.php                  |  96 ----------
 apps/files/l10n/de_AT.js                |  15 ++
 apps/files/l10n/de_AT.json              |  13 ++
 apps/files/l10n/de_AT.php               |  14 --
 apps/files/l10n/de_CH.js                |  58 ++++++
 apps/files/l10n/de_CH.json              |  56 ++++++
 apps/files/l10n/de_CH.php               |  57 ------
 apps/files/l10n/de_DE.js                |  97 ++++++++++
 apps/files/l10n/de_DE.json              |  95 ++++++++++
 apps/files/l10n/de_DE.php               |  96 ----------
 apps/files/l10n/el.js                   |  97 ++++++++++
 apps/files/l10n/el.json                 |  95 ++++++++++
 apps/files/l10n/el.php                  |  96 ----------
 apps/files/l10n/en@pirate.js            |   9 +
 apps/files/l10n/en@pirate.json          |   7 +
 apps/files/l10n/en@pirate.php           |   8 -
 apps/files/l10n/en_GB.js                |  97 ++++++++++
 apps/files/l10n/en_GB.json              |  95 ++++++++++
 apps/files/l10n/en_GB.php               |  96 ----------
 apps/files/l10n/en_NZ.js                |   8 +
 apps/files/l10n/en_NZ.json              |   6 +
 apps/files/l10n/en_NZ.php               |   7 -
 apps/files/l10n/eo.js                   |  74 ++++++++
 apps/files/l10n/eo.json                 |  72 +++++++
 apps/files/l10n/eo.php                  |  73 -------
 apps/files/l10n/es.js                   |  97 ++++++++++
 apps/files/l10n/es.json                 |  95 ++++++++++
 apps/files/l10n/es.php                  |  96 ----------
 apps/files/l10n/es_AR.js                |  82 ++++++++
 apps/files/l10n/es_AR.json              |  80 ++++++++
 apps/files/l10n/es_AR.php               |  81 --------
 apps/files/l10n/es_BO.js                |   8 +
 apps/files/l10n/es_BO.json              |   6 +
 apps/files/l10n/es_BO.php               |   7 -
 apps/files/l10n/es_CL.js                |  15 ++
 apps/files/l10n/es_CL.json              |  13 ++
 apps/files/l10n/es_CL.php               |  14 --
 apps/files/l10n/es_CO.js                |   8 +
 apps/files/l10n/es_CO.json              |   6 +
 apps/files/l10n/es_CO.php               |   7 -
 apps/files/l10n/es_CR.js                |   8 +
 apps/files/l10n/es_CR.json              |   6 +
 apps/files/l10n/es_CR.php               |   7 -
 apps/files/l10n/es_EC.js                |   8 +
 apps/files/l10n/es_EC.json              |   6 +
 apps/files/l10n/es_EC.php               |   7 -
 apps/files/l10n/es_MX.js                |  82 ++++++++
 apps/files/l10n/es_MX.json              |  80 ++++++++
 apps/files/l10n/es_MX.php               |  81 --------
 apps/files/l10n/es_PE.js                |   8 +
 apps/files/l10n/es_PE.json              |   6 +
 apps/files/l10n/es_PE.php               |   7 -
 apps/files/l10n/es_PY.js                |   9 +
 apps/files/l10n/es_PY.json              |   7 +
 apps/files/l10n/es_PY.php               |   8 -
 apps/files/l10n/es_US.js                |   8 +
 apps/files/l10n/es_US.json              |   6 +
 apps/files/l10n/es_US.php               |   7 -
 apps/files/l10n/es_UY.js                |   8 +
 apps/files/l10n/es_UY.json              |   6 +
 apps/files/l10n/es_UY.php               |   7 -
 apps/files/l10n/et_EE.js                |  97 ++++++++++
 apps/files/l10n/et_EE.json              |  95 ++++++++++
 apps/files/l10n/et_EE.php               |  96 ----------
 apps/files/l10n/eu.js                   |  96 ++++++++++
 apps/files/l10n/eu.json                 |  94 ++++++++++
 apps/files/l10n/eu.php                  |  96 ----------
 apps/files/l10n/eu_ES.js                |  11 ++
 apps/files/l10n/eu_ES.json              |   9 +
 apps/files/l10n/eu_ES.php               |  10 -
 apps/files/l10n/fa.js                   |  58 ++++++
 apps/files/l10n/fa.json                 |  56 ++++++
 apps/files/l10n/fa.php                  |  57 ------
 apps/files/l10n/fi_FI.js                |  97 ++++++++++
 apps/files/l10n/fi_FI.json              |  95 ++++++++++
 apps/files/l10n/fi_FI.php               |  96 ----------
 apps/files/l10n/fil.js                  |   8 +
 apps/files/l10n/fil.json                |   6 +
 apps/files/l10n/fil.php                 |   7 -
 apps/files/l10n/fr.js                   |  97 ++++++++++
 apps/files/l10n/fr.json                 |  95 ++++++++++
 apps/files/l10n/fr.php                  |  96 ----------
 apps/files/l10n/fr_CA.js                |   8 +
 apps/files/l10n/fr_CA.json              |   6 +
 apps/files/l10n/fr_CA.php               |   7 -
 apps/files/l10n/fy_NL.js                |   8 +
 apps/files/l10n/fy_NL.json              |   6 +
 apps/files/l10n/fy_NL.php               |   7 -
 apps/files/l10n/gl.js                   |  96 ++++++++++
 apps/files/l10n/gl.json                 |  94 ++++++++++
 apps/files/l10n/gl.php                  |  95 ----------
 apps/files/l10n/gu.js                   |   8 +
 apps/files/l10n/gu.json                 |   6 +
 apps/files/l10n/gu.php                  |   7 -
 apps/files/l10n/he.js                   |  56 ++++++
 apps/files/l10n/he.json                 |  54 ++++++
 apps/files/l10n/he.php                  |  55 ------
 apps/files/l10n/hi.js                   |  13 ++
 apps/files/l10n/hi.json                 |  11 ++
 apps/files/l10n/hi.php                  |  12 --
 apps/files/l10n/hi_IN.js                |   8 +
 apps/files/l10n/hi_IN.json              |   1 +
 apps/files/l10n/hi_IN.php               |   7 -
 apps/files/l10n/hr.js                   |  97 ++++++++++
 apps/files/l10n/hr.json                 |  95 ++++++++++
 apps/files/l10n/hr.php                  |  96 ----------
 apps/files/l10n/hu_HU.js                |  97 ++++++++++
 apps/files/l10n/hu_HU.json              |  95 ++++++++++
 apps/files/l10n/hu_HU.php               |  96 ----------
 apps/files/l10n/hy.js                   |  11 ++
 apps/files/l10n/hy.json                 |   9 +
 apps/files/l10n/hy.php                  |  10 -
 apps/files/l10n/ia.js                   |  31 +++
 apps/files/l10n/ia.json                 |  29 +++
 apps/files/l10n/ia.php                  |  30 ---
 apps/files/l10n/id.js                   |  97 ++++++++++
 apps/files/l10n/id.json                 |  95 ++++++++++
 apps/files/l10n/id.php                  |  96 ----------
 apps/files/l10n/io.js                   |   8 +
 apps/files/l10n/io.json                 |   6 +
 apps/files/l10n/io.php                  |   7 -
 apps/files/l10n/is.js                   |  48 +++++
 apps/files/l10n/is.json                 |  46 +++++
 apps/files/l10n/is.php                  |  47 -----
 apps/files/l10n/it.js                   |  97 ++++++++++
 apps/files/l10n/it.json                 |  95 ++++++++++
 apps/files/l10n/it.php                  |  96 ----------
 apps/files/l10n/ja.js                   |  97 ++++++++++
 apps/files/l10n/ja.json                 |  95 ++++++++++
 apps/files/l10n/ja.php                  |  96 ----------
 apps/files/l10n/jv.js                   |   9 +
 apps/files/l10n/jv.json                 |   7 +
 apps/files/l10n/jv.php                  |   8 -
 apps/files/l10n/ka_GE.js                |  54 ++++++
 apps/files/l10n/ka_GE.json              |  52 +++++
 apps/files/l10n/ka_GE.php               |  53 ------
 apps/files/l10n/km.js                   |  39 ++++
 apps/files/l10n/km.json                 |  37 ++++
 apps/files/l10n/km.php                  |  38 ----
 apps/files/l10n/kn.js                   |   8 +
 apps/files/l10n/kn.json                 |   6 +
 apps/files/l10n/kn.php                  |   7 -
 apps/files/l10n/ko.js                   |  82 ++++++++
 apps/files/l10n/ko.json                 |  80 ++++++++
 apps/files/l10n/ko.php                  |  81 --------
 apps/files/l10n/ku_IQ.js                |  15 ++
 apps/files/l10n/ku_IQ.json              |  13 ++
 apps/files/l10n/ku_IQ.php               |  14 --
 apps/files/l10n/lb.js                   |  38 ++++
 apps/files/l10n/lb.json                 |  36 ++++
 apps/files/l10n/lb.php                  |  37 ----
 apps/files/l10n/lt_LT.js                |  82 ++++++++
 apps/files/l10n/lt_LT.json              |  80 ++++++++
 apps/files/l10n/lt_LT.php               |  81 --------
 apps/files/l10n/lv.js                   |  58 ++++++
 apps/files/l10n/lv.json                 |  56 ++++++
 apps/files/l10n/lv.php                  |  57 ------
 apps/files/l10n/mg.js                   |   8 +
 apps/files/l10n/mg.json                 |   6 +
 apps/files/l10n/mg.php                  |   7 -
 apps/files/l10n/mk.js                   |  70 +++++++
 apps/files/l10n/mk.json                 |  68 +++++++
 apps/files/l10n/mk.php                  |  69 -------
 apps/files/l10n/ml.js                   |   8 +
 apps/files/l10n/ml.json                 |   6 +
 apps/files/l10n/ml.php                  |   7 -
 apps/files/l10n/ml_IN.js                |   9 +
 apps/files/l10n/ml_IN.json              |   7 +
 apps/files/l10n/ml_IN.php               |   8 -
 apps/files/l10n/mn.js                   |   8 +
 apps/files/l10n/mn.json                 |   6 +
 apps/files/l10n/mn.php                  |   7 -
 apps/files/l10n/ms_MY.js                |  37 ++++
 apps/files/l10n/ms_MY.json              |  35 ++++
 apps/files/l10n/ms_MY.php               |  36 ----
 apps/files/l10n/mt_MT.js                |   8 +
 apps/files/l10n/mt_MT.json              |   6 +
 apps/files/l10n/mt_MT.php               |   7 -
 apps/files/l10n/my_MM.js                |  10 +
 apps/files/l10n/my_MM.json              |   8 +
 apps/files/l10n/my_MM.php               |   9 -
 apps/files/l10n/nb_NO.js                |  97 ++++++++++
 apps/files/l10n/nb_NO.json              |  95 ++++++++++
 apps/files/l10n/nb_NO.php               |  96 ----------
 apps/files/l10n/nds.js                  |   8 +
 apps/files/l10n/nds.json                |   6 +
 apps/files/l10n/nds.php                 |   7 -
 apps/files/l10n/ne.js                   |   8 +
 apps/files/l10n/ne.json                 |   6 +
 apps/files/l10n/ne.php                  |   7 -
 apps/files/l10n/nl.js                   |  97 ++++++++++
 apps/files/l10n/nl.json                 |  95 ++++++++++
 apps/files/l10n/nl.php                  |  96 ----------
 apps/files/l10n/nn_NO.js                |  64 +++++++
 apps/files/l10n/nn_NO.json              |  62 ++++++
 apps/files/l10n/nn_NO.php               |  63 -------
 apps/files/l10n/nqo.js                  |   8 +
 apps/files/l10n/nqo.json                |   6 +
 apps/files/l10n/nqo.php                 |   7 -
 apps/files/l10n/oc.js                   |  38 ++++
 apps/files/l10n/oc.json                 |  36 ++++
 apps/files/l10n/oc.php                  |  37 ----
 apps/files/l10n/or_IN.js                |   8 +
 apps/files/l10n/or_IN.json              |   6 +
 apps/files/l10n/or_IN.php               |   7 -
 apps/files/l10n/pa.js                   |  15 ++
 apps/files/l10n/pa.json                 |  13 ++
 apps/files/l10n/pa.php                  |  14 --
 apps/files/l10n/pl.js                   |  97 ++++++++++
 apps/files/l10n/pl.json                 |  95 ++++++++++
 apps/files/l10n/pl.php                  |  96 ----------
 apps/files/l10n/pt_BR.js                |  97 ++++++++++
 apps/files/l10n/pt_BR.json              |  95 ++++++++++
 apps/files/l10n/pt_BR.php               |  96 ----------
 apps/files/l10n/pt_PT.js                |  97 ++++++++++
 apps/files/l10n/pt_PT.json              |  95 ++++++++++
 apps/files/l10n/pt_PT.php               |  96 ----------
 apps/files/l10n/ro.js                   |  97 ++++++++++
 apps/files/l10n/ro.json                 |  95 ++++++++++
 apps/files/l10n/ro.php                  |  96 ----------
 apps/files/l10n/ru.js                   |  97 ++++++++++
 apps/files/l10n/ru.json                 |  95 ++++++++++
 apps/files/l10n/ru.php                  |  96 ----------
 apps/files/l10n/si_LK.js                |  39 ++++
 apps/files/l10n/si_LK.json              |  37 ++++
 apps/files/l10n/si_LK.php               |  38 ----
 apps/files/l10n/sk.js                   |  12 ++
 apps/files/l10n/sk.json                 |   1 +
 apps/files/l10n/sk.php                  |  11 --
 apps/files/l10n/sk_SK.js                |  97 ++++++++++
 apps/files/l10n/sk_SK.json              |  95 ++++++++++
 apps/files/l10n/sk_SK.php               |  96 ----------
 apps/files/l10n/sl.js                   |  97 ++++++++++
 apps/files/l10n/sl.json                 |  95 ++++++++++
 apps/files/l10n/sl.php                  |  96 ----------
 apps/files/l10n/sq.js                   |  62 ++++++
 apps/files/l10n/sq.json                 |  60 ++++++
 apps/files/l10n/sq.php                  |  61 ------
 apps/files/l10n/sr.js                   |  52 +++++
 apps/files/l10n/sr.json                 |  50 +++++
 apps/files/l10n/sr.php                  |  51 -----
 apps/files/l10n/sr@latin.js             |  29 +++
 apps/files/l10n/sr@latin.json           |  27 +++
 apps/files/l10n/sr@latin.php            |  28 ---
 apps/files/l10n/su.js                   |   8 +
 apps/files/l10n/su.json                 |   6 +
 apps/files/l10n/su.php                  |   7 -
 apps/files/l10n/sv.js                   |  91 +++++++++
 apps/files/l10n/sv.json                 |  89 +++++++++
 apps/files/l10n/sv.php                  |  90 ---------
 apps/files/l10n/sw_KE.js                |   8 +
 apps/files/l10n/sw_KE.json              |   6 +
 apps/files/l10n/sw_KE.php               |   7 -
 apps/files/l10n/ta_IN.js                |  10 +
 apps/files/l10n/ta_IN.json              |   8 +
 apps/files/l10n/ta_IN.php               |   9 -
 apps/files/l10n/ta_LK.js                |  42 +++++
 apps/files/l10n/ta_LK.json              |  40 ++++
 apps/files/l10n/ta_LK.php               |  41 ----
 apps/files/l10n/te.js                   |  16 ++
 apps/files/l10n/te.json                 |  14 ++
 apps/files/l10n/te.php                  |  15 --
 apps/files/l10n/tg_TJ.js                |   8 +
 apps/files/l10n/tg_TJ.json              |   6 +
 apps/files/l10n/tg_TJ.php               |   7 -
 apps/files/l10n/th_TH.js                |  53 ++++++
 apps/files/l10n/th_TH.json              |  51 +++++
 apps/files/l10n/th_TH.php               |  52 -----
 apps/files/l10n/tl_PH.js                |   8 +
 apps/files/l10n/tl_PH.json              |   6 +
 apps/files/l10n/tl_PH.php               |   7 -
 apps/files/l10n/tr.js                   |  97 ++++++++++
 apps/files/l10n/tr.json                 |  95 ++++++++++
 apps/files/l10n/tr.php                  |  96 ----------
 apps/files/l10n/tzm.js                  |   8 +
 apps/files/l10n/tzm.json                |   6 +
 apps/files/l10n/tzm.php                 |   7 -
 apps/files/l10n/ug.js                   |  38 ++++
 apps/files/l10n/ug.json                 |  36 ++++
 apps/files/l10n/ug.php                  |  37 ----
 apps/files/l10n/uk.js                   |  97 ++++++++++
 apps/files/l10n/uk.json                 |  95 ++++++++++
 apps/files/l10n/uk.php                  |  96 ----------
 apps/files/l10n/ur.js                   |   9 +
 apps/files/l10n/ur.json                 |   1 +
 apps/files/l10n/ur.php                  |   8 -
 apps/files/l10n/ur_PK.js                |  16 ++
 apps/files/l10n/ur_PK.json              |  14 ++
 apps/files/l10n/ur_PK.php               |  15 --
 apps/files/l10n/uz.js                   |   8 +
 apps/files/l10n/uz.json                 |   6 +
 apps/files/l10n/uz.php                  |   7 -
 apps/files/l10n/vi.js                   |  79 ++++++++
 apps/files/l10n/vi.json                 |  77 ++++++++
 apps/files/l10n/vi.php                  |  78 --------
 apps/files/l10n/zh_CN.js                |  94 ++++++++++
 apps/files/l10n/zh_CN.json              |  92 +++++++++
 apps/files/l10n/zh_CN.php               |  93 ---------
 apps/files/l10n/zh_HK.js                |  25 +++
 apps/files/l10n/zh_HK.json              |  23 +++
 apps/files/l10n/zh_HK.php               |  24 ---
 apps/files/l10n/zh_TW.js                |  97 ++++++++++
 apps/files/l10n/zh_TW.json              |  95 ++++++++++
 apps/files/l10n/zh_TW.php               |  96 ----------
 apps/files_encryption/l10n/ar.js        |  43 +++++
 apps/files_encryption/l10n/ar.json      |  41 ++++
 apps/files_encryption/l10n/ar.php       |  42 -----
 apps/files_encryption/l10n/ast.js       |  44 +++++
 apps/files_encryption/l10n/ast.json     |  42 +++++
 apps/files_encryption/l10n/ast.php      |  43 -----
 apps/files_encryption/l10n/az.js        |  16 ++
 apps/files_encryption/l10n/az.json      |  14 ++
 apps/files_encryption/l10n/az.php       |  15 --
 apps/files_encryption/l10n/bg_BG.js     |  51 +++++
 apps/files_encryption/l10n/bg_BG.json   |  49 +++++
 apps/files_encryption/l10n/bg_BG.php    |  50 -----
 apps/files_encryption/l10n/bn_BD.js     |  23 +++
 apps/files_encryption/l10n/bn_BD.json   |  21 +++
 apps/files_encryption/l10n/bn_BD.php    |  22 ---
 apps/files_encryption/l10n/ca.js        |  45 +++++
 apps/files_encryption/l10n/ca.json      |  43 +++++
 apps/files_encryption/l10n/ca.php       |  44 -----
 apps/files_encryption/l10n/cs_CZ.js     |  51 +++++
 apps/files_encryption/l10n/cs_CZ.json   |  49 +++++
 apps/files_encryption/l10n/cs_CZ.php    |  50 -----
 apps/files_encryption/l10n/cy_GB.js     |   6 +
 apps/files_encryption/l10n/cy_GB.json   |   4 +
 apps/files_encryption/l10n/cy_GB.php    |   5 -
 apps/files_encryption/l10n/da.js        |  51 +++++
 apps/files_encryption/l10n/da.json      |  49 +++++
 apps/files_encryption/l10n/da.php       |  50 -----
 apps/files_encryption/l10n/de.js        |  51 +++++
 apps/files_encryption/l10n/de.json      |  49 +++++
 apps/files_encryption/l10n/de.php       |  50 -----
 apps/files_encryption/l10n/de_CH.js     |  33 ++++
 apps/files_encryption/l10n/de_CH.json   |  31 +++
 apps/files_encryption/l10n/de_CH.php    |  32 ----
 apps/files_encryption/l10n/de_DE.js     |  51 +++++
 apps/files_encryption/l10n/de_DE.json   |  49 +++++
 apps/files_encryption/l10n/de_DE.php    |  50 -----
 apps/files_encryption/l10n/el.js        |  51 +++++
 apps/files_encryption/l10n/el.json      |  49 +++++
 apps/files_encryption/l10n/el.php       |  50 -----
 apps/files_encryption/l10n/en_GB.js     |  51 +++++
 apps/files_encryption/l10n/en_GB.json   |  49 +++++
 apps/files_encryption/l10n/en_GB.php    |  50 -----
 apps/files_encryption/l10n/eo.js        |  18 ++
 apps/files_encryption/l10n/eo.json      |  16 ++
 apps/files_encryption/l10n/eo.php       |  17 --
 apps/files_encryption/l10n/es.js        |  51 +++++
 apps/files_encryption/l10n/es.json      |  49 +++++
 apps/files_encryption/l10n/es.php       |  50 -----
 apps/files_encryption/l10n/es_AR.js     |  41 ++++
 apps/files_encryption/l10n/es_AR.json   |  39 ++++
 apps/files_encryption/l10n/es_AR.php    |  40 ----
 apps/files_encryption/l10n/es_CL.js     |   6 +
 apps/files_encryption/l10n/es_CL.json   |   4 +
 apps/files_encryption/l10n/es_CL.php    |   5 -
 apps/files_encryption/l10n/es_MX.js     |  40 ++++
 apps/files_encryption/l10n/es_MX.json   |  38 ++++
 apps/files_encryption/l10n/es_MX.php    |  39 ----
 apps/files_encryption/l10n/et_EE.js     |  51 +++++
 apps/files_encryption/l10n/et_EE.json   |  49 +++++
 apps/files_encryption/l10n/et_EE.php    |  50 -----
 apps/files_encryption/l10n/eu.js        |  45 +++++
 apps/files_encryption/l10n/eu.json      |  43 +++++
 apps/files_encryption/l10n/eu.php       |  50 -----
 apps/files_encryption/l10n/fa.js        |  32 ++++
 apps/files_encryption/l10n/fa.json      |  30 +++
 apps/files_encryption/l10n/fa.php       |  31 ---
 apps/files_encryption/l10n/fi_FI.js     |  33 ++++
 apps/files_encryption/l10n/fi_FI.json   |  31 +++
 apps/files_encryption/l10n/fi_FI.php    |  32 ----
 apps/files_encryption/l10n/fr.js        |  51 +++++
 apps/files_encryption/l10n/fr.json      |  49 +++++
 apps/files_encryption/l10n/fr.php       |  50 -----
 apps/files_encryption/l10n/gl.js        |  45 +++++
 apps/files_encryption/l10n/gl.json      |  43 +++++
 apps/files_encryption/l10n/gl.php       |  44 -----
 apps/files_encryption/l10n/he.js        |   7 +
 apps/files_encryption/l10n/he.json      |   5 +
 apps/files_encryption/l10n/he.php       |   6 -
 apps/files_encryption/l10n/hr.js        |  45 +++++
 apps/files_encryption/l10n/hr.json      |  43 +++++
 apps/files_encryption/l10n/hr.php       |  44 -----
 apps/files_encryption/l10n/hu_HU.js     |  41 ++++
 apps/files_encryption/l10n/hu_HU.json   |  39 ++++
 apps/files_encryption/l10n/hu_HU.php    |  40 ----
 apps/files_encryption/l10n/ia.js        |   6 +
 apps/files_encryption/l10n/ia.json      |   4 +
 apps/files_encryption/l10n/ia.php       |   5 -
 apps/files_encryption/l10n/id.js        |  37 ++++
 apps/files_encryption/l10n/id.json      |  35 ++++
 apps/files_encryption/l10n/id.php       |  50 -----
 apps/files_encryption/l10n/is.js        |   6 +
 apps/files_encryption/l10n/is.json      |   4 +
 apps/files_encryption/l10n/is.php       |   5 -
 apps/files_encryption/l10n/it.js        |  51 +++++
 apps/files_encryption/l10n/it.json      |  49 +++++
 apps/files_encryption/l10n/it.php       |  50 -----
 apps/files_encryption/l10n/ja.js        |  51 +++++
 apps/files_encryption/l10n/ja.json      |  49 +++++
 apps/files_encryption/l10n/ja.php       |  50 -----
 apps/files_encryption/l10n/ka_GE.js     |   7 +
 apps/files_encryption/l10n/ka_GE.json   |   5 +
 apps/files_encryption/l10n/ka_GE.php    |   6 -
 apps/files_encryption/l10n/km.js        |  12 ++
 apps/files_encryption/l10n/km.json      |  10 +
 apps/files_encryption/l10n/km.php       |  11 --
 apps/files_encryption/l10n/ko.js        |  40 ++++
 apps/files_encryption/l10n/ko.json      |  38 ++++
 apps/files_encryption/l10n/ko.php       |  39 ----
 apps/files_encryption/l10n/ku_IQ.js     |   6 +
 apps/files_encryption/l10n/ku_IQ.json   |   4 +
 apps/files_encryption/l10n/ku_IQ.php    |   5 -
 apps/files_encryption/l10n/lb.js        |   6 +
 apps/files_encryption/l10n/lb.json      |   4 +
 apps/files_encryption/l10n/lb.php       |   5 -
 apps/files_encryption/l10n/lt_LT.js     |  40 ++++
 apps/files_encryption/l10n/lt_LT.json   |  38 ++++
 apps/files_encryption/l10n/lt_LT.php    |  39 ----
 apps/files_encryption/l10n/lv.js        |   7 +
 apps/files_encryption/l10n/lv.json      |   5 +
 apps/files_encryption/l10n/lv.php       |   6 -
 apps/files_encryption/l10n/mk.js        |  19 ++
 apps/files_encryption/l10n/mk.json      |  17 ++
 apps/files_encryption/l10n/mk.php       |  18 --
 apps/files_encryption/l10n/nb_NO.js     |  45 +++++
 apps/files_encryption/l10n/nb_NO.json   |  43 +++++
 apps/files_encryption/l10n/nb_NO.php    |  44 -----
 apps/files_encryption/l10n/nl.js        |  51 +++++
 apps/files_encryption/l10n/nl.json      |  49 +++++
 apps/files_encryption/l10n/nl.php       |  50 -----
 apps/files_encryption/l10n/nn_NO.js     |   7 +
 apps/files_encryption/l10n/nn_NO.json   |   5 +
 apps/files_encryption/l10n/nn_NO.php    |   6 -
 apps/files_encryption/l10n/pa.js        |   6 +
 apps/files_encryption/l10n/pa.json      |   4 +
 apps/files_encryption/l10n/pa.php       |   5 -
 apps/files_encryption/l10n/pl.js        |  45 +++++
 apps/files_encryption/l10n/pl.json      |  43 +++++
 apps/files_encryption/l10n/pl.php       |  45 -----
 apps/files_encryption/l10n/pt_BR.js     |  51 +++++
 apps/files_encryption/l10n/pt_BR.json   |  49 +++++
 apps/files_encryption/l10n/pt_BR.php    |  50 -----
 apps/files_encryption/l10n/pt_PT.js     |  51 +++++
 apps/files_encryption/l10n/pt_PT.json   |  49 +++++
 apps/files_encryption/l10n/pt_PT.php    |  50 -----
 apps/files_encryption/l10n/ro.js        |  20 ++
 apps/files_encryption/l10n/ro.json      |  18 ++
 apps/files_encryption/l10n/ro.php       |  19 --
 apps/files_encryption/l10n/ru.js        |  51 +++++
 apps/files_encryption/l10n/ru.json      |  49 +++++
 apps/files_encryption/l10n/ru.php       |  50 -----
 apps/files_encryption/l10n/si_LK.js     |   6 +
 apps/files_encryption/l10n/si_LK.json   |   4 +
 apps/files_encryption/l10n/si_LK.php    |   5 -
 apps/files_encryption/l10n/sk_SK.js     |  45 +++++
 apps/files_encryption/l10n/sk_SK.json   |  43 +++++
 apps/files_encryption/l10n/sk_SK.php    |  44 -----
 apps/files_encryption/l10n/sl.js        |  51 +++++
 apps/files_encryption/l10n/sl.json      |  49 +++++
 apps/files_encryption/l10n/sl.php       |  50 -----
 apps/files_encryption/l10n/sq.js        |   7 +
 apps/files_encryption/l10n/sq.json      |   5 +
 apps/files_encryption/l10n/sq.php       |   6 -
 apps/files_encryption/l10n/sr.js        |   6 +
 apps/files_encryption/l10n/sr.json      |   4 +
 apps/files_encryption/l10n/sr.php       |   5 -
 apps/files_encryption/l10n/sv.js        |  43 +++++
 apps/files_encryption/l10n/sv.json      |  41 ++++
 apps/files_encryption/l10n/sv.php       |  42 -----
 apps/files_encryption/l10n/ta_LK.js     |   6 +
 apps/files_encryption/l10n/ta_LK.json   |   4 +
 apps/files_encryption/l10n/ta_LK.php    |   5 -
 apps/files_encryption/l10n/th_TH.js     |   7 +
 apps/files_encryption/l10n/th_TH.json   |   5 +
 apps/files_encryption/l10n/th_TH.php    |   6 -
 apps/files_encryption/l10n/tr.js        |  51 +++++
 apps/files_encryption/l10n/tr.json      |  49 +++++
 apps/files_encryption/l10n/tr.php       |  50 -----
 apps/files_encryption/l10n/ug.js        |   7 +
 apps/files_encryption/l10n/ug.json      |   5 +
 apps/files_encryption/l10n/ug.php       |   6 -
 apps/files_encryption/l10n/uk.js        |  51 +++++
 apps/files_encryption/l10n/uk.json      |  49 +++++
 apps/files_encryption/l10n/uk.php       |  50 -----
 apps/files_encryption/l10n/ur_PK.js     |   6 +
 apps/files_encryption/l10n/ur_PK.json   |   4 +
 apps/files_encryption/l10n/ur_PK.php    |   5 -
 apps/files_encryption/l10n/vi.js        |  26 +++
 apps/files_encryption/l10n/vi.json      |  24 +++
 apps/files_encryption/l10n/vi.php       |  25 ---
 apps/files_encryption/l10n/zh_CN.js     |  43 +++++
 apps/files_encryption/l10n/zh_CN.json   |  41 ++++
 apps/files_encryption/l10n/zh_CN.php    |  42 -----
 apps/files_encryption/l10n/zh_HK.js     |  10 +
 apps/files_encryption/l10n/zh_HK.json   |   8 +
 apps/files_encryption/l10n/zh_HK.php    |   9 -
 apps/files_encryption/l10n/zh_TW.js     |  42 +++++
 apps/files_encryption/l10n/zh_TW.json   |  40 ++++
 apps/files_encryption/l10n/zh_TW.php    |  41 ----
 apps/files_external/l10n/af_ZA.js       |   9 +
 apps/files_external/l10n/af_ZA.json     |   7 +
 apps/files_external/l10n/af_ZA.php      |   8 -
 apps/files_external/l10n/ar.js          |  19 ++
 apps/files_external/l10n/ar.json        |  17 ++
 apps/files_external/l10n/ar.php         |  18 --
 apps/files_external/l10n/ast.js         |  72 +++++++
 apps/files_external/l10n/ast.json       |  70 +++++++
 apps/files_external/l10n/ast.php        |  71 -------
 apps/files_external/l10n/az.js          |  24 +++
 apps/files_external/l10n/az.json        |  22 +++
 apps/files_external/l10n/az.php         |  23 ---
 apps/files_external/l10n/bg_BG.js       |  74 ++++++++
 apps/files_external/l10n/bg_BG.json     |  72 +++++++
 apps/files_external/l10n/bg_BG.php      |  73 -------
 apps/files_external/l10n/bn_BD.js       |  44 +++++
 apps/files_external/l10n/bn_BD.json     |  42 +++++
 apps/files_external/l10n/bn_BD.php      |  43 -----
 apps/files_external/l10n/bn_IN.js       |  13 ++
 apps/files_external/l10n/bn_IN.json     |  11 ++
 apps/files_external/l10n/bn_IN.php      |  12 --
 apps/files_external/l10n/bs.js          |   7 +
 apps/files_external/l10n/bs.json        |   5 +
 apps/files_external/l10n/bs.php         |   6 -
 apps/files_external/l10n/ca.js          |  74 ++++++++
 apps/files_external/l10n/ca.json        |  72 +++++++
 apps/files_external/l10n/ca.php         |  73 -------
 apps/files_external/l10n/cs_CZ.js       |  74 ++++++++
 apps/files_external/l10n/cs_CZ.json     |  72 +++++++
 apps/files_external/l10n/cs_CZ.php      |  73 -------
 apps/files_external/l10n/cy_GB.js       |  13 ++
 apps/files_external/l10n/cy_GB.json     |  11 ++
 apps/files_external/l10n/cy_GB.php      |  12 --
 apps/files_external/l10n/da.js          |  74 ++++++++
 apps/files_external/l10n/da.json        |  72 +++++++
 apps/files_external/l10n/da.php         |  73 -------
 apps/files_external/l10n/de.js          |  74 ++++++++
 apps/files_external/l10n/de.json        |  72 +++++++
 apps/files_external/l10n/de.php         |  73 -------
 apps/files_external/l10n/de_AT.js       |  12 ++
 apps/files_external/l10n/de_AT.json     |  10 +
 apps/files_external/l10n/de_AT.php      |  11 --
 apps/files_external/l10n/de_CH.js       |  28 +++
 apps/files_external/l10n/de_CH.json     |  26 +++
 apps/files_external/l10n/de_CH.php      |  27 ---
 apps/files_external/l10n/de_DE.js       |  74 ++++++++
 apps/files_external/l10n/de_DE.json     |  72 +++++++
 apps/files_external/l10n/de_DE.php      |  73 -------
 apps/files_external/l10n/el.js          |  74 ++++++++
 apps/files_external/l10n/el.json        |  72 +++++++
 apps/files_external/l10n/el.php         |  73 -------
 apps/files_external/l10n/en@pirate.js   |   6 +
 apps/files_external/l10n/en@pirate.json |   4 +
 apps/files_external/l10n/en@pirate.php  |   5 -
 apps/files_external/l10n/en_GB.js       |  74 ++++++++
 apps/files_external/l10n/en_GB.json     |  72 +++++++
 apps/files_external/l10n/en_GB.php      |  73 -------
 apps/files_external/l10n/eo.js          |  52 +++++
 apps/files_external/l10n/eo.json        |  50 +++++
 apps/files_external/l10n/eo.php         |  51 -----
 apps/files_external/l10n/es.js          |  74 ++++++++
 apps/files_external/l10n/es.json        |  72 +++++++
 apps/files_external/l10n/es.php         |  73 -------
 apps/files_external/l10n/es_AR.js       |  28 +++
 apps/files_external/l10n/es_AR.json     |  26 +++
 apps/files_external/l10n/es_AR.php      |  27 ---
 apps/files_external/l10n/es_CL.js       |  10 +
 apps/files_external/l10n/es_CL.json     |   8 +
 apps/files_external/l10n/es_CL.php      |   9 -
 apps/files_external/l10n/es_MX.js       |  26 +++
 apps/files_external/l10n/es_MX.json     |  24 +++
 apps/files_external/l10n/es_MX.php      |  25 ---
 apps/files_external/l10n/et_EE.js       |  74 ++++++++
 apps/files_external/l10n/et_EE.json     |  72 +++++++
 apps/files_external/l10n/et_EE.php      |  73 -------
 apps/files_external/l10n/eu.js          |  68 +++++++
 apps/files_external/l10n/eu.json        |  66 +++++++
 apps/files_external/l10n/eu.php         |  71 -------
 apps/files_external/l10n/eu_ES.js       |   8 +
 apps/files_external/l10n/eu_ES.json     |   6 +
 apps/files_external/l10n/eu_ES.php      |   7 -
 apps/files_external/l10n/fa.js          |  28 +++
 apps/files_external/l10n/fa.json        |  26 +++
 apps/files_external/l10n/fa.php         |  27 ---
 apps/files_external/l10n/fi_FI.js       |  50 +++++
 apps/files_external/l10n/fi_FI.json     |  48 +++++
 apps/files_external/l10n/fi_FI.php      |  49 -----
 apps/files_external/l10n/fr.js          |  74 ++++++++
 apps/files_external/l10n/fr.json        |  72 +++++++
 apps/files_external/l10n/fr.php         |  73 -------
 apps/files_external/l10n/gl.js          |  70 +++++++
 apps/files_external/l10n/gl.json        |  68 +++++++
 apps/files_external/l10n/gl.php         |  69 -------
 apps/files_external/l10n/he.js          |  27 +++
 apps/files_external/l10n/he.json        |  25 +++
 apps/files_external/l10n/he.php         |  26 ---
 apps/files_external/l10n/hi.js          |   9 +
 apps/files_external/l10n/hi.json        |   7 +
 apps/files_external/l10n/hi.php         |   8 -
 apps/files_external/l10n/hr.js          |  74 ++++++++
 apps/files_external/l10n/hr.json        |  72 +++++++
 apps/files_external/l10n/hr.php         |  73 -------
 apps/files_external/l10n/hu_HU.js       |  29 +++
 apps/files_external/l10n/hu_HU.json     |  27 +++
 apps/files_external/l10n/hu_HU.php      |  28 ---
 apps/files_external/l10n/hy.js          |   6 +
 apps/files_external/l10n/hy.json        |   4 +
 apps/files_external/l10n/hy.php         |   5 -
 apps/files_external/l10n/ia.js          |  16 ++
 apps/files_external/l10n/ia.json        |  14 ++
 apps/files_external/l10n/ia.php         |  15 --
 apps/files_external/l10n/id.js          |  39 ++++
 apps/files_external/l10n/id.json        |  37 ++++
 apps/files_external/l10n/id.php         |  38 ----
 apps/files_external/l10n/is.js          |  23 +++
 apps/files_external/l10n/is.json        |  21 +++
 apps/files_external/l10n/is.php         |  22 ---
 apps/files_external/l10n/it.js          |  74 ++++++++
 apps/files_external/l10n/it.json        |  72 +++++++
 apps/files_external/l10n/it.php         |  73 -------
 apps/files_external/l10n/ja.js          |  74 ++++++++
 apps/files_external/l10n/ja.json        |  72 +++++++
 apps/files_external/l10n/ja.php         |  73 -------
 apps/files_external/l10n/jv.js          |   6 +
 apps/files_external/l10n/jv.json        |   4 +
 apps/files_external/l10n/jv.php         |   5 -
 apps/files_external/l10n/ka_GE.js       |  27 +++
 apps/files_external/l10n/ka_GE.json     |  25 +++
 apps/files_external/l10n/ka_GE.php      |  26 ---
 apps/files_external/l10n/km.js          |  24 +++
 apps/files_external/l10n/km.json        |  22 +++
 apps/files_external/l10n/km.php         |  23 ---
 apps/files_external/l10n/ko.js          |  29 +++
 apps/files_external/l10n/ko.json        |  27 +++
 apps/files_external/l10n/ko.php         |  28 ---
 apps/files_external/l10n/ku_IQ.js       |  12 ++
 apps/files_external/l10n/ku_IQ.json     |  10 +
 apps/files_external/l10n/ku_IQ.php      |  11 --
 apps/files_external/l10n/lb.js          |  16 ++
 apps/files_external/l10n/lb.json        |  14 ++
 apps/files_external/l10n/lb.php         |  15 --
 apps/files_external/l10n/lt_LT.js       |  27 +++
 apps/files_external/l10n/lt_LT.json     |  25 +++
 apps/files_external/l10n/lt_LT.php      |  26 ---
 apps/files_external/l10n/lv.js          |  26 +++
 apps/files_external/l10n/lv.json        |  24 +++
 apps/files_external/l10n/lv.php         |  25 ---
 apps/files_external/l10n/mk.js          |  27 +++
 apps/files_external/l10n/mk.json        |  25 +++
 apps/files_external/l10n/mk.php         |  26 ---
 apps/files_external/l10n/ms_MY.js       |  14 ++
 apps/files_external/l10n/ms_MY.json     |  12 ++
 apps/files_external/l10n/ms_MY.php      |  13 --
 apps/files_external/l10n/my_MM.js       |   8 +
 apps/files_external/l10n/my_MM.json     |   6 +
 apps/files_external/l10n/my_MM.php      |   7 -
 apps/files_external/l10n/nb_NO.js       |  74 ++++++++
 apps/files_external/l10n/nb_NO.json     |  72 +++++++
 apps/files_external/l10n/nb_NO.php      |  73 -------
 apps/files_external/l10n/nl.js          |  74 ++++++++
 apps/files_external/l10n/nl.json        |  72 +++++++
 apps/files_external/l10n/nl.php         |  73 -------
 apps/files_external/l10n/nn_NO.js       |  17 ++
 apps/files_external/l10n/nn_NO.json     |  15 ++
 apps/files_external/l10n/nn_NO.php      |  16 --
 apps/files_external/l10n/oc.js          |  13 ++
 apps/files_external/l10n/oc.json        |  11 ++
 apps/files_external/l10n/oc.php         |  12 --
 apps/files_external/l10n/pa.js          |   9 +
 apps/files_external/l10n/pa.json        |   7 +
 apps/files_external/l10n/pa.php         |   8 -
 apps/files_external/l10n/pl.js          |  74 ++++++++
 apps/files_external/l10n/pl.json        |  72 +++++++
 apps/files_external/l10n/pl.php         |  73 -------
 apps/files_external/l10n/pt_BR.js       |  74 ++++++++
 apps/files_external/l10n/pt_BR.json     |  72 +++++++
 apps/files_external/l10n/pt_BR.php      |  73 -------
 apps/files_external/l10n/pt_PT.js       |  74 ++++++++
 apps/files_external/l10n/pt_PT.json     |  72 +++++++
 apps/files_external/l10n/pt_PT.php      |  73 -------
 apps/files_external/l10n/ro.js          |  32 ++++
 apps/files_external/l10n/ro.json        |  30 +++
 apps/files_external/l10n/ro.php         |  31 ---
 apps/files_external/l10n/ru.js          |  74 ++++++++
 apps/files_external/l10n/ru.json        |  72 +++++++
 apps/files_external/l10n/ru.php         |  73 -------
 apps/files_external/l10n/si_LK.js       |  25 +++
 apps/files_external/l10n/si_LK.json     |  23 +++
 apps/files_external/l10n/si_LK.php      |  24 ---
 apps/files_external/l10n/sk_SK.js       |  74 ++++++++
 apps/files_external/l10n/sk_SK.json     |  72 +++++++
 apps/files_external/l10n/sk_SK.php      |  73 -------
 apps/files_external/l10n/sl.js          |  74 ++++++++
 apps/files_external/l10n/sl.json        |  72 +++++++
 apps/files_external/l10n/sl.php         |  73 -------
 apps/files_external/l10n/sq.js          |  17 ++
 apps/files_external/l10n/sq.json        |  15 ++
 apps/files_external/l10n/sq.php         |  16 --
 apps/files_external/l10n/sr.js          |  15 ++
 apps/files_external/l10n/sr.json        |  13 ++
 apps/files_external/l10n/sr.php         |  14 --
 apps/files_external/l10n/sr@latin.js    |  13 ++
 apps/files_external/l10n/sr@latin.json  |  11 ++
 apps/files_external/l10n/sr@latin.php   |  12 --
 apps/files_external/l10n/sv.js          |  68 +++++++
 apps/files_external/l10n/sv.json        |  66 +++++++
 apps/files_external/l10n/sv.php         |  67 -------
 apps/files_external/l10n/ta_LK.js       |  25 +++
 apps/files_external/l10n/ta_LK.json     |  23 +++
 apps/files_external/l10n/ta_LK.php      |  24 ---
 apps/files_external/l10n/te.js          |  11 ++
 apps/files_external/l10n/te.json        |   9 +
 apps/files_external/l10n/te.php         |  10 -
 apps/files_external/l10n/th_TH.js       |  25 +++
 apps/files_external/l10n/th_TH.json     |  23 +++
 apps/files_external/l10n/th_TH.php      |  24 ---
 apps/files_external/l10n/tr.js          |  74 ++++++++
 apps/files_external/l10n/tr.json        |  72 +++++++
 apps/files_external/l10n/tr.php         |  73 -------
 apps/files_external/l10n/ug.js          |  18 ++
 apps/files_external/l10n/ug.json        |  16 ++
 apps/files_external/l10n/ug.php         |  17 --
 apps/files_external/l10n/uk.js          |  74 ++++++++
 apps/files_external/l10n/uk.json        |  72 +++++++
 apps/files_external/l10n/uk.php         |  73 -------
 apps/files_external/l10n/ur_PK.js       |  13 ++
 apps/files_external/l10n/ur_PK.json     |  11 ++
 apps/files_external/l10n/ur_PK.php      |  12 --
 apps/files_external/l10n/vi.js          |  27 +++
 apps/files_external/l10n/vi.json        |  25 +++
 apps/files_external/l10n/vi.php         |  26 ---
 apps/files_external/l10n/zh_CN.js       |  51 +++++
 apps/files_external/l10n/zh_CN.json     |  49 +++++
 apps/files_external/l10n/zh_CN.php      |  50 -----
 apps/files_external/l10n/zh_HK.js       |  15 ++
 apps/files_external/l10n/zh_HK.json     |  13 ++
 apps/files_external/l10n/zh_HK.php      |  14 --
 apps/files_external/l10n/zh_TW.js       |  43 +++++
 apps/files_external/l10n/zh_TW.json     |  41 ++++
 apps/files_external/l10n/zh_TW.php      |  42 -----
 apps/files_sharing/l10n/af_ZA.js        |   7 +
 apps/files_sharing/l10n/af_ZA.json      |   5 +
 apps/files_sharing/l10n/af_ZA.php       |   6 -
 apps/files_sharing/l10n/ar.js           |  20 ++
 apps/files_sharing/l10n/ar.json         |  18 ++
 apps/files_sharing/l10n/ar.php          |  19 --
 apps/files_sharing/l10n/ast.js          |  40 ++++
 apps/files_sharing/l10n/ast.json        |  38 ++++
 apps/files_sharing/l10n/ast.php         |  39 ----
 apps/files_sharing/l10n/az.js           |  21 +++
 apps/files_sharing/l10n/az.json         |  19 ++
 apps/files_sharing/l10n/az.php          |  20 --
 apps/files_sharing/l10n/bg_BG.js        |  41 ++++
 apps/files_sharing/l10n/bg_BG.json      |  39 ++++
 apps/files_sharing/l10n/bg_BG.php       |  40 ----
 apps/files_sharing/l10n/bn_BD.js        |  30 +++
 apps/files_sharing/l10n/bn_BD.json      |  28 +++
 apps/files_sharing/l10n/bn_BD.php       |  29 ---
 apps/files_sharing/l10n/bn_IN.js        |   8 +
 apps/files_sharing/l10n/bn_IN.json      |   6 +
 apps/files_sharing/l10n/bn_IN.php       |   7 -
 apps/files_sharing/l10n/bs.js           |   7 +
 apps/files_sharing/l10n/bs.json         |   5 +
 apps/files_sharing/l10n/bs.php          |   6 -
 apps/files_sharing/l10n/ca.js           |  40 ++++
 apps/files_sharing/l10n/ca.json         |  38 ++++
 apps/files_sharing/l10n/ca.php          |  39 ----
 apps/files_sharing/l10n/cs_CZ.js        |  41 ++++
 apps/files_sharing/l10n/cs_CZ.json      |  39 ++++
 apps/files_sharing/l10n/cs_CZ.php       |  40 ----
 apps/files_sharing/l10n/cy_GB.js        |  10 +
 apps/files_sharing/l10n/cy_GB.json      |   8 +
 apps/files_sharing/l10n/cy_GB.php       |   9 -
 apps/files_sharing/l10n/da.js           |  41 ++++
 apps/files_sharing/l10n/da.json         |  39 ++++
 apps/files_sharing/l10n/da.php          |  40 ----
 apps/files_sharing/l10n/de.js           |  41 ++++
 apps/files_sharing/l10n/de.json         |  39 ++++
 apps/files_sharing/l10n/de.php          |  40 ----
 apps/files_sharing/l10n/de_AT.js        |   8 +
 apps/files_sharing/l10n/de_AT.json      |   6 +
 apps/files_sharing/l10n/de_AT.php       |   7 -
 apps/files_sharing/l10n/de_CH.js        |  17 ++
 apps/files_sharing/l10n/de_CH.json      |  15 ++
 apps/files_sharing/l10n/de_CH.php       |  16 --
 apps/files_sharing/l10n/de_DE.js        |  41 ++++
 apps/files_sharing/l10n/de_DE.json      |  39 ++++
 apps/files_sharing/l10n/de_DE.php       |  40 ----
 apps/files_sharing/l10n/el.js           |  41 ++++
 apps/files_sharing/l10n/el.json         |  39 ++++
 apps/files_sharing/l10n/el.php          |  40 ----
 apps/files_sharing/l10n/en@pirate.js    |   7 +
 apps/files_sharing/l10n/en@pirate.json  |   5 +
 apps/files_sharing/l10n/en@pirate.php   |   6 -
 apps/files_sharing/l10n/en_GB.js        |  41 ++++
 apps/files_sharing/l10n/en_GB.json      |  39 ++++
 apps/files_sharing/l10n/en_GB.php       |  40 ----
 apps/files_sharing/l10n/eo.js           |  29 +++
 apps/files_sharing/l10n/eo.json         |  27 +++
 apps/files_sharing/l10n/eo.php          |  28 ---
 apps/files_sharing/l10n/es.js           |  41 ++++
 apps/files_sharing/l10n/es.json         |  39 ++++
 apps/files_sharing/l10n/es.php          |  40 ----
 apps/files_sharing/l10n/es_AR.js        |  19 ++
 apps/files_sharing/l10n/es_AR.json      |  17 ++
 apps/files_sharing/l10n/es_AR.php       |  18 --
 apps/files_sharing/l10n/es_CL.js        |   8 +
 apps/files_sharing/l10n/es_CL.json      |   6 +
 apps/files_sharing/l10n/es_CL.php       |   7 -
 apps/files_sharing/l10n/es_MX.js        |  19 ++
 apps/files_sharing/l10n/es_MX.json      |  17 ++
 apps/files_sharing/l10n/es_MX.php       |  18 --
 apps/files_sharing/l10n/et_EE.js        |  41 ++++
 apps/files_sharing/l10n/et_EE.json      |  39 ++++
 apps/files_sharing/l10n/et_EE.php       |  40 ----
 apps/files_sharing/l10n/eu.js           |  39 ++++
 apps/files_sharing/l10n/eu.json         |  37 ++++
 apps/files_sharing/l10n/eu.php          |  40 ----
 apps/files_sharing/l10n/eu_ES.js        |   7 +
 apps/files_sharing/l10n/eu_ES.json      |   5 +
 apps/files_sharing/l10n/eu_ES.php       |   6 -
 apps/files_sharing/l10n/fa.js           |  40 ++++
 apps/files_sharing/l10n/fa.json         |  38 ++++
 apps/files_sharing/l10n/fa.php          |  39 ----
 apps/files_sharing/l10n/fi_FI.js        |  41 ++++
 apps/files_sharing/l10n/fi_FI.json      |  39 ++++
 apps/files_sharing/l10n/fi_FI.php       |  40 ----
 apps/files_sharing/l10n/fr.js           |  41 ++++
 apps/files_sharing/l10n/fr.json         |  39 ++++
 apps/files_sharing/l10n/fr.php          |  40 ----
 apps/files_sharing/l10n/gl.js           |  40 ++++
 apps/files_sharing/l10n/gl.json         |  38 ++++
 apps/files_sharing/l10n/gl.php          |  39 ----
 apps/files_sharing/l10n/he.js           |  10 +
 apps/files_sharing/l10n/he.json         |   8 +
 apps/files_sharing/l10n/he.php          |   9 -
 apps/files_sharing/l10n/hi.js           |   8 +
 apps/files_sharing/l10n/hi.json         |   6 +
 apps/files_sharing/l10n/hi.php          |   7 -
 apps/files_sharing/l10n/hr.js           |  40 ++++
 apps/files_sharing/l10n/hr.json         |  38 ++++
 apps/files_sharing/l10n/hr.php          |  39 ----
 apps/files_sharing/l10n/hu_HU.js        |  41 ++++
 apps/files_sharing/l10n/hu_HU.json      |  39 ++++
 apps/files_sharing/l10n/hu_HU.php       |  40 ----
 apps/files_sharing/l10n/hy.js           |   6 +
 apps/files_sharing/l10n/hy.json         |   4 +
 apps/files_sharing/l10n/hy.php          |   5 -
 apps/files_sharing/l10n/ia.js           |   9 +
 apps/files_sharing/l10n/ia.json         |   7 +
 apps/files_sharing/l10n/ia.php          |   8 -
 apps/files_sharing/l10n/id.js           |  31 +++
 apps/files_sharing/l10n/id.json         |  29 +++
 apps/files_sharing/l10n/id.php          |  40 ----
 apps/files_sharing/l10n/is.js           |  10 +
 apps/files_sharing/l10n/is.json         |   8 +
 apps/files_sharing/l10n/is.php          |   9 -
 apps/files_sharing/l10n/it.js           |  41 ++++
 apps/files_sharing/l10n/it.json         |  39 ++++
 apps/files_sharing/l10n/it.php          |  40 ----
 apps/files_sharing/l10n/ja.js           |  41 ++++
 apps/files_sharing/l10n/ja.json         |  39 ++++
 apps/files_sharing/l10n/ja.php          |  40 ----
 apps/files_sharing/l10n/jv.js           |   6 +
 apps/files_sharing/l10n/jv.json         |   4 +
 apps/files_sharing/l10n/jv.php          |   5 -
 apps/files_sharing/l10n/ka_GE.js        |  10 +
 apps/files_sharing/l10n/ka_GE.json      |   8 +
 apps/files_sharing/l10n/ka_GE.php       |   9 -
 apps/files_sharing/l10n/km.js           |  20 ++
 apps/files_sharing/l10n/km.json         |  18 ++
 apps/files_sharing/l10n/km.php          |  19 --
 apps/files_sharing/l10n/ko.js           |  19 ++
 apps/files_sharing/l10n/ko.json         |  17 ++
 apps/files_sharing/l10n/ko.php          |  18 --
 apps/files_sharing/l10n/ku_IQ.js        |   9 +
 apps/files_sharing/l10n/ku_IQ.json      |   7 +
 apps/files_sharing/l10n/ku_IQ.php       |   8 -
 apps/files_sharing/l10n/lb.js           |  11 ++
 apps/files_sharing/l10n/lb.json         |   9 +
 apps/files_sharing/l10n/lb.php          |  10 -
 apps/files_sharing/l10n/lt_LT.js        |  19 ++
 apps/files_sharing/l10n/lt_LT.json      |  17 ++
 apps/files_sharing/l10n/lt_LT.php       |  18 --
 apps/files_sharing/l10n/lv.js           |  10 +
 apps/files_sharing/l10n/lv.json         |   8 +
 apps/files_sharing/l10n/lv.php          |   9 -
 apps/files_sharing/l10n/mk.js           |  27 +++
 apps/files_sharing/l10n/mk.json         |  25 +++
 apps/files_sharing/l10n/mk.php          |  26 ---
 apps/files_sharing/l10n/ms_MY.js        |  10 +
 apps/files_sharing/l10n/ms_MY.json      |   8 +
 apps/files_sharing/l10n/ms_MY.php       |   9 -
 apps/files_sharing/l10n/my_MM.js        |   8 +
 apps/files_sharing/l10n/my_MM.json      |   6 +
 apps/files_sharing/l10n/my_MM.php       |   7 -
 apps/files_sharing/l10n/nb_NO.js        |  41 ++++
 apps/files_sharing/l10n/nb_NO.json      |  39 ++++
 apps/files_sharing/l10n/nb_NO.php       |  40 ----
 apps/files_sharing/l10n/nl.js           |  41 ++++
 apps/files_sharing/l10n/nl.json         |  39 ++++
 apps/files_sharing/l10n/nl.php          |  40 ----
 apps/files_sharing/l10n/nn_NO.js        |  17 ++
 apps/files_sharing/l10n/nn_NO.json      |  15 ++
 apps/files_sharing/l10n/nn_NO.php       |  16 --
 apps/files_sharing/l10n/oc.js           |   9 +
 apps/files_sharing/l10n/oc.json         |   7 +
 apps/files_sharing/l10n/oc.php          |   8 -
 apps/files_sharing/l10n/pa.js           |   8 +
 apps/files_sharing/l10n/pa.json         |   6 +
 apps/files_sharing/l10n/pa.php          |   7 -
 apps/files_sharing/l10n/pl.js           |  41 ++++
 apps/files_sharing/l10n/pl.json         |  39 ++++
 apps/files_sharing/l10n/pl.php          |  40 ----
 apps/files_sharing/l10n/pt_BR.js        |  41 ++++
 apps/files_sharing/l10n/pt_BR.json      |  39 ++++
 apps/files_sharing/l10n/pt_BR.php       |  40 ----
 apps/files_sharing/l10n/pt_PT.js        |  41 ++++
 apps/files_sharing/l10n/pt_PT.json      |  39 ++++
 apps/files_sharing/l10n/pt_PT.php       |  40 ----
 apps/files_sharing/l10n/ro.js           |  22 +++
 apps/files_sharing/l10n/ro.json         |  20 ++
 apps/files_sharing/l10n/ro.php          |  21 ---
 apps/files_sharing/l10n/ru.js           |  41 ++++
 apps/files_sharing/l10n/ru.json         |  39 ++++
 apps/files_sharing/l10n/ru.php          |  40 ----
 apps/files_sharing/l10n/si_LK.js        |   9 +
 apps/files_sharing/l10n/si_LK.json      |   7 +
 apps/files_sharing/l10n/si_LK.php       |   8 -
 apps/files_sharing/l10n/sk_SK.js        |  40 ++++
 apps/files_sharing/l10n/sk_SK.json      |  38 ++++
 apps/files_sharing/l10n/sk_SK.php       |  39 ----
 apps/files_sharing/l10n/sl.js           |  41 ++++
 apps/files_sharing/l10n/sl.json         |  39 ++++
 apps/files_sharing/l10n/sl.php          |  40 ----
 apps/files_sharing/l10n/sq.js           |  19 ++
 apps/files_sharing/l10n/sq.json         |  17 ++
 apps/files_sharing/l10n/sq.php          |  18 --
 apps/files_sharing/l10n/sr.js           |  10 +
 apps/files_sharing/l10n/sr.json         |   8 +
 apps/files_sharing/l10n/sr.php          |   9 -
 apps/files_sharing/l10n/sr@latin.js     |   9 +
 apps/files_sharing/l10n/sr@latin.json   |   7 +
 apps/files_sharing/l10n/sr@latin.php    |   8 -
 apps/files_sharing/l10n/sv.js           |  35 ++++
 apps/files_sharing/l10n/sv.json         |  33 ++++
 apps/files_sharing/l10n/sv.php          |  34 ----
 apps/files_sharing/l10n/ta_LK.js        |   9 +
 apps/files_sharing/l10n/ta_LK.json      |   7 +
 apps/files_sharing/l10n/ta_LK.php       |   8 -
 apps/files_sharing/l10n/te.js           |   8 +
 apps/files_sharing/l10n/te.json         |   6 +
 apps/files_sharing/l10n/te.php          |   7 -
 apps/files_sharing/l10n/th_TH.js        |  10 +
 apps/files_sharing/l10n/th_TH.json      |   8 +
 apps/files_sharing/l10n/th_TH.php       |   9 -
 apps/files_sharing/l10n/tr.js           |  41 ++++
 apps/files_sharing/l10n/tr.json         |  39 ++++
 apps/files_sharing/l10n/tr.php          |  40 ----
 apps/files_sharing/l10n/ug.js           |  10 +
 apps/files_sharing/l10n/ug.json         |   8 +
 apps/files_sharing/l10n/ug.php          |   9 -
 apps/files_sharing/l10n/uk.js           |  41 ++++
 apps/files_sharing/l10n/uk.json         |  39 ++++
 apps/files_sharing/l10n/uk.php          |  40 ----
 apps/files_sharing/l10n/ur_PK.js        |  10 +
 apps/files_sharing/l10n/ur_PK.json      |   8 +
 apps/files_sharing/l10n/ur_PK.php       |   9 -
 apps/files_sharing/l10n/vi.js           |  10 +
 apps/files_sharing/l10n/vi.json         |   8 +
 apps/files_sharing/l10n/vi.php          |   9 -
 apps/files_sharing/l10n/zh_CN.js        |  39 ++++
 apps/files_sharing/l10n/zh_CN.json      |  37 ++++
 apps/files_sharing/l10n/zh_CN.php       |  38 ----
 apps/files_sharing/l10n/zh_HK.js        |   9 +
 apps/files_sharing/l10n/zh_HK.json      |   7 +
 apps/files_sharing/l10n/zh_HK.php       |   8 -
 apps/files_sharing/l10n/zh_TW.js        |  39 ++++
 apps/files_sharing/l10n/zh_TW.json      |  37 ++++
 apps/files_sharing/l10n/zh_TW.php       |  38 ----
 apps/files_trashbin/l10n/ar.js          |  15 ++
 apps/files_trashbin/l10n/ar.json        |  13 ++
 apps/files_trashbin/l10n/ar.php         |  14 --
 apps/files_trashbin/l10n/ast.js         |  15 ++
 apps/files_trashbin/l10n/ast.json       |  13 ++
 apps/files_trashbin/l10n/ast.php        |  14 --
 apps/files_trashbin/l10n/az.js          |  15 ++
 apps/files_trashbin/l10n/az.json        |  13 ++
 apps/files_trashbin/l10n/az.php         |  14 --
 apps/files_trashbin/l10n/be.js          |   6 +
 apps/files_trashbin/l10n/be.json        |   4 +
 apps/files_trashbin/l10n/be.php         |   5 -
 apps/files_trashbin/l10n/bg_BG.js       |  15 ++
 apps/files_trashbin/l10n/bg_BG.json     |  13 ++
 apps/files_trashbin/l10n/bg_BG.php      |  14 --
 apps/files_trashbin/l10n/bn_BD.js       |  15 ++
 apps/files_trashbin/l10n/bn_BD.json     |  13 ++
 apps/files_trashbin/l10n/bn_BD.php      |  14 --
 apps/files_trashbin/l10n/bn_IN.js       |  15 ++
 apps/files_trashbin/l10n/bn_IN.json     |  13 ++
 apps/files_trashbin/l10n/bn_IN.php      |  14 --
 apps/files_trashbin/l10n/bs.js          |   6 +
 apps/files_trashbin/l10n/bs.json        |   4 +
 apps/files_trashbin/l10n/bs.php         |   5 -
 apps/files_trashbin/l10n/ca.js          |  15 ++
 apps/files_trashbin/l10n/ca.json        |  13 ++
 apps/files_trashbin/l10n/ca.php         |  14 --
 apps/files_trashbin/l10n/cs_CZ.js       |  15 ++
 apps/files_trashbin/l10n/cs_CZ.json     |  13 ++
 apps/files_trashbin/l10n/cs_CZ.php      |  14 --
 apps/files_trashbin/l10n/cy_GB.js       |  14 ++
 apps/files_trashbin/l10n/cy_GB.json     |  12 ++
 apps/files_trashbin/l10n/cy_GB.php      |  13 --
 apps/files_trashbin/l10n/da.js          |  15 ++
 apps/files_trashbin/l10n/da.json        |  13 ++
 apps/files_trashbin/l10n/da.php         |  14 --
 apps/files_trashbin/l10n/de.js          |  15 ++
 apps/files_trashbin/l10n/de.json        |  13 ++
 apps/files_trashbin/l10n/de.php         |  14 --
 apps/files_trashbin/l10n/de_AT.js       |   7 +
 apps/files_trashbin/l10n/de_AT.json     |   5 +
 apps/files_trashbin/l10n/de_AT.php      |   6 -
 apps/files_trashbin/l10n/de_CH.js       |  15 ++
 apps/files_trashbin/l10n/de_CH.json     |  13 ++
 apps/files_trashbin/l10n/de_CH.php      |  14 --
 apps/files_trashbin/l10n/de_DE.js       |  15 ++
 apps/files_trashbin/l10n/de_DE.json     |  13 ++
 apps/files_trashbin/l10n/de_DE.php      |  14 --
 apps/files_trashbin/l10n/el.js          |  15 ++
 apps/files_trashbin/l10n/el.json        |  13 ++
 apps/files_trashbin/l10n/el.php         |  14 --
 apps/files_trashbin/l10n/en_GB.js       |  15 ++
 apps/files_trashbin/l10n/en_GB.json     |  13 ++
 apps/files_trashbin/l10n/en_GB.php      |  14 --
 apps/files_trashbin/l10n/eo.js          |  15 ++
 apps/files_trashbin/l10n/eo.json        |  13 ++
 apps/files_trashbin/l10n/eo.php         |  14 --
 apps/files_trashbin/l10n/es.js          |  15 ++
 apps/files_trashbin/l10n/es.json        |  13 ++
 apps/files_trashbin/l10n/es.php         |  14 --
 apps/files_trashbin/l10n/es_AR.js       |  15 ++
 apps/files_trashbin/l10n/es_AR.json     |  13 ++
 apps/files_trashbin/l10n/es_AR.php      |  14 --
 apps/files_trashbin/l10n/es_CL.js       |   6 +
 apps/files_trashbin/l10n/es_CL.json     |   4 +
 apps/files_trashbin/l10n/es_CL.php      |   5 -
 apps/files_trashbin/l10n/es_MX.js       |  15 ++
 apps/files_trashbin/l10n/es_MX.json     |  13 ++
 apps/files_trashbin/l10n/es_MX.php      |  14 --
 apps/files_trashbin/l10n/et_EE.js       |  15 ++
 apps/files_trashbin/l10n/et_EE.json     |  13 ++
 apps/files_trashbin/l10n/et_EE.php      |  14 --
 apps/files_trashbin/l10n/eu.js          |  15 ++
 apps/files_trashbin/l10n/eu.json        |  13 ++
 apps/files_trashbin/l10n/eu.php         |  14 --
 apps/files_trashbin/l10n/eu_ES.js       |   6 +
 apps/files_trashbin/l10n/eu_ES.json     |   4 +
 apps/files_trashbin/l10n/eu_ES.php      |   5 -
 apps/files_trashbin/l10n/fa.js          |  15 ++
 apps/files_trashbin/l10n/fa.json        |  13 ++
 apps/files_trashbin/l10n/fa.php         |  14 --
 apps/files_trashbin/l10n/fi_FI.js       |  15 ++
 apps/files_trashbin/l10n/fi_FI.json     |  13 ++
 apps/files_trashbin/l10n/fi_FI.php      |  14 --
 apps/files_trashbin/l10n/fr.js          |  15 ++
 apps/files_trashbin/l10n/fr.json        |  13 ++
 apps/files_trashbin/l10n/fr.php         |  14 --
 apps/files_trashbin/l10n/gl.js          |  15 ++
 apps/files_trashbin/l10n/gl.json        |  13 ++
 apps/files_trashbin/l10n/gl.php         |  14 --
 apps/files_trashbin/l10n/he.js          |  15 ++
 apps/files_trashbin/l10n/he.json        |  13 ++
 apps/files_trashbin/l10n/he.php         |  14 --
 apps/files_trashbin/l10n/hi.js          |   6 +
 apps/files_trashbin/l10n/hi.json        |   4 +
 apps/files_trashbin/l10n/hi.php         |   5 -
 apps/files_trashbin/l10n/hr.js          |  15 ++
 apps/files_trashbin/l10n/hr.json        |  13 ++
 apps/files_trashbin/l10n/hr.php         |  14 --
 apps/files_trashbin/l10n/hu_HU.js       |  15 ++
 apps/files_trashbin/l10n/hu_HU.json     |  13 ++
 apps/files_trashbin/l10n/hu_HU.php      |  14 --
 apps/files_trashbin/l10n/hy.js          |   6 +
 apps/files_trashbin/l10n/hy.json        |   4 +
 apps/files_trashbin/l10n/hy.php         |   5 -
 apps/files_trashbin/l10n/ia.js          |   8 +
 apps/files_trashbin/l10n/ia.json        |   6 +
 apps/files_trashbin/l10n/ia.php         |   7 -
 apps/files_trashbin/l10n/id.js          |  14 ++
 apps/files_trashbin/l10n/id.json        |  12 ++
 apps/files_trashbin/l10n/id.php         |  13 --
 apps/files_trashbin/l10n/is.js          |   8 +
 apps/files_trashbin/l10n/is.json        |   6 +
 apps/files_trashbin/l10n/is.php         |   7 -
 apps/files_trashbin/l10n/it.js          |  15 ++
 apps/files_trashbin/l10n/it.json        |  13 ++
 apps/files_trashbin/l10n/it.php         |  14 --
 apps/files_trashbin/l10n/ja.js          |  15 ++
 apps/files_trashbin/l10n/ja.json        |  13 ++
 apps/files_trashbin/l10n/ja.php         |  14 --
 apps/files_trashbin/l10n/ka_GE.js       |  14 ++
 apps/files_trashbin/l10n/ka_GE.json     |  12 ++
 apps/files_trashbin/l10n/ka_GE.php      |  13 --
 apps/files_trashbin/l10n/km.js          |  15 ++
 apps/files_trashbin/l10n/km.json        |  13 ++
 apps/files_trashbin/l10n/km.php         |  14 --
 apps/files_trashbin/l10n/ko.js          |  15 ++
 apps/files_trashbin/l10n/ko.json        |  13 ++
 apps/files_trashbin/l10n/ko.php         |  14 --
 apps/files_trashbin/l10n/ku_IQ.js       |   7 +
 apps/files_trashbin/l10n/ku_IQ.json     |   5 +
 apps/files_trashbin/l10n/ku_IQ.php      |   6 -
 apps/files_trashbin/l10n/lb.js          |   8 +
 apps/files_trashbin/l10n/lb.json        |   6 +
 apps/files_trashbin/l10n/lb.php         |   7 -
 apps/files_trashbin/l10n/lt_LT.js       |  15 ++
 apps/files_trashbin/l10n/lt_LT.json     |  13 ++
 apps/files_trashbin/l10n/lt_LT.php      |  14 --
 apps/files_trashbin/l10n/lv.js          |  15 ++
 apps/files_trashbin/l10n/lv.json        |  13 ++
 apps/files_trashbin/l10n/lv.php         |  14 --
 apps/files_trashbin/l10n/mk.js          |  15 ++
 apps/files_trashbin/l10n/mk.json        |  13 ++
 apps/files_trashbin/l10n/mk.php         |  14 --
 apps/files_trashbin/l10n/ms_MY.js       |  15 ++
 apps/files_trashbin/l10n/ms_MY.json     |  13 ++
 apps/files_trashbin/l10n/ms_MY.php      |  14 --
 apps/files_trashbin/l10n/nb_NO.js       |  15 ++
 apps/files_trashbin/l10n/nb_NO.json     |  13 ++
 apps/files_trashbin/l10n/nb_NO.php      |  14 --
 apps/files_trashbin/l10n/nl.js          |  15 ++
 apps/files_trashbin/l10n/nl.json        |  13 ++
 apps/files_trashbin/l10n/nl.php         |  14 --
 apps/files_trashbin/l10n/nn_NO.js       |  15 ++
 apps/files_trashbin/l10n/nn_NO.json     |  13 ++
 apps/files_trashbin/l10n/nn_NO.php      |  14 --
 apps/files_trashbin/l10n/oc.js          |   8 +
 apps/files_trashbin/l10n/oc.json        |   6 +
 apps/files_trashbin/l10n/oc.php         |   7 -
 apps/files_trashbin/l10n/pa.js          |   7 +
 apps/files_trashbin/l10n/pa.json        |   5 +
 apps/files_trashbin/l10n/pa.php         |   6 -
 apps/files_trashbin/l10n/pl.js          |  15 ++
 apps/files_trashbin/l10n/pl.json        |  13 ++
 apps/files_trashbin/l10n/pl.php         |  14 --
 apps/files_trashbin/l10n/pt_BR.js       |  15 ++
 apps/files_trashbin/l10n/pt_BR.json     |  13 ++
 apps/files_trashbin/l10n/pt_BR.php      |  14 --
 apps/files_trashbin/l10n/pt_PT.js       |  15 ++
 apps/files_trashbin/l10n/pt_PT.json     |  13 ++
 apps/files_trashbin/l10n/pt_PT.php      |  14 --
 apps/files_trashbin/l10n/ro.js          |  10 +
 apps/files_trashbin/l10n/ro.json        |   8 +
 apps/files_trashbin/l10n/ro.php         |   9 -
 apps/files_trashbin/l10n/ru.js          |  15 ++
 apps/files_trashbin/l10n/ru.json        |  13 ++
 apps/files_trashbin/l10n/ru.php         |  14 --
 apps/files_trashbin/l10n/si_LK.js       |   8 +
 apps/files_trashbin/l10n/si_LK.json     |   6 +
 apps/files_trashbin/l10n/si_LK.php      |   7 -
 apps/files_trashbin/l10n/sk_SK.js       |  15 ++
 apps/files_trashbin/l10n/sk_SK.json     |  13 ++
 apps/files_trashbin/l10n/sk_SK.php      |  14 --
 apps/files_trashbin/l10n/sl.js          |  15 ++
 apps/files_trashbin/l10n/sl.json        |  13 ++
 apps/files_trashbin/l10n/sl.php         |  14 --
 apps/files_trashbin/l10n/sq.js          |  15 ++
 apps/files_trashbin/l10n/sq.json        |  13 ++
 apps/files_trashbin/l10n/sq.php         |  14 --
 apps/files_trashbin/l10n/sr.js          |  12 ++
 apps/files_trashbin/l10n/sr.json        |  10 +
 apps/files_trashbin/l10n/sr.php         |  11 --
 apps/files_trashbin/l10n/sr@latin.js    |   8 +
 apps/files_trashbin/l10n/sr@latin.json  |   6 +
 apps/files_trashbin/l10n/sr@latin.php   |   7 -
 apps/files_trashbin/l10n/sv.js          |  15 ++
 apps/files_trashbin/l10n/sv.json        |  13 ++
 apps/files_trashbin/l10n/sv.php         |  14 --
 apps/files_trashbin/l10n/ta_LK.js       |   8 +
 apps/files_trashbin/l10n/ta_LK.json     |   6 +
 apps/files_trashbin/l10n/ta_LK.php      |   7 -
 apps/files_trashbin/l10n/te.js          |   8 +
 apps/files_trashbin/l10n/te.json        |   6 +
 apps/files_trashbin/l10n/te.php         |   7 -
 apps/files_trashbin/l10n/th_TH.js       |  11 ++
 apps/files_trashbin/l10n/th_TH.json     |   9 +
 apps/files_trashbin/l10n/th_TH.php      |  10 -
 apps/files_trashbin/l10n/tr.js          |  15 ++
 apps/files_trashbin/l10n/tr.json        |  13 ++
 apps/files_trashbin/l10n/tr.php         |  14 --
 apps/files_trashbin/l10n/ug.js          |  11 ++
 apps/files_trashbin/l10n/ug.json        |   9 +
 apps/files_trashbin/l10n/ug.php         |  10 -
 apps/files_trashbin/l10n/uk.js          |  15 ++
 apps/files_trashbin/l10n/uk.json        |  13 ++
 apps/files_trashbin/l10n/uk.php         |  14 --
 apps/files_trashbin/l10n/ur_PK.js       |  15 ++
 apps/files_trashbin/l10n/ur_PK.json     |  13 ++
 apps/files_trashbin/l10n/ur_PK.php      |  14 --
 apps/files_trashbin/l10n/vi.js          |  15 ++
 apps/files_trashbin/l10n/vi.json        |  13 ++
 apps/files_trashbin/l10n/vi.php         |  14 --
 apps/files_trashbin/l10n/zh_CN.js       |  15 ++
 apps/files_trashbin/l10n/zh_CN.json     |  13 ++
 apps/files_trashbin/l10n/zh_CN.php      |  14 --
 apps/files_trashbin/l10n/zh_HK.js       |   8 +
 apps/files_trashbin/l10n/zh_HK.json     |   6 +
 apps/files_trashbin/l10n/zh_HK.php      |   7 -
 apps/files_trashbin/l10n/zh_TW.js       |  15 ++
 apps/files_trashbin/l10n/zh_TW.json     |  13 ++
 apps/files_trashbin/l10n/zh_TW.php      |  14 --
 apps/files_versions/l10n/ar.js          |   7 +
 apps/files_versions/l10n/ar.json        |   5 +
 apps/files_versions/l10n/ar.php         |   6 -
 apps/files_versions/l10n/ast.js         |  11 ++
 apps/files_versions/l10n/ast.json       |   9 +
 apps/files_versions/l10n/ast.php        |  10 -
 apps/files_versions/l10n/az.js          |  11 ++
 apps/files_versions/l10n/az.json        |   9 +
 apps/files_versions/l10n/az.php         |  10 -
 apps/files_versions/l10n/bg_BG.js       |  11 ++
 apps/files_versions/l10n/bg_BG.json     |   9 +
 apps/files_versions/l10n/bg_BG.php      |  10 -
 apps/files_versions/l10n/bn_BD.js       |  11 ++
 apps/files_versions/l10n/bn_BD.json     |   9 +
 apps/files_versions/l10n/bn_BD.php      |  10 -
 apps/files_versions/l10n/bn_IN.js       |  11 ++
 apps/files_versions/l10n/bn_IN.json     |   9 +
 apps/files_versions/l10n/bn_IN.php      |  10 -
 apps/files_versions/l10n/ca.js          |  11 ++
 apps/files_versions/l10n/ca.json        |   9 +
 apps/files_versions/l10n/ca.php         |  10 -
 apps/files_versions/l10n/cs_CZ.js       |  11 ++
 apps/files_versions/l10n/cs_CZ.json     |   9 +
 apps/files_versions/l10n/cs_CZ.php      |  10 -
 apps/files_versions/l10n/cy_GB.js       |   6 +
 apps/files_versions/l10n/cy_GB.json     |   4 +
 apps/files_versions/l10n/cy_GB.php      |   5 -
 apps/files_versions/l10n/da.js          |  11 ++
 apps/files_versions/l10n/da.json        |   9 +
 apps/files_versions/l10n/da.php         |  10 -
 apps/files_versions/l10n/de.js          |  11 ++
 apps/files_versions/l10n/de.json        |   9 +
 apps/files_versions/l10n/de.php         |  10 -
 apps/files_versions/l10n/de_CH.js       |  11 ++
 apps/files_versions/l10n/de_CH.json     |   9 +
 apps/files_versions/l10n/de_CH.php      |  10 -
 apps/files_versions/l10n/de_DE.js       |  11 ++
 apps/files_versions/l10n/de_DE.json     |   9 +
 apps/files_versions/l10n/de_DE.php      |  10 -
 apps/files_versions/l10n/el.js          |  11 ++
 apps/files_versions/l10n/el.json        |   9 +
 apps/files_versions/l10n/el.php         |  10 -
 apps/files_versions/l10n/en_GB.js       |  11 ++
 apps/files_versions/l10n/en_GB.json     |   9 +
 apps/files_versions/l10n/en_GB.php      |  10 -
 apps/files_versions/l10n/eo.js          |  11 ++
 apps/files_versions/l10n/eo.json        |   9 +
 apps/files_versions/l10n/eo.php         |  10 -
 apps/files_versions/l10n/es.js          |  11 ++
 apps/files_versions/l10n/es.json        |   9 +
 apps/files_versions/l10n/es.php         |  10 -
 apps/files_versions/l10n/es_AR.js       |  11 ++
 apps/files_versions/l10n/es_AR.json     |   9 +
 apps/files_versions/l10n/es_AR.php      |  10 -
 apps/files_versions/l10n/es_MX.js       |  11 ++
 apps/files_versions/l10n/es_MX.json     |   9 +
 apps/files_versions/l10n/es_MX.php      |  10 -
 apps/files_versions/l10n/et_EE.js       |  11 ++
 apps/files_versions/l10n/et_EE.json     |   9 +
 apps/files_versions/l10n/et_EE.php      |  10 -
 apps/files_versions/l10n/eu.js          |  11 ++
 apps/files_versions/l10n/eu.json        |   9 +
 apps/files_versions/l10n/eu.php         |  10 -
 apps/files_versions/l10n/fa.js          |  11 ++
 apps/files_versions/l10n/fa.json        |   9 +
 apps/files_versions/l10n/fa.php         |  10 -
 apps/files_versions/l10n/fi_FI.js       |  11 ++
 apps/files_versions/l10n/fi_FI.json     |   9 +
 apps/files_versions/l10n/fi_FI.php      |  10 -
 apps/files_versions/l10n/fr.js          |  11 ++
 apps/files_versions/l10n/fr.json        |   9 +
 apps/files_versions/l10n/fr.php         |  10 -
 apps/files_versions/l10n/gl.js          |  11 ++
 apps/files_versions/l10n/gl.json        |   9 +
 apps/files_versions/l10n/gl.php         |  10 -
 apps/files_versions/l10n/he.js          |   8 +
 apps/files_versions/l10n/he.json        |   6 +
 apps/files_versions/l10n/he.php         |   7 -
 apps/files_versions/l10n/hr.js          |  11 ++
 apps/files_versions/l10n/hr.json        |   9 +
 apps/files_versions/l10n/hr.php         |  10 -
 apps/files_versions/l10n/hu_HU.js       |  11 ++
 apps/files_versions/l10n/hu_HU.json     |   9 +
 apps/files_versions/l10n/hu_HU.php      |  10 -
 apps/files_versions/l10n/id.js          |  11 ++
 apps/files_versions/l10n/id.json        |   9 +
 apps/files_versions/l10n/id.php         |  10 -
 apps/files_versions/l10n/is.js          |   6 +
 apps/files_versions/l10n/is.json        |   4 +
 apps/files_versions/l10n/is.php         |   5 -
 apps/files_versions/l10n/it.js          |  11 ++
 apps/files_versions/l10n/it.json        |   9 +
 apps/files_versions/l10n/it.php         |  10 -
 apps/files_versions/l10n/ja.js          |  11 ++
 apps/files_versions/l10n/ja.json        |   9 +
 apps/files_versions/l10n/ja.php         |  10 -
 apps/files_versions/l10n/ka_GE.js       |   8 +
 apps/files_versions/l10n/ka_GE.json     |   6 +
 apps/files_versions/l10n/ka_GE.php      |   7 -
 apps/files_versions/l10n/km.js          |  11 ++
 apps/files_versions/l10n/km.json        |   9 +
 apps/files_versions/l10n/km.php         |  10 -
 apps/files_versions/l10n/ko.js          |  11 ++
 apps/files_versions/l10n/ko.json        |   9 +
 apps/files_versions/l10n/ko.php         |  10 -
 apps/files_versions/l10n/ku_IQ.js       |   6 +
 apps/files_versions/l10n/ku_IQ.json     |   4 +
 apps/files_versions/l10n/ku_IQ.php      |   5 -
 apps/files_versions/l10n/lt_LT.js       |  11 ++
 apps/files_versions/l10n/lt_LT.json     |   9 +
 apps/files_versions/l10n/lt_LT.php      |  10 -
 apps/files_versions/l10n/lv.js          |   8 +
 apps/files_versions/l10n/lv.json        |   6 +
 apps/files_versions/l10n/lv.php         |   7 -
 apps/files_versions/l10n/mk.js          |  11 ++
 apps/files_versions/l10n/mk.json        |   9 +
 apps/files_versions/l10n/mk.php         |  10 -
 apps/files_versions/l10n/ms_MY.js       |  11 ++
 apps/files_versions/l10n/ms_MY.json     |   9 +
 apps/files_versions/l10n/ms_MY.php      |  10 -
 apps/files_versions/l10n/nb_NO.js       |  11 ++
 apps/files_versions/l10n/nb_NO.json     |   9 +
 apps/files_versions/l10n/nb_NO.php      |  10 -
 apps/files_versions/l10n/nl.js          |  11 ++
 apps/files_versions/l10n/nl.json        |   9 +
 apps/files_versions/l10n/nl.php         |  10 -
 apps/files_versions/l10n/nn_NO.js       |  11 ++
 apps/files_versions/l10n/nn_NO.json     |   9 +
 apps/files_versions/l10n/nn_NO.php      |  10 -
 apps/files_versions/l10n/pl.js          |  11 ++
 apps/files_versions/l10n/pl.json        |   9 +
 apps/files_versions/l10n/pl.php         |  10 -
 apps/files_versions/l10n/pt_BR.js       |  11 ++
 apps/files_versions/l10n/pt_BR.json     |   9 +
 apps/files_versions/l10n/pt_BR.php      |  10 -
 apps/files_versions/l10n/pt_PT.js       |  11 ++
 apps/files_versions/l10n/pt_PT.json     |   9 +
 apps/files_versions/l10n/pt_PT.php      |  10 -
 apps/files_versions/l10n/ro.js          |  10 +
 apps/files_versions/l10n/ro.json        |   8 +
 apps/files_versions/l10n/ro.php         |   9 -
 apps/files_versions/l10n/ru.js          |  11 ++
 apps/files_versions/l10n/ru.json        |   9 +
 apps/files_versions/l10n/ru.php         |  10 -
 apps/files_versions/l10n/si_LK.js       |   6 +
 apps/files_versions/l10n/si_LK.json     |   4 +
 apps/files_versions/l10n/si_LK.php      |   5 -
 apps/files_versions/l10n/sk_SK.js       |  11 ++
 apps/files_versions/l10n/sk_SK.json     |   9 +
 apps/files_versions/l10n/sk_SK.php      |  10 -
 apps/files_versions/l10n/sl.js          |  11 ++
 apps/files_versions/l10n/sl.json        |   9 +
 apps/files_versions/l10n/sl.php         |  10 -
 apps/files_versions/l10n/sq.js          |  11 ++
 apps/files_versions/l10n/sq.json        |   9 +
 apps/files_versions/l10n/sq.php         |  10 -
 apps/files_versions/l10n/sr.js          |   6 +
 apps/files_versions/l10n/sr.json        |   4 +
 apps/files_versions/l10n/sr.php         |   5 -
 apps/files_versions/l10n/sv.js          |  11 ++
 apps/files_versions/l10n/sv.json        |   9 +
 apps/files_versions/l10n/sv.php         |  10 -
 apps/files_versions/l10n/ta_LK.js       |   6 +
 apps/files_versions/l10n/ta_LK.json     |   4 +
 apps/files_versions/l10n/ta_LK.php      |   5 -
 apps/files_versions/l10n/th_TH.js       |   7 +
 apps/files_versions/l10n/th_TH.json     |   5 +
 apps/files_versions/l10n/th_TH.php      |   6 -
 apps/files_versions/l10n/tr.js          |  11 ++
 apps/files_versions/l10n/tr.json        |   9 +
 apps/files_versions/l10n/tr.php         |  10 -
 apps/files_versions/l10n/ug.js          |   7 +
 apps/files_versions/l10n/ug.json        |   5 +
 apps/files_versions/l10n/ug.php         |   6 -
 apps/files_versions/l10n/uk.js          |  11 ++
 apps/files_versions/l10n/uk.json        |   9 +
 apps/files_versions/l10n/uk.php         |  10 -
 apps/files_versions/l10n/ur_PK.js       |   6 +
 apps/files_versions/l10n/ur_PK.json     |   4 +
 apps/files_versions/l10n/ur_PK.php      |   5 -
 apps/files_versions/l10n/vi.js          |  11 ++
 apps/files_versions/l10n/vi.json        |   9 +
 apps/files_versions/l10n/vi.php         |  10 -
 apps/files_versions/l10n/zh_CN.js       |  11 ++
 apps/files_versions/l10n/zh_CN.json     |   9 +
 apps/files_versions/l10n/zh_CN.php      |  10 -
 apps/files_versions/l10n/zh_HK.js       |   6 +
 apps/files_versions/l10n/zh_HK.json     |   4 +
 apps/files_versions/l10n/zh_HK.php      |   5 -
 apps/files_versions/l10n/zh_TW.js       |  11 ++
 apps/files_versions/l10n/zh_TW.json     |   9 +
 apps/files_versions/l10n/zh_TW.php      |  10 -
 apps/user_ldap/l10n/ach.js              |   7 +
 apps/user_ldap/l10n/ach.json            |   5 +
 apps/user_ldap/l10n/ach.php             |   6 -
 apps/user_ldap/l10n/ady.js              |   7 +
 apps/user_ldap/l10n/ady.json            |   5 +
 apps/user_ldap/l10n/ady.php             |   6 -
 apps/user_ldap/l10n/af_ZA.js            |  11 ++
 apps/user_ldap/l10n/af_ZA.json          |   9 +
 apps/user_ldap/l10n/af_ZA.php           |  10 -
 apps/user_ldap/l10n/ak.js               |   7 +
 apps/user_ldap/l10n/ak.json             |   5 +
 apps/user_ldap/l10n/ak.php              |   6 -
 apps/user_ldap/l10n/am_ET.js            |   7 +
 apps/user_ldap/l10n/am_ET.json          |   5 +
 apps/user_ldap/l10n/am_ET.php           |   6 -
 apps/user_ldap/l10n/ar.js               |  21 +++
 apps/user_ldap/l10n/ar.json             |  19 ++
 apps/user_ldap/l10n/ar.php              |  44 -----
 apps/user_ldap/l10n/ast.js              | 128 +++++++++++++
 apps/user_ldap/l10n/ast.json            | 126 +++++++++++++
 apps/user_ldap/l10n/ast.php             | 127 -------------
 apps/user_ldap/l10n/az.js               |  22 +++
 apps/user_ldap/l10n/az.json             |  20 ++
 apps/user_ldap/l10n/az.php              |  21 ---
 apps/user_ldap/l10n/be.js               |   9 +
 apps/user_ldap/l10n/be.json             |   7 +
 apps/user_ldap/l10n/be.php              |   8 -
 apps/user_ldap/l10n/bg_BG.js            | 132 +++++++++++++
 apps/user_ldap/l10n/bg_BG.json          | 130 +++++++++++++
 apps/user_ldap/l10n/bg_BG.php           | 131 -------------
 apps/user_ldap/l10n/bn_BD.js            | 107 +++++++++++
 apps/user_ldap/l10n/bn_BD.json          | 105 +++++++++++
 apps/user_ldap/l10n/bn_BD.php           | 106 -----------
 apps/user_ldap/l10n/bn_IN.js            |  10 +
 apps/user_ldap/l10n/bn_IN.json          |   8 +
 apps/user_ldap/l10n/bn_IN.php           |   9 -
 apps/user_ldap/l10n/bs.js               |   8 +
 apps/user_ldap/l10n/bs.json             |   6 +
 apps/user_ldap/l10n/bs.php              |   7 -
 apps/user_ldap/l10n/ca.js               | 128 +++++++++++++
 apps/user_ldap/l10n/ca.json             | 126 +++++++++++++
 apps/user_ldap/l10n/ca.php              | 127 -------------
 apps/user_ldap/l10n/ca@valencia.js      |   7 +
 apps/user_ldap/l10n/ca@valencia.json    |   5 +
 apps/user_ldap/l10n/ca@valencia.php     |   6 -
 apps/user_ldap/l10n/cs_CZ.js            | 132 +++++++++++++
 apps/user_ldap/l10n/cs_CZ.json          | 130 +++++++++++++
 apps/user_ldap/l10n/cs_CZ.php           | 131 -------------
 apps/user_ldap/l10n/cy_GB.js            |  13 ++
 apps/user_ldap/l10n/cy_GB.json          |  11 ++
 apps/user_ldap/l10n/cy_GB.php           |  12 --
 apps/user_ldap/l10n/da.js               | 132 +++++++++++++
 apps/user_ldap/l10n/da.json             | 130 +++++++++++++
 apps/user_ldap/l10n/da.php              | 131 -------------
 apps/user_ldap/l10n/de.js               | 132 +++++++++++++
 apps/user_ldap/l10n/de.json             | 130 +++++++++++++
 apps/user_ldap/l10n/de.php              | 131 -------------
 apps/user_ldap/l10n/de_AT.js            |  90 +++++++++
 apps/user_ldap/l10n/de_AT.json          |  88 +++++++++
 apps/user_ldap/l10n/de_AT.php           |  89 ---------
 apps/user_ldap/l10n/de_CH.js            |  82 ++++++++
 apps/user_ldap/l10n/de_CH.json          |  80 ++++++++
 apps/user_ldap/l10n/de_CH.php           |  81 --------
 apps/user_ldap/l10n/de_DE.js            | 132 +++++++++++++
 apps/user_ldap/l10n/de_DE.json          | 130 +++++++++++++
 apps/user_ldap/l10n/de_DE.php           | 131 -------------
 apps/user_ldap/l10n/el.js               | 132 +++++++++++++
 apps/user_ldap/l10n/el.json             | 130 +++++++++++++
 apps/user_ldap/l10n/el.php              | 131 -------------
 apps/user_ldap/l10n/en@pirate.js        |   8 +
 apps/user_ldap/l10n/en@pirate.json      |   6 +
 apps/user_ldap/l10n/en@pirate.php       |   7 -
 apps/user_ldap/l10n/en_GB.js            | 132 +++++++++++++
 apps/user_ldap/l10n/en_GB.json          | 130 +++++++++++++
 apps/user_ldap/l10n/en_GB.php           | 131 -------------
 apps/user_ldap/l10n/en_NZ.js            |   7 +
 apps/user_ldap/l10n/en_NZ.json          |   5 +
 apps/user_ldap/l10n/en_NZ.php           |   6 -
 apps/user_ldap/l10n/eo.js               |  74 ++++++++
 apps/user_ldap/l10n/eo.json             |  72 +++++++
 apps/user_ldap/l10n/eo.php              |  73 -------
 apps/user_ldap/l10n/es.js               | 132 +++++++++++++
 apps/user_ldap/l10n/es.json             | 130 +++++++++++++
 apps/user_ldap/l10n/es.php              | 131 -------------
 apps/user_ldap/l10n/es_AR.js            | 116 ++++++++++++
 apps/user_ldap/l10n/es_AR.json          | 114 +++++++++++
 apps/user_ldap/l10n/es_AR.php           | 115 ------------
 apps/user_ldap/l10n/es_BO.js            |   7 +
 apps/user_ldap/l10n/es_BO.json          |   5 +
 apps/user_ldap/l10n/es_BO.php           |   6 -
 apps/user_ldap/l10n/es_CL.js            |  10 +
 apps/user_ldap/l10n/es_CL.json          |   8 +
 apps/user_ldap/l10n/es_CL.php           |   9 -
 apps/user_ldap/l10n/es_CO.js            |   7 +
 apps/user_ldap/l10n/es_CO.json          |   5 +
 apps/user_ldap/l10n/es_CO.php           |   6 -
 apps/user_ldap/l10n/es_CR.js            |   7 +
 apps/user_ldap/l10n/es_CR.json          |   5 +
 apps/user_ldap/l10n/es_CR.php           |   6 -
 apps/user_ldap/l10n/es_EC.js            |   7 +
 apps/user_ldap/l10n/es_EC.json          |   5 +
 apps/user_ldap/l10n/es_EC.php           |   6 -
 apps/user_ldap/l10n/es_MX.js            | 108 +++++++++++
 apps/user_ldap/l10n/es_MX.json          | 106 +++++++++++
 apps/user_ldap/l10n/es_MX.php           | 107 -----------
 apps/user_ldap/l10n/es_PE.js            |   7 +
 apps/user_ldap/l10n/es_PE.json          |   5 +
 apps/user_ldap/l10n/es_PE.php           |   6 -
 apps/user_ldap/l10n/es_PY.js            |   7 +
 apps/user_ldap/l10n/es_PY.json          |   5 +
 apps/user_ldap/l10n/es_PY.php           |   6 -
 apps/user_ldap/l10n/es_US.js            |   7 +
 apps/user_ldap/l10n/es_US.json          |   5 +
 apps/user_ldap/l10n/es_US.php           |   6 -
 apps/user_ldap/l10n/es_UY.js            |   7 +
 apps/user_ldap/l10n/es_UY.json          |   5 +
 apps/user_ldap/l10n/es_UY.php           |   6 -
 apps/user_ldap/l10n/et_EE.js            | 132 +++++++++++++
 apps/user_ldap/l10n/et_EE.json          | 130 +++++++++++++
 apps/user_ldap/l10n/et_EE.php           | 131 -------------
 apps/user_ldap/l10n/eu.js               | 125 ++++++++++++
 apps/user_ldap/l10n/eu.json             | 123 ++++++++++++
 apps/user_ldap/l10n/eu.php              | 125 ------------
 apps/user_ldap/l10n/eu_ES.js            |   8 +
 apps/user_ldap/l10n/eu_ES.json          |   6 +
 apps/user_ldap/l10n/eu_ES.php           |   7 -
 apps/user_ldap/l10n/fa.js               |  94 ++++++++++
 apps/user_ldap/l10n/fa.json             |  92 +++++++++
 apps/user_ldap/l10n/fa.php              |  93 ---------
 apps/user_ldap/l10n/fi_FI.js            |  70 +++++++
 apps/user_ldap/l10n/fi_FI.json          |  68 +++++++
 apps/user_ldap/l10n/fi_FI.php           |  69 -------
 apps/user_ldap/l10n/fil.js              |   7 +
 apps/user_ldap/l10n/fil.json            |   5 +
 apps/user_ldap/l10n/fil.php             |   6 -
 apps/user_ldap/l10n/fr.js               | 132 +++++++++++++
 apps/user_ldap/l10n/fr.json             | 130 +++++++++++++
 apps/user_ldap/l10n/fr.php              | 131 -------------
 apps/user_ldap/l10n/fr_CA.js            |   7 +
 apps/user_ldap/l10n/fr_CA.json          |   5 +
 apps/user_ldap/l10n/fr_CA.php           |   6 -
 apps/user_ldap/l10n/fy_NL.js            |   7 +
 apps/user_ldap/l10n/fy_NL.json          |   5 +
 apps/user_ldap/l10n/fy_NL.php           |   6 -
 apps/user_ldap/l10n/gl.js               | 128 +++++++++++++
 apps/user_ldap/l10n/gl.json             | 126 +++++++++++++
 apps/user_ldap/l10n/gl.php              | 127 -------------
 apps/user_ldap/l10n/gu.js               |   7 +
 apps/user_ldap/l10n/gu.json             |   5 +
 apps/user_ldap/l10n/gu.php              |   6 -
 apps/user_ldap/l10n/he.js               |  28 +++
 apps/user_ldap/l10n/he.json             |  26 +++
 apps/user_ldap/l10n/he.php              |  27 ---
 apps/user_ldap/l10n/hi.js               |  12 ++
 apps/user_ldap/l10n/hi.json             |  10 +
 apps/user_ldap/l10n/hi.php              |  11 --
 apps/user_ldap/l10n/hr.js               |  17 ++
 apps/user_ldap/l10n/hr.json             |  15 ++
 apps/user_ldap/l10n/hr.php              |  16 --
 apps/user_ldap/l10n/hu_HU.js            | 131 +++++++++++++
 apps/user_ldap/l10n/hu_HU.json          | 129 +++++++++++++
 apps/user_ldap/l10n/hu_HU.php           | 130 -------------
 apps/user_ldap/l10n/hy.js               |   8 +
 apps/user_ldap/l10n/hy.json             |   6 +
 apps/user_ldap/l10n/hy.php              |   7 -
 apps/user_ldap/l10n/ia.js               |  15 ++
 apps/user_ldap/l10n/ia.json             |  13 ++
 apps/user_ldap/l10n/ia.php              |  14 --
 apps/user_ldap/l10n/id.js               |  68 +++++++
 apps/user_ldap/l10n/id.json             |  66 +++++++
 apps/user_ldap/l10n/id.php              | 106 -----------
 apps/user_ldap/l10n/io.js               |   7 +
 apps/user_ldap/l10n/io.json             |   5 +
 apps/user_ldap/l10n/io.php              |   6 -
 apps/user_ldap/l10n/is.js               |  15 ++
 apps/user_ldap/l10n/is.json             |  13 ++
 apps/user_ldap/l10n/is.php              |  14 --
 apps/user_ldap/l10n/it.js               | 132 +++++++++++++
 apps/user_ldap/l10n/it.json             | 130 +++++++++++++
 apps/user_ldap/l10n/it.php              | 131 -------------
 apps/user_ldap/l10n/ja.js               | 128 +++++++++++++
 apps/user_ldap/l10n/ja.json             | 126 +++++++++++++
 apps/user_ldap/l10n/ja.php              | 127 -------------
 apps/user_ldap/l10n/jv.js               |   7 +
 apps/user_ldap/l10n/jv.json             |   5 +
 apps/user_ldap/l10n/jv.php              |   6 -
 apps/user_ldap/l10n/ka_GE.js            |  65 +++++++
 apps/user_ldap/l10n/ka_GE.json          |  63 +++++++
 apps/user_ldap/l10n/ka_GE.php           |  64 -------
 apps/user_ldap/l10n/km.js               |  25 +++
 apps/user_ldap/l10n/km.json             |  23 +++
 apps/user_ldap/l10n/km.php              |  24 ---
 apps/user_ldap/l10n/kn.js               |   7 +
 apps/user_ldap/l10n/kn.json             |   5 +
 apps/user_ldap/l10n/kn.php              |   6 -
 apps/user_ldap/l10n/ko.js               | 112 +++++++++++
 apps/user_ldap/l10n/ko.json             | 110 +++++++++++
 apps/user_ldap/l10n/ko.php              | 111 -----------
 apps/user_ldap/l10n/ku_IQ.js            |  13 ++
 apps/user_ldap/l10n/ku_IQ.json          |  11 ++
 apps/user_ldap/l10n/ku_IQ.php           |  12 --
 apps/user_ldap/l10n/lb.js               |  16 ++
 apps/user_ldap/l10n/lb.json             |  14 ++
 apps/user_ldap/l10n/lb.php              |  15 --
 apps/user_ldap/l10n/lt_LT.js            |  61 ++++++
 apps/user_ldap/l10n/lt_LT.json          |  59 ++++++
 apps/user_ldap/l10n/lt_LT.php           |  60 ------
 apps/user_ldap/l10n/lv.js               |  64 +++++++
 apps/user_ldap/l10n/lv.json             |  62 ++++++
 apps/user_ldap/l10n/lv.php              |  63 -------
 apps/user_ldap/l10n/mg.js               |   7 +
 apps/user_ldap/l10n/mg.json             |   5 +
 apps/user_ldap/l10n/mg.php              |   6 -
 apps/user_ldap/l10n/mk.js               |  23 +++
 apps/user_ldap/l10n/mk.json             |  21 +++
 apps/user_ldap/l10n/mk.php              |  22 ---
 apps/user_ldap/l10n/ml.js               |   7 +
 apps/user_ldap/l10n/ml.json             |   5 +
 apps/user_ldap/l10n/ml.php              |   6 -
 apps/user_ldap/l10n/ml_IN.js            |   7 +
 apps/user_ldap/l10n/ml_IN.json          |   5 +
 apps/user_ldap/l10n/ml_IN.php           |   6 -
 apps/user_ldap/l10n/mn.js               |   7 +
 apps/user_ldap/l10n/mn.json             |   5 +
 apps/user_ldap/l10n/mn.php              |   6 -
 apps/user_ldap/l10n/ms_MY.js            |  14 ++
 apps/user_ldap/l10n/ms_MY.json          |  12 ++
 apps/user_ldap/l10n/ms_MY.php           |  13 --
 apps/user_ldap/l10n/mt_MT.js            |   7 +
 apps/user_ldap/l10n/mt_MT.json          |   5 +
 apps/user_ldap/l10n/mt_MT.php           |   6 -
 apps/user_ldap/l10n/my_MM.js            |  10 +
 apps/user_ldap/l10n/my_MM.json          |   8 +
 apps/user_ldap/l10n/my_MM.php           |   9 -
 apps/user_ldap/l10n/nb_NO.js            | 128 +++++++++++++
 apps/user_ldap/l10n/nb_NO.json          | 126 +++++++++++++
 apps/user_ldap/l10n/nb_NO.php           | 127 -------------
 apps/user_ldap/l10n/nds.js              |   7 +
 apps/user_ldap/l10n/nds.json            |   5 +
 apps/user_ldap/l10n/nds.php             |   6 -
 apps/user_ldap/l10n/ne.js               |   7 +
 apps/user_ldap/l10n/ne.json             |   5 +
 apps/user_ldap/l10n/ne.php              |   6 -
 apps/user_ldap/l10n/nl.js               | 132 +++++++++++++
 apps/user_ldap/l10n/nl.json             | 130 +++++++++++++
 apps/user_ldap/l10n/nl.php              | 131 -------------
 apps/user_ldap/l10n/nn_NO.js            |  17 ++
 apps/user_ldap/l10n/nn_NO.json          |  15 ++
 apps/user_ldap/l10n/nn_NO.php           |  16 --
 apps/user_ldap/l10n/nqo.js              |   7 +
 apps/user_ldap/l10n/nqo.json            |   5 +
 apps/user_ldap/l10n/nqo.php             |   6 -
 apps/user_ldap/l10n/oc.js               |  13 ++
 apps/user_ldap/l10n/oc.json             |  11 ++
 apps/user_ldap/l10n/oc.php              |  12 --
 apps/user_ldap/l10n/or_IN.js            |   7 +
 apps/user_ldap/l10n/or_IN.json          |   5 +
 apps/user_ldap/l10n/or_IN.php           |   6 -
 apps/user_ldap/l10n/pa.js               |   9 +
 apps/user_ldap/l10n/pa.json             |   7 +
 apps/user_ldap/l10n/pa.php              |   8 -
 apps/user_ldap/l10n/pl.js               | 128 +++++++++++++
 apps/user_ldap/l10n/pl.json             | 126 +++++++++++++
 apps/user_ldap/l10n/pl.php              | 127 -------------
 apps/user_ldap/l10n/pt_BR.js            | 132 +++++++++++++
 apps/user_ldap/l10n/pt_BR.json          | 130 +++++++++++++
 apps/user_ldap/l10n/pt_BR.php           | 131 -------------
 apps/user_ldap/l10n/pt_PT.js            | 132 +++++++++++++
 apps/user_ldap/l10n/pt_PT.json          | 130 +++++++++++++
 apps/user_ldap/l10n/pt_PT.php           | 131 -------------
 apps/user_ldap/l10n/ro.js               |  61 ++++++
 apps/user_ldap/l10n/ro.json             |  59 ++++++
 apps/user_ldap/l10n/ro.php              |  60 ------
 apps/user_ldap/l10n/ru.js               | 128 +++++++++++++
 apps/user_ldap/l10n/ru.json             | 126 +++++++++++++
 apps/user_ldap/l10n/ru.php              | 127 -------------
 apps/user_ldap/l10n/si_LK.js            |  18 ++
 apps/user_ldap/l10n/si_LK.json          |  16 ++
 apps/user_ldap/l10n/si_LK.php           |  17 --
 apps/user_ldap/l10n/sk_SK.js            | 128 +++++++++++++
 apps/user_ldap/l10n/sk_SK.json          | 126 +++++++++++++
 apps/user_ldap/l10n/sk_SK.php           | 127 -------------
 apps/user_ldap/l10n/sl.js               | 128 +++++++++++++
 apps/user_ldap/l10n/sl.json             | 126 +++++++++++++
 apps/user_ldap/l10n/sl.php              | 131 -------------
 apps/user_ldap/l10n/sq.js               |  72 +++++++
 apps/user_ldap/l10n/sq.json             |  70 +++++++
 apps/user_ldap/l10n/sq.php              |  71 -------
 apps/user_ldap/l10n/sr.js               |  29 +++
 apps/user_ldap/l10n/sr.json             |  27 +++
 apps/user_ldap/l10n/sr.php              |  28 ---
 apps/user_ldap/l10n/sr@latin.js         |  13 ++
 apps/user_ldap/l10n/sr@latin.json       |  11 ++
 apps/user_ldap/l10n/sr@latin.php        |  12 --
 apps/user_ldap/l10n/su.js               |   7 +
 apps/user_ldap/l10n/su.json             |   5 +
 apps/user_ldap/l10n/su.php              |   6 -
 apps/user_ldap/l10n/sv.js               | 128 +++++++++++++
 apps/user_ldap/l10n/sv.json             | 126 +++++++++++++
 apps/user_ldap/l10n/sv.php              | 127 -------------
 apps/user_ldap/l10n/sw_KE.js            |   7 +
 apps/user_ldap/l10n/sw_KE.json          |   5 +
 apps/user_ldap/l10n/sw_KE.php           |   6 -
 apps/user_ldap/l10n/ta_IN.js            |   7 +
 apps/user_ldap/l10n/ta_IN.json          |   5 +
 apps/user_ldap/l10n/ta_IN.php           |   6 -
 apps/user_ldap/l10n/ta_LK.js            |  28 +++
 apps/user_ldap/l10n/ta_LK.json          |  26 +++
 apps/user_ldap/l10n/ta_LK.php           |  27 ---
 apps/user_ldap/l10n/te.js               |  13 ++
 apps/user_ldap/l10n/te.json             |  11 ++
 apps/user_ldap/l10n/te.php              |  12 --
 apps/user_ldap/l10n/tg_TJ.js            |   7 +
 apps/user_ldap/l10n/tg_TJ.json          |   5 +
 apps/user_ldap/l10n/tg_TJ.php           |   6 -
 apps/user_ldap/l10n/th_TH.js            |  54 ++++++
 apps/user_ldap/l10n/th_TH.json          |  52 +++++
 apps/user_ldap/l10n/th_TH.php           |  53 ------
 apps/user_ldap/l10n/tl_PH.js            |   7 +
 apps/user_ldap/l10n/tl_PH.json          |   5 +
 apps/user_ldap/l10n/tl_PH.php           |   6 -
 apps/user_ldap/l10n/tr.js               | 132 +++++++++++++
 apps/user_ldap/l10n/tr.json             | 130 +++++++++++++
 apps/user_ldap/l10n/tr.php              | 131 -------------
 apps/user_ldap/l10n/tzm.js              |   7 +
 apps/user_ldap/l10n/tzm.json            |   5 +
 apps/user_ldap/l10n/tzm.php             |   6 -
 apps/user_ldap/l10n/ug.js               |  18 ++
 apps/user_ldap/l10n/ug.json             |  16 ++
 apps/user_ldap/l10n/ug.php              |  17 --
 apps/user_ldap/l10n/uk.js               | 132 +++++++++++++
 apps/user_ldap/l10n/uk.json             | 130 +++++++++++++
 apps/user_ldap/l10n/uk.php              | 131 -------------
 apps/user_ldap/l10n/ur_PK.js            |  13 ++
 apps/user_ldap/l10n/ur_PK.json          |  11 ++
 apps/user_ldap/l10n/ur_PK.php           |  12 --
 apps/user_ldap/l10n/uz.js               |   7 +
 apps/user_ldap/l10n/uz.json             |   5 +
 apps/user_ldap/l10n/uz.php              |   6 -
 apps/user_ldap/l10n/vi.js               |  42 +++++
 apps/user_ldap/l10n/vi.json             |  40 ++++
 apps/user_ldap/l10n/vi.php              |  41 ----
 apps/user_ldap/l10n/zh_CN.js            |  85 +++++++++
 apps/user_ldap/l10n/zh_CN.json          |  83 ++++++++
 apps/user_ldap/l10n/zh_CN.php           |  84 ---------
 apps/user_ldap/l10n/zh_HK.js            |  14 ++
 apps/user_ldap/l10n/zh_HK.json          |  12 ++
 apps/user_ldap/l10n/zh_HK.php           |  13 --
 apps/user_ldap/l10n/zh_TW.js            |  70 +++++++
 apps/user_ldap/l10n/zh_TW.json          |  68 +++++++
 apps/user_ldap/l10n/zh_TW.php           |  69 -------
 apps/user_webdavauth/l10n/ar.js         |   9 +
 apps/user_webdavauth/l10n/ar.json       |   7 +
 apps/user_webdavauth/l10n/ar.php        |   8 -
 apps/user_webdavauth/l10n/ast.js        |   9 +
 apps/user_webdavauth/l10n/ast.json      |   7 +
 apps/user_webdavauth/l10n/ast.php       |   8 -
 apps/user_webdavauth/l10n/az.js         |   9 +
 apps/user_webdavauth/l10n/az.json       |   7 +
 apps/user_webdavauth/l10n/az.php        |   8 -
 apps/user_webdavauth/l10n/bg_BG.js      |   9 +
 apps/user_webdavauth/l10n/bg_BG.json    |   7 +
 apps/user_webdavauth/l10n/bg_BG.php     |   8 -
 apps/user_webdavauth/l10n/bn_BD.js      |   9 +
 apps/user_webdavauth/l10n/bn_BD.json    |   7 +
 apps/user_webdavauth/l10n/bn_BD.php     |   8 -
 apps/user_webdavauth/l10n/bn_IN.js      |   9 +
 apps/user_webdavauth/l10n/bn_IN.json    |   7 +
 apps/user_webdavauth/l10n/bn_IN.php     |   8 -
 apps/user_webdavauth/l10n/bs.js         |   6 +
 apps/user_webdavauth/l10n/bs.json       |   4 +
 apps/user_webdavauth/l10n/bs.php        |   5 -
 apps/user_webdavauth/l10n/ca.js         |   9 +
 apps/user_webdavauth/l10n/ca.json       |   7 +
 apps/user_webdavauth/l10n/ca.php        |   8 -
 apps/user_webdavauth/l10n/cs_CZ.js      |   9 +
 apps/user_webdavauth/l10n/cs_CZ.json    |   7 +
 apps/user_webdavauth/l10n/cs_CZ.php     |   8 -
 apps/user_webdavauth/l10n/cy_GB.js      |   6 +
 apps/user_webdavauth/l10n/cy_GB.json    |   4 +
 apps/user_webdavauth/l10n/cy_GB.php     |   5 -
 apps/user_webdavauth/l10n/da.js         |   9 +
 apps/user_webdavauth/l10n/da.json       |   7 +
 apps/user_webdavauth/l10n/da.php        |   8 -
 apps/user_webdavauth/l10n/de.js         |   9 +
 apps/user_webdavauth/l10n/de.json       |   7 +
 apps/user_webdavauth/l10n/de.php        |   8 -
 apps/user_webdavauth/l10n/de_AT.js      |   6 +
 apps/user_webdavauth/l10n/de_AT.json    |   4 +
 apps/user_webdavauth/l10n/de_AT.php     |   5 -
 apps/user_webdavauth/l10n/de_CH.js      |   8 +
 apps/user_webdavauth/l10n/de_CH.json    |   6 +
 apps/user_webdavauth/l10n/de_CH.php     |   7 -
 apps/user_webdavauth/l10n/de_DE.js      |   9 +
 apps/user_webdavauth/l10n/de_DE.json    |   7 +
 apps/user_webdavauth/l10n/de_DE.php     |   8 -
 apps/user_webdavauth/l10n/el.js         |   9 +
 apps/user_webdavauth/l10n/el.json       |   7 +
 apps/user_webdavauth/l10n/el.php        |   8 -
 apps/user_webdavauth/l10n/en_GB.js      |   9 +
 apps/user_webdavauth/l10n/en_GB.json    |   7 +
 apps/user_webdavauth/l10n/en_GB.php     |   8 -
 apps/user_webdavauth/l10n/eo.js         |   7 +
 apps/user_webdavauth/l10n/eo.json       |   5 +
 apps/user_webdavauth/l10n/eo.php        |   6 -
 apps/user_webdavauth/l10n/es.js         |   9 +
 apps/user_webdavauth/l10n/es.json       |   7 +
 apps/user_webdavauth/l10n/es.php        |   8 -
 apps/user_webdavauth/l10n/es_AR.js      |   8 +
 apps/user_webdavauth/l10n/es_AR.json    |   6 +
 apps/user_webdavauth/l10n/es_AR.php     |   7 -
 apps/user_webdavauth/l10n/es_MX.js      |   8 +
 apps/user_webdavauth/l10n/es_MX.json    |   6 +
 apps/user_webdavauth/l10n/es_MX.php     |   7 -
 apps/user_webdavauth/l10n/et_EE.js      |   9 +
 apps/user_webdavauth/l10n/et_EE.json    |   7 +
 apps/user_webdavauth/l10n/et_EE.php     |   8 -
 apps/user_webdavauth/l10n/eu.js         |   9 +
 apps/user_webdavauth/l10n/eu.json       |   7 +
 apps/user_webdavauth/l10n/eu.php        |   8 -
 apps/user_webdavauth/l10n/eu_ES.js      |   6 +
 apps/user_webdavauth/l10n/eu_ES.json    |   4 +
 apps/user_webdavauth/l10n/eu_ES.php     |   5 -
 apps/user_webdavauth/l10n/fa.js         |   9 +
 apps/user_webdavauth/l10n/fa.json       |   7 +
 apps/user_webdavauth/l10n/fa.php        |   8 -
 apps/user_webdavauth/l10n/fi_FI.js      |   9 +
 apps/user_webdavauth/l10n/fi_FI.json    |   7 +
 apps/user_webdavauth/l10n/fi_FI.php     |   8 -
 apps/user_webdavauth/l10n/fr.js         |   9 +
 apps/user_webdavauth/l10n/fr.json       |   7 +
 apps/user_webdavauth/l10n/fr.php        |   8 -
 apps/user_webdavauth/l10n/gl.js         |   9 +
 apps/user_webdavauth/l10n/gl.json       |   7 +
 apps/user_webdavauth/l10n/gl.php        |   8 -
 apps/user_webdavauth/l10n/he.js         |   7 +
 apps/user_webdavauth/l10n/he.json       |   5 +
 apps/user_webdavauth/l10n/he.php        |   6 -
 apps/user_webdavauth/l10n/hi.js         |   6 +
 apps/user_webdavauth/l10n/hi.json       |   4 +
 apps/user_webdavauth/l10n/hi.php        |   5 -
 apps/user_webdavauth/l10n/hr.js         |   6 +
 apps/user_webdavauth/l10n/hr.json       |   4 +
 apps/user_webdavauth/l10n/hr.php        |   5 -
 apps/user_webdavauth/l10n/hu_HU.js      |   9 +
 apps/user_webdavauth/l10n/hu_HU.json    |   7 +
 apps/user_webdavauth/l10n/hu_HU.php     |   8 -
 apps/user_webdavauth/l10n/hy.js         |   6 +
 apps/user_webdavauth/l10n/hy.json       |   4 +
 apps/user_webdavauth/l10n/hy.php        |   5 -
 apps/user_webdavauth/l10n/ia.js         |   6 +
 apps/user_webdavauth/l10n/ia.json       |   4 +
 apps/user_webdavauth/l10n/ia.php        |   5 -
 apps/user_webdavauth/l10n/id.js         |   8 +
 apps/user_webdavauth/l10n/id.json       |   6 +
 apps/user_webdavauth/l10n/id.php        |   7 -
 apps/user_webdavauth/l10n/is.js         |   7 +
 apps/user_webdavauth/l10n/is.json       |   5 +
 apps/user_webdavauth/l10n/is.php        |   6 -
 apps/user_webdavauth/l10n/it.js         |   9 +
 apps/user_webdavauth/l10n/it.json       |   7 +
 apps/user_webdavauth/l10n/it.php        |   8 -
 apps/user_webdavauth/l10n/ja.js         |   9 +
 apps/user_webdavauth/l10n/ja.json       |   7 +
 apps/user_webdavauth/l10n/ja.php        |   8 -
 apps/user_webdavauth/l10n/ka_GE.js      |   7 +
 apps/user_webdavauth/l10n/ka_GE.json    |   5 +
 apps/user_webdavauth/l10n/ka_GE.php     |   6 -
 apps/user_webdavauth/l10n/km.js         |   8 +
 apps/user_webdavauth/l10n/km.json       |   6 +
 apps/user_webdavauth/l10n/km.php        |   7 -
 apps/user_webdavauth/l10n/ko.js         |   8 +
 apps/user_webdavauth/l10n/ko.json       |   6 +
 apps/user_webdavauth/l10n/ko.php        |   7 -
 apps/user_webdavauth/l10n/ku_IQ.js      |   6 +
 apps/user_webdavauth/l10n/ku_IQ.json    |   4 +
 apps/user_webdavauth/l10n/ku_IQ.php     |   5 -
 apps/user_webdavauth/l10n/lb.js         |   6 +
 apps/user_webdavauth/l10n/lb.json       |   4 +
 apps/user_webdavauth/l10n/lb.php        |   5 -
 apps/user_webdavauth/l10n/lt_LT.js      |   9 +
 apps/user_webdavauth/l10n/lt_LT.json    |   7 +
 apps/user_webdavauth/l10n/lt_LT.php     |   8 -
 apps/user_webdavauth/l10n/lv.js         |   7 +
 apps/user_webdavauth/l10n/lv.json       |   5 +
 apps/user_webdavauth/l10n/lv.php        |   6 -
 apps/user_webdavauth/l10n/mk.js         |   6 +
 apps/user_webdavauth/l10n/mk.json       |   4 +
 apps/user_webdavauth/l10n/mk.php        |   5 -
 apps/user_webdavauth/l10n/ms_MY.js      |   9 +
 apps/user_webdavauth/l10n/ms_MY.json    |   7 +
 apps/user_webdavauth/l10n/ms_MY.php     |   8 -
 apps/user_webdavauth/l10n/nb_NO.js      |   9 +
 apps/user_webdavauth/l10n/nb_NO.json    |   7 +
 apps/user_webdavauth/l10n/nb_NO.php     |   8 -
 apps/user_webdavauth/l10n/nl.js         |   9 +
 apps/user_webdavauth/l10n/nl.json       |   7 +
 apps/user_webdavauth/l10n/nl.php        |   8 -
 apps/user_webdavauth/l10n/nn_NO.js      |   8 +
 apps/user_webdavauth/l10n/nn_NO.json    |   6 +
 apps/user_webdavauth/l10n/nn_NO.php     |   7 -
 apps/user_webdavauth/l10n/oc.js         |   6 +
 apps/user_webdavauth/l10n/oc.json       |   4 +
 apps/user_webdavauth/l10n/oc.php        |   5 -
 apps/user_webdavauth/l10n/pl.js         |   9 +
 apps/user_webdavauth/l10n/pl.json       |   7 +
 apps/user_webdavauth/l10n/pl.php        |   8 -
 apps/user_webdavauth/l10n/pt_BR.js      |   9 +
 apps/user_webdavauth/l10n/pt_BR.json    |   7 +
 apps/user_webdavauth/l10n/pt_BR.php     |   8 -
 apps/user_webdavauth/l10n/pt_PT.js      |   9 +
 apps/user_webdavauth/l10n/pt_PT.json    |   7 +
 apps/user_webdavauth/l10n/pt_PT.php     |   8 -
 apps/user_webdavauth/l10n/ro.js         |   7 +
 apps/user_webdavauth/l10n/ro.json       |   5 +
 apps/user_webdavauth/l10n/ro.php        |   6 -
 apps/user_webdavauth/l10n/ru.js         |   9 +
 apps/user_webdavauth/l10n/ru.json       |   7 +
 apps/user_webdavauth/l10n/ru.php        |   8 -
 apps/user_webdavauth/l10n/si_LK.js      |   6 +
 apps/user_webdavauth/l10n/si_LK.json    |   4 +
 apps/user_webdavauth/l10n/si_LK.php     |   5 -
 apps/user_webdavauth/l10n/sk_SK.js      |   9 +
 apps/user_webdavauth/l10n/sk_SK.json    |   7 +
 apps/user_webdavauth/l10n/sk_SK.php     |   8 -
 apps/user_webdavauth/l10n/sl.js         |   9 +
 apps/user_webdavauth/l10n/sl.json       |   7 +
 apps/user_webdavauth/l10n/sl.php        |   8 -
 apps/user_webdavauth/l10n/sq.js         |   6 +
 apps/user_webdavauth/l10n/sq.json       |   4 +
 apps/user_webdavauth/l10n/sq.php        |   5 -
 apps/user_webdavauth/l10n/sr.js         |   7 +
 apps/user_webdavauth/l10n/sr.json       |   5 +
 apps/user_webdavauth/l10n/sr.php        |   6 -
 apps/user_webdavauth/l10n/sr@latin.js   |   6 +
 apps/user_webdavauth/l10n/sr@latin.json |   4 +
 apps/user_webdavauth/l10n/sr@latin.php  |   5 -
 apps/user_webdavauth/l10n/sv.js         |   9 +
 apps/user_webdavauth/l10n/sv.json       |   7 +
 apps/user_webdavauth/l10n/sv.php        |   8 -
 apps/user_webdavauth/l10n/ta_LK.js      |   6 +
 apps/user_webdavauth/l10n/ta_LK.json    |   4 +
 apps/user_webdavauth/l10n/ta_LK.php     |   5 -
 apps/user_webdavauth/l10n/te.js         |   6 +
 apps/user_webdavauth/l10n/te.json       |   4 +
 apps/user_webdavauth/l10n/te.php        |   5 -
 apps/user_webdavauth/l10n/th_TH.js      |   7 +
 apps/user_webdavauth/l10n/th_TH.json    |   5 +
 apps/user_webdavauth/l10n/th_TH.php     |   6 -
 apps/user_webdavauth/l10n/tr.js         |   9 +
 apps/user_webdavauth/l10n/tr.json       |   7 +
 apps/user_webdavauth/l10n/tr.php        |   8 -
 apps/user_webdavauth/l10n/ug.js         |   7 +
 apps/user_webdavauth/l10n/ug.json       |   5 +
 apps/user_webdavauth/l10n/ug.php        |   6 -
 apps/user_webdavauth/l10n/uk.js         |   9 +
 apps/user_webdavauth/l10n/uk.json       |   7 +
 apps/user_webdavauth/l10n/uk.php        |   8 -
 apps/user_webdavauth/l10n/ur_PK.js      |   6 +
 apps/user_webdavauth/l10n/ur_PK.json    |   4 +
 apps/user_webdavauth/l10n/ur_PK.php     |   5 -
 apps/user_webdavauth/l10n/vi.js         |   8 +
 apps/user_webdavauth/l10n/vi.json       |   6 +
 apps/user_webdavauth/l10n/vi.php        |   7 -
 apps/user_webdavauth/l10n/zh_CN.js      |   9 +
 apps/user_webdavauth/l10n/zh_CN.json    |   7 +
 apps/user_webdavauth/l10n/zh_CN.php     |   8 -
 apps/user_webdavauth/l10n/zh_HK.js      |   9 +
 apps/user_webdavauth/l10n/zh_HK.json    |   7 +
 apps/user_webdavauth/l10n/zh_HK.php     |   8 -
 apps/user_webdavauth/l10n/zh_TW.js      |   8 +
 apps/user_webdavauth/l10n/zh_TW.json    |   6 +
 apps/user_webdavauth/l10n/zh_TW.php     |   7 -
 core/l10n/ach.js                        |   6 +
 core/l10n/ach.json                      |   4 +
 core/l10n/ach.php                       |   5 -
 core/l10n/ady.js                        |   6 +
 core/l10n/ady.json                      |   4 +
 core/l10n/ady.php                       |   5 -
 core/l10n/af_ZA.js                      | 129 +++++++++++++
 core/l10n/af_ZA.json                    | 127 +++++++++++++
 core/l10n/af_ZA.php                     | 128 -------------
 core/l10n/ak.js                         |   6 +
 core/l10n/ak.json                       |   4 +
 core/l10n/ak.php                        |   5 -
 core/l10n/am_ET.js                      |   6 +
 core/l10n/am_ET.json                    |   4 +
 core/l10n/am_ET.php                     |   5 -
 core/l10n/ar.js                         | 110 +++++++++++
 core/l10n/ar.json                       | 108 +++++++++++
 core/l10n/ar.php                        | 109 -----------
 core/l10n/ast.js                        | 189 +++++++++++++++++++
 core/l10n/ast.json                      | 187 ++++++++++++++++++
 core/l10n/ast.php                       | 188 -------------------
 core/l10n/az.js                         |  49 +++++
 core/l10n/az.json                       |  47 +++++
 core/l10n/az.php                        |  48 -----
 core/l10n/be.js                         |  33 ++++
 core/l10n/be.json                       |  31 +++
 core/l10n/be.php                        |  32 ----
 core/l10n/bg_BG.js                      | 212 +++++++++++++++++++++
 core/l10n/bg_BG.json                    | 210 +++++++++++++++++++++
 core/l10n/bg_BG.php                     | 211 ---------------------
 core/l10n/bn_BD.js                      | 120 ++++++++++++
 core/l10n/bn_BD.json                    | 118 ++++++++++++
 core/l10n/bn_BD.php                     | 119 ------------
 core/l10n/bn_IN.js                      |  17 ++
 core/l10n/bn_IN.json                    |  15 ++
 core/l10n/bn_IN.php                     |  16 --
 core/l10n/bs.js                         |  10 +
 core/l10n/bs.json                       |   8 +
 core/l10n/bs.php                        |   9 -
 core/l10n/ca.js                         | 205 ++++++++++++++++++++
 core/l10n/ca.json                       | 203 ++++++++++++++++++++
 core/l10n/ca.php                        | 204 --------------------
 core/l10n/ca@valencia.js                |   6 +
 core/l10n/ca@valencia.json              |   4 +
 core/l10n/ca@valencia.php               |   5 -
 core/l10n/cs_CZ.js                      | 212 +++++++++++++++++++++
 core/l10n/cs_CZ.json                    | 210 +++++++++++++++++++++
 core/l10n/cs_CZ.php                     | 211 ---------------------
 core/l10n/cy_GB.js                      |  95 ++++++++++
 core/l10n/cy_GB.json                    |  93 +++++++++
 core/l10n/cy_GB.php                     |  94 ----------
 core/l10n/da.js                         | 212 +++++++++++++++++++++
 core/l10n/da.json                       | 210 +++++++++++++++++++++
 core/l10n/da.php                        | 211 ---------------------
 core/l10n/de.js                         | 212 +++++++++++++++++++++
 core/l10n/de.json                       | 210 +++++++++++++++++++++
 core/l10n/de.php                        | 211 ---------------------
 core/l10n/de_AT.js                      |  38 ++++
 core/l10n/de_AT.json                    |  36 ++++
 core/l10n/de_AT.php                     |  37 ----
 core/l10n/de_CH.js                      | 108 +++++++++++
 core/l10n/de_CH.json                    | 106 +++++++++++
 core/l10n/de_CH.php                     | 107 -----------
 core/l10n/de_DE.js                      | 212 +++++++++++++++++++++
 core/l10n/de_DE.json                    | 210 +++++++++++++++++++++
 core/l10n/de_DE.php                     | 211 ---------------------
 core/l10n/el.js                         | 212 +++++++++++++++++++++
 core/l10n/el.json                       | 210 +++++++++++++++++++++
 core/l10n/el.php                        | 211 ---------------------
 core/l10n/en@pirate.js                  |   7 +
 core/l10n/en@pirate.json                |   5 +
 core/l10n/en@pirate.php                 |   6 -
 core/l10n/en_GB.js                      | 212 +++++++++++++++++++++
 core/l10n/en_GB.json                    | 210 +++++++++++++++++++++
 core/l10n/en_GB.php                     | 211 ---------------------
 core/l10n/en_NZ.js                      |   6 +
 core/l10n/en_NZ.json                    |   4 +
 core/l10n/en_NZ.php                     |   5 -
 core/l10n/eo.js                         | 128 +++++++++++++
 core/l10n/eo.json                       | 126 +++++++++++++
 core/l10n/eo.php                        | 127 -------------
 core/l10n/es.js                         | 212 +++++++++++++++++++++
 core/l10n/es.json                       | 210 +++++++++++++++++++++
 core/l10n/es.php                        | 211 ---------------------
 core/l10n/es_AR.js                      | 155 +++++++++++++++
 core/l10n/es_AR.json                    | 153 +++++++++++++++
 core/l10n/es_AR.php                     | 154 ---------------
 core/l10n/es_BO.js                      |   6 +
 core/l10n/es_BO.json                    |   4 +
 core/l10n/es_BO.php                     |   5 -
 core/l10n/es_CL.js                      |  48 +++++
 core/l10n/es_CL.json                    |  46 +++++
 core/l10n/es_CL.php                     |  47 -----
 core/l10n/es_CO.js                      |   6 +
 core/l10n/es_CO.json                    |   4 +
 core/l10n/es_CO.php                     |   5 -
 core/l10n/es_CR.js                      |   6 +
 core/l10n/es_CR.json                    |   4 +
 core/l10n/es_CR.php                     |   5 -
 core/l10n/es_EC.js                      |   6 +
 core/l10n/es_EC.json                    |   4 +
 core/l10n/es_EC.php                     |   5 -
 core/l10n/es_MX.js                      | 148 +++++++++++++++
 core/l10n/es_MX.json                    | 146 ++++++++++++++
 core/l10n/es_MX.php                     | 147 ---------------
 core/l10n/es_PE.js                      |   6 +
 core/l10n/es_PE.json                    |   4 +
 core/l10n/es_PE.php                     |   5 -
 core/l10n/es_PY.js                      |   6 +
 core/l10n/es_PY.json                    |   4 +
 core/l10n/es_PY.php                     |   5 -
 core/l10n/es_US.js                      |   6 +
 core/l10n/es_US.json                    |   4 +
 core/l10n/es_US.php                     |   5 -
 core/l10n/es_UY.js                      |   6 +
 core/l10n/es_UY.json                    |   4 +
 core/l10n/es_UY.php                     |   5 -
 core/l10n/et_EE.js                      | 212 +++++++++++++++++++++
 core/l10n/et_EE.json                    | 210 +++++++++++++++++++++
 core/l10n/et_EE.php                     | 211 ---------------------
 core/l10n/eu.js                         | 192 +++++++++++++++++++
 core/l10n/eu.json                       | 190 +++++++++++++++++++
 core/l10n/eu.php                        | 211 ---------------------
 core/l10n/eu_ES.js                      |   9 +
 core/l10n/eu_ES.json                    |   7 +
 core/l10n/eu_ES.php                     |   8 -
 core/l10n/fa.js                         | 152 +++++++++++++++
 core/l10n/fa.json                       | 150 +++++++++++++++
 core/l10n/fa.php                        | 151 ---------------
 core/l10n/fi_FI.js                      | 211 +++++++++++++++++++++
 core/l10n/fi_FI.json                    | 209 +++++++++++++++++++++
 core/l10n/fi_FI.php                     | 210 ---------------------
 core/l10n/fil.js                        |   6 +
 core/l10n/fil.json                      |   4 +
 core/l10n/fil.php                       |   5 -
 core/l10n/fr.js                         | 212 +++++++++++++++++++++
 core/l10n/fr.json                       | 210 +++++++++++++++++++++
 core/l10n/fr.php                        | 211 ---------------------
 core/l10n/fr_CA.js                      |   6 +
 core/l10n/fr_CA.json                    |   4 +
 core/l10n/fr_CA.php                     |   5 -
 core/l10n/fy_NL.js                      |   6 +
 core/l10n/fy_NL.json                    |   4 +
 core/l10n/fy_NL.php                     |   5 -
 core/l10n/gl.js                         | 188 +++++++++++++++++++
 core/l10n/gl.json                       | 186 ++++++++++++++++++
 core/l10n/gl.php                        | 187 ------------------
 core/l10n/gu.js                         |   6 +
 core/l10n/gu.json                       |   4 +
 core/l10n/gu.php                        |   5 -
 core/l10n/he.js                         | 100 ++++++++++
 core/l10n/he.json                       |  98 ++++++++++
 core/l10n/he.php                        |  99 ----------
 core/l10n/hi.js                         |  53 ++++++
 core/l10n/hi.json                       |  51 +++++
 core/l10n/hi.php                        |  52 -----
 core/l10n/hr.js                         | 193 +++++++++++++++++++
 core/l10n/hr.json                       | 191 +++++++++++++++++++
 core/l10n/hr.php                        | 192 -------------------
 core/l10n/hu_HU.js                      | 205 ++++++++++++++++++++
 core/l10n/hu_HU.json                    | 203 ++++++++++++++++++++
 core/l10n/hu_HU.php                     | 204 --------------------
 core/l10n/hy.js                         |  26 +++
 core/l10n/hy.json                       |  24 +++
 core/l10n/hy.php                        |  25 ---
 core/l10n/ia.js                         | 161 ++++++++++++++++
 core/l10n/ia.json                       | 159 ++++++++++++++++
 core/l10n/ia.php                        | 160 ----------------
 core/l10n/id.js                         | 212 +++++++++++++++++++++
 core/l10n/id.json                       | 210 +++++++++++++++++++++
 core/l10n/id.php                        | 211 ---------------------
 core/l10n/io.js                         |   6 +
 core/l10n/io.json                       |   4 +
 core/l10n/io.php                        |   5 -
 core/l10n/is.js                         |  90 +++++++++
 core/l10n/is.json                       |  88 +++++++++
 core/l10n/is.php                        |  89 ---------
 core/l10n/it.js                         | 212 +++++++++++++++++++++
 core/l10n/it.json                       | 210 +++++++++++++++++++++
 core/l10n/it.php                        | 211 ---------------------
 core/l10n/ja.js                         | 211 +++++++++++++++++++++
 core/l10n/ja.json                       | 209 +++++++++++++++++++++
 core/l10n/ja.php                        | 210 ---------------------
 core/l10n/jv.js                         |   6 +
 core/l10n/jv.json                       |   4 +
 core/l10n/jv.php                        |   5 -
 core/l10n/ka_GE.js                      |  96 ++++++++++
 core/l10n/ka_GE.json                    |  94 ++++++++++
 core/l10n/ka_GE.php                     |  95 ----------
 core/l10n/km.js                         | 102 ++++++++++
 core/l10n/km.json                       | 100 ++++++++++
 core/l10n/km.php                        | 101 ----------
 core/l10n/kn.js                         |   6 +
 core/l10n/kn.json                       |   4 +
 core/l10n/kn.php                        |   5 -
 core/l10n/ko.js                         | 163 ++++++++++++++++
 core/l10n/ko.json                       | 161 ++++++++++++++++
 core/l10n/ko.php                        | 162 ----------------
 core/l10n/ku_IQ.js                      |  31 +++
 core/l10n/ku_IQ.json                    |  29 +++
 core/l10n/ku_IQ.php                     |  30 ---
 core/l10n/lb.js                         | 121 ++++++++++++
 core/l10n/lb.json                       | 119 ++++++++++++
 core/l10n/lb.php                        | 120 ------------
 core/l10n/lt_LT.js                      | 148 +++++++++++++++
 core/l10n/lt_LT.json                    | 146 ++++++++++++++
 core/l10n/lt_LT.php                     | 147 ---------------
 core/l10n/lv.js                         | 103 ++++++++++
 core/l10n/lv.json                       | 101 ++++++++++
 core/l10n/lv.php                        | 102 ----------
 core/l10n/mg.js                         |   6 +
 core/l10n/mg.json                       |   4 +
 core/l10n/mg.php                        |   5 -
 core/l10n/mk.js                         | 131 +++++++++++++
 core/l10n/mk.json                       | 129 +++++++++++++
 core/l10n/mk.php                        | 130 -------------
 core/l10n/ml.js                         |   6 +
 core/l10n/ml.json                       |   4 +
 core/l10n/ml.php                        |   5 -
 core/l10n/ml_IN.js                      |   6 +
 core/l10n/ml_IN.json                    |   4 +
 core/l10n/ml_IN.php                     |   5 -
 core/l10n/mn.js                         |   6 +
 core/l10n/mn.json                       |   4 +
 core/l10n/mn.php                        |   5 -
 core/l10n/ms_MY.js                      |  64 +++++++
 core/l10n/ms_MY.json                    |  62 ++++++
 core/l10n/ms_MY.php                     |  63 -------
 core/l10n/mt_MT.js                      |   6 +
 core/l10n/mt_MT.json                    |   4 +
 core/l10n/mt_MT.php                     |   5 -
 core/l10n/my_MM.js                      |  48 +++++
 core/l10n/my_MM.json                    |  46 +++++
 core/l10n/my_MM.php                     |  47 -----
 core/l10n/nb_NO.js                      | 211 +++++++++++++++++++++
 core/l10n/nb_NO.json                    | 209 +++++++++++++++++++++
 core/l10n/nb_NO.php                     | 210 ---------------------
 core/l10n/nds.js                        |   6 +
 core/l10n/nds.json                      |   4 +
 core/l10n/nds.php                       |   5 -
 core/l10n/ne.js                         |   6 +
 core/l10n/ne.json                       |   4 +
 core/l10n/ne.php                        |   5 -
 core/l10n/nl.js                         | 212 +++++++++++++++++++++
 core/l10n/nl.json                       | 210 +++++++++++++++++++++
 core/l10n/nl.php                        | 211 ---------------------
 core/l10n/nn_NO.js                      | 126 +++++++++++++
 core/l10n/nn_NO.json                    | 124 ++++++++++++
 core/l10n/nn_NO.php                     | 125 ------------
 core/l10n/nqo.js                        |   6 +
 core/l10n/nqo.json                      |   4 +
 core/l10n/nqo.php                       |   5 -
 core/l10n/oc.js                         |  79 ++++++++
 core/l10n/oc.json                       |  77 ++++++++
 core/l10n/oc.php                        |  78 --------
 core/l10n/or_IN.js                      |   6 +
 core/l10n/or_IN.json                    |   4 +
 core/l10n/or_IN.php                     |   5 -
 core/l10n/pa.js                         |  40 ++++
 core/l10n/pa.json                       |  38 ++++
 core/l10n/pa.php                        |  39 ----
 core/l10n/pl.js                         | 210 +++++++++++++++++++++
 core/l10n/pl.json                       | 208 ++++++++++++++++++++
 core/l10n/pl.php                        | 209 ---------------------
 core/l10n/pt_BR.js                      | 212 +++++++++++++++++++++
 core/l10n/pt_BR.json                    | 210 +++++++++++++++++++++
 core/l10n/pt_BR.php                     | 211 ---------------------
 core/l10n/pt_PT.js                      | 212 +++++++++++++++++++++
 core/l10n/pt_PT.json                    | 210 +++++++++++++++++++++
 core/l10n/pt_PT.php                     | 211 ---------------------
 core/l10n/ro.js                         | 140 ++++++++++++++
 core/l10n/ro.json                       | 138 ++++++++++++++
 core/l10n/ro.php                        | 139 --------------
 core/l10n/ru.js                         | 211 +++++++++++++++++++++
 core/l10n/ru.json                       | 209 +++++++++++++++++++++
 core/l10n/ru.php                        | 211 ---------------------
 core/l10n/si_LK.js                      |  74 ++++++++
 core/l10n/si_LK.json                    |  72 +++++++
 core/l10n/si_LK.php                     |  73 -------
 core/l10n/sk_SK.js                      | 190 +++++++++++++++++++
 core/l10n/sk_SK.json                    | 188 +++++++++++++++++++
 core/l10n/sk_SK.php                     | 189 -------------------
 core/l10n/sl.js                         | 212 +++++++++++++++++++++
 core/l10n/sl.json                       | 210 +++++++++++++++++++++
 core/l10n/sl.php                        | 211 ---------------------
 core/l10n/sq.js                         | 104 ++++++++++
 core/l10n/sq.json                       | 102 ++++++++++
 core/l10n/sq.php                        | 103 ----------
 core/l10n/sr.js                         |  88 +++++++++
 core/l10n/sr.json                       |  86 +++++++++
 core/l10n/sr.php                        |  87 ---------
 core/l10n/sr@latin.js                   | 100 ++++++++++
 core/l10n/sr@latin.json                 |  98 ++++++++++
 core/l10n/sr@latin.php                  |  99 ----------
 core/l10n/su.js                         |   6 +
 core/l10n/su.json                       |   4 +
 core/l10n/su.php                        |   5 -
 core/l10n/sv.js                         | 192 +++++++++++++++++++
 core/l10n/sv.json                       | 190 +++++++++++++++++++
 core/l10n/sv.php                        | 191 -------------------
 core/l10n/sw_KE.js                      |   6 +
 core/l10n/sw_KE.json                    |   4 +
 core/l10n/sw_KE.php                     |   5 -
 core/l10n/ta_IN.js                      |   8 +
 core/l10n/ta_IN.json                    |   6 +
 core/l10n/ta_IN.php                     |   7 -
 core/l10n/ta_LK.js                      |  84 +++++++++
 core/l10n/ta_LK.json                    |  82 ++++++++
 core/l10n/ta_LK.php                     |  83 --------
 core/l10n/te.js                         |  46 +++++
 core/l10n/te.json                       |  44 +++++
 core/l10n/te.php                        |  45 -----
 core/l10n/tg_TJ.js                      |   6 +
 core/l10n/tg_TJ.json                    |   4 +
 core/l10n/tg_TJ.php                     |   5 -
 core/l10n/th_TH.js                      |  93 +++++++++
 core/l10n/th_TH.json                    |  91 +++++++++
 core/l10n/th_TH.php                     |  92 ---------
 core/l10n/tl_PH.js                      |   6 +
 core/l10n/tl_PH.json                    |   4 +
 core/l10n/tl_PH.php                     |   5 -
 core/l10n/tr.js                         | 212 +++++++++++++++++++++
 core/l10n/tr.json                       | 210 +++++++++++++++++++++
 core/l10n/tr.php                        | 211 ---------------------
 core/l10n/tzm.js                        |   6 +
 core/l10n/tzm.json                      |   4 +
 core/l10n/tzm.php                       |   5 -
 core/l10n/ug.js                         |  52 +++++
 core/l10n/ug.json                       |  50 +++++
 core/l10n/ug.php                        |  51 -----
 core/l10n/uk.js                         | 212 +++++++++++++++++++++
 core/l10n/uk.json                       | 210 +++++++++++++++++++++
 core/l10n/uk.php                        | 211 ---------------------
 core/l10n/ur_PK.js                      | 127 +++++++++++++
 core/l10n/ur_PK.json                    | 125 ++++++++++++
 core/l10n/ur_PK.php                     | 126 -------------
 core/l10n/uz.js                         |   6 +
 core/l10n/uz.json                       |   4 +
 core/l10n/uz.php                        |   5 -
 core/l10n/vi.js                         | 144 ++++++++++++++
 core/l10n/vi.json                       | 142 ++++++++++++++
 core/l10n/vi.php                        | 143 --------------
 core/l10n/zh_CN.js                      | 211 +++++++++++++++++++++
 core/l10n/zh_CN.json                    | 209 +++++++++++++++++++++
 core/l10n/zh_CN.php                     | 210 ---------------------
 core/l10n/zh_HK.js                      |  80 ++++++++
 core/l10n/zh_HK.json                    |  78 ++++++++
 core/l10n/zh_HK.php                     |  79 --------
 core/l10n/zh_TW.js                      | 211 +++++++++++++++++++++
 core/l10n/zh_TW.json                    | 209 +++++++++++++++++++++
 core/l10n/zh_TW.php                     | 210 ---------------------
 lib/l10n/ach.js                         |   9 +
 lib/l10n/ach.json                       |   7 +
 lib/l10n/ach.php                        |   8 -
 lib/l10n/ady.js                         |   9 +
 lib/l10n/ady.json                       |   7 +
 lib/l10n/ady.php                        |   8 -
 lib/l10n/af_ZA.js                       |  18 ++
 lib/l10n/af_ZA.json                     |  16 ++
 lib/l10n/af_ZA.php                      |  17 --
 lib/l10n/ak.js                          |   9 +
 lib/l10n/ak.json                        |   7 +
 lib/l10n/ak.php                         |   8 -
 lib/l10n/am_ET.js                       |   9 +
 lib/l10n/am_ET.json                     |   7 +
 lib/l10n/am_ET.php                      |   8 -
 lib/l10n/ar.js                          |  53 ++++++
 lib/l10n/ar.json                        |  51 +++++
 lib/l10n/ar.php                         |  52 -----
 lib/l10n/ast.js                         | 119 ++++++++++++
 lib/l10n/ast.json                       | 117 ++++++++++++
 lib/l10n/ast.php                        | 118 ------------
 lib/l10n/az.js                          |  45 +++++
 lib/l10n/az.json                        |  43 +++++
 lib/l10n/az.php                         |  44 -----
 lib/l10n/be.js                          |  16 ++
 lib/l10n/be.json                        |  14 ++
 lib/l10n/be.php                         |  15 --
 lib/l10n/bg_BG.js                       | 124 ++++++++++++
 lib/l10n/bg_BG.json                     | 122 ++++++++++++
 lib/l10n/bg_BG.php                      | 123 ------------
 lib/l10n/bn_BD.js                       |  45 +++++
 lib/l10n/bn_BD.json                     |  43 +++++
 lib/l10n/bn_BD.php                      |  44 -----
 lib/l10n/bn_IN.js                       |  10 +
 lib/l10n/bn_IN.json                     |   8 +
 lib/l10n/bn_IN.php                      |   9 -
 lib/l10n/bs.js                          |   9 +
 lib/l10n/bs.json                        |   7 +
 lib/l10n/bs.php                         |   8 -
 lib/l10n/ca.js                          | 122 ++++++++++++
 lib/l10n/ca.json                        | 120 ++++++++++++
 lib/l10n/ca.php                         | 121 ------------
 lib/l10n/ca@valencia.js                 |   9 +
 lib/l10n/ca@valencia.json               |   7 +
 lib/l10n/ca@valencia.php                |   8 -
 lib/l10n/cs_CZ.js                       | 124 ++++++++++++
 lib/l10n/cs_CZ.json                     | 122 ++++++++++++
 lib/l10n/cs_CZ.php                      | 123 ------------
 lib/l10n/cy_GB.js                       |  37 ++++
 lib/l10n/cy_GB.json                     |  35 ++++
 lib/l10n/cy_GB.php                      |  36 ----
 lib/l10n/da.js                          | 124 ++++++++++++
 lib/l10n/da.json                        | 122 ++++++++++++
 lib/l10n/da.php                         | 123 ------------
 lib/l10n/de.js                          | 124 ++++++++++++
 lib/l10n/de.json                        | 122 ++++++++++++
 lib/l10n/de.php                         | 123 ------------
 lib/l10n/de_AT.js                       |  12 ++
 lib/l10n/de_AT.json                     |  10 +
 lib/l10n/de_AT.php                      |  11 --
 lib/l10n/de_CH.js                       |  44 +++++
 lib/l10n/de_CH.json                     |  42 +++++
 lib/l10n/de_CH.php                      |  43 -----
 lib/l10n/de_DE.js                       | 124 ++++++++++++
 lib/l10n/de_DE.json                     | 122 ++++++++++++
 lib/l10n/de_DE.php                      | 123 ------------
 lib/l10n/el.js                          | 124 ++++++++++++
 lib/l10n/el.json                        | 122 ++++++++++++
 lib/l10n/el.php                         | 123 ------------
 lib/l10n/en@pirate.js                   |  10 +
 lib/l10n/en@pirate.json                 |   8 +
 lib/l10n/en@pirate.php                  |   9 -
 lib/l10n/en_GB.js                       | 124 ++++++++++++
 lib/l10n/en_GB.json                     | 122 ++++++++++++
 lib/l10n/en_GB.php                      | 123 ------------
 lib/l10n/en_NZ.js                       |   9 +
 lib/l10n/en_NZ.json                     |   7 +
 lib/l10n/en_NZ.php                      |   8 -
 lib/l10n/eo.js                          |  56 ++++++
 lib/l10n/eo.json                        |  54 ++++++
 lib/l10n/eo.php                         |  55 ------
 lib/l10n/es.js                          | 124 ++++++++++++
 lib/l10n/es.json                        | 122 ++++++++++++
 lib/l10n/es.php                         | 123 ------------
 lib/l10n/es_AR.js                       |  56 ++++++
 lib/l10n/es_AR.json                     |  54 ++++++
 lib/l10n/es_AR.php                      |  55 ------
 lib/l10n/es_BO.js                       |   9 +
 lib/l10n/es_BO.json                     |   7 +
 lib/l10n/es_BO.php                      |   8 -
 lib/l10n/es_CL.js                       |  32 ++++
 lib/l10n/es_CL.json                     |  30 +++
 lib/l10n/es_CL.php                      |  31 ---
 lib/l10n/es_CO.js                       |   9 +
 lib/l10n/es_CO.json                     |   7 +
 lib/l10n/es_CO.php                      |   8 -
 lib/l10n/es_CR.js                       |   9 +
 lib/l10n/es_CR.json                     |   7 +
 lib/l10n/es_CR.php                      |   8 -
 lib/l10n/es_EC.js                       |   9 +
 lib/l10n/es_EC.json                     |   7 +
 lib/l10n/es_EC.php                      |   8 -
 lib/l10n/es_MX.js                       |  56 ++++++
 lib/l10n/es_MX.json                     |  54 ++++++
 lib/l10n/es_MX.php                      |  55 ------
 lib/l10n/es_PE.js                       |   9 +
 lib/l10n/es_PE.json                     |   7 +
 lib/l10n/es_PE.php                      |   8 -
 lib/l10n/es_PY.js                       |   9 +
 lib/l10n/es_PY.json                     |   7 +
 lib/l10n/es_PY.php                      |   8 -
 lib/l10n/es_US.js                       |   9 +
 lib/l10n/es_US.json                     |   7 +
 lib/l10n/es_US.php                      |   8 -
 lib/l10n/es_UY.js                       |   9 +
 lib/l10n/es_UY.json                     |   7 +
 lib/l10n/es_UY.php                      |   8 -
 lib/l10n/et_EE.js                       | 124 ++++++++++++
 lib/l10n/et_EE.json                     | 122 ++++++++++++
 lib/l10n/et_EE.php                      | 123 ------------
 lib/l10n/eu.js                          | 122 ++++++++++++
 lib/l10n/eu.json                        | 120 ++++++++++++
 lib/l10n/eu.php                         | 123 ------------
 lib/l10n/eu_ES.js                       |  10 +
 lib/l10n/eu_ES.json                     |   8 +
 lib/l10n/eu_ES.php                      |   9 -
 lib/l10n/fa.js                          |  43 +++++
 lib/l10n/fa.json                        |  41 ++++
 lib/l10n/fa.php                         |  42 -----
 lib/l10n/fi_FI.js                       | 110 +++++++++++
 lib/l10n/fi_FI.json                     | 108 +++++++++++
 lib/l10n/fi_FI.php                      | 109 -----------
 lib/l10n/fil.js                         |   9 +
 lib/l10n/fil.json                       |   7 +
 lib/l10n/fil.php                        |   8 -
 lib/l10n/fr.js                          | 124 ++++++++++++
 lib/l10n/fr.json                        | 122 ++++++++++++
 lib/l10n/fr.php                         | 123 ------------
 lib/l10n/fr_CA.js                       |   9 +
 lib/l10n/fr_CA.json                     |   7 +
 lib/l10n/fr_CA.php                      |   8 -
 lib/l10n/fy_NL.js                       |   9 +
 lib/l10n/fy_NL.json                     |   7 +
 lib/l10n/fy_NL.php                      |   8 -
 lib/l10n/gl.js                          | 120 ++++++++++++
 lib/l10n/gl.json                        | 118 ++++++++++++
 lib/l10n/gl.php                         | 119 ------------
 lib/l10n/gu.js                          |   9 +
 lib/l10n/gu.json                        |   7 +
 lib/l10n/gu.php                         |   8 -
 lib/l10n/he.js                          |  28 +++
 lib/l10n/he.json                        |  26 +++
 lib/l10n/he.php                         |  27 ---
 lib/l10n/hi.js                          |  13 ++
 lib/l10n/hi.json                        |  11 ++
 lib/l10n/hi.php                         |  12 --
 lib/l10n/hr.js                          | 122 ++++++++++++
 lib/l10n/hr.json                        | 120 ++++++++++++
 lib/l10n/hr.php                         | 121 ------------
 lib/l10n/hu_HU.js                       | 124 ++++++++++++
 lib/l10n/hu_HU.json                     | 122 ++++++++++++
 lib/l10n/hu_HU.php                      | 123 ------------
 lib/l10n/hy.js                          |   9 +
 lib/l10n/hy.json                        |   7 +
 lib/l10n/hy.php                         |   8 -
 lib/l10n/ia.js                          |  23 +++
 lib/l10n/ia.json                        |  21 +++
 lib/l10n/ia.php                         |  22 ---
 lib/l10n/id.js                          |  57 ++++++
 lib/l10n/id.json                        |  55 ++++++
 lib/l10n/id.php                         | 116 ------------
 lib/l10n/io.js                          |   9 +
 lib/l10n/io.json                        |   7 +
 lib/l10n/io.php                         |   8 -
 lib/l10n/is.js                          |  25 +++
 lib/l10n/is.json                        |  23 +++
 lib/l10n/is.php                         |  24 ---
 lib/l10n/it.js                          | 124 ++++++++++++
 lib/l10n/it.json                        | 122 ++++++++++++
 lib/l10n/it.php                         | 123 ------------
 lib/l10n/ja.js                          | 123 ++++++++++++
 lib/l10n/ja.json                        | 121 ++++++++++++
 lib/l10n/ja.php                         | 123 ------------
 lib/l10n/jv.js                          |   9 +
 lib/l10n/jv.json                        |   7 +
 lib/l10n/jv.php                         |   8 -
 lib/l10n/ka_GE.js                       |  39 ++++
 lib/l10n/ka_GE.json                     |  37 ++++
 lib/l10n/ka_GE.php                      |  38 ----
 lib/l10n/km.js                          |  40 ++++
 lib/l10n/km.json                        |  38 ++++
 lib/l10n/km.php                         |  39 ----
 lib/l10n/kn.js                          |   9 +
 lib/l10n/kn.json                        |   7 +
 lib/l10n/kn.php                         |   8 -
 lib/l10n/ko.js                          |  69 +++++++
 lib/l10n/ko.json                        |  67 +++++++
 lib/l10n/ko.php                         |  68 -------
 lib/l10n/ku_IQ.js                       |  14 ++
 lib/l10n/ku_IQ.json                     |  12 ++
 lib/l10n/ku_IQ.php                      |  13 --
 lib/l10n/lb.js                          |  25 +++
 lib/l10n/lb.json                        |  23 +++
 lib/l10n/lb.php                         |  24 ---
 lib/l10n/lt_LT.js                       |  56 ++++++
 lib/l10n/lt_LT.json                     |  54 ++++++
 lib/l10n/lt_LT.php                      |  55 ------
 lib/l10n/lv.js                          |  42 +++++
 lib/l10n/lv.json                        |  40 ++++
 lib/l10n/lv.php                         |  41 ----
 lib/l10n/mg.js                          |   9 +
 lib/l10n/mg.json                        |   7 +
 lib/l10n/mg.php                         |   8 -
 lib/l10n/mk.js                          |  42 +++++
 lib/l10n/mk.json                        |  40 ++++
 lib/l10n/mk.php                         |  41 ----
 lib/l10n/ml.js                          |   9 +
 lib/l10n/ml.json                        |   7 +
 lib/l10n/ml.php                         |   8 -
 lib/l10n/ml_IN.js                       |   9 +
 lib/l10n/ml_IN.json                     |   7 +
 lib/l10n/ml_IN.php                      |   8 -
 lib/l10n/mn.js                          |   9 +
 lib/l10n/mn.json                        |   7 +
 lib/l10n/mn.php                         |   8 -
 lib/l10n/ms_MY.js                       |  16 ++
 lib/l10n/ms_MY.json                     |  14 ++
 lib/l10n/ms_MY.php                      |  15 --
 lib/l10n/mt_MT.js                       |   9 +
 lib/l10n/mt_MT.json                     |   7 +
 lib/l10n/mt_MT.php                      |   8 -
 lib/l10n/my_MM.js                       |  21 +++
 lib/l10n/my_MM.json                     |  19 ++
 lib/l10n/my_MM.php                      |  20 --
 lib/l10n/nb_NO.js                       | 123 ++++++++++++
 lib/l10n/nb_NO.json                     | 121 ++++++++++++
 lib/l10n/nb_NO.php                      | 122 ------------
 lib/l10n/nds.js                         |   9 +
 lib/l10n/nds.json                       |   7 +
 lib/l10n/nds.php                        |   8 -
 lib/l10n/ne.js                          |   9 +
 lib/l10n/ne.json                        |   7 +
 lib/l10n/ne.php                         |   8 -
 lib/l10n/nl.js                          | 124 ++++++++++++
 lib/l10n/nl.json                        | 122 ++++++++++++
 lib/l10n/nl.php                         | 123 ------------
 lib/l10n/nn_NO.js                       |  27 +++
 lib/l10n/nn_NO.json                     |  25 +++
 lib/l10n/nn_NO.php                      |  26 ---
 lib/l10n/nqo.js                         |   9 +
 lib/l10n/nqo.json                       |   7 +
 lib/l10n/nqo.php                        |   8 -
 lib/l10n/oc.js                          |  22 +++
 lib/l10n/oc.json                        |  20 ++
 lib/l10n/oc.php                         |  21 ---
 lib/l10n/or_IN.js                       |   9 +
 lib/l10n/or_IN.json                     |   7 +
 lib/l10n/or_IN.php                      |   8 -
 lib/l10n/pa.js                          |  16 ++
 lib/l10n/pa.json                        |  14 ++
 lib/l10n/pa.php                         |  15 --
 lib/l10n/pl.js                          | 122 ++++++++++++
 lib/l10n/pl.json                        | 120 ++++++++++++
 lib/l10n/pl.php                         | 123 ------------
 lib/l10n/pt_BR.js                       | 124 ++++++++++++
 lib/l10n/pt_BR.json                     | 122 ++++++++++++
 lib/l10n/pt_BR.php                      | 123 ------------
 lib/l10n/pt_PT.js                       | 124 ++++++++++++
 lib/l10n/pt_PT.json                     | 122 ++++++++++++
 lib/l10n/pt_PT.php                      | 123 ------------
 lib/l10n/ro.js                          |  52 +++++
 lib/l10n/ro.json                        |  50 +++++
 lib/l10n/ro.php                         |  51 -----
 lib/l10n/ru.js                          | 123 ++++++++++++
 lib/l10n/ru.json                        | 121 ++++++++++++
 lib/l10n/ru.php                         | 122 ------------
 lib/l10n/si_LK.js                       |  24 +++
 lib/l10n/si_LK.json                     |  22 +++
 lib/l10n/si_LK.php                      |  23 ---
 lib/l10n/sk_SK.js                       | 122 ++++++++++++
 lib/l10n/sk_SK.json                     | 120 ++++++++++++
 lib/l10n/sk_SK.php                      | 121 ------------
 lib/l10n/sl.js                          | 103 ++++++++++
 lib/l10n/sl.json                        | 101 ++++++++++
 lib/l10n/sl.php                         | 123 ------------
 lib/l10n/sq.js                          |  40 ++++
 lib/l10n/sq.json                        |  38 ++++
 lib/l10n/sq.php                         |  39 ----
 lib/l10n/sr.js                          |  27 +++
 lib/l10n/sr.json                        |  25 +++
 lib/l10n/sr.php                         |  26 ---
 lib/l10n/sr@latin.js                    |  21 +++
 lib/l10n/sr@latin.json                  |  19 ++
 lib/l10n/sr@latin.php                   |  20 --
 lib/l10n/su.js                          |   9 +
 lib/l10n/su.json                        |   7 +
 lib/l10n/su.php                         |   8 -
 lib/l10n/sv.js                          | 111 +++++++++++
 lib/l10n/sv.json                        | 109 +++++++++++
 lib/l10n/sv.php                         | 110 -----------
 lib/l10n/sw_KE.js                       |   9 +
 lib/l10n/sw_KE.json                     |   7 +
 lib/l10n/sw_KE.php                      |   8 -
 lib/l10n/ta_IN.js                       |  10 +
 lib/l10n/ta_IN.json                     |   8 +
 lib/l10n/ta_IN.php                      |   9 -
 lib/l10n/ta_LK.js                       |  25 +++
 lib/l10n/ta_LK.json                     |  23 +++
 lib/l10n/ta_LK.php                      |  24 ---
 lib/l10n/te.js                          |  19 ++
 lib/l10n/te.json                        |  17 ++
 lib/l10n/te.php                         |  18 --
 lib/l10n/tg_TJ.js                       |   9 +
 lib/l10n/tg_TJ.json                     |   7 +
 lib/l10n/tg_TJ.php                      |   8 -
 lib/l10n/th_TH.js                       |  25 +++
 lib/l10n/th_TH.json                     |  23 +++
 lib/l10n/th_TH.php                      |  24 ---
 lib/l10n/tl_PH.js                       |   9 +
 lib/l10n/tl_PH.json                     |   7 +
 lib/l10n/tl_PH.php                      |   8 -
 lib/l10n/tr.js                          | 124 ++++++++++++
 lib/l10n/tr.json                        | 122 ++++++++++++
 lib/l10n/tr.php                         | 123 ------------
 lib/l10n/tzm.js                         |   9 +
 lib/l10n/tzm.json                       |   7 +
 lib/l10n/tzm.php                        |   8 -
 lib/l10n/ug.js                          |  18 ++
 lib/l10n/ug.json                        |  16 ++
 lib/l10n/ug.php                         |  17 --
 lib/l10n/uk.js                          |  54 ++++++
 lib/l10n/uk.json                        |  52 +++++
 lib/l10n/uk.php                         |  80 --------
 lib/l10n/ur_PK.js                       |  23 +++
 lib/l10n/ur_PK.json                     |  21 +++
 lib/l10n/ur_PK.php                      |  22 ---
 lib/l10n/uz.js                          |   9 +
 lib/l10n/uz.json                        |   7 +
 lib/l10n/uz.php                         |   8 -
 lib/l10n/vi.js                          |  28 +++
 lib/l10n/vi.json                        |  26 +++
 lib/l10n/vi.php                         |  27 ---
 lib/l10n/zh_CN.js                       | 108 +++++++++++
 lib/l10n/zh_CN.json                     | 106 +++++++++++
 lib/l10n/zh_CN.php                      | 107 -----------
 lib/l10n/zh_HK.js                       |  20 ++
 lib/l10n/zh_HK.json                     |  18 ++
 lib/l10n/zh_HK.php                      |  19 --
 lib/l10n/zh_TW.js                       | 123 ++++++++++++
 lib/l10n/zh_TW.json                     | 121 ++++++++++++
 lib/l10n/zh_TW.php                      | 122 ------------
 settings/l10n/af_ZA.js                  |  11 ++
 settings/l10n/af_ZA.json                |   9 +
 settings/l10n/af_ZA.php                 |  10 -
 settings/l10n/ar.js                     | 158 ++++++++++++++++
 settings/l10n/ar.json                   | 156 +++++++++++++++
 settings/l10n/ar.php                    | 157 ----------------
 settings/l10n/ast.js                    | 214 +++++++++++++++++++++
 settings/l10n/ast.json                  | 212 +++++++++++++++++++++
 settings/l10n/ast.php                   | 213 ---------------------
 settings/l10n/az.js                     | 107 +++++++++++
 settings/l10n/az.json                   | 105 +++++++++++
 settings/l10n/az.php                    | 106 -----------
 settings/l10n/be.php                    |   5 -
 settings/l10n/bg_BG.js                  | 237 +++++++++++++++++++++++
 settings/l10n/bg_BG.json                | 235 +++++++++++++++++++++++
 settings/l10n/bg_BG.php                 | 239 -----------------------
 settings/l10n/bn_BD.js                  | 107 +++++++++++
 settings/l10n/bn_BD.json                | 105 +++++++++++
 settings/l10n/bn_BD.php                 | 106 -----------
 settings/l10n/bn_IN.js                  |  11 ++
 settings/l10n/bn_IN.json                |   9 +
 settings/l10n/bn_IN.php                 |  10 -
 settings/l10n/bs.php                    |   5 -
 settings/l10n/ca.js                     | 214 +++++++++++++++++++++
 settings/l10n/ca.json                   | 212 +++++++++++++++++++++
 settings/l10n/ca.php                    | 213 ---------------------
 settings/l10n/cs_CZ.js                  | 240 ++++++++++++++++++++++++
 settings/l10n/cs_CZ.json                | 238 +++++++++++++++++++++++
 settings/l10n/cs_CZ.php                 | 239 -----------------------
 settings/l10n/cy_GB.js                  |  25 +++
 settings/l10n/cy_GB.json                |  23 +++
 settings/l10n/cy_GB.php                 |  24 ---
 settings/l10n/da.js                     | 238 +++++++++++++++++++++++
 settings/l10n/da.json                   | 236 +++++++++++++++++++++++
 settings/l10n/da.php                    | 239 -----------------------
 settings/l10n/de.js                     | 240 ++++++++++++++++++++++++
 settings/l10n/de.json                   | 238 +++++++++++++++++++++++
 settings/l10n/de.php                    | 239 -----------------------
 settings/l10n/de_AT.js                  |  17 ++
 settings/l10n/de_AT.json                |  15 ++
 settings/l10n/de_AT.php                 |  16 --
 settings/l10n/de_CH.js                  | 102 ++++++++++
 settings/l10n/de_CH.json                | 100 ++++++++++
 settings/l10n/de_CH.php                 | 101 ----------
 settings/l10n/de_DE.js                  | 240 ++++++++++++++++++++++++
 settings/l10n/de_DE.json                | 238 +++++++++++++++++++++++
 settings/l10n/de_DE.php                 | 239 -----------------------
 settings/l10n/el.js                     | 237 +++++++++++++++++++++++
 settings/l10n/el.json                   | 235 +++++++++++++++++++++++
 settings/l10n/el.php                    | 237 -----------------------
 settings/l10n/en@pirate.js              |   6 +
 settings/l10n/en@pirate.json            |   4 +
 settings/l10n/en@pirate.php             |   5 -
 settings/l10n/en_GB.js                  | 240 ++++++++++++++++++++++++
 settings/l10n/en_GB.json                | 238 +++++++++++++++++++++++
 settings/l10n/en_GB.php                 | 239 -----------------------
 settings/l10n/eo.js                     | 155 +++++++++++++++
 settings/l10n/eo.json                   | 153 +++++++++++++++
 settings/l10n/eo.php                    | 154 ---------------
 settings/l10n/es.js                     | 238 +++++++++++++++++++++++
 settings/l10n/es.json                   | 236 +++++++++++++++++++++++
 settings/l10n/es.php                    | 239 -----------------------
 settings/l10n/es_AR.js                  | 167 +++++++++++++++++
 settings/l10n/es_AR.json                | 165 ++++++++++++++++
 settings/l10n/es_AR.php                 | 166 ----------------
 settings/l10n/es_CL.js                  |   8 +
 settings/l10n/es_CL.json                |   6 +
 settings/l10n/es_CL.php                 |   7 -
 settings/l10n/es_MX.js                  | 133 +++++++++++++
 settings/l10n/es_MX.json                | 131 +++++++++++++
 settings/l10n/es_MX.php                 | 132 -------------
 settings/l10n/et_EE.js                  | 237 +++++++++++++++++++++++
 settings/l10n/et_EE.json                | 235 +++++++++++++++++++++++
 settings/l10n/et_EE.php                 | 236 -----------------------
 settings/l10n/eu.js                     | 221 ++++++++++++++++++++++
 settings/l10n/eu.json                   | 219 +++++++++++++++++++++
 settings/l10n/eu.php                    | 233 -----------------------
 settings/l10n/eu_ES.js                  |   9 +
 settings/l10n/eu_ES.json                |   7 +
 settings/l10n/eu_ES.php                 |   8 -
 settings/l10n/fa.js                     | 190 +++++++++++++++++++
 settings/l10n/fa.json                   | 188 +++++++++++++++++++
 settings/l10n/fa.php                    | 189 -------------------
 settings/l10n/fi_FI.js                  | 230 +++++++++++++++++++++++
 settings/l10n/fi_FI.json                | 228 ++++++++++++++++++++++
 settings/l10n/fi_FI.php                 | 229 ----------------------
 settings/l10n/fr.js                     | 237 +++++++++++++++++++++++
 settings/l10n/fr.json                   | 235 +++++++++++++++++++++++
 settings/l10n/fr.php                    | 239 -----------------------
 settings/l10n/gl.js                     | 219 +++++++++++++++++++++
 settings/l10n/gl.json                   | 217 +++++++++++++++++++++
 settings/l10n/gl.php                    | 218 ---------------------
 settings/l10n/he.js                     |  95 ++++++++++
 settings/l10n/he.json                   |  93 +++++++++
 settings/l10n/he.php                    |  94 ----------
 settings/l10n/hi.js                     |  12 ++
 settings/l10n/hi.json                   |  10 +
 settings/l10n/hi.php                    |  11 --
 settings/l10n/hr.js                     | 227 ++++++++++++++++++++++
 settings/l10n/hr.json                   | 225 ++++++++++++++++++++++
 settings/l10n/hr.php                    | 226 ----------------------
 settings/l10n/hu_HU.js                  | 221 ++++++++++++++++++++++
 settings/l10n/hu_HU.json                | 219 +++++++++++++++++++++
 settings/l10n/hu_HU.php                 | 220 ----------------------
 settings/l10n/hy.js                     |   7 +
 settings/l10n/hy.json                   |   5 +
 settings/l10n/hy.php                    |   6 -
 settings/l10n/ia.js                     |  40 ++++
 settings/l10n/ia.json                   |  38 ++++
 settings/l10n/ia.php                    |  39 ----
 settings/l10n/id.js                     | 240 ++++++++++++++++++++++++
 settings/l10n/id.json                   | 238 +++++++++++++++++++++++
 settings/l10n/id.php                    | 239 -----------------------
 settings/l10n/is.js                     |  62 ++++++
 settings/l10n/is.json                   |  60 ++++++
 settings/l10n/is.php                    |  61 ------
 settings/l10n/it.js                     | 238 +++++++++++++++++++++++
 settings/l10n/it.json                   | 236 +++++++++++++++++++++++
 settings/l10n/it.php                    | 239 -----------------------
 settings/l10n/ja.js                     | 230 +++++++++++++++++++++++
 settings/l10n/ja.json                   | 228 ++++++++++++++++++++++
 settings/l10n/ja.php                    | 230 -----------------------
 settings/l10n/jv.js                     |   6 +
 settings/l10n/jv.json                   |   4 +
 settings/l10n/jv.php                    |   5 -
 settings/l10n/ka_GE.js                  |  92 +++++++++
 settings/l10n/ka_GE.json                |  90 +++++++++
 settings/l10n/ka_GE.php                 |  91 ---------
 settings/l10n/km.js                     | 113 +++++++++++
 settings/l10n/km.json                   | 111 +++++++++++
 settings/l10n/km.php                    | 112 -----------
 settings/l10n/ko.js                     | 175 +++++++++++++++++
 settings/l10n/ko.json                   | 173 +++++++++++++++++
 settings/l10n/ko.php                    | 174 -----------------
 settings/l10n/ku_IQ.js                  |  18 ++
 settings/l10n/ku_IQ.json                |  16 ++
 settings/l10n/ku_IQ.php                 |  17 --
 settings/l10n/lb.js                     |  52 +++++
 settings/l10n/lb.json                   |  50 +++++
 settings/l10n/lb.php                    |  51 -----
 settings/l10n/lt_LT.js                  | 123 ++++++++++++
 settings/l10n/lt_LT.json                | 121 ++++++++++++
 settings/l10n/lt_LT.php                 | 122 ------------
 settings/l10n/lv.js                     | 103 ++++++++++
 settings/l10n/lv.json                   | 101 ++++++++++
 settings/l10n/lv.php                    | 102 ----------
 settings/l10n/mk.js                     | 168 +++++++++++++++++
 settings/l10n/mk.json                   | 166 ++++++++++++++++
 settings/l10n/mk.php                    | 167 -----------------
 settings/l10n/ms_MY.js                  |  40 ++++
 settings/l10n/ms_MY.json                |  38 ++++
 settings/l10n/ms_MY.php                 |  39 ----
 settings/l10n/my_MM.js                  |  12 ++
 settings/l10n/my_MM.json                |  10 +
 settings/l10n/my_MM.php                 |  11 --
 settings/l10n/nb_NO.js                  | 229 ++++++++++++++++++++++
 settings/l10n/nb_NO.json                | 227 ++++++++++++++++++++++
 settings/l10n/nb_NO.php                 | 228 ----------------------
 settings/l10n/nl.js                     | 240 ++++++++++++++++++++++++
 settings/l10n/nl.json                   | 238 +++++++++++++++++++++++
 settings/l10n/nl.php                    | 239 -----------------------
 settings/l10n/nn_NO.js                  | 113 +++++++++++
 settings/l10n/nn_NO.json                | 111 +++++++++++
 settings/l10n/nn_NO.php                 | 112 -----------
 settings/l10n/oc.js                     |  48 +++++
 settings/l10n/oc.json                   |  46 +++++
 settings/l10n/oc.php                    |  47 -----
 settings/l10n/pa.js                     |  25 +++
 settings/l10n/pa.json                   |  23 +++
 settings/l10n/pa.php                    |  24 ---
 settings/l10n/pl.js                     | 230 +++++++++++++++++++++++
 settings/l10n/pl.json                   | 228 ++++++++++++++++++++++
 settings/l10n/pl.php                    | 238 -----------------------
 settings/l10n/pt_BR.js                  | 240 ++++++++++++++++++++++++
 settings/l10n/pt_BR.json                | 238 +++++++++++++++++++++++
 settings/l10n/pt_BR.php                 | 239 -----------------------
 settings/l10n/pt_PT.js                  | 240 ++++++++++++++++++++++++
 settings/l10n/pt_PT.json                | 238 +++++++++++++++++++++++
 settings/l10n/pt_PT.php                 | 239 -----------------------
 settings/l10n/ro.js                     | 137 ++++++++++++++
 settings/l10n/ro.json                   | 135 +++++++++++++
 settings/l10n/ro.php                    | 136 --------------
 settings/l10n/ru.js                     | 230 +++++++++++++++++++++++
 settings/l10n/ru.json                   | 228 ++++++++++++++++++++++
 settings/l10n/ru.php                    | 229 ----------------------
 settings/l10n/si_LK.js                  |  54 ++++++
 settings/l10n/si_LK.json                |  52 +++++
 settings/l10n/si_LK.php                 |  53 ------
 settings/l10n/sk.php                    |   8 -
 settings/l10n/sk_SK.js                  | 228 ++++++++++++++++++++++
 settings/l10n/sk_SK.json                | 226 ++++++++++++++++++++++
 settings/l10n/sk_SK.php                 | 227 ----------------------
 settings/l10n/sl.js                     | 199 ++++++++++++++++++++
 settings/l10n/sl.json                   | 197 +++++++++++++++++++
 settings/l10n/sl.php                    | 229 ----------------------
 settings/l10n/sq.js                     | 116 ++++++++++++
 settings/l10n/sq.json                   | 114 +++++++++++
 settings/l10n/sq.php                    | 115 ------------
 settings/l10n/sr.js                     |  88 +++++++++
 settings/l10n/sr.json                   |  86 +++++++++
 settings/l10n/sr.php                    |  87 ---------
 settings/l10n/sr@latin.js               |  30 +++
 settings/l10n/sr@latin.json             |  28 +++
 settings/l10n/sr@latin.php              |  29 ---
 settings/l10n/sv.js                     | 218 +++++++++++++++++++++
 settings/l10n/sv.json                   | 216 +++++++++++++++++++++
 settings/l10n/sv.php                    | 217 ---------------------
 settings/l10n/ta_IN.js                  |   6 +
 settings/l10n/ta_IN.json                |   4 +
 settings/l10n/ta_IN.php                 |   5 -
 settings/l10n/ta_LK.js                  |  55 ++++++
 settings/l10n/ta_LK.json                |  53 ++++++
 settings/l10n/ta_LK.php                 |  54 ------
 settings/l10n/te.js                     |  15 ++
 settings/l10n/te.json                   |  13 ++
 settings/l10n/te.php                    |  14 --
 settings/l10n/th_TH.js                  |  81 ++++++++
 settings/l10n/th_TH.json                |  79 ++++++++
 settings/l10n/th_TH.php                 |  80 --------
 settings/l10n/tr.js                     | 237 +++++++++++++++++++++++
 settings/l10n/tr.json                   | 235 +++++++++++++++++++++++
 settings/l10n/tr.php                    | 239 -----------------------
 settings/l10n/ug.js                     |  72 +++++++
 settings/l10n/ug.json                   |  70 +++++++
 settings/l10n/ug.php                    |  71 -------
 settings/l10n/uk.js                     | 237 +++++++++++++++++++++++
 settings/l10n/uk.json                   | 235 +++++++++++++++++++++++
 settings/l10n/uk.php                    | 239 -----------------------
 settings/l10n/ur.php                    |   5 -
 settings/l10n/ur_PK.js                  |  21 +++
 settings/l10n/ur_PK.json                |  19 ++
 settings/l10n/ur_PK.php                 |  20 --
 settings/l10n/vi.js                     |  90 +++++++++
 settings/l10n/vi.json                   |  88 +++++++++
 settings/l10n/vi.php                    |  89 ---------
 settings/l10n/zh_CN.js                  | 230 +++++++++++++++++++++++
 settings/l10n/zh_CN.json                | 228 ++++++++++++++++++++++
 settings/l10n/zh_CN.php                 | 229 ----------------------
 settings/l10n/zh_HK.js                  |  30 +++
 settings/l10n/zh_HK.json                |  28 +++
 settings/l10n/zh_HK.php                 |  29 ---
 settings/l10n/zh_TW.js                  | 173 +++++++++++++++++
 settings/l10n/zh_TW.json                | 171 +++++++++++++++++
 settings/l10n/zh_TW.php                 | 172 -----------------
 2983 files changed, 95191 insertions(+), 47944 deletions(-)
 create mode 100644 apps/files/l10n/ach.js
 create mode 100644 apps/files/l10n/ach.json
 delete mode 100644 apps/files/l10n/ach.php
 create mode 100644 apps/files/l10n/ady.js
 create mode 100644 apps/files/l10n/ady.json
 delete mode 100644 apps/files/l10n/ady.php
 create mode 100644 apps/files/l10n/af.js
 create mode 100644 apps/files/l10n/af.json
 delete mode 100644 apps/files/l10n/af.php
 create mode 100644 apps/files/l10n/af_ZA.js
 create mode 100644 apps/files/l10n/af_ZA.json
 delete mode 100644 apps/files/l10n/af_ZA.php
 create mode 100644 apps/files/l10n/ak.js
 create mode 100644 apps/files/l10n/ak.json
 delete mode 100644 apps/files/l10n/ak.php
 create mode 100644 apps/files/l10n/am_ET.js
 create mode 100644 apps/files/l10n/am_ET.json
 delete mode 100644 apps/files/l10n/am_ET.php
 create mode 100644 apps/files/l10n/ar.js
 create mode 100644 apps/files/l10n/ar.json
 delete mode 100644 apps/files/l10n/ar.php
 create mode 100644 apps/files/l10n/ast.js
 create mode 100644 apps/files/l10n/ast.json
 delete mode 100644 apps/files/l10n/ast.php
 create mode 100644 apps/files/l10n/az.js
 create mode 100644 apps/files/l10n/az.json
 delete mode 100644 apps/files/l10n/az.php
 create mode 100644 apps/files/l10n/be.js
 create mode 100644 apps/files/l10n/be.json
 delete mode 100644 apps/files/l10n/be.php
 create mode 100644 apps/files/l10n/bg_BG.js
 create mode 100644 apps/files/l10n/bg_BG.json
 delete mode 100644 apps/files/l10n/bg_BG.php
 create mode 100644 apps/files/l10n/bn_BD.js
 create mode 100644 apps/files/l10n/bn_BD.json
 delete mode 100644 apps/files/l10n/bn_BD.php
 create mode 100644 apps/files/l10n/bn_IN.js
 create mode 100644 apps/files/l10n/bn_IN.json
 delete mode 100644 apps/files/l10n/bn_IN.php
 create mode 100644 apps/files/l10n/bs.js
 create mode 100644 apps/files/l10n/bs.json
 delete mode 100644 apps/files/l10n/bs.php
 create mode 100644 apps/files/l10n/ca.js
 create mode 100644 apps/files/l10n/ca.json
 delete mode 100644 apps/files/l10n/ca.php
 create mode 100644 apps/files/l10n/ca@valencia.js
 create mode 100644 apps/files/l10n/ca@valencia.json
 delete mode 100644 apps/files/l10n/ca@valencia.php
 create mode 100644 apps/files/l10n/cs_CZ.js
 create mode 100644 apps/files/l10n/cs_CZ.json
 delete mode 100644 apps/files/l10n/cs_CZ.php
 create mode 100644 apps/files/l10n/cy_GB.js
 create mode 100644 apps/files/l10n/cy_GB.json
 delete mode 100644 apps/files/l10n/cy_GB.php
 create mode 100644 apps/files/l10n/da.js
 create mode 100644 apps/files/l10n/da.json
 delete mode 100644 apps/files/l10n/da.php
 create mode 100644 apps/files/l10n/de.js
 create mode 100644 apps/files/l10n/de.json
 delete mode 100644 apps/files/l10n/de.php
 create mode 100644 apps/files/l10n/de_AT.js
 create mode 100644 apps/files/l10n/de_AT.json
 delete mode 100644 apps/files/l10n/de_AT.php
 create mode 100644 apps/files/l10n/de_CH.js
 create mode 100644 apps/files/l10n/de_CH.json
 delete mode 100644 apps/files/l10n/de_CH.php
 create mode 100644 apps/files/l10n/de_DE.js
 create mode 100644 apps/files/l10n/de_DE.json
 delete mode 100644 apps/files/l10n/de_DE.php
 create mode 100644 apps/files/l10n/el.js
 create mode 100644 apps/files/l10n/el.json
 delete mode 100644 apps/files/l10n/el.php
 create mode 100644 apps/files/l10n/en@pirate.js
 create mode 100644 apps/files/l10n/en@pirate.json
 delete mode 100644 apps/files/l10n/en@pirate.php
 create mode 100644 apps/files/l10n/en_GB.js
 create mode 100644 apps/files/l10n/en_GB.json
 delete mode 100644 apps/files/l10n/en_GB.php
 create mode 100644 apps/files/l10n/en_NZ.js
 create mode 100644 apps/files/l10n/en_NZ.json
 delete mode 100644 apps/files/l10n/en_NZ.php
 create mode 100644 apps/files/l10n/eo.js
 create mode 100644 apps/files/l10n/eo.json
 delete mode 100644 apps/files/l10n/eo.php
 create mode 100644 apps/files/l10n/es.js
 create mode 100644 apps/files/l10n/es.json
 delete mode 100644 apps/files/l10n/es.php
 create mode 100644 apps/files/l10n/es_AR.js
 create mode 100644 apps/files/l10n/es_AR.json
 delete mode 100644 apps/files/l10n/es_AR.php
 create mode 100644 apps/files/l10n/es_BO.js
 create mode 100644 apps/files/l10n/es_BO.json
 delete mode 100644 apps/files/l10n/es_BO.php
 create mode 100644 apps/files/l10n/es_CL.js
 create mode 100644 apps/files/l10n/es_CL.json
 delete mode 100644 apps/files/l10n/es_CL.php
 create mode 100644 apps/files/l10n/es_CO.js
 create mode 100644 apps/files/l10n/es_CO.json
 delete mode 100644 apps/files/l10n/es_CO.php
 create mode 100644 apps/files/l10n/es_CR.js
 create mode 100644 apps/files/l10n/es_CR.json
 delete mode 100644 apps/files/l10n/es_CR.php
 create mode 100644 apps/files/l10n/es_EC.js
 create mode 100644 apps/files/l10n/es_EC.json
 delete mode 100644 apps/files/l10n/es_EC.php
 create mode 100644 apps/files/l10n/es_MX.js
 create mode 100644 apps/files/l10n/es_MX.json
 delete mode 100644 apps/files/l10n/es_MX.php
 create mode 100644 apps/files/l10n/es_PE.js
 create mode 100644 apps/files/l10n/es_PE.json
 delete mode 100644 apps/files/l10n/es_PE.php
 create mode 100644 apps/files/l10n/es_PY.js
 create mode 100644 apps/files/l10n/es_PY.json
 delete mode 100644 apps/files/l10n/es_PY.php
 create mode 100644 apps/files/l10n/es_US.js
 create mode 100644 apps/files/l10n/es_US.json
 delete mode 100644 apps/files/l10n/es_US.php
 create mode 100644 apps/files/l10n/es_UY.js
 create mode 100644 apps/files/l10n/es_UY.json
 delete mode 100644 apps/files/l10n/es_UY.php
 create mode 100644 apps/files/l10n/et_EE.js
 create mode 100644 apps/files/l10n/et_EE.json
 delete mode 100644 apps/files/l10n/et_EE.php
 create mode 100644 apps/files/l10n/eu.js
 create mode 100644 apps/files/l10n/eu.json
 delete mode 100644 apps/files/l10n/eu.php
 create mode 100644 apps/files/l10n/eu_ES.js
 create mode 100644 apps/files/l10n/eu_ES.json
 delete mode 100644 apps/files/l10n/eu_ES.php
 create mode 100644 apps/files/l10n/fa.js
 create mode 100644 apps/files/l10n/fa.json
 delete mode 100644 apps/files/l10n/fa.php
 create mode 100644 apps/files/l10n/fi_FI.js
 create mode 100644 apps/files/l10n/fi_FI.json
 delete mode 100644 apps/files/l10n/fi_FI.php
 create mode 100644 apps/files/l10n/fil.js
 create mode 100644 apps/files/l10n/fil.json
 delete mode 100644 apps/files/l10n/fil.php
 create mode 100644 apps/files/l10n/fr.js
 create mode 100644 apps/files/l10n/fr.json
 delete mode 100644 apps/files/l10n/fr.php
 create mode 100644 apps/files/l10n/fr_CA.js
 create mode 100644 apps/files/l10n/fr_CA.json
 delete mode 100644 apps/files/l10n/fr_CA.php
 create mode 100644 apps/files/l10n/fy_NL.js
 create mode 100644 apps/files/l10n/fy_NL.json
 delete mode 100644 apps/files/l10n/fy_NL.php
 create mode 100644 apps/files/l10n/gl.js
 create mode 100644 apps/files/l10n/gl.json
 delete mode 100644 apps/files/l10n/gl.php
 create mode 100644 apps/files/l10n/gu.js
 create mode 100644 apps/files/l10n/gu.json
 delete mode 100644 apps/files/l10n/gu.php
 create mode 100644 apps/files/l10n/he.js
 create mode 100644 apps/files/l10n/he.json
 delete mode 100644 apps/files/l10n/he.php
 create mode 100644 apps/files/l10n/hi.js
 create mode 100644 apps/files/l10n/hi.json
 delete mode 100644 apps/files/l10n/hi.php
 create mode 100644 apps/files/l10n/hi_IN.js
 create mode 100644 apps/files/l10n/hi_IN.json
 delete mode 100644 apps/files/l10n/hi_IN.php
 create mode 100644 apps/files/l10n/hr.js
 create mode 100644 apps/files/l10n/hr.json
 delete mode 100644 apps/files/l10n/hr.php
 create mode 100644 apps/files/l10n/hu_HU.js
 create mode 100644 apps/files/l10n/hu_HU.json
 delete mode 100644 apps/files/l10n/hu_HU.php
 create mode 100644 apps/files/l10n/hy.js
 create mode 100644 apps/files/l10n/hy.json
 delete mode 100644 apps/files/l10n/hy.php
 create mode 100644 apps/files/l10n/ia.js
 create mode 100644 apps/files/l10n/ia.json
 delete mode 100644 apps/files/l10n/ia.php
 create mode 100644 apps/files/l10n/id.js
 create mode 100644 apps/files/l10n/id.json
 delete mode 100644 apps/files/l10n/id.php
 create mode 100644 apps/files/l10n/io.js
 create mode 100644 apps/files/l10n/io.json
 delete mode 100644 apps/files/l10n/io.php
 create mode 100644 apps/files/l10n/is.js
 create mode 100644 apps/files/l10n/is.json
 delete mode 100644 apps/files/l10n/is.php
 create mode 100644 apps/files/l10n/it.js
 create mode 100644 apps/files/l10n/it.json
 delete mode 100644 apps/files/l10n/it.php
 create mode 100644 apps/files/l10n/ja.js
 create mode 100644 apps/files/l10n/ja.json
 delete mode 100644 apps/files/l10n/ja.php
 create mode 100644 apps/files/l10n/jv.js
 create mode 100644 apps/files/l10n/jv.json
 delete mode 100644 apps/files/l10n/jv.php
 create mode 100644 apps/files/l10n/ka_GE.js
 create mode 100644 apps/files/l10n/ka_GE.json
 delete mode 100644 apps/files/l10n/ka_GE.php
 create mode 100644 apps/files/l10n/km.js
 create mode 100644 apps/files/l10n/km.json
 delete mode 100644 apps/files/l10n/km.php
 create mode 100644 apps/files/l10n/kn.js
 create mode 100644 apps/files/l10n/kn.json
 delete mode 100644 apps/files/l10n/kn.php
 create mode 100644 apps/files/l10n/ko.js
 create mode 100644 apps/files/l10n/ko.json
 delete mode 100644 apps/files/l10n/ko.php
 create mode 100644 apps/files/l10n/ku_IQ.js
 create mode 100644 apps/files/l10n/ku_IQ.json
 delete mode 100644 apps/files/l10n/ku_IQ.php
 create mode 100644 apps/files/l10n/lb.js
 create mode 100644 apps/files/l10n/lb.json
 delete mode 100644 apps/files/l10n/lb.php
 create mode 100644 apps/files/l10n/lt_LT.js
 create mode 100644 apps/files/l10n/lt_LT.json
 delete mode 100644 apps/files/l10n/lt_LT.php
 create mode 100644 apps/files/l10n/lv.js
 create mode 100644 apps/files/l10n/lv.json
 delete mode 100644 apps/files/l10n/lv.php
 create mode 100644 apps/files/l10n/mg.js
 create mode 100644 apps/files/l10n/mg.json
 delete mode 100644 apps/files/l10n/mg.php
 create mode 100644 apps/files/l10n/mk.js
 create mode 100644 apps/files/l10n/mk.json
 delete mode 100644 apps/files/l10n/mk.php
 create mode 100644 apps/files/l10n/ml.js
 create mode 100644 apps/files/l10n/ml.json
 delete mode 100644 apps/files/l10n/ml.php
 create mode 100644 apps/files/l10n/ml_IN.js
 create mode 100644 apps/files/l10n/ml_IN.json
 delete mode 100644 apps/files/l10n/ml_IN.php
 create mode 100644 apps/files/l10n/mn.js
 create mode 100644 apps/files/l10n/mn.json
 delete mode 100644 apps/files/l10n/mn.php
 create mode 100644 apps/files/l10n/ms_MY.js
 create mode 100644 apps/files/l10n/ms_MY.json
 delete mode 100644 apps/files/l10n/ms_MY.php
 create mode 100644 apps/files/l10n/mt_MT.js
 create mode 100644 apps/files/l10n/mt_MT.json
 delete mode 100644 apps/files/l10n/mt_MT.php
 create mode 100644 apps/files/l10n/my_MM.js
 create mode 100644 apps/files/l10n/my_MM.json
 delete mode 100644 apps/files/l10n/my_MM.php
 create mode 100644 apps/files/l10n/nb_NO.js
 create mode 100644 apps/files/l10n/nb_NO.json
 delete mode 100644 apps/files/l10n/nb_NO.php
 create mode 100644 apps/files/l10n/nds.js
 create mode 100644 apps/files/l10n/nds.json
 delete mode 100644 apps/files/l10n/nds.php
 create mode 100644 apps/files/l10n/ne.js
 create mode 100644 apps/files/l10n/ne.json
 delete mode 100644 apps/files/l10n/ne.php
 create mode 100644 apps/files/l10n/nl.js
 create mode 100644 apps/files/l10n/nl.json
 delete mode 100644 apps/files/l10n/nl.php
 create mode 100644 apps/files/l10n/nn_NO.js
 create mode 100644 apps/files/l10n/nn_NO.json
 delete mode 100644 apps/files/l10n/nn_NO.php
 create mode 100644 apps/files/l10n/nqo.js
 create mode 100644 apps/files/l10n/nqo.json
 delete mode 100644 apps/files/l10n/nqo.php
 create mode 100644 apps/files/l10n/oc.js
 create mode 100644 apps/files/l10n/oc.json
 delete mode 100644 apps/files/l10n/oc.php
 create mode 100644 apps/files/l10n/or_IN.js
 create mode 100644 apps/files/l10n/or_IN.json
 delete mode 100644 apps/files/l10n/or_IN.php
 create mode 100644 apps/files/l10n/pa.js
 create mode 100644 apps/files/l10n/pa.json
 delete mode 100644 apps/files/l10n/pa.php
 create mode 100644 apps/files/l10n/pl.js
 create mode 100644 apps/files/l10n/pl.json
 delete mode 100644 apps/files/l10n/pl.php
 create mode 100644 apps/files/l10n/pt_BR.js
 create mode 100644 apps/files/l10n/pt_BR.json
 delete mode 100644 apps/files/l10n/pt_BR.php
 create mode 100644 apps/files/l10n/pt_PT.js
 create mode 100644 apps/files/l10n/pt_PT.json
 delete mode 100644 apps/files/l10n/pt_PT.php
 create mode 100644 apps/files/l10n/ro.js
 create mode 100644 apps/files/l10n/ro.json
 delete mode 100644 apps/files/l10n/ro.php
 create mode 100644 apps/files/l10n/ru.js
 create mode 100644 apps/files/l10n/ru.json
 delete mode 100644 apps/files/l10n/ru.php
 create mode 100644 apps/files/l10n/si_LK.js
 create mode 100644 apps/files/l10n/si_LK.json
 delete mode 100644 apps/files/l10n/si_LK.php
 create mode 100644 apps/files/l10n/sk.js
 create mode 100644 apps/files/l10n/sk.json
 delete mode 100644 apps/files/l10n/sk.php
 create mode 100644 apps/files/l10n/sk_SK.js
 create mode 100644 apps/files/l10n/sk_SK.json
 delete mode 100644 apps/files/l10n/sk_SK.php
 create mode 100644 apps/files/l10n/sl.js
 create mode 100644 apps/files/l10n/sl.json
 delete mode 100644 apps/files/l10n/sl.php
 create mode 100644 apps/files/l10n/sq.js
 create mode 100644 apps/files/l10n/sq.json
 delete mode 100644 apps/files/l10n/sq.php
 create mode 100644 apps/files/l10n/sr.js
 create mode 100644 apps/files/l10n/sr.json
 delete mode 100644 apps/files/l10n/sr.php
 create mode 100644 apps/files/l10n/sr@latin.js
 create mode 100644 apps/files/l10n/sr@latin.json
 delete mode 100644 apps/files/l10n/sr@latin.php
 create mode 100644 apps/files/l10n/su.js
 create mode 100644 apps/files/l10n/su.json
 delete mode 100644 apps/files/l10n/su.php
 create mode 100644 apps/files/l10n/sv.js
 create mode 100644 apps/files/l10n/sv.json
 delete mode 100644 apps/files/l10n/sv.php
 create mode 100644 apps/files/l10n/sw_KE.js
 create mode 100644 apps/files/l10n/sw_KE.json
 delete mode 100644 apps/files/l10n/sw_KE.php
 create mode 100644 apps/files/l10n/ta_IN.js
 create mode 100644 apps/files/l10n/ta_IN.json
 delete mode 100644 apps/files/l10n/ta_IN.php
 create mode 100644 apps/files/l10n/ta_LK.js
 create mode 100644 apps/files/l10n/ta_LK.json
 delete mode 100644 apps/files/l10n/ta_LK.php
 create mode 100644 apps/files/l10n/te.js
 create mode 100644 apps/files/l10n/te.json
 delete mode 100644 apps/files/l10n/te.php
 create mode 100644 apps/files/l10n/tg_TJ.js
 create mode 100644 apps/files/l10n/tg_TJ.json
 delete mode 100644 apps/files/l10n/tg_TJ.php
 create mode 100644 apps/files/l10n/th_TH.js
 create mode 100644 apps/files/l10n/th_TH.json
 delete mode 100644 apps/files/l10n/th_TH.php
 create mode 100644 apps/files/l10n/tl_PH.js
 create mode 100644 apps/files/l10n/tl_PH.json
 delete mode 100644 apps/files/l10n/tl_PH.php
 create mode 100644 apps/files/l10n/tr.js
 create mode 100644 apps/files/l10n/tr.json
 delete mode 100644 apps/files/l10n/tr.php
 create mode 100644 apps/files/l10n/tzm.js
 create mode 100644 apps/files/l10n/tzm.json
 delete mode 100644 apps/files/l10n/tzm.php
 create mode 100644 apps/files/l10n/ug.js
 create mode 100644 apps/files/l10n/ug.json
 delete mode 100644 apps/files/l10n/ug.php
 create mode 100644 apps/files/l10n/uk.js
 create mode 100644 apps/files/l10n/uk.json
 delete mode 100644 apps/files/l10n/uk.php
 create mode 100644 apps/files/l10n/ur.js
 create mode 100644 apps/files/l10n/ur.json
 delete mode 100644 apps/files/l10n/ur.php
 create mode 100644 apps/files/l10n/ur_PK.js
 create mode 100644 apps/files/l10n/ur_PK.json
 delete mode 100644 apps/files/l10n/ur_PK.php
 create mode 100644 apps/files/l10n/uz.js
 create mode 100644 apps/files/l10n/uz.json
 delete mode 100644 apps/files/l10n/uz.php
 create mode 100644 apps/files/l10n/vi.js
 create mode 100644 apps/files/l10n/vi.json
 delete mode 100644 apps/files/l10n/vi.php
 create mode 100644 apps/files/l10n/zh_CN.js
 create mode 100644 apps/files/l10n/zh_CN.json
 delete mode 100644 apps/files/l10n/zh_CN.php
 create mode 100644 apps/files/l10n/zh_HK.js
 create mode 100644 apps/files/l10n/zh_HK.json
 delete mode 100644 apps/files/l10n/zh_HK.php
 create mode 100644 apps/files/l10n/zh_TW.js
 create mode 100644 apps/files/l10n/zh_TW.json
 delete mode 100644 apps/files/l10n/zh_TW.php
 create mode 100644 apps/files_encryption/l10n/ar.js
 create mode 100644 apps/files_encryption/l10n/ar.json
 delete mode 100644 apps/files_encryption/l10n/ar.php
 create mode 100644 apps/files_encryption/l10n/ast.js
 create mode 100644 apps/files_encryption/l10n/ast.json
 delete mode 100644 apps/files_encryption/l10n/ast.php
 create mode 100644 apps/files_encryption/l10n/az.js
 create mode 100644 apps/files_encryption/l10n/az.json
 delete mode 100644 apps/files_encryption/l10n/az.php
 create mode 100644 apps/files_encryption/l10n/bg_BG.js
 create mode 100644 apps/files_encryption/l10n/bg_BG.json
 delete mode 100644 apps/files_encryption/l10n/bg_BG.php
 create mode 100644 apps/files_encryption/l10n/bn_BD.js
 create mode 100644 apps/files_encryption/l10n/bn_BD.json
 delete mode 100644 apps/files_encryption/l10n/bn_BD.php
 create mode 100644 apps/files_encryption/l10n/ca.js
 create mode 100644 apps/files_encryption/l10n/ca.json
 delete mode 100644 apps/files_encryption/l10n/ca.php
 create mode 100644 apps/files_encryption/l10n/cs_CZ.js
 create mode 100644 apps/files_encryption/l10n/cs_CZ.json
 delete mode 100644 apps/files_encryption/l10n/cs_CZ.php
 create mode 100644 apps/files_encryption/l10n/cy_GB.js
 create mode 100644 apps/files_encryption/l10n/cy_GB.json
 delete mode 100644 apps/files_encryption/l10n/cy_GB.php
 create mode 100644 apps/files_encryption/l10n/da.js
 create mode 100644 apps/files_encryption/l10n/da.json
 delete mode 100644 apps/files_encryption/l10n/da.php
 create mode 100644 apps/files_encryption/l10n/de.js
 create mode 100644 apps/files_encryption/l10n/de.json
 delete mode 100644 apps/files_encryption/l10n/de.php
 create mode 100644 apps/files_encryption/l10n/de_CH.js
 create mode 100644 apps/files_encryption/l10n/de_CH.json
 delete mode 100644 apps/files_encryption/l10n/de_CH.php
 create mode 100644 apps/files_encryption/l10n/de_DE.js
 create mode 100644 apps/files_encryption/l10n/de_DE.json
 delete mode 100644 apps/files_encryption/l10n/de_DE.php
 create mode 100644 apps/files_encryption/l10n/el.js
 create mode 100644 apps/files_encryption/l10n/el.json
 delete mode 100644 apps/files_encryption/l10n/el.php
 create mode 100644 apps/files_encryption/l10n/en_GB.js
 create mode 100644 apps/files_encryption/l10n/en_GB.json
 delete mode 100644 apps/files_encryption/l10n/en_GB.php
 create mode 100644 apps/files_encryption/l10n/eo.js
 create mode 100644 apps/files_encryption/l10n/eo.json
 delete mode 100644 apps/files_encryption/l10n/eo.php
 create mode 100644 apps/files_encryption/l10n/es.js
 create mode 100644 apps/files_encryption/l10n/es.json
 delete mode 100644 apps/files_encryption/l10n/es.php
 create mode 100644 apps/files_encryption/l10n/es_AR.js
 create mode 100644 apps/files_encryption/l10n/es_AR.json
 delete mode 100644 apps/files_encryption/l10n/es_AR.php
 create mode 100644 apps/files_encryption/l10n/es_CL.js
 create mode 100644 apps/files_encryption/l10n/es_CL.json
 delete mode 100644 apps/files_encryption/l10n/es_CL.php
 create mode 100644 apps/files_encryption/l10n/es_MX.js
 create mode 100644 apps/files_encryption/l10n/es_MX.json
 delete mode 100644 apps/files_encryption/l10n/es_MX.php
 create mode 100644 apps/files_encryption/l10n/et_EE.js
 create mode 100644 apps/files_encryption/l10n/et_EE.json
 delete mode 100644 apps/files_encryption/l10n/et_EE.php
 create mode 100644 apps/files_encryption/l10n/eu.js
 create mode 100644 apps/files_encryption/l10n/eu.json
 delete mode 100644 apps/files_encryption/l10n/eu.php
 create mode 100644 apps/files_encryption/l10n/fa.js
 create mode 100644 apps/files_encryption/l10n/fa.json
 delete mode 100644 apps/files_encryption/l10n/fa.php
 create mode 100644 apps/files_encryption/l10n/fi_FI.js
 create mode 100644 apps/files_encryption/l10n/fi_FI.json
 delete mode 100644 apps/files_encryption/l10n/fi_FI.php
 create mode 100644 apps/files_encryption/l10n/fr.js
 create mode 100644 apps/files_encryption/l10n/fr.json
 delete mode 100644 apps/files_encryption/l10n/fr.php
 create mode 100644 apps/files_encryption/l10n/gl.js
 create mode 100644 apps/files_encryption/l10n/gl.json
 delete mode 100644 apps/files_encryption/l10n/gl.php
 create mode 100644 apps/files_encryption/l10n/he.js
 create mode 100644 apps/files_encryption/l10n/he.json
 delete mode 100644 apps/files_encryption/l10n/he.php
 create mode 100644 apps/files_encryption/l10n/hr.js
 create mode 100644 apps/files_encryption/l10n/hr.json
 delete mode 100644 apps/files_encryption/l10n/hr.php
 create mode 100644 apps/files_encryption/l10n/hu_HU.js
 create mode 100644 apps/files_encryption/l10n/hu_HU.json
 delete mode 100644 apps/files_encryption/l10n/hu_HU.php
 create mode 100644 apps/files_encryption/l10n/ia.js
 create mode 100644 apps/files_encryption/l10n/ia.json
 delete mode 100644 apps/files_encryption/l10n/ia.php
 create mode 100644 apps/files_encryption/l10n/id.js
 create mode 100644 apps/files_encryption/l10n/id.json
 delete mode 100644 apps/files_encryption/l10n/id.php
 create mode 100644 apps/files_encryption/l10n/is.js
 create mode 100644 apps/files_encryption/l10n/is.json
 delete mode 100644 apps/files_encryption/l10n/is.php
 create mode 100644 apps/files_encryption/l10n/it.js
 create mode 100644 apps/files_encryption/l10n/it.json
 delete mode 100644 apps/files_encryption/l10n/it.php
 create mode 100644 apps/files_encryption/l10n/ja.js
 create mode 100644 apps/files_encryption/l10n/ja.json
 delete mode 100644 apps/files_encryption/l10n/ja.php
 create mode 100644 apps/files_encryption/l10n/ka_GE.js
 create mode 100644 apps/files_encryption/l10n/ka_GE.json
 delete mode 100644 apps/files_encryption/l10n/ka_GE.php
 create mode 100644 apps/files_encryption/l10n/km.js
 create mode 100644 apps/files_encryption/l10n/km.json
 delete mode 100644 apps/files_encryption/l10n/km.php
 create mode 100644 apps/files_encryption/l10n/ko.js
 create mode 100644 apps/files_encryption/l10n/ko.json
 delete mode 100644 apps/files_encryption/l10n/ko.php
 create mode 100644 apps/files_encryption/l10n/ku_IQ.js
 create mode 100644 apps/files_encryption/l10n/ku_IQ.json
 delete mode 100644 apps/files_encryption/l10n/ku_IQ.php
 create mode 100644 apps/files_encryption/l10n/lb.js
 create mode 100644 apps/files_encryption/l10n/lb.json
 delete mode 100644 apps/files_encryption/l10n/lb.php
 create mode 100644 apps/files_encryption/l10n/lt_LT.js
 create mode 100644 apps/files_encryption/l10n/lt_LT.json
 delete mode 100644 apps/files_encryption/l10n/lt_LT.php
 create mode 100644 apps/files_encryption/l10n/lv.js
 create mode 100644 apps/files_encryption/l10n/lv.json
 delete mode 100644 apps/files_encryption/l10n/lv.php
 create mode 100644 apps/files_encryption/l10n/mk.js
 create mode 100644 apps/files_encryption/l10n/mk.json
 delete mode 100644 apps/files_encryption/l10n/mk.php
 create mode 100644 apps/files_encryption/l10n/nb_NO.js
 create mode 100644 apps/files_encryption/l10n/nb_NO.json
 delete mode 100644 apps/files_encryption/l10n/nb_NO.php
 create mode 100644 apps/files_encryption/l10n/nl.js
 create mode 100644 apps/files_encryption/l10n/nl.json
 delete mode 100644 apps/files_encryption/l10n/nl.php
 create mode 100644 apps/files_encryption/l10n/nn_NO.js
 create mode 100644 apps/files_encryption/l10n/nn_NO.json
 delete mode 100644 apps/files_encryption/l10n/nn_NO.php
 create mode 100644 apps/files_encryption/l10n/pa.js
 create mode 100644 apps/files_encryption/l10n/pa.json
 delete mode 100644 apps/files_encryption/l10n/pa.php
 create mode 100644 apps/files_encryption/l10n/pl.js
 create mode 100644 apps/files_encryption/l10n/pl.json
 delete mode 100644 apps/files_encryption/l10n/pl.php
 create mode 100644 apps/files_encryption/l10n/pt_BR.js
 create mode 100644 apps/files_encryption/l10n/pt_BR.json
 delete mode 100644 apps/files_encryption/l10n/pt_BR.php
 create mode 100644 apps/files_encryption/l10n/pt_PT.js
 create mode 100644 apps/files_encryption/l10n/pt_PT.json
 delete mode 100644 apps/files_encryption/l10n/pt_PT.php
 create mode 100644 apps/files_encryption/l10n/ro.js
 create mode 100644 apps/files_encryption/l10n/ro.json
 delete mode 100644 apps/files_encryption/l10n/ro.php
 create mode 100644 apps/files_encryption/l10n/ru.js
 create mode 100644 apps/files_encryption/l10n/ru.json
 delete mode 100644 apps/files_encryption/l10n/ru.php
 create mode 100644 apps/files_encryption/l10n/si_LK.js
 create mode 100644 apps/files_encryption/l10n/si_LK.json
 delete mode 100644 apps/files_encryption/l10n/si_LK.php
 create mode 100644 apps/files_encryption/l10n/sk_SK.js
 create mode 100644 apps/files_encryption/l10n/sk_SK.json
 delete mode 100644 apps/files_encryption/l10n/sk_SK.php
 create mode 100644 apps/files_encryption/l10n/sl.js
 create mode 100644 apps/files_encryption/l10n/sl.json
 delete mode 100644 apps/files_encryption/l10n/sl.php
 create mode 100644 apps/files_encryption/l10n/sq.js
 create mode 100644 apps/files_encryption/l10n/sq.json
 delete mode 100644 apps/files_encryption/l10n/sq.php
 create mode 100644 apps/files_encryption/l10n/sr.js
 create mode 100644 apps/files_encryption/l10n/sr.json
 delete mode 100644 apps/files_encryption/l10n/sr.php
 create mode 100644 apps/files_encryption/l10n/sv.js
 create mode 100644 apps/files_encryption/l10n/sv.json
 delete mode 100644 apps/files_encryption/l10n/sv.php
 create mode 100644 apps/files_encryption/l10n/ta_LK.js
 create mode 100644 apps/files_encryption/l10n/ta_LK.json
 delete mode 100644 apps/files_encryption/l10n/ta_LK.php
 create mode 100644 apps/files_encryption/l10n/th_TH.js
 create mode 100644 apps/files_encryption/l10n/th_TH.json
 delete mode 100644 apps/files_encryption/l10n/th_TH.php
 create mode 100644 apps/files_encryption/l10n/tr.js
 create mode 100644 apps/files_encryption/l10n/tr.json
 delete mode 100644 apps/files_encryption/l10n/tr.php
 create mode 100644 apps/files_encryption/l10n/ug.js
 create mode 100644 apps/files_encryption/l10n/ug.json
 delete mode 100644 apps/files_encryption/l10n/ug.php
 create mode 100644 apps/files_encryption/l10n/uk.js
 create mode 100644 apps/files_encryption/l10n/uk.json
 delete mode 100644 apps/files_encryption/l10n/uk.php
 create mode 100644 apps/files_encryption/l10n/ur_PK.js
 create mode 100644 apps/files_encryption/l10n/ur_PK.json
 delete mode 100644 apps/files_encryption/l10n/ur_PK.php
 create mode 100644 apps/files_encryption/l10n/vi.js
 create mode 100644 apps/files_encryption/l10n/vi.json
 delete mode 100644 apps/files_encryption/l10n/vi.php
 create mode 100644 apps/files_encryption/l10n/zh_CN.js
 create mode 100644 apps/files_encryption/l10n/zh_CN.json
 delete mode 100644 apps/files_encryption/l10n/zh_CN.php
 create mode 100644 apps/files_encryption/l10n/zh_HK.js
 create mode 100644 apps/files_encryption/l10n/zh_HK.json
 delete mode 100644 apps/files_encryption/l10n/zh_HK.php
 create mode 100644 apps/files_encryption/l10n/zh_TW.js
 create mode 100644 apps/files_encryption/l10n/zh_TW.json
 delete mode 100644 apps/files_encryption/l10n/zh_TW.php
 create mode 100644 apps/files_external/l10n/af_ZA.js
 create mode 100644 apps/files_external/l10n/af_ZA.json
 delete mode 100644 apps/files_external/l10n/af_ZA.php
 create mode 100644 apps/files_external/l10n/ar.js
 create mode 100644 apps/files_external/l10n/ar.json
 delete mode 100644 apps/files_external/l10n/ar.php
 create mode 100644 apps/files_external/l10n/ast.js
 create mode 100644 apps/files_external/l10n/ast.json
 delete mode 100644 apps/files_external/l10n/ast.php
 create mode 100644 apps/files_external/l10n/az.js
 create mode 100644 apps/files_external/l10n/az.json
 delete mode 100644 apps/files_external/l10n/az.php
 create mode 100644 apps/files_external/l10n/bg_BG.js
 create mode 100644 apps/files_external/l10n/bg_BG.json
 delete mode 100644 apps/files_external/l10n/bg_BG.php
 create mode 100644 apps/files_external/l10n/bn_BD.js
 create mode 100644 apps/files_external/l10n/bn_BD.json
 delete mode 100644 apps/files_external/l10n/bn_BD.php
 create mode 100644 apps/files_external/l10n/bn_IN.js
 create mode 100644 apps/files_external/l10n/bn_IN.json
 delete mode 100644 apps/files_external/l10n/bn_IN.php
 create mode 100644 apps/files_external/l10n/bs.js
 create mode 100644 apps/files_external/l10n/bs.json
 delete mode 100644 apps/files_external/l10n/bs.php
 create mode 100644 apps/files_external/l10n/ca.js
 create mode 100644 apps/files_external/l10n/ca.json
 delete mode 100644 apps/files_external/l10n/ca.php
 create mode 100644 apps/files_external/l10n/cs_CZ.js
 create mode 100644 apps/files_external/l10n/cs_CZ.json
 delete mode 100644 apps/files_external/l10n/cs_CZ.php
 create mode 100644 apps/files_external/l10n/cy_GB.js
 create mode 100644 apps/files_external/l10n/cy_GB.json
 delete mode 100644 apps/files_external/l10n/cy_GB.php
 create mode 100644 apps/files_external/l10n/da.js
 create mode 100644 apps/files_external/l10n/da.json
 delete mode 100644 apps/files_external/l10n/da.php
 create mode 100644 apps/files_external/l10n/de.js
 create mode 100644 apps/files_external/l10n/de.json
 delete mode 100644 apps/files_external/l10n/de.php
 create mode 100644 apps/files_external/l10n/de_AT.js
 create mode 100644 apps/files_external/l10n/de_AT.json
 delete mode 100644 apps/files_external/l10n/de_AT.php
 create mode 100644 apps/files_external/l10n/de_CH.js
 create mode 100644 apps/files_external/l10n/de_CH.json
 delete mode 100644 apps/files_external/l10n/de_CH.php
 create mode 100644 apps/files_external/l10n/de_DE.js
 create mode 100644 apps/files_external/l10n/de_DE.json
 delete mode 100644 apps/files_external/l10n/de_DE.php
 create mode 100644 apps/files_external/l10n/el.js
 create mode 100644 apps/files_external/l10n/el.json
 delete mode 100644 apps/files_external/l10n/el.php
 create mode 100644 apps/files_external/l10n/en@pirate.js
 create mode 100644 apps/files_external/l10n/en@pirate.json
 delete mode 100644 apps/files_external/l10n/en@pirate.php
 create mode 100644 apps/files_external/l10n/en_GB.js
 create mode 100644 apps/files_external/l10n/en_GB.json
 delete mode 100644 apps/files_external/l10n/en_GB.php
 create mode 100644 apps/files_external/l10n/eo.js
 create mode 100644 apps/files_external/l10n/eo.json
 delete mode 100644 apps/files_external/l10n/eo.php
 create mode 100644 apps/files_external/l10n/es.js
 create mode 100644 apps/files_external/l10n/es.json
 delete mode 100644 apps/files_external/l10n/es.php
 create mode 100644 apps/files_external/l10n/es_AR.js
 create mode 100644 apps/files_external/l10n/es_AR.json
 delete mode 100644 apps/files_external/l10n/es_AR.php
 create mode 100644 apps/files_external/l10n/es_CL.js
 create mode 100644 apps/files_external/l10n/es_CL.json
 delete mode 100644 apps/files_external/l10n/es_CL.php
 create mode 100644 apps/files_external/l10n/es_MX.js
 create mode 100644 apps/files_external/l10n/es_MX.json
 delete mode 100644 apps/files_external/l10n/es_MX.php
 create mode 100644 apps/files_external/l10n/et_EE.js
 create mode 100644 apps/files_external/l10n/et_EE.json
 delete mode 100644 apps/files_external/l10n/et_EE.php
 create mode 100644 apps/files_external/l10n/eu.js
 create mode 100644 apps/files_external/l10n/eu.json
 delete mode 100644 apps/files_external/l10n/eu.php
 create mode 100644 apps/files_external/l10n/eu_ES.js
 create mode 100644 apps/files_external/l10n/eu_ES.json
 delete mode 100644 apps/files_external/l10n/eu_ES.php
 create mode 100644 apps/files_external/l10n/fa.js
 create mode 100644 apps/files_external/l10n/fa.json
 delete mode 100644 apps/files_external/l10n/fa.php
 create mode 100644 apps/files_external/l10n/fi_FI.js
 create mode 100644 apps/files_external/l10n/fi_FI.json
 delete mode 100644 apps/files_external/l10n/fi_FI.php
 create mode 100644 apps/files_external/l10n/fr.js
 create mode 100644 apps/files_external/l10n/fr.json
 delete mode 100644 apps/files_external/l10n/fr.php
 create mode 100644 apps/files_external/l10n/gl.js
 create mode 100644 apps/files_external/l10n/gl.json
 delete mode 100644 apps/files_external/l10n/gl.php
 create mode 100644 apps/files_external/l10n/he.js
 create mode 100644 apps/files_external/l10n/he.json
 delete mode 100644 apps/files_external/l10n/he.php
 create mode 100644 apps/files_external/l10n/hi.js
 create mode 100644 apps/files_external/l10n/hi.json
 delete mode 100644 apps/files_external/l10n/hi.php
 create mode 100644 apps/files_external/l10n/hr.js
 create mode 100644 apps/files_external/l10n/hr.json
 delete mode 100644 apps/files_external/l10n/hr.php
 create mode 100644 apps/files_external/l10n/hu_HU.js
 create mode 100644 apps/files_external/l10n/hu_HU.json
 delete mode 100644 apps/files_external/l10n/hu_HU.php
 create mode 100644 apps/files_external/l10n/hy.js
 create mode 100644 apps/files_external/l10n/hy.json
 delete mode 100644 apps/files_external/l10n/hy.php
 create mode 100644 apps/files_external/l10n/ia.js
 create mode 100644 apps/files_external/l10n/ia.json
 delete mode 100644 apps/files_external/l10n/ia.php
 create mode 100644 apps/files_external/l10n/id.js
 create mode 100644 apps/files_external/l10n/id.json
 delete mode 100644 apps/files_external/l10n/id.php
 create mode 100644 apps/files_external/l10n/is.js
 create mode 100644 apps/files_external/l10n/is.json
 delete mode 100644 apps/files_external/l10n/is.php
 create mode 100644 apps/files_external/l10n/it.js
 create mode 100644 apps/files_external/l10n/it.json
 delete mode 100644 apps/files_external/l10n/it.php
 create mode 100644 apps/files_external/l10n/ja.js
 create mode 100644 apps/files_external/l10n/ja.json
 delete mode 100644 apps/files_external/l10n/ja.php
 create mode 100644 apps/files_external/l10n/jv.js
 create mode 100644 apps/files_external/l10n/jv.json
 delete mode 100644 apps/files_external/l10n/jv.php
 create mode 100644 apps/files_external/l10n/ka_GE.js
 create mode 100644 apps/files_external/l10n/ka_GE.json
 delete mode 100644 apps/files_external/l10n/ka_GE.php
 create mode 100644 apps/files_external/l10n/km.js
 create mode 100644 apps/files_external/l10n/km.json
 delete mode 100644 apps/files_external/l10n/km.php
 create mode 100644 apps/files_external/l10n/ko.js
 create mode 100644 apps/files_external/l10n/ko.json
 delete mode 100644 apps/files_external/l10n/ko.php
 create mode 100644 apps/files_external/l10n/ku_IQ.js
 create mode 100644 apps/files_external/l10n/ku_IQ.json
 delete mode 100644 apps/files_external/l10n/ku_IQ.php
 create mode 100644 apps/files_external/l10n/lb.js
 create mode 100644 apps/files_external/l10n/lb.json
 delete mode 100644 apps/files_external/l10n/lb.php
 create mode 100644 apps/files_external/l10n/lt_LT.js
 create mode 100644 apps/files_external/l10n/lt_LT.json
 delete mode 100644 apps/files_external/l10n/lt_LT.php
 create mode 100644 apps/files_external/l10n/lv.js
 create mode 100644 apps/files_external/l10n/lv.json
 delete mode 100644 apps/files_external/l10n/lv.php
 create mode 100644 apps/files_external/l10n/mk.js
 create mode 100644 apps/files_external/l10n/mk.json
 delete mode 100644 apps/files_external/l10n/mk.php
 create mode 100644 apps/files_external/l10n/ms_MY.js
 create mode 100644 apps/files_external/l10n/ms_MY.json
 delete mode 100644 apps/files_external/l10n/ms_MY.php
 create mode 100644 apps/files_external/l10n/my_MM.js
 create mode 100644 apps/files_external/l10n/my_MM.json
 delete mode 100644 apps/files_external/l10n/my_MM.php
 create mode 100644 apps/files_external/l10n/nb_NO.js
 create mode 100644 apps/files_external/l10n/nb_NO.json
 delete mode 100644 apps/files_external/l10n/nb_NO.php
 create mode 100644 apps/files_external/l10n/nl.js
 create mode 100644 apps/files_external/l10n/nl.json
 delete mode 100644 apps/files_external/l10n/nl.php
 create mode 100644 apps/files_external/l10n/nn_NO.js
 create mode 100644 apps/files_external/l10n/nn_NO.json
 delete mode 100644 apps/files_external/l10n/nn_NO.php
 create mode 100644 apps/files_external/l10n/oc.js
 create mode 100644 apps/files_external/l10n/oc.json
 delete mode 100644 apps/files_external/l10n/oc.php
 create mode 100644 apps/files_external/l10n/pa.js
 create mode 100644 apps/files_external/l10n/pa.json
 delete mode 100644 apps/files_external/l10n/pa.php
 create mode 100644 apps/files_external/l10n/pl.js
 create mode 100644 apps/files_external/l10n/pl.json
 delete mode 100644 apps/files_external/l10n/pl.php
 create mode 100644 apps/files_external/l10n/pt_BR.js
 create mode 100644 apps/files_external/l10n/pt_BR.json
 delete mode 100644 apps/files_external/l10n/pt_BR.php
 create mode 100644 apps/files_external/l10n/pt_PT.js
 create mode 100644 apps/files_external/l10n/pt_PT.json
 delete mode 100644 apps/files_external/l10n/pt_PT.php
 create mode 100644 apps/files_external/l10n/ro.js
 create mode 100644 apps/files_external/l10n/ro.json
 delete mode 100644 apps/files_external/l10n/ro.php
 create mode 100644 apps/files_external/l10n/ru.js
 create mode 100644 apps/files_external/l10n/ru.json
 delete mode 100644 apps/files_external/l10n/ru.php
 create mode 100644 apps/files_external/l10n/si_LK.js
 create mode 100644 apps/files_external/l10n/si_LK.json
 delete mode 100644 apps/files_external/l10n/si_LK.php
 create mode 100644 apps/files_external/l10n/sk_SK.js
 create mode 100644 apps/files_external/l10n/sk_SK.json
 delete mode 100644 apps/files_external/l10n/sk_SK.php
 create mode 100644 apps/files_external/l10n/sl.js
 create mode 100644 apps/files_external/l10n/sl.json
 delete mode 100644 apps/files_external/l10n/sl.php
 create mode 100644 apps/files_external/l10n/sq.js
 create mode 100644 apps/files_external/l10n/sq.json
 delete mode 100644 apps/files_external/l10n/sq.php
 create mode 100644 apps/files_external/l10n/sr.js
 create mode 100644 apps/files_external/l10n/sr.json
 delete mode 100644 apps/files_external/l10n/sr.php
 create mode 100644 apps/files_external/l10n/sr@latin.js
 create mode 100644 apps/files_external/l10n/sr@latin.json
 delete mode 100644 apps/files_external/l10n/sr@latin.php
 create mode 100644 apps/files_external/l10n/sv.js
 create mode 100644 apps/files_external/l10n/sv.json
 delete mode 100644 apps/files_external/l10n/sv.php
 create mode 100644 apps/files_external/l10n/ta_LK.js
 create mode 100644 apps/files_external/l10n/ta_LK.json
 delete mode 100644 apps/files_external/l10n/ta_LK.php
 create mode 100644 apps/files_external/l10n/te.js
 create mode 100644 apps/files_external/l10n/te.json
 delete mode 100644 apps/files_external/l10n/te.php
 create mode 100644 apps/files_external/l10n/th_TH.js
 create mode 100644 apps/files_external/l10n/th_TH.json
 delete mode 100644 apps/files_external/l10n/th_TH.php
 create mode 100644 apps/files_external/l10n/tr.js
 create mode 100644 apps/files_external/l10n/tr.json
 delete mode 100644 apps/files_external/l10n/tr.php
 create mode 100644 apps/files_external/l10n/ug.js
 create mode 100644 apps/files_external/l10n/ug.json
 delete mode 100644 apps/files_external/l10n/ug.php
 create mode 100644 apps/files_external/l10n/uk.js
 create mode 100644 apps/files_external/l10n/uk.json
 delete mode 100644 apps/files_external/l10n/uk.php
 create mode 100644 apps/files_external/l10n/ur_PK.js
 create mode 100644 apps/files_external/l10n/ur_PK.json
 delete mode 100644 apps/files_external/l10n/ur_PK.php
 create mode 100644 apps/files_external/l10n/vi.js
 create mode 100644 apps/files_external/l10n/vi.json
 delete mode 100644 apps/files_external/l10n/vi.php
 create mode 100644 apps/files_external/l10n/zh_CN.js
 create mode 100644 apps/files_external/l10n/zh_CN.json
 delete mode 100644 apps/files_external/l10n/zh_CN.php
 create mode 100644 apps/files_external/l10n/zh_HK.js
 create mode 100644 apps/files_external/l10n/zh_HK.json
 delete mode 100644 apps/files_external/l10n/zh_HK.php
 create mode 100644 apps/files_external/l10n/zh_TW.js
 create mode 100644 apps/files_external/l10n/zh_TW.json
 delete mode 100644 apps/files_external/l10n/zh_TW.php
 create mode 100644 apps/files_sharing/l10n/af_ZA.js
 create mode 100644 apps/files_sharing/l10n/af_ZA.json
 delete mode 100644 apps/files_sharing/l10n/af_ZA.php
 create mode 100644 apps/files_sharing/l10n/ar.js
 create mode 100644 apps/files_sharing/l10n/ar.json
 delete mode 100644 apps/files_sharing/l10n/ar.php
 create mode 100644 apps/files_sharing/l10n/ast.js
 create mode 100644 apps/files_sharing/l10n/ast.json
 delete mode 100644 apps/files_sharing/l10n/ast.php
 create mode 100644 apps/files_sharing/l10n/az.js
 create mode 100644 apps/files_sharing/l10n/az.json
 delete mode 100644 apps/files_sharing/l10n/az.php
 create mode 100644 apps/files_sharing/l10n/bg_BG.js
 create mode 100644 apps/files_sharing/l10n/bg_BG.json
 delete mode 100644 apps/files_sharing/l10n/bg_BG.php
 create mode 100644 apps/files_sharing/l10n/bn_BD.js
 create mode 100644 apps/files_sharing/l10n/bn_BD.json
 delete mode 100644 apps/files_sharing/l10n/bn_BD.php
 create mode 100644 apps/files_sharing/l10n/bn_IN.js
 create mode 100644 apps/files_sharing/l10n/bn_IN.json
 delete mode 100644 apps/files_sharing/l10n/bn_IN.php
 create mode 100644 apps/files_sharing/l10n/bs.js
 create mode 100644 apps/files_sharing/l10n/bs.json
 delete mode 100644 apps/files_sharing/l10n/bs.php
 create mode 100644 apps/files_sharing/l10n/ca.js
 create mode 100644 apps/files_sharing/l10n/ca.json
 delete mode 100644 apps/files_sharing/l10n/ca.php
 create mode 100644 apps/files_sharing/l10n/cs_CZ.js
 create mode 100644 apps/files_sharing/l10n/cs_CZ.json
 delete mode 100644 apps/files_sharing/l10n/cs_CZ.php
 create mode 100644 apps/files_sharing/l10n/cy_GB.js
 create mode 100644 apps/files_sharing/l10n/cy_GB.json
 delete mode 100644 apps/files_sharing/l10n/cy_GB.php
 create mode 100644 apps/files_sharing/l10n/da.js
 create mode 100644 apps/files_sharing/l10n/da.json
 delete mode 100644 apps/files_sharing/l10n/da.php
 create mode 100644 apps/files_sharing/l10n/de.js
 create mode 100644 apps/files_sharing/l10n/de.json
 delete mode 100644 apps/files_sharing/l10n/de.php
 create mode 100644 apps/files_sharing/l10n/de_AT.js
 create mode 100644 apps/files_sharing/l10n/de_AT.json
 delete mode 100644 apps/files_sharing/l10n/de_AT.php
 create mode 100644 apps/files_sharing/l10n/de_CH.js
 create mode 100644 apps/files_sharing/l10n/de_CH.json
 delete mode 100644 apps/files_sharing/l10n/de_CH.php
 create mode 100644 apps/files_sharing/l10n/de_DE.js
 create mode 100644 apps/files_sharing/l10n/de_DE.json
 delete mode 100644 apps/files_sharing/l10n/de_DE.php
 create mode 100644 apps/files_sharing/l10n/el.js
 create mode 100644 apps/files_sharing/l10n/el.json
 delete mode 100644 apps/files_sharing/l10n/el.php
 create mode 100644 apps/files_sharing/l10n/en@pirate.js
 create mode 100644 apps/files_sharing/l10n/en@pirate.json
 delete mode 100644 apps/files_sharing/l10n/en@pirate.php
 create mode 100644 apps/files_sharing/l10n/en_GB.js
 create mode 100644 apps/files_sharing/l10n/en_GB.json
 delete mode 100644 apps/files_sharing/l10n/en_GB.php
 create mode 100644 apps/files_sharing/l10n/eo.js
 create mode 100644 apps/files_sharing/l10n/eo.json
 delete mode 100644 apps/files_sharing/l10n/eo.php
 create mode 100644 apps/files_sharing/l10n/es.js
 create mode 100644 apps/files_sharing/l10n/es.json
 delete mode 100644 apps/files_sharing/l10n/es.php
 create mode 100644 apps/files_sharing/l10n/es_AR.js
 create mode 100644 apps/files_sharing/l10n/es_AR.json
 delete mode 100644 apps/files_sharing/l10n/es_AR.php
 create mode 100644 apps/files_sharing/l10n/es_CL.js
 create mode 100644 apps/files_sharing/l10n/es_CL.json
 delete mode 100644 apps/files_sharing/l10n/es_CL.php
 create mode 100644 apps/files_sharing/l10n/es_MX.js
 create mode 100644 apps/files_sharing/l10n/es_MX.json
 delete mode 100644 apps/files_sharing/l10n/es_MX.php
 create mode 100644 apps/files_sharing/l10n/et_EE.js
 create mode 100644 apps/files_sharing/l10n/et_EE.json
 delete mode 100644 apps/files_sharing/l10n/et_EE.php
 create mode 100644 apps/files_sharing/l10n/eu.js
 create mode 100644 apps/files_sharing/l10n/eu.json
 delete mode 100644 apps/files_sharing/l10n/eu.php
 create mode 100644 apps/files_sharing/l10n/eu_ES.js
 create mode 100644 apps/files_sharing/l10n/eu_ES.json
 delete mode 100644 apps/files_sharing/l10n/eu_ES.php
 create mode 100644 apps/files_sharing/l10n/fa.js
 create mode 100644 apps/files_sharing/l10n/fa.json
 delete mode 100644 apps/files_sharing/l10n/fa.php
 create mode 100644 apps/files_sharing/l10n/fi_FI.js
 create mode 100644 apps/files_sharing/l10n/fi_FI.json
 delete mode 100644 apps/files_sharing/l10n/fi_FI.php
 create mode 100644 apps/files_sharing/l10n/fr.js
 create mode 100644 apps/files_sharing/l10n/fr.json
 delete mode 100644 apps/files_sharing/l10n/fr.php
 create mode 100644 apps/files_sharing/l10n/gl.js
 create mode 100644 apps/files_sharing/l10n/gl.json
 delete mode 100644 apps/files_sharing/l10n/gl.php
 create mode 100644 apps/files_sharing/l10n/he.js
 create mode 100644 apps/files_sharing/l10n/he.json
 delete mode 100644 apps/files_sharing/l10n/he.php
 create mode 100644 apps/files_sharing/l10n/hi.js
 create mode 100644 apps/files_sharing/l10n/hi.json
 delete mode 100644 apps/files_sharing/l10n/hi.php
 create mode 100644 apps/files_sharing/l10n/hr.js
 create mode 100644 apps/files_sharing/l10n/hr.json
 delete mode 100644 apps/files_sharing/l10n/hr.php
 create mode 100644 apps/files_sharing/l10n/hu_HU.js
 create mode 100644 apps/files_sharing/l10n/hu_HU.json
 delete mode 100644 apps/files_sharing/l10n/hu_HU.php
 create mode 100644 apps/files_sharing/l10n/hy.js
 create mode 100644 apps/files_sharing/l10n/hy.json
 delete mode 100644 apps/files_sharing/l10n/hy.php
 create mode 100644 apps/files_sharing/l10n/ia.js
 create mode 100644 apps/files_sharing/l10n/ia.json
 delete mode 100644 apps/files_sharing/l10n/ia.php
 create mode 100644 apps/files_sharing/l10n/id.js
 create mode 100644 apps/files_sharing/l10n/id.json
 delete mode 100644 apps/files_sharing/l10n/id.php
 create mode 100644 apps/files_sharing/l10n/is.js
 create mode 100644 apps/files_sharing/l10n/is.json
 delete mode 100644 apps/files_sharing/l10n/is.php
 create mode 100644 apps/files_sharing/l10n/it.js
 create mode 100644 apps/files_sharing/l10n/it.json
 delete mode 100644 apps/files_sharing/l10n/it.php
 create mode 100644 apps/files_sharing/l10n/ja.js
 create mode 100644 apps/files_sharing/l10n/ja.json
 delete mode 100644 apps/files_sharing/l10n/ja.php
 create mode 100644 apps/files_sharing/l10n/jv.js
 create mode 100644 apps/files_sharing/l10n/jv.json
 delete mode 100644 apps/files_sharing/l10n/jv.php
 create mode 100644 apps/files_sharing/l10n/ka_GE.js
 create mode 100644 apps/files_sharing/l10n/ka_GE.json
 delete mode 100644 apps/files_sharing/l10n/ka_GE.php
 create mode 100644 apps/files_sharing/l10n/km.js
 create mode 100644 apps/files_sharing/l10n/km.json
 delete mode 100644 apps/files_sharing/l10n/km.php
 create mode 100644 apps/files_sharing/l10n/ko.js
 create mode 100644 apps/files_sharing/l10n/ko.json
 delete mode 100644 apps/files_sharing/l10n/ko.php
 create mode 100644 apps/files_sharing/l10n/ku_IQ.js
 create mode 100644 apps/files_sharing/l10n/ku_IQ.json
 delete mode 100644 apps/files_sharing/l10n/ku_IQ.php
 create mode 100644 apps/files_sharing/l10n/lb.js
 create mode 100644 apps/files_sharing/l10n/lb.json
 delete mode 100644 apps/files_sharing/l10n/lb.php
 create mode 100644 apps/files_sharing/l10n/lt_LT.js
 create mode 100644 apps/files_sharing/l10n/lt_LT.json
 delete mode 100644 apps/files_sharing/l10n/lt_LT.php
 create mode 100644 apps/files_sharing/l10n/lv.js
 create mode 100644 apps/files_sharing/l10n/lv.json
 delete mode 100644 apps/files_sharing/l10n/lv.php
 create mode 100644 apps/files_sharing/l10n/mk.js
 create mode 100644 apps/files_sharing/l10n/mk.json
 delete mode 100644 apps/files_sharing/l10n/mk.php
 create mode 100644 apps/files_sharing/l10n/ms_MY.js
 create mode 100644 apps/files_sharing/l10n/ms_MY.json
 delete mode 100644 apps/files_sharing/l10n/ms_MY.php
 create mode 100644 apps/files_sharing/l10n/my_MM.js
 create mode 100644 apps/files_sharing/l10n/my_MM.json
 delete mode 100644 apps/files_sharing/l10n/my_MM.php
 create mode 100644 apps/files_sharing/l10n/nb_NO.js
 create mode 100644 apps/files_sharing/l10n/nb_NO.json
 delete mode 100644 apps/files_sharing/l10n/nb_NO.php
 create mode 100644 apps/files_sharing/l10n/nl.js
 create mode 100644 apps/files_sharing/l10n/nl.json
 delete mode 100644 apps/files_sharing/l10n/nl.php
 create mode 100644 apps/files_sharing/l10n/nn_NO.js
 create mode 100644 apps/files_sharing/l10n/nn_NO.json
 delete mode 100644 apps/files_sharing/l10n/nn_NO.php
 create mode 100644 apps/files_sharing/l10n/oc.js
 create mode 100644 apps/files_sharing/l10n/oc.json
 delete mode 100644 apps/files_sharing/l10n/oc.php
 create mode 100644 apps/files_sharing/l10n/pa.js
 create mode 100644 apps/files_sharing/l10n/pa.json
 delete mode 100644 apps/files_sharing/l10n/pa.php
 create mode 100644 apps/files_sharing/l10n/pl.js
 create mode 100644 apps/files_sharing/l10n/pl.json
 delete mode 100644 apps/files_sharing/l10n/pl.php
 create mode 100644 apps/files_sharing/l10n/pt_BR.js
 create mode 100644 apps/files_sharing/l10n/pt_BR.json
 delete mode 100644 apps/files_sharing/l10n/pt_BR.php
 create mode 100644 apps/files_sharing/l10n/pt_PT.js
 create mode 100644 apps/files_sharing/l10n/pt_PT.json
 delete mode 100644 apps/files_sharing/l10n/pt_PT.php
 create mode 100644 apps/files_sharing/l10n/ro.js
 create mode 100644 apps/files_sharing/l10n/ro.json
 delete mode 100644 apps/files_sharing/l10n/ro.php
 create mode 100644 apps/files_sharing/l10n/ru.js
 create mode 100644 apps/files_sharing/l10n/ru.json
 delete mode 100644 apps/files_sharing/l10n/ru.php
 create mode 100644 apps/files_sharing/l10n/si_LK.js
 create mode 100644 apps/files_sharing/l10n/si_LK.json
 delete mode 100644 apps/files_sharing/l10n/si_LK.php
 create mode 100644 apps/files_sharing/l10n/sk_SK.js
 create mode 100644 apps/files_sharing/l10n/sk_SK.json
 delete mode 100644 apps/files_sharing/l10n/sk_SK.php
 create mode 100644 apps/files_sharing/l10n/sl.js
 create mode 100644 apps/files_sharing/l10n/sl.json
 delete mode 100644 apps/files_sharing/l10n/sl.php
 create mode 100644 apps/files_sharing/l10n/sq.js
 create mode 100644 apps/files_sharing/l10n/sq.json
 delete mode 100644 apps/files_sharing/l10n/sq.php
 create mode 100644 apps/files_sharing/l10n/sr.js
 create mode 100644 apps/files_sharing/l10n/sr.json
 delete mode 100644 apps/files_sharing/l10n/sr.php
 create mode 100644 apps/files_sharing/l10n/sr@latin.js
 create mode 100644 apps/files_sharing/l10n/sr@latin.json
 delete mode 100644 apps/files_sharing/l10n/sr@latin.php
 create mode 100644 apps/files_sharing/l10n/sv.js
 create mode 100644 apps/files_sharing/l10n/sv.json
 delete mode 100644 apps/files_sharing/l10n/sv.php
 create mode 100644 apps/files_sharing/l10n/ta_LK.js
 create mode 100644 apps/files_sharing/l10n/ta_LK.json
 delete mode 100644 apps/files_sharing/l10n/ta_LK.php
 create mode 100644 apps/files_sharing/l10n/te.js
 create mode 100644 apps/files_sharing/l10n/te.json
 delete mode 100644 apps/files_sharing/l10n/te.php
 create mode 100644 apps/files_sharing/l10n/th_TH.js
 create mode 100644 apps/files_sharing/l10n/th_TH.json
 delete mode 100644 apps/files_sharing/l10n/th_TH.php
 create mode 100644 apps/files_sharing/l10n/tr.js
 create mode 100644 apps/files_sharing/l10n/tr.json
 delete mode 100644 apps/files_sharing/l10n/tr.php
 create mode 100644 apps/files_sharing/l10n/ug.js
 create mode 100644 apps/files_sharing/l10n/ug.json
 delete mode 100644 apps/files_sharing/l10n/ug.php
 create mode 100644 apps/files_sharing/l10n/uk.js
 create mode 100644 apps/files_sharing/l10n/uk.json
 delete mode 100644 apps/files_sharing/l10n/uk.php
 create mode 100644 apps/files_sharing/l10n/ur_PK.js
 create mode 100644 apps/files_sharing/l10n/ur_PK.json
 delete mode 100644 apps/files_sharing/l10n/ur_PK.php
 create mode 100644 apps/files_sharing/l10n/vi.js
 create mode 100644 apps/files_sharing/l10n/vi.json
 delete mode 100644 apps/files_sharing/l10n/vi.php
 create mode 100644 apps/files_sharing/l10n/zh_CN.js
 create mode 100644 apps/files_sharing/l10n/zh_CN.json
 delete mode 100644 apps/files_sharing/l10n/zh_CN.php
 create mode 100644 apps/files_sharing/l10n/zh_HK.js
 create mode 100644 apps/files_sharing/l10n/zh_HK.json
 delete mode 100644 apps/files_sharing/l10n/zh_HK.php
 create mode 100644 apps/files_sharing/l10n/zh_TW.js
 create mode 100644 apps/files_sharing/l10n/zh_TW.json
 delete mode 100644 apps/files_sharing/l10n/zh_TW.php
 create mode 100644 apps/files_trashbin/l10n/ar.js
 create mode 100644 apps/files_trashbin/l10n/ar.json
 delete mode 100644 apps/files_trashbin/l10n/ar.php
 create mode 100644 apps/files_trashbin/l10n/ast.js
 create mode 100644 apps/files_trashbin/l10n/ast.json
 delete mode 100644 apps/files_trashbin/l10n/ast.php
 create mode 100644 apps/files_trashbin/l10n/az.js
 create mode 100644 apps/files_trashbin/l10n/az.json
 delete mode 100644 apps/files_trashbin/l10n/az.php
 create mode 100644 apps/files_trashbin/l10n/be.js
 create mode 100644 apps/files_trashbin/l10n/be.json
 delete mode 100644 apps/files_trashbin/l10n/be.php
 create mode 100644 apps/files_trashbin/l10n/bg_BG.js
 create mode 100644 apps/files_trashbin/l10n/bg_BG.json
 delete mode 100644 apps/files_trashbin/l10n/bg_BG.php
 create mode 100644 apps/files_trashbin/l10n/bn_BD.js
 create mode 100644 apps/files_trashbin/l10n/bn_BD.json
 delete mode 100644 apps/files_trashbin/l10n/bn_BD.php
 create mode 100644 apps/files_trashbin/l10n/bn_IN.js
 create mode 100644 apps/files_trashbin/l10n/bn_IN.json
 delete mode 100644 apps/files_trashbin/l10n/bn_IN.php
 create mode 100644 apps/files_trashbin/l10n/bs.js
 create mode 100644 apps/files_trashbin/l10n/bs.json
 delete mode 100644 apps/files_trashbin/l10n/bs.php
 create mode 100644 apps/files_trashbin/l10n/ca.js
 create mode 100644 apps/files_trashbin/l10n/ca.json
 delete mode 100644 apps/files_trashbin/l10n/ca.php
 create mode 100644 apps/files_trashbin/l10n/cs_CZ.js
 create mode 100644 apps/files_trashbin/l10n/cs_CZ.json
 delete mode 100644 apps/files_trashbin/l10n/cs_CZ.php
 create mode 100644 apps/files_trashbin/l10n/cy_GB.js
 create mode 100644 apps/files_trashbin/l10n/cy_GB.json
 delete mode 100644 apps/files_trashbin/l10n/cy_GB.php
 create mode 100644 apps/files_trashbin/l10n/da.js
 create mode 100644 apps/files_trashbin/l10n/da.json
 delete mode 100644 apps/files_trashbin/l10n/da.php
 create mode 100644 apps/files_trashbin/l10n/de.js
 create mode 100644 apps/files_trashbin/l10n/de.json
 delete mode 100644 apps/files_trashbin/l10n/de.php
 create mode 100644 apps/files_trashbin/l10n/de_AT.js
 create mode 100644 apps/files_trashbin/l10n/de_AT.json
 delete mode 100644 apps/files_trashbin/l10n/de_AT.php
 create mode 100644 apps/files_trashbin/l10n/de_CH.js
 create mode 100644 apps/files_trashbin/l10n/de_CH.json
 delete mode 100644 apps/files_trashbin/l10n/de_CH.php
 create mode 100644 apps/files_trashbin/l10n/de_DE.js
 create mode 100644 apps/files_trashbin/l10n/de_DE.json
 delete mode 100644 apps/files_trashbin/l10n/de_DE.php
 create mode 100644 apps/files_trashbin/l10n/el.js
 create mode 100644 apps/files_trashbin/l10n/el.json
 delete mode 100644 apps/files_trashbin/l10n/el.php
 create mode 100644 apps/files_trashbin/l10n/en_GB.js
 create mode 100644 apps/files_trashbin/l10n/en_GB.json
 delete mode 100644 apps/files_trashbin/l10n/en_GB.php
 create mode 100644 apps/files_trashbin/l10n/eo.js
 create mode 100644 apps/files_trashbin/l10n/eo.json
 delete mode 100644 apps/files_trashbin/l10n/eo.php
 create mode 100644 apps/files_trashbin/l10n/es.js
 create mode 100644 apps/files_trashbin/l10n/es.json
 delete mode 100644 apps/files_trashbin/l10n/es.php
 create mode 100644 apps/files_trashbin/l10n/es_AR.js
 create mode 100644 apps/files_trashbin/l10n/es_AR.json
 delete mode 100644 apps/files_trashbin/l10n/es_AR.php
 create mode 100644 apps/files_trashbin/l10n/es_CL.js
 create mode 100644 apps/files_trashbin/l10n/es_CL.json
 delete mode 100644 apps/files_trashbin/l10n/es_CL.php
 create mode 100644 apps/files_trashbin/l10n/es_MX.js
 create mode 100644 apps/files_trashbin/l10n/es_MX.json
 delete mode 100644 apps/files_trashbin/l10n/es_MX.php
 create mode 100644 apps/files_trashbin/l10n/et_EE.js
 create mode 100644 apps/files_trashbin/l10n/et_EE.json
 delete mode 100644 apps/files_trashbin/l10n/et_EE.php
 create mode 100644 apps/files_trashbin/l10n/eu.js
 create mode 100644 apps/files_trashbin/l10n/eu.json
 delete mode 100644 apps/files_trashbin/l10n/eu.php
 create mode 100644 apps/files_trashbin/l10n/eu_ES.js
 create mode 100644 apps/files_trashbin/l10n/eu_ES.json
 delete mode 100644 apps/files_trashbin/l10n/eu_ES.php
 create mode 100644 apps/files_trashbin/l10n/fa.js
 create mode 100644 apps/files_trashbin/l10n/fa.json
 delete mode 100644 apps/files_trashbin/l10n/fa.php
 create mode 100644 apps/files_trashbin/l10n/fi_FI.js
 create mode 100644 apps/files_trashbin/l10n/fi_FI.json
 delete mode 100644 apps/files_trashbin/l10n/fi_FI.php
 create mode 100644 apps/files_trashbin/l10n/fr.js
 create mode 100644 apps/files_trashbin/l10n/fr.json
 delete mode 100644 apps/files_trashbin/l10n/fr.php
 create mode 100644 apps/files_trashbin/l10n/gl.js
 create mode 100644 apps/files_trashbin/l10n/gl.json
 delete mode 100644 apps/files_trashbin/l10n/gl.php
 create mode 100644 apps/files_trashbin/l10n/he.js
 create mode 100644 apps/files_trashbin/l10n/he.json
 delete mode 100644 apps/files_trashbin/l10n/he.php
 create mode 100644 apps/files_trashbin/l10n/hi.js
 create mode 100644 apps/files_trashbin/l10n/hi.json
 delete mode 100644 apps/files_trashbin/l10n/hi.php
 create mode 100644 apps/files_trashbin/l10n/hr.js
 create mode 100644 apps/files_trashbin/l10n/hr.json
 delete mode 100644 apps/files_trashbin/l10n/hr.php
 create mode 100644 apps/files_trashbin/l10n/hu_HU.js
 create mode 100644 apps/files_trashbin/l10n/hu_HU.json
 delete mode 100644 apps/files_trashbin/l10n/hu_HU.php
 create mode 100644 apps/files_trashbin/l10n/hy.js
 create mode 100644 apps/files_trashbin/l10n/hy.json
 delete mode 100644 apps/files_trashbin/l10n/hy.php
 create mode 100644 apps/files_trashbin/l10n/ia.js
 create mode 100644 apps/files_trashbin/l10n/ia.json
 delete mode 100644 apps/files_trashbin/l10n/ia.php
 create mode 100644 apps/files_trashbin/l10n/id.js
 create mode 100644 apps/files_trashbin/l10n/id.json
 delete mode 100644 apps/files_trashbin/l10n/id.php
 create mode 100644 apps/files_trashbin/l10n/is.js
 create mode 100644 apps/files_trashbin/l10n/is.json
 delete mode 100644 apps/files_trashbin/l10n/is.php
 create mode 100644 apps/files_trashbin/l10n/it.js
 create mode 100644 apps/files_trashbin/l10n/it.json
 delete mode 100644 apps/files_trashbin/l10n/it.php
 create mode 100644 apps/files_trashbin/l10n/ja.js
 create mode 100644 apps/files_trashbin/l10n/ja.json
 delete mode 100644 apps/files_trashbin/l10n/ja.php
 create mode 100644 apps/files_trashbin/l10n/ka_GE.js
 create mode 100644 apps/files_trashbin/l10n/ka_GE.json
 delete mode 100644 apps/files_trashbin/l10n/ka_GE.php
 create mode 100644 apps/files_trashbin/l10n/km.js
 create mode 100644 apps/files_trashbin/l10n/km.json
 delete mode 100644 apps/files_trashbin/l10n/km.php
 create mode 100644 apps/files_trashbin/l10n/ko.js
 create mode 100644 apps/files_trashbin/l10n/ko.json
 delete mode 100644 apps/files_trashbin/l10n/ko.php
 create mode 100644 apps/files_trashbin/l10n/ku_IQ.js
 create mode 100644 apps/files_trashbin/l10n/ku_IQ.json
 delete mode 100644 apps/files_trashbin/l10n/ku_IQ.php
 create mode 100644 apps/files_trashbin/l10n/lb.js
 create mode 100644 apps/files_trashbin/l10n/lb.json
 delete mode 100644 apps/files_trashbin/l10n/lb.php
 create mode 100644 apps/files_trashbin/l10n/lt_LT.js
 create mode 100644 apps/files_trashbin/l10n/lt_LT.json
 delete mode 100644 apps/files_trashbin/l10n/lt_LT.php
 create mode 100644 apps/files_trashbin/l10n/lv.js
 create mode 100644 apps/files_trashbin/l10n/lv.json
 delete mode 100644 apps/files_trashbin/l10n/lv.php
 create mode 100644 apps/files_trashbin/l10n/mk.js
 create mode 100644 apps/files_trashbin/l10n/mk.json
 delete mode 100644 apps/files_trashbin/l10n/mk.php
 create mode 100644 apps/files_trashbin/l10n/ms_MY.js
 create mode 100644 apps/files_trashbin/l10n/ms_MY.json
 delete mode 100644 apps/files_trashbin/l10n/ms_MY.php
 create mode 100644 apps/files_trashbin/l10n/nb_NO.js
 create mode 100644 apps/files_trashbin/l10n/nb_NO.json
 delete mode 100644 apps/files_trashbin/l10n/nb_NO.php
 create mode 100644 apps/files_trashbin/l10n/nl.js
 create mode 100644 apps/files_trashbin/l10n/nl.json
 delete mode 100644 apps/files_trashbin/l10n/nl.php
 create mode 100644 apps/files_trashbin/l10n/nn_NO.js
 create mode 100644 apps/files_trashbin/l10n/nn_NO.json
 delete mode 100644 apps/files_trashbin/l10n/nn_NO.php
 create mode 100644 apps/files_trashbin/l10n/oc.js
 create mode 100644 apps/files_trashbin/l10n/oc.json
 delete mode 100644 apps/files_trashbin/l10n/oc.php
 create mode 100644 apps/files_trashbin/l10n/pa.js
 create mode 100644 apps/files_trashbin/l10n/pa.json
 delete mode 100644 apps/files_trashbin/l10n/pa.php
 create mode 100644 apps/files_trashbin/l10n/pl.js
 create mode 100644 apps/files_trashbin/l10n/pl.json
 delete mode 100644 apps/files_trashbin/l10n/pl.php
 create mode 100644 apps/files_trashbin/l10n/pt_BR.js
 create mode 100644 apps/files_trashbin/l10n/pt_BR.json
 delete mode 100644 apps/files_trashbin/l10n/pt_BR.php
 create mode 100644 apps/files_trashbin/l10n/pt_PT.js
 create mode 100644 apps/files_trashbin/l10n/pt_PT.json
 delete mode 100644 apps/files_trashbin/l10n/pt_PT.php
 create mode 100644 apps/files_trashbin/l10n/ro.js
 create mode 100644 apps/files_trashbin/l10n/ro.json
 delete mode 100644 apps/files_trashbin/l10n/ro.php
 create mode 100644 apps/files_trashbin/l10n/ru.js
 create mode 100644 apps/files_trashbin/l10n/ru.json
 delete mode 100644 apps/files_trashbin/l10n/ru.php
 create mode 100644 apps/files_trashbin/l10n/si_LK.js
 create mode 100644 apps/files_trashbin/l10n/si_LK.json
 delete mode 100644 apps/files_trashbin/l10n/si_LK.php
 create mode 100644 apps/files_trashbin/l10n/sk_SK.js
 create mode 100644 apps/files_trashbin/l10n/sk_SK.json
 delete mode 100644 apps/files_trashbin/l10n/sk_SK.php
 create mode 100644 apps/files_trashbin/l10n/sl.js
 create mode 100644 apps/files_trashbin/l10n/sl.json
 delete mode 100644 apps/files_trashbin/l10n/sl.php
 create mode 100644 apps/files_trashbin/l10n/sq.js
 create mode 100644 apps/files_trashbin/l10n/sq.json
 delete mode 100644 apps/files_trashbin/l10n/sq.php
 create mode 100644 apps/files_trashbin/l10n/sr.js
 create mode 100644 apps/files_trashbin/l10n/sr.json
 delete mode 100644 apps/files_trashbin/l10n/sr.php
 create mode 100644 apps/files_trashbin/l10n/sr@latin.js
 create mode 100644 apps/files_trashbin/l10n/sr@latin.json
 delete mode 100644 apps/files_trashbin/l10n/sr@latin.php
 create mode 100644 apps/files_trashbin/l10n/sv.js
 create mode 100644 apps/files_trashbin/l10n/sv.json
 delete mode 100644 apps/files_trashbin/l10n/sv.php
 create mode 100644 apps/files_trashbin/l10n/ta_LK.js
 create mode 100644 apps/files_trashbin/l10n/ta_LK.json
 delete mode 100644 apps/files_trashbin/l10n/ta_LK.php
 create mode 100644 apps/files_trashbin/l10n/te.js
 create mode 100644 apps/files_trashbin/l10n/te.json
 delete mode 100644 apps/files_trashbin/l10n/te.php
 create mode 100644 apps/files_trashbin/l10n/th_TH.js
 create mode 100644 apps/files_trashbin/l10n/th_TH.json
 delete mode 100644 apps/files_trashbin/l10n/th_TH.php
 create mode 100644 apps/files_trashbin/l10n/tr.js
 create mode 100644 apps/files_trashbin/l10n/tr.json
 delete mode 100644 apps/files_trashbin/l10n/tr.php
 create mode 100644 apps/files_trashbin/l10n/ug.js
 create mode 100644 apps/files_trashbin/l10n/ug.json
 delete mode 100644 apps/files_trashbin/l10n/ug.php
 create mode 100644 apps/files_trashbin/l10n/uk.js
 create mode 100644 apps/files_trashbin/l10n/uk.json
 delete mode 100644 apps/files_trashbin/l10n/uk.php
 create mode 100644 apps/files_trashbin/l10n/ur_PK.js
 create mode 100644 apps/files_trashbin/l10n/ur_PK.json
 delete mode 100644 apps/files_trashbin/l10n/ur_PK.php
 create mode 100644 apps/files_trashbin/l10n/vi.js
 create mode 100644 apps/files_trashbin/l10n/vi.json
 delete mode 100644 apps/files_trashbin/l10n/vi.php
 create mode 100644 apps/files_trashbin/l10n/zh_CN.js
 create mode 100644 apps/files_trashbin/l10n/zh_CN.json
 delete mode 100644 apps/files_trashbin/l10n/zh_CN.php
 create mode 100644 apps/files_trashbin/l10n/zh_HK.js
 create mode 100644 apps/files_trashbin/l10n/zh_HK.json
 delete mode 100644 apps/files_trashbin/l10n/zh_HK.php
 create mode 100644 apps/files_trashbin/l10n/zh_TW.js
 create mode 100644 apps/files_trashbin/l10n/zh_TW.json
 delete mode 100644 apps/files_trashbin/l10n/zh_TW.php
 create mode 100644 apps/files_versions/l10n/ar.js
 create mode 100644 apps/files_versions/l10n/ar.json
 delete mode 100644 apps/files_versions/l10n/ar.php
 create mode 100644 apps/files_versions/l10n/ast.js
 create mode 100644 apps/files_versions/l10n/ast.json
 delete mode 100644 apps/files_versions/l10n/ast.php
 create mode 100644 apps/files_versions/l10n/az.js
 create mode 100644 apps/files_versions/l10n/az.json
 delete mode 100644 apps/files_versions/l10n/az.php
 create mode 100644 apps/files_versions/l10n/bg_BG.js
 create mode 100644 apps/files_versions/l10n/bg_BG.json
 delete mode 100644 apps/files_versions/l10n/bg_BG.php
 create mode 100644 apps/files_versions/l10n/bn_BD.js
 create mode 100644 apps/files_versions/l10n/bn_BD.json
 delete mode 100644 apps/files_versions/l10n/bn_BD.php
 create mode 100644 apps/files_versions/l10n/bn_IN.js
 create mode 100644 apps/files_versions/l10n/bn_IN.json
 delete mode 100644 apps/files_versions/l10n/bn_IN.php
 create mode 100644 apps/files_versions/l10n/ca.js
 create mode 100644 apps/files_versions/l10n/ca.json
 delete mode 100644 apps/files_versions/l10n/ca.php
 create mode 100644 apps/files_versions/l10n/cs_CZ.js
 create mode 100644 apps/files_versions/l10n/cs_CZ.json
 delete mode 100644 apps/files_versions/l10n/cs_CZ.php
 create mode 100644 apps/files_versions/l10n/cy_GB.js
 create mode 100644 apps/files_versions/l10n/cy_GB.json
 delete mode 100644 apps/files_versions/l10n/cy_GB.php
 create mode 100644 apps/files_versions/l10n/da.js
 create mode 100644 apps/files_versions/l10n/da.json
 delete mode 100644 apps/files_versions/l10n/da.php
 create mode 100644 apps/files_versions/l10n/de.js
 create mode 100644 apps/files_versions/l10n/de.json
 delete mode 100644 apps/files_versions/l10n/de.php
 create mode 100644 apps/files_versions/l10n/de_CH.js
 create mode 100644 apps/files_versions/l10n/de_CH.json
 delete mode 100644 apps/files_versions/l10n/de_CH.php
 create mode 100644 apps/files_versions/l10n/de_DE.js
 create mode 100644 apps/files_versions/l10n/de_DE.json
 delete mode 100644 apps/files_versions/l10n/de_DE.php
 create mode 100644 apps/files_versions/l10n/el.js
 create mode 100644 apps/files_versions/l10n/el.json
 delete mode 100644 apps/files_versions/l10n/el.php
 create mode 100644 apps/files_versions/l10n/en_GB.js
 create mode 100644 apps/files_versions/l10n/en_GB.json
 delete mode 100644 apps/files_versions/l10n/en_GB.php
 create mode 100644 apps/files_versions/l10n/eo.js
 create mode 100644 apps/files_versions/l10n/eo.json
 delete mode 100644 apps/files_versions/l10n/eo.php
 create mode 100644 apps/files_versions/l10n/es.js
 create mode 100644 apps/files_versions/l10n/es.json
 delete mode 100644 apps/files_versions/l10n/es.php
 create mode 100644 apps/files_versions/l10n/es_AR.js
 create mode 100644 apps/files_versions/l10n/es_AR.json
 delete mode 100644 apps/files_versions/l10n/es_AR.php
 create mode 100644 apps/files_versions/l10n/es_MX.js
 create mode 100644 apps/files_versions/l10n/es_MX.json
 delete mode 100644 apps/files_versions/l10n/es_MX.php
 create mode 100644 apps/files_versions/l10n/et_EE.js
 create mode 100644 apps/files_versions/l10n/et_EE.json
 delete mode 100644 apps/files_versions/l10n/et_EE.php
 create mode 100644 apps/files_versions/l10n/eu.js
 create mode 100644 apps/files_versions/l10n/eu.json
 delete mode 100644 apps/files_versions/l10n/eu.php
 create mode 100644 apps/files_versions/l10n/fa.js
 create mode 100644 apps/files_versions/l10n/fa.json
 delete mode 100644 apps/files_versions/l10n/fa.php
 create mode 100644 apps/files_versions/l10n/fi_FI.js
 create mode 100644 apps/files_versions/l10n/fi_FI.json
 delete mode 100644 apps/files_versions/l10n/fi_FI.php
 create mode 100644 apps/files_versions/l10n/fr.js
 create mode 100644 apps/files_versions/l10n/fr.json
 delete mode 100644 apps/files_versions/l10n/fr.php
 create mode 100644 apps/files_versions/l10n/gl.js
 create mode 100644 apps/files_versions/l10n/gl.json
 delete mode 100644 apps/files_versions/l10n/gl.php
 create mode 100644 apps/files_versions/l10n/he.js
 create mode 100644 apps/files_versions/l10n/he.json
 delete mode 100644 apps/files_versions/l10n/he.php
 create mode 100644 apps/files_versions/l10n/hr.js
 create mode 100644 apps/files_versions/l10n/hr.json
 delete mode 100644 apps/files_versions/l10n/hr.php
 create mode 100644 apps/files_versions/l10n/hu_HU.js
 create mode 100644 apps/files_versions/l10n/hu_HU.json
 delete mode 100644 apps/files_versions/l10n/hu_HU.php
 create mode 100644 apps/files_versions/l10n/id.js
 create mode 100644 apps/files_versions/l10n/id.json
 delete mode 100644 apps/files_versions/l10n/id.php
 create mode 100644 apps/files_versions/l10n/is.js
 create mode 100644 apps/files_versions/l10n/is.json
 delete mode 100644 apps/files_versions/l10n/is.php
 create mode 100644 apps/files_versions/l10n/it.js
 create mode 100644 apps/files_versions/l10n/it.json
 delete mode 100644 apps/files_versions/l10n/it.php
 create mode 100644 apps/files_versions/l10n/ja.js
 create mode 100644 apps/files_versions/l10n/ja.json
 delete mode 100644 apps/files_versions/l10n/ja.php
 create mode 100644 apps/files_versions/l10n/ka_GE.js
 create mode 100644 apps/files_versions/l10n/ka_GE.json
 delete mode 100644 apps/files_versions/l10n/ka_GE.php
 create mode 100644 apps/files_versions/l10n/km.js
 create mode 100644 apps/files_versions/l10n/km.json
 delete mode 100644 apps/files_versions/l10n/km.php
 create mode 100644 apps/files_versions/l10n/ko.js
 create mode 100644 apps/files_versions/l10n/ko.json
 delete mode 100644 apps/files_versions/l10n/ko.php
 create mode 100644 apps/files_versions/l10n/ku_IQ.js
 create mode 100644 apps/files_versions/l10n/ku_IQ.json
 delete mode 100644 apps/files_versions/l10n/ku_IQ.php
 create mode 100644 apps/files_versions/l10n/lt_LT.js
 create mode 100644 apps/files_versions/l10n/lt_LT.json
 delete mode 100644 apps/files_versions/l10n/lt_LT.php
 create mode 100644 apps/files_versions/l10n/lv.js
 create mode 100644 apps/files_versions/l10n/lv.json
 delete mode 100644 apps/files_versions/l10n/lv.php
 create mode 100644 apps/files_versions/l10n/mk.js
 create mode 100644 apps/files_versions/l10n/mk.json
 delete mode 100644 apps/files_versions/l10n/mk.php
 create mode 100644 apps/files_versions/l10n/ms_MY.js
 create mode 100644 apps/files_versions/l10n/ms_MY.json
 delete mode 100644 apps/files_versions/l10n/ms_MY.php
 create mode 100644 apps/files_versions/l10n/nb_NO.js
 create mode 100644 apps/files_versions/l10n/nb_NO.json
 delete mode 100644 apps/files_versions/l10n/nb_NO.php
 create mode 100644 apps/files_versions/l10n/nl.js
 create mode 100644 apps/files_versions/l10n/nl.json
 delete mode 100644 apps/files_versions/l10n/nl.php
 create mode 100644 apps/files_versions/l10n/nn_NO.js
 create mode 100644 apps/files_versions/l10n/nn_NO.json
 delete mode 100644 apps/files_versions/l10n/nn_NO.php
 create mode 100644 apps/files_versions/l10n/pl.js
 create mode 100644 apps/files_versions/l10n/pl.json
 delete mode 100644 apps/files_versions/l10n/pl.php
 create mode 100644 apps/files_versions/l10n/pt_BR.js
 create mode 100644 apps/files_versions/l10n/pt_BR.json
 delete mode 100644 apps/files_versions/l10n/pt_BR.php
 create mode 100644 apps/files_versions/l10n/pt_PT.js
 create mode 100644 apps/files_versions/l10n/pt_PT.json
 delete mode 100644 apps/files_versions/l10n/pt_PT.php
 create mode 100644 apps/files_versions/l10n/ro.js
 create mode 100644 apps/files_versions/l10n/ro.json
 delete mode 100644 apps/files_versions/l10n/ro.php
 create mode 100644 apps/files_versions/l10n/ru.js
 create mode 100644 apps/files_versions/l10n/ru.json
 delete mode 100644 apps/files_versions/l10n/ru.php
 create mode 100644 apps/files_versions/l10n/si_LK.js
 create mode 100644 apps/files_versions/l10n/si_LK.json
 delete mode 100644 apps/files_versions/l10n/si_LK.php
 create mode 100644 apps/files_versions/l10n/sk_SK.js
 create mode 100644 apps/files_versions/l10n/sk_SK.json
 delete mode 100644 apps/files_versions/l10n/sk_SK.php
 create mode 100644 apps/files_versions/l10n/sl.js
 create mode 100644 apps/files_versions/l10n/sl.json
 delete mode 100644 apps/files_versions/l10n/sl.php
 create mode 100644 apps/files_versions/l10n/sq.js
 create mode 100644 apps/files_versions/l10n/sq.json
 delete mode 100644 apps/files_versions/l10n/sq.php
 create mode 100644 apps/files_versions/l10n/sr.js
 create mode 100644 apps/files_versions/l10n/sr.json
 delete mode 100644 apps/files_versions/l10n/sr.php
 create mode 100644 apps/files_versions/l10n/sv.js
 create mode 100644 apps/files_versions/l10n/sv.json
 delete mode 100644 apps/files_versions/l10n/sv.php
 create mode 100644 apps/files_versions/l10n/ta_LK.js
 create mode 100644 apps/files_versions/l10n/ta_LK.json
 delete mode 100644 apps/files_versions/l10n/ta_LK.php
 create mode 100644 apps/files_versions/l10n/th_TH.js
 create mode 100644 apps/files_versions/l10n/th_TH.json
 delete mode 100644 apps/files_versions/l10n/th_TH.php
 create mode 100644 apps/files_versions/l10n/tr.js
 create mode 100644 apps/files_versions/l10n/tr.json
 delete mode 100644 apps/files_versions/l10n/tr.php
 create mode 100644 apps/files_versions/l10n/ug.js
 create mode 100644 apps/files_versions/l10n/ug.json
 delete mode 100644 apps/files_versions/l10n/ug.php
 create mode 100644 apps/files_versions/l10n/uk.js
 create mode 100644 apps/files_versions/l10n/uk.json
 delete mode 100644 apps/files_versions/l10n/uk.php
 create mode 100644 apps/files_versions/l10n/ur_PK.js
 create mode 100644 apps/files_versions/l10n/ur_PK.json
 delete mode 100644 apps/files_versions/l10n/ur_PK.php
 create mode 100644 apps/files_versions/l10n/vi.js
 create mode 100644 apps/files_versions/l10n/vi.json
 delete mode 100644 apps/files_versions/l10n/vi.php
 create mode 100644 apps/files_versions/l10n/zh_CN.js
 create mode 100644 apps/files_versions/l10n/zh_CN.json
 delete mode 100644 apps/files_versions/l10n/zh_CN.php
 create mode 100644 apps/files_versions/l10n/zh_HK.js
 create mode 100644 apps/files_versions/l10n/zh_HK.json
 delete mode 100644 apps/files_versions/l10n/zh_HK.php
 create mode 100644 apps/files_versions/l10n/zh_TW.js
 create mode 100644 apps/files_versions/l10n/zh_TW.json
 delete mode 100644 apps/files_versions/l10n/zh_TW.php
 create mode 100644 apps/user_ldap/l10n/ach.js
 create mode 100644 apps/user_ldap/l10n/ach.json
 delete mode 100644 apps/user_ldap/l10n/ach.php
 create mode 100644 apps/user_ldap/l10n/ady.js
 create mode 100644 apps/user_ldap/l10n/ady.json
 delete mode 100644 apps/user_ldap/l10n/ady.php
 create mode 100644 apps/user_ldap/l10n/af_ZA.js
 create mode 100644 apps/user_ldap/l10n/af_ZA.json
 delete mode 100644 apps/user_ldap/l10n/af_ZA.php
 create mode 100644 apps/user_ldap/l10n/ak.js
 create mode 100644 apps/user_ldap/l10n/ak.json
 delete mode 100644 apps/user_ldap/l10n/ak.php
 create mode 100644 apps/user_ldap/l10n/am_ET.js
 create mode 100644 apps/user_ldap/l10n/am_ET.json
 delete mode 100644 apps/user_ldap/l10n/am_ET.php
 create mode 100644 apps/user_ldap/l10n/ar.js
 create mode 100644 apps/user_ldap/l10n/ar.json
 delete mode 100644 apps/user_ldap/l10n/ar.php
 create mode 100644 apps/user_ldap/l10n/ast.js
 create mode 100644 apps/user_ldap/l10n/ast.json
 delete mode 100644 apps/user_ldap/l10n/ast.php
 create mode 100644 apps/user_ldap/l10n/az.js
 create mode 100644 apps/user_ldap/l10n/az.json
 delete mode 100644 apps/user_ldap/l10n/az.php
 create mode 100644 apps/user_ldap/l10n/be.js
 create mode 100644 apps/user_ldap/l10n/be.json
 delete mode 100644 apps/user_ldap/l10n/be.php
 create mode 100644 apps/user_ldap/l10n/bg_BG.js
 create mode 100644 apps/user_ldap/l10n/bg_BG.json
 delete mode 100644 apps/user_ldap/l10n/bg_BG.php
 create mode 100644 apps/user_ldap/l10n/bn_BD.js
 create mode 100644 apps/user_ldap/l10n/bn_BD.json
 delete mode 100644 apps/user_ldap/l10n/bn_BD.php
 create mode 100644 apps/user_ldap/l10n/bn_IN.js
 create mode 100644 apps/user_ldap/l10n/bn_IN.json
 delete mode 100644 apps/user_ldap/l10n/bn_IN.php
 create mode 100644 apps/user_ldap/l10n/bs.js
 create mode 100644 apps/user_ldap/l10n/bs.json
 delete mode 100644 apps/user_ldap/l10n/bs.php
 create mode 100644 apps/user_ldap/l10n/ca.js
 create mode 100644 apps/user_ldap/l10n/ca.json
 delete mode 100644 apps/user_ldap/l10n/ca.php
 create mode 100644 apps/user_ldap/l10n/ca@valencia.js
 create mode 100644 apps/user_ldap/l10n/ca@valencia.json
 delete mode 100644 apps/user_ldap/l10n/ca@valencia.php
 create mode 100644 apps/user_ldap/l10n/cs_CZ.js
 create mode 100644 apps/user_ldap/l10n/cs_CZ.json
 delete mode 100644 apps/user_ldap/l10n/cs_CZ.php
 create mode 100644 apps/user_ldap/l10n/cy_GB.js
 create mode 100644 apps/user_ldap/l10n/cy_GB.json
 delete mode 100644 apps/user_ldap/l10n/cy_GB.php
 create mode 100644 apps/user_ldap/l10n/da.js
 create mode 100644 apps/user_ldap/l10n/da.json
 delete mode 100644 apps/user_ldap/l10n/da.php
 create mode 100644 apps/user_ldap/l10n/de.js
 create mode 100644 apps/user_ldap/l10n/de.json
 delete mode 100644 apps/user_ldap/l10n/de.php
 create mode 100644 apps/user_ldap/l10n/de_AT.js
 create mode 100644 apps/user_ldap/l10n/de_AT.json
 delete mode 100644 apps/user_ldap/l10n/de_AT.php
 create mode 100644 apps/user_ldap/l10n/de_CH.js
 create mode 100644 apps/user_ldap/l10n/de_CH.json
 delete mode 100644 apps/user_ldap/l10n/de_CH.php
 create mode 100644 apps/user_ldap/l10n/de_DE.js
 create mode 100644 apps/user_ldap/l10n/de_DE.json
 delete mode 100644 apps/user_ldap/l10n/de_DE.php
 create mode 100644 apps/user_ldap/l10n/el.js
 create mode 100644 apps/user_ldap/l10n/el.json
 delete mode 100644 apps/user_ldap/l10n/el.php
 create mode 100644 apps/user_ldap/l10n/en@pirate.js
 create mode 100644 apps/user_ldap/l10n/en@pirate.json
 delete mode 100644 apps/user_ldap/l10n/en@pirate.php
 create mode 100644 apps/user_ldap/l10n/en_GB.js
 create mode 100644 apps/user_ldap/l10n/en_GB.json
 delete mode 100644 apps/user_ldap/l10n/en_GB.php
 create mode 100644 apps/user_ldap/l10n/en_NZ.js
 create mode 100644 apps/user_ldap/l10n/en_NZ.json
 delete mode 100644 apps/user_ldap/l10n/en_NZ.php
 create mode 100644 apps/user_ldap/l10n/eo.js
 create mode 100644 apps/user_ldap/l10n/eo.json
 delete mode 100644 apps/user_ldap/l10n/eo.php
 create mode 100644 apps/user_ldap/l10n/es.js
 create mode 100644 apps/user_ldap/l10n/es.json
 delete mode 100644 apps/user_ldap/l10n/es.php
 create mode 100644 apps/user_ldap/l10n/es_AR.js
 create mode 100644 apps/user_ldap/l10n/es_AR.json
 delete mode 100644 apps/user_ldap/l10n/es_AR.php
 create mode 100644 apps/user_ldap/l10n/es_BO.js
 create mode 100644 apps/user_ldap/l10n/es_BO.json
 delete mode 100644 apps/user_ldap/l10n/es_BO.php
 create mode 100644 apps/user_ldap/l10n/es_CL.js
 create mode 100644 apps/user_ldap/l10n/es_CL.json
 delete mode 100644 apps/user_ldap/l10n/es_CL.php
 create mode 100644 apps/user_ldap/l10n/es_CO.js
 create mode 100644 apps/user_ldap/l10n/es_CO.json
 delete mode 100644 apps/user_ldap/l10n/es_CO.php
 create mode 100644 apps/user_ldap/l10n/es_CR.js
 create mode 100644 apps/user_ldap/l10n/es_CR.json
 delete mode 100644 apps/user_ldap/l10n/es_CR.php
 create mode 100644 apps/user_ldap/l10n/es_EC.js
 create mode 100644 apps/user_ldap/l10n/es_EC.json
 delete mode 100644 apps/user_ldap/l10n/es_EC.php
 create mode 100644 apps/user_ldap/l10n/es_MX.js
 create mode 100644 apps/user_ldap/l10n/es_MX.json
 delete mode 100644 apps/user_ldap/l10n/es_MX.php
 create mode 100644 apps/user_ldap/l10n/es_PE.js
 create mode 100644 apps/user_ldap/l10n/es_PE.json
 delete mode 100644 apps/user_ldap/l10n/es_PE.php
 create mode 100644 apps/user_ldap/l10n/es_PY.js
 create mode 100644 apps/user_ldap/l10n/es_PY.json
 delete mode 100644 apps/user_ldap/l10n/es_PY.php
 create mode 100644 apps/user_ldap/l10n/es_US.js
 create mode 100644 apps/user_ldap/l10n/es_US.json
 delete mode 100644 apps/user_ldap/l10n/es_US.php
 create mode 100644 apps/user_ldap/l10n/es_UY.js
 create mode 100644 apps/user_ldap/l10n/es_UY.json
 delete mode 100644 apps/user_ldap/l10n/es_UY.php
 create mode 100644 apps/user_ldap/l10n/et_EE.js
 create mode 100644 apps/user_ldap/l10n/et_EE.json
 delete mode 100644 apps/user_ldap/l10n/et_EE.php
 create mode 100644 apps/user_ldap/l10n/eu.js
 create mode 100644 apps/user_ldap/l10n/eu.json
 delete mode 100644 apps/user_ldap/l10n/eu.php
 create mode 100644 apps/user_ldap/l10n/eu_ES.js
 create mode 100644 apps/user_ldap/l10n/eu_ES.json
 delete mode 100644 apps/user_ldap/l10n/eu_ES.php
 create mode 100644 apps/user_ldap/l10n/fa.js
 create mode 100644 apps/user_ldap/l10n/fa.json
 delete mode 100644 apps/user_ldap/l10n/fa.php
 create mode 100644 apps/user_ldap/l10n/fi_FI.js
 create mode 100644 apps/user_ldap/l10n/fi_FI.json
 delete mode 100644 apps/user_ldap/l10n/fi_FI.php
 create mode 100644 apps/user_ldap/l10n/fil.js
 create mode 100644 apps/user_ldap/l10n/fil.json
 delete mode 100644 apps/user_ldap/l10n/fil.php
 create mode 100644 apps/user_ldap/l10n/fr.js
 create mode 100644 apps/user_ldap/l10n/fr.json
 delete mode 100644 apps/user_ldap/l10n/fr.php
 create mode 100644 apps/user_ldap/l10n/fr_CA.js
 create mode 100644 apps/user_ldap/l10n/fr_CA.json
 delete mode 100644 apps/user_ldap/l10n/fr_CA.php
 create mode 100644 apps/user_ldap/l10n/fy_NL.js
 create mode 100644 apps/user_ldap/l10n/fy_NL.json
 delete mode 100644 apps/user_ldap/l10n/fy_NL.php
 create mode 100644 apps/user_ldap/l10n/gl.js
 create mode 100644 apps/user_ldap/l10n/gl.json
 delete mode 100644 apps/user_ldap/l10n/gl.php
 create mode 100644 apps/user_ldap/l10n/gu.js
 create mode 100644 apps/user_ldap/l10n/gu.json
 delete mode 100644 apps/user_ldap/l10n/gu.php
 create mode 100644 apps/user_ldap/l10n/he.js
 create mode 100644 apps/user_ldap/l10n/he.json
 delete mode 100644 apps/user_ldap/l10n/he.php
 create mode 100644 apps/user_ldap/l10n/hi.js
 create mode 100644 apps/user_ldap/l10n/hi.json
 delete mode 100644 apps/user_ldap/l10n/hi.php
 create mode 100644 apps/user_ldap/l10n/hr.js
 create mode 100644 apps/user_ldap/l10n/hr.json
 delete mode 100644 apps/user_ldap/l10n/hr.php
 create mode 100644 apps/user_ldap/l10n/hu_HU.js
 create mode 100644 apps/user_ldap/l10n/hu_HU.json
 delete mode 100644 apps/user_ldap/l10n/hu_HU.php
 create mode 100644 apps/user_ldap/l10n/hy.js
 create mode 100644 apps/user_ldap/l10n/hy.json
 delete mode 100644 apps/user_ldap/l10n/hy.php
 create mode 100644 apps/user_ldap/l10n/ia.js
 create mode 100644 apps/user_ldap/l10n/ia.json
 delete mode 100644 apps/user_ldap/l10n/ia.php
 create mode 100644 apps/user_ldap/l10n/id.js
 create mode 100644 apps/user_ldap/l10n/id.json
 delete mode 100644 apps/user_ldap/l10n/id.php
 create mode 100644 apps/user_ldap/l10n/io.js
 create mode 100644 apps/user_ldap/l10n/io.json
 delete mode 100644 apps/user_ldap/l10n/io.php
 create mode 100644 apps/user_ldap/l10n/is.js
 create mode 100644 apps/user_ldap/l10n/is.json
 delete mode 100644 apps/user_ldap/l10n/is.php
 create mode 100644 apps/user_ldap/l10n/it.js
 create mode 100644 apps/user_ldap/l10n/it.json
 delete mode 100644 apps/user_ldap/l10n/it.php
 create mode 100644 apps/user_ldap/l10n/ja.js
 create mode 100644 apps/user_ldap/l10n/ja.json
 delete mode 100644 apps/user_ldap/l10n/ja.php
 create mode 100644 apps/user_ldap/l10n/jv.js
 create mode 100644 apps/user_ldap/l10n/jv.json
 delete mode 100644 apps/user_ldap/l10n/jv.php
 create mode 100644 apps/user_ldap/l10n/ka_GE.js
 create mode 100644 apps/user_ldap/l10n/ka_GE.json
 delete mode 100644 apps/user_ldap/l10n/ka_GE.php
 create mode 100644 apps/user_ldap/l10n/km.js
 create mode 100644 apps/user_ldap/l10n/km.json
 delete mode 100644 apps/user_ldap/l10n/km.php
 create mode 100644 apps/user_ldap/l10n/kn.js
 create mode 100644 apps/user_ldap/l10n/kn.json
 delete mode 100644 apps/user_ldap/l10n/kn.php
 create mode 100644 apps/user_ldap/l10n/ko.js
 create mode 100644 apps/user_ldap/l10n/ko.json
 delete mode 100644 apps/user_ldap/l10n/ko.php
 create mode 100644 apps/user_ldap/l10n/ku_IQ.js
 create mode 100644 apps/user_ldap/l10n/ku_IQ.json
 delete mode 100644 apps/user_ldap/l10n/ku_IQ.php
 create mode 100644 apps/user_ldap/l10n/lb.js
 create mode 100644 apps/user_ldap/l10n/lb.json
 delete mode 100644 apps/user_ldap/l10n/lb.php
 create mode 100644 apps/user_ldap/l10n/lt_LT.js
 create mode 100644 apps/user_ldap/l10n/lt_LT.json
 delete mode 100644 apps/user_ldap/l10n/lt_LT.php
 create mode 100644 apps/user_ldap/l10n/lv.js
 create mode 100644 apps/user_ldap/l10n/lv.json
 delete mode 100644 apps/user_ldap/l10n/lv.php
 create mode 100644 apps/user_ldap/l10n/mg.js
 create mode 100644 apps/user_ldap/l10n/mg.json
 delete mode 100644 apps/user_ldap/l10n/mg.php
 create mode 100644 apps/user_ldap/l10n/mk.js
 create mode 100644 apps/user_ldap/l10n/mk.json
 delete mode 100644 apps/user_ldap/l10n/mk.php
 create mode 100644 apps/user_ldap/l10n/ml.js
 create mode 100644 apps/user_ldap/l10n/ml.json
 delete mode 100644 apps/user_ldap/l10n/ml.php
 create mode 100644 apps/user_ldap/l10n/ml_IN.js
 create mode 100644 apps/user_ldap/l10n/ml_IN.json
 delete mode 100644 apps/user_ldap/l10n/ml_IN.php
 create mode 100644 apps/user_ldap/l10n/mn.js
 create mode 100644 apps/user_ldap/l10n/mn.json
 delete mode 100644 apps/user_ldap/l10n/mn.php
 create mode 100644 apps/user_ldap/l10n/ms_MY.js
 create mode 100644 apps/user_ldap/l10n/ms_MY.json
 delete mode 100644 apps/user_ldap/l10n/ms_MY.php
 create mode 100644 apps/user_ldap/l10n/mt_MT.js
 create mode 100644 apps/user_ldap/l10n/mt_MT.json
 delete mode 100644 apps/user_ldap/l10n/mt_MT.php
 create mode 100644 apps/user_ldap/l10n/my_MM.js
 create mode 100644 apps/user_ldap/l10n/my_MM.json
 delete mode 100644 apps/user_ldap/l10n/my_MM.php
 create mode 100644 apps/user_ldap/l10n/nb_NO.js
 create mode 100644 apps/user_ldap/l10n/nb_NO.json
 delete mode 100644 apps/user_ldap/l10n/nb_NO.php
 create mode 100644 apps/user_ldap/l10n/nds.js
 create mode 100644 apps/user_ldap/l10n/nds.json
 delete mode 100644 apps/user_ldap/l10n/nds.php
 create mode 100644 apps/user_ldap/l10n/ne.js
 create mode 100644 apps/user_ldap/l10n/ne.json
 delete mode 100644 apps/user_ldap/l10n/ne.php
 create mode 100644 apps/user_ldap/l10n/nl.js
 create mode 100644 apps/user_ldap/l10n/nl.json
 delete mode 100644 apps/user_ldap/l10n/nl.php
 create mode 100644 apps/user_ldap/l10n/nn_NO.js
 create mode 100644 apps/user_ldap/l10n/nn_NO.json
 delete mode 100644 apps/user_ldap/l10n/nn_NO.php
 create mode 100644 apps/user_ldap/l10n/nqo.js
 create mode 100644 apps/user_ldap/l10n/nqo.json
 delete mode 100644 apps/user_ldap/l10n/nqo.php
 create mode 100644 apps/user_ldap/l10n/oc.js
 create mode 100644 apps/user_ldap/l10n/oc.json
 delete mode 100644 apps/user_ldap/l10n/oc.php
 create mode 100644 apps/user_ldap/l10n/or_IN.js
 create mode 100644 apps/user_ldap/l10n/or_IN.json
 delete mode 100644 apps/user_ldap/l10n/or_IN.php
 create mode 100644 apps/user_ldap/l10n/pa.js
 create mode 100644 apps/user_ldap/l10n/pa.json
 delete mode 100644 apps/user_ldap/l10n/pa.php
 create mode 100644 apps/user_ldap/l10n/pl.js
 create mode 100644 apps/user_ldap/l10n/pl.json
 delete mode 100644 apps/user_ldap/l10n/pl.php
 create mode 100644 apps/user_ldap/l10n/pt_BR.js
 create mode 100644 apps/user_ldap/l10n/pt_BR.json
 delete mode 100644 apps/user_ldap/l10n/pt_BR.php
 create mode 100644 apps/user_ldap/l10n/pt_PT.js
 create mode 100644 apps/user_ldap/l10n/pt_PT.json
 delete mode 100644 apps/user_ldap/l10n/pt_PT.php
 create mode 100644 apps/user_ldap/l10n/ro.js
 create mode 100644 apps/user_ldap/l10n/ro.json
 delete mode 100644 apps/user_ldap/l10n/ro.php
 create mode 100644 apps/user_ldap/l10n/ru.js
 create mode 100644 apps/user_ldap/l10n/ru.json
 delete mode 100644 apps/user_ldap/l10n/ru.php
 create mode 100644 apps/user_ldap/l10n/si_LK.js
 create mode 100644 apps/user_ldap/l10n/si_LK.json
 delete mode 100644 apps/user_ldap/l10n/si_LK.php
 create mode 100644 apps/user_ldap/l10n/sk_SK.js
 create mode 100644 apps/user_ldap/l10n/sk_SK.json
 delete mode 100644 apps/user_ldap/l10n/sk_SK.php
 create mode 100644 apps/user_ldap/l10n/sl.js
 create mode 100644 apps/user_ldap/l10n/sl.json
 delete mode 100644 apps/user_ldap/l10n/sl.php
 create mode 100644 apps/user_ldap/l10n/sq.js
 create mode 100644 apps/user_ldap/l10n/sq.json
 delete mode 100644 apps/user_ldap/l10n/sq.php
 create mode 100644 apps/user_ldap/l10n/sr.js
 create mode 100644 apps/user_ldap/l10n/sr.json
 delete mode 100644 apps/user_ldap/l10n/sr.php
 create mode 100644 apps/user_ldap/l10n/sr@latin.js
 create mode 100644 apps/user_ldap/l10n/sr@latin.json
 delete mode 100644 apps/user_ldap/l10n/sr@latin.php
 create mode 100644 apps/user_ldap/l10n/su.js
 create mode 100644 apps/user_ldap/l10n/su.json
 delete mode 100644 apps/user_ldap/l10n/su.php
 create mode 100644 apps/user_ldap/l10n/sv.js
 create mode 100644 apps/user_ldap/l10n/sv.json
 delete mode 100644 apps/user_ldap/l10n/sv.php
 create mode 100644 apps/user_ldap/l10n/sw_KE.js
 create mode 100644 apps/user_ldap/l10n/sw_KE.json
 delete mode 100644 apps/user_ldap/l10n/sw_KE.php
 create mode 100644 apps/user_ldap/l10n/ta_IN.js
 create mode 100644 apps/user_ldap/l10n/ta_IN.json
 delete mode 100644 apps/user_ldap/l10n/ta_IN.php
 create mode 100644 apps/user_ldap/l10n/ta_LK.js
 create mode 100644 apps/user_ldap/l10n/ta_LK.json
 delete mode 100644 apps/user_ldap/l10n/ta_LK.php
 create mode 100644 apps/user_ldap/l10n/te.js
 create mode 100644 apps/user_ldap/l10n/te.json
 delete mode 100644 apps/user_ldap/l10n/te.php
 create mode 100644 apps/user_ldap/l10n/tg_TJ.js
 create mode 100644 apps/user_ldap/l10n/tg_TJ.json
 delete mode 100644 apps/user_ldap/l10n/tg_TJ.php
 create mode 100644 apps/user_ldap/l10n/th_TH.js
 create mode 100644 apps/user_ldap/l10n/th_TH.json
 delete mode 100644 apps/user_ldap/l10n/th_TH.php
 create mode 100644 apps/user_ldap/l10n/tl_PH.js
 create mode 100644 apps/user_ldap/l10n/tl_PH.json
 delete mode 100644 apps/user_ldap/l10n/tl_PH.php
 create mode 100644 apps/user_ldap/l10n/tr.js
 create mode 100644 apps/user_ldap/l10n/tr.json
 delete mode 100644 apps/user_ldap/l10n/tr.php
 create mode 100644 apps/user_ldap/l10n/tzm.js
 create mode 100644 apps/user_ldap/l10n/tzm.json
 delete mode 100644 apps/user_ldap/l10n/tzm.php
 create mode 100644 apps/user_ldap/l10n/ug.js
 create mode 100644 apps/user_ldap/l10n/ug.json
 delete mode 100644 apps/user_ldap/l10n/ug.php
 create mode 100644 apps/user_ldap/l10n/uk.js
 create mode 100644 apps/user_ldap/l10n/uk.json
 delete mode 100644 apps/user_ldap/l10n/uk.php
 create mode 100644 apps/user_ldap/l10n/ur_PK.js
 create mode 100644 apps/user_ldap/l10n/ur_PK.json
 delete mode 100644 apps/user_ldap/l10n/ur_PK.php
 create mode 100644 apps/user_ldap/l10n/uz.js
 create mode 100644 apps/user_ldap/l10n/uz.json
 delete mode 100644 apps/user_ldap/l10n/uz.php
 create mode 100644 apps/user_ldap/l10n/vi.js
 create mode 100644 apps/user_ldap/l10n/vi.json
 delete mode 100644 apps/user_ldap/l10n/vi.php
 create mode 100644 apps/user_ldap/l10n/zh_CN.js
 create mode 100644 apps/user_ldap/l10n/zh_CN.json
 delete mode 100644 apps/user_ldap/l10n/zh_CN.php
 create mode 100644 apps/user_ldap/l10n/zh_HK.js
 create mode 100644 apps/user_ldap/l10n/zh_HK.json
 delete mode 100644 apps/user_ldap/l10n/zh_HK.php
 create mode 100644 apps/user_ldap/l10n/zh_TW.js
 create mode 100644 apps/user_ldap/l10n/zh_TW.json
 delete mode 100644 apps/user_ldap/l10n/zh_TW.php
 create mode 100644 apps/user_webdavauth/l10n/ar.js
 create mode 100644 apps/user_webdavauth/l10n/ar.json
 delete mode 100644 apps/user_webdavauth/l10n/ar.php
 create mode 100644 apps/user_webdavauth/l10n/ast.js
 create mode 100644 apps/user_webdavauth/l10n/ast.json
 delete mode 100644 apps/user_webdavauth/l10n/ast.php
 create mode 100644 apps/user_webdavauth/l10n/az.js
 create mode 100644 apps/user_webdavauth/l10n/az.json
 delete mode 100644 apps/user_webdavauth/l10n/az.php
 create mode 100644 apps/user_webdavauth/l10n/bg_BG.js
 create mode 100644 apps/user_webdavauth/l10n/bg_BG.json
 delete mode 100644 apps/user_webdavauth/l10n/bg_BG.php
 create mode 100644 apps/user_webdavauth/l10n/bn_BD.js
 create mode 100644 apps/user_webdavauth/l10n/bn_BD.json
 delete mode 100644 apps/user_webdavauth/l10n/bn_BD.php
 create mode 100644 apps/user_webdavauth/l10n/bn_IN.js
 create mode 100644 apps/user_webdavauth/l10n/bn_IN.json
 delete mode 100644 apps/user_webdavauth/l10n/bn_IN.php
 create mode 100644 apps/user_webdavauth/l10n/bs.js
 create mode 100644 apps/user_webdavauth/l10n/bs.json
 delete mode 100644 apps/user_webdavauth/l10n/bs.php
 create mode 100644 apps/user_webdavauth/l10n/ca.js
 create mode 100644 apps/user_webdavauth/l10n/ca.json
 delete mode 100644 apps/user_webdavauth/l10n/ca.php
 create mode 100644 apps/user_webdavauth/l10n/cs_CZ.js
 create mode 100644 apps/user_webdavauth/l10n/cs_CZ.json
 delete mode 100644 apps/user_webdavauth/l10n/cs_CZ.php
 create mode 100644 apps/user_webdavauth/l10n/cy_GB.js
 create mode 100644 apps/user_webdavauth/l10n/cy_GB.json
 delete mode 100644 apps/user_webdavauth/l10n/cy_GB.php
 create mode 100644 apps/user_webdavauth/l10n/da.js
 create mode 100644 apps/user_webdavauth/l10n/da.json
 delete mode 100644 apps/user_webdavauth/l10n/da.php
 create mode 100644 apps/user_webdavauth/l10n/de.js
 create mode 100644 apps/user_webdavauth/l10n/de.json
 delete mode 100644 apps/user_webdavauth/l10n/de.php
 create mode 100644 apps/user_webdavauth/l10n/de_AT.js
 create mode 100644 apps/user_webdavauth/l10n/de_AT.json
 delete mode 100644 apps/user_webdavauth/l10n/de_AT.php
 create mode 100644 apps/user_webdavauth/l10n/de_CH.js
 create mode 100644 apps/user_webdavauth/l10n/de_CH.json
 delete mode 100644 apps/user_webdavauth/l10n/de_CH.php
 create mode 100644 apps/user_webdavauth/l10n/de_DE.js
 create mode 100644 apps/user_webdavauth/l10n/de_DE.json
 delete mode 100644 apps/user_webdavauth/l10n/de_DE.php
 create mode 100644 apps/user_webdavauth/l10n/el.js
 create mode 100644 apps/user_webdavauth/l10n/el.json
 delete mode 100644 apps/user_webdavauth/l10n/el.php
 create mode 100644 apps/user_webdavauth/l10n/en_GB.js
 create mode 100644 apps/user_webdavauth/l10n/en_GB.json
 delete mode 100644 apps/user_webdavauth/l10n/en_GB.php
 create mode 100644 apps/user_webdavauth/l10n/eo.js
 create mode 100644 apps/user_webdavauth/l10n/eo.json
 delete mode 100644 apps/user_webdavauth/l10n/eo.php
 create mode 100644 apps/user_webdavauth/l10n/es.js
 create mode 100644 apps/user_webdavauth/l10n/es.json
 delete mode 100644 apps/user_webdavauth/l10n/es.php
 create mode 100644 apps/user_webdavauth/l10n/es_AR.js
 create mode 100644 apps/user_webdavauth/l10n/es_AR.json
 delete mode 100644 apps/user_webdavauth/l10n/es_AR.php
 create mode 100644 apps/user_webdavauth/l10n/es_MX.js
 create mode 100644 apps/user_webdavauth/l10n/es_MX.json
 delete mode 100644 apps/user_webdavauth/l10n/es_MX.php
 create mode 100644 apps/user_webdavauth/l10n/et_EE.js
 create mode 100644 apps/user_webdavauth/l10n/et_EE.json
 delete mode 100644 apps/user_webdavauth/l10n/et_EE.php
 create mode 100644 apps/user_webdavauth/l10n/eu.js
 create mode 100644 apps/user_webdavauth/l10n/eu.json
 delete mode 100644 apps/user_webdavauth/l10n/eu.php
 create mode 100644 apps/user_webdavauth/l10n/eu_ES.js
 create mode 100644 apps/user_webdavauth/l10n/eu_ES.json
 delete mode 100644 apps/user_webdavauth/l10n/eu_ES.php
 create mode 100644 apps/user_webdavauth/l10n/fa.js
 create mode 100644 apps/user_webdavauth/l10n/fa.json
 delete mode 100644 apps/user_webdavauth/l10n/fa.php
 create mode 100644 apps/user_webdavauth/l10n/fi_FI.js
 create mode 100644 apps/user_webdavauth/l10n/fi_FI.json
 delete mode 100644 apps/user_webdavauth/l10n/fi_FI.php
 create mode 100644 apps/user_webdavauth/l10n/fr.js
 create mode 100644 apps/user_webdavauth/l10n/fr.json
 delete mode 100644 apps/user_webdavauth/l10n/fr.php
 create mode 100644 apps/user_webdavauth/l10n/gl.js
 create mode 100644 apps/user_webdavauth/l10n/gl.json
 delete mode 100644 apps/user_webdavauth/l10n/gl.php
 create mode 100644 apps/user_webdavauth/l10n/he.js
 create mode 100644 apps/user_webdavauth/l10n/he.json
 delete mode 100644 apps/user_webdavauth/l10n/he.php
 create mode 100644 apps/user_webdavauth/l10n/hi.js
 create mode 100644 apps/user_webdavauth/l10n/hi.json
 delete mode 100644 apps/user_webdavauth/l10n/hi.php
 create mode 100644 apps/user_webdavauth/l10n/hr.js
 create mode 100644 apps/user_webdavauth/l10n/hr.json
 delete mode 100644 apps/user_webdavauth/l10n/hr.php
 create mode 100644 apps/user_webdavauth/l10n/hu_HU.js
 create mode 100644 apps/user_webdavauth/l10n/hu_HU.json
 delete mode 100644 apps/user_webdavauth/l10n/hu_HU.php
 create mode 100644 apps/user_webdavauth/l10n/hy.js
 create mode 100644 apps/user_webdavauth/l10n/hy.json
 delete mode 100644 apps/user_webdavauth/l10n/hy.php
 create mode 100644 apps/user_webdavauth/l10n/ia.js
 create mode 100644 apps/user_webdavauth/l10n/ia.json
 delete mode 100644 apps/user_webdavauth/l10n/ia.php
 create mode 100644 apps/user_webdavauth/l10n/id.js
 create mode 100644 apps/user_webdavauth/l10n/id.json
 delete mode 100644 apps/user_webdavauth/l10n/id.php
 create mode 100644 apps/user_webdavauth/l10n/is.js
 create mode 100644 apps/user_webdavauth/l10n/is.json
 delete mode 100644 apps/user_webdavauth/l10n/is.php
 create mode 100644 apps/user_webdavauth/l10n/it.js
 create mode 100644 apps/user_webdavauth/l10n/it.json
 delete mode 100644 apps/user_webdavauth/l10n/it.php
 create mode 100644 apps/user_webdavauth/l10n/ja.js
 create mode 100644 apps/user_webdavauth/l10n/ja.json
 delete mode 100644 apps/user_webdavauth/l10n/ja.php
 create mode 100644 apps/user_webdavauth/l10n/ka_GE.js
 create mode 100644 apps/user_webdavauth/l10n/ka_GE.json
 delete mode 100644 apps/user_webdavauth/l10n/ka_GE.php
 create mode 100644 apps/user_webdavauth/l10n/km.js
 create mode 100644 apps/user_webdavauth/l10n/km.json
 delete mode 100644 apps/user_webdavauth/l10n/km.php
 create mode 100644 apps/user_webdavauth/l10n/ko.js
 create mode 100644 apps/user_webdavauth/l10n/ko.json
 delete mode 100644 apps/user_webdavauth/l10n/ko.php
 create mode 100644 apps/user_webdavauth/l10n/ku_IQ.js
 create mode 100644 apps/user_webdavauth/l10n/ku_IQ.json
 delete mode 100644 apps/user_webdavauth/l10n/ku_IQ.php
 create mode 100644 apps/user_webdavauth/l10n/lb.js
 create mode 100644 apps/user_webdavauth/l10n/lb.json
 delete mode 100644 apps/user_webdavauth/l10n/lb.php
 create mode 100644 apps/user_webdavauth/l10n/lt_LT.js
 create mode 100644 apps/user_webdavauth/l10n/lt_LT.json
 delete mode 100644 apps/user_webdavauth/l10n/lt_LT.php
 create mode 100644 apps/user_webdavauth/l10n/lv.js
 create mode 100644 apps/user_webdavauth/l10n/lv.json
 delete mode 100644 apps/user_webdavauth/l10n/lv.php
 create mode 100644 apps/user_webdavauth/l10n/mk.js
 create mode 100644 apps/user_webdavauth/l10n/mk.json
 delete mode 100644 apps/user_webdavauth/l10n/mk.php
 create mode 100644 apps/user_webdavauth/l10n/ms_MY.js
 create mode 100644 apps/user_webdavauth/l10n/ms_MY.json
 delete mode 100644 apps/user_webdavauth/l10n/ms_MY.php
 create mode 100644 apps/user_webdavauth/l10n/nb_NO.js
 create mode 100644 apps/user_webdavauth/l10n/nb_NO.json
 delete mode 100644 apps/user_webdavauth/l10n/nb_NO.php
 create mode 100644 apps/user_webdavauth/l10n/nl.js
 create mode 100644 apps/user_webdavauth/l10n/nl.json
 delete mode 100644 apps/user_webdavauth/l10n/nl.php
 create mode 100644 apps/user_webdavauth/l10n/nn_NO.js
 create mode 100644 apps/user_webdavauth/l10n/nn_NO.json
 delete mode 100644 apps/user_webdavauth/l10n/nn_NO.php
 create mode 100644 apps/user_webdavauth/l10n/oc.js
 create mode 100644 apps/user_webdavauth/l10n/oc.json
 delete mode 100644 apps/user_webdavauth/l10n/oc.php
 create mode 100644 apps/user_webdavauth/l10n/pl.js
 create mode 100644 apps/user_webdavauth/l10n/pl.json
 delete mode 100644 apps/user_webdavauth/l10n/pl.php
 create mode 100644 apps/user_webdavauth/l10n/pt_BR.js
 create mode 100644 apps/user_webdavauth/l10n/pt_BR.json
 delete mode 100644 apps/user_webdavauth/l10n/pt_BR.php
 create mode 100644 apps/user_webdavauth/l10n/pt_PT.js
 create mode 100644 apps/user_webdavauth/l10n/pt_PT.json
 delete mode 100644 apps/user_webdavauth/l10n/pt_PT.php
 create mode 100644 apps/user_webdavauth/l10n/ro.js
 create mode 100644 apps/user_webdavauth/l10n/ro.json
 delete mode 100644 apps/user_webdavauth/l10n/ro.php
 create mode 100644 apps/user_webdavauth/l10n/ru.js
 create mode 100644 apps/user_webdavauth/l10n/ru.json
 delete mode 100644 apps/user_webdavauth/l10n/ru.php
 create mode 100644 apps/user_webdavauth/l10n/si_LK.js
 create mode 100644 apps/user_webdavauth/l10n/si_LK.json
 delete mode 100644 apps/user_webdavauth/l10n/si_LK.php
 create mode 100644 apps/user_webdavauth/l10n/sk_SK.js
 create mode 100644 apps/user_webdavauth/l10n/sk_SK.json
 delete mode 100644 apps/user_webdavauth/l10n/sk_SK.php
 create mode 100644 apps/user_webdavauth/l10n/sl.js
 create mode 100644 apps/user_webdavauth/l10n/sl.json
 delete mode 100644 apps/user_webdavauth/l10n/sl.php
 create mode 100644 apps/user_webdavauth/l10n/sq.js
 create mode 100644 apps/user_webdavauth/l10n/sq.json
 delete mode 100644 apps/user_webdavauth/l10n/sq.php
 create mode 100644 apps/user_webdavauth/l10n/sr.js
 create mode 100644 apps/user_webdavauth/l10n/sr.json
 delete mode 100644 apps/user_webdavauth/l10n/sr.php
 create mode 100644 apps/user_webdavauth/l10n/sr@latin.js
 create mode 100644 apps/user_webdavauth/l10n/sr@latin.json
 delete mode 100644 apps/user_webdavauth/l10n/sr@latin.php
 create mode 100644 apps/user_webdavauth/l10n/sv.js
 create mode 100644 apps/user_webdavauth/l10n/sv.json
 delete mode 100644 apps/user_webdavauth/l10n/sv.php
 create mode 100644 apps/user_webdavauth/l10n/ta_LK.js
 create mode 100644 apps/user_webdavauth/l10n/ta_LK.json
 delete mode 100644 apps/user_webdavauth/l10n/ta_LK.php
 create mode 100644 apps/user_webdavauth/l10n/te.js
 create mode 100644 apps/user_webdavauth/l10n/te.json
 delete mode 100644 apps/user_webdavauth/l10n/te.php
 create mode 100644 apps/user_webdavauth/l10n/th_TH.js
 create mode 100644 apps/user_webdavauth/l10n/th_TH.json
 delete mode 100644 apps/user_webdavauth/l10n/th_TH.php
 create mode 100644 apps/user_webdavauth/l10n/tr.js
 create mode 100644 apps/user_webdavauth/l10n/tr.json
 delete mode 100644 apps/user_webdavauth/l10n/tr.php
 create mode 100644 apps/user_webdavauth/l10n/ug.js
 create mode 100644 apps/user_webdavauth/l10n/ug.json
 delete mode 100644 apps/user_webdavauth/l10n/ug.php
 create mode 100644 apps/user_webdavauth/l10n/uk.js
 create mode 100644 apps/user_webdavauth/l10n/uk.json
 delete mode 100644 apps/user_webdavauth/l10n/uk.php
 create mode 100644 apps/user_webdavauth/l10n/ur_PK.js
 create mode 100644 apps/user_webdavauth/l10n/ur_PK.json
 delete mode 100644 apps/user_webdavauth/l10n/ur_PK.php
 create mode 100644 apps/user_webdavauth/l10n/vi.js
 create mode 100644 apps/user_webdavauth/l10n/vi.json
 delete mode 100644 apps/user_webdavauth/l10n/vi.php
 create mode 100644 apps/user_webdavauth/l10n/zh_CN.js
 create mode 100644 apps/user_webdavauth/l10n/zh_CN.json
 delete mode 100644 apps/user_webdavauth/l10n/zh_CN.php
 create mode 100644 apps/user_webdavauth/l10n/zh_HK.js
 create mode 100644 apps/user_webdavauth/l10n/zh_HK.json
 delete mode 100644 apps/user_webdavauth/l10n/zh_HK.php
 create mode 100644 apps/user_webdavauth/l10n/zh_TW.js
 create mode 100644 apps/user_webdavauth/l10n/zh_TW.json
 delete mode 100644 apps/user_webdavauth/l10n/zh_TW.php
 create mode 100644 core/l10n/ach.js
 create mode 100644 core/l10n/ach.json
 delete mode 100644 core/l10n/ach.php
 create mode 100644 core/l10n/ady.js
 create mode 100644 core/l10n/ady.json
 delete mode 100644 core/l10n/ady.php
 create mode 100644 core/l10n/af_ZA.js
 create mode 100644 core/l10n/af_ZA.json
 delete mode 100644 core/l10n/af_ZA.php
 create mode 100644 core/l10n/ak.js
 create mode 100644 core/l10n/ak.json
 delete mode 100644 core/l10n/ak.php
 create mode 100644 core/l10n/am_ET.js
 create mode 100644 core/l10n/am_ET.json
 delete mode 100644 core/l10n/am_ET.php
 create mode 100644 core/l10n/ar.js
 create mode 100644 core/l10n/ar.json
 delete mode 100644 core/l10n/ar.php
 create mode 100644 core/l10n/ast.js
 create mode 100644 core/l10n/ast.json
 delete mode 100644 core/l10n/ast.php
 create mode 100644 core/l10n/az.js
 create mode 100644 core/l10n/az.json
 delete mode 100644 core/l10n/az.php
 create mode 100644 core/l10n/be.js
 create mode 100644 core/l10n/be.json
 delete mode 100644 core/l10n/be.php
 create mode 100644 core/l10n/bg_BG.js
 create mode 100644 core/l10n/bg_BG.json
 delete mode 100644 core/l10n/bg_BG.php
 create mode 100644 core/l10n/bn_BD.js
 create mode 100644 core/l10n/bn_BD.json
 delete mode 100644 core/l10n/bn_BD.php
 create mode 100644 core/l10n/bn_IN.js
 create mode 100644 core/l10n/bn_IN.json
 delete mode 100644 core/l10n/bn_IN.php
 create mode 100644 core/l10n/bs.js
 create mode 100644 core/l10n/bs.json
 delete mode 100644 core/l10n/bs.php
 create mode 100644 core/l10n/ca.js
 create mode 100644 core/l10n/ca.json
 delete mode 100644 core/l10n/ca.php
 create mode 100644 core/l10n/ca@valencia.js
 create mode 100644 core/l10n/ca@valencia.json
 delete mode 100644 core/l10n/ca@valencia.php
 create mode 100644 core/l10n/cs_CZ.js
 create mode 100644 core/l10n/cs_CZ.json
 delete mode 100644 core/l10n/cs_CZ.php
 create mode 100644 core/l10n/cy_GB.js
 create mode 100644 core/l10n/cy_GB.json
 delete mode 100644 core/l10n/cy_GB.php
 create mode 100644 core/l10n/da.js
 create mode 100644 core/l10n/da.json
 delete mode 100644 core/l10n/da.php
 create mode 100644 core/l10n/de.js
 create mode 100644 core/l10n/de.json
 delete mode 100644 core/l10n/de.php
 create mode 100644 core/l10n/de_AT.js
 create mode 100644 core/l10n/de_AT.json
 delete mode 100644 core/l10n/de_AT.php
 create mode 100644 core/l10n/de_CH.js
 create mode 100644 core/l10n/de_CH.json
 delete mode 100644 core/l10n/de_CH.php
 create mode 100644 core/l10n/de_DE.js
 create mode 100644 core/l10n/de_DE.json
 delete mode 100644 core/l10n/de_DE.php
 create mode 100644 core/l10n/el.js
 create mode 100644 core/l10n/el.json
 delete mode 100644 core/l10n/el.php
 create mode 100644 core/l10n/en@pirate.js
 create mode 100644 core/l10n/en@pirate.json
 delete mode 100644 core/l10n/en@pirate.php
 create mode 100644 core/l10n/en_GB.js
 create mode 100644 core/l10n/en_GB.json
 delete mode 100644 core/l10n/en_GB.php
 create mode 100644 core/l10n/en_NZ.js
 create mode 100644 core/l10n/en_NZ.json
 delete mode 100644 core/l10n/en_NZ.php
 create mode 100644 core/l10n/eo.js
 create mode 100644 core/l10n/eo.json
 delete mode 100644 core/l10n/eo.php
 create mode 100644 core/l10n/es.js
 create mode 100644 core/l10n/es.json
 delete mode 100644 core/l10n/es.php
 create mode 100644 core/l10n/es_AR.js
 create mode 100644 core/l10n/es_AR.json
 delete mode 100644 core/l10n/es_AR.php
 create mode 100644 core/l10n/es_BO.js
 create mode 100644 core/l10n/es_BO.json
 delete mode 100644 core/l10n/es_BO.php
 create mode 100644 core/l10n/es_CL.js
 create mode 100644 core/l10n/es_CL.json
 delete mode 100644 core/l10n/es_CL.php
 create mode 100644 core/l10n/es_CO.js
 create mode 100644 core/l10n/es_CO.json
 delete mode 100644 core/l10n/es_CO.php
 create mode 100644 core/l10n/es_CR.js
 create mode 100644 core/l10n/es_CR.json
 delete mode 100644 core/l10n/es_CR.php
 create mode 100644 core/l10n/es_EC.js
 create mode 100644 core/l10n/es_EC.json
 delete mode 100644 core/l10n/es_EC.php
 create mode 100644 core/l10n/es_MX.js
 create mode 100644 core/l10n/es_MX.json
 delete mode 100644 core/l10n/es_MX.php
 create mode 100644 core/l10n/es_PE.js
 create mode 100644 core/l10n/es_PE.json
 delete mode 100644 core/l10n/es_PE.php
 create mode 100644 core/l10n/es_PY.js
 create mode 100644 core/l10n/es_PY.json
 delete mode 100644 core/l10n/es_PY.php
 create mode 100644 core/l10n/es_US.js
 create mode 100644 core/l10n/es_US.json
 delete mode 100644 core/l10n/es_US.php
 create mode 100644 core/l10n/es_UY.js
 create mode 100644 core/l10n/es_UY.json
 delete mode 100644 core/l10n/es_UY.php
 create mode 100644 core/l10n/et_EE.js
 create mode 100644 core/l10n/et_EE.json
 delete mode 100644 core/l10n/et_EE.php
 create mode 100644 core/l10n/eu.js
 create mode 100644 core/l10n/eu.json
 delete mode 100644 core/l10n/eu.php
 create mode 100644 core/l10n/eu_ES.js
 create mode 100644 core/l10n/eu_ES.json
 delete mode 100644 core/l10n/eu_ES.php
 create mode 100644 core/l10n/fa.js
 create mode 100644 core/l10n/fa.json
 delete mode 100644 core/l10n/fa.php
 create mode 100644 core/l10n/fi_FI.js
 create mode 100644 core/l10n/fi_FI.json
 delete mode 100644 core/l10n/fi_FI.php
 create mode 100644 core/l10n/fil.js
 create mode 100644 core/l10n/fil.json
 delete mode 100644 core/l10n/fil.php
 create mode 100644 core/l10n/fr.js
 create mode 100644 core/l10n/fr.json
 delete mode 100644 core/l10n/fr.php
 create mode 100644 core/l10n/fr_CA.js
 create mode 100644 core/l10n/fr_CA.json
 delete mode 100644 core/l10n/fr_CA.php
 create mode 100644 core/l10n/fy_NL.js
 create mode 100644 core/l10n/fy_NL.json
 delete mode 100644 core/l10n/fy_NL.php
 create mode 100644 core/l10n/gl.js
 create mode 100644 core/l10n/gl.json
 delete mode 100644 core/l10n/gl.php
 create mode 100644 core/l10n/gu.js
 create mode 100644 core/l10n/gu.json
 delete mode 100644 core/l10n/gu.php
 create mode 100644 core/l10n/he.js
 create mode 100644 core/l10n/he.json
 delete mode 100644 core/l10n/he.php
 create mode 100644 core/l10n/hi.js
 create mode 100644 core/l10n/hi.json
 delete mode 100644 core/l10n/hi.php
 create mode 100644 core/l10n/hr.js
 create mode 100644 core/l10n/hr.json
 delete mode 100644 core/l10n/hr.php
 create mode 100644 core/l10n/hu_HU.js
 create mode 100644 core/l10n/hu_HU.json
 delete mode 100644 core/l10n/hu_HU.php
 create mode 100644 core/l10n/hy.js
 create mode 100644 core/l10n/hy.json
 delete mode 100644 core/l10n/hy.php
 create mode 100644 core/l10n/ia.js
 create mode 100644 core/l10n/ia.json
 delete mode 100644 core/l10n/ia.php
 create mode 100644 core/l10n/id.js
 create mode 100644 core/l10n/id.json
 delete mode 100644 core/l10n/id.php
 create mode 100644 core/l10n/io.js
 create mode 100644 core/l10n/io.json
 delete mode 100644 core/l10n/io.php
 create mode 100644 core/l10n/is.js
 create mode 100644 core/l10n/is.json
 delete mode 100644 core/l10n/is.php
 create mode 100644 core/l10n/it.js
 create mode 100644 core/l10n/it.json
 delete mode 100644 core/l10n/it.php
 create mode 100644 core/l10n/ja.js
 create mode 100644 core/l10n/ja.json
 delete mode 100644 core/l10n/ja.php
 create mode 100644 core/l10n/jv.js
 create mode 100644 core/l10n/jv.json
 delete mode 100644 core/l10n/jv.php
 create mode 100644 core/l10n/ka_GE.js
 create mode 100644 core/l10n/ka_GE.json
 delete mode 100644 core/l10n/ka_GE.php
 create mode 100644 core/l10n/km.js
 create mode 100644 core/l10n/km.json
 delete mode 100644 core/l10n/km.php
 create mode 100644 core/l10n/kn.js
 create mode 100644 core/l10n/kn.json
 delete mode 100644 core/l10n/kn.php
 create mode 100644 core/l10n/ko.js
 create mode 100644 core/l10n/ko.json
 delete mode 100644 core/l10n/ko.php
 create mode 100644 core/l10n/ku_IQ.js
 create mode 100644 core/l10n/ku_IQ.json
 delete mode 100644 core/l10n/ku_IQ.php
 create mode 100644 core/l10n/lb.js
 create mode 100644 core/l10n/lb.json
 delete mode 100644 core/l10n/lb.php
 create mode 100644 core/l10n/lt_LT.js
 create mode 100644 core/l10n/lt_LT.json
 delete mode 100644 core/l10n/lt_LT.php
 create mode 100644 core/l10n/lv.js
 create mode 100644 core/l10n/lv.json
 delete mode 100644 core/l10n/lv.php
 create mode 100644 core/l10n/mg.js
 create mode 100644 core/l10n/mg.json
 delete mode 100644 core/l10n/mg.php
 create mode 100644 core/l10n/mk.js
 create mode 100644 core/l10n/mk.json
 delete mode 100644 core/l10n/mk.php
 create mode 100644 core/l10n/ml.js
 create mode 100644 core/l10n/ml.json
 delete mode 100644 core/l10n/ml.php
 create mode 100644 core/l10n/ml_IN.js
 create mode 100644 core/l10n/ml_IN.json
 delete mode 100644 core/l10n/ml_IN.php
 create mode 100644 core/l10n/mn.js
 create mode 100644 core/l10n/mn.json
 delete mode 100644 core/l10n/mn.php
 create mode 100644 core/l10n/ms_MY.js
 create mode 100644 core/l10n/ms_MY.json
 delete mode 100644 core/l10n/ms_MY.php
 create mode 100644 core/l10n/mt_MT.js
 create mode 100644 core/l10n/mt_MT.json
 delete mode 100644 core/l10n/mt_MT.php
 create mode 100644 core/l10n/my_MM.js
 create mode 100644 core/l10n/my_MM.json
 delete mode 100644 core/l10n/my_MM.php
 create mode 100644 core/l10n/nb_NO.js
 create mode 100644 core/l10n/nb_NO.json
 delete mode 100644 core/l10n/nb_NO.php
 create mode 100644 core/l10n/nds.js
 create mode 100644 core/l10n/nds.json
 delete mode 100644 core/l10n/nds.php
 create mode 100644 core/l10n/ne.js
 create mode 100644 core/l10n/ne.json
 delete mode 100644 core/l10n/ne.php
 create mode 100644 core/l10n/nl.js
 create mode 100644 core/l10n/nl.json
 delete mode 100644 core/l10n/nl.php
 create mode 100644 core/l10n/nn_NO.js
 create mode 100644 core/l10n/nn_NO.json
 delete mode 100644 core/l10n/nn_NO.php
 create mode 100644 core/l10n/nqo.js
 create mode 100644 core/l10n/nqo.json
 delete mode 100644 core/l10n/nqo.php
 create mode 100644 core/l10n/oc.js
 create mode 100644 core/l10n/oc.json
 delete mode 100644 core/l10n/oc.php
 create mode 100644 core/l10n/or_IN.js
 create mode 100644 core/l10n/or_IN.json
 delete mode 100644 core/l10n/or_IN.php
 create mode 100644 core/l10n/pa.js
 create mode 100644 core/l10n/pa.json
 delete mode 100644 core/l10n/pa.php
 create mode 100644 core/l10n/pl.js
 create mode 100644 core/l10n/pl.json
 delete mode 100644 core/l10n/pl.php
 create mode 100644 core/l10n/pt_BR.js
 create mode 100644 core/l10n/pt_BR.json
 delete mode 100644 core/l10n/pt_BR.php
 create mode 100644 core/l10n/pt_PT.js
 create mode 100644 core/l10n/pt_PT.json
 delete mode 100644 core/l10n/pt_PT.php
 create mode 100644 core/l10n/ro.js
 create mode 100644 core/l10n/ro.json
 delete mode 100644 core/l10n/ro.php
 create mode 100644 core/l10n/ru.js
 create mode 100644 core/l10n/ru.json
 delete mode 100644 core/l10n/ru.php
 create mode 100644 core/l10n/si_LK.js
 create mode 100644 core/l10n/si_LK.json
 delete mode 100644 core/l10n/si_LK.php
 create mode 100644 core/l10n/sk_SK.js
 create mode 100644 core/l10n/sk_SK.json
 delete mode 100644 core/l10n/sk_SK.php
 create mode 100644 core/l10n/sl.js
 create mode 100644 core/l10n/sl.json
 delete mode 100644 core/l10n/sl.php
 create mode 100644 core/l10n/sq.js
 create mode 100644 core/l10n/sq.json
 delete mode 100644 core/l10n/sq.php
 create mode 100644 core/l10n/sr.js
 create mode 100644 core/l10n/sr.json
 delete mode 100644 core/l10n/sr.php
 create mode 100644 core/l10n/sr@latin.js
 create mode 100644 core/l10n/sr@latin.json
 delete mode 100644 core/l10n/sr@latin.php
 create mode 100644 core/l10n/su.js
 create mode 100644 core/l10n/su.json
 delete mode 100644 core/l10n/su.php
 create mode 100644 core/l10n/sv.js
 create mode 100644 core/l10n/sv.json
 delete mode 100644 core/l10n/sv.php
 create mode 100644 core/l10n/sw_KE.js
 create mode 100644 core/l10n/sw_KE.json
 delete mode 100644 core/l10n/sw_KE.php
 create mode 100644 core/l10n/ta_IN.js
 create mode 100644 core/l10n/ta_IN.json
 delete mode 100644 core/l10n/ta_IN.php
 create mode 100644 core/l10n/ta_LK.js
 create mode 100644 core/l10n/ta_LK.json
 delete mode 100644 core/l10n/ta_LK.php
 create mode 100644 core/l10n/te.js
 create mode 100644 core/l10n/te.json
 delete mode 100644 core/l10n/te.php
 create mode 100644 core/l10n/tg_TJ.js
 create mode 100644 core/l10n/tg_TJ.json
 delete mode 100644 core/l10n/tg_TJ.php
 create mode 100644 core/l10n/th_TH.js
 create mode 100644 core/l10n/th_TH.json
 delete mode 100644 core/l10n/th_TH.php
 create mode 100644 core/l10n/tl_PH.js
 create mode 100644 core/l10n/tl_PH.json
 delete mode 100644 core/l10n/tl_PH.php
 create mode 100644 core/l10n/tr.js
 create mode 100644 core/l10n/tr.json
 delete mode 100644 core/l10n/tr.php
 create mode 100644 core/l10n/tzm.js
 create mode 100644 core/l10n/tzm.json
 delete mode 100644 core/l10n/tzm.php
 create mode 100644 core/l10n/ug.js
 create mode 100644 core/l10n/ug.json
 delete mode 100644 core/l10n/ug.php
 create mode 100644 core/l10n/uk.js
 create mode 100644 core/l10n/uk.json
 delete mode 100644 core/l10n/uk.php
 create mode 100644 core/l10n/ur_PK.js
 create mode 100644 core/l10n/ur_PK.json
 delete mode 100644 core/l10n/ur_PK.php
 create mode 100644 core/l10n/uz.js
 create mode 100644 core/l10n/uz.json
 delete mode 100644 core/l10n/uz.php
 create mode 100644 core/l10n/vi.js
 create mode 100644 core/l10n/vi.json
 delete mode 100644 core/l10n/vi.php
 create mode 100644 core/l10n/zh_CN.js
 create mode 100644 core/l10n/zh_CN.json
 delete mode 100644 core/l10n/zh_CN.php
 create mode 100644 core/l10n/zh_HK.js
 create mode 100644 core/l10n/zh_HK.json
 delete mode 100644 core/l10n/zh_HK.php
 create mode 100644 core/l10n/zh_TW.js
 create mode 100644 core/l10n/zh_TW.json
 delete mode 100644 core/l10n/zh_TW.php
 create mode 100644 lib/l10n/ach.js
 create mode 100644 lib/l10n/ach.json
 delete mode 100644 lib/l10n/ach.php
 create mode 100644 lib/l10n/ady.js
 create mode 100644 lib/l10n/ady.json
 delete mode 100644 lib/l10n/ady.php
 create mode 100644 lib/l10n/af_ZA.js
 create mode 100644 lib/l10n/af_ZA.json
 delete mode 100644 lib/l10n/af_ZA.php
 create mode 100644 lib/l10n/ak.js
 create mode 100644 lib/l10n/ak.json
 delete mode 100644 lib/l10n/ak.php
 create mode 100644 lib/l10n/am_ET.js
 create mode 100644 lib/l10n/am_ET.json
 delete mode 100644 lib/l10n/am_ET.php
 create mode 100644 lib/l10n/ar.js
 create mode 100644 lib/l10n/ar.json
 delete mode 100644 lib/l10n/ar.php
 create mode 100644 lib/l10n/ast.js
 create mode 100644 lib/l10n/ast.json
 delete mode 100644 lib/l10n/ast.php
 create mode 100644 lib/l10n/az.js
 create mode 100644 lib/l10n/az.json
 delete mode 100644 lib/l10n/az.php
 create mode 100644 lib/l10n/be.js
 create mode 100644 lib/l10n/be.json
 delete mode 100644 lib/l10n/be.php
 create mode 100644 lib/l10n/bg_BG.js
 create mode 100644 lib/l10n/bg_BG.json
 delete mode 100644 lib/l10n/bg_BG.php
 create mode 100644 lib/l10n/bn_BD.js
 create mode 100644 lib/l10n/bn_BD.json
 delete mode 100644 lib/l10n/bn_BD.php
 create mode 100644 lib/l10n/bn_IN.js
 create mode 100644 lib/l10n/bn_IN.json
 delete mode 100644 lib/l10n/bn_IN.php
 create mode 100644 lib/l10n/bs.js
 create mode 100644 lib/l10n/bs.json
 delete mode 100644 lib/l10n/bs.php
 create mode 100644 lib/l10n/ca.js
 create mode 100644 lib/l10n/ca.json
 delete mode 100644 lib/l10n/ca.php
 create mode 100644 lib/l10n/ca@valencia.js
 create mode 100644 lib/l10n/ca@valencia.json
 delete mode 100644 lib/l10n/ca@valencia.php
 create mode 100644 lib/l10n/cs_CZ.js
 create mode 100644 lib/l10n/cs_CZ.json
 delete mode 100644 lib/l10n/cs_CZ.php
 create mode 100644 lib/l10n/cy_GB.js
 create mode 100644 lib/l10n/cy_GB.json
 delete mode 100644 lib/l10n/cy_GB.php
 create mode 100644 lib/l10n/da.js
 create mode 100644 lib/l10n/da.json
 delete mode 100644 lib/l10n/da.php
 create mode 100644 lib/l10n/de.js
 create mode 100644 lib/l10n/de.json
 delete mode 100644 lib/l10n/de.php
 create mode 100644 lib/l10n/de_AT.js
 create mode 100644 lib/l10n/de_AT.json
 delete mode 100644 lib/l10n/de_AT.php
 create mode 100644 lib/l10n/de_CH.js
 create mode 100644 lib/l10n/de_CH.json
 delete mode 100644 lib/l10n/de_CH.php
 create mode 100644 lib/l10n/de_DE.js
 create mode 100644 lib/l10n/de_DE.json
 delete mode 100644 lib/l10n/de_DE.php
 create mode 100644 lib/l10n/el.js
 create mode 100644 lib/l10n/el.json
 delete mode 100644 lib/l10n/el.php
 create mode 100644 lib/l10n/en@pirate.js
 create mode 100644 lib/l10n/en@pirate.json
 delete mode 100644 lib/l10n/en@pirate.php
 create mode 100644 lib/l10n/en_GB.js
 create mode 100644 lib/l10n/en_GB.json
 delete mode 100644 lib/l10n/en_GB.php
 create mode 100644 lib/l10n/en_NZ.js
 create mode 100644 lib/l10n/en_NZ.json
 delete mode 100644 lib/l10n/en_NZ.php
 create mode 100644 lib/l10n/eo.js
 create mode 100644 lib/l10n/eo.json
 delete mode 100644 lib/l10n/eo.php
 create mode 100644 lib/l10n/es.js
 create mode 100644 lib/l10n/es.json
 delete mode 100644 lib/l10n/es.php
 create mode 100644 lib/l10n/es_AR.js
 create mode 100644 lib/l10n/es_AR.json
 delete mode 100644 lib/l10n/es_AR.php
 create mode 100644 lib/l10n/es_BO.js
 create mode 100644 lib/l10n/es_BO.json
 delete mode 100644 lib/l10n/es_BO.php
 create mode 100644 lib/l10n/es_CL.js
 create mode 100644 lib/l10n/es_CL.json
 delete mode 100644 lib/l10n/es_CL.php
 create mode 100644 lib/l10n/es_CO.js
 create mode 100644 lib/l10n/es_CO.json
 delete mode 100644 lib/l10n/es_CO.php
 create mode 100644 lib/l10n/es_CR.js
 create mode 100644 lib/l10n/es_CR.json
 delete mode 100644 lib/l10n/es_CR.php
 create mode 100644 lib/l10n/es_EC.js
 create mode 100644 lib/l10n/es_EC.json
 delete mode 100644 lib/l10n/es_EC.php
 create mode 100644 lib/l10n/es_MX.js
 create mode 100644 lib/l10n/es_MX.json
 delete mode 100644 lib/l10n/es_MX.php
 create mode 100644 lib/l10n/es_PE.js
 create mode 100644 lib/l10n/es_PE.json
 delete mode 100644 lib/l10n/es_PE.php
 create mode 100644 lib/l10n/es_PY.js
 create mode 100644 lib/l10n/es_PY.json
 delete mode 100644 lib/l10n/es_PY.php
 create mode 100644 lib/l10n/es_US.js
 create mode 100644 lib/l10n/es_US.json
 delete mode 100644 lib/l10n/es_US.php
 create mode 100644 lib/l10n/es_UY.js
 create mode 100644 lib/l10n/es_UY.json
 delete mode 100644 lib/l10n/es_UY.php
 create mode 100644 lib/l10n/et_EE.js
 create mode 100644 lib/l10n/et_EE.json
 delete mode 100644 lib/l10n/et_EE.php
 create mode 100644 lib/l10n/eu.js
 create mode 100644 lib/l10n/eu.json
 delete mode 100644 lib/l10n/eu.php
 create mode 100644 lib/l10n/eu_ES.js
 create mode 100644 lib/l10n/eu_ES.json
 delete mode 100644 lib/l10n/eu_ES.php
 create mode 100644 lib/l10n/fa.js
 create mode 100644 lib/l10n/fa.json
 delete mode 100644 lib/l10n/fa.php
 create mode 100644 lib/l10n/fi_FI.js
 create mode 100644 lib/l10n/fi_FI.json
 delete mode 100644 lib/l10n/fi_FI.php
 create mode 100644 lib/l10n/fil.js
 create mode 100644 lib/l10n/fil.json
 delete mode 100644 lib/l10n/fil.php
 create mode 100644 lib/l10n/fr.js
 create mode 100644 lib/l10n/fr.json
 delete mode 100644 lib/l10n/fr.php
 create mode 100644 lib/l10n/fr_CA.js
 create mode 100644 lib/l10n/fr_CA.json
 delete mode 100644 lib/l10n/fr_CA.php
 create mode 100644 lib/l10n/fy_NL.js
 create mode 100644 lib/l10n/fy_NL.json
 delete mode 100644 lib/l10n/fy_NL.php
 create mode 100644 lib/l10n/gl.js
 create mode 100644 lib/l10n/gl.json
 delete mode 100644 lib/l10n/gl.php
 create mode 100644 lib/l10n/gu.js
 create mode 100644 lib/l10n/gu.json
 delete mode 100644 lib/l10n/gu.php
 create mode 100644 lib/l10n/he.js
 create mode 100644 lib/l10n/he.json
 delete mode 100644 lib/l10n/he.php
 create mode 100644 lib/l10n/hi.js
 create mode 100644 lib/l10n/hi.json
 delete mode 100644 lib/l10n/hi.php
 create mode 100644 lib/l10n/hr.js
 create mode 100644 lib/l10n/hr.json
 delete mode 100644 lib/l10n/hr.php
 create mode 100644 lib/l10n/hu_HU.js
 create mode 100644 lib/l10n/hu_HU.json
 delete mode 100644 lib/l10n/hu_HU.php
 create mode 100644 lib/l10n/hy.js
 create mode 100644 lib/l10n/hy.json
 delete mode 100644 lib/l10n/hy.php
 create mode 100644 lib/l10n/ia.js
 create mode 100644 lib/l10n/ia.json
 delete mode 100644 lib/l10n/ia.php
 create mode 100644 lib/l10n/id.js
 create mode 100644 lib/l10n/id.json
 delete mode 100644 lib/l10n/id.php
 create mode 100644 lib/l10n/io.js
 create mode 100644 lib/l10n/io.json
 delete mode 100644 lib/l10n/io.php
 create mode 100644 lib/l10n/is.js
 create mode 100644 lib/l10n/is.json
 delete mode 100644 lib/l10n/is.php
 create mode 100644 lib/l10n/it.js
 create mode 100644 lib/l10n/it.json
 delete mode 100644 lib/l10n/it.php
 create mode 100644 lib/l10n/ja.js
 create mode 100644 lib/l10n/ja.json
 delete mode 100644 lib/l10n/ja.php
 create mode 100644 lib/l10n/jv.js
 create mode 100644 lib/l10n/jv.json
 delete mode 100644 lib/l10n/jv.php
 create mode 100644 lib/l10n/ka_GE.js
 create mode 100644 lib/l10n/ka_GE.json
 delete mode 100644 lib/l10n/ka_GE.php
 create mode 100644 lib/l10n/km.js
 create mode 100644 lib/l10n/km.json
 delete mode 100644 lib/l10n/km.php
 create mode 100644 lib/l10n/kn.js
 create mode 100644 lib/l10n/kn.json
 delete mode 100644 lib/l10n/kn.php
 create mode 100644 lib/l10n/ko.js
 create mode 100644 lib/l10n/ko.json
 delete mode 100644 lib/l10n/ko.php
 create mode 100644 lib/l10n/ku_IQ.js
 create mode 100644 lib/l10n/ku_IQ.json
 delete mode 100644 lib/l10n/ku_IQ.php
 create mode 100644 lib/l10n/lb.js
 create mode 100644 lib/l10n/lb.json
 delete mode 100644 lib/l10n/lb.php
 create mode 100644 lib/l10n/lt_LT.js
 create mode 100644 lib/l10n/lt_LT.json
 delete mode 100644 lib/l10n/lt_LT.php
 create mode 100644 lib/l10n/lv.js
 create mode 100644 lib/l10n/lv.json
 delete mode 100644 lib/l10n/lv.php
 create mode 100644 lib/l10n/mg.js
 create mode 100644 lib/l10n/mg.json
 delete mode 100644 lib/l10n/mg.php
 create mode 100644 lib/l10n/mk.js
 create mode 100644 lib/l10n/mk.json
 delete mode 100644 lib/l10n/mk.php
 create mode 100644 lib/l10n/ml.js
 create mode 100644 lib/l10n/ml.json
 delete mode 100644 lib/l10n/ml.php
 create mode 100644 lib/l10n/ml_IN.js
 create mode 100644 lib/l10n/ml_IN.json
 delete mode 100644 lib/l10n/ml_IN.php
 create mode 100644 lib/l10n/mn.js
 create mode 100644 lib/l10n/mn.json
 delete mode 100644 lib/l10n/mn.php
 create mode 100644 lib/l10n/ms_MY.js
 create mode 100644 lib/l10n/ms_MY.json
 delete mode 100644 lib/l10n/ms_MY.php
 create mode 100644 lib/l10n/mt_MT.js
 create mode 100644 lib/l10n/mt_MT.json
 delete mode 100644 lib/l10n/mt_MT.php
 create mode 100644 lib/l10n/my_MM.js
 create mode 100644 lib/l10n/my_MM.json
 delete mode 100644 lib/l10n/my_MM.php
 create mode 100644 lib/l10n/nb_NO.js
 create mode 100644 lib/l10n/nb_NO.json
 delete mode 100644 lib/l10n/nb_NO.php
 create mode 100644 lib/l10n/nds.js
 create mode 100644 lib/l10n/nds.json
 delete mode 100644 lib/l10n/nds.php
 create mode 100644 lib/l10n/ne.js
 create mode 100644 lib/l10n/ne.json
 delete mode 100644 lib/l10n/ne.php
 create mode 100644 lib/l10n/nl.js
 create mode 100644 lib/l10n/nl.json
 delete mode 100644 lib/l10n/nl.php
 create mode 100644 lib/l10n/nn_NO.js
 create mode 100644 lib/l10n/nn_NO.json
 delete mode 100644 lib/l10n/nn_NO.php
 create mode 100644 lib/l10n/nqo.js
 create mode 100644 lib/l10n/nqo.json
 delete mode 100644 lib/l10n/nqo.php
 create mode 100644 lib/l10n/oc.js
 create mode 100644 lib/l10n/oc.json
 delete mode 100644 lib/l10n/oc.php
 create mode 100644 lib/l10n/or_IN.js
 create mode 100644 lib/l10n/or_IN.json
 delete mode 100644 lib/l10n/or_IN.php
 create mode 100644 lib/l10n/pa.js
 create mode 100644 lib/l10n/pa.json
 delete mode 100644 lib/l10n/pa.php
 create mode 100644 lib/l10n/pl.js
 create mode 100644 lib/l10n/pl.json
 delete mode 100644 lib/l10n/pl.php
 create mode 100644 lib/l10n/pt_BR.js
 create mode 100644 lib/l10n/pt_BR.json
 delete mode 100644 lib/l10n/pt_BR.php
 create mode 100644 lib/l10n/pt_PT.js
 create mode 100644 lib/l10n/pt_PT.json
 delete mode 100644 lib/l10n/pt_PT.php
 create mode 100644 lib/l10n/ro.js
 create mode 100644 lib/l10n/ro.json
 delete mode 100644 lib/l10n/ro.php
 create mode 100644 lib/l10n/ru.js
 create mode 100644 lib/l10n/ru.json
 delete mode 100644 lib/l10n/ru.php
 create mode 100644 lib/l10n/si_LK.js
 create mode 100644 lib/l10n/si_LK.json
 delete mode 100644 lib/l10n/si_LK.php
 create mode 100644 lib/l10n/sk_SK.js
 create mode 100644 lib/l10n/sk_SK.json
 delete mode 100644 lib/l10n/sk_SK.php
 create mode 100644 lib/l10n/sl.js
 create mode 100644 lib/l10n/sl.json
 delete mode 100644 lib/l10n/sl.php
 create mode 100644 lib/l10n/sq.js
 create mode 100644 lib/l10n/sq.json
 delete mode 100644 lib/l10n/sq.php
 create mode 100644 lib/l10n/sr.js
 create mode 100644 lib/l10n/sr.json
 delete mode 100644 lib/l10n/sr.php
 create mode 100644 lib/l10n/sr@latin.js
 create mode 100644 lib/l10n/sr@latin.json
 delete mode 100644 lib/l10n/sr@latin.php
 create mode 100644 lib/l10n/su.js
 create mode 100644 lib/l10n/su.json
 delete mode 100644 lib/l10n/su.php
 create mode 100644 lib/l10n/sv.js
 create mode 100644 lib/l10n/sv.json
 delete mode 100644 lib/l10n/sv.php
 create mode 100644 lib/l10n/sw_KE.js
 create mode 100644 lib/l10n/sw_KE.json
 delete mode 100644 lib/l10n/sw_KE.php
 create mode 100644 lib/l10n/ta_IN.js
 create mode 100644 lib/l10n/ta_IN.json
 delete mode 100644 lib/l10n/ta_IN.php
 create mode 100644 lib/l10n/ta_LK.js
 create mode 100644 lib/l10n/ta_LK.json
 delete mode 100644 lib/l10n/ta_LK.php
 create mode 100644 lib/l10n/te.js
 create mode 100644 lib/l10n/te.json
 delete mode 100644 lib/l10n/te.php
 create mode 100644 lib/l10n/tg_TJ.js
 create mode 100644 lib/l10n/tg_TJ.json
 delete mode 100644 lib/l10n/tg_TJ.php
 create mode 100644 lib/l10n/th_TH.js
 create mode 100644 lib/l10n/th_TH.json
 delete mode 100644 lib/l10n/th_TH.php
 create mode 100644 lib/l10n/tl_PH.js
 create mode 100644 lib/l10n/tl_PH.json
 delete mode 100644 lib/l10n/tl_PH.php
 create mode 100644 lib/l10n/tr.js
 create mode 100644 lib/l10n/tr.json
 delete mode 100644 lib/l10n/tr.php
 create mode 100644 lib/l10n/tzm.js
 create mode 100644 lib/l10n/tzm.json
 delete mode 100644 lib/l10n/tzm.php
 create mode 100644 lib/l10n/ug.js
 create mode 100644 lib/l10n/ug.json
 delete mode 100644 lib/l10n/ug.php
 create mode 100644 lib/l10n/uk.js
 create mode 100644 lib/l10n/uk.json
 delete mode 100644 lib/l10n/uk.php
 create mode 100644 lib/l10n/ur_PK.js
 create mode 100644 lib/l10n/ur_PK.json
 delete mode 100644 lib/l10n/ur_PK.php
 create mode 100644 lib/l10n/uz.js
 create mode 100644 lib/l10n/uz.json
 delete mode 100644 lib/l10n/uz.php
 create mode 100644 lib/l10n/vi.js
 create mode 100644 lib/l10n/vi.json
 delete mode 100644 lib/l10n/vi.php
 create mode 100644 lib/l10n/zh_CN.js
 create mode 100644 lib/l10n/zh_CN.json
 delete mode 100644 lib/l10n/zh_CN.php
 create mode 100644 lib/l10n/zh_HK.js
 create mode 100644 lib/l10n/zh_HK.json
 delete mode 100644 lib/l10n/zh_HK.php
 create mode 100644 lib/l10n/zh_TW.js
 create mode 100644 lib/l10n/zh_TW.json
 delete mode 100644 lib/l10n/zh_TW.php
 create mode 100644 settings/l10n/af_ZA.js
 create mode 100644 settings/l10n/af_ZA.json
 delete mode 100644 settings/l10n/af_ZA.php
 create mode 100644 settings/l10n/ar.js
 create mode 100644 settings/l10n/ar.json
 delete mode 100644 settings/l10n/ar.php
 create mode 100644 settings/l10n/ast.js
 create mode 100644 settings/l10n/ast.json
 delete mode 100644 settings/l10n/ast.php
 create mode 100644 settings/l10n/az.js
 create mode 100644 settings/l10n/az.json
 delete mode 100644 settings/l10n/az.php
 delete mode 100644 settings/l10n/be.php
 create mode 100644 settings/l10n/bg_BG.js
 create mode 100644 settings/l10n/bg_BG.json
 delete mode 100644 settings/l10n/bg_BG.php
 create mode 100644 settings/l10n/bn_BD.js
 create mode 100644 settings/l10n/bn_BD.json
 delete mode 100644 settings/l10n/bn_BD.php
 create mode 100644 settings/l10n/bn_IN.js
 create mode 100644 settings/l10n/bn_IN.json
 delete mode 100644 settings/l10n/bn_IN.php
 delete mode 100644 settings/l10n/bs.php
 create mode 100644 settings/l10n/ca.js
 create mode 100644 settings/l10n/ca.json
 delete mode 100644 settings/l10n/ca.php
 create mode 100644 settings/l10n/cs_CZ.js
 create mode 100644 settings/l10n/cs_CZ.json
 delete mode 100644 settings/l10n/cs_CZ.php
 create mode 100644 settings/l10n/cy_GB.js
 create mode 100644 settings/l10n/cy_GB.json
 delete mode 100644 settings/l10n/cy_GB.php
 create mode 100644 settings/l10n/da.js
 create mode 100644 settings/l10n/da.json
 delete mode 100644 settings/l10n/da.php
 create mode 100644 settings/l10n/de.js
 create mode 100644 settings/l10n/de.json
 delete mode 100644 settings/l10n/de.php
 create mode 100644 settings/l10n/de_AT.js
 create mode 100644 settings/l10n/de_AT.json
 delete mode 100644 settings/l10n/de_AT.php
 create mode 100644 settings/l10n/de_CH.js
 create mode 100644 settings/l10n/de_CH.json
 delete mode 100644 settings/l10n/de_CH.php
 create mode 100644 settings/l10n/de_DE.js
 create mode 100644 settings/l10n/de_DE.json
 delete mode 100644 settings/l10n/de_DE.php
 create mode 100644 settings/l10n/el.js
 create mode 100644 settings/l10n/el.json
 delete mode 100644 settings/l10n/el.php
 create mode 100644 settings/l10n/en@pirate.js
 create mode 100644 settings/l10n/en@pirate.json
 delete mode 100644 settings/l10n/en@pirate.php
 create mode 100644 settings/l10n/en_GB.js
 create mode 100644 settings/l10n/en_GB.json
 delete mode 100644 settings/l10n/en_GB.php
 create mode 100644 settings/l10n/eo.js
 create mode 100644 settings/l10n/eo.json
 delete mode 100644 settings/l10n/eo.php
 create mode 100644 settings/l10n/es.js
 create mode 100644 settings/l10n/es.json
 delete mode 100644 settings/l10n/es.php
 create mode 100644 settings/l10n/es_AR.js
 create mode 100644 settings/l10n/es_AR.json
 delete mode 100644 settings/l10n/es_AR.php
 create mode 100644 settings/l10n/es_CL.js
 create mode 100644 settings/l10n/es_CL.json
 delete mode 100644 settings/l10n/es_CL.php
 create mode 100644 settings/l10n/es_MX.js
 create mode 100644 settings/l10n/es_MX.json
 delete mode 100644 settings/l10n/es_MX.php
 create mode 100644 settings/l10n/et_EE.js
 create mode 100644 settings/l10n/et_EE.json
 delete mode 100644 settings/l10n/et_EE.php
 create mode 100644 settings/l10n/eu.js
 create mode 100644 settings/l10n/eu.json
 delete mode 100644 settings/l10n/eu.php
 create mode 100644 settings/l10n/eu_ES.js
 create mode 100644 settings/l10n/eu_ES.json
 delete mode 100644 settings/l10n/eu_ES.php
 create mode 100644 settings/l10n/fa.js
 create mode 100644 settings/l10n/fa.json
 delete mode 100644 settings/l10n/fa.php
 create mode 100644 settings/l10n/fi_FI.js
 create mode 100644 settings/l10n/fi_FI.json
 delete mode 100644 settings/l10n/fi_FI.php
 create mode 100644 settings/l10n/fr.js
 create mode 100644 settings/l10n/fr.json
 delete mode 100644 settings/l10n/fr.php
 create mode 100644 settings/l10n/gl.js
 create mode 100644 settings/l10n/gl.json
 delete mode 100644 settings/l10n/gl.php
 create mode 100644 settings/l10n/he.js
 create mode 100644 settings/l10n/he.json
 delete mode 100644 settings/l10n/he.php
 create mode 100644 settings/l10n/hi.js
 create mode 100644 settings/l10n/hi.json
 delete mode 100644 settings/l10n/hi.php
 create mode 100644 settings/l10n/hr.js
 create mode 100644 settings/l10n/hr.json
 delete mode 100644 settings/l10n/hr.php
 create mode 100644 settings/l10n/hu_HU.js
 create mode 100644 settings/l10n/hu_HU.json
 delete mode 100644 settings/l10n/hu_HU.php
 create mode 100644 settings/l10n/hy.js
 create mode 100644 settings/l10n/hy.json
 delete mode 100644 settings/l10n/hy.php
 create mode 100644 settings/l10n/ia.js
 create mode 100644 settings/l10n/ia.json
 delete mode 100644 settings/l10n/ia.php
 create mode 100644 settings/l10n/id.js
 create mode 100644 settings/l10n/id.json
 delete mode 100644 settings/l10n/id.php
 create mode 100644 settings/l10n/is.js
 create mode 100644 settings/l10n/is.json
 delete mode 100644 settings/l10n/is.php
 create mode 100644 settings/l10n/it.js
 create mode 100644 settings/l10n/it.json
 delete mode 100644 settings/l10n/it.php
 create mode 100644 settings/l10n/ja.js
 create mode 100644 settings/l10n/ja.json
 delete mode 100644 settings/l10n/ja.php
 create mode 100644 settings/l10n/jv.js
 create mode 100644 settings/l10n/jv.json
 delete mode 100644 settings/l10n/jv.php
 create mode 100644 settings/l10n/ka_GE.js
 create mode 100644 settings/l10n/ka_GE.json
 delete mode 100644 settings/l10n/ka_GE.php
 create mode 100644 settings/l10n/km.js
 create mode 100644 settings/l10n/km.json
 delete mode 100644 settings/l10n/km.php
 create mode 100644 settings/l10n/ko.js
 create mode 100644 settings/l10n/ko.json
 delete mode 100644 settings/l10n/ko.php
 create mode 100644 settings/l10n/ku_IQ.js
 create mode 100644 settings/l10n/ku_IQ.json
 delete mode 100644 settings/l10n/ku_IQ.php
 create mode 100644 settings/l10n/lb.js
 create mode 100644 settings/l10n/lb.json
 delete mode 100644 settings/l10n/lb.php
 create mode 100644 settings/l10n/lt_LT.js
 create mode 100644 settings/l10n/lt_LT.json
 delete mode 100644 settings/l10n/lt_LT.php
 create mode 100644 settings/l10n/lv.js
 create mode 100644 settings/l10n/lv.json
 delete mode 100644 settings/l10n/lv.php
 create mode 100644 settings/l10n/mk.js
 create mode 100644 settings/l10n/mk.json
 delete mode 100644 settings/l10n/mk.php
 create mode 100644 settings/l10n/ms_MY.js
 create mode 100644 settings/l10n/ms_MY.json
 delete mode 100644 settings/l10n/ms_MY.php
 create mode 100644 settings/l10n/my_MM.js
 create mode 100644 settings/l10n/my_MM.json
 delete mode 100644 settings/l10n/my_MM.php
 create mode 100644 settings/l10n/nb_NO.js
 create mode 100644 settings/l10n/nb_NO.json
 delete mode 100644 settings/l10n/nb_NO.php
 create mode 100644 settings/l10n/nl.js
 create mode 100644 settings/l10n/nl.json
 delete mode 100644 settings/l10n/nl.php
 create mode 100644 settings/l10n/nn_NO.js
 create mode 100644 settings/l10n/nn_NO.json
 delete mode 100644 settings/l10n/nn_NO.php
 create mode 100644 settings/l10n/oc.js
 create mode 100644 settings/l10n/oc.json
 delete mode 100644 settings/l10n/oc.php
 create mode 100644 settings/l10n/pa.js
 create mode 100644 settings/l10n/pa.json
 delete mode 100644 settings/l10n/pa.php
 create mode 100644 settings/l10n/pl.js
 create mode 100644 settings/l10n/pl.json
 delete mode 100644 settings/l10n/pl.php
 create mode 100644 settings/l10n/pt_BR.js
 create mode 100644 settings/l10n/pt_BR.json
 delete mode 100644 settings/l10n/pt_BR.php
 create mode 100644 settings/l10n/pt_PT.js
 create mode 100644 settings/l10n/pt_PT.json
 delete mode 100644 settings/l10n/pt_PT.php
 create mode 100644 settings/l10n/ro.js
 create mode 100644 settings/l10n/ro.json
 delete mode 100644 settings/l10n/ro.php
 create mode 100644 settings/l10n/ru.js
 create mode 100644 settings/l10n/ru.json
 delete mode 100644 settings/l10n/ru.php
 create mode 100644 settings/l10n/si_LK.js
 create mode 100644 settings/l10n/si_LK.json
 delete mode 100644 settings/l10n/si_LK.php
 delete mode 100644 settings/l10n/sk.php
 create mode 100644 settings/l10n/sk_SK.js
 create mode 100644 settings/l10n/sk_SK.json
 delete mode 100644 settings/l10n/sk_SK.php
 create mode 100644 settings/l10n/sl.js
 create mode 100644 settings/l10n/sl.json
 delete mode 100644 settings/l10n/sl.php
 create mode 100644 settings/l10n/sq.js
 create mode 100644 settings/l10n/sq.json
 delete mode 100644 settings/l10n/sq.php
 create mode 100644 settings/l10n/sr.js
 create mode 100644 settings/l10n/sr.json
 delete mode 100644 settings/l10n/sr.php
 create mode 100644 settings/l10n/sr@latin.js
 create mode 100644 settings/l10n/sr@latin.json
 delete mode 100644 settings/l10n/sr@latin.php
 create mode 100644 settings/l10n/sv.js
 create mode 100644 settings/l10n/sv.json
 delete mode 100644 settings/l10n/sv.php
 create mode 100644 settings/l10n/ta_IN.js
 create mode 100644 settings/l10n/ta_IN.json
 delete mode 100644 settings/l10n/ta_IN.php
 create mode 100644 settings/l10n/ta_LK.js
 create mode 100644 settings/l10n/ta_LK.json
 delete mode 100644 settings/l10n/ta_LK.php
 create mode 100644 settings/l10n/te.js
 create mode 100644 settings/l10n/te.json
 delete mode 100644 settings/l10n/te.php
 create mode 100644 settings/l10n/th_TH.js
 create mode 100644 settings/l10n/th_TH.json
 delete mode 100644 settings/l10n/th_TH.php
 create mode 100644 settings/l10n/tr.js
 create mode 100644 settings/l10n/tr.json
 delete mode 100644 settings/l10n/tr.php
 create mode 100644 settings/l10n/ug.js
 create mode 100644 settings/l10n/ug.json
 delete mode 100644 settings/l10n/ug.php
 create mode 100644 settings/l10n/uk.js
 create mode 100644 settings/l10n/uk.json
 delete mode 100644 settings/l10n/uk.php
 delete mode 100644 settings/l10n/ur.php
 create mode 100644 settings/l10n/ur_PK.js
 create mode 100644 settings/l10n/ur_PK.json
 delete mode 100644 settings/l10n/ur_PK.php
 create mode 100644 settings/l10n/vi.js
 create mode 100644 settings/l10n/vi.json
 delete mode 100644 settings/l10n/vi.php
 create mode 100644 settings/l10n/zh_CN.js
 create mode 100644 settings/l10n/zh_CN.json
 delete mode 100644 settings/l10n/zh_CN.php
 create mode 100644 settings/l10n/zh_HK.js
 create mode 100644 settings/l10n/zh_HK.json
 delete mode 100644 settings/l10n/zh_HK.php
 create mode 100644 settings/l10n/zh_TW.js
 create mode 100644 settings/l10n/zh_TW.json
 delete mode 100644 settings/l10n/zh_TW.php

diff --git a/apps/files/l10n/ach.js b/apps/files/l10n/ach.js
new file mode 100644
index 00000000000..f085469f731
--- /dev/null
+++ b/apps/files/l10n/ach.js
@@ -0,0 +1,8 @@
+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/ach.json b/apps/files/l10n/ach.json
new file mode 100644
index 00000000000..ba9792477cd
--- /dev/null
+++ b/apps/files/l10n/ach.json
@@ -0,0 +1,6 @@
+{ "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/ach.php b/apps/files/l10n/ach.php
deleted file mode 100644
index 3c711e6b78a..00000000000
--- a/apps/files/l10n/ach.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/ady.js b/apps/files/l10n/ady.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/ady.js
@@ -0,0 +1,8 @@
+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/ady.json b/apps/files/l10n/ady.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/ady.json
@@ -0,0 +1,6 @@
+{ "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/ady.php b/apps/files/l10n/ady.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/ady.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/af.js b/apps/files/l10n/af.js
new file mode 100644
index 00000000000..5bdf101699a
--- /dev/null
+++ b/apps/files/l10n/af.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..26e5833738b
--- /dev/null
+++ b/apps/files/l10n/af.json
@@ -0,0 +1 @@
+{"translations":{"_%n folder_::_%n folders_":["",""],"_%n file_::_%n files_":["",""],"_Uploading %n file_::_Uploading %n files_":["",""]},"pluralForm":"nplurals=2; plural=(n != 1);"}
\ No newline at end of file
diff --git a/apps/files/l10n/af.php b/apps/files/l10n/af.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/af.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/af_ZA.js b/apps/files/l10n/af_ZA.js
new file mode 100644
index 00000000000..1a4639183ed
--- /dev/null
+++ b/apps/files/l10n/af_ZA.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files",
+    {
+    "Share" : "Deel",
+    "Unshare" : "Deel terug neem",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Folder" : "Omslag"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/af_ZA.json b/apps/files/l10n/af_ZA.json
new file mode 100644
index 00000000000..0e7116887f0
--- /dev/null
+++ b/apps/files/l10n/af_ZA.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Share" : "Deel",
+    "Unshare" : "Deel terug neem",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Folder" : "Omslag"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/af_ZA.php b/apps/files/l10n/af_ZA.php
deleted file mode 100644
index 9f9a82dbc33..00000000000
--- a/apps/files/l10n/af_ZA.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Share" => "Deel",
-"Unshare" => "Deel terug neem",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Folder" => "Omslag"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ak.js b/apps/files/l10n/ak.js
new file mode 100644
index 00000000000..8ffacdcf2f3
--- /dev/null
+++ b/apps/files/l10n/ak.js
@@ -0,0 +1,8 @@
+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/ak.json b/apps/files/l10n/ak.json
new file mode 100644
index 00000000000..63d087f769b
--- /dev/null
+++ b/apps/files/l10n/ak.json
@@ -0,0 +1,6 @@
+{ "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/ak.php b/apps/files/l10n/ak.php
deleted file mode 100644
index f229792722d..00000000000
--- a/apps/files/l10n/ak.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=n > 1;";
diff --git a/apps/files/l10n/am_ET.js b/apps/files/l10n/am_ET.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/am_ET.js
@@ -0,0 +1,8 @@
+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/am_ET.json b/apps/files/l10n/am_ET.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/am_ET.json
@@ -0,0 +1,6 @@
+{ "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/am_ET.php b/apps/files/l10n/am_ET.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/am_ET.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ar.js b/apps/files/l10n/ar.js
new file mode 100644
index 00000000000..aaa4f1aa2be
--- /dev/null
+++ b/apps/files/l10n/ar.js
@@ -0,0 +1,67 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "خطأ غير معروف. ",
+    "Could not move %s - File with this name already exists" : "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
+    "Could not move %s" : "فشل في نقل %s",
+    "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
+    "Unable to set upload directory." : "غير قادر على تحميل المجلد",
+    "Invalid Token" : "علامة غير صالحة",
+    "No file was uploaded. Unknown error" : "لم يتم رفع أي ملف , خطأ غير معروف",
+    "There is no error, the file uploaded with success" : "تم ترفيع الملفات بنجاح.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "حجم الملف المرفوع تجاوز قيمة  upload_max_filesize الموجودة في ملف php.ini ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML.",
+    "The uploaded file was only partially uploaded" : "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط",
+    "No file was uploaded" : "لم يتم ترفيع أي من الملفات",
+    "Missing a temporary folder" : "المجلد المؤقت غير موجود",
+    "Failed to write to disk" : "خطأ في الكتابة على القرص الصلب",
+    "Not enough storage available" : "لا يوجد مساحة تخزينية كافية",
+    "Upload failed. Could not find uploaded file" : "*فشلت علمية الرفع. تعذر إيجاد الملف الذي تم رفعه.\n*فشلت علمية التحميل. تعذر إيجاد الملف الذي تم تحميله.",
+    "Upload failed. Could not get file info." : "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
+    "Invalid directory." : "مسار غير صحيح.",
+    "Files" : "الملفات",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
+    "Upload cancelled." : "تم إلغاء عملية رفع الملفات .",
+    "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
+    "{new_name} already exists" : "{new_name} موجود مسبقا",
+    "Share" : "شارك",
+    "Delete" : "إلغاء",
+    "Unshare" : "إلغاء المشاركة",
+    "Delete permanently" : "حذف بشكل دائم",
+    "Rename" : "إعادة تسميه",
+    "Pending" : "قيد الانتظار",
+    "Error moving file" : "حدث خطأ أثناء نقل الملف",
+    "Error" : "خطأ",
+    "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"],
+    "_Uploading %n file_::_Uploading %n files_" : ["لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"],
+    "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
+    "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.",
+    "{dirs} and {files}" : "{dirs} و {files}",
+    "%s could not be renamed" : "%s  لا يمكن إعادة تسميته. ",
+    "File handling" : "التعامل مع الملف",
+    "Maximum upload size" : "الحد الأقصى لحجم الملفات التي يمكن رفعها",
+    "max. possible: " : "الحد الأقصى المسموح به",
+    "Save" : "حفظ",
+    "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" : "مجلد",
+    "From link" : "من رابط",
+    "Nothing in here. Upload something!" : "لا يوجد شيء هنا. إرفع بعض الملفات!",
+    "Download" : "تحميل",
+    "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." : "يرجى الانتظار , جاري فحص الملفات ."
+},
+"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
new file mode 100644
index 00000000000..8e6b863bb0d
--- /dev/null
+++ b/apps/files/l10n/ar.json
@@ -0,0 +1,65 @@
+{ "translations": {
+    "Unknown error" : "خطأ غير معروف. ",
+    "Could not move %s - File with this name already exists" : "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
+    "Could not move %s" : "فشل في نقل %s",
+    "File name cannot be empty." : "اسم الملف لا يجوز أن يكون فارغا",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
+    "Unable to set upload directory." : "غير قادر على تحميل المجلد",
+    "Invalid Token" : "علامة غير صالحة",
+    "No file was uploaded. Unknown error" : "لم يتم رفع أي ملف , خطأ غير معروف",
+    "There is no error, the file uploaded with success" : "تم ترفيع الملفات بنجاح.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "حجم الملف المرفوع تجاوز قيمة  upload_max_filesize الموجودة في ملف php.ini ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML.",
+    "The uploaded file was only partially uploaded" : "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط",
+    "No file was uploaded" : "لم يتم ترفيع أي من الملفات",
+    "Missing a temporary folder" : "المجلد المؤقت غير موجود",
+    "Failed to write to disk" : "خطأ في الكتابة على القرص الصلب",
+    "Not enough storage available" : "لا يوجد مساحة تخزينية كافية",
+    "Upload failed. Could not find uploaded file" : "*فشلت علمية الرفع. تعذر إيجاد الملف الذي تم رفعه.\n*فشلت علمية التحميل. تعذر إيجاد الملف الذي تم تحميله.",
+    "Upload failed. Could not get file info." : "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
+    "Invalid directory." : "مسار غير صحيح.",
+    "Files" : "الملفات",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
+    "Upload cancelled." : "تم إلغاء عملية رفع الملفات .",
+    "Could not get result from server." : "تعذر الحصول على نتيجة من الخادم",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
+    "{new_name} already exists" : "{new_name} موجود مسبقا",
+    "Share" : "شارك",
+    "Delete" : "إلغاء",
+    "Unshare" : "إلغاء المشاركة",
+    "Delete permanently" : "حذف بشكل دائم",
+    "Rename" : "إعادة تسميه",
+    "Pending" : "قيد الانتظار",
+    "Error moving file" : "حدث خطأ أثناء نقل الملف",
+    "Error" : "خطأ",
+    "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"],
+    "_Uploading %n file_::_Uploading %n files_" : ["لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"],
+    "Your storage is full, files can not be updated or synced anymore!" : "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
+    "Your storage is almost full ({usedSpacePercent}%)" : "مساحتك التخزينية امتلأت تقريبا ",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.",
+    "{dirs} and {files}" : "{dirs} و {files}",
+    "%s could not be renamed" : "%s  لا يمكن إعادة تسميته. ",
+    "File handling" : "التعامل مع الملف",
+    "Maximum upload size" : "الحد الأقصى لحجم الملفات التي يمكن رفعها",
+    "max. possible: " : "الحد الأقصى المسموح به",
+    "Save" : "حفظ",
+    "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" : "مجلد",
+    "From link" : "من رابط",
+    "Nothing in here. Upload something!" : "لا يوجد شيء هنا. إرفع بعض الملفات!",
+    "Download" : "تحميل",
+    "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." : "يرجى الانتظار , جاري فحص الملفات ."
+},"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/ar.php b/apps/files/l10n/ar.php
deleted file mode 100644
index f4ed20e7991..00000000000
--- a/apps/files/l10n/ar.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "خطأ غير معروف. ",
-"Could not move %s - File with this name already exists" => "فشل في نقل الملف %s - يوجد ملف بنفس هذا الاسم",
-"Could not move %s" => "فشل في نقل %s",
-"File name cannot be empty." => "اسم الملف لا يجوز أن يكون فارغا",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "اسم غير صحيح , الرموز  '\\', '/', '<', '>', ':', '\"', '|', '?' و \"*\" غير مسموح استخدامها",
-"Unable to set upload directory." => "غير قادر على تحميل المجلد",
-"Invalid Token" => "علامة غير صالحة",
-"No file was uploaded. Unknown error" => "لم يتم رفع أي ملف , خطأ غير معروف",
-"There is no error, the file uploaded with success" => "تم ترفيع الملفات بنجاح.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "حجم الملف المرفوع تجاوز قيمة  upload_max_filesize الموجودة في ملف php.ini ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حجم الملف الذي تريد ترفيعه أعلى مما MAX_FILE_SIZE يسمح به في واجهة ال HTML.",
-"The uploaded file was only partially uploaded" => "تم ترفيع جزء من الملفات الذي تريد ترفيعها فقط",
-"No file was uploaded" => "لم يتم ترفيع أي من الملفات",
-"Missing a temporary folder" => "المجلد المؤقت غير موجود",
-"Failed to write to disk" => "خطأ في الكتابة على القرص الصلب",
-"Not enough storage available" => "لا يوجد مساحة تخزينية كافية",
-"Upload failed. Could not find uploaded file" => "*فشلت علمية الرفع. تعذر إيجاد الملف الذي تم رفعه.\n*فشلت علمية التحميل. تعذر إيجاد الملف الذي تم تحميله.",
-"Upload failed. Could not get file info." => "فشلت عملية الرفع. تعذر الحصول على معلومات الملف.",
-"Invalid directory." => "مسار غير صحيح.",
-"Files" => "الملفات",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "تعذر رفع الملف {filename} إما لأنه مجلد أو لان حجم الملف 0 بايت",
-"Upload cancelled." => "تم إلغاء عملية رفع الملفات .",
-"Could not get result from server." => "تعذر الحصول على نتيجة من الخادم",
-"File upload is in progress. Leaving the page now will cancel the upload." => "عملية رفع الملفات قيد التنفيذ. اغلاق الصفحة سوف يلغي عملية رفع الملفات.",
-"{new_name} already exists" => "{new_name} موجود مسبقا",
-"Share" => "شارك",
-"Delete" => "إلغاء",
-"Unshare" => "إلغاء المشاركة",
-"Delete permanently" => "حذف بشكل دائم",
-"Rename" => "إعادة تسميه",
-"Pending" => "قيد الانتظار",
-"Error moving file" => "حدث خطأ أثناء نقل الملف",
-"Error" => "خطأ",
-"Name" => "اسم",
-"Size" => "حجم",
-"Modified" => "معدل",
-"_%n folder_::_%n folders_" => array("لا يوجد مجلدات %n","1 مجلد %n","2 مجلد %n","عدد قليل من مجلدات %n","عدد كبير من مجلدات %n","مجلدات %n"),
-"_%n file_::_%n files_" => array("لا يوجد ملفات %n","ملف %n","2 ملف %n","قليل من ملفات %n","الكثير من ملفات %n"," ملفات %n"),
-"_Uploading %n file_::_Uploading %n files_" => array("لا يوجد ملفات %n لتحميلها","تحميل 1 ملف %n","تحميل 2 ملف %n","يتم تحميل عدد قليل من ملفات %n","يتم تحميل عدد كبير من ملفات %n","يتم تحميل ملفات %n"),
-"Your storage is full, files can not be updated or synced anymore!" => "مساحتك التخزينية ممتلئة, لا يمكم تحديث ملفاتك أو مزامنتها بعد الآن !",
-"Your storage is almost full ({usedSpacePercent}%)" => "مساحتك التخزينية امتلأت تقريبا ",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "المفتاح الخاص بتشفير التطبيقات غير صالح. يرجى تحديث كلمة السر الخاصة بالمفتاح الخاص من الإعدادت الشخصية حتى تتمكن من الوصول للملفات المشفرة.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "تم تعطيل التشفير لكن ملفاتك لا تزال مشفرة. فضلا اذهب إلى الإعدادات الشخصية لإزالة التشفير عن ملفاتك.",
-"{dirs} and {files}" => "{dirs} و {files}",
-"%s could not be renamed" => "%s  لا يمكن إعادة تسميته. ",
-"File handling" => "التعامل مع الملف",
-"Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
-"max. possible: " => "الحد الأقصى المسموح به",
-"Save" => "حفظ",
-"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" => "مجلد",
-"From link" => "من رابط",
-"Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
-"Download" => "تحميل",
-"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." => "يرجى الانتظار , جاري فحص الملفات ."
-);
-$PLURAL_FORMS = "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/ast.js b/apps/files/l10n/ast.js
new file mode 100644
index 00000000000..dd53313b613
--- /dev/null
+++ b/apps/files/l10n/ast.js
@@ -0,0 +1,95 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Almacenamientu non disponible",
+    "Storage invalid" : "Almacenamientu inválidu",
+    "Unknown error" : "Fallu desconocíu",
+    "Could not move %s - File with this name already exists" : "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
+    "Could not move %s" : "Nun pudo movese %s",
+    "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
+    "\"%s\" is an invalid file name." : "\"%s\" ye un nome de ficheru inválidu.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos.",
+    "The target folder has been moved or deleted." : "La carpeta oxetivu movióse o desanicióse.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "El nome %s yá ta n'usu na carpeta %s. Por favor, escueyi un nome diferente.",
+    "Not a valid source" : "Nun ye una fonte válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "Nun se-y permite al sirvidor abrir URLs, por favor comprueba la configuración del sirvidor",
+    "The file exceeds your quota by %s" : "El ficheru perpasa la cuota por %s",
+    "Error while downloading %s to %s" : "Fallu cuando se descargaba %s a %s",
+    "Error when creating the file" : "Fallu cuando se creaba'l ficheru",
+    "Folder name cannot be empty." : "El nome la carpeta nun pue tar baleru.",
+    "Error when creating the folder" : "Fallu cuando se creaba la carpeta",
+    "Unable to set upload directory." : "Nun pue afitase la carpeta de xubida.",
+    "Invalid Token" : "Token inválidu",
+    "No file was uploaded. Unknown error" : "Nun se xubió dengún ficheru. Fallu desconocíu",
+    "There is no error, the file uploaded with success" : "Nun hai dengún fallu, el ficheru xubióse ensin problemes",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "El ficheru xubíu perpasa la direutiva \"upload_max_filesize\" del ficheru php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El ficheru xubíu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML",
+    "The uploaded file was only partially uploaded" : "El ficheru xubióse de mou parcial",
+    "No file was uploaded" : "Nun se xubió dengún ficheru",
+    "Missing a temporary folder" : "Falta una carpeta temporal",
+    "Failed to write to disk" : "Fallu al escribir al discu",
+    "Not enough storage available" : "Nun hai abondu espaciu disponible",
+    "Upload failed. Could not find uploaded file" : "Xubida fallida.  Nun pudo atopase'l ficheru xubíu.",
+    "Upload failed. Could not get file info." : "Falló la xubida.  Nun se pudo obtener la información del ficheru.",
+    "Invalid directory." : "Direutoriu non válidu.",
+    "Files" : "Ficheros",
+    "All files" : "Tolos ficheros",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}",
+    "Upload cancelled." : "Xuba encaboxada.",
+    "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
+    "URL cannot be empty" : "La URL nun pue tar balera",
+    "{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",
+    "Error fetching URL" : "Fallu obteniendo URL",
+    "Share" : "Compartir",
+    "Delete" : "Desaniciar",
+    "Disconnect storage" : "Desconeutar almacenamientu",
+    "Unshare" : "Dexar de compartir",
+    "Delete permanently" : "Desaniciar dafechu",
+    "Rename" : "Renomar",
+    "Pending" : "Pendiente",
+    "Error moving file." : "Fallu moviendo'l ficheru.",
+    "Error moving file" : "Fallu moviendo'l ficheru",
+    "Error" : "Fallu",
+    "Could not rename file" : "Nun pudo renomase'l ficheru",
+    "Error deleting file." : "Fallu desaniciando'l ficheru.",
+    "Name" : "Nome",
+    "Size" : "Tamañu",
+    "Modified" : "Modificáu",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
+    "_%n file_::_%n files_" : ["%n ficheru","%n ficheros"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" ye un nome de ficheru inválidu.",
+    "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}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Deshabilitose'l cifráu pero los tos ficheros tovía tán cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
+    "{dirs} and {files}" : "{dirs} y {files}",
+    "%s could not be renamed" : "Nun se puede renomar %s ",
+    "Upload (max. %s)" : "Xuba (máx. %s)",
+    "File handling" : "Alministración de ficheros",
+    "Maximum upload size" : "Tamañu máximu de xubida",
+    "max. possible: " : "máx. posible:",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Dende enllaz",
+    "Nothing in here. Upload something!" : "Nun hai nada equí. ¡Xubi daqué!",
+    "Download" : "Descargar",
+    "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.",
+    "Currently scanning" : "Anguaño escaneando"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json
new file mode 100644
index 00000000000..33649aeae39
--- /dev/null
+++ b/apps/files/l10n/ast.json
@@ -0,0 +1,93 @@
+{ "translations": {
+    "Storage not available" : "Almacenamientu non disponible",
+    "Storage invalid" : "Almacenamientu inválidu",
+    "Unknown error" : "Fallu desconocíu",
+    "Could not move %s - File with this name already exists" : "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
+    "Could not move %s" : "Nun pudo movese %s",
+    "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
+    "\"%s\" is an invalid file name." : "\"%s\" ye un nome de ficheru inválidu.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos.",
+    "The target folder has been moved or deleted." : "La carpeta oxetivu movióse o desanicióse.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "El nome %s yá ta n'usu na carpeta %s. Por favor, escueyi un nome diferente.",
+    "Not a valid source" : "Nun ye una fonte válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "Nun se-y permite al sirvidor abrir URLs, por favor comprueba la configuración del sirvidor",
+    "The file exceeds your quota by %s" : "El ficheru perpasa la cuota por %s",
+    "Error while downloading %s to %s" : "Fallu cuando se descargaba %s a %s",
+    "Error when creating the file" : "Fallu cuando se creaba'l ficheru",
+    "Folder name cannot be empty." : "El nome la carpeta nun pue tar baleru.",
+    "Error when creating the folder" : "Fallu cuando se creaba la carpeta",
+    "Unable to set upload directory." : "Nun pue afitase la carpeta de xubida.",
+    "Invalid Token" : "Token inválidu",
+    "No file was uploaded. Unknown error" : "Nun se xubió dengún ficheru. Fallu desconocíu",
+    "There is no error, the file uploaded with success" : "Nun hai dengún fallu, el ficheru xubióse ensin problemes",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "El ficheru xubíu perpasa la direutiva \"upload_max_filesize\" del ficheru php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El ficheru xubíu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML",
+    "The uploaded file was only partially uploaded" : "El ficheru xubióse de mou parcial",
+    "No file was uploaded" : "Nun se xubió dengún ficheru",
+    "Missing a temporary folder" : "Falta una carpeta temporal",
+    "Failed to write to disk" : "Fallu al escribir al discu",
+    "Not enough storage available" : "Nun hai abondu espaciu disponible",
+    "Upload failed. Could not find uploaded file" : "Xubida fallida.  Nun pudo atopase'l ficheru xubíu.",
+    "Upload failed. Could not get file info." : "Falló la xubida.  Nun se pudo obtener la información del ficheru.",
+    "Invalid directory." : "Direutoriu non válidu.",
+    "Files" : "Ficheros",
+    "All files" : "Tolos ficheros",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}",
+    "Upload cancelled." : "Xuba encaboxada.",
+    "Could not get result from server." : "Nun pudo obtenese'l resultáu del sirvidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
+    "URL cannot be empty" : "La URL nun pue tar balera",
+    "{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",
+    "Error fetching URL" : "Fallu obteniendo URL",
+    "Share" : "Compartir",
+    "Delete" : "Desaniciar",
+    "Disconnect storage" : "Desconeutar almacenamientu",
+    "Unshare" : "Dexar de compartir",
+    "Delete permanently" : "Desaniciar dafechu",
+    "Rename" : "Renomar",
+    "Pending" : "Pendiente",
+    "Error moving file." : "Fallu moviendo'l ficheru.",
+    "Error moving file" : "Fallu moviendo'l ficheru",
+    "Error" : "Fallu",
+    "Could not rename file" : "Nun pudo renomase'l ficheru",
+    "Error deleting file." : "Fallu desaniciando'l ficheru.",
+    "Name" : "Nome",
+    "Size" : "Tamañu",
+    "Modified" : "Modificáu",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
+    "_%n file_::_%n files_" : ["%n ficheru","%n ficheros"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" ye un nome de ficheru inválidu.",
+    "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}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Deshabilitose'l cifráu pero los tos ficheros tovía tán cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
+    "{dirs} and {files}" : "{dirs} y {files}",
+    "%s could not be renamed" : "Nun se puede renomar %s ",
+    "Upload (max. %s)" : "Xuba (máx. %s)",
+    "File handling" : "Alministración de ficheros",
+    "Maximum upload size" : "Tamañu máximu de xubida",
+    "max. possible: " : "máx. posible:",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Dende enllaz",
+    "Nothing in here. Upload something!" : "Nun hai nada equí. ¡Xubi daqué!",
+    "Download" : "Descargar",
+    "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.",
+    "Currently scanning" : "Anguaño escaneando"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ast.php b/apps/files/l10n/ast.php
deleted file mode 100644
index acac6819db4..00000000000
--- a/apps/files/l10n/ast.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Almacenamientu non disponible",
-"Storage invalid" => "Almacenamientu inválidu",
-"Unknown error" => "Fallu desconocíu",
-"Could not move %s - File with this name already exists" => "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
-"Could not move %s" => "Nun pudo movese %s",
-"File name cannot be empty." => "El nome de ficheru nun pue quedar baleru.",
-"\"%s\" is an invalid file name." => "\"%s\" ye un nome de ficheru inválidu.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos.",
-"The target folder has been moved or deleted." => "La carpeta oxetivu movióse o desanicióse.",
-"The name %s is already used in the folder %s. Please choose a different name." => "El nome %s yá ta n'usu na carpeta %s. Por favor, escueyi un nome diferente.",
-"Not a valid source" => "Nun ye una fonte válida",
-"Server is not allowed to open URLs, please check the server configuration" => "Nun se-y permite al sirvidor abrir URLs, por favor comprueba la configuración del sirvidor",
-"The file exceeds your quota by %s" => "El ficheru perpasa la cuota por %s",
-"Error while downloading %s to %s" => "Fallu cuando se descargaba %s a %s",
-"Error when creating the file" => "Fallu cuando se creaba'l ficheru",
-"Folder name cannot be empty." => "El nome la carpeta nun pue tar baleru.",
-"Error when creating the folder" => "Fallu cuando se creaba la carpeta",
-"Unable to set upload directory." => "Nun pue afitase la carpeta de xubida.",
-"Invalid Token" => "Token inválidu",
-"No file was uploaded. Unknown error" => "Nun se xubió dengún ficheru. Fallu desconocíu",
-"There is no error, the file uploaded with success" => "Nun hai dengún fallu, el ficheru xubióse ensin problemes",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El ficheru xubíu perpasa la direutiva \"upload_max_filesize\" del ficheru php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El ficheru xubíu perpasa la direutiva \"MAX_FILE_SIZE\" especificada nel formulariu HTML",
-"The uploaded file was only partially uploaded" => "El ficheru xubióse de mou parcial",
-"No file was uploaded" => "Nun se xubió dengún ficheru",
-"Missing a temporary folder" => "Falta una carpeta temporal",
-"Failed to write to disk" => "Fallu al escribir al discu",
-"Not enough storage available" => "Nun hai abondu espaciu disponible",
-"Upload failed. Could not find uploaded file" => "Xubida fallida.  Nun pudo atopase'l ficheru xubíu.",
-"Upload failed. Could not get file info." => "Falló la xubida.  Nun se pudo obtener la información del ficheru.",
-"Invalid directory." => "Direutoriu non válidu.",
-"Files" => "Ficheros",
-"All files" => "Tolos ficheros",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nun pudo xubise {filename}, paez que ye un directoriu o tien 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "El tamañu de ficheru total {size1} perpasa la llende de xuba {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nun hai abondu espaciu llibre, tas xubiendo {size1} pero namái falta {size2}",
-"Upload cancelled." => "Xuba encaboxada.",
-"Could not get result from server." => "Nun pudo obtenese'l resultáu del sirvidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La xuba del ficheru ta en progresu. Si dexes agora la páxina, va encaboxase la xuba.",
-"URL cannot be empty" => "La URL nun pue tar balera",
-"{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",
-"Error fetching URL" => "Fallu obteniendo URL",
-"Share" => "Compartir",
-"Delete" => "Desaniciar",
-"Disconnect storage" => "Desconeutar almacenamientu",
-"Unshare" => "Dexar de compartir",
-"Delete permanently" => "Desaniciar dafechu",
-"Rename" => "Renomar",
-"Pending" => "Pendiente",
-"Error moving file." => "Fallu moviendo'l ficheru.",
-"Error moving file" => "Fallu moviendo'l ficheru",
-"Error" => "Fallu",
-"Could not rename file" => "Nun pudo renomase'l ficheru",
-"Error deleting file." => "Fallu desaniciando'l ficheru.",
-"Name" => "Nome",
-"Size" => "Tamañu",
-"Modified" => "Modificáu",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
-"_%n file_::_%n files_" => array("%n ficheru","%n ficheros"),
-"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_" => array("Xubiendo %n ficheru","Xubiendo %n ficheros"),
-"\"{name}\" is an invalid file name." => "\"{name}\" ye un nome de ficheru inválidu.",
-"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}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Deshabilitose'l cifráu pero los tos ficheros tovía tán cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
-"{dirs} and {files}" => "{dirs} y {files}",
-"%s could not be renamed" => "Nun se puede renomar %s ",
-"Upload (max. %s)" => "Xuba (máx. %s)",
-"File handling" => "Alministración de ficheros",
-"Maximum upload size" => "Tamañu máximu de xubida",
-"max. possible: " => "máx. posible:",
-"Save" => "Guardar",
-"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",
-"From link" => "Dende enllaz",
-"Nothing in here. Upload something!" => "Nun hai nada equí. ¡Xubi daqué!",
-"Download" => "Descargar",
-"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.",
-"Currently scanning" => "Anguaño escaneando"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/az.js b/apps/files/l10n/az.js
new file mode 100644
index 00000000000..08e19809811
--- /dev/null
+++ b/apps/files/l10n/az.js
@@ -0,0 +1,64 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "İnformasiya daşıyıcısı mövcud deyil",
+    "Storage invalid" : "İnformasiya daşıyıcısı yalnışdır",
+    "Unknown error" : "Bəlli olmayan səhv baş verdi",
+    "Could not move %s - File with this name already exists" : "Köçürmə mümkün deyil %s - Bu adla fayl artıq mövcuddur",
+    "Could not move %s" : "Yerdəyişmə mükün olmadı %s",
+    "Permission denied" : "Yetki qadağandır",
+    "File name cannot be empty." : "Faylın adı boş ola bilməz.",
+    "\"%s\" is an invalid file name." : "\"%s\" yalnış fayl adıdır.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Yalnış ad, '\\', '/', '<', '>', ':', '\"', '|', '?' və '*' qəbul edilmir.",
+    "The target folder has been moved or deleted." : "Mənsəbdə olan qovluqun ünvanı dəyişib yada silinib.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Bu ad %s artıq %s  qovluğunda istifadə edilir. Xahiş olunur fərqli ad istifadə edəsiniz.",
+    "Not a valid source" : "Düzgün mənbə yoxdur",
+    "Server is not allowed to open URLs, please check the server configuration" : "URL-ləri açmaq üçün server izin vermir, xahış olunur server quraşdırmalarını yoxlayasınız",
+    "The file exceeds your quota by %s" : "Fayl sizə təyin edilmiş %s məhdudiyyətini aşır",
+    "Error while downloading %s to %s" : "%s-i %s-ə yükləmə zamanı səhv baş verdi",
+    "Error when creating the file" : "Fayl yaratdıqda səhv baş vermişdir",
+    "Folder name cannot be empty." : "Qovluğun adı boş ola bilməz",
+    "Error when creating the folder" : "Qovluğu yaratdıqda səhv baş vermişdir",
+    "Unable to set upload directory." : "Əlavələr qovluğunu təyin etmək mümkün olmadı.",
+    "Invalid Token" : "Yalnış token",
+    "No file was uploaded. Unknown error" : "Heç bir fayl uüklənilmədi. Naməlum səhv",
+    "There is no error, the file uploaded with success" : "Səhv yoxdur, fayl uğurla yüklənildi.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Yüklənilən faylin həcmi php.ini config faylinin upload_max_filesize direktivində göstəriləndən çoxdur.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Yüklənilən faylın həcmi HTML formasinda olan MAX_FILE_SIZE direktivində təyin dilmiş həcmi aşır.",
+    "The uploaded file was only partially uploaded" : "Yüklənilən faylın yalnız bir hissəsi yüklənildi",
+    "No file was uploaded" : "Heç bir fayl yüklənilmədi",
+    "Missing a temporary folder" : "Müvəqqəti qovluq çatışmır",
+    "Failed to write to disk" : "Sərt diskə yazmaq mümkün olmadı",
+    "Not enough storage available" : "Tələb edilən qədər yer yoxdur.",
+    "Upload failed. Could not find uploaded file" : "Yüklənmədə səhv oldu. Yüklənmiş faylı tapmaq olmur.",
+    "Upload failed. Could not get file info." : "Yüklənmədə səhv oldu. Faylın informasiyasını almaq mümkün olmadı.",
+    "Invalid directory." : "Yalnış qovluq.",
+    "Files" : "Fayllar",
+    "All files" : "Bütün fayllar",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ",
+    "Total file size {size1} exceeds upload limit {size2}" : "Ümumi fayl həcmi {size1}  yüklənmə limiti {size2} -ni aşır",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq  {size2} var. ",
+    "Upload cancelled." : "Yüklənmə dayandırıldı.",
+    "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
+    "URL cannot be empty" : "URL boş ola bilməz",
+    "{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",
+    "Error fetching URL" : "URL-in gətirilməsində səhv baş verdi",
+    "Share" : "Yayımla",
+    "Delete" : "Sil",
+    "Rename" : "Adı dəyiş",
+    "Error" : "Səhv",
+    "Name" : "Ad",
+    "Size" : "Həcm",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "Saxlamaq",
+    "New folder" : "Yeni qovluq",
+    "Folder" : "Qovluq",
+    "Nothing in here. Upload something!" : "Burda heçnə yoxdur. Nese yükləyin!",
+    "Download" : "Yüklə"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/az.json b/apps/files/l10n/az.json
new file mode 100644
index 00000000000..591ec63e31e
--- /dev/null
+++ b/apps/files/l10n/az.json
@@ -0,0 +1,62 @@
+{ "translations": {
+    "Storage not available" : "İnformasiya daşıyıcısı mövcud deyil",
+    "Storage invalid" : "İnformasiya daşıyıcısı yalnışdır",
+    "Unknown error" : "Bəlli olmayan səhv baş verdi",
+    "Could not move %s - File with this name already exists" : "Köçürmə mümkün deyil %s - Bu adla fayl artıq mövcuddur",
+    "Could not move %s" : "Yerdəyişmə mükün olmadı %s",
+    "Permission denied" : "Yetki qadağandır",
+    "File name cannot be empty." : "Faylın adı boş ola bilməz.",
+    "\"%s\" is an invalid file name." : "\"%s\" yalnış fayl adıdır.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Yalnış ad, '\\', '/', '<', '>', ':', '\"', '|', '?' və '*' qəbul edilmir.",
+    "The target folder has been moved or deleted." : "Mənsəbdə olan qovluqun ünvanı dəyişib yada silinib.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Bu ad %s artıq %s  qovluğunda istifadə edilir. Xahiş olunur fərqli ad istifadə edəsiniz.",
+    "Not a valid source" : "Düzgün mənbə yoxdur",
+    "Server is not allowed to open URLs, please check the server configuration" : "URL-ləri açmaq üçün server izin vermir, xahış olunur server quraşdırmalarını yoxlayasınız",
+    "The file exceeds your quota by %s" : "Fayl sizə təyin edilmiş %s məhdudiyyətini aşır",
+    "Error while downloading %s to %s" : "%s-i %s-ə yükləmə zamanı səhv baş verdi",
+    "Error when creating the file" : "Fayl yaratdıqda səhv baş vermişdir",
+    "Folder name cannot be empty." : "Qovluğun adı boş ola bilməz",
+    "Error when creating the folder" : "Qovluğu yaratdıqda səhv baş vermişdir",
+    "Unable to set upload directory." : "Əlavələr qovluğunu təyin etmək mümkün olmadı.",
+    "Invalid Token" : "Yalnış token",
+    "No file was uploaded. Unknown error" : "Heç bir fayl uüklənilmədi. Naməlum səhv",
+    "There is no error, the file uploaded with success" : "Səhv yoxdur, fayl uğurla yüklənildi.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Yüklənilən faylin həcmi php.ini config faylinin upload_max_filesize direktivində göstəriləndən çoxdur.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Yüklənilən faylın həcmi HTML formasinda olan MAX_FILE_SIZE direktivində təyin dilmiş həcmi aşır.",
+    "The uploaded file was only partially uploaded" : "Yüklənilən faylın yalnız bir hissəsi yüklənildi",
+    "No file was uploaded" : "Heç bir fayl yüklənilmədi",
+    "Missing a temporary folder" : "Müvəqqəti qovluq çatışmır",
+    "Failed to write to disk" : "Sərt diskə yazmaq mümkün olmadı",
+    "Not enough storage available" : "Tələb edilən qədər yer yoxdur.",
+    "Upload failed. Could not find uploaded file" : "Yüklənmədə səhv oldu. Yüklənmiş faylı tapmaq olmur.",
+    "Upload failed. Could not get file info." : "Yüklənmədə səhv oldu. Faylın informasiyasını almaq mümkün olmadı.",
+    "Invalid directory." : "Yalnış qovluq.",
+    "Files" : "Fayllar",
+    "All files" : "Bütün fayllar",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ",
+    "Total file size {size1} exceeds upload limit {size2}" : "Ümumi fayl həcmi {size1}  yüklənmə limiti {size2} -ni aşır",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq  {size2} var. ",
+    "Upload cancelled." : "Yüklənmə dayandırıldı.",
+    "Could not get result from server." : "Nəticəni serverdən almaq mümkün olmur.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
+    "URL cannot be empty" : "URL boş ola bilməz",
+    "{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",
+    "Error fetching URL" : "URL-in gətirilməsində səhv baş verdi",
+    "Share" : "Yayımla",
+    "Delete" : "Sil",
+    "Rename" : "Adı dəyiş",
+    "Error" : "Səhv",
+    "Name" : "Ad",
+    "Size" : "Həcm",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "Saxlamaq",
+    "New folder" : "Yeni qovluq",
+    "Folder" : "Qovluq",
+    "Nothing in here. Upload something!" : "Burda heçnə yoxdur. Nese yükləyin!",
+    "Download" : "Yüklə"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/az.php b/apps/files/l10n/az.php
deleted file mode 100644
index 05e99c11543..00000000000
--- a/apps/files/l10n/az.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "İnformasiya daşıyıcısı mövcud deyil",
-"Storage invalid" => "İnformasiya daşıyıcısı yalnışdır",
-"Unknown error" => "Bəlli olmayan səhv baş verdi",
-"Could not move %s - File with this name already exists" => "Köçürmə mümkün deyil %s - Bu adla fayl artıq mövcuddur",
-"Could not move %s" => "Yerdəyişmə mükün olmadı %s",
-"Permission denied" => "Yetki qadağandır",
-"File name cannot be empty." => "Faylın adı boş ola bilməz.",
-"\"%s\" is an invalid file name." => "\"%s\" yalnış fayl adıdır.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Yalnış ad, '\\', '/', '<', '>', ':', '\"', '|', '?' və '*' qəbul edilmir.",
-"The target folder has been moved or deleted." => "Mənsəbdə olan qovluqun ünvanı dəyişib yada silinib.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Bu ad %s artıq %s  qovluğunda istifadə edilir. Xahiş olunur fərqli ad istifadə edəsiniz.",
-"Not a valid source" => "Düzgün mənbə yoxdur",
-"Server is not allowed to open URLs, please check the server configuration" => "URL-ləri açmaq üçün server izin vermir, xahış olunur server quraşdırmalarını yoxlayasınız",
-"The file exceeds your quota by %s" => "Fayl sizə təyin edilmiş %s məhdudiyyətini aşır",
-"Error while downloading %s to %s" => "%s-i %s-ə yükləmə zamanı səhv baş verdi",
-"Error when creating the file" => "Fayl yaratdıqda səhv baş vermişdir",
-"Folder name cannot be empty." => "Qovluğun adı boş ola bilməz",
-"Error when creating the folder" => "Qovluğu yaratdıqda səhv baş vermişdir",
-"Unable to set upload directory." => "Əlavələr qovluğunu təyin etmək mümkün olmadı.",
-"Invalid Token" => "Yalnış token",
-"No file was uploaded. Unknown error" => "Heç bir fayl uüklənilmədi. Naməlum səhv",
-"There is no error, the file uploaded with success" => "Səhv yoxdur, fayl uğurla yüklənildi.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Yüklənilən faylin həcmi php.ini config faylinin upload_max_filesize direktivində göstəriləndən çoxdur.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklənilən faylın həcmi HTML formasinda olan MAX_FILE_SIZE direktivində təyin dilmiş həcmi aşır.",
-"The uploaded file was only partially uploaded" => "Yüklənilən faylın yalnız bir hissəsi yüklənildi",
-"No file was uploaded" => "Heç bir fayl yüklənilmədi",
-"Missing a temporary folder" => "Müvəqqəti qovluq çatışmır",
-"Failed to write to disk" => "Sərt diskə yazmaq mümkün olmadı",
-"Not enough storage available" => "Tələb edilən qədər yer yoxdur.",
-"Upload failed. Could not find uploaded file" => "Yüklənmədə səhv oldu. Yüklənmiş faylı tapmaq olmur.",
-"Upload failed. Could not get file info." => "Yüklənmədə səhv oldu. Faylın informasiyasını almaq mümkün olmadı.",
-"Invalid directory." => "Yalnış qovluq.",
-"Files" => "Fayllar",
-"All files" => "Bütün fayllar",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Yükləmək olmur {filename} ona görə ki, ya qovluqdur yada ki, həcmi 0 baytdır ",
-"Total file size {size1} exceeds upload limit {size2}" => "Ümumi fayl həcmi {size1}  yüklənmə limiti {size2} -ni aşır",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Kifayət qədər boş yer yoxdur, siz yükləyirsiniz {size1} ancaq  {size2} var. ",
-"Upload cancelled." => "Yüklənmə dayandırıldı.",
-"Could not get result from server." => "Nəticəni serverdən almaq mümkün olmur.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Faylın yüklənməsi gedir. Əgər səhifəni indi tərk etsəniz yüklənmə dayanacaq.",
-"URL cannot be empty" => "URL boş ola bilməz",
-"{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",
-"Error fetching URL" => "URL-in gətirilməsində səhv baş verdi",
-"Share" => "Yayımla",
-"Delete" => "Sil",
-"Rename" => "Adı dəyiş",
-"Error" => "Səhv",
-"Name" => "Ad",
-"Size" => "Həcm",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "Saxlamaq",
-"New folder" => "Yeni qovluq",
-"Folder" => "Qovluq",
-"Nothing in here. Upload something!" => "Burda heçnə yoxdur. Nese yükləyin!",
-"Download" => "Yüklə"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/be.js b/apps/files/l10n/be.js
new file mode 100644
index 00000000000..bf634ae5aef
--- /dev/null
+++ b/apps/files/l10n/be.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files",
+    {
+    "Error" : "Памылка",
+    "_%n folder_::_%n folders_" : ["","","",""],
+    "_%n file_::_%n files_" : ["","","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","","",""]
+},
+"nplurals=4; 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/l10n/be.json b/apps/files/l10n/be.json
new file mode 100644
index 00000000000..0718404760d
--- /dev/null
+++ b/apps/files/l10n/be.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Error" : "Памылка",
+    "_%n folder_::_%n folders_" : ["","","",""],
+    "_%n file_::_%n files_" : ["","","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","","",""]
+},"pluralForm" :"nplurals=4; 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/l10n/be.php b/apps/files/l10n/be.php
deleted file mode 100644
index f97fc27e2d1..00000000000
--- a/apps/files/l10n/be.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Памылка",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","","","")
-);
-$PLURAL_FORMS = "nplurals=4; 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/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js
new file mode 100644
index 00000000000..24e148c9c63
--- /dev/null
+++ b/apps/files/l10n/bg_BG.js
@@ -0,0 +1,97 @@
+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" : "Достъпът отказан",
+    "File name cannot be empty." : "Името на файла не може да бъде оставено празно.",
+    "\"%s\" is an invalid file name." : "\"%s\" е непозволено име за файл.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Невалидно име, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не са разрешени.",
+    "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. Моля, избери друго име.",
+    "Not a valid source" : "Невалиден източник.",
+    "Server is not allowed to open URLs, please check the server configuration" : "На сървърът не му е разрешно да отваря интернет адреси, моля провери настройките на сървъра.",
+    "The file exceeds your quota by %s" : "Файлът надвиши квотата ти с %s",
+    "Error while downloading %s to %s" : "Грешка при тегленето на %s от %s.",
+    "Error when creating the file" : "Грешка при създаването на файлът.",
+    "Folder name cannot be empty." : "Името на папката не може да бъде оставено празно.",
+    "Error when creating the folder" : "Грешка при създаването на папката.",
+    "Unable to set upload directory." : "Неуспешно задаване на директория за качване.",
+    "Invalid Token" : "Невалиеден токен.",
+    "No file was uploaded. Unknown error" : "Неуспешно качвачване на файл. Непозната грешка.",
+    "There is no error, the file uploaded with success" : "Файлът е качен успешно.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Файлът, който се опитваше да качиш надвишава зададения upload_max_filesize размер в php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Файлът, който се опитваш да качиш надвишава стойностите в MAX_FILE_SIZE в HTML формата.",
+    "The uploaded file was only partially uploaded" : "Файлът е качен частично.",
+    "No file was uploaded" : "Неуспешно качване.",
+    "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" : "Всички файлове",
+    "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." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
+    "URL cannot be empty" : "Интернет адресът не може да бъде оставен празен.",
+    "{new_name} already exists" : "{new_name} вече съществува.",
+    "Could not create file" : "Несупешно създаване на файла.",
+    "Could not create folder" : "Неуспешно създаване на папка.",
+    "Error fetching URL" : "Грешка при отварянето на интернет адреса.",
+    "Share" : "Сподели",
+    "Delete" : "Изтрий",
+    "Disconnect storage" : "Извади дисковото устройство.",
+    "Unshare" : "Премахни Споделяне",
+    "Delete permanently" : "Изтрий завинаги",
+    "Rename" : "Преименуване",
+    "Pending" : "Чакащо",
+    "Error moving file." : "Грешка при местенето на файла.",
+    "Error moving file" : "Грешка при преместването на файла.",
+    "Error" : "Грешка",
+    "Could not rename file" : "Неуспешно преименуване на файла.",
+    "Error deleting file." : "Грешка при изтриването на файла.",
+    "Name" : "Име",
+    "Size" : "Размер",
+    "Modified" : "Променен на",
+    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
+    "_%n file_::_%n files_" : ["%n файл","%n файла"],
+    "You don’t have permission to upload or create files here" : "Нямаш разрешение да създаваш или качваш файлове тук.",
+    "_Uploading %n file_::_Uploading %n files_" : ["Качване на %n файл","Качване на %n файла."],
+    "\"{name}\" is an invalid file name." : "\"{name}\" е непозволено име за файл.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Заделеното място е почити запълнено ({usedSpacePercent}%).",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
+    "{dirs} and {files}" : "{dirs} и {files}",
+    "%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" : "Запис",
+    "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" : "Папка",
+    "From link" : "От връзка",
+    "Nothing in here. Upload something!" : "Тук няма нищо. Качи нещо!",
+    "Download" : "Изтегли",
+    "Upload too large" : "Прекалено голям файл за качване.",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
+    "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
+    "Currently scanning" : "В момента се сканирва."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json
new file mode 100644
index 00000000000..451cc21ae7b
--- /dev/null
+++ b/apps/files/l10n/bg_BG.json
@@ -0,0 +1,95 @@
+{ "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" : "Достъпът отказан",
+    "File name cannot be empty." : "Името на файла не може да бъде оставено празно.",
+    "\"%s\" is an invalid file name." : "\"%s\" е непозволено име за файл.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Невалидно име, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не са разрешени.",
+    "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. Моля, избери друго име.",
+    "Not a valid source" : "Невалиден източник.",
+    "Server is not allowed to open URLs, please check the server configuration" : "На сървърът не му е разрешно да отваря интернет адреси, моля провери настройките на сървъра.",
+    "The file exceeds your quota by %s" : "Файлът надвиши квотата ти с %s",
+    "Error while downloading %s to %s" : "Грешка при тегленето на %s от %s.",
+    "Error when creating the file" : "Грешка при създаването на файлът.",
+    "Folder name cannot be empty." : "Името на папката не може да бъде оставено празно.",
+    "Error when creating the folder" : "Грешка при създаването на папката.",
+    "Unable to set upload directory." : "Неуспешно задаване на директория за качване.",
+    "Invalid Token" : "Невалиеден токен.",
+    "No file was uploaded. Unknown error" : "Неуспешно качвачване на файл. Непозната грешка.",
+    "There is no error, the file uploaded with success" : "Файлът е качен успешно.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Файлът, който се опитваше да качиш надвишава зададения upload_max_filesize размер в php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Файлът, който се опитваш да качиш надвишава стойностите в MAX_FILE_SIZE в HTML формата.",
+    "The uploaded file was only partially uploaded" : "Файлът е качен частично.",
+    "No file was uploaded" : "Неуспешно качване.",
+    "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" : "Всички файлове",
+    "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." : "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
+    "URL cannot be empty" : "Интернет адресът не може да бъде оставен празен.",
+    "{new_name} already exists" : "{new_name} вече съществува.",
+    "Could not create file" : "Несупешно създаване на файла.",
+    "Could not create folder" : "Неуспешно създаване на папка.",
+    "Error fetching URL" : "Грешка при отварянето на интернет адреса.",
+    "Share" : "Сподели",
+    "Delete" : "Изтрий",
+    "Disconnect storage" : "Извади дисковото устройство.",
+    "Unshare" : "Премахни Споделяне",
+    "Delete permanently" : "Изтрий завинаги",
+    "Rename" : "Преименуване",
+    "Pending" : "Чакащо",
+    "Error moving file." : "Грешка при местенето на файла.",
+    "Error moving file" : "Грешка при преместването на файла.",
+    "Error" : "Грешка",
+    "Could not rename file" : "Неуспешно преименуване на файла.",
+    "Error deleting file." : "Грешка при изтриването на файла.",
+    "Name" : "Име",
+    "Size" : "Размер",
+    "Modified" : "Променен на",
+    "_%n folder_::_%n folders_" : ["%n папка","%n папки"],
+    "_%n file_::_%n files_" : ["%n файл","%n файла"],
+    "You don’t have permission to upload or create files here" : "Нямаш разрешение да създаваш или качваш файлове тук.",
+    "_Uploading %n file_::_Uploading %n files_" : ["Качване на %n файл","Качване на %n файла."],
+    "\"{name}\" is an invalid file name." : "\"{name}\" е непозволено име за файл.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Заделеното място е почити запълнено ({usedSpacePercent}%).",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
+    "{dirs} and {files}" : "{dirs} и {files}",
+    "%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" : "Запис",
+    "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" : "Папка",
+    "From link" : "От връзка",
+    "Nothing in here. Upload something!" : "Тук няма нищо. Качи нещо!",
+    "Download" : "Изтегли",
+    "Upload too large" : "Прекалено голям файл за качване.",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
+    "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
+    "Currently scanning" : "В момента се сканирва."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
deleted file mode 100644
index 1342f4e86db..00000000000
--- a/apps/files/l10n/bg_BG.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "Достъпът отказан",
-"File name cannot be empty." => "Името на файла не може да бъде оставено празно.",
-"\"%s\" is an invalid file name." => "\"%s\" е непозволено име за файл.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невалидно име, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не са разрешени.",
-"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. Моля, избери друго име.",
-"Not a valid source" => "Невалиден източник.",
-"Server is not allowed to open URLs, please check the server configuration" => "На сървърът не му е разрешно да отваря интернет адреси, моля провери настройките на сървъра.",
-"The file exceeds your quota by %s" => "Файлът надвиши квотата ти с %s",
-"Error while downloading %s to %s" => "Грешка при тегленето на %s от %s.",
-"Error when creating the file" => "Грешка при създаването на файлът.",
-"Folder name cannot be empty." => "Името на папката не може да бъде оставено празно.",
-"Error when creating the folder" => "Грешка при създаването на папката.",
-"Unable to set upload directory." => "Неуспешно задаване на директория за качване.",
-"Invalid Token" => "Невалиеден токен.",
-"No file was uploaded. Unknown error" => "Неуспешно качвачване на файл. Непозната грешка.",
-"There is no error, the file uploaded with success" => "Файлът е качен успешно.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Файлът, който се опитваше да качиш надвишава зададения upload_max_filesize размер в php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Файлът, който се опитваш да качиш надвишава стойностите в MAX_FILE_SIZE в HTML формата.",
-"The uploaded file was only partially uploaded" => "Файлът е качен частично.",
-"No file was uploaded" => "Неуспешно качване.",
-"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" => "Всички файлове",
-"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." => "Извършва се качване на файлове. Затварянето на тази страница ще прекъсне качването.",
-"URL cannot be empty" => "Интернет адресът не може да бъде оставен празен.",
-"{new_name} already exists" => "{new_name} вече съществува.",
-"Could not create file" => "Несупешно създаване на файла.",
-"Could not create folder" => "Неуспешно създаване на папка.",
-"Error fetching URL" => "Грешка при отварянето на интернет адреса.",
-"Share" => "Сподели",
-"Delete" => "Изтрий",
-"Disconnect storage" => "Извади дисковото устройство.",
-"Unshare" => "Премахни Споделяне",
-"Delete permanently" => "Изтрий завинаги",
-"Rename" => "Преименуване",
-"Pending" => "Чакащо",
-"Error moving file." => "Грешка при местенето на файла.",
-"Error moving file" => "Грешка при преместването на файла.",
-"Error" => "Грешка",
-"Could not rename file" => "Неуспешно преименуване на файла.",
-"Error deleting file." => "Грешка при изтриването на файла.",
-"Name" => "Име",
-"Size" => "Размер",
-"Modified" => "Променен на",
-"_%n folder_::_%n folders_" => array("%n папка","%n папки"),
-"_%n file_::_%n files_" => array("%n файл","%n файла"),
-"You don’t have permission to upload or create files here" => "Нямаш разрешение да създаваш или качваш файлове тук.",
-"_Uploading %n file_::_Uploading %n files_" => array("Качване на %n файл","Качване на %n файла."),
-"\"{name}\" is an invalid file name." => "\"{name}\" е непозволено име за файл.",
-"Your storage is full, files can not be updated or synced anymore!" => "Заделеното място е запълнено, повече файлове не могат да бъдат синхронизирани или опреснени!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Заделеното място е почити запълнено ({usedSpacePercent}%).",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Невалиден личен ключ за Криптиращата Програма. Моля, обнови личния си ключ в Лични настройки, за да възстановиш достъпа до криптираните си файловете.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Криптирането е изключено, но файлове ти са все още защитени. Моля, отиди на лични найстройки, за да разшфроваш файловете.",
-"{dirs} and {files}" => "{dirs} и {files}",
-"%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" => "Запис",
-"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" => "Папка",
-"From link" => "От връзка",
-"Nothing in here. Upload something!" => "Тук няма нищо. Качи нещо!",
-"Download" => "Изтегли",
-"Upload too large" => "Прекалено голям файл за качване.",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
-"Files are being scanned, please wait." => "Файловете се сканирват, изчакайте.",
-"Currently scanning" => "В момента се сканирва."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_BD.js b/apps/files/l10n/bn_BD.js
new file mode 100644
index 00000000000..bf2ecc2f660
--- /dev/null
+++ b/apps/files/l10n/bn_BD.js
@@ -0,0 +1,68 @@
+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" : "অনুমতি দেয়া হয়নি",
+    "File name cannot be empty." : "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
+    "\"%s\" is an invalid file name." : "\"%s\" টি একটি অননুমোদিত ফাইল নাম।",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
+    "Not a valid source" : "বৈধ উৎস নয়",
+    "The file exceeds your quota by %s" : "এই ফাইলটি %s আপনার নির্দিষ্ট কোটা ছাড়িয়ে যাচ্ছে",
+    "Error while downloading %s to %s" : "%s হতে %s ডাউনলোড করতে সমস্যা হচ্ছে",
+    "Error when creating the file" : "ফাইলটি তৈরী করতে যেয়ে সমস্যা হলো",
+    "Folder name cannot be empty." : "ফোল্ডার নামটি ফাঁকা রাখা যাবে না।",
+    "Error when creating the folder" : "ফোল্ডার তৈরী করতে যেয়ে সমস্যা হলো",
+    "Unable to set upload directory." : "েআপলোড ডিরেক্টরি নির্ধারণ করা গেলনা।",
+    "No file was uploaded. Unknown error" : "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।",
+    "There is no error, the file uploaded with success" : "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "আপলোড করা ফাইলটি  HTML  ফর্মে উল্লিখিত MAX_FILE_SIZE নির্ধারিত ফাইলের সর্বোচ্চ আকার  অতিক্রম করতে চলেছে ",
+    "The uploaded file was only partially uploaded" : "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে",
+    "No file was uploaded" : "কোন ফাইল আপলোড করা হয় নি",
+    "Missing a temporary folder" : "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে",
+    "Failed to write to disk" : "ডিস্কে লিখতে ব্যর্থ",
+    "Not enough storage available" : "সংরক্ষণের যথেষ্ট জায়গা প্রাপ্তব্য নয়",
+    "Invalid directory." : "ভুল ডিরেক্টরি",
+    "Files" : "ফাইল",
+    "All files" : "সব ফাইল",
+    "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
+    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
+    "Share" : "ভাগাভাগি কর",
+    "Delete" : "মুছে",
+    "Unshare" : "ভাগাভাগি বাতিল ",
+    "Rename" : "পূনঃনামকরণ",
+    "Pending" : "মুলতুবি",
+    "Error moving file." : "ফাইল সরাতে সমস্যা হলো।",
+    "Error moving file" : "ফাইল সরাতে সমস্যা হলো",
+    "Error" : "সমস্যা",
+    "Could not rename file" : "ফাইলের পূণঃনামকরণ করা গেলনা",
+    "Name" : "রাম",
+    "Size" : "আকার",
+    "Modified" : "পরিবর্তিত",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["%n ফাইল আপলোড হচ্ছে","%n ফাইল আপলোড হচ্ছে"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" টি একটি অননুমোদিত ফাইল নাম।",
+    "Your storage is almost full ({usedSpacePercent}%)" : "আপনার সংরক্ষণাধার প্রায় পরিপূর্ণ ({usedSpacePercent}%) ",
+    "File handling" : "ফাইল হ্যার্ডলিং",
+    "Maximum upload size" : "আপলোডের সর্বোচ্চ আকার",
+    "max. possible: " : "অনুমোদিত  সর্বোচ্চ  আকার",
+    "Save" : "সংরক্ষণ",
+    "WebDAV" : "WebDAV",
+    "New" : "নতুন",
+    "Text file" : "টেক্সট ফাইল",
+    "New folder" : "নব ফােলডার",
+    "Folder" : "ফোল্ডার",
+    "From link" : " লিংক থেকে",
+    "Nothing in here. Upload something!" : "এখানে কিছুই নেই। কিছু আপলোড করুন !",
+    "Download" : "ডাউনলোড",
+    "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." : "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bn_BD.json b/apps/files/l10n/bn_BD.json
new file mode 100644
index 00000000000..35db36b61fa
--- /dev/null
+++ b/apps/files/l10n/bn_BD.json
@@ -0,0 +1,66 @@
+{ "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" : "অনুমতি দেয়া হয়নি",
+    "File name cannot be empty." : "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
+    "\"%s\" is an invalid file name." : "\"%s\" টি একটি অননুমোদিত ফাইল নাম।",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
+    "Not a valid source" : "বৈধ উৎস নয়",
+    "The file exceeds your quota by %s" : "এই ফাইলটি %s আপনার নির্দিষ্ট কোটা ছাড়িয়ে যাচ্ছে",
+    "Error while downloading %s to %s" : "%s হতে %s ডাউনলোড করতে সমস্যা হচ্ছে",
+    "Error when creating the file" : "ফাইলটি তৈরী করতে যেয়ে সমস্যা হলো",
+    "Folder name cannot be empty." : "ফোল্ডার নামটি ফাঁকা রাখা যাবে না।",
+    "Error when creating the folder" : "ফোল্ডার তৈরী করতে যেয়ে সমস্যা হলো",
+    "Unable to set upload directory." : "েআপলোড ডিরেক্টরি নির্ধারণ করা গেলনা।",
+    "No file was uploaded. Unknown error" : "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।",
+    "There is no error, the file uploaded with success" : "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "আপলোড করা ফাইলটি  HTML  ফর্মে উল্লিখিত MAX_FILE_SIZE নির্ধারিত ফাইলের সর্বোচ্চ আকার  অতিক্রম করতে চলেছে ",
+    "The uploaded file was only partially uploaded" : "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে",
+    "No file was uploaded" : "কোন ফাইল আপলোড করা হয় নি",
+    "Missing a temporary folder" : "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে",
+    "Failed to write to disk" : "ডিস্কে লিখতে ব্যর্থ",
+    "Not enough storage available" : "সংরক্ষণের যথেষ্ট জায়গা প্রাপ্তব্য নয়",
+    "Invalid directory." : "ভুল ডিরেক্টরি",
+    "Files" : "ফাইল",
+    "All files" : "সব ফাইল",
+    "Upload cancelled." : "আপলোড বাতিল করা হয়েছে।",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
+    "{new_name} already exists" : "{new_name} টি বিদ্যমান",
+    "Share" : "ভাগাভাগি কর",
+    "Delete" : "মুছে",
+    "Unshare" : "ভাগাভাগি বাতিল ",
+    "Rename" : "পূনঃনামকরণ",
+    "Pending" : "মুলতুবি",
+    "Error moving file." : "ফাইল সরাতে সমস্যা হলো।",
+    "Error moving file" : "ফাইল সরাতে সমস্যা হলো",
+    "Error" : "সমস্যা",
+    "Could not rename file" : "ফাইলের পূণঃনামকরণ করা গেলনা",
+    "Name" : "রাম",
+    "Size" : "আকার",
+    "Modified" : "পরিবর্তিত",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["%n ফাইল আপলোড হচ্ছে","%n ফাইল আপলোড হচ্ছে"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" টি একটি অননুমোদিত ফাইল নাম।",
+    "Your storage is almost full ({usedSpacePercent}%)" : "আপনার সংরক্ষণাধার প্রায় পরিপূর্ণ ({usedSpacePercent}%) ",
+    "File handling" : "ফাইল হ্যার্ডলিং",
+    "Maximum upload size" : "আপলোডের সর্বোচ্চ আকার",
+    "max. possible: " : "অনুমোদিত  সর্বোচ্চ  আকার",
+    "Save" : "সংরক্ষণ",
+    "WebDAV" : "WebDAV",
+    "New" : "নতুন",
+    "Text file" : "টেক্সট ফাইল",
+    "New folder" : "নব ফােলডার",
+    "Folder" : "ফোল্ডার",
+    "From link" : " লিংক থেকে",
+    "Nothing in here. Upload something!" : "এখানে কিছুই নেই। কিছু আপলোড করুন !",
+    "Download" : "ডাউনলোড",
+    "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." : "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/bn_BD.php b/apps/files/l10n/bn_BD.php
deleted file mode 100644
index 826f36a452e..00000000000
--- a/apps/files/l10n/bn_BD.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "অনুমতি দেয়া হয়নি",
-"File name cannot be empty." => "ফাইলের নামটি ফাঁকা রাখা যাবে না।",
-"\"%s\" is an invalid file name." => "\"%s\" টি একটি অননুমোদিত ফাইল নাম।",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "নামটি সঠিক নয়,  '\\', '/', '<', '>', ':', '\"', '|', '?' এবং  '*'  অনুমোদিত নয়।",
-"Not a valid source" => "বৈধ উৎস নয়",
-"The file exceeds your quota by %s" => "এই ফাইলটি %s আপনার নির্দিষ্ট কোটা ছাড়িয়ে যাচ্ছে",
-"Error while downloading %s to %s" => "%s হতে %s ডাউনলোড করতে সমস্যা হচ্ছে",
-"Error when creating the file" => "ফাইলটি তৈরী করতে যেয়ে সমস্যা হলো",
-"Folder name cannot be empty." => "ফোল্ডার নামটি ফাঁকা রাখা যাবে না।",
-"Error when creating the folder" => "ফোল্ডার তৈরী করতে যেয়ে সমস্যা হলো",
-"Unable to set upload directory." => "েআপলোড ডিরেক্টরি নির্ধারণ করা গেলনা।",
-"No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি। সমস্যার কারণটি অজ্ঞাত।",
-"There is no error, the file uploaded with success" => "কোন সমস্যা হয় নি, ফাইল আপলোড সুসম্পন্ন হয়েছে।",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "আপলোড করা  ফাইলটি php.ini তে বর্ণিত  upload_max_filesize নির্দেশিত আয়তন অতিক্রম করছেঃ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইলটি  HTML  ফর্মে উল্লিখিত MAX_FILE_SIZE নির্ধারিত ফাইলের সর্বোচ্চ আকার  অতিক্রম করতে চলেছে ",
-"The uploaded file was only partially uploaded" => "আপলোড করা ফাইলটি আংশিক আপলোড করা হয়েছে",
-"No file was uploaded" => "কোন ফাইল আপলোড করা হয় নি",
-"Missing a temporary folder" => "অস্থায়ী ফোল্ডারটি হারানো গিয়েছে",
-"Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
-"Not enough storage available" => "সংরক্ষণের যথেষ্ট জায়গা প্রাপ্তব্য নয়",
-"Invalid directory." => "ভুল ডিরেক্টরি",
-"Files" => "ফাইল",
-"All files" => "সব ফাইল",
-"Upload cancelled." => "আপলোড বাতিল করা হয়েছে।",
-"File upload is in progress. Leaving the page now will cancel the upload." => "ফাইল আপলোড চলমান। এই পৃষ্ঠা পরিত্যাগ করলে আপলোড বাতিল করা হবে।",
-"{new_name} already exists" => "{new_name} টি বিদ্যমান",
-"Share" => "ভাগাভাগি কর",
-"Delete" => "মুছে",
-"Unshare" => "ভাগাভাগি বাতিল ",
-"Rename" => "পূনঃনামকরণ",
-"Pending" => "মুলতুবি",
-"Error moving file." => "ফাইল সরাতে সমস্যা হলো।",
-"Error moving file" => "ফাইল সরাতে সমস্যা হলো",
-"Error" => "সমস্যা",
-"Could not rename file" => "ফাইলের পূণঃনামকরণ করা গেলনা",
-"Name" => "রাম",
-"Size" => "আকার",
-"Modified" => "পরিবর্তিত",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("%n ফাইল আপলোড হচ্ছে","%n ফাইল আপলোড হচ্ছে"),
-"\"{name}\" is an invalid file name." => "\"{name}\" টি একটি অননুমোদিত ফাইল নাম।",
-"Your storage is almost full ({usedSpacePercent}%)" => "আপনার সংরক্ষণাধার প্রায় পরিপূর্ণ ({usedSpacePercent}%) ",
-"File handling" => "ফাইল হ্যার্ডলিং",
-"Maximum upload size" => "আপলোডের সর্বোচ্চ আকার",
-"max. possible: " => "অনুমোদিত  সর্বোচ্চ  আকার",
-"Save" => "সংরক্ষণ",
-"WebDAV" => "WebDAV",
-"New" => "নতুন",
-"Text file" => "টেক্সট ফাইল",
-"New folder" => "নব ফােলডার",
-"Folder" => "ফোল্ডার",
-"From link" => " লিংক থেকে",
-"Nothing in here. Upload something!" => "এখানে কিছুই নেই। কিছু আপলোড করুন !",
-"Download" => "ডাউনলোড",
-"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." => "ফাইলগুলো স্ক্যান করা হচ্ছে, দয়া করে অপেক্ষা করুন।"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bn_IN.js b/apps/files/l10n/bn_IN.js
new file mode 100644
index 00000000000..320ef37a8f9
--- /dev/null
+++ b/apps/files/l10n/bn_IN.js
@@ -0,0 +1,33 @@
+OC.L10N.register(
+    "files",
+    {
+    "Could not move %s - File with this name already exists" : "%s সরানো যায়নি-এই নামে আগে থেকেই ফাইল আছে",
+    "Could not move %s" : "%s সরানো যায়নি",
+    "No file was uploaded. Unknown error" : "কোন ফাইল আপলোড করা হয় নি।অজানা ত্রুটি",
+    "There is no error, the file uploaded with success" : "কোন ত্রুটি নেই,ফাইল সাফল্যের সঙ্গে আপলোড করা হয়েছে",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "আপলোড করা ফাইল-php.ini মধ্যে upload_max_filesize নির্দেশ অতিক্রম করে:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "আপলোড করা ফাইল HTML ফর্মের জন্য  MAX_FILE_SIZE নির্দেশ অতিক্রম করে",
+    "The uploaded file was only partially uploaded" : "আপলোড করা ফাইল শুধুমাত্র আংশিকভাবে আপলোড করা হয়েছে",
+    "No file was uploaded" : "কোন ফাইল আপলোড করা হয় নি",
+    "Missing a temporary folder" : "একটি অস্থায়ী ফোল্ডার পাওয়া যাচ্ছেনা",
+    "Failed to write to disk" : "ডিস্কে লিখতে ব্যর্থ",
+    "Not enough storage available" : "যথেষ্ট স্টোরেজ পাওয়া যায় না",
+    "Invalid directory." : "অবৈধ ডিরেক্টরি।",
+    "Files" : "ফাইলস",
+    "Share" : "শেয়ার",
+    "Delete" : "মুছে ফেলা",
+    "Delete permanently" : "স্থায়ীভাবে মুছে দিন",
+    "Rename" : "পুনঃনামকরণ",
+    "Pending" : "মুলতুবি",
+    "Error" : "ভুল",
+    "Name" : "নাম",
+    "Size" : "আকার",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "সেভ",
+    "New folder" : "নতুন ফোল্ডার",
+    "Folder" : "ফোল্ডার",
+    "Download" : "ডাউনলোড করুন"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bn_IN.json b/apps/files/l10n/bn_IN.json
new file mode 100644
index 00000000000..7b6528c38a9
--- /dev/null
+++ b/apps/files/l10n/bn_IN.json
@@ -0,0 +1,31 @@
+{ "translations": {
+    "Could not move %s - File with this name already exists" : "%s সরানো যায়নি-এই নামে আগে থেকেই ফাইল আছে",
+    "Could not move %s" : "%s সরানো যায়নি",
+    "No file was uploaded. Unknown error" : "কোন ফাইল আপলোড করা হয় নি।অজানা ত্রুটি",
+    "There is no error, the file uploaded with success" : "কোন ত্রুটি নেই,ফাইল সাফল্যের সঙ্গে আপলোড করা হয়েছে",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "আপলোড করা ফাইল-php.ini মধ্যে upload_max_filesize নির্দেশ অতিক্রম করে:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "আপলোড করা ফাইল HTML ফর্মের জন্য  MAX_FILE_SIZE নির্দেশ অতিক্রম করে",
+    "The uploaded file was only partially uploaded" : "আপলোড করা ফাইল শুধুমাত্র আংশিকভাবে আপলোড করা হয়েছে",
+    "No file was uploaded" : "কোন ফাইল আপলোড করা হয় নি",
+    "Missing a temporary folder" : "একটি অস্থায়ী ফোল্ডার পাওয়া যাচ্ছেনা",
+    "Failed to write to disk" : "ডিস্কে লিখতে ব্যর্থ",
+    "Not enough storage available" : "যথেষ্ট স্টোরেজ পাওয়া যায় না",
+    "Invalid directory." : "অবৈধ ডিরেক্টরি।",
+    "Files" : "ফাইলস",
+    "Share" : "শেয়ার",
+    "Delete" : "মুছে ফেলা",
+    "Delete permanently" : "স্থায়ীভাবে মুছে দিন",
+    "Rename" : "পুনঃনামকরণ",
+    "Pending" : "মুলতুবি",
+    "Error" : "ভুল",
+    "Name" : "নাম",
+    "Size" : "আকার",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "সেভ",
+    "New folder" : "নতুন ফোল্ডার",
+    "Folder" : "ফোল্ডার",
+    "Download" : "ডাউনলোড করুন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/bn_IN.php b/apps/files/l10n/bn_IN.php
deleted file mode 100644
index ae53a11b8ec..00000000000
--- a/apps/files/l10n/bn_IN.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "%s সরানো যায়নি-এই নামে আগে থেকেই ফাইল আছে",
-"Could not move %s" => "%s সরানো যায়নি",
-"No file was uploaded. Unknown error" => "কোন ফাইল আপলোড করা হয় নি।অজানা ত্রুটি",
-"There is no error, the file uploaded with success" => "কোন ত্রুটি নেই,ফাইল সাফল্যের সঙ্গে আপলোড করা হয়েছে",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "আপলোড করা ফাইল-php.ini মধ্যে upload_max_filesize নির্দেশ অতিক্রম করে:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "আপলোড করা ফাইল HTML ফর্মের জন্য  MAX_FILE_SIZE নির্দেশ অতিক্রম করে",
-"The uploaded file was only partially uploaded" => "আপলোড করা ফাইল শুধুমাত্র আংশিকভাবে আপলোড করা হয়েছে",
-"No file was uploaded" => "কোন ফাইল আপলোড করা হয় নি",
-"Missing a temporary folder" => "একটি অস্থায়ী ফোল্ডার পাওয়া যাচ্ছেনা",
-"Failed to write to disk" => "ডিস্কে লিখতে ব্যর্থ",
-"Not enough storage available" => "যথেষ্ট স্টোরেজ পাওয়া যায় না",
-"Invalid directory." => "অবৈধ ডিরেক্টরি।",
-"Files" => "ফাইলস",
-"Share" => "শেয়ার",
-"Delete" => "মুছে ফেলা",
-"Delete permanently" => "স্থায়ীভাবে মুছে দিন",
-"Rename" => "পুনঃনামকরণ",
-"Pending" => "মুলতুবি",
-"Error" => "ভুল",
-"Name" => "নাম",
-"Size" => "আকার",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "সেভ",
-"New folder" => "নতুন ফোল্ডার",
-"Folder" => "ফোল্ডার",
-"Download" => "ডাউনলোড করুন"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/bs.js b/apps/files/l10n/bs.js
new file mode 100644
index 00000000000..1ce26f916a2
--- /dev/null
+++ b/apps/files/l10n/bs.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "files",
+    {
+    "Share" : "Podijeli",
+    "Name" : "Ime",
+    "Size" : "Veličina",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "Save" : "Spasi",
+    "New folder" : "Nova fascikla",
+    "Folder" : "Fasikla"
+},
+"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/l10n/bs.json b/apps/files/l10n/bs.json
new file mode 100644
index 00000000000..7c2d782d01c
--- /dev/null
+++ b/apps/files/l10n/bs.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Share" : "Podijeli",
+    "Name" : "Ime",
+    "Size" : "Veličina",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "Save" : "Spasi",
+    "New folder" : "Nova fascikla",
+    "Folder" : "Fasikla"
+},"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/l10n/bs.php b/apps/files/l10n/bs.php
deleted file mode 100644
index 89ff91da031..00000000000
--- a/apps/files/l10n/bs.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Share" => "Podijeli",
-"Name" => "Ime",
-"Size" => "Veličina",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"Save" => "Spasi",
-"New folder" => "Nova fascikla",
-"Folder" => "Fasikla"
-);
-$PLURAL_FORMS = "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/l10n/ca.js b/apps/files/l10n/ca.js
new file mode 100644
index 00000000000..8a4b5c42d24
--- /dev/null
+++ b/apps/files/l10n/ca.js
@@ -0,0 +1,96 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Emmagatzemament no disponible",
+    "Storage invalid" : "Emmagatzemament no vàlid",
+    "Unknown error" : "Error desconegut",
+    "Could not move %s - File with this name already exists" : "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
+    "Could not move %s" : " No s'ha pogut moure %s",
+    "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
+    "\"%s\" is an invalid file name." : "\"%s\" no es un fitxer vàlid.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
+    "The target folder has been moved or deleted." : "La carpeta de destí s'ha mogut o eliminat.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "El nom %s ja s'usa en la carpeta %s. Indiqueu un nom diferent.",
+    "Not a valid source" : "No és un origen vàlid",
+    "Server is not allowed to open URLs, please check the server configuration" : "El servidor no té autorització per obrir URLs, comproveu la configuració del servidor",
+    "The file exceeds your quota by %s" : "El fitxer excedeix de la teva quota per %s",
+    "Error while downloading %s to %s" : "S'ha produït un error en baixar %s a %s",
+    "Error when creating the file" : "S'ha produït un error en crear el fitxer",
+    "Folder name cannot be empty." : "El nom de la carpeta no pot ser buit.",
+    "Error when creating the folder" : "S'ha produït un error en crear la carpeta",
+    "Unable to set upload directory." : "No es pot establir la carpeta de pujada.",
+    "Invalid Token" : "Testimoni no vàlid",
+    "No file was uploaded. Unknown error" : "No s'ha carregat cap fitxer. Error desconegut",
+    "There is no error, the file uploaded with success" : "No hi ha errors, el fitxer s'ha carregat correctament",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML",
+    "The uploaded file was only partially uploaded" : "El fitxer només s'ha carregat parcialment",
+    "No file was uploaded" : "No s'ha carregat cap fitxer",
+    "Missing a temporary folder" : "Falta un fitxer temporal",
+    "Failed to write to disk" : "Ha fallat en escriure al disc",
+    "Not enough storage available" : "No hi ha prou espai disponible",
+    "Upload failed. Could not find uploaded file" : "La pujada ha fallat. El fitxer pujat no s'ha trobat.",
+    "Upload failed. Could not get file info." : "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.",
+    "Invalid directory." : "Directori no vàlid.",
+    "Files" : "Fitxers",
+    "All files" : "Tots els fitxers",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "No es pot pujar {filename} perquè és una carpeta o té 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "Mida total del fitxer {size1} excedeix el límit de pujada {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
+    "Upload cancelled." : "La pujada s'ha cancel·lat.",
+    "Could not get result from server." : "No hi ha resposta del servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
+    "URL cannot be empty" : "L'URL no pot ser buit",
+    "{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",
+    "Error fetching URL" : "Error en obtenir la URL",
+    "Share" : "Comparteix",
+    "Delete" : "Esborra",
+    "Disconnect storage" : "Desonnecta l'emmagatzematge",
+    "Unshare" : "Deixa de compartir",
+    "Delete permanently" : "Esborra permanentment",
+    "Rename" : "Reanomena",
+    "Pending" : "Pendent",
+    "Error moving file." : "Error en moure el fitxer.",
+    "Error moving file" : "Error en moure el fitxer",
+    "Error" : "Error",
+    "Could not rename file" : "No es pot canviar el nom de fitxer",
+    "Error deleting file." : "Error en esborrar el fitxer.",
+    "Name" : "Nom",
+    "Size" : "Mida",
+    "Modified" : "Modificat",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
+    "_%n file_::_%n files_" : ["%n fitxer","%n fitxers"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" no es un fitxer vàlid.",
+    "Your storage is full, files can not be updated or synced anymore!" : "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
+    "{dirs} and {files}" : "{dirs} i {files}",
+    "%s could not be renamed as it has been deleted" : "No s'ha pogut renombrar %s ja que ha estat borrat",
+    "%s could not be renamed" : "%s no es pot canviar el nom",
+    "Upload (max. %s)" : "Pujada (màx. %s)",
+    "File handling" : "Gestió de fitxers",
+    "Maximum upload size" : "Mida màxima de pujada",
+    "max. possible: " : "màxim possible:",
+    "Save" : "Desa",
+    "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",
+    "From link" : "Des d'enllaç",
+    "Nothing in here. Upload something!" : "Res per aquí. Pugeu alguna cosa!",
+    "Download" : "Baixa",
+    "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",
+    "Currently scanning" : "Actualment escanejant"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json
new file mode 100644
index 00000000000..91e96f5742d
--- /dev/null
+++ b/apps/files/l10n/ca.json
@@ -0,0 +1,94 @@
+{ "translations": {
+    "Storage not available" : "Emmagatzemament no disponible",
+    "Storage invalid" : "Emmagatzemament no vàlid",
+    "Unknown error" : "Error desconegut",
+    "Could not move %s - File with this name already exists" : "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
+    "Could not move %s" : " No s'ha pogut moure %s",
+    "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
+    "\"%s\" is an invalid file name." : "\"%s\" no es un fitxer vàlid.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
+    "The target folder has been moved or deleted." : "La carpeta de destí s'ha mogut o eliminat.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "El nom %s ja s'usa en la carpeta %s. Indiqueu un nom diferent.",
+    "Not a valid source" : "No és un origen vàlid",
+    "Server is not allowed to open URLs, please check the server configuration" : "El servidor no té autorització per obrir URLs, comproveu la configuració del servidor",
+    "The file exceeds your quota by %s" : "El fitxer excedeix de la teva quota per %s",
+    "Error while downloading %s to %s" : "S'ha produït un error en baixar %s a %s",
+    "Error when creating the file" : "S'ha produït un error en crear el fitxer",
+    "Folder name cannot be empty." : "El nom de la carpeta no pot ser buit.",
+    "Error when creating the folder" : "S'ha produït un error en crear la carpeta",
+    "Unable to set upload directory." : "No es pot establir la carpeta de pujada.",
+    "Invalid Token" : "Testimoni no vàlid",
+    "No file was uploaded. Unknown error" : "No s'ha carregat cap fitxer. Error desconegut",
+    "There is no error, the file uploaded with success" : "No hi ha errors, el fitxer s'ha carregat correctament",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML",
+    "The uploaded file was only partially uploaded" : "El fitxer només s'ha carregat parcialment",
+    "No file was uploaded" : "No s'ha carregat cap fitxer",
+    "Missing a temporary folder" : "Falta un fitxer temporal",
+    "Failed to write to disk" : "Ha fallat en escriure al disc",
+    "Not enough storage available" : "No hi ha prou espai disponible",
+    "Upload failed. Could not find uploaded file" : "La pujada ha fallat. El fitxer pujat no s'ha trobat.",
+    "Upload failed. Could not get file info." : "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.",
+    "Invalid directory." : "Directori no vàlid.",
+    "Files" : "Fitxers",
+    "All files" : "Tots els fitxers",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "No es pot pujar {filename} perquè és una carpeta o té 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "Mida total del fitxer {size1} excedeix el límit de pujada {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
+    "Upload cancelled." : "La pujada s'ha cancel·lat.",
+    "Could not get result from server." : "No hi ha resposta del servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
+    "URL cannot be empty" : "L'URL no pot ser buit",
+    "{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",
+    "Error fetching URL" : "Error en obtenir la URL",
+    "Share" : "Comparteix",
+    "Delete" : "Esborra",
+    "Disconnect storage" : "Desonnecta l'emmagatzematge",
+    "Unshare" : "Deixa de compartir",
+    "Delete permanently" : "Esborra permanentment",
+    "Rename" : "Reanomena",
+    "Pending" : "Pendent",
+    "Error moving file." : "Error en moure el fitxer.",
+    "Error moving file" : "Error en moure el fitxer",
+    "Error" : "Error",
+    "Could not rename file" : "No es pot canviar el nom de fitxer",
+    "Error deleting file." : "Error en esborrar el fitxer.",
+    "Name" : "Nom",
+    "Size" : "Mida",
+    "Modified" : "Modificat",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetes"],
+    "_%n file_::_%n files_" : ["%n fitxer","%n fitxers"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" no es un fitxer vàlid.",
+    "Your storage is full, files can not be updated or synced anymore!" : "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
+    "{dirs} and {files}" : "{dirs} i {files}",
+    "%s could not be renamed as it has been deleted" : "No s'ha pogut renombrar %s ja que ha estat borrat",
+    "%s could not be renamed" : "%s no es pot canviar el nom",
+    "Upload (max. %s)" : "Pujada (màx. %s)",
+    "File handling" : "Gestió de fitxers",
+    "Maximum upload size" : "Mida màxima de pujada",
+    "max. possible: " : "màxim possible:",
+    "Save" : "Desa",
+    "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",
+    "From link" : "Des d'enllaç",
+    "Nothing in here. Upload something!" : "Res per aquí. Pugeu alguna cosa!",
+    "Download" : "Baixa",
+    "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",
+    "Currently scanning" : "Actualment escanejant"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
deleted file mode 100644
index 534235284c8..00000000000
--- a/apps/files/l10n/ca.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Emmagatzemament no disponible",
-"Storage invalid" => "Emmagatzemament no vàlid",
-"Unknown error" => "Error desconegut",
-"Could not move %s - File with this name already exists" => "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
-"Could not move %s" => " No s'ha pogut moure %s",
-"File name cannot be empty." => "El nom del fitxer no pot ser buit.",
-"\"%s\" is an invalid file name." => "\"%s\" no es un fitxer vàlid.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
-"The target folder has been moved or deleted." => "La carpeta de destí s'ha mogut o eliminat.",
-"The name %s is already used in the folder %s. Please choose a different name." => "El nom %s ja s'usa en la carpeta %s. Indiqueu un nom diferent.",
-"Not a valid source" => "No és un origen vàlid",
-"Server is not allowed to open URLs, please check the server configuration" => "El servidor no té autorització per obrir URLs, comproveu la configuració del servidor",
-"The file exceeds your quota by %s" => "El fitxer excedeix de la teva quota per %s",
-"Error while downloading %s to %s" => "S'ha produït un error en baixar %s a %s",
-"Error when creating the file" => "S'ha produït un error en crear el fitxer",
-"Folder name cannot be empty." => "El nom de la carpeta no pot ser buit.",
-"Error when creating the folder" => "S'ha produït un error en crear la carpeta",
-"Unable to set upload directory." => "No es pot establir la carpeta de pujada.",
-"Invalid Token" => "Testimoni no vàlid",
-"No file was uploaded. Unknown error" => "No s'ha carregat cap fitxer. Error desconegut",
-"There is no error, the file uploaded with success" => "No hi ha errors, el fitxer s'ha carregat correctament",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "L’arxiu que voleu carregar supera el màxim definit en la directiva upload_max_filesize del php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML",
-"The uploaded file was only partially uploaded" => "El fitxer només s'ha carregat parcialment",
-"No file was uploaded" => "No s'ha carregat cap fitxer",
-"Missing a temporary folder" => "Falta un fitxer temporal",
-"Failed to write to disk" => "Ha fallat en escriure al disc",
-"Not enough storage available" => "No hi ha prou espai disponible",
-"Upload failed. Could not find uploaded file" => "La pujada ha fallat. El fitxer pujat no s'ha trobat.",
-"Upload failed. Could not get file info." => "La pujada ha fallat. No s'ha pogut obtenir informació del fitxer.",
-"Invalid directory." => "Directori no vàlid.",
-"Files" => "Fitxers",
-"All files" => "Tots els fitxers",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "No es pot pujar {filename} perquè és una carpeta o té 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "Mida total del fitxer {size1} excedeix el límit de pujada {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "No hi ha prou espai lliure, està carregant {size1} però només pot {size2}",
-"Upload cancelled." => "La pujada s'ha cancel·lat.",
-"Could not get result from server." => "No hi ha resposta del servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
-"URL cannot be empty" => "L'URL no pot ser buit",
-"{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",
-"Error fetching URL" => "Error en obtenir la URL",
-"Share" => "Comparteix",
-"Delete" => "Esborra",
-"Disconnect storage" => "Desonnecta l'emmagatzematge",
-"Unshare" => "Deixa de compartir",
-"Delete permanently" => "Esborra permanentment",
-"Rename" => "Reanomena",
-"Pending" => "Pendent",
-"Error moving file." => "Error en moure el fitxer.",
-"Error moving file" => "Error en moure el fitxer",
-"Error" => "Error",
-"Could not rename file" => "No es pot canviar el nom de fitxer",
-"Error deleting file." => "Error en esborrar el fitxer.",
-"Name" => "Nom",
-"Size" => "Mida",
-"Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetes"),
-"_%n file_::_%n files_" => array("%n fitxer","%n fitxers"),
-"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_" => array("Pujant %n fitxer","Pujant %n fitxers"),
-"\"{name}\" is an invalid file name." => "\"{name}\" no es un fitxer vàlid.",
-"Your storage is full, files can not be updated or synced anymore!" => "El vostre espai d'emmagatzemament és ple, els fitxers ja no es poden actualitzar o sincronitzar!",
-"Your storage is almost full ({usedSpacePercent}%)" => "El vostre espai d'emmagatzemament és gairebé ple ({usedSpacePercent}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "L'encriptació s'ha desactivat però els vostres fitxers segueixen encriptats. Aneu a la vostra configuració personal per desencriptar els vostres fitxers.",
-"{dirs} and {files}" => "{dirs} i {files}",
-"%s could not be renamed as it has been deleted" => "No s'ha pogut renombrar %s ja que ha estat borrat",
-"%s could not be renamed" => "%s no es pot canviar el nom",
-"Upload (max. %s)" => "Pujada (màx. %s)",
-"File handling" => "Gestió de fitxers",
-"Maximum upload size" => "Mida màxima de pujada",
-"max. possible: " => "màxim possible:",
-"Save" => "Desa",
-"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",
-"From link" => "Des d'enllaç",
-"Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
-"Download" => "Baixa",
-"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",
-"Currently scanning" => "Actualment escanejant"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ca@valencia.js b/apps/files/l10n/ca@valencia.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/ca@valencia.js
@@ -0,0 +1,8 @@
+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/ca@valencia.json b/apps/files/l10n/ca@valencia.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/ca@valencia.json
@@ -0,0 +1,6 @@
+{ "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.php b/apps/files/l10n/ca@valencia.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/ca@valencia.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
new file mode 100644
index 00000000000..bbf480b4660
--- /dev/null
+++ b/apps/files/l10n/cs_CZ.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Úložiště není dostupné",
+    "Storage invalid" : "Neplatné úložiště",
+    "Unknown error" : "Neznámá chyba",
+    "Could not move %s - File with this name already exists" : "Nelze přesunout %s - již existuje soubor se stejným názvem",
+    "Could not move %s" : "Nelze přesunout %s",
+    "Permission denied" : "Přístup odepřen",
+    "File name cannot be empty." : "Název souboru nemůže být prázdný řetězec.",
+    "\"%s\" is an invalid file name." : "\"%s\" je neplatným názvem souboru.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
+    "The target folder has been moved or deleted." : "Cílová složka byla přesunuta nebo smazána.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Název %s ve složce %s již existuje. Vyberte prosím jiné jméno.",
+    "Not a valid source" : "Neplatný zdroj",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server není oprávněn otevírat adresy URL. Ověřte, prosím, konfiguraci serveru.",
+    "The file exceeds your quota by %s" : "Soubor překračuje povolenou kvótu o %s",
+    "Error while downloading %s to %s" : "Chyba při stahování %s do %s",
+    "Error when creating the file" : "Chyba při vytváření souboru",
+    "Folder name cannot be empty." : "Název složky nemůže být prázdný.",
+    "Error when creating the folder" : "Chyba při vytváření složky",
+    "Unable to set upload directory." : "Nelze nastavit adresář pro nahrané soubory.",
+    "Invalid Token" : "Neplatný token",
+    "No file was uploaded. Unknown error" : "Žádný soubor nebyl odeslán. Neznámá chyba",
+    "There is no error, the file uploaded with success" : "Soubor byl odeslán úspěšně",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný ve formuláři HTML",
+    "The uploaded file was only partially uploaded" : "Soubor byl odeslán pouze částečně",
+    "No file was uploaded" : "Žádný soubor nebyl odeslán",
+    "Missing a temporary folder" : "Chybí adresář pro dočasné soubory",
+    "Failed to write to disk" : "Zápis na disk selhal",
+    "Not enough storage available" : "Nedostatek dostupného úložného prostoru",
+    "Upload failed. Could not find uploaded file" : "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor.",
+    "Upload failed. Could not get file info." : "Nahrávání selhalo. Nepodařilo se získat informace o souboru.",
+    "Invalid directory." : "Neplatný adresář",
+    "Files" : "Soubory",
+    "All files" : "Všechny soubory",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů",
+    "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
+    "Upload cancelled." : "Odesílání zrušeno.",
+    "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
+    "URL cannot be empty" : "URL nemůže zůstat prázdná",
+    "{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",
+    "Error fetching URL" : "Chyba při načítání URL",
+    "Share" : "Sdílet",
+    "Delete" : "Smazat",
+    "Disconnect storage" : "Odpojit úložiště",
+    "Unshare" : "Zrušit sdílení",
+    "Delete permanently" : "Trvale odstranit",
+    "Rename" : "Přejmenovat",
+    "Pending" : "Nevyřízené",
+    "Error moving file." : "Chyba při přesunu souboru.",
+    "Error moving file" : "Chyba při přesunu souboru",
+    "Error" : "Chyba",
+    "Could not rename file" : "Nepodařilo se přejmenovat soubor",
+    "Error deleting file." : "Chyba při mazání souboru.",
+    "Name" : "Název",
+    "Size" : "Velikost",
+    "Modified" : "Upraveno",
+    "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek"],
+    "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů"],
+    "You don’t have permission to upload or create files here" : "Nemáte oprávnění zde nahrávat či vytvářet soubory",
+    "_Uploading %n file_::_Uploading %n files_" : ["Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.",
+    "{dirs} and {files}" : "{dirs} a {files}",
+    "%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)",
+    "File handling" : "Zacházení se soubory",
+    "Maximum upload size" : "Maximální velikost pro odesílání",
+    "max. possible: " : "největší možná: ",
+    "Save" : "Uložit",
+    "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",
+    "From link" : "Z odkazu",
+    "Nothing in here. Upload something!" : "Žádný obsah. Nahrajte něco.",
+    "Download" : "Stáhnout",
+    "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.",
+    "Currently scanning" : "Prohledává se"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
new file mode 100644
index 00000000000..f427a6961e3
--- /dev/null
+++ b/apps/files/l10n/cs_CZ.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Úložiště není dostupné",
+    "Storage invalid" : "Neplatné úložiště",
+    "Unknown error" : "Neznámá chyba",
+    "Could not move %s - File with this name already exists" : "Nelze přesunout %s - již existuje soubor se stejným názvem",
+    "Could not move %s" : "Nelze přesunout %s",
+    "Permission denied" : "Přístup odepřen",
+    "File name cannot be empty." : "Název souboru nemůže být prázdný řetězec.",
+    "\"%s\" is an invalid file name." : "\"%s\" je neplatným názvem souboru.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
+    "The target folder has been moved or deleted." : "Cílová složka byla přesunuta nebo smazána.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Název %s ve složce %s již existuje. Vyberte prosím jiné jméno.",
+    "Not a valid source" : "Neplatný zdroj",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server není oprávněn otevírat adresy URL. Ověřte, prosím, konfiguraci serveru.",
+    "The file exceeds your quota by %s" : "Soubor překračuje povolenou kvótu o %s",
+    "Error while downloading %s to %s" : "Chyba při stahování %s do %s",
+    "Error when creating the file" : "Chyba při vytváření souboru",
+    "Folder name cannot be empty." : "Název složky nemůže být prázdný.",
+    "Error when creating the folder" : "Chyba při vytváření složky",
+    "Unable to set upload directory." : "Nelze nastavit adresář pro nahrané soubory.",
+    "Invalid Token" : "Neplatný token",
+    "No file was uploaded. Unknown error" : "Žádný soubor nebyl odeslán. Neznámá chyba",
+    "There is no error, the file uploaded with success" : "Soubor byl odeslán úspěšně",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný ve formuláři HTML",
+    "The uploaded file was only partially uploaded" : "Soubor byl odeslán pouze částečně",
+    "No file was uploaded" : "Žádný soubor nebyl odeslán",
+    "Missing a temporary folder" : "Chybí adresář pro dočasné soubory",
+    "Failed to write to disk" : "Zápis na disk selhal",
+    "Not enough storage available" : "Nedostatek dostupného úložného prostoru",
+    "Upload failed. Could not find uploaded file" : "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor.",
+    "Upload failed. Could not get file info." : "Nahrávání selhalo. Nepodařilo se získat informace o souboru.",
+    "Invalid directory." : "Neplatný adresář",
+    "Files" : "Soubory",
+    "All files" : "Všechny soubory",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů",
+    "Total file size {size1} exceeds upload limit {size2}" : "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
+    "Upload cancelled." : "Odesílání zrušeno.",
+    "Could not get result from server." : "Nepodařilo se získat výsledek ze serveru.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
+    "URL cannot be empty" : "URL nemůže zůstat prázdná",
+    "{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",
+    "Error fetching URL" : "Chyba při načítání URL",
+    "Share" : "Sdílet",
+    "Delete" : "Smazat",
+    "Disconnect storage" : "Odpojit úložiště",
+    "Unshare" : "Zrušit sdílení",
+    "Delete permanently" : "Trvale odstranit",
+    "Rename" : "Přejmenovat",
+    "Pending" : "Nevyřízené",
+    "Error moving file." : "Chyba při přesunu souboru.",
+    "Error moving file" : "Chyba při přesunu souboru",
+    "Error" : "Chyba",
+    "Could not rename file" : "Nepodařilo se přejmenovat soubor",
+    "Error deleting file." : "Chyba při mazání souboru.",
+    "Name" : "Název",
+    "Size" : "Velikost",
+    "Modified" : "Upraveno",
+    "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek"],
+    "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů"],
+    "You don’t have permission to upload or create files here" : "Nemáte oprávnění zde nahrávat či vytvářet soubory",
+    "_Uploading %n file_::_Uploading %n files_" : ["Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.",
+    "{dirs} and {files}" : "{dirs} a {files}",
+    "%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)",
+    "File handling" : "Zacházení se soubory",
+    "Maximum upload size" : "Maximální velikost pro odesílání",
+    "max. possible: " : "největší možná: ",
+    "Save" : "Uložit",
+    "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",
+    "From link" : "Z odkazu",
+    "Nothing in here. Upload something!" : "Žádný obsah. Nahrajte něco.",
+    "Download" : "Stáhnout",
+    "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.",
+    "Currently scanning" : "Prohledává se"
+},"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/cs_CZ.php b/apps/files/l10n/cs_CZ.php
deleted file mode 100644
index d2bf781b944..00000000000
--- a/apps/files/l10n/cs_CZ.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Úložiště není dostupné",
-"Storage invalid" => "Neplatné úložiště",
-"Unknown error" => "Neznámá chyba",
-"Could not move %s - File with this name already exists" => "Nelze přesunout %s - již existuje soubor se stejným názvem",
-"Could not move %s" => "Nelze přesunout %s",
-"Permission denied" => "Přístup odepřen",
-"File name cannot be empty." => "Název souboru nemůže být prázdný řetězec.",
-"\"%s\" is an invalid file name." => "\"%s\" je neplatným názvem souboru.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neplatný název, znaky '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nejsou povoleny.",
-"The target folder has been moved or deleted." => "Cílová složka byla přesunuta nebo smazána.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Název %s ve složce %s již existuje. Vyberte prosím jiné jméno.",
-"Not a valid source" => "Neplatný zdroj",
-"Server is not allowed to open URLs, please check the server configuration" => "Server není oprávněn otevírat adresy URL. Ověřte, prosím, konfiguraci serveru.",
-"The file exceeds your quota by %s" => "Soubor překračuje povolenou kvótu o %s",
-"Error while downloading %s to %s" => "Chyba při stahování %s do %s",
-"Error when creating the file" => "Chyba při vytváření souboru",
-"Folder name cannot be empty." => "Název složky nemůže být prázdný.",
-"Error when creating the folder" => "Chyba při vytváření složky",
-"Unable to set upload directory." => "Nelze nastavit adresář pro nahrané soubory.",
-"Invalid Token" => "Neplatný token",
-"No file was uploaded. Unknown error" => "Žádný soubor nebyl odeslán. Neznámá chyba",
-"There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Odesílaný soubor přesahuje velikost upload_max_filesize povolenou v php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný ve formuláři HTML",
-"The uploaded file was only partially uploaded" => "Soubor byl odeslán pouze částečně",
-"No file was uploaded" => "Žádný soubor nebyl odeslán",
-"Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
-"Failed to write to disk" => "Zápis na disk selhal",
-"Not enough storage available" => "Nedostatek dostupného úložného prostoru",
-"Upload failed. Could not find uploaded file" => "Nahrávání selhalo. Nepodařilo se nalézt nahraný soubor.",
-"Upload failed. Could not get file info." => "Nahrávání selhalo. Nepodařilo se získat informace o souboru.",
-"Invalid directory." => "Neplatný adresář",
-"Files" => "Soubory",
-"All files" => "Všechny soubory",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nelze nahrát soubor {filename}, protože je to buď adresář nebo má velikost 0 bytů",
-"Total file size {size1} exceeds upload limit {size2}" => "Celková velikost souboru {size1} překračuje povolenou velikost pro nahrávání {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Není dostatek místa pro uložení, velikost souboru je {size1}, zbývá pouze {size2}",
-"Upload cancelled." => "Odesílání zrušeno.",
-"Could not get result from server." => "Nepodařilo se získat výsledek ze serveru.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky způsobí zrušení nahrávání.",
-"URL cannot be empty" => "URL nemůže zůstat prázdná",
-"{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",
-"Error fetching URL" => "Chyba při načítání URL",
-"Share" => "Sdílet",
-"Delete" => "Smazat",
-"Disconnect storage" => "Odpojit úložiště",
-"Unshare" => "Zrušit sdílení",
-"Delete permanently" => "Trvale odstranit",
-"Rename" => "Přejmenovat",
-"Pending" => "Nevyřízené",
-"Error moving file." => "Chyba při přesunu souboru.",
-"Error moving file" => "Chyba při přesunu souboru",
-"Error" => "Chyba",
-"Could not rename file" => "Nepodařilo se přejmenovat soubor",
-"Error deleting file." => "Chyba při mazání souboru.",
-"Name" => "Název",
-"Size" => "Velikost",
-"Modified" => "Upraveno",
-"_%n folder_::_%n folders_" => array("%n složka","%n složky","%n složek"),
-"_%n file_::_%n files_" => array("%n soubor","%n soubory","%n souborů"),
-"You don’t have permission to upload or create files here" => "Nemáte oprávnění zde nahrávat či vytvářet soubory",
-"_Uploading %n file_::_Uploading %n files_" => array("Nahrávám %n soubor","Nahrávám %n soubory","Nahrávám %n souborů"),
-"\"{name}\" is an invalid file name." => "\"{name}\" je neplatným názvem souboru.",
-"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložiště je téměř plné ({usedSpacePercent}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrování bylo vypnuto, vaše soubory jsou však stále zašifrované. Běžte prosím do osobního nastavení, kde soubory odšifrujete.",
-"{dirs} and {files}" => "{dirs} a {files}",
-"%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)",
-"File handling" => "Zacházení se soubory",
-"Maximum upload size" => "Maximální velikost pro odesílání",
-"max. possible: " => "největší možná: ",
-"Save" => "Uložit",
-"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",
-"From link" => "Z odkazu",
-"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
-"Download" => "Stáhnout",
-"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.",
-"Currently scanning" => "Prohledává se"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/cy_GB.js b/apps/files/l10n/cy_GB.js
new file mode 100644
index 00000000000..a9c4ddeba28
--- /dev/null
+++ b/apps/files/l10n/cy_GB.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files",
+    {
+    "Could not move %s - File with this name already exists" : "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
+    "Could not move %s" : "Methwyd symud %s",
+    "File name cannot be empty." : "Does dim hawl cael enw ffeil gwag.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
+    "No file was uploaded. Unknown error" : "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
+    "There is no error, the file uploaded with success" : "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb MAX_FILE_SIZE bennwyd yn y ffurflen HTML",
+    "The uploaded file was only partially uploaded" : "Dim ond yn rhannol y llwythwyd y ffeil i fyny",
+    "No file was uploaded" : "Ni lwythwyd ffeil i fyny",
+    "Missing a temporary folder" : "Plygell dros dro yn eisiau",
+    "Failed to write to disk" : "Methwyd ysgrifennu i'r ddisg",
+    "Not enough storage available" : "Dim digon o le storio ar gael",
+    "Invalid directory." : "Cyfeiriadur annilys.",
+    "Files" : "Ffeiliau",
+    "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",
+    "Share" : "Rhannu",
+    "Delete" : "Dileu",
+    "Unshare" : "Dad-rannu",
+    "Delete permanently" : "Dileu'n barhaol",
+    "Rename" : "Ailenwi",
+    "Pending" : "I ddod",
+    "Error" : "Gwall",
+    "Name" : "Enw",
+    "Size" : "Maint",
+    "Modified" : "Addaswyd",
+    "_%n folder_::_%n folders_" : ["","","",""],
+    "_%n file_::_%n files_" : ["","","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","","",""],
+    "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}%)",
+    "File handling" : "Trafod ffeiliau",
+    "Maximum upload size" : "Maint mwyaf llwytho i fyny",
+    "max. possible: " : "mwyaf. posib:",
+    "Save" : "Cadw",
+    "New" : "Newydd",
+    "Text file" : "Ffeil destun",
+    "Folder" : "Plygell",
+    "From link" : "Dolen o",
+    "Nothing in here. Upload something!" : "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
+    "Download" : "Llwytho i lawr",
+    "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."
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/files/l10n/cy_GB.json b/apps/files/l10n/cy_GB.json
new file mode 100644
index 00000000000..dc583d0a333
--- /dev/null
+++ b/apps/files/l10n/cy_GB.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Could not move %s - File with this name already exists" : "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
+    "Could not move %s" : "Methwyd symud %s",
+    "File name cannot be empty." : "Does dim hawl cael enw ffeil gwag.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
+    "No file was uploaded. Unknown error" : "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
+    "There is no error, the file uploaded with success" : "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb MAX_FILE_SIZE bennwyd yn y ffurflen HTML",
+    "The uploaded file was only partially uploaded" : "Dim ond yn rhannol y llwythwyd y ffeil i fyny",
+    "No file was uploaded" : "Ni lwythwyd ffeil i fyny",
+    "Missing a temporary folder" : "Plygell dros dro yn eisiau",
+    "Failed to write to disk" : "Methwyd ysgrifennu i'r ddisg",
+    "Not enough storage available" : "Dim digon o le storio ar gael",
+    "Invalid directory." : "Cyfeiriadur annilys.",
+    "Files" : "Ffeiliau",
+    "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",
+    "Share" : "Rhannu",
+    "Delete" : "Dileu",
+    "Unshare" : "Dad-rannu",
+    "Delete permanently" : "Dileu'n barhaol",
+    "Rename" : "Ailenwi",
+    "Pending" : "I ddod",
+    "Error" : "Gwall",
+    "Name" : "Enw",
+    "Size" : "Maint",
+    "Modified" : "Addaswyd",
+    "_%n folder_::_%n folders_" : ["","","",""],
+    "_%n file_::_%n files_" : ["","","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","","",""],
+    "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}%)",
+    "File handling" : "Trafod ffeiliau",
+    "Maximum upload size" : "Maint mwyaf llwytho i fyny",
+    "max. possible: " : "mwyaf. posib:",
+    "Save" : "Cadw",
+    "New" : "Newydd",
+    "Text file" : "Ffeil destun",
+    "Folder" : "Plygell",
+    "From link" : "Dolen o",
+    "Nothing in here. Upload something!" : "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
+    "Download" : "Llwytho i lawr",
+    "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."
+},"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/files/l10n/cy_GB.php b/apps/files/l10n/cy_GB.php
deleted file mode 100644
index bf739c87562..00000000000
--- a/apps/files/l10n/cy_GB.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Methwyd symud %s - Mae ffeil gyda'r enw hwn eisoes yn bodoli",
-"Could not move %s" => "Methwyd symud %s",
-"File name cannot be empty." => "Does dim hawl cael enw ffeil gwag.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Enw annilys, ni chaniateir, '\\', '/', '<', '>', ':', '\"', '|', '?' na '*'.",
-"No file was uploaded. Unknown error" => "Ni lwythwyd ffeil i fyny. Gwall anhysbys.",
-"There is no error, the file uploaded with success" => "Does dim gwall, llwythodd y ffeil i fyny'n llwyddiannus",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb upload_max_filesize yn php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Mae'r ffeil lwythwyd i fyny'n fwy na chyfarwyddeb MAX_FILE_SIZE bennwyd yn y ffurflen HTML",
-"The uploaded file was only partially uploaded" => "Dim ond yn rhannol y llwythwyd y ffeil i fyny",
-"No file was uploaded" => "Ni lwythwyd ffeil i fyny",
-"Missing a temporary folder" => "Plygell dros dro yn eisiau",
-"Failed to write to disk" => "Methwyd ysgrifennu i'r ddisg",
-"Not enough storage available" => "Dim digon o le storio ar gael",
-"Invalid directory." => "Cyfeiriadur annilys.",
-"Files" => "Ffeiliau",
-"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",
-"Share" => "Rhannu",
-"Delete" => "Dileu",
-"Unshare" => "Dad-rannu",
-"Delete permanently" => "Dileu'n barhaol",
-"Rename" => "Ailenwi",
-"Pending" => "I ddod",
-"Error" => "Gwall",
-"Name" => "Enw",
-"Size" => "Maint",
-"Modified" => "Addaswyd",
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","","",""),
-"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}%)",
-"File handling" => "Trafod ffeiliau",
-"Maximum upload size" => "Maint mwyaf llwytho i fyny",
-"max. possible: " => "mwyaf. posib:",
-"Save" => "Cadw",
-"New" => "Newydd",
-"Text file" => "Ffeil destun",
-"Folder" => "Plygell",
-"From link" => "Dolen o",
-"Nothing in here. Upload something!" => "Does dim byd fan hyn. Llwythwch rhywbeth i fyny!",
-"Download" => "Llwytho i lawr",
-"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."
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files/l10n/da.js b/apps/files/l10n/da.js
new file mode 100644
index 00000000000..7b636c63409
--- /dev/null
+++ b/apps/files/l10n/da.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Lagerplads er ikke tilgængeligt",
+    "Storage invalid" : "Lagerplads er ugyldig",
+    "Unknown error" : "Ukendt fejl",
+    "Could not move %s - File with this name already exists" : "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
+    "Could not move %s" : "Kunne ikke flytte %s",
+    "Permission denied" : "Adgang nægtet",
+    "File name cannot be empty." : "Filnavnet kan ikke stå tomt.",
+    "\"%s\" is an invalid file name." : "\"%s\" er et ugyldigt filnavn.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
+    "The target folder has been moved or deleted." : "Mappen er blevet slettet eller fjernet.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Navnet %s er allerede i brug i mappen %s. Vælg venligst et andet navn.",
+    "Not a valid source" : "Ikke en gyldig kilde",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server har ikke tilladelse til at åbne URL'er. Kontroller venligst serverens indstillinger",
+    "The file exceeds your quota by %s" : "Denne fil overskrider dit kvota med %s",
+    "Error while downloading %s to %s" : "Fejl ved hentning af %s til %s",
+    "Error when creating the file" : "Fejl ved oprettelse af fil",
+    "Folder name cannot be empty." : "Mappenavnet kan ikke være tomt.",
+    "Error when creating the folder" : "Fejl ved oprettelse af mappen",
+    "Unable to set upload directory." : "Ude af stand til at vælge upload mappe.",
+    "Invalid Token" : "Ugyldig Token ",
+    "No file was uploaded. Unknown error" : "Ingen fil blev uploadet. Ukendt fejl.",
+    "There is no error, the file uploaded with success" : "Der skete ingen fejl, filen blev succesfuldt uploadet",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
+    "The uploaded file was only partially uploaded" : "Filen blev kun delvist uploadet.",
+    "No file was uploaded" : "Ingen fil uploadet",
+    "Missing a temporary folder" : "Manglende midlertidig mappe.",
+    "Failed to write to disk" : "Fejl ved skrivning til disk.",
+    "Not enough storage available" : "Der er ikke nok plads til rådlighed",
+    "Upload failed. Could not find uploaded file" : "Upload fejlede. Kunne ikke finde den uploadede fil.",
+    "Upload failed. Could not get file info." : "Upload fejlede. Kunne ikke hente filinformation.",
+    "Invalid directory." : "Ugyldig mappe.",
+    "Files" : "Filer",
+    "All files" : "Alle filer",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.",
+    "Total file size {size1} exceeds upload limit {size2}" : "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
+    "Upload cancelled." : "Upload afbrudt.",
+    "Could not get result from server." : "Kunne ikke hente resultat fra server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
+    "URL cannot be empty" : "URL kan ikke være tom",
+    "{new_name} already exists" : "{new_name} eksisterer allerede",
+    "Could not create file" : "Kunne ikke oprette fil",
+    "Could not create folder" : "Kunne ikke oprette mappe",
+    "Error fetching URL" : "Fejl ved URL",
+    "Share" : "Del",
+    "Delete" : "Slet",
+    "Disconnect storage" : "Frakobl lager",
+    "Unshare" : "Fjern deling",
+    "Delete permanently" : "Slet permanent",
+    "Rename" : "Omdøb",
+    "Pending" : "Afventer",
+    "Error moving file." : "Fejl ved flytning af fil",
+    "Error moving file" : "Fejl ved flytning af fil",
+    "Error" : "Fejl",
+    "Could not rename file" : "Kunne ikke omdøbe filen",
+    "Error deleting file." : "Fejl ved sletnign af fil.",
+    "Name" : "Navn",
+    "Size" : "Størrelse",
+    "Modified" : "Ændret",
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "'{name}' er et ugyldigt filnavn.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
+    "{dirs} and {files}" : "{dirs} og {files}",
+    "%s could not be renamed as it has been deleted" : "%s kunne ikke omdøbes, da den er blevet slettet",
+    "%s could not be renamed" : "%s kunne ikke omdøbes",
+    "Upload (max. %s)" : "Upload (max. %s)",
+    "File handling" : "Filhåndtering",
+    "Maximum upload size" : "Maksimal upload-størrelse",
+    "max. possible: " : "max. mulige: ",
+    "Save" : "Gem",
+    "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",
+    "From link" : "Fra link",
+    "Nothing in here. Upload something!" : "Her er tomt. Upload noget!",
+    "Download" : "Download",
+    "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.",
+    "Currently scanning" : "Indlæser"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/da.json b/apps/files/l10n/da.json
new file mode 100644
index 00000000000..81b658bef2e
--- /dev/null
+++ b/apps/files/l10n/da.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Lagerplads er ikke tilgængeligt",
+    "Storage invalid" : "Lagerplads er ugyldig",
+    "Unknown error" : "Ukendt fejl",
+    "Could not move %s - File with this name already exists" : "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
+    "Could not move %s" : "Kunne ikke flytte %s",
+    "Permission denied" : "Adgang nægtet",
+    "File name cannot be empty." : "Filnavnet kan ikke stå tomt.",
+    "\"%s\" is an invalid file name." : "\"%s\" er et ugyldigt filnavn.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
+    "The target folder has been moved or deleted." : "Mappen er blevet slettet eller fjernet.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Navnet %s er allerede i brug i mappen %s. Vælg venligst et andet navn.",
+    "Not a valid source" : "Ikke en gyldig kilde",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server har ikke tilladelse til at åbne URL'er. Kontroller venligst serverens indstillinger",
+    "The file exceeds your quota by %s" : "Denne fil overskrider dit kvota med %s",
+    "Error while downloading %s to %s" : "Fejl ved hentning af %s til %s",
+    "Error when creating the file" : "Fejl ved oprettelse af fil",
+    "Folder name cannot be empty." : "Mappenavnet kan ikke være tomt.",
+    "Error when creating the folder" : "Fejl ved oprettelse af mappen",
+    "Unable to set upload directory." : "Ude af stand til at vælge upload mappe.",
+    "Invalid Token" : "Ugyldig Token ",
+    "No file was uploaded. Unknown error" : "Ingen fil blev uploadet. Ukendt fejl.",
+    "There is no error, the file uploaded with success" : "Der skete ingen fejl, filen blev succesfuldt uploadet",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
+    "The uploaded file was only partially uploaded" : "Filen blev kun delvist uploadet.",
+    "No file was uploaded" : "Ingen fil uploadet",
+    "Missing a temporary folder" : "Manglende midlertidig mappe.",
+    "Failed to write to disk" : "Fejl ved skrivning til disk.",
+    "Not enough storage available" : "Der er ikke nok plads til rådlighed",
+    "Upload failed. Could not find uploaded file" : "Upload fejlede. Kunne ikke finde den uploadede fil.",
+    "Upload failed. Could not get file info." : "Upload fejlede. Kunne ikke hente filinformation.",
+    "Invalid directory." : "Ugyldig mappe.",
+    "Files" : "Filer",
+    "All files" : "Alle filer",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.",
+    "Total file size {size1} exceeds upload limit {size2}" : "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
+    "Upload cancelled." : "Upload afbrudt.",
+    "Could not get result from server." : "Kunne ikke hente resultat fra server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
+    "URL cannot be empty" : "URL kan ikke være tom",
+    "{new_name} already exists" : "{new_name} eksisterer allerede",
+    "Could not create file" : "Kunne ikke oprette fil",
+    "Could not create folder" : "Kunne ikke oprette mappe",
+    "Error fetching URL" : "Fejl ved URL",
+    "Share" : "Del",
+    "Delete" : "Slet",
+    "Disconnect storage" : "Frakobl lager",
+    "Unshare" : "Fjern deling",
+    "Delete permanently" : "Slet permanent",
+    "Rename" : "Omdøb",
+    "Pending" : "Afventer",
+    "Error moving file." : "Fejl ved flytning af fil",
+    "Error moving file" : "Fejl ved flytning af fil",
+    "Error" : "Fejl",
+    "Could not rename file" : "Kunne ikke omdøbe filen",
+    "Error deleting file." : "Fejl ved sletnign af fil.",
+    "Name" : "Navn",
+    "Size" : "Størrelse",
+    "Modified" : "Ændret",
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "'{name}' er et ugyldigt filnavn.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
+    "{dirs} and {files}" : "{dirs} og {files}",
+    "%s could not be renamed as it has been deleted" : "%s kunne ikke omdøbes, da den er blevet slettet",
+    "%s could not be renamed" : "%s kunne ikke omdøbes",
+    "Upload (max. %s)" : "Upload (max. %s)",
+    "File handling" : "Filhåndtering",
+    "Maximum upload size" : "Maksimal upload-størrelse",
+    "max. possible: " : "max. mulige: ",
+    "Save" : "Gem",
+    "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",
+    "From link" : "Fra link",
+    "Nothing in here. Upload something!" : "Her er tomt. Upload noget!",
+    "Download" : "Download",
+    "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.",
+    "Currently scanning" : "Indlæser"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
deleted file mode 100644
index ca2b16059da..00000000000
--- a/apps/files/l10n/da.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Lagerplads er ikke tilgængeligt",
-"Storage invalid" => "Lagerplads er ugyldig",
-"Unknown error" => "Ukendt fejl",
-"Could not move %s - File with this name already exists" => "Kunne ikke flytte %s - der findes allerede en fil med dette navn",
-"Could not move %s" => "Kunne ikke flytte %s",
-"Permission denied" => "Adgang nægtet",
-"File name cannot be empty." => "Filnavnet kan ikke stå tomt.",
-"\"%s\" is an invalid file name." => "\"%s\" er et ugyldigt filnavn.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldigt navn, '\\', '/', '<', '>', ':' | '?', '\"', '', og '*' er ikke tilladt.",
-"The target folder has been moved or deleted." => "Mappen er blevet slettet eller fjernet.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Navnet %s er allerede i brug i mappen %s. Vælg venligst et andet navn.",
-"Not a valid source" => "Ikke en gyldig kilde",
-"Server is not allowed to open URLs, please check the server configuration" => "Server har ikke tilladelse til at åbne URL'er. Kontroller venligst serverens indstillinger",
-"The file exceeds your quota by %s" => "Denne fil overskrider dit kvota med %s",
-"Error while downloading %s to %s" => "Fejl ved hentning af %s til %s",
-"Error when creating the file" => "Fejl ved oprettelse af fil",
-"Folder name cannot be empty." => "Mappenavnet kan ikke være tomt.",
-"Error when creating the folder" => "Fejl ved oprettelse af mappen",
-"Unable to set upload directory." => "Ude af stand til at vælge upload mappe.",
-"Invalid Token" => "Ugyldig Token ",
-"No file was uploaded. Unknown error" => "Ingen fil blev uploadet. Ukendt fejl.",
-"There is no error, the file uploaded with success" => "Der skete ingen fejl, filen blev succesfuldt uploadet",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uploadede fil overstiger upload_max_filesize direktivet i php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uploadede fil overstiger MAX_FILE_SIZE indstilingen, som specificeret i HTML formularen",
-"The uploaded file was only partially uploaded" => "Filen blev kun delvist uploadet.",
-"No file was uploaded" => "Ingen fil uploadet",
-"Missing a temporary folder" => "Manglende midlertidig mappe.",
-"Failed to write to disk" => "Fejl ved skrivning til disk.",
-"Not enough storage available" => "Der er ikke nok plads til rådlighed",
-"Upload failed. Could not find uploaded file" => "Upload fejlede. Kunne ikke finde den uploadede fil.",
-"Upload failed. Could not get file info." => "Upload fejlede. Kunne ikke hente filinformation.",
-"Invalid directory." => "Ugyldig mappe.",
-"Files" => "Filer",
-"All files" => "Alle filer",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan ikke upload {filename} da det er enten en mappe eller indholder 0 bytes.",
-"Total file size {size1} exceeds upload limit {size2}" => "Den totale filstørrelse {size1} er større end uploadgrænsen {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Der er ikke tilstrækkeligt friplads. Du uplaoder {size1} men der er kun {size2} tilbage",
-"Upload cancelled." => "Upload afbrudt.",
-"Could not get result from server." => "Kunne ikke hente resultat fra server.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
-"URL cannot be empty" => "URL kan ikke være tom",
-"{new_name} already exists" => "{new_name} eksisterer allerede",
-"Could not create file" => "Kunne ikke oprette fil",
-"Could not create folder" => "Kunne ikke oprette mappe",
-"Error fetching URL" => "Fejl ved URL",
-"Share" => "Del",
-"Delete" => "Slet",
-"Disconnect storage" => "Frakobl lager",
-"Unshare" => "Fjern deling",
-"Delete permanently" => "Slet permanent",
-"Rename" => "Omdøb",
-"Pending" => "Afventer",
-"Error moving file." => "Fejl ved flytning af fil",
-"Error moving file" => "Fejl ved flytning af fil",
-"Error" => "Fejl",
-"Could not rename file" => "Kunne ikke omdøbe filen",
-"Error deleting file." => "Fejl ved sletnign af fil.",
-"Name" => "Navn",
-"Size" => "Størrelse",
-"Modified" => "Ændret",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
-"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_" => array("Uploader %n fil","Uploader %n filer"),
-"\"{name}\" is an invalid file name." => "'{name}' er et ugyldigt filnavn.",
-"Your storage is full, files can not be updated or synced anymore!" => "Din opbevaringsplads er fyldt op, filer kan ikke opdateres eller synkroniseres længere!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Din opbevaringsplads er næsten fyldt op ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krypteringen blev deaktiveret, men dine filer er stadig krypteret. Gå venligst til dine personlige indstillinger for at dekryptere dine filer. ",
-"{dirs} and {files}" => "{dirs} og {files}",
-"%s could not be renamed as it has been deleted" => "%s kunne ikke omdøbes, da den er blevet slettet",
-"%s could not be renamed" => "%s kunne ikke omdøbes",
-"Upload (max. %s)" => "Upload (max. %s)",
-"File handling" => "Filhåndtering",
-"Maximum upload size" => "Maksimal upload-størrelse",
-"max. possible: " => "max. mulige: ",
-"Save" => "Gem",
-"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",
-"From link" => "Fra link",
-"Nothing in here. Upload something!" => "Her er tomt. Upload noget!",
-"Download" => "Download",
-"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.",
-"Currently scanning" => "Indlæser"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de.js b/apps/files/l10n/de.js
new file mode 100644
index 00000000000..b4ffa90c89b
--- /dev/null
+++ b/apps/files/l10n/de.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Speicher nicht verfügbar",
+    "Storage invalid" : "Speicher ungültig",
+    "Unknown error" : "Unbekannter Fehler",
+    "Could not move %s - File with this name already exists" : "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
+    "Could not move %s" : "Konnte %s nicht verschieben",
+    "Permission denied" : "Zugriff verweigert",
+    "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
+    "\"%s\" is an invalid file name." : "»%s« ist kein gültiger Dateiname.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+    "The target folder has been moved or deleted." : "Der Zielordner wurde verschoben oder gelöscht.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Der Name %s wird bereits im Ordner %s benutzt. Bitte wähle  einen anderen Namen.",
+    "Not a valid source" : "Keine gültige Quelle",
+    "Server is not allowed to open URLs, please check the server configuration" : "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
+    "The file exceeds your quota by %s" : "Die Datei überschreitet Dein Limit um %s",
+    "Error while downloading %s to %s" : "Fehler beim Herunterladen von %s nach %s",
+    "Error when creating the file" : "Fehler beim Erstellen der Datei",
+    "Folder name cannot be empty." : "Der Ordner-Name darf nicht leer sein.",
+    "Error when creating the folder" : "Fehler beim Erstellen des Ordners",
+    "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ößer, als die MAX_FILE_SIZE Direktive 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.",
+    "Upload failed. Could not find uploaded file" : "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.",
+    "Upload failed. Could not get file info." : "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
+    "Invalid directory." : "Ungültiges Verzeichnis.",
+    "Files" : "Dateien",
+    "All files" : "Alle Dateien",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
+    "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
+    "Upload cancelled." : "Upload abgebrochen.",
+    "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
+    "URL cannot be empty" : "Die URL darf nicht leer sein",
+    "{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",
+    "Error fetching URL" : "Fehler beim Abrufen der URL",
+    "Share" : "Teilen",
+    "Delete" : "Löschen",
+    "Disconnect storage" : "Speicher trennen",
+    "Unshare" : "Freigabe aufheben",
+    "Delete permanently" : "Endgültig löschen",
+    "Rename" : "Umbenennen",
+    "Pending" : "Ausstehend",
+    "Error moving file." : "Fehler beim Verschieben der Datei.",
+    "Error moving file" : "Fehler beim Verschieben der Datei",
+    "Error" : "Fehler",
+    "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Error deleting file." : "Fehler beim Löschen der Datei.",
+    "Name" : "Name",
+    "Size" : "Größe",
+    "Modified" : "Geändert",
+    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
+    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "You don’t have permission to upload or create files here" : "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
+    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
+    "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Dein Speicher ist fast voll ({usedSpacePercent}%)",
+    "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 melden Dich nochmals ab und wieder an.",
+    "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 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 Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln.",
+    "{dirs} and {files}" : "{dirs} und {files}",
+    "%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:",
+    "Save" : "Speichern",
+    "WebDAV" : "WebDAV",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Diese Adresse benutzen, 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",
+    "From link" : "Von einem Link",
+    "Nothing in here. Upload something!" : "Alles leer. Lade etwas hoch!",
+    "Download" : "Herunterladen",
+    "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.",
+    "Currently scanning" : "Durchsuchen läuft"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de.json b/apps/files/l10n/de.json
new file mode 100644
index 00000000000..600a60ddfd7
--- /dev/null
+++ b/apps/files/l10n/de.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Speicher nicht verfügbar",
+    "Storage invalid" : "Speicher ungültig",
+    "Unknown error" : "Unbekannter Fehler",
+    "Could not move %s - File with this name already exists" : "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
+    "Could not move %s" : "Konnte %s nicht verschieben",
+    "Permission denied" : "Zugriff verweigert",
+    "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
+    "\"%s\" is an invalid file name." : "»%s« ist kein gültiger Dateiname.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+    "The target folder has been moved or deleted." : "Der Zielordner wurde verschoben oder gelöscht.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Der Name %s wird bereits im Ordner %s benutzt. Bitte wähle  einen anderen Namen.",
+    "Not a valid source" : "Keine gültige Quelle",
+    "Server is not allowed to open URLs, please check the server configuration" : "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
+    "The file exceeds your quota by %s" : "Die Datei überschreitet Dein Limit um %s",
+    "Error while downloading %s to %s" : "Fehler beim Herunterladen von %s nach %s",
+    "Error when creating the file" : "Fehler beim Erstellen der Datei",
+    "Folder name cannot be empty." : "Der Ordner-Name darf nicht leer sein.",
+    "Error when creating the folder" : "Fehler beim Erstellen des Ordners",
+    "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ößer, als die MAX_FILE_SIZE Direktive 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.",
+    "Upload failed. Could not find uploaded file" : "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.",
+    "Upload failed. Could not get file info." : "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
+    "Invalid directory." : "Ungültiges Verzeichnis.",
+    "Files" : "Dateien",
+    "All files" : "Alle Dateien",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
+    "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
+    "Upload cancelled." : "Upload abgebrochen.",
+    "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
+    "URL cannot be empty" : "Die URL darf nicht leer sein",
+    "{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",
+    "Error fetching URL" : "Fehler beim Abrufen der URL",
+    "Share" : "Teilen",
+    "Delete" : "Löschen",
+    "Disconnect storage" : "Speicher trennen",
+    "Unshare" : "Freigabe aufheben",
+    "Delete permanently" : "Endgültig löschen",
+    "Rename" : "Umbenennen",
+    "Pending" : "Ausstehend",
+    "Error moving file." : "Fehler beim Verschieben der Datei.",
+    "Error moving file" : "Fehler beim Verschieben der Datei",
+    "Error" : "Fehler",
+    "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Error deleting file." : "Fehler beim Löschen der Datei.",
+    "Name" : "Name",
+    "Size" : "Größe",
+    "Modified" : "Geändert",
+    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
+    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "You don’t have permission to upload or create files here" : "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
+    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
+    "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Dein Speicher ist fast voll ({usedSpacePercent}%)",
+    "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 melden Dich nochmals ab und wieder an.",
+    "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 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 Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln.",
+    "{dirs} and {files}" : "{dirs} und {files}",
+    "%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:",
+    "Save" : "Speichern",
+    "WebDAV" : "WebDAV",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Diese Adresse benutzen, 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",
+    "From link" : "Von einem Link",
+    "Nothing in here. Upload something!" : "Alles leer. Lade etwas hoch!",
+    "Download" : "Herunterladen",
+    "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.",
+    "Currently scanning" : "Durchsuchen läuft"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
deleted file mode 100644
index c8191f82b0c..00000000000
--- a/apps/files/l10n/de.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Speicher nicht verfügbar",
-"Storage invalid" => "Speicher ungültig",
-"Unknown error" => "Unbekannter Fehler",
-"Could not move %s - File with this name already exists" => "Konnte %s nicht verschieben. Eine Datei mit diesem Namen existiert bereits",
-"Could not move %s" => "Konnte %s nicht verschieben",
-"Permission denied" => "Zugriff verweigert",
-"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
-"\"%s\" is an invalid file name." => "»%s« ist kein gültiger Dateiname.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"The target folder has been moved or deleted." => "Der Zielordner wurde verschoben oder gelöscht.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Der Name %s wird bereits im Ordner %s benutzt. Bitte wähle  einen anderen Namen.",
-"Not a valid source" => "Keine gültige Quelle",
-"Server is not allowed to open URLs, please check the server configuration" => "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
-"The file exceeds your quota by %s" => "Die Datei überschreitet Dein Limit um %s",
-"Error while downloading %s to %s" => "Fehler beim Herunterladen von %s nach %s",
-"Error when creating the file" => "Fehler beim Erstellen der Datei",
-"Folder name cannot be empty." => "Der Ordner-Name darf nicht leer sein.",
-"Error when creating the folder" => "Fehler beim Erstellen des Ordners",
-"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ößer, als die MAX_FILE_SIZE Direktive 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.",
-"Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Hochgeladene Datei konnte nicht gefunden werden.",
-"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Dateiinformationen konnten nicht abgerufen werden.",
-"Invalid directory." => "Ungültiges Verzeichnis.",
-"Files" => "Dateien",
-"All files" => "Alle Dateien",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
-"Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, du möchtest {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
-"Upload cancelled." => "Upload abgebrochen.",
-"Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen.",
-"URL cannot be empty" => "Die URL darf nicht leer sein",
-"{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",
-"Error fetching URL" => "Fehler beim Abrufen der URL",
-"Share" => "Teilen",
-"Delete" => "Löschen",
-"Disconnect storage" => "Speicher trennen",
-"Unshare" => "Freigabe aufheben",
-"Delete permanently" => "Endgültig löschen",
-"Rename" => "Umbenennen",
-"Pending" => "Ausstehend",
-"Error moving file." => "Fehler beim Verschieben der Datei.",
-"Error moving file" => "Fehler beim Verschieben der Datei",
-"Error" => "Fehler",
-"Could not rename file" => "Die Datei konnte nicht umbenannt werden",
-"Error deleting file." => "Fehler beim Löschen der Datei.",
-"Name" => "Name",
-"Size" => "Größe",
-"Modified" => "Geändert",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
-"You don’t have permission to upload or create files here" => "Du besitzt hier keine Berechtigung, um Dateien hochzuladen oder zu erstellen",
-"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hochgeladen","%n Dateien werden hochgeladen"),
-"\"{name}\" is an invalid file name." => "»{name}« ist kein gültiger Dateiname.",
-"Your storage is full, files can not be updated or synced anymore!" => "Dein Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Dein Speicher ist fast voll ({usedSpacePercent}%)",
-"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 melden Dich nochmals ab und wieder an.",
-"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 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 Deine Dateien nach wie vor verschlüsselt. Bitte gehe zu Deinen persönlichen Einstellungen, um Deine Dateien zu entschlüsseln.",
-"{dirs} and {files}" => "{dirs} und {files}",
-"%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:",
-"Save" => "Speichern",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Diese Adresse benutzen, 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",
-"From link" => "Von einem Link",
-"Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
-"Download" => "Herunterladen",
-"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.",
-"Currently scanning" => "Durchsuchen läuft"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_AT.js b/apps/files/l10n/de_AT.js
new file mode 100644
index 00000000000..00e929683cc
--- /dev/null
+++ b/apps/files/l10n/de_AT.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files",
+    {
+    "Files" : "Dateien",
+    "Share" : "Freigeben",
+    "Delete" : "Löschen",
+    "Unshare" : "Teilung zurücknehmen",
+    "Error" : "Fehler",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "Speichern",
+    "Download" : "Herunterladen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de_AT.json b/apps/files/l10n/de_AT.json
new file mode 100644
index 00000000000..190e5c1d3b1
--- /dev/null
+++ b/apps/files/l10n/de_AT.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Files" : "Dateien",
+    "Share" : "Freigeben",
+    "Delete" : "Löschen",
+    "Unshare" : "Teilung zurücknehmen",
+    "Error" : "Fehler",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "Speichern",
+    "Download" : "Herunterladen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/de_AT.php b/apps/files/l10n/de_AT.php
deleted file mode 100644
index 5f9459c2f07..00000000000
--- a/apps/files/l10n/de_AT.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Files" => "Dateien",
-"Share" => "Freigeben",
-"Delete" => "Löschen",
-"Unshare" => "Teilung zurücknehmen",
-"Error" => "Fehler",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "Speichern",
-"Download" => "Herunterladen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_CH.js b/apps/files/l10n/de_CH.js
new file mode 100644
index 00000000000..05cec407e0b
--- /dev/null
+++ b/apps/files/l10n/de_CH.js
@@ -0,0 +1,58 @@
+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",
+    "_%n folder_::_%n folders_" : ["","%n Ordner"],
+    "_%n file_::_%n files_" : ["","%n Dateien"],
+    "_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
new file mode 100644
index 00000000000..9ef3585f722
--- /dev/null
+++ b/apps/files/l10n/de_CH.json
@@ -0,0 +1,56 @@
+{ "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",
+    "_%n folder_::_%n folders_" : ["","%n Ordner"],
+    "_%n file_::_%n files_" : ["","%n Dateien"],
+    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hochgeladen","%n Dateien werden hochgeladen"],
+    "Your storage is full, files can not be updated or synced anymore!" : "Ihr Speicher ist voll, daher können keine Dateien mehr aktualisiert oder synchronisiert werden!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ihr Speicher ist fast voll ({usedSpacePercent}%)",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Die Verschlüsselung wurde deaktiviert, jedoch sind Ihre Dateien nach wie vor verschlüsselt. Bitte gehen Sie zu Ihren persönlichen Einstellungen, um Ihre Dateien zu entschlüsseln.",
+    "%s could not be renamed" : "%s konnte nicht umbenannt werden",
+    "File handling" : "Dateibehandlung",
+    "Maximum upload size" : "Maximale Upload-Grösse",
+    "max. possible: " : "maximal möglich:",
+    "Save" : "Speichern",
+    "WebDAV" : "WebDAV",
+    "New" : "Neu",
+    "Text file" : "Textdatei",
+    "New folder" : "Neues Verzeichnis",
+    "Folder" : "Ordner",
+    "From link" : "Von einem Link",
+    "Nothing in here. Upload something!" : "Alles leer. Laden Sie etwas hoch!",
+    "Download" : "Herunterladen",
+    "Upload too large" : "Der Upload ist zu gross",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Die Datei überschreitet die Maximalgrösse für Uploads auf diesem Server.",
+    "Files are being scanned, please wait." : "Dateien werden gescannt, bitte warten."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/de_CH.php b/apps/files/l10n/de_CH.php
deleted file mode 100644
index 1fb8e7e6123..00000000000
--- a/apps/files/l10n/de_CH.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"_%n folder_::_%n folders_" => array("","%n Ordner"),
-"_%n file_::_%n files_" => array("","%n Dateien"),
-"_Uploading %n file_::_Uploading %n files_" => array("%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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/de_DE.js b/apps/files/l10n/de_DE.js
new file mode 100644
index 00000000000..3e64aa3c990
--- /dev/null
+++ b/apps/files/l10n/de_DE.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Speicher nicht verfügbar",
+    "Storage invalid" : "Speicher ungültig",
+    "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",
+    "Permission denied" : "Zugriff verweigert",
+    "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
+    "\"%s\" is an invalid file name." : "\"%s\" ist kein gültiger Dateiname.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+    "The target folder has been moved or deleted." : "Der Ziel-Ordner wurde verschoben oder gelöscht.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.",
+    "Not a valid source" : "Keine gültige Quelle",
+    "Server is not allowed to open URLs, please check the server configuration" : "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
+    "The file exceeds your quota by %s" : "Die Datei überschreitet Ihr Limit um %s",
+    "Error while downloading %s to %s" : "Fehler beim Herunterladen von %s nach %s",
+    "Error when creating the file" : "Fehler beim Erstellen der Datei",
+    "Folder name cannot be empty." : "Der Ordner-Name darf nicht leer sein.",
+    "Error when creating the folder" : "Fehler beim Erstellen des Ordners",
+    "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ößer, 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.",
+    "Upload failed. Could not find uploaded file" : "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden.",
+    "Upload failed. Could not get file info." : "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
+    "Invalid directory." : "Ungültiges Verzeichnis.",
+    "Files" : "Dateien",
+    "All files" : "Alle Dateien",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
+    "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
+    "Upload cancelled." : "Upload abgebrochen.",
+    "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+    "URL cannot be empty" : "Die URL darf nicht leer sein",
+    "{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",
+    "Error fetching URL" : "Fehler beim Abrufen der URL",
+    "Share" : "Teilen",
+    "Delete" : "Löschen",
+    "Disconnect storage" : "Speicher trennen",
+    "Unshare" : "Freigabe aufheben",
+    "Delete permanently" : "Endgültig löschen",
+    "Rename" : "Umbenennen",
+    "Pending" : "Ausstehend",
+    "Error moving file." : "Fehler beim Verschieben der Datei.",
+    "Error moving file" : "Fehler beim Verschieben der Datei",
+    "Error" : "Fehler",
+    "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Error deleting file." : "Fehler beim Löschen der Datei.",
+    "Name" : "Name",
+    "Size" : "Größe",
+    "Modified" : "Geändert",
+    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
+    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "You don’t have permission to upload or create files here" : "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
+    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"],
+    "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
+    "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 App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.",
+    "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üsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
+    "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.",
+    "{dirs} and {files}" : "{dirs} und {files}",
+    "%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:",
+    "Save" : "Speichern",
+    "WebDAV" : "WebDAV",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Diese Adresse benutzen, 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",
+    "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 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.",
+    "Currently scanning" : "Durchsuchen läuft"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/de_DE.json b/apps/files/l10n/de_DE.json
new file mode 100644
index 00000000000..df3433251c6
--- /dev/null
+++ b/apps/files/l10n/de_DE.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Speicher nicht verfügbar",
+    "Storage invalid" : "Speicher ungültig",
+    "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",
+    "Permission denied" : "Zugriff verweigert",
+    "File name cannot be empty." : "Der Dateiname darf nicht leer sein.",
+    "\"%s\" is an invalid file name." : "\"%s\" ist kein gültiger Dateiname.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
+    "The target folder has been moved or deleted." : "Der Ziel-Ordner wurde verschoben oder gelöscht.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.",
+    "Not a valid source" : "Keine gültige Quelle",
+    "Server is not allowed to open URLs, please check the server configuration" : "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
+    "The file exceeds your quota by %s" : "Die Datei überschreitet Ihr Limit um %s",
+    "Error while downloading %s to %s" : "Fehler beim Herunterladen von %s nach %s",
+    "Error when creating the file" : "Fehler beim Erstellen der Datei",
+    "Folder name cannot be empty." : "Der Ordner-Name darf nicht leer sein.",
+    "Error when creating the folder" : "Fehler beim Erstellen des Ordners",
+    "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ößer, 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.",
+    "Upload failed. Could not find uploaded file" : "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden.",
+    "Upload failed. Could not get file info." : "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
+    "Invalid directory." : "Ungültiges Verzeichnis.",
+    "Files" : "Dateien",
+    "All files" : "Alle Dateien",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
+    "Total file size {size1} exceeds upload limit {size2}" : "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
+    "Upload cancelled." : "Upload abgebrochen.",
+    "Could not get result from server." : "Ergebnis konnte nicht vom Server abgerufen werden.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
+    "URL cannot be empty" : "Die URL darf nicht leer sein",
+    "{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",
+    "Error fetching URL" : "Fehler beim Abrufen der URL",
+    "Share" : "Teilen",
+    "Delete" : "Löschen",
+    "Disconnect storage" : "Speicher trennen",
+    "Unshare" : "Freigabe aufheben",
+    "Delete permanently" : "Endgültig löschen",
+    "Rename" : "Umbenennen",
+    "Pending" : "Ausstehend",
+    "Error moving file." : "Fehler beim Verschieben der Datei.",
+    "Error moving file" : "Fehler beim Verschieben der Datei",
+    "Error" : "Fehler",
+    "Could not rename file" : "Die Datei konnte nicht umbenannt werden",
+    "Error deleting file." : "Fehler beim Löschen der Datei.",
+    "Name" : "Name",
+    "Size" : "Größe",
+    "Modified" : "Geändert",
+    "_%n folder_::_%n folders_" : ["%n Ordner","%n Ordner"],
+    "_%n file_::_%n files_" : ["%n Datei","%n Dateien"],
+    "You don’t have permission to upload or create files here" : "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
+    "_Uploading %n file_::_Uploading %n files_" : ["%n Datei wird hoch geladen","%n Dateien werden hoch geladen"],
+    "\"{name}\" is an invalid file name." : "»{name}« ist kein gültiger Dateiname.",
+    "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 App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.",
+    "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üsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
+    "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.",
+    "{dirs} and {files}" : "{dirs} und {files}",
+    "%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:",
+    "Save" : "Speichern",
+    "WebDAV" : "WebDAV",
+    "Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" : "Diese Adresse benutzen, 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",
+    "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 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.",
+    "Currently scanning" : "Durchsuchen läuft"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
deleted file mode 100644
index 1b37aaa78e0..00000000000
--- a/apps/files/l10n/de_DE.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Speicher nicht verfügbar",
-"Storage invalid" => "Speicher ungültig",
-"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",
-"Permission denied" => "Zugriff verweigert",
-"File name cannot be empty." => "Der Dateiname darf nicht leer sein.",
-"\"%s\" is an invalid file name." => "\"%s\" ist kein gültiger Dateiname.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig.",
-"The target folder has been moved or deleted." => "Der Ziel-Ordner wurde verschoben oder gelöscht.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Der Name %s wird bereits im Ordner %s benutzt. Bitte wählen Sie einen anderen Namen.",
-"Not a valid source" => "Keine gültige Quelle",
-"Server is not allowed to open URLs, please check the server configuration" => "Dem Server ist das Öffnen von URLs nicht erlaubt, bitte die Serverkonfiguration prüfen",
-"The file exceeds your quota by %s" => "Die Datei überschreitet Ihr Limit um %s",
-"Error while downloading %s to %s" => "Fehler beim Herunterladen von %s nach %s",
-"Error when creating the file" => "Fehler beim Erstellen der Datei",
-"Folder name cannot be empty." => "Der Ordner-Name darf nicht leer sein.",
-"Error when creating the folder" => "Fehler beim Erstellen des Ordners",
-"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ößer, 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.",
-"Upload failed. Could not find uploaded file" => "Hochladen fehlgeschlagen. Die hochgeladene Datei konnte nicht gefunden werden.",
-"Upload failed. Could not get file info." => "Hochladen fehlgeschlagen. Die Dateiinformationen konnten nicht abgerufen werden.",
-"Invalid directory." => "Ungültiges Verzeichnis.",
-"Files" => "Dateien",
-"All files" => "Alle Dateien",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Die Datei {filename} kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist",
-"Total file size {size1} exceeds upload limit {size2}" => "Die Gesamt-Größe {size1} überschreitet die Upload-Begrenzung {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nicht genügend freier Speicherplatz, Sie möchten {size1} hochladen, es sind jedoch nur noch {size2} verfügbar.",
-"Upload cancelled." => "Upload abgebrochen.",
-"Could not get result from server." => "Ergebnis konnte nicht vom Server abgerufen werden.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
-"URL cannot be empty" => "Die URL darf nicht leer sein",
-"{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",
-"Error fetching URL" => "Fehler beim Abrufen der URL",
-"Share" => "Teilen",
-"Delete" => "Löschen",
-"Disconnect storage" => "Speicher trennen",
-"Unshare" => "Freigabe aufheben",
-"Delete permanently" => "Endgültig löschen",
-"Rename" => "Umbenennen",
-"Pending" => "Ausstehend",
-"Error moving file." => "Fehler beim Verschieben der Datei.",
-"Error moving file" => "Fehler beim Verschieben der Datei",
-"Error" => "Fehler",
-"Could not rename file" => "Die Datei konnte nicht umbenannt werden",
-"Error deleting file." => "Fehler beim Löschen der Datei.",
-"Name" => "Name",
-"Size" => "Größe",
-"Modified" => "Geändert",
-"_%n folder_::_%n folders_" => array("%n Ordner","%n Ordner"),
-"_%n file_::_%n files_" => array("%n Datei","%n Dateien"),
-"You don’t have permission to upload or create files here" => "Sie besitzen hier keine Berechtigung Dateien hochzuladen oder zu erstellen",
-"_Uploading %n file_::_Uploading %n files_" => array("%n Datei wird hoch geladen","%n Dateien werden hoch geladen"),
-"\"{name}\" is an invalid file name." => "»{name}« ist kein gültiger Dateiname.",
-"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 App is enabled but your keys are not initialized, please log-out and log-in again" => "Verschlüsselungs-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte melden Sie sich nochmals ab und wieder an.",
-"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üsselungs-App. Bitte aktualisieren Sie Ihr privates Schlüsselpasswort, um den Zugriff auf Ihre verschlüsselten Dateien wiederherzustellen.",
-"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.",
-"{dirs} and {files}" => "{dirs} und {files}",
-"%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:",
-"Save" => "Speichern",
-"WebDAV" => "WebDAV",
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via WebDAV</a>" => "Diese Adresse benutzen, 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",
-"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 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.",
-"Currently scanning" => "Durchsuchen läuft"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/el.js b/apps/files/l10n/el.js
new file mode 100644
index 00000000000..eaf4eb65ebd
--- /dev/null
+++ b/apps/files/l10n/el.js
@@ -0,0 +1,97 @@
+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" : "Η πρόσβαση απορρίφθηκε",
+    "File name cannot be empty." : "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
+    "\"%s\" is an invalid file name." : "Το \"%s\" είναι ένα μη έγκυρο όνομα αρχείου.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
+    "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. Παρακαλώ επιλέξτε ένα άλλο όνομα.",
+    "Not a valid source" : "Μη έγκυρη πηγή",
+    "Server is not allowed to open URLs, please check the server configuration" : "Ο διακομιστής δεν επιτρέπεται να ανοίγει URL, παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή",
+    "The file exceeds your quota by %s" : "Ο φάκελλος ξεπερνάει το όριό σας κατά %s",
+    "Error while downloading %s to %s" : "Σφάλμα κατά τη λήψη του %s στο %s",
+    "Error when creating the file" : "Σφάλμα κατά τη δημιουργία του αρχείου",
+    "Folder name cannot be empty." : "Το όνομα φακέλου δεν μπορεί να είναι κενό.",
+    "Error when creating the folder" : "Σφάλμα δημιουργίας φακέλου",
+    "Unable to set upload directory." : "Αδυναμία ορισμού καταλόγου αποστολής.",
+    "Invalid Token" : "Μη έγκυρο Token",
+    "No file was uploaded. Unknown error" : "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
+    "There is no error, the file uploaded with success" : "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Το αρχείο που εστάλει υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα",
+    "The uploaded file was only partially uploaded" : "Το αρχείο εστάλει μόνο εν μέρει",
+    "No file was uploaded" : "Κανένα αρχείο δεν στάλθηκε",
+    "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" : "Όλα τα αρχεία",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}",
+    "Upload cancelled." : "Η αποστολή ακυρώθηκε.",
+    "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
+    "URL cannot be empty" : "Η URL δεν πρέπει να είναι κενή",
+    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
+    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
+    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
+    "Error fetching URL" : "Σφάλμα φόρτωσης URL",
+    "Share" : "Διαμοιρασμός",
+    "Delete" : "Διαγραφή",
+    "Disconnect storage" : "Αποσυνδεδεμένος αποθηκευτικός χώρος",
+    "Unshare" : "Διακοπή διαμοιρασμού",
+    "Delete permanently" : "Μόνιμη διαγραφή",
+    "Rename" : "Μετονομασία",
+    "Pending" : "Εκκρεμεί",
+    "Error moving file." : "Σφάλμα κατά τη μετακίνηση του αρχείου.",
+    "Error moving file" : "Σφάλμα κατά τη μετακίνηση του αρχείου",
+    "Error" : "Σφάλμα",
+    "Could not rename file" : "Αδυναμία μετονομασίας αρχείου",
+    "Error deleting file." : "Σφάλμα διαγραφής αρχείου.",
+    "Name" : "Όνομα",
+    "Size" : "Μέγεθος",
+    "Modified" : "Τροποποιήθηκε",
+    "_%n folder_::_%n folders_" : ["%n φάκελος","%n φάκελοι"],
+    "_%n file_::_%n files_" : ["%n αρχείο","%n αρχεία"],
+    "You don’t have permission to upload or create files here" : "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
+    "_Uploading %n file_::_Uploading %n files_" : ["Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"],
+    "\"{name}\" is an invalid file name." : "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις",
+    "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
+    "%s could not be renamed as it has been deleted" : "%s δεν μπορούσε να μετονομαστεί εφόσον είχε διαγραφεί",
+    "%s could not be renamed" : "Αδυναμία μετονομασίας του %s",
+    "Upload (max. %s)" : "Διαμοιρασμός (max. %s)",
+    "File handling" : "Διαχείριση αρχείων",
+    "Maximum upload size" : "Μέγιστο μέγεθος αποστολής",
+    "max. possible: " : "μέγιστο δυνατό:",
+    "Save" : "Αποθήκευση",
+    "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" : "Φάκελος",
+    "From link" : "Από σύνδεσμο",
+    "Nothing in here. Upload something!" : "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
+    "Download" : "Λήψη",
+    "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
+    "Files are being scanned, please wait." : "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
+    "Currently scanning" : "Σάρωση σε εξέλιξη"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/el.json b/apps/files/l10n/el.json
new file mode 100644
index 00000000000..5c9b763b5e1
--- /dev/null
+++ b/apps/files/l10n/el.json
@@ -0,0 +1,95 @@
+{ "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" : "Η πρόσβαση απορρίφθηκε",
+    "File name cannot be empty." : "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
+    "\"%s\" is an invalid file name." : "Το \"%s\" είναι ένα μη έγκυρο όνομα αρχείου.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
+    "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. Παρακαλώ επιλέξτε ένα άλλο όνομα.",
+    "Not a valid source" : "Μη έγκυρη πηγή",
+    "Server is not allowed to open URLs, please check the server configuration" : "Ο διακομιστής δεν επιτρέπεται να ανοίγει URL, παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή",
+    "The file exceeds your quota by %s" : "Ο φάκελλος ξεπερνάει το όριό σας κατά %s",
+    "Error while downloading %s to %s" : "Σφάλμα κατά τη λήψη του %s στο %s",
+    "Error when creating the file" : "Σφάλμα κατά τη δημιουργία του αρχείου",
+    "Folder name cannot be empty." : "Το όνομα φακέλου δεν μπορεί να είναι κενό.",
+    "Error when creating the folder" : "Σφάλμα δημιουργίας φακέλου",
+    "Unable to set upload directory." : "Αδυναμία ορισμού καταλόγου αποστολής.",
+    "Invalid Token" : "Μη έγκυρο Token",
+    "No file was uploaded. Unknown error" : "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
+    "There is no error, the file uploaded with success" : "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Το αρχείο που εστάλει υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα",
+    "The uploaded file was only partially uploaded" : "Το αρχείο εστάλει μόνο εν μέρει",
+    "No file was uploaded" : "Κανένα αρχείο δεν στάλθηκε",
+    "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" : "Όλα τα αρχεία",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}",
+    "Upload cancelled." : "Η αποστολή ακυρώθηκε.",
+    "Could not get result from server." : "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
+    "URL cannot be empty" : "Η URL δεν πρέπει να είναι κενή",
+    "{new_name} already exists" : "{new_name} υπάρχει ήδη",
+    "Could not create file" : "Αδυναμία δημιουργίας αρχείου",
+    "Could not create folder" : "Αδυναμία δημιουργίας φακέλου",
+    "Error fetching URL" : "Σφάλμα φόρτωσης URL",
+    "Share" : "Διαμοιρασμός",
+    "Delete" : "Διαγραφή",
+    "Disconnect storage" : "Αποσυνδεδεμένος αποθηκευτικός χώρος",
+    "Unshare" : "Διακοπή διαμοιρασμού",
+    "Delete permanently" : "Μόνιμη διαγραφή",
+    "Rename" : "Μετονομασία",
+    "Pending" : "Εκκρεμεί",
+    "Error moving file." : "Σφάλμα κατά τη μετακίνηση του αρχείου.",
+    "Error moving file" : "Σφάλμα κατά τη μετακίνηση του αρχείου",
+    "Error" : "Σφάλμα",
+    "Could not rename file" : "Αδυναμία μετονομασίας αρχείου",
+    "Error deleting file." : "Σφάλμα διαγραφής αρχείου.",
+    "Name" : "Όνομα",
+    "Size" : "Μέγεθος",
+    "Modified" : "Τροποποιήθηκε",
+    "_%n folder_::_%n folders_" : ["%n φάκελος","%n φάκελοι"],
+    "_%n file_::_%n files_" : ["%n αρχείο","%n αρχεία"],
+    "You don’t have permission to upload or create files here" : "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
+    "_Uploading %n file_::_Uploading %n files_" : ["Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"],
+    "\"{name}\" is an invalid file name." : "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις",
+    "{dirs} and {files}" : "{Κατάλογοι αρχείων} και {αρχεία}",
+    "%s could not be renamed as it has been deleted" : "%s δεν μπορούσε να μετονομαστεί εφόσον είχε διαγραφεί",
+    "%s could not be renamed" : "Αδυναμία μετονομασίας του %s",
+    "Upload (max. %s)" : "Διαμοιρασμός (max. %s)",
+    "File handling" : "Διαχείριση αρχείων",
+    "Maximum upload size" : "Μέγιστο μέγεθος αποστολής",
+    "max. possible: " : "μέγιστο δυνατό:",
+    "Save" : "Αποθήκευση",
+    "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" : "Φάκελος",
+    "From link" : "Από σύνδεσμο",
+    "Nothing in here. Upload something!" : "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
+    "Download" : "Λήψη",
+    "Upload too large" : "Πολύ μεγάλο αρχείο προς αποστολή",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
+    "Files are being scanned, please wait." : "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
+    "Currently scanning" : "Σάρωση σε εξέλιξη"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
deleted file mode 100644
index 4b51fa4ba00..00000000000
--- a/apps/files/l10n/el.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "Η πρόσβαση απορρίφθηκε",
-"File name cannot be empty." => "Το όνομα αρχείου δεν μπορεί να είναι κενό.",
-"\"%s\" is an invalid file name." => "Το \"%s\" είναι ένα μη έγκυρο όνομα αρχείου.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Μη έγκυρο όνομα, '\\', '/', '<', '>', ':', '\"', '|', '?' και '*' δεν επιτρέπονται.",
-"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. Παρακαλώ επιλέξτε ένα άλλο όνομα.",
-"Not a valid source" => "Μη έγκυρη πηγή",
-"Server is not allowed to open URLs, please check the server configuration" => "Ο διακομιστής δεν επιτρέπεται να ανοίγει URL, παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή",
-"The file exceeds your quota by %s" => "Ο φάκελλος ξεπερνάει το όριό σας κατά %s",
-"Error while downloading %s to %s" => "Σφάλμα κατά τη λήψη του %s στο %s",
-"Error when creating the file" => "Σφάλμα κατά τη δημιουργία του αρχείου",
-"Folder name cannot be empty." => "Το όνομα φακέλου δεν μπορεί να είναι κενό.",
-"Error when creating the folder" => "Σφάλμα δημιουργίας φακέλου",
-"Unable to set upload directory." => "Αδυναμία ορισμού καταλόγου αποστολής.",
-"Invalid Token" => "Μη έγκυρο Token",
-"No file was uploaded. Unknown error" => "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα",
-"There is no error, the file uploaded with success" => "Δεν υπάρχει σφάλμα, το αρχείο εστάλει επιτυχώς",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Το αρχείο που εστάλει υπερβαίνει την οδηγία μέγιστου επιτρεπτού μεγέθους \"upload_max_filesize\" του php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Το ανεβασμένο αρχείο υπερβαίνει το MAX_FILE_SIZE που ορίζεται στην  HTML φόρμα",
-"The uploaded file was only partially uploaded" => "Το αρχείο εστάλει μόνο εν μέρει",
-"No file was uploaded" => "Κανένα αρχείο δεν στάλθηκε",
-"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" => "Όλα τα αρχεία",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Αδυναμία φόρτωσης {filename} καθώς είναι κατάλογος αρχείων ή έχει 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "Το συνολικό μέγεθος αρχείου {size1} υπερβαίνει το όριο μεταφόρτωσης {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Δεν υπάρχει αρκετός ελεύθερος χώρος, μεταφορτώνετε μέγεθος {size1} αλλά υπάρχει χώρος μόνο {size2}",
-"Upload cancelled." => "Η αποστολή ακυρώθηκε.",
-"Could not get result from server." => "Αδυναμία λήψης αποτελέσματος από το διακομιστή.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Η αποστολή του αρχείου βρίσκεται σε εξέλιξη. Το κλείσιμο της σελίδας θα ακυρώσει την αποστολή.",
-"URL cannot be empty" => "Η URL δεν πρέπει να είναι κενή",
-"{new_name} already exists" => "{new_name} υπάρχει ήδη",
-"Could not create file" => "Αδυναμία δημιουργίας αρχείου",
-"Could not create folder" => "Αδυναμία δημιουργίας φακέλου",
-"Error fetching URL" => "Σφάλμα φόρτωσης URL",
-"Share" => "Διαμοιρασμός",
-"Delete" => "Διαγραφή",
-"Disconnect storage" => "Αποσυνδεδεμένος αποθηκευτικός χώρος",
-"Unshare" => "Διακοπή διαμοιρασμού",
-"Delete permanently" => "Μόνιμη διαγραφή",
-"Rename" => "Μετονομασία",
-"Pending" => "Εκκρεμεί",
-"Error moving file." => "Σφάλμα κατά τη μετακίνηση του αρχείου.",
-"Error moving file" => "Σφάλμα κατά τη μετακίνηση του αρχείου",
-"Error" => "Σφάλμα",
-"Could not rename file" => "Αδυναμία μετονομασίας αρχείου",
-"Error deleting file." => "Σφάλμα διαγραφής αρχείου.",
-"Name" => "Όνομα",
-"Size" => "Μέγεθος",
-"Modified" => "Τροποποιήθηκε",
-"_%n folder_::_%n folders_" => array("%n φάκελος","%n φάκελοι"),
-"_%n file_::_%n files_" => array("%n αρχείο","%n αρχεία"),
-"You don’t have permission to upload or create files here" => "Δεν έχετε δικαιώματα φόρτωσης ή δημιουργίας αρχείων εδώ",
-"_Uploading %n file_::_Uploading %n files_" => array("Ανέβασμα %n αρχείου","Ανέβασμα %n αρχείων"),
-"\"{name}\" is an invalid file name." => "Το \"{name}\" είναι μη έγκυρο όνομα αρχείου.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ο αποθηκευτικός σας χώρος είναι γεμάτος, τα αρχεία δεν μπορούν να ενημερωθούν ή να συγχρονιστούν πια!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ο αποθηκευτικός χώρος είναι σχεδόν γεμάτος ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Άκυρο προσωπικό κλειδί για την εφαρμογή κρυπτογράφησης. Παρακαλώ ενημερώστε τον κωδικό του προσωπικού κλειδίου σας στις προσωπικές ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Η κρυπτογράφηση απενεργοποιήθηκε, αλλά τα αρχεία σας είναι ακόμα κρυπτογραφημένα. Παρακαλούμε απενεργοποιήσετε την κρυπτογράφηση αρχείων από τις προσωπικές σας ρυθμίσεις",
-"{dirs} and {files}" => "{Κατάλογοι αρχείων} και {αρχεία}",
-"%s could not be renamed as it has been deleted" => "%s δεν μπορούσε να μετονομαστεί εφόσον είχε διαγραφεί",
-"%s could not be renamed" => "Αδυναμία μετονομασίας του %s",
-"Upload (max. %s)" => "Διαμοιρασμός (max. %s)",
-"File handling" => "Διαχείριση αρχείων",
-"Maximum upload size" => "Μέγιστο μέγεθος αποστολής",
-"max. possible: " => "μέγιστο δυνατό:",
-"Save" => "Αποθήκευση",
-"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" => "Φάκελος",
-"From link" => "Από σύνδεσμο",
-"Nothing in here. Upload something!" => "Δεν υπάρχει τίποτα εδώ. Ανεβάστε κάτι!",
-"Download" => "Λήψη",
-"Upload too large" => "Πολύ μεγάλο αρχείο προς αποστολή",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος αποστολής αρχείων σε αυτόν τον διακομιστή.",
-"Files are being scanned, please wait." => "Τα αρχεία σαρώνονται, παρακαλώ περιμένετε.",
-"Currently scanning" => "Σάρωση σε εξέλιξη"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en@pirate.js b/apps/files/l10n/en@pirate.js
new file mode 100644
index 00000000000..92b310a0964
--- /dev/null
+++ b/apps/files/l10n/en@pirate.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files",
+    {
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Download" : "Download"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/en@pirate.json b/apps/files/l10n/en@pirate.json
new file mode 100644
index 00000000000..9d489a29829
--- /dev/null
+++ b/apps/files/l10n/en@pirate.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Download" : "Download"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/en@pirate.php b/apps/files/l10n/en@pirate.php
deleted file mode 100644
index 128f527aef1..00000000000
--- a/apps/files/l10n/en@pirate.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Download" => "Download"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en_GB.js b/apps/files/l10n/en_GB.js
new file mode 100644
index 00000000000..494358d3363
--- /dev/null
+++ b/apps/files/l10n/en_GB.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Storage not available",
+    "Storage invalid" : "Storage invalid",
+    "Unknown error" : "Unknown error",
+    "Could not move %s - File with this name already exists" : "Could not move %s - File with this name already exists",
+    "Could not move %s" : "Could not move %s",
+    "Permission denied" : "Permission denied",
+    "File name cannot be empty." : "File name cannot be empty.",
+    "\"%s\" is an invalid file name." : "\"%s\" is an invalid file name.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
+    "The target folder has been moved or deleted." : "The target folder has been moved or deleted.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "The name %s is already used in the folder %s. Please choose a different name.",
+    "Not a valid source" : "Not a valid source",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server is not allowed to open URLs, please check the server configuration",
+    "The file exceeds your quota by %s" : "The file exceeds your quota by %s",
+    "Error while downloading %s to %s" : "Error whilst downloading %s to %s",
+    "Error when creating the file" : "Error when creating the file",
+    "Folder name cannot be empty." : "Folder name cannot be empty.",
+    "Error when creating the folder" : "Error when creating the folder",
+    "Unable to set upload directory." : "Unable to set upload directory.",
+    "Invalid Token" : "Invalid Token",
+    "No file was uploaded. Unknown error" : "No file was uploaded. Unknown error",
+    "There is no error, the file uploaded with success" : "There is no error, the file uploaded successfully",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
+    "The uploaded file was only partially uploaded" : "The uploaded file was only partially uploaded",
+    "No file was uploaded" : "No file was uploaded",
+    "Missing a temporary folder" : "Missing a temporary folder",
+    "Failed to write to disk" : "Failed to write to disk",
+    "Not enough storage available" : "Not enough storage available",
+    "Upload failed. Could not find uploaded file" : "Upload failed. Could not find uploaded file",
+    "Upload failed. Could not get file info." : "Upload failed. Could not get file info.",
+    "Invalid directory." : "Invalid directory.",
+    "Files" : "Files",
+    "All files" : "All files",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left",
+    "Upload cancelled." : "Upload cancelled.",
+    "Could not get result from server." : "Could not get result from server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
+    "URL cannot be empty" : "URL cannot be empty",
+    "{new_name} already exists" : "{new_name} already exists",
+    "Could not create file" : "Could not create file",
+    "Could not create folder" : "Could not create folder",
+    "Error fetching URL" : "Error fetching URL",
+    "Share" : "Share",
+    "Delete" : "Delete",
+    "Disconnect storage" : "Disconnect storage",
+    "Unshare" : "Unshare",
+    "Delete permanently" : "Delete permanently",
+    "Rename" : "Rename",
+    "Pending" : "Pending",
+    "Error moving file." : "Error moving file.",
+    "Error moving file" : "Error moving file",
+    "Error" : "Error",
+    "Could not rename file" : "Could not rename file",
+    "Error deleting file." : "Error deleting file.",
+    "Name" : "Name",
+    "Size" : "Size",
+    "Modified" : "Modified",
+    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
+    "_%n file_::_%n files_" : ["%n file","%n 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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" is an invalid file name.",
+    "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}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
+    "{dirs} and {files}" : "{dirs} and {files}",
+    "%s could not be renamed as it has been deleted" : "%s could not be renamed as it has been deleted",
+    "%s could not be renamed" : "%s could not be renamed",
+    "Upload (max. %s)" : "Upload (max. %s)",
+    "File handling" : "File handling",
+    "Maximum upload size" : "Maximum upload size",
+    "max. possible: " : "max. possible: ",
+    "Save" : "Save",
+    "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",
+    "From link" : "From link",
+    "Nothing in here. Upload something!" : "Nothing in here. Upload something!",
+    "Download" : "Download",
+    "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.",
+    "Currently scanning" : "Currently scanning"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/en_GB.json b/apps/files/l10n/en_GB.json
new file mode 100644
index 00000000000..bdda9bf4faf
--- /dev/null
+++ b/apps/files/l10n/en_GB.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Storage not available",
+    "Storage invalid" : "Storage invalid",
+    "Unknown error" : "Unknown error",
+    "Could not move %s - File with this name already exists" : "Could not move %s - File with this name already exists",
+    "Could not move %s" : "Could not move %s",
+    "Permission denied" : "Permission denied",
+    "File name cannot be empty." : "File name cannot be empty.",
+    "\"%s\" is an invalid file name." : "\"%s\" is an invalid file name.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
+    "The target folder has been moved or deleted." : "The target folder has been moved or deleted.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "The name %s is already used in the folder %s. Please choose a different name.",
+    "Not a valid source" : "Not a valid source",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server is not allowed to open URLs, please check the server configuration",
+    "The file exceeds your quota by %s" : "The file exceeds your quota by %s",
+    "Error while downloading %s to %s" : "Error whilst downloading %s to %s",
+    "Error when creating the file" : "Error when creating the file",
+    "Folder name cannot be empty." : "Folder name cannot be empty.",
+    "Error when creating the folder" : "Error when creating the folder",
+    "Unable to set upload directory." : "Unable to set upload directory.",
+    "Invalid Token" : "Invalid Token",
+    "No file was uploaded. Unknown error" : "No file was uploaded. Unknown error",
+    "There is no error, the file uploaded with success" : "There is no error, the file uploaded successfully",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
+    "The uploaded file was only partially uploaded" : "The uploaded file was only partially uploaded",
+    "No file was uploaded" : "No file was uploaded",
+    "Missing a temporary folder" : "Missing a temporary folder",
+    "Failed to write to disk" : "Failed to write to disk",
+    "Not enough storage available" : "Not enough storage available",
+    "Upload failed. Could not find uploaded file" : "Upload failed. Could not find uploaded file",
+    "Upload failed. Could not get file info." : "Upload failed. Could not get file info.",
+    "Invalid directory." : "Invalid directory.",
+    "Files" : "Files",
+    "All files" : "All files",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Unable to upload {filename} as it is a directory or has 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "Total file size {size1} exceeds upload limit {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Not enough free space, you are uploading {size1} but only {size2} is left",
+    "Upload cancelled." : "Upload cancelled.",
+    "Could not get result from server." : "Could not get result from server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "File upload is in progress. Leaving the page now will cancel the upload.",
+    "URL cannot be empty" : "URL cannot be empty",
+    "{new_name} already exists" : "{new_name} already exists",
+    "Could not create file" : "Could not create file",
+    "Could not create folder" : "Could not create folder",
+    "Error fetching URL" : "Error fetching URL",
+    "Share" : "Share",
+    "Delete" : "Delete",
+    "Disconnect storage" : "Disconnect storage",
+    "Unshare" : "Unshare",
+    "Delete permanently" : "Delete permanently",
+    "Rename" : "Rename",
+    "Pending" : "Pending",
+    "Error moving file." : "Error moving file.",
+    "Error moving file" : "Error moving file",
+    "Error" : "Error",
+    "Could not rename file" : "Could not rename file",
+    "Error deleting file." : "Error deleting file.",
+    "Name" : "Name",
+    "Size" : "Size",
+    "Modified" : "Modified",
+    "_%n folder_::_%n folders_" : ["%n folder","%n folders"],
+    "_%n file_::_%n files_" : ["%n file","%n 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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" is an invalid file name.",
+    "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}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
+    "{dirs} and {files}" : "{dirs} and {files}",
+    "%s could not be renamed as it has been deleted" : "%s could not be renamed as it has been deleted",
+    "%s could not be renamed" : "%s could not be renamed",
+    "Upload (max. %s)" : "Upload (max. %s)",
+    "File handling" : "File handling",
+    "Maximum upload size" : "Maximum upload size",
+    "max. possible: " : "max. possible: ",
+    "Save" : "Save",
+    "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",
+    "From link" : "From link",
+    "Nothing in here. Upload something!" : "Nothing in here. Upload something!",
+    "Download" : "Download",
+    "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.",
+    "Currently scanning" : "Currently scanning"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/en_GB.php b/apps/files/l10n/en_GB.php
deleted file mode 100644
index e2589923341..00000000000
--- a/apps/files/l10n/en_GB.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Storage not available",
-"Storage invalid" => "Storage invalid",
-"Unknown error" => "Unknown error",
-"Could not move %s - File with this name already exists" => "Could not move %s - File with this name already exists",
-"Could not move %s" => "Could not move %s",
-"Permission denied" => "Permission denied",
-"File name cannot be empty." => "File name cannot be empty.",
-"\"%s\" is an invalid file name." => "\"%s\" is an invalid file name.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Invalid name: '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed.",
-"The target folder has been moved or deleted." => "The target folder has been moved or deleted.",
-"The name %s is already used in the folder %s. Please choose a different name." => "The name %s is already used in the folder %s. Please choose a different name.",
-"Not a valid source" => "Not a valid source",
-"Server is not allowed to open URLs, please check the server configuration" => "Server is not allowed to open URLs, please check the server configuration",
-"The file exceeds your quota by %s" => "The file exceeds your quota by %s",
-"Error while downloading %s to %s" => "Error whilst downloading %s to %s",
-"Error when creating the file" => "Error when creating the file",
-"Folder name cannot be empty." => "Folder name cannot be empty.",
-"Error when creating the folder" => "Error when creating the folder",
-"Unable to set upload directory." => "Unable to set upload directory.",
-"Invalid Token" => "Invalid Token",
-"No file was uploaded. Unknown error" => "No file was uploaded. Unknown error",
-"There is no error, the file uploaded with success" => "There is no error, the file uploaded successfully",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form",
-"The uploaded file was only partially uploaded" => "The uploaded file was only partially uploaded",
-"No file was uploaded" => "No file was uploaded",
-"Missing a temporary folder" => "Missing a temporary folder",
-"Failed to write to disk" => "Failed to write to disk",
-"Not enough storage available" => "Not enough storage available",
-"Upload failed. Could not find uploaded file" => "Upload failed. Could not find uploaded file",
-"Upload failed. Could not get file info." => "Upload failed. Could not get file info.",
-"Invalid directory." => "Invalid directory.",
-"Files" => "Files",
-"All files" => "All files",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Unable to upload {filename} as it is a directory or has 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "Total file size {size1} exceeds upload limit {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Not enough free space, you are uploading {size1} but only {size2} is left",
-"Upload cancelled." => "Upload cancelled.",
-"Could not get result from server." => "Could not get result from server.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "File upload is in progress. Leaving the page now will cancel the upload.",
-"URL cannot be empty" => "URL cannot be empty",
-"{new_name} already exists" => "{new_name} already exists",
-"Could not create file" => "Could not create file",
-"Could not create folder" => "Could not create folder",
-"Error fetching URL" => "Error fetching URL",
-"Share" => "Share",
-"Delete" => "Delete",
-"Disconnect storage" => "Disconnect storage",
-"Unshare" => "Unshare",
-"Delete permanently" => "Delete permanently",
-"Rename" => "Rename",
-"Pending" => "Pending",
-"Error moving file." => "Error moving file.",
-"Error moving file" => "Error moving file",
-"Error" => "Error",
-"Could not rename file" => "Could not rename file",
-"Error deleting file." => "Error deleting file.",
-"Name" => "Name",
-"Size" => "Size",
-"Modified" => "Modified",
-"_%n folder_::_%n folders_" => array("%n folder","%n folders"),
-"_%n file_::_%n files_" => array("%n file","%n 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_" => array("Uploading %n file","Uploading %n files"),
-"\"{name}\" is an invalid file name." => "\"{name}\" is an invalid file name.",
-"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}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files.",
-"{dirs} and {files}" => "{dirs} and {files}",
-"%s could not be renamed as it has been deleted" => "%s could not be renamed as it has been deleted",
-"%s could not be renamed" => "%s could not be renamed",
-"Upload (max. %s)" => "Upload (max. %s)",
-"File handling" => "File handling",
-"Maximum upload size" => "Maximum upload size",
-"max. possible: " => "max. possible: ",
-"Save" => "Save",
-"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",
-"From link" => "From link",
-"Nothing in here. Upload something!" => "Nothing in here. Upload something!",
-"Download" => "Download",
-"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.",
-"Currently scanning" => "Currently scanning"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/en_NZ.js b/apps/files/l10n/en_NZ.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/en_NZ.js
@@ -0,0 +1,8 @@
+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/en_NZ.json b/apps/files/l10n/en_NZ.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/en_NZ.json
@@ -0,0 +1,6 @@
+{ "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/en_NZ.php b/apps/files/l10n/en_NZ.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/en_NZ.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eo.js b/apps/files/l10n/eo.js
new file mode 100644
index 00000000000..43acaae6ba4
--- /dev/null
+++ b/apps/files/l10n/eo.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Nekonata eraro",
+    "Could not move %s - File with this name already exists" : "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
+    "Could not move %s" : "Ne eblis movi %s",
+    "File name cannot be empty." : "Dosiernomo devas ne malpleni.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "La nomo %s jam uziĝas en la dosierujo %s. Bonvolu elekti malsaman nomon.",
+    "Not a valid source" : "Nevalida fonto",
+    "Error while downloading %s to %s" : "Eraris elŝuto de %s al %s",
+    "Error when creating the file" : "Eraris la kreo de la dosiero",
+    "Folder name cannot be empty." : "La dosierujnomo ne povas malpleni.",
+    "Error when creating the folder" : "Eraris la kreo de la dosierujo",
+    "Unable to set upload directory." : "Ne povis agordiĝi la alŝuta dosierujo.",
+    "No file was uploaded. Unknown error" : "Neniu dosiero alŝutiĝis. Nekonata eraro.",
+    "There is no error, the file uploaded with success" : "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
+    "The uploaded file was only partially uploaded" : "la alŝutita dosiero nur parte alŝutiĝis",
+    "No file was uploaded" : "Neniu dosiero alŝutiĝis.",
+    "Missing a temporary folder" : "Mankas provizora dosierujo.",
+    "Failed to write to disk" : "Malsukcesis skribo al disko",
+    "Not enough storage available" : "Ne haveblas sufiĉa memoro",
+    "Upload failed. Could not find uploaded file" : "La alŝuto malsukcesis. Ne troviĝis alŝutota dosiero.",
+    "Upload failed. Could not get file info." : "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero.",
+    "Invalid directory." : "Nevalida dosierujo.",
+    "Files" : "Dosieroj",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn",
+    "Upload cancelled." : "La alŝuto nuliĝis.",
+    "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
+    "URL cannot be empty" : "La URL ne povas malpleni",
+    "{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",
+    "Share" : "Kunhavigi",
+    "Delete" : "Forigi",
+    "Unshare" : "Malkunhavigi",
+    "Delete permanently" : "Forigi por ĉiam",
+    "Rename" : "Alinomigi",
+    "Pending" : "Traktotaj",
+    "Error moving file" : "Eraris movo de dosiero",
+    "Error" : "Eraro",
+    "Could not rename file" : "Ne povis alinomiĝi dosiero",
+    "Name" : "Nomo",
+    "Size" : "Grando",
+    "Modified" : "Modifita",
+    "_%n folder_::_%n folders_" : ["%n dosierujo","%n dosierujoj"],
+    "_%n file_::_%n files_" : ["%n dosiero","%n dosieroj"],
+    "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"],
+    "Your storage is full, files can not be updated or synced anymore!" : "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
+    "{dirs} and {files}" : "{dirs} kaj {files}",
+    "%s could not be renamed" : "%s ne povis alinomiĝi",
+    "Upload (max. %s)" : "Alŝuti (maks. %s)",
+    "File handling" : "Dosieradministro",
+    "Maximum upload size" : "Maksimuma alŝutogrando",
+    "max. possible: " : "maks. ebla: ",
+    "Save" : "Konservi",
+    "WebDAV" : "WebDAV",
+    "New" : "Nova",
+    "Text file" : "Tekstodosiero",
+    "New folder" : "Nova dosierujo",
+    "Folder" : "Dosierujo",
+    "From link" : "El ligilo",
+    "Nothing in here. Upload something!" : "Nenio estas ĉi tie. Alŝutu ion!",
+    "Download" : "Elŝuti",
+    "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."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/eo.json b/apps/files/l10n/eo.json
new file mode 100644
index 00000000000..96338a90c11
--- /dev/null
+++ b/apps/files/l10n/eo.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Unknown error" : "Nekonata eraro",
+    "Could not move %s - File with this name already exists" : "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
+    "Could not move %s" : "Ne eblis movi %s",
+    "File name cannot be empty." : "Dosiernomo devas ne malpleni.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "La nomo %s jam uziĝas en la dosierujo %s. Bonvolu elekti malsaman nomon.",
+    "Not a valid source" : "Nevalida fonto",
+    "Error while downloading %s to %s" : "Eraris elŝuto de %s al %s",
+    "Error when creating the file" : "Eraris la kreo de la dosiero",
+    "Folder name cannot be empty." : "La dosierujnomo ne povas malpleni.",
+    "Error when creating the folder" : "Eraris la kreo de la dosierujo",
+    "Unable to set upload directory." : "Ne povis agordiĝi la alŝuta dosierujo.",
+    "No file was uploaded. Unknown error" : "Neniu dosiero alŝutiĝis. Nekonata eraro.",
+    "There is no error, the file uploaded with success" : "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
+    "The uploaded file was only partially uploaded" : "la alŝutita dosiero nur parte alŝutiĝis",
+    "No file was uploaded" : "Neniu dosiero alŝutiĝis.",
+    "Missing a temporary folder" : "Mankas provizora dosierujo.",
+    "Failed to write to disk" : "Malsukcesis skribo al disko",
+    "Not enough storage available" : "Ne haveblas sufiĉa memoro",
+    "Upload failed. Could not find uploaded file" : "La alŝuto malsukcesis. Ne troviĝis alŝutota dosiero.",
+    "Upload failed. Could not get file info." : "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero.",
+    "Invalid directory." : "Nevalida dosierujo.",
+    "Files" : "Dosieroj",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn",
+    "Upload cancelled." : "La alŝuto nuliĝis.",
+    "Could not get result from server." : "Ne povis ekhaviĝi rezulto el la servilo.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
+    "URL cannot be empty" : "La URL ne povas malpleni",
+    "{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",
+    "Share" : "Kunhavigi",
+    "Delete" : "Forigi",
+    "Unshare" : "Malkunhavigi",
+    "Delete permanently" : "Forigi por ĉiam",
+    "Rename" : "Alinomigi",
+    "Pending" : "Traktotaj",
+    "Error moving file" : "Eraris movo de dosiero",
+    "Error" : "Eraro",
+    "Could not rename file" : "Ne povis alinomiĝi dosiero",
+    "Name" : "Nomo",
+    "Size" : "Grando",
+    "Modified" : "Modifita",
+    "_%n folder_::_%n folders_" : ["%n dosierujo","%n dosierujoj"],
+    "_%n file_::_%n files_" : ["%n dosiero","%n dosieroj"],
+    "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"],
+    "Your storage is full, files can not be updated or synced anymore!" : "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
+    "{dirs} and {files}" : "{dirs} kaj {files}",
+    "%s could not be renamed" : "%s ne povis alinomiĝi",
+    "Upload (max. %s)" : "Alŝuti (maks. %s)",
+    "File handling" : "Dosieradministro",
+    "Maximum upload size" : "Maksimuma alŝutogrando",
+    "max. possible: " : "maks. ebla: ",
+    "Save" : "Konservi",
+    "WebDAV" : "WebDAV",
+    "New" : "Nova",
+    "Text file" : "Tekstodosiero",
+    "New folder" : "Nova dosierujo",
+    "Folder" : "Dosierujo",
+    "From link" : "El ligilo",
+    "Nothing in here. Upload something!" : "Nenio estas ĉi tie. Alŝutu ion!",
+    "Download" : "Elŝuti",
+    "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."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
deleted file mode 100644
index e8538e47acf..00000000000
--- a/apps/files/l10n/eo.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Nekonata eraro",
-"Could not move %s - File with this name already exists" => "Ne eblis movi %s: dosiero kun ĉi tiu nomo jam ekzistas",
-"Could not move %s" => "Ne eblis movi %s",
-"File name cannot be empty." => "Dosiernomo devas ne malpleni.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
-"The name %s is already used in the folder %s. Please choose a different name." => "La nomo %s jam uziĝas en la dosierujo %s. Bonvolu elekti malsaman nomon.",
-"Not a valid source" => "Nevalida fonto",
-"Error while downloading %s to %s" => "Eraris elŝuto de %s al %s",
-"Error when creating the file" => "Eraris la kreo de la dosiero",
-"Folder name cannot be empty." => "La dosierujnomo ne povas malpleni.",
-"Error when creating the folder" => "Eraris la kreo de la dosierujo",
-"Unable to set upload directory." => "Ne povis agordiĝi la alŝuta dosierujo.",
-"No file was uploaded. Unknown error" => "Neniu dosiero alŝutiĝis. Nekonata eraro.",
-"There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
-"The uploaded file was only partially uploaded" => "la alŝutita dosiero nur parte alŝutiĝis",
-"No file was uploaded" => "Neniu dosiero alŝutiĝis.",
-"Missing a temporary folder" => "Mankas provizora dosierujo.",
-"Failed to write to disk" => "Malsukcesis skribo al disko",
-"Not enough storage available" => "Ne haveblas sufiĉa memoro",
-"Upload failed. Could not find uploaded file" => "La alŝuto malsukcesis. Ne troviĝis alŝutota dosiero.",
-"Upload failed. Could not get file info." => "La alŝuto malsukcesis. Ne povis ekhaviĝi informo pri dosiero.",
-"Invalid directory." => "Nevalida dosierujo.",
-"Files" => "Dosieroj",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ne povis alŝutiĝi {filename} ĉar ĝi estas dosierujo aŭ ĝi havas 0 duumokojn",
-"Upload cancelled." => "La alŝuto nuliĝis.",
-"Could not get result from server." => "Ne povis ekhaviĝi rezulto el la servilo.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
-"URL cannot be empty" => "La URL ne povas malpleni",
-"{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",
-"Share" => "Kunhavigi",
-"Delete" => "Forigi",
-"Unshare" => "Malkunhavigi",
-"Delete permanently" => "Forigi por ĉiam",
-"Rename" => "Alinomigi",
-"Pending" => "Traktotaj",
-"Error moving file" => "Eraris movo de dosiero",
-"Error" => "Eraro",
-"Could not rename file" => "Ne povis alinomiĝi dosiero",
-"Name" => "Nomo",
-"Size" => "Grando",
-"Modified" => "Modifita",
-"_%n folder_::_%n folders_" => array("%n dosierujo","%n dosierujoj"),
-"_%n file_::_%n files_" => array("%n dosiero","%n dosieroj"),
-"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_" => array("Alŝutatas %n dosiero","Alŝutatas %n dosieroj"),
-"Your storage is full, files can not be updated or synced anymore!" => "Via memoro plenas, ne plu eblas ĝisdatigi aŭ sinkronigi dosierojn!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Via memoro preskaŭ plenas ({usedSpacePercent}%)",
-"{dirs} and {files}" => "{dirs} kaj {files}",
-"%s could not be renamed" => "%s ne povis alinomiĝi",
-"Upload (max. %s)" => "Alŝuti (maks. %s)",
-"File handling" => "Dosieradministro",
-"Maximum upload size" => "Maksimuma alŝutogrando",
-"max. possible: " => "maks. ebla: ",
-"Save" => "Konservi",
-"WebDAV" => "WebDAV",
-"New" => "Nova",
-"Text file" => "Tekstodosiero",
-"New folder" => "Nova dosierujo",
-"Folder" => "Dosierujo",
-"From link" => "El ligilo",
-"Nothing in here. Upload something!" => "Nenio estas ĉi tie. Alŝutu ion!",
-"Download" => "Elŝuti",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es.js b/apps/files/l10n/es.js
new file mode 100644
index 00000000000..0e1ac9aede9
--- /dev/null
+++ b/apps/files/l10n/es.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Almacenamiento no disponible",
+    "Storage invalid" : "Almacenamiento inválido",
+    "Unknown error" : "Error desconocido",
+    "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",
+    "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
+    "\"%s\" is an invalid file name." : "\"%s\" es un nombre de archivo inválido.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
+    "The target folder has been moved or deleted." : "La carpeta 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.",
+    "Not a valid source" : "No es una fuente válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "La configuración del servidor no le permite abrir URLs, revísela.",
+    "The file exceeds your quota by %s" : "El archivo sobrepasa su cuota por %s",
+    "Error while downloading %s to %s" : "Error mientras se descargaba %s a %s",
+    "Error when creating the file" : "Error al crear el archivo",
+    "Folder name cannot be empty." : "El nombre de la carpeta no puede estar vacío.",
+    "Error when creating the folder" : "Error al crear la carpeta.",
+    "Unable to set upload directory." : "Incapaz de crear directorio de subida.",
+    "Invalid Token" : "Token Inválido",
+    "No file was uploaded. Unknown error" : "No se subió ningún archivo. Error desconocido",
+    "There is no error, the file uploaded with success" : "No hubo ningún problema, el archivo se subió con éxito",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML",
+    "The uploaded file was only partially uploaded" : "El archivo subido fue sólo subido parcialmente",
+    "No file was uploaded" : "No se subió ningún archivo",
+    "Missing a temporary folder" : "Falta la carpeta temporal",
+    "Failed to write to disk" : "Falló al escribir al disco",
+    "Not enough storage available" : "No hay suficiente espacio disponible",
+    "Upload failed. Could not find uploaded file" : "Actualización fallida. No se pudo encontrar el archivo subido",
+    "Upload failed. Could not get file info." : "Actualización fallida. No se pudo obtener información del archivo.",
+    "Invalid directory." : "Directorio inválido.",
+    "Files" : "Archivos",
+    "All files" : "Todos los archivos",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
+    "Upload cancelled." : "Subida cancelada.",
+    "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
+    "URL cannot be empty" : "La dirección URL no puede estar vacía",
+    "{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",
+    "Error fetching URL" : "Error al descargar URL.",
+    "Share" : "Compartir",
+    "Delete" : "Eliminar",
+    "Disconnect storage" : "Desconectar almacenamiento",
+    "Unshare" : "Dejar de compartir",
+    "Delete permanently" : "Eliminar permanentemente",
+    "Rename" : "Renombrar",
+    "Pending" : "Pendiente",
+    "Error moving file." : "Error al mover el archivo.",
+    "Error moving file" : "Error moviendo archivo",
+    "Error" : "Error",
+    "Could not rename file" : "No se pudo renombrar el archivo",
+    "Error deleting file." : "Error al borrar el archivo",
+    "Name" : "Nombre",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido.",
+    "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}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
+    "{dirs} and {files}" : "{dirs} y {files}",
+    "%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)",
+    "File handling" : "Administración de archivos",
+    "Maximum upload size" : "Tamaño máximo de subida",
+    "max. possible: " : "máx. posible:",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Desde enlace",
+    "Nothing in here. Upload something!" : "No hay nada aquí. ¡Suba algo!",
+    "Download" : "Descargar",
+    "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.",
+    "Currently scanning" : "Escaneando en este momento"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es.json b/apps/files/l10n/es.json
new file mode 100644
index 00000000000..5b45a869b54
--- /dev/null
+++ b/apps/files/l10n/es.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Almacenamiento no disponible",
+    "Storage invalid" : "Almacenamiento inválido",
+    "Unknown error" : "Error desconocido",
+    "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",
+    "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
+    "\"%s\" is an invalid file name." : "\"%s\" es un nombre de archivo inválido.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
+    "The target folder has been moved or deleted." : "La carpeta 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.",
+    "Not a valid source" : "No es una fuente válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "La configuración del servidor no le permite abrir URLs, revísela.",
+    "The file exceeds your quota by %s" : "El archivo sobrepasa su cuota por %s",
+    "Error while downloading %s to %s" : "Error mientras se descargaba %s a %s",
+    "Error when creating the file" : "Error al crear el archivo",
+    "Folder name cannot be empty." : "El nombre de la carpeta no puede estar vacío.",
+    "Error when creating the folder" : "Error al crear la carpeta.",
+    "Unable to set upload directory." : "Incapaz de crear directorio de subida.",
+    "Invalid Token" : "Token Inválido",
+    "No file was uploaded. Unknown error" : "No se subió ningún archivo. Error desconocido",
+    "There is no error, the file uploaded with success" : "No hubo ningún problema, el archivo se subió con éxito",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML",
+    "The uploaded file was only partially uploaded" : "El archivo subido fue sólo subido parcialmente",
+    "No file was uploaded" : "No se subió ningún archivo",
+    "Missing a temporary folder" : "Falta la carpeta temporal",
+    "Failed to write to disk" : "Falló al escribir al disco",
+    "Not enough storage available" : "No hay suficiente espacio disponible",
+    "Upload failed. Could not find uploaded file" : "Actualización fallida. No se pudo encontrar el archivo subido",
+    "Upload failed. Could not get file info." : "Actualización fallida. No se pudo obtener información del archivo.",
+    "Invalid directory." : "Directorio inválido.",
+    "Files" : "Archivos",
+    "All files" : "Todos los archivos",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "El tamaño total del archivo {size1} excede el límite {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
+    "Upload cancelled." : "Subida cancelada.",
+    "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
+    "URL cannot be empty" : "La dirección URL no puede estar vacía",
+    "{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",
+    "Error fetching URL" : "Error al descargar URL.",
+    "Share" : "Compartir",
+    "Delete" : "Eliminar",
+    "Disconnect storage" : "Desconectar almacenamiento",
+    "Unshare" : "Dejar de compartir",
+    "Delete permanently" : "Eliminar permanentemente",
+    "Rename" : "Renombrar",
+    "Pending" : "Pendiente",
+    "Error moving file." : "Error al mover el archivo.",
+    "Error moving file" : "Error moviendo archivo",
+    "Error" : "Error",
+    "Could not rename file" : "No se pudo renombrar el archivo",
+    "Error deleting file." : "Error al borrar el archivo",
+    "Name" : "Nombre",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" es un nombre de archivo inválido.",
+    "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}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
+    "{dirs} and {files}" : "{dirs} y {files}",
+    "%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)",
+    "File handling" : "Administración de archivos",
+    "Maximum upload size" : "Tamaño máximo de subida",
+    "max. possible: " : "máx. posible:",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Desde enlace",
+    "Nothing in here. Upload something!" : "No hay nada aquí. ¡Suba algo!",
+    "Download" : "Descargar",
+    "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.",
+    "Currently scanning" : "Escaneando en este momento"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
deleted file mode 100644
index fd0d55ef3e7..00000000000
--- a/apps/files/l10n/es.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Almacenamiento no disponible",
-"Storage invalid" => "Almacenamiento inválido",
-"Unknown error" => "Error desconocido",
-"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",
-"File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
-"\"%s\" is an invalid file name." => "\"%s\" es un nombre de archivo inválido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
-"The target folder has been moved or deleted." => "La carpeta 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.",
-"Not a valid source" => "No es una fuente válida",
-"Server is not allowed to open URLs, please check the server configuration" => "La configuración del servidor no le permite abrir URLs, revísela.",
-"The file exceeds your quota by %s" => "El archivo sobrepasa su cuota por %s",
-"Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
-"Error when creating the file" => "Error al crear el archivo",
-"Folder name cannot be empty." => "El nombre de la carpeta no puede estar vacío.",
-"Error when creating the folder" => "Error al crear la carpeta.",
-"Unable to set upload directory." => "Incapaz de crear directorio de subida.",
-"Invalid Token" => "Token Inválido",
-"No file was uploaded. Unknown error" => "No se subió ningún archivo. Error desconocido",
-"There is no error, the file uploaded with success" => "No hubo ningún problema, el archivo se subió con éxito",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo subido fue sólo subido parcialmente",
-"No file was uploaded" => "No se subió ningún archivo",
-"Missing a temporary folder" => "Falta la carpeta temporal",
-"Failed to write to disk" => "Falló al escribir al disco",
-"Not enough storage available" => "No hay suficiente espacio disponible",
-"Upload failed. Could not find uploaded file" => "Actualización fallida. No se pudo encontrar el archivo subido",
-"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
-"Invalid directory." => "Directorio inválido.",
-"Files" => "Archivos",
-"All files" => "Todos los archivos",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "El tamaño total del archivo {size1} excede el límite {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "No hay suficiente espacio libre. Quiere subir {size1} pero solo quedan {size2}",
-"Upload cancelled." => "Subida cancelada.",
-"Could not get result from server." => "No se pudo obtener respuesta del servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-"URL cannot be empty" => "La dirección URL no puede estar vacía",
-"{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",
-"Error fetching URL" => "Error al descargar URL.",
-"Share" => "Compartir",
-"Delete" => "Eliminar",
-"Disconnect storage" => "Desconectar almacenamiento",
-"Unshare" => "Dejar de compartir",
-"Delete permanently" => "Eliminar permanentemente",
-"Rename" => "Renombrar",
-"Pending" => "Pendiente",
-"Error moving file." => "Error al mover el archivo.",
-"Error moving file" => "Error moviendo archivo",
-"Error" => "Error",
-"Could not rename file" => "No se pudo renombrar el archivo",
-"Error deleting file." => "Error al borrar el archivo",
-"Name" => "Nombre",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
-"_%n file_::_%n files_" => array("%n archivo","%n 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_" => array("Subiendo %n archivo","Subiendo %n archivos"),
-"\"{name}\" is an invalid file name." => "\"{name}\" es un nombre de archivo inválido.",
-"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}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
-"{dirs} and {files}" => "{dirs} y {files}",
-"%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)",
-"File handling" => "Administración de archivos",
-"Maximum upload size" => "Tamaño máximo de subida",
-"max. possible: " => "máx. posible:",
-"Save" => "Guardar",
-"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",
-"From link" => "Desde enlace",
-"Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
-"Download" => "Descargar",
-"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.",
-"Currently scanning" => "Escaneando en este momento"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_AR.js b/apps/files/l10n/es_AR.js
new file mode 100644
index 00000000000..fd9f9bd05e1
--- /dev/null
+++ b/apps/files/l10n/es_AR.js
@@ -0,0 +1,82 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Error desconocido",
+    "Could not move %s - File with this name already exists" : "No se pudo mover %s - Un archivo con este nombre ya existe",
+    "Could not move %s" : "No se pudo mover %s ",
+    "File name cannot be empty." : "El nombre del archivo no puede quedar vacío.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "El nombre %s está en uso en el directorio %s. Por favor elija un otro nombre.",
+    "Not a valid source" : "No es una fuente válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "El servidor no está permitido abrir las URLs, por favor chequee la configuración del servidor",
+    "Error while downloading %s to %s" : "Error mientras se descargaba %s a %s",
+    "Error when creating the file" : "Error al crear el archivo",
+    "Folder name cannot be empty." : "El nombre del directorio no puede estar vacío.",
+    "Error when creating the folder" : "Error al crear el directorio",
+    "Unable to set upload directory." : "No fue posible crear el directorio de subida.",
+    "Invalid Token" : "Token Inválido",
+    "No file was uploaded. Unknown error" : "El archivo no fue subido. Error desconocido",
+    "There is no error, the file uploaded with success" : "No hay errores, el archivo fue subido con éxito",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML",
+    "The uploaded file was only partially uploaded" : "El archivo fue subido parcialmente",
+    "No file was uploaded" : "No se subió ningún archivo ",
+    "Missing a temporary folder" : "Falta un directorio temporal",
+    "Failed to write to disk" : "Error al escribir en el disco",
+    "Not enough storage available" : "No hay suficiente almacenamiento",
+    "Upload failed. Could not find uploaded file" : "Falló la carga. No se pudo encontrar el archivo subido.",
+    "Upload failed. Could not get file info." : "Falló la carga. No se pudo obtener la información del archivo.",
+    "Invalid directory." : "Directorio inválido.",
+    "Files" : "Archivos",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.",
+    "Upload cancelled." : "La subida fue cancelada",
+    "Could not get result from server." : "No se pudo obtener resultados del servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
+    "URL cannot be empty" : "La URL no puede estar vacía",
+    "{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",
+    "Error fetching URL" : "Error al obtener la URL",
+    "Share" : "Compartir",
+    "Delete" : "Borrar",
+    "Unshare" : "Dejar de compartir",
+    "Delete permanently" : "Borrar permanentemente",
+    "Rename" : "Cambiar nombre",
+    "Pending" : "Pendientes",
+    "Error moving file" : "Error moviendo el archivo",
+    "Error" : "Error",
+    "Could not rename file" : "No se pudo renombrar el archivo",
+    "Error deleting file." : "Error al borrar el archivo.",
+    "Name" : "Nombre",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "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"],
+    "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}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
+    "{dirs} and {files}" : "{carpetas} y {archivos}",
+    "%s could not be renamed" : "No se pudo renombrar %s",
+    "File handling" : "Tratamiento de archivos",
+    "Maximum upload size" : "Tamaño máximo de subida",
+    "max. possible: " : "máx. posible:",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Desde enlace",
+    "Nothing in here. Upload something!" : "No hay nada. ¡Subí contenido!",
+    "Download" : "Descargar",
+    "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á."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_AR.json b/apps/files/l10n/es_AR.json
new file mode 100644
index 00000000000..aa701390e68
--- /dev/null
+++ b/apps/files/l10n/es_AR.json
@@ -0,0 +1,80 @@
+{ "translations": {
+    "Unknown error" : "Error desconocido",
+    "Could not move %s - File with this name already exists" : "No se pudo mover %s - Un archivo con este nombre ya existe",
+    "Could not move %s" : "No se pudo mover %s ",
+    "File name cannot be empty." : "El nombre del archivo no puede quedar vacío.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "El nombre %s está en uso en el directorio %s. Por favor elija un otro nombre.",
+    "Not a valid source" : "No es una fuente válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "El servidor no está permitido abrir las URLs, por favor chequee la configuración del servidor",
+    "Error while downloading %s to %s" : "Error mientras se descargaba %s a %s",
+    "Error when creating the file" : "Error al crear el archivo",
+    "Folder name cannot be empty." : "El nombre del directorio no puede estar vacío.",
+    "Error when creating the folder" : "Error al crear el directorio",
+    "Unable to set upload directory." : "No fue posible crear el directorio de subida.",
+    "Invalid Token" : "Token Inválido",
+    "No file was uploaded. Unknown error" : "El archivo no fue subido. Error desconocido",
+    "There is no error, the file uploaded with success" : "No hay errores, el archivo fue subido con éxito",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML",
+    "The uploaded file was only partially uploaded" : "El archivo fue subido parcialmente",
+    "No file was uploaded" : "No se subió ningún archivo ",
+    "Missing a temporary folder" : "Falta un directorio temporal",
+    "Failed to write to disk" : "Error al escribir en el disco",
+    "Not enough storage available" : "No hay suficiente almacenamiento",
+    "Upload failed. Could not find uploaded file" : "Falló la carga. No se pudo encontrar el archivo subido.",
+    "Upload failed. Could not get file info." : "Falló la carga. No se pudo obtener la información del archivo.",
+    "Invalid directory." : "Directorio inválido.",
+    "Files" : "Archivos",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.",
+    "Upload cancelled." : "La subida fue cancelada",
+    "Could not get result from server." : "No se pudo obtener resultados del servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
+    "URL cannot be empty" : "La URL no puede estar vacía",
+    "{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",
+    "Error fetching URL" : "Error al obtener la URL",
+    "Share" : "Compartir",
+    "Delete" : "Borrar",
+    "Unshare" : "Dejar de compartir",
+    "Delete permanently" : "Borrar permanentemente",
+    "Rename" : "Cambiar nombre",
+    "Pending" : "Pendientes",
+    "Error moving file" : "Error moviendo el archivo",
+    "Error" : "Error",
+    "Could not rename file" : "No se pudo renombrar el archivo",
+    "Error deleting file." : "Error al borrar el archivo.",
+    "Name" : "Nombre",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "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"],
+    "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}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
+    "{dirs} and {files}" : "{carpetas} y {archivos}",
+    "%s could not be renamed" : "No se pudo renombrar %s",
+    "File handling" : "Tratamiento de archivos",
+    "Maximum upload size" : "Tamaño máximo de subida",
+    "max. possible: " : "máx. posible:",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Desde enlace",
+    "Nothing in here. Upload something!" : "No hay nada. ¡Subí contenido!",
+    "Download" : "Descargar",
+    "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á."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/es_AR.php b/apps/files/l10n/es_AR.php
deleted file mode 100644
index 8b9fe78791e..00000000000
--- a/apps/files/l10n/es_AR.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error desconocido",
-"Could not move %s - File with this name already exists" => "No se pudo mover %s - Un archivo con este nombre ya existe",
-"Could not move %s" => "No se pudo mover %s ",
-"File name cannot be empty." => "El nombre del archivo no puede quedar vacío.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre invalido, '\\', '/', '<', '>', ':', '\"', '|', '?' y '*' no están permitidos.",
-"The name %s is already used in the folder %s. Please choose a different name." => "El nombre %s está en uso en el directorio %s. Por favor elija un otro nombre.",
-"Not a valid source" => "No es una fuente válida",
-"Server is not allowed to open URLs, please check the server configuration" => "El servidor no está permitido abrir las URLs, por favor chequee la configuración del servidor",
-"Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
-"Error when creating the file" => "Error al crear el archivo",
-"Folder name cannot be empty." => "El nombre del directorio no puede estar vacío.",
-"Error when creating the folder" => "Error al crear el directorio",
-"Unable to set upload directory." => "No fue posible crear el directorio de subida.",
-"Invalid Token" => "Token Inválido",
-"No file was uploaded. Unknown error" => "El archivo no fue subido. Error desconocido",
-"There is no error, the file uploaded with success" => "No hay errores, el archivo fue subido con éxito",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo que intentás subir excede el tamaño definido por upload_max_filesize en el php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa el valor MAX_FILE_SIZE especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo fue subido parcialmente",
-"No file was uploaded" => "No se subió ningún archivo ",
-"Missing a temporary folder" => "Falta un directorio temporal",
-"Failed to write to disk" => "Error al escribir en el disco",
-"Not enough storage available" => "No hay suficiente almacenamiento",
-"Upload failed. Could not find uploaded file" => "Falló la carga. No se pudo encontrar el archivo subido.",
-"Upload failed. Could not get file info." => "Falló la carga. No se pudo obtener la información del archivo.",
-"Invalid directory." => "Directorio inválido.",
-"Files" => "Archivos",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Imposible cargar {filename} puesto que es un directoro o tiene 0 bytes.",
-"Upload cancelled." => "La subida fue cancelada",
-"Could not get result from server." => "No se pudo obtener resultados del servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si salís de la página ahora, la subida se cancelará.",
-"URL cannot be empty" => "La URL no puede estar vacía",
-"{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",
-"Error fetching URL" => "Error al obtener la URL",
-"Share" => "Compartir",
-"Delete" => "Borrar",
-"Unshare" => "Dejar de compartir",
-"Delete permanently" => "Borrar permanentemente",
-"Rename" => "Cambiar nombre",
-"Pending" => "Pendientes",
-"Error moving file" => "Error moviendo el archivo",
-"Error" => "Error",
-"Could not rename file" => "No se pudo renombrar el archivo",
-"Error deleting file." => "Error al borrar el archivo.",
-"Name" => "Nombre",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
-"_%n file_::_%n files_" => array("%n archivo","%n 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_" => array("Subiendo %n archivo","Subiendo %n archivos"),
-"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}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El proceso de cifrado se ha desactivado, pero los archivos aún están encriptados. Por favor, vaya a la configuración personal para descifrar los archivos.",
-"{dirs} and {files}" => "{carpetas} y {archivos}",
-"%s could not be renamed" => "No se pudo renombrar %s",
-"File handling" => "Tratamiento de archivos",
-"Maximum upload size" => "Tamaño máximo de subida",
-"max. possible: " => "máx. posible:",
-"Save" => "Guardar",
-"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",
-"From link" => "Desde enlace",
-"Nothing in here. Upload something!" => "No hay nada. ¡Subí contenido!",
-"Download" => "Descargar",
-"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á."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_BO.js b/apps/files/l10n/es_BO.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/es_BO.js
@@ -0,0 +1,8 @@
+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/es_BO.json b/apps/files/l10n/es_BO.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/es_BO.json
@@ -0,0 +1,6 @@
+{ "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/es_BO.php b/apps/files/l10n/es_BO.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/es_BO.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_CL.js b/apps/files/l10n/es_CL.js
new file mode 100644
index 00000000000..7a6f60c2961
--- /dev/null
+++ b/apps/files/l10n/es_CL.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Error desconocido",
+    "Files" : "Archivos",
+    "Share" : "Compartir",
+    "Rename" : "Renombrar",
+    "Error" : "Error",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "New folder" : "Nuevo directorio",
+    "Download" : "Descargar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_CL.json b/apps/files/l10n/es_CL.json
new file mode 100644
index 00000000000..bb2cd206077
--- /dev/null
+++ b/apps/files/l10n/es_CL.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Unknown error" : "Error desconocido",
+    "Files" : "Archivos",
+    "Share" : "Compartir",
+    "Rename" : "Renombrar",
+    "Error" : "Error",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "New folder" : "Nuevo directorio",
+    "Download" : "Descargar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/es_CL.php b/apps/files/l10n/es_CL.php
deleted file mode 100644
index c92170830cc..00000000000
--- a/apps/files/l10n/es_CL.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error desconocido",
-"Files" => "Archivos",
-"Share" => "Compartir",
-"Rename" => "Renombrar",
-"Error" => "Error",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"New folder" => "Nuevo directorio",
-"Download" => "Descargar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_CO.js b/apps/files/l10n/es_CO.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/es_CO.js
@@ -0,0 +1,8 @@
+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/es_CO.json b/apps/files/l10n/es_CO.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/es_CO.json
@@ -0,0 +1,6 @@
+{ "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/es_CO.php b/apps/files/l10n/es_CO.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/es_CO.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_CR.js b/apps/files/l10n/es_CR.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/es_CR.js
@@ -0,0 +1,8 @@
+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/es_CR.json b/apps/files/l10n/es_CR.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/es_CR.json
@@ -0,0 +1,6 @@
+{ "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/es_CR.php b/apps/files/l10n/es_CR.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/es_CR.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_EC.js b/apps/files/l10n/es_EC.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/es_EC.js
@@ -0,0 +1,8 @@
+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/es_EC.json b/apps/files/l10n/es_EC.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/es_EC.json
@@ -0,0 +1,6 @@
+{ "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/es_EC.php b/apps/files/l10n/es_EC.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/es_EC.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_MX.js b/apps/files/l10n/es_MX.js
new file mode 100644
index 00000000000..9d353e84a25
--- /dev/null
+++ b/apps/files/l10n/es_MX.js
@@ -0,0 +1,82 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Error desconocido",
+    "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",
+    "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
+    "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.",
+    "Not a valid source" : "No es un origen válido",
+    "Server is not allowed to open URLs, please check the server configuration" : "El servidor no puede acceder URLs; revise la configuración del servidor.",
+    "Error while downloading %s to %s" : "Error mientras se descargaba %s a %s",
+    "Error when creating the file" : "Error al crear el archivo",
+    "Folder name cannot be empty." : "El nombre de la carpeta no puede estar vacío.",
+    "Error when creating the folder" : "Error al crear la carpeta.",
+    "Unable to set upload directory." : "Incapaz de crear directorio de subida.",
+    "Invalid Token" : "Token Inválido",
+    "No file was uploaded. Unknown error" : "No se subió ningún archivo. Error desconocido",
+    "There is no error, the file uploaded with success" : "No hubo ningún problema, el archivo se subió con éxito",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML",
+    "The uploaded file was only partially uploaded" : "El archivo subido fue sólo subido parcialmente",
+    "No file was uploaded" : "No se subió ningún archivo",
+    "Missing a temporary folder" : "Falta la carpeta temporal",
+    "Failed to write to disk" : "Falló al escribir al disco",
+    "Not enough storage available" : "No hay suficiente espacio disponible",
+    "Upload failed. Could not find uploaded file" : "Actualización fallida. No se pudo encontrar el archivo subido",
+    "Upload failed. Could not get file info." : "Actualización fallida. No se pudo obtener información del archivo.",
+    "Invalid directory." : "Directorio inválido.",
+    "Files" : "Archivos",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
+    "Upload cancelled." : "Subida cancelada.",
+    "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
+    "URL cannot be empty" : "La dirección URL no puede estar vacía",
+    "{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",
+    "Error fetching URL" : "Error al descargar URL.",
+    "Share" : "Compartir",
+    "Delete" : "Eliminar",
+    "Unshare" : "Dejar de compartir",
+    "Delete permanently" : "Eliminar permanentemente",
+    "Rename" : "Renombrar",
+    "Pending" : "Pendiente",
+    "Error moving file" : "Error moviendo archivo",
+    "Error" : "Error",
+    "Could not rename file" : "No se pudo renombrar el archivo",
+    "Error deleting file." : "Error borrando el archivo.",
+    "Name" : "Nombre",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "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"],
+    "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}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
+    "{dirs} and {files}" : "{dirs} y {files}",
+    "%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",
+    "max. possible: " : "máx. posible:",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Desde enlace",
+    "Nothing in here. Upload something!" : "No hay nada aquí. ¡Suba algo!",
+    "Download" : "Descargar",
+    "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."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/es_MX.json b/apps/files/l10n/es_MX.json
new file mode 100644
index 00000000000..f08223b70c7
--- /dev/null
+++ b/apps/files/l10n/es_MX.json
@@ -0,0 +1,80 @@
+{ "translations": {
+    "Unknown error" : "Error desconocido",
+    "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",
+    "File name cannot be empty." : "El nombre de archivo no puede estar vacío.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
+    "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.",
+    "Not a valid source" : "No es un origen válido",
+    "Server is not allowed to open URLs, please check the server configuration" : "El servidor no puede acceder URLs; revise la configuración del servidor.",
+    "Error while downloading %s to %s" : "Error mientras se descargaba %s a %s",
+    "Error when creating the file" : "Error al crear el archivo",
+    "Folder name cannot be empty." : "El nombre de la carpeta no puede estar vacío.",
+    "Error when creating the folder" : "Error al crear la carpeta.",
+    "Unable to set upload directory." : "Incapaz de crear directorio de subida.",
+    "Invalid Token" : "Token Inválido",
+    "No file was uploaded. Unknown error" : "No se subió ningún archivo. Error desconocido",
+    "There is no error, the file uploaded with success" : "No hubo ningún problema, el archivo se subió con éxito",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML",
+    "The uploaded file was only partially uploaded" : "El archivo subido fue sólo subido parcialmente",
+    "No file was uploaded" : "No se subió ningún archivo",
+    "Missing a temporary folder" : "Falta la carpeta temporal",
+    "Failed to write to disk" : "Falló al escribir al disco",
+    "Not enough storage available" : "No hay suficiente espacio disponible",
+    "Upload failed. Could not find uploaded file" : "Actualización fallida. No se pudo encontrar el archivo subido",
+    "Upload failed. Could not get file info." : "Actualización fallida. No se pudo obtener información del archivo.",
+    "Invalid directory." : "Directorio inválido.",
+    "Files" : "Archivos",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
+    "Upload cancelled." : "Subida cancelada.",
+    "Could not get result from server." : "No se pudo obtener respuesta del servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
+    "URL cannot be empty" : "La dirección URL no puede estar vacía",
+    "{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",
+    "Error fetching URL" : "Error al descargar URL.",
+    "Share" : "Compartir",
+    "Delete" : "Eliminar",
+    "Unshare" : "Dejar de compartir",
+    "Delete permanently" : "Eliminar permanentemente",
+    "Rename" : "Renombrar",
+    "Pending" : "Pendiente",
+    "Error moving file" : "Error moviendo archivo",
+    "Error" : "Error",
+    "Could not rename file" : "No se pudo renombrar el archivo",
+    "Error deleting file." : "Error borrando el archivo.",
+    "Name" : "Nombre",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n carpeta","%n carpetas"],
+    "_%n file_::_%n files_" : ["%n archivo","%n archivos"],
+    "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"],
+    "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}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
+    "{dirs} and {files}" : "{dirs} y {files}",
+    "%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",
+    "max. possible: " : "máx. posible:",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Desde enlace",
+    "Nothing in here. Upload something!" : "No hay nada aquí. ¡Suba algo!",
+    "Download" : "Descargar",
+    "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."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/es_MX.php b/apps/files/l10n/es_MX.php
deleted file mode 100644
index d11bc4301df..00000000000
--- a/apps/files/l10n/es_MX.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error desconocido",
-"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",
-"File name cannot be empty." => "El nombre de archivo no puede estar vacío.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nombre inválido, los caracteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" no están permitidos ",
-"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.",
-"Not a valid source" => "No es un origen válido",
-"Server is not allowed to open URLs, please check the server configuration" => "El servidor no puede acceder URLs; revise la configuración del servidor.",
-"Error while downloading %s to %s" => "Error mientras se descargaba %s a %s",
-"Error when creating the file" => "Error al crear el archivo",
-"Folder name cannot be empty." => "El nombre de la carpeta no puede estar vacío.",
-"Error when creating the folder" => "Error al crear la carpeta.",
-"Unable to set upload directory." => "Incapaz de crear directorio de subida.",
-"Invalid Token" => "Token Inválido",
-"No file was uploaded. Unknown error" => "No se subió ningún archivo. Error desconocido",
-"There is no error, the file uploaded with success" => "No hubo ningún problema, el archivo se subió con éxito",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "El archivo subido sobrepasa la directiva 'upload_max_filesize' en php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva 'MAX_FILE_SIZE' especificada en el formulario HTML",
-"The uploaded file was only partially uploaded" => "El archivo subido fue sólo subido parcialmente",
-"No file was uploaded" => "No se subió ningún archivo",
-"Missing a temporary folder" => "Falta la carpeta temporal",
-"Failed to write to disk" => "Falló al escribir al disco",
-"Not enough storage available" => "No hay suficiente espacio disponible",
-"Upload failed. Could not find uploaded file" => "Actualización fallida. No se pudo encontrar el archivo subido",
-"Upload failed. Could not get file info." => "Actualización fallida. No se pudo obtener información del archivo.",
-"Invalid directory." => "Directorio inválido.",
-"Files" => "Archivos",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "No ha sido posible subir {filename} porque es un directorio o tiene 0 bytes",
-"Upload cancelled." => "Subida cancelada.",
-"Could not get result from server." => "No se pudo obtener respuesta del servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Si sale de la página ahora, la subida será cancelada.",
-"URL cannot be empty" => "La dirección URL no puede estar vacía",
-"{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",
-"Error fetching URL" => "Error al descargar URL.",
-"Share" => "Compartir",
-"Delete" => "Eliminar",
-"Unshare" => "Dejar de compartir",
-"Delete permanently" => "Eliminar permanentemente",
-"Rename" => "Renombrar",
-"Pending" => "Pendiente",
-"Error moving file" => "Error moviendo archivo",
-"Error" => "Error",
-"Could not rename file" => "No se pudo renombrar el archivo",
-"Error deleting file." => "Error borrando el archivo.",
-"Name" => "Nombre",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("%n carpeta","%n carpetas"),
-"_%n file_::_%n files_" => array("%n archivo","%n 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_" => array("Subiendo %n archivo","Subiendo %n archivos"),
-"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}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "El cifrado ha sido deshabilitado pero tus archivos permanecen cifrados. Por favor, ve a tus ajustes personales para descifrar tus archivos.",
-"{dirs} and {files}" => "{dirs} y {files}",
-"%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",
-"max. possible: " => "máx. posible:",
-"Save" => "Guardar",
-"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",
-"From link" => "Desde enlace",
-"Nothing in here. Upload something!" => "No hay nada aquí. ¡Suba algo!",
-"Download" => "Descargar",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_PE.js b/apps/files/l10n/es_PE.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/es_PE.js
@@ -0,0 +1,8 @@
+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/es_PE.json b/apps/files/l10n/es_PE.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/es_PE.json
@@ -0,0 +1,6 @@
+{ "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/es_PE.php b/apps/files/l10n/es_PE.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/es_PE.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_PY.js b/apps/files/l10n/es_PY.js
new file mode 100644
index 00000000000..8a7f665016d
--- /dev/null
+++ b/apps/files/l10n/es_PY.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files",
+    {
+    "Files" : "Archivos",
+    "_%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/es_PY.json b/apps/files/l10n/es_PY.json
new file mode 100644
index 00000000000..85d1fa4e4c0
--- /dev/null
+++ b/apps/files/l10n/es_PY.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Files" : "Archivos",
+    "_%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/es_PY.php b/apps/files/l10n/es_PY.php
deleted file mode 100644
index f3def68c0bf..00000000000
--- a/apps/files/l10n/es_PY.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Files" => "Archivos",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_US.js b/apps/files/l10n/es_US.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/es_US.js
@@ -0,0 +1,8 @@
+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/es_US.json b/apps/files/l10n/es_US.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/es_US.json
@@ -0,0 +1,6 @@
+{ "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/es_US.php b/apps/files/l10n/es_US.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/es_US.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/es_UY.js b/apps/files/l10n/es_UY.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/es_UY.js
@@ -0,0 +1,8 @@
+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/es_UY.json b/apps/files/l10n/es_UY.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/es_UY.json
@@ -0,0 +1,6 @@
+{ "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/es_UY.php b/apps/files/l10n/es_UY.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/es_UY.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/et_EE.js b/apps/files/l10n/et_EE.js
new file mode 100644
index 00000000000..0ffbb81f63c
--- /dev/null
+++ b/apps/files/l10n/et_EE.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Andmehoidla pole saadaval",
+    "Storage invalid" : "Vigane andmehoidla",
+    "Unknown error" : "Tundmatu viga",
+    "Could not move %s - File with this name already exists" : "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
+    "Could not move %s" : "%s liigutamine ebaõnnestus",
+    "Permission denied" : "Ligipääs keelatud",
+    "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
+    "\"%s\" is an invalid file name." : "\"%s\" on vigane failinimi.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
+    "The target folder has been moved or deleted." : "Sihtkataloog on ümber tõstetud või kustutatud.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Nimi %s on juba kasutusel kataloogis %s. Palun vali mõni teine nimi.",
+    "Not a valid source" : "Pole korrektne lähteallikas",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server ei võimalda URL-ide avamist, palun kontrolli serveri seadistust",
+    "The file exceeds your quota by %s" : "Fail ületab sinu limiidi: %s",
+    "Error while downloading %s to %s" : "Viga %s allalaadimisel %s",
+    "Error when creating the file" : "Viga faili loomisel",
+    "Folder name cannot be empty." : "Kataloogi nimi ei saa olla tühi.",
+    "Error when creating the folder" : "Viga kataloogi loomisel",
+    "Unable to set upload directory." : "Üleslaadimiste kausta määramine ebaõnnestus.",
+    "Invalid Token" : "Vigane kontrollkood",
+    "No file was uploaded. Unknown error" : "Ühtegi faili ei laetud üles. Tundmatu viga",
+    "There is no error, the file uploaded with success" : "Ühtegi tõrget polnud, fail on üles laetud",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
+    "The uploaded file was only partially uploaded" : "Fail laeti üles ainult osaliselt",
+    "No file was uploaded" : "Ühtegi faili ei laetud üles",
+    "Missing a temporary folder" : "Ajutiste failide kaust puudub",
+    "Failed to write to disk" : "Kettale kirjutamine ebaõnnestus",
+    "Not enough storage available" : "Saadaval pole piisavalt ruumi",
+    "Upload failed. Could not find uploaded file" : "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud",
+    "Upload failed. Could not get file info." : "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
+    "Invalid directory." : "Vigane kaust.",
+    "Files" : "Failid",
+    "All files" : "Kõik failid",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
+    "Total file size {size1} exceeds upload limit {size2}" : "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
+    "Upload cancelled." : "Üleslaadimine tühistati.",
+    "Could not get result from server." : "Serverist ei saadud tulemusi",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
+    "URL cannot be empty" : "URL ei saa olla tühi",
+    "{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",
+    "Error fetching URL" : "Viga URL-i haaramisel",
+    "Share" : "Jaga",
+    "Delete" : "Kustuta",
+    "Disconnect storage" : "Ühenda andmehoidla lahti.",
+    "Unshare" : "Lõpeta jagamine",
+    "Delete permanently" : "Kustuta jäädavalt",
+    "Rename" : "Nimeta ümber",
+    "Pending" : "Ootel",
+    "Error moving file." : "Viga faili liigutamisel.",
+    "Error moving file" : "Viga faili eemaldamisel",
+    "Error" : "Viga",
+    "Could not rename file" : "Ei suuda faili ümber nimetada",
+    "Error deleting file." : "Viga faili kustutamisel.",
+    "Name" : "Nimi",
+    "Size" : "Suurus",
+    "Modified" : "Muudetud",
+    "_%n folder_::_%n folders_" : ["%n kataloog","%n kataloogi"],
+    "_%n file_::_%n files_" : ["%n fail","%n faili"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" on vigane failinimi.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
+    "{dirs} and {files}" : "{dirs} ja {files}",
+    "%s could not be renamed as it has been deleted" : "%s ei saa ümber nimetada, kuna see on kustutatud",
+    "%s could not be renamed" : "%s ümbernimetamine ebaõnnestus",
+    "Upload (max. %s)" : "Üleslaadimine (max. %s)",
+    "File handling" : "Failide käsitlemine",
+    "Maximum upload size" : "Maksimaalne üleslaadimise suurus",
+    "max. possible: " : "maks. võimalik: ",
+    "Save" : "Salvesta",
+    "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",
+    "From link" : "Allikast",
+    "Nothing in here. Upload something!" : "Siin pole midagi. Lae midagi üles!",
+    "Download" : "Lae alla",
+    "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.",
+    "Currently scanning" : "Praegu skännimisel"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/et_EE.json b/apps/files/l10n/et_EE.json
new file mode 100644
index 00000000000..fdb5bdcb4f2
--- /dev/null
+++ b/apps/files/l10n/et_EE.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Andmehoidla pole saadaval",
+    "Storage invalid" : "Vigane andmehoidla",
+    "Unknown error" : "Tundmatu viga",
+    "Could not move %s - File with this name already exists" : "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
+    "Could not move %s" : "%s liigutamine ebaõnnestus",
+    "Permission denied" : "Ligipääs keelatud",
+    "File name cannot be empty." : "Faili nimi ei saa olla tühi.",
+    "\"%s\" is an invalid file name." : "\"%s\" on vigane failinimi.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
+    "The target folder has been moved or deleted." : "Sihtkataloog on ümber tõstetud või kustutatud.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Nimi %s on juba kasutusel kataloogis %s. Palun vali mõni teine nimi.",
+    "Not a valid source" : "Pole korrektne lähteallikas",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server ei võimalda URL-ide avamist, palun kontrolli serveri seadistust",
+    "The file exceeds your quota by %s" : "Fail ületab sinu limiidi: %s",
+    "Error while downloading %s to %s" : "Viga %s allalaadimisel %s",
+    "Error when creating the file" : "Viga faili loomisel",
+    "Folder name cannot be empty." : "Kataloogi nimi ei saa olla tühi.",
+    "Error when creating the folder" : "Viga kataloogi loomisel",
+    "Unable to set upload directory." : "Üleslaadimiste kausta määramine ebaõnnestus.",
+    "Invalid Token" : "Vigane kontrollkood",
+    "No file was uploaded. Unknown error" : "Ühtegi faili ei laetud üles. Tundmatu viga",
+    "There is no error, the file uploaded with success" : "Ühtegi tõrget polnud, fail on üles laetud",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
+    "The uploaded file was only partially uploaded" : "Fail laeti üles ainult osaliselt",
+    "No file was uploaded" : "Ühtegi faili ei laetud üles",
+    "Missing a temporary folder" : "Ajutiste failide kaust puudub",
+    "Failed to write to disk" : "Kettale kirjutamine ebaõnnestus",
+    "Not enough storage available" : "Saadaval pole piisavalt ruumi",
+    "Upload failed. Could not find uploaded file" : "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud",
+    "Upload failed. Could not get file info." : "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
+    "Invalid directory." : "Vigane kaust.",
+    "Files" : "Failid",
+    "All files" : "Kõik failid",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
+    "Total file size {size1} exceeds upload limit {size2}" : "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
+    "Upload cancelled." : "Üleslaadimine tühistati.",
+    "Could not get result from server." : "Serverist ei saadud tulemusi",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
+    "URL cannot be empty" : "URL ei saa olla tühi",
+    "{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",
+    "Error fetching URL" : "Viga URL-i haaramisel",
+    "Share" : "Jaga",
+    "Delete" : "Kustuta",
+    "Disconnect storage" : "Ühenda andmehoidla lahti.",
+    "Unshare" : "Lõpeta jagamine",
+    "Delete permanently" : "Kustuta jäädavalt",
+    "Rename" : "Nimeta ümber",
+    "Pending" : "Ootel",
+    "Error moving file." : "Viga faili liigutamisel.",
+    "Error moving file" : "Viga faili eemaldamisel",
+    "Error" : "Viga",
+    "Could not rename file" : "Ei suuda faili ümber nimetada",
+    "Error deleting file." : "Viga faili kustutamisel.",
+    "Name" : "Nimi",
+    "Size" : "Suurus",
+    "Modified" : "Muudetud",
+    "_%n folder_::_%n folders_" : ["%n kataloog","%n kataloogi"],
+    "_%n file_::_%n files_" : ["%n fail","%n faili"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" on vigane failinimi.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
+    "{dirs} and {files}" : "{dirs} ja {files}",
+    "%s could not be renamed as it has been deleted" : "%s ei saa ümber nimetada, kuna see on kustutatud",
+    "%s could not be renamed" : "%s ümbernimetamine ebaõnnestus",
+    "Upload (max. %s)" : "Üleslaadimine (max. %s)",
+    "File handling" : "Failide käsitlemine",
+    "Maximum upload size" : "Maksimaalne üleslaadimise suurus",
+    "max. possible: " : "maks. võimalik: ",
+    "Save" : "Salvesta",
+    "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",
+    "From link" : "Allikast",
+    "Nothing in here. Upload something!" : "Siin pole midagi. Lae midagi üles!",
+    "Download" : "Lae alla",
+    "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.",
+    "Currently scanning" : "Praegu skännimisel"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
deleted file mode 100644
index d40805d04bf..00000000000
--- a/apps/files/l10n/et_EE.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Andmehoidla pole saadaval",
-"Storage invalid" => "Vigane andmehoidla",
-"Unknown error" => "Tundmatu viga",
-"Could not move %s - File with this name already exists" => "Ei saa liigutada faili %s - samanimeline fail on juba olemas",
-"Could not move %s" => "%s liigutamine ebaõnnestus",
-"Permission denied" => "Ligipääs keelatud",
-"File name cannot be empty." => "Faili nimi ei saa olla tühi.",
-"\"%s\" is an invalid file name." => "\"%s\" on vigane failinimi.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Vigane nimi, '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' pole lubatud.",
-"The target folder has been moved or deleted." => "Sihtkataloog on ümber tõstetud või kustutatud.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Nimi %s on juba kasutusel kataloogis %s. Palun vali mõni teine nimi.",
-"Not a valid source" => "Pole korrektne lähteallikas",
-"Server is not allowed to open URLs, please check the server configuration" => "Server ei võimalda URL-ide avamist, palun kontrolli serveri seadistust",
-"The file exceeds your quota by %s" => "Fail ületab sinu limiidi: %s",
-"Error while downloading %s to %s" => "Viga %s allalaadimisel %s",
-"Error when creating the file" => "Viga faili loomisel",
-"Folder name cannot be empty." => "Kataloogi nimi ei saa olla tühi.",
-"Error when creating the folder" => "Viga kataloogi loomisel",
-"Unable to set upload directory." => "Üleslaadimiste kausta määramine ebaõnnestus.",
-"Invalid Token" => "Vigane kontrollkood",
-"No file was uploaded. Unknown error" => "Ühtegi faili ei laetud üles. Tundmatu viga",
-"There is no error, the file uploaded with success" => "Ühtegi tõrget polnud, fail on üles laetud",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Üleslaetava faili suurus ületab php.ini poolt määratud upload_max_filesize suuruse:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
-"The uploaded file was only partially uploaded" => "Fail laeti üles ainult osaliselt",
-"No file was uploaded" => "Ühtegi faili ei laetud üles",
-"Missing a temporary folder" => "Ajutiste failide kaust puudub",
-"Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
-"Not enough storage available" => "Saadaval pole piisavalt ruumi",
-"Upload failed. Could not find uploaded file" => "Üleslaadimine ebaõnnestus. Üleslaetud faili ei leitud",
-"Upload failed. Could not get file info." => "Üleslaadimine ebaõnnestus. Faili info hankimine ebaõnnestus.",
-"Invalid directory." => "Vigane kaust.",
-"Files" => "Failid",
-"All files" => "Kõik failid",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ei saa üles laadida {filename}, kuna see on kataloog või selle suurus on 0 baiti",
-"Total file size {size1} exceeds upload limit {size2}" => "Faili suurus {size1} ületab faili üleslaadimise mahu piirangu {size2}.",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Pole piisavalt vaba ruumi. Sa laadid üles {size1}, kuid ainult {size2} on saadaval.",
-"Upload cancelled." => "Üleslaadimine tühistati.",
-"Could not get result from server." => "Serverist ei saadud tulemusi",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös. Lehelt lahkumine katkestab selle üleslaadimise.",
-"URL cannot be empty" => "URL ei saa olla tühi",
-"{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",
-"Error fetching URL" => "Viga URL-i haaramisel",
-"Share" => "Jaga",
-"Delete" => "Kustuta",
-"Disconnect storage" => "Ühenda andmehoidla lahti.",
-"Unshare" => "Lõpeta jagamine",
-"Delete permanently" => "Kustuta jäädavalt",
-"Rename" => "Nimeta ümber",
-"Pending" => "Ootel",
-"Error moving file." => "Viga faili liigutamisel.",
-"Error moving file" => "Viga faili eemaldamisel",
-"Error" => "Viga",
-"Could not rename file" => "Ei suuda faili ümber nimetada",
-"Error deleting file." => "Viga faili kustutamisel.",
-"Name" => "Nimi",
-"Size" => "Suurus",
-"Modified" => "Muudetud",
-"_%n folder_::_%n folders_" => array("%n kataloog","%n kataloogi"),
-"_%n file_::_%n files_" => array("%n fail","%n faili"),
-"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_" => array("Laadin üles %n faili","Laadin üles %n faili"),
-"\"{name}\" is an invalid file name." => "\"{name}\" on vigane failinimi.",
-"Your storage is full, files can not be updated or synced anymore!" => "Sinu andmemaht on täis! Faile ei uuendata ega sünkroniseerita!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Su andmemaht on peaaegu täis ({usedSpacePercent}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Krüpteering on keelatud, kuid sinu failid on endiselt krüpteeritud. Palun vaata oma personaalseid seadeid oma failide dekrüpteerimiseks.",
-"{dirs} and {files}" => "{dirs} ja {files}",
-"%s could not be renamed as it has been deleted" => "%s ei saa ümber nimetada, kuna see on kustutatud",
-"%s could not be renamed" => "%s ümbernimetamine ebaõnnestus",
-"Upload (max. %s)" => "Üleslaadimine (max. %s)",
-"File handling" => "Failide käsitlemine",
-"Maximum upload size" => "Maksimaalne üleslaadimise suurus",
-"max. possible: " => "maks. võimalik: ",
-"Save" => "Salvesta",
-"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",
-"From link" => "Allikast",
-"Nothing in here. Upload something!" => "Siin pole midagi. Lae midagi üles!",
-"Download" => "Lae alla",
-"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.",
-"Currently scanning" => "Praegu skännimisel"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
new file mode 100644
index 00000000000..c4da5e6cfa6
--- /dev/null
+++ b/apps/files/l10n/eu.js
@@ -0,0 +1,96 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Biltegia ez dago eskuragarri",
+    "Storage invalid" : "Biltegi bliogabea",
+    "Unknown error" : "Errore ezezaguna",
+    "Could not move %s - File with this name already exists" : "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
+    "Could not move %s" : "Ezin dira fitxategiak mugitu %s",
+    "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
+    "\"%s\" is an invalid file name." : "\"%s\" ez da fitxategi izen baliogarria.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
+    "The target folder has been moved or deleted." : "Jatorrizko karpeta mugitu edo ezabatu da.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "%s izena dagoeneko erabilita dago %s karpetan. Mesdez hautatu izen ezberdina.",
+    "Not a valid source" : "Ez da jatorri baliogarria",
+    "Server is not allowed to open URLs, please check the server configuration" : "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa",
+    "The file exceeds your quota by %s" : "Fitxategiak zure kouta gainditzen du %s-an",
+    "Error while downloading %s to %s" : "Errorea %s %sra deskargatzerakoan",
+    "Error when creating the file" : "Errorea fitxategia sortzerakoan",
+    "Folder name cannot be empty." : "Karpeta izena ezin da hutsa izan.",
+    "Error when creating the folder" : "Errorea karpeta sortzerakoan",
+    "Unable to set upload directory." : "Ezin da igoera direktorioa ezarri.",
+    "Invalid Token" : "Lekuko baliogabea",
+    "No file was uploaded. Unknown error" : "Ez da fitxategirik igo. Errore ezezaguna",
+    "There is no error, the file uploaded with success" : "Ez da errorerik egon, fitxategia ongi igo da",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
+    "The uploaded file was only partially uploaded" : "Igotako fitxategiaren zati bat bakarrik igo da",
+    "No file was uploaded" : "Ez da fitxategirik igo",
+    "Missing a temporary folder" : "Aldi bateko karpeta falta da",
+    "Failed to write to disk" : "Errore bat izan da diskoan idazterakoan",
+    "Not enough storage available" : "Ez dago behar aina leku erabilgarri,",
+    "Upload failed. Could not find uploaded file" : "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu",
+    "Upload failed. Could not get file info." : "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu.",
+    "Invalid directory." : "Baliogabeko karpeta.",
+    "Files" : "Fitxategiak",
+    "All files" : "Fitxategi guztiak",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
+    "Total file size {size1} exceeds upload limit {size2}" : "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
+    "Upload cancelled." : "Igoera ezeztatuta",
+    "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
+    "URL cannot be empty" : "URLa ezin da hutsik egon",
+    "{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",
+    "Error fetching URL" : "Errorea URLa eskuratzerakoan",
+    "Share" : "Elkarbanatu",
+    "Delete" : "Ezabatu",
+    "Disconnect storage" : "Deskonektatu biltegia",
+    "Unshare" : "Ez elkarbanatu",
+    "Delete permanently" : "Ezabatu betirako",
+    "Rename" : "Berrizendatu",
+    "Pending" : "Zain",
+    "Error moving file." : "Errorea fitxategia mugitzean.",
+    "Error moving file" : "Errorea fitxategia mugitzean",
+    "Error" : "Errorea",
+    "Could not rename file" : "Ezin izan da fitxategia berrizendatu",
+    "Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
+    "Name" : "Izena",
+    "Size" : "Tamaina",
+    "Modified" : "Aldatuta",
+    "_%n folder_::_%n folders_" : ["karpeta %n","%n karpeta"],
+    "_%n file_::_%n files_" : ["fitxategi %n","%n fitxategi"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" ez da fitxategi izen baliogarria.",
+    "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})",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
+    "{dirs} and {files}" : "{dirs} eta {files}",
+    "%s could not be renamed as it has been deleted" : "%s ezin izan da berrizendatu ezabatua zegoen eta",
+    "%s could not be renamed" : "%s ezin da berrizendatu",
+    "Upload (max. %s)" : "Igo (max. %s)",
+    "File handling" : "Fitxategien kudeaketa",
+    "Maximum upload size" : "Igo daitekeen gehienezko tamaina",
+    "max. possible: " : "max, posiblea:",
+    "Save" : "Gorde",
+    "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",
+    "From link" : "Estekatik",
+    "Nothing in here. Upload something!" : "Ez dago ezer. Igo zerbait!",
+    "Download" : "Deskargatu",
+    "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.",
+    "Currently scanning" : "Eskaneatzen une honetan"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
new file mode 100644
index 00000000000..300bbc8917c
--- /dev/null
+++ b/apps/files/l10n/eu.json
@@ -0,0 +1,94 @@
+{ "translations": {
+    "Storage not available" : "Biltegia ez dago eskuragarri",
+    "Storage invalid" : "Biltegi bliogabea",
+    "Unknown error" : "Errore ezezaguna",
+    "Could not move %s - File with this name already exists" : "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
+    "Could not move %s" : "Ezin dira fitxategiak mugitu %s",
+    "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
+    "\"%s\" is an invalid file name." : "\"%s\" ez da fitxategi izen baliogarria.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
+    "The target folder has been moved or deleted." : "Jatorrizko karpeta mugitu edo ezabatu da.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "%s izena dagoeneko erabilita dago %s karpetan. Mesdez hautatu izen ezberdina.",
+    "Not a valid source" : "Ez da jatorri baliogarria",
+    "Server is not allowed to open URLs, please check the server configuration" : "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa",
+    "The file exceeds your quota by %s" : "Fitxategiak zure kouta gainditzen du %s-an",
+    "Error while downloading %s to %s" : "Errorea %s %sra deskargatzerakoan",
+    "Error when creating the file" : "Errorea fitxategia sortzerakoan",
+    "Folder name cannot be empty." : "Karpeta izena ezin da hutsa izan.",
+    "Error when creating the folder" : "Errorea karpeta sortzerakoan",
+    "Unable to set upload directory." : "Ezin da igoera direktorioa ezarri.",
+    "Invalid Token" : "Lekuko baliogabea",
+    "No file was uploaded. Unknown error" : "Ez da fitxategirik igo. Errore ezezaguna",
+    "There is no error, the file uploaded with success" : "Ez da errorerik egon, fitxategia ongi igo da",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
+    "The uploaded file was only partially uploaded" : "Igotako fitxategiaren zati bat bakarrik igo da",
+    "No file was uploaded" : "Ez da fitxategirik igo",
+    "Missing a temporary folder" : "Aldi bateko karpeta falta da",
+    "Failed to write to disk" : "Errore bat izan da diskoan idazterakoan",
+    "Not enough storage available" : "Ez dago behar aina leku erabilgarri,",
+    "Upload failed. Could not find uploaded file" : "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu",
+    "Upload failed. Could not get file info." : "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu.",
+    "Invalid directory." : "Baliogabeko karpeta.",
+    "Files" : "Fitxategiak",
+    "All files" : "Fitxategi guztiak",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
+    "Total file size {size1} exceeds upload limit {size2}" : "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
+    "Upload cancelled." : "Igoera ezeztatuta",
+    "Could not get result from server." : "Ezin da zerbitzaritik emaitzik lortu",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
+    "URL cannot be empty" : "URLa ezin da hutsik egon",
+    "{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",
+    "Error fetching URL" : "Errorea URLa eskuratzerakoan",
+    "Share" : "Elkarbanatu",
+    "Delete" : "Ezabatu",
+    "Disconnect storage" : "Deskonektatu biltegia",
+    "Unshare" : "Ez elkarbanatu",
+    "Delete permanently" : "Ezabatu betirako",
+    "Rename" : "Berrizendatu",
+    "Pending" : "Zain",
+    "Error moving file." : "Errorea fitxategia mugitzean.",
+    "Error moving file" : "Errorea fitxategia mugitzean",
+    "Error" : "Errorea",
+    "Could not rename file" : "Ezin izan da fitxategia berrizendatu",
+    "Error deleting file." : "Errorea fitxategia ezabatzerakoan.",
+    "Name" : "Izena",
+    "Size" : "Tamaina",
+    "Modified" : "Aldatuta",
+    "_%n folder_::_%n folders_" : ["karpeta %n","%n karpeta"],
+    "_%n file_::_%n files_" : ["fitxategi %n","%n fitxategi"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" ez da fitxategi izen baliogarria.",
+    "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})",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
+    "{dirs} and {files}" : "{dirs} eta {files}",
+    "%s could not be renamed as it has been deleted" : "%s ezin izan da berrizendatu ezabatua zegoen eta",
+    "%s could not be renamed" : "%s ezin da berrizendatu",
+    "Upload (max. %s)" : "Igo (max. %s)",
+    "File handling" : "Fitxategien kudeaketa",
+    "Maximum upload size" : "Igo daitekeen gehienezko tamaina",
+    "max. possible: " : "max, posiblea:",
+    "Save" : "Gorde",
+    "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",
+    "From link" : "Estekatik",
+    "Nothing in here. Upload something!" : "Ez dago ezer. Igo zerbait!",
+    "Download" : "Deskargatu",
+    "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.",
+    "Currently scanning" : "Eskaneatzen une honetan"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
deleted file mode 100644
index 012e5f214a8..00000000000
--- a/apps/files/l10n/eu.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Biltegia ez dago eskuragarri",
-"Storage invalid" => "Biltegi bliogabea",
-"Unknown error" => "Errore ezezaguna",
-"Could not move %s - File with this name already exists" => "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
-"Could not move %s" => "Ezin dira fitxategiak mugitu %s",
-"Permission denied" => "Baimena Ukatua",
-"File name cannot be empty." => "Fitxategi izena ezin da hutsa izan.",
-"\"%s\" is an invalid file name." => "\"%s\" ez da fitxategi izen baliogarria.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
-"The target folder has been moved or deleted." => "Jatorrizko karpeta mugitu edo ezabatu da.",
-"The name %s is already used in the folder %s. Please choose a different name." => "%s izena dagoeneko erabilita dago %s karpetan. Mesdez hautatu izen ezberdina.",
-"Not a valid source" => "Ez da jatorri baliogarria",
-"Server is not allowed to open URLs, please check the server configuration" => "Zerbitzaria ez dago URLak irekitzeko baimendua, mesedez egiaztatu zerbitzariaren konfigurazioa",
-"The file exceeds your quota by %s" => "Fitxategiak zure kouta gainditzen du %s-an",
-"Error while downloading %s to %s" => "Errorea %s %sra deskargatzerakoan",
-"Error when creating the file" => "Errorea fitxategia sortzerakoan",
-"Folder name cannot be empty." => "Karpeta izena ezin da hutsa izan.",
-"Error when creating the folder" => "Errorea karpeta sortzerakoan",
-"Unable to set upload directory." => "Ezin da igoera direktorioa ezarri.",
-"Invalid Token" => "Lekuko baliogabea",
-"No file was uploaded. Unknown error" => "Ez da fitxategirik igo. Errore ezezaguna",
-"There is no error, the file uploaded with success" => "Ez da errorerik egon, fitxategia ongi igo da",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategia HTML formularioan zehaztutako MAX_FILE_SIZE direktiba baino handidagoa da.",
-"The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat bakarrik igo da",
-"No file was uploaded" => "Ez da fitxategirik igo",
-"Missing a temporary folder" => "Aldi bateko karpeta falta da",
-"Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
-"Not enough storage available" => "Ez dago behar aina leku erabilgarri,",
-"Upload failed. Could not find uploaded file" => "Igoerak huts egin du. Ezin izan da igotako fitxategia aurkitu",
-"Upload failed. Could not get file info." => "Igoerak huts egin du. Ezin izan da fitxategiaren informazioa eskuratu.",
-"Invalid directory." => "Baliogabeko karpeta.",
-"Files" => "Fitxategiak",
-"All files" => "Fitxategi guztiak",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ezin da {filename} igo karpeta bat delako edo 0 byte dituelako",
-"Total file size {size1} exceeds upload limit {size2}" => "Fitxategiaren tamainak {size1} igotzeko muga {size2} gainditzen du",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ez dago leku nahikorik, zu {size1} igotzen ari zara baina bakarrik {size2} libre dago",
-"Upload cancelled." => "Igoera ezeztatuta",
-"Could not get result from server." => "Ezin da zerbitzaritik emaitzik lortu",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
-"URL cannot be empty" => "URLa ezin da hutsik egon",
-"{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",
-"Error fetching URL" => "Errorea URLa eskuratzerakoan",
-"Share" => "Elkarbanatu",
-"Delete" => "Ezabatu",
-"Disconnect storage" => "Deskonektatu biltegia",
-"Unshare" => "Ez elkarbanatu",
-"Delete permanently" => "Ezabatu betirako",
-"Rename" => "Berrizendatu",
-"Pending" => "Zain",
-"Error moving file." => "Errorea fitxategia mugitzean.",
-"Error moving file" => "Errorea fitxategia mugitzean",
-"Error" => "Errorea",
-"Could not rename file" => "Ezin izan da fitxategia berrizendatu",
-"Error deleting file." => "Errorea fitxategia ezabatzerakoan.",
-"Name" => "Izena",
-"Size" => "Tamaina",
-"Modified" => "Aldatuta",
-"_%n folder_::_%n folders_" => array("karpeta %n","%n karpeta"),
-"_%n file_::_%n files_" => array("fitxategi %n","%n fitxategi"),
-"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_" => array("Fitxategi %n igotzen","%n fitxategi igotzen"),
-"\"{name}\" is an invalid file name." => "\"{name}\" ez da fitxategi izen baliogarria.",
-"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})",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enkriptazioa desgaitua izan da baina zure fitxategiak oraindik enkriptatuta daude. Mesedez  jo zure ezarpen pertsonaletara zure fitxategiak dekodifikatzeko.",
-"{dirs} and {files}" => "{dirs} eta {files}",
-"%s could not be renamed as it has been deleted" => "%s ezin izan da berrizendatu ezabatua zegoen eta",
-"%s could not be renamed" => "%s ezin da berrizendatu",
-"Upload (max. %s)" => "Igo (max. %s)",
-"File handling" => "Fitxategien kudeaketa",
-"Maximum upload size" => "Igo daitekeen gehienezko tamaina",
-"max. possible: " => "max, posiblea:",
-"Save" => "Gorde",
-"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",
-"From link" => "Estekatik",
-"Nothing in here. Upload something!" => "Ez dago ezer. Igo zerbait!",
-"Download" => "Deskargatu",
-"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.",
-"Currently scanning" => "Eskaneatzen une honetan"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/eu_ES.js b/apps/files/l10n/eu_ES.js
new file mode 100644
index 00000000000..eec67678d34
--- /dev/null
+++ b/apps/files/l10n/eu_ES.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files",
+    {
+    "Delete" : "Ezabatu",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "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
new file mode 100644
index 00000000000..2a2660e84e5
--- /dev/null
+++ b/apps/files/l10n/eu_ES.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Delete" : "Ezabatu",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "Gorde",
+    "Download" : "Deskargatu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/eu_ES.php b/apps/files/l10n/eu_ES.php
deleted file mode 100644
index e2be349d06b..00000000000
--- a/apps/files/l10n/eu_ES.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Ezabatu",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "Gorde",
-"Download" => "Deskargatu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fa.js b/apps/files/l10n/fa.js
new file mode 100644
index 00000000000..1e403418ab1
--- /dev/null
+++ b/apps/files/l10n/fa.js
@@ -0,0 +1,58 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "خطای نامشخص",
+    "Could not move %s - File with this name already exists" : "%s نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. ",
+    "Could not move %s" : "%s نمی تواند حرکت کند ",
+    "File name cannot be empty." : "نام پرونده نمی تواند خالی باشد.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند.",
+    "Unable to set upload directory." : "قادر به تنظیم پوشه آپلود نمی باشد.",
+    "Invalid Token" : "رمز نامعتبر",
+    "No file was uploaded. Unknown error" : "هیچ فایلی آپلود نشد.خطای ناشناس",
+    "There is no error, the file uploaded with success" : "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است",
+    "The uploaded file was only partially uploaded" : "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
+    "No file was uploaded" : "هیچ پروندهای بارگذاری نشده",
+    "Missing a temporary folder" : "یک پوشه موقت گم شده",
+    "Failed to write to disk" : "نوشتن بر روی دیسک سخت ناموفق بود",
+    "Not enough storage available" : "فضای کافی در دسترس نیست",
+    "Invalid directory." : "فهرست راهنما نامعتبر می باشد.",
+    "Files" : "پرونده‌ها",
+    "Upload cancelled." : "بار گذاری لغو شد",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
+    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
+    "Share" : "اشتراک‌گذاری",
+    "Delete" : "حذف",
+    "Unshare" : "لغو اشتراک",
+    "Delete permanently" : "حذف قطعی",
+    "Rename" : "تغییرنام",
+    "Pending" : "در انتظار",
+    "Error" : "خطا",
+    "Name" : "نام",
+    "Size" : "اندازه",
+    "Modified" : "تاریخ",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : ["در حال بارگذاری %n فایل"],
+    "Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
+    "%s could not be renamed" : "%s نمیتواند تغییر نام دهد.",
+    "File handling" : "اداره پرونده ها",
+    "Maximum upload size" : "حداکثر اندازه بارگزاری",
+    "max. possible: " : "حداکثرمقدارممکن:",
+    "Save" : "ذخیره",
+    "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" : "پوشه",
+    "From link" : "از پیوند",
+    "Nothing in here. Upload something!" : "اینجا هیچ چیز نیست.",
+    "Download" : "دانلود",
+    "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." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/fa.json b/apps/files/l10n/fa.json
new file mode 100644
index 00000000000..872cef839a7
--- /dev/null
+++ b/apps/files/l10n/fa.json
@@ -0,0 +1,56 @@
+{ "translations": {
+    "Unknown error" : "خطای نامشخص",
+    "Could not move %s - File with this name already exists" : "%s نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. ",
+    "Could not move %s" : "%s نمی تواند حرکت کند ",
+    "File name cannot be empty." : "نام پرونده نمی تواند خالی باشد.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند.",
+    "Unable to set upload directory." : "قادر به تنظیم پوشه آپلود نمی باشد.",
+    "Invalid Token" : "رمز نامعتبر",
+    "No file was uploaded. Unknown error" : "هیچ فایلی آپلود نشد.خطای ناشناس",
+    "There is no error, the file uploaded with success" : "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است",
+    "The uploaded file was only partially uploaded" : "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
+    "No file was uploaded" : "هیچ پروندهای بارگذاری نشده",
+    "Missing a temporary folder" : "یک پوشه موقت گم شده",
+    "Failed to write to disk" : "نوشتن بر روی دیسک سخت ناموفق بود",
+    "Not enough storage available" : "فضای کافی در دسترس نیست",
+    "Invalid directory." : "فهرست راهنما نامعتبر می باشد.",
+    "Files" : "پرونده‌ها",
+    "Upload cancelled." : "بار گذاری لغو شد",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
+    "{new_name} already exists" : "{نام _جدید} در حال حاضر وجود دارد.",
+    "Share" : "اشتراک‌گذاری",
+    "Delete" : "حذف",
+    "Unshare" : "لغو اشتراک",
+    "Delete permanently" : "حذف قطعی",
+    "Rename" : "تغییرنام",
+    "Pending" : "در انتظار",
+    "Error" : "خطا",
+    "Name" : "نام",
+    "Size" : "اندازه",
+    "Modified" : "تاریخ",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : ["در حال بارگذاری %n فایل"],
+    "Your storage is full, files can not be updated or synced anymore!" : "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
+    "%s could not be renamed" : "%s نمیتواند تغییر نام دهد.",
+    "File handling" : "اداره پرونده ها",
+    "Maximum upload size" : "حداکثر اندازه بارگزاری",
+    "max. possible: " : "حداکثرمقدارممکن:",
+    "Save" : "ذخیره",
+    "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" : "پوشه",
+    "From link" : "از پیوند",
+    "Nothing in here. Upload something!" : "اینجا هیچ چیز نیست.",
+    "Download" : "دانلود",
+    "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." : "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
deleted file mode 100644
index 92c7d96ed8a..00000000000
--- a/apps/files/l10n/fa.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "خطای نامشخص",
-"Could not move %s - File with this name already exists" => "%s نمی توان جابجا کرد - در حال حاضر پرونده با این نام وجود دارد. ",
-"Could not move %s" => "%s نمی تواند حرکت کند ",
-"File name cannot be empty." => "نام پرونده نمی تواند خالی باشد.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "نام نامعتبر ،  '\\', '/', '<', '>', ':', '\"', '|', '?'  و '*'  مجاز نمی باشند.",
-"Unable to set upload directory." => "قادر به تنظیم پوشه آپلود نمی باشد.",
-"Invalid Token" => "رمز نامعتبر",
-"No file was uploaded. Unknown error" => "هیچ فایلی آپلود نشد.خطای ناشناس",
-"There is no error, the file uploaded with success" => "هیچ خطایی نیست بارگذاری پرونده موفقیت آمیز بود",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "پرونده آپلود شده بیش ازدستور  ماکزیمم_حجم فایل_برای آپلود در   php.ini استفاده کرده است.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "حداکثر حجم قابل بار گذاری از طریق HTML MAX_FILE_SIZE است",
-"The uploaded file was only partially uploaded" => "پرونده بارگذاری شده فقط تاحدودی بارگذاری شده",
-"No file was uploaded" => "هیچ پروندهای بارگذاری نشده",
-"Missing a temporary folder" => "یک پوشه موقت گم شده",
-"Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
-"Not enough storage available" => "فضای کافی در دسترس نیست",
-"Invalid directory." => "فهرست راهنما نامعتبر می باشد.",
-"Files" => "پرونده‌ها",
-"Upload cancelled." => "بار گذاری لغو شد",
-"File upload is in progress. Leaving the page now will cancel the upload." => "آپلودکردن پرونده در حال پیشرفت است. در صورت خروج از صفحه آپلود لغو میگردد. ",
-"{new_name} already exists" => "{نام _جدید} در حال حاضر وجود دارد.",
-"Share" => "اشتراک‌گذاری",
-"Delete" => "حذف",
-"Unshare" => "لغو اشتراک",
-"Delete permanently" => "حذف قطعی",
-"Rename" => "تغییرنام",
-"Pending" => "در انتظار",
-"Error" => "خطا",
-"Name" => "نام",
-"Size" => "اندازه",
-"Modified" => "تاریخ",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array("در حال بارگذاری %n فایل"),
-"Your storage is full, files can not be updated or synced anymore!" => "فضای ذخیره ی شما کاملا پر است، بیش از این فایلها بهنگام یا همگام سازی نمی توانند بشوند!",
-"Your storage is almost full ({usedSpacePercent}%)" => "فضای ذخیره ی شما تقریبا پر است ({usedSpacePercent}%)",
-"%s could not be renamed" => "%s نمیتواند تغییر نام دهد.",
-"File handling" => "اداره پرونده ها",
-"Maximum upload size" => "حداکثر اندازه بارگزاری",
-"max. possible: " => "حداکثرمقدارممکن:",
-"Save" => "ذخیره",
-"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" => "پوشه",
-"From link" => "از پیوند",
-"Nothing in here. Upload something!" => "اینجا هیچ چیز نیست.",
-"Download" => "دانلود",
-"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." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/fi_FI.js b/apps/files/l10n/fi_FI.js
new file mode 100644
index 00000000000..3c94a518774
--- /dev/null
+++ b/apps/files/l10n/fi_FI.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Tallennustila ei ole käytettävissä",
+    "Storage invalid" : "Virheellinen tallennustila",
+    "Unknown error" : "Tuntematon virhe",
+    "Could not move %s - File with this name already exists" : "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
+    "Could not move %s" : "Kohteen %s siirto ei onnistunut",
+    "Permission denied" : "Ei käyttöoikeutta",
+    "File name cannot be empty." : "Tiedoston nimi ei voi olla tyhjä.",
+    "\"%s\" is an invalid file name." : "\"%s\" on virheellinen tiedostonimi.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
+    "The target folder has been moved or deleted." : "Kohdekansio on siirretty tai poistettu.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Nimi %s on jo käytössä kansiossa %s. Valitse toinen nimi.",
+    "Not a valid source" : "Virheellinen lähde",
+    "Server is not allowed to open URLs, please check the server configuration" : "Palvelimen ei ole lupa avata verkko-osoitteita. Tarkista palvelimen asetukset",
+    "The file exceeds your quota by %s" : "Tiedosto ylittää kiintiösi %s:lla",
+    "Error while downloading %s to %s" : "Virhe ladatessa kohdetta %s sijaintiin %s",
+    "Error when creating the file" : "Virhe tiedostoa luotaessa",
+    "Folder name cannot be empty." : "Kansion nimi ei voi olla tyhjä.",
+    "Error when creating the folder" : "Virhe kansiota luotaessa",
+    "Unable to set upload directory." : "Lähetyskansion asettaminen epäonnistui.",
+    "Invalid Token" : "Virheellinen token",
+    "No file was uploaded. Unknown error" : "Tiedostoa ei lähetetty. Tuntematon virhe",
+    "There is no error, the file uploaded with success" : "Ei virheitä, tiedosto lähetettiin onnistuneesti",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Lähetettävän tiedoston enimmäiskoko ylittää HTML-lomakkeessa määritellyn MAX_FILE_SIZE-säännön",
+    "The uploaded file was only partially uploaded" : "Tiedoston lähetys onnistui vain osittain",
+    "No file was uploaded" : "Yhtäkään tiedostoa ei lähetetty",
+    "Missing a temporary folder" : "Tilapäiskansio puuttuu",
+    "Failed to write to disk" : "Levylle kirjoitus epäonnistui",
+    "Not enough storage available" : "Tallennustilaa ei ole riittävästi käytettävissä",
+    "Upload failed. Could not find uploaded file" : "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
+    "Upload failed. Could not get file info." : "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
+    "Invalid directory." : "Virheellinen kansio.",
+    "Files" : "Tiedostot",
+    "All files" : "Kaikki tiedostot",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
+    "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
+    "Upload cancelled." : "Lähetys peruttu.",
+    "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
+    "URL cannot be empty" : "Osoite ei voi olla tyhjä",
+    "{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",
+    "Error fetching URL" : "Virhe noutaessa verkko-osoitetta",
+    "Share" : "Jaa",
+    "Delete" : "Poista",
+    "Disconnect storage" : "Katkaise yhteys tallennustilaan",
+    "Unshare" : "Peru jakaminen",
+    "Delete permanently" : "Poista pysyvästi",
+    "Rename" : "Nimeä uudelleen",
+    "Pending" : "Odottaa",
+    "Error moving file." : "Virhe tiedostoa siirrettäessä.",
+    "Error moving file" : "Virhe tiedostoa siirrettäessä",
+    "Error" : "Virhe",
+    "Could not rename file" : "Tiedoston nimeäminen uudelleen epäonnistui",
+    "Error deleting file." : "Virhe tiedostoa poistaessa.",
+    "Name" : "Nimi",
+    "Size" : "Koko",
+    "Modified" : "Muokattu",
+    "_%n folder_::_%n folders_" : ["%n kansio","%n kansiota"],
+    "_%n file_::_%n files_" : ["%n tiedosto","%n tiedostoa"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" on virheellinen tiedostonimi.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Tallennustila on melkein loppu ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen.",
+    "{dirs} and {files}" : "{dirs} ja {files}",
+    "%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)",
+    "File handling" : "Tiedostonhallinta",
+    "Maximum upload size" : "Lähetettävän tiedoston suurin sallittu koko",
+    "max. possible: " : "suurin mahdollinen:",
+    "Save" : "Tallenna",
+    "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",
+    "From link" : "Linkistä",
+    "Nothing in here. Upload something!" : "Täällä ei ole mitään. Lähetä tänne jotakin!",
+    "Download" : "Lataa",
+    "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.",
+    "Currently scanning" : "Tutkitaan parhaillaan"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/fi_FI.json b/apps/files/l10n/fi_FI.json
new file mode 100644
index 00000000000..8628607793b
--- /dev/null
+++ b/apps/files/l10n/fi_FI.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Tallennustila ei ole käytettävissä",
+    "Storage invalid" : "Virheellinen tallennustila",
+    "Unknown error" : "Tuntematon virhe",
+    "Could not move %s - File with this name already exists" : "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
+    "Could not move %s" : "Kohteen %s siirto ei onnistunut",
+    "Permission denied" : "Ei käyttöoikeutta",
+    "File name cannot be empty." : "Tiedoston nimi ei voi olla tyhjä.",
+    "\"%s\" is an invalid file name." : "\"%s\" on virheellinen tiedostonimi.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
+    "The target folder has been moved or deleted." : "Kohdekansio on siirretty tai poistettu.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Nimi %s on jo käytössä kansiossa %s. Valitse toinen nimi.",
+    "Not a valid source" : "Virheellinen lähde",
+    "Server is not allowed to open URLs, please check the server configuration" : "Palvelimen ei ole lupa avata verkko-osoitteita. Tarkista palvelimen asetukset",
+    "The file exceeds your quota by %s" : "Tiedosto ylittää kiintiösi %s:lla",
+    "Error while downloading %s to %s" : "Virhe ladatessa kohdetta %s sijaintiin %s",
+    "Error when creating the file" : "Virhe tiedostoa luotaessa",
+    "Folder name cannot be empty." : "Kansion nimi ei voi olla tyhjä.",
+    "Error when creating the folder" : "Virhe kansiota luotaessa",
+    "Unable to set upload directory." : "Lähetyskansion asettaminen epäonnistui.",
+    "Invalid Token" : "Virheellinen token",
+    "No file was uploaded. Unknown error" : "Tiedostoa ei lähetetty. Tuntematon virhe",
+    "There is no error, the file uploaded with success" : "Ei virheitä, tiedosto lähetettiin onnistuneesti",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Lähetettävän tiedoston enimmäiskoko ylittää HTML-lomakkeessa määritellyn MAX_FILE_SIZE-säännön",
+    "The uploaded file was only partially uploaded" : "Tiedoston lähetys onnistui vain osittain",
+    "No file was uploaded" : "Yhtäkään tiedostoa ei lähetetty",
+    "Missing a temporary folder" : "Tilapäiskansio puuttuu",
+    "Failed to write to disk" : "Levylle kirjoitus epäonnistui",
+    "Not enough storage available" : "Tallennustilaa ei ole riittävästi käytettävissä",
+    "Upload failed. Could not find uploaded file" : "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
+    "Upload failed. Could not get file info." : "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
+    "Invalid directory." : "Virheellinen kansio.",
+    "Files" : "Tiedostot",
+    "All files" : "Kaikki tiedostot",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
+    "Total file size {size1} exceeds upload limit {size2}" : "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
+    "Upload cancelled." : "Lähetys peruttu.",
+    "Could not get result from server." : "Tuloksien saaminen palvelimelta ei onnistunut.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
+    "URL cannot be empty" : "Osoite ei voi olla tyhjä",
+    "{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",
+    "Error fetching URL" : "Virhe noutaessa verkko-osoitetta",
+    "Share" : "Jaa",
+    "Delete" : "Poista",
+    "Disconnect storage" : "Katkaise yhteys tallennustilaan",
+    "Unshare" : "Peru jakaminen",
+    "Delete permanently" : "Poista pysyvästi",
+    "Rename" : "Nimeä uudelleen",
+    "Pending" : "Odottaa",
+    "Error moving file." : "Virhe tiedostoa siirrettäessä.",
+    "Error moving file" : "Virhe tiedostoa siirrettäessä",
+    "Error" : "Virhe",
+    "Could not rename file" : "Tiedoston nimeäminen uudelleen epäonnistui",
+    "Error deleting file." : "Virhe tiedostoa poistaessa.",
+    "Name" : "Nimi",
+    "Size" : "Koko",
+    "Modified" : "Muokattu",
+    "_%n folder_::_%n folders_" : ["%n kansio","%n kansiota"],
+    "_%n file_::_%n files_" : ["%n tiedosto","%n tiedostoa"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" on virheellinen tiedostonimi.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Tallennustila on melkein loppu ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen.",
+    "{dirs} and {files}" : "{dirs} ja {files}",
+    "%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)",
+    "File handling" : "Tiedostonhallinta",
+    "Maximum upload size" : "Lähetettävän tiedoston suurin sallittu koko",
+    "max. possible: " : "suurin mahdollinen:",
+    "Save" : "Tallenna",
+    "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",
+    "From link" : "Linkistä",
+    "Nothing in here. Upload something!" : "Täällä ei ole mitään. Lähetä tänne jotakin!",
+    "Download" : "Lataa",
+    "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.",
+    "Currently scanning" : "Tutkitaan parhaillaan"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
deleted file mode 100644
index adce13d004b..00000000000
--- a/apps/files/l10n/fi_FI.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Tallennustila ei ole käytettävissä",
-"Storage invalid" => "Virheellinen tallennustila",
-"Unknown error" => "Tuntematon virhe",
-"Could not move %s - File with this name already exists" => "Kohteen %s siirto ei onnistunut - Tiedosto samalla nimellä on jo olemassa",
-"Could not move %s" => "Kohteen %s siirto ei onnistunut",
-"Permission denied" => "Ei käyttöoikeutta",
-"File name cannot be empty." => "Tiedoston nimi ei voi olla tyhjä.",
-"\"%s\" is an invalid file name." => "\"%s\" on virheellinen tiedostonimi.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Virheellinen nimi, merkit '\\', '/', '<', '>', ':', '\"', '|', '?' ja '*' eivät ole sallittuja.",
-"The target folder has been moved or deleted." => "Kohdekansio on siirretty tai poistettu.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Nimi %s on jo käytössä kansiossa %s. Valitse toinen nimi.",
-"Not a valid source" => "Virheellinen lähde",
-"Server is not allowed to open URLs, please check the server configuration" => "Palvelimen ei ole lupa avata verkko-osoitteita. Tarkista palvelimen asetukset",
-"The file exceeds your quota by %s" => "Tiedosto ylittää kiintiösi %s:lla",
-"Error while downloading %s to %s" => "Virhe ladatessa kohdetta %s sijaintiin %s",
-"Error when creating the file" => "Virhe tiedostoa luotaessa",
-"Folder name cannot be empty." => "Kansion nimi ei voi olla tyhjä.",
-"Error when creating the folder" => "Virhe kansiota luotaessa",
-"Unable to set upload directory." => "Lähetyskansion asettaminen epäonnistui.",
-"Invalid Token" => "Virheellinen token",
-"No file was uploaded. Unknown error" => "Tiedostoa ei lähetetty. Tuntematon virhe",
-"There is no error, the file uploaded with success" => "Ei virheitä, tiedosto lähetettiin onnistuneesti",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Lähetetyn tiedoston koko ylittää php.ini-tiedoston upload_max_filesize-säännön:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lähetettävän tiedoston enimmäiskoko ylittää HTML-lomakkeessa määritellyn MAX_FILE_SIZE-säännön",
-"The uploaded file was only partially uploaded" => "Tiedoston lähetys onnistui vain osittain",
-"No file was uploaded" => "Yhtäkään tiedostoa ei lähetetty",
-"Missing a temporary folder" => "Tilapäiskansio puuttuu",
-"Failed to write to disk" => "Levylle kirjoitus epäonnistui",
-"Not enough storage available" => "Tallennustilaa ei ole riittävästi käytettävissä",
-"Upload failed. Could not find uploaded file" => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
-"Upload failed. Could not get file info." => "Lähetys epäonnistui. Lähettävää tiedostoa ei löydetty.",
-"Invalid directory." => "Virheellinen kansio.",
-"Files" => "Tiedostot",
-"All files" => "Kaikki tiedostot",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kohdetta {filename} ei voi lähettää, koska se on joko kansio tai sen koko on 0 tavua",
-"Total file size {size1} exceeds upload limit {size2}" => "Yhteiskoko {size1} ylittää lähetysrajan {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ei riittävästi vapaata tilaa. Lähetyksesi koko on {size1}, mutta vain {size2} on jäljellä",
-"Upload cancelled." => "Lähetys peruttu.",
-"Could not get result from server." => "Tuloksien saaminen palvelimelta ei onnistunut.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
-"URL cannot be empty" => "Osoite ei voi olla tyhjä",
-"{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",
-"Error fetching URL" => "Virhe noutaessa verkko-osoitetta",
-"Share" => "Jaa",
-"Delete" => "Poista",
-"Disconnect storage" => "Katkaise yhteys tallennustilaan",
-"Unshare" => "Peru jakaminen",
-"Delete permanently" => "Poista pysyvästi",
-"Rename" => "Nimeä uudelleen",
-"Pending" => "Odottaa",
-"Error moving file." => "Virhe tiedostoa siirrettäessä.",
-"Error moving file" => "Virhe tiedostoa siirrettäessä",
-"Error" => "Virhe",
-"Could not rename file" => "Tiedoston nimeäminen uudelleen epäonnistui",
-"Error deleting file." => "Virhe tiedostoa poistaessa.",
-"Name" => "Nimi",
-"Size" => "Koko",
-"Modified" => "Muokattu",
-"_%n folder_::_%n folders_" => array("%n kansio","%n kansiota"),
-"_%n file_::_%n files_" => array("%n tiedosto","%n tiedostoa"),
-"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_" => array("Lähetetään %n tiedosto","Lähetetään %n tiedostoa"),
-"\"{name}\" is an invalid file name." => "\"{name}\" on virheellinen tiedostonimi.",
-"Your storage is full, files can not be updated or synced anymore!" => "Tallennustila on loppu, tiedostoja ei voi enää päivittää tai synkronoida!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Tallennustila on melkein loppu ({usedSpacePercent}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Salaus poistettiin käytöstä, mutta tiedostosi ovat edelleen salattuina. Siirry henkilökohtaisiin asetuksiin avataksesi tiedostojesi salauksen.",
-"{dirs} and {files}" => "{dirs} ja {files}",
-"%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)",
-"File handling" => "Tiedostonhallinta",
-"Maximum upload size" => "Lähetettävän tiedoston suurin sallittu koko",
-"max. possible: " => "suurin mahdollinen:",
-"Save" => "Tallenna",
-"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",
-"From link" => "Linkistä",
-"Nothing in here. Upload something!" => "Täällä ei ole mitään. Lähetä tänne jotakin!",
-"Download" => "Lataa",
-"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.",
-"Currently scanning" => "Tutkitaan parhaillaan"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/fil.js b/apps/files/l10n/fil.js
new file mode 100644
index 00000000000..f085469f731
--- /dev/null
+++ b/apps/files/l10n/fil.js
@@ -0,0 +1,8 @@
+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/fil.json b/apps/files/l10n/fil.json
new file mode 100644
index 00000000000..ba9792477cd
--- /dev/null
+++ b/apps/files/l10n/fil.json
@@ -0,0 +1,6 @@
+{ "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/fil.php b/apps/files/l10n/fil.php
deleted file mode 100644
index 3c711e6b78a..00000000000
--- a/apps/files/l10n/fil.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
new file mode 100644
index 00000000000..967908eaca0
--- /dev/null
+++ b/apps/files/l10n/fr.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Support de stockage non disponible",
+    "Storage invalid" : "Support de stockage invalide",
+    "Unknown error" : "Erreur Inconnue ",
+    "Could not move %s - File with this name already exists" : "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
+    "Could not move %s" : "Impossible de déplacer %s",
+    "Permission denied" : "Permission refusée",
+    "File name cannot be empty." : "Le nom de fichier ne peut être vide.",
+    "\"%s\" is an invalid file name." : "\"%s\" n'est pas un nom de fichier valide.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
+    "The target folder has been moved or deleted." : "Le dossier cible a été déplacé ou supprimé.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Le nom %s est déjà utilisé dans le dossier %s. Merci de choisir un nom différent.",
+    "Not a valid source" : "La source n'est pas valide",
+    "Server is not allowed to open URLs, please check the server configuration" : "Le serveur n'est pas autorisé à ouvrir des URL, veuillez vérifier la configuration du serveur",
+    "The file exceeds your quota by %s" : "Le fichier excède votre quota de %s",
+    "Error while downloading %s to %s" : "Erreur pendant le téléchargement de %s à %s",
+    "Error when creating the file" : "Erreur pendant la création du fichier",
+    "Folder name cannot be empty." : "Le nom de dossier ne peux pas être vide.",
+    "Error when creating the folder" : "Erreur pendant la création du dossier",
+    "Unable to set upload directory." : "Impossible de définir le dossier pour l'upload, charger.",
+    "Invalid Token" : "Jeton non valide",
+    "No file was uploaded. Unknown error" : "Aucun fichier n'a été envoyé. Erreur inconnue",
+    "There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été envoyé avec succès.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
+    "The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement envoyé.",
+    "No file was uploaded" : "Pas de fichier envoyé.",
+    "Missing a temporary folder" : "Absence de dossier temporaire.",
+    "Failed to write to disk" : "Erreur d'écriture sur le disque",
+    "Not enough storage available" : "Plus assez d'espace de stockage disponible",
+    "Upload failed. Could not find uploaded file" : "L'envoi a échoué. Impossible de trouver le fichier envoyé.",
+    "Upload failed. Could not get file info." : "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
+    "Invalid directory." : "Dossier invalide.",
+    "Files" : "Fichiers",
+    "All files" : "Tous les fichiers",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
+    "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
+    "Upload cancelled." : "Envoi annulé.",
+    "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
+    "URL cannot be empty" : "L'URL ne peut pas être vide",
+    "{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",
+    "Error fetching URL" : "Erreur d'accès à l'URL",
+    "Share" : "Partager",
+    "Delete" : "Supprimer",
+    "Disconnect storage" : "Déconnecter ce support de stockage",
+    "Unshare" : "Ne plus partager",
+    "Delete permanently" : "Supprimer de façon définitive",
+    "Rename" : "Renommer",
+    "Pending" : "En attente",
+    "Error moving file." : "Erreur lors du déplacement du fichier.",
+    "Error moving file" : "Erreur lors du déplacement du fichier",
+    "Error" : "Erreur",
+    "Could not rename file" : "Impossible de renommer le fichier",
+    "Error deleting file." : "Erreur pendant la suppression du fichier.",
+    "Name" : "Nom",
+    "Size" : "Taille",
+    "Modified" : "Modifié",
+    "_%n folder_::_%n folders_" : ["%n dossier","%n dossiers"],
+    "_%n file_::_%n files_" : ["%n fichier","%n fichiers"],
+    "You don’t have permission to upload or create files here" : "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
+    "_Uploading %n file_::_Uploading %n files_" : ["Téléversement de %n fichier","Téléversement de %n fichiers"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" n'est pas un nom de fichier valide.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
+    "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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
+    "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 pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
+    "{dirs} and {files}" : "{dirs} et {files}",
+    "%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)",
+    "File handling" : "Gestion des fichiers",
+    "Maximum upload size" : "Taille max. d'envoi",
+    "max. possible: " : "Max. possible :",
+    "Save" : "Sauvegarder",
+    "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",
+    "From link" : "Depuis un lien",
+    "Nothing in here. Upload something!" : "Il n'y a rien ici ! Envoyez donc quelque chose :)",
+    "Download" : "Télécharger",
+    "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 permise par ce serveur.",
+    "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.",
+    "Currently scanning" : "Analyse en cours"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
new file mode 100644
index 00000000000..19c9154dc79
--- /dev/null
+++ b/apps/files/l10n/fr.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Support de stockage non disponible",
+    "Storage invalid" : "Support de stockage invalide",
+    "Unknown error" : "Erreur Inconnue ",
+    "Could not move %s - File with this name already exists" : "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
+    "Could not move %s" : "Impossible de déplacer %s",
+    "Permission denied" : "Permission refusée",
+    "File name cannot be empty." : "Le nom de fichier ne peut être vide.",
+    "\"%s\" is an invalid file name." : "\"%s\" n'est pas un nom de fichier valide.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
+    "The target folder has been moved or deleted." : "Le dossier cible a été déplacé ou supprimé.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Le nom %s est déjà utilisé dans le dossier %s. Merci de choisir un nom différent.",
+    "Not a valid source" : "La source n'est pas valide",
+    "Server is not allowed to open URLs, please check the server configuration" : "Le serveur n'est pas autorisé à ouvrir des URL, veuillez vérifier la configuration du serveur",
+    "The file exceeds your quota by %s" : "Le fichier excède votre quota de %s",
+    "Error while downloading %s to %s" : "Erreur pendant le téléchargement de %s à %s",
+    "Error when creating the file" : "Erreur pendant la création du fichier",
+    "Folder name cannot be empty." : "Le nom de dossier ne peux pas être vide.",
+    "Error when creating the folder" : "Erreur pendant la création du dossier",
+    "Unable to set upload directory." : "Impossible de définir le dossier pour l'upload, charger.",
+    "Invalid Token" : "Jeton non valide",
+    "No file was uploaded. Unknown error" : "Aucun fichier n'a été envoyé. Erreur inconnue",
+    "There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été envoyé avec succès.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
+    "The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement envoyé.",
+    "No file was uploaded" : "Pas de fichier envoyé.",
+    "Missing a temporary folder" : "Absence de dossier temporaire.",
+    "Failed to write to disk" : "Erreur d'écriture sur le disque",
+    "Not enough storage available" : "Plus assez d'espace de stockage disponible",
+    "Upload failed. Could not find uploaded file" : "L'envoi a échoué. Impossible de trouver le fichier envoyé.",
+    "Upload failed. Could not get file info." : "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
+    "Invalid directory." : "Dossier invalide.",
+    "Files" : "Fichiers",
+    "All files" : "Tous les fichiers",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
+    "Total file size {size1} exceeds upload limit {size2}" : "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
+    "Upload cancelled." : "Envoi annulé.",
+    "Could not get result from server." : "Ne peut recevoir les résultats du serveur.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
+    "URL cannot be empty" : "L'URL ne peut pas être vide",
+    "{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",
+    "Error fetching URL" : "Erreur d'accès à l'URL",
+    "Share" : "Partager",
+    "Delete" : "Supprimer",
+    "Disconnect storage" : "Déconnecter ce support de stockage",
+    "Unshare" : "Ne plus partager",
+    "Delete permanently" : "Supprimer de façon définitive",
+    "Rename" : "Renommer",
+    "Pending" : "En attente",
+    "Error moving file." : "Erreur lors du déplacement du fichier.",
+    "Error moving file" : "Erreur lors du déplacement du fichier",
+    "Error" : "Erreur",
+    "Could not rename file" : "Impossible de renommer le fichier",
+    "Error deleting file." : "Erreur pendant la suppression du fichier.",
+    "Name" : "Nom",
+    "Size" : "Taille",
+    "Modified" : "Modifié",
+    "_%n folder_::_%n folders_" : ["%n dossier","%n dossiers"],
+    "_%n file_::_%n files_" : ["%n fichier","%n fichiers"],
+    "You don’t have permission to upload or create files here" : "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
+    "_Uploading %n file_::_Uploading %n files_" : ["Téléversement de %n fichier","Téléversement de %n fichiers"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" n'est pas un nom de fichier valide.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
+    "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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
+    "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 pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
+    "{dirs} and {files}" : "{dirs} et {files}",
+    "%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)",
+    "File handling" : "Gestion des fichiers",
+    "Maximum upload size" : "Taille max. d'envoi",
+    "max. possible: " : "Max. possible :",
+    "Save" : "Sauvegarder",
+    "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",
+    "From link" : "Depuis un lien",
+    "Nothing in here. Upload something!" : "Il n'y a rien ici ! Envoyez donc quelque chose :)",
+    "Download" : "Télécharger",
+    "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 permise par ce serveur.",
+    "Files are being scanned, please wait." : "Les fichiers sont en cours d'analyse, veuillez patienter.",
+    "Currently scanning" : "Analyse en cours"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
deleted file mode 100644
index e4f7d93aeed..00000000000
--- a/apps/files/l10n/fr.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Support de stockage non disponible",
-"Storage invalid" => "Support de stockage invalide",
-"Unknown error" => "Erreur Inconnue ",
-"Could not move %s - File with this name already exists" => "Impossible de déplacer %s - Un fichier possédant ce nom existe déjà",
-"Could not move %s" => "Impossible de déplacer %s",
-"Permission denied" => "Permission refusée",
-"File name cannot be empty." => "Le nom de fichier ne peut être vide.",
-"\"%s\" is an invalid file name." => "\"%s\" n'est pas un nom de fichier valide.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nom invalide, les caractères '\\', '/', '<', '>', ':', '\"', '|', '?' et '*' ne sont pas autorisés.",
-"The target folder has been moved or deleted." => "Le dossier cible a été déplacé ou supprimé.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Le nom %s est déjà utilisé dans le dossier %s. Merci de choisir un nom différent.",
-"Not a valid source" => "La source n'est pas valide",
-"Server is not allowed to open URLs, please check the server configuration" => "Le serveur n'est pas autorisé à ouvrir des URL, veuillez vérifier la configuration du serveur",
-"The file exceeds your quota by %s" => "Le fichier excède votre quota de %s",
-"Error while downloading %s to %s" => "Erreur pendant le téléchargement de %s à %s",
-"Error when creating the file" => "Erreur pendant la création du fichier",
-"Folder name cannot be empty." => "Le nom de dossier ne peux pas être vide.",
-"Error when creating the folder" => "Erreur pendant la création du dossier",
-"Unable to set upload directory." => "Impossible de définir le dossier pour l'upload, charger.",
-"Invalid Token" => "Jeton non valide",
-"No file was uploaded. Unknown error" => "Aucun fichier n'a été envoyé. Erreur inconnue",
-"There is no error, the file uploaded with success" => "Aucune erreur, le fichier a été envoyé avec succès.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
-"The uploaded file was only partially uploaded" => "Le fichier n'a été que partiellement envoyé.",
-"No file was uploaded" => "Pas de fichier envoyé.",
-"Missing a temporary folder" => "Absence de dossier temporaire.",
-"Failed to write to disk" => "Erreur d'écriture sur le disque",
-"Not enough storage available" => "Plus assez d'espace de stockage disponible",
-"Upload failed. Could not find uploaded file" => "L'envoi a échoué. Impossible de trouver le fichier envoyé.",
-"Upload failed. Could not get file info." => "L'envoi a échoué. Impossible d'obtenir les informations du fichier.",
-"Invalid directory." => "Dossier invalide.",
-"Files" => "Fichiers",
-"All files" => "Tous les fichiers",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossible d'envoyer {filename} car il s'agit d'un répertoire ou d'un fichier de taille nulle",
-"Total file size {size1} exceeds upload limit {size2}" => "La taille totale du fichier {size1} excède la taille maximale d'envoi {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Espace insuffisant : vous tentez d'envoyer {size1} mais seulement {size2} sont disponibles",
-"Upload cancelled." => "Envoi annulé.",
-"Could not get result from server." => "Ne peut recevoir les résultats du serveur.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
-"URL cannot be empty" => "L'URL ne peut pas être vide",
-"{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",
-"Error fetching URL" => "Erreur d'accès à l'URL",
-"Share" => "Partager",
-"Delete" => "Supprimer",
-"Disconnect storage" => "Déconnecter ce support de stockage",
-"Unshare" => "Ne plus partager",
-"Delete permanently" => "Supprimer de façon définitive",
-"Rename" => "Renommer",
-"Pending" => "En attente",
-"Error moving file." => "Erreur lors du déplacement du fichier.",
-"Error moving file" => "Erreur lors du déplacement du fichier",
-"Error" => "Erreur",
-"Could not rename file" => "Impossible de renommer le fichier",
-"Error deleting file." => "Erreur pendant la suppression du fichier.",
-"Name" => "Nom",
-"Size" => "Taille",
-"Modified" => "Modifié",
-"_%n folder_::_%n folders_" => array("%n dossier","%n dossiers"),
-"_%n file_::_%n files_" => array("%n fichier","%n fichiers"),
-"You don’t have permission to upload or create files here" => "Vous n'avez pas la permission de téléverser ou de créer des fichiers ici",
-"_Uploading %n file_::_Uploading %n files_" => array("Téléversement de %n fichier","Téléversement de %n fichiers"),
-"\"{name}\" is an invalid file name." => "\"{name}\" n'est pas un nom de fichier valide.",
-"Your storage is full, files can not be updated or synced anymore!" => "Votre espage de stockage est plein, les fichiers ne peuvent plus être téléversés ou synchronisés !",
-"Your storage is almost full ({usedSpacePercent}%)" => "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
-"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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
-"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 pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
-"{dirs} and {files}" => "{dirs} et {files}",
-"%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)",
-"File handling" => "Gestion des fichiers",
-"Maximum upload size" => "Taille max. d'envoi",
-"max. possible: " => "Max. possible :",
-"Save" => "Sauvegarder",
-"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",
-"From link" => "Depuis un lien",
-"Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
-"Download" => "Télécharger",
-"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 permise par ce serveur.",
-"Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
-"Currently scanning" => "Analyse en cours"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/fr_CA.js b/apps/files/l10n/fr_CA.js
new file mode 100644
index 00000000000..f085469f731
--- /dev/null
+++ b/apps/files/l10n/fr_CA.js
@@ -0,0 +1,8 @@
+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/fr_CA.json b/apps/files/l10n/fr_CA.json
new file mode 100644
index 00000000000..ba9792477cd
--- /dev/null
+++ b/apps/files/l10n/fr_CA.json
@@ -0,0 +1,6 @@
+{ "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/fr_CA.php b/apps/files/l10n/fr_CA.php
deleted file mode 100644
index 3c711e6b78a..00000000000
--- a/apps/files/l10n/fr_CA.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/fy_NL.js b/apps/files/l10n/fy_NL.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/fy_NL.js
@@ -0,0 +1,8 @@
+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/fy_NL.json b/apps/files/l10n/fy_NL.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/fy_NL.json
@@ -0,0 +1,6 @@
+{ "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/fy_NL.php b/apps/files/l10n/fy_NL.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/fy_NL.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/gl.js b/apps/files/l10n/gl.js
new file mode 100644
index 00000000000..a169f5c21cf
--- /dev/null
+++ b/apps/files/l10n/gl.js
@@ -0,0 +1,96 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Almacenamento non dispoñíbel",
+    "Storage invalid" : "Almacenamento incorrecto",
+    "Unknown error" : "Produciuse un erro descoñecido",
+    "Could not move %s - File with this name already exists" : "Non foi posíbel mover %s; Xa existe un ficheiro con ese nome.",
+    "Could not move %s" : "Non foi posíbel mover %s",
+    "File name cannot be empty." : "O nome de ficheiro non pode estar baleiro",
+    "\"%s\" is an invalid file name." : "«%s» é un nome incorrecto de ficheiro.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
+    "The target folder has been moved or deleted." : "O cartafol de destino foi movido ou eliminado.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Xa existe o nome %s no cartafol %s. Escolla outro nome.",
+    "Not a valid source" : "Esta orixe non é correcta",
+    "Server is not allowed to open URLs, please check the server configuration" : "O servidor non ten permisos para abrir os enderezos URL, comprobe a configuración do servidor",
+    "The file exceeds your quota by %s" : "O ficheiro excede a súa cota en %s",
+    "Error while downloading %s to %s" : "Produciuse un erro ao descargar %s en %s",
+    "Error when creating the file" : "Produciuse un erro ao crear o ficheiro",
+    "Folder name cannot be empty." : "O nome de cartafol non pode estar baleiro.",
+    "Error when creating the folder" : "Produciuse un erro ao crear o cartafol",
+    "Unable to set upload directory." : "Non é posíbel configurar o directorio de envíos.",
+    "Invalid Token" : "Marca incorrecta",
+    "No file was uploaded. Unknown error" : "Non se enviou ningún ficheiro. Produciuse un erro descoñecido.",
+    "There is no error, the file uploaded with success" : "Non houbo erros, o ficheiro enviouse correctamente",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML",
+    "The uploaded file was only partially uploaded" : "O ficheiro so foi parcialmente enviado",
+    "No file was uploaded" : "Non se enviou ningún ficheiro",
+    "Missing a temporary folder" : "Falta o cartafol temporal",
+    "Failed to write to disk" : "Produciuse un erro ao escribir no disco",
+    "Not enough storage available" : "Non hai espazo de almacenamento abondo",
+    "Upload failed. Could not find uploaded file" : "O envío fracasou. Non foi posíbel atopar o ficheiro enviado",
+    "Upload failed. Could not get file info." : "O envío fracasou. Non foi posíbel obter información do ficheiro.",
+    "Invalid directory." : "O directorio é incorrecto.",
+    "Files" : "Ficheiros",
+    "All files" : "Todos os ficheiros",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "O tamaño total do ficheiro {size1} excede do límite de envío {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}",
+    "Upload cancelled." : "Envío cancelado.",
+    "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
+    "URL cannot be empty" : "O URL non pode quedar en branco.",
+    "{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",
+    "Error fetching URL" : "Produciuse un erro ao obter o URL",
+    "Share" : "Compartir",
+    "Delete" : "Eliminar",
+    "Disconnect storage" : "Desconectar o almacenamento",
+    "Unshare" : "Deixar de compartir",
+    "Delete permanently" : "Eliminar permanentemente",
+    "Rename" : "Renomear",
+    "Pending" : "Pendentes",
+    "Error moving file." : "Produciuse un erro ao mover o ficheiro.",
+    "Error moving file" : "Produciuse un erro ao mover o ficheiro",
+    "Error" : "Erro",
+    "Could not rename file" : "Non foi posíbel renomear o ficheiro",
+    "Error deleting file." : "Produciuse un erro ao eliminar o ficheiro.",
+    "Name" : "Nome",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n cartafol","%n cartafoles"],
+    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "«{name}» é un nome incorrecto de ficheiro.",
+    "Your storage is full, files can not be updated or synced anymore!" : "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
+    "{dirs} and {files}" : "{dirs} e {files}",
+    "%s could not be renamed as it has been deleted" : "Non é posíbel renomear %s xa que foi eliminado",
+    "%s could not be renamed" : "%s non pode cambiar de nome",
+    "Upload (max. %s)" : "Envío (máx. %s)",
+    "File handling" : "Manexo de ficheiro",
+    "Maximum upload size" : "Tamaño máximo do envío",
+    "max. possible: " : "máx. posíbel: ",
+    "Save" : "Gardar",
+    "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",
+    "From link" : "Desde a ligazón",
+    "Nothing in here. Upload something!" : "Aquí non hai nada. Envíe algo.",
+    "Download" : "Descargar",
+    "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.",
+    "Currently scanning" : "Análise actual"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/gl.json b/apps/files/l10n/gl.json
new file mode 100644
index 00000000000..cf1f30dcfc4
--- /dev/null
+++ b/apps/files/l10n/gl.json
@@ -0,0 +1,94 @@
+{ "translations": {
+    "Storage not available" : "Almacenamento non dispoñíbel",
+    "Storage invalid" : "Almacenamento incorrecto",
+    "Unknown error" : "Produciuse un erro descoñecido",
+    "Could not move %s - File with this name already exists" : "Non foi posíbel mover %s; Xa existe un ficheiro con ese nome.",
+    "Could not move %s" : "Non foi posíbel mover %s",
+    "File name cannot be empty." : "O nome de ficheiro non pode estar baleiro",
+    "\"%s\" is an invalid file name." : "«%s» é un nome incorrecto de ficheiro.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
+    "The target folder has been moved or deleted." : "O cartafol de destino foi movido ou eliminado.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Xa existe o nome %s no cartafol %s. Escolla outro nome.",
+    "Not a valid source" : "Esta orixe non é correcta",
+    "Server is not allowed to open URLs, please check the server configuration" : "O servidor non ten permisos para abrir os enderezos URL, comprobe a configuración do servidor",
+    "The file exceeds your quota by %s" : "O ficheiro excede a súa cota en %s",
+    "Error while downloading %s to %s" : "Produciuse un erro ao descargar %s en %s",
+    "Error when creating the file" : "Produciuse un erro ao crear o ficheiro",
+    "Folder name cannot be empty." : "O nome de cartafol non pode estar baleiro.",
+    "Error when creating the folder" : "Produciuse un erro ao crear o cartafol",
+    "Unable to set upload directory." : "Non é posíbel configurar o directorio de envíos.",
+    "Invalid Token" : "Marca incorrecta",
+    "No file was uploaded. Unknown error" : "Non se enviou ningún ficheiro. Produciuse un erro descoñecido.",
+    "There is no error, the file uploaded with success" : "Non houbo erros, o ficheiro enviouse correctamente",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML",
+    "The uploaded file was only partially uploaded" : "O ficheiro so foi parcialmente enviado",
+    "No file was uploaded" : "Non se enviou ningún ficheiro",
+    "Missing a temporary folder" : "Falta o cartafol temporal",
+    "Failed to write to disk" : "Produciuse un erro ao escribir no disco",
+    "Not enough storage available" : "Non hai espazo de almacenamento abondo",
+    "Upload failed. Could not find uploaded file" : "O envío fracasou. Non foi posíbel atopar o ficheiro enviado",
+    "Upload failed. Could not get file info." : "O envío fracasou. Non foi posíbel obter información do ficheiro.",
+    "Invalid directory." : "O directorio é incorrecto.",
+    "Files" : "Ficheiros",
+    "All files" : "Todos os ficheiros",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "O tamaño total do ficheiro {size1} excede do límite de envío {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}",
+    "Upload cancelled." : "Envío cancelado.",
+    "Could not get result from server." : "Non foi posíbel obter o resultado do servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
+    "URL cannot be empty" : "O URL non pode quedar en branco.",
+    "{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",
+    "Error fetching URL" : "Produciuse un erro ao obter o URL",
+    "Share" : "Compartir",
+    "Delete" : "Eliminar",
+    "Disconnect storage" : "Desconectar o almacenamento",
+    "Unshare" : "Deixar de compartir",
+    "Delete permanently" : "Eliminar permanentemente",
+    "Rename" : "Renomear",
+    "Pending" : "Pendentes",
+    "Error moving file." : "Produciuse un erro ao mover o ficheiro.",
+    "Error moving file" : "Produciuse un erro ao mover o ficheiro",
+    "Error" : "Erro",
+    "Could not rename file" : "Non foi posíbel renomear o ficheiro",
+    "Error deleting file." : "Produciuse un erro ao eliminar o ficheiro.",
+    "Name" : "Nome",
+    "Size" : "Tamaño",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n cartafol","%n cartafoles"],
+    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "«{name}» é un nome incorrecto de ficheiro.",
+    "Your storage is full, files can not be updated or synced anymore!" : "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
+    "{dirs} and {files}" : "{dirs} e {files}",
+    "%s could not be renamed as it has been deleted" : "Non é posíbel renomear %s xa que foi eliminado",
+    "%s could not be renamed" : "%s non pode cambiar de nome",
+    "Upload (max. %s)" : "Envío (máx. %s)",
+    "File handling" : "Manexo de ficheiro",
+    "Maximum upload size" : "Tamaño máximo do envío",
+    "max. possible: " : "máx. posíbel: ",
+    "Save" : "Gardar",
+    "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",
+    "From link" : "Desde a ligazón",
+    "Nothing in here. Upload something!" : "Aquí non hai nada. Envíe algo.",
+    "Download" : "Descargar",
+    "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.",
+    "Currently scanning" : "Análise actual"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
deleted file mode 100644
index 0671a0ac474..00000000000
--- a/apps/files/l10n/gl.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Almacenamento non dispoñíbel",
-"Storage invalid" => "Almacenamento incorrecto",
-"Unknown error" => "Produciuse un erro descoñecido",
-"Could not move %s - File with this name already exists" => "Non foi posíbel mover %s; Xa existe un ficheiro con ese nome.",
-"Could not move %s" => "Non foi posíbel mover %s",
-"File name cannot be empty." => "O nome de ficheiro non pode estar baleiro",
-"\"%s\" is an invalid file name." => "«%s» é un nome incorrecto de ficheiro.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome incorrecto, non se permite «\\», «/», «<», «>», «:», «\"», «|», «?» e «*».",
-"The target folder has been moved or deleted." => "O cartafol de destino foi movido ou eliminado.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Xa existe o nome %s no cartafol %s. Escolla outro nome.",
-"Not a valid source" => "Esta orixe non é correcta",
-"Server is not allowed to open URLs, please check the server configuration" => "O servidor non ten permisos para abrir os enderezos URL, comprobe a configuración do servidor",
-"The file exceeds your quota by %s" => "O ficheiro excede a súa cota en %s",
-"Error while downloading %s to %s" => "Produciuse un erro ao descargar %s en %s",
-"Error when creating the file" => "Produciuse un erro ao crear o ficheiro",
-"Folder name cannot be empty." => "O nome de cartafol non pode estar baleiro.",
-"Error when creating the folder" => "Produciuse un erro ao crear o cartafol",
-"Unable to set upload directory." => "Non é posíbel configurar o directorio de envíos.",
-"Invalid Token" => "Marca incorrecta",
-"No file was uploaded. Unknown error" => "Non se enviou ningún ficheiro. Produciuse un erro descoñecido.",
-"There is no error, the file uploaded with success" => "Non houbo erros, o ficheiro enviouse correctamente",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede a directiva indicada por upload_max_filesize de php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado excede da directiva MAX_FILE_SIZE especificada no formulario HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro so foi parcialmente enviado",
-"No file was uploaded" => "Non se enviou ningún ficheiro",
-"Missing a temporary folder" => "Falta o cartafol temporal",
-"Failed to write to disk" => "Produciuse un erro ao escribir no disco",
-"Not enough storage available" => "Non hai espazo de almacenamento abondo",
-"Upload failed. Could not find uploaded file" => "O envío fracasou. Non foi posíbel atopar o ficheiro enviado",
-"Upload failed. Could not get file info." => "O envío fracasou. Non foi posíbel obter información do ficheiro.",
-"Invalid directory." => "O directorio é incorrecto.",
-"Files" => "Ficheiros",
-"All files" => "Todos os ficheiros",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Non é posíbel enviar {filename}, xa que ou é un directorio ou ten 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "O tamaño total do ficheiro {size1} excede do límite de envío {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Non hai espazo libre abondo, o seu envío é de {size1} mais só dispón de {size2}",
-"Upload cancelled." => "Envío cancelado.",
-"Could not get result from server." => "Non foi posíbel obter o resultado do servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "O envío do ficheiro está en proceso. Saír agora da páxina cancelará o envío.",
-"URL cannot be empty" => "O URL non pode quedar en branco.",
-"{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",
-"Error fetching URL" => "Produciuse un erro ao obter o URL",
-"Share" => "Compartir",
-"Delete" => "Eliminar",
-"Disconnect storage" => "Desconectar o almacenamento",
-"Unshare" => "Deixar de compartir",
-"Delete permanently" => "Eliminar permanentemente",
-"Rename" => "Renomear",
-"Pending" => "Pendentes",
-"Error moving file." => "Produciuse un erro ao mover o ficheiro.",
-"Error moving file" => "Produciuse un erro ao mover o ficheiro",
-"Error" => "Erro",
-"Could not rename file" => "Non foi posíbel renomear o ficheiro",
-"Error deleting file." => "Produciuse un erro ao eliminar o ficheiro.",
-"Name" => "Nome",
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("%n cartafol","%n cartafoles"),
-"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
-"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_" => array("Cargando %n ficheiro","Cargando %n ficheiros"),
-"\"{name}\" is an invalid file name." => "«{name}» é un nome incorrecto de ficheiro.",
-"Your storage is full, files can not be updated or synced anymore!" => "O seu espazo de almacenamento está cheo, non é posíbel actualizar ou sincronizar máis os ficheiros!",
-"Your storage is almost full ({usedSpacePercent}%)" => "O seu espazo de almacenamento está case cheo ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada para a aplicación de cifrado non é correcta. Actualice o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros cifrados.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "O cifrado foi desactivado, mais os ficheiros están cifrados. Vaia á configuración persoal para descifrar os ficheiros.",
-"{dirs} and {files}" => "{dirs} e {files}",
-"%s could not be renamed as it has been deleted" => "Non é posíbel renomear %s xa que foi eliminado",
-"%s could not be renamed" => "%s non pode cambiar de nome",
-"Upload (max. %s)" => "Envío (máx. %s)",
-"File handling" => "Manexo de ficheiro",
-"Maximum upload size" => "Tamaño máximo do envío",
-"max. possible: " => "máx. posíbel: ",
-"Save" => "Gardar",
-"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",
-"From link" => "Desde a ligazón",
-"Nothing in here. Upload something!" => "Aquí non hai nada. Envíe algo.",
-"Download" => "Descargar",
-"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.",
-"Currently scanning" => "Análise actual"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/gu.js b/apps/files/l10n/gu.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/gu.js
@@ -0,0 +1,8 @@
+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/gu.json b/apps/files/l10n/gu.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/gu.json
@@ -0,0 +1,6 @@
+{ "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/gu.php b/apps/files/l10n/gu.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/gu.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/he.js b/apps/files/l10n/he.js
new file mode 100644
index 00000000000..4db22fef4ed
--- /dev/null
+++ b/apps/files/l10n/he.js
@@ -0,0 +1,56 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "שגיאה בלתי ידועה",
+    "Could not move %s - File with this name already exists" : "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים",
+    "Could not move %s" : "לא ניתן להעביר את %s",
+    "File name cannot be empty." : "שם קובץ אינו יכול להיות ריק",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
+    "No file was uploaded. Unknown error" : "לא הועלה קובץ. טעות בלתי מזוהה.",
+    "There is no error, the file uploaded with success" : "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
+    "The uploaded file was only partially uploaded" : "הקובץ הועלה באופן חלקי בלבד",
+    "No file was uploaded" : "שום קובץ לא הועלה",
+    "Missing a temporary folder" : "תקיה זמנית חסרה",
+    "Failed to write to disk" : "הכתיבה לכונן נכשלה",
+    "Not enough storage available" : "אין די שטח פנוי באחסון",
+    "Upload failed. Could not get file info." : "העלאה נכשלה. לא ניתן להשיג את פרטי הקובץ.",
+    "Invalid directory." : "תיקייה שגויה.",
+    "Files" : "קבצים",
+    "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} כבר קיים",
+    "Share" : "שתף",
+    "Delete" : "מחיקה",
+    "Unshare" : "הסר שיתוף",
+    "Delete permanently" : "מחק לצמיתות",
+    "Rename" : "שינוי שם",
+    "Pending" : "ממתין",
+    "Error" : "שגיאה",
+    "Name" : "שם",
+    "Size" : "גודל",
+    "Modified" : "זמן שינוי",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Your storage is almost full ({usedSpacePercent}%)" : "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
+    "Upload (max. %s)" : "העלאה (מקסימום %s)",
+    "File handling" : "טיפול בקבצים",
+    "Maximum upload size" : "גודל העלאה מקסימלי",
+    "max. possible: " : "המרבי האפשרי: ",
+    "Save" : "שמירה",
+    "WebDAV" : "WebDAV",
+    "New" : "חדש",
+    "Text file" : "קובץ טקסט",
+    "New folder" : "תיקייה חדשה",
+    "Folder" : "תיקייה",
+    "From link" : "מקישור",
+    "Nothing in here. Upload something!" : "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
+    "Download" : "הורדה",
+    "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." : "הקבצים נסרקים, נא להמתין."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/he.json b/apps/files/l10n/he.json
new file mode 100644
index 00000000000..b876983cbbb
--- /dev/null
+++ b/apps/files/l10n/he.json
@@ -0,0 +1,54 @@
+{ "translations": {
+    "Unknown error" : "שגיאה בלתי ידועה",
+    "Could not move %s - File with this name already exists" : "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים",
+    "Could not move %s" : "לא ניתן להעביר את %s",
+    "File name cannot be empty." : "שם קובץ אינו יכול להיות ריק",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
+    "No file was uploaded. Unknown error" : "לא הועלה קובץ. טעות בלתי מזוהה.",
+    "There is no error, the file uploaded with success" : "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
+    "The uploaded file was only partially uploaded" : "הקובץ הועלה באופן חלקי בלבד",
+    "No file was uploaded" : "שום קובץ לא הועלה",
+    "Missing a temporary folder" : "תקיה זמנית חסרה",
+    "Failed to write to disk" : "הכתיבה לכונן נכשלה",
+    "Not enough storage available" : "אין די שטח פנוי באחסון",
+    "Upload failed. Could not get file info." : "העלאה נכשלה. לא ניתן להשיג את פרטי הקובץ.",
+    "Invalid directory." : "תיקייה שגויה.",
+    "Files" : "קבצים",
+    "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} כבר קיים",
+    "Share" : "שתף",
+    "Delete" : "מחיקה",
+    "Unshare" : "הסר שיתוף",
+    "Delete permanently" : "מחק לצמיתות",
+    "Rename" : "שינוי שם",
+    "Pending" : "ממתין",
+    "Error" : "שגיאה",
+    "Name" : "שם",
+    "Size" : "גודל",
+    "Modified" : "זמן שינוי",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Your storage is almost full ({usedSpacePercent}%)" : "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
+    "Upload (max. %s)" : "העלאה (מקסימום %s)",
+    "File handling" : "טיפול בקבצים",
+    "Maximum upload size" : "גודל העלאה מקסימלי",
+    "max. possible: " : "המרבי האפשרי: ",
+    "Save" : "שמירה",
+    "WebDAV" : "WebDAV",
+    "New" : "חדש",
+    "Text file" : "קובץ טקסט",
+    "New folder" : "תיקייה חדשה",
+    "Folder" : "תיקייה",
+    "From link" : "מקישור",
+    "Nothing in here. Upload something!" : "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
+    "Download" : "הורדה",
+    "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." : "הקבצים נסרקים, נא להמתין."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
deleted file mode 100644
index 5eae5e46f27..00000000000
--- a/apps/files/l10n/he.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "שגיאה בלתי ידועה",
-"Could not move %s - File with this name already exists" => "לא ניתן להעביר את %s - קובץ בשם הזה כבר קיים",
-"Could not move %s" => "לא ניתן להעביר את %s",
-"File name cannot be empty." => "שם קובץ אינו יכול להיות ריק",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "השם שגוי, אסור להשתמש בתווים '\\', '/', '<', '>', ':', '\"', '|', '?' ו־'*'.",
-"No file was uploaded. Unknown error" => "לא הועלה קובץ. טעות בלתי מזוהה.",
-"There is no error, the file uploaded with success" => "לא התרחשה שגיאה, הקובץ הועלה בהצלחה",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "הקבצים שנשלחו חורגים מהגודל שצוין בהגדרה upload_max_filesize שבקובץ php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "הקובץ שהועלה גדוך מהערך MAX_FILE_SIZE שהוגדר בתופס HTML",
-"The uploaded file was only partially uploaded" => "הקובץ הועלה באופן חלקי בלבד",
-"No file was uploaded" => "שום קובץ לא הועלה",
-"Missing a temporary folder" => "תקיה זמנית חסרה",
-"Failed to write to disk" => "הכתיבה לכונן נכשלה",
-"Not enough storage available" => "אין די שטח פנוי באחסון",
-"Upload failed. Could not get file info." => "העלאה נכשלה. לא ניתן להשיג את פרטי הקובץ.",
-"Invalid directory." => "תיקייה שגויה.",
-"Files" => "קבצים",
-"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} כבר קיים",
-"Share" => "שתף",
-"Delete" => "מחיקה",
-"Unshare" => "הסר שיתוף",
-"Delete permanently" => "מחק לצמיתות",
-"Rename" => "שינוי שם",
-"Pending" => "ממתין",
-"Error" => "שגיאה",
-"Name" => "שם",
-"Size" => "גודל",
-"Modified" => "זמן שינוי",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Your storage is almost full ({usedSpacePercent}%)" => "שטח האחסון שלך כמעט מלא ({usedSpacePercent}%)",
-"Upload (max. %s)" => "העלאה (מקסימום %s)",
-"File handling" => "טיפול בקבצים",
-"Maximum upload size" => "גודל העלאה מקסימלי",
-"max. possible: " => "המרבי האפשרי: ",
-"Save" => "שמירה",
-"WebDAV" => "WebDAV",
-"New" => "חדש",
-"Text file" => "קובץ טקסט",
-"New folder" => "תיקייה חדשה",
-"Folder" => "תיקייה",
-"From link" => "מקישור",
-"Nothing in here. Upload something!" => "אין כאן שום דבר. אולי ברצונך להעלות משהו?",
-"Download" => "הורדה",
-"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." => "הקבצים נסרקים, נא להמתין."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hi.js b/apps/files/l10n/hi.js
new file mode 100644
index 00000000000..21b409ce9ef
--- /dev/null
+++ b/apps/files/l10n/hi.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "files",
+    {
+    "Files" : "फाइलें ",
+    "Share" : "साझा करें",
+    "Error" : "त्रुटि",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "सहेजें",
+    "New folder" : "नया फ़ोल्डर"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hi.json b/apps/files/l10n/hi.json
new file mode 100644
index 00000000000..093b80ce700
--- /dev/null
+++ b/apps/files/l10n/hi.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Files" : "फाइलें ",
+    "Share" : "साझा करें",
+    "Error" : "त्रुटि",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "सहेजें",
+    "New folder" : "नया फ़ोल्डर"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/hi.php b/apps/files/l10n/hi.php
deleted file mode 100644
index d38129dd9a2..00000000000
--- a/apps/files/l10n/hi.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Files" => "फाइलें ",
-"Share" => "साझा करें",
-"Error" => "त्रुटि",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "सहेजें",
-"New folder" => "नया फ़ोल्डर"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hi_IN.js b/apps/files/l10n/hi_IN.js
new file mode 100644
index 00000000000..5bdf101699a
--- /dev/null
+++ b/apps/files/l10n/hi_IN.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..26e5833738b
--- /dev/null
+++ b/apps/files/l10n/hi_IN.json
@@ -0,0 +1 @@
+{"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/hi_IN.php b/apps/files/l10n/hi_IN.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/hi_IN.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hr.js b/apps/files/l10n/hr.js
new file mode 100644
index 00000000000..ad4eead41cc
--- /dev/null
+++ b/apps/files/l10n/hr.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Pohrana nedostupna",
+    "Storage invalid" : "Pohrana neispravna",
+    "Unknown error" : "Nepoznata pogreška",
+    "Could not move %s - File with this name already exists" : "Nemoguće premjestiti %s - Datoteka takvog naziva već postoji",
+    "Could not move %s" : "Nemoguće premjestiti %s",
+    "Permission denied" : "Nemate dozvolu",
+    "File name cannot be empty." : "Naziv datoteke ne može biti prazan.",
+    "\"%s\" is an invalid file name." : "\"%s\" je neispravan naziv datoteke.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neispravan naziv,'\\', '/', '<', '>', ':', '\"', '|', '?' i '*' nisu dozvoljeni.",
+    "The target folder has been moved or deleted." : "Ciljna mapa je premještena ili izbrisana.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Naziv %s je već iskorišten u mapi %s. Molimo odaberite drukčiji naziv.",
+    "Not a valid source" : "Izvor nije valjan",
+    "Server is not allowed to open URLs, please check the server configuration" : "Poslužitelj ne smije otvarati URL-ove, molimo provjerite konfiguraciju poslužitelja",
+    "The file exceeds your quota by %s" : "Datoteka premašuje vašu kvotu za %s",
+    "Error while downloading %s to %s" : "Pogreška pri prenošenju %s u %s",
+    "Error when creating the file" : "Pogreška pri kreiranju datoteke",
+    "Folder name cannot be empty." : "Naziv mape ne može biti prazan.",
+    "Error when creating the folder" : "Pogreška pri kreiranju mape",
+    "Unable to set upload directory." : "Postavka učitavanja direktorija nije moguća",
+    "Invalid Token" : "Neispravan token",
+    "No file was uploaded. Unknown error" : "Nijedna datoteka nije učitana. Pogreška nepoznata.",
+    "There is no error, the file uploaded with success" : "Pogreške nema, datoteka uspješno učitana",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Učitana datoteka premašuje maksimalnu dopuštenu veličinu navedenu u php. ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Učitana datoteka premašuje MAX_FILE_SIZE direktivu navedenu u HTML formi",
+    "The uploaded file was only partially uploaded" : "Učitana datoteka samo je djelomično učitana",
+    "No file was uploaded" : "Nijedna datoteka nije učitana",
+    "Missing a temporary folder" : "Nedostaje privremena mapa",
+    "Failed to write to disk" : "Zapisivanje na disk nije uspjelo",
+    "Not enough storage available" : "Prostor za pohranu nedostatan",
+    "Upload failed. Could not find uploaded file" : "Učitavanje neuspješno. Nije emoguće pronaći učitanu dataoteku",
+    "Upload failed. Could not get file info." : "Učitavanje neuspješno. Nije moguće dohvatiti informacije o datoteci",
+    "Invalid directory." : "Neispravan direktorij",
+    "Files" : "Datoteke",
+    "All files" : "Sve datoteke",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta",
+    "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nedovoljno slobodnog prostora, vi učitavate {size1} a samo je {size2} preostalo",
+    "Upload cancelled." : "Učitavanje je prekinuto.",
+    "Could not get result from server." : "Nemoguće dobiti rezultat od poslužitelja.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
+    "URL cannot be empty" : "URL ne može biti prazan",
+    "{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",
+    "Error fetching URL" : "Pogrešan dohvat URL",
+    "Share" : "Podijelite resurs",
+    "Delete" : "Izbrišite",
+    "Disconnect storage" : "Isključite pohranu",
+    "Unshare" : "Prestanite dijeliti",
+    "Delete permanently" : "Trajno izbrišite",
+    "Rename" : "Preimenujte",
+    "Pending" : "Na čekanju",
+    "Error moving file." : "Pogrešno premještanje datoteke",
+    "Error moving file" : "Pogrešno premještanje datoteke",
+    "Error" : "Pogreška",
+    "Could not rename file" : "Datoteku nije moguće preimenovati",
+    "Error deleting file." : "Pogrešno brisanje datoteke",
+    "Name" : "Naziv",
+    "Size" : "Veličina",
+    "Modified" : "Promijenjeno",
+    "_%n folder_::_%n folders_" : ["%n mapa","%n mape","%n mapa"],
+    "_%n file_::_%n files_" : ["%n datoteka","%n datoteke","%n datoteka"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
+    "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}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je onemogućena, ali vaši ključevi nisu inicijalizirani, molimo odjavite se i ponovno prijavite",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, otiđite u svojeosobne postavke da biste dešifrirali svoje datoteke.",
+    "{dirs} and {files}" : "{dirs} i {files}",
+    "%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)" : "Prijenos (max. %s)",
+    "File handling" : "Obrada datoteke",
+    "Maximum upload size" : "Maksimalna veličina učitanog sadržaja",
+    "max. possible: " : "max. moguće: ",
+    "Save" : "Spremite",
+    "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",
+    "From link" : "Od veze",
+    "Nothing in here. Upload something!" : "Ovdje nema ničega. Učitajte nešto!",
+    "Download" : "Preuzimanje",
+    "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.",
+    "Currently scanning" : "Provjera u tijeku"
+},
+"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/l10n/hr.json b/apps/files/l10n/hr.json
new file mode 100644
index 00000000000..482796da4a1
--- /dev/null
+++ b/apps/files/l10n/hr.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Pohrana nedostupna",
+    "Storage invalid" : "Pohrana neispravna",
+    "Unknown error" : "Nepoznata pogreška",
+    "Could not move %s - File with this name already exists" : "Nemoguće premjestiti %s - Datoteka takvog naziva već postoji",
+    "Could not move %s" : "Nemoguće premjestiti %s",
+    "Permission denied" : "Nemate dozvolu",
+    "File name cannot be empty." : "Naziv datoteke ne može biti prazan.",
+    "\"%s\" is an invalid file name." : "\"%s\" je neispravan naziv datoteke.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neispravan naziv,'\\', '/', '<', '>', ':', '\"', '|', '?' i '*' nisu dozvoljeni.",
+    "The target folder has been moved or deleted." : "Ciljna mapa je premještena ili izbrisana.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Naziv %s je već iskorišten u mapi %s. Molimo odaberite drukčiji naziv.",
+    "Not a valid source" : "Izvor nije valjan",
+    "Server is not allowed to open URLs, please check the server configuration" : "Poslužitelj ne smije otvarati URL-ove, molimo provjerite konfiguraciju poslužitelja",
+    "The file exceeds your quota by %s" : "Datoteka premašuje vašu kvotu za %s",
+    "Error while downloading %s to %s" : "Pogreška pri prenošenju %s u %s",
+    "Error when creating the file" : "Pogreška pri kreiranju datoteke",
+    "Folder name cannot be empty." : "Naziv mape ne može biti prazan.",
+    "Error when creating the folder" : "Pogreška pri kreiranju mape",
+    "Unable to set upload directory." : "Postavka učitavanja direktorija nije moguća",
+    "Invalid Token" : "Neispravan token",
+    "No file was uploaded. Unknown error" : "Nijedna datoteka nije učitana. Pogreška nepoznata.",
+    "There is no error, the file uploaded with success" : "Pogreške nema, datoteka uspješno učitana",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Učitana datoteka premašuje maksimalnu dopuštenu veličinu navedenu u php. ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Učitana datoteka premašuje MAX_FILE_SIZE direktivu navedenu u HTML formi",
+    "The uploaded file was only partially uploaded" : "Učitana datoteka samo je djelomično učitana",
+    "No file was uploaded" : "Nijedna datoteka nije učitana",
+    "Missing a temporary folder" : "Nedostaje privremena mapa",
+    "Failed to write to disk" : "Zapisivanje na disk nije uspjelo",
+    "Not enough storage available" : "Prostor za pohranu nedostatan",
+    "Upload failed. Could not find uploaded file" : "Učitavanje neuspješno. Nije emoguće pronaći učitanu dataoteku",
+    "Upload failed. Could not get file info." : "Učitavanje neuspješno. Nije moguće dohvatiti informacije o datoteci",
+    "Invalid directory." : "Neispravan direktorij",
+    "Files" : "Datoteke",
+    "All files" : "Sve datoteke",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta",
+    "Total file size {size1} exceeds upload limit {size2}" : "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nedovoljno slobodnog prostora, vi učitavate {size1} a samo je {size2} preostalo",
+    "Upload cancelled." : "Učitavanje je prekinuto.",
+    "Could not get result from server." : "Nemoguće dobiti rezultat od poslužitelja.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
+    "URL cannot be empty" : "URL ne može biti prazan",
+    "{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",
+    "Error fetching URL" : "Pogrešan dohvat URL",
+    "Share" : "Podijelite resurs",
+    "Delete" : "Izbrišite",
+    "Disconnect storage" : "Isključite pohranu",
+    "Unshare" : "Prestanite dijeliti",
+    "Delete permanently" : "Trajno izbrišite",
+    "Rename" : "Preimenujte",
+    "Pending" : "Na čekanju",
+    "Error moving file." : "Pogrešno premještanje datoteke",
+    "Error moving file" : "Pogrešno premještanje datoteke",
+    "Error" : "Pogreška",
+    "Could not rename file" : "Datoteku nije moguće preimenovati",
+    "Error deleting file." : "Pogrešno brisanje datoteke",
+    "Name" : "Naziv",
+    "Size" : "Veličina",
+    "Modified" : "Promijenjeno",
+    "_%n folder_::_%n folders_" : ["%n mapa","%n mape","%n mapa"],
+    "_%n file_::_%n files_" : ["%n datoteka","%n datoteke","%n datoteka"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" je neispravno ime datoteke.",
+    "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}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacija šifriranja je onemogućena, ali vaši ključevi nisu inicijalizirani, molimo odjavite se i ponovno prijavite",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, otiđite u svojeosobne postavke da biste dešifrirali svoje datoteke.",
+    "{dirs} and {files}" : "{dirs} i {files}",
+    "%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)" : "Prijenos (max. %s)",
+    "File handling" : "Obrada datoteke",
+    "Maximum upload size" : "Maksimalna veličina učitanog sadržaja",
+    "max. possible: " : "max. moguće: ",
+    "Save" : "Spremite",
+    "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",
+    "From link" : "Od veze",
+    "Nothing in here. Upload something!" : "Ovdje nema ničega. Učitajte nešto!",
+    "Download" : "Preuzimanje",
+    "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.",
+    "Currently scanning" : "Provjera u tijeku"
+},"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/l10n/hr.php b/apps/files/l10n/hr.php
deleted file mode 100644
index 7c4016d31b3..00000000000
--- a/apps/files/l10n/hr.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Pohrana nedostupna",
-"Storage invalid" => "Pohrana neispravna",
-"Unknown error" => "Nepoznata pogreška",
-"Could not move %s - File with this name already exists" => "Nemoguće premjestiti %s - Datoteka takvog naziva već postoji",
-"Could not move %s" => "Nemoguće premjestiti %s",
-"Permission denied" => "Nemate dozvolu",
-"File name cannot be empty." => "Naziv datoteke ne može biti prazan.",
-"\"%s\" is an invalid file name." => "\"%s\" je neispravan naziv datoteke.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neispravan naziv,'\\', '/', '<', '>', ':', '\"', '|', '?' i '*' nisu dozvoljeni.",
-"The target folder has been moved or deleted." => "Ciljna mapa je premještena ili izbrisana.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Naziv %s je već iskorišten u mapi %s. Molimo odaberite drukčiji naziv.",
-"Not a valid source" => "Izvor nije valjan",
-"Server is not allowed to open URLs, please check the server configuration" => "Poslužitelj ne smije otvarati URL-ove, molimo provjerite konfiguraciju poslužitelja",
-"The file exceeds your quota by %s" => "Datoteka premašuje vašu kvotu za %s",
-"Error while downloading %s to %s" => "Pogreška pri prenošenju %s u %s",
-"Error when creating the file" => "Pogreška pri kreiranju datoteke",
-"Folder name cannot be empty." => "Naziv mape ne može biti prazan.",
-"Error when creating the folder" => "Pogreška pri kreiranju mape",
-"Unable to set upload directory." => "Postavka učitavanja direktorija nije moguća",
-"Invalid Token" => "Neispravan token",
-"No file was uploaded. Unknown error" => "Nijedna datoteka nije učitana. Pogreška nepoznata.",
-"There is no error, the file uploaded with success" => "Pogreške nema, datoteka uspješno učitana",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Učitana datoteka premašuje maksimalnu dopuštenu veličinu navedenu u php. ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Učitana datoteka premašuje MAX_FILE_SIZE direktivu navedenu u HTML formi",
-"The uploaded file was only partially uploaded" => "Učitana datoteka samo je djelomično učitana",
-"No file was uploaded" => "Nijedna datoteka nije učitana",
-"Missing a temporary folder" => "Nedostaje privremena mapa",
-"Failed to write to disk" => "Zapisivanje na disk nije uspjelo",
-"Not enough storage available" => "Prostor za pohranu nedostatan",
-"Upload failed. Could not find uploaded file" => "Učitavanje neuspješno. Nije emoguće pronaći učitanu dataoteku",
-"Upload failed. Could not get file info." => "Učitavanje neuspješno. Nije moguće dohvatiti informacije o datoteci",
-"Invalid directory." => "Neispravan direktorij",
-"Files" => "Datoteke",
-"All files" => "Sve datoteke",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nije moguće učitati {filename} jer je ili direktorij ili ima 0 bajta",
-"Total file size {size1} exceeds upload limit {size2}" => "Ukupna veličina datoteke {size1} premašuje ograničenje unosa {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nedovoljno slobodnog prostora, vi učitavate {size1} a samo je {size2} preostalo",
-"Upload cancelled." => "Učitavanje je prekinuto.",
-"Could not get result from server." => "Nemoguće dobiti rezultat od poslužitelja.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Učitavanje datoteke je u tijeku. Napuštanje stranice prekinut će učitavanje.",
-"URL cannot be empty" => "URL ne može biti prazan",
-"{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",
-"Error fetching URL" => "Pogrešan dohvat URL",
-"Share" => "Podijelite resurs",
-"Delete" => "Izbrišite",
-"Disconnect storage" => "Isključite pohranu",
-"Unshare" => "Prestanite dijeliti",
-"Delete permanently" => "Trajno izbrišite",
-"Rename" => "Preimenujte",
-"Pending" => "Na čekanju",
-"Error moving file." => "Pogrešno premještanje datoteke",
-"Error moving file" => "Pogrešno premještanje datoteke",
-"Error" => "Pogreška",
-"Could not rename file" => "Datoteku nije moguće preimenovati",
-"Error deleting file." => "Pogrešno brisanje datoteke",
-"Name" => "Naziv",
-"Size" => "Veličina",
-"Modified" => "Promijenjeno",
-"_%n folder_::_%n folders_" => array("%n mapa","%n mape","%n mapa"),
-"_%n file_::_%n files_" => array("%n datoteka","%n datoteke","%n datoteka"),
-"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_" => array("Prenosim %n datoteku","Prenosim %n datoteke","Prenosim %n datoteka"),
-"\"{name}\" is an invalid file name." => "\"{name}\" je neispravno ime datoteke.",
-"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}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Aplikacija šifriranja je onemogućena, ali vaši ključevi nisu inicijalizirani, molimo odjavite se i ponovno prijavite",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifriranje je onemogućeno, ali vaše su datoteke još uvijek šifrirane. Molimo, otiđite u svojeosobne postavke da biste dešifrirali svoje datoteke.",
-"{dirs} and {files}" => "{dirs} i {files}",
-"%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)" => "Prijenos (max. %s)",
-"File handling" => "Obrada datoteke",
-"Maximum upload size" => "Maksimalna veličina učitanog sadržaja",
-"max. possible: " => "max. moguće: ",
-"Save" => "Spremite",
-"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",
-"From link" => "Od veze",
-"Nothing in here. Upload something!" => "Ovdje nema ničega. Učitajte nešto!",
-"Download" => "Preuzimanje",
-"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.",
-"Currently scanning" => "Provjera u tijeku"
-);
-$PLURAL_FORMS = "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/l10n/hu_HU.js b/apps/files/l10n/hu_HU.js
new file mode 100644
index 00000000000..34a9c73aa08
--- /dev/null
+++ b/apps/files/l10n/hu_HU.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "A tároló elérhetetlen.",
+    "Storage invalid" : "A tároló érvénytelen",
+    "Unknown error" : "Ismeretlen hiba",
+    "Could not move %s - File with this name already exists" : "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
+    "Could not move %s" : "Nem sikerült %s áthelyezése",
+    "Permission denied" : "Engedély megtagadva ",
+    "File name cannot be empty." : "A fájlnév nem lehet semmi.",
+    "\"%s\" is an invalid file name." : "\"%s\" érvénytelen, mint fájlnév.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
+    "The target folder has been moved or deleted." : "A célmappa törlődött, vagy áthelyezésre került.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "A %s név már létezik a %s mappában. Kérem válasszon másik nevet!",
+    "Not a valid source" : "A kiinduló állomány érvénytelen",
+    "Server is not allowed to open URLs, please check the server configuration" : "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat!",
+    "The file exceeds your quota by %s" : "A fájl ennyivel meghaladja a kvótáját: %s",
+    "Error while downloading %s to %s" : "Hiba történt miközben %s-t letöltöttük %s-be",
+    "Error when creating the file" : "Hiba történt az állomány létrehozásakor",
+    "Folder name cannot be empty." : "A mappa neve nem maradhat kitöltetlenül",
+    "Error when creating the folder" : "Hiba történt a mappa létrehozásakor",
+    "Unable to set upload directory." : "Nem található a mappa, ahova feltölteni szeretne.",
+    "Invalid Token" : "Hibás token",
+    "No file was uploaded. Unknown error" : "Nem történt feltöltés. Ismeretlen hiba",
+    "There is no error, the file uploaded with success" : "A fájlt sikerült feltölteni",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML  formban került megadásra.",
+    "The uploaded file was only partially uploaded" : "Az eredeti fájlt csak részben sikerült feltölteni.",
+    "No file was uploaded" : "Nem töltődött fel állomány",
+    "Missing a temporary folder" : "Hiányzik egy ideiglenes mappa",
+    "Failed to write to disk" : "Nem sikerült a lemezre történő írás",
+    "Not enough storage available" : "Nincs elég szabad hely.",
+    "Upload failed. Could not find uploaded file" : "A feltöltés nem sikerült. Nem található a feltöltendő állomány.",
+    "Upload failed. Could not get file info." : "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.",
+    "Invalid directory." : "Érvénytelen mappa.",
+    "Files" : "Fájlkezelő",
+    "All files" : "Az összes állomány",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.",
+    "Total file size {size1} exceeds upload limit {size2}" : "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.",
+    "Upload cancelled." : "A feltöltést megszakítottuk.",
+    "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
+    "URL cannot be empty" : "Az URL-cím nem maradhat kitöltetlenül",
+    "{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",
+    "Error fetching URL" : "A megadott URL-ről nem sikerül adatokat kapni",
+    "Share" : "Megosztás",
+    "Delete" : "Törlés",
+    "Disconnect storage" : "Tároló leválasztása",
+    "Unshare" : "A megosztás visszavonása",
+    "Delete permanently" : "Végleges törlés",
+    "Rename" : "Átnevezés",
+    "Pending" : "Folyamatban",
+    "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",
+    "Could not rename file" : "Az állomány nem nevezhető át",
+    "Error deleting file." : "Hiba a file törlése közben.",
+    "Name" : "Név",
+    "Size" : "Méret",
+    "Modified" : "Módosítva",
+    "_%n folder_::_%n folders_" : ["%n mappa","%n mappa"],
+    "_%n file_::_%n files_" : ["%n állomány","%n állomány"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" érvénytelen, mint fájlnév.",
+    "Your storage is full, files can not be updated or synced anymore!" : "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "A tároló majdnem tele van ({usedSpacePercent}%)",
+    "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!",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.",
+    "{dirs} and {files}" : "{dirs} és {files}",
+    "%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)",
+    "File handling" : "Fájlkezelés",
+    "Maximum upload size" : "Maximális feltölthető fájlméret",
+    "max. possible: " : "max. lehetséges: ",
+    "Save" : "Mentés",
+    "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",
+    "From link" : "Feltöltés linkről",
+    "Nothing in here. Upload something!" : "Itt nincs semmi. Töltsön fel valamit!",
+    "Download" : "Letölté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!",
+    "Currently scanning" : "Mappaellenőrzés: "
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hu_HU.json b/apps/files/l10n/hu_HU.json
new file mode 100644
index 00000000000..10ff167fd46
--- /dev/null
+++ b/apps/files/l10n/hu_HU.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "A tároló elérhetetlen.",
+    "Storage invalid" : "A tároló érvénytelen",
+    "Unknown error" : "Ismeretlen hiba",
+    "Could not move %s - File with this name already exists" : "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
+    "Could not move %s" : "Nem sikerült %s áthelyezése",
+    "Permission denied" : "Engedély megtagadva ",
+    "File name cannot be empty." : "A fájlnév nem lehet semmi.",
+    "\"%s\" is an invalid file name." : "\"%s\" érvénytelen, mint fájlnév.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
+    "The target folder has been moved or deleted." : "A célmappa törlődött, vagy áthelyezésre került.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "A %s név már létezik a %s mappában. Kérem válasszon másik nevet!",
+    "Not a valid source" : "A kiinduló állomány érvénytelen",
+    "Server is not allowed to open URLs, please check the server configuration" : "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat!",
+    "The file exceeds your quota by %s" : "A fájl ennyivel meghaladja a kvótáját: %s",
+    "Error while downloading %s to %s" : "Hiba történt miközben %s-t letöltöttük %s-be",
+    "Error when creating the file" : "Hiba történt az állomány létrehozásakor",
+    "Folder name cannot be empty." : "A mappa neve nem maradhat kitöltetlenül",
+    "Error when creating the folder" : "Hiba történt a mappa létrehozásakor",
+    "Unable to set upload directory." : "Nem található a mappa, ahova feltölteni szeretne.",
+    "Invalid Token" : "Hibás token",
+    "No file was uploaded. Unknown error" : "Nem történt feltöltés. Ismeretlen hiba",
+    "There is no error, the file uploaded with success" : "A fájlt sikerült feltölteni",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML  formban került megadásra.",
+    "The uploaded file was only partially uploaded" : "Az eredeti fájlt csak részben sikerült feltölteni.",
+    "No file was uploaded" : "Nem töltődött fel állomány",
+    "Missing a temporary folder" : "Hiányzik egy ideiglenes mappa",
+    "Failed to write to disk" : "Nem sikerült a lemezre történő írás",
+    "Not enough storage available" : "Nincs elég szabad hely.",
+    "Upload failed. Could not find uploaded file" : "A feltöltés nem sikerült. Nem található a feltöltendő állomány.",
+    "Upload failed. Could not get file info." : "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.",
+    "Invalid directory." : "Érvénytelen mappa.",
+    "Files" : "Fájlkezelő",
+    "All files" : "Az összes állomány",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.",
+    "Total file size {size1} exceeds upload limit {size2}" : "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.",
+    "Upload cancelled." : "A feltöltést megszakítottuk.",
+    "Could not get result from server." : "A kiszolgálótól nem kapható meg a művelet eredménye.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
+    "URL cannot be empty" : "Az URL-cím nem maradhat kitöltetlenül",
+    "{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",
+    "Error fetching URL" : "A megadott URL-ről nem sikerül adatokat kapni",
+    "Share" : "Megosztás",
+    "Delete" : "Törlés",
+    "Disconnect storage" : "Tároló leválasztása",
+    "Unshare" : "A megosztás visszavonása",
+    "Delete permanently" : "Végleges törlés",
+    "Rename" : "Átnevezés",
+    "Pending" : "Folyamatban",
+    "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",
+    "Could not rename file" : "Az állomány nem nevezhető át",
+    "Error deleting file." : "Hiba a file törlése közben.",
+    "Name" : "Név",
+    "Size" : "Méret",
+    "Modified" : "Módosítva",
+    "_%n folder_::_%n folders_" : ["%n mappa","%n mappa"],
+    "_%n file_::_%n files_" : ["%n állomány","%n állomány"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" érvénytelen, mint fájlnév.",
+    "Your storage is full, files can not be updated or synced anymore!" : "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "A tároló majdnem tele van ({usedSpacePercent}%)",
+    "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!",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.",
+    "{dirs} and {files}" : "{dirs} és {files}",
+    "%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)",
+    "File handling" : "Fájlkezelés",
+    "Maximum upload size" : "Maximális feltölthető fájlméret",
+    "max. possible: " : "max. lehetséges: ",
+    "Save" : "Mentés",
+    "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",
+    "From link" : "Feltöltés linkről",
+    "Nothing in here. Upload something!" : "Itt nincs semmi. Töltsön fel valamit!",
+    "Download" : "Letölté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!",
+    "Currently scanning" : "Mappaellenőrzés: "
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
deleted file mode 100644
index 7aef457b4a0..00000000000
--- a/apps/files/l10n/hu_HU.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "A tároló elérhetetlen.",
-"Storage invalid" => "A tároló érvénytelen",
-"Unknown error" => "Ismeretlen hiba",
-"Could not move %s - File with this name already exists" => "%s áthelyezése nem sikerült - már létezik másik fájl ezzel a névvel",
-"Could not move %s" => "Nem sikerült %s áthelyezése",
-"Permission denied" => "Engedély megtagadva ",
-"File name cannot be empty." => "A fájlnév nem lehet semmi.",
-"\"%s\" is an invalid file name." => "\"%s\" érvénytelen, mint fájlnév.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Érvénytelen elnevezés. Ezek a karakterek nem használhatók: '\\', '/', '<', '>', ':', '\"', '|', '?' és '*'",
-"The target folder has been moved or deleted." => "A célmappa törlődött, vagy áthelyezésre került.",
-"The name %s is already used in the folder %s. Please choose a different name." => "A %s név már létezik a %s mappában. Kérem válasszon másik nevet!",
-"Not a valid source" => "A kiinduló állomány érvénytelen",
-"Server is not allowed to open URLs, please check the server configuration" => "A kiszolgálón nincs engedélyezve URL-ek megnyitása, kérem ellenőrizze a beállításokat!",
-"The file exceeds your quota by %s" => "A fájl ennyivel meghaladja a kvótáját: %s",
-"Error while downloading %s to %s" => "Hiba történt miközben %s-t letöltöttük %s-be",
-"Error when creating the file" => "Hiba történt az állomány létrehozásakor",
-"Folder name cannot be empty." => "A mappa neve nem maradhat kitöltetlenül",
-"Error when creating the folder" => "Hiba történt a mappa létrehozásakor",
-"Unable to set upload directory." => "Nem található a mappa, ahova feltölteni szeretne.",
-"Invalid Token" => "Hibás token",
-"No file was uploaded. Unknown error" => "Nem történt feltöltés. Ismeretlen hiba",
-"There is no error, the file uploaded with success" => "A fájlt sikerült feltölteni",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "A feltöltött fájl mérete meghaladja a php.ini állományban megadott upload_max_filesize paraméter értékét.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "A feltöltött fájl mérete meghaladja a MAX_FILE_SIZE paramétert, ami a HTML  formban került megadásra.",
-"The uploaded file was only partially uploaded" => "Az eredeti fájlt csak részben sikerült feltölteni.",
-"No file was uploaded" => "Nem töltődött fel állomány",
-"Missing a temporary folder" => "Hiányzik egy ideiglenes mappa",
-"Failed to write to disk" => "Nem sikerült a lemezre történő írás",
-"Not enough storage available" => "Nincs elég szabad hely.",
-"Upload failed. Could not find uploaded file" => "A feltöltés nem sikerült. Nem található a feltöltendő állomány.",
-"Upload failed. Could not get file info." => "A feltöltés nem sikerült. Az állományt leíró információk nem érhetők el.",
-"Invalid directory." => "Érvénytelen mappa.",
-"Files" => "Fájlkezelő",
-"All files" => "Az összes állomány",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "A(z) {filename} állomány nem tölthető fel, mert ez vagy egy mappa, vagy pedig 0 bájtból áll.",
-"Total file size {size1} exceeds upload limit {size2}" => "A teljes fájlméret: {size1} meghaladja a feltöltési limitet: {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nincs elég szabad hely. A feltöltés mérete {size1}, de csak ennyi hely van: {size2}.",
-"Upload cancelled." => "A feltöltést megszakítottuk.",
-"Could not get result from server." => "A kiszolgálótól nem kapható meg a művelet eredménye.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fájlfeltöltés van folyamatban. Az oldal elhagyása megszakítja a feltöltést.",
-"URL cannot be empty" => "Az URL-cím nem maradhat kitöltetlenül",
-"{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",
-"Error fetching URL" => "A megadott URL-ről nem sikerül adatokat kapni",
-"Share" => "Megosztás",
-"Delete" => "Törlés",
-"Disconnect storage" => "Tároló leválasztása",
-"Unshare" => "A megosztás visszavonása",
-"Delete permanently" => "Végleges törlés",
-"Rename" => "Átnevezés",
-"Pending" => "Folyamatban",
-"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",
-"Could not rename file" => "Az állomány nem nevezhető át",
-"Error deleting file." => "Hiba a file törlése közben.",
-"Name" => "Név",
-"Size" => "Méret",
-"Modified" => "Módosítva",
-"_%n folder_::_%n folders_" => array("%n mappa","%n mappa"),
-"_%n file_::_%n files_" => array("%n állomány","%n állomány"),
-"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_" => array("%n állomány feltöltése","%n állomány feltöltése"),
-"\"{name}\" is an invalid file name." => "\"{name}\" érvénytelen, mint fájlnév.",
-"Your storage is full, files can not be updated or synced anymore!" => "A tároló tele van, a fájlok nem frissíthetőek vagy szinkronizálhatóak a jövőben.",
-"Your storage is almost full ({usedSpacePercent}%)" => "A tároló majdnem tele van ({usedSpacePercent}%)",
-"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!",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A titkosítási funkciót kikapcsolták, de az Ön állományai még mindig titkosított állapotban vannak. A személyes beállításoknál tudja a titkosítást feloldani.",
-"{dirs} and {files}" => "{dirs} és {files}",
-"%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)",
-"File handling" => "Fájlkezelés",
-"Maximum upload size" => "Maximális feltölthető fájlméret",
-"max. possible: " => "max. lehetséges: ",
-"Save" => "Mentés",
-"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",
-"From link" => "Feltöltés linkről",
-"Nothing in here. Upload something!" => "Itt nincs semmi. Töltsön fel valamit!",
-"Download" => "Letölté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!",
-"Currently scanning" => "Mappaellenőrzés: "
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/hy.js b/apps/files/l10n/hy.js
new file mode 100644
index 00000000000..5772fd20c72
--- /dev/null
+++ b/apps/files/l10n/hy.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files",
+    {
+    "Delete" : "Ջնջել",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "Պահպանել",
+    "Download" : "Բեռնել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/hy.json b/apps/files/l10n/hy.json
new file mode 100644
index 00000000000..3cbee75121a
--- /dev/null
+++ b/apps/files/l10n/hy.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Delete" : "Ջնջել",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "Պահպանել",
+    "Download" : "Բեռնել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/hy.php b/apps/files/l10n/hy.php
deleted file mode 100644
index c32411a57d1..00000000000
--- a/apps/files/l10n/hy.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Ջնջել",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "Պահպանել",
-"Download" => "Բեռնել"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ia.js b/apps/files/l10n/ia.js
new file mode 100644
index 00000000000..8c93abf1bef
--- /dev/null
+++ b/apps/files/l10n/ia.js
@@ -0,0 +1,31 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Error Incognite",
+    "File name cannot be empty." : "Le nomine de file non pote esser vacue.",
+    "The uploaded file was only partially uploaded" : "Le file incargate solmente esseva incargate partialmente",
+    "No file was uploaded" : "Nulle file esseva incargate.",
+    "Missing a temporary folder" : "Manca un dossier temporari",
+    "Files" : "Files",
+    "Share" : "Compartir",
+    "Delete" : "Deler",
+    "Unshare" : "Leva compartir",
+    "Error" : "Error",
+    "Name" : "Nomine",
+    "Size" : "Dimension",
+    "Modified" : "Modificate",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Upload (max. %s)" : "Incargar (max. %s)",
+    "Maximum upload size" : "Dimension maxime de incargamento",
+    "Save" : "Salveguardar",
+    "New" : "Nove",
+    "Text file" : "File de texto",
+    "New folder" : "Nove dossier",
+    "Folder" : "Dossier",
+    "Nothing in here. Upload something!" : "Nihil hic. Incarga alcun cosa!",
+    "Download" : "Discargar",
+    "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
new file mode 100644
index 00000000000..962419f288b
--- /dev/null
+++ b/apps/files/l10n/ia.json
@@ -0,0 +1,29 @@
+{ "translations": {
+    "Unknown error" : "Error Incognite",
+    "File name cannot be empty." : "Le nomine de file non pote esser vacue.",
+    "The uploaded file was only partially uploaded" : "Le file incargate solmente esseva incargate partialmente",
+    "No file was uploaded" : "Nulle file esseva incargate.",
+    "Missing a temporary folder" : "Manca un dossier temporari",
+    "Files" : "Files",
+    "Share" : "Compartir",
+    "Delete" : "Deler",
+    "Unshare" : "Leva compartir",
+    "Error" : "Error",
+    "Name" : "Nomine",
+    "Size" : "Dimension",
+    "Modified" : "Modificate",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Upload (max. %s)" : "Incargar (max. %s)",
+    "Maximum upload size" : "Dimension maxime de incargamento",
+    "Save" : "Salveguardar",
+    "New" : "Nove",
+    "Text file" : "File de texto",
+    "New folder" : "Nove dossier",
+    "Folder" : "Dossier",
+    "Nothing in here. Upload something!" : "Nihil hic. Incarga alcun cosa!",
+    "Download" : "Discargar",
+    "Upload too large" : "Incargamento troppo longe"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
deleted file mode 100644
index 62b07896fdd..00000000000
--- a/apps/files/l10n/ia.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error Incognite",
-"File name cannot be empty." => "Le nomine de file non pote esser vacue.",
-"The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
-"No file was uploaded" => "Nulle file esseva incargate.",
-"Missing a temporary folder" => "Manca un dossier temporari",
-"Files" => "Files",
-"Share" => "Compartir",
-"Delete" => "Deler",
-"Unshare" => "Leva compartir",
-"Error" => "Error",
-"Name" => "Nomine",
-"Size" => "Dimension",
-"Modified" => "Modificate",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Upload (max. %s)" => "Incargar (max. %s)",
-"Maximum upload size" => "Dimension maxime de incargamento",
-"Save" => "Salveguardar",
-"New" => "Nove",
-"Text file" => "File de texto",
-"New folder" => "Nove dossier",
-"Folder" => "Dossier",
-"Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
-"Download" => "Discargar",
-"Upload too large" => "Incargamento troppo longe"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/id.js b/apps/files/l10n/id.js
new file mode 100644
index 00000000000..8ae4c822ea8
--- /dev/null
+++ b/apps/files/l10n/id.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Penyimpanan tidak tersedia",
+    "Storage invalid" : "Penyimpanan tidak sah",
+    "Unknown error" : "Kesalahan tidak diketahui",
+    "Could not move %s - File with this name already exists" : "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
+    "Could not move %s" : "Tidak dapat memindahkan %s",
+    "Permission denied" : "Perizinan ditolak",
+    "File name cannot be empty." : "Nama berkas tidak boleh kosong.",
+    "\"%s\" is an invalid file name." : "\"%s\" adalah sebuah nama berkas yang tidak sah.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
+    "The target folder has been moved or deleted." : "Folder tujuan telah dipindahkan atau dihapus.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
+    "Not a valid source" : "Sumber tidak sah",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server",
+    "The file exceeds your quota by %s" : "Berkas melampaui kuota Anda oleh %s",
+    "Error while downloading %s to %s" : "Kesalahan saat mengunduh %s ke %s",
+    "Error when creating the file" : "Kesalahan saat membuat berkas",
+    "Folder name cannot be empty." : "Nama folder tidak bolh kosong.",
+    "Error when creating the folder" : "Kesalahan saat membuat folder",
+    "Unable to set upload directory." : "Tidak dapat mengatur folder unggah",
+    "Invalid Token" : "Token tidak sah",
+    "No file was uploaded. Unknown error" : "Tidak ada berkas yang diunggah. Kesalahan tidak dikenal.",
+    "There is no error, the file uploaded with success" : "Tidak ada kesalahan, berkas sukses diunggah",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML.",
+    "The uploaded file was only partially uploaded" : "Berkas hanya diunggah sebagian",
+    "No file was uploaded" : "Tidak ada berkas yang diunggah",
+    "Missing a temporary folder" : "Folder sementara tidak ada",
+    "Failed to write to disk" : "Gagal menulis ke disk",
+    "Not enough storage available" : "Ruang penyimpanan tidak mencukupi",
+    "Upload failed. Could not find uploaded file" : "Unggah gagal. Tidak menemukan berkas yang akan diunggah",
+    "Upload failed. Could not get file info." : "Unggah gagal. Tidak mendapatkan informasi berkas.",
+    "Invalid directory." : "Direktori tidak valid.",
+    "Files" : "Berkas",
+    "All files" : "Semua berkas",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte",
+    "Total file size {size1} exceeds upload limit {size2}" : "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa",
+    "Upload cancelled." : "Pengunggahan dibatalkan.",
+    "Could not get result from server." : "Tidak mendapatkan hasil dari server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
+    "URL cannot be empty" : "URL tidak boleh kosong",
+    "{new_name} already exists" : "{new_name} sudah ada",
+    "Could not create file" : "Tidak dapat membuat berkas",
+    "Could not create folder" : "Tidak dapat membuat folder",
+    "Error fetching URL" : "Kesalahan saat mengambil URL",
+    "Share" : "Bagikan",
+    "Delete" : "Hapus",
+    "Disconnect storage" : "Memutuskan penyimpaan",
+    "Unshare" : "Batalkan berbagi",
+    "Delete permanently" : "Hapus secara permanen",
+    "Rename" : "Ubah nama",
+    "Pending" : "Menunggu",
+    "Error moving file." : "Kesalahan saat memindahkan berkas.",
+    "Error moving file" : "Kesalahan saat memindahkan berkas",
+    "Error" : "Kesalahan ",
+    "Could not rename file" : "Tidak dapat mengubah nama berkas",
+    "Error deleting file." : "Kesalahan saat menghapus berkas.",
+    "Name" : "Nama",
+    "Size" : "Ukuran",
+    "Modified" : "Dimodifikasi",
+    "_%n folder_::_%n folders_" : ["%n folder"],
+    "_%n file_::_%n files_" : ["%n berkas"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" adalah nama berkas yang tidak sah.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
+    "{dirs} and {files}" : "{dirs} dan {files}",
+    "%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)",
+    "File handling" : "Penanganan berkas",
+    "Maximum upload size" : "Ukuran pengunggahan maksimum",
+    "max. possible: " : "Kemungkinan maks.:",
+    "Save" : "Simpan",
+    "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",
+    "From link" : "Dari tautan",
+    "Nothing in here. Upload something!" : "Tidak ada apa-apa di sini. Unggah sesuatu!",
+    "Download" : "Unduh",
+    "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.",
+    "Currently scanning" : "Pemindaian terbaru"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/id.json b/apps/files/l10n/id.json
new file mode 100644
index 00000000000..d644aa22ec4
--- /dev/null
+++ b/apps/files/l10n/id.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Penyimpanan tidak tersedia",
+    "Storage invalid" : "Penyimpanan tidak sah",
+    "Unknown error" : "Kesalahan tidak diketahui",
+    "Could not move %s - File with this name already exists" : "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
+    "Could not move %s" : "Tidak dapat memindahkan %s",
+    "Permission denied" : "Perizinan ditolak",
+    "File name cannot be empty." : "Nama berkas tidak boleh kosong.",
+    "\"%s\" is an invalid file name." : "\"%s\" adalah sebuah nama berkas yang tidak sah.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
+    "The target folder has been moved or deleted." : "Folder tujuan telah dipindahkan atau dihapus.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
+    "Not a valid source" : "Sumber tidak sah",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server",
+    "The file exceeds your quota by %s" : "Berkas melampaui kuota Anda oleh %s",
+    "Error while downloading %s to %s" : "Kesalahan saat mengunduh %s ke %s",
+    "Error when creating the file" : "Kesalahan saat membuat berkas",
+    "Folder name cannot be empty." : "Nama folder tidak bolh kosong.",
+    "Error when creating the folder" : "Kesalahan saat membuat folder",
+    "Unable to set upload directory." : "Tidak dapat mengatur folder unggah",
+    "Invalid Token" : "Token tidak sah",
+    "No file was uploaded. Unknown error" : "Tidak ada berkas yang diunggah. Kesalahan tidak dikenal.",
+    "There is no error, the file uploaded with success" : "Tidak ada kesalahan, berkas sukses diunggah",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML.",
+    "The uploaded file was only partially uploaded" : "Berkas hanya diunggah sebagian",
+    "No file was uploaded" : "Tidak ada berkas yang diunggah",
+    "Missing a temporary folder" : "Folder sementara tidak ada",
+    "Failed to write to disk" : "Gagal menulis ke disk",
+    "Not enough storage available" : "Ruang penyimpanan tidak mencukupi",
+    "Upload failed. Could not find uploaded file" : "Unggah gagal. Tidak menemukan berkas yang akan diunggah",
+    "Upload failed. Could not get file info." : "Unggah gagal. Tidak mendapatkan informasi berkas.",
+    "Invalid directory." : "Direktori tidak valid.",
+    "Files" : "Berkas",
+    "All files" : "Semua berkas",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte",
+    "Total file size {size1} exceeds upload limit {size2}" : "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa",
+    "Upload cancelled." : "Pengunggahan dibatalkan.",
+    "Could not get result from server." : "Tidak mendapatkan hasil dari server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
+    "URL cannot be empty" : "URL tidak boleh kosong",
+    "{new_name} already exists" : "{new_name} sudah ada",
+    "Could not create file" : "Tidak dapat membuat berkas",
+    "Could not create folder" : "Tidak dapat membuat folder",
+    "Error fetching URL" : "Kesalahan saat mengambil URL",
+    "Share" : "Bagikan",
+    "Delete" : "Hapus",
+    "Disconnect storage" : "Memutuskan penyimpaan",
+    "Unshare" : "Batalkan berbagi",
+    "Delete permanently" : "Hapus secara permanen",
+    "Rename" : "Ubah nama",
+    "Pending" : "Menunggu",
+    "Error moving file." : "Kesalahan saat memindahkan berkas.",
+    "Error moving file" : "Kesalahan saat memindahkan berkas",
+    "Error" : "Kesalahan ",
+    "Could not rename file" : "Tidak dapat mengubah nama berkas",
+    "Error deleting file." : "Kesalahan saat menghapus berkas.",
+    "Name" : "Nama",
+    "Size" : "Ukuran",
+    "Modified" : "Dimodifikasi",
+    "_%n folder_::_%n folders_" : ["%n folder"],
+    "_%n file_::_%n files_" : ["%n berkas"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" adalah nama berkas yang tidak sah.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
+    "{dirs} and {files}" : "{dirs} dan {files}",
+    "%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)",
+    "File handling" : "Penanganan berkas",
+    "Maximum upload size" : "Ukuran pengunggahan maksimum",
+    "max. possible: " : "Kemungkinan maks.:",
+    "Save" : "Simpan",
+    "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",
+    "From link" : "Dari tautan",
+    "Nothing in here. Upload something!" : "Tidak ada apa-apa di sini. Unggah sesuatu!",
+    "Download" : "Unduh",
+    "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.",
+    "Currently scanning" : "Pemindaian terbaru"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
deleted file mode 100644
index 259025b7e88..00000000000
--- a/apps/files/l10n/id.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Penyimpanan tidak tersedia",
-"Storage invalid" => "Penyimpanan tidak sah",
-"Unknown error" => "Kesalahan tidak diketahui",
-"Could not move %s - File with this name already exists" => "Tidak dapat memindahkan %s - Berkas dengan nama ini sudah ada",
-"Could not move %s" => "Tidak dapat memindahkan %s",
-"Permission denied" => "Perizinan ditolak",
-"File name cannot be empty." => "Nama berkas tidak boleh kosong.",
-"\"%s\" is an invalid file name." => "\"%s\" adalah sebuah nama berkas yang tidak sah.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nama tidak valid, karakter '\\', '/', '<', '>', ':', '\"', '|', '?' dan '*' tidak diizinkan.",
-"The target folder has been moved or deleted." => "Folder tujuan telah dipindahkan atau dihapus.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Nama %s sudah digunakan dalam folder %s. Silakan pilih nama yang berbeda.",
-"Not a valid source" => "Sumber tidak sah",
-"Server is not allowed to open URLs, please check the server configuration" => "Server tidak megizinkan untuk membuka URL, mohon periksa konfigurasi server",
-"The file exceeds your quota by %s" => "Berkas melampaui kuota Anda oleh %s",
-"Error while downloading %s to %s" => "Kesalahan saat mengunduh %s ke %s",
-"Error when creating the file" => "Kesalahan saat membuat berkas",
-"Folder name cannot be empty." => "Nama folder tidak bolh kosong.",
-"Error when creating the folder" => "Kesalahan saat membuat folder",
-"Unable to set upload directory." => "Tidak dapat mengatur folder unggah",
-"Invalid Token" => "Token tidak sah",
-"No file was uploaded. Unknown error" => "Tidak ada berkas yang diunggah. Kesalahan tidak dikenal.",
-"There is no error, the file uploaded with success" => "Tidak ada kesalahan, berkas sukses diunggah",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Berkas yang diunggah melampaui direktif upload_max_filesize pada php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Berkas yang diunggah melampaui direktif MAX_FILE_SIZE yang ditentukan dalam formulir HTML.",
-"The uploaded file was only partially uploaded" => "Berkas hanya diunggah sebagian",
-"No file was uploaded" => "Tidak ada berkas yang diunggah",
-"Missing a temporary folder" => "Folder sementara tidak ada",
-"Failed to write to disk" => "Gagal menulis ke disk",
-"Not enough storage available" => "Ruang penyimpanan tidak mencukupi",
-"Upload failed. Could not find uploaded file" => "Unggah gagal. Tidak menemukan berkas yang akan diunggah",
-"Upload failed. Could not get file info." => "Unggah gagal. Tidak mendapatkan informasi berkas.",
-"Invalid directory." => "Direktori tidak valid.",
-"Files" => "Berkas",
-"All files" => "Semua berkas",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Tidak dapat mengunggah {filename} karena ini sebuah direktori atau memiliki ukuran 0 byte",
-"Total file size {size1} exceeds upload limit {size2}" => "Jumlah ukuran berkas {size1} melampaui batas unggah {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ruang bebas tidak mencukupi, Anda mengunggah {size1} tetapi hanya {size2} yang tersisa",
-"Upload cancelled." => "Pengunggahan dibatalkan.",
-"Could not get result from server." => "Tidak mendapatkan hasil dari server.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Berkas sedang diunggah. Meninggalkan halaman ini akan membatalkan proses.",
-"URL cannot be empty" => "URL tidak boleh kosong",
-"{new_name} already exists" => "{new_name} sudah ada",
-"Could not create file" => "Tidak dapat membuat berkas",
-"Could not create folder" => "Tidak dapat membuat folder",
-"Error fetching URL" => "Kesalahan saat mengambil URL",
-"Share" => "Bagikan",
-"Delete" => "Hapus",
-"Disconnect storage" => "Memutuskan penyimpaan",
-"Unshare" => "Batalkan berbagi",
-"Delete permanently" => "Hapus secara permanen",
-"Rename" => "Ubah nama",
-"Pending" => "Menunggu",
-"Error moving file." => "Kesalahan saat memindahkan berkas.",
-"Error moving file" => "Kesalahan saat memindahkan berkas",
-"Error" => "Kesalahan ",
-"Could not rename file" => "Tidak dapat mengubah nama berkas",
-"Error deleting file." => "Kesalahan saat menghapus berkas.",
-"Name" => "Nama",
-"Size" => "Ukuran",
-"Modified" => "Dimodifikasi",
-"_%n folder_::_%n folders_" => array("%n folder"),
-"_%n file_::_%n files_" => array("%n berkas"),
-"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_" => array("Mengunggah %n berkas"),
-"\"{name}\" is an invalid file name." => "\"{name}\" adalah nama berkas yang tidak sah.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ruang penyimpanan Anda penuh, berkas tidak dapat diperbarui atau disinkronkan lagi!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ruang penyimpanan hampir penuh ({usedSpacePercent}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Enskripi telah dinonaktifkan tetapi berkas anda tetap dienskripsi. Silakan menuju ke pengaturan pribadi untuk deskrip berkas anda.",
-"{dirs} and {files}" => "{dirs} dan {files}",
-"%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)",
-"File handling" => "Penanganan berkas",
-"Maximum upload size" => "Ukuran pengunggahan maksimum",
-"max. possible: " => "Kemungkinan maks.:",
-"Save" => "Simpan",
-"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",
-"From link" => "Dari tautan",
-"Nothing in here. Upload something!" => "Tidak ada apa-apa di sini. Unggah sesuatu!",
-"Download" => "Unduh",
-"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.",
-"Currently scanning" => "Pemindaian terbaru"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/io.js b/apps/files/l10n/io.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/io.js
@@ -0,0 +1,8 @@
+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/io.json b/apps/files/l10n/io.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/io.json
@@ -0,0 +1,6 @@
+{ "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/io.php b/apps/files/l10n/io.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/io.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/is.js b/apps/files/l10n/is.js
new file mode 100644
index 00000000000..5f3e2e78f26
--- /dev/null
+++ b/apps/files/l10n/is.js
@@ -0,0 +1,48 @@
+OC.L10N.register(
+    "files",
+    {
+    "Could not move %s - File with this name already exists" : "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
+    "Could not move %s" : "Gat ekki fært %s",
+    "File name cannot be empty." : "Nafn skráar má ekki vera tómt",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
+    "No file was uploaded. Unknown error" : "Engin skrá var send inn. Óþekkt villa.",
+    "There is no error, the file uploaded with success" : "Engin villa, innsending heppnaðist",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Innsend skrá er stærri en upload_max stillingin í php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu.",
+    "The uploaded file was only partially uploaded" : "Einungis hluti af innsendri skrá skilaði sér",
+    "No file was uploaded" : "Engin skrá skilaði sér",
+    "Missing a temporary folder" : "Vantar bráðabirgðamöppu",
+    "Failed to write to disk" : "Tókst ekki að skrifa á disk",
+    "Invalid directory." : "Ógild mappa.",
+    "Files" : "Skrár",
+    "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",
+    "Share" : "Deila",
+    "Delete" : "Eyða",
+    "Unshare" : "Hætta deilingu",
+    "Rename" : "Endurskýra",
+    "Pending" : "Bíður",
+    "Error" : "Villa",
+    "Name" : "Nafn",
+    "Size" : "Stærð",
+    "Modified" : "Breytt",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "Meðhöndlun skrár",
+    "Maximum upload size" : "Hámarks stærð innsendingar",
+    "max. possible: " : "hámark mögulegt: ",
+    "Save" : "Vista",
+    "WebDAV" : "WebDAV",
+    "New" : "Nýtt",
+    "Text file" : "Texta skrá",
+    "Folder" : "Mappa",
+    "From link" : "Af tengli",
+    "Nothing in here. Upload something!" : "Ekkert hér. Settu eitthvað inn!",
+    "Download" : "Niðurhal",
+    "Upload too large" : "Innsend skrá er of stór",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
+    "Files are being scanned, please wait." : "Verið er að skima skrár, vinsamlegast hinkraðu."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/is.json b/apps/files/l10n/is.json
new file mode 100644
index 00000000000..0a6afcb0b64
--- /dev/null
+++ b/apps/files/l10n/is.json
@@ -0,0 +1,46 @@
+{ "translations": {
+    "Could not move %s - File with this name already exists" : "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
+    "Could not move %s" : "Gat ekki fært %s",
+    "File name cannot be empty." : "Nafn skráar má ekki vera tómt",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
+    "No file was uploaded. Unknown error" : "Engin skrá var send inn. Óþekkt villa.",
+    "There is no error, the file uploaded with success" : "Engin villa, innsending heppnaðist",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Innsend skrá er stærri en upload_max stillingin í php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu.",
+    "The uploaded file was only partially uploaded" : "Einungis hluti af innsendri skrá skilaði sér",
+    "No file was uploaded" : "Engin skrá skilaði sér",
+    "Missing a temporary folder" : "Vantar bráðabirgðamöppu",
+    "Failed to write to disk" : "Tókst ekki að skrifa á disk",
+    "Invalid directory." : "Ógild mappa.",
+    "Files" : "Skrár",
+    "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",
+    "Share" : "Deila",
+    "Delete" : "Eyða",
+    "Unshare" : "Hætta deilingu",
+    "Rename" : "Endurskýra",
+    "Pending" : "Bíður",
+    "Error" : "Villa",
+    "Name" : "Nafn",
+    "Size" : "Stærð",
+    "Modified" : "Breytt",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "Meðhöndlun skrár",
+    "Maximum upload size" : "Hámarks stærð innsendingar",
+    "max. possible: " : "hámark mögulegt: ",
+    "Save" : "Vista",
+    "WebDAV" : "WebDAV",
+    "New" : "Nýtt",
+    "Text file" : "Texta skrá",
+    "Folder" : "Mappa",
+    "From link" : "Af tengli",
+    "Nothing in here. Upload something!" : "Ekkert hér. Settu eitthvað inn!",
+    "Download" : "Niðurhal",
+    "Upload too large" : "Innsend skrá er of stór",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Skrárnar sem þú ert að senda inn eru stærri en hámarks innsendingarstærð á þessum netþjóni.",
+    "Files are being scanned, please wait." : "Verið er að skima skrár, vinsamlegast hinkraðu."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/is.php b/apps/files/l10n/is.php
deleted file mode 100644
index f645d9cf002..00000000000
--- a/apps/files/l10n/is.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Gat ekki fært %s - Skrá með þessu nafni er þegar til",
-"Could not move %s" => "Gat ekki fært %s",
-"File name cannot be empty." => "Nafn skráar má ekki vera tómt",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ógilt nafn, táknin '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' eru ekki leyfð.",
-"No file was uploaded. Unknown error" => "Engin skrá var send inn. Óþekkt villa.",
-"There is no error, the file uploaded with success" => "Engin villa, innsending heppnaðist",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Innsend skrá er stærri en upload_max stillingin í php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Innsenda skráin er stærri en MAX_FILE_SIZE sem skilgreint er í HTML sniðinu.",
-"The uploaded file was only partially uploaded" => "Einungis hluti af innsendri skrá skilaði sér",
-"No file was uploaded" => "Engin skrá skilaði sér",
-"Missing a temporary folder" => "Vantar bráðabirgðamöppu",
-"Failed to write to disk" => "Tókst ekki að skrifa á disk",
-"Invalid directory." => "Ógild mappa.",
-"Files" => "Skrár",
-"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",
-"Share" => "Deila",
-"Delete" => "Eyða",
-"Unshare" => "Hætta deilingu",
-"Rename" => "Endurskýra",
-"Pending" => "Bíður",
-"Error" => "Villa",
-"Name" => "Nafn",
-"Size" => "Stærð",
-"Modified" => "Breytt",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"File handling" => "Meðhöndlun skrár",
-"Maximum upload size" => "Hámarks stærð innsendingar",
-"max. possible: " => "hámark mögulegt: ",
-"Save" => "Vista",
-"WebDAV" => "WebDAV",
-"New" => "Nýtt",
-"Text file" => "Texta skrá",
-"Folder" => "Mappa",
-"From link" => "Af tengli",
-"Nothing in here. Upload something!" => "Ekkert hér. Settu eitthvað inn!",
-"Download" => "Niðurhal",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
new file mode 100644
index 00000000000..939f5e55dac
--- /dev/null
+++ b/apps/files/l10n/it.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Archiviazione non disponibile",
+    "Storage invalid" : "Archiviazione non valida",
+    "Unknown error" : "Errore sconosciuto",
+    "Could not move %s - File with this name already exists" : "Impossibile spostare %s - un file con questo nome esiste già",
+    "Could not move %s" : "Impossibile spostare %s",
+    "Permission denied" : "Permesso negato",
+    "File name cannot be empty." : "Il nome del file non può essere vuoto.",
+    "\"%s\" is an invalid file name." : "\"%s\" non è un nome file valido.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
+    "The target folder has been moved or deleted." : "La cartella di destinazione è stata spostata o eliminata.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Il nome %s è attualmente in uso nella cartella %s. Scegli un nome diverso.",
+    "Not a valid source" : "Non è una sorgente valida",
+    "Server is not allowed to open URLs, please check the server configuration" : "Al server non è permesso aprire URL, controlla la configurazione del server",
+    "The file exceeds your quota by %s" : "Il file supera la tua quota di %s",
+    "Error while downloading %s to %s" : "Errore durante lo scaricamento di %s su %s",
+    "Error when creating the file" : "Errore durante la creazione del file",
+    "Folder name cannot be empty." : "Il nome della cartella non può essere vuoto.",
+    "Error when creating the folder" : "Errore durante la creazione della cartella",
+    "Unable to set upload directory." : "Impossibile impostare una cartella di caricamento.",
+    "Invalid Token" : "Token non valido",
+    "No file was uploaded. Unknown error" : "Nessun file è stato inviato. Errore sconosciuto",
+    "There is no error, the file uploaded with success" : "Non ci sono errori, il file è stato caricato correttamente",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
+    "The uploaded file was only partially uploaded" : "Il file è stato caricato solo parzialmente",
+    "No file was uploaded" : "Nessun file è stato caricato",
+    "Missing a temporary folder" : "Manca una cartella temporanea",
+    "Failed to write to disk" : "Scrittura su disco non riuscita",
+    "Not enough storage available" : "Spazio di archiviazione insufficiente",
+    "Upload failed. Could not find uploaded file" : "Caricamento non riuscito. Impossibile trovare il file caricato.",
+    "Upload failed. Could not get file info." : "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
+    "Invalid directory." : "Cartella non valida.",
+    "Files" : "File",
+    "All files" : "Tutti i file",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
+    "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
+    "Upload cancelled." : "Invio 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.",
+    "URL cannot be empty" : "L'URL non può essere vuoto.",
+    "{new_name} already exists" : "{new_name} esiste già",
+    "Could not create file" : "Impossibile creare il file",
+    "Could not create folder" : "Impossibile creare la cartella",
+    "Error fetching URL" : "Errore durante il recupero dello URL",
+    "Share" : "Condividi",
+    "Delete" : "Elimina",
+    "Disconnect storage" : "Disconnetti archiviazione",
+    "Unshare" : "Rimuovi condivisione",
+    "Delete permanently" : "Elimina definitivamente",
+    "Rename" : "Rinomina",
+    "Pending" : "In corso",
+    "Error moving file." : "Errore durante lo spostamento del file.",
+    "Error moving file" : "Errore durante lo spostamento del file",
+    "Error" : "Errore",
+    "Could not rename file" : "Impossibile rinominare il file",
+    "Error deleting file." : "Errore durante l'eliminazione del file.",
+    "Name" : "Nome",
+    "Size" : "Dimensione",
+    "Modified" : "Modificato",
+    "_%n folder_::_%n folders_" : ["%n cartella","%n cartelle"],
+    "_%n file_::_%n files_" : ["%n file","%n file"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" non è un nome file valido.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
+    "{dirs} and {files}" : "{dirs} e {files}",
+    "%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)",
+    "File handling" : "Gestione file",
+    "Maximum upload size" : "Dimensione massima upload",
+    "max. possible: " : "numero mass.: ",
+    "Save" : "Salva",
+    "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",
+    "From link" : "Da collegamento",
+    "Nothing in here. Upload something!" : "Non c'è niente qui. Carica qualcosa!",
+    "Download" : "Scarica",
+    "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",
+    "Currently scanning" : "Scansione in corso"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
new file mode 100644
index 00000000000..8686051f461
--- /dev/null
+++ b/apps/files/l10n/it.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Archiviazione non disponibile",
+    "Storage invalid" : "Archiviazione non valida",
+    "Unknown error" : "Errore sconosciuto",
+    "Could not move %s - File with this name already exists" : "Impossibile spostare %s - un file con questo nome esiste già",
+    "Could not move %s" : "Impossibile spostare %s",
+    "Permission denied" : "Permesso negato",
+    "File name cannot be empty." : "Il nome del file non può essere vuoto.",
+    "\"%s\" is an invalid file name." : "\"%s\" non è un nome file valido.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
+    "The target folder has been moved or deleted." : "La cartella di destinazione è stata spostata o eliminata.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Il nome %s è attualmente in uso nella cartella %s. Scegli un nome diverso.",
+    "Not a valid source" : "Non è una sorgente valida",
+    "Server is not allowed to open URLs, please check the server configuration" : "Al server non è permesso aprire URL, controlla la configurazione del server",
+    "The file exceeds your quota by %s" : "Il file supera la tua quota di %s",
+    "Error while downloading %s to %s" : "Errore durante lo scaricamento di %s su %s",
+    "Error when creating the file" : "Errore durante la creazione del file",
+    "Folder name cannot be empty." : "Il nome della cartella non può essere vuoto.",
+    "Error when creating the folder" : "Errore durante la creazione della cartella",
+    "Unable to set upload directory." : "Impossibile impostare una cartella di caricamento.",
+    "Invalid Token" : "Token non valido",
+    "No file was uploaded. Unknown error" : "Nessun file è stato inviato. Errore sconosciuto",
+    "There is no error, the file uploaded with success" : "Non ci sono errori, il file è stato caricato correttamente",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
+    "The uploaded file was only partially uploaded" : "Il file è stato caricato solo parzialmente",
+    "No file was uploaded" : "Nessun file è stato caricato",
+    "Missing a temporary folder" : "Manca una cartella temporanea",
+    "Failed to write to disk" : "Scrittura su disco non riuscita",
+    "Not enough storage available" : "Spazio di archiviazione insufficiente",
+    "Upload failed. Could not find uploaded file" : "Caricamento non riuscito. Impossibile trovare il file caricato.",
+    "Upload failed. Could not get file info." : "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
+    "Invalid directory." : "Cartella non valida.",
+    "Files" : "File",
+    "All files" : "Tutti i file",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
+    "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
+    "Upload cancelled." : "Invio 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.",
+    "URL cannot be empty" : "L'URL non può essere vuoto.",
+    "{new_name} already exists" : "{new_name} esiste già",
+    "Could not create file" : "Impossibile creare il file",
+    "Could not create folder" : "Impossibile creare la cartella",
+    "Error fetching URL" : "Errore durante il recupero dello URL",
+    "Share" : "Condividi",
+    "Delete" : "Elimina",
+    "Disconnect storage" : "Disconnetti archiviazione",
+    "Unshare" : "Rimuovi condivisione",
+    "Delete permanently" : "Elimina definitivamente",
+    "Rename" : "Rinomina",
+    "Pending" : "In corso",
+    "Error moving file." : "Errore durante lo spostamento del file.",
+    "Error moving file" : "Errore durante lo spostamento del file",
+    "Error" : "Errore",
+    "Could not rename file" : "Impossibile rinominare il file",
+    "Error deleting file." : "Errore durante l'eliminazione del file.",
+    "Name" : "Nome",
+    "Size" : "Dimensione",
+    "Modified" : "Modificato",
+    "_%n folder_::_%n folders_" : ["%n cartella","%n cartelle"],
+    "_%n file_::_%n files_" : ["%n file","%n file"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" non è un nome file valido.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
+    "{dirs} and {files}" : "{dirs} e {files}",
+    "%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)",
+    "File handling" : "Gestione file",
+    "Maximum upload size" : "Dimensione massima upload",
+    "max. possible: " : "numero mass.: ",
+    "Save" : "Salva",
+    "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",
+    "From link" : "Da collegamento",
+    "Nothing in here. Upload something!" : "Non c'è niente qui. Carica qualcosa!",
+    "Download" : "Scarica",
+    "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",
+    "Currently scanning" : "Scansione in corso"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
deleted file mode 100644
index 08cb41f1230..00000000000
--- a/apps/files/l10n/it.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Archiviazione non disponibile",
-"Storage invalid" => "Archiviazione non valida",
-"Unknown error" => "Errore sconosciuto",
-"Could not move %s - File with this name already exists" => "Impossibile spostare %s - un file con questo nome esiste già",
-"Could not move %s" => "Impossibile spostare %s",
-"Permission denied" => "Permesso negato",
-"File name cannot be empty." => "Il nome del file non può essere vuoto.",
-"\"%s\" is an invalid file name." => "\"%s\" non è un nome file valido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non valido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non sono consentiti.",
-"The target folder has been moved or deleted." => "La cartella di destinazione è stata spostata o eliminata.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Il nome %s è attualmente in uso nella cartella %s. Scegli un nome diverso.",
-"Not a valid source" => "Non è una sorgente valida",
-"Server is not allowed to open URLs, please check the server configuration" => "Al server non è permesso aprire URL, controlla la configurazione del server",
-"The file exceeds your quota by %s" => "Il file supera la tua quota di %s",
-"Error while downloading %s to %s" => "Errore durante lo scaricamento di %s su %s",
-"Error when creating the file" => "Errore durante la creazione del file",
-"Folder name cannot be empty." => "Il nome della cartella non può essere vuoto.",
-"Error when creating the folder" => "Errore durante la creazione della cartella",
-"Unable to set upload directory." => "Impossibile impostare una cartella di caricamento.",
-"Invalid Token" => "Token non valido",
-"No file was uploaded. Unknown error" => "Nessun file è stato inviato. Errore sconosciuto",
-"There is no error, the file uploaded with success" => "Non ci sono errori, il file è stato caricato correttamente",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
-"The uploaded file was only partially uploaded" => "Il file è stato caricato solo parzialmente",
-"No file was uploaded" => "Nessun file è stato caricato",
-"Missing a temporary folder" => "Manca una cartella temporanea",
-"Failed to write to disk" => "Scrittura su disco non riuscita",
-"Not enough storage available" => "Spazio di archiviazione insufficiente",
-"Upload failed. Could not find uploaded file" => "Caricamento non riuscito. Impossibile trovare il file caricato.",
-"Upload failed. Could not get file info." => "Caricamento non riuscito. Impossibile ottenere informazioni sul file.",
-"Invalid directory." => "Cartella non valida.",
-"Files" => "File",
-"All files" => "Tutti i file",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
-"Total file size {size1} exceeds upload limit {size2}" => "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
-"Upload cancelled." => "Invio 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.",
-"URL cannot be empty" => "L'URL non può essere vuoto.",
-"{new_name} already exists" => "{new_name} esiste già",
-"Could not create file" => "Impossibile creare il file",
-"Could not create folder" => "Impossibile creare la cartella",
-"Error fetching URL" => "Errore durante il recupero dello URL",
-"Share" => "Condividi",
-"Delete" => "Elimina",
-"Disconnect storage" => "Disconnetti archiviazione",
-"Unshare" => "Rimuovi condivisione",
-"Delete permanently" => "Elimina definitivamente",
-"Rename" => "Rinomina",
-"Pending" => "In corso",
-"Error moving file." => "Errore durante lo spostamento del file.",
-"Error moving file" => "Errore durante lo spostamento del file",
-"Error" => "Errore",
-"Could not rename file" => "Impossibile rinominare il file",
-"Error deleting file." => "Errore durante l'eliminazione del file.",
-"Name" => "Nome",
-"Size" => "Dimensione",
-"Modified" => "Modificato",
-"_%n folder_::_%n folders_" => array("%n cartella","%n cartelle"),
-"_%n file_::_%n files_" => array("%n file","%n file"),
-"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_" => array("Caricamento di %n file in corso","Caricamento di %n file in corso"),
-"\"{name}\" is an invalid file name." => "\"{name}\" non è un nome file valido.",
-"Your storage is full, files can not be updated or synced anymore!" => "Lo spazio di archiviazione è pieno, i file non possono essere più aggiornati o sincronizzati!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Lo spazio di archiviazione è quasi pieno ({usedSpacePercent}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "La cifratura è stata disabilitata ma i tuoi file sono ancora cifrati. Vai nelle impostazioni personali per decifrare i file.",
-"{dirs} and {files}" => "{dirs} e {files}",
-"%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)",
-"File handling" => "Gestione file",
-"Maximum upload size" => "Dimensione massima upload",
-"max. possible: " => "numero mass.: ",
-"Save" => "Salva",
-"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",
-"From link" => "Da collegamento",
-"Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
-"Download" => "Scarica",
-"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",
-"Currently scanning" => "Scansione in corso"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ja.js b/apps/files/l10n/ja.js
new file mode 100644
index 00000000000..201da49664b
--- /dev/null
+++ b/apps/files/l10n/ja.js
@@ -0,0 +1,97 @@
+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" : "アクセス拒否",
+    "File name cannot be empty." : "ファイル名を空にすることはできません。",
+    "\"%s\" is an invalid file name." : "\"%s\" は無効なファイル名です。",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
+    "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 ですでに使われています。別の名前を選択してください。",
+    "Not a valid source" : "有効なソースではありません",
+    "Server is not allowed to open URLs, please check the server configuration" : "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。",
+    "The file exceeds your quota by %s" : "ファイル %s で容量制限をオーバーしました。",
+    "Error while downloading %s to %s" : "%s から %s へのダウンロードエラー",
+    "Error when creating the file" : "ファイルの生成エラー",
+    "Folder name cannot be empty." : "フォルダー名は空にできません",
+    "Error when creating the folder" : "フォルダーの生成エラー",
+    "Unable to set upload directory." : "アップロードディレクトリを設定できません。",
+    "Invalid Token" : "無効なトークン",
+    "No file was uploaded. Unknown error" : "ファイルは何もアップロードされていません。不明なエラー",
+    "There is no error, the file uploaded with success" : "エラーはありません。ファイルのアップロードは成功しました",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
+    "The uploaded file was only partially uploaded" : "アップロードファイルは一部分だけアップロードされました",
+    "No file was uploaded" : "ファイルはアップロードされませんでした",
+    "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" : "すべてのファイル",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
+    "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
+    "Upload cancelled." : "アップロードはキャンセルされました。",
+    "Could not get result from server." : "サーバーから結果を取得できませんでした。",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
+    "URL cannot be empty" : "URL は空にできません",
+    "{new_name} already exists" : "{new_name} はすでに存在します",
+    "Could not create file" : "ファイルを作成できませんでした",
+    "Could not create folder" : "フォルダーを作成できませんでした",
+    "Error fetching URL" : "URL取得エラー",
+    "Share" : "共有",
+    "Delete" : "削除",
+    "Disconnect storage" : "ストレージを切断する",
+    "Unshare" : "共有解除",
+    "Delete permanently" : "完全に削除する",
+    "Rename" : "名前の変更",
+    "Pending" : "中断",
+    "Error moving file." : "ファイル移動でエラー",
+    "Error moving file" : "ファイルの移動エラー",
+    "Error" : "エラー",
+    "Could not rename file" : "ファイルの名前変更ができませんでした",
+    "Error deleting file." : "ファイルの削除エラー。",
+    "Name" : "名前",
+    "Size" : "サイズ",
+    "Modified" : "更新日時",
+    "_%n folder_::_%n folders_" : ["%n 個のフォルダー"],
+    "_%n file_::_%n files_" : ["%n 個のファイル"],
+    "You don’t have permission to upload or create files here" : "ここにファイルをアップロードもしくは作成する権限がありません",
+    "_Uploading %n file_::_Uploading %n files_" : ["%n 個のファイルをアップロード中"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" は無効なファイル名です。",
+    "Your storage is full, files can not be updated or synced anymore!" : "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
+    "Your storage is almost full ({usedSpacePercent}%)" : "ストレージがほぼ一杯です（{usedSpacePercent}%）",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
+    "{dirs} and {files}" : "{dirs} と {files}",
+    "%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" : "保存",
+    "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" : "フォルダー",
+    "From link" : "リンク",
+    "Nothing in here. Upload something!" : "ここには何もありません。何かアップロードしてください。",
+    "Download" : "ダウンロード",
+    "Upload too large" : "アップロードには大きすぎます。",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
+    "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。",
+    "Currently scanning" : "現在スキャン中"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/ja.json b/apps/files/l10n/ja.json
new file mode 100644
index 00000000000..314bc723322
--- /dev/null
+++ b/apps/files/l10n/ja.json
@@ -0,0 +1,95 @@
+{ "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" : "アクセス拒否",
+    "File name cannot be empty." : "ファイル名を空にすることはできません。",
+    "\"%s\" is an invalid file name." : "\"%s\" は無効なファイル名です。",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
+    "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 ですでに使われています。別の名前を選択してください。",
+    "Not a valid source" : "有効なソースではありません",
+    "Server is not allowed to open URLs, please check the server configuration" : "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。",
+    "The file exceeds your quota by %s" : "ファイル %s で容量制限をオーバーしました。",
+    "Error while downloading %s to %s" : "%s から %s へのダウンロードエラー",
+    "Error when creating the file" : "ファイルの生成エラー",
+    "Folder name cannot be empty." : "フォルダー名は空にできません",
+    "Error when creating the folder" : "フォルダーの生成エラー",
+    "Unable to set upload directory." : "アップロードディレクトリを設定できません。",
+    "Invalid Token" : "無効なトークン",
+    "No file was uploaded. Unknown error" : "ファイルは何もアップロードされていません。不明なエラー",
+    "There is no error, the file uploaded with success" : "エラーはありません。ファイルのアップロードは成功しました",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
+    "The uploaded file was only partially uploaded" : "アップロードファイルは一部分だけアップロードされました",
+    "No file was uploaded" : "ファイルはアップロードされませんでした",
+    "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" : "すべてのファイル",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
+    "Total file size {size1} exceeds upload limit {size2}" : "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
+    "Upload cancelled." : "アップロードはキャンセルされました。",
+    "Could not get result from server." : "サーバーから結果を取得できませんでした。",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
+    "URL cannot be empty" : "URL は空にできません",
+    "{new_name} already exists" : "{new_name} はすでに存在します",
+    "Could not create file" : "ファイルを作成できませんでした",
+    "Could not create folder" : "フォルダーを作成できませんでした",
+    "Error fetching URL" : "URL取得エラー",
+    "Share" : "共有",
+    "Delete" : "削除",
+    "Disconnect storage" : "ストレージを切断する",
+    "Unshare" : "共有解除",
+    "Delete permanently" : "完全に削除する",
+    "Rename" : "名前の変更",
+    "Pending" : "中断",
+    "Error moving file." : "ファイル移動でエラー",
+    "Error moving file" : "ファイルの移動エラー",
+    "Error" : "エラー",
+    "Could not rename file" : "ファイルの名前変更ができませんでした",
+    "Error deleting file." : "ファイルの削除エラー。",
+    "Name" : "名前",
+    "Size" : "サイズ",
+    "Modified" : "更新日時",
+    "_%n folder_::_%n folders_" : ["%n 個のフォルダー"],
+    "_%n file_::_%n files_" : ["%n 個のファイル"],
+    "You don’t have permission to upload or create files here" : "ここにファイルをアップロードもしくは作成する権限がありません",
+    "_Uploading %n file_::_Uploading %n files_" : ["%n 個のファイルをアップロード中"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" は無効なファイル名です。",
+    "Your storage is full, files can not be updated or synced anymore!" : "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
+    "Your storage is almost full ({usedSpacePercent}%)" : "ストレージがほぼ一杯です（{usedSpacePercent}%）",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
+    "{dirs} and {files}" : "{dirs} と {files}",
+    "%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" : "保存",
+    "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" : "フォルダー",
+    "From link" : "リンク",
+    "Nothing in here. Upload something!" : "ここには何もありません。何かアップロードしてください。",
+    "Download" : "ダウンロード",
+    "Upload too large" : "アップロードには大きすぎます。",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
+    "Files are being scanned, please wait." : "ファイルをスキャンしています、しばらくお待ちください。",
+    "Currently scanning" : "現在スキャン中"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ja.php b/apps/files/l10n/ja.php
deleted file mode 100644
index c0e67863dbf..00000000000
--- a/apps/files/l10n/ja.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "アクセス拒否",
-"File name cannot be empty." => "ファイル名を空にすることはできません。",
-"\"%s\" is an invalid file name." => "\"%s\" は無効なファイル名です。",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "無効な名前、'\\', '/', '<', '>', ':', '\"', '|', '?', '*' は使用できません。",
-"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 ですでに使われています。別の名前を選択してください。",
-"Not a valid source" => "有効なソースではありません",
-"Server is not allowed to open URLs, please check the server configuration" => "サーバーは、URLを開くことは許されません。サーバーの設定をチェックしてください。",
-"The file exceeds your quota by %s" => "ファイル %s で容量制限をオーバーしました。",
-"Error while downloading %s to %s" => "%s から %s へのダウンロードエラー",
-"Error when creating the file" => "ファイルの生成エラー",
-"Folder name cannot be empty." => "フォルダー名は空にできません",
-"Error when creating the folder" => "フォルダーの生成エラー",
-"Unable to set upload directory." => "アップロードディレクトリを設定できません。",
-"Invalid Token" => "無効なトークン",
-"No file was uploaded. Unknown error" => "ファイルは何もアップロードされていません。不明なエラー",
-"There is no error, the file uploaded with success" => "エラーはありません。ファイルのアップロードは成功しました",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "アップロードされたファイルはphp.ini の upload_max_filesize に設定されたサイズを超えています:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "アップロードファイルはHTMLフォームで指定された MAX_FILE_SIZE の制限を超えています",
-"The uploaded file was only partially uploaded" => "アップロードファイルは一部分だけアップロードされました",
-"No file was uploaded" => "ファイルはアップロードされませんでした",
-"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" => "すべてのファイル",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "ディレクトリもしくは0バイトのため {filename} をアップロードできません",
-"Total file size {size1} exceeds upload limit {size2}" => "合計ファイルサイズ {size1} はアップロード制限 {size2} を超過しています。",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "空き容量が十分でなく、 {size1} をアップロードしていますが、 {size2} しか残っていません。",
-"Upload cancelled." => "アップロードはキャンセルされました。",
-"Could not get result from server." => "サーバーから結果を取得できませんでした。",
-"File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
-"URL cannot be empty" => "URL は空にできません",
-"{new_name} already exists" => "{new_name} はすでに存在します",
-"Could not create file" => "ファイルを作成できませんでした",
-"Could not create folder" => "フォルダーを作成できませんでした",
-"Error fetching URL" => "URL取得エラー",
-"Share" => "共有",
-"Delete" => "削除",
-"Disconnect storage" => "ストレージを切断する",
-"Unshare" => "共有解除",
-"Delete permanently" => "完全に削除する",
-"Rename" => "名前の変更",
-"Pending" => "中断",
-"Error moving file." => "ファイル移動でエラー",
-"Error moving file" => "ファイルの移動エラー",
-"Error" => "エラー",
-"Could not rename file" => "ファイルの名前変更ができませんでした",
-"Error deleting file." => "ファイルの削除エラー。",
-"Name" => "名前",
-"Size" => "サイズ",
-"Modified" => "更新日時",
-"_%n folder_::_%n folders_" => array("%n 個のフォルダー"),
-"_%n file_::_%n files_" => array("%n 個のファイル"),
-"You don’t have permission to upload or create files here" => "ここにファイルをアップロードもしくは作成する権限がありません",
-"_Uploading %n file_::_Uploading %n files_" => array("%n 個のファイルをアップロード中"),
-"\"{name}\" is an invalid file name." => "\"{name}\" は無効なファイル名です。",
-"Your storage is full, files can not be updated or synced anymore!" => "あなたのストレージは一杯です。ファイルの更新と同期はもうできません！",
-"Your storage is almost full ({usedSpacePercent}%)" => "ストレージがほぼ一杯です（{usedSpacePercent}%）",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "暗号化アプリの無効なプライベートキーです。あなたの暗号化されたファイルへアクセスするために、個人設定からプライベートキーのパスワードを更新してください。",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "暗号化の機能は無効化されましたが、ファイルはすでに暗号化されています。個人設定からファイルを複合を行ってください。",
-"{dirs} and {files}" => "{dirs} と {files}",
-"%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" => "保存",
-"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" => "フォルダー",
-"From link" => "リンク",
-"Nothing in here. Upload something!" => "ここには何もありません。何かアップロードしてください。",
-"Download" => "ダウンロード",
-"Upload too large" => "アップロードには大きすぎます。",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "アップロードしようとしているファイルは、サーバーで規定された最大サイズを超えています。",
-"Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
-"Currently scanning" => "現在スキャン中"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/jv.js b/apps/files/l10n/jv.js
new file mode 100644
index 00000000000..b9de258aa2c
--- /dev/null
+++ b/apps/files/l10n/jv.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files",
+    {
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Download" : "Njipuk"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/jv.json b/apps/files/l10n/jv.json
new file mode 100644
index 00000000000..c5064a9ff57
--- /dev/null
+++ b/apps/files/l10n/jv.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Download" : "Njipuk"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/jv.php b/apps/files/l10n/jv.php
deleted file mode 100644
index cfab5af7d1c..00000000000
--- a/apps/files/l10n/jv.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Download" => "Njipuk"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ka_GE.js b/apps/files/l10n/ka_GE.js
new file mode 100644
index 00000000000..9845b12b129
--- /dev/null
+++ b/apps/files/l10n/ka_GE.js
@@ -0,0 +1,54 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "უცნობი შეცდომა",
+    "Could not move %s - File with this name already exists" : "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
+    "Could not move %s" : "%s –ის გადატანა ვერ მოხერხდა",
+    "File name cannot be empty." : "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული.",
+    "No file was uploaded. Unknown error" : "ფაილი არ აიტვირთა. უცნობი შეცდომა",
+    "There is no error, the file uploaded with success" : "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში",
+    "The uploaded file was only partially uploaded" : "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
+    "No file was uploaded" : "ფაილი არ აიტვირთა",
+    "Missing a temporary folder" : "დროებითი საქაღალდე არ არსებობს",
+    "Failed to write to disk" : "შეცდომა დისკზე ჩაწერისას",
+    "Not enough storage available" : "საცავში საკმარისი ადგილი არ არის",
+    "Invalid directory." : "დაუშვებელი დირექტორია.",
+    "Files" : "ფაილები",
+    "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
+    "{new_name} already exists" : "{new_name} უკვე არსებობს",
+    "Share" : "გაზიარება",
+    "Delete" : "წაშლა",
+    "Unshare" : "გაუზიარებადი",
+    "Delete permanently" : "სრულად წაშლა",
+    "Rename" : "გადარქმევა",
+    "Pending" : "მოცდის რეჟიმში",
+    "Error" : "შეცდომა",
+    "Name" : "სახელი",
+    "Size" : "ზომა",
+    "Modified" : "შეცვლილია",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Your storage is full, files can not be updated or synced anymore!" : "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
+    "File handling" : "ფაილის დამუშავება",
+    "Maximum upload size" : "მაქსიმუმ ატვირთის ზომა",
+    "max. possible: " : "მაქს. შესაძლებელი:",
+    "Save" : "შენახვა",
+    "WebDAV" : "WebDAV",
+    "New" : "ახალი",
+    "Text file" : "ტექსტური ფაილი",
+    "New folder" : "ახალი ფოლდერი",
+    "Folder" : "საქაღალდე",
+    "From link" : "მისამართიდან",
+    "Nothing in here. Upload something!" : "აქ არაფერი არ არის. ატვირთე რამე!",
+    "Download" : "ჩამოტვირთვა",
+    "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." : "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/ka_GE.json b/apps/files/l10n/ka_GE.json
new file mode 100644
index 00000000000..65dde81cfc4
--- /dev/null
+++ b/apps/files/l10n/ka_GE.json
@@ -0,0 +1,52 @@
+{ "translations": {
+    "Unknown error" : "უცნობი შეცდომა",
+    "Could not move %s - File with this name already exists" : "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
+    "Could not move %s" : "%s –ის გადატანა ვერ მოხერხდა",
+    "File name cannot be empty." : "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული.",
+    "No file was uploaded. Unknown error" : "ფაილი არ აიტვირთა. უცნობი შეცდომა",
+    "There is no error, the file uploaded with success" : "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში",
+    "The uploaded file was only partially uploaded" : "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
+    "No file was uploaded" : "ფაილი არ აიტვირთა",
+    "Missing a temporary folder" : "დროებითი საქაღალდე არ არსებობს",
+    "Failed to write to disk" : "შეცდომა დისკზე ჩაწერისას",
+    "Not enough storage available" : "საცავში საკმარისი ადგილი არ არის",
+    "Invalid directory." : "დაუშვებელი დირექტორია.",
+    "Files" : "ფაილები",
+    "Upload cancelled." : "ატვირთვა შეჩერებულ იქნა.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
+    "{new_name} already exists" : "{new_name} უკვე არსებობს",
+    "Share" : "გაზიარება",
+    "Delete" : "წაშლა",
+    "Unshare" : "გაუზიარებადი",
+    "Delete permanently" : "სრულად წაშლა",
+    "Rename" : "გადარქმევა",
+    "Pending" : "მოცდის რეჟიმში",
+    "Error" : "შეცდომა",
+    "Name" : "სახელი",
+    "Size" : "ზომა",
+    "Modified" : "შეცვლილია",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Your storage is full, files can not be updated or synced anymore!" : "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
+    "File handling" : "ფაილის დამუშავება",
+    "Maximum upload size" : "მაქსიმუმ ატვირთის ზომა",
+    "max. possible: " : "მაქს. შესაძლებელი:",
+    "Save" : "შენახვა",
+    "WebDAV" : "WebDAV",
+    "New" : "ახალი",
+    "Text file" : "ტექსტური ფაილი",
+    "New folder" : "ახალი ფოლდერი",
+    "Folder" : "საქაღალდე",
+    "From link" : "მისამართიდან",
+    "Nothing in here. Upload something!" : "აქ არაფერი არ არის. ატვირთე რამე!",
+    "Download" : "ჩამოტვირთვა",
+    "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." : "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
deleted file mode 100644
index 31184a5796f..00000000000
--- a/apps/files/l10n/ka_GE.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "უცნობი შეცდომა",
-"Could not move %s - File with this name already exists" => "%s –ის გადატანა ვერ მოხერხდა – ფაილი ამ სახელით უკვე არსებობს",
-"Could not move %s" => "%s –ის გადატანა ვერ მოხერხდა",
-"File name cannot be empty." => "ფაილის სახელი არ შეიძლება იყოს ცარიელი.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "არადაშვებადი სახელი, '\\', '/', '<', '>', ':', '\"', '|', '?' და  '*' არ არის დაიშვებული.",
-"No file was uploaded. Unknown error" => "ფაილი არ აიტვირთა. უცნობი შეცდომა",
-"There is no error, the file uploaded with success" => "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში",
-"The uploaded file was only partially uploaded" => "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
-"No file was uploaded" => "ფაილი არ აიტვირთა",
-"Missing a temporary folder" => "დროებითი საქაღალდე არ არსებობს",
-"Failed to write to disk" => "შეცდომა დისკზე ჩაწერისას",
-"Not enough storage available" => "საცავში საკმარისი ადგილი არ არის",
-"Invalid directory." => "დაუშვებელი დირექტორია.",
-"Files" => "ფაილები",
-"Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
-"{new_name} already exists" => "{new_name} უკვე არსებობს",
-"Share" => "გაზიარება",
-"Delete" => "წაშლა",
-"Unshare" => "გაუზიარებადი",
-"Delete permanently" => "სრულად წაშლა",
-"Rename" => "გადარქმევა",
-"Pending" => "მოცდის რეჟიმში",
-"Error" => "შეცდომა",
-"Name" => "სახელი",
-"Size" => "ზომა",
-"Modified" => "შეცვლილია",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"Your storage is full, files can not be updated or synced anymore!" => "თქვენი საცავი გადაივსო. ფაილების განახლება და სინქრონიზირება ვერ მოხერხდება!",
-"Your storage is almost full ({usedSpacePercent}%)" => "თქვენი საცავი თითქმის გადაივსო ({usedSpacePercent}%)",
-"File handling" => "ფაილის დამუშავება",
-"Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
-"max. possible: " => "მაქს. შესაძლებელი:",
-"Save" => "შენახვა",
-"WebDAV" => "WebDAV",
-"New" => "ახალი",
-"Text file" => "ტექსტური ფაილი",
-"New folder" => "ახალი ფოლდერი",
-"Folder" => "საქაღალდე",
-"From link" => "მისამართიდან",
-"Nothing in here. Upload something!" => "აქ არაფერი არ არის. ატვირთე რამე!",
-"Download" => "ჩამოტვირთვა",
-"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." => "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/km.js b/apps/files/l10n/km.js
new file mode 100644
index 00000000000..5a44796d1e7
--- /dev/null
+++ b/apps/files/l10n/km.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "មិន​ស្គាល់​កំហុស",
+    "Could not move %s - File with this name already exists" : "មិន​អាច​ផ្លាស់​ទី %s - មាន​ឈ្មោះ​ឯកសារ​ដូច​នេះ​ហើយ",
+    "Could not move %s" : "មិន​អាច​ផ្លាស់ទី %s",
+    "File name cannot be empty." : "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទេ​បាន​ឡើយ។",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "ឈ្មោះ​មិន​ត្រឹម​ត្រូវ, មិន​អនុញ្ញាត '\\', '/', '<', '>', ':', '\"', '|', '?' និង '*' ទេ។",
+    "No file was uploaded. Unknown error" : "មិន​មាន​ឯកសារ​ដែល​បាន​ផ្ទុក​ឡើង។ មិន​ស្គាល់​កំហុស",
+    "There is no error, the file uploaded with success" : "មិន​មាន​កំហុស​អ្វី​ទេ ហើយ​ឯកសារ​ត្រូវ​បាន​ផ្ទុកឡើង​ដោយ​ជោគជ័យ",
+    "Files" : "ឯកសារ",
+    "Upload cancelled." : "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
+    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
+    "Share" : "ចែក​រំលែក",
+    "Delete" : "លុប",
+    "Unshare" : "លែង​ចែក​រំលែក",
+    "Delete permanently" : "លុប​ជា​អចិន្ត្រៃយ៍",
+    "Rename" : "ប្ដូរ​ឈ្មោះ",
+    "Pending" : "កំពុង​រង់ចាំ",
+    "Error" : "កំហុស",
+    "Name" : "ឈ្មោះ",
+    "Size" : "ទំហំ",
+    "Modified" : "បាន​កែ​ប្រែ",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Maximum upload size" : "ទំហំ​ផ្ទុកឡើង​ជា​អតិបរមា",
+    "Save" : "រក្សាទុក",
+    "WebDAV" : "WebDAV",
+    "New" : "ថ្មី",
+    "Text file" : "ឯកសារ​អក្សរ",
+    "New folder" : "ថត​ថ្មី",
+    "Folder" : "ថត",
+    "From link" : "ពី​តំណ",
+    "Nothing in here. Upload something!" : "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ផ្ទុក​ឡើង​អ្វី​មួយ!",
+    "Download" : "ទាញយក",
+    "Upload too large" : "ផ្ទុក​ឡើង​ធំ​ពេក"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/km.json b/apps/files/l10n/km.json
new file mode 100644
index 00000000000..6ed24afe47a
--- /dev/null
+++ b/apps/files/l10n/km.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Unknown error" : "មិន​ស្គាល់​កំហុស",
+    "Could not move %s - File with this name already exists" : "មិន​អាច​ផ្លាស់​ទី %s - មាន​ឈ្មោះ​ឯកសារ​ដូច​នេះ​ហើយ",
+    "Could not move %s" : "មិន​អាច​ផ្លាស់ទី %s",
+    "File name cannot be empty." : "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទេ​បាន​ឡើយ។",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "ឈ្មោះ​មិន​ត្រឹម​ត្រូវ, មិន​អនុញ្ញាត '\\', '/', '<', '>', ':', '\"', '|', '?' និង '*' ទេ។",
+    "No file was uploaded. Unknown error" : "មិន​មាន​ឯកសារ​ដែល​បាន​ផ្ទុក​ឡើង។ មិន​ស្គាល់​កំហុស",
+    "There is no error, the file uploaded with success" : "មិន​មាន​កំហុស​អ្វី​ទេ ហើយ​ឯកសារ​ត្រូវ​បាន​ផ្ទុកឡើង​ដោយ​ជោគជ័យ",
+    "Files" : "ឯកសារ",
+    "Upload cancelled." : "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
+    "{new_name} already exists" : "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
+    "Share" : "ចែក​រំលែក",
+    "Delete" : "លុប",
+    "Unshare" : "លែង​ចែក​រំលែក",
+    "Delete permanently" : "លុប​ជា​អចិន្ត្រៃយ៍",
+    "Rename" : "ប្ដូរ​ឈ្មោះ",
+    "Pending" : "កំពុង​រង់ចាំ",
+    "Error" : "កំហុស",
+    "Name" : "ឈ្មោះ",
+    "Size" : "ទំហំ",
+    "Modified" : "បាន​កែ​ប្រែ",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Maximum upload size" : "ទំហំ​ផ្ទុកឡើង​ជា​អតិបរមា",
+    "Save" : "រក្សាទុក",
+    "WebDAV" : "WebDAV",
+    "New" : "ថ្មី",
+    "Text file" : "ឯកសារ​អក្សរ",
+    "New folder" : "ថត​ថ្មី",
+    "Folder" : "ថត",
+    "From link" : "ពី​តំណ",
+    "Nothing in here. Upload something!" : "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ផ្ទុក​ឡើង​អ្វី​មួយ!",
+    "Download" : "ទាញយក",
+    "Upload too large" : "ផ្ទុក​ឡើង​ធំ​ពេក"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/km.php b/apps/files/l10n/km.php
deleted file mode 100644
index 9fa338d3659..00000000000
--- a/apps/files/l10n/km.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "មិន​ស្គាល់​កំហុស",
-"Could not move %s - File with this name already exists" => "មិន​អាច​ផ្លាស់​ទី %s - មាន​ឈ្មោះ​ឯកសារ​ដូច​នេះ​ហើយ",
-"Could not move %s" => "មិន​អាច​ផ្លាស់ទី %s",
-"File name cannot be empty." => "ឈ្មោះ​ឯកសារ​មិន​អាច​នៅ​ទទេ​បាន​ឡើយ។",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ឈ្មោះ​មិន​ត្រឹម​ត្រូវ, មិន​អនុញ្ញាត '\\', '/', '<', '>', ':', '\"', '|', '?' និង '*' ទេ។",
-"No file was uploaded. Unknown error" => "មិន​មាន​ឯកសារ​ដែល​បាន​ផ្ទុក​ឡើង។ មិន​ស្គាល់​កំហុស",
-"There is no error, the file uploaded with success" => "មិន​មាន​កំហុស​អ្វី​ទេ ហើយ​ឯកសារ​ត្រូវ​បាន​ផ្ទុកឡើង​ដោយ​ជោគជ័យ",
-"Files" => "ឯកសារ",
-"Upload cancelled." => "បាន​បោះបង់​ការ​ផ្ទុក​ឡើង។",
-"{new_name} already exists" => "មាន​ឈ្មោះ {new_name} រួច​ហើយ",
-"Share" => "ចែក​រំលែក",
-"Delete" => "លុប",
-"Unshare" => "លែង​ចែក​រំលែក",
-"Delete permanently" => "លុប​ជា​អចិន្ត្រៃយ៍",
-"Rename" => "ប្ដូរ​ឈ្មោះ",
-"Pending" => "កំពុង​រង់ចាំ",
-"Error" => "កំហុស",
-"Name" => "ឈ្មោះ",
-"Size" => "ទំហំ",
-"Modified" => "បាន​កែ​ប្រែ",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"Maximum upload size" => "ទំហំ​ផ្ទុកឡើង​ជា​អតិបរមា",
-"Save" => "រក្សាទុក",
-"WebDAV" => "WebDAV",
-"New" => "ថ្មី",
-"Text file" => "ឯកសារ​អក្សរ",
-"New folder" => "ថត​ថ្មី",
-"Folder" => "ថត",
-"From link" => "ពី​តំណ",
-"Nothing in here. Upload something!" => "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ផ្ទុក​ឡើង​អ្វី​មួយ!",
-"Download" => "ទាញយក",
-"Upload too large" => "ផ្ទុក​ឡើង​ធំ​ពេក"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/kn.js b/apps/files/l10n/kn.js
new file mode 100644
index 00000000000..d1bbfca2dd4
--- /dev/null
+++ b/apps/files/l10n/kn.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files",
+    {
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/kn.json b/apps/files/l10n/kn.json
new file mode 100644
index 00000000000..e493054d78a
--- /dev/null
+++ b/apps/files/l10n/kn.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/kn.php b/apps/files/l10n/kn.php
deleted file mode 100644
index 70ab6572ba4..00000000000
--- a/apps/files/l10n/kn.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ko.js b/apps/files/l10n/ko.js
new file mode 100644
index 00000000000..519652e4796
--- /dev/null
+++ b/apps/files/l10n/ko.js
@@ -0,0 +1,82 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "알 수 없는 오류",
+    "Could not move %s - File with this name already exists" : "항목 %s을(를) 이동시킬 수 없음 - 같은 이름의 파일이 이미 존재함",
+    "Could not move %s" : "항목 %s을(를) 이동시킬 수 없음",
+    "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "이름 %s이(가) 폴더 %s에서 이미 사용 중입니다. 다른 이름을 사용하십시오.",
+    "Not a valid source" : "올바르지 않은 원본",
+    "Server is not allowed to open URLs, please check the server configuration" : "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십시오",
+    "Error while downloading %s to %s" : "%s을(를) %s(으)로 다운로드하는 중 오류 발생",
+    "Error when creating the file" : "파일 생성 중 오류 발생",
+    "Folder name cannot be empty." : "폴더 이름이 비어있을 수 없습니다.",
+    "Error when creating the folder" : "폴더 생성 중 오류 발생",
+    "Unable to set upload directory." : "업로드 디렉터리를 설정할 수 없습니다.",
+    "Invalid Token" : "잘못된 토큰",
+    "No file was uploaded. Unknown error" : "파일이 업로드 되지 않았습니다. 알 수 없는 오류입니다",
+    "There is no error, the file uploaded with success" : "파일 업로드에 성공하였습니다.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "업로드한 파일 크기가 HTML 폼의 MAX_FILE_SIZE보다 큼",
+    "The uploaded file was only partially uploaded" : "파일의 일부분만 업로드됨",
+    "No file was uploaded" : "파일이 업로드되지 않았음",
+    "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" : "파일",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.",
+    "Upload cancelled." : "업로드가 취소되었습니다.",
+    "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
+    "URL cannot be empty" : "URL이 비어있을 수 없음",
+    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
+    "Could not create file" : "파일을 만들 수 없음",
+    "Could not create folder" : "폴더를 만들 수 없음",
+    "Error fetching URL" : "URL을 가져올 수 없음",
+    "Share" : "공유",
+    "Delete" : "삭제",
+    "Unshare" : "공유 해제",
+    "Delete permanently" : "영구히 삭제",
+    "Rename" : "이름 바꾸기",
+    "Pending" : "대기 중",
+    "Error moving file" : "파일 이동 오류",
+    "Error" : "오류",
+    "Could not rename file" : "이름을 변경할 수 없음",
+    "Error deleting file." : "파일 삭제 오류.",
+    "Name" : "이름",
+    "Size" : "크기",
+    "Modified" : "수정됨",
+    "_%n folder_::_%n folders_" : ["폴더 %n개"],
+    "_%n file_::_%n files_" : ["파일 %n개"],
+    "You don’t have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다",
+    "_Uploading %n file_::_Uploading %n files_" : ["파일 %n개 업로드 중"],
+    "Your storage is full, files can not be updated or synced anymore!" : "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오.",
+    "{dirs} and {files}" : "{dirs} 그리고 {files}",
+    "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다",
+    "File handling" : "파일 처리",
+    "Maximum upload size" : "최대 업로드 크기",
+    "max. possible: " : "최대 가능:",
+    "Save" : "저장",
+    "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" : "폴더",
+    "From link" : "링크에서",
+    "Nothing in here. Upload something!" : "내용이 없습니다. 업로드할 수 있습니다!",
+    "Download" : "다운로드",
+    "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." : "파일을 검색하고 있습니다. 기다려 주십시오."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/ko.json b/apps/files/l10n/ko.json
new file mode 100644
index 00000000000..afcda78ecd0
--- /dev/null
+++ b/apps/files/l10n/ko.json
@@ -0,0 +1,80 @@
+{ "translations": {
+    "Unknown error" : "알 수 없는 오류",
+    "Could not move %s - File with this name already exists" : "항목 %s을(를) 이동시킬 수 없음 - 같은 이름의 파일이 이미 존재함",
+    "Could not move %s" : "항목 %s을(를) 이동시킬 수 없음",
+    "File name cannot be empty." : "파일 이름이 비어 있을 수 없습니다.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "이름 %s이(가) 폴더 %s에서 이미 사용 중입니다. 다른 이름을 사용하십시오.",
+    "Not a valid source" : "올바르지 않은 원본",
+    "Server is not allowed to open URLs, please check the server configuration" : "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십시오",
+    "Error while downloading %s to %s" : "%s을(를) %s(으)로 다운로드하는 중 오류 발생",
+    "Error when creating the file" : "파일 생성 중 오류 발생",
+    "Folder name cannot be empty." : "폴더 이름이 비어있을 수 없습니다.",
+    "Error when creating the folder" : "폴더 생성 중 오류 발생",
+    "Unable to set upload directory." : "업로드 디렉터리를 설정할 수 없습니다.",
+    "Invalid Token" : "잘못된 토큰",
+    "No file was uploaded. Unknown error" : "파일이 업로드 되지 않았습니다. 알 수 없는 오류입니다",
+    "There is no error, the file uploaded with success" : "파일 업로드에 성공하였습니다.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "업로드한 파일 크기가 HTML 폼의 MAX_FILE_SIZE보다 큼",
+    "The uploaded file was only partially uploaded" : "파일의 일부분만 업로드됨",
+    "No file was uploaded" : "파일이 업로드되지 않았음",
+    "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" : "파일",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.",
+    "Upload cancelled." : "업로드가 취소되었습니다.",
+    "Could not get result from server." : "서버에서 결과를 가져올 수 없습니다.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
+    "URL cannot be empty" : "URL이 비어있을 수 없음",
+    "{new_name} already exists" : "{new_name}이(가) 이미 존재함",
+    "Could not create file" : "파일을 만들 수 없음",
+    "Could not create folder" : "폴더를 만들 수 없음",
+    "Error fetching URL" : "URL을 가져올 수 없음",
+    "Share" : "공유",
+    "Delete" : "삭제",
+    "Unshare" : "공유 해제",
+    "Delete permanently" : "영구히 삭제",
+    "Rename" : "이름 바꾸기",
+    "Pending" : "대기 중",
+    "Error moving file" : "파일 이동 오류",
+    "Error" : "오류",
+    "Could not rename file" : "이름을 변경할 수 없음",
+    "Error deleting file." : "파일 삭제 오류.",
+    "Name" : "이름",
+    "Size" : "크기",
+    "Modified" : "수정됨",
+    "_%n folder_::_%n folders_" : ["폴더 %n개"],
+    "_%n file_::_%n files_" : ["파일 %n개"],
+    "You don’t have permission to upload or create files here" : "여기에 파일을 업로드하거나 만들 권한이 없습니다",
+    "_Uploading %n file_::_Uploading %n files_" : ["파일 %n개 업로드 중"],
+    "Your storage is full, files can not be updated or synced anymore!" : "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오.",
+    "{dirs} and {files}" : "{dirs} 그리고 {files}",
+    "%s could not be renamed" : "%s의 이름을 변경할 수 없습니다",
+    "File handling" : "파일 처리",
+    "Maximum upload size" : "최대 업로드 크기",
+    "max. possible: " : "최대 가능:",
+    "Save" : "저장",
+    "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" : "폴더",
+    "From link" : "링크에서",
+    "Nothing in here. Upload something!" : "내용이 없습니다. 업로드할 수 있습니다!",
+    "Download" : "다운로드",
+    "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." : "파일을 검색하고 있습니다. 기다려 주십시오."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
deleted file mode 100644
index b342b375c77..00000000000
--- a/apps/files/l10n/ko.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "알 수 없는 오류",
-"Could not move %s - File with this name already exists" => "항목 %s을(를) 이동시킬 수 없음 - 같은 이름의 파일이 이미 존재함",
-"Could not move %s" => "항목 %s을(를) 이동시킬 수 없음",
-"File name cannot be empty." => "파일 이름이 비어 있을 수 없습니다.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "폴더 이름이 올바르지 않습니다. 이름에 문자 '\\', '/', '<', '>', ':', '\"', '|', '? ', '*'는 사용할 수 없습니다.",
-"The name %s is already used in the folder %s. Please choose a different name." => "이름 %s이(가) 폴더 %s에서 이미 사용 중입니다. 다른 이름을 사용하십시오.",
-"Not a valid source" => "올바르지 않은 원본",
-"Server is not allowed to open URLs, please check the server configuration" => "서버에서 URL을 열 수 없습니다. 서버 설정을 확인하십시오",
-"Error while downloading %s to %s" => "%s을(를) %s(으)로 다운로드하는 중 오류 발생",
-"Error when creating the file" => "파일 생성 중 오류 발생",
-"Folder name cannot be empty." => "폴더 이름이 비어있을 수 없습니다.",
-"Error when creating the folder" => "폴더 생성 중 오류 발생",
-"Unable to set upload directory." => "업로드 디렉터리를 설정할 수 없습니다.",
-"Invalid Token" => "잘못된 토큰",
-"No file was uploaded. Unknown error" => "파일이 업로드 되지 않았습니다. 알 수 없는 오류입니다",
-"There is no error, the file uploaded with success" => "파일 업로드에 성공하였습니다.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "업로드한 파일이 php.ini의 upload_max_filesize보다 큽니다:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "업로드한 파일 크기가 HTML 폼의 MAX_FILE_SIZE보다 큼",
-"The uploaded file was only partially uploaded" => "파일의 일부분만 업로드됨",
-"No file was uploaded" => "파일이 업로드되지 않았음",
-"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" => "파일",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "{filename}을(를) 업로드할 수 없습니다. 폴더이거나 0 바이트 파일입니다.",
-"Upload cancelled." => "업로드가 취소되었습니다.",
-"Could not get result from server." => "서버에서 결과를 가져올 수 없습니다.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "파일 업로드가 진행 중입니다. 이 페이지를 벗어나면 업로드가 취소됩니다.",
-"URL cannot be empty" => "URL이 비어있을 수 없음",
-"{new_name} already exists" => "{new_name}이(가) 이미 존재함",
-"Could not create file" => "파일을 만들 수 없음",
-"Could not create folder" => "폴더를 만들 수 없음",
-"Error fetching URL" => "URL을 가져올 수 없음",
-"Share" => "공유",
-"Delete" => "삭제",
-"Unshare" => "공유 해제",
-"Delete permanently" => "영구히 삭제",
-"Rename" => "이름 바꾸기",
-"Pending" => "대기 중",
-"Error moving file" => "파일 이동 오류",
-"Error" => "오류",
-"Could not rename file" => "이름을 변경할 수 없음",
-"Error deleting file." => "파일 삭제 오류.",
-"Name" => "이름",
-"Size" => "크기",
-"Modified" => "수정됨",
-"_%n folder_::_%n folders_" => array("폴더 %n개"),
-"_%n file_::_%n files_" => array("파일 %n개"),
-"You don’t have permission to upload or create files here" => "여기에 파일을 업로드하거나 만들 권한이 없습니다",
-"_Uploading %n file_::_Uploading %n files_" => array("파일 %n개 업로드 중"),
-"Your storage is full, files can not be updated or synced anymore!" => "저장 공간이 가득 찼습니다. 파일을 업데이트하거나 동기화할 수 없습니다!",
-"Your storage is almost full ({usedSpacePercent}%)" => "저장 공간이 거의 가득 찼습니다 ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "암호화 앱의 개인 키가 잘못되었습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 업데이트해야 합니다.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "암호화는 해제되어 있지만, 파일은 아직 암호화되어 있습니다. 개인 설정에서 파일을 복호화하십시오.",
-"{dirs} and {files}" => "{dirs} 그리고 {files}",
-"%s could not be renamed" => "%s의 이름을 변경할 수 없습니다",
-"File handling" => "파일 처리",
-"Maximum upload size" => "최대 업로드 크기",
-"max. possible: " => "최대 가능:",
-"Save" => "저장",
-"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" => "폴더",
-"From link" => "링크에서",
-"Nothing in here. Upload something!" => "내용이 없습니다. 업로드할 수 있습니다!",
-"Download" => "다운로드",
-"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." => "파일을 검색하고 있습니다. 기다려 주십시오."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/ku_IQ.js b/apps/files/l10n/ku_IQ.js
new file mode 100644
index 00000000000..5236669f239
--- /dev/null
+++ b/apps/files/l10n/ku_IQ.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files",
+    {
+    "Files" : "په‌ڕگەکان",
+    "Share" : "هاوبەشی کردن",
+    "Error" : "هه‌ڵه",
+    "Name" : "ناو",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "پاشکه‌وتکردن",
+    "Folder" : "بوخچه",
+    "Download" : "داگرتن"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ku_IQ.json b/apps/files/l10n/ku_IQ.json
new file mode 100644
index 00000000000..c11984e29d7
--- /dev/null
+++ b/apps/files/l10n/ku_IQ.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Files" : "په‌ڕگەکان",
+    "Share" : "هاوبەشی کردن",
+    "Error" : "هه‌ڵه",
+    "Name" : "ناو",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "پاشکه‌وتکردن",
+    "Folder" : "بوخچه",
+    "Download" : "داگرتن"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
deleted file mode 100644
index 4afe5e4cc29..00000000000
--- a/apps/files/l10n/ku_IQ.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Files" => "په‌ڕگەکان",
-"Share" => "هاوبەشی کردن",
-"Error" => "هه‌ڵه",
-"Name" => "ناو",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "پاشکه‌وتکردن",
-"Folder" => "بوخچه",
-"Download" => "داگرتن"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lb.js b/apps/files/l10n/lb.js
new file mode 100644
index 00000000000..05c3ff1e7e4
--- /dev/null
+++ b/apps/files/l10n/lb.js
@@ -0,0 +1,38 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Et ass en onbekannte Fehler opgetrueden",
+    "There is no error, the file uploaded with success" : "Keen Feeler, Datei ass komplett ropgelueden ginn",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
+    "The uploaded file was only partially uploaded" : "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
+    "No file was uploaded" : "Et ass kee Fichier ropgeluede ginn",
+    "Missing a temporary folder" : "Et feelt en temporären Dossier",
+    "Failed to write to disk" : "Konnt net op den Disk schreiwen",
+    "Files" : "Dateien",
+    "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.",
+    "Share" : "Deelen",
+    "Delete" : "Läschen",
+    "Unshare" : "Net méi deelen",
+    "Rename" : "Ëm-benennen",
+    "Error" : "Fehler",
+    "Name" : "Numm",
+    "Size" : "Gréisst",
+    "Modified" : "Geännert",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "Fichier handling",
+    "Maximum upload size" : "Maximum Upload Gréisst ",
+    "max. possible: " : "max. méiglech:",
+    "Save" : "Späicheren",
+    "New" : "Nei",
+    "Text file" : "Text Fichier",
+    "Folder" : "Dossier",
+    "Nothing in here. Upload something!" : "Hei ass näischt. Lued eppes rop!",
+    "Download" : "Download",
+    "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."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/lb.json b/apps/files/l10n/lb.json
new file mode 100644
index 00000000000..868141071f3
--- /dev/null
+++ b/apps/files/l10n/lb.json
@@ -0,0 +1,36 @@
+{ "translations": {
+    "Unknown error" : "Et ass en onbekannte Fehler opgetrueden",
+    "There is no error, the file uploaded with success" : "Keen Feeler, Datei ass komplett ropgelueden ginn",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
+    "The uploaded file was only partially uploaded" : "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
+    "No file was uploaded" : "Et ass kee Fichier ropgeluede ginn",
+    "Missing a temporary folder" : "Et feelt en temporären Dossier",
+    "Failed to write to disk" : "Konnt net op den Disk schreiwen",
+    "Files" : "Dateien",
+    "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.",
+    "Share" : "Deelen",
+    "Delete" : "Läschen",
+    "Unshare" : "Net méi deelen",
+    "Rename" : "Ëm-benennen",
+    "Error" : "Fehler",
+    "Name" : "Numm",
+    "Size" : "Gréisst",
+    "Modified" : "Geännert",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "Fichier handling",
+    "Maximum upload size" : "Maximum Upload Gréisst ",
+    "max. possible: " : "max. méiglech:",
+    "Save" : "Späicheren",
+    "New" : "Nei",
+    "Text file" : "Text Fichier",
+    "Folder" : "Dossier",
+    "Nothing in here. Upload something!" : "Hei ass näischt. Lued eppes rop!",
+    "Download" : "Download",
+    "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."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
deleted file mode 100644
index a60c930c870..00000000000
--- a/apps/files/l10n/lb.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Et ass en onbekannte Fehler opgetrueden",
-"There is no error, the file uploaded with success" => "Keen Feeler, Datei ass komplett ropgelueden ginn",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Déi ropgelueden Datei ass méi grouss wei d'MAX_FILE_SIZE Eegenschaft déi an der HTML form uginn ass",
-"The uploaded file was only partially uploaded" => "Déi ropgelueden Datei ass nëmmen hallef ropgelueden ginn",
-"No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
-"Missing a temporary folder" => "Et feelt en temporären Dossier",
-"Failed to write to disk" => "Konnt net op den Disk schreiwen",
-"Files" => "Dateien",
-"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.",
-"Share" => "Deelen",
-"Delete" => "Läschen",
-"Unshare" => "Net méi deelen",
-"Rename" => "Ëm-benennen",
-"Error" => "Fehler",
-"Name" => "Numm",
-"Size" => "Gréisst",
-"Modified" => "Geännert",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"File handling" => "Fichier handling",
-"Maximum upload size" => "Maximum Upload Gréisst ",
-"max. possible: " => "max. méiglech:",
-"Save" => "Späicheren",
-"New" => "Nei",
-"Text file" => "Text Fichier",
-"Folder" => "Dossier",
-"Nothing in here. Upload something!" => "Hei ass näischt. Lued eppes rop!",
-"Download" => "Download",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/lt_LT.js b/apps/files/l10n/lt_LT.js
new file mode 100644
index 00000000000..c4b391bee67
--- /dev/null
+++ b/apps/files/l10n/lt_LT.js
@@ -0,0 +1,82 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Neatpažinta klaida",
+    "Could not move %s - File with this name already exists" : "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
+    "Could not move %s" : "Nepavyko perkelti %s",
+    "File name cannot be empty." : "Failo pavadinimas negali būti tuščias.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Pavadinimas %s jau naudojamas aplanke %s. Prašome pasirinkti kitokį pavadinimą.",
+    "Not a valid source" : "Netinkamas šaltinis",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serveriui neleidžiama atverti URL, prašome patikrinti serverio konfigūraciją",
+    "Error while downloading %s to %s" : "Klaida siunčiant %s į %s",
+    "Error when creating the file" : "Klaida kuriant failą",
+    "Folder name cannot be empty." : "Aplanko pavadinimas negali būti tuščias.",
+    "Error when creating the folder" : "Klaida kuriant aplanką",
+    "Unable to set upload directory." : "Nepavyksta nustatyti įkėlimų katalogo.",
+    "Invalid Token" : "Netinkamas ženklas",
+    "No file was uploaded. Unknown error" : "Failai nebuvo įkelti dėl nežinomos priežasties",
+    "There is no error, the file uploaded with success" : "Failas įkeltas sėkmingai, be klaidų",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
+    "The uploaded file was only partially uploaded" : "Failas buvo įkeltas tik dalinai",
+    "No file was uploaded" : "Nebuvo įkeltas joks failas",
+    "Missing a temporary folder" : "Nėra laikinojo katalogo",
+    "Failed to write to disk" : "Nepavyko įrašyti į diską",
+    "Not enough storage available" : "Nepakanka vietos serveryje",
+    "Upload failed. Could not find uploaded file" : "Įkėlimas nepavyko. Nepavyko rasti įkelto failo",
+    "Upload failed. Could not get file info." : "Įkėlimas nepavyko. Nepavyko gauti failo informacijos.",
+    "Invalid directory." : "Neteisingas aplankas",
+    "Files" : "Failai",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio",
+    "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.",
+    "URL cannot be empty" : "URL negali būti tuščias.",
+    "{new_name} already exists" : "{new_name} jau egzistuoja",
+    "Could not create file" : "Neįmanoma sukurti failo",
+    "Could not create folder" : "Neįmanoma sukurti aplanko",
+    "Error fetching URL" : "Klauda gaunant URL",
+    "Share" : "Dalintis",
+    "Delete" : "Ištrinti",
+    "Unshare" : "Nebesidalinti",
+    "Delete permanently" : "Ištrinti negrįžtamai",
+    "Rename" : "Pervadinti",
+    "Pending" : "Laukiantis",
+    "Error moving file" : "Klaida perkeliant failą",
+    "Error" : "Klaida",
+    "Could not rename file" : "Neįmanoma pervadinti failo",
+    "Error deleting file." : "Klaida trinant failą.",
+    "Name" : "Pavadinimas",
+    "Size" : "Dydis",
+    "Modified" : "Pakeista",
+    "_%n folder_::_%n folders_" : ["%n aplankas","%n aplankai","%n aplankų"],
+    "_%n file_::_%n files_" : ["%n failas","%n failai","%n failų"],
+    "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ų"],
+    "Your storage is full, files can not be updated or synced anymore!" : "Jūsų visa vieta serveryje užimta",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.",
+    "{dirs} and {files}" : "{dirs} ir {files}",
+    "%s could not be renamed" : "%s negali būti pervadintas",
+    "File handling" : "Failų tvarkymas",
+    "Maximum upload size" : "Maksimalus įkeliamo failo dydis",
+    "max. possible: " : "maks. galima:",
+    "Save" : "Išsaugoti",
+    "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",
+    "From link" : "Iš nuorodos",
+    "Nothing in here. Upload something!" : "Čia tuščia. Įkelkite ką nors!",
+    "Download" : "Atsisiųsti",
+    "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."
+},
+"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/l10n/lt_LT.json b/apps/files/l10n/lt_LT.json
new file mode 100644
index 00000000000..6baaa79c92c
--- /dev/null
+++ b/apps/files/l10n/lt_LT.json
@@ -0,0 +1,80 @@
+{ "translations": {
+    "Unknown error" : "Neatpažinta klaida",
+    "Could not move %s - File with this name already exists" : "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
+    "Could not move %s" : "Nepavyko perkelti %s",
+    "File name cannot be empty." : "Failo pavadinimas negali būti tuščias.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Pavadinimas %s jau naudojamas aplanke %s. Prašome pasirinkti kitokį pavadinimą.",
+    "Not a valid source" : "Netinkamas šaltinis",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serveriui neleidžiama atverti URL, prašome patikrinti serverio konfigūraciją",
+    "Error while downloading %s to %s" : "Klaida siunčiant %s į %s",
+    "Error when creating the file" : "Klaida kuriant failą",
+    "Folder name cannot be empty." : "Aplanko pavadinimas negali būti tuščias.",
+    "Error when creating the folder" : "Klaida kuriant aplanką",
+    "Unable to set upload directory." : "Nepavyksta nustatyti įkėlimų katalogo.",
+    "Invalid Token" : "Netinkamas ženklas",
+    "No file was uploaded. Unknown error" : "Failai nebuvo įkelti dėl nežinomos priežasties",
+    "There is no error, the file uploaded with success" : "Failas įkeltas sėkmingai, be klaidų",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
+    "The uploaded file was only partially uploaded" : "Failas buvo įkeltas tik dalinai",
+    "No file was uploaded" : "Nebuvo įkeltas joks failas",
+    "Missing a temporary folder" : "Nėra laikinojo katalogo",
+    "Failed to write to disk" : "Nepavyko įrašyti į diską",
+    "Not enough storage available" : "Nepakanka vietos serveryje",
+    "Upload failed. Could not find uploaded file" : "Įkėlimas nepavyko. Nepavyko rasti įkelto failo",
+    "Upload failed. Could not get file info." : "Įkėlimas nepavyko. Nepavyko gauti failo informacijos.",
+    "Invalid directory." : "Neteisingas aplankas",
+    "Files" : "Failai",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio",
+    "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.",
+    "URL cannot be empty" : "URL negali būti tuščias.",
+    "{new_name} already exists" : "{new_name} jau egzistuoja",
+    "Could not create file" : "Neįmanoma sukurti failo",
+    "Could not create folder" : "Neįmanoma sukurti aplanko",
+    "Error fetching URL" : "Klauda gaunant URL",
+    "Share" : "Dalintis",
+    "Delete" : "Ištrinti",
+    "Unshare" : "Nebesidalinti",
+    "Delete permanently" : "Ištrinti negrįžtamai",
+    "Rename" : "Pervadinti",
+    "Pending" : "Laukiantis",
+    "Error moving file" : "Klaida perkeliant failą",
+    "Error" : "Klaida",
+    "Could not rename file" : "Neįmanoma pervadinti failo",
+    "Error deleting file." : "Klaida trinant failą.",
+    "Name" : "Pavadinimas",
+    "Size" : "Dydis",
+    "Modified" : "Pakeista",
+    "_%n folder_::_%n folders_" : ["%n aplankas","%n aplankai","%n aplankų"],
+    "_%n file_::_%n files_" : ["%n failas","%n failai","%n failų"],
+    "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ų"],
+    "Your storage is full, files can not be updated or synced anymore!" : "Jūsų visa vieta serveryje užimta",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.",
+    "{dirs} and {files}" : "{dirs} ir {files}",
+    "%s could not be renamed" : "%s negali būti pervadintas",
+    "File handling" : "Failų tvarkymas",
+    "Maximum upload size" : "Maksimalus įkeliamo failo dydis",
+    "max. possible: " : "maks. galima:",
+    "Save" : "Išsaugoti",
+    "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",
+    "From link" : "Iš nuorodos",
+    "Nothing in here. Upload something!" : "Čia tuščia. Įkelkite ką nors!",
+    "Download" : "Atsisiųsti",
+    "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."
+},"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/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
deleted file mode 100644
index e1c16c8a80f..00000000000
--- a/apps/files/l10n/lt_LT.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Neatpažinta klaida",
-"Could not move %s - File with this name already exists" => "Nepavyko perkelti %s - failas su tokiu pavadinimu jau egzistuoja",
-"Could not move %s" => "Nepavyko perkelti %s",
-"File name cannot be empty." => "Failo pavadinimas negali būti tuščias.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neleistinas pavadinimas, '\\', '/', '<', '>', ':', '\"', '|', '?' ir '*' yra neleidžiami.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Pavadinimas %s jau naudojamas aplanke %s. Prašome pasirinkti kitokį pavadinimą.",
-"Not a valid source" => "Netinkamas šaltinis",
-"Server is not allowed to open URLs, please check the server configuration" => "Serveriui neleidžiama atverti URL, prašome patikrinti serverio konfigūraciją",
-"Error while downloading %s to %s" => "Klaida siunčiant %s į %s",
-"Error when creating the file" => "Klaida kuriant failą",
-"Folder name cannot be empty." => "Aplanko pavadinimas negali būti tuščias.",
-"Error when creating the folder" => "Klaida kuriant aplanką",
-"Unable to set upload directory." => "Nepavyksta nustatyti įkėlimų katalogo.",
-"Invalid Token" => "Netinkamas ženklas",
-"No file was uploaded. Unknown error" => "Failai nebuvo įkelti dėl nežinomos priežasties",
-"There is no error, the file uploaded with success" => "Failas įkeltas sėkmingai, be klaidų",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Įkeliamas failas yra didesnis nei leidžia upload_max_filesize php.ini faile:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Įkeliamo failo dydis viršija MAX_FILE_SIZE nustatymą, kuris naudojamas HTML formoje.",
-"The uploaded file was only partially uploaded" => "Failas buvo įkeltas tik dalinai",
-"No file was uploaded" => "Nebuvo įkeltas joks failas",
-"Missing a temporary folder" => "Nėra laikinojo katalogo",
-"Failed to write to disk" => "Nepavyko įrašyti į diską",
-"Not enough storage available" => "Nepakanka vietos serveryje",
-"Upload failed. Could not find uploaded file" => "Įkėlimas nepavyko. Nepavyko rasti įkelto failo",
-"Upload failed. Could not get file info." => "Įkėlimas nepavyko. Nepavyko gauti failo informacijos.",
-"Invalid directory." => "Neteisingas aplankas",
-"Files" => "Failai",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nepavyksta įkelti {filename}, nes tai katalogas arba yra 0 baitų dydžio",
-"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.",
-"URL cannot be empty" => "URL negali būti tuščias.",
-"{new_name} already exists" => "{new_name} jau egzistuoja",
-"Could not create file" => "Neįmanoma sukurti failo",
-"Could not create folder" => "Neįmanoma sukurti aplanko",
-"Error fetching URL" => "Klauda gaunant URL",
-"Share" => "Dalintis",
-"Delete" => "Ištrinti",
-"Unshare" => "Nebesidalinti",
-"Delete permanently" => "Ištrinti negrįžtamai",
-"Rename" => "Pervadinti",
-"Pending" => "Laukiantis",
-"Error moving file" => "Klaida perkeliant failą",
-"Error" => "Klaida",
-"Could not rename file" => "Neįmanoma pervadinti failo",
-"Error deleting file." => "Klaida trinant failą.",
-"Name" => "Pavadinimas",
-"Size" => "Dydis",
-"Modified" => "Pakeista",
-"_%n folder_::_%n folders_" => array("%n aplankas","%n aplankai","%n aplankų"),
-"_%n file_::_%n files_" => array("%n failas","%n failai","%n failų"),
-"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_" => array("Įkeliamas %n failas","Įkeliami %n failai","Įkeliama %n failų"),
-"Your storage is full, files can not be updated or synced anymore!" => "Jūsų visa vieta serveryje užimta",
-"Your storage is almost full ({usedSpacePercent}%)" => "Jūsų vieta serveryje beveik visa užimta ({usedSpacePercent}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifravimas buvo išjungtas, bet Jūsų failai vis dar užšifruoti. Prašome eiti į asmeninius nustatymus ir iššifruoti savo failus.",
-"{dirs} and {files}" => "{dirs} ir {files}",
-"%s could not be renamed" => "%s negali būti pervadintas",
-"File handling" => "Failų tvarkymas",
-"Maximum upload size" => "Maksimalus įkeliamo failo dydis",
-"max. possible: " => "maks. galima:",
-"Save" => "Išsaugoti",
-"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",
-"From link" => "Iš nuorodos",
-"Nothing in here. Upload something!" => "Čia tuščia. Įkelkite ką nors!",
-"Download" => "Atsisiųsti",
-"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."
-);
-$PLURAL_FORMS = "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/l10n/lv.js b/apps/files/l10n/lv.js
new file mode 100644
index 00000000000..d01f2894d94
--- /dev/null
+++ b/apps/files/l10n/lv.js
@@ -0,0 +1,58 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Nezināma kļūda",
+    "Could not move %s - File with this name already exists" : "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
+    "Could not move %s" : "Nevarēja pārvietot %s",
+    "File name cannot be empty." : "Datnes nosaukums nevar būt tukšs.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
+    "Unable to set upload directory." : "Nevar uzstādīt augšupielādes mapi.",
+    "Invalid Token" : "Nepareiza pilnvara",
+    "No file was uploaded. Unknown error" : "Netika augšupielādēta neviena datne. Nezināma kļūda",
+    "There is no error, the file uploaded with success" : "Viss kārtībā, datne augšupielādēta veiksmīga",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Augšupielādētā datne pārsniedz MAX_FILE_SIZE norādi, kas ir norādīta HTML formā",
+    "The uploaded file was only partially uploaded" : "Augšupielādētā datne ir tikai daļēji augšupielādēta",
+    "No file was uploaded" : "Neviena datne netika augšupielādēta",
+    "Missing a temporary folder" : "Trūkst pagaidu mapes",
+    "Failed to write to disk" : "Neizdevās saglabāt diskā",
+    "Not enough storage available" : "Nav pietiekami daudz vietas",
+    "Invalid directory." : "Nederīga direktorija.",
+    "Files" : "Datnes",
+    "Upload cancelled." : "Augšupielāde ir atcelta.",
+    "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ē",
+    "Share" : "Dalīties",
+    "Delete" : "Dzēst",
+    "Unshare" : "Pārtraukt dalīšanos",
+    "Delete permanently" : "Dzēst pavisam",
+    "Rename" : "Pārsaukt",
+    "Pending" : "Gaida savu kārtu",
+    "Error" : "Kļūda",
+    "Name" : "Nosaukums",
+    "Size" : "Izmērs",
+    "Modified" : "Mainīts",
+    "_%n folder_::_%n folders_" : ["%n mapes","%n mape","%n mapes"],
+    "_%n file_::_%n files_" : ["%n faili","%n fails","%n faili"],
+    "_Uploading %n file_::_Uploading %n files_" : ["%n","Augšupielāde %n failu","Augšupielāde %n failus"],
+    "Your storage is full, files can not be updated or synced anymore!" : "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
+    "%s could not be renamed" : "%s nevar tikt pārsaukts",
+    "File handling" : "Datņu pārvaldība",
+    "Maximum upload size" : "Maksimālais datņu augšupielādes apjoms",
+    "max. possible: " : "maksimālais iespējamais:",
+    "Save" : "Saglabāt",
+    "WebDAV" : "WebDAV",
+    "New" : "Jauna",
+    "Text file" : "Teksta datne",
+    "New folder" : "Jauna mape",
+    "Folder" : "Mape",
+    "From link" : "No saites",
+    "Nothing in here. Upload something!" : "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
+    "Download" : "Lejupielādēt",
+    "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."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files/l10n/lv.json b/apps/files/l10n/lv.json
new file mode 100644
index 00000000000..39a0caea5b2
--- /dev/null
+++ b/apps/files/l10n/lv.json
@@ -0,0 +1,56 @@
+{ "translations": {
+    "Unknown error" : "Nezināma kļūda",
+    "Could not move %s - File with this name already exists" : "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
+    "Could not move %s" : "Nevarēja pārvietot %s",
+    "File name cannot be empty." : "Datnes nosaukums nevar būt tukšs.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
+    "Unable to set upload directory." : "Nevar uzstādīt augšupielādes mapi.",
+    "Invalid Token" : "Nepareiza pilnvara",
+    "No file was uploaded. Unknown error" : "Netika augšupielādēta neviena datne. Nezināma kļūda",
+    "There is no error, the file uploaded with success" : "Viss kārtībā, datne augšupielādēta veiksmīga",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Augšupielādētā datne pārsniedz MAX_FILE_SIZE norādi, kas ir norādīta HTML formā",
+    "The uploaded file was only partially uploaded" : "Augšupielādētā datne ir tikai daļēji augšupielādēta",
+    "No file was uploaded" : "Neviena datne netika augšupielādēta",
+    "Missing a temporary folder" : "Trūkst pagaidu mapes",
+    "Failed to write to disk" : "Neizdevās saglabāt diskā",
+    "Not enough storage available" : "Nav pietiekami daudz vietas",
+    "Invalid directory." : "Nederīga direktorija.",
+    "Files" : "Datnes",
+    "Upload cancelled." : "Augšupielāde ir atcelta.",
+    "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ē",
+    "Share" : "Dalīties",
+    "Delete" : "Dzēst",
+    "Unshare" : "Pārtraukt dalīšanos",
+    "Delete permanently" : "Dzēst pavisam",
+    "Rename" : "Pārsaukt",
+    "Pending" : "Gaida savu kārtu",
+    "Error" : "Kļūda",
+    "Name" : "Nosaukums",
+    "Size" : "Izmērs",
+    "Modified" : "Mainīts",
+    "_%n folder_::_%n folders_" : ["%n mapes","%n mape","%n mapes"],
+    "_%n file_::_%n files_" : ["%n faili","%n fails","%n faili"],
+    "_Uploading %n file_::_Uploading %n files_" : ["%n","Augšupielāde %n failu","Augšupielāde %n failus"],
+    "Your storage is full, files can not be updated or synced anymore!" : "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
+    "%s could not be renamed" : "%s nevar tikt pārsaukts",
+    "File handling" : "Datņu pārvaldība",
+    "Maximum upload size" : "Maksimālais datņu augšupielādes apjoms",
+    "max. possible: " : "maksimālais iespējamais:",
+    "Save" : "Saglabāt",
+    "WebDAV" : "WebDAV",
+    "New" : "Jauna",
+    "Text file" : "Teksta datne",
+    "New folder" : "Jauna mape",
+    "Folder" : "Mape",
+    "From link" : "No saites",
+    "Nothing in here. Upload something!" : "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
+    "Download" : "Lejupielādēt",
+    "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."
+},"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/l10n/lv.php b/apps/files/l10n/lv.php
deleted file mode 100644
index 3911fb806fb..00000000000
--- a/apps/files/l10n/lv.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Nezināma kļūda",
-"Could not move %s - File with this name already exists" => "Nevarēja pārvietot %s — jau eksistē datne ar tādu nosaukumu",
-"Could not move %s" => "Nevarēja pārvietot %s",
-"File name cannot be empty." => "Datnes nosaukums nevar būt tukšs.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nederīgs nosaukums, nav atļauti '\\', '/', '<', '>', ':', '\"', '|', '?' un '*'.",
-"Unable to set upload directory." => "Nevar uzstādīt augšupielādes mapi.",
-"Invalid Token" => "Nepareiza pilnvara",
-"No file was uploaded. Unknown error" => "Netika augšupielādēta neviena datne. Nezināma kļūda",
-"There is no error, the file uploaded with success" => "Viss kārtībā, datne augšupielādēta veiksmīga",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Augšupielādētā datne pārsniedz upload_max_filesize norādījumu php.ini datnē:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Augšupielādētā datne pārsniedz MAX_FILE_SIZE norādi, kas ir norādīta HTML formā",
-"The uploaded file was only partially uploaded" => "Augšupielādētā datne ir tikai daļēji augšupielādēta",
-"No file was uploaded" => "Neviena datne netika augšupielādēta",
-"Missing a temporary folder" => "Trūkst pagaidu mapes",
-"Failed to write to disk" => "Neizdevās saglabāt diskā",
-"Not enough storage available" => "Nav pietiekami daudz vietas",
-"Invalid directory." => "Nederīga direktorija.",
-"Files" => "Datnes",
-"Upload cancelled." => "Augšupielāde ir atcelta.",
-"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ē",
-"Share" => "Dalīties",
-"Delete" => "Dzēst",
-"Unshare" => "Pārtraukt dalīšanos",
-"Delete permanently" => "Dzēst pavisam",
-"Rename" => "Pārsaukt",
-"Pending" => "Gaida savu kārtu",
-"Error" => "Kļūda",
-"Name" => "Nosaukums",
-"Size" => "Izmērs",
-"Modified" => "Mainīts",
-"_%n folder_::_%n folders_" => array("%n mapes","%n mape","%n mapes"),
-"_%n file_::_%n files_" => array("%n faili","%n fails","%n faili"),
-"_Uploading %n file_::_Uploading %n files_" => array("%n","Augšupielāde %n failu","Augšupielāde %n failus"),
-"Your storage is full, files can not be updated or synced anymore!" => "Jūsu krātuve ir pilna, datnes vairs nevar augšupielādēt vai sinhronizēt!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Jūsu krātuve ir gandrīz pilna ({usedSpacePercent}%)",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrēšana tika atslēgta, tomēr jūsu faili joprojām ir šifrēti. Atšifrēt failus var Personiskajos uzstādījumos.",
-"%s could not be renamed" => "%s nevar tikt pārsaukts",
-"File handling" => "Datņu pārvaldība",
-"Maximum upload size" => "Maksimālais datņu augšupielādes apjoms",
-"max. possible: " => "maksimālais iespējamais:",
-"Save" => "Saglabāt",
-"WebDAV" => "WebDAV",
-"New" => "Jauna",
-"Text file" => "Teksta datne",
-"New folder" => "Jauna mape",
-"Folder" => "Mape",
-"From link" => "No saites",
-"Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšupielādēt!",
-"Download" => "Lejupielādēt",
-"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."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files/l10n/mg.js b/apps/files/l10n/mg.js
new file mode 100644
index 00000000000..f085469f731
--- /dev/null
+++ b/apps/files/l10n/mg.js
@@ -0,0 +1,8 @@
+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/mg.json b/apps/files/l10n/mg.json
new file mode 100644
index 00000000000..ba9792477cd
--- /dev/null
+++ b/apps/files/l10n/mg.json
@@ -0,0 +1,6 @@
+{ "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/mg.php b/apps/files/l10n/mg.php
deleted file mode 100644
index 3c711e6b78a..00000000000
--- a/apps/files/l10n/mg.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/mk.js b/apps/files/l10n/mk.js
new file mode 100644
index 00000000000..57a717ceaf6
--- /dev/null
+++ b/apps/files/l10n/mk.js
@@ -0,0 +1,70 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Непозната грешка",
+    "Could not move %s - File with this name already exists" : "Не можам да го преместам %s - Датотека со такво име веќе постои",
+    "Could not move %s" : "Не можам да ги префрлам %s",
+    "File name cannot be empty." : "Името на датотеката не може да биде празно.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
+    "Not a valid source" : "Не е валиден извор",
+    "Error while downloading %s to %s" : "Грешка додека преземам %s to %s",
+    "Error when creating the file" : "Грешка при креирање на датотека",
+    "Folder name cannot be empty." : "Името на папката не може да биде празно.",
+    "Error when creating the folder" : "Грешка при креирање на папка",
+    "Unable to set upload directory." : "Не може да се постави папката за префрлање на податоци.",
+    "Invalid Token" : "Грешен токен",
+    "No file was uploaded. Unknown error" : "Ниту еден фајл не се вчита. Непозната грешка",
+    "There is no error, the file uploaded with success" : "Датотеката беше успешно подигната.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата",
+    "The uploaded file was only partially uploaded" : "Датотеката беше само делумно подигната.",
+    "No file was uploaded" : "Не беше подигната датотека.",
+    "Missing a temporary folder" : "Недостасува привремена папка",
+    "Failed to write to disk" : "Неуспеав да запишам на диск",
+    "Not enough storage available" : "Нема доволно слободен сториџ",
+    "Upload failed. Could not find uploaded file" : "Префрлањето е неуспешно. Не можам да го најдам префрлената датотека.",
+    "Invalid directory." : "Погрешна папка.",
+    "Files" : "Датотеки",
+    "Upload cancelled." : "Преземањето е прекинато.",
+    "Could not get result from server." : "Не можам да добијам резултат од серверот.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
+    "URL cannot be empty" : "URL-то не може да биде празно",
+    "{new_name} already exists" : "{new_name} веќе постои",
+    "Could not create file" : "Не множам да креирам датотека",
+    "Could not create folder" : "Не можам да креирам папка",
+    "Share" : "Сподели",
+    "Delete" : "Избриши",
+    "Unshare" : "Не споделувај",
+    "Delete permanently" : "Трајно избришани",
+    "Rename" : "Преименувај",
+    "Pending" : "Чека",
+    "Error moving file" : "Грешка при префрлање на датотека",
+    "Error" : "Грешка",
+    "Could not rename file" : "Не можам да ја преименувам датотеката",
+    "Name" : "Име",
+    "Size" : "Големина",
+    "Modified" : "Променето",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Your storage is full, files can not be updated or synced anymore!" : "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
+    "{dirs} and {files}" : "{dirs} и {files}",
+    "%s could not be renamed" : "%s не може да биде преименуван",
+    "File handling" : "Ракување со датотеки",
+    "Maximum upload size" : "Максимална големина за подигање",
+    "max. possible: " : "макс. можно:",
+    "Save" : "Сними",
+    "WebDAV" : "WebDAV",
+    "New" : "Ново",
+    "Text file" : "Текстуална датотека",
+    "New folder" : "Нова папка",
+    "Folder" : "Папка",
+    "From link" : "Од врска",
+    "Nothing in here. Upload something!" : "Тука нема ништо. Снимете нешто!",
+    "Download" : "Преземи",
+    "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." : "Се скенираат датотеки, ве молам почекајте."
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/files/l10n/mk.json b/apps/files/l10n/mk.json
new file mode 100644
index 00000000000..2d3df73a75f
--- /dev/null
+++ b/apps/files/l10n/mk.json
@@ -0,0 +1,68 @@
+{ "translations": {
+    "Unknown error" : "Непозната грешка",
+    "Could not move %s - File with this name already exists" : "Не можам да го преместам %s - Датотека со такво име веќе постои",
+    "Could not move %s" : "Не можам да ги префрлам %s",
+    "File name cannot be empty." : "Името на датотеката не може да биде празно.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
+    "Not a valid source" : "Не е валиден извор",
+    "Error while downloading %s to %s" : "Грешка додека преземам %s to %s",
+    "Error when creating the file" : "Грешка при креирање на датотека",
+    "Folder name cannot be empty." : "Името на папката не може да биде празно.",
+    "Error when creating the folder" : "Грешка при креирање на папка",
+    "Unable to set upload directory." : "Не може да се постави папката за префрлање на податоци.",
+    "Invalid Token" : "Грешен токен",
+    "No file was uploaded. Unknown error" : "Ниту еден фајл не се вчита. Непозната грешка",
+    "There is no error, the file uploaded with success" : "Датотеката беше успешно подигната.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата",
+    "The uploaded file was only partially uploaded" : "Датотеката беше само делумно подигната.",
+    "No file was uploaded" : "Не беше подигната датотека.",
+    "Missing a temporary folder" : "Недостасува привремена папка",
+    "Failed to write to disk" : "Неуспеав да запишам на диск",
+    "Not enough storage available" : "Нема доволно слободен сториџ",
+    "Upload failed. Could not find uploaded file" : "Префрлањето е неуспешно. Не можам да го најдам префрлената датотека.",
+    "Invalid directory." : "Погрешна папка.",
+    "Files" : "Датотеки",
+    "Upload cancelled." : "Преземањето е прекинато.",
+    "Could not get result from server." : "Не можам да добијам резултат од серверот.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
+    "URL cannot be empty" : "URL-то не може да биде празно",
+    "{new_name} already exists" : "{new_name} веќе постои",
+    "Could not create file" : "Не множам да креирам датотека",
+    "Could not create folder" : "Не можам да креирам папка",
+    "Share" : "Сподели",
+    "Delete" : "Избриши",
+    "Unshare" : "Не споделувај",
+    "Delete permanently" : "Трајно избришани",
+    "Rename" : "Преименувај",
+    "Pending" : "Чека",
+    "Error moving file" : "Грешка при префрлање на датотека",
+    "Error" : "Грешка",
+    "Could not rename file" : "Не можам да ја преименувам датотеката",
+    "Name" : "Име",
+    "Size" : "Големина",
+    "Modified" : "Променето",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Your storage is full, files can not be updated or synced anymore!" : "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
+    "{dirs} and {files}" : "{dirs} и {files}",
+    "%s could not be renamed" : "%s не може да биде преименуван",
+    "File handling" : "Ракување со датотеки",
+    "Maximum upload size" : "Максимална големина за подигање",
+    "max. possible: " : "макс. можно:",
+    "Save" : "Сними",
+    "WebDAV" : "WebDAV",
+    "New" : "Ново",
+    "Text file" : "Текстуална датотека",
+    "New folder" : "Нова папка",
+    "Folder" : "Папка",
+    "From link" : "Од врска",
+    "Nothing in here. Upload something!" : "Тука нема ништо. Снимете нешто!",
+    "Download" : "Преземи",
+    "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." : "Се скенираат датотеки, ве молам почекајте."
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
deleted file mode 100644
index 395b2b4f0cc..00000000000
--- a/apps/files/l10n/mk.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Непозната грешка",
-"Could not move %s - File with this name already exists" => "Не можам да го преместам %s - Датотека со такво име веќе постои",
-"Could not move %s" => "Не можам да ги префрлам %s",
-"File name cannot be empty." => "Името на датотеката не може да биде празно.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправилно име. , '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' не се дозволени.",
-"Not a valid source" => "Не е валиден извор",
-"Error while downloading %s to %s" => "Грешка додека преземам %s to %s",
-"Error when creating the file" => "Грешка при креирање на датотека",
-"Folder name cannot be empty." => "Името на папката не може да биде празно.",
-"Error when creating the folder" => "Грешка при креирање на папка",
-"Unable to set upload directory." => "Не може да се постави папката за префрлање на податоци.",
-"Invalid Token" => "Грешен токен",
-"No file was uploaded. Unknown error" => "Ниту еден фајл не се вчита. Непозната грешка",
-"There is no error, the file uploaded with success" => "Датотеката беше успешно подигната.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Подигнатата датотека ја надминува upload_max_filesize директивата во php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Големината на датотеката ја надминува MAX_FILE_SIZE директивата која беше специфицирана во HTML формата",
-"The uploaded file was only partially uploaded" => "Датотеката беше само делумно подигната.",
-"No file was uploaded" => "Не беше подигната датотека.",
-"Missing a temporary folder" => "Недостасува привремена папка",
-"Failed to write to disk" => "Неуспеав да запишам на диск",
-"Not enough storage available" => "Нема доволно слободен сториџ",
-"Upload failed. Could not find uploaded file" => "Префрлањето е неуспешно. Не можам да го најдам префрлената датотека.",
-"Invalid directory." => "Погрешна папка.",
-"Files" => "Датотеки",
-"Upload cancelled." => "Преземањето е прекинато.",
-"Could not get result from server." => "Не можам да добијам резултат од серверот.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Подигање на датотека е во тек. Напуштење на страницата ќе го прекине.",
-"URL cannot be empty" => "URL-то не може да биде празно",
-"{new_name} already exists" => "{new_name} веќе постои",
-"Could not create file" => "Не множам да креирам датотека",
-"Could not create folder" => "Не можам да креирам папка",
-"Share" => "Сподели",
-"Delete" => "Избриши",
-"Unshare" => "Не споделувај",
-"Delete permanently" => "Трајно избришани",
-"Rename" => "Преименувај",
-"Pending" => "Чека",
-"Error moving file" => "Грешка при префрлање на датотека",
-"Error" => "Грешка",
-"Could not rename file" => "Не можам да ја преименувам датотеката",
-"Name" => "Име",
-"Size" => "Големина",
-"Modified" => "Променето",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Your storage is full, files can not be updated or synced anymore!" => "Вашиот сториџ е полн, датотеките веќе не можат да се освежуваат или синхронизираат!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Вашиот сториџ е скоро полн ({usedSpacePercent}%)",
-"{dirs} and {files}" => "{dirs} и {files}",
-"%s could not be renamed" => "%s не може да биде преименуван",
-"File handling" => "Ракување со датотеки",
-"Maximum upload size" => "Максимална големина за подигање",
-"max. possible: " => "макс. можно:",
-"Save" => "Сними",
-"WebDAV" => "WebDAV",
-"New" => "Ново",
-"Text file" => "Текстуална датотека",
-"New folder" => "Нова папка",
-"Folder" => "Папка",
-"From link" => "Од врска",
-"Nothing in here. Upload something!" => "Тука нема ништо. Снимете нешто!",
-"Download" => "Преземи",
-"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." => "Се скенираат датотеки, ве молам почекајте."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files/l10n/ml.js b/apps/files/l10n/ml.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/ml.js
@@ -0,0 +1,8 @@
+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/ml.json b/apps/files/l10n/ml.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/ml.json
@@ -0,0 +1,6 @@
+{ "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/ml.php b/apps/files/l10n/ml.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/ml.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ml_IN.js b/apps/files/l10n/ml_IN.js
new file mode 100644
index 00000000000..a7af6e02c73
--- /dev/null
+++ b/apps/files/l10n/ml_IN.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files",
+    {
+    "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/ml_IN.json b/apps/files/l10n/ml_IN.json
new file mode 100644
index 00000000000..e140756a6bd
--- /dev/null
+++ b/apps/files/l10n/ml_IN.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Files" : "ഫയലുകൾ",
+    "_%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/ml_IN.php b/apps/files/l10n/ml_IN.php
deleted file mode 100644
index 9cf8ea034ab..00000000000
--- a/apps/files/l10n/ml_IN.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Files" => "ഫയലുകൾ",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/mn.js b/apps/files/l10n/mn.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/mn.js
@@ -0,0 +1,8 @@
+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/mn.json b/apps/files/l10n/mn.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/mn.json
@@ -0,0 +1,6 @@
+{ "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/mn.php b/apps/files/l10n/mn.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/mn.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ms_MY.js b/apps/files/l10n/ms_MY.js
new file mode 100644
index 00000000000..50e95b4bca2
--- /dev/null
+++ b/apps/files/l10n/ms_MY.js
@@ -0,0 +1,37 @@
+OC.L10N.register(
+    "files",
+    {
+    "No file was uploaded. Unknown error" : "Tiada fail dimuatnaik. Ralat tidak diketahui.",
+    "There is no error, the file uploaded with success" : "Tiada ralat berlaku, fail berjaya dimuatnaik",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
+    "The uploaded file was only partially uploaded" : "Fail yang dimuatnaik tidak lengkap",
+    "No file was uploaded" : "Tiada fail dimuatnaik",
+    "Missing a temporary folder" : "Direktori sementara hilang",
+    "Failed to write to disk" : "Gagal untuk disimpan",
+    "Files" : "Fail-fail",
+    "Upload cancelled." : "Muatnaik dibatalkan.",
+    "Share" : "Kongsi",
+    "Delete" : "Padam",
+    "Rename" : "Namakan",
+    "Pending" : "Dalam proses",
+    "Error" : "Ralat",
+    "Name" : "Nama",
+    "Size" : "Saiz",
+    "Modified" : "Dimodifikasi",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "File handling" : "Pengendalian fail",
+    "Maximum upload size" : "Saiz maksimum muat naik",
+    "max. possible: " : "maksimum:",
+    "Save" : "Simpan",
+    "New" : "Baru",
+    "Text file" : "Fail teks",
+    "Folder" : "Folder",
+    "Nothing in here. Upload something!" : "Tiada apa-apa di sini. Muat naik sesuatu!",
+    "Download" : "Muat turun",
+    "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."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/ms_MY.json b/apps/files/l10n/ms_MY.json
new file mode 100644
index 00000000000..6f085a76a68
--- /dev/null
+++ b/apps/files/l10n/ms_MY.json
@@ -0,0 +1,35 @@
+{ "translations": {
+    "No file was uploaded. Unknown error" : "Tiada fail dimuatnaik. Ralat tidak diketahui.",
+    "There is no error, the file uploaded with success" : "Tiada ralat berlaku, fail berjaya dimuatnaik",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
+    "The uploaded file was only partially uploaded" : "Fail yang dimuatnaik tidak lengkap",
+    "No file was uploaded" : "Tiada fail dimuatnaik",
+    "Missing a temporary folder" : "Direktori sementara hilang",
+    "Failed to write to disk" : "Gagal untuk disimpan",
+    "Files" : "Fail-fail",
+    "Upload cancelled." : "Muatnaik dibatalkan.",
+    "Share" : "Kongsi",
+    "Delete" : "Padam",
+    "Rename" : "Namakan",
+    "Pending" : "Dalam proses",
+    "Error" : "Ralat",
+    "Name" : "Nama",
+    "Size" : "Saiz",
+    "Modified" : "Dimodifikasi",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "File handling" : "Pengendalian fail",
+    "Maximum upload size" : "Saiz maksimum muat naik",
+    "max. possible: " : "maksimum:",
+    "Save" : "Simpan",
+    "New" : "Baru",
+    "Text file" : "Fail teks",
+    "Folder" : "Folder",
+    "Nothing in here. Upload something!" : "Tiada apa-apa di sini. Muat naik sesuatu!",
+    "Download" : "Muat turun",
+    "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."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
deleted file mode 100644
index 32bf46bb814..00000000000
--- a/apps/files/l10n/ms_MY.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"No file was uploaded. Unknown error" => "Tiada fail dimuatnaik. Ralat tidak diketahui.",
-"There is no error, the file uploaded with success" => "Tiada ralat berlaku, fail berjaya dimuatnaik",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Saiz fail yang dimuatnaik melebihi MAX_FILE_SIZE yang ditetapkan dalam borang HTML",
-"The uploaded file was only partially uploaded" => "Fail yang dimuatnaik tidak lengkap",
-"No file was uploaded" => "Tiada fail dimuatnaik",
-"Missing a temporary folder" => "Direktori sementara hilang",
-"Failed to write to disk" => "Gagal untuk disimpan",
-"Files" => "Fail-fail",
-"Upload cancelled." => "Muatnaik dibatalkan.",
-"Share" => "Kongsi",
-"Delete" => "Padam",
-"Rename" => "Namakan",
-"Pending" => "Dalam proses",
-"Error" => "Ralat",
-"Name" => "Nama",
-"Size" => "Saiz",
-"Modified" => "Dimodifikasi",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"File handling" => "Pengendalian fail",
-"Maximum upload size" => "Saiz maksimum muat naik",
-"max. possible: " => "maksimum:",
-"Save" => "Simpan",
-"New" => "Baru",
-"Text file" => "Fail teks",
-"Folder" => "Folder",
-"Nothing in here. Upload something!" => "Tiada apa-apa di sini. Muat naik sesuatu!",
-"Download" => "Muat turun",
-"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."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/mt_MT.js b/apps/files/l10n/mt_MT.js
new file mode 100644
index 00000000000..82ce643895a
--- /dev/null
+++ b/apps/files/l10n/mt_MT.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files",
+    {
+    "_%n folder_::_%n folders_" : ["","","",""],
+    "_%n file_::_%n files_" : ["","","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","","",""]
+},
+"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);");
diff --git a/apps/files/l10n/mt_MT.json b/apps/files/l10n/mt_MT.json
new file mode 100644
index 00000000000..8bcf5b69eab
--- /dev/null
+++ b/apps/files/l10n/mt_MT.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%n folder_::_%n folders_" : ["","","",""],
+    "_%n file_::_%n files_" : ["","","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","","",""]
+},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/mt_MT.php b/apps/files/l10n/mt_MT.php
deleted file mode 100644
index 2a3be76cb7f..00000000000
--- a/apps/files/l10n/mt_MT.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("","","",""),
-"_%n file_::_%n files_" => array("","","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","","","")
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);";
diff --git a/apps/files/l10n/my_MM.js b/apps/files/l10n/my_MM.js
new file mode 100644
index 00000000000..0a7ff3bb31c
--- /dev/null
+++ b/apps/files/l10n/my_MM.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files",
+    {
+    "Files" : "ဖိုင်များ",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Download" : "ဒေါင်းလုတ်"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/my_MM.json b/apps/files/l10n/my_MM.json
new file mode 100644
index 00000000000..d4b9b3d0fa8
--- /dev/null
+++ b/apps/files/l10n/my_MM.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Files" : "ဖိုင်များ",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Download" : "ဒေါင်းလုတ်"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/my_MM.php b/apps/files/l10n/my_MM.php
deleted file mode 100644
index 497ecc09492..00000000000
--- a/apps/files/l10n/my_MM.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Files" => "ဖိုင်များ",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"Download" => "ဒေါင်းလုတ်"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/nb_NO.js b/apps/files/l10n/nb_NO.js
new file mode 100644
index 00000000000..d9c59b1bdd7
--- /dev/null
+++ b/apps/files/l10n/nb_NO.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Lagringsplass ikke tilgjengelig",
+    "Storage invalid" : "Lagringsplass ugyldig",
+    "Unknown error" : "Ukjent feil",
+    "Could not move %s - File with this name already exists" : "Kan ikke flytte %s - En fil med samme navn finnes allerede",
+    "Could not move %s" : "Kunne ikke flytte %s",
+    "Permission denied" : "Tilgang nektet",
+    "File name cannot be empty." : "Filnavn kan ikke være tomt.",
+    "\"%s\" is an invalid file name." : "\"%s\" er et ugyldig filnavn.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+    "The target folder has been moved or deleted." : "Målmappen er blitt flyttet eller slettet.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Navnet %s brukes allerede i mappen %s. Velg et annet navn.",
+    "Not a valid source" : "Ikke en gyldig kilde",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serveren har ikke lov til å åpne URL-er. Sjekk konfigurasjon av server",
+    "The file exceeds your quota by %s" : "Filen overstiger din kvote med %s",
+    "Error while downloading %s to %s" : "Feil ved nedlasting av %s til %s",
+    "Error when creating the file" : "Feil ved oppretting av filen",
+    "Folder name cannot be empty." : "Mappenavn kan ikke være tomt.",
+    "Error when creating the folder" : "Feil ved oppretting av mappen",
+    "Unable to set upload directory." : "Kunne ikke sette opplastingskatalog.",
+    "Invalid Token" : "Ugyldig nøkkel",
+    "No file was uploaded. Unknown error" : "Ingen filer ble lastet opp. Ukjent feil.",
+    "There is no error, the file uploaded with success" : "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
+    "The uploaded file was only partially uploaded" : "Filen du prøvde å laste opp ble kun delvis lastet opp",
+    "No file was uploaded" : "Ingen filer ble lastet opp",
+    "Missing a temporary folder" : "Mangler midlertidig mappe",
+    "Failed to write to disk" : "Klarte ikke å skrive til disk",
+    "Not enough storage available" : "Ikke nok lagringsplass",
+    "Upload failed. Could not find uploaded file" : "Opplasting feilet. Fant ikke opplastet fil.",
+    "Upload failed. Could not get file info." : "Opplasting feilet. Klarte ikke å finne informasjon om fil.",
+    "Invalid directory." : "Ugyldig katalog.",
+    "Files" : "Filer",
+    "All files" : "Alle filer",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig",
+    "Upload cancelled." : "Opplasting avbrutt.",
+    "Could not get result from server." : "Fikk ikke resultat fra serveren.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
+    "URL cannot be empty" : "URL kan ikke være tom",
+    "{new_name} already exists" : "{new_name} finnes allerede",
+    "Could not create file" : "Klarte ikke å opprette fil",
+    "Could not create folder" : "Klarte ikke å opprette mappe",
+    "Error fetching URL" : "Feil ved henting av URL",
+    "Share" : "Del",
+    "Delete" : "Slett",
+    "Disconnect storage" : "Koble fra lagring",
+    "Unshare" : "Avslutt deling",
+    "Delete permanently" : "Slett permanent",
+    "Rename" : "Gi nytt navn",
+    "Pending" : "Ventende",
+    "Error moving file." : "Feil ved flytting av fil.",
+    "Error moving file" : "Feil ved flytting av fil",
+    "Error" : "Feil",
+    "Could not rename file" : "Klarte ikke å gi nytt navn til fil",
+    "Error deleting file." : "Feil ved sletting av fil.",
+    "Name" : "Navn",
+    "Size" : "Størrelse",
+    "Modified" : "Endret",
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
+    "{dirs} and {files}" : "{dirs} og {files}",
+    "%s could not be renamed as it has been deleted" : "%s kunne ikke gis nytt navn da den er blitt slettet",
+    "%s could not be renamed" : "Kunne ikke gi nytt navn til %s",
+    "Upload (max. %s)" : "Opplasting (maks. %s)",
+    "File handling" : "Filhåndtering",
+    "Maximum upload size" : "Maksimum opplastingsstørrelse",
+    "max. possible: " : "max. mulige:",
+    "Save" : "Lagre",
+    "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",
+    "From link" : "Fra lenke",
+    "Nothing in here. Upload something!" : "Ingenting her. Last opp noe!",
+    "Download" : "Last ned",
+    "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 for å laste opp til denne serveren.",
+    "Files are being scanned, please wait." : "Skanner filer, vennligst vent.",
+    "Currently scanning" : "Skanner nå"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/nb_NO.json b/apps/files/l10n/nb_NO.json
new file mode 100644
index 00000000000..ab3dfc782e6
--- /dev/null
+++ b/apps/files/l10n/nb_NO.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Lagringsplass ikke tilgjengelig",
+    "Storage invalid" : "Lagringsplass ugyldig",
+    "Unknown error" : "Ukjent feil",
+    "Could not move %s - File with this name already exists" : "Kan ikke flytte %s - En fil med samme navn finnes allerede",
+    "Could not move %s" : "Kunne ikke flytte %s",
+    "Permission denied" : "Tilgang nektet",
+    "File name cannot be empty." : "Filnavn kan ikke være tomt.",
+    "\"%s\" is an invalid file name." : "\"%s\" er et ugyldig filnavn.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
+    "The target folder has been moved or deleted." : "Målmappen er blitt flyttet eller slettet.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Navnet %s brukes allerede i mappen %s. Velg et annet navn.",
+    "Not a valid source" : "Ikke en gyldig kilde",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serveren har ikke lov til å åpne URL-er. Sjekk konfigurasjon av server",
+    "The file exceeds your quota by %s" : "Filen overstiger din kvote med %s",
+    "Error while downloading %s to %s" : "Feil ved nedlasting av %s til %s",
+    "Error when creating the file" : "Feil ved oppretting av filen",
+    "Folder name cannot be empty." : "Mappenavn kan ikke være tomt.",
+    "Error when creating the folder" : "Feil ved oppretting av mappen",
+    "Unable to set upload directory." : "Kunne ikke sette opplastingskatalog.",
+    "Invalid Token" : "Ugyldig nøkkel",
+    "No file was uploaded. Unknown error" : "Ingen filer ble lastet opp. Ukjent feil.",
+    "There is no error, the file uploaded with success" : "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
+    "The uploaded file was only partially uploaded" : "Filen du prøvde å laste opp ble kun delvis lastet opp",
+    "No file was uploaded" : "Ingen filer ble lastet opp",
+    "Missing a temporary folder" : "Mangler midlertidig mappe",
+    "Failed to write to disk" : "Klarte ikke å skrive til disk",
+    "Not enough storage available" : "Ikke nok lagringsplass",
+    "Upload failed. Could not find uploaded file" : "Opplasting feilet. Fant ikke opplastet fil.",
+    "Upload failed. Could not get file info." : "Opplasting feilet. Klarte ikke å finne informasjon om fil.",
+    "Invalid directory." : "Ugyldig katalog.",
+    "Files" : "Filer",
+    "All files" : "Alle filer",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "Total filstørrelse {size1} overstiger grense for opplasting {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig",
+    "Upload cancelled." : "Opplasting avbrutt.",
+    "Could not get result from server." : "Fikk ikke resultat fra serveren.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
+    "URL cannot be empty" : "URL kan ikke være tom",
+    "{new_name} already exists" : "{new_name} finnes allerede",
+    "Could not create file" : "Klarte ikke å opprette fil",
+    "Could not create folder" : "Klarte ikke å opprette mappe",
+    "Error fetching URL" : "Feil ved henting av URL",
+    "Share" : "Del",
+    "Delete" : "Slett",
+    "Disconnect storage" : "Koble fra lagring",
+    "Unshare" : "Avslutt deling",
+    "Delete permanently" : "Slett permanent",
+    "Rename" : "Gi nytt navn",
+    "Pending" : "Ventende",
+    "Error moving file." : "Feil ved flytting av fil.",
+    "Error moving file" : "Feil ved flytting av fil",
+    "Error" : "Feil",
+    "Could not rename file" : "Klarte ikke å gi nytt navn til fil",
+    "Error deleting file." : "Feil ved sletting av fil.",
+    "Name" : "Navn",
+    "Size" : "Størrelse",
+    "Modified" : "Endret",
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" er et uglydig filnavn.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
+    "{dirs} and {files}" : "{dirs} og {files}",
+    "%s could not be renamed as it has been deleted" : "%s kunne ikke gis nytt navn da den er blitt slettet",
+    "%s could not be renamed" : "Kunne ikke gi nytt navn til %s",
+    "Upload (max. %s)" : "Opplasting (maks. %s)",
+    "File handling" : "Filhåndtering",
+    "Maximum upload size" : "Maksimum opplastingsstørrelse",
+    "max. possible: " : "max. mulige:",
+    "Save" : "Lagre",
+    "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",
+    "From link" : "Fra lenke",
+    "Nothing in here. Upload something!" : "Ingenting her. Last opp noe!",
+    "Download" : "Last ned",
+    "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 for å laste opp til denne serveren.",
+    "Files are being scanned, please wait." : "Skanner filer, vennligst vent.",
+    "Currently scanning" : "Skanner nå"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
deleted file mode 100644
index 259fc0beec9..00000000000
--- a/apps/files/l10n/nb_NO.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Lagringsplass ikke tilgjengelig",
-"Storage invalid" => "Lagringsplass ugyldig",
-"Unknown error" => "Ukjent feil",
-"Could not move %s - File with this name already exists" => "Kan ikke flytte %s - En fil med samme navn finnes allerede",
-"Could not move %s" => "Kunne ikke flytte %s",
-"Permission denied" => "Tilgang nektet",
-"File name cannot be empty." => "Filnavn kan ikke være tomt.",
-"\"%s\" is an invalid file name." => "\"%s\" er et ugyldig filnavn.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig navn, '\\', '/', '<', '>', ':', '\"', '|', '?' og '*' er ikke tillatt.",
-"The target folder has been moved or deleted." => "Målmappen er blitt flyttet eller slettet.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Navnet %s brukes allerede i mappen %s. Velg et annet navn.",
-"Not a valid source" => "Ikke en gyldig kilde",
-"Server is not allowed to open URLs, please check the server configuration" => "Serveren har ikke lov til å åpne URL-er. Sjekk konfigurasjon av server",
-"The file exceeds your quota by %s" => "Filen overstiger din kvote med %s",
-"Error while downloading %s to %s" => "Feil ved nedlasting av %s til %s",
-"Error when creating the file" => "Feil ved oppretting av filen",
-"Folder name cannot be empty." => "Mappenavn kan ikke være tomt.",
-"Error when creating the folder" => "Feil ved oppretting av mappen",
-"Unable to set upload directory." => "Kunne ikke sette opplastingskatalog.",
-"Invalid Token" => "Ugyldig nøkkel",
-"No file was uploaded. Unknown error" => "Ingen filer ble lastet opp. Ukjent feil.",
-"There is no error, the file uploaded with success" => "Pust ut, ingen feil. Filen ble lastet opp problemfritt",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Filstørrelsen overskrider maksgrensedirektivet upload_max_filesize i php.ini-konfigurasjonen.",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Filen du prøvde å laste opp var større enn grensen satt i MAX_FILE_SIZE i HTML-skjemaet.",
-"The uploaded file was only partially uploaded" => "Filen du prøvde å laste opp ble kun delvis lastet opp",
-"No file was uploaded" => "Ingen filer ble lastet opp",
-"Missing a temporary folder" => "Mangler midlertidig mappe",
-"Failed to write to disk" => "Klarte ikke å skrive til disk",
-"Not enough storage available" => "Ikke nok lagringsplass",
-"Upload failed. Could not find uploaded file" => "Opplasting feilet. Fant ikke opplastet fil.",
-"Upload failed. Could not get file info." => "Opplasting feilet. Klarte ikke å finne informasjon om fil.",
-"Invalid directory." => "Ugyldig katalog.",
-"Files" => "Filer",
-"All files" => "Alle filer",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan ikke laste opp {filename} fordi det er en mappe eller har 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "Total filstørrelse {size1} overstiger grense for opplasting {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Ikke nok ledig plass. Du laster opp size1} men bare {size2} er ledig",
-"Upload cancelled." => "Opplasting avbrutt.",
-"Could not get result from server." => "Fikk ikke resultat fra serveren.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
-"URL cannot be empty" => "URL kan ikke være tom",
-"{new_name} already exists" => "{new_name} finnes allerede",
-"Could not create file" => "Klarte ikke å opprette fil",
-"Could not create folder" => "Klarte ikke å opprette mappe",
-"Error fetching URL" => "Feil ved henting av URL",
-"Share" => "Del",
-"Delete" => "Slett",
-"Disconnect storage" => "Koble fra lagring",
-"Unshare" => "Avslutt deling",
-"Delete permanently" => "Slett permanent",
-"Rename" => "Gi nytt navn",
-"Pending" => "Ventende",
-"Error moving file." => "Feil ved flytting av fil.",
-"Error moving file" => "Feil ved flytting av fil",
-"Error" => "Feil",
-"Could not rename file" => "Klarte ikke å gi nytt navn til fil",
-"Error deleting file." => "Feil ved sletting av fil.",
-"Name" => "Navn",
-"Size" => "Størrelse",
-"Modified" => "Endret",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
-"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_" => array("Laster opp %n fil","Laster opp %n filer"),
-"\"{name}\" is an invalid file name." => "\"{name}\" er et uglydig filnavn.",
-"Your storage is full, files can not be updated or synced anymore!" => "Lagringsplass er oppbrukt, filer kan ikke lenger oppdateres eller synkroniseres!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Lagringsplass er nesten brukt opp ([usedSpacePercent}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering ble slått av men filene dine er fremdeles kryptert. Gå til dine personlige innstillinger for å dekryptere filene dine.",
-"{dirs} and {files}" => "{dirs} og {files}",
-"%s could not be renamed as it has been deleted" => "%s kunne ikke gis nytt navn da den er blitt slettet",
-"%s could not be renamed" => "Kunne ikke gi nytt navn til %s",
-"Upload (max. %s)" => "Opplasting (maks. %s)",
-"File handling" => "Filhåndtering",
-"Maximum upload size" => "Maksimum opplastingsstørrelse",
-"max. possible: " => "max. mulige:",
-"Save" => "Lagre",
-"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",
-"From link" => "Fra lenke",
-"Nothing in here. Upload something!" => "Ingenting her. Last opp noe!",
-"Download" => "Last ned",
-"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 for å laste opp til denne serveren.",
-"Files are being scanned, please wait." => "Skanner filer, vennligst vent.",
-"Currently scanning" => "Skanner nå"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nds.js b/apps/files/l10n/nds.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/nds.js
@@ -0,0 +1,8 @@
+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/nds.json b/apps/files/l10n/nds.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/nds.json
@@ -0,0 +1,6 @@
+{ "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/nds.php b/apps/files/l10n/nds.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/nds.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ne.js b/apps/files/l10n/ne.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/ne.js
@@ -0,0 +1,8 @@
+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/ne.json b/apps/files/l10n/ne.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/ne.json
@@ -0,0 +1,6 @@
+{ "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/ne.php b/apps/files/l10n/ne.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/ne.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nl.js b/apps/files/l10n/nl.js
new file mode 100644
index 00000000000..75f1e26ec0b
--- /dev/null
+++ b/apps/files/l10n/nl.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Opslag niet beschikbaar",
+    "Storage invalid" : "Opslag ongeldig",
+    "Unknown error" : "Onbekende fout",
+    "Could not move %s - File with this name already exists" : "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
+    "Could not move %s" : "Kon %s niet verplaatsen",
+    "Permission denied" : "Toegang geweigerd",
+    "File name cannot be empty." : "Bestandsnaam kan niet leeg zijn.",
+    "\"%s\" is an invalid file name." : "\"%s\" is een ongeldige bestandsnaam.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
+    "The target folder has been moved or deleted." : "De doelmap is verplaatst of verwijderd.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "De naam %s bestaat al in map %s. Kies een andere naam.",
+    "Not a valid source" : "Geen geldige bron",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server mag geen URL's openen, controleer de serverconfiguratie",
+    "The file exceeds your quota by %s" : "Het bestand overschrijdt uw quotum met %s",
+    "Error while downloading %s to %s" : "Fout bij downloaden %s naar %s",
+    "Error when creating the file" : "Fout bij creëren bestand",
+    "Folder name cannot be empty." : "Mapnaam mag niet leeg zijn.",
+    "Error when creating the folder" : "Fout bij aanmaken map",
+    "Unable to set upload directory." : "Kan uploadmap niet instellen.",
+    "Invalid Token" : "Ongeldig Token",
+    "No file was uploaded. Unknown error" : "Er was geen bestand geladen.  Onbekende fout",
+    "There is no error, the file uploaded with success" : "Het bestand is succesvol geüpload.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier",
+    "The uploaded file was only partially uploaded" : "Het bestand is slechts gedeeltelijk geüpload",
+    "No file was uploaded" : "Er is geen bestand geüpload",
+    "Missing a temporary folder" : "Er ontbreekt een tijdelijke map",
+    "Failed to write to disk" : "Schrijven naar schijf mislukt",
+    "Not enough storage available" : "Niet genoeg opslagruimte beschikbaar",
+    "Upload failed. Could not find uploaded file" : "Upload mislukt. Kon geüploade bestand niet vinden",
+    "Upload failed. Could not get file info." : "Upload mislukt. Kon geen bestandsinfo krijgen.",
+    "Invalid directory." : "Ongeldige directory.",
+    "Files" : "Bestanden",
+    "All files" : "Alle bestanden",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
+    "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar",
+    "Upload cancelled." : "Uploaden geannuleerd.",
+    "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
+    "URL cannot be empty" : "URL mag niet leeg zijn",
+    "{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",
+    "Error fetching URL" : "Fout bij ophalen URL",
+    "Share" : "Delen",
+    "Delete" : "Verwijderen",
+    "Disconnect storage" : "Verbinding met opslag verbreken",
+    "Unshare" : "Stop met delen",
+    "Delete permanently" : "Definitief verwijderen",
+    "Rename" : "Naam wijzigen",
+    "Pending" : "In behandeling",
+    "Error moving file." : "Fout bij verplaatsen bestand.",
+    "Error moving file" : "Fout bij verplaatsen bestand",
+    "Error" : "Fout",
+    "Could not rename file" : "Kon de naam van het bestand niet wijzigen",
+    "Error deleting file." : "Fout bij verwijderen bestand.",
+    "Name" : "Naam",
+    "Size" : "Grootte",
+    "Modified" : "Aangepast",
+    "_%n folder_::_%n folders_" : ["","%n mappen"],
+    "_%n file_::_%n files_" : ["%n bestand","%n bestanden"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" is een ongeldige bestandsnaam.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Uw opslagruimte zit vol. Bestanden kunnen niet meer worden gewijzigd of gesynchroniseerd!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
+    "{dirs} and {files}" : "{dirs} en {files}",
+    "%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)",
+    "File handling" : "Bestand",
+    "Maximum upload size" : "Maximale bestandsgrootte voor uploads",
+    "max. possible: " : "max. mogelijk: ",
+    "Save" : "Bewaren",
+    "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",
+    "From link" : "Vanaf link",
+    "Nothing in here. Upload something!" : "Niets te zien hier. Upload iets!",
+    "Download" : "Downloaden",
+    "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.",
+    "Currently scanning" : "Nu aan het scannen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/nl.json b/apps/files/l10n/nl.json
new file mode 100644
index 00000000000..58416264c9a
--- /dev/null
+++ b/apps/files/l10n/nl.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Opslag niet beschikbaar",
+    "Storage invalid" : "Opslag ongeldig",
+    "Unknown error" : "Onbekende fout",
+    "Could not move %s - File with this name already exists" : "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
+    "Could not move %s" : "Kon %s niet verplaatsen",
+    "Permission denied" : "Toegang geweigerd",
+    "File name cannot be empty." : "Bestandsnaam kan niet leeg zijn.",
+    "\"%s\" is an invalid file name." : "\"%s\" is een ongeldige bestandsnaam.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
+    "The target folder has been moved or deleted." : "De doelmap is verplaatst of verwijderd.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "De naam %s bestaat al in map %s. Kies een andere naam.",
+    "Not a valid source" : "Geen geldige bron",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server mag geen URL's openen, controleer de serverconfiguratie",
+    "The file exceeds your quota by %s" : "Het bestand overschrijdt uw quotum met %s",
+    "Error while downloading %s to %s" : "Fout bij downloaden %s naar %s",
+    "Error when creating the file" : "Fout bij creëren bestand",
+    "Folder name cannot be empty." : "Mapnaam mag niet leeg zijn.",
+    "Error when creating the folder" : "Fout bij aanmaken map",
+    "Unable to set upload directory." : "Kan uploadmap niet instellen.",
+    "Invalid Token" : "Ongeldig Token",
+    "No file was uploaded. Unknown error" : "Er was geen bestand geladen.  Onbekende fout",
+    "There is no error, the file uploaded with success" : "Het bestand is succesvol geüpload.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier",
+    "The uploaded file was only partially uploaded" : "Het bestand is slechts gedeeltelijk geüpload",
+    "No file was uploaded" : "Er is geen bestand geüpload",
+    "Missing a temporary folder" : "Er ontbreekt een tijdelijke map",
+    "Failed to write to disk" : "Schrijven naar schijf mislukt",
+    "Not enough storage available" : "Niet genoeg opslagruimte beschikbaar",
+    "Upload failed. Could not find uploaded file" : "Upload mislukt. Kon geüploade bestand niet vinden",
+    "Upload failed. Could not get file info." : "Upload mislukt. Kon geen bestandsinfo krijgen.",
+    "Invalid directory." : "Ongeldige directory.",
+    "Files" : "Bestanden",
+    "All files" : "Alle bestanden",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
+    "Total file size {size1} exceeds upload limit {size2}" : "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar",
+    "Upload cancelled." : "Uploaden geannuleerd.",
+    "Could not get result from server." : "Kon het resultaat van de server niet terugkrijgen.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
+    "URL cannot be empty" : "URL mag niet leeg zijn",
+    "{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",
+    "Error fetching URL" : "Fout bij ophalen URL",
+    "Share" : "Delen",
+    "Delete" : "Verwijderen",
+    "Disconnect storage" : "Verbinding met opslag verbreken",
+    "Unshare" : "Stop met delen",
+    "Delete permanently" : "Definitief verwijderen",
+    "Rename" : "Naam wijzigen",
+    "Pending" : "In behandeling",
+    "Error moving file." : "Fout bij verplaatsen bestand.",
+    "Error moving file" : "Fout bij verplaatsen bestand",
+    "Error" : "Fout",
+    "Could not rename file" : "Kon de naam van het bestand niet wijzigen",
+    "Error deleting file." : "Fout bij verwijderen bestand.",
+    "Name" : "Naam",
+    "Size" : "Grootte",
+    "Modified" : "Aangepast",
+    "_%n folder_::_%n folders_" : ["","%n mappen"],
+    "_%n file_::_%n files_" : ["%n bestand","%n bestanden"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" is een ongeldige bestandsnaam.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Uw opslagruimte zit vol. Bestanden kunnen niet meer worden gewijzigd of gesynchroniseerd!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
+    "{dirs} and {files}" : "{dirs} en {files}",
+    "%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)",
+    "File handling" : "Bestand",
+    "Maximum upload size" : "Maximale bestandsgrootte voor uploads",
+    "max. possible: " : "max. mogelijk: ",
+    "Save" : "Bewaren",
+    "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",
+    "From link" : "Vanaf link",
+    "Nothing in here. Upload something!" : "Niets te zien hier. Upload iets!",
+    "Download" : "Downloaden",
+    "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.",
+    "Currently scanning" : "Nu aan het scannen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
deleted file mode 100644
index a1a44916936..00000000000
--- a/apps/files/l10n/nl.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Opslag niet beschikbaar",
-"Storage invalid" => "Opslag ongeldig",
-"Unknown error" => "Onbekende fout",
-"Could not move %s - File with this name already exists" => "Kon %s niet verplaatsen - Er bestaat al een bestand met deze naam",
-"Could not move %s" => "Kon %s niet verplaatsen",
-"Permission denied" => "Toegang geweigerd",
-"File name cannot be empty." => "Bestandsnaam kan niet leeg zijn.",
-"\"%s\" is an invalid file name." => "\"%s\" is een ongeldige bestandsnaam.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Onjuiste naam; '\\', '/', '<', '>', ':', '\"', '|', '?' en '*' zijn niet toegestaan.",
-"The target folder has been moved or deleted." => "De doelmap is verplaatst of verwijderd.",
-"The name %s is already used in the folder %s. Please choose a different name." => "De naam %s bestaat al in map %s. Kies een andere naam.",
-"Not a valid source" => "Geen geldige bron",
-"Server is not allowed to open URLs, please check the server configuration" => "Server mag geen URL's openen, controleer de serverconfiguratie",
-"The file exceeds your quota by %s" => "Het bestand overschrijdt uw quotum met %s",
-"Error while downloading %s to %s" => "Fout bij downloaden %s naar %s",
-"Error when creating the file" => "Fout bij creëren bestand",
-"Folder name cannot be empty." => "Mapnaam mag niet leeg zijn.",
-"Error when creating the folder" => "Fout bij aanmaken map",
-"Unable to set upload directory." => "Kan uploadmap niet instellen.",
-"Invalid Token" => "Ongeldig Token",
-"No file was uploaded. Unknown error" => "Er was geen bestand geladen.  Onbekende fout",
-"There is no error, the file uploaded with success" => "Het bestand is succesvol geüpload.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Het geüploade bestand overscheidt de upload_max_filesize optie in php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier",
-"The uploaded file was only partially uploaded" => "Het bestand is slechts gedeeltelijk geüpload",
-"No file was uploaded" => "Er is geen bestand geüpload",
-"Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
-"Failed to write to disk" => "Schrijven naar schijf mislukt",
-"Not enough storage available" => "Niet genoeg opslagruimte beschikbaar",
-"Upload failed. Could not find uploaded file" => "Upload mislukt. Kon geüploade bestand niet vinden",
-"Upload failed. Could not get file info." => "Upload mislukt. Kon geen bestandsinfo krijgen.",
-"Invalid directory." => "Ongeldige directory.",
-"Files" => "Bestanden",
-"All files" => "Alle bestanden",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan {filename} niet uploaden omdat het een map is of 0 bytes groot is",
-"Total file size {size1} exceeds upload limit {size2}" => "Totale bestandsgrootte {size1} groter dan uploadlimiet {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Niet genoeg vrije ruimte. U upload {size1}, maar is is slechts {size2} beschikbaar",
-"Upload cancelled." => "Uploaden geannuleerd.",
-"Could not get result from server." => "Kon het resultaat van de server niet terugkrijgen.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Bestandsupload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
-"URL cannot be empty" => "URL mag niet leeg zijn",
-"{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",
-"Error fetching URL" => "Fout bij ophalen URL",
-"Share" => "Delen",
-"Delete" => "Verwijderen",
-"Disconnect storage" => "Verbinding met opslag verbreken",
-"Unshare" => "Stop met delen",
-"Delete permanently" => "Definitief verwijderen",
-"Rename" => "Naam wijzigen",
-"Pending" => "In behandeling",
-"Error moving file." => "Fout bij verplaatsen bestand.",
-"Error moving file" => "Fout bij verplaatsen bestand",
-"Error" => "Fout",
-"Could not rename file" => "Kon de naam van het bestand niet wijzigen",
-"Error deleting file." => "Fout bij verwijderen bestand.",
-"Name" => "Naam",
-"Size" => "Grootte",
-"Modified" => "Aangepast",
-"_%n folder_::_%n folders_" => array("","%n mappen"),
-"_%n file_::_%n files_" => array("%n bestand","%n bestanden"),
-"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_" => array("%n bestand aan het uploaden","%n bestanden aan het uploaden"),
-"\"{name}\" is an invalid file name." => "\"{name}\" is een ongeldige bestandsnaam.",
-"Your storage is full, files can not be updated or synced anymore!" => "Uw opslagruimte zit vol. Bestanden kunnen niet meer worden gewijzigd of gesynchroniseerd!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Uw opslagruimte zit bijna vol ({usedSpacePercent}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Encryptie is uitgeschakeld maar uw bestanden zijn nog steeds versleuteld. Ga naar uw persoonlijke instellingen om uw bestanden te decoderen.",
-"{dirs} and {files}" => "{dirs} en {files}",
-"%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)",
-"File handling" => "Bestand",
-"Maximum upload size" => "Maximale bestandsgrootte voor uploads",
-"max. possible: " => "max. mogelijk: ",
-"Save" => "Bewaren",
-"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",
-"From link" => "Vanaf link",
-"Nothing in here. Upload something!" => "Niets te zien hier. Upload iets!",
-"Download" => "Downloaden",
-"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.",
-"Currently scanning" => "Nu aan het scannen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nn_NO.js b/apps/files/l10n/nn_NO.js
new file mode 100644
index 00000000000..6d17a9458c5
--- /dev/null
+++ b/apps/files/l10n/nn_NO.js
@@ -0,0 +1,64 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Ukjend feil",
+    "Could not move %s - File with this name already exists" : "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
+    "Could not move %s" : "Klarte ikkje flytta %s",
+    "File name cannot be empty." : "Filnamnet kan ikkje vera tomt.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
+    "Unable to set upload directory." : "Klarte ikkje å endra opplastingsmappa.",
+    "Invalid Token" : "Ugyldig token",
+    "No file was uploaded. Unknown error" : "Ingen filer lasta opp. Ukjend feil",
+    "There is no error, the file uploaded with success" : "Ingen feil, fila vart lasta opp",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
+    "The uploaded file was only partially uploaded" : "Fila vart berre delvis lasta opp",
+    "No file was uploaded" : "Ingen filer vart lasta opp",
+    "Missing a temporary folder" : "Manglar ei mellombels mappe",
+    "Failed to write to disk" : "Klarte ikkje skriva til disk",
+    "Not enough storage available" : "Ikkje nok lagringsplass tilgjengeleg",
+    "Upload failed. Could not find uploaded file" : "Feil ved opplasting. Klarte ikkje å finna opplasta fil.",
+    "Upload failed. Could not get file info." : "Feil ved opplasting. Klarte ikkje å henta filinfo.",
+    "Invalid directory." : "Ugyldig mappe.",
+    "Files" : "Filer",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.",
+    "Upload cancelled." : "Opplasting avbroten.",
+    "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
+    "{new_name} already exists" : "{new_name} finst allereie",
+    "Share" : "Del",
+    "Delete" : "Slett",
+    "Unshare" : "Udel",
+    "Delete permanently" : "Slett for godt",
+    "Rename" : "Endra namn",
+    "Pending" : "Under vegs",
+    "Error moving file" : "Feil ved flytting av fil",
+    "Error" : "Feil",
+    "Name" : "Namn",
+    "Size" : "Storleik",
+    "Modified" : "Endra",
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "_Uploading %n file_::_Uploading %n files_" : ["Lastar opp %n fil","Lastar opp %n filer"],
+    "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} %)",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
+    "{dirs} and {files}" : "{dirs} og {files}",
+    "%s could not be renamed" : "Klarte ikkje å omdøypa på %s",
+    "File handling" : "Filhandtering",
+    "Maximum upload size" : "Maksimal opplastingsstorleik",
+    "max. possible: " : "maks. moglege:",
+    "Save" : "Lagre",
+    "WebDAV" : "WebDAV",
+    "New" : "Ny",
+    "Text file" : "Tekst fil",
+    "New folder" : "Ny mappe",
+    "Folder" : "Mappe",
+    "From link" : "Frå lenkje",
+    "Nothing in here. Upload something!" : "Ingenting her. Last noko opp!",
+    "Download" : "Last ned",
+    "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."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/nn_NO.json b/apps/files/l10n/nn_NO.json
new file mode 100644
index 00000000000..4008ab0778c
--- /dev/null
+++ b/apps/files/l10n/nn_NO.json
@@ -0,0 +1,62 @@
+{ "translations": {
+    "Unknown error" : "Ukjend feil",
+    "Could not move %s - File with this name already exists" : "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
+    "Could not move %s" : "Klarte ikkje flytta %s",
+    "File name cannot be empty." : "Filnamnet kan ikkje vera tomt.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
+    "Unable to set upload directory." : "Klarte ikkje å endra opplastingsmappa.",
+    "Invalid Token" : "Ugyldig token",
+    "No file was uploaded. Unknown error" : "Ingen filer lasta opp. Ukjend feil",
+    "There is no error, the file uploaded with success" : "Ingen feil, fila vart lasta opp",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
+    "The uploaded file was only partially uploaded" : "Fila vart berre delvis lasta opp",
+    "No file was uploaded" : "Ingen filer vart lasta opp",
+    "Missing a temporary folder" : "Manglar ei mellombels mappe",
+    "Failed to write to disk" : "Klarte ikkje skriva til disk",
+    "Not enough storage available" : "Ikkje nok lagringsplass tilgjengeleg",
+    "Upload failed. Could not find uploaded file" : "Feil ved opplasting. Klarte ikkje å finna opplasta fil.",
+    "Upload failed. Could not get file info." : "Feil ved opplasting. Klarte ikkje å henta filinfo.",
+    "Invalid directory." : "Ugyldig mappe.",
+    "Files" : "Filer",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.",
+    "Upload cancelled." : "Opplasting avbroten.",
+    "Could not get result from server." : "Klarte ikkje å henta resultat frå tenaren.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
+    "{new_name} already exists" : "{new_name} finst allereie",
+    "Share" : "Del",
+    "Delete" : "Slett",
+    "Unshare" : "Udel",
+    "Delete permanently" : "Slett for godt",
+    "Rename" : "Endra namn",
+    "Pending" : "Under vegs",
+    "Error moving file" : "Feil ved flytting av fil",
+    "Error" : "Feil",
+    "Name" : "Namn",
+    "Size" : "Storleik",
+    "Modified" : "Endra",
+    "_%n folder_::_%n folders_" : ["%n mappe","%n mapper"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "_Uploading %n file_::_Uploading %n files_" : ["Lastar opp %n fil","Lastar opp %n filer"],
+    "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} %)",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
+    "{dirs} and {files}" : "{dirs} og {files}",
+    "%s could not be renamed" : "Klarte ikkje å omdøypa på %s",
+    "File handling" : "Filhandtering",
+    "Maximum upload size" : "Maksimal opplastingsstorleik",
+    "max. possible: " : "maks. moglege:",
+    "Save" : "Lagre",
+    "WebDAV" : "WebDAV",
+    "New" : "Ny",
+    "Text file" : "Tekst fil",
+    "New folder" : "Ny mappe",
+    "Folder" : "Mappe",
+    "From link" : "Frå lenkje",
+    "Nothing in here. Upload something!" : "Ingenting her. Last noko opp!",
+    "Download" : "Last ned",
+    "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."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
deleted file mode 100644
index 502c313aa06..00000000000
--- a/apps/files/l10n/nn_NO.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Ukjend feil",
-"Could not move %s - File with this name already exists" => "Klarte ikkje flytta %s – det finst allereie ei fil med dette namnet",
-"Could not move %s" => "Klarte ikkje flytta %s",
-"File name cannot be empty." => "Filnamnet kan ikkje vera tomt.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ugyldig namn, «\\», «/», «<», «>», «:», «\"», «|», «?» og «*» er ikkje tillate.",
-"Unable to set upload directory." => "Klarte ikkje å endra opplastingsmappa.",
-"Invalid Token" => "Ugyldig token",
-"No file was uploaded. Unknown error" => "Ingen filer lasta opp. Ukjend feil",
-"There is no error, the file uploaded with success" => "Ingen feil, fila vart lasta opp",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fila du lasta opp er større enn det «upload_max_filesize» i php.ini tillater: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den opplasta fila er større enn variabelen MAX_FILE_SIZE i HTML-skjemaet",
-"The uploaded file was only partially uploaded" => "Fila vart berre delvis lasta opp",
-"No file was uploaded" => "Ingen filer vart lasta opp",
-"Missing a temporary folder" => "Manglar ei mellombels mappe",
-"Failed to write to disk" => "Klarte ikkje skriva til disk",
-"Not enough storage available" => "Ikkje nok lagringsplass tilgjengeleg",
-"Upload failed. Could not find uploaded file" => "Feil ved opplasting. Klarte ikkje å finna opplasta fil.",
-"Upload failed. Could not get file info." => "Feil ved opplasting. Klarte ikkje å henta filinfo.",
-"Invalid directory." => "Ugyldig mappe.",
-"Files" => "Filer",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Klarte ikkje å lasta opp {filename} sidan det er ei mappe eller er 0 byte.",
-"Upload cancelled." => "Opplasting avbroten.",
-"Could not get result from server." => "Klarte ikkje å henta resultat frå tenaren.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fila lastar no opp. Viss du forlèt sida no vil opplastinga verta avbroten.",
-"{new_name} already exists" => "{new_name} finst allereie",
-"Share" => "Del",
-"Delete" => "Slett",
-"Unshare" => "Udel",
-"Delete permanently" => "Slett for godt",
-"Rename" => "Endra namn",
-"Pending" => "Under vegs",
-"Error moving file" => "Feil ved flytting av fil",
-"Error" => "Feil",
-"Name" => "Namn",
-"Size" => "Storleik",
-"Modified" => "Endra",
-"_%n folder_::_%n folders_" => array("%n mappe","%n mapper"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
-"_Uploading %n file_::_Uploading %n files_" => array("Lastar opp %n fil","Lastar opp %n filer"),
-"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} %)",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering er skrudd av, men filene dine er enno krypterte. Du kan dekryptera filene i personlege innstillingar.",
-"{dirs} and {files}" => "{dirs} og {files}",
-"%s could not be renamed" => "Klarte ikkje å omdøypa på %s",
-"File handling" => "Filhandtering",
-"Maximum upload size" => "Maksimal opplastingsstorleik",
-"max. possible: " => "maks. moglege:",
-"Save" => "Lagre",
-"WebDAV" => "WebDAV",
-"New" => "Ny",
-"Text file" => "Tekst fil",
-"New folder" => "Ny mappe",
-"Folder" => "Mappe",
-"From link" => "Frå lenkje",
-"Nothing in here. Upload something!" => "Ingenting her. Last noko opp!",
-"Download" => "Last ned",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/nqo.js b/apps/files/l10n/nqo.js
new file mode 100644
index 00000000000..d1bbfca2dd4
--- /dev/null
+++ b/apps/files/l10n/nqo.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files",
+    {
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/nqo.json b/apps/files/l10n/nqo.json
new file mode 100644
index 00000000000..e493054d78a
--- /dev/null
+++ b/apps/files/l10n/nqo.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/nqo.php b/apps/files/l10n/nqo.php
deleted file mode 100644
index 70ab6572ba4..00000000000
--- a/apps/files/l10n/nqo.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/oc.js b/apps/files/l10n/oc.js
new file mode 100644
index 00000000000..deb447f57d9
--- /dev/null
+++ b/apps/files/l10n/oc.js
@@ -0,0 +1,38 @@
+OC.L10N.register(
+    "files",
+    {
+    "There is no error, the file uploaded with success" : "Amontcargament capitat, pas d'errors",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML",
+    "The uploaded file was only partially uploaded" : "Lo fichièr foguèt pas completament amontcargat",
+    "No file was uploaded" : "Cap de fichièrs son estats amontcargats",
+    "Missing a temporary folder" : "Un dorsièr temporari manca",
+    "Failed to write to disk" : "L'escriptura sul disc a fracassat",
+    "Files" : "Fichièrs",
+    "Upload cancelled." : "Amontcargar anullat.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
+    "Share" : "Parteja",
+    "Delete" : "Escafa",
+    "Unshare" : "Pas partejador",
+    "Rename" : "Torna nomenar",
+    "Pending" : "Al esperar",
+    "Error" : "Error",
+    "Name" : "Nom",
+    "Size" : "Talha",
+    "Modified" : "Modificat",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "Manejament de fichièr",
+    "Maximum upload size" : "Talha maximum d'amontcargament",
+    "max. possible: " : "max. possible: ",
+    "Save" : "Enregistra",
+    "New" : "Nòu",
+    "Text file" : "Fichièr de tèxte",
+    "Folder" : "Dorsièr",
+    "Nothing in here. Upload something!" : "Pas res dedins. Amontcarga qualquaren",
+    "Download" : "Avalcarga",
+    "Upload too large" : "Amontcargament tròp gròs",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
+    "Files are being scanned, please wait." : "Los fiichièrs son a èsser explorats, "
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files/l10n/oc.json b/apps/files/l10n/oc.json
new file mode 100644
index 00000000000..994cb0055ea
--- /dev/null
+++ b/apps/files/l10n/oc.json
@@ -0,0 +1,36 @@
+{ "translations": {
+    "There is no error, the file uploaded with success" : "Amontcargament capitat, pas d'errors",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML",
+    "The uploaded file was only partially uploaded" : "Lo fichièr foguèt pas completament amontcargat",
+    "No file was uploaded" : "Cap de fichièrs son estats amontcargats",
+    "Missing a temporary folder" : "Un dorsièr temporari manca",
+    "Failed to write to disk" : "L'escriptura sul disc a fracassat",
+    "Files" : "Fichièrs",
+    "Upload cancelled." : "Amontcargar anullat.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
+    "Share" : "Parteja",
+    "Delete" : "Escafa",
+    "Unshare" : "Pas partejador",
+    "Rename" : "Torna nomenar",
+    "Pending" : "Al esperar",
+    "Error" : "Error",
+    "Name" : "Nom",
+    "Size" : "Talha",
+    "Modified" : "Modificat",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "Manejament de fichièr",
+    "Maximum upload size" : "Talha maximum d'amontcargament",
+    "max. possible: " : "max. possible: ",
+    "Save" : "Enregistra",
+    "New" : "Nòu",
+    "Text file" : "Fichièr de tèxte",
+    "Folder" : "Dorsièr",
+    "Nothing in here. Upload something!" : "Pas res dedins. Amontcarga qualquaren",
+    "Download" : "Avalcarga",
+    "Upload too large" : "Amontcargament tròp gròs",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
+    "Files are being scanned, please wait." : "Los fiichièrs son a èsser explorats, "
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
deleted file mode 100644
index 0a41ffb0075..00000000000
--- a/apps/files/l10n/oc.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Amontcargament capitat, pas d'errors",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Lo fichièr amontcargat es mai gròs que la directiva «MAX_FILE_SIZE» especifiada dins lo formulari HTML",
-"The uploaded file was only partially uploaded" => "Lo fichièr foguèt pas completament amontcargat",
-"No file was uploaded" => "Cap de fichièrs son estats amontcargats",
-"Missing a temporary folder" => "Un dorsièr temporari manca",
-"Failed to write to disk" => "L'escriptura sul disc a fracassat",
-"Files" => "Fichièrs",
-"Upload cancelled." => "Amontcargar anullat.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Un amontcargar es a se far. Daissar aquesta pagina ara tamparà lo cargament. ",
-"Share" => "Parteja",
-"Delete" => "Escafa",
-"Unshare" => "Pas partejador",
-"Rename" => "Torna nomenar",
-"Pending" => "Al esperar",
-"Error" => "Error",
-"Name" => "Nom",
-"Size" => "Talha",
-"Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"File handling" => "Manejament de fichièr",
-"Maximum upload size" => "Talha maximum d'amontcargament",
-"max. possible: " => "max. possible: ",
-"Save" => "Enregistra",
-"New" => "Nòu",
-"Text file" => "Fichièr de tèxte",
-"Folder" => "Dorsièr",
-"Nothing in here. Upload something!" => "Pas res dedins. Amontcarga qualquaren",
-"Download" => "Avalcarga",
-"Upload too large" => "Amontcargament tròp gròs",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Los fichièrs que sias a amontcargar son tròp pesucs per la talha maxi pel servidor.",
-"Files are being scanned, please wait." => "Los fiichièrs son a èsser explorats, "
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/or_IN.js b/apps/files/l10n/or_IN.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/or_IN.js
@@ -0,0 +1,8 @@
+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/or_IN.json b/apps/files/l10n/or_IN.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/or_IN.json
@@ -0,0 +1,6 @@
+{ "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/or_IN.php b/apps/files/l10n/or_IN.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/or_IN.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/pa.js b/apps/files/l10n/pa.js
new file mode 100644
index 00000000000..84216361960
--- /dev/null
+++ b/apps/files/l10n/pa.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "ਅਣਜਾਣ ਗਲਤੀ",
+    "Files" : "ਫਾਇਲਾਂ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
+    "Delete" : "ਹਟਾਓ",
+    "Rename" : "ਨਾਂ ਬਦਲੋ",
+    "Error" : "ਗਲਤੀ",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Download" : "ਡਾਊਨਲੋਡ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/pa.json b/apps/files/l10n/pa.json
new file mode 100644
index 00000000000..b429b4ab19b
--- /dev/null
+++ b/apps/files/l10n/pa.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Unknown error" : "ਅਣਜਾਣ ਗਲਤੀ",
+    "Files" : "ਫਾਇਲਾਂ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
+    "Delete" : "ਹਟਾਓ",
+    "Rename" : "ਨਾਂ ਬਦਲੋ",
+    "Error" : "ਗਲਤੀ",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Download" : "ਡਾਊਨਲੋਡ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/pa.php b/apps/files/l10n/pa.php
deleted file mode 100644
index 55af52a4547..00000000000
--- a/apps/files/l10n/pa.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "ਅਣਜਾਣ ਗਲਤੀ",
-"Files" => "ਫਾਇਲਾਂ",
-"Share" => "ਸਾਂਝਾ ਕਰੋ",
-"Delete" => "ਹਟਾਓ",
-"Rename" => "ਨਾਂ ਬਦਲੋ",
-"Error" => "ਗਲਤੀ",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Download" => "ਡਾਊਨਲੋਡ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/pl.js b/apps/files/l10n/pl.js
new file mode 100644
index 00000000000..1a0fb57ec30
--- /dev/null
+++ b/apps/files/l10n/pl.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Pamięć nie dostępna",
+    "Storage invalid" : "Pamięć nieprawidłowa",
+    "Unknown error" : "Nieznany błąd",
+    "Could not move %s - File with this name already exists" : "Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
+    "Could not move %s" : "Nie można było przenieść %s",
+    "Permission denied" : "Dostęp zabroniony",
+    "File name cannot be empty." : "Nazwa pliku nie może być pusta.",
+    "\"%s\" is an invalid file name." : "\"%s\" jest nieprawidłową nazwą pliku.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
+    "The target folder has been moved or deleted." : "Folder docelowy został przeniesiony lub usunięty",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Nazwa %s jest już używana w folderze %s. Proszę wybrać inną nazwę.",
+    "Not a valid source" : "Niepoprawne źródło",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serwer nie mógł otworzyć adresów URL, należy sprawdzić konfigurację serwera",
+    "The file exceeds your quota by %s" : "Ten plik przekracza twój limit o %s",
+    "Error while downloading %s to %s" : "Błąd podczas pobierania %s do %S",
+    "Error when creating the file" : "Błąd przy tworzeniu pliku",
+    "Folder name cannot be empty." : "Nazwa folderu nie może być pusta.",
+    "Error when creating the folder" : "Błąd przy tworzeniu folderu",
+    "Unable to set upload directory." : "Nie można ustawić katalog wczytywania.",
+    "Invalid Token" : "Nieprawidłowy Token",
+    "No file was uploaded. Unknown error" : "Żaden plik nie został załadowany. Nieznany błąd",
+    "There is no error, the file uploaded with success" : "Nie było błędów, plik wysłano poprawnie.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML",
+    "The uploaded file was only partially uploaded" : "Załadowany plik został wysłany tylko częściowo.",
+    "No file was uploaded" : "Nie wysłano żadnego pliku",
+    "Missing a temporary folder" : "Brak folderu tymczasowego",
+    "Failed to write to disk" : "Błąd zapisu na dysk",
+    "Not enough storage available" : "Za mało dostępnego miejsca",
+    "Upload failed. Could not find uploaded file" : "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku",
+    "Upload failed. Could not get file info." : "Nieudane przesłanie. Nie można pobrać informacji o pliku.",
+    "Invalid directory." : "Zła ścieżka.",
+    "Files" : "Pliki",
+    "All files" : "Wszystkie pliki",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów",
+    "Total file size {size1} exceeds upload limit {size2}" : "Całkowity rozmiar {size1} przekracza limit uploadu {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}",
+    "Upload cancelled." : "Wczytywanie anulowane.",
+    "Could not get result from server." : "Nie można uzyskać wyniku z serwera.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
+    "URL cannot be empty" : "URL nie może być pusty",
+    "{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",
+    "Error fetching URL" : "Błąd przy pobieraniu adresu URL",
+    "Share" : "Udostępnij",
+    "Delete" : "Usuń",
+    "Disconnect storage" : "Odłącz magazyn",
+    "Unshare" : "Zatrzymaj współdzielenie",
+    "Delete permanently" : "Trwale usuń",
+    "Rename" : "Zmień nazwę",
+    "Pending" : "Oczekujące",
+    "Error moving file." : "Błąd podczas przenoszenia pliku.",
+    "Error moving file" : "Błąd prz przenoszeniu pliku",
+    "Error" : "Błąd",
+    "Could not rename file" : "Nie można zmienić nazwy pliku",
+    "Error deleting file." : "Błąd podczas usuwania pliku",
+    "Name" : "Nazwa",
+    "Size" : "Rozmiar",
+    "Modified" : "Modyfikacja",
+    "_%n folder_::_%n folders_" : ["%n katalog","%n katalogi","%n katalogów"],
+    "_%n file_::_%n files_" : ["%n plik","%n pliki","%n plików"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" jest nieprawidłową nazwą pliku.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.",
+    "{dirs} and {files}" : "{dirs} i {files}",
+    "%s could not be renamed as it has been deleted" : "%s nie może mieć zmienionej nazwy, ponieważ został usunięty",
+    "%s could not be renamed" : "%s nie można zmienić nazwy",
+    "Upload (max. %s)" : "Wysyłka (max. %s)",
+    "File handling" : "Zarządzanie plikami",
+    "Maximum upload size" : "Maksymalny rozmiar wysyłanego pliku",
+    "max. possible: " : "maks. możliwy:",
+    "Save" : "Zapisz",
+    "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",
+    "From link" : "Z odnośnika",
+    "Nothing in here. Upload something!" : "Pusto. Wyślij coś!",
+    "Download" : "Pobierz",
+    "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ć.",
+    "Currently scanning" : "Aktualnie skanowane"
+},
+"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/l10n/pl.json b/apps/files/l10n/pl.json
new file mode 100644
index 00000000000..b073141e3d1
--- /dev/null
+++ b/apps/files/l10n/pl.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Pamięć nie dostępna",
+    "Storage invalid" : "Pamięć nieprawidłowa",
+    "Unknown error" : "Nieznany błąd",
+    "Could not move %s - File with this name already exists" : "Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
+    "Could not move %s" : "Nie można było przenieść %s",
+    "Permission denied" : "Dostęp zabroniony",
+    "File name cannot be empty." : "Nazwa pliku nie może być pusta.",
+    "\"%s\" is an invalid file name." : "\"%s\" jest nieprawidłową nazwą pliku.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
+    "The target folder has been moved or deleted." : "Folder docelowy został przeniesiony lub usunięty",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Nazwa %s jest już używana w folderze %s. Proszę wybrać inną nazwę.",
+    "Not a valid source" : "Niepoprawne źródło",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serwer nie mógł otworzyć adresów URL, należy sprawdzić konfigurację serwera",
+    "The file exceeds your quota by %s" : "Ten plik przekracza twój limit o %s",
+    "Error while downloading %s to %s" : "Błąd podczas pobierania %s do %S",
+    "Error when creating the file" : "Błąd przy tworzeniu pliku",
+    "Folder name cannot be empty." : "Nazwa folderu nie może być pusta.",
+    "Error when creating the folder" : "Błąd przy tworzeniu folderu",
+    "Unable to set upload directory." : "Nie można ustawić katalog wczytywania.",
+    "Invalid Token" : "Nieprawidłowy Token",
+    "No file was uploaded. Unknown error" : "Żaden plik nie został załadowany. Nieznany błąd",
+    "There is no error, the file uploaded with success" : "Nie było błędów, plik wysłano poprawnie.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML",
+    "The uploaded file was only partially uploaded" : "Załadowany plik został wysłany tylko częściowo.",
+    "No file was uploaded" : "Nie wysłano żadnego pliku",
+    "Missing a temporary folder" : "Brak folderu tymczasowego",
+    "Failed to write to disk" : "Błąd zapisu na dysk",
+    "Not enough storage available" : "Za mało dostępnego miejsca",
+    "Upload failed. Could not find uploaded file" : "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku",
+    "Upload failed. Could not get file info." : "Nieudane przesłanie. Nie można pobrać informacji o pliku.",
+    "Invalid directory." : "Zła ścieżka.",
+    "Files" : "Pliki",
+    "All files" : "Wszystkie pliki",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów",
+    "Total file size {size1} exceeds upload limit {size2}" : "Całkowity rozmiar {size1} przekracza limit uploadu {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}",
+    "Upload cancelled." : "Wczytywanie anulowane.",
+    "Could not get result from server." : "Nie można uzyskać wyniku z serwera.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
+    "URL cannot be empty" : "URL nie może być pusty",
+    "{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",
+    "Error fetching URL" : "Błąd przy pobieraniu adresu URL",
+    "Share" : "Udostępnij",
+    "Delete" : "Usuń",
+    "Disconnect storage" : "Odłącz magazyn",
+    "Unshare" : "Zatrzymaj współdzielenie",
+    "Delete permanently" : "Trwale usuń",
+    "Rename" : "Zmień nazwę",
+    "Pending" : "Oczekujące",
+    "Error moving file." : "Błąd podczas przenoszenia pliku.",
+    "Error moving file" : "Błąd prz przenoszeniu pliku",
+    "Error" : "Błąd",
+    "Could not rename file" : "Nie można zmienić nazwy pliku",
+    "Error deleting file." : "Błąd podczas usuwania pliku",
+    "Name" : "Nazwa",
+    "Size" : "Rozmiar",
+    "Modified" : "Modyfikacja",
+    "_%n folder_::_%n folders_" : ["%n katalog","%n katalogi","%n katalogów"],
+    "_%n file_::_%n files_" : ["%n plik","%n pliki","%n plików"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" jest nieprawidłową nazwą pliku.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.",
+    "{dirs} and {files}" : "{dirs} i {files}",
+    "%s could not be renamed as it has been deleted" : "%s nie może mieć zmienionej nazwy, ponieważ został usunięty",
+    "%s could not be renamed" : "%s nie można zmienić nazwy",
+    "Upload (max. %s)" : "Wysyłka (max. %s)",
+    "File handling" : "Zarządzanie plikami",
+    "Maximum upload size" : "Maksymalny rozmiar wysyłanego pliku",
+    "max. possible: " : "maks. możliwy:",
+    "Save" : "Zapisz",
+    "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",
+    "From link" : "Z odnośnika",
+    "Nothing in here. Upload something!" : "Pusto. Wyślij coś!",
+    "Download" : "Pobierz",
+    "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ć.",
+    "Currently scanning" : "Aktualnie skanowane"
+},"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/l10n/pl.php b/apps/files/l10n/pl.php
deleted file mode 100644
index b835baafc89..00000000000
--- a/apps/files/l10n/pl.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Pamięć nie dostępna",
-"Storage invalid" => "Pamięć nieprawidłowa",
-"Unknown error" => "Nieznany błąd",
-"Could not move %s - File with this name already exists" => "Nie można było przenieść %s - Plik o takiej nazwie już istnieje",
-"Could not move %s" => "Nie można było przenieść %s",
-"Permission denied" => "Dostęp zabroniony",
-"File name cannot be empty." => "Nazwa pliku nie może być pusta.",
-"\"%s\" is an invalid file name." => "\"%s\" jest nieprawidłową nazwą pliku.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nieprawidłowa nazwa. Znaki '\\', '/', '<', '>', ':', '\"', '|', '?' oraz '*' są niedozwolone.",
-"The target folder has been moved or deleted." => "Folder docelowy został przeniesiony lub usunięty",
-"The name %s is already used in the folder %s. Please choose a different name." => "Nazwa %s jest już używana w folderze %s. Proszę wybrać inną nazwę.",
-"Not a valid source" => "Niepoprawne źródło",
-"Server is not allowed to open URLs, please check the server configuration" => "Serwer nie mógł otworzyć adresów URL, należy sprawdzić konfigurację serwera",
-"The file exceeds your quota by %s" => "Ten plik przekracza twój limit o %s",
-"Error while downloading %s to %s" => "Błąd podczas pobierania %s do %S",
-"Error when creating the file" => "Błąd przy tworzeniu pliku",
-"Folder name cannot be empty." => "Nazwa folderu nie może być pusta.",
-"Error when creating the folder" => "Błąd przy tworzeniu folderu",
-"Unable to set upload directory." => "Nie można ustawić katalog wczytywania.",
-"Invalid Token" => "Nieprawidłowy Token",
-"No file was uploaded. Unknown error" => "Żaden plik nie został załadowany. Nieznany błąd",
-"There is no error, the file uploaded with success" => "Nie było błędów, plik wysłano poprawnie.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Wgrany plik przekracza wartość upload_max_filesize zdefiniowaną w php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Wysłany plik przekracza wielkość dyrektywy MAX_FILE_SIZE określonej w formularzu HTML",
-"The uploaded file was only partially uploaded" => "Załadowany plik został wysłany tylko częściowo.",
-"No file was uploaded" => "Nie wysłano żadnego pliku",
-"Missing a temporary folder" => "Brak folderu tymczasowego",
-"Failed to write to disk" => "Błąd zapisu na dysk",
-"Not enough storage available" => "Za mało dostępnego miejsca",
-"Upload failed. Could not find uploaded file" => "Nieudane przesłanie. Nie można znaleźć przesyłanego pliku",
-"Upload failed. Could not get file info." => "Nieudane przesłanie. Nie można pobrać informacji o pliku.",
-"Invalid directory." => "Zła ścieżka.",
-"Files" => "Pliki",
-"All files" => "Wszystkie pliki",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nie można przesłać {filename} być może jest katalogiem lub posiada 0 bajtów",
-"Total file size {size1} exceeds upload limit {size2}" => "Całkowity rozmiar {size1} przekracza limit uploadu {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Brak wolnej przestrzeni, przesyłasz {size1} a pozostało tylko {size2}",
-"Upload cancelled." => "Wczytywanie anulowane.",
-"Could not get result from server." => "Nie można uzyskać wyniku z serwera.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Jeśli opuścisz tę stronę, wysyłanie zostanie przerwane.",
-"URL cannot be empty" => "URL nie może być pusty",
-"{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",
-"Error fetching URL" => "Błąd przy pobieraniu adresu URL",
-"Share" => "Udostępnij",
-"Delete" => "Usuń",
-"Disconnect storage" => "Odłącz magazyn",
-"Unshare" => "Zatrzymaj współdzielenie",
-"Delete permanently" => "Trwale usuń",
-"Rename" => "Zmień nazwę",
-"Pending" => "Oczekujące",
-"Error moving file." => "Błąd podczas przenoszenia pliku.",
-"Error moving file" => "Błąd prz przenoszeniu pliku",
-"Error" => "Błąd",
-"Could not rename file" => "Nie można zmienić nazwy pliku",
-"Error deleting file." => "Błąd podczas usuwania pliku",
-"Name" => "Nazwa",
-"Size" => "Rozmiar",
-"Modified" => "Modyfikacja",
-"_%n folder_::_%n folders_" => array("%n katalog","%n katalogi","%n katalogów"),
-"_%n file_::_%n files_" => array("%n plik","%n pliki","%n plików"),
-"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_" => array("Wysyłanie %n pliku","Wysyłanie %n plików","Wysyłanie %n plików"),
-"\"{name}\" is an invalid file name." => "\"{name}\" jest nieprawidłową nazwą pliku.",
-"Your storage is full, files can not be updated or synced anymore!" => "Magazyn jest pełny. Pliki nie mogą zostać zaktualizowane lub zsynchronizowane!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Twój magazyn jest prawie pełny ({usedSpacePercent}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Szyfrowanie zostało wyłączone, ale nadal pliki są zaszyfrowane. Przejdź do ustawień osobistych i tam odszyfruj pliki.",
-"{dirs} and {files}" => "{dirs} i {files}",
-"%s could not be renamed as it has been deleted" => "%s nie może mieć zmienionej nazwy, ponieważ został usunięty",
-"%s could not be renamed" => "%s nie można zmienić nazwy",
-"Upload (max. %s)" => "Wysyłka (max. %s)",
-"File handling" => "Zarządzanie plikami",
-"Maximum upload size" => "Maksymalny rozmiar wysyłanego pliku",
-"max. possible: " => "maks. możliwy:",
-"Save" => "Zapisz",
-"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",
-"From link" => "Z odnośnika",
-"Nothing in here. Upload something!" => "Pusto. Wyślij coś!",
-"Download" => "Pobierz",
-"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ć.",
-"Currently scanning" => "Aktualnie skanowane"
-);
-$PLURAL_FORMS = "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/l10n/pt_BR.js b/apps/files/l10n/pt_BR.js
new file mode 100644
index 00000000000..b4c97887362
--- /dev/null
+++ b/apps/files/l10n/pt_BR.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Armazanamento não disponível",
+    "Storage invalid" : "Armazenamento invávilido",
+    "Unknown error" : "Erro desconhecido",
+    "Could not move %s - File with this name already exists" : "Impossível mover %s - Já existe um arquivo com esse nome",
+    "Could not move %s" : "Impossível mover %s",
+    "Permission denied" : "Permissão Negada",
+    "File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
+    "\"%s\" is an invalid file name." : "\"%s\" é um nome de arquivo inválido.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
+    "The target folder has been moved or deleted." : "A pasta de destino foi movida ou excluída.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "O nome %s já é usado na pasta %s. Por favor, escolha um nome diferente.",
+    "Not a valid source" : "Não é uma fonte válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "O servidor não tem permissão para abrir URLs. Por favor, verifique a configuração do servidor.",
+    "The file exceeds your quota by %s" : "O arquivo excede sua cota por %s",
+    "Error while downloading %s to %s" : "Erro ao baixar %s para %s",
+    "Error when creating the file" : "Erro ao criar o arquivo",
+    "Folder name cannot be empty." : "O nome da pasta não pode estar vazio.",
+    "Error when creating the folder" : "Erro ao criar a pasta",
+    "Unable to set upload directory." : "Impossível configurar o diretório de envio",
+    "Invalid Token" : "Token inválido",
+    "No file was uploaded. Unknown error" : "Nenhum arquivo foi enviado. Erro desconhecido",
+    "There is no error, the file uploaded with success" : "Sem erros, o arquivo foi enviado com sucesso",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
+    "The uploaded file was only partially uploaded" : "O arquivo foi parcialmente enviado",
+    "No file was uploaded" : "Nenhum arquivo enviado",
+    "Missing a temporary folder" : "Pasta temporária não encontrada",
+    "Failed to write to disk" : "Falha ao escrever no disco",
+    "Not enough storage available" : "Espaço de armazenamento insuficiente",
+    "Upload failed. Could not find uploaded file" : "Falha no envio. Não foi possível encontrar o arquivo enviado",
+    "Upload failed. Could not get file info." : "Falha no envio. Não foi possível obter informações do arquivo.",
+    "Invalid directory." : "Diretório inválido.",
+    "Files" : "Arquivos",
+    "All files" : "Todos os arquivos",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
+    "Upload cancelled." : "Envio cancelado.",
+    "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
+    "URL cannot be empty" : "URL não pode estar vazia",
+    "{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",
+    "Error fetching URL" : "Erro ao buscar URL",
+    "Share" : "Compartilhar",
+    "Delete" : "Excluir",
+    "Disconnect storage" : "Desconectar armazenagem",
+    "Unshare" : "Descompartilhar",
+    "Delete permanently" : "Excluir permanentemente",
+    "Rename" : "Renomear",
+    "Pending" : "Pendente",
+    "Error moving file." : "Erro movendo o arquivo.",
+    "Error moving file" : "Erro movendo o arquivo",
+    "Error" : "Erro",
+    "Could not rename file" : "Não foi possível renomear o arquivo",
+    "Error deleting file." : "Erro eliminando o arquivo.",
+    "Name" : "Nome",
+    "Size" : "Tamanho",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas"],
+    "_%n file_::_%n files_" : ["%n arquivo","%n arquivos"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de arquivo inválido.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Criptografia foi desabilitada mas seus arquivos continuam criptografados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.",
+    "{dirs} and {files}" : "{dirs} e {files}",
+    "%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)",
+    "File handling" : "Tratamento de Arquivo",
+    "Maximum upload size" : "Tamanho máximo para envio",
+    "max. possible: " : "max. possível:",
+    "Save" : "Salvar",
+    "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",
+    "From link" : "Do link",
+    "Nothing in here. Upload something!" : "Nada aqui. Carregue alguma coisa!",
+    "Download" : "Baixar",
+    "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.",
+    "Currently scanning" : "Atualmente escaneando"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files/l10n/pt_BR.json b/apps/files/l10n/pt_BR.json
new file mode 100644
index 00000000000..8c303c234ae
--- /dev/null
+++ b/apps/files/l10n/pt_BR.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Armazanamento não disponível",
+    "Storage invalid" : "Armazenamento invávilido",
+    "Unknown error" : "Erro desconhecido",
+    "Could not move %s - File with this name already exists" : "Impossível mover %s - Já existe um arquivo com esse nome",
+    "Could not move %s" : "Impossível mover %s",
+    "Permission denied" : "Permissão Negada",
+    "File name cannot be empty." : "O nome do arquivo não pode estar vazio.",
+    "\"%s\" is an invalid file name." : "\"%s\" é um nome de arquivo inválido.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
+    "The target folder has been moved or deleted." : "A pasta de destino foi movida ou excluída.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "O nome %s já é usado na pasta %s. Por favor, escolha um nome diferente.",
+    "Not a valid source" : "Não é uma fonte válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "O servidor não tem permissão para abrir URLs. Por favor, verifique a configuração do servidor.",
+    "The file exceeds your quota by %s" : "O arquivo excede sua cota por %s",
+    "Error while downloading %s to %s" : "Erro ao baixar %s para %s",
+    "Error when creating the file" : "Erro ao criar o arquivo",
+    "Folder name cannot be empty." : "O nome da pasta não pode estar vazio.",
+    "Error when creating the folder" : "Erro ao criar a pasta",
+    "Unable to set upload directory." : "Impossível configurar o diretório de envio",
+    "Invalid Token" : "Token inválido",
+    "No file was uploaded. Unknown error" : "Nenhum arquivo foi enviado. Erro desconhecido",
+    "There is no error, the file uploaded with success" : "Sem erros, o arquivo foi enviado com sucesso",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
+    "The uploaded file was only partially uploaded" : "O arquivo foi parcialmente enviado",
+    "No file was uploaded" : "Nenhum arquivo enviado",
+    "Missing a temporary folder" : "Pasta temporária não encontrada",
+    "Failed to write to disk" : "Falha ao escrever no disco",
+    "Not enough storage available" : "Espaço de armazenamento insuficiente",
+    "Upload failed. Could not find uploaded file" : "Falha no envio. Não foi possível encontrar o arquivo enviado",
+    "Upload failed. Could not get file info." : "Falha no envio. Não foi possível obter informações do arquivo.",
+    "Invalid directory." : "Diretório inválido.",
+    "Files" : "Arquivos",
+    "All files" : "Todos os arquivos",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do arquivo {size1} excede o limite de envio {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
+    "Upload cancelled." : "Envio cancelado.",
+    "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
+    "URL cannot be empty" : "URL não pode estar vazia",
+    "{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",
+    "Error fetching URL" : "Erro ao buscar URL",
+    "Share" : "Compartilhar",
+    "Delete" : "Excluir",
+    "Disconnect storage" : "Desconectar armazenagem",
+    "Unshare" : "Descompartilhar",
+    "Delete permanently" : "Excluir permanentemente",
+    "Rename" : "Renomear",
+    "Pending" : "Pendente",
+    "Error moving file." : "Erro movendo o arquivo.",
+    "Error moving file" : "Erro movendo o arquivo",
+    "Error" : "Erro",
+    "Could not rename file" : "Não foi possível renomear o arquivo",
+    "Error deleting file." : "Erro eliminando o arquivo.",
+    "Name" : "Nome",
+    "Size" : "Tamanho",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas"],
+    "_%n file_::_%n files_" : ["%n arquivo","%n arquivos"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de arquivo inválido.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Criptografia foi desabilitada mas seus arquivos continuam criptografados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.",
+    "{dirs} and {files}" : "{dirs} e {files}",
+    "%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)",
+    "File handling" : "Tratamento de Arquivo",
+    "Maximum upload size" : "Tamanho máximo para envio",
+    "max. possible: " : "max. possível:",
+    "Save" : "Salvar",
+    "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",
+    "From link" : "Do link",
+    "Nothing in here. Upload something!" : "Nada aqui. Carregue alguma coisa!",
+    "Download" : "Baixar",
+    "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.",
+    "Currently scanning" : "Atualmente escaneando"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
deleted file mode 100644
index 1dc10824883..00000000000
--- a/apps/files/l10n/pt_BR.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Armazanamento não disponível",
-"Storage invalid" => "Armazenamento invávilido",
-"Unknown error" => "Erro desconhecido",
-"Could not move %s - File with this name already exists" => "Impossível mover %s - Já existe um arquivo com esse nome",
-"Could not move %s" => "Impossível mover %s",
-"Permission denied" => "Permissão Negada",
-"File name cannot be empty." => "O nome do arquivo não pode estar vazio.",
-"\"%s\" is an invalid file name." => "\"%s\" é um nome de arquivo inválido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
-"The target folder has been moved or deleted." => "A pasta de destino foi movida ou excluída.",
-"The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já é usado na pasta %s. Por favor, escolha um nome diferente.",
-"Not a valid source" => "Não é uma fonte válida",
-"Server is not allowed to open URLs, please check the server configuration" => "O servidor não tem permissão para abrir URLs. Por favor, verifique a configuração do servidor.",
-"The file exceeds your quota by %s" => "O arquivo excede sua cota por %s",
-"Error while downloading %s to %s" => "Erro ao baixar %s para %s",
-"Error when creating the file" => "Erro ao criar o arquivo",
-"Folder name cannot be empty." => "O nome da pasta não pode estar vazio.",
-"Error when creating the folder" => "Erro ao criar a pasta",
-"Unable to set upload directory." => "Impossível configurar o diretório de envio",
-"Invalid Token" => "Token inválido",
-"No file was uploaded. Unknown error" => "Nenhum arquivo foi enviado. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Sem erros, o arquivo foi enviado com sucesso",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o argumento MAX_FILE_SIZE especificado no formulário HTML",
-"The uploaded file was only partially uploaded" => "O arquivo foi parcialmente enviado",
-"No file was uploaded" => "Nenhum arquivo enviado",
-"Missing a temporary folder" => "Pasta temporária não encontrada",
-"Failed to write to disk" => "Falha ao escrever no disco",
-"Not enough storage available" => "Espaço de armazenamento insuficiente",
-"Upload failed. Could not find uploaded file" => "Falha no envio. Não foi possível encontrar o arquivo enviado",
-"Upload failed. Could not get file info." => "Falha no envio. Não foi possível obter informações do arquivo.",
-"Invalid directory." => "Diretório inválido.",
-"Files" => "Arquivos",
-"All files" => "Todos os arquivos",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de fazer o envio de {filename}, pois é um diretório ou tem 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "O tamanho total do arquivo {size1} excede o limite de envio {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Não há espaço suficiente, você está enviando {size1} mas resta apenas {size2}",
-"Upload cancelled." => "Envio cancelado.",
-"Could not get result from server." => "Não foi possível obter o resultado do servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Envio de arquivo em andamento. Sair da página agora resultará no cancelamento do envio.",
-"URL cannot be empty" => "URL não pode estar vazia",
-"{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",
-"Error fetching URL" => "Erro ao buscar URL",
-"Share" => "Compartilhar",
-"Delete" => "Excluir",
-"Disconnect storage" => "Desconectar armazenagem",
-"Unshare" => "Descompartilhar",
-"Delete permanently" => "Excluir permanentemente",
-"Rename" => "Renomear",
-"Pending" => "Pendente",
-"Error moving file." => "Erro movendo o arquivo.",
-"Error moving file" => "Erro movendo o arquivo",
-"Error" => "Erro",
-"Could not rename file" => "Não foi possível renomear o arquivo",
-"Error deleting file." => "Erro eliminando o arquivo.",
-"Name" => "Nome",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
-"_%n file_::_%n files_" => array("%n arquivo","%n arquivos"),
-"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_" => array("Enviando %n arquivo","Enviando %n arquivos"),
-"\"{name}\" is an invalid file name." => "\"{name}\" é um nome de arquivo inválido.",
-"Your storage is full, files can not be updated or synced anymore!" => "Seu armazenamento está cheio, arquivos não podem mais ser atualizados ou sincronizados!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Seu armazenamento está quase cheio ({usedSpacePercent}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Criptografia foi desabilitada mas seus arquivos continuam criptografados. Por favor vá a suas configurações pessoais para descriptar seus arquivos.",
-"{dirs} and {files}" => "{dirs} e {files}",
-"%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)",
-"File handling" => "Tratamento de Arquivo",
-"Maximum upload size" => "Tamanho máximo para envio",
-"max. possible: " => "max. possível:",
-"Save" => "Salvar",
-"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",
-"From link" => "Do link",
-"Nothing in here. Upload something!" => "Nada aqui. Carregue alguma coisa!",
-"Download" => "Baixar",
-"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.",
-"Currently scanning" => "Atualmente escaneando"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/pt_PT.js b/apps/files/l10n/pt_PT.js
new file mode 100644
index 00000000000..2ce2038d661
--- /dev/null
+++ b/apps/files/l10n/pt_PT.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Armazenamento indisposinvel",
+    "Storage invalid" : "Armazenamento inválido",
+    "Unknown error" : "Erro Desconhecido",
+    "Could not move %s - File with this name already exists" : "Não foi possível mover %s - Já existe um ficheiro com este nome",
+    "Could not move %s" : "Não foi possível mover %s",
+    "Permission denied" : "Permissão negada",
+    "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
+    "\"%s\" is an invalid file name." : "\"%s\" é um nome de ficheiro inválido.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome Inválido, Não são permitidos os carateres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*'.",
+    "The target folder has been moved or deleted." : "A pasta de destino foi movida ou eliminada.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente.",
+    "Not a valid source" : "Não é uma fonte válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "O servidor não consegue abrir URLs, por favor verifique a configuração do servidor",
+    "The file exceeds your quota by %s" : "O ficheiro excede a sua quota por %s",
+    "Error while downloading %s to %s" : "Erro ao transferir %s para %s",
+    "Error when creating the file" : "Erro ao criar o ficheiro",
+    "Folder name cannot be empty." : "O nome da pasta não pode estar vazio.",
+    "Error when creating the folder" : "Erro ao criar a pasta",
+    "Unable to set upload directory." : "Não foi possível criar o diretório de upload",
+    "Invalid Token" : "Token inválido",
+    "No file was uploaded. Unknown error" : "Não foi enviado nenhum ficheiro. Erro desconhecido",
+    "There is no error, the file uploaded with success" : "Não ocorreram erros, o ficheiro foi enviado com sucesso",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "O ficheiro enviado excede a diretiva php.ini upload_max_filesize no php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "O tamanho do ficheiro enviado excede a diretiva MAX_FILE_SIZE definida  no formulário HTML",
+    "The uploaded file was only partially uploaded" : "O ficheiro submetido só foi parcialmente enviado",
+    "No file was uploaded" : "Não foi enviado nenhum ficheiro",
+    "Missing a temporary folder" : "A pasta temporária está em falta",
+    "Failed to write to disk" : "Não foi possível gravar no disco",
+    "Not enough storage available" : "Não há espaço suficiente em disco",
+    "Upload failed. Could not find uploaded file" : "Falhou o envio. Não conseguiu encontrar o ficheiro enviado",
+    "Upload failed. Could not get file info." : "O carregamento falhou. Não foi possível obter a informação do ficheiro.",
+    "Invalid directory." : "Diretoria inválida.",
+    "Files" : "Ficheiros",
+    "All files" : "Todos os ficheiros",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível",
+    "Upload cancelled." : "Envio cancelado.",
+    "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
+    "URL cannot be empty" : "URL não pode estar vazio",
+    "{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",
+    "Error fetching URL" : "Erro ao obter URL",
+    "Share" : "Compartilhar",
+    "Delete" : "Apagar",
+    "Disconnect storage" : "Desconete o armazenamento",
+    "Unshare" : "Deixar de partilhar",
+    "Delete permanently" : "Apagar Para Sempre",
+    "Rename" : "Renomear",
+    "Pending" : "Pendente",
+    "Error moving file." : "Erro a mover o ficheiro.",
+    "Error moving file" : "Erro ao mover o ficheiro",
+    "Error" : "Erro",
+    "Could not rename file" : "Não pôde renomear o ficheiro",
+    "Error deleting file." : "Erro ao apagar o ficheiro.",
+    "Name" : "Nome",
+    "Size" : "Tamanho",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas"],
+    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de ficheiro inválido.",
+    "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
+    "{dirs} and {files}" : "{dirs} e {files}",
+    "%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado",
+    "%s could not be renamed" : "%s não pode ser renomeada",
+    "Upload (max. %s)" : "Enviar (max. %s)",
+    "File handling" : "Manuseamento do ficheiro",
+    "Maximum upload size" : "Tamanho máximo de envio",
+    "max. possible: " : "Máx. possível: ",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Da hiperligação",
+    "Nothing in here. Upload something!" : "Vazio. Envie alguma coisa!",
+    "Download" : "Transferir",
+    "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.",
+    "Currently scanning" : "A analisar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/pt_PT.json b/apps/files/l10n/pt_PT.json
new file mode 100644
index 00000000000..4be9e4306dc
--- /dev/null
+++ b/apps/files/l10n/pt_PT.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Armazenamento indisposinvel",
+    "Storage invalid" : "Armazenamento inválido",
+    "Unknown error" : "Erro Desconhecido",
+    "Could not move %s - File with this name already exists" : "Não foi possível mover %s - Já existe um ficheiro com este nome",
+    "Could not move %s" : "Não foi possível mover %s",
+    "Permission denied" : "Permissão negada",
+    "File name cannot be empty." : "O nome do ficheiro não pode estar em branco.",
+    "\"%s\" is an invalid file name." : "\"%s\" é um nome de ficheiro inválido.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome Inválido, Não são permitidos os carateres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*'.",
+    "The target folder has been moved or deleted." : "A pasta de destino foi movida ou eliminada.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente.",
+    "Not a valid source" : "Não é uma fonte válida",
+    "Server is not allowed to open URLs, please check the server configuration" : "O servidor não consegue abrir URLs, por favor verifique a configuração do servidor",
+    "The file exceeds your quota by %s" : "O ficheiro excede a sua quota por %s",
+    "Error while downloading %s to %s" : "Erro ao transferir %s para %s",
+    "Error when creating the file" : "Erro ao criar o ficheiro",
+    "Folder name cannot be empty." : "O nome da pasta não pode estar vazio.",
+    "Error when creating the folder" : "Erro ao criar a pasta",
+    "Unable to set upload directory." : "Não foi possível criar o diretório de upload",
+    "Invalid Token" : "Token inválido",
+    "No file was uploaded. Unknown error" : "Não foi enviado nenhum ficheiro. Erro desconhecido",
+    "There is no error, the file uploaded with success" : "Não ocorreram erros, o ficheiro foi enviado com sucesso",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "O ficheiro enviado excede a diretiva php.ini upload_max_filesize no php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "O tamanho do ficheiro enviado excede a diretiva MAX_FILE_SIZE definida  no formulário HTML",
+    "The uploaded file was only partially uploaded" : "O ficheiro submetido só foi parcialmente enviado",
+    "No file was uploaded" : "Não foi enviado nenhum ficheiro",
+    "Missing a temporary folder" : "A pasta temporária está em falta",
+    "Failed to write to disk" : "Não foi possível gravar no disco",
+    "Not enough storage available" : "Não há espaço suficiente em disco",
+    "Upload failed. Could not find uploaded file" : "Falhou o envio. Não conseguiu encontrar o ficheiro enviado",
+    "Upload failed. Could not get file info." : "O carregamento falhou. Não foi possível obter a informação do ficheiro.",
+    "Invalid directory." : "Diretoria inválida.",
+    "Files" : "Ficheiros",
+    "All files" : "Todos os ficheiros",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
+    "Total file size {size1} exceeds upload limit {size2}" : "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível",
+    "Upload cancelled." : "Envio cancelado.",
+    "Could not get result from server." : "Não foi possível obter o resultado do servidor.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
+    "URL cannot be empty" : "URL não pode estar vazio",
+    "{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",
+    "Error fetching URL" : "Erro ao obter URL",
+    "Share" : "Compartilhar",
+    "Delete" : "Apagar",
+    "Disconnect storage" : "Desconete o armazenamento",
+    "Unshare" : "Deixar de partilhar",
+    "Delete permanently" : "Apagar Para Sempre",
+    "Rename" : "Renomear",
+    "Pending" : "Pendente",
+    "Error moving file." : "Erro a mover o ficheiro.",
+    "Error moving file" : "Erro ao mover o ficheiro",
+    "Error" : "Erro",
+    "Could not rename file" : "Não pôde renomear o ficheiro",
+    "Error deleting file." : "Erro ao apagar o ficheiro.",
+    "Name" : "Nome",
+    "Size" : "Tamanho",
+    "Modified" : "Modificado",
+    "_%n folder_::_%n folders_" : ["%n pasta","%n pastas"],
+    "_%n file_::_%n files_" : ["%n ficheiro","%n ficheiros"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" é um nome de ficheiro inválido.",
+    "Your storage is full, files can not be updated or synced anymore!" : "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
+    "{dirs} and {files}" : "{dirs} e {files}",
+    "%s could not be renamed as it has been deleted" : "Não foi possível renomear %s devido a ter sido eliminado",
+    "%s could not be renamed" : "%s não pode ser renomeada",
+    "Upload (max. %s)" : "Enviar (max. %s)",
+    "File handling" : "Manuseamento do ficheiro",
+    "Maximum upload size" : "Tamanho máximo de envio",
+    "max. possible: " : "Máx. possível: ",
+    "Save" : "Guardar",
+    "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",
+    "From link" : "Da hiperligação",
+    "Nothing in here. Upload something!" : "Vazio. Envie alguma coisa!",
+    "Download" : "Transferir",
+    "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.",
+    "Currently scanning" : "A analisar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
deleted file mode 100644
index d44a5bd01b2..00000000000
--- a/apps/files/l10n/pt_PT.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Armazenamento indisposinvel",
-"Storage invalid" => "Armazenamento inválido",
-"Unknown error" => "Erro Desconhecido",
-"Could not move %s - File with this name already exists" => "Não foi possível mover %s - Já existe um ficheiro com este nome",
-"Could not move %s" => "Não foi possível mover %s",
-"Permission denied" => "Permissão negada",
-"File name cannot be empty." => "O nome do ficheiro não pode estar em branco.",
-"\"%s\" is an invalid file name." => "\"%s\" é um nome de ficheiro inválido.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome Inválido, Não são permitidos os carateres '\\', '/', '<', '>', ':', '\"', '|', '?' e '*'.",
-"The target folder has been moved or deleted." => "A pasta de destino foi movida ou eliminada.",
-"The name %s is already used in the folder %s. Please choose a different name." => "O nome %s já está em uso na pasta %s. Por favor escolha um nome diferente.",
-"Not a valid source" => "Não é uma fonte válida",
-"Server is not allowed to open URLs, please check the server configuration" => "O servidor não consegue abrir URLs, por favor verifique a configuração do servidor",
-"The file exceeds your quota by %s" => "O ficheiro excede a sua quota por %s",
-"Error while downloading %s to %s" => "Erro ao transferir %s para %s",
-"Error when creating the file" => "Erro ao criar o ficheiro",
-"Folder name cannot be empty." => "O nome da pasta não pode estar vazio.",
-"Error when creating the folder" => "Erro ao criar a pasta",
-"Unable to set upload directory." => "Não foi possível criar o diretório de upload",
-"Invalid Token" => "Token inválido",
-"No file was uploaded. Unknown error" => "Não foi enviado nenhum ficheiro. Erro desconhecido",
-"There is no error, the file uploaded with success" => "Não ocorreram erros, o ficheiro foi enviado com sucesso",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro enviado excede a diretiva php.ini upload_max_filesize no php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O tamanho do ficheiro enviado excede a diretiva MAX_FILE_SIZE definida  no formulário HTML",
-"The uploaded file was only partially uploaded" => "O ficheiro submetido só foi parcialmente enviado",
-"No file was uploaded" => "Não foi enviado nenhum ficheiro",
-"Missing a temporary folder" => "A pasta temporária está em falta",
-"Failed to write to disk" => "Não foi possível gravar no disco",
-"Not enough storage available" => "Não há espaço suficiente em disco",
-"Upload failed. Could not find uploaded file" => "Falhou o envio. Não conseguiu encontrar o ficheiro enviado",
-"Upload failed. Could not get file info." => "O carregamento falhou. Não foi possível obter a informação do ficheiro.",
-"Invalid directory." => "Diretoria inválida.",
-"Files" => "Ficheiros",
-"All files" => "Todos os ficheiros",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Incapaz de enviar {filename}, dado que é uma pasta, ou tem 0 bytes",
-"Total file size {size1} exceeds upload limit {size2}" => "O tamanho total do ficheiro {size1} excede o limite de carregamento {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Não existe espaço suficiente. Está a enviar {size1} mas apenas existe {size2} disponível",
-"Upload cancelled." => "Envio cancelado.",
-"Could not get result from server." => "Não foi possível obter o resultado do servidor.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Envio de ficheiro em progresso. Se deixar a página agora, irá cancelar o envio.",
-"URL cannot be empty" => "URL não pode estar vazio",
-"{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",
-"Error fetching URL" => "Erro ao obter URL",
-"Share" => "Compartilhar",
-"Delete" => "Apagar",
-"Disconnect storage" => "Desconete o armazenamento",
-"Unshare" => "Deixar de partilhar",
-"Delete permanently" => "Apagar Para Sempre",
-"Rename" => "Renomear",
-"Pending" => "Pendente",
-"Error moving file." => "Erro a mover o ficheiro.",
-"Error moving file" => "Erro ao mover o ficheiro",
-"Error" => "Erro",
-"Could not rename file" => "Não pôde renomear o ficheiro",
-"Error deleting file." => "Erro ao apagar o ficheiro.",
-"Name" => "Nome",
-"Size" => "Tamanho",
-"Modified" => "Modificado",
-"_%n folder_::_%n folders_" => array("%n pasta","%n pastas"),
-"_%n file_::_%n files_" => array("%n ficheiro","%n ficheiros"),
-"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_" => array("A carregar %n ficheiro","A carregar %n ficheiros"),
-"\"{name}\" is an invalid file name." => "\"{name}\" é um nome de ficheiro inválido.",
-"Your storage is full, files can not be updated or synced anymore!" => "O seu armazenamento está cheio, os ficheiros já não podem ser atualizados ou sincronizados.",
-"Your storage is almost full ({usedSpacePercent}%)" => "O seu armazenamento está quase cheiro ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Chave privada inválida da Aplicação de Encriptação. Por favor atualize a sua senha de chave privada nas definições pessoais, para recuperar o acesso aos seus ficheiros encriptados.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "A encriptação foi desactivada mas os seus ficheiros continuam encriptados.  Por favor consulte as suas definições pessoais para desencriptar os ficheiros.",
-"{dirs} and {files}" => "{dirs} e {files}",
-"%s could not be renamed as it has been deleted" => "Não foi possível renomear %s devido a ter sido eliminado",
-"%s could not be renamed" => "%s não pode ser renomeada",
-"Upload (max. %s)" => "Enviar (max. %s)",
-"File handling" => "Manuseamento do ficheiro",
-"Maximum upload size" => "Tamanho máximo de envio",
-"max. possible: " => "Máx. possível: ",
-"Save" => "Guardar",
-"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",
-"From link" => "Da hiperligação",
-"Nothing in here. Upload something!" => "Vazio. Envie alguma coisa!",
-"Download" => "Transferir",
-"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.",
-"Currently scanning" => "A analisar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ro.js b/apps/files/l10n/ro.js
new file mode 100644
index 00000000000..2b3e662aafd
--- /dev/null
+++ b/apps/files/l10n/ro.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Spațiu de stocare indisponibil",
+    "Storage invalid" : "Spațiu de stocare invalid",
+    "Unknown error" : "Eroare necunoscută",
+    "Could not move %s - File with this name already exists" : "%s nu se poate muta - Fișierul cu acest nume există deja ",
+    "Could not move %s" : "Nu se poate muta %s",
+    "Permission denied" : "Accesul interzis",
+    "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.",
+    "\"%s\" is an invalid file name." : "\"%s\" este un nume de fișier nevalid",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise.",
+    "The target folder has been moved or deleted." : "Dosarul țintă a fost mutat sau șters.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Numele %s este deja este folosit în dosarul %s. Te rog alege alt nume.",
+    "Not a valid source" : "Sursă nevalidă",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serverului nu ii este permis sa deschida URL-ul , verificati setarile serverului",
+    "The file exceeds your quota by %s" : "Fisierul depaseste limita cu %s",
+    "Error while downloading %s to %s" : "Eroare la descarcarea %s in %s",
+    "Error when creating the file" : "Eroare la crearea fisierului",
+    "Folder name cannot be empty." : "Numele folderului nu poate fi liber.",
+    "Error when creating the folder" : "Eroare la crearea folderului",
+    "Unable to set upload directory." : "Imposibil de a seta directorul pentru incărcare.",
+    "Invalid Token" : "Jeton Invalid",
+    "No file was uploaded. Unknown error" : "Niciun fișier nu a fost încărcat. Eroare necunoscută",
+    "There is no error, the file uploaded with success" : "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML",
+    "The uploaded file was only partially uploaded" : "Fișierul a fost încărcat doar parțial",
+    "No file was uploaded" : "Nu a fost încărcat nici un fișier",
+    "Missing a temporary folder" : "Lipsește un dosar temporar",
+    "Failed to write to disk" : "Eroare la scrierea pe disc",
+    "Not enough storage available" : "Nu este disponibil suficient spațiu",
+    "Upload failed. Could not find uploaded file" : "Încărcare eșuată. Nu se poate găsi fișierul încărcat",
+    "Upload failed. Could not get file info." : "Încărcare eșuată. Nu se pot obține informații despre fișier.",
+    "Invalid directory." : "Dosar nevalid.",
+    "Files" : "Fișiere",
+    "All files" : "Toate fișierele.",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți",
+    "Total file size {size1} exceeds upload limit {size2}" : "Mărimea fișierului este {size1} ce depășește limita de incarcare de {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas",
+    "Upload cancelled." : "Încărcare anulată.",
+    "Could not get result from server." : "Nu se poate obține rezultatul de la server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
+    "URL cannot be empty" : "URL nu poate fi gol",
+    "{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",
+    "Error fetching URL" : "Eroare încarcare URL",
+    "Share" : "Partajează",
+    "Delete" : "Șterge",
+    "Disconnect storage" : "Stocare deconectata",
+    "Unshare" : "Anulare",
+    "Delete permanently" : "Șterge permanent",
+    "Rename" : "Redenumește",
+    "Pending" : "În așteptare",
+    "Error moving file." : "Eroare la mutarea fișierului.",
+    "Error moving file" : "Eroare la mutarea fișierului",
+    "Error" : "Eroare",
+    "Could not rename file" : "Nu s-a putut redenumi fisierul",
+    "Error deleting file." : "Eroare la ștergerea fisierului.",
+    "Name" : "Nume",
+    "Size" : "Mărime",
+    "Modified" : "Modificat",
+    "_%n folder_::_%n folders_" : ["%n director","%n directoare","%n directoare"],
+    "_%n file_::_%n files_" : ["%n fișier","%n fișiere","%n fișiere"],
+    "You don’t have permission to upload or create files here" : "Nu aveti permisiunea de a incarca sau crea fisiere aici",
+    "_Uploading %n file_::_Uploading %n files_" : ["Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."],
+    "\"{name}\" is an invalid file name." : "\"{name}\" este un nume de fișier nevalid.",
+    "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}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele",
+    "{dirs} and {files}" : "{dirs} și {files}",
+    "%s could not be renamed as it has been deleted" : "%s nu a putut fi redenumit deoarece a fost sters",
+    "%s could not be renamed" : "%s nu a putut fi redenumit",
+    "Upload (max. %s)" : "Încarcă (max. %s)",
+    "File handling" : "Manipulare fișiere",
+    "Maximum upload size" : "Dimensiune maximă admisă la încărcare",
+    "max. possible: " : "max. posibil:",
+    "Save" : "Salvează",
+    "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",
+    "From link" : "De la adresa",
+    "Nothing in here. Upload something!" : "Nimic aici. Încarcă ceva!",
+    "Download" : "Descarcă",
+    "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ă.",
+    "Currently scanning" : "Acum scaneaza"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files/l10n/ro.json b/apps/files/l10n/ro.json
new file mode 100644
index 00000000000..c0e85b4b916
--- /dev/null
+++ b/apps/files/l10n/ro.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Spațiu de stocare indisponibil",
+    "Storage invalid" : "Spațiu de stocare invalid",
+    "Unknown error" : "Eroare necunoscută",
+    "Could not move %s - File with this name already exists" : "%s nu se poate muta - Fișierul cu acest nume există deja ",
+    "Could not move %s" : "Nu se poate muta %s",
+    "Permission denied" : "Accesul interzis",
+    "File name cannot be empty." : "Numele fișierului nu poate rămâne gol.",
+    "\"%s\" is an invalid file name." : "\"%s\" este un nume de fișier nevalid",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise.",
+    "The target folder has been moved or deleted." : "Dosarul țintă a fost mutat sau șters.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Numele %s este deja este folosit în dosarul %s. Te rog alege alt nume.",
+    "Not a valid source" : "Sursă nevalidă",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serverului nu ii este permis sa deschida URL-ul , verificati setarile serverului",
+    "The file exceeds your quota by %s" : "Fisierul depaseste limita cu %s",
+    "Error while downloading %s to %s" : "Eroare la descarcarea %s in %s",
+    "Error when creating the file" : "Eroare la crearea fisierului",
+    "Folder name cannot be empty." : "Numele folderului nu poate fi liber.",
+    "Error when creating the folder" : "Eroare la crearea folderului",
+    "Unable to set upload directory." : "Imposibil de a seta directorul pentru incărcare.",
+    "Invalid Token" : "Jeton Invalid",
+    "No file was uploaded. Unknown error" : "Niciun fișier nu a fost încărcat. Eroare necunoscută",
+    "There is no error, the file uploaded with success" : "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML",
+    "The uploaded file was only partially uploaded" : "Fișierul a fost încărcat doar parțial",
+    "No file was uploaded" : "Nu a fost încărcat nici un fișier",
+    "Missing a temporary folder" : "Lipsește un dosar temporar",
+    "Failed to write to disk" : "Eroare la scrierea pe disc",
+    "Not enough storage available" : "Nu este disponibil suficient spațiu",
+    "Upload failed. Could not find uploaded file" : "Încărcare eșuată. Nu se poate găsi fișierul încărcat",
+    "Upload failed. Could not get file info." : "Încărcare eșuată. Nu se pot obține informații despre fișier.",
+    "Invalid directory." : "Dosar nevalid.",
+    "Files" : "Fișiere",
+    "All files" : "Toate fișierele.",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți",
+    "Total file size {size1} exceeds upload limit {size2}" : "Mărimea fișierului este {size1} ce depășește limita de incarcare de {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas",
+    "Upload cancelled." : "Încărcare anulată.",
+    "Could not get result from server." : "Nu se poate obține rezultatul de la server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
+    "URL cannot be empty" : "URL nu poate fi gol",
+    "{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",
+    "Error fetching URL" : "Eroare încarcare URL",
+    "Share" : "Partajează",
+    "Delete" : "Șterge",
+    "Disconnect storage" : "Stocare deconectata",
+    "Unshare" : "Anulare",
+    "Delete permanently" : "Șterge permanent",
+    "Rename" : "Redenumește",
+    "Pending" : "În așteptare",
+    "Error moving file." : "Eroare la mutarea fișierului.",
+    "Error moving file" : "Eroare la mutarea fișierului",
+    "Error" : "Eroare",
+    "Could not rename file" : "Nu s-a putut redenumi fisierul",
+    "Error deleting file." : "Eroare la ștergerea fisierului.",
+    "Name" : "Nume",
+    "Size" : "Mărime",
+    "Modified" : "Modificat",
+    "_%n folder_::_%n folders_" : ["%n director","%n directoare","%n directoare"],
+    "_%n file_::_%n files_" : ["%n fișier","%n fișiere","%n fișiere"],
+    "You don’t have permission to upload or create files here" : "Nu aveti permisiunea de a incarca sau crea fisiere aici",
+    "_Uploading %n file_::_Uploading %n files_" : ["Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."],
+    "\"{name}\" is an invalid file name." : "\"{name}\" este un nume de fișier nevalid.",
+    "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}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele",
+    "{dirs} and {files}" : "{dirs} și {files}",
+    "%s could not be renamed as it has been deleted" : "%s nu a putut fi redenumit deoarece a fost sters",
+    "%s could not be renamed" : "%s nu a putut fi redenumit",
+    "Upload (max. %s)" : "Încarcă (max. %s)",
+    "File handling" : "Manipulare fișiere",
+    "Maximum upload size" : "Dimensiune maximă admisă la încărcare",
+    "max. possible: " : "max. posibil:",
+    "Save" : "Salvează",
+    "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",
+    "From link" : "De la adresa",
+    "Nothing in here. Upload something!" : "Nimic aici. Încarcă ceva!",
+    "Download" : "Descarcă",
+    "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ă.",
+    "Currently scanning" : "Acum scaneaza"
+},"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/l10n/ro.php b/apps/files/l10n/ro.php
deleted file mode 100644
index 69c97508dca..00000000000
--- a/apps/files/l10n/ro.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Spațiu de stocare indisponibil",
-"Storage invalid" => "Spațiu de stocare invalid",
-"Unknown error" => "Eroare necunoscută",
-"Could not move %s - File with this name already exists" => "%s nu se poate muta - Fișierul cu acest nume există deja ",
-"Could not move %s" => "Nu se poate muta %s",
-"Permission denied" => "Accesul interzis",
-"File name cannot be empty." => "Numele fișierului nu poate rămâne gol.",
-"\"%s\" is an invalid file name." => "\"%s\" este un nume de fișier nevalid",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nume nevalide, '\\', '/', '<', '>', ':', '\"', '|', '?' și '*' nu sunt permise.",
-"The target folder has been moved or deleted." => "Dosarul țintă a fost mutat sau șters.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Numele %s este deja este folosit în dosarul %s. Te rog alege alt nume.",
-"Not a valid source" => "Sursă nevalidă",
-"Server is not allowed to open URLs, please check the server configuration" => "Serverului nu ii este permis sa deschida URL-ul , verificati setarile serverului",
-"The file exceeds your quota by %s" => "Fisierul depaseste limita cu %s",
-"Error while downloading %s to %s" => "Eroare la descarcarea %s in %s",
-"Error when creating the file" => "Eroare la crearea fisierului",
-"Folder name cannot be empty." => "Numele folderului nu poate fi liber.",
-"Error when creating the folder" => "Eroare la crearea folderului",
-"Unable to set upload directory." => "Imposibil de a seta directorul pentru incărcare.",
-"Invalid Token" => "Jeton Invalid",
-"No file was uploaded. Unknown error" => "Niciun fișier nu a fost încărcat. Eroare necunoscută",
-"There is no error, the file uploaded with success" => "Nu a apărut nici o eroare, fișierul a fost încărcat cu succes",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Fișierul încărcat depășește directiva upload_max_filesize din php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Fișierul încărcat depășește directiva MAX_FILE_SIZE specificată în formularul HTML",
-"The uploaded file was only partially uploaded" => "Fișierul a fost încărcat doar parțial",
-"No file was uploaded" => "Nu a fost încărcat nici un fișier",
-"Missing a temporary folder" => "Lipsește un dosar temporar",
-"Failed to write to disk" => "Eroare la scrierea pe disc",
-"Not enough storage available" => "Nu este disponibil suficient spațiu",
-"Upload failed. Could not find uploaded file" => "Încărcare eșuată. Nu se poate găsi fișierul încărcat",
-"Upload failed. Could not get file info." => "Încărcare eșuată. Nu se pot obține informații despre fișier.",
-"Invalid directory." => "Dosar nevalid.",
-"Files" => "Fișiere",
-"All files" => "Toate fișierele.",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nu se poate încărca {filename} deoarece este un director sau are mărimea de 0 octeți",
-"Total file size {size1} exceeds upload limit {size2}" => "Mărimea fișierului este {size1} ce depășește limita de incarcare de {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Spațiu liber insuficient, încărcați {size1} însă doar {size2} disponibil rămas",
-"Upload cancelled." => "Încărcare anulată.",
-"Could not get result from server." => "Nu se poate obține rezultatul de la server.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Fișierul este în curs de încărcare. Părăsirea paginii va întrerupe încărcarea.",
-"URL cannot be empty" => "URL nu poate fi gol",
-"{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",
-"Error fetching URL" => "Eroare încarcare URL",
-"Share" => "Partajează",
-"Delete" => "Șterge",
-"Disconnect storage" => "Stocare deconectata",
-"Unshare" => "Anulare",
-"Delete permanently" => "Șterge permanent",
-"Rename" => "Redenumește",
-"Pending" => "În așteptare",
-"Error moving file." => "Eroare la mutarea fișierului.",
-"Error moving file" => "Eroare la mutarea fișierului",
-"Error" => "Eroare",
-"Could not rename file" => "Nu s-a putut redenumi fisierul",
-"Error deleting file." => "Eroare la ștergerea fisierului.",
-"Name" => "Nume",
-"Size" => "Mărime",
-"Modified" => "Modificat",
-"_%n folder_::_%n folders_" => array("%n director","%n directoare","%n directoare"),
-"_%n file_::_%n files_" => array("%n fișier","%n fișiere","%n fișiere"),
-"You don’t have permission to upload or create files here" => "Nu aveti permisiunea de a incarca sau crea fisiere aici",
-"_Uploading %n file_::_Uploading %n files_" => array("Se încarcă %n fișier.","Se încarcă %n fișiere.","Se încarcă %n fișiere."),
-"\"{name}\" is an invalid file name." => "\"{name}\" este un nume de fișier nevalid.",
-"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}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "criptarea a fost disactivata dar fisierele sant inca criptate.va rog intrati in setarile personale pentru a decripta fisierele",
-"{dirs} and {files}" => "{dirs} și {files}",
-"%s could not be renamed as it has been deleted" => "%s nu a putut fi redenumit deoarece a fost sters",
-"%s could not be renamed" => "%s nu a putut fi redenumit",
-"Upload (max. %s)" => "Încarcă (max. %s)",
-"File handling" => "Manipulare fișiere",
-"Maximum upload size" => "Dimensiune maximă admisă la încărcare",
-"max. possible: " => "max. posibil:",
-"Save" => "Salvează",
-"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",
-"From link" => "De la adresa",
-"Nothing in here. Upload something!" => "Nimic aici. Încarcă ceva!",
-"Download" => "Descarcă",
-"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ă.",
-"Currently scanning" => "Acum scaneaza"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files/l10n/ru.js b/apps/files/l10n/ru.js
new file mode 100644
index 00000000000..cd982266155
--- /dev/null
+++ b/apps/files/l10n/ru.js
@@ -0,0 +1,97 @@
+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" : "В доступе отказано",
+    "File name cannot be empty." : "Имя файла не может быть пустым.",
+    "\"%s\" is an invalid file name." : "\"%s\" это не правильное имя файла.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Неправильное имя: символы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
+    "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. Пожалуйста, выберите другое имя.",
+    "Not a valid source" : "Неправильный источник",
+    "Server is not allowed to open URLs, please check the server configuration" : "Сервер не позволяет открывать URL-адреса, пожалуйста, проверьте настройки сервера",
+    "The file exceeds your quota by %s" : "Файл превышает вашу квоту на  %s",
+    "Error while downloading %s to %s" : "Ошибка при скачивании %s в %s",
+    "Error when creating the file" : "Ошибка при создании файла",
+    "Folder name cannot be empty." : "Имя папки не может быть пустым.",
+    "Error when creating the folder" : "Ошибка создания каталога",
+    "Unable to set upload directory." : "Не удалось установить каталог загрузки.",
+    "Invalid Token" : "Недопустимый маркер",
+    "No file was uploaded. Unknown error" : "Файл не был загружен. Неизвестная ошибка",
+    "There is no error, the file uploaded with success" : "Файл загружен успешно.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме",
+    "The uploaded file was only partially uploaded" : "Файл загружен лишь частично",
+    "No file was uploaded" : "Ни одного файла загружено не было",
+    "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" : "Все файлы",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера",
+    "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}",
+    "Upload cancelled." : "Загрузка отменена.",
+    "Could not get result from server." : "Не удалось получить ответ от сервера.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
+    "URL cannot be empty" : "Ссылка не может быть пустой.",
+    "{new_name} already exists" : "{new_name} уже существует",
+    "Could not create file" : "Не удалось создать файл",
+    "Could not create folder" : "Не удалось создать каталог",
+    "Error fetching URL" : "Ошибка получения URL",
+    "Share" : "Открыть доступ",
+    "Delete" : "Удалить",
+    "Disconnect storage" : "Отсоединиться от хранилища",
+    "Unshare" : "Закрыть доступ",
+    "Delete permanently" : "Удалить окончательно",
+    "Rename" : "Переименовать",
+    "Pending" : "Ожидание",
+    "Error moving file." : "Ошибка перемещения файла.",
+    "Error moving file" : "Ошибка при перемещении файла",
+    "Error" : "Ошибка",
+    "Could not rename file" : "Не удалось переименовать файл",
+    "Error deleting file." : "Ошибка при удалении файла.",
+    "Name" : "Имя",
+    "Size" : "Размер",
+    "Modified" : "Изменён",
+    "_%n folder_::_%n folders_" : ["%n каталог","%n каталога","%n каталогов"],
+    "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов"],
+    "You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.",
+    "_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" это не правильное имя файла.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
+    "{dirs} and {files}" : "{dirs} и {files}",
+    "%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" : "Сохранить",
+    "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" : "Каталог",
+    "From link" : "Объект по ссылке",
+    "Nothing in here. Upload something!" : "Здесь ничего нет. Загрузите что-нибудь!",
+    "Download" : "Скачать",
+    "Upload too large" : "Файл слишком велик",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.",
+    "Files are being scanned, please wait." : "Подождите, файлы сканируются.",
+    "Currently scanning" : "В настоящее время сканируется"
+},
+"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/l10n/ru.json b/apps/files/l10n/ru.json
new file mode 100644
index 00000000000..7ac4fb7c3c3
--- /dev/null
+++ b/apps/files/l10n/ru.json
@@ -0,0 +1,95 @@
+{ "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" : "В доступе отказано",
+    "File name cannot be empty." : "Имя файла не может быть пустым.",
+    "\"%s\" is an invalid file name." : "\"%s\" это не правильное имя файла.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Неправильное имя: символы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
+    "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. Пожалуйста, выберите другое имя.",
+    "Not a valid source" : "Неправильный источник",
+    "Server is not allowed to open URLs, please check the server configuration" : "Сервер не позволяет открывать URL-адреса, пожалуйста, проверьте настройки сервера",
+    "The file exceeds your quota by %s" : "Файл превышает вашу квоту на  %s",
+    "Error while downloading %s to %s" : "Ошибка при скачивании %s в %s",
+    "Error when creating the file" : "Ошибка при создании файла",
+    "Folder name cannot be empty." : "Имя папки не может быть пустым.",
+    "Error when creating the folder" : "Ошибка создания каталога",
+    "Unable to set upload directory." : "Не удалось установить каталог загрузки.",
+    "Invalid Token" : "Недопустимый маркер",
+    "No file was uploaded. Unknown error" : "Файл не был загружен. Неизвестная ошибка",
+    "There is no error, the file uploaded with success" : "Файл загружен успешно.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме",
+    "The uploaded file was only partially uploaded" : "Файл загружен лишь частично",
+    "No file was uploaded" : "Ни одного файла загружено не было",
+    "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" : "Все файлы",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера",
+    "Total file size {size1} exceeds upload limit {size2}" : "Полный размер файла {size1} превышает лимит по загрузке {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}",
+    "Upload cancelled." : "Загрузка отменена.",
+    "Could not get result from server." : "Не удалось получить ответ от сервера.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
+    "URL cannot be empty" : "Ссылка не может быть пустой.",
+    "{new_name} already exists" : "{new_name} уже существует",
+    "Could not create file" : "Не удалось создать файл",
+    "Could not create folder" : "Не удалось создать каталог",
+    "Error fetching URL" : "Ошибка получения URL",
+    "Share" : "Открыть доступ",
+    "Delete" : "Удалить",
+    "Disconnect storage" : "Отсоединиться от хранилища",
+    "Unshare" : "Закрыть доступ",
+    "Delete permanently" : "Удалить окончательно",
+    "Rename" : "Переименовать",
+    "Pending" : "Ожидание",
+    "Error moving file." : "Ошибка перемещения файла.",
+    "Error moving file" : "Ошибка при перемещении файла",
+    "Error" : "Ошибка",
+    "Could not rename file" : "Не удалось переименовать файл",
+    "Error deleting file." : "Ошибка при удалении файла.",
+    "Name" : "Имя",
+    "Size" : "Размер",
+    "Modified" : "Изменён",
+    "_%n folder_::_%n folders_" : ["%n каталог","%n каталога","%n каталогов"],
+    "_%n file_::_%n files_" : ["%n файл","%n файла","%n файлов"],
+    "You don’t have permission to upload or create files here" : "У вас нет прав для загрузки или создания файлов здесь.",
+    "_Uploading %n file_::_Uploading %n files_" : ["Закачка %n файла","Закачка %n файлов","Закачка %n файлов"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" это не правильное имя файла.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
+    "{dirs} and {files}" : "{dirs} и {files}",
+    "%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" : "Сохранить",
+    "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" : "Каталог",
+    "From link" : "Объект по ссылке",
+    "Nothing in here. Upload something!" : "Здесь ничего нет. Загрузите что-нибудь!",
+    "Download" : "Скачать",
+    "Upload too large" : "Файл слишком велик",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.",
+    "Files are being scanned, please wait." : "Подождите, файлы сканируются.",
+    "Currently scanning" : "В настоящее время сканируется"
+},"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/l10n/ru.php b/apps/files/l10n/ru.php
deleted file mode 100644
index 943a8a13a26..00000000000
--- a/apps/files/l10n/ru.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "В доступе отказано",
-"File name cannot be empty." => "Имя файла не может быть пустым.",
-"\"%s\" is an invalid file name." => "\"%s\" это не правильное имя файла.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неправильное имя: символы '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы.",
-"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. Пожалуйста, выберите другое имя.",
-"Not a valid source" => "Неправильный источник",
-"Server is not allowed to open URLs, please check the server configuration" => "Сервер не позволяет открывать URL-адреса, пожалуйста, проверьте настройки сервера",
-"The file exceeds your quota by %s" => "Файл превышает вашу квоту на  %s",
-"Error while downloading %s to %s" => "Ошибка при скачивании %s в %s",
-"Error when creating the file" => "Ошибка при создании файла",
-"Folder name cannot be empty." => "Имя папки не может быть пустым.",
-"Error when creating the folder" => "Ошибка создания каталога",
-"Unable to set upload directory." => "Не удалось установить каталог загрузки.",
-"Invalid Token" => "Недопустимый маркер",
-"No file was uploaded. Unknown error" => "Файл не был загружен. Неизвестная ошибка",
-"There is no error, the file uploaded with success" => "Файл загружен успешно.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Файл превышает размер, установленный параметром upload_max_filesize в php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Загруженный файл превышает размер, установленный параметром MAX_FILE_SIZE в HTML-форме",
-"The uploaded file was only partially uploaded" => "Файл загружен лишь частично",
-"No file was uploaded" => "Ни одного файла загружено не было",
-"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" => "Все файлы",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Невозможно загрузить {filename}, так как это либо каталог, либо файл нулевого размера",
-"Total file size {size1} exceeds upload limit {size2}" => "Полный размер файла {size1} превышает лимит по загрузке {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Не достаточно свободного места, Вы загружаете {size1} но осталось только {size2}",
-"Upload cancelled." => "Загрузка отменена.",
-"Could not get result from server." => "Не удалось получить ответ от сервера.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Идёт загрузка файла. Покинув страницу, вы прервёте загрузку.",
-"URL cannot be empty" => "Ссылка не может быть пустой.",
-"{new_name} already exists" => "{new_name} уже существует",
-"Could not create file" => "Не удалось создать файл",
-"Could not create folder" => "Не удалось создать каталог",
-"Error fetching URL" => "Ошибка получения URL",
-"Share" => "Открыть доступ",
-"Delete" => "Удалить",
-"Disconnect storage" => "Отсоединиться от хранилища",
-"Unshare" => "Закрыть доступ",
-"Delete permanently" => "Удалить окончательно",
-"Rename" => "Переименовать",
-"Pending" => "Ожидание",
-"Error moving file." => "Ошибка перемещения файла.",
-"Error moving file" => "Ошибка при перемещении файла",
-"Error" => "Ошибка",
-"Could not rename file" => "Не удалось переименовать файл",
-"Error deleting file." => "Ошибка при удалении файла.",
-"Name" => "Имя",
-"Size" => "Размер",
-"Modified" => "Изменён",
-"_%n folder_::_%n folders_" => array("%n каталог","%n каталога","%n каталогов"),
-"_%n file_::_%n files_" => array("%n файл","%n файла","%n файлов"),
-"You don’t have permission to upload or create files here" => "У вас нет прав для загрузки или создания файлов здесь.",
-"_Uploading %n file_::_Uploading %n files_" => array("Закачка %n файла","Закачка %n файлов","Закачка %n файлов"),
-"\"{name}\" is an invalid file name." => "\"{name}\" это не правильное имя файла.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше хранилище заполнено, произведите очистку перед загрузкой новых файлов.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ваше хранилище почти заполнено ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Закрытый ключ приложения шифрования недействителен. Обновите закрытый ключ в личных настройках, чтобы восстановить доступ к зашифрованным файлам.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрование было отключено, но ваши файлы остались зашифрованными. Зайдите на страницу личных настроек для того, чтобы расшифровать их.",
-"{dirs} and {files}" => "{dirs} и {files}",
-"%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" => "Сохранить",
-"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" => "Каталог",
-"From link" => "Объект по ссылке",
-"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
-"Download" => "Скачать",
-"Upload too large" => "Файл слишком велик",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файлы, которые вы пытаетесь загрузить, превышают лимит максимального размера на этом сервере.",
-"Files are being scanned, please wait." => "Подождите, файлы сканируются.",
-"Currently scanning" => "В настоящее время сканируется"
-);
-$PLURAL_FORMS = "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/l10n/si_LK.js b/apps/files/l10n/si_LK.js
new file mode 100644
index 00000000000..80df02a9ada
--- /dev/null
+++ b/apps/files/l10n/si_LK.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "files",
+    {
+    "No file was uploaded. Unknown error" : "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්",
+    "There is no error, the file uploaded with success" : "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය",
+    "The uploaded file was only partially uploaded" : "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
+    "No file was uploaded" : "ගොනුවක් උඩුගත නොවුණි",
+    "Missing a temporary folder" : "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්",
+    "Failed to write to disk" : "තැටිගත කිරීම අසාර්ථකයි",
+    "Files" : "ගොනු",
+    "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
+    "Share" : "බෙදා හදා ගන්න",
+    "Delete" : "මකා දමන්න",
+    "Unshare" : "නොබෙදු",
+    "Rename" : "නැවත නම් කරන්න",
+    "Error" : "දෝෂයක්",
+    "Name" : "නම",
+    "Size" : "ප්‍රමාණය",
+    "Modified" : "වෙනස් කළ",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "ගොනු පරිහරණය",
+    "Maximum upload size" : "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
+    "max. possible: " : "හැකි උපරිමය:",
+    "Save" : "සුරකින්න",
+    "New" : "නව",
+    "Text file" : "පෙළ ගොනුව",
+    "Folder" : "ෆෝල්ඩරය",
+    "From link" : "යොමුවෙන්",
+    "Nothing in here. Upload something!" : "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
+    "Download" : "බාන්න",
+    "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." : "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/si_LK.json b/apps/files/l10n/si_LK.json
new file mode 100644
index 00000000000..e66d5c2a1f1
--- /dev/null
+++ b/apps/files/l10n/si_LK.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "No file was uploaded. Unknown error" : "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්",
+    "There is no error, the file uploaded with success" : "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය",
+    "The uploaded file was only partially uploaded" : "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
+    "No file was uploaded" : "ගොනුවක් උඩුගත නොවුණි",
+    "Missing a temporary folder" : "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්",
+    "Failed to write to disk" : "තැටිගත කිරීම අසාර්ථකයි",
+    "Files" : "ගොනු",
+    "Upload cancelled." : "උඩුගත කිරීම අත් හරින්න ලදී",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
+    "Share" : "බෙදා හදා ගන්න",
+    "Delete" : "මකා දමන්න",
+    "Unshare" : "නොබෙදු",
+    "Rename" : "නැවත නම් කරන්න",
+    "Error" : "දෝෂයක්",
+    "Name" : "නම",
+    "Size" : "ප්‍රමාණය",
+    "Modified" : "වෙනස් කළ",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "ගොනු පරිහරණය",
+    "Maximum upload size" : "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
+    "max. possible: " : "හැකි උපරිමය:",
+    "Save" : "සුරකින්න",
+    "New" : "නව",
+    "Text file" : "පෙළ ගොනුව",
+    "Folder" : "ෆෝල්ඩරය",
+    "From link" : "යොමුවෙන්",
+    "Nothing in here. Upload something!" : "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
+    "Download" : "බාන්න",
+    "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." : "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
deleted file mode 100644
index 666902e93e8..00000000000
--- a/apps/files/l10n/si_LK.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"No file was uploaded. Unknown error" => "ගොනුවක් උඩුගත නොවුනි. නොහැඳිනු දෝෂයක්",
-"There is no error, the file uploaded with success" => "දෝෂයක් නොමැත. සාර්ථකව ගොනුව උඩුගත කෙරුණි",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "උඩුගත කළ ගොනුවේ විශාලත්වය HTML පෝරමයේ නියම කළ ඇති MAX_FILE_SIZE විශාලත්වයට වඩා වැඩිය",
-"The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
-"No file was uploaded" => "ගොනුවක් උඩුගත නොවුණි",
-"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් අතුරුදහන්",
-"Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
-"Files" => "ගොනු",
-"Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී",
-"File upload is in progress. Leaving the page now will cancel the upload." => "උඩුගතකිරීමක් සිදුවේ. පිටුව හැර යාමෙන් එය නැවතෙනු ඇත",
-"Share" => "බෙදා හදා ගන්න",
-"Delete" => "මකා දමන්න",
-"Unshare" => "නොබෙදු",
-"Rename" => "නැවත නම් කරන්න",
-"Error" => "දෝෂයක්",
-"Name" => "නම",
-"Size" => "ප්‍රමාණය",
-"Modified" => "වෙනස් කළ",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"File handling" => "ගොනු පරිහරණය",
-"Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
-"max. possible: " => "හැකි උපරිමය:",
-"Save" => "සුරකින්න",
-"New" => "නව",
-"Text file" => "පෙළ ගොනුව",
-"Folder" => "ෆෝල්ඩරය",
-"From link" => "යොමුවෙන්",
-"Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
-"Download" => "බාන්න",
-"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." => "ගොනු පරික්ෂා කෙරේ. මඳක් රැඳී සිටින්න"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sk.js b/apps/files/l10n/sk.js
new file mode 100644
index 00000000000..f2a2f49398a
--- /dev/null
+++ b/apps/files/l10n/sk.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "files",
+    {
+    "Share" : "Zdieľať",
+    "Delete" : "Odstrániť",
+    "_%n folder_::_%n folders_" : "[ ,,]",
+    "_%n file_::_%n files_" : "[ ,,]",
+    "_Uploading %n file_::_Uploading %n files_" : "[ ,,]",
+    "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
new file mode 100644
index 00000000000..1ff4b9ce34b
--- /dev/null
+++ b/apps/files/l10n/sk.json
@@ -0,0 +1 @@
+{"translations":{"Share":"Zdie\u013ea\u0165","Delete":"Odstr\u00e1ni\u0165","_%n folder_::_%n folders_":["","",""],"_%n file_::_%n files_":["","",""],"_Uploading %n file_::_Uploading %n files_":["","",""],"Save":"Ulo\u017ei\u0165","Download":"Stiahnu\u0165"},"pluralForm":"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"}
\ No newline at end of file
diff --git a/apps/files/l10n/sk.php b/apps/files/l10n/sk.php
deleted file mode 100644
index 8d6c2237dc3..00000000000
--- a/apps/files/l10n/sk.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Share" => "Zdieľať",
-"Delete" => "Odstrániť",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"Save" => "Uložiť",
-"Download" => "Stiahnuť"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sk_SK.js b/apps/files/l10n/sk_SK.js
new file mode 100644
index 00000000000..b29bc7e2c0f
--- /dev/null
+++ b/apps/files/l10n/sk_SK.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Úložisko nie je dostupné",
+    "Storage invalid" : "Úložisko nie je platné",
+    "Unknown error" : "Neznáma chyba",
+    "Could not move %s - File with this name already exists" : "Nie je možné presunúť %s - súbor s týmto menom už existuje",
+    "Could not move %s" : "Nie je možné presunúť %s",
+    "Permission denied" : "Prístup bol odmietnutý",
+    "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
+    "\"%s\" is an invalid file name." : "\"%s\" je neplatné meno súboru.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
+    "The target folder has been moved or deleted." : "Cieľový priečinok bol premiestnený alebo odstránený.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Názov %s už používa priečinok s%. Prosím zvoľte iný názov.",
+    "Not a valid source" : "Neplatný zdroj",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server nie je oprávnený otvárať adresy URL. Overte nastavenia servera.",
+    "The file exceeds your quota by %s" : "Súbor prekračuje vašu kvótu o %s",
+    "Error while downloading %s to %s" : "Chyba pri sťahovaní súboru %s do %s",
+    "Error when creating the file" : "Chyba pri vytváraní súboru",
+    "Folder name cannot be empty." : "Názov priečinka nemôže byť prázdny.",
+    "Error when creating the folder" : "Chyba pri vytváraní priečinka",
+    "Unable to set upload directory." : "Nemožno nastaviť priečinok pre nahrané súbory.",
+    "Invalid Token" : "Neplatný token",
+    "No file was uploaded. Unknown error" : "Žiaden súbor nebol nahraný. Neznáma chyba",
+    "There is no error, the file uploaded with success" : "Nenastala žiadna chyba, súbor bol úspešne nahraný",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Nahraný súbor prekročil limit nastavený v upload_max_filesize v súbore php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.",
+    "The uploaded file was only partially uploaded" : "Ukladaný súbor sa nahral len čiastočne",
+    "No file was uploaded" : "Žiadny súbor nebol uložený",
+    "Missing a temporary folder" : "Chýba dočasný priečinok",
+    "Failed to write to disk" : "Zápis na disk sa nepodaril",
+    "Not enough storage available" : "Nedostatok dostupného úložného priestoru",
+    "Upload failed. Could not find uploaded file" : "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor",
+    "Upload failed. Could not get file info." : "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore.",
+    "Invalid directory." : "Neplatný priečinok.",
+    "Files" : "Súbory",
+    "All files" : "Všetky súbory",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
+    "Total file size {size1} exceeds upload limit {size2}" : "Celková veľkosť súboru {size1} prekračuje upload limit {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
+    "Upload cancelled." : "Odosielanie je zrušené.",
+    "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
+    "URL cannot be empty" : "URL nemôže byť prázdna",
+    "{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",
+    "Error fetching URL" : "Chyba pri načítavaní URL",
+    "Share" : "Zdieľať",
+    "Delete" : "Zmazať",
+    "Disconnect storage" : "Odpojiť úložisko",
+    "Unshare" : "Zrušiť zdieľanie",
+    "Delete permanently" : "Zmazať  trvalo",
+    "Rename" : "Premenovať",
+    "Pending" : "Čaká",
+    "Error moving file." : "Chyba pri presune súboru.",
+    "Error moving file" : "Chyba pri presúvaní súboru",
+    "Error" : "Chyba",
+    "Could not rename file" : "Nemožno premenovať súbor",
+    "Error deleting file." : "Chyba pri mazaní súboru.",
+    "Name" : "Názov",
+    "Size" : "Veľkosť",
+    "Modified" : "Upravené",
+    "_%n folder_::_%n folders_" : ["%n priečinok","%n priečinky","%n priečinkov"],
+    "_%n file_::_%n files_" : ["%n súbor","%n súbory","%n súborov"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" je neplatné meno súboru.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.",
+    "{dirs} and {files}" : "{dirs} a {files}",
+    "%s could not be renamed as it has been deleted" : "%s nebolo možné premenovať, pretože bol zmazaný",
+    "%s could not be renamed" : "%s nemohol byť premenovaný",
+    "Upload (max. %s)" : "Nahrať (max. %s)",
+    "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é:",
+    "Save" : "Uložiť",
+    "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",
+    "From link" : "Z odkazu",
+    "Nothing in here. Upload something!" : "Žiadny súbor. Nahrajte niečo!",
+    "Download" : "Sťahovanie",
+    "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é.",
+    "Currently scanning" : "Prehľadáva sa"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files/l10n/sk_SK.json b/apps/files/l10n/sk_SK.json
new file mode 100644
index 00000000000..a61a5ac06ad
--- /dev/null
+++ b/apps/files/l10n/sk_SK.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Úložisko nie je dostupné",
+    "Storage invalid" : "Úložisko nie je platné",
+    "Unknown error" : "Neznáma chyba",
+    "Could not move %s - File with this name already exists" : "Nie je možné presunúť %s - súbor s týmto menom už existuje",
+    "Could not move %s" : "Nie je možné presunúť %s",
+    "Permission denied" : "Prístup bol odmietnutý",
+    "File name cannot be empty." : "Meno súboru nemôže byť prázdne",
+    "\"%s\" is an invalid file name." : "\"%s\" je neplatné meno súboru.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
+    "The target folder has been moved or deleted." : "Cieľový priečinok bol premiestnený alebo odstránený.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Názov %s už používa priečinok s%. Prosím zvoľte iný názov.",
+    "Not a valid source" : "Neplatný zdroj",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server nie je oprávnený otvárať adresy URL. Overte nastavenia servera.",
+    "The file exceeds your quota by %s" : "Súbor prekračuje vašu kvótu o %s",
+    "Error while downloading %s to %s" : "Chyba pri sťahovaní súboru %s do %s",
+    "Error when creating the file" : "Chyba pri vytváraní súboru",
+    "Folder name cannot be empty." : "Názov priečinka nemôže byť prázdny.",
+    "Error when creating the folder" : "Chyba pri vytváraní priečinka",
+    "Unable to set upload directory." : "Nemožno nastaviť priečinok pre nahrané súbory.",
+    "Invalid Token" : "Neplatný token",
+    "No file was uploaded. Unknown error" : "Žiaden súbor nebol nahraný. Neznáma chyba",
+    "There is no error, the file uploaded with success" : "Nenastala žiadna chyba, súbor bol úspešne nahraný",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Nahraný súbor prekročil limit nastavený v upload_max_filesize v súbore php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.",
+    "The uploaded file was only partially uploaded" : "Ukladaný súbor sa nahral len čiastočne",
+    "No file was uploaded" : "Žiadny súbor nebol uložený",
+    "Missing a temporary folder" : "Chýba dočasný priečinok",
+    "Failed to write to disk" : "Zápis na disk sa nepodaril",
+    "Not enough storage available" : "Nedostatok dostupného úložného priestoru",
+    "Upload failed. Could not find uploaded file" : "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor",
+    "Upload failed. Could not get file info." : "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore.",
+    "Invalid directory." : "Neplatný priečinok.",
+    "Files" : "Súbory",
+    "All files" : "Všetky súbory",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
+    "Total file size {size1} exceeds upload limit {size2}" : "Celková veľkosť súboru {size1} prekračuje upload limit {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
+    "Upload cancelled." : "Odosielanie je zrušené.",
+    "Could not get result from server." : "Nepodarilo sa dostať výsledky zo servera.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
+    "URL cannot be empty" : "URL nemôže byť prázdna",
+    "{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",
+    "Error fetching URL" : "Chyba pri načítavaní URL",
+    "Share" : "Zdieľať",
+    "Delete" : "Zmazať",
+    "Disconnect storage" : "Odpojiť úložisko",
+    "Unshare" : "Zrušiť zdieľanie",
+    "Delete permanently" : "Zmazať  trvalo",
+    "Rename" : "Premenovať",
+    "Pending" : "Čaká",
+    "Error moving file." : "Chyba pri presune súboru.",
+    "Error moving file" : "Chyba pri presúvaní súboru",
+    "Error" : "Chyba",
+    "Could not rename file" : "Nemožno premenovať súbor",
+    "Error deleting file." : "Chyba pri mazaní súboru.",
+    "Name" : "Názov",
+    "Size" : "Veľkosť",
+    "Modified" : "Upravené",
+    "_%n folder_::_%n folders_" : ["%n priečinok","%n priečinky","%n priečinkov"],
+    "_%n file_::_%n files_" : ["%n súbor","%n súbory","%n súborov"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" je neplatné meno súboru.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.",
+    "{dirs} and {files}" : "{dirs} a {files}",
+    "%s could not be renamed as it has been deleted" : "%s nebolo možné premenovať, pretože bol zmazaný",
+    "%s could not be renamed" : "%s nemohol byť premenovaný",
+    "Upload (max. %s)" : "Nahrať (max. %s)",
+    "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é:",
+    "Save" : "Uložiť",
+    "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",
+    "From link" : "Z odkazu",
+    "Nothing in here. Upload something!" : "Žiadny súbor. Nahrajte niečo!",
+    "Download" : "Sťahovanie",
+    "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é.",
+    "Currently scanning" : "Prehľadáva sa"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
deleted file mode 100644
index 23806d87892..00000000000
--- a/apps/files/l10n/sk_SK.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Úložisko nie je dostupné",
-"Storage invalid" => "Úložisko nie je platné",
-"Unknown error" => "Neznáma chyba",
-"Could not move %s - File with this name already exists" => "Nie je možné presunúť %s - súbor s týmto menom už existuje",
-"Could not move %s" => "Nie je možné presunúť %s",
-"Permission denied" => "Prístup bol odmietnutý",
-"File name cannot be empty." => "Meno súboru nemôže byť prázdne",
-"\"%s\" is an invalid file name." => "\"%s\" je neplatné meno súboru.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nesprávne meno, '\\', '/', '<', '>', ':', '\"', '|', '?' a '*' nie sú povolené hodnoty.",
-"The target folder has been moved or deleted." => "Cieľový priečinok bol premiestnený alebo odstránený.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Názov %s už používa priečinok s%. Prosím zvoľte iný názov.",
-"Not a valid source" => "Neplatný zdroj",
-"Server is not allowed to open URLs, please check the server configuration" => "Server nie je oprávnený otvárať adresy URL. Overte nastavenia servera.",
-"The file exceeds your quota by %s" => "Súbor prekračuje vašu kvótu o %s",
-"Error while downloading %s to %s" => "Chyba pri sťahovaní súboru %s do %s",
-"Error when creating the file" => "Chyba pri vytváraní súboru",
-"Folder name cannot be empty." => "Názov priečinka nemôže byť prázdny.",
-"Error when creating the folder" => "Chyba pri vytváraní priečinka",
-"Unable to set upload directory." => "Nemožno nastaviť priečinok pre nahrané súbory.",
-"Invalid Token" => "Neplatný token",
-"No file was uploaded. Unknown error" => "Žiaden súbor nebol nahraný. Neznáma chyba",
-"There is no error, the file uploaded with success" => "Nenastala žiadna chyba, súbor bol úspešne nahraný",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Nahraný súbor prekročil limit nastavený v upload_max_filesize v súbore php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.",
-"The uploaded file was only partially uploaded" => "Ukladaný súbor sa nahral len čiastočne",
-"No file was uploaded" => "Žiadny súbor nebol uložený",
-"Missing a temporary folder" => "Chýba dočasný priečinok",
-"Failed to write to disk" => "Zápis na disk sa nepodaril",
-"Not enough storage available" => "Nedostatok dostupného úložného priestoru",
-"Upload failed. Could not find uploaded file" => "Nahrávanie zlyhalo. Nepodarilo sa nájsť nahrávaný súbor",
-"Upload failed. Could not get file info." => "Nahrávanie zlyhalo. Nepodarilo sa získať informácie o súbore.",
-"Invalid directory." => "Neplatný priečinok.",
-"Files" => "Súbory",
-"All files" => "Všetky súbory",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Nemožno nahrať súbor {filename}, pretože je to priečinok, alebo má 0 bitov",
-"Total file size {size1} exceeds upload limit {size2}" => "Celková veľkosť súboru {size1} prekračuje upload limit {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Nie je dostatok voľného miesta, chcete nahrať {size1} ale k dispozíciji je len {size2}",
-"Upload cancelled." => "Odosielanie je zrušené.",
-"Could not get result from server." => "Nepodarilo sa dostať výsledky zo servera.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
-"URL cannot be empty" => "URL nemôže byť prázdna",
-"{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",
-"Error fetching URL" => "Chyba pri načítavaní URL",
-"Share" => "Zdieľať",
-"Delete" => "Zmazať",
-"Disconnect storage" => "Odpojiť úložisko",
-"Unshare" => "Zrušiť zdieľanie",
-"Delete permanently" => "Zmazať  trvalo",
-"Rename" => "Premenovať",
-"Pending" => "Čaká",
-"Error moving file." => "Chyba pri presune súboru.",
-"Error moving file" => "Chyba pri presúvaní súboru",
-"Error" => "Chyba",
-"Could not rename file" => "Nemožno premenovať súbor",
-"Error deleting file." => "Chyba pri mazaní súboru.",
-"Name" => "Názov",
-"Size" => "Veľkosť",
-"Modified" => "Upravené",
-"_%n folder_::_%n folders_" => array("%n priečinok","%n priečinky","%n priečinkov"),
-"_%n file_::_%n files_" => array("%n súbor","%n súbory","%n súborov"),
-"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_" => array("Nahrávam %n súbor","Nahrávam %n súbory","Nahrávam %n súborov"),
-"\"{name}\" is an invalid file name." => "\"{name}\" je neplatné meno súboru.",
-"Your storage is full, files can not be updated or synced anymore!" => "Vaše úložisko je plné. Súbory nemožno aktualizovať ani synchronizovať!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Vaše úložisko je takmer plné ({usedSpacePercent}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifrovanie bolo zakázané, ale vaše súbory sú stále zašifrované. Prosím, choďte do osobného nastavenia pre dešifrovanie súborov.",
-"{dirs} and {files}" => "{dirs} a {files}",
-"%s could not be renamed as it has been deleted" => "%s nebolo možné premenovať, pretože bol zmazaný",
-"%s could not be renamed" => "%s nemohol byť premenovaný",
-"Upload (max. %s)" => "Nahrať (max. %s)",
-"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é:",
-"Save" => "Uložiť",
-"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",
-"From link" => "Z odkazu",
-"Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
-"Download" => "Sťahovanie",
-"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é.",
-"Currently scanning" => "Prehľadáva sa"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files/l10n/sl.js b/apps/files/l10n/sl.js
new file mode 100644
index 00000000000..6a8bcbe68a6
--- /dev/null
+++ b/apps/files/l10n/sl.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Na voljo ni dovolj prostora",
+    "Storage invalid" : "Določen prostor ni veljaven",
+    "Unknown error" : "Neznana napaka",
+    "Could not move %s - File with this name already exists" : "Datoteke %s ni mogoče premakniti  - datoteka s tem imenom že obstaja.",
+    "Could not move %s" : "Datoteke %s ni mogoče premakniti",
+    "Permission denied" : "Za to opravilo ni ustreznih dovoljenj.",
+    "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.",
+    "\"%s\" is an invalid file name." : "\"%s\" je neveljavno ime datoteke.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
+    "The target folder has been moved or deleted." : "Ciljna mapa je premaknjena ali izbrisana.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Ime %s je že v mapi %s že v uporabi. Izbrati je treba drugo ime.",
+    "Not a valid source" : "Vir ni veljaven",
+    "Server is not allowed to open URLs, please check the server configuration" : "Odpiranje naslovov URL preko strežnika ni dovoljeno. Preverite nastavitve strežnika.",
+    "The file exceeds your quota by %s" : "Datoteka presega omejitev velikosti za %s",
+    "Error while downloading %s to %s" : "Napaka med prejemanjem %s v mapo %s",
+    "Error when creating the file" : "Napaka med ustvarjanjem datoteke",
+    "Folder name cannot be empty." : "Ime mape ne more biti prazna vrednost.",
+    "Error when creating the folder" : "Napaka med ustvarjanjem mape",
+    "Unable to set upload directory." : "Mapo, v katero boste prenašali dokumente, ni mogoče določiti",
+    "Invalid Token" : "Neveljaven žeton",
+    "No file was uploaded. Unknown error" : "Ni poslane datoteke. Neznana napaka.",
+    "There is no error, the file uploaded with success" : "Datoteka je uspešno naložena.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML.",
+    "The uploaded file was only partially uploaded" : "Poslan je le del datoteke.",
+    "No file was uploaded" : "Ni poslane datoteke",
+    "Missing a temporary folder" : "Manjka začasna mapa",
+    "Failed to write to disk" : "Pisanje na disk je spodletelo",
+    "Not enough storage available" : "Na voljo ni dovolj prostora",
+    "Upload failed. Could not find uploaded file" : "Pošiljanje je spodletelo. Ni mogoče najti poslane datoteke.",
+    "Upload failed. Could not get file info." : "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke.",
+    "Invalid directory." : "Neveljavna mapa.",
+    "Files" : "Datoteke",
+    "All files" : "Vse datoteke",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.",
+    "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.",
+    "Upload cancelled." : "Pošiljanje je preklicano.",
+    "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
+    "URL cannot be empty" : "Polje naslova URL ne sme biti prazno",
+    "{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",
+    "Error fetching URL" : "Napaka pridobivanja naslova URL",
+    "Share" : "Souporaba",
+    "Delete" : "Izbriši",
+    "Disconnect storage" : "Odklopi shrambo",
+    "Unshare" : "Prekini souporabo",
+    "Delete permanently" : "Izbriši dokončno",
+    "Rename" : "Preimenuj",
+    "Pending" : "V čakanju ...",
+    "Error moving file." : "Napaka premikanja datoteke.",
+    "Error moving file" : "Napaka premikanja datoteke",
+    "Error" : "Napaka",
+    "Could not rename file" : "Ni mogoče preimenovati datoteke",
+    "Error deleting file." : "Napaka brisanja datoteke.",
+    "Name" : "Ime",
+    "Size" : "Velikost",
+    "Modified" : "Spremenjeno",
+    "_%n folder_::_%n folders_" : ["%n mapa","%n mapi","%n mape","%n map"],
+    "_%n file_::_%n files_" : ["%n datoteka","%n datoteki","%n datoteke","%n datotek"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" je neveljavno ime datoteke.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogočeno, datoteke pa so še vedno šifrirane. Odšifrirajte jih med nastavitvami.",
+    "{dirs} and {files}" : "{dirs} in {files}",
+    "%s could not be renamed as it has been deleted" : "Datoteke %s ni mogoče preimenovati, ker je bila že prej izbrisana.",
+    "%s could not be renamed" : "%s ni mogoče preimenovati",
+    "Upload (max. %s)" : "Pošiljanje (omejitev %s)",
+    "File handling" : "Upravljanje z datotekami",
+    "Maximum upload size" : "Največja velikost za pošiljanja",
+    "max. possible: " : "največ mogoče:",
+    "Save" : "Shrani",
+    "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",
+    "From link" : "Iz povezave",
+    "Nothing in here. Upload something!" : "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!",
+    "Download" : "Prejmi",
+    "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 ...",
+    "Currently scanning" : "Poteka preverjanje"
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/files/l10n/sl.json b/apps/files/l10n/sl.json
new file mode 100644
index 00000000000..c759bd2abfe
--- /dev/null
+++ b/apps/files/l10n/sl.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Na voljo ni dovolj prostora",
+    "Storage invalid" : "Določen prostor ni veljaven",
+    "Unknown error" : "Neznana napaka",
+    "Could not move %s - File with this name already exists" : "Datoteke %s ni mogoče premakniti  - datoteka s tem imenom že obstaja.",
+    "Could not move %s" : "Datoteke %s ni mogoče premakniti",
+    "Permission denied" : "Za to opravilo ni ustreznih dovoljenj.",
+    "File name cannot be empty." : "Ime datoteke ne sme biti prazno polje.",
+    "\"%s\" is an invalid file name." : "\"%s\" je neveljavno ime datoteke.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
+    "The target folder has been moved or deleted." : "Ciljna mapa je premaknjena ali izbrisana.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Ime %s je že v mapi %s že v uporabi. Izbrati je treba drugo ime.",
+    "Not a valid source" : "Vir ni veljaven",
+    "Server is not allowed to open URLs, please check the server configuration" : "Odpiranje naslovov URL preko strežnika ni dovoljeno. Preverite nastavitve strežnika.",
+    "The file exceeds your quota by %s" : "Datoteka presega omejitev velikosti za %s",
+    "Error while downloading %s to %s" : "Napaka med prejemanjem %s v mapo %s",
+    "Error when creating the file" : "Napaka med ustvarjanjem datoteke",
+    "Folder name cannot be empty." : "Ime mape ne more biti prazna vrednost.",
+    "Error when creating the folder" : "Napaka med ustvarjanjem mape",
+    "Unable to set upload directory." : "Mapo, v katero boste prenašali dokumente, ni mogoče določiti",
+    "Invalid Token" : "Neveljaven žeton",
+    "No file was uploaded. Unknown error" : "Ni poslane datoteke. Neznana napaka.",
+    "There is no error, the file uploaded with success" : "Datoteka je uspešno naložena.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML.",
+    "The uploaded file was only partially uploaded" : "Poslan je le del datoteke.",
+    "No file was uploaded" : "Ni poslane datoteke",
+    "Missing a temporary folder" : "Manjka začasna mapa",
+    "Failed to write to disk" : "Pisanje na disk je spodletelo",
+    "Not enough storage available" : "Na voljo ni dovolj prostora",
+    "Upload failed. Could not find uploaded file" : "Pošiljanje je spodletelo. Ni mogoče najti poslane datoteke.",
+    "Upload failed. Could not get file info." : "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke.",
+    "Invalid directory." : "Neveljavna mapa.",
+    "Files" : "Datoteke",
+    "All files" : "Vse datoteke",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.",
+    "Total file size {size1} exceeds upload limit {size2}" : "Skupna velikost {size1} presega omejitev velikosti {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.",
+    "Upload cancelled." : "Pošiljanje je preklicano.",
+    "Could not get result from server." : "Ni mogoče pridobiti podatkov s strežnika.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
+    "URL cannot be empty" : "Polje naslova URL ne sme biti prazno",
+    "{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",
+    "Error fetching URL" : "Napaka pridobivanja naslova URL",
+    "Share" : "Souporaba",
+    "Delete" : "Izbriši",
+    "Disconnect storage" : "Odklopi shrambo",
+    "Unshare" : "Prekini souporabo",
+    "Delete permanently" : "Izbriši dokončno",
+    "Rename" : "Preimenuj",
+    "Pending" : "V čakanju ...",
+    "Error moving file." : "Napaka premikanja datoteke.",
+    "Error moving file" : "Napaka premikanja datoteke",
+    "Error" : "Napaka",
+    "Could not rename file" : "Ni mogoče preimenovati datoteke",
+    "Error deleting file." : "Napaka brisanja datoteke.",
+    "Name" : "Ime",
+    "Size" : "Velikost",
+    "Modified" : "Spremenjeno",
+    "_%n folder_::_%n folders_" : ["%n mapa","%n mapi","%n mape","%n map"],
+    "_%n file_::_%n files_" : ["%n datoteka","%n datoteki","%n datoteke","%n datotek"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" je neveljavno ime datoteke.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)",
+    "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.",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Šifriranje je onemogočeno, datoteke pa so še vedno šifrirane. Odšifrirajte jih med nastavitvami.",
+    "{dirs} and {files}" : "{dirs} in {files}",
+    "%s could not be renamed as it has been deleted" : "Datoteke %s ni mogoče preimenovati, ker je bila že prej izbrisana.",
+    "%s could not be renamed" : "%s ni mogoče preimenovati",
+    "Upload (max. %s)" : "Pošiljanje (omejitev %s)",
+    "File handling" : "Upravljanje z datotekami",
+    "Maximum upload size" : "Največja velikost za pošiljanja",
+    "max. possible: " : "največ mogoče:",
+    "Save" : "Shrani",
+    "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",
+    "From link" : "Iz povezave",
+    "Nothing in here. Upload something!" : "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!",
+    "Download" : "Prejmi",
+    "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 ...",
+    "Currently scanning" : "Poteka preverjanje"
+},"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/l10n/sl.php b/apps/files/l10n/sl.php
deleted file mode 100644
index 4bddb133521..00000000000
--- a/apps/files/l10n/sl.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Na voljo ni dovolj prostora",
-"Storage invalid" => "Določen prostor ni veljaven",
-"Unknown error" => "Neznana napaka",
-"Could not move %s - File with this name already exists" => "Datoteke %s ni mogoče premakniti  - datoteka s tem imenom že obstaja.",
-"Could not move %s" => "Datoteke %s ni mogoče premakniti",
-"Permission denied" => "Za to opravilo ni ustreznih dovoljenj.",
-"File name cannot be empty." => "Ime datoteke ne sme biti prazno polje.",
-"\"%s\" is an invalid file name." => "\"%s\" je neveljavno ime datoteke.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Neveljavno ime; znaki '\\', '/', '<', '>', ':', '\"', '|', '?' in '*' niso dovoljeni.",
-"The target folder has been moved or deleted." => "Ciljna mapa je premaknjena ali izbrisana.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Ime %s je že v mapi %s že v uporabi. Izbrati je treba drugo ime.",
-"Not a valid source" => "Vir ni veljaven",
-"Server is not allowed to open URLs, please check the server configuration" => "Odpiranje naslovov URL preko strežnika ni dovoljeno. Preverite nastavitve strežnika.",
-"The file exceeds your quota by %s" => "Datoteka presega omejitev velikosti za %s",
-"Error while downloading %s to %s" => "Napaka med prejemanjem %s v mapo %s",
-"Error when creating the file" => "Napaka med ustvarjanjem datoteke",
-"Folder name cannot be empty." => "Ime mape ne more biti prazna vrednost.",
-"Error when creating the folder" => "Napaka med ustvarjanjem mape",
-"Unable to set upload directory." => "Mapo, v katero boste prenašali dokumente, ni mogoče določiti",
-"Invalid Token" => "Neveljaven žeton",
-"No file was uploaded. Unknown error" => "Ni poslane datoteke. Neznana napaka.",
-"There is no error, the file uploaded with success" => "Datoteka je uspešno naložena.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Poslana datoteka presega dovoljeno velikost, ki je določena z možnostjo upload_max_filesize v datoteki php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslana datoteka presega velikost, ki jo določa parameter največje dovoljene velikosti v obrazcu HTML.",
-"The uploaded file was only partially uploaded" => "Poslan je le del datoteke.",
-"No file was uploaded" => "Ni poslane datoteke",
-"Missing a temporary folder" => "Manjka začasna mapa",
-"Failed to write to disk" => "Pisanje na disk je spodletelo",
-"Not enough storage available" => "Na voljo ni dovolj prostora",
-"Upload failed. Could not find uploaded file" => "Pošiljanje je spodletelo. Ni mogoče najti poslane datoteke.",
-"Upload failed. Could not get file info." => "Pošiljanje je spodletelo. Ni mogoče pridobiti podrobnosti datoteke.",
-"Invalid directory." => "Neveljavna mapa.",
-"Files" => "Datoteke",
-"All files" => "Vse datoteke",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Ni mogoče poslati datoteke {filename}, saj je to ali mapa ali pa je velikost datoteke 0 bajtov.",
-"Total file size {size1} exceeds upload limit {size2}" => "Skupna velikost {size1} presega omejitev velikosti {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Na voljo ni dovolj prostora. Velikost poslane datoteke je {size1}, na voljo pa je je {size2}.",
-"Upload cancelled." => "Pošiljanje je preklicano.",
-"Could not get result from server." => "Ni mogoče pridobiti podatkov s strežnika.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "V teku je pošiljanje datoteke. Če zapustite to stran zdaj, bo pošiljanje preklicano.",
-"URL cannot be empty" => "Polje naslova URL ne sme biti prazno",
-"{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",
-"Error fetching URL" => "Napaka pridobivanja naslova URL",
-"Share" => "Souporaba",
-"Delete" => "Izbriši",
-"Disconnect storage" => "Odklopi shrambo",
-"Unshare" => "Prekini souporabo",
-"Delete permanently" => "Izbriši dokončno",
-"Rename" => "Preimenuj",
-"Pending" => "V čakanju ...",
-"Error moving file." => "Napaka premikanja datoteke.",
-"Error moving file" => "Napaka premikanja datoteke",
-"Error" => "Napaka",
-"Could not rename file" => "Ni mogoče preimenovati datoteke",
-"Error deleting file." => "Napaka brisanja datoteke.",
-"Name" => "Ime",
-"Size" => "Velikost",
-"Modified" => "Spremenjeno",
-"_%n folder_::_%n folders_" => array("%n mapa","%n mapi","%n mape","%n map"),
-"_%n file_::_%n files_" => array("%n datoteka","%n datoteki","%n datoteke","%n datotek"),
-"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_" => array("Posodabljanje %n datoteke","Posodabljanje %n datotek","Posodabljanje %n datotek","Posodabljanje %n datotek"),
-"\"{name}\" is an invalid file name." => "\"{name}\" je neveljavno ime datoteke.",
-"Your storage is full, files can not be updated or synced anymore!" => "Shramba je povsem napolnjena. Datotek ni več mogoče posodabljati in usklajevati!",
-"Your storage is almost full ({usedSpacePercent}%)" => "Prostor za shranjevanje je skoraj do konca zaseden ({usedSpacePercent}%)",
-"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.",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Šifriranje je onemogočeno, datoteke pa so še vedno šifrirane. Odšifrirajte jih med nastavitvami.",
-"{dirs} and {files}" => "{dirs} in {files}",
-"%s could not be renamed as it has been deleted" => "Datoteke %s ni mogoče preimenovati, ker je bila že prej izbrisana.",
-"%s could not be renamed" => "%s ni mogoče preimenovati",
-"Upload (max. %s)" => "Pošiljanje (omejitev %s)",
-"File handling" => "Upravljanje z datotekami",
-"Maximum upload size" => "Največja velikost za pošiljanja",
-"max. possible: " => "največ mogoče:",
-"Save" => "Shrani",
-"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",
-"From link" => "Iz povezave",
-"Nothing in here. Upload something!" => "Tukaj še ni ničesar. Najprej je treba kakšno datoteko poslati v oblak!",
-"Download" => "Prejmi",
-"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 ...",
-"Currently scanning" => "Poteka preverjanje"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js
new file mode 100644
index 00000000000..14caaa15140
--- /dev/null
+++ b/apps/files/l10n/sq.js
@@ -0,0 +1,62 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Gabim panjohur",
+    "Could not move %s - File with this name already exists" : "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer",
+    "Could not move %s" : "Nuk mund të zhvendoset %s",
+    "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
+    "Unable to set upload directory." : "E pa mundur të vendoset dosja e ngarkimit",
+    "Invalid Token" : "Shenjë e gabuar",
+    "No file was uploaded. Unknown error" : "Asnjë skedar nuk u dërgua. Gabim i pa njohur",
+    "There is no error, the file uploaded with success" : "Skedari u ngarkua me sukses",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Skedari i ngarkuar tejkalon limitin hapsirës së lejuar në php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Skedari i ngarkuar tejlakon vlerën MAX_FILE_SIZE të përcaktuar në formën HTML",
+    "The uploaded file was only partially uploaded" : "Skedari është ngakruar vetëm pjesërisht",
+    "No file was uploaded" : "Asnjë skedar nuk është ngarkuar",
+    "Missing a temporary folder" : "Mungon dosja e përkohshme",
+    "Failed to write to disk" : "Dështoi shkrimi në disk",
+    "Not enough storage available" : "Hapsira e arkivimit e pamjaftueshme",
+    "Invalid directory." : "Dosje e pavlefshme",
+    "Files" : "Skedarë",
+    "Upload cancelled." : "Ngarkimi u anullua",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
+    "URL cannot be empty" : "URL-i nuk mund të jetë bosh",
+    "{new_name} already exists" : "{new_name} është ekzistues ",
+    "Could not create folder" : "I pamundur krijimi i kartelës",
+    "Share" : "Ndaj",
+    "Delete" : "Fshi",
+    "Unshare" : "Hiq ndarjen",
+    "Delete permanently" : "Fshi përfundimisht",
+    "Rename" : "Riemëro",
+    "Pending" : "Në vijim",
+    "Error moving file" : "Gabim lëvizjen dokumentave",
+    "Error" : "Gabim",
+    "Name" : "Emri",
+    "Size" : "Madhësia",
+    "Modified" : "Ndryshuar",
+    "_%n folder_::_%n folders_" : ["%n dosje","%n dosje"],
+    "_%n file_::_%n files_" : ["%n skedar","%n skedarë"],
+    "_Uploading %n file_::_Uploading %n files_" : ["Po ngarkoj %n skedar","Po ngarkoj %n skedarë"],
+    "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}%)",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
+    "{dirs} and {files}" : "{dirs} dhe {files}",
+    "%s could not be renamed" : "Nuk është i mundur riemërtimi i %s",
+    "File handling" : "Trajtimi i Skedarëve",
+    "Maximum upload size" : "Madhësia maksimale e nagarkimit",
+    "max. possible: " : "maks i mundshëm",
+    "Save" : "Ruaj",
+    "WebDAV" : "WebDAV",
+    "New" : "E re",
+    "Text file" : "Skedar tekst",
+    "New folder" : "Dosje e're",
+    "Folder" : "Dosje",
+    "From link" : "Nga lidhja",
+    "Nothing in here. Upload something!" : "Këtu nuk ka asgje. Ngarko dicka",
+    "Download" : "Shkarko",
+    "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."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json
new file mode 100644
index 00000000000..ec666c96ee4
--- /dev/null
+++ b/apps/files/l10n/sq.json
@@ -0,0 +1,60 @@
+{ "translations": {
+    "Unknown error" : "Gabim panjohur",
+    "Could not move %s - File with this name already exists" : "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer",
+    "Could not move %s" : "Nuk mund të zhvendoset %s",
+    "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
+    "Unable to set upload directory." : "E pa mundur të vendoset dosja e ngarkimit",
+    "Invalid Token" : "Shenjë e gabuar",
+    "No file was uploaded. Unknown error" : "Asnjë skedar nuk u dërgua. Gabim i pa njohur",
+    "There is no error, the file uploaded with success" : "Skedari u ngarkua me sukses",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Skedari i ngarkuar tejkalon limitin hapsirës së lejuar në php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Skedari i ngarkuar tejlakon vlerën MAX_FILE_SIZE të përcaktuar në formën HTML",
+    "The uploaded file was only partially uploaded" : "Skedari është ngakruar vetëm pjesërisht",
+    "No file was uploaded" : "Asnjë skedar nuk është ngarkuar",
+    "Missing a temporary folder" : "Mungon dosja e përkohshme",
+    "Failed to write to disk" : "Dështoi shkrimi në disk",
+    "Not enough storage available" : "Hapsira e arkivimit e pamjaftueshme",
+    "Invalid directory." : "Dosje e pavlefshme",
+    "Files" : "Skedarë",
+    "Upload cancelled." : "Ngarkimi u anullua",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
+    "URL cannot be empty" : "URL-i nuk mund të jetë bosh",
+    "{new_name} already exists" : "{new_name} është ekzistues ",
+    "Could not create folder" : "I pamundur krijimi i kartelës",
+    "Share" : "Ndaj",
+    "Delete" : "Fshi",
+    "Unshare" : "Hiq ndarjen",
+    "Delete permanently" : "Fshi përfundimisht",
+    "Rename" : "Riemëro",
+    "Pending" : "Në vijim",
+    "Error moving file" : "Gabim lëvizjen dokumentave",
+    "Error" : "Gabim",
+    "Name" : "Emri",
+    "Size" : "Madhësia",
+    "Modified" : "Ndryshuar",
+    "_%n folder_::_%n folders_" : ["%n dosje","%n dosje"],
+    "_%n file_::_%n files_" : ["%n skedar","%n skedarë"],
+    "_Uploading %n file_::_Uploading %n files_" : ["Po ngarkoj %n skedar","Po ngarkoj %n skedarë"],
+    "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}%)",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
+    "{dirs} and {files}" : "{dirs} dhe {files}",
+    "%s could not be renamed" : "Nuk është i mundur riemërtimi i %s",
+    "File handling" : "Trajtimi i Skedarëve",
+    "Maximum upload size" : "Madhësia maksimale e nagarkimit",
+    "max. possible: " : "maks i mundshëm",
+    "Save" : "Ruaj",
+    "WebDAV" : "WebDAV",
+    "New" : "E re",
+    "Text file" : "Skedar tekst",
+    "New folder" : "Dosje e're",
+    "Folder" : "Dosje",
+    "From link" : "Nga lidhja",
+    "Nothing in here. Upload something!" : "Këtu nuk ka asgje. Ngarko dicka",
+    "Download" : "Shkarko",
+    "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."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/sq.php b/apps/files/l10n/sq.php
deleted file mode 100644
index 5491d820d51..00000000000
--- a/apps/files/l10n/sq.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Gabim panjohur",
-"Could not move %s - File with this name already exists" => "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer",
-"Could not move %s" => "Nuk mund të zhvendoset %s",
-"File name cannot be empty." => "Emri i skedarit nuk mund të jetë bosh.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
-"Unable to set upload directory." => "E pa mundur të vendoset dosja e ngarkimit",
-"Invalid Token" => "Shenjë e gabuar",
-"No file was uploaded. Unknown error" => "Asnjë skedar nuk u dërgua. Gabim i pa njohur",
-"There is no error, the file uploaded with success" => "Skedari u ngarkua me sukses",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Skedari i ngarkuar tejkalon limitin hapsirës së lejuar në php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Skedari i ngarkuar tejlakon vlerën MAX_FILE_SIZE të përcaktuar në formën HTML",
-"The uploaded file was only partially uploaded" => "Skedari është ngakruar vetëm pjesërisht",
-"No file was uploaded" => "Asnjë skedar nuk është ngarkuar",
-"Missing a temporary folder" => "Mungon dosja e përkohshme",
-"Failed to write to disk" => "Dështoi shkrimi në disk",
-"Not enough storage available" => "Hapsira e arkivimit e pamjaftueshme",
-"Invalid directory." => "Dosje e pavlefshme",
-"Files" => "Skedarë",
-"Upload cancelled." => "Ngarkimi u anullua",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
-"URL cannot be empty" => "URL-i nuk mund të jetë bosh",
-"{new_name} already exists" => "{new_name} është ekzistues ",
-"Could not create folder" => "I pamundur krijimi i kartelës",
-"Share" => "Ndaj",
-"Delete" => "Fshi",
-"Unshare" => "Hiq ndarjen",
-"Delete permanently" => "Fshi përfundimisht",
-"Rename" => "Riemëro",
-"Pending" => "Në vijim",
-"Error moving file" => "Gabim lëvizjen dokumentave",
-"Error" => "Gabim",
-"Name" => "Emri",
-"Size" => "Madhësia",
-"Modified" => "Ndryshuar",
-"_%n folder_::_%n folders_" => array("%n dosje","%n dosje"),
-"_%n file_::_%n files_" => array("%n skedar","%n skedarë"),
-"_Uploading %n file_::_Uploading %n files_" => array("Po ngarkoj %n skedar","Po ngarkoj %n skedarë"),
-"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}%)",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
-"{dirs} and {files}" => "{dirs} dhe {files}",
-"%s could not be renamed" => "Nuk është i mundur riemërtimi i %s",
-"File handling" => "Trajtimi i Skedarëve",
-"Maximum upload size" => "Madhësia maksimale e nagarkimit",
-"max. possible: " => "maks i mundshëm",
-"Save" => "Ruaj",
-"WebDAV" => "WebDAV",
-"New" => "E re",
-"Text file" => "Skedar tekst",
-"New folder" => "Dosje e're",
-"Folder" => "Dosje",
-"From link" => "Nga lidhja",
-"Nothing in here. Upload something!" => "Këtu nuk ka asgje. Ngarko dicka",
-"Download" => "Shkarko",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sr.js b/apps/files/l10n/sr.js
new file mode 100644
index 00000000000..a758c833ff5
--- /dev/null
+++ b/apps/files/l10n/sr.js
@@ -0,0 +1,52 @@
+OC.L10N.register(
+    "files",
+    {
+    "Could not move %s - File with this name already exists" : "Не могу да преместим %s – датотека с овим именом већ постоји",
+    "Could not move %s" : "Не могу да преместим %s",
+    "File name cannot be empty." : "Име датотеке не може бити празно.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
+    "No file was uploaded. Unknown error" : "Ниједна датотека није отпремљена услед непознате грешке",
+    "There is no error, the file uploaded with success" : "Није дошло до грешке. Датотека је успешно отпремљена.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу",
+    "The uploaded file was only partially uploaded" : "Датотека је делимично отпремљена",
+    "No file was uploaded" : "Датотека није отпремљена",
+    "Missing a temporary folder" : "Недостаје привремена фасцикла",
+    "Failed to write to disk" : "Не могу да пишем на диск",
+    "Not enough storage available" : "Нема довољно простора",
+    "Invalid directory." : "неисправна фасцикла.",
+    "Files" : "Датотеке",
+    "Upload cancelled." : "Отпремање је прекинуто.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
+    "{new_name} already exists" : "{new_name} већ постоји",
+    "Share" : "Дели",
+    "Delete" : "Обриши",
+    "Unshare" : "Укини дељење",
+    "Delete permanently" : "Обриши за стално",
+    "Rename" : "Преименуј",
+    "Pending" : "На чекању",
+    "Error" : "Грешка",
+    "Name" : "Име",
+    "Size" : "Величина",
+    "Modified" : "Измењено",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "Your storage is full, files can not be updated or synced anymore!" : "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро па пуно ({usedSpacePercent}%)",
+    "File handling" : "Управљање датотекама",
+    "Maximum upload size" : "Највећа величина датотеке",
+    "max. possible: " : "највећа величина:",
+    "Save" : "Сачувај",
+    "WebDAV" : "WebDAV",
+    "New" : "Нова",
+    "Text file" : "текстуална датотека",
+    "Folder" : "фасцикла",
+    "From link" : "Са везе",
+    "Nothing in here. Upload something!" : "Овде нема ничег. Отпремите нешто!",
+    "Download" : "Преузми",
+    "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." : "Скенирам датотеке…"
+},
+"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/l10n/sr.json b/apps/files/l10n/sr.json
new file mode 100644
index 00000000000..a68c3f8ad8d
--- /dev/null
+++ b/apps/files/l10n/sr.json
@@ -0,0 +1,50 @@
+{ "translations": {
+    "Could not move %s - File with this name already exists" : "Не могу да преместим %s – датотека с овим именом већ постоји",
+    "Could not move %s" : "Не могу да преместим %s",
+    "File name cannot be empty." : "Име датотеке не може бити празно.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
+    "No file was uploaded. Unknown error" : "Ниједна датотека није отпремљена услед непознате грешке",
+    "There is no error, the file uploaded with success" : "Није дошло до грешке. Датотека је успешно отпремљена.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу",
+    "The uploaded file was only partially uploaded" : "Датотека је делимично отпремљена",
+    "No file was uploaded" : "Датотека није отпремљена",
+    "Missing a temporary folder" : "Недостаје привремена фасцикла",
+    "Failed to write to disk" : "Не могу да пишем на диск",
+    "Not enough storage available" : "Нема довољно простора",
+    "Invalid directory." : "неисправна фасцикла.",
+    "Files" : "Датотеке",
+    "Upload cancelled." : "Отпремање је прекинуто.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
+    "{new_name} already exists" : "{new_name} већ постоји",
+    "Share" : "Дели",
+    "Delete" : "Обриши",
+    "Unshare" : "Укини дељење",
+    "Delete permanently" : "Обриши за стално",
+    "Rename" : "Преименуј",
+    "Pending" : "На чекању",
+    "Error" : "Грешка",
+    "Name" : "Име",
+    "Size" : "Величина",
+    "Modified" : "Измењено",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "Your storage is full, files can not be updated or synced anymore!" : "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ваше складиште је скоро па пуно ({usedSpacePercent}%)",
+    "File handling" : "Управљање датотекама",
+    "Maximum upload size" : "Највећа величина датотеке",
+    "max. possible: " : "највећа величина:",
+    "Save" : "Сачувај",
+    "WebDAV" : "WebDAV",
+    "New" : "Нова",
+    "Text file" : "текстуална датотека",
+    "Folder" : "фасцикла",
+    "From link" : "Са везе",
+    "Nothing in here. Upload something!" : "Овде нема ничег. Отпремите нешто!",
+    "Download" : "Преузми",
+    "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." : "Скенирам датотеке…"
+},"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/l10n/sr.php b/apps/files/l10n/sr.php
deleted file mode 100644
index 99a98fbd6df..00000000000
--- a/apps/files/l10n/sr.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not move %s - File with this name already exists" => "Не могу да преместим %s – датотека с овим именом већ постоји",
-"Could not move %s" => "Не могу да преместим %s",
-"File name cannot be empty." => "Име датотеке не може бити празно.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Неисправан назив. Следећи знакови нису дозвољени: \\, /, <, >, :, \", |, ? и *.",
-"No file was uploaded. Unknown error" => "Ниједна датотека није отпремљена услед непознате грешке",
-"There is no error, the file uploaded with success" => "Није дошло до грешке. Датотека је успешно отпремљена.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Отпремљена датотека прелази смерницу upload_max_filesize у датотеци php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Отпремљена датотека прелази смерницу MAX_FILE_SIZE која је наведена у HTML обрасцу",
-"The uploaded file was only partially uploaded" => "Датотека је делимично отпремљена",
-"No file was uploaded" => "Датотека није отпремљена",
-"Missing a temporary folder" => "Недостаје привремена фасцикла",
-"Failed to write to disk" => "Не могу да пишем на диск",
-"Not enough storage available" => "Нема довољно простора",
-"Invalid directory." => "неисправна фасцикла.",
-"Files" => "Датотеке",
-"Upload cancelled." => "Отпремање је прекинуто.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Отпремање датотеке је у току. Ако сада напустите страницу, прекинућете отпремање.",
-"{new_name} already exists" => "{new_name} већ постоји",
-"Share" => "Дели",
-"Delete" => "Обриши",
-"Unshare" => "Укини дељење",
-"Delete permanently" => "Обриши за стално",
-"Rename" => "Преименуј",
-"Pending" => "На чекању",
-"Error" => "Грешка",
-"Name" => "Име",
-"Size" => "Величина",
-"Modified" => "Измењено",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше складиште је пуно. Датотеке више не могу бити ажуриране ни синхронизоване.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ваше складиште је скоро па пуно ({usedSpacePercent}%)",
-"File handling" => "Управљање датотекама",
-"Maximum upload size" => "Највећа величина датотеке",
-"max. possible: " => "највећа величина:",
-"Save" => "Сачувај",
-"WebDAV" => "WebDAV",
-"New" => "Нова",
-"Text file" => "текстуална датотека",
-"Folder" => "фасцикла",
-"From link" => "Са везе",
-"Nothing in here. Upload something!" => "Овде нема ничег. Отпремите нешто!",
-"Download" => "Преузми",
-"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." => "Скенирам датотеке…"
-);
-$PLURAL_FORMS = "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/l10n/sr@latin.js b/apps/files/l10n/sr@latin.js
new file mode 100644
index 00000000000..2209b673abd
--- /dev/null
+++ b/apps/files/l10n/sr@latin.js
@@ -0,0 +1,29 @@
+OC.L10N.register(
+    "files",
+    {
+    "There is no error, the file uploaded with success" : "Nema greške, fajl je uspešno poslat",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi",
+    "The uploaded file was only partially uploaded" : "Poslati fajl je samo delimično otpremljen!",
+    "No file was uploaded" : "Nijedan fajl nije poslat",
+    "Missing a temporary folder" : "Nedostaje privremena fascikla",
+    "Files" : "Fajlovi",
+    "Share" : "Podeli",
+    "Delete" : "Obriši",
+    "Unshare" : "Ukljoni deljenje",
+    "Rename" : "Preimenij",
+    "Error" : "Greška",
+    "Name" : "Ime",
+    "Size" : "Veličina",
+    "Modified" : "Zadnja izmena",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "Maximum upload size" : "Maksimalna veličina pošiljke",
+    "Save" : "Snimi",
+    "Folder" : "Direktorijum",
+    "Nothing in here. Upload something!" : "Ovde nema ničeg. Pošaljite nešto!",
+    "Download" : "Preuzmi",
+    "Upload too large" : "Pošiljka je prevelika",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
+},
+"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/l10n/sr@latin.json b/apps/files/l10n/sr@latin.json
new file mode 100644
index 00000000000..f130138bc55
--- /dev/null
+++ b/apps/files/l10n/sr@latin.json
@@ -0,0 +1,27 @@
+{ "translations": {
+    "There is no error, the file uploaded with success" : "Nema greške, fajl je uspešno poslat",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi",
+    "The uploaded file was only partially uploaded" : "Poslati fajl je samo delimično otpremljen!",
+    "No file was uploaded" : "Nijedan fajl nije poslat",
+    "Missing a temporary folder" : "Nedostaje privremena fascikla",
+    "Files" : "Fajlovi",
+    "Share" : "Podeli",
+    "Delete" : "Obriši",
+    "Unshare" : "Ukljoni deljenje",
+    "Rename" : "Preimenij",
+    "Error" : "Greška",
+    "Name" : "Ime",
+    "Size" : "Veličina",
+    "Modified" : "Zadnja izmena",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "Maximum upload size" : "Maksimalna veličina pošiljke",
+    "Save" : "Snimi",
+    "Folder" : "Direktorijum",
+    "Nothing in here. Upload something!" : "Ovde nema ničeg. Pošaljite nešto!",
+    "Download" : "Preuzmi",
+    "Upload too large" : "Pošiljka je prevelika",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
+},"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/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
deleted file mode 100644
index 0eed9d5e154..00000000000
--- a/apps/files/l10n/sr@latin.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"There is no error, the file uploaded with success" => "Nema greške, fajl je uspešno poslat",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Poslati fajl prevazilazi direktivu MAX_FILE_SIZE koja je navedena u HTML formi",
-"The uploaded file was only partially uploaded" => "Poslati fajl je samo delimično otpremljen!",
-"No file was uploaded" => "Nijedan fajl nije poslat",
-"Missing a temporary folder" => "Nedostaje privremena fascikla",
-"Files" => "Fajlovi",
-"Share" => "Podeli",
-"Delete" => "Obriši",
-"Unshare" => "Ukljoni deljenje",
-"Rename" => "Preimenij",
-"Error" => "Greška",
-"Name" => "Ime",
-"Size" => "Veličina",
-"Modified" => "Zadnja izmena",
-"_%n folder_::_%n folders_" => array("","",""),
-"_%n file_::_%n files_" => array("","",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","",""),
-"Maximum upload size" => "Maksimalna veličina pošiljke",
-"Save" => "Snimi",
-"Folder" => "Direktorijum",
-"Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
-"Download" => "Preuzmi",
-"Upload too large" => "Pošiljka je prevelika",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
-);
-$PLURAL_FORMS = "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/l10n/su.js b/apps/files/l10n/su.js
new file mode 100644
index 00000000000..d1bbfca2dd4
--- /dev/null
+++ b/apps/files/l10n/su.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files",
+    {
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/su.json b/apps/files/l10n/su.json
new file mode 100644
index 00000000000..e493054d78a
--- /dev/null
+++ b/apps/files/l10n/su.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/su.php b/apps/files/l10n/su.php
deleted file mode 100644
index 70ab6572ba4..00000000000
--- a/apps/files/l10n/su.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/sv.js b/apps/files/l10n/sv.js
new file mode 100644
index 00000000000..234731fec2b
--- /dev/null
+++ b/apps/files/l10n/sv.js
@@ -0,0 +1,91 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Okänt fel",
+    "Could not move %s - File with this name already exists" : "Kunde inte flytta %s - Det finns redan en fil med detta namn",
+    "Could not move %s" : "Kan inte flytta %s",
+    "File name cannot be empty." : "Filnamn kan inte vara tomt.",
+    "\"%s\" is an invalid file name." : "\"%s\" är ett ogiltigt filnamn.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
+    "The target folder has been moved or deleted." : "Målmappen har flyttats eller tagits bort.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Namnet %s används  redan i katalogen %s. Välj ett annat namn.",
+    "Not a valid source" : "Inte en giltig källa",
+    "Server is not allowed to open URLs, please check the server configuration" : "Servern är inte tillåten att öppna URL:er, vänligen kontrollera server konfigurationen",
+    "Error while downloading %s to %s" : "Fel under nerladdning från %s till %s",
+    "Error when creating the file" : "Fel under skapande utav filen",
+    "Folder name cannot be empty." : "Katalognamn kan ej vara tomt.",
+    "Error when creating the folder" : "Fel under skapande utav en katalog",
+    "Unable to set upload directory." : "Kan inte sätta mapp för uppladdning.",
+    "Invalid Token" : "Ogiltig token",
+    "No file was uploaded. Unknown error" : "Ingen fil uppladdad. Okänt fel",
+    "There is no error, the file uploaded with success" : "Inga fel uppstod. Filen laddades upp utan problem.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
+    "The uploaded file was only partially uploaded" : "Den uppladdade filen var endast delvis uppladdad",
+    "No file was uploaded" : "Ingen fil laddades upp",
+    "Missing a temporary folder" : "En temporär mapp saknas",
+    "Failed to write to disk" : "Misslyckades spara till disk",
+    "Not enough storage available" : "Inte tillräckligt med lagringsutrymme tillgängligt",
+    "Upload failed. Could not find uploaded file" : "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen",
+    "Upload failed. Could not get file info." : "Uppladdning misslyckades. Gick inte att hämta filinformation.",
+    "Invalid directory." : "Felaktig mapp.",
+    "Files" : "Filer",
+    "All files" : "Alla filer",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
+    "Total file size {size1} exceeds upload limit {size2}" : "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
+    "Upload cancelled." : "Uppladdning avbruten.",
+    "Could not get result from server." : "Gick inte att hämta resultat från server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
+    "URL cannot be empty" : "URL kan ej vara tomt",
+    "{new_name} already exists" : "{new_name} finns redan",
+    "Could not create file" : "Kunde ej skapa fil",
+    "Could not create folder" : "Kunde ej skapa katalog",
+    "Error fetching URL" : "Fel vid hämtning av URL",
+    "Share" : "Dela",
+    "Delete" : "Radera",
+    "Unshare" : "Sluta dela",
+    "Delete permanently" : "Radera permanent",
+    "Rename" : "Byt namn",
+    "Pending" : "Väntar",
+    "Error moving file." : "Fel vid flytt av fil.",
+    "Error moving file" : "Fel uppstod vid flyttning av fil",
+    "Error" : "Fel",
+    "Could not rename file" : "Kan ej byta filnamn",
+    "Error deleting file." : "Kunde inte ta bort filen.",
+    "Name" : "Namn",
+    "Size" : "Storlek",
+    "Modified" : "Ändrad",
+    "_%n folder_::_%n folders_" : ["%n mapp","%n mappar"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" är ett ogiltligt filnamn.",
+    "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}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
+    "{dirs} and {files}" : "{dirs} och {files}",
+    "%s could not be renamed" : "%s kunde inte namnändras",
+    "Upload (max. %s)" : "Ladda upp (max. %s)",
+    "File handling" : "Filhantering",
+    "Maximum upload size" : "Maximal storlek att ladda upp",
+    "max. possible: " : "max. möjligt:",
+    "Save" : "Spara",
+    "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",
+    "From link" : "Från länk",
+    "Nothing in here. Upload something!" : "Ingenting här. Ladda upp något!",
+    "Download" : "Ladda ner",
+    "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",
+    "Currently scanning" : "sökning pågår"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/sv.json b/apps/files/l10n/sv.json
new file mode 100644
index 00000000000..36aa5d5984f
--- /dev/null
+++ b/apps/files/l10n/sv.json
@@ -0,0 +1,89 @@
+{ "translations": {
+    "Unknown error" : "Okänt fel",
+    "Could not move %s - File with this name already exists" : "Kunde inte flytta %s - Det finns redan en fil med detta namn",
+    "Could not move %s" : "Kan inte flytta %s",
+    "File name cannot be empty." : "Filnamn kan inte vara tomt.",
+    "\"%s\" is an invalid file name." : "\"%s\" är ett ogiltigt filnamn.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
+    "The target folder has been moved or deleted." : "Målmappen har flyttats eller tagits bort.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Namnet %s används  redan i katalogen %s. Välj ett annat namn.",
+    "Not a valid source" : "Inte en giltig källa",
+    "Server is not allowed to open URLs, please check the server configuration" : "Servern är inte tillåten att öppna URL:er, vänligen kontrollera server konfigurationen",
+    "Error while downloading %s to %s" : "Fel under nerladdning från %s till %s",
+    "Error when creating the file" : "Fel under skapande utav filen",
+    "Folder name cannot be empty." : "Katalognamn kan ej vara tomt.",
+    "Error when creating the folder" : "Fel under skapande utav en katalog",
+    "Unable to set upload directory." : "Kan inte sätta mapp för uppladdning.",
+    "Invalid Token" : "Ogiltig token",
+    "No file was uploaded. Unknown error" : "Ingen fil uppladdad. Okänt fel",
+    "There is no error, the file uploaded with success" : "Inga fel uppstod. Filen laddades upp utan problem.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
+    "The uploaded file was only partially uploaded" : "Den uppladdade filen var endast delvis uppladdad",
+    "No file was uploaded" : "Ingen fil laddades upp",
+    "Missing a temporary folder" : "En temporär mapp saknas",
+    "Failed to write to disk" : "Misslyckades spara till disk",
+    "Not enough storage available" : "Inte tillräckligt med lagringsutrymme tillgängligt",
+    "Upload failed. Could not find uploaded file" : "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen",
+    "Upload failed. Could not get file info." : "Uppladdning misslyckades. Gick inte att hämta filinformation.",
+    "Invalid directory." : "Felaktig mapp.",
+    "Files" : "Filer",
+    "All files" : "Alla filer",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
+    "Total file size {size1} exceeds upload limit {size2}" : "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
+    "Upload cancelled." : "Uppladdning avbruten.",
+    "Could not get result from server." : "Gick inte att hämta resultat från server.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
+    "URL cannot be empty" : "URL kan ej vara tomt",
+    "{new_name} already exists" : "{new_name} finns redan",
+    "Could not create file" : "Kunde ej skapa fil",
+    "Could not create folder" : "Kunde ej skapa katalog",
+    "Error fetching URL" : "Fel vid hämtning av URL",
+    "Share" : "Dela",
+    "Delete" : "Radera",
+    "Unshare" : "Sluta dela",
+    "Delete permanently" : "Radera permanent",
+    "Rename" : "Byt namn",
+    "Pending" : "Väntar",
+    "Error moving file." : "Fel vid flytt av fil.",
+    "Error moving file" : "Fel uppstod vid flyttning av fil",
+    "Error" : "Fel",
+    "Could not rename file" : "Kan ej byta filnamn",
+    "Error deleting file." : "Kunde inte ta bort filen.",
+    "Name" : "Namn",
+    "Size" : "Storlek",
+    "Modified" : "Ändrad",
+    "_%n folder_::_%n folders_" : ["%n mapp","%n mappar"],
+    "_%n file_::_%n files_" : ["%n fil","%n filer"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" är ett ogiltligt filnamn.",
+    "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}%)",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
+    "{dirs} and {files}" : "{dirs} och {files}",
+    "%s could not be renamed" : "%s kunde inte namnändras",
+    "Upload (max. %s)" : "Ladda upp (max. %s)",
+    "File handling" : "Filhantering",
+    "Maximum upload size" : "Maximal storlek att ladda upp",
+    "max. possible: " : "max. möjligt:",
+    "Save" : "Spara",
+    "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",
+    "From link" : "Från länk",
+    "Nothing in here. Upload something!" : "Ingenting här. Ladda upp något!",
+    "Download" : "Ladda ner",
+    "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",
+    "Currently scanning" : "sökning pågår"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
deleted file mode 100644
index 953946f3809..00000000000
--- a/apps/files/l10n/sv.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Okänt fel",
-"Could not move %s - File with this name already exists" => "Kunde inte flytta %s - Det finns redan en fil med detta namn",
-"Could not move %s" => "Kan inte flytta %s",
-"File name cannot be empty." => "Filnamn kan inte vara tomt.",
-"\"%s\" is an invalid file name." => "\"%s\" är ett ogiltigt filnamn.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Ogiltigt namn, '\\', '/', '<', '>', ':', '\"', '|', '?' och '*' är inte tillåtet.",
-"The target folder has been moved or deleted." => "Målmappen har flyttats eller tagits bort.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Namnet %s används  redan i katalogen %s. Välj ett annat namn.",
-"Not a valid source" => "Inte en giltig källa",
-"Server is not allowed to open URLs, please check the server configuration" => "Servern är inte tillåten att öppna URL:er, vänligen kontrollera server konfigurationen",
-"Error while downloading %s to %s" => "Fel under nerladdning från %s till %s",
-"Error when creating the file" => "Fel under skapande utav filen",
-"Folder name cannot be empty." => "Katalognamn kan ej vara tomt.",
-"Error when creating the folder" => "Fel under skapande utav en katalog",
-"Unable to set upload directory." => "Kan inte sätta mapp för uppladdning.",
-"Invalid Token" => "Ogiltig token",
-"No file was uploaded. Unknown error" => "Ingen fil uppladdad. Okänt fel",
-"There is no error, the file uploaded with success" => "Inga fel uppstod. Filen laddades upp utan problem.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Den uppladdade filen överskrider upload_max_filesize direktivet php.ini:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Den uppladdade filen överskrider MAX_FILE_SIZE direktivet som har angetts i HTML formuläret",
-"The uploaded file was only partially uploaded" => "Den uppladdade filen var endast delvis uppladdad",
-"No file was uploaded" => "Ingen fil laddades upp",
-"Missing a temporary folder" => "En temporär mapp saknas",
-"Failed to write to disk" => "Misslyckades spara till disk",
-"Not enough storage available" => "Inte tillräckligt med lagringsutrymme tillgängligt",
-"Upload failed. Could not find uploaded file" => "Uppladdning misslyckades. Kunde inte hitta den uppladdade filen",
-"Upload failed. Could not get file info." => "Uppladdning misslyckades. Gick inte att hämta filinformation.",
-"Invalid directory." => "Felaktig mapp.",
-"Files" => "Filer",
-"All files" => "Alla filer",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Kan inte ladda upp {filename} eftersom den antingen är en mapp eller har 0 bytes.",
-"Total file size {size1} exceeds upload limit {size2}" => "Totala filstorleken {size1} överskrider uppladdningsgränsen {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Inte tillräckligt med ledigt utrymme, du laddar upp {size1} men endast {size2} finns kvar.",
-"Upload cancelled." => "Uppladdning avbruten.",
-"Could not get result from server." => "Gick inte att hämta resultat från server.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
-"URL cannot be empty" => "URL kan ej vara tomt",
-"{new_name} already exists" => "{new_name} finns redan",
-"Could not create file" => "Kunde ej skapa fil",
-"Could not create folder" => "Kunde ej skapa katalog",
-"Error fetching URL" => "Fel vid hämtning av URL",
-"Share" => "Dela",
-"Delete" => "Radera",
-"Unshare" => "Sluta dela",
-"Delete permanently" => "Radera permanent",
-"Rename" => "Byt namn",
-"Pending" => "Väntar",
-"Error moving file." => "Fel vid flytt av fil.",
-"Error moving file" => "Fel uppstod vid flyttning av fil",
-"Error" => "Fel",
-"Could not rename file" => "Kan ej byta filnamn",
-"Error deleting file." => "Kunde inte ta bort filen.",
-"Name" => "Namn",
-"Size" => "Storlek",
-"Modified" => "Ändrad",
-"_%n folder_::_%n folders_" => array("%n mapp","%n mappar"),
-"_%n file_::_%n files_" => array("%n fil","%n filer"),
-"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_" => array("Laddar upp %n fil","Laddar upp %n filer"),
-"\"{name}\" is an invalid file name." => "\"{name}\" är ett ogiltligt filnamn.",
-"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}%)",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Kryptering inaktiverades men dina filer är fortfarande krypterade. Vänligen gå till sidan för dina personliga inställningar för att dekryptera dina filer.",
-"{dirs} and {files}" => "{dirs} och {files}",
-"%s could not be renamed" => "%s kunde inte namnändras",
-"Upload (max. %s)" => "Ladda upp (max. %s)",
-"File handling" => "Filhantering",
-"Maximum upload size" => "Maximal storlek att ladda upp",
-"max. possible: " => "max. möjligt:",
-"Save" => "Spara",
-"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",
-"From link" => "Från länk",
-"Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
-"Download" => "Ladda ner",
-"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",
-"Currently scanning" => "sökning pågår"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/sw_KE.js b/apps/files/l10n/sw_KE.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/sw_KE.js
@@ -0,0 +1,8 @@
+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/sw_KE.json b/apps/files/l10n/sw_KE.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/sw_KE.json
@@ -0,0 +1,6 @@
+{ "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/sw_KE.php b/apps/files/l10n/sw_KE.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/sw_KE.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_IN.js b/apps/files/l10n/ta_IN.js
new file mode 100644
index 00000000000..b7aaa25ee52
--- /dev/null
+++ b/apps/files/l10n/ta_IN.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files",
+    {
+    "Files" : "கோப்புகள்",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "New folder" : "புதிய கோப்புறை"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ta_IN.json b/apps/files/l10n/ta_IN.json
new file mode 100644
index 00000000000..955320c6c94
--- /dev/null
+++ b/apps/files/l10n/ta_IN.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Files" : "கோப்புகள்",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "New folder" : "புதிய கோப்புறை"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ta_IN.php b/apps/files/l10n/ta_IN.php
deleted file mode 100644
index 8266e21a44e..00000000000
--- a/apps/files/l10n/ta_IN.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Files" => "கோப்புகள்",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"New folder" => "புதிய கோப்புறை"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ta_LK.js b/apps/files/l10n/ta_LK.js
new file mode 100644
index 00000000000..2014dd6ceb9
--- /dev/null
+++ b/apps/files/l10n/ta_LK.js
@@ -0,0 +1,42 @@
+OC.L10N.register(
+    "files",
+    {
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
+    "No file was uploaded. Unknown error" : "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு",
+    "There is no error, the file uploaded with success" : "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது",
+    "The uploaded file was only partially uploaded" : "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது",
+    "No file was uploaded" : "எந்த கோப்பும் பதிவேற்றப்படவில்லை",
+    "Missing a temporary folder" : "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை",
+    "Failed to write to disk" : "வட்டில் எழுத முடியவில்லை",
+    "Files" : "கோப்புகள்",
+    "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
+    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
+    "Share" : "பகிர்வு",
+    "Delete" : "நீக்குக",
+    "Unshare" : "பகிரப்படாதது",
+    "Rename" : "பெயர்மாற்றம்",
+    "Pending" : "நிலுவையிலுள்ள",
+    "Error" : "வழு",
+    "Name" : "பெயர்",
+    "Size" : "அளவு",
+    "Modified" : "மாற்றப்பட்டது",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "கோப்பு கையாளுதல்",
+    "Maximum upload size" : "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
+    "max. possible: " : "ஆகக் கூடியது:",
+    "Save" : "சேமிக்க ",
+    "New" : "புதிய",
+    "Text file" : "கோப்பு உரை",
+    "Folder" : "கோப்புறை",
+    "From link" : "இணைப்பிலிருந்து",
+    "Nothing in here. Upload something!" : "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",
+    "Download" : "பதிவிறக்குக",
+    "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." : "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ta_LK.json b/apps/files/l10n/ta_LK.json
new file mode 100644
index 00000000000..c8426f9eb32
--- /dev/null
+++ b/apps/files/l10n/ta_LK.json
@@ -0,0 +1,40 @@
+{ "translations": {
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
+    "No file was uploaded. Unknown error" : "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு",
+    "There is no error, the file uploaded with success" : "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது",
+    "The uploaded file was only partially uploaded" : "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது",
+    "No file was uploaded" : "எந்த கோப்பும் பதிவேற்றப்படவில்லை",
+    "Missing a temporary folder" : "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை",
+    "Failed to write to disk" : "வட்டில் எழுத முடியவில்லை",
+    "Files" : "கோப்புகள்",
+    "Upload cancelled." : "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
+    "{new_name} already exists" : "{new_name} ஏற்கனவே உள்ளது",
+    "Share" : "பகிர்வு",
+    "Delete" : "நீக்குக",
+    "Unshare" : "பகிரப்படாதது",
+    "Rename" : "பெயர்மாற்றம்",
+    "Pending" : "நிலுவையிலுள்ள",
+    "Error" : "வழு",
+    "Name" : "பெயர்",
+    "Size" : "அளவு",
+    "Modified" : "மாற்றப்பட்டது",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "File handling" : "கோப்பு கையாளுதல்",
+    "Maximum upload size" : "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
+    "max. possible: " : "ஆகக் கூடியது:",
+    "Save" : "சேமிக்க ",
+    "New" : "புதிய",
+    "Text file" : "கோப்பு உரை",
+    "Folder" : "கோப்புறை",
+    "From link" : "இணைப்பிலிருந்து",
+    "Nothing in here. Upload something!" : "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",
+    "Download" : "பதிவிறக்குக",
+    "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." : "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
deleted file mode 100644
index d492b0ae399..00000000000
--- a/apps/files/l10n/ta_LK.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "செல்லுபடியற்ற பெயர்,'\\', '/', '<', '>', ':', '\"', '|', '?' மற்றும் '*' ஆகியன அனுமதிக்கப்படமாட்டாது.",
-"No file was uploaded. Unknown error" => "ஒரு கோப்பும் பதிவேற்றப்படவில்லை. அறியப்படாத வழு",
-"There is no error, the file uploaded with success" => "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது",
-"The uploaded file was only partially uploaded" => "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது",
-"No file was uploaded" => "எந்த கோப்பும் பதிவேற்றப்படவில்லை",
-"Missing a temporary folder" => "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை",
-"Failed to write to disk" => "வட்டில் எழுத முடியவில்லை",
-"Files" => "கோப்புகள்",
-"Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
-"File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
-"{new_name} already exists" => "{new_name} ஏற்கனவே உள்ளது",
-"Share" => "பகிர்வு",
-"Delete" => "நீக்குக",
-"Unshare" => "பகிரப்படாதது",
-"Rename" => "பெயர்மாற்றம்",
-"Pending" => "நிலுவையிலுள்ள",
-"Error" => "வழு",
-"Name" => "பெயர்",
-"Size" => "அளவு",
-"Modified" => "மாற்றப்பட்டது",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"File handling" => "கோப்பு கையாளுதல்",
-"Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
-"max. possible: " => "ஆகக் கூடியது:",
-"Save" => "சேமிக்க ",
-"New" => "புதிய",
-"Text file" => "கோப்பு உரை",
-"Folder" => "கோப்புறை",
-"From link" => "இணைப்பிலிருந்து",
-"Nothing in here. Upload something!" => "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",
-"Download" => "பதிவிறக்குக",
-"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." => "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/te.js b/apps/files/l10n/te.js
new file mode 100644
index 00000000000..2d0a3ed3d9a
--- /dev/null
+++ b/apps/files/l10n/te.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "files",
+    {
+    "Delete" : "తొలగించు",
+    "Delete permanently" : "శాశ్వతంగా తొలగించు",
+    "Error" : "పొరపాటు",
+    "Name" : "పేరు",
+    "Size" : "పరిమాణం",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "భద్రపరచు",
+    "New folder" : "కొత్త సంచయం",
+    "Folder" : "సంచయం"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/te.json b/apps/files/l10n/te.json
new file mode 100644
index 00000000000..efa952f212a
--- /dev/null
+++ b/apps/files/l10n/te.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Delete" : "తొలగించు",
+    "Delete permanently" : "శాశ్వతంగా తొలగించు",
+    "Error" : "పొరపాటు",
+    "Name" : "పేరు",
+    "Size" : "పరిమాణం",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "భద్రపరచు",
+    "New folder" : "కొత్త సంచయం",
+    "Folder" : "సంచయం"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/te.php b/apps/files/l10n/te.php
deleted file mode 100644
index ac70a956c08..00000000000
--- a/apps/files/l10n/te.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "తొలగించు",
-"Delete permanently" => "శాశ్వతంగా తొలగించు",
-"Error" => "పొరపాటు",
-"Name" => "పేరు",
-"Size" => "పరిమాణం",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "భద్రపరచు",
-"New folder" => "కొత్త సంచయం",
-"Folder" => "సంచయం"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/tg_TJ.js b/apps/files/l10n/tg_TJ.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/tg_TJ.js
@@ -0,0 +1,8 @@
+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/tg_TJ.json b/apps/files/l10n/tg_TJ.json
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/tg_TJ.json
@@ -0,0 +1,6 @@
+{ "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/tg_TJ.php b/apps/files/l10n/tg_TJ.php
deleted file mode 100644
index 0157af093e9..00000000000
--- a/apps/files/l10n/tg_TJ.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/th_TH.js b/apps/files/l10n/th_TH.js
new file mode 100644
index 00000000000..039d4562a7a
--- /dev/null
+++ b/apps/files/l10n/th_TH.js
@@ -0,0 +1,53 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
+    "Could not move %s - File with this name already exists" : "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
+    "Could not move %s" : "ไม่สามารถย้าย %s ได้",
+    "File name cannot be empty." : "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
+    "No file was uploaded. Unknown error" : "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
+    "There is no error, the file uploaded with success" : "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML",
+    "The uploaded file was only partially uploaded" : "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น",
+    "No file was uploaded" : "ไม่มีไฟล์ที่ถูกอัพโหลด",
+    "Missing a temporary folder" : "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
+    "Failed to write to disk" : "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
+    "Not enough storage available" : "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
+    "Invalid directory." : "ไดเร็กทอรี่ไม่ถูกต้อง",
+    "Files" : "ไฟล์",
+    "Upload cancelled." : "การอัพโหลดถูกยกเลิก",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
+    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
+    "Share" : "แชร์",
+    "Delete" : "ลบ",
+    "Unshare" : "ยกเลิกการแชร์",
+    "Rename" : "เปลี่ยนชื่อ",
+    "Pending" : "อยู่ระหว่างดำเนินการ",
+    "Error" : "ข้อผิดพลาด",
+    "Name" : "ชื่อ",
+    "Size" : "ขนาด",
+    "Modified" : "แก้ไขแล้ว",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Your storage is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป",
+    "Your storage is almost full ({usedSpacePercent}%)" : "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)",
+    "File handling" : "การจัดกาไฟล์",
+    "Maximum upload size" : "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
+    "max. possible: " : "จำนวนสูงสุดที่สามารถทำได้: ",
+    "Save" : "บันทึก",
+    "WebDAV" : "WebDAV",
+    "New" : "อัพโหลดไฟล์ใหม่",
+    "Text file" : "ไฟล์ข้อความ",
+    "New folder" : "โฟลเดอร์ใหม่",
+    "Folder" : "แฟ้มเอกสาร",
+    "From link" : "จากลิงก์",
+    "Nothing in here. Upload something!" : "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
+    "Download" : "ดาวน์โหลด",
+    "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." : "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/th_TH.json b/apps/files/l10n/th_TH.json
new file mode 100644
index 00000000000..bd4afed4aec
--- /dev/null
+++ b/apps/files/l10n/th_TH.json
@@ -0,0 +1,51 @@
+{ "translations": {
+    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
+    "Could not move %s - File with this name already exists" : "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
+    "Could not move %s" : "ไม่สามารถย้าย %s ได้",
+    "File name cannot be empty." : "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
+    "No file was uploaded. Unknown error" : "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
+    "There is no error, the file uploaded with success" : "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML",
+    "The uploaded file was only partially uploaded" : "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น",
+    "No file was uploaded" : "ไม่มีไฟล์ที่ถูกอัพโหลด",
+    "Missing a temporary folder" : "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
+    "Failed to write to disk" : "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
+    "Not enough storage available" : "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
+    "Invalid directory." : "ไดเร็กทอรี่ไม่ถูกต้อง",
+    "Files" : "ไฟล์",
+    "Upload cancelled." : "การอัพโหลดถูกยกเลิก",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
+    "{new_name} already exists" : "{new_name} มีอยู่แล้วในระบบ",
+    "Share" : "แชร์",
+    "Delete" : "ลบ",
+    "Unshare" : "ยกเลิกการแชร์",
+    "Rename" : "เปลี่ยนชื่อ",
+    "Pending" : "อยู่ระหว่างดำเนินการ",
+    "Error" : "ข้อผิดพลาด",
+    "Name" : "ชื่อ",
+    "Size" : "ขนาด",
+    "Modified" : "แก้ไขแล้ว",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Your storage is full, files can not be updated or synced anymore!" : "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป",
+    "Your storage is almost full ({usedSpacePercent}%)" : "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)",
+    "File handling" : "การจัดกาไฟล์",
+    "Maximum upload size" : "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
+    "max. possible: " : "จำนวนสูงสุดที่สามารถทำได้: ",
+    "Save" : "บันทึก",
+    "WebDAV" : "WebDAV",
+    "New" : "อัพโหลดไฟล์ใหม่",
+    "Text file" : "ไฟล์ข้อความ",
+    "New folder" : "โฟลเดอร์ใหม่",
+    "Folder" : "แฟ้มเอกสาร",
+    "From link" : "จากลิงก์",
+    "Nothing in here. Upload something!" : "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
+    "Download" : "ดาวน์โหลด",
+    "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." : "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
deleted file mode 100644
index ebe9b5aed73..00000000000
--- a/apps/files/l10n/th_TH.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-"Could not move %s - File with this name already exists" => "ไม่สามารถย้าย %s ได้ - ไฟล์ที่ใช้ชื่อนี้มีอยู่แล้ว",
-"Could not move %s" => "ไม่สามารถย้าย %s ได้",
-"File name cannot be empty." => "ชื่อไฟล์ไม่สามารถเว้นว่างได้",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง, '\\', '/', '<', '>', ':', '\"', '|', '?' และ '*' ไม่ได้รับอนุญาตให้ใช้งานได้",
-"No file was uploaded. Unknown error" => "ยังไม่มีไฟล์ใดที่ถูกอัพโหลด เกิดข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-"There is no error, the file uploaded with success" => "ไม่พบข้อผิดพลาดใดๆ, ไฟล์ถูกอัพโหลดเรียบร้อยแล้ว",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "ขนาดไฟล์ที่อัพโหลดมีขนาดเกิน upload_max_filesize ที่ระบุไว้ใน php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ไฟล์ที่อัพโหลดมีขนาดไฟล์ใหญ่เกินจำนวนที่กำหนดไว้ในคำสั่ง MAX_FILE_SIZE ที่ถูกระบุไว้ในรูปแบบของ HTML",
-"The uploaded file was only partially uploaded" => "ไฟล์ถูกอัพโหลดได้เพียงบางส่วนเท่านั้น",
-"No file was uploaded" => "ไม่มีไฟล์ที่ถูกอัพโหลด",
-"Missing a temporary folder" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
-"Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
-"Not enough storage available" => "เหลือพื้นที่ไม่เพียงสำหรับใช้งาน",
-"Invalid directory." => "ไดเร็กทอรี่ไม่ถูกต้อง",
-"Files" => "ไฟล์",
-"Upload cancelled." => "การอัพโหลดถูกยกเลิก",
-"File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
-"{new_name} already exists" => "{new_name} มีอยู่แล้วในระบบ",
-"Share" => "แชร์",
-"Delete" => "ลบ",
-"Unshare" => "ยกเลิกการแชร์",
-"Rename" => "เปลี่ยนชื่อ",
-"Pending" => "อยู่ระหว่างดำเนินการ",
-"Error" => "ข้อผิดพลาด",
-"Name" => "ชื่อ",
-"Size" => "ขนาด",
-"Modified" => "แก้ไขแล้ว",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"Your storage is full, files can not be updated or synced anymore!" => "พื้นที่จัดเก็บข้อมูลของคุณเต็มแล้ว ไม่สามารถอัพเดทหรือผสานไฟล์ต่างๆได้อีกต่อไป",
-"Your storage is almost full ({usedSpacePercent}%)" => "พื้นที่จัดเก็บข้อมูลของคุณใกล้เต็มแล้ว ({usedSpacePercent}%)",
-"File handling" => "การจัดกาไฟล์",
-"Maximum upload size" => "ขนาดไฟล์สูงสุดที่อัพโหลดได้",
-"max. possible: " => "จำนวนสูงสุดที่สามารถทำได้: ",
-"Save" => "บันทึก",
-"WebDAV" => "WebDAV",
-"New" => "อัพโหลดไฟล์ใหม่",
-"Text file" => "ไฟล์ข้อความ",
-"New folder" => "โฟลเดอร์ใหม่",
-"Folder" => "แฟ้มเอกสาร",
-"From link" => "จากลิงก์",
-"Nothing in here. Upload something!" => "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!",
-"Download" => "ดาวน์โหลด",
-"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." => "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/tl_PH.js b/apps/files/l10n/tl_PH.js
new file mode 100644
index 00000000000..f085469f731
--- /dev/null
+++ b/apps/files/l10n/tl_PH.js
@@ -0,0 +1,8 @@
+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/tl_PH.json b/apps/files/l10n/tl_PH.json
new file mode 100644
index 00000000000..ba9792477cd
--- /dev/null
+++ b/apps/files/l10n/tl_PH.json
@@ -0,0 +1,6 @@
+{ "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/tl_PH.php b/apps/files/l10n/tl_PH.php
deleted file mode 100644
index 3c711e6b78a..00000000000
--- a/apps/files/l10n/tl_PH.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/tr.js b/apps/files/l10n/tr.js
new file mode 100644
index 00000000000..81eaf632112
--- /dev/null
+++ b/apps/files/l10n/tr.js
@@ -0,0 +1,97 @@
+OC.L10N.register(
+    "files",
+    {
+    "Storage not available" : "Depolama mevcut değil",
+    "Storage invalid" : "Depolama geçersiz",
+    "Unknown error" : "Bilinmeyen hata",
+    "Could not move %s - File with this name already exists" : "%s taşınamadı. Bu isimde dosya zaten mevcut",
+    "Could not move %s" : "%s taşınamadı",
+    "Permission denied" : "Erişim reddedildi",
+    "File name cannot be empty." : "Dosya adı boş olamaz.",
+    "\"%s\" is an invalid file name." : "\"%s\" geçersiz bir dosya adı.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Geçersiz isim. '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
+    "The target folder has been moved or deleted." : "Hedef klasör taşındı veya silindi.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "%s ismi zaten %s klasöründe kullanılıyor. Lütfen farklı bir isim seçin.",
+    "Not a valid source" : "Geçerli bir kaynak değil",
+    "Server is not allowed to open URLs, please check the server configuration" : "Sunucunun adresleri açma izni yok, lütfen sunucu yapılandırmasını denetleyin",
+    "The file exceeds your quota by %s" : "Dosya, kotanızı %s aşıyor",
+    "Error while downloading %s to %s" : "%s, %s içine indirilirken hata",
+    "Error when creating the file" : "Dosya oluşturulurken hata",
+    "Folder name cannot be empty." : "Klasör adı boş olamaz.",
+    "Error when creating the folder" : "Klasör oluşturulurken hata",
+    "Unable to set upload directory." : "Yükleme dizini ayarlanamadı.",
+    "Invalid Token" : "Geçersiz Belirteç",
+    "No file was uploaded. Unknown error" : "Dosya yüklenmedi. Bilinmeyen hata",
+    "There is no error, the file uploaded with success" : "Dosya başarıyla yüklendi, hata oluşmadı",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
+    "The uploaded file was only partially uploaded" : "Dosya karşıya kısmen yüklenebildi",
+    "No file was uploaded" : "Hiç dosya gönderilmedi",
+    "Missing a temporary folder" : "Geçici bir dizin eksik",
+    "Failed to write to disk" : "Diske yazılamadı",
+    "Not enough storage available" : "Yeterli disk alanı yok",
+    "Upload failed. Could not find uploaded file" : "Yükleme başarısız. Yüklenen dosya bulunamadı",
+    "Upload failed. Could not get file info." : "Yükleme başarısız. Dosya bilgisi alınamadı.",
+    "Invalid directory." : "Geçersiz dizin.",
+    "Files" : "Dosyalar",
+    "All files" : "Tüm dosyalar",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi",
+    "Total file size {size1} exceeds upload limit {size2}" : "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut",
+    "Upload cancelled." : "Yükleme iptal edildi.",
+    "Could not get result from server." : "Sunucudan sonuç alınamadı.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
+    "URL cannot be empty" : "URL boş olamaz",
+    "{new_name} already exists" : "{new_name} zaten mevcut",
+    "Could not create file" : "Dosya oluşturulamadı",
+    "Could not create folder" : "Klasör oluşturulamadı",
+    "Error fetching URL" : "Adres getirilirken hata",
+    "Share" : "Paylaş",
+    "Delete" : "Sil",
+    "Disconnect storage" : "Depolama bağlantısını kes",
+    "Unshare" : "Paylaşmayı Kaldır",
+    "Delete permanently" : "Kalıcı olarak sil",
+    "Rename" : "Yeniden adlandır",
+    "Pending" : "Bekliyor",
+    "Error moving file." : "Dosya taşıma hatası.",
+    "Error moving file" : "Dosya taşıma hatası",
+    "Error" : "Hata",
+    "Could not rename file" : "Dosya adlandırılamadı",
+    "Error deleting file." : "Dosya silinirken hata.",
+    "Name" : "İsim",
+    "Size" : "Boyut",
+    "Modified" : "Değiştirilme",
+    "_%n folder_::_%n folders_" : ["%n dizin","%n dizin"],
+    "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" geçersiz bir dosya adı.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin.",
+    "{dirs} and {files}" : "{dirs} ve {files}",
+    "%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)",
+    "File handling" : "Dosya işlemleri",
+    "Maximum upload size" : "Azami yükleme boyutu",
+    "max. possible: " : "mümkün olan en fazla: ",
+    "Save" : "Kaydet",
+    "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",
+    "From link" : "Bağlantıdan",
+    "Nothing in here. Upload something!" : "Burada hiçbir şey yok. Bir şeyler yükleyin!",
+    "Download" : "İndir",
+    "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.",
+    "Currently scanning" : "Şu anda taranan"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files/l10n/tr.json b/apps/files/l10n/tr.json
new file mode 100644
index 00000000000..41ba10c4e7f
--- /dev/null
+++ b/apps/files/l10n/tr.json
@@ -0,0 +1,95 @@
+{ "translations": {
+    "Storage not available" : "Depolama mevcut değil",
+    "Storage invalid" : "Depolama geçersiz",
+    "Unknown error" : "Bilinmeyen hata",
+    "Could not move %s - File with this name already exists" : "%s taşınamadı. Bu isimde dosya zaten mevcut",
+    "Could not move %s" : "%s taşınamadı",
+    "Permission denied" : "Erişim reddedildi",
+    "File name cannot be empty." : "Dosya adı boş olamaz.",
+    "\"%s\" is an invalid file name." : "\"%s\" geçersiz bir dosya adı.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Geçersiz isim. '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
+    "The target folder has been moved or deleted." : "Hedef klasör taşındı veya silindi.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "%s ismi zaten %s klasöründe kullanılıyor. Lütfen farklı bir isim seçin.",
+    "Not a valid source" : "Geçerli bir kaynak değil",
+    "Server is not allowed to open URLs, please check the server configuration" : "Sunucunun adresleri açma izni yok, lütfen sunucu yapılandırmasını denetleyin",
+    "The file exceeds your quota by %s" : "Dosya, kotanızı %s aşıyor",
+    "Error while downloading %s to %s" : "%s, %s içine indirilirken hata",
+    "Error when creating the file" : "Dosya oluşturulurken hata",
+    "Folder name cannot be empty." : "Klasör adı boş olamaz.",
+    "Error when creating the folder" : "Klasör oluşturulurken hata",
+    "Unable to set upload directory." : "Yükleme dizini ayarlanamadı.",
+    "Invalid Token" : "Geçersiz Belirteç",
+    "No file was uploaded. Unknown error" : "Dosya yüklenmedi. Bilinmeyen hata",
+    "There is no error, the file uploaded with success" : "Dosya başarıyla yüklendi, hata oluşmadı",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı:",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
+    "The uploaded file was only partially uploaded" : "Dosya karşıya kısmen yüklenebildi",
+    "No file was uploaded" : "Hiç dosya gönderilmedi",
+    "Missing a temporary folder" : "Geçici bir dizin eksik",
+    "Failed to write to disk" : "Diske yazılamadı",
+    "Not enough storage available" : "Yeterli disk alanı yok",
+    "Upload failed. Could not find uploaded file" : "Yükleme başarısız. Yüklenen dosya bulunamadı",
+    "Upload failed. Could not get file info." : "Yükleme başarısız. Dosya bilgisi alınamadı.",
+    "Invalid directory." : "Geçersiz dizin.",
+    "Files" : "Dosyalar",
+    "All files" : "Tüm dosyalar",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi",
+    "Total file size {size1} exceeds upload limit {size2}" : "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut",
+    "Upload cancelled." : "Yükleme iptal edildi.",
+    "Could not get result from server." : "Sunucudan sonuç alınamadı.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
+    "URL cannot be empty" : "URL boş olamaz",
+    "{new_name} already exists" : "{new_name} zaten mevcut",
+    "Could not create file" : "Dosya oluşturulamadı",
+    "Could not create folder" : "Klasör oluşturulamadı",
+    "Error fetching URL" : "Adres getirilirken hata",
+    "Share" : "Paylaş",
+    "Delete" : "Sil",
+    "Disconnect storage" : "Depolama bağlantısını kes",
+    "Unshare" : "Paylaşmayı Kaldır",
+    "Delete permanently" : "Kalıcı olarak sil",
+    "Rename" : "Yeniden adlandır",
+    "Pending" : "Bekliyor",
+    "Error moving file." : "Dosya taşıma hatası.",
+    "Error moving file" : "Dosya taşıma hatası",
+    "Error" : "Hata",
+    "Could not rename file" : "Dosya adlandırılamadı",
+    "Error deleting file." : "Dosya silinirken hata.",
+    "Name" : "İsim",
+    "Size" : "Boyut",
+    "Modified" : "Değiştirilme",
+    "_%n folder_::_%n folders_" : ["%n dizin","%n dizin"],
+    "_%n file_::_%n files_" : ["%n dosya","%n dosya"],
+    "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"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" geçersiz bir dosya adı.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
+    "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",
+    "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin.",
+    "{dirs} and {files}" : "{dirs} ve {files}",
+    "%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)",
+    "File handling" : "Dosya işlemleri",
+    "Maximum upload size" : "Azami yükleme boyutu",
+    "max. possible: " : "mümkün olan en fazla: ",
+    "Save" : "Kaydet",
+    "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",
+    "From link" : "Bağlantıdan",
+    "Nothing in here. Upload something!" : "Burada hiçbir şey yok. Bir şeyler yükleyin!",
+    "Download" : "İndir",
+    "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.",
+    "Currently scanning" : "Şu anda taranan"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
deleted file mode 100644
index 7bf746dba52..00000000000
--- a/apps/files/l10n/tr.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "Depolama mevcut değil",
-"Storage invalid" => "Depolama geçersiz",
-"Unknown error" => "Bilinmeyen hata",
-"Could not move %s - File with this name already exists" => "%s taşınamadı. Bu isimde dosya zaten mevcut",
-"Could not move %s" => "%s taşınamadı",
-"Permission denied" => "Erişim reddedildi",
-"File name cannot be empty." => "Dosya adı boş olamaz.",
-"\"%s\" is an invalid file name." => "\"%s\" geçersiz bir dosya adı.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Geçersiz isim. '\\', '/', '<', '>', ':', '\"', '|', '?' ve '*' karakterlerine izin verilmemektedir.",
-"The target folder has been moved or deleted." => "Hedef klasör taşındı veya silindi.",
-"The name %s is already used in the folder %s. Please choose a different name." => "%s ismi zaten %s klasöründe kullanılıyor. Lütfen farklı bir isim seçin.",
-"Not a valid source" => "Geçerli bir kaynak değil",
-"Server is not allowed to open URLs, please check the server configuration" => "Sunucunun adresleri açma izni yok, lütfen sunucu yapılandırmasını denetleyin",
-"The file exceeds your quota by %s" => "Dosya, kotanızı %s aşıyor",
-"Error while downloading %s to %s" => "%s, %s içine indirilirken hata",
-"Error when creating the file" => "Dosya oluşturulurken hata",
-"Folder name cannot be empty." => "Klasör adı boş olamaz.",
-"Error when creating the folder" => "Klasör oluşturulurken hata",
-"Unable to set upload directory." => "Yükleme dizini ayarlanamadı.",
-"Invalid Token" => "Geçersiz Belirteç",
-"No file was uploaded. Unknown error" => "Dosya yüklenmedi. Bilinmeyen hata",
-"There is no error, the file uploaded with success" => "Dosya başarıyla yüklendi, hata oluşmadı",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "php.ini dosyasında upload_max_filesize ile belirtilen dosya yükleme sınırı aşıldı:",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
-"The uploaded file was only partially uploaded" => "Dosya karşıya kısmen yüklenebildi",
-"No file was uploaded" => "Hiç dosya gönderilmedi",
-"Missing a temporary folder" => "Geçici bir dizin eksik",
-"Failed to write to disk" => "Diske yazılamadı",
-"Not enough storage available" => "Yeterli disk alanı yok",
-"Upload failed. Could not find uploaded file" => "Yükleme başarısız. Yüklenen dosya bulunamadı",
-"Upload failed. Could not get file info." => "Yükleme başarısız. Dosya bilgisi alınamadı.",
-"Invalid directory." => "Geçersiz dizin.",
-"Files" => "Dosyalar",
-"All files" => "Tüm dosyalar",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "{filename} bir dizin veya 0 bayt olduğundan yüklenemedi",
-"Total file size {size1} exceeds upload limit {size2}" => "Toplam dosya boyutu {size1}, {size2} gönderme sınırını aşıyor",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Yeterince boş alan yok. Gönderdiğiniz boyut {size1} ancak {size2} alan mevcut",
-"Upload cancelled." => "Yükleme iptal edildi.",
-"Could not get result from server." => "Sunucudan sonuç alınamadı.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şu anda sayfadan ayrılmak yükleme işlemini iptal edecek.",
-"URL cannot be empty" => "URL boş olamaz",
-"{new_name} already exists" => "{new_name} zaten mevcut",
-"Could not create file" => "Dosya oluşturulamadı",
-"Could not create folder" => "Klasör oluşturulamadı",
-"Error fetching URL" => "Adres getirilirken hata",
-"Share" => "Paylaş",
-"Delete" => "Sil",
-"Disconnect storage" => "Depolama bağlantısını kes",
-"Unshare" => "Paylaşmayı Kaldır",
-"Delete permanently" => "Kalıcı olarak sil",
-"Rename" => "Yeniden adlandır",
-"Pending" => "Bekliyor",
-"Error moving file." => "Dosya taşıma hatası.",
-"Error moving file" => "Dosya taşıma hatası",
-"Error" => "Hata",
-"Could not rename file" => "Dosya adlandırılamadı",
-"Error deleting file." => "Dosya silinirken hata.",
-"Name" => "İsim",
-"Size" => "Boyut",
-"Modified" => "Değiştirilme",
-"_%n folder_::_%n folders_" => array("%n dizin","%n dizin"),
-"_%n file_::_%n files_" => array("%n dosya","%n dosya"),
-"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_" => array("%n dosya yükleniyor","%n dosya yükleniyor"),
-"\"{name}\" is an invalid file name." => "\"{name}\" geçersiz bir dosya adı.",
-"Your storage is full, files can not be updated or synced anymore!" => "Depolama alanınız dolu, artık dosyalar güncellenmeyecek veya eşitlenmeyecek.",
-"Your storage is almost full ({usedSpacePercent}%)" => "Depolama alanınız neredeyse dolu (%{usedSpacePercent})",
-"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",
-"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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Şifreleme işlemi durduruldu ancak dosyalarınız hala şifreli. Dosyalarınızın şifrelemesini kaldırmak için lütfen kişisel ayarlar kısmına geçin.",
-"{dirs} and {files}" => "{dirs} ve {files}",
-"%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)",
-"File handling" => "Dosya işlemleri",
-"Maximum upload size" => "Azami yükleme boyutu",
-"max. possible: " => "mümkün olan en fazla: ",
-"Save" => "Kaydet",
-"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",
-"From link" => "Bağlantıdan",
-"Nothing in here. Upload something!" => "Burada hiçbir şey yok. Bir şeyler yükleyin!",
-"Download" => "İndir",
-"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.",
-"Currently scanning" => "Şu anda taranan"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files/l10n/tzm.js b/apps/files/l10n/tzm.js
new file mode 100644
index 00000000000..2a7c7f44429
--- /dev/null
+++ b/apps/files/l10n/tzm.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files",
+    {
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""]
+},
+"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;");
diff --git a/apps/files/l10n/tzm.json b/apps/files/l10n/tzm.json
new file mode 100644
index 00000000000..63a463dce66
--- /dev/null
+++ b/apps/files/l10n/tzm.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/tzm.php b/apps/files/l10n/tzm.php
deleted file mode 100644
index c50e35da623..00000000000
--- a/apps/files/l10n/tzm.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;";
diff --git a/apps/files/l10n/ug.js b/apps/files/l10n/ug.js
new file mode 100644
index 00000000000..cfa6db88c4a
--- /dev/null
+++ b/apps/files/l10n/ug.js
@@ -0,0 +1,38 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "يوچۇن خاتالىق",
+    "Could not move %s" : "%s يۆتكىيەلمەيدۇ",
+    "No file was uploaded. Unknown error" : "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق",
+    "No file was uploaded" : "ھېچقانداق ھۆججەت يۈكلەنمىدى",
+    "Missing a temporary folder" : "ۋاقىتلىق قىسقۇچ كەم.",
+    "Failed to write to disk" : "دىسكىغا يازالمىدى",
+    "Not enough storage available" : "يېتەرلىك ساقلاش بوشلۇقى يوق",
+    "Files" : "ھۆججەتلەر",
+    "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} مەۋجۇت",
+    "Share" : "ھەمبەھىر",
+    "Delete" : "ئۆچۈر",
+    "Unshare" : "ھەمبەھىرلىمە",
+    "Delete permanently" : "مەڭگۈلۈك ئۆچۈر",
+    "Rename" : "ئات ئۆزگەرت",
+    "Pending" : "كۈتۈۋاتىدۇ",
+    "Error" : "خاتالىق",
+    "Name" : "ئاتى",
+    "Size" : "چوڭلۇقى",
+    "Modified" : "ئۆزگەرتكەن",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Save" : "ساقلا",
+    "WebDAV" : "WebDAV",
+    "New" : "يېڭى",
+    "Text file" : "تېكىست ھۆججەت",
+    "New folder" : "يېڭى قىسقۇچ",
+    "Folder" : "قىسقۇچ",
+    "Nothing in here. Upload something!" : "بۇ جايدا ھېچنېمە يوق. Upload something!",
+    "Download" : "چۈشۈر",
+    "Upload too large" : "يۈكلەندىغىنى بەك چوڭ"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/ug.json b/apps/files/l10n/ug.json
new file mode 100644
index 00000000000..19c010492e7
--- /dev/null
+++ b/apps/files/l10n/ug.json
@@ -0,0 +1,36 @@
+{ "translations": {
+    "Unknown error" : "يوچۇن خاتالىق",
+    "Could not move %s" : "%s يۆتكىيەلمەيدۇ",
+    "No file was uploaded. Unknown error" : "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق",
+    "No file was uploaded" : "ھېچقانداق ھۆججەت يۈكلەنمىدى",
+    "Missing a temporary folder" : "ۋاقىتلىق قىسقۇچ كەم.",
+    "Failed to write to disk" : "دىسكىغا يازالمىدى",
+    "Not enough storage available" : "يېتەرلىك ساقلاش بوشلۇقى يوق",
+    "Files" : "ھۆججەتلەر",
+    "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} مەۋجۇت",
+    "Share" : "ھەمبەھىر",
+    "Delete" : "ئۆچۈر",
+    "Unshare" : "ھەمبەھىرلىمە",
+    "Delete permanently" : "مەڭگۈلۈك ئۆچۈر",
+    "Rename" : "ئات ئۆزگەرت",
+    "Pending" : "كۈتۈۋاتىدۇ",
+    "Error" : "خاتالىق",
+    "Name" : "ئاتى",
+    "Size" : "چوڭلۇقى",
+    "Modified" : "ئۆزگەرتكەن",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "Save" : "ساقلا",
+    "WebDAV" : "WebDAV",
+    "New" : "يېڭى",
+    "Text file" : "تېكىست ھۆججەت",
+    "New folder" : "يېڭى قىسقۇچ",
+    "Folder" : "قىسقۇچ",
+    "Nothing in here. Upload something!" : "بۇ جايدا ھېچنېمە يوق. Upload something!",
+    "Download" : "چۈشۈر",
+    "Upload too large" : "يۈكلەندىغىنى بەك چوڭ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ug.php b/apps/files/l10n/ug.php
deleted file mode 100644
index da132edc9ef..00000000000
--- a/apps/files/l10n/ug.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "يوچۇن خاتالىق",
-"Could not move %s" => "%s يۆتكىيەلمەيدۇ",
-"No file was uploaded. Unknown error" => "ھېچقانداق ھۆججەت يۈكلەنمىدى. يوچۇن خاتالىق",
-"No file was uploaded" => "ھېچقانداق ھۆججەت يۈكلەنمىدى",
-"Missing a temporary folder" => "ۋاقىتلىق قىسقۇچ كەم.",
-"Failed to write to disk" => "دىسكىغا يازالمىدى",
-"Not enough storage available" => "يېتەرلىك ساقلاش بوشلۇقى يوق",
-"Files" => "ھۆججەتلەر",
-"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} مەۋجۇت",
-"Share" => "ھەمبەھىر",
-"Delete" => "ئۆچۈر",
-"Unshare" => "ھەمبەھىرلىمە",
-"Delete permanently" => "مەڭگۈلۈك ئۆچۈر",
-"Rename" => "ئات ئۆزگەرت",
-"Pending" => "كۈتۈۋاتىدۇ",
-"Error" => "خاتالىق",
-"Name" => "ئاتى",
-"Size" => "چوڭلۇقى",
-"Modified" => "ئۆزگەرتكەن",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"Save" => "ساقلا",
-"WebDAV" => "WebDAV",
-"New" => "يېڭى",
-"Text file" => "تېكىست ھۆججەت",
-"New folder" => "يېڭى قىسقۇچ",
-"Folder" => "قىسقۇچ",
-"Nothing in here. Upload something!" => "بۇ جايدا ھېچنېمە يوق. Upload something!",
-"Download" => "چۈشۈر",
-"Upload too large" => "يۈكلەندىغىنى بەك چوڭ"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/uk.js b/apps/files/l10n/uk.js
new file mode 100644
index 00000000000..b2bbbcbfc4c
--- /dev/null
+++ b/apps/files/l10n/uk.js
@@ -0,0 +1,97 @@
+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" : "Доступ заборонено",
+    "File name cannot be empty." : " Ім'я файлу не може бути порожнім.",
+    "\"%s\" is an invalid file name." : "\"%s\" - це некоректне ім'я файлу.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
+    "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. Оберіть інше ім'я.",
+    "Not a valid source" : "Недійсне джерело",
+    "Server is not allowed to open URLs, please check the server configuration" : "Серверу заборонено відкривати посилання, перевірте конфігурацію",
+    "The file exceeds your quota by %s" : "Файл перевищує вашу квоту на %s",
+    "Error while downloading %s to %s" : "Помилка завантаження %s до %s",
+    "Error when creating the file" : "Помилка створення файлу",
+    "Folder name cannot be empty." : "Ім'я теки не може бути порожнім.",
+    "Error when creating the folder" : "Помилка створення теки",
+    "Unable to set upload directory." : "Не вдалося встановити каталог завантаження.",
+    "Invalid Token" : "Невірний Маркер",
+    "No file was uploaded. Unknown error" : "Не завантажено жодного файлу. Невідома помилка",
+    "There is no error, the file uploaded with success" : "Файл успішно вивантажено без помилок.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі",
+    "The uploaded file was only partially uploaded" : "Файл відвантажено лише частково",
+    "No file was uploaded" : "Не відвантажено жодного файлу",
+    "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" : "Усі файли",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неможливо завантажити {filename}, оскільки це каталог або має нульовий розмір.",
+    "Total file size {size1} exceeds upload limit {size2}" : "Розмір файлу {size1} перевищує обмеження {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви завантажуєте {size1}, а залишилося лише {size2}",
+    "Upload cancelled." : "Завантаження перервано.",
+    "Could not get result from server." : "Не вдалося отримати результат від сервера.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
+    "URL cannot be empty" : "URL не може бути порожнім",
+    "{new_name} already exists" : "{new_name} вже існує",
+    "Could not create file" : "Не вдалося створити файл",
+    "Could not create folder" : "Не вдалося створити теку",
+    "Error fetching URL" : "Помилка отримання URL",
+    "Share" : "Поділитися",
+    "Delete" : "Видалити",
+    "Disconnect storage" : "Від’єднати сховище",
+    "Unshare" : "Закрити доступ",
+    "Delete permanently" : "Видалити назавжди",
+    "Rename" : "Перейменувати",
+    "Pending" : "Очікування",
+    "Error moving file." : "Помилка переміщення файлу.",
+    "Error moving file" : "Помилка переміщення файлу",
+    "Error" : "Помилка",
+    "Could not rename file" : "Неможливо перейменувати файл",
+    "Error deleting file." : "Помилка видалення файлу.",
+    "Name" : "Ім'я",
+    "Size" : "Розмір",
+    "Modified" : "Змінено",
+    "_%n folder_::_%n folders_" : ["%n тека ","теки : %n ","теки : %n "],
+    "_%n file_::_%n files_" : ["%n файл ","файли : %n ","файли : %n "],
+    "You don’t have permission to upload or create files here" : "У вас недостатньо прав для завантаження або створення файлів тут",
+    "_Uploading %n file_::_Uploading %n files_" : ["Завантаження %n файлу","Завантаження %n файлів","Завантаження %n файлів"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" - некоректне ім'я файлу.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ваше сховище майже повне ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.",
+    "{dirs} and {files}" : "{dirs} і {files}",
+    "%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" : "Зберегти",
+    "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" : "Тека",
+    "From link" : "З посилання",
+    "Nothing in here. Upload something!" : "Тут нічого немає. Відвантажте що-небудь!",
+    "Download" : "Завантажити",
+    "Upload too large" : "Файл занадто великий",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
+    "Files are being scanned, please wait." : "Файли скануються, зачекайте, будь-ласка.",
+    "Currently scanning" : "Триває перевірка"
+},
+"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/l10n/uk.json b/apps/files/l10n/uk.json
new file mode 100644
index 00000000000..6c8a5be4f5c
--- /dev/null
+++ b/apps/files/l10n/uk.json
@@ -0,0 +1,95 @@
+{ "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" : "Доступ заборонено",
+    "File name cannot be empty." : " Ім'я файлу не може бути порожнім.",
+    "\"%s\" is an invalid file name." : "\"%s\" - це некоректне ім'я файлу.",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
+    "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. Оберіть інше ім'я.",
+    "Not a valid source" : "Недійсне джерело",
+    "Server is not allowed to open URLs, please check the server configuration" : "Серверу заборонено відкривати посилання, перевірте конфігурацію",
+    "The file exceeds your quota by %s" : "Файл перевищує вашу квоту на %s",
+    "Error while downloading %s to %s" : "Помилка завантаження %s до %s",
+    "Error when creating the file" : "Помилка створення файлу",
+    "Folder name cannot be empty." : "Ім'я теки не може бути порожнім.",
+    "Error when creating the folder" : "Помилка створення теки",
+    "Unable to set upload directory." : "Не вдалося встановити каталог завантаження.",
+    "Invalid Token" : "Невірний Маркер",
+    "No file was uploaded. Unknown error" : "Не завантажено жодного файлу. Невідома помилка",
+    "There is no error, the file uploaded with success" : "Файл успішно вивантажено без помилок.",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі",
+    "The uploaded file was only partially uploaded" : "Файл відвантажено лише частково",
+    "No file was uploaded" : "Не відвантажено жодного файлу",
+    "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" : "Усі файли",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Неможливо завантажити {filename}, оскільки це каталог або має нульовий розмір.",
+    "Total file size {size1} exceeds upload limit {size2}" : "Розмір файлу {size1} перевищує обмеження {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Недостатньо вільного місця, ви завантажуєте {size1}, а залишилося лише {size2}",
+    "Upload cancelled." : "Завантаження перервано.",
+    "Could not get result from server." : "Не вдалося отримати результат від сервера.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
+    "URL cannot be empty" : "URL не може бути порожнім",
+    "{new_name} already exists" : "{new_name} вже існує",
+    "Could not create file" : "Не вдалося створити файл",
+    "Could not create folder" : "Не вдалося створити теку",
+    "Error fetching URL" : "Помилка отримання URL",
+    "Share" : "Поділитися",
+    "Delete" : "Видалити",
+    "Disconnect storage" : "Від’єднати сховище",
+    "Unshare" : "Закрити доступ",
+    "Delete permanently" : "Видалити назавжди",
+    "Rename" : "Перейменувати",
+    "Pending" : "Очікування",
+    "Error moving file." : "Помилка переміщення файлу.",
+    "Error moving file" : "Помилка переміщення файлу",
+    "Error" : "Помилка",
+    "Could not rename file" : "Неможливо перейменувати файл",
+    "Error deleting file." : "Помилка видалення файлу.",
+    "Name" : "Ім'я",
+    "Size" : "Розмір",
+    "Modified" : "Змінено",
+    "_%n folder_::_%n folders_" : ["%n тека ","теки : %n ","теки : %n "],
+    "_%n file_::_%n files_" : ["%n файл ","файли : %n ","файли : %n "],
+    "You don’t have permission to upload or create files here" : "У вас недостатньо прав для завантаження або створення файлів тут",
+    "_Uploading %n file_::_Uploading %n files_" : ["Завантаження %n файлу","Завантаження %n файлів","Завантаження %n файлів"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" - некоректне ім'я файлу.",
+    "Your storage is full, files can not be updated or synced anymore!" : "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
+    "Your storage is almost full ({usedSpacePercent}%)" : "Ваше сховище майже повне ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.",
+    "{dirs} and {files}" : "{dirs} і {files}",
+    "%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" : "Зберегти",
+    "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" : "Тека",
+    "From link" : "З посилання",
+    "Nothing in here. Upload something!" : "Тут нічого немає. Відвантажте що-небудь!",
+    "Download" : "Завантажити",
+    "Upload too large" : "Файл занадто великий",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
+    "Files are being scanned, please wait." : "Файли скануються, зачекайте, будь-ласка.",
+    "Currently scanning" : "Триває перевірка"
+},"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/l10n/uk.php b/apps/files/l10n/uk.php
deleted file mode 100644
index f2927738a1e..00000000000
--- a/apps/files/l10n/uk.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "Доступ заборонено",
-"File name cannot be empty." => " Ім'я файлу не може бути порожнім.",
-"\"%s\" is an invalid file name." => "\"%s\" - це некоректне ім'я файлу.",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Невірне ім'я, '\\', '/', '<', '>', ':', '\"', '|', '?' та '*' не дозволені.",
-"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. Оберіть інше ім'я.",
-"Not a valid source" => "Недійсне джерело",
-"Server is not allowed to open URLs, please check the server configuration" => "Серверу заборонено відкривати посилання, перевірте конфігурацію",
-"The file exceeds your quota by %s" => "Файл перевищує вашу квоту на %s",
-"Error while downloading %s to %s" => "Помилка завантаження %s до %s",
-"Error when creating the file" => "Помилка створення файлу",
-"Folder name cannot be empty." => "Ім'я теки не може бути порожнім.",
-"Error when creating the folder" => "Помилка створення теки",
-"Unable to set upload directory." => "Не вдалося встановити каталог завантаження.",
-"Invalid Token" => "Невірний Маркер",
-"No file was uploaded. Unknown error" => "Не завантажено жодного файлу. Невідома помилка",
-"There is no error, the file uploaded with success" => "Файл успішно вивантажено без помилок.",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Розмір звантаження перевищує upload_max_filesize параметра в php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Розмір відвантаженого файлу перевищує директиву MAX_FILE_SIZE вказану в HTML формі",
-"The uploaded file was only partially uploaded" => "Файл відвантажено лише частково",
-"No file was uploaded" => "Не відвантажено жодного файлу",
-"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" => "Усі файли",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "Неможливо завантажити {filename}, оскільки це каталог або має нульовий розмір.",
-"Total file size {size1} exceeds upload limit {size2}" => "Розмір файлу {size1} перевищує обмеження {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "Недостатньо вільного місця, ви завантажуєте {size1}, а залишилося лише {size2}",
-"Upload cancelled." => "Завантаження перервано.",
-"Could not get result from server." => "Не вдалося отримати результат від сервера.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Виконується завантаження файлу. Закриття цієї сторінки приведе до відміни завантаження.",
-"URL cannot be empty" => "URL не може бути порожнім",
-"{new_name} already exists" => "{new_name} вже існує",
-"Could not create file" => "Не вдалося створити файл",
-"Could not create folder" => "Не вдалося створити теку",
-"Error fetching URL" => "Помилка отримання URL",
-"Share" => "Поділитися",
-"Delete" => "Видалити",
-"Disconnect storage" => "Від’єднати сховище",
-"Unshare" => "Закрити доступ",
-"Delete permanently" => "Видалити назавжди",
-"Rename" => "Перейменувати",
-"Pending" => "Очікування",
-"Error moving file." => "Помилка переміщення файлу.",
-"Error moving file" => "Помилка переміщення файлу",
-"Error" => "Помилка",
-"Could not rename file" => "Неможливо перейменувати файл",
-"Error deleting file." => "Помилка видалення файлу.",
-"Name" => "Ім'я",
-"Size" => "Розмір",
-"Modified" => "Змінено",
-"_%n folder_::_%n folders_" => array("%n тека ","теки : %n ","теки : %n "),
-"_%n file_::_%n files_" => array("%n файл ","файли : %n ","файли : %n "),
-"You don’t have permission to upload or create files here" => "У вас недостатньо прав для завантаження або створення файлів тут",
-"_Uploading %n file_::_Uploading %n files_" => array("Завантаження %n файлу","Завантаження %n файлів","Завантаження %n файлів"),
-"\"{name}\" is an invalid file name." => "\"{name}\" - некоректне ім'я файлу.",
-"Your storage is full, files can not be updated or synced anymore!" => "Ваше сховище переповнене, файли більше не можуть бути оновлені або синхронізовані !",
-"Your storage is almost full ({usedSpacePercent}%)" => "Ваше сховище майже повне ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "Невірний закритий ключ для доданку шифрування. Оновіть пароль до вашого закритого ключа в особистих налаштуваннях.",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Шифрування було вимкнено, але ваші файли все ще зашифровано. Для розшифрування перейдіть до персональних налаштувань.",
-"{dirs} and {files}" => "{dirs} і {files}",
-"%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" => "Зберегти",
-"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" => "Тека",
-"From link" => "З посилання",
-"Nothing in here. Upload something!" => "Тут нічого немає. Відвантажте що-небудь!",
-"Download" => "Завантажити",
-"Upload too large" => "Файл занадто великий",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері.",
-"Files are being scanned, please wait." => "Файли скануються, зачекайте, будь-ласка.",
-"Currently scanning" => "Триває перевірка"
-);
-$PLURAL_FORMS = "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/l10n/ur.js b/apps/files/l10n/ur.js
new file mode 100644
index 00000000000..f04bfd7a6f3
--- /dev/null
+++ b/apps/files/l10n/ur.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files",
+    {
+    "Error" : "خرابی",
+    "_%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/ur.json b/apps/files/l10n/ur.json
new file mode 100644
index 00000000000..cb374c0b15b
--- /dev/null
+++ b/apps/files/l10n/ur.json
@@ -0,0 +1 @@
+{"translations":{"Error":"\u062e\u0631\u0627\u0628\u06cc","_%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/ur.php b/apps/files/l10n/ur.php
deleted file mode 100644
index 8d85d55266e..00000000000
--- a/apps/files/l10n/ur.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "خرابی",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/ur_PK.js b/apps/files/l10n/ur_PK.js
new file mode 100644
index 00000000000..c0be28aa0d4
--- /dev/null
+++ b/apps/files/l10n/ur_PK.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "غیر معروف خرابی",
+    "Share" : "تقسیم",
+    "Delete" : "حذف کریں",
+    "Unshare" : "شئیرنگ ختم کریں",
+    "Error" : "ایرر",
+    "Name" : "اسم",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "حفظ",
+    "Download" : "ڈاؤن لوڈ،"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/ur_PK.json b/apps/files/l10n/ur_PK.json
new file mode 100644
index 00000000000..1ceef01a442
--- /dev/null
+++ b/apps/files/l10n/ur_PK.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Unknown error" : "غیر معروف خرابی",
+    "Share" : "تقسیم",
+    "Delete" : "حذف کریں",
+    "Unshare" : "شئیرنگ ختم کریں",
+    "Error" : "ایرر",
+    "Name" : "اسم",
+    "_%n folder_::_%n folders_" : ["",""],
+    "_%n file_::_%n files_" : ["",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["",""],
+    "Save" : "حفظ",
+    "Download" : "ڈاؤن لوڈ،"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/ur_PK.php b/apps/files/l10n/ur_PK.php
deleted file mode 100644
index 583ebb80489..00000000000
--- a/apps/files/l10n/ur_PK.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "غیر معروف خرابی",
-"Share" => "تقسیم",
-"Delete" => "حذف کریں",
-"Unshare" => "شئیرنگ ختم کریں",
-"Error" => "ایرر",
-"Name" => "اسم",
-"_%n folder_::_%n folders_" => array("",""),
-"_%n file_::_%n files_" => array("",""),
-"_Uploading %n file_::_Uploading %n files_" => array("",""),
-"Save" => "حفظ",
-"Download" => "ڈاؤن لوڈ،"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files/l10n/uz.js b/apps/files/l10n/uz.js
new file mode 100644
index 00000000000..d1bbfca2dd4
--- /dev/null
+++ b/apps/files/l10n/uz.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files",
+    {
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/uz.json b/apps/files/l10n/uz.json
new file mode 100644
index 00000000000..e493054d78a
--- /dev/null
+++ b/apps/files/l10n/uz.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/uz.php b/apps/files/l10n/uz.php
deleted file mode 100644
index 70ab6572ba4..00000000000
--- a/apps/files/l10n/uz.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/vi.js b/apps/files/l10n/vi.js
new file mode 100644
index 00000000000..744f37082fe
--- /dev/null
+++ b/apps/files/l10n/vi.js
@@ -0,0 +1,79 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "Lỗi chưa biết",
+    "Could not move %s - File with this name already exists" : "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
+    "Could not move %s" : "Không thể di chuyển %s",
+    "File name cannot be empty." : "Tên file không được rỗng",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Tên %s đã được sử dụng trong thư mục %s. Hãy chọn tên khác.",
+    "Not a valid source" : "Nguồn không hợp lệ",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server cấm mở URLs, vui lòng kiểm tra lại cấu hình server",
+    "Error while downloading %s to %s" : "Lỗi trong trong quá trình tải %s từ %s",
+    "Error when creating the file" : "Lỗi khi tạo file",
+    "Folder name cannot be empty." : "Tên thư mục không thể để trống",
+    "Error when creating the folder" : "Lỗi khi tạo thư mục",
+    "Unable to set upload directory." : "Không thể thiết lập thư mục tải lên.",
+    "Invalid Token" : "Xác thực không hợp lệ",
+    "No file was uploaded. Unknown error" : "Không có tập tin nào được tải lên. Lỗi không xác định",
+    "There is no error, the file uploaded with success" : "Không có lỗi, các tập tin đã được tải lên thành công",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML",
+    "The uploaded file was only partially uploaded" : "Các tập tin được tải lên chỉ tải lên được một phần",
+    "No file was uploaded" : "Chưa có file nào được tải lên",
+    "Missing a temporary folder" : "Không tìm thấy thư mục tạm",
+    "Failed to write to disk" : "Không thể ghi ",
+    "Not enough storage available" : "Không đủ không gian lưu trữ",
+    "Upload failed. Could not find uploaded file" : "Tải lên thất bại. Không thể tìm thấy tập tin được tải lên",
+    "Upload failed. Could not get file info." : "Tải lên thất bại. Không thể có được thông tin tập tin.",
+    "Invalid directory." : "Thư mục không hợp lệ",
+    "Files" : "Tập tin",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte",
+    "Upload cancelled." : "Hủy tải lên",
+    "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
+    "URL cannot be empty" : "URL không thể để trống",
+    "{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",
+    "Share" : "Chia sẻ",
+    "Delete" : "Xóa",
+    "Unshare" : "Bỏ chia sẻ",
+    "Delete permanently" : "Xóa vĩnh vễn",
+    "Rename" : "Sửa tên",
+    "Pending" : "Đang chờ",
+    "Error moving file" : "Lỗi di chuyển tập tin",
+    "Error" : "Lỗi",
+    "Could not rename file" : "Không thể đổi tên file",
+    "Error deleting file." : "Lỗi xóa file,",
+    "Name" : "Tên",
+    "Size" : "Kích cỡ",
+    "Modified" : "Thay đổi",
+    "_%n folder_::_%n folders_" : ["%n thư mục"],
+    "_%n file_::_%n files_" : ["%n tập tin"],
+    "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"],
+    "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}%)",
+    "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",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Mã hóa đã bị vô hiệu nhưng những tập tin của bạn vẫn được mã hóa. Vui lòng vào phần thiết lập cá nhân để giải mã chúng.",
+    "{dirs} and {files}" : "{dirs} và {files}",
+    "%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 ",
+    "max. possible: " : "tối đa cho phép:",
+    "Save" : "Lưu",
+    "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",
+    "From link" : "Từ liên kết",
+    "Nothing in here. Upload something!" : "Không có gì ở đây .Hãy tải lên một cái gì đó !",
+    "Download" : "Tải về",
+    "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ờ."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/vi.json b/apps/files/l10n/vi.json
new file mode 100644
index 00000000000..32e953b68e1
--- /dev/null
+++ b/apps/files/l10n/vi.json
@@ -0,0 +1,77 @@
+{ "translations": {
+    "Unknown error" : "Lỗi chưa biết",
+    "Could not move %s - File with this name already exists" : "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
+    "Could not move %s" : "Không thể di chuyển %s",
+    "File name cannot be empty." : "Tên file không được rỗng",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Tên %s đã được sử dụng trong thư mục %s. Hãy chọn tên khác.",
+    "Not a valid source" : "Nguồn không hợp lệ",
+    "Server is not allowed to open URLs, please check the server configuration" : "Server cấm mở URLs, vui lòng kiểm tra lại cấu hình server",
+    "Error while downloading %s to %s" : "Lỗi trong trong quá trình tải %s từ %s",
+    "Error when creating the file" : "Lỗi khi tạo file",
+    "Folder name cannot be empty." : "Tên thư mục không thể để trống",
+    "Error when creating the folder" : "Lỗi khi tạo thư mục",
+    "Unable to set upload directory." : "Không thể thiết lập thư mục tải lên.",
+    "Invalid Token" : "Xác thực không hợp lệ",
+    "No file was uploaded. Unknown error" : "Không có tập tin nào được tải lên. Lỗi không xác định",
+    "There is no error, the file uploaded with success" : "Không có lỗi, các tập tin đã được tải lên thành công",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML",
+    "The uploaded file was only partially uploaded" : "Các tập tin được tải lên chỉ tải lên được một phần",
+    "No file was uploaded" : "Chưa có file nào được tải lên",
+    "Missing a temporary folder" : "Không tìm thấy thư mục tạm",
+    "Failed to write to disk" : "Không thể ghi ",
+    "Not enough storage available" : "Không đủ không gian lưu trữ",
+    "Upload failed. Could not find uploaded file" : "Tải lên thất bại. Không thể tìm thấy tập tin được tải lên",
+    "Upload failed. Could not get file info." : "Tải lên thất bại. Không thể có được thông tin tập tin.",
+    "Invalid directory." : "Thư mục không hợp lệ",
+    "Files" : "Tập tin",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte",
+    "Upload cancelled." : "Hủy tải lên",
+    "Could not get result from server." : "Không thể nhận được kết quả từ máy chủ.",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
+    "URL cannot be empty" : "URL không thể để trống",
+    "{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",
+    "Share" : "Chia sẻ",
+    "Delete" : "Xóa",
+    "Unshare" : "Bỏ chia sẻ",
+    "Delete permanently" : "Xóa vĩnh vễn",
+    "Rename" : "Sửa tên",
+    "Pending" : "Đang chờ",
+    "Error moving file" : "Lỗi di chuyển tập tin",
+    "Error" : "Lỗi",
+    "Could not rename file" : "Không thể đổi tên file",
+    "Error deleting file." : "Lỗi xóa file,",
+    "Name" : "Tên",
+    "Size" : "Kích cỡ",
+    "Modified" : "Thay đổi",
+    "_%n folder_::_%n folders_" : ["%n thư mục"],
+    "_%n file_::_%n files_" : ["%n tập tin"],
+    "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"],
+    "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}%)",
+    "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",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Mã hóa đã bị vô hiệu nhưng những tập tin của bạn vẫn được mã hóa. Vui lòng vào phần thiết lập cá nhân để giải mã chúng.",
+    "{dirs} and {files}" : "{dirs} và {files}",
+    "%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 ",
+    "max. possible: " : "tối đa cho phép:",
+    "Save" : "Lưu",
+    "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",
+    "From link" : "Từ liên kết",
+    "Nothing in here. Upload something!" : "Không có gì ở đây .Hãy tải lên một cái gì đó !",
+    "Download" : "Tải về",
+    "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ờ."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
deleted file mode 100644
index a754b9d5a5d..00000000000
--- a/apps/files/l10n/vi.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Lỗi chưa biết",
-"Could not move %s - File with this name already exists" => "Không thể di chuyển %s - Đã có tên tập tin này trên hệ thống",
-"Could not move %s" => "Không thể di chuyển %s",
-"File name cannot be empty." => "Tên file không được rỗng",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Tên không hợp lệ, '\\', '/', '<', '>', ':', '\"', '|', '?' và '*' thì không được phép dùng.",
-"The name %s is already used in the folder %s. Please choose a different name." => "Tên %s đã được sử dụng trong thư mục %s. Hãy chọn tên khác.",
-"Not a valid source" => "Nguồn không hợp lệ",
-"Server is not allowed to open URLs, please check the server configuration" => "Server cấm mở URLs, vui lòng kiểm tra lại cấu hình server",
-"Error while downloading %s to %s" => "Lỗi trong trong quá trình tải %s từ %s",
-"Error when creating the file" => "Lỗi khi tạo file",
-"Folder name cannot be empty." => "Tên thư mục không thể để trống",
-"Error when creating the folder" => "Lỗi khi tạo thư mục",
-"Unable to set upload directory." => "Không thể thiết lập thư mục tải lên.",
-"Invalid Token" => "Xác thực không hợp lệ",
-"No file was uploaded. Unknown error" => "Không có tập tin nào được tải lên. Lỗi không xác định",
-"There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "The uploaded file exceeds the upload_max_filesize directive in php.ini: ",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Tập tin được tải lên vượt quá MAX_FILE_SIZE được quy định trong mẫu HTML",
-"The uploaded file was only partially uploaded" => "Các tập tin được tải lên chỉ tải lên được một phần",
-"No file was uploaded" => "Chưa có file nào được tải lên",
-"Missing a temporary folder" => "Không tìm thấy thư mục tạm",
-"Failed to write to disk" => "Không thể ghi ",
-"Not enough storage available" => "Không đủ không gian lưu trữ",
-"Upload failed. Could not find uploaded file" => "Tải lên thất bại. Không thể tìm thấy tập tin được tải lên",
-"Upload failed. Could not get file info." => "Tải lên thất bại. Không thể có được thông tin tập tin.",
-"Invalid directory." => "Thư mục không hợp lệ",
-"Files" => "Tập tin",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "không thể tải {filename} lên do nó là một thư mục hoặc có kích thước bằng 0 byte",
-"Upload cancelled." => "Hủy tải lên",
-"Could not get result from server." => "Không thể nhận được kết quả từ máy chủ.",
-"File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
-"URL cannot be empty" => "URL không thể để trống",
-"{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",
-"Share" => "Chia sẻ",
-"Delete" => "Xóa",
-"Unshare" => "Bỏ chia sẻ",
-"Delete permanently" => "Xóa vĩnh vễn",
-"Rename" => "Sửa tên",
-"Pending" => "Đang chờ",
-"Error moving file" => "Lỗi di chuyển tập tin",
-"Error" => "Lỗi",
-"Could not rename file" => "Không thể đổi tên file",
-"Error deleting file." => "Lỗi xóa file,",
-"Name" => "Tên",
-"Size" => "Kích cỡ",
-"Modified" => "Thay đổi",
-"_%n folder_::_%n folders_" => array("%n thư mục"),
-"_%n file_::_%n files_" => array("%n tập tin"),
-"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_" => array("Đang tải lên %n tập tin"),
-"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}%)",
-"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",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "Mã hóa đã bị vô hiệu nhưng những tập tin của bạn vẫn được mã hóa. Vui lòng vào phần thiết lập cá nhân để giải mã chúng.",
-"{dirs} and {files}" => "{dirs} và {files}",
-"%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 ",
-"max. possible: " => "tối đa cho phép:",
-"Save" => "Lưu",
-"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",
-"From link" => "Từ liên kết",
-"Nothing in here. Upload something!" => "Không có gì ở đây .Hãy tải lên một cái gì đó !",
-"Download" => "Tải về",
-"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ờ."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_CN.js b/apps/files/l10n/zh_CN.js
new file mode 100644
index 00000000000..502c673764e
--- /dev/null
+++ b/apps/files/l10n/zh_CN.js
@@ -0,0 +1,94 @@
+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",
+    "File name cannot be empty." : "文件名不能为空。",
+    "\"%s\" is an invalid file name." : "“%s” 是一个无效的文件名。",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
+    "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 中存在的名称。请使用其他名称。",
+    "Not a valid source" : "不是一个可用的源",
+    "Server is not allowed to open URLs, please check the server configuration" : "服务器没有允许打开URL网址，请检查服务器配置",
+    "Error while downloading %s to %s" : "当下载 %s 到 %s 时出错",
+    "Error when creating the file" : "当创建文件是出错",
+    "Folder name cannot be empty." : "文件夹名称不能为空",
+    "Error when creating the folder" : "创建文件夹出错",
+    "Unable to set upload directory." : "无法设置上传文件夹。",
+    "Invalid Token" : "无效密匙",
+    "No file was uploaded. Unknown error" : "没有文件被上传。未知错误",
+    "There is no error, the file uploaded with success" : "文件上传成功，没有错误发生",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "上传文件大小已超过php.ini中upload_max_filesize所规定的值",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
+    "The uploaded file was only partially uploaded" : "已上传文件只上传了部分（不完整）",
+    "No file was uploaded" : "没有文件被上传",
+    "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" : "全部文件",
+    "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." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
+    "URL cannot be empty" : "URL不能为空",
+    "{new_name} already exists" : "{new_name} 已存在",
+    "Could not create file" : "不能创建文件",
+    "Could not create folder" : "不能创建文件夹",
+    "Error fetching URL" : "获取URL出错",
+    "Share" : "分享",
+    "Delete" : "删除",
+    "Disconnect storage" : "断开储存连接",
+    "Unshare" : "取消共享",
+    "Delete permanently" : "永久删除",
+    "Rename" : "重命名",
+    "Pending" : "等待",
+    "Error moving file." : "移动文件出错。",
+    "Error moving file" : "移动文件错误",
+    "Error" : "错误",
+    "Could not rename file" : "不能重命名文件",
+    "Error deleting file." : "删除文件出错。",
+    "Name" : "名称",
+    "Size" : "大小",
+    "Modified" : "修改日期",
+    "_%n folder_::_%n folders_" : ["%n 文件夹"],
+    "_%n file_::_%n files_" : ["%n个文件"],
+    "You don’t have permission to upload or create files here" : "您没有权限来上传湖州哦和创建文件",
+    "_Uploading %n file_::_Uploading %n files_" : ["上传 %n 个文件"],
+    "\"{name}\" is an invalid file name." : "“{name}”是一个无效的文件名。",
+    "Your storage is full, files can not be updated or synced anymore!" : "您的存储空间已满，文件将无法更新或同步！",
+    "Your storage is almost full ({usedSpacePercent}%)" : "您的存储空间即将用完 ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。",
+    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "%s could not be renamed" : "%s 不能被重命名",
+    "Upload (max. %s)" : "上传 (最大 %s)",
+    "File handling" : "文件处理",
+    "Maximum upload size" : "最大上传大小",
+    "max. possible: " : "最大允许: ",
+    "Save" : "保存",
+    "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" : "文件夹",
+    "From link" : "来自链接",
+    "Nothing in here. Upload something!" : "这里还什么都没有。上传些东西吧！",
+    "Download" : "下载",
+    "Upload too large" : "上传文件过大",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
+    "Files are being scanned, please wait." : "文件正在被扫描，请稍候。",
+    "Currently scanning" : "正在扫描"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/zh_CN.json b/apps/files/l10n/zh_CN.json
new file mode 100644
index 00000000000..a0244f1965a
--- /dev/null
+++ b/apps/files/l10n/zh_CN.json
@@ -0,0 +1,92 @@
+{ "translations": {
+    "Storage not available" : "存储空间不可用",
+    "Storage invalid" : "存储空间无效",
+    "Unknown error" : "未知错误",
+    "Could not move %s - File with this name already exists" : "无法移动 %s - 同名文件已存在",
+    "Could not move %s" : "无法移动 %s",
+    "File name cannot be empty." : "文件名不能为空。",
+    "\"%s\" is an invalid file name." : "“%s” 是一个无效的文件名。",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
+    "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 中存在的名称。请使用其他名称。",
+    "Not a valid source" : "不是一个可用的源",
+    "Server is not allowed to open URLs, please check the server configuration" : "服务器没有允许打开URL网址，请检查服务器配置",
+    "Error while downloading %s to %s" : "当下载 %s 到 %s 时出错",
+    "Error when creating the file" : "当创建文件是出错",
+    "Folder name cannot be empty." : "文件夹名称不能为空",
+    "Error when creating the folder" : "创建文件夹出错",
+    "Unable to set upload directory." : "无法设置上传文件夹。",
+    "Invalid Token" : "无效密匙",
+    "No file was uploaded. Unknown error" : "没有文件被上传。未知错误",
+    "There is no error, the file uploaded with success" : "文件上传成功，没有错误发生",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "上传文件大小已超过php.ini中upload_max_filesize所规定的值",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
+    "The uploaded file was only partially uploaded" : "已上传文件只上传了部分（不完整）",
+    "No file was uploaded" : "没有文件被上传",
+    "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" : "全部文件",
+    "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." : "文件正在上传中。现在离开此页会导致上传动作被取消。",
+    "URL cannot be empty" : "URL不能为空",
+    "{new_name} already exists" : "{new_name} 已存在",
+    "Could not create file" : "不能创建文件",
+    "Could not create folder" : "不能创建文件夹",
+    "Error fetching URL" : "获取URL出错",
+    "Share" : "分享",
+    "Delete" : "删除",
+    "Disconnect storage" : "断开储存连接",
+    "Unshare" : "取消共享",
+    "Delete permanently" : "永久删除",
+    "Rename" : "重命名",
+    "Pending" : "等待",
+    "Error moving file." : "移动文件出错。",
+    "Error moving file" : "移动文件错误",
+    "Error" : "错误",
+    "Could not rename file" : "不能重命名文件",
+    "Error deleting file." : "删除文件出错。",
+    "Name" : "名称",
+    "Size" : "大小",
+    "Modified" : "修改日期",
+    "_%n folder_::_%n folders_" : ["%n 文件夹"],
+    "_%n file_::_%n files_" : ["%n个文件"],
+    "You don’t have permission to upload or create files here" : "您没有权限来上传湖州哦和创建文件",
+    "_Uploading %n file_::_Uploading %n files_" : ["上传 %n 个文件"],
+    "\"{name}\" is an invalid file name." : "“{name}”是一个无效的文件名。",
+    "Your storage is full, files can not be updated or synced anymore!" : "您的存储空间已满，文件将无法更新或同步！",
+    "Your storage is almost full ({usedSpacePercent}%)" : "您的存储空间即将用完 ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。",
+    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "%s could not be renamed" : "%s 不能被重命名",
+    "Upload (max. %s)" : "上传 (最大 %s)",
+    "File handling" : "文件处理",
+    "Maximum upload size" : "最大上传大小",
+    "max. possible: " : "最大允许: ",
+    "Save" : "保存",
+    "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" : "文件夹",
+    "From link" : "来自链接",
+    "Nothing in here. Upload something!" : "这里还什么都没有。上传些东西吧！",
+    "Download" : "下载",
+    "Upload too large" : "上传文件过大",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
+    "Files are being scanned, please wait." : "文件正在被扫描，请稍候。",
+    "Currently scanning" : "正在扫描"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
deleted file mode 100644
index f24218f2784..00000000000
--- a/apps/files/l10n/zh_CN.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Storage not available" => "存储空间不可用",
-"Storage invalid" => "存储空间无效",
-"Unknown error" => "未知错误",
-"Could not move %s - File with this name already exists" => "无法移动 %s - 同名文件已存在",
-"Could not move %s" => "无法移动 %s",
-"File name cannot be empty." => "文件名不能为空。",
-"\"%s\" is an invalid file name." => "“%s” 是一个无效的文件名。",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "无效名称，'\\', '/', '<', '>', ':', '\"', '|', '?' 和 '*' 不被允许使用。",
-"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 中存在的名称。请使用其他名称。",
-"Not a valid source" => "不是一个可用的源",
-"Server is not allowed to open URLs, please check the server configuration" => "服务器没有允许打开URL网址，请检查服务器配置",
-"Error while downloading %s to %s" => "当下载 %s 到 %s 时出错",
-"Error when creating the file" => "当创建文件是出错",
-"Folder name cannot be empty." => "文件夹名称不能为空",
-"Error when creating the folder" => "创建文件夹出错",
-"Unable to set upload directory." => "无法设置上传文件夹。",
-"Invalid Token" => "无效密匙",
-"No file was uploaded. Unknown error" => "没有文件被上传。未知错误",
-"There is no error, the file uploaded with success" => "文件上传成功，没有错误发生",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上传文件大小已超过php.ini中upload_max_filesize所规定的值",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上传的文件长度超出了 HTML 表单中 MAX_FILE_SIZE 的限制",
-"The uploaded file was only partially uploaded" => "已上传文件只上传了部分（不完整）",
-"No file was uploaded" => "没有文件被上传",
-"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" => "全部文件",
-"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." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
-"URL cannot be empty" => "URL不能为空",
-"{new_name} already exists" => "{new_name} 已存在",
-"Could not create file" => "不能创建文件",
-"Could not create folder" => "不能创建文件夹",
-"Error fetching URL" => "获取URL出错",
-"Share" => "分享",
-"Delete" => "删除",
-"Disconnect storage" => "断开储存连接",
-"Unshare" => "取消共享",
-"Delete permanently" => "永久删除",
-"Rename" => "重命名",
-"Pending" => "等待",
-"Error moving file." => "移动文件出错。",
-"Error moving file" => "移动文件错误",
-"Error" => "错误",
-"Could not rename file" => "不能重命名文件",
-"Error deleting file." => "删除文件出错。",
-"Name" => "名称",
-"Size" => "大小",
-"Modified" => "修改日期",
-"_%n folder_::_%n folders_" => array("%n 文件夹"),
-"_%n file_::_%n files_" => array("%n个文件"),
-"You don’t have permission to upload or create files here" => "您没有权限来上传湖州哦和创建文件",
-"_Uploading %n file_::_Uploading %n files_" => array("上传 %n 个文件"),
-"\"{name}\" is an invalid file name." => "“{name}”是一个无效的文件名。",
-"Your storage is full, files can not be updated or synced anymore!" => "您的存储空间已满，文件将无法更新或同步！",
-"Your storage is almost full ({usedSpacePercent}%)" => "您的存储空间即将用完 ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "无效的私有密钥。请到您的个人配置里去更新私有密钥，来恢复对加密文件的访问。",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "加密是被禁用的，但是您的文件还是被加密了。请到您的个人配置里设置文件加密选项。",
-"{dirs} and {files}" => "{dirs} 和 {files}",
-"%s could not be renamed" => "%s 不能被重命名",
-"Upload (max. %s)" => "上传 (最大 %s)",
-"File handling" => "文件处理",
-"Maximum upload size" => "最大上传大小",
-"max. possible: " => "最大允许: ",
-"Save" => "保存",
-"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" => "文件夹",
-"From link" => "来自链接",
-"Nothing in here. Upload something!" => "这里还什么都没有。上传些东西吧！",
-"Download" => "下载",
-"Upload too large" => "上传文件过大",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您正尝试上传的文件超过了此服务器可以上传的最大容量限制",
-"Files are being scanned, please wait." => "文件正在被扫描，请稍候。",
-"Currently scanning" => "正在扫描"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_HK.js b/apps/files/l10n/zh_HK.js
new file mode 100644
index 00000000000..e3e2aec65a0
--- /dev/null
+++ b/apps/files/l10n/zh_HK.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "files",
+    {
+    "Unknown error" : "不明錯誤",
+    "Files" : "文件",
+    "All files" : "所有文件",
+    "Share" : "分享",
+    "Delete" : "刪除",
+    "Unshare" : "取消分享",
+    "Rename" : "重新命名",
+    "Error" : "錯誤",
+    "Name" : "名稱",
+    "Size" : "大小",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "Save" : "儲存",
+    "WebDAV" : "WebDAV",
+    "New" : "新增",
+    "New folder" : "新資料夾",
+    "Folder" : "資料夾",
+    "Download" : "下載"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/zh_HK.json b/apps/files/l10n/zh_HK.json
new file mode 100644
index 00000000000..da0632f0882
--- /dev/null
+++ b/apps/files/l10n/zh_HK.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Unknown error" : "不明錯誤",
+    "Files" : "文件",
+    "All files" : "所有文件",
+    "Share" : "分享",
+    "Delete" : "刪除",
+    "Unshare" : "取消分享",
+    "Rename" : "重新命名",
+    "Error" : "錯誤",
+    "Name" : "名稱",
+    "Size" : "大小",
+    "_%n folder_::_%n folders_" : [""],
+    "_%n file_::_%n files_" : [""],
+    "_Uploading %n file_::_Uploading %n files_" : [""],
+    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "Save" : "儲存",
+    "WebDAV" : "WebDAV",
+    "New" : "新增",
+    "New folder" : "新資料夾",
+    "Folder" : "資料夾",
+    "Download" : "下載"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/zh_HK.php b/apps/files/l10n/zh_HK.php
deleted file mode 100644
index 8868bd21c8d..00000000000
--- a/apps/files/l10n/zh_HK.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "不明錯誤",
-"Files" => "文件",
-"All files" => "所有文件",
-"Share" => "分享",
-"Delete" => "刪除",
-"Unshare" => "取消分享",
-"Rename" => "重新命名",
-"Error" => "錯誤",
-"Name" => "名稱",
-"Size" => "大小",
-"_%n folder_::_%n folders_" => array(""),
-"_%n file_::_%n files_" => array(""),
-"_Uploading %n file_::_Uploading %n files_" => array(""),
-"{dirs} and {files}" => "{dirs} 和 {files}",
-"Save" => "儲存",
-"WebDAV" => "WebDAV",
-"New" => "新增",
-"New folder" => "新資料夾",
-"Folder" => "資料夾",
-"Download" => "下載"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files/l10n/zh_TW.js b/apps/files/l10n/zh_TW.js
new file mode 100644
index 00000000000..73e17fa47fc
--- /dev/null
+++ b/apps/files/l10n/zh_TW.js
@@ -0,0 +1,97 @@
+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" : "存取被拒",
+    "File name cannot be empty." : "檔名不能為空",
+    "\"%s\" is an invalid file name." : "%s 是不合法的檔名。",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "檔名不合法，不允許 \\ / < > : \" | ? * 字元",
+    "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 ，請換一個名字",
+    "Not a valid source" : "不是有效的來源",
+    "Server is not allowed to open URLs, please check the server configuration" : "伺服器上不允許開啓 URL ，請檢查伺服器設定",
+    "The file exceeds your quota by %s" : "這個檔案大小超出配額 %s",
+    "Error while downloading %s to %s" : "下載 %s 到 %s 失敗",
+    "Error when creating the file" : "建立檔案失敗",
+    "Folder name cannot be empty." : "資料夾名稱不能留空",
+    "Error when creating the folder" : "建立資料夾失敗",
+    "Unable to set upload directory." : "無法設定上傳目錄",
+    "Invalid Token" : "無效的 token",
+    "No file was uploaded. Unknown error" : "沒有檔案被上傳，原因未知",
+    "There is no error, the file uploaded with success" : "一切都順利，檔案上傳成功",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制",
+    "The uploaded file was only partially uploaded" : "只有檔案的一部分被上傳",
+    "No file was uploaded" : "沒有檔案被上傳",
+    "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" : "所有檔案",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳",
+    "Total file size {size1} exceeds upload limit {size2}" : "檔案大小總和 {size1} 超過上傳限制 {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}",
+    "Upload cancelled." : "上傳已取消",
+    "Could not get result from server." : "無法從伺服器取回結果",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳。",
+    "URL cannot be empty" : "URL 不能留空",
+    "{new_name} already exists" : "{new_name} 已經存在",
+    "Could not create file" : "無法建立檔案",
+    "Could not create folder" : "無法建立資料夾",
+    "Error fetching URL" : "抓取 URL 發生錯誤",
+    "Share" : "分享",
+    "Delete" : "刪除",
+    "Disconnect storage" : "斷開儲存空間連接",
+    "Unshare" : "取消分享",
+    "Delete permanently" : "永久刪除",
+    "Rename" : "重新命名",
+    "Pending" : "等候中",
+    "Error moving file." : "移動檔案發生錯誤",
+    "Error moving file" : "移動檔案失敗",
+    "Error" : "錯誤",
+    "Could not rename file" : "無法重新命名",
+    "Error deleting file." : "刪除檔案發生錯誤",
+    "Name" : "名稱",
+    "Size" : "大小",
+    "Modified" : "修改時間",
+    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
+    "_%n file_::_%n files_" : ["%n 個檔案"],
+    "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案",
+    "_Uploading %n file_::_Uploading %n files_" : ["%n 個檔案正在上傳"],
+    "\"{name}\" is an invalid file name." : "{name} 是無效的檔名",
+    "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
+    "Your storage is almost full ({usedSpacePercent}%)" : "您的儲存空間快要滿了 ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。",
+    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "%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" : "儲存",
+    "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" : "資料夾",
+    "From link" : "從連結",
+    "Nothing in here. Upload something!" : "這裡還沒有東西，上傳一些吧！",
+    "Download" : "下載",
+    "Upload too large" : "上傳過大",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您試圖上傳的檔案大小超過伺服器的限制。",
+    "Files are being scanned, please wait." : "正在掃描檔案，請稍等。",
+    "Currently scanning" : "正在掃描"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files/l10n/zh_TW.json b/apps/files/l10n/zh_TW.json
new file mode 100644
index 00000000000..f55b936a40f
--- /dev/null
+++ b/apps/files/l10n/zh_TW.json
@@ -0,0 +1,95 @@
+{ "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" : "存取被拒",
+    "File name cannot be empty." : "檔名不能為空",
+    "\"%s\" is an invalid file name." : "%s 是不合法的檔名。",
+    "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "檔名不合法，不允許 \\ / < > : \" | ? * 字元",
+    "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 ，請換一個名字",
+    "Not a valid source" : "不是有效的來源",
+    "Server is not allowed to open URLs, please check the server configuration" : "伺服器上不允許開啓 URL ，請檢查伺服器設定",
+    "The file exceeds your quota by %s" : "這個檔案大小超出配額 %s",
+    "Error while downloading %s to %s" : "下載 %s 到 %s 失敗",
+    "Error when creating the file" : "建立檔案失敗",
+    "Folder name cannot be empty." : "資料夾名稱不能留空",
+    "Error when creating the folder" : "建立資料夾失敗",
+    "Unable to set upload directory." : "無法設定上傳目錄",
+    "Invalid Token" : "無效的 token",
+    "No file was uploaded. Unknown error" : "沒有檔案被上傳，原因未知",
+    "There is no error, the file uploaded with success" : "一切都順利，檔案上傳成功",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制",
+    "The uploaded file was only partially uploaded" : "只有檔案的一部分被上傳",
+    "No file was uploaded" : "沒有檔案被上傳",
+    "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" : "所有檔案",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "因為 {filename} 是個目錄或是大小為零，所以無法上傳",
+    "Total file size {size1} exceeds upload limit {size2}" : "檔案大小總和 {size1} 超過上傳限制 {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}",
+    "Upload cancelled." : "上傳已取消",
+    "Could not get result from server." : "無法從伺服器取回結果",
+    "File upload is in progress. Leaving the page now will cancel the upload." : "檔案上傳中，離開此頁面將會取消上傳。",
+    "URL cannot be empty" : "URL 不能留空",
+    "{new_name} already exists" : "{new_name} 已經存在",
+    "Could not create file" : "無法建立檔案",
+    "Could not create folder" : "無法建立資料夾",
+    "Error fetching URL" : "抓取 URL 發生錯誤",
+    "Share" : "分享",
+    "Delete" : "刪除",
+    "Disconnect storage" : "斷開儲存空間連接",
+    "Unshare" : "取消分享",
+    "Delete permanently" : "永久刪除",
+    "Rename" : "重新命名",
+    "Pending" : "等候中",
+    "Error moving file." : "移動檔案發生錯誤",
+    "Error moving file" : "移動檔案失敗",
+    "Error" : "錯誤",
+    "Could not rename file" : "無法重新命名",
+    "Error deleting file." : "刪除檔案發生錯誤",
+    "Name" : "名稱",
+    "Size" : "大小",
+    "Modified" : "修改時間",
+    "_%n folder_::_%n folders_" : ["%n 個資料夾"],
+    "_%n file_::_%n files_" : ["%n 個檔案"],
+    "You don’t have permission to upload or create files here" : "您沒有權限在這裡上傳或建立檔案",
+    "_Uploading %n file_::_Uploading %n files_" : ["%n 個檔案正在上傳"],
+    "\"{name}\" is an invalid file name." : "{name} 是無效的檔名",
+    "Your storage is full, files can not be updated or synced anymore!" : "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
+    "Your storage is almost full ({usedSpacePercent}%)" : "您的儲存空間快要滿了 ({usedSpacePercent}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
+    "Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." : "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。",
+    "{dirs} and {files}" : "{dirs} 和 {files}",
+    "%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" : "儲存",
+    "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" : "資料夾",
+    "From link" : "從連結",
+    "Nothing in here. Upload something!" : "這裡還沒有東西，上傳一些吧！",
+    "Download" : "下載",
+    "Upload too large" : "上傳過大",
+    "The files you are trying to upload exceed the maximum size for file uploads on this server." : "您試圖上傳的檔案大小超過伺服器的限制。",
+    "Files are being scanned, please wait." : "正在掃描檔案，請稍等。",
+    "Currently scanning" : "正在掃描"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
deleted file mode 100644
index 394283b9621..00000000000
--- a/apps/files/l10n/zh_TW.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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" => "存取被拒",
-"File name cannot be empty." => "檔名不能為空",
-"\"%s\" is an invalid file name." => "%s 是不合法的檔名。",
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "檔名不合法，不允許 \\ / < > : \" | ? * 字元",
-"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 ，請換一個名字",
-"Not a valid source" => "不是有效的來源",
-"Server is not allowed to open URLs, please check the server configuration" => "伺服器上不允許開啓 URL ，請檢查伺服器設定",
-"The file exceeds your quota by %s" => "這個檔案大小超出配額 %s",
-"Error while downloading %s to %s" => "下載 %s 到 %s 失敗",
-"Error when creating the file" => "建立檔案失敗",
-"Folder name cannot be empty." => "資料夾名稱不能留空",
-"Error when creating the folder" => "建立資料夾失敗",
-"Unable to set upload directory." => "無法設定上傳目錄",
-"Invalid Token" => "無效的 token",
-"No file was uploaded. Unknown error" => "沒有檔案被上傳，原因未知",
-"There is no error, the file uploaded with success" => "一切都順利，檔案上傳成功",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "上傳的檔案大小超過 php.ini 當中 upload_max_filesize 參數的設定：",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "上傳的檔案大小超過 HTML 表單中 MAX_FILE_SIZE 的限制",
-"The uploaded file was only partially uploaded" => "只有檔案的一部分被上傳",
-"No file was uploaded" => "沒有檔案被上傳",
-"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" => "所有檔案",
-"Unable to upload {filename} as it is a directory or has 0 bytes" => "因為 {filename} 是個目錄或是大小為零，所以無法上傳",
-"Total file size {size1} exceeds upload limit {size2}" => "檔案大小總和 {size1} 超過上傳限制 {size2}",
-"Not enough free space, you are uploading {size1} but only {size2} is left" => "可用空間不足，你正要上傳 {size1} 可是只剩下 {size2}",
-"Upload cancelled." => "上傳已取消",
-"Could not get result from server." => "無法從伺服器取回結果",
-"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中，離開此頁面將會取消上傳。",
-"URL cannot be empty" => "URL 不能留空",
-"{new_name} already exists" => "{new_name} 已經存在",
-"Could not create file" => "無法建立檔案",
-"Could not create folder" => "無法建立資料夾",
-"Error fetching URL" => "抓取 URL 發生錯誤",
-"Share" => "分享",
-"Delete" => "刪除",
-"Disconnect storage" => "斷開儲存空間連接",
-"Unshare" => "取消分享",
-"Delete permanently" => "永久刪除",
-"Rename" => "重新命名",
-"Pending" => "等候中",
-"Error moving file." => "移動檔案發生錯誤",
-"Error moving file" => "移動檔案失敗",
-"Error" => "錯誤",
-"Could not rename file" => "無法重新命名",
-"Error deleting file." => "刪除檔案發生錯誤",
-"Name" => "名稱",
-"Size" => "大小",
-"Modified" => "修改時間",
-"_%n folder_::_%n folders_" => array("%n 個資料夾"),
-"_%n file_::_%n files_" => array("%n 個檔案"),
-"You don’t have permission to upload or create files here" => "您沒有權限在這裡上傳或建立檔案",
-"_Uploading %n file_::_Uploading %n files_" => array("%n 個檔案正在上傳"),
-"\"{name}\" is an invalid file name." => "{name} 是無效的檔名",
-"Your storage is full, files can not be updated or synced anymore!" => "您的儲存空間已滿，沒有辦法再更新或是同步檔案！",
-"Your storage is almost full ({usedSpacePercent}%)" => "您的儲存空間快要滿了 ({usedSpacePercent}%)",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
-"Invalid private key for Encryption App. Please update your private key password in your personal settings to recover access to your encrypted files." => "無效的檔案加密私鑰，請在個人設定中更新您的私鑰密語以存取加密的檔案。",
-"Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." => "加密已經被停用，但是您的舊檔案還是處於已加密的狀態，請前往個人設定以解密這些檔案。",
-"{dirs} and {files}" => "{dirs} 和 {files}",
-"%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" => "儲存",
-"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" => "資料夾",
-"From link" => "從連結",
-"Nothing in here. Upload something!" => "這裡還沒有東西，上傳一些吧！",
-"Download" => "下載",
-"Upload too large" => "上傳過大",
-"The files you are trying to upload exceed the maximum size for file uploads on this server." => "您試圖上傳的檔案大小超過伺服器的限制。",
-"Files are being scanned, please wait." => "正在掃描檔案，請稍等。",
-"Currently scanning" => "正在掃描"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ar.js b/apps/files_encryption/l10n/ar.js
new file mode 100644
index 00000000000..b1af4358241
--- /dev/null
+++ b/apps/files_encryption/l10n/ar.js
@@ -0,0 +1,43 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "خطأ غير معروف. ",
+    "Recovery key successfully enabled" : "تم بنجاح تفعيل مفتاح الاستعادة",
+    "Could not disable recovery key. Please check your recovery key password!" : "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+    "Recovery key successfully disabled" : "تم تعطيل مفتاح الاستعادة بنجاح",
+    "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
+    "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+    "Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
+    "Could not update the private key password. Maybe the old password was not correct." : "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+    "File recovery settings updated" : "اعدادات ملف الاستعادة تم تحديثه",
+    "Could not update file recovery" : "تعذر تحديث ملف الاستعادة",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "مفتاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور في الاعدادات الشخصية لإستعادة الوصول الى ملفاتك المشفرة.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
+    "Unknown error. Please check your system settings or contact your administrator" : "خطأ غير معروف, الرجاء التحقق من إعدادات نظامك أو راسل المدير",
+    "Missing requirements." : "متطلبات ناقصة.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "يرجى التاكد من ان اصدار PHP 5.3.3 او احدث , مثبت و التاكد من ان OpenSSL مفعل و مهيئ بشكل صحيح. حتى الان برنامج التتشفير تم تعطيلة.",
+    "Following users are not set up for encryption:" : "المستخدمين التاليين لم يتم تعيين لهم التشفيير:",
+    "Initial encryption started... This can take some time. Please wait." : "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار.",
+    "Initial encryption running... Please try again later." : "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا",
+    "Go directly to your %spersonal settings%s." : "  .%spersonal settings%s إنتقل مباشرة إلى ",
+    "Encryption" : "التشفير",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):",
+    "Recovery key password" : "استعادة كلمة مرور المفتاح",
+    "Repeat Recovery key password" : "كرر كلمة المرور لـ استعادة المفتاح",
+    "Enabled" : "مفعلة",
+    "Disabled" : "معطلة",
+    "Change recovery key password:" : "تعديل كلمة المرور استعادة المفتاح:",
+    "Old Recovery key password" : "كلمة المرور القديمة لـ استعامة المفتاح",
+    "New Recovery key password" : "تعيين كلمة مرور جديدة لـ استعادة المفتاح",
+    "Repeat New Recovery key password" : "كرر كلمة المرور لـ استعادة المفتاح من جديد",
+    "Change Password" : "عدل كلمة السر",
+    " 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" : "كلمة المرور الحالية الخاصة بالدخول",
+    "Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
+    "Enable password recovery:" : "تفعيل استعادة كلمة المرور:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور"
+},
+"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_encryption/l10n/ar.json b/apps/files_encryption/l10n/ar.json
new file mode 100644
index 00000000000..f65d0c7b327
--- /dev/null
+++ b/apps/files_encryption/l10n/ar.json
@@ -0,0 +1,41 @@
+{ "translations": {
+    "Unknown error" : "خطأ غير معروف. ",
+    "Recovery key successfully enabled" : "تم بنجاح تفعيل مفتاح الاستعادة",
+    "Could not disable recovery key. Please check your recovery key password!" : "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
+    "Recovery key successfully disabled" : "تم تعطيل مفتاح الاستعادة بنجاح",
+    "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
+    "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+    "Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
+    "Could not update the private key password. Maybe the old password was not correct." : "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.",
+    "File recovery settings updated" : "اعدادات ملف الاستعادة تم تحديثه",
+    "Could not update file recovery" : "تعذر تحديث ملف الاستعادة",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "مفتاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور في الاعدادات الشخصية لإستعادة الوصول الى ملفاتك المشفرة.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
+    "Unknown error. Please check your system settings or contact your administrator" : "خطأ غير معروف, الرجاء التحقق من إعدادات نظامك أو راسل المدير",
+    "Missing requirements." : "متطلبات ناقصة.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "يرجى التاكد من ان اصدار PHP 5.3.3 او احدث , مثبت و التاكد من ان OpenSSL مفعل و مهيئ بشكل صحيح. حتى الان برنامج التتشفير تم تعطيلة.",
+    "Following users are not set up for encryption:" : "المستخدمين التاليين لم يتم تعيين لهم التشفيير:",
+    "Initial encryption started... This can take some time. Please wait." : "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار.",
+    "Initial encryption running... Please try again later." : "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا",
+    "Go directly to your %spersonal settings%s." : "  .%spersonal settings%s إنتقل مباشرة إلى ",
+    "Encryption" : "التشفير",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):",
+    "Recovery key password" : "استعادة كلمة مرور المفتاح",
+    "Repeat Recovery key password" : "كرر كلمة المرور لـ استعادة المفتاح",
+    "Enabled" : "مفعلة",
+    "Disabled" : "معطلة",
+    "Change recovery key password:" : "تعديل كلمة المرور استعادة المفتاح:",
+    "Old Recovery key password" : "كلمة المرور القديمة لـ استعامة المفتاح",
+    "New Recovery key password" : "تعيين كلمة مرور جديدة لـ استعادة المفتاح",
+    "Repeat New Recovery key password" : "كرر كلمة المرور لـ استعادة المفتاح من جديد",
+    "Change Password" : "عدل كلمة السر",
+    " 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" : "كلمة المرور الحالية الخاصة بالدخول",
+    "Update Private Key Password" : "تحديث كلمة المرور لـ المفتاح الخاص",
+    "Enable password recovery:" : "تفعيل استعادة كلمة المرور:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور"
+},"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_encryption/l10n/ar.php b/apps/files_encryption/l10n/ar.php
deleted file mode 100644
index 7cda7379693..00000000000
--- a/apps/files_encryption/l10n/ar.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "خطأ غير معروف. ",
-"Recovery key successfully enabled" => "تم بنجاح تفعيل مفتاح الاستعادة",
-"Could not disable recovery key. Please check your recovery key password!" => "لا يمكن تعطيل مفتاح الاستعادة, يرجى التحقق من كلمة مرور مفتاح الاستعادة!",
-"Recovery key successfully disabled" => "تم تعطيل مفتاح الاستعادة بنجاح",
-"Password successfully changed." => "تم تغيير كلمة المرور بنجاح.",
-"Could not change the password. Maybe the old password was not correct." => "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
-"Private key password successfully updated." => "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
-"Could not update the private key password. Maybe the old password was not correct." => "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.",
-"File recovery settings updated" => "اعدادات ملف الاستعادة تم تحديثه",
-"Could not update file recovery" => "تعذر تحديث ملف الاستعادة",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "مفتاحك الخاص غير صالح! ربما تم تغيير كلمة المرور خارج %s (مثل:مجلد شركتك). يمكنك تحديث كلمة المرور في الاعدادات الشخصية لإستعادة الوصول الى ملفاتك المشفرة.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "لا يمكن فك التشفير من هذا الملف, من الممكن ان يكون هذا الملف مُشارك. يرجى سؤال صاحب الملف لإعادة مشاركتة معك.",
-"Unknown error. Please check your system settings or contact your administrator" => "خطأ غير معروف, الرجاء التحقق من إعدادات نظامك أو راسل المدير",
-"Missing requirements." => "متطلبات ناقصة.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "يرجى التاكد من ان اصدار PHP 5.3.3 او احدث , مثبت و التاكد من ان OpenSSL مفعل و مهيئ بشكل صحيح. حتى الان برنامج التتشفير تم تعطيلة.",
-"Following users are not set up for encryption:" => "المستخدمين التاليين لم يتم تعيين لهم التشفيير:",
-"Initial encryption started... This can take some time. Please wait." => "بدأ التشفير... من الممكن ان ياخذ بعض الوقت. يرجى الانتظار.",
-"Initial encryption running... Please try again later." => "جاري تفعيل التشفير المبدئي ، الرجاء المحاولة لاحقا",
-"Go directly to your %spersonal settings%s." => "  .%spersonal settings%s إنتقل مباشرة إلى ",
-"Encryption" => "التشفير",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "تم تمكين تشفير البرامج لكن لم يتم تهيئة المفاتيح لذا يرجى تسجيل الخروج ثم تسجيل الدخول مرة آخرى.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "تفعيل استعادة المفتاح (سوف يمكنك من استعادة ملفات المستخدمين في حال فقدان كلمة المرور):",
-"Recovery key password" => "استعادة كلمة مرور المفتاح",
-"Repeat Recovery key password" => "كرر كلمة المرور لـ استعادة المفتاح",
-"Enabled" => "مفعلة",
-"Disabled" => "معطلة",
-"Change recovery key password:" => "تعديل كلمة المرور استعادة المفتاح:",
-"Old Recovery key password" => "كلمة المرور القديمة لـ استعامة المفتاح",
-"New Recovery key password" => "تعيين كلمة مرور جديدة لـ استعادة المفتاح",
-"Repeat New Recovery key password" => "كرر كلمة المرور لـ استعادة المفتاح من جديد",
-"Change Password" => "عدل كلمة السر",
-" 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" => "كلمة المرور الحالية الخاصة بالدخول",
-"Update Private Key Password" => "تحديث كلمة المرور لـ المفتاح الخاص",
-"Enable password recovery:" => "تفعيل استعادة كلمة المرور:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "تفعيل هذا الخيار يمكنك من اعادة الوصول الى ملفاتك المشفرة عند فقدان كلمة المرور"
-);
-$PLURAL_FORMS = "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_encryption/l10n/ast.js b/apps/files_encryption/l10n/ast.js
new file mode 100644
index 00000000000..2252f302aaa
--- /dev/null
+++ b/apps/files_encryption/l10n/ast.js
@@ -0,0 +1,44 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Fallu desconocíu",
+    "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Password successfully changed." : "Camudóse la contraseña",
+    "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
+    "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.",
+    "File recovery settings updated" : "Opciones de recuperación de ficheros anovada",
+    "Could not update file recovery" : "Nun pudo anovase la recuperación de ficheros",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Fallu desconocíu. Por favor, comprueba los axustes del sistema o contauta col alministrador",
+    "Missing requirements." : "Requisitos incompletos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse.",
+    "Following users are not set up for encryption:" : "Los siguientes usuarios nun se configuraron pal cifráu:",
+    "Initial encryption started... This can take some time. Please wait." : "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.",
+    "Initial encryption running... Please try again later." : "Cifráu inicial en cursu... Inténtalo dempués.",
+    "Go directly to your %spersonal settings%s." : "Dir direutamente a los tos %saxustes personales%s.",
+    "Encryption" : "Cifráu",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repeti la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitáu",
+    "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Clave de recuperación vieya",
+    "New Recovery key password" : "Clave de recuperación nueva",
+    "Repeat New Recovery key password" : "Repetir la clave de recuperación nueva",
+    "Change Password" : "Camudar contraseña",
+    "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
+    "Old log-in password" : "Contraseña d'accesu vieya",
+    "Current log-in password" : "Contraseña d'accesu actual",
+    "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/ast.json b/apps/files_encryption/l10n/ast.json
new file mode 100644
index 00000000000..4c1edefea97
--- /dev/null
+++ b/apps/files_encryption/l10n/ast.json
@@ -0,0 +1,42 @@
+{ "translations": {
+    "Unknown error" : "Fallu desconocíu",
+    "Recovery key successfully enabled" : "Habilitóse la recuperación de ficheros",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Password successfully changed." : "Camudóse la contraseña",
+    "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
+    "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.",
+    "File recovery settings updated" : "Opciones de recuperación de ficheros anovada",
+    "Could not update file recovery" : "Nun pudo anovase la recuperación de ficheros",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Fallu desconocíu. Por favor, comprueba los axustes del sistema o contauta col alministrador",
+    "Missing requirements." : "Requisitos incompletos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse.",
+    "Following users are not set up for encryption:" : "Los siguientes usuarios nun se configuraron pal cifráu:",
+    "Initial encryption started... This can take some time. Please wait." : "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.",
+    "Initial encryption running... Please try again later." : "Cifráu inicial en cursu... Inténtalo dempués.",
+    "Go directly to your %spersonal settings%s." : "Dir direutamente a los tos %saxustes personales%s.",
+    "Encryption" : "Cifráu",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repeti la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitáu",
+    "Change recovery key password:" : "Camudar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Clave de recuperación vieya",
+    "New Recovery key password" : "Clave de recuperación nueva",
+    "Repeat New Recovery key password" : "Repetir la clave de recuperación nueva",
+    "Change Password" : "Camudar contraseña",
+    "Set your old private key password to your current log-in password:" : "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
+    "Old log-in password" : "Contraseña d'accesu vieya",
+    "Current log-in password" : "Contraseña d'accesu actual",
+    "Update Private Key Password" : "Anovar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ast.php b/apps/files_encryption/l10n/ast.php
deleted file mode 100644
index d03ebb47b62..00000000000
--- a/apps/files_encryption/l10n/ast.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Fallu desconocíu",
-"Recovery key successfully enabled" => "Habilitóse la recuperación de ficheros",
-"Could not disable recovery key. Please check your recovery key password!" => "Nun pudo deshabilitase la clave de recuperación. Por favor comprueba la contraseña!",
-"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
-"Password successfully changed." => "Camudóse la contraseña",
-"Could not change the password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
-"Private key password successfully updated." => "Contraseña de clave privada anovada correchamente.",
-"Could not update the private key password. Maybe the old password was not correct." => "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.",
-"File recovery settings updated" => "Opciones de recuperación de ficheros anovada",
-"Could not update file recovery" => "Nun pudo anovase la recuperación de ficheros",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡La clave privada nun ye válida! Seique la contraseña se camudase dende fuera de %s (Ex:El to direutoriu corporativu). Pues anovar la contraseña de la clave privada nes tos opciones personales pa recuperar l'accesu a los ficheros.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Fallu desconocíu. Por favor, comprueba los axustes del sistema o contauta col alministrador",
-"Missing requirements." => "Requisitos incompletos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrate de que PHP 5.3.3 o postreru ta instaláu y que la estensión OpenSSL de PHP ta habilitada y configurada correutamente. Pel momentu, l'aplicación de cifráu deshabilitóse.",
-"Following users are not set up for encryption:" => "Los siguientes usuarios nun se configuraron pal cifráu:",
-"Initial encryption started... This can take some time. Please wait." => "Cifráu aniciáu..... Esto pue llevar un tiempu. Por favor espera.",
-"Initial encryption running... Please try again later." => "Cifráu inicial en cursu... Inténtalo dempués.",
-"Go directly to your %spersonal settings%s." => "Dir direutamente a los tos %saxustes personales%s.",
-"Encryption" => "Cifráu",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuariu en casu de perda de la contraseña);",
-"Recovery key password" => "Contraseña de clave de recuperación",
-"Repeat Recovery key password" => "Repeti la contraseña de clave de recuperación",
-"Enabled" => "Habilitar",
-"Disabled" => "Deshabilitáu",
-"Change recovery key password:" => "Camudar la contraseña de la clave de recuperación",
-"Old Recovery key password" => "Clave de recuperación vieya",
-"New Recovery key password" => "Clave de recuperación nueva",
-"Repeat New Recovery key password" => "Repetir la clave de recuperación nueva",
-"Change Password" => "Camudar contraseña",
-"Set your old private key password to your current log-in password:" => "Afita la contraseña de clave privada vieya pa la to contraseña d'aniciu de sesión actual:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Si nun recuerdes la contraseña vieya, pues pidir a alministrador que te recupere los ficheros.",
-"Old log-in password" => "Contraseña d'accesu vieya",
-"Current log-in password" => "Contraseña d'accesu actual",
-"Update Private Key Password" => "Anovar Contraseña de Clave Privada",
-"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción va permitite volver a tener accesu a los ficheros cifraos en casu de perda de contraseña"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/az.js b/apps/files_encryption/l10n/az.js
new file mode 100644
index 00000000000..29c4bc2633d
--- /dev/null
+++ b/apps/files_encryption/l10n/az.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Bəlli olmayan səhv baş verdi",
+    "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
+    "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
+    "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
+    "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Sizin gizli açarınız doğru deyil! Təxmin edilir ki, sizin şifrə %s-dən kənarda dəyişdirilib(misal üçün sizin koorporativ qovluq). Siz öz şifrələnmiş fayllarınıza yetkinizi bərpa etmək üçün, öz şifrənizi şəxsi quraşdırmalarınızda yeniləyə bilərsiniz.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Tanınmayan səhv. Xahiş olunur sistem quraşdırmalarınızı yoxlayın yada öz inzibatçınızla əlaqə yaradın",
+    "Missing requirements." : "Taləbatlar çatışmır.",
+    "Initial encryption running... Please try again later." : "İlkin şifrələnmə işləyir... Xahiş olunur birazdan yenidən müraciət edəsiniz.",
+    "Go directly to your %spersonal settings%s." : "Birbaşa öz %sşəxsi quraşdırmalarınıza%s gedin.",
+    "Encryption" : "Şifrələnmə"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/az.json b/apps/files_encryption/l10n/az.json
new file mode 100644
index 00000000000..f801dd0b247
--- /dev/null
+++ b/apps/files_encryption/l10n/az.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Unknown error" : "Bəlli olmayan səhv baş verdi",
+    "Recovery key successfully enabled" : "Bərpa açarı uğurla aktivləşdi",
+    "Could not disable recovery key. Please check your recovery key password!" : "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
+    "Recovery key successfully disabled" : "Bərpa açarı uğurla söndürüldü",
+    "Password successfully changed." : "Şifrə uğurla dəyişdirildi.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Sizin gizli açarınız doğru deyil! Təxmin edilir ki, sizin şifrə %s-dən kənarda dəyişdirilib(misal üçün sizin koorporativ qovluq). Siz öz şifrələnmiş fayllarınıza yetkinizi bərpa etmək üçün, öz şifrənizi şəxsi quraşdırmalarınızda yeniləyə bilərsiniz.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Tanınmayan səhv. Xahiş olunur sistem quraşdırmalarınızı yoxlayın yada öz inzibatçınızla əlaqə yaradın",
+    "Missing requirements." : "Taləbatlar çatışmır.",
+    "Initial encryption running... Please try again later." : "İlkin şifrələnmə işləyir... Xahiş olunur birazdan yenidən müraciət edəsiniz.",
+    "Go directly to your %spersonal settings%s." : "Birbaşa öz %sşəxsi quraşdırmalarınıza%s gedin.",
+    "Encryption" : "Şifrələnmə"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/az.php b/apps/files_encryption/l10n/az.php
deleted file mode 100644
index 2cc8bd67df4..00000000000
--- a/apps/files_encryption/l10n/az.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Bəlli olmayan səhv baş verdi",
-"Recovery key successfully enabled" => "Bərpa açarı uğurla aktivləşdi",
-"Could not disable recovery key. Please check your recovery key password!" => "Geriqaytarılma açarını sondürmək olmur. Xahiş edirik geriqaytarılma key açarınızı yoxlayın.",
-"Recovery key successfully disabled" => "Bərpa açarı uğurla söndürüldü",
-"Password successfully changed." => "Şifrə uğurla dəyişdirildi.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sizin gizli açarınız doğru deyil! Təxmin edilir ki, sizin şifrə %s-dən kənarda dəyişdirilib(misal üçün sizin koorporativ qovluq). Siz öz şifrələnmiş fayllarınıza yetkinizi bərpa etmək üçün, öz şifrənizi şəxsi quraşdırmalarınızda yeniləyə bilərsiniz.",
-"Unknown error. Please check your system settings or contact your administrator" => "Tanınmayan səhv. Xahiş olunur sistem quraşdırmalarınızı yoxlayın yada öz inzibatçınızla əlaqə yaradın",
-"Missing requirements." => "Taləbatlar çatışmır.",
-"Initial encryption running... Please try again later." => "İlkin şifrələnmə işləyir... Xahiş olunur birazdan yenidən müraciət edəsiniz.",
-"Go directly to your %spersonal settings%s." => "Birbaşa öz %sşəxsi quraşdırmalarınıza%s gedin.",
-"Encryption" => "Şifrələnmə"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/bg_BG.js b/apps/files_encryption/l10n/bg_BG.js
new file mode 100644
index 00000000000..a117818ba84
--- /dev/null
+++ b/apps/files_encryption/l10n/bg_BG.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Непозната грешка.",
+    "Missing recovery key password" : "Липсва парола за възстановяване",
+    "Please repeat the recovery key password" : "Повтори новата парола за възстановяване",
+    "Repeated recovery key password does not match the provided recovery key password" : "Повторената парола за възстановяване не съвпада със зададената парола за възстановяване",
+    "Recovery key successfully enabled" : "Успешно включване на опцията ключ за възстановяване.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
+    "Recovery key successfully disabled" : "Успешно изключване на ключа за възстановяване.",
+    "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." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+    "Private key password successfully updated." : "Успешно променена тайната парола за ключа.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.",
+    "File recovery settings updated" : "Настройките за възстановяване на файлове са променени.",
+    "Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Непозната грешка. Моля, провери системните настройки или се свържи с администратора.",
+    "Missing requirements." : "Липсва задължителна информация.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля, увери се, че PHP 5.3.3 или по-нова версия е инсталирана, и че OpenSSL заедно съответната PHP добавка са включени и правилно настроени. За сега, криптиращото приложение ще бъде изключено.",
+    "Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:",
+    "Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
+    "Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.",
+    "Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.",
+    "Encryption" : "Криптиране",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
+    "Recovery key password" : "Парола за възстановяане на ключа",
+    "Repeat Recovery key password" : "Повтори паролата за възстановяване на ключа",
+    "Enabled" : "Включено",
+    "Disabled" : "Изключено",
+    "Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
+    "Old Recovery key password" : "Старата парола за въстановяване на ключа",
+    "New Recovery key password" : "Новата парола за възстановяване на ключа",
+    "Repeat New Recovery key password" : "Повтори новата паролза за възстановяване на ключа",
+    "Change Password" : "Промени Паролата",
+    "Your private key password no longer matches your log-in password." : "Личният ти ключ не съвпада с паролата за вписване.",
+    "Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
+    " 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" : "Текуща парола за вписване",
+    "Update Private Key Password" : "Промени Тайната Парола за Ключа",
+    "Enable password recovery:" : "Включи опцията възстановяване на паролата:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/bg_BG.json b/apps/files_encryption/l10n/bg_BG.json
new file mode 100644
index 00000000000..74ac2593091
--- /dev/null
+++ b/apps/files_encryption/l10n/bg_BG.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Непозната грешка.",
+    "Missing recovery key password" : "Липсва парола за възстановяване",
+    "Please repeat the recovery key password" : "Повтори новата парола за възстановяване",
+    "Repeated recovery key password does not match the provided recovery key password" : "Повторената парола за възстановяване не съвпада със зададената парола за възстановяване",
+    "Recovery key successfully enabled" : "Успешно включване на опцията ключ за възстановяване.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
+    "Recovery key successfully disabled" : "Успешно изключване на ключа за възстановяване.",
+    "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." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+    "Private key password successfully updated." : "Успешно променена тайната парола за ключа.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.",
+    "File recovery settings updated" : "Настройките за възстановяване на файлове са променени.",
+    "Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Непозната грешка. Моля, провери системните настройки или се свържи с администратора.",
+    "Missing requirements." : "Липсва задължителна информация.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Моля, увери се, че PHP 5.3.3 или по-нова версия е инсталирана, и че OpenSSL заедно съответната PHP добавка са включени и правилно настроени. За сега, криптиращото приложение ще бъде изключено.",
+    "Following users are not set up for encryption:" : "Следните потребители не са настроени за криптиране:",
+    "Initial encryption started... This can take some time. Please wait." : "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
+    "Initial encryption running... Please try again later." : "Тече първоначално криптиране... Моля опитай по-късно.",
+    "Go directly to your %spersonal settings%s." : "Отиде направо към твоите %sлични настройки%s.",
+    "Encryption" : "Криптиране",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
+    "Recovery key password" : "Парола за възстановяане на ключа",
+    "Repeat Recovery key password" : "Повтори паролата за възстановяване на ключа",
+    "Enabled" : "Включено",
+    "Disabled" : "Изключено",
+    "Change recovery key password:" : "Промени паролата за въстановяване на ключа:",
+    "Old Recovery key password" : "Старата парола за въстановяване на ключа",
+    "New Recovery key password" : "Новата парола за възстановяване на ключа",
+    "Repeat New Recovery key password" : "Повтори новата паролза за възстановяване на ключа",
+    "Change Password" : "Промени Паролата",
+    "Your private key password no longer matches your log-in password." : "Личният ти ключ не съвпада с паролата за вписване.",
+    "Set your old private key password to your current log-in password:" : "Промени паролата за тайния ти включ на паролата за вписване:",
+    " 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" : "Текуща парола за вписване",
+    "Update Private Key Password" : "Промени Тайната Парола за Ключа",
+    "Enable password recovery:" : "Включи опцията възстановяване на паролата:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/bg_BG.php b/apps/files_encryption/l10n/bg_BG.php
deleted file mode 100644
index 43d089671cb..00000000000
--- a/apps/files_encryption/l10n/bg_BG.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Непозната грешка.",
-"Missing recovery key password" => "Липсва парола за възстановяване",
-"Please repeat the recovery key password" => "Повтори новата парола за възстановяване",
-"Repeated recovery key password does not match the provided recovery key password" => "Повторената парола за възстановяване не съвпада със зададената парола за възстановяване",
-"Recovery key successfully enabled" => "Успешно включване на опцията ключ за възстановяване.",
-"Could not disable recovery key. Please check your recovery key password!" => "Неуспешно изключване на ключа за възстановяване. Моля, провери паролата за ключа за възстановяване!",
-"Recovery key successfully disabled" => "Успешно изключване на ключа за възстановяване.",
-"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." => "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
-"Private key password successfully updated." => "Успешно променена тайната парола за ключа.",
-"Could not update the private key password. Maybe the old password was not correct." => "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.",
-"File recovery settings updated" => "Настройките за възстановяване на файлове са променени.",
-"Could not update file recovery" => "Неуспешна промяна на настройките за възстановяване на файлове.",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Твоят таен ключ е невалиден! Вероятно твоята парола беше променена извън %s(пр. твоята корпоративна директория). Можеш да промениш своят таен ключ в Лични настройки, за да възстановиш достъпа до криптираните файлове.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Неуспешно разшифроване на този файл, вероятно това е споделен файл. Моля, поискай собственика на файла да го сподели повторно с теб.",
-"Unknown error. Please check your system settings or contact your administrator" => "Непозната грешка. Моля, провери системните настройки или се свържи с администратора.",
-"Missing requirements." => "Липсва задължителна информация.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Моля, увери се, че PHP 5.3.3 или по-нова версия е инсталирана, и че OpenSSL заедно съответната PHP добавка са включени и правилно настроени. За сега, криптиращото приложение ще бъде изключено.",
-"Following users are not set up for encryption:" => "Следните потребители не са настроени за криптиране:",
-"Initial encryption started... This can take some time. Please wait." => "Първоначалното криптиране започна... Това може да отнеме време. Моля изчакай.",
-"Initial encryption running... Please try again later." => "Тече първоначално криптиране... Моля опитай по-късно.",
-"Go directly to your %spersonal settings%s." => "Отиде направо към твоите %sлични настройки%s.",
-"Encryption" => "Криптиране",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Програмата за криптиране е включена, но твоите ключове не са зададени, моля отпиши си и се впиши отново.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Включи опцията възстановяване на ключ (разрешава да възстанови файловете на потребителите в случай на загубена парола):",
-"Recovery key password" => "Парола за възстановяане на ключа",
-"Repeat Recovery key password" => "Повтори паролата за възстановяване на ключа",
-"Enabled" => "Включено",
-"Disabled" => "Изключено",
-"Change recovery key password:" => "Промени паролата за въстановяване на ключа:",
-"Old Recovery key password" => "Старата парола за въстановяване на ключа",
-"New Recovery key password" => "Новата парола за възстановяване на ключа",
-"Repeat New Recovery key password" => "Повтори новата паролза за възстановяване на ключа",
-"Change Password" => "Промени Паролата",
-"Your private key password no longer matches your log-in password." => "Личният ти ключ не съвпада с паролата за вписване.",
-"Set your old private key password to your current log-in password:" => "Промени паролата за тайния ти включ на паролата за вписване:",
-" 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" => "Текуща парола за вписване",
-"Update Private Key Password" => "Промени Тайната Парола за Ключа",
-"Enable password recovery:" => "Включи опцията възстановяване на паролата:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Избирането на тази опция ще ти позволи да възстановиш достъпа си до файловете в случай на изгубена парола."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/bn_BD.js b/apps/files_encryption/l10n/bn_BD.js
new file mode 100644
index 00000000000..b3986d9668d
--- /dev/null
+++ b/apps/files_encryption/l10n/bn_BD.js
@@ -0,0 +1,23 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "অজানা জটিলতা",
+    "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
+    "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
+    "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
+    "Missing requirements." : "প্রয়োজনানুযায়ী ঘাটতি আছে।",
+    "Following users are not set up for encryption:" : "নিম্নবর্ণিত ব্যবহারকারীগণ এনক্রিপসনের জন্য অধিকারপ্রাপ্ত নন:",
+    "Initial encryption started... This can take some time. Please wait." : "প্রাথমিক এনক্রিপসন শুরু হয়েছে.... এটি কিছুটা সময় নিতে পারে। অপেক্ষা করুন।",
+    "Initial encryption running... Please try again later." : "প্রাথমিক এনক্রিপসন চলছে.... দয়া করে পরে আবার চেষ্টা করুন।",
+    "Go directly to your %spersonal settings%s." : "সরাসরি আপনার %spersonal settings%s এ যান।",
+    "Encryption" : "সংকেতায়ন",
+    "Repeat Recovery key password" : "পূণরূদ্ধার কি এর  কুটশব্দ পূণরায় দিন",
+    "Enabled" : "কার্যকর",
+    "Disabled" : "অকার্যকর",
+    "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
+    "Old Recovery key password" : "পূণরূদ্ধার কি এর  পুরাতন কুটশব্দ",
+    "New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ",
+    "Repeat New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ পূণরায় দিন",
+    "Change Password" : "কূটশব্দ পরিবর্তন করুন"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/bn_BD.json b/apps/files_encryption/l10n/bn_BD.json
new file mode 100644
index 00000000000..d1febcda0bb
--- /dev/null
+++ b/apps/files_encryption/l10n/bn_BD.json
@@ -0,0 +1,21 @@
+{ "translations": {
+    "Unknown error" : "অজানা জটিলতা",
+    "Recovery key successfully enabled" : "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
+    "Recovery key successfully disabled" : "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
+    "Password successfully changed." : "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
+    "Missing requirements." : "প্রয়োজনানুযায়ী ঘাটতি আছে।",
+    "Following users are not set up for encryption:" : "নিম্নবর্ণিত ব্যবহারকারীগণ এনক্রিপসনের জন্য অধিকারপ্রাপ্ত নন:",
+    "Initial encryption started... This can take some time. Please wait." : "প্রাথমিক এনক্রিপসন শুরু হয়েছে.... এটি কিছুটা সময় নিতে পারে। অপেক্ষা করুন।",
+    "Initial encryption running... Please try again later." : "প্রাথমিক এনক্রিপসন চলছে.... দয়া করে পরে আবার চেষ্টা করুন।",
+    "Go directly to your %spersonal settings%s." : "সরাসরি আপনার %spersonal settings%s এ যান।",
+    "Encryption" : "সংকেতায়ন",
+    "Repeat Recovery key password" : "পূণরূদ্ধার কি এর  কুটশব্দ পূণরায় দিন",
+    "Enabled" : "কার্যকর",
+    "Disabled" : "অকার্যকর",
+    "Change recovery key password:" : "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
+    "Old Recovery key password" : "পূণরূদ্ধার কি এর  পুরাতন কুটশব্দ",
+    "New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ",
+    "Repeat New Recovery key password" : "পূণরূদ্ধার কি এর  নতুন কুটশব্দ পূণরায় দিন",
+    "Change Password" : "কূটশব্দ পরিবর্তন করুন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/bn_BD.php b/apps/files_encryption/l10n/bn_BD.php
deleted file mode 100644
index addbb917953..00000000000
--- a/apps/files_encryption/l10n/bn_BD.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "অজানা জটিলতা",
-"Recovery key successfully enabled" => "পূনরুদ্ধার চাবি সার্থকভাবে কার্যকর করা হয়েছে",
-"Recovery key successfully disabled" => "পূনরুদ্ধার চাবি সার্থকভাবে অকার্যকর করা হয়েছে",
-"Password successfully changed." => "আপনার কূটশব্দটি সার্থকভাবে পরিবর্তন করা হয়েছে ",
-"Missing requirements." => "প্রয়োজনানুযায়ী ঘাটতি আছে।",
-"Following users are not set up for encryption:" => "নিম্নবর্ণিত ব্যবহারকারীগণ এনক্রিপসনের জন্য অধিকারপ্রাপ্ত নন:",
-"Initial encryption started... This can take some time. Please wait." => "প্রাথমিক এনক্রিপসন শুরু হয়েছে.... এটি কিছুটা সময় নিতে পারে। অপেক্ষা করুন।",
-"Initial encryption running... Please try again later." => "প্রাথমিক এনক্রিপসন চলছে.... দয়া করে পরে আবার চেষ্টা করুন।",
-"Go directly to your %spersonal settings%s." => "সরাসরি আপনার %spersonal settings%s এ যান।",
-"Encryption" => "সংকেতায়ন",
-"Repeat Recovery key password" => "পূণরূদ্ধার কি এর  কুটশব্দ পূণরায় দিন",
-"Enabled" => "কার্যকর",
-"Disabled" => "অকার্যকর",
-"Change recovery key password:" => "পূণরূদ্ধার কি এর কুটশব্দ পরিবর্তন করুন:",
-"Old Recovery key password" => "পূণরূদ্ধার কি এর  পুরাতন কুটশব্দ",
-"New Recovery key password" => "পূণরূদ্ধার কি এর  নতুন কুটশব্দ",
-"Repeat New Recovery key password" => "পূণরূদ্ধার কি এর  নতুন কুটশব্দ পূণরায় দিন",
-"Change Password" => "কূটশব্দ পরিবর্তন করুন"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ca.js b/apps/files_encryption/l10n/ca.js
new file mode 100644
index 00000000000..e443d384ac2
--- /dev/null
+++ b/apps/files_encryption/l10n/ca.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Error desconegut",
+    "Recovery key successfully enabled" : "La clau de recuperació s'ha activat",
+    "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ó!",
+    "Recovery key successfully disabled" : "La clau de recuperació s'ha descativat",
+    "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.",
+    "Could not update the private key password. Maybe the old password was not correct." : "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
+    "File recovery settings updated" : "S'han  actualitzat els arranjaments de recuperació de fitxers",
+    "Could not update file recovery" : "No s'ha pogut actualitzar la recuperació de fitxers",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'aplicació d'encriptació  no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Error desconegut. Comproveu l'arranjament del sistema o aviseu a l'administrador",
+    "Missing requirements." : "Manca de requisits.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
+    "Following users are not set up for encryption:" : "Els usuaris següents no estan configurats per a l'encriptació:",
+    "Initial encryption started... This can take some time. Please wait." : "La encriptació inicial ha començat... Pot trigar una estona, espereu.",
+    "Initial encryption running... Please try again later." : "encriptació inicial en procés... Proveu-ho més tard.",
+    "Go directly to your %spersonal settings%s." : "Vés directament a l'%sarranjament personal%s.",
+    "Encryption" : "Xifrat",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
+    "Recovery key password" : "Clau de recuperació de la contrasenya",
+    "Repeat Recovery key password" : "Repetiu la clau de recuperació de contrasenya",
+    "Enabled" : "Activat",
+    "Disabled" : "Desactivat",
+    "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
+    "Old Recovery key password" : "Antiga clau de recuperació de contrasenya",
+    "New Recovery key password" : "Nova clau de recuperació de contrasenya",
+    "Repeat New Recovery key password" : "Repetiu la nova clau de recuperació de contrasenya",
+    "Change Password" : "Canvia la contrasenya",
+    "Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'accés:",
+    "Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
+    "Old log-in password" : "Contrasenya anterior d'accés",
+    "Current log-in password" : "Contrasenya d'accés actual",
+    "Update Private Key Password" : "Actualitza la contrasenya de clau privada",
+    "Enable password recovery:" : "Habilita la recuperació de contrasenya:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/ca.json b/apps/files_encryption/l10n/ca.json
new file mode 100644
index 00000000000..a65fbf9c88e
--- /dev/null
+++ b/apps/files_encryption/l10n/ca.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Unknown error" : "Error desconegut",
+    "Recovery key successfully enabled" : "La clau de recuperació s'ha activat",
+    "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ó!",
+    "Recovery key successfully disabled" : "La clau de recuperació s'ha descativat",
+    "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.",
+    "Could not update the private key password. Maybe the old password was not correct." : "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
+    "File recovery settings updated" : "S'han  actualitzat els arranjaments de recuperació de fitxers",
+    "Could not update file recovery" : "No s'ha pogut actualitzar la recuperació de fitxers",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'aplicació d'encriptació  no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Error desconegut. Comproveu l'arranjament del sistema o aviseu a l'administrador",
+    "Missing requirements." : "Manca de requisits.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
+    "Following users are not set up for encryption:" : "Els usuaris següents no estan configurats per a l'encriptació:",
+    "Initial encryption started... This can take some time. Please wait." : "La encriptació inicial ha començat... Pot trigar una estona, espereu.",
+    "Initial encryption running... Please try again later." : "encriptació inicial en procés... Proveu-ho més tard.",
+    "Go directly to your %spersonal settings%s." : "Vés directament a l'%sarranjament personal%s.",
+    "Encryption" : "Xifrat",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
+    "Recovery key password" : "Clau de recuperació de la contrasenya",
+    "Repeat Recovery key password" : "Repetiu la clau de recuperació de contrasenya",
+    "Enabled" : "Activat",
+    "Disabled" : "Desactivat",
+    "Change recovery key password:" : "Canvia la clau de recuperació de contrasenya:",
+    "Old Recovery key password" : "Antiga clau de recuperació de contrasenya",
+    "New Recovery key password" : "Nova clau de recuperació de contrasenya",
+    "Repeat New Recovery key password" : "Repetiu la nova clau de recuperació de contrasenya",
+    "Change Password" : "Canvia la contrasenya",
+    "Your private key password no longer matches your log-in password." : "La clau privada ja no es correspon amb la contrasenya d'accés:",
+    "Set your old private key password to your current log-in password:" : "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
+    "Old log-in password" : "Contrasenya anterior d'accés",
+    "Current log-in password" : "Contrasenya d'accés actual",
+    "Update Private Key Password" : "Actualitza la contrasenya de clau privada",
+    "Enable password recovery:" : "Habilita la recuperació de contrasenya:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ca.php b/apps/files_encryption/l10n/ca.php
deleted file mode 100644
index 9d3d95c05cf..00000000000
--- a/apps/files_encryption/l10n/ca.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error desconegut",
-"Recovery key successfully enabled" => "La clau de recuperació s'ha activat",
-"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ó!",
-"Recovery key successfully disabled" => "La clau de recuperació s'ha descativat",
-"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.",
-"Could not update the private key password. Maybe the old password was not correct." => "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
-"File recovery settings updated" => "S'han  actualitzat els arranjaments de recuperació de fitxers",
-"Could not update file recovery" => "No s'ha pogut actualitzar la recuperació de fitxers",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'aplicació d'encriptació  no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La clau privada no és vàlida! Probablement la contrasenya va ser canviada des de fora de %s (per exemple, en el directori de l'empresa). Vostè pot actualitzar la contrasenya de clau privada en la seva configuració personal per poder recuperar l'accés en els arxius xifrats.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Error desconegut. Comproveu l'arranjament del sistema o aviseu a l'administrador",
-"Missing requirements." => "Manca de requisits.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assegureu-vos que teniu instal·lat PHP 5.3.3 o una versió superior i que està activat Open SSL i habilitada i configurada correctament l'extensió de PHP. De moment, l'aplicació d'encriptació s'ha desactivat.",
-"Following users are not set up for encryption:" => "Els usuaris següents no estan configurats per a l'encriptació:",
-"Initial encryption started... This can take some time. Please wait." => "La encriptació inicial ha començat... Pot trigar una estona, espereu.",
-"Initial encryption running... Please try again later." => "encriptació inicial en procés... Proveu-ho més tard.",
-"Go directly to your %spersonal settings%s." => "Vés directament a l'%sarranjament personal%s.",
-"Encryption" => "Xifrat",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Activa la clau de recuperació (permet recuperar fitxers d'usuaris en cas de pèrdua de contrasenya):",
-"Recovery key password" => "Clau de recuperació de la contrasenya",
-"Repeat Recovery key password" => "Repetiu la clau de recuperació de contrasenya",
-"Enabled" => "Activat",
-"Disabled" => "Desactivat",
-"Change recovery key password:" => "Canvia la clau de recuperació de contrasenya:",
-"Old Recovery key password" => "Antiga clau de recuperació de contrasenya",
-"New Recovery key password" => "Nova clau de recuperació de contrasenya",
-"Repeat New Recovery key password" => "Repetiu la nova clau de recuperació de contrasenya",
-"Change Password" => "Canvia la contrasenya",
-"Your private key password no longer matches your log-in password." => "La clau privada ja no es correspon amb la contrasenya d'accés:",
-"Set your old private key password to your current log-in password:" => "Establiu la vostra antiga clau privada a l'actual contrasenya d'accés:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Si no recordeu la contrasenya anterior podeu demanar a l'administrador que recuperi els vostres fitxers.",
-"Old log-in password" => "Contrasenya anterior d'accés",
-"Current log-in password" => "Contrasenya d'accés actual",
-"Update Private Key Password" => "Actualitza la contrasenya de clau privada",
-"Enable password recovery:" => "Habilita la recuperació de contrasenya:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activar aquesta opció us permetrà obtenir de nou accés als vostres fitxers encriptats en cas de perdre la contrasenya"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/cs_CZ.js b/apps/files_encryption/l10n/cs_CZ.js
new file mode 100644
index 00000000000..3c3b54e67f3
--- /dev/null
+++ b/apps/files_encryption/l10n/cs_CZ.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Neznámá chyba",
+    "Missing recovery key password" : "Chybí heslo klíče pro obnovu",
+    "Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
+    "Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
+    "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
+    "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
+    "Please provide the old recovery password" : "Zapište prosím staré heslo pro obnovu",
+    "Please provide a new recovery password" : "Zapište prosím nové heslo pro obnovu",
+    "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
+    "Password successfully changed." : "Heslo bylo úspěšně změněno.",
+    "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
+    "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
+    "File recovery settings updated" : "Možnosti záchrany souborů aktualizovány",
+    "Could not update file recovery" : "Nelze nastavit záchranu souborů",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno vně systému %s (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Neznámá chyba. Zkontrolujte nastavení systému nebo kontaktujte vašeho správce.",
+    "Missing requirements." : "Nesplněné závislosti.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
+    "Following users are not set up for encryption:" : "Následující uživatelé nemají nastavené šifrování:",
+    "Initial encryption started... This can take some time. Please wait." : "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.",
+    "Initial encryption running... Please try again later." : "Probíhá počáteční šifrování... Zkuste to prosím znovu později.",
+    "Go directly to your %spersonal settings%s." : "Přejít přímo do svého %sosobního nastavení%s.",
+    "Encryption" : "Šifrování",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
+    "Recovery key password" : "Heslo klíče pro obnovu",
+    "Repeat Recovery key password" : "Zopakujte heslo klíče pro obnovu",
+    "Enabled" : "Povoleno",
+    "Disabled" : "Zakázáno",
+    "Change recovery key password:" : "Změna hesla klíče pro obnovu:",
+    "Old Recovery key password" : "Původní heslo klíče pro obnovu",
+    "New Recovery key password" : "Nové heslo klíče pro obnovu",
+    "Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
+    "Change Password" : "Změnit heslo",
+    "Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
+    "Set your old private key password to your current log-in password:" : "Změňte vaše staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.",
+    "Old log-in password" : "Původní přihlašovací heslo",
+    "Current log-in password" : "Aktuální přihlašovací heslo",
+    "Update Private Key Password" : "Změnit heslo soukromého klíče",
+    "Enable password recovery:" : "Povolit obnovu hesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_encryption/l10n/cs_CZ.json b/apps/files_encryption/l10n/cs_CZ.json
new file mode 100644
index 00000000000..5bd5bb54f01
--- /dev/null
+++ b/apps/files_encryption/l10n/cs_CZ.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Neznámá chyba",
+    "Missing recovery key password" : "Chybí heslo klíče pro obnovu",
+    "Please repeat the recovery key password" : "Zopakujte prosím heslo klíče pro obnovu",
+    "Repeated recovery key password does not match the provided recovery key password" : "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
+    "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
+    "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
+    "Please provide the old recovery password" : "Zapište prosím staré heslo pro obnovu",
+    "Please provide a new recovery password" : "Zapište prosím nové heslo pro obnovu",
+    "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
+    "Password successfully changed." : "Heslo bylo úspěšně změněno.",
+    "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
+    "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
+    "File recovery settings updated" : "Možnosti záchrany souborů aktualizovány",
+    "Could not update file recovery" : "Nelze nastavit záchranu souborů",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno vně systému %s (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Neznámá chyba. Zkontrolujte nastavení systému nebo kontaktujte vašeho správce.",
+    "Missing requirements." : "Nesplněné závislosti.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
+    "Following users are not set up for encryption:" : "Následující uživatelé nemají nastavené šifrování:",
+    "Initial encryption started... This can take some time. Please wait." : "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.",
+    "Initial encryption running... Please try again later." : "Probíhá počáteční šifrování... Zkuste to prosím znovu později.",
+    "Go directly to your %spersonal settings%s." : "Přejít přímo do svého %sosobního nastavení%s.",
+    "Encryption" : "Šifrování",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
+    "Recovery key password" : "Heslo klíče pro obnovu",
+    "Repeat Recovery key password" : "Zopakujte heslo klíče pro obnovu",
+    "Enabled" : "Povoleno",
+    "Disabled" : "Zakázáno",
+    "Change recovery key password:" : "Změna hesla klíče pro obnovu:",
+    "Old Recovery key password" : "Původní heslo klíče pro obnovu",
+    "New Recovery key password" : "Nové heslo klíče pro obnovu",
+    "Repeat New Recovery key password" : "Zopakujte nové heslo klíče pro obnovu",
+    "Change Password" : "Změnit heslo",
+    "Your private key password no longer matches your log-in password." : "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
+    "Set your old private key password to your current log-in password:" : "Změňte vaše staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.",
+    "Old log-in password" : "Původní přihlašovací heslo",
+    "Current log-in password" : "Aktuální přihlašovací heslo",
+    "Update Private Key Password" : "Změnit heslo soukromého klíče",
+    "Enable password recovery:" : "Povolit obnovu hesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
deleted file mode 100644
index a0e7274926a..00000000000
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Neznámá chyba",
-"Missing recovery key password" => "Chybí heslo klíče pro obnovu",
-"Please repeat the recovery key password" => "Zopakujte prosím heslo klíče pro obnovu",
-"Repeated recovery key password does not match the provided recovery key password" => "Opakované heslo pro obnovu nesouhlasí se zadaným heslem",
-"Recovery key successfully enabled" => "Záchranný klíč byl úspěšně povolen",
-"Could not disable recovery key. Please check your recovery key password!" => "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
-"Recovery key successfully disabled" => "Záchranný klíč byl úspěšně zakázán",
-"Please provide the old recovery password" => "Zapište prosím staré heslo pro obnovu",
-"Please provide a new recovery password" => "Zapište prosím nové heslo pro obnovu",
-"Please repeat the new recovery password" => "Zopakujte prosím nové heslo pro obnovu",
-"Password successfully changed." => "Heslo bylo úspěšně změněno.",
-"Could not change the password. Maybe the old password was not correct." => "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
-"Private key password successfully updated." => "Heslo soukromého klíče úspěšně aktualizováno.",
-"Could not update the private key password. Maybe the old password was not correct." => "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
-"File recovery settings updated" => "Možnosti záchrany souborů aktualizovány",
-"Could not update file recovery" => "Nelze nastavit záchranu souborů",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš soukromý klíč není platný! Pravděpodobně bylo vaše heslo změněno vně systému %s (např. ve vašem firemním adresáři). Heslo vašeho soukromého klíče můžete změnit ve svém osobním nastavení pro obnovení přístupu k vašim zašifrovaným souborům.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Neznámá chyba. Zkontrolujte nastavení systému nebo kontaktujte vašeho správce.",
-"Missing requirements." => "Nesplněné závislosti.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Ujistěte se prosím, že máte nainstalované PHP 5.3.3 nebo novější a že máte povolené a správně nakonfigurované OpenSSL včetně jeho rozšíření pro PHP. Prozatím byla aplikace pro šifrování vypnuta.",
-"Following users are not set up for encryption:" => "Následující uživatelé nemají nastavené šifrování:",
-"Initial encryption started... This can take some time. Please wait." => "Počáteční šifrování zahájeno... Toto může chvíli trvat. Počkejte prosím.",
-"Initial encryption running... Please try again later." => "Probíhá počáteční šifrování... Zkuste to prosím znovu později.",
-"Go directly to your %spersonal settings%s." => "Přejít přímo do svého %sosobního nastavení%s.",
-"Encryption" => "Šifrování",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Povolit klíč pro obnovu (umožňuje obnovu uživatelských souborů v případě ztráty hesla)",
-"Recovery key password" => "Heslo klíče pro obnovu",
-"Repeat Recovery key password" => "Zopakujte heslo klíče pro obnovu",
-"Enabled" => "Povoleno",
-"Disabled" => "Zakázáno",
-"Change recovery key password:" => "Změna hesla klíče pro obnovu:",
-"Old Recovery key password" => "Původní heslo klíče pro obnovu",
-"New Recovery key password" => "Nové heslo klíče pro obnovu",
-"Repeat New Recovery key password" => "Zopakujte nové heslo klíče pro obnovu",
-"Change Password" => "Změnit heslo",
-"Your private key password no longer matches your log-in password." => "Heslo vašeho soukromého klíče se již neshoduje s vaším přihlašovacím heslem.",
-"Set your old private key password to your current log-in password:" => "Změňte vaše staré heslo soukromého klíče na stejné, jako je vaše současné přihlašovací heslo:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Pokud si nepamatujete vaše původní heslo, můžete požádat správce o obnovu vašich souborů.",
-"Old log-in password" => "Původní přihlašovací heslo",
-"Current log-in password" => "Aktuální přihlašovací heslo",
-"Update Private Key Password" => "Změnit heslo soukromého klíče",
-"Enable password recovery:" => "Povolit obnovu hesla:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Zapnutí této volby vám umožní znovu získat přístup k vašim zašifrovaným souborům pokud ztratíte heslo"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/cy_GB.js b/apps/files_encryption/l10n/cy_GB.js
new file mode 100644
index 00000000000..03b6d253b38
--- /dev/null
+++ b/apps/files_encryption/l10n/cy_GB.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Encryption" : "Amgryptiad"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/files_encryption/l10n/cy_GB.json b/apps/files_encryption/l10n/cy_GB.json
new file mode 100644
index 00000000000..ed3f6b2fb92
--- /dev/null
+++ b/apps/files_encryption/l10n/cy_GB.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Encryption" : "Amgryptiad"
+},"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/files_encryption/l10n/cy_GB.php b/apps/files_encryption/l10n/cy_GB.php
deleted file mode 100644
index 6d3b898d002..00000000000
--- a/apps/files_encryption/l10n/cy_GB.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Encryption" => "Amgryptiad"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_encryption/l10n/da.js b/apps/files_encryption/l10n/da.js
new file mode 100644
index 00000000000..9c12271be0b
--- /dev/null
+++ b/apps/files_encryption/l10n/da.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Ukendt fejl",
+    "Missing recovery key password" : "Der mangler kodeord for gendannelsesnøgle",
+    "Please repeat the recovery key password" : "Gentag venligst kodeordet for gendannelsesnøglen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Det gentagne kodeord for gendannelsesnøglen stemmer ikke med det angivne kodeord for gendannelsesnøglen",
+    "Recovery key successfully enabled" : "Gendannelsesnøgle aktiveret med succes",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
+    "Recovery key successfully disabled" : "Gendannelsesnøgle deaktiveret succesfuldt",
+    "Please provide the old recovery password" : "Angiv venligst det gamle kodeord for gendannelsesnøglen",
+    "Please provide a new recovery password" : "Angiv venligst et nyt kodeord til gendannelse",
+    "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse",
+    "Password successfully changed." : "Kodeordet blev ændret succesfuldt",
+    "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
+    "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
+    "File recovery settings updated" : "Filgendannelsesindstillinger opdateret",
+    "Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
+    "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 felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
+    "Missing requirements." : "Manglende betingelser.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
+    "Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:",
+    "Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
+    "Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.",
+    "Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.",
+    "Encryption" : "Kryptering",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
+    "Recovery key password" : "Gendannelsesnøgle kodeord",
+    "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
+    "Enabled" : "Aktiveret",
+    "Disabled" : "Deaktiveret",
+    "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
+    "Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
+    "New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
+    "Repeat New Recovery key password" : "Gentag dannelse af ny gendannaleses nøglekode",
+    "Change Password" : "Skift Kodeord",
+    "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
+    "Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
+    "Old log-in password" : "Gammelt login kodeord",
+    "Current log-in password" : "Nuvrende login kodeord",
+    "Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
+    "Enable password recovery:" : "Aktiver kodeord gendannelse:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/da.json b/apps/files_encryption/l10n/da.json
new file mode 100644
index 00000000000..65a64a95d33
--- /dev/null
+++ b/apps/files_encryption/l10n/da.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Ukendt fejl",
+    "Missing recovery key password" : "Der mangler kodeord for gendannelsesnøgle",
+    "Please repeat the recovery key password" : "Gentag venligst kodeordet for gendannelsesnøglen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Det gentagne kodeord for gendannelsesnøglen stemmer ikke med det angivne kodeord for gendannelsesnøglen",
+    "Recovery key successfully enabled" : "Gendannelsesnøgle aktiveret med succes",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
+    "Recovery key successfully disabled" : "Gendannelsesnøgle deaktiveret succesfuldt",
+    "Please provide the old recovery password" : "Angiv venligst det gamle kodeord for gendannelsesnøglen",
+    "Please provide a new recovery password" : "Angiv venligst et nyt kodeord til gendannelse",
+    "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse",
+    "Password successfully changed." : "Kodeordet blev ændret succesfuldt",
+    "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
+    "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
+    "File recovery settings updated" : "Filgendannelsesindstillinger opdateret",
+    "Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
+    "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 felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
+    "Missing requirements." : "Manglende betingelser.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
+    "Following users are not set up for encryption:" : "Følgende brugere er ikke sat op til kryptering:",
+    "Initial encryption started... This can take some time. Please wait." : "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
+    "Initial encryption running... Please try again later." : "Kryptering foretages... Prøv venligst igen senere.",
+    "Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige indstillinger%s.",
+    "Encryption" : "Kryptering",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
+    "Recovery key password" : "Gendannelsesnøgle kodeord",
+    "Repeat Recovery key password" : "Gentag gendannelse af nøglekoden",
+    "Enabled" : "Aktiveret",
+    "Disabled" : "Deaktiveret",
+    "Change recovery key password:" : "Skift gendannelsesnøgle kodeord:",
+    "Old Recovery key password" : "Gammel Gendannelsesnøgle kodeord",
+    "New Recovery key password" : "Ny Gendannelsesnøgle kodeord",
+    "Repeat New Recovery key password" : "Gentag dannelse af ny gendannaleses nøglekode",
+    "Change Password" : "Skift Kodeord",
+    "Your private key password no longer matches your log-in password." : "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
+    "Set your old private key password to your current log-in password:" : "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
+    "Old log-in password" : "Gammelt login kodeord",
+    "Current log-in password" : "Nuvrende login kodeord",
+    "Update Private Key Password" : "Opdater Privat Nøgle Kodeord",
+    "Enable password recovery:" : "Aktiver kodeord gendannelse:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/da.php b/apps/files_encryption/l10n/da.php
deleted file mode 100644
index d47b88487dc..00000000000
--- a/apps/files_encryption/l10n/da.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Ukendt fejl",
-"Missing recovery key password" => "Der mangler kodeord for gendannelsesnøgle",
-"Please repeat the recovery key password" => "Gentag venligst kodeordet for gendannelsesnøglen",
-"Repeated recovery key password does not match the provided recovery key password" => "Det gentagne kodeord for gendannelsesnøglen stemmer ikke med det angivne kodeord for gendannelsesnøglen",
-"Recovery key successfully enabled" => "Gendannelsesnøgle aktiveret med succes",
-"Could not disable recovery key. Please check your recovery key password!" => "Kunne ikke deaktivere gendannelsesnøgle. Kontroller din gendannelsesnøgle kodeord!",
-"Recovery key successfully disabled" => "Gendannelsesnøgle deaktiveret succesfuldt",
-"Please provide the old recovery password" => "Angiv venligst det gamle kodeord for gendannelsesnøglen",
-"Please provide a new recovery password" => "Angiv venligst et nyt kodeord til gendannelse",
-"Please repeat the new recovery password" => "Gentag venligst det nye kodeord til gendannelse",
-"Password successfully changed." => "Kodeordet blev ændret succesfuldt",
-"Could not change the password. Maybe the old password was not correct." => "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
-"Private key password successfully updated." => "Privat nøgle kodeord succesfuldt opdateret.",
-"Could not update the private key password. Maybe the old password was not correct." => "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
-"File recovery settings updated" => "Filgendannelsesindstillinger opdateret",
-"Could not update file recovery" => "Kunne ikke opdatere filgendannelse",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøgle er ikke gyldig. Sandsynligvis er dit kodeord blevet ændret uden for %s (f.eks dit firmas adressebog). Du kan opdatere din private nøglekode i dine personlige indstillinger for at genskabe adgang til dine krypterede filer.",
-"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 felen er delt. Bed venligst filens ejer om at dele den med dig på ny.",
-"Unknown error. Please check your system settings or contact your administrator" => "Ukendt fejl. Venligst tjek dine systemindstillinger eller kontakt din systemadministrator",
-"Missing requirements." => "Manglende betingelser.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Sørg for at PHP 5.3.3 eller nyere er installeret og at OpenSSL sammen med PHP-udvidelsen er aktiveret og korrekt konfigureret. Indtil videre er krypteringsprogrammet deaktiveret.",
-"Following users are not set up for encryption:" => "Følgende brugere er ikke sat op til kryptering:",
-"Initial encryption started... This can take some time. Please wait." => "Førstegangskrypteringen er påbegyndt... Dette kan tage nogen tid. Vent venligst.",
-"Initial encryption running... Please try again later." => "Kryptering foretages... Prøv venligst igen senere.",
-"Go directly to your %spersonal settings%s." => "Gå direkte til dine %spersonlige indstillinger%s.",
-"Encryption" => "Kryptering",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Krypteringsprogrammet er aktiveret, men din nøgle er ikke igangsat. Log venligst ud og ind igen.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktiver gendannelsesnøgle (Tillad gendannelse af brugerfiler i tilfælde af tab af kodeord):",
-"Recovery key password" => "Gendannelsesnøgle kodeord",
-"Repeat Recovery key password" => "Gentag gendannelse af nøglekoden",
-"Enabled" => "Aktiveret",
-"Disabled" => "Deaktiveret",
-"Change recovery key password:" => "Skift gendannelsesnøgle kodeord:",
-"Old Recovery key password" => "Gammel Gendannelsesnøgle kodeord",
-"New Recovery key password" => "Ny Gendannelsesnøgle kodeord",
-"Repeat New Recovery key password" => "Gentag dannelse af ny gendannaleses nøglekode",
-"Change Password" => "Skift Kodeord",
-"Your private key password no longer matches your log-in password." => "Dit private nøglekodeord stemmer ikke længere overens med dit login-kodeord.",
-"Set your old private key password to your current log-in password:" => "Sæt dit gamle, private nøglekodeord til at være dit nuværende login-kodeord. ",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Hvis du ikke kan huske dit gamle kodeord kan du bede din administrator om at gendanne dine filer.",
-"Old log-in password" => "Gammelt login kodeord",
-"Current log-in password" => "Nuvrende login kodeord",
-"Update Private Key Password" => "Opdater Privat Nøgle Kodeord",
-"Enable password recovery:" => "Aktiver kodeord gendannelse:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering af denne valgmulighed tillader dig at generhverve adgang til dine krypterede filer i tilfælde af tab af kodeord"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de.js b/apps/files_encryption/l10n/de.js
new file mode 100644
index 00000000000..2c680836cb5
--- /dev/null
+++ b/apps/files_encryption/l10n/de.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Unbekannter Fehler",
+    "Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
+    "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
+    "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
+    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide a new recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
+    "Password successfully changed." : "Dein Passwort wurde geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
+    "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
+    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
+    "File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
+    "Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
+    "Missing requirements." : "Fehlende Vorraussetzungen",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+    "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
+    "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.",
+    "Go directly to your %spersonal settings%s." : "Direkt zu Deinen %spersonal settings%s wechseln.",
+    "Encryption" : "Verschlüsselung",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
+    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
+    "Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüssel-Passwort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort",
+    "Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
+    "Change Password" : "Passwort ändern",
+    "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort darf nicht länger mit dem Anmeldepasswort übereinstimmen.",
+    "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
+    "Old log-in password" : "Altes Login Passwort",
+    "Current log-in password" : "Aktuelles Passwort",
+    "Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
+    "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/de.json b/apps/files_encryption/l10n/de.json
new file mode 100644
index 00000000000..ce5b6e81af1
--- /dev/null
+++ b/apps/files_encryption/l10n/de.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Unbekannter Fehler",
+    "Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
+    "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
+    "Recovery key successfully enabled" : "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
+    "Recovery key successfully disabled" : "Wiederherstellungsschlüssel deaktiviert.",
+    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide a new recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
+    "Password successfully changed." : "Dein Passwort wurde geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
+    "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
+    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
+    "File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
+    "Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
+    "Missing requirements." : "Fehlende Vorraussetzungen",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+    "Initial encryption started... This can take some time. Please wait." : "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
+    "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.",
+    "Go directly to your %spersonal settings%s." : "Direkt zu Deinen %spersonal settings%s wechseln.",
+    "Encryption" : "Verschlüsselung",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
+    "Recovery key password" : "Wiederherstellungsschlüssel-Passwort",
+    "Repeat Recovery key password" : "Schlüssel-Passwort zur Wiederherstellung wiederholen",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüssel-Passwort ändern:",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüssel-Passwort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüssel-Passwort",
+    "Repeat New Recovery key password" : "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
+    "Change Password" : "Passwort ändern",
+    "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort darf nicht länger mit dem Anmeldepasswort übereinstimmen.",
+    "Set your old private key password to your current log-in password:" : "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
+    "Old log-in password" : "Altes Login Passwort",
+    "Current log-in password" : "Aktuelles Passwort",
+    "Update Private Key Password" : "Passwort für den privaten Schlüssel aktualisieren",
+    "Enable password recovery:" : "Passwortwiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/de.php b/apps/files_encryption/l10n/de.php
deleted file mode 100644
index cd6d8ea9a28..00000000000
--- a/apps/files_encryption/l10n/de.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Unbekannter Fehler",
-"Missing recovery key password" => "Schlüsselpasswort zur Wiederherstellung fehlt",
-"Please repeat the recovery key password" => "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
-"Repeated recovery key password does not match the provided recovery key password" => "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
-"Recovery key successfully enabled" => "Wiederherstellungsschlüssel wurde erfolgreich aktiviert",
-"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Überprüfe Dein Wiederherstellungspasswort!",
-"Recovery key successfully disabled" => "Wiederherstellungsschlüssel deaktiviert.",
-"Please provide the old recovery password" => "Bitte das alte Passwort zur Wiederherstellung eingeben",
-"Please provide a new recovery password" => "Bitte das alte Passwort zur Wiederherstellung eingeben",
-"Please repeat the new recovery password" => "Bitte das neue Passwort zur Wiederherstellung wiederholen",
-"Password successfully changed." => "Dein Passwort wurde geändert.",
-"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
-"Private key password successfully updated." => "Passwort des privaten Schlüssels erfolgreich aktualisiert",
-"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
-"File recovery settings updated" => "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
-"Could not update file recovery" => "Dateiwiederherstellung konnte nicht aktualisiert werden",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Dein privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Dein Passwort geändert (z.B. in Deinem gemeinsamen Verzeichnis). Du kannst das Passwort Deines privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Deine Dateien zu gelangen.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte frage den Dateibesitzer, ob er die Datei nochmals mit Dir teilt.",
-"Unknown error. Please check your system settings or contact your administrator" => "Unbekannter Fehler. Bitte prüfe Deine Systemeinstellungen oder kontaktiere Deinen Administrator",
-"Missing requirements." => "Fehlende Vorraussetzungen",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stelle sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
-"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
-"Initial encryption started... This can take some time. Please wait." => "Initialverschlüsselung gestartet... Dies kann einige Zeit dauern. Bitte warten.",
-"Initial encryption running... Please try again later." => "Anfangsverschlüsselung läuft … Bitte versuche es später wieder.",
-"Go directly to your %spersonal settings%s." => "Direkt zu Deinen %spersonal settings%s wechseln.",
-"Encryption" => "Verschlüsselung",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Wiederherstellungsschlüssel aktivieren (ermöglicht das Wiederherstellen von Dateien, falls das Passwort vergessen wurde):",
-"Recovery key password" => "Wiederherstellungsschlüssel-Passwort",
-"Repeat Recovery key password" => "Schlüssel-Passwort zur Wiederherstellung wiederholen",
-"Enabled" => "Aktiviert",
-"Disabled" => "Deaktiviert",
-"Change recovery key password:" => "Wiederherstellungsschlüssel-Passwort ändern:",
-"Old Recovery key password" => "Altes Wiederherstellungsschlüssel-Passwort",
-"New Recovery key password" => "Neues Wiederherstellungsschlüssel-Passwort",
-"Repeat New Recovery key password" => "Neues Schlüssel-Passwort zur Wiederherstellung wiederholen",
-"Change Password" => "Passwort ändern",
-"Your private key password no longer matches your log-in password." => "Das Privatschlüsselpasswort darf nicht länger mit dem Anmeldepasswort übereinstimmen.",
-"Set your old private key password to your current log-in password:" => "Dein altes Passwort für Deinen privaten Schlüssel auf Dein aktuelles Anmeldepasswort einstellen:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Wenn Du Dein altes Passwort vergessen hast, könntest Du Deinen Administrator bitten, Deine Daten wiederherzustellen.",
-"Old log-in password" => "Altes Login Passwort",
-"Current log-in password" => "Aktuelles Passwort",
-"Update Private Key Password" => "Passwort für den privaten Schlüssel aktualisieren",
-"Enable password recovery:" => "Passwortwiederherstellung aktivieren:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Wenn Du diese Option aktivierst, kannst Du Deine verschlüsselten Dateien wiederherstellen, falls Du Dein Passwort vergisst"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de_CH.js b/apps/files_encryption/l10n/de_CH.js
new file mode 100644
index 00000000000..1f5a01e6798
--- /dev/null
+++ b/apps/files_encryption/l10n/de_CH.js
@@ -0,0 +1,33 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Unbekannter Fehler",
+    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+    "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
+    "Missing requirements." : "Fehlende Voraussetzungen",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+    "Encryption" : "Verschlüsselung",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
+    "Change Password" : "Passwort ändern",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Login-Passwort",
+    "Current log-in password" : "Momentanes Login-Passwort",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/de_CH.json b/apps/files_encryption/l10n/de_CH.json
new file mode 100644
index 00000000000..244d0946bfe
--- /dev/null
+++ b/apps/files_encryption/l10n/de_CH.json
@@ -0,0 +1,31 @@
+{ "translations": {
+    "Unknown error" : "Unbekannter Fehler",
+    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+    "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
+    "Missing requirements." : "Fehlende Voraussetzungen",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+    "Encryption" : "Verschlüsselung",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
+    "Change Password" : "Passwort ändern",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Login-Passwort",
+    "Current log-in password" : "Momentanes Login-Passwort",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/de_CH.php b/apps/files_encryption/l10n/de_CH.php
deleted file mode 100644
index 9c2af0c93c6..00000000000
--- a/apps/files_encryption/l10n/de_CH.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Unbekannter Fehler",
-"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
-"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
-"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
-"Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
-"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
-"Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
-"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
-"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
-"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
-"Missing requirements." => "Fehlende Voraussetzungen",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
-"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
-"Encryption" => "Verschlüsselung",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
-"Recovery key password" => "Wiederherstellungschlüsselpasswort",
-"Enabled" => "Aktiviert",
-"Disabled" => "Deaktiviert",
-"Change recovery key password:" => "Wiederherstellungsschlüsselpasswort ändern",
-"Old Recovery key password" => "Altes Wiederherstellungsschlüsselpasswort",
-"New Recovery key password" => "Neues Wiederherstellungsschlüsselpasswort ",
-"Change Password" => "Passwort ändern",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
-"Old log-in password" => "Altes Login-Passwort",
-"Current log-in password" => "Momentanes Login-Passwort",
-"Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
-"Enable password recovery:" => "Die Passwort-Wiederherstellung aktivieren:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/de_DE.js b/apps/files_encryption/l10n/de_DE.js
new file mode 100644
index 00000000000..f24b4a74358
--- /dev/null
+++ b/apps/files_encryption/l10n/de_DE.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Unbekannter Fehler",
+    "Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
+    "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
+    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide a new recovery password" : "Bitte das neue Passwort zur Wiederherstellung eingeben",
+    "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
+    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+    "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Dateibesitzer, dass er die Datei nochmals mit Ihnen teilt.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
+    "Missing requirements." : "Fehlende Voraussetzungen",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+    "Initial encryption started... This can take some time. Please wait." : "Anfangsverschlüsselung gestartet … Dieses kann einige Zeit dauern. Bitte warten.",
+    "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
+    "Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
+    "Encryption" : "Verschlüsselung",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
+    "Repeat New Recovery key password" : "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
+    "Change Password" : "Passwort ändern",
+    "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
+    "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Anmeldepasswort",
+    "Current log-in password" : "Aktuelles Anmeldepasswort",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/de_DE.json b/apps/files_encryption/l10n/de_DE.json
new file mode 100644
index 00000000000..0bbba2a50df
--- /dev/null
+++ b/apps/files_encryption/l10n/de_DE.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Unbekannter Fehler",
+    "Missing recovery key password" : "Schlüsselpasswort zur Wiederherstellung fehlt",
+    "Please repeat the recovery key password" : "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
+    "Repeated recovery key password does not match the provided recovery key password" : "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
+    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+    "Please provide the old recovery password" : "Bitte das alte Passwort zur Wiederherstellung eingeben",
+    "Please provide a new recovery password" : "Bitte das neue Passwort zur Wiederherstellung eingeben",
+    "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
+    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+    "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Dateibesitzer, dass er die Datei nochmals mit Ihnen teilt.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
+    "Missing requirements." : "Fehlende Voraussetzungen",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+    "Initial encryption started... This can take some time. Please wait." : "Anfangsverschlüsselung gestartet … Dieses kann einige Zeit dauern. Bitte warten.",
+    "Initial encryption running... Please try again later." : "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
+    "Go directly to your %spersonal settings%s." : "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
+    "Encryption" : "Verschlüsselung",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Repeat Recovery key password" : "Schlüsselpasswort zur Wiederherstellung wiederholen",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
+    "Repeat New Recovery key password" : "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
+    "Change Password" : "Passwort ändern",
+    "Your private key password no longer matches your log-in password." : "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
+    "Set your old private key password to your current log-in password:" : "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Anmeldepasswort",
+    "Current log-in password" : "Aktuelles Anmeldepasswort",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/de_DE.php b/apps/files_encryption/l10n/de_DE.php
deleted file mode 100644
index b16a4003e87..00000000000
--- a/apps/files_encryption/l10n/de_DE.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Unbekannter Fehler",
-"Missing recovery key password" => "Schlüsselpasswort zur Wiederherstellung fehlt",
-"Please repeat the recovery key password" => "Schlüsselpasswort zur Wiederherstellung bitte wiederholen",
-"Repeated recovery key password does not match the provided recovery key password" => "Das wiederholte Schlüsselpasswort zur Wiederherstellung stimmt nicht mit dem geforderten Schlüsselpasswort zur Wiederherstellung überein",
-"Recovery key successfully enabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
-"Could not disable recovery key. Please check your recovery key password!" => "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
-"Recovery key successfully disabled" => "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
-"Please provide the old recovery password" => "Bitte das alte Passwort zur Wiederherstellung eingeben",
-"Please provide a new recovery password" => "Bitte das neue Passwort zur Wiederherstellung eingeben",
-"Please repeat the new recovery password" => "Bitte das neue Passwort zur Wiederherstellung wiederholen",
-"Password successfully changed." => "Das Passwort wurde erfolgreich geändert.",
-"Could not change the password. Maybe the old password was not correct." => "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
-"Private key password successfully updated." => "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
-"Could not update the private key password. Maybe the old password was not correct." => "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
-"File recovery settings updated" => "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
-"Could not update file recovery" => "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ihr privater Schlüssel ist ungültig. Möglicher Weise wurde außerhalb von %s Ihr Passwort geändert (z.B. in Ihrem gemeinsamen Verzeichnis). Sie können das Passwort Ihres privaten Schlüssels in den persönlichen Einstellungen aktualisieren, um wieder an Ihre Dateien zu gelangen.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Die Datei kann nicht entschlüsselt werden, da die Datei möglicherweise eine geteilte Datei ist. Bitte fragen Sie den Dateibesitzer, dass er die Datei nochmals mit Ihnen teilt.",
-"Unknown error. Please check your system settings or contact your administrator" => "Unbekannter Fehler. Bitte prüfen Sie die Systemeinstellungen oder kontaktieren Sie Ihren Administrator",
-"Missing requirements." => "Fehlende Voraussetzungen",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
-"Following users are not set up for encryption:" => "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
-"Initial encryption started... This can take some time. Please wait." => "Anfangsverschlüsselung gestartet … Dieses kann einige Zeit dauern. Bitte warten.",
-"Initial encryption running... Please try again later." => "Anfangsverschlüsselung läuft … Bitte versuchen Sie es später wieder.",
-"Go directly to your %spersonal settings%s." => "Wechseln Sie direkt zu Ihren %spersonal settings%s.",
-"Encryption" => "Verschlüsselung",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Verschlüsselung-App ist aktiviert, aber Ihre Schlüssel sind nicht initialisiert. Bitte nochmals ab- und wieder anmelden.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
-"Recovery key password" => "Wiederherstellungschlüsselpasswort",
-"Repeat Recovery key password" => "Schlüsselpasswort zur Wiederherstellung wiederholen",
-"Enabled" => "Aktiviert",
-"Disabled" => "Deaktiviert",
-"Change recovery key password:" => "Wiederherstellungsschlüsselpasswort ändern",
-"Old Recovery key password" => "Altes Wiederherstellungsschlüsselpasswort",
-"New Recovery key password" => "Neues Wiederherstellungsschlüsselpasswort ",
-"Repeat New Recovery key password" => "Neues Schlüsselpasswort zur Wiederherstellung wiederholen",
-"Change Password" => "Passwort ändern",
-"Your private key password no longer matches your log-in password." => "Das Privatschlüsselpasswort stimmt nicht länger mit dem Anmeldepasswort überein.",
-"Set your old private key password to your current log-in password:" => "Ihr altes Privatschlüsselpasswort auf Ihr aktuelles Anmeldepasswort stellen:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
-"Old log-in password" => "Altes Anmeldepasswort",
-"Current log-in password" => "Aktuelles Anmeldepasswort",
-"Update Private Key Password" => "Das Passwort des privaten Schlüssels aktualisieren",
-"Enable password recovery:" => "Die Passwort-Wiederherstellung aktivieren:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/el.js b/apps/files_encryption/l10n/el.js
new file mode 100644
index 00000000000..a39a0c867f3
--- /dev/null
+++ b/apps/files_encryption/l10n/el.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Άγνωστο σφάλμα",
+    "Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
+    "Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
+    "Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
+    "Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
+    "Could not disable recovery key. Please check your recovery key password!" : "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
+    "Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
+    "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." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
+    "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
+    "Could not update the private key password. Maybe the old password was not correct." : "Αποτυχία ενημέρωσης του κωδικού για το προσωπικό κλειδί. Ενδεχομένως ο παλιός κωδικός δεν ήταν σωστός.",
+    "File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
+    "Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Το προσωπικό σας κλειδί δεν είναι έγκυρο! Πιθανόν ο κωδικός σας να άλλαξε έξω από το %s (π.χ. τη λίστα διευθύνσεων της εταιρείας σας). Μπορείτε να ενημερώσετε το προσωπικό σας κλειδί επαναφοράς κωδικού στις προσωπικές σας ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Άγνωστο σφάλμα. Παρακαλώ ελέγξτε τις ρυθμίσεις του συστήματό σας ή επικοινωνήστε με τον διαχειριστή συστημάτων σας",
+    "Missing requirements." : "Προαπαιτούμενα που απουσιάζουν.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Παρακαλώ επιβεβαιώστε ότι η PHP 5.3.3  ή νεότερη είναι εγκατεστημένη  και ότι το  OpenSSL μαζί με το PHP extension είναι ενεργοποιήμένο και έχει ρυθμιστεί σωστά. Προς το παρόν, η εφαρμογή κρυπτογράφησης είναι απενεργοποιημένη.",
+    "Following users are not set up for encryption:" : "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:",
+    "Initial encryption started... This can take some time. Please wait." : "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.",
+    "Initial encryption running... Please try again later." : "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα.",
+    "Go directly to your %spersonal settings%s." : "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας.",
+    "Encryption" : "Κρυπτογράφηση",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
+    "Recovery key password" : "Επαναφορά κωδικού κλειδιού",
+    "Repeat Recovery key password" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
+    "Enabled" : "Ενεργοποιημένο",
+    "Disabled" : "Απενεργοποιημένο",
+    "Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
+    "Old Recovery key password" : "Παλιό κλειδί επαναφοράς κωδικού",
+    "New Recovery key password" : "Νέο κλειδί επαναφοράς κωδικού",
+    "Repeat New Recovery key password" : "Επαναλάβετε νέο κλειδί επαναφοράς κωδικού",
+    "Change Password" : "Αλλαγή Κωδικού Πρόσβασης",
+    "Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
+    "Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
+    " 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" : "Τρέχον συνθηματικό πρόσβασης",
+    "Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
+    "Enable password recovery:" : "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/el.json b/apps/files_encryption/l10n/el.json
new file mode 100644
index 00000000000..0ebf52e3f88
--- /dev/null
+++ b/apps/files_encryption/l10n/el.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Άγνωστο σφάλμα",
+    "Missing recovery key password" : "Λείπει το κλειδί επαναφοράς κωδικού",
+    "Please repeat the recovery key password" : "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
+    "Repeated recovery key password does not match the provided recovery key password" : "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
+    "Recovery key successfully enabled" : "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
+    "Could not disable recovery key. Please check your recovery key password!" : "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
+    "Recovery key successfully disabled" : "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
+    "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." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
+    "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
+    "Could not update the private key password. Maybe the old password was not correct." : "Αποτυχία ενημέρωσης του κωδικού για το προσωπικό κλειδί. Ενδεχομένως ο παλιός κωδικός δεν ήταν σωστός.",
+    "File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
+    "Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Το προσωπικό σας κλειδί δεν είναι έγκυρο! Πιθανόν ο κωδικός σας να άλλαξε έξω από το %s (π.χ. τη λίστα διευθύνσεων της εταιρείας σας). Μπορείτε να ενημερώσετε το προσωπικό σας κλειδί επαναφοράς κωδικού στις προσωπικές σας ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Άγνωστο σφάλμα. Παρακαλώ ελέγξτε τις ρυθμίσεις του συστήματό σας ή επικοινωνήστε με τον διαχειριστή συστημάτων σας",
+    "Missing requirements." : "Προαπαιτούμενα που απουσιάζουν.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Παρακαλώ επιβεβαιώστε ότι η PHP 5.3.3  ή νεότερη είναι εγκατεστημένη  και ότι το  OpenSSL μαζί με το PHP extension είναι ενεργοποιήμένο και έχει ρυθμιστεί σωστά. Προς το παρόν, η εφαρμογή κρυπτογράφησης είναι απενεργοποιημένη.",
+    "Following users are not set up for encryption:" : "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:",
+    "Initial encryption started... This can take some time. Please wait." : "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.",
+    "Initial encryption running... Please try again later." : "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα.",
+    "Go directly to your %spersonal settings%s." : "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας.",
+    "Encryption" : "Κρυπτογράφηση",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
+    "Recovery key password" : "Επαναφορά κωδικού κλειδιού",
+    "Repeat Recovery key password" : "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
+    "Enabled" : "Ενεργοποιημένο",
+    "Disabled" : "Απενεργοποιημένο",
+    "Change recovery key password:" : "Αλλαγή κλειδιού επαναφοράς κωδικού:",
+    "Old Recovery key password" : "Παλιό κλειδί επαναφοράς κωδικού",
+    "New Recovery key password" : "Νέο κλειδί επαναφοράς κωδικού",
+    "Repeat New Recovery key password" : "Επαναλάβετε νέο κλειδί επαναφοράς κωδικού",
+    "Change Password" : "Αλλαγή Κωδικού Πρόσβασης",
+    "Your private key password no longer matches your log-in password." : "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
+    "Set your old private key password to your current log-in password:" : "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
+    " 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" : "Τρέχον συνθηματικό πρόσβασης",
+    "Update Private Key Password" : "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
+    "Enable password recovery:" : "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/el.php b/apps/files_encryption/l10n/el.php
deleted file mode 100644
index 5d293e7a06f..00000000000
--- a/apps/files_encryption/l10n/el.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Άγνωστο σφάλμα",
-"Missing recovery key password" => "Λείπει το κλειδί επαναφοράς κωδικού",
-"Please repeat the recovery key password" => "Παρακαλώ επαναλάβετε το κλειδί επαναφοράς κωδικού",
-"Repeated recovery key password does not match the provided recovery key password" => "Η επανάληψη του κλειδιού επαναφοράς κωδικού δεν ταιριάζει με το δοσμένο κλειδί επαναφοράς κωδικού",
-"Recovery key successfully enabled" => "Επιτυχής ενεργοποίηση κλειδιού ανάκτησης",
-"Could not disable recovery key. Please check your recovery key password!" => "Αποτυχία απενεργοποίησης κλειδιού ανάκτησης. Παρακαλώ ελέγξτε τον κωδικό του κλειδιού ανάκτησής σας!",
-"Recovery key successfully disabled" => "Επιτυχής απενεργοποίηση κλειδιού ανάκτησης",
-"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." => "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
-"Private key password successfully updated." => "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
-"Could not update the private key password. Maybe the old password was not correct." => "Αποτυχία ενημέρωσης του κωδικού για το προσωπικό κλειδί. Ενδεχομένως ο παλιός κωδικός δεν ήταν σωστός.",
-"File recovery settings updated" => "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
-"Could not update file recovery" => "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Το προσωπικό σας κλειδί δεν είναι έγκυρο! Πιθανόν ο κωδικός σας να άλλαξε έξω από το %s (π.χ. τη λίστα διευθύνσεων της εταιρείας σας). Μπορείτε να ενημερώσετε το προσωπικό σας κλειδί επαναφοράς κωδικού στις προσωπικές σας ρυθμίσεις για να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Δεν ήταν δυνατό να αποκρυπτογραφηθεί αυτό το αρχείο, πιθανόν πρόκειται για κοινόχρηστο αρχείο. Παρακαλώ ζητήστε από τον ιδιοκτήτη του αρχείου να το ξαναμοιραστεί μαζί σας.",
-"Unknown error. Please check your system settings or contact your administrator" => "Άγνωστο σφάλμα. Παρακαλώ ελέγξτε τις ρυθμίσεις του συστήματό σας ή επικοινωνήστε με τον διαχειριστή συστημάτων σας",
-"Missing requirements." => "Προαπαιτούμενα που απουσιάζουν.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Παρακαλώ επιβεβαιώστε ότι η PHP 5.3.3  ή νεότερη είναι εγκατεστημένη  και ότι το  OpenSSL μαζί με το PHP extension είναι ενεργοποιήμένο και έχει ρυθμιστεί σωστά. Προς το παρόν, η εφαρμογή κρυπτογράφησης είναι απενεργοποιημένη.",
-"Following users are not set up for encryption:" => "Οι κάτωθι χρήστες δεν έχουν ρυθμιστεί για κρυπογράφηση:",
-"Initial encryption started... This can take some time. Please wait." => "Η αρχική κρυπτογράφηση άρχισε... Αυτό μπορεί να πάρει κάποια ώρα. Παρακαλώ περιμένετε.",
-"Initial encryption running... Please try again later." => "Εκτέλεση αρχικής κρυπτογράφησης... Παρακαλώ προσπαθήστε αργότερα.",
-"Go directly to your %spersonal settings%s." => "Πηγαίνετε κατ'ευθείαν στις %sπροσωπικές ρυθμίσεις%s σας.",
-"Encryption" => "Κρυπτογράφηση",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Η εφαρμογή κρυπτογράφησης είναι ενεργοποιημένη αλλά τα κλειδιά σας δεν έχουν καταγραφεί, παρακαλώ αποσυνδεθείτε και επανασυνδεθείτε.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Ενεργοποίηση κλειδιού ανάκτησης (επιτρέψτε την ανάκτηση αρχείων χρηστών σε περίπτωση απώλειας κωδικού):",
-"Recovery key password" => "Επαναφορά κωδικού κλειδιού",
-"Repeat Recovery key password" => "Επαναλάβετε το κλειδί επαναφοράς κωδικού",
-"Enabled" => "Ενεργοποιημένο",
-"Disabled" => "Απενεργοποιημένο",
-"Change recovery key password:" => "Αλλαγή κλειδιού επαναφοράς κωδικού:",
-"Old Recovery key password" => "Παλιό κλειδί επαναφοράς κωδικού",
-"New Recovery key password" => "Νέο κλειδί επαναφοράς κωδικού",
-"Repeat New Recovery key password" => "Επαναλάβετε νέο κλειδί επαναφοράς κωδικού",
-"Change Password" => "Αλλαγή Κωδικού Πρόσβασης",
-"Your private key password no longer matches your log-in password." => "Ο κωδικός του ιδιωτικού κλειδιού σας δεν ταιριάζει πλέον με τον κωδικό σύνδεσής σας.",
-"Set your old private key password to your current log-in password:" => "Ορίστε τον παλιό σας κωδικό ιδιωτικού κλειδιού στον τρέχοντα κωδικό σύνδεσης.",
-" 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" => "Τρέχον συνθηματικό πρόσβασης",
-"Update Private Key Password" => "Ενημέρωση Προσωπικού Κλειδού Πρόσβασης",
-"Enable password recovery:" => "Ενεργοποιήστε την ανάκτηση κωδικού πρόσβασης",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Η ενεργοποίηση αυτής της επιλογής θα σας επιτρέψει να επανακτήσετε πρόσβαση στα κρυπτογραφημένα σας αρχεία σε περίπτωση απώλειας του κωδικού σας"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/en_GB.js b/apps/files_encryption/l10n/en_GB.js
new file mode 100644
index 00000000000..126d901b24f
--- /dev/null
+++ b/apps/files_encryption/l10n/en_GB.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Unknown error",
+    "Missing recovery key password" : "Missing recovery key password",
+    "Please repeat the recovery key password" : "Please repeat the recovery key password",
+    "Repeated recovery key password does not match the provided recovery key password" : "Repeated recovery key password does not match the provided recovery key password",
+    "Recovery key successfully enabled" : "Recovery key enabled successfully",
+    "Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
+    "Recovery key successfully disabled" : "Recovery key disabled successfully",
+    "Please provide the old recovery password" : "Please provide the old recovery password",
+    "Please provide a new recovery password" : "Please provide a new recovery password",
+    "Please repeat the new recovery password" : "Please repeat the new recovery password",
+    "Password successfully changed." : "Password changed successfully.",
+    "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
+    "Private key password successfully updated." : "Private key password updated successfully.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Could not update the private key password. Maybe the old password was not correct.",
+    "File recovery settings updated" : "File recovery settings updated",
+    "Could not update file recovery" : "Could not update file recovery",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Unknown error. Please check your system settings or contact your administrator",
+    "Missing requirements." : "Missing requirements.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.",
+    "Following users are not set up for encryption:" : "Following users are not set up for encryption:",
+    "Initial encryption started... This can take some time. Please wait." : "Initial encryption started... This can take some time. Please wait.",
+    "Initial encryption running... Please try again later." : "Initial encryption running... Please try again later.",
+    "Go directly to your %spersonal settings%s." : "Go directly to your %spersonal settings%s.",
+    "Encryption" : "Encryption",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):",
+    "Recovery key password" : "Recovery key password",
+    "Repeat Recovery key password" : "Repeat recovery key password",
+    "Enabled" : "Enabled",
+    "Disabled" : "Disabled",
+    "Change recovery key password:" : "Change recovery key password:",
+    "Old Recovery key password" : "Old recovery key password",
+    "New Recovery key password" : "New recovery key password",
+    "Repeat New Recovery key password" : "Repeat new recovery key password",
+    "Change Password" : "Change Password",
+    "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
+    "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
+    "Old log-in password" : "Old login password",
+    "Current log-in password" : "Current login password",
+    "Update Private Key Password" : "Update Private Key Password",
+    "Enable password recovery:" : "Enable password recovery:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/en_GB.json b/apps/files_encryption/l10n/en_GB.json
new file mode 100644
index 00000000000..e81b4088055
--- /dev/null
+++ b/apps/files_encryption/l10n/en_GB.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Unknown error",
+    "Missing recovery key password" : "Missing recovery key password",
+    "Please repeat the recovery key password" : "Please repeat the recovery key password",
+    "Repeated recovery key password does not match the provided recovery key password" : "Repeated recovery key password does not match the provided recovery key password",
+    "Recovery key successfully enabled" : "Recovery key enabled successfully",
+    "Could not disable recovery key. Please check your recovery key password!" : "Could not disable recovery key. Please check your recovery key password!",
+    "Recovery key successfully disabled" : "Recovery key disabled successfully",
+    "Please provide the old recovery password" : "Please provide the old recovery password",
+    "Please provide a new recovery password" : "Please provide a new recovery password",
+    "Please repeat the new recovery password" : "Please repeat the new recovery password",
+    "Password successfully changed." : "Password changed successfully.",
+    "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
+    "Private key password successfully updated." : "Private key password updated successfully.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Could not update the private key password. Maybe the old password was not correct.",
+    "File recovery settings updated" : "File recovery settings updated",
+    "Could not update file recovery" : "Could not update file recovery",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Unknown error. Please check your system settings or contact your administrator",
+    "Missing requirements." : "Missing requirements.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.",
+    "Following users are not set up for encryption:" : "Following users are not set up for encryption:",
+    "Initial encryption started... This can take some time. Please wait." : "Initial encryption started... This can take some time. Please wait.",
+    "Initial encryption running... Please try again later." : "Initial encryption running... Please try again later.",
+    "Go directly to your %spersonal settings%s." : "Go directly to your %spersonal settings%s.",
+    "Encryption" : "Encryption",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Enable recovery key (allow to recover users files in case of password loss):",
+    "Recovery key password" : "Recovery key password",
+    "Repeat Recovery key password" : "Repeat recovery key password",
+    "Enabled" : "Enabled",
+    "Disabled" : "Disabled",
+    "Change recovery key password:" : "Change recovery key password:",
+    "Old Recovery key password" : "Old recovery key password",
+    "New Recovery key password" : "New recovery key password",
+    "Repeat New Recovery key password" : "Repeat new recovery key password",
+    "Change Password" : "Change Password",
+    "Your private key password no longer matches your log-in password." : "Your private key password no longer matches your log-in password.",
+    "Set your old private key password to your current log-in password:" : "Set your old private key password to your current log-in password:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : " If you don't remember your old password you can ask your administrator to recover your files.",
+    "Old log-in password" : "Old login password",
+    "Current log-in password" : "Current login password",
+    "Update Private Key Password" : "Update Private Key Password",
+    "Enable password recovery:" : "Enable password recovery:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/en_GB.php b/apps/files_encryption/l10n/en_GB.php
deleted file mode 100644
index 7a9b248bc43..00000000000
--- a/apps/files_encryption/l10n/en_GB.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Unknown error",
-"Missing recovery key password" => "Missing recovery key password",
-"Please repeat the recovery key password" => "Please repeat the recovery key password",
-"Repeated recovery key password does not match the provided recovery key password" => "Repeated recovery key password does not match the provided recovery key password",
-"Recovery key successfully enabled" => "Recovery key enabled successfully",
-"Could not disable recovery key. Please check your recovery key password!" => "Could not disable recovery key. Please check your recovery key password!",
-"Recovery key successfully disabled" => "Recovery key disabled successfully",
-"Please provide the old recovery password" => "Please provide the old recovery password",
-"Please provide a new recovery password" => "Please provide a new recovery password",
-"Please repeat the new recovery password" => "Please repeat the new recovery password",
-"Password successfully changed." => "Password changed successfully.",
-"Could not change the password. Maybe the old password was not correct." => "Could not change the password. Maybe the old password was incorrect.",
-"Private key password successfully updated." => "Private key password updated successfully.",
-"Could not update the private key password. Maybe the old password was not correct." => "Could not update the private key password. Maybe the old password was not correct.",
-"File recovery settings updated" => "File recovery settings updated",
-"Could not update file recovery" => "Could not update file recovery",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Unknown error. Please check your system settings or contact your administrator",
-"Missing requirements." => "Missing requirements.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled.",
-"Following users are not set up for encryption:" => "Following users are not set up for encryption:",
-"Initial encryption started... This can take some time. Please wait." => "Initial encryption started... This can take some time. Please wait.",
-"Initial encryption running... Please try again later." => "Initial encryption running... Please try again later.",
-"Go directly to your %spersonal settings%s." => "Go directly to your %spersonal settings%s.",
-"Encryption" => "Encryption",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Encryption App is enabled but your keys are not initialised, please log-out and log-in again",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Enable recovery key (allow to recover users files in case of password loss):",
-"Recovery key password" => "Recovery key password",
-"Repeat Recovery key password" => "Repeat recovery key password",
-"Enabled" => "Enabled",
-"Disabled" => "Disabled",
-"Change recovery key password:" => "Change recovery key password:",
-"Old Recovery key password" => "Old recovery key password",
-"New Recovery key password" => "New recovery key password",
-"Repeat New Recovery key password" => "Repeat new recovery key password",
-"Change Password" => "Change Password",
-"Your private key password no longer matches your log-in password." => "Your private key password no longer matches your log-in password.",
-"Set your old private key password to your current log-in password:" => "Set your old private key password to your current log-in password:",
-" If you don't remember your old password you can ask your administrator to recover your files." => " If you don't remember your old password you can ask your administrator to recover your files.",
-"Old log-in password" => "Old login password",
-"Current log-in password" => "Current login password",
-"Update Private Key Password" => "Update Private Key Password",
-"Enable password recovery:" => "Enable password recovery:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/eo.js b/apps/files_encryption/l10n/eo.js
new file mode 100644
index 00000000000..8b014abba04
--- /dev/null
+++ b/apps/files_encryption/l10n/eo.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Nekonata eraro",
+    "Password successfully changed." : "La pasvorto sukcese ŝanĝiĝis.",
+    "Could not change the password. Maybe the old password was not correct." : "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
+    "Private key password successfully updated." : "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
+    "Missing requirements." : "Mankas neproj.",
+    "Encryption" : "Ĉifrado",
+    "Enabled" : "Kapabligita",
+    "Disabled" : "Malkapabligita",
+    "Change Password" : "Ŝarĝi pasvorton",
+    "Old log-in password" : "Malnova ensaluta pasvorto",
+    "Current log-in password" : "Nuna ensaluta pasvorto",
+    "Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika klavo",
+    "Enable password recovery:" : "Kapabligi restaŭron de pasvorto:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/eo.json b/apps/files_encryption/l10n/eo.json
new file mode 100644
index 00000000000..221c29addec
--- /dev/null
+++ b/apps/files_encryption/l10n/eo.json
@@ -0,0 +1,16 @@
+{ "translations": {
+    "Unknown error" : "Nekonata eraro",
+    "Password successfully changed." : "La pasvorto sukcese ŝanĝiĝis.",
+    "Could not change the password. Maybe the old password was not correct." : "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
+    "Private key password successfully updated." : "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
+    "Missing requirements." : "Mankas neproj.",
+    "Encryption" : "Ĉifrado",
+    "Enabled" : "Kapabligita",
+    "Disabled" : "Malkapabligita",
+    "Change Password" : "Ŝarĝi pasvorton",
+    "Old log-in password" : "Malnova ensaluta pasvorto",
+    "Current log-in password" : "Nuna ensaluta pasvorto",
+    "Update Private Key Password" : "Ĝisdatigi la pasvorton de la malpublika klavo",
+    "Enable password recovery:" : "Kapabligi restaŭron de pasvorto:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/eo.php b/apps/files_encryption/l10n/eo.php
deleted file mode 100644
index e8d50132128..00000000000
--- a/apps/files_encryption/l10n/eo.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Nekonata eraro",
-"Password successfully changed." => "La pasvorto sukcese ŝanĝiĝis.",
-"Could not change the password. Maybe the old password was not correct." => "Ne eblis ŝanĝi la pasvorton. Eble la malnova pasvorto malĝustis.",
-"Private key password successfully updated." => "La pasvorto de la malpublika klavo sukcese ĝisdatiĝis.",
-"Missing requirements." => "Mankas neproj.",
-"Encryption" => "Ĉifrado",
-"Enabled" => "Kapabligita",
-"Disabled" => "Malkapabligita",
-"Change Password" => "Ŝarĝi pasvorton",
-"Old log-in password" => "Malnova ensaluta pasvorto",
-"Current log-in password" => "Nuna ensaluta pasvorto",
-"Update Private Key Password" => "Ĝisdatigi la pasvorton de la malpublika klavo",
-"Enable password recovery:" => "Kapabligi restaŭron de pasvorto:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es.js b/apps/files_encryption/l10n/es.js
new file mode 100644
index 00000000000..8101c9f4663
--- /dev/null
+++ b/apps/files_encryption/l10n/es.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Error desconocido",
+    "Missing recovery key password" : "Falta contraseña de recuperacion.",
+    "Please repeat the recovery key password" : "Por favor repita la contraseña de recuperacion",
+    "Repeated recovery key password does not match the provided recovery key password" : "la contraseña de recuperacion repetida no es igual a la contraseña de recuperacion",
+    "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
+    "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Please provide the old recovery password" : "Por favor ingrese su antigua contraseña de recuperacion",
+    "Please provide a new recovery password" : "Por favor ingrese una nueva contraseña de recuperacion",
+    "Please repeat the new recovery password" : "Por favor repita su nueva contraseña de recuperacion",
+    "Password successfully changed." : "Su contraseña ha sido cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
+    "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+    "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
+    "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Error desconocido. Revise la configuración de su sistema o contacte a su administrador",
+    "Missing requirements." : "Requisitos incompletos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
+    "Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:",
+    "Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere.",
+    "Initial encryption running... Please try again later." : "Cifrado inicial en curso... Inténtelo más tarde.",
+    "Go directly to your %spersonal settings%s." : "Ir directamente a %sOpciones%s.",
+    "Encryption" : "Cifrado",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Antigua clave de recuperación",
+    "New Recovery key password" : "Nueva clave de recuperación",
+    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    "Your private key password no longer matches your log-in password." : "Tu contraseña de clave privada ya no concuerda con tu contraseña de inicio.",
+    "Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
+    "Old log-in password" : "Contraseña de acceso antigua",
+    "Current log-in password" : "Contraseña de acceso actual",
+    "Update Private Key Password" : "Actualizar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/es.json b/apps/files_encryption/l10n/es.json
new file mode 100644
index 00000000000..16cdc6b40a0
--- /dev/null
+++ b/apps/files_encryption/l10n/es.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Error desconocido",
+    "Missing recovery key password" : "Falta contraseña de recuperacion.",
+    "Please repeat the recovery key password" : "Por favor repita la contraseña de recuperacion",
+    "Repeated recovery key password does not match the provided recovery key password" : "la contraseña de recuperacion repetida no es igual a la contraseña de recuperacion",
+    "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
+    "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Please provide the old recovery password" : "Por favor ingrese su antigua contraseña de recuperacion",
+    "Please provide a new recovery password" : "Por favor ingrese una nueva contraseña de recuperacion",
+    "Please repeat the new recovery password" : "Por favor repita su nueva contraseña de recuperacion",
+    "Password successfully changed." : "Su contraseña ha sido cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
+    "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+    "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
+    "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Error desconocido. Revise la configuración de su sistema o contacte a su administrador",
+    "Missing requirements." : "Requisitos incompletos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
+    "Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:",
+    "Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere.",
+    "Initial encryption running... Please try again later." : "Cifrado inicial en curso... Inténtelo más tarde.",
+    "Go directly to your %spersonal settings%s." : "Ir directamente a %sOpciones%s.",
+    "Encryption" : "Cifrado",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Antigua clave de recuperación",
+    "New Recovery key password" : "Nueva clave de recuperación",
+    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    "Your private key password no longer matches your log-in password." : "Tu contraseña de clave privada ya no concuerda con tu contraseña de inicio.",
+    "Set your old private key password to your current log-in password:" : "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
+    "Old log-in password" : "Contraseña de acceso antigua",
+    "Current log-in password" : "Contraseña de acceso actual",
+    "Update Private Key Password" : "Actualizar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
deleted file mode 100644
index d26aa449b3b..00000000000
--- a/apps/files_encryption/l10n/es.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error desconocido",
-"Missing recovery key password" => "Falta contraseña de recuperacion.",
-"Please repeat the recovery key password" => "Por favor repita la contraseña de recuperacion",
-"Repeated recovery key password does not match the provided recovery key password" => "la contraseña de recuperacion repetida no es igual a la contraseña de recuperacion",
-"Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
-"Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
-"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
-"Please provide the old recovery password" => "Por favor ingrese su antigua contraseña de recuperacion",
-"Please provide a new recovery password" => "Por favor ingrese una nueva contraseña de recuperacion",
-"Please repeat the new recovery password" => "Por favor repita su nueva contraseña de recuperacion",
-"Password successfully changed." => "Su contraseña ha sido cambiada",
-"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
-"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
-"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
-"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
-"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Error desconocido. Revise la configuración de su sistema o contacte a su administrador",
-"Missing requirements." => "Requisitos incompletos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
-"Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
-"Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada..... Esto puede tomar un tiempo. Por favor espere.",
-"Initial encryption running... Please try again later." => "Cifrado inicial en curso... Inténtelo más tarde.",
-"Go directly to your %spersonal settings%s." => "Ir directamente a %sOpciones%s.",
-"Encryption" => "Cifrado",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "La app de crifrado está habilitada pero tus claves no han sido inicializadas, por favor, cierra la sesión y vuelva a iniciarla de nuevo.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los ficheros del usuario en caso de pérdida de la contraseña);",
-"Recovery key password" => "Contraseña de clave de recuperación",
-"Repeat Recovery key password" => "Repite la contraseña de clave de recuperación",
-"Enabled" => "Habilitar",
-"Disabled" => "Deshabilitado",
-"Change recovery key password:" => "Cambiar la contraseña de la clave de recuperación",
-"Old Recovery key password" => "Antigua clave de recuperación",
-"New Recovery key password" => "Nueva clave de recuperación",
-"Repeat New Recovery key password" => "Repetir la nueva clave de recuperación",
-"Change Password" => "Cambiar contraseña",
-"Your private key password no longer matches your log-in password." => "Tu contraseña de clave privada ya no concuerda con tu contraseña de inicio.",
-"Set your old private key password to your current log-in password:" => "Establezca la contraseña de clave privada antigua para su contraseña de inicio de sesión actual:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus ficheros.",
-"Old log-in password" => "Contraseña de acceso antigua",
-"Current log-in password" => "Contraseña de acceso actual",
-"Update Private Key Password" => "Actualizar Contraseña de Clave Privada",
-"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus ficheros cifrados en caso de pérdida de contraseña"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_AR.js b/apps/files_encryption/l10n/es_AR.js
new file mode 100644
index 00000000000..86ac5977f7f
--- /dev/null
+++ b/apps/files_encryption/l10n/es_AR.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Error desconocido",
+    "Recovery key successfully enabled" : "Se habilitó la recuperación de archivos",
+    "Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Password successfully changed." : "Tu contraseña fue cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
+    "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
+    "Could not update the private key password. Maybe the old password was not correct." : "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
+    "File recovery settings updated" : "Las opciones de recuperación de archivos fueron actualizadas",
+    "Could not update file recovery" : "No fue posible actualizar la recuperación de archivos",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.",
+    "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.",
+    "Missing requirements." : "Requisitos incompletos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada.",
+    "Following users are not set up for encryption:" : "Los siguientes usuarios no fueron configurados para encriptar:",
+    "Initial encryption started... This can take some time. Please wait." : "Encriptación inicial comenzada... Esto puede durar un tiempo. Por favor espere.",
+    "Initial encryption running... Please try again later." : "Encriptación inicial corriendo... Por favor intente mas tarde. ",
+    "Encryption" : "Encriptación",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):",
+    "Recovery key password" : "Contraseña de recuperación de clave",
+    "Repeat Recovery key password" : "Repetir la contraseña de la clave de recuperación",
+    "Enabled" : "Habilitado",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
+    "Old Recovery key password" : "Contraseña antigua de recuperación de clave",
+    "New Recovery key password" : "Nueva contraseña de recuperación de clave",
+    "Repeat New Recovery key password" : "Repetir Nueva contraseña para la clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
+    "Old log-in password" : "Contraseña anterior",
+    "Current log-in password" : "Contraseña actual",
+    "Update Private Key Password" : "Actualizar contraseña de la clave privada",
+    "Enable password recovery:" : "Habilitar recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/es_AR.json b/apps/files_encryption/l10n/es_AR.json
new file mode 100644
index 00000000000..07dab2694bd
--- /dev/null
+++ b/apps/files_encryption/l10n/es_AR.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Unknown error" : "Error desconocido",
+    "Recovery key successfully enabled" : "Se habilitó la recuperación de archivos",
+    "Could not disable recovery key. Please check your recovery key password!" : "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Password successfully changed." : "Tu contraseña fue cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
+    "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
+    "Could not update the private key password. Maybe the old password was not correct." : "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
+    "File recovery settings updated" : "Las opciones de recuperación de archivos fueron actualizadas",
+    "Could not update file recovery" : "No fue posible actualizar la recuperación de archivos",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.",
+    "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.",
+    "Missing requirements." : "Requisitos incompletos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada.",
+    "Following users are not set up for encryption:" : "Los siguientes usuarios no fueron configurados para encriptar:",
+    "Initial encryption started... This can take some time. Please wait." : "Encriptación inicial comenzada... Esto puede durar un tiempo. Por favor espere.",
+    "Initial encryption running... Please try again later." : "Encriptación inicial corriendo... Por favor intente mas tarde. ",
+    "Encryption" : "Encriptación",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):",
+    "Recovery key password" : "Contraseña de recuperación de clave",
+    "Repeat Recovery key password" : "Repetir la contraseña de la clave de recuperación",
+    "Enabled" : "Habilitado",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar contraseña para recuperar la clave:",
+    "Old Recovery key password" : "Contraseña antigua de recuperación de clave",
+    "New Recovery key password" : "Nueva contraseña de recuperación de clave",
+    "Repeat New Recovery key password" : "Repetir Nueva contraseña para la clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
+    "Old log-in password" : "Contraseña anterior",
+    "Current log-in password" : "Contraseña actual",
+    "Update Private Key Password" : "Actualizar contraseña de la clave privada",
+    "Enable password recovery:" : "Habilitar recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/es_AR.php b/apps/files_encryption/l10n/es_AR.php
deleted file mode 100644
index d82e5fe0144..00000000000
--- a/apps/files_encryption/l10n/es_AR.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error desconocido",
-"Recovery key successfully enabled" => "Se habilitó la recuperación de archivos",
-"Could not disable recovery key. Please check your recovery key password!" => "No fue posible deshabilitar la clave de recuperación.  Por favor, comprobá tu contraseña.",
-"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
-"Password successfully changed." => "Tu contraseña fue cambiada",
-"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
-"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
-"Could not update the private key password. Maybe the old password was not correct." => "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
-"File recovery settings updated" => "Las opciones de recuperación de archivos fueron actualizadas",
-"Could not update file recovery" => "No fue posible actualizar la recuperación de archivos",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Tu llave privada no es válida! Aparenta que tu clave fue cambiada fuera de %s (de tus directorios). Puedes actualizar la contraseña de tu clave privadaen las configuraciones personales para recobrar el acceso a tus archivos encriptados.",
-"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.",
-"Missing requirements." => "Requisitos incompletos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o una versión más reciente esté instalado y que OpenSSL junto con la extensión PHP esté habilitado y configurado apropiadamente. Por ahora, la aplicación de encriptación ha sido deshabilitada.",
-"Following users are not set up for encryption:" => "Los siguientes usuarios no fueron configurados para encriptar:",
-"Initial encryption started... This can take some time. Please wait." => "Encriptación inicial comenzada... Esto puede durar un tiempo. Por favor espere.",
-"Initial encryption running... Please try again later." => "Encriptación inicial corriendo... Por favor intente mas tarde. ",
-"Encryption" => "Encriptación",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar clave de recuperación (te permite recuperar los archivos de usuario en el caso que pierdas la contraseña):",
-"Recovery key password" => "Contraseña de recuperación de clave",
-"Repeat Recovery key password" => "Repetir la contraseña de la clave de recuperación",
-"Enabled" => "Habilitado",
-"Disabled" => "Deshabilitado",
-"Change recovery key password:" => "Cambiar contraseña para recuperar la clave:",
-"Old Recovery key password" => "Contraseña antigua de recuperación de clave",
-"New Recovery key password" => "Nueva contraseña de recuperación de clave",
-"Repeat New Recovery key password" => "Repetir Nueva contraseña para la clave de recuperación",
-"Change Password" => "Cambiar contraseña",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Si no te acordás de tu contraseña antigua, pedile al administrador que recupere tus archivos",
-"Old log-in password" => "Contraseña anterior",
-"Current log-in password" => "Contraseña actual",
-"Update Private Key Password" => "Actualizar contraseña de la clave privada",
-"Enable password recovery:" => "Habilitar recuperación de contraseña:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitando esta opción, vas a tener acceso a tus archivos encriptados, incluso si perdés la contraseña"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_CL.js b/apps/files_encryption/l10n/es_CL.js
new file mode 100644
index 00000000000..5863354a6f1
--- /dev/null
+++ b/apps/files_encryption/l10n/es_CL.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Error desconocido"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/es_CL.json b/apps/files_encryption/l10n/es_CL.json
new file mode 100644
index 00000000000..8573fba4ca1
--- /dev/null
+++ b/apps/files_encryption/l10n/es_CL.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Unknown error" : "Error desconocido"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/es_CL.php b/apps/files_encryption/l10n/es_CL.php
deleted file mode 100644
index 10621479ff2..00000000000
--- a/apps/files_encryption/l10n/es_CL.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error desconocido"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/es_MX.js b/apps/files_encryption/l10n/es_MX.js
new file mode 100644
index 00000000000..02af0608ab1
--- /dev/null
+++ b/apps/files_encryption/l10n/es_MX.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Error desconocido",
+    "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
+    "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Password successfully changed." : "Su contraseña ha sido cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
+    "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+    "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
+    "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
+    "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.",
+    "Missing requirements." : "Requisitos incompletos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
+    "Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:",
+    "Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.",
+    "Encryption" : "Cifrado",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Antigua clave de recuperación",
+    "New Recovery key password" : "Nueva clave de recuperación",
+    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
+    "Old log-in password" : "Contraseña de acceso antigua",
+    "Current log-in password" : "Contraseña de acceso actual",
+    "Update Private Key Password" : "Actualizar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/es_MX.json b/apps/files_encryption/l10n/es_MX.json
new file mode 100644
index 00000000000..1ff89da3d8f
--- /dev/null
+++ b/apps/files_encryption/l10n/es_MX.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Unknown error" : "Error desconocido",
+    "Recovery key successfully enabled" : "Se ha habilitado la recuperación de archivos",
+    "Could not disable recovery key. Please check your recovery key password!" : "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
+    "Recovery key successfully disabled" : "Clave de recuperación deshabilitada",
+    "Password successfully changed." : "Su contraseña ha sido cambiada",
+    "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
+    "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
+    "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
+    "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
+    "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.",
+    "Missing requirements." : "Requisitos incompletos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
+    "Following users are not set up for encryption:" : "Los siguientes usuarios no han sido configurados para el cifrado:",
+    "Initial encryption started... This can take some time. Please wait." : "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.",
+    "Encryption" : "Cifrado",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);",
+    "Recovery key password" : "Contraseña de clave de recuperación",
+    "Repeat Recovery key password" : "Repite la contraseña de clave de recuperación",
+    "Enabled" : "Habilitar",
+    "Disabled" : "Deshabilitado",
+    "Change recovery key password:" : "Cambiar la contraseña de la clave de recuperación",
+    "Old Recovery key password" : "Antigua clave de recuperación",
+    "New Recovery key password" : "Nueva clave de recuperación",
+    "Repeat New Recovery key password" : "Repetir la nueva clave de recuperación",
+    "Change Password" : "Cambiar contraseña",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
+    "Old log-in password" : "Contraseña de acceso antigua",
+    "Current log-in password" : "Contraseña de acceso actual",
+    "Update Private Key Password" : "Actualizar Contraseña de Clave Privada",
+    "Enable password recovery:" : "Habilitar la recuperación de contraseña:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/es_MX.php b/apps/files_encryption/l10n/es_MX.php
deleted file mode 100644
index e25d34796e5..00000000000
--- a/apps/files_encryption/l10n/es_MX.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error desconocido",
-"Recovery key successfully enabled" => "Se ha habilitado la recuperación de archivos",
-"Could not disable recovery key. Please check your recovery key password!" => "No se pudo deshabilitar la clave de recuperación. Por favor compruebe su contraseña!",
-"Recovery key successfully disabled" => "Clave de recuperación deshabilitada",
-"Password successfully changed." => "Su contraseña ha sido cambiada",
-"Could not change the password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
-"Private key password successfully updated." => "Contraseña de clave privada actualizada con éxito.",
-"Could not update the private key password. Maybe the old password was not correct." => "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
-"File recovery settings updated" => "Opciones de recuperación de archivos actualizada",
-"Could not update file recovery" => "No se pudo actualizar la recuperación de archivos",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "¡Su clave privada no es válida! Tal vez su contraseña ha sido cambiada desde fuera. de %s (Ej:Su directorio corporativo). Puede actualizar la contraseña de su clave privada en sus opciones personales para recuperar el acceso a sus archivos.",
-"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.",
-"Missing requirements." => "Requisitos incompletos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, asegúrese de que PHP 5.3.3 o posterior está instalado y que la extensión OpenSSL de PHP está habilitada y configurada correctamente. Por el momento, la aplicación de cifrado ha sido deshabilitada.",
-"Following users are not set up for encryption:" => "Los siguientes usuarios no han sido configurados para el cifrado:",
-"Initial encryption started... This can take some time. Please wait." => "Encriptación iniciada... Esto puede tomar un tiempo. Por favor espere.",
-"Encryption" => "Cifrado",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar la clave de recuperación (permite recuperar los archivos del usuario en caso de pérdida de la contraseña);",
-"Recovery key password" => "Contraseña de clave de recuperación",
-"Repeat Recovery key password" => "Repite la contraseña de clave de recuperación",
-"Enabled" => "Habilitar",
-"Disabled" => "Deshabilitado",
-"Change recovery key password:" => "Cambiar la contraseña de la clave de recuperación",
-"Old Recovery key password" => "Antigua clave de recuperación",
-"New Recovery key password" => "Nueva clave de recuperación",
-"Repeat New Recovery key password" => "Repetir la nueva clave de recuperación",
-"Change Password" => "Cambiar contraseña",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Si no recuerda su antigua contraseña puede pedir a su administrador que le recupere sus archivos.",
-"Old log-in password" => "Contraseña de acceso antigua",
-"Current log-in password" => "Contraseña de acceso actual",
-"Update Private Key Password" => "Actualizar Contraseña de Clave Privada",
-"Enable password recovery:" => "Habilitar la recuperación de contraseña:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar esta opción le permitirá volver a tener acceso a sus archivos cifrados en caso de pérdida de contraseña"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/et_EE.js b/apps/files_encryption/l10n/et_EE.js
new file mode 100644
index 00000000000..a4edf9950a6
--- /dev/null
+++ b/apps/files_encryption/l10n/et_EE.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Tundmatu viga",
+    "Missing recovery key password" : "Muuda taastevõtme parool",
+    "Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
+    "Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
+    "Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+    "Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
+    "Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
+    "Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
+    "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.",
+    "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
+    "File recovery settings updated" : "Faili taaste seaded uuendatud",
+    "Could not update file recovery" : "Ei suuda uuendada taastefaili",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Tundmatu viga. Palun võta ühendust oma administraatoriga.",
+    "Missing requirements." : "Nõutavad on puudu.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
+    "Following users are not set up for encryption:" : "Järgmised kasutajad pole seadistatud krüpteeringuks:",
+    "Initial encryption started... This can take some time. Please wait." : "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.",
+    "Initial encryption running... Please try again later." : "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.",
+    "Go directly to your %spersonal settings%s." : "Liigi otse oma %s isiklike seadete %s juurde.",
+    "Encryption" : "Krüpteerimine",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):",
+    "Recovery key password" : "Taastevõtme parool",
+    "Repeat Recovery key password" : "Korda taastevõtme parooli",
+    "Enabled" : "Sisse lülitatud",
+    "Disabled" : "Väljalülitatud",
+    "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.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+    "Old log-in password" : "Vana sisselogimise parool",
+    "Current log-in password" : "Praegune sisselogimise parool",
+    "Update Private Key Password" : "Uuenda privaatse võtme parooli",
+    "Enable password recovery:" : "Luba parooli taaste:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/et_EE.json b/apps/files_encryption/l10n/et_EE.json
new file mode 100644
index 00000000000..df58c8f11fb
--- /dev/null
+++ b/apps/files_encryption/l10n/et_EE.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Tundmatu viga",
+    "Missing recovery key password" : "Muuda taastevõtme parool",
+    "Please repeat the recovery key password" : "Palun korda uut taastevõtme parooli",
+    "Repeated recovery key password does not match the provided recovery key password" : "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
+    "Recovery key successfully enabled" : "Taastevõtme lubamine õnnestus",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
+    "Recovery key successfully disabled" : "Taastevõtme keelamine õnnestus",
+    "Please provide the old recovery password" : "Palun sisesta vana taastevõtme parool",
+    "Please provide a new recovery password" : "Palun sisesta uus taastevõtme parool",
+    "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.",
+    "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
+    "File recovery settings updated" : "Faili taaste seaded uuendatud",
+    "Could not update file recovery" : "Ei suuda uuendada taastefaili",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Tundmatu viga. Palun võta ühendust oma administraatoriga.",
+    "Missing requirements." : "Nõutavad on puudu.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
+    "Following users are not set up for encryption:" : "Järgmised kasutajad pole seadistatud krüpteeringuks:",
+    "Initial encryption started... This can take some time. Please wait." : "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.",
+    "Initial encryption running... Please try again later." : "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.",
+    "Go directly to your %spersonal settings%s." : "Liigi otse oma %s isiklike seadete %s juurde.",
+    "Encryption" : "Krüpteerimine",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):",
+    "Recovery key password" : "Taastevõtme parool",
+    "Repeat Recovery key password" : "Korda taastevõtme parooli",
+    "Enabled" : "Sisse lülitatud",
+    "Disabled" : "Väljalülitatud",
+    "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.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
+    "Old log-in password" : "Vana sisselogimise parool",
+    "Current log-in password" : "Praegune sisselogimise parool",
+    "Update Private Key Password" : "Uuenda privaatse võtme parooli",
+    "Enable password recovery:" : "Luba parooli taaste:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/et_EE.php b/apps/files_encryption/l10n/et_EE.php
deleted file mode 100644
index 7362c61bc71..00000000000
--- a/apps/files_encryption/l10n/et_EE.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Tundmatu viga",
-"Missing recovery key password" => "Muuda taastevõtme parool",
-"Please repeat the recovery key password" => "Palun korda uut taastevõtme parooli",
-"Repeated recovery key password does not match the provided recovery key password" => "Lahtritesse sisestatud taastevõtme paroolid ei kattu",
-"Recovery key successfully enabled" => "Taastevõtme lubamine õnnestus",
-"Could not disable recovery key. Please check your recovery key password!" => "Ei suuda keelata taastevõtit. Palun kontrolli oma taastevõtme parooli!",
-"Recovery key successfully disabled" => "Taastevõtme keelamine õnnestus",
-"Please provide the old recovery password" => "Palun sisesta vana taastevõtme parool",
-"Please provide a new recovery password" => "Palun sisesta uus taastevõtme parool",
-"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.",
-"Private key password successfully updated." => "Privaatse võtme parool edukalt uuendatud.",
-"Could not update the private key password. Maybe the old password was not correct." => "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
-"File recovery settings updated" => "Faili taaste seaded uuendatud",
-"Could not update file recovery" => "Ei suuda uuendada taastefaili",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sinu provaatne võti pole kehtiv! Tõenäoliselt mudueti parooli väljaspool kausta %s (nt. sinu ettevõtte kaust). Sa saad uuendada oma privaatse võtme parooli oma isiklikes seadetes, et taastada ligipääs sinu krüpteeritud failidele.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Tundmatu viga. Palun võta ühendust oma administraatoriga.",
-"Missing requirements." => "Nõutavad on puudu.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Palun veendu, et on paigaldatud PHP 5.3.3 või uuem ning PHP OpenSSL laiendus on lubatud ning seadistatud korrektselt. Hetkel krüpteerimise rakendus on peatatud.",
-"Following users are not set up for encryption:" => "Järgmised kasutajad pole seadistatud krüpteeringuks:",
-"Initial encryption started... This can take some time. Please wait." => "Algne krüpteerimine käivitati... See võib võtta natuke aega. Palun oota.",
-"Initial encryption running... Please try again later." => "Toimub esmane krüpteerimine... Palun proovi hiljem uuesti.",
-"Go directly to your %spersonal settings%s." => "Liigi otse oma %s isiklike seadete %s juurde.",
-"Encryption" => "Krüpteerimine",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Luba taastevõti (võimalda kasutaja failide taastamine parooli kaotuse puhul):",
-"Recovery key password" => "Taastevõtme parool",
-"Repeat Recovery key password" => "Korda taastevõtme parooli",
-"Enabled" => "Sisse lülitatud",
-"Disabled" => "Väljalülitatud",
-"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.",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Kui sa ei mäleta oma vana parooli, siis palu oma süsteemihalduril taastada ligipääs failidele.",
-"Old log-in password" => "Vana sisselogimise parool",
-"Current log-in password" => "Praegune sisselogimise parool",
-"Update Private Key Password" => "Uuenda privaatse võtme parooli",
-"Enable password recovery:" => "Luba parooli taaste:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Valiku lubamine võimaldab taastada ligipääsu krüpteeritud failidele kui parooli kaotuse puhul"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/eu.js b/apps/files_encryption/l10n/eu.js
new file mode 100644
index 00000000000..72c78ec31c3
--- /dev/null
+++ b/apps/files_encryption/l10n/eu.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Errore ezezaguna",
+    "Recovery key successfully enabled" : "Berreskuratze gakoa behar bezala gaitua",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
+    "Recovery key successfully disabled" : "Berreskuratze gakoa behar bezala desgaitu da",
+    "Password successfully changed." : "Pasahitza behar bezala aldatu da.",
+    "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+    "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
+    "File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
+    "Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Errore ezezaguna. Mesedez, egiaztatu zure sistemaren ezarpenak edo jarri zure administrariarekin kontaktuan.",
+    "Missing requirements." : "Eskakizun batzuk ez dira betetzen.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago.",
+    "Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
+    "Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
+    "Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
+    "Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.",
+    "Encryption" : "Enkriptazioa",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
+    "Recovery key password" : "Berreskuratze gako pasahitza",
+    "Repeat Recovery key password" : "Errepikatu berreskuratze gakoaren pasahitza",
+    "Enabled" : "Gaitua",
+    "Disabled" : "Ez-gaitua",
+    "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
+    "Old Recovery key password" : "Berreskuratze gako pasahitz zaharra",
+    "New Recovery key password" : "Berreskuratze gako pasahitz berria",
+    "Repeat New Recovery key password" : "Errepikatu berreskuratze gako berriaren pasahitza",
+    "Change Password" : "Aldatu Pasahitza",
+    "Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
+    "Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun  sartzeko pasahitzan:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
+    "Old log-in password" : "Sartzeko pasahitz zaharra",
+    "Current log-in password" : "Sartzeko oraingo pasahitza",
+    "Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
+    "Enable password recovery:" : "Gaitu pasahitzaren berreskuratzea:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/eu.json b/apps/files_encryption/l10n/eu.json
new file mode 100644
index 00000000000..16480dc93c3
--- /dev/null
+++ b/apps/files_encryption/l10n/eu.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Unknown error" : "Errore ezezaguna",
+    "Recovery key successfully enabled" : "Berreskuratze gakoa behar bezala gaitua",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
+    "Recovery key successfully disabled" : "Berreskuratze gakoa behar bezala desgaitu da",
+    "Password successfully changed." : "Pasahitza behar bezala aldatu da.",
+    "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
+    "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
+    "File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
+    "Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Errore ezezaguna. Mesedez, egiaztatu zure sistemaren ezarpenak edo jarri zure administrariarekin kontaktuan.",
+    "Missing requirements." : "Eskakizun batzuk ez dira betetzen.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago.",
+    "Following users are not set up for encryption:" : "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
+    "Initial encryption started... This can take some time. Please wait." : "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
+    "Initial encryption running... Please try again later." : "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
+    "Go directly to your %spersonal settings%s." : "Joan zuzenean zure %sezarpen pertsonaletara%s.",
+    "Encryption" : "Enkriptazioa",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
+    "Recovery key password" : "Berreskuratze gako pasahitza",
+    "Repeat Recovery key password" : "Errepikatu berreskuratze gakoaren pasahitza",
+    "Enabled" : "Gaitua",
+    "Disabled" : "Ez-gaitua",
+    "Change recovery key password:" : "Aldatu berreskuratze gako pasahitza:",
+    "Old Recovery key password" : "Berreskuratze gako pasahitz zaharra",
+    "New Recovery key password" : "Berreskuratze gako pasahitz berria",
+    "Repeat New Recovery key password" : "Errepikatu berreskuratze gako berriaren pasahitza",
+    "Change Password" : "Aldatu Pasahitza",
+    "Your private key password no longer matches your log-in password." : "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
+    "Set your old private key password to your current log-in password:" : "Ezarri zure gako pasahitz zaharra orain duzun  sartzeko pasahitzan:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
+    "Old log-in password" : "Sartzeko pasahitz zaharra",
+    "Current log-in password" : "Sartzeko oraingo pasahitza",
+    "Update Private Key Password" : "Eguneratu gako pasahitza pribatua",
+    "Enable password recovery:" : "Gaitu pasahitzaren berreskuratzea:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
deleted file mode 100644
index 90a943a2356..00000000000
--- a/apps/files_encryption/l10n/eu.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Errore ezezaguna",
-"Missing recovery key password" => "Berreskurapen gakoaren pasahitza falta da",
-"Please repeat the recovery key password" => "Mesedez errepikatu berreskuratze gakoaren pasahitza",
-"Repeated recovery key password does not match the provided recovery key password" => "Errepikatutako berreskuratze gakoaren pasahitza ez dator bat berreskuratze gakoaren pasahitzarekin",
-"Recovery key successfully enabled" => "Berreskuratze gakoa behar bezala gaitua",
-"Could not disable recovery key. Please check your recovery key password!" => "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
-"Recovery key successfully disabled" => "Berreskuratze gakoa behar bezala desgaitu da",
-"Please provide the old recovery password" => "Mesedez sartu berreskuratze pasahitz zaharra",
-"Please provide a new recovery password" => "Mesedez sartu berreskuratze pasahitz berria",
-"Please repeat the new recovery password" => "Mesedez errepikatu berreskuratze pasahitz berria",
-"Password successfully changed." => "Pasahitza behar bezala aldatu da.",
-"Could not change the password. Maybe the old password was not correct." => "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
-"Private key password successfully updated." => "Gako pasahitz pribatu behar bezala eguneratu da.",
-"Could not update the private key password. Maybe the old password was not correct." => "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
-"File recovery settings updated" => "Fitxategi berreskuratze ezarpenak eguneratuak",
-"Could not update file recovery" => "Ezin da fitxategi berreskuratzea eguneratu",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zure gako pribatua ez da egokia! Seguruaski zure pasahitza %s-tik kanpo aldatu da (adb. zure direktorio korporatiboa). Zure gako pribatuaren pasahitza eguneratu dezakezu zure ezarpen pertsonaletan zure enkriptatutako fitxategiak berreskuratzeko.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Errore ezezaguna. Mesedez, egiaztatu zure sistemaren ezarpenak edo jarri zure administrariarekin kontaktuan.",
-"Missing requirements." => "Eskakizun batzuk ez dira betetzen.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Mesedez ziurtatu PHP 5.3.3 edo berriago bat instalatuta dagoela eta OpenSSL PHP hedapenarekin gaitua eta ongi konfiguratuta dagoela. Oraingoz, enkriptazio aplikazioa desgaituta dago.",
-"Following users are not set up for encryption:" => "Hurrengo erabiltzaileak ez daude enktriptatzeko konfiguratutak:",
-"Initial encryption started... This can take some time. Please wait." => "Hasierako enkriptazioa hasi da... Honek denbora har dezake. Mesedez itxaron.",
-"Initial encryption running... Please try again later." => "Hasierako enkriptaketa abian... mesedez, saiatu beranduago.",
-"Go directly to your %spersonal settings%s." => "Joan zuzenean zure %sezarpen pertsonaletara%s.",
-"Encryption" => "Enkriptazioa",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Gaitu berreskurapen gakoa (erabiltzaileen fitxategiak berreskuratzea ahalbidetzen du pasahitza galtzen badute ere):",
-"Recovery key password" => "Berreskuratze gako pasahitza",
-"Repeat Recovery key password" => "Errepikatu berreskuratze gakoaren pasahitza",
-"Enabled" => "Gaitua",
-"Disabled" => "Ez-gaitua",
-"Change recovery key password:" => "Aldatu berreskuratze gako pasahitza:",
-"Old Recovery key password" => "Berreskuratze gako pasahitz zaharra",
-"New Recovery key password" => "Berreskuratze gako pasahitz berria",
-"Repeat New Recovery key password" => "Errepikatu berreskuratze gako berriaren pasahitza",
-"Change Password" => "Aldatu Pasahitza",
-"Your private key password no longer matches your log-in password." => "Zure gako pasahitza pribatua ez da dagoeneko bat etortzen zure sartzeko pasahitzarekin.",
-"Set your old private key password to your current log-in password:" => "Ezarri zure gako pasahitz zaharra orain duzun  sartzeko pasahitzan:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Ez baduzu zure pasahitz zaharra gogoratzen eskatu zure administratzaileari zure fitxategiak berreskuratzeko.",
-"Old log-in password" => "Sartzeko pasahitz zaharra",
-"Current log-in password" => "Sartzeko oraingo pasahitza",
-"Update Private Key Password" => "Eguneratu gako pasahitza pribatua",
-"Enable password recovery:" => "Gaitu pasahitzaren berreskuratzea:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aukera hau gaituz zure enkriptatutako fitxategiak berreskuratu ahal izango dituzu pasahitza galtzekotan"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fa.js b/apps/files_encryption/l10n/fa.js
new file mode 100644
index 00000000000..541b19c695c
--- /dev/null
+++ b/apps/files_encryption/l10n/fa.js
@@ -0,0 +1,32 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "خطای نامشخص",
+    "Recovery key successfully enabled" : "کلید بازیابی با موفقیت فعال شده است.",
+    "Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
+    "Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
+    "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
+    "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
+    "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
+    "Could not update the private key password. Maybe the old password was not correct." : "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
+    "File recovery settings updated" : "تنظیمات بازیابی فایل به روز شده است.",
+    "Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.",
+    "Missing requirements." : "نیازمندی های گمشده",
+    "Following users are not set up for encryption:" : "کاربران زیر برای رمزنگاری تنظیم نشده اند",
+    "Encryption" : "رمزگذاری",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
+    "Recovery key password" : "رمزعبور کلید بازیابی",
+    "Enabled" : "فعال شده",
+    "Disabled" : "غیرفعال شده",
+    "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
+    "Old Recovery key password" : "رمزعبور قدیمی  کلید بازیابی ",
+    "New Recovery key password" : "رمزعبور جدید کلید بازیابی",
+    "Change Password" : "تغییر رمزعبور",
+    " 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" : "رمزعبور فعلی",
+    "Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
+    "Enable password recovery:" : "فعال سازی بازیابی رمزعبور:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/fa.json b/apps/files_encryption/l10n/fa.json
new file mode 100644
index 00000000000..30b0faa5ec8
--- /dev/null
+++ b/apps/files_encryption/l10n/fa.json
@@ -0,0 +1,30 @@
+{ "translations": {
+    "Unknown error" : "خطای نامشخص",
+    "Recovery key successfully enabled" : "کلید بازیابی با موفقیت فعال شده است.",
+    "Could not disable recovery key. Please check your recovery key password!" : "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
+    "Recovery key successfully disabled" : "کلید بازیابی با موفقیت غیر فعال شده است.",
+    "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
+    "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
+    "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
+    "Could not update the private key password. Maybe the old password was not correct." : "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
+    "File recovery settings updated" : "تنظیمات بازیابی فایل به روز شده است.",
+    "Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.",
+    "Missing requirements." : "نیازمندی های گمشده",
+    "Following users are not set up for encryption:" : "کاربران زیر برای رمزنگاری تنظیم نشده اند",
+    "Encryption" : "رمزگذاری",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
+    "Recovery key password" : "رمزعبور کلید بازیابی",
+    "Enabled" : "فعال شده",
+    "Disabled" : "غیرفعال شده",
+    "Change recovery key password:" : "تغییر رمزعبور کلید بازیابی:",
+    "Old Recovery key password" : "رمزعبور قدیمی  کلید بازیابی ",
+    "New Recovery key password" : "رمزعبور جدید کلید بازیابی",
+    "Change Password" : "تغییر رمزعبور",
+    " 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" : "رمزعبور فعلی",
+    "Update Private Key Password" : "به روز رسانی رمزعبور کلید خصوصی",
+    "Enable password recovery:" : "فعال سازی بازیابی رمزعبور:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/fa.php b/apps/files_encryption/l10n/fa.php
deleted file mode 100644
index 113bf65ca37..00000000000
--- a/apps/files_encryption/l10n/fa.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "خطای نامشخص",
-"Recovery key successfully enabled" => "کلید بازیابی با موفقیت فعال شده است.",
-"Could not disable recovery key. Please check your recovery key password!" => "کلید بازیابی را نمی تواند غیرفعال نماید. لطفا رمزعبور کلید بازیابی خود را بررسی کنید!",
-"Recovery key successfully disabled" => "کلید بازیابی با موفقیت غیر فعال شده است.",
-"Password successfully changed." => "رمزعبور با موفقیت تغییر یافت.",
-"Could not change the password. Maybe the old password was not correct." => "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
-"Private key password successfully updated." => "رمزعبور کلید خصوصی با موفقیت به روز شد.",
-"Could not update the private key password. Maybe the old password was not correct." => "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
-"File recovery settings updated" => "تنظیمات بازیابی فایل به روز شده است.",
-"Could not update file recovery" => "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.",
-"Missing requirements." => "نیازمندی های گمشده",
-"Following users are not set up for encryption:" => "کاربران زیر برای رمزنگاری تنظیم نشده اند",
-"Encryption" => "رمزگذاری",
-"Enable recovery key (allow to recover users files in case of password loss):" => "فعال کردن کلید بازیابی(اجازه بازیابی فایل های کاربران در صورت از دست دادن رمزعبور):",
-"Recovery key password" => "رمزعبور کلید بازیابی",
-"Enabled" => "فعال شده",
-"Disabled" => "غیرفعال شده",
-"Change recovery key password:" => "تغییر رمزعبور کلید بازیابی:",
-"Old Recovery key password" => "رمزعبور قدیمی  کلید بازیابی ",
-"New Recovery key password" => "رمزعبور جدید کلید بازیابی",
-"Change Password" => "تغییر رمزعبور",
-" 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" => "رمزعبور فعلی",
-"Update Private Key Password" => "به روز رسانی رمزعبور کلید خصوصی",
-"Enable password recovery:" => "فعال سازی بازیابی رمزعبور:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "فعال کردن این گزینه به شما اجازه خواهد داد در صورت از دست دادن رمزعبور به فایل های رمزگذاری شده خود دسترسی داشته باشید."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/fi_FI.js b/apps/files_encryption/l10n/fi_FI.js
new file mode 100644
index 00000000000..bf1afbb1129
--- /dev/null
+++ b/apps/files_encryption/l10n/fi_FI.js
@@ -0,0 +1,33 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Tuntematon virhe",
+    "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti",
+    "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.",
+    "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+    "Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.",
+    "File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty",
+    "Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
+    "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
+    "Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
+    "Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
+    "Go directly to your %spersonal settings%s." : "Siirry suoraan %shenkilökohtaisiin asetuksiisi%s.",
+    "Encryption" : "Salaus",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):",
+    "Recovery key password" : "Palautusavaimen salasana",
+    "Repeat Recovery key password" : "Toista palautusavaimen salasana",
+    "Enabled" : "Käytössä",
+    "Disabled" : "Ei käytössä",
+    "Change recovery key password:" : "Vaihda palautusavaimen salasana:",
+    "Old Recovery key password" : "Vanha palautusavaimen salasana",
+    "New Recovery key password" : "Uusi palautusavaimen salasana",
+    "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
+    "Change Password" : "Vaihda salasana",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
+    "Old log-in password" : "Vanha kirjautumis-salasana",
+    "Current log-in password" : "Nykyinen kirjautumis-salasana",
+    "Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
+    "Enable password recovery:" : "Ota salasanan palautus käyttöön:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/fi_FI.json b/apps/files_encryption/l10n/fi_FI.json
new file mode 100644
index 00000000000..2b91a4388d0
--- /dev/null
+++ b/apps/files_encryption/l10n/fi_FI.json
@@ -0,0 +1,31 @@
+{ "translations": {
+    "Unknown error" : "Tuntematon virhe",
+    "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti",
+    "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.",
+    "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+    "Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.",
+    "File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty",
+    "Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
+    "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
+    "Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
+    "Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
+    "Go directly to your %spersonal settings%s." : "Siirry suoraan %shenkilökohtaisiin asetuksiisi%s.",
+    "Encryption" : "Salaus",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):",
+    "Recovery key password" : "Palautusavaimen salasana",
+    "Repeat Recovery key password" : "Toista palautusavaimen salasana",
+    "Enabled" : "Käytössä",
+    "Disabled" : "Ei käytössä",
+    "Change recovery key password:" : "Vaihda palautusavaimen salasana:",
+    "Old Recovery key password" : "Vanha palautusavaimen salasana",
+    "New Recovery key password" : "Uusi palautusavaimen salasana",
+    "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
+    "Change Password" : "Vaihda salasana",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
+    "Old log-in password" : "Vanha kirjautumis-salasana",
+    "Current log-in password" : "Nykyinen kirjautumis-salasana",
+    "Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
+    "Enable password recovery:" : "Ota salasanan palautus käyttöön:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/fi_FI.php b/apps/files_encryption/l10n/fi_FI.php
deleted file mode 100644
index 93ecf4c1ea7..00000000000
--- a/apps/files_encryption/l10n/fi_FI.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Tuntematon virhe",
-"Recovery key successfully enabled" => "Palautusavain kytketty päälle onnistuneesti",
-"Password successfully changed." => "Salasana vaihdettiin onnistuneesti.",
-"Could not change the password. Maybe the old password was not correct." => "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
-"Private key password successfully updated." => "Yksityisen avaimen salasana päivitetty onnistuneesti.",
-"File recovery settings updated" => "Tiedostopalautuksen asetukset päivitetty",
-"Unknown error. Please check your system settings or contact your administrator" => "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
-"Following users are not set up for encryption:" => "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
-"Initial encryption started... This can take some time. Please wait." => "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
-"Initial encryption running... Please try again later." => "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
-"Go directly to your %spersonal settings%s." => "Siirry suoraan %shenkilökohtaisiin asetuksiisi%s.",
-"Encryption" => "Salaus",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Käytä palautusavainta (salli käyttäjien tiedostojen palauttaminen, jos heidän salasana unohtuu):",
-"Recovery key password" => "Palautusavaimen salasana",
-"Repeat Recovery key password" => "Toista palautusavaimen salasana",
-"Enabled" => "Käytössä",
-"Disabled" => "Ei käytössä",
-"Change recovery key password:" => "Vaihda palautusavaimen salasana:",
-"Old Recovery key password" => "Vanha palautusavaimen salasana",
-"New Recovery key password" => "Uusi palautusavaimen salasana",
-"Repeat New Recovery key password" => "Toista uusi palautusavaimen salasana",
-"Change Password" => "Vaihda salasana",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
-"Old log-in password" => "Vanha kirjautumis-salasana",
-"Current log-in password" => "Nykyinen kirjautumis-salasana",
-"Update Private Key Password" => "Päivitä yksityisen avaimen salasana",
-"Enable password recovery:" => "Ota salasanan palautus käyttöön:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js
new file mode 100644
index 00000000000..68d07143f73
--- /dev/null
+++ b/apps/files_encryption/l10n/fr.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Erreur Inconnue ",
+    "Missing recovery key password" : "Mot de passe de la clef de récupération manquant",
+    "Please repeat the recovery key password" : "Répétez le mot de passe de la clé de récupération",
+    "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.",
+    "Recovery key successfully enabled" : "Clé de récupération activée avec succès",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
+    "Recovery key successfully disabled" : "Clé de récupération désactivée avec succès",
+    "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
+    "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
+    "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
+    "Password successfully changed." : "Mot de passe changé avec succès ",
+    "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
+    "Private key password successfully updated." : "Mot de passe de la clé privé mis à jour avec succès.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
+    "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour",
+    "Could not update file recovery" : "Ne peut pas remettre à jour les fichiers de récupération",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée est invalide ! Votre mot de passe a probablement été modifié hors de %s (ex. votre annuaire d'entreprise). Vous pouvez mettre à jour le mot de passe de votre clef privée dans les paramètres personnels pour pouvoir récupérer l'accès à vos fichiers chiffrés.",
+    "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 de ce fichier de le repartager avec vous.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur.",
+    "Missing requirements." : "Système minimum requis non respecté.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
+    "Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
+    "Initial encryption started... This can take some time. Please wait." : "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.",
+    "Initial encryption running... Please try again later." : "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.",
+    "Go directly to your %spersonal settings%s." : "Allerz directement à vos %spersonal settings%s.",
+    "Encryption" : "Chiffrement",
+    "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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
+    "Recovery key password" : "Mot de passe de la clef de récupération",
+    "Repeat Recovery key password" : "Répétez le mot de passe de la clé de récupération",
+    "Enabled" : "Activer",
+    "Disabled" : "Désactiver",
+    "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
+    "Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
+    "New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
+    "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération",
+    "Change Password" : "Changer de mot de passe",
+    "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
+    "Set your old private key password to your current log-in password:" : "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion :",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
+    "Old log-in password" : "Ancien mot de passe de connexion",
+    "Current log-in password" : "Actuel mot de passe de connexion",
+    "Update Private Key Password" : "Mettre à jour le mot de passe de votre clé privée",
+    "Enable password recovery:" : "Activer la récupération du mot de passe :",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_encryption/l10n/fr.json b/apps/files_encryption/l10n/fr.json
new file mode 100644
index 00000000000..707583f7c80
--- /dev/null
+++ b/apps/files_encryption/l10n/fr.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Erreur Inconnue ",
+    "Missing recovery key password" : "Mot de passe de la clef de récupération manquant",
+    "Please repeat the recovery key password" : "Répétez le mot de passe de la clé de récupération",
+    "Repeated recovery key password does not match the provided recovery key password" : "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.",
+    "Recovery key successfully enabled" : "Clé de récupération activée avec succès",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
+    "Recovery key successfully disabled" : "Clé de récupération désactivée avec succès",
+    "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
+    "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
+    "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
+    "Password successfully changed." : "Mot de passe changé avec succès ",
+    "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
+    "Private key password successfully updated." : "Mot de passe de la clé privé mis à jour avec succès.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
+    "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour",
+    "Could not update file recovery" : "Ne peut pas remettre à jour les fichiers de récupération",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Votre clef privée est invalide ! Votre mot de passe a probablement été modifié hors de %s (ex. votre annuaire d'entreprise). Vous pouvez mettre à jour le mot de passe de votre clef privée dans les paramètres personnels pour pouvoir récupérer l'accès à vos fichiers chiffrés.",
+    "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 de ce fichier de le repartager avec vous.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur.",
+    "Missing requirements." : "Système minimum requis non respecté.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
+    "Following users are not set up for encryption:" : "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
+    "Initial encryption started... This can take some time. Please wait." : "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.",
+    "Initial encryption running... Please try again later." : "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.",
+    "Go directly to your %spersonal settings%s." : "Allerz directement à vos %spersonal settings%s.",
+    "Encryption" : "Chiffrement",
+    "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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
+    "Recovery key password" : "Mot de passe de la clef de récupération",
+    "Repeat Recovery key password" : "Répétez le mot de passe de la clé de récupération",
+    "Enabled" : "Activer",
+    "Disabled" : "Désactiver",
+    "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
+    "Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
+    "New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
+    "Repeat New Recovery key password" : "Répétez le nouveau mot de passe de la clé de récupération",
+    "Change Password" : "Changer de mot de passe",
+    "Your private key password no longer matches your log-in password." : "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
+    "Set your old private key password to your current log-in password:" : "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion :",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
+    "Old log-in password" : "Ancien mot de passe de connexion",
+    "Current log-in password" : "Actuel mot de passe de connexion",
+    "Update Private Key Password" : "Mettre à jour le mot de passe de votre clé privée",
+    "Enable password recovery:" : "Activer la récupération du mot de passe :",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/fr.php b/apps/files_encryption/l10n/fr.php
deleted file mode 100644
index 2ca5eec48f0..00000000000
--- a/apps/files_encryption/l10n/fr.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Erreur Inconnue ",
-"Missing recovery key password" => "Mot de passe de la clef de récupération manquant",
-"Please repeat the recovery key password" => "Répétez le mot de passe de la clé de récupération",
-"Repeated recovery key password does not match the provided recovery key password" => "Le mot de passe de la clé de récupération et sa répétition ne sont pas identiques.",
-"Recovery key successfully enabled" => "Clé de récupération activée avec succès",
-"Could not disable recovery key. Please check your recovery key password!" => "Impossible de désactiver la clé de récupération. Veuillez vérifier votre mot de passe de clé de récupération !",
-"Recovery key successfully disabled" => "Clé de récupération désactivée avec succès",
-"Please provide the old recovery password" => "Veuillez entrer l'ancien mot de passe de récupération",
-"Please provide a new recovery password" => "Veuillez entrer un nouveau mot de passe de récupération",
-"Please repeat the new recovery password" => "Veuillez répéter le nouveau mot de passe de récupération",
-"Password successfully changed." => "Mot de passe changé avec succès ",
-"Could not change the password. Maybe the old password was not correct." => "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
-"Private key password successfully updated." => "Mot de passe de la clé privé mis à jour avec succès.",
-"Could not update the private key password. Maybe the old password was not correct." => "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
-"File recovery settings updated" => "Paramètres de récupération de fichiers mis à jour",
-"Could not update file recovery" => "Ne peut pas remettre à jour les fichiers de récupération",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Votre clef privée est invalide ! Votre mot de passe a probablement été modifié hors de %s (ex. votre annuaire d'entreprise). Vous pouvez mettre à jour le mot de passe de votre clef privée dans les paramètres personnels pour pouvoir récupérer l'accès à vos fichiers chiffrés.",
-"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 de ce fichier de le repartager avec vous.",
-"Unknown error. Please check your system settings or contact your administrator" => "Erreur inconnue. Veuillez vérifier vos paramètres système ou contacter un administrateur.",
-"Missing requirements." => "Système minimum requis non respecté.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Veuillez vous assurer qu'une version de PHP 5.3.3 ou supérieure est installée et qu'OpenSSL et son extension PHP sont activés et configurés correctement. En attendant, l'application de chiffrement été désactivée.",
-"Following users are not set up for encryption:" => "Les utilisateurs suivants ne sont pas configurés pour le chiffrement :",
-"Initial encryption started... This can take some time. Please wait." => "Chiffrement initial démarré... Cela peut prendre un certain temps. Veuillez patienter.",
-"Initial encryption running... Please try again later." => "Chiffrement initial en cours... Veuillez re-essayer ultérieurement.",
-"Go directly to your %spersonal settings%s." => "Allerz directement à vos %spersonal settings%s.",
-"Encryption" => "Chiffrement",
-"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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
-"Recovery key password" => "Mot de passe de la clef de récupération",
-"Repeat Recovery key password" => "Répétez le mot de passe de la clé de récupération",
-"Enabled" => "Activer",
-"Disabled" => "Désactiver",
-"Change recovery key password:" => "Modifier le mot de passe de la clef de récupération :",
-"Old Recovery key password" => "Ancien mot de passe de la clef de récupération",
-"New Recovery key password" => "Nouveau mot de passe de la clef de récupération",
-"Repeat New Recovery key password" => "Répétez le nouveau mot de passe de la clé de récupération",
-"Change Password" => "Changer de mot de passe",
-"Your private key password no longer matches your log-in password." => "Le mot de passe de votre clef privée ne correspond plus à votre mot de passe de connexion.",
-"Set your old private key password to your current log-in password:" => "Configurez le mot de passe de votre ancienne clef privée avec votre mot de passe courant de connexion :",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Si vous ne vous souvenez plus de votre ancien mot de passe, vous pouvez demander à votre administrateur de récupérer vos fichiers.",
-"Old log-in password" => "Ancien mot de passe de connexion",
-"Current log-in password" => "Actuel mot de passe de connexion",
-"Update Private Key Password" => "Mettre à jour le mot de passe de votre clé privée",
-"Enable password recovery:" => "Activer la récupération du mot de passe :",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Activer cette option vous permettra d'obtenir à nouveau l'accès à vos fichiers chiffrés en cas de perte de mot de passe"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/gl.js b/apps/files_encryption/l10n/gl.js
new file mode 100644
index 00000000000..72f27a9c5a9
--- /dev/null
+++ b/apps/files_encryption/l10n/gl.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Produciuse un erro descoñecido",
+    "Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación",
+    "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+    "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación",
+    "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
+    "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
+    "Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
+    "File recovery settings updated" : "Actualizouse o ficheiro de axustes de recuperación",
+    "Could not update file recovery" : "Non foi posíbel actualizar o ficheiro de recuperación",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Non se iniciou a aplicación de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala para que tamén se inicie a aplicación de cifrado.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior do %s (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou contacte co administrador",
+    "Missing requirements." : "Non se cumpren os requisitos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivada a aplicación de cifrado.",
+    "Following users are not set up for encryption:" : "Os seguintes usuarios non teñen configuración para o cifrado:",
+    "Initial encryption started... This can take some time. Please wait." : "Comezou o cifrado inicial... Isto pode levar bastante tempo. Agarde.",
+    "Initial encryption running... Please try again later." : "O cifrado inicial está en execución... Tenteo máis tarde.",
+    "Go directly to your %spersonal settings%s." : "Vaia directamente aos seus %saxustes persoais%s.",
+    "Encryption" : "Cifrado",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
+    "Recovery key password" : "Contrasinal da chave de recuperación",
+    "Repeat Recovery key password" : "Repita o contrasinal da chave de recuperación",
+    "Enabled" : "Activado",
+    "Disabled" : "Desactivado",
+    "Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
+    "Old Recovery key password" : "Antigo contrasinal da chave de recuperación",
+    "New Recovery key password" : "Novo contrasinal da chave de recuperación",
+    "Repeat New Recovery key password" : "Repita o novo contrasinal da chave de recuperación",
+    "Change Password" : "Cambiar o contrasinal",
+    "Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
+    "Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
+    "Old log-in password" : "Contrasinal antigo de acceso",
+    "Current log-in password" : "Contrasinal actual de acceso",
+    "Update Private Key Password" : "Actualizar o contrasinal da chave privada",
+    "Enable password recovery:" : "Activar o  contrasinal de recuperación:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/gl.json b/apps/files_encryption/l10n/gl.json
new file mode 100644
index 00000000000..05e17509c46
--- /dev/null
+++ b/apps/files_encryption/l10n/gl.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Unknown error" : "Produciuse un erro descoñecido",
+    "Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación",
+    "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
+    "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación",
+    "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
+    "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
+    "Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
+    "File recovery settings updated" : "Actualizouse o ficheiro de axustes de recuperación",
+    "Could not update file recovery" : "Non foi posíbel actualizar o ficheiro de recuperación",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Non se iniciou a aplicación de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala para que tamén se inicie a aplicación de cifrado.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior do %s (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou contacte co administrador",
+    "Missing requirements." : "Non se cumpren os requisitos.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivada a aplicación de cifrado.",
+    "Following users are not set up for encryption:" : "Os seguintes usuarios non teñen configuración para o cifrado:",
+    "Initial encryption started... This can take some time. Please wait." : "Comezou o cifrado inicial... Isto pode levar bastante tempo. Agarde.",
+    "Initial encryption running... Please try again later." : "O cifrado inicial está en execución... Tenteo máis tarde.",
+    "Go directly to your %spersonal settings%s." : "Vaia directamente aos seus %saxustes persoais%s.",
+    "Encryption" : "Cifrado",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
+    "Recovery key password" : "Contrasinal da chave de recuperación",
+    "Repeat Recovery key password" : "Repita o contrasinal da chave de recuperación",
+    "Enabled" : "Activado",
+    "Disabled" : "Desactivado",
+    "Change recovery key password:" : "Cambiar o contrasinal da chave de la recuperación:",
+    "Old Recovery key password" : "Antigo contrasinal da chave de recuperación",
+    "New Recovery key password" : "Novo contrasinal da chave de recuperación",
+    "Repeat New Recovery key password" : "Repita o novo contrasinal da chave de recuperación",
+    "Change Password" : "Cambiar o contrasinal",
+    "Your private key password no longer matches your log-in password." : "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
+    "Set your old private key password to your current log-in password:" : "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
+    "Old log-in password" : "Contrasinal antigo de acceso",
+    "Current log-in password" : "Contrasinal actual de acceso",
+    "Update Private Key Password" : "Actualizar o contrasinal da chave privada",
+    "Enable password recovery:" : "Activar o  contrasinal de recuperación:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/gl.php b/apps/files_encryption/l10n/gl.php
deleted file mode 100644
index bf1cea07093..00000000000
--- a/apps/files_encryption/l10n/gl.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Produciuse un erro descoñecido",
-"Recovery key successfully enabled" => "Activada satisfactoriamente a chave de recuperación",
-"Could not disable recovery key. Please check your recovery key password!" => "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
-"Recovery key successfully disabled" => "Desactivada satisfactoriamente a chave de recuperación",
-"Password successfully changed." => "O contrasinal foi cambiado satisfactoriamente",
-"Could not change the password. Maybe the old password was not correct." => "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
-"Private key password successfully updated." => "A chave privada foi actualizada correctamente.",
-"Could not update the private key password. Maybe the old password was not correct." => "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
-"File recovery settings updated" => "Actualizouse o ficheiro de axustes de recuperación",
-"Could not update file recovery" => "Non foi posíbel actualizar o ficheiro de recuperación",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Non se iniciou a aplicación de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala para que tamén se inicie a aplicación de cifrado.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A chave privada non é correcta! É probábel que o seu contrasinal teña sido cambiado desde o exterior do %s (p.ex. o seu directorio corporativo). Vostede pode actualizar o contrasinal da súa chave privada nos seus axustes persoais para recuperar o acceso aos seus ficheiros",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Produciuse un erro descoñecido. Comprobe os axustes do sistema ou contacte co administrador",
-"Missing requirements." => "Non se cumpren os requisitos.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Asegúrese de que está instalado o PHP 5.3.3 ou posterior e de que o OpenSSL xunto coa extensión PHP estean activados e configurados correctamente. Polo de agora foi desactivada a aplicación de cifrado.",
-"Following users are not set up for encryption:" => "Os seguintes usuarios non teñen configuración para o cifrado:",
-"Initial encryption started... This can take some time. Please wait." => "Comezou o cifrado inicial... Isto pode levar bastante tempo. Agarde.",
-"Initial encryption running... Please try again later." => "O cifrado inicial está en execución... Tenteo máis tarde.",
-"Go directly to your %spersonal settings%s." => "Vaia directamente aos seus %saxustes persoais%s.",
-"Encryption" => "Cifrado",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "A aplicación de cifrado está activada, mais as chaves non foron inicializadas, saia da sesión e volva a acceder de novo",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Activar a chave de recuperación (permitirá recuperar os ficheiros dos usuarios no caso de perda do contrasinal):",
-"Recovery key password" => "Contrasinal da chave de recuperación",
-"Repeat Recovery key password" => "Repita o contrasinal da chave de recuperación",
-"Enabled" => "Activado",
-"Disabled" => "Desactivado",
-"Change recovery key password:" => "Cambiar o contrasinal da chave de la recuperación:",
-"Old Recovery key password" => "Antigo contrasinal da chave de recuperación",
-"New Recovery key password" => "Novo contrasinal da chave de recuperación",
-"Repeat New Recovery key password" => "Repita o novo contrasinal da chave de recuperación",
-"Change Password" => "Cambiar o contrasinal",
-"Your private key password no longer matches your log-in password." => "O seu contrasinal da chave privada non coincide co seu contrasinal de acceso.",
-"Set your old private key password to your current log-in password:" => "Estabeleza o seu contrasinal antigo da chave de recuperación ao seu contrasinal de acceso actual:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Se non lembra o seu antigo contrasinal pode pedírllelo ao seu administrador para recuperar os seus ficheiros.",
-"Old log-in password" => "Contrasinal antigo de acceso",
-"Current log-in password" => "Contrasinal actual de acceso",
-"Update Private Key Password" => "Actualizar o contrasinal da chave privada",
-"Enable password recovery:" => "Activar o  contrasinal de recuperación:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao activar esta opción permitiráselle volver a obter acceso aos ficheiros cifrados no caso de perda do contrasinal"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/he.js b/apps/files_encryption/l10n/he.js
new file mode 100644
index 00000000000..90070547378
--- /dev/null
+++ b/apps/files_encryption/l10n/he.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "שגיאה בלתי ידועה",
+    "Encryption" : "הצפנה"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/he.json b/apps/files_encryption/l10n/he.json
new file mode 100644
index 00000000000..c3d357516d3
--- /dev/null
+++ b/apps/files_encryption/l10n/he.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Unknown error" : "שגיאה בלתי ידועה",
+    "Encryption" : "הצפנה"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/he.php b/apps/files_encryption/l10n/he.php
deleted file mode 100644
index fe514f5b01d..00000000000
--- a/apps/files_encryption/l10n/he.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "שגיאה בלתי ידועה",
-"Encryption" => "הצפנה"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/hr.js b/apps/files_encryption/l10n/hr.js
new file mode 100644
index 00000000000..7160e72ac23
--- /dev/null
+++ b/apps/files_encryption/l10n/hr.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Nepoznata pogreška",
+    "Recovery key successfully enabled" : "Ključ za oporavak uspješno aktiviran",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
+    "Recovery key successfully disabled" : "Ključ za ooravak uspješno deaktiviran",
+    "Password successfully changed." : "Lozinka uspješno promijenjena.",
+    "Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
+    "Private key password successfully updated." : "Lozinka privatnog ključa uspješno ažurirana.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Lozinku privatnog ključa nije moguće promijeniti. Možda stara je stara lozinka bila neispravna.",
+    "File recovery settings updated" : "Ažurirane postavke za oporavak datoteke",
+    "Could not update file recovery" : "Oporavak datoteke nije moguće ažurirati",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Vaš privatni ključ nije ispravan! Vjerojatno je vaša lozinka promijenjena izvan %s(npr. vašega korporativnog direktorija). Lozinku svoga privatnog ključa možete ažuriratiu svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Pogreška nepoznata. Molimo provjerite svoje sistemske postavke ili kontaktirajte svog administratora.",
+    "Missing requirements." : "Nedostaju preduvjeti.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Molimo osigurajte da je instaliran PHP 5.3.3 ili noviji i da je OpenSSL zajedno s PHP ekstenzijom propisno aktivirani konfiguriran. Za sada, aplikacija šifriranja je deaktivirana.",
+    "Following users are not set up for encryption:" : "Sljedeći korisnici nisu određeni za šifriranje:",
+    "Initial encryption started... This can take some time. Please wait." : "Počelo inicijalno šifriranje... To može potrajati neko vrijeme. Molimo, pričekajte.",
+    "Initial encryption running... Please try again later." : "Inicijalno šifriranje u tijeku... Molimo, pokušajte ponovno kasnije.",
+    "Go directly to your %spersonal settings%s." : "Idite izravno na svoje %sosobne postavke%s.",
+    "Encryption" : "Šifriranje",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):",
+    "Recovery key password" : "Lozinka ključa za oporavak",
+    "Repeat Recovery key password" : "Ponovite lozinku ključa za oporavak",
+    "Enabled" : "Aktivirano",
+    "Disabled" : "Onemogućeno",
+    "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
+    "Old Recovery key password" : "Stara lozinka ključa za oporavak",
+    "New Recovery key password" : "Nova lozinka ključa za oporavak",
+    "Repeat New Recovery key password" : "Ponovite novu lozinku ključa za oporavak",
+    "Change Password" : "Promijenite lozinku",
+    "Your private key password no longer matches your log-in password." : "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
+    "Set your old private key password to your current log-in password:" : "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare lozinke, možete zamoliti administratora da oporavi vaše datoteke.",
+    "Old log-in password" : "Stara lozinka za prijavu",
+    "Current log-in password" : "Aktualna lozinka za prijavu",
+    "Update Private Key Password" : "Ažurirajte lozinku privatnog ključa",
+    "Enable password recovery:" : "Omogućite oporavak lozinke:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama"
+},
+"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_encryption/l10n/hr.json b/apps/files_encryption/l10n/hr.json
new file mode 100644
index 00000000000..e375f3f6314
--- /dev/null
+++ b/apps/files_encryption/l10n/hr.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Unknown error" : "Nepoznata pogreška",
+    "Recovery key successfully enabled" : "Ključ za oporavak uspješno aktiviran",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
+    "Recovery key successfully disabled" : "Ključ za ooravak uspješno deaktiviran",
+    "Password successfully changed." : "Lozinka uspješno promijenjena.",
+    "Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
+    "Private key password successfully updated." : "Lozinka privatnog ključa uspješno ažurirana.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Lozinku privatnog ključa nije moguće promijeniti. Možda stara je stara lozinka bila neispravna.",
+    "File recovery settings updated" : "Ažurirane postavke za oporavak datoteke",
+    "Could not update file recovery" : "Oporavak datoteke nije moguće ažurirati",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Vaš privatni ključ nije ispravan! Vjerojatno je vaša lozinka promijenjena izvan %s(npr. vašega korporativnog direktorija). Lozinku svoga privatnog ključa možete ažuriratiu svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Pogreška nepoznata. Molimo provjerite svoje sistemske postavke ili kontaktirajte svog administratora.",
+    "Missing requirements." : "Nedostaju preduvjeti.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Molimo osigurajte da je instaliran PHP 5.3.3 ili noviji i da je OpenSSL zajedno s PHP ekstenzijom propisno aktivirani konfiguriran. Za sada, aplikacija šifriranja je deaktivirana.",
+    "Following users are not set up for encryption:" : "Sljedeći korisnici nisu određeni za šifriranje:",
+    "Initial encryption started... This can take some time. Please wait." : "Počelo inicijalno šifriranje... To može potrajati neko vrijeme. Molimo, pričekajte.",
+    "Initial encryption running... Please try again later." : "Inicijalno šifriranje u tijeku... Molimo, pokušajte ponovno kasnije.",
+    "Go directly to your %spersonal settings%s." : "Idite izravno na svoje %sosobne postavke%s.",
+    "Encryption" : "Šifriranje",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):",
+    "Recovery key password" : "Lozinka ključa za oporavak",
+    "Repeat Recovery key password" : "Ponovite lozinku ključa za oporavak",
+    "Enabled" : "Aktivirano",
+    "Disabled" : "Onemogućeno",
+    "Change recovery key password:" : "Promijenite lozinku ključa za oporavak",
+    "Old Recovery key password" : "Stara lozinka ključa za oporavak",
+    "New Recovery key password" : "Nova lozinka ključa za oporavak",
+    "Repeat New Recovery key password" : "Ponovite novu lozinku ključa za oporavak",
+    "Change Password" : "Promijenite lozinku",
+    "Your private key password no longer matches your log-in password." : "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
+    "Set your old private key password to your current log-in password:" : "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ako se ne sjećate svoje stare lozinke, možete zamoliti administratora da oporavi vaše datoteke.",
+    "Old log-in password" : "Stara lozinka za prijavu",
+    "Current log-in password" : "Aktualna lozinka za prijavu",
+    "Update Private Key Password" : "Ažurirajte lozinku privatnog ključa",
+    "Enable password recovery:" : "Omogućite oporavak lozinke:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama"
+},"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_encryption/l10n/hr.php b/apps/files_encryption/l10n/hr.php
deleted file mode 100644
index 663c7940e46..00000000000
--- a/apps/files_encryption/l10n/hr.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Nepoznata pogreška",
-"Recovery key successfully enabled" => "Ključ za oporavak uspješno aktiviran",
-"Could not disable recovery key. Please check your recovery key password!" => "Ključ za oporavak nije moguće deaktivirati. Molimo provjerite svoju lozinku ključa za oporavak!",
-"Recovery key successfully disabled" => "Ključ za ooravak uspješno deaktiviran",
-"Password successfully changed." => "Lozinka uspješno promijenjena.",
-"Could not change the password. Maybe the old password was not correct." => "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
-"Private key password successfully updated." => "Lozinka privatnog ključa uspješno ažurirana.",
-"Could not update the private key password. Maybe the old password was not correct." => "Lozinku privatnog ključa nije moguće promijeniti. Možda stara je stara lozinka bila neispravna.",
-"File recovery settings updated" => "Ažurirane postavke za oporavak datoteke",
-"Could not update file recovery" => "Oporavak datoteke nije moguće ažurirati",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Vaš privatni ključ nije ispravan! Vjerojatno je vaša lozinka promijenjena izvan %s(npr. vašega korporativnog direktorija). Lozinku svoga privatnog ključa možete ažuriratiu svojim osobnim postavkama da biste obnovili pristup svojim šifriranim datotekama.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Pogreška nepoznata. Molimo provjerite svoje sistemske postavke ili kontaktirajte svog administratora.",
-"Missing requirements." => "Nedostaju preduvjeti.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Molimo osigurajte da je instaliran PHP 5.3.3 ili noviji i da je OpenSSL zajedno s PHP ekstenzijom propisno aktivirani konfiguriran. Za sada, aplikacija šifriranja je deaktivirana.",
-"Following users are not set up for encryption:" => "Sljedeći korisnici nisu određeni za šifriranje:",
-"Initial encryption started... This can take some time. Please wait." => "Počelo inicijalno šifriranje... To može potrajati neko vrijeme. Molimo, pričekajte.",
-"Initial encryption running... Please try again later." => "Inicijalno šifriranje u tijeku... Molimo, pokušajte ponovno kasnije.",
-"Go directly to your %spersonal settings%s." => "Idite izravno na svoje %sosobne postavke%s.",
-"Encryption" => "Šifriranje",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivirajte ključ za oporavak (u slučaju gubitka lozinke dozvolite oporavak korisničkih datoteka):",
-"Recovery key password" => "Lozinka ključa za oporavak",
-"Repeat Recovery key password" => "Ponovite lozinku ključa za oporavak",
-"Enabled" => "Aktivirano",
-"Disabled" => "Onemogućeno",
-"Change recovery key password:" => "Promijenite lozinku ključa za oporavak",
-"Old Recovery key password" => "Stara lozinka ključa za oporavak",
-"New Recovery key password" => "Nova lozinka ključa za oporavak",
-"Repeat New Recovery key password" => "Ponovite novu lozinku ključa za oporavak",
-"Change Password" => "Promijenite lozinku",
-"Your private key password no longer matches your log-in password." => "Lozinka vašeg privatnog ključa više se ne slaže s vašom lozinkom za prijavu.",
-"Set your old private key password to your current log-in password:" => "Postavite svoju staru lozinku privatnog ključa u svoju postojeću lozinku za prijavu.",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Ako se ne sjećate svoje stare lozinke, možete zamoliti administratora da oporavi vaše datoteke.",
-"Old log-in password" => "Stara lozinka za prijavu",
-"Current log-in password" => "Aktualna lozinka za prijavu",
-"Update Private Key Password" => "Ažurirajte lozinku privatnog ključa",
-"Enable password recovery:" => "Omogućite oporavak lozinke:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "U slučaju gubitka lozinke, aktiviranje ove opcije ponovno će vam pribaviti pristup vašim šifriranim datotekama"
-);
-$PLURAL_FORMS = "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_encryption/l10n/hu_HU.js b/apps/files_encryption/l10n/hu_HU.js
new file mode 100644
index 00000000000..349d7cf6e3e
--- /dev/null
+++ b/apps/files_encryption/l10n/hu_HU.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Ismeretlen hiba",
+    "Recovery key successfully enabled" : "A helyreállítási kulcs sikeresen bekapcsolva",
+    "Could not disable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
+    "Recovery key successfully disabled" : "A helyreállítási kulcs sikeresen kikapcsolva",
+    "Password successfully changed." : "A jelszót sikeresen megváltoztattuk.",
+    "Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
+    "Private key password successfully updated." : "A személyes kulcsának jelszava frissítésre került.",
+    "Could not update the private key password. Maybe the old password was not correct." : "A személyes kulcsa jelszavát nem lehetett frissíteni. Lehet, hogy hibás volt a régi jelszó.",
+    "File recovery settings updated" : "A fájlhelyreállítási beállítások frissültek",
+    "Could not update file recovery" : "A fájlhelyreállítás nem frissíthető",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can 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. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.",
+    "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!",
+    "Missing requirements." : "Hiányzó követelmények.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepítve, továbbá az OpenSSL a megfelelő PHP-bővítménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosító modul egyelőre kikapcsolásra került.",
+    "Following users are not set up for encryption:" : "A következő felhasználók nem állították be a titkosítást:",
+    "Initial encryption started... This can take some time. Please wait." : "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.",
+    "Initial encryption running... Please try again later." : "Kezedeti titkosítás fut... Próbálja később.",
+    "Encryption" : "Titkosítás",
+    "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!",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):",
+    "Recovery key password" : "A helyreállítási kulcs jelszava",
+    "Repeat Recovery key password" : "Ismételje meg a helyreállítási kulcs jelszavát",
+    "Enabled" : "Bekapcsolva",
+    "Disabled" : "Kikapcsolva",
+    "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
+    "Old Recovery key password" : "Régi Helyreállítási Kulcs Jelszava",
+    "New Recovery key password" : "Új Helyreállítási kulcs jelszava",
+    "Repeat New Recovery key password" : "Ismételje meg az új helyreállítási kulcs jelszavát",
+    "Change Password" : "Jelszó megváltoztatása",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
+    "Old log-in password" : "Régi bejelentkezési jelszó",
+    "Current log-in password" : "Jelenlegi bejelentkezési jelszó",
+    "Update Private Key Password" : "A személyest kulcs jelszó frissítése",
+    "Enable password recovery:" : "Jelszó-visszaállítás bekapcsolása",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/hu_HU.json b/apps/files_encryption/l10n/hu_HU.json
new file mode 100644
index 00000000000..e94c192180a
--- /dev/null
+++ b/apps/files_encryption/l10n/hu_HU.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Unknown error" : "Ismeretlen hiba",
+    "Recovery key successfully enabled" : "A helyreállítási kulcs sikeresen bekapcsolva",
+    "Could not disable recovery key. Please check your recovery key password!" : "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
+    "Recovery key successfully disabled" : "A helyreállítási kulcs sikeresen kikapcsolva",
+    "Password successfully changed." : "A jelszót sikeresen megváltoztattuk.",
+    "Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
+    "Private key password successfully updated." : "A személyes kulcsának jelszava frissítésre került.",
+    "Could not update the private key password. Maybe the old password was not correct." : "A személyes kulcsa jelszavát nem lehetett frissíteni. Lehet, hogy hibás volt a régi jelszó.",
+    "File recovery settings updated" : "A fájlhelyreállítási beállítások frissültek",
+    "Could not update file recovery" : "A fájlhelyreállítás nem frissíthető",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can 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. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.",
+    "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!",
+    "Missing requirements." : "Hiányzó követelmények.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepítve, továbbá az OpenSSL a megfelelő PHP-bővítménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosító modul egyelőre kikapcsolásra került.",
+    "Following users are not set up for encryption:" : "A következő felhasználók nem állították be a titkosítást:",
+    "Initial encryption started... This can take some time. Please wait." : "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.",
+    "Initial encryption running... Please try again later." : "Kezedeti titkosítás fut... Próbálja később.",
+    "Encryption" : "Titkosítás",
+    "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!",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):",
+    "Recovery key password" : "A helyreállítási kulcs jelszava",
+    "Repeat Recovery key password" : "Ismételje meg a helyreállítási kulcs jelszavát",
+    "Enabled" : "Bekapcsolva",
+    "Disabled" : "Kikapcsolva",
+    "Change recovery key password:" : "A helyreállítási kulcs jelszavának módosítása:",
+    "Old Recovery key password" : "Régi Helyreállítási Kulcs Jelszava",
+    "New Recovery key password" : "Új Helyreállítási kulcs jelszava",
+    "Repeat New Recovery key password" : "Ismételje meg az új helyreállítási kulcs jelszavát",
+    "Change Password" : "Jelszó megváltoztatása",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
+    "Old log-in password" : "Régi bejelentkezési jelszó",
+    "Current log-in password" : "Jelenlegi bejelentkezési jelszó",
+    "Update Private Key Password" : "A személyest kulcs jelszó frissítése",
+    "Enable password recovery:" : "Jelszó-visszaállítás bekapcsolása",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
deleted file mode 100644
index 6c77da95331..00000000000
--- a/apps/files_encryption/l10n/hu_HU.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Ismeretlen hiba",
-"Recovery key successfully enabled" => "A helyreállítási kulcs sikeresen bekapcsolva",
-"Could not disable recovery key. Please check your recovery key password!" => "A helyreállítási kulcsot nem lehetett kikapcsolni. Ellenőrizze a helyreállítási kulcsa jelszavát!",
-"Recovery key successfully disabled" => "A helyreállítási kulcs sikeresen kikapcsolva",
-"Password successfully changed." => "A jelszót sikeresen megváltoztattuk.",
-"Could not change the password. Maybe the old password was not correct." => "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
-"Private key password successfully updated." => "A személyes kulcsának jelszava frissítésre került.",
-"Could not update the private key password. Maybe the old password was not correct." => "A személyes kulcsa jelszavát nem lehetett frissíteni. Lehet, hogy hibás volt a régi jelszó.",
-"File recovery settings updated" => "A fájlhelyreállítási beállítások frissültek",
-"Could not update file recovery" => "A fájlhelyreállítás nem frissíthető",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can 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. Valószínűleg a %s rendszeren kívül változtatta meg a jelszavát (pl. a munkahelyi címtárban). A személyes beállításoknál frissítheti a titkos kulcsát, hogy ismét elérhesse a titkosított állományait.",
-"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!",
-"Missing requirements." => "Hiányzó követelmények.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kérem gondoskodjon arról, hogy PHP 5.3.3 vagy annál frissebb legyen telepítve, továbbá az OpenSSL a megfelelő PHP-bővítménnyel együtt rendelkezésre álljon és helyesen legyen konfigurálva! A titkosító modul egyelőre kikapcsolásra került.",
-"Following users are not set up for encryption:" => "A következő felhasználók nem állították be a titkosítást:",
-"Initial encryption started... This can take some time. Please wait." => "A titkosítási folyamat megkezdődött... Ez hosszabb ideig is eltarthat. Kérem várjon.",
-"Initial encryption running... Please try again later." => "Kezedeti titkosítás fut... Próbálja később.",
-"Encryption" => "Titkosítás",
-"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!",
-"Enable recovery key (allow to recover users files in case of password loss):" => "A helyreállítási kulcs beállítása (lehetővé teszi a felhasználók állományainak visszaállítását, ha elfelejtik a jelszavukat):",
-"Recovery key password" => "A helyreállítási kulcs jelszava",
-"Repeat Recovery key password" => "Ismételje meg a helyreállítási kulcs jelszavát",
-"Enabled" => "Bekapcsolva",
-"Disabled" => "Kikapcsolva",
-"Change recovery key password:" => "A helyreállítási kulcs jelszavának módosítása:",
-"Old Recovery key password" => "Régi Helyreállítási Kulcs Jelszava",
-"New Recovery key password" => "Új Helyreállítási kulcs jelszava",
-"Repeat New Recovery key password" => "Ismételje meg az új helyreállítási kulcs jelszavát",
-"Change Password" => "Jelszó megváltoztatása",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Ha nem emlékszik a régi jelszavára akkor megkérheti a rendszergazdát, hogy állítsa vissza az állományait.",
-"Old log-in password" => "Régi bejelentkezési jelszó",
-"Current log-in password" => "Jelenlegi bejelentkezési jelszó",
-"Update Private Key Password" => "A személyest kulcs jelszó frissítése",
-"Enable password recovery:" => "Jelszó-visszaállítás bekapcsolása",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ez az opció lehetővé teszi, hogy a titkosított állományok tartalmát visszanyerjük abban az esetben, ha elfelejti a jelszavát"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ia.js b/apps/files_encryption/l10n/ia.js
new file mode 100644
index 00000000000..5d480be507c
--- /dev/null
+++ b/apps/files_encryption/l10n/ia.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Error Incognite"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/ia.json b/apps/files_encryption/l10n/ia.json
new file mode 100644
index 00000000000..de701b407d0
--- /dev/null
+++ b/apps/files_encryption/l10n/ia.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Unknown error" : "Error Incognite"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ia.php b/apps/files_encryption/l10n/ia.php
deleted file mode 100644
index 513184ba1cd..00000000000
--- a/apps/files_encryption/l10n/ia.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Error Incognite"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/id.js b/apps/files_encryption/l10n/id.js
new file mode 100644
index 00000000000..fcb3ffb9d30
--- /dev/null
+++ b/apps/files_encryption/l10n/id.js
@@ -0,0 +1,37 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Galat tidak diketahui",
+    "Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
+    "Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
+    "Recovery key successfully disabled" : "Kunci pemulihan berhasil dinonaktifkan",
+    "Password successfully changed." : "Sandi berhasil diubah",
+    "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
+    "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
+    "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
+    "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
+    "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.",
+    "Missing requirements." : "Persyaratan yang hilang.",
+    "Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:",
+    "Initial encryption started... This can take some time. Please wait." : "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+    "Encryption" : "Enkripsi",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
+    "Recovery key password" : "Sandi kunci pemulihan",
+    "Repeat Recovery key password" : "Ulangi sandi kunci Pemulihan",
+    "Enabled" : "Diaktifkan",
+    "Disabled" : "Dinonaktifkan",
+    "Change recovery key password:" : "Ubah sandi kunci pemulihan:",
+    "Old Recovery key password" : "Sandi kunci Pemulihan Lama",
+    "New Recovery key password" : "Sandi kunci Pemulihan Baru",
+    "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
+    "Change Password" : "Ubah sandi",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
+    "Old log-in password" : "Sandi masuk yang lama",
+    "Current log-in password" : "Sandi masuk saat ini",
+    "Update Private Key Password" : "Perbarui Sandi Kunci Privat",
+    "Enable password recovery:" : "Aktifkan sandi pemulihan:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/id.json b/apps/files_encryption/l10n/id.json
new file mode 100644
index 00000000000..c0e5b434964
--- /dev/null
+++ b/apps/files_encryption/l10n/id.json
@@ -0,0 +1,35 @@
+{ "translations": {
+    "Unknown error" : "Galat tidak diketahui",
+    "Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
+    "Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
+    "Recovery key successfully disabled" : "Kunci pemulihan berhasil dinonaktifkan",
+    "Password successfully changed." : "Sandi berhasil diubah",
+    "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
+    "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
+    "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
+    "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
+    "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.",
+    "Missing requirements." : "Persyaratan yang hilang.",
+    "Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:",
+    "Initial encryption started... This can take some time. Please wait." : "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+    "Encryption" : "Enkripsi",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
+    "Recovery key password" : "Sandi kunci pemulihan",
+    "Repeat Recovery key password" : "Ulangi sandi kunci Pemulihan",
+    "Enabled" : "Diaktifkan",
+    "Disabled" : "Dinonaktifkan",
+    "Change recovery key password:" : "Ubah sandi kunci pemulihan:",
+    "Old Recovery key password" : "Sandi kunci Pemulihan Lama",
+    "New Recovery key password" : "Sandi kunci Pemulihan Baru",
+    "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
+    "Change Password" : "Ubah sandi",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
+    "Old log-in password" : "Sandi masuk yang lama",
+    "Current log-in password" : "Sandi masuk saat ini",
+    "Update Private Key Password" : "Perbarui Sandi Kunci Privat",
+    "Enable password recovery:" : "Aktifkan sandi pemulihan:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/id.php b/apps/files_encryption/l10n/id.php
deleted file mode 100644
index c1d171d1fc0..00000000000
--- a/apps/files_encryption/l10n/id.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Kesalahan tidak diketahui",
-"Missing recovery key password" => "Sandi kunci pemuliahan hilang",
-"Please repeat the recovery key password" => "Silakan ulangi sandi kunci pemulihan",
-"Repeated recovery key password does not match the provided recovery key password" => "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
-"Recovery key successfully enabled" => "Kunci pemulihan berhasil diaktifkan",
-"Could not disable recovery key. Please check your recovery key password!" => "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
-"Recovery key successfully disabled" => "Kunci pemulihan berhasil dinonaktifkan",
-"Please provide the old recovery password" => "Mohon berikan sandi pemulihan lama",
-"Please provide a new recovery password" => "Mohon berikan sandi pemulihan baru",
-"Please repeat the new recovery password" => "Silakan ulangi sandi pemulihan baru",
-"Password successfully changed." => "Sandi berhasil diubah",
-"Could not change the password. Maybe the old password was not correct." => "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
-"Private key password successfully updated." => "Sandi kunci privat berhasil diperbarui.",
-"Could not update the private key password. Maybe the old password was not correct." => "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
-"File recovery settings updated" => "Pengaturan pemulihan berkas diperbarui",
-"Could not update file recovery" => "Tidak dapat memperbarui pemulihan berkas",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator",
-"Missing requirements." => "Persyaratan tidak terpenuhi.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Pastikan bahwa PHP 5.3.3 atau yang lebih baru telah diinstal dan OpenSSL bersama ekstensi PHP telah diaktifkan dan dikonfigurasi dengan benar. Untuk saat ini, aplikasi enkripsi akan dinonaktifkan.",
-"Following users are not set up for encryption:" => "Pengguna berikut belum diatur untuk enkripsi:",
-"Initial encryption started... This can take some time. Please wait." => "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
-"Initial encryption running... Please try again later." => "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
-"Go directly to your %spersonal settings%s." => "Langsung ke %spengaturan pribadi%s Anda.",
-"Encryption" => "Enkripsi",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
-"Recovery key password" => "Sandi kunci pemulihan",
-"Repeat Recovery key password" => "Ulangi sandi kunci Pemulihan",
-"Enabled" => "Diaktifkan",
-"Disabled" => "Dinonaktifkan",
-"Change recovery key password:" => "Ubah sandi kunci pemulihan:",
-"Old Recovery key password" => "Sandi kunci Pemulihan Lama",
-"New Recovery key password" => "Sandi kunci Pemulihan Baru",
-"Repeat New Recovery key password" => "Ulangi sandi kunci Pemulihan baru",
-"Change Password" => "Ubah sandi",
-"Your private key password no longer matches your log-in password." => "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
-"Set your old private key password to your current log-in password:" => "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
-"Old log-in password" => "Sandi masuk yang lama",
-"Current log-in password" => "Sandi masuk saat ini",
-"Update Private Key Password" => "Perbarui Sandi Kunci Privat",
-"Enable password recovery:" => "Aktifkan sandi pemulihan:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Mengaktifkan opsi ini memungkinkan Anda untuk mendapatkan kembali akses ke berkas terenkripsi Anda dalam kasus kehilangan sandi"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/is.js b/apps/files_encryption/l10n/is.js
new file mode 100644
index 00000000000..8dfc249683e
--- /dev/null
+++ b/apps/files_encryption/l10n/is.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Encryption" : "Dulkóðun"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/is.json b/apps/files_encryption/l10n/is.json
new file mode 100644
index 00000000000..b4d4708f404
--- /dev/null
+++ b/apps/files_encryption/l10n/is.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Encryption" : "Dulkóðun"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/is.php b/apps/files_encryption/l10n/is.php
deleted file mode 100644
index 7b7a403b460..00000000000
--- a/apps/files_encryption/l10n/is.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Encryption" => "Dulkóðun"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/it.js b/apps/files_encryption/l10n/it.js
new file mode 100644
index 00000000000..e71abc94675
--- /dev/null
+++ b/apps/files_encryption/l10n/it.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Errore sconosciuto",
+    "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",
+    "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 recupero disabilitata correttamente",
+    "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",
+    "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.",
+    "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
+    "File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate",
+    "Could not update file recovery" : "Impossibile aggiornare il ripristino dei file",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "La tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore",
+    "Missing requirements." : "Requisiti mancanti.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
+    "Following users are not set up for encryption:" : "I seguenti utenti non sono configurati per la cifratura:",
+    "Initial encryption started... This can take some time. Please wait." : "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.",
+    "Initial encryption running... Please try again later." : "Cifratura iniziale in esecuzione... Riprova più tardi.",
+    "Go directly to your %spersonal settings%s." : "Vai direttamente alle tue %simpostazioni personali%s.",
+    "Encryption" : "Cifratura",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
+    "Recovery key password" : "Password della chiave di recupero",
+    "Repeat Recovery key password" : "Ripeti la password della chiave di recupero",
+    "Enabled" : "Abilitata",
+    "Disabled" : "Disabilitata",
+    "Change recovery key password:" : "Cambia la password della chiave di recupero:",
+    "Old Recovery key password" : "Vecchia password della chiave di recupero",
+    "New Recovery key password" : "Nuova password della chiave di recupero",
+    "Repeat New Recovery key password" : "Ripeti la nuova password della chiave di recupero",
+    "Change Password" : "Modifica password",
+    "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.",
+    "Old log-in password" : "Vecchia password di accesso",
+    "Current log-in password" : "Password di accesso attuale",
+    "Update Private Key Password" : "Aggiorna la password della chiave privata",
+    "Enable password recovery:" : "Abilita il ripristino della password:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/it.json b/apps/files_encryption/l10n/it.json
new file mode 100644
index 00000000000..d051a2cfc98
--- /dev/null
+++ b/apps/files_encryption/l10n/it.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Errore sconosciuto",
+    "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",
+    "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 recupero disabilitata correttamente",
+    "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",
+    "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.",
+    "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
+    "File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate",
+    "Could not update file recovery" : "Impossibile aggiornare il ripristino dei file",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "La tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore",
+    "Missing requirements." : "Requisiti mancanti.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
+    "Following users are not set up for encryption:" : "I seguenti utenti non sono configurati per la cifratura:",
+    "Initial encryption started... This can take some time. Please wait." : "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.",
+    "Initial encryption running... Please try again later." : "Cifratura iniziale in esecuzione... Riprova più tardi.",
+    "Go directly to your %spersonal settings%s." : "Vai direttamente alle tue %simpostazioni personali%s.",
+    "Encryption" : "Cifratura",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
+    "Recovery key password" : "Password della chiave di recupero",
+    "Repeat Recovery key password" : "Ripeti la password della chiave di recupero",
+    "Enabled" : "Abilitata",
+    "Disabled" : "Disabilitata",
+    "Change recovery key password:" : "Cambia la password della chiave di recupero:",
+    "Old Recovery key password" : "Vecchia password della chiave di recupero",
+    "New Recovery key password" : "Nuova password della chiave di recupero",
+    "Repeat New Recovery key password" : "Ripeti la nuova password della chiave di recupero",
+    "Change Password" : "Modifica password",
+    "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.",
+    "Old log-in password" : "Vecchia password di accesso",
+    "Current log-in password" : "Password di accesso attuale",
+    "Update Private Key Password" : "Aggiorna la password della chiave privata",
+    "Enable password recovery:" : "Abilita il ripristino della password:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/it.php b/apps/files_encryption/l10n/it.php
deleted file mode 100644
index 24fd9e99dd0..00000000000
--- a/apps/files_encryption/l10n/it.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Errore sconosciuto",
-"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",
-"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 recupero disabilitata correttamente",
-"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",
-"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.",
-"Private key password successfully updated." => "Password della chiave privata aggiornata correttamente.",
-"Could not update the private key password. Maybe the old password was not correct." => "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
-"File recovery settings updated" => "Impostazioni di ripristino dei file aggiornate",
-"Could not update file recovery" => "Impossibile aggiornare il ripristino dei file",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "La tua chiave privata non è valida! Forse la password è stata cambiata al di fuori di %s (ad es. la directory aziendale). Puoi aggiornare la password della chiave privata nelle impostazioni personali per ottenere nuovamente l'accesso ai file cifrati.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Errore sconosciuto. Controlla le impostazioni di sistema o contatta il tuo amministratore",
-"Missing requirements." => "Requisiti mancanti.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Assicurati che sia installato PHP 5.3.3 o versioni successive e che l'estensione OpenSSL di PHP sia abilitata e configurata correttamente. Per ora, l'applicazione di cifratura è disabilitata.",
-"Following users are not set up for encryption:" => "I seguenti utenti non sono configurati per la cifratura:",
-"Initial encryption started... This can take some time. Please wait." => "Cifratura iniziale avviata... Potrebbe richiedere del tempo. Attendi.",
-"Initial encryption running... Please try again later." => "Cifratura iniziale in esecuzione... Riprova più tardi.",
-"Go directly to your %spersonal settings%s." => "Vai direttamente alle tue %simpostazioni personali%s.",
-"Encryption" => "Cifratura",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Abilita la chiave di recupero (permette di recuperare i file utenti in caso di perdita della password):",
-"Recovery key password" => "Password della chiave di recupero",
-"Repeat Recovery key password" => "Ripeti la password della chiave di recupero",
-"Enabled" => "Abilitata",
-"Disabled" => "Disabilitata",
-"Change recovery key password:" => "Cambia la password della chiave di recupero:",
-"Old Recovery key password" => "Vecchia password della chiave di recupero",
-"New Recovery key password" => "Nuova password della chiave di recupero",
-"Repeat New Recovery key password" => "Ripeti la nuova password della chiave di recupero",
-"Change Password" => "Modifica password",
-"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.",
-"Old log-in password" => "Vecchia password di accesso",
-"Current log-in password" => "Password di accesso attuale",
-"Update Private Key Password" => "Aggiorna la password della chiave privata",
-"Enable password recovery:" => "Abilita il ripristino della password:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "L'abilitazione di questa opzione ti consentirà di accedere nuovamente ai file cifrati in caso di perdita della password"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ja.js b/apps/files_encryption/l10n/ja.js
new file mode 100644
index 00000000000..e4ca38f822b
--- /dev/null
+++ b/apps/files_encryption/l10n/ja.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "不明なエラー",
+    "Missing recovery key password" : "復旧キーのパスワードがありません",
+    "Please repeat the recovery key password" : "復旧キーのパスワードをもう一度入力",
+    "Repeated recovery key password does not match the provided recovery key password" : "入力された復旧キーのパスワードが一致しません。",
+    "Recovery key successfully enabled" : "リカバリ用のキーを正常に有効にしました",
+    "Could not disable recovery key. Please check your recovery key password!" : "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
+    "Recovery key successfully disabled" : "リカバリ用のキーを正常に無効化しました",
+    "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." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+    "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
+    "Could not update the private key password. Maybe the old password was not correct." : "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
+    "File recovery settings updated" : "ファイルリカバリ設定を更新しました",
+    "Could not update file recovery" : "ファイルリカバリを更新できませんでした",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "プライベートキーが有効ではありません！パスワードが%sの外部で変更された(例: 共同ディレクトリ)と思われます。個人設定でプライベートキーのパスワードを更新して、暗号化ファイルへのアクセスを回復することができます。",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+    "Unknown error. Please check your system settings or contact your administrator" : "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。",
+    "Missing requirements." : "必要要件が満たされていません。",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
+    "Following users are not set up for encryption:" : "以下のユーザーは、暗号化設定がされていません：",
+    "Initial encryption started... This can take some time. Please wait." : "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。お待ちください。",
+    "Initial encryption running... Please try again later." : "初期暗号化実行中... 後でもう一度お試しください。",
+    "Go directly to your %spersonal settings%s." : "直接 %s個人設定%s に進む。",
+    "Encryption" : "暗号化",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
+    "Recovery key password" : "リカバリキーのパスワード",
+    "Repeat Recovery key password" : "リカバリキーのパスワードをもう一度入力",
+    "Enabled" : "有効",
+    "Disabled" : "無効",
+    "Change recovery key password:" : "リカバリキーのパスワードを変更:",
+    "Old Recovery key password" : "古いリカバリキーのパスワード",
+    "New Recovery key password" : "新しいリカバリキーのパスワード",
+    "Repeat New Recovery key password" : "新しいリカバリキーのパスワードをもう一度入力",
+    "Change Password" : "パスワードを変更",
+    "Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
+    "Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
+    " 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" : "現在のログインパスワード",
+    "Update Private Key Password" : "秘密鍵のパスワードを更新",
+    "Enable password recovery:" : "パスワードリカバリを有効に:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/ja.json b/apps/files_encryption/l10n/ja.json
new file mode 100644
index 00000000000..471bf314442
--- /dev/null
+++ b/apps/files_encryption/l10n/ja.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "不明なエラー",
+    "Missing recovery key password" : "復旧キーのパスワードがありません",
+    "Please repeat the recovery key password" : "復旧キーのパスワードをもう一度入力",
+    "Repeated recovery key password does not match the provided recovery key password" : "入力された復旧キーのパスワードが一致しません。",
+    "Recovery key successfully enabled" : "リカバリ用のキーを正常に有効にしました",
+    "Could not disable recovery key. Please check your recovery key password!" : "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
+    "Recovery key successfully disabled" : "リカバリ用のキーを正常に無効化しました",
+    "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." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+    "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
+    "Could not update the private key password. Maybe the old password was not correct." : "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
+    "File recovery settings updated" : "ファイルリカバリ設定を更新しました",
+    "Could not update file recovery" : "ファイルリカバリを更新できませんでした",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "プライベートキーが有効ではありません！パスワードが%sの外部で変更された(例: 共同ディレクトリ)と思われます。個人設定でプライベートキーのパスワードを更新して、暗号化ファイルへのアクセスを回復することができます。",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
+    "Unknown error. Please check your system settings or contact your administrator" : "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。",
+    "Missing requirements." : "必要要件が満たされていません。",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
+    "Following users are not set up for encryption:" : "以下のユーザーは、暗号化設定がされていません：",
+    "Initial encryption started... This can take some time. Please wait." : "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。お待ちください。",
+    "Initial encryption running... Please try again later." : "初期暗号化実行中... 後でもう一度お試しください。",
+    "Go directly to your %spersonal settings%s." : "直接 %s個人設定%s に進む。",
+    "Encryption" : "暗号化",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
+    "Recovery key password" : "リカバリキーのパスワード",
+    "Repeat Recovery key password" : "リカバリキーのパスワードをもう一度入力",
+    "Enabled" : "有効",
+    "Disabled" : "無効",
+    "Change recovery key password:" : "リカバリキーのパスワードを変更:",
+    "Old Recovery key password" : "古いリカバリキーのパスワード",
+    "New Recovery key password" : "新しいリカバリキーのパスワード",
+    "Repeat New Recovery key password" : "新しいリカバリキーのパスワードをもう一度入力",
+    "Change Password" : "パスワードを変更",
+    "Your private key password no longer matches your log-in password." : "もはや秘密鍵はログインパスワードと一致しません。",
+    "Set your old private key password to your current log-in password:" : "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
+    " 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" : "現在のログインパスワード",
+    "Update Private Key Password" : "秘密鍵のパスワードを更新",
+    "Enable password recovery:" : "パスワードリカバリを有効に:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ja.php b/apps/files_encryption/l10n/ja.php
deleted file mode 100644
index 9e4517d63cd..00000000000
--- a/apps/files_encryption/l10n/ja.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "不明なエラー",
-"Missing recovery key password" => "復旧キーのパスワードがありません",
-"Please repeat the recovery key password" => "復旧キーのパスワードをもう一度入力",
-"Repeated recovery key password does not match the provided recovery key password" => "入力された復旧キーのパスワードが一致しません。",
-"Recovery key successfully enabled" => "リカバリ用のキーを正常に有効にしました",
-"Could not disable recovery key. Please check your recovery key password!" => "リカバリ用のキーを無効化できませんでした。リカバリ用のキーのパスワードを確認してください！",
-"Recovery key successfully disabled" => "リカバリ用のキーを正常に無効化しました",
-"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." => "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
-"Private key password successfully updated." => "秘密鍵のパスワードが正常に更新されました。",
-"Could not update the private key password. Maybe the old password was not correct." => "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
-"File recovery settings updated" => "ファイルリカバリ設定を更新しました",
-"Could not update file recovery" => "ファイルリカバリを更新できませんでした",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "プライベートキーが有効ではありません！パスワードが%sの外部で変更された(例: 共同ディレクトリ)と思われます。個人設定でプライベートキーのパスワードを更新して、暗号化ファイルへのアクセスを回復することができます。",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "このファイルを復号化できません、共有ファイルの可能性があります。ファイルの所有者にお願いして、ファイルを共有しなおしてもらってください。",
-"Unknown error. Please check your system settings or contact your administrator" => "不明なエラーです。システム設定を確認するか、管理者に問い合わせてください。",
-"Missing requirements." => "必要要件が満たされていません。",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "必ず、PHP 5.3.3もしくはそれ以上をインストールし、同時にOpenSSLのPHP拡張を有効にした上でOpenSSLも同様にインストール、適切に設定してください。現時点では暗号化アプリは無効になっています。",
-"Following users are not set up for encryption:" => "以下のユーザーは、暗号化設定がされていません：",
-"Initial encryption started... This can take some time. Please wait." => "暗号化の初期化作業を開始しました... この処理にはしばらく時間がかかります。お待ちください。",
-"Initial encryption running... Please try again later." => "初期暗号化実行中... 後でもう一度お試しください。",
-"Go directly to your %spersonal settings%s." => "直接 %s個人設定%s に進む。",
-"Encryption" => "暗号化",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "暗号化アプリは有効ですが、あなたの暗号化キーは初期化されていません。ログアウトした後に、再度ログインしてください",
-"Enable recovery key (allow to recover users files in case of password loss):" => "リカバリキーを有効にする (パスワードを忘れた場合にユーザーのファイルを回復できます):",
-"Recovery key password" => "リカバリキーのパスワード",
-"Repeat Recovery key password" => "リカバリキーのパスワードをもう一度入力",
-"Enabled" => "有効",
-"Disabled" => "無効",
-"Change recovery key password:" => "リカバリキーのパスワードを変更:",
-"Old Recovery key password" => "古いリカバリキーのパスワード",
-"New Recovery key password" => "新しいリカバリキーのパスワード",
-"Repeat New Recovery key password" => "新しいリカバリキーのパスワードをもう一度入力",
-"Change Password" => "パスワードを変更",
-"Your private key password no longer matches your log-in password." => "もはや秘密鍵はログインパスワードと一致しません。",
-"Set your old private key password to your current log-in password:" => "古い秘密鍵のパスワードを現在のログインパスワードに設定:",
-" 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" => "現在のログインパスワード",
-"Update Private Key Password" => "秘密鍵のパスワードを更新",
-"Enable password recovery:" => "パスワードリカバリを有効に:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "このオプションを有効にすると、パスワードを紛失した場合も、暗号化されたファイルに再度アクセスすることができるようになります。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ka_GE.js b/apps/files_encryption/l10n/ka_GE.js
new file mode 100644
index 00000000000..cf8468d2191
--- /dev/null
+++ b/apps/files_encryption/l10n/ka_GE.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "უცნობი შეცდომა",
+    "Encryption" : "ენკრიპცია"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/ka_GE.json b/apps/files_encryption/l10n/ka_GE.json
new file mode 100644
index 00000000000..90cbc551f46
--- /dev/null
+++ b/apps/files_encryption/l10n/ka_GE.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Unknown error" : "უცნობი შეცდომა",
+    "Encryption" : "ენკრიპცია"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ka_GE.php b/apps/files_encryption/l10n/ka_GE.php
deleted file mode 100644
index f426e9b5ce7..00000000000
--- a/apps/files_encryption/l10n/ka_GE.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "უცნობი შეცდომა",
-"Encryption" => "ენკრიპცია"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/km.js b/apps/files_encryption/l10n/km.js
new file mode 100644
index 00000000000..0fb88f52ef7
--- /dev/null
+++ b/apps/files_encryption/l10n/km.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "មិន​ស្គាល់​កំហុស",
+    "Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
+    "Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
+    "Encryption" : "កូដនីយកម្ម",
+    "Enabled" : "បាន​បើក",
+    "Disabled" : "បាន​បិទ",
+    "Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/km.json b/apps/files_encryption/l10n/km.json
new file mode 100644
index 00000000000..7a68cc58584
--- /dev/null
+++ b/apps/files_encryption/l10n/km.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Unknown error" : "មិន​ស្គាល់​កំហុស",
+    "Password successfully changed." : "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
+    "Could not change the password. Maybe the old password was not correct." : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
+    "Encryption" : "កូដនីយកម្ម",
+    "Enabled" : "បាន​បើក",
+    "Disabled" : "បាន​បិទ",
+    "Change Password" : "ប្ដូរ​ពាក្យ​សម្ងាត់"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/km.php b/apps/files_encryption/l10n/km.php
deleted file mode 100644
index 9c700dfec15..00000000000
--- a/apps/files_encryption/l10n/km.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "មិន​ស្គាល់​កំហុស",
-"Password successfully changed." => "បាន​ប្ដូរ​ពាក្យ​សម្ងាត់​ដោយ​ជោគជ័យ។",
-"Could not change the password. Maybe the old password was not correct." => "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​បាន​ទេ។ ប្រហែល​ពាក្យ​សម្ងាត់​ចាស់​មិន​ត្រឹម​ត្រូវ។",
-"Encryption" => "កូដនីយកម្ម",
-"Enabled" => "បាន​បើក",
-"Disabled" => "បាន​បិទ",
-"Change Password" => "ប្ដូរ​ពាក្យ​សម្ងាត់"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ko.js b/apps/files_encryption/l10n/ko.js
new file mode 100644
index 00000000000..a994dc7d339
--- /dev/null
+++ b/apps/files_encryption/l10n/ko.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "알 수 없는 오류",
+    "Recovery key successfully enabled" : "복구 키가 성공적으로 활성화되었습니다",
+    "Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해주세요!",
+    "Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화 되었습니다",
+    "Password successfully changed." : "암호가 성공적으로 변경되었습니다",
+    "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
+    "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 됨.",
+    "Could not update the private key password. Maybe the old password was not correct." : "개인 키 암호를 업데이트할 수 없습니다. 이전 암호가 올바르지 않은 것 같습니다.",
+    "File recovery settings updated" : "파일 복구 설정 업데이트됨",
+    "Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "개인 키가 올바르지 않습니다! 암호가 %s(예: 회사 디렉터리) 외부에서 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
+    "Missing requirements." : "요구 사항이 부족합니다.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "PHP 5.3.3 이상 설치 여부, PHP의 OpenSSL 확장 기능 활성화 및 설정 여부를 확인하십시오. 암호화 앱이 비활성화 되었습니다.",
+    "Following users are not set up for encryption:" : "다음 사용자는 암호화를 사용할 수 없습니다:",
+    "Initial encryption started... This can take some time. Please wait." : "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.",
+    "Encryption" : "암호화",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
+    "Recovery key password" : "복구 키 암호",
+    "Repeat Recovery key password" : "복구 키 암호 재입력",
+    "Enabled" : "활성화",
+    "Disabled" : "비활성화",
+    "Change recovery key password:" : "복구 키 암호 변경:",
+    "Old Recovery key password" : "이전 복구 키 암호",
+    "New Recovery key password" : "새 복구 키 암호",
+    "Repeat New Recovery key password" : "새 복구 키 암호 재입력",
+    "Change Password" : "암호 변경",
+    " 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" : "현재 로그인 암호",
+    "Update Private Key Password" : "개인 키 암호 업데이트",
+    "Enable password recovery:" : "암호 복구 사용:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/ko.json b/apps/files_encryption/l10n/ko.json
new file mode 100644
index 00000000000..3cc8ec06b06
--- /dev/null
+++ b/apps/files_encryption/l10n/ko.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Unknown error" : "알 수 없는 오류",
+    "Recovery key successfully enabled" : "복구 키가 성공적으로 활성화되었습니다",
+    "Could not disable recovery key. Please check your recovery key password!" : "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해주세요!",
+    "Recovery key successfully disabled" : "복구 키가 성공적으로 비활성화 되었습니다",
+    "Password successfully changed." : "암호가 성공적으로 변경되었습니다",
+    "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
+    "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 됨.",
+    "Could not update the private key password. Maybe the old password was not correct." : "개인 키 암호를 업데이트할 수 없습니다. 이전 암호가 올바르지 않은 것 같습니다.",
+    "File recovery settings updated" : "파일 복구 설정 업데이트됨",
+    "Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "개인 키가 올바르지 않습니다! 암호가 %s(예: 회사 디렉터리) 외부에서 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
+    "Missing requirements." : "요구 사항이 부족합니다.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "PHP 5.3.3 이상 설치 여부, PHP의 OpenSSL 확장 기능 활성화 및 설정 여부를 확인하십시오. 암호화 앱이 비활성화 되었습니다.",
+    "Following users are not set up for encryption:" : "다음 사용자는 암호화를 사용할 수 없습니다:",
+    "Initial encryption started... This can take some time. Please wait." : "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.",
+    "Encryption" : "암호화",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
+    "Recovery key password" : "복구 키 암호",
+    "Repeat Recovery key password" : "복구 키 암호 재입력",
+    "Enabled" : "활성화",
+    "Disabled" : "비활성화",
+    "Change recovery key password:" : "복구 키 암호 변경:",
+    "Old Recovery key password" : "이전 복구 키 암호",
+    "New Recovery key password" : "새 복구 키 암호",
+    "Repeat New Recovery key password" : "새 복구 키 암호 재입력",
+    "Change Password" : "암호 변경",
+    " 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" : "현재 로그인 암호",
+    "Update Private Key Password" : "개인 키 암호 업데이트",
+    "Enable password recovery:" : "암호 복구 사용:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ko.php b/apps/files_encryption/l10n/ko.php
deleted file mode 100644
index d90a98448f9..00000000000
--- a/apps/files_encryption/l10n/ko.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "알 수 없는 오류",
-"Recovery key successfully enabled" => "복구 키가 성공적으로 활성화되었습니다",
-"Could not disable recovery key. Please check your recovery key password!" => "복구 키를 비활성화 할 수 없습니다. 복구 키의 암호를 확인해주세요!",
-"Recovery key successfully disabled" => "복구 키가 성공적으로 비활성화 되었습니다",
-"Password successfully changed." => "암호가 성공적으로 변경되었습니다",
-"Could not change the password. Maybe the old password was not correct." => "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
-"Private key password successfully updated." => "개인 키 암호가 성공적으로 업데이트 됨.",
-"Could not update the private key password. Maybe the old password was not correct." => "개인 키 암호를 업데이트할 수 없습니다. 이전 암호가 올바르지 않은 것 같습니다.",
-"File recovery settings updated" => "파일 복구 설정 업데이트됨",
-"Could not update file recovery" => "파일 복구를 업데이트할 수 없습니다",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "개인 키가 올바르지 않습니다! 암호가 %s(예: 회사 디렉터리) 외부에서 변경된 것 같습니다. 암호화된 파일에 다시 접근하려면 개인 설정에서 개인 키 암호를 수정하십시오.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "이 파일을 복호화할 수 없습니다. 공유된 파일일 수도 있습니다. 파일 소유자에게 공유를 다시 요청하십시오.",
-"Missing requirements." => "요구 사항이 부족합니다.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "PHP 5.3.3 이상 설치 여부, PHP의 OpenSSL 확장 기능 활성화 및 설정 여부를 확인하십시오. 암호화 앱이 비활성화 되었습니다.",
-"Following users are not set up for encryption:" => "다음 사용자는 암호화를 사용할 수 없습니다:",
-"Initial encryption started... This can take some time. Please wait." => "초기 암호화가 시작되었습니다... 시간이 걸릴 수도 있으니 기다려 주십시오.",
-"Encryption" => "암호화",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "암호화 앱이 활성화되어 있지만 키가 초기화되지 않았습니다. 로그아웃한 후 다시 로그인하십시오",
-"Enable recovery key (allow to recover users files in case of password loss):" => "복구 키 사용 (암호를 잊었을 때 파일을 복구할 수 있도록 함):",
-"Recovery key password" => "복구 키 암호",
-"Repeat Recovery key password" => "복구 키 암호 재입력",
-"Enabled" => "활성화",
-"Disabled" => "비활성화",
-"Change recovery key password:" => "복구 키 암호 변경:",
-"Old Recovery key password" => "이전 복구 키 암호",
-"New Recovery key password" => "새 복구 키 암호",
-"Repeat New Recovery key password" => "새 복구 키 암호 재입력",
-"Change Password" => "암호 변경",
-" 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" => "현재 로그인 암호",
-"Update Private Key Password" => "개인 키 암호 업데이트",
-"Enable password recovery:" => "암호 복구 사용:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "이 옵션을 사용하면 암호를 잊었을 때 암호화된 파일에 다시 접근할 수 있습니다"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/ku_IQ.js b/apps/files_encryption/l10n/ku_IQ.js
new file mode 100644
index 00000000000..5a036cc5252
--- /dev/null
+++ b/apps/files_encryption/l10n/ku_IQ.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Encryption" : "نهێنیکردن"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/ku_IQ.json b/apps/files_encryption/l10n/ku_IQ.json
new file mode 100644
index 00000000000..ab30a5a485b
--- /dev/null
+++ b/apps/files_encryption/l10n/ku_IQ.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Encryption" : "نهێنیکردن"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ku_IQ.php b/apps/files_encryption/l10n/ku_IQ.php
deleted file mode 100644
index d7b10d1df62..00000000000
--- a/apps/files_encryption/l10n/ku_IQ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Encryption" => "نهێنیکردن"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lb.js b/apps/files_encryption/l10n/lb.js
new file mode 100644
index 00000000000..d5e206fddb0
--- /dev/null
+++ b/apps/files_encryption/l10n/lb.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Et ass en onbekannte Fehler opgetrueden"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/lb.json b/apps/files_encryption/l10n/lb.json
new file mode 100644
index 00000000000..8cfee6638f4
--- /dev/null
+++ b/apps/files_encryption/l10n/lb.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Unknown error" : "Et ass en onbekannte Fehler opgetrueden"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/lb.php b/apps/files_encryption/l10n/lb.php
deleted file mode 100644
index d9287f6dec9..00000000000
--- a/apps/files_encryption/l10n/lb.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Et ass en onbekannte Fehler opgetrueden"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/lt_LT.js b/apps/files_encryption/l10n/lt_LT.js
new file mode 100644
index 00000000000..eebfcedaf0b
--- /dev/null
+++ b/apps/files_encryption/l10n/lt_LT.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Neatpažinta klaida",
+    "Recovery key successfully enabled" : "Atkūrimo raktas sėkmingai įjungtas",
+    "Could not disable recovery key. Please check your recovery key password!" : "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+    "Recovery key successfully disabled" : "Atkūrimo raktas sėkmingai išjungtas",
+    "Password successfully changed." : "Slaptažodis sėkmingai pakeistas",
+    "Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
+    "Private key password successfully updated." : "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
+    "File recovery settings updated" : "Failų atkūrimo nustatymai pakeisti",
+    "Could not update file recovery" : "Neišėjo atnaujinti failų atkūrimo",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
+    "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ą.",
+    "Missing requirements." : "Trūkstami laukai.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.",
+    "Following users are not set up for encryption:" : "Sekantys naudotojai nenustatyti šifravimui:",
+    "Initial encryption started... This can take some time. Please wait." : "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.",
+    "Encryption" : "Šifravimas",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
+    "Recovery key password" : "Atkūrimo rakto slaptažodis",
+    "Repeat Recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
+    "Enabled" : "Įjungta",
+    "Disabled" : "Išjungta",
+    "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
+    "Old Recovery key password" : "Senas atkūrimo rakto slaptažodis",
+    "New Recovery key password" : "Naujas atkūrimo rakto slaptažodis",
+    "Repeat New Recovery key password" : "Pakartokite naują atkūrimo rakto slaptažodį",
+    "Change Password" : "Pakeisti slaptažodį",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
+    "Old log-in password" : "Senas prisijungimo slaptažodis",
+    "Current log-in password" : "Dabartinis prisijungimo slaptažodis",
+    "Update Private Key Password" : "Atnaujinti privataus rakto slaptažodį",
+    "Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
+},
+"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_encryption/l10n/lt_LT.json b/apps/files_encryption/l10n/lt_LT.json
new file mode 100644
index 00000000000..c642bfd7528
--- /dev/null
+++ b/apps/files_encryption/l10n/lt_LT.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Unknown error" : "Neatpažinta klaida",
+    "Recovery key successfully enabled" : "Atkūrimo raktas sėkmingai įjungtas",
+    "Could not disable recovery key. Please check your recovery key password!" : "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
+    "Recovery key successfully disabled" : "Atkūrimo raktas sėkmingai išjungtas",
+    "Password successfully changed." : "Slaptažodis sėkmingai pakeistas",
+    "Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
+    "Private key password successfully updated." : "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
+    "File recovery settings updated" : "Failų atkūrimo nustatymai pakeisti",
+    "Could not update file recovery" : "Neišėjo atnaujinti failų atkūrimo",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
+    "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ą.",
+    "Missing requirements." : "Trūkstami laukai.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.",
+    "Following users are not set up for encryption:" : "Sekantys naudotojai nenustatyti šifravimui:",
+    "Initial encryption started... This can take some time. Please wait." : "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.",
+    "Encryption" : "Šifravimas",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
+    "Recovery key password" : "Atkūrimo rakto slaptažodis",
+    "Repeat Recovery key password" : "Pakartokite atkūrimo rakto slaptažodį",
+    "Enabled" : "Įjungta",
+    "Disabled" : "Išjungta",
+    "Change recovery key password:" : "Pakeisti atkūrimo rakto slaptažodį:",
+    "Old Recovery key password" : "Senas atkūrimo rakto slaptažodis",
+    "New Recovery key password" : "Naujas atkūrimo rakto slaptažodis",
+    "Repeat New Recovery key password" : "Pakartokite naują atkūrimo rakto slaptažodį",
+    "Change Password" : "Pakeisti slaptažodį",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
+    "Old log-in password" : "Senas prisijungimo slaptažodis",
+    "Current log-in password" : "Dabartinis prisijungimo slaptažodis",
+    "Update Private Key Password" : "Atnaujinti privataus rakto slaptažodį",
+    "Enable password recovery:" : "Įjungti slaptažodžio atkūrimą:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
+},"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_encryption/l10n/lt_LT.php b/apps/files_encryption/l10n/lt_LT.php
deleted file mode 100644
index 837ace4a607..00000000000
--- a/apps/files_encryption/l10n/lt_LT.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Neatpažinta klaida",
-"Recovery key successfully enabled" => "Atkūrimo raktas sėkmingai įjungtas",
-"Could not disable recovery key. Please check your recovery key password!" => "Neišėjo išjungti jūsų atkūrimo rakto. Prašome jį patikrinti!",
-"Recovery key successfully disabled" => "Atkūrimo raktas sėkmingai išjungtas",
-"Password successfully changed." => "Slaptažodis sėkmingai pakeistas",
-"Could not change the password. Maybe the old password was not correct." => "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
-"Private key password successfully updated." => "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
-"Could not update the private key password. Maybe the old password was not correct." => "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
-"File recovery settings updated" => "Failų atkūrimo nustatymai pakeisti",
-"Could not update file recovery" => "Neišėjo atnaujinti failų atkūrimo",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Jūsų privatus raktas yra netinkamas! Panašu, kad Jūsų slaptažodis buvo pakeistas už %s (pvz. Jūsų organizacijos kataloge). Galite atnaujinti savo privataus rakto slaptažodį savo asmeniniuose nustatymuose, kad atkurti prieigą prie savo šifruotų failų.",
-"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ą.",
-"Missing requirements." => "Trūkstami laukai.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prašome įsitikinti, kad PHP 5.3.3 ar naujesnė yra įdiegta ir kad OpenSSL kartu su PHP plėtiniu yra šjungti ir teisingai sukonfigūruoti. Kol kas šifravimo programa bus išjungta.",
-"Following users are not set up for encryption:" => "Sekantys naudotojai nenustatyti šifravimui:",
-"Initial encryption started... This can take some time. Please wait." => "Pradėtas pirminis šifravimas... Tai gali užtrukti. Prašome palaukti.",
-"Encryption" => "Šifravimas",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Įjunkite atkūrimo raktą, (leisti atkurti naudotojų failus praradus slaptažodį):",
-"Recovery key password" => "Atkūrimo rakto slaptažodis",
-"Repeat Recovery key password" => "Pakartokite atkūrimo rakto slaptažodį",
-"Enabled" => "Įjungta",
-"Disabled" => "Išjungta",
-"Change recovery key password:" => "Pakeisti atkūrimo rakto slaptažodį:",
-"Old Recovery key password" => "Senas atkūrimo rakto slaptažodis",
-"New Recovery key password" => "Naujas atkūrimo rakto slaptažodis",
-"Repeat New Recovery key password" => "Pakartokite naują atkūrimo rakto slaptažodį",
-"Change Password" => "Pakeisti slaptažodį",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Jei nepamenate savo seno slaptažodžio, galite paprašyti administratoriaus atkurti Jūsų failus.",
-"Old log-in password" => "Senas prisijungimo slaptažodis",
-"Current log-in password" => "Dabartinis prisijungimo slaptažodis",
-"Update Private Key Password" => "Atnaujinti privataus rakto slaptažodį",
-"Enable password recovery:" => "Įjungti slaptažodžio atkūrimą:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Įjungus šią funkciją jums bus suteiktas pakartotinis priėjimas prie Jūsų šifruotų failų pamiršus slaptažodį."
-);
-$PLURAL_FORMS = "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_encryption/l10n/lv.js b/apps/files_encryption/l10n/lv.js
new file mode 100644
index 00000000000..841a7fc754d
--- /dev/null
+++ b/apps/files_encryption/l10n/lv.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Nezināma kļūda",
+    "Encryption" : "Šifrēšana"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_encryption/l10n/lv.json b/apps/files_encryption/l10n/lv.json
new file mode 100644
index 00000000000..b5c22c13a86
--- /dev/null
+++ b/apps/files_encryption/l10n/lv.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Unknown error" : "Nezināma kļūda",
+    "Encryption" : "Šifrēšana"
+},"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_encryption/l10n/lv.php b/apps/files_encryption/l10n/lv.php
deleted file mode 100644
index 367eac18795..00000000000
--- a/apps/files_encryption/l10n/lv.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Nezināma kļūda",
-"Encryption" => "Šifrēšana"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_encryption/l10n/mk.js b/apps/files_encryption/l10n/mk.js
new file mode 100644
index 00000000000..a34a81e8693
--- /dev/null
+++ b/apps/files_encryption/l10n/mk.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Непозната грешка",
+    "Password successfully changed." : "Лозинката е успешно променета.",
+    "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
+    "Missing requirements." : "Барања кои недостасуваат.",
+    "Encryption" : "Енкрипција",
+    "Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување",
+    "Enabled" : "Овозможен",
+    "Disabled" : "Оневозможен",
+    "Old Recovery key password" : "Старата лозинка за клучот на обновување ",
+    "Repeat New Recovery key password" : "Повтори ја лозинката за клучот на обновувањето",
+    "Change Password" : "Смени лозинка",
+    "Old log-in password" : "Старата лозинка за најавување",
+    "Current log-in password" : "Тековната лозинка за најавување",
+    "Enable password recovery:" : "Овозможи го обновувањето на лозинката:"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/files_encryption/l10n/mk.json b/apps/files_encryption/l10n/mk.json
new file mode 100644
index 00000000000..770bb602dc3
--- /dev/null
+++ b/apps/files_encryption/l10n/mk.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Unknown error" : "Непозната грешка",
+    "Password successfully changed." : "Лозинката е успешно променета.",
+    "Could not change the password. Maybe the old password was not correct." : "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
+    "Missing requirements." : "Барања кои недостасуваат.",
+    "Encryption" : "Енкрипција",
+    "Repeat Recovery key password" : "Повтори ја лозинката за клучот на обновување",
+    "Enabled" : "Овозможен",
+    "Disabled" : "Оневозможен",
+    "Old Recovery key password" : "Старата лозинка за клучот на обновување ",
+    "Repeat New Recovery key password" : "Повтори ја лозинката за клучот на обновувањето",
+    "Change Password" : "Смени лозинка",
+    "Old log-in password" : "Старата лозинка за најавување",
+    "Current log-in password" : "Тековната лозинка за најавување",
+    "Enable password recovery:" : "Овозможи го обновувањето на лозинката:"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/mk.php b/apps/files_encryption/l10n/mk.php
deleted file mode 100644
index 1a1e18f2231..00000000000
--- a/apps/files_encryption/l10n/mk.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Непозната грешка",
-"Password successfully changed." => "Лозинката е успешно променета.",
-"Could not change the password. Maybe the old password was not correct." => "Лозинката не можеше да се промени. Можеби старата лозинка не беше исправна.",
-"Missing requirements." => "Барања кои недостасуваат.",
-"Encryption" => "Енкрипција",
-"Repeat Recovery key password" => "Повтори ја лозинката за клучот на обновување",
-"Enabled" => "Овозможен",
-"Disabled" => "Оневозможен",
-"Old Recovery key password" => "Старата лозинка за клучот на обновување ",
-"Repeat New Recovery key password" => "Повтори ја лозинката за клучот на обновувањето",
-"Change Password" => "Смени лозинка",
-"Old log-in password" => "Старата лозинка за најавување",
-"Current log-in password" => "Тековната лозинка за најавување",
-"Enable password recovery:" => "Овозможи го обновувањето на лозинката:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_encryption/l10n/nb_NO.js b/apps/files_encryption/l10n/nb_NO.js
new file mode 100644
index 00000000000..3e018cd76f2
--- /dev/null
+++ b/apps/files_encryption/l10n/nb_NO.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Ukjent feil",
+    "Recovery key successfully enabled" : "Gjenopprettingsnøkkel aktivert",
+    "Could not disable recovery key. Please check your recovery key password!" : "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+    "Recovery key successfully disabled" : "Gjenopprettingsnøkkel ble deaktivert",
+    "Password successfully changed." : "Passordet ble endret.",
+    "Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
+    "Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.",
+    "File recovery settings updated" : "Innstillinger for gjenoppretting av filer ble oppdatert",
+    "Could not update file recovery" : "Klarte ikke å oppdatere gjenoppretting av filer",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Ukjent feil. Sjekk systeminnstillingene eller kontakt administratoren.",
+    "Missing requirements." : "Manglende krav.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert.",
+    "Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:",
+    "Initial encryption started... This can take some time. Please wait." : "Førstegangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
+    "Initial encryption running... Please try again later." : "Førstegangs kryptering kjører... Prøv igjen senere.",
+    "Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.",
+    "Encryption" : "Kryptering",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
+    "Recovery key password" : "Passord for gjenopprettingsnøkkel",
+    "Repeat Recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
+    "Enabled" : "Aktiv",
+    "Disabled" : "Inaktiv",
+    "Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
+    "Old Recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
+    "New Recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
+    "Repeat New Recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
+    "Change Password" : "Endre passord",
+    "Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
+    "Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
+    "Old log-in password" : "Gammelt påloggingspassord",
+    "Current log-in password" : "Nåværende påloggingspassord",
+    "Update Private Key Password" : "Oppdater passord for privat nøkkel",
+    "Enable password recovery:" : "Aktiver gjenoppretting av passord:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/nb_NO.json b/apps/files_encryption/l10n/nb_NO.json
new file mode 100644
index 00000000000..ba3e2210a96
--- /dev/null
+++ b/apps/files_encryption/l10n/nb_NO.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Unknown error" : "Ukjent feil",
+    "Recovery key successfully enabled" : "Gjenopprettingsnøkkel aktivert",
+    "Could not disable recovery key. Please check your recovery key password!" : "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
+    "Recovery key successfully disabled" : "Gjenopprettingsnøkkel ble deaktivert",
+    "Password successfully changed." : "Passordet ble endret.",
+    "Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
+    "Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.",
+    "File recovery settings updated" : "Innstillinger for gjenoppretting av filer ble oppdatert",
+    "Could not update file recovery" : "Klarte ikke å oppdatere gjenoppretting av filer",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Ukjent feil. Sjekk systeminnstillingene eller kontakt administratoren.",
+    "Missing requirements." : "Manglende krav.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert.",
+    "Following users are not set up for encryption:" : "Følgende brukere er ikke satt opp for kryptering:",
+    "Initial encryption started... This can take some time. Please wait." : "Førstegangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
+    "Initial encryption running... Please try again later." : "Førstegangs kryptering kjører... Prøv igjen senere.",
+    "Go directly to your %spersonal settings%s." : "Gå direkte til dine %spersonlige innstillinger%s.",
+    "Encryption" : "Kryptering",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
+    "Recovery key password" : "Passord for gjenopprettingsnøkkel",
+    "Repeat Recovery key password" : "Gjenta passord for gjenopprettingsnøkkel",
+    "Enabled" : "Aktiv",
+    "Disabled" : "Inaktiv",
+    "Change recovery key password:" : "Endre passord for gjenopprettingsnøkkel:",
+    "Old Recovery key password" : "Gammelt passord for gjenopprettingsnøkkel",
+    "New Recovery key password" : "Nytt passord for gjenopprettingsnøkkel",
+    "Repeat New Recovery key password" : "Gjenta nytt passord for gjenopprettingsnøkkel",
+    "Change Password" : "Endre passord",
+    "Your private key password no longer matches your log-in password." : "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
+    "Set your old private key password to your current log-in password:" : "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
+    "Old log-in password" : "Gammelt påloggingspassord",
+    "Current log-in password" : "Nåværende påloggingspassord",
+    "Update Private Key Password" : "Oppdater passord for privat nøkkel",
+    "Enable password recovery:" : "Aktiver gjenoppretting av passord:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/nb_NO.php b/apps/files_encryption/l10n/nb_NO.php
deleted file mode 100644
index 343aeba9f08..00000000000
--- a/apps/files_encryption/l10n/nb_NO.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Ukjent feil",
-"Recovery key successfully enabled" => "Gjenopprettingsnøkkel aktivert",
-"Could not disable recovery key. Please check your recovery key password!" => "Klarte ikke å deaktivere gjenopprettingsnøkkel. Sjekk passordet for gjenopprettingsnøkkelen.",
-"Recovery key successfully disabled" => "Gjenopprettingsnøkkel ble deaktivert",
-"Password successfully changed." => "Passordet ble endret.",
-"Could not change the password. Maybe the old password was not correct." => "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
-"Private key password successfully updated." => "Passord for privat nøkkel ble oppdatert.",
-"Could not update the private key password. Maybe the old password was not correct." => "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.",
-"File recovery settings updated" => "Innstillinger for gjenoppretting av filer ble oppdatert",
-"Could not update file recovery" => "Klarte ikke å oppdatere gjenoppretting av filer",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din private nøkkel er ikke gyldig! Sannsynligvis ble passordet ditt endret utenfor %s. (f.eks. din bedriftskatalog). Du kan oppdatere passordet for din private nøkkel i dine personlige innstillinger for å gjenvinne tilgang til de krypterte filene dine.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Ukjent feil. Sjekk systeminnstillingene eller kontakt administratoren.",
-"Missing requirements." => "Manglende krav.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Vennligst se til at PHP 5.3.3 eller nyere er installert og at OpenSSL sammen med PHP-utvidelsen er aktivert og riktig konfigurert. Enn så lenge er krypterings-appen deaktivert.",
-"Following users are not set up for encryption:" => "Følgende brukere er ikke satt opp for kryptering:",
-"Initial encryption started... This can take some time. Please wait." => "Førstegangs kryptering startet... Dette kan ta litt tid. Vennligst vent.",
-"Initial encryption running... Please try again later." => "Førstegangs kryptering kjører... Prøv igjen senere.",
-"Go directly to your %spersonal settings%s." => "Gå direkte til dine %spersonlige innstillinger%s.",
-"Encryption" => "Kryptering",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktiver gjenopprettingsnøkkel (tillat å gjenopprette brukerfiler i tilfelle tap av passord):",
-"Recovery key password" => "Passord for gjenopprettingsnøkkel",
-"Repeat Recovery key password" => "Gjenta passord for gjenopprettingsnøkkel",
-"Enabled" => "Aktiv",
-"Disabled" => "Inaktiv",
-"Change recovery key password:" => "Endre passord for gjenopprettingsnøkkel:",
-"Old Recovery key password" => "Gammelt passord for gjenopprettingsnøkkel",
-"New Recovery key password" => "Nytt passord for gjenopprettingsnøkkel",
-"Repeat New Recovery key password" => "Gjenta nytt passord for gjenopprettingsnøkkel",
-"Change Password" => "Endre passord",
-"Your private key password no longer matches your log-in password." => "Passordet for din private nøkkel stemmer ikke lenger med påloggingspassordet ditt.",
-"Set your old private key password to your current log-in password:" => "Sett ditt gamle passord for privat nøkkel til ditt nåværende påloggingspassord:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Hvis du ikke husker det gamle passordet ditt kan du spørre administratoren om å gjenopprette filene dine.",
-"Old log-in password" => "Gammelt påloggingspassord",
-"Current log-in password" => "Nåværende påloggingspassord",
-"Update Private Key Password" => "Oppdater passord for privat nøkkel",
-"Enable password recovery:" => "Aktiver gjenoppretting av passord:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Aktivering av dette valget tillater deg å gjenerobre tilgang til dine krypterte filer i tilfelle du mister passordet ditt."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nl.js b/apps/files_encryption/l10n/nl.js
new file mode 100644
index 00000000000..04b2c9e8175
--- /dev/null
+++ b/apps/files_encryption/l10n/nl.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Onbekende fout",
+    "Missing recovery key password" : "Ontbrekende wachtwoord herstelsleutel",
+    "Please repeat the recovery key password" : "Herhaal het herstelsleutel wachtwoord",
+    "Repeated recovery key password does not match the provided recovery key password" : "Het herhaalde herstelsleutel wachtwoord kwam niet overeen met het eerdere herstelsleutel wachtwoord ",
+    "Recovery key successfully enabled" : "Herstelsleutel succesvol geactiveerd",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
+    "Recovery key successfully disabled" : "Herstelsleutel succesvol gedeactiveerd",
+    "Please provide the old recovery password" : "Geef het oude herstelwachtwoord op",
+    "Please provide a new recovery password" : "Geef een nieuw herstelwachtwoord op",
+    "Please repeat the new recovery password" : "Herhaal het nieuwe herstelwachtwoord",
+    "Password successfully changed." : "Wachtwoord succesvol gewijzigd.",
+    "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+    "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
+    "File recovery settings updated" : "Bestandsherstel instellingen bijgewerkt",
+    "Could not update file recovery" : "Kon bestandsherstel niet bijwerken",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Uw privésleutel is niet geldig! Waarschijnlijk is uw wachtwoord gewijzigd buiten %s (bijv. uw corporate directory). U kunt uw privésleutel wachtwoord in uw persoonlijke instellingen bijwerken om toegang te krijgen tot uw versleutelde bestanden.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Onbekende fout. Controleer uw systeeminstellingen of neem contact op met de beheerder",
+    "Missing requirements." : "Missende benodigdheden.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
+    "Following users are not set up for encryption:" : "De volgende gebruikers hebben geen configuratie voor encryptie:",
+    "Initial encryption started... This can take some time. Please wait." : "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.",
+    "Initial encryption running... Please try again later." : "Initiële versleuteling bezig... Probeer het later opnieuw.",
+    "Go directly to your %spersonal settings%s." : "Ga direct naar uw %spersoonlijke instellingen%s.",
+    "Encryption" : "Versleuteling",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
+    "Recovery key password" : "Wachtwoord herstelsleulel",
+    "Repeat Recovery key password" : "Herhaal het herstelsleutel wachtwoord",
+    "Enabled" : "Geactiveerd",
+    "Disabled" : "Gedeactiveerd",
+    "Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
+    "Old Recovery key password" : "Oude wachtwoord herstelsleutel",
+    "New Recovery key password" : "Nieuwe wachtwoord herstelsleutel",
+    "Repeat New Recovery key password" : "Herhaal het nieuwe herstelsleutel wachtwoord",
+    "Change Password" : "Wijzigen wachtwoord",
+    "Your private key password no longer matches your log-in password." : "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord.",
+    "Set your old private key password to your current log-in password:" : "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
+    "Old log-in password" : "Oude wachtwoord",
+    "Current log-in password" : "Huidige wachtwoord",
+    "Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
+    "Enable password recovery:" : "Activeren wachtwoord herstel:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/nl.json b/apps/files_encryption/l10n/nl.json
new file mode 100644
index 00000000000..67f0d2e4c89
--- /dev/null
+++ b/apps/files_encryption/l10n/nl.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Onbekende fout",
+    "Missing recovery key password" : "Ontbrekende wachtwoord herstelsleutel",
+    "Please repeat the recovery key password" : "Herhaal het herstelsleutel wachtwoord",
+    "Repeated recovery key password does not match the provided recovery key password" : "Het herhaalde herstelsleutel wachtwoord kwam niet overeen met het eerdere herstelsleutel wachtwoord ",
+    "Recovery key successfully enabled" : "Herstelsleutel succesvol geactiveerd",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
+    "Recovery key successfully disabled" : "Herstelsleutel succesvol gedeactiveerd",
+    "Please provide the old recovery password" : "Geef het oude herstelwachtwoord op",
+    "Please provide a new recovery password" : "Geef een nieuw herstelwachtwoord op",
+    "Please repeat the new recovery password" : "Herhaal het nieuwe herstelwachtwoord",
+    "Password successfully changed." : "Wachtwoord succesvol gewijzigd.",
+    "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+    "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
+    "File recovery settings updated" : "Bestandsherstel instellingen bijgewerkt",
+    "Could not update file recovery" : "Kon bestandsherstel niet bijwerken",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Uw privésleutel is niet geldig! Waarschijnlijk is uw wachtwoord gewijzigd buiten %s (bijv. uw corporate directory). U kunt uw privésleutel wachtwoord in uw persoonlijke instellingen bijwerken om toegang te krijgen tot uw versleutelde bestanden.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Onbekende fout. Controleer uw systeeminstellingen of neem contact op met de beheerder",
+    "Missing requirements." : "Missende benodigdheden.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
+    "Following users are not set up for encryption:" : "De volgende gebruikers hebben geen configuratie voor encryptie:",
+    "Initial encryption started... This can take some time. Please wait." : "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.",
+    "Initial encryption running... Please try again later." : "Initiële versleuteling bezig... Probeer het later opnieuw.",
+    "Go directly to your %spersonal settings%s." : "Ga direct naar uw %spersoonlijke instellingen%s.",
+    "Encryption" : "Versleuteling",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
+    "Recovery key password" : "Wachtwoord herstelsleulel",
+    "Repeat Recovery key password" : "Herhaal het herstelsleutel wachtwoord",
+    "Enabled" : "Geactiveerd",
+    "Disabled" : "Gedeactiveerd",
+    "Change recovery key password:" : "Wijzig wachtwoord herstelsleutel:",
+    "Old Recovery key password" : "Oude wachtwoord herstelsleutel",
+    "New Recovery key password" : "Nieuwe wachtwoord herstelsleutel",
+    "Repeat New Recovery key password" : "Herhaal het nieuwe herstelsleutel wachtwoord",
+    "Change Password" : "Wijzigen wachtwoord",
+    "Your private key password no longer matches your log-in password." : "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord.",
+    "Set your old private key password to your current log-in password:" : "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
+    "Old log-in password" : "Oude wachtwoord",
+    "Current log-in password" : "Huidige wachtwoord",
+    "Update Private Key Password" : "Bijwerken wachtwoord Privésleutel",
+    "Enable password recovery:" : "Activeren wachtwoord herstel:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
deleted file mode 100644
index 3dd7665d729..00000000000
--- a/apps/files_encryption/l10n/nl.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Onbekende fout",
-"Missing recovery key password" => "Ontbrekende wachtwoord herstelsleutel",
-"Please repeat the recovery key password" => "Herhaal het herstelsleutel wachtwoord",
-"Repeated recovery key password does not match the provided recovery key password" => "Het herhaalde herstelsleutel wachtwoord kwam niet overeen met het eerdere herstelsleutel wachtwoord ",
-"Recovery key successfully enabled" => "Herstelsleutel succesvol geactiveerd",
-"Could not disable recovery key. Please check your recovery key password!" => "Kon herstelsleutel niet deactiveren. Controleer het wachtwoord van uw herstelsleutel!",
-"Recovery key successfully disabled" => "Herstelsleutel succesvol gedeactiveerd",
-"Please provide the old recovery password" => "Geef het oude herstelwachtwoord op",
-"Please provide a new recovery password" => "Geef een nieuw herstelwachtwoord op",
-"Please repeat the new recovery password" => "Herhaal het nieuwe herstelwachtwoord",
-"Password successfully changed." => "Wachtwoord succesvol gewijzigd.",
-"Could not change the password. Maybe the old password was not correct." => "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
-"Private key password successfully updated." => "Privésleutel succesvol bijgewerkt.",
-"Could not update the private key password. Maybe the old password was not correct." => "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
-"File recovery settings updated" => "Bestandsherstel instellingen bijgewerkt",
-"Could not update file recovery" => "Kon bestandsherstel niet bijwerken",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Uw privésleutel is niet geldig! Waarschijnlijk is uw wachtwoord gewijzigd buiten %s (bijv. uw corporate directory). U kunt uw privésleutel wachtwoord in uw persoonlijke instellingen bijwerken om toegang te krijgen tot uw versleutelde bestanden.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Onbekende fout. Controleer uw systeeminstellingen of neem contact op met de beheerder",
-"Missing requirements." => "Missende benodigdheden.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Wees er zeker van dat PHP5.3.3 of nieuwer is geïstalleerd en dat de OpenSSL PHP extensie is ingeschakeld en correct geconfigureerd. De versleutel-app is voorlopig uitgeschakeld.",
-"Following users are not set up for encryption:" => "De volgende gebruikers hebben geen configuratie voor encryptie:",
-"Initial encryption started... This can take some time. Please wait." => "initiële versleuteling gestart... Dit kan even duren, geduld a.u.b.",
-"Initial encryption running... Please try again later." => "Initiële versleuteling bezig... Probeer het later opnieuw.",
-"Go directly to your %spersonal settings%s." => "Ga direct naar uw %spersoonlijke instellingen%s.",
-"Encryption" => "Versleuteling",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Activeren herstelsleutel (maakt het mogelijk om gebruikersbestanden terug te halen in geval van verlies van het wachtwoord):",
-"Recovery key password" => "Wachtwoord herstelsleulel",
-"Repeat Recovery key password" => "Herhaal het herstelsleutel wachtwoord",
-"Enabled" => "Geactiveerd",
-"Disabled" => "Gedeactiveerd",
-"Change recovery key password:" => "Wijzig wachtwoord herstelsleutel:",
-"Old Recovery key password" => "Oude wachtwoord herstelsleutel",
-"New Recovery key password" => "Nieuwe wachtwoord herstelsleutel",
-"Repeat New Recovery key password" => "Herhaal het nieuwe herstelsleutel wachtwoord",
-"Change Password" => "Wijzigen wachtwoord",
-"Your private key password no longer matches your log-in password." => "Het wachtwoord van uw privésleutel komt niet meer overeen met uw inlogwachtwoord.",
-"Set your old private key password to your current log-in password:" => "Stel het wachtwoord van uw oude privésleutel in op uw huidige inlogwachtwoord.",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Als u uw oude wachtwoord niet meer weet, kunt u uw beheerder vragen uw bestanden terug te halen.",
-"Old log-in password" => "Oude wachtwoord",
-"Current log-in password" => "Huidige wachtwoord",
-"Update Private Key Password" => "Bijwerken wachtwoord Privésleutel",
-"Enable password recovery:" => "Activeren wachtwoord herstel:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Het activeren van deze optie maakt het mogelijk om uw versleutelde bestanden te benaderen als uw wachtwoord kwijt is"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/nn_NO.js b/apps/files_encryption/l10n/nn_NO.js
new file mode 100644
index 00000000000..5adb8d65475
--- /dev/null
+++ b/apps/files_encryption/l10n/nn_NO.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Ukjend feil",
+    "Encryption" : "Kryptering"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/nn_NO.json b/apps/files_encryption/l10n/nn_NO.json
new file mode 100644
index 00000000000..8f78cc1320f
--- /dev/null
+++ b/apps/files_encryption/l10n/nn_NO.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Unknown error" : "Ukjend feil",
+    "Encryption" : "Kryptering"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/nn_NO.php b/apps/files_encryption/l10n/nn_NO.php
deleted file mode 100644
index 042104c5fb5..00000000000
--- a/apps/files_encryption/l10n/nn_NO.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Ukjend feil",
-"Encryption" => "Kryptering"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/pa.js b/apps/files_encryption/l10n/pa.js
new file mode 100644
index 00000000000..f61063e9459
--- /dev/null
+++ b/apps/files_encryption/l10n/pa.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "ਅਣਜਾਣ ਗਲਤੀ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/pa.json b/apps/files_encryption/l10n/pa.json
new file mode 100644
index 00000000000..41690f3aa32
--- /dev/null
+++ b/apps/files_encryption/l10n/pa.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Unknown error" : "ਅਣਜਾਣ ਗਲਤੀ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/pa.php b/apps/files_encryption/l10n/pa.php
deleted file mode 100644
index 771dd8b4497..00000000000
--- a/apps/files_encryption/l10n/pa.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "ਅਣਜਾਣ ਗਲਤੀ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/pl.js b/apps/files_encryption/l10n/pl.js
new file mode 100644
index 00000000000..027e933008c
--- /dev/null
+++ b/apps/files_encryption/l10n/pl.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Nieznany błąd",
+    "Recovery key successfully enabled" : "Klucz odzyskiwania włączony",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+    "Recovery key successfully disabled" : "Klucz odzyskiwania wyłączony",
+    "Password successfully changed." : "Zmiana hasła udana.",
+    "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+    "Private key password successfully updated." : "Pomyślnie zaktualizowano hasło klucza prywatnego.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
+    "File recovery settings updated" : "Ustawienia odzyskiwania plików zmienione",
+    "Could not update file recovery" : "Nie można zmienić pliku odzyskiwania",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Prawdopodobnie Twoje hasło zostało zmienione poza %s (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Nieznany błąd. Proszę sprawdzić ustawienia systemowe lub skontaktować się z administratorem",
+    "Missing requirements." : "Brak wymagań.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
+    "Following users are not set up for encryption:" : "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
+    "Initial encryption started... This can take some time. Please wait." : "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać.",
+    "Initial encryption running... Please try again later." : "Trwa szyfrowanie początkowe...Spróbuj ponownie.",
+    "Go directly to your %spersonal settings%s." : "Przejdź bezpośrednio do %spersonal settings%s.",
+    "Encryption" : "Szyfrowanie",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
+    "Recovery key password" : "Hasło klucza odzyskiwania",
+    "Repeat Recovery key password" : "Powtórz hasło klucza odzyskiwania",
+    "Enabled" : "Włączone",
+    "Disabled" : "Wyłączone",
+    "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
+    "Old Recovery key password" : "Stare hasło klucza odzyskiwania",
+    "New Recovery key password" : "Nowe hasło klucza odzyskiwania",
+    "Repeat New Recovery key password" : "Powtórz nowe hasło klucza odzyskiwania",
+    "Change Password" : "Zmień hasło",
+    "Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
+    "Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
+    "Old log-in password" : "Stare hasło logowania",
+    "Current log-in password" : "Bieżące hasło logowania",
+    "Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
+    "Enable password recovery:" : "Włącz hasło odzyskiwania:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
+},
+"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_encryption/l10n/pl.json b/apps/files_encryption/l10n/pl.json
new file mode 100644
index 00000000000..25e38425235
--- /dev/null
+++ b/apps/files_encryption/l10n/pl.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Unknown error" : "Nieznany błąd",
+    "Recovery key successfully enabled" : "Klucz odzyskiwania włączony",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
+    "Recovery key successfully disabled" : "Klucz odzyskiwania wyłączony",
+    "Password successfully changed." : "Zmiana hasła udana.",
+    "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+    "Private key password successfully updated." : "Pomyślnie zaktualizowano hasło klucza prywatnego.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
+    "File recovery settings updated" : "Ustawienia odzyskiwania plików zmienione",
+    "Could not update file recovery" : "Nie można zmienić pliku odzyskiwania",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Klucz prywatny nie jest poprawny! Prawdopodobnie Twoje hasło zostało zmienione poza %s (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Nieznany błąd. Proszę sprawdzić ustawienia systemowe lub skontaktować się z administratorem",
+    "Missing requirements." : "Brak wymagań.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
+    "Following users are not set up for encryption:" : "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
+    "Initial encryption started... This can take some time. Please wait." : "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać.",
+    "Initial encryption running... Please try again later." : "Trwa szyfrowanie początkowe...Spróbuj ponownie.",
+    "Go directly to your %spersonal settings%s." : "Przejdź bezpośrednio do %spersonal settings%s.",
+    "Encryption" : "Szyfrowanie",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
+    "Recovery key password" : "Hasło klucza odzyskiwania",
+    "Repeat Recovery key password" : "Powtórz hasło klucza odzyskiwania",
+    "Enabled" : "Włączone",
+    "Disabled" : "Wyłączone",
+    "Change recovery key password:" : "Zmień hasło klucza odzyskiwania",
+    "Old Recovery key password" : "Stare hasło klucza odzyskiwania",
+    "New Recovery key password" : "Nowe hasło klucza odzyskiwania",
+    "Repeat New Recovery key password" : "Powtórz nowe hasło klucza odzyskiwania",
+    "Change Password" : "Zmień hasło",
+    "Your private key password no longer matches your log-in password." : "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
+    "Set your old private key password to your current log-in password:" : "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
+    "Old log-in password" : "Stare hasło logowania",
+    "Current log-in password" : "Bieżące hasło logowania",
+    "Update Private Key Password" : "Aktualizacja hasła klucza prywatnego",
+    "Enable password recovery:" : "Włącz hasło odzyskiwania:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
+},"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_encryption/l10n/pl.php b/apps/files_encryption/l10n/pl.php
deleted file mode 100644
index c52c3ddee99..00000000000
--- a/apps/files_encryption/l10n/pl.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Nieznany błąd",
-"Please repeat the recovery key password" => "Proszę powtórz nowe hasło klucza odzyskiwania",
-"Recovery key successfully enabled" => "Klucz odzyskiwania włączony",
-"Could not disable recovery key. Please check your recovery key password!" => "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
-"Recovery key successfully disabled" => "Klucz odzyskiwania wyłączony",
-"Password successfully changed." => "Zmiana hasła udana.",
-"Could not change the password. Maybe the old password was not correct." => "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
-"Private key password successfully updated." => "Pomyślnie zaktualizowano hasło klucza prywatnego.",
-"Could not update the private key password. Maybe the old password was not correct." => "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
-"File recovery settings updated" => "Ustawienia odzyskiwania plików zmienione",
-"Could not update file recovery" => "Nie można zmienić pliku odzyskiwania",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Klucz prywatny nie jest poprawny! Prawdopodobnie Twoje hasło zostało zmienione poza %s (np. w katalogu firmy). Aby odzyskać dostęp do zaszyfrowanych plików można zaktualizować hasło klucza prywatnego w ustawieniach osobistych.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Nieznany błąd. Proszę sprawdzić ustawienia systemowe lub skontaktować się z administratorem",
-"Missing requirements." => "Brak wymagań.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Proszę upewnić się, że PHP 5.3.3 lub nowszy jest zainstalowany i że OpenSSL oraz rozszerzenie PHP jest włączone i poprawnie skonfigurowane. Obecnie szyfrowanie aplikacji zostało wyłączone.",
-"Following users are not set up for encryption:" => "Następujący użytkownicy nie mają skonfigurowanego szyfrowania:",
-"Initial encryption started... This can take some time. Please wait." => "Rozpoczęto szyfrowanie... To może chwilę potrwać. Proszę czekać.",
-"Initial encryption running... Please try again later." => "Trwa szyfrowanie początkowe...Spróbuj ponownie.",
-"Go directly to your %spersonal settings%s." => "Przejdź bezpośrednio do %spersonal settings%s.",
-"Encryption" => "Szyfrowanie",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Włączhasło klucza odzyskiwania (pozwala odzyskać pliki użytkowników w przypadku utraty hasła):",
-"Recovery key password" => "Hasło klucza odzyskiwania",
-"Repeat Recovery key password" => "Powtórz hasło klucza odzyskiwania",
-"Enabled" => "Włączone",
-"Disabled" => "Wyłączone",
-"Change recovery key password:" => "Zmień hasło klucza odzyskiwania",
-"Old Recovery key password" => "Stare hasło klucza odzyskiwania",
-"New Recovery key password" => "Nowe hasło klucza odzyskiwania",
-"Repeat New Recovery key password" => "Powtórz nowe hasło klucza odzyskiwania",
-"Change Password" => "Zmień hasło",
-"Your private key password no longer matches your log-in password." => "Hasło Twojego klucza prywatnego nie pasuje już do Twojego hasła logowania.",
-"Set your old private key password to your current log-in password:" => "Ustaw stare hasło klucza prywatnego na aktualne hasło logowania:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Jeśli nie pamiętasz swojego starego hasła, poproś swojego administratora, aby odzyskać pliki.",
-"Old log-in password" => "Stare hasło logowania",
-"Current log-in password" => "Bieżące hasło logowania",
-"Update Private Key Password" => "Aktualizacja hasła klucza prywatnego",
-"Enable password recovery:" => "Włącz hasło odzyskiwania:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Włączenie tej opcji umożliwia otrzymać dostęp do zaszyfrowanych plików w przypadku utraty hasła"
-);
-$PLURAL_FORMS = "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_encryption/l10n/pt_BR.js b/apps/files_encryption/l10n/pt_BR.js
new file mode 100644
index 00000000000..3849876d602
--- /dev/null
+++ b/apps/files_encryption/l10n/pt_BR.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Erro desconhecido",
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, repita a senha da chave de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A senha repetidas da chave de valorização não corresponde a senha da chave de recuperação prevista",
+    "Recovery key successfully enabled" : "Recuperação de chave habilitada com sucesso",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+    "Recovery key successfully disabled" : "Recuperação de chave desabilitada com sucesso",
+    "Please provide the old recovery password" : "Por favor, forneça a antiga senha de recuperação",
+    "Please provide a new recovery password" : "Por favor, forneça a nova senha de recuperação",
+    "Please repeat the new recovery password" : "Por favor, repita a nova senha de recuperação",
+    "Password successfully changed." : "Senha alterada com sucesso.",
+    "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+    "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
+    "File recovery settings updated" : "Configurações de recuperação de arquivo atualizado",
+    "Could not update file recovery" : "Não foi possível atualizar a recuperação de arquivos",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora de %s (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
+    "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. Poe favoe peça ao dono do arquivo para compartilha-lo com você.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador",
+    "Missing requirements." : "Requisitos não encontrados.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
+    "Following users are not set up for encryption:" : "Seguintes usuários não estão configurados para criptografia:",
+    "Initial encryption started... This can take some time. Please wait." : "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.",
+    "Initial encryption running... Please try again later." : "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.",
+    "Go directly to your %spersonal settings%s." : "Ir direto para suas %spersonal settings%s.",
+    "Encryption" : "Criptografia",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
+    "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat Recovery key password" : "Repita Recuperação de senha da chave",
+    "Enabled" : "Habilitado",
+    "Disabled" : "Desabilitado",
+    "Change recovery key password:" : "Mudar a senha da chave de recuperação:",
+    "Old Recovery key password" : "Senha antiga da chave de recuperação",
+    "New Recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat New Recovery key password" : "Repita Nova senha da chave de recuperação",
+    "Change Password" : "Trocar Senha",
+    "Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
+    "Set your old private key password to your current log-in password:" : "Defina a sua antiga senha da chave privada para sua senha de login atual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
+    "Old log-in password" : "Senha antiga de login",
+    "Current log-in password" : "Senha de login atual",
+    "Update Private Key Password" : "Atualizar Senha de Chave Privada",
+    "Enable password recovery:" : "Habilitar recuperação de senha:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_encryption/l10n/pt_BR.json b/apps/files_encryption/l10n/pt_BR.json
new file mode 100644
index 00000000000..6627951f8f0
--- /dev/null
+++ b/apps/files_encryption/l10n/pt_BR.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Erro desconhecido",
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, repita a senha da chave de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A senha repetidas da chave de valorização não corresponde a senha da chave de recuperação prevista",
+    "Recovery key successfully enabled" : "Recuperação de chave habilitada com sucesso",
+    "Could not disable recovery key. Please check your recovery key password!" : "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
+    "Recovery key successfully disabled" : "Recuperação de chave desabilitada com sucesso",
+    "Please provide the old recovery password" : "Por favor, forneça a antiga senha de recuperação",
+    "Please provide a new recovery password" : "Por favor, forneça a nova senha de recuperação",
+    "Please repeat the new recovery password" : "Por favor, repita a nova senha de recuperação",
+    "Password successfully changed." : "Senha alterada com sucesso.",
+    "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+    "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
+    "File recovery settings updated" : "Configurações de recuperação de arquivo atualizado",
+    "Could not update file recovery" : "Não foi possível atualizar a recuperação de arquivos",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora de %s (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
+    "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. Poe favoe peça ao dono do arquivo para compartilha-lo com você.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador",
+    "Missing requirements." : "Requisitos não encontrados.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
+    "Following users are not set up for encryption:" : "Seguintes usuários não estão configurados para criptografia:",
+    "Initial encryption started... This can take some time. Please wait." : "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.",
+    "Initial encryption running... Please try again later." : "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.",
+    "Go directly to your %spersonal settings%s." : "Ir direto para suas %spersonal settings%s.",
+    "Encryption" : "Criptografia",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
+    "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat Recovery key password" : "Repita Recuperação de senha da chave",
+    "Enabled" : "Habilitado",
+    "Disabled" : "Desabilitado",
+    "Change recovery key password:" : "Mudar a senha da chave de recuperação:",
+    "Old Recovery key password" : "Senha antiga da chave de recuperação",
+    "New Recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat New Recovery key password" : "Repita Nova senha da chave de recuperação",
+    "Change Password" : "Trocar Senha",
+    "Your private key password no longer matches your log-in password." : "A sua senha de chave privada não corresponde a sua senha de login.",
+    "Set your old private key password to your current log-in password:" : "Defina a sua antiga senha da chave privada para sua senha de login atual:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
+    "Old log-in password" : "Senha antiga de login",
+    "Current log-in password" : "Senha de login atual",
+    "Update Private Key Password" : "Atualizar Senha de Chave Privada",
+    "Enable password recovery:" : "Habilitar recuperação de senha:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/pt_BR.php b/apps/files_encryption/l10n/pt_BR.php
deleted file mode 100644
index 50b0e8421e6..00000000000
--- a/apps/files_encryption/l10n/pt_BR.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Erro desconhecido",
-"Missing recovery key password" => "Senha da chave de recuperação em falta",
-"Please repeat the recovery key password" => "Por favor, repita a senha da chave de recuperação",
-"Repeated recovery key password does not match the provided recovery key password" => "A senha repetidas da chave de valorização não corresponde a senha da chave de recuperação prevista",
-"Recovery key successfully enabled" => "Recuperação de chave habilitada com sucesso",
-"Could not disable recovery key. Please check your recovery key password!" => "Impossível desabilitar recuperação de chave. Por favor verifique sua senha para recuperação de chave!",
-"Recovery key successfully disabled" => "Recuperação de chave desabilitada com sucesso",
-"Please provide the old recovery password" => "Por favor, forneça a antiga senha de recuperação",
-"Please provide a new recovery password" => "Por favor, forneça a nova senha de recuperação",
-"Please repeat the new recovery password" => "Por favor, repita a nova senha de recuperação",
-"Password successfully changed." => "Senha alterada com sucesso.",
-"Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
-"Private key password successfully updated." => "Senha de chave privada atualizada com sucesso.",
-"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
-"File recovery settings updated" => "Configurações de recuperação de arquivo atualizado",
-"Could not update file recovery" => "Não foi possível atualizar a recuperação de arquivos",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Sua chave privada não é válida! Provavelmente sua senha foi alterada fora de %s (por exemplo, seu diretório corporativo). Você pode atualizar sua senha de chave privada em suas configurações pessoais para recuperar o acesso a seus arquivos criptografados.",
-"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. Poe favoe peça ao dono do arquivo para compartilha-lo com você.",
-"Unknown error. Please check your system settings or contact your administrator" => "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contato com o administrador",
-"Missing requirements." => "Requisitos não encontrados.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou mais recente está instalado e que a extensão PHP OpenSSL está habilitado e configurado corretamente. Por enquanto, o aplicativo de criptografia foi desativado.",
-"Following users are not set up for encryption:" => "Seguintes usuários não estão configurados para criptografia:",
-"Initial encryption started... This can take some time. Please wait." => "Criptografia inicial inicializada... Isto pode tomar algum tempo. Por favor espere.",
-"Initial encryption running... Please try again later." => "Criptografia inicial em execução ... Por favor, tente novamente mais tarde.",
-"Go directly to your %spersonal settings%s." => "Ir direto para suas %spersonal settings%s.",
-"Encryption" => "Criptografia",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Habilitar chave de recuperação (permite recuperar arquivos de usuários em caso de perda de senha):",
-"Recovery key password" => "Senha da chave de recuperação",
-"Repeat Recovery key password" => "Repita Recuperação de senha da chave",
-"Enabled" => "Habilitado",
-"Disabled" => "Desabilitado",
-"Change recovery key password:" => "Mudar a senha da chave de recuperação:",
-"Old Recovery key password" => "Senha antiga da chave de recuperação",
-"New Recovery key password" => "Nova senha da chave de recuperação",
-"Repeat New Recovery key password" => "Repita Nova senha da chave de recuperação",
-"Change Password" => "Trocar Senha",
-"Your private key password no longer matches your log-in password." => "A sua senha de chave privada não corresponde a sua senha de login.",
-"Set your old private key password to your current log-in password:" => "Defina a sua antiga senha da chave privada para sua senha de login atual:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Se você não se lembra de sua antiga senha você pode pedir ao administrador que recupere seus arquivos.",
-"Old log-in password" => "Senha antiga de login",
-"Current log-in password" => "Senha de login atual",
-"Update Private Key Password" => "Atualizar Senha de Chave Privada",
-"Enable password recovery:" => "Habilitar recuperação de senha:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Habilitar essa opção vai permitir que você obtenha novamente acesso aos seus arquivos encriptados em caso de perda de senha"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/pt_PT.js b/apps/files_encryption/l10n/pt_PT.js
new file mode 100644
index 00000000000..3f785d9d29e
--- /dev/null
+++ b/apps/files_encryption/l10n/pt_PT.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Erro Desconhecido",
+    "Missing recovery key password" : "Palavra-passe de recuperação em falta",
+    "Please repeat the recovery key password" : "Repita a palavra-passe de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
+    "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso",
+    "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
+    "Recovery key successfully disabled" : "A chave de recuperação foi desativada com sucesso",
+    "Please provide the old recovery password" : "Escreva a palavra-passe de recuperação antiga",
+    "Please provide a new recovery password" : "Escreva a nova palavra-passe de recuperação",
+    "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação",
+    "Password successfully changed." : "Senha alterada com sucesso.",
+    "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
+    "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
+    "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha da chave privada. A senha antiga poderia não estar correta.",
+    "File recovery settings updated" : "As definições da recuperação de ficheiro foram atualizadas",
+    "Could not update file recovery" : "Não foi possível atualizar a recuperação de ficheiro",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A app de encriptação não foi inicializada! A app de encriptação poderá ter sido reativada durante a sua sessão. Por favor, tente terminar a sessão e iniciá-la de seguida para inicializar a app de encriptação.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "A sua chave privada não é válida! Provavelmente a senha foi alterada fora do %s (ex. a sua diretoria corporativa). Pode atualizar a sua senha da chave privada nas definições pessoais para recuperar o acesso aos seus ficheiros encriptados. ",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contacto com o seu administrador ",
+    "Missing requirements." : "Requisitos em falta.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se que o PHP 5.3.3 ou superior está instalado e que  o OpenSSL juntamente com a extensão PHP estão ativados e devidamente configurados. Por agora, a app de encriptação foi desativada.",
+    "Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:",
+    "Initial encryption started... This can take some time. Please wait." : "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.",
+    "Initial encryption running... Please try again later." : "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.",
+    "Go directly to your %spersonal settings%s." : "Ir diretamente para as %sdefinições pessoais%s.",
+    "Encryption" : "Encriptação",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
+    "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat Recovery key password" : "Contrassenha da chave de recuperação",
+    "Enabled" : "Ativada",
+    "Disabled" : "Desactivada",
+    "Change recovery key password:" : "Alterar a senha da chave de recuperação:",
+    "Old Recovery key password" : "Senha da chave de recuperação antiga",
+    "New Recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat New Recovery key password" : "Contrassenha da nova chave de recuperação",
+    "Change Password" : "Alterar a Senha",
+    "Your private key password no longer matches your log-in password." : "A Password da sua chave privada não coincide mais com a password do seu login.",
+    "Set your old private key password to your current log-in password:" : "Altere a password antiga da chave privada para a nova password do login:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da senha antiga pode pedir ao administrador para recuperar os seus ficheiros. ",
+    "Old log-in password" : "Senha de iniciar sessão antiga",
+    "Current log-in password" : "Senha de iniciar sessão atual",
+    "Update Private Key Password" : "Atualizar Senha da Chave Privada ",
+    "Enable password recovery:" : "Ativar a recuperação da senha:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao ativar esta opção, irá poder obter o acesso aos seus ficheiros encriptados, se perder a senha"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/pt_PT.json b/apps/files_encryption/l10n/pt_PT.json
new file mode 100644
index 00000000000..40af81afcb4
--- /dev/null
+++ b/apps/files_encryption/l10n/pt_PT.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Erro Desconhecido",
+    "Missing recovery key password" : "Palavra-passe de recuperação em falta",
+    "Please repeat the recovery key password" : "Repita a palavra-passe de recuperação",
+    "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
+    "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso",
+    "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
+    "Recovery key successfully disabled" : "A chave de recuperação foi desativada com sucesso",
+    "Please provide the old recovery password" : "Escreva a palavra-passe de recuperação antiga",
+    "Please provide a new recovery password" : "Escreva a nova palavra-passe de recuperação",
+    "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação",
+    "Password successfully changed." : "Senha alterada com sucesso.",
+    "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
+    "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
+    "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha da chave privada. A senha antiga poderia não estar correta.",
+    "File recovery settings updated" : "As definições da recuperação de ficheiro foram atualizadas",
+    "Could not update file recovery" : "Não foi possível atualizar a recuperação de ficheiro",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A app de encriptação não foi inicializada! A app de encriptação poderá ter sido reativada durante a sua sessão. Por favor, tente terminar a sessão e iniciá-la de seguida para inicializar a app de encriptação.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "A sua chave privada não é válida! Provavelmente a senha foi alterada fora do %s (ex. a sua diretoria corporativa). Pode atualizar a sua senha da chave privada nas definições pessoais para recuperar o acesso aos seus ficheiros encriptados. ",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contacto com o seu administrador ",
+    "Missing requirements." : "Requisitos em falta.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Por favor, certifique-se que o PHP 5.3.3 ou superior está instalado e que  o OpenSSL juntamente com a extensão PHP estão ativados e devidamente configurados. Por agora, a app de encriptação foi desativada.",
+    "Following users are not set up for encryption:" : "Os utilizadores seguintes não estão configurados para encriptação:",
+    "Initial encryption started... This can take some time. Please wait." : "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.",
+    "Initial encryption running... Please try again later." : "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.",
+    "Go directly to your %spersonal settings%s." : "Ir diretamente para as %sdefinições pessoais%s.",
+    "Encryption" : "Encriptação",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
+    "Recovery key password" : "Senha da chave de recuperação",
+    "Repeat Recovery key password" : "Contrassenha da chave de recuperação",
+    "Enabled" : "Ativada",
+    "Disabled" : "Desactivada",
+    "Change recovery key password:" : "Alterar a senha da chave de recuperação:",
+    "Old Recovery key password" : "Senha da chave de recuperação antiga",
+    "New Recovery key password" : "Nova senha da chave de recuperação",
+    "Repeat New Recovery key password" : "Contrassenha da nova chave de recuperação",
+    "Change Password" : "Alterar a Senha",
+    "Your private key password no longer matches your log-in password." : "A Password da sua chave privada não coincide mais com a password do seu login.",
+    "Set your old private key password to your current log-in password:" : "Altere a password antiga da chave privada para a nova password do login:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Se não se lembra da senha antiga pode pedir ao administrador para recuperar os seus ficheiros. ",
+    "Old log-in password" : "Senha de iniciar sessão antiga",
+    "Current log-in password" : "Senha de iniciar sessão atual",
+    "Update Private Key Password" : "Atualizar Senha da Chave Privada ",
+    "Enable password recovery:" : "Ativar a recuperação da senha:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Ao ativar esta opção, irá poder obter o acesso aos seus ficheiros encriptados, se perder a senha"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/pt_PT.php b/apps/files_encryption/l10n/pt_PT.php
deleted file mode 100644
index e52165492d9..00000000000
--- a/apps/files_encryption/l10n/pt_PT.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Erro Desconhecido",
-"Missing recovery key password" => "Palavra-passe de recuperação em falta",
-"Please repeat the recovery key password" => "Repita a palavra-passe de recuperação",
-"Repeated recovery key password does not match the provided recovery key password" => "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
-"Recovery key successfully enabled" => "A chave de recuperação foi ativada com sucesso",
-"Could not disable recovery key. Please check your recovery key password!" => "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
-"Recovery key successfully disabled" => "A chave de recuperação foi desativada com sucesso",
-"Please provide the old recovery password" => "Escreva a palavra-passe de recuperação antiga",
-"Please provide a new recovery password" => "Escreva a nova palavra-passe de recuperação",
-"Please repeat the new recovery password" => "Escreva de novo a nova palavra-passe de recuperação",
-"Password successfully changed." => "Senha alterada com sucesso.",
-"Could not change the password. Maybe the old password was not correct." => "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
-"Private key password successfully updated." => "A senha da chave privada foi atualizada com sucesso. ",
-"Could not update the private key password. Maybe the old password was not correct." => "Não foi possível atualizar a senha da chave privada. A senha antiga poderia não estar correta.",
-"File recovery settings updated" => "As definições da recuperação de ficheiro foram atualizadas",
-"Could not update file recovery" => "Não foi possível atualizar a recuperação de ficheiro",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "A app de encriptação não foi inicializada! A app de encriptação poderá ter sido reativada durante a sua sessão. Por favor, tente terminar a sessão e iniciá-la de seguida para inicializar a app de encriptação.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "A sua chave privada não é válida! Provavelmente a senha foi alterada fora do %s (ex. a sua diretoria corporativa). Pode atualizar a sua senha da chave privada nas definições pessoais para recuperar o acesso aos seus ficheiros encriptados. ",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Erro desconhecido. Por favor, verifique as configurações do sistema ou entre em contacto com o seu administrador ",
-"Missing requirements." => "Requisitos em falta.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Por favor, certifique-se que o PHP 5.3.3 ou superior está instalado e que  o OpenSSL juntamente com a extensão PHP estão ativados e devidamente configurados. Por agora, a app de encriptação foi desativada.",
-"Following users are not set up for encryption:" => "Os utilizadores seguintes não estão configurados para encriptação:",
-"Initial encryption started... This can take some time. Please wait." => "A encriptação inicial foi iniciada ... Esta pode demorar algum tempo. Aguarde, por favor.",
-"Initial encryption running... Please try again later." => "A encriptação inicial está em execução ... Por favor, tente de novo mais tarde.",
-"Go directly to your %spersonal settings%s." => "Ir diretamente para as %sdefinições pessoais%s.",
-"Encryption" => "Encriptação",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "A Aplicação de Encriptação está ativada, mas as suas chaves não inicializaram. Por favor termine e inicie a sessão novamente",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Ativar a chave de recuperação (permite recuperar os ficheiros do utilizador, se perder a senha):",
-"Recovery key password" => "Senha da chave de recuperação",
-"Repeat Recovery key password" => "Contrassenha da chave de recuperação",
-"Enabled" => "Ativada",
-"Disabled" => "Desactivada",
-"Change recovery key password:" => "Alterar a senha da chave de recuperação:",
-"Old Recovery key password" => "Senha da chave de recuperação antiga",
-"New Recovery key password" => "Nova senha da chave de recuperação",
-"Repeat New Recovery key password" => "Contrassenha da nova chave de recuperação",
-"Change Password" => "Alterar a Senha",
-"Your private key password no longer matches your log-in password." => "A Password da sua chave privada não coincide mais com a password do seu login.",
-"Set your old private key password to your current log-in password:" => "Altere a password antiga da chave privada para a nova password do login:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Se não se lembra da senha antiga pode pedir ao administrador para recuperar os seus ficheiros. ",
-"Old log-in password" => "Senha de iniciar sessão antiga",
-"Current log-in password" => "Senha de iniciar sessão atual",
-"Update Private Key Password" => "Atualizar Senha da Chave Privada ",
-"Enable password recovery:" => "Ativar a recuperação da senha:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Ao ativar esta opção, irá poder obter o acesso aos seus ficheiros encriptados, se perder a senha"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ro.js b/apps/files_encryption/l10n/ro.js
new file mode 100644
index 00000000000..822cc4be58d
--- /dev/null
+++ b/apps/files_encryption/l10n/ro.js
@@ -0,0 +1,20 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Eroare necunoscută",
+    "Recovery key successfully enabled" : "Cheia de recupeare a fost activata cu succes",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!",
+    "Recovery key successfully disabled" : "Cheia de recuperare dezactivata cu succes",
+    "Password successfully changed." : "Parola a fost modificată cu succes.",
+    "Could not change the password. Maybe the old password was not correct." : "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
+    "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.",
+    "File recovery settings updated" : "Setarile pentru recuperarea fisierelor au fost actualizate",
+    "Could not update file recovery" : "Nu am putut actualiza recuperarea de fisiere",
+    "Encryption" : "Încriptare",
+    "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",
+    "Enabled" : "Activat",
+    "Disabled" : "Dezactivat",
+    "Change Password" : "Schimbă parola"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files_encryption/l10n/ro.json b/apps/files_encryption/l10n/ro.json
new file mode 100644
index 00000000000..3ac528a60ce
--- /dev/null
+++ b/apps/files_encryption/l10n/ro.json
@@ -0,0 +1,18 @@
+{ "translations": {
+    "Unknown error" : "Eroare necunoscută",
+    "Recovery key successfully enabled" : "Cheia de recupeare a fost activata cu succes",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!",
+    "Recovery key successfully disabled" : "Cheia de recuperare dezactivata cu succes",
+    "Password successfully changed." : "Parola a fost modificată cu succes.",
+    "Could not change the password. Maybe the old password was not correct." : "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
+    "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.",
+    "File recovery settings updated" : "Setarile pentru recuperarea fisierelor au fost actualizate",
+    "Could not update file recovery" : "Nu am putut actualiza recuperarea de fisiere",
+    "Encryption" : "Încriptare",
+    "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",
+    "Enabled" : "Activat",
+    "Disabled" : "Dezactivat",
+    "Change Password" : "Schimbă parola"
+},"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_encryption/l10n/ro.php b/apps/files_encryption/l10n/ro.php
deleted file mode 100644
index 07b12b0f8a8..00000000000
--- a/apps/files_encryption/l10n/ro.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Eroare necunoscută",
-"Recovery key successfully enabled" => "Cheia de recupeare a fost activata cu succes",
-"Could not disable recovery key. Please check your recovery key password!" => "Nu am putut dezactiva cheia de recuperare. Verifica parola de recuperare!",
-"Recovery key successfully disabled" => "Cheia de recuperare dezactivata cu succes",
-"Password successfully changed." => "Parola a fost modificată cu succes.",
-"Could not change the password. Maybe the old password was not correct." => "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
-"Private key password successfully updated." => "Cheia privata a fost actualizata cu succes",
-"Could not update the private key password. Maybe the old password was not correct." => "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.",
-"File recovery settings updated" => "Setarile pentru recuperarea fisierelor au fost actualizate",
-"Could not update file recovery" => "Nu am putut actualiza recuperarea de fisiere",
-"Encryption" => "Încriptare",
-"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",
-"Enabled" => "Activat",
-"Disabled" => "Dezactivat",
-"Change Password" => "Schimbă parola"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_encryption/l10n/ru.js b/apps/files_encryption/l10n/ru.js
new file mode 100644
index 00000000000..2d035d75f5e
--- /dev/null
+++ b/apps/files_encryption/l10n/ru.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Неизвестная ошибка",
+    "Missing recovery key password" : "Отсутствует пароль восстановления ключа",
+    "Please repeat the recovery key password" : "Пожалуйста, повторите пароль восстановления ключа",
+    "Repeated recovery key password does not match the provided recovery key password" : "Пароль восстановления ключа и его повтор не совпадают",
+    "Recovery key successfully enabled" : "Ключ восстановления успешно установлен",
+    "Could not disable recovery key. Please check your recovery key password!" : "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
+    "Recovery key successfully disabled" : "Ключ восстановления успешно отключен",
+    "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." : "Невозможно изменить пароль. Возможно старый пароль не был верен.",
+    "Private key password successfully updated." : "Пароль секретного ключа успешно обновлён.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
+    "File recovery settings updated" : "Настройки файла восстановления обновлены",
+    "Could not update file recovery" : "Невозможно обновить файл восстановления",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу расшифровать файл, возможно это опубликованный файл. Пожалуйста, попросите владельца файла поделиться им  с вами еще раз.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Неизвестная ошибка. Пожалуйста, проверьте системные настройки или свяжитесь с администратором",
+    "Missing requirements." : "Требования отсутствуют.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
+    "Following users are not set up for encryption:" : "Для следующих пользователей шифрование не настроено:",
+    "Initial encryption started... This can take some time. Please wait." : "Начато начальное шифрование... Это может занять какое-то время. Пожалуйста, подождите.",
+    "Initial encryption running... Please try again later." : "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже.",
+    "Go directly to your %spersonal settings%s." : "Перейти напряму к вашим %spersonal settings%s.",
+    "Encryption" : "Шифрование",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
+    "Recovery key password" : "Пароль для ключа восстановления",
+    "Repeat Recovery key password" : "Повторите пароль восстановления ключа",
+    "Enabled" : "Включено",
+    "Disabled" : "Отключено",
+    "Change recovery key password:" : "Сменить пароль для ключа восстановления:",
+    "Old Recovery key password" : "Старый пароль для ключа восстановления",
+    "New Recovery key password" : "Новый пароль для ключа восстановления",
+    "Repeat New Recovery key password" : "Повторите новый пароль восстановления ключа",
+    "Change Password" : "Изменить пароль",
+    "Your private key password no longer matches your log-in password." : "Пароль от Вашего закрытого ключа больше не соответствует паролю от вашей учетной записи.",
+    "Set your old private key password to your current log-in password:" : "Замените старый пароль от закрытого ключа на новый пароль входа.",
+    " 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" : "Текущйи пароль для входа",
+    "Update Private Key Password" : "Обновить пароль от секретного ключа",
+    "Enable password recovery:" : "Включить восстановление пароля:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
+},
+"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_encryption/l10n/ru.json b/apps/files_encryption/l10n/ru.json
new file mode 100644
index 00000000000..ce66622d6be
--- /dev/null
+++ b/apps/files_encryption/l10n/ru.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Неизвестная ошибка",
+    "Missing recovery key password" : "Отсутствует пароль восстановления ключа",
+    "Please repeat the recovery key password" : "Пожалуйста, повторите пароль восстановления ключа",
+    "Repeated recovery key password does not match the provided recovery key password" : "Пароль восстановления ключа и его повтор не совпадают",
+    "Recovery key successfully enabled" : "Ключ восстановления успешно установлен",
+    "Could not disable recovery key. Please check your recovery key password!" : "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
+    "Recovery key successfully disabled" : "Ключ восстановления успешно отключен",
+    "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." : "Невозможно изменить пароль. Возможно старый пароль не был верен.",
+    "Private key password successfully updated." : "Пароль секретного ключа успешно обновлён.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
+    "File recovery settings updated" : "Настройки файла восстановления обновлены",
+    "Could not update file recovery" : "Невозможно обновить файл восстановления",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу расшифровать файл, возможно это опубликованный файл. Пожалуйста, попросите владельца файла поделиться им  с вами еще раз.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Неизвестная ошибка. Пожалуйста, проверьте системные настройки или свяжитесь с администратором",
+    "Missing requirements." : "Требования отсутствуют.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
+    "Following users are not set up for encryption:" : "Для следующих пользователей шифрование не настроено:",
+    "Initial encryption started... This can take some time. Please wait." : "Начато начальное шифрование... Это может занять какое-то время. Пожалуйста, подождите.",
+    "Initial encryption running... Please try again later." : "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже.",
+    "Go directly to your %spersonal settings%s." : "Перейти напряму к вашим %spersonal settings%s.",
+    "Encryption" : "Шифрование",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
+    "Recovery key password" : "Пароль для ключа восстановления",
+    "Repeat Recovery key password" : "Повторите пароль восстановления ключа",
+    "Enabled" : "Включено",
+    "Disabled" : "Отключено",
+    "Change recovery key password:" : "Сменить пароль для ключа восстановления:",
+    "Old Recovery key password" : "Старый пароль для ключа восстановления",
+    "New Recovery key password" : "Новый пароль для ключа восстановления",
+    "Repeat New Recovery key password" : "Повторите новый пароль восстановления ключа",
+    "Change Password" : "Изменить пароль",
+    "Your private key password no longer matches your log-in password." : "Пароль от Вашего закрытого ключа больше не соответствует паролю от вашей учетной записи.",
+    "Set your old private key password to your current log-in password:" : "Замените старый пароль от закрытого ключа на новый пароль входа.",
+    " 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" : "Текущйи пароль для входа",
+    "Update Private Key Password" : "Обновить пароль от секретного ключа",
+    "Enable password recovery:" : "Включить восстановление пароля:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
+},"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_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
deleted file mode 100644
index 0a4e2cbbc27..00000000000
--- a/apps/files_encryption/l10n/ru.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Неизвестная ошибка",
-"Missing recovery key password" => "Отсутствует пароль восстановления ключа",
-"Please repeat the recovery key password" => "Пожалуйста, повторите пароль восстановления ключа",
-"Repeated recovery key password does not match the provided recovery key password" => "Пароль восстановления ключа и его повтор не совпадают",
-"Recovery key successfully enabled" => "Ключ восстановления успешно установлен",
-"Could not disable recovery key. Please check your recovery key password!" => "Невозможно выключить ключ восстановления. Проверьте правильность пароля от ключа!",
-"Recovery key successfully disabled" => "Ключ восстановления успешно отключен",
-"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." => "Невозможно изменить пароль. Возможно старый пароль не был верен.",
-"Private key password successfully updated." => "Пароль секретного ключа успешно обновлён.",
-"Could not update the private key password. Maybe the old password was not correct." => "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
-"File recovery settings updated" => "Настройки файла восстановления обновлены",
-"Could not update file recovery" => "Невозможно обновить файл восстановления",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Не могу расшифровать файл, возможно это опубликованный файл. Пожалуйста, попросите владельца файла поделиться им  с вами еще раз.",
-"Unknown error. Please check your system settings or contact your administrator" => "Неизвестная ошибка. Пожалуйста, проверьте системные настройки или свяжитесь с администратором",
-"Missing requirements." => "Требования отсутствуют.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Пожалуйста, убедитесь, что версия PHP 5.3.3 или новее, а также, что OpenSSL и соответствующее расширение PHP включены и правильно настроены. На данный момент приложение шифрования отключено.",
-"Following users are not set up for encryption:" => "Для следующих пользователей шифрование не настроено:",
-"Initial encryption started... This can take some time. Please wait." => "Начато начальное шифрование... Это может занять какое-то время. Пожалуйста, подождите.",
-"Initial encryption running... Please try again later." => "Работает первоначальное шифрование... Пожалуйста, повторите попытку позже.",
-"Go directly to your %spersonal settings%s." => "Перейти напряму к вашим %spersonal settings%s.",
-"Encryption" => "Шифрование",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Приложение для шифрования активно, но ваши ключи не инициализированы, пожалуйста, перелогиньтесь",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Включить ключ восстановления (позволяет пользователям восстановить файлы при потере пароля):",
-"Recovery key password" => "Пароль для ключа восстановления",
-"Repeat Recovery key password" => "Повторите пароль восстановления ключа",
-"Enabled" => "Включено",
-"Disabled" => "Отключено",
-"Change recovery key password:" => "Сменить пароль для ключа восстановления:",
-"Old Recovery key password" => "Старый пароль для ключа восстановления",
-"New Recovery key password" => "Новый пароль для ключа восстановления",
-"Repeat New Recovery key password" => "Повторите новый пароль восстановления ключа",
-"Change Password" => "Изменить пароль",
-"Your private key password no longer matches your log-in password." => "Пароль от Вашего закрытого ключа больше не соответствует паролю от вашей учетной записи.",
-"Set your old private key password to your current log-in password:" => "Замените старый пароль от закрытого ключа на новый пароль входа.",
-" 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" => "Текущйи пароль для входа",
-"Update Private Key Password" => "Обновить пароль от секретного ключа",
-"Enable password recovery:" => "Включить восстановление пароля:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
-);
-$PLURAL_FORMS = "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_encryption/l10n/si_LK.js b/apps/files_encryption/l10n/si_LK.js
new file mode 100644
index 00000000000..befc19388e0
--- /dev/null
+++ b/apps/files_encryption/l10n/si_LK.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Encryption" : "ගුප්ත කේතනය"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/si_LK.json b/apps/files_encryption/l10n/si_LK.json
new file mode 100644
index 00000000000..3c619c7d8c4
--- /dev/null
+++ b/apps/files_encryption/l10n/si_LK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Encryption" : "ගුප්ත කේතනය"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/si_LK.php b/apps/files_encryption/l10n/si_LK.php
deleted file mode 100644
index 4c7dc957bfe..00000000000
--- a/apps/files_encryption/l10n/si_LK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Encryption" => "ගුප්ත කේතනය"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/sk_SK.js b/apps/files_encryption/l10n/sk_SK.js
new file mode 100644
index 00000000000..ac61753f09d
--- /dev/null
+++ b/apps/files_encryption/l10n/sk_SK.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Neznáma chyba",
+    "Recovery key successfully enabled" : "Záchranný kľúč bol úspešne povolený",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+    "Recovery key successfully disabled" : "Záchranný kľúč bol úspešne zakázaný",
+    "Password successfully changed." : "Heslo úspešne zmenené.",
+    "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+    "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+    "File recovery settings updated" : "Nastavenie obnovy súborov aktualizované",
+    "Could not update file recovery" : "Nemožno aktualizovať obnovenie súborov",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná počas vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Váš súkromný kľúč nie je platný! Možno bolo vaše heslo zmenené mimo %s (napr. firemný priečinok). Môžete si aktualizovať heslo svojho ​​súkromného kľúča vo vašom osobnom nastavení, ak si chcete obnoviť prístup k šifrovaným súborom.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Neznáma chyba. Skontrolujte si vaše systémové nastavenia alebo kontaktujte administrátora",
+    "Missing requirements." : "Chýbajúce požiadavky.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.",
+    "Following users are not set up for encryption:" : "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
+    "Initial encryption started... This can take some time. Please wait." : "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.",
+    "Initial encryption running... Please try again later." : "Počiatočné šifrovanie beží... Skúste to neskôr znovu.",
+    "Go directly to your %spersonal settings%s." : "Prejsť priamo do svojho %sosobného nastavenia%s.",
+    "Encryption" : "Šifrovanie",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
+    "Recovery key password" : "Heslo obnovovacieho kľúča",
+    "Repeat Recovery key password" : "Zopakujte heslo kľúča pre obnovu",
+    "Enabled" : "Povolené",
+    "Disabled" : "Zakázané",
+    "Change recovery key password:" : "Zmeniť heslo obnovovacieho kľúča:",
+    "Old Recovery key password" : "Staré heslo obnovovacieho kľúča",
+    "New Recovery key password" : "Nové heslo obnovovacieho kľúča",
+    "Repeat New Recovery key password" : "Zopakujte nové heslo kľúča pre obnovu",
+    "Change Password" : "Zmeniť heslo",
+    "Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
+    "Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+    "Old log-in password" : "Staré prihlasovacie heslo",
+    "Current log-in password" : "Súčasné prihlasovacie heslo",
+    "Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
+    "Enable password recovery:" : "Povoliť obnovu hesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_encryption/l10n/sk_SK.json b/apps/files_encryption/l10n/sk_SK.json
new file mode 100644
index 00000000000..e1887527634
--- /dev/null
+++ b/apps/files_encryption/l10n/sk_SK.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Unknown error" : "Neznáma chyba",
+    "Recovery key successfully enabled" : "Záchranný kľúč bol úspešne povolený",
+    "Could not disable recovery key. Please check your recovery key password!" : "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
+    "Recovery key successfully disabled" : "Záchranný kľúč bol úspešne zakázaný",
+    "Password successfully changed." : "Heslo úspešne zmenené.",
+    "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
+    "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
+    "File recovery settings updated" : "Nastavenie obnovy súborov aktualizované",
+    "Could not update file recovery" : "Nemožno aktualizovať obnovenie súborov",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná počas vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Váš súkromný kľúč nie je platný! Možno bolo vaše heslo zmenené mimo %s (napr. firemný priečinok). Môžete si aktualizovať heslo svojho ​​súkromného kľúča vo vašom osobnom nastavení, ak si chcete obnoviť prístup k šifrovaným súborom.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Neznáma chyba. Skontrolujte si vaše systémové nastavenia alebo kontaktujte administrátora",
+    "Missing requirements." : "Chýbajúce požiadavky.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.",
+    "Following users are not set up for encryption:" : "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
+    "Initial encryption started... This can take some time. Please wait." : "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.",
+    "Initial encryption running... Please try again later." : "Počiatočné šifrovanie beží... Skúste to neskôr znovu.",
+    "Go directly to your %spersonal settings%s." : "Prejsť priamo do svojho %sosobného nastavenia%s.",
+    "Encryption" : "Šifrovanie",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
+    "Recovery key password" : "Heslo obnovovacieho kľúča",
+    "Repeat Recovery key password" : "Zopakujte heslo kľúča pre obnovu",
+    "Enabled" : "Povolené",
+    "Disabled" : "Zakázané",
+    "Change recovery key password:" : "Zmeniť heslo obnovovacieho kľúča:",
+    "Old Recovery key password" : "Staré heslo obnovovacieho kľúča",
+    "New Recovery key password" : "Nové heslo obnovovacieho kľúča",
+    "Repeat New Recovery key password" : "Zopakujte nové heslo kľúča pre obnovu",
+    "Change Password" : "Zmeniť heslo",
+    "Your private key password no longer matches your log-in password." : "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
+    "Set your old private key password to your current log-in password:" : "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
+    "Old log-in password" : "Staré prihlasovacie heslo",
+    "Current log-in password" : "Súčasné prihlasovacie heslo",
+    "Update Private Key Password" : "Aktualizovať heslo súkromného kľúča",
+    "Enable password recovery:" : "Povoliť obnovu hesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
deleted file mode 100644
index 2a35448539f..00000000000
--- a/apps/files_encryption/l10n/sk_SK.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Neznáma chyba",
-"Recovery key successfully enabled" => "Záchranný kľúč bol úspešne povolený",
-"Could not disable recovery key. Please check your recovery key password!" => "Nepodarilo sa zakázať záchranný kľúč. Skontrolujte prosím Vaše heslo záchranného kľúča!",
-"Recovery key successfully disabled" => "Záchranný kľúč bol úspešne zakázaný",
-"Password successfully changed." => "Heslo úspešne zmenené.",
-"Could not change the password. Maybe the old password was not correct." => "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
-"Private key password successfully updated." => "Heslo súkromného kľúča je úspešne aktualizované.",
-"Could not update the private key password. Maybe the old password was not correct." => "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
-"File recovery settings updated" => "Nastavenie obnovy súborov aktualizované",
-"Could not update file recovery" => "Nemožno aktualizovať obnovenie súborov",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná počas vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Váš súkromný kľúč nie je platný! Možno bolo vaše heslo zmenené mimo %s (napr. firemný priečinok). Môžete si aktualizovať heslo svojho ​​súkromného kľúča vo vašom osobnom nastavení, ak si chcete obnoviť prístup k šifrovaným súborom.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Neznáma chyba. Skontrolujte si vaše systémové nastavenia alebo kontaktujte administrátora",
-"Missing requirements." => "Chýbajúce požiadavky.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Prosím uistite sa, že PHP verzie 5.3.3 alebo novšej je nainštalované a tiež, že OpenSSL knižnica spolu z PHP rozšírením je povolená a konfigurovaná správne. Nateraz bola aplikácia šifrovania zablokovaná.",
-"Following users are not set up for encryption:" => "Nasledujúci používatelia nie sú nastavení pre šifrovanie:",
-"Initial encryption started... This can take some time. Please wait." => "Počiatočné šifrovanie započalo ... To môže nejakú dobu trvať. Čakajte prosím.",
-"Initial encryption running... Please try again later." => "Počiatočné šifrovanie beží... Skúste to neskôr znovu.",
-"Go directly to your %spersonal settings%s." => "Prejsť priamo do svojho %sosobného nastavenia%s.",
-"Encryption" => "Šifrovanie",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Povoliť obnovovací kľúč (umožňuje obnoviť používateľské súbory v prípade straty hesla):",
-"Recovery key password" => "Heslo obnovovacieho kľúča",
-"Repeat Recovery key password" => "Zopakujte heslo kľúča pre obnovu",
-"Enabled" => "Povolené",
-"Disabled" => "Zakázané",
-"Change recovery key password:" => "Zmeniť heslo obnovovacieho kľúča:",
-"Old Recovery key password" => "Staré heslo obnovovacieho kľúča",
-"New Recovery key password" => "Nové heslo obnovovacieho kľúča",
-"Repeat New Recovery key password" => "Zopakujte nové heslo kľúča pre obnovu",
-"Change Password" => "Zmeniť heslo",
-"Your private key password no longer matches your log-in password." => "Heslo vášho súkromného kľúča sa nezhoduje v vašim prihlasovacím heslom.",
-"Set your old private key password to your current log-in password:" => "Zmeňte si vaše staré heslo súkromného kľúča na rovnaké, aké je vaše aktuálne prihlasovacie heslo:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Ak si nepamätáte svoje staré heslo, môžete požiadať administrátora o obnovenie svojich súborov.",
-"Old log-in password" => "Staré prihlasovacie heslo",
-"Current log-in password" => "Súčasné prihlasovacie heslo",
-"Update Private Key Password" => "Aktualizovať heslo súkromného kľúča",
-"Enable password recovery:" => "Povoliť obnovu hesla:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Povolenie Vám umožní znovu získať prístup k Vašim zašifrovaným súborom, ak stratíte heslo"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_encryption/l10n/sl.js b/apps/files_encryption/l10n/sl.js
new file mode 100644
index 00000000000..f0623de697f
--- /dev/null
+++ b/apps/files_encryption/l10n/sl.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Neznana napaka",
+    "Missing recovery key password" : "Manjka ključ za obnovitev",
+    "Please repeat the recovery key password" : "Ponovite vpis ključa za obnovitev",
+    "Repeated recovery key password does not match the provided recovery key password" : "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa",
+    "Recovery key successfully enabled" : "Ključ za obnovitev gesla je uspešno nastavljen",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
+    "Recovery key successfully disabled" : "Ključ za obnovitev gesla je uspešno onemogočen",
+    "Please provide the old recovery password" : "Vpišite star ključ za obnovitev",
+    "Please provide a new recovery password" : "Vpišite nov ključ za obnovitev",
+    "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev",
+    "Password successfully changed." : "Geslo je uspešno spremenjeno.",
+    "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
+    "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Zasebnega ključa za geslo ni mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
+    "File recovery settings updated" : "Nastavitve obnavljanja dokumentov so posodobljene",
+    "Could not update file recovery" : "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Program za šifriranje ni začet. Morda je bil program ponovno omogočen šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Zasebni ključ ni veljaven. Najverjetneje je bilo geslo spremenjeno izven %s (najverjetneje je to poslovna mapa). Geslo lahko posodobite med osebnimi nastavitvami in s tem obnovite dostop do šifriranih datotek.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Neznana napaka. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema.",
+    "Missing requirements." : "Manjkajoče zahteve",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Preverite, ali je na strežniku nameščen paket PHP 5.3.3 ali novejši, da je omogočen in pravilno nastavljen PHP OpenSSL. Z obstoječimi možnostmi šifriranje ni mogoče.",
+    "Following users are not set up for encryption:" : "Navedeni uporabniki še nimajo nastavljenega šifriranja:",
+    "Initial encryption started... This can take some time. Please wait." : "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.",
+    "Initial encryption running... Please try again later." : "Začetno šifriranje je v teku ... Poskusite kasneje.",
+    "Go directly to your %spersonal settings%s." : "Oglejte si %sosebne nastavitve%s.",
+    "Encryption" : "Šifriranje",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Omogoči ključ za obnovitev datotek (v primeru izgube gesla):",
+    "Recovery key password" : "Ključ za obnovitev gesla",
+    "Repeat Recovery key password" : "Ponovi ključ za obnovitev gesla",
+    "Enabled" : "Omogočeno",
+    "Disabled" : "Onemogočeno",
+    "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:",
+    "Old Recovery key password" : "Stari ključ za obnovitev gesla",
+    "New Recovery key password" : "Novi ključ za obnovitev gesla",
+    "Repeat New Recovery key password" : "Ponovi novi ključ za obnovitev gesla",
+    "Change Password" : "Spremeni geslo",
+    "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
+    "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema.",
+    "Old log-in password" : "Staro geslo",
+    "Current log-in password" : "Trenutno geslo",
+    "Update Private Key Password" : "Posodobi zasebni ključ",
+    "Enable password recovery:" : "Omogoči obnovitev gesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da boste geslo pozabili."
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/files_encryption/l10n/sl.json b/apps/files_encryption/l10n/sl.json
new file mode 100644
index 00000000000..4a692bfebae
--- /dev/null
+++ b/apps/files_encryption/l10n/sl.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Neznana napaka",
+    "Missing recovery key password" : "Manjka ključ za obnovitev",
+    "Please repeat the recovery key password" : "Ponovite vpis ključa za obnovitev",
+    "Repeated recovery key password does not match the provided recovery key password" : "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa",
+    "Recovery key successfully enabled" : "Ključ za obnovitev gesla je uspešno nastavljen",
+    "Could not disable recovery key. Please check your recovery key password!" : "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
+    "Recovery key successfully disabled" : "Ključ za obnovitev gesla je uspešno onemogočen",
+    "Please provide the old recovery password" : "Vpišite star ključ za obnovitev",
+    "Please provide a new recovery password" : "Vpišite nov ključ za obnovitev",
+    "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev",
+    "Password successfully changed." : "Geslo je uspešno spremenjeno.",
+    "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
+    "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Zasebnega ključa za geslo ni mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
+    "File recovery settings updated" : "Nastavitve obnavljanja dokumentov so posodobljene",
+    "Could not update file recovery" : "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Program za šifriranje ni začet. Morda je bil program ponovno omogočen šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Zasebni ključ ni veljaven. Najverjetneje je bilo geslo spremenjeno izven %s (najverjetneje je to poslovna mapa). Geslo lahko posodobite med osebnimi nastavitvami in s tem obnovite dostop do šifriranih datotek.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Neznana napaka. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema.",
+    "Missing requirements." : "Manjkajoče zahteve",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Preverite, ali je na strežniku nameščen paket PHP 5.3.3 ali novejši, da je omogočen in pravilno nastavljen PHP OpenSSL. Z obstoječimi možnostmi šifriranje ni mogoče.",
+    "Following users are not set up for encryption:" : "Navedeni uporabniki še nimajo nastavljenega šifriranja:",
+    "Initial encryption started... This can take some time. Please wait." : "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.",
+    "Initial encryption running... Please try again later." : "Začetno šifriranje je v teku ... Poskusite kasneje.",
+    "Go directly to your %spersonal settings%s." : "Oglejte si %sosebne nastavitve%s.",
+    "Encryption" : "Šifriranje",
+    "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.",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Omogoči ključ za obnovitev datotek (v primeru izgube gesla):",
+    "Recovery key password" : "Ključ za obnovitev gesla",
+    "Repeat Recovery key password" : "Ponovi ključ za obnovitev gesla",
+    "Enabled" : "Omogočeno",
+    "Disabled" : "Onemogočeno",
+    "Change recovery key password:" : "Spremeni ključ za obnovitev gesla:",
+    "Old Recovery key password" : "Stari ključ za obnovitev gesla",
+    "New Recovery key password" : "Novi ključ za obnovitev gesla",
+    "Repeat New Recovery key password" : "Ponovi novi ključ za obnovitev gesla",
+    "Change Password" : "Spremeni geslo",
+    "Your private key password no longer matches your log-in password." : "Zasebno geslo ni več skladno s prijavnim geslom.",
+    "Set your old private key password to your current log-in password:" : "Nastavite star zasebni ključ na trenutno prijavno geslo:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema.",
+    "Old log-in password" : "Staro geslo",
+    "Current log-in password" : "Trenutno geslo",
+    "Update Private Key Password" : "Posodobi zasebni ključ",
+    "Enable password recovery:" : "Omogoči obnovitev gesla:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da boste geslo pozabili."
+},"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_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
deleted file mode 100644
index 83fef18ea0a..00000000000
--- a/apps/files_encryption/l10n/sl.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Neznana napaka",
-"Missing recovery key password" => "Manjka ključ za obnovitev",
-"Please repeat the recovery key password" => "Ponovite vpis ključa za obnovitev",
-"Repeated recovery key password does not match the provided recovery key password" => "Ponovljen vpis ključa za obnovitev ni enak prvemu vpisu tega ključa",
-"Recovery key successfully enabled" => "Ključ za obnovitev gesla je uspešno nastavljen",
-"Could not disable recovery key. Please check your recovery key password!" => "Ključa za obnovitev gesla ni mogoče onemogočiti. Preverite ključ!",
-"Recovery key successfully disabled" => "Ključ za obnovitev gesla je uspešno onemogočen",
-"Please provide the old recovery password" => "Vpišite star ključ za obnovitev",
-"Please provide a new recovery password" => "Vpišite nov ključ za obnovitev",
-"Please repeat the new recovery password" => "Ponovno vpišite nov ključ za obnovitev",
-"Password successfully changed." => "Geslo je uspešno spremenjeno.",
-"Could not change the password. Maybe the old password was not correct." => "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
-"Private key password successfully updated." => "Zasebni ključ za geslo je uspešno posodobljen.",
-"Could not update the private key password. Maybe the old password was not correct." => "Zasebnega ključa za geslo ni mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
-"File recovery settings updated" => "Nastavitve obnavljanja dokumentov so posodobljene",
-"Could not update file recovery" => "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Program za šifriranje ni začet. Morda je bil program ponovno omogočen šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Zasebni ključ ni veljaven. Najverjetneje je bilo geslo spremenjeno izven %s (najverjetneje je to poslovna mapa). Geslo lahko posodobite med osebnimi nastavitvami in s tem obnovite dostop do šifriranih datotek.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Neznana napaka. Preverite nastavitve sistema ali pa stopite v stik s skrbnikom sistema.",
-"Missing requirements." => "Manjkajoče zahteve",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Preverite, ali je na strežniku nameščen paket PHP 5.3.3 ali novejši, da je omogočen in pravilno nastavljen PHP OpenSSL. Z obstoječimi možnostmi šifriranje ni mogoče.",
-"Following users are not set up for encryption:" => "Navedeni uporabniki še nimajo nastavljenega šifriranja:",
-"Initial encryption started... This can take some time. Please wait." => "Začetno šifriranje je začeto ... Opravilo je lahko dolgotrajno.",
-"Initial encryption running... Please try again later." => "Začetno šifriranje je v teku ... Poskusite kasneje.",
-"Go directly to your %spersonal settings%s." => "Oglejte si %sosebne nastavitve%s.",
-"Encryption" => "Šifriranje",
-"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.",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Omogoči ključ za obnovitev datotek (v primeru izgube gesla):",
-"Recovery key password" => "Ključ za obnovitev gesla",
-"Repeat Recovery key password" => "Ponovi ključ za obnovitev gesla",
-"Enabled" => "Omogočeno",
-"Disabled" => "Onemogočeno",
-"Change recovery key password:" => "Spremeni ključ za obnovitev gesla:",
-"Old Recovery key password" => "Stari ključ za obnovitev gesla",
-"New Recovery key password" => "Novi ključ za obnovitev gesla",
-"Repeat New Recovery key password" => "Ponovi novi ključ za obnovitev gesla",
-"Change Password" => "Spremeni geslo",
-"Your private key password no longer matches your log-in password." => "Zasebno geslo ni več skladno s prijavnim geslom.",
-"Set your old private key password to your current log-in password:" => "Nastavite star zasebni ključ na trenutno prijavno geslo:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Če ste pozabili svoje geslo, lahko vaše datoteke obnovi le skrbnik sistema.",
-"Old log-in password" => "Staro geslo",
-"Current log-in password" => "Trenutno geslo",
-"Update Private Key Password" => "Posodobi zasebni ključ",
-"Enable password recovery:" => "Omogoči obnovitev gesla:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Nastavitev te možnosti omogoča ponovno pridobitev dostopa do šifriranih datotek, v primeru, da boste geslo pozabili."
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_encryption/l10n/sq.js b/apps/files_encryption/l10n/sq.js
new file mode 100644
index 00000000000..f3c5d10cf0a
--- /dev/null
+++ b/apps/files_encryption/l10n/sq.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Gabim panjohur",
+    "Encryption" : "Kodifikimi"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/sq.json b/apps/files_encryption/l10n/sq.json
new file mode 100644
index 00000000000..b4fe571e7e0
--- /dev/null
+++ b/apps/files_encryption/l10n/sq.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Unknown error" : "Gabim panjohur",
+    "Encryption" : "Kodifikimi"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/sq.php b/apps/files_encryption/l10n/sq.php
deleted file mode 100644
index 85cb322bd8c..00000000000
--- a/apps/files_encryption/l10n/sq.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Gabim panjohur",
-"Encryption" => "Kodifikimi"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/sr.js b/apps/files_encryption/l10n/sr.js
new file mode 100644
index 00000000000..d6f89d85ca6
--- /dev/null
+++ b/apps/files_encryption/l10n/sr.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Encryption" : "Шифровање"
+},
+"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_encryption/l10n/sr.json b/apps/files_encryption/l10n/sr.json
new file mode 100644
index 00000000000..db6beb276cb
--- /dev/null
+++ b/apps/files_encryption/l10n/sr.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Encryption" : "Шифровање"
+},"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_encryption/l10n/sr.php b/apps/files_encryption/l10n/sr.php
deleted file mode 100644
index 8a291faed23..00000000000
--- a/apps/files_encryption/l10n/sr.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Encryption" => "Шифровање"
-);
-$PLURAL_FORMS = "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_encryption/l10n/sv.js b/apps/files_encryption/l10n/sv.js
new file mode 100644
index 00000000000..f8ef7040926
--- /dev/null
+++ b/apps/files_encryption/l10n/sv.js
@@ -0,0 +1,43 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Okänt fel",
+    "Recovery key successfully enabled" : "Återställningsnyckeln har framgångsrikt aktiverats",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+    "Recovery key successfully disabled" : "Återställningsnyckeln har framgångsrikt inaktiverats",
+    "Password successfully changed." : "Ändringen av lösenordet lyckades.",
+    "Could not change the password. Maybe the old password was not correct." : "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
+    "Private key password successfully updated." : "Den privata nyckelns lösenord uppdaterades utan problem.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
+    "File recovery settings updated" : "Inställningarna för filåterställning har uppdaterats",
+    "Could not update file recovery" : "Kunde inte uppdatera filåterställning",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför %s (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Okänt fel. Kontrollera dina systeminställningar eller kontakta din administratör",
+    "Missing requirements." : "Krav som saknas",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
+    "Following users are not set up for encryption:" : "Följande användare har inte aktiverat kryptering:",
+    "Initial encryption started... This can take some time. Please wait." : "Initiala krypteringen har påbörjats... Detta kan ta lite tid. Var god vänta.",
+    "Initial encryption running... Please try again later." : "Initiala krypteringen körs... Var god försök igen senare.",
+    "Go directly to your %spersonal settings%s." : "Gå direkt till dina %segna inställningar%s.",
+    "Encryption" : "Kryptering",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
+    "Recovery key password" : "Lösenord för återställningsnyckel",
+    "Repeat Recovery key password" : "Upprepa återställningsnyckelns lösenord",
+    "Enabled" : "Aktiverad",
+    "Disabled" : "Inaktiverad",
+    "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
+    "Old Recovery key password" : "Gammalt lösenord för återställningsnyckel",
+    "New Recovery key password" : "Nytt lösenord för återställningsnyckel",
+    "Repeat New Recovery key password" : "Upprepa lösenord för ny återställningsnyckel",
+    "Change Password" : "Byt lösenord",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+    "Old log-in password" : "Gammalt inloggningslösenord",
+    "Current log-in password" : "Nuvarande inloggningslösenord",
+    "Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
+    "Enable password recovery:" : "Aktivera lösenordsåterställning",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/sv.json b/apps/files_encryption/l10n/sv.json
new file mode 100644
index 00000000000..f94da503843
--- /dev/null
+++ b/apps/files_encryption/l10n/sv.json
@@ -0,0 +1,41 @@
+{ "translations": {
+    "Unknown error" : "Okänt fel",
+    "Recovery key successfully enabled" : "Återställningsnyckeln har framgångsrikt aktiverats",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
+    "Recovery key successfully disabled" : "Återställningsnyckeln har framgångsrikt inaktiverats",
+    "Password successfully changed." : "Ändringen av lösenordet lyckades.",
+    "Could not change the password. Maybe the old password was not correct." : "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
+    "Private key password successfully updated." : "Den privata nyckelns lösenord uppdaterades utan problem.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
+    "File recovery settings updated" : "Inställningarna för filåterställning har uppdaterats",
+    "Could not update file recovery" : "Kunde inte uppdatera filåterställning",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför %s (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Okänt fel. Kontrollera dina systeminställningar eller kontakta din administratör",
+    "Missing requirements." : "Krav som saknas",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
+    "Following users are not set up for encryption:" : "Följande användare har inte aktiverat kryptering:",
+    "Initial encryption started... This can take some time. Please wait." : "Initiala krypteringen har påbörjats... Detta kan ta lite tid. Var god vänta.",
+    "Initial encryption running... Please try again later." : "Initiala krypteringen körs... Var god försök igen senare.",
+    "Go directly to your %spersonal settings%s." : "Gå direkt till dina %segna inställningar%s.",
+    "Encryption" : "Kryptering",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
+    "Recovery key password" : "Lösenord för återställningsnyckel",
+    "Repeat Recovery key password" : "Upprepa återställningsnyckelns lösenord",
+    "Enabled" : "Aktiverad",
+    "Disabled" : "Inaktiverad",
+    "Change recovery key password:" : "Ändra lösenord för återställningsnyckel:",
+    "Old Recovery key password" : "Gammalt lösenord för återställningsnyckel",
+    "New Recovery key password" : "Nytt lösenord för återställningsnyckel",
+    "Repeat New Recovery key password" : "Upprepa lösenord för ny återställningsnyckel",
+    "Change Password" : "Byt lösenord",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
+    "Old log-in password" : "Gammalt inloggningslösenord",
+    "Current log-in password" : "Nuvarande inloggningslösenord",
+    "Update Private Key Password" : "Uppdatera lösenordet för din privata nyckel",
+    "Enable password recovery:" : "Aktivera lösenordsåterställning",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/sv.php b/apps/files_encryption/l10n/sv.php
deleted file mode 100644
index 896e53b1397..00000000000
--- a/apps/files_encryption/l10n/sv.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Okänt fel",
-"Recovery key successfully enabled" => "Återställningsnyckeln har framgångsrikt aktiverats",
-"Could not disable recovery key. Please check your recovery key password!" => "Kunde inte inaktivera återställningsnyckeln. Vänligen kontrollera ditt lösenord för återställningsnyckeln!",
-"Recovery key successfully disabled" => "Återställningsnyckeln har framgångsrikt inaktiverats",
-"Password successfully changed." => "Ändringen av lösenordet lyckades.",
-"Could not change the password. Maybe the old password was not correct." => "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
-"Private key password successfully updated." => "Den privata nyckelns lösenord uppdaterades utan problem.",
-"Could not update the private key password. Maybe the old password was not correct." => "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
-"File recovery settings updated" => "Inställningarna för filåterställning har uppdaterats",
-"Could not update file recovery" => "Kunde inte uppdatera filåterställning",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Din privata lösenordsnyckel är inte giltig! Troligen har ditt lösenord ändrats utanför %s (t.ex. i företagets katalogtjänst). Du kan uppdatera den privata lösenordsnyckeln under dina personliga inställningar för att återfå tillgång till dina filer.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Okänt fel. Kontrollera dina systeminställningar eller kontakta din administratör",
-"Missing requirements." => "Krav som saknas",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Kontrollera att PHP 5.3.3 eller senare är installerad och att tillägget OpenSSL PHP är aktiverad och korrekt konfigurerad. Kryptering är tillsvidare inaktiverad.",
-"Following users are not set up for encryption:" => "Följande användare har inte aktiverat kryptering:",
-"Initial encryption started... This can take some time. Please wait." => "Initiala krypteringen har påbörjats... Detta kan ta lite tid. Var god vänta.",
-"Initial encryption running... Please try again later." => "Initiala krypteringen körs... Var god försök igen senare.",
-"Go directly to your %spersonal settings%s." => "Gå direkt till dina %segna inställningar%s.",
-"Encryption" => "Kryptering",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Aktivera återställningsnyckel (för att kunna återfå användarens filer vid glömt eller förlorat lösenord):",
-"Recovery key password" => "Lösenord för återställningsnyckel",
-"Repeat Recovery key password" => "Upprepa återställningsnyckelns lösenord",
-"Enabled" => "Aktiverad",
-"Disabled" => "Inaktiverad",
-"Change recovery key password:" => "Ändra lösenord för återställningsnyckel:",
-"Old Recovery key password" => "Gammalt lösenord för återställningsnyckel",
-"New Recovery key password" => "Nytt lösenord för återställningsnyckel",
-"Repeat New Recovery key password" => "Upprepa lösenord för ny återställningsnyckel",
-"Change Password" => "Byt lösenord",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Om du inte kommer ihåg ditt gamla lösenord kan du be din administratör att återställa dina filer.",
-"Old log-in password" => "Gammalt inloggningslösenord",
-"Current log-in password" => "Nuvarande inloggningslösenord",
-"Update Private Key Password" => "Uppdatera lösenordet för din privata nyckel",
-"Enable password recovery:" => "Aktivera lösenordsåterställning",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Genom att aktivera detta alternativ kommer du kunna återfå tillgång till dina krypterade filer om du skulle förlora/glömma ditt lösenord"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/ta_LK.js b/apps/files_encryption/l10n/ta_LK.js
new file mode 100644
index 00000000000..e37ff4a78c4
--- /dev/null
+++ b/apps/files_encryption/l10n/ta_LK.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Encryption" : "மறைக்குறியீடு"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/ta_LK.json b/apps/files_encryption/l10n/ta_LK.json
new file mode 100644
index 00000000000..a52ff1c3215
--- /dev/null
+++ b/apps/files_encryption/l10n/ta_LK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Encryption" : "மறைக்குறியீடு"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ta_LK.php b/apps/files_encryption/l10n/ta_LK.php
deleted file mode 100644
index 327102b5df6..00000000000
--- a/apps/files_encryption/l10n/ta_LK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Encryption" => "மறைக்குறியீடு"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/th_TH.js b/apps/files_encryption/l10n/th_TH.js
new file mode 100644
index 00000000000..ad95d941a28
--- /dev/null
+++ b/apps/files_encryption/l10n/th_TH.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
+    "Encryption" : "การเข้ารหัส"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/th_TH.json b/apps/files_encryption/l10n/th_TH.json
new file mode 100644
index 00000000000..d5a9a37569d
--- /dev/null
+++ b/apps/files_encryption/l10n/th_TH.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Unknown error" : "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
+    "Encryption" : "การเข้ารหัส"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/th_TH.php b/apps/files_encryption/l10n/th_TH.php
deleted file mode 100644
index 12555767d4f..00000000000
--- a/apps/files_encryption/l10n/th_TH.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "ข้อผิดพลาดที่ไม่ทราบสาเหตุ",
-"Encryption" => "การเข้ารหัส"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/tr.js b/apps/files_encryption/l10n/tr.js
new file mode 100644
index 00000000000..3a50eeb2081
--- /dev/null
+++ b/apps/files_encryption/l10n/tr.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Bilinmeyen hata",
+    "Missing recovery key password" : "Eksik kurtarma anahtarı parolası",
+    "Please repeat the recovery key password" : "Lütfen kurtarma anahtarı parolasını yenileyin",
+    "Repeated recovery key password does not match the provided recovery key password" : "Yenilenen kurtarma anahtarı parolası, belirtilen kurtarma anahtarı parolası ile eşleşmiyor",
+    "Recovery key successfully enabled" : "Kurtarma anahtarı başarıyla etkinleştirildi",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+    "Recovery key successfully disabled" : "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
+    "Please provide the old recovery password" : "Lütfen eski kurtarma parolasını girin",
+    "Please provide a new recovery password" : "Lütfen yeni bir kurtarma parolası girin",
+    "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yenileyin",
+    "Password successfully changed." : "Parola başarıyla değiştirildi.",
+    "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
+    "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
+    "File recovery settings updated" : "Dosya kurtarma ayarları güncellendi",
+    "Could not update file recovery" : "Dosya kurtarma güncellenemedi",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
+    "Missing requirements." : "Gereklilikler eksik.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğundan ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.",
+    "Following users are not set up for encryption:" : "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:",
+    "Initial encryption started... This can take some time. Please wait." : "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.",
+    "Initial encryption running... Please try again later." : "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.",
+    "Go directly to your %spersonal settings%s." : "Doğrudan %skişisel ayarlarınıza%s gidin.",
+    "Encryption" : "Şifreleme",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
+    "Recovery key password" : "Kurtarma anahtarı parolası",
+    "Repeat Recovery key password" : "Kurtarma anahtarı parolasını yineleyin",
+    "Enabled" : "Etkin",
+    "Disabled" : "Devre Dışı",
+    "Change recovery key password:" : "Kurtarma anahtarı parolasını değiştir:",
+    "Old Recovery key password" : "Eski Kurtarma anahtarı parolası",
+    "New Recovery key password" : "Yeni Kurtarma anahtarı parolası",
+    "Repeat New Recovery key password" : "Yeni Kurtarma anahtarı parolasını yineleyin",
+    "Change Password" : "Parola Değiştir",
+    "Your private key password no longer matches your log-in password." : "Özel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
+    "Set your old private key password to your current log-in password:" : "Eski özel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz.",
+    "Old log-in password" : "Eski oturum açma parolası",
+    "Current log-in password" : "Geçerli oturum açma parolası",
+    "Update Private Key Password" : "Özel Anahtar Parolasını Güncelle",
+    "Enable password recovery:" : "Parola kurtarmayı etkinleştir:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_encryption/l10n/tr.json b/apps/files_encryption/l10n/tr.json
new file mode 100644
index 00000000000..4998865f3bd
--- /dev/null
+++ b/apps/files_encryption/l10n/tr.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Bilinmeyen hata",
+    "Missing recovery key password" : "Eksik kurtarma anahtarı parolası",
+    "Please repeat the recovery key password" : "Lütfen kurtarma anahtarı parolasını yenileyin",
+    "Repeated recovery key password does not match the provided recovery key password" : "Yenilenen kurtarma anahtarı parolası, belirtilen kurtarma anahtarı parolası ile eşleşmiyor",
+    "Recovery key successfully enabled" : "Kurtarma anahtarı başarıyla etkinleştirildi",
+    "Could not disable recovery key. Please check your recovery key password!" : "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
+    "Recovery key successfully disabled" : "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
+    "Please provide the old recovery password" : "Lütfen eski kurtarma parolasını girin",
+    "Please provide a new recovery password" : "Lütfen yeni bir kurtarma parolası girin",
+    "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yenileyin",
+    "Password successfully changed." : "Parola başarıyla değiştirildi.",
+    "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
+    "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
+    "File recovery settings updated" : "Dosya kurtarma ayarları güncellendi",
+    "Could not update file recovery" : "Dosya kurtarma güncellenemedi",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
+    "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.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
+    "Missing requirements." : "Gereklilikler eksik.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğundan ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.",
+    "Following users are not set up for encryption:" : "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:",
+    "Initial encryption started... This can take some time. Please wait." : "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.",
+    "Initial encryption running... Please try again later." : "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.",
+    "Go directly to your %spersonal settings%s." : "Doğrudan %skişisel ayarlarınıza%s gidin.",
+    "Encryption" : "Şifreleme",
+    "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",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
+    "Recovery key password" : "Kurtarma anahtarı parolası",
+    "Repeat Recovery key password" : "Kurtarma anahtarı parolasını yineleyin",
+    "Enabled" : "Etkin",
+    "Disabled" : "Devre Dışı",
+    "Change recovery key password:" : "Kurtarma anahtarı parolasını değiştir:",
+    "Old Recovery key password" : "Eski Kurtarma anahtarı parolası",
+    "New Recovery key password" : "Yeni Kurtarma anahtarı parolası",
+    "Repeat New Recovery key password" : "Yeni Kurtarma anahtarı parolasını yineleyin",
+    "Change Password" : "Parola Değiştir",
+    "Your private key password no longer matches your log-in password." : "Özel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
+    "Set your old private key password to your current log-in password:" : "Eski özel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz.",
+    "Old log-in password" : "Eski oturum açma parolası",
+    "Current log-in password" : "Geçerli oturum açma parolası",
+    "Update Private Key Password" : "Özel Anahtar Parolasını Güncelle",
+    "Enable password recovery:" : "Parola kurtarmayı etkinleştir:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/tr.php b/apps/files_encryption/l10n/tr.php
deleted file mode 100644
index 7d5553ee649..00000000000
--- a/apps/files_encryption/l10n/tr.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Bilinmeyen hata",
-"Missing recovery key password" => "Eksik kurtarma anahtarı parolası",
-"Please repeat the recovery key password" => "Lütfen kurtarma anahtarı parolasını yenileyin",
-"Repeated recovery key password does not match the provided recovery key password" => "Yenilenen kurtarma anahtarı parolası, belirtilen kurtarma anahtarı parolası ile eşleşmiyor",
-"Recovery key successfully enabled" => "Kurtarma anahtarı başarıyla etkinleştirildi",
-"Could not disable recovery key. Please check your recovery key password!" => "Kurtarma anahtarı devre dışı bırakılamadı. Lütfen kurtarma anahtarı parolanızı kontrol edin!",
-"Recovery key successfully disabled" => "Kurtarma anahtarı başarıyla devre dışı bırakıldı",
-"Please provide the old recovery password" => "Lütfen eski kurtarma parolasını girin",
-"Please provide a new recovery password" => "Lütfen yeni bir kurtarma parolası girin",
-"Please repeat the new recovery password" => "Lütfen yeni kurtarma parolasını yenileyin",
-"Password successfully changed." => "Parola başarıyla değiştirildi.",
-"Could not change the password. Maybe the old password was not correct." => "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
-"Private key password successfully updated." => "Özel anahtar parolası başarıyla güncellendi.",
-"Could not update the private key password. Maybe the old password was not correct." => "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
-"File recovery settings updated" => "Dosya kurtarma ayarları güncellendi",
-"Could not update file recovery" => "Dosya kurtarma güncellenemedi",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Özel anahtarınız geçerli değil! Muhtemelen parolanız %s dışarısında değiştirildi (örn. şirket dizininde). Gizli anahtar parolanızı kişisel ayarlarınızda güncelleyerek şifreli dosyalarınıza erişimi kurtarabilirsiniz.",
-"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.",
-"Unknown error. Please check your system settings or contact your administrator" => "Bilinmeyen hata. Lütfen sistem ayarlarınızı denetleyin veya yöneticiniz ile iletişime geçin",
-"Missing requirements." => "Gereklilikler eksik.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "PHP 5.3.3 veya daha sürümü ile birlikte OpenSSL ve OpenSSL PHP uzantısının birlikte etkin olduğundan ve doğru bir şekilde yapılandırıldığından emin olun. Şimdilik şifreleme uygulaması devre dışı bırakıldı.",
-"Following users are not set up for encryption:" => "Aşağıdaki kullanıcılar şifreleme için ayarlanmamış:",
-"Initial encryption started... This can take some time. Please wait." => "İlk şifreleme başladı... Bu biraz zaman alabilir. Lütfen bekleyin.",
-"Initial encryption running... Please try again later." => "İlk şifreleme çalışıyor... Lütfen daha sonra tekrar deneyin.",
-"Go directly to your %spersonal settings%s." => "Doğrudan %skişisel ayarlarınıza%s gidin.",
-"Encryption" => "Şifreleme",
-"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",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Kurtarma anahtarını etkinleştir (parola kaybı durumunda kullanıcı dosyalarının kurtarılmasına izin verir):",
-"Recovery key password" => "Kurtarma anahtarı parolası",
-"Repeat Recovery key password" => "Kurtarma anahtarı parolasını yineleyin",
-"Enabled" => "Etkin",
-"Disabled" => "Devre Dışı",
-"Change recovery key password:" => "Kurtarma anahtarı parolasını değiştir:",
-"Old Recovery key password" => "Eski Kurtarma anahtarı parolası",
-"New Recovery key password" => "Yeni Kurtarma anahtarı parolası",
-"Repeat New Recovery key password" => "Yeni Kurtarma anahtarı parolasını yineleyin",
-"Change Password" => "Parola Değiştir",
-"Your private key password no longer matches your log-in password." => "Özel anahtar parolanız artık oturum açma parolanız ile eşleşmiyor.",
-"Set your old private key password to your current log-in password:" => "Eski özel anahtar parolanızı, geçerli oturum açma parolanız olarak ayarlayın:",
-" If you don't remember your old password you can ask your administrator to recover your files." => "Eğer eski parolanızı hatırlamıyorsanız, yöneticinizden dosyalarınızı kurtarmasını talep edebilirsiniz.",
-"Old log-in password" => "Eski oturum açma parolası",
-"Current log-in password" => "Geçerli oturum açma parolası",
-"Update Private Key Password" => "Özel Anahtar Parolasını Güncelle",
-"Enable password recovery:" => "Parola kurtarmayı etkinleştir:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Bu seçeneği etkinleştirmek, parola kaybı durumunda şifrelenmiş dosyalarınıza erişimi yeniden kazanmanızı sağlayacaktır"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_encryption/l10n/ug.js b/apps/files_encryption/l10n/ug.js
new file mode 100644
index 00000000000..0e56a30f378
--- /dev/null
+++ b/apps/files_encryption/l10n/ug.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "يوچۇن خاتالىق",
+    "Encryption" : "شىفىرلاش"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/ug.json b/apps/files_encryption/l10n/ug.json
new file mode 100644
index 00000000000..eef86f6564a
--- /dev/null
+++ b/apps/files_encryption/l10n/ug.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Unknown error" : "يوچۇن خاتالىق",
+    "Encryption" : "شىفىرلاش"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ug.php b/apps/files_encryption/l10n/ug.php
deleted file mode 100644
index b05008575f8..00000000000
--- a/apps/files_encryption/l10n/ug.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "يوچۇن خاتالىق",
-"Encryption" => "شىفىرلاش"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/uk.js b/apps/files_encryption/l10n/uk.js
new file mode 100644
index 00000000000..169f6c3f92e
--- /dev/null
+++ b/apps/files_encryption/l10n/uk.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Невідома помилка",
+    "Missing recovery key password" : "Відсутній пароль ключа відновлення",
+    "Please repeat the recovery key password" : "Введіть ще раз пароль для ключа відновлення",
+    "Repeated recovery key password does not match the provided recovery key password" : "Введені паролі ключа відновлення не співпадають",
+    "Recovery key successfully enabled" : "Ключ відновлення підключено",
+    "Could not disable recovery key. Please check your recovery key password!" : "Не вдалося відключити ключ відновлення. Будь ласка, перевірте пароль ключа відновлення!",
+    "Recovery key successfully disabled" : "Ключ відновлення відключено",
+    "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." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+    "Private key password successfully updated." : "Пароль секретного ключа оновлено.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.",
+    "File recovery settings updated" : "Налаштування файла відновлення оновлено",
+    "Could not update file recovery" : "Не вдалося оновити файл відновлення ",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ваш секретний ключ не дійсний! Ймовірно ваш пароль був змінений ззовні %s (наприклад, корпоративний каталог). Ви можете оновити секретний ключ в особистих налаштуваннях на сторінці відновлення доступу до зашифрованих файлів.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Невідома помилка. Будь ласка, перевірте налаштування системи або зверніться до адміністратора.",
+    "Missing requirements." : "Відсутні вимоги.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Будь ласка, впевніться, що встановлена версія PHP 5.3.3 або новіша, а також, що OpenSSL та інші розширення PHP підключені та вірно налаштовані. На даний момент додаток шифрування відключений.",
+    "Following users are not set up for encryption:" : "Для наступних користувачів шифрування не налаштоване:",
+    "Initial encryption started... This can take some time. Please wait." : "Початкове шифрування почалося... Це може зайняти деякий час. Будь ласка, почекайте.",
+    "Initial encryption running... Please try again later." : "Початкове шифрування працює... Це може зайняти деякий час. Будь ласка, почекайте.",
+    "Go directly to your %spersonal settings%s." : "Перейти навпростець до ваших %spersonal settings%s.",
+    "Encryption" : "Шифрування",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):",
+    "Recovery key password" : "Пароль ключа відновлення",
+    "Repeat Recovery key password" : "Введіть ще раз пароль ключа відновлення",
+    "Enabled" : "Увімкнено",
+    "Disabled" : "Вимкнено",
+    "Change recovery key password:" : "Змінити пароль ключа відновлення:",
+    "Old Recovery key password" : "Старий пароль ключа відновлення",
+    "New Recovery key password" : "Новий пароль ключа відновлення",
+    "Repeat New Recovery key password" : "Введіть ще раз новий пароль ключа відновлення",
+    "Change Password" : "Змінити Пароль",
+    "Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
+    "Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
+    " 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" : "Поточний пароль входу",
+    "Update Private Key Password" : "Оновити пароль для закритого ключа",
+    "Enable password recovery:" : "Ввімкнути відновлення паролю:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю"
+},
+"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_encryption/l10n/uk.json b/apps/files_encryption/l10n/uk.json
new file mode 100644
index 00000000000..454de34d9c0
--- /dev/null
+++ b/apps/files_encryption/l10n/uk.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Unknown error" : "Невідома помилка",
+    "Missing recovery key password" : "Відсутній пароль ключа відновлення",
+    "Please repeat the recovery key password" : "Введіть ще раз пароль для ключа відновлення",
+    "Repeated recovery key password does not match the provided recovery key password" : "Введені паролі ключа відновлення не співпадають",
+    "Recovery key successfully enabled" : "Ключ відновлення підключено",
+    "Could not disable recovery key. Please check your recovery key password!" : "Не вдалося відключити ключ відновлення. Будь ласка, перевірте пароль ключа відновлення!",
+    "Recovery key successfully disabled" : "Ключ відновлення відключено",
+    "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." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+    "Private key password successfully updated." : "Пароль секретного ключа оновлено.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.",
+    "File recovery settings updated" : "Налаштування файла відновлення оновлено",
+    "Could not update file recovery" : "Не вдалося оновити файл відновлення ",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ваш секретний ключ не дійсний! Ймовірно ваш пароль був змінений ззовні %s (наприклад, корпоративний каталог). Ви можете оновити секретний ключ в особистих налаштуваннях на сторінці відновлення доступу до зашифрованих файлів.",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Невідома помилка. Будь ласка, перевірте налаштування системи або зверніться до адміністратора.",
+    "Missing requirements." : "Відсутні вимоги.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Будь ласка, впевніться, що встановлена версія PHP 5.3.3 або новіша, а також, що OpenSSL та інші розширення PHP підключені та вірно налаштовані. На даний момент додаток шифрування відключений.",
+    "Following users are not set up for encryption:" : "Для наступних користувачів шифрування не налаштоване:",
+    "Initial encryption started... This can take some time. Please wait." : "Початкове шифрування почалося... Це може зайняти деякий час. Будь ласка, почекайте.",
+    "Initial encryption running... Please try again later." : "Початкове шифрування працює... Це може зайняти деякий час. Будь ласка, почекайте.",
+    "Go directly to your %spersonal settings%s." : "Перейти навпростець до ваших %spersonal settings%s.",
+    "Encryption" : "Шифрування",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):",
+    "Recovery key password" : "Пароль ключа відновлення",
+    "Repeat Recovery key password" : "Введіть ще раз пароль ключа відновлення",
+    "Enabled" : "Увімкнено",
+    "Disabled" : "Вимкнено",
+    "Change recovery key password:" : "Змінити пароль ключа відновлення:",
+    "Old Recovery key password" : "Старий пароль ключа відновлення",
+    "New Recovery key password" : "Новий пароль ключа відновлення",
+    "Repeat New Recovery key password" : "Введіть ще раз новий пароль ключа відновлення",
+    "Change Password" : "Змінити Пароль",
+    "Your private key password no longer matches your log-in password." : "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
+    "Set your old private key password to your current log-in password:" : "Замініть старий пароль від закритого ключа на новий пароль входу:",
+    " 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" : "Поточний пароль входу",
+    "Update Private Key Password" : "Оновити пароль для закритого ключа",
+    "Enable password recovery:" : "Ввімкнути відновлення паролю:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю"
+},"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_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
deleted file mode 100644
index 674d5445bb7..00000000000
--- a/apps/files_encryption/l10n/uk.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Невідома помилка",
-"Missing recovery key password" => "Відсутній пароль ключа відновлення",
-"Please repeat the recovery key password" => "Введіть ще раз пароль для ключа відновлення",
-"Repeated recovery key password does not match the provided recovery key password" => "Введені паролі ключа відновлення не співпадають",
-"Recovery key successfully enabled" => "Ключ відновлення підключено",
-"Could not disable recovery key. Please check your recovery key password!" => "Не вдалося відключити ключ відновлення. Будь ласка, перевірте пароль ключа відновлення!",
-"Recovery key successfully disabled" => "Ключ відновлення відключено",
-"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." => "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
-"Private key password successfully updated." => "Пароль секретного ключа оновлено.",
-"Could not update the private key password. Maybe the old password was not correct." => "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.",
-"File recovery settings updated" => "Налаштування файла відновлення оновлено",
-"Could not update file recovery" => "Не вдалося оновити файл відновлення ",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "Ваш секретний ключ не дійсний! Ймовірно ваш пароль був змінений ззовні %s (наприклад, корпоративний каталог). Ви можете оновити секретний ключ в особистих налаштуваннях на сторінці відновлення доступу до зашифрованих файлів.",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "Не можу розшифрувати цей файл, можливо він опублікований. Будь ласка, попросіть власника опублікувати його заново.",
-"Unknown error. Please check your system settings or contact your administrator" => "Невідома помилка. Будь ласка, перевірте налаштування системи або зверніться до адміністратора.",
-"Missing requirements." => "Відсутні вимоги.",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "Будь ласка, впевніться, що встановлена версія PHP 5.3.3 або новіша, а також, що OpenSSL та інші розширення PHP підключені та вірно налаштовані. На даний момент додаток шифрування відключений.",
-"Following users are not set up for encryption:" => "Для наступних користувачів шифрування не налаштоване:",
-"Initial encryption started... This can take some time. Please wait." => "Початкове шифрування почалося... Це може зайняти деякий час. Будь ласка, почекайте.",
-"Initial encryption running... Please try again later." => "Початкове шифрування працює... Це може зайняти деякий час. Будь ласка, почекайте.",
-"Go directly to your %spersonal settings%s." => "Перейти навпростець до ваших %spersonal settings%s.",
-"Encryption" => "Шифрування",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "Доданок шифрування ввімкнено, але ваші ключі не ініціалізовано, вийдіть та зайдіть знову",
-"Enable recovery key (allow to recover users files in case of password loss):" => "Ввімкнути ключ відновлення (дозволяє користувачам відновлювати файли при втраті паролю):",
-"Recovery key password" => "Пароль ключа відновлення",
-"Repeat Recovery key password" => "Введіть ще раз пароль ключа відновлення",
-"Enabled" => "Увімкнено",
-"Disabled" => "Вимкнено",
-"Change recovery key password:" => "Змінити пароль ключа відновлення:",
-"Old Recovery key password" => "Старий пароль ключа відновлення",
-"New Recovery key password" => "Новий пароль ключа відновлення",
-"Repeat New Recovery key password" => "Введіть ще раз новий пароль ключа відновлення",
-"Change Password" => "Змінити Пароль",
-"Your private key password no longer matches your log-in password." => "Пароль вашого закритого ключа більше не відповідає паролю від вашого облікового запису.",
-"Set your old private key password to your current log-in password:" => "Замініть старий пароль від закритого ключа на новий пароль входу:",
-" 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" => "Поточний пароль входу",
-"Update Private Key Password" => "Оновити пароль для закритого ключа",
-"Enable password recovery:" => "Ввімкнути відновлення паролю:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Включення цієї опції дозволить вам отримати доступ до своїх зашифрованих файлів у випадку втрати паролю"
-);
-$PLURAL_FORMS = "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_encryption/l10n/ur_PK.js b/apps/files_encryption/l10n/ur_PK.js
new file mode 100644
index 00000000000..f2fd4d3419d
--- /dev/null
+++ b/apps/files_encryption/l10n/ur_PK.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "غیر معروف خرابی"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/ur_PK.json b/apps/files_encryption/l10n/ur_PK.json
new file mode 100644
index 00000000000..7d7738b3811
--- /dev/null
+++ b/apps/files_encryption/l10n/ur_PK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Unknown error" : "غیر معروف خرابی"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/ur_PK.php b/apps/files_encryption/l10n/ur_PK.php
deleted file mode 100644
index fab26a330e9..00000000000
--- a/apps/files_encryption/l10n/ur_PK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "غیر معروف خرابی"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_encryption/l10n/vi.js b/apps/files_encryption/l10n/vi.js
new file mode 100644
index 00000000000..8fc542510da
--- /dev/null
+++ b/apps/files_encryption/l10n/vi.js
@@ -0,0 +1,26 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Lỗi chưa biết",
+    "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công",
+    "Could not disable recovery key. Please check your recovery key password!" : "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
+    "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công",
+    "Password successfully changed." : "Đã đổi mật khẩu.",
+    "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",
+    "Could not update the private key password. Maybe the old password was not correct." : "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng",
+    "File recovery settings updated" : "Đã cập nhật thiết lập khôi phục tập tin ",
+    "Could not update file recovery" : "Không thể cập nhật khôi phục tập tin",
+    "Encryption" : "Mã hóa",
+    "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",
+    "Enabled" : "Bật",
+    "Disabled" : "Tắt",
+    "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ũ",
+    "Current log-in password" : "Mật khẩu đăng nhập hiện tại",
+    "Update Private Key Password" : "Cập nhật mật khẩu khóa cá nhân",
+    "Enable password recovery:" : "Kích hoạt khôi phục mật khẩu:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/vi.json b/apps/files_encryption/l10n/vi.json
new file mode 100644
index 00000000000..f1a1ff4c6da
--- /dev/null
+++ b/apps/files_encryption/l10n/vi.json
@@ -0,0 +1,24 @@
+{ "translations": {
+    "Unknown error" : "Lỗi chưa biết",
+    "Recovery key successfully enabled" : "Khóa khôi phục kích hoạt thành công",
+    "Could not disable recovery key. Please check your recovery key password!" : "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
+    "Recovery key successfully disabled" : "Vô hiệu hóa khóa khôi phục thành công",
+    "Password successfully changed." : "Đã đổi mật khẩu.",
+    "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",
+    "Could not update the private key password. Maybe the old password was not correct." : "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng",
+    "File recovery settings updated" : "Đã cập nhật thiết lập khôi phục tập tin ",
+    "Could not update file recovery" : "Không thể cập nhật khôi phục tập tin",
+    "Encryption" : "Mã hóa",
+    "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",
+    "Enabled" : "Bật",
+    "Disabled" : "Tắt",
+    "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ũ",
+    "Current log-in password" : "Mật khẩu đăng nhập hiện tại",
+    "Update Private Key Password" : "Cập nhật mật khẩu khóa cá nhân",
+    "Enable password recovery:" : "Kích hoạt khôi phục mật khẩu:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
deleted file mode 100644
index 65c4bcf1f71..00000000000
--- a/apps/files_encryption/l10n/vi.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "Lỗi chưa biết",
-"Recovery key successfully enabled" => "Khóa khôi phục kích hoạt thành công",
-"Could not disable recovery key. Please check your recovery key password!" => "Không thể vô hiệu hóa khóa khôi phục. Vui lòng kiểm tra mật khẩu khóa khôi phục!",
-"Recovery key successfully disabled" => "Vô hiệu hóa khóa khôi phục thành công",
-"Password successfully changed." => "Đã đổi mật khẩu.",
-"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",
-"Could not update the private key password. Maybe the old password was not correct." => "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng",
-"File recovery settings updated" => "Đã cập nhật thiết lập khôi phục tập tin ",
-"Could not update file recovery" => "Không thể cập nhật khôi phục tập tin",
-"Encryption" => "Mã hóa",
-"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",
-"Enabled" => "Bật",
-"Disabled" => "Tắt",
-"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ũ",
-"Current log-in password" => "Mật khẩu đăng nhập hiện tại",
-"Update Private Key Password" => "Cập nhật mật khẩu khóa cá nhân",
-"Enable password recovery:" => "Kích hoạt khôi phục mật khẩu:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "Tùy chọn này sẽ cho phép bạn tái truy cập đến các tập tin mã hóa trong trường hợp mất mật khẩu"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_CN.js b/apps/files_encryption/l10n/zh_CN.js
new file mode 100644
index 00000000000..82051423baf
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_CN.js
@@ -0,0 +1,43 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "未知错误",
+    "Recovery key successfully enabled" : "恢复密钥成功启用",
+    "Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码！",
+    "Recovery key successfully disabled" : "恢复密钥成功禁用",
+    "Password successfully changed." : "密码修改成功。",
+    "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
+    "Private key password successfully updated." : "私钥密码成功更新。",
+    "Could not update the private key password. Maybe the old password was not correct." : "无法更新私钥密码。可能旧密码不正确。",
+    "File recovery settings updated" : "文件恢复设置已更新",
+    "Could not update file recovery" : "不能更新文件恢复",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "您的私有密钥无效！也许是您在 %s 外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
+    "Unknown error. Please check your system settings or contact your administrator" : "未知错误。请检查系统设置或联系您的管理员",
+    "Missing requirements." : "必填项未填写。",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "请确认安装了 PHP 5.3.3 或更新版本，且 OpenSSL 及其 PHP 扩展已经启用并正确配置。加密应用现在已被禁用。",
+    "Following users are not set up for encryption:" : "以下用户还没有设置加密：",
+    "Initial encryption started... This can take some time. Please wait." : "初始加密启动中....这可能会花一些时间，请稍后再试。",
+    "Initial encryption running... Please try again later." : "初始加密运行中....请稍后再试。",
+    "Go directly to your %spersonal settings%s." : "直接访问您的%s个人设置%s。",
+    "Encryption" : "加密",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "启用恢复密钥（允许你在密码丢失后恢复文件）：",
+    "Recovery key password" : "恢复密钥密码",
+    "Repeat Recovery key password" : "重复恢复密钥密码",
+    "Enabled" : "开启",
+    "Disabled" : "禁用",
+    "Change recovery key password:" : "更改恢复密钥密码",
+    "Old Recovery key password" : "旧的恢复密钥密码",
+    "New Recovery key password" : "新的恢复密钥密码",
+    "Repeat New Recovery key password" : "重复新的密钥恢复密码",
+    "Change Password" : "修改密码",
+    " 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" : "当前登录密码",
+    "Update Private Key Password" : "更新私钥密码",
+    "Enable password recovery:" : "启用密码恢复：",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "启用该项将允许你在密码丢失后取回您的加密文件"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/zh_CN.json b/apps/files_encryption/l10n/zh_CN.json
new file mode 100644
index 00000000000..9c9a6adc7cb
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_CN.json
@@ -0,0 +1,41 @@
+{ "translations": {
+    "Unknown error" : "未知错误",
+    "Recovery key successfully enabled" : "恢复密钥成功启用",
+    "Could not disable recovery key. Please check your recovery key password!" : "不能禁用恢复密钥。请检查恢复密钥密码！",
+    "Recovery key successfully disabled" : "恢复密钥成功禁用",
+    "Password successfully changed." : "密码修改成功。",
+    "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
+    "Private key password successfully updated." : "私钥密码成功更新。",
+    "Could not update the private key password. Maybe the old password was not correct." : "无法更新私钥密码。可能旧密码不正确。",
+    "File recovery settings updated" : "文件恢复设置已更新",
+    "Could not update file recovery" : "不能更新文件恢复",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "您的私有密钥无效！也许是您在 %s 外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
+    "Unknown error. Please check your system settings or contact your administrator" : "未知错误。请检查系统设置或联系您的管理员",
+    "Missing requirements." : "必填项未填写。",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "请确认安装了 PHP 5.3.3 或更新版本，且 OpenSSL 及其 PHP 扩展已经启用并正确配置。加密应用现在已被禁用。",
+    "Following users are not set up for encryption:" : "以下用户还没有设置加密：",
+    "Initial encryption started... This can take some time. Please wait." : "初始加密启动中....这可能会花一些时间，请稍后再试。",
+    "Initial encryption running... Please try again later." : "初始加密运行中....请稍后再试。",
+    "Go directly to your %spersonal settings%s." : "直接访问您的%s个人设置%s。",
+    "Encryption" : "加密",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "启用恢复密钥（允许你在密码丢失后恢复文件）：",
+    "Recovery key password" : "恢复密钥密码",
+    "Repeat Recovery key password" : "重复恢复密钥密码",
+    "Enabled" : "开启",
+    "Disabled" : "禁用",
+    "Change recovery key password:" : "更改恢复密钥密码",
+    "Old Recovery key password" : "旧的恢复密钥密码",
+    "New Recovery key password" : "新的恢复密钥密码",
+    "Repeat New Recovery key password" : "重复新的密钥恢复密码",
+    "Change Password" : "修改密码",
+    " 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" : "当前登录密码",
+    "Update Private Key Password" : "更新私钥密码",
+    "Enable password recovery:" : "启用密码恢复：",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "启用该项将允许你在密码丢失后取回您的加密文件"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
deleted file mode 100644
index 74d7a36f569..00000000000
--- a/apps/files_encryption/l10n/zh_CN.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "未知错误",
-"Recovery key successfully enabled" => "恢复密钥成功启用",
-"Could not disable recovery key. Please check your recovery key password!" => "不能禁用恢复密钥。请检查恢复密钥密码！",
-"Recovery key successfully disabled" => "恢复密钥成功禁用",
-"Password successfully changed." => "密码修改成功。",
-"Could not change the password. Maybe the old password was not correct." => "不能修改密码。旧密码可能不正确。",
-"Private key password successfully updated." => "私钥密码成功更新。",
-"Could not update the private key password. Maybe the old password was not correct." => "无法更新私钥密码。可能旧密码不正确。",
-"File recovery settings updated" => "文件恢复设置已更新",
-"Could not update file recovery" => "不能更新文件恢复",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私有密钥无效！也许是您在 %s 外更改了密码 (比如，在您的公司目录)。您可以在个人设置里更新您的私钥密码来恢复访问你的加密文件。",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => " 无法解密这个文件（或许这是一个共享文件？），请询问文件所有者重新与您分享这个文件。",
-"Unknown error. Please check your system settings or contact your administrator" => "未知错误。请检查系统设置或联系您的管理员",
-"Missing requirements." => "必填项未填写。",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "请确认安装了 PHP 5.3.3 或更新版本，且 OpenSSL 及其 PHP 扩展已经启用并正确配置。加密应用现在已被禁用。",
-"Following users are not set up for encryption:" => "以下用户还没有设置加密：",
-"Initial encryption started... This can take some time. Please wait." => "初始加密启动中....这可能会花一些时间，请稍后再试。",
-"Initial encryption running... Please try again later." => "初始加密运行中....请稍后再试。",
-"Go directly to your %spersonal settings%s." => "直接访问您的%s个人设置%s。",
-"Encryption" => "加密",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "加密应用被启用了，但是你的加密密钥没有初始化，请重新登出登录系统一次。",
-"Enable recovery key (allow to recover users files in case of password loss):" => "启用恢复密钥（允许你在密码丢失后恢复文件）：",
-"Recovery key password" => "恢复密钥密码",
-"Repeat Recovery key password" => "重复恢复密钥密码",
-"Enabled" => "开启",
-"Disabled" => "禁用",
-"Change recovery key password:" => "更改恢复密钥密码",
-"Old Recovery key password" => "旧的恢复密钥密码",
-"New Recovery key password" => "新的恢复密钥密码",
-"Repeat New Recovery key password" => "重复新的密钥恢复密码",
-"Change Password" => "修改密码",
-" 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" => "当前登录密码",
-"Update Private Key Password" => "更新私钥密码",
-"Enable password recovery:" => "启用密码恢复：",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "启用该项将允许你在密码丢失后取回您的加密文件"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_HK.js b/apps/files_encryption/l10n/zh_HK.js
new file mode 100644
index 00000000000..f4e3fc7e53e
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_HK.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "不明錯誤",
+    "Encryption" : "加密",
+    "Enabled" : "啟用",
+    "Disabled" : "停用",
+    "Change Password" : "更改密碼"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/zh_HK.json b/apps/files_encryption/l10n/zh_HK.json
new file mode 100644
index 00000000000..75a003dd466
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_HK.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Unknown error" : "不明錯誤",
+    "Encryption" : "加密",
+    "Enabled" : "啟用",
+    "Disabled" : "停用",
+    "Change Password" : "更改密碼"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/zh_HK.php b/apps/files_encryption/l10n/zh_HK.php
deleted file mode 100644
index ea559b6f0db..00000000000
--- a/apps/files_encryption/l10n/zh_HK.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "不明錯誤",
-"Encryption" => "加密",
-"Enabled" => "啟用",
-"Disabled" => "停用",
-"Change Password" => "更改密碼"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_encryption/l10n/zh_TW.js b/apps/files_encryption/l10n/zh_TW.js
new file mode 100644
index 00000000000..c68028a7aad
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_TW.js
@@ -0,0 +1,42 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "未知的錯誤",
+    "Recovery key successfully enabled" : "還原金鑰已成功開啟",
+    "Could not disable recovery key. Please check your recovery key password!" : "無法停用還原金鑰。請檢查您的還原金鑰密碼!",
+    "Recovery key successfully disabled" : "還原金鑰已成功停用",
+    "Password successfully changed." : "成功變更密碼。",
+    "Could not change the password. Maybe the old password was not correct." : "無法變更密碼，或許是輸入的舊密碼不正確。",
+    "Private key password successfully updated." : "私人金鑰密碼已成功更新。",
+    "Could not update the private key password. Maybe the old password was not correct." : "無法更新私人金鑰密碼。可能舊的密碼不正確。",
+    "File recovery settings updated" : "檔案還原設定已更新",
+    "Could not update file recovery" : "無法更新檔案還原設定",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密功能未初始化!可能加密功能需要重新啟用在現在的連線上。請試著登出再登入來初始化加密功能。",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "您的私人金鑰不正確!可能您的密碼已經變更在外部的 %s (例如:您的企業目錄)。您可以在您的個人設定中更新私人金鑰密碼來還原存取您的加密檔案。",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。",
+    "Unknown error. Please check your system settings or contact your administrator" : "未知錯誤請檢查您的系統設定或是聯絡您的管理員",
+    "Missing requirements." : "遺失必要條件。",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "請確認已安裝 PHP 5.3.3 或是更新的版本以及 OpenSSL 也一併安裝在 PHP extension 裡面並啟用及設置完成。現在，加密功能是停用的。",
+    "Following users are not set up for encryption:" : "以下的使用者無法設定加密:",
+    "Initial encryption started... This can take some time. Please wait." : "加密初始已啟用...這個需要一些時間。請稍等。",
+    "Initial encryption running... Please try again later." : "加密初始執行中...請晚點再試。",
+    "Encryption" : "加密",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "啟用還原金鑰 (因忘記密碼仍允許還原使用者檔案):",
+    "Recovery key password" : "還原金鑰密碼",
+    "Repeat Recovery key password" : "再輸入還原金鑰密碼一次",
+    "Enabled" : "已啓用",
+    "Disabled" : "已停用",
+    "Change recovery key password:" : "變更還原金鑰密碼:",
+    "Old Recovery key password" : "舊的還原金鑰密碼",
+    "New Recovery key password" : "新的還原金鑰密碼",
+    "Repeat New Recovery key password" : "再輸入新的還原金鑰密碼一次",
+    "Change Password" : "變更密碼",
+    " 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" : "目前的登入密碼",
+    "Update Private Key Password" : "更新私人金鑰密碼",
+    "Enable password recovery:" : "啟用密碼還原:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_encryption/l10n/zh_TW.json b/apps/files_encryption/l10n/zh_TW.json
new file mode 100644
index 00000000000..c6560dc3738
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_TW.json
@@ -0,0 +1,40 @@
+{ "translations": {
+    "Unknown error" : "未知的錯誤",
+    "Recovery key successfully enabled" : "還原金鑰已成功開啟",
+    "Could not disable recovery key. Please check your recovery key password!" : "無法停用還原金鑰。請檢查您的還原金鑰密碼!",
+    "Recovery key successfully disabled" : "還原金鑰已成功停用",
+    "Password successfully changed." : "成功變更密碼。",
+    "Could not change the password. Maybe the old password was not correct." : "無法變更密碼，或許是輸入的舊密碼不正確。",
+    "Private key password successfully updated." : "私人金鑰密碼已成功更新。",
+    "Could not update the private key password. Maybe the old password was not correct." : "無法更新私人金鑰密碼。可能舊的密碼不正確。",
+    "File recovery settings updated" : "檔案還原設定已更新",
+    "Could not update file recovery" : "無法更新檔案還原設定",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密功能未初始化!可能加密功能需要重新啟用在現在的連線上。請試著登出再登入來初始化加密功能。",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "您的私人金鑰不正確!可能您的密碼已經變更在外部的 %s (例如:您的企業目錄)。您可以在您的個人設定中更新私人金鑰密碼來還原存取您的加密檔案。",
+    "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。",
+    "Unknown error. Please check your system settings or contact your administrator" : "未知錯誤請檢查您的系統設定或是聯絡您的管理員",
+    "Missing requirements." : "遺失必要條件。",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "請確認已安裝 PHP 5.3.3 或是更新的版本以及 OpenSSL 也一併安裝在 PHP extension 裡面並啟用及設置完成。現在，加密功能是停用的。",
+    "Following users are not set up for encryption:" : "以下的使用者無法設定加密:",
+    "Initial encryption started... This can take some time. Please wait." : "加密初始已啟用...這個需要一些時間。請稍等。",
+    "Initial encryption running... Please try again later." : "加密初始執行中...請晚點再試。",
+    "Encryption" : "加密",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "啟用還原金鑰 (因忘記密碼仍允許還原使用者檔案):",
+    "Recovery key password" : "還原金鑰密碼",
+    "Repeat Recovery key password" : "再輸入還原金鑰密碼一次",
+    "Enabled" : "已啓用",
+    "Disabled" : "已停用",
+    "Change recovery key password:" : "變更還原金鑰密碼:",
+    "Old Recovery key password" : "舊的還原金鑰密碼",
+    "New Recovery key password" : "新的還原金鑰密碼",
+    "Repeat New Recovery key password" : "再輸入新的還原金鑰密碼一次",
+    "Change Password" : "變更密碼",
+    " 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" : "目前的登入密碼",
+    "Update Private Key Password" : "更新私人金鑰密碼",
+    "Enable password recovery:" : "啟用密碼還原:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
deleted file mode 100644
index d4028b58310..00000000000
--- a/apps/files_encryption/l10n/zh_TW.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown error" => "未知的錯誤",
-"Recovery key successfully enabled" => "還原金鑰已成功開啟",
-"Could not disable recovery key. Please check your recovery key password!" => "無法停用還原金鑰。請檢查您的還原金鑰密碼!",
-"Recovery key successfully disabled" => "還原金鑰已成功停用",
-"Password successfully changed." => "成功變更密碼。",
-"Could not change the password. Maybe the old password was not correct." => "無法變更密碼，或許是輸入的舊密碼不正確。",
-"Private key password successfully updated." => "私人金鑰密碼已成功更新。",
-"Could not update the private key password. Maybe the old password was not correct." => "無法更新私人金鑰密碼。可能舊的密碼不正確。",
-"File recovery settings updated" => "檔案還原設定已更新",
-"Could not update file recovery" => "無法更新檔案還原設定",
-"Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." => "加密功能未初始化!可能加密功能需要重新啟用在現在的連線上。請試著登出再登入來初始化加密功能。",
-"Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." => "您的私人金鑰不正確!可能您的密碼已經變更在外部的 %s (例如:您的企業目錄)。您可以在您的個人設定中更新私人金鑰密碼來還原存取您的加密檔案。",
-"Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." => "無法解密這個檔案，也許這是分享的檔案。請詢問檔案所有人重新分享檔案給您。",
-"Unknown error. Please check your system settings or contact your administrator" => "未知錯誤請檢查您的系統設定或是聯絡您的管理員",
-"Missing requirements." => "遺失必要條件。",
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." => "請確認已安裝 PHP 5.3.3 或是更新的版本以及 OpenSSL 也一併安裝在 PHP extension 裡面並啟用及設置完成。現在，加密功能是停用的。",
-"Following users are not set up for encryption:" => "以下的使用者無法設定加密:",
-"Initial encryption started... This can take some time. Please wait." => "加密初始已啟用...這個需要一些時間。請稍等。",
-"Initial encryption running... Please try again later." => "加密初始執行中...請晚點再試。",
-"Encryption" => "加密",
-"Encryption App is enabled but your keys are not initialized, please log-out and log-in again" => "檔案加密已啓用，但是您的金鑰尚未初始化，請重新登入一次",
-"Enable recovery key (allow to recover users files in case of password loss):" => "啟用還原金鑰 (因忘記密碼仍允許還原使用者檔案):",
-"Recovery key password" => "還原金鑰密碼",
-"Repeat Recovery key password" => "再輸入還原金鑰密碼一次",
-"Enabled" => "已啓用",
-"Disabled" => "已停用",
-"Change recovery key password:" => "變更還原金鑰密碼:",
-"Old Recovery key password" => "舊的還原金鑰密碼",
-"New Recovery key password" => "新的還原金鑰密碼",
-"Repeat New Recovery key password" => "再輸入新的還原金鑰密碼一次",
-"Change Password" => "變更密碼",
-" 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" => "目前的登入密碼",
-"Update Private Key Password" => "更新私人金鑰密碼",
-"Enable password recovery:" => "啟用密碼還原:",
-"Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" => "啟用這個選項將會允許您因忘記密碼但需要存取您的加密檔案"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/af_ZA.js b/apps/files_external/l10n/af_ZA.js
new file mode 100644
index 00000000000..1c56071d430
--- /dev/null
+++ b/apps/files_external/l10n/af_ZA.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wagwoord",
+    "Share" : "Deel",
+    "Personal" : "Persoonlik"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/af_ZA.json b/apps/files_external/l10n/af_ZA.json
new file mode 100644
index 00000000000..ddb14146649
--- /dev/null
+++ b/apps/files_external/l10n/af_ZA.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wagwoord",
+    "Share" : "Deel",
+    "Personal" : "Persoonlik"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/af_ZA.php b/apps/files_external/l10n/af_ZA.php
deleted file mode 100644
index 7b416fc117a..00000000000
--- a/apps/files_external/l10n/af_ZA.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Username" => "Gebruikersnaam",
-"Password" => "Wagwoord",
-"Share" => "Deel",
-"Personal" => "Persoonlik"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ar.js b/apps/files_external/l10n/ar.js
new file mode 100644
index 00000000000..c2825869a7e
--- /dev/null
+++ b/apps/files_external/l10n/ar.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "المكان",
+    "Port" : "المنفذ",
+    "Region" : "المنطقة",
+    "Host" : "المضيف",
+    "Username" : "إسم المستخدم",
+    "Password" : "كلمة السر",
+    "Share" : "شارك",
+    "URL" : "عنوان الموقع",
+    "Personal" : "شخصي",
+    "Saved" : "حفظ",
+    "Name" : "اسم",
+    "Folder name" : "اسم المجلد",
+    "Configuration" : "إعداد",
+    "Delete" : "إلغاء"
+},
+"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_external/l10n/ar.json b/apps/files_external/l10n/ar.json
new file mode 100644
index 00000000000..64650283140
--- /dev/null
+++ b/apps/files_external/l10n/ar.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Location" : "المكان",
+    "Port" : "المنفذ",
+    "Region" : "المنطقة",
+    "Host" : "المضيف",
+    "Username" : "إسم المستخدم",
+    "Password" : "كلمة السر",
+    "Share" : "شارك",
+    "URL" : "عنوان الموقع",
+    "Personal" : "شخصي",
+    "Saved" : "حفظ",
+    "Name" : "اسم",
+    "Folder name" : "اسم المجلد",
+    "Configuration" : "إعداد",
+    "Delete" : "إلغاء"
+},"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_external/l10n/ar.php b/apps/files_external/l10n/ar.php
deleted file mode 100644
index ad06d9c778e..00000000000
--- a/apps/files_external/l10n/ar.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "المكان",
-"Port" => "المنفذ",
-"Region" => "المنطقة",
-"Host" => "المضيف",
-"Username" => "إسم المستخدم",
-"Password" => "كلمة السر",
-"Share" => "شارك",
-"URL" => "عنوان الموقع",
-"Personal" => "شخصي",
-"Saved" => "حفظ",
-"Name" => "اسم",
-"Folder name" => "اسم المجلد",
-"Configuration" => "إعداد",
-"Delete" => "إلغاء"
-);
-$PLURAL_FORMS = "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_external/l10n/ast.js b/apps/files_external/l10n/ast.js
new file mode 100644
index 00000000000..ec5ff68ac65
--- /dev/null
+++ b/apps/files_external/l10n/ast.js
@@ -0,0 +1,72 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
+    "Please provide a valid Dropbox app key and secret." : "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
+    "Step 1 failed. Exception: %s" : "Pasu 1 fallíu. Esceición: %s",
+    "Step 2 failed. Exception: %s" : "Pasu 2 fallíu. Esceición: %s",
+    "External storage" : "Almacenamientu esternu",
+    "Local" : "Llocal",
+    "Location" : "Llocalización",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clave",
+    "Secret" : "Secretu",
+    "Bucket" : "Depósitu",
+    "Amazon S3 and compliant" : "Amazon S3 y compatibilidá",
+    "Access Key" : "Clave d'accesu",
+    "Secret Key" : "Clave Secreta",
+    "Hostname" : "Nome d'agospiu",
+    "Port" : "Puertu",
+    "Region" : "Rexón",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilu de ruta",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "Host" : "Sirvidor",
+    "Username" : "Nome d'usuariu",
+    "Password" : "Contraseña",
+    "Root" : "Raíz",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "ID de veceru",
+    "Client secret" : "Veceru secretu",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Rexón (opcional pa OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Clave API (necesaria pa Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
+    "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
+    "Username as share" : "Nome d'usuariu como Compartición",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Access granted" : "Accesu concedíu",
+    "Error configuring Dropbox storage" : "Fallu configurando l'almacenamientu de Dropbox",
+    "Grant access" : "Conceder accesu",
+    "Error configuring Google Drive storage" : "Fallu configurando l'almacenamientu de Google Drive",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "(group)" : "(grupu)",
+    "Saved" : "Guardáu",
+    "<b>Note:</b> " : "<b>Nota:</b> ",
+    " and " : "y",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP 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.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
+    "You don't have any external storages" : "Nun tienes almacenamientos esternos",
+    "Name" : "Nome",
+    "Storage type" : "Triba d'almacenamientu",
+    "Scope" : "Ámbitu",
+    "External Storage" : "Almacenamientu esternu",
+    "Folder name" : "Nome de la carpeta",
+    "Configuration" : "Configuración",
+    "Available for" : "Disponible pa",
+    "Add storage" : "Amestar almacenamientu",
+    "Delete" : "Desaniciar",
+    "Enable User External Storage" : "Habilitar almacenamientu esterno d'usuariu",
+    "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamientu esternu"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/ast.json b/apps/files_external/l10n/ast.json
new file mode 100644
index 00000000000..21777896973
--- /dev/null
+++ b/apps/files_external/l10n/ast.json
@@ -0,0 +1,70 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
+    "Please provide a valid Dropbox app key and secret." : "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
+    "Step 1 failed. Exception: %s" : "Pasu 1 fallíu. Esceición: %s",
+    "Step 2 failed. Exception: %s" : "Pasu 2 fallíu. Esceición: %s",
+    "External storage" : "Almacenamientu esternu",
+    "Local" : "Llocal",
+    "Location" : "Llocalización",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clave",
+    "Secret" : "Secretu",
+    "Bucket" : "Depósitu",
+    "Amazon S3 and compliant" : "Amazon S3 y compatibilidá",
+    "Access Key" : "Clave d'accesu",
+    "Secret Key" : "Clave Secreta",
+    "Hostname" : "Nome d'agospiu",
+    "Port" : "Puertu",
+    "Region" : "Rexón",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilu de ruta",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "Host" : "Sirvidor",
+    "Username" : "Nome d'usuariu",
+    "Password" : "Contraseña",
+    "Root" : "Raíz",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "ID de veceru",
+    "Client secret" : "Veceru secretu",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Rexón (opcional pa OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Clave API (necesaria pa Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
+    "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
+    "Username as share" : "Nome d'usuariu como Compartición",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Access granted" : "Accesu concedíu",
+    "Error configuring Dropbox storage" : "Fallu configurando l'almacenamientu de Dropbox",
+    "Grant access" : "Conceder accesu",
+    "Error configuring Google Drive storage" : "Fallu configurando l'almacenamientu de Google Drive",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "(group)" : "(grupu)",
+    "Saved" : "Guardáu",
+    "<b>Note:</b> " : "<b>Nota:</b> ",
+    " and " : "y",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP 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.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
+    "You don't have any external storages" : "Nun tienes almacenamientos esternos",
+    "Name" : "Nome",
+    "Storage type" : "Triba d'almacenamientu",
+    "Scope" : "Ámbitu",
+    "External Storage" : "Almacenamientu esternu",
+    "Folder name" : "Nome de la carpeta",
+    "Configuration" : "Configuración",
+    "Available for" : "Disponible pa",
+    "Add storage" : "Amestar almacenamientu",
+    "Delete" : "Desaniciar",
+    "Enable User External Storage" : "Habilitar almacenamientu esterno d'usuariu",
+    "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamientu esternu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ast.php b/apps/files_external/l10n/ast.php
deleted file mode 100644
index 0aba42d38af..00000000000
--- a/apps/files_external/l10n/ast.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Falló la descarga de los tokens solicitaos. Verifica que la clave y el secretu de la app de Dropbox ye correuta.",
-"Please provide a valid Dropbox app key and secret." => "Por favor, proporciona una clave válida de l'app Dropbox y una clave secreta.",
-"Step 1 failed. Exception: %s" => "Pasu 1 fallíu. Esceición: %s",
-"Step 2 failed. Exception: %s" => "Pasu 2 fallíu. Esceición: %s",
-"External storage" => "Almacenamientu esternu",
-"Local" => "Llocal",
-"Location" => "Llocalización",
-"Amazon S3" => "Amazon S3",
-"Key" => "Clave",
-"Secret" => "Secretu",
-"Bucket" => "Depósitu",
-"Amazon S3 and compliant" => "Amazon S3 y compatibilidá",
-"Access Key" => "Clave d'accesu",
-"Secret Key" => "Clave Secreta",
-"Hostname" => "Nome d'agospiu",
-"Port" => "Puertu",
-"Region" => "Rexón",
-"Enable SSL" => "Habilitar SSL",
-"Enable Path Style" => "Habilitar Estilu de ruta",
-"App key" => "App principal",
-"App secret" => "App secreta",
-"Host" => "Sirvidor",
-"Username" => "Nome d'usuariu",
-"Password" => "Contraseña",
-"Root" => "Raíz",
-"Secure ftps://" => "Secure ftps://",
-"Client ID" => "ID de veceru",
-"Client secret" => "Veceru secretu",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Rexón (opcional pa OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "Clave API (necesaria pa Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Nome d'inquilín (necesariu pa OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Contraseña (necesaria pa OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
-"Share" => "Compartir",
-"SMB / CIFS using OC login" => "SMB / CIFS usando accesu OC",
-"Username as share" => "Nome d'usuariu como Compartición",
-"URL" => "URL",
-"Secure https://" => "Secure https://",
-"Remote subfolder" => "Subcarpeta remota",
-"Access granted" => "Accesu concedíu",
-"Error configuring Dropbox storage" => "Fallu configurando l'almacenamientu de Dropbox",
-"Grant access" => "Conceder accesu",
-"Error configuring Google Drive storage" => "Fallu configurando l'almacenamientu de Google Drive",
-"Personal" => "Personal",
-"System" => "Sistema",
-"(group)" => "(grupu)",
-"Saved" => "Guardáu",
-"<b>Note:</b> " => "<b>Nota:</b> ",
-" and " => "y",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de cURL en PHP 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.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" nun ta instaláu. Nun pue montase %s. Pídi-y al alministrador de sistema que lu instale.",
-"You don't have any external storages" => "Nun tienes almacenamientos esternos",
-"Name" => "Nome",
-"Storage type" => "Triba d'almacenamientu",
-"Scope" => "Ámbitu",
-"External Storage" => "Almacenamientu esternu",
-"Folder name" => "Nome de la carpeta",
-"Configuration" => "Configuración",
-"Available for" => "Disponible pa",
-"Add storage" => "Amestar almacenamientu",
-"Delete" => "Desaniciar",
-"Enable User External Storage" => "Habilitar almacenamientu esterno d'usuariu",
-"Allow users to mount the following external storage" => "Permitir a los usuarios montar el siguiente almacenamientu esternu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/az.js b/apps/files_external/l10n/az.js
new file mode 100644
index 00000000000..78cb4de59f4
--- /dev/null
+++ b/apps/files_external/l10n/az.js
@@ -0,0 +1,24 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
+    "Please provide a valid Dropbox app key and secret." : "Xahiş olunur düzgün Dropbox proqram açarı və gizlisini təqdim edəsiniz.",
+    "Step 2 failed. Exception: %s" : "2-ci addım. İstisna: %s",
+    "External storage" : "Kənar informasıya daşıyıcısı",
+    "Location" : "Yerləşdiyiniz ünvan",
+    "Key" : "Açar",
+    "Secret" : "Gizli",
+    "Enable SSL" : "SSL-i işə sal",
+    "Host" : "Şəbəkədə ünvan",
+    "Username" : "İstifadəçi adı",
+    "Password" : "Şifrə",
+    "Share" : "Yayımla",
+    "URL" : "URL",
+    "Personal" : "Şəxsi",
+    "Saved" : "Saxlanıldı",
+    "Name" : "Ad",
+    "Folder name" : "Qovluq adı",
+    "Delete" : "Sil"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/az.json b/apps/files_external/l10n/az.json
new file mode 100644
index 00000000000..e9d51e8fa92
--- /dev/null
+++ b/apps/files_external/l10n/az.json
@@ -0,0 +1,22 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
+    "Please provide a valid Dropbox app key and secret." : "Xahiş olunur düzgün Dropbox proqram açarı və gizlisini təqdim edəsiniz.",
+    "Step 2 failed. Exception: %s" : "2-ci addım. İstisna: %s",
+    "External storage" : "Kənar informasıya daşıyıcısı",
+    "Location" : "Yerləşdiyiniz ünvan",
+    "Key" : "Açar",
+    "Secret" : "Gizli",
+    "Enable SSL" : "SSL-i işə sal",
+    "Host" : "Şəbəkədə ünvan",
+    "Username" : "İstifadəçi adı",
+    "Password" : "Şifrə",
+    "Share" : "Yayımla",
+    "URL" : "URL",
+    "Personal" : "Şəxsi",
+    "Saved" : "Saxlanıldı",
+    "Name" : "Ad",
+    "Folder name" : "Qovluq adı",
+    "Delete" : "Sil"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/az.php b/apps/files_external/l10n/az.php
deleted file mode 100644
index 330e8234a61..00000000000
--- a/apps/files_external/l10n/az.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Müraciət token-nin alınmasında səhv baş verdi. Əmin olun ki, sizin Dropbox proqraminin açarı və gizlisi düzgündür.",
-"Please provide a valid Dropbox app key and secret." => "Xahiş olunur düzgün Dropbox proqram açarı və gizlisini təqdim edəsiniz.",
-"Step 2 failed. Exception: %s" => "2-ci addım. İstisna: %s",
-"External storage" => "Kənar informasıya daşıyıcısı",
-"Location" => "Yerləşdiyiniz ünvan",
-"Key" => "Açar",
-"Secret" => "Gizli",
-"Enable SSL" => "SSL-i işə sal",
-"Host" => "Şəbəkədə ünvan",
-"Username" => "İstifadəçi adı",
-"Password" => "Şifrə",
-"Share" => "Yayımla",
-"URL" => "URL",
-"Personal" => "Şəxsi",
-"Saved" => "Saxlanıldı",
-"Name" => "Ad",
-"Folder name" => "Qovluq adı",
-"Delete" => "Sil"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bg_BG.js b/apps/files_external/l10n/bg_BG.js
new file mode 100644
index 00000000000..1944af503f1
--- /dev/null
+++ b/apps/files_external/l10n/bg_BG.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
+    "Please provide a valid Dropbox app key and secret." : "Моля, задай валидни Dropbox app key и secret.",
+    "Step 1 failed. Exception: %s" : "Стъпка 1 - неуспешна. Грешка: %s",
+    "Step 2 failed. Exception: %s" : "Стъпка 2 - неуспешна. Грешка: %s",
+    "External storage" : "Външно дисково пространство",
+    "Local" : "Локален",
+    "Location" : "Местоположение",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Key",
+    "Secret" : "Secret",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 и съвместими",
+    "Access Key" : "Access Key",
+    "Secret Key" : "Secret Key",
+    "Hostname" : "Сървър",
+    "Port" : "Порт",
+    "Region" : "Регион",
+    "Enable SSL" : "Включи SSL",
+    "Enable Path Style" : "Включи Path Style",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Host" : "Сървър",
+    "Username" : "Потребителско Име",
+    "Password" : "Парола",
+    "Root" : "Root",
+    "Secure ftps://" : "Сигурен ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Регион (незадължително за OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (задължително за Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (задължително за OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Парола (задължително за OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Service Name (задължително за OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (задължително за OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Timeout за HTTP заявки в секунди",
+    "Share" : "Споделяне",
+    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
+    "Username as share" : "Потребителско име като споделена папка",
+    "URL" : "Интернет Адрес",
+    "Secure https://" : "Подсигурен https://",
+    "Remote subfolder" : "Външна подпапка",
+    "Access granted" : "Достъпът разрешен",
+    "Error configuring Dropbox storage" : "Грешка при настройката на Dropbox дисковото пространство.",
+    "Grant access" : "Разреши достъп",
+    "Error configuring Google Drive storage" : "Грешка при настройката на Dropbox дисковото пространство.",
+    "Personal" : "Личен",
+    "System" : "Системен",
+    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
+    "(group)" : "(група)",
+    "Saved" : "Запазено",
+    "<b>Note:</b> " : "<b>Бележка:</b> ",
+    " and " : "и",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+    "You don't have any external storages" : "Нямаш никакви външни дискови пространства",
+    "Name" : "Име",
+    "Storage type" : "Тип дисково пространство",
+    "Scope" : "Обхват",
+    "External Storage" : "Външно Дисково Пространство",
+    "Folder name" : "Име на папката",
+    "Configuration" : "Настройки",
+    "Available for" : "Достъпно за",
+    "Add storage" : "Добави дисково пространство",
+    "Delete" : "Изтрий",
+    "Enable User External Storage" : "Разреши Потребителско Външно Дисково Пространство",
+    "Allow users to mount the following external storage" : "Разреши на потребителите да прикачват следното външно дисково пространство"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/bg_BG.json b/apps/files_external/l10n/bg_BG.json
new file mode 100644
index 00000000000..0564415c3d6
--- /dev/null
+++ b/apps/files_external/l10n/bg_BG.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
+    "Please provide a valid Dropbox app key and secret." : "Моля, задай валидни Dropbox app key и secret.",
+    "Step 1 failed. Exception: %s" : "Стъпка 1 - неуспешна. Грешка: %s",
+    "Step 2 failed. Exception: %s" : "Стъпка 2 - неуспешна. Грешка: %s",
+    "External storage" : "Външно дисково пространство",
+    "Local" : "Локален",
+    "Location" : "Местоположение",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Key",
+    "Secret" : "Secret",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 и съвместими",
+    "Access Key" : "Access Key",
+    "Secret Key" : "Secret Key",
+    "Hostname" : "Сървър",
+    "Port" : "Порт",
+    "Region" : "Регион",
+    "Enable SSL" : "Включи SSL",
+    "Enable Path Style" : "Включи Path Style",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Host" : "Сървър",
+    "Username" : "Потребителско Име",
+    "Password" : "Парола",
+    "Root" : "Root",
+    "Secure ftps://" : "Сигурен ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Регион (незадължително за OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (задължително за Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (задължително за OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Парола (задължително за OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Service Name (задължително за OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (задължително за OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Timeout за HTTP заявки в секунди",
+    "Share" : "Споделяне",
+    "SMB / CIFS using OC login" : "SMB / CIFS използвайки OC профил",
+    "Username as share" : "Потребителско име като споделена папка",
+    "URL" : "Интернет Адрес",
+    "Secure https://" : "Подсигурен https://",
+    "Remote subfolder" : "Външна подпапка",
+    "Access granted" : "Достъпът разрешен",
+    "Error configuring Dropbox storage" : "Грешка при настройката на Dropbox дисковото пространство.",
+    "Grant access" : "Разреши достъп",
+    "Error configuring Google Drive storage" : "Грешка при настройката на Dropbox дисковото пространство.",
+    "Personal" : "Личен",
+    "System" : "Системен",
+    "All users. Type to select user or group." : "Всички потребители. Пиши, за да избереш потребител или група.",
+    "(group)" : "(група)",
+    "Saved" : "Запазено",
+    "<b>Note:</b> " : "<b>Бележка:</b> ",
+    " and " : "и",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
+    "You don't have any external storages" : "Нямаш никакви външни дискови пространства",
+    "Name" : "Име",
+    "Storage type" : "Тип дисково пространство",
+    "Scope" : "Обхват",
+    "External Storage" : "Външно Дисково Пространство",
+    "Folder name" : "Име на папката",
+    "Configuration" : "Настройки",
+    "Available for" : "Достъпно за",
+    "Add storage" : "Добави дисково пространство",
+    "Delete" : "Изтрий",
+    "Enable User External Storage" : "Разреши Потребителско Външно Дисково Пространство",
+    "Allow users to mount the following external storage" : "Разреши на потребителите да прикачват следното външно дисково пространство"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
deleted file mode 100644
index cb9663147cd..00000000000
--- a/apps/files_external/l10n/bg_BG.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Неуспешно изтеглянето на токени за заявка. Провери дали Dropbox app key и secret са правилни.",
-"Please provide a valid Dropbox app key and secret." => "Моля, задай валидни Dropbox app key и secret.",
-"Step 1 failed. Exception: %s" => "Стъпка 1 - неуспешна. Грешка: %s",
-"Step 2 failed. Exception: %s" => "Стъпка 2 - неуспешна. Грешка: %s",
-"External storage" => "Външно дисково пространство",
-"Local" => "Локален",
-"Location" => "Местоположение",
-"Amazon S3" => "Amazon S3",
-"Key" => "Key",
-"Secret" => "Secret",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 и съвместими",
-"Access Key" => "Access Key",
-"Secret Key" => "Secret Key",
-"Hostname" => "Сървър",
-"Port" => "Порт",
-"Region" => "Регион",
-"Enable SSL" => "Включи SSL",
-"Enable Path Style" => "Включи Path Style",
-"App key" => "App key",
-"App secret" => "App secret",
-"Host" => "Сървър",
-"Username" => "Потребителско Име",
-"Password" => "Парола",
-"Root" => "Root",
-"Secure ftps://" => "Сигурен ftps://",
-"Client ID" => "Client ID",
-"Client secret" => "Client secret",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Регион (незадължително за OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API Key (задължително за Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Tenantname (задължително за OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Парола (задължително за OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Service Name (задължително за OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL of identity endpoint (задължително за OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Timeout за HTTP заявки в секунди",
-"Share" => "Споделяне",
-"SMB / CIFS using OC login" => "SMB / CIFS използвайки OC профил",
-"Username as share" => "Потребителско име като споделена папка",
-"URL" => "Интернет Адрес",
-"Secure https://" => "Подсигурен https://",
-"Remote subfolder" => "Външна подпапка",
-"Access granted" => "Достъпът разрешен",
-"Error configuring Dropbox storage" => "Грешка при настройката на Dropbox дисковото пространство.",
-"Grant access" => "Разреши достъп",
-"Error configuring Google Drive storage" => "Грешка при настройката на Dropbox дисковото пространство.",
-"Personal" => "Личен",
-"System" => "Системен",
-"All users. Type to select user or group." => "Всички потребители. Пиши, за да избереш потребител или група.",
-"(group)" => "(група)",
-"Saved" => "Запазено",
-"<b>Note:</b> " => "<b>Бележка:</b> ",
-" and " => "и",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> PHP подръжката на cURL не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> PHP подръжката на FTP не е включена или инсталирана. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> \"%s\" не е инсталиран. Прикачването на %s не е възможно. Моля, поискай системния администратор да я инсталира.",
-"You don't have any external storages" => "Нямаш никакви външни дискови пространства",
-"Name" => "Име",
-"Storage type" => "Тип дисково пространство",
-"Scope" => "Обхват",
-"External Storage" => "Външно Дисково Пространство",
-"Folder name" => "Име на папката",
-"Configuration" => "Настройки",
-"Available for" => "Достъпно за",
-"Add storage" => "Добави дисково пространство",
-"Delete" => "Изтрий",
-"Enable User External Storage" => "Разреши Потребителско Външно Дисково Пространство",
-"Allow users to mount the following external storage" => "Разреши на потребителите да прикачват следното външно дисково пространство"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bn_BD.js b/apps/files_external/l10n/bn_BD.js
new file mode 100644
index 00000000000..1afb8c66ee1
--- /dev/null
+++ b/apps/files_external/l10n/bn_BD.js
@@ -0,0 +1,44 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।",
+    "Step 1 failed. Exception: %s" : "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
+    "External storage" : "বাহ্যিক সংরক্ষণাগার",
+    "Local" : "স্থানীয়",
+    "Location" : "অবস্থান",
+    "Amazon S3" : "আমাজন S3",
+    "Key" : "কী",
+    "Secret" : "গোপণীয়",
+    "Bucket" : "বালতি",
+    "Secret Key" : "গোপণ চাবি",
+    "Hostname" : "হোস্টনেম",
+    "Port" : "পোর্ট",
+    "Region" : "এলাকা",
+    "Enable SSL" : "SSL সক্রিয় কর",
+    "App key" : "অ্যাপ কি",
+    "App secret" : "অ্যাপ সিক্রেট",
+    "Host" : "হোস্ট",
+    "Username" : "ব্যবহারকারী",
+    "Password" : "কূটশব্দ",
+    "Root" : "শেকড়",
+    "Secure ftps://" : "ftps:// অর্জন কর",
+    "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Share" : "ভাগাভাগি কর",
+    "URL" : "URL",
+    "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
+    "Error configuring Dropbox storage" : "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
+    "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
+    "Error configuring Google Drive storage" : "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
+    "Personal" : "ব্যক্তিগত",
+    "(group)" : "(গোষ্ঠি)",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "<b>Note:</b> " : "<b>দ্রষ্টব্য:</b> ",
+    " and " : "এবং",
+    "Name" : "রাম",
+    "External Storage" : "বাহ্যিক সংরক্ষণাগার",
+    "Folder name" : "ফোলডারের নাম",
+    "Configuration" : "কনফিগারেসন",
+    "Delete" : "মুছে",
+    "Enable User External Storage" : "ব্যবহারকারীর বাহ্যিক সংরক্ষণাগার সক্রিয় কর"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/bn_BD.json b/apps/files_external/l10n/bn_BD.json
new file mode 100644
index 00000000000..975bf7cace7
--- /dev/null
+++ b/apps/files_external/l10n/bn_BD.json
@@ -0,0 +1,42 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।",
+    "Step 1 failed. Exception: %s" : "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
+    "External storage" : "বাহ্যিক সংরক্ষণাগার",
+    "Local" : "স্থানীয়",
+    "Location" : "অবস্থান",
+    "Amazon S3" : "আমাজন S3",
+    "Key" : "কী",
+    "Secret" : "গোপণীয়",
+    "Bucket" : "বালতি",
+    "Secret Key" : "গোপণ চাবি",
+    "Hostname" : "হোস্টনেম",
+    "Port" : "পোর্ট",
+    "Region" : "এলাকা",
+    "Enable SSL" : "SSL সক্রিয় কর",
+    "App key" : "অ্যাপ কি",
+    "App secret" : "অ্যাপ সিক্রেট",
+    "Host" : "হোস্ট",
+    "Username" : "ব্যবহারকারী",
+    "Password" : "কূটশব্দ",
+    "Root" : "শেকড়",
+    "Secure ftps://" : "ftps:// অর্জন কর",
+    "Client ID" : "ক্লায়েন্ট পরিচিতি",
+    "Share" : "ভাগাভাগি কর",
+    "URL" : "URL",
+    "Access granted" : "অধিগমনের  অনুমতি প্রদান করা হলো",
+    "Error configuring Dropbox storage" : "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
+    "Grant access" : "অধিগমনের  অনুমতি প্রদান কর",
+    "Error configuring Google Drive storage" : "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
+    "Personal" : "ব্যক্তিগত",
+    "(group)" : "(গোষ্ঠি)",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "<b>Note:</b> " : "<b>দ্রষ্টব্য:</b> ",
+    " and " : "এবং",
+    "Name" : "রাম",
+    "External Storage" : "বাহ্যিক সংরক্ষণাগার",
+    "Folder name" : "ফোলডারের নাম",
+    "Configuration" : "কনফিগারেসন",
+    "Delete" : "মুছে",
+    "Enable User External Storage" : "ব্যবহারকারীর বাহ্যিক সংরক্ষণাগার সক্রিয় কর"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/bn_BD.php b/apps/files_external/l10n/bn_BD.php
deleted file mode 100644
index 7e9a431275a..00000000000
--- a/apps/files_external/l10n/bn_BD.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "দয়া করে সঠিক এবং বৈধ Dropbox app key and secret প্রদান করুন।",
-"Step 1 failed. Exception: %s" => "প্রথম ধাপ ব্যার্থ। ব্যতিক্রম: %s",
-"External storage" => "বাহ্যিক সংরক্ষণাগার",
-"Local" => "স্থানীয়",
-"Location" => "অবস্থান",
-"Amazon S3" => "আমাজন S3",
-"Key" => "কী",
-"Secret" => "গোপণীয়",
-"Bucket" => "বালতি",
-"Secret Key" => "গোপণ চাবি",
-"Hostname" => "হোস্টনেম",
-"Port" => "পোর্ট",
-"Region" => "এলাকা",
-"Enable SSL" => "SSL সক্রিয় কর",
-"App key" => "অ্যাপ কি",
-"App secret" => "অ্যাপ সিক্রেট",
-"Host" => "হোস্ট",
-"Username" => "ব্যবহারকারী",
-"Password" => "কূটশব্দ",
-"Root" => "শেকড়",
-"Secure ftps://" => "ftps:// অর্জন কর",
-"Client ID" => "ক্লায়েন্ট পরিচিতি",
-"Share" => "ভাগাভাগি কর",
-"URL" => "URL",
-"Access granted" => "অধিগমনের  অনুমতি প্রদান করা হলো",
-"Error configuring Dropbox storage" => "Dropbox সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
-"Grant access" => "অধিগমনের  অনুমতি প্রদান কর",
-"Error configuring Google Drive storage" => "Google Drive সংরক্ষণাগার নির্ধারণ করতে সমস্যা ",
-"Personal" => "ব্যক্তিগত",
-"(group)" => "(গোষ্ঠি)",
-"Saved" => "সংরক্ষণ করা হলো",
-"<b>Note:</b> " => "<b>দ্রষ্টব্য:</b> ",
-" and " => "এবং",
-"Name" => "রাম",
-"External Storage" => "বাহ্যিক সংরক্ষণাগার",
-"Folder name" => "ফোলডারের নাম",
-"Configuration" => "কনফিগারেসন",
-"Delete" => "মুছে",
-"Enable User External Storage" => "ব্যবহারকারীর বাহ্যিক সংরক্ষণাগার সক্রিয় কর"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bn_IN.js b/apps/files_external/l10n/bn_IN.js
new file mode 100644
index 00000000000..cd66c82ab84
--- /dev/null
+++ b/apps/files_external/l10n/bn_IN.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Host" : "হোস্ট",
+    "Username" : "ইউজারনেম",
+    "Share" : "শেয়ার",
+    "URL" : "URL",
+    "Saved" : "সংরক্ষিত",
+    "Name" : "নাম",
+    "Folder name" : "ফোল্ডারের নাম",
+    "Delete" : "মুছে ফেলা"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/bn_IN.json b/apps/files_external/l10n/bn_IN.json
new file mode 100644
index 00000000000..ca30788dbc4
--- /dev/null
+++ b/apps/files_external/l10n/bn_IN.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Host" : "হোস্ট",
+    "Username" : "ইউজারনেম",
+    "Share" : "শেয়ার",
+    "URL" : "URL",
+    "Saved" : "সংরক্ষিত",
+    "Name" : "নাম",
+    "Folder name" : "ফোল্ডারের নাম",
+    "Delete" : "মুছে ফেলা"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/bn_IN.php b/apps/files_external/l10n/bn_IN.php
deleted file mode 100644
index 581496cc3f7..00000000000
--- a/apps/files_external/l10n/bn_IN.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Host" => "হোস্ট",
-"Username" => "ইউজারনেম",
-"Share" => "শেয়ার",
-"URL" => "URL",
-"Saved" => "সংরক্ষিত",
-"Name" => "নাম",
-"Folder name" => "ফোল্ডারের নাম",
-"Delete" => "মুছে ফেলা"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/bs.js b/apps/files_external/l10n/bs.js
new file mode 100644
index 00000000000..349554cd2dd
--- /dev/null
+++ b/apps/files_external/l10n/bs.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Share" : "Podijeli",
+    "Name" : "Ime"
+},
+"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/bs.json b/apps/files_external/l10n/bs.json
new file mode 100644
index 00000000000..123aaea647a
--- /dev/null
+++ b/apps/files_external/l10n/bs.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Share" : "Podijeli",
+    "Name" : "Ime"
+},"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_external/l10n/bs.php b/apps/files_external/l10n/bs.php
deleted file mode 100644
index 917ad1b49ef..00000000000
--- a/apps/files_external/l10n/bs.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Share" => "Podijeli",
-"Name" => "Ime"
-);
-$PLURAL_FORMS = "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
new file mode 100644
index 00000000000..4663654f63c
--- /dev/null
+++ b/apps/files_external/l10n/ca.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
+    "Please provide a valid Dropbox app key and secret." : "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
+    "Step 1 failed. Exception: %s" : "El pas 1 ha fallat. Excepció: %s",
+    "Step 2 failed. Exception: %s" : "El pas 2 ha fallat. Excepció: %s",
+    "External storage" : "Emmagatzemament extern",
+    "Local" : "Local",
+    "Location" : "Ubicació",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clau",
+    "Secret" : "Secret",
+    "Bucket" : "Cub",
+    "Amazon S3 and compliant" : "Amazon S3 i similars",
+    "Access Key" : "Clau d'accés",
+    "Secret Key" : "Clau secreta",
+    "Hostname" : "Nom del servidor",
+    "Port" : "Port",
+    "Region" : "Comarca",
+    "Enable SSL" : "Habilita SSL",
+    "Enable Path Style" : "Permet l'estil del camí",
+    "App key" : "Clau de l'aplicació",
+    "App secret" : "Secret de l'aplicació",
+    "Host" : "Equip remot",
+    "Username" : "Nom d'usuari",
+    "Password" : "Contrasenya",
+    "Root" : "Arrel",
+    "Secure ftps://" : "Protocol segur ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Secret del client",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regió (opcional per OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Clau API (requerit per fitxers al núvol Rackspace)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requerit per OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Contrasenya (requerit per OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nom del servei (requerit per OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt identificador final (requerit per OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Temps d'expera màxim de les peticions HTTP en segons",
+    "Share" : "Comparteix",
+    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
+    "Username as share" : "Nom d'usuari per compartir",
+    "URL" : "URL",
+    "Secure https://" : "Protocol segur https://",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Access granted" : "S'ha concedit l'accés",
+    "Error configuring Dropbox storage" : "Error en configurar l'emmagatzemament Dropbox",
+    "Grant access" : "Concedeix accés",
+    "Error configuring Google Drive storage" : "Error en configurar l'emmagatzemament Google Drive",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
+    "(group)" : "(grup)",
+    "Saved" : "Desat",
+    "<b>Note:</b> " : "<b>Nota:</b> ",
+    " and " : "i",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
+    "You don't have any external storages" : "No teniu emmagatzaments externs",
+    "Name" : "Nom",
+    "Storage type" : "Tipus d'emmagatzemament",
+    "Scope" : "Abast",
+    "External Storage" : "Emmagatzemament extern",
+    "Folder name" : "Nom de la carpeta",
+    "Configuration" : "Configuració",
+    "Available for" : "Disponible per",
+    "Add storage" : "Afegeix emmagatzemament",
+    "Delete" : "Esborra",
+    "Enable User External Storage" : "Habilita l'emmagatzemament extern d'usuari",
+    "Allow users to mount the following external storage" : "Permet als usuaris muntar els dispositius externs següents"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/ca.json b/apps/files_external/l10n/ca.json
new file mode 100644
index 00000000000..6bd1dcca39b
--- /dev/null
+++ b/apps/files_external/l10n/ca.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
+    "Please provide a valid Dropbox app key and secret." : "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
+    "Step 1 failed. Exception: %s" : "El pas 1 ha fallat. Excepció: %s",
+    "Step 2 failed. Exception: %s" : "El pas 2 ha fallat. Excepció: %s",
+    "External storage" : "Emmagatzemament extern",
+    "Local" : "Local",
+    "Location" : "Ubicació",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clau",
+    "Secret" : "Secret",
+    "Bucket" : "Cub",
+    "Amazon S3 and compliant" : "Amazon S3 i similars",
+    "Access Key" : "Clau d'accés",
+    "Secret Key" : "Clau secreta",
+    "Hostname" : "Nom del servidor",
+    "Port" : "Port",
+    "Region" : "Comarca",
+    "Enable SSL" : "Habilita SSL",
+    "Enable Path Style" : "Permet l'estil del camí",
+    "App key" : "Clau de l'aplicació",
+    "App secret" : "Secret de l'aplicació",
+    "Host" : "Equip remot",
+    "Username" : "Nom d'usuari",
+    "Password" : "Contrasenya",
+    "Root" : "Arrel",
+    "Secure ftps://" : "Protocol segur ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Secret del client",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regió (opcional per OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Clau API (requerit per fitxers al núvol Rackspace)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (requerit per OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Contrasenya (requerit per OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nom del servei (requerit per OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del punt identificador final (requerit per OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Temps d'expera màxim de les peticions HTTP en segons",
+    "Share" : "Comparteix",
+    "SMB / CIFS using OC login" : "SMB / CIFS usant acreditació OC",
+    "Username as share" : "Nom d'usuari per compartir",
+    "URL" : "URL",
+    "Secure https://" : "Protocol segur https://",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Access granted" : "S'ha concedit l'accés",
+    "Error configuring Dropbox storage" : "Error en configurar l'emmagatzemament Dropbox",
+    "Grant access" : "Concedeix accés",
+    "Error configuring Google Drive storage" : "Error en configurar l'emmagatzemament Google Drive",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
+    "(group)" : "(grup)",
+    "Saved" : "Desat",
+    "<b>Note:</b> " : "<b>Nota:</b> ",
+    " and " : "i",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
+    "You don't have any external storages" : "No teniu emmagatzaments externs",
+    "Name" : "Nom",
+    "Storage type" : "Tipus d'emmagatzemament",
+    "Scope" : "Abast",
+    "External Storage" : "Emmagatzemament extern",
+    "Folder name" : "Nom de la carpeta",
+    "Configuration" : "Configuració",
+    "Available for" : "Disponible per",
+    "Add storage" : "Afegeix emmagatzemament",
+    "Delete" : "Esborra",
+    "Enable User External Storage" : "Habilita l'emmagatzemament extern d'usuari",
+    "Allow users to mount the following external storage" : "Permet als usuaris muntar els dispositius externs següents"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
deleted file mode 100644
index 13e6616d2c4..00000000000
--- a/apps/files_external/l10n/ca.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Ha fallat en obtenir els testimonis de la petició. Verifiqueu que la clau i la contrasenya de l'aplicació Dropbox són correctes.",
-"Please provide a valid Dropbox app key and secret." => "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
-"Step 1 failed. Exception: %s" => "El pas 1 ha fallat. Excepció: %s",
-"Step 2 failed. Exception: %s" => "El pas 2 ha fallat. Excepció: %s",
-"External storage" => "Emmagatzemament extern",
-"Local" => "Local",
-"Location" => "Ubicació",
-"Amazon S3" => "Amazon S3",
-"Key" => "Clau",
-"Secret" => "Secret",
-"Bucket" => "Cub",
-"Amazon S3 and compliant" => "Amazon S3 i similars",
-"Access Key" => "Clau d'accés",
-"Secret Key" => "Clau secreta",
-"Hostname" => "Nom del servidor",
-"Port" => "Port",
-"Region" => "Comarca",
-"Enable SSL" => "Habilita SSL",
-"Enable Path Style" => "Permet l'estil del camí",
-"App key" => "Clau de l'aplicació",
-"App secret" => "Secret de l'aplicació",
-"Host" => "Equip remot",
-"Username" => "Nom d'usuari",
-"Password" => "Contrasenya",
-"Root" => "Arrel",
-"Secure ftps://" => "Protocol segur ftps://",
-"Client ID" => "Client ID",
-"Client secret" => "Secret del client",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Regió (opcional per OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "Clau API (requerit per fitxers al núvol Rackspace)",
-"Tenantname (required for OpenStack Object Storage)" => "Tenantname (requerit per OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Contrasenya (requerit per OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Nom del servei (requerit per OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL del punt identificador final (requerit per OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Temps d'expera màxim de les peticions HTTP en segons",
-"Share" => "Comparteix",
-"SMB / CIFS using OC login" => "SMB / CIFS usant acreditació OC",
-"Username as share" => "Nom d'usuari per compartir",
-"URL" => "URL",
-"Secure https://" => "Protocol segur https://",
-"Remote subfolder" => "Subcarpeta remota",
-"Access granted" => "S'ha concedit l'accés",
-"Error configuring Dropbox storage" => "Error en configurar l'emmagatzemament Dropbox",
-"Grant access" => "Concedeix accés",
-"Error configuring Google Drive storage" => "Error en configurar l'emmagatzemament Google Drive",
-"Personal" => "Personal",
-"System" => "Sistema",
-"All users. Type to select user or group." => "Tots els usuaris. Escriu per seleccionar un usuari o grup.",
-"(group)" => "(grup)",
-"Saved" => "Desat",
-"<b>Note:</b> " => "<b>Nota:</b> ",
-" and " => "i",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El suport cURL no està activat o instal·lat a PHP. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> %s no està instal·lat. No es pot muntar %s. Demaneu a l'administrador del sistema que l'instal·li.",
-"You don't have any external storages" => "No teniu emmagatzaments externs",
-"Name" => "Nom",
-"Storage type" => "Tipus d'emmagatzemament",
-"Scope" => "Abast",
-"External Storage" => "Emmagatzemament extern",
-"Folder name" => "Nom de la carpeta",
-"Configuration" => "Configuració",
-"Available for" => "Disponible per",
-"Add storage" => "Afegeix emmagatzemament",
-"Delete" => "Esborra",
-"Enable User External Storage" => "Habilita l'emmagatzemament extern d'usuari",
-"Allow users to mount the following external storage" => "Permet als usuaris muntar els dispositius externs següents"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/cs_CZ.js b/apps/files_external/l10n/cs_CZ.js
new file mode 100644
index 00000000000..29af393cf07
--- /dev/null
+++ b/apps/files_external/l10n/cs_CZ.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
+    "Please provide a valid Dropbox app key and secret." : "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
+    "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
+    "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
+    "External storage" : "Externí úložiště",
+    "Local" : "Místní",
+    "Location" : "Umístění",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Klíč",
+    "Secret" : "Tajemství",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 a kompatibilní",
+    "Access Key" : "Přístupový klíč",
+    "Secret Key" : "Tajný klíč",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Kraj",
+    "Enable SSL" : "Povolit SSL",
+    "Enable Path Style" : "Povolit Path Style",
+    "App key" : "Klíč aplikace",
+    "App secret" : "Tajemství aplikace",
+    "Host" : "Počítač",
+    "Username" : "Uživatelské jméno",
+    "Password" : "Heslo",
+    "Root" : "Kořen",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Client ID" : "Klientské ID",
+    "Client secret" : "Klientské tajemství",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (nepovinný pro OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API klíč (vyžadován pro Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Heslo (vyžadováno pro OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Název služby (vyžadováno pro OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadavků v sekundách",
+    "Share" : "Sdílet",
+    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
+    "Username as share" : "Uživatelské jméno jako sdílený adresář",
+    "URL" : "URL",
+    "Secure https://" : "Zabezpečené https://",
+    "Remote subfolder" : "Vzdálený podadresář",
+    "Access granted" : "Přístup povolen",
+    "Error configuring Dropbox storage" : "Chyba při nastavení úložiště Dropbox",
+    "Grant access" : "Povolit přístup",
+    "Error configuring Google Drive storage" : "Chyba při nastavení úložiště Google Drive",
+    "Personal" : "Osobní",
+    "System" : "Systém",
+    "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",
+    "<b>Note:</b> " : "<b>Poznámka:</b>",
+    " and " : "a",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.",
+    "You don't have any external storages" : "Nemáte žádná externí úložiště",
+    "Name" : "Název",
+    "Storage type" : "Typ úložiště",
+    "Scope" : "Rozsah",
+    "External Storage" : "Externí úložiště",
+    "Folder name" : "Název složky",
+    "Configuration" : "Nastavení",
+    "Available for" : "Dostupné pro",
+    "Add storage" : "Přidat úložiště",
+    "Delete" : "Smazat",
+    "Enable User External Storage" : "Zapnout externí uživatelské úložiště",
+    "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_external/l10n/cs_CZ.json b/apps/files_external/l10n/cs_CZ.json
new file mode 100644
index 00000000000..f8acc7d469d
--- /dev/null
+++ b/apps/files_external/l10n/cs_CZ.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
+    "Please provide a valid Dropbox app key and secret." : "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
+    "Step 1 failed. Exception: %s" : "Selhal krok 1. Výjimka: %s",
+    "Step 2 failed. Exception: %s" : "Selhal krok 2. Výjimka: %s",
+    "External storage" : "Externí úložiště",
+    "Local" : "Místní",
+    "Location" : "Umístění",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Klíč",
+    "Secret" : "Tajemství",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 a kompatibilní",
+    "Access Key" : "Přístupový klíč",
+    "Secret Key" : "Tajný klíč",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Kraj",
+    "Enable SSL" : "Povolit SSL",
+    "Enable Path Style" : "Povolit Path Style",
+    "App key" : "Klíč aplikace",
+    "App secret" : "Tajemství aplikace",
+    "Host" : "Počítač",
+    "Username" : "Uživatelské jméno",
+    "Password" : "Heslo",
+    "Root" : "Kořen",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Client ID" : "Klientské ID",
+    "Client secret" : "Klientské tajemství",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (nepovinný pro OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API klíč (vyžadován pro Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Heslo (vyžadováno pro OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Název služby (vyžadováno pro OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadavků v sekundách",
+    "Share" : "Sdílet",
+    "SMB / CIFS using OC login" : "SMB / CIFS za použití přihlašovacího jména OC",
+    "Username as share" : "Uživatelské jméno jako sdílený adresář",
+    "URL" : "URL",
+    "Secure https://" : "Zabezpečené https://",
+    "Remote subfolder" : "Vzdálený podadresář",
+    "Access granted" : "Přístup povolen",
+    "Error configuring Dropbox storage" : "Chyba při nastavení úložiště Dropbox",
+    "Grant access" : "Povolit přístup",
+    "Error configuring Google Drive storage" : "Chyba při nastavení úložiště Google Drive",
+    "Personal" : "Osobní",
+    "System" : "Systém",
+    "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",
+    "<b>Note:</b> " : "<b>Poznámka:</b>",
+    " and " : "a",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.",
+    "You don't have any external storages" : "Nemáte žádná externí úložiště",
+    "Name" : "Název",
+    "Storage type" : "Typ úložiště",
+    "Scope" : "Rozsah",
+    "External Storage" : "Externí úložiště",
+    "Folder name" : "Název složky",
+    "Configuration" : "Nastavení",
+    "Available for" : "Dostupné pro",
+    "Add storage" : "Přidat úložiště",
+    "Delete" : "Smazat",
+    "Enable User External Storage" : "Zapnout externí uživatelské úložiště",
+    "Allow users to mount the following external storage" : "Povolit uživatelů připojit následující externí úložiště"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
deleted file mode 100644
index 99a4e731986..00000000000
--- a/apps/files_external/l10n/cs_CZ.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Získání přístupových tokenů selhalo. Ověřte že klíč aplikace Dropbox a tajné heslo jsou správné.",
-"Please provide a valid Dropbox app key and secret." => "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
-"Step 1 failed. Exception: %s" => "Selhal krok 1. Výjimka: %s",
-"Step 2 failed. Exception: %s" => "Selhal krok 2. Výjimka: %s",
-"External storage" => "Externí úložiště",
-"Local" => "Místní",
-"Location" => "Umístění",
-"Amazon S3" => "Amazon S3",
-"Key" => "Klíč",
-"Secret" => "Tajemství",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 a kompatibilní",
-"Access Key" => "Přístupový klíč",
-"Secret Key" => "Tajný klíč",
-"Hostname" => "Hostname",
-"Port" => "Port",
-"Region" => "Kraj",
-"Enable SSL" => "Povolit SSL",
-"Enable Path Style" => "Povolit Path Style",
-"App key" => "Klíč aplikace",
-"App secret" => "Tajemství aplikace",
-"Host" => "Počítač",
-"Username" => "Uživatelské jméno",
-"Password" => "Heslo",
-"Root" => "Kořen",
-"Secure ftps://" => "Zabezpečené ftps://",
-"Client ID" => "Klientské ID",
-"Client secret" => "Klientské tajemství",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Region (nepovinný pro OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API klíč (vyžadován pro Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Jméno nájemce (vyžadováno pro OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Heslo (vyžadováno pro OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Název služby (vyžadováno pro OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL identity koncového bodu (vyžadováno pro OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Časový limit HTTP požadavků v sekundách",
-"Share" => "Sdílet",
-"SMB / CIFS using OC login" => "SMB / CIFS za použití přihlašovacího jména OC",
-"Username as share" => "Uživatelské jméno jako sdílený adresář",
-"URL" => "URL",
-"Secure https://" => "Zabezpečené https://",
-"Remote subfolder" => "Vzdálený podadresář",
-"Access granted" => "Přístup povolen",
-"Error configuring Dropbox storage" => "Chyba při nastavení úložiště Dropbox",
-"Grant access" => "Povolit přístup",
-"Error configuring Google Drive storage" => "Chyba při nastavení úložiště Google Drive",
-"Personal" => "Osobní",
-"System" => "Systém",
-"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",
-"<b>Note:</b> " => "<b>Poznámka:</b>",
-" and " => "a",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> cURL podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> FTP podpora v PHP není povolena nebo nainstalována. Není možné připojení %s. Prosím požádejte svého správce systému ať ji nainstaluje.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> \"%s\" není instalováno. Není možné připojení %s. Prosím požádejte svého správce systému o instalaci.",
-"You don't have any external storages" => "Nemáte žádná externí úložiště",
-"Name" => "Název",
-"Storage type" => "Typ úložiště",
-"Scope" => "Rozsah",
-"External Storage" => "Externí úložiště",
-"Folder name" => "Název složky",
-"Configuration" => "Nastavení",
-"Available for" => "Dostupné pro",
-"Add storage" => "Přidat úložiště",
-"Delete" => "Smazat",
-"Enable User External Storage" => "Zapnout externí uživatelské úložiště",
-"Allow users to mount the following external storage" => "Povolit uživatelů připojit následující externí úložiště"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/cy_GB.js b/apps/files_external/l10n/cy_GB.js
new file mode 100644
index 00000000000..4cd0a336e90
--- /dev/null
+++ b/apps/files_external/l10n/cy_GB.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Lleoliad",
+    "Username" : "Enw defnyddiwr",
+    "Password" : "Cyfrinair",
+    "Share" : "Rhannu",
+    "URL" : "URL",
+    "Personal" : "Personol",
+    "Name" : "Enw",
+    "Delete" : "Dileu"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/files_external/l10n/cy_GB.json b/apps/files_external/l10n/cy_GB.json
new file mode 100644
index 00000000000..257039de583
--- /dev/null
+++ b/apps/files_external/l10n/cy_GB.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Location" : "Lleoliad",
+    "Username" : "Enw defnyddiwr",
+    "Password" : "Cyfrinair",
+    "Share" : "Rhannu",
+    "URL" : "URL",
+    "Personal" : "Personol",
+    "Name" : "Enw",
+    "Delete" : "Dileu"
+},"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/files_external/l10n/cy_GB.php b/apps/files_external/l10n/cy_GB.php
deleted file mode 100644
index 26420c555c4..00000000000
--- a/apps/files_external/l10n/cy_GB.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Lleoliad",
-"Username" => "Enw defnyddiwr",
-"Password" => "Cyfrinair",
-"Share" => "Rhannu",
-"URL" => "URL",
-"Personal" => "Personol",
-"Name" => "Enw",
-"Delete" => "Dileu"
-);
-$PLURAL_FORMS = "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
new file mode 100644
index 00000000000..5420917e2a9
--- /dev/null
+++ b/apps/files_external/l10n/da.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for forespørgsler mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for adgang mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
+    "Please provide a valid Dropbox app key and secret." : "Angiv venligst en gyldig Dropbox app-nøgle og hemmelighed",
+    "Step 1 failed. Exception: %s" : "Trin 1 mislykkedes. Undtagelse: %s",
+    "Step 2 failed. Exception: %s" : "Trin 2 mislykkedes. Undtagelse: %s",
+    "External storage" : "Eksternt lager",
+    "Local" : "Lokal",
+    "Location" : "Placering",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Nøgle",
+    "Secret" : "Hemmelighed",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 og kompatible",
+    "Access Key" : "Adgangsnøgle",
+    "Secret Key" : "Hemmelig nøgle ",
+    "Hostname" : "Værtsnavn",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Aktivér SSL",
+    "Enable Path Style" : "Aktivér stil for sti",
+    "App key" : "App-nøgle",
+    "App secret" : "App-hemmelighed",
+    "Host" : "Vært",
+    "Username" : "Brugernavn",
+    "Password" : "Kodeord",
+    "Root" : "Root",
+    "Secure ftps://" : "Sikker ftps://",
+    "Client ID" : "Klient-ID",
+    "Client secret" : "Klient hemmelighed",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (valgfri for OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API-nøgle (påkrævet for Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Lejers navn (påkrævet for OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Adgangskode (påkrævet for OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Service Navn (påkrævet for OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tidsudløb for HTTP-forespørgsler i sekunder",
+    "Share" : "Del",
+    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
+    "Username as share" : "Brugernavn som deling",
+    "URL" : "URL",
+    "Secure https://" : "Sikker https://",
+    "Remote subfolder" : "Fjernundermappe",
+    "Access granted" : "Adgang godkendt",
+    "Error configuring Dropbox storage" : "Fejl ved konfiguration af Dropbox plads",
+    "Grant access" : "Godkend adgang",
+    "Error configuring Google Drive storage" : "Fejl ved konfiguration af Google Drive-plads",
+    "Personal" : "Personligt",
+    "System" : "System",
+    "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.",
+    "(group)" : "(gruppe)",
+    "Saved" : "Gemt",
+    "<b>Note:</b> " : "<b>Note:</b> ",
+    " and " : "og",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  \"%s\" er ikke installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
+    "You don't have any external storages" : "Du har ingen eksterne lagre",
+    "Name" : "Navn",
+    "Storage type" : "Lagertype",
+    "Scope" : "Anvendelsesområde",
+    "External Storage" : "Ekstern opbevaring",
+    "Folder name" : "Mappenavn",
+    "Configuration" : "Opsætning",
+    "Available for" : "Tilgængelig for",
+    "Add storage" : "Tilføj lager",
+    "Delete" : "Slet",
+    "Enable User External Storage" : "Aktivér ekstern opbevaring for brugere",
+    "Allow users to mount the following external storage" : "Tillad brugere at montere følgende som eksternt lager"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/da.json b/apps/files_external/l10n/da.json
new file mode 100644
index 00000000000..d5c468a5d8e
--- /dev/null
+++ b/apps/files_external/l10n/da.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for forespørgsler mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Indhentning af symboludtryk for adgang mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
+    "Please provide a valid Dropbox app key and secret." : "Angiv venligst en gyldig Dropbox app-nøgle og hemmelighed",
+    "Step 1 failed. Exception: %s" : "Trin 1 mislykkedes. Undtagelse: %s",
+    "Step 2 failed. Exception: %s" : "Trin 2 mislykkedes. Undtagelse: %s",
+    "External storage" : "Eksternt lager",
+    "Local" : "Lokal",
+    "Location" : "Placering",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Nøgle",
+    "Secret" : "Hemmelighed",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 og kompatible",
+    "Access Key" : "Adgangsnøgle",
+    "Secret Key" : "Hemmelig nøgle ",
+    "Hostname" : "Værtsnavn",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Aktivér SSL",
+    "Enable Path Style" : "Aktivér stil for sti",
+    "App key" : "App-nøgle",
+    "App secret" : "App-hemmelighed",
+    "Host" : "Vært",
+    "Username" : "Brugernavn",
+    "Password" : "Kodeord",
+    "Root" : "Root",
+    "Secure ftps://" : "Sikker ftps://",
+    "Client ID" : "Klient-ID",
+    "Client secret" : "Klient hemmelighed",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (valgfri for OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API-nøgle (påkrævet for Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Lejers navn (påkrævet for OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Adgangskode (påkrævet for OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Service Navn (påkrævet for OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tidsudløb for HTTP-forespørgsler i sekunder",
+    "Share" : "Del",
+    "SMB / CIFS using OC login" : "SMB / CIFS med OC-login",
+    "Username as share" : "Brugernavn som deling",
+    "URL" : "URL",
+    "Secure https://" : "Sikker https://",
+    "Remote subfolder" : "Fjernundermappe",
+    "Access granted" : "Adgang godkendt",
+    "Error configuring Dropbox storage" : "Fejl ved konfiguration af Dropbox plads",
+    "Grant access" : "Godkend adgang",
+    "Error configuring Google Drive storage" : "Fejl ved konfiguration af Google Drive-plads",
+    "Personal" : "Personligt",
+    "System" : "System",
+    "All users. Type to select user or group." : "Alle brugere. Indtast for at vælge bruger eller gruppe.",
+    "(group)" : "(gruppe)",
+    "Saved" : "Gemt",
+    "<b>Note:</b> " : "<b>Note:</b> ",
+    " and " : "og",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Bemærk:</b>  \"%s\" er ikke installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
+    "You don't have any external storages" : "Du har ingen eksterne lagre",
+    "Name" : "Navn",
+    "Storage type" : "Lagertype",
+    "Scope" : "Anvendelsesområde",
+    "External Storage" : "Ekstern opbevaring",
+    "Folder name" : "Mappenavn",
+    "Configuration" : "Opsætning",
+    "Available for" : "Tilgængelig for",
+    "Add storage" : "Tilføj lager",
+    "Delete" : "Slet",
+    "Enable User External Storage" : "Aktivér ekstern opbevaring for brugere",
+    "Allow users to mount the following external storage" : "Tillad brugere at montere følgende som eksternt lager"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/da.php b/apps/files_external/l10n/da.php
deleted file mode 100644
index 717f077b5e3..00000000000
--- a/apps/files_external/l10n/da.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Indhentning af symboludtryk for forespørgsler mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Indhentning af symboludtryk for adgang mislykkedes. Verificér at din Dropbox app-nøgle og -hemmelighed er korrekte.",
-"Please provide a valid Dropbox app key and secret." => "Angiv venligst en gyldig Dropbox app-nøgle og hemmelighed",
-"Step 1 failed. Exception: %s" => "Trin 1 mislykkedes. Undtagelse: %s",
-"Step 2 failed. Exception: %s" => "Trin 2 mislykkedes. Undtagelse: %s",
-"External storage" => "Eksternt lager",
-"Local" => "Lokal",
-"Location" => "Placering",
-"Amazon S3" => "Amazon S3",
-"Key" => "Nøgle",
-"Secret" => "Hemmelighed",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 og kompatible",
-"Access Key" => "Adgangsnøgle",
-"Secret Key" => "Hemmelig nøgle ",
-"Hostname" => "Værtsnavn",
-"Port" => "Port",
-"Region" => "Region",
-"Enable SSL" => "Aktivér SSL",
-"Enable Path Style" => "Aktivér stil for sti",
-"App key" => "App-nøgle",
-"App secret" => "App-hemmelighed",
-"Host" => "Vært",
-"Username" => "Brugernavn",
-"Password" => "Kodeord",
-"Root" => "Root",
-"Secure ftps://" => "Sikker ftps://",
-"Client ID" => "Klient-ID",
-"Client secret" => "Klient hemmelighed",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Region (valgfri for OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API-nøgle (påkrævet for Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Lejers navn (påkrævet for OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Adgangskode (påkrævet for OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Service Navn (påkrævet for OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL på slutpunkt for identitet (påkrævet for OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Tidsudløb for HTTP-forespørgsler i sekunder",
-"Share" => "Del",
-"SMB / CIFS using OC login" => "SMB / CIFS med OC-login",
-"Username as share" => "Brugernavn som deling",
-"URL" => "URL",
-"Secure https://" => "Sikker https://",
-"Remote subfolder" => "Fjernundermappe",
-"Access granted" => "Adgang godkendt",
-"Error configuring Dropbox storage" => "Fejl ved konfiguration af Dropbox plads",
-"Grant access" => "Godkend adgang",
-"Error configuring Google Drive storage" => "Fejl ved konfiguration af Google Drive-plads",
-"Personal" => "Personligt",
-"System" => "System",
-"All users. Type to select user or group." => "Alle brugere. Indtast for at vælge bruger eller gruppe.",
-"(group)" => "(gruppe)",
-"Saved" => "Gemt",
-"<b>Note:</b> " => "<b>Note:</b> ",
-" and " => "og",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Bemærk:</b>  cURL-understøttelsen i PHP er enten ikke aktiveret eller installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Bemærk:</b>  FTP understøttelsen i PHP er enten ikke aktiveret eller installeret. Montering af %s er ikke muligt. Anmod din systemadministrator om at installere det.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Bemærk:</b>  \"%s\" er ikke installeret. Monteringen af %s er ikke mulig. Anmod din systemadministrator om at installere det.",
-"You don't have any external storages" => "Du har ingen eksterne lagre",
-"Name" => "Navn",
-"Storage type" => "Lagertype",
-"Scope" => "Anvendelsesområde",
-"External Storage" => "Ekstern opbevaring",
-"Folder name" => "Mappenavn",
-"Configuration" => "Opsætning",
-"Available for" => "Tilgængelig for",
-"Add storage" => "Tilføj lager",
-"Delete" => "Slet",
-"Enable User External Storage" => "Aktivér ekstern opbevaring for brugere",
-"Allow users to mount the following external storage" => "Tillad brugere at montere følgende som eksternt lager"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de.js b/apps/files_external/l10n/de.js
new file mode 100644
index 00000000000..d67bda49b4d
--- /dev/null
+++ b/apps/files_external/l10n/de.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Anfrage-Token holen fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Zugriff-Token holen fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
+    "Please provide a valid Dropbox app key and secret." : "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
+    "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
+    "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
+    "External storage" : "Externer Speicher",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Schlüssel",
+    "Secret" : "Geheime Zeichenkette",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 und kompatible",
+    "Access Key" : "Zugriffsschlüssel",
+    "Secret Key" : "Sicherheitssschlüssel",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfad-Stil aktivieren",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Host" : "Host",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "Root" : "Root",
+    "Secure ftps://" : "Sicherer FTPS://",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
+    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
+    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
+    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
+    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
+    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
+    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
+    "Share" : "Teilen",
+    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
+    "Username as share" : "Benutzername als Freigabe",
+    "URL" : "URL",
+    "Secure https://" : "Sicherer HTTPS://",
+    "Remote subfolder" : "Remote-Unterordner:",
+    "Access granted" : "Zugriff gestattet",
+    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
+    "Grant access" : "Zugriff gestatten",
+    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
+    "Personal" : "Persönlich",
+    "System" : "System",
+    "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+    "(group)" : "(group)",
+    "Saved" : "Gespeichert",
+    "<b>Note:</b> " : "<b>Hinweis:</b> ",
+    " and " : "und",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
+    "You don't have any external storages" : "Du hast noch keinen externen Speicher",
+    "Name" : "Name",
+    "Storage type" : "Du hast noch keinen externen Speicher",
+    "Scope" : "Anwendungsbereich",
+    "External Storage" : "Externer Speicher",
+    "Folder name" : "Ordnername",
+    "Configuration" : "Konfiguration",
+    "Available for" : "Verfügbar für",
+    "Add storage" : "Speicher hinzufügen",
+    "Delete" : "Löschen",
+    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
+    "Allow users to mount the following external storage" : "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/de.json b/apps/files_external/l10n/de.json
new file mode 100644
index 00000000000..fb4467cc1f2
--- /dev/null
+++ b/apps/files_external/l10n/de.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Anfrage-Token holen fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Zugriff-Token holen fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
+    "Please provide a valid Dropbox app key and secret." : "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
+    "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
+    "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
+    "External storage" : "Externer Speicher",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Schlüssel",
+    "Secret" : "Geheime Zeichenkette",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 und kompatible",
+    "Access Key" : "Zugriffsschlüssel",
+    "Secret Key" : "Sicherheitssschlüssel",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfad-Stil aktivieren",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Host" : "Host",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "Root" : "Root",
+    "Secure ftps://" : "Sicherer FTPS://",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
+    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
+    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
+    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
+    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
+    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
+    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
+    "Share" : "Teilen",
+    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
+    "Username as share" : "Benutzername als Freigabe",
+    "URL" : "URL",
+    "Secure https://" : "Sicherer HTTPS://",
+    "Remote subfolder" : "Remote-Unterordner:",
+    "Access granted" : "Zugriff gestattet",
+    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
+    "Grant access" : "Zugriff gestatten",
+    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
+    "Personal" : "Persönlich",
+    "System" : "System",
+    "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+    "(group)" : "(group)",
+    "Saved" : "Gespeichert",
+    "<b>Note:</b> " : "<b>Hinweis:</b> ",
+    " and " : "und",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
+    "You don't have any external storages" : "Du hast noch keinen externen Speicher",
+    "Name" : "Name",
+    "Storage type" : "Du hast noch keinen externen Speicher",
+    "Scope" : "Anwendungsbereich",
+    "External Storage" : "Externer Speicher",
+    "Folder name" : "Ordnername",
+    "Configuration" : "Konfiguration",
+    "Available for" : "Verfügbar für",
+    "Add storage" : "Speicher hinzufügen",
+    "Delete" : "Löschen",
+    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
+    "Allow users to mount the following external storage" : "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/de.php b/apps/files_external/l10n/de.php
deleted file mode 100644
index 550ecb3f408..00000000000
--- a/apps/files_external/l10n/de.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Anfrage-Token holen fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Zugriff-Token holen fehlgeschlagen. Stelle bitte sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-"Please provide a valid Dropbox app key and secret." => "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein.",
-"Step 1 failed. Exception: %s" => "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
-"Step 2 failed. Exception: %s" => "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
-"External storage" => "Externer Speicher",
-"Local" => "Lokal",
-"Location" => "Ort",
-"Amazon S3" => "Amazon S3",
-"Key" => "Schlüssel",
-"Secret" => "Geheime Zeichenkette",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 und kompatible",
-"Access Key" => "Zugriffsschlüssel",
-"Secret Key" => "Sicherheitssschlüssel",
-"Hostname" => "Host-Name",
-"Port" => "Port",
-"Region" => "Region",
-"Enable SSL" => "SSL aktivieren",
-"Enable Path Style" => "Pfad-Stil aktivieren",
-"App key" => "App-Schlüssel",
-"App secret" => "Geheime Zeichenkette der App",
-"Host" => "Host",
-"Username" => "Benutzername",
-"Password" => "Passwort",
-"Root" => "Root",
-"Secure ftps://" => "Sicherer FTPS://",
-"Client ID" => "Client-ID",
-"Client secret" => "Geheime Zeichenkette des Client",
-"OpenStack Object Storage" => "Openstack-Objektspeicher",
-"Region (optional for OpenStack Object Storage)" => "Region (Optional für Openstack-Objektspeicher)",
-"API Key (required for Rackspace Cloud Files)" => "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-"Tenantname (required for OpenStack Object Storage)" => "Mietername (Erforderlich für Openstack-Objektspeicher)",
-"Password (required for OpenStack Object Storage)" => "Passwort (Erforderlich für Openstack-Objektspeicher)",
-"Service Name (required for OpenStack Object Storage)" => "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-"Timeout of HTTP requests in seconds" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-"Share" => "Teilen",
-"SMB / CIFS using OC login" => "SMB / CIFS mit OC-Login",
-"Username as share" => "Benutzername als Freigabe",
-"URL" => "URL",
-"Secure https://" => "Sicherer HTTPS://",
-"Remote subfolder" => "Remote-Unterordner:",
-"Access granted" => "Zugriff gestattet",
-"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
-"Grant access" => "Zugriff gestatten",
-"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
-"Personal" => "Persönlich",
-"System" => "System",
-"All users. Type to select user or group." => "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
-"(group)" => "(group)",
-"Saved" => "Gespeichert",
-"<b>Note:</b> " => "<b>Hinweis:</b> ",
-" and " => "und",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich zur Installation an Deinen Systemadministrator.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wende Dich sich zur Installation an Deinen Systemadministrator.",
-"You don't have any external storages" => "Du hast noch keinen externen Speicher",
-"Name" => "Name",
-"Storage type" => "Du hast noch keinen externen Speicher",
-"Scope" => "Anwendungsbereich",
-"External Storage" => "Externer Speicher",
-"Folder name" => "Ordnername",
-"Configuration" => "Konfiguration",
-"Available for" => "Verfügbar für",
-"Add storage" => "Speicher hinzufügen",
-"Delete" => "Löschen",
-"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
-"Allow users to mount the following external storage" => "Erlaube es Benutzern, den folgenden externen Speicher einzubinden"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de_AT.js b/apps/files_external/l10n/de_AT.js
new file mode 100644
index 00000000000..c4a56bb7a5f
--- /dev/null
+++ b/apps/files_external/l10n/de_AT.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Ort",
+    "Port" : "Port",
+    "Host" : "Host",
+    "Password" : "Passwort",
+    "Share" : "Freigeben",
+    "Personal" : "Persönlich",
+    "Delete" : "Löschen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/de_AT.json b/apps/files_external/l10n/de_AT.json
new file mode 100644
index 00000000000..3dea5f2cd58
--- /dev/null
+++ b/apps/files_external/l10n/de_AT.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Location" : "Ort",
+    "Port" : "Port",
+    "Host" : "Host",
+    "Password" : "Passwort",
+    "Share" : "Freigeben",
+    "Personal" : "Persönlich",
+    "Delete" : "Löschen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/de_AT.php b/apps/files_external/l10n/de_AT.php
deleted file mode 100644
index 0e7672f0a0b..00000000000
--- a/apps/files_external/l10n/de_AT.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Ort",
-"Port" => "Port",
-"Host" => "Host",
-"Password" => "Passwort",
-"Share" => "Freigeben",
-"Personal" => "Persönlich",
-"Delete" => "Löschen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de_CH.js b/apps/files_external/l10n/de_CH.js
new file mode 100644
index 00000000000..b0039573097
--- /dev/null
+++ b/apps/files_external/l10n/de_CH.js
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000000..955fae07f5b
--- /dev/null
+++ b/apps/files_external/l10n/de_CH.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
+    "External storage" : "Externer Speicher",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "Port" : "Port",
+    "Host" : "Host",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "Share" : "Freigeben",
+    "URL" : "URL",
+    "Access granted" : "Zugriff gestattet",
+    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
+    "Grant access" : "Zugriff gestatten",
+    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
+    "Personal" : "Persönlich",
+    "Saved" : "Gespeichert",
+    "Name" : "Name",
+    "External Storage" : "Externer Speicher",
+    "Folder name" : "Ordnername",
+    "Configuration" : "Konfiguration",
+    "Add storage" : "Speicher hinzufügen",
+    "Delete" : "Löschen",
+    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/de_CH.php b/apps/files_external/l10n/de_CH.php
deleted file mode 100644
index af1cbd1561f..00000000000
--- a/apps/files_external/l10n/de_CH.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/de_DE.js b/apps/files_external/l10n/de_DE.js
new file mode 100644
index 00000000000..d12b171f639
--- /dev/null
+++ b/apps/files_external/l10n/de_DE.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Anfrage-Token holen fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Zugriff-Token holen fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
+    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
+    "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
+    "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
+    "External storage" : "Externer Speicher",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Schlüssel",
+    "Secret" : "Geheime Zeichenkette",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 und Kompatible",
+    "Access Key" : "Zugriffsschlüssel",
+    "Secret Key" : "Sicherheitsschlüssel",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfadstil aktivieren",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Host" : "Host",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "Root" : "Root",
+    "Secure ftps://" : "Sicherer FTPS://",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
+    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
+    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
+    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
+    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
+    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
+    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
+    "Share" : "Teilen",
+    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
+    "Username as share" : "Benutzername als Freigabe",
+    "URL" : "Adresse",
+    "Secure https://" : "Sicherer HTTPS://",
+    "Remote subfolder" : "Entfernter Unterordner:",
+    "Access granted" : "Zugriff gestattet",
+    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
+    "Grant access" : "Zugriff gestatten",
+    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
+    "Personal" : "Persönlich",
+    "System" : "System",
+    "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+    "(group)" : "(group)",
+    "Saved" : "Gespeichert",
+    "<b>Note:</b> " : "<b>Hinweis:</b> ",
+    " and " : "und",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
+    "You don't have any external storages" : "Sie haben noch keinen externen Speicher",
+    "Name" : "Name",
+    "Storage type" : "Speichertyp",
+    "Scope" : "Anwendungsbereich",
+    "External Storage" : "Externer Speicher",
+    "Folder name" : "Ordnername",
+    "Configuration" : "Konfiguration",
+    "Available for" : "Verfügbar für",
+    "Add storage" : "Speicher hinzufügen",
+    "Delete" : "Löschen",
+    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
+    "Allow users to mount the following external storage" : "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/de_DE.json b/apps/files_external/l10n/de_DE.json
new file mode 100644
index 00000000000..43c24e0c94a
--- /dev/null
+++ b/apps/files_external/l10n/de_DE.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Anfrage-Token holen fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Zugriff-Token holen fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
+    "Please provide a valid Dropbox app key and secret." : "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
+    "Step 1 failed. Exception: %s" : "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
+    "Step 2 failed. Exception: %s" : "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
+    "External storage" : "Externer Speicher",
+    "Local" : "Lokal",
+    "Location" : "Ort",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Schlüssel",
+    "Secret" : "Geheime Zeichenkette",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 und Kompatible",
+    "Access Key" : "Zugriffsschlüssel",
+    "Secret Key" : "Sicherheitsschlüssel",
+    "Hostname" : "Host-Name",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "SSL aktivieren",
+    "Enable Path Style" : "Pfadstil aktivieren",
+    "App key" : "App-Schlüssel",
+    "App secret" : "Geheime Zeichenkette der App",
+    "Host" : "Host",
+    "Username" : "Benutzername",
+    "Password" : "Passwort",
+    "Root" : "Root",
+    "Secure ftps://" : "Sicherer FTPS://",
+    "Client ID" : "Client-ID",
+    "Client secret" : "Geheime Zeichenkette des Client",
+    "OpenStack Object Storage" : "Openstack-Objektspeicher",
+    "Region (optional for OpenStack Object Storage)" : "Region (Optional für Openstack-Objektspeicher)",
+    "API Key (required for Rackspace Cloud Files)" : "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
+    "Tenantname (required for OpenStack Object Storage)" : "Mietername (Erforderlich für Openstack-Objektspeicher)",
+    "Password (required for OpenStack Object Storage)" : "Passwort (Erforderlich für Openstack-Objektspeicher)",
+    "Service Name (required for OpenStack Object Storage)" : "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
+    "Timeout of HTTP requests in seconds" : "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
+    "Share" : "Teilen",
+    "SMB / CIFS using OC login" : "SMB / CIFS mit OC-Login",
+    "Username as share" : "Benutzername als Freigabe",
+    "URL" : "Adresse",
+    "Secure https://" : "Sicherer HTTPS://",
+    "Remote subfolder" : "Entfernter Unterordner:",
+    "Access granted" : "Zugriff gestattet",
+    "Error configuring Dropbox storage" : "Fehler beim Einrichten von Dropbox",
+    "Grant access" : "Zugriff gestatten",
+    "Error configuring Google Drive storage" : "Fehler beim Einrichten von Google Drive",
+    "Personal" : "Persönlich",
+    "System" : "System",
+    "All users. Type to select user or group." : "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
+    "(group)" : "(group)",
+    "Saved" : "Gespeichert",
+    "<b>Note:</b> " : "<b>Hinweis:</b> ",
+    " and " : "und",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
+    "You don't have any external storages" : "Sie haben noch keinen externen Speicher",
+    "Name" : "Name",
+    "Storage type" : "Speichertyp",
+    "Scope" : "Anwendungsbereich",
+    "External Storage" : "Externer Speicher",
+    "Folder name" : "Ordnername",
+    "Configuration" : "Konfiguration",
+    "Available for" : "Verfügbar für",
+    "Add storage" : "Speicher hinzufügen",
+    "Delete" : "Löschen",
+    "Enable User External Storage" : "Externen Speicher für Benutzer aktivieren",
+    "Allow users to mount the following external storage" : "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/de_DE.php b/apps/files_external/l10n/de_DE.php
deleted file mode 100644
index fbeacb43178..00000000000
--- a/apps/files_external/l10n/de_DE.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Anfrage-Token holen fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Zugriff-Token holen fehlgeschlagen. Stellen Sie sicher, dass der Anwendungsschlüssel und Sicherheitsschlüssel für Dropbox korrekt sind.",
-"Please provide a valid Dropbox app key and secret." => "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein.",
-"Step 1 failed. Exception: %s" => "Schritt 1 fehlgeschlagen. Fehlermeldung: %s",
-"Step 2 failed. Exception: %s" => "Schritt 2 fehlgeschlagen. Fehlermeldung: %s",
-"External storage" => "Externer Speicher",
-"Local" => "Lokal",
-"Location" => "Ort",
-"Amazon S3" => "Amazon S3",
-"Key" => "Schlüssel",
-"Secret" => "Geheime Zeichenkette",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 und Kompatible",
-"Access Key" => "Zugriffsschlüssel",
-"Secret Key" => "Sicherheitsschlüssel",
-"Hostname" => "Host-Name",
-"Port" => "Port",
-"Region" => "Region",
-"Enable SSL" => "SSL aktivieren",
-"Enable Path Style" => "Pfadstil aktivieren",
-"App key" => "App-Schlüssel",
-"App secret" => "Geheime Zeichenkette der App",
-"Host" => "Host",
-"Username" => "Benutzername",
-"Password" => "Passwort",
-"Root" => "Root",
-"Secure ftps://" => "Sicherer FTPS://",
-"Client ID" => "Client-ID",
-"Client secret" => "Geheime Zeichenkette des Client",
-"OpenStack Object Storage" => "Openstack-Objektspeicher",
-"Region (optional for OpenStack Object Storage)" => "Region (Optional für Openstack-Objektspeicher)",
-"API Key (required for Rackspace Cloud Files)" => "API-Schlüssel (Erforderlich für Rackspace Cloud-Dateien)",
-"Tenantname (required for OpenStack Object Storage)" => "Mietername (Erforderlich für Openstack-Objektspeicher)",
-"Password (required for OpenStack Object Storage)" => "Passwort (Erforderlich für Openstack-Objektspeicher)",
-"Service Name (required for OpenStack Object Storage)" => "Name der Dienstleistung (Erforderlich für Openstack-Objektspeicher)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL des Identitätsendpunktes (Erforderlich für Openstack-Objektspeicher)",
-"Timeout of HTTP requests in seconds" => "Zeitüberschreitung von HTTP-Anfragen in Sekunden",
-"Share" => "Teilen",
-"SMB / CIFS using OC login" => "SMB / CIFS mit OC-Login",
-"Username as share" => "Benutzername als Freigabe",
-"URL" => "Adresse",
-"Secure https://" => "Sicherer HTTPS://",
-"Remote subfolder" => "Entfernter Unterordner:",
-"Access granted" => "Zugriff gestattet",
-"Error configuring Dropbox storage" => "Fehler beim Einrichten von Dropbox",
-"Grant access" => "Zugriff gestatten",
-"Error configuring Google Drive storage" => "Fehler beim Einrichten von Google Drive",
-"Personal" => "Persönlich",
-"System" => "System",
-"All users. Type to select user or group." => "Alle Nutzer. Nutzer oder Gruppe zur Auswahl eingeben.",
-"(group)" => "(group)",
-"Saved" => "Gespeichert",
-"<b>Note:</b> " => "<b>Hinweis:</b> ",
-" and " => "und",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> Die cURL-Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> Die FTP Unterstützung von PHP ist nicht aktiviert oder installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Hinweis:</b> \"%s\" ist nicht installiert. Das Hinzufügen von %s ist nicht möglich. Bitte wenden Sie sich zur Installation an Ihren Systemadministrator.",
-"You don't have any external storages" => "Sie haben noch keinen externen Speicher",
-"Name" => "Name",
-"Storage type" => "Speichertyp",
-"Scope" => "Anwendungsbereich",
-"External Storage" => "Externer Speicher",
-"Folder name" => "Ordnername",
-"Configuration" => "Konfiguration",
-"Available for" => "Verfügbar für",
-"Add storage" => "Speicher hinzufügen",
-"Delete" => "Löschen",
-"Enable User External Storage" => "Externen Speicher für Benutzer aktivieren",
-"Allow users to mount the following external storage" => "Erlauben Sie Benutzern, folgende externe Speicher einzubinden"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/el.js b/apps/files_external/l10n/el.js
new file mode 100644
index 00000000000..28105a01d6b
--- /dev/null
+++ b/apps/files_external/l10n/el.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά.",
+    "Please provide a valid Dropbox app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
+    "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
+    "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
+    "External storage" : "Εξωτερική αποθήκευση",
+    "Local" : "Τοπικός",
+    "Location" : "Τοποθεσία",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Κλειδί",
+    "Secret" : "Μυστικό",
+    "Bucket" : "Κάδος",
+    "Amazon S3 and compliant" : "Amazon S3 και συμμορφούμενα",
+    "Access Key" : "Κλειδί πρόσβασης",
+    "Secret Key" : "Μυστικό κλειδί",
+    "Hostname" : "Όνομα Υπολογιστή",
+    "Port" : "Θύρα",
+    "Region" : "Περιοχή",
+    "Enable SSL" : "Ενεργοποίηση SSL",
+    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
+    "App key" : "Κλειδί εφαρμογής",
+    "App secret" : "Μυστικό εφαρμογής",
+    "Host" : "Διακομιστής",
+    "Username" : "Όνομα χρήστη",
+    "Password" : "Κωδικός πρόσβασης",
+    "Root" : "Root",
+    "Secure ftps://" : "Ασφαλής ftps://",
+    "Client ID" : "ID πελάτη",
+    "Client secret" : "Μυστικό πελάτη",
+    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
+    "Tenantname (required for OpenStack Object Storage)" : "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
+    "Share" : "Διαμοιράστε",
+    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
+    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
+    "URL" : "URL",
+    "Secure https://" : "Ασφαλής σύνδεση https://",
+    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
+    "Access granted" : "Πρόσβαση παρασχέθηκε",
+    "Error configuring Dropbox storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
+    "Grant access" : "Παροχή πρόσβασης",
+    "Error configuring Google Drive storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
+    "Personal" : "Προσωπικά",
+    "System" : "Σύστημα",
+    "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
+    "(group)" : "(ομάδα)",
+    "Saved" : "Αποθηκεύτηκαν",
+    "<b>Note:</b> " : "<b>Σημείωση:</b> ",
+    " and " : "και",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+    "You don't have any external storages" : "Δεν έχετε κανέναν εξωτερικό αποθηκευτικό χώρο",
+    "Name" : "Όνομα",
+    "Storage type" : "Τύπος αποθηκευτικού χώρου",
+    "Scope" : "Εύρος",
+    "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
+    "Folder name" : "Όνομα φακέλου",
+    "Configuration" : "Ρυθμίσεις",
+    "Available for" : "Διαθέσιμο για",
+    "Add storage" : "Προσθηκη αποθηκευσης",
+    "Delete" : "Διαγραφή",
+    "Enable User External Storage" : "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
+    "Allow users to mount the following external storage" : "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/el.json b/apps/files_external/l10n/el.json
new file mode 100644
index 00000000000..4be10506a02
--- /dev/null
+++ b/apps/files_external/l10n/el.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά.",
+    "Please provide a valid Dropbox app key and secret." : "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
+    "Step 1 failed. Exception: %s" : "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
+    "Step 2 failed. Exception: %s" : "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
+    "External storage" : "Εξωτερική αποθήκευση",
+    "Local" : "Τοπικός",
+    "Location" : "Τοποθεσία",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Κλειδί",
+    "Secret" : "Μυστικό",
+    "Bucket" : "Κάδος",
+    "Amazon S3 and compliant" : "Amazon S3 και συμμορφούμενα",
+    "Access Key" : "Κλειδί πρόσβασης",
+    "Secret Key" : "Μυστικό κλειδί",
+    "Hostname" : "Όνομα Υπολογιστή",
+    "Port" : "Θύρα",
+    "Region" : "Περιοχή",
+    "Enable SSL" : "Ενεργοποίηση SSL",
+    "Enable Path Style" : "Ενεργοποίηση μορφής διαδρομής",
+    "App key" : "Κλειδί εφαρμογής",
+    "App secret" : "Μυστικό εφαρμογής",
+    "Host" : "Διακομιστής",
+    "Username" : "Όνομα χρήστη",
+    "Password" : "Κωδικός πρόσβασης",
+    "Root" : "Root",
+    "Secure ftps://" : "Ασφαλής ftps://",
+    "Client ID" : "ID πελάτη",
+    "Client secret" : "Μυστικό πελάτη",
+    "OpenStack Object Storage" : "Αποθήκη αντικειμένων OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
+    "Tenantname (required for OpenStack Object Storage)" : "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
+    "Share" : "Διαμοιράστε",
+    "SMB / CIFS using OC login" : "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
+    "Username as share" : "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
+    "URL" : "URL",
+    "Secure https://" : "Ασφαλής σύνδεση https://",
+    "Remote subfolder" : "Απομακρυσμένος υποφάκελος",
+    "Access granted" : "Πρόσβαση παρασχέθηκε",
+    "Error configuring Dropbox storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
+    "Grant access" : "Παροχή πρόσβασης",
+    "Error configuring Google Drive storage" : "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
+    "Personal" : "Προσωπικά",
+    "System" : "Σύστημα",
+    "All users. Type to select user or group." : "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
+    "(group)" : "(ομάδα)",
+    "Saved" : "Αποθηκεύτηκαν",
+    "<b>Note:</b> " : "<b>Σημείωση:</b> ",
+    " and " : "και",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
+    "You don't have any external storages" : "Δεν έχετε κανέναν εξωτερικό αποθηκευτικό χώρο",
+    "Name" : "Όνομα",
+    "Storage type" : "Τύπος αποθηκευτικού χώρου",
+    "Scope" : "Εύρος",
+    "External Storage" : "Εξωτερικό Αποθηκευτικό Μέσο",
+    "Folder name" : "Όνομα φακέλου",
+    "Configuration" : "Ρυθμίσεις",
+    "Available for" : "Διαθέσιμο για",
+    "Add storage" : "Προσθηκη αποθηκευσης",
+    "Delete" : "Διαγραφή",
+    "Enable User External Storage" : "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
+    "Allow users to mount the following external storage" : "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
deleted file mode 100644
index 626b2d07a49..00000000000
--- a/apps/files_external/l10n/el.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Η λήψη των τεκμηρίων αιτήματος απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Η λήψη των τεκμηρίων πρόσβασης απέτυχε. Βεβαιώστε ότι το κλειδί εφαρμογής και το μυστικό του Dropbox είναι ορθά.",
-"Please provide a valid Dropbox app key and secret." => "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox και μυστικό.",
-"Step 1 failed. Exception: %s" => "Το βήμα 1 απέτυχε. Εξαίρεση: %s",
-"Step 2 failed. Exception: %s" => "Το βήμα 2 απέτυχε. Εξαίρεση: %s",
-"External storage" => "Εξωτερική αποθήκευση",
-"Local" => "Τοπικός",
-"Location" => "Τοποθεσία",
-"Amazon S3" => "Amazon S3",
-"Key" => "Κλειδί",
-"Secret" => "Μυστικό",
-"Bucket" => "Κάδος",
-"Amazon S3 and compliant" => "Amazon S3 και συμμορφούμενα",
-"Access Key" => "Κλειδί πρόσβασης",
-"Secret Key" => "Μυστικό κλειδί",
-"Hostname" => "Όνομα Υπολογιστή",
-"Port" => "Θύρα",
-"Region" => "Περιοχή",
-"Enable SSL" => "Ενεργοποίηση SSL",
-"Enable Path Style" => "Ενεργοποίηση μορφής διαδρομής",
-"App key" => "Κλειδί εφαρμογής",
-"App secret" => "Μυστικό εφαρμογής",
-"Host" => "Διακομιστής",
-"Username" => "Όνομα χρήστη",
-"Password" => "Κωδικός πρόσβασης",
-"Root" => "Root",
-"Secure ftps://" => "Ασφαλής ftps://",
-"Client ID" => "ID πελάτη",
-"Client secret" => "Μυστικό πελάτη",
-"OpenStack Object Storage" => "Αποθήκη αντικειμένων OpenStack",
-"Region (optional for OpenStack Object Storage)" => "Περιοχή (προαιρετικά για την αποθήκευση αντικειμένων OpenStack)",
-"API Key (required for Rackspace Cloud Files)" => "Κλειδί API (απαιτείται για αρχεία Rackspace Cloud)",
-"Tenantname (required for OpenStack Object Storage)" => "Όνομα ενοίκου (απαιτείται για την Αποθήκευση Αντικειμένων OpenStack)",
-"Password (required for OpenStack Object Storage)" => "Μυστικός κωδικός (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-"Service Name (required for OpenStack Object Storage)" => "Όνομα υπηρεσίας (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "Διεύθυνση URL της ταυτότητας τελικού σημείου (απαιτείται για την αποθήκευση αντικειμένων OpenStack)",
-"Timeout of HTTP requests in seconds" => "Χρονικό όριο των αιτήσεων HTTP σε δευτερόλεπτα",
-"Share" => "Διαμοιράστε",
-"SMB / CIFS using OC login" => "SMB / CIFS χρησιμοποιώντας λογαριασμό OC",
-"Username as share" => "Όνομα χρήστη ως διαμοιραζόμενος φάκελος",
-"URL" => "URL",
-"Secure https://" => "Ασφαλής σύνδεση https://",
-"Remote subfolder" => "Απομακρυσμένος υποφάκελος",
-"Access granted" => "Πρόσβαση παρασχέθηκε",
-"Error configuring Dropbox storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Dropbox ",
-"Grant access" => "Παροχή πρόσβασης",
-"Error configuring Google Drive storage" => "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive ",
-"Personal" => "Προσωπικά",
-"System" => "Σύστημα",
-"All users. Type to select user or group." => "Όλοι οι χρήστες. Πληκτρολογήστε για να επιλέξετε χρήστη ή ομάδα.",
-"(group)" => "(ομάδα)",
-"Saved" => "Αποθηκεύτηκαν",
-"<b>Note:</b> " => "<b>Σημείωση:</b> ",
-" and " => "και",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η υποστήριξη cURL στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Η προσάρτηση του %s δεν είναι δυνατή. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η υποστήριξη FTP στην PHP δεν είναι ενεργοποιημένη ή εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση του %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Σημείωση:</b> Η επέκταση \"%s\" δεν είναι εγκατεστημένη. Δεν είναι δυνατή η προσάρτηση %s. Παρακαλώ ζητήστε από τον διαχειριστή συστημάτων σας να την εγκαταστήσει.",
-"You don't have any external storages" => "Δεν έχετε κανέναν εξωτερικό αποθηκευτικό χώρο",
-"Name" => "Όνομα",
-"Storage type" => "Τύπος αποθηκευτικού χώρου",
-"Scope" => "Εύρος",
-"External Storage" => "Εξωτερικό Αποθηκευτικό Μέσο",
-"Folder name" => "Όνομα φακέλου",
-"Configuration" => "Ρυθμίσεις",
-"Available for" => "Διαθέσιμο για",
-"Add storage" => "Προσθηκη αποθηκευσης",
-"Delete" => "Διαγραφή",
-"Enable User External Storage" => "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη",
-"Allow users to mount the following external storage" => "Χορήγηση άδειας στους χρήστες να συνδέσουν τα παρακάτω εξωτερικά μέσα αποθήκευσης"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/en@pirate.js b/apps/files_external/l10n/en@pirate.js
new file mode 100644
index 00000000000..7345429f750
--- /dev/null
+++ b/apps/files_external/l10n/en@pirate.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Password" : "Secret Code"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/en@pirate.json b/apps/files_external/l10n/en@pirate.json
new file mode 100644
index 00000000000..bde5153f309
--- /dev/null
+++ b/apps/files_external/l10n/en@pirate.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Password" : "Secret Code"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/en@pirate.php b/apps/files_external/l10n/en@pirate.php
deleted file mode 100644
index ab628e1717e..00000000000
--- a/apps/files_external/l10n/en@pirate.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Password" => "Secret Code"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/en_GB.js b/apps/files_external/l10n/en_GB.js
new file mode 100644
index 00000000000..9f97d2c488c
--- /dev/null
+++ b/apps/files_external/l10n/en_GB.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.",
+    "Please provide a valid Dropbox app key and secret." : "Please provide a valid Dropbox app key and secret.",
+    "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
+    "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
+    "External storage" : "External storage",
+    "Local" : "Local",
+    "Location" : "Location",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Key",
+    "Secret" : "Secret",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 and compliant",
+    "Access Key" : "Access Key",
+    "Secret Key" : "Secret Key",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Enable SSL",
+    "Enable Path Style" : "Enable Path Style",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Host" : "Host",
+    "Username" : "Username",
+    "Password" : "Password",
+    "Root" : "Root",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (optional for OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (required for Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (required for OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Password (required for OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Service Name (required for OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (required for OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Timeout of HTTP requests in seconds",
+    "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
+    "Username as share" : "Username as share",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Remote subfolder",
+    "Access granted" : "Access granted",
+    "Error configuring Dropbox storage" : "Error configuring Dropbox storage",
+    "Grant access" : "Grant access",
+    "Error configuring Google Drive storage" : "Error configuring Google Drive storage",
+    "Personal" : "Personal",
+    "System" : "System",
+    "All users. Type to select user or group." : "All users. Type to select user or group.",
+    "(group)" : "(group)",
+    "Saved" : "Saved",
+    "<b>Note:</b> " : "<b>Note:</b> ",
+    " and " : " and ",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "You don't have any external storages" : "You don't have any external storage",
+    "Name" : "Name",
+    "Storage type" : "Storage type",
+    "Scope" : "Scope",
+    "External Storage" : "External Storage",
+    "Folder name" : "Folder name",
+    "Configuration" : "Configuration",
+    "Available for" : "Available for",
+    "Add storage" : "Add storage",
+    "Delete" : "Delete",
+    "Enable User External Storage" : "Enable User External Storage",
+    "Allow users to mount the following external storage" : "Allow users to mount the following external storage"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/en_GB.json b/apps/files_external/l10n/en_GB.json
new file mode 100644
index 00000000000..d4e7ad11bbe
--- /dev/null
+++ b/apps/files_external/l10n/en_GB.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.",
+    "Please provide a valid Dropbox app key and secret." : "Please provide a valid Dropbox app key and secret.",
+    "Step 1 failed. Exception: %s" : "Step 1 failed. Exception: %s",
+    "Step 2 failed. Exception: %s" : "Step 2 failed. Exception: %s",
+    "External storage" : "External storage",
+    "Local" : "Local",
+    "Location" : "Location",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Key",
+    "Secret" : "Secret",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 and compliant",
+    "Access Key" : "Access Key",
+    "Secret Key" : "Secret Key",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Enable SSL",
+    "Enable Path Style" : "Enable Path Style",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Host" : "Host",
+    "Username" : "Username",
+    "Password" : "Password",
+    "Root" : "Root",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (optional for OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (required for Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (required for OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Password (required for OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Service Name (required for OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (required for OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Timeout of HTTP requests in seconds",
+    "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS using OC login",
+    "Username as share" : "Username as share",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Remote subfolder",
+    "Access granted" : "Access granted",
+    "Error configuring Dropbox storage" : "Error configuring Dropbox storage",
+    "Grant access" : "Grant access",
+    "Error configuring Google Drive storage" : "Error configuring Google Drive storage",
+    "Personal" : "Personal",
+    "System" : "System",
+    "All users. Type to select user or group." : "All users. Type to select user or group.",
+    "(group)" : "(group)",
+    "Saved" : "Saved",
+    "<b>Note:</b> " : "<b>Note:</b> ",
+    " and " : " and ",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
+    "You don't have any external storages" : "You don't have any external storage",
+    "Name" : "Name",
+    "Storage type" : "Storage type",
+    "Scope" : "Scope",
+    "External Storage" : "External Storage",
+    "Folder name" : "Folder name",
+    "Configuration" : "Configuration",
+    "Available for" : "Available for",
+    "Add storage" : "Add storage",
+    "Delete" : "Delete",
+    "Enable User External Storage" : "Enable User External Storage",
+    "Allow users to mount the following external storage" : "Allow users to mount the following external storage"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/en_GB.php b/apps/files_external/l10n/en_GB.php
deleted file mode 100644
index 129f8181538..00000000000
--- a/apps/files_external/l10n/en_GB.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.",
-"Please provide a valid Dropbox app key and secret." => "Please provide a valid Dropbox app key and secret.",
-"Step 1 failed. Exception: %s" => "Step 1 failed. Exception: %s",
-"Step 2 failed. Exception: %s" => "Step 2 failed. Exception: %s",
-"External storage" => "External storage",
-"Local" => "Local",
-"Location" => "Location",
-"Amazon S3" => "Amazon S3",
-"Key" => "Key",
-"Secret" => "Secret",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 and compliant",
-"Access Key" => "Access Key",
-"Secret Key" => "Secret Key",
-"Hostname" => "Hostname",
-"Port" => "Port",
-"Region" => "Region",
-"Enable SSL" => "Enable SSL",
-"Enable Path Style" => "Enable Path Style",
-"App key" => "App key",
-"App secret" => "App secret",
-"Host" => "Host",
-"Username" => "Username",
-"Password" => "Password",
-"Root" => "Root",
-"Secure ftps://" => "Secure ftps://",
-"Client ID" => "Client ID",
-"Client secret" => "Client secret",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Region (optional for OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API Key (required for Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Tenantname (required for OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Password (required for OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Service Name (required for OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL of identity endpoint (required for OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Timeout of HTTP requests in seconds",
-"Share" => "Share",
-"SMB / CIFS using OC login" => "SMB / CIFS using OC login",
-"Username as share" => "Username as share",
-"URL" => "URL",
-"Secure https://" => "Secure https://",
-"Remote subfolder" => "Remote subfolder",
-"Access granted" => "Access granted",
-"Error configuring Dropbox storage" => "Error configuring Dropbox storage",
-"Grant access" => "Grant access",
-"Error configuring Google Drive storage" => "Error configuring Google Drive storage",
-"Personal" => "Personal",
-"System" => "System",
-"All users. Type to select user or group." => "All users. Type to select user or group.",
-"(group)" => "(group)",
-"Saved" => "Saved",
-"<b>Note:</b> " => "<b>Note:</b> ",
-" and " => " and ",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.",
-"You don't have any external storages" => "You don't have any external storage",
-"Name" => "Name",
-"Storage type" => "Storage type",
-"Scope" => "Scope",
-"External Storage" => "External Storage",
-"Folder name" => "Folder name",
-"Configuration" => "Configuration",
-"Available for" => "Available for",
-"Add storage" => "Add storage",
-"Delete" => "Delete",
-"Enable User External Storage" => "Enable User External Storage",
-"Allow users to mount the following external storage" => "Allow users to mount the following external storage"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eo.js b/apps/files_external/l10n/eo.js
new file mode 100644
index 00000000000..1d5014cdf23
--- /dev/null
+++ b/apps/files_external/l10n/eo.js
@@ -0,0 +1,52 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
+    "External storage" : "Malena memorilo",
+    "Local" : "Loka",
+    "Location" : "Loko",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Klavo",
+    "Secret" : "Sekreto",
+    "Access Key" : "Aliroklavo",
+    "Secret Key" : "Sekretoklavo",
+    "Port" : "Pordo",
+    "Region" : "Regiono",
+    "Enable SSL" : "Kapabligi SSL-on",
+    "App key" : "Aplikaĵoklavo",
+    "App secret" : "Aplikaĵosekreto",
+    "Host" : "Gastigo",
+    "Username" : "Uzantonomo",
+    "Password" : "Pasvorto",
+    "Root" : "Radiko",
+    "Secure ftps://" : "Sekura ftps://",
+    "Client ID" : "Klientidentigilo",
+    "Client secret" : "Klientosekreto",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regiono (malnepra por OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API-klavo (nepra por Rackspace Cloud Files)",
+    "Password (required for OpenStack Object Storage)" : "Pasvorto (nepra por OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Servonomo (nepra por OpenStack Object Storage)",
+    "Share" : "Kunhavigi",
+    "URL" : "URL",
+    "Secure https://" : "Sekura https://",
+    "Remote subfolder" : "Malloka subdosierujo",
+    "Access granted" : "Alirpermeso donita",
+    "Error configuring Dropbox storage" : "Eraro dum agordado de la memorservo Dropbox",
+    "Grant access" : "Doni alirpermeson",
+    "Error configuring Google Drive storage" : "Eraro dum agordado de la memorservo Google Drive",
+    "Personal" : "Persona",
+    "Saved" : "Konservita",
+    "<b>Note:</b> " : "<b>Noto:</b>",
+    " and " : "kaj",
+    "Name" : "Nomo",
+    "External Storage" : "Malena memorilo",
+    "Folder name" : "Dosierujnomo",
+    "Configuration" : "Agordo",
+    "Available for" : "Disponebla por",
+    "Add storage" : "Aldoni memorilon",
+    "Delete" : "Forigi",
+    "Enable User External Storage" : "Kapabligi malenan memorilon de uzanto",
+    "Allow users to mount the following external storage" : "Permesi uzantojn munti la jenajn malenajn memorilojn"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/eo.json b/apps/files_external/l10n/eo.json
new file mode 100644
index 00000000000..cf63614fb88
--- /dev/null
+++ b/apps/files_external/l10n/eo.json
@@ -0,0 +1,50 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
+    "External storage" : "Malena memorilo",
+    "Local" : "Loka",
+    "Location" : "Loko",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Klavo",
+    "Secret" : "Sekreto",
+    "Access Key" : "Aliroklavo",
+    "Secret Key" : "Sekretoklavo",
+    "Port" : "Pordo",
+    "Region" : "Regiono",
+    "Enable SSL" : "Kapabligi SSL-on",
+    "App key" : "Aplikaĵoklavo",
+    "App secret" : "Aplikaĵosekreto",
+    "Host" : "Gastigo",
+    "Username" : "Uzantonomo",
+    "Password" : "Pasvorto",
+    "Root" : "Radiko",
+    "Secure ftps://" : "Sekura ftps://",
+    "Client ID" : "Klientidentigilo",
+    "Client secret" : "Klientosekreto",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regiono (malnepra por OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API-klavo (nepra por Rackspace Cloud Files)",
+    "Password (required for OpenStack Object Storage)" : "Pasvorto (nepra por OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Servonomo (nepra por OpenStack Object Storage)",
+    "Share" : "Kunhavigi",
+    "URL" : "URL",
+    "Secure https://" : "Sekura https://",
+    "Remote subfolder" : "Malloka subdosierujo",
+    "Access granted" : "Alirpermeso donita",
+    "Error configuring Dropbox storage" : "Eraro dum agordado de la memorservo Dropbox",
+    "Grant access" : "Doni alirpermeson",
+    "Error configuring Google Drive storage" : "Eraro dum agordado de la memorservo Google Drive",
+    "Personal" : "Persona",
+    "Saved" : "Konservita",
+    "<b>Note:</b> " : "<b>Noto:</b>",
+    " and " : "kaj",
+    "Name" : "Nomo",
+    "External Storage" : "Malena memorilo",
+    "Folder name" : "Dosierujnomo",
+    "Configuration" : "Agordo",
+    "Available for" : "Disponebla por",
+    "Add storage" : "Aldoni memorilon",
+    "Delete" : "Forigi",
+    "Enable User External Storage" : "Kapabligi malenan memorilon de uzanto",
+    "Allow users to mount the following external storage" : "Permesi uzantojn munti la jenajn malenajn memorilojn"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/eo.php b/apps/files_external/l10n/eo.php
deleted file mode 100644
index bc2b1af0f19..00000000000
--- a/apps/files_external/l10n/eo.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan.",
-"External storage" => "Malena memorilo",
-"Local" => "Loka",
-"Location" => "Loko",
-"Amazon S3" => "Amazon S3",
-"Key" => "Klavo",
-"Secret" => "Sekreto",
-"Access Key" => "Aliroklavo",
-"Secret Key" => "Sekretoklavo",
-"Port" => "Pordo",
-"Region" => "Regiono",
-"Enable SSL" => "Kapabligi SSL-on",
-"App key" => "Aplikaĵoklavo",
-"App secret" => "Aplikaĵosekreto",
-"Host" => "Gastigo",
-"Username" => "Uzantonomo",
-"Password" => "Pasvorto",
-"Root" => "Radiko",
-"Secure ftps://" => "Sekura ftps://",
-"Client ID" => "Klientidentigilo",
-"Client secret" => "Klientosekreto",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Regiono (malnepra por OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API-klavo (nepra por Rackspace Cloud Files)",
-"Password (required for OpenStack Object Storage)" => "Pasvorto (nepra por OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Servonomo (nepra por OpenStack Object Storage)",
-"Share" => "Kunhavigi",
-"URL" => "URL",
-"Secure https://" => "Sekura https://",
-"Remote subfolder" => "Malloka subdosierujo",
-"Access granted" => "Alirpermeso donita",
-"Error configuring Dropbox storage" => "Eraro dum agordado de la memorservo Dropbox",
-"Grant access" => "Doni alirpermeson",
-"Error configuring Google Drive storage" => "Eraro dum agordado de la memorservo Google Drive",
-"Personal" => "Persona",
-"Saved" => "Konservita",
-"<b>Note:</b> " => "<b>Noto:</b>",
-" and " => "kaj",
-"Name" => "Nomo",
-"External Storage" => "Malena memorilo",
-"Folder name" => "Dosierujnomo",
-"Configuration" => "Agordo",
-"Available for" => "Disponebla por",
-"Add storage" => "Aldoni memorilon",
-"Delete" => "Forigi",
-"Enable User External Storage" => "Kapabligi malenan memorilon de uzanto",
-"Allow users to mount the following external storage" => "Permesi uzantojn munti la jenajn malenajn memorilojn"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es.js b/apps/files_external/l10n/es.js
new file mode 100644
index 00000000000..9306558b346
--- /dev/null
+++ b/apps/files_external/l10n/es.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens solicitados ha fallado. Verifique que la llave y el secreto de su app Dropbox es correcta.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens de acceso ha fallado. Verifique que la llave y el secreto de su app Dropbox es correcta.",
+    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
+    "Step 1 failed. Exception: %s" : "El paso 1 falló. Excepción: %s",
+    "Step 2 failed. Exception: %s" : "El paso 2 falló. Excepción: %s",
+    "External storage" : "Almacenamiento externo",
+    "Local" : "Local",
+    "Location" : "Ubicación",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clave",
+    "Secret" : "Secreto",
+    "Bucket" : "Depósito",
+    "Amazon S3 and compliant" : "Amazon S3 y compatibilidad",
+    "Access Key" : "Clave de Acceso",
+    "Secret Key" : "Clave Secreta",
+    "Hostname" : "Nombre de equipo",
+    "Port" : "Puerto",
+    "Region" : "Región",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo de Ruta",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "Host" : "Servidor",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "Root" : "Raíz",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "ID de Cliente",
+    "Client secret" : "Cliente secreto",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Región (opcional para OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Clave API (requerida para Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nombre de Inquilino (requerido para OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Contraseña (requerida para OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nombre de Servicio (requerido para OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
+    "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
+    "Username as share" : "Nombre de Usuario como compartir",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Access granted" : "Acceso concedido",
+    "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
+    "Grant access" : "Conceder acceso",
+    "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Guardado",
+    "<b>Note:</b> " : "<b>Nota:</b> ",
+    " and " : "y",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de 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 de sistema que lo instale.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
+    "You don't have any external storages" : "Usted no tiene ningún almacenamiento externo",
+    "Name" : "Nombre",
+    "Storage type" : "Tipo de almacenamiento",
+    "Scope" : "Ámbito",
+    "External Storage" : "Almacenamiento externo",
+    "Folder name" : "Nombre de la carpeta",
+    "Configuration" : "Configuración",
+    "Available for" : "Disponible para",
+    "Add storage" : "Añadir almacenamiento",
+    "Delete" : "Eliminar",
+    "Enable User External Storage" : "Habilitar almacenamiento externo de usuario",
+    "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamiento externo"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es.json b/apps/files_external/l10n/es.json
new file mode 100644
index 00000000000..1d9067106eb
--- /dev/null
+++ b/apps/files_external/l10n/es.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens solicitados ha fallado. Verifique que la llave y el secreto de su app Dropbox es correcta.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La descarga de los tokens de acceso ha fallado. Verifique que la llave y el secreto de su app Dropbox es correcta.",
+    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
+    "Step 1 failed. Exception: %s" : "El paso 1 falló. Excepción: %s",
+    "Step 2 failed. Exception: %s" : "El paso 2 falló. Excepción: %s",
+    "External storage" : "Almacenamiento externo",
+    "Local" : "Local",
+    "Location" : "Ubicación",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clave",
+    "Secret" : "Secreto",
+    "Bucket" : "Depósito",
+    "Amazon S3 and compliant" : "Amazon S3 y compatibilidad",
+    "Access Key" : "Clave de Acceso",
+    "Secret Key" : "Clave Secreta",
+    "Hostname" : "Nombre de equipo",
+    "Port" : "Puerto",
+    "Region" : "Región",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo de Ruta",
+    "App key" : "App principal",
+    "App secret" : "App secreta",
+    "Host" : "Servidor",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "Root" : "Raíz",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "ID de Cliente",
+    "Client secret" : "Cliente secreto",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Región (opcional para OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Clave API (requerida para Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nombre de Inquilino (requerido para OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Contraseña (requerida para OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nombre de Servicio (requerido para OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL de identidad de punto final (requerido para OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tiempo de espera de solicitudes HTTP en segundos",
+    "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
+    "Username as share" : "Nombre de Usuario como compartir",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Subcarpeta remota",
+    "Access granted" : "Acceso concedido",
+    "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
+    "Grant access" : "Conceder acceso",
+    "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive",
+    "Personal" : "Personal",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Guardado",
+    "<b>Note:</b> " : "<b>Nota:</b> ",
+    " and " : "y",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de 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 de sistema que lo instale.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
+    "You don't have any external storages" : "Usted no tiene ningún almacenamiento externo",
+    "Name" : "Nombre",
+    "Storage type" : "Tipo de almacenamiento",
+    "Scope" : "Ámbito",
+    "External Storage" : "Almacenamiento externo",
+    "Folder name" : "Nombre de la carpeta",
+    "Configuration" : "Configuración",
+    "Available for" : "Disponible para",
+    "Add storage" : "Añadir almacenamiento",
+    "Delete" : "Eliminar",
+    "Enable User External Storage" : "Habilitar almacenamiento externo de usuario",
+    "Allow users to mount the following external storage" : "Permitir a los usuarios montar el siguiente almacenamiento externo"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
deleted file mode 100644
index 07cbd4a2d3c..00000000000
--- a/apps/files_external/l10n/es.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "La descarga de los tokens solicitados ha fallado. Verifique que la llave y el secreto de su app Dropbox es correcta.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "La descarga de los tokens de acceso ha fallado. Verifique que la llave y el secreto de su app Dropbox es correcta.",
-"Please provide a valid Dropbox app key and secret." => "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
-"Step 1 failed. Exception: %s" => "El paso 1 falló. Excepción: %s",
-"Step 2 failed. Exception: %s" => "El paso 2 falló. Excepción: %s",
-"External storage" => "Almacenamiento externo",
-"Local" => "Local",
-"Location" => "Ubicación",
-"Amazon S3" => "Amazon S3",
-"Key" => "Clave",
-"Secret" => "Secreto",
-"Bucket" => "Depósito",
-"Amazon S3 and compliant" => "Amazon S3 y compatibilidad",
-"Access Key" => "Clave de Acceso",
-"Secret Key" => "Clave Secreta",
-"Hostname" => "Nombre de equipo",
-"Port" => "Puerto",
-"Region" => "Región",
-"Enable SSL" => "Habilitar SSL",
-"Enable Path Style" => "Habilitar Estilo de Ruta",
-"App key" => "App principal",
-"App secret" => "App secreta",
-"Host" => "Servidor",
-"Username" => "Nombre de usuario",
-"Password" => "Contraseña",
-"Root" => "Raíz",
-"Secure ftps://" => "Secure ftps://",
-"Client ID" => "ID de Cliente",
-"Client secret" => "Cliente secreto",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Región (opcional para OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "Clave API (requerida para Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Nombre de Inquilino (requerido para OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Contraseña (requerida para OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Nombre de Servicio (requerido para OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL de identidad de punto final (requerido para OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Tiempo de espera de solicitudes HTTP en segundos",
-"Share" => "Compartir",
-"SMB / CIFS using OC login" => "SMB / CIFS usando acceso OC",
-"Username as share" => "Nombre de Usuario como compartir",
-"URL" => "URL",
-"Secure https://" => "Secure https://",
-"Remote subfolder" => "Subcarpeta remota",
-"Access granted" => "Acceso concedido",
-"Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
-"Grant access" => "Conceder acceso",
-"Error configuring Google Drive storage" => "Error configurando el almacenamiento de Google Drive",
-"Personal" => "Personal",
-"System" => "Sistema",
-"All users. Type to select user or group." => "Todos los usuarios. Teclee para seleccionar un usuario o grupo.",
-"(group)" => "(grupo)",
-"Saved" => "Guardado",
-"<b>Note:</b> " => "<b>Nota:</b> ",
-" and " => "y",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> El soporte de cURL en PHP no está activado o instalado. No se puede montar %s. Pídale al administrador de 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 de sistema que lo instale.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" no está instalado. No se puede montar %s. Pídale al administrador de sistema que lo instale.",
-"You don't have any external storages" => "Usted no tiene ningún almacenamiento externo",
-"Name" => "Nombre",
-"Storage type" => "Tipo de almacenamiento",
-"Scope" => "Ámbito",
-"External Storage" => "Almacenamiento externo",
-"Folder name" => "Nombre de la carpeta",
-"Configuration" => "Configuración",
-"Available for" => "Disponible para",
-"Add storage" => "Añadir almacenamiento",
-"Delete" => "Eliminar",
-"Enable User External Storage" => "Habilitar almacenamiento externo de usuario",
-"Allow users to mount the following external storage" => "Permitir a los usuarios montar el siguiente almacenamiento externo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es_AR.js b/apps/files_external/l10n/es_AR.js
new file mode 100644
index 00000000000..0936079fbc2
--- /dev/null
+++ b/apps/files_external/l10n/es_AR.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
+    "External storage" : "Almacenamiento externo",
+    "Location" : "Ubicación",
+    "Port" : "Puerto",
+    "Region" : "Provincia",
+    "Host" : "Servidor",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "Share" : "Compartir",
+    "URL" : "URL",
+    "Access granted" : "Acceso permitido",
+    "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox",
+    "Grant access" : "Permitir acceso",
+    "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive",
+    "Personal" : "Personal",
+    "Saved" : "Guardado",
+    "Name" : "Nombre",
+    "External Storage" : "Almacenamiento externo",
+    "Folder name" : "Nombre de la carpeta",
+    "Configuration" : "Configuración",
+    "Add storage" : "Añadir almacenamiento",
+    "Delete" : "Borrar",
+    "Enable User External Storage" : "Habilitar almacenamiento de usuario externo"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_AR.json b/apps/files_external/l10n/es_AR.json
new file mode 100644
index 00000000000..3b971a1883c
--- /dev/null
+++ b/apps/files_external/l10n/es_AR.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
+    "External storage" : "Almacenamiento externo",
+    "Location" : "Ubicación",
+    "Port" : "Puerto",
+    "Region" : "Provincia",
+    "Host" : "Servidor",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "Share" : "Compartir",
+    "URL" : "URL",
+    "Access granted" : "Acceso permitido",
+    "Error configuring Dropbox storage" : "Error al configurar el almacenamiento de Dropbox",
+    "Grant access" : "Permitir acceso",
+    "Error configuring Google Drive storage" : "Error al configurar el almacenamiento de Google Drive",
+    "Personal" : "Personal",
+    "Saved" : "Guardado",
+    "Name" : "Nombre",
+    "External Storage" : "Almacenamiento externo",
+    "Folder name" : "Nombre de la carpeta",
+    "Configuration" : "Configuración",
+    "Add storage" : "Añadir almacenamiento",
+    "Delete" : "Borrar",
+    "Enable User External Storage" : "Habilitar almacenamiento de usuario externo"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
deleted file mode 100644
index d262f2afb87..00000000000
--- a/apps/files_external/l10n/es_AR.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
-"External storage" => "Almacenamiento externo",
-"Location" => "Ubicación",
-"Port" => "Puerto",
-"Region" => "Provincia",
-"Host" => "Servidor",
-"Username" => "Nombre de usuario",
-"Password" => "Contraseña",
-"Share" => "Compartir",
-"URL" => "URL",
-"Access granted" => "Acceso permitido",
-"Error configuring Dropbox storage" => "Error al configurar el almacenamiento de Dropbox",
-"Grant access" => "Permitir acceso",
-"Error configuring Google Drive storage" => "Error al configurar el almacenamiento de Google Drive",
-"Personal" => "Personal",
-"Saved" => "Guardado",
-"Name" => "Nombre",
-"External Storage" => "Almacenamiento externo",
-"Folder name" => "Nombre de la carpeta",
-"Configuration" => "Configuración",
-"Add storage" => "Añadir almacenamiento",
-"Delete" => "Borrar",
-"Enable User External Storage" => "Habilitar almacenamiento de usuario externo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es_CL.js b/apps/files_external/l10n/es_CL.js
new file mode 100644
index 00000000000..e2936ebb415
--- /dev/null
+++ b/apps/files_external/l10n/es_CL.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Username" : "Usuario",
+    "Password" : "Clave",
+    "Share" : "Compartir",
+    "Personal" : "Personal",
+    "Folder name" : "Nombre del directorio"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_CL.json b/apps/files_external/l10n/es_CL.json
new file mode 100644
index 00000000000..3c16c6b5124
--- /dev/null
+++ b/apps/files_external/l10n/es_CL.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Username" : "Usuario",
+    "Password" : "Clave",
+    "Share" : "Compartir",
+    "Personal" : "Personal",
+    "Folder name" : "Nombre del directorio"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/es_CL.php b/apps/files_external/l10n/es_CL.php
deleted file mode 100644
index cd9a32fdd10..00000000000
--- a/apps/files_external/l10n/es_CL.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Username" => "Usuario",
-"Password" => "Clave",
-"Share" => "Compartir",
-"Personal" => "Personal",
-"Folder name" => "Nombre del directorio"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/es_MX.js b/apps/files_external/l10n/es_MX.js
new file mode 100644
index 00000000000..a51d157cd89
--- /dev/null
+++ b/apps/files_external/l10n/es_MX.js
@@ -0,0 +1,26 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
+    "External storage" : "Almacenamiento externo",
+    "Location" : "Ubicación",
+    "Port" : "Puerto",
+    "Host" : "Servidor",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "Share" : "Compartir",
+    "URL" : "URL",
+    "Access granted" : "Acceso concedido",
+    "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
+    "Grant access" : "Conceder acceso",
+    "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive",
+    "Personal" : "Personal",
+    "Name" : "Nombre",
+    "External Storage" : "Almacenamiento externo",
+    "Folder name" : "Nombre de la carpeta",
+    "Configuration" : "Configuración",
+    "Add storage" : "Añadir almacenamiento",
+    "Delete" : "Eliminar",
+    "Enable User External Storage" : "Habilitar almacenamiento externo de usuario"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/es_MX.json b/apps/files_external/l10n/es_MX.json
new file mode 100644
index 00000000000..4a4bccdefe4
--- /dev/null
+++ b/apps/files_external/l10n/es_MX.json
@@ -0,0 +1,24 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
+    "External storage" : "Almacenamiento externo",
+    "Location" : "Ubicación",
+    "Port" : "Puerto",
+    "Host" : "Servidor",
+    "Username" : "Nombre de usuario",
+    "Password" : "Contraseña",
+    "Share" : "Compartir",
+    "URL" : "URL",
+    "Access granted" : "Acceso concedido",
+    "Error configuring Dropbox storage" : "Error configurando el almacenamiento de Dropbox",
+    "Grant access" : "Conceder acceso",
+    "Error configuring Google Drive storage" : "Error configurando el almacenamiento de Google Drive",
+    "Personal" : "Personal",
+    "Name" : "Nombre",
+    "External Storage" : "Almacenamiento externo",
+    "Folder name" : "Nombre de la carpeta",
+    "Configuration" : "Configuración",
+    "Add storage" : "Añadir almacenamiento",
+    "Delete" : "Eliminar",
+    "Enable User External Storage" : "Habilitar almacenamiento externo de usuario"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/es_MX.php b/apps/files_external/l10n/es_MX.php
deleted file mode 100644
index 2fbdbc5b4d5..00000000000
--- a/apps/files_external/l10n/es_MX.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Por favor, proporcione un una clave válida de la app Dropbox y una clave secreta.",
-"External storage" => "Almacenamiento externo",
-"Location" => "Ubicación",
-"Port" => "Puerto",
-"Host" => "Servidor",
-"Username" => "Nombre de usuario",
-"Password" => "Contraseña",
-"Share" => "Compartir",
-"URL" => "URL",
-"Access granted" => "Acceso concedido",
-"Error configuring Dropbox storage" => "Error configurando el almacenamiento de Dropbox",
-"Grant access" => "Conceder acceso",
-"Error configuring Google Drive storage" => "Error configurando el almacenamiento de Google Drive",
-"Personal" => "Personal",
-"Name" => "Nombre",
-"External Storage" => "Almacenamiento externo",
-"Folder name" => "Nombre de la carpeta",
-"Configuration" => "Configuración",
-"Add storage" => "Añadir almacenamiento",
-"Delete" => "Eliminar",
-"Enable User External Storage" => "Habilitar almacenamiento externo de usuario"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/et_EE.js b/apps/files_external/l10n/et_EE.js
new file mode 100644
index 00000000000..226190cb5f8
--- /dev/null
+++ b/apps/files_external/l10n/et_EE.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Tellimustõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ligipääsutõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
+    "Please provide a valid Dropbox app key and secret." : "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
+    "Step 1 failed. Exception: %s" : "Samm 1 ebaõnnestus. Erind: %s",
+    "Step 2 failed. Exception: %s" : "Samm 2 ebaõnnestus. Erind: %s",
+    "External storage" : "Väline andmehoidla",
+    "Local" : "Kohalik",
+    "Location" : "Asukoht",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Võti",
+    "Secret" : "Salasõna",
+    "Bucket" : "Korv",
+    "Amazon S3 and compliant" : "Amazon S3 ja ühilduv",
+    "Access Key" : "Ligipääsu võti",
+    "Secret Key" : "Salavõti",
+    "Hostname" : "Hostinimi",
+    "Port" : "Port",
+    "Region" : "Piirkond",
+    "Enable SSL" : "SSL-i kasutamine",
+    "Enable Path Style" : "Luba otsingtee stiilis",
+    "App key" : "Rakenduse võti",
+    "App secret" : "Rakenduse salasõna",
+    "Host" : "Host",
+    "Username" : "Kasutajanimi",
+    "Password" : "Parool",
+    "Root" : "Juur",
+    "Secure ftps://" : "Turvaline ftps://",
+    "Client ID" : "Kliendi ID",
+    "Client secret" : "Kliendi salasõna",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regioon (valikuline OpenStack Object Storage puhul)",
+    "API Key (required for Rackspace Cloud Files)" : "API võti (vajalik Rackspace Cloud Files puhul)",
+    "Tenantname (required for OpenStack Object Storage)" : "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
+    "Password (required for OpenStack Object Storage)" : "Parool (vajalik OpenStack Object Storage puhul)",
+    "Service Name (required for OpenStack Object Storage)" : "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
+    "Timeout of HTTP requests in seconds" : "HTTP päringute aegumine sekundites",
+    "Share" : "Jaga",
+    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
+    "Username as share" : "Kasutajanimi kui jagamine",
+    "URL" : "URL",
+    "Secure https://" : "Turvaline https://",
+    "Remote subfolder" : "Mujahl olev alamkaust",
+    "Access granted" : "Ligipääs on antud",
+    "Error configuring Dropbox storage" : "Viga Dropboxi salvestusruumi seadistamisel",
+    "Grant access" : "Anna ligipääs",
+    "Error configuring Google Drive storage" : "Viga Google Drive'i salvestusruumi seadistamisel",
+    "Personal" : "Isiklik",
+    "System" : "Süsteem",
+    "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
+    "(group)" : "(grupp)",
+    "Saved" : "Salvestatud",
+    "<b>Note:</b> " : "<b>Märkus:</b>",
+    " and " : "ja",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata vajalik tugi.",
+    "You don't have any external storages" : "Sul pole ühtegi välist andmehoidlat",
+    "Name" : "Nimi",
+    "Storage type" : "Andmehoidla tüüp",
+    "Scope" : "Skoop",
+    "External Storage" : "Väline salvestuskoht",
+    "Folder name" : "Kausta nimi",
+    "Configuration" : "Seadistamine",
+    "Available for" : "Saadaval",
+    "Add storage" : "Lisa andmehoidla",
+    "Delete" : "Kustuta",
+    "Enable User External Storage" : "Luba kasutajatele väline salvestamine",
+    "Allow users to mount the following external storage" : "Võimalda kasutajatel ühendada järgmist välist andmehoidlat"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/et_EE.json b/apps/files_external/l10n/et_EE.json
new file mode 100644
index 00000000000..a32eca9e8c2
--- /dev/null
+++ b/apps/files_external/l10n/et_EE.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Tellimustõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ligipääsutõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
+    "Please provide a valid Dropbox app key and secret." : "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
+    "Step 1 failed. Exception: %s" : "Samm 1 ebaõnnestus. Erind: %s",
+    "Step 2 failed. Exception: %s" : "Samm 2 ebaõnnestus. Erind: %s",
+    "External storage" : "Väline andmehoidla",
+    "Local" : "Kohalik",
+    "Location" : "Asukoht",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Võti",
+    "Secret" : "Salasõna",
+    "Bucket" : "Korv",
+    "Amazon S3 and compliant" : "Amazon S3 ja ühilduv",
+    "Access Key" : "Ligipääsu võti",
+    "Secret Key" : "Salavõti",
+    "Hostname" : "Hostinimi",
+    "Port" : "Port",
+    "Region" : "Piirkond",
+    "Enable SSL" : "SSL-i kasutamine",
+    "Enable Path Style" : "Luba otsingtee stiilis",
+    "App key" : "Rakenduse võti",
+    "App secret" : "Rakenduse salasõna",
+    "Host" : "Host",
+    "Username" : "Kasutajanimi",
+    "Password" : "Parool",
+    "Root" : "Juur",
+    "Secure ftps://" : "Turvaline ftps://",
+    "Client ID" : "Kliendi ID",
+    "Client secret" : "Kliendi salasõna",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regioon (valikuline OpenStack Object Storage puhul)",
+    "API Key (required for Rackspace Cloud Files)" : "API võti (vajalik Rackspace Cloud Files puhul)",
+    "Tenantname (required for OpenStack Object Storage)" : "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
+    "Password (required for OpenStack Object Storage)" : "Parool (vajalik OpenStack Object Storage puhul)",
+    "Service Name (required for OpenStack Object Storage)" : "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
+    "Timeout of HTTP requests in seconds" : "HTTP päringute aegumine sekundites",
+    "Share" : "Jaga",
+    "SMB / CIFS using OC login" : "SMB / CIFS kasutades OC logimist",
+    "Username as share" : "Kasutajanimi kui jagamine",
+    "URL" : "URL",
+    "Secure https://" : "Turvaline https://",
+    "Remote subfolder" : "Mujahl olev alamkaust",
+    "Access granted" : "Ligipääs on antud",
+    "Error configuring Dropbox storage" : "Viga Dropboxi salvestusruumi seadistamisel",
+    "Grant access" : "Anna ligipääs",
+    "Error configuring Google Drive storage" : "Viga Google Drive'i salvestusruumi seadistamisel",
+    "Personal" : "Isiklik",
+    "System" : "Süsteem",
+    "All users. Type to select user or group." : "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
+    "(group)" : "(grupp)",
+    "Saved" : "Salvestatud",
+    "<b>Note:</b> " : "<b>Märkus:</b>",
+    " and " : "ja",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata vajalik tugi.",
+    "You don't have any external storages" : "Sul pole ühtegi välist andmehoidlat",
+    "Name" : "Nimi",
+    "Storage type" : "Andmehoidla tüüp",
+    "Scope" : "Skoop",
+    "External Storage" : "Väline salvestuskoht",
+    "Folder name" : "Kausta nimi",
+    "Configuration" : "Seadistamine",
+    "Available for" : "Saadaval",
+    "Add storage" : "Lisa andmehoidla",
+    "Delete" : "Kustuta",
+    "Enable User External Storage" : "Luba kasutajatele väline salvestamine",
+    "Allow users to mount the following external storage" : "Võimalda kasutajatel ühendada järgmist välist andmehoidlat"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
deleted file mode 100644
index 55992a44e6d..00000000000
--- a/apps/files_external/l10n/et_EE.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Tellimustõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Ligipääsutõendi hankimine ebaõnnestus. Veendu, et Su Dropboxi rakendi võti (key) ja saladus (secret) on korrektsed.",
-"Please provide a valid Dropbox app key and secret." => "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna.",
-"Step 1 failed. Exception: %s" => "Samm 1 ebaõnnestus. Erind: %s",
-"Step 2 failed. Exception: %s" => "Samm 2 ebaõnnestus. Erind: %s",
-"External storage" => "Väline andmehoidla",
-"Local" => "Kohalik",
-"Location" => "Asukoht",
-"Amazon S3" => "Amazon S3",
-"Key" => "Võti",
-"Secret" => "Salasõna",
-"Bucket" => "Korv",
-"Amazon S3 and compliant" => "Amazon S3 ja ühilduv",
-"Access Key" => "Ligipääsu võti",
-"Secret Key" => "Salavõti",
-"Hostname" => "Hostinimi",
-"Port" => "Port",
-"Region" => "Piirkond",
-"Enable SSL" => "SSL-i kasutamine",
-"Enable Path Style" => "Luba otsingtee stiilis",
-"App key" => "Rakenduse võti",
-"App secret" => "Rakenduse salasõna",
-"Host" => "Host",
-"Username" => "Kasutajanimi",
-"Password" => "Parool",
-"Root" => "Juur",
-"Secure ftps://" => "Turvaline ftps://",
-"Client ID" => "Kliendi ID",
-"Client secret" => "Kliendi salasõna",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Regioon (valikuline OpenStack Object Storage puhul)",
-"API Key (required for Rackspace Cloud Files)" => "API võti (vajalik Rackspace Cloud Files puhul)",
-"Tenantname (required for OpenStack Object Storage)" => "Rendinimi (tenantname , vajalik OpenStack Object Storage puhul)",
-"Password (required for OpenStack Object Storage)" => "Parool (vajalik OpenStack Object Storage puhul)",
-"Service Name (required for OpenStack Object Storage)" => "Teenuse nimi (vajalik OpenStack Object Storage puhul)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "Tuvastuse URL lõpp-punkt (vajalik OpenStack Object Storage puhul)",
-"Timeout of HTTP requests in seconds" => "HTTP päringute aegumine sekundites",
-"Share" => "Jaga",
-"SMB / CIFS using OC login" => "SMB / CIFS kasutades OC logimist",
-"Username as share" => "Kasutajanimi kui jagamine",
-"URL" => "URL",
-"Secure https://" => "Turvaline https://",
-"Remote subfolder" => "Mujahl olev alamkaust",
-"Access granted" => "Ligipääs on antud",
-"Error configuring Dropbox storage" => "Viga Dropboxi salvestusruumi seadistamisel",
-"Grant access" => "Anna ligipääs",
-"Error configuring Google Drive storage" => "Viga Google Drive'i salvestusruumi seadistamisel",
-"Personal" => "Isiklik",
-"System" => "Süsteem",
-"All users. Type to select user or group." => "Kõik kasutajad. Kirjuta, et valida kasutaja või grupp.",
-"(group)" => "(grupp)",
-"Saved" => "Salvestatud",
-"<b>Note:</b> " => "<b>Märkus:</b>",
-" and " => "ja",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Märkus:</b> cURL tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata cURL tugi.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Märkus:</b> FTP tugi puudub PHP paigalduses. FTP %s hoidla ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata FTP tugi.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Märkus:</b> \"%s\" pole paigaldatud. Hoidla %s ühendamine pole võimalik. Palu oma süsteemihalduril paigaldata vajalik tugi.",
-"You don't have any external storages" => "Sul pole ühtegi välist andmehoidlat",
-"Name" => "Nimi",
-"Storage type" => "Andmehoidla tüüp",
-"Scope" => "Skoop",
-"External Storage" => "Väline salvestuskoht",
-"Folder name" => "Kausta nimi",
-"Configuration" => "Seadistamine",
-"Available for" => "Saadaval",
-"Add storage" => "Lisa andmehoidla",
-"Delete" => "Kustuta",
-"Enable User External Storage" => "Luba kasutajatele väline salvestamine",
-"Allow users to mount the following external storage" => "Võimalda kasutajatel ühendada järgmist välist andmehoidlat"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js
new file mode 100644
index 00000000000..4c8ce97c6ff
--- /dev/null
+++ b/apps/files_external/l10n/eu.js
@@ -0,0 +1,68 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Eskaera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Sarrera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
+    "Please provide a valid Dropbox app key and secret." : "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
+    "Step 1 failed. Exception: %s" : "1 Urratsak huts egin du. Salbuespena: %s",
+    "Step 2 failed. Exception: %s" : "2 Urratsak huts egin du. Salbuespena: %s",
+    "External storage" : "Kanpoko biltegiratzea",
+    "Local" : "Bertakoa",
+    "Location" : "Kokapena",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Gakoa",
+    "Secret" : "Sekretua",
+    "Amazon S3 and compliant" : "Amazon S3 eta baliokideak",
+    "Access Key" : "Sarbide gakoa",
+    "Secret Key" : "Giltza Sekretua",
+    "Port" : "Portua",
+    "Region" : "Eskualdea",
+    "Enable SSL" : "Gaitu SSL",
+    "Enable Path Style" : "Gaitu Bide Estiloa",
+    "App key" : "Aplikazio gakoa",
+    "App secret" : "App sekretua",
+    "Host" : "Ostalaria",
+    "Username" : "Erabiltzaile izena",
+    "Password" : "Pasahitza",
+    "Root" : "Erroa",
+    "Secure ftps://" : "ftps:// segurua",
+    "Client ID" : "Bezero ID",
+    "Client secret" : "Bezeroaren Sekretua",
+    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
+    "Region (optional for OpenStack Object Storage)" : "Eskualdea (hautazkoa OpenStack Objektu Biltegiratzerako)",
+    "API Key (required for Rackspace Cloud Files)" : "API Giltza (beharrezkoa Rackspace Cloud Filesentzako)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (beharrezkoa OpenStack Objektu Biltegiratzerko)",
+    "Password (required for OpenStack Object Storage)" : "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+    "Service Name (required for OpenStack Object Storage)" : "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+    "Share" : "Partekatu",
+    "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
+    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
+    "URL" : "URL",
+    "Secure https://" : "https:// segurua",
+    "Remote subfolder" : "Urruneko azpikarpeta",
+    "Access granted" : "Sarrera baimendua",
+    "Error configuring Dropbox storage" : "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
+    "Grant access" : "Baimendu sarrera",
+    "Error configuring Google Drive storage" : "Errore bat egon da Google Drive konfiguratzean",
+    "Personal" : "Pertsonala",
+    "System" : "Sistema",
+    "Saved" : "Gordeta",
+    "<b>Note:</b> " : "<b>Oharra:</b>",
+    " and " : "eta",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+    "You don't have any external storages" : "Ez duzu kanpoko biltegiratzerik",
+    "Name" : "Izena",
+    "Storage type" : "Biltegiratze mota",
+    "External Storage" : "Kanpoko biltegiratzea",
+    "Folder name" : "Karpetaren izena",
+    "Configuration" : "Konfigurazioa",
+    "Available for" : "Hauentzat eskuragarri",
+    "Add storage" : "Gehitu biltegiratzea",
+    "Delete" : "Ezabatu",
+    "Enable User External Storage" : "Gaitu erabiltzaileentzako kanpo biltegiratzea",
+    "Allow users to mount the following external storage" : "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json
new file mode 100644
index 00000000000..b74d207cc2b
--- /dev/null
+++ b/apps/files_external/l10n/eu.json
@@ -0,0 +1,66 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Eskaera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Sarrera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
+    "Please provide a valid Dropbox app key and secret." : "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
+    "Step 1 failed. Exception: %s" : "1 Urratsak huts egin du. Salbuespena: %s",
+    "Step 2 failed. Exception: %s" : "2 Urratsak huts egin du. Salbuespena: %s",
+    "External storage" : "Kanpoko biltegiratzea",
+    "Local" : "Bertakoa",
+    "Location" : "Kokapena",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Gakoa",
+    "Secret" : "Sekretua",
+    "Amazon S3 and compliant" : "Amazon S3 eta baliokideak",
+    "Access Key" : "Sarbide gakoa",
+    "Secret Key" : "Giltza Sekretua",
+    "Port" : "Portua",
+    "Region" : "Eskualdea",
+    "Enable SSL" : "Gaitu SSL",
+    "Enable Path Style" : "Gaitu Bide Estiloa",
+    "App key" : "Aplikazio gakoa",
+    "App secret" : "App sekretua",
+    "Host" : "Ostalaria",
+    "Username" : "Erabiltzaile izena",
+    "Password" : "Pasahitza",
+    "Root" : "Erroa",
+    "Secure ftps://" : "ftps:// segurua",
+    "Client ID" : "Bezero ID",
+    "Client secret" : "Bezeroaren Sekretua",
+    "OpenStack Object Storage" : "OpenStack Objektu Biltegiratzea",
+    "Region (optional for OpenStack Object Storage)" : "Eskualdea (hautazkoa OpenStack Objektu Biltegiratzerako)",
+    "API Key (required for Rackspace Cloud Files)" : "API Giltza (beharrezkoa Rackspace Cloud Filesentzako)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (beharrezkoa OpenStack Objektu Biltegiratzerko)",
+    "Password (required for OpenStack Object Storage)" : "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+    "Service Name (required for OpenStack Object Storage)" : "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+    "Share" : "Partekatu",
+    "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
+    "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
+    "URL" : "URL",
+    "Secure https://" : "https:// segurua",
+    "Remote subfolder" : "Urruneko azpikarpeta",
+    "Access granted" : "Sarrera baimendua",
+    "Error configuring Dropbox storage" : "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
+    "Grant access" : "Baimendu sarrera",
+    "Error configuring Google Drive storage" : "Errore bat egon da Google Drive konfiguratzean",
+    "Personal" : "Pertsonala",
+    "System" : "Sistema",
+    "Saved" : "Gordeta",
+    "<b>Note:</b> " : "<b>Oharra:</b>",
+    " and " : "eta",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
+    "You don't have any external storages" : "Ez duzu kanpoko biltegiratzerik",
+    "Name" : "Izena",
+    "Storage type" : "Biltegiratze mota",
+    "External Storage" : "Kanpoko biltegiratzea",
+    "Folder name" : "Karpetaren izena",
+    "Configuration" : "Konfigurazioa",
+    "Available for" : "Hauentzat eskuragarri",
+    "Add storage" : "Gehitu biltegiratzea",
+    "Delete" : "Ezabatu",
+    "Enable User External Storage" : "Gaitu erabiltzaileentzako kanpo biltegiratzea",
+    "Allow users to mount the following external storage" : "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
deleted file mode 100644
index 9ebf51e49cf..00000000000
--- a/apps/files_external/l10n/eu.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Eskaera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Sarrera tokenen eskuratzeak huts egin du. Egiaztatu zure Dropbox app giltza eta sekretua zuzenak direla.",
-"Please provide a valid Dropbox app key and secret." => "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua",
-"Step 1 failed. Exception: %s" => "1 Urratsak huts egin du. Salbuespena: %s",
-"Step 2 failed. Exception: %s" => "2 Urratsak huts egin du. Salbuespena: %s",
-"External storage" => "Kanpoko biltegiratzea",
-"Local" => "Bertakoa",
-"Location" => "Kokapena",
-"Amazon S3" => "Amazon S3",
-"Key" => "Gakoa",
-"Secret" => "Sekretua",
-"Amazon S3 and compliant" => "Amazon S3 eta baliokideak",
-"Access Key" => "Sarbide gakoa",
-"Secret Key" => "Giltza Sekretua",
-"Hostname" => "Ostalari izena",
-"Port" => "Portua",
-"Region" => "Eskualdea",
-"Enable SSL" => "Gaitu SSL",
-"Enable Path Style" => "Gaitu Bide Estiloa",
-"App key" => "Aplikazio gakoa",
-"App secret" => "App sekretua",
-"Host" => "Ostalaria",
-"Username" => "Erabiltzaile izena",
-"Password" => "Pasahitza",
-"Root" => "Erroa",
-"Secure ftps://" => "ftps:// segurua",
-"Client ID" => "Bezero ID",
-"Client secret" => "Bezeroaren Sekretua",
-"OpenStack Object Storage" => "OpenStack Objektu Biltegiratzea",
-"Region (optional for OpenStack Object Storage)" => "Eskualdea (hautazkoa OpenStack Objektu Biltegiratzerako)",
-"API Key (required for Rackspace Cloud Files)" => "API Giltza (beharrezkoa Rackspace Cloud Filesentzako)",
-"Tenantname (required for OpenStack Object Storage)" => "Tenantname (beharrezkoa OpenStack Objektu Biltegiratzerko)",
-"Password (required for OpenStack Object Storage)" => "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-"Service Name (required for OpenStack Object Storage)" => "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
-"Timeout of HTTP requests in seconds" => "HTTP eskarien gehienezko denbora segundutan",
-"Share" => "Partekatu",
-"SMB / CIFS using OC login" => "SMB / CIFS saioa hasteko OC erabiliz",
-"Username as share" => "Erabiltzaile izena elkarbanaketa bezala",
-"URL" => "URL",
-"Secure https://" => "https:// segurua",
-"Remote subfolder" => "Urruneko azpikarpeta",
-"Access granted" => "Sarrera baimendua",
-"Error configuring Dropbox storage" => "Errore bat egon da Dropbox biltegiratzea konfiguratzean",
-"Grant access" => "Baimendu sarrera",
-"Error configuring Google Drive storage" => "Errore bat egon da Google Drive konfiguratzean",
-"Personal" => "Pertsonala",
-"System" => "Sistema",
-"All users. Type to select user or group." => "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
-"(group)" => "(taldea)",
-"Saved" => "Gordeta",
-"<b>Note:</b> " => "<b>Oharra:</b>",
-" and " => "eta",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Oharra:</b> :PHPko cURL euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Oharra:</b> :PHPko FTP euskarria ez dago instalatuta edo gaitua. Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Oharra:</b>\"%s\" euskarria ez dago instalatuta Ezinezko da %s muntatzea. Mesedez eskatu sistema administratzaleari instala dezan. ",
-"You don't have any external storages" => "Ez duzu kanpoko biltegiratzerik",
-"Name" => "Izena",
-"Storage type" => "Biltegiratze mota",
-"External Storage" => "Kanpoko biltegiratzea",
-"Folder name" => "Karpetaren izena",
-"Configuration" => "Konfigurazioa",
-"Available for" => "Hauentzat eskuragarri",
-"Add storage" => "Gehitu biltegiratzea",
-"Delete" => "Ezabatu",
-"Enable User External Storage" => "Gaitu erabiltzaileentzako kanpo biltegiratzea",
-"Allow users to mount the following external storage" => "Baimendu erabiltzaileak hurrengo kanpo biltegiratzeak muntatzen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/eu_ES.js b/apps/files_external/l10n/eu_ES.js
new file mode 100644
index 00000000000..513edcb534e
--- /dev/null
+++ b/apps/files_external/l10n/eu_ES.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..149a30d1a7e
--- /dev/null
+++ b/apps/files_external/l10n/eu_ES.json
@@ -0,0 +1,6 @@
+{ "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/eu_ES.php b/apps/files_external/l10n/eu_ES.php
deleted file mode 100644
index c1a7b6889ba..00000000000
--- a/apps/files_external/l10n/eu_ES.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "kokapena",
-"Personal" => "Pertsonala",
-"Delete" => "Ezabatu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fa.js b/apps/files_external/l10n/fa.js
new file mode 100644
index 00000000000..066684383e8
--- /dev/null
+++ b/apps/files_external/l10n/fa.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید.",
+    "External storage" : "حافظه خارجی",
+    "Location" : "محل",
+    "Port" : "درگاه",
+    "Region" : "ناحیه",
+    "Host" : "میزبانی",
+    "Username" : "نام کاربری",
+    "Password" : "گذرواژه",
+    "Share" : "اشتراک‌گذاری",
+    "URL" : "آدرس",
+    "Access granted" : "مجوز دسترسی صادر شد",
+    "Error configuring Dropbox storage" : "خطا به هنگام تنظیم فضای دراپ باکس",
+    "Grant access" : " مجوز اعطا دسترسی",
+    "Error configuring Google Drive storage" : "خطا به هنگام تنظیم فضای Google Drive",
+    "Personal" : "شخصی",
+    "Saved" : "ذخیره شد",
+    "Name" : "نام",
+    "External Storage" : "حافظه خارجی",
+    "Folder name" : "نام پوشه",
+    "Configuration" : "پیکربندی",
+    "Add storage" : "اضافه کردن حافظه",
+    "Delete" : "حذف",
+    "Enable User External Storage" : "فعال سازی حافظه خارجی کاربر"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/fa.json b/apps/files_external/l10n/fa.json
new file mode 100644
index 00000000000..21bd2c63b59
--- /dev/null
+++ b/apps/files_external/l10n/fa.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید.",
+    "External storage" : "حافظه خارجی",
+    "Location" : "محل",
+    "Port" : "درگاه",
+    "Region" : "ناحیه",
+    "Host" : "میزبانی",
+    "Username" : "نام کاربری",
+    "Password" : "گذرواژه",
+    "Share" : "اشتراک‌گذاری",
+    "URL" : "آدرس",
+    "Access granted" : "مجوز دسترسی صادر شد",
+    "Error configuring Dropbox storage" : "خطا به هنگام تنظیم فضای دراپ باکس",
+    "Grant access" : " مجوز اعطا دسترسی",
+    "Error configuring Google Drive storage" : "خطا به هنگام تنظیم فضای Google Drive",
+    "Personal" : "شخصی",
+    "Saved" : "ذخیره شد",
+    "Name" : "نام",
+    "External Storage" : "حافظه خارجی",
+    "Folder name" : "نام پوشه",
+    "Configuration" : "پیکربندی",
+    "Add storage" : "اضافه کردن حافظه",
+    "Delete" : "حذف",
+    "Enable User External Storage" : "فعال سازی حافظه خارجی کاربر"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
deleted file mode 100644
index 820f4f8d73b..00000000000
--- a/apps/files_external/l10n/fa.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "لطفا یک کلید و کد امنیتی صحیح دراپ باکس وارد کنید.",
-"External storage" => "حافظه خارجی",
-"Location" => "محل",
-"Port" => "درگاه",
-"Region" => "ناحیه",
-"Host" => "میزبانی",
-"Username" => "نام کاربری",
-"Password" => "گذرواژه",
-"Share" => "اشتراک‌گذاری",
-"URL" => "آدرس",
-"Access granted" => "مجوز دسترسی صادر شد",
-"Error configuring Dropbox storage" => "خطا به هنگام تنظیم فضای دراپ باکس",
-"Grant access" => " مجوز اعطا دسترسی",
-"Error configuring Google Drive storage" => "خطا به هنگام تنظیم فضای Google Drive",
-"Personal" => "شخصی",
-"Saved" => "ذخیره شد",
-"Name" => "نام",
-"External Storage" => "حافظه خارجی",
-"Folder name" => "نام پوشه",
-"Configuration" => "پیکربندی",
-"Add storage" => "اضافه کردن حافظه",
-"Delete" => "حذف",
-"Enable User External Storage" => "فعال سازی حافظه خارجی کاربر"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/fi_FI.js b/apps/files_external/l10n/fi_FI.js
new file mode 100644
index 00000000000..f7895f842c3
--- /dev/null
+++ b/apps/files_external/l10n/fi_FI.js
@@ -0,0 +1,50 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
+    "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
+    "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
+    "External storage" : "Ulkoinen tallennustila",
+    "Local" : "Paikallinen",
+    "Location" : "Sijainti",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Avain",
+    "Amazon S3 and compliant" : "Amazon S3 ja yhteensopivat",
+    "Port" : "Portti",
+    "Region" : "Alue",
+    "Enable SSL" : "Käytä SSL:ää",
+    "Host" : "Isäntä",
+    "Username" : "Käyttäjätunnus",
+    "Password" : "Salasana",
+    "Secure ftps://" : "Salattu ftps://",
+    "Timeout of HTTP requests in seconds" : "HTTP-pyyntöjen aikakatkaisu sekunneissa",
+    "Share" : "Jaa",
+    "URL" : "Verkko-osoite",
+    "Secure https://" : "Salattu https://",
+    "Access granted" : "Pääsy sallittu",
+    "Error configuring Dropbox storage" : "Virhe Dropbox levyn asetuksia tehtäessä",
+    "Grant access" : "Salli pääsy",
+    "Error configuring Google Drive storage" : "Virhe Google Drive levyn asetuksia tehtäessä",
+    "Personal" : "Henkilökohtainen",
+    "System" : "Järjestelmä",
+    "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",
+    "<b>Note:</b> " : "<b>Huomio:</b> ",
+    " and " : "ja",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
+    "You don't have any external storages" : "Käytössäsi ei ole erillisiä tallennustiloja",
+    "Name" : "Nimi",
+    "Storage type" : "Tallennustilan tyyppi",
+    "External Storage" : "Erillinen tallennusväline",
+    "Folder name" : "Kansion nimi",
+    "Configuration" : "Asetukset",
+    "Available for" : "Saatavuus",
+    "Add storage" : "Lisää tallennustila",
+    "Delete" : "Poista",
+    "Enable User External Storage" : "Ota käyttöön ulkopuoliset tallennuspaikat",
+    "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/fi_FI.json b/apps/files_external/l10n/fi_FI.json
new file mode 100644
index 00000000000..dad235128fb
--- /dev/null
+++ b/apps/files_external/l10n/fi_FI.json
@@ -0,0 +1,48 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
+    "Step 1 failed. Exception: %s" : "Vaihe 1 epäonnistui. Poikkeus: %s",
+    "Step 2 failed. Exception: %s" : "Vaihe 2 epäonnistui. Poikkeus: %s",
+    "External storage" : "Ulkoinen tallennustila",
+    "Local" : "Paikallinen",
+    "Location" : "Sijainti",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Avain",
+    "Amazon S3 and compliant" : "Amazon S3 ja yhteensopivat",
+    "Port" : "Portti",
+    "Region" : "Alue",
+    "Enable SSL" : "Käytä SSL:ää",
+    "Host" : "Isäntä",
+    "Username" : "Käyttäjätunnus",
+    "Password" : "Salasana",
+    "Secure ftps://" : "Salattu ftps://",
+    "Timeout of HTTP requests in seconds" : "HTTP-pyyntöjen aikakatkaisu sekunneissa",
+    "Share" : "Jaa",
+    "URL" : "Verkko-osoite",
+    "Secure https://" : "Salattu https://",
+    "Access granted" : "Pääsy sallittu",
+    "Error configuring Dropbox storage" : "Virhe Dropbox levyn asetuksia tehtäessä",
+    "Grant access" : "Salli pääsy",
+    "Error configuring Google Drive storage" : "Virhe Google Drive levyn asetuksia tehtäessä",
+    "Personal" : "Henkilökohtainen",
+    "System" : "Järjestelmä",
+    "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",
+    "<b>Note:</b> " : "<b>Huomio:</b> ",
+    " and " : "ja",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
+    "You don't have any external storages" : "Käytössäsi ei ole erillisiä tallennustiloja",
+    "Name" : "Nimi",
+    "Storage type" : "Tallennustilan tyyppi",
+    "External Storage" : "Erillinen tallennusväline",
+    "Folder name" : "Kansion nimi",
+    "Configuration" : "Asetukset",
+    "Available for" : "Saatavuus",
+    "Add storage" : "Lisää tallennustila",
+    "Delete" : "Poista",
+    "Enable User External Storage" : "Ota käyttöön ulkopuoliset tallennuspaikat",
+    "Allow users to mount the following external storage" : "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
deleted file mode 100644
index a2d5420c975..00000000000
--- a/apps/files_external/l10n/fi_FI.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Anna kelvollinen Dropbox-sovellusavain ja salainen vastaus.",
-"Step 1 failed. Exception: %s" => "Vaihe 1 epäonnistui. Poikkeus: %s",
-"Step 2 failed. Exception: %s" => "Vaihe 2 epäonnistui. Poikkeus: %s",
-"External storage" => "Ulkoinen tallennustila",
-"Local" => "Paikallinen",
-"Location" => "Sijainti",
-"Amazon S3" => "Amazon S3",
-"Key" => "Avain",
-"Amazon S3 and compliant" => "Amazon S3 ja yhteensopivat",
-"Port" => "Portti",
-"Region" => "Alue",
-"Enable SSL" => "Käytä SSL:ää",
-"Host" => "Isäntä",
-"Username" => "Käyttäjätunnus",
-"Password" => "Salasana",
-"Secure ftps://" => "Salattu ftps://",
-"Timeout of HTTP requests in seconds" => "HTTP-pyyntöjen aikakatkaisu sekunneissa",
-"Share" => "Jaa",
-"URL" => "Verkko-osoite",
-"Secure https://" => "Salattu https://",
-"Access granted" => "Pääsy sallittu",
-"Error configuring Dropbox storage" => "Virhe Dropbox levyn asetuksia tehtäessä",
-"Grant access" => "Salli pääsy",
-"Error configuring Google Drive storage" => "Virhe Google Drive levyn asetuksia tehtäessä",
-"Personal" => "Henkilökohtainen",
-"System" => "Järjestelmä",
-"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",
-"<b>Note:</b> " => "<b>Huomio:</b> ",
-" and " => "ja",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> PHP:n cURL-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan cURL-tuki käyttöön.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> PHP:n FTP-tuki ei ole käytössä tai sitä ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää ottamaan FTP-tuki käyttöön.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Huomio:</b> \"%s\" ei ole asennettu. Kohteen %s liittäminen ei ole mahdollista. Pyydä järjestelmän ylläpitäjää asentamaan puuttuva kohde.",
-"You don't have any external storages" => "Käytössäsi ei ole erillisiä tallennustiloja",
-"Name" => "Nimi",
-"Storage type" => "Tallennustilan tyyppi",
-"External Storage" => "Erillinen tallennusväline",
-"Folder name" => "Kansion nimi",
-"Configuration" => "Asetukset",
-"Available for" => "Saatavuus",
-"Add storage" => "Lisää tallennustila",
-"Delete" => "Poista",
-"Enable User External Storage" => "Ota käyttöön ulkopuoliset tallennuspaikat",
-"Allow users to mount the following external storage" => "Salli käyttäjien liittää seuraavat erilliset tallennusvälineet"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
new file mode 100644
index 00000000000..8f4b0bc11bf
--- /dev/null
+++ b/apps/files_external/l10n/fr.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clef Dropbox ainsi que le mot de passe.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
+    "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
+    "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur: %s",
+    "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur: %s",
+    "External storage" : "Stockage externe",
+    "Local" : "Local",
+    "Location" : "Emplacement",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clé",
+    "Secret" : "Secret",
+    "Bucket" : "Seau",
+    "Amazon S3 and compliant" : "Compatible avec Amazon S3",
+    "Access Key" : "Clé d'accès",
+    "Secret Key" : "Clé secrète",
+    "Hostname" : "Nom de l'hôte",
+    "Port" : "Port",
+    "Region" : "Région",
+    "Enable SSL" : "Activer SSL",
+    "Enable Path Style" : "Activer le style de chemin",
+    "App key" : "Clé App",
+    "App secret" : "Secret de l'application",
+    "Host" : "Hôte",
+    "Username" : "Nom d'utilisateur",
+    "Password" : "Mot de passe",
+    "Root" : "Root",
+    "Secure ftps://" : "Sécuriser via ftps://",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "OpenStack Object Storage" : "Object de Stockage OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Region (optionnel pour Object de Stockage OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nom du locataire (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 (requit 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" : "Temps maximal de requête HTTP en seconde",
+    "Share" : "Partager",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC",
+    "Username as share" : "Nom d'utilisateur du partage",
+    "URL" : "URL",
+    "Secure https://" : "Sécurisation https://",
+    "Remote subfolder" : "Sous-dossier distant",
+    "Access granted" : "Accès autorisé",
+    "Error configuring Dropbox storage" : "Erreur lors de la configuration du support de stockage Dropbox",
+    "Grant access" : "Autoriser l'accès",
+    "Error configuring Google Drive storage" : "Erreur lors de la configuration du support de stockage Google Drive",
+    "Personal" : "Personnel",
+    "System" : "Système",
+    "All users. Type to select user or group." : "Tous les utilisateurs. Commencez à saisir pour sélectionner un utilisateur ou un groupe.",
+    "(group)" : "(groupe)",
+    "Saved" : "Sauvegarder",
+    "<b>Note:</b> " : "<b>Attention :</b>",
+    " and " : "et",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. 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> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+    "You don't have any external storages" : "Vous n'avez pas de support de stockage externe",
+    "Name" : "Nom",
+    "Storage type" : "Type de support de stockage",
+    "Scope" : "Portée",
+    "External Storage" : "Stockage externe",
+    "Folder name" : "Nom du dossier",
+    "Configuration" : "Configuration",
+    "Available for" : "Disponible pour",
+    "Add storage" : "Ajouter un support de stockage",
+    "Delete" : "Supprimer",
+    "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs",
+    "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
new file mode 100644
index 00000000000..b4b614e3775
--- /dev/null
+++ b/apps/files_external/l10n/fr.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clef Dropbox ainsi que le mot de passe.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
+    "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
+    "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur: %s",
+    "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur: %s",
+    "External storage" : "Stockage externe",
+    "Local" : "Local",
+    "Location" : "Emplacement",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clé",
+    "Secret" : "Secret",
+    "Bucket" : "Seau",
+    "Amazon S3 and compliant" : "Compatible avec Amazon S3",
+    "Access Key" : "Clé d'accès",
+    "Secret Key" : "Clé secrète",
+    "Hostname" : "Nom de l'hôte",
+    "Port" : "Port",
+    "Region" : "Région",
+    "Enable SSL" : "Activer SSL",
+    "Enable Path Style" : "Activer le style de chemin",
+    "App key" : "Clé App",
+    "App secret" : "Secret de l'application",
+    "Host" : "Hôte",
+    "Username" : "Nom d'utilisateur",
+    "Password" : "Mot de passe",
+    "Root" : "Root",
+    "Secure ftps://" : "Sécuriser via ftps://",
+    "Client ID" : "ID Client",
+    "Client secret" : "Secret client",
+    "OpenStack Object Storage" : "Object de Stockage OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Region (optionnel pour Object de Stockage OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Clé API (requis pour Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nom du locataire (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 (requit 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" : "Temps maximal de requête HTTP en seconde",
+    "Share" : "Partager",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC",
+    "Username as share" : "Nom d'utilisateur du partage",
+    "URL" : "URL",
+    "Secure https://" : "Sécurisation https://",
+    "Remote subfolder" : "Sous-dossier distant",
+    "Access granted" : "Accès autorisé",
+    "Error configuring Dropbox storage" : "Erreur lors de la configuration du support de stockage Dropbox",
+    "Grant access" : "Autoriser l'accès",
+    "Error configuring Google Drive storage" : "Erreur lors de la configuration du support de stockage Google Drive",
+    "Personal" : "Personnel",
+    "System" : "Système",
+    "All users. Type to select user or group." : "Tous les utilisateurs. Commencez à saisir pour sélectionner un utilisateur ou un groupe.",
+    "(group)" : "(groupe)",
+    "Saved" : "Sauvegarder",
+    "<b>Note:</b> " : "<b>Attention :</b>",
+    " and " : "et",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. 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> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+    "You don't have any external storages" : "Vous n'avez pas de support de stockage externe",
+    "Name" : "Nom",
+    "Storage type" : "Type de support de stockage",
+    "Scope" : "Portée",
+    "External Storage" : "Stockage externe",
+    "Folder name" : "Nom du dossier",
+    "Configuration" : "Configuration",
+    "Available for" : "Disponible pour",
+    "Add storage" : "Ajouter un support de stockage",
+    "Delete" : "Supprimer",
+    "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs",
+    "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/fr.php b/apps/files_external/l10n/fr.php
deleted file mode 100644
index 67f2f321bfb..00000000000
--- a/apps/files_external/l10n/fr.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
-"Please provide a valid Dropbox app key and secret." => "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
-"Step 1 failed. Exception: %s" => "L’étape 1 a échoué. Erreur: %s",
-"Step 2 failed. Exception: %s" => "L’étape 2 a échoué. Erreur: %s",
-"External storage" => "Stockage externe",
-"Local" => "Local",
-"Location" => "Emplacement",
-"Amazon S3" => "Amazon S3",
-"Key" => "Clé",
-"Secret" => "Secret",
-"Bucket" => "Seau",
-"Amazon S3 and compliant" => "Compatible avec Amazon S3",
-"Access Key" => "Clé d'accès",
-"Secret Key" => "Clé secrète",
-"Hostname" => "Nom de l'hôte",
-"Port" => "Port",
-"Region" => "Région",
-"Enable SSL" => "Activer SSL",
-"Enable Path Style" => "Activer le style de chemin",
-"App key" => "Clé App",
-"App secret" => "Secret de l'application",
-"Host" => "Hôte",
-"Username" => "Nom d'utilisateur",
-"Password" => "Mot de passe",
-"Root" => "Root",
-"Secure ftps://" => "Sécuriser via ftps://",
-"Client ID" => "ID Client",
-"Client secret" => "Secret client",
-"OpenStack Object Storage" => "Object de Stockage OpenStack",
-"Region (optional for OpenStack Object Storage)" => "Region (optionnel pour Object de Stockage OpenStack)",
-"API Key (required for Rackspace Cloud Files)" => "Clé API (requis pour Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Nom du locataire (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 (requit 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" => "Temps maximal de requête HTTP en seconde",
-"Share" => "Partager",
-"SMB / CIFS using OC login" => "SMB / CIFS utilise le nom d'utilisateur OC",
-"Username as share" => "Nom d'utilisateur du partage",
-"URL" => "URL",
-"Secure https://" => "Sécurisation https://",
-"Remote subfolder" => "Sous-dossier distant",
-"Access granted" => "Accès autorisé",
-"Error configuring Dropbox storage" => "Erreur lors de la configuration du support de stockage Dropbox",
-"Grant access" => "Autoriser l'accès",
-"Error configuring Google Drive storage" => "Erreur lors de la configuration du support de stockage Google Drive",
-"Personal" => "Personnel",
-"System" => "Système",
-"All users. Type to select user or group." => "Tous les utilisateurs. Commencez à saisir pour sélectionner un utilisateur ou un groupe.",
-"(group)" => "(groupe)",
-"Saved" => "Sauvegarder",
-"<b>Note:</b> " => "<b>Attention :</b>",
-" and " => "et",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. 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> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
-"You don't have any external storages" => "Vous n'avez pas de support de stockage externe",
-"Name" => "Nom",
-"Storage type" => "Type de support de stockage",
-"Scope" => "Portée",
-"External Storage" => "Stockage externe",
-"Folder name" => "Nom du dossier",
-"Configuration" => "Configuration",
-"Available for" => "Disponible pour",
-"Add storage" => "Ajouter un support de stockage",
-"Delete" => "Supprimer",
-"Enable User External Storage" => "Activer le stockage externe pour les utilisateurs",
-"Allow users to mount the following external storage" => "Autorise les utilisateurs à monter les stockage externes suivants"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js
new file mode 100644
index 00000000000..9e2ec2535b6
--- /dev/null
+++ b/apps/files_external/l10n/gl.js
@@ -0,0 +1,70 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de petición. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de acceso. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
+    "Please provide a valid Dropbox app key and secret." : "Forneza unha chave correcta e segreda do Dropbox.",
+    "Step 1 failed. Exception: %s" : "Fallou o paso 1. Excepción: %s",
+    "Step 2 failed. Exception: %s" : "Fallou o paso 2. Excepción: %s",
+    "External storage" : "Almacenamento externo",
+    "Local" : "Local",
+    "Location" : "Localización",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clave",
+    "Secret" : "Secreto",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 e compatíbeis",
+    "Access Key" : "Clave de acceso",
+    "Secret Key" : "Clave secreta",
+    "Port" : "Porto",
+    "Region" : "Autonomía",
+    "Enable SSL" : "Activar SSL",
+    "Enable Path Style" : "Activar o estilo de ruta",
+    "App key" : "Clave da API",
+    "App secret" : "Secreto da aplicación",
+    "Host" : "Servidor",
+    "Username" : "Nome de usuario",
+    "Password" : "Contrasinal",
+    "Root" : "Root (raíz)",
+    "Secure ftps://" : "ftps:// seguro",
+    "Client ID" : "ID do cliente",
+    "Client secret" : "Secreto do cliente",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Rexión (opcional para OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Clave da API (obrigatoria para Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
+    "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
+    "Username as share" : "Nome de usuario como compartición",
+    "URL" : "URL",
+    "Secure https://" : "https:// seguro",
+    "Remote subfolder" : "Subcartafol remoto",
+    "Access granted" : "Concedeuse acceso",
+    "Error configuring Dropbox storage" : "Produciuse un erro ao configurar o almacenamento en Dropbox",
+    "Grant access" : "Permitir o acceso",
+    "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive",
+    "Personal" : "Persoal",
+    "System" : "Sistema",
+    "Saved" : "Gardado",
+    "<b>Note:</b> " : "<b>Nota:</b> ",
+    " and " : "e",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
+    "You don't have any external storages" : "Non ten ningún almacenamento externo",
+    "Name" : "Nome",
+    "Storage type" : "Tipo de almacenamento",
+    "Scope" : "Ámbito",
+    "External Storage" : "Almacenamento externo",
+    "Folder name" : "Nome do cartafol",
+    "Configuration" : "Configuración",
+    "Available for" : "Dispoñíbel para",
+    "Add storage" : "Engadir almacenamento",
+    "Delete" : "Eliminar",
+    "Enable User External Storage" : "Activar o almacenamento externo do usuario",
+    "Allow users to mount the following external storage" : "Permitirlle aos usuarios montar o seguinte almacenamento externo"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json
new file mode 100644
index 00000000000..e04afd7f5bd
--- /dev/null
+++ b/apps/files_external/l10n/gl.json
@@ -0,0 +1,68 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de petición. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Fallou a obtención de marcas de acceso. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
+    "Please provide a valid Dropbox app key and secret." : "Forneza unha chave correcta e segreda do Dropbox.",
+    "Step 1 failed. Exception: %s" : "Fallou o paso 1. Excepción: %s",
+    "Step 2 failed. Exception: %s" : "Fallou o paso 2. Excepción: %s",
+    "External storage" : "Almacenamento externo",
+    "Local" : "Local",
+    "Location" : "Localización",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Clave",
+    "Secret" : "Secreto",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 e compatíbeis",
+    "Access Key" : "Clave de acceso",
+    "Secret Key" : "Clave secreta",
+    "Port" : "Porto",
+    "Region" : "Autonomía",
+    "Enable SSL" : "Activar SSL",
+    "Enable Path Style" : "Activar o estilo de ruta",
+    "App key" : "Clave da API",
+    "App secret" : "Secreto da aplicación",
+    "Host" : "Servidor",
+    "Username" : "Nome de usuario",
+    "Password" : "Contrasinal",
+    "Root" : "Root (raíz)",
+    "Secure ftps://" : "ftps:// seguro",
+    "Client ID" : "ID do cliente",
+    "Client secret" : "Secreto do cliente",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Rexión (opcional para OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Clave da API (obrigatoria para Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
+    "Share" : "Compartir",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
+    "Username as share" : "Nome de usuario como compartición",
+    "URL" : "URL",
+    "Secure https://" : "https:// seguro",
+    "Remote subfolder" : "Subcartafol remoto",
+    "Access granted" : "Concedeuse acceso",
+    "Error configuring Dropbox storage" : "Produciuse un erro ao configurar o almacenamento en Dropbox",
+    "Grant access" : "Permitir o acceso",
+    "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive",
+    "Personal" : "Persoal",
+    "System" : "Sistema",
+    "Saved" : "Gardado",
+    "<b>Note:</b> " : "<b>Nota:</b> ",
+    " and " : "e",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
+    "You don't have any external storages" : "Non ten ningún almacenamento externo",
+    "Name" : "Nome",
+    "Storage type" : "Tipo de almacenamento",
+    "Scope" : "Ámbito",
+    "External Storage" : "Almacenamento externo",
+    "Folder name" : "Nome do cartafol",
+    "Configuration" : "Configuración",
+    "Available for" : "Dispoñíbel para",
+    "Add storage" : "Engadir almacenamento",
+    "Delete" : "Eliminar",
+    "Enable User External Storage" : "Activar o almacenamento externo do usuario",
+    "Allow users to mount the following external storage" : "Permitirlle aos usuarios montar o seguinte almacenamento externo"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/gl.php b/apps/files_external/l10n/gl.php
deleted file mode 100644
index b5b6521796f..00000000000
--- a/apps/files_external/l10n/gl.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Fallou a obtención de marcas de petición. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Fallou a obtención de marcas de acceso. Comprobe que a chave e o código secreto da súa aplicación Dropbox son correctas.",
-"Please provide a valid Dropbox app key and secret." => "Forneza unha chave correcta e segreda do Dropbox.",
-"Step 1 failed. Exception: %s" => "Fallou o paso 1. Excepción: %s",
-"Step 2 failed. Exception: %s" => "Fallou o paso 2. Excepción: %s",
-"External storage" => "Almacenamento externo",
-"Local" => "Local",
-"Location" => "Localización",
-"Amazon S3" => "Amazon S3",
-"Key" => "Clave",
-"Secret" => "Secreto",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 e compatíbeis",
-"Access Key" => "Clave de acceso",
-"Secret Key" => "Clave secreta",
-"Port" => "Porto",
-"Region" => "Autonomía",
-"Enable SSL" => "Activar SSL",
-"Enable Path Style" => "Activar o estilo de ruta",
-"App key" => "Clave da API",
-"App secret" => "Secreto da aplicación",
-"Host" => "Servidor",
-"Username" => "Nome de usuario",
-"Password" => "Contrasinal",
-"Root" => "Root (raíz)",
-"Secure ftps://" => "ftps:// seguro",
-"Client ID" => "ID do cliente",
-"Client secret" => "Secreto do cliente",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Rexión (opcional para OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "Clave da API (obrigatoria para Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Nome do inquilino (obrigatorio para OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Contrasinal (obrigatorio para OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Nome do servizo (obrigatorio para OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
-"Share" => "Compartir",
-"SMB / CIFS using OC login" => "SMB / CIFS usando acceso OC",
-"Username as share" => "Nome de usuario como compartición",
-"URL" => "URL",
-"Secure https://" => "https:// seguro",
-"Remote subfolder" => "Subcartafol remoto",
-"Access granted" => "Concedeuse acceso",
-"Error configuring Dropbox storage" => "Produciuse un erro ao configurar o almacenamento en Dropbox",
-"Grant access" => "Permitir o acceso",
-"Error configuring Google Drive storage" => "Produciuse un erro ao configurar o almacenamento en Google Drive",
-"Personal" => "Persoal",
-"System" => "Sistema",
-"Saved" => "Gardado",
-"<b>Note:</b> " => "<b>Nota:</b> ",
-" and " => "e",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> A compatibilidade de cURL en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> A compatibilidade de FTP en PHP non está activada, ou non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> «%s»  non está instalado. Non é posíbel a montaxe de %s. Consulte co administrador do sistema como instalalo.",
-"You don't have any external storages" => "Non ten ningún almacenamento externo",
-"Name" => "Nome",
-"Storage type" => "Tipo de almacenamento",
-"Scope" => "Ámbito",
-"External Storage" => "Almacenamento externo",
-"Folder name" => "Nome do cartafol",
-"Configuration" => "Configuración",
-"Available for" => "Dispoñíbel para",
-"Add storage" => "Engadir almacenamento",
-"Delete" => "Eliminar",
-"Enable User External Storage" => "Activar o almacenamento externo do usuario",
-"Allow users to mount the following external storage" => "Permitirlle aos usuarios montar o seguinte almacenamento externo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/he.js b/apps/files_external/l10n/he.js
new file mode 100644
index 00000000000..d9e903ff3ed
--- /dev/null
+++ b/apps/files_external/l10n/he.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "נא לספק קוד יישום וסוד תקניים של Dropbox.",
+    "Local" : "מקומי",
+    "Location" : "מיקום",
+    "Port" : "פורט",
+    "Region" : "אזור",
+    "Host" : "מארח",
+    "Username" : "שם משתמש",
+    "Password" : "סיסמא",
+    "Share" : "שיתוף",
+    "URL" : "כתובת",
+    "Access granted" : "הוענקה גישה",
+    "Error configuring Dropbox storage" : "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
+    "Grant access" : "הענקת גישה",
+    "Error configuring Google Drive storage" : "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive",
+    "Personal" : "אישי",
+    "Saved" : "נשמר",
+    "Name" : "שם",
+    "External Storage" : "אחסון חיצוני",
+    "Folder name" : "שם התיקייה",
+    "Configuration" : "הגדרות",
+    "Delete" : "מחיקה",
+    "Enable User External Storage" : "הפעלת אחסון חיצוני למשתמשים"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/he.json b/apps/files_external/l10n/he.json
new file mode 100644
index 00000000000..fb812938345
--- /dev/null
+++ b/apps/files_external/l10n/he.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "נא לספק קוד יישום וסוד תקניים של Dropbox.",
+    "Local" : "מקומי",
+    "Location" : "מיקום",
+    "Port" : "פורט",
+    "Region" : "אזור",
+    "Host" : "מארח",
+    "Username" : "שם משתמש",
+    "Password" : "סיסמא",
+    "Share" : "שיתוף",
+    "URL" : "כתובת",
+    "Access granted" : "הוענקה גישה",
+    "Error configuring Dropbox storage" : "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
+    "Grant access" : "הענקת גישה",
+    "Error configuring Google Drive storage" : "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive",
+    "Personal" : "אישי",
+    "Saved" : "נשמר",
+    "Name" : "שם",
+    "External Storage" : "אחסון חיצוני",
+    "Folder name" : "שם התיקייה",
+    "Configuration" : "הגדרות",
+    "Delete" : "מחיקה",
+    "Enable User External Storage" : "הפעלת אחסון חיצוני למשתמשים"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
deleted file mode 100644
index 72365bffd73..00000000000
--- a/apps/files_external/l10n/he.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "נא לספק קוד יישום וסוד תקניים של Dropbox.",
-"Local" => "מקומי",
-"Location" => "מיקום",
-"Port" => "פורט",
-"Region" => "אזור",
-"Host" => "מארח",
-"Username" => "שם משתמש",
-"Password" => "סיסמא",
-"Share" => "שיתוף",
-"URL" => "כתובת",
-"Access granted" => "הוענקה גישה",
-"Error configuring Dropbox storage" => "אירעה שגיאה בעת הגדרת אחסון ב־Dropbox",
-"Grant access" => "הענקת גישה",
-"Error configuring Google Drive storage" => "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive",
-"Personal" => "אישי",
-"Saved" => "נשמר",
-"Name" => "שם",
-"External Storage" => "אחסון חיצוני",
-"Folder name" => "שם התיקייה",
-"Configuration" => "הגדרות",
-"Delete" => "מחיקה",
-"Enable User External Storage" => "הפעלת אחסון חיצוני למשתמשים"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hi.js b/apps/files_external/l10n/hi.js
new file mode 100644
index 00000000000..97fcc0d1350
--- /dev/null
+++ b/apps/files_external/l10n/hi.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Username" : "प्रयोक्ता का नाम",
+    "Password" : "पासवर्ड",
+    "Share" : "साझा करें",
+    "Personal" : "यक्तिगत"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hi.json b/apps/files_external/l10n/hi.json
new file mode 100644
index 00000000000..cee1bf9c5cc
--- /dev/null
+++ b/apps/files_external/l10n/hi.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Username" : "प्रयोक्ता का नाम",
+    "Password" : "पासवर्ड",
+    "Share" : "साझा करें",
+    "Personal" : "यक्तिगत"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/hi.php b/apps/files_external/l10n/hi.php
deleted file mode 100644
index ca41287841e..00000000000
--- a/apps/files_external/l10n/hi.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Username" => "प्रयोक्ता का नाम",
-"Password" => "पासवर्ड",
-"Share" => "साझा करें",
-"Personal" => "यक्तिगत"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hr.js b/apps/files_external/l10n/hr.js
new file mode 100644
index 00000000000..c166841d9c6
--- /dev/null
+++ b/apps/files_external/l10n/hr.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje tokena zahtjeva nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje pristupnog tokena nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
+    "Please provide a valid Dropbox app key and secret." : "Molimo navedite ispravan ključ za aplikacije iz zajedničke mrežne mape i tajni kluč.",
+    "Step 1 failed. Exception: %s" : "Korak 1 nije uspio. Izuzetak: %s",
+    "Step 2 failed. Exception: %s" : "Korak 2 nije uspio. Izuzetak: %s",
+    "External storage" : "Vanjsko spremište za pohranu",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Ključ",
+    "Secret" : "Tajna",
+    "Bucket" : "Kantica",
+    "Amazon S3 and compliant" : "Amazon S3 i kompatibilno",
+    "Access Key" : "Pristupni ključ",
+    "Secret Key" : "Ključ za tajnu",
+    "Hostname" : "Naziv poslužitelja",
+    "Port" : "Port",
+    "Region" : "Regija",
+    "Enable SSL" : "Omogućite SSL",
+    "Enable Path Style" : "Omogućite Path Style",
+    "App key" : "Ključ za aplikacije",
+    "App secret" : "Tajna aplikacije",
+    "Host" : "Glavno računalo",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
+    "Root" : "Korijen",
+    "Secure ftps://" : "Sigurni ftps://",
+    "Client ID" : "ID klijenta",
+    "Client secret" : "Klijentski tajni ključ",
+    "OpenStack Object Storage" : "Prostor za pohranu.....",
+    "Region (optional for OpenStack Object Storage)" : "Regija (neobavezno za OpenStack object storage",
+    "API Key (required for Rackspace Cloud Files)" : "API ključ (obavezno za Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Naziv korisnika (obavezno za OpenStack Object storage)",
+    "Password (required for OpenStack Object Storage)" : "Lozinka (obavezno za OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Naziv usluge (Obavezno za OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje točke identiteta (obavezno za OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Vrijeme isteka HTTP zahtjeva u sekundama",
+    "Share" : "Dijeljenje zhajedničkih resursa",
+    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
+    "Username as share" : "Korisničko ime kao dijeljeni resurs",
+    "URL" : "URL",
+    "Secure https://" : "Siguran https://",
+    "Remote subfolder" : "Udaljena podmapa",
+    "Access granted" : "Pristup odobren",
+    "Error configuring Dropbox storage" : "Pogreška pri konfiguriranju spremišta u zajedničkoj mrežnoj mapi",
+    "Grant access" : "Dodijeli pristup",
+    "Error configuring Google Drive storage" : "Pogreška pri konfiguriranju spremišta u Google Drive-u",
+    "Personal" : "Osobno",
+    "System" : "Sustav",
+    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
+    "(group)" : "(grupa)",
+    "Saved" : "Spremljeno",
+    "<b>Note:</b> " : "<b>Bilješka:</b>",
+    " and " : " i ",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>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.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" nije instaliran. Postavljanje %s nije moguće. Molimo zamolitesvog administratora sustava da ga instalira.",
+    "You don't have any external storages" : "Vi nemate nikakvo vanjsko spremište",
+    "Name" : "Naziv",
+    "Storage type" : "Vrsta spremišta",
+    "Scope" : "Opseg",
+    "External Storage" : "Vanjsko spremište",
+    "Folder name" : "Naziv mape",
+    "Configuration" : "Konfiguracija",
+    "Available for" : "Dostupno za",
+    "Add storage" : "Dodajte spremište",
+    "Delete" : "Izbrišite",
+    "Enable User External Storage" : "Omogućite korisničko vanjsko spremište",
+    "Allow users to mount the following external storage" : "Dopustite korisnicima postavljanje sljedećeg vanjskog spremišta"
+},
+"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/hr.json b/apps/files_external/l10n/hr.json
new file mode 100644
index 00000000000..069af3fa6c8
--- /dev/null
+++ b/apps/files_external/l10n/hr.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje tokena zahtjeva nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Dohvaćanje pristupnog tokena nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
+    "Please provide a valid Dropbox app key and secret." : "Molimo navedite ispravan ključ za aplikacije iz zajedničke mrežne mape i tajni kluč.",
+    "Step 1 failed. Exception: %s" : "Korak 1 nije uspio. Izuzetak: %s",
+    "Step 2 failed. Exception: %s" : "Korak 2 nije uspio. Izuzetak: %s",
+    "External storage" : "Vanjsko spremište za pohranu",
+    "Local" : "Lokalno",
+    "Location" : "Lokacija",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Ključ",
+    "Secret" : "Tajna",
+    "Bucket" : "Kantica",
+    "Amazon S3 and compliant" : "Amazon S3 i kompatibilno",
+    "Access Key" : "Pristupni ključ",
+    "Secret Key" : "Ključ za tajnu",
+    "Hostname" : "Naziv poslužitelja",
+    "Port" : "Port",
+    "Region" : "Regija",
+    "Enable SSL" : "Omogućite SSL",
+    "Enable Path Style" : "Omogućite Path Style",
+    "App key" : "Ključ za aplikacije",
+    "App secret" : "Tajna aplikacije",
+    "Host" : "Glavno računalo",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
+    "Root" : "Korijen",
+    "Secure ftps://" : "Sigurni ftps://",
+    "Client ID" : "ID klijenta",
+    "Client secret" : "Klijentski tajni ključ",
+    "OpenStack Object Storage" : "Prostor za pohranu.....",
+    "Region (optional for OpenStack Object Storage)" : "Regija (neobavezno za OpenStack object storage",
+    "API Key (required for Rackspace Cloud Files)" : "API ključ (obavezno za Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Naziv korisnika (obavezno za OpenStack Object storage)",
+    "Password (required for OpenStack Object Storage)" : "Lozinka (obavezno za OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Naziv usluge (Obavezno za OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL krajnje točke identiteta (obavezno za OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Vrijeme isteka HTTP zahtjeva u sekundama",
+    "Share" : "Dijeljenje zhajedničkih resursa",
+    "SMB / CIFS using OC login" : "SMB / CIFS uz prijavu putem programa OC",
+    "Username as share" : "Korisničko ime kao dijeljeni resurs",
+    "URL" : "URL",
+    "Secure https://" : "Siguran https://",
+    "Remote subfolder" : "Udaljena podmapa",
+    "Access granted" : "Pristup odobren",
+    "Error configuring Dropbox storage" : "Pogreška pri konfiguriranju spremišta u zajedničkoj mrežnoj mapi",
+    "Grant access" : "Dodijeli pristup",
+    "Error configuring Google Drive storage" : "Pogreška pri konfiguriranju spremišta u Google Drive-u",
+    "Personal" : "Osobno",
+    "System" : "Sustav",
+    "All users. Type to select user or group." : "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
+    "(group)" : "(grupa)",
+    "Saved" : "Spremljeno",
+    "<b>Note:</b> " : "<b>Bilješka:</b>",
+    " and " : " i ",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>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.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Note:</b> \"%s\" nije instaliran. Postavljanje %s nije moguće. Molimo zamolitesvog administratora sustava da ga instalira.",
+    "You don't have any external storages" : "Vi nemate nikakvo vanjsko spremište",
+    "Name" : "Naziv",
+    "Storage type" : "Vrsta spremišta",
+    "Scope" : "Opseg",
+    "External Storage" : "Vanjsko spremište",
+    "Folder name" : "Naziv mape",
+    "Configuration" : "Konfiguracija",
+    "Available for" : "Dostupno za",
+    "Add storage" : "Dodajte spremište",
+    "Delete" : "Izbrišite",
+    "Enable User External Storage" : "Omogućite korisničko vanjsko spremište",
+    "Allow users to mount the following external storage" : "Dopustite korisnicima postavljanje sljedećeg vanjskog spremišta"
+},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/hr.php b/apps/files_external/l10n/hr.php
deleted file mode 100644
index 3e2f38675e0..00000000000
--- a/apps/files_external/l10n/hr.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Dohvaćanje tokena zahtjeva nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Dohvaćanje pristupnog tokena nije uspjelo. Provjerite jesu li vaš ključ za aplikacije iz zajedničke mrežne mapei tajna aplikacije ispravni",
-"Please provide a valid Dropbox app key and secret." => "Molimo navedite ispravan ključ za aplikacije iz zajedničke mrežne mape i tajni kluč.",
-"Step 1 failed. Exception: %s" => "Korak 1 nije uspio. Izuzetak: %s",
-"Step 2 failed. Exception: %s" => "Korak 2 nije uspio. Izuzetak: %s",
-"External storage" => "Vanjsko spremište za pohranu",
-"Local" => "Lokalno",
-"Location" => "Lokacija",
-"Amazon S3" => "Amazon S3",
-"Key" => "Ključ",
-"Secret" => "Tajna",
-"Bucket" => "Kantica",
-"Amazon S3 and compliant" => "Amazon S3 i kompatibilno",
-"Access Key" => "Pristupni ključ",
-"Secret Key" => "Ključ za tajnu",
-"Hostname" => "Naziv poslužitelja",
-"Port" => "Port",
-"Region" => "Regija",
-"Enable SSL" => "Omogućite SSL",
-"Enable Path Style" => "Omogućite Path Style",
-"App key" => "Ključ za aplikacije",
-"App secret" => "Tajna aplikacije",
-"Host" => "Glavno računalo",
-"Username" => "Korisničko ime",
-"Password" => "Lozinka",
-"Root" => "Korijen",
-"Secure ftps://" => "Sigurni ftps://",
-"Client ID" => "ID klijenta",
-"Client secret" => "Klijentski tajni ključ",
-"OpenStack Object Storage" => "Prostor za pohranu.....",
-"Region (optional for OpenStack Object Storage)" => "Regija (neobavezno za OpenStack object storage",
-"API Key (required for Rackspace Cloud Files)" => "API ključ (obavezno za Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Naziv korisnika (obavezno za OpenStack Object storage)",
-"Password (required for OpenStack Object Storage)" => "Lozinka (obavezno za OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Naziv usluge (Obavezno za OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL krajnje točke identiteta (obavezno za OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Vrijeme isteka HTTP zahtjeva u sekundama",
-"Share" => "Dijeljenje zhajedničkih resursa",
-"SMB / CIFS using OC login" => "SMB / CIFS uz prijavu putem programa OC",
-"Username as share" => "Korisničko ime kao dijeljeni resurs",
-"URL" => "URL",
-"Secure https://" => "Siguran https://",
-"Remote subfolder" => "Udaljena podmapa",
-"Access granted" => "Pristup odobren",
-"Error configuring Dropbox storage" => "Pogreška pri konfiguriranju spremišta u zajedničkoj mrežnoj mapi",
-"Grant access" => "Dodijeli pristup",
-"Error configuring Google Drive storage" => "Pogreška pri konfiguriranju spremišta u Google Drive-u",
-"Personal" => "Osobno",
-"System" => "Sustav",
-"All users. Type to select user or group." => "Svi korisnici. Započnite unos za izbor korisnika ili grupe.",
-"(group)" => "(grupa)",
-"Saved" => "Spremljeno",
-"<b>Note:</b> " => "<b>Bilješka:</b>",
-" and " => " i ",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>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.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Note:</b> \"%s\" nije instaliran. Postavljanje %s nije moguće. Molimo zamolitesvog administratora sustava da ga instalira.",
-"You don't have any external storages" => "Vi nemate nikakvo vanjsko spremište",
-"Name" => "Naziv",
-"Storage type" => "Vrsta spremišta",
-"Scope" => "Opseg",
-"External Storage" => "Vanjsko spremište",
-"Folder name" => "Naziv mape",
-"Configuration" => "Konfiguracija",
-"Available for" => "Dostupno za",
-"Add storage" => "Dodajte spremište",
-"Delete" => "Izbrišite",
-"Enable User External Storage" => "Omogućite korisničko vanjsko spremište",
-"Allow users to mount the following external storage" => "Dopustite korisnicima postavljanje sljedećeg vanjskog spremišta"
-);
-$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/apps/files_external/l10n/hu_HU.js b/apps/files_external/l10n/hu_HU.js
new file mode 100644
index 00000000000..bf2e0badb20
--- /dev/null
+++ b/apps/files_external/l10n/hu_HU.js
@@ -0,0 +1,29 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Adjon meg egy érvényes Dropbox app key-t és secretet!",
+    "External storage" : "Külső tárolók",
+    "Local" : "Helyi",
+    "Location" : "Hely",
+    "Port" : "Port",
+    "Region" : "Megye",
+    "Host" : "Kiszolgáló",
+    "Username" : "Felhasználónév",
+    "Password" : "Jelszó",
+    "Share" : "Megosztás",
+    "URL" : "URL",
+    "Access granted" : "Érvényes hozzáférés",
+    "Error configuring Dropbox storage" : "A Dropbox tárolót nem sikerült beállítani",
+    "Grant access" : "Megadom a hozzáférést",
+    "Error configuring Google Drive storage" : "A Google Drive tárolót nem sikerült beállítani",
+    "Personal" : "Személyes",
+    "Saved" : "Elmentve",
+    "Name" : "Név",
+    "External Storage" : "Külső tárolási szolgáltatások becsatolása",
+    "Folder name" : "Mappanév",
+    "Configuration" : "Beállítások",
+    "Add storage" : "Tároló becsatolása",
+    "Delete" : "Törlés",
+    "Enable User External Storage" : "Külső tárolók engedélyezése a felhasználók részére"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hu_HU.json b/apps/files_external/l10n/hu_HU.json
new file mode 100644
index 00000000000..430188e2144
--- /dev/null
+++ b/apps/files_external/l10n/hu_HU.json
@@ -0,0 +1,27 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Adjon meg egy érvényes Dropbox app key-t és secretet!",
+    "External storage" : "Külső tárolók",
+    "Local" : "Helyi",
+    "Location" : "Hely",
+    "Port" : "Port",
+    "Region" : "Megye",
+    "Host" : "Kiszolgáló",
+    "Username" : "Felhasználónév",
+    "Password" : "Jelszó",
+    "Share" : "Megosztás",
+    "URL" : "URL",
+    "Access granted" : "Érvényes hozzáférés",
+    "Error configuring Dropbox storage" : "A Dropbox tárolót nem sikerült beállítani",
+    "Grant access" : "Megadom a hozzáférést",
+    "Error configuring Google Drive storage" : "A Google Drive tárolót nem sikerült beállítani",
+    "Personal" : "Személyes",
+    "Saved" : "Elmentve",
+    "Name" : "Név",
+    "External Storage" : "Külső tárolási szolgáltatások becsatolása",
+    "Folder name" : "Mappanév",
+    "Configuration" : "Beállítások",
+    "Add storage" : "Tároló becsatolása",
+    "Delete" : "Törlés",
+    "Enable User External Storage" : "Külső tárolók engedélyezése a felhasználók részére"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
deleted file mode 100644
index 4e462b94df9..00000000000
--- a/apps/files_external/l10n/hu_HU.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Adjon meg egy érvényes Dropbox app key-t és secretet!",
-"External storage" => "Külső tárolók",
-"Local" => "Helyi",
-"Location" => "Hely",
-"Port" => "Port",
-"Region" => "Megye",
-"Host" => "Kiszolgáló",
-"Username" => "Felhasználónév",
-"Password" => "Jelszó",
-"Share" => "Megosztás",
-"URL" => "URL",
-"Access granted" => "Érvényes hozzáférés",
-"Error configuring Dropbox storage" => "A Dropbox tárolót nem sikerült beállítani",
-"Grant access" => "Megadom a hozzáférést",
-"Error configuring Google Drive storage" => "A Google Drive tárolót nem sikerült beállítani",
-"Personal" => "Személyes",
-"Saved" => "Elmentve",
-"Name" => "Név",
-"External Storage" => "Külső tárolási szolgáltatások becsatolása",
-"Folder name" => "Mappanév",
-"Configuration" => "Beállítások",
-"Add storage" => "Tároló becsatolása",
-"Delete" => "Törlés",
-"Enable User External Storage" => "Külső tárolók engedélyezése a felhasználók részére"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/hy.js b/apps/files_external/l10n/hy.js
new file mode 100644
index 00000000000..00c24e3f92a
--- /dev/null
+++ b/apps/files_external/l10n/hy.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Delete" : "Ջնջել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/hy.json b/apps/files_external/l10n/hy.json
new file mode 100644
index 00000000000..081a2c5f49e
--- /dev/null
+++ b/apps/files_external/l10n/hy.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Delete" : "Ջնջել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/hy.php b/apps/files_external/l10n/hy.php
deleted file mode 100644
index f933bec8feb..00000000000
--- a/apps/files_external/l10n/hy.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Ջնջել"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ia.js b/apps/files_external/l10n/ia.js
new file mode 100644
index 00000000000..f6dfe61009c
--- /dev/null
+++ b/apps/files_external/l10n/ia.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Loco",
+    "Region" : "Region",
+    "Username" : "Nomine de usator",
+    "Password" : "Contrasigno",
+    "Share" : "Compartir",
+    "URL" : "URL",
+    "Personal" : "Personal",
+    "Saved" : "Salveguardate",
+    "Name" : "Nomine",
+    "Folder name" : "Nomine de dossier",
+    "Delete" : "Deler"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/ia.json b/apps/files_external/l10n/ia.json
new file mode 100644
index 00000000000..64eefa5dff3
--- /dev/null
+++ b/apps/files_external/l10n/ia.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Location" : "Loco",
+    "Region" : "Region",
+    "Username" : "Nomine de usator",
+    "Password" : "Contrasigno",
+    "Share" : "Compartir",
+    "URL" : "URL",
+    "Personal" : "Personal",
+    "Saved" : "Salveguardate",
+    "Name" : "Nomine",
+    "Folder name" : "Nomine de dossier",
+    "Delete" : "Deler"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ia.php b/apps/files_external/l10n/ia.php
deleted file mode 100644
index a3ebcf5183b..00000000000
--- a/apps/files_external/l10n/ia.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Loco",
-"Region" => "Region",
-"Username" => "Nomine de usator",
-"Password" => "Contrasigno",
-"Share" => "Compartir",
-"URL" => "URL",
-"Personal" => "Personal",
-"Saved" => "Salveguardate",
-"Name" => "Nomine",
-"Folder name" => "Nomine de dossier",
-"Delete" => "Deler"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
new file mode 100644
index 00000000000..4673da66543
--- /dev/null
+++ b/apps/files_external/l10n/id.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
+    "External storage" : "Penyimpanan eksternal",
+    "Local" : "Lokal",
+    "Location" : "lokasi",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "port",
+    "Region" : "daerah",
+    "Enable SSL" : "Aktifkan SSL",
+    "Host" : "Host",
+    "Username" : "Nama Pengguna",
+    "Password" : "Sandi",
+    "Root" : "Root",
+    "Share" : "Bagikan",
+    "URL" : "tautan",
+    "Access granted" : "Akses diberikan",
+    "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
+    "Grant access" : "Berikan hak akses",
+    "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
+    "Personal" : "Pribadi",
+    "Saved" : "Disimpan",
+    "<b>Note:</b> " : "<b>Catatan:</b> ",
+    " and " : "dan",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke 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 tanyakan ke administrator sistem Anda untuk menginstalnya.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
+    "Name" : "Nama",
+    "External Storage" : "Penyimpanan Eksternal",
+    "Folder name" : "Nama folder",
+    "Configuration" : "Konfigurasi",
+    "Available for" : "Tersedia untuk",
+    "Add storage" : "Tambahkan penyimpanan",
+    "Delete" : "Hapus",
+    "Enable User External Storage" : "Aktifkan Penyimpanan Eksternal Pengguna",
+    "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
new file mode 100644
index 00000000000..067f79b2a20
--- /dev/null
+++ b/apps/files_external/l10n/id.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
+    "External storage" : "Penyimpanan eksternal",
+    "Local" : "Lokal",
+    "Location" : "lokasi",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "port",
+    "Region" : "daerah",
+    "Enable SSL" : "Aktifkan SSL",
+    "Host" : "Host",
+    "Username" : "Nama Pengguna",
+    "Password" : "Sandi",
+    "Root" : "Root",
+    "Share" : "Bagikan",
+    "URL" : "tautan",
+    "Access granted" : "Akses diberikan",
+    "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
+    "Grant access" : "Berikan hak akses",
+    "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
+    "Personal" : "Pribadi",
+    "Saved" : "Disimpan",
+    "<b>Note:</b> " : "<b>Catatan:</b> ",
+    " and " : "dan",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke 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 tanyakan ke administrator sistem Anda untuk menginstalnya.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
+    "Name" : "Nama",
+    "External Storage" : "Penyimpanan Eksternal",
+    "Folder name" : "Nama folder",
+    "Configuration" : "Konfigurasi",
+    "Available for" : "Tersedia untuk",
+    "Add storage" : "Tambahkan penyimpanan",
+    "Delete" : "Hapus",
+    "Enable User External Storage" : "Aktifkan Penyimpanan Eksternal Pengguna",
+    "Allow users to mount the following external storage" : "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/id.php b/apps/files_external/l10n/id.php
deleted file mode 100644
index 51c9236caf0..00000000000
--- a/apps/files_external/l10n/id.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
-"External storage" => "Penyimpanan eksternal",
-"Local" => "Lokal",
-"Location" => "lokasi",
-"Amazon S3" => "Amazon S3",
-"Port" => "port",
-"Region" => "daerah",
-"Enable SSL" => "Aktifkan SSL",
-"Host" => "Host",
-"Username" => "Nama Pengguna",
-"Password" => "Sandi",
-"Root" => "Root",
-"Share" => "Bagikan",
-"URL" => "tautan",
-"Access granted" => "Akses diberikan",
-"Error configuring Dropbox storage" => "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
-"Grant access" => "Berikan hak akses",
-"Error configuring Google Drive storage" => "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
-"Personal" => "Pribadi",
-"Saved" => "Disimpan",
-"<b>Note:</b> " => "<b>Catatan:</b> ",
-" and " => "dan",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke 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 tanyakan ke administrator sistem Anda untuk menginstalnya.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
-"Name" => "Nama",
-"External Storage" => "Penyimpanan Eksternal",
-"Folder name" => "Nama folder",
-"Configuration" => "Konfigurasi",
-"Available for" => "Tersedia untuk",
-"Add storage" => "Tambahkan penyimpanan",
-"Delete" => "Hapus",
-"Enable User External Storage" => "Aktifkan Penyimpanan Eksternal Pengguna",
-"Allow users to mount the following external storage" => "Izinkan pengguna untuk mengaitkan penyimpanan eksternal berikut"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/is.js b/apps/files_external/l10n/is.js
new file mode 100644
index 00000000000..0ef3945c353
--- /dev/null
+++ b/apps/files_external/l10n/is.js
@@ -0,0 +1,23 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Gefðu upp virkan Dropbox lykil og leynikóða",
+    "Location" : "Staðsetning",
+    "Host" : "Netþjónn",
+    "Username" : "Notendanafn",
+    "Password" : "Lykilorð",
+    "Share" : "Deila",
+    "URL" : "URL",
+    "Access granted" : "Aðgengi veitt",
+    "Error configuring Dropbox storage" : "Villa við að setja upp Dropbox gagnasvæði",
+    "Grant access" : "Veita aðgengi",
+    "Error configuring Google Drive storage" : "Villa kom upp við að setja upp Google Drive gagnasvæði",
+    "Personal" : "Um mig",
+    "Name" : "Nafn",
+    "External Storage" : "Ytri gagnageymsla",
+    "Folder name" : "Nafn möppu",
+    "Configuration" : "Uppsetning",
+    "Delete" : "Eyða",
+    "Enable User External Storage" : "Virkja ytra gagnasvæði notenda"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/is.json b/apps/files_external/l10n/is.json
new file mode 100644
index 00000000000..c5d55bea9ce
--- /dev/null
+++ b/apps/files_external/l10n/is.json
@@ -0,0 +1,21 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Gefðu upp virkan Dropbox lykil og leynikóða",
+    "Location" : "Staðsetning",
+    "Host" : "Netþjónn",
+    "Username" : "Notendanafn",
+    "Password" : "Lykilorð",
+    "Share" : "Deila",
+    "URL" : "URL",
+    "Access granted" : "Aðgengi veitt",
+    "Error configuring Dropbox storage" : "Villa við að setja upp Dropbox gagnasvæði",
+    "Grant access" : "Veita aðgengi",
+    "Error configuring Google Drive storage" : "Villa kom upp við að setja upp Google Drive gagnasvæði",
+    "Personal" : "Um mig",
+    "Name" : "Nafn",
+    "External Storage" : "Ytri gagnageymsla",
+    "Folder name" : "Nafn möppu",
+    "Configuration" : "Uppsetning",
+    "Delete" : "Eyða",
+    "Enable User External Storage" : "Virkja ytra gagnasvæði notenda"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/is.php b/apps/files_external/l10n/is.php
deleted file mode 100644
index 98cee7d8fb3..00000000000
--- a/apps/files_external/l10n/is.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Gefðu upp virkan Dropbox lykil og leynikóða",
-"Location" => "Staðsetning",
-"Host" => "Netþjónn",
-"Username" => "Notendanafn",
-"Password" => "Lykilorð",
-"Share" => "Deila",
-"URL" => "URL",
-"Access granted" => "Aðgengi veitt",
-"Error configuring Dropbox storage" => "Villa við að setja upp Dropbox gagnasvæði",
-"Grant access" => "Veita aðgengi",
-"Error configuring Google Drive storage" => "Villa kom upp við að setja upp Google Drive gagnasvæði",
-"Personal" => "Um mig",
-"Name" => "Nafn",
-"External Storage" => "Ytri gagnageymsla",
-"Folder name" => "Nafn möppu",
-"Configuration" => "Uppsetning",
-"Delete" => "Eyða",
-"Enable User External Storage" => "Virkja ytra gagnasvæði notenda"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/it.js b/apps/files_external/l10n/it.js
new file mode 100644
index 00000000000..5834ff25f0b
--- /dev/null
+++ b/apps/files_external/l10n/it.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
+    "Please provide a valid Dropbox app key and secret." : "Fornisci chiave di applicazione e segreto di Dropbox validi.",
+    "Step 1 failed. Exception: %s" : "Fase 1 non riuscita. Eccezione: %s",
+    "Step 2 failed. Exception: %s" : "Fase 2 non riuscita. Eccezione: %s",
+    "External storage" : "Archiviazione esterna",
+    "Local" : "Locale",
+    "Location" : "Posizione",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Chiave",
+    "Secret" : "Segreto",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 e conformi",
+    "Access Key" : "Chiave di accesso",
+    "Secret Key" : "Chiave segreta",
+    "Hostname" : "Nome host",
+    "Port" : "Porta",
+    "Region" : "Regione",
+    "Enable SSL" : "Abilita SSL",
+    "Enable Path Style" : "Abilita stile percorsi",
+    "App key" : "Chiave applicazione",
+    "App secret" : "Segreto applicazione",
+    "Host" : "Host",
+    "Username" : "Nome utente",
+    "Password" : "Password",
+    "Root" : "Radice",
+    "Secure ftps://" : "Sicuro ftps://",
+    "Client ID" : "ID client",
+    "Client secret" : "Segreto del client",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regione (facoltativa per OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Chiave API (richiesta per Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome tenant (richiesto per OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Password (richiesta per OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome servizio (richiesta per OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del servizio di identità (richiesto per OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tempo massimo in secondi delle richieste HTTP",
+    "Share" : "Condividi",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
+    "Username as share" : "Nome utente come condivisione",
+    "URL" : "URL",
+    "Secure https://" : "Sicuro https://",
+    "Remote subfolder" : "Sottocartella remota",
+    "Access granted" : "Accesso consentito",
+    "Error configuring Dropbox storage" : "Errore durante la configurazione dell'archivio Dropbox",
+    "Grant access" : "Concedi l'accesso",
+    "Error configuring Google Drive storage" : "Errore durante la configurazione dell'archivio Google Drive",
+    "Personal" : "Personale",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.",
+    "(group)" : "(gruppo)",
+    "Saved" : "Salvato",
+    "<b>Note:</b> " : "<b>Nota:</b>",
+    " and " : "e",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
+    "You don't have any external storages" : "Non è disponibile alcuna archiviazione esterna",
+    "Name" : "Nome",
+    "Storage type" : "Tipo di archiviazione",
+    "Scope" : "Ambito",
+    "External Storage" : "Archiviazione esterna",
+    "Folder name" : "Nome della cartella",
+    "Configuration" : "Configurazione",
+    "Available for" : "Disponibile per",
+    "Add storage" : "Aggiungi archiviazione",
+    "Delete" : "Elimina",
+    "Enable User External Storage" : "Abilita la memoria esterna dell'utente",
+    "Allow users to mount the following external storage" : "Consenti agli utenti di montare la seguente memoria esterna"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/it.json b/apps/files_external/l10n/it.json
new file mode 100644
index 00000000000..b780cae57a6
--- /dev/null
+++ b/apps/files_external/l10n/it.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
+    "Please provide a valid Dropbox app key and secret." : "Fornisci chiave di applicazione e segreto di Dropbox validi.",
+    "Step 1 failed. Exception: %s" : "Fase 1 non riuscita. Eccezione: %s",
+    "Step 2 failed. Exception: %s" : "Fase 2 non riuscita. Eccezione: %s",
+    "External storage" : "Archiviazione esterna",
+    "Local" : "Locale",
+    "Location" : "Posizione",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Chiave",
+    "Secret" : "Segreto",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 e conformi",
+    "Access Key" : "Chiave di accesso",
+    "Secret Key" : "Chiave segreta",
+    "Hostname" : "Nome host",
+    "Port" : "Porta",
+    "Region" : "Regione",
+    "Enable SSL" : "Abilita SSL",
+    "Enable Path Style" : "Abilita stile percorsi",
+    "App key" : "Chiave applicazione",
+    "App secret" : "Segreto applicazione",
+    "Host" : "Host",
+    "Username" : "Nome utente",
+    "Password" : "Password",
+    "Root" : "Radice",
+    "Secure ftps://" : "Sicuro ftps://",
+    "Client ID" : "ID client",
+    "Client secret" : "Segreto del client",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regione (facoltativa per OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Chiave API (richiesta per Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome tenant (richiesto per OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Password (richiesta per OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome servizio (richiesta per OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL del servizio di identità (richiesto per OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tempo massimo in secondi delle richieste HTTP",
+    "Share" : "Condividi",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilizzando le credenziali di OC",
+    "Username as share" : "Nome utente come condivisione",
+    "URL" : "URL",
+    "Secure https://" : "Sicuro https://",
+    "Remote subfolder" : "Sottocartella remota",
+    "Access granted" : "Accesso consentito",
+    "Error configuring Dropbox storage" : "Errore durante la configurazione dell'archivio Dropbox",
+    "Grant access" : "Concedi l'accesso",
+    "Error configuring Google Drive storage" : "Errore durante la configurazione dell'archivio Google Drive",
+    "Personal" : "Personale",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Tutti gli utenti. Digita per selezionare utente o gruppo.",
+    "(group)" : "(gruppo)",
+    "Saved" : "Salvato",
+    "<b>Note:</b> " : "<b>Nota:</b>",
+    " and " : "e",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
+    "You don't have any external storages" : "Non è disponibile alcuna archiviazione esterna",
+    "Name" : "Nome",
+    "Storage type" : "Tipo di archiviazione",
+    "Scope" : "Ambito",
+    "External Storage" : "Archiviazione esterna",
+    "Folder name" : "Nome della cartella",
+    "Configuration" : "Configurazione",
+    "Available for" : "Disponibile per",
+    "Add storage" : "Aggiungi archiviazione",
+    "Delete" : "Elimina",
+    "Enable User External Storage" : "Abilita la memoria esterna dell'utente",
+    "Allow users to mount the following external storage" : "Consenti agli utenti di montare la seguente memoria esterna"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
deleted file mode 100644
index 5170def1f86..00000000000
--- a/apps/files_external/l10n/it.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Il recupero dei token di richiesta non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Il recupero dei token di accesso non è riuscito. Verifica che la chiave e il segreto dell'applicazione Dropbox siano corretti.",
-"Please provide a valid Dropbox app key and secret." => "Fornisci chiave di applicazione e segreto di Dropbox validi.",
-"Step 1 failed. Exception: %s" => "Fase 1 non riuscita. Eccezione: %s",
-"Step 2 failed. Exception: %s" => "Fase 2 non riuscita. Eccezione: %s",
-"External storage" => "Archiviazione esterna",
-"Local" => "Locale",
-"Location" => "Posizione",
-"Amazon S3" => "Amazon S3",
-"Key" => "Chiave",
-"Secret" => "Segreto",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 e conformi",
-"Access Key" => "Chiave di accesso",
-"Secret Key" => "Chiave segreta",
-"Hostname" => "Nome host",
-"Port" => "Porta",
-"Region" => "Regione",
-"Enable SSL" => "Abilita SSL",
-"Enable Path Style" => "Abilita stile percorsi",
-"App key" => "Chiave applicazione",
-"App secret" => "Segreto applicazione",
-"Host" => "Host",
-"Username" => "Nome utente",
-"Password" => "Password",
-"Root" => "Radice",
-"Secure ftps://" => "Sicuro ftps://",
-"Client ID" => "ID client",
-"Client secret" => "Segreto del client",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Regione (facoltativa per OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "Chiave API (richiesta per Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Nome tenant (richiesto per OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Password (richiesta per OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Nome servizio (richiesta per OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL del servizio di identità (richiesto per OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Tempo massimo in secondi delle richieste HTTP",
-"Share" => "Condividi",
-"SMB / CIFS using OC login" => "SMB / CIFS utilizzando le credenziali di OC",
-"Username as share" => "Nome utente come condivisione",
-"URL" => "URL",
-"Secure https://" => "Sicuro https://",
-"Remote subfolder" => "Sottocartella remota",
-"Access granted" => "Accesso consentito",
-"Error configuring Dropbox storage" => "Errore durante la configurazione dell'archivio Dropbox",
-"Grant access" => "Concedi l'accesso",
-"Error configuring Google Drive storage" => "Errore durante la configurazione dell'archivio Google Drive",
-"Personal" => "Personale",
-"System" => "Sistema",
-"All users. Type to select user or group." => "Tutti gli utenti. Digita per selezionare utente o gruppo.",
-"(group)" => "(gruppo)",
-"Saved" => "Salvato",
-"<b>Note:</b> " => "<b>Nota:</b>",
-" and " => "e",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> il supporto a cURL di PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> il supporto a FTP in PHP non è abilitato o installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" non è installato. Impossibile montare %s. Chiedi al tuo amministratore di sistema di installarlo.",
-"You don't have any external storages" => "Non è disponibile alcuna archiviazione esterna",
-"Name" => "Nome",
-"Storage type" => "Tipo di archiviazione",
-"Scope" => "Ambito",
-"External Storage" => "Archiviazione esterna",
-"Folder name" => "Nome della cartella",
-"Configuration" => "Configurazione",
-"Available for" => "Disponibile per",
-"Add storage" => "Aggiungi archiviazione",
-"Delete" => "Elimina",
-"Enable User External Storage" => "Abilita la memoria esterna dell'utente",
-"Allow users to mount the following external storage" => "Consenti agli utenti di montare la seguente memoria esterna"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
new file mode 100644
index 00000000000..3edb2c44d8d
--- /dev/null
+++ b/apps/files_external/l10n/ja.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "リクエストトークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "アクセストークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
+    "Please provide a valid Dropbox app key and secret." : "有効なDropboxアプリのキーとパスワードを入力してください。",
+    "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
+    "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
+    "External storage" : "外部ストレージ",
+    "Local" : "ローカル",
+    "Location" : "位置",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "キー",
+    "Secret" : "シークレットキー",
+    "Bucket" : "バケット名",
+    "Amazon S3 and compliant" : "Amazon S3 と互換ストレージ",
+    "Access Key" : "アクセスキー",
+    "Secret Key" : "シークレットキー",
+    "Hostname" : "ホスト名",
+    "Port" : "ポート",
+    "Region" : "都道府県",
+    "Enable SSL" : "SSLを有効",
+    "Enable Path Style" : "パス形式を有効",
+    "App key" : "アプリキー",
+    "App secret" : "アプリシークレット",
+    "Host" : "ホスト",
+    "Username" : "ユーザー名",
+    "Password" : "パスワード",
+    "Root" : "ルート",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "クライアントID",
+    "Client secret" : "クライアント秘密キー",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack Object Storage用のオプション)",
+    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace Cloud Filesに必須)",
+    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack Object Storage用に必要)",
+    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack Object Storage用に必要)",
+    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack Object Storage用に必要)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack Object Storage用に必要)",
+    "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
+    "Share" : "共有",
+    "SMB / CIFS using OC login" : "ownCloudログインで SMB/CIFSを使用",
+    "Username as share" : "共有名",
+    "URL" : "URL",
+    "Secure https://" : "セキュア https://",
+    "Remote subfolder" : "リモートサブフォルダー",
+    "Access granted" : "アクセスは許可されました",
+    "Error configuring Dropbox storage" : "Dropboxストレージの設定エラー",
+    "Grant access" : "アクセスを許可",
+    "Error configuring Google Drive storage" : "Googleドライブストレージの設定エラー",
+    "Personal" : "個人",
+    "System" : "システム",
+    "All users. Type to select user or group." : "全てのユーザー．ユーザー、グループを追加",
+    "(group)" : "(グループ)",
+    "Saved" : "保存されました",
+    "<b>Note:</b> " : "<b>注意:</b> ",
+    " and " : "と",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
+    "You don't have any external storages" : "外部ストレージはありません。",
+    "Name" : "名前",
+    "Storage type" : "ストレージ種別",
+    "Scope" : "スコープ",
+    "External Storage" : "外部ストレージ",
+    "Folder name" : "フォルダー名",
+    "Configuration" : "設定",
+    "Available for" : "以下が利用可能",
+    "Add storage" : "ストレージを追加",
+    "Delete" : "削除",
+    "Enable User External Storage" : "ユーザーの外部ストレージを有効にする",
+    "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
new file mode 100644
index 00000000000..ee531405d7e
--- /dev/null
+++ b/apps/files_external/l10n/ja.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "リクエストトークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "アクセストークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
+    "Please provide a valid Dropbox app key and secret." : "有効なDropboxアプリのキーとパスワードを入力してください。",
+    "Step 1 failed. Exception: %s" : "ステップ 1 の実行に失敗しました。例外: %s",
+    "Step 2 failed. Exception: %s" : "ステップ 2 の実行に失敗しました。例外: %s",
+    "External storage" : "外部ストレージ",
+    "Local" : "ローカル",
+    "Location" : "位置",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "キー",
+    "Secret" : "シークレットキー",
+    "Bucket" : "バケット名",
+    "Amazon S3 and compliant" : "Amazon S3 と互換ストレージ",
+    "Access Key" : "アクセスキー",
+    "Secret Key" : "シークレットキー",
+    "Hostname" : "ホスト名",
+    "Port" : "ポート",
+    "Region" : "都道府県",
+    "Enable SSL" : "SSLを有効",
+    "Enable Path Style" : "パス形式を有効",
+    "App key" : "アプリキー",
+    "App secret" : "アプリシークレット",
+    "Host" : "ホスト",
+    "Username" : "ユーザー名",
+    "Password" : "パスワード",
+    "Root" : "ルート",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "クライアントID",
+    "Client secret" : "クライアント秘密キー",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "リージョン (OpenStack Object Storage用のオプション)",
+    "API Key (required for Rackspace Cloud Files)" : "APIキー (Rackspace Cloud Filesに必須)",
+    "Tenantname (required for OpenStack Object Storage)" : "テナント名 (OpenStack Object Storage用に必要)",
+    "Password (required for OpenStack Object Storage)" : "パスワード (OpenStack Object Storage用に必要)",
+    "Service Name (required for OpenStack Object Storage)" : "サービス名 (OpenStack Object Storage用に必要)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "識別用エンドポイントURL (OpenStack Object Storage用に必要)",
+    "Timeout of HTTP requests in seconds" : "HTTP接続タイムアウト秒数",
+    "Share" : "共有",
+    "SMB / CIFS using OC login" : "ownCloudログインで SMB/CIFSを使用",
+    "Username as share" : "共有名",
+    "URL" : "URL",
+    "Secure https://" : "セキュア https://",
+    "Remote subfolder" : "リモートサブフォルダー",
+    "Access granted" : "アクセスは許可されました",
+    "Error configuring Dropbox storage" : "Dropboxストレージの設定エラー",
+    "Grant access" : "アクセスを許可",
+    "Error configuring Google Drive storage" : "Googleドライブストレージの設定エラー",
+    "Personal" : "個人",
+    "System" : "システム",
+    "All users. Type to select user or group." : "全てのユーザー．ユーザー、グループを追加",
+    "(group)" : "(グループ)",
+    "Saved" : "保存されました",
+    "<b>Note:</b> " : "<b>注意:</b> ",
+    " and " : "と",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
+    "You don't have any external storages" : "外部ストレージはありません。",
+    "Name" : "名前",
+    "Storage type" : "ストレージ種別",
+    "Scope" : "スコープ",
+    "External Storage" : "外部ストレージ",
+    "Folder name" : "フォルダー名",
+    "Configuration" : "設定",
+    "Available for" : "以下が利用可能",
+    "Add storage" : "ストレージを追加",
+    "Delete" : "削除",
+    "Enable User External Storage" : "ユーザーの外部ストレージを有効にする",
+    "Allow users to mount the following external storage" : "ユーザーに以下の外部ストレージのマウントを許可する"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ja.php b/apps/files_external/l10n/ja.php
deleted file mode 100644
index f4601bb7daf..00000000000
--- a/apps/files_external/l10n/ja.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "リクエストトークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "アクセストークンの取得に失敗しました。Dropboxアプリのキーとパスワードが正しいことを確認してください。",
-"Please provide a valid Dropbox app key and secret." => "有効なDropboxアプリのキーとパスワードを入力してください。",
-"Step 1 failed. Exception: %s" => "ステップ 1 の実行に失敗しました。例外: %s",
-"Step 2 failed. Exception: %s" => "ステップ 2 の実行に失敗しました。例外: %s",
-"External storage" => "外部ストレージ",
-"Local" => "ローカル",
-"Location" => "位置",
-"Amazon S3" => "Amazon S3",
-"Key" => "キー",
-"Secret" => "シークレットキー",
-"Bucket" => "バケット名",
-"Amazon S3 and compliant" => "Amazon S3 と互換ストレージ",
-"Access Key" => "アクセスキー",
-"Secret Key" => "シークレットキー",
-"Hostname" => "ホスト名",
-"Port" => "ポート",
-"Region" => "都道府県",
-"Enable SSL" => "SSLを有効",
-"Enable Path Style" => "パス形式を有効",
-"App key" => "アプリキー",
-"App secret" => "アプリシークレット",
-"Host" => "ホスト",
-"Username" => "ユーザー名",
-"Password" => "パスワード",
-"Root" => "ルート",
-"Secure ftps://" => "Secure ftps://",
-"Client ID" => "クライアントID",
-"Client secret" => "クライアント秘密キー",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "リージョン (OpenStack Object Storage用のオプション)",
-"API Key (required for Rackspace Cloud Files)" => "APIキー (Rackspace Cloud Filesに必須)",
-"Tenantname (required for OpenStack Object Storage)" => "テナント名 (OpenStack Object Storage用に必要)",
-"Password (required for OpenStack Object Storage)" => "パスワード (OpenStack Object Storage用に必要)",
-"Service Name (required for OpenStack Object Storage)" => "サービス名 (OpenStack Object Storage用に必要)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "識別用エンドポイントURL (OpenStack Object Storage用に必要)",
-"Timeout of HTTP requests in seconds" => "HTTP接続タイムアウト秒数",
-"Share" => "共有",
-"SMB / CIFS using OC login" => "ownCloudログインで SMB/CIFSを使用",
-"Username as share" => "共有名",
-"URL" => "URL",
-"Secure https://" => "セキュア https://",
-"Remote subfolder" => "リモートサブフォルダー",
-"Access granted" => "アクセスは許可されました",
-"Error configuring Dropbox storage" => "Dropboxストレージの設定エラー",
-"Grant access" => "アクセスを許可",
-"Error configuring Google Drive storage" => "Googleドライブストレージの設定エラー",
-"Personal" => "個人",
-"System" => "システム",
-"All users. Type to select user or group." => "すべてのユーザー．ユーザー、グループを追加",
-"(group)" => "(グループ)",
-"Saved" => "保存されました",
-"<b>Note:</b> " => "<b>注意:</b> ",
-" and " => "と",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注意:</b> PHPにcURLのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注意:</b> PHPにFTPのエクステンションが入っていないか、有効ではありません。%s をマウントすることができません。このシステムの管理者にインストールをお願いしてください。",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>注意:</b> \"%s\" がインストールされていません。%sをマウントできません。このシステムの管理者にインストールをお願いしてください。",
-"You don't have any external storages" => "外部ストレージはありません。",
-"Name" => "名前",
-"Storage type" => "ストレージ種別",
-"Scope" => "スコープ",
-"External Storage" => "外部ストレージ",
-"Folder name" => "フォルダー名",
-"Configuration" => "設定",
-"Available for" => "以下が利用可能",
-"Add storage" => "ストレージを追加",
-"Delete" => "削除",
-"Enable User External Storage" => "ユーザーの外部ストレージを有効にする",
-"Allow users to mount the following external storage" => "ユーザーに以下の外部ストレージのマウントを許可する"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/jv.js b/apps/files_external/l10n/jv.js
new file mode 100644
index 00000000000..daa8658d543
--- /dev/null
+++ b/apps/files_external/l10n/jv.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Papan panggonan"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/jv.json b/apps/files_external/l10n/jv.json
new file mode 100644
index 00000000000..53d963e56be
--- /dev/null
+++ b/apps/files_external/l10n/jv.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Location" : "Papan panggonan"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/jv.php b/apps/files_external/l10n/jv.php
deleted file mode 100644
index acff46664cc..00000000000
--- a/apps/files_external/l10n/jv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Papan panggonan"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ka_GE.js b/apps/files_external/l10n/ka_GE.js
new file mode 100644
index 00000000000..b152dbc7a85
--- /dev/null
+++ b/apps/files_external/l10n/ka_GE.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
+    "External storage" : "ექსტერნალ საცავი",
+    "Location" : "ადგილმდებარეობა",
+    "Port" : "პორტი",
+    "Region" : "რეგიონი",
+    "Host" : "ჰოსტი",
+    "Username" : "მომხმარებლის სახელი",
+    "Password" : "პაროლი",
+    "Share" : "გაზიარება",
+    "URL" : "URL",
+    "Access granted" : "დაშვება მინიჭებულია",
+    "Error configuring Dropbox storage" : "შეცდომა Dropbox საცავის კონფიგურირების დროს",
+    "Grant access" : "დაშვების მინიჭება",
+    "Error configuring Google Drive storage" : "შეცდომა Google Drive საცავის კონფიგურირების დროს",
+    "Personal" : "პირადი",
+    "Name" : "სახელი",
+    "External Storage" : "ექსტერნალ საცავი",
+    "Folder name" : "ფოლდერის სახელი",
+    "Configuration" : "კონფიგურაცია",
+    "Add storage" : "საცავის დამატება",
+    "Delete" : "წაშლა",
+    "Enable User External Storage" : "მომხმარებლის ექსტერნალ საცავის აქტივირება"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/ka_GE.json b/apps/files_external/l10n/ka_GE.json
new file mode 100644
index 00000000000..9e5e8e8db80
--- /dev/null
+++ b/apps/files_external/l10n/ka_GE.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
+    "External storage" : "ექსტერნალ საცავი",
+    "Location" : "ადგილმდებარეობა",
+    "Port" : "პორტი",
+    "Region" : "რეგიონი",
+    "Host" : "ჰოსტი",
+    "Username" : "მომხმარებლის სახელი",
+    "Password" : "პაროლი",
+    "Share" : "გაზიარება",
+    "URL" : "URL",
+    "Access granted" : "დაშვება მინიჭებულია",
+    "Error configuring Dropbox storage" : "შეცდომა Dropbox საცავის კონფიგურირების დროს",
+    "Grant access" : "დაშვების მინიჭება",
+    "Error configuring Google Drive storage" : "შეცდომა Google Drive საცავის კონფიგურირების დროს",
+    "Personal" : "პირადი",
+    "Name" : "სახელი",
+    "External Storage" : "ექსტერნალ საცავი",
+    "Folder name" : "ფოლდერის სახელი",
+    "Configuration" : "კონფიგურაცია",
+    "Add storage" : "საცავის დამატება",
+    "Delete" : "წაშლა",
+    "Enable User External Storage" : "მომხმარებლის ექსტერნალ საცავის აქტივირება"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
deleted file mode 100644
index 3cf45b050b0..00000000000
--- a/apps/files_external/l10n/ka_GE.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "გთხოვთ მიუთითოთ Dropbox აპლიკაციის გასაღები და კოდი.",
-"External storage" => "ექსტერნალ საცავი",
-"Location" => "ადგილმდებარეობა",
-"Port" => "პორტი",
-"Region" => "რეგიონი",
-"Host" => "ჰოსტი",
-"Username" => "მომხმარებლის სახელი",
-"Password" => "პაროლი",
-"Share" => "გაზიარება",
-"URL" => "URL",
-"Access granted" => "დაშვება მინიჭებულია",
-"Error configuring Dropbox storage" => "შეცდომა Dropbox საცავის კონფიგურირების დროს",
-"Grant access" => "დაშვების მინიჭება",
-"Error configuring Google Drive storage" => "შეცდომა Google Drive საცავის კონფიგურირების დროს",
-"Personal" => "პირადი",
-"Name" => "სახელი",
-"External Storage" => "ექსტერნალ საცავი",
-"Folder name" => "ფოლდერის სახელი",
-"Configuration" => "კონფიგურაცია",
-"Add storage" => "საცავის დამატება",
-"Delete" => "წაშლა",
-"Enable User External Storage" => "მომხმარებლის ექსტერნალ საცავის აქტივირება"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/km.js b/apps/files_external/l10n/km.js
new file mode 100644
index 00000000000..0706c6d8b28
--- /dev/null
+++ b/apps/files_external/l10n/km.js
@@ -0,0 +1,24 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "External storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
+    "Location" : "ទីតាំង",
+    "Port" : "ច្រក",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Share" : "ចែក​រំលែក",
+    "URL" : "URL",
+    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
+    "Error configuring Dropbox storage" : "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
+    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Saved" : "បាន​រក្សាទុក",
+    "Name" : "ឈ្មោះ",
+    "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
+    "Folder name" : "ឈ្មោះ​ថត",
+    "Configuration" : "ការ​កំណត់​សណ្ឋាន",
+    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក",
+    "Delete" : "លុប"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/km.json b/apps/files_external/l10n/km.json
new file mode 100644
index 00000000000..3696e721b8a
--- /dev/null
+++ b/apps/files_external/l10n/km.json
@@ -0,0 +1,22 @@
+{ "translations": {
+    "External storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
+    "Location" : "ទីតាំង",
+    "Port" : "ច្រក",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Share" : "ចែក​រំលែក",
+    "URL" : "URL",
+    "Access granted" : "បាន​ទទួល​សិទ្ធិ​ចូល",
+    "Error configuring Dropbox storage" : "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
+    "Grant access" : "ទទួល​សិទ្ធិ​ចូល",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Saved" : "បាន​រក្សាទុក",
+    "Name" : "ឈ្មោះ",
+    "External Storage" : "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
+    "Folder name" : "ឈ្មោះ​ថត",
+    "Configuration" : "ការ​កំណត់​សណ្ឋាន",
+    "Add storage" : "បន្ថែម​ឃ្លាំងផ្ទុក",
+    "Delete" : "លុប"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/km.php b/apps/files_external/l10n/km.php
deleted file mode 100644
index 3a96906fdb7..00000000000
--- a/apps/files_external/l10n/km.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"External storage" => "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
-"Location" => "ទីតាំង",
-"Port" => "ច្រក",
-"Host" => "ម៉ាស៊ីន​ផ្ទុក",
-"Username" => "ឈ្មោះ​អ្នកប្រើ",
-"Password" => "ពាក្យសម្ងាត់",
-"Share" => "ចែក​រំលែក",
-"URL" => "URL",
-"Access granted" => "បាន​ទទួល​សិទ្ធិ​ចូល",
-"Error configuring Dropbox storage" => "កំហុស​ការ​កំណត់​សណ្ឋាន​នៃ​ឃ្លាំងផ្ទុក Dropbox",
-"Grant access" => "ទទួល​សិទ្ធិ​ចូល",
-"Personal" => "ផ្ទាល់​ខ្លួន",
-"Saved" => "បាន​រក្សាទុក",
-"Name" => "ឈ្មោះ",
-"External Storage" => "ឃ្លាំងផ្ទុក​ខាងក្រៅ",
-"Folder name" => "ឈ្មោះ​ថត",
-"Configuration" => "ការ​កំណត់​សណ្ឋាន",
-"Add storage" => "បន្ថែម​ឃ្លាំងផ្ទុក",
-"Delete" => "លុប"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ko.js b/apps/files_external/l10n/ko.js
new file mode 100644
index 00000000000..6f77ff4071a
--- /dev/null
+++ b/apps/files_external/l10n/ko.js
@@ -0,0 +1,29 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
+    "External storage" : "외부 저장소",
+    "Location" : "장소",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "포트",
+    "Region" : "지역",
+    "Host" : "호스트",
+    "Username" : "사용자 이름",
+    "Password" : "암호",
+    "Share" : "공유",
+    "URL" : "URL",
+    "Access granted" : "접근 허가됨",
+    "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류",
+    "Grant access" : "접근 권한 부여",
+    "Error configuring Google Drive storage" : "Google 드라이브 저장소 설정 오류",
+    "Personal" : "개인",
+    "Saved" : "저장됨",
+    "Name" : "이름",
+    "External Storage" : "외부 저장소",
+    "Folder name" : "폴더 이름",
+    "Configuration" : "설정",
+    "Add storage" : "저장소 추가",
+    "Delete" : "삭제",
+    "Enable User External Storage" : "사용자 외부 저장소 사용"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/ko.json b/apps/files_external/l10n/ko.json
new file mode 100644
index 00000000000..73112120559
--- /dev/null
+++ b/apps/files_external/l10n/ko.json
@@ -0,0 +1,27 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
+    "External storage" : "외부 저장소",
+    "Location" : "장소",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "포트",
+    "Region" : "지역",
+    "Host" : "호스트",
+    "Username" : "사용자 이름",
+    "Password" : "암호",
+    "Share" : "공유",
+    "URL" : "URL",
+    "Access granted" : "접근 허가됨",
+    "Error configuring Dropbox storage" : "Dropbox 저장소 설정 오류",
+    "Grant access" : "접근 권한 부여",
+    "Error configuring Google Drive storage" : "Google 드라이브 저장소 설정 오류",
+    "Personal" : "개인",
+    "Saved" : "저장됨",
+    "Name" : "이름",
+    "External Storage" : "외부 저장소",
+    "Folder name" : "폴더 이름",
+    "Configuration" : "설정",
+    "Add storage" : "저장소 추가",
+    "Delete" : "삭제",
+    "Enable User External Storage" : "사용자 외부 저장소 사용"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ko.php b/apps/files_external/l10n/ko.php
deleted file mode 100644
index b1c8eea1f17..00000000000
--- a/apps/files_external/l10n/ko.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "올바른 Dropbox 앱 키와 암호를 입력하십시오.",
-"External storage" => "외부 저장소",
-"Location" => "장소",
-"Amazon S3" => "Amazon S3",
-"Port" => "포트",
-"Region" => "지역",
-"Host" => "호스트",
-"Username" => "사용자 이름",
-"Password" => "암호",
-"Share" => "공유",
-"URL" => "URL",
-"Access granted" => "접근 허가됨",
-"Error configuring Dropbox storage" => "Dropbox 저장소 설정 오류",
-"Grant access" => "접근 권한 부여",
-"Error configuring Google Drive storage" => "Google 드라이브 저장소 설정 오류",
-"Personal" => "개인",
-"Saved" => "저장됨",
-"Name" => "이름",
-"External Storage" => "외부 저장소",
-"Folder name" => "폴더 이름",
-"Configuration" => "설정",
-"Add storage" => "저장소 추가",
-"Delete" => "삭제",
-"Enable User External Storage" => "사용자 외부 저장소 사용"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/ku_IQ.js b/apps/files_external/l10n/ku_IQ.js
new file mode 100644
index 00000000000..60110b5a0a7
--- /dev/null
+++ b/apps/files_external/l10n/ku_IQ.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "شوێن",
+    "Username" : "ناوی به‌کارهێنه‌ر",
+    "Password" : "وشەی تێپەربو",
+    "Share" : "هاوبەشی کردن",
+    "URL" : "ناونیشانی به‌سته‌ر",
+    "Name" : "ناو",
+    "Folder name" : "ناوی بوخچه"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/ku_IQ.json b/apps/files_external/l10n/ku_IQ.json
new file mode 100644
index 00000000000..5116096025f
--- /dev/null
+++ b/apps/files_external/l10n/ku_IQ.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Location" : "شوێن",
+    "Username" : "ناوی به‌کارهێنه‌ر",
+    "Password" : "وشەی تێپەربو",
+    "Share" : "هاوبەشی کردن",
+    "URL" : "ناونیشانی به‌سته‌ر",
+    "Name" : "ناو",
+    "Folder name" : "ناوی بوخچه"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php
deleted file mode 100644
index 097f8d3199c..00000000000
--- a/apps/files_external/l10n/ku_IQ.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "شوێن",
-"Username" => "ناوی به‌کارهێنه‌ر",
-"Password" => "وشەی تێپەربو",
-"Share" => "هاوبەشی کردن",
-"URL" => "ناونیشانی به‌سته‌ر",
-"Name" => "ناو",
-"Folder name" => "ناوی بوخچه"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/lb.js b/apps/files_external/l10n/lb.js
new file mode 100644
index 00000000000..6bd258b4234
--- /dev/null
+++ b/apps/files_external/l10n/lb.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Uert",
+    "Region" : "Regioun",
+    "Host" : "Host",
+    "Username" : "Benotzernumm",
+    "Password" : "Passwuert",
+    "Share" : "Deelen",
+    "URL" : "URL",
+    "Personal" : "Perséinlech",
+    "Name" : "Numm",
+    "Folder name" : "Dossiers Numm:",
+    "Delete" : "Läschen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/lb.json b/apps/files_external/l10n/lb.json
new file mode 100644
index 00000000000..0c5143c4f0d
--- /dev/null
+++ b/apps/files_external/l10n/lb.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Location" : "Uert",
+    "Region" : "Regioun",
+    "Host" : "Host",
+    "Username" : "Benotzernumm",
+    "Password" : "Passwuert",
+    "Share" : "Deelen",
+    "URL" : "URL",
+    "Personal" : "Perséinlech",
+    "Name" : "Numm",
+    "Folder name" : "Dossiers Numm:",
+    "Delete" : "Läschen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
deleted file mode 100644
index 01b940f25d0..00000000000
--- a/apps/files_external/l10n/lb.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Uert",
-"Region" => "Regioun",
-"Host" => "Host",
-"Username" => "Benotzernumm",
-"Password" => "Passwuert",
-"Share" => "Deelen",
-"URL" => "URL",
-"Personal" => "Perséinlech",
-"Name" => "Numm",
-"Folder name" => "Dossiers Numm:",
-"Delete" => "Läschen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/lt_LT.js b/apps/files_external/l10n/lt_LT.js
new file mode 100644
index 00000000000..fa8dcec68e0
--- /dev/null
+++ b/apps/files_external/l10n/lt_LT.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
+    "External storage" : "Išorinė saugykla",
+    "Location" : "Vieta",
+    "Port" : "Prievadas",
+    "Region" : "Regionas",
+    "Host" : "Mazgas",
+    "Username" : "Prisijungimo vardas",
+    "Password" : "Slaptažodis",
+    "Share" : "Dalintis",
+    "URL" : "URL",
+    "Access granted" : "Priėjimas suteiktas",
+    "Error configuring Dropbox storage" : "Klaida nustatinėjant Dropbox talpyklą",
+    "Grant access" : "Suteikti priėjimą",
+    "Error configuring Google Drive storage" : "Klaida nustatinėjant Google Drive talpyklą",
+    "Personal" : "Asmeniniai",
+    "Name" : "Pavadinimas",
+    "External Storage" : "Išorinės saugyklos",
+    "Folder name" : "Katalogo pavadinimas",
+    "Configuration" : "Konfigūracija",
+    "Add storage" : "Pridėti saugyklą",
+    "Delete" : "Ištrinti",
+    "Enable User External Storage" : "Įjungti vartotojų išorines saugyklas"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_external/l10n/lt_LT.json b/apps/files_external/l10n/lt_LT.json
new file mode 100644
index 00000000000..a6d6e9bfc72
--- /dev/null
+++ b/apps/files_external/l10n/lt_LT.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
+    "External storage" : "Išorinė saugykla",
+    "Location" : "Vieta",
+    "Port" : "Prievadas",
+    "Region" : "Regionas",
+    "Host" : "Mazgas",
+    "Username" : "Prisijungimo vardas",
+    "Password" : "Slaptažodis",
+    "Share" : "Dalintis",
+    "URL" : "URL",
+    "Access granted" : "Priėjimas suteiktas",
+    "Error configuring Dropbox storage" : "Klaida nustatinėjant Dropbox talpyklą",
+    "Grant access" : "Suteikti priėjimą",
+    "Error configuring Google Drive storage" : "Klaida nustatinėjant Google Drive talpyklą",
+    "Personal" : "Asmeniniai",
+    "Name" : "Pavadinimas",
+    "External Storage" : "Išorinės saugyklos",
+    "Folder name" : "Katalogo pavadinimas",
+    "Configuration" : "Konfigūracija",
+    "Add storage" : "Pridėti saugyklą",
+    "Delete" : "Ištrinti",
+    "Enable User External Storage" : "Įjungti vartotojų išorines saugyklas"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
deleted file mode 100644
index f5e83fc60bc..00000000000
--- a/apps/files_external/l10n/lt_LT.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
-"External storage" => "Išorinė saugykla",
-"Location" => "Vieta",
-"Port" => "Prievadas",
-"Region" => "Regionas",
-"Host" => "Mazgas",
-"Username" => "Prisijungimo vardas",
-"Password" => "Slaptažodis",
-"Share" => "Dalintis",
-"URL" => "URL",
-"Access granted" => "Priėjimas suteiktas",
-"Error configuring Dropbox storage" => "Klaida nustatinėjant Dropbox talpyklą",
-"Grant access" => "Suteikti priėjimą",
-"Error configuring Google Drive storage" => "Klaida nustatinėjant Google Drive talpyklą",
-"Personal" => "Asmeniniai",
-"Name" => "Pavadinimas",
-"External Storage" => "Išorinės saugyklos",
-"Folder name" => "Katalogo pavadinimas",
-"Configuration" => "Konfigūracija",
-"Add storage" => "Pridėti saugyklą",
-"Delete" => "Ištrinti",
-"Enable User External Storage" => "Įjungti vartotojų išorines saugyklas"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/lv.js b/apps/files_external/l10n/lv.js
new file mode 100644
index 00000000000..8f22ff9fd1b
--- /dev/null
+++ b/apps/files_external/l10n/lv.js
@@ -0,0 +1,26 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
+    "External storage" : "Ārējā krātuve",
+    "Location" : "Vieta",
+    "Port" : "Ports",
+    "Host" : "Resursdators",
+    "Username" : "Lietotājvārds",
+    "Password" : "Parole",
+    "Share" : "Dalīties",
+    "URL" : "URL",
+    "Access granted" : "Piešķirta pieeja",
+    "Error configuring Dropbox storage" : "Kļūda, konfigurējot Dropbox krātuvi",
+    "Grant access" : "Piešķirt pieeju",
+    "Error configuring Google Drive storage" : "Kļūda, konfigurējot Google Drive krātuvi",
+    "Personal" : "Personīgi",
+    "Name" : "Nosaukums",
+    "External Storage" : "Ārējā krātuve",
+    "Folder name" : "Mapes nosaukums",
+    "Configuration" : "Konfigurācija",
+    "Add storage" : "Pievienot krātuvi",
+    "Delete" : "Dzēst",
+    "Enable User External Storage" : "Aktivēt lietotāja ārējo krātuvi"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_external/l10n/lv.json b/apps/files_external/l10n/lv.json
new file mode 100644
index 00000000000..f5637ac9b55
--- /dev/null
+++ b/apps/files_external/l10n/lv.json
@@ -0,0 +1,24 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
+    "External storage" : "Ārējā krātuve",
+    "Location" : "Vieta",
+    "Port" : "Ports",
+    "Host" : "Resursdators",
+    "Username" : "Lietotājvārds",
+    "Password" : "Parole",
+    "Share" : "Dalīties",
+    "URL" : "URL",
+    "Access granted" : "Piešķirta pieeja",
+    "Error configuring Dropbox storage" : "Kļūda, konfigurējot Dropbox krātuvi",
+    "Grant access" : "Piešķirt pieeju",
+    "Error configuring Google Drive storage" : "Kļūda, konfigurējot Google Drive krātuvi",
+    "Personal" : "Personīgi",
+    "Name" : "Nosaukums",
+    "External Storage" : "Ārējā krātuve",
+    "Folder name" : "Mapes nosaukums",
+    "Configuration" : "Konfigurācija",
+    "Add storage" : "Pievienot krātuvi",
+    "Delete" : "Dzēst",
+    "Enable User External Storage" : "Aktivēt lietotāja ārējo krātuvi"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
deleted file mode 100644
index 3bd5589a5f5..00000000000
--- a/apps/files_external/l10n/lv.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Lūdzu, norādiet derīgu Dropbox lietotnes atslēgu un noslēpumu.",
-"External storage" => "Ārējā krātuve",
-"Location" => "Vieta",
-"Port" => "Ports",
-"Host" => "Resursdators",
-"Username" => "Lietotājvārds",
-"Password" => "Parole",
-"Share" => "Dalīties",
-"URL" => "URL",
-"Access granted" => "Piešķirta pieeja",
-"Error configuring Dropbox storage" => "Kļūda, konfigurējot Dropbox krātuvi",
-"Grant access" => "Piešķirt pieeju",
-"Error configuring Google Drive storage" => "Kļūda, konfigurējot Google Drive krātuvi",
-"Personal" => "Personīgi",
-"Name" => "Nosaukums",
-"External Storage" => "Ārējā krātuve",
-"Folder name" => "Mapes nosaukums",
-"Configuration" => "Konfigurācija",
-"Add storage" => "Pievienot krātuvi",
-"Delete" => "Dzēst",
-"Enable User External Storage" => "Aktivēt lietotāja ārējo krātuvi"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_external/l10n/mk.js b/apps/files_external/l10n/mk.js
new file mode 100644
index 00000000000..4250db79d36
--- /dev/null
+++ b/apps/files_external/l10n/mk.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
+    "Local" : "Локален",
+    "Location" : "Локација",
+    "Port" : "Порта",
+    "Region" : "Регион",
+    "Host" : "Домаќин",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "Share" : "Сподели",
+    "URL" : "Адреса",
+    "Access granted" : "Пристапот е дозволен",
+    "Error configuring Dropbox storage" : "Грешка при конфигурација на Dropbox",
+    "Grant access" : "Дозволи пристап",
+    "Error configuring Google Drive storage" : "Грешка при конфигурација на Google Drive",
+    "Personal" : "Лично",
+    "Saved" : "Снимено",
+    "Name" : "Име",
+    "External Storage" : "Надворешно складиште",
+    "Folder name" : "Име на папка",
+    "Configuration" : "Конфигурација",
+    "Delete" : "Избриши",
+    "Enable User External Storage" : "Овозможи надворешни за корисници"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/files_external/l10n/mk.json b/apps/files_external/l10n/mk.json
new file mode 100644
index 00000000000..d216a075b31
--- /dev/null
+++ b/apps/files_external/l10n/mk.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
+    "Local" : "Локален",
+    "Location" : "Локација",
+    "Port" : "Порта",
+    "Region" : "Регион",
+    "Host" : "Домаќин",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "Share" : "Сподели",
+    "URL" : "Адреса",
+    "Access granted" : "Пристапот е дозволен",
+    "Error configuring Dropbox storage" : "Грешка при конфигурација на Dropbox",
+    "Grant access" : "Дозволи пристап",
+    "Error configuring Google Drive storage" : "Грешка при конфигурација на Google Drive",
+    "Personal" : "Лично",
+    "Saved" : "Снимено",
+    "Name" : "Име",
+    "External Storage" : "Надворешно складиште",
+    "Folder name" : "Име на папка",
+    "Configuration" : "Конфигурација",
+    "Delete" : "Избриши",
+    "Enable User External Storage" : "Овозможи надворешни за корисници"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
deleted file mode 100644
index 8c9ab8fff14..00000000000
--- a/apps/files_external/l10n/mk.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Ве молам доставите валиден Dropbox клуч и тајна лозинка.",
-"Local" => "Локален",
-"Location" => "Локација",
-"Port" => "Порта",
-"Region" => "Регион",
-"Host" => "Домаќин",
-"Username" => "Корисничко име",
-"Password" => "Лозинка",
-"Share" => "Сподели",
-"URL" => "Адреса",
-"Access granted" => "Пристапот е дозволен",
-"Error configuring Dropbox storage" => "Грешка при конфигурација на Dropbox",
-"Grant access" => "Дозволи пристап",
-"Error configuring Google Drive storage" => "Грешка при конфигурација на Google Drive",
-"Personal" => "Лично",
-"Saved" => "Снимено",
-"Name" => "Име",
-"External Storage" => "Надворешно складиште",
-"Folder name" => "Име на папка",
-"Configuration" => "Конфигурација",
-"Delete" => "Избриши",
-"Enable User External Storage" => "Овозможи надворешни за корисници"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_external/l10n/ms_MY.js b/apps/files_external/l10n/ms_MY.js
new file mode 100644
index 00000000000..e73074f39fd
--- /dev/null
+++ b/apps/files_external/l10n/ms_MY.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Lokasi",
+    "Region" : "Wilayah",
+    "Username" : "Nama pengguna",
+    "Password" : "Kata laluan",
+    "Share" : "Kongsi",
+    "URL" : "URL",
+    "Personal" : "Peribadi",
+    "Name" : "Nama",
+    "Delete" : "Padam"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/ms_MY.json b/apps/files_external/l10n/ms_MY.json
new file mode 100644
index 00000000000..3dbcfc92a75
--- /dev/null
+++ b/apps/files_external/l10n/ms_MY.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Location" : "Lokasi",
+    "Region" : "Wilayah",
+    "Username" : "Nama pengguna",
+    "Password" : "Kata laluan",
+    "Share" : "Kongsi",
+    "URL" : "URL",
+    "Personal" : "Peribadi",
+    "Name" : "Nama",
+    "Delete" : "Padam"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ms_MY.php b/apps/files_external/l10n/ms_MY.php
deleted file mode 100644
index 06d66083f9b..00000000000
--- a/apps/files_external/l10n/ms_MY.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Lokasi",
-"Region" => "Wilayah",
-"Username" => "Nama pengguna",
-"Password" => "Kata laluan",
-"Share" => "Kongsi",
-"URL" => "URL",
-"Personal" => "Peribadi",
-"Name" => "Nama",
-"Delete" => "Padam"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/my_MM.js b/apps/files_external/l10n/my_MM.js
new file mode 100644
index 00000000000..d858639143d
--- /dev/null
+++ b/apps/files_external/l10n/my_MM.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "တည်နေရာ",
+    "Username" : "သုံးစွဲသူအမည်",
+    "Password" : "စကားဝှက်"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/my_MM.json b/apps/files_external/l10n/my_MM.json
new file mode 100644
index 00000000000..ee8c8165a50
--- /dev/null
+++ b/apps/files_external/l10n/my_MM.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Location" : "တည်နေရာ",
+    "Username" : "သုံးစွဲသူအမည်",
+    "Password" : "စကားဝှက်"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/my_MM.php b/apps/files_external/l10n/my_MM.php
deleted file mode 100644
index bf50d1b1b6d..00000000000
--- a/apps/files_external/l10n/my_MM.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "တည်နေရာ",
-"Username" => "သုံးစွဲသူအမည်",
-"Password" => "စကားဝှက်"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/nb_NO.js b/apps/files_external/l10n/nb_NO.js
new file mode 100644
index 00000000000..ebf113068a2
--- /dev/null
+++ b/apps/files_external/l10n/nb_NO.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
+    "Please provide a valid Dropbox app key and secret." : "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+    "Step 1 failed. Exception: %s" : "Steg 1 feilet. Unntak: %s",
+    "Step 2 failed. Exception: %s" : "Steg 2 feilet. Unntak: %s",
+    "External storage" : "Ekstern lagringsplass",
+    "Local" : "Lokal",
+    "Location" : "Sted",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Key",
+    "Secret" : "Secret",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 og tilsvarende",
+    "Access Key" : "Access Key",
+    "Secret Key" : "Secret Key",
+    "Hostname" : "Servernavn",
+    "Port" : "Port",
+    "Region" : "Området",
+    "Enable SSL" : "Aktiver SSL",
+    "Enable Path Style" : "Aktiver Path Style",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Host" : "Tjener",
+    "Username" : "Brukernavn",
+    "Password" : "Passord",
+    "Root" : "Rot",
+    "Secure ftps://" : "Sikker ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (ikke påkrevet for OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (påkrevet for Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (påkrevet for OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Passord (påkrevet for OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Tjenestenavn (påkrevet for OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tidsavbrudd for HTTP-forespørsler i sekunder",
+    "Share" : "Del",
+    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
+    "Username as share" : "Brukernavn som share",
+    "URL" : "URL",
+    "Secure https://" : "Sikker https://",
+    "Remote subfolder" : "Ekstern undermappe",
+    "Access granted" : "Tilgang innvilget",
+    "Error configuring Dropbox storage" : "Feil ved konfigurering av Dropbox-lagring",
+    "Grant access" : "Gi tilgang",
+    "Error configuring Google Drive storage" : "Feil med konfigurering av Google Drive",
+    "Personal" : "Personlig",
+    "System" : "System",
+    "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
+    "(group)" : "(gruppe)",
+    "Saved" : "Lagret",
+    "<b>Note:</b> " : "<b>Merk:</b> ",
+    " and " : " og ",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
+    "You don't have any external storages" : "Du har ingen eksterne lagre",
+    "Name" : "Navn",
+    "Storage type" : "Lagringstype",
+    "Scope" : "Omfang",
+    "External Storage" : "Ekstern lagring",
+    "Folder name" : "Mappenavn",
+    "Configuration" : "Konfigurasjon",
+    "Available for" : "Tilgjengelig for",
+    "Add storage" : "Legg til lagringsplass",
+    "Delete" : "Slett",
+    "Enable User External Storage" : "Aktiver ekstern lagring for bruker",
+    "Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/nb_NO.json b/apps/files_external/l10n/nb_NO.json
new file mode 100644
index 00000000000..b9b736fb13a
--- /dev/null
+++ b/apps/files_external/l10n/nb_NO.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Henting adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
+    "Please provide a valid Dropbox app key and secret." : "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
+    "Step 1 failed. Exception: %s" : "Steg 1 feilet. Unntak: %s",
+    "Step 2 failed. Exception: %s" : "Steg 2 feilet. Unntak: %s",
+    "External storage" : "Ekstern lagringsplass",
+    "Local" : "Lokal",
+    "Location" : "Sted",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Key",
+    "Secret" : "Secret",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 og tilsvarende",
+    "Access Key" : "Access Key",
+    "Secret Key" : "Secret Key",
+    "Hostname" : "Servernavn",
+    "Port" : "Port",
+    "Region" : "Området",
+    "Enable SSL" : "Aktiver SSL",
+    "Enable Path Style" : "Aktiver Path Style",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Host" : "Tjener",
+    "Username" : "Brukernavn",
+    "Password" : "Passord",
+    "Root" : "Rot",
+    "Secure ftps://" : "Sikker ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (ikke påkrevet for OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (påkrevet for Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (påkrevet for OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Passord (påkrevet for OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Tjenestenavn (påkrevet for OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tidsavbrudd for HTTP-forespørsler i sekunder",
+    "Share" : "Del",
+    "SMB / CIFS using OC login" : "SMB / CIFS med OC-pålogging",
+    "Username as share" : "Brukernavn som share",
+    "URL" : "URL",
+    "Secure https://" : "Sikker https://",
+    "Remote subfolder" : "Ekstern undermappe",
+    "Access granted" : "Tilgang innvilget",
+    "Error configuring Dropbox storage" : "Feil ved konfigurering av Dropbox-lagring",
+    "Grant access" : "Gi tilgang",
+    "Error configuring Google Drive storage" : "Feil med konfigurering av Google Drive",
+    "Personal" : "Personlig",
+    "System" : "System",
+    "All users. Type to select user or group." : "Alle brukere. Tast for å velge bruker eller gruppe.",
+    "(group)" : "(gruppe)",
+    "Saved" : "Lagret",
+    "<b>Note:</b> " : "<b>Merk:</b> ",
+    " and " : " og ",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
+    "You don't have any external storages" : "Du har ingen eksterne lagre",
+    "Name" : "Navn",
+    "Storage type" : "Lagringstype",
+    "Scope" : "Omfang",
+    "External Storage" : "Ekstern lagring",
+    "Folder name" : "Mappenavn",
+    "Configuration" : "Konfigurasjon",
+    "Available for" : "Tilgjengelig for",
+    "Add storage" : "Legg til lagringsplass",
+    "Delete" : "Slett",
+    "Enable User External Storage" : "Aktiver ekstern lagring for bruker",
+    "Allow users to mount the following external storage" : "Tillat brukere å koble opp følgende eksterne lagring"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
deleted file mode 100644
index e27def2ea7f..00000000000
--- a/apps/files_external/l10n/nb_NO.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Henting av henvendelsessymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Henting adgangssymboler feilet. Sjekk at app-nøkkelen og hemmeligheten din for Dropbox stemmer.",
-"Please provide a valid Dropbox app key and secret." => "Vær vennlig å oppgi gyldig Dropbox appnøkkel og hemmelighet.",
-"Step 1 failed. Exception: %s" => "Steg 1 feilet. Unntak: %s",
-"Step 2 failed. Exception: %s" => "Steg 2 feilet. Unntak: %s",
-"External storage" => "Ekstern lagringsplass",
-"Local" => "Lokal",
-"Location" => "Sted",
-"Amazon S3" => "Amazon S3",
-"Key" => "Key",
-"Secret" => "Secret",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 og tilsvarende",
-"Access Key" => "Access Key",
-"Secret Key" => "Secret Key",
-"Hostname" => "Servernavn",
-"Port" => "Port",
-"Region" => "Området",
-"Enable SSL" => "Aktiver SSL",
-"Enable Path Style" => "Aktiver Path Style",
-"App key" => "App key",
-"App secret" => "App secret",
-"Host" => "Tjener",
-"Username" => "Brukernavn",
-"Password" => "Passord",
-"Root" => "Rot",
-"Secure ftps://" => "Sikker ftps://",
-"Client ID" => "Client ID",
-"Client secret" => "Client secret",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Region (ikke påkrevet for OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API Key (påkrevet for Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Tenantname (påkrevet for OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Passord (påkrevet for OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Tjenestenavn (påkrevet for OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL for identity endpoint (påkrevet for OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Tidsavbrudd for HTTP-forespørsler i sekunder",
-"Share" => "Del",
-"SMB / CIFS using OC login" => "SMB / CIFS med OC-pålogging",
-"Username as share" => "Brukernavn som share",
-"URL" => "URL",
-"Secure https://" => "Sikker https://",
-"Remote subfolder" => "Ekstern undermappe",
-"Access granted" => "Tilgang innvilget",
-"Error configuring Dropbox storage" => "Feil ved konfigurering av Dropbox-lagring",
-"Grant access" => "Gi tilgang",
-"Error configuring Google Drive storage" => "Feil med konfigurering av Google Drive",
-"Personal" => "Personlig",
-"System" => "System",
-"All users. Type to select user or group." => "Alle brukere. Tast for å velge bruker eller gruppe.",
-"(group)" => "(gruppe)",
-"Saved" => "Lagret",
-"<b>Note:</b> " => "<b>Merk:</b> ",
-" and " => " og ",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Merk:</b> Støtte for cURL i PHP er ikke aktivert eller installert. Oppkobling av %s er ikke mulig. Be systemadministratoren om å installere det.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Merk:</b> FTP-støtte i PHP er ikke slått på eller installert. Kan ikke koble opp %s. Ta kontakt med systemadministratoren for å installere det.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Merk:</b> \"%s\" er ikke installert. Oppkobling av %s er ikke mulig. Spør systemadministratoren om å installere det.",
-"You don't have any external storages" => "Du har ingen eksterne lagre",
-"Name" => "Navn",
-"Storage type" => "Lagringstype",
-"Scope" => "Omfang",
-"External Storage" => "Ekstern lagring",
-"Folder name" => "Mappenavn",
-"Configuration" => "Konfigurasjon",
-"Available for" => "Tilgjengelig for",
-"Add storage" => "Legg til lagringsplass",
-"Delete" => "Slett",
-"Enable User External Storage" => "Aktiver ekstern lagring for bruker",
-"Allow users to mount the following external storage" => "Tillat brukere å koble opp følgende eksterne lagring"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/nl.js b/apps/files_external/l10n/nl.js
new file mode 100644
index 00000000000..0dcbe8556a3
--- /dev/null
+++ b/apps/files_external/l10n/nl.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
+    "Please provide a valid Dropbox app key and secret." : "Geef een geldige Dropbox key en secret.",
+    "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
+    "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
+    "External storage" : "Externe opslag",
+    "Local" : "Lokaal",
+    "Location" : "Locatie",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Sleutel",
+    "Secret" : "Geheim",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 en overeenkomstig",
+    "Access Key" : "Access Key",
+    "Secret Key" : "Secret Key",
+    "Hostname" : "Hostnaam",
+    "Port" : "Poort",
+    "Region" : "Regio",
+    "Enable SSL" : "Activeren SSL",
+    "Enable Path Style" : "Activeren pad stijl",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Host" : "Host",
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wachtwoord",
+    "Root" : "Root",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regio (optioneel voor OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (verplicht voor Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (Verplicht voor OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Wachtwoord (verplicht voor OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Service Name (verplicht voor OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Time-out van HTTP-verzoeken in seconden",
+    "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
+    "Username as share" : "Gebruikersnaam als share",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Externe submap",
+    "Access granted" : "Toegang toegestaan",
+    "Error configuring Dropbox storage" : "Fout tijdens het configureren van Dropbox opslag",
+    "Grant access" : "Sta toegang toe",
+    "Error configuring Google Drive storage" : "Fout tijdens het configureren van Google Drive opslag",
+    "Personal" : "Persoonlijk",
+    "System" : "Systeem",
+    "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
+    "(group)" : "(groep)",
+    "Saved" : "Bewaard",
+    "<b>Note:</b> " : "<b>Let op:</b> ",
+    " and " : "en",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.",
+    "You don't have any external storages" : "U hebt geen externe opslag",
+    "Name" : "Naam",
+    "Storage type" : "Opslagtype",
+    "Scope" : "Scope",
+    "External Storage" : "Externe opslag",
+    "Folder name" : "Mapnaam",
+    "Configuration" : "Configuratie",
+    "Available for" : "Beschikbaar voor",
+    "Add storage" : "Toevoegen opslag",
+    "Delete" : "Verwijder",
+    "Enable User External Storage" : "Externe opslag voor gebruikers activeren",
+    "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/nl.json b/apps/files_external/l10n/nl.json
new file mode 100644
index 00000000000..135aea89664
--- /dev/null
+++ b/apps/files_external/l10n/nl.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
+    "Please provide a valid Dropbox app key and secret." : "Geef een geldige Dropbox key en secret.",
+    "Step 1 failed. Exception: %s" : "Stap 1 is mislukt. Uitzondering: %s",
+    "Step 2 failed. Exception: %s" : "Stap 2 is mislukt. Uitzondering: %s",
+    "External storage" : "Externe opslag",
+    "Local" : "Lokaal",
+    "Location" : "Locatie",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Sleutel",
+    "Secret" : "Geheim",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 en overeenkomstig",
+    "Access Key" : "Access Key",
+    "Secret Key" : "Secret Key",
+    "Hostname" : "Hostnaam",
+    "Port" : "Poort",
+    "Region" : "Regio",
+    "Enable SSL" : "Activeren SSL",
+    "Enable Path Style" : "Activeren pad stijl",
+    "App key" : "App key",
+    "App secret" : "App secret",
+    "Host" : "Host",
+    "Username" : "Gebruikersnaam",
+    "Password" : "Wachtwoord",
+    "Root" : "Root",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Client secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Regio (optioneel voor OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (verplicht voor Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (Verplicht voor OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Wachtwoord (verplicht voor OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Service Name (verplicht voor OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Time-out van HTTP-verzoeken in seconden",
+    "Share" : "Share",
+    "SMB / CIFS using OC login" : "SMB / CIFS via OC inlog",
+    "Username as share" : "Gebruikersnaam als share",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Externe submap",
+    "Access granted" : "Toegang toegestaan",
+    "Error configuring Dropbox storage" : "Fout tijdens het configureren van Dropbox opslag",
+    "Grant access" : "Sta toegang toe",
+    "Error configuring Google Drive storage" : "Fout tijdens het configureren van Google Drive opslag",
+    "Personal" : "Persoonlijk",
+    "System" : "Systeem",
+    "All users. Type to select user or group." : "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
+    "(group)" : "(groep)",
+    "Saved" : "Bewaard",
+    "<b>Note:</b> " : "<b>Let op:</b> ",
+    " and " : "en",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.",
+    "You don't have any external storages" : "U hebt geen externe opslag",
+    "Name" : "Naam",
+    "Storage type" : "Opslagtype",
+    "Scope" : "Scope",
+    "External Storage" : "Externe opslag",
+    "Folder name" : "Mapnaam",
+    "Configuration" : "Configuratie",
+    "Available for" : "Beschikbaar voor",
+    "Add storage" : "Toevoegen opslag",
+    "Delete" : "Verwijder",
+    "Enable User External Storage" : "Externe opslag voor gebruikers activeren",
+    "Allow users to mount the following external storage" : "Sta gebruikers toe de volgende externe opslag aan te koppelen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
deleted file mode 100644
index 37c17204ebc..00000000000
--- a/apps/files_external/l10n/nl.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Ophalen aanvraag tokens mislukt. Verifieer dat uw Dropbox app key en secret juist zijn.",
-"Please provide a valid Dropbox app key and secret." => "Geef een geldige Dropbox key en secret.",
-"Step 1 failed. Exception: %s" => "Stap 1 is mislukt. Uitzondering: %s",
-"Step 2 failed. Exception: %s" => "Stap 2 is mislukt. Uitzondering: %s",
-"External storage" => "Externe opslag",
-"Local" => "Lokaal",
-"Location" => "Locatie",
-"Amazon S3" => "Amazon S3",
-"Key" => "Sleutel",
-"Secret" => "Geheim",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 en overeenkomstig",
-"Access Key" => "Access Key",
-"Secret Key" => "Secret Key",
-"Hostname" => "Hostnaam",
-"Port" => "Poort",
-"Region" => "Regio",
-"Enable SSL" => "Activeren SSL",
-"Enable Path Style" => "Activeren pad stijl",
-"App key" => "App key",
-"App secret" => "App secret",
-"Host" => "Host",
-"Username" => "Gebruikersnaam",
-"Password" => "Wachtwoord",
-"Root" => "Root",
-"Secure ftps://" => "Secure ftps://",
-"Client ID" => "Client ID",
-"Client secret" => "Client secret",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Regio (optioneel voor OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API Key (verplicht voor Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Tenantname (Verplicht voor OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Wachtwoord (verplicht voor OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Service Name (verplicht voor OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL van identity endpoint (verplicht voor OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Time-out van HTTP-verzoeken in seconden",
-"Share" => "Share",
-"SMB / CIFS using OC login" => "SMB / CIFS via OC inlog",
-"Username as share" => "Gebruikersnaam als share",
-"URL" => "URL",
-"Secure https://" => "Secure https://",
-"Remote subfolder" => "Externe submap",
-"Access granted" => "Toegang toegestaan",
-"Error configuring Dropbox storage" => "Fout tijdens het configureren van Dropbox opslag",
-"Grant access" => "Sta toegang toe",
-"Error configuring Google Drive storage" => "Fout tijdens het configureren van Google Drive opslag",
-"Personal" => "Persoonlijk",
-"System" => "Systeem",
-"All users. Type to select user or group." => "Alle gebruikers. Tikken om een gebruiker of groep te selecteren.",
-"(group)" => "(groep)",
-"Saved" => "Bewaard",
-"<b>Note:</b> " => "<b>Let op:</b> ",
-" and " => "en",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> Curl ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw systeembeheerder dit te installeren.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> FTP ondersteuning in PHP is niet geactiveerd of geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder dit te installeren.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Let op:</b> \"%s\" is niet geïnstalleerd. Mounten van %s is niet mogelijk. Vraag uw beheerder om dit te installeren.",
-"You don't have any external storages" => "U hebt geen externe opslag",
-"Name" => "Naam",
-"Storage type" => "Opslagtype",
-"Scope" => "Scope",
-"External Storage" => "Externe opslag",
-"Folder name" => "Mapnaam",
-"Configuration" => "Configuratie",
-"Available for" => "Beschikbaar voor",
-"Add storage" => "Toevoegen opslag",
-"Delete" => "Verwijder",
-"Enable User External Storage" => "Externe opslag voor gebruikers activeren",
-"Allow users to mount the following external storage" => "Sta gebruikers toe de volgende externe opslag aan te koppelen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/nn_NO.js b/apps/files_external/l10n/nn_NO.js
new file mode 100644
index 00000000000..080f510546a
--- /dev/null
+++ b/apps/files_external/l10n/nn_NO.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Stad",
+    "Region" : "Region/fylke",
+    "Host" : "Tenar",
+    "Username" : "Brukarnamn",
+    "Password" : "Passord",
+    "Share" : "Del",
+    "URL" : "Nettstad",
+    "Personal" : "Personleg",
+    "Name" : "Namn",
+    "Folder name" : "Mappenamn",
+    "Configuration" : "Innstillingar",
+    "Delete" : "Slett"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/nn_NO.json b/apps/files_external/l10n/nn_NO.json
new file mode 100644
index 00000000000..1451532c222
--- /dev/null
+++ b/apps/files_external/l10n/nn_NO.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Location" : "Stad",
+    "Region" : "Region/fylke",
+    "Host" : "Tenar",
+    "Username" : "Brukarnamn",
+    "Password" : "Passord",
+    "Share" : "Del",
+    "URL" : "Nettstad",
+    "Personal" : "Personleg",
+    "Name" : "Namn",
+    "Folder name" : "Mappenamn",
+    "Configuration" : "Innstillingar",
+    "Delete" : "Slett"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
deleted file mode 100644
index 8f2a351aab3..00000000000
--- a/apps/files_external/l10n/nn_NO.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Stad",
-"Region" => "Region/fylke",
-"Host" => "Tenar",
-"Username" => "Brukarnamn",
-"Password" => "Passord",
-"Share" => "Del",
-"URL" => "Nettstad",
-"Personal" => "Personleg",
-"Name" => "Namn",
-"Folder name" => "Mappenamn",
-"Configuration" => "Innstillingar",
-"Delete" => "Slett"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/oc.js b/apps/files_external/l10n/oc.js
new file mode 100644
index 00000000000..68d56926612
--- /dev/null
+++ b/apps/files_external/l10n/oc.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Plaça",
+    "Username" : "Non d'usancièr",
+    "Password" : "Senhal",
+    "Share" : "Parteja",
+    "URL" : "URL",
+    "Personal" : "Personal",
+    "Name" : "Nom",
+    "Delete" : "Escafa"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_external/l10n/oc.json b/apps/files_external/l10n/oc.json
new file mode 100644
index 00000000000..2a3c1bf4561
--- /dev/null
+++ b/apps/files_external/l10n/oc.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Location" : "Plaça",
+    "Username" : "Non d'usancièr",
+    "Password" : "Senhal",
+    "Share" : "Parteja",
+    "URL" : "URL",
+    "Personal" : "Personal",
+    "Name" : "Nom",
+    "Delete" : "Escafa"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/oc.php b/apps/files_external/l10n/oc.php
deleted file mode 100644
index af4b03e3c15..00000000000
--- a/apps/files_external/l10n/oc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Plaça",
-"Username" => "Non d'usancièr",
-"Password" => "Senhal",
-"Share" => "Parteja",
-"URL" => "URL",
-"Personal" => "Personal",
-"Name" => "Nom",
-"Delete" => "Escafa"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/pa.js b/apps/files_external/l10n/pa.js
new file mode 100644
index 00000000000..47acbde23d8
--- /dev/null
+++ b/apps/files_external/l10n/pa.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
+    "Password" : "ਪਾਸਵਰ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
+    "Delete" : "ਹਟਾਓ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/pa.json b/apps/files_external/l10n/pa.json
new file mode 100644
index 00000000000..2bdafd7a25e
--- /dev/null
+++ b/apps/files_external/l10n/pa.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
+    "Password" : "ਪਾਸਵਰ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
+    "Delete" : "ਹਟਾਓ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/pa.php b/apps/files_external/l10n/pa.php
deleted file mode 100644
index 14e0fe78ae0..00000000000
--- a/apps/files_external/l10n/pa.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
-"Password" => "ਪਾਸਵਰ",
-"Share" => "ਸਾਂਝਾ ਕਰੋ",
-"Delete" => "ਹਟਾਓ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/pl.js b/apps/files_external/l10n/pl.js
new file mode 100644
index 00000000000..a20f61c4677
--- /dev/null
+++ b/apps/files_external/l10n/pl.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
+    "Please provide a valid Dropbox app key and secret." : "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
+    "Step 1 failed. Exception: %s" : "Krok 1 błędny. Błąd: %s",
+    "Step 2 failed. Exception: %s" : "Krok 2 błędny. Błąd: %s",
+    "External storage" : "Zewnętrzne zasoby dyskowe",
+    "Local" : "Lokalny",
+    "Location" : "Lokalizacja",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Klucz",
+    "Secret" : "Hasło",
+    "Bucket" : "Kosz",
+    "Amazon S3 and compliant" : "Amazon S3 i zgodne",
+    "Access Key" : "Klucz dostępu",
+    "Secret Key" : "Klucz hasła",
+    "Hostname" : "Nazwa serwera",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Włącz SSL",
+    "Enable Path Style" : "Włącz styl ścieżki",
+    "App key" : "Klucz aplikacji",
+    "App secret" : "Hasło aplikacji",
+    "Host" : "Host",
+    "Username" : "Nazwa użytkownika",
+    "Password" : "Hasło",
+    "Root" : "Root",
+    "Secure ftps://" : "Bezpieczny ftps://",
+    "Client ID" : "ID klienta",
+    "Client secret" : "Hasło klienta",
+    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Region (opcjonalny dla magazynu obiektów OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Klucz API (wymagany dla plików Rackspace Cloud)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Hasło (wymagane dla magazynu obiektów OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Czas nieaktywności żądania HTTP w sekundach",
+    "Share" : "Udostępnij",
+    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
+    "Username as share" : "Użytkownik jako zasób",
+    "URL" : "URL",
+    "Secure https://" : "Bezpieczny https://",
+    "Remote subfolder" : "Zdalny podfolder",
+    "Access granted" : "Dostęp do",
+    "Error configuring Dropbox storage" : "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
+    "Grant access" : "Udziel dostępu",
+    "Error configuring Google Drive storage" : "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
+    "Personal" : "Osobiste",
+    "System" : "System",
+    "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
+    "(group)" : "(grupa)",
+    "Saved" : "Zapisano",
+    "<b>Note:</b> " : "<b>Uwaga:</b> ",
+    " and " : "oraz",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
+    "You don't have any external storages" : "Nie masz żadnych zewnętrznych magazynów",
+    "Name" : "Nazwa",
+    "Storage type" : "Typ magazynu",
+    "Scope" : "Zakres",
+    "External Storage" : "Zewnętrzna zasoby dyskowe",
+    "Folder name" : "Nazwa folderu",
+    "Configuration" : "Konfiguracja",
+    "Available for" : "Dostępne przez",
+    "Add storage" : "Dodaj zasoby dyskowe",
+    "Delete" : "Usuń",
+    "Enable User External Storage" : "Włącz zewnętrzne zasoby dyskowe użytkownika",
+    "Allow users to mount the following external storage" : "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe"
+},
+"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_external/l10n/pl.json b/apps/files_external/l10n/pl.json
new file mode 100644
index 00000000000..c838595674d
--- /dev/null
+++ b/apps/files_external/l10n/pl.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
+    "Please provide a valid Dropbox app key and secret." : "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
+    "Step 1 failed. Exception: %s" : "Krok 1 błędny. Błąd: %s",
+    "Step 2 failed. Exception: %s" : "Krok 2 błędny. Błąd: %s",
+    "External storage" : "Zewnętrzne zasoby dyskowe",
+    "Local" : "Lokalny",
+    "Location" : "Lokalizacja",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Klucz",
+    "Secret" : "Hasło",
+    "Bucket" : "Kosz",
+    "Amazon S3 and compliant" : "Amazon S3 i zgodne",
+    "Access Key" : "Klucz dostępu",
+    "Secret Key" : "Klucz hasła",
+    "Hostname" : "Nazwa serwera",
+    "Port" : "Port",
+    "Region" : "Region",
+    "Enable SSL" : "Włącz SSL",
+    "Enable Path Style" : "Włącz styl ścieżki",
+    "App key" : "Klucz aplikacji",
+    "App secret" : "Hasło aplikacji",
+    "Host" : "Host",
+    "Username" : "Nazwa użytkownika",
+    "Password" : "Hasło",
+    "Root" : "Root",
+    "Secure ftps://" : "Bezpieczny ftps://",
+    "Client ID" : "ID klienta",
+    "Client secret" : "Hasło klienta",
+    "OpenStack Object Storage" : "Magazyn obiektów OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Region (opcjonalny dla magazynu obiektów OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Klucz API (wymagany dla plików Rackspace Cloud)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Hasło (wymagane dla magazynu obiektów OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Czas nieaktywności żądania HTTP w sekundach",
+    "Share" : "Udostępnij",
+    "SMB / CIFS using OC login" : "SMB / CIFS przy użyciu loginu OC",
+    "Username as share" : "Użytkownik jako zasób",
+    "URL" : "URL",
+    "Secure https://" : "Bezpieczny https://",
+    "Remote subfolder" : "Zdalny podfolder",
+    "Access granted" : "Dostęp do",
+    "Error configuring Dropbox storage" : "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
+    "Grant access" : "Udziel dostępu",
+    "Error configuring Google Drive storage" : "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
+    "Personal" : "Osobiste",
+    "System" : "System",
+    "All users. Type to select user or group." : "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
+    "(group)" : "(grupa)",
+    "Saved" : "Zapisano",
+    "<b>Note:</b> " : "<b>Uwaga:</b> ",
+    " and " : "oraz",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
+    "You don't have any external storages" : "Nie masz żadnych zewnętrznych magazynów",
+    "Name" : "Nazwa",
+    "Storage type" : "Typ magazynu",
+    "Scope" : "Zakres",
+    "External Storage" : "Zewnętrzna zasoby dyskowe",
+    "Folder name" : "Nazwa folderu",
+    "Configuration" : "Konfiguracja",
+    "Available for" : "Dostępne przez",
+    "Add storage" : "Dodaj zasoby dyskowe",
+    "Delete" : "Usuń",
+    "Enable User External Storage" : "Włącz zewnętrzne zasoby dyskowe użytkownika",
+    "Allow users to mount the following external storage" : "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe"
+},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
deleted file mode 100644
index cbbdc9b9ebd..00000000000
--- a/apps/files_external/l10n/pl.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Otrzymano błędne żądanie tokenów. Sprawdź, czy klucz aplikacji oraz klucz poufny Dropbox'a są poprawne.",
-"Please provide a valid Dropbox app key and secret." => "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
-"Step 1 failed. Exception: %s" => "Krok 1 błędny. Błąd: %s",
-"Step 2 failed. Exception: %s" => "Krok 2 błędny. Błąd: %s",
-"External storage" => "Zewnętrzne zasoby dyskowe",
-"Local" => "Lokalny",
-"Location" => "Lokalizacja",
-"Amazon S3" => "Amazon S3",
-"Key" => "Klucz",
-"Secret" => "Hasło",
-"Bucket" => "Kosz",
-"Amazon S3 and compliant" => "Amazon S3 i zgodne",
-"Access Key" => "Klucz dostępu",
-"Secret Key" => "Klucz hasła",
-"Hostname" => "Nazwa serwera",
-"Port" => "Port",
-"Region" => "Region",
-"Enable SSL" => "Włącz SSL",
-"Enable Path Style" => "Włącz styl ścieżki",
-"App key" => "Klucz aplikacji",
-"App secret" => "Hasło aplikacji",
-"Host" => "Host",
-"Username" => "Nazwa użytkownika",
-"Password" => "Hasło",
-"Root" => "Root",
-"Secure ftps://" => "Bezpieczny ftps://",
-"Client ID" => "ID klienta",
-"Client secret" => "Hasło klienta",
-"OpenStack Object Storage" => "Magazyn obiektów OpenStack",
-"Region (optional for OpenStack Object Storage)" => "Region (opcjonalny dla magazynu obiektów OpenStack)",
-"API Key (required for Rackspace Cloud Files)" => "Klucz API (wymagany dla plików Rackspace Cloud)",
-"Tenantname (required for OpenStack Object Storage)" => "Nazwa najemcy (wymagana dla magazynu obiektów OpenStack)",
-"Password (required for OpenStack Object Storage)" => "Hasło (wymagane dla magazynu obiektów OpenStack)",
-"Service Name (required for OpenStack Object Storage)" => "Nazwa usługi (wymagana dla magazynu obiektów OpenStack)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL lub zakończenie jednostki (wymagane dla magazynu obiektów OpenStack)",
-"Timeout of HTTP requests in seconds" => "Czas nieaktywności żądania HTTP w sekundach",
-"Share" => "Udostępnij",
-"SMB / CIFS using OC login" => "SMB / CIFS przy użyciu loginu OC",
-"Username as share" => "Użytkownik jako zasób",
-"URL" => "URL",
-"Secure https://" => "Bezpieczny https://",
-"Remote subfolder" => "Zdalny podfolder",
-"Access granted" => "Dostęp do",
-"Error configuring Dropbox storage" => "Wystąpił błąd podczas konfigurowania zasobu Dropbox",
-"Grant access" => "Udziel dostępu",
-"Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
-"Personal" => "Osobiste",
-"System" => "System",
-"All users. Type to select user or group." => "Wszyscy użytkownicy. Zacznij pisać, aby wybrać użytkownika lub grupę.",
-"(group)" => "(grupa)",
-"Saved" => "Zapisano",
-"<b>Note:</b> " => "<b>Uwaga:</b> ",
-" and " => "oraz",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Uwaga:</b> Wsparcie dla cURL w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Uwaga:</b> Wsparcie dla FTP w PHP nie zostało włączone lub zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Uwaga:</b> \"%s\" nie jest zainstalowane. Zamontowanie %s nie jest możliwe. Proszę poproś Twojego administratora o zainstalowanie go.",
-"You don't have any external storages" => "Nie masz żadnych zewnętrznych magazynów",
-"Name" => "Nazwa",
-"Storage type" => "Typ magazynu",
-"Scope" => "Zakres",
-"External Storage" => "Zewnętrzna zasoby dyskowe",
-"Folder name" => "Nazwa folderu",
-"Configuration" => "Konfiguracja",
-"Available for" => "Dostępne przez",
-"Add storage" => "Dodaj zasoby dyskowe",
-"Delete" => "Usuń",
-"Enable User External Storage" => "Włącz zewnętrzne zasoby dyskowe użytkownika",
-"Allow users to mount the following external storage" => "Pozwól użytkownikom montować następujące zewnętrzne zasoby dyskowe"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/pt_BR.js b/apps/files_external/l10n/pt_BR.js
new file mode 100644
index 00000000000..e9ec582e182
--- /dev/null
+++ b/apps/files_external/l10n/pt_BR.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de fichas de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de tokens de acesso falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
+    "Please provide a valid Dropbox app key and secret." : "Por favor forneça uma chave de aplicativo e segurança válidos para o Dropbox",
+    "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
+    "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
+    "External storage" : "Armazenamento Externo",
+    "Local" : "Local",
+    "Location" : "Localização",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Chave",
+    "Secret" : "Segredo",
+    "Bucket" : "Cesta",
+    "Amazon S3 and compliant" : "Amazon S3 e compatível",
+    "Access Key" : "Chave de Acesso",
+    "Secret Key" : "Chave Secreta",
+    "Hostname" : "Nome do Host",
+    "Port" : "Porta",
+    "Region" : "Região",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo do Caminho",
+    "App key" : "Chave do Aplicativo",
+    "App secret" : "Segredo da Aplicação",
+    "Host" : "Host",
+    "Username" : "Nome de Usuário",
+    "Password" : "Senha",
+    "Root" : "Raiz",
+    "Secure ftps://" : "Seguro ftps://",
+    "Client ID" : "ID do Cliente",
+    "Client secret" : "Segredo do cliente",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Região (opcional para armazenamento de objetos OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Senha (necessário para armazenamento de objetos OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Tempo de vencimento do pedido HTTP em segundos",
+    "Share" : "Compartilhar",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
+    "Username as share" : "Nome de usuário como compartilhado",
+    "URL" : "URL",
+    "Secure https://" : "https:// segura",
+    "Remote subfolder" : "Subpasta remota",
+    "Access granted" : "Acesso concedido",
+    "Error configuring Dropbox storage" : "Erro ao configurar armazenamento do Dropbox",
+    "Grant access" : "Permitir acesso",
+    "Error configuring Google Drive storage" : "Erro ao configurar armazenamento do Google Drive",
+    "Personal" : "Pessoal",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Salvo",
+    "<b>Note:</b> " : "<b>Nota:</b>",
+    " and " : "e",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
+    "You don't have any external storages" : "Você não tem nenhuma armazenamento externa",
+    "Name" : "Nome",
+    "Storage type" : "Tipo de armazenamento",
+    "Scope" : "Escopo",
+    "External Storage" : "Armazenamento Externo",
+    "Folder name" : "Nome da pasta",
+    "Configuration" : "Configuração",
+    "Available for" : "Disponível para",
+    "Add storage" : "Adicionar Armazenamento",
+    "Delete" : "Excluir",
+    "Enable User External Storage" : "Habilitar Armazenamento Externo do Usuário",
+    "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_external/l10n/pt_BR.json b/apps/files_external/l10n/pt_BR.json
new file mode 100644
index 00000000000..9f0907b9d20
--- /dev/null
+++ b/apps/files_external/l10n/pt_BR.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de fichas de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "A busca de tokens de acesso falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
+    "Please provide a valid Dropbox app key and secret." : "Por favor forneça uma chave de aplicativo e segurança válidos para o Dropbox",
+    "Step 1 failed. Exception: %s" : "Passo 1 falhou. Exceção: %s",
+    "Step 2 failed. Exception: %s" : "Passo 2 falhou. Exceção: %s",
+    "External storage" : "Armazenamento Externo",
+    "Local" : "Local",
+    "Location" : "Localização",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Chave",
+    "Secret" : "Segredo",
+    "Bucket" : "Cesta",
+    "Amazon S3 and compliant" : "Amazon S3 e compatível",
+    "Access Key" : "Chave de Acesso",
+    "Secret Key" : "Chave Secreta",
+    "Hostname" : "Nome do Host",
+    "Port" : "Porta",
+    "Region" : "Região",
+    "Enable SSL" : "Habilitar SSL",
+    "Enable Path Style" : "Habilitar Estilo do Caminho",
+    "App key" : "Chave do Aplicativo",
+    "App secret" : "Segredo da Aplicação",
+    "Host" : "Host",
+    "Username" : "Nome de Usuário",
+    "Password" : "Senha",
+    "Root" : "Raiz",
+    "Secure ftps://" : "Seguro ftps://",
+    "Client ID" : "ID do Cliente",
+    "Client secret" : "Segredo do cliente",
+    "OpenStack Object Storage" : "Armazenamento de Objetos OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Região (opcional para armazenamento de objetos OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Senha (necessário para armazenamento de objetos OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Tempo de vencimento do pedido HTTP em segundos",
+    "Share" : "Compartilhar",
+    "SMB / CIFS using OC login" : "SMB / CIFS usando OC login",
+    "Username as share" : "Nome de usuário como compartilhado",
+    "URL" : "URL",
+    "Secure https://" : "https:// segura",
+    "Remote subfolder" : "Subpasta remota",
+    "Access granted" : "Acesso concedido",
+    "Error configuring Dropbox storage" : "Erro ao configurar armazenamento do Dropbox",
+    "Grant access" : "Permitir acesso",
+    "Error configuring Google Drive storage" : "Erro ao configurar armazenamento do Google Drive",
+    "Personal" : "Pessoal",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Todos os usuários. Digite para selecionar usuário ou grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Salvo",
+    "<b>Note:</b> " : "<b>Nota:</b>",
+    " and " : "e",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
+    "You don't have any external storages" : "Você não tem nenhuma armazenamento externa",
+    "Name" : "Nome",
+    "Storage type" : "Tipo de armazenamento",
+    "Scope" : "Escopo",
+    "External Storage" : "Armazenamento Externo",
+    "Folder name" : "Nome da pasta",
+    "Configuration" : "Configuração",
+    "Available for" : "Disponível para",
+    "Add storage" : "Adicionar Armazenamento",
+    "Delete" : "Excluir",
+    "Enable User External Storage" : "Habilitar Armazenamento Externo do Usuário",
+    "Allow users to mount the following external storage" : "Permitir que usuários montem o seguinte armazenamento externo"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/pt_BR.php b/apps/files_external/l10n/pt_BR.php
deleted file mode 100644
index ef0c2642396..00000000000
--- a/apps/files_external/l10n/pt_BR.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "A busca de fichas de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "A busca de tokens de acesso falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-"Please provide a valid Dropbox app key and secret." => "Por favor forneça uma chave de aplicativo e segurança válidos para o Dropbox",
-"Step 1 failed. Exception: %s" => "Passo 1 falhou. Exceção: %s",
-"Step 2 failed. Exception: %s" => "Passo 2 falhou. Exceção: %s",
-"External storage" => "Armazenamento Externo",
-"Local" => "Local",
-"Location" => "Localização",
-"Amazon S3" => "Amazon S3",
-"Key" => "Chave",
-"Secret" => "Segredo",
-"Bucket" => "Cesta",
-"Amazon S3 and compliant" => "Amazon S3 e compatível",
-"Access Key" => "Chave de Acesso",
-"Secret Key" => "Chave Secreta",
-"Hostname" => "Nome do Host",
-"Port" => "Porta",
-"Region" => "Região",
-"Enable SSL" => "Habilitar SSL",
-"Enable Path Style" => "Habilitar Estilo do Caminho",
-"App key" => "Chave do Aplicativo",
-"App secret" => "Segredo da Aplicação",
-"Host" => "Host",
-"Username" => "Nome de Usuário",
-"Password" => "Senha",
-"Root" => "Raiz",
-"Secure ftps://" => "Seguro ftps://",
-"Client ID" => "ID do Cliente",
-"Client secret" => "Segredo do cliente",
-"OpenStack Object Storage" => "Armazenamento de Objetos OpenStack",
-"Region (optional for OpenStack Object Storage)" => "Região (opcional para armazenamento de objetos OpenStack)",
-"API Key (required for Rackspace Cloud Files)" => "Chave API (necessário para Rackspace Cloud File)",
-"Tenantname (required for OpenStack Object Storage)" => "Nome Tenant (necessário para armazenamento de objetos OpenStack)",
-"Password (required for OpenStack Object Storage)" => "Senha (necessário para armazenamento de objetos OpenStack)",
-"Service Name (required for OpenStack Object Storage)" => "Nome do Serviço (necessário para armazenamento de objetos OpenStack)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "Ponto final de identidade da URL (obrigatório para armazenamento de objetos OpenStack)",
-"Timeout of HTTP requests in seconds" => "Tempo de vencimento do pedido HTTP em segundos",
-"Share" => "Compartilhar",
-"SMB / CIFS using OC login" => "SMB / CIFS usando OC login",
-"Username as share" => "Nome de usuário como compartilhado",
-"URL" => "URL",
-"Secure https://" => "https:// segura",
-"Remote subfolder" => "Subpasta remota",
-"Access granted" => "Acesso concedido",
-"Error configuring Dropbox storage" => "Erro ao configurar armazenamento do Dropbox",
-"Grant access" => "Permitir acesso",
-"Error configuring Google Drive storage" => "Erro ao configurar armazenamento do Google Drive",
-"Personal" => "Pessoal",
-"System" => "Sistema",
-"All users. Type to select user or group." => "Todos os usuários. Digite para selecionar usuário ou grupo.",
-"(group)" => "(grupo)",
-"Saved" => "Salvo",
-"<b>Note:</b> " => "<b>Nota:</b>",
-" and " => "e",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> O suporte cURL do PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> O suporte FTP no PHP não está habilitado ou instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Nota:</b> \"%s\" não está instalado. Montagem de %s não é possível. Por favor, solicite ao seu administrador do sistema para instalá-lo.",
-"You don't have any external storages" => "Você não tem nenhuma armazenamento externa",
-"Name" => "Nome",
-"Storage type" => "Tipo de armazenamento",
-"Scope" => "Escopo",
-"External Storage" => "Armazenamento Externo",
-"Folder name" => "Nome da pasta",
-"Configuration" => "Configuração",
-"Available for" => "Disponível para",
-"Add storage" => "Adicionar Armazenamento",
-"Delete" => "Excluir",
-"Enable User External Storage" => "Habilitar Armazenamento Externo do Usuário",
-"Allow users to mount the following external storage" => "Permitir que usuários montem o seguinte armazenamento externo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/pt_PT.js b/apps/files_external/l10n/pt_PT.js
new file mode 100644
index 00000000000..2d3f342e9e9
--- /dev/null
+++ b/apps/files_external/l10n/pt_PT.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de solicitação falhou.  Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
+    "Please provide a valid Dropbox app key and secret." : "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
+    "Step 1 failed. Exception: %s" : "Passo 1 falhou. Excepção: %s",
+    "Step 2 failed. Exception: %s" : "Passo 2 falhou. Excepção: %s",
+    "External storage" : "Armazenamento Externo",
+    "Local" : "Local",
+    "Location" : "Local",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Chave",
+    "Secret" : "Secreto",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 e compatível",
+    "Access Key" : "Chave de acesso",
+    "Secret Key" : "Chave Secreta",
+    "Hostname" : "Hostname",
+    "Port" : "Porta",
+    "Region" : "Região",
+    "Enable SSL" : "Activar SSL",
+    "Enable Path Style" : "Ativar Estilo do Caminho",
+    "App key" : "Chave da aplicação",
+    "App secret" : "Chave secreta da aplicação",
+    "Host" : "Endereço",
+    "Username" : "Nome de utilizador",
+    "Password" : "Palavra-passe",
+    "Root" : "Raiz",
+    "Secure ftps://" : "ftps:// Seguro",
+    "Client ID" : "ID Cliente",
+    "Client secret" : "Segredo do cliente",
+    "OpenStack Object Storage" : "Armazenamento de objetos OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Senha (necessária para OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Timeout de pedidos HTTP em segundos",
+    "Share" : "Partilhar",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
+    "Username as share" : "Utilizar nome de utilizador como partilha",
+    "URL" : "URL",
+    "Secure https://" : "https:// Seguro",
+    "Remote subfolder" : "Sub-pasta remota ",
+    "Access granted" : "Acesso autorizado",
+    "Error configuring Dropbox storage" : "Erro ao configurar o armazenamento do Dropbox",
+    "Grant access" : "Conceder acesso",
+    "Error configuring Google Drive storage" : "Erro ao configurar o armazenamento do Google Drive",
+    "Personal" : "Pessoal",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Todos os utilizadores. Digite para seleccionar utilizador ou grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Guardado",
+    "<b>Note:</b> " : "<b>Aviso:</b> ",
+    " and " : "e",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
+    "You don't have any external storages" : "Não possui quaisquer armazenamentos externos",
+    "Name" : "Nome",
+    "Storage type" : "Tipo de Armazenamento",
+    "Scope" : "Âmbito",
+    "External Storage" : "Armazenamento Externo",
+    "Folder name" : "Nome da pasta",
+    "Configuration" : "Configuração",
+    "Available for" : "Disponível para ",
+    "Add storage" : "Adicionar armazenamento",
+    "Delete" : "Eliminar",
+    "Enable User External Storage" : "Activar Armazenamento Externo para o Utilizador",
+    "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/pt_PT.json b/apps/files_external/l10n/pt_PT.json
new file mode 100644
index 00000000000..cee9e1b7f1a
--- /dev/null
+++ b/apps/files_external/l10n/pt_PT.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de solicitação falhou.  Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "O pedido de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
+    "Please provide a valid Dropbox app key and secret." : "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
+    "Step 1 failed. Exception: %s" : "Passo 1 falhou. Excepção: %s",
+    "Step 2 failed. Exception: %s" : "Passo 2 falhou. Excepção: %s",
+    "External storage" : "Armazenamento Externo",
+    "Local" : "Local",
+    "Location" : "Local",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Chave",
+    "Secret" : "Secreto",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 e compatível",
+    "Access Key" : "Chave de acesso",
+    "Secret Key" : "Chave Secreta",
+    "Hostname" : "Hostname",
+    "Port" : "Porta",
+    "Region" : "Região",
+    "Enable SSL" : "Activar SSL",
+    "Enable Path Style" : "Ativar Estilo do Caminho",
+    "App key" : "Chave da aplicação",
+    "App secret" : "Chave secreta da aplicação",
+    "Host" : "Endereço",
+    "Username" : "Nome de utilizador",
+    "Password" : "Palavra-passe",
+    "Root" : "Raiz",
+    "Secure ftps://" : "ftps:// Seguro",
+    "Client ID" : "ID Cliente",
+    "Client secret" : "Segredo do cliente",
+    "OpenStack Object Storage" : "Armazenamento de objetos OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Região (opcional para OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Chave API (necessário para Rackspace Cloud File)",
+    "Tenantname (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Senha (necessária para OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Nome do Serviço (necessário para OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Timeout de pedidos HTTP em segundos",
+    "Share" : "Partilhar",
+    "SMB / CIFS using OC login" : "SMB / CIFS utilizando o início de sessão OC",
+    "Username as share" : "Utilizar nome de utilizador como partilha",
+    "URL" : "URL",
+    "Secure https://" : "https:// Seguro",
+    "Remote subfolder" : "Sub-pasta remota ",
+    "Access granted" : "Acesso autorizado",
+    "Error configuring Dropbox storage" : "Erro ao configurar o armazenamento do Dropbox",
+    "Grant access" : "Conceder acesso",
+    "Error configuring Google Drive storage" : "Erro ao configurar o armazenamento do Google Drive",
+    "Personal" : "Pessoal",
+    "System" : "Sistema",
+    "All users. Type to select user or group." : "Todos os utilizadores. Digite para seleccionar utilizador ou grupo.",
+    "(group)" : "(grupo)",
+    "Saved" : "Guardado",
+    "<b>Note:</b> " : "<b>Aviso:</b> ",
+    " and " : "e",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
+    "You don't have any external storages" : "Não possui quaisquer armazenamentos externos",
+    "Name" : "Nome",
+    "Storage type" : "Tipo de Armazenamento",
+    "Scope" : "Âmbito",
+    "External Storage" : "Armazenamento Externo",
+    "Folder name" : "Nome da pasta",
+    "Configuration" : "Configuração",
+    "Available for" : "Disponível para ",
+    "Add storage" : "Adicionar armazenamento",
+    "Delete" : "Eliminar",
+    "Enable User External Storage" : "Activar Armazenamento Externo para o Utilizador",
+    "Allow users to mount the following external storage" : "Permitir que os utilizadores montem o seguinte armazenamento externo"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/pt_PT.php b/apps/files_external/l10n/pt_PT.php
deleted file mode 100644
index 185b5ef6cee..00000000000
--- a/apps/files_external/l10n/pt_PT.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "O pedido de solicitação falhou.  Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "O pedido de solicitação falhou. Verifique se a sua chave de aplicativo Dropbox e o segredo estão corretos.",
-"Please provide a valid Dropbox app key and secret." => "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas.",
-"Step 1 failed. Exception: %s" => "Passo 1 falhou. Excepção: %s",
-"Step 2 failed. Exception: %s" => "Passo 2 falhou. Excepção: %s",
-"External storage" => "Armazenamento Externo",
-"Local" => "Local",
-"Location" => "Local",
-"Amazon S3" => "Amazon S3",
-"Key" => "Chave",
-"Secret" => "Secreto",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 e compatível",
-"Access Key" => "Chave de acesso",
-"Secret Key" => "Chave Secreta",
-"Hostname" => "Hostname",
-"Port" => "Porta",
-"Region" => "Região",
-"Enable SSL" => "Activar SSL",
-"Enable Path Style" => "Ativar Estilo do Caminho",
-"App key" => "Chave da aplicação",
-"App secret" => "Chave secreta da aplicação",
-"Host" => "Endereço",
-"Username" => "Nome de utilizador",
-"Password" => "Palavra-passe",
-"Root" => "Raiz",
-"Secure ftps://" => "ftps:// Seguro",
-"Client ID" => "ID Cliente",
-"Client secret" => "Segredo do cliente",
-"OpenStack Object Storage" => "Armazenamento de objetos OpenStack",
-"Region (optional for OpenStack Object Storage)" => "Região (opcional para OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "Chave API (necessário para Rackspace Cloud File)",
-"Tenantname (required for OpenStack Object Storage)" => "Nome do Serviço (necessário para OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Senha (necessária para OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Nome do Serviço (necessário para OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "Nome do Serviço (necessário para OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Timeout de pedidos HTTP em segundos",
-"Share" => "Partilhar",
-"SMB / CIFS using OC login" => "SMB / CIFS utilizando o início de sessão OC",
-"Username as share" => "Utilizar nome de utilizador como partilha",
-"URL" => "URL",
-"Secure https://" => "https:// Seguro",
-"Remote subfolder" => "Sub-pasta remota ",
-"Access granted" => "Acesso autorizado",
-"Error configuring Dropbox storage" => "Erro ao configurar o armazenamento do Dropbox",
-"Grant access" => "Conceder acesso",
-"Error configuring Google Drive storage" => "Erro ao configurar o armazenamento do Google Drive",
-"Personal" => "Pessoal",
-"System" => "Sistema",
-"All users. Type to select user or group." => "Todos os utilizadores. Digite para seleccionar utilizador ou grupo.",
-"(group)" => "(grupo)",
-"Saved" => "Guardado",
-"<b>Note:</b> " => "<b>Aviso:</b> ",
-" and " => "e",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte cURL no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O suporte FTP no PHP não está activo ou instalado. Não é possível montar %s. Peça ao seu administrador para instalar.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Aviso:</b> O cliente\"%s\" não está instalado. Não é possível montar \"%s\" . Peça ao seu administrador para instalar.",
-"You don't have any external storages" => "Não possui quaisquer armazenamentos externos",
-"Name" => "Nome",
-"Storage type" => "Tipo de Armazenamento",
-"Scope" => "Âmbito",
-"External Storage" => "Armazenamento Externo",
-"Folder name" => "Nome da pasta",
-"Configuration" => "Configuração",
-"Available for" => "Disponível para ",
-"Add storage" => "Adicionar armazenamento",
-"Delete" => "Eliminar",
-"Enable User External Storage" => "Activar Armazenamento Externo para o Utilizador",
-"Allow users to mount the following external storage" => "Permitir que os utilizadores montem o seguinte armazenamento externo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ro.js b/apps/files_external/l10n/ro.js
new file mode 100644
index 00000000000..b98fd2557b6
--- /dev/null
+++ b/apps/files_external/l10n/ro.js
@@ -0,0 +1,32 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Prezintă te rog o cheie de Dropbox validă și parola",
+    "External storage" : "Stocare externă",
+    "Location" : "Locație",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "Portul",
+    "Region" : "Regiune",
+    "Host" : "Gazdă",
+    "Username" : "Nume utilizator",
+    "Password" : "Parolă",
+    "Root" : "Root",
+    "Share" : "Partajează",
+    "URL" : "URL",
+    "Access granted" : "Acces permis",
+    "Error configuring Dropbox storage" : "Eroare la configurarea mediului de stocare Dropbox",
+    "Grant access" : "Permite accesul",
+    "Error configuring Google Drive storage" : "Eroare la configurarea mediului de stocare Google Drive",
+    "Personal" : "Personal",
+    "Saved" : "Salvat",
+    "Name" : "Nume",
+    "Storage type" : "Tip stocare",
+    "External Storage" : "Stocare externă",
+    "Folder name" : "Denumire director",
+    "Configuration" : "Configurație",
+    "Add storage" : "Adauga stocare",
+    "Delete" : "Șterge",
+    "Enable User External Storage" : "Permite stocare externă pentru utilizatori",
+    "Allow users to mount the following external storage" : "Permite utilizatorilor să monteze următoarea unitate de stocare"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files_external/l10n/ro.json b/apps/files_external/l10n/ro.json
new file mode 100644
index 00000000000..a0e03679958
--- /dev/null
+++ b/apps/files_external/l10n/ro.json
@@ -0,0 +1,30 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Prezintă te rog o cheie de Dropbox validă și parola",
+    "External storage" : "Stocare externă",
+    "Location" : "Locație",
+    "Amazon S3" : "Amazon S3",
+    "Port" : "Portul",
+    "Region" : "Regiune",
+    "Host" : "Gazdă",
+    "Username" : "Nume utilizator",
+    "Password" : "Parolă",
+    "Root" : "Root",
+    "Share" : "Partajează",
+    "URL" : "URL",
+    "Access granted" : "Acces permis",
+    "Error configuring Dropbox storage" : "Eroare la configurarea mediului de stocare Dropbox",
+    "Grant access" : "Permite accesul",
+    "Error configuring Google Drive storage" : "Eroare la configurarea mediului de stocare Google Drive",
+    "Personal" : "Personal",
+    "Saved" : "Salvat",
+    "Name" : "Nume",
+    "Storage type" : "Tip stocare",
+    "External Storage" : "Stocare externă",
+    "Folder name" : "Denumire director",
+    "Configuration" : "Configurație",
+    "Add storage" : "Adauga stocare",
+    "Delete" : "Șterge",
+    "Enable User External Storage" : "Permite stocare externă pentru utilizatori",
+    "Allow users to mount the following external storage" : "Permite utilizatorilor să monteze următoarea unitate de stocare"
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ro.php b/apps/files_external/l10n/ro.php
deleted file mode 100644
index 1aa9ecdef55..00000000000
--- a/apps/files_external/l10n/ro.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Prezintă te rog o cheie de Dropbox validă și parola",
-"External storage" => "Stocare externă",
-"Location" => "Locație",
-"Amazon S3" => "Amazon S3",
-"Port" => "Portul",
-"Region" => "Regiune",
-"Host" => "Gazdă",
-"Username" => "Nume utilizator",
-"Password" => "Parolă",
-"Root" => "Root",
-"Share" => "Partajează",
-"URL" => "URL",
-"Access granted" => "Acces permis",
-"Error configuring Dropbox storage" => "Eroare la configurarea mediului de stocare Dropbox",
-"Grant access" => "Permite accesul",
-"Error configuring Google Drive storage" => "Eroare la configurarea mediului de stocare Google Drive",
-"Personal" => "Personal",
-"Saved" => "Salvat",
-"Name" => "Nume",
-"Storage type" => "Tip stocare",
-"External Storage" => "Stocare externă",
-"Folder name" => "Denumire director",
-"Configuration" => "Configurație",
-"Add storage" => "Adauga stocare",
-"Delete" => "Șterge",
-"Enable User External Storage" => "Permite stocare externă pentru utilizatori",
-"Allow users to mount the following external storage" => "Permite utilizatorilor să monteze următoarea unitate de stocare"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_external/l10n/ru.js b/apps/files_external/l10n/ru.js
new file mode 100644
index 00000000000..35eec150d01
--- /dev/null
+++ b/apps/files_external/l10n/ru.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токенов. Проверьте правильность вашего ключа приложения и секретного ключа.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токена доступа.  Проверьте правильность вашего ключа приложения и секретного ключа.",
+    "Please provide a valid Dropbox app key and secret." : "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
+    "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
+    "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
+    "External storage" : "Внешнее хранилище",
+    "Local" : "Локально",
+    "Location" : "Местоположение",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Ключ",
+    "Secret" : "Секрет",
+    "Bucket" : "Корзина",
+    "Amazon S3 and compliant" : "Amazon S3 и совместимый",
+    "Access Key" : "Ключ доступа",
+    "Secret Key" : "Секретный ключ",
+    "Hostname" : "Имя хоста",
+    "Port" : "Порт",
+    "Region" : "Область",
+    "Enable SSL" : "Включить SSL",
+    "Enable Path Style" : "Включить стиль пути",
+    "App key" : "Ключ приложения",
+    "App secret" : "Секретный ключ ",
+    "Host" : "Сервер",
+    "Username" : "Имя пользователя",
+    "Password" : "Пароль",
+    "Root" : "Корневой каталог",
+    "Secure ftps://" : "Защищённый ftps://",
+    "Client ID" : "Идентификатор клиента",
+    "Client secret" : "Клиентский ключ ",
+    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Регион (необяз. для Хранилища объектов OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обяз. для Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Пароль (обяз. для Хранилища объектов OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
+    "Share" : "Открыть доступ",
+    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
+    "Username as share" : "Имя для открытого доступа",
+    "URL" : "Ссылка",
+    "Secure https://" : "Безопасный https://",
+    "Remote subfolder" : "Удаленный подкаталог",
+    "Access granted" : "Доступ предоставлен",
+    "Error configuring Dropbox storage" : "Ошибка при настройке хранилища Dropbox",
+    "Grant access" : "Предоставить доступ",
+    "Error configuring Google Drive storage" : "Ошибка при настройке хранилища Google Drive",
+    "Personal" : "Личное",
+    "System" : "Система",
+    "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
+    "(group)" : "(группа)",
+    "Saved" : "Сохранено",
+    "<b>Note:</b> " : "<b>Примечание:</b> ",
+    " and " : "и",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
+    "You don't have any external storages" : "У вас нет внешних хранилищ",
+    "Name" : "Имя",
+    "Storage type" : "Тип хранилища",
+    "Scope" : "Область",
+    "External Storage" : "Внешнее хранилище",
+    "Folder name" : "Имя папки",
+    "Configuration" : "Конфигурация",
+    "Available for" : "Доступно для",
+    "Add storage" : "Добавить хранилище",
+    "Delete" : "Удалить",
+    "Enable User External Storage" : "Включить пользовательские внешние носители",
+    "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующее внешнее хранилище данных"
+},
+"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/ru.json b/apps/files_external/l10n/ru.json
new file mode 100644
index 00000000000..85b9bf38e4c
--- /dev/null
+++ b/apps/files_external/l10n/ru.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токенов. Проверьте правильность вашего ключа приложения и секретного ключа.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Ошибка при получении токена доступа.  Проверьте правильность вашего ключа приложения и секретного ключа.",
+    "Please provide a valid Dropbox app key and secret." : "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
+    "Step 1 failed. Exception: %s" : "Шаг 1 неудачен. Исключение: %s",
+    "Step 2 failed. Exception: %s" : "Шаг 2 неудачен. Исключение: %s",
+    "External storage" : "Внешнее хранилище",
+    "Local" : "Локально",
+    "Location" : "Местоположение",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Ключ",
+    "Secret" : "Секрет",
+    "Bucket" : "Корзина",
+    "Amazon S3 and compliant" : "Amazon S3 и совместимый",
+    "Access Key" : "Ключ доступа",
+    "Secret Key" : "Секретный ключ",
+    "Hostname" : "Имя хоста",
+    "Port" : "Порт",
+    "Region" : "Область",
+    "Enable SSL" : "Включить SSL",
+    "Enable Path Style" : "Включить стиль пути",
+    "App key" : "Ключ приложения",
+    "App secret" : "Секретный ключ ",
+    "Host" : "Сервер",
+    "Username" : "Имя пользователя",
+    "Password" : "Пароль",
+    "Root" : "Корневой каталог",
+    "Secure ftps://" : "Защищённый ftps://",
+    "Client ID" : "Идентификатор клиента",
+    "Client secret" : "Клиентский ключ ",
+    "OpenStack Object Storage" : "Хранилище объектов OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Регион (необяз. для Хранилища объектов OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обяз. для Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Пароль (обяз. для Хранилища объектов OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Имя Службы (обяз. для Хранилища объектов OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP-запросов в секундах",
+    "Share" : "Открыть доступ",
+    "SMB / CIFS using OC login" : "SMB / CIFS с ипользованием логина OC",
+    "Username as share" : "Имя для открытого доступа",
+    "URL" : "Ссылка",
+    "Secure https://" : "Безопасный https://",
+    "Remote subfolder" : "Удаленный подкаталог",
+    "Access granted" : "Доступ предоставлен",
+    "Error configuring Dropbox storage" : "Ошибка при настройке хранилища Dropbox",
+    "Grant access" : "Предоставить доступ",
+    "Error configuring Google Drive storage" : "Ошибка при настройке хранилища Google Drive",
+    "Personal" : "Личное",
+    "System" : "Система",
+    "All users. Type to select user or group." : "Все пользователи. Введите имя пользователя или группы.",
+    "(group)" : "(группа)",
+    "Saved" : "Сохранено",
+    "<b>Note:</b> " : "<b>Примечание:</b> ",
+    " and " : "и",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примечание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
+    "You don't have any external storages" : "У вас нет внешних хранилищ",
+    "Name" : "Имя",
+    "Storage type" : "Тип хранилища",
+    "Scope" : "Область",
+    "External Storage" : "Внешнее хранилище",
+    "Folder name" : "Имя папки",
+    "Configuration" : "Конфигурация",
+    "Available for" : "Доступно для",
+    "Add storage" : "Добавить хранилище",
+    "Delete" : "Удалить",
+    "Enable User External Storage" : "Включить пользовательские внешние носители",
+    "Allow users to mount the following external storage" : "Разрешить пользователям монтировать следующее внешнее хранилище данных"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
deleted file mode 100644
index a1be3a7a7cf..00000000000
--- a/apps/files_external/l10n/ru.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Ошибка при получении токенов. Проверьте правильность вашего ключа приложения и секретного ключа.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Ошибка при получении токена доступа.  Проверьте правильность вашего ключа приложения и секретного ключа.",
-"Please provide a valid Dropbox app key and secret." => "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
-"Step 1 failed. Exception: %s" => "Шаг 1 неудачен. Исключение: %s",
-"Step 2 failed. Exception: %s" => "Шаг 2 неудачен. Исключение: %s",
-"External storage" => "Внешнее хранилище",
-"Local" => "Локально",
-"Location" => "Местоположение",
-"Amazon S3" => "Amazon S3",
-"Key" => "Ключ",
-"Secret" => "Секрет",
-"Bucket" => "Корзина",
-"Amazon S3 and compliant" => "Amazon S3 и совместимый",
-"Access Key" => "Ключ доступа",
-"Secret Key" => "Секретный ключ",
-"Hostname" => "Имя хоста",
-"Port" => "Порт",
-"Region" => "Область",
-"Enable SSL" => "Включить SSL",
-"Enable Path Style" => "Включить стиль пути",
-"App key" => "Ключ приложения",
-"App secret" => "Секретный ключ ",
-"Host" => "Сервер",
-"Username" => "Имя пользователя",
-"Password" => "Пароль",
-"Root" => "Корневой каталог",
-"Secure ftps://" => "Защищённый ftps://",
-"Client ID" => "Идентификатор клиента",
-"Client secret" => "Клиентский ключ ",
-"OpenStack Object Storage" => "Хранилище объектов OpenStack",
-"Region (optional for OpenStack Object Storage)" => "Регион (необяз. для Хранилища объектов OpenStack)",
-"API Key (required for Rackspace Cloud Files)" => "Ключ API (обяз. для Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Имя арендатора (обяз. для Хранилища объектов OpenStack)",
-"Password (required for OpenStack Object Storage)" => "Пароль (обяз. для Хранилища объектов OpenStack)",
-"Service Name (required for OpenStack Object Storage)" => "Имя Службы (обяз. для Хранилища объектов OpenStack)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL для удостоверения конечной точки (обяз. для Хранилища объектов OpenStack)",
-"Timeout of HTTP requests in seconds" => "Тайм-аут HTTP-запросов в секундах",
-"Share" => "Открыть доступ",
-"SMB / CIFS using OC login" => "SMB / CIFS с ипользованием логина OC",
-"Username as share" => "Имя для открытого доступа",
-"URL" => "Ссылка",
-"Secure https://" => "Безопасный https://",
-"Remote subfolder" => "Удаленный подкаталог",
-"Access granted" => "Доступ предоставлен",
-"Error configuring Dropbox storage" => "Ошибка при настройке хранилища Dropbox",
-"Grant access" => "Предоставить доступ",
-"Error configuring Google Drive storage" => "Ошибка при настройке хранилища Google Drive",
-"Personal" => "Личное",
-"System" => "Система",
-"All users. Type to select user or group." => "Все пользователи. Введите имя пользователя или группы.",
-"(group)" => "(группа)",
-"Saved" => "Сохранено",
-"<b>Note:</b> " => "<b>Примечание:</b> ",
-" and " => "и",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примечание:</b> Поддержка cURL в PHP не включена или не установлена. Монтирование %s невозможно. Обратитесь к вашему системному администратору.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примечание:</b> Поддержка FTP в PHP не включена или не установлена. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примечание:</b> \"%s\" не установлен. Монтирование %s невозможно. Пожалуйста, обратитесь к системному администратору.",
-"You don't have any external storages" => "У вас нет внешних хранилищ",
-"Name" => "Имя",
-"Storage type" => "Тип хранилища",
-"Scope" => "Область",
-"External Storage" => "Внешнее хранилище",
-"Folder name" => "Имя папки",
-"Configuration" => "Конфигурация",
-"Available for" => "Доступно для",
-"Add storage" => "Добавить хранилище",
-"Delete" => "Удалить",
-"Enable User External Storage" => "Включить пользовательские внешние носители",
-"Allow users to mount the following external storage" => "Разрешить пользователям монтировать следующее внешнее хранилище данных"
-);
-$PLURAL_FORMS = "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/si_LK.js b/apps/files_external/l10n/si_LK.js
new file mode 100644
index 00000000000..61ce19641bd
--- /dev/null
+++ b/apps/files_external/l10n/si_LK.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
+    "Location" : "ස්ථානය",
+    "Port" : "තොට",
+    "Region" : "කළාපය",
+    "Host" : "සත්කාරකය",
+    "Username" : "පරිශීලක නම",
+    "Password" : "මුර පදය",
+    "Share" : "බෙදා හදා ගන්න",
+    "URL" : "URL",
+    "Access granted" : "පිවිසීමට හැක",
+    "Error configuring Dropbox storage" : "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
+    "Grant access" : "පිවිසුම ලබාදෙන්න",
+    "Error configuring Google Drive storage" : "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
+    "Personal" : "පෞද්ගලික",
+    "Name" : "නම",
+    "External Storage" : "භාහිර ගබඩාව",
+    "Folder name" : "ෆොල්ඩරයේ නම",
+    "Configuration" : "වින්‍යාසය",
+    "Delete" : "මකා දමන්න",
+    "Enable User External Storage" : "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/si_LK.json b/apps/files_external/l10n/si_LK.json
new file mode 100644
index 00000000000..d9554fdb970
--- /dev/null
+++ b/apps/files_external/l10n/si_LK.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
+    "Location" : "ස්ථානය",
+    "Port" : "තොට",
+    "Region" : "කළාපය",
+    "Host" : "සත්කාරකය",
+    "Username" : "පරිශීලක නම",
+    "Password" : "මුර පදය",
+    "Share" : "බෙදා හදා ගන්න",
+    "URL" : "URL",
+    "Access granted" : "පිවිසීමට හැක",
+    "Error configuring Dropbox storage" : "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
+    "Grant access" : "පිවිසුම ලබාදෙන්න",
+    "Error configuring Google Drive storage" : "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
+    "Personal" : "පෞද්ගලික",
+    "Name" : "නම",
+    "External Storage" : "භාහිර ගබඩාව",
+    "Folder name" : "ෆොල්ඩරයේ නම",
+    "Configuration" : "වින්‍යාසය",
+    "Delete" : "මකා දමන්න",
+    "Enable User External Storage" : "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
deleted file mode 100644
index b8dfc559b3b..00000000000
--- a/apps/files_external/l10n/si_LK.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
-"Location" => "ස්ථානය",
-"Port" => "තොට",
-"Region" => "කළාපය",
-"Host" => "සත්කාරකය",
-"Username" => "පරිශීලක නම",
-"Password" => "මුර පදය",
-"Share" => "බෙදා හදා ගන්න",
-"URL" => "URL",
-"Access granted" => "පිවිසීමට හැක",
-"Error configuring Dropbox storage" => "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
-"Grant access" => "පිවිසුම ලබාදෙන්න",
-"Error configuring Google Drive storage" => "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
-"Personal" => "පෞද්ගලික",
-"Name" => "නම",
-"External Storage" => "භාහිර ගබඩාව",
-"Folder name" => "ෆොල්ඩරයේ නම",
-"Configuration" => "වින්‍යාසය",
-"Delete" => "මකා දමන්න",
-"Enable User External Storage" => "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/sk_SK.js b/apps/files_external/l10n/sk_SK.js
new file mode 100644
index 00000000000..636953c42ea
--- /dev/null
+++ b/apps/files_external/l10n/sk_SK.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie tokenov požiadavky zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie prístupových tokenov zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
+    "Please provide a valid Dropbox app key and secret." : "Zadajte platný kľúč aplikácie a heslo Dropbox",
+    "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
+    "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
+    "External storage" : "Externé úložisko",
+    "Local" : "Lokálny",
+    "Location" : "Umiestnenie",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Kľúč",
+    "Secret" : "Tajné",
+    "Bucket" : "Sektor",
+    "Amazon S3 and compliant" : "Amazon S3 a kompatibilné",
+    "Access Key" : "Prístupový kľúč",
+    "Secret Key" : "Tajný kľúč",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Región",
+    "Enable SSL" : "Povoliť SSL",
+    "Enable Path Style" : "Povoliť štýl cesty",
+    "App key" : "Kľúč aplikácie",
+    "App secret" : "Heslo aplikácie",
+    "Host" : "Hostiteľ",
+    "Username" : "Používateľské meno",
+    "Password" : "Heslo",
+    "Root" : "Root",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Heslo klienta",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (požadované pre OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadaviek v sekundách",
+    "Share" : "Zdieľať",
+    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
+    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
+    "URL" : "URL",
+    "Secure https://" : "Zabezpečené https://",
+    "Remote subfolder" : "Vzdialený podpriečinok",
+    "Access granted" : "Prístup povolený",
+    "Error configuring Dropbox storage" : "Chyba pri konfigurácii úložiska Dropbox",
+    "Grant access" : "Povoliť prístup",
+    "Error configuring Google Drive storage" : "Chyba pri konfigurácii úložiska Google drive",
+    "Personal" : "Osobné",
+    "System" : "Systém",
+    "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é",
+    "<b>Note:</b> " : "<b>Poznámka:</b> ",
+    " and " : "a",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+    "You don't have any external storages" : "Nemáte žiadne externé úložisko",
+    "Name" : "Názov",
+    "Storage type" : "Typ úložiska",
+    "Scope" : "Rozsah",
+    "External Storage" : "Externé úložisko",
+    "Folder name" : "Názov priečinka",
+    "Configuration" : "Nastavenia",
+    "Available for" : "K dispozícii pre",
+    "Add storage" : "Pridať úložisko",
+    "Delete" : "Zmazať",
+    "Enable User External Storage" : "Povoliť externé úložisko",
+    "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_external/l10n/sk_SK.json b/apps/files_external/l10n/sk_SK.json
new file mode 100644
index 00000000000..5d2ca0a95a0
--- /dev/null
+++ b/apps/files_external/l10n/sk_SK.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie tokenov požiadavky zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Získanie prístupových tokenov zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
+    "Please provide a valid Dropbox app key and secret." : "Zadajte platný kľúč aplikácie a heslo Dropbox",
+    "Step 1 failed. Exception: %s" : "Krok 1 zlyhal. Výnimka: %s",
+    "Step 2 failed. Exception: %s" : "Krok 2 zlyhal. Výnimka: %s",
+    "External storage" : "Externé úložisko",
+    "Local" : "Lokálny",
+    "Location" : "Umiestnenie",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Kľúč",
+    "Secret" : "Tajné",
+    "Bucket" : "Sektor",
+    "Amazon S3 and compliant" : "Amazon S3 a kompatibilné",
+    "Access Key" : "Prístupový kľúč",
+    "Secret Key" : "Tajný kľúč",
+    "Hostname" : "Hostname",
+    "Port" : "Port",
+    "Region" : "Región",
+    "Enable SSL" : "Povoliť SSL",
+    "Enable Path Style" : "Povoliť štýl cesty",
+    "App key" : "Kľúč aplikácie",
+    "App secret" : "Heslo aplikácie",
+    "Host" : "Hostiteľ",
+    "Username" : "Používateľské meno",
+    "Password" : "Heslo",
+    "Root" : "Root",
+    "Secure ftps://" : "Zabezpečené ftps://",
+    "Client ID" : "Client ID",
+    "Client secret" : "Heslo klienta",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Región (voliteľné pre OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API Key (požadované pre Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (požadované pre OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Heslo (požadované pre OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Meno služby (požadované pre OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (požadované pre OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Časový limit HTTP požadaviek v sekundách",
+    "Share" : "Zdieľať",
+    "SMB / CIFS using OC login" : "SMB / CIFS s použitím OC prihlásenia",
+    "Username as share" : "Používateľské meno ako zdieľaný priečinok",
+    "URL" : "URL",
+    "Secure https://" : "Zabezpečené https://",
+    "Remote subfolder" : "Vzdialený podpriečinok",
+    "Access granted" : "Prístup povolený",
+    "Error configuring Dropbox storage" : "Chyba pri konfigurácii úložiska Dropbox",
+    "Grant access" : "Povoliť prístup",
+    "Error configuring Google Drive storage" : "Chyba pri konfigurácii úložiska Google drive",
+    "Personal" : "Osobné",
+    "System" : "Systém",
+    "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é",
+    "<b>Note:</b> " : "<b>Poznámka:</b> ",
+    " and " : "a",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
+    "You don't have any external storages" : "Nemáte žiadne externé úložisko",
+    "Name" : "Názov",
+    "Storage type" : "Typ úložiska",
+    "Scope" : "Rozsah",
+    "External Storage" : "Externé úložisko",
+    "Folder name" : "Názov priečinka",
+    "Configuration" : "Nastavenia",
+    "Available for" : "K dispozícii pre",
+    "Add storage" : "Pridať úložisko",
+    "Delete" : "Zmazať",
+    "Enable User External Storage" : "Povoliť externé úložisko",
+    "Allow users to mount the following external storage" : "Povoliť používateľom pripojiť tieto externé úložiská"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
deleted file mode 100644
index 0662e207da8..00000000000
--- a/apps/files_external/l10n/sk_SK.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Získanie tokenov požiadavky zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Získanie prístupových tokenov zlyhalo. Overte správnosť svojho kľúča a hesla aplikácie Dropbox.",
-"Please provide a valid Dropbox app key and secret." => "Zadajte platný kľúč aplikácie a heslo Dropbox",
-"Step 1 failed. Exception: %s" => "Krok 1 zlyhal. Výnimka: %s",
-"Step 2 failed. Exception: %s" => "Krok 2 zlyhal. Výnimka: %s",
-"External storage" => "Externé úložisko",
-"Local" => "Lokálny",
-"Location" => "Umiestnenie",
-"Amazon S3" => "Amazon S3",
-"Key" => "Kľúč",
-"Secret" => "Tajné",
-"Bucket" => "Sektor",
-"Amazon S3 and compliant" => "Amazon S3 a kompatibilné",
-"Access Key" => "Prístupový kľúč",
-"Secret Key" => "Tajný kľúč",
-"Hostname" => "Hostname",
-"Port" => "Port",
-"Region" => "Región",
-"Enable SSL" => "Povoliť SSL",
-"Enable Path Style" => "Povoliť štýl cesty",
-"App key" => "Kľúč aplikácie",
-"App secret" => "Heslo aplikácie",
-"Host" => "Hostiteľ",
-"Username" => "Používateľské meno",
-"Password" => "Heslo",
-"Root" => "Root",
-"Secure ftps://" => "Zabezpečené ftps://",
-"Client ID" => "Client ID",
-"Client secret" => "Heslo klienta",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Región (voliteľné pre OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API Key (požadované pre Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Tenantname (požadované pre OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Heslo (požadované pre OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Meno služby (požadované pre OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL of identity endpoint (požadované pre OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Časový limit HTTP požadaviek v sekundách",
-"Share" => "Zdieľať",
-"SMB / CIFS using OC login" => "SMB / CIFS s použitím OC prihlásenia",
-"Username as share" => "Používateľské meno ako zdieľaný priečinok",
-"URL" => "URL",
-"Secure https://" => "Zabezpečené https://",
-"Remote subfolder" => "Vzdialený podpriečinok",
-"Access granted" => "Prístup povolený",
-"Error configuring Dropbox storage" => "Chyba pri konfigurácii úložiska Dropbox",
-"Grant access" => "Povoliť prístup",
-"Error configuring Google Drive storage" => "Chyba pri konfigurácii úložiska Google drive",
-"Personal" => "Osobné",
-"System" => "Systém",
-"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é",
-"<b>Note:</b> " => "<b>Poznámka:</b> ",
-" and " => "a",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> cURL podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> FTP podpora v PHP nie je zapnutá alebo nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Poznámka:</b> \"%s\" nie je nainštalovaná. Pripojenie %s nie je možné. Požiadajte správcu systému, aby ju nainštaloval.",
-"You don't have any external storages" => "Nemáte žiadne externé úložisko",
-"Name" => "Názov",
-"Storage type" => "Typ úložiska",
-"Scope" => "Rozsah",
-"External Storage" => "Externé úložisko",
-"Folder name" => "Názov priečinka",
-"Configuration" => "Nastavenia",
-"Available for" => "K dispozícii pre",
-"Add storage" => "Pridať úložisko",
-"Delete" => "Zmazať",
-"Enable User External Storage" => "Povoliť externé úložisko",
-"Allow users to mount the following external storage" => "Povoliť používateľom pripojiť tieto externé úložiská"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_external/l10n/sl.js b/apps/files_external/l10n/sl.js
new file mode 100644
index 00000000000..690fd9ae322
--- /dev/null
+++ b/apps/files_external/l10n/sl.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za zahteve je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za dostop je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
+    "Please provide a valid Dropbox app key and secret." : "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
+    "Step 1 failed. Exception: %s" : "1. korak je spodletel. Izjemna napaka: %s",
+    "Step 2 failed. Exception: %s" : "2. korak je spodletel. Izjemna napaka: %s",
+    "External storage" : "Zunanja shramba",
+    "Local" : "Krajevno",
+    "Location" : "Mesto",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Ključ",
+    "Secret" : "Skrivni ključ",
+    "Bucket" : "Pomnilniško vedro",
+    "Amazon S3 and compliant" : "Amazon S3 in podobno",
+    "Access Key" : "Ključ za dostop",
+    "Secret Key" : "Skrivni ključ",
+    "Hostname" : "Ime gostitelja",
+    "Port" : "Vrata",
+    "Region" : "Območje",
+    "Enable SSL" : "Omogoči SSL",
+    "Enable Path Style" : "Omogoči slog poti",
+    "App key" : "Programski ključ",
+    "App secret" : "Skrivni programski ključ",
+    "Host" : "Gostitelj",
+    "Username" : "Uporabniško ime",
+    "Password" : "Geslo",
+    "Root" : "Koren",
+    "Secure ftps://" : "Varni način ftps://",
+    "Client ID" : "ID odjemalca",
+    "Client secret" : "Skrivni ključ odjemalca",
+    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Območje (zahtevano za shrambo predmeta OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
+    "Tenantname (required for OpenStack Object Storage)" : "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Geslo (zahtevano za shrambo predmeta OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Časovni zamik zahtev HTTP v sekundah",
+    "Share" : "Souporaba",
+    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
+    "Username as share" : "Uporabniško ime za souporabo",
+    "URL" : "Naslov URL",
+    "Secure https://" : "Varni način https://",
+    "Remote subfolder" : "Oddaljena podrejena mapa",
+    "Access granted" : "Dostop je odobren",
+    "Error configuring Dropbox storage" : "Napaka nastavljanja shrambe Dropbox",
+    "Grant access" : "Odobri dostop",
+    "Error configuring Google Drive storage" : "Napaka nastavljanja shrambe Google Drive",
+    "Personal" : "Osebno",
+    "System" : "Sistem",
+    "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
+    "(group)" : "(skupina)",
+    "Saved" : "Shranjeno",
+    "<b>Note:</b> " : "<b>Opomba:</b> ",
+    " and " : "in",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+    "You don't have any external storages" : "Ni navedenih zunanjih shramb",
+    "Name" : "Ime",
+    "Storage type" : "Vrsta shrambe",
+    "Scope" : "Obseg",
+    "External Storage" : "Zunanja podatkovna shramba",
+    "Folder name" : "Ime mape",
+    "Configuration" : "Nastavitve",
+    "Available for" : "Na voljo za",
+    "Add storage" : "Dodaj shrambo",
+    "Delete" : "Izbriši",
+    "Enable User External Storage" : "Omogoči zunanjo uporabniško podatkovno shrambo",
+    "Allow users to mount the following external storage" : "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/files_external/l10n/sl.json b/apps/files_external/l10n/sl.json
new file mode 100644
index 00000000000..c92e9a310d8
--- /dev/null
+++ b/apps/files_external/l10n/sl.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za zahteve je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Pridobivanje žetonov za dostop je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
+    "Please provide a valid Dropbox app key and secret." : "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
+    "Step 1 failed. Exception: %s" : "1. korak je spodletel. Izjemna napaka: %s",
+    "Step 2 failed. Exception: %s" : "2. korak je spodletel. Izjemna napaka: %s",
+    "External storage" : "Zunanja shramba",
+    "Local" : "Krajevno",
+    "Location" : "Mesto",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Ključ",
+    "Secret" : "Skrivni ključ",
+    "Bucket" : "Pomnilniško vedro",
+    "Amazon S3 and compliant" : "Amazon S3 in podobno",
+    "Access Key" : "Ključ za dostop",
+    "Secret Key" : "Skrivni ključ",
+    "Hostname" : "Ime gostitelja",
+    "Port" : "Vrata",
+    "Region" : "Območje",
+    "Enable SSL" : "Omogoči SSL",
+    "Enable Path Style" : "Omogoči slog poti",
+    "App key" : "Programski ključ",
+    "App secret" : "Skrivni programski ključ",
+    "Host" : "Gostitelj",
+    "Username" : "Uporabniško ime",
+    "Password" : "Geslo",
+    "Root" : "Koren",
+    "Secure ftps://" : "Varni način ftps://",
+    "Client ID" : "ID odjemalca",
+    "Client secret" : "Skrivni ključ odjemalca",
+    "OpenStack Object Storage" : "Shramba predmeta OpenStack",
+    "Region (optional for OpenStack Object Storage)" : "Območje (zahtevano za shrambo predmeta OpenStack)",
+    "API Key (required for Rackspace Cloud Files)" : "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
+    "Tenantname (required for OpenStack Object Storage)" : "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
+    "Password (required for OpenStack Object Storage)" : "Geslo (zahtevano za shrambo predmeta OpenStack)",
+    "Service Name (required for OpenStack Object Storage)" : "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
+    "Timeout of HTTP requests in seconds" : "Časovni zamik zahtev HTTP v sekundah",
+    "Share" : "Souporaba",
+    "SMB / CIFS using OC login" : "SMB / CIFS z uporabo prijave OC",
+    "Username as share" : "Uporabniško ime za souporabo",
+    "URL" : "Naslov URL",
+    "Secure https://" : "Varni način https://",
+    "Remote subfolder" : "Oddaljena podrejena mapa",
+    "Access granted" : "Dostop je odobren",
+    "Error configuring Dropbox storage" : "Napaka nastavljanja shrambe Dropbox",
+    "Grant access" : "Odobri dostop",
+    "Error configuring Google Drive storage" : "Napaka nastavljanja shrambe Google Drive",
+    "Personal" : "Osebno",
+    "System" : "Sistem",
+    "All users. Type to select user or group." : "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
+    "(group)" : "(skupina)",
+    "Saved" : "Shranjeno",
+    "<b>Note:</b> " : "<b>Opomba:</b> ",
+    " and " : "in",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
+    "You don't have any external storages" : "Ni navedenih zunanjih shramb",
+    "Name" : "Ime",
+    "Storage type" : "Vrsta shrambe",
+    "Scope" : "Obseg",
+    "External Storage" : "Zunanja podatkovna shramba",
+    "Folder name" : "Ime mape",
+    "Configuration" : "Nastavitve",
+    "Available for" : "Na voljo za",
+    "Add storage" : "Dodaj shrambo",
+    "Delete" : "Izbriši",
+    "Enable User External Storage" : "Omogoči zunanjo uporabniško podatkovno shrambo",
+    "Allow users to mount the following external storage" : "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
+},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/sl.php b/apps/files_external/l10n/sl.php
deleted file mode 100644
index 90d9c234f2b..00000000000
--- a/apps/files_external/l10n/sl.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Pridobivanje žetonov za zahteve je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Pridobivanje žetonov za dostop je spodletelo. Preverite, da sta ključ in skrivno geslo programa Dropbox navedena pravilno.",
-"Please provide a valid Dropbox app key and secret." => "Vpisati je treba veljaven ključ programa in kodo za Dropbox",
-"Step 1 failed. Exception: %s" => "1. korak je spodletel. Izjemna napaka: %s",
-"Step 2 failed. Exception: %s" => "2. korak je spodletel. Izjemna napaka: %s",
-"External storage" => "Zunanja shramba",
-"Local" => "Krajevno",
-"Location" => "Mesto",
-"Amazon S3" => "Amazon S3",
-"Key" => "Ključ",
-"Secret" => "Skrivni ključ",
-"Bucket" => "Pomnilniško vedro",
-"Amazon S3 and compliant" => "Amazon S3 in podobno",
-"Access Key" => "Ključ za dostop",
-"Secret Key" => "Skrivni ključ",
-"Hostname" => "Ime gostitelja",
-"Port" => "Vrata",
-"Region" => "Območje",
-"Enable SSL" => "Omogoči SSL",
-"Enable Path Style" => "Omogoči slog poti",
-"App key" => "Programski ključ",
-"App secret" => "Skrivni programski ključ",
-"Host" => "Gostitelj",
-"Username" => "Uporabniško ime",
-"Password" => "Geslo",
-"Root" => "Koren",
-"Secure ftps://" => "Varni način ftps://",
-"Client ID" => "ID odjemalca",
-"Client secret" => "Skrivni ključ odjemalca",
-"OpenStack Object Storage" => "Shramba predmeta OpenStack",
-"Region (optional for OpenStack Object Storage)" => "Območje (zahtevano za shrambo predmeta OpenStack)",
-"API Key (required for Rackspace Cloud Files)" => "Ključ programskega vmesnika (API) (zahtevan je za datoteke v oblaku Rackspace)",
-"Tenantname (required for OpenStack Object Storage)" => "Ime uporabnika (zahtevano za shrambo predmeta OpenStack)",
-"Password (required for OpenStack Object Storage)" => "Geslo (zahtevano za shrambo predmeta OpenStack)",
-"Service Name (required for OpenStack Object Storage)" => "Ime storitve (zahtevano za shrambo predmeta OpenStack)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "Naslov URL končne točke  uporabnika (zahtevano za shrambo predmeta OpenStack)",
-"Timeout of HTTP requests in seconds" => "Časovni zamik zahtev HTTP v sekundah",
-"Share" => "Souporaba",
-"SMB / CIFS using OC login" => "SMB / CIFS z uporabo prijave OC",
-"Username as share" => "Uporabniško ime za souporabo",
-"URL" => "Naslov URL",
-"Secure https://" => "Varni način https://",
-"Remote subfolder" => "Oddaljena podrejena mapa",
-"Access granted" => "Dostop je odobren",
-"Error configuring Dropbox storage" => "Napaka nastavljanja shrambe Dropbox",
-"Grant access" => "Odobri dostop",
-"Error configuring Google Drive storage" => "Napaka nastavljanja shrambe Google Drive",
-"Personal" => "Osebno",
-"System" => "Sistem",
-"All users. Type to select user or group." => "Vsi uporabniki. Skupino ali uporabnika je mogoče tudi izbrati.",
-"(group)" => "(skupina)",
-"Saved" => "Shranjeno",
-"<b>Note:</b> " => "<b>Opomba:</b> ",
-" and " => "in",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za naslove cURL v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Podpora za protokol FTP v PHP ni omogočena, ali pa ni ustrezno nameščenih programov. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Opomba:</b> Program \"%s\" ni nameščen. Priklapljanje %s ni mogoče. Za pomoč pri namestitvi se obrnite na sistemskega skrbnika.",
-"You don't have any external storages" => "Ni navedenih zunanjih shramb",
-"Name" => "Ime",
-"Storage type" => "Vrsta shrambe",
-"Scope" => "Obseg",
-"External Storage" => "Zunanja podatkovna shramba",
-"Folder name" => "Ime mape",
-"Configuration" => "Nastavitve",
-"Available for" => "Na voljo za",
-"Add storage" => "Dodaj shrambo",
-"Delete" => "Izbriši",
-"Enable User External Storage" => "Omogoči zunanjo uporabniško podatkovno shrambo",
-"Allow users to mount the following external storage" => "Dovoli uporabnikom priklapljanje navedenih zunanjih shramb."
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_external/l10n/sq.js b/apps/files_external/l10n/sq.js
new file mode 100644
index 00000000000..5a8c70406de
--- /dev/null
+++ b/apps/files_external/l10n/sq.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Vendndodhja",
+    "Port" : "Porta",
+    "Host" : "Pritësi",
+    "Username" : "Përdoruesi",
+    "Password" : "fjalëkalim",
+    "Share" : "Ndaj",
+    "URL" : "URL-i",
+    "Personal" : "Personale",
+    "Saved" : "U ruajt",
+    "Name" : "Emri",
+    "Folder name" : "Emri i Skedarit",
+    "Delete" : "Elimino"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/sq.json b/apps/files_external/l10n/sq.json
new file mode 100644
index 00000000000..d2abfb55bf5
--- /dev/null
+++ b/apps/files_external/l10n/sq.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Location" : "Vendndodhja",
+    "Port" : "Porta",
+    "Host" : "Pritësi",
+    "Username" : "Përdoruesi",
+    "Password" : "fjalëkalim",
+    "Share" : "Ndaj",
+    "URL" : "URL-i",
+    "Personal" : "Personale",
+    "Saved" : "U ruajt",
+    "Name" : "Emri",
+    "Folder name" : "Emri i Skedarit",
+    "Delete" : "Elimino"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/sq.php b/apps/files_external/l10n/sq.php
deleted file mode 100644
index 7beb726fc9e..00000000000
--- a/apps/files_external/l10n/sq.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Vendndodhja",
-"Port" => "Porta",
-"Host" => "Pritësi",
-"Username" => "Përdoruesi",
-"Password" => "fjalëkalim",
-"Share" => "Ndaj",
-"URL" => "URL-i",
-"Personal" => "Personale",
-"Saved" => "U ruajt",
-"Name" => "Emri",
-"Folder name" => "Emri i Skedarit",
-"Delete" => "Elimino"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/sr.js b/apps/files_external/l10n/sr.js
new file mode 100644
index 00000000000..790bd598d09
--- /dev/null
+++ b/apps/files_external/l10n/sr.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Локација",
+    "Port" : "Порт",
+    "Region" : "Регија",
+    "Host" : "Домаћин",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "Share" : "Дели",
+    "Personal" : "Лично",
+    "Name" : "Име",
+    "Delete" : "Обриши"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_external/l10n/sr.json b/apps/files_external/l10n/sr.json
new file mode 100644
index 00000000000..fac0889c3dc
--- /dev/null
+++ b/apps/files_external/l10n/sr.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Location" : "Локација",
+    "Port" : "Порт",
+    "Region" : "Регија",
+    "Host" : "Домаћин",
+    "Username" : "Корисничко име",
+    "Password" : "Лозинка",
+    "Share" : "Дели",
+    "Personal" : "Лично",
+    "Name" : "Име",
+    "Delete" : "Обриши"
+},"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_external/l10n/sr.php b/apps/files_external/l10n/sr.php
deleted file mode 100644
index 79650019c79..00000000000
--- a/apps/files_external/l10n/sr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Локација",
-"Port" => "Порт",
-"Region" => "Регија",
-"Host" => "Домаћин",
-"Username" => "Корисничко име",
-"Password" => "Лозинка",
-"Share" => "Дели",
-"Personal" => "Лично",
-"Name" => "Име",
-"Delete" => "Обриши"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/sr@latin.js b/apps/files_external/l10n/sr@latin.js
new file mode 100644
index 00000000000..518d9e3957d
--- /dev/null
+++ b/apps/files_external/l10n/sr@latin.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "Lokacija",
+    "Region" : "Regija",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
+    "Share" : "Podeli",
+    "Personal" : "Lično",
+    "Name" : "Ime",
+    "Delete" : "Obriši"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/apps/files_external/l10n/sr@latin.json b/apps/files_external/l10n/sr@latin.json
new file mode 100644
index 00000000000..9dbfe640d85
--- /dev/null
+++ b/apps/files_external/l10n/sr@latin.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Location" : "Lokacija",
+    "Region" : "Regija",
+    "Username" : "Korisničko ime",
+    "Password" : "Lozinka",
+    "Share" : "Podeli",
+    "Personal" : "Lično",
+    "Name" : "Ime",
+    "Delete" : "Obriš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);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/sr@latin.php b/apps/files_external/l10n/sr@latin.php
deleted file mode 100644
index 3a42d5c34bb..00000000000
--- a/apps/files_external/l10n/sr@latin.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Lokacija",
-"Region" => "Regija",
-"Username" => "Korisničko ime",
-"Password" => "Lozinka",
-"Share" => "Podeli",
-"Personal" => "Lično",
-"Name" => "Ime",
-"Delete" => "Obriši"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/sv.js b/apps/files_external/l10n/sv.js
new file mode 100644
index 00000000000..cb12208c49a
--- /dev/null
+++ b/apps/files_external/l10n/sv.js
@@ -0,0 +1,68 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta access tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta request tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
+    "Please provide a valid Dropbox app key and secret." : "Ange en giltig Dropbox nyckel och hemlighet.",
+    "External storage" : "Extern lagring",
+    "Local" : "Lokal",
+    "Location" : "Plats",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Nyckel",
+    "Secret" : "Hemlig",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 och compliant",
+    "Access Key" : "Accessnyckel",
+    "Secret Key" : "Hemlig nyckel",
+    "Port" : "Port",
+    "Region" : "Län",
+    "Enable SSL" : "Aktivera SSL",
+    "Enable Path Style" : "Aktivera Path Style",
+    "App key" : "App-nyckel",
+    "App secret" : "App-hemlighet",
+    "Host" : "Server",
+    "Username" : "Användarnamn",
+    "Password" : "Lösenord",
+    "Root" : "Root",
+    "Secure ftps://" : "Säker ftps://",
+    "Client ID" : "Klient ID",
+    "Client secret" : "klient secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (valfritt för OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API-nyckel (krävs för Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (krävs för OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Lösenord (krävs för OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Tjänstens namn (krävs för OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
+    "Share" : "Dela",
+    "SMB / CIFS using OC login" : "SMB / CIFS använder OC inloggning",
+    "Username as share" : "Användarnamn till utdelning",
+    "URL" : "URL",
+    "Secure https://" : "Säker https://",
+    "Remote subfolder" : "Fjärrmapp",
+    "Access granted" : "Åtkomst beviljad",
+    "Error configuring Dropbox storage" : "Fel vid konfigurering av Dropbox",
+    "Grant access" : "Bevilja åtkomst",
+    "Error configuring Google Drive storage" : "Fel vid konfigurering av Google Drive",
+    "Personal" : "Personligt",
+    "System" : "System",
+    "Saved" : "Sparad",
+    "<b>Note:</b> " : "<b> OBS: </ b>",
+    " and " : "och",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> cURL stöd i PHP inte är aktiverat eller installeras. 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> Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
+    "You don't have any external storages" : "Du har ingen extern extern lagring",
+    "Name" : "Namn",
+    "Storage type" : "Lagringstyp",
+    "Scope" : "Scope",
+    "External Storage" : "Extern lagring",
+    "Folder name" : "Mappnamn",
+    "Configuration" : "Konfiguration",
+    "Available for" : "Tillgänglig för",
+    "Add storage" : "Lägg till lagring",
+    "Delete" : "Radera",
+    "Enable User External Storage" : "Aktivera extern lagring för användare",
+    "Allow users to mount the following external storage" : "Tillåt användare att montera följande extern lagring"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/sv.json b/apps/files_external/l10n/sv.json
new file mode 100644
index 00000000000..12b9f36fd5d
--- /dev/null
+++ b/apps/files_external/l10n/sv.json
@@ -0,0 +1,66 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta access tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Misslyckades att hämta request tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
+    "Please provide a valid Dropbox app key and secret." : "Ange en giltig Dropbox nyckel och hemlighet.",
+    "External storage" : "Extern lagring",
+    "Local" : "Lokal",
+    "Location" : "Plats",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Nyckel",
+    "Secret" : "Hemlig",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 och compliant",
+    "Access Key" : "Accessnyckel",
+    "Secret Key" : "Hemlig nyckel",
+    "Port" : "Port",
+    "Region" : "Län",
+    "Enable SSL" : "Aktivera SSL",
+    "Enable Path Style" : "Aktivera Path Style",
+    "App key" : "App-nyckel",
+    "App secret" : "App-hemlighet",
+    "Host" : "Server",
+    "Username" : "Användarnamn",
+    "Password" : "Lösenord",
+    "Root" : "Root",
+    "Secure ftps://" : "Säker ftps://",
+    "Client ID" : "Klient ID",
+    "Client secret" : "klient secret",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Region (valfritt för OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "API-nyckel (krävs för Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (krävs för OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Lösenord (krävs för OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Tjänstens namn (krävs för OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
+    "Share" : "Dela",
+    "SMB / CIFS using OC login" : "SMB / CIFS använder OC inloggning",
+    "Username as share" : "Användarnamn till utdelning",
+    "URL" : "URL",
+    "Secure https://" : "Säker https://",
+    "Remote subfolder" : "Fjärrmapp",
+    "Access granted" : "Åtkomst beviljad",
+    "Error configuring Dropbox storage" : "Fel vid konfigurering av Dropbox",
+    "Grant access" : "Bevilja åtkomst",
+    "Error configuring Google Drive storage" : "Fel vid konfigurering av Google Drive",
+    "Personal" : "Personligt",
+    "System" : "System",
+    "Saved" : "Sparad",
+    "<b>Note:</b> " : "<b> OBS: </ b>",
+    " and " : "och",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> cURL stöd i PHP inte är aktiverat eller installeras. 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> Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b> OBS: </ b> \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
+    "You don't have any external storages" : "Du har ingen extern extern lagring",
+    "Name" : "Namn",
+    "Storage type" : "Lagringstyp",
+    "Scope" : "Scope",
+    "External Storage" : "Extern lagring",
+    "Folder name" : "Mappnamn",
+    "Configuration" : "Konfiguration",
+    "Available for" : "Tillgänglig för",
+    "Add storage" : "Lägg till lagring",
+    "Delete" : "Radera",
+    "Enable User External Storage" : "Aktivera extern lagring för användare",
+    "Allow users to mount the following external storage" : "Tillåt användare att montera följande extern lagring"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/sv.php b/apps/files_external/l10n/sv.php
deleted file mode 100644
index 7e19d016ed6..00000000000
--- a/apps/files_external/l10n/sv.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Misslyckades att hämta access tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Misslyckades att hämta request tokens. Verifiera att din Dropbox app-nyckel och app-hemlighet är korrekt",
-"Please provide a valid Dropbox app key and secret." => "Ange en giltig Dropbox nyckel och hemlighet.",
-"External storage" => "Extern lagring",
-"Local" => "Lokal",
-"Location" => "Plats",
-"Amazon S3" => "Amazon S3",
-"Key" => "Nyckel",
-"Secret" => "Hemlig",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 och compliant",
-"Access Key" => "Accessnyckel",
-"Secret Key" => "Hemlig nyckel",
-"Port" => "Port",
-"Region" => "Län",
-"Enable SSL" => "Aktivera SSL",
-"Enable Path Style" => "Aktivera Path Style",
-"App key" => "App-nyckel",
-"App secret" => "App-hemlighet",
-"Host" => "Server",
-"Username" => "Användarnamn",
-"Password" => "Lösenord",
-"Root" => "Root",
-"Secure ftps://" => "Säker ftps://",
-"Client ID" => "Klient ID",
-"Client secret" => "klient secret",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Region (valfritt för OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "API-nyckel (krävs för Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Tenantname (krävs för OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Lösenord (krävs för OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Tjänstens namn (krävs för OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL för identitetens slutpunkt (krävs för OpenStack Object Storage)",
-"Share" => "Dela",
-"SMB / CIFS using OC login" => "SMB / CIFS använder OC inloggning",
-"Username as share" => "Användarnamn till utdelning",
-"URL" => "URL",
-"Secure https://" => "Säker https://",
-"Remote subfolder" => "Fjärrmapp",
-"Access granted" => "Åtkomst beviljad",
-"Error configuring Dropbox storage" => "Fel vid konfigurering av Dropbox",
-"Grant access" => "Bevilja åtkomst",
-"Error configuring Google Drive storage" => "Fel vid konfigurering av Google Drive",
-"Personal" => "Personligt",
-"System" => "System",
-"Saved" => "Sparad",
-"<b>Note:</b> " => "<b> OBS: </ b>",
-" and " => "och",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b> OBS: </ b> cURL stöd i PHP inte är aktiverat eller installeras. 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> Den FTP-stöd i PHP inte är aktiverat eller installeras. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b> OBS: </ b> \"%s\" är inte installerat. Montering av %s är inte möjlig. Be din systemadministratör att installera det.",
-"You don't have any external storages" => "Du har ingen extern extern lagring",
-"Name" => "Namn",
-"Storage type" => "Lagringstyp",
-"Scope" => "Scope",
-"External Storage" => "Extern lagring",
-"Folder name" => "Mappnamn",
-"Configuration" => "Konfiguration",
-"Available for" => "Tillgänglig för",
-"Add storage" => "Lägg till lagring",
-"Delete" => "Radera",
-"Enable User External Storage" => "Aktivera extern lagring för användare",
-"Allow users to mount the following external storage" => "Tillåt användare att montera följande extern lagring"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/ta_LK.js b/apps/files_external/l10n/ta_LK.js
new file mode 100644
index 00000000000..274f2dcf34c
--- /dev/null
+++ b/apps/files_external/l10n/ta_LK.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
+    "Location" : "இடம்",
+    "Port" : "துறை ",
+    "Region" : "பிரதேசம்",
+    "Host" : "ஓம்புனர்",
+    "Username" : "பயனாளர் பெயர்",
+    "Password" : "கடவுச்சொல்",
+    "Share" : "பகிர்வு",
+    "URL" : "URL",
+    "Access granted" : "அனுமதி வழங்கப்பட்டது",
+    "Error configuring Dropbox storage" : "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
+    "Grant access" : "அனுமதியை வழங்கல்",
+    "Error configuring Google Drive storage" : "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
+    "Personal" : "தனிப்பட்ட",
+    "Name" : "பெயர்",
+    "External Storage" : "வெளி சேமிப்பு",
+    "Folder name" : "கோப்புறை பெயர்",
+    "Configuration" : "தகவமைப்பு",
+    "Delete" : "நீக்குக",
+    "Enable User External Storage" : "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/ta_LK.json b/apps/files_external/l10n/ta_LK.json
new file mode 100644
index 00000000000..6d9b600b56b
--- /dev/null
+++ b/apps/files_external/l10n/ta_LK.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
+    "Location" : "இடம்",
+    "Port" : "துறை ",
+    "Region" : "பிரதேசம்",
+    "Host" : "ஓம்புனர்",
+    "Username" : "பயனாளர் பெயர்",
+    "Password" : "கடவுச்சொல்",
+    "Share" : "பகிர்வு",
+    "URL" : "URL",
+    "Access granted" : "அனுமதி வழங்கப்பட்டது",
+    "Error configuring Dropbox storage" : "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
+    "Grant access" : "அனுமதியை வழங்கல்",
+    "Error configuring Google Drive storage" : "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
+    "Personal" : "தனிப்பட்ட",
+    "Name" : "பெயர்",
+    "External Storage" : "வெளி சேமிப்பு",
+    "Folder name" : "கோப்புறை பெயர்",
+    "Configuration" : "தகவமைப்பு",
+    "Delete" : "நீக்குக",
+    "Enable User External Storage" : "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ta_LK.php b/apps/files_external/l10n/ta_LK.php
deleted file mode 100644
index 94cb2faa6d8..00000000000
--- a/apps/files_external/l10n/ta_LK.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "தயவுசெய்து ஒரு செல்லுபடியான Dropbox செயலி சாவி மற்றும் இரகசியத்தை வழங்குக. ",
-"Location" => "இடம்",
-"Port" => "துறை ",
-"Region" => "பிரதேசம்",
-"Host" => "ஓம்புனர்",
-"Username" => "பயனாளர் பெயர்",
-"Password" => "கடவுச்சொல்",
-"Share" => "பகிர்வு",
-"URL" => "URL",
-"Access granted" => "அனுமதி வழங்கப்பட்டது",
-"Error configuring Dropbox storage" => "Dropbox சேமிப்பை தகவமைப்பதில் வழு",
-"Grant access" => "அனுமதியை வழங்கல்",
-"Error configuring Google Drive storage" => "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு",
-"Personal" => "தனிப்பட்ட",
-"Name" => "பெயர்",
-"External Storage" => "வெளி சேமிப்பு",
-"Folder name" => "கோப்புறை பெயர்",
-"Configuration" => "தகவமைப்பு",
-"Delete" => "நீக்குக",
-"Enable User External Storage" => "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/te.js b/apps/files_external/l10n/te.js
new file mode 100644
index 00000000000..b1f0e091c26
--- /dev/null
+++ b/apps/files_external/l10n/te.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Username" : "వాడుకరి పేరు",
+    "Password" : "సంకేతపదం",
+    "Personal" : "వ్యక్తిగతం",
+    "Name" : "పేరు",
+    "Folder name" : "సంచయం పేరు",
+    "Delete" : "తొలగించు"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/te.json b/apps/files_external/l10n/te.json
new file mode 100644
index 00000000000..4a6f3caba86
--- /dev/null
+++ b/apps/files_external/l10n/te.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Username" : "వాడుకరి పేరు",
+    "Password" : "సంకేతపదం",
+    "Personal" : "వ్యక్తిగతం",
+    "Name" : "పేరు",
+    "Folder name" : "సంచయం పేరు",
+    "Delete" : "తొలగించు"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/te.php b/apps/files_external/l10n/te.php
deleted file mode 100644
index 73e828ebfcb..00000000000
--- a/apps/files_external/l10n/te.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Username" => "వాడుకరి పేరు",
-"Password" => "సంకేతపదం",
-"Personal" => "వ్యక్తిగతం",
-"Name" => "పేరు",
-"Folder name" => "సంచయం పేరు",
-"Delete" => "తొలగించు"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/th_TH.js b/apps/files_external/l10n/th_TH.js
new file mode 100644
index 00000000000..a86b399fde0
--- /dev/null
+++ b/apps/files_external/l10n/th_TH.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
+    "Location" : "ตำแหน่งที่อยู่",
+    "Port" : "พอร์ต",
+    "Region" : "พื้นที่",
+    "Host" : "โฮสต์",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Password" : "รหัสผ่าน",
+    "Share" : "แชร์",
+    "URL" : "URL",
+    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
+    "Error configuring Dropbox storage" : "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
+    "Grant access" : "อนุญาตให้เข้าถึงได้",
+    "Error configuring Google Drive storage" : "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
+    "Personal" : "ส่วนตัว",
+    "Name" : "ชื่อ",
+    "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
+    "Folder name" : "ชื่อโฟลเดอร์",
+    "Configuration" : "การกำหนดค่า",
+    "Delete" : "ลบ",
+    "Enable User External Storage" : "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/th_TH.json b/apps/files_external/l10n/th_TH.json
new file mode 100644
index 00000000000..a5612ff444e
--- /dev/null
+++ b/apps/files_external/l10n/th_TH.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
+    "Location" : "ตำแหน่งที่อยู่",
+    "Port" : "พอร์ต",
+    "Region" : "พื้นที่",
+    "Host" : "โฮสต์",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Password" : "รหัสผ่าน",
+    "Share" : "แชร์",
+    "URL" : "URL",
+    "Access granted" : "การเข้าถึงได้รับอนุญาตแล้ว",
+    "Error configuring Dropbox storage" : "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
+    "Grant access" : "อนุญาตให้เข้าถึงได้",
+    "Error configuring Google Drive storage" : "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
+    "Personal" : "ส่วนตัว",
+    "Name" : "ชื่อ",
+    "External Storage" : "พื้นทีจัดเก็บข้อมูลจากภายนอก",
+    "Folder name" : "ชื่อโฟลเดอร์",
+    "Configuration" : "การกำหนดค่า",
+    "Delete" : "ลบ",
+    "Enable User External Storage" : "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/th_TH.php b/apps/files_external/l10n/th_TH.php
deleted file mode 100644
index c2c577e4971..00000000000
--- a/apps/files_external/l10n/th_TH.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "กรุณากรอกรหัส app key ของ Dropbox และรหัสลับ",
-"Location" => "ตำแหน่งที่อยู่",
-"Port" => "พอร์ต",
-"Region" => "พื้นที่",
-"Host" => "โฮสต์",
-"Username" => "ชื่อผู้ใช้งาน",
-"Password" => "รหัสผ่าน",
-"Share" => "แชร์",
-"URL" => "URL",
-"Access granted" => "การเข้าถึงได้รับอนุญาตแล้ว",
-"Error configuring Dropbox storage" => "เกิดข้อผิดพลาดในการกำหนดค่าพื้นที่จัดเก็บข้อมูล Dropbox",
-"Grant access" => "อนุญาตให้เข้าถึงได้",
-"Error configuring Google Drive storage" => "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive",
-"Personal" => "ส่วนตัว",
-"Name" => "ชื่อ",
-"External Storage" => "พื้นทีจัดเก็บข้อมูลจากภายนอก",
-"Folder name" => "ชื่อโฟลเดอร์",
-"Configuration" => "การกำหนดค่า",
-"Delete" => "ลบ",
-"Enable User External Storage" => "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/tr.js b/apps/files_external/l10n/tr.js
new file mode 100644
index 00000000000..cbe240b5818
--- /dev/null
+++ b/apps/files_external/l10n/tr.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "İstek belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Erişim belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
+    "Please provide a valid Dropbox app key and secret." : "Lütfen Dropbox app key ve secret temin ediniz",
+    "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
+    "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
+    "External storage" : "Harici depolama",
+    "Local" : "Yerel",
+    "Location" : "Konum",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Anahtar",
+    "Secret" : "Parola",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 ve uyumlu olanlar",
+    "Access Key" : "Erişim Anahtarı",
+    "Secret Key" : "Gizli Anahtar",
+    "Hostname" : "Makine adı",
+    "Port" : "Port",
+    "Region" : "Bölge",
+    "Enable SSL" : "SSL'yi Etkinleştir",
+    "Enable Path Style" : "Yol Biçemini Etkinleştir",
+    "App key" : "Uyg. anahtarı",
+    "App secret" : "Uyg. parolası",
+    "Host" : "Sunucu",
+    "Username" : "Kullanıcı Adı",
+    "Password" : "Parola",
+    "Root" : "Kök",
+    "Secure ftps://" : "Güvenli ftps://",
+    "Client ID" : "İstemci kimliği",
+    "Client secret" : "İstemci parolası",
+    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
+    "Region (optional for OpenStack Object Storage)" : "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
+    "API Key (required for Rackspace Cloud Files)" : "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
+    "Tenantname (required for OpenStack Object Storage)" : "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
+    "Password (required for OpenStack Object Storage)" : "Parola (OpenStack Nesne Depolaması için gerekli)",
+    "Service Name (required for OpenStack Object Storage)" : "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
+    "Timeout of HTTP requests in seconds" : "Saniye cinsinden HTTP istek zaman aşımı",
+    "Share" : "Paylaş",
+    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
+    "Username as share" : "Paylaşım olarak kullanıcı adı",
+    "URL" : "URL",
+    "Secure https://" : "Güvenli https://",
+    "Remote subfolder" : "Uzak alt klasör",
+    "Access granted" : "Giriş kabul edildi",
+    "Error configuring Dropbox storage" : "Dropbox depo yapılandırma hatası",
+    "Grant access" : "Erişimi sağla",
+    "Error configuring Google Drive storage" : "Google Drive depo yapılandırma hatası",
+    "Personal" : "Kişisel",
+    "System" : "Sistem",
+    "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",
+    "<b>Note:</b> " : "<b>Not:</b> ",
+    " and " : "ve",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
+    "You don't have any external storages" : "Hiç harici depolamanız yok",
+    "Name" : "Ad",
+    "Storage type" : "Depolama türü",
+    "Scope" : "Kapsam",
+    "External Storage" : "Harici Depolama",
+    "Folder name" : "Klasör ismi",
+    "Configuration" : "Yapılandırma",
+    "Available for" : "Kullanabilenler",
+    "Add storage" : "Depo ekle",
+    "Delete" : "Sil",
+    "Enable User External Storage" : "Kullanıcılar için Harici Depolamayı Etkinleştir",
+    "Allow users to mount the following external storage" : "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_external/l10n/tr.json b/apps/files_external/l10n/tr.json
new file mode 100644
index 00000000000..669608cca27
--- /dev/null
+++ b/apps/files_external/l10n/tr.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "İstek belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Erişim belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
+    "Please provide a valid Dropbox app key and secret." : "Lütfen Dropbox app key ve secret temin ediniz",
+    "Step 1 failed. Exception: %s" : "Adım 1 başarısız. Özel durum: %s",
+    "Step 2 failed. Exception: %s" : "Adım 2 başarısız. Özel durum: %s",
+    "External storage" : "Harici depolama",
+    "Local" : "Yerel",
+    "Location" : "Konum",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Anahtar",
+    "Secret" : "Parola",
+    "Bucket" : "Bucket",
+    "Amazon S3 and compliant" : "Amazon S3 ve uyumlu olanlar",
+    "Access Key" : "Erişim Anahtarı",
+    "Secret Key" : "Gizli Anahtar",
+    "Hostname" : "Makine adı",
+    "Port" : "Port",
+    "Region" : "Bölge",
+    "Enable SSL" : "SSL'yi Etkinleştir",
+    "Enable Path Style" : "Yol Biçemini Etkinleştir",
+    "App key" : "Uyg. anahtarı",
+    "App secret" : "Uyg. parolası",
+    "Host" : "Sunucu",
+    "Username" : "Kullanıcı Adı",
+    "Password" : "Parola",
+    "Root" : "Kök",
+    "Secure ftps://" : "Güvenli ftps://",
+    "Client ID" : "İstemci kimliği",
+    "Client secret" : "İstemci parolası",
+    "OpenStack Object Storage" : "OpenStack Nesne Depolama",
+    "Region (optional for OpenStack Object Storage)" : "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
+    "API Key (required for Rackspace Cloud Files)" : "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
+    "Tenantname (required for OpenStack Object Storage)" : "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
+    "Password (required for OpenStack Object Storage)" : "Parola (OpenStack Nesne Depolaması için gerekli)",
+    "Service Name (required for OpenStack Object Storage)" : "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
+    "Timeout of HTTP requests in seconds" : "Saniye cinsinden HTTP istek zaman aşımı",
+    "Share" : "Paylaş",
+    "SMB / CIFS using OC login" : "OC oturumu kullanarak SMB / CIFS",
+    "Username as share" : "Paylaşım olarak kullanıcı adı",
+    "URL" : "URL",
+    "Secure https://" : "Güvenli https://",
+    "Remote subfolder" : "Uzak alt klasör",
+    "Access granted" : "Giriş kabul edildi",
+    "Error configuring Dropbox storage" : "Dropbox depo yapılandırma hatası",
+    "Grant access" : "Erişimi sağla",
+    "Error configuring Google Drive storage" : "Google Drive depo yapılandırma hatası",
+    "Personal" : "Kişisel",
+    "System" : "Sistem",
+    "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",
+    "<b>Note:</b> " : "<b>Not:</b> ",
+    " and " : "ve",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
+    "You don't have any external storages" : "Hiç harici depolamanız yok",
+    "Name" : "Ad",
+    "Storage type" : "Depolama türü",
+    "Scope" : "Kapsam",
+    "External Storage" : "Harici Depolama",
+    "Folder name" : "Klasör ismi",
+    "Configuration" : "Yapılandırma",
+    "Available for" : "Kullanabilenler",
+    "Add storage" : "Depo ekle",
+    "Delete" : "Sil",
+    "Enable User External Storage" : "Kullanıcılar için Harici Depolamayı Etkinleştir",
+    "Allow users to mount the following external storage" : "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
deleted file mode 100644
index 274d4f12487..00000000000
--- a/apps/files_external/l10n/tr.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "İstek belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Erişim belirteçleri alınma işlemi başarısız. Dropbox app anahtarı ve parolasının doğru olduğundan emin olun.",
-"Please provide a valid Dropbox app key and secret." => "Lütfen Dropbox app key ve secret temin ediniz",
-"Step 1 failed. Exception: %s" => "Adım 1 başarısız. Özel durum: %s",
-"Step 2 failed. Exception: %s" => "Adım 2 başarısız. Özel durum: %s",
-"External storage" => "Harici depolama",
-"Local" => "Yerel",
-"Location" => "Konum",
-"Amazon S3" => "Amazon S3",
-"Key" => "Anahtar",
-"Secret" => "Parola",
-"Bucket" => "Bucket",
-"Amazon S3 and compliant" => "Amazon S3 ve uyumlu olanlar",
-"Access Key" => "Erişim Anahtarı",
-"Secret Key" => "Gizli Anahtar",
-"Hostname" => "Makine adı",
-"Port" => "Port",
-"Region" => "Bölge",
-"Enable SSL" => "SSL'yi Etkinleştir",
-"Enable Path Style" => "Yol Biçemini Etkinleştir",
-"App key" => "Uyg. anahtarı",
-"App secret" => "Uyg. parolası",
-"Host" => "Sunucu",
-"Username" => "Kullanıcı Adı",
-"Password" => "Parola",
-"Root" => "Kök",
-"Secure ftps://" => "Güvenli ftps://",
-"Client ID" => "İstemci kimliği",
-"Client secret" => "İstemci parolası",
-"OpenStack Object Storage" => "OpenStack Nesne Depolama",
-"Region (optional for OpenStack Object Storage)" => "Bölge (OpenStack Nesne Depolaması için isteğe bağlı)",
-"API Key (required for Rackspace Cloud Files)" => "API Anahtarı (Rackspace Bulut Dosyaları için gerekli)",
-"Tenantname (required for OpenStack Object Storage)" => "Kiracı Adı (OpenStack Nesne Depolaması için gerekli)",
-"Password (required for OpenStack Object Storage)" => "Parola (OpenStack Nesne Depolaması için gerekli)",
-"Service Name (required for OpenStack Object Storage)" => "Hizmet Adı (OpenStack Nesne Depolaması için gerekli)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "Kimlik uç nokta adresi (OpenStack Nesne Depolaması için gerekli)",
-"Timeout of HTTP requests in seconds" => "Saniye cinsinden HTTP istek zaman aşımı",
-"Share" => "Paylaş",
-"SMB / CIFS using OC login" => "OC oturumu kullanarak SMB / CIFS",
-"Username as share" => "Paylaşım olarak kullanıcı adı",
-"URL" => "URL",
-"Secure https://" => "Güvenli https://",
-"Remote subfolder" => "Uzak alt klasör",
-"Access granted" => "Giriş kabul edildi",
-"Error configuring Dropbox storage" => "Dropbox depo yapılandırma hatası",
-"Grant access" => "Erişimi sağla",
-"Error configuring Google Drive storage" => "Google Drive depo yapılandırma hatası",
-"Personal" => "Kişisel",
-"System" => "Sistem",
-"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",
-"<b>Note:</b> " => "<b>Not:</b> ",
-" and " => "ve",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Not:</b> PHP'de cURL desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Not:</b> PHP'de FTP desteği etkin veya kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Not:</b> \"%s\" kurulu değil. %s bağlaması mümkün olmayacak. Lütfen kurulumu için sistem yöneticilerinizle iletişime geçin.",
-"You don't have any external storages" => "Hiç harici depolamanız yok",
-"Name" => "Ad",
-"Storage type" => "Depolama türü",
-"Scope" => "Kapsam",
-"External Storage" => "Harici Depolama",
-"Folder name" => "Klasör ismi",
-"Configuration" => "Yapılandırma",
-"Available for" => "Kullanabilenler",
-"Add storage" => "Depo ekle",
-"Delete" => "Sil",
-"Enable User External Storage" => "Kullanıcılar için Harici Depolamayı Etkinleştir",
-"Allow users to mount the following external storage" => "Kullanıcıların aşağıdaki harici depolamayı bağlamalarına izin ver"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_external/l10n/ug.js b/apps/files_external/l10n/ug.js
new file mode 100644
index 00000000000..a1a5dc648bc
--- /dev/null
+++ b/apps/files_external/l10n/ug.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "External storage" : "سىرتقى ساقلىغۇچ",
+    "Location" : "ئورنى",
+    "Port" : "ئېغىز",
+    "Host" : "باش ئاپپارات",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "Password" : "ئىم",
+    "Share" : "ھەمبەھىر",
+    "URL" : "URL",
+    "Personal" : "شەخسىي",
+    "Name" : "ئاتى",
+    "Folder name" : "قىسقۇچ ئاتى",
+    "Configuration" : "سەپلىمە",
+    "Delete" : "ئۆچۈر"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/ug.json b/apps/files_external/l10n/ug.json
new file mode 100644
index 00000000000..d6923a86599
--- /dev/null
+++ b/apps/files_external/l10n/ug.json
@@ -0,0 +1,16 @@
+{ "translations": {
+    "External storage" : "سىرتقى ساقلىغۇچ",
+    "Location" : "ئورنى",
+    "Port" : "ئېغىز",
+    "Host" : "باش ئاپپارات",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "Password" : "ئىم",
+    "Share" : "ھەمبەھىر",
+    "URL" : "URL",
+    "Personal" : "شەخسىي",
+    "Name" : "ئاتى",
+    "Folder name" : "قىسقۇچ ئاتى",
+    "Configuration" : "سەپلىمە",
+    "Delete" : "ئۆچۈر"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ug.php b/apps/files_external/l10n/ug.php
deleted file mode 100644
index 134de2af932..00000000000
--- a/apps/files_external/l10n/ug.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"External storage" => "سىرتقى ساقلىغۇچ",
-"Location" => "ئورنى",
-"Port" => "ئېغىز",
-"Host" => "باش ئاپپارات",
-"Username" => "ئىشلەتكۈچى ئاتى",
-"Password" => "ئىم",
-"Share" => "ھەمبەھىر",
-"URL" => "URL",
-"Personal" => "شەخسىي",
-"Name" => "ئاتى",
-"Folder name" => "قىسقۇچ ئاتى",
-"Configuration" => "سەپلىمە",
-"Delete" => "ئۆچۈر"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/uk.js b/apps/files_external/l10n/uk.js
new file mode 100644
index 00000000000..7cf8533fd24
--- /dev/null
+++ b/apps/files_external/l10n/uk.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токенів. Перевірте правильність вашого секретного ключа та ключ додатка.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токена доступу. Перевірте правильність вашого секретного ключа та ключ додатка.",
+    "Please provide a valid Dropbox app key and secret." : "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
+    "Step 1 failed. Exception: %s" : "1-й крок невдалий. Виключення: %s",
+    "Step 2 failed. Exception: %s" : "2-й крок невдалий. Виключення: %s",
+    "External storage" : "Зовнішнє сховище",
+    "Local" : "Локально",
+    "Location" : "Місце",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Ключ",
+    "Secret" : "Секрет",
+    "Bucket" : "Кошик",
+    "Amazon S3 and compliant" : "Amazon S3 та сумісний",
+    "Access Key" : "Ключ доступа",
+    "Secret Key" : "Секретний ключ",
+    "Hostname" : "Ім'я хоста",
+    "Port" : "Порт",
+    "Region" : "Регіон",
+    "Enable SSL" : "Включити SSL",
+    "Enable Path Style" : "Включити стиль шляху",
+    "App key" : "Ключ додатку",
+    "App secret" : "Секретний ключ додатку",
+    "Host" : "Хост",
+    "Username" : "Ім'я користувача",
+    "Password" : "Пароль",
+    "Root" : "Батьківський каталог",
+    "Secure ftps://" : "Захищений ftps://",
+    "Client ID" : "Ідентифікатор клієнта",
+    "Client secret" : "Ключ клієнта",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Регіон (опціонально для OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обов'язково для Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Ім'я орендатора (обов'язково для OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Пароль (обов’язково для OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Назва сервісу (обов’язково для OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL підтвердження кінцевої точки (обов'язково для OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP запитів на секунду",
+    "Share" : "Поділитися",
+    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
+    "Username as share" : "Ім'я для відкритого доступу",
+    "URL" : "URL",
+    "Secure https://" : "Захищений https://",
+    "Remote subfolder" : "Віддалений підкаталог",
+    "Access granted" : "Доступ дозволено",
+    "Error configuring Dropbox storage" : "Помилка при налаштуванні сховища Dropbox",
+    "Grant access" : "Дозволити доступ",
+    "Error configuring Google Drive storage" : "Помилка при налаштуванні сховища Google Drive",
+    "Personal" : "Особисте",
+    "System" : "Система",
+    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
+    "(group)" : "(група)",
+    "Saved" : "Збереженно",
+    "<b>Note:</b> " : "<b>Примітка:</b>",
+    " and " : "та",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
+    "You don't have any external storages" : "У вас немає зовнішніх сховищ",
+    "Name" : "Ім'я",
+    "Storage type" : "Тип сховища",
+    "Scope" : "Область",
+    "External Storage" : "Зовнішні сховища",
+    "Folder name" : "Ім'я теки",
+    "Configuration" : "Налаштування",
+    "Available for" : "Доступний для",
+    "Add storage" : "Додати сховище",
+    "Delete" : "Видалити",
+    "Enable User External Storage" : "Активувати користувацькі зовнішні сховища",
+    "Allow users to mount the following external storage" : "Дозволити користувачам монтувати наступні зовнішні сховища"
+},
+"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/uk.json b/apps/files_external/l10n/uk.json
new file mode 100644
index 00000000000..8ebccaf5c1c
--- /dev/null
+++ b/apps/files_external/l10n/uk.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токенів. Перевірте правильність вашого секретного ключа та ключ додатка.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Помилка при отримані токена доступу. Перевірте правильність вашого секретного ключа та ключ додатка.",
+    "Please provide a valid Dropbox app key and secret." : "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
+    "Step 1 failed. Exception: %s" : "1-й крок невдалий. Виключення: %s",
+    "Step 2 failed. Exception: %s" : "2-й крок невдалий. Виключення: %s",
+    "External storage" : "Зовнішнє сховище",
+    "Local" : "Локально",
+    "Location" : "Місце",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "Ключ",
+    "Secret" : "Секрет",
+    "Bucket" : "Кошик",
+    "Amazon S3 and compliant" : "Amazon S3 та сумісний",
+    "Access Key" : "Ключ доступа",
+    "Secret Key" : "Секретний ключ",
+    "Hostname" : "Ім'я хоста",
+    "Port" : "Порт",
+    "Region" : "Регіон",
+    "Enable SSL" : "Включити SSL",
+    "Enable Path Style" : "Включити стиль шляху",
+    "App key" : "Ключ додатку",
+    "App secret" : "Секретний ключ додатку",
+    "Host" : "Хост",
+    "Username" : "Ім'я користувача",
+    "Password" : "Пароль",
+    "Root" : "Батьківський каталог",
+    "Secure ftps://" : "Захищений ftps://",
+    "Client ID" : "Ідентифікатор клієнта",
+    "Client secret" : "Ключ клієнта",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Регіон (опціонально для OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Ключ API (обов'язково для Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Ім'я орендатора (обов'язково для OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Пароль (обов’язково для OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Назва сервісу (обов’язково для OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL підтвердження кінцевої точки (обов'язково для OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Тайм-аут HTTP запитів на секунду",
+    "Share" : "Поділитися",
+    "SMB / CIFS using OC login" : "SMB / CIFS з використанням логіна OC",
+    "Username as share" : "Ім'я для відкритого доступу",
+    "URL" : "URL",
+    "Secure https://" : "Захищений https://",
+    "Remote subfolder" : "Віддалений підкаталог",
+    "Access granted" : "Доступ дозволено",
+    "Error configuring Dropbox storage" : "Помилка при налаштуванні сховища Dropbox",
+    "Grant access" : "Дозволити доступ",
+    "Error configuring Google Drive storage" : "Помилка при налаштуванні сховища Google Drive",
+    "Personal" : "Особисте",
+    "System" : "Система",
+    "All users. Type to select user or group." : "Всі користувачі. Введіть ім'я користувача або групи.",
+    "(group)" : "(група)",
+    "Saved" : "Збереженно",
+    "<b>Note:</b> " : "<b>Примітка:</b>",
+    " and " : "та",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
+    "You don't have any external storages" : "У вас немає зовнішніх сховищ",
+    "Name" : "Ім'я",
+    "Storage type" : "Тип сховища",
+    "Scope" : "Область",
+    "External Storage" : "Зовнішні сховища",
+    "Folder name" : "Ім'я теки",
+    "Configuration" : "Налаштування",
+    "Available for" : "Доступний для",
+    "Add storage" : "Додати сховище",
+    "Delete" : "Видалити",
+    "Enable User External Storage" : "Активувати користувацькі зовнішні сховища",
+    "Allow users to mount the following external storage" : "Дозволити користувачам монтувати наступні зовнішні сховища"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
deleted file mode 100644
index 2c0c3081a5f..00000000000
--- a/apps/files_external/l10n/uk.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." => "Помилка при отримані токенів. Перевірте правильність вашого секретного ключа та ключ додатка.",
-"Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." => "Помилка при отримані токена доступу. Перевірте правильність вашого секретного ключа та ключ додатка.",
-"Please provide a valid Dropbox app key and secret." => "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
-"Step 1 failed. Exception: %s" => "1-й крок невдалий. Виключення: %s",
-"Step 2 failed. Exception: %s" => "2-й крок невдалий. Виключення: %s",
-"External storage" => "Зовнішнє сховище",
-"Local" => "Локально",
-"Location" => "Місце",
-"Amazon S3" => "Amazon S3",
-"Key" => "Ключ",
-"Secret" => "Секрет",
-"Bucket" => "Кошик",
-"Amazon S3 and compliant" => "Amazon S3 та сумісний",
-"Access Key" => "Ключ доступа",
-"Secret Key" => "Секретний ключ",
-"Hostname" => "Ім'я хоста",
-"Port" => "Порт",
-"Region" => "Регіон",
-"Enable SSL" => "Включити SSL",
-"Enable Path Style" => "Включити стиль шляху",
-"App key" => "Ключ додатку",
-"App secret" => "Секретний ключ додатку",
-"Host" => "Хост",
-"Username" => "Ім'я користувача",
-"Password" => "Пароль",
-"Root" => "Батьківський каталог",
-"Secure ftps://" => "Захищений ftps://",
-"Client ID" => "Ідентифікатор клієнта",
-"Client secret" => "Ключ клієнта",
-"OpenStack Object Storage" => "OpenStack Object Storage",
-"Region (optional for OpenStack Object Storage)" => "Регіон (опціонально для OpenStack Object Storage)",
-"API Key (required for Rackspace Cloud Files)" => "Ключ API (обов'язково для Rackspace Cloud Files)",
-"Tenantname (required for OpenStack Object Storage)" => "Ім'я орендатора (обов'язково для OpenStack Object Storage)",
-"Password (required for OpenStack Object Storage)" => "Пароль (обов’язково для OpenStack Object Storage)",
-"Service Name (required for OpenStack Object Storage)" => "Назва сервісу (обов’язково для OpenStack Object Storage)",
-"URL of identity endpoint (required for OpenStack Object Storage)" => "URL підтвердження кінцевої точки (обов'язково для OpenStack Object Storage)",
-"Timeout of HTTP requests in seconds" => "Тайм-аут HTTP запитів на секунду",
-"Share" => "Поділитися",
-"SMB / CIFS using OC login" => "SMB / CIFS з використанням логіна OC",
-"Username as share" => "Ім'я для відкритого доступу",
-"URL" => "URL",
-"Secure https://" => "Захищений https://",
-"Remote subfolder" => "Віддалений підкаталог",
-"Access granted" => "Доступ дозволено",
-"Error configuring Dropbox storage" => "Помилка при налаштуванні сховища Dropbox",
-"Grant access" => "Дозволити доступ",
-"Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive",
-"Personal" => "Особисте",
-"System" => "Система",
-"All users. Type to select user or group." => "Всі користувачі. Введіть ім'я користувача або групи.",
-"(group)" => "(група)",
-"Saved" => "Збереженно",
-"<b>Note:</b> " => "<b>Примітка:</b>",
-" and " => "та",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примітка:</b> Підтримку cURL в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примітка:</b> Підтримку FTP в PHP не ввімкнено чи не встановлена. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>Примітка:</b> \"%s\" не встановлено. Під'єднатися до %s неможливо. Зверніться до системного адміністратора.",
-"You don't have any external storages" => "У вас немає зовнішніх сховищ",
-"Name" => "Ім'я",
-"Storage type" => "Тип сховища",
-"Scope" => "Область",
-"External Storage" => "Зовнішні сховища",
-"Folder name" => "Ім'я теки",
-"Configuration" => "Налаштування",
-"Available for" => "Доступний для",
-"Add storage" => "Додати сховище",
-"Delete" => "Видалити",
-"Enable User External Storage" => "Активувати користувацькі зовнішні сховища",
-"Allow users to mount the following external storage" => "Дозволити користувачам монтувати наступні зовнішні сховища"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/apps/files_external/l10n/ur_PK.js b/apps/files_external/l10n/ur_PK.js
new file mode 100644
index 00000000000..19554608096
--- /dev/null
+++ b/apps/files_external/l10n/ur_PK.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Location" : "مقام",
+    "Username" : "یوزر نیم",
+    "Password" : "پاسورڈ",
+    "Share" : "تقسیم",
+    "URL" : "یو ار ایل",
+    "Personal" : "شخصی",
+    "Name" : "اسم",
+    "Delete" : "حذف کریں"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_external/l10n/ur_PK.json b/apps/files_external/l10n/ur_PK.json
new file mode 100644
index 00000000000..c4df8947bd7
--- /dev/null
+++ b/apps/files_external/l10n/ur_PK.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Location" : "مقام",
+    "Username" : "یوزر نیم",
+    "Password" : "پاسورڈ",
+    "Share" : "تقسیم",
+    "URL" : "یو ار ایل",
+    "Personal" : "شخصی",
+    "Name" : "اسم",
+    "Delete" : "حذف کریں"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/ur_PK.php b/apps/files_external/l10n/ur_PK.php
deleted file mode 100644
index e5b9089328d..00000000000
--- a/apps/files_external/l10n/ur_PK.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "مقام",
-"Username" => "یوزر نیم",
-"Password" => "پاسورڈ",
-"Share" => "تقسیم",
-"URL" => "یو ار ایل",
-"Personal" => "شخصی",
-"Name" => "اسم",
-"Delete" => "حذف کریں"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_external/l10n/vi.js b/apps/files_external/l10n/vi.js
new file mode 100644
index 00000000000..096ab0713cd
--- /dev/null
+++ b/apps/files_external/l10n/vi.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
+    "External storage" : "Lưu trữ ngoài",
+    "Location" : "Vị trí",
+    "Port" : "Cổng",
+    "Region" : "Vùng/miền",
+    "Host" : "Máy chủ",
+    "Username" : "Tên đăng nhập",
+    "Password" : "Mật khẩu",
+    "Share" : "Chia sẻ",
+    "URL" : "URL",
+    "Access granted" : "Đã cấp quyền truy cập",
+    "Error configuring Dropbox storage" : "Lỗi cấu hình lưu trữ Dropbox ",
+    "Grant access" : "Cấp quyền truy cập",
+    "Error configuring Google Drive storage" : "Lỗi cấu hình lưu trữ Google Drive",
+    "Personal" : "Cá nhân",
+    "Name" : "Tên",
+    "External Storage" : "Lưu trữ ngoài",
+    "Folder name" : "Tên thư mục",
+    "Configuration" : "Cấu hình",
+    "Add storage" : "Thêm bộ nhớ",
+    "Delete" : "Xóa",
+    "Enable User External Storage" : "Kích hoạt tính năng lưu trữ ngoài"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/vi.json b/apps/files_external/l10n/vi.json
new file mode 100644
index 00000000000..135f9cffdf4
--- /dev/null
+++ b/apps/files_external/l10n/vi.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
+    "External storage" : "Lưu trữ ngoài",
+    "Location" : "Vị trí",
+    "Port" : "Cổng",
+    "Region" : "Vùng/miền",
+    "Host" : "Máy chủ",
+    "Username" : "Tên đăng nhập",
+    "Password" : "Mật khẩu",
+    "Share" : "Chia sẻ",
+    "URL" : "URL",
+    "Access granted" : "Đã cấp quyền truy cập",
+    "Error configuring Dropbox storage" : "Lỗi cấu hình lưu trữ Dropbox ",
+    "Grant access" : "Cấp quyền truy cập",
+    "Error configuring Google Drive storage" : "Lỗi cấu hình lưu trữ Google Drive",
+    "Personal" : "Cá nhân",
+    "Name" : "Tên",
+    "External Storage" : "Lưu trữ ngoài",
+    "Folder name" : "Tên thư mục",
+    "Configuration" : "Cấu hình",
+    "Add storage" : "Thêm bộ nhớ",
+    "Delete" : "Xóa",
+    "Enable User External Storage" : "Kích hoạt tính năng lưu trữ ngoài"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
deleted file mode 100644
index 42db3b4a834..00000000000
--- a/apps/files_external/l10n/vi.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã bí mật.",
-"External storage" => "Lưu trữ ngoài",
-"Location" => "Vị trí",
-"Port" => "Cổng",
-"Region" => "Vùng/miền",
-"Host" => "Máy chủ",
-"Username" => "Tên đăng nhập",
-"Password" => "Mật khẩu",
-"Share" => "Chia sẻ",
-"URL" => "URL",
-"Access granted" => "Đã cấp quyền truy cập",
-"Error configuring Dropbox storage" => "Lỗi cấu hình lưu trữ Dropbox ",
-"Grant access" => "Cấp quyền truy cập",
-"Error configuring Google Drive storage" => "Lỗi cấu hình lưu trữ Google Drive",
-"Personal" => "Cá nhân",
-"Name" => "Tên",
-"External Storage" => "Lưu trữ ngoài",
-"Folder name" => "Tên thư mục",
-"Configuration" => "Cấu hình",
-"Add storage" => "Thêm bộ nhớ",
-"Delete" => "Xóa",
-"Enable User External Storage" => "Kích hoạt tính năng lưu trữ ngoài"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_CN.js b/apps/files_external/l10n/zh_CN.js
new file mode 100644
index 00000000000..8c71da68db7
--- /dev/null
+++ b/apps/files_external/l10n/zh_CN.js
@@ -0,0 +1,51 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "请提供有效的Dropbox应用key和secret",
+    "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s",
+    "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s",
+    "External storage" : "外部存储",
+    "Local" : "本地",
+    "Location" : "地点",
+    "Amazon S3" : "Amazon S3",
+    "Amazon S3 and compliant" : "Amazon S3 和兼容协议",
+    "Access Key" : "访问密钥",
+    "Secret Key" : "秘钥",
+    "Port" : "端口",
+    "Region" : "地区",
+    "Enable SSL" : "启用 SSL",
+    "Enable Path Style" : "启用 Path Style",
+    "Host" : "主机",
+    "Username" : "用户名",
+    "Password" : "密码",
+    "Root" : "根路径",
+    "Secure ftps://" : "安全 ftps://",
+    "OpenStack Object Storage" : "OpenStack 对象存储",
+    "Share" : "共享",
+    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
+    "URL" : "URL",
+    "Secure https://" : "安全 https://",
+    "Remote subfolder" : "远程子文件夹",
+    "Access granted" : "权限已授予。",
+    "Error configuring Dropbox storage" : "配置Dropbox存储时出错",
+    "Grant access" : "授权",
+    "Error configuring Google Drive storage" : "配置Google Drive存储时出错",
+    "Personal" : "个人",
+    "System" : "系统",
+    "Saved" : "已保存",
+    "<b>Note:</b> " : "<b>注意：</b>",
+    " and " : "和",
+    "You don't have any external storages" : "您没有外部存储",
+    "Name" : "名称",
+    "Storage type" : "存储类型",
+    "Scope" : "适用范围",
+    "External Storage" : "外部存储",
+    "Folder name" : "目录名称",
+    "Configuration" : "配置",
+    "Available for" : "可用于",
+    "Add storage" : "增加存储",
+    "Delete" : "删除",
+    "Enable User External Storage" : "启用用户外部存储",
+    "Allow users to mount the following external storage" : "允许用户挂载以下外部存储"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/zh_CN.json b/apps/files_external/l10n/zh_CN.json
new file mode 100644
index 00000000000..ba2ca93be86
--- /dev/null
+++ b/apps/files_external/l10n/zh_CN.json
@@ -0,0 +1,49 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "请提供有效的Dropbox应用key和secret",
+    "Step 1 failed. Exception: %s" : "步骤 1 失败。异常：%s",
+    "Step 2 failed. Exception: %s" : "步骤 2 失败。异常：%s",
+    "External storage" : "外部存储",
+    "Local" : "本地",
+    "Location" : "地点",
+    "Amazon S3" : "Amazon S3",
+    "Amazon S3 and compliant" : "Amazon S3 和兼容协议",
+    "Access Key" : "访问密钥",
+    "Secret Key" : "秘钥",
+    "Port" : "端口",
+    "Region" : "地区",
+    "Enable SSL" : "启用 SSL",
+    "Enable Path Style" : "启用 Path Style",
+    "Host" : "主机",
+    "Username" : "用户名",
+    "Password" : "密码",
+    "Root" : "根路径",
+    "Secure ftps://" : "安全 ftps://",
+    "OpenStack Object Storage" : "OpenStack 对象存储",
+    "Share" : "共享",
+    "SMB / CIFS using OC login" : "SMB / CIFS 使用 OC 登录信息",
+    "URL" : "URL",
+    "Secure https://" : "安全 https://",
+    "Remote subfolder" : "远程子文件夹",
+    "Access granted" : "权限已授予。",
+    "Error configuring Dropbox storage" : "配置Dropbox存储时出错",
+    "Grant access" : "授权",
+    "Error configuring Google Drive storage" : "配置Google Drive存储时出错",
+    "Personal" : "个人",
+    "System" : "系统",
+    "Saved" : "已保存",
+    "<b>Note:</b> " : "<b>注意：</b>",
+    " and " : "和",
+    "You don't have any external storages" : "您没有外部存储",
+    "Name" : "名称",
+    "Storage type" : "存储类型",
+    "Scope" : "适用范围",
+    "External Storage" : "外部存储",
+    "Folder name" : "目录名称",
+    "Configuration" : "配置",
+    "Available for" : "可用于",
+    "Add storage" : "增加存储",
+    "Delete" : "删除",
+    "Enable User External Storage" : "启用用户外部存储",
+    "Allow users to mount the following external storage" : "允许用户挂载以下外部存储"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/zh_CN.php b/apps/files_external/l10n/zh_CN.php
deleted file mode 100644
index fcb4fc93445..00000000000
--- a/apps/files_external/l10n/zh_CN.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "请提供有效的Dropbox应用key和secret",
-"Step 1 failed. Exception: %s" => "步骤 1 失败。异常：%s",
-"Step 2 failed. Exception: %s" => "步骤 2 失败。异常：%s",
-"External storage" => "外部存储",
-"Local" => "本地",
-"Location" => "地点",
-"Amazon S3" => "Amazon S3",
-"Amazon S3 and compliant" => "Amazon S3 和兼容协议",
-"Access Key" => "访问密钥",
-"Secret Key" => "秘钥",
-"Port" => "端口",
-"Region" => "地区",
-"Enable SSL" => "启用 SSL",
-"Enable Path Style" => "启用 Path Style",
-"Host" => "主机",
-"Username" => "用户名",
-"Password" => "密码",
-"Root" => "根路径",
-"Secure ftps://" => "安全 ftps://",
-"OpenStack Object Storage" => "OpenStack 对象存储",
-"Share" => "共享",
-"SMB / CIFS using OC login" => "SMB / CIFS 使用 OC 登录信息",
-"URL" => "URL",
-"Secure https://" => "安全 https://",
-"Remote subfolder" => "远程子文件夹",
-"Access granted" => "权限已授予。",
-"Error configuring Dropbox storage" => "配置Dropbox存储时出错",
-"Grant access" => "授权",
-"Error configuring Google Drive storage" => "配置Google Drive存储时出错",
-"Personal" => "个人",
-"System" => "系统",
-"Saved" => "已保存",
-"<b>Note:</b> " => "<b>注意：</b>",
-" and " => "和",
-"You don't have any external storages" => "您没有外部存储",
-"Name" => "名称",
-"Storage type" => "存储类型",
-"Scope" => "适用范围",
-"External Storage" => "外部存储",
-"Folder name" => "目录名称",
-"Configuration" => "配置",
-"Available for" => "可用于",
-"Add storage" => "增加存储",
-"Delete" => "删除",
-"Enable User External Storage" => "启用用户外部存储",
-"Allow users to mount the following external storage" => "允许用户挂载以下外部存储"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_HK.js b/apps/files_external/l10n/zh_HK.js
new file mode 100644
index 00000000000..d8446e4dac6
--- /dev/null
+++ b/apps/files_external/l10n/zh_HK.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Port" : "連接埠",
+    "Username" : "用戶名稱",
+    "Password" : "密碼",
+    "Share" : "分享",
+    "URL" : "網址",
+    "Personal" : "個人",
+    "Saved" : "已儲存",
+    "Name" : "名稱",
+    "Folder name" : "資料夾名稱",
+    "Delete" : "刪除"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/zh_HK.json b/apps/files_external/l10n/zh_HK.json
new file mode 100644
index 00000000000..46d6c0dabe7
--- /dev/null
+++ b/apps/files_external/l10n/zh_HK.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Port" : "連接埠",
+    "Username" : "用戶名稱",
+    "Password" : "密碼",
+    "Share" : "分享",
+    "URL" : "網址",
+    "Personal" : "個人",
+    "Saved" : "已儲存",
+    "Name" : "名稱",
+    "Folder name" : "資料夾名稱",
+    "Delete" : "刪除"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/zh_HK.php b/apps/files_external/l10n/zh_HK.php
deleted file mode 100644
index c7f3f1afd88..00000000000
--- a/apps/files_external/l10n/zh_HK.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Port" => "連接埠",
-"Username" => "用戶名稱",
-"Password" => "密碼",
-"Share" => "分享",
-"URL" => "網址",
-"Personal" => "個人",
-"Saved" => "已儲存",
-"Name" => "名稱",
-"Folder name" => "資料夾名稱",
-"Delete" => "刪除"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_external/l10n/zh_TW.js b/apps/files_external/l10n/zh_TW.js
new file mode 100644
index 00000000000..a1f2d8a226d
--- /dev/null
+++ b/apps/files_external/l10n/zh_TW.js
@@ -0,0 +1,43 @@
+OC.L10N.register(
+    "files_external",
+    {
+    "Please provide a valid Dropbox app key and secret." : "請提供有效的 Dropbox app key 和 app secret 。",
+    "External storage" : "外部儲存",
+    "Local" : "本地",
+    "Location" : "地點",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "鑰",
+    "Secret" : "密",
+    "Secret Key" : "密鑰",
+    "Port" : "連接埠",
+    "Region" : "地區",
+    "Enable SSL" : "啟用 SSL",
+    "Host" : "主機",
+    "Username" : "使用者名稱",
+    "Password" : "密碼",
+    "Share" : "分享",
+    "URL" : "URL",
+    "Access granted" : "允許存取",
+    "Error configuring Dropbox storage" : "設定 Dropbox 儲存時發生錯誤",
+    "Grant access" : "允許存取",
+    "Error configuring Google Drive storage" : "設定 Google Drive 儲存時發生錯誤",
+    "Personal" : "個人",
+    "System" : "系統",
+    "Saved" : "已儲存",
+    "<b>Note:</b> " : "<b>警告:</b> ",
+    " and " : "與",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>並未安裝 \"%s\"，因此無法掛載 %s。請洽您的系統管理員將其安裝並啓用。",
+    "You don't have any external storages" : "您沒有任何外部儲存",
+    "Name" : "名稱",
+    "External Storage" : "外部儲存",
+    "Folder name" : "資料夾名稱",
+    "Configuration" : "設定",
+    "Available for" : "可用的",
+    "Add storage" : "增加儲存區",
+    "Delete" : "刪除",
+    "Enable User External Storage" : "啓用使用者外部儲存",
+    "Allow users to mount the following external storage" : "允許使用者自行掛載以下的外部儲存"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_external/l10n/zh_TW.json b/apps/files_external/l10n/zh_TW.json
new file mode 100644
index 00000000000..03a20a3215e
--- /dev/null
+++ b/apps/files_external/l10n/zh_TW.json
@@ -0,0 +1,41 @@
+{ "translations": {
+    "Please provide a valid Dropbox app key and secret." : "請提供有效的 Dropbox app key 和 app secret 。",
+    "External storage" : "外部儲存",
+    "Local" : "本地",
+    "Location" : "地點",
+    "Amazon S3" : "Amazon S3",
+    "Key" : "鑰",
+    "Secret" : "密",
+    "Secret Key" : "密鑰",
+    "Port" : "連接埠",
+    "Region" : "地區",
+    "Enable SSL" : "啟用 SSL",
+    "Host" : "主機",
+    "Username" : "使用者名稱",
+    "Password" : "密碼",
+    "Share" : "分享",
+    "URL" : "URL",
+    "Access granted" : "允許存取",
+    "Error configuring Dropbox storage" : "設定 Dropbox 儲存時發生錯誤",
+    "Grant access" : "允許存取",
+    "Error configuring Google Drive storage" : "設定 Google Drive 儲存時發生錯誤",
+    "Personal" : "個人",
+    "System" : "系統",
+    "Saved" : "已儲存",
+    "<b>Note:</b> " : "<b>警告:</b> ",
+    " and " : "與",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>警告</b>並未安裝 \"%s\"，因此無法掛載 %s。請洽您的系統管理員將其安裝並啓用。",
+    "You don't have any external storages" : "您沒有任何外部儲存",
+    "Name" : "名稱",
+    "External Storage" : "外部儲存",
+    "Folder name" : "資料夾名稱",
+    "Configuration" : "設定",
+    "Available for" : "可用的",
+    "Add storage" : "增加儲存區",
+    "Delete" : "刪除",
+    "Enable User External Storage" : "啓用使用者外部儲存",
+    "Allow users to mount the following external storage" : "允許使用者自行掛載以下的外部儲存"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_external/l10n/zh_TW.php b/apps/files_external/l10n/zh_TW.php
deleted file mode 100644
index 7dbaebc04d0..00000000000
--- a/apps/files_external/l10n/zh_TW.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Please provide a valid Dropbox app key and secret." => "請提供有效的 Dropbox app key 和 app secret 。",
-"External storage" => "外部儲存",
-"Local" => "本地",
-"Location" => "地點",
-"Amazon S3" => "Amazon S3",
-"Key" => "鑰",
-"Secret" => "密",
-"Secret Key" => "密鑰",
-"Port" => "連接埠",
-"Region" => "地區",
-"Enable SSL" => "啟用 SSL",
-"Host" => "主機",
-"Username" => "使用者名稱",
-"Password" => "密碼",
-"Share" => "分享",
-"URL" => "URL",
-"Access granted" => "允許存取",
-"Error configuring Dropbox storage" => "設定 Dropbox 儲存時發生錯誤",
-"Grant access" => "允許存取",
-"Error configuring Google Drive storage" => "設定 Google Drive 儲存時發生錯誤",
-"Personal" => "個人",
-"System" => "系統",
-"Saved" => "已儲存",
-"<b>Note:</b> " => "<b>警告:</b> ",
-" and " => "與",
-"<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHP 並未啓用 Curl 的支援，因此無法掛載 %s 。請洽您的系統管理員將其安裝並啓用。",
-"<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告</b>：PHP 並未啓用 FTP 的支援，因此無法掛載 %s，請洽您的系統管理員將其安裝並啓用。",
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." => "<b>警告</b>並未安裝 \"%s\"，因此無法掛載 %s。請洽您的系統管理員將其安裝並啓用。",
-"You don't have any external storages" => "您沒有任何外部儲存",
-"Name" => "名稱",
-"External Storage" => "外部儲存",
-"Folder name" => "資料夾名稱",
-"Configuration" => "設定",
-"Available for" => "可用的",
-"Add storage" => "增加儲存區",
-"Delete" => "刪除",
-"Enable User External Storage" => "啓用使用者外部儲存",
-"Allow users to mount the following external storage" => "允許使用者自行掛載以下的外部儲存"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/af_ZA.js b/apps/files_sharing/l10n/af_ZA.js
new file mode 100644
index 00000000000..4e05c598353
--- /dev/null
+++ b/apps/files_sharing/l10n/af_ZA.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Kanseleer",
+    "Password" : "Wagwoord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/af_ZA.json b/apps/files_sharing/l10n/af_ZA.json
new file mode 100644
index 00000000000..1e959e1544a
--- /dev/null
+++ b/apps/files_sharing/l10n/af_ZA.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Kanseleer",
+    "Password" : "Wagwoord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/af_ZA.php b/apps/files_sharing/l10n/af_ZA.php
deleted file mode 100644
index e57c3578de3..00000000000
--- a/apps/files_sharing/l10n/af_ZA.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Kanseleer",
-"Password" => "Wagwoord"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ar.js b/apps/files_sharing/l10n/ar.js
new file mode 100644
index 00000000000..de2b179847a
--- /dev/null
+++ b/apps/files_sharing/l10n/ar.js
@@ -0,0 +1,20 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "إلغاء",
+    "Shared by" : "تم مشاركتها بواسطة",
+    "This share is password-protected" : "هذه المشاركة محمية بكلمة مرور",
+    "The password is wrong. Try again." : "كلمة المرور خاطئة. حاول مرة أخرى",
+    "Password" : "كلمة المرور",
+    "Name" : "اسم",
+    "Sorry, this link doesn’t seem to work anymore." : "عذرا، يبدو أن هذا الرابط لم يعد يعمل.",
+    "Reasons might be:" : "الأسباب الممكنة :",
+    "the item was removed" : "تم حذف العنصر المطلوب",
+    "the link expired" : "انتهت صلاحية الرابط",
+    "sharing is disabled" : "المشاركة غير مفعلة",
+    "For more info, please ask the person who sent this link." : "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط",
+    "Download" : "تحميل",
+    "Download %s" : "تحميل %s",
+    "Direct link" : "رابط مباشر"
+},
+"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_sharing/l10n/ar.json b/apps/files_sharing/l10n/ar.json
new file mode 100644
index 00000000000..890035152a2
--- /dev/null
+++ b/apps/files_sharing/l10n/ar.json
@@ -0,0 +1,18 @@
+{ "translations": {
+    "Cancel" : "إلغاء",
+    "Shared by" : "تم مشاركتها بواسطة",
+    "This share is password-protected" : "هذه المشاركة محمية بكلمة مرور",
+    "The password is wrong. Try again." : "كلمة المرور خاطئة. حاول مرة أخرى",
+    "Password" : "كلمة المرور",
+    "Name" : "اسم",
+    "Sorry, this link doesn’t seem to work anymore." : "عذرا، يبدو أن هذا الرابط لم يعد يعمل.",
+    "Reasons might be:" : "الأسباب الممكنة :",
+    "the item was removed" : "تم حذف العنصر المطلوب",
+    "the link expired" : "انتهت صلاحية الرابط",
+    "sharing is disabled" : "المشاركة غير مفعلة",
+    "For more info, please ask the person who sent this link." : "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط",
+    "Download" : "تحميل",
+    "Download %s" : "تحميل %s",
+    "Direct link" : "رابط مباشر"
+},"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_sharing/l10n/ar.php b/apps/files_sharing/l10n/ar.php
deleted file mode 100644
index 937bdadb0fb..00000000000
--- a/apps/files_sharing/l10n/ar.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "إلغاء",
-"Shared by" => "تم مشاركتها بواسطة",
-"This share is password-protected" => "هذه المشاركة محمية بكلمة مرور",
-"The password is wrong. Try again." => "كلمة المرور خاطئة. حاول مرة أخرى",
-"Password" => "كلمة المرور",
-"Name" => "اسم",
-"Sorry, this link doesn’t seem to work anymore." => "عذرا، يبدو أن هذا الرابط لم يعد يعمل.",
-"Reasons might be:" => "الأسباب الممكنة :",
-"the item was removed" => "تم حذف العنصر المطلوب",
-"the link expired" => "انتهت صلاحية الرابط",
-"sharing is disabled" => "المشاركة غير مفعلة",
-"For more info, please ask the person who sent this link." => "لمزيد من المعلومات، يرجى سؤال الشخص الذي أرسل هذا الرابط",
-"Download" => "تحميل",
-"Download %s" => "تحميل %s",
-"Direct link" => "رابط مباشر"
-);
-$PLURAL_FORMS = "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_sharing/l10n/ast.js b/apps/files_sharing/l10n/ast.js
new file mode 100644
index 00000000000..c3df4e46fb1
--- /dev/null
+++ b/apps/files_sharing/l10n/ast.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "La compartición sirvidor a sirvidor nun ta habilitada nesti sirvidor",
+    "Invalid or untrusted SSL certificate" : "Certificáu SSL inválidu o ensín validar",
+    "Couldn't add remote share" : "Nun pudo amestase una compartición remota",
+    "Shared with you" : "Compartíos contigo",
+    "Shared with others" : "Compartíos con otros",
+    "Shared by link" : "Compartíos per enllaz",
+    "No files have been shared with you yet." : "Entá nun se compartieron ficheros contigo.",
+    "You haven't shared any files yet." : "Entá nun compartiesti dengún ficheru.",
+    "You haven't shared any files by link yet." : "Entá nun compartiesti nengún ficheru per enllaz.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Quies amestar compartición remota {name} de {owner}@{remote}?",
+    "Remote share" : "Compartición remota",
+    "Remote share password" : "Contraseña de compartición remota",
+    "Cancel" : "Encaboxar",
+    "Add remote share" : "Amestar compartición remota",
+    "No ownCloud installation found at {remote}" : "Nun s'alcontró denguna instalación d'ownCloud en {remote}",
+    "Invalid ownCloud url" : "Url ownCloud inválida",
+    "Shared by" : "Compartíos por",
+    "This share is password-protected" : "Esta compartición tien contraseña protexida",
+    "The password is wrong. Try again." : "La contraseña ye incorreuta. Inténtalo otra vegada.",
+    "Password" : "Contraseña",
+    "Name" : "Nome",
+    "Share time" : "Compartir hora",
+    "Sorry, this link doesn’t seem to work anymore." : "Sentímoslo, esti enllaz paez que yá nun furrula.",
+    "Reasons might be:" : "Les razones pueden ser: ",
+    "the item was removed" : "desanicióse l'elementu",
+    "the link expired" : "l'enllaz caducó",
+    "sharing is disabled" : "la compartición ta deshabilitada",
+    "For more info, please ask the person who sent this link." : "Pa más información, entrúga-y a la persona qu'unvió esti enllaz",
+    "Add to your ownCloud" : "Amestar al to ownCloud",
+    "Download" : "Baxar",
+    "Download %s" : "Descargar %s",
+    "Direct link" : "Enllaz direutu",
+    "Remote Shares" : "Comparticiones remotes",
+    "Allow other instances to mount public links shared from this server" : "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor",
+    "Allow users to mount public link shares" : "Permitir a los usuarios montar enllaces compartíos públicos"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json
new file mode 100644
index 00000000000..04fb75b450b
--- /dev/null
+++ b/apps/files_sharing/l10n/ast.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "La compartición sirvidor a sirvidor nun ta habilitada nesti sirvidor",
+    "Invalid or untrusted SSL certificate" : "Certificáu SSL inválidu o ensín validar",
+    "Couldn't add remote share" : "Nun pudo amestase una compartición remota",
+    "Shared with you" : "Compartíos contigo",
+    "Shared with others" : "Compartíos con otros",
+    "Shared by link" : "Compartíos per enllaz",
+    "No files have been shared with you yet." : "Entá nun se compartieron ficheros contigo.",
+    "You haven't shared any files yet." : "Entá nun compartiesti dengún ficheru.",
+    "You haven't shared any files by link yet." : "Entá nun compartiesti nengún ficheru per enllaz.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Quies amestar compartición remota {name} de {owner}@{remote}?",
+    "Remote share" : "Compartición remota",
+    "Remote share password" : "Contraseña de compartición remota",
+    "Cancel" : "Encaboxar",
+    "Add remote share" : "Amestar compartición remota",
+    "No ownCloud installation found at {remote}" : "Nun s'alcontró denguna instalación d'ownCloud en {remote}",
+    "Invalid ownCloud url" : "Url ownCloud inválida",
+    "Shared by" : "Compartíos por",
+    "This share is password-protected" : "Esta compartición tien contraseña protexida",
+    "The password is wrong. Try again." : "La contraseña ye incorreuta. Inténtalo otra vegada.",
+    "Password" : "Contraseña",
+    "Name" : "Nome",
+    "Share time" : "Compartir hora",
+    "Sorry, this link doesn’t seem to work anymore." : "Sentímoslo, esti enllaz paez que yá nun furrula.",
+    "Reasons might be:" : "Les razones pueden ser: ",
+    "the item was removed" : "desanicióse l'elementu",
+    "the link expired" : "l'enllaz caducó",
+    "sharing is disabled" : "la compartición ta deshabilitada",
+    "For more info, please ask the person who sent this link." : "Pa más información, entrúga-y a la persona qu'unvió esti enllaz",
+    "Add to your ownCloud" : "Amestar al to ownCloud",
+    "Download" : "Baxar",
+    "Download %s" : "Descargar %s",
+    "Direct link" : "Enllaz direutu",
+    "Remote Shares" : "Comparticiones remotes",
+    "Allow other instances to mount public links shared from this server" : "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor",
+    "Allow users to mount public link shares" : "Permitir a los usuarios montar enllaces compartíos públicos"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ast.php b/apps/files_sharing/l10n/ast.php
deleted file mode 100644
index 2a5004811b8..00000000000
--- a/apps/files_sharing/l10n/ast.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "La compartición sirvidor a sirvidor nun ta habilitada nesti sirvidor",
-"Invalid or untrusted SSL certificate" => "Certificáu SSL inválidu o ensín validar",
-"Couldn't add remote share" => "Nun pudo amestase una compartición remota",
-"Shared with you" => "Compartíos contigo",
-"Shared with others" => "Compartíos con otros",
-"Shared by link" => "Compartíos per enllaz",
-"No files have been shared with you yet." => "Entá nun se compartieron ficheros contigo.",
-"You haven't shared any files yet." => "Entá nun compartiesti dengún ficheru.",
-"You haven't shared any files by link yet." => "Entá nun compartiesti nengún ficheru per enllaz.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Quies amestar compartición remota {name} de {owner}@{remote}?",
-"Remote share" => "Compartición remota",
-"Remote share password" => "Contraseña de compartición remota",
-"Cancel" => "Encaboxar",
-"Add remote share" => "Amestar compartición remota",
-"No ownCloud installation found at {remote}" => "Nun s'alcontró denguna instalación d'ownCloud en {remote}",
-"Invalid ownCloud url" => "Url ownCloud inválida",
-"Shared by" => "Compartíos por",
-"This share is password-protected" => "Esta compartición tien contraseña protexida",
-"The password is wrong. Try again." => "La contraseña ye incorreuta. Inténtalo otra vegada.",
-"Password" => "Contraseña",
-"Name" => "Nome",
-"Share time" => "Compartir hora",
-"Sorry, this link doesn’t seem to work anymore." => "Sentímoslo, esti enllaz paez que yá nun furrula.",
-"Reasons might be:" => "Les razones pueden ser: ",
-"the item was removed" => "desanicióse l'elementu",
-"the link expired" => "l'enllaz caducó",
-"sharing is disabled" => "la compartición ta deshabilitada",
-"For more info, please ask the person who sent this link." => "Pa más información, entrúga-y a la persona qu'unvió esti enllaz",
-"Add to your ownCloud" => "Amestar al to ownCloud",
-"Download" => "Baxar",
-"Download %s" => "Descargar %s",
-"Direct link" => "Enllaz direutu",
-"Remote Shares" => "Comparticiones remotes",
-"Allow other instances to mount public links shared from this server" => "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor",
-"Allow users to mount public link shares" => "Permitir a los usuarios montar enllaces compartíos públicos"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/az.js b/apps/files_sharing/l10n/az.js
new file mode 100644
index 00000000000..ac29161dbd7
--- /dev/null
+++ b/apps/files_sharing/l10n/az.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Bu serverdə, serverlərarası yayımlanma aktiv deyil",
+    "Invalid or untrusted SSL certificate" : "Yalnış yada inam listindən kənar SSL sertifikatı",
+    "Couldn't add remote share" : "Uzaqda olan yayımlanmanı əlavə etmək mümkün olmadı",
+    "Shared with you" : "Sizinlə yayımlanan",
+    "Shared with others" : "Hər kəsə yayımlanmış",
+    "You haven't shared any files yet." : "Siz hələki heç bir faylı yayımlamamısnız.",
+    "You haven't shared any files by link yet." : "Hələki siz bu link ilə heç bir faylı yayımlamamısıniz.",
+    "Remote share" : "Uzaq yayımlanma",
+    "Remote share password" : "Uzaq yayımlanma şifrəsi",
+    "Cancel" : "Dayandır",
+    "Add remote share" : "Uzaq yayımlanmanı əlavə et",
+    "Invalid ownCloud url" : "Yalnış ownCloud url-i",
+    "Shared by" : "Tərəfindən yayımlanıb",
+    "Password" : "Şifrə",
+    "Name" : "Ad",
+    "Download" : "Yüklə"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/az.json b/apps/files_sharing/l10n/az.json
new file mode 100644
index 00000000000..1b08e3b4e7d
--- /dev/null
+++ b/apps/files_sharing/l10n/az.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Bu serverdə, serverlərarası yayımlanma aktiv deyil",
+    "Invalid or untrusted SSL certificate" : "Yalnış yada inam listindən kənar SSL sertifikatı",
+    "Couldn't add remote share" : "Uzaqda olan yayımlanmanı əlavə etmək mümkün olmadı",
+    "Shared with you" : "Sizinlə yayımlanan",
+    "Shared with others" : "Hər kəsə yayımlanmış",
+    "You haven't shared any files yet." : "Siz hələki heç bir faylı yayımlamamısnız.",
+    "You haven't shared any files by link yet." : "Hələki siz bu link ilə heç bir faylı yayımlamamısıniz.",
+    "Remote share" : "Uzaq yayımlanma",
+    "Remote share password" : "Uzaq yayımlanma şifrəsi",
+    "Cancel" : "Dayandır",
+    "Add remote share" : "Uzaq yayımlanmanı əlavə et",
+    "Invalid ownCloud url" : "Yalnış ownCloud url-i",
+    "Shared by" : "Tərəfindən yayımlanıb",
+    "Password" : "Şifrə",
+    "Name" : "Ad",
+    "Download" : "Yüklə"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/az.php b/apps/files_sharing/l10n/az.php
deleted file mode 100644
index edb068ab198..00000000000
--- a/apps/files_sharing/l10n/az.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Bu serverdə, serverlərarası yayımlanma aktiv deyil",
-"Invalid or untrusted SSL certificate" => "Yalnış yada inam listindən kənar SSL sertifikatı",
-"Couldn't add remote share" => "Uzaqda olan yayımlanmanı əlavə etmək mümkün olmadı",
-"Shared with you" => "Sizinlə yayımlanan",
-"Shared with others" => "Hər kəsə yayımlanmış",
-"You haven't shared any files yet." => "Siz hələki heç bir faylı yayımlamamısnız.",
-"You haven't shared any files by link yet." => "Hələki siz bu link ilə heç bir faylı yayımlamamısıniz.",
-"Remote share" => "Uzaq yayımlanma",
-"Remote share password" => "Uzaq yayımlanma şifrəsi",
-"Cancel" => "Dayandır",
-"Add remote share" => "Uzaq yayımlanmanı əlavə et",
-"Invalid ownCloud url" => "Yalnış ownCloud url-i",
-"Shared by" => "Tərəfindən yayımlanıb",
-"Password" => "Şifrə",
-"Name" => "Ad",
-"Download" => "Yüklə"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js
new file mode 100644
index 00000000000..fe7c4ecdb9b
--- /dev/null
+++ b/apps/files_sharing/l10n/bg_BG.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Споделяне между сървъри не е разрешено на този сървър.",
+    "The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.",
+    "Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат",
+    "Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория.",
+    "Shared with you" : "Споделено с теб",
+    "Shared with others" : "Споделено с други",
+    "Shared by link" : "Споделено с връзка",
+    "No files have been shared with you yet." : "Все още няма споделени с теб файлове.",
+    "You haven't shared any files yet." : "Все още не си споделил файлове.",
+    "You haven't shared any files by link yet." : "Все още не си споделил файлове с връзка.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?",
+    "Remote share" : "Прикачена Папка",
+    "Remote share password" : "Парола за прикачена папка",
+    "Cancel" : "Отказ",
+    "Add remote share" : "Добави прикачена папка",
+    "No ownCloud installation found at {remote}" : "Не е открит инсталиран ownCloud на {remote}.",
+    "Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.",
+    "Shared by" : "Споделено от",
+    "This share is password-protected" : "Тази зона е защитена с парола.",
+    "The password is wrong. Try again." : "Грешна парола. Опитай отново.",
+    "Password" : "Парола",
+    "Name" : "Име",
+    "Share time" : "Споделено на",
+    "Sorry, this link doesn’t seem to work anymore." : "Съжаляваме, връзката вече не е активна.",
+    "Reasons might be:" : "Причините може да са:",
+    "the item was removed" : "съдържанието е премахнато",
+    "the link expired" : "връзката е изтекла",
+    "sharing is disabled" : "споделянето е изключено",
+    "For more info, please ask the person who sent this link." : "За повече информация, моля питай човека, който е изпратил тази връзка.",
+    "Add to your ownCloud" : "Добави към своя ownCloud",
+    "Download" : "Изтегли",
+    "Download %s" : "Изтегли %s",
+    "Direct link" : "Директна връзка",
+    "Remote Shares" : "Прикачени Папки",
+    "Allow other instances to mount public links shared from this server" : "Разреши други ownCloud сървъри да прикачват папки, споделени посредством връзки, на този сървър.",
+    "Allow users to mount public link shares" : "Разреши потребители да прикачват папки, споделени посредством връзки."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json
new file mode 100644
index 00000000000..7fcea7ddfef
--- /dev/null
+++ b/apps/files_sharing/l10n/bg_BG.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Споделяне между сървъри не е разрешено на този сървър.",
+    "The mountpoint name contains invalid characters." : "Името на mountpoint-a съдържа невалидни символи.",
+    "Invalid or untrusted SSL certificate" : "Невалиден или ненадежден SSL сертификат",
+    "Couldn't add remote share" : "Неуспешно добавяне на отдалечена споделена директория.",
+    "Shared with you" : "Споделено с теб",
+    "Shared with others" : "Споделено с други",
+    "Shared by link" : "Споделено с връзка",
+    "No files have been shared with you yet." : "Все още няма споделени с теб файлове.",
+    "You haven't shared any files yet." : "Все още не си споделил файлове.",
+    "You haven't shared any files by link yet." : "Все още не си споделил файлове с връзка.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?",
+    "Remote share" : "Прикачена Папка",
+    "Remote share password" : "Парола за прикачена папка",
+    "Cancel" : "Отказ",
+    "Add remote share" : "Добави прикачена папка",
+    "No ownCloud installation found at {remote}" : "Не е открит инсталиран ownCloud на {remote}.",
+    "Invalid ownCloud url" : "Невалиден ownCloud интернет адрес.",
+    "Shared by" : "Споделено от",
+    "This share is password-protected" : "Тази зона е защитена с парола.",
+    "The password is wrong. Try again." : "Грешна парола. Опитай отново.",
+    "Password" : "Парола",
+    "Name" : "Име",
+    "Share time" : "Споделено на",
+    "Sorry, this link doesn’t seem to work anymore." : "Съжаляваме, връзката вече не е активна.",
+    "Reasons might be:" : "Причините може да са:",
+    "the item was removed" : "съдържанието е премахнато",
+    "the link expired" : "връзката е изтекла",
+    "sharing is disabled" : "споделянето е изключено",
+    "For more info, please ask the person who sent this link." : "За повече информация, моля питай човека, който е изпратил тази връзка.",
+    "Add to your ownCloud" : "Добави към своя ownCloud",
+    "Download" : "Изтегли",
+    "Download %s" : "Изтегли %s",
+    "Direct link" : "Директна връзка",
+    "Remote Shares" : "Прикачени Папки",
+    "Allow other instances to mount public links shared from this server" : "Разреши други ownCloud сървъри да прикачват папки, споделени посредством връзки, на този сървър.",
+    "Allow users to mount public link shares" : "Разреши потребители да прикачват папки, споделени посредством връзки."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/bg_BG.php b/apps/files_sharing/l10n/bg_BG.php
deleted file mode 100644
index 80af4693898..00000000000
--- a/apps/files_sharing/l10n/bg_BG.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Споделяне между сървъри не е разрешено на този сървър.",
-"The mountpoint name contains invalid characters." => "Името на mountpoint-a съдържа невалидни символи.",
-"Invalid or untrusted SSL certificate" => "Невалиден или ненадежден SSL сертификат",
-"Couldn't add remote share" => "Неуспешно добавяне на отдалечена споделена директория.",
-"Shared with you" => "Споделено с теб",
-"Shared with others" => "Споделено с други",
-"Shared by link" => "Споделено с връзка",
-"No files have been shared with you yet." => "Все още няма споделени с теб файлове.",
-"You haven't shared any files yet." => "Все още не си споделил файлове.",
-"You haven't shared any files by link yet." => "Все още не си споделил файлове с връзка.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Желаеш ли да добавиш като прикачената папка {name} от {owner}@{remote}?",
-"Remote share" => "Прикачена Папка",
-"Remote share password" => "Парола за прикачена папка",
-"Cancel" => "Отказ",
-"Add remote share" => "Добави прикачена папка",
-"No ownCloud installation found at {remote}" => "Не е открит инсталиран ownCloud на {remote}.",
-"Invalid ownCloud url" => "Невалиден ownCloud интернет адрес.",
-"Shared by" => "Споделено от",
-"This share is password-protected" => "Тази зона е защитена с парола.",
-"The password is wrong. Try again." => "Грешна парола. Опитай отново.",
-"Password" => "Парола",
-"Name" => "Име",
-"Share time" => "Споделено на",
-"Sorry, this link doesn’t seem to work anymore." => "Съжаляваме, връзката вече не е активна.",
-"Reasons might be:" => "Причините може да са:",
-"the item was removed" => "съдържанието е премахнато",
-"the link expired" => "връзката е изтекла",
-"sharing is disabled" => "споделянето е изключено",
-"For more info, please ask the person who sent this link." => "За повече информация, моля питай човека, който е изпратил тази връзка.",
-"Add to your ownCloud" => "Добави към своя ownCloud",
-"Download" => "Изтегли",
-"Download %s" => "Изтегли %s",
-"Direct link" => "Директна връзка",
-"Remote Shares" => "Прикачени Папки",
-"Allow other instances to mount public links shared from this server" => "Разреши други ownCloud сървъри да прикачват папки, споделени посредством връзки, на този сървър.",
-"Allow users to mount public link shares" => "Разреши потребители да прикачват папки, споделени посредством връзки."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bn_BD.js b/apps/files_sharing/l10n/bn_BD.js
new file mode 100644
index 00000000000..8df349c3c77
--- /dev/null
+++ b/apps/files_sharing/l10n/bn_BD.js
@@ -0,0 +1,30 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "এই সার্ভারে সার্ভার হতে সার্ভারে ভাগাভাগি কার্যকর নয়",
+    "Invalid or untrusted SSL certificate" : "অবৈধ বা অবিশ্বস্ত SSL সার্টিফিকেট",
+    "Couldn't add remote share" : "দুরবর্তী ভাগাভাগি যোগ করা গেলনা",
+    "Shared with you" : "আপনার সাথে ভাগাভাগি করেছেন",
+    "Shared by link" : "লিঙ্কের মাধ্যমে ভাগাভাগিকৃত",
+    "Remote share" : "দুরবর্তী ভাগাভাগি",
+    "Cancel" : "বাতিল",
+    "No ownCloud installation found at {remote}" : "{remote}এ কোন ওউনক্লাউড ইনস্টলেসন পাওয়া গেলনা",
+    "Invalid ownCloud url" : "অবৈধ ওউনক্লাউড url",
+    "Shared by" : "যাদের মাঝে ভাগাভাগি করা হয়েছে",
+    "This share is password-protected" : "এই শেয়ারটি কূটশব্দদ্বারা সুরক্ষিত",
+    "The password is wrong. Try again." : "কুটশব্দটি ভুল। আবার চেষ্টা করুন।",
+    "Password" : "কূটশব্দ",
+    "Name" : "নাম",
+    "Share time" : "ভাগাভাগির সময়",
+    "Sorry, this link doesn’t seem to work anymore." : "দুঃখিত, এই লিঙ্কটি আর কার্যকর নয়।",
+    "Reasons might be:" : "কারণসমূহ হতে পারে:",
+    "the item was removed" : "আইটেমটি অপসারণ করা হয়েছিল",
+    "the link expired" : "মেয়াদোত্তীর্ন লিঙ্ক",
+    "sharing is disabled" : "ভাগাভাগি অকার্যকর",
+    "For more info, please ask the person who sent this link." : "বিস্তারিত তথ্যের জন্য এই লিঙ্কের প্রেরককে জিজ্ঞাসা করুন।",
+    "Download" : "ডাউনলোড",
+    "Download %s" : "ডাউনলোড  %s",
+    "Direct link" : "সরাসরি লিঙ্ক",
+    "Remote Shares" : "দুরবর্তী ভাগাভাগি"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/bn_BD.json b/apps/files_sharing/l10n/bn_BD.json
new file mode 100644
index 00000000000..9eafda60df9
--- /dev/null
+++ b/apps/files_sharing/l10n/bn_BD.json
@@ -0,0 +1,28 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "এই সার্ভারে সার্ভার হতে সার্ভারে ভাগাভাগি কার্যকর নয়",
+    "Invalid or untrusted SSL certificate" : "অবৈধ বা অবিশ্বস্ত SSL সার্টিফিকেট",
+    "Couldn't add remote share" : "দুরবর্তী ভাগাভাগি যোগ করা গেলনা",
+    "Shared with you" : "আপনার সাথে ভাগাভাগি করেছেন",
+    "Shared by link" : "লিঙ্কের মাধ্যমে ভাগাভাগিকৃত",
+    "Remote share" : "দুরবর্তী ভাগাভাগি",
+    "Cancel" : "বাতিল",
+    "No ownCloud installation found at {remote}" : "{remote}এ কোন ওউনক্লাউড ইনস্টলেসন পাওয়া গেলনা",
+    "Invalid ownCloud url" : "অবৈধ ওউনক্লাউড url",
+    "Shared by" : "যাদের মাঝে ভাগাভাগি করা হয়েছে",
+    "This share is password-protected" : "এই শেয়ারটি কূটশব্দদ্বারা সুরক্ষিত",
+    "The password is wrong. Try again." : "কুটশব্দটি ভুল। আবার চেষ্টা করুন।",
+    "Password" : "কূটশব্দ",
+    "Name" : "নাম",
+    "Share time" : "ভাগাভাগির সময়",
+    "Sorry, this link doesn’t seem to work anymore." : "দুঃখিত, এই লিঙ্কটি আর কার্যকর নয়।",
+    "Reasons might be:" : "কারণসমূহ হতে পারে:",
+    "the item was removed" : "আইটেমটি অপসারণ করা হয়েছিল",
+    "the link expired" : "মেয়াদোত্তীর্ন লিঙ্ক",
+    "sharing is disabled" : "ভাগাভাগি অকার্যকর",
+    "For more info, please ask the person who sent this link." : "বিস্তারিত তথ্যের জন্য এই লিঙ্কের প্রেরককে জিজ্ঞাসা করুন।",
+    "Download" : "ডাউনলোড",
+    "Download %s" : "ডাউনলোড  %s",
+    "Direct link" : "সরাসরি লিঙ্ক",
+    "Remote Shares" : "দুরবর্তী ভাগাভাগি"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/bn_BD.php b/apps/files_sharing/l10n/bn_BD.php
deleted file mode 100644
index fdd3f5233bf..00000000000
--- a/apps/files_sharing/l10n/bn_BD.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "এই সার্ভারে সার্ভার হতে সার্ভারে ভাগাভাগি কার্যকর নয়",
-"Invalid or untrusted SSL certificate" => "অবৈধ বা অবিশ্বস্ত SSL সার্টিফিকেট",
-"Couldn't add remote share" => "দুরবর্তী ভাগাভাগি যোগ করা গেলনা",
-"Shared with you" => "আপনার সাথে ভাগাভাগি করেছেন",
-"Shared by link" => "লিঙ্কের মাধ্যমে ভাগাভাগিকৃত",
-"Remote share" => "দুরবর্তী ভাগাভাগি",
-"Cancel" => "বাতিল",
-"No ownCloud installation found at {remote}" => "{remote}এ কোন ওউনক্লাউড ইনস্টলেসন পাওয়া গেলনা",
-"Invalid ownCloud url" => "অবৈধ ওউনক্লাউড url",
-"Shared by" => "যাদের মাঝে ভাগাভাগি করা হয়েছে",
-"This share is password-protected" => "এই শেয়ারটি কূটশব্দদ্বারা সুরক্ষিত",
-"The password is wrong. Try again." => "কুটশব্দটি ভুল। আবার চেষ্টা করুন।",
-"Password" => "কূটশব্দ",
-"Name" => "নাম",
-"Share time" => "ভাগাভাগির সময়",
-"Sorry, this link doesn’t seem to work anymore." => "দুঃখিত, এই লিঙ্কটি আর কার্যকর নয়।",
-"Reasons might be:" => "কারণসমূহ হতে পারে:",
-"the item was removed" => "আইটেমটি অপসারণ করা হয়েছিল",
-"the link expired" => "মেয়াদোত্তীর্ন লিঙ্ক",
-"sharing is disabled" => "ভাগাভাগি অকার্যকর",
-"For more info, please ask the person who sent this link." => "বিস্তারিত তথ্যের জন্য এই লিঙ্কের প্রেরককে জিজ্ঞাসা করুন।",
-"Download" => "ডাউনলোড",
-"Download %s" => "ডাউনলোড  %s",
-"Direct link" => "সরাসরি লিঙ্ক",
-"Remote Shares" => "দুরবর্তী ভাগাভাগি"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bn_IN.js b/apps/files_sharing/l10n/bn_IN.js
new file mode 100644
index 00000000000..61694c85575
--- /dev/null
+++ b/apps/files_sharing/l10n/bn_IN.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "বাতিল করা",
+    "Name" : "নাম",
+    "Download" : "ডাউনলোড করুন"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/bn_IN.json b/apps/files_sharing/l10n/bn_IN.json
new file mode 100644
index 00000000000..344c7677c19
--- /dev/null
+++ b/apps/files_sharing/l10n/bn_IN.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "বাতিল করা",
+    "Name" : "নাম",
+    "Download" : "ডাউনলোড করুন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/bn_IN.php b/apps/files_sharing/l10n/bn_IN.php
deleted file mode 100644
index 99daa51da79..00000000000
--- a/apps/files_sharing/l10n/bn_IN.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "বাতিল করা",
-"Name" => "নাম",
-"Download" => "ডাউনলোড করুন"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/bs.js b/apps/files_sharing/l10n/bs.js
new file mode 100644
index 00000000000..1be4f1f3fb8
--- /dev/null
+++ b/apps/files_sharing/l10n/bs.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Shared by" : "Dijeli",
+    "Name" : "Ime"
+},
+"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/bs.json b/apps/files_sharing/l10n/bs.json
new file mode 100644
index 00000000000..48fb8d2209a
--- /dev/null
+++ b/apps/files_sharing/l10n/bs.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Shared by" : "Dijeli",
+    "Name" : "Ime"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/bs.php b/apps/files_sharing/l10n/bs.php
deleted file mode 100644
index bf5b758a33d..00000000000
--- a/apps/files_sharing/l10n/bs.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Shared by" => "Dijeli",
-"Name" => "Ime"
-);
-$PLURAL_FORMS = "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/ca.js b/apps/files_sharing/l10n/ca.js
new file mode 100644
index 00000000000..3397d85f140
--- /dev/null
+++ b/apps/files_sharing/l10n/ca.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "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",
+    "Couldn't add remote share" : "No s'ha pogut afegir una compartició remota",
+    "Shared with you" : "Compartit amb vós",
+    "Shared with others" : "Compartit amb altres",
+    "Shared by link" : "Compartit amb enllaç",
+    "No files have been shared with you yet." : "Encara no hi ha fitxers compartits amb vós.",
+    "You haven't shared any files yet." : "Encara no heu compartit cap fitxer.",
+    "You haven't shared any files by link yet." : "Encara no heu compartit cap fitxer amb enllaç.",
+    "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",
+    "Cancel" : "Cancel·la",
+    "Add remote share" : "Afegeix compartició remota",
+    "No ownCloud installation found at {remote}" : "No s'ha trobat cap instal·lació ownCloud a {remote}",
+    "Invalid ownCloud url" : "La url d'ownCloud no és vàlida",
+    "Shared by" : "Compartit per",
+    "This share is password-protected" : "Aquest compartit està protegit amb contrasenya",
+    "The password is wrong. Try again." : "la contrasenya és incorrecta. Intenteu-ho de nou.",
+    "Password" : "Contrasenya",
+    "Name" : "Nom",
+    "Share time" : "Temps de compartició",
+    "Sorry, this link doesn’t seem to work anymore." : "Aquest enllaç sembla que no funciona.",
+    "Reasons might be:" : "Les raons podrien ser:",
+    "the item was removed" : "l'element ha estat eliminat",
+    "the link expired" : "l'enllaç ha vençut",
+    "sharing is disabled" : "s'ha desactivat la compartició",
+    "For more info, please ask the person who sent this link." : "Per més informació contacteu amb qui us ha enviat l'enllaç.",
+    "Add to your ownCloud" : "Afegiu a ownCloud",
+    "Download" : "Baixa",
+    "Download %s" : "Baixa %s",
+    "Direct link" : "Enllaç directe",
+    "Remote Shares" : "Compartició remota",
+    "Allow other instances to mount public links shared from this server" : "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor",
+    "Allow users to mount public link shares" : "Permet que usuaris muntin compartits amb enllaços públics"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json
new file mode 100644
index 00000000000..861dd589bce
--- /dev/null
+++ b/apps/files_sharing/l10n/ca.json
@@ -0,0 +1,38 @@
+{ "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",
+    "Couldn't add remote share" : "No s'ha pogut afegir una compartició remota",
+    "Shared with you" : "Compartit amb vós",
+    "Shared with others" : "Compartit amb altres",
+    "Shared by link" : "Compartit amb enllaç",
+    "No files have been shared with you yet." : "Encara no hi ha fitxers compartits amb vós.",
+    "You haven't shared any files yet." : "Encara no heu compartit cap fitxer.",
+    "You haven't shared any files by link yet." : "Encara no heu compartit cap fitxer amb enllaç.",
+    "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",
+    "Cancel" : "Cancel·la",
+    "Add remote share" : "Afegeix compartició remota",
+    "No ownCloud installation found at {remote}" : "No s'ha trobat cap instal·lació ownCloud a {remote}",
+    "Invalid ownCloud url" : "La url d'ownCloud no és vàlida",
+    "Shared by" : "Compartit per",
+    "This share is password-protected" : "Aquest compartit està protegit amb contrasenya",
+    "The password is wrong. Try again." : "la contrasenya és incorrecta. Intenteu-ho de nou.",
+    "Password" : "Contrasenya",
+    "Name" : "Nom",
+    "Share time" : "Temps de compartició",
+    "Sorry, this link doesn’t seem to work anymore." : "Aquest enllaç sembla que no funciona.",
+    "Reasons might be:" : "Les raons podrien ser:",
+    "the item was removed" : "l'element ha estat eliminat",
+    "the link expired" : "l'enllaç ha vençut",
+    "sharing is disabled" : "s'ha desactivat la compartició",
+    "For more info, please ask the person who sent this link." : "Per més informació contacteu amb qui us ha enviat l'enllaç.",
+    "Add to your ownCloud" : "Afegiu a ownCloud",
+    "Download" : "Baixa",
+    "Download %s" : "Baixa %s",
+    "Direct link" : "Enllaç directe",
+    "Remote Shares" : "Compartició remota",
+    "Allow other instances to mount public links shared from this server" : "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor",
+    "Allow users to mount public link shares" : "Permet que usuaris muntin compartits amb enllaços públics"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
deleted file mode 100644
index 1b94c030358..00000000000
--- a/apps/files_sharing/l10n/ca.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"Couldn't add remote share" => "No s'ha pogut afegir una compartició remota",
-"Shared with you" => "Compartit amb vós",
-"Shared with others" => "Compartit amb altres",
-"Shared by link" => "Compartit amb enllaç",
-"No files have been shared with you yet." => "Encara no hi ha fitxers compartits amb vós.",
-"You haven't shared any files yet." => "Encara no heu compartit cap fitxer.",
-"You haven't shared any files by link yet." => "Encara no heu compartit cap fitxer amb enllaç.",
-"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",
-"Cancel" => "Cancel·la",
-"Add remote share" => "Afegeix compartició remota",
-"No ownCloud installation found at {remote}" => "No s'ha trobat cap instal·lació ownCloud a {remote}",
-"Invalid ownCloud url" => "La url d'ownCloud no és vàlida",
-"Shared by" => "Compartit per",
-"This share is password-protected" => "Aquest compartit està protegit amb contrasenya",
-"The password is wrong. Try again." => "la contrasenya és incorrecta. Intenteu-ho de nou.",
-"Password" => "Contrasenya",
-"Name" => "Nom",
-"Share time" => "Temps de compartició",
-"Sorry, this link doesn’t seem to work anymore." => "Aquest enllaç sembla que no funciona.",
-"Reasons might be:" => "Les raons podrien ser:",
-"the item was removed" => "l'element ha estat eliminat",
-"the link expired" => "l'enllaç ha vençut",
-"sharing is disabled" => "s'ha desactivat la compartició",
-"For more info, please ask the person who sent this link." => "Per més informació contacteu amb qui us ha enviat l'enllaç.",
-"Add to your ownCloud" => "Afegiu a ownCloud",
-"Download" => "Baixa",
-"Download %s" => "Baixa %s",
-"Direct link" => "Enllaç directe",
-"Remote Shares" => "Compartició remota",
-"Allow other instances to mount public links shared from this server" => "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor",
-"Allow users to mount public link shares" => "Permet que usuaris muntin compartits amb enllaços públics"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
new file mode 100644
index 00000000000..dc0d1e92c41
--- /dev/null
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Sdílení mezi servery není povoleno",
+    "The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje nepovolené znaky.",
+    "Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát",
+    "Couldn't add remote share" : "Nelze přidat vzdálené úložiště",
+    "Shared with you" : "Sdíleno s vámi",
+    "Shared with others" : "Sdíleno s ostatními",
+    "Shared by link" : "Sdíleno pomocí odkazu",
+    "No files have been shared with you yet." : "Zatím s vámi nikdo žádné soubory nesdílel.",
+    "You haven't shared any files yet." : "Zatím jste nesdíleli žádné soubory.",
+    "You haven't shared any files by link yet." : "Zatím jste nesdíleli pomocí odkazu žádné soubory.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcete přidat vzdálené úložiště {name} uživatele {owner}@{remote}?",
+    "Remote share" : "Vzdálené úložiště",
+    "Remote share password" : "Heslo ke vzdálenému úložišti",
+    "Cancel" : "Zrušit",
+    "Add remote share" : "Přidat vzdálené úložiště",
+    "No ownCloud installation found at {remote}" : "Nebyla nalezena instalace ownCloud na {remote}",
+    "Invalid ownCloud url" : "Neplatná ownCloud url",
+    "Shared by" : "Sdílí",
+    "This share is password-protected" : "Toto sdílení je chráněno heslem",
+    "The password is wrong. Try again." : "Heslo není správné. Zkuste to znovu.",
+    "Password" : "Heslo",
+    "Name" : "Název",
+    "Share time" : "Čas sdílení",
+    "Sorry, this link doesn’t seem to work anymore." : "Je nám líto, ale tento odkaz již není funkční.",
+    "Reasons might be:" : "Možné důvody:",
+    "the item was removed" : "položka byla odebrána",
+    "the link expired" : "platnost odkazu vypršela",
+    "sharing is disabled" : "sdílení je zakázané",
+    "For more info, please ask the person who sent this link." : "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.",
+    "Add to your ownCloud" : "Přidat do svého ownCloudu",
+    "Download" : "Stáhnout",
+    "Download %s" : "Stáhnout %s",
+    "Direct link" : "Přímý odkaz",
+    "Remote Shares" : "Vzdálená úložiště",
+    "Allow other instances to mount public links shared from this server" : "Povolit připojování veřejně sdílených odkazů z tohoto serveru",
+    "Allow users to mount public link shares" : "Povolit uživatelům připojovat veřejně sdílené odkazy"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
new file mode 100644
index 00000000000..6b2dffa63fe
--- /dev/null
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Sdílení mezi servery není povoleno",
+    "The mountpoint name contains invalid characters." : "Jméno přípojného bodu obsahuje nepovolené znaky.",
+    "Invalid or untrusted SSL certificate" : "Neplatný nebo nedůvěryhodný SSL certifikát",
+    "Couldn't add remote share" : "Nelze přidat vzdálené úložiště",
+    "Shared with you" : "Sdíleno s vámi",
+    "Shared with others" : "Sdíleno s ostatními",
+    "Shared by link" : "Sdíleno pomocí odkazu",
+    "No files have been shared with you yet." : "Zatím s vámi nikdo žádné soubory nesdílel.",
+    "You haven't shared any files yet." : "Zatím jste nesdíleli žádné soubory.",
+    "You haven't shared any files by link yet." : "Zatím jste nesdíleli pomocí odkazu žádné soubory.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcete přidat vzdálené úložiště {name} uživatele {owner}@{remote}?",
+    "Remote share" : "Vzdálené úložiště",
+    "Remote share password" : "Heslo ke vzdálenému úložišti",
+    "Cancel" : "Zrušit",
+    "Add remote share" : "Přidat vzdálené úložiště",
+    "No ownCloud installation found at {remote}" : "Nebyla nalezena instalace ownCloud na {remote}",
+    "Invalid ownCloud url" : "Neplatná ownCloud url",
+    "Shared by" : "Sdílí",
+    "This share is password-protected" : "Toto sdílení je chráněno heslem",
+    "The password is wrong. Try again." : "Heslo není správné. Zkuste to znovu.",
+    "Password" : "Heslo",
+    "Name" : "Název",
+    "Share time" : "Čas sdílení",
+    "Sorry, this link doesn’t seem to work anymore." : "Je nám líto, ale tento odkaz již není funkční.",
+    "Reasons might be:" : "Možné důvody:",
+    "the item was removed" : "položka byla odebrána",
+    "the link expired" : "platnost odkazu vypršela",
+    "sharing is disabled" : "sdílení je zakázané",
+    "For more info, please ask the person who sent this link." : "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.",
+    "Add to your ownCloud" : "Přidat do svého ownCloudu",
+    "Download" : "Stáhnout",
+    "Download %s" : "Stáhnout %s",
+    "Direct link" : "Přímý odkaz",
+    "Remote Shares" : "Vzdálená úložiště",
+    "Allow other instances to mount public links shared from this server" : "Povolit připojování veřejně sdílených odkazů z tohoto serveru",
+    "Allow users to mount public link shares" : "Povolit uživatelům připojovat veřejně sdílené odkazy"
+},"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/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
deleted file mode 100644
index d9b7aab958d..00000000000
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Sdílení mezi servery není povoleno",
-"The mountpoint name contains invalid characters." => "Jméno přípojného bodu obsahuje nepovolené znaky.",
-"Invalid or untrusted SSL certificate" => "Neplatný nebo nedůvěryhodný SSL certifikát",
-"Couldn't add remote share" => "Nelze přidat vzdálené úložiště",
-"Shared with you" => "Sdíleno s vámi",
-"Shared with others" => "Sdíleno s ostatními",
-"Shared by link" => "Sdíleno pomocí odkazu",
-"No files have been shared with you yet." => "Zatím s vámi nikdo žádné soubory nesdílel.",
-"You haven't shared any files yet." => "Zatím jste nesdíleli žádné soubory.",
-"You haven't shared any files by link yet." => "Zatím jste nesdíleli pomocí odkazu žádné soubory.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Chcete přidat vzdálené úložiště {name} uživatele {owner}@{remote}?",
-"Remote share" => "Vzdálené úložiště",
-"Remote share password" => "Heslo ke vzdálenému úložišti",
-"Cancel" => "Zrušit",
-"Add remote share" => "Přidat vzdálené úložiště",
-"No ownCloud installation found at {remote}" => "Nebyla nalezena instalace ownCloud na {remote}",
-"Invalid ownCloud url" => "Neplatná ownCloud url",
-"Shared by" => "Sdílí",
-"This share is password-protected" => "Toto sdílení je chráněno heslem",
-"The password is wrong. Try again." => "Heslo není správné. Zkuste to znovu.",
-"Password" => "Heslo",
-"Name" => "Název",
-"Share time" => "Čas sdílení",
-"Sorry, this link doesn’t seem to work anymore." => "Je nám líto, ale tento odkaz již není funkční.",
-"Reasons might be:" => "Možné důvody:",
-"the item was removed" => "položka byla odebrána",
-"the link expired" => "platnost odkazu vypršela",
-"sharing is disabled" => "sdílení je zakázané",
-"For more info, please ask the person who sent this link." => "Pro více informací kontaktujte osobu, která vám zaslala tento odkaz.",
-"Add to your ownCloud" => "Přidat do svého ownCloudu",
-"Download" => "Stáhnout",
-"Download %s" => "Stáhnout %s",
-"Direct link" => "Přímý odkaz",
-"Remote Shares" => "Vzdálená úložiště",
-"Allow other instances to mount public links shared from this server" => "Povolit připojování veřejně sdílených odkazů z tohoto serveru",
-"Allow users to mount public link shares" => "Povolit uživatelům připojovat veřejně sdílené odkazy"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/cy_GB.js b/apps/files_sharing/l10n/cy_GB.js
new file mode 100644
index 00000000000..1a8addf1729
--- /dev/null
+++ b/apps/files_sharing/l10n/cy_GB.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Diddymu",
+    "Shared by" : "Rhannwyd gan",
+    "Password" : "Cyfrinair",
+    "Name" : "Enw",
+    "Download" : "Llwytho i lawr"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/files_sharing/l10n/cy_GB.json b/apps/files_sharing/l10n/cy_GB.json
new file mode 100644
index 00000000000..9eebc50be7d
--- /dev/null
+++ b/apps/files_sharing/l10n/cy_GB.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "Diddymu",
+    "Shared by" : "Rhannwyd gan",
+    "Password" : "Cyfrinair",
+    "Name" : "Enw",
+    "Download" : "Llwytho i lawr"
+},"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/files_sharing/l10n/cy_GB.php b/apps/files_sharing/l10n/cy_GB.php
deleted file mode 100644
index 92ce71f1bd6..00000000000
--- a/apps/files_sharing/l10n/cy_GB.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Diddymu",
-"Shared by" => "Rhannwyd gan",
-"Password" => "Cyfrinair",
-"Name" => "Enw",
-"Download" => "Llwytho i lawr"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
new file mode 100644
index 00000000000..a706bfbf15f
--- /dev/null
+++ b/apps/files_sharing/l10n/da.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Server til serverdeling er ikke slået til på denne server",
+    "The mountpoint name contains invalid characters." : "Monteringspunktets navn indeholder ugyldige tegn.",
+    "Invalid or untrusted SSL certificate" : "Ugyldigt eller upålideligt SSL-certifikat",
+    "Couldn't add remote share" : "Kunne ikke tliføje den delte ekstern ressource",
+    "Shared with you" : "Delt med dig",
+    "Shared with others" : "Delt med andre",
+    "Shared by link" : "Delt via link",
+    "No files have been shared with you yet." : "Endnu er ingen filer delt med dig.",
+    "You haven't shared any files yet." : "Du har ikke delt nogen filer endnu.",
+    "You haven't shared any files by link yet." : "Du har ikke delt nogen filer endnu.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Vil du tilføje den eksterne deling {name} fra {owner}@{remote}?",
+    "Remote share" : "Ekstern deling",
+    "Remote share password" : "Adgangskode for ekstern deling",
+    "Cancel" : "Annuller",
+    "Add remote share" : "Tilføj ekstern deling",
+    "No ownCloud installation found at {remote}" : "Der blev ikke fundet en ownCloud-installation på {remote}",
+    "Invalid ownCloud url" : "Ugyldig ownCloud-URL",
+    "Shared by" : "Delt af",
+    "This share is password-protected" : "Delingen er beskyttet af kodeord",
+    "The password is wrong. Try again." : "Kodeordet er forkert. Prøv igen.",
+    "Password" : "Kodeord",
+    "Name" : "Navn",
+    "Share time" : "Dele periode",
+    "Sorry, this link doesn’t seem to work anymore." : "Desværre, dette link ser ikke ud til at fungerer længere.",
+    "Reasons might be:" : "Årsagen kan være:",
+    "the item was removed" : "Filen blev fjernet",
+    "the link expired" : "linket udløb",
+    "sharing is disabled" : "deling er deaktiveret",
+    "For more info, please ask the person who sent this link." : "For yderligere information, kontakt venligst personen der sendte linket. ",
+    "Add to your ownCloud" : "Tilføj til din ownCload",
+    "Download" : "Download",
+    "Download %s" : "Download %s",
+    "Direct link" : "Direkte link",
+    "Remote Shares" : "Eksterne delinger",
+    "Allow other instances to mount public links shared from this server" : "Tillad andre instanser at montere offentlige links, der er delt fra denne server",
+    "Allow users to mount public link shares" : "Tillad brugere at montere offentlige linkdelinger"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
new file mode 100644
index 00000000000..7046e3eeeed
--- /dev/null
+++ b/apps/files_sharing/l10n/da.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Server til serverdeling er ikke slået til på denne server",
+    "The mountpoint name contains invalid characters." : "Monteringspunktets navn indeholder ugyldige tegn.",
+    "Invalid or untrusted SSL certificate" : "Ugyldigt eller upålideligt SSL-certifikat",
+    "Couldn't add remote share" : "Kunne ikke tliføje den delte ekstern ressource",
+    "Shared with you" : "Delt med dig",
+    "Shared with others" : "Delt med andre",
+    "Shared by link" : "Delt via link",
+    "No files have been shared with you yet." : "Endnu er ingen filer delt med dig.",
+    "You haven't shared any files yet." : "Du har ikke delt nogen filer endnu.",
+    "You haven't shared any files by link yet." : "Du har ikke delt nogen filer endnu.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Vil du tilføje den eksterne deling {name} fra {owner}@{remote}?",
+    "Remote share" : "Ekstern deling",
+    "Remote share password" : "Adgangskode for ekstern deling",
+    "Cancel" : "Annuller",
+    "Add remote share" : "Tilføj ekstern deling",
+    "No ownCloud installation found at {remote}" : "Der blev ikke fundet en ownCloud-installation på {remote}",
+    "Invalid ownCloud url" : "Ugyldig ownCloud-URL",
+    "Shared by" : "Delt af",
+    "This share is password-protected" : "Delingen er beskyttet af kodeord",
+    "The password is wrong. Try again." : "Kodeordet er forkert. Prøv igen.",
+    "Password" : "Kodeord",
+    "Name" : "Navn",
+    "Share time" : "Dele periode",
+    "Sorry, this link doesn’t seem to work anymore." : "Desværre, dette link ser ikke ud til at fungerer længere.",
+    "Reasons might be:" : "Årsagen kan være:",
+    "the item was removed" : "Filen blev fjernet",
+    "the link expired" : "linket udløb",
+    "sharing is disabled" : "deling er deaktiveret",
+    "For more info, please ask the person who sent this link." : "For yderligere information, kontakt venligst personen der sendte linket. ",
+    "Add to your ownCloud" : "Tilføj til din ownCload",
+    "Download" : "Download",
+    "Download %s" : "Download %s",
+    "Direct link" : "Direkte link",
+    "Remote Shares" : "Eksterne delinger",
+    "Allow other instances to mount public links shared from this server" : "Tillad andre instanser at montere offentlige links, der er delt fra denne server",
+    "Allow users to mount public link shares" : "Tillad brugere at montere offentlige linkdelinger"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/da.php b/apps/files_sharing/l10n/da.php
deleted file mode 100644
index 8ab8c077be5..00000000000
--- a/apps/files_sharing/l10n/da.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Server til serverdeling er ikke slået til på denne server",
-"The mountpoint name contains invalid characters." => "Monteringspunktets navn indeholder ugyldige tegn.",
-"Invalid or untrusted SSL certificate" => "Ugyldigt eller upålideligt SSL-certifikat",
-"Couldn't add remote share" => "Kunne ikke tliføje den delte ekstern ressource",
-"Shared with you" => "Delt med dig",
-"Shared with others" => "Delt med andre",
-"Shared by link" => "Delt via link",
-"No files have been shared with you yet." => "Endnu er ingen filer delt med dig.",
-"You haven't shared any files yet." => "Du har ikke delt nogen filer endnu.",
-"You haven't shared any files by link yet." => "Du har ikke delt nogen filer endnu.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Vil du tilføje den eksterne deling {name} fra {owner}@{remote}?",
-"Remote share" => "Ekstern deling",
-"Remote share password" => "Adgangskode for ekstern deling",
-"Cancel" => "Annuller",
-"Add remote share" => "Tilføj ekstern deling",
-"No ownCloud installation found at {remote}" => "Der blev ikke fundet en ownCloud-installation på {remote}",
-"Invalid ownCloud url" => "Ugyldig ownCloud-URL",
-"Shared by" => "Delt af",
-"This share is password-protected" => "Delingen er beskyttet af kodeord",
-"The password is wrong. Try again." => "Kodeordet er forkert. Prøv igen.",
-"Password" => "Kodeord",
-"Name" => "Navn",
-"Share time" => "Dele periode",
-"Sorry, this link doesn’t seem to work anymore." => "Desværre, dette link ser ikke ud til at fungerer længere.",
-"Reasons might be:" => "Årsagen kan være:",
-"the item was removed" => "Filen blev fjernet",
-"the link expired" => "linket udløb",
-"sharing is disabled" => "deling er deaktiveret",
-"For more info, please ask the person who sent this link." => "For yderligere information, kontakt venligst personen der sendte linket. ",
-"Add to your ownCloud" => "Tilføj til din ownCload",
-"Download" => "Download",
-"Download %s" => "Download %s",
-"Direct link" => "Direkte link",
-"Remote Shares" => "Eksterne delinger",
-"Allow other instances to mount public links shared from this server" => "Tillad andre instanser at montere offentlige links, der er delt fra denne server",
-"Allow users to mount public link shares" => "Tillad brugere at montere offentlige linkdelinger"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
new file mode 100644
index 00000000000..36858c89095
--- /dev/null
+++ b/apps/files_sharing/l10n/de.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
+    "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
+    "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+    "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzu gefügt werden",
+    "Shared with you" : "Mit Dir geteilt",
+    "Shared with others" : "Von Dir geteilt",
+    "Shared by link" : "Geteilt über einen Link",
+    "No files have been shared with you yet." : "Es wurden bis jetzt keine Dateien mit Dir geteilt.",
+    "You haven't shared any files yet." : "Du hast bis jetzt keine Dateien mit anderen geteilt.",
+    "You haven't shared any files by link yet." : "Du hast bis jetzt keine Dateien über einen Link mit anderen geteilt.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchtest Du die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?",
+    "Remote share" : "Entfernte Freigabe",
+    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Cancel" : "Abbrechen",
+    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "No ownCloud installation found at {remote}" : "Keine OwnCloud-Installation auf {remote} gefunden",
+    "Invalid ownCloud url" : "Ungültige OwnCloud-URL",
+    "Shared by" : "Geteilt von ",
+    "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
+    "The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.",
+    "Password" : "Passwort",
+    "Name" : "Name",
+    "Share time" : "Zeitpunkt der Freigabe",
+    "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, frage bitte die Person, die Dir diesen Link geschickt hat.",
+    "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen",
+    "Download" : "Herunterladen",
+    "Download %s" : "Download %s",
+    "Direct link" : "Direkter Link",
+    "Remote Shares" : "Entfernte Freigaben",
+    "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
+    "Allow users to mount public link shares" : "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
new file mode 100644
index 00000000000..db6ebf3b8a6
--- /dev/null
+++ b/apps/files_sharing/l10n/de.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
+    "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
+    "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+    "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzu gefügt werden",
+    "Shared with you" : "Mit Dir geteilt",
+    "Shared with others" : "Von Dir geteilt",
+    "Shared by link" : "Geteilt über einen Link",
+    "No files have been shared with you yet." : "Es wurden bis jetzt keine Dateien mit Dir geteilt.",
+    "You haven't shared any files yet." : "Du hast bis jetzt keine Dateien mit anderen geteilt.",
+    "You haven't shared any files by link yet." : "Du hast bis jetzt keine Dateien über einen Link mit anderen geteilt.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchtest Du die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?",
+    "Remote share" : "Entfernte Freigabe",
+    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Cancel" : "Abbrechen",
+    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "No ownCloud installation found at {remote}" : "Keine OwnCloud-Installation auf {remote} gefunden",
+    "Invalid ownCloud url" : "Ungültige OwnCloud-URL",
+    "Shared by" : "Geteilt von ",
+    "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
+    "The password is wrong. Try again." : "Bitte überprüfe Dein Passwort und versuche es erneut.",
+    "Password" : "Passwort",
+    "Name" : "Name",
+    "Share time" : "Zeitpunkt der Freigabe",
+    "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, frage bitte die Person, die Dir diesen Link geschickt hat.",
+    "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen",
+    "Download" : "Herunterladen",
+    "Download %s" : "Download %s",
+    "Direct link" : "Direkter Link",
+    "Remote Shares" : "Entfernte Freigaben",
+    "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
+    "Allow users to mount public link shares" : "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
deleted file mode 100644
index 517f7c68b2e..00000000000
--- a/apps/files_sharing/l10n/de.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
-"The mountpoint name contains invalid characters." => "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
-"Invalid or untrusted SSL certificate" => "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
-"Couldn't add remote share" => "Entfernte Freigabe kann nicht hinzu gefügt werden",
-"Shared with you" => "Mit Dir geteilt",
-"Shared with others" => "Von Dir geteilt",
-"Shared by link" => "Geteilt über einen Link",
-"No files have been shared with you yet." => "Es wurden bis jetzt keine Dateien mit Dir geteilt.",
-"You haven't shared any files yet." => "Du hast bis jetzt keine Dateien mit anderen geteilt.",
-"You haven't shared any files by link yet." => "Du hast bis jetzt keine Dateien über einen Link mit anderen geteilt.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Möchtest Du die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?",
-"Remote share" => "Entfernte Freigabe",
-"Remote share password" => "Passwort für die entfernte Freigabe",
-"Cancel" => "Abbrechen",
-"Add remote share" => "Entfernte Freigabe hinzufügen",
-"No ownCloud installation found at {remote}" => "Keine OwnCloud-Installation auf {remote} gefunden",
-"Invalid ownCloud url" => "Ungültige OwnCloud-URL",
-"Shared by" => "Geteilt von ",
-"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
-"The password is wrong. Try again." => "Bitte überprüfe Dein Passwort und versuche es erneut.",
-"Password" => "Passwort",
-"Name" => "Name",
-"Share time" => "Zeitpunkt der Freigabe",
-"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, frage bitte die Person, die Dir diesen Link geschickt hat.",
-"Add to your ownCloud" => "Zu Deiner ownCloud hinzufügen",
-"Download" => "Herunterladen",
-"Download %s" => "Download %s",
-"Direct link" => "Direkter Link",
-"Remote Shares" => "Entfernte Freigaben",
-"Allow other instances to mount public links shared from this server" => "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
-"Allow users to mount public link shares" => "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_AT.js b/apps/files_sharing/l10n/de_AT.js
new file mode 100644
index 00000000000..50b8f406f80
--- /dev/null
+++ b/apps/files_sharing/l10n/de_AT.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Abbrechen",
+    "Password" : "Passwort",
+    "Download" : "Herunterladen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_AT.json b/apps/files_sharing/l10n/de_AT.json
new file mode 100644
index 00000000000..4f05c28750b
--- /dev/null
+++ b/apps/files_sharing/l10n/de_AT.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Abbrechen",
+    "Password" : "Passwort",
+    "Download" : "Herunterladen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_AT.php b/apps/files_sharing/l10n/de_AT.php
deleted file mode 100644
index ebb78eece1d..00000000000
--- a/apps/files_sharing/l10n/de_AT.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Abbrechen",
-"Password" => "Passwort",
-"Download" => "Herunterladen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_CH.js b/apps/files_sharing/l10n/de_CH.js
new file mode 100644
index 00000000000..2cdb3d47c69
--- /dev/null
+++ b/apps/files_sharing/l10n/de_CH.js
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 00000000000..a161e06bae8
--- /dev/null
+++ b/apps/files_sharing/l10n/de_CH.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Cancel" : "Abbrechen",
+    "Shared by" : "Geteilt von",
+    "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
+    "Password" : "Passwort",
+    "Name" : "Name",
+    "Sorry, this link doesn’t seem to work anymore." : "Entschuldigung, dieser Link scheint nicht mehr zu funktionieren.",
+    "Reasons might be:" : "Gründe könnten sein:",
+    "the item was removed" : "Das Element wurde entfernt",
+    "the link expired" : "Der Link ist abgelaufen",
+    "sharing is disabled" : "Teilen ist deaktiviert",
+    "For more info, please ask the person who sent this link." : "Für mehr Informationen, fragen Sie bitte die Person, die Ihnen diesen Link geschickt hat.",
+    "Download" : "Herunterladen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_CH.php b/apps/files_sharing/l10n/de_CH.php
deleted file mode 100644
index 2088d9a4030..00000000000
--- a/apps/files_sharing/l10n/de_CH.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
new file mode 100644
index 00000000000..d028d22413d
--- /dev/null
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
+    "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
+    "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+    "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden",
+    "Shared with you" : "Mit Ihnen geteilt",
+    "Shared with others" : "Von Ihnen geteilt",
+    "Shared by link" : "Geteilt über einen Link",
+    "No files have been shared with you yet." : "Es wurden bis jetzt keine Dateien mit Ihnen geteilt.",
+    "You haven't shared any files yet." : "Sie haben bis jetzt keine Dateien mit anderen geteilt.",
+    "You haven't shared any files by link yet." : "Sie haben bis jetzt keine Dateien über einen Link mit anderen geteilt.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?",
+    "Remote share" : "Entfernte Freigabe",
+    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Cancel" : "Abbrechen",
+    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "No ownCloud installation found at {remote}" : "Keine OwnCloud-Installation auf {remote} gefunden",
+    "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse",
+    "Shared by" : "Geteilt von",
+    "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
+    "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
+    "Password" : "Passwort",
+    "Name" : "Name",
+    "Share time" : "Zeitpunkt der Freigabe",
+    "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.",
+    "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen",
+    "Download" : "Herunterladen",
+    "Download %s" : "Download %s",
+    "Direct link" : "Direkte Verlinkung",
+    "Remote Shares" : "Entfernte Freigaben",
+    "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
+    "Allow users to mount public link shares" : "Benutzern das Hinzufügen von freigegebenen öffentlichen Links erlauben"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
new file mode 100644
index 00000000000..546add68233
--- /dev/null
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
+    "The mountpoint name contains invalid characters." : "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
+    "Invalid or untrusted SSL certificate" : "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
+    "Couldn't add remote share" : "Entfernte Freigabe kann nicht hinzugefügt werden",
+    "Shared with you" : "Mit Ihnen geteilt",
+    "Shared with others" : "Von Ihnen geteilt",
+    "Shared by link" : "Geteilt über einen Link",
+    "No files have been shared with you yet." : "Es wurden bis jetzt keine Dateien mit Ihnen geteilt.",
+    "You haven't shared any files yet." : "Sie haben bis jetzt keine Dateien mit anderen geteilt.",
+    "You haven't shared any files by link yet." : "Sie haben bis jetzt keine Dateien über einen Link mit anderen geteilt.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Möchten Sie die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?",
+    "Remote share" : "Entfernte Freigabe",
+    "Remote share password" : "Passwort für die entfernte Freigabe",
+    "Cancel" : "Abbrechen",
+    "Add remote share" : "Entfernte Freigabe hinzufügen",
+    "No ownCloud installation found at {remote}" : "Keine OwnCloud-Installation auf {remote} gefunden",
+    "Invalid ownCloud url" : "Ungültige OwnCloud-Adresse",
+    "Shared by" : "Geteilt von",
+    "This share is password-protected" : "Diese Freigabe ist durch ein Passwort geschützt",
+    "The password is wrong. Try again." : "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
+    "Password" : "Passwort",
+    "Name" : "Name",
+    "Share time" : "Zeitpunkt der Freigabe",
+    "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.",
+    "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen",
+    "Download" : "Herunterladen",
+    "Download %s" : "Download %s",
+    "Direct link" : "Direkte Verlinkung",
+    "Remote Shares" : "Entfernte Freigaben",
+    "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
+    "Allow users to mount public link shares" : "Benutzern das Hinzufügen von freigegebenen öffentlichen Links erlauben"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_DE.php b/apps/files_sharing/l10n/de_DE.php
deleted file mode 100644
index 231b2adb15c..00000000000
--- a/apps/files_sharing/l10n/de_DE.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Der Server für die Serverfreigabe ist auf diesem Server nicht aktiviert",
-"The mountpoint name contains invalid characters." => "Der Name des Einhängepunktes enthält nicht gültige Zeichen.",
-"Invalid or untrusted SSL certificate" => "Ungültiges oder nicht vertrauenswürdiges SSL-Zertifikat",
-"Couldn't add remote share" => "Entfernte Freigabe kann nicht hinzugefügt werden",
-"Shared with you" => "Mit Ihnen geteilt",
-"Shared with others" => "Von Ihnen geteilt",
-"Shared by link" => "Geteilt über einen Link",
-"No files have been shared with you yet." => "Es wurden bis jetzt keine Dateien mit Ihnen geteilt.",
-"You haven't shared any files yet." => "Sie haben bis jetzt keine Dateien mit anderen geteilt.",
-"You haven't shared any files by link yet." => "Sie haben bis jetzt keine Dateien über einen Link mit anderen geteilt.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Möchten Sie die entfernte Freigabe {name} von {owner}@{remote} hinzufügen?",
-"Remote share" => "Entfernte Freigabe",
-"Remote share password" => "Passwort für die entfernte Freigabe",
-"Cancel" => "Abbrechen",
-"Add remote share" => "Entfernte Freigabe hinzufügen",
-"No ownCloud installation found at {remote}" => "Keine OwnCloud-Installation auf {remote} gefunden",
-"Invalid ownCloud url" => "Ungültige OwnCloud-Adresse",
-"Shared by" => "Geteilt von",
-"This share is password-protected" => "Diese Freigabe ist durch ein Passwort geschützt",
-"The password is wrong. Try again." => "Das Passwort ist falsch. Bitte versuchen Sie es erneut.",
-"Password" => "Passwort",
-"Name" => "Name",
-"Share time" => "Zeitpunkt der Freigabe",
-"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.",
-"Add to your ownCloud" => "Zu Ihrer ownCloud hinzufügen",
-"Download" => "Herunterladen",
-"Download %s" => "Download %s",
-"Direct link" => "Direkte Verlinkung",
-"Remote Shares" => "Entfernte Freigaben",
-"Allow other instances to mount public links shared from this server" => "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
-"Allow users to mount public link shares" => "Benutzern das Hinzufügen von freigegebenen öffentlichen Links erlauben"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
new file mode 100644
index 00000000000..04be4353062
--- /dev/null
+++ b/apps/files_sharing/l10n/el.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
+    "The mountpoint name contains invalid characters." : "Το όνομα σημείου προσάρτησης περιέχει μη έγκυρους χαρακτήρες.",
+    "Invalid or untrusted SSL certificate" : "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL",
+    "Couldn't add remote share" : "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
+    "Shared with you" : "Διαμοιρασμένο με εσάς",
+    "Shared with others" : "Διαμοιρασμένο με άλλους",
+    "Shared by link" : "Διαμοιρασμένο μέσω συνδέσμου",
+    "No files have been shared with you yet." : "Κανένα αρχείο δεν έχει διαμοιραστεί ακόμα με εσάς.",
+    "You haven't shared any files yet." : "Δεν έχετε διαμοιραστεί κανένα αρχείο ακόμα.",
+    "You haven't shared any files by link yet." : "Δεν έχετε διαμοιραστεί κανένα αρχείο μέσω συνδέσμου ακόμα.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?",
+    "Remote share" : "Απομακρυσμένος κοινόχρηστος φάκελος",
+    "Remote share password" : "Κωδικός πρόσβασης απομακρυσμένου κοινόχρηστου φακέλου",
+    "Cancel" : "Άκυρο",
+    "Add remote share" : "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου",
+    "No ownCloud installation found at {remote}" : "Δεν βρέθηκε εγκατεστημένο ownCloud στο {remote}",
+    "Invalid ownCloud url" : "Άκυρη url ownCloud ",
+    "Shared by" : "Διαμοιράστηκε από",
+    "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
+    "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
+    "Password" : "Κωδικός πρόσβασης",
+    "Name" : "Όνομα",
+    "Share time" : "Χρόνος διαμοιρασμού",
+    "Sorry, this link doesn’t seem to work anymore." : "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.",
+    "Reasons might be:" : "Οι λόγοι μπορεί να είναι:",
+    "the item was removed" : "το αντικείμενο απομακρύνθηκε",
+    "the link expired" : "ο σύνδεσμος έληξε",
+    "sharing is disabled" : "ο διαμοιρασμός απενεργοποιήθηκε",
+    "For more info, please ask the person who sent this link." : "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.",
+    "Add to your ownCloud" : "Προσθήκη στο ownCloud σου",
+    "Download" : "Λήψη",
+    "Download %s" : "Λήψη %s",
+    "Direct link" : "Άμεσος σύνδεσμος",
+    "Remote Shares" : "Απομακρυσμένοι Κοινόχρηστοι Φάκελοι",
+    "Allow other instances to mount public links shared from this server" : "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή",
+    "Allow users to mount public link shares" : "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους από δημόσιους συνδέσμους"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
new file mode 100644
index 00000000000..04a86c27619
--- /dev/null
+++ b/apps/files_sharing/l10n/el.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
+    "The mountpoint name contains invalid characters." : "Το όνομα σημείου προσάρτησης περιέχει μη έγκυρους χαρακτήρες.",
+    "Invalid or untrusted SSL certificate" : "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL",
+    "Couldn't add remote share" : "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
+    "Shared with you" : "Διαμοιρασμένο με εσάς",
+    "Shared with others" : "Διαμοιρασμένο με άλλους",
+    "Shared by link" : "Διαμοιρασμένο μέσω συνδέσμου",
+    "No files have been shared with you yet." : "Κανένα αρχείο δεν έχει διαμοιραστεί ακόμα με εσάς.",
+    "You haven't shared any files yet." : "Δεν έχετε διαμοιραστεί κανένα αρχείο ακόμα.",
+    "You haven't shared any files by link yet." : "Δεν έχετε διαμοιραστεί κανένα αρχείο μέσω συνδέσμου ακόμα.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?",
+    "Remote share" : "Απομακρυσμένος κοινόχρηστος φάκελος",
+    "Remote share password" : "Κωδικός πρόσβασης απομακρυσμένου κοινόχρηστου φακέλου",
+    "Cancel" : "Άκυρο",
+    "Add remote share" : "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου",
+    "No ownCloud installation found at {remote}" : "Δεν βρέθηκε εγκατεστημένο ownCloud στο {remote}",
+    "Invalid ownCloud url" : "Άκυρη url ownCloud ",
+    "Shared by" : "Διαμοιράστηκε από",
+    "This share is password-protected" : "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
+    "The password is wrong. Try again." : "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
+    "Password" : "Κωδικός πρόσβασης",
+    "Name" : "Όνομα",
+    "Share time" : "Χρόνος διαμοιρασμού",
+    "Sorry, this link doesn’t seem to work anymore." : "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.",
+    "Reasons might be:" : "Οι λόγοι μπορεί να είναι:",
+    "the item was removed" : "το αντικείμενο απομακρύνθηκε",
+    "the link expired" : "ο σύνδεσμος έληξε",
+    "sharing is disabled" : "ο διαμοιρασμός απενεργοποιήθηκε",
+    "For more info, please ask the person who sent this link." : "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.",
+    "Add to your ownCloud" : "Προσθήκη στο ownCloud σου",
+    "Download" : "Λήψη",
+    "Download %s" : "Λήψη %s",
+    "Direct link" : "Άμεσος σύνδεσμος",
+    "Remote Shares" : "Απομακρυσμένοι Κοινόχρηστοι Φάκελοι",
+    "Allow other instances to mount public links shared from this server" : "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή",
+    "Allow users to mount public link shares" : "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους από δημόσιους συνδέσμους"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
deleted file mode 100644
index a4d8e35d90e..00000000000
--- a/apps/files_sharing/l10n/el.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Ο διαμοιρασμός μεταξύ διακομιστών δεν έχει ενεργοποιηθεί σε αυτόν το διακομιστή",
-"The mountpoint name contains invalid characters." => "Το όνομα σημείου προσάρτησης περιέχει μη έγκυρους χαρακτήρες.",
-"Invalid or untrusted SSL certificate" => "Μη έγκυρο ή μη έμπιστο πιστοποιητικό SSL",
-"Couldn't add remote share" => "Αδυναμία προσθήκης απομακρυσμένου κοινόχρηστου φακέλου",
-"Shared with you" => "Διαμοιρασμένο με εσάς",
-"Shared with others" => "Διαμοιρασμένο με άλλους",
-"Shared by link" => "Διαμοιρασμένο μέσω συνδέσμου",
-"No files have been shared with you yet." => "Κανένα αρχείο δεν έχει διαμοιραστεί ακόμα με εσάς.",
-"You haven't shared any files yet." => "Δεν έχετε διαμοιραστεί κανένα αρχείο ακόμα.",
-"You haven't shared any files by link yet." => "Δεν έχετε διαμοιραστεί κανένα αρχείο μέσω συνδέσμου ακόμα.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Θέλετε να προσθέσουμε τον απομακρυσμένο κοινόχρηστο φάκελο {name} από {owner}@{remote}?",
-"Remote share" => "Απομακρυσμένος κοινόχρηστος φάκελος",
-"Remote share password" => "Κωδικός πρόσβασης απομακρυσμένου κοινόχρηστου φακέλου",
-"Cancel" => "Άκυρο",
-"Add remote share" => "Προσθήκη απομακρυσμένου κοινόχρηστου φακέλου",
-"No ownCloud installation found at {remote}" => "Δεν βρέθηκε εγκατεστημένο ownCloud στο {remote}",
-"Invalid ownCloud url" => "Άκυρη url ownCloud ",
-"Shared by" => "Διαμοιράστηκε από",
-"This share is password-protected" => "Αυτός ο κοινόχρηστος φάκελος προστατεύεται με κωδικό",
-"The password is wrong. Try again." => "Εσφαλμένος κωδικός πρόσβασης. Προσπαθήστε ξανά.",
-"Password" => "Κωδικός πρόσβασης",
-"Name" => "Όνομα",
-"Share time" => "Χρόνος διαμοιρασμού",
-"Sorry, this link doesn’t seem to work anymore." => "Συγγνώμη, αυτός ο σύνδεσμος μοιάζει να μην ισχύει πια.",
-"Reasons might be:" => "Οι λόγοι μπορεί να είναι:",
-"the item was removed" => "το αντικείμενο απομακρύνθηκε",
-"the link expired" => "ο σύνδεσμος έληξε",
-"sharing is disabled" => "ο διαμοιρασμός απενεργοποιήθηκε",
-"For more info, please ask the person who sent this link." => "Για περισσότερες πληροφορίες, παρακαλώ ρωτήστε το άτομο που σας έστειλε αυτόν τον σύνδεσμο.",
-"Add to your ownCloud" => "Προσθήκη στο ownCloud σου",
-"Download" => "Λήψη",
-"Download %s" => "Λήψη %s",
-"Direct link" => "Άμεσος σύνδεσμος",
-"Remote Shares" => "Απομακρυσμένοι Κοινόχρηστοι Φάκελοι",
-"Allow other instances to mount public links shared from this server" => "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή",
-"Allow users to mount public link shares" => "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους από δημόσιους συνδέσμους"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en@pirate.js b/apps/files_sharing/l10n/en@pirate.js
new file mode 100644
index 00000000000..84e0fabadc6
--- /dev/null
+++ b/apps/files_sharing/l10n/en@pirate.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Password" : "Secret Code",
+    "Download" : "Download"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/en@pirate.json b/apps/files_sharing/l10n/en@pirate.json
new file mode 100644
index 00000000000..ec5b5f4b272
--- /dev/null
+++ b/apps/files_sharing/l10n/en@pirate.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Password" : "Secret Code",
+    "Download" : "Download"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/en@pirate.php b/apps/files_sharing/l10n/en@pirate.php
deleted file mode 100644
index a9271109002..00000000000
--- a/apps/files_sharing/l10n/en@pirate.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Password" => "Secret Code",
-"Download" => "Download"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
new file mode 100644
index 00000000000..16e0ff1433b
--- /dev/null
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server",
+    "The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.",
+    "Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate",
+    "Couldn't add remote share" : "Couldn't add remote share",
+    "Shared with you" : "Shared with you",
+    "Shared with others" : "Shared with others",
+    "Shared by link" : "Shared by link",
+    "No files have been shared with you yet." : "No files have been shared with you yet.",
+    "You haven't shared any files yet." : "You haven't shared any files yet.",
+    "You haven't shared any files by link yet." : "You haven't shared any files by link yet.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Do you want to add the remote share {name} from {owner}@{remote}?",
+    "Remote share" : "Remote share",
+    "Remote share password" : "Remote share password",
+    "Cancel" : "Cancel",
+    "Add remote share" : "Add remote share",
+    "No ownCloud installation found at {remote}" : "No ownCloud installation found at {remote}",
+    "Invalid ownCloud url" : "Invalid ownCloud URL",
+    "Shared by" : "Shared by",
+    "This share is password-protected" : "This share is password-protected",
+    "The password is wrong. Try again." : "The password is wrong. Try again.",
+    "Password" : "Password",
+    "Name" : "Name",
+    "Share time" : "Share time",
+    "Sorry, this link doesn’t seem to work anymore." : "Sorry, this link doesn’t seem to work anymore.",
+    "Reasons might be:" : "Reasons might be:",
+    "the item was removed" : "the item was removed",
+    "the link expired" : "the link expired",
+    "sharing is disabled" : "sharing is disabled",
+    "For more info, please ask the person who sent this link." : "For more info, please ask the person who sent this link.",
+    "Add to your ownCloud" : "Add to your ownCloud",
+    "Download" : "Download",
+    "Download %s" : "Download %s",
+    "Direct link" : "Direct link",
+    "Remote Shares" : "Remote Shares",
+    "Allow other instances to mount public links shared from this server" : "Allow other instances to mount public links shared from this server",
+    "Allow users to mount public link shares" : "Allow users to mount public link shares"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
new file mode 100644
index 00000000000..ddee5ae0535
--- /dev/null
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Server to server sharing is not enabled on this server",
+    "The mountpoint name contains invalid characters." : "The mountpoint name contains invalid characters.",
+    "Invalid or untrusted SSL certificate" : "Invalid or untrusted SSL certificate",
+    "Couldn't add remote share" : "Couldn't add remote share",
+    "Shared with you" : "Shared with you",
+    "Shared with others" : "Shared with others",
+    "Shared by link" : "Shared by link",
+    "No files have been shared with you yet." : "No files have been shared with you yet.",
+    "You haven't shared any files yet." : "You haven't shared any files yet.",
+    "You haven't shared any files by link yet." : "You haven't shared any files by link yet.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Do you want to add the remote share {name} from {owner}@{remote}?",
+    "Remote share" : "Remote share",
+    "Remote share password" : "Remote share password",
+    "Cancel" : "Cancel",
+    "Add remote share" : "Add remote share",
+    "No ownCloud installation found at {remote}" : "No ownCloud installation found at {remote}",
+    "Invalid ownCloud url" : "Invalid ownCloud URL",
+    "Shared by" : "Shared by",
+    "This share is password-protected" : "This share is password-protected",
+    "The password is wrong. Try again." : "The password is wrong. Try again.",
+    "Password" : "Password",
+    "Name" : "Name",
+    "Share time" : "Share time",
+    "Sorry, this link doesn’t seem to work anymore." : "Sorry, this link doesn’t seem to work anymore.",
+    "Reasons might be:" : "Reasons might be:",
+    "the item was removed" : "the item was removed",
+    "the link expired" : "the link expired",
+    "sharing is disabled" : "sharing is disabled",
+    "For more info, please ask the person who sent this link." : "For more info, please ask the person who sent this link.",
+    "Add to your ownCloud" : "Add to your ownCloud",
+    "Download" : "Download",
+    "Download %s" : "Download %s",
+    "Direct link" : "Direct link",
+    "Remote Shares" : "Remote Shares",
+    "Allow other instances to mount public links shared from this server" : "Allow other instances to mount public links shared from this server",
+    "Allow users to mount public link shares" : "Allow users to mount public link shares"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/en_GB.php b/apps/files_sharing/l10n/en_GB.php
deleted file mode 100644
index 66238fbb6b8..00000000000
--- a/apps/files_sharing/l10n/en_GB.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Server to server sharing is not enabled on this server",
-"The mountpoint name contains invalid characters." => "The mountpoint name contains invalid characters.",
-"Invalid or untrusted SSL certificate" => "Invalid or untrusted SSL certificate",
-"Couldn't add remote share" => "Couldn't add remote share",
-"Shared with you" => "Shared with you",
-"Shared with others" => "Shared with others",
-"Shared by link" => "Shared by link",
-"No files have been shared with you yet." => "No files have been shared with you yet.",
-"You haven't shared any files yet." => "You haven't shared any files yet.",
-"You haven't shared any files by link yet." => "You haven't shared any files by link yet.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Do you want to add the remote share {name} from {owner}@{remote}?",
-"Remote share" => "Remote share",
-"Remote share password" => "Remote share password",
-"Cancel" => "Cancel",
-"Add remote share" => "Add remote share",
-"No ownCloud installation found at {remote}" => "No ownCloud installation found at {remote}",
-"Invalid ownCloud url" => "Invalid ownCloud URL",
-"Shared by" => "Shared by",
-"This share is password-protected" => "This share is password-protected",
-"The password is wrong. Try again." => "The password is wrong. Try again.",
-"Password" => "Password",
-"Name" => "Name",
-"Share time" => "Share time",
-"Sorry, this link doesn’t seem to work anymore." => "Sorry, this link doesn’t seem to work anymore.",
-"Reasons might be:" => "Reasons might be:",
-"the item was removed" => "the item was removed",
-"the link expired" => "the link expired",
-"sharing is disabled" => "sharing is disabled",
-"For more info, please ask the person who sent this link." => "For more info, please ask the person who sent this link.",
-"Add to your ownCloud" => "Add to your ownCloud",
-"Download" => "Download",
-"Download %s" => "Download %s",
-"Direct link" => "Direct link",
-"Remote Shares" => "Remote Shares",
-"Allow other instances to mount public links shared from this server" => "Allow other instances to mount public links shared from this server",
-"Allow users to mount public link shares" => "Allow users to mount public link shares"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eo.js b/apps/files_sharing/l10n/eo.js
new file mode 100644
index 00000000000..28e1c3acdbb
--- /dev/null
+++ b/apps/files_sharing/l10n/eo.js
@@ -0,0 +1,29 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Interservila kunhavo ne kapabliĝis en ĉi tiu servilo",
+    "Shared with you" : "Kunhavata kun vi",
+    "Shared with others" : "Kunhavata kun aliaj",
+    "Shared by link" : "Kunhavata per ligilo",
+    "No files have been shared with you yet." : "Neniu dosiero kunhaviĝis kun vi ankoraŭ.",
+    "You haven't shared any files yet." : "Vi kunhavigis neniun dosieron ankoraŭ.",
+    "You haven't shared any files by link yet." : "Vi kunhavigis neniun dosieron per ligilo ankoraŭ.",
+    "Cancel" : "Nuligi",
+    "No ownCloud installation found at {remote}" : "Ne troviĝis instalo de ownCloud ĉe {remote}",
+    "Invalid ownCloud url" : "Nevalidas URL de ownCloud",
+    "Shared by" : "Kunhavigita de",
+    "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",
+    "Name" : "Nomo",
+    "Sorry, this link doesn’t seem to work anymore." : "Pardonu, ĉi tiu ligilo ŝajne ne plu funkcias.",
+    "Reasons might be:" : "Kialoj povas esti:",
+    "the item was removed" : "la ero foriĝis",
+    "the link expired" : "la ligilo eksvalidiĝis",
+    "sharing is disabled" : "kunhavigo malkapablas",
+    "For more info, please ask the person who sent this link." : "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.",
+    "Download" : "Elŝuti",
+    "Download %s" : "Elŝuti %s",
+    "Direct link" : "Direkta ligilo"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/eo.json b/apps/files_sharing/l10n/eo.json
new file mode 100644
index 00000000000..00d0d7de2aa
--- /dev/null
+++ b/apps/files_sharing/l10n/eo.json
@@ -0,0 +1,27 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Interservila kunhavo ne kapabliĝis en ĉi tiu servilo",
+    "Shared with you" : "Kunhavata kun vi",
+    "Shared with others" : "Kunhavata kun aliaj",
+    "Shared by link" : "Kunhavata per ligilo",
+    "No files have been shared with you yet." : "Neniu dosiero kunhaviĝis kun vi ankoraŭ.",
+    "You haven't shared any files yet." : "Vi kunhavigis neniun dosieron ankoraŭ.",
+    "You haven't shared any files by link yet." : "Vi kunhavigis neniun dosieron per ligilo ankoraŭ.",
+    "Cancel" : "Nuligi",
+    "No ownCloud installation found at {remote}" : "Ne troviĝis instalo de ownCloud ĉe {remote}",
+    "Invalid ownCloud url" : "Nevalidas URL de ownCloud",
+    "Shared by" : "Kunhavigita de",
+    "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",
+    "Name" : "Nomo",
+    "Sorry, this link doesn’t seem to work anymore." : "Pardonu, ĉi tiu ligilo ŝajne ne plu funkcias.",
+    "Reasons might be:" : "Kialoj povas esti:",
+    "the item was removed" : "la ero foriĝis",
+    "the link expired" : "la ligilo eksvalidiĝis",
+    "sharing is disabled" : "kunhavigo malkapablas",
+    "For more info, please ask the person who sent this link." : "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.",
+    "Download" : "Elŝuti",
+    "Download %s" : "Elŝuti %s",
+    "Direct link" : "Direkta ligilo"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
deleted file mode 100644
index 14ae1b36ffc..00000000000
--- a/apps/files_sharing/l10n/eo.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Interservila kunhavo ne kapabliĝis en ĉi tiu servilo",
-"Shared with you" => "Kunhavata kun vi",
-"Shared with others" => "Kunhavata kun aliaj",
-"Shared by link" => "Kunhavata per ligilo",
-"No files have been shared with you yet." => "Neniu dosiero kunhaviĝis kun vi ankoraŭ.",
-"You haven't shared any files yet." => "Vi kunhavigis neniun dosieron ankoraŭ.",
-"You haven't shared any files by link yet." => "Vi kunhavigis neniun dosieron per ligilo ankoraŭ.",
-"Cancel" => "Nuligi",
-"No ownCloud installation found at {remote}" => "Ne troviĝis instalo de ownCloud ĉe {remote}",
-"Invalid ownCloud url" => "Nevalidas URL de ownCloud",
-"Shared by" => "Kunhavigita de",
-"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",
-"Name" => "Nomo",
-"Sorry, this link doesn’t seem to work anymore." => "Pardonu, ĉi tiu ligilo ŝajne ne plu funkcias.",
-"Reasons might be:" => "Kialoj povas esti:",
-"the item was removed" => "la ero foriĝis",
-"the link expired" => "la ligilo eksvalidiĝis",
-"sharing is disabled" => "kunhavigo malkapablas",
-"For more info, please ask the person who sent this link." => "Por plia informo, bonvolu peti al la persono, kiu sendis ĉi tiun ligilon.",
-"Download" => "Elŝuti",
-"Download %s" => "Elŝuti %s",
-"Direct link" => "Direkta ligilo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
new file mode 100644
index 00000000000..2d0ba1b32ec
--- /dev/null
+++ b/apps/files_sharing/l10n/es.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Compartir entre servidores no está habilitado en este servidor",
+    "The mountpoint name contains invalid characters." : "El punto de montaje contiene caracteres inválidos.",
+    "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
+    "Couldn't add remote share" : "No se puede añadir un compartido remoto",
+    "Shared with you" : "Compartido contigo",
+    "Shared with others" : "Compartido con otros",
+    "Shared by link" : "Compartido por medio de enlaces",
+    "No files have been shared with you yet." : "Aún no han compartido contigo ningún archivo.",
+    "You haven't shared any files yet." : "Aún no has compartido ningún archivo.",
+    "You haven't shared any files by link yet." : "Usted todavía no ha compartido ningún archivo por medio de enlaces.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "¿Desea añadir el recurso compartido remoto {name} de {owner}@{remote}?",
+    "Remote share" : "Recurso compartido remoto",
+    "Remote share password" : "Contraseña del compartido remoto",
+    "Cancel" : "Cancelar",
+    "Add remote share" : "Añadir recurso compartido remoto",
+    "No ownCloud installation found at {remote}" : "No se encontró una instalación de ownCloud en {remote}",
+    "Invalid ownCloud url" : "URL de ownCloud inválido",
+    "Shared by" : "Compartido por",
+    "This share is password-protected" : "Este elemento compartido esta protegido por contraseña",
+    "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.",
+    "Password" : "Contraseña",
+    "Name" : "Nombre",
+    "Share time" : "Compartido hace",
+    "Sorry, this link doesn’t seem to work anymore." : "Vaya, este enlace parece que no volverá a funcionar.",
+    "Reasons might be:" : "Las causas podrían ser:",
+    "the item was removed" : "el elemento fue eliminado",
+    "the link expired" : "el enlace expiró",
+    "sharing is disabled" : "compartir está desactivado",
+    "For more info, please ask the person who sent this link." : "Para mayor información, contacte a la persona que le envió el enlace.",
+    "Add to your ownCloud" : "Agregue su propio ownCloud",
+    "Download" : "Descargar",
+    "Download %s" : "Descargar %s",
+    "Direct link" : "Enlace directo",
+    "Remote Shares" : "Almacenamiento compartido remoto",
+    "Allow other instances to mount public links shared from this server" : "Permitir a otros montar enlaces publicos compartidos de este servidor",
+    "Allow users to mount public link shares" : "Permitir a los usuarios montar enlaces publicos compartidos"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
new file mode 100644
index 00000000000..3821c00cd73
--- /dev/null
+++ b/apps/files_sharing/l10n/es.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Compartir entre servidores no está habilitado en este servidor",
+    "The mountpoint name contains invalid characters." : "El punto de montaje contiene caracteres inválidos.",
+    "Invalid or untrusted SSL certificate" : "Certificado SSL inválido o no confiable",
+    "Couldn't add remote share" : "No se puede añadir un compartido remoto",
+    "Shared with you" : "Compartido contigo",
+    "Shared with others" : "Compartido con otros",
+    "Shared by link" : "Compartido por medio de enlaces",
+    "No files have been shared with you yet." : "Aún no han compartido contigo ningún archivo.",
+    "You haven't shared any files yet." : "Aún no has compartido ningún archivo.",
+    "You haven't shared any files by link yet." : "Usted todavía no ha compartido ningún archivo por medio de enlaces.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "¿Desea añadir el recurso compartido remoto {name} de {owner}@{remote}?",
+    "Remote share" : "Recurso compartido remoto",
+    "Remote share password" : "Contraseña del compartido remoto",
+    "Cancel" : "Cancelar",
+    "Add remote share" : "Añadir recurso compartido remoto",
+    "No ownCloud installation found at {remote}" : "No se encontró una instalación de ownCloud en {remote}",
+    "Invalid ownCloud url" : "URL de ownCloud inválido",
+    "Shared by" : "Compartido por",
+    "This share is password-protected" : "Este elemento compartido esta protegido por contraseña",
+    "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.",
+    "Password" : "Contraseña",
+    "Name" : "Nombre",
+    "Share time" : "Compartido hace",
+    "Sorry, this link doesn’t seem to work anymore." : "Vaya, este enlace parece que no volverá a funcionar.",
+    "Reasons might be:" : "Las causas podrían ser:",
+    "the item was removed" : "el elemento fue eliminado",
+    "the link expired" : "el enlace expiró",
+    "sharing is disabled" : "compartir está desactivado",
+    "For more info, please ask the person who sent this link." : "Para mayor información, contacte a la persona que le envió el enlace.",
+    "Add to your ownCloud" : "Agregue su propio ownCloud",
+    "Download" : "Descargar",
+    "Download %s" : "Descargar %s",
+    "Direct link" : "Enlace directo",
+    "Remote Shares" : "Almacenamiento compartido remoto",
+    "Allow other instances to mount public links shared from this server" : "Permitir a otros montar enlaces publicos compartidos de este servidor",
+    "Allow users to mount public link shares" : "Permitir a los usuarios montar enlaces publicos compartidos"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
deleted file mode 100644
index 2611ab993d1..00000000000
--- a/apps/files_sharing/l10n/es.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Compartir entre servidores no está habilitado en este servidor",
-"The mountpoint name contains invalid characters." => "El punto de montaje contiene caracteres inválidos.",
-"Invalid or untrusted SSL certificate" => "Certificado SSL inválido o no confiable",
-"Couldn't add remote share" => "No se puede añadir un compartido remoto",
-"Shared with you" => "Compartido contigo",
-"Shared with others" => "Compartido con otros",
-"Shared by link" => "Compartido por medio de enlaces",
-"No files have been shared with you yet." => "Aún no han compartido contigo ningún archivo.",
-"You haven't shared any files yet." => "Aún no has compartido ningún archivo.",
-"You haven't shared any files by link yet." => "Usted todavía no ha compartido ningún archivo por medio de enlaces.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "¿Desea añadir el recurso compartido remoto {name} de {owner}@{remote}?",
-"Remote share" => "Recurso compartido remoto",
-"Remote share password" => "Contraseña del compartido remoto",
-"Cancel" => "Cancelar",
-"Add remote share" => "Añadir recurso compartido remoto",
-"No ownCloud installation found at {remote}" => "No se encontró una instalación de ownCloud en {remote}",
-"Invalid ownCloud url" => "URL de ownCloud inválido",
-"Shared by" => "Compartido por",
-"This share is password-protected" => "Este elemento compartido esta protegido por contraseña",
-"The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
-"Password" => "Contraseña",
-"Name" => "Nombre",
-"Share time" => "Compartido hace",
-"Sorry, this link doesn’t seem to work anymore." => "Vaya, este enlace parece que no volverá a funcionar.",
-"Reasons might be:" => "Las causas podrían ser:",
-"the item was removed" => "el elemento fue eliminado",
-"the link expired" => "el enlace expiró",
-"sharing is disabled" => "compartir está desactivado",
-"For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
-"Add to your ownCloud" => "Agregue su propio ownCloud",
-"Download" => "Descargar",
-"Download %s" => "Descargar %s",
-"Direct link" => "Enlace directo",
-"Remote Shares" => "Almacenamiento compartido remoto",
-"Allow other instances to mount public links shared from this server" => "Permitir a otros montar enlaces publicos compartidos de este servidor",
-"Allow users to mount public link shares" => "Permitir a los usuarios montar enlaces publicos compartidos"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_AR.js b/apps/files_sharing/l10n/es_AR.js
new file mode 100644
index 00000000000..b90c8293dfe
--- /dev/null
+++ b/apps/files_sharing/l10n/es_AR.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Cancelar",
+    "Shared by" : "Compartido por",
+    "This share is password-protected" : "Esto está protegido por contraseña",
+    "The password is wrong. Try again." : "La contraseña no es correcta. Probá de nuevo.",
+    "Password" : "Contraseña",
+    "Name" : "Nombre",
+    "Sorry, this link doesn’t seem to work anymore." : "Perdón, este enlace parece no funcionar más.",
+    "Reasons might be:" : "Las causas podrían ser:",
+    "the item was removed" : "el elemento fue borrado",
+    "the link expired" : "el enlace expiró",
+    "sharing is disabled" : "compartir está desactivado",
+    "For more info, please ask the person who sent this link." : "Para mayor información, contactá a la persona que te mandó el enlace.",
+    "Download" : "Descargar",
+    "Direct link" : "Vínculo directo"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es_AR.json b/apps/files_sharing/l10n/es_AR.json
new file mode 100644
index 00000000000..9e11b761eda
--- /dev/null
+++ b/apps/files_sharing/l10n/es_AR.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Cancel" : "Cancelar",
+    "Shared by" : "Compartido por",
+    "This share is password-protected" : "Esto está protegido por contraseña",
+    "The password is wrong. Try again." : "La contraseña no es correcta. Probá de nuevo.",
+    "Password" : "Contraseña",
+    "Name" : "Nombre",
+    "Sorry, this link doesn’t seem to work anymore." : "Perdón, este enlace parece no funcionar más.",
+    "Reasons might be:" : "Las causas podrían ser:",
+    "the item was removed" : "el elemento fue borrado",
+    "the link expired" : "el enlace expiró",
+    "sharing is disabled" : "compartir está desactivado",
+    "For more info, please ask the person who sent this link." : "Para mayor información, contactá a la persona que te mandó el enlace.",
+    "Download" : "Descargar",
+    "Direct link" : "Vínculo directo"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es_AR.php b/apps/files_sharing/l10n/es_AR.php
deleted file mode 100644
index 4d57018a3b3..00000000000
--- a/apps/files_sharing/l10n/es_AR.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Cancelar",
-"Shared by" => "Compartido por",
-"This share is password-protected" => "Esto está protegido por contraseña",
-"The password is wrong. Try again." => "La contraseña no es correcta. Probá de nuevo.",
-"Password" => "Contraseña",
-"Name" => "Nombre",
-"Sorry, this link doesn’t seem to work anymore." => "Perdón, este enlace parece no funcionar más.",
-"Reasons might be:" => "Las causas podrían ser:",
-"the item was removed" => "el elemento fue borrado",
-"the link expired" => "el enlace expiró",
-"sharing is disabled" => "compartir está desactivado",
-"For more info, please ask the person who sent this link." => "Para mayor información, contactá a la persona que te mandó el enlace.",
-"Download" => "Descargar",
-"Direct link" => "Vínculo directo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_CL.js b/apps/files_sharing/l10n/es_CL.js
new file mode 100644
index 00000000000..33d53eb99e4
--- /dev/null
+++ b/apps/files_sharing/l10n/es_CL.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Cancelar",
+    "Password" : "Clave",
+    "Download" : "Descargar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es_CL.json b/apps/files_sharing/l10n/es_CL.json
new file mode 100644
index 00000000000..a77aecd0347
--- /dev/null
+++ b/apps/files_sharing/l10n/es_CL.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "Cancelar",
+    "Password" : "Clave",
+    "Download" : "Descargar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es_CL.php b/apps/files_sharing/l10n/es_CL.php
deleted file mode 100644
index 3b5a3bea6f4..00000000000
--- a/apps/files_sharing/l10n/es_CL.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Cancelar",
-"Password" => "Clave",
-"Download" => "Descargar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/es_MX.js b/apps/files_sharing/l10n/es_MX.js
new file mode 100644
index 00000000000..7d608b06e45
--- /dev/null
+++ b/apps/files_sharing/l10n/es_MX.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Cancelar",
+    "Shared by" : "Compartido por",
+    "This share is password-protected" : "Este elemento compartido esta protegido por contraseña",
+    "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.",
+    "Password" : "Contraseña",
+    "Name" : "Nombre",
+    "Sorry, this link doesn’t seem to work anymore." : "Lo siento, este enlace al parecer ya no funciona.",
+    "Reasons might be:" : "Las causas podrían ser:",
+    "the item was removed" : "el elemento fue eliminado",
+    "the link expired" : "el enlace expiró",
+    "sharing is disabled" : "compartir está desactivado",
+    "For more info, please ask the person who sent this link." : "Para mayor información, contacte a la persona que le envió el enlace.",
+    "Download" : "Descargar",
+    "Direct link" : "Enlace directo"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es_MX.json b/apps/files_sharing/l10n/es_MX.json
new file mode 100644
index 00000000000..7b0cff90181
--- /dev/null
+++ b/apps/files_sharing/l10n/es_MX.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Cancel" : "Cancelar",
+    "Shared by" : "Compartido por",
+    "This share is password-protected" : "Este elemento compartido esta protegido por contraseña",
+    "The password is wrong. Try again." : "La contraseña introducida es errónea. Inténtelo de nuevo.",
+    "Password" : "Contraseña",
+    "Name" : "Nombre",
+    "Sorry, this link doesn’t seem to work anymore." : "Lo siento, este enlace al parecer ya no funciona.",
+    "Reasons might be:" : "Las causas podrían ser:",
+    "the item was removed" : "el elemento fue eliminado",
+    "the link expired" : "el enlace expiró",
+    "sharing is disabled" : "compartir está desactivado",
+    "For more info, please ask the person who sent this link." : "Para mayor información, contacte a la persona que le envió el enlace.",
+    "Download" : "Descargar",
+    "Direct link" : "Enlace directo"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es_MX.php b/apps/files_sharing/l10n/es_MX.php
deleted file mode 100644
index e86f58ed6a3..00000000000
--- a/apps/files_sharing/l10n/es_MX.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Cancelar",
-"Shared by" => "Compartido por",
-"This share is password-protected" => "Este elemento compartido esta protegido por contraseña",
-"The password is wrong. Try again." => "La contraseña introducida es errónea. Inténtelo de nuevo.",
-"Password" => "Contraseña",
-"Name" => "Nombre",
-"Sorry, this link doesn’t seem to work anymore." => "Lo siento, este enlace al parecer ya no funciona.",
-"Reasons might be:" => "Las causas podrían ser:",
-"the item was removed" => "el elemento fue eliminado",
-"the link expired" => "el enlace expiró",
-"sharing is disabled" => "compartir está desactivado",
-"For more info, please ask the person who sent this link." => "Para mayor información, contacte a la persona que le envió el enlace.",
-"Download" => "Descargar",
-"Direct link" => "Enlace directo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
new file mode 100644
index 00000000000..51389730f0f
--- /dev/null
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "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",
+    "Couldn't add remote share" : "Ei suutnud lisada kaugjagamist",
+    "Shared with you" : "Sinuga jagatud",
+    "Shared with others" : "Teistega jagatud",
+    "Shared by link" : "Jagatud lingiga",
+    "No files have been shared with you yet." : "Sinuga pole veel ühtegi faili jagatud.",
+    "You haven't shared any files yet." : "Sa pole jaganud veel ühtegi faili.",
+    "You haven't shared any files by link yet." : "Sa pole lingiga jaganud veel ühtegi faili.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?",
+    "Remote share" : "Kaugjagamine",
+    "Remote share password" : "Kaugjagamise parool",
+    "Cancel" : "Loobu",
+    "Add remote share" : "Lisa kaugjagamine",
+    "No ownCloud installation found at {remote}" : "Ei leitud ownCloud paigaldust asukohas {remote}",
+    "Invalid ownCloud url" : "Vigane ownCloud url",
+    "Shared by" : "Jagas",
+    "This share is password-protected" : "See jagamine on parooliga kaitstud",
+    "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.",
+    "Password" : "Parool",
+    "Name" : "Nimi",
+    "Share time" : "Jagamise aeg",
+    "Sorry, this link doesn’t seem to work anymore." : "Vabandust, see link ei tundu enam toimivat.",
+    "Reasons might be:" : "Põhjused võivad olla:",
+    "the item was removed" : "üksus on eemaldatud",
+    "the link expired" : "link on aegunud",
+    "sharing is disabled" : "jagamine on peatatud",
+    "For more info, please ask the person who sent this link." : "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.",
+    "Add to your ownCloud" : "Lisa oma ownCloudi",
+    "Download" : "Lae alla",
+    "Download %s" : "Laadi alla %s",
+    "Direct link" : "Otsene link",
+    "Remote Shares" : "Eemalolevad jagamised",
+    "Allow other instances to mount public links shared from this server" : "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke",
+    "Allow users to mount public link shares" : "Luba kasutajatel ühendada jagatud avalikke linke"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
new file mode 100644
index 00000000000..9b54f73f88d
--- /dev/null
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "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",
+    "Couldn't add remote share" : "Ei suutnud lisada kaugjagamist",
+    "Shared with you" : "Sinuga jagatud",
+    "Shared with others" : "Teistega jagatud",
+    "Shared by link" : "Jagatud lingiga",
+    "No files have been shared with you yet." : "Sinuga pole veel ühtegi faili jagatud.",
+    "You haven't shared any files yet." : "Sa pole jaganud veel ühtegi faili.",
+    "You haven't shared any files by link yet." : "Sa pole lingiga jaganud veel ühtegi faili.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?",
+    "Remote share" : "Kaugjagamine",
+    "Remote share password" : "Kaugjagamise parool",
+    "Cancel" : "Loobu",
+    "Add remote share" : "Lisa kaugjagamine",
+    "No ownCloud installation found at {remote}" : "Ei leitud ownCloud paigaldust asukohas {remote}",
+    "Invalid ownCloud url" : "Vigane ownCloud url",
+    "Shared by" : "Jagas",
+    "This share is password-protected" : "See jagamine on parooliga kaitstud",
+    "The password is wrong. Try again." : "Parool on vale. Proovi uuesti.",
+    "Password" : "Parool",
+    "Name" : "Nimi",
+    "Share time" : "Jagamise aeg",
+    "Sorry, this link doesn’t seem to work anymore." : "Vabandust, see link ei tundu enam toimivat.",
+    "Reasons might be:" : "Põhjused võivad olla:",
+    "the item was removed" : "üksus on eemaldatud",
+    "the link expired" : "link on aegunud",
+    "sharing is disabled" : "jagamine on peatatud",
+    "For more info, please ask the person who sent this link." : "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.",
+    "Add to your ownCloud" : "Lisa oma ownCloudi",
+    "Download" : "Lae alla",
+    "Download %s" : "Laadi alla %s",
+    "Direct link" : "Otsene link",
+    "Remote Shares" : "Eemalolevad jagamised",
+    "Allow other instances to mount public links shared from this server" : "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke",
+    "Allow users to mount public link shares" : "Luba kasutajatel ühendada jagatud avalikke linke"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
deleted file mode 100644
index e087af6b9e3..00000000000
--- a/apps/files_sharing/l10n/et_EE.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"Couldn't add remote share" => "Ei suutnud lisada kaugjagamist",
-"Shared with you" => "Sinuga jagatud",
-"Shared with others" => "Teistega jagatud",
-"Shared by link" => "Jagatud lingiga",
-"No files have been shared with you yet." => "Sinuga pole veel ühtegi faili jagatud.",
-"You haven't shared any files yet." => "Sa pole jaganud veel ühtegi faili.",
-"You haven't shared any files by link yet." => "Sa pole lingiga jaganud veel ühtegi faili.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Soovid lisata kaugjagamise {name} asukohast {owner}@{remote}?",
-"Remote share" => "Kaugjagamine",
-"Remote share password" => "Kaugjagamise parool",
-"Cancel" => "Loobu",
-"Add remote share" => "Lisa kaugjagamine",
-"No ownCloud installation found at {remote}" => "Ei leitud ownCloud paigaldust asukohas {remote}",
-"Invalid ownCloud url" => "Vigane ownCloud url",
-"Shared by" => "Jagas",
-"This share is password-protected" => "See jagamine on parooliga kaitstud",
-"The password is wrong. Try again." => "Parool on vale. Proovi uuesti.",
-"Password" => "Parool",
-"Name" => "Nimi",
-"Share time" => "Jagamise aeg",
-"Sorry, this link doesn’t seem to work anymore." => "Vabandust, see link ei tundu enam toimivat.",
-"Reasons might be:" => "Põhjused võivad olla:",
-"the item was removed" => "üksus on eemaldatud",
-"the link expired" => "link on aegunud",
-"sharing is disabled" => "jagamine on peatatud",
-"For more info, please ask the person who sent this link." => "Täpsema info saamiseks palun pöördu lingi saatnud isiku poole.",
-"Add to your ownCloud" => "Lisa oma ownCloudi",
-"Download" => "Lae alla",
-"Download %s" => "Laadi alla %s",
-"Direct link" => "Otsene link",
-"Remote Shares" => "Eemalolevad jagamised",
-"Allow other instances to mount public links shared from this server" => "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke",
-"Allow users to mount public link shares" => "Luba kasutajatel ühendada jagatud avalikke linke"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js
new file mode 100644
index 00000000000..e9b08e31668
--- /dev/null
+++ b/apps/files_sharing/l10n/eu.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
+    "Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu",
+    "Shared with you" : "Zurekin elkarbanatuta",
+    "Shared with others" : "Beste batzuekin elkarbanatuta",
+    "Shared by link" : "Lotura bidez elkarbanatuta",
+    "No files have been shared with you yet." : "Ez da zurekin fitxategirik elkarbanatu oraindik.",
+    "You haven't shared any files yet." : "Ez duzu oraindik fitxategirik elkarbanatu.",
+    "You haven't shared any files by link yet." : "Ez duzu oraindik fitxategirik lotura bidez elkarbanatu.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Nahi duzu gehitzea  {name}  urrutiko partekatzea honengandik  {owner}@{remote}?",
+    "Remote share" : "Urrutiko parte hartzea",
+    "Remote share password" : "Urrutiko parte hartzeen pasahitza",
+    "Cancel" : "Ezeztatu",
+    "Add remote share" : "Gehitu urrutiko parte hartzea",
+    "No ownCloud installation found at {remote}" : "Ez da ownClouden instalaziorik aurkitu {remote}n",
+    "Invalid ownCloud url" : "ownCloud url baliogabea",
+    "Shared by" : "Honek elkarbanatuta",
+    "This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago",
+    "The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.",
+    "Password" : "Pasahitza",
+    "Name" : "Izena",
+    "Share time" : "Elkarbanatze unea",
+    "Sorry, this link doesn’t seem to work anymore." : "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
+    "Reasons might be:" : "Arrazoiak hurrengoak litezke:",
+    "the item was removed" : "fitxategia ezbatua izan da",
+    "the link expired" : "lotura iraungi da",
+    "sharing is disabled" : "elkarbanatzea ez dago gaituta",
+    "For more info, please ask the person who sent this link." : "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari",
+    "Add to your ownCloud" : "Gehitu zure ownCloud-era",
+    "Download" : "Deskargatu",
+    "Download %s" : "Deskargatu %s",
+    "Direct link" : "Lotura zuzena",
+    "Remote Shares" : "Urrutiko parte hartzeak",
+    "Allow other instances to mount public links shared from this server" : "Baimendu beste instantziak zerbitzari honetatik elkarbanatutako lotura publikoak kargatzen",
+    "Allow users to mount public link shares" : "Baimendu erabiltzaileak lotura publiko bidezko elkarbanaketak muntatzen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json
new file mode 100644
index 00000000000..f991273372a
--- /dev/null
+++ b/apps/files_sharing/l10n/eu.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
+    "Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu",
+    "Shared with you" : "Zurekin elkarbanatuta",
+    "Shared with others" : "Beste batzuekin elkarbanatuta",
+    "Shared by link" : "Lotura bidez elkarbanatuta",
+    "No files have been shared with you yet." : "Ez da zurekin fitxategirik elkarbanatu oraindik.",
+    "You haven't shared any files yet." : "Ez duzu oraindik fitxategirik elkarbanatu.",
+    "You haven't shared any files by link yet." : "Ez duzu oraindik fitxategirik lotura bidez elkarbanatu.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Nahi duzu gehitzea  {name}  urrutiko partekatzea honengandik  {owner}@{remote}?",
+    "Remote share" : "Urrutiko parte hartzea",
+    "Remote share password" : "Urrutiko parte hartzeen pasahitza",
+    "Cancel" : "Ezeztatu",
+    "Add remote share" : "Gehitu urrutiko parte hartzea",
+    "No ownCloud installation found at {remote}" : "Ez da ownClouden instalaziorik aurkitu {remote}n",
+    "Invalid ownCloud url" : "ownCloud url baliogabea",
+    "Shared by" : "Honek elkarbanatuta",
+    "This share is password-protected" : "Elkarbanatutako hau pasahitzarekin babestuta dago",
+    "The password is wrong. Try again." : "Pasahitza ez da egokia. Saiatu berriro.",
+    "Password" : "Pasahitza",
+    "Name" : "Izena",
+    "Share time" : "Elkarbanatze unea",
+    "Sorry, this link doesn’t seem to work anymore." : "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
+    "Reasons might be:" : "Arrazoiak hurrengoak litezke:",
+    "the item was removed" : "fitxategia ezbatua izan da",
+    "the link expired" : "lotura iraungi da",
+    "sharing is disabled" : "elkarbanatzea ez dago gaituta",
+    "For more info, please ask the person who sent this link." : "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari",
+    "Add to your ownCloud" : "Gehitu zure ownCloud-era",
+    "Download" : "Deskargatu",
+    "Download %s" : "Deskargatu %s",
+    "Direct link" : "Lotura zuzena",
+    "Remote Shares" : "Urrutiko parte hartzeak",
+    "Allow other instances to mount public links shared from this server" : "Baimendu beste instantziak zerbitzari honetatik elkarbanatutako lotura publikoak kargatzen",
+    "Allow users to mount public link shares" : "Baimendu erabiltzaileak lotura publiko bidezko elkarbanaketak muntatzen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
deleted file mode 100644
index 935609eb0df..00000000000
--- a/apps/files_sharing/l10n/eu.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
-"The mountpoint name contains invalid characters." => "Montatze puntuaren izenak baliogabeko karaktereak ditu.",
-"Invalid or untrusted SSL certificate" => "SSL ziurtagiri baliogabea edo fidagaitza",
-"Couldn't add remote share" => "Ezin izan da hurruneko elkarbanaketa gehitu",
-"Shared with you" => "Zurekin elkarbanatuta",
-"Shared with others" => "Beste batzuekin elkarbanatuta",
-"Shared by link" => "Lotura bidez elkarbanatuta",
-"No files have been shared with you yet." => "Ez da zurekin fitxategirik elkarbanatu oraindik.",
-"You haven't shared any files yet." => "Ez duzu oraindik fitxategirik elkarbanatu.",
-"You haven't shared any files by link yet." => "Ez duzu oraindik fitxategirik lotura bidez elkarbanatu.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Nahi duzu gehitzea  {name}  urrutiko partekatzea honengandik  {owner}@{remote}?",
-"Remote share" => "Urrutiko parte hartzea",
-"Remote share password" => "Urrutiko parte hartzeen pasahitza",
-"Cancel" => "Ezeztatu",
-"Add remote share" => "Gehitu urrutiko parte hartzea",
-"No ownCloud installation found at {remote}" => "Ez da ownClouden instalaziorik aurkitu {remote}n",
-"Invalid ownCloud url" => "ownCloud url baliogabea",
-"Shared by" => "Honek elkarbanatuta",
-"This share is password-protected" => "Elkarbanatutako hau pasahitzarekin babestuta dago",
-"The password is wrong. Try again." => "Pasahitza ez da egokia. Saiatu berriro.",
-"Password" => "Pasahitza",
-"Name" => "Izena",
-"Share time" => "Elkarbanatze unea",
-"Sorry, this link doesn’t seem to work anymore." => "Barkatu, lotura ez dirudi eskuragarria dagoenik.",
-"Reasons might be:" => "Arrazoiak hurrengoak litezke:",
-"the item was removed" => "fitxategia ezbatua izan da",
-"the link expired" => "lotura iraungi da",
-"sharing is disabled" => "elkarbanatzea ez dago gaituta",
-"For more info, please ask the person who sent this link." => "Informazio gehiagorako, mesedez eskatu lotura hau bidali zuen pertsonari",
-"Add to your ownCloud" => "Gehitu zure ownCloud-era",
-"Download" => "Deskargatu",
-"Download %s" => "Deskargatu %s",
-"Direct link" => "Lotura zuzena",
-"Remote Shares" => "Urrutiko parte hartzeak",
-"Allow other instances to mount public links shared from this server" => "Baimendu beste instantziak zerbitzari honetatik elkarbanatutako lotura publikoak kargatzen",
-"Allow users to mount public link shares" => "Baimendu erabiltzaileak lotura publiko bidezko elkarbanaketak muntatzen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/eu_ES.js b/apps/files_sharing/l10n/eu_ES.js
new file mode 100644
index 00000000000..240f0181559
--- /dev/null
+++ b/apps/files_sharing/l10n/eu_ES.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..9adbb2b8185
--- /dev/null
+++ b/apps/files_sharing/l10n/eu_ES.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Cancel" : "Ezeztatu",
+    "Download" : "Deskargatu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/eu_ES.php b/apps/files_sharing/l10n/eu_ES.php
deleted file mode 100644
index c6d9c9eb733..00000000000
--- a/apps/files_sharing/l10n/eu_ES.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Ezeztatu",
-"Download" => "Deskargatu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js
new file mode 100644
index 00000000000..7bf3b3b6654
--- /dev/null
+++ b/apps/files_sharing/l10n/fa.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "اشتراک سرور به سرور در این سرور فعال نیست .",
+    "Invalid or untrusted SSL certificate" : "گواهینامه SSL غیر قابل اعتماد یا غیر معتبر است.",
+    "Couldn't add remote share" : "امکان افزودن اشتراک گذاری از راه دور وجود ندارد",
+    "Shared with you" : "موارد به اشتراک گذاشته شده با شما",
+    "Shared with others" : "موارد به اشتراک گذاشته شده با دیگران",
+    "Shared by link" : "اشتراک گذاشته شده از طریق پیوند",
+    "No files have been shared with you yet." : "هنوز هیچ فایلی با شما به اشتراک گذاشته نشده است.",
+    "You haven't shared any files yet." : "شما هنوز هیچ فایلی را به اشتراک نگذاشته اید.",
+    "You haven't shared any files by link yet." : "شما هنوز هیچ فایلی را از طریق پیوند با کسی به اشتراک نگذاشته اید.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "آیا مایل به افزودن اشتراک از راه دور {name} از {owner}@{remote} هستید.",
+    "Remote share" : "اشتراک از راه دور",
+    "Remote share password" : "رمز عبور اشتراک از راه دور",
+    "Cancel" : "منصرف شدن",
+    "Add remote share" : "افزودن اشتراک از راه دور",
+    "No ownCloud installation found at {remote}" : "نمونه ای از ownCloud نصب شده در {remote} یافت نشد",
+    "Invalid ownCloud url" : "آدرس نمونه ownCloud  غیر معتبر است",
+    "Shared by" : "اشتراک گذاشته شده به وسیله",
+    "This share is password-protected" : "این اشتراک توسط رمز عبور محافظت می شود",
+    "The password is wrong. Try again." : "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
+    "Password" : "گذرواژه",
+    "Name" : "نام",
+    "Share time" : "زمان به اشتراک گذاری",
+    "Sorry, this link doesn’t seem to work anymore." : "متاسفانه این پیوند دیگر کار نمی کند",
+    "Reasons might be:" : "ممکن است به این دلایل باشد:",
+    "the item was removed" : "این مورد حذف شده است",
+    "the link expired" : "این پیوند منقضی شده است",
+    "sharing is disabled" : "قابلیت اشتراک گذاری غیرفعال است",
+    "For more info, please ask the person who sent this link." : "برای اطلاعات بیشتر، لطفا از شخصی که این پیوند را ارسال کرده سوال بفرمایید.",
+    "Add to your ownCloud" : "افزودن به ownCloud شما",
+    "Download" : "دانلود",
+    "Download %s" : "دانلود %s",
+    "Direct link" : "پیوند مستقیم",
+    "Remote Shares" : "اشتراک های از راه دور",
+    "Allow other instances to mount public links shared from this server" : "اجازه به نمونه های دیگر برای مانت کردن پیوند های عمومی به اشتراک گذاشته شده از این سرور",
+    "Allow users to mount public link shares" : "اجازه دادن به کاربران برای مانت پیوندهای عمومی موارد به اشتراک گذاری"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json
new file mode 100644
index 00000000000..8b1cc8a85bb
--- /dev/null
+++ b/apps/files_sharing/l10n/fa.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "اشتراک سرور به سرور در این سرور فعال نیست .",
+    "Invalid or untrusted SSL certificate" : "گواهینامه SSL غیر قابل اعتماد یا غیر معتبر است.",
+    "Couldn't add remote share" : "امکان افزودن اشتراک گذاری از راه دور وجود ندارد",
+    "Shared with you" : "موارد به اشتراک گذاشته شده با شما",
+    "Shared with others" : "موارد به اشتراک گذاشته شده با دیگران",
+    "Shared by link" : "اشتراک گذاشته شده از طریق پیوند",
+    "No files have been shared with you yet." : "هنوز هیچ فایلی با شما به اشتراک گذاشته نشده است.",
+    "You haven't shared any files yet." : "شما هنوز هیچ فایلی را به اشتراک نگذاشته اید.",
+    "You haven't shared any files by link yet." : "شما هنوز هیچ فایلی را از طریق پیوند با کسی به اشتراک نگذاشته اید.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "آیا مایل به افزودن اشتراک از راه دور {name} از {owner}@{remote} هستید.",
+    "Remote share" : "اشتراک از راه دور",
+    "Remote share password" : "رمز عبور اشتراک از راه دور",
+    "Cancel" : "منصرف شدن",
+    "Add remote share" : "افزودن اشتراک از راه دور",
+    "No ownCloud installation found at {remote}" : "نمونه ای از ownCloud نصب شده در {remote} یافت نشد",
+    "Invalid ownCloud url" : "آدرس نمونه ownCloud  غیر معتبر است",
+    "Shared by" : "اشتراک گذاشته شده به وسیله",
+    "This share is password-protected" : "این اشتراک توسط رمز عبور محافظت می شود",
+    "The password is wrong. Try again." : "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
+    "Password" : "گذرواژه",
+    "Name" : "نام",
+    "Share time" : "زمان به اشتراک گذاری",
+    "Sorry, this link doesn’t seem to work anymore." : "متاسفانه این پیوند دیگر کار نمی کند",
+    "Reasons might be:" : "ممکن است به این دلایل باشد:",
+    "the item was removed" : "این مورد حذف شده است",
+    "the link expired" : "این پیوند منقضی شده است",
+    "sharing is disabled" : "قابلیت اشتراک گذاری غیرفعال است",
+    "For more info, please ask the person who sent this link." : "برای اطلاعات بیشتر، لطفا از شخصی که این پیوند را ارسال کرده سوال بفرمایید.",
+    "Add to your ownCloud" : "افزودن به ownCloud شما",
+    "Download" : "دانلود",
+    "Download %s" : "دانلود %s",
+    "Direct link" : "پیوند مستقیم",
+    "Remote Shares" : "اشتراک های از راه دور",
+    "Allow other instances to mount public links shared from this server" : "اجازه به نمونه های دیگر برای مانت کردن پیوند های عمومی به اشتراک گذاشته شده از این سرور",
+    "Allow users to mount public link shares" : "اجازه دادن به کاربران برای مانت پیوندهای عمومی موارد به اشتراک گذاری"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fa.php b/apps/files_sharing/l10n/fa.php
deleted file mode 100644
index 5b55438c4ff..00000000000
--- a/apps/files_sharing/l10n/fa.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "اشتراک سرور به سرور در این سرور فعال نیست .",
-"Invalid or untrusted SSL certificate" => "گواهینامه SSL غیر قابل اعتماد یا غیر معتبر است.",
-"Couldn't add remote share" => "امکان افزودن اشتراک گذاری از راه دور وجود ندارد",
-"Shared with you" => "موارد به اشتراک گذاشته شده با شما",
-"Shared with others" => "موارد به اشتراک گذاشته شده با دیگران",
-"Shared by link" => "اشتراک گذاشته شده از طریق پیوند",
-"No files have been shared with you yet." => "هنوز هیچ فایلی با شما به اشتراک گذاشته نشده است.",
-"You haven't shared any files yet." => "شما هنوز هیچ فایلی را به اشتراک نگذاشته اید.",
-"You haven't shared any files by link yet." => "شما هنوز هیچ فایلی را از طریق پیوند با کسی به اشتراک نگذاشته اید.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "آیا مایل به افزودن اشتراک از راه دور {name} از {owner}@{remote} هستید.",
-"Remote share" => "اشتراک از راه دور",
-"Remote share password" => "رمز عبور اشتراک از راه دور",
-"Cancel" => "منصرف شدن",
-"Add remote share" => "افزودن اشتراک از راه دور",
-"No ownCloud installation found at {remote}" => "نمونه ای از ownCloud نصب شده در {remote} یافت نشد",
-"Invalid ownCloud url" => "آدرس نمونه ownCloud  غیر معتبر است",
-"Shared by" => "اشتراک گذاشته شده به وسیله",
-"This share is password-protected" => "این اشتراک توسط رمز عبور محافظت می شود",
-"The password is wrong. Try again." => "رمزعبور اشتباه می باشد. دوباره امتحان کنید.",
-"Password" => "گذرواژه",
-"Name" => "نام",
-"Share time" => "زمان به اشتراک گذاری",
-"Sorry, this link doesn’t seem to work anymore." => "متاسفانه این پیوند دیگر کار نمی کند",
-"Reasons might be:" => "ممکن است به این دلایل باشد:",
-"the item was removed" => "این مورد حذف شده است",
-"the link expired" => "این پیوند منقضی شده است",
-"sharing is disabled" => "قابلیت اشتراک گذاری غیرفعال است",
-"For more info, please ask the person who sent this link." => "برای اطلاعات بیشتر، لطفا از شخصی که این پیوند را ارسال کرده سوال بفرمایید.",
-"Add to your ownCloud" => "افزودن به ownCloud شما",
-"Download" => "دانلود",
-"Download %s" => "دانلود %s",
-"Direct link" => "پیوند مستقیم",
-"Remote Shares" => "اشتراک های از راه دور",
-"Allow other instances to mount public links shared from this server" => "اجازه به نمونه های دیگر برای مانت کردن پیوند های عمومی به اشتراک گذاشته شده از این سرور",
-"Allow users to mount public link shares" => "اجازه دادن به کاربران برای مانت پیوندهای عمومی موارد به اشتراک گذاری"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
new file mode 100644
index 00000000000..ffa5e25dd4f
--- /dev/null
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella",
+    "The mountpoint name contains invalid characters." : "Liitospisteen nimi sisältää virheellisiä merkkejä.",
+    "Invalid or untrusted SSL certificate" : "Virheellinen tai ei-luotettu SSL-varmenne",
+    "Couldn't add remote share" : "Etäjaon liittäminen epäonnistui",
+    "Shared with you" : "Jaettu kanssasi",
+    "Shared with others" : "Jaettu muiden kanssa",
+    "Shared by link" : "Jaettu linkin kautta",
+    "No files have been shared with you yet." : "Kukaan ei ole jakanut tiedostoja kanssasi vielä.",
+    "You haven't shared any files yet." : "Et ole jakanut yhtäkään tiedostoa vielä.",
+    "You haven't shared any files by link yet." : "Et ole vielä jakanut yhtäkään tiedostoa linkin kautta.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Haluatko lisätä etäjaon {name} kohteesta {owner}@{remote}?",
+    "Remote share" : "Etäjako",
+    "Remote share password" : "Etäjaon salasana",
+    "Cancel" : "Peru",
+    "Add remote share" : "Lisää etäjako",
+    "No ownCloud installation found at {remote}" : "ownCloud-asennusta ei löytynyt kohteesta {remote}",
+    "Invalid ownCloud url" : "Virheellinen ownCloud-osoite",
+    "Shared by" : "Jakanut",
+    "This share is password-protected" : "Tämä jako on suojattu salasanalla",
+    "The password is wrong. Try again." : "Väärä salasana. Yritä uudelleen.",
+    "Password" : "Salasana",
+    "Name" : "Nimi",
+    "Share time" : "Jakamisen ajankohta",
+    "Sorry, this link doesn’t seem to work anymore." : "Valitettavasti linkki ei vaikuta enää toimivan.",
+    "Reasons might be:" : "Mahdollisia syitä:",
+    "the item was removed" : "kohde poistettiin",
+    "the link expired" : "linkki vanheni",
+    "sharing is disabled" : "jakaminen on poistettu käytöstä",
+    "For more info, please ask the person who sent this link." : "Kysy lisätietoja henkilöltä, jolta sait linkin.",
+    "Add to your ownCloud" : "Lisää ownCloudiisi",
+    "Download" : "Lataa",
+    "Download %s" : "Lataa %s",
+    "Direct link" : "Suora linkki",
+    "Remote Shares" : "Etäjaot",
+    "Allow other instances to mount public links shared from this server" : "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä",
+    "Allow users to mount public link shares" : "Salli käyttäjien liittää julkisia linkkijakoja"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
new file mode 100644
index 00000000000..eba4df5b7b9
--- /dev/null
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella",
+    "The mountpoint name contains invalid characters." : "Liitospisteen nimi sisältää virheellisiä merkkejä.",
+    "Invalid or untrusted SSL certificate" : "Virheellinen tai ei-luotettu SSL-varmenne",
+    "Couldn't add remote share" : "Etäjaon liittäminen epäonnistui",
+    "Shared with you" : "Jaettu kanssasi",
+    "Shared with others" : "Jaettu muiden kanssa",
+    "Shared by link" : "Jaettu linkin kautta",
+    "No files have been shared with you yet." : "Kukaan ei ole jakanut tiedostoja kanssasi vielä.",
+    "You haven't shared any files yet." : "Et ole jakanut yhtäkään tiedostoa vielä.",
+    "You haven't shared any files by link yet." : "Et ole vielä jakanut yhtäkään tiedostoa linkin kautta.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Haluatko lisätä etäjaon {name} kohteesta {owner}@{remote}?",
+    "Remote share" : "Etäjako",
+    "Remote share password" : "Etäjaon salasana",
+    "Cancel" : "Peru",
+    "Add remote share" : "Lisää etäjako",
+    "No ownCloud installation found at {remote}" : "ownCloud-asennusta ei löytynyt kohteesta {remote}",
+    "Invalid ownCloud url" : "Virheellinen ownCloud-osoite",
+    "Shared by" : "Jakanut",
+    "This share is password-protected" : "Tämä jako on suojattu salasanalla",
+    "The password is wrong. Try again." : "Väärä salasana. Yritä uudelleen.",
+    "Password" : "Salasana",
+    "Name" : "Nimi",
+    "Share time" : "Jakamisen ajankohta",
+    "Sorry, this link doesn’t seem to work anymore." : "Valitettavasti linkki ei vaikuta enää toimivan.",
+    "Reasons might be:" : "Mahdollisia syitä:",
+    "the item was removed" : "kohde poistettiin",
+    "the link expired" : "linkki vanheni",
+    "sharing is disabled" : "jakaminen on poistettu käytöstä",
+    "For more info, please ask the person who sent this link." : "Kysy lisätietoja henkilöltä, jolta sait linkin.",
+    "Add to your ownCloud" : "Lisää ownCloudiisi",
+    "Download" : "Lataa",
+    "Download %s" : "Lataa %s",
+    "Direct link" : "Suora linkki",
+    "Remote Shares" : "Etäjaot",
+    "Allow other instances to mount public links shared from this server" : "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä",
+    "Allow users to mount public link shares" : "Salli käyttäjien liittää julkisia linkkijakoja"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
deleted file mode 100644
index 210b2d57d37..00000000000
--- a/apps/files_sharing/l10n/fi_FI.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Palvelimelta-palvelimelle-jakaminen ei ole käytössä tällä palvelimella",
-"The mountpoint name contains invalid characters." => "Liitospisteen nimi sisältää virheellisiä merkkejä.",
-"Invalid or untrusted SSL certificate" => "Virheellinen tai ei-luotettu SSL-varmenne",
-"Couldn't add remote share" => "Etäjaon liittäminen epäonnistui",
-"Shared with you" => "Jaettu kanssasi",
-"Shared with others" => "Jaettu muiden kanssa",
-"Shared by link" => "Jaettu linkin kautta",
-"No files have been shared with you yet." => "Kukaan ei ole jakanut tiedostoja kanssasi vielä.",
-"You haven't shared any files yet." => "Et ole jakanut yhtäkään tiedostoa vielä.",
-"You haven't shared any files by link yet." => "Et ole vielä jakanut yhtäkään tiedostoa linkin kautta.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Haluatko lisätä etäjaon {name} kohteesta {owner}@{remote}?",
-"Remote share" => "Etäjako",
-"Remote share password" => "Etäjaon salasana",
-"Cancel" => "Peru",
-"Add remote share" => "Lisää etäjako",
-"No ownCloud installation found at {remote}" => "ownCloud-asennusta ei löytynyt kohteesta {remote}",
-"Invalid ownCloud url" => "Virheellinen ownCloud-osoite",
-"Shared by" => "Jakanut",
-"This share is password-protected" => "Tämä jako on suojattu salasanalla",
-"The password is wrong. Try again." => "Väärä salasana. Yritä uudelleen.",
-"Password" => "Salasana",
-"Name" => "Nimi",
-"Share time" => "Jakamisen ajankohta",
-"Sorry, this link doesn’t seem to work anymore." => "Valitettavasti linkki ei vaikuta enää toimivan.",
-"Reasons might be:" => "Mahdollisia syitä:",
-"the item was removed" => "kohde poistettiin",
-"the link expired" => "linkki vanheni",
-"sharing is disabled" => "jakaminen on poistettu käytöstä",
-"For more info, please ask the person who sent this link." => "Kysy lisätietoja henkilöltä, jolta sait linkin.",
-"Add to your ownCloud" => "Lisää ownCloudiisi",
-"Download" => "Lataa",
-"Download %s" => "Lataa %s",
-"Direct link" => "Suora linkki",
-"Remote Shares" => "Etäjaot",
-"Allow other instances to mount public links shared from this server" => "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä",
-"Allow users to mount public link shares" => "Salli käyttäjien liittää julkisia linkkijakoja"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
new file mode 100644
index 00000000000..bce80d457e0
--- /dev/null
+++ b/apps/files_sharing/l10n/fr.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur",
+    "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.",
+    "Invalid or untrusted SSL certificate" : "Certificat SSL invalide ou non-fiable",
+    "Couldn't add remote share" : "Impossible d'ajouter un partage distant",
+    "Shared with you" : "Partagés avec vous",
+    "Shared with others" : "Partagés avec d'autres",
+    "Shared by link" : "Partagés par lien",
+    "No files have been shared with you yet." : "Aucun fichier n'est partagé avec vous pour l'instant.",
+    "You haven't shared any files yet." : "Vous ne partagez pas de fichier pour l'instant.",
+    "You haven't shared any files by link yet." : "Vous ne partagez pas de fichier par lien pour l'instant.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de  {owner}@{remote} ?",
+    "Remote share" : "Partage distant",
+    "Remote share password" : "Mot de passe du partage distant",
+    "Cancel" : "Annuler",
+    "Add remote share" : "Ajouter un partage distant",
+    "No ownCloud installation found at {remote}" : "Aucune installation ownCloud n'a été trouvée sur {remote}",
+    "Invalid ownCloud url" : "URL ownCloud invalide",
+    "Shared by" : "Partagé par",
+    "This share is password-protected" : "Ce partage est protégé par un mot de passe",
+    "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.",
+    "Password" : "Mot de passe",
+    "Name" : "Nom",
+    "Share time" : "Date de partage",
+    "Sorry, this link doesn’t seem to work anymore." : "Désolé, mais le lien semble ne plus fonctionner.",
+    "Reasons might be:" : "Les raisons peuvent être :",
+    "the item was removed" : "l'item a été supprimé",
+    "the link expired" : "le lien a expiré",
+    "sharing is disabled" : "le partage est désactivé",
+    "For more info, please ask the person who sent this link." : "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.",
+    "Add to your ownCloud" : "Ajouter à votre ownCloud",
+    "Download" : "Télécharger",
+    "Download %s" : "Télécharger %s",
+    "Direct link" : "Lien direct",
+    "Remote Shares" : "Partages distants",
+    "Allow other instances to mount public links shared from this server" : "Autoriser d'autres instances à monter les liens publics partagés depuis ce serveur",
+    "Allow users to mount public link shares" : "Autoriser vos utilisateurs à monter les liens publics"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
new file mode 100644
index 00000000000..58c5eaab637
--- /dev/null
+++ b/apps/files_sharing/l10n/fr.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Le partage de serveur à serveur n'est pas activé sur ce serveur",
+    "The mountpoint name contains invalid characters." : "Le nom du point de montage contient des caractères invalides.",
+    "Invalid or untrusted SSL certificate" : "Certificat SSL invalide ou non-fiable",
+    "Couldn't add remote share" : "Impossible d'ajouter un partage distant",
+    "Shared with you" : "Partagés avec vous",
+    "Shared with others" : "Partagés avec d'autres",
+    "Shared by link" : "Partagés par lien",
+    "No files have been shared with you yet." : "Aucun fichier n'est partagé avec vous pour l'instant.",
+    "You haven't shared any files yet." : "Vous ne partagez pas de fichier pour l'instant.",
+    "You haven't shared any files by link yet." : "Vous ne partagez pas de fichier par lien pour l'instant.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voulez-vous ajouter le partage distant {name} de  {owner}@{remote} ?",
+    "Remote share" : "Partage distant",
+    "Remote share password" : "Mot de passe du partage distant",
+    "Cancel" : "Annuler",
+    "Add remote share" : "Ajouter un partage distant",
+    "No ownCloud installation found at {remote}" : "Aucune installation ownCloud n'a été trouvée sur {remote}",
+    "Invalid ownCloud url" : "URL ownCloud invalide",
+    "Shared by" : "Partagé par",
+    "This share is password-protected" : "Ce partage est protégé par un mot de passe",
+    "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.",
+    "Password" : "Mot de passe",
+    "Name" : "Nom",
+    "Share time" : "Date de partage",
+    "Sorry, this link doesn’t seem to work anymore." : "Désolé, mais le lien semble ne plus fonctionner.",
+    "Reasons might be:" : "Les raisons peuvent être :",
+    "the item was removed" : "l'item a été supprimé",
+    "the link expired" : "le lien a expiré",
+    "sharing is disabled" : "le partage est désactivé",
+    "For more info, please ask the person who sent this link." : "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.",
+    "Add to your ownCloud" : "Ajouter à votre ownCloud",
+    "Download" : "Télécharger",
+    "Download %s" : "Télécharger %s",
+    "Direct link" : "Lien direct",
+    "Remote Shares" : "Partages distants",
+    "Allow other instances to mount public links shared from this server" : "Autoriser d'autres instances à monter les liens publics partagés depuis ce serveur",
+    "Allow users to mount public link shares" : "Autoriser vos utilisateurs à monter les liens publics"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
deleted file mode 100644
index 608f8a4cc24..00000000000
--- a/apps/files_sharing/l10n/fr.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Le partage de serveur à serveur n'est pas activé sur ce serveur",
-"The mountpoint name contains invalid characters." => "Le nom du point de montage contient des caractères invalides.",
-"Invalid or untrusted SSL certificate" => "Certificat SSL invalide ou non-fiable",
-"Couldn't add remote share" => "Impossible d'ajouter un partage distant",
-"Shared with you" => "Partagés avec vous",
-"Shared with others" => "Partagés avec d'autres",
-"Shared by link" => "Partagés par lien",
-"No files have been shared with you yet." => "Aucun fichier n'est partagé avec vous pour l'instant.",
-"You haven't shared any files yet." => "Vous ne partagez pas de fichier pour l'instant.",
-"You haven't shared any files by link yet." => "Vous ne partagez pas de fichier par lien pour l'instant.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Voulez-vous ajouter le partage distant {name} de  {owner}@{remote} ?",
-"Remote share" => "Partage distant",
-"Remote share password" => "Mot de passe du partage distant",
-"Cancel" => "Annuler",
-"Add remote share" => "Ajouter un partage distant",
-"No ownCloud installation found at {remote}" => "Aucune installation ownCloud n'a été trouvée sur {remote}",
-"Invalid ownCloud url" => "URL ownCloud invalide",
-"Shared by" => "Partagé par",
-"This share is password-protected" => "Ce partage est protégé par un mot de passe",
-"The password is wrong. Try again." => "Le mot de passe est incorrect. Veuillez réessayer.",
-"Password" => "Mot de passe",
-"Name" => "Nom",
-"Share time" => "Date de partage",
-"Sorry, this link doesn’t seem to work anymore." => "Désolé, mais le lien semble ne plus fonctionner.",
-"Reasons might be:" => "Les raisons peuvent être :",
-"the item was removed" => "l'item a été supprimé",
-"the link expired" => "le lien a expiré",
-"sharing is disabled" => "le partage est désactivé",
-"For more info, please ask the person who sent this link." => "Pour plus d'informations, veuillez contacter la personne qui a envoyé ce lien.",
-"Add to your ownCloud" => "Ajouter à votre ownCloud",
-"Download" => "Télécharger",
-"Download %s" => "Télécharger %s",
-"Direct link" => "Lien direct",
-"Remote Shares" => "Partages distants",
-"Allow other instances to mount public links shared from this server" => "Autoriser d'autres instances à monter les liens publics partagés depuis ce serveur",
-"Allow users to mount public link shares" => "Autoriser vos utilisateurs à monter les liens publics"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
new file mode 100644
index 00000000000..2a5d70aeb87
--- /dev/null
+++ b/apps/files_sharing/l10n/gl.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Neste servidor non está activada a compartición de servidor a servidor",
+    "Invalid or untrusted SSL certificate" : "Certificado SSL incorrecto ou non fiábel",
+    "Couldn't add remote share" : "Non foi posíbel engadir a compartición remota",
+    "Shared with you" : "Compartido con vostede",
+    "Shared with others" : "Compartido con outros",
+    "Shared by link" : "Compartido por ligazón",
+    "No files have been shared with you yet." : "Aínda non hai ficheiros compartidos con vostede.",
+    "You haven't shared any files yet." : "Aínda non compartiu ningún ficheiro.",
+    "You haven't shared any files by link yet." : "Aínda non compartiu ningún ficheiro por ligazón.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Quere engadir a compartición remota {name} desde {owner}@{remote}?",
+    "Remote share" : "Compartición remota",
+    "Remote share password" : "Contrasinal da compartición remota",
+    "Cancel" : "Cancelar",
+    "Add remote share" : "Engadir unha compartición remota",
+    "No ownCloud installation found at {remote}" : "Non se atopou unha instalación do ownCloud en {remote}",
+    "Invalid ownCloud url" : "URL incorrecta do ownCloud",
+    "Shared by" : "Compartido por",
+    "This share is password-protected" : "Esta compartición está protexida con contrasinal",
+    "The password is wrong. Try again." : "O contrasinal é incorrecto. Ténteo de novo.",
+    "Password" : "Contrasinal",
+    "Name" : "Nome",
+    "Share time" : "Compartir o tempo",
+    "Sorry, this link doesn’t seem to work anymore." : "Semella que esta ligazón non funciona.",
+    "Reasons might be:" : "As razóns poderían ser:",
+    "the item was removed" : "o elemento foi retirado",
+    "the link expired" : "a ligazón caducou",
+    "sharing is disabled" : "foi desactivada a compartición",
+    "For more info, please ask the person who sent this link." : "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.",
+    "Add to your ownCloud" : "Engadir ao seu ownCloud",
+    "Download" : "Descargar",
+    "Download %s" : "Descargar %s",
+    "Direct link" : "Ligazón directa",
+    "Remote Shares" : "Comparticións remotas",
+    "Allow other instances to mount public links shared from this server" : "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor",
+    "Allow users to mount public link shares" : "Permitirlle aos usuarios montar ligazóns públicas compartidas"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
new file mode 100644
index 00000000000..ff980ea0a61
--- /dev/null
+++ b/apps/files_sharing/l10n/gl.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Neste servidor non está activada a compartición de servidor a servidor",
+    "Invalid or untrusted SSL certificate" : "Certificado SSL incorrecto ou non fiábel",
+    "Couldn't add remote share" : "Non foi posíbel engadir a compartición remota",
+    "Shared with you" : "Compartido con vostede",
+    "Shared with others" : "Compartido con outros",
+    "Shared by link" : "Compartido por ligazón",
+    "No files have been shared with you yet." : "Aínda non hai ficheiros compartidos con vostede.",
+    "You haven't shared any files yet." : "Aínda non compartiu ningún ficheiro.",
+    "You haven't shared any files by link yet." : "Aínda non compartiu ningún ficheiro por ligazón.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Quere engadir a compartición remota {name} desde {owner}@{remote}?",
+    "Remote share" : "Compartición remota",
+    "Remote share password" : "Contrasinal da compartición remota",
+    "Cancel" : "Cancelar",
+    "Add remote share" : "Engadir unha compartición remota",
+    "No ownCloud installation found at {remote}" : "Non se atopou unha instalación do ownCloud en {remote}",
+    "Invalid ownCloud url" : "URL incorrecta do ownCloud",
+    "Shared by" : "Compartido por",
+    "This share is password-protected" : "Esta compartición está protexida con contrasinal",
+    "The password is wrong. Try again." : "O contrasinal é incorrecto. Ténteo de novo.",
+    "Password" : "Contrasinal",
+    "Name" : "Nome",
+    "Share time" : "Compartir o tempo",
+    "Sorry, this link doesn’t seem to work anymore." : "Semella que esta ligazón non funciona.",
+    "Reasons might be:" : "As razóns poderían ser:",
+    "the item was removed" : "o elemento foi retirado",
+    "the link expired" : "a ligazón caducou",
+    "sharing is disabled" : "foi desactivada a compartición",
+    "For more info, please ask the person who sent this link." : "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.",
+    "Add to your ownCloud" : "Engadir ao seu ownCloud",
+    "Download" : "Descargar",
+    "Download %s" : "Descargar %s",
+    "Direct link" : "Ligazón directa",
+    "Remote Shares" : "Comparticións remotas",
+    "Allow other instances to mount public links shared from this server" : "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor",
+    "Allow users to mount public link shares" : "Permitirlle aos usuarios montar ligazóns públicas compartidas"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/gl.php b/apps/files_sharing/l10n/gl.php
deleted file mode 100644
index c272ac8afe7..00000000000
--- a/apps/files_sharing/l10n/gl.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Neste servidor non está activada a compartición de servidor a servidor",
-"Invalid or untrusted SSL certificate" => "Certificado SSL incorrecto ou non fiábel",
-"Couldn't add remote share" => "Non foi posíbel engadir a compartición remota",
-"Shared with you" => "Compartido con vostede",
-"Shared with others" => "Compartido con outros",
-"Shared by link" => "Compartido por ligazón",
-"No files have been shared with you yet." => "Aínda non hai ficheiros compartidos con vostede.",
-"You haven't shared any files yet." => "Aínda non compartiu ningún ficheiro.",
-"You haven't shared any files by link yet." => "Aínda non compartiu ningún ficheiro por ligazón.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Quere engadir a compartición remota {name} desde {owner}@{remote}?",
-"Remote share" => "Compartición remota",
-"Remote share password" => "Contrasinal da compartición remota",
-"Cancel" => "Cancelar",
-"Add remote share" => "Engadir unha compartición remota",
-"No ownCloud installation found at {remote}" => "Non se atopou unha instalación do ownCloud en {remote}",
-"Invalid ownCloud url" => "URL incorrecta do ownCloud",
-"Shared by" => "Compartido por",
-"This share is password-protected" => "Esta compartición está protexida con contrasinal",
-"The password is wrong. Try again." => "O contrasinal é incorrecto. Ténteo de novo.",
-"Password" => "Contrasinal",
-"Name" => "Nome",
-"Share time" => "Compartir o tempo",
-"Sorry, this link doesn’t seem to work anymore." => "Semella que esta ligazón non funciona.",
-"Reasons might be:" => "As razóns poderían ser:",
-"the item was removed" => "o elemento foi retirado",
-"the link expired" => "a ligazón caducou",
-"sharing is disabled" => "foi desactivada a compartición",
-"For more info, please ask the person who sent this link." => "Para obter máis información, pregúntelle á persoa que lle enviou a ligazón.",
-"Add to your ownCloud" => "Engadir ao seu ownCloud",
-"Download" => "Descargar",
-"Download %s" => "Descargar %s",
-"Direct link" => "Ligazón directa",
-"Remote Shares" => "Comparticións remotas",
-"Allow other instances to mount public links shared from this server" => "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor",
-"Allow users to mount public link shares" => "Permitirlle aos usuarios montar ligazóns públicas compartidas"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/he.js b/apps/files_sharing/l10n/he.js
new file mode 100644
index 00000000000..4e9ce972240
--- /dev/null
+++ b/apps/files_sharing/l10n/he.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "ביטול",
+    "Shared by" : "שותף על־ידי",
+    "Password" : "סיסמא",
+    "Name" : "שם",
+    "Download" : "הורדה"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/he.json b/apps/files_sharing/l10n/he.json
new file mode 100644
index 00000000000..fe209ca3ecd
--- /dev/null
+++ b/apps/files_sharing/l10n/he.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "ביטול",
+    "Shared by" : "שותף על־ידי",
+    "Password" : "סיסמא",
+    "Name" : "שם",
+    "Download" : "הורדה"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
deleted file mode 100644
index d5228c608f3..00000000000
--- a/apps/files_sharing/l10n/he.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "ביטול",
-"Shared by" => "שותף על־ידי",
-"Password" => "סיסמא",
-"Name" => "שם",
-"Download" => "הורדה"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hi.js b/apps/files_sharing/l10n/hi.js
new file mode 100644
index 00000000000..a9647c762d0
--- /dev/null
+++ b/apps/files_sharing/l10n/hi.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "रद्द करें ",
+    "Shared by" : "द्वारा साझा",
+    "Password" : "पासवर्ड"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/hi.json b/apps/files_sharing/l10n/hi.json
new file mode 100644
index 00000000000..5775830b621
--- /dev/null
+++ b/apps/files_sharing/l10n/hi.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "रद्द करें ",
+    "Shared by" : "द्वारा साझा",
+    "Password" : "पासवर्ड"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/hi.php b/apps/files_sharing/l10n/hi.php
deleted file mode 100644
index e713e5b022f..00000000000
--- a/apps/files_sharing/l10n/hi.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "रद्द करें ",
-"Shared by" => "द्वारा साझा",
-"Password" => "पासवर्ड"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hr.js b/apps/files_sharing/l10n/hr.js
new file mode 100644
index 00000000000..75d82342e78
--- /dev/null
+++ b/apps/files_sharing/l10n/hr.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Dijeljenje resursa s poslužitelja na poslužitelj s ovog poslužitelja nije omogućeno.",
+    "Invalid or untrusted SSL certificate" : "Neispravna ili nepouzdana SSL potvrda",
+    "Couldn't add remote share" : "Udaljeni zajednički resurs nije moguće dodati",
+    "Shared with you" : "Podijeljeno s vama",
+    "Shared with others" : "Podijeljeno s ostalima",
+    "Shared by link" : "POdijeljeno putem veze",
+    "No files have been shared with you yet." : "S vama dosad još nisu podijeljene nikakve datoteke.",
+    "You haven't shared any files yet." : "Vi dosad još niste podijelili nikakve datoteke.",
+    "You haven't shared any files by link yet." : "Vi dosad još niste putem veze podijelili nikakve datoteke.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Želite li dodati udaljeni zajednički resurs {name} od {owner}@{remote}?",
+    "Remote share" : "Udaljeni zajednički resurs (za raspodjelu)",
+    "Remote share password" : "Lozinka za udaljeni zajednički resurs",
+    "Cancel" : "Odustanite",
+    "Add remote share" : "Dodajte udaljeni zajednički resurs",
+    "No ownCloud installation found at {remote}" : "Nijedna ownCloud instalacija nije nađena na {remote}",
+    "Invalid ownCloud url" : "Neispravan ownCloud URL",
+    "Shared by" : "Podijeljeno od strane",
+    "This share is password-protected" : "Ovaj zajednički resurs je zaštićen lozinkom",
+    "The password is wrong. Try again." : "Pogrešna lozinka. Pokušajte ponovno.",
+    "Password" : "Lozinka",
+    "Name" : "Naziv",
+    "Share time" : "Vrijeme dijeljenja",
+    "Sorry, this link doesn’t seem to work anymore." : "Žao nam je, čini se da ova veza više ne radi.",
+    "Reasons might be:" : "Mogući razlozi su:",
+    "the item was removed" : "stavka je uklonjena",
+    "the link expired" : "veza je istekla",
+    "sharing is disabled" : "dijeljenje je onemogućeno",
+    "For more info, please ask the person who sent this link." : "Za više informacija, molimo obratite se osobi koja je ovu vezu poslala.",
+    "Add to your ownCloud" : "Dodajte svome ownCloud",
+    "Download" : "Preuzmite",
+    "Download %s" : "Preuzmite %s",
+    "Direct link" : "Izravna veza",
+    "Remote Shares" : "Udaljeni zajednički resursi (za raspodjelu)",
+    "Allow other instances to mount public links shared from this server" : "Dopustite drugim instancama postavljanje javnih veza koje su podijeljene s ovog poslužitelja.",
+    "Allow users to mount public link shares" : "Dopustite korisnicima postavljanje podijeljenih javnih veza"
+},
+"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/hr.json b/apps/files_sharing/l10n/hr.json
new file mode 100644
index 00000000000..79064c575b9
--- /dev/null
+++ b/apps/files_sharing/l10n/hr.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Dijeljenje resursa s poslužitelja na poslužitelj s ovog poslužitelja nije omogućeno.",
+    "Invalid or untrusted SSL certificate" : "Neispravna ili nepouzdana SSL potvrda",
+    "Couldn't add remote share" : "Udaljeni zajednički resurs nije moguće dodati",
+    "Shared with you" : "Podijeljeno s vama",
+    "Shared with others" : "Podijeljeno s ostalima",
+    "Shared by link" : "POdijeljeno putem veze",
+    "No files have been shared with you yet." : "S vama dosad još nisu podijeljene nikakve datoteke.",
+    "You haven't shared any files yet." : "Vi dosad još niste podijelili nikakve datoteke.",
+    "You haven't shared any files by link yet." : "Vi dosad još niste putem veze podijelili nikakve datoteke.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Želite li dodati udaljeni zajednički resurs {name} od {owner}@{remote}?",
+    "Remote share" : "Udaljeni zajednički resurs (za raspodjelu)",
+    "Remote share password" : "Lozinka za udaljeni zajednički resurs",
+    "Cancel" : "Odustanite",
+    "Add remote share" : "Dodajte udaljeni zajednički resurs",
+    "No ownCloud installation found at {remote}" : "Nijedna ownCloud instalacija nije nađena na {remote}",
+    "Invalid ownCloud url" : "Neispravan ownCloud URL",
+    "Shared by" : "Podijeljeno od strane",
+    "This share is password-protected" : "Ovaj zajednički resurs je zaštićen lozinkom",
+    "The password is wrong. Try again." : "Pogrešna lozinka. Pokušajte ponovno.",
+    "Password" : "Lozinka",
+    "Name" : "Naziv",
+    "Share time" : "Vrijeme dijeljenja",
+    "Sorry, this link doesn’t seem to work anymore." : "Žao nam je, čini se da ova veza više ne radi.",
+    "Reasons might be:" : "Mogući razlozi su:",
+    "the item was removed" : "stavka je uklonjena",
+    "the link expired" : "veza je istekla",
+    "sharing is disabled" : "dijeljenje je onemogućeno",
+    "For more info, please ask the person who sent this link." : "Za više informacija, molimo obratite se osobi koja je ovu vezu poslala.",
+    "Add to your ownCloud" : "Dodajte svome ownCloud",
+    "Download" : "Preuzmite",
+    "Download %s" : "Preuzmite %s",
+    "Direct link" : "Izravna veza",
+    "Remote Shares" : "Udaljeni zajednički resursi (za raspodjelu)",
+    "Allow other instances to mount public links shared from this server" : "Dopustite drugim instancama postavljanje javnih veza koje su podijeljene s ovog poslužitelja.",
+    "Allow users to mount public link shares" : "Dopustite korisnicima postavljanje podijeljenih javnih veza"
+},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/hr.php b/apps/files_sharing/l10n/hr.php
deleted file mode 100644
index 2cb0d0596d0..00000000000
--- a/apps/files_sharing/l10n/hr.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Dijeljenje resursa s poslužitelja na poslužitelj s ovog poslužitelja nije omogućeno.",
-"Invalid or untrusted SSL certificate" => "Neispravna ili nepouzdana SSL potvrda",
-"Couldn't add remote share" => "Udaljeni zajednički resurs nije moguće dodati",
-"Shared with you" => "Podijeljeno s vama",
-"Shared with others" => "Podijeljeno s ostalima",
-"Shared by link" => "POdijeljeno putem veze",
-"No files have been shared with you yet." => "S vama dosad još nisu podijeljene nikakve datoteke.",
-"You haven't shared any files yet." => "Vi dosad još niste podijelili nikakve datoteke.",
-"You haven't shared any files by link yet." => "Vi dosad još niste putem veze podijelili nikakve datoteke.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Želite li dodati udaljeni zajednički resurs {name} od {owner}@{remote}?",
-"Remote share" => "Udaljeni zajednički resurs (za raspodjelu)",
-"Remote share password" => "Lozinka za udaljeni zajednički resurs",
-"Cancel" => "Odustanite",
-"Add remote share" => "Dodajte udaljeni zajednički resurs",
-"No ownCloud installation found at {remote}" => "Nijedna ownCloud instalacija nije nađena na {remote}",
-"Invalid ownCloud url" => "Neispravan ownCloud URL",
-"Shared by" => "Podijeljeno od strane",
-"This share is password-protected" => "Ovaj zajednički resurs je zaštićen lozinkom",
-"The password is wrong. Try again." => "Pogrešna lozinka. Pokušajte ponovno.",
-"Password" => "Lozinka",
-"Name" => "Naziv",
-"Share time" => "Vrijeme dijeljenja",
-"Sorry, this link doesn’t seem to work anymore." => "Žao nam je, čini se da ova veza više ne radi.",
-"Reasons might be:" => "Mogući razlozi su:",
-"the item was removed" => "stavka je uklonjena",
-"the link expired" => "veza je istekla",
-"sharing is disabled" => "dijeljenje je onemogućeno",
-"For more info, please ask the person who sent this link." => "Za više informacija, molimo obratite se osobi koja je ovu vezu poslala.",
-"Add to your ownCloud" => "Dodajte svome ownCloud",
-"Download" => "Preuzmite",
-"Download %s" => "Preuzmite %s",
-"Direct link" => "Izravna veza",
-"Remote Shares" => "Udaljeni zajednički resursi (za raspodjelu)",
-"Allow other instances to mount public links shared from this server" => "Dopustite drugim instancama postavljanje javnih veza koje su podijeljene s ovog poslužitelja.",
-"Allow users to mount public link shares" => "Dopustite korisnicima postavljanje podijeljenih javnih veza"
-);
-$PLURAL_FORMS = "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/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
new file mode 100644
index 00000000000..488ad61bab2
--- /dev/null
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "A kiszolgálók közötti megosztás nincs engedélyezve ezen a kiszolgálón",
+    "The mountpoint name contains invalid characters." : "A csatlakozási pont neve érvénytelen karaktereket tartalmaz ",
+    "Invalid or untrusted SSL certificate" : "Érvénytelen vagy nem megbízható az SSL tanúsítvány",
+    "Couldn't add remote share" : "A távoli megosztás nem hozható létre",
+    "Shared with you" : "Velem osztották meg",
+    "Shared with others" : "Én osztottam meg másokkal",
+    "Shared by link" : "Linkkel osztottam meg",
+    "No files have been shared with you yet." : "Még nem osztottak meg Önnel semmit.",
+    "You haven't shared any files yet." : "Még nem osztott meg másokkal semmit",
+    "You haven't shared any files by link yet." : "Még nem osztott meg link segítségével semmit.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Használatba kívánja venni a {name} távoli megosztást, amit a {owner}@{remote} címről kapott?",
+    "Remote share" : "Távoli megosztás",
+    "Remote share password" : "Jelszó a távoli megosztáshoz",
+    "Cancel" : "Mégsem",
+    "Add remote share" : "Távoli megosztás létrehozása",
+    "No ownCloud installation found at {remote}" : "Nem található ownCloud telepítés ezen a címen {remote}",
+    "Invalid ownCloud url" : "Érvénytelen ownCloud webcím",
+    "Shared by" : "Megosztotta Önnel",
+    "This share is password-protected" : "Ez egy jelszóval védett megosztás",
+    "The password is wrong. Try again." : "A megadott jelszó nem megfelelő. Próbálja újra!",
+    "Password" : "Jelszó",
+    "Name" : "Név",
+    "Share time" : "A megosztás időpontja",
+    "Sorry, this link doesn’t seem to work anymore." : "Sajnos úgy tűnik, ez a link már nem működik.",
+    "Reasons might be:" : "Ennek az oka a következő lehet:",
+    "the item was removed" : "az állományt időközben eltávolították",
+    "the link expired" : "lejárt a link érvényességi ideje",
+    "sharing is disabled" : "letiltásra került a megosztás",
+    "For more info, please ask the person who sent this link." : "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!",
+    "Add to your ownCloud" : "Adjuk hozzá a saját ownCloudunkhoz",
+    "Download" : "Letöltés",
+    "Download %s" : "%s letöltése",
+    "Direct link" : "Közvetlen link",
+    "Remote Shares" : "Távoli megosztások",
+    "Allow other instances to mount public links shared from this server" : "Engedélyezzük más ownCloud telepítéseknek, hogy becsatolják ennek a kiszolgálónak a nyilvános linkkel megadott megosztásait",
+    "Allow users to mount public link shares" : "Engedélyezzük, hogy felhasználóink becsatolják más kiszolgálók nyilvános, linkkel megadott megosztásait"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
new file mode 100644
index 00000000000..f267a5a8ae7
--- /dev/null
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "A kiszolgálók közötti megosztás nincs engedélyezve ezen a kiszolgálón",
+    "The mountpoint name contains invalid characters." : "A csatlakozási pont neve érvénytelen karaktereket tartalmaz ",
+    "Invalid or untrusted SSL certificate" : "Érvénytelen vagy nem megbízható az SSL tanúsítvány",
+    "Couldn't add remote share" : "A távoli megosztás nem hozható létre",
+    "Shared with you" : "Velem osztották meg",
+    "Shared with others" : "Én osztottam meg másokkal",
+    "Shared by link" : "Linkkel osztottam meg",
+    "No files have been shared with you yet." : "Még nem osztottak meg Önnel semmit.",
+    "You haven't shared any files yet." : "Még nem osztott meg másokkal semmit",
+    "You haven't shared any files by link yet." : "Még nem osztott meg link segítségével semmit.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Használatba kívánja venni a {name} távoli megosztást, amit a {owner}@{remote} címről kapott?",
+    "Remote share" : "Távoli megosztás",
+    "Remote share password" : "Jelszó a távoli megosztáshoz",
+    "Cancel" : "Mégsem",
+    "Add remote share" : "Távoli megosztás létrehozása",
+    "No ownCloud installation found at {remote}" : "Nem található ownCloud telepítés ezen a címen {remote}",
+    "Invalid ownCloud url" : "Érvénytelen ownCloud webcím",
+    "Shared by" : "Megosztotta Önnel",
+    "This share is password-protected" : "Ez egy jelszóval védett megosztás",
+    "The password is wrong. Try again." : "A megadott jelszó nem megfelelő. Próbálja újra!",
+    "Password" : "Jelszó",
+    "Name" : "Név",
+    "Share time" : "A megosztás időpontja",
+    "Sorry, this link doesn’t seem to work anymore." : "Sajnos úgy tűnik, ez a link már nem működik.",
+    "Reasons might be:" : "Ennek az oka a következő lehet:",
+    "the item was removed" : "az állományt időközben eltávolították",
+    "the link expired" : "lejárt a link érvényességi ideje",
+    "sharing is disabled" : "letiltásra került a megosztás",
+    "For more info, please ask the person who sent this link." : "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!",
+    "Add to your ownCloud" : "Adjuk hozzá a saját ownCloudunkhoz",
+    "Download" : "Letöltés",
+    "Download %s" : "%s letöltése",
+    "Direct link" : "Közvetlen link",
+    "Remote Shares" : "Távoli megosztások",
+    "Allow other instances to mount public links shared from this server" : "Engedélyezzük más ownCloud telepítéseknek, hogy becsatolják ennek a kiszolgálónak a nyilvános linkkel megadott megosztásait",
+    "Allow users to mount public link shares" : "Engedélyezzük, hogy felhasználóink becsatolják más kiszolgálók nyilvános, linkkel megadott megosztásait"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
deleted file mode 100644
index aee8a5151d7..00000000000
--- a/apps/files_sharing/l10n/hu_HU.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "A kiszolgálók közötti megosztás nincs engedélyezve ezen a kiszolgálón",
-"The mountpoint name contains invalid characters." => "A csatlakozási pont neve érvénytelen karaktereket tartalmaz ",
-"Invalid or untrusted SSL certificate" => "Érvénytelen vagy nem megbízható az SSL tanúsítvány",
-"Couldn't add remote share" => "A távoli megosztás nem hozható létre",
-"Shared with you" => "Velem osztották meg",
-"Shared with others" => "Én osztottam meg másokkal",
-"Shared by link" => "Linkkel osztottam meg",
-"No files have been shared with you yet." => "Még nem osztottak meg Önnel semmit.",
-"You haven't shared any files yet." => "Még nem osztott meg másokkal semmit",
-"You haven't shared any files by link yet." => "Még nem osztott meg link segítségével semmit.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Használatba kívánja venni a {name} távoli megosztást, amit a {owner}@{remote} címről kapott?",
-"Remote share" => "Távoli megosztás",
-"Remote share password" => "Jelszó a távoli megosztáshoz",
-"Cancel" => "Mégsem",
-"Add remote share" => "Távoli megosztás létrehozása",
-"No ownCloud installation found at {remote}" => "Nem található ownCloud telepítés ezen a címen {remote}",
-"Invalid ownCloud url" => "Érvénytelen ownCloud webcím",
-"Shared by" => "Megosztotta Önnel",
-"This share is password-protected" => "Ez egy jelszóval védett megosztás",
-"The password is wrong. Try again." => "A megadott jelszó nem megfelelő. Próbálja újra!",
-"Password" => "Jelszó",
-"Name" => "Név",
-"Share time" => "A megosztás időpontja",
-"Sorry, this link doesn’t seem to work anymore." => "Sajnos úgy tűnik, ez a link már nem működik.",
-"Reasons might be:" => "Ennek az oka a következő lehet:",
-"the item was removed" => "az állományt időközben eltávolították",
-"the link expired" => "lejárt a link érvényességi ideje",
-"sharing is disabled" => "letiltásra került a megosztás",
-"For more info, please ask the person who sent this link." => "További információért forduljon ahhoz, aki ezt a linket küldte Önnek!",
-"Add to your ownCloud" => "Adjuk hozzá a saját ownCloudunkhoz",
-"Download" => "Letöltés",
-"Download %s" => "%s letöltése",
-"Direct link" => "Közvetlen link",
-"Remote Shares" => "Távoli megosztások",
-"Allow other instances to mount public links shared from this server" => "Engedélyezzük más ownCloud telepítéseknek, hogy becsatolják ennek a kiszolgálónak a nyilvános linkkel megadott megosztásait",
-"Allow users to mount public link shares" => "Engedélyezzük, hogy felhasználóink becsatolják más kiszolgálók nyilvános, linkkel megadott megosztásait"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/hy.js b/apps/files_sharing/l10n/hy.js
new file mode 100644
index 00000000000..10b9dfa1dd4
--- /dev/null
+++ b/apps/files_sharing/l10n/hy.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Download" : "Բեռնել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/hy.json b/apps/files_sharing/l10n/hy.json
new file mode 100644
index 00000000000..1d9890db3d9
--- /dev/null
+++ b/apps/files_sharing/l10n/hy.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Download" : "Բեռնել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/hy.php b/apps/files_sharing/l10n/hy.php
deleted file mode 100644
index da200623e03..00000000000
--- a/apps/files_sharing/l10n/hy.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Download" => "Բեռնել"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ia.js b/apps/files_sharing/l10n/ia.js
new file mode 100644
index 00000000000..c144fbd44f3
--- /dev/null
+++ b/apps/files_sharing/l10n/ia.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Cancellar",
+    "Password" : "Contrasigno",
+    "Name" : "Nomine",
+    "Download" : "Discargar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ia.json b/apps/files_sharing/l10n/ia.json
new file mode 100644
index 00000000000..d6153f18230
--- /dev/null
+++ b/apps/files_sharing/l10n/ia.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Cancel" : "Cancellar",
+    "Password" : "Contrasigno",
+    "Name" : "Nomine",
+    "Download" : "Discargar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ia.php b/apps/files_sharing/l10n/ia.php
deleted file mode 100644
index c6feab0db28..00000000000
--- a/apps/files_sharing/l10n/ia.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Cancellar",
-"Password" => "Contrasigno",
-"Name" => "Nomine",
-"Download" => "Discargar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
new file mode 100644
index 00000000000..a86cf96bf74
--- /dev/null
+++ b/apps/files_sharing/l10n/id.js
@@ -0,0 +1,31 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidaj diaktifkan pada server ini",
+    "Shared with you" : "Dibagikan dengan Anda",
+    "Shared with others" : "Dibagikan dengan lainnya",
+    "Shared by link" : "Dibagikan dengan tautan",
+    "No files have been shared with you yet." : "Tidak ada berkas yang dibagikan kepada Anda.",
+    "You haven't shared any files yet." : "Anda belum berbagi berkas apapun.",
+    "You haven't shared any files by link yet." : "Anda belum berbagi berkas dengan tautan satupun.",
+    "Cancel" : "Batal",
+    "No ownCloud installation found at {remote}" : "Tidak ada instalasi ownCloud yang ditemukan di {remote}",
+    "Invalid ownCloud url" : "URL ownCloud tidak sah",
+    "Shared by" : "Dibagikan oleh",
+    "This share is password-protected" : "Berbagi ini dilindungi sandi",
+    "The password is wrong. Try again." : "Sandi salah. Coba lagi",
+    "Password" : "Sandi",
+    "Name" : "Nama",
+    "Share time" : "Bagikan waktu",
+    "Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
+    "Reasons might be:" : "Alasan mungkin:",
+    "the item was removed" : "item telah dihapus",
+    "the link expired" : "tautan telah kadaluarsa",
+    "sharing is disabled" : "berbagi dinonaktifkan",
+    "For more info, please ask the person who sent this link." : "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
+    "Download" : "Unduh",
+    "Download %s" : "Unduh %s",
+    "Direct link" : "Tautan langsung",
+    "Allow users to mount public link shares" : "Izinkan pengguna untuk mengaitkan tautan berbagi publik"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
new file mode 100644
index 00000000000..de4a8b7f924
--- /dev/null
+++ b/apps/files_sharing/l10n/id.json
@@ -0,0 +1,29 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidaj diaktifkan pada server ini",
+    "Shared with you" : "Dibagikan dengan Anda",
+    "Shared with others" : "Dibagikan dengan lainnya",
+    "Shared by link" : "Dibagikan dengan tautan",
+    "No files have been shared with you yet." : "Tidak ada berkas yang dibagikan kepada Anda.",
+    "You haven't shared any files yet." : "Anda belum berbagi berkas apapun.",
+    "You haven't shared any files by link yet." : "Anda belum berbagi berkas dengan tautan satupun.",
+    "Cancel" : "Batal",
+    "No ownCloud installation found at {remote}" : "Tidak ada instalasi ownCloud yang ditemukan di {remote}",
+    "Invalid ownCloud url" : "URL ownCloud tidak sah",
+    "Shared by" : "Dibagikan oleh",
+    "This share is password-protected" : "Berbagi ini dilindungi sandi",
+    "The password is wrong. Try again." : "Sandi salah. Coba lagi",
+    "Password" : "Sandi",
+    "Name" : "Nama",
+    "Share time" : "Bagikan waktu",
+    "Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
+    "Reasons might be:" : "Alasan mungkin:",
+    "the item was removed" : "item telah dihapus",
+    "the link expired" : "tautan telah kadaluarsa",
+    "sharing is disabled" : "berbagi dinonaktifkan",
+    "For more info, please ask the person who sent this link." : "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
+    "Download" : "Unduh",
+    "Download %s" : "Unduh %s",
+    "Direct link" : "Tautan langsung",
+    "Allow users to mount public link shares" : "Izinkan pengguna untuk mengaitkan tautan berbagi publik"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/id.php b/apps/files_sharing/l10n/id.php
deleted file mode 100644
index 10ff3cf0530..00000000000
--- a/apps/files_sharing/l10n/id.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Berbagi server ke server tidak diaktifkan pada server ini",
-"The mountpoint name contains invalid characters." => "Nama titik kait berisi karakter yang tidak sah.",
-"Invalid or untrusted SSL certificate" => "Sertifikast SSL tidak sah atau tidak terpercaya",
-"Couldn't add remote share" => "Tidak dapat menambahkan berbagi remote",
-"Shared with you" => "Dibagikan dengan Anda",
-"Shared with others" => "Dibagikan dengan lainnya",
-"Shared by link" => "Dibagikan dengan tautan",
-"No files have been shared with you yet." => "Tidak ada berkas yang dibagikan kepada Anda.",
-"You haven't shared any files yet." => "Anda belum berbagi berkas apapun.",
-"You haven't shared any files by link yet." => "Anda belum berbagi berkas dengan tautan satupun.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
-"Remote share" => "Berbagi remote",
-"Remote share password" => "Sandi berbagi remote",
-"Cancel" => "Batal",
-"Add remote share" => "Tambah berbagi remote",
-"No ownCloud installation found at {remote}" => "Tidak ada instalasi ownCloud yang ditemukan di {remote}",
-"Invalid ownCloud url" => "URL ownCloud tidak sah",
-"Shared by" => "Dibagikan oleh",
-"This share is password-protected" => "Berbagi ini dilindungi sandi",
-"The password is wrong. Try again." => "Sandi salah. Coba lagi",
-"Password" => "Sandi",
-"Name" => "Nama",
-"Share time" => "Bagikan waktu",
-"Sorry, this link doesn’t seem to work anymore." => "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
-"Reasons might be:" => "Alasan yang mungkin:",
-"the item was removed" => "item telah dihapus",
-"the link expired" => "tautan telah kadaluarsa",
-"sharing is disabled" => "berbagi dinonaktifkan",
-"For more info, please ask the person who sent this link." => "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
-"Add to your ownCloud" => "Tambahkan ke ownCloud Anda",
-"Download" => "Unduh",
-"Download %s" => "Unduh %s",
-"Direct link" => "Tautan langsung",
-"Remote Shares" => "Berbagi Remote",
-"Allow other instances to mount public links shared from this server" => "Izinkan instansi lain untuk mengaitkan tautan publik untuk dibagikan dari server ini",
-"Allow users to mount public link shares" => "Izinkan pengguna untuk mengaitkan tautan berbagi publik"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/is.js b/apps/files_sharing/l10n/is.js
new file mode 100644
index 00000000000..ecce4e25d97
--- /dev/null
+++ b/apps/files_sharing/l10n/is.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Hætta við",
+    "Shared by" : "Deilt af",
+    "Password" : "Lykilorð",
+    "Name" : "Nafn",
+    "Download" : "Niðurhal"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/is.json b/apps/files_sharing/l10n/is.json
new file mode 100644
index 00000000000..889f8a32398
--- /dev/null
+++ b/apps/files_sharing/l10n/is.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "Hætta við",
+    "Shared by" : "Deilt af",
+    "Password" : "Lykilorð",
+    "Name" : "Nafn",
+    "Download" : "Niðurhal"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/is.php b/apps/files_sharing/l10n/is.php
deleted file mode 100644
index 3acd2159495..00000000000
--- a/apps/files_sharing/l10n/is.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Hætta við",
-"Shared by" => "Deilt af",
-"Password" => "Lykilorð",
-"Name" => "Nafn",
-"Download" => "Niðurhal"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
new file mode 100644
index 00000000000..5e604ec199d
--- /dev/null
+++ b/apps/files_sharing/l10n/it.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server",
+    "The mountpoint name contains invalid characters." : "Il nome del punto di mount contiene caratteri non validi.",
+    "Invalid or untrusted SSL certificate" : "Certificato SSL non valido o non attendibile",
+    "Couldn't add remote share" : "Impossibile aggiungere la condivisione remota",
+    "Shared with you" : "Condiviso con te",
+    "Shared with others" : "Condiviso con altri",
+    "Shared by link" : "Condiviso tramite collegamento",
+    "No files have been shared with you yet." : "Non è stato ancora condiviso alcun file con te.",
+    "You haven't shared any files yet." : "Non hai ancora condiviso alcun file.",
+    "You haven't shared any files by link yet." : "Non hai ancora condiviso alcun file tramite collegamento.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Vuoi aggiungere la condivisione remota {name} da {owner}@{remote}?",
+    "Remote share" : "Condivisione remota",
+    "Remote share password" : "Password della condivisione remota",
+    "Cancel" : "Annulla",
+    "Add remote share" : "Aggiungi condivisione remota",
+    "No ownCloud installation found at {remote}" : "Nessuna installazione di ownCloud trovata su {remote}",
+    "Invalid ownCloud url" : "URL di ownCloud non valido",
+    "Shared by" : "Condiviso da",
+    "This share is password-protected" : "Questa condivione è protetta da password",
+    "The password is wrong. Try again." : "La password è errata. Prova ancora.",
+    "Password" : "Password",
+    "Name" : "Nome",
+    "Share time" : "Tempo di condivisione",
+    "Sorry, this link doesn’t seem to work anymore." : "Spiacenti, questo collegamento sembra non essere più attivo.",
+    "Reasons might be:" : "I motivi potrebbero essere:",
+    "the item was removed" : "l'elemento è stato rimosso",
+    "the link expired" : "il collegamento è scaduto",
+    "sharing is disabled" : "la condivisione è disabilitata",
+    "For more info, please ask the person who sent this link." : "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.",
+    "Add to your ownCloud" : "Aggiungi al tuo ownCloud",
+    "Download" : "Scarica",
+    "Download %s" : "Scarica %s",
+    "Direct link" : "Collegamento diretto",
+    "Remote Shares" : "Condivisioni remote",
+    "Allow other instances to mount public links shared from this server" : "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server",
+    "Allow users to mount public link shares" : "Permetti agli utenti di montare condivisioni con collegamento pubblico"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
new file mode 100644
index 00000000000..3477bb1909a
--- /dev/null
+++ b/apps/files_sharing/l10n/it.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "La condivisione tra server non è abilitata su questo server",
+    "The mountpoint name contains invalid characters." : "Il nome del punto di mount contiene caratteri non validi.",
+    "Invalid or untrusted SSL certificate" : "Certificato SSL non valido o non attendibile",
+    "Couldn't add remote share" : "Impossibile aggiungere la condivisione remota",
+    "Shared with you" : "Condiviso con te",
+    "Shared with others" : "Condiviso con altri",
+    "Shared by link" : "Condiviso tramite collegamento",
+    "No files have been shared with you yet." : "Non è stato ancora condiviso alcun file con te.",
+    "You haven't shared any files yet." : "Non hai ancora condiviso alcun file.",
+    "You haven't shared any files by link yet." : "Non hai ancora condiviso alcun file tramite collegamento.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Vuoi aggiungere la condivisione remota {name} da {owner}@{remote}?",
+    "Remote share" : "Condivisione remota",
+    "Remote share password" : "Password della condivisione remota",
+    "Cancel" : "Annulla",
+    "Add remote share" : "Aggiungi condivisione remota",
+    "No ownCloud installation found at {remote}" : "Nessuna installazione di ownCloud trovata su {remote}",
+    "Invalid ownCloud url" : "URL di ownCloud non valido",
+    "Shared by" : "Condiviso da",
+    "This share is password-protected" : "Questa condivione è protetta da password",
+    "The password is wrong. Try again." : "La password è errata. Prova ancora.",
+    "Password" : "Password",
+    "Name" : "Nome",
+    "Share time" : "Tempo di condivisione",
+    "Sorry, this link doesn’t seem to work anymore." : "Spiacenti, questo collegamento sembra non essere più attivo.",
+    "Reasons might be:" : "I motivi potrebbero essere:",
+    "the item was removed" : "l'elemento è stato rimosso",
+    "the link expired" : "il collegamento è scaduto",
+    "sharing is disabled" : "la condivisione è disabilitata",
+    "For more info, please ask the person who sent this link." : "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.",
+    "Add to your ownCloud" : "Aggiungi al tuo ownCloud",
+    "Download" : "Scarica",
+    "Download %s" : "Scarica %s",
+    "Direct link" : "Collegamento diretto",
+    "Remote Shares" : "Condivisioni remote",
+    "Allow other instances to mount public links shared from this server" : "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server",
+    "Allow users to mount public link shares" : "Permetti agli utenti di montare condivisioni con collegamento pubblico"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
deleted file mode 100644
index 5aad92e7d09..00000000000
--- a/apps/files_sharing/l10n/it.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "La condivisione tra server non è abilitata su questo server",
-"The mountpoint name contains invalid characters." => "Il nome del punto di mount contiene caratteri non validi.",
-"Invalid or untrusted SSL certificate" => "Certificato SSL non valido o non attendibile",
-"Couldn't add remote share" => "Impossibile aggiungere la condivisione remota",
-"Shared with you" => "Condiviso con te",
-"Shared with others" => "Condiviso con altri",
-"Shared by link" => "Condiviso tramite collegamento",
-"No files have been shared with you yet." => "Non è stato ancora condiviso alcun file con te.",
-"You haven't shared any files yet." => "Non hai ancora condiviso alcun file.",
-"You haven't shared any files by link yet." => "Non hai ancora condiviso alcun file tramite collegamento.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Vuoi aggiungere la condivisione remota {name} da {owner}@{remote}?",
-"Remote share" => "Condivisione remota",
-"Remote share password" => "Password della condivisione remota",
-"Cancel" => "Annulla",
-"Add remote share" => "Aggiungi condivisione remota",
-"No ownCloud installation found at {remote}" => "Nessuna installazione di ownCloud trovata su {remote}",
-"Invalid ownCloud url" => "URL di ownCloud non valido",
-"Shared by" => "Condiviso da",
-"This share is password-protected" => "Questa condivione è protetta da password",
-"The password is wrong. Try again." => "La password è errata. Prova ancora.",
-"Password" => "Password",
-"Name" => "Nome",
-"Share time" => "Tempo di condivisione",
-"Sorry, this link doesn’t seem to work anymore." => "Spiacenti, questo collegamento sembra non essere più attivo.",
-"Reasons might be:" => "I motivi potrebbero essere:",
-"the item was removed" => "l'elemento è stato rimosso",
-"the link expired" => "il collegamento è scaduto",
-"sharing is disabled" => "la condivisione è disabilitata",
-"For more info, please ask the person who sent this link." => "Per ulteriori informazioni, chiedi alla persona che ti ha inviato il collegamento.",
-"Add to your ownCloud" => "Aggiungi al tuo ownCloud",
-"Download" => "Scarica",
-"Download %s" => "Scarica %s",
-"Direct link" => "Collegamento diretto",
-"Remote Shares" => "Condivisioni remote",
-"Allow other instances to mount public links shared from this server" => "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server",
-"Allow users to mount public link shares" => "Permetti agli utenti di montare condivisioni con collegamento pubblico"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
new file mode 100644
index 00000000000..ed0ee4fd3a1
--- /dev/null
+++ b/apps/files_sharing/l10n/ja.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "このサーバーでは、サーバー間の共有が有効ではありません",
+    "The mountpoint name contains invalid characters." : "マウントポイント名 に不正な文字列が含まれています。",
+    "Invalid or untrusted SSL certificate" : "無効または信頼できないSSL証明書",
+    "Couldn't add remote share" : "リモート共有を追加できませんでした",
+    "Shared with you" : "他ユーザーがあなたと共有中",
+    "Shared with others" : "他ユーザーと共有中",
+    "Shared by link" : "URLリンクで共有中",
+    "No files have been shared with you yet." : "他のユーザーがあなたと共有しているファイルはありません。",
+    "You haven't shared any files yet." : "他のユーザーと共有しているファイルはありません。",
+    "You haven't shared any files by link yet." : "URLリンクで共有しているファイルはありません。",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "{owner}@{remote} からリモート共有 {name} を追加してもよろしいですか？",
+    "Remote share" : "リモート共有",
+    "Remote share password" : "リモート共有のパスワード",
+    "Cancel" : "キャンセル",
+    "Add remote share" : "リモート共有を追加",
+    "No ownCloud installation found at {remote}" : "{remote} にはownCloudがインストールされていません",
+    "Invalid ownCloud url" : "無効なownCloud URL です",
+    "Shared by" : "共有者：",
+    "This share is password-protected" : "この共有はパスワードで保護されています",
+    "The password is wrong. Try again." : "パスワードが間違っています。再試行してください。",
+    "Password" : "パスワード",
+    "Name" : "名前",
+    "Share time" : "共有時間",
+    "Sorry, this link doesn’t seem to work anymore." : "申し訳ございません。このリンクはもう利用できません。",
+    "Reasons might be:" : "理由は以下の通りと考えられます：",
+    "the item was removed" : "アイテムが削除されました",
+    "the link expired" : "リンクの期限が切れています",
+    "sharing is disabled" : "共有は無効になっています",
+    "For more info, please ask the person who sent this link." : "不明な点は、こちらのリンクの提供者に確認をお願いします。",
+    "Add to your ownCloud" : "ownCloud に追加",
+    "Download" : "ダウンロード",
+    "Download %s" : "%s をダウンロード",
+    "Direct link" : "リンク",
+    "Remote Shares" : "リモート共有",
+    "Allow other instances to mount public links shared from this server" : "このサーバーにおけるURLでの共有を他のインスタンスからマウントできるようにする",
+    "Allow users to mount public link shares" : "ユーザーがURLでの共有をマウントできるようにする"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
new file mode 100644
index 00000000000..8500f6b2f2f
--- /dev/null
+++ b/apps/files_sharing/l10n/ja.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "このサーバーでは、サーバー間の共有が有効ではありません",
+    "The mountpoint name contains invalid characters." : "マウントポイント名 に不正な文字列が含まれています。",
+    "Invalid or untrusted SSL certificate" : "無効または信頼できないSSL証明書",
+    "Couldn't add remote share" : "リモート共有を追加できませんでした",
+    "Shared with you" : "他ユーザーがあなたと共有中",
+    "Shared with others" : "他ユーザーと共有中",
+    "Shared by link" : "URLリンクで共有中",
+    "No files have been shared with you yet." : "他のユーザーがあなたと共有しているファイルはありません。",
+    "You haven't shared any files yet." : "他のユーザーと共有しているファイルはありません。",
+    "You haven't shared any files by link yet." : "URLリンクで共有しているファイルはありません。",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "{owner}@{remote} からリモート共有 {name} を追加してもよろしいですか？",
+    "Remote share" : "リモート共有",
+    "Remote share password" : "リモート共有のパスワード",
+    "Cancel" : "キャンセル",
+    "Add remote share" : "リモート共有を追加",
+    "No ownCloud installation found at {remote}" : "{remote} にはownCloudがインストールされていません",
+    "Invalid ownCloud url" : "無効なownCloud URL です",
+    "Shared by" : "共有者：",
+    "This share is password-protected" : "この共有はパスワードで保護されています",
+    "The password is wrong. Try again." : "パスワードが間違っています。再試行してください。",
+    "Password" : "パスワード",
+    "Name" : "名前",
+    "Share time" : "共有時間",
+    "Sorry, this link doesn’t seem to work anymore." : "申し訳ございません。このリンクはもう利用できません。",
+    "Reasons might be:" : "理由は以下の通りと考えられます：",
+    "the item was removed" : "アイテムが削除されました",
+    "the link expired" : "リンクの期限が切れています",
+    "sharing is disabled" : "共有は無効になっています",
+    "For more info, please ask the person who sent this link." : "不明な点は、こちらのリンクの提供者に確認をお願いします。",
+    "Add to your ownCloud" : "ownCloud に追加",
+    "Download" : "ダウンロード",
+    "Download %s" : "%s をダウンロード",
+    "Direct link" : "リンク",
+    "Remote Shares" : "リモート共有",
+    "Allow other instances to mount public links shared from this server" : "このサーバーにおけるURLでの共有を他のインスタンスからマウントできるようにする",
+    "Allow users to mount public link shares" : "ユーザーがURLでの共有をマウントできるようにする"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ja.php b/apps/files_sharing/l10n/ja.php
deleted file mode 100644
index 7a89a180b43..00000000000
--- a/apps/files_sharing/l10n/ja.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "このサーバーでは、サーバー間の共有が有効ではありません",
-"The mountpoint name contains invalid characters." => "マウントポイント名 に不正な文字列が含まれています。",
-"Invalid or untrusted SSL certificate" => "無効または信頼できないSSL証明書",
-"Couldn't add remote share" => "リモート共有を追加できませんでした",
-"Shared with you" => "他ユーザーがあなたと共有中",
-"Shared with others" => "他ユーザーと共有中",
-"Shared by link" => "URLリンクで共有中",
-"No files have been shared with you yet." => "他のユーザーがあなたと共有しているファイルはありません。",
-"You haven't shared any files yet." => "他のユーザーと共有しているファイルはありません。",
-"You haven't shared any files by link yet." => "URLリンクで共有しているファイルはありません。",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "{owner}@{remote} からリモート共有 {name} を追加してもよろしいですか？",
-"Remote share" => "リモート共有",
-"Remote share password" => "リモート共有のパスワード",
-"Cancel" => "キャンセル",
-"Add remote share" => "リモート共有を追加",
-"No ownCloud installation found at {remote}" => "{remote} にはownCloudがインストールされていません",
-"Invalid ownCloud url" => "無効なownCloud URL です",
-"Shared by" => "共有者：",
-"This share is password-protected" => "この共有はパスワードで保護されています",
-"The password is wrong. Try again." => "パスワードが間違っています。再試行してください。",
-"Password" => "パスワード",
-"Name" => "名前",
-"Share time" => "共有時間",
-"Sorry, this link doesn’t seem to work anymore." => "申し訳ございません。このリンクはもう利用できません。",
-"Reasons might be:" => "理由は以下の通りと考えられます：",
-"the item was removed" => "アイテムが削除されました",
-"the link expired" => "リンクの期限が切れています",
-"sharing is disabled" => "共有は無効になっています",
-"For more info, please ask the person who sent this link." => "不明な点は、こちらのリンクの提供者に確認をお願いします。",
-"Add to your ownCloud" => "ownCloud に追加",
-"Download" => "ダウンロード",
-"Download %s" => "%s をダウンロード",
-"Direct link" => "リンク",
-"Remote Shares" => "リモート共有",
-"Allow other instances to mount public links shared from this server" => "このサーバーにおけるURLでの共有を他のインスタンスからマウントできるようにする",
-"Allow users to mount public link shares" => "ユーザーがURLでの共有をマウントできるようにする"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/jv.js b/apps/files_sharing/l10n/jv.js
new file mode 100644
index 00000000000..6a7a3e6fedc
--- /dev/null
+++ b/apps/files_sharing/l10n/jv.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Download" : "Njipuk"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/jv.json b/apps/files_sharing/l10n/jv.json
new file mode 100644
index 00000000000..5122607580c
--- /dev/null
+++ b/apps/files_sharing/l10n/jv.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Download" : "Njipuk"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/jv.php b/apps/files_sharing/l10n/jv.php
deleted file mode 100644
index 690632bdba0..00000000000
--- a/apps/files_sharing/l10n/jv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Download" => "Njipuk"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ka_GE.js b/apps/files_sharing/l10n/ka_GE.js
new file mode 100644
index 00000000000..df36093b688
--- /dev/null
+++ b/apps/files_sharing/l10n/ka_GE.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "უარყოფა",
+    "Shared by" : "აზიარებს",
+    "Password" : "პაროლი",
+    "Name" : "სახელი",
+    "Download" : "ჩამოტვირთვა"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/ka_GE.json b/apps/files_sharing/l10n/ka_GE.json
new file mode 100644
index 00000000000..acebf7caa30
--- /dev/null
+++ b/apps/files_sharing/l10n/ka_GE.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "უარყოფა",
+    "Shared by" : "აზიარებს",
+    "Password" : "პაროლი",
+    "Name" : "სახელი",
+    "Download" : "ჩამოტვირთვა"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ka_GE.php b/apps/files_sharing/l10n/ka_GE.php
deleted file mode 100644
index 0fcf07f3bb1..00000000000
--- a/apps/files_sharing/l10n/ka_GE.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "უარყოფა",
-"Shared by" => "აზიარებს",
-"Password" => "პაროლი",
-"Name" => "სახელი",
-"Download" => "ჩამოტვირთვა"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/km.js b/apps/files_sharing/l10n/km.js
new file mode 100644
index 00000000000..d98f1df047e
--- /dev/null
+++ b/apps/files_sharing/l10n/km.js
@@ -0,0 +1,20 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "បោះបង់",
+    "Shared by" : "បាន​ចែក​រំលែក​ដោយ",
+    "This share is password-protected" : "ការ​ចែករំលែក​នេះ​ត្រូវ​បាន​ការពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "The password is wrong. Try again." : "ពាក្យ​សម្ងាត់​ខុស​ហើយ។ ព្យាយាម​ម្ដង​ទៀត។",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Name" : "ឈ្មោះ",
+    "Sorry, this link doesn’t seem to work anymore." : "សូម​ទោស តំណ​នេះ​ហាក់​ដូច​ជា​លែង​ដើរ​ហើយ។",
+    "Reasons might be:" : "មូលហេតុ​អាច​ជា៖",
+    "the item was removed" : "របស់​ត្រូវ​បាន​ដក​ចេញ",
+    "the link expired" : "តំណ​ផុត​ពេល​កំណត់",
+    "sharing is disabled" : "មិន​អនុញ្ញាត​ការ​ចែករំលែក",
+    "For more info, please ask the person who sent this link." : "សម្រាប់​ព័ត៌មាន​បន្ថែម សូម​សួរ​អ្នក​ដែល​ផ្ញើ​តំណ​នេះ។",
+    "Download" : "ទាញយក",
+    "Download %s" : "ទាញយក %s",
+    "Direct link" : "តំណ​ផ្ទាល់"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/km.json b/apps/files_sharing/l10n/km.json
new file mode 100644
index 00000000000..283ddcf871a
--- /dev/null
+++ b/apps/files_sharing/l10n/km.json
@@ -0,0 +1,18 @@
+{ "translations": {
+    "Cancel" : "បោះបង់",
+    "Shared by" : "បាន​ចែក​រំលែក​ដោយ",
+    "This share is password-protected" : "ការ​ចែករំលែក​នេះ​ត្រូវ​បាន​ការពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "The password is wrong. Try again." : "ពាក្យ​សម្ងាត់​ខុស​ហើយ។ ព្យាយាម​ម្ដង​ទៀត។",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Name" : "ឈ្មោះ",
+    "Sorry, this link doesn’t seem to work anymore." : "សូម​ទោស តំណ​នេះ​ហាក់​ដូច​ជា​លែង​ដើរ​ហើយ។",
+    "Reasons might be:" : "មូលហេតុ​អាច​ជា៖",
+    "the item was removed" : "របស់​ត្រូវ​បាន​ដក​ចេញ",
+    "the link expired" : "តំណ​ផុត​ពេល​កំណត់",
+    "sharing is disabled" : "មិន​អនុញ្ញាត​ការ​ចែករំលែក",
+    "For more info, please ask the person who sent this link." : "សម្រាប់​ព័ត៌មាន​បន្ថែម សូម​សួរ​អ្នក​ដែល​ផ្ញើ​តំណ​នេះ។",
+    "Download" : "ទាញយក",
+    "Download %s" : "ទាញយក %s",
+    "Direct link" : "តំណ​ផ្ទាល់"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/km.php b/apps/files_sharing/l10n/km.php
deleted file mode 100644
index 605266d6da1..00000000000
--- a/apps/files_sharing/l10n/km.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "បោះបង់",
-"Shared by" => "បាន​ចែក​រំលែក​ដោយ",
-"This share is password-protected" => "ការ​ចែករំលែក​នេះ​ត្រូវ​បាន​ការពារ​ដោយ​ពាក្យ​សម្ងាត់",
-"The password is wrong. Try again." => "ពាក្យ​សម្ងាត់​ខុស​ហើយ។ ព្យាយាម​ម្ដង​ទៀត។",
-"Password" => "ពាក្យសម្ងាត់",
-"Name" => "ឈ្មោះ",
-"Sorry, this link doesn’t seem to work anymore." => "សូម​ទោស តំណ​នេះ​ហាក់​ដូច​ជា​លែង​ដើរ​ហើយ។",
-"Reasons might be:" => "មូលហេតុ​អាច​ជា៖",
-"the item was removed" => "របស់​ត្រូវ​បាន​ដក​ចេញ",
-"the link expired" => "តំណ​ផុត​ពេល​កំណត់",
-"sharing is disabled" => "មិន​អនុញ្ញាត​ការ​ចែករំលែក",
-"For more info, please ask the person who sent this link." => "សម្រាប់​ព័ត៌មាន​បន្ថែម សូម​សួរ​អ្នក​ដែល​ផ្ញើ​តំណ​នេះ។",
-"Download" => "ទាញយក",
-"Download %s" => "ទាញយក %s",
-"Direct link" => "តំណ​ផ្ទាល់"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ko.js b/apps/files_sharing/l10n/ko.js
new file mode 100644
index 00000000000..88fe10788c9
--- /dev/null
+++ b/apps/files_sharing/l10n/ko.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "취소",
+    "Shared by" : "공유한 사용자:",
+    "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다",
+    "The password is wrong. Try again." : "암호가 잘못되었습니다. 다시 입력해 주십시오.",
+    "Password" : "암호",
+    "Name" : "이름",
+    "Sorry, this link doesn’t seem to work anymore." : "죄송합니다. 이 링크는 더 이상 작동하지 않습니다.",
+    "Reasons might be:" : "이유는 다음과 같을 수 있습니다:",
+    "the item was removed" : "항목이 삭제됨",
+    "the link expired" : "링크가 만료됨",
+    "sharing is disabled" : "공유가 비활성화됨",
+    "For more info, please ask the person who sent this link." : "자세한 정보는 링크를 보낸 사람에게 문의하십시오.",
+    "Download" : "다운로드",
+    "Direct link" : "직접 링크"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/ko.json b/apps/files_sharing/l10n/ko.json
new file mode 100644
index 00000000000..e005feecef1
--- /dev/null
+++ b/apps/files_sharing/l10n/ko.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Cancel" : "취소",
+    "Shared by" : "공유한 사용자:",
+    "This share is password-protected" : "이 공유는 암호로 보호되어 있습니다",
+    "The password is wrong. Try again." : "암호가 잘못되었습니다. 다시 입력해 주십시오.",
+    "Password" : "암호",
+    "Name" : "이름",
+    "Sorry, this link doesn’t seem to work anymore." : "죄송합니다. 이 링크는 더 이상 작동하지 않습니다.",
+    "Reasons might be:" : "이유는 다음과 같을 수 있습니다:",
+    "the item was removed" : "항목이 삭제됨",
+    "the link expired" : "링크가 만료됨",
+    "sharing is disabled" : "공유가 비활성화됨",
+    "For more info, please ask the person who sent this link." : "자세한 정보는 링크를 보낸 사람에게 문의하십시오.",
+    "Download" : "다운로드",
+    "Direct link" : "직접 링크"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ko.php b/apps/files_sharing/l10n/ko.php
deleted file mode 100644
index 1a75eca32f6..00000000000
--- a/apps/files_sharing/l10n/ko.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "취소",
-"Shared by" => "공유한 사용자:",
-"This share is password-protected" => "이 공유는 암호로 보호되어 있습니다",
-"The password is wrong. Try again." => "암호가 잘못되었습니다. 다시 입력해 주십시오.",
-"Password" => "암호",
-"Name" => "이름",
-"Sorry, this link doesn’t seem to work anymore." => "죄송합니다. 이 링크는 더 이상 작동하지 않습니다.",
-"Reasons might be:" => "이유는 다음과 같을 수 있습니다:",
-"the item was removed" => "항목이 삭제됨",
-"the link expired" => "링크가 만료됨",
-"sharing is disabled" => "공유가 비활성화됨",
-"For more info, please ask the person who sent this link." => "자세한 정보는 링크를 보낸 사람에게 문의하십시오.",
-"Download" => "다운로드",
-"Direct link" => "직접 링크"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/ku_IQ.js b/apps/files_sharing/l10n/ku_IQ.js
new file mode 100644
index 00000000000..f1549d46c0f
--- /dev/null
+++ b/apps/files_sharing/l10n/ku_IQ.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "لابردن",
+    "Password" : "وشەی تێپەربو",
+    "Name" : "ناو",
+    "Download" : "داگرتن"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ku_IQ.json b/apps/files_sharing/l10n/ku_IQ.json
new file mode 100644
index 00000000000..7be49d0c5e2
--- /dev/null
+++ b/apps/files_sharing/l10n/ku_IQ.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Cancel" : "لابردن",
+    "Password" : "وشەی تێپەربو",
+    "Name" : "ناو",
+    "Download" : "داگرتن"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ku_IQ.php b/apps/files_sharing/l10n/ku_IQ.php
deleted file mode 100644
index 50f75a7b573..00000000000
--- a/apps/files_sharing/l10n/ku_IQ.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "لابردن",
-"Password" => "وشەی تێپەربو",
-"Name" => "ناو",
-"Download" => "داگرتن"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lb.js b/apps/files_sharing/l10n/lb.js
new file mode 100644
index 00000000000..f391757f709
--- /dev/null
+++ b/apps/files_sharing/l10n/lb.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Ofbriechen",
+    "Shared by" : "Gedeelt vun",
+    "The password is wrong. Try again." : "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
+    "Password" : "Passwuert",
+    "Name" : "Numm",
+    "Download" : "Download"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/lb.json b/apps/files_sharing/l10n/lb.json
new file mode 100644
index 00000000000..07d504d9165
--- /dev/null
+++ b/apps/files_sharing/l10n/lb.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Cancel" : "Ofbriechen",
+    "Shared by" : "Gedeelt vun",
+    "The password is wrong. Try again." : "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
+    "Password" : "Passwuert",
+    "Name" : "Numm",
+    "Download" : "Download"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/lb.php b/apps/files_sharing/l10n/lb.php
deleted file mode 100644
index 0657d968264..00000000000
--- a/apps/files_sharing/l10n/lb.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Ofbriechen",
-"Shared by" => "Gedeelt vun",
-"The password is wrong. Try again." => "Den Passwuert ass incorrect. Probeier ed nach eng keier.",
-"Password" => "Passwuert",
-"Name" => "Numm",
-"Download" => "Download"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/lt_LT.js b/apps/files_sharing/l10n/lt_LT.js
new file mode 100644
index 00000000000..9a7145bbdae
--- /dev/null
+++ b/apps/files_sharing/l10n/lt_LT.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Atšaukti",
+    "Shared by" : "Dalinasi",
+    "This share is password-protected" : "Turinys apsaugotas slaptažodžiu",
+    "The password is wrong. Try again." : "Netinka slaptažodis: Bandykite dar kartą.",
+    "Password" : "Slaptažodis",
+    "Name" : "Pavadinimas",
+    "Sorry, this link doesn’t seem to work anymore." : "Atleiskite, panašu, kad nuoroda yra neveiksni.",
+    "Reasons might be:" : "Galimos priežastys:",
+    "the item was removed" : "elementas buvo pašalintas",
+    "the link expired" : "baigėsi nuorodos galiojimo laikas",
+    "sharing is disabled" : "dalinimasis yra išjungtas",
+    "For more info, please ask the person who sent this link." : "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.",
+    "Download" : "Atsisiųsti",
+    "Direct link" : "Tiesioginė nuoroda"
+},
+"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_sharing/l10n/lt_LT.json b/apps/files_sharing/l10n/lt_LT.json
new file mode 100644
index 00000000000..2da5fb37d50
--- /dev/null
+++ b/apps/files_sharing/l10n/lt_LT.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Cancel" : "Atšaukti",
+    "Shared by" : "Dalinasi",
+    "This share is password-protected" : "Turinys apsaugotas slaptažodžiu",
+    "The password is wrong. Try again." : "Netinka slaptažodis: Bandykite dar kartą.",
+    "Password" : "Slaptažodis",
+    "Name" : "Pavadinimas",
+    "Sorry, this link doesn’t seem to work anymore." : "Atleiskite, panašu, kad nuoroda yra neveiksni.",
+    "Reasons might be:" : "Galimos priežastys:",
+    "the item was removed" : "elementas buvo pašalintas",
+    "the link expired" : "baigėsi nuorodos galiojimo laikas",
+    "sharing is disabled" : "dalinimasis yra išjungtas",
+    "For more info, please ask the person who sent this link." : "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.",
+    "Download" : "Atsisiųsti",
+    "Direct link" : "Tiesioginė nuoroda"
+},"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_sharing/l10n/lt_LT.php b/apps/files_sharing/l10n/lt_LT.php
deleted file mode 100644
index 4742d2ccd9d..00000000000
--- a/apps/files_sharing/l10n/lt_LT.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Atšaukti",
-"Shared by" => "Dalinasi",
-"This share is password-protected" => "Turinys apsaugotas slaptažodžiu",
-"The password is wrong. Try again." => "Netinka slaptažodis: Bandykite dar kartą.",
-"Password" => "Slaptažodis",
-"Name" => "Pavadinimas",
-"Sorry, this link doesn’t seem to work anymore." => "Atleiskite, panašu, kad nuoroda yra neveiksni.",
-"Reasons might be:" => "Galimos priežastys:",
-"the item was removed" => "elementas buvo pašalintas",
-"the link expired" => "baigėsi nuorodos galiojimo laikas",
-"sharing is disabled" => "dalinimasis yra išjungtas",
-"For more info, please ask the person who sent this link." => "Dėl tikslesnės informacijos susisiekite su asmeniu atsiuntusiu nuorodą.",
-"Download" => "Atsisiųsti",
-"Direct link" => "Tiesioginė nuoroda"
-);
-$PLURAL_FORMS = "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_sharing/l10n/lv.js b/apps/files_sharing/l10n/lv.js
new file mode 100644
index 00000000000..c786d7f3f18
--- /dev/null
+++ b/apps/files_sharing/l10n/lv.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Atcelt",
+    "Shared by" : "Dalījās",
+    "Password" : "Parole",
+    "Name" : "Nosaukums",
+    "Download" : "Lejupielādēt"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_sharing/l10n/lv.json b/apps/files_sharing/l10n/lv.json
new file mode 100644
index 00000000000..dc317305cc5
--- /dev/null
+++ b/apps/files_sharing/l10n/lv.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "Atcelt",
+    "Shared by" : "Dalījās",
+    "Password" : "Parole",
+    "Name" : "Nosaukums",
+    "Download" : "Lejupielādē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/files_sharing/l10n/lv.php b/apps/files_sharing/l10n/lv.php
deleted file mode 100644
index 33182d25eb7..00000000000
--- a/apps/files_sharing/l10n/lv.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Atcelt",
-"Shared by" => "Dalījās",
-"Password" => "Parole",
-"Name" => "Nosaukums",
-"Download" => "Lejupielādēt"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_sharing/l10n/mk.js b/apps/files_sharing/l10n/mk.js
new file mode 100644
index 00000000000..028c2f7ee0f
--- /dev/null
+++ b/apps/files_sharing/l10n/mk.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Shared with you" : "Споделено со тебе",
+    "Shared with others" : "Сподели со останатите",
+    "Shared by link" : "Споделено со врска",
+    "No files have been shared with you yet." : "Ниту една датотека сеуште не била споделена со вас.",
+    "You haven't shared any files yet." : "Вие досега немате споделено ниту една датотека.",
+    "You haven't shared any files by link yet." : "Сеуште немате споделено датотека со врска.",
+    "Cancel" : "Откажи",
+    "Shared by" : "Споделено од",
+    "This share is password-protected" : "Ова споделување е заштитено со лозинка",
+    "The password is wrong. Try again." : "Лозинката е грешна. Обиди се повторно.",
+    "Password" : "Лозинка",
+    "Name" : "Име",
+    "Share time" : "Сподели време",
+    "Sorry, this link doesn’t seem to work anymore." : "Извенете, но овој линк изгледа дека повеќе не функционира.",
+    "Reasons might be:" : "Причината може да биде:",
+    "the item was removed" : "предметот беше одстранет",
+    "the link expired" : "времетраењето на линкот е изминато",
+    "sharing is disabled" : "споделувањето не е дозволено",
+    "For more info, please ask the person who sent this link." : "За повеќе информации, прашајте го лицето кое ви ја испратила врската.",
+    "Download" : "Преземи",
+    "Download %s" : "Преземи %s",
+    "Direct link" : "Директна врска"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/files_sharing/l10n/mk.json b/apps/files_sharing/l10n/mk.json
new file mode 100644
index 00000000000..9e51f668eb0
--- /dev/null
+++ b/apps/files_sharing/l10n/mk.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Shared with you" : "Споделено со тебе",
+    "Shared with others" : "Сподели со останатите",
+    "Shared by link" : "Споделено со врска",
+    "No files have been shared with you yet." : "Ниту една датотека сеуште не била споделена со вас.",
+    "You haven't shared any files yet." : "Вие досега немате споделено ниту една датотека.",
+    "You haven't shared any files by link yet." : "Сеуште немате споделено датотека со врска.",
+    "Cancel" : "Откажи",
+    "Shared by" : "Споделено од",
+    "This share is password-protected" : "Ова споделување е заштитено со лозинка",
+    "The password is wrong. Try again." : "Лозинката е грешна. Обиди се повторно.",
+    "Password" : "Лозинка",
+    "Name" : "Име",
+    "Share time" : "Сподели време",
+    "Sorry, this link doesn’t seem to work anymore." : "Извенете, но овој линк изгледа дека повеќе не функционира.",
+    "Reasons might be:" : "Причината може да биде:",
+    "the item was removed" : "предметот беше одстранет",
+    "the link expired" : "времетраењето на линкот е изминато",
+    "sharing is disabled" : "споделувањето не е дозволено",
+    "For more info, please ask the person who sent this link." : "За повеќе информации, прашајте го лицето кое ви ја испратила врската.",
+    "Download" : "Преземи",
+    "Download %s" : "Преземи %s",
+    "Direct link" : "Директна врска"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/mk.php b/apps/files_sharing/l10n/mk.php
deleted file mode 100644
index 4a4a1c1aab2..00000000000
--- a/apps/files_sharing/l10n/mk.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Shared with you" => "Споделено со тебе",
-"Shared with others" => "Сподели со останатите",
-"Shared by link" => "Споделено со врска",
-"No files have been shared with you yet." => "Ниту една датотека сеуште не била споделена со вас.",
-"You haven't shared any files yet." => "Вие досега немате споделено ниту една датотека.",
-"You haven't shared any files by link yet." => "Сеуште немате споделено датотека со врска.",
-"Cancel" => "Откажи",
-"Shared by" => "Споделено од",
-"This share is password-protected" => "Ова споделување е заштитено со лозинка",
-"The password is wrong. Try again." => "Лозинката е грешна. Обиди се повторно.",
-"Password" => "Лозинка",
-"Name" => "Име",
-"Share time" => "Сподели време",
-"Sorry, this link doesn’t seem to work anymore." => "Извенете, но овој линк изгледа дека повеќе не функционира.",
-"Reasons might be:" => "Причината може да биде:",
-"the item was removed" => "предметот беше одстранет",
-"the link expired" => "времетраењето на линкот е изминато",
-"sharing is disabled" => "споделувањето не е дозволено",
-"For more info, please ask the person who sent this link." => "За повеќе информации, прашајте го лицето кое ви ја испратила врската.",
-"Download" => "Преземи",
-"Download %s" => "Преземи %s",
-"Direct link" => "Директна врска"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_sharing/l10n/ms_MY.js b/apps/files_sharing/l10n/ms_MY.js
new file mode 100644
index 00000000000..92ca90bb60e
--- /dev/null
+++ b/apps/files_sharing/l10n/ms_MY.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Batal",
+    "Shared by" : "Dikongsi dengan",
+    "Password" : "Kata laluan",
+    "Name" : "Nama",
+    "Download" : "Muat turun"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/ms_MY.json b/apps/files_sharing/l10n/ms_MY.json
new file mode 100644
index 00000000000..45ae1fe85a0
--- /dev/null
+++ b/apps/files_sharing/l10n/ms_MY.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "Batal",
+    "Shared by" : "Dikongsi dengan",
+    "Password" : "Kata laluan",
+    "Name" : "Nama",
+    "Download" : "Muat turun"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ms_MY.php b/apps/files_sharing/l10n/ms_MY.php
deleted file mode 100644
index 0d1e00c1b47..00000000000
--- a/apps/files_sharing/l10n/ms_MY.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Batal",
-"Shared by" => "Dikongsi dengan",
-"Password" => "Kata laluan",
-"Name" => "Nama",
-"Download" => "Muat turun"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/my_MM.js b/apps/files_sharing/l10n/my_MM.js
new file mode 100644
index 00000000000..cde621b63be
--- /dev/null
+++ b/apps/files_sharing/l10n/my_MM.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Password" : "စကားဝှက်",
+    "Download" : "ဒေါင်းလုတ်"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/my_MM.json b/apps/files_sharing/l10n/my_MM.json
new file mode 100644
index 00000000000..9e7fd456f0b
--- /dev/null
+++ b/apps/files_sharing/l10n/my_MM.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Password" : "စကားဝှက်",
+    "Download" : "ဒေါင်းလုတ်"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/my_MM.php b/apps/files_sharing/l10n/my_MM.php
deleted file mode 100644
index 4ca6a9049e7..00000000000
--- a/apps/files_sharing/l10n/my_MM.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "ပယ်ဖျက်မည်",
-"Password" => "စကားဝှက်",
-"Download" => "ဒေါင်းလုတ်"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
new file mode 100644
index 00000000000..1038d9e1beb
--- /dev/null
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Server til server-deling er ikke aktivert på denne serveren",
+    "The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
+    "Invalid or untrusted SSL certificate" : "Ugyldig eller ikke tiltrodd SSL-sertifikat",
+    "Couldn't add remote share" : "Klarte ikke å legge til ekstern deling",
+    "Shared with you" : "Delt med deg",
+    "Shared with others" : "Delt med andre",
+    "Shared by link" : "Delt med lenke",
+    "No files have been shared with you yet." : "Ingen filer er delt med deg ennå.",
+    "You haven't shared any files yet." : "Du har ikke delt noen filer ennå.",
+    "You haven't shared any files by link yet." : "Du har ikke delt noen filer med lenke ennå.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Ønsker du å legge til ekstern deling {name} fra {owner}@{remote}?",
+    "Remote share" : "Ekstern deling",
+    "Remote share password" : "Passord for ekstern deling",
+    "Cancel" : "Avbryt",
+    "Add remote share" : "Legg til ekstern deling",
+    "No ownCloud installation found at {remote}" : "Ingen ownCloud-installasjon funnet på {remote}",
+    "Invalid ownCloud url" : "Ugyldig ownCloud-url",
+    "Shared by" : "Delt av",
+    "This share is password-protected" : "Denne delingen er passordbeskyttet",
+    "The password is wrong. Try again." : "Passordet er feil. Prøv på nytt.",
+    "Password" : "Passord",
+    "Name" : "Navn",
+    "Share time" : "Delingstidspunkt",
+    "Sorry, this link doesn’t seem to work anymore." : "Beklager, denne lenken ser ikke ut til å virke lenger.",
+    "Reasons might be:" : "Mulige årsaker:",
+    "the item was removed" : "elementet er fjernet",
+    "the link expired" : "lenken er utløpt",
+    "sharing is disabled" : "deling er deaktivert",
+    "For more info, please ask the person who sent this link." : "For mer informasjon, spør personen som sendte lenken.",
+    "Add to your ownCloud" : "Legg til i din ownCloud",
+    "Download" : "Last ned",
+    "Download %s" : "Last ned %s",
+    "Direct link" : "Direkte lenke",
+    "Remote Shares" : "Ekstern deling",
+    "Allow other instances to mount public links shared from this server" : "Tillat at andre servere kobler opp offentlige lenker som er delt fra denne serveren",
+    "Allow users to mount public link shares" : "Tillat at brukere kobler opp offentlige lenke-delinger"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
new file mode 100644
index 00000000000..a511465b997
--- /dev/null
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Server til server-deling er ikke aktivert på denne serveren",
+    "The mountpoint name contains invalid characters." : "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
+    "Invalid or untrusted SSL certificate" : "Ugyldig eller ikke tiltrodd SSL-sertifikat",
+    "Couldn't add remote share" : "Klarte ikke å legge til ekstern deling",
+    "Shared with you" : "Delt med deg",
+    "Shared with others" : "Delt med andre",
+    "Shared by link" : "Delt med lenke",
+    "No files have been shared with you yet." : "Ingen filer er delt med deg ennå.",
+    "You haven't shared any files yet." : "Du har ikke delt noen filer ennå.",
+    "You haven't shared any files by link yet." : "Du har ikke delt noen filer med lenke ennå.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Ønsker du å legge til ekstern deling {name} fra {owner}@{remote}?",
+    "Remote share" : "Ekstern deling",
+    "Remote share password" : "Passord for ekstern deling",
+    "Cancel" : "Avbryt",
+    "Add remote share" : "Legg til ekstern deling",
+    "No ownCloud installation found at {remote}" : "Ingen ownCloud-installasjon funnet på {remote}",
+    "Invalid ownCloud url" : "Ugyldig ownCloud-url",
+    "Shared by" : "Delt av",
+    "This share is password-protected" : "Denne delingen er passordbeskyttet",
+    "The password is wrong. Try again." : "Passordet er feil. Prøv på nytt.",
+    "Password" : "Passord",
+    "Name" : "Navn",
+    "Share time" : "Delingstidspunkt",
+    "Sorry, this link doesn’t seem to work anymore." : "Beklager, denne lenken ser ikke ut til å virke lenger.",
+    "Reasons might be:" : "Mulige årsaker:",
+    "the item was removed" : "elementet er fjernet",
+    "the link expired" : "lenken er utløpt",
+    "sharing is disabled" : "deling er deaktivert",
+    "For more info, please ask the person who sent this link." : "For mer informasjon, spør personen som sendte lenken.",
+    "Add to your ownCloud" : "Legg til i din ownCloud",
+    "Download" : "Last ned",
+    "Download %s" : "Last ned %s",
+    "Direct link" : "Direkte lenke",
+    "Remote Shares" : "Ekstern deling",
+    "Allow other instances to mount public links shared from this server" : "Tillat at andre servere kobler opp offentlige lenker som er delt fra denne serveren",
+    "Allow users to mount public link shares" : "Tillat at brukere kobler opp offentlige lenke-delinger"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
deleted file mode 100644
index 306e3b0204d..00000000000
--- a/apps/files_sharing/l10n/nb_NO.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Server til server-deling er ikke aktivert på denne serveren",
-"The mountpoint name contains invalid characters." => "Navnet på oppkoblingspunktet inneholder ugyldige tegn.",
-"Invalid or untrusted SSL certificate" => "Ugyldig eller ikke tiltrodd SSL-sertifikat",
-"Couldn't add remote share" => "Klarte ikke å legge til ekstern deling",
-"Shared with you" => "Delt med deg",
-"Shared with others" => "Delt med andre",
-"Shared by link" => "Delt med lenke",
-"No files have been shared with you yet." => "Ingen filer er delt med deg ennå.",
-"You haven't shared any files yet." => "Du har ikke delt noen filer ennå.",
-"You haven't shared any files by link yet." => "Du har ikke delt noen filer med lenke ennå.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Ønsker du å legge til ekstern deling {name} fra {owner}@{remote}?",
-"Remote share" => "Ekstern deling",
-"Remote share password" => "Passord for ekstern deling",
-"Cancel" => "Avbryt",
-"Add remote share" => "Legg til ekstern deling",
-"No ownCloud installation found at {remote}" => "Ingen ownCloud-installasjon funnet på {remote}",
-"Invalid ownCloud url" => "Ugyldig ownCloud-url",
-"Shared by" => "Delt av",
-"This share is password-protected" => "Denne delingen er passordbeskyttet",
-"The password is wrong. Try again." => "Passordet er feil. Prøv på nytt.",
-"Password" => "Passord",
-"Name" => "Navn",
-"Share time" => "Delingstidspunkt",
-"Sorry, this link doesn’t seem to work anymore." => "Beklager, denne lenken ser ikke ut til å virke lenger.",
-"Reasons might be:" => "Mulige årsaker:",
-"the item was removed" => "elementet er fjernet",
-"the link expired" => "lenken er utløpt",
-"sharing is disabled" => "deling er deaktivert",
-"For more info, please ask the person who sent this link." => "For mer informasjon, spør personen som sendte lenken.",
-"Add to your ownCloud" => "Legg til i din ownCloud",
-"Download" => "Last ned",
-"Download %s" => "Last ned %s",
-"Direct link" => "Direkte lenke",
-"Remote Shares" => "Ekstern deling",
-"Allow other instances to mount public links shared from this server" => "Tillat at andre servere kobler opp offentlige lenker som er delt fra denne serveren",
-"Allow users to mount public link shares" => "Tillat at brukere kobler opp offentlige lenke-delinger"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
new file mode 100644
index 00000000000..ae691afda9b
--- /dev/null
+++ b/apps/files_sharing/l10n/nl.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Server met server delen is niet geactiveerd op deze server",
+    "The mountpoint name contains invalid characters." : "De naam van het mountpoint bevat ongeldige karakters.",
+    "Invalid or untrusted SSL certificate" : "Ongeldig of onvertrouwd SSL-certificaat",
+    "Couldn't add remote share" : "Kon geen externe share toevoegen",
+    "Shared with you" : "Gedeeld met u",
+    "Shared with others" : "Gedeeld door u",
+    "Shared by link" : "Gedeeld via een link",
+    "No files have been shared with you yet." : "Er zijn nog geen bestanden met u gedeeld.",
+    "You haven't shared any files yet." : "U hebt nog geen bestanden gedeeld.",
+    "You haven't shared any files by link yet." : "U hebt nog geen bestanden via een link gedeeld.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wilt u de externe share {name} van {owner}@{remote} toevoegen?",
+    "Remote share" : "Externe share",
+    "Remote share password" : "Wachtwoord externe share",
+    "Cancel" : "Annuleren",
+    "Add remote share" : "Toevoegen externe share",
+    "No ownCloud installation found at {remote}" : "Geen ownCloud installatie gevonden op {remote}",
+    "Invalid ownCloud url" : "Ongeldige ownCloud url",
+    "Shared by" : "Gedeeld door",
+    "This share is password-protected" : "Deze share is met een wachtwoord beveiligd",
+    "The password is wrong. Try again." : "Wachtwoord ongeldig. Probeer het nogmaals.",
+    "Password" : "Wachtwoord",
+    "Name" : "Naam",
+    "Share time" : "Deel tijd",
+    "Sorry, this link doesn’t seem to work anymore." : "Sorry, deze link lijkt niet meer in gebruik te zijn.",
+    "Reasons might be:" : "Redenen kunnen zijn:",
+    "the item was removed" : "bestand was verwijderd",
+    "the link expired" : "de link is verlopen",
+    "sharing is disabled" : "delen is uitgeschakeld",
+    "For more info, please ask the person who sent this link." : "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
+    "Add to your ownCloud" : "Toevoegen aan uw ownCloud",
+    "Download" : "Downloaden",
+    "Download %s" : "Download %s",
+    "Direct link" : "Directe link",
+    "Remote Shares" : "Externe shares",
+    "Allow other instances to mount public links shared from this server" : "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server",
+    "Allow users to mount public link shares" : "Toestaan dat gebruikers openbaar gedeelde links mounten"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
new file mode 100644
index 00000000000..eb53e0da936
--- /dev/null
+++ b/apps/files_sharing/l10n/nl.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Server met server delen is niet geactiveerd op deze server",
+    "The mountpoint name contains invalid characters." : "De naam van het mountpoint bevat ongeldige karakters.",
+    "Invalid or untrusted SSL certificate" : "Ongeldig of onvertrouwd SSL-certificaat",
+    "Couldn't add remote share" : "Kon geen externe share toevoegen",
+    "Shared with you" : "Gedeeld met u",
+    "Shared with others" : "Gedeeld door u",
+    "Shared by link" : "Gedeeld via een link",
+    "No files have been shared with you yet." : "Er zijn nog geen bestanden met u gedeeld.",
+    "You haven't shared any files yet." : "U hebt nog geen bestanden gedeeld.",
+    "You haven't shared any files by link yet." : "U hebt nog geen bestanden via een link gedeeld.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Wilt u de externe share {name} van {owner}@{remote} toevoegen?",
+    "Remote share" : "Externe share",
+    "Remote share password" : "Wachtwoord externe share",
+    "Cancel" : "Annuleren",
+    "Add remote share" : "Toevoegen externe share",
+    "No ownCloud installation found at {remote}" : "Geen ownCloud installatie gevonden op {remote}",
+    "Invalid ownCloud url" : "Ongeldige ownCloud url",
+    "Shared by" : "Gedeeld door",
+    "This share is password-protected" : "Deze share is met een wachtwoord beveiligd",
+    "The password is wrong. Try again." : "Wachtwoord ongeldig. Probeer het nogmaals.",
+    "Password" : "Wachtwoord",
+    "Name" : "Naam",
+    "Share time" : "Deel tijd",
+    "Sorry, this link doesn’t seem to work anymore." : "Sorry, deze link lijkt niet meer in gebruik te zijn.",
+    "Reasons might be:" : "Redenen kunnen zijn:",
+    "the item was removed" : "bestand was verwijderd",
+    "the link expired" : "de link is verlopen",
+    "sharing is disabled" : "delen is uitgeschakeld",
+    "For more info, please ask the person who sent this link." : "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
+    "Add to your ownCloud" : "Toevoegen aan uw ownCloud",
+    "Download" : "Downloaden",
+    "Download %s" : "Download %s",
+    "Direct link" : "Directe link",
+    "Remote Shares" : "Externe shares",
+    "Allow other instances to mount public links shared from this server" : "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server",
+    "Allow users to mount public link shares" : "Toestaan dat gebruikers openbaar gedeelde links mounten"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
deleted file mode 100644
index 91f8cd3e74c..00000000000
--- a/apps/files_sharing/l10n/nl.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Server met server delen is niet geactiveerd op deze server",
-"The mountpoint name contains invalid characters." => "De naam van het mountpoint bevat ongeldige karakters.",
-"Invalid or untrusted SSL certificate" => "Ongeldig of onvertrouwd SSL-certificaat",
-"Couldn't add remote share" => "Kon geen externe share toevoegen",
-"Shared with you" => "Gedeeld met u",
-"Shared with others" => "Gedeeld door u",
-"Shared by link" => "Gedeeld via een link",
-"No files have been shared with you yet." => "Er zijn nog geen bestanden met u gedeeld.",
-"You haven't shared any files yet." => "U hebt nog geen bestanden gedeeld.",
-"You haven't shared any files by link yet." => "U hebt nog geen bestanden via een link gedeeld.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Wilt u de externe share {name} van {owner}@{remote} toevoegen?",
-"Remote share" => "Externe share",
-"Remote share password" => "Wachtwoord externe share",
-"Cancel" => "Annuleren",
-"Add remote share" => "Toevoegen externe share",
-"No ownCloud installation found at {remote}" => "Geen ownCloud installatie gevonden op {remote}",
-"Invalid ownCloud url" => "Ongeldige ownCloud url",
-"Shared by" => "Gedeeld door",
-"This share is password-protected" => "Deze share is met een wachtwoord beveiligd",
-"The password is wrong. Try again." => "Wachtwoord ongeldig. Probeer het nogmaals.",
-"Password" => "Wachtwoord",
-"Name" => "Naam",
-"Share time" => "Deel tijd",
-"Sorry, this link doesn’t seem to work anymore." => "Sorry, deze link lijkt niet meer in gebruik te zijn.",
-"Reasons might be:" => "Redenen kunnen zijn:",
-"the item was removed" => "bestand was verwijderd",
-"the link expired" => "de link is verlopen",
-"sharing is disabled" => "delen is uitgeschakeld",
-"For more info, please ask the person who sent this link." => "Voor meer informatie, neem contact op met de persoon die u deze link heeft gestuurd.",
-"Add to your ownCloud" => "Toevoegen aan uw ownCloud",
-"Download" => "Downloaden",
-"Download %s" => "Download %s",
-"Direct link" => "Directe link",
-"Remote Shares" => "Externe shares",
-"Allow other instances to mount public links shared from this server" => "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server",
-"Allow users to mount public link shares" => "Toestaan dat gebruikers openbaar gedeelde links mounten"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/nn_NO.js b/apps/files_sharing/l10n/nn_NO.js
new file mode 100644
index 00000000000..f0c749ceb58
--- /dev/null
+++ b/apps/files_sharing/l10n/nn_NO.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Avbryt",
+    "Shared by" : "Delt av",
+    "The password is wrong. Try again." : "Passordet er gale. Prøv igjen.",
+    "Password" : "Passord",
+    "Name" : "Namn",
+    "Sorry, this link doesn’t seem to work anymore." : "Orsak, denne lenkja fungerer visst ikkje lenger.",
+    "Reasons might be:" : "Moglege grunnar:",
+    "the item was removed" : "fila/mappa er fjerna",
+    "the link expired" : "lenkja har gått ut på dato",
+    "sharing is disabled" : "deling er slått av",
+    "For more info, please ask the person who sent this link." : "Spør den som sende deg lenkje om du vil ha meir informasjon.",
+    "Download" : "Last ned"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nn_NO.json b/apps/files_sharing/l10n/nn_NO.json
new file mode 100644
index 00000000000..c4292b2ccb6
--- /dev/null
+++ b/apps/files_sharing/l10n/nn_NO.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Cancel" : "Avbryt",
+    "Shared by" : "Delt av",
+    "The password is wrong. Try again." : "Passordet er gale. Prøv igjen.",
+    "Password" : "Passord",
+    "Name" : "Namn",
+    "Sorry, this link doesn’t seem to work anymore." : "Orsak, denne lenkja fungerer visst ikkje lenger.",
+    "Reasons might be:" : "Moglege grunnar:",
+    "the item was removed" : "fila/mappa er fjerna",
+    "the link expired" : "lenkja har gått ut på dato",
+    "sharing is disabled" : "deling er slått av",
+    "For more info, please ask the person who sent this link." : "Spør den som sende deg lenkje om du vil ha meir informasjon.",
+    "Download" : "Last ned"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/nn_NO.php b/apps/files_sharing/l10n/nn_NO.php
deleted file mode 100644
index 7297183b2e7..00000000000
--- a/apps/files_sharing/l10n/nn_NO.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Avbryt",
-"Shared by" => "Delt av",
-"The password is wrong. Try again." => "Passordet er gale. Prøv igjen.",
-"Password" => "Passord",
-"Name" => "Namn",
-"Sorry, this link doesn’t seem to work anymore." => "Orsak, denne lenkja fungerer visst ikkje lenger.",
-"Reasons might be:" => "Moglege grunnar:",
-"the item was removed" => "fila/mappa er fjerna",
-"the link expired" => "lenkja har gått ut på dato",
-"sharing is disabled" => "deling er slått av",
-"For more info, please ask the person who sent this link." => "Spør den som sende deg lenkje om du vil ha meir informasjon.",
-"Download" => "Last ned"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/oc.js b/apps/files_sharing/l10n/oc.js
new file mode 100644
index 00000000000..74492671603
--- /dev/null
+++ b/apps/files_sharing/l10n/oc.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Annula",
+    "Password" : "Senhal",
+    "Name" : "Nom",
+    "Download" : "Avalcarga"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/oc.json b/apps/files_sharing/l10n/oc.json
new file mode 100644
index 00000000000..787013857a5
--- /dev/null
+++ b/apps/files_sharing/l10n/oc.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Cancel" : "Annula",
+    "Password" : "Senhal",
+    "Name" : "Nom",
+    "Download" : "Avalcarga"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/oc.php b/apps/files_sharing/l10n/oc.php
deleted file mode 100644
index 63169697690..00000000000
--- a/apps/files_sharing/l10n/oc.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Annula",
-"Password" => "Senhal",
-"Name" => "Nom",
-"Download" => "Avalcarga"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pa.js b/apps/files_sharing/l10n/pa.js
new file mode 100644
index 00000000000..55e1fcc2498
--- /dev/null
+++ b/apps/files_sharing/l10n/pa.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Password" : "ਪਾਸਵਰ",
+    "Download" : "ਡਾਊਨਲੋਡ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/pa.json b/apps/files_sharing/l10n/pa.json
new file mode 100644
index 00000000000..d0feec38fff
--- /dev/null
+++ b/apps/files_sharing/l10n/pa.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Password" : "ਪਾਸਵਰ",
+    "Download" : "ਡਾਊਨਲੋਡ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pa.php b/apps/files_sharing/l10n/pa.php
deleted file mode 100644
index cdd4fbc8c44..00000000000
--- a/apps/files_sharing/l10n/pa.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "ਰੱਦ ਕਰੋ",
-"Password" => "ਪਾਸਵਰ",
-"Download" => "ਡਾਊਨਲੋਡ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js
new file mode 100644
index 00000000000..65a4de92265
--- /dev/null
+++ b/apps/files_sharing/l10n/pl.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Współdzielenie między serwerami nie jest uruchomione na tym serwerze",
+    "The mountpoint name contains invalid characters." : "Nazwa zamontowanego zasobu zawiera niedozwolone znaki.",
+    "Invalid or untrusted SSL certificate" : "Niewłaściwy lub niezaufany certyfikat SSL",
+    "Couldn't add remote share" : "Nie można dodać zdalnego folderu",
+    "Shared with you" : "Współdzielony z Tobą",
+    "Shared with others" : "Współdzielony z innymi",
+    "Shared by link" : "Współdzielony linkiem",
+    "No files have been shared with you yet." : "Nie ma jeszcze żadnych plików współdzielonych z Tobą",
+    "You haven't shared any files yet." : "Nie współdzielisz jeszcze żadnych plików.",
+    "You haven't shared any files by link yet." : "Nie współdzielisz jeszcze żadnych plików linkiem",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Czy chcesz dodać udział zdalny {name} od {owner}@{remote}?",
+    "Remote share" : "Zdalny zasób",
+    "Remote share password" : "Hasło do zdalnego zasobu",
+    "Cancel" : "Anuluj",
+    "Add remote share" : "Dodaj zdalny zasób",
+    "No ownCloud installation found at {remote}" : "Nie znaleziono instalacji ownCloud na {remote}",
+    "Invalid ownCloud url" : "Błędny adres URL",
+    "Shared by" : "Udostępniane przez",
+    "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",
+    "Name" : "Nazwa",
+    "Share time" : "Czas współdzielenia",
+    "Sorry, this link doesn’t seem to work anymore." : "Przepraszamy ale wygląda na to, że ten link już nie działa.",
+    "Reasons might be:" : "Możliwe powody:",
+    "the item was removed" : "element został usunięty",
+    "the link expired" : "link wygasł",
+    "sharing is disabled" : "udostępnianie jest wyłączone",
+    "For more info, please ask the person who sent this link." : "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.",
+    "Add to your ownCloud" : "Dodaj do twojego ownCloud",
+    "Download" : "Pobierz",
+    "Download %s" : "Pobierz %s",
+    "Direct link" : "Bezpośredni link",
+    "Remote Shares" : "Udziały zdalne",
+    "Allow other instances to mount public links shared from this server" : "Pozwól innym instancjom montować publiczne linki z tego serwera",
+    "Allow users to mount public link shares" : "Zezwalaj użytkownikom na montowanie publicznych linków"
+},
+"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_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json
new file mode 100644
index 00000000000..89ad199602e
--- /dev/null
+++ b/apps/files_sharing/l10n/pl.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Współdzielenie między serwerami nie jest uruchomione na tym serwerze",
+    "The mountpoint name contains invalid characters." : "Nazwa zamontowanego zasobu zawiera niedozwolone znaki.",
+    "Invalid or untrusted SSL certificate" : "Niewłaściwy lub niezaufany certyfikat SSL",
+    "Couldn't add remote share" : "Nie można dodać zdalnego folderu",
+    "Shared with you" : "Współdzielony z Tobą",
+    "Shared with others" : "Współdzielony z innymi",
+    "Shared by link" : "Współdzielony linkiem",
+    "No files have been shared with you yet." : "Nie ma jeszcze żadnych plików współdzielonych z Tobą",
+    "You haven't shared any files yet." : "Nie współdzielisz jeszcze żadnych plików.",
+    "You haven't shared any files by link yet." : "Nie współdzielisz jeszcze żadnych plików linkiem",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Czy chcesz dodać udział zdalny {name} od {owner}@{remote}?",
+    "Remote share" : "Zdalny zasób",
+    "Remote share password" : "Hasło do zdalnego zasobu",
+    "Cancel" : "Anuluj",
+    "Add remote share" : "Dodaj zdalny zasób",
+    "No ownCloud installation found at {remote}" : "Nie znaleziono instalacji ownCloud na {remote}",
+    "Invalid ownCloud url" : "Błędny adres URL",
+    "Shared by" : "Udostępniane przez",
+    "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",
+    "Name" : "Nazwa",
+    "Share time" : "Czas współdzielenia",
+    "Sorry, this link doesn’t seem to work anymore." : "Przepraszamy ale wygląda na to, że ten link już nie działa.",
+    "Reasons might be:" : "Możliwe powody:",
+    "the item was removed" : "element został usunięty",
+    "the link expired" : "link wygasł",
+    "sharing is disabled" : "udostępnianie jest wyłączone",
+    "For more info, please ask the person who sent this link." : "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.",
+    "Add to your ownCloud" : "Dodaj do twojego ownCloud",
+    "Download" : "Pobierz",
+    "Download %s" : "Pobierz %s",
+    "Direct link" : "Bezpośredni link",
+    "Remote Shares" : "Udziały zdalne",
+    "Allow other instances to mount public links shared from this server" : "Pozwól innym instancjom montować publiczne linki z tego serwera",
+    "Allow users to mount public link shares" : "Zezwalaj użytkownikom na montowanie publicznych linków"
+},"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_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
deleted file mode 100644
index ee3dfbcac48..00000000000
--- a/apps/files_sharing/l10n/pl.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Współdzielenie między serwerami nie jest uruchomione na tym serwerze",
-"The mountpoint name contains invalid characters." => "Nazwa zamontowanego zasobu zawiera niedozwolone znaki.",
-"Invalid or untrusted SSL certificate" => "Niewłaściwy lub niezaufany certyfikat SSL",
-"Couldn't add remote share" => "Nie można dodać zdalnego folderu",
-"Shared with you" => "Współdzielony z Tobą",
-"Shared with others" => "Współdzielony z innymi",
-"Shared by link" => "Współdzielony linkiem",
-"No files have been shared with you yet." => "Nie ma jeszcze żadnych plików współdzielonych z Tobą",
-"You haven't shared any files yet." => "Nie współdzielisz jeszcze żadnych plików.",
-"You haven't shared any files by link yet." => "Nie współdzielisz jeszcze żadnych plików linkiem",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Czy chcesz dodać udział zdalny {name} od {owner}@{remote}?",
-"Remote share" => "Zdalny zasób",
-"Remote share password" => "Hasło do zdalnego zasobu",
-"Cancel" => "Anuluj",
-"Add remote share" => "Dodaj zdalny zasób",
-"No ownCloud installation found at {remote}" => "Nie znaleziono instalacji ownCloud na {remote}",
-"Invalid ownCloud url" => "Błędny adres URL",
-"Shared by" => "Udostępniane przez",
-"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",
-"Name" => "Nazwa",
-"Share time" => "Czas współdzielenia",
-"Sorry, this link doesn’t seem to work anymore." => "Przepraszamy ale wygląda na to, że ten link już nie działa.",
-"Reasons might be:" => "Możliwe powody:",
-"the item was removed" => "element został usunięty",
-"the link expired" => "link wygasł",
-"sharing is disabled" => "udostępnianie jest wyłączone",
-"For more info, please ask the person who sent this link." => "Aby uzyskać więcej informacji proszę poprosić osobę, która wysłał ten link.",
-"Add to your ownCloud" => "Dodaj do twojego ownCloud",
-"Download" => "Pobierz",
-"Download %s" => "Pobierz %s",
-"Direct link" => "Bezpośredni link",
-"Remote Shares" => "Udziały zdalne",
-"Allow other instances to mount public links shared from this server" => "Pozwól innym instancjom montować publiczne linki z tego serwera",
-"Allow users to mount public link shares" => "Zezwalaj użytkownikom na montowanie publicznych linków"
-);
-$PLURAL_FORMS = "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_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
new file mode 100644
index 00000000000..498f423e69a
--- /dev/null
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Compartilhamento de servidor para servidor não está habilitado no servidor",
+    "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém caracteres inválidos.",
+    "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+    "Couldn't add remote share" : "Não foi possível adicionar compartilhamento remoto",
+    "Shared with you" : "Compartilhado com você",
+    "Shared with others" : "Compartilhado com outros",
+    "Shared by link" : "Compartilhado por link",
+    "No files have been shared with you yet." : "Nenhum arquivo ainda foi compartilhado com você.",
+    "You haven't shared any files yet." : "Você ainda não compartilhou nenhum arquivo.",
+    "You haven't shared any files by link yet." : "Você ainda não compartilhou nenhum arquivo por link.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Você quer adicionar o compartilhamento remoto {name} de {owner}@{remote}?",
+    "Remote share" : "Compartilhamento remoto",
+    "Remote share password" : "Senha do compartilhamento remoto",
+    "Cancel" : "Cancelar",
+    "Add remote share" : "Adicionar compartilhamento remoto",
+    "No ownCloud installation found at {remote}" : "Nenhuma instalação ownCloud encontrada em {remote}",
+    "Invalid ownCloud url" : "Url invalida para ownCloud",
+    "Shared by" : "Compartilhado por",
+    "This share is password-protected" : "Este compartilhamento esta protegido por senha",
+    "The password is wrong. Try again." : "Senha incorreta. Tente novamente.",
+    "Password" : "Senha",
+    "Name" : "Nome",
+    "Share time" : "Tempo de compartilhamento",
+    "Sorry, this link doesn’t seem to work anymore." : "Desculpe, este link parece não mais  funcionar.",
+    "Reasons might be:" : "As razões podem ser:",
+    "the item was removed" : "o item foi removido",
+    "the link expired" : "o link expirou",
+    "sharing is disabled" : "o compartilhamento está desativado",
+    "For more info, please ask the person who sent this link." : "Para mais informações, por favor, pergunte a pessoa que enviou este link.",
+    "Add to your ownCloud" : "Adiconar ao seu ownCloud",
+    "Download" : "Baixar",
+    "Download %s" : "Baixar %s",
+    "Direct link" : "Link direto",
+    "Remote Shares" : "Compartilhamentos Remoto",
+    "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor",
+    "Allow users to mount public link shares" : "Permitir aos usuários montar links públicos de compartilhamentos"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
new file mode 100644
index 00000000000..4739bc9a24a
--- /dev/null
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Compartilhamento de servidor para servidor não está habilitado no servidor",
+    "The mountpoint name contains invalid characters." : "O nome do ponto de montagem contém caracteres inválidos.",
+    "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+    "Couldn't add remote share" : "Não foi possível adicionar compartilhamento remoto",
+    "Shared with you" : "Compartilhado com você",
+    "Shared with others" : "Compartilhado com outros",
+    "Shared by link" : "Compartilhado por link",
+    "No files have been shared with you yet." : "Nenhum arquivo ainda foi compartilhado com você.",
+    "You haven't shared any files yet." : "Você ainda não compartilhou nenhum arquivo.",
+    "You haven't shared any files by link yet." : "Você ainda não compartilhou nenhum arquivo por link.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Você quer adicionar o compartilhamento remoto {name} de {owner}@{remote}?",
+    "Remote share" : "Compartilhamento remoto",
+    "Remote share password" : "Senha do compartilhamento remoto",
+    "Cancel" : "Cancelar",
+    "Add remote share" : "Adicionar compartilhamento remoto",
+    "No ownCloud installation found at {remote}" : "Nenhuma instalação ownCloud encontrada em {remote}",
+    "Invalid ownCloud url" : "Url invalida para ownCloud",
+    "Shared by" : "Compartilhado por",
+    "This share is password-protected" : "Este compartilhamento esta protegido por senha",
+    "The password is wrong. Try again." : "Senha incorreta. Tente novamente.",
+    "Password" : "Senha",
+    "Name" : "Nome",
+    "Share time" : "Tempo de compartilhamento",
+    "Sorry, this link doesn’t seem to work anymore." : "Desculpe, este link parece não mais  funcionar.",
+    "Reasons might be:" : "As razões podem ser:",
+    "the item was removed" : "o item foi removido",
+    "the link expired" : "o link expirou",
+    "sharing is disabled" : "o compartilhamento está desativado",
+    "For more info, please ask the person who sent this link." : "Para mais informações, por favor, pergunte a pessoa que enviou este link.",
+    "Add to your ownCloud" : "Adiconar ao seu ownCloud",
+    "Download" : "Baixar",
+    "Download %s" : "Baixar %s",
+    "Direct link" : "Link direto",
+    "Remote Shares" : "Compartilhamentos Remoto",
+    "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor",
+    "Allow users to mount public link shares" : "Permitir aos usuários montar links públicos de compartilhamentos"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pt_BR.php b/apps/files_sharing/l10n/pt_BR.php
deleted file mode 100644
index c190c6fbc89..00000000000
--- a/apps/files_sharing/l10n/pt_BR.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Compartilhamento de servidor para servidor não está habilitado no servidor",
-"The mountpoint name contains invalid characters." => "O nome do ponto de montagem contém caracteres inválidos.",
-"Invalid or untrusted SSL certificate" => "Certificado SSL inválido ou não confiável",
-"Couldn't add remote share" => "Não foi possível adicionar compartilhamento remoto",
-"Shared with you" => "Compartilhado com você",
-"Shared with others" => "Compartilhado com outros",
-"Shared by link" => "Compartilhado por link",
-"No files have been shared with you yet." => "Nenhum arquivo ainda foi compartilhado com você.",
-"You haven't shared any files yet." => "Você ainda não compartilhou nenhum arquivo.",
-"You haven't shared any files by link yet." => "Você ainda não compartilhou nenhum arquivo por link.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Você quer adicionar o compartilhamento remoto {name} de {owner}@{remote}?",
-"Remote share" => "Compartilhamento remoto",
-"Remote share password" => "Senha do compartilhamento remoto",
-"Cancel" => "Cancelar",
-"Add remote share" => "Adicionar compartilhamento remoto",
-"No ownCloud installation found at {remote}" => "Nenhuma instalação ownCloud encontrada em {remote}",
-"Invalid ownCloud url" => "Url invalida para ownCloud",
-"Shared by" => "Compartilhado por",
-"This share is password-protected" => "Este compartilhamento esta protegido por senha",
-"The password is wrong. Try again." => "Senha incorreta. Tente novamente.",
-"Password" => "Senha",
-"Name" => "Nome",
-"Share time" => "Tempo de compartilhamento",
-"Sorry, this link doesn’t seem to work anymore." => "Desculpe, este link parece não mais  funcionar.",
-"Reasons might be:" => "As razões podem ser:",
-"the item was removed" => "o item foi removido",
-"the link expired" => "o link expirou",
-"sharing is disabled" => "o compartilhamento está desativado",
-"For more info, please ask the person who sent this link." => "Para mais informações, por favor, pergunte a pessoa que enviou este link.",
-"Add to your ownCloud" => "Adiconar ao seu ownCloud",
-"Download" => "Baixar",
-"Download %s" => "Baixar %s",
-"Direct link" => "Link direto",
-"Remote Shares" => "Compartilhamentos Remoto",
-"Allow other instances to mount public links shared from this server" => "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor",
-"Allow users to mount public link shares" => "Permitir aos usuários montar links públicos de compartilhamentos"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
new file mode 100644
index 00000000000..218d4608ab6
--- /dev/null
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível",
+    "The mountpoint name contains invalid characters." : "O nome de mountpoint contém caracteres inválidos.",
+    "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+    "Couldn't add remote share" : "Ocorreu um erro ao adicionar a partilha remota",
+    "Shared with you" : "Partilhado consigo ",
+    "Shared with others" : "Partilhado com outros",
+    "Shared by link" : "Partilhado pela hiperligação",
+    "No files have been shared with you yet." : "Ainda não partilhados quaisquer ficheuiros consigo.",
+    "You haven't shared any files yet." : "Ainda não partilhou quaisquer ficheiros.",
+    "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros por hiperligação.",
+    "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" : "Password da partilha remota",
+    "Cancel" : "Cancelar",
+    "Add remote share" : "Adicionar partilha remota",
+    "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação em {remote}",
+    "Invalid ownCloud url" : "Endereço errado",
+    "Shared by" : "Partilhado por",
+    "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",
+    "Name" : "Nome",
+    "Share time" : "Hora da Partilha",
+    "Sorry, this link doesn’t seem to work anymore." : "Desculpe, mas esta hiperligação parece já não estar a funcionar.",
+    "Reasons might be:" : "As razões poderão ser:",
+    "the item was removed" : "o item foi removido",
+    "the link expired" : "A hiperligação expirou",
+    "sharing is disabled" : "a partilha está desativada",
+    "For more info, please ask the person who sent this link." : "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.",
+    "Add to your ownCloud" : "Adicionar á sua ownCloud",
+    "Download" : "Transferir",
+    "Download %s" : "Transferir %s",
+    "Direct link" : "Hiperligação direta",
+    "Remote Shares" : "Partilhas Remotas",
+    "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias mapeiem endereços partilhados deste servidor",
+    "Allow users to mount public link shares" : "Permitir mapeamentos de endereços partilhados aos utilizadores"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
new file mode 100644
index 00000000000..1de211bebc3
--- /dev/null
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível",
+    "The mountpoint name contains invalid characters." : "O nome de mountpoint contém caracteres inválidos.",
+    "Invalid or untrusted SSL certificate" : "Certificado SSL inválido ou não confiável",
+    "Couldn't add remote share" : "Ocorreu um erro ao adicionar a partilha remota",
+    "Shared with you" : "Partilhado consigo ",
+    "Shared with others" : "Partilhado com outros",
+    "Shared by link" : "Partilhado pela hiperligação",
+    "No files have been shared with you yet." : "Ainda não partilhados quaisquer ficheuiros consigo.",
+    "You haven't shared any files yet." : "Ainda não partilhou quaisquer ficheiros.",
+    "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros por hiperligação.",
+    "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" : "Password da partilha remota",
+    "Cancel" : "Cancelar",
+    "Add remote share" : "Adicionar partilha remota",
+    "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação em {remote}",
+    "Invalid ownCloud url" : "Endereço errado",
+    "Shared by" : "Partilhado por",
+    "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",
+    "Name" : "Nome",
+    "Share time" : "Hora da Partilha",
+    "Sorry, this link doesn’t seem to work anymore." : "Desculpe, mas esta hiperligação parece já não estar a funcionar.",
+    "Reasons might be:" : "As razões poderão ser:",
+    "the item was removed" : "o item foi removido",
+    "the link expired" : "A hiperligação expirou",
+    "sharing is disabled" : "a partilha está desativada",
+    "For more info, please ask the person who sent this link." : "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.",
+    "Add to your ownCloud" : "Adicionar á sua ownCloud",
+    "Download" : "Transferir",
+    "Download %s" : "Transferir %s",
+    "Direct link" : "Hiperligação direta",
+    "Remote Shares" : "Partilhas Remotas",
+    "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias mapeiem endereços partilhados deste servidor",
+    "Allow users to mount public link shares" : "Permitir mapeamentos de endereços partilhados aos utilizadores"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pt_PT.php b/apps/files_sharing/l10n/pt_PT.php
deleted file mode 100644
index 59acb2d243a..00000000000
--- a/apps/files_sharing/l10n/pt_PT.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "A partilha entre servidores não se encontra disponível",
-"The mountpoint name contains invalid characters." => "O nome de mountpoint contém caracteres inválidos.",
-"Invalid or untrusted SSL certificate" => "Certificado SSL inválido ou não confiável",
-"Couldn't add remote share" => "Ocorreu um erro ao adicionar a partilha remota",
-"Shared with you" => "Partilhado consigo ",
-"Shared with others" => "Partilhado com outros",
-"Shared by link" => "Partilhado pela hiperligação",
-"No files have been shared with you yet." => "Ainda não partilhados quaisquer ficheuiros consigo.",
-"You haven't shared any files yet." => "Ainda não partilhou quaisquer ficheiros.",
-"You haven't shared any files by link yet." => "Ainda não partilhou quaisquer ficheiros por hiperligação.",
-"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" => "Password da partilha remota",
-"Cancel" => "Cancelar",
-"Add remote share" => "Adicionar partilha remota",
-"No ownCloud installation found at {remote}" => "Não foi encontrada uma instalação em {remote}",
-"Invalid ownCloud url" => "Endereço errado",
-"Shared by" => "Partilhado por",
-"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",
-"Name" => "Nome",
-"Share time" => "Hora da Partilha",
-"Sorry, this link doesn’t seem to work anymore." => "Desculpe, mas esta hiperligação parece já não estar a funcionar.",
-"Reasons might be:" => "As razões poderão ser:",
-"the item was removed" => "o item foi removido",
-"the link expired" => "A hiperligação expirou",
-"sharing is disabled" => "a partilha está desativada",
-"For more info, please ask the person who sent this link." => "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.",
-"Add to your ownCloud" => "Adicionar á sua ownCloud",
-"Download" => "Transferir",
-"Download %s" => "Transferir %s",
-"Direct link" => "Hiperligação direta",
-"Remote Shares" => "Partilhas Remotas",
-"Allow other instances to mount public links shared from this server" => "Permitir que outras instâncias mapeiem endereços partilhados deste servidor",
-"Allow users to mount public link shares" => "Permitir mapeamentos de endereços partilhados aos utilizadores"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js
new file mode 100644
index 00000000000..37780d3ec23
--- /dev/null
+++ b/apps/files_sharing/l10n/ro.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Partajare server-server nu este activată pe acest server",
+    "Shared with you" : "Partajat cu tine",
+    "Shared with others" : "Partajat cu alții",
+    "No files have been shared with you yet." : "Nu sunt încă fișiere partajate cu tine.",
+    "You haven't shared any files yet." : "Nu ai partajat încă nici un fișier.",
+    "Cancel" : "Anulare",
+    "Shared by" : "impartite in ",
+    "This share is password-protected" : "Această partajare este protejată cu parolă",
+    "The password is wrong. Try again." : "Parola este incorectă. Încercaţi din nou.",
+    "Password" : "Parolă",
+    "Name" : "Nume",
+    "Reasons might be:" : "Motive posibile ar fi:",
+    "sharing is disabled" : "Partajare este oprită",
+    "Add to your ownCloud" : "Adaugă propriul tău ownCloud",
+    "Download" : "Descarcă",
+    "Download %s" : "Descarcă %s",
+    "Remote Shares" : "Partajări de la distanță"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json
new file mode 100644
index 00000000000..04936017e6e
--- /dev/null
+++ b/apps/files_sharing/l10n/ro.json
@@ -0,0 +1,20 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Partajare server-server nu este activată pe acest server",
+    "Shared with you" : "Partajat cu tine",
+    "Shared with others" : "Partajat cu alții",
+    "No files have been shared with you yet." : "Nu sunt încă fișiere partajate cu tine.",
+    "You haven't shared any files yet." : "Nu ai partajat încă nici un fișier.",
+    "Cancel" : "Anulare",
+    "Shared by" : "impartite in ",
+    "This share is password-protected" : "Această partajare este protejată cu parolă",
+    "The password is wrong. Try again." : "Parola este incorectă. Încercaţi din nou.",
+    "Password" : "Parolă",
+    "Name" : "Nume",
+    "Reasons might be:" : "Motive posibile ar fi:",
+    "sharing is disabled" : "Partajare este oprită",
+    "Add to your ownCloud" : "Adaugă propriul tău ownCloud",
+    "Download" : "Descarcă",
+    "Download %s" : "Descarcă %s",
+    "Remote Shares" : "Partajări de la distanță"
+},"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_sharing/l10n/ro.php b/apps/files_sharing/l10n/ro.php
deleted file mode 100644
index 423f0ee38a0..00000000000
--- a/apps/files_sharing/l10n/ro.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Partajare server-server nu este activată pe acest server",
-"Shared with you" => "Partajat cu tine",
-"Shared with others" => "Partajat cu alții",
-"No files have been shared with you yet." => "Nu sunt încă fișiere partajate cu tine.",
-"You haven't shared any files yet." => "Nu ai partajat încă nici un fișier.",
-"Cancel" => "Anulare",
-"Shared by" => "impartite in ",
-"This share is password-protected" => "Această partajare este protejată cu parolă",
-"The password is wrong. Try again." => "Parola este incorectă. Încercaţi din nou.",
-"Password" => "Parolă",
-"Name" => "Nume",
-"Reasons might be:" => "Motive posibile ar fi:",
-"sharing is disabled" => "Partajare este oprită",
-"Add to your ownCloud" => "Adaugă propriul tău ownCloud",
-"Download" => "Descarcă",
-"Download %s" => "Descarcă %s",
-"Remote Shares" => "Partajări de la distanță"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
new file mode 100644
index 00000000000..eb788b1c36f
--- /dev/null
+++ b/apps/files_sharing/l10n/ru.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общих папок",
+    "The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.",
+    "Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL",
+    "Couldn't add remote share" : "Невозможно добавить удалённую общую папку",
+    "Shared with you" : "Доступные для Вас",
+    "Shared with others" : "Доступные для других",
+    "Shared by link" : "Доступные по ссылке",
+    "No files have been shared with you yet." : "Отсутствуют доступные для вас файлы.",
+    "You haven't shared any files yet." : "У вас нет общедоступных файлов",
+    "You haven't shared any files by link yet." : "Вы ещё не открыли доступ по ссылке ни к одному файлу.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Добавить удалённую общую папку {name} из {owner}@{remote}?",
+    "Remote share" : "Удалённая общая папка",
+    "Remote share password" : "Пароль для удалённой общей папки",
+    "Cancel" : "Отменить",
+    "Add remote share" : "Добавить удалённую общую папку",
+    "No ownCloud installation found at {remote}" : "Не найдено ownCloud на {remote}",
+    "Invalid ownCloud url" : "Неверный адрес ownCloud",
+    "Shared by" : "Опубликовано",
+    "This share is password-protected" : "Для доступа к информации необходимо ввести пароль",
+    "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.",
+    "Password" : "Пароль",
+    "Name" : "Имя",
+    "Share time" : "Дата публикации",
+    "Sorry, this link doesn’t seem to work anymore." : "Эта ссылка устарела и более не действительна.",
+    "Reasons might be:" : "Причиной может быть:",
+    "the item was removed" : "объект был удалён",
+    "the link expired" : "срок действия ссылки истёк",
+    "sharing is disabled" : "общий доступ отключён",
+    "For more info, please ask the person who sent this link." : "Для получения дополнительной информации, пожалуйста, свяжитесь с тем, кто отправил Вам эту ссылку.",
+    "Add to your ownCloud" : "Добавить в свой ownCloud",
+    "Download" : "Скачать",
+    "Download %s" : "Скачать %s",
+    "Direct link" : "Прямая ссылка",
+    "Remote Shares" : "Удалённые общие папки",
+    "Allow other instances to mount public links shared from this server" : "Разрешить другим экземплярам Owncloud монтировать ссылки, опубликованные на этом сервере",
+    "Allow users to mount public link shares" : "Разрешить пользователям монтировать ссылки на общие папки"
+},
+"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/ru.json b/apps/files_sharing/l10n/ru.json
new file mode 100644
index 00000000000..a31468bf36f
--- /dev/null
+++ b/apps/files_sharing/l10n/ru.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "На данном сервере выключено межсерверное предоставление общих папок",
+    "The mountpoint name contains invalid characters." : "Имя точки монтирования содержит недопустимые символы.",
+    "Invalid or untrusted SSL certificate" : "Недействительный или недоверенный сертификат SSL",
+    "Couldn't add remote share" : "Невозможно добавить удалённую общую папку",
+    "Shared with you" : "Доступные для Вас",
+    "Shared with others" : "Доступные для других",
+    "Shared by link" : "Доступные по ссылке",
+    "No files have been shared with you yet." : "Отсутствуют доступные для вас файлы.",
+    "You haven't shared any files yet." : "У вас нет общедоступных файлов",
+    "You haven't shared any files by link yet." : "Вы ещё не открыли доступ по ссылке ни к одному файлу.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Добавить удалённую общую папку {name} из {owner}@{remote}?",
+    "Remote share" : "Удалённая общая папка",
+    "Remote share password" : "Пароль для удалённой общей папки",
+    "Cancel" : "Отменить",
+    "Add remote share" : "Добавить удалённую общую папку",
+    "No ownCloud installation found at {remote}" : "Не найдено ownCloud на {remote}",
+    "Invalid ownCloud url" : "Неверный адрес ownCloud",
+    "Shared by" : "Опубликовано",
+    "This share is password-protected" : "Для доступа к информации необходимо ввести пароль",
+    "The password is wrong. Try again." : "Неверный пароль. Попробуйте еще раз.",
+    "Password" : "Пароль",
+    "Name" : "Имя",
+    "Share time" : "Дата публикации",
+    "Sorry, this link doesn’t seem to work anymore." : "Эта ссылка устарела и более не действительна.",
+    "Reasons might be:" : "Причиной может быть:",
+    "the item was removed" : "объект был удалён",
+    "the link expired" : "срок действия ссылки истёк",
+    "sharing is disabled" : "общий доступ отключён",
+    "For more info, please ask the person who sent this link." : "Для получения дополнительной информации, пожалуйста, свяжитесь с тем, кто отправил Вам эту ссылку.",
+    "Add to your ownCloud" : "Добавить в свой ownCloud",
+    "Download" : "Скачать",
+    "Download %s" : "Скачать %s",
+    "Direct link" : "Прямая ссылка",
+    "Remote Shares" : "Удалённые общие папки",
+    "Allow other instances to mount public links shared from this server" : "Разрешить другим экземплярам Owncloud монтировать ссылки, опубликованные на этом сервере",
+    "Allow users to mount public link shares" : "Разрешить пользователям монтировать ссылки на общие папки"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
deleted file mode 100644
index 6d08aff040f..00000000000
--- a/apps/files_sharing/l10n/ru.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "На данном сервере выключено межсерверное предоставление общих папок",
-"The mountpoint name contains invalid characters." => "Имя точки монтирования содержит недопустимые символы.",
-"Invalid or untrusted SSL certificate" => "Недействительный или недоверенный сертификат SSL",
-"Couldn't add remote share" => "Невозможно добавить удалённую общую папку",
-"Shared with you" => "Доступные для Вас",
-"Shared with others" => "Доступные для других",
-"Shared by link" => "Доступные по ссылке",
-"No files have been shared with you yet." => "Отсутствуют доступные для вас файлы.",
-"You haven't shared any files yet." => "У вас нет общедоступных файлов",
-"You haven't shared any files by link yet." => "Вы ещё не открыли доступ по ссылке ни к одному файлу.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Добавить удалённую общую папку {name} из {owner}@{remote}?",
-"Remote share" => "Удалённая общая папка",
-"Remote share password" => "Пароль для удалённой общей папки",
-"Cancel" => "Отменить",
-"Add remote share" => "Добавить удалённую общую папку",
-"No ownCloud installation found at {remote}" => "Не найдено ownCloud на {remote}",
-"Invalid ownCloud url" => "Неверный адрес ownCloud",
-"Shared by" => "Опубликовано",
-"This share is password-protected" => "Для доступа к информации необходимо ввести пароль",
-"The password is wrong. Try again." => "Неверный пароль. Попробуйте еще раз.",
-"Password" => "Пароль",
-"Name" => "Имя",
-"Share time" => "Дата публикации",
-"Sorry, this link doesn’t seem to work anymore." => "Эта ссылка устарела и более не действительна.",
-"Reasons might be:" => "Причиной может быть:",
-"the item was removed" => "объект был удалён",
-"the link expired" => "срок действия ссылки истёк",
-"sharing is disabled" => "общий доступ отключён",
-"For more info, please ask the person who sent this link." => "Для получения дополнительной информации, пожалуйста, свяжитесь с тем, кто отправил Вам эту ссылку.",
-"Add to your ownCloud" => "Добавить в свой ownCloud",
-"Download" => "Скачать",
-"Download %s" => "Скачать %s",
-"Direct link" => "Прямая ссылка",
-"Remote Shares" => "Удалённые общие папки",
-"Allow other instances to mount public links shared from this server" => "Разрешить другим экземплярам Owncloud монтировать ссылки, опубликованные на этом сервере",
-"Allow users to mount public link shares" => "Разрешить пользователям монтировать ссылки на общие папки"
-);
-$PLURAL_FORMS = "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/si_LK.js b/apps/files_sharing/l10n/si_LK.js
new file mode 100644
index 00000000000..f55e8fc6d50
--- /dev/null
+++ b/apps/files_sharing/l10n/si_LK.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "එපා",
+    "Password" : "මුර පදය",
+    "Name" : "නම",
+    "Download" : "බාන්න"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/si_LK.json b/apps/files_sharing/l10n/si_LK.json
new file mode 100644
index 00000000000..528b13cd6e4
--- /dev/null
+++ b/apps/files_sharing/l10n/si_LK.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Cancel" : "එපා",
+    "Password" : "මුර පදය",
+    "Name" : "නම",
+    "Download" : "බාන්න"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
deleted file mode 100644
index f3919e97b11..00000000000
--- a/apps/files_sharing/l10n/si_LK.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "එපා",
-"Password" => "මුර පදය",
-"Name" => "නම",
-"Download" => "බාන්න"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
new file mode 100644
index 00000000000..42d7259df4f
--- /dev/null
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Zdieľanie server-server nie je na tomto serveri povolené",
+    "Invalid or untrusted SSL certificate" : "Neplatný alebo nedôveryhodný certifikát SSL",
+    "Couldn't add remote share" : "Nemožno pridať vzdialené zdieľanie",
+    "Shared with you" : "Zdieľané s vami",
+    "Shared with others" : "Zdieľané s ostanými",
+    "Shared by link" : "Zdieľané pomocou odkazu",
+    "No files have been shared with you yet." : "Zatiaľ s vami nikto žiadne súbory nezdieľal.",
+    "You haven't shared any files yet." : "Zatiaľ ste nezdieľali žiadne súbory.",
+    "You haven't shared any files by link yet." : "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcete pridať vzdialené úložisko {name} patriace používateľovi {owner}@{remote}?",
+    "Remote share" : "Vzdialené úložisko",
+    "Remote share password" : "Heslo k vzdialenému úložisku",
+    "Cancel" : "Zrušiť",
+    "Add remote share" : "Pridať vzdialené úložisko",
+    "No ownCloud installation found at {remote}" : "Žiadna ownCloud inštancia na {remote}",
+    "Invalid ownCloud url" : "Chybná ownCloud url",
+    "Shared by" : "Zdieľa",
+    "This share is password-protected" : "Toto zdieľanie je chránené heslom",
+    "The password is wrong. Try again." : "Heslo je chybné. Skúste to znova.",
+    "Password" : "Heslo",
+    "Name" : "Názov",
+    "Share time" : "Čas zdieľania",
+    "Sorry, this link doesn’t seem to work anymore." : "To je nepríjemné, ale tento odkaz už nie je funkčný.",
+    "Reasons might be:" : "Možné dôvody:",
+    "the item was removed" : "položka bola presunutá",
+    "the link expired" : "linke vypršala platnosť",
+    "sharing is disabled" : "zdieľanie je zakázané",
+    "For more info, please ask the person who sent this link." : "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.",
+    "Add to your ownCloud" : "Pridať do svojho ownCloudu",
+    "Download" : "Sťahovanie",
+    "Download %s" : "Stiahnuť %s",
+    "Direct link" : "Priama linka",
+    "Remote Shares" : "Vzdialené úložiská",
+    "Allow other instances to mount public links shared from this server" : "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera",
+    "Allow users to mount public link shares" : "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
new file mode 100644
index 00000000000..03853efa980
--- /dev/null
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Zdieľanie server-server nie je na tomto serveri povolené",
+    "Invalid or untrusted SSL certificate" : "Neplatný alebo nedôveryhodný certifikát SSL",
+    "Couldn't add remote share" : "Nemožno pridať vzdialené zdieľanie",
+    "Shared with you" : "Zdieľané s vami",
+    "Shared with others" : "Zdieľané s ostanými",
+    "Shared by link" : "Zdieľané pomocou odkazu",
+    "No files have been shared with you yet." : "Zatiaľ s vami nikto žiadne súbory nezdieľal.",
+    "You haven't shared any files yet." : "Zatiaľ ste nezdieľali žiadne súbory.",
+    "You haven't shared any files by link yet." : "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Chcete pridať vzdialené úložisko {name} patriace používateľovi {owner}@{remote}?",
+    "Remote share" : "Vzdialené úložisko",
+    "Remote share password" : "Heslo k vzdialenému úložisku",
+    "Cancel" : "Zrušiť",
+    "Add remote share" : "Pridať vzdialené úložisko",
+    "No ownCloud installation found at {remote}" : "Žiadna ownCloud inštancia na {remote}",
+    "Invalid ownCloud url" : "Chybná ownCloud url",
+    "Shared by" : "Zdieľa",
+    "This share is password-protected" : "Toto zdieľanie je chránené heslom",
+    "The password is wrong. Try again." : "Heslo je chybné. Skúste to znova.",
+    "Password" : "Heslo",
+    "Name" : "Názov",
+    "Share time" : "Čas zdieľania",
+    "Sorry, this link doesn’t seem to work anymore." : "To je nepríjemné, ale tento odkaz už nie je funkčný.",
+    "Reasons might be:" : "Možné dôvody:",
+    "the item was removed" : "položka bola presunutá",
+    "the link expired" : "linke vypršala platnosť",
+    "sharing is disabled" : "zdieľanie je zakázané",
+    "For more info, please ask the person who sent this link." : "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.",
+    "Add to your ownCloud" : "Pridať do svojho ownCloudu",
+    "Download" : "Sťahovanie",
+    "Download %s" : "Stiahnuť %s",
+    "Direct link" : "Priama linka",
+    "Remote Shares" : "Vzdialené úložiská",
+    "Allow other instances to mount public links shared from this server" : "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera",
+    "Allow users to mount public link shares" : "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
deleted file mode 100644
index f3231cb1021..00000000000
--- a/apps/files_sharing/l10n/sk_SK.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Zdieľanie server-server nie je na tomto serveri povolené",
-"Invalid or untrusted SSL certificate" => "Neplatný alebo nedôveryhodný certifikát SSL",
-"Couldn't add remote share" => "Nemožno pridať vzdialené zdieľanie",
-"Shared with you" => "Zdieľané s vami",
-"Shared with others" => "Zdieľané s ostanými",
-"Shared by link" => "Zdieľané pomocou odkazu",
-"No files have been shared with you yet." => "Zatiaľ s vami nikto žiadne súbory nezdieľal.",
-"You haven't shared any files yet." => "Zatiaľ ste nezdieľali žiadne súbory.",
-"You haven't shared any files by link yet." => "Zatiaľ ste pomocou odkazu nezdieľali žiaden súbor.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Chcete pridať vzdialené úložisko {name} patriace používateľovi {owner}@{remote}?",
-"Remote share" => "Vzdialené úložisko",
-"Remote share password" => "Heslo k vzdialenému úložisku",
-"Cancel" => "Zrušiť",
-"Add remote share" => "Pridať vzdialené úložisko",
-"No ownCloud installation found at {remote}" => "Žiadna ownCloud inštancia na {remote}",
-"Invalid ownCloud url" => "Chybná ownCloud url",
-"Shared by" => "Zdieľa",
-"This share is password-protected" => "Toto zdieľanie je chránené heslom",
-"The password is wrong. Try again." => "Heslo je chybné. Skúste to znova.",
-"Password" => "Heslo",
-"Name" => "Názov",
-"Share time" => "Čas zdieľania",
-"Sorry, this link doesn’t seem to work anymore." => "To je nepríjemné, ale tento odkaz už nie je funkčný.",
-"Reasons might be:" => "Možné dôvody:",
-"the item was removed" => "položka bola presunutá",
-"the link expired" => "linke vypršala platnosť",
-"sharing is disabled" => "zdieľanie je zakázané",
-"For more info, please ask the person who sent this link." => "Pre viac informácií kontaktujte osobu, ktorá vám poslala tento odkaz.",
-"Add to your ownCloud" => "Pridať do svojho ownCloudu",
-"Download" => "Sťahovanie",
-"Download %s" => "Stiahnuť %s",
-"Direct link" => "Priama linka",
-"Remote Shares" => "Vzdialené úložiská",
-"Allow other instances to mount public links shared from this server" => "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera",
-"Allow users to mount public link shares" => "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js
new file mode 100644
index 00000000000..9466ea37f89
--- /dev/null
+++ b/apps/files_sharing/l10n/sl.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Na tem strežniku ni omogočena možnost souporabe strežnika s strežnikom.",
+    "The mountpoint name contains invalid characters." : "Ime točke priklopa vsebuje neveljavne znake.",
+    "Invalid or untrusted SSL certificate" : "Neveljavno oziroma nepotrjeno potrdilo SSL",
+    "Couldn't add remote share" : "Ni mogoče dodati oddaljenega mesta za souporabo",
+    "Shared with you" : "V souporabi z vami",
+    "Shared with others" : "V souporabi  z drugimi",
+    "Shared by link" : "Souporaba s povezavo",
+    "No files have been shared with you yet." : "Ni datotek, ki bi jih drugi omogočili za souporabo z vami.",
+    "You haven't shared any files yet." : "Ni datotek, ki bi jih omogočili za souporabo.",
+    "You haven't shared any files by link yet." : "Ni datotek, ki bi jih omogočili za souporabo s povezavo.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Ali želite dodati oddaljeno mesto souporabe {name} na {owner}@{remote}?",
+    "Remote share" : "Oddaljeno mesto za souporabo",
+    "Remote share password" : "Geslo za mesto za oddaljeno souporabo",
+    "Cancel" : "Prekliči",
+    "Add remote share" : "Dodaj oddaljeno mesto za souporabo",
+    "No ownCloud installation found at {remote}" : "Na mestu {remote} ni namestitve ownCloud",
+    "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud",
+    "Shared by" : "V souporabi z",
+    "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",
+    "Name" : "Ime",
+    "Share time" : "Čas souporabe",
+    "Sorry, this link doesn’t seem to work anymore." : "Povezava očitno ni več v uporabi.",
+    "Reasons might be:" : "Vzrok je lahko:",
+    "the item was removed" : "predmet je odstranjen,",
+    "the link expired" : "povezava je pretekla,",
+    "sharing is disabled" : "souporaba je onemogočena.",
+    "For more info, please ask the person who sent this link." : "Za več podrobnosti stopite v stik s pošiljateljem te povezave.",
+    "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud",
+    "Download" : "Prejmi",
+    "Download %s" : "Prejmi %s",
+    "Direct link" : "Neposredna povezava",
+    "Remote Shares" : "Oddaljena souporaba",
+    "Allow other instances to mount public links shared from this server" : "Dovoli drugim primerkom priklop javnih povezav s tega strežnika",
+    "Allow users to mount public link shares" : "Dovoli uporabnikom priklop javnih povezav med mapami za souporabo"
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json
new file mode 100644
index 00000000000..2619904b50a
--- /dev/null
+++ b/apps/files_sharing/l10n/sl.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Na tem strežniku ni omogočena možnost souporabe strežnika s strežnikom.",
+    "The mountpoint name contains invalid characters." : "Ime točke priklopa vsebuje neveljavne znake.",
+    "Invalid or untrusted SSL certificate" : "Neveljavno oziroma nepotrjeno potrdilo SSL",
+    "Couldn't add remote share" : "Ni mogoče dodati oddaljenega mesta za souporabo",
+    "Shared with you" : "V souporabi z vami",
+    "Shared with others" : "V souporabi  z drugimi",
+    "Shared by link" : "Souporaba s povezavo",
+    "No files have been shared with you yet." : "Ni datotek, ki bi jih drugi omogočili za souporabo z vami.",
+    "You haven't shared any files yet." : "Ni datotek, ki bi jih omogočili za souporabo.",
+    "You haven't shared any files by link yet." : "Ni datotek, ki bi jih omogočili za souporabo s povezavo.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Ali želite dodati oddaljeno mesto souporabe {name} na {owner}@{remote}?",
+    "Remote share" : "Oddaljeno mesto za souporabo",
+    "Remote share password" : "Geslo za mesto za oddaljeno souporabo",
+    "Cancel" : "Prekliči",
+    "Add remote share" : "Dodaj oddaljeno mesto za souporabo",
+    "No ownCloud installation found at {remote}" : "Na mestu {remote} ni namestitve ownCloud",
+    "Invalid ownCloud url" : "Naveden je neveljaven naslov URL strežnika ownCloud",
+    "Shared by" : "V souporabi z",
+    "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",
+    "Name" : "Ime",
+    "Share time" : "Čas souporabe",
+    "Sorry, this link doesn’t seem to work anymore." : "Povezava očitno ni več v uporabi.",
+    "Reasons might be:" : "Vzrok je lahko:",
+    "the item was removed" : "predmet je odstranjen,",
+    "the link expired" : "povezava je pretekla,",
+    "sharing is disabled" : "souporaba je onemogočena.",
+    "For more info, please ask the person who sent this link." : "Za več podrobnosti stopite v stik s pošiljateljem te povezave.",
+    "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud",
+    "Download" : "Prejmi",
+    "Download %s" : "Prejmi %s",
+    "Direct link" : "Neposredna povezava",
+    "Remote Shares" : "Oddaljena souporaba",
+    "Allow other instances to mount public links shared from this server" : "Dovoli drugim primerkom priklop javnih povezav s tega strežnika",
+    "Allow users to mount public link shares" : "Dovoli uporabnikom priklop javnih povezav med mapami za souporabo"
+},"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_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
deleted file mode 100644
index a7aea4d49d6..00000000000
--- a/apps/files_sharing/l10n/sl.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Na tem strežniku ni omogočena možnost souporabe strežnika s strežnikom.",
-"The mountpoint name contains invalid characters." => "Ime točke priklopa vsebuje neveljavne znake.",
-"Invalid or untrusted SSL certificate" => "Neveljavno oziroma nepotrjeno potrdilo SSL",
-"Couldn't add remote share" => "Ni mogoče dodati oddaljenega mesta za souporabo",
-"Shared with you" => "V souporabi z vami",
-"Shared with others" => "V souporabi  z drugimi",
-"Shared by link" => "Souporaba s povezavo",
-"No files have been shared with you yet." => "Ni datotek, ki bi jih drugi omogočili za souporabo z vami.",
-"You haven't shared any files yet." => "Ni datotek, ki bi jih omogočili za souporabo.",
-"You haven't shared any files by link yet." => "Ni datotek, ki bi jih omogočili za souporabo s povezavo.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Ali želite dodati oddaljeno mesto souporabe {name} na {owner}@{remote}?",
-"Remote share" => "Oddaljeno mesto za souporabo",
-"Remote share password" => "Geslo za mesto za oddaljeno souporabo",
-"Cancel" => "Prekliči",
-"Add remote share" => "Dodaj oddaljeno mesto za souporabo",
-"No ownCloud installation found at {remote}" => "Na mestu {remote} ni namestitve ownCloud",
-"Invalid ownCloud url" => "Naveden je neveljaven naslov URL strežnika ownCloud",
-"Shared by" => "V souporabi z",
-"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",
-"Name" => "Ime",
-"Share time" => "Čas souporabe",
-"Sorry, this link doesn’t seem to work anymore." => "Povezava očitno ni več v uporabi.",
-"Reasons might be:" => "Vzrok je lahko:",
-"the item was removed" => "predmet je odstranjen,",
-"the link expired" => "povezava je pretekla,",
-"sharing is disabled" => "souporaba je onemogočena.",
-"For more info, please ask the person who sent this link." => "Za več podrobnosti stopite v stik s pošiljateljem te povezave.",
-"Add to your ownCloud" => "Dodaj v svoj oblak ownCloud",
-"Download" => "Prejmi",
-"Download %s" => "Prejmi %s",
-"Direct link" => "Neposredna povezava",
-"Remote Shares" => "Oddaljena souporaba",
-"Allow other instances to mount public links shared from this server" => "Dovoli drugim primerkom priklop javnih povezav s tega strežnika",
-"Allow users to mount public link shares" => "Dovoli uporabnikom priklop javnih povezav med mapami za souporabo"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_sharing/l10n/sq.js b/apps/files_sharing/l10n/sq.js
new file mode 100644
index 00000000000..5f11b75039f
--- /dev/null
+++ b/apps/files_sharing/l10n/sq.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Anullo",
+    "Shared by" : "Ndarë nga",
+    "This share is password-protected" : "Kjo pjesë është e mbrojtur me fjalëkalim",
+    "The password is wrong. Try again." : "Kodi është i gabuar. Provojeni përsëri.",
+    "Password" : "Kodi",
+    "Name" : "Emri",
+    "Sorry, this link doesn’t seem to work anymore." : "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më.",
+    "Reasons might be:" : "Arsyet mund të jenë:",
+    "the item was removed" : "elementi është eliminuar",
+    "the link expired" : "lidhja ka skaduar",
+    "sharing is disabled" : "ndarja është çaktivizuar",
+    "For more info, please ask the person who sent this link." : "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.",
+    "Download" : "Shkarko",
+    "Direct link" : "Lidhje direkte"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/sq.json b/apps/files_sharing/l10n/sq.json
new file mode 100644
index 00000000000..491c0bfc7a9
--- /dev/null
+++ b/apps/files_sharing/l10n/sq.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Cancel" : "Anullo",
+    "Shared by" : "Ndarë nga",
+    "This share is password-protected" : "Kjo pjesë është e mbrojtur me fjalëkalim",
+    "The password is wrong. Try again." : "Kodi është i gabuar. Provojeni përsëri.",
+    "Password" : "Kodi",
+    "Name" : "Emri",
+    "Sorry, this link doesn’t seem to work anymore." : "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më.",
+    "Reasons might be:" : "Arsyet mund të jenë:",
+    "the item was removed" : "elementi është eliminuar",
+    "the link expired" : "lidhja ka skaduar",
+    "sharing is disabled" : "ndarja është çaktivizuar",
+    "For more info, please ask the person who sent this link." : "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.",
+    "Download" : "Shkarko",
+    "Direct link" : "Lidhje direkte"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sq.php b/apps/files_sharing/l10n/sq.php
deleted file mode 100644
index 56b3816da32..00000000000
--- a/apps/files_sharing/l10n/sq.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Anullo",
-"Shared by" => "Ndarë nga",
-"This share is password-protected" => "Kjo pjesë është e mbrojtur me fjalëkalim",
-"The password is wrong. Try again." => "Kodi është i gabuar. Provojeni përsëri.",
-"Password" => "Kodi",
-"Name" => "Emri",
-"Sorry, this link doesn’t seem to work anymore." => "Ju kërkojmë ndjesë, kjo lidhje duket sikur nuk punon më.",
-"Reasons might be:" => "Arsyet mund të jenë:",
-"the item was removed" => "elementi është eliminuar",
-"the link expired" => "lidhja ka skaduar",
-"sharing is disabled" => "ndarja është çaktivizuar",
-"For more info, please ask the person who sent this link." => "Për më shumë informacione, ju lutem pyesni personin që iu dërgoi këtë lidhje.",
-"Download" => "Shkarko",
-"Direct link" => "Lidhje direkte"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/sr.js b/apps/files_sharing/l10n/sr.js
new file mode 100644
index 00000000000..6e8100375f1
--- /dev/null
+++ b/apps/files_sharing/l10n/sr.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Откажи",
+    "Shared by" : "Делио",
+    "Password" : "Лозинка",
+    "Name" : "Име",
+    "Download" : "Преузми"
+},
+"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/sr.json b/apps/files_sharing/l10n/sr.json
new file mode 100644
index 00000000000..53642f3f349
--- /dev/null
+++ b/apps/files_sharing/l10n/sr.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "Откажи",
+    "Shared by" : "Делио",
+    "Password" : "Лозинка",
+    "Name" : "Име",
+    "Download" : "Преузми"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sr.php b/apps/files_sharing/l10n/sr.php
deleted file mode 100644
index 2f5a996bba5..00000000000
--- a/apps/files_sharing/l10n/sr.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Откажи",
-"Shared by" => "Делио",
-"Password" => "Лозинка",
-"Name" => "Име",
-"Download" => "Преузми"
-);
-$PLURAL_FORMS = "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/sr@latin.js b/apps/files_sharing/l10n/sr@latin.js
new file mode 100644
index 00000000000..6e13a919b1b
--- /dev/null
+++ b/apps/files_sharing/l10n/sr@latin.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Otkaži",
+    "Password" : "Lozinka",
+    "Name" : "Ime",
+    "Download" : "Preuzmi"
+},
+"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/sr@latin.json b/apps/files_sharing/l10n/sr@latin.json
new file mode 100644
index 00000000000..9aebf35fc82
--- /dev/null
+++ b/apps/files_sharing/l10n/sr@latin.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Cancel" : "Otkaži",
+    "Password" : "Lozinka",
+    "Name" : "Ime",
+    "Download" : "Preuzmi"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sr@latin.php b/apps/files_sharing/l10n/sr@latin.php
deleted file mode 100644
index 168005c1e39..00000000000
--- a/apps/files_sharing/l10n/sr@latin.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Otkaži",
-"Password" => "Lozinka",
-"Name" => "Ime",
-"Download" => "Preuzmi"
-);
-$PLURAL_FORMS = "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/sv.js b/apps/files_sharing/l10n/sv.js
new file mode 100644
index 00000000000..f9e595f3406
--- /dev/null
+++ b/apps/files_sharing/l10n/sv.js
@@ -0,0 +1,35 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Server-till-server-delning är inte aktiverat på denna server",
+    "Couldn't add remote share" : "Kunde inte lägga till fjärrutdelning",
+    "Shared with you" : "Delat med dig",
+    "Shared with others" : "Delat med andra",
+    "Shared by link" : "Delad som länk",
+    "No files have been shared with you yet." : "Inga filer har ännu delats med dig.",
+    "You haven't shared any files yet." : "Du har inte delat några filer ännu.",
+    "You haven't shared any files by link yet." : "Du har inte delat några filer som länk ännu.",
+    "Cancel" : "Avbryt",
+    "No ownCloud installation found at {remote}" : "Ingen ownCloudinstallation funnen på {remote}",
+    "Invalid ownCloud url" : "Felaktig ownCloud url",
+    "Shared by" : "Delad av",
+    "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",
+    "Name" : "Namn",
+    "Share time" : "Delningstid",
+    "Sorry, this link doesn’t seem to work anymore." : "Tyvärr, denna länk verkar inte fungera längre.",
+    "Reasons might be:" : "Orsaker kan vara:",
+    "the item was removed" : "objektet togs bort",
+    "the link expired" : "giltighet för länken har gått ut",
+    "sharing is disabled" : "delning är inaktiverat",
+    "For more info, please ask the person who sent this link." : "För mer information, kontakta den person som skickade den här länken.",
+    "Add to your ownCloud" : "Lägg till i din ownCloud",
+    "Download" : "Ladda ner",
+    "Download %s" : "Ladda ner %s",
+    "Direct link" : "Direkt länk",
+    "Remote Shares" : "Fjärrutdelningar Server-Server",
+    "Allow other instances to mount public links shared from this server" : "Tillåt andra instanser vidaredelning utav publika länkar delade från denna servern",
+    "Allow users to mount public link shares" : "Tillåt användare att montera publika länkar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json
new file mode 100644
index 00000000000..c0763d3f384
--- /dev/null
+++ b/apps/files_sharing/l10n/sv.json
@@ -0,0 +1,33 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Server-till-server-delning är inte aktiverat på denna server",
+    "Couldn't add remote share" : "Kunde inte lägga till fjärrutdelning",
+    "Shared with you" : "Delat med dig",
+    "Shared with others" : "Delat med andra",
+    "Shared by link" : "Delad som länk",
+    "No files have been shared with you yet." : "Inga filer har ännu delats med dig.",
+    "You haven't shared any files yet." : "Du har inte delat några filer ännu.",
+    "You haven't shared any files by link yet." : "Du har inte delat några filer som länk ännu.",
+    "Cancel" : "Avbryt",
+    "No ownCloud installation found at {remote}" : "Ingen ownCloudinstallation funnen på {remote}",
+    "Invalid ownCloud url" : "Felaktig ownCloud url",
+    "Shared by" : "Delad av",
+    "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",
+    "Name" : "Namn",
+    "Share time" : "Delningstid",
+    "Sorry, this link doesn’t seem to work anymore." : "Tyvärr, denna länk verkar inte fungera längre.",
+    "Reasons might be:" : "Orsaker kan vara:",
+    "the item was removed" : "objektet togs bort",
+    "the link expired" : "giltighet för länken har gått ut",
+    "sharing is disabled" : "delning är inaktiverat",
+    "For more info, please ask the person who sent this link." : "För mer information, kontakta den person som skickade den här länken.",
+    "Add to your ownCloud" : "Lägg till i din ownCloud",
+    "Download" : "Ladda ner",
+    "Download %s" : "Ladda ner %s",
+    "Direct link" : "Direkt länk",
+    "Remote Shares" : "Fjärrutdelningar Server-Server",
+    "Allow other instances to mount public links shared from this server" : "Tillåt andra instanser vidaredelning utav publika länkar delade från denna servern",
+    "Allow users to mount public link shares" : "Tillåt användare att montera publika länkar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
deleted file mode 100644
index 4bb1f207ba8..00000000000
--- a/apps/files_sharing/l10n/sv.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Server-till-server-delning är inte aktiverat på denna server",
-"Couldn't add remote share" => "Kunde inte lägga till fjärrutdelning",
-"Shared with you" => "Delat med dig",
-"Shared with others" => "Delat med andra",
-"Shared by link" => "Delad som länk",
-"No files have been shared with you yet." => "Inga filer har ännu delats med dig.",
-"You haven't shared any files yet." => "Du har inte delat några filer ännu.",
-"You haven't shared any files by link yet." => "Du har inte delat några filer som länk ännu.",
-"Cancel" => "Avbryt",
-"No ownCloud installation found at {remote}" => "Ingen ownCloudinstallation funnen på {remote}",
-"Invalid ownCloud url" => "Felaktig ownCloud url",
-"Shared by" => "Delad av",
-"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",
-"Name" => "Namn",
-"Share time" => "Delningstid",
-"Sorry, this link doesn’t seem to work anymore." => "Tyvärr, denna länk verkar inte fungera längre.",
-"Reasons might be:" => "Orsaker kan vara:",
-"the item was removed" => "objektet togs bort",
-"the link expired" => "giltighet för länken har gått ut",
-"sharing is disabled" => "delning är inaktiverat",
-"For more info, please ask the person who sent this link." => "För mer information, kontakta den person som skickade den här länken.",
-"Add to your ownCloud" => "Lägg till i din ownCloud",
-"Download" => "Ladda ner",
-"Download %s" => "Ladda ner %s",
-"Direct link" => "Direkt länk",
-"Remote Shares" => "Fjärrutdelningar Server-Server",
-"Allow other instances to mount public links shared from this server" => "Tillåt andra instanser vidaredelning utav publika länkar delade från denna servern",
-"Allow users to mount public link shares" => "Tillåt användare att montera publika länkar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/ta_LK.js b/apps/files_sharing/l10n/ta_LK.js
new file mode 100644
index 00000000000..846ed1b4f84
--- /dev/null
+++ b/apps/files_sharing/l10n/ta_LK.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "இரத்து செய்க",
+    "Password" : "கடவுச்சொல்",
+    "Name" : "பெயர்",
+    "Download" : "பதிவிறக்குக"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ta_LK.json b/apps/files_sharing/l10n/ta_LK.json
new file mode 100644
index 00000000000..8e722a93889
--- /dev/null
+++ b/apps/files_sharing/l10n/ta_LK.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Cancel" : "இரத்து செய்க",
+    "Password" : "கடவுச்சொல்",
+    "Name" : "பெயர்",
+    "Download" : "பதிவிறக்குக"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ta_LK.php b/apps/files_sharing/l10n/ta_LK.php
deleted file mode 100644
index 7303c07f7b3..00000000000
--- a/apps/files_sharing/l10n/ta_LK.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "இரத்து செய்க",
-"Password" => "கடவுச்சொல்",
-"Name" => "பெயர்",
-"Download" => "பதிவிறக்குக"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/te.js b/apps/files_sharing/l10n/te.js
new file mode 100644
index 00000000000..16f1ba1ee28
--- /dev/null
+++ b/apps/files_sharing/l10n/te.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "రద్దుచేయి",
+    "Password" : "సంకేతపదం",
+    "Name" : "పేరు"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/te.json b/apps/files_sharing/l10n/te.json
new file mode 100644
index 00000000000..1992a126415
--- /dev/null
+++ b/apps/files_sharing/l10n/te.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Cancel" : "రద్దుచేయి",
+    "Password" : "సంకేతపదం",
+    "Name" : "పేరు"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/te.php b/apps/files_sharing/l10n/te.php
deleted file mode 100644
index 249e121cdbf..00000000000
--- a/apps/files_sharing/l10n/te.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "రద్దుచేయి",
-"Password" => "సంకేతపదం",
-"Name" => "పేరు"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/th_TH.js b/apps/files_sharing/l10n/th_TH.js
new file mode 100644
index 00000000000..153f7e222c6
--- /dev/null
+++ b/apps/files_sharing/l10n/th_TH.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "ยกเลิก",
+    "Shared by" : "ถูกแชร์โดย",
+    "Password" : "รหัสผ่าน",
+    "Name" : "ชื่อ",
+    "Download" : "ดาวน์โหลด"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/th_TH.json b/apps/files_sharing/l10n/th_TH.json
new file mode 100644
index 00000000000..05757834e53
--- /dev/null
+++ b/apps/files_sharing/l10n/th_TH.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "ยกเลิก",
+    "Shared by" : "ถูกแชร์โดย",
+    "Password" : "รหัสผ่าน",
+    "Name" : "ชื่อ",
+    "Download" : "ดาวน์โหลด"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
deleted file mode 100644
index 1594037396f..00000000000
--- a/apps/files_sharing/l10n/th_TH.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "ยกเลิก",
-"Shared by" => "ถูกแชร์โดย",
-"Password" => "รหัสผ่าน",
-"Name" => "ชื่อ",
-"Download" => "ดาวน์โหลด"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
new file mode 100644
index 00000000000..919b615d239
--- /dev/null
+++ b/apps/files_sharing/l10n/tr.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "Sunucudan sunucuya paylaşım bu sunucuda etkin değil",
+    "The mountpoint name contains invalid characters." : "Bağlama noktası adı geçersiz karakterler içeriyor.",
+    "Invalid or untrusted SSL certificate" : "Geçersiz veya güvenilmeyen SSL sertifikası",
+    "Couldn't add remote share" : "Uzak paylaşım eklenemedi",
+    "Shared with you" : "Sizinle paylaşılmış",
+    "Shared with others" : "Diğerleri ile paylaşılmış",
+    "Shared by link" : "Bağlantı ile paylaşılmış",
+    "No files have been shared with you yet." : "Henüz sizinle paylaşılan bir dosya yok.",
+    "You haven't shared any files yet." : "Henüz hiçbir dosya paylaşmadınız.",
+    "You haven't shared any files by link yet." : "Bağlantı ile henüz hiçbir dosya paylaşmadınız.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "{owner}@{remote} konumundan {name} uzak paylaşımını eklemek istiyor musunuz?",
+    "Remote share" : "Uzak paylaşım",
+    "Remote share password" : "Uzak paylaşım parolası",
+    "Cancel" : "İptal",
+    "Add remote share" : "Uzak paylaşım ekle",
+    "No ownCloud installation found at {remote}" : "{remote} üzerinde ownCloud kurulumu bulunamadı",
+    "Invalid ownCloud url" : "Geçersiz ownCloud adresi",
+    "Shared by" : "Paylaşan",
+    "This share is password-protected" : "Bu paylaşım parola korumalı",
+    "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.",
+    "Password" : "Parola",
+    "Name" : "Ad",
+    "Share time" : "Paylaşma zamanı",
+    "Sorry, this link doesn’t seem to work anymore." : "Üzgünüz, bu bağlantı artık çalışıyor gibi görünmüyor.",
+    "Reasons might be:" : "Sebepleri şunlar olabilir:",
+    "the item was removed" : "öge kaldırılmış",
+    "the link expired" : "bağlantı süresi dolmuş",
+    "sharing is disabled" : "paylaşım devre dışı",
+    "For more info, please ask the person who sent this link." : "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin.",
+    "Add to your ownCloud" : "ownCloud'ınıza Ekleyin",
+    "Download" : "İndir",
+    "Download %s" : "İndir: %s",
+    "Direct link" : "Doğrudan bağlantı",
+    "Remote Shares" : "Uzak Paylaşımlar",
+    "Allow other instances to mount public links shared from this server" : "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver",
+    "Allow users to mount public link shares" : "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
new file mode 100644
index 00000000000..d7c4b7c7b7c
--- /dev/null
+++ b/apps/files_sharing/l10n/tr.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "Sunucudan sunucuya paylaşım bu sunucuda etkin değil",
+    "The mountpoint name contains invalid characters." : "Bağlama noktası adı geçersiz karakterler içeriyor.",
+    "Invalid or untrusted SSL certificate" : "Geçersiz veya güvenilmeyen SSL sertifikası",
+    "Couldn't add remote share" : "Uzak paylaşım eklenemedi",
+    "Shared with you" : "Sizinle paylaşılmış",
+    "Shared with others" : "Diğerleri ile paylaşılmış",
+    "Shared by link" : "Bağlantı ile paylaşılmış",
+    "No files have been shared with you yet." : "Henüz sizinle paylaşılan bir dosya yok.",
+    "You haven't shared any files yet." : "Henüz hiçbir dosya paylaşmadınız.",
+    "You haven't shared any files by link yet." : "Bağlantı ile henüz hiçbir dosya paylaşmadınız.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "{owner}@{remote} konumundan {name} uzak paylaşımını eklemek istiyor musunuz?",
+    "Remote share" : "Uzak paylaşım",
+    "Remote share password" : "Uzak paylaşım parolası",
+    "Cancel" : "İptal",
+    "Add remote share" : "Uzak paylaşım ekle",
+    "No ownCloud installation found at {remote}" : "{remote} üzerinde ownCloud kurulumu bulunamadı",
+    "Invalid ownCloud url" : "Geçersiz ownCloud adresi",
+    "Shared by" : "Paylaşan",
+    "This share is password-protected" : "Bu paylaşım parola korumalı",
+    "The password is wrong. Try again." : "Parola hatalı. Yeniden deneyin.",
+    "Password" : "Parola",
+    "Name" : "Ad",
+    "Share time" : "Paylaşma zamanı",
+    "Sorry, this link doesn’t seem to work anymore." : "Üzgünüz, bu bağlantı artık çalışıyor gibi görünmüyor.",
+    "Reasons might be:" : "Sebepleri şunlar olabilir:",
+    "the item was removed" : "öge kaldırılmış",
+    "the link expired" : "bağlantı süresi dolmuş",
+    "sharing is disabled" : "paylaşım devre dışı",
+    "For more info, please ask the person who sent this link." : "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin.",
+    "Add to your ownCloud" : "ownCloud'ınıza Ekleyin",
+    "Download" : "İndir",
+    "Download %s" : "İndir: %s",
+    "Direct link" : "Doğrudan bağlantı",
+    "Remote Shares" : "Uzak Paylaşımlar",
+    "Allow other instances to mount public links shared from this server" : "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver",
+    "Allow users to mount public link shares" : "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/tr.php b/apps/files_sharing/l10n/tr.php
deleted file mode 100644
index 018851657d4..00000000000
--- a/apps/files_sharing/l10n/tr.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "Sunucudan sunucuya paylaşım bu sunucuda etkin değil",
-"The mountpoint name contains invalid characters." => "Bağlama noktası adı geçersiz karakterler içeriyor.",
-"Invalid or untrusted SSL certificate" => "Geçersiz veya güvenilmeyen SSL sertifikası",
-"Couldn't add remote share" => "Uzak paylaşım eklenemedi",
-"Shared with you" => "Sizinle paylaşılmış",
-"Shared with others" => "Diğerleri ile paylaşılmış",
-"Shared by link" => "Bağlantı ile paylaşılmış",
-"No files have been shared with you yet." => "Henüz sizinle paylaşılan bir dosya yok.",
-"You haven't shared any files yet." => "Henüz hiçbir dosya paylaşmadınız.",
-"You haven't shared any files by link yet." => "Bağlantı ile henüz hiçbir dosya paylaşmadınız.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "{owner}@{remote} konumundan {name} uzak paylaşımını eklemek istiyor musunuz?",
-"Remote share" => "Uzak paylaşım",
-"Remote share password" => "Uzak paylaşım parolası",
-"Cancel" => "İptal",
-"Add remote share" => "Uzak paylaşım ekle",
-"No ownCloud installation found at {remote}" => "{remote} üzerinde ownCloud kurulumu bulunamadı",
-"Invalid ownCloud url" => "Geçersiz ownCloud adresi",
-"Shared by" => "Paylaşan",
-"This share is password-protected" => "Bu paylaşım parola korumalı",
-"The password is wrong. Try again." => "Parola hatalı. Yeniden deneyin.",
-"Password" => "Parola",
-"Name" => "Ad",
-"Share time" => "Paylaşma zamanı",
-"Sorry, this link doesn’t seem to work anymore." => "Üzgünüz, bu bağlantı artık çalışıyor gibi görünmüyor.",
-"Reasons might be:" => "Sebepleri şunlar olabilir:",
-"the item was removed" => "öge kaldırılmış",
-"the link expired" => "bağlantı süresi dolmuş",
-"sharing is disabled" => "paylaşım devre dışı",
-"For more info, please ask the person who sent this link." => "Daha fazla bilgi için bu bağlantıyı aldığınız kişi ile iletişime geçin.",
-"Add to your ownCloud" => "ownCloud'ınıza Ekleyin",
-"Download" => "İndir",
-"Download %s" => "İndir: %s",
-"Direct link" => "Doğrudan bağlantı",
-"Remote Shares" => "Uzak Paylaşımlar",
-"Allow other instances to mount public links shared from this server" => "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver",
-"Allow users to mount public link shares" => "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_sharing/l10n/ug.js b/apps/files_sharing/l10n/ug.js
new file mode 100644
index 00000000000..2e1fcc17441
--- /dev/null
+++ b/apps/files_sharing/l10n/ug.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "ۋاز كەچ",
+    "Shared by" : "ھەمبەھىرلىگۈچى",
+    "Password" : "ئىم",
+    "Name" : "ئاتى",
+    "Download" : "چۈشۈر"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/ug.json b/apps/files_sharing/l10n/ug.json
new file mode 100644
index 00000000000..da37c17a579
--- /dev/null
+++ b/apps/files_sharing/l10n/ug.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "ۋاز كەچ",
+    "Shared by" : "ھەمبەھىرلىگۈچى",
+    "Password" : "ئىم",
+    "Name" : "ئاتى",
+    "Download" : "چۈشۈر"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ug.php b/apps/files_sharing/l10n/ug.php
deleted file mode 100644
index f15cda0e497..00000000000
--- a/apps/files_sharing/l10n/ug.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "ۋاز كەچ",
-"Shared by" => "ھەمبەھىرلىگۈچى",
-"Password" => "ئىم",
-"Name" => "ئاتى",
-"Download" => "چۈشۈر"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js
new file mode 100644
index 00000000000..fd5dacb564e
--- /dev/null
+++ b/apps/files_sharing/l10n/uk.js
@@ -0,0 +1,41 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "На даному сервері вимкнута можливість передачі даних між серверами",
+    "The mountpoint name contains invalid characters." : "Ім'я точки монтування містить неприпустимі символи.",
+    "Invalid or untrusted SSL certificate" : "Недійсній або не довірений SSL-сертифікат",
+    "Couldn't add remote share" : "Неможливо додати віддалену загальну теку",
+    "Shared with you" : "Доступне для вас",
+    "Shared with others" : "Доступне для інших",
+    "Shared by link" : "Доступне за посиланням",
+    "No files have been shared with you yet." : "Доступні для вас файли відсутні.",
+    "You haven't shared any files yet." : "Ви не маєте загальнодоступних файлів.",
+    "You haven't shared any files by link yet." : "Ви ще не відкрили доступ за посиланням для жодного з файлів.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Додати віддалену загальну теку {name} з {owner}@{remote}?",
+    "Remote share" : "Віддалена загальна тека",
+    "Remote share password" : "Пароль для віддаленої загальної теки",
+    "Cancel" : "Відмінити",
+    "Add remote share" : "Додати віддалену загальну теку",
+    "No ownCloud installation found at {remote}" : "Не знайдено ownCloud на {remote}",
+    "Invalid ownCloud url" : "Невірний ownCloud URL",
+    "Shared by" : "Опубліковано",
+    "This share is password-protected" : "Цей ресурс обміну захищений паролем",
+    "The password is wrong. Try again." : "Невірний пароль. Спробуйте ще раз.",
+    "Password" : "Пароль",
+    "Name" : "Ім'я",
+    "Share time" : "Дата публікації",
+    "Sorry, this link doesn’t seem to work anymore." : "На жаль, посилання більше не працює.",
+    "Reasons might be:" : "Можливі причини:",
+    "the item was removed" : "цей пункт був вилучений",
+    "the link expired" : "посилання застаріло",
+    "sharing is disabled" : "обмін заборонений",
+    "For more info, please ask the person who sent this link." : "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.",
+    "Add to your ownCloud" : "Додати до вашого ownCloud",
+    "Download" : "Завантажити",
+    "Download %s" : "Завантажити %s",
+    "Direct link" : "Пряме посилання",
+    "Remote Shares" : "Віддалені загальні теки",
+    "Allow other instances to mount public links shared from this server" : "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері",
+    "Allow users to mount public link shares" : "Дозволити користувачам монтувати монтувати посилання на загальні теки"
+},
+"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
new file mode 100644
index 00000000000..5ec57cdad12
--- /dev/null
+++ b/apps/files_sharing/l10n/uk.json
@@ -0,0 +1,39 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "На даному сервері вимкнута можливість передачі даних між серверами",
+    "The mountpoint name contains invalid characters." : "Ім'я точки монтування містить неприпустимі символи.",
+    "Invalid or untrusted SSL certificate" : "Недійсній або не довірений SSL-сертифікат",
+    "Couldn't add remote share" : "Неможливо додати віддалену загальну теку",
+    "Shared with you" : "Доступне для вас",
+    "Shared with others" : "Доступне для інших",
+    "Shared by link" : "Доступне за посиланням",
+    "No files have been shared with you yet." : "Доступні для вас файли відсутні.",
+    "You haven't shared any files yet." : "Ви не маєте загальнодоступних файлів.",
+    "You haven't shared any files by link yet." : "Ви ще не відкрили доступ за посиланням для жодного з файлів.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Додати віддалену загальну теку {name} з {owner}@{remote}?",
+    "Remote share" : "Віддалена загальна тека",
+    "Remote share password" : "Пароль для віддаленої загальної теки",
+    "Cancel" : "Відмінити",
+    "Add remote share" : "Додати віддалену загальну теку",
+    "No ownCloud installation found at {remote}" : "Не знайдено ownCloud на {remote}",
+    "Invalid ownCloud url" : "Невірний ownCloud URL",
+    "Shared by" : "Опубліковано",
+    "This share is password-protected" : "Цей ресурс обміну захищений паролем",
+    "The password is wrong. Try again." : "Невірний пароль. Спробуйте ще раз.",
+    "Password" : "Пароль",
+    "Name" : "Ім'я",
+    "Share time" : "Дата публікації",
+    "Sorry, this link doesn’t seem to work anymore." : "На жаль, посилання більше не працює.",
+    "Reasons might be:" : "Можливі причини:",
+    "the item was removed" : "цей пункт був вилучений",
+    "the link expired" : "посилання застаріло",
+    "sharing is disabled" : "обмін заборонений",
+    "For more info, please ask the person who sent this link." : "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.",
+    "Add to your ownCloud" : "Додати до вашого ownCloud",
+    "Download" : "Завантажити",
+    "Download %s" : "Завантажити %s",
+    "Direct link" : "Пряме посилання",
+    "Remote Shares" : "Віддалені загальні теки",
+    "Allow other instances to mount public links shared from this server" : "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері",
+    "Allow users to mount public link shares" : "Дозволити користувачам монтувати монтувати посилання на загальні теки"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
deleted file mode 100644
index da1fe1acdd1..00000000000
--- a/apps/files_sharing/l10n/uk.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "На даному сервері вимкнута можливість передачі даних між серверами",
-"The mountpoint name contains invalid characters." => "Ім'я точки монтування містить неприпустимі символи.",
-"Invalid or untrusted SSL certificate" => "Недійсній або не довірений SSL-сертифікат",
-"Couldn't add remote share" => "Неможливо додати віддалену загальну теку",
-"Shared with you" => "Доступне для вас",
-"Shared with others" => "Доступне для інших",
-"Shared by link" => "Доступне за посиланням",
-"No files have been shared with you yet." => "Доступні для вас файли відсутні.",
-"You haven't shared any files yet." => "Ви не маєте загальнодоступних файлів.",
-"You haven't shared any files by link yet." => "Ви ще не відкрили доступ за посиланням для жодного з файлів.",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "Додати віддалену загальну теку {name} з {owner}@{remote}?",
-"Remote share" => "Віддалена загальна тека",
-"Remote share password" => "Пароль для віддаленої загальної теки",
-"Cancel" => "Відмінити",
-"Add remote share" => "Додати віддалену загальну теку",
-"No ownCloud installation found at {remote}" => "Не знайдено ownCloud на {remote}",
-"Invalid ownCloud url" => "Невірний ownCloud URL",
-"Shared by" => "Опубліковано",
-"This share is password-protected" => "Цей ресурс обміну захищений паролем",
-"The password is wrong. Try again." => "Невірний пароль. Спробуйте ще раз.",
-"Password" => "Пароль",
-"Name" => "Ім'я",
-"Share time" => "Дата публікації",
-"Sorry, this link doesn’t seem to work anymore." => "На жаль, посилання більше не працює.",
-"Reasons might be:" => "Можливі причини:",
-"the item was removed" => "цей пункт був вилучений",
-"the link expired" => "посилання застаріло",
-"sharing is disabled" => "обмін заборонений",
-"For more info, please ask the person who sent this link." => "Для отримання додаткової інформації, будь ласка, зверніться до особи, яка надіслала це посилання.",
-"Add to your ownCloud" => "Додати до вашого ownCloud",
-"Download" => "Завантажити",
-"Download %s" => "Завантажити %s",
-"Direct link" => "Пряме посилання",
-"Remote Shares" => "Віддалені загальні теки",
-"Allow other instances to mount public links shared from this server" => "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері",
-"Allow users to mount public link shares" => "Дозволити користувачам монтувати монтувати посилання на загальні теки"
-);
-$PLURAL_FORMS = "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/ur_PK.js b/apps/files_sharing/l10n/ur_PK.js
new file mode 100644
index 00000000000..2e9b145d789
--- /dev/null
+++ b/apps/files_sharing/l10n/ur_PK.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "منسوخ کریں",
+    "Shared by" : "سے اشتراک شدہ",
+    "Password" : "پاسورڈ",
+    "Name" : "اسم",
+    "Download" : "ڈاؤن لوڈ،"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ur_PK.json b/apps/files_sharing/l10n/ur_PK.json
new file mode 100644
index 00000000000..b0ac6d244b8
--- /dev/null
+++ b/apps/files_sharing/l10n/ur_PK.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "منسوخ کریں",
+    "Shared by" : "سے اشتراک شدہ",
+    "Password" : "پاسورڈ",
+    "Name" : "اسم",
+    "Download" : "ڈاؤن لوڈ،"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ur_PK.php b/apps/files_sharing/l10n/ur_PK.php
deleted file mode 100644
index 428feb5fbb9..00000000000
--- a/apps/files_sharing/l10n/ur_PK.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "منسوخ کریں",
-"Shared by" => "سے اشتراک شدہ",
-"Password" => "پاسورڈ",
-"Name" => "اسم",
-"Download" => "ڈاؤن لوڈ،"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_sharing/l10n/vi.js b/apps/files_sharing/l10n/vi.js
new file mode 100644
index 00000000000..3b73c2c9ec4
--- /dev/null
+++ b/apps/files_sharing/l10n/vi.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "Hủy",
+    "Shared by" : "Chia sẻ bởi",
+    "Password" : "Mật khẩu",
+    "Name" : "Tên",
+    "Download" : "Tải về"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/vi.json b/apps/files_sharing/l10n/vi.json
new file mode 100644
index 00000000000..149509fa91e
--- /dev/null
+++ b/apps/files_sharing/l10n/vi.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Cancel" : "Hủy",
+    "Shared by" : "Chia sẻ bởi",
+    "Password" : "Mật khẩu",
+    "Name" : "Tên",
+    "Download" : "Tải về"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
deleted file mode 100644
index d7eeebd9a10..00000000000
--- a/apps/files_sharing/l10n/vi.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Hủy",
-"Shared by" => "Chia sẻ bởi",
-"Password" => "Mật khẩu",
-"Name" => "Tên",
-"Download" => "Tải về"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js
new file mode 100644
index 00000000000..b5cb43f6ce2
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_CN.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能",
+    "Couldn't add remote share" : "无法添加远程分享",
+    "Shared with you" : "分享给您的文件",
+    "Shared with others" : "您分享的文件",
+    "Shared by link" : "分享链接的文件",
+    "No files have been shared with you yet." : "目前没有文件向您分享。",
+    "You haven't shared any files yet." : "您还未分享过文件。",
+    "You haven't shared any files by link yet." : "您还没通过链接分享文件。",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？",
+    "Remote share" : "远程分享",
+    "Remote share password" : "远程分享密码",
+    "Cancel" : "取消",
+    "Add remote share" : "添加远程分享",
+    "No ownCloud installation found at {remote}" : "未能在 {remote} 找到 ownCloud 服务",
+    "Invalid ownCloud url" : "无效的 ownCloud 网址",
+    "Shared by" : "共享人",
+    "This share is password-protected" : "这是一个密码保护的共享",
+    "The password is wrong. Try again." : "用户名或密码错误！请重试",
+    "Password" : "密码",
+    "Name" : "名称",
+    "Share time" : "分享时间",
+    "Sorry, this link doesn’t seem to work anymore." : "抱歉，此链接已失效",
+    "Reasons might be:" : "可能原因是：",
+    "the item was removed" : "此项已移除",
+    "the link expired" : "链接过期",
+    "sharing is disabled" : "分享已禁用",
+    "For more info, please ask the person who sent this link." : "欲知详情，请联系发给你链接的人。",
+    "Add to your ownCloud" : "添加到您的 ownCloud",
+    "Download" : "下载",
+    "Download %s" : "下载 %s",
+    "Direct link" : "直接链接",
+    "Remote Shares" : "远程分享",
+    "Allow other instances to mount public links shared from this server" : "允许其他实例挂载由此服务器分享的公共链接",
+    "Allow users to mount public link shares" : "允许用户挂载公共链接分享"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json
new file mode 100644
index 00000000000..760a2807f5b
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_CN.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "此服务器未启用服务器到服务器分享功能",
+    "Couldn't add remote share" : "无法添加远程分享",
+    "Shared with you" : "分享给您的文件",
+    "Shared with others" : "您分享的文件",
+    "Shared by link" : "分享链接的文件",
+    "No files have been shared with you yet." : "目前没有文件向您分享。",
+    "You haven't shared any files yet." : "您还未分享过文件。",
+    "You haven't shared any files by link yet." : "您还没通过链接分享文件。",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？",
+    "Remote share" : "远程分享",
+    "Remote share password" : "远程分享密码",
+    "Cancel" : "取消",
+    "Add remote share" : "添加远程分享",
+    "No ownCloud installation found at {remote}" : "未能在 {remote} 找到 ownCloud 服务",
+    "Invalid ownCloud url" : "无效的 ownCloud 网址",
+    "Shared by" : "共享人",
+    "This share is password-protected" : "这是一个密码保护的共享",
+    "The password is wrong. Try again." : "用户名或密码错误！请重试",
+    "Password" : "密码",
+    "Name" : "名称",
+    "Share time" : "分享时间",
+    "Sorry, this link doesn’t seem to work anymore." : "抱歉，此链接已失效",
+    "Reasons might be:" : "可能原因是：",
+    "the item was removed" : "此项已移除",
+    "the link expired" : "链接过期",
+    "sharing is disabled" : "分享已禁用",
+    "For more info, please ask the person who sent this link." : "欲知详情，请联系发给你链接的人。",
+    "Add to your ownCloud" : "添加到您的 ownCloud",
+    "Download" : "下载",
+    "Download %s" : "下载 %s",
+    "Direct link" : "直接链接",
+    "Remote Shares" : "远程分享",
+    "Allow other instances to mount public links shared from this server" : "允许其他实例挂载由此服务器分享的公共链接",
+    "Allow users to mount public link shares" : "允许用户挂载公共链接分享"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/zh_CN.php b/apps/files_sharing/l10n/zh_CN.php
deleted file mode 100644
index a873793446a..00000000000
--- a/apps/files_sharing/l10n/zh_CN.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "此服务器未启用服务器到服务器分享功能",
-"Couldn't add remote share" => "无法添加远程分享",
-"Shared with you" => "分享给您的文件",
-"Shared with others" => "您分享的文件",
-"Shared by link" => "分享链接的文件",
-"No files have been shared with you yet." => "目前没有文件向您分享。",
-"You haven't shared any files yet." => "您还未分享过文件。",
-"You haven't shared any files by link yet." => "您还没通过链接分享文件。",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "您要添加 {name} 来自 {owner}@{remote} 的远程分享吗？",
-"Remote share" => "远程分享",
-"Remote share password" => "远程分享密码",
-"Cancel" => "取消",
-"Add remote share" => "添加远程分享",
-"No ownCloud installation found at {remote}" => "未能在 {remote} 找到 ownCloud 服务",
-"Invalid ownCloud url" => "无效的 ownCloud 网址",
-"Shared by" => "共享人",
-"This share is password-protected" => "这是一个密码保护的共享",
-"The password is wrong. Try again." => "用户名或密码错误！请重试",
-"Password" => "密码",
-"Name" => "名称",
-"Share time" => "分享时间",
-"Sorry, this link doesn’t seem to work anymore." => "抱歉，此链接已失效",
-"Reasons might be:" => "可能原因是：",
-"the item was removed" => "此项已移除",
-"the link expired" => "链接过期",
-"sharing is disabled" => "分享已禁用",
-"For more info, please ask the person who sent this link." => "欲知详情，请联系发给你链接的人。",
-"Add to your ownCloud" => "添加到您的 ownCloud",
-"Download" => "下载",
-"Download %s" => "下载 %s",
-"Direct link" => "直接链接",
-"Remote Shares" => "远程分享",
-"Allow other instances to mount public links shared from this server" => "允许其他实例挂载由此服务器分享的公共链接",
-"Allow users to mount public link shares" => "允许用户挂载公共链接分享"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_HK.js b/apps/files_sharing/l10n/zh_HK.js
new file mode 100644
index 00000000000..02246228f3c
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_HK.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Cancel" : "取消",
+    "Password" : "密碼",
+    "Name" : "名稱",
+    "Download" : "下載"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/zh_HK.json b/apps/files_sharing/l10n/zh_HK.json
new file mode 100644
index 00000000000..dedf9d2e9ee
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_HK.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Cancel" : "取消",
+    "Password" : "密碼",
+    "Name" : "名稱",
+    "Download" : "下載"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/zh_HK.php b/apps/files_sharing/l10n/zh_HK.php
deleted file mode 100644
index 00a2620cb18..00000000000
--- a/apps/files_sharing/l10n/zh_HK.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "取消",
-"Password" => "密碼",
-"Name" => "名稱",
-"Download" => "下載"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js
new file mode 100644
index 00000000000..1ed3dc6aa47
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_TW.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "files_sharing",
+    {
+    "Server to server sharing is not enabled on this server" : "伺服器對伺服器共享在這台伺服器上面並未啟用",
+    "Couldn't add remote share" : "無法加入遠端分享",
+    "Shared with you" : "與你分享",
+    "Shared with others" : "與其他人分享",
+    "Shared by link" : "由連結分享",
+    "No files have been shared with you yet." : "目前沒有任何與你分享的檔案",
+    "You haven't shared any files yet." : "你尚未分享任何檔案",
+    "You haven't shared any files by link yet." : "你尚未使用連結分享任何檔案",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "是否要加入來自 {owner}@{remote} 的遠端分享 {name} ？",
+    "Remote share" : "遠端分享",
+    "Remote share password" : "遠端分享密碼",
+    "Cancel" : "取消",
+    "Add remote share" : "加入遠端分享",
+    "No ownCloud installation found at {remote}" : "沒有在 {remote} 找到 ownCloud",
+    "Invalid ownCloud url" : "無效的 ownCloud URL",
+    "Shared by" : "由...分享",
+    "This share is password-protected" : "這個分享有密碼保護",
+    "The password is wrong. Try again." : "請檢查您的密碼並再試一次",
+    "Password" : "密碼",
+    "Name" : "名稱",
+    "Share time" : "分享時間",
+    "Sorry, this link doesn’t seem to work anymore." : "抱歉，此連結已經失效",
+    "Reasons might be:" : "可能的原因：",
+    "the item was removed" : "項目已經移除",
+    "the link expired" : "連結過期",
+    "sharing is disabled" : "分享功能已停用",
+    "For more info, please ask the person who sent this link." : "請詢問告訴您此連結的人以瞭解更多",
+    "Add to your ownCloud" : "加入到你的 ownCloud",
+    "Download" : "下載",
+    "Download %s" : "下載 %s",
+    "Direct link" : "直接連結",
+    "Remote Shares" : "遠端分享",
+    "Allow other instances to mount public links shared from this server" : "允許其他伺服器掛載本地的公開分享",
+    "Allow users to mount public link shares" : "允許使用者掛載公開分享"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json
new file mode 100644
index 00000000000..1dabacfdfd2
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_TW.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Server to server sharing is not enabled on this server" : "伺服器對伺服器共享在這台伺服器上面並未啟用",
+    "Couldn't add remote share" : "無法加入遠端分享",
+    "Shared with you" : "與你分享",
+    "Shared with others" : "與其他人分享",
+    "Shared by link" : "由連結分享",
+    "No files have been shared with you yet." : "目前沒有任何與你分享的檔案",
+    "You haven't shared any files yet." : "你尚未分享任何檔案",
+    "You haven't shared any files by link yet." : "你尚未使用連結分享任何檔案",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "是否要加入來自 {owner}@{remote} 的遠端分享 {name} ？",
+    "Remote share" : "遠端分享",
+    "Remote share password" : "遠端分享密碼",
+    "Cancel" : "取消",
+    "Add remote share" : "加入遠端分享",
+    "No ownCloud installation found at {remote}" : "沒有在 {remote} 找到 ownCloud",
+    "Invalid ownCloud url" : "無效的 ownCloud URL",
+    "Shared by" : "由...分享",
+    "This share is password-protected" : "這個分享有密碼保護",
+    "The password is wrong. Try again." : "請檢查您的密碼並再試一次",
+    "Password" : "密碼",
+    "Name" : "名稱",
+    "Share time" : "分享時間",
+    "Sorry, this link doesn’t seem to work anymore." : "抱歉，此連結已經失效",
+    "Reasons might be:" : "可能的原因：",
+    "the item was removed" : "項目已經移除",
+    "the link expired" : "連結過期",
+    "sharing is disabled" : "分享功能已停用",
+    "For more info, please ask the person who sent this link." : "請詢問告訴您此連結的人以瞭解更多",
+    "Add to your ownCloud" : "加入到你的 ownCloud",
+    "Download" : "下載",
+    "Download %s" : "下載 %s",
+    "Direct link" : "直接連結",
+    "Remote Shares" : "遠端分享",
+    "Allow other instances to mount public links shared from this server" : "允許其他伺服器掛載本地的公開分享",
+    "Allow users to mount public link shares" : "允許使用者掛載公開分享"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
deleted file mode 100644
index 0b6f6d9e11e..00000000000
--- a/apps/files_sharing/l10n/zh_TW.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Server to server sharing is not enabled on this server" => "伺服器對伺服器共享在這台伺服器上面並未啟用",
-"Couldn't add remote share" => "無法加入遠端分享",
-"Shared with you" => "與你分享",
-"Shared with others" => "與其他人分享",
-"Shared by link" => "由連結分享",
-"No files have been shared with you yet." => "目前沒有任何與你分享的檔案",
-"You haven't shared any files yet." => "你尚未分享任何檔案",
-"You haven't shared any files by link yet." => "你尚未使用連結分享任何檔案",
-"Do you want to add the remote share {name} from {owner}@{remote}?" => "是否要加入來自 {owner}@{remote} 的遠端分享 {name} ？",
-"Remote share" => "遠端分享",
-"Remote share password" => "遠端分享密碼",
-"Cancel" => "取消",
-"Add remote share" => "加入遠端分享",
-"No ownCloud installation found at {remote}" => "沒有在 {remote} 找到 ownCloud",
-"Invalid ownCloud url" => "無效的 ownCloud URL",
-"Shared by" => "由...分享",
-"This share is password-protected" => "這個分享有密碼保護",
-"The password is wrong. Try again." => "請檢查您的密碼並再試一次",
-"Password" => "密碼",
-"Name" => "名稱",
-"Share time" => "分享時間",
-"Sorry, this link doesn’t seem to work anymore." => "抱歉，此連結已經失效",
-"Reasons might be:" => "可能的原因：",
-"the item was removed" => "項目已經移除",
-"the link expired" => "連結過期",
-"sharing is disabled" => "分享功能已停用",
-"For more info, please ask the person who sent this link." => "請詢問告訴您此連結的人以瞭解更多",
-"Add to your ownCloud" => "加入到你的 ownCloud",
-"Download" => "下載",
-"Download %s" => "下載 %s",
-"Direct link" => "直接連結",
-"Remote Shares" => "遠端分享",
-"Allow other instances to mount public links shared from this server" => "允許其他伺服器掛載本地的公開分享",
-"Allow users to mount public link shares" => "允許使用者掛載公開分享"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ar.js b/apps/files_trashbin/l10n/ar.js
new file mode 100644
index 00000000000..549cac51433
--- /dev/null
+++ b/apps/files_trashbin/l10n/ar.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "تعذّر حذف%s بشكل دائم",
+    "Couldn't restore %s" : "تعذّر استرجاع %s ",
+    "Deleted files" : "حذف الملفات",
+    "Restore" : "استعيد",
+    "Error" : "خطأ",
+    "restored" : "تمت الاستعادة",
+    "Nothing in here. Your trash bin is empty!" : "لا يوجد شيء هنا. سلة المهملات خاليه.",
+    "Name" : "اسم",
+    "Deleted" : "تم الحذف",
+    "Delete" : "إلغاء"
+},
+"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
new file mode 100644
index 00000000000..2c34afb3781
--- /dev/null
+++ b/apps/files_trashbin/l10n/ar.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "تعذّر حذف%s بشكل دائم",
+    "Couldn't restore %s" : "تعذّر استرجاع %s ",
+    "Deleted files" : "حذف الملفات",
+    "Restore" : "استعيد",
+    "Error" : "خطأ",
+    "restored" : "تمت الاستعادة",
+    "Nothing in here. Your trash bin is empty!" : "لا يوجد شيء هنا. سلة المهملات خاليه.",
+    "Name" : "اسم",
+    "Deleted" : "تم الحذف",
+    "Delete" : "إلغاء"
+},"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/ar.php b/apps/files_trashbin/l10n/ar.php
deleted file mode 100644
index 5a6105bda6f..00000000000
--- a/apps/files_trashbin/l10n/ar.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "تعذّر حذف%s بشكل دائم",
-"Couldn't restore %s" => "تعذّر استرجاع %s ",
-"Deleted files" => "حذف الملفات",
-"Restore" => "استعيد",
-"Error" => "خطأ",
-"restored" => "تمت الاستعادة",
-"Nothing in here. Your trash bin is empty!" => "لا يوجد شيء هنا. سلة المهملات خاليه.",
-"Name" => "اسم",
-"Deleted" => "تم الحذف",
-"Delete" => "إلغاء"
-);
-$PLURAL_FORMS = "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/ast.js b/apps/files_trashbin/l10n/ast.js
new file mode 100644
index 00000000000..647602bf46b
--- /dev/null
+++ b/apps/files_trashbin/l10n/ast.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nun pudo desaniciase %s dafechu",
+    "Couldn't restore %s" : "Nun pudo restaurase %s",
+    "Deleted files" : "Ficheros desaniciaos",
+    "Restore" : "Restaurar",
+    "Error" : "Fallu",
+    "restored" : "recuperóse",
+    "Nothing in here. Your trash bin is empty!" : "Nun hai un res equí. La papelera ta balera!",
+    "Name" : "Nome",
+    "Deleted" : "Desaniciáu",
+    "Delete" : "Desaniciar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/ast.json b/apps/files_trashbin/l10n/ast.json
new file mode 100644
index 00000000000..9530d37871e
--- /dev/null
+++ b/apps/files_trashbin/l10n/ast.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nun pudo desaniciase %s dafechu",
+    "Couldn't restore %s" : "Nun pudo restaurase %s",
+    "Deleted files" : "Ficheros desaniciaos",
+    "Restore" : "Restaurar",
+    "Error" : "Fallu",
+    "restored" : "recuperóse",
+    "Nothing in here. Your trash bin is empty!" : "Nun hai un res equí. La papelera ta balera!",
+    "Name" : "Nome",
+    "Deleted" : "Desaniciáu",
+    "Delete" : "Desaniciar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ast.php b/apps/files_trashbin/l10n/ast.php
deleted file mode 100644
index 3240d6751c1..00000000000
--- a/apps/files_trashbin/l10n/ast.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nun pudo desaniciase %s dafechu",
-"Couldn't restore %s" => "Nun pudo restaurase %s",
-"Deleted files" => "Ficheros desaniciaos",
-"Restore" => "Restaurar",
-"Error" => "Fallu",
-"restored" => "recuperóse",
-"Nothing in here. Your trash bin is empty!" => "Nun hai un res equí. La papelera ta balera!",
-"Name" => "Nome",
-"Deleted" => "Desaniciáu",
-"Delete" => "Desaniciar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/az.js b/apps/files_trashbin/l10n/az.js
new file mode 100644
index 00000000000..515abea51c2
--- /dev/null
+++ b/apps/files_trashbin/l10n/az.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Həmişəlik silmək olmaz %s-i",
+    "Couldn't restore %s" : "Geri qaytarila bilmədi  %s",
+    "Deleted files" : "Silinmiş fayllar",
+    "Restore" : "Geri qaytar",
+    "Error" : "Səhv",
+    "restored" : "geriqaytarılıb",
+    "Nothing in here. Your trash bin is empty!" : "Burda heçnə yoxdur. Sizin zibil qutusu boşdur!",
+    "Name" : "Ad",
+    "Deleted" : "Silinib",
+    "Delete" : "Sil"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/az.json b/apps/files_trashbin/l10n/az.json
new file mode 100644
index 00000000000..4c7f63028e2
--- /dev/null
+++ b/apps/files_trashbin/l10n/az.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Həmişəlik silmək olmaz %s-i",
+    "Couldn't restore %s" : "Geri qaytarila bilmədi  %s",
+    "Deleted files" : "Silinmiş fayllar",
+    "Restore" : "Geri qaytar",
+    "Error" : "Səhv",
+    "restored" : "geriqaytarılıb",
+    "Nothing in here. Your trash bin is empty!" : "Burda heçnə yoxdur. Sizin zibil qutusu boşdur!",
+    "Name" : "Ad",
+    "Deleted" : "Silinib",
+    "Delete" : "Sil"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/az.php b/apps/files_trashbin/l10n/az.php
deleted file mode 100644
index 9d07ff60499..00000000000
--- a/apps/files_trashbin/l10n/az.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Həmişəlik silmək olmaz %s-i",
-"Couldn't restore %s" => "Geri qaytarila bilmədi  %s",
-"Deleted files" => "Silinmiş fayllar",
-"Restore" => "Geri qaytar",
-"Error" => "Səhv",
-"restored" => "geriqaytarılıb",
-"Nothing in here. Your trash bin is empty!" => "Burda heçnə yoxdur. Sizin zibil qutusu boşdur!",
-"Name" => "Ad",
-"Deleted" => "Silinib",
-"Delete" => "Sil"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/be.js b/apps/files_trashbin/l10n/be.js
new file mode 100644
index 00000000000..3ed1bc6464a
--- /dev/null
+++ b/apps/files_trashbin/l10n/be.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Памылка"
+},
+"nplurals=4; 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_trashbin/l10n/be.json b/apps/files_trashbin/l10n/be.json
new file mode 100644
index 00000000000..501bc5f7dfb
--- /dev/null
+++ b/apps/files_trashbin/l10n/be.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Error" : "Памылка"
+},"pluralForm" :"nplurals=4; 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_trashbin/l10n/be.php b/apps/files_trashbin/l10n/be.php
deleted file mode 100644
index 6a34f1fe246..00000000000
--- a/apps/files_trashbin/l10n/be.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Памылка"
-);
-$PLURAL_FORMS = "nplurals=4; 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_trashbin/l10n/bg_BG.js b/apps/files_trashbin/l10n/bg_BG.js
new file mode 100644
index 00000000000..f910190faf1
--- /dev/null
+++ b/apps/files_trashbin/l10n/bg_BG.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Неуспешно безвъзвратно изтриване на %s.",
+    "Couldn't restore %s" : "Неуспешно възтановяване на %s.",
+    "Deleted files" : "Изтрити файлове",
+    "Restore" : "Възстановяви",
+    "Error" : "Грешка",
+    "restored" : "възстановено",
+    "Nothing in here. Your trash bin is empty!" : "Няма нищо. Кошчето е празно!",
+    "Name" : "Име",
+    "Deleted" : "Изтрито",
+    "Delete" : "Изтрий"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/bg_BG.json b/apps/files_trashbin/l10n/bg_BG.json
new file mode 100644
index 00000000000..1d8cb72dc2a
--- /dev/null
+++ b/apps/files_trashbin/l10n/bg_BG.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Неуспешно безвъзвратно изтриване на %s.",
+    "Couldn't restore %s" : "Неуспешно възтановяване на %s.",
+    "Deleted files" : "Изтрити файлове",
+    "Restore" : "Възстановяви",
+    "Error" : "Грешка",
+    "restored" : "възстановено",
+    "Nothing in here. Your trash bin is empty!" : "Няма нищо. Кошчето е празно!",
+    "Name" : "Име",
+    "Deleted" : "Изтрито",
+    "Delete" : "Изтрий"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/bg_BG.php b/apps/files_trashbin/l10n/bg_BG.php
deleted file mode 100644
index 64a4eb51d21..00000000000
--- a/apps/files_trashbin/l10n/bg_BG.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Неуспешно безвъзвратно изтриване на %s.",
-"Couldn't restore %s" => "Неуспешно възтановяване на %s.",
-"Deleted files" => "Изтрити файлове",
-"Restore" => "Възстановяви",
-"Error" => "Грешка",
-"restored" => "възстановено",
-"Nothing in here. Your trash bin is empty!" => "Няма нищо. Кошчето е празно!",
-"Name" => "Име",
-"Deleted" => "Изтрито",
-"Delete" => "Изтрий"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/bn_BD.js b/apps/files_trashbin/l10n/bn_BD.js
new file mode 100644
index 00000000000..632b387d3b6
--- /dev/null
+++ b/apps/files_trashbin/l10n/bn_BD.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "%s স্থায়ীভাবে মুছে ফেলা গেলনা",
+    "Couldn't restore %s" : "%s ফেরত আনা গেলনা",
+    "Deleted files" : "মুছে ফেলা ফাইলসমূহ",
+    "Restore" : "ফিরিয়ে দাও",
+    "Error" : "সমস্যা",
+    "restored" : "পূণঃসংরক্ষিত",
+    "Nothing in here. Your trash bin is empty!" : "এখানে কিছু নেই। আপনার ট্র্যাসবিন শুন্য",
+    "Name" : "নাম",
+    "Deleted" : "মুছে ফেলা",
+    "Delete" : "মুছে"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/bn_BD.json b/apps/files_trashbin/l10n/bn_BD.json
new file mode 100644
index 00000000000..9d0575766a9
--- /dev/null
+++ b/apps/files_trashbin/l10n/bn_BD.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "%s স্থায়ীভাবে মুছে ফেলা গেলনা",
+    "Couldn't restore %s" : "%s ফেরত আনা গেলনা",
+    "Deleted files" : "মুছে ফেলা ফাইলসমূহ",
+    "Restore" : "ফিরিয়ে দাও",
+    "Error" : "সমস্যা",
+    "restored" : "পূণঃসংরক্ষিত",
+    "Nothing in here. Your trash bin is empty!" : "এখানে কিছু নেই। আপনার ট্র্যাসবিন শুন্য",
+    "Name" : "নাম",
+    "Deleted" : "মুছে ফেলা",
+    "Delete" : "মুছে"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/bn_BD.php b/apps/files_trashbin/l10n/bn_BD.php
deleted file mode 100644
index e0e44bf8c60..00000000000
--- a/apps/files_trashbin/l10n/bn_BD.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s স্থায়ীভাবে মুছে ফেলা গেলনা",
-"Couldn't restore %s" => "%s ফেরত আনা গেলনা",
-"Deleted files" => "মুছে ফেলা ফাইলসমূহ",
-"Restore" => "ফিরিয়ে দাও",
-"Error" => "সমস্যা",
-"restored" => "পূণঃসংরক্ষিত",
-"Nothing in here. Your trash bin is empty!" => "এখানে কিছু নেই। আপনার ট্র্যাসবিন শুন্য",
-"Name" => "নাম",
-"Deleted" => "মুছে ফেলা",
-"Delete" => "মুছে"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/bn_IN.js b/apps/files_trashbin/l10n/bn_IN.js
new file mode 100644
index 00000000000..eacbbbc76d6
--- /dev/null
+++ b/apps/files_trashbin/l10n/bn_IN.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "স্থায়ীভাবে %s গুলি মুছে ফেলা যায়নি",
+    "Couldn't restore %s" : "%s পুনরুদ্ধার করা যায়নি",
+    "Deleted files" : "ফাইলস মুছে ফেলা হয়েছে",
+    "Restore" : "পুনরুদ্ধার",
+    "Error" : "ভুল",
+    "restored" : "পুনরুদ্ধার করা হয়েছে",
+    "Nothing in here. Your trash bin is empty!" : "কিছুই নেই এখানে।আপনার ট্র্যাশ বিন খালি!",
+    "Name" : "নাম",
+    "Deleted" : "মুছে ফেলা হয়েছে",
+    "Delete" : "মুছে ফেলা"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/bn_IN.json b/apps/files_trashbin/l10n/bn_IN.json
new file mode 100644
index 00000000000..74a8ca13388
--- /dev/null
+++ b/apps/files_trashbin/l10n/bn_IN.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "স্থায়ীভাবে %s গুলি মুছে ফেলা যায়নি",
+    "Couldn't restore %s" : "%s পুনরুদ্ধার করা যায়নি",
+    "Deleted files" : "ফাইলস মুছে ফেলা হয়েছে",
+    "Restore" : "পুনরুদ্ধার",
+    "Error" : "ভুল",
+    "restored" : "পুনরুদ্ধার করা হয়েছে",
+    "Nothing in here. Your trash bin is empty!" : "কিছুই নেই এখানে।আপনার ট্র্যাশ বিন খালি!",
+    "Name" : "নাম",
+    "Deleted" : "মুছে ফেলা হয়েছে",
+    "Delete" : "মুছে ফেলা"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/bn_IN.php b/apps/files_trashbin/l10n/bn_IN.php
deleted file mode 100644
index 687945782de..00000000000
--- a/apps/files_trashbin/l10n/bn_IN.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "স্থায়ীভাবে %s গুলি মুছে ফেলা যায়নি",
-"Couldn't restore %s" => "%s পুনরুদ্ধার করা যায়নি",
-"Deleted files" => "ফাইলস মুছে ফেলা হয়েছে",
-"Restore" => "পুনরুদ্ধার",
-"Error" => "ভুল",
-"restored" => "পুনরুদ্ধার করা হয়েছে",
-"Nothing in here. Your trash bin is empty!" => "কিছুই নেই এখানে।আপনার ট্র্যাশ বিন খালি!",
-"Name" => "নাম",
-"Deleted" => "মুছে ফেলা হয়েছে",
-"Delete" => "মুছে ফেলা"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/bs.js b/apps/files_trashbin/l10n/bs.js
new file mode 100644
index 00000000000..70b584f2951
--- /dev/null
+++ b/apps/files_trashbin/l10n/bs.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Name" : "Ime"
+},
+"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_trashbin/l10n/bs.json b/apps/files_trashbin/l10n/bs.json
new file mode 100644
index 00000000000..b91bf025992
--- /dev/null
+++ b/apps/files_trashbin/l10n/bs.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Name" : "Ime"
+},"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_trashbin/l10n/bs.php b/apps/files_trashbin/l10n/bs.php
deleted file mode 100644
index 08ef9b4fdbb..00000000000
--- a/apps/files_trashbin/l10n/bs.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Name" => "Ime"
-);
-$PLURAL_FORMS = "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_trashbin/l10n/ca.js b/apps/files_trashbin/l10n/ca.js
new file mode 100644
index 00000000000..7a31c5c2d9d
--- /dev/null
+++ b/apps/files_trashbin/l10n/ca.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "No s'ha pogut esborrar permanentment %s",
+    "Couldn't restore %s" : "No s'ha pogut restaurar %s",
+    "Deleted files" : "Fitxers esborrats",
+    "Restore" : "Recupera",
+    "Error" : "Error",
+    "restored" : "restaurat",
+    "Nothing in here. Your trash bin is empty!" : "La paperera està buida!",
+    "Name" : "Nom",
+    "Deleted" : "Eliminat",
+    "Delete" : "Esborra"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/ca.json b/apps/files_trashbin/l10n/ca.json
new file mode 100644
index 00000000000..586b14d0c57
--- /dev/null
+++ b/apps/files_trashbin/l10n/ca.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "No s'ha pogut esborrar permanentment %s",
+    "Couldn't restore %s" : "No s'ha pogut restaurar %s",
+    "Deleted files" : "Fitxers esborrats",
+    "Restore" : "Recupera",
+    "Error" : "Error",
+    "restored" : "restaurat",
+    "Nothing in here. Your trash bin is empty!" : "La paperera està buida!",
+    "Name" : "Nom",
+    "Deleted" : "Eliminat",
+    "Delete" : "Esborra"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ca.php b/apps/files_trashbin/l10n/ca.php
deleted file mode 100644
index 59b42797cf9..00000000000
--- a/apps/files_trashbin/l10n/ca.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "No s'ha pogut esborrar permanentment %s",
-"Couldn't restore %s" => "No s'ha pogut restaurar %s",
-"Deleted files" => "Fitxers esborrats",
-"Restore" => "Recupera",
-"Error" => "Error",
-"restored" => "restaurat",
-"Nothing in here. Your trash bin is empty!" => "La paperera està buida!",
-"Name" => "Nom",
-"Deleted" => "Eliminat",
-"Delete" => "Esborra"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/cs_CZ.js b/apps/files_trashbin/l10n/cs_CZ.js
new file mode 100644
index 00000000000..3f8ddfc2235
--- /dev/null
+++ b/apps/files_trashbin/l10n/cs_CZ.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nelze trvale odstranit %s",
+    "Couldn't restore %s" : "Nelze obnovit %s",
+    "Deleted files" : "Odstraněné soubory",
+    "Restore" : "Obnovit",
+    "Error" : "Chyba",
+    "restored" : "obnoveno",
+    "Nothing in here. Your trash bin is empty!" : "Žádný obsah. Váš koš je prázdný.",
+    "Name" : "Název",
+    "Deleted" : "Smazáno",
+    "Delete" : "Smazat"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_trashbin/l10n/cs_CZ.json b/apps/files_trashbin/l10n/cs_CZ.json
new file mode 100644
index 00000000000..628ab047ba8
--- /dev/null
+++ b/apps/files_trashbin/l10n/cs_CZ.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nelze trvale odstranit %s",
+    "Couldn't restore %s" : "Nelze obnovit %s",
+    "Deleted files" : "Odstraněné soubory",
+    "Restore" : "Obnovit",
+    "Error" : "Chyba",
+    "restored" : "obnoveno",
+    "Nothing in here. Your trash bin is empty!" : "Žádný obsah. Váš koš je prázdný.",
+    "Name" : "Název",
+    "Deleted" : "Smazáno",
+    "Delete" : "Smazat"
+},"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/cs_CZ.php b/apps/files_trashbin/l10n/cs_CZ.php
deleted file mode 100644
index 3e4f9e0e15a..00000000000
--- a/apps/files_trashbin/l10n/cs_CZ.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nelze trvale odstranit %s",
-"Couldn't restore %s" => "Nelze obnovit %s",
-"Deleted files" => "Odstraněné soubory",
-"Restore" => "Obnovit",
-"Error" => "Chyba",
-"restored" => "obnoveno",
-"Nothing in here. Your trash bin is empty!" => "Žádný obsah. Váš koš je prázdný.",
-"Name" => "Název",
-"Deleted" => "Smazáno",
-"Delete" => "Smazat"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/cy_GB.js b/apps/files_trashbin/l10n/cy_GB.js
new file mode 100644
index 00000000000..d5ccb0f7415
--- /dev/null
+++ b/apps/files_trashbin/l10n/cy_GB.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Methwyd dileu %s yn barhaol",
+    "Couldn't restore %s" : "Methwyd adfer %s",
+    "Deleted files" : "Ffeiliau ddilewyd",
+    "Restore" : "Adfer",
+    "Error" : "Gwall",
+    "Nothing in here. Your trash bin is empty!" : "Does dim byd yma. Mae eich bin sbwriel yn wag!",
+    "Name" : "Enw",
+    "Deleted" : "Wedi dileu",
+    "Delete" : "Dileu"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/files_trashbin/l10n/cy_GB.json b/apps/files_trashbin/l10n/cy_GB.json
new file mode 100644
index 00000000000..d82ea580325
--- /dev/null
+++ b/apps/files_trashbin/l10n/cy_GB.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Methwyd dileu %s yn barhaol",
+    "Couldn't restore %s" : "Methwyd adfer %s",
+    "Deleted files" : "Ffeiliau ddilewyd",
+    "Restore" : "Adfer",
+    "Error" : "Gwall",
+    "Nothing in here. Your trash bin is empty!" : "Does dim byd yma. Mae eich bin sbwriel yn wag!",
+    "Name" : "Enw",
+    "Deleted" : "Wedi dileu",
+    "Delete" : "Dileu"
+},"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/files_trashbin/l10n/cy_GB.php b/apps/files_trashbin/l10n/cy_GB.php
deleted file mode 100644
index 4e76a6d25ab..00000000000
--- a/apps/files_trashbin/l10n/cy_GB.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Methwyd dileu %s yn barhaol",
-"Couldn't restore %s" => "Methwyd adfer %s",
-"Deleted files" => "Ffeiliau ddilewyd",
-"Restore" => "Adfer",
-"Error" => "Gwall",
-"Nothing in here. Your trash bin is empty!" => "Does dim byd yma. Mae eich bin sbwriel yn wag!",
-"Name" => "Enw",
-"Deleted" => "Wedi dileu",
-"Delete" => "Dileu"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_trashbin/l10n/da.js b/apps/files_trashbin/l10n/da.js
new file mode 100644
index 00000000000..2d24f3749f6
--- /dev/null
+++ b/apps/files_trashbin/l10n/da.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Kunne ikke slette %s permanent",
+    "Couldn't restore %s" : "Kunne ikke gendanne %s",
+    "Deleted files" : "Slettede filer",
+    "Restore" : "Gendan",
+    "Error" : "Fejl",
+    "restored" : "Gendannet",
+    "Nothing in here. Your trash bin is empty!" : "Intet at se her. Din papirkurv er tom!",
+    "Name" : "Navn",
+    "Deleted" : "Slettet",
+    "Delete" : "Slet"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/da.json b/apps/files_trashbin/l10n/da.json
new file mode 100644
index 00000000000..4fbed5049a9
--- /dev/null
+++ b/apps/files_trashbin/l10n/da.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Kunne ikke slette %s permanent",
+    "Couldn't restore %s" : "Kunne ikke gendanne %s",
+    "Deleted files" : "Slettede filer",
+    "Restore" : "Gendan",
+    "Error" : "Fejl",
+    "restored" : "Gendannet",
+    "Nothing in here. Your trash bin is empty!" : "Intet at se her. Din papirkurv er tom!",
+    "Name" : "Navn",
+    "Deleted" : "Slettet",
+    "Delete" : "Slet"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/da.php b/apps/files_trashbin/l10n/da.php
deleted file mode 100644
index b651d81d1bd..00000000000
--- a/apps/files_trashbin/l10n/da.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Kunne ikke slette %s permanent",
-"Couldn't restore %s" => "Kunne ikke gendanne %s",
-"Deleted files" => "Slettede filer",
-"Restore" => "Gendan",
-"Error" => "Fejl",
-"restored" => "Gendannet",
-"Nothing in here. Your trash bin is empty!" => "Intet at se her. Din papirkurv er tom!",
-"Name" => "Navn",
-"Deleted" => "Slettet",
-"Delete" => "Slet"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de.js b/apps/files_trashbin/l10n/de.js
new file mode 100644
index 00000000000..85274258143
--- /dev/null
+++ b/apps/files_trashbin/l10n/de.js
@@ -0,0 +1,15 @@
+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, der Papierkorb ist leer!",
+    "Name" : "Name",
+    "Deleted" : "gelöscht",
+    "Delete" : "Löschen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/de.json b/apps/files_trashbin/l10n/de.json
new file mode 100644
index 00000000000..16e3cb2ae79
--- /dev/null
+++ b/apps/files_trashbin/l10n/de.json
@@ -0,0 +1,13 @@
+{ "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, der 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/de.php b/apps/files_trashbin/l10n/de.php
deleted file mode 100644
index 56b7ccfc7bd..00000000000
--- a/apps/files_trashbin/l10n/de.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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, der Papierkorb ist leer!",
-"Name" => "Name",
-"Deleted" => "gelöscht",
-"Delete" => "Löschen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de_AT.js b/apps/files_trashbin/l10n/de_AT.js
new file mode 100644
index 00000000000..db1e7544a5b
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_AT.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Fehler",
+    "Delete" : "Löschen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/de_AT.json b/apps/files_trashbin/l10n/de_AT.json
new file mode 100644
index 00000000000..a854415701f
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_AT.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Error" : "Fehler",
+    "Delete" : "Löschen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/de_AT.php b/apps/files_trashbin/l10n/de_AT.php
deleted file mode 100644
index c24aa37115e..00000000000
--- a/apps/files_trashbin/l10n/de_AT.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Fehler",
-"Delete" => "Löschen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de_CH.js b/apps/files_trashbin/l10n/de_CH.js
new file mode 100644
index 00000000000..70a428d4c93
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_CH.js
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 00000000000..497b6c35d55
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_CH.json
@@ -0,0 +1,13 @@
+{ "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/de_CH.php b/apps/files_trashbin/l10n/de_CH.php
deleted file mode 100644
index be54e57d3f3..00000000000
--- a/apps/files_trashbin/l10n/de_CH.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/de_DE.js b/apps/files_trashbin/l10n/de_DE.js
new file mode 100644
index 00000000000..70a428d4c93
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_DE.js
@@ -0,0 +1,15 @@
+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_DE.json b/apps/files_trashbin/l10n/de_DE.json
new file mode 100644
index 00000000000..497b6c35d55
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_DE.json
@@ -0,0 +1,13 @@
+{ "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/de_DE.php b/apps/files_trashbin/l10n/de_DE.php
deleted file mode 100644
index be54e57d3f3..00000000000
--- a/apps/files_trashbin/l10n/de_DE.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/el.js b/apps/files_trashbin/l10n/el.js
new file mode 100644
index 00000000000..d9902dc8636
--- /dev/null
+++ b/apps/files_trashbin/l10n/el.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Αδύνατη η μόνιμη διαγραφή του %s",
+    "Couldn't restore %s" : "Αδυναμία επαναφοράς %s",
+    "Deleted files" : "Διεγραμμένα αρχεία",
+    "Restore" : "Επαναφορά",
+    "Error" : "Σφάλμα",
+    "restored" : "επαναφέρθηκαν",
+    "Nothing in here. Your trash bin is empty!" : "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
+    "Name" : "Όνομα",
+    "Deleted" : "Διαγραμμένα",
+    "Delete" : "Διαγραφή"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/el.json b/apps/files_trashbin/l10n/el.json
new file mode 100644
index 00000000000..0004fd7242d
--- /dev/null
+++ b/apps/files_trashbin/l10n/el.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Αδύνατη η μόνιμη διαγραφή του %s",
+    "Couldn't restore %s" : "Αδυναμία επαναφοράς %s",
+    "Deleted files" : "Διεγραμμένα αρχεία",
+    "Restore" : "Επαναφορά",
+    "Error" : "Σφάλμα",
+    "restored" : "επαναφέρθηκαν",
+    "Nothing in here. Your trash bin is empty!" : "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
+    "Name" : "Όνομα",
+    "Deleted" : "Διαγραμμένα",
+    "Delete" : "Διαγραφή"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/el.php b/apps/files_trashbin/l10n/el.php
deleted file mode 100644
index 029901304ba..00000000000
--- a/apps/files_trashbin/l10n/el.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Αδύνατη η μόνιμη διαγραφή του %s",
-"Couldn't restore %s" => "Αδυναμία επαναφοράς %s",
-"Deleted files" => "Διεγραμμένα αρχεία",
-"Restore" => "Επαναφορά",
-"Error" => "Σφάλμα",
-"restored" => "επαναφέρθηκαν",
-"Nothing in here. Your trash bin is empty!" => "Δεν υπάρχει τίποτα εδώ. Ο κάδος σας είναι άδειος!",
-"Name" => "Όνομα",
-"Deleted" => "Διαγραμμένα",
-"Delete" => "Διαγραφή"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/en_GB.js b/apps/files_trashbin/l10n/en_GB.js
new file mode 100644
index 00000000000..7bd7a49b301
--- /dev/null
+++ b/apps/files_trashbin/l10n/en_GB.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Couldn't delete %s permanently",
+    "Couldn't restore %s" : "Couldn't restore %s",
+    "Deleted files" : "Deleted files",
+    "Restore" : "Restore",
+    "Error" : "Error",
+    "restored" : "restored",
+    "Nothing in here. Your trash bin is empty!" : "Nothing in here. Your recycle bin is empty!",
+    "Name" : "Name",
+    "Deleted" : "Deleted",
+    "Delete" : "Delete"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/en_GB.json b/apps/files_trashbin/l10n/en_GB.json
new file mode 100644
index 00000000000..62603ea26ea
--- /dev/null
+++ b/apps/files_trashbin/l10n/en_GB.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Couldn't delete %s permanently",
+    "Couldn't restore %s" : "Couldn't restore %s",
+    "Deleted files" : "Deleted files",
+    "Restore" : "Restore",
+    "Error" : "Error",
+    "restored" : "restored",
+    "Nothing in here. Your trash bin is empty!" : "Nothing in here. Your recycle bin is empty!",
+    "Name" : "Name",
+    "Deleted" : "Deleted",
+    "Delete" : "Delete"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/en_GB.php b/apps/files_trashbin/l10n/en_GB.php
deleted file mode 100644
index b2715dfceb7..00000000000
--- a/apps/files_trashbin/l10n/en_GB.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Couldn't delete %s permanently",
-"Couldn't restore %s" => "Couldn't restore %s",
-"Deleted files" => "Deleted files",
-"Restore" => "Restore",
-"Error" => "Error",
-"restored" => "restored",
-"Nothing in here. Your trash bin is empty!" => "Nothing in here. Your recycle bin is empty!",
-"Name" => "Name",
-"Deleted" => "Deleted",
-"Delete" => "Delete"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eo.js b/apps/files_trashbin/l10n/eo.js
new file mode 100644
index 00000000000..ad4d45a98e0
--- /dev/null
+++ b/apps/files_trashbin/l10n/eo.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Ne povis foriĝi %s por ĉiam",
+    "Couldn't restore %s" : "Ne povis restaŭriĝi %s",
+    "Deleted files" : "Forigitaj dosieroj",
+    "Restore" : "Restaŭri",
+    "Error" : "Eraro",
+    "restored" : "restaŭrita",
+    "Nothing in here. Your trash bin is empty!" : "Nenio estas ĉi tie. Via rubujo malplenas!",
+    "Name" : "Nomo",
+    "Deleted" : "Forigita",
+    "Delete" : "Forigi"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/eo.json b/apps/files_trashbin/l10n/eo.json
new file mode 100644
index 00000000000..3faebfb80d6
--- /dev/null
+++ b/apps/files_trashbin/l10n/eo.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Ne povis foriĝi %s por ĉiam",
+    "Couldn't restore %s" : "Ne povis restaŭriĝi %s",
+    "Deleted files" : "Forigitaj dosieroj",
+    "Restore" : "Restaŭri",
+    "Error" : "Eraro",
+    "restored" : "restaŭrita",
+    "Nothing in here. Your trash bin is empty!" : "Nenio estas ĉi tie. Via rubujo malplenas!",
+    "Name" : "Nomo",
+    "Deleted" : "Forigita",
+    "Delete" : "Forigi"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/eo.php b/apps/files_trashbin/l10n/eo.php
deleted file mode 100644
index 67617f448d0..00000000000
--- a/apps/files_trashbin/l10n/eo.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Ne povis foriĝi %s por ĉiam",
-"Couldn't restore %s" => "Ne povis restaŭriĝi %s",
-"Deleted files" => "Forigitaj dosieroj",
-"Restore" => "Restaŭri",
-"Error" => "Eraro",
-"restored" => "restaŭrita",
-"Nothing in here. Your trash bin is empty!" => "Nenio estas ĉi tie. Via rubujo malplenas!",
-"Name" => "Nomo",
-"Deleted" => "Forigita",
-"Delete" => "Forigi"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es.js b/apps/files_trashbin/l10n/es.js
new file mode 100644
index 00000000000..2df71c43b31
--- /dev/null
+++ b/apps/files_trashbin/l10n/es.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "No se puede eliminar %s permanentemente",
+    "Couldn't restore %s" : "No se puede restaurar %s",
+    "Deleted files" : "Archivos eliminados",
+    "Restore" : "Recuperar",
+    "Error" : "Error",
+    "restored" : "recuperado",
+    "Nothing in here. Your trash bin is empty!" : "No hay nada aquí. ¡Tu papelera esta vacía!",
+    "Name" : "Nombre",
+    "Deleted" : "Eliminado",
+    "Delete" : "Eliminar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/es.json b/apps/files_trashbin/l10n/es.json
new file mode 100644
index 00000000000..b37ab9647c8
--- /dev/null
+++ b/apps/files_trashbin/l10n/es.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "No se puede eliminar %s permanentemente",
+    "Couldn't restore %s" : "No se puede restaurar %s",
+    "Deleted files" : "Archivos eliminados",
+    "Restore" : "Recuperar",
+    "Error" : "Error",
+    "restored" : "recuperado",
+    "Nothing in here. Your trash bin is empty!" : "No hay nada aquí. ¡Tu papelera esta vacía!",
+    "Name" : "Nombre",
+    "Deleted" : "Eliminado",
+    "Delete" : "Eliminar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/es.php b/apps/files_trashbin/l10n/es.php
deleted file mode 100644
index c3db7765154..00000000000
--- a/apps/files_trashbin/l10n/es.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
-"Couldn't restore %s" => "No se puede restaurar %s",
-"Deleted files" => "Archivos eliminados",
-"Restore" => "Recuperar",
-"Error" => "Error",
-"restored" => "recuperado",
-"Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
-"Name" => "Nombre",
-"Deleted" => "Eliminado",
-"Delete" => "Eliminar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es_AR.js b/apps/files_trashbin/l10n/es_AR.js
new file mode 100644
index 00000000000..e49dae4688a
--- /dev/null
+++ b/apps/files_trashbin/l10n/es_AR.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "No fue posible borrar %s de manera permanente",
+    "Couldn't restore %s" : "No se pudo restaurar %s",
+    "Deleted files" : "Archivos borrados",
+    "Restore" : "Recuperar",
+    "Error" : "Error",
+    "restored" : "recuperado",
+    "Nothing in here. Your trash bin is empty!" : "No hay nada acá. ¡La papelera está vacía!",
+    "Name" : "Nombre",
+    "Deleted" : "Borrado",
+    "Delete" : "Borrar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/es_AR.json b/apps/files_trashbin/l10n/es_AR.json
new file mode 100644
index 00000000000..793a1e8b172
--- /dev/null
+++ b/apps/files_trashbin/l10n/es_AR.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "No fue posible borrar %s de manera permanente",
+    "Couldn't restore %s" : "No se pudo restaurar %s",
+    "Deleted files" : "Archivos borrados",
+    "Restore" : "Recuperar",
+    "Error" : "Error",
+    "restored" : "recuperado",
+    "Nothing in here. Your trash bin is empty!" : "No hay nada acá. ¡La papelera está vacía!",
+    "Name" : "Nombre",
+    "Deleted" : "Borrado",
+    "Delete" : "Borrar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/es_AR.php b/apps/files_trashbin/l10n/es_AR.php
deleted file mode 100644
index 2991ea507b0..00000000000
--- a/apps/files_trashbin/l10n/es_AR.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "No fue posible borrar %s de manera permanente",
-"Couldn't restore %s" => "No se pudo restaurar %s",
-"Deleted files" => "Archivos borrados",
-"Restore" => "Recuperar",
-"Error" => "Error",
-"restored" => "recuperado",
-"Nothing in here. Your trash bin is empty!" => "No hay nada acá. ¡La papelera está vacía!",
-"Name" => "Nombre",
-"Deleted" => "Borrado",
-"Delete" => "Borrar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es_CL.js b/apps/files_trashbin/l10n/es_CL.js
new file mode 100644
index 00000000000..11ab23caf7b
--- /dev/null
+++ b/apps/files_trashbin/l10n/es_CL.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Error"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/es_CL.json b/apps/files_trashbin/l10n/es_CL.json
new file mode 100644
index 00000000000..97579514401
--- /dev/null
+++ b/apps/files_trashbin/l10n/es_CL.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Error" : "Error"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/es_CL.php b/apps/files_trashbin/l10n/es_CL.php
deleted file mode 100644
index 45584ff7c42..00000000000
--- a/apps/files_trashbin/l10n/es_CL.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Error"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/es_MX.js b/apps/files_trashbin/l10n/es_MX.js
new file mode 100644
index 00000000000..2df71c43b31
--- /dev/null
+++ b/apps/files_trashbin/l10n/es_MX.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "No se puede eliminar %s permanentemente",
+    "Couldn't restore %s" : "No se puede restaurar %s",
+    "Deleted files" : "Archivos eliminados",
+    "Restore" : "Recuperar",
+    "Error" : "Error",
+    "restored" : "recuperado",
+    "Nothing in here. Your trash bin is empty!" : "No hay nada aquí. ¡Tu papelera esta vacía!",
+    "Name" : "Nombre",
+    "Deleted" : "Eliminado",
+    "Delete" : "Eliminar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/es_MX.json b/apps/files_trashbin/l10n/es_MX.json
new file mode 100644
index 00000000000..b37ab9647c8
--- /dev/null
+++ b/apps/files_trashbin/l10n/es_MX.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "No se puede eliminar %s permanentemente",
+    "Couldn't restore %s" : "No se puede restaurar %s",
+    "Deleted files" : "Archivos eliminados",
+    "Restore" : "Recuperar",
+    "Error" : "Error",
+    "restored" : "recuperado",
+    "Nothing in here. Your trash bin is empty!" : "No hay nada aquí. ¡Tu papelera esta vacía!",
+    "Name" : "Nombre",
+    "Deleted" : "Eliminado",
+    "Delete" : "Eliminar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/es_MX.php b/apps/files_trashbin/l10n/es_MX.php
deleted file mode 100644
index c3db7765154..00000000000
--- a/apps/files_trashbin/l10n/es_MX.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "No se puede eliminar %s permanentemente",
-"Couldn't restore %s" => "No se puede restaurar %s",
-"Deleted files" => "Archivos eliminados",
-"Restore" => "Recuperar",
-"Error" => "Error",
-"restored" => "recuperado",
-"Nothing in here. Your trash bin is empty!" => "No hay nada aquí. ¡Tu papelera esta vacía!",
-"Name" => "Nombre",
-"Deleted" => "Eliminado",
-"Delete" => "Eliminar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/et_EE.js b/apps/files_trashbin/l10n/et_EE.js
new file mode 100644
index 00000000000..3067589bd9b
--- /dev/null
+++ b/apps/files_trashbin/l10n/et_EE.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "%s jäädavalt kustutamine ebaõnnestus",
+    "Couldn't restore %s" : "%s ei saa taastada",
+    "Deleted files" : "Kustutatud failid",
+    "Restore" : "Taasta",
+    "Error" : "Viga",
+    "restored" : "taastatud",
+    "Nothing in here. Your trash bin is empty!" : "Siin pole midagi. Sinu prügikast on tühi!",
+    "Name" : "Nimi",
+    "Deleted" : "Kustutatud",
+    "Delete" : "Kustuta"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/et_EE.json b/apps/files_trashbin/l10n/et_EE.json
new file mode 100644
index 00000000000..2e6d239f421
--- /dev/null
+++ b/apps/files_trashbin/l10n/et_EE.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "%s jäädavalt kustutamine ebaõnnestus",
+    "Couldn't restore %s" : "%s ei saa taastada",
+    "Deleted files" : "Kustutatud failid",
+    "Restore" : "Taasta",
+    "Error" : "Viga",
+    "restored" : "taastatud",
+    "Nothing in here. Your trash bin is empty!" : "Siin pole midagi. Sinu prügikast on tühi!",
+    "Name" : "Nimi",
+    "Deleted" : "Kustutatud",
+    "Delete" : "Kustuta"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/et_EE.php b/apps/files_trashbin/l10n/et_EE.php
deleted file mode 100644
index c1c9ea66c4f..00000000000
--- a/apps/files_trashbin/l10n/et_EE.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s jäädavalt kustutamine ebaõnnestus",
-"Couldn't restore %s" => "%s ei saa taastada",
-"Deleted files" => "Kustutatud failid",
-"Restore" => "Taasta",
-"Error" => "Viga",
-"restored" => "taastatud",
-"Nothing in here. Your trash bin is empty!" => "Siin pole midagi. Sinu prügikast on tühi!",
-"Name" => "Nimi",
-"Deleted" => "Kustutatud",
-"Delete" => "Kustuta"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eu.js b/apps/files_trashbin/l10n/eu.js
new file mode 100644
index 00000000000..747175d830c
--- /dev/null
+++ b/apps/files_trashbin/l10n/eu.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Ezin izan da %s betirako ezabatu",
+    "Couldn't restore %s" : "Ezin izan da %s berreskuratu",
+    "Deleted files" : "Ezabatutako fitxategiak",
+    "Restore" : "Berrezarri",
+    "Error" : "Errorea",
+    "restored" : "Berrezarrita",
+    "Nothing in here. Your trash bin is empty!" : "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
+    "Name" : "Izena",
+    "Deleted" : "Ezabatuta",
+    "Delete" : "Ezabatu"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/eu.json b/apps/files_trashbin/l10n/eu.json
new file mode 100644
index 00000000000..f86ba4230ab
--- /dev/null
+++ b/apps/files_trashbin/l10n/eu.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Ezin izan da %s betirako ezabatu",
+    "Couldn't restore %s" : "Ezin izan da %s berreskuratu",
+    "Deleted files" : "Ezabatutako fitxategiak",
+    "Restore" : "Berrezarri",
+    "Error" : "Errorea",
+    "restored" : "Berrezarrita",
+    "Nothing in here. Your trash bin is empty!" : "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
+    "Name" : "Izena",
+    "Deleted" : "Ezabatuta",
+    "Delete" : "Ezabatu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/eu.php b/apps/files_trashbin/l10n/eu.php
deleted file mode 100644
index 63c1245da06..00000000000
--- a/apps/files_trashbin/l10n/eu.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Ezin izan da %s betirako ezabatu",
-"Couldn't restore %s" => "Ezin izan da %s berreskuratu",
-"Deleted files" => "Ezabatutako fitxategiak",
-"Restore" => "Berrezarri",
-"Error" => "Errorea",
-"restored" => "Berrezarrita",
-"Nothing in here. Your trash bin is empty!" => "Ez dago ezer ez. Zure zakarrontzia hutsik dago!",
-"Name" => "Izena",
-"Deleted" => "Ezabatuta",
-"Delete" => "Ezabatu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/eu_ES.js b/apps/files_trashbin/l10n/eu_ES.js
new file mode 100644
index 00000000000..8e988be3bf6
--- /dev/null
+++ b/apps/files_trashbin/l10n/eu_ES.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..14a2375ad60
--- /dev/null
+++ b/apps/files_trashbin/l10n/eu_ES.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Delete" : "Ezabatu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/eu_ES.php b/apps/files_trashbin/l10n/eu_ES.php
deleted file mode 100644
index 8612c8609bb..00000000000
--- a/apps/files_trashbin/l10n/eu_ES.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Ezabatu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fa.js b/apps/files_trashbin/l10n/fa.js
new file mode 100644
index 00000000000..a87d9a5c113
--- /dev/null
+++ b/apps/files_trashbin/l10n/fa.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "%s را نمی توان برای همیشه حذف کرد",
+    "Couldn't restore %s" : "%s را نمی توان بازگرداند",
+    "Deleted files" : "فایل های حذف شده",
+    "Restore" : "بازیابی",
+    "Error" : "خطا",
+    "restored" : "بازیابی شد",
+    "Nothing in here. Your trash bin is empty!" : "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
+    "Name" : "نام",
+    "Deleted" : "حذف شده",
+    "Delete" : "حذف"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/fa.json b/apps/files_trashbin/l10n/fa.json
new file mode 100644
index 00000000000..94748c98899
--- /dev/null
+++ b/apps/files_trashbin/l10n/fa.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "%s را نمی توان برای همیشه حذف کرد",
+    "Couldn't restore %s" : "%s را نمی توان بازگرداند",
+    "Deleted files" : "فایل های حذف شده",
+    "Restore" : "بازیابی",
+    "Error" : "خطا",
+    "restored" : "بازیابی شد",
+    "Nothing in here. Your trash bin is empty!" : "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
+    "Name" : "نام",
+    "Deleted" : "حذف شده",
+    "Delete" : "حذف"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/fa.php b/apps/files_trashbin/l10n/fa.php
deleted file mode 100644
index e7f99c53f42..00000000000
--- a/apps/files_trashbin/l10n/fa.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s را نمی توان برای همیشه حذف کرد",
-"Couldn't restore %s" => "%s را نمی توان بازگرداند",
-"Deleted files" => "فایل های حذف شده",
-"Restore" => "بازیابی",
-"Error" => "خطا",
-"restored" => "بازیابی شد",
-"Nothing in here. Your trash bin is empty!" => "هیچ چیزی اینجا نیست. سطل زباله ی شما خالی است.",
-"Name" => "نام",
-"Deleted" => "حذف شده",
-"Delete" => "حذف"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/fi_FI.js b/apps/files_trashbin/l10n/fi_FI.js
new file mode 100644
index 00000000000..1b69bf5c75f
--- /dev/null
+++ b/apps/files_trashbin/l10n/fi_FI.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Kohdetta %s ei voitu poistaa pysyvästi",
+    "Couldn't restore %s" : "Kohteen %s palautus epäonnistui",
+    "Deleted files" : "Poistetut tiedostot",
+    "Restore" : "Palauta",
+    "Error" : "Virhe",
+    "restored" : "palautettu",
+    "Nothing in here. Your trash bin is empty!" : "Tyhjää täynnä! Roskakorissa ei ole mitään.",
+    "Name" : "Nimi",
+    "Deleted" : "Poistettu",
+    "Delete" : "Poista"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/fi_FI.json b/apps/files_trashbin/l10n/fi_FI.json
new file mode 100644
index 00000000000..25b3d71dced
--- /dev/null
+++ b/apps/files_trashbin/l10n/fi_FI.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Kohdetta %s ei voitu poistaa pysyvästi",
+    "Couldn't restore %s" : "Kohteen %s palautus epäonnistui",
+    "Deleted files" : "Poistetut tiedostot",
+    "Restore" : "Palauta",
+    "Error" : "Virhe",
+    "restored" : "palautettu",
+    "Nothing in here. Your trash bin is empty!" : "Tyhjää täynnä! Roskakorissa ei ole mitään.",
+    "Name" : "Nimi",
+    "Deleted" : "Poistettu",
+    "Delete" : "Poista"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/fi_FI.php b/apps/files_trashbin/l10n/fi_FI.php
deleted file mode 100644
index 158fc7dac55..00000000000
--- a/apps/files_trashbin/l10n/fi_FI.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Kohdetta %s ei voitu poistaa pysyvästi",
-"Couldn't restore %s" => "Kohteen %s palautus epäonnistui",
-"Deleted files" => "Poistetut tiedostot",
-"Restore" => "Palauta",
-"Error" => "Virhe",
-"restored" => "palautettu",
-"Nothing in here. Your trash bin is empty!" => "Tyhjää täynnä! Roskakorissa ei ole mitään.",
-"Name" => "Nimi",
-"Deleted" => "Poistettu",
-"Delete" => "Poista"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/fr.js b/apps/files_trashbin/l10n/fr.js
new file mode 100644
index 00000000000..ddcdc495de5
--- /dev/null
+++ b/apps/files_trashbin/l10n/fr.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Impossible de supprimer %s définitivement",
+    "Couldn't restore %s" : "Impossible de restaurer %s",
+    "Deleted files" : "Fichiers supprimés",
+    "Restore" : "Restaurer",
+    "Error" : "Erreur",
+    "restored" : "restauré",
+    "Nothing in here. Your trash bin is empty!" : "Il n'y a rien ici. Votre corbeille est vide !",
+    "Name" : "Nom",
+    "Deleted" : "Effacé",
+    "Delete" : "Supprimer"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_trashbin/l10n/fr.json b/apps/files_trashbin/l10n/fr.json
new file mode 100644
index 00000000000..bc6cda70713
--- /dev/null
+++ b/apps/files_trashbin/l10n/fr.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Impossible de supprimer %s définitivement",
+    "Couldn't restore %s" : "Impossible de restaurer %s",
+    "Deleted files" : "Fichiers supprimés",
+    "Restore" : "Restaurer",
+    "Error" : "Erreur",
+    "restored" : "restauré",
+    "Nothing in here. Your trash bin is empty!" : "Il n'y a rien ici. Votre corbeille est vide !",
+    "Name" : "Nom",
+    "Deleted" : "Effacé",
+    "Delete" : "Supprimer"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/fr.php b/apps/files_trashbin/l10n/fr.php
deleted file mode 100644
index b59eb6aa7d4..00000000000
--- a/apps/files_trashbin/l10n/fr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Impossible de supprimer %s définitivement",
-"Couldn't restore %s" => "Impossible de restaurer %s",
-"Deleted files" => "Fichiers supprimés",
-"Restore" => "Restaurer",
-"Error" => "Erreur",
-"restored" => "restauré",
-"Nothing in here. Your trash bin is empty!" => "Il n'y a rien ici. Votre corbeille est vide !",
-"Name" => "Nom",
-"Deleted" => "Effacé",
-"Delete" => "Supprimer"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/gl.js b/apps/files_trashbin/l10n/gl.js
new file mode 100644
index 00000000000..701c1354dfd
--- /dev/null
+++ b/apps/files_trashbin/l10n/gl.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Non foi posíbel eliminar %s permanente",
+    "Couldn't restore %s" : "Non foi posíbel restaurar %s",
+    "Deleted files" : "Ficheiros eliminados",
+    "Restore" : "Restabelecer",
+    "Error" : "Erro",
+    "restored" : "restaurado",
+    "Nothing in here. Your trash bin is empty!" : "Aquí non hai nada. O cesto do lixo está baleiro!",
+    "Name" : "Nome",
+    "Deleted" : "Eliminado",
+    "Delete" : "Eliminar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/gl.json b/apps/files_trashbin/l10n/gl.json
new file mode 100644
index 00000000000..74ac40c4f32
--- /dev/null
+++ b/apps/files_trashbin/l10n/gl.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Non foi posíbel eliminar %s permanente",
+    "Couldn't restore %s" : "Non foi posíbel restaurar %s",
+    "Deleted files" : "Ficheiros eliminados",
+    "Restore" : "Restabelecer",
+    "Error" : "Erro",
+    "restored" : "restaurado",
+    "Nothing in here. Your trash bin is empty!" : "Aquí non hai nada. O cesto do lixo está baleiro!",
+    "Name" : "Nome",
+    "Deleted" : "Eliminado",
+    "Delete" : "Eliminar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/gl.php b/apps/files_trashbin/l10n/gl.php
deleted file mode 100644
index 475d7075c70..00000000000
--- a/apps/files_trashbin/l10n/gl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Non foi posíbel eliminar %s permanente",
-"Couldn't restore %s" => "Non foi posíbel restaurar %s",
-"Deleted files" => "Ficheiros eliminados",
-"Restore" => "Restabelecer",
-"Error" => "Erro",
-"restored" => "restaurado",
-"Nothing in here. Your trash bin is empty!" => "Aquí non hai nada. O cesto do lixo está baleiro!",
-"Name" => "Nome",
-"Deleted" => "Eliminado",
-"Delete" => "Eliminar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/he.js b/apps/files_trashbin/l10n/he.js
new file mode 100644
index 00000000000..ea5d131a9e4
--- /dev/null
+++ b/apps/files_trashbin/l10n/he.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "לא ניתן למחוק את %s לצמיתות",
+    "Couldn't restore %s" : "לא ניתן לשחזר את %s",
+    "Deleted files" : "קבצים שנמחקו",
+    "Restore" : "שחזור",
+    "Error" : "שגיאה",
+    "restored" : "שוחזר",
+    "Nothing in here. Your trash bin is empty!" : "אין כאן שום דבר. סל המיחזור שלך ריק!",
+    "Name" : "שם",
+    "Deleted" : "נמחק",
+    "Delete" : "מחיקה"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/he.json b/apps/files_trashbin/l10n/he.json
new file mode 100644
index 00000000000..d0db85c41b9
--- /dev/null
+++ b/apps/files_trashbin/l10n/he.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "לא ניתן למחוק את %s לצמיתות",
+    "Couldn't restore %s" : "לא ניתן לשחזר את %s",
+    "Deleted files" : "קבצים שנמחקו",
+    "Restore" : "שחזור",
+    "Error" : "שגיאה",
+    "restored" : "שוחזר",
+    "Nothing in here. Your trash bin is empty!" : "אין כאן שום דבר. סל המיחזור שלך ריק!",
+    "Name" : "שם",
+    "Deleted" : "נמחק",
+    "Delete" : "מחיקה"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/he.php b/apps/files_trashbin/l10n/he.php
deleted file mode 100644
index 90b3fd11ab5..00000000000
--- a/apps/files_trashbin/l10n/he.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "לא ניתן למחוק את %s לצמיתות",
-"Couldn't restore %s" => "לא ניתן לשחזר את %s",
-"Deleted files" => "קבצים שנמחקו",
-"Restore" => "שחזור",
-"Error" => "שגיאה",
-"restored" => "שוחזר",
-"Nothing in here. Your trash bin is empty!" => "אין כאן שום דבר. סל המיחזור שלך ריק!",
-"Name" => "שם",
-"Deleted" => "נמחק",
-"Delete" => "מחיקה"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hi.js b/apps/files_trashbin/l10n/hi.js
new file mode 100644
index 00000000000..a4bf005dbbf
--- /dev/null
+++ b/apps/files_trashbin/l10n/hi.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "त्रुटि"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/hi.json b/apps/files_trashbin/l10n/hi.json
new file mode 100644
index 00000000000..5fbc8a85e1b
--- /dev/null
+++ b/apps/files_trashbin/l10n/hi.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Error" : "त्रुटि"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/hi.php b/apps/files_trashbin/l10n/hi.php
deleted file mode 100644
index d4a26011b58..00000000000
--- a/apps/files_trashbin/l10n/hi.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "त्रुटि"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hr.js b/apps/files_trashbin/l10n/hr.js
new file mode 100644
index 00000000000..e05fde1c8a6
--- /dev/null
+++ b/apps/files_trashbin/l10n/hr.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nije moguće trajno izbrisati %s",
+    "Couldn't restore %s" : "Nije moguće obnoviti %s",
+    "Deleted files" : "Izbrisane datoteke",
+    "Restore" : "Obnovite",
+    "Error" : "Pogreška",
+    "restored" : "Obnovljeno",
+    "Nothing in here. Your trash bin is empty!" : "Ovdje nema ničega. Vaša kantica je prazna!",
+    "Name" : "Naziv",
+    "Deleted" : "Izbrisano",
+    "Delete" : "Izbrišite"
+},
+"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_trashbin/l10n/hr.json b/apps/files_trashbin/l10n/hr.json
new file mode 100644
index 00000000000..7ce4749b133
--- /dev/null
+++ b/apps/files_trashbin/l10n/hr.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nije moguće trajno izbrisati %s",
+    "Couldn't restore %s" : "Nije moguće obnoviti %s",
+    "Deleted files" : "Izbrisane datoteke",
+    "Restore" : "Obnovite",
+    "Error" : "Pogreška",
+    "restored" : "Obnovljeno",
+    "Nothing in here. Your trash bin is empty!" : "Ovdje nema ničega. Vaša kantica je prazna!",
+    "Name" : "Naziv",
+    "Deleted" : "Izbrisano",
+    "Delete" : "Izbrišite"
+},"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_trashbin/l10n/hr.php b/apps/files_trashbin/l10n/hr.php
deleted file mode 100644
index 2d29eeba44d..00000000000
--- a/apps/files_trashbin/l10n/hr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nije moguće trajno izbrisati %s",
-"Couldn't restore %s" => "Nije moguće obnoviti %s",
-"Deleted files" => "Izbrisane datoteke",
-"Restore" => "Obnovite",
-"Error" => "Pogreška",
-"restored" => "Obnovljeno",
-"Nothing in here. Your trash bin is empty!" => "Ovdje nema ničega. Vaša kantica je prazna!",
-"Name" => "Naziv",
-"Deleted" => "Izbrisano",
-"Delete" => "Izbrišite"
-);
-$PLURAL_FORMS = "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_trashbin/l10n/hu_HU.js b/apps/files_trashbin/l10n/hu_HU.js
new file mode 100644
index 00000000000..cd057777275
--- /dev/null
+++ b/apps/files_trashbin/l10n/hu_HU.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nem sikerült %s végleges törlése",
+    "Couldn't restore %s" : "Nem sikerült %s visszaállítása",
+    "Deleted files" : "Törölt fájlok",
+    "Restore" : "Visszaállítás",
+    "Error" : "Hiba",
+    "restored" : "visszaállítva",
+    "Nothing in here. Your trash bin is empty!" : "Itt nincs semmi. Az Ön szemetes mappája üres!",
+    "Name" : "Név",
+    "Deleted" : "Törölve",
+    "Delete" : "Törlés"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/hu_HU.json b/apps/files_trashbin/l10n/hu_HU.json
new file mode 100644
index 00000000000..f989f402328
--- /dev/null
+++ b/apps/files_trashbin/l10n/hu_HU.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nem sikerült %s végleges törlése",
+    "Couldn't restore %s" : "Nem sikerült %s visszaállítása",
+    "Deleted files" : "Törölt fájlok",
+    "Restore" : "Visszaállítás",
+    "Error" : "Hiba",
+    "restored" : "visszaállítva",
+    "Nothing in here. Your trash bin is empty!" : "Itt nincs semmi. Az Ön szemetes mappája üres!",
+    "Name" : "Név",
+    "Deleted" : "Törölve",
+    "Delete" : "Törlés"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/hu_HU.php b/apps/files_trashbin/l10n/hu_HU.php
deleted file mode 100644
index 60f3ebad856..00000000000
--- a/apps/files_trashbin/l10n/hu_HU.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nem sikerült %s végleges törlése",
-"Couldn't restore %s" => "Nem sikerült %s visszaállítása",
-"Deleted files" => "Törölt fájlok",
-"Restore" => "Visszaállítás",
-"Error" => "Hiba",
-"restored" => "visszaállítva",
-"Nothing in here. Your trash bin is empty!" => "Itt nincs semmi. Az Ön szemetes mappája üres!",
-"Name" => "Név",
-"Deleted" => "Törölve",
-"Delete" => "Törlés"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/hy.js b/apps/files_trashbin/l10n/hy.js
new file mode 100644
index 00000000000..0ad4f14c7b7
--- /dev/null
+++ b/apps/files_trashbin/l10n/hy.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Delete" : "Ջնջել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/hy.json b/apps/files_trashbin/l10n/hy.json
new file mode 100644
index 00000000000..081a2c5f49e
--- /dev/null
+++ b/apps/files_trashbin/l10n/hy.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Delete" : "Ջնջել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/hy.php b/apps/files_trashbin/l10n/hy.php
deleted file mode 100644
index f933bec8feb..00000000000
--- a/apps/files_trashbin/l10n/hy.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Ջնջել"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ia.js b/apps/files_trashbin/l10n/ia.js
new file mode 100644
index 00000000000..1ae952f8c9b
--- /dev/null
+++ b/apps/files_trashbin/l10n/ia.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Error",
+    "Name" : "Nomine",
+    "Delete" : "Deler"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/ia.json b/apps/files_trashbin/l10n/ia.json
new file mode 100644
index 00000000000..909e6dfe769
--- /dev/null
+++ b/apps/files_trashbin/l10n/ia.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "Error",
+    "Name" : "Nomine",
+    "Delete" : "Deler"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ia.php b/apps/files_trashbin/l10n/ia.php
deleted file mode 100644
index 7709ef030e3..00000000000
--- a/apps/files_trashbin/l10n/ia.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Error",
-"Name" => "Nomine",
-"Delete" => "Deler"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/id.js b/apps/files_trashbin/l10n/id.js
new file mode 100644
index 00000000000..6e13e455591
--- /dev/null
+++ b/apps/files_trashbin/l10n/id.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Tidak dapat menghapus permanen %s",
+    "Couldn't restore %s" : "Tidak dapat memulihkan %s",
+    "Deleted files" : "Berkas yang dihapus",
+    "Restore" : "Pulihkan",
+    "Error" : "Galat",
+    "Nothing in here. Your trash bin is empty!" : "Tempat sampah anda kosong!",
+    "Name" : "Nama",
+    "Deleted" : "Dihapus",
+    "Delete" : "Hapus"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/id.json b/apps/files_trashbin/l10n/id.json
new file mode 100644
index 00000000000..f29df5cd07e
--- /dev/null
+++ b/apps/files_trashbin/l10n/id.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Tidak dapat menghapus permanen %s",
+    "Couldn't restore %s" : "Tidak dapat memulihkan %s",
+    "Deleted files" : "Berkas yang dihapus",
+    "Restore" : "Pulihkan",
+    "Error" : "Galat",
+    "Nothing in here. Your trash bin is empty!" : "Tempat sampah anda kosong!",
+    "Name" : "Nama",
+    "Deleted" : "Dihapus",
+    "Delete" : "Hapus"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/id.php b/apps/files_trashbin/l10n/id.php
deleted file mode 100644
index bba9e329eeb..00000000000
--- a/apps/files_trashbin/l10n/id.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Tidak dapat menghapus permanen %s",
-"Couldn't restore %s" => "Tidak dapat memulihkan %s",
-"Deleted files" => "Berkas yang dihapus",
-"Restore" => "Pulihkan",
-"Error" => "Galat",
-"Nothing in here. Your trash bin is empty!" => "Tempat sampah anda kosong!",
-"Name" => "Nama",
-"Deleted" => "Dihapus",
-"Delete" => "Hapus"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/is.js b/apps/files_trashbin/l10n/is.js
new file mode 100644
index 00000000000..916875decea
--- /dev/null
+++ b/apps/files_trashbin/l10n/is.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Villa",
+    "Name" : "Nafn",
+    "Delete" : "Eyða"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/is.json b/apps/files_trashbin/l10n/is.json
new file mode 100644
index 00000000000..35e1620df95
--- /dev/null
+++ b/apps/files_trashbin/l10n/is.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "Villa",
+    "Name" : "Nafn",
+    "Delete" : "Eyða"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/is.php b/apps/files_trashbin/l10n/is.php
deleted file mode 100644
index 8ccf89739fc..00000000000
--- a/apps/files_trashbin/l10n/is.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Villa",
-"Name" => "Nafn",
-"Delete" => "Eyða"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/it.js b/apps/files_trashbin/l10n/it.js
new file mode 100644
index 00000000000..5e57848c479
--- /dev/null
+++ b/apps/files_trashbin/l10n/it.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Impossibile eliminare %s definitivamente",
+    "Couldn't restore %s" : "Impossibile ripristinare %s",
+    "Deleted files" : "File eliminati",
+    "Restore" : "Ripristina",
+    "Error" : "Errore",
+    "restored" : "ripristinati",
+    "Nothing in here. Your trash bin is empty!" : "Qui non c'è niente. Il tuo cestino è vuoto.",
+    "Name" : "Nome",
+    "Deleted" : "Eliminati",
+    "Delete" : "Elimina"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/it.json b/apps/files_trashbin/l10n/it.json
new file mode 100644
index 00000000000..25efb47a65a
--- /dev/null
+++ b/apps/files_trashbin/l10n/it.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Impossibile eliminare %s definitivamente",
+    "Couldn't restore %s" : "Impossibile ripristinare %s",
+    "Deleted files" : "File eliminati",
+    "Restore" : "Ripristina",
+    "Error" : "Errore",
+    "restored" : "ripristinati",
+    "Nothing in here. Your trash bin is empty!" : "Qui non c'è niente. Il tuo cestino è vuoto.",
+    "Name" : "Nome",
+    "Deleted" : "Eliminati",
+    "Delete" : "Elimina"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/it.php b/apps/files_trashbin/l10n/it.php
deleted file mode 100644
index 905384b82bb..00000000000
--- a/apps/files_trashbin/l10n/it.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Impossibile eliminare %s definitivamente",
-"Couldn't restore %s" => "Impossibile ripristinare %s",
-"Deleted files" => "File eliminati",
-"Restore" => "Ripristina",
-"Error" => "Errore",
-"restored" => "ripristinati",
-"Nothing in here. Your trash bin is empty!" => "Qui non c'è niente. Il tuo cestino è vuoto.",
-"Name" => "Nome",
-"Deleted" => "Eliminati",
-"Delete" => "Elimina"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ja.js b/apps/files_trashbin/l10n/ja.js
new file mode 100644
index 00000000000..dba8442c5d4
--- /dev/null
+++ b/apps/files_trashbin/l10n/ja.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "%s を完全に削除できませんでした",
+    "Couldn't restore %s" : "%s を復元できませんでした",
+    "Deleted files" : "ゴミ箱",
+    "Restore" : "復元",
+    "Error" : "エラー",
+    "restored" : "復元済",
+    "Nothing in here. Your trash bin is empty!" : "ここには何もありません。ゴミ箱は空です！",
+    "Name" : "名前",
+    "Deleted" : "削除日時",
+    "Delete" : "削除"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/ja.json b/apps/files_trashbin/l10n/ja.json
new file mode 100644
index 00000000000..cd6f6c37e12
--- /dev/null
+++ b/apps/files_trashbin/l10n/ja.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "%s を完全に削除できませんでした",
+    "Couldn't restore %s" : "%s を復元できませんでした",
+    "Deleted files" : "ゴミ箱",
+    "Restore" : "復元",
+    "Error" : "エラー",
+    "restored" : "復元済",
+    "Nothing in here. Your trash bin is empty!" : "ここには何もありません。ゴミ箱は空です！",
+    "Name" : "名前",
+    "Deleted" : "削除日時",
+    "Delete" : "削除"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ja.php b/apps/files_trashbin/l10n/ja.php
deleted file mode 100644
index 059579fc88d..00000000000
--- a/apps/files_trashbin/l10n/ja.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s を完全に削除できませんでした",
-"Couldn't restore %s" => "%s を復元できませんでした",
-"Deleted files" => "ゴミ箱",
-"Restore" => "復元",
-"Error" => "エラー",
-"restored" => "復元済",
-"Nothing in here. Your trash bin is empty!" => "ここには何もありません。ゴミ箱は空です！",
-"Name" => "名前",
-"Deleted" => "削除日時",
-"Delete" => "削除"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ka_GE.js b/apps/files_trashbin/l10n/ka_GE.js
new file mode 100644
index 00000000000..49f9fd4b0b0
--- /dev/null
+++ b/apps/files_trashbin/l10n/ka_GE.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
+    "Couldn't restore %s" : "%s–ის აღდგენა ვერ მოხერხდა",
+    "Deleted files" : "წაშლილი ფაილები",
+    "Restore" : "აღდგენა",
+    "Error" : "შეცდომა",
+    "Nothing in here. Your trash bin is empty!" : "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
+    "Name" : "სახელი",
+    "Deleted" : "წაშლილი",
+    "Delete" : "წაშლა"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/ka_GE.json b/apps/files_trashbin/l10n/ka_GE.json
new file mode 100644
index 00000000000..98b165a02dd
--- /dev/null
+++ b/apps/files_trashbin/l10n/ka_GE.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
+    "Couldn't restore %s" : "%s–ის აღდგენა ვერ მოხერხდა",
+    "Deleted files" : "წაშლილი ფაილები",
+    "Restore" : "აღდგენა",
+    "Error" : "შეცდომა",
+    "Nothing in here. Your trash bin is empty!" : "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
+    "Name" : "სახელი",
+    "Deleted" : "წაშლილი",
+    "Delete" : "წაშლა"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ka_GE.php b/apps/files_trashbin/l10n/ka_GE.php
deleted file mode 100644
index 16e147bd416..00000000000
--- a/apps/files_trashbin/l10n/ka_GE.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "ფაილი %s–ის სრულად წაშლა ვერ მოხერხდა",
-"Couldn't restore %s" => "%s–ის აღდგენა ვერ მოხერხდა",
-"Deleted files" => "წაშლილი ფაილები",
-"Restore" => "აღდგენა",
-"Error" => "შეცდომა",
-"Nothing in here. Your trash bin is empty!" => "აქ არაფერი არ არის. სანაგვე ყუთი ცარიელია!",
-"Name" => "სახელი",
-"Deleted" => "წაშლილი",
-"Delete" => "წაშლა"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/km.js b/apps/files_trashbin/l10n/km.js
new file mode 100644
index 00000000000..a5bac8c2bd6
--- /dev/null
+++ b/apps/files_trashbin/l10n/km.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "មិន​អាច​លុប %s ចោល​ជា​អចិន្ត្រៃយ៍​ទេ",
+    "Couldn't restore %s" : "មិន​អាច​ស្ដារ %s ឡើង​វិញ​បាន​ទេ",
+    "Deleted files" : "ឯកសារ​ដែល​បាន​លុប",
+    "Restore" : "ស្ដារ​មក​វិញ",
+    "Error" : "កំហុស",
+    "restored" : "បាន​ស្ដារ​វិញ",
+    "Nothing in here. Your trash bin is empty!" : "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ធុង​សំរាម​របស់​អ្នក​គឺ​ទទេ!",
+    "Name" : "ឈ្មោះ",
+    "Deleted" : "បាន​លុប",
+    "Delete" : "លុប"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/km.json b/apps/files_trashbin/l10n/km.json
new file mode 100644
index 00000000000..bda740966e8
--- /dev/null
+++ b/apps/files_trashbin/l10n/km.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "មិន​អាច​លុប %s ចោល​ជា​អចិន្ត្រៃយ៍​ទេ",
+    "Couldn't restore %s" : "មិន​អាច​ស្ដារ %s ឡើង​វិញ​បាន​ទេ",
+    "Deleted files" : "ឯកសារ​ដែល​បាន​លុប",
+    "Restore" : "ស្ដារ​មក​វិញ",
+    "Error" : "កំហុស",
+    "restored" : "បាន​ស្ដារ​វិញ",
+    "Nothing in here. Your trash bin is empty!" : "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ធុង​សំរាម​របស់​អ្នក​គឺ​ទទេ!",
+    "Name" : "ឈ្មោះ",
+    "Deleted" : "បាន​លុប",
+    "Delete" : "លុប"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/km.php b/apps/files_trashbin/l10n/km.php
deleted file mode 100644
index 40119afc878..00000000000
--- a/apps/files_trashbin/l10n/km.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "មិន​អាច​លុប %s ចោល​ជា​អចិន្ត្រៃយ៍​ទេ",
-"Couldn't restore %s" => "មិន​អាច​ស្ដារ %s ឡើង​វិញ​បាន​ទេ",
-"Deleted files" => "ឯកសារ​ដែល​បាន​លុប",
-"Restore" => "ស្ដារ​មក​វិញ",
-"Error" => "កំហុស",
-"restored" => "បាន​ស្ដារ​វិញ",
-"Nothing in here. Your trash bin is empty!" => "គ្មាន​អ្វី​នៅ​ទីនេះ​ទេ។ ធុង​សំរាម​របស់​អ្នក​គឺ​ទទេ!",
-"Name" => "ឈ្មោះ",
-"Deleted" => "បាន​លុប",
-"Delete" => "លុប"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ko.js b/apps/files_trashbin/l10n/ko.js
new file mode 100644
index 00000000000..6f3f68cc666
--- /dev/null
+++ b/apps/files_trashbin/l10n/ko.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "%s을(를_ 영구적으로 삭제할 수 없습니다",
+    "Couldn't restore %s" : "%s을(를) 복원할 수 없습니다",
+    "Deleted files" : "삭제된 파일",
+    "Restore" : "복원",
+    "Error" : "오류",
+    "restored" : "복원됨",
+    "Nothing in here. Your trash bin is empty!" : "휴지통이 비어 있습니다!",
+    "Name" : "이름",
+    "Deleted" : "삭제됨",
+    "Delete" : "삭제"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/ko.json b/apps/files_trashbin/l10n/ko.json
new file mode 100644
index 00000000000..834c798fb7f
--- /dev/null
+++ b/apps/files_trashbin/l10n/ko.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "%s을(를_ 영구적으로 삭제할 수 없습니다",
+    "Couldn't restore %s" : "%s을(를) 복원할 수 없습니다",
+    "Deleted files" : "삭제된 파일",
+    "Restore" : "복원",
+    "Error" : "오류",
+    "restored" : "복원됨",
+    "Nothing in here. Your trash bin is empty!" : "휴지통이 비어 있습니다!",
+    "Name" : "이름",
+    "Deleted" : "삭제됨",
+    "Delete" : "삭제"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ko.php b/apps/files_trashbin/l10n/ko.php
deleted file mode 100644
index 98800fd2e58..00000000000
--- a/apps/files_trashbin/l10n/ko.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s을(를_ 영구적으로 삭제할 수 없습니다",
-"Couldn't restore %s" => "%s을(를) 복원할 수 없습니다",
-"Deleted files" => "삭제된 파일",
-"Restore" => "복원",
-"Error" => "오류",
-"restored" => "복원됨",
-"Nothing in here. Your trash bin is empty!" => "휴지통이 비어 있습니다!",
-"Name" => "이름",
-"Deleted" => "삭제됨",
-"Delete" => "삭제"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/ku_IQ.js b/apps/files_trashbin/l10n/ku_IQ.js
new file mode 100644
index 00000000000..5169ba012e0
--- /dev/null
+++ b/apps/files_trashbin/l10n/ku_IQ.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "هه‌ڵه",
+    "Name" : "ناو"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/ku_IQ.json b/apps/files_trashbin/l10n/ku_IQ.json
new file mode 100644
index 00000000000..0aac36468eb
--- /dev/null
+++ b/apps/files_trashbin/l10n/ku_IQ.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Error" : "هه‌ڵه",
+    "Name" : "ناو"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ku_IQ.php b/apps/files_trashbin/l10n/ku_IQ.php
deleted file mode 100644
index c1962a4075d..00000000000
--- a/apps/files_trashbin/l10n/ku_IQ.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "هه‌ڵه",
-"Name" => "ناو"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lb.js b/apps/files_trashbin/l10n/lb.js
new file mode 100644
index 00000000000..001f64200c5
--- /dev/null
+++ b/apps/files_trashbin/l10n/lb.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Fehler",
+    "Name" : "Numm",
+    "Delete" : "Läschen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/lb.json b/apps/files_trashbin/l10n/lb.json
new file mode 100644
index 00000000000..2019dad0b75
--- /dev/null
+++ b/apps/files_trashbin/l10n/lb.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "Fehler",
+    "Name" : "Numm",
+    "Delete" : "Läschen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/lb.php b/apps/files_trashbin/l10n/lb.php
deleted file mode 100644
index b434ae72176..00000000000
--- a/apps/files_trashbin/l10n/lb.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Fehler",
-"Name" => "Numm",
-"Delete" => "Läschen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/lt_LT.js b/apps/files_trashbin/l10n/lt_LT.js
new file mode 100644
index 00000000000..b7a43703e83
--- /dev/null
+++ b/apps/files_trashbin/l10n/lt_LT.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nepavyko negrįžtamai ištrinti %s",
+    "Couldn't restore %s" : "Nepavyko atkurti %s",
+    "Deleted files" : "Ištrinti failai",
+    "Restore" : "Atstatyti",
+    "Error" : "Klaida",
+    "restored" : "atstatyta",
+    "Nothing in here. Your trash bin is empty!" : "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
+    "Name" : "Pavadinimas",
+    "Deleted" : "Ištrinti",
+    "Delete" : "Ištrinti"
+},
+"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_trashbin/l10n/lt_LT.json b/apps/files_trashbin/l10n/lt_LT.json
new file mode 100644
index 00000000000..7c572ddc20d
--- /dev/null
+++ b/apps/files_trashbin/l10n/lt_LT.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nepavyko negrįžtamai ištrinti %s",
+    "Couldn't restore %s" : "Nepavyko atkurti %s",
+    "Deleted files" : "Ištrinti failai",
+    "Restore" : "Atstatyti",
+    "Error" : "Klaida",
+    "restored" : "atstatyta",
+    "Nothing in here. Your trash bin is empty!" : "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
+    "Name" : "Pavadinimas",
+    "Deleted" : "Ištrinti",
+    "Delete" : "Ištrinti"
+},"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_trashbin/l10n/lt_LT.php b/apps/files_trashbin/l10n/lt_LT.php
deleted file mode 100644
index fa65d7eabac..00000000000
--- a/apps/files_trashbin/l10n/lt_LT.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nepavyko negrįžtamai ištrinti %s",
-"Couldn't restore %s" => "Nepavyko atkurti %s",
-"Deleted files" => "Ištrinti failai",
-"Restore" => "Atstatyti",
-"Error" => "Klaida",
-"restored" => "atstatyta",
-"Nothing in here. Your trash bin is empty!" => "Nieko nėra. Jūsų šiukšliadėžė tuščia!",
-"Name" => "Pavadinimas",
-"Deleted" => "Ištrinti",
-"Delete" => "Ištrinti"
-);
-$PLURAL_FORMS = "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_trashbin/l10n/lv.js b/apps/files_trashbin/l10n/lv.js
new file mode 100644
index 00000000000..463be504d54
--- /dev/null
+++ b/apps/files_trashbin/l10n/lv.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nevarēja pilnībā izdzēst %s",
+    "Couldn't restore %s" : "Nevarēja atjaunot %s",
+    "Deleted files" : "Dzēstās datnes",
+    "Restore" : "Atjaunot",
+    "Error" : "Kļūda",
+    "restored" : "atjaunots",
+    "Nothing in here. Your trash bin is empty!" : "Šeit nekā nav. Jūsu miskaste ir tukša!",
+    "Name" : "Nosaukums",
+    "Deleted" : "Dzēsts",
+    "Delete" : "Dzēst"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/files_trashbin/l10n/lv.json b/apps/files_trashbin/l10n/lv.json
new file mode 100644
index 00000000000..ad0e2aa9842
--- /dev/null
+++ b/apps/files_trashbin/l10n/lv.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nevarēja pilnībā izdzēst %s",
+    "Couldn't restore %s" : "Nevarēja atjaunot %s",
+    "Deleted files" : "Dzēstās datnes",
+    "Restore" : "Atjaunot",
+    "Error" : "Kļūda",
+    "restored" : "atjaunots",
+    "Nothing in here. Your trash bin is empty!" : "Šeit nekā nav. Jūsu miskaste ir tukša!",
+    "Name" : "Nosaukums",
+    "Deleted" : "Dzēsts",
+    "Delete" : "Dzēst"
+},"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_trashbin/l10n/lv.php b/apps/files_trashbin/l10n/lv.php
deleted file mode 100644
index 3432f9ac75e..00000000000
--- a/apps/files_trashbin/l10n/lv.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nevarēja pilnībā izdzēst %s",
-"Couldn't restore %s" => "Nevarēja atjaunot %s",
-"Deleted files" => "Dzēstās datnes",
-"Restore" => "Atjaunot",
-"Error" => "Kļūda",
-"restored" => "atjaunots",
-"Nothing in here. Your trash bin is empty!" => "Šeit nekā nav. Jūsu miskaste ir tukša!",
-"Name" => "Nosaukums",
-"Deleted" => "Dzēsts",
-"Delete" => "Dzēst"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_trashbin/l10n/mk.js b/apps/files_trashbin/l10n/mk.js
new file mode 100644
index 00000000000..6d74f64e37c
--- /dev/null
+++ b/apps/files_trashbin/l10n/mk.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Не можеше трајно да се избрише %s",
+    "Couldn't restore %s" : "Не можеше да се поврати %s",
+    "Deleted files" : "Избришани датотеки",
+    "Restore" : "Поврати",
+    "Error" : "Грешка",
+    "restored" : "повратени",
+    "Nothing in here. Your trash bin is empty!" : "Тука нема ништо. Вашата корпа за отпадоци е празна!",
+    "Name" : "Име",
+    "Deleted" : "Избришан",
+    "Delete" : "Избриши"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/files_trashbin/l10n/mk.json b/apps/files_trashbin/l10n/mk.json
new file mode 100644
index 00000000000..45eef9bfd61
--- /dev/null
+++ b/apps/files_trashbin/l10n/mk.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Не можеше трајно да се избрише %s",
+    "Couldn't restore %s" : "Не можеше да се поврати %s",
+    "Deleted files" : "Избришани датотеки",
+    "Restore" : "Поврати",
+    "Error" : "Грешка",
+    "restored" : "повратени",
+    "Nothing in here. Your trash bin is empty!" : "Тука нема ништо. Вашата корпа за отпадоци е празна!",
+    "Name" : "Име",
+    "Deleted" : "Избришан",
+    "Delete" : "Избриши"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/mk.php b/apps/files_trashbin/l10n/mk.php
deleted file mode 100644
index 66c2d0a2961..00000000000
--- a/apps/files_trashbin/l10n/mk.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Не можеше трајно да се избрише %s",
-"Couldn't restore %s" => "Не можеше да се поврати %s",
-"Deleted files" => "Избришани датотеки",
-"Restore" => "Поврати",
-"Error" => "Грешка",
-"restored" => "повратени",
-"Nothing in here. Your trash bin is empty!" => "Тука нема ништо. Вашата корпа за отпадоци е празна!",
-"Name" => "Име",
-"Deleted" => "Избришан",
-"Delete" => "Избриши"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_trashbin/l10n/ms_MY.js b/apps/files_trashbin/l10n/ms_MY.js
new file mode 100644
index 00000000000..6e7028832e6
--- /dev/null
+++ b/apps/files_trashbin/l10n/ms_MY.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Tidak dapat menghapuskan %s secara kekal",
+    "Couldn't restore %s" : "Tidak dapat memulihkan %s",
+    "Deleted files" : "Fail dipadam",
+    "Restore" : "Pulihkan",
+    "Error" : "Ralat",
+    "restored" : "dipulihkan",
+    "Nothing in here. Your trash bin is empty!" : "Tiada apa disini. Tong sampah anda kosong!",
+    "Name" : "Nama",
+    "Deleted" : "Dipadam",
+    "Delete" : "Padam"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/ms_MY.json b/apps/files_trashbin/l10n/ms_MY.json
new file mode 100644
index 00000000000..5bb1e815ffd
--- /dev/null
+++ b/apps/files_trashbin/l10n/ms_MY.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Tidak dapat menghapuskan %s secara kekal",
+    "Couldn't restore %s" : "Tidak dapat memulihkan %s",
+    "Deleted files" : "Fail dipadam",
+    "Restore" : "Pulihkan",
+    "Error" : "Ralat",
+    "restored" : "dipulihkan",
+    "Nothing in here. Your trash bin is empty!" : "Tiada apa disini. Tong sampah anda kosong!",
+    "Name" : "Nama",
+    "Deleted" : "Dipadam",
+    "Delete" : "Padam"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ms_MY.php b/apps/files_trashbin/l10n/ms_MY.php
deleted file mode 100644
index 55f26ba6efe..00000000000
--- a/apps/files_trashbin/l10n/ms_MY.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Tidak dapat menghapuskan %s secara kekal",
-"Couldn't restore %s" => "Tidak dapat memulihkan %s",
-"Deleted files" => "Fail dipadam",
-"Restore" => "Pulihkan",
-"Error" => "Ralat",
-"restored" => "dipulihkan",
-"Nothing in here. Your trash bin is empty!" => "Tiada apa disini. Tong sampah anda kosong!",
-"Name" => "Nama",
-"Deleted" => "Dipadam",
-"Delete" => "Padam"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/nb_NO.js b/apps/files_trashbin/l10n/nb_NO.js
new file mode 100644
index 00000000000..b5c2821a305
--- /dev/null
+++ b/apps/files_trashbin/l10n/nb_NO.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Kunne ikke slette %s fullstendig",
+    "Couldn't restore %s" : "Kunne ikke gjenopprette %s",
+    "Deleted files" : "Slettede filer",
+    "Restore" : "Gjenopprett",
+    "Error" : "Feil",
+    "restored" : "gjenopprettet",
+    "Nothing in here. Your trash bin is empty!" : "Ingenting her. Søppelkassen din er tom!",
+    "Name" : "Navn",
+    "Deleted" : "Slettet",
+    "Delete" : "Slett"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/nb_NO.json b/apps/files_trashbin/l10n/nb_NO.json
new file mode 100644
index 00000000000..a671f461155
--- /dev/null
+++ b/apps/files_trashbin/l10n/nb_NO.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Kunne ikke slette %s fullstendig",
+    "Couldn't restore %s" : "Kunne ikke gjenopprette %s",
+    "Deleted files" : "Slettede filer",
+    "Restore" : "Gjenopprett",
+    "Error" : "Feil",
+    "restored" : "gjenopprettet",
+    "Nothing in here. Your trash bin is empty!" : "Ingenting her. Søppelkassen din er tom!",
+    "Name" : "Navn",
+    "Deleted" : "Slettet",
+    "Delete" : "Slett"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/nb_NO.php b/apps/files_trashbin/l10n/nb_NO.php
deleted file mode 100644
index 519b4e5aa24..00000000000
--- a/apps/files_trashbin/l10n/nb_NO.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Kunne ikke slette %s fullstendig",
-"Couldn't restore %s" => "Kunne ikke gjenopprette %s",
-"Deleted files" => "Slettede filer",
-"Restore" => "Gjenopprett",
-"Error" => "Feil",
-"restored" => "gjenopprettet",
-"Nothing in here. Your trash bin is empty!" => "Ingenting her. Søppelkassen din er tom!",
-"Name" => "Navn",
-"Deleted" => "Slettet",
-"Delete" => "Slett"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nl.js b/apps/files_trashbin/l10n/nl.js
new file mode 100644
index 00000000000..3bd48a07eff
--- /dev/null
+++ b/apps/files_trashbin/l10n/nl.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Kon %s niet permanent verwijderen",
+    "Couldn't restore %s" : "Kon %s niet herstellen",
+    "Deleted files" : "Verwijderde bestanden",
+    "Restore" : "Herstellen",
+    "Error" : "Fout",
+    "restored" : "hersteld",
+    "Nothing in here. Your trash bin is empty!" : "Niets te vinden. Uw prullenbak is leeg!",
+    "Name" : "Naam",
+    "Deleted" : "Verwijderd",
+    "Delete" : "Verwijder"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/nl.json b/apps/files_trashbin/l10n/nl.json
new file mode 100644
index 00000000000..5d4134ed1ce
--- /dev/null
+++ b/apps/files_trashbin/l10n/nl.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Kon %s niet permanent verwijderen",
+    "Couldn't restore %s" : "Kon %s niet herstellen",
+    "Deleted files" : "Verwijderde bestanden",
+    "Restore" : "Herstellen",
+    "Error" : "Fout",
+    "restored" : "hersteld",
+    "Nothing in here. Your trash bin is empty!" : "Niets te vinden. Uw prullenbak is leeg!",
+    "Name" : "Naam",
+    "Deleted" : "Verwijderd",
+    "Delete" : "Verwijder"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/nl.php b/apps/files_trashbin/l10n/nl.php
deleted file mode 100644
index 41dfa86b7a7..00000000000
--- a/apps/files_trashbin/l10n/nl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Kon %s niet permanent verwijderen",
-"Couldn't restore %s" => "Kon %s niet herstellen",
-"Deleted files" => "Verwijderde bestanden",
-"Restore" => "Herstellen",
-"Error" => "Fout",
-"restored" => "hersteld",
-"Nothing in here. Your trash bin is empty!" => "Niets te vinden. Uw prullenbak is leeg!",
-"Name" => "Naam",
-"Deleted" => "Verwijderd",
-"Delete" => "Verwijder"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/nn_NO.js b/apps/files_trashbin/l10n/nn_NO.js
new file mode 100644
index 00000000000..2c42392757d
--- /dev/null
+++ b/apps/files_trashbin/l10n/nn_NO.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Klarte ikkje sletta %s for godt",
+    "Couldn't restore %s" : "Klarte ikkje gjenoppretta %s",
+    "Deleted files" : "Sletta filer",
+    "Restore" : "Gjenopprett",
+    "Error" : "Feil",
+    "restored" : "gjenoppretta",
+    "Nothing in here. Your trash bin is empty!" : "Ingenting her. Papirkorga di er tom!",
+    "Name" : "Namn",
+    "Deleted" : "Sletta",
+    "Delete" : "Slett"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/nn_NO.json b/apps/files_trashbin/l10n/nn_NO.json
new file mode 100644
index 00000000000..f5fe09fa06e
--- /dev/null
+++ b/apps/files_trashbin/l10n/nn_NO.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Klarte ikkje sletta %s for godt",
+    "Couldn't restore %s" : "Klarte ikkje gjenoppretta %s",
+    "Deleted files" : "Sletta filer",
+    "Restore" : "Gjenopprett",
+    "Error" : "Feil",
+    "restored" : "gjenoppretta",
+    "Nothing in here. Your trash bin is empty!" : "Ingenting her. Papirkorga di er tom!",
+    "Name" : "Namn",
+    "Deleted" : "Sletta",
+    "Delete" : "Slett"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/nn_NO.php b/apps/files_trashbin/l10n/nn_NO.php
deleted file mode 100644
index aa18927b1fd..00000000000
--- a/apps/files_trashbin/l10n/nn_NO.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Klarte ikkje sletta %s for godt",
-"Couldn't restore %s" => "Klarte ikkje gjenoppretta %s",
-"Deleted files" => "Sletta filer",
-"Restore" => "Gjenopprett",
-"Error" => "Feil",
-"restored" => "gjenoppretta",
-"Nothing in here. Your trash bin is empty!" => "Ingenting her. Papirkorga di er tom!",
-"Name" => "Namn",
-"Deleted" => "Sletta",
-"Delete" => "Slett"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/oc.js b/apps/files_trashbin/l10n/oc.js
new file mode 100644
index 00000000000..26e577443c0
--- /dev/null
+++ b/apps/files_trashbin/l10n/oc.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Error",
+    "Name" : "Nom",
+    "Delete" : "Escafa"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_trashbin/l10n/oc.json b/apps/files_trashbin/l10n/oc.json
new file mode 100644
index 00000000000..2ec4734761a
--- /dev/null
+++ b/apps/files_trashbin/l10n/oc.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "Error",
+    "Name" : "Nom",
+    "Delete" : "Escafa"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/oc.php b/apps/files_trashbin/l10n/oc.php
deleted file mode 100644
index b472683f08d..00000000000
--- a/apps/files_trashbin/l10n/oc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Error",
-"Name" => "Nom",
-"Delete" => "Escafa"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pa.js b/apps/files_trashbin/l10n/pa.js
new file mode 100644
index 00000000000..301d8f08c15
--- /dev/null
+++ b/apps/files_trashbin/l10n/pa.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "ਗਲਤੀ",
+    "Delete" : "ਹਟਾਓ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/pa.json b/apps/files_trashbin/l10n/pa.json
new file mode 100644
index 00000000000..6ad75a4c997
--- /dev/null
+++ b/apps/files_trashbin/l10n/pa.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Error" : "ਗਲਤੀ",
+    "Delete" : "ਹਟਾਓ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/pa.php b/apps/files_trashbin/l10n/pa.php
deleted file mode 100644
index 825a49aaea4..00000000000
--- a/apps/files_trashbin/l10n/pa.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "ਗਲਤੀ",
-"Delete" => "ਹਟਾਓ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/pl.js b/apps/files_trashbin/l10n/pl.js
new file mode 100644
index 00000000000..13053c3bae4
--- /dev/null
+++ b/apps/files_trashbin/l10n/pl.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nie można trwale usunąć %s",
+    "Couldn't restore %s" : "Nie można przywrócić %s",
+    "Deleted files" : "Usunięte pliki",
+    "Restore" : "Przywróć",
+    "Error" : "Błąd",
+    "restored" : "przywrócony",
+    "Nothing in here. Your trash bin is empty!" : "Nic tu nie ma. Twój kosz jest pusty!",
+    "Name" : "Nazwa",
+    "Deleted" : "Usunięte",
+    "Delete" : "Usuń"
+},
+"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_trashbin/l10n/pl.json b/apps/files_trashbin/l10n/pl.json
new file mode 100644
index 00000000000..edb0a2daafa
--- /dev/null
+++ b/apps/files_trashbin/l10n/pl.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nie można trwale usunąć %s",
+    "Couldn't restore %s" : "Nie można przywrócić %s",
+    "Deleted files" : "Usunięte pliki",
+    "Restore" : "Przywróć",
+    "Error" : "Błąd",
+    "restored" : "przywrócony",
+    "Nothing in here. Your trash bin is empty!" : "Nic tu nie ma. Twój kosz jest pusty!",
+    "Name" : "Nazwa",
+    "Deleted" : "Usunięte",
+    "Delete" : "Usuń"
+},"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_trashbin/l10n/pl.php b/apps/files_trashbin/l10n/pl.php
deleted file mode 100644
index 9b5b923aa5e..00000000000
--- a/apps/files_trashbin/l10n/pl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nie można trwale usunąć %s",
-"Couldn't restore %s" => "Nie można przywrócić %s",
-"Deleted files" => "Usunięte pliki",
-"Restore" => "Przywróć",
-"Error" => "Błąd",
-"restored" => "przywrócony",
-"Nothing in here. Your trash bin is empty!" => "Nic tu nie ma. Twój kosz jest pusty!",
-"Name" => "Nazwa",
-"Deleted" => "Usunięte",
-"Delete" => "Usuń"
-);
-$PLURAL_FORMS = "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_trashbin/l10n/pt_BR.js b/apps/files_trashbin/l10n/pt_BR.js
new file mode 100644
index 00000000000..f1b7e447381
--- /dev/null
+++ b/apps/files_trashbin/l10n/pt_BR.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Não foi possível excluir %s permanentemente",
+    "Couldn't restore %s" : "Não foi possível restaurar %s",
+    "Deleted files" : "Arquivos apagados",
+    "Restore" : "Restaurar",
+    "Error" : "Erro",
+    "restored" : "restaurado",
+    "Nothing in here. Your trash bin is empty!" : "Nada aqui. Sua lixeira está vazia!",
+    "Name" : "Nome",
+    "Deleted" : "Excluído",
+    "Delete" : "Excluir"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_trashbin/l10n/pt_BR.json b/apps/files_trashbin/l10n/pt_BR.json
new file mode 100644
index 00000000000..801f91f18bd
--- /dev/null
+++ b/apps/files_trashbin/l10n/pt_BR.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Não foi possível excluir %s permanentemente",
+    "Couldn't restore %s" : "Não foi possível restaurar %s",
+    "Deleted files" : "Arquivos apagados",
+    "Restore" : "Restaurar",
+    "Error" : "Erro",
+    "restored" : "restaurado",
+    "Nothing in here. Your trash bin is empty!" : "Nada aqui. Sua lixeira está vazia!",
+    "Name" : "Nome",
+    "Deleted" : "Excluído",
+    "Delete" : "Excluir"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/pt_BR.php b/apps/files_trashbin/l10n/pt_BR.php
deleted file mode 100644
index b7dd346b40a..00000000000
--- a/apps/files_trashbin/l10n/pt_BR.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Não foi possível excluir %s permanentemente",
-"Couldn't restore %s" => "Não foi possível restaurar %s",
-"Deleted files" => "Arquivos apagados",
-"Restore" => "Restaurar",
-"Error" => "Erro",
-"restored" => "restaurado",
-"Nothing in here. Your trash bin is empty!" => "Nada aqui. Sua lixeira está vazia!",
-"Name" => "Nome",
-"Deleted" => "Excluído",
-"Delete" => "Excluir"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/pt_PT.js b/apps/files_trashbin/l10n/pt_PT.js
new file mode 100644
index 00000000000..5d22e3bca21
--- /dev/null
+++ b/apps/files_trashbin/l10n/pt_PT.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Não foi possível eliminar %s de forma permanente",
+    "Couldn't restore %s" : "Não foi possível restaurar %s",
+    "Deleted files" : "Ficheiros eliminados",
+    "Restore" : "Restaurar",
+    "Error" : "Erro",
+    "restored" : "Restaurado",
+    "Nothing in here. Your trash bin is empty!" : "Não hà ficheiros. O lixo está vazio!",
+    "Name" : "Nome",
+    "Deleted" : "Apagado",
+    "Delete" : "Eliminar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/pt_PT.json b/apps/files_trashbin/l10n/pt_PT.json
new file mode 100644
index 00000000000..4feb75abd9a
--- /dev/null
+++ b/apps/files_trashbin/l10n/pt_PT.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Não foi possível eliminar %s de forma permanente",
+    "Couldn't restore %s" : "Não foi possível restaurar %s",
+    "Deleted files" : "Ficheiros eliminados",
+    "Restore" : "Restaurar",
+    "Error" : "Erro",
+    "restored" : "Restaurado",
+    "Nothing in here. Your trash bin is empty!" : "Não hà ficheiros. O lixo está vazio!",
+    "Name" : "Nome",
+    "Deleted" : "Apagado",
+    "Delete" : "Eliminar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/pt_PT.php b/apps/files_trashbin/l10n/pt_PT.php
deleted file mode 100644
index 8a18d842c93..00000000000
--- a/apps/files_trashbin/l10n/pt_PT.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Não foi possível eliminar %s de forma permanente",
-"Couldn't restore %s" => "Não foi possível restaurar %s",
-"Deleted files" => "Ficheiros eliminados",
-"Restore" => "Restaurar",
-"Error" => "Erro",
-"restored" => "Restaurado",
-"Nothing in here. Your trash bin is empty!" => "Não hà ficheiros. O lixo está vazio!",
-"Name" => "Nome",
-"Deleted" => "Apagado",
-"Delete" => "Eliminar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ro.js b/apps/files_trashbin/l10n/ro.js
new file mode 100644
index 00000000000..c0ba5741695
--- /dev/null
+++ b/apps/files_trashbin/l10n/ro.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Deleted files" : "Sterge fisierele",
+    "Restore" : "Restabilire",
+    "Error" : "Eroare",
+    "Name" : "Nume",
+    "Delete" : "Șterge"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files_trashbin/l10n/ro.json b/apps/files_trashbin/l10n/ro.json
new file mode 100644
index 00000000000..d0c02197e46
--- /dev/null
+++ b/apps/files_trashbin/l10n/ro.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Deleted files" : "Sterge fisierele",
+    "Restore" : "Restabilire",
+    "Error" : "Eroare",
+    "Name" : "Nume",
+    "Delete" : "Șterge"
+},"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_trashbin/l10n/ro.php b/apps/files_trashbin/l10n/ro.php
deleted file mode 100644
index eb8d6b81b7d..00000000000
--- a/apps/files_trashbin/l10n/ro.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deleted files" => "Sterge fisierele",
-"Restore" => "Restabilire",
-"Error" => "Eroare",
-"Name" => "Nume",
-"Delete" => "Șterge"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_trashbin/l10n/ru.js b/apps/files_trashbin/l10n/ru.js
new file mode 100644
index 00000000000..dbb2df1f704
--- /dev/null
+++ b/apps/files_trashbin/l10n/ru.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "%s не может быть удалён навсегда",
+    "Couldn't restore %s" : "%s не может быть восстановлен",
+    "Deleted files" : "Удалённые файлы",
+    "Restore" : "Восстановить",
+    "Error" : "Ошибка",
+    "restored" : "восстановлен",
+    "Nothing in here. Your trash bin is empty!" : "Здесь ничего нет. Ваша корзина пуста!",
+    "Name" : "Имя",
+    "Deleted" : "Удалён",
+    "Delete" : "Удалить"
+},
+"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_trashbin/l10n/ru.json b/apps/files_trashbin/l10n/ru.json
new file mode 100644
index 00000000000..3e67045967d
--- /dev/null
+++ b/apps/files_trashbin/l10n/ru.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "%s не может быть удалён навсегда",
+    "Couldn't restore %s" : "%s не может быть восстановлен",
+    "Deleted files" : "Удалённые файлы",
+    "Restore" : "Восстановить",
+    "Error" : "Ошибка",
+    "restored" : "восстановлен",
+    "Nothing in here. Your trash bin is empty!" : "Здесь ничего нет. Ваша корзина пуста!",
+    "Name" : "Имя",
+    "Deleted" : "Удалён",
+    "Delete" : "Удалить"
+},"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_trashbin/l10n/ru.php b/apps/files_trashbin/l10n/ru.php
deleted file mode 100644
index 8d00e082418..00000000000
--- a/apps/files_trashbin/l10n/ru.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s не может быть удалён навсегда",
-"Couldn't restore %s" => "%s не может быть восстановлен",
-"Deleted files" => "Удалённые файлы",
-"Restore" => "Восстановить",
-"Error" => "Ошибка",
-"restored" => "восстановлен",
-"Nothing in here. Your trash bin is empty!" => "Здесь ничего нет. Ваша корзина пуста!",
-"Name" => "Имя",
-"Deleted" => "Удалён",
-"Delete" => "Удалить"
-);
-$PLURAL_FORMS = "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_trashbin/l10n/si_LK.js b/apps/files_trashbin/l10n/si_LK.js
new file mode 100644
index 00000000000..2f8a62ccab8
--- /dev/null
+++ b/apps/files_trashbin/l10n/si_LK.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "දෝෂයක්",
+    "Name" : "නම",
+    "Delete" : "මකා දමන්න"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/si_LK.json b/apps/files_trashbin/l10n/si_LK.json
new file mode 100644
index 00000000000..c46fb9adcbc
--- /dev/null
+++ b/apps/files_trashbin/l10n/si_LK.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "දෝෂයක්",
+    "Name" : "නම",
+    "Delete" : "මකා දමන්න"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/si_LK.php b/apps/files_trashbin/l10n/si_LK.php
deleted file mode 100644
index 87e928989e4..00000000000
--- a/apps/files_trashbin/l10n/si_LK.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "දෝෂයක්",
-"Name" => "නම",
-"Delete" => "මකා දමන්න"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sk_SK.js b/apps/files_trashbin/l10n/sk_SK.js
new file mode 100644
index 00000000000..9069b4ea509
--- /dev/null
+++ b/apps/files_trashbin/l10n/sk_SK.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nemožno zmazať %s navždy",
+    "Couldn't restore %s" : "Nemožno obnoviť %s",
+    "Deleted files" : "Zmazané súbory",
+    "Restore" : "Obnoviť",
+    "Error" : "Chyba",
+    "restored" : "obnovené",
+    "Nothing in here. Your trash bin is empty!" : "Žiadny obsah. Kôš je prázdny!",
+    "Name" : "Názov",
+    "Deleted" : "Zmazané",
+    "Delete" : "Zmazať"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_trashbin/l10n/sk_SK.json b/apps/files_trashbin/l10n/sk_SK.json
new file mode 100644
index 00000000000..e3b95e1d591
--- /dev/null
+++ b/apps/files_trashbin/l10n/sk_SK.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nemožno zmazať %s navždy",
+    "Couldn't restore %s" : "Nemožno obnoviť %s",
+    "Deleted files" : "Zmazané súbory",
+    "Restore" : "Obnoviť",
+    "Error" : "Chyba",
+    "restored" : "obnovené",
+    "Nothing in here. Your trash bin is empty!" : "Žiadny obsah. Kôš je prázdny!",
+    "Name" : "Názov",
+    "Deleted" : "Zmazané",
+    "Delete" : "Zmazať"
+},"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/sk_SK.php b/apps/files_trashbin/l10n/sk_SK.php
deleted file mode 100644
index 7588b555d96..00000000000
--- a/apps/files_trashbin/l10n/sk_SK.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nemožno zmazať %s navždy",
-"Couldn't restore %s" => "Nemožno obnoviť %s",
-"Deleted files" => "Zmazané súbory",
-"Restore" => "Obnoviť",
-"Error" => "Chyba",
-"restored" => "obnovené",
-"Nothing in here. Your trash bin is empty!" => "Žiadny obsah. Kôš je prázdny!",
-"Name" => "Názov",
-"Deleted" => "Zmazané",
-"Delete" => "Zmazať"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_trashbin/l10n/sl.js b/apps/files_trashbin/l10n/sl.js
new file mode 100644
index 00000000000..60cecde1cb8
--- /dev/null
+++ b/apps/files_trashbin/l10n/sl.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Datoteke %s ni mogoče trajno izbrisati.",
+    "Couldn't restore %s" : "Ni mogoče obnoviti %s",
+    "Deleted files" : "Izbrisane datoteke",
+    "Restore" : "Obnovi",
+    "Error" : "Napaka",
+    "restored" : "obnovljeno",
+    "Nothing in here. Your trash bin is empty!" : "Mapa smeti je prazna.",
+    "Name" : "Ime",
+    "Deleted" : "Izbrisano",
+    "Delete" : "Izbriši"
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/files_trashbin/l10n/sl.json b/apps/files_trashbin/l10n/sl.json
new file mode 100644
index 00000000000..0431bb30997
--- /dev/null
+++ b/apps/files_trashbin/l10n/sl.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Datoteke %s ni mogoče trajno izbrisati.",
+    "Couldn't restore %s" : "Ni mogoče obnoviti %s",
+    "Deleted files" : "Izbrisane datoteke",
+    "Restore" : "Obnovi",
+    "Error" : "Napaka",
+    "restored" : "obnovljeno",
+    "Nothing in here. Your trash bin is empty!" : "Mapa smeti je prazna.",
+    "Name" : "Ime",
+    "Deleted" : "Izbrisano",
+    "Delete" : "Izbriši"
+},"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_trashbin/l10n/sl.php b/apps/files_trashbin/l10n/sl.php
deleted file mode 100644
index f9dc5112ac3..00000000000
--- a/apps/files_trashbin/l10n/sl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Datoteke %s ni mogoče trajno izbrisati.",
-"Couldn't restore %s" => "Ni mogoče obnoviti %s",
-"Deleted files" => "Izbrisane datoteke",
-"Restore" => "Obnovi",
-"Error" => "Napaka",
-"restored" => "obnovljeno",
-"Nothing in here. Your trash bin is empty!" => "Mapa smeti je prazna.",
-"Name" => "Ime",
-"Deleted" => "Izbrisano",
-"Delete" => "Izbriši"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/files_trashbin/l10n/sq.js b/apps/files_trashbin/l10n/sq.js
new file mode 100644
index 00000000000..6c4e2b4461f
--- /dev/null
+++ b/apps/files_trashbin/l10n/sq.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Nuk munda ta eliminoj përfundimisht %s",
+    "Couldn't restore %s" : "Nuk munda ta rivendos %s",
+    "Deleted files" : "Skedarë të fshirë ",
+    "Restore" : "Rivendos",
+    "Error" : "Veprim i gabuar",
+    "restored" : "rivendosur",
+    "Nothing in here. Your trash bin is empty!" : "Këtu nuk ka asgjë. Koshi juaj është bosh!",
+    "Name" : "Emri",
+    "Deleted" : "Eliminuar",
+    "Delete" : "Elimino"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/sq.json b/apps/files_trashbin/l10n/sq.json
new file mode 100644
index 00000000000..fc766582d5f
--- /dev/null
+++ b/apps/files_trashbin/l10n/sq.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Nuk munda ta eliminoj përfundimisht %s",
+    "Couldn't restore %s" : "Nuk munda ta rivendos %s",
+    "Deleted files" : "Skedarë të fshirë ",
+    "Restore" : "Rivendos",
+    "Error" : "Veprim i gabuar",
+    "restored" : "rivendosur",
+    "Nothing in here. Your trash bin is empty!" : "Këtu nuk ka asgjë. Koshi juaj është bosh!",
+    "Name" : "Emri",
+    "Deleted" : "Eliminuar",
+    "Delete" : "Elimino"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/sq.php b/apps/files_trashbin/l10n/sq.php
deleted file mode 100644
index 9e16b7a7bfd..00000000000
--- a/apps/files_trashbin/l10n/sq.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Nuk munda ta eliminoj përfundimisht %s",
-"Couldn't restore %s" => "Nuk munda ta rivendos %s",
-"Deleted files" => "Skedarë të fshirë ",
-"Restore" => "Rivendos",
-"Error" => "Veprim i gabuar",
-"restored" => "rivendosur",
-"Nothing in here. Your trash bin is empty!" => "Këtu nuk ka asgjë. Koshi juaj është bosh!",
-"Name" => "Emri",
-"Deleted" => "Eliminuar",
-"Delete" => "Elimino"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/sr.js b/apps/files_trashbin/l10n/sr.js
new file mode 100644
index 00000000000..fdaae6185ad
--- /dev/null
+++ b/apps/files_trashbin/l10n/sr.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Deleted files" : "Обрисане датотеке",
+    "Restore" : "Врати",
+    "Error" : "Грешка",
+    "Nothing in here. Your trash bin is empty!" : "Овде нема ништа. Корпа за отпатке је празна.",
+    "Name" : "Име",
+    "Deleted" : "Обрисано",
+    "Delete" : "Обриши"
+},
+"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_trashbin/l10n/sr.json b/apps/files_trashbin/l10n/sr.json
new file mode 100644
index 00000000000..d4d8c91bf17
--- /dev/null
+++ b/apps/files_trashbin/l10n/sr.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Deleted files" : "Обрисане датотеке",
+    "Restore" : "Врати",
+    "Error" : "Грешка",
+    "Nothing in here. Your trash bin is empty!" : "Овде нема ништа. Корпа за отпатке је празна.",
+    "Name" : "Име",
+    "Deleted" : "Обрисано",
+    "Delete" : "Обриши"
+},"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_trashbin/l10n/sr.php b/apps/files_trashbin/l10n/sr.php
deleted file mode 100644
index d4abc908c91..00000000000
--- a/apps/files_trashbin/l10n/sr.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deleted files" => "Обрисане датотеке",
-"Restore" => "Врати",
-"Error" => "Грешка",
-"Nothing in here. Your trash bin is empty!" => "Овде нема ништа. Корпа за отпатке је празна.",
-"Name" => "Име",
-"Deleted" => "Обрисано",
-"Delete" => "Обриши"
-);
-$PLURAL_FORMS = "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_trashbin/l10n/sr@latin.js b/apps/files_trashbin/l10n/sr@latin.js
new file mode 100644
index 00000000000..ee9560bf680
--- /dev/null
+++ b/apps/files_trashbin/l10n/sr@latin.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Greška",
+    "Name" : "Ime",
+    "Delete" : "Obriši"
+},
+"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_trashbin/l10n/sr@latin.json b/apps/files_trashbin/l10n/sr@latin.json
new file mode 100644
index 00000000000..3f64cf8f2b9
--- /dev/null
+++ b/apps/files_trashbin/l10n/sr@latin.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "Greška",
+    "Name" : "Ime",
+    "Delete" : "Obriš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);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/sr@latin.php b/apps/files_trashbin/l10n/sr@latin.php
deleted file mode 100644
index 9f18ac8be7d..00000000000
--- a/apps/files_trashbin/l10n/sr@latin.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Greška",
-"Name" => "Ime",
-"Delete" => "Obriši"
-);
-$PLURAL_FORMS = "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_trashbin/l10n/sv.js b/apps/files_trashbin/l10n/sv.js
new file mode 100644
index 00000000000..eb7ad2dcd41
--- /dev/null
+++ b/apps/files_trashbin/l10n/sv.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Kunde inte radera %s permanent",
+    "Couldn't restore %s" : "Kunde inte återställa %s",
+    "Deleted files" : "Raderade filer",
+    "Restore" : "Återskapa",
+    "Error" : "Fel",
+    "restored" : "återställd",
+    "Nothing in here. Your trash bin is empty!" : "Ingenting här. Din papperskorg är tom!",
+    "Name" : "Namn",
+    "Deleted" : "Raderad",
+    "Delete" : "Radera"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/sv.json b/apps/files_trashbin/l10n/sv.json
new file mode 100644
index 00000000000..114b5f7738b
--- /dev/null
+++ b/apps/files_trashbin/l10n/sv.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Kunde inte radera %s permanent",
+    "Couldn't restore %s" : "Kunde inte återställa %s",
+    "Deleted files" : "Raderade filer",
+    "Restore" : "Återskapa",
+    "Error" : "Fel",
+    "restored" : "återställd",
+    "Nothing in here. Your trash bin is empty!" : "Ingenting här. Din papperskorg är tom!",
+    "Name" : "Namn",
+    "Deleted" : "Raderad",
+    "Delete" : "Radera"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/sv.php b/apps/files_trashbin/l10n/sv.php
deleted file mode 100644
index 330bcc34821..00000000000
--- a/apps/files_trashbin/l10n/sv.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Kunde inte radera %s permanent",
-"Couldn't restore %s" => "Kunde inte återställa %s",
-"Deleted files" => "Raderade filer",
-"Restore" => "Återskapa",
-"Error" => "Fel",
-"restored" => "återställd",
-"Nothing in here. Your trash bin is empty!" => "Ingenting här. Din papperskorg är tom!",
-"Name" => "Namn",
-"Deleted" => "Raderad",
-"Delete" => "Radera"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/ta_LK.js b/apps/files_trashbin/l10n/ta_LK.js
new file mode 100644
index 00000000000..cd53239625e
--- /dev/null
+++ b/apps/files_trashbin/l10n/ta_LK.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "வழு",
+    "Name" : "பெயர்",
+    "Delete" : "நீக்குக"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/ta_LK.json b/apps/files_trashbin/l10n/ta_LK.json
new file mode 100644
index 00000000000..ade1c7f13e0
--- /dev/null
+++ b/apps/files_trashbin/l10n/ta_LK.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "வழு",
+    "Name" : "பெயர்",
+    "Delete" : "நீக்குக"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ta_LK.php b/apps/files_trashbin/l10n/ta_LK.php
deleted file mode 100644
index 79349919b52..00000000000
--- a/apps/files_trashbin/l10n/ta_LK.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "வழு",
-"Name" => "பெயர்",
-"Delete" => "நீக்குக"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/te.js b/apps/files_trashbin/l10n/te.js
new file mode 100644
index 00000000000..505aced8869
--- /dev/null
+++ b/apps/files_trashbin/l10n/te.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "పొరపాటు",
+    "Name" : "పేరు",
+    "Delete" : "తొలగించు"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/te.json b/apps/files_trashbin/l10n/te.json
new file mode 100644
index 00000000000..37f365e370d
--- /dev/null
+++ b/apps/files_trashbin/l10n/te.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "పొరపాటు",
+    "Name" : "పేరు",
+    "Delete" : "తొలగించు"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/te.php b/apps/files_trashbin/l10n/te.php
deleted file mode 100644
index 01262b78232..00000000000
--- a/apps/files_trashbin/l10n/te.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "పొరపాటు",
-"Name" => "పేరు",
-"Delete" => "తొలగించు"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/th_TH.js b/apps/files_trashbin/l10n/th_TH.js
new file mode 100644
index 00000000000..77ccd12dd44
--- /dev/null
+++ b/apps/files_trashbin/l10n/th_TH.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Restore" : "คืนค่า",
+    "Error" : "ข้อผิดพลาด",
+    "Nothing in here. Your trash bin is empty!" : "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
+    "Name" : "ชื่อ",
+    "Deleted" : "ลบแล้ว",
+    "Delete" : "ลบ"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/th_TH.json b/apps/files_trashbin/l10n/th_TH.json
new file mode 100644
index 00000000000..550ff568061
--- /dev/null
+++ b/apps/files_trashbin/l10n/th_TH.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Restore" : "คืนค่า",
+    "Error" : "ข้อผิดพลาด",
+    "Nothing in here. Your trash bin is empty!" : "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
+    "Name" : "ชื่อ",
+    "Deleted" : "ลบแล้ว",
+    "Delete" : "ลบ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/th_TH.php b/apps/files_trashbin/l10n/th_TH.php
deleted file mode 100644
index 47c3450d2ea..00000000000
--- a/apps/files_trashbin/l10n/th_TH.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Restore" => "คืนค่า",
-"Error" => "ข้อผิดพลาด",
-"Nothing in here. Your trash bin is empty!" => "ไม่มีอะไรอยู่ในนี้ ถังขยะของคุณยังว่างอยู่",
-"Name" => "ชื่อ",
-"Deleted" => "ลบแล้ว",
-"Delete" => "ลบ"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/tr.js b/apps/files_trashbin/l10n/tr.js
new file mode 100644
index 00000000000..f8e8b4daff1
--- /dev/null
+++ b/apps/files_trashbin/l10n/tr.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "%s kalıcı olarak silinemedi",
+    "Couldn't restore %s" : "%s geri yüklenemedi",
+    "Deleted files" : "Silinmiş dosyalar",
+    "Restore" : "Geri yükle",
+    "Error" : "Hata",
+    "restored" : "geri yüklendi",
+    "Nothing in here. Your trash bin is empty!" : "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!",
+    "Name" : "İsim",
+    "Deleted" : "Silinme",
+    "Delete" : "Sil"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_trashbin/l10n/tr.json b/apps/files_trashbin/l10n/tr.json
new file mode 100644
index 00000000000..d000f31a743
--- /dev/null
+++ b/apps/files_trashbin/l10n/tr.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "%s kalıcı olarak silinemedi",
+    "Couldn't restore %s" : "%s geri yüklenemedi",
+    "Deleted files" : "Silinmiş dosyalar",
+    "Restore" : "Geri yükle",
+    "Error" : "Hata",
+    "restored" : "geri yüklendi",
+    "Nothing in here. Your trash bin is empty!" : "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!",
+    "Name" : "İsim",
+    "Deleted" : "Silinme",
+    "Delete" : "Sil"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/tr.php b/apps/files_trashbin/l10n/tr.php
deleted file mode 100644
index b69d29498d7..00000000000
--- a/apps/files_trashbin/l10n/tr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "%s kalıcı olarak silinemedi",
-"Couldn't restore %s" => "%s geri yüklenemedi",
-"Deleted files" => "Silinmiş dosyalar",
-"Restore" => "Geri yükle",
-"Error" => "Hata",
-"restored" => "geri yüklendi",
-"Nothing in here. Your trash bin is empty!" => "Burada hiçbir şey yok. Çöp kutunuz tamamen boş!",
-"Name" => "İsim",
-"Deleted" => "Silinme",
-"Delete" => "Sil"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_trashbin/l10n/ug.js b/apps/files_trashbin/l10n/ug.js
new file mode 100644
index 00000000000..e67cbf85809
--- /dev/null
+++ b/apps/files_trashbin/l10n/ug.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Deleted files" : "ئۆچۈرۈلگەن ھۆججەتلەر",
+    "Error" : "خاتالىق",
+    "Nothing in here. Your trash bin is empty!" : "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
+    "Name" : "ئاتى",
+    "Deleted" : "ئۆچۈرۈلدى",
+    "Delete" : "ئۆچۈر"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/ug.json b/apps/files_trashbin/l10n/ug.json
new file mode 100644
index 00000000000..8ed6b5cdd80
--- /dev/null
+++ b/apps/files_trashbin/l10n/ug.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Deleted files" : "ئۆچۈرۈلگەن ھۆججەتلەر",
+    "Error" : "خاتالىق",
+    "Nothing in here. Your trash bin is empty!" : "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
+    "Name" : "ئاتى",
+    "Deleted" : "ئۆچۈرۈلدى",
+    "Delete" : "ئۆچۈر"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ug.php b/apps/files_trashbin/l10n/ug.php
deleted file mode 100644
index f52f28db49b..00000000000
--- a/apps/files_trashbin/l10n/ug.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deleted files" => "ئۆچۈرۈلگەن ھۆججەتلەر",
-"Error" => "خاتالىق",
-"Nothing in here. Your trash bin is empty!" => "بۇ جايدا ھېچنېمە يوق. Your trash bin is empty!",
-"Name" => "ئاتى",
-"Deleted" => "ئۆچۈرۈلدى",
-"Delete" => "ئۆچۈر"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/uk.js b/apps/files_trashbin/l10n/uk.js
new file mode 100644
index 00000000000..0d778f21ad9
--- /dev/null
+++ b/apps/files_trashbin/l10n/uk.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Неможливо видалити %s назавжди",
+    "Couldn't restore %s" : "Неможливо відновити %s",
+    "Deleted files" : "Видалені файли",
+    "Restore" : "Відновити",
+    "Error" : "Помилка",
+    "restored" : "відновлено",
+    "Nothing in here. Your trash bin is empty!" : "Нічого немає. Ваший кошик для сміття пустий!",
+    "Name" : "Ім'я",
+    "Deleted" : "Видалено",
+    "Delete" : "Видалити"
+},
+"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_trashbin/l10n/uk.json b/apps/files_trashbin/l10n/uk.json
new file mode 100644
index 00000000000..77e9b53896c
--- /dev/null
+++ b/apps/files_trashbin/l10n/uk.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Неможливо видалити %s назавжди",
+    "Couldn't restore %s" : "Неможливо відновити %s",
+    "Deleted files" : "Видалені файли",
+    "Restore" : "Відновити",
+    "Error" : "Помилка",
+    "restored" : "відновлено",
+    "Nothing in here. Your trash bin is empty!" : "Нічого немає. Ваший кошик для сміття пустий!",
+    "Name" : "Ім'я",
+    "Deleted" : "Видалено",
+    "Delete" : "Видалити"
+},"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_trashbin/l10n/uk.php b/apps/files_trashbin/l10n/uk.php
deleted file mode 100644
index 406bd520c29..00000000000
--- a/apps/files_trashbin/l10n/uk.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Неможливо видалити %s назавжди",
-"Couldn't restore %s" => "Неможливо відновити %s",
-"Deleted files" => "Видалені файли",
-"Restore" => "Відновити",
-"Error" => "Помилка",
-"restored" => "відновлено",
-"Nothing in here. Your trash bin is empty!" => "Нічого немає. Ваший кошик для сміття пустий!",
-"Name" => "Ім'я",
-"Deleted" => "Видалено",
-"Delete" => "Видалити"
-);
-$PLURAL_FORMS = "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_trashbin/l10n/ur_PK.js b/apps/files_trashbin/l10n/ur_PK.js
new file mode 100644
index 00000000000..4235475115c
--- /dev/null
+++ b/apps/files_trashbin/l10n/ur_PK.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "حذف نہیں ہو سکتا %s مستقل طور پر",
+    "Couldn't restore %s" : "بحال نہيں کيا جا سکتا %s",
+    "Deleted files" : "حذف شدہ فائليں",
+    "Restore" : "بحال",
+    "Error" : "ایرر",
+    "restored" : "بحال شدہ",
+    "Nothing in here. Your trash bin is empty!" : " یہاں کچھ بھی نہیں .آپکی ردی کی ٹوکری خالی ہے.",
+    "Name" : "اسم",
+    "Deleted" : "حذف شدہ ",
+    "Delete" : "حذف کریں"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/ur_PK.json b/apps/files_trashbin/l10n/ur_PK.json
new file mode 100644
index 00000000000..609b83e75c3
--- /dev/null
+++ b/apps/files_trashbin/l10n/ur_PK.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "حذف نہیں ہو سکتا %s مستقل طور پر",
+    "Couldn't restore %s" : "بحال نہيں کيا جا سکتا %s",
+    "Deleted files" : "حذف شدہ فائليں",
+    "Restore" : "بحال",
+    "Error" : "ایرر",
+    "restored" : "بحال شدہ",
+    "Nothing in here. Your trash bin is empty!" : " یہاں کچھ بھی نہیں .آپکی ردی کی ٹوکری خالی ہے.",
+    "Name" : "اسم",
+    "Deleted" : "حذف شدہ ",
+    "Delete" : "حذف کریں"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/ur_PK.php b/apps/files_trashbin/l10n/ur_PK.php
deleted file mode 100644
index fc71b528ced..00000000000
--- a/apps/files_trashbin/l10n/ur_PK.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "حذف نہیں ہو سکتا %s مستقل طور پر",
-"Couldn't restore %s" => "بحال نہيں کيا جا سکتا %s",
-"Deleted files" => "حذف شدہ فائليں",
-"Restore" => "بحال",
-"Error" => "ایرر",
-"restored" => "بحال شدہ",
-"Nothing in here. Your trash bin is empty!" => " یہاں کچھ بھی نہیں .آپکی ردی کی ٹوکری خالی ہے.",
-"Name" => "اسم",
-"Deleted" => "حذف شدہ ",
-"Delete" => "حذف کریں"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_trashbin/l10n/vi.js b/apps/files_trashbin/l10n/vi.js
new file mode 100644
index 00000000000..113fae4c2da
--- /dev/null
+++ b/apps/files_trashbin/l10n/vi.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "Không thể xóa %s vĩnh viễn",
+    "Couldn't restore %s" : "Không thể khôi phục %s",
+    "Deleted files" : "File đã bị xóa",
+    "Restore" : "Khôi phục",
+    "Error" : "Lỗi",
+    "restored" : "khôi phục",
+    "Nothing in here. Your trash bin is empty!" : "Không có gì ở đây. Thùng rác của bạn rỗng!",
+    "Name" : "Tên",
+    "Deleted" : "Đã xóa",
+    "Delete" : "Xóa"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/vi.json b/apps/files_trashbin/l10n/vi.json
new file mode 100644
index 00000000000..7323889de6f
--- /dev/null
+++ b/apps/files_trashbin/l10n/vi.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "Không thể xóa %s vĩnh viễn",
+    "Couldn't restore %s" : "Không thể khôi phục %s",
+    "Deleted files" : "File đã bị xóa",
+    "Restore" : "Khôi phục",
+    "Error" : "Lỗi",
+    "restored" : "khôi phục",
+    "Nothing in here. Your trash bin is empty!" : "Không có gì ở đây. Thùng rác của bạn rỗng!",
+    "Name" : "Tên",
+    "Deleted" : "Đã xóa",
+    "Delete" : "Xóa"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/vi.php b/apps/files_trashbin/l10n/vi.php
deleted file mode 100644
index d374effcabb..00000000000
--- a/apps/files_trashbin/l10n/vi.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "Không thể xóa %s vĩnh viễn",
-"Couldn't restore %s" => "Không thể khôi phục %s",
-"Deleted files" => "File đã bị xóa",
-"Restore" => "Khôi phục",
-"Error" => "Lỗi",
-"restored" => "khôi phục",
-"Nothing in here. Your trash bin is empty!" => "Không có gì ở đây. Thùng rác của bạn rỗng!",
-"Name" => "Tên",
-"Deleted" => "Đã xóa",
-"Delete" => "Xóa"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_CN.js b/apps/files_trashbin/l10n/zh_CN.js
new file mode 100644
index 00000000000..6c421ab55b9
--- /dev/null
+++ b/apps/files_trashbin/l10n/zh_CN.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "无法彻底删除文件%s",
+    "Couldn't restore %s" : "无法恢复%s",
+    "Deleted files" : "已删除文件",
+    "Restore" : "恢复",
+    "Error" : "错误",
+    "restored" : "已恢复",
+    "Nothing in here. Your trash bin is empty!" : "这里没有东西. 你的回收站是空的!",
+    "Name" : "名称",
+    "Deleted" : "已删除",
+    "Delete" : "删除"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/zh_CN.json b/apps/files_trashbin/l10n/zh_CN.json
new file mode 100644
index 00000000000..88665113d1b
--- /dev/null
+++ b/apps/files_trashbin/l10n/zh_CN.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "无法彻底删除文件%s",
+    "Couldn't restore %s" : "无法恢复%s",
+    "Deleted files" : "已删除文件",
+    "Restore" : "恢复",
+    "Error" : "错误",
+    "restored" : "已恢复",
+    "Nothing in here. Your trash bin is empty!" : "这里没有东西. 你的回收站是空的!",
+    "Name" : "名称",
+    "Deleted" : "已删除",
+    "Delete" : "删除"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/zh_CN.php b/apps/files_trashbin/l10n/zh_CN.php
deleted file mode 100644
index 49cd412299e..00000000000
--- a/apps/files_trashbin/l10n/zh_CN.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "无法彻底删除文件%s",
-"Couldn't restore %s" => "无法恢复%s",
-"Deleted files" => "已删除文件",
-"Restore" => "恢复",
-"Error" => "错误",
-"restored" => "已恢复",
-"Nothing in here. Your trash bin is empty!" => "这里没有东西. 你的回收站是空的!",
-"Name" => "名称",
-"Deleted" => "已删除",
-"Delete" => "删除"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_HK.js b/apps/files_trashbin/l10n/zh_HK.js
new file mode 100644
index 00000000000..78811bbdd2c
--- /dev/null
+++ b/apps/files_trashbin/l10n/zh_HK.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "錯誤",
+    "Name" : "名稱",
+    "Delete" : "刪除"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/zh_HK.json b/apps/files_trashbin/l10n/zh_HK.json
new file mode 100644
index 00000000000..eaa123c49f4
--- /dev/null
+++ b/apps/files_trashbin/l10n/zh_HK.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "錯誤",
+    "Name" : "名稱",
+    "Delete" : "刪除"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/zh_HK.php b/apps/files_trashbin/l10n/zh_HK.php
deleted file mode 100644
index 877912e9c42..00000000000
--- a/apps/files_trashbin/l10n/zh_HK.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "錯誤",
-"Name" => "名稱",
-"Delete" => "刪除"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_trashbin/l10n/zh_TW.js b/apps/files_trashbin/l10n/zh_TW.js
new file mode 100644
index 00000000000..9a0ff0bdb8f
--- /dev/null
+++ b/apps/files_trashbin/l10n/zh_TW.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Couldn't delete %s permanently" : "無法永久刪除 %s",
+    "Couldn't restore %s" : "無法還原 %s",
+    "Deleted files" : "回收桶",
+    "Restore" : "還原",
+    "Error" : "錯誤",
+    "restored" : "已還原",
+    "Nothing in here. Your trash bin is empty!" : "您的回收桶是空的！",
+    "Name" : "名稱",
+    "Deleted" : "已刪除",
+    "Delete" : "刪除"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_trashbin/l10n/zh_TW.json b/apps/files_trashbin/l10n/zh_TW.json
new file mode 100644
index 00000000000..61d7daaf1f4
--- /dev/null
+++ b/apps/files_trashbin/l10n/zh_TW.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Couldn't delete %s permanently" : "無法永久刪除 %s",
+    "Couldn't restore %s" : "無法還原 %s",
+    "Deleted files" : "回收桶",
+    "Restore" : "還原",
+    "Error" : "錯誤",
+    "restored" : "已還原",
+    "Nothing in here. Your trash bin is empty!" : "您的回收桶是空的！",
+    "Name" : "名稱",
+    "Deleted" : "已刪除",
+    "Delete" : "刪除"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_trashbin/l10n/zh_TW.php b/apps/files_trashbin/l10n/zh_TW.php
deleted file mode 100644
index 014527083e3..00000000000
--- a/apps/files_trashbin/l10n/zh_TW.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't delete %s permanently" => "無法永久刪除 %s",
-"Couldn't restore %s" => "無法還原 %s",
-"Deleted files" => "回收桶",
-"Restore" => "還原",
-"Error" => "錯誤",
-"restored" => "已還原",
-"Nothing in here. Your trash bin is empty!" => "您的回收桶是空的！",
-"Name" => "名稱",
-"Deleted" => "已刪除",
-"Delete" => "刪除"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ar.js b/apps/files_versions/l10n/ar.js
new file mode 100644
index 00000000000..ee0199f5b11
--- /dev/null
+++ b/apps/files_versions/l10n/ar.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Versions" : "الإصدارات",
+    "Restore" : "استعيد"
+},
+"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
new file mode 100644
index 00000000000..e84fbfc56c2
--- /dev/null
+++ b/apps/files_versions/l10n/ar.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Versions" : "الإصدارات",
+    "Restore" : "استعيد"
+},"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/ar.php b/apps/files_versions/l10n/ar.php
deleted file mode 100644
index 53eae8e9fee..00000000000
--- a/apps/files_versions/l10n/ar.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Versions" => "الإصدارات",
-"Restore" => "استعيد"
-);
-$PLURAL_FORMS = "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/ast.js b/apps/files_versions/l10n/ast.js
new file mode 100644
index 00000000000..39f7ea7d58f
--- /dev/null
+++ b/apps/files_versions/l10n/ast.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Nun hai otres versiones disponibles",
+    "Restore" : "Restaurar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ast.json b/apps/files_versions/l10n/ast.json
new file mode 100644
index 00000000000..720f02e6f63
--- /dev/null
+++ b/apps/files_versions/l10n/ast.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Nun hai otres versiones disponibles",
+    "Restore" : "Restaurar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ast.php b/apps/files_versions/l10n/ast.php
deleted file mode 100644
index 31e6e72b2d7..00000000000
--- a/apps/files_versions/l10n/ast.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Nun hai otres versiones disponibles",
-"Restore" => "Restaurar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/az.js b/apps/files_versions/l10n/az.js
new file mode 100644
index 00000000000..ee6e86ef111
--- /dev/null
+++ b/apps/files_versions/l10n/az.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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",
+    "No other versions available" : "Başqa versiyalar mövcud deyil",
+    "Restore" : "Geri qaytar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/az.json b/apps/files_versions/l10n/az.json
new file mode 100644
index 00000000000..9b38c19fdba
--- /dev/null
+++ b/apps/files_versions/l10n/az.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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",
+    "No other versions available" : "Başqa versiyalar mövcud deyil",
+    "Restore" : "Geri qaytar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/az.php b/apps/files_versions/l10n/az.php
deleted file mode 100644
index fc1b877406a..00000000000
--- a/apps/files_versions/l10n/az.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"No other versions available" => "Başqa versiyalar mövcud deyil",
-"Restore" => "Geri qaytar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/bg_BG.js b/apps/files_versions/l10n/bg_BG.js
new file mode 100644
index 00000000000..6ea5387eec2
--- /dev/null
+++ b/apps/files_versions/l10n/bg_BG.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "Грешка при връщане: %s",
+    "Versions" : "Версии",
+    "Failed to revert {file} to revision {timestamp}." : "Грешка при връщане на {file} към версия {timestamp}.",
+    "More versions..." : "Още версии...",
+    "No other versions available" : "Няма други налични версии",
+    "Restore" : "Възтановяви"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/bg_BG.json b/apps/files_versions/l10n/bg_BG.json
new file mode 100644
index 00000000000..3d8060a22f1
--- /dev/null
+++ b/apps/files_versions/l10n/bg_BG.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "Грешка при връщане: %s",
+    "Versions" : "Версии",
+    "Failed to revert {file} to revision {timestamp}." : "Грешка при връщане на {file} към версия {timestamp}.",
+    "More versions..." : "Още версии...",
+    "No other versions available" : "Няма други налични версии",
+    "Restore" : "Възтановяви"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/bg_BG.php b/apps/files_versions/l10n/bg_BG.php
deleted file mode 100644
index 9dea358d31f..00000000000
--- a/apps/files_versions/l10n/bg_BG.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "Грешка при връщане: %s",
-"Versions" => "Версии",
-"Failed to revert {file} to revision {timestamp}." => "Грешка при връщане на {file} към версия {timestamp}.",
-"More versions..." => "Още версии...",
-"No other versions available" => "Няма други налични версии",
-"Restore" => "Възтановяви"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/bn_BD.js b/apps/files_versions/l10n/bn_BD.js
new file mode 100644
index 00000000000..4e3f8be76bb
--- /dev/null
+++ b/apps/files_versions/l10n/bn_BD.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "ফিরে যাওয়া গেলনা: %s",
+    "Versions" : "সংষ্করন",
+    "Failed to revert {file} to revision {timestamp}." : " {file} সংশোধিত  {timestamp} এ ফিরে যেতে ব্যার্থ হলো।",
+    "More versions..." : "আরো সংষ্করণ....",
+    "No other versions available" : "আর কোন সংষ্করণ প্রাপ্তব্য নয়",
+    "Restore" : "ফিরিয়ে দাও"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/bn_BD.json b/apps/files_versions/l10n/bn_BD.json
new file mode 100644
index 00000000000..4ab5756e011
--- /dev/null
+++ b/apps/files_versions/l10n/bn_BD.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "ফিরে যাওয়া গেলনা: %s",
+    "Versions" : "সংষ্করন",
+    "Failed to revert {file} to revision {timestamp}." : " {file} সংশোধিত  {timestamp} এ ফিরে যেতে ব্যার্থ হলো।",
+    "More versions..." : "আরো সংষ্করণ....",
+    "No other versions available" : "আর কোন সংষ্করণ প্রাপ্তব্য নয়",
+    "Restore" : "ফিরিয়ে দাও"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/bn_BD.php b/apps/files_versions/l10n/bn_BD.php
deleted file mode 100644
index 2b57275d274..00000000000
--- a/apps/files_versions/l10n/bn_BD.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "ফিরে যাওয়া গেলনা: %s",
-"Versions" => "সংষ্করন",
-"Failed to revert {file} to revision {timestamp}." => " {file} সংশোধিত  {timestamp} এ ফিরে যেতে ব্যার্থ হলো।",
-"More versions..." => "আরো সংষ্করণ....",
-"No other versions available" => "আর কোন সংষ্করণ প্রাপ্তব্য নয়",
-"Restore" => "ফিরিয়ে দাও"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/bn_IN.js b/apps/files_versions/l10n/bn_IN.js
new file mode 100644
index 00000000000..f2985aa4afb
--- /dev/null
+++ b/apps/files_versions/l10n/bn_IN.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "প্রত্যাবর্তন করা যায়নি: %s",
+    "Versions" : "সংস্করণ",
+    "Failed to revert {file} to revision {timestamp}." : "{ফাইল} প্রত্যাবর্তন থেকে পুনর্বিবেচনা {টাইমস্ট্যাম্প} করতে ব্যর্থ।",
+    "More versions..." : "আরো সংস্করণ...",
+    "No other versions available" : "আর কোন সংস্করণ পাওয়া যাচ্ছে না",
+    "Restore" : "পুনরুদ্ধার"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/bn_IN.json b/apps/files_versions/l10n/bn_IN.json
new file mode 100644
index 00000000000..e973e1f074e
--- /dev/null
+++ b/apps/files_versions/l10n/bn_IN.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "প্রত্যাবর্তন করা যায়নি: %s",
+    "Versions" : "সংস্করণ",
+    "Failed to revert {file} to revision {timestamp}." : "{ফাইল} প্রত্যাবর্তন থেকে পুনর্বিবেচনা {টাইমস্ট্যাম্প} করতে ব্যর্থ।",
+    "More versions..." : "আরো সংস্করণ...",
+    "No other versions available" : "আর কোন সংস্করণ পাওয়া যাচ্ছে না",
+    "Restore" : "পুনরুদ্ধার"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/bn_IN.php b/apps/files_versions/l10n/bn_IN.php
deleted file mode 100644
index 5bbfaad470b..00000000000
--- a/apps/files_versions/l10n/bn_IN.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "প্রত্যাবর্তন করা যায়নি: %s",
-"Versions" => "সংস্করণ",
-"Failed to revert {file} to revision {timestamp}." => "{ফাইল} প্রত্যাবর্তন থেকে পুনর্বিবেচনা {টাইমস্ট্যাম্প} করতে ব্যর্থ।",
-"More versions..." => "আরো সংস্করণ...",
-"No other versions available" => "আর কোন সংস্করণ পাওয়া যাচ্ছে না",
-"Restore" => "পুনরুদ্ধার"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ca.js b/apps/files_versions/l10n/ca.js
new file mode 100644
index 00000000000..da6bd06b98e
--- /dev/null
+++ b/apps/files_versions/l10n/ca.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "No hi ha altres versions disponibles",
+    "Restore" : "Recupera"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ca.json b/apps/files_versions/l10n/ca.json
new file mode 100644
index 00000000000..3638e7b6462
--- /dev/null
+++ b/apps/files_versions/l10n/ca.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "No hi ha altres versions disponibles",
+    "Restore" : "Recupera"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
deleted file mode 100644
index e5c47a277f9..00000000000
--- a/apps/files_versions/l10n/ca.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "No hi ha altres versions disponibles",
-"Restore" => "Recupera"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/cs_CZ.js b/apps/files_versions/l10n/cs_CZ.js
new file mode 100644
index 00000000000..0ba87af547f
--- /dev/null
+++ b/apps/files_versions/l10n/cs_CZ.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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í...",
+    "No other versions available" : "Žádné další verze nejsou dostupné",
+    "Restore" : "Obnovit"
+},
+"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
new file mode 100644
index 00000000000..dc47f0b4cc8
--- /dev/null
+++ b/apps/files_versions/l10n/cs_CZ.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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í...",
+    "No other versions available" : "Žádné další verze nejsou dostupné",
+    "Restore" : "Obnovit"
+},"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/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
deleted file mode 100644
index 45ce297eae5..00000000000
--- a/apps/files_versions/l10n/cs_CZ.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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í...",
-"No other versions available" => "Žádné další verze nejsou dostupné",
-"Restore" => "Obnovit"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_versions/l10n/cy_GB.js b/apps/files_versions/l10n/cy_GB.js
new file mode 100644
index 00000000000..e5285e2e157
--- /dev/null
+++ b/apps/files_versions/l10n/cy_GB.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Restore" : "Adfer"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/files_versions/l10n/cy_GB.json b/apps/files_versions/l10n/cy_GB.json
new file mode 100644
index 00000000000..5ad23a5ac6f
--- /dev/null
+++ b/apps/files_versions/l10n/cy_GB.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Restore" : "Adfer"
+},"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/files_versions/l10n/cy_GB.php b/apps/files_versions/l10n/cy_GB.php
deleted file mode 100644
index fa35dfd5218..00000000000
--- a/apps/files_versions/l10n/cy_GB.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Restore" => "Adfer"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/files_versions/l10n/da.js b/apps/files_versions/l10n/da.js
new file mode 100644
index 00000000000..22f7f66b45d
--- /dev/null
+++ b/apps/files_versions/l10n/da.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Ingen andre versioner tilgængelig",
+    "Restore" : "Gendan"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/da.json b/apps/files_versions/l10n/da.json
new file mode 100644
index 00000000000..4dfa5dbeafa
--- /dev/null
+++ b/apps/files_versions/l10n/da.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Ingen andre versioner tilgængelig",
+    "Restore" : "Gendan"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/da.php b/apps/files_versions/l10n/da.php
deleted file mode 100644
index a18bc717708..00000000000
--- a/apps/files_versions/l10n/da.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Ingen andre versioner tilgængelig",
-"Restore" => "Gendan"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/de.js b/apps/files_versions/l10n/de.js
new file mode 100644
index 00000000000..71905567b34
--- /dev/null
+++ b/apps/files_versions/l10n/de.js
@@ -0,0 +1,11 @@
+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ängig machen.",
+    "More versions..." : "Weitere 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.json b/apps/files_versions/l10n/de.json
new file mode 100644
index 00000000000..f6feac199e2
--- /dev/null
+++ b/apps/files_versions/l10n/de.json
@@ -0,0 +1,9 @@
+{ "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ängig machen.",
+    "More versions..." : "Weitere Versionen...",
+    "No other versions available" : "Keine anderen Versionen verfügbar",
+    "Restore" : "Wiederherstellen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
deleted file mode 100644
index 2b5bf3e9347..00000000000
--- a/apps/files_versions/l10n/de.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Keine anderen Versionen verfügbar",
-"Restore" => "Wiederherstellen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/de_CH.js b/apps/files_versions/l10n/de_CH.js
new file mode 100644
index 00000000000..9e970501fb7
--- /dev/null
+++ b/apps/files_versions/l10n/de_CH.js
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000000..8d4b76f8c2c
--- /dev/null
+++ b/apps/files_versions/l10n/de_CH.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "Konnte %s nicht zurücksetzen",
+    "Versions" : "Versionen",
+    "Failed to revert {file} to revision {timestamp}." : "Konnte {file} der Revision {timestamp} nicht rückgänging machen.",
+    "More versions..." : "Mehrere Versionen...",
+    "No other versions available" : "Keine anderen Versionen verfügbar",
+    "Restore" : "Wiederherstellen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/de_CH.php b/apps/files_versions/l10n/de_CH.php
deleted file mode 100644
index c8b45eee500..00000000000
--- a/apps/files_versions/l10n/de_CH.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/de_DE.js b/apps/files_versions/l10n/de_DE.js
new file mode 100644
index 00000000000..0b8e5cdeac7
--- /dev/null
+++ b/apps/files_versions/l10n/de_DE.js
@@ -0,0 +1,11 @@
+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ängig 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_DE.json b/apps/files_versions/l10n/de_DE.json
new file mode 100644
index 00000000000..6e5a8ec3bdb
--- /dev/null
+++ b/apps/files_versions/l10n/de_DE.json
@@ -0,0 +1,9 @@
+{ "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ängig machen.",
+    "More versions..." : "Mehrere Versionen...",
+    "No other versions available" : "Keine anderen Versionen verfügbar",
+    "Restore" : "Wiederherstellen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/de_DE.php b/apps/files_versions/l10n/de_DE.php
deleted file mode 100644
index 781774dcdd9..00000000000
--- a/apps/files_versions/l10n/de_DE.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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..." => "Mehrere Versionen...",
-"No other versions available" => "Keine anderen Versionen verfügbar",
-"Restore" => "Wiederherstellen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/el.js b/apps/files_versions/l10n/el.js
new file mode 100644
index 00000000000..a54655bcba0
--- /dev/null
+++ b/apps/files_versions/l10n/el.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "Αδυναμία επαναφοράς: %s",
+    "Versions" : "Εκδόσεις",
+    "Failed to revert {file} to revision {timestamp}." : "Αποτυχία επαναφοράς του {file} στην αναθεώρηση {timestamp}.",
+    "More versions..." : "Περισσότερες εκδόσεις...",
+    "No other versions available" : "Δεν υπάρχουν άλλες εκδόσεις διαθέσιμες",
+    "Restore" : "Επαναφορά"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/el.json b/apps/files_versions/l10n/el.json
new file mode 100644
index 00000000000..836fdce5535
--- /dev/null
+++ b/apps/files_versions/l10n/el.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "Αδυναμία επαναφοράς: %s",
+    "Versions" : "Εκδόσεις",
+    "Failed to revert {file} to revision {timestamp}." : "Αποτυχία επαναφοράς του {file} στην αναθεώρηση {timestamp}.",
+    "More versions..." : "Περισσότερες εκδόσεις...",
+    "No other versions available" : "Δεν υπάρχουν άλλες εκδόσεις διαθέσιμες",
+    "Restore" : "Επαναφορά"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/el.php b/apps/files_versions/l10n/el.php
deleted file mode 100644
index 5337f3b5a48..00000000000
--- a/apps/files_versions/l10n/el.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "Αδυναμία επαναφοράς: %s",
-"Versions" => "Εκδόσεις",
-"Failed to revert {file} to revision {timestamp}." => "Αποτυχία επαναφοράς του {file} στην αναθεώρηση {timestamp}.",
-"More versions..." => "Περισσότερες εκδόσεις...",
-"No other versions available" => "Δεν υπάρχουν άλλες εκδόσεις διαθέσιμες",
-"Restore" => "Επαναφορά"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/en_GB.js b/apps/files_versions/l10n/en_GB.js
new file mode 100644
index 00000000000..a8ca3729752
--- /dev/null
+++ b/apps/files_versions/l10n/en_GB.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "No other versions available",
+    "Restore" : "Restore"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/en_GB.json b/apps/files_versions/l10n/en_GB.json
new file mode 100644
index 00000000000..8ae47df9fcb
--- /dev/null
+++ b/apps/files_versions/l10n/en_GB.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "No other versions available",
+    "Restore" : "Restore"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/en_GB.php b/apps/files_versions/l10n/en_GB.php
deleted file mode 100644
index af22b8fb0b2..00000000000
--- a/apps/files_versions/l10n/en_GB.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "No other versions available",
-"Restore" => "Restore"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/eo.js b/apps/files_versions/l10n/eo.js
new file mode 100644
index 00000000000..1695a84dbad
--- /dev/null
+++ b/apps/files_versions/l10n/eo.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Ne disponeblas aliaj versioj",
+    "Restore" : "Restaŭri"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/eo.json b/apps/files_versions/l10n/eo.json
new file mode 100644
index 00000000000..099bbf19365
--- /dev/null
+++ b/apps/files_versions/l10n/eo.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Ne disponeblas aliaj versioj",
+    "Restore" : "Restaŭri"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
deleted file mode 100644
index cfd8b1845cb..00000000000
--- a/apps/files_versions/l10n/eo.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Ne disponeblas aliaj versioj",
-"Restore" => "Restaŭri"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/es.js b/apps/files_versions/l10n/es.js
new file mode 100644
index 00000000000..f3d980489b0
--- /dev/null
+++ b/apps/files_versions/l10n/es.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "No hay otras versiones disponibles",
+    "Restore" : "Recuperar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/es.json b/apps/files_versions/l10n/es.json
new file mode 100644
index 00000000000..7c395cbbb2e
--- /dev/null
+++ b/apps/files_versions/l10n/es.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "No hay otras versiones disponibles",
+    "Restore" : "Recuperar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
deleted file mode 100644
index b7acc376978..00000000000
--- a/apps/files_versions/l10n/es.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "No hay otras versiones disponibles",
-"Restore" => "Recuperar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/es_AR.js b/apps/files_versions/l10n/es_AR.js
new file mode 100644
index 00000000000..b471c76e1cc
--- /dev/null
+++ b/apps/files_versions/l10n/es_AR.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "No hay más versiones disponibles",
+    "Restore" : "Recuperar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/es_AR.json b/apps/files_versions/l10n/es_AR.json
new file mode 100644
index 00000000000..806ecb2aa30
--- /dev/null
+++ b/apps/files_versions/l10n/es_AR.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "No hay más versiones disponibles",
+    "Restore" : "Recuperar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_AR.php b/apps/files_versions/l10n/es_AR.php
deleted file mode 100644
index 3008220122f..00000000000
--- a/apps/files_versions/l10n/es_AR.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "No hay más versiones disponibles",
-"Restore" => "Recuperar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/es_MX.js b/apps/files_versions/l10n/es_MX.js
new file mode 100644
index 00000000000..f3d980489b0
--- /dev/null
+++ b/apps/files_versions/l10n/es_MX.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "No hay otras versiones disponibles",
+    "Restore" : "Recuperar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/es_MX.json b/apps/files_versions/l10n/es_MX.json
new file mode 100644
index 00000000000..7c395cbbb2e
--- /dev/null
+++ b/apps/files_versions/l10n/es_MX.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "No hay otras versiones disponibles",
+    "Restore" : "Recuperar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/es_MX.php b/apps/files_versions/l10n/es_MX.php
deleted file mode 100644
index b7acc376978..00000000000
--- a/apps/files_versions/l10n/es_MX.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "No hay otras versiones disponibles",
-"Restore" => "Recuperar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/et_EE.js b/apps/files_versions/l10n/et_EE.js
new file mode 100644
index 00000000000..14a0dc1a095
--- /dev/null
+++ b/apps/files_versions/l10n/et_EE.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Muid versioone pole saadaval",
+    "Restore" : "Taasta"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/et_EE.json b/apps/files_versions/l10n/et_EE.json
new file mode 100644
index 00000000000..a1762b7e15f
--- /dev/null
+++ b/apps/files_versions/l10n/et_EE.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Muid versioone pole saadaval",
+    "Restore" : "Taasta"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
deleted file mode 100644
index ba8b516e856..00000000000
--- a/apps/files_versions/l10n/et_EE.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Muid versioone pole saadaval",
-"Restore" => "Taasta"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/eu.js b/apps/files_versions/l10n/eu.js
new file mode 100644
index 00000000000..0c92f18594c
--- /dev/null
+++ b/apps/files_versions/l10n/eu.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Ez dago bertsio gehiago eskuragarri",
+    "Restore" : "Berrezarri"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/eu.json b/apps/files_versions/l10n/eu.json
new file mode 100644
index 00000000000..acb9e78e7f7
--- /dev/null
+++ b/apps/files_versions/l10n/eu.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Ez dago bertsio gehiago eskuragarri",
+    "Restore" : "Berrezarri"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
deleted file mode 100644
index 249ae096630..00000000000
--- a/apps/files_versions/l10n/eu.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Ez dago bertsio gehiago eskuragarri",
-"Restore" => "Berrezarri"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/fa.js b/apps/files_versions/l10n/fa.js
new file mode 100644
index 00000000000..fda05b61e5d
--- /dev/null
+++ b/apps/files_versions/l10n/fa.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "بازگردانی امکان ناپذیر است: %s",
+    "Versions" : "نسخه ها",
+    "Failed to revert {file} to revision {timestamp}." : "برگرداندن {file} به نسخه {timestamp} با شکست روبرو شد",
+    "More versions..." : "نسخه های بیشتر",
+    "No other versions available" : "نسخه ی دیگری در دسترس نیست",
+    "Restore" : "بازیابی"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/fa.json b/apps/files_versions/l10n/fa.json
new file mode 100644
index 00000000000..56e04f8f5c7
--- /dev/null
+++ b/apps/files_versions/l10n/fa.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "بازگردانی امکان ناپذیر است: %s",
+    "Versions" : "نسخه ها",
+    "Failed to revert {file} to revision {timestamp}." : "برگرداندن {file} به نسخه {timestamp} با شکست روبرو شد",
+    "More versions..." : "نسخه های بیشتر",
+    "No other versions available" : "نسخه ی دیگری در دسترس نیست",
+    "Restore" : "بازیابی"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/fa.php b/apps/files_versions/l10n/fa.php
deleted file mode 100644
index 7b26e361ec5..00000000000
--- a/apps/files_versions/l10n/fa.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "بازگردانی امکان ناپذیر است: %s",
-"Versions" => "نسخه ها",
-"Failed to revert {file} to revision {timestamp}." => "برگرداندن {file} به نسخه {timestamp} با شکست روبرو شد",
-"More versions..." => "نسخه های بیشتر",
-"No other versions available" => "نسخه ی دیگری در دسترس نیست",
-"Restore" => "بازیابی"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/fi_FI.js b/apps/files_versions/l10n/fi_FI.js
new file mode 100644
index 00000000000..32e3e28f0cc
--- /dev/null
+++ b/apps/files_versions/l10n/fi_FI.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Ei muita versioita saatavilla",
+    "Restore" : "Palauta"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/fi_FI.json b/apps/files_versions/l10n/fi_FI.json
new file mode 100644
index 00000000000..57d552b196b
--- /dev/null
+++ b/apps/files_versions/l10n/fi_FI.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Ei muita versioita saatavilla",
+    "Restore" : "Palauta"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
deleted file mode 100644
index fb011df2a13..00000000000
--- a/apps/files_versions/l10n/fi_FI.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Ei muita versioita saatavilla",
-"Restore" => "Palauta"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/fr.js b/apps/files_versions/l10n/fr.js
new file mode 100644
index 00000000000..be23bf846df
--- /dev/null
+++ b/apps/files_versions/l10n/fr.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Aucune autre version n'est disponible",
+    "Restore" : "Restaurer"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/fr.json b/apps/files_versions/l10n/fr.json
new file mode 100644
index 00000000000..22d39d84f5f
--- /dev/null
+++ b/apps/files_versions/l10n/fr.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Aucune autre version n'est disponible",
+    "Restore" : "Restaurer"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
deleted file mode 100644
index 1dd6ddc39c3..00000000000
--- a/apps/files_versions/l10n/fr.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Aucune autre version n'est disponible",
-"Restore" => "Restaurer"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/gl.js b/apps/files_versions/l10n/gl.js
new file mode 100644
index 00000000000..e947351bd9d
--- /dev/null
+++ b/apps/files_versions/l10n/gl.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Non hai outras versións dispoñíbeis",
+    "Restore" : "Restabelecer"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/gl.json b/apps/files_versions/l10n/gl.json
new file mode 100644
index 00000000000..240c78d5fed
--- /dev/null
+++ b/apps/files_versions/l10n/gl.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Non hai outras versións dispoñíbeis",
+    "Restore" : "Restabelecer"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/gl.php b/apps/files_versions/l10n/gl.php
deleted file mode 100644
index 48eef193e43..00000000000
--- a/apps/files_versions/l10n/gl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Non hai outras versións dispoñíbeis",
-"Restore" => "Restabelecer"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/he.js b/apps/files_versions/l10n/he.js
new file mode 100644
index 00000000000..ecb859bb7f8
--- /dev/null
+++ b/apps/files_versions/l10n/he.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "לא ניתן להחזיר: %s",
+    "Versions" : "גרסאות",
+    "Restore" : "שחזור"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/he.json b/apps/files_versions/l10n/he.json
new file mode 100644
index 00000000000..6cedccc663c
--- /dev/null
+++ b/apps/files_versions/l10n/he.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Could not revert: %s" : "לא ניתן להחזיר: %s",
+    "Versions" : "גרסאות",
+    "Restore" : "שחזור"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
deleted file mode 100644
index 848e4712276..00000000000
--- a/apps/files_versions/l10n/he.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "לא ניתן להחזיר: %s",
-"Versions" => "גרסאות",
-"Restore" => "שחזור"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/hr.js b/apps/files_versions/l10n/hr.js
new file mode 100644
index 00000000000..15851fc3b12
--- /dev/null
+++ b/apps/files_versions/l10n/hr.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Nikakve druge verzije nisu dostupne",
+    "Restore" : "Obnovite"
+},
+"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
new file mode 100644
index 00000000000..8197420150f
--- /dev/null
+++ b/apps/files_versions/l10n/hr.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Nikakve druge verzije nisu dostupne",
+    "Restore" : "Obnovite"
+},"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/hr.php b/apps/files_versions/l10n/hr.php
deleted file mode 100644
index fdd8d89d206..00000000000
--- a/apps/files_versions/l10n/hr.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Nikakve druge verzije nisu dostupne",
-"Restore" => "Obnovite"
-);
-$PLURAL_FORMS = "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/hu_HU.js b/apps/files_versions/l10n/hu_HU.js
new file mode 100644
index 00000000000..342e65d5faf
--- /dev/null
+++ b/apps/files_versions/l10n/hu_HU.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Az állománynak nincs több változata",
+    "Restore" : "Visszaállítás"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/hu_HU.json b/apps/files_versions/l10n/hu_HU.json
new file mode 100644
index 00000000000..2b2be0f444e
--- /dev/null
+++ b/apps/files_versions/l10n/hu_HU.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Az állománynak nincs több változata",
+    "Restore" : "Visszaállítás"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/hu_HU.php b/apps/files_versions/l10n/hu_HU.php
deleted file mode 100644
index 13b3fe7cace..00000000000
--- a/apps/files_versions/l10n/hu_HU.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Az állománynak nincs több változata",
-"Restore" => "Visszaállítás"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/id.js b/apps/files_versions/l10n/id.js
new file mode 100644
index 00000000000..0e1111cf890
--- /dev/null
+++ b/apps/files_versions/l10n/id.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Tidak ada versi lain yang tersedia",
+    "Restore" : "Pulihkan"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/id.json b/apps/files_versions/l10n/id.json
new file mode 100644
index 00000000000..e0b7e17bcc5
--- /dev/null
+++ b/apps/files_versions/l10n/id.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Tidak ada versi lain yang tersedia",
+    "Restore" : "Pulihkan"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/id.php b/apps/files_versions/l10n/id.php
deleted file mode 100644
index 14920cc52fd..00000000000
--- a/apps/files_versions/l10n/id.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Tidak ada versi lain yang tersedia",
-"Restore" => "Pulihkan"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/is.js b/apps/files_versions/l10n/is.js
new file mode 100644
index 00000000000..25bf6aafbfc
--- /dev/null
+++ b/apps/files_versions/l10n/is.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Versions" : "Útgáfur"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/is.json b/apps/files_versions/l10n/is.json
new file mode 100644
index 00000000000..d21e4480909
--- /dev/null
+++ b/apps/files_versions/l10n/is.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Versions" : "Útgáfur"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/is.php b/apps/files_versions/l10n/is.php
deleted file mode 100644
index 0f643122ad0..00000000000
--- a/apps/files_versions/l10n/is.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Versions" => "Útgáfur"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/it.js b/apps/files_versions/l10n/it.js
new file mode 100644
index 00000000000..45256577289
--- /dev/null
+++ b/apps/files_versions/l10n/it.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Non sono disponibili altre versioni",
+    "Restore" : "Ripristina"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/it.json b/apps/files_versions/l10n/it.json
new file mode 100644
index 00000000000..af5d7bbcaba
--- /dev/null
+++ b/apps/files_versions/l10n/it.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Non sono disponibili altre versioni",
+    "Restore" : "Ripristina"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
deleted file mode 100644
index 6e4aee450a6..00000000000
--- a/apps/files_versions/l10n/it.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Non sono disponibili altre versioni",
-"Restore" => "Ripristina"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ja.js b/apps/files_versions/l10n/ja.js
new file mode 100644
index 00000000000..1e4f26edc39
--- /dev/null
+++ b/apps/files_versions/l10n/ja.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "元に戻せませんでした: %s",
+    "Versions" : "バージョン",
+    "Failed to revert {file} to revision {timestamp}." : "{file} を {timestamp} のリビジョンに戻すことができません。",
+    "More versions..." : "他のバージョン...",
+    "No other versions available" : "利用可能なバージョンはありません",
+    "Restore" : "復元"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ja.json b/apps/files_versions/l10n/ja.json
new file mode 100644
index 00000000000..7ee6b4d2c0e
--- /dev/null
+++ b/apps/files_versions/l10n/ja.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "元に戻せませんでした: %s",
+    "Versions" : "バージョン",
+    "Failed to revert {file} to revision {timestamp}." : "{file} を {timestamp} のリビジョンに戻すことができません。",
+    "More versions..." : "他のバージョン...",
+    "No other versions available" : "利用可能なバージョンはありません",
+    "Restore" : "復元"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ja.php b/apps/files_versions/l10n/ja.php
deleted file mode 100644
index f4c04ca76e9..00000000000
--- a/apps/files_versions/l10n/ja.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "元に戻せませんでした: %s",
-"Versions" => "バージョン",
-"Failed to revert {file} to revision {timestamp}." => "{file} を {timestamp} のリビジョンに戻すことができません。",
-"More versions..." => "他のバージョン...",
-"No other versions available" => "利用可能なバージョンはありません",
-"Restore" => "復元"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ka_GE.js b/apps/files_versions/l10n/ka_GE.js
new file mode 100644
index 00000000000..d958b4f4dee
--- /dev/null
+++ b/apps/files_versions/l10n/ka_GE.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "ვერ მოხერხდა უკან დაბრუნება: %s",
+    "Versions" : "ვერსიები",
+    "Restore" : "აღდგენა"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ka_GE.json b/apps/files_versions/l10n/ka_GE.json
new file mode 100644
index 00000000000..a3b2d0344de
--- /dev/null
+++ b/apps/files_versions/l10n/ka_GE.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Could not revert: %s" : "ვერ მოხერხდა უკან დაბრუნება: %s",
+    "Versions" : "ვერსიები",
+    "Restore" : "აღდგენა"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ka_GE.php b/apps/files_versions/l10n/ka_GE.php
deleted file mode 100644
index 41e65903b65..00000000000
--- a/apps/files_versions/l10n/ka_GE.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "ვერ მოხერხდა უკან დაბრუნება: %s",
-"Versions" => "ვერსიები",
-"Restore" => "აღდგენა"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/km.js b/apps/files_versions/l10n/km.js
new file mode 100644
index 00000000000..b1edbcbb3cc
--- /dev/null
+++ b/apps/files_versions/l10n/km.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "មិន​អាច​ត្រឡប់៖ %s",
+    "Versions" : "កំណែ",
+    "Failed to revert {file} to revision {timestamp}." : "មិន​អាច​ត្រឡប់ {file} ទៅ​កំណែ​សម្រួល {timestamp} បាន​ទេ។",
+    "More versions..." : "កំណែ​ច្រើន​ទៀត...",
+    "No other versions available" : "មិន​មាន​កំណែ​ផ្សេង​ទៀត​ទេ",
+    "Restore" : "ស្ដារ​មក​វិញ"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/km.json b/apps/files_versions/l10n/km.json
new file mode 100644
index 00000000000..830170a2234
--- /dev/null
+++ b/apps/files_versions/l10n/km.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "មិន​អាច​ត្រឡប់៖ %s",
+    "Versions" : "កំណែ",
+    "Failed to revert {file} to revision {timestamp}." : "មិន​អាច​ត្រឡប់ {file} ទៅ​កំណែ​សម្រួល {timestamp} បាន​ទេ។",
+    "More versions..." : "កំណែ​ច្រើន​ទៀត...",
+    "No other versions available" : "មិន​មាន​កំណែ​ផ្សេង​ទៀត​ទេ",
+    "Restore" : "ស្ដារ​មក​វិញ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/km.php b/apps/files_versions/l10n/km.php
deleted file mode 100644
index 3673d002a7c..00000000000
--- a/apps/files_versions/l10n/km.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "មិន​អាច​ត្រឡប់៖ %s",
-"Versions" => "កំណែ",
-"Failed to revert {file} to revision {timestamp}." => "មិន​អាច​ត្រឡប់ {file} ទៅ​កំណែ​សម្រួល {timestamp} បាន​ទេ។",
-"More versions..." => "កំណែ​ច្រើន​ទៀត...",
-"No other versions available" => "មិន​មាន​កំណែ​ផ្សេង​ទៀត​ទេ",
-"Restore" => "ស្ដារ​មក​វិញ"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ko.js b/apps/files_versions/l10n/ko.js
new file mode 100644
index 00000000000..9e125ec6bbf
--- /dev/null
+++ b/apps/files_versions/l10n/ko.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "되돌릴 수 없습니다: %s",
+    "Versions" : "버전",
+    "Failed to revert {file} to revision {timestamp}." : "{file}을(를) 리비전 {timestamp}으(로) 되돌리는 데 실패하였습니다.",
+    "More versions..." : "더 많은 버전...",
+    "No other versions available" : "다른 버전을 사용할 수 없습니다",
+    "Restore" : "복원"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ko.json b/apps/files_versions/l10n/ko.json
new file mode 100644
index 00000000000..80ebb43912a
--- /dev/null
+++ b/apps/files_versions/l10n/ko.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "되돌릴 수 없습니다: %s",
+    "Versions" : "버전",
+    "Failed to revert {file} to revision {timestamp}." : "{file}을(를) 리비전 {timestamp}으(로) 되돌리는 데 실패하였습니다.",
+    "More versions..." : "더 많은 버전...",
+    "No other versions available" : "다른 버전을 사용할 수 없습니다",
+    "Restore" : "복원"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ko.php b/apps/files_versions/l10n/ko.php
deleted file mode 100644
index bd56c0489bf..00000000000
--- a/apps/files_versions/l10n/ko.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "되돌릴 수 없습니다: %s",
-"Versions" => "버전",
-"Failed to revert {file} to revision {timestamp}." => "{file}을(를) 리비전 {timestamp}으(로) 되돌리는 데 실패하였습니다.",
-"More versions..." => "더 많은 버전...",
-"No other versions available" => "다른 버전을 사용할 수 없습니다",
-"Restore" => "복원"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/ku_IQ.js b/apps/files_versions/l10n/ku_IQ.js
new file mode 100644
index 00000000000..46d7e075356
--- /dev/null
+++ b/apps/files_versions/l10n/ku_IQ.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Versions" : "وه‌شان"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ku_IQ.json b/apps/files_versions/l10n/ku_IQ.json
new file mode 100644
index 00000000000..0a929bb22df
--- /dev/null
+++ b/apps/files_versions/l10n/ku_IQ.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Versions" : "وه‌شان"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ku_IQ.php b/apps/files_versions/l10n/ku_IQ.php
deleted file mode 100644
index de2696509bb..00000000000
--- a/apps/files_versions/l10n/ku_IQ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Versions" => "وه‌شان"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/lt_LT.js b/apps/files_versions/l10n/lt_LT.js
new file mode 100644
index 00000000000..987b914412a
--- /dev/null
+++ b/apps/files_versions/l10n/lt_LT.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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ų...",
+    "No other versions available" : "Nėra daugiau versijų",
+    "Restore" : "Atstatyti"
+},
+"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
new file mode 100644
index 00000000000..5e30612dd33
--- /dev/null
+++ b/apps/files_versions/l10n/lt_LT.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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ų...",
+    "No other versions available" : "Nėra daugiau versijų",
+    "Restore" : "Atstatyti"
+},"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/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
deleted file mode 100644
index 3afcfbe3b5f..00000000000
--- a/apps/files_versions/l10n/lt_LT.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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ų...",
-"No other versions available" => "Nėra daugiau versijų",
-"Restore" => "Atstatyti"
-);
-$PLURAL_FORMS = "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/lv.js b/apps/files_versions/l10n/lv.js
new file mode 100644
index 00000000000..5a8cbcf0ece
--- /dev/null
+++ b/apps/files_versions/l10n/lv.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "Nevarēja atgriezt — %s",
+    "Versions" : "Versijas",
+    "Restore" : "Atjaunot"
+},
+"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
new file mode 100644
index 00000000000..6781de4d471
--- /dev/null
+++ b/apps/files_versions/l10n/lv.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Could not revert: %s" : "Nevarēja atgriezt — %s",
+    "Versions" : "Versijas",
+    "Restore" : "Atjaunot"
+},"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/lv.php b/apps/files_versions/l10n/lv.php
deleted file mode 100644
index c686370ac31..00000000000
--- a/apps/files_versions/l10n/lv.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "Nevarēja atgriezt — %s",
-"Versions" => "Versijas",
-"Restore" => "Atjaunot"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/files_versions/l10n/mk.js b/apps/files_versions/l10n/mk.js
new file mode 100644
index 00000000000..a730ea89404
--- /dev/null
+++ b/apps/files_versions/l10n/mk.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "Не можев да го вратам: %s",
+    "Versions" : "Версии",
+    "Failed to revert {file} to revision {timestamp}." : "Не успеав да го вратам {file} на ревизијата {timestamp}.",
+    "More versions..." : "Повеќе верзии...",
+    "No other versions available" : "Не постојат други верзии",
+    "Restore" : "Врати"
+},
+"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
new file mode 100644
index 00000000000..7e57aa91b55
--- /dev/null
+++ b/apps/files_versions/l10n/mk.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "Не можев да го вратам: %s",
+    "Versions" : "Версии",
+    "Failed to revert {file} to revision {timestamp}." : "Не успеав да го вратам {file} на ревизијата {timestamp}.",
+    "More versions..." : "Повеќе верзии...",
+    "No other versions available" : "Не постојат други верзии",
+    "Restore" : "Врати"
+},"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/mk.php b/apps/files_versions/l10n/mk.php
deleted file mode 100644
index d5c883b894f..00000000000
--- a/apps/files_versions/l10n/mk.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "Не можев да го вратам: %s",
-"Versions" => "Версии",
-"Failed to revert {file} to revision {timestamp}." => "Не успеав да го вратам {file} на ревизијата {timestamp}.",
-"More versions..." => "Повеќе верзии...",
-"No other versions available" => "Не постојат други верзии",
-"Restore" => "Врати"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/files_versions/l10n/ms_MY.js b/apps/files_versions/l10n/ms_MY.js
new file mode 100644
index 00000000000..f645a255caf
--- /dev/null
+++ b/apps/files_versions/l10n/ms_MY.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Tiada lagi versi lain",
+    "Restore" : "Pulihkan"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ms_MY.json b/apps/files_versions/l10n/ms_MY.json
new file mode 100644
index 00000000000..6ed0cd34131
--- /dev/null
+++ b/apps/files_versions/l10n/ms_MY.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Tiada lagi versi lain",
+    "Restore" : "Pulihkan"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ms_MY.php b/apps/files_versions/l10n/ms_MY.php
deleted file mode 100644
index 513dff49b24..00000000000
--- a/apps/files_versions/l10n/ms_MY.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Tiada lagi versi lain",
-"Restore" => "Pulihkan"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/nb_NO.js b/apps/files_versions/l10n/nb_NO.js
new file mode 100644
index 00000000000..e3279e61bf8
--- /dev/null
+++ b/apps/files_versions/l10n/nb_NO.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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",
+    "No other versions available" : "Det finnes ingen andre versjoner",
+    "Restore" : "Gjenopprett"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nb_NO.json b/apps/files_versions/l10n/nb_NO.json
new file mode 100644
index 00000000000..18c520014d1
--- /dev/null
+++ b/apps/files_versions/l10n/nb_NO.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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",
+    "No other versions available" : "Det finnes ingen andre versjoner",
+    "Restore" : "Gjenopprett"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
deleted file mode 100644
index 4c0c8c65bac..00000000000
--- a/apps/files_versions/l10n/nb_NO.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"No other versions available" => "Det finnes ingen andre versjoner",
-"Restore" => "Gjenopprett"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/nl.js b/apps/files_versions/l10n/nl.js
new file mode 100644
index 00000000000..53de2706f35
--- /dev/null
+++ b/apps/files_versions/l10n/nl.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Geen andere versies beschikbaar",
+    "Restore" : "Herstellen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nl.json b/apps/files_versions/l10n/nl.json
new file mode 100644
index 00000000000..b564b5e54b3
--- /dev/null
+++ b/apps/files_versions/l10n/nl.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Geen andere versies beschikbaar",
+    "Restore" : "Herstellen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
deleted file mode 100644
index ec7551d9596..00000000000
--- a/apps/files_versions/l10n/nl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Geen andere versies beschikbaar",
-"Restore" => "Herstellen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/nn_NO.js b/apps/files_versions/l10n/nn_NO.js
new file mode 100644
index 00000000000..feedf5a9449
--- /dev/null
+++ b/apps/files_versions/l10n/nn_NO.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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 …",
+    "No other versions available" : "Ingen andre utgåver tilgjengeleg",
+    "Restore" : "Gjenopprett"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/nn_NO.json b/apps/files_versions/l10n/nn_NO.json
new file mode 100644
index 00000000000..96d410cfa04
--- /dev/null
+++ b/apps/files_versions/l10n/nn_NO.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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 …",
+    "No other versions available" : "Ingen andre utgåver tilgjengeleg",
+    "Restore" : "Gjenopprett"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/nn_NO.php b/apps/files_versions/l10n/nn_NO.php
deleted file mode 100644
index 608d72aaaed..00000000000
--- a/apps/files_versions/l10n/nn_NO.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 …",
-"No other versions available" => "Ingen andre utgåver tilgjengeleg",
-"Restore" => "Gjenopprett"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/pl.js b/apps/files_versions/l10n/pl.js
new file mode 100644
index 00000000000..dce5f500ef6
--- /dev/null
+++ b/apps/files_versions/l10n/pl.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Nie są dostępne żadne inne wersje",
+    "Restore" : "Przywróć"
+},
+"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
new file mode 100644
index 00000000000..68860dd115a
--- /dev/null
+++ b/apps/files_versions/l10n/pl.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Nie są dostępne żadne inne wersje",
+    "Restore" : "Przywróć"
+},"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/pl.php b/apps/files_versions/l10n/pl.php
deleted file mode 100644
index 89018bf1176..00000000000
--- a/apps/files_versions/l10n/pl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Nie są dostępne żadne inne wersje",
-"Restore" => "Przywróć"
-);
-$PLURAL_FORMS = "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/pt_BR.js b/apps/files_versions/l10n/pt_BR.js
new file mode 100644
index 00000000000..229d935be22
--- /dev/null
+++ b/apps/files_versions/l10n/pt_BR.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Nenhuma outra versão disponível",
+    "Restore" : "Restaurar"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/pt_BR.json b/apps/files_versions/l10n/pt_BR.json
new file mode 100644
index 00000000000..11225a32b9f
--- /dev/null
+++ b/apps/files_versions/l10n/pt_BR.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Nenhuma outra versão disponível",
+    "Restore" : "Restaurar"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
deleted file mode 100644
index b1958825b47..00000000000
--- a/apps/files_versions/l10n/pt_BR.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Nenhuma outra versão disponível",
-"Restore" => "Restaurar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/pt_PT.js b/apps/files_versions/l10n/pt_PT.js
new file mode 100644
index 00000000000..29ae6e3eef9
--- /dev/null
+++ b/apps/files_versions/l10n/pt_PT.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Não existem versões mais antigas",
+    "Restore" : "Restaurar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/pt_PT.json b/apps/files_versions/l10n/pt_PT.json
new file mode 100644
index 00000000000..4ce27f4c748
--- /dev/null
+++ b/apps/files_versions/l10n/pt_PT.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Não existem versões mais antigas",
+    "Restore" : "Restaurar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/pt_PT.php b/apps/files_versions/l10n/pt_PT.php
deleted file mode 100644
index e4371f53409..00000000000
--- a/apps/files_versions/l10n/pt_PT.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Não existem versões mais antigas",
-"Restore" => "Restaurar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ro.js b/apps/files_versions/l10n/ro.js
new file mode 100644
index 00000000000..1c8d6382d9f
--- /dev/null
+++ b/apps/files_versions/l10n/ro.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "Nu a putut reveni: %s",
+    "Versions" : "Versiuni",
+    "More versions..." : "Mai multe versiuni...",
+    "No other versions available" : "Nu există alte versiuni disponibile",
+    "Restore" : "Restabilire"
+},
+"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
new file mode 100644
index 00000000000..3b2d0c795ab
--- /dev/null
+++ b/apps/files_versions/l10n/ro.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Could not revert: %s" : "Nu a putut reveni: %s",
+    "Versions" : "Versiuni",
+    "More versions..." : "Mai multe versiuni...",
+    "No other versions available" : "Nu există alte versiuni disponibile",
+    "Restore" : "Restabilire"
+},"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/ro.php b/apps/files_versions/l10n/ro.php
deleted file mode 100644
index cc8c6e19311..00000000000
--- a/apps/files_versions/l10n/ro.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "Nu a putut reveni: %s",
-"Versions" => "Versiuni",
-"More versions..." => "Mai multe versiuni...",
-"No other versions available" => "Nu există alte versiuni disponibile",
-"Restore" => "Restabilire"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/files_versions/l10n/ru.js b/apps/files_versions/l10n/ru.js
new file mode 100644
index 00000000000..2dc12f9ff2a
--- /dev/null
+++ b/apps/files_versions/l10n/ru.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "Не может быть возвращён: %s",
+    "Versions" : "Версии",
+    "Failed to revert {file} to revision {timestamp}." : "Не удалось возвратить {file} к ревизии {timestamp}.",
+    "More versions..." : "Ещё версии...",
+    "No other versions available" : "Других версий не доступно",
+    "Restore" : "Восстановить"
+},
+"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/ru.json b/apps/files_versions/l10n/ru.json
new file mode 100644
index 00000000000..fe1906bf467
--- /dev/null
+++ b/apps/files_versions/l10n/ru.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "Не может быть возвращён: %s",
+    "Versions" : "Версии",
+    "Failed to revert {file} to revision {timestamp}." : "Не удалось возвратить {file} к ревизии {timestamp}.",
+    "More versions..." : "Ещё версии...",
+    "No other versions available" : "Других версий не доступно",
+    "Restore" : "Восстановить"
+},"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/ru.php b/apps/files_versions/l10n/ru.php
deleted file mode 100644
index 12f9f77b94d..00000000000
--- a/apps/files_versions/l10n/ru.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "Не может быть возвращён: %s",
-"Versions" => "Версии",
-"Failed to revert {file} to revision {timestamp}." => "Не удалось возвратить {file} к ревизии {timestamp}.",
-"More versions..." => "Ещё версии...",
-"No other versions available" => "Других версий не доступно",
-"Restore" => "Восстановить"
-);
-$PLURAL_FORMS = "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/si_LK.js b/apps/files_versions/l10n/si_LK.js
new file mode 100644
index 00000000000..1d7ab4ef254
--- /dev/null
+++ b/apps/files_versions/l10n/si_LK.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Versions" : "අනුවාද"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/si_LK.json b/apps/files_versions/l10n/si_LK.json
new file mode 100644
index 00000000000..161b51d25a4
--- /dev/null
+++ b/apps/files_versions/l10n/si_LK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Versions" : "අනුවාද"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/si_LK.php b/apps/files_versions/l10n/si_LK.php
deleted file mode 100644
index 7ee8da049b7..00000000000
--- a/apps/files_versions/l10n/si_LK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Versions" => "අනුවාද"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/sk_SK.js b/apps/files_versions/l10n/sk_SK.js
new file mode 100644
index 00000000000..1433f42f2b5
--- /dev/null
+++ b/apps/files_versions/l10n/sk_SK.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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í...",
+    "No other versions available" : "Žiadne ďalšie verzie nie sú dostupné",
+    "Restore" : "Obnoviť"
+},
+"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
new file mode 100644
index 00000000000..da8a7b02ca9
--- /dev/null
+++ b/apps/files_versions/l10n/sk_SK.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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í...",
+    "No other versions available" : "Žiadne ďalšie verzie nie sú dostupné",
+    "Restore" : "Obnoviť"
+},"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/sk_SK.php b/apps/files_versions/l10n/sk_SK.php
deleted file mode 100644
index 5edcea3606c..00000000000
--- a/apps/files_versions/l10n/sk_SK.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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í...",
-"No other versions available" => "Žiadne ďalšie verzie nie sú dostupné",
-"Restore" => "Obnoviť"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/files_versions/l10n/sl.js b/apps/files_versions/l10n/sl.js
new file mode 100644
index 00000000000..abbf4a803d8
--- /dev/null
+++ b/apps/files_versions/l10n/sl.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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",
+    "No other versions available" : "Ni drugih različic",
+    "Restore" : "Obnovi"
+},
+"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
new file mode 100644
index 00000000000..581c9aab594
--- /dev/null
+++ b/apps/files_versions/l10n/sl.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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",
+    "No other versions available" : "Ni drugih različic",
+    "Restore" : "Obnovi"
+},"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/sl.php b/apps/files_versions/l10n/sl.php
deleted file mode 100644
index 08b2f03e4c1..00000000000
--- a/apps/files_versions/l10n/sl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"No other versions available" => "Ni drugih različic",
-"Restore" => "Obnovi"
-);
-$PLURAL_FORMS = "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/sq.js b/apps/files_versions/l10n/sq.js
new file mode 100644
index 00000000000..5330b36aad5
--- /dev/null
+++ b/apps/files_versions/l10n/sq.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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ë...",
+    "No other versions available" : "Nuk ka versione të tjera në dispozicion",
+    "Restore" : "Rivendos"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/sq.json b/apps/files_versions/l10n/sq.json
new file mode 100644
index 00000000000..994772c8e3e
--- /dev/null
+++ b/apps/files_versions/l10n/sq.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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ë...",
+    "No other versions available" : "Nuk ka versione të tjera në dispozicion",
+    "Restore" : "Rivendos"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/sq.php b/apps/files_versions/l10n/sq.php
deleted file mode 100644
index e8a0e797485..00000000000
--- a/apps/files_versions/l10n/sq.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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ë...",
-"No other versions available" => "Nuk ka versione të tjera në dispozicion",
-"Restore" => "Rivendos"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/sr.js b/apps/files_versions/l10n/sr.js
new file mode 100644
index 00000000000..be85270b3aa
--- /dev/null
+++ b/apps/files_versions/l10n/sr.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Restore" : "Врати"
+},
+"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
new file mode 100644
index 00000000000..744ab3c4b72
--- /dev/null
+++ b/apps/files_versions/l10n/sr.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Restore" : "Врати"
+},"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.php b/apps/files_versions/l10n/sr.php
deleted file mode 100644
index d4eb0be19cb..00000000000
--- a/apps/files_versions/l10n/sr.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Restore" => "Врати"
-);
-$PLURAL_FORMS = "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/sv.js b/apps/files_versions/l10n/sv.js
new file mode 100644
index 00000000000..6ff23cc5635
--- /dev/null
+++ b/apps/files_versions/l10n/sv.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Inga andra versioner tillgängliga",
+    "Restore" : "Återskapa"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/sv.json b/apps/files_versions/l10n/sv.json
new file mode 100644
index 00000000000..ccf056f6f0f
--- /dev/null
+++ b/apps/files_versions/l10n/sv.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Inga andra versioner tillgängliga",
+    "Restore" : "Återskapa"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
deleted file mode 100644
index 0fd073d5cbe..00000000000
--- a/apps/files_versions/l10n/sv.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Inga andra versioner tillgängliga",
-"Restore" => "Återskapa"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/ta_LK.js b/apps/files_versions/l10n/ta_LK.js
new file mode 100644
index 00000000000..f03d2e0ff9d
--- /dev/null
+++ b/apps/files_versions/l10n/ta_LK.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Versions" : "பதிப்புகள்"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ta_LK.json b/apps/files_versions/l10n/ta_LK.json
new file mode 100644
index 00000000000..4418ed3b7fb
--- /dev/null
+++ b/apps/files_versions/l10n/ta_LK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Versions" : "பதிப்புகள்"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ta_LK.php b/apps/files_versions/l10n/ta_LK.php
deleted file mode 100644
index 3c21735fa84..00000000000
--- a/apps/files_versions/l10n/ta_LK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Versions" => "பதிப்புகள்"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/th_TH.js b/apps/files_versions/l10n/th_TH.js
new file mode 100644
index 00000000000..72a456dc0ce
--- /dev/null
+++ b/apps/files_versions/l10n/th_TH.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Versions" : "รุ่น",
+    "Restore" : "คืนค่า"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/th_TH.json b/apps/files_versions/l10n/th_TH.json
new file mode 100644
index 00000000000..1d87f34b101
--- /dev/null
+++ b/apps/files_versions/l10n/th_TH.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Versions" : "รุ่น",
+    "Restore" : "คืนค่า"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
deleted file mode 100644
index 97c89b2f809..00000000000
--- a/apps/files_versions/l10n/th_TH.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Versions" => "รุ่น",
-"Restore" => "คืนค่า"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/tr.js b/apps/files_versions/l10n/tr.js
new file mode 100644
index 00000000000..ad248adc1dd
--- /dev/null
+++ b/apps/files_versions/l10n/tr.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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...",
+    "No other versions available" : "Başka sürüm mevcut değil",
+    "Restore" : "Geri yükle"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/files_versions/l10n/tr.json b/apps/files_versions/l10n/tr.json
new file mode 100644
index 00000000000..49731d545c6
--- /dev/null
+++ b/apps/files_versions/l10n/tr.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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...",
+    "No other versions available" : "Başka sürüm mevcut değil",
+    "Restore" : "Geri yükle"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/tr.php b/apps/files_versions/l10n/tr.php
deleted file mode 100644
index 73b77360a2f..00000000000
--- a/apps/files_versions/l10n/tr.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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...",
-"No other versions available" => "Başka sürüm mevcut değil",
-"Restore" => "Geri yükle"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/files_versions/l10n/ug.js b/apps/files_versions/l10n/ug.js
new file mode 100644
index 00000000000..d0fc24b831f
--- /dev/null
+++ b/apps/files_versions/l10n/ug.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "ئەسلىگە قايتۇرالمايدۇ: %s",
+    "Versions" : "نەشرى"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/ug.json b/apps/files_versions/l10n/ug.json
new file mode 100644
index 00000000000..84f12cdc23a
--- /dev/null
+++ b/apps/files_versions/l10n/ug.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Could not revert: %s" : "ئەسلىگە قايتۇرالمايدۇ: %s",
+    "Versions" : "نەشرى"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ug.php b/apps/files_versions/l10n/ug.php
deleted file mode 100644
index 984e6c314c7..00000000000
--- a/apps/files_versions/l10n/ug.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "ئەسلىگە قايتۇرالمايدۇ: %s",
-"Versions" => "نەشرى"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/uk.js b/apps/files_versions/l10n/uk.js
new file mode 100644
index 00000000000..02947793545
--- /dev/null
+++ b/apps/files_versions/l10n/uk.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "Не вдалося відновити: %s",
+    "Versions" : "Версії",
+    "Failed to revert {file} to revision {timestamp}." : "Не вдалося повернути {file} до ревізії {timestamp}.",
+    "More versions..." : "Більше версій ...",
+    "No other versions available" : "Інші версії недоступні",
+    "Restore" : "Відновити"
+},
+"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
new file mode 100644
index 00000000000..6571b1fe2b5
--- /dev/null
+++ b/apps/files_versions/l10n/uk.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "Не вдалося відновити: %s",
+    "Versions" : "Версії",
+    "Failed to revert {file} to revision {timestamp}." : "Не вдалося повернути {file} до ревізії {timestamp}.",
+    "More versions..." : "Більше версій ...",
+    "No other versions available" : "Інші версії недоступні",
+    "Restore" : "Відновити"
+},"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/uk.php b/apps/files_versions/l10n/uk.php
deleted file mode 100644
index 2f87a9e703b..00000000000
--- a/apps/files_versions/l10n/uk.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "Не вдалося відновити: %s",
-"Versions" => "Версії",
-"Failed to revert {file} to revision {timestamp}." => "Не вдалося повернути {file} до ревізії {timestamp}.",
-"More versions..." => "Більше версій ...",
-"No other versions available" => "Інші версії недоступні",
-"Restore" => "Відновити"
-);
-$PLURAL_FORMS = "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/ur_PK.js b/apps/files_versions/l10n/ur_PK.js
new file mode 100644
index 00000000000..ae55363a2dd
--- /dev/null
+++ b/apps/files_versions/l10n/ur_PK.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Restore" : "بحال"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_versions/l10n/ur_PK.json b/apps/files_versions/l10n/ur_PK.json
new file mode 100644
index 00000000000..bfbcb42de28
--- /dev/null
+++ b/apps/files_versions/l10n/ur_PK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Restore" : "بحال"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/ur_PK.php b/apps/files_versions/l10n/ur_PK.php
deleted file mode 100644
index bbf2391a93e..00000000000
--- a/apps/files_versions/l10n/ur_PK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Restore" => "بحال"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/files_versions/l10n/vi.js b/apps/files_versions/l10n/vi.js
new file mode 100644
index 00000000000..08f6c9bb25e
--- /dev/null
+++ b/apps/files_versions/l10n/vi.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "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 ...",
+    "No other versions available" : "Không có các phiên bản khác có sẵn",
+    "Restore" : "Khôi phục"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/vi.json b/apps/files_versions/l10n/vi.json
new file mode 100644
index 00000000000..21b8a964fe0
--- /dev/null
+++ b/apps/files_versions/l10n/vi.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "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 ...",
+    "No other versions available" : "Không có các phiên bản khác có sẵn",
+    "Restore" : "Khôi phục"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
deleted file mode 100644
index a6f515ed0ad..00000000000
--- a/apps/files_versions/l10n/vi.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 ...",
-"No other versions available" => "Không có các phiên bản khác có sẵn",
-"Restore" => "Khôi phục"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_CN.js b/apps/files_versions/l10n/zh_CN.js
new file mode 100644
index 00000000000..8c1ca7ad3ee
--- /dev/null
+++ b/apps/files_versions/l10n/zh_CN.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "无法恢复: %s",
+    "Versions" : "版本",
+    "Failed to revert {file} to revision {timestamp}." : "无法恢复 {file} 到 {timestamp} 的版本。",
+    "More versions..." : "更多版本...",
+    "No other versions available" : "无其他版本可用",
+    "Restore" : "恢复"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/zh_CN.json b/apps/files_versions/l10n/zh_CN.json
new file mode 100644
index 00000000000..4ffb09503b0
--- /dev/null
+++ b/apps/files_versions/l10n/zh_CN.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "无法恢复: %s",
+    "Versions" : "版本",
+    "Failed to revert {file} to revision {timestamp}." : "无法恢复 {file} 到 {timestamp} 的版本。",
+    "More versions..." : "更多版本...",
+    "No other versions available" : "无其他版本可用",
+    "Restore" : "恢复"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
deleted file mode 100644
index 279ec2eff82..00000000000
--- a/apps/files_versions/l10n/zh_CN.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "无法恢复: %s",
-"Versions" => "版本",
-"Failed to revert {file} to revision {timestamp}." => "无法恢复 {file} 到 {timestamp} 的版本。",
-"More versions..." => "更多版本...",
-"No other versions available" => "无其他版本可用",
-"Restore" => "恢复"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_HK.js b/apps/files_versions/l10n/zh_HK.js
new file mode 100644
index 00000000000..bdee63494d7
--- /dev/null
+++ b/apps/files_versions/l10n/zh_HK.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Versions" : "版本"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/zh_HK.json b/apps/files_versions/l10n/zh_HK.json
new file mode 100644
index 00000000000..bbf91817b11
--- /dev/null
+++ b/apps/files_versions/l10n/zh_HK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Versions" : "版本"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/zh_HK.php b/apps/files_versions/l10n/zh_HK.php
deleted file mode 100644
index 6d249af4b16..00000000000
--- a/apps/files_versions/l10n/zh_HK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Versions" => "版本"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/files_versions/l10n/zh_TW.js b/apps/files_versions/l10n/zh_TW.js
new file mode 100644
index 00000000000..8094658394e
--- /dev/null
+++ b/apps/files_versions/l10n/zh_TW.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "files_versions",
+    {
+    "Could not revert: %s" : "無法還原：%s",
+    "Versions" : "版本",
+    "Failed to revert {file} to revision {timestamp}." : "無法還原檔案 {file} 至版本 {timestamp}",
+    "More versions..." : "更多版本…",
+    "No other versions available" : "沒有其他版本了",
+    "Restore" : "復原"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/files_versions/l10n/zh_TW.json b/apps/files_versions/l10n/zh_TW.json
new file mode 100644
index 00000000000..0766f66976f
--- /dev/null
+++ b/apps/files_versions/l10n/zh_TW.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Could not revert: %s" : "無法還原：%s",
+    "Versions" : "版本",
+    "Failed to revert {file} to revision {timestamp}." : "無法還原檔案 {file} 至版本 {timestamp}",
+    "More versions..." : "更多版本…",
+    "No other versions available" : "沒有其他版本了",
+    "Restore" : "復原"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/files_versions/l10n/zh_TW.php b/apps/files_versions/l10n/zh_TW.php
deleted file mode 100644
index 9b8900fd8e1..00000000000
--- a/apps/files_versions/l10n/zh_TW.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Could not revert: %s" => "無法還原：%s",
-"Versions" => "版本",
-"Failed to revert {file} to revision {timestamp}." => "無法還原檔案 {file} 至版本 {timestamp}",
-"More versions..." => "更多版本…",
-"No other versions available" => "沒有其他版本了",
-"Restore" => "復原"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ach.js b/apps/user_ldap/l10n/ach.js
new file mode 100644
index 00000000000..95c97db2f9c
--- /dev/null
+++ b/apps/user_ldap/l10n/ach.js
@@ -0,0 +1,7 @@
+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/ach.json b/apps/user_ldap/l10n/ach.json
new file mode 100644
index 00000000000..8e0cd6f6783
--- /dev/null
+++ b/apps/user_ldap/l10n/ach.json
@@ -0,0 +1,5 @@
+{ "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/ach.php b/apps/user_ldap/l10n/ach.php
deleted file mode 100644
index 2371ee70593..00000000000
--- a/apps/user_ldap/l10n/ach.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/ady.js b/apps/user_ldap/l10n/ady.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/ady.js
@@ -0,0 +1,7 @@
+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/ady.json b/apps/user_ldap/l10n/ady.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/ady.json
@@ -0,0 +1,5 @@
+{ "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/ady.php b/apps/user_ldap/l10n/ady.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/ady.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/af_ZA.js b/apps/user_ldap/l10n/af_ZA.js
new file mode 100644
index 00000000000..fc00b542daa
--- /dev/null
+++ b/apps/user_ldap/l10n/af_ZA.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Help" : "Hulp",
+    "Password" : "Wagwoord",
+    "Continue" : "Gaan voort",
+    "Advanced" : "Gevorderd"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/af_ZA.json b/apps/user_ldap/l10n/af_ZA.json
new file mode 100644
index 00000000000..ec83ea0849a
--- /dev/null
+++ b/apps/user_ldap/l10n/af_ZA.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Help" : "Hulp",
+    "Password" : "Wagwoord",
+    "Continue" : "Gaan voort",
+    "Advanced" : "Gevorderd"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/af_ZA.php b/apps/user_ldap/l10n/af_ZA.php
deleted file mode 100644
index e4e599e059e..00000000000
--- a/apps/user_ldap/l10n/af_ZA.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Help" => "Hulp",
-"Password" => "Wagwoord",
-"Continue" => "Gaan voort",
-"Advanced" => "Gevorderd"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ak.js b/apps/user_ldap/l10n/ak.js
new file mode 100644
index 00000000000..a88c80b7933
--- /dev/null
+++ b/apps/user_ldap/l10n/ak.js
@@ -0,0 +1,7 @@
+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/ak.json b/apps/user_ldap/l10n/ak.json
new file mode 100644
index 00000000000..58fcef711ee
--- /dev/null
+++ b/apps/user_ldap/l10n/ak.json
@@ -0,0 +1,5 @@
+{ "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/ak.php b/apps/user_ldap/l10n/ak.php
deleted file mode 100644
index dd5f66761d6..00000000000
--- a/apps/user_ldap/l10n/ak.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=n > 1;";
diff --git a/apps/user_ldap/l10n/am_ET.js b/apps/user_ldap/l10n/am_ET.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/am_ET.js
@@ -0,0 +1,7 @@
+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/am_ET.json b/apps/user_ldap/l10n/am_ET.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/am_ET.json
@@ -0,0 +1,5 @@
+{ "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/am_ET.php b/apps/user_ldap/l10n/am_ET.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/am_ET.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ar.js b/apps/user_ldap/l10n/ar.js
new file mode 100644
index 00000000000..11472f292d4
--- /dev/null
+++ b/apps/user_ldap/l10n/ar.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to delete the server configuration" : "تعذر حذف ملف إعدادات الخادم",
+    "The configuration is valid and the connection could be established!" : "الإعدادت صحيحة",
+    "Deletion failed" : "فشل الحذف",
+    "Success" : "نجاح",
+    "Error" : "خطأ",
+    "Select groups" : "إختر مجموعة",
+    "_%s group found_::_%s groups found_" : ["","","","","",""],
+    "_%s user found_::_%s users found_" : ["","","","","",""],
+    "Save" : "حفظ",
+    "Help" : "المساعدة",
+    "Host" : "المضيف",
+    "Port" : "المنفذ",
+    "Password" : "كلمة المرور",
+    "Back" : "رجوع",
+    "Advanced" : "تعديلات متقدمه",
+    "Email Field" : "خانة البريد الإلكتروني"
+},
+"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_ldap/l10n/ar.json b/apps/user_ldap/l10n/ar.json
new file mode 100644
index 00000000000..1a3cfe03b4a
--- /dev/null
+++ b/apps/user_ldap/l10n/ar.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Failed to delete the server configuration" : "تعذر حذف ملف إعدادات الخادم",
+    "The configuration is valid and the connection could be established!" : "الإعدادت صحيحة",
+    "Deletion failed" : "فشل الحذف",
+    "Success" : "نجاح",
+    "Error" : "خطأ",
+    "Select groups" : "إختر مجموعة",
+    "_%s group found_::_%s groups found_" : ["","","","","",""],
+    "_%s user found_::_%s users found_" : ["","","","","",""],
+    "Save" : "حفظ",
+    "Help" : "المساعدة",
+    "Host" : "المضيف",
+    "Port" : "المنفذ",
+    "Password" : "كلمة المرور",
+    "Back" : "رجوع",
+    "Advanced" : "تعديلات متقدمه",
+    "Email Field" : "خانة البريد الإلكتروني"
+},"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_ldap/l10n/ar.php b/apps/user_ldap/l10n/ar.php
deleted file mode 100644
index e10ada32d55..00000000000
--- a/apps/user_ldap/l10n/ar.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "فشل مسح الارتباطات (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." => "الإعدادات صحيحة، لكن لم ينجح الارتباط. يرجى التأكد من إعدادات الخادم وبيانات التحقق من الدخول.",
-"The configuration is invalid. Please have a look at the logs for further details." => "الإعدادات غير صحيحة. يرجى الاطلاع على سجلات المتابعة للمزيد من التفاصيل.",
-"No action specified" => "لم يتم تحديد الإجراء",
-"No configuration specified" => "لم يتم تحديد الإعدادات.",
-"No data specified" => "لم يتم تحديد البيانات.",
-" Could not set configuration %s" => "تعذر تنفيذ الإعداد %s",
-"Deletion failed" => "فشل الحذف",
-"Take over settings from recent server configuration?" => "الحصول على الخصائص من آخر إعدادات في الخادم؟",
-"Keep settings?" => "الاحتفاظ بالخصائص والإعدادات؟",
-"{nthServer}. Server" => "الخادم {nthServer}.",
-"Cannot add server configuration" => "تعذر إضافة الإعدادات للخادم.",
-"mappings cleared" => "تم مسح الارتباطات (mappings)",
-"Success" => "نجاح",
-"Error" => "خطأ",
-"Please specify a Base DN" => "يرجى تحديد اسم نطاق أساسي Base DN",
-"Could not determine Base DN" => "تعذر التحقق من اسم النطاق الأساسي Base DN",
-"Please specify the port" => "يرجى تحديد المنفذ",
-"Configuration OK" => "الإعدادات صحيحة",
-"Configuration incorrect" => "الإعدادات غير صحيحة",
-"Configuration incomplete" => "الإعدادات غير مكتملة",
-"Select groups" => "إختر مجموعة",
-"Select object classes" => "اختر أصناف المكونات",
-"Select attributes" => "اختر الخصائص",
-"Connection test succeeded" => "تم اختبار الاتصال بنجاح",
-"Connection test failed" => "فشل اختبار الاتصال",
-"Do you really want to delete the current Server Configuration?" => "هل ترغب فعلاً في حذف إعدادات الخادم الحالي؟",
-"Confirm Deletion" => "تأكيد الحذف",
-"_%s group found_::_%s groups found_" => array("لا توجد مجموعات: %s","تم إيجاد %s مجموعة واحدة","تم إيجاد %s مجموعتين","تم إيجاد %s مجموعات","تم إيجاد %s مجموعة","تم إيجاد %s مجموعة/مجموعات"),
-"_%s user found_::_%s users found_" => array("","","","","",""),
-"Save" => "حفظ",
-"Help" => "المساعدة",
-"Host" => "المضيف",
-"Port" => "المنفذ",
-"Password" => "كلمة المرور",
-"Back" => "رجوع",
-"Advanced" => "تعديلات متقدمه",
-"Email Field" => "خانة البريد الإلكتروني"
-);
-$PLURAL_FORMS = "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_ldap/l10n/ast.js b/apps/user_ldap/l10n/ast.js
new file mode 100644
index 00000000000..9a1c765979a
--- /dev/null
+++ b/apps/user_ldap/l10n/ast.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Hebo un fallu al desaniciar les asignaciones.",
+    "Failed to delete the server configuration" : "Fallu al desaniciar la configuración del sirvidor",
+    "The configuration is valid and the connection could be established!" : "¡La configuración ye válida y pudo afitase la conexón!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración ye válida, pero falló'l vínculu.  Por favor, comprueba la configuración y les credenciales nel sirvidor.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.",
+    "No action specified" : "Nun s'especificó l'aición",
+    "No configuration specified" : "Nun s'especificó la configuración",
+    "No data specified" : "Nun s'especificaron los datos",
+    " Could not set configuration %s" : "Nun pudo afitase la configuración %s",
+    "Deletion failed" : "Falló'l borráu",
+    "Take over settings from recent server configuration?" : "¿Asumir los axustes actuales de la configuración del sirvidor?",
+    "Keep settings?" : "¿Caltener los axustes?",
+    "{nthServer}. Server" : "{nthServer}. Sirvidor",
+    "Cannot add server configuration" : "Nun pue amestase la configuración del sirvidor",
+    "mappings cleared" : "Asignaciones desaniciaes",
+    "Success" : "Con ésitu",
+    "Error" : "Fallu",
+    "Please specify a Base DN" : "Especifica un DN base",
+    "Could not determine Base DN" : "Nun pudo determinase un DN base",
+    "Please specify the port" : "Especifica'l puertu",
+    "Configuration OK" : "Configuración correuta",
+    "Configuration incorrect" : "Configuración incorreuta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Esbillar grupos",
+    "Select object classes" : "Seleicionar la clas d'oxetu",
+    "Select attributes" : "Esbillar atributos",
+    "Connection test succeeded" : "Test de conexón esitosu",
+    "Connection test failed" : "Falló'l test de conexón",
+    "Do you really want to delete the current Server Configuration?" : "¿Daveres que quies desaniciar la configuración actual del sirvidor?",
+    "Confirm Deletion" : "Confirmar desaniciu",
+    "_%s group found_::_%s groups found_" : ["%s grupu alcontráu","%s grupos alcontraos"],
+    "_%s user found_::_%s users found_" : ["%s usuariu alcontráu","%s usuarios alcontraos"],
+    "Could not find the desired feature" : "Nun pudo alcontrase la carauterística deseyada",
+    "Invalid Host" : "Host inválidu",
+    "Server" : "Sirvidor",
+    "User Filter" : "Filtru d'usuariu",
+    "Login Filter" : "Filtru de login",
+    "Group Filter" : "Filtru de Grupu",
+    "Save" : "Guardar",
+    "Test Configuration" : "Configuración de prueba",
+    "Help" : "Ayuda",
+    "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios tán disponibles en %s:",
+    "only those object classes:" : "namái d'estes clases d'oxetu:",
+    "only from those groups:" : "manái d'estos grupos:",
+    "Edit raw filter instead" : "Editar el filtru en brutu en so llugar",
+    "Raw LDAP filter" : "Filtru LDAP en brutu",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtru especifica qué grupos LDAP van tener accesu a %s.",
+    "groups found" : "grupos alcontraos",
+    "Users login with this attribute:" : "Aniciu de sesión d'usuarios con esti atributu:",
+    "LDAP Username:" : "Nome d'usuariu LDAP",
+    "LDAP Email Address:" : "Direición e-mail LDAP:",
+    "Other Attributes:" : "Otros atributos:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define'l filtru a aplicar cuando s'intenta identificar. %%uid va trocar al nome d'usuariu nel procesu d'identificación. Por exemplu: \"uid=%%uid\"",
+    "1. Server" : "1. Sirvidor",
+    "%s. Server:" : "%s. Sirvidor:",
+    "Add Server Configuration" : "Amestar configuración del sirvidor",
+    "Delete Configuration" : "Desaniciar configuración",
+    "Host" : "Equipu",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pues omitir el protocolu, sacantes si necesites SSL. Nesi casu, entama con ldaps://",
+    "Port" : "Puertu",
+    "User DN" : "DN usuariu",
+    "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." : "El DN del usuariu veceru col que va facese l'asociación, p.ex. uid=axente,dc=exemplu,dc=com. P'accesu anónimu, dexa DN y contraseña baleros.",
+    "Password" : "Contraseña",
+    "For anonymous access, leave DN and Password empty." : "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
+    "One Base DN per line" : "Un DN Base por llinia",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Pues especificar el DN base pa usuarios y grupos na llingüeta Avanzáu",
+    "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
+    "users found" : "usuarios alcontraos",
+    "Back" : "Atrás",
+    "Continue" : "Continuar",
+    "Expert" : "Espertu",
+    "Advanced" : "Avanzáu",
+    "<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>Avisu:</b> Les apps user_ldap y user_webdavauth son incompatibles. Pues esperimentar un comportamientu inesperáu. Entruga al to alministrador de sistemes pa desactivar una d'elles.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Avisu:</b> El módulu LDAP de PHP nun ta instaláu, el sistema nun va funcionar. Por favor consulta al alministrador del sistema pa instalalu.",
+    "Connection Settings" : "Axustes de conexón",
+    "Configuration Active" : "Configuración activa",
+    "When unchecked, this configuration will be skipped." : "Cuando nun tea conseñáu, saltaráse esta configuración.",
+    "Backup (Replica) Host" : "Sirvidor de copia de seguranza (Réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un sirvidor de copia de seguranza opcional. Tien de ser una réplica del sirvidor principal LDAP / AD.",
+    "Backup (Replica) Port" : "Puertu pa copies de seguranza (Réplica)",
+    "Disable Main Server" : "Deshabilitar sirvidor principal",
+    "Only connect to the replica server." : "Coneutar namái col sirvidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Sirvidor de LDAP insensible a mayúscules/minúscules (Windows)",
+    "Turn off SSL certificate validation." : "Apagar la validación del certificáu SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nun se recomienda, ¡úsalu namái pa pruebes! Si la conexón namái funciona con esta opción, importa'l certificáu SSL del sirvidor LDAP nel to sirvidor %s.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "en segundos. Un cambéu vacia la caché.",
+    "Directory Settings" : "Axustes del direutoriu",
+    "User Display Name Field" : "Campu de nome d'usuariu a amosar",
+    "The LDAP attribute to use to generate the user's display name." : "El campu LDAP a usar pa xenerar el nome p'amosar del usuariu.",
+    "Base User Tree" : "Árbol base d'usuariu",
+    "One User Base DN per line" : "Un DN Base d'Usuariu por llinia",
+    "User Search Attributes" : "Atributos de la gueta d'usuariu",
+    "Optional; one attribute per line" : "Opcional; un atributu por llinia",
+    "Group Display Name Field" : "Campu de nome de grupu a amosar",
+    "The LDAP attribute to use to generate the groups's display name." : "El campu LDAP a usar pa xenerar el nome p'amosar del grupu.",
+    "Base Group Tree" : "Árbol base de grupu",
+    "One Group Base DN per line" : "Un DN Base de Grupu por llinia",
+    "Group Search Attributes" : "Atributos de gueta de grupu",
+    "Group-Member association" : "Asociación Grupu-Miembru",
+    "Nested Groups" : "Grupos añeraos",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Cuando s'active, van permitise grupos que contengan otros grupos (namái funciona si l'atributu de miembru de grupu contién DNs).",
+    "Paging chunksize" : "Tamañu de los fragmentos de paxinación",
+    "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.)" : "Tamañu de los fragmentos usáu pa busques LDAP paxinaes que puen devolver resultaos voluminosos, como enubmeración d'usuarios o de grupos. (Si s'afita en 0, van deshabilitase les busques LDAP paxinaes neses situaciones.)",
+    "Special Attributes" : "Atributos especiales",
+    "Quota Field" : "Cuota",
+    "Quota Default" : "Cuota por defeutu",
+    "in bytes" : "en bytes",
+    "Email Field" : "E-mail",
+    "User Home Folder Naming Rule" : "Regla pa la carpeta Home d'usuariu",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Baleru pal nome d'usuariu (por defeutu). N'otru casu, especifica un atributu LDAP/AD.",
+    "Internal Username" : "Nome d'usuariu internu",
+    "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." : "El nome d'usuariu internu va crease de forma predeterminada dende l'atributu UUID. Esto asegura que'l nome d'usuariu ye únicu y los caráuteres nun necesiten convertise. Nel nome d'usuariu internu namái puen usase estos caráuteres: [ a-zA-Z0-9_.@- ]. El restu de caráuteres sustitúyense pol so correspondiente en ASCII u omítense. En casu de duplicidaes, va amestase o incrementase un númberu. El nome d'usuariu internu úsase pa identificar un usuariu. Ye tamién el nome predetermináu pa la carpeta personal del usuariu en ownCloud. Tamién ye parte d'URLs remotes, por exemplu, pa tolos servicios *DAV. Con esta configuración el comportamientu predetermináu pue cambiase. Pa consiguir un comportamientu asemeyáu a como yera enantes d'ownCloud 5, introduz el campu del nome p'amosar del usuariu na siguiente caxa. Déxalu baleru pal comportamientu predetermináu. Los cambeos namái van tener efeutu nos usuarios LDAP mapeaos (amestaos) recién.",
+    "Internal Username Attribute:" : "Atributu Nome d'usuariu Internu:",
+    "Override UUID detection" : "Sobrescribir la deteición 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." : "Por defeutu, l'atributu UUID autodetéutase. Esti atributu úsase pa identificar induldablemente usuarios y grupos LDAP. Arriendes, el nome d'usuariu internu va crease en bas al UUID, si nun s'especificó otru comportamientu arriba. Pues sobrescribir la configuración y pasar un atributu de la to eleición. Tienes d'asegurate de que l'atributu de la to eleición seya accesible polos usuarios y grupos y ser únicu. Déxalu en blanco pa usar el comportamientu por defeutu. Los cambeos van tener efeutu namái nos usuarios y grupos de LDAP mapeaos (amestaos) recién.",
+    "UUID Attribute for Users:" : "Atributu UUID pa usuarios:",
+    "UUID Attribute for Groups:" : "Atributu UUID pa Grupos:",
+    "Username-LDAP User Mapping" : "Asignación del Nome d'usuariu LDAP",
+    "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." : "Los usuarios úsense p'almacenar y asignar (meta) datos. Col envís d'identificar de forma precisa y reconocer usuarios, cada usuariu de LDAP va tener un nome d'usuariu internu. Esto requier un mapéu ente'l nome d'usuariu y l'usuariu del LDAP. El nome d'usuariu creáu mapéase respeutu al UUID del usuariu nel LDAP. De forma adicional, el DN cachéase p'amenorgar la interaición ente'l LDAP, pero nun s'usa pa identificar. Si'l DN camuda, los cambeos van aplicase. El nome d'usuariu internu úsase penriba de too. Llimpiar los mapeos va dexar restos per toos llaos, nun ye sensible a configuración, ¡afeuta a toles configuraciones del LDAP! Enxamás llimpies los mapeos nun entornu de producción, namái nuna fase de desendolcu o esperimental.",
+    "Clear Username-LDAP User Mapping" : "Llimpiar l'asignación de los Nomes d'usuariu de los usuarios LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Llimpiar l'asignación de los Nomes de grupu de los grupos de LDAP"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ast.json b/apps/user_ldap/l10n/ast.json
new file mode 100644
index 00000000000..eb53ddad6db
--- /dev/null
+++ b/apps/user_ldap/l10n/ast.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Hebo un fallu al desaniciar les asignaciones.",
+    "Failed to delete the server configuration" : "Fallu al desaniciar la configuración del sirvidor",
+    "The configuration is valid and the connection could be established!" : "¡La configuración ye válida y pudo afitase la conexón!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración ye válida, pero falló'l vínculu.  Por favor, comprueba la configuración y les credenciales nel sirvidor.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.",
+    "No action specified" : "Nun s'especificó l'aición",
+    "No configuration specified" : "Nun s'especificó la configuración",
+    "No data specified" : "Nun s'especificaron los datos",
+    " Could not set configuration %s" : "Nun pudo afitase la configuración %s",
+    "Deletion failed" : "Falló'l borráu",
+    "Take over settings from recent server configuration?" : "¿Asumir los axustes actuales de la configuración del sirvidor?",
+    "Keep settings?" : "¿Caltener los axustes?",
+    "{nthServer}. Server" : "{nthServer}. Sirvidor",
+    "Cannot add server configuration" : "Nun pue amestase la configuración del sirvidor",
+    "mappings cleared" : "Asignaciones desaniciaes",
+    "Success" : "Con ésitu",
+    "Error" : "Fallu",
+    "Please specify a Base DN" : "Especifica un DN base",
+    "Could not determine Base DN" : "Nun pudo determinase un DN base",
+    "Please specify the port" : "Especifica'l puertu",
+    "Configuration OK" : "Configuración correuta",
+    "Configuration incorrect" : "Configuración incorreuta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Esbillar grupos",
+    "Select object classes" : "Seleicionar la clas d'oxetu",
+    "Select attributes" : "Esbillar atributos",
+    "Connection test succeeded" : "Test de conexón esitosu",
+    "Connection test failed" : "Falló'l test de conexón",
+    "Do you really want to delete the current Server Configuration?" : "¿Daveres que quies desaniciar la configuración actual del sirvidor?",
+    "Confirm Deletion" : "Confirmar desaniciu",
+    "_%s group found_::_%s groups found_" : ["%s grupu alcontráu","%s grupos alcontraos"],
+    "_%s user found_::_%s users found_" : ["%s usuariu alcontráu","%s usuarios alcontraos"],
+    "Could not find the desired feature" : "Nun pudo alcontrase la carauterística deseyada",
+    "Invalid Host" : "Host inválidu",
+    "Server" : "Sirvidor",
+    "User Filter" : "Filtru d'usuariu",
+    "Login Filter" : "Filtru de login",
+    "Group Filter" : "Filtru de Grupu",
+    "Save" : "Guardar",
+    "Test Configuration" : "Configuración de prueba",
+    "Help" : "Ayuda",
+    "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios tán disponibles en %s:",
+    "only those object classes:" : "namái d'estes clases d'oxetu:",
+    "only from those groups:" : "manái d'estos grupos:",
+    "Edit raw filter instead" : "Editar el filtru en brutu en so llugar",
+    "Raw LDAP filter" : "Filtru LDAP en brutu",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtru especifica qué grupos LDAP van tener accesu a %s.",
+    "groups found" : "grupos alcontraos",
+    "Users login with this attribute:" : "Aniciu de sesión d'usuarios con esti atributu:",
+    "LDAP Username:" : "Nome d'usuariu LDAP",
+    "LDAP Email Address:" : "Direición e-mail LDAP:",
+    "Other Attributes:" : "Otros atributos:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define'l filtru a aplicar cuando s'intenta identificar. %%uid va trocar al nome d'usuariu nel procesu d'identificación. Por exemplu: \"uid=%%uid\"",
+    "1. Server" : "1. Sirvidor",
+    "%s. Server:" : "%s. Sirvidor:",
+    "Add Server Configuration" : "Amestar configuración del sirvidor",
+    "Delete Configuration" : "Desaniciar configuración",
+    "Host" : "Equipu",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pues omitir el protocolu, sacantes si necesites SSL. Nesi casu, entama con ldaps://",
+    "Port" : "Puertu",
+    "User DN" : "DN usuariu",
+    "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." : "El DN del usuariu veceru col que va facese l'asociación, p.ex. uid=axente,dc=exemplu,dc=com. P'accesu anónimu, dexa DN y contraseña baleros.",
+    "Password" : "Contraseña",
+    "For anonymous access, leave DN and Password empty." : "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
+    "One Base DN per line" : "Un DN Base por llinia",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Pues especificar el DN base pa usuarios y grupos na llingüeta Avanzáu",
+    "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
+    "users found" : "usuarios alcontraos",
+    "Back" : "Atrás",
+    "Continue" : "Continuar",
+    "Expert" : "Espertu",
+    "Advanced" : "Avanzáu",
+    "<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>Avisu:</b> Les apps user_ldap y user_webdavauth son incompatibles. Pues esperimentar un comportamientu inesperáu. Entruga al to alministrador de sistemes pa desactivar una d'elles.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Avisu:</b> El módulu LDAP de PHP nun ta instaláu, el sistema nun va funcionar. Por favor consulta al alministrador del sistema pa instalalu.",
+    "Connection Settings" : "Axustes de conexón",
+    "Configuration Active" : "Configuración activa",
+    "When unchecked, this configuration will be skipped." : "Cuando nun tea conseñáu, saltaráse esta configuración.",
+    "Backup (Replica) Host" : "Sirvidor de copia de seguranza (Réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un sirvidor de copia de seguranza opcional. Tien de ser una réplica del sirvidor principal LDAP / AD.",
+    "Backup (Replica) Port" : "Puertu pa copies de seguranza (Réplica)",
+    "Disable Main Server" : "Deshabilitar sirvidor principal",
+    "Only connect to the replica server." : "Coneutar namái col sirvidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Sirvidor de LDAP insensible a mayúscules/minúscules (Windows)",
+    "Turn off SSL certificate validation." : "Apagar la validación del certificáu SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nun se recomienda, ¡úsalu namái pa pruebes! Si la conexón namái funciona con esta opción, importa'l certificáu SSL del sirvidor LDAP nel to sirvidor %s.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "en segundos. Un cambéu vacia la caché.",
+    "Directory Settings" : "Axustes del direutoriu",
+    "User Display Name Field" : "Campu de nome d'usuariu a amosar",
+    "The LDAP attribute to use to generate the user's display name." : "El campu LDAP a usar pa xenerar el nome p'amosar del usuariu.",
+    "Base User Tree" : "Árbol base d'usuariu",
+    "One User Base DN per line" : "Un DN Base d'Usuariu por llinia",
+    "User Search Attributes" : "Atributos de la gueta d'usuariu",
+    "Optional; one attribute per line" : "Opcional; un atributu por llinia",
+    "Group Display Name Field" : "Campu de nome de grupu a amosar",
+    "The LDAP attribute to use to generate the groups's display name." : "El campu LDAP a usar pa xenerar el nome p'amosar del grupu.",
+    "Base Group Tree" : "Árbol base de grupu",
+    "One Group Base DN per line" : "Un DN Base de Grupu por llinia",
+    "Group Search Attributes" : "Atributos de gueta de grupu",
+    "Group-Member association" : "Asociación Grupu-Miembru",
+    "Nested Groups" : "Grupos añeraos",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Cuando s'active, van permitise grupos que contengan otros grupos (namái funciona si l'atributu de miembru de grupu contién DNs).",
+    "Paging chunksize" : "Tamañu de los fragmentos de paxinación",
+    "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.)" : "Tamañu de los fragmentos usáu pa busques LDAP paxinaes que puen devolver resultaos voluminosos, como enubmeración d'usuarios o de grupos. (Si s'afita en 0, van deshabilitase les busques LDAP paxinaes neses situaciones.)",
+    "Special Attributes" : "Atributos especiales",
+    "Quota Field" : "Cuota",
+    "Quota Default" : "Cuota por defeutu",
+    "in bytes" : "en bytes",
+    "Email Field" : "E-mail",
+    "User Home Folder Naming Rule" : "Regla pa la carpeta Home d'usuariu",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Baleru pal nome d'usuariu (por defeutu). N'otru casu, especifica un atributu LDAP/AD.",
+    "Internal Username" : "Nome d'usuariu internu",
+    "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." : "El nome d'usuariu internu va crease de forma predeterminada dende l'atributu UUID. Esto asegura que'l nome d'usuariu ye únicu y los caráuteres nun necesiten convertise. Nel nome d'usuariu internu namái puen usase estos caráuteres: [ a-zA-Z0-9_.@- ]. El restu de caráuteres sustitúyense pol so correspondiente en ASCII u omítense. En casu de duplicidaes, va amestase o incrementase un númberu. El nome d'usuariu internu úsase pa identificar un usuariu. Ye tamién el nome predetermináu pa la carpeta personal del usuariu en ownCloud. Tamién ye parte d'URLs remotes, por exemplu, pa tolos servicios *DAV. Con esta configuración el comportamientu predetermináu pue cambiase. Pa consiguir un comportamientu asemeyáu a como yera enantes d'ownCloud 5, introduz el campu del nome p'amosar del usuariu na siguiente caxa. Déxalu baleru pal comportamientu predetermináu. Los cambeos namái van tener efeutu nos usuarios LDAP mapeaos (amestaos) recién.",
+    "Internal Username Attribute:" : "Atributu Nome d'usuariu Internu:",
+    "Override UUID detection" : "Sobrescribir la deteición 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." : "Por defeutu, l'atributu UUID autodetéutase. Esti atributu úsase pa identificar induldablemente usuarios y grupos LDAP. Arriendes, el nome d'usuariu internu va crease en bas al UUID, si nun s'especificó otru comportamientu arriba. Pues sobrescribir la configuración y pasar un atributu de la to eleición. Tienes d'asegurate de que l'atributu de la to eleición seya accesible polos usuarios y grupos y ser únicu. Déxalu en blanco pa usar el comportamientu por defeutu. Los cambeos van tener efeutu namái nos usuarios y grupos de LDAP mapeaos (amestaos) recién.",
+    "UUID Attribute for Users:" : "Atributu UUID pa usuarios:",
+    "UUID Attribute for Groups:" : "Atributu UUID pa Grupos:",
+    "Username-LDAP User Mapping" : "Asignación del Nome d'usuariu LDAP",
+    "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." : "Los usuarios úsense p'almacenar y asignar (meta) datos. Col envís d'identificar de forma precisa y reconocer usuarios, cada usuariu de LDAP va tener un nome d'usuariu internu. Esto requier un mapéu ente'l nome d'usuariu y l'usuariu del LDAP. El nome d'usuariu creáu mapéase respeutu al UUID del usuariu nel LDAP. De forma adicional, el DN cachéase p'amenorgar la interaición ente'l LDAP, pero nun s'usa pa identificar. Si'l DN camuda, los cambeos van aplicase. El nome d'usuariu internu úsase penriba de too. Llimpiar los mapeos va dexar restos per toos llaos, nun ye sensible a configuración, ¡afeuta a toles configuraciones del LDAP! Enxamás llimpies los mapeos nun entornu de producción, namái nuna fase de desendolcu o esperimental.",
+    "Clear Username-LDAP User Mapping" : "Llimpiar l'asignación de los Nomes d'usuariu de los usuarios LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Llimpiar l'asignación de los Nomes de grupu de los grupos de LDAP"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ast.php b/apps/user_ldap/l10n/ast.php
deleted file mode 100644
index f319a46a4ae..00000000000
--- a/apps/user_ldap/l10n/ast.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Hebo un fallu al desaniciar les asignaciones.",
-"Failed to delete the server configuration" => "Fallu al desaniciar la configuración del sirvidor",
-"The configuration is valid and the connection could be established!" => "¡La configuración ye válida y pudo afitase la conexón!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración ye válida, pero falló'l vínculu.  Por favor, comprueba la configuración y les credenciales nel sirvidor.",
-"The configuration is invalid. Please have a look at the logs for further details." => "La configuración nun ye válida. Por favor, écha-y un güeyu a los rexistros pa más detalles.",
-"No action specified" => "Nun s'especificó l'aición",
-"No configuration specified" => "Nun s'especificó la configuración",
-"No data specified" => "Nun s'especificaron los datos",
-" Could not set configuration %s" => "Nun pudo afitase la configuración %s",
-"Deletion failed" => "Falló'l borráu",
-"Take over settings from recent server configuration?" => "¿Asumir los axustes actuales de la configuración del sirvidor?",
-"Keep settings?" => "¿Caltener los axustes?",
-"{nthServer}. Server" => "{nthServer}. Sirvidor",
-"Cannot add server configuration" => "Nun pue amestase la configuración del sirvidor",
-"mappings cleared" => "Asignaciones desaniciaes",
-"Success" => "Con ésitu",
-"Error" => "Fallu",
-"Please specify a Base DN" => "Especifica un DN base",
-"Could not determine Base DN" => "Nun pudo determinase un DN base",
-"Please specify the port" => "Especifica'l puertu",
-"Configuration OK" => "Configuración correuta",
-"Configuration incorrect" => "Configuración incorreuta",
-"Configuration incomplete" => "Configuración incompleta",
-"Select groups" => "Esbillar grupos",
-"Select object classes" => "Seleicionar la clas d'oxetu",
-"Select attributes" => "Esbillar atributos",
-"Connection test succeeded" => "Test de conexón esitosu",
-"Connection test failed" => "Falló'l test de conexón",
-"Do you really want to delete the current Server Configuration?" => "¿Daveres que quies desaniciar la configuración actual del sirvidor?",
-"Confirm Deletion" => "Confirmar desaniciu",
-"_%s group found_::_%s groups found_" => array("%s grupu alcontráu","%s grupos alcontraos"),
-"_%s user found_::_%s users found_" => array("%s usuariu alcontráu","%s usuarios alcontraos"),
-"Could not find the desired feature" => "Nun pudo alcontrase la carauterística deseyada",
-"Invalid Host" => "Host inválidu",
-"Server" => "Sirvidor",
-"User Filter" => "Filtru d'usuariu",
-"Login Filter" => "Filtru de login",
-"Group Filter" => "Filtru de Grupu",
-"Save" => "Guardar",
-"Test Configuration" => "Configuración de prueba",
-"Help" => "Ayuda",
-"Groups meeting these criteria are available in %s:" => "Los grupos que cumplen estos criterios tán disponibles en %s:",
-"only those object classes:" => "namái d'estes clases d'oxetu:",
-"only from those groups:" => "manái d'estos grupos:",
-"Edit raw filter instead" => "Editar el filtru en brutu en so llugar",
-"Raw LDAP filter" => "Filtru LDAP en brutu",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "El filtru especifica qué grupos LDAP van tener accesu a %s.",
-"groups found" => "grupos alcontraos",
-"Users login with this attribute:" => "Aniciu de sesión d'usuarios con esti atributu:",
-"LDAP Username:" => "Nome d'usuariu LDAP",
-"LDAP Email Address:" => "Direición e-mail LDAP:",
-"Other Attributes:" => "Otros atributos:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define'l filtru a aplicar cuando s'intenta identificar. %%uid va trocar al nome d'usuariu nel procesu d'identificación. Por exemplu: \"uid=%%uid\"",
-"1. Server" => "1. Sirvidor",
-"%s. Server:" => "%s. Sirvidor:",
-"Add Server Configuration" => "Amestar configuración del sirvidor",
-"Delete Configuration" => "Desaniciar configuración",
-"Host" => "Equipu",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pues omitir el protocolu, sacantes si necesites SSL. Nesi casu, entama con ldaps://",
-"Port" => "Puertu",
-"User DN" => "DN usuariu",
-"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." => "El DN del usuariu veceru col que va facese l'asociación, p.ex. uid=axente,dc=exemplu,dc=com. P'accesu anónimu, dexa DN y contraseña baleros.",
-"Password" => "Contraseña",
-"For anonymous access, leave DN and Password empty." => "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
-"One Base DN per line" => "Un DN Base por llinia",
-"You can specify Base DN for users and groups in the Advanced tab" => "Pues especificar el DN base pa usuarios y grupos na llingüeta Avanzáu",
-"Limit %s access to users meeting these criteria:" => "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
-"users found" => "usuarios alcontraos",
-"Back" => "Atrás",
-"Continue" => "Continuar",
-"Expert" => "Espertu",
-"Advanced" => "Avanzáu",
-"<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>Avisu:</b> Les apps user_ldap y user_webdavauth son incompatibles. Pues esperimentar un comportamientu inesperáu. Entruga al to alministrador de sistemes pa desactivar una d'elles.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Avisu:</b> El módulu LDAP de PHP nun ta instaláu, el sistema nun va funcionar. Por favor consulta al alministrador del sistema pa instalalu.",
-"Connection Settings" => "Axustes de conexón",
-"Configuration Active" => "Configuración activa",
-"When unchecked, this configuration will be skipped." => "Cuando nun tea conseñáu, saltaráse esta configuración.",
-"Backup (Replica) Host" => "Sirvidor de copia de seguranza (Réplica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un sirvidor de copia de seguranza opcional. Tien de ser una réplica del sirvidor principal LDAP / AD.",
-"Backup (Replica) Port" => "Puertu pa copies de seguranza (Réplica)",
-"Disable Main Server" => "Deshabilitar sirvidor principal",
-"Only connect to the replica server." => "Coneutar namái col sirvidor de réplica.",
-"Case insensitive LDAP server (Windows)" => "Sirvidor de LDAP insensible a mayúscules/minúscules (Windows)",
-"Turn off SSL certificate validation." => "Apagar la validación del certificáu SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nun se recomienda, ¡úsalu namái pa pruebes! Si la conexón namái funciona con esta opción, importa'l certificáu SSL del sirvidor LDAP nel to sirvidor %s.",
-"Cache Time-To-Live" => "Cache Time-To-Live",
-"in seconds. A change empties the cache." => "en segundos. Un cambéu vacia la caché.",
-"Directory Settings" => "Axustes del direutoriu",
-"User Display Name Field" => "Campu de nome d'usuariu a amosar",
-"The LDAP attribute to use to generate the user's display name." => "El campu LDAP a usar pa xenerar el nome p'amosar del usuariu.",
-"Base User Tree" => "Árbol base d'usuariu",
-"One User Base DN per line" => "Un DN Base d'Usuariu por llinia",
-"User Search Attributes" => "Atributos de la gueta d'usuariu",
-"Optional; one attribute per line" => "Opcional; un atributu por llinia",
-"Group Display Name Field" => "Campu de nome de grupu a amosar",
-"The LDAP attribute to use to generate the groups's display name." => "El campu LDAP a usar pa xenerar el nome p'amosar del grupu.",
-"Base Group Tree" => "Árbol base de grupu",
-"One Group Base DN per line" => "Un DN Base de Grupu por llinia",
-"Group Search Attributes" => "Atributos de gueta de grupu",
-"Group-Member association" => "Asociación Grupu-Miembru",
-"Nested Groups" => "Grupos añeraos",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Cuando s'active, van permitise grupos que contengan otros grupos (namái funciona si l'atributu de miembru de grupu contién DNs).",
-"Paging chunksize" => "Tamañu de los fragmentos de paxinación",
-"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.)" => "Tamañu de los fragmentos usáu pa busques LDAP paxinaes que puen devolver resultaos voluminosos, como enubmeración d'usuarios o de grupos. (Si s'afita en 0, van deshabilitase les busques LDAP paxinaes neses situaciones.)",
-"Special Attributes" => "Atributos especiales",
-"Quota Field" => "Cuota",
-"Quota Default" => "Cuota por defeutu",
-"in bytes" => "en bytes",
-"Email Field" => "E-mail",
-"User Home Folder Naming Rule" => "Regla pa la carpeta Home d'usuariu",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Baleru pal nome d'usuariu (por defeutu). N'otru casu, especifica un atributu LDAP/AD.",
-"Internal Username" => "Nome d'usuariu internu",
-"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." => "El nome d'usuariu internu va crease de forma predeterminada dende l'atributu UUID. Esto asegura que'l nome d'usuariu ye únicu y los caráuteres nun necesiten convertise. Nel nome d'usuariu internu namái puen usase estos caráuteres: [ a-zA-Z0-9_.@- ]. El restu de caráuteres sustitúyense pol so correspondiente en ASCII u omítense. En casu de duplicidaes, va amestase o incrementase un númberu. El nome d'usuariu internu úsase pa identificar un usuariu. Ye tamién el nome predetermináu pa la carpeta personal del usuariu en ownCloud. Tamién ye parte d'URLs remotes, por exemplu, pa tolos servicios *DAV. Con esta configuración el comportamientu predetermináu pue cambiase. Pa consiguir un comportamientu asemeyáu a como yera enantes d'ownCloud 5, introduz el campu del nome p'amosar del usuariu na siguiente caxa. Déxalu baleru pal comportamientu predetermináu. Los cambeos namái van tener efeutu nos usuarios LDAP mapeaos (amestaos) recién.",
-"Internal Username Attribute:" => "Atributu Nome d'usuariu Internu:",
-"Override UUID detection" => "Sobrescribir la deteición 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." => "Por defeutu, l'atributu UUID autodetéutase. Esti atributu úsase pa identificar induldablemente usuarios y grupos LDAP. Arriendes, el nome d'usuariu internu va crease en bas al UUID, si nun s'especificó otru comportamientu arriba. Pues sobrescribir la configuración y pasar un atributu de la to eleición. Tienes d'asegurate de que l'atributu de la to eleición seya accesible polos usuarios y grupos y ser únicu. Déxalu en blanco pa usar el comportamientu por defeutu. Los cambeos van tener efeutu namái nos usuarios y grupos de LDAP mapeaos (amestaos) recién.",
-"UUID Attribute for Users:" => "Atributu UUID pa usuarios:",
-"UUID Attribute for Groups:" => "Atributu UUID pa Grupos:",
-"Username-LDAP User Mapping" => "Asignación del Nome d'usuariu LDAP",
-"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." => "Los usuarios úsense p'almacenar y asignar (meta) datos. Col envís d'identificar de forma precisa y reconocer usuarios, cada usuariu de LDAP va tener un nome d'usuariu internu. Esto requier un mapéu ente'l nome d'usuariu y l'usuariu del LDAP. El nome d'usuariu creáu mapéase respeutu al UUID del usuariu nel LDAP. De forma adicional, el DN cachéase p'amenorgar la interaición ente'l LDAP, pero nun s'usa pa identificar. Si'l DN camuda, los cambeos van aplicase. El nome d'usuariu internu úsase penriba de too. Llimpiar los mapeos va dexar restos per toos llaos, nun ye sensible a configuración, ¡afeuta a toles configuraciones del LDAP! Enxamás llimpies los mapeos nun entornu de producción, namái nuna fase de desendolcu o esperimental.",
-"Clear Username-LDAP User Mapping" => "Llimpiar l'asignación de los Nomes d'usuariu de los usuarios LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Llimpiar l'asignación de los Nomes de grupu de los grupos de LDAP"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/az.js b/apps/user_ldap/l10n/az.js
new file mode 100644
index 00000000000..a170e6ecd2b
--- /dev/null
+++ b/apps/user_ldap/l10n/az.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Xəritələnməni silmək mümkün olmadı",
+    "Failed to delete the server configuration" : "Server configini silmək mümkün olmadı",
+    "The configuration is valid and the connection could be established!" : "Configurasiya doğrudur və qoşulmaq mümkündür!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Configurasiya doğrudur yalnız, birləşmədə səhv oldu. Xahiş olunur server quraşdırmalarını və daxil etdiyiniz verilənlərin düzgünlüyünü yoxlayasınız.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Configurasiya dügün deyil. Əlavə detallar üçün xahiş edirik jurnal faylına baxasınız.",
+    "No action specified" : "Heç bir iş təyin edilməyib",
+    " Could not set configuration %s" : "%s configi təyin etmək mümkün olmadı",
+    "Deletion failed" : "Silinmədə səhv baş verdi",
+    "Keep settings?" : "Ayarlar qalsın?",
+    "Cannot add server configuration" : "Server quraşdırmalarını əlavə etmək mümkün olmadı",
+    "Error" : "Səhv",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Saxlamaq",
+    "Help" : "Kömək",
+    "Host" : "Şəbəkədə ünvan",
+    "Password" : "Şifrə"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/az.json b/apps/user_ldap/l10n/az.json
new file mode 100644
index 00000000000..0bec40e6d28
--- /dev/null
+++ b/apps/user_ldap/l10n/az.json
@@ -0,0 +1,20 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Xəritələnməni silmək mümkün olmadı",
+    "Failed to delete the server configuration" : "Server configini silmək mümkün olmadı",
+    "The configuration is valid and the connection could be established!" : "Configurasiya doğrudur və qoşulmaq mümkündür!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Configurasiya doğrudur yalnız, birləşmədə səhv oldu. Xahiş olunur server quraşdırmalarını və daxil etdiyiniz verilənlərin düzgünlüyünü yoxlayasınız.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Configurasiya dügün deyil. Əlavə detallar üçün xahiş edirik jurnal faylına baxasınız.",
+    "No action specified" : "Heç bir iş təyin edilməyib",
+    " Could not set configuration %s" : "%s configi təyin etmək mümkün olmadı",
+    "Deletion failed" : "Silinmədə səhv baş verdi",
+    "Keep settings?" : "Ayarlar qalsın?",
+    "Cannot add server configuration" : "Server quraşdırmalarını əlavə etmək mümkün olmadı",
+    "Error" : "Səhv",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Saxlamaq",
+    "Help" : "Kömək",
+    "Host" : "Şəbəkədə ünvan",
+    "Password" : "Şifrə"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/az.php b/apps/user_ldap/l10n/az.php
deleted file mode 100644
index 6d3e01b8a8e..00000000000
--- a/apps/user_ldap/l10n/az.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Xəritələnməni silmək mümkün olmadı",
-"Failed to delete the server configuration" => "Server configini silmək mümkün olmadı",
-"The configuration is valid and the connection could be established!" => "Configurasiya doğrudur və qoşulmaq mümkündür!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Configurasiya doğrudur yalnız, birləşmədə səhv oldu. Xahiş olunur server quraşdırmalarını və daxil etdiyiniz verilənlərin düzgünlüyünü yoxlayasınız.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Configurasiya dügün deyil. Əlavə detallar üçün xahiş edirik jurnal faylına baxasınız.",
-"No action specified" => "Heç bir iş təyin edilməyib",
-" Could not set configuration %s" => "%s configi təyin etmək mümkün olmadı",
-"Deletion failed" => "Silinmədə səhv baş verdi",
-"Keep settings?" => "Ayarlar qalsın?",
-"Cannot add server configuration" => "Server quraşdırmalarını əlavə etmək mümkün olmadı",
-"Error" => "Səhv",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Saxlamaq",
-"Help" => "Kömək",
-"Host" => "Şəbəkədə ünvan",
-"Password" => "Şifrə"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/be.js b/apps/user_ldap/l10n/be.js
new file mode 100644
index 00000000000..3bad78472e2
--- /dev/null
+++ b/apps/user_ldap/l10n/be.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "Памылка",
+    "_%s group found_::_%s groups found_" : ["","","",""],
+    "_%s user found_::_%s users found_" : ["","","",""],
+    "Advanced" : "Дасведчаны"
+},
+"nplurals=4; 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_ldap/l10n/be.json b/apps/user_ldap/l10n/be.json
new file mode 100644
index 00000000000..f77a6b3c142
--- /dev/null
+++ b/apps/user_ldap/l10n/be.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Error" : "Памылка",
+    "_%s group found_::_%s groups found_" : ["","","",""],
+    "_%s user found_::_%s users found_" : ["","","",""],
+    "Advanced" : "Дасведчаны"
+},"pluralForm" :"nplurals=4; 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_ldap/l10n/be.php b/apps/user_ldap/l10n/be.php
deleted file mode 100644
index b55e4595318..00000000000
--- a/apps/user_ldap/l10n/be.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Памылка",
-"_%s group found_::_%s groups found_" => array("","","",""),
-"_%s user found_::_%s users found_" => array("","","",""),
-"Advanced" => "Дасведчаны"
-);
-$PLURAL_FORMS = "nplurals=4; 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_ldap/l10n/bg_BG.js b/apps/user_ldap/l10n/bg_BG.js
new file mode 100644
index 00000000000..e6f45803985
--- /dev/null
+++ b/apps/user_ldap/l10n/bg_BG.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Неуспешно изчистване на mapping-ите.",
+    "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." : "Конфигурацията е валидна, но Bind-а неуспя. Моля, провери сървърните настройки, потребителското име и паролата.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Невалидна конфигурация. Моля, разгледай докладите за допълнителна информация.",
+    "No action specified" : "Не е посочено действие",
+    "No configuration specified" : "Не е посочена конфигурация",
+    "No data specified" : "Не са посочени данни",
+    " Could not set configuration %s" : "Неуспешно задаване на конфигруацията %s",
+    "Deletion failed" : "Неуспешно изтриване",
+    "Take over settings from recent server configuration?" : "Използвай настройките от скорошна сървърна конфигурация?",
+    "Keep settings?" : "Запази настройките?",
+    "{nthServer}. Server" : "{nthServer}. Сървър",
+    "Cannot add server configuration" : "Неуспешно добавяне на сървърна конфигурация.",
+    "mappings cleared" : "mapping-и създадени.",
+    "Success" : "Успех",
+    "Error" : "Грешка",
+    "Please specify a Base DN" : "Моля, посочи Base DN",
+    "Could not determine Base DN" : "Неуспешно установяване на Base DN",
+    "Please specify the port" : "Mоля, посочи портът",
+    "Configuration OK" : "Конфигурацията е ОК",
+    "Configuration incorrect" : "Конфигурацията е грешна",
+    "Configuration incomplete" : "Конфигурацията не е завършена",
+    "Select groups" : "Избери Групи",
+    "Select object classes" : "Избери типове обекти",
+    "Select attributes" : "Избери атрибути",
+    "Connection test succeeded" : "Успешен тест на връзката.",
+    "Connection test failed" : "Неуспешен тест на връзката.",
+    "Do you really want to delete the current Server Configuration?" : "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
+    "Confirm Deletion" : "Потвърди Изтриването",
+    "_%s group found_::_%s groups found_" : ["%s открита група","%s открити групи"],
+    "_%s user found_::_%s users found_" : ["%s октрит потребител","%s октрити потребители"],
+    "Could not find the desired feature" : "Не е открита желанта функция",
+    "Invalid Host" : "Невалиден Сървър",
+    "Server" : "Сървър",
+    "User Filter" : "User Filter",
+    "Login Filter" : "Login Filter",
+    "Group Filter" : "Group Filter",
+    "Save" : "Запиши",
+    "Test Configuration" : "Тествай Конфигурацията",
+    "Help" : "Помощ",
+    "Groups meeting these criteria are available in %s:" : "Групи спазващи тези критерии са разположени в %s:",
+    "only those object classes:" : "само следните типове обекти:",
+    "only from those groups:" : "само от следните групи:",
+    "Edit raw filter instead" : "Промени raw филтъра",
+    "Raw LDAP filter" : "Raw LDAP филтър",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
+    "Test Filter" : "Тестов Филтър",
+    "groups found" : "открити групи",
+    "Users login with this attribute:" : "Потребителски профили с този атрибут:",
+    "LDAP Username:" : "LDAP Потребителско Име:",
+    "LDAP Email Address:" : "LDAP Имел Адрес:",
+    "Other Attributes:" : "Други Атрибути:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Заявява филтърът, който да бъде приложен при опит за вписване. %%uid замества потребителското име в полето login action. Пример: \"uid=%%uid\".",
+    "1. Server" : "1. Сървър",
+    "%s. Server:" : "%s. Сървър:",
+    "Add Server Configuration" : "Добави Сървърна Конфигурация",
+    "Delete Configuration" : "Изтрий Конфигурацията",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
+    "Port" : "Порт",
+    "User DN" : "User 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." : "DN на потребителят, с който ще стане свързването, пр. uid=agent,dc=example,dc=com. За анонимен достъп, остави DN и Парола празни.",
+    "Password" : "Парола",
+    "For anonymous access, leave DN and Password empty." : "За анонимен достъп, остави DN и Парола празни.",
+    "One Base DN per line" : "По един Base DN на ред",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
+    "Limit %s access to users meeting these criteria:" : "Ограничи достъпа на %s до потребители покриващи следните критерии:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
+    "users found" : "открити потребители",
+    "Saving" : "Записване",
+    "Back" : "Назад",
+    "Continue" : "Продължи",
+    "Expert" : "Експерт",
+    "Advanced" : "Допълнителни",
+    "<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Може да изпитате неочквано поведение. Моля, поискайте системния администратор да изключи едното приложение.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> PHP LDAP модулът не е инсталиран, сървърът няма да работи. Моля, поискай системният админстратор да го инсталира.",
+    "Connection Settings" : "Настройки на Връзката",
+    "Configuration Active" : "Конфигурацията е Активна",
+    "When unchecked, this configuration will be skipped." : "Когато не е отметнато, тази конфигурация ще бъде прескочена.",
+    "Backup (Replica) Host" : "Backup (Replica) Host",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Задай незадължителен резервен сървър. Трябва да бъде реплика на главния LDAP/AD сървър.",
+    "Backup (Replica) Port" : "Backup (Replica) Port",
+    "Disable Main Server" : "Изключи Главиния Сървър",
+    "Only connect to the replica server." : "Свържи се само с репликирания сървър.",
+    "Case insensitive LDAP server (Windows)" : "Нечувствителен към главни/малки букви LDAP сървър (Windows)",
+    "Turn off SSL certificate validation." : "Изключи валидацията на SSL сертификата.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не е пропоръчително, ползвай само за тестване. Ако връзката работи само с тази опция, вмъкни LDAP сървърния SSL сертификат в твоя %s сървър.",
+    "Cache Time-To-Live" : "Кеширай Time-To-Live",
+    "in seconds. A change empties the cache." : "в секунди. Всяка промяна изтрива кеша.",
+    "Directory Settings" : "Настройки на Директорията",
+    "User Display Name Field" : "Поле User Display Name",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP атрибутът, който да бъде използван за генериране на видимото име на потребителя.",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "По един User Base DN на ред",
+    "User Search Attributes" : "Атрибути на Потребителско Търсене",
+    "Optional; one attribute per line" : "По желание; един атрибут на ред",
+    "Group Display Name Field" : "Поле Group Display Name",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP атрибутът, който да бъде използван за генерирането на видмото име на групата.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "По един Group Base DN на ред",
+    "Group Search Attributes" : "Атрибути на Групово Търсене",
+    "Group-Member association" : "Group-Member асоциация",
+    "Nested Groups" : "Nested Групи",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Когато е включени, се подържат групи в групи. (Работи единствено ако членът на групата притежава атрибута DNs).",
+    "Paging chunksize" : "Размер на paging-а",
+    "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.)" : "Размерът използван за връщането на големи резултати от LDAP търсения като изброяване на потребители или групи. (Стойност 0 изключва paged LDAP търсения в тези ситуации).",
+    "Special Attributes" : "Специални Атрибути",
+    "Quota Field" : "Поле за Квота",
+    "Quota Default" : "Детайли на Квотата",
+    "in bytes" : "в байтове",
+    "Email Field" : "Поле за Имейл",
+    "User Home Folder Naming Rule" : "Правило за Кръщаване на Потребителската Папка",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Остави празно за потребителско име (по подразбиране). Иначе, посочи LDAP/AD атрибут.",
+    "Internal Username" : "Вътрешно Потребителско Име",
+    "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." : "По подразбиране вътрешното потребителско име ще бъде създадено от UUID атрибутът. Това гарантира, че потребителското име ще бъде уникално, и че няма да се наложи да се конвертират символи. Вътрешното потребителско име ще бъде ограничено да използва само следните символи: [ a-zA-Z0-9_.@- ]. Другите символи ще бъдат заменени със техните ASCII еквиваленти или ще бъдат просто пренебрегнати. Ако има сблъсъци ще бъде добавено/увеличено число. Вътрешното потребителско име се използва, за да се идентифицира вътрешно потребителя. То е и директорията по подразбиране на потребителя. Също така е част от отдалечените URL-и, на пример за всички *DAV услуги. С тази настройка може да бъде променено всичко това. За да постигнеш подобно държание на това, което беше в ownCloud 5 въведи съдържанието на user display name атрибутът тук. Остави го празно да се държи, както по подразбиране. Промените ще се отразят само на новодобавени(map-нати) LDAP потребители.",
+    "Internal Username Attribute:" : "Атрибут на Вътрешното Потребителско Име:",
+    "Override UUID detection" : "Промени 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." : "По подразбиране, UUID атрибутът ще бъде автоматично намерен. UUID се използва, за да се идентифицират еднозначно LDAP потребители и групи. Също така, вътрешното име ще бъде генерирано базирано на UUID, ако такова не е посочено по-горе. Можеш да промениш тази настройка и да използваш атрибут по свой избор. Трябва да се увериш, че атрибутът, който си избрал може да бъде проверен, както за потребителите така и за групите, и да е уникален. Промените ще се отразят само на новодобавени(map-нати) LDAP потребители.",
+    "UUID Attribute for Users:" : "UUID Атрибут за Потребителите:",
+    "UUID Attribute for Groups:" : "UUID Атрибут за Групите:",
+    "Username-LDAP User Mapping" : "Username-LDAP User Mapping",
+    "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." : "Потребителските имена се използват, за да се запази и зададат (мета)данни. За да може да се идентифицира и разпознае потребител, всеки LDAP потребител ще има вътрешно потребителско име. Налага се map-ване от вътрешен потребител към LDAP потребител. Създаденото потребителско име се map-ва към UUID-то на LDAP потребител. В допълнение DN се кешира, за да се намали LDAP комункацията, но не се използва за идентифициране. Ако DN се промени, промяната ще бъде открита. Вътрешното име се използва навсякъде. Изтриването на map-ванията ще се отрази на всички LDAP конфигурации! Никога не изчиствай map-ванията на производствена инсталация, а само докато тестваш и експериментираш.",
+    "Clear Username-LDAP User Mapping" : "Изчисти Username-LDAP User Mapping",
+    "Clear Groupname-LDAP Group Mapping" : "Изчисти Groupname-LDAP Group Mapping"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/bg_BG.json b/apps/user_ldap/l10n/bg_BG.json
new file mode 100644
index 00000000000..f29aff72266
--- /dev/null
+++ b/apps/user_ldap/l10n/bg_BG.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Неуспешно изчистване на mapping-ите.",
+    "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." : "Конфигурацията е валидна, но Bind-а неуспя. Моля, провери сървърните настройки, потребителското име и паролата.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Невалидна конфигурация. Моля, разгледай докладите за допълнителна информация.",
+    "No action specified" : "Не е посочено действие",
+    "No configuration specified" : "Не е посочена конфигурация",
+    "No data specified" : "Не са посочени данни",
+    " Could not set configuration %s" : "Неуспешно задаване на конфигруацията %s",
+    "Deletion failed" : "Неуспешно изтриване",
+    "Take over settings from recent server configuration?" : "Използвай настройките от скорошна сървърна конфигурация?",
+    "Keep settings?" : "Запази настройките?",
+    "{nthServer}. Server" : "{nthServer}. Сървър",
+    "Cannot add server configuration" : "Неуспешно добавяне на сървърна конфигурация.",
+    "mappings cleared" : "mapping-и създадени.",
+    "Success" : "Успех",
+    "Error" : "Грешка",
+    "Please specify a Base DN" : "Моля, посочи Base DN",
+    "Could not determine Base DN" : "Неуспешно установяване на Base DN",
+    "Please specify the port" : "Mоля, посочи портът",
+    "Configuration OK" : "Конфигурацията е ОК",
+    "Configuration incorrect" : "Конфигурацията е грешна",
+    "Configuration incomplete" : "Конфигурацията не е завършена",
+    "Select groups" : "Избери Групи",
+    "Select object classes" : "Избери типове обекти",
+    "Select attributes" : "Избери атрибути",
+    "Connection test succeeded" : "Успешен тест на връзката.",
+    "Connection test failed" : "Неуспешен тест на връзката.",
+    "Do you really want to delete the current Server Configuration?" : "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
+    "Confirm Deletion" : "Потвърди Изтриването",
+    "_%s group found_::_%s groups found_" : ["%s открита група","%s открити групи"],
+    "_%s user found_::_%s users found_" : ["%s октрит потребител","%s октрити потребители"],
+    "Could not find the desired feature" : "Не е открита желанта функция",
+    "Invalid Host" : "Невалиден Сървър",
+    "Server" : "Сървър",
+    "User Filter" : "User Filter",
+    "Login Filter" : "Login Filter",
+    "Group Filter" : "Group Filter",
+    "Save" : "Запиши",
+    "Test Configuration" : "Тествай Конфигурацията",
+    "Help" : "Помощ",
+    "Groups meeting these criteria are available in %s:" : "Групи спазващи тези критерии са разположени в %s:",
+    "only those object classes:" : "само следните типове обекти:",
+    "only from those groups:" : "само от следните групи:",
+    "Edit raw filter instead" : "Промени raw филтъра",
+    "Raw LDAP filter" : "Raw LDAP филтър",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
+    "Test Filter" : "Тестов Филтър",
+    "groups found" : "открити групи",
+    "Users login with this attribute:" : "Потребителски профили с този атрибут:",
+    "LDAP Username:" : "LDAP Потребителско Име:",
+    "LDAP Email Address:" : "LDAP Имел Адрес:",
+    "Other Attributes:" : "Други Атрибути:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Заявява филтърът, който да бъде приложен при опит за вписване. %%uid замества потребителското име в полето login action. Пример: \"uid=%%uid\".",
+    "1. Server" : "1. Сървър",
+    "%s. Server:" : "%s. Сървър:",
+    "Add Server Configuration" : "Добави Сървърна Конфигурация",
+    "Delete Configuration" : "Изтрий Конфигурацията",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
+    "Port" : "Порт",
+    "User DN" : "User 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." : "DN на потребителят, с който ще стане свързването, пр. uid=agent,dc=example,dc=com. За анонимен достъп, остави DN и Парола празни.",
+    "Password" : "Парола",
+    "For anonymous access, leave DN and Password empty." : "За анонимен достъп, остави DN и Парола празни.",
+    "One Base DN per line" : "По един Base DN на ред",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
+    "Limit %s access to users meeting these criteria:" : "Ограничи достъпа на %s до потребители покриващи следните критерии:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
+    "users found" : "открити потребители",
+    "Saving" : "Записване",
+    "Back" : "Назад",
+    "Continue" : "Продължи",
+    "Expert" : "Експерт",
+    "Advanced" : "Допълнителни",
+    "<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Може да изпитате неочквано поведение. Моля, поискайте системния администратор да изключи едното приложение.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Предупреждение:</b> PHP LDAP модулът не е инсталиран, сървърът няма да работи. Моля, поискай системният админстратор да го инсталира.",
+    "Connection Settings" : "Настройки на Връзката",
+    "Configuration Active" : "Конфигурацията е Активна",
+    "When unchecked, this configuration will be skipped." : "Когато не е отметнато, тази конфигурация ще бъде прескочена.",
+    "Backup (Replica) Host" : "Backup (Replica) Host",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Задай незадължителен резервен сървър. Трябва да бъде реплика на главния LDAP/AD сървър.",
+    "Backup (Replica) Port" : "Backup (Replica) Port",
+    "Disable Main Server" : "Изключи Главиния Сървър",
+    "Only connect to the replica server." : "Свържи се само с репликирания сървър.",
+    "Case insensitive LDAP server (Windows)" : "Нечувствителен към главни/малки букви LDAP сървър (Windows)",
+    "Turn off SSL certificate validation." : "Изключи валидацията на SSL сертификата.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не е пропоръчително, ползвай само за тестване. Ако връзката работи само с тази опция, вмъкни LDAP сървърния SSL сертификат в твоя %s сървър.",
+    "Cache Time-To-Live" : "Кеширай Time-To-Live",
+    "in seconds. A change empties the cache." : "в секунди. Всяка промяна изтрива кеша.",
+    "Directory Settings" : "Настройки на Директорията",
+    "User Display Name Field" : "Поле User Display Name",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP атрибутът, който да бъде използван за генериране на видимото име на потребителя.",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "По един User Base DN на ред",
+    "User Search Attributes" : "Атрибути на Потребителско Търсене",
+    "Optional; one attribute per line" : "По желание; един атрибут на ред",
+    "Group Display Name Field" : "Поле Group Display Name",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP атрибутът, който да бъде използван за генерирането на видмото име на групата.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "По един Group Base DN на ред",
+    "Group Search Attributes" : "Атрибути на Групово Търсене",
+    "Group-Member association" : "Group-Member асоциация",
+    "Nested Groups" : "Nested Групи",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Когато е включени, се подържат групи в групи. (Работи единствено ако членът на групата притежава атрибута DNs).",
+    "Paging chunksize" : "Размер на paging-а",
+    "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.)" : "Размерът използван за връщането на големи резултати от LDAP търсения като изброяване на потребители или групи. (Стойност 0 изключва paged LDAP търсения в тези ситуации).",
+    "Special Attributes" : "Специални Атрибути",
+    "Quota Field" : "Поле за Квота",
+    "Quota Default" : "Детайли на Квотата",
+    "in bytes" : "в байтове",
+    "Email Field" : "Поле за Имейл",
+    "User Home Folder Naming Rule" : "Правило за Кръщаване на Потребителската Папка",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Остави празно за потребителско име (по подразбиране). Иначе, посочи LDAP/AD атрибут.",
+    "Internal Username" : "Вътрешно Потребителско Име",
+    "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." : "По подразбиране вътрешното потребителско име ще бъде създадено от UUID атрибутът. Това гарантира, че потребителското име ще бъде уникално, и че няма да се наложи да се конвертират символи. Вътрешното потребителско име ще бъде ограничено да използва само следните символи: [ a-zA-Z0-9_.@- ]. Другите символи ще бъдат заменени със техните ASCII еквиваленти или ще бъдат просто пренебрегнати. Ако има сблъсъци ще бъде добавено/увеличено число. Вътрешното потребителско име се използва, за да се идентифицира вътрешно потребителя. То е и директорията по подразбиране на потребителя. Също така е част от отдалечените URL-и, на пример за всички *DAV услуги. С тази настройка може да бъде променено всичко това. За да постигнеш подобно държание на това, което беше в ownCloud 5 въведи съдържанието на user display name атрибутът тук. Остави го празно да се държи, както по подразбиране. Промените ще се отразят само на новодобавени(map-нати) LDAP потребители.",
+    "Internal Username Attribute:" : "Атрибут на Вътрешното Потребителско Име:",
+    "Override UUID detection" : "Промени 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." : "По подразбиране, UUID атрибутът ще бъде автоматично намерен. UUID се използва, за да се идентифицират еднозначно LDAP потребители и групи. Също така, вътрешното име ще бъде генерирано базирано на UUID, ако такова не е посочено по-горе. Можеш да промениш тази настройка и да използваш атрибут по свой избор. Трябва да се увериш, че атрибутът, който си избрал може да бъде проверен, както за потребителите така и за групите, и да е уникален. Промените ще се отразят само на новодобавени(map-нати) LDAP потребители.",
+    "UUID Attribute for Users:" : "UUID Атрибут за Потребителите:",
+    "UUID Attribute for Groups:" : "UUID Атрибут за Групите:",
+    "Username-LDAP User Mapping" : "Username-LDAP User Mapping",
+    "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." : "Потребителските имена се използват, за да се запази и зададат (мета)данни. За да може да се идентифицира и разпознае потребител, всеки LDAP потребител ще има вътрешно потребителско име. Налага се map-ване от вътрешен потребител към LDAP потребител. Създаденото потребителско име се map-ва към UUID-то на LDAP потребител. В допълнение DN се кешира, за да се намали LDAP комункацията, но не се използва за идентифициране. Ако DN се промени, промяната ще бъде открита. Вътрешното име се използва навсякъде. Изтриването на map-ванията ще се отрази на всички LDAP конфигурации! Никога не изчиствай map-ванията на производствена инсталация, а само докато тестваш и експериментираш.",
+    "Clear Username-LDAP User Mapping" : "Изчисти Username-LDAP User Mapping",
+    "Clear Groupname-LDAP Group Mapping" : "Изчисти Groupname-LDAP Group Mapping"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/bg_BG.php b/apps/user_ldap/l10n/bg_BG.php
deleted file mode 100644
index 9873a7d1f5c..00000000000
--- a/apps/user_ldap/l10n/bg_BG.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Неуспешно изчистване на mapping-ите.",
-"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." => "Конфигурацията е валидна, но Bind-а неуспя. Моля, провери сървърните настройки, потребителското име и паролата.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Невалидна конфигурация. Моля, разгледай докладите за допълнителна информация.",
-"No action specified" => "Не е посочено действие",
-"No configuration specified" => "Не е посочена конфигурация",
-"No data specified" => "Не са посочени данни",
-" Could not set configuration %s" => "Неуспешно задаване на конфигруацията %s",
-"Deletion failed" => "Неуспешно изтриване",
-"Take over settings from recent server configuration?" => "Използвай настройките от скорошна сървърна конфигурация?",
-"Keep settings?" => "Запази настройките?",
-"{nthServer}. Server" => "{nthServer}. Сървър",
-"Cannot add server configuration" => "Неуспешно добавяне на сървърна конфигурация.",
-"mappings cleared" => "mapping-и създадени.",
-"Success" => "Успех",
-"Error" => "Грешка",
-"Please specify a Base DN" => "Моля, посочи Base DN",
-"Could not determine Base DN" => "Неуспешно установяване на Base DN",
-"Please specify the port" => "Mоля, посочи портът",
-"Configuration OK" => "Конфигурацията е ОК",
-"Configuration incorrect" => "Конфигурацията е грешна",
-"Configuration incomplete" => "Конфигурацията не е завършена",
-"Select groups" => "Избери Групи",
-"Select object classes" => "Избери типове обекти",
-"Select attributes" => "Избери атрибути",
-"Connection test succeeded" => "Успешен тест на връзката.",
-"Connection test failed" => "Неуспешен тест на връзката.",
-"Do you really want to delete the current Server Configuration?" => "Наистина ли искаш да изтриеш текущата Сървърна Конфигурация?",
-"Confirm Deletion" => "Потвърди Изтриването",
-"_%s group found_::_%s groups found_" => array("%s открита група","%s открити групи"),
-"_%s user found_::_%s users found_" => array("%s октрит потребител","%s октрити потребители"),
-"Could not find the desired feature" => "Не е открита желанта функция",
-"Invalid Host" => "Невалиден Сървър",
-"Server" => "Сървър",
-"User Filter" => "User Filter",
-"Login Filter" => "Login Filter",
-"Group Filter" => "Group Filter",
-"Save" => "Запиши",
-"Test Configuration" => "Тествай Конфигурацията",
-"Help" => "Помощ",
-"Groups meeting these criteria are available in %s:" => "Групи спазващи тези критерии са разположени в %s:",
-"only those object classes:" => "само следните типове обекти:",
-"only from those groups:" => "само от следните групи:",
-"Edit raw filter instead" => "Промени raw филтъра",
-"Raw LDAP filter" => "Raw LDAP филтър",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Филтърът посочва кои LDAP групи ще имат достъп до %s инсталацията.",
-"Test Filter" => "Тестов Филтър",
-"groups found" => "открити групи",
-"Users login with this attribute:" => "Потребителски профили с този атрибут:",
-"LDAP Username:" => "LDAP Потребителско Име:",
-"LDAP Email Address:" => "LDAP Имел Адрес:",
-"Other Attributes:" => "Други Атрибути:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Заявява филтърът, който да бъде приложен при опит за вписване. %%uid замества потребителското име в полето login action. Пример: \"uid=%%uid\".",
-"1. Server" => "1. Сървър",
-"%s. Server:" => "%s. Сървър:",
-"Add Server Configuration" => "Добави Сървърна Конфигурация",
-"Delete Configuration" => "Изтрий Конфигурацията",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Протоколът не задължителен освен ако не изискваш SLL. В такъв случай започни с ldaps://",
-"Port" => "Порт",
-"User DN" => "User 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." => "DN на потребителят, с който ще стане свързването, пр. uid=agent,dc=example,dc=com. За анонимен достъп, остави DN и Парола празни.",
-"Password" => "Парола",
-"For anonymous access, leave DN and Password empty." => "За анонимен достъп, остави DN и Парола празни.",
-"One Base DN per line" => "По един Base DN на ред",
-"You can specify Base DN for users and groups in the Advanced tab" => "Можеш да настроиш Base DN за отделни потребители и групи в разделителя Допълнителни.",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Избягва автоматични LDAP заявки. По-добра опция за големи инсталации, но изисква LDAP познания.",
-"Manually enter LDAP filters (recommended for large directories)" => "Ръчно въвеждана на LDAP филтри(препоръчано за по-големи папки)",
-"Limit %s access to users meeting these criteria:" => "Ограничи достъпа на %s до потребители покриващи следните критерии:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Филтърът посочва кои LDAP потребители ще имат достъп до %s инсталацията.",
-"users found" => "открити потребители",
-"Saving" => "Записване",
-"Back" => "Назад",
-"Continue" => "Продължи",
-"Expert" => "Експерт",
-"Advanced" => "Допълнителни",
-"<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Може да изпитате неочквано поведение. Моля, поискайте системния администратор да изключи едното приложение.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Предупреждение:</b> PHP LDAP модулът не е инсталиран, сървърът няма да работи. Моля, поискай системният админстратор да го инсталира.",
-"Connection Settings" => "Настройки на Връзката",
-"Configuration Active" => "Конфигурацията е Активна",
-"When unchecked, this configuration will be skipped." => "Когато не е отметнато, тази конфигурация ще бъде прескочена.",
-"Backup (Replica) Host" => "Backup (Replica) Host",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Задай незадължителен резервен сървър. Трябва да бъде реплика на главния LDAP/AD сървър.",
-"Backup (Replica) Port" => "Backup (Replica) Port",
-"Disable Main Server" => "Изключи Главиния Сървър",
-"Only connect to the replica server." => "Свържи се само с репликирания сървър.",
-"Case insensitive LDAP server (Windows)" => "Нечувствителен към главни/малки букви LDAP сървър (Windows)",
-"Turn off SSL certificate validation." => "Изключи валидацията на SSL сертификата.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Не е пропоръчително, ползвай само за тестване. Ако връзката работи само с тази опция, вмъкни LDAP сървърния SSL сертификат в твоя %s сървър.",
-"Cache Time-To-Live" => "Кеширай Time-To-Live",
-"in seconds. A change empties the cache." => "в секунди. Всяка промяна изтрива кеша.",
-"Directory Settings" => "Настройки на Директорията",
-"User Display Name Field" => "Поле User Display Name",
-"The LDAP attribute to use to generate the user's display name." => "LDAP атрибутът, който да бъде използван за генериране на видимото име на потребителя.",
-"Base User Tree" => "Base User Tree",
-"One User Base DN per line" => "По един User Base DN на ред",
-"User Search Attributes" => "Атрибути на Потребителско Търсене",
-"Optional; one attribute per line" => "По желание; един атрибут на ред",
-"Group Display Name Field" => "Поле Group Display Name",
-"The LDAP attribute to use to generate the groups's display name." => "LDAP атрибутът, който да бъде използван за генерирането на видмото име на групата.",
-"Base Group Tree" => "Base Group Tree",
-"One Group Base DN per line" => "По един Group Base DN на ред",
-"Group Search Attributes" => "Атрибути на Групово Търсене",
-"Group-Member association" => "Group-Member асоциация",
-"Nested Groups" => "Nested Групи",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Когато е включени, се подържат групи в групи. (Работи единствено ако членът на групата притежава атрибута DNs).",
-"Paging chunksize" => "Размер на paging-а",
-"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.)" => "Размерът използван за връщането на големи резултати от LDAP търсения като изброяване на потребители или групи. (Стойност 0 изключва paged LDAP търсения в тези ситуации).",
-"Special Attributes" => "Специални Атрибути",
-"Quota Field" => "Поле за Квота",
-"Quota Default" => "Детайли на Квотата",
-"in bytes" => "в байтове",
-"Email Field" => "Поле за Имейл",
-"User Home Folder Naming Rule" => "Правило за Кръщаване на Потребителската Папка",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Остави празно за потребителско име (по подразбиране). Иначе, посочи LDAP/AD атрибут.",
-"Internal Username" => "Вътрешно Потребителско Име",
-"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." => "По подразбиране вътрешното потребителско име ще бъде създадено от UUID атрибутът. Това гарантира, че потребителското име ще бъде уникално, и че няма да се наложи да се конвертират символи. Вътрешното потребителско име ще бъде ограничено да използва само следните символи: [ a-zA-Z0-9_.@- ]. Другите символи ще бъдат заменени със техните ASCII еквиваленти или ще бъдат просто пренебрегнати. Ако има сблъсъци ще бъде добавено/увеличено число. Вътрешното потребителско име се използва, за да се идентифицира вътрешно потребителя. То е и директорията по подразбиране на потребителя. Също така е част от отдалечените URL-и, на пример за всички *DAV услуги. С тази настройка може да бъде променено всичко това. За да постигнеш подобно държание на това, което беше в ownCloud 5 въведи съдържанието на user display name атрибутът тук. Остави го празно да се държи, както по подразбиране. Промените ще се отразят само на новодобавени(map-нати) LDAP потребители.",
-"Internal Username Attribute:" => "Атрибут на Вътрешното Потребителско Име:",
-"Override UUID detection" => "Промени 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." => "По подразбиране, UUID атрибутът ще бъде автоматично намерен. UUID се използва, за да се идентифицират еднозначно LDAP потребители и групи. Също така, вътрешното име ще бъде генерирано базирано на UUID, ако такова не е посочено по-горе. Можеш да промениш тази настройка и да използваш атрибут по свой избор. Трябва да се увериш, че атрибутът, който си избрал може да бъде проверен, както за потребителите така и за групите, и да е уникален. Промените ще се отразят само на новодобавени(map-нати) LDAP потребители.",
-"UUID Attribute for Users:" => "UUID Атрибут за Потребителите:",
-"UUID Attribute for Groups:" => "UUID Атрибут за Групите:",
-"Username-LDAP User Mapping" => "Username-LDAP User Mapping",
-"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." => "Потребителските имена се използват, за да се запази и зададат (мета)данни. За да може да се идентифицира и разпознае потребител, всеки LDAP потребител ще има вътрешно потребителско име. Налага се map-ване от вътрешен потребител към LDAP потребител. Създаденото потребителско име се map-ва към UUID-то на LDAP потребител. В допълнение DN се кешира, за да се намали LDAP комункацията, но не се използва за идентифициране. Ако DN се промени, промяната ще бъде открита. Вътрешното име се използва навсякъде. Изтриването на map-ванията ще се отрази на всички LDAP конфигурации! Никога не изчиствай map-ванията на производствена инсталация, а само докато тестваш и експериментираш.",
-"Clear Username-LDAP User Mapping" => "Изчисти Username-LDAP User Mapping",
-"Clear Groupname-LDAP Group Mapping" => "Изчисти Groupname-LDAP Group Mapping"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/bn_BD.js b/apps/user_ldap/l10n/bn_BD.js
new file mode 100644
index 00000000000..d52c5eb953a
--- /dev/null
+++ b/apps/user_ldap/l10n/bn_BD.js
@@ -0,0 +1,107 @@
+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." : "কনফিগারেশনটি বৈধ তবে Bind ব্যার্থ। দয়া করে সার্ভার নিয়ামকসমূহ এবং ব্যবহারকারী পরীক্ষা করুন।",
+    "The configuration is invalid. Please have a look at the logs for further details." : "কনফিহারেশনটি অবৈধ। বিস্তারিত জানতে দয়া করে লগ দেখুন।",
+    "No action specified" : "কোন কার্যাদেশ সুনির্দিষ্ট নয়",
+    "No configuration specified" : " কোন কনফিগারেসন সুনির্দিষ্ট নয়",
+    "No data specified" : "কোন ডাটা সুনির্দিষ্ট নয়",
+    " Could not set configuration %s" : "%s কনফিগারেসন ঠিক করা গেল না",
+    "Deletion failed" : "মুছার আদেশ ব্যার্থ হলো",
+    "Take over settings from recent server configuration?" : "সদ্য সার্ভার কনফিগারেসন থেকে নিয়ামকসমূহ নিতে হবে?",
+    "Keep settings?" : "নিয়ামকসমূহ সংরক্ষণ করবো?",
+    "{nthServer}. Server" : "{nthServer}. সার্ভার",
+    "Cannot add server configuration" : "সার্ভার কনফিগারেসন যোগ করা যাবেনা",
+    "mappings cleared" : "মানচিত্রায়ন মোছা হলো",
+    "Success" : "সাফল্য",
+    "Error" : "সমস্যা",
+    "Please specify a Base DN" : "দয়া করে একটি Base DN নির্দিষ্ট করুন",
+    "Could not determine Base DN" : "Base DN নির্ধারণ করা গেলনা",
+    "Please specify the port" : "পোর্ট সুনির্দিষ্ট করুন",
+    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
+    "Configuration incorrect" : "ভুল কনফিগারেসন",
+    "Configuration incomplete" : "অসম্পূর্ণ কনফিগারেসন",
+    "Select groups" : "গ্রুপ নির্ধারণ",
+    "Select object classes" : "অবজেক্ট ক্লাস নির্ধারণ",
+    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
+    "Connection test succeeded" : "যোগাযোগ পরীক্ষা সার্থক",
+    "Connection test failed" : "যোগাযোগ পরীক্ষা ব্যার্থ",
+    "Do you really want to delete the current Server Configuration?" : "আপনি কি সত্যিই চলতি সার্ভার কনফিগারেসন মুছতে চান?",
+    "Confirm Deletion" : "মোছার আদেশ নিশ্চিত করুন",
+    "_%s group found_::_%s groups found_" : ["%s গ্রুপ পাওয়া গেছে","%s গ্রুপ পাওয়া গেছে"],
+    "_%s user found_::_%s users found_" : ["%s ব্যাবহারকারী পাওয়া গেছে","%s ব্যাবহারকারী পাওয়া গেছে"],
+    "Could not find the desired feature" : "চাহিদামাফিক ফিচারটি পাওয়া গেলনা",
+    "Invalid Host" : "অবৈধ হোস্ট",
+    "Server" : "সার্ভার",
+    "User Filter" : "ব্যবহারকারী তালিকা ছাঁকনী",
+    "Login Filter" : "প্রবেশ ছাঁকনী",
+    "Group Filter" : "গোষ্ঠী ছাঁকনী",
+    "Save" : "সংরক্ষণ",
+    "Test Configuration" : "পরীক্ষামূলক কনফিগারেসন",
+    "Help" : "সহায়িকা",
+    "Groups meeting these criteria are available in %s:" : "প্রদত্ত বৈশিষ্ট্য অনুযায়ী %s এ প্রাপ্তব্য গ্রুপসমূহ:",
+    "only those object classes:" : "শুধুমাত্র সেইসব অবজেক্ট ক্লাস:",
+    "only from those groups:" : "শুধুমাত্র বর্ণিত গ্রুপসমূহ হতে:",
+    "Edit raw filter instead" : "অসম্পূর্ণ ফিল্টার সম্পাদনা করুন",
+    "Raw LDAP filter" : "অসম্পূর্ণ LDAP ফিল্টার",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "ফিল্টারটি %s সার্ভারে কোন কোন LDAP গ্রুপ প্রবেশাধিকার পাবে তা নির্ধারণ করে।",
+    "groups found" : "গ্রুপ পাওয়া গেছে",
+    "Users login with this attribute:" : "এই বৈশিষ্ট্য নিয়ে ব্যবহারকারী প্রবেশ করতে পারেন:",
+    "LDAP Username:" : "LDAP ব্যাবহারকারী নাম:",
+    "LDAP Email Address:" : "LDAP ই-মেইল ঠিকানা:",
+    "Other Attributes:" : "অন্যান্য বৈশিষ্ট্য:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "প্রবেশ প্রচেষ্টা নিলে প্রযোজ্য ফিল্টার নির্ধারণ করে। প্রবেশকালে %%uid ব্যাবহারকারীর নামকে প্রতিস্থাপন করে। ঊদাহরণ: \"uid=%%uid\"",
+    "1. Server" : "1. সার্ভার",
+    "%s. Server:" : "%s. সার্ভার:",
+    "Add Server Configuration" : "সার্ভার কনফিগারেসন যোগ কর",
+    "Delete Configuration" : "কনফিগারেসন মুছে ফেল",
+    "Host" : "হোস্ট",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
+    "Port" : "পোর্ট",
+    "User DN" : "ব্যবহারকারি  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." : "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. পরিচয় গোপন রেখে অধিগমনের জন্য  DN এবং কূটশব্দটি ফাঁকা রাখুন।",
+    "Password" : "কূটশব্দ",
+    "For anonymous access, leave DN and Password empty." : "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।",
+    "One Base DN per line" : "লাইনপ্রতি একটি Base DN",
+    "You can specify Base DN for users and groups in the Advanced tab" : "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।",
+    "Limit %s access to users meeting these criteria:" : "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।",
+    "users found" : "ব্যাবহারকারী পাওয়া গেছে",
+    "Back" : "পেছনে যাও",
+    "Continue" : "চালিয়ে যাও",
+    "Expert" : "দক্ষ",
+    "Advanced" : "সুচারু",
+    "<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>Warning:</b> Apps user_ldap and user_webdavauth কম্প্যাটিবল নয়। আপনি অবান্ছিত জটিলতার মুখোমুখি হতে পারেন। সিস্টেম প্রশাসককে যেকোন একটি অকার্যকর করে দিতে বলুন।",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warning:</b> PHP LDAP মডিউল ইনস্টল করা নেই, ব্যাকএন্ড কাজ করবেনা। সিস্টেম প্রশাসককে এটি ইনস্টল করতে বলুন।",
+    "Connection Settings" : "সংযোগ নিয়ামকসমূহ",
+    "Configuration Active" : "কনফিগারেসন সক্রিয়",
+    "When unchecked, this configuration will be skipped." : "চেকমার্ক তুলে দিলে কনফিগারেসন এড়িয়ে যাবে।",
+    "Backup (Replica) Host" : "ব্যাকআপ (নকল) হোস্ট",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "একটি ঐচ্ছিক ব্যাকআপ হোস্ট দিন। এটি মূল LDAP/AD সার্ভারের নকল হবে।",
+    "Backup (Replica) Port" : "ব্যাকআপ (নকল) পোর্ট",
+    "Disable Main Server" : "মূল সার্ভারকে অকার্যকর কর",
+    "Only connect to the replica server." : "শুধুমাত্র নকল সার্ভারে সংযোগ দাও।",
+    "Case insensitive LDAP server (Windows)" : "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)",
+    "Turn off SSL certificate validation." : "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
+    "Cache Time-To-Live" : "ক্যাশে টাইম-টু-লিভ",
+    "in seconds. A change empties the cache." : "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।",
+    "Directory Settings" : "ডিরেক্টরি নিয়ামকসমূহ",
+    "User Display Name Field" : "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র",
+    "The LDAP attribute to use to generate the user's display name." : "ব্যবহারকারীর প্রদর্শনীয় নাম তৈরি করার জন্য ব্যবহৃত LDAP বৈশিষ্ট্য।",
+    "Base User Tree" : "ভিত্তি ব্যবহারকারি বৃক্ষাকারে",
+    "Group Display Name Field" : "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র",
+    "Base Group Tree" : "ভিত্তি গোষ্ঠী বৃক্ষাকারে",
+    "Group Search Attributes" : "গ্রুপ খোঁজার বৈশিষ্ট্য",
+    "Group-Member association" : "গোষ্ঠী-সদস্য সংস্থাপন",
+    "Nested Groups" : "একতাবদ্ধ গোষ্ঠিসমূহ",
+    "Special Attributes" : "বিশেষ বৈশিষ্ট্যসমূহ",
+    "Quota Field" : "কোটা",
+    "Quota Default" : "পূর্বনির্ধারিত কোটা",
+    "in bytes" : "বাইটে",
+    "Email Field" : "ইমেইল ক্ষেত্র",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/bn_BD.json b/apps/user_ldap/l10n/bn_BD.json
new file mode 100644
index 00000000000..0c21103de4f
--- /dev/null
+++ b/apps/user_ldap/l10n/bn_BD.json
@@ -0,0 +1,105 @@
+{ "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." : "কনফিগারেশনটি বৈধ তবে Bind ব্যার্থ। দয়া করে সার্ভার নিয়ামকসমূহ এবং ব্যবহারকারী পরীক্ষা করুন।",
+    "The configuration is invalid. Please have a look at the logs for further details." : "কনফিহারেশনটি অবৈধ। বিস্তারিত জানতে দয়া করে লগ দেখুন।",
+    "No action specified" : "কোন কার্যাদেশ সুনির্দিষ্ট নয়",
+    "No configuration specified" : " কোন কনফিগারেসন সুনির্দিষ্ট নয়",
+    "No data specified" : "কোন ডাটা সুনির্দিষ্ট নয়",
+    " Could not set configuration %s" : "%s কনফিগারেসন ঠিক করা গেল না",
+    "Deletion failed" : "মুছার আদেশ ব্যার্থ হলো",
+    "Take over settings from recent server configuration?" : "সদ্য সার্ভার কনফিগারেসন থেকে নিয়ামকসমূহ নিতে হবে?",
+    "Keep settings?" : "নিয়ামকসমূহ সংরক্ষণ করবো?",
+    "{nthServer}. Server" : "{nthServer}. সার্ভার",
+    "Cannot add server configuration" : "সার্ভার কনফিগারেসন যোগ করা যাবেনা",
+    "mappings cleared" : "মানচিত্রায়ন মোছা হলো",
+    "Success" : "সাফল্য",
+    "Error" : "সমস্যা",
+    "Please specify a Base DN" : "দয়া করে একটি Base DN নির্দিষ্ট করুন",
+    "Could not determine Base DN" : "Base DN নির্ধারণ করা গেলনা",
+    "Please specify the port" : "পোর্ট সুনির্দিষ্ট করুন",
+    "Configuration OK" : "কনফিগারেসন ঠিক আছে",
+    "Configuration incorrect" : "ভুল কনফিগারেসন",
+    "Configuration incomplete" : "অসম্পূর্ণ কনফিগারেসন",
+    "Select groups" : "গ্রুপ নির্ধারণ",
+    "Select object classes" : "অবজেক্ট ক্লাস নির্ধারণ",
+    "Select attributes" : "বৈশিষ্ট্য নির্ধারণ",
+    "Connection test succeeded" : "যোগাযোগ পরীক্ষা সার্থক",
+    "Connection test failed" : "যোগাযোগ পরীক্ষা ব্যার্থ",
+    "Do you really want to delete the current Server Configuration?" : "আপনি কি সত্যিই চলতি সার্ভার কনফিগারেসন মুছতে চান?",
+    "Confirm Deletion" : "মোছার আদেশ নিশ্চিত করুন",
+    "_%s group found_::_%s groups found_" : ["%s গ্রুপ পাওয়া গেছে","%s গ্রুপ পাওয়া গেছে"],
+    "_%s user found_::_%s users found_" : ["%s ব্যাবহারকারী পাওয়া গেছে","%s ব্যাবহারকারী পাওয়া গেছে"],
+    "Could not find the desired feature" : "চাহিদামাফিক ফিচারটি পাওয়া গেলনা",
+    "Invalid Host" : "অবৈধ হোস্ট",
+    "Server" : "সার্ভার",
+    "User Filter" : "ব্যবহারকারী তালিকা ছাঁকনী",
+    "Login Filter" : "প্রবেশ ছাঁকনী",
+    "Group Filter" : "গোষ্ঠী ছাঁকনী",
+    "Save" : "সংরক্ষণ",
+    "Test Configuration" : "পরীক্ষামূলক কনফিগারেসন",
+    "Help" : "সহায়িকা",
+    "Groups meeting these criteria are available in %s:" : "প্রদত্ত বৈশিষ্ট্য অনুযায়ী %s এ প্রাপ্তব্য গ্রুপসমূহ:",
+    "only those object classes:" : "শুধুমাত্র সেইসব অবজেক্ট ক্লাস:",
+    "only from those groups:" : "শুধুমাত্র বর্ণিত গ্রুপসমূহ হতে:",
+    "Edit raw filter instead" : "অসম্পূর্ণ ফিল্টার সম্পাদনা করুন",
+    "Raw LDAP filter" : "অসম্পূর্ণ LDAP ফিল্টার",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "ফিল্টারটি %s সার্ভারে কোন কোন LDAP গ্রুপ প্রবেশাধিকার পাবে তা নির্ধারণ করে।",
+    "groups found" : "গ্রুপ পাওয়া গেছে",
+    "Users login with this attribute:" : "এই বৈশিষ্ট্য নিয়ে ব্যবহারকারী প্রবেশ করতে পারেন:",
+    "LDAP Username:" : "LDAP ব্যাবহারকারী নাম:",
+    "LDAP Email Address:" : "LDAP ই-মেইল ঠিকানা:",
+    "Other Attributes:" : "অন্যান্য বৈশিষ্ট্য:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "প্রবেশ প্রচেষ্টা নিলে প্রযোজ্য ফিল্টার নির্ধারণ করে। প্রবেশকালে %%uid ব্যাবহারকারীর নামকে প্রতিস্থাপন করে। ঊদাহরণ: \"uid=%%uid\"",
+    "1. Server" : "1. সার্ভার",
+    "%s. Server:" : "%s. সার্ভার:",
+    "Add Server Configuration" : "সার্ভার কনফিগারেসন যোগ কর",
+    "Delete Configuration" : "কনফিগারেসন মুছে ফেল",
+    "Host" : "হোস্ট",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
+    "Port" : "পোর্ট",
+    "User DN" : "ব্যবহারকারি  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." : "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. পরিচয় গোপন রেখে অধিগমনের জন্য  DN এবং কূটশব্দটি ফাঁকা রাখুন।",
+    "Password" : "কূটশব্দ",
+    "For anonymous access, leave DN and Password empty." : "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।",
+    "One Base DN per line" : "লাইনপ্রতি একটি Base DN",
+    "You can specify Base DN for users and groups in the Advanced tab" : "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।",
+    "Limit %s access to users meeting these criteria:" : "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।",
+    "users found" : "ব্যাবহারকারী পাওয়া গেছে",
+    "Back" : "পেছনে যাও",
+    "Continue" : "চালিয়ে যাও",
+    "Expert" : "দক্ষ",
+    "Advanced" : "সুচারু",
+    "<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>Warning:</b> Apps user_ldap and user_webdavauth কম্প্যাটিবল নয়। আপনি অবান্ছিত জটিলতার মুখোমুখি হতে পারেন। সিস্টেম প্রশাসককে যেকোন একটি অকার্যকর করে দিতে বলুন।",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warning:</b> PHP LDAP মডিউল ইনস্টল করা নেই, ব্যাকএন্ড কাজ করবেনা। সিস্টেম প্রশাসককে এটি ইনস্টল করতে বলুন।",
+    "Connection Settings" : "সংযোগ নিয়ামকসমূহ",
+    "Configuration Active" : "কনফিগারেসন সক্রিয়",
+    "When unchecked, this configuration will be skipped." : "চেকমার্ক তুলে দিলে কনফিগারেসন এড়িয়ে যাবে।",
+    "Backup (Replica) Host" : "ব্যাকআপ (নকল) হোস্ট",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "একটি ঐচ্ছিক ব্যাকআপ হোস্ট দিন। এটি মূল LDAP/AD সার্ভারের নকল হবে।",
+    "Backup (Replica) Port" : "ব্যাকআপ (নকল) পোর্ট",
+    "Disable Main Server" : "মূল সার্ভারকে অকার্যকর কর",
+    "Only connect to the replica server." : "শুধুমাত্র নকল সার্ভারে সংযোগ দাও।",
+    "Case insensitive LDAP server (Windows)" : "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)",
+    "Turn off SSL certificate validation." : "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
+    "Cache Time-To-Live" : "ক্যাশে টাইম-টু-লিভ",
+    "in seconds. A change empties the cache." : "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।",
+    "Directory Settings" : "ডিরেক্টরি নিয়ামকসমূহ",
+    "User Display Name Field" : "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র",
+    "The LDAP attribute to use to generate the user's display name." : "ব্যবহারকারীর প্রদর্শনীয় নাম তৈরি করার জন্য ব্যবহৃত LDAP বৈশিষ্ট্য।",
+    "Base User Tree" : "ভিত্তি ব্যবহারকারি বৃক্ষাকারে",
+    "Group Display Name Field" : "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র",
+    "Base Group Tree" : "ভিত্তি গোষ্ঠী বৃক্ষাকারে",
+    "Group Search Attributes" : "গ্রুপ খোঁজার বৈশিষ্ট্য",
+    "Group-Member association" : "গোষ্ঠী-সদস্য সংস্থাপন",
+    "Nested Groups" : "একতাবদ্ধ গোষ্ঠিসমূহ",
+    "Special Attributes" : "বিশেষ বৈশিষ্ট্যসমূহ",
+    "Quota Field" : "কোটা",
+    "Quota Default" : "পূর্বনির্ধারিত কোটা",
+    "in bytes" : "বাইটে",
+    "Email Field" : "ইমেইল ক্ষেত্র",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/bn_BD.php b/apps/user_ldap/l10n/bn_BD.php
deleted file mode 100644
index 9c7d9233738..00000000000
--- a/apps/user_ldap/l10n/bn_BD.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "কনফিগারেশনটি বৈধ তবে Bind ব্যার্থ। দয়া করে সার্ভার নিয়ামকসমূহ এবং ব্যবহারকারী পরীক্ষা করুন।",
-"The configuration is invalid. Please have a look at the logs for further details." => "কনফিহারেশনটি অবৈধ। বিস্তারিত জানতে দয়া করে লগ দেখুন।",
-"No action specified" => "কোন কার্যাদেশ সুনির্দিষ্ট নয়",
-"No configuration specified" => " কোন কনফিগারেসন সুনির্দিষ্ট নয়",
-"No data specified" => "কোন ডাটা সুনির্দিষ্ট নয়",
-" Could not set configuration %s" => "%s কনফিগারেসন ঠিক করা গেল না",
-"Deletion failed" => "মুছার আদেশ ব্যার্থ হলো",
-"Take over settings from recent server configuration?" => "সদ্য সার্ভার কনফিগারেসন থেকে নিয়ামকসমূহ নিতে হবে?",
-"Keep settings?" => "নিয়ামকসমূহ সংরক্ষণ করবো?",
-"{nthServer}. Server" => "{nthServer}. সার্ভার",
-"Cannot add server configuration" => "সার্ভার কনফিগারেসন যোগ করা যাবেনা",
-"mappings cleared" => "মানচিত্রায়ন মোছা হলো",
-"Success" => "সাফল্য",
-"Error" => "সমস্যা",
-"Please specify a Base DN" => "দয়া করে একটি Base DN নির্দিষ্ট করুন",
-"Could not determine Base DN" => "Base DN নির্ধারণ করা গেলনা",
-"Please specify the port" => "পোর্ট সুনির্দিষ্ট করুন",
-"Configuration OK" => "কনফিগারেসন ঠিক আছে",
-"Configuration incorrect" => "ভুল কনফিগারেসন",
-"Configuration incomplete" => "অসম্পূর্ণ কনফিগারেসন",
-"Select groups" => "গ্রুপ নির্ধারণ",
-"Select object classes" => "অবজেক্ট ক্লাস নির্ধারণ",
-"Select attributes" => "বৈশিষ্ট্য নির্ধারণ",
-"Connection test succeeded" => "যোগাযোগ পরীক্ষা সার্থক",
-"Connection test failed" => "যোগাযোগ পরীক্ষা ব্যার্থ",
-"Do you really want to delete the current Server Configuration?" => "আপনি কি সত্যিই চলতি সার্ভার কনফিগারেসন মুছতে চান?",
-"Confirm Deletion" => "মোছার আদেশ নিশ্চিত করুন",
-"_%s group found_::_%s groups found_" => array("%s গ্রুপ পাওয়া গেছে","%s গ্রুপ পাওয়া গেছে"),
-"_%s user found_::_%s users found_" => array("%s ব্যাবহারকারী পাওয়া গেছে","%s ব্যাবহারকারী পাওয়া গেছে"),
-"Could not find the desired feature" => "চাহিদামাফিক ফিচারটি পাওয়া গেলনা",
-"Invalid Host" => "অবৈধ হোস্ট",
-"Server" => "সার্ভার",
-"User Filter" => "ব্যবহারকারী তালিকা ছাঁকনী",
-"Login Filter" => "প্রবেশ ছাঁকনী",
-"Group Filter" => "গোষ্ঠী ছাঁকনী",
-"Save" => "সংরক্ষণ",
-"Test Configuration" => "পরীক্ষামূলক কনফিগারেসন",
-"Help" => "সহায়িকা",
-"Groups meeting these criteria are available in %s:" => "প্রদত্ত বৈশিষ্ট্য অনুযায়ী %s এ প্রাপ্তব্য গ্রুপসমূহ:",
-"only those object classes:" => "শুধুমাত্র সেইসব অবজেক্ট ক্লাস:",
-"only from those groups:" => "শুধুমাত্র বর্ণিত গ্রুপসমূহ হতে:",
-"Edit raw filter instead" => "অসম্পূর্ণ ফিল্টার সম্পাদনা করুন",
-"Raw LDAP filter" => "অসম্পূর্ণ LDAP ফিল্টার",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "ফিল্টারটি %s সার্ভারে কোন কোন LDAP গ্রুপ প্রবেশাধিকার পাবে তা নির্ধারণ করে।",
-"groups found" => "গ্রুপ পাওয়া গেছে",
-"Users login with this attribute:" => "এই বৈশিষ্ট্য নিয়ে ব্যবহারকারী প্রবেশ করতে পারেন:",
-"LDAP Username:" => "LDAP ব্যাবহারকারী নাম:",
-"LDAP Email Address:" => "LDAP ই-মেইল ঠিকানা:",
-"Other Attributes:" => "অন্যান্য বৈশিষ্ট্য:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "প্রবেশ প্রচেষ্টা নিলে প্রযোজ্য ফিল্টার নির্ধারণ করে। প্রবেশকালে %%uid ব্যাবহারকারীর নামকে প্রতিস্থাপন করে। ঊদাহরণ: \"uid=%%uid\"",
-"1. Server" => "1. সার্ভার",
-"%s. Server:" => "%s. সার্ভার:",
-"Add Server Configuration" => "সার্ভার কনফিগারেসন যোগ কর",
-"Delete Configuration" => "কনফিগারেসন মুছে ফেল",
-"Host" => "হোস্ট",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL আবশ্যক  না হলে  আপনি এই প্রটোকলটি মুছে ফেলতে পারেন । এরপর শুরু করুন এটা দিয়ে ldaps://",
-"Port" => "পোর্ট",
-"User DN" => "ব্যবহারকারি  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." => "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. পরিচয় গোপন রেখে অধিগমনের জন্য  DN এবং কূটশব্দটি ফাঁকা রাখুন।",
-"Password" => "কূটশব্দ",
-"For anonymous access, leave DN and Password empty." => "অজ্ঞাতকুলশীল অধিগমনের জন্য DN এবং কূটশব্দটি ফাঁকা রাখুন।",
-"One Base DN per line" => "লাইনপ্রতি একটি Base DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "সুচারু ট্যঅবে গিয়ে আপনি ব্যবহারকারি এবং গোষ্ঠীসমূহের জন্য ভিত্তি DN নির্ধারণ করতে পারেন।",
-"Limit %s access to users meeting these criteria:" => "%s এ প্রবেশাধিকার এই শর্তধারী ব্যবহারকারীর মাঝে সীমিত রাখ:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "এই ফিল্টারটি কোন কোন LDAP ব্যবহারকারী %s সার্ভারে প্রবেশ করবেন তা বাছাই করে।",
-"users found" => "ব্যাবহারকারী পাওয়া গেছে",
-"Back" => "পেছনে যাও",
-"Continue" => "চালিয়ে যাও",
-"Expert" => "দক্ষ",
-"Advanced" => "সুচারু",
-"<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>Warning:</b> Apps user_ldap and user_webdavauth কম্প্যাটিবল নয়। আপনি অবান্ছিত জটিলতার মুখোমুখি হতে পারেন। সিস্টেম প্রশাসককে যেকোন একটি অকার্যকর করে দিতে বলুন।",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> PHP LDAP মডিউল ইনস্টল করা নেই, ব্যাকএন্ড কাজ করবেনা। সিস্টেম প্রশাসককে এটি ইনস্টল করতে বলুন।",
-"Connection Settings" => "সংযোগ নিয়ামকসমূহ",
-"Configuration Active" => "কনফিগারেসন সক্রিয়",
-"When unchecked, this configuration will be skipped." => "চেকমার্ক তুলে দিলে কনফিগারেসন এড়িয়ে যাবে।",
-"Backup (Replica) Host" => "ব্যাকআপ (নকল) হোস্ট",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "একটি ঐচ্ছিক ব্যাকআপ হোস্ট দিন। এটি মূল LDAP/AD সার্ভারের নকল হবে।",
-"Backup (Replica) Port" => "ব্যাকআপ (নকল) পোর্ট",
-"Disable Main Server" => "মূল সার্ভারকে অকার্যকর কর",
-"Only connect to the replica server." => "শুধুমাত্র নকল সার্ভারে সংযোগ দাও।",
-"Case insensitive LDAP server (Windows)" => "বর্ণ অসংবেদী LDAP  সার্ভার (উইন্ডোজ)",
-"Turn off SSL certificate validation." => "SSL সনদপত্র যাচাইকরণ বন্ধ রাক।",
-"Cache Time-To-Live" => "ক্যাশে টাইম-টু-লিভ",
-"in seconds. A change empties the cache." => "সেকেন্ডে। কোন পরিবর্তন ক্যাসে খালি করবে।",
-"Directory Settings" => "ডিরেক্টরি নিয়ামকসমূহ",
-"User Display Name Field" => "ব্যবহারকারীর প্রদর্শিতব্য নামের ক্ষেত্র",
-"The LDAP attribute to use to generate the user's display name." => "ব্যবহারকারীর প্রদর্শনীয় নাম তৈরি করার জন্য ব্যবহৃত LDAP বৈশিষ্ট্য।",
-"Base User Tree" => "ভিত্তি ব্যবহারকারি বৃক্ষাকারে",
-"Group Display Name Field" => "গোষ্ঠীর প্রদর্শিতব্য নামের ক্ষেত্র",
-"Base Group Tree" => "ভিত্তি গোষ্ঠী বৃক্ষাকারে",
-"Group Search Attributes" => "গ্রুপ খোঁজার বৈশিষ্ট্য",
-"Group-Member association" => "গোষ্ঠী-সদস্য সংস্থাপন",
-"Nested Groups" => "একতাবদ্ধ গোষ্ঠিসমূহ",
-"Special Attributes" => "বিশেষ বৈশিষ্ট্যসমূহ",
-"Quota Field" => "কোটা",
-"Quota Default" => "পূর্বনির্ধারিত কোটা",
-"in bytes" => "বাইটে",
-"Email Field" => "ইমেইল ক্ষেত্র",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ব্যবহারকারী নামের জন্য ফাঁকা রাখুন (পূর্বনির্ধারিত)। অন্যথায়, LDAP/AD বৈশিষ্ট্য নির্ধারণ করুন।"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/bn_IN.js b/apps/user_ldap/l10n/bn_IN.js
new file mode 100644
index 00000000000..526a2e10154
--- /dev/null
+++ b/apps/user_ldap/l10n/bn_IN.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "ভুল",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "সেভ",
+    "Host" : "হোস্ট"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/bn_IN.json b/apps/user_ldap/l10n/bn_IN.json
new file mode 100644
index 00000000000..f8bc485fa1f
--- /dev/null
+++ b/apps/user_ldap/l10n/bn_IN.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Error" : "ভুল",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "সেভ",
+    "Host" : "হোস্ট"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/bn_IN.php b/apps/user_ldap/l10n/bn_IN.php
deleted file mode 100644
index 2898597664a..00000000000
--- a/apps/user_ldap/l10n/bn_IN.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "ভুল",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "সেভ",
-"Host" => "হোস্ট"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/bs.js b/apps/user_ldap/l10n/bs.js
new file mode 100644
index 00000000000..feccd314874
--- /dev/null
+++ b/apps/user_ldap/l10n/bs.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Save" : "Spasi"
+},
+"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_ldap/l10n/bs.json b/apps/user_ldap/l10n/bs.json
new file mode 100644
index 00000000000..42f5ec1bffc
--- /dev/null
+++ b/apps/user_ldap/l10n/bs.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Save" : "Spasi"
+},"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_ldap/l10n/bs.php b/apps/user_ldap/l10n/bs.php
deleted file mode 100644
index 7a64be44e0d..00000000000
--- a/apps/user_ldap/l10n/bs.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
-"Save" => "Spasi"
-);
-$PLURAL_FORMS = "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_ldap/l10n/ca.js b/apps/user_ldap/l10n/ca.js
new file mode 100644
index 00000000000..8250261e9dc
--- /dev/null
+++ b/apps/user_ldap/l10n/ca.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Ha fallat en eliminar els mapatges",
+    "Failed to delete the server configuration" : "Ha fallat en eliminar la configuració del servidor",
+    "The configuration is valid and the connection could be established!" : "La configuració és vàlida i s'ha pogut establir la comunicació!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuració és vàlida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuració no és vàlida. Per més detalls mireu al registre del sistema.",
+    "No action specified" : "No heu especificat cap acció",
+    "No configuration specified" : "No heu especificat cap configuració",
+    "No data specified" : "No heu especificat cap dada",
+    " Could not set configuration %s" : "No s'ha pogut establir la configuració %s",
+    "Deletion failed" : "Eliminació fallida",
+    "Take over settings from recent server configuration?" : "Voleu prendre l'arranjament de la configuració actual del servidor?",
+    "Keep settings?" : "Voleu mantenir la configuració?",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
+    "Cannot add server configuration" : "No es pot afegir la configuració del servidor",
+    "mappings cleared" : "s'han eliminat els mapatges",
+    "Success" : "Èxit",
+    "Error" : "Error",
+    "Please specify a Base DN" : "Especifiqueu una base DN",
+    "Could not determine Base DN" : "No s'ha pogut determinar la base DN",
+    "Please specify the port" : "Especifiqueu el port",
+    "Configuration OK" : "Configuració correcte",
+    "Configuration incorrect" : "Configuració incorrecte",
+    "Configuration incomplete" : "Configuració incompleta",
+    "Select groups" : "Selecciona els grups",
+    "Select object classes" : "Seleccioneu les classes dels objectes",
+    "Select attributes" : "Seleccioneu els atributs",
+    "Connection test succeeded" : "La prova de connexió ha reeixit",
+    "Connection test failed" : "La prova de connexió ha fallat",
+    "Do you really want to delete the current Server Configuration?" : "Voleu eliminar la configuració actual del servidor?",
+    "Confirm Deletion" : "Confirma l'eliminació",
+    "_%s group found_::_%s groups found_" : ["S'ha trobat %s grup","S'han trobat %s grups"],
+    "_%s user found_::_%s users found_" : ["S'ha trobat %s usuari","S'han trobat %s usuaris"],
+    "Could not find the desired feature" : "La característica desitjada no s'ha trobat",
+    "Invalid Host" : "Ordinador central no vàlid",
+    "Server" : "Servidor",
+    "User Filter" : "Filtre d'usuari",
+    "Login Filter" : "Filtre d'acreditació",
+    "Group Filter" : "Filtre de grup",
+    "Save" : "Desa",
+    "Test Configuration" : "Comprovació de la configuració",
+    "Help" : "Ajuda",
+    "Groups meeting these criteria are available in %s:" : "Els grups que compleixen aquests criteris estan disponibles a %s:",
+    "only those object classes:" : "només aquestes classes d'objecte:",
+    "only from those groups:" : "només d'aquests grups",
+    "Edit raw filter instead" : "Edita filtre raw",
+    "Raw LDAP filter" : "Filtre raw LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtre especifica quins grups LDAP haurien de tenir accés a la instància %s.",
+    "groups found" : "grups trobats",
+    "Users login with this attribute:" : "Usuaris acreditats amb aquest atribut:",
+    "LDAP Username:" : "Nom d'usuari LDAP:",
+    "LDAP Email Address:" : "Adreça de correu electrònic LDAP:",
+    "Other Attributes:" : "Altres atributs:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor:",
+    "Add Server Configuration" : "Afegeix la configuració del servidor",
+    "Delete Configuration" : "Esborra la configuració",
+    "Host" : "Equip remot",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
+    "Port" : "Port",
+    "User DN" : "DN Usuari",
+    "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." : "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
+    "Password" : "Contrasenya",
+    "For anonymous access, leave DN and Password empty." : "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
+    "One Base DN per line" : "Una DN Base per línia",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
+    "Limit %s access to users meeting these criteria:" : "Limita l'accés a %s usuaris que compleixin amb aquest criteri:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s",
+    "users found" : "usuaris trobats",
+    "Back" : "Enrera",
+    "Continue" : "Continua",
+    "Expert" : "Expert",
+    "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>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi 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>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
+    "Connection Settings" : "Arranjaments de connexió",
+    "Configuration Active" : "Configuració activa",
+    "When unchecked, this configuration will be skipped." : "Si està desmarcat, aquesta configuració s'ometrà.",
+    "Backup (Replica) Host" : "Màquina de còpia de serguretat (rèplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Afegiu una màquina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal.",
+    "Backup (Replica) Port" : "Port de la còpia de seguretat (rèplica)",
+    "Disable Main Server" : "Desactiva el servidor principal",
+    "Only connect to the replica server." : "Connecta només al servidor rèplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
+    "Turn off SSL certificate validation." : "Desactiva la validació de certificat SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
+    "Cache Time-To-Live" : "Memòria cau Time-To-Live",
+    "in seconds. A change empties the cache." : "en segons. Un canvi buidarà la memòria cau.",
+    "Directory Settings" : "Arranjaments de carpetes",
+    "User Display Name Field" : "Camp per mostrar el nom d'usuari",
+    "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP a usar per generar el nom a mostrar de l'usuari.",
+    "Base User Tree" : "Arbre base d'usuaris",
+    "One User Base DN per line" : "Una DN Base d'Usuari per línia",
+    "User Search Attributes" : "Atributs de cerca d'usuari",
+    "Optional; one attribute per line" : "Opcional; Un atribut per línia",
+    "Group Display Name Field" : "Camp per mostrar el nom del grup",
+    "The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP a usar per generar el nom a mostrar del grup.",
+    "Base Group Tree" : "Arbre base de grups",
+    "One Group Base DN per line" : "Una DN Base de Grup per línia",
+    "Group Search Attributes" : "Atributs de cerca de grup",
+    "Group-Member association" : "Associació membres-grup",
+    "Nested Groups" : "Grups imbricats",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Quan està activat, els grups que contenen grups estan permesos. (Només funciona si l'atribut del grup membre conté DNs.)",
+    "Paging chunksize" : "Mida de la pàgina",
+    "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.)" : "Mida usada per cerques LDAP paginades que podrien retornar respostes de volcat com enumeració d'usuari o grup. (Establint-ho a 0 desactiva les cerques LDAP paginades en aquestes situacions.)",
+    "Special Attributes" : "Atributs especials",
+    "Quota Field" : "Camp de quota",
+    "Quota Default" : "Quota per defecte",
+    "in bytes" : "en bytes",
+    "Email Field" : "Camp de correu electrònic",
+    "User Home Folder Naming Rule" : "Norma per anomenar la carpeta arrel d'usuari",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
+    "Internal Username" : "Nom d'usuari intern",
+    "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 defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home d'usuari. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits).",
+    "Internal Username Attribute:" : "Atribut nom d'usuari intern:",
+    "Override UUID detection" : "Sobrescriu la detecció 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 defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits).",
+    "UUID Attribute for Users:" : "Atribut UUID per Usuaris:",
+    "UUID Attribute for Groups:" : "Atribut UUID per Grups:",
+    "Username-LDAP User Mapping" : "Mapatge d'usuari Nom d'usuari-LDAP",
+    "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." : "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental.",
+    "Clear Username-LDAP User Mapping" : "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Elimina el mapatge de grup Nom de grup-LDAP"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ca.json b/apps/user_ldap/l10n/ca.json
new file mode 100644
index 00000000000..ebf387726e6
--- /dev/null
+++ b/apps/user_ldap/l10n/ca.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Ha fallat en eliminar els mapatges",
+    "Failed to delete the server configuration" : "Ha fallat en eliminar la configuració del servidor",
+    "The configuration is valid and the connection could be established!" : "La configuració és vàlida i s'ha pogut establir la comunicació!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuració és vàlida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuració no és vàlida. Per més detalls mireu al registre del sistema.",
+    "No action specified" : "No heu especificat cap acció",
+    "No configuration specified" : "No heu especificat cap configuració",
+    "No data specified" : "No heu especificat cap dada",
+    " Could not set configuration %s" : "No s'ha pogut establir la configuració %s",
+    "Deletion failed" : "Eliminació fallida",
+    "Take over settings from recent server configuration?" : "Voleu prendre l'arranjament de la configuració actual del servidor?",
+    "Keep settings?" : "Voleu mantenir la configuració?",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
+    "Cannot add server configuration" : "No es pot afegir la configuració del servidor",
+    "mappings cleared" : "s'han eliminat els mapatges",
+    "Success" : "Èxit",
+    "Error" : "Error",
+    "Please specify a Base DN" : "Especifiqueu una base DN",
+    "Could not determine Base DN" : "No s'ha pogut determinar la base DN",
+    "Please specify the port" : "Especifiqueu el port",
+    "Configuration OK" : "Configuració correcte",
+    "Configuration incorrect" : "Configuració incorrecte",
+    "Configuration incomplete" : "Configuració incompleta",
+    "Select groups" : "Selecciona els grups",
+    "Select object classes" : "Seleccioneu les classes dels objectes",
+    "Select attributes" : "Seleccioneu els atributs",
+    "Connection test succeeded" : "La prova de connexió ha reeixit",
+    "Connection test failed" : "La prova de connexió ha fallat",
+    "Do you really want to delete the current Server Configuration?" : "Voleu eliminar la configuració actual del servidor?",
+    "Confirm Deletion" : "Confirma l'eliminació",
+    "_%s group found_::_%s groups found_" : ["S'ha trobat %s grup","S'han trobat %s grups"],
+    "_%s user found_::_%s users found_" : ["S'ha trobat %s usuari","S'han trobat %s usuaris"],
+    "Could not find the desired feature" : "La característica desitjada no s'ha trobat",
+    "Invalid Host" : "Ordinador central no vàlid",
+    "Server" : "Servidor",
+    "User Filter" : "Filtre d'usuari",
+    "Login Filter" : "Filtre d'acreditació",
+    "Group Filter" : "Filtre de grup",
+    "Save" : "Desa",
+    "Test Configuration" : "Comprovació de la configuració",
+    "Help" : "Ajuda",
+    "Groups meeting these criteria are available in %s:" : "Els grups que compleixen aquests criteris estan disponibles a %s:",
+    "only those object classes:" : "només aquestes classes d'objecte:",
+    "only from those groups:" : "només d'aquests grups",
+    "Edit raw filter instead" : "Edita filtre raw",
+    "Raw LDAP filter" : "Filtre raw LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtre especifica quins grups LDAP haurien de tenir accés a la instància %s.",
+    "groups found" : "grups trobats",
+    "Users login with this attribute:" : "Usuaris acreditats amb aquest atribut:",
+    "LDAP Username:" : "Nom d'usuari LDAP:",
+    "LDAP Email Address:" : "Adreça de correu electrònic LDAP:",
+    "Other Attributes:" : "Altres atributs:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor:",
+    "Add Server Configuration" : "Afegeix la configuració del servidor",
+    "Delete Configuration" : "Esborra la configuració",
+    "Host" : "Equip remot",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
+    "Port" : "Port",
+    "User DN" : "DN Usuari",
+    "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." : "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
+    "Password" : "Contrasenya",
+    "For anonymous access, leave DN and Password empty." : "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
+    "One Base DN per line" : "Una DN Base per línia",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
+    "Limit %s access to users meeting these criteria:" : "Limita l'accés a %s usuaris que compleixin amb aquest criteri:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s",
+    "users found" : "usuaris trobats",
+    "Back" : "Enrera",
+    "Continue" : "Continua",
+    "Expert" : "Expert",
+    "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>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi 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>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
+    "Connection Settings" : "Arranjaments de connexió",
+    "Configuration Active" : "Configuració activa",
+    "When unchecked, this configuration will be skipped." : "Si està desmarcat, aquesta configuració s'ometrà.",
+    "Backup (Replica) Host" : "Màquina de còpia de serguretat (rèplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Afegiu una màquina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal.",
+    "Backup (Replica) Port" : "Port de la còpia de seguretat (rèplica)",
+    "Disable Main Server" : "Desactiva el servidor principal",
+    "Only connect to the replica server." : "Connecta només al servidor rèplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
+    "Turn off SSL certificate validation." : "Desactiva la validació de certificat SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
+    "Cache Time-To-Live" : "Memòria cau Time-To-Live",
+    "in seconds. A change empties the cache." : "en segons. Un canvi buidarà la memòria cau.",
+    "Directory Settings" : "Arranjaments de carpetes",
+    "User Display Name Field" : "Camp per mostrar el nom d'usuari",
+    "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP a usar per generar el nom a mostrar de l'usuari.",
+    "Base User Tree" : "Arbre base d'usuaris",
+    "One User Base DN per line" : "Una DN Base d'Usuari per línia",
+    "User Search Attributes" : "Atributs de cerca d'usuari",
+    "Optional; one attribute per line" : "Opcional; Un atribut per línia",
+    "Group Display Name Field" : "Camp per mostrar el nom del grup",
+    "The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP a usar per generar el nom a mostrar del grup.",
+    "Base Group Tree" : "Arbre base de grups",
+    "One Group Base DN per line" : "Una DN Base de Grup per línia",
+    "Group Search Attributes" : "Atributs de cerca de grup",
+    "Group-Member association" : "Associació membres-grup",
+    "Nested Groups" : "Grups imbricats",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Quan està activat, els grups que contenen grups estan permesos. (Només funciona si l'atribut del grup membre conté DNs.)",
+    "Paging chunksize" : "Mida de la pàgina",
+    "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.)" : "Mida usada per cerques LDAP paginades que podrien retornar respostes de volcat com enumeració d'usuari o grup. (Establint-ho a 0 desactiva les cerques LDAP paginades en aquestes situacions.)",
+    "Special Attributes" : "Atributs especials",
+    "Quota Field" : "Camp de quota",
+    "Quota Default" : "Quota per defecte",
+    "in bytes" : "en bytes",
+    "Email Field" : "Camp de correu electrònic",
+    "User Home Folder Naming Rule" : "Norma per anomenar la carpeta arrel d'usuari",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
+    "Internal Username" : "Nom d'usuari intern",
+    "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 defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home d'usuari. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits).",
+    "Internal Username Attribute:" : "Atribut nom d'usuari intern:",
+    "Override UUID detection" : "Sobrescriu la detecció 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 defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits).",
+    "UUID Attribute for Users:" : "Atribut UUID per Usuaris:",
+    "UUID Attribute for Groups:" : "Atribut UUID per Grups:",
+    "Username-LDAP User Mapping" : "Mapatge d'usuari Nom d'usuari-LDAP",
+    "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." : "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental.",
+    "Clear Username-LDAP User Mapping" : "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Elimina el mapatge de grup Nom de grup-LDAP"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
deleted file mode 100644
index 682dd97d8cb..00000000000
--- a/apps/user_ldap/l10n/ca.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Ha fallat en eliminar els mapatges",
-"Failed to delete the server configuration" => "Ha fallat en eliminar la configuració del servidor",
-"The configuration is valid and the connection could be established!" => "La configuració és vàlida i s'ha pogut establir la comunicació!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuració és vàlida, però ha fallat el Bind. Comproveu les credencials i l'arranjament del servidor.",
-"The configuration is invalid. Please have a look at the logs for further details." => "La configuració no és vàlida. Per més detalls mireu al registre del sistema.",
-"No action specified" => "No heu especificat cap acció",
-"No configuration specified" => "No heu especificat cap configuració",
-"No data specified" => "No heu especificat cap dada",
-" Could not set configuration %s" => "No s'ha pogut establir la configuració %s",
-"Deletion failed" => "Eliminació fallida",
-"Take over settings from recent server configuration?" => "Voleu prendre l'arranjament de la configuració actual del servidor?",
-"Keep settings?" => "Voleu mantenir la configuració?",
-"{nthServer}. Server" => "{nthServer}. Servidor",
-"Cannot add server configuration" => "No es pot afegir la configuració del servidor",
-"mappings cleared" => "s'han eliminat els mapatges",
-"Success" => "Èxit",
-"Error" => "Error",
-"Please specify a Base DN" => "Especifiqueu una base DN",
-"Could not determine Base DN" => "No s'ha pogut determinar la base DN",
-"Please specify the port" => "Especifiqueu el port",
-"Configuration OK" => "Configuració correcte",
-"Configuration incorrect" => "Configuració incorrecte",
-"Configuration incomplete" => "Configuració incompleta",
-"Select groups" => "Selecciona els grups",
-"Select object classes" => "Seleccioneu les classes dels objectes",
-"Select attributes" => "Seleccioneu els atributs",
-"Connection test succeeded" => "La prova de connexió ha reeixit",
-"Connection test failed" => "La prova de connexió ha fallat",
-"Do you really want to delete the current Server Configuration?" => "Voleu eliminar la configuració actual del servidor?",
-"Confirm Deletion" => "Confirma l'eliminació",
-"_%s group found_::_%s groups found_" => array("S'ha trobat %s grup","S'han trobat %s grups"),
-"_%s user found_::_%s users found_" => array("S'ha trobat %s usuari","S'han trobat %s usuaris"),
-"Could not find the desired feature" => "La característica desitjada no s'ha trobat",
-"Invalid Host" => "Ordinador central no vàlid",
-"Server" => "Servidor",
-"User Filter" => "Filtre d'usuari",
-"Login Filter" => "Filtre d'acreditació",
-"Group Filter" => "Filtre de grup",
-"Save" => "Desa",
-"Test Configuration" => "Comprovació de la configuració",
-"Help" => "Ajuda",
-"Groups meeting these criteria are available in %s:" => "Els grups que compleixen aquests criteris estan disponibles a %s:",
-"only those object classes:" => "només aquestes classes d'objecte:",
-"only from those groups:" => "només d'aquests grups",
-"Edit raw filter instead" => "Edita filtre raw",
-"Raw LDAP filter" => "Filtre raw LDAP",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "El filtre especifica quins grups LDAP haurien de tenir accés a la instància %s.",
-"groups found" => "grups trobats",
-"Users login with this attribute:" => "Usuaris acreditats amb aquest atribut:",
-"LDAP Username:" => "Nom d'usuari LDAP:",
-"LDAP Email Address:" => "Adreça de correu electrònic LDAP:",
-"Other Attributes:" => "Altres atributs:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defineix el filtre a aplicar quan s'intenta iniciar la sessió. %%uid reemplaça el nom d'usuari en l'acció d'inici de sessió. Per exemple: \"uid=%%uid\"",
-"1. Server" => "1. Servidor",
-"%s. Server:" => "%s. Servidor:",
-"Add Server Configuration" => "Afegeix la configuració del servidor",
-"Delete Configuration" => "Esborra la configuració",
-"Host" => "Equip remot",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podeu ometre el protocol, excepte si requeriu SSL. Llavors comenceu amb ldaps://",
-"Port" => "Port",
-"User DN" => "DN Usuari",
-"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." => "La DN de l'usuari client amb la que s'haurà de fer, per exemple uid=agent,dc=exemple,dc=com. Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
-"Password" => "Contrasenya",
-"For anonymous access, leave DN and Password empty." => "Per un accés anònim, deixeu la DN i la contrasenya en blanc.",
-"One Base DN per line" => "Una DN Base per línia",
-"You can specify Base DN for users and groups in the Advanced tab" => "Podeu especificar DN Base per usuaris i grups a la pestanya Avançat",
-"Limit %s access to users meeting these criteria:" => "Limita l'accés a %s usuaris que compleixin amb aquest criteri:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "El filtre especifica quins usuaris LDAP haurien de tenir accés a la instància %s",
-"users found" => "usuaris trobats",
-"Back" => "Enrera",
-"Continue" => "Continua",
-"Expert" => "Expert",
-"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>Avís:</b> Les aplicacions user_ldap i user_webdavauth són incompatibles. Podeu experimentar comportaments inesperats. Demaneu a l'administrador del sistema que en desactivi 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>Avís:</b> El mòdul PHP LDAP no està instal·lat, el dorsal no funcionarà. Demaneu a l'administrador del sistema que l'instal·li.",
-"Connection Settings" => "Arranjaments de connexió",
-"Configuration Active" => "Configuració activa",
-"When unchecked, this configuration will be skipped." => "Si està desmarcat, aquesta configuració s'ometrà.",
-"Backup (Replica) Host" => "Màquina de còpia de serguretat (rèplica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Afegiu una màquina de còpia de seguretat opcional. Ha de ser una rèplica del servidor LDAP/AD principal.",
-"Backup (Replica) Port" => "Port de la còpia de seguretat (rèplica)",
-"Disable Main Server" => "Desactiva el servidor principal",
-"Only connect to the replica server." => "Connecta només al servidor rèplica.",
-"Case insensitive LDAP server (Windows)" => "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)",
-"Turn off SSL certificate validation." => "Desactiva la validació de certificat SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomana, useu-ho només com a prova! Importeu el certificat SSL del servidor LDAP al servidor %s només si la connexió funciona amb aquesta opció.",
-"Cache Time-To-Live" => "Memòria cau Time-To-Live",
-"in seconds. A change empties the cache." => "en segons. Un canvi buidarà la memòria cau.",
-"Directory Settings" => "Arranjaments de carpetes",
-"User Display Name Field" => "Camp per mostrar el nom d'usuari",
-"The LDAP attribute to use to generate the user's display name." => "Atribut LDAP a usar per generar el nom a mostrar de l'usuari.",
-"Base User Tree" => "Arbre base d'usuaris",
-"One User Base DN per line" => "Una DN Base d'Usuari per línia",
-"User Search Attributes" => "Atributs de cerca d'usuari",
-"Optional; one attribute per line" => "Opcional; Un atribut per línia",
-"Group Display Name Field" => "Camp per mostrar el nom del grup",
-"The LDAP attribute to use to generate the groups's display name." => "Atribut LDAP a usar per generar el nom a mostrar del grup.",
-"Base Group Tree" => "Arbre base de grups",
-"One Group Base DN per line" => "Una DN Base de Grup per línia",
-"Group Search Attributes" => "Atributs de cerca de grup",
-"Group-Member association" => "Associació membres-grup",
-"Nested Groups" => "Grups imbricats",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quan està activat, els grups que contenen grups estan permesos. (Només funciona si l'atribut del grup membre conté DNs.)",
-"Paging chunksize" => "Mida de la pàgina",
-"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.)" => "Mida usada per cerques LDAP paginades que podrien retornar respostes de volcat com enumeració d'usuari o grup. (Establint-ho a 0 desactiva les cerques LDAP paginades en aquestes situacions.)",
-"Special Attributes" => "Atributs especials",
-"Quota Field" => "Camp de quota",
-"Quota Default" => "Quota per defecte",
-"in bytes" => "en bytes",
-"Email Field" => "Camp de correu electrònic",
-"User Home Folder Naming Rule" => "Norma per anomenar la carpeta arrel d'usuari",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
-"Internal Username" => "Nom d'usuari intern",
-"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 defecte el nom d'usuari intern es crearà a partir de l'atribut UUID. Això assegura que el nom d'usuari és únic i que els caràcters no s'han de convertir. El nom d'usuari intern té la restricció que només estan permesos els caràcters: [ a-zA-Z0-9_.@- ]. Els altres caràcters es substitueixen pel seu corresponent ASCII o simplement s'ometen. En cas de col·lisió s'incrementa/decrementa en un. El nom d'usuari intern s'utilitza per identificar un usuari internament. També és el nom per defecte de la carpeta home d'usuari. És també un port de URLs remotes, per exemple tots els serveis *DAV. Amb aquest arranjament es pot variar el comportament per defecte. Per obtenir un comportament similar al d'abans de ownCloud 5, escriviu el nom d'usuari a mostrar en el camp següent. Deixei-lo en blanc si preferiu el comportament per defecte. Els canvis tindran efecte només en els nous usuaris LDAP mapats (afegits).",
-"Internal Username Attribute:" => "Atribut nom d'usuari intern:",
-"Override UUID detection" => "Sobrescriu la detecció 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 defecte, owncloud autodetecta l'atribut UUID. L'atribut UUID s'utilitza per identificar usuaris i grups de forma indubtable. També el nom d'usuari intern es crearà en base a la UUIS, si no heu especificat res diferent a dalt. Podeu sobreescriure l'arranjament i passar l'atribut que desitgeu. Heu d'assegurar-vos que l'atribut que escolliu pot ser recollit tant pels usuaris com pels grups i que és únic. Deixeu-ho en blanc si preferiu el comportament per defecte. els canvis s'aplicaran als usuaris i grups LDAP mapats de nou (afegits).",
-"UUID Attribute for Users:" => "Atribut UUID per Usuaris:",
-"UUID Attribute for Groups:" => "Atribut UUID per Grups:",
-"Username-LDAP User Mapping" => "Mapatge d'usuari Nom d'usuari-LDAP",
-"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." => "Els noms d'usuari s'usen per desar i assignar (meta)dades. Per tal d'identificar amb precisió i reconèixer els usuaris, cada usuari LDAP tindrà un nom d'usuari intern. Això requereix mapatge del nom d'usuari a l'usuari LDAP. El nom d'usuari creat es mapa a la UUID de l'usuari LDAP. A més, la DN es posa a la memòria cau per reduir la interacció LDAP, però no s'usa per identificació. En cas que la DN canvïi, els canvis es trobaran. El nom d'usuari intern s'usa a tot arreu. Si esborreu els mapatges quedaran sobrants a tot arreu. Esborrar els mapatges no és sensible a la configuració, afecta a totes les configuracions LDAP! No esborreu mai els mapatges en un entorn de producció, només en un estadi de prova o experimental.",
-"Clear Username-LDAP User Mapping" => "Elimina el mapatge d'usuari Nom d'usuari-LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Elimina el mapatge de grup Nom de grup-LDAP"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ca@valencia.js b/apps/user_ldap/l10n/ca@valencia.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/ca@valencia.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/ca@valencia.json
@@ -0,0 +1,5 @@
+{ "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/ca@valencia.php b/apps/user_ldap/l10n/ca@valencia.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/ca@valencia.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js
new file mode 100644
index 00000000000..abfa8433593
--- /dev/null
+++ b/apps/user_ldap/l10n/cs_CZ.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Selhalo zrušení mapování.",
+    "Failed to delete the server configuration" : "Selhalo smazání nastavení serveru",
+    "The configuration is valid and the connection could be established!" : "Nastavení je v pořádku a spojení bylo navázáno.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurace je neplatná. Pro bližší informace se podívejte do logu.",
+    "No action specified" : "Neurčena žádná akce",
+    "No configuration specified" : "Neurčena žádná konfigurace",
+    "No data specified" : "Neurčena žádná data",
+    " Could not set configuration %s" : "Nelze nastavit konfiguraci %s",
+    "Deletion failed" : "Mazání selhalo",
+    "Take over settings from recent server configuration?" : "Převzít nastavení z nedávné konfigurace serveru?",
+    "Keep settings?" : "Ponechat nastavení?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Nelze přidat nastavení serveru",
+    "mappings cleared" : "mapování zrušeno",
+    "Success" : "Úspěch",
+    "Error" : "Chyba",
+    "Please specify a Base DN" : "Uveďte prosím Base DN",
+    "Could not determine Base DN" : "Nelze určit Base DN",
+    "Please specify the port" : "Prosím zadejte port",
+    "Configuration OK" : "Konfigurace v pořádku",
+    "Configuration incorrect" : "Nesprávná konfigurace",
+    "Configuration incomplete" : "Nekompletní konfigurace",
+    "Select groups" : "Vyberte skupiny",
+    "Select object classes" : "Vyberte objektové třídy",
+    "Select attributes" : "Vyberte atributy",
+    "Connection test succeeded" : "Test spojení byl úspěšný",
+    "Connection test failed" : "Test spojení selhal",
+    "Do you really want to delete the current Server Configuration?" : "Opravdu si přejete smazat současné nastavení serveru?",
+    "Confirm Deletion" : "Potvrdit smazání",
+    "_%s group found_::_%s groups found_" : ["nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"],
+    "_%s user found_::_%s users found_" : ["nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"],
+    "Could not find the desired feature" : "Nelze nalézt požadovanou vlastnost",
+    "Invalid Host" : "Neplatný hostitel",
+    "Server" : "Server",
+    "User Filter" : "Uživatelský filtr",
+    "Login Filter" : "Přihlašovací filtr",
+    "Group Filter" : "Filtr skupin",
+    "Save" : "Uložit",
+    "Test Configuration" : "Vyzkoušet nastavení",
+    "Help" : "Nápověda",
+    "Groups meeting these criteria are available in %s:" : "Skupiny splňující tyto podmínky jsou k dispozici v %s:",
+    "only those object classes:" : "pouze tyto objektové třídy:",
+    "only from those groups:" : "pouze z těchto skupin:",
+    "Edit raw filter instead" : "Edituj filtr přímo",
+    "Raw LDAP filter" : "Původní filtr LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
+    "Test Filter" : "Otestovat filtr",
+    "groups found" : "nalezené skupiny",
+    "Users login with this attribute:" : "Uživatelé se přihlašují s tímto atributem:",
+    "LDAP Username:" : "LDAP uživatelské jméno:",
+    "LDAP Email Address:" : "LDAP e-mailová adresa:",
+    "Other Attributes:" : "Další atributy:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Přidat nastavení serveru",
+    "Delete Configuration" : "Odstranit konfiguraci",
+    "Host" : "Počítač",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
+    "Port" : "Port",
+    "User DN" : "Uživatelské 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." : "DN klientského uživatele, ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte DN a heslo prázdné.",
+    "Password" : "Heslo",
+    "For anonymous access, leave DN and Password empty." : "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
+    "One Base DN per line" : "Jedna základní DN na řádku",
+    "You can specify Base DN for users and groups in the Advanced tab" : "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)",
+    "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
+    "users found" : "nalezení uživatelé",
+    "Saving" : "Ukládá se",
+    "Back" : "Zpět",
+    "Continue" : "Pokračovat",
+    "Expert" : "Expertní",
+    "Advanced" : "Pokročilé",
+    "<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval.",
+    "Connection Settings" : "Nastavení spojení",
+    "Configuration Active" : "Nastavení aktivní",
+    "When unchecked, this configuration will be skipped." : "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.",
+    "Backup (Replica) Host" : "Záložní (kopie) hostitel",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD.",
+    "Backup (Replica) Port" : "Záložní (kopie) port",
+    "Disable Main Server" : "Zakázat hlavní server",
+    "Only connect to the replica server." : "Připojit jen k záložnímu serveru.",
+    "Case insensitive LDAP server (Windows)" : "LDAP server nerozlišující velikost znaků (Windows)",
+    "Turn off SSL certificate validation." : "Vypnout ověřování SSL certifikátu.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nedoporučuje se, určeno pouze k testovacímu použití. Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.",
+    "Cache Time-To-Live" : "TTL vyrovnávací paměti",
+    "in seconds. A change empties the cache." : "v sekundách. Změna vyprázdní vyrovnávací paměť.",
+    "Directory Settings" : "Nastavení adresáře",
+    "User Display Name Field" : "Pole zobrazovaného jména uživatele",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP atribut použitý k vytvoření zobrazovaného jména uživatele.",
+    "Base User Tree" : "Základní uživatelský strom",
+    "One User Base DN per line" : "Jedna uživatelská základní DN na řádku",
+    "User Search Attributes" : "Atributy vyhledávání uživatelů",
+    "Optional; one attribute per line" : "Volitelné, jeden atribut na řádku",
+    "Group Display Name Field" : "Pole zobrazovaného jména skupiny",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP atribut použitý k vytvoření zobrazovaného jména skupiny.",
+    "Base Group Tree" : "Základní skupinový strom",
+    "One Group Base DN per line" : "Jedna skupinová základní DN na řádku",
+    "Group Search Attributes" : "Atributy vyhledávání skupin",
+    "Group-Member association" : "Asociace člena skupiny",
+    "Nested Groups" : "Vnořené skupiny",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Pokud zapnuto, je možno používat skupiny, které obsahují jiné skupiny. (Funguje pouze pokud atribut člena skupiny obsahuje DN.)",
+    "Paging chunksize" : "Velikost bloku stránkování",
+    "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.)" : "Velikost bloku použitá pro stránkování vyhledávání v LDAP, které může vracet objemné výsledky jako třeba výčet uživatelů či skupin. (Nastavení na 0 zakáže stránkovaná vyhledávání pro tyto situace.)",
+    "Special Attributes" : "Speciální atributy",
+    "Quota Field" : "Pole pro kvótu",
+    "Quota Default" : "Výchozí kvóta",
+    "in bytes" : "v bajtech",
+    "Email Field" : "Pole e-mailu",
+    "User Home Folder Naming Rule" : "Pravidlo pojmenování domovské složky uživatele",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
+    "Internal Username" : "Interní uživatelské jméno",
+    "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." : "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP.",
+    "Internal Username Attribute:" : "Atribut interního uživatelského jména:",
+    "Override UUID detection" : "Nastavit ručně UUID atribut",
+    "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." : "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP.",
+    "UUID Attribute for Users:" : "UUID atribut pro uživatele:",
+    "UUID Attribute for Groups:" : "UUID atribut pro skupiny:",
+    "Username-LDAP User Mapping" : "Mapování uživatelských jmen z LDAPu",
+    "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." : "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi.",
+    "Clear Username-LDAP User Mapping" : "Zrušit mapování uživatelských jmen LDAPu",
+    "Clear Groupname-LDAP Group Mapping" : "Zrušit mapování názvů skupin LDAPu"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json
new file mode 100644
index 00000000000..f8e76205cae
--- /dev/null
+++ b/apps/user_ldap/l10n/cs_CZ.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Selhalo zrušení mapování.",
+    "Failed to delete the server configuration" : "Selhalo smazání nastavení serveru",
+    "The configuration is valid and the connection could be established!" : "Nastavení je v pořádku a spojení bylo navázáno.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurace je neplatná. Pro bližší informace se podívejte do logu.",
+    "No action specified" : "Neurčena žádná akce",
+    "No configuration specified" : "Neurčena žádná konfigurace",
+    "No data specified" : "Neurčena žádná data",
+    " Could not set configuration %s" : "Nelze nastavit konfiguraci %s",
+    "Deletion failed" : "Mazání selhalo",
+    "Take over settings from recent server configuration?" : "Převzít nastavení z nedávné konfigurace serveru?",
+    "Keep settings?" : "Ponechat nastavení?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Nelze přidat nastavení serveru",
+    "mappings cleared" : "mapování zrušeno",
+    "Success" : "Úspěch",
+    "Error" : "Chyba",
+    "Please specify a Base DN" : "Uveďte prosím Base DN",
+    "Could not determine Base DN" : "Nelze určit Base DN",
+    "Please specify the port" : "Prosím zadejte port",
+    "Configuration OK" : "Konfigurace v pořádku",
+    "Configuration incorrect" : "Nesprávná konfigurace",
+    "Configuration incomplete" : "Nekompletní konfigurace",
+    "Select groups" : "Vyberte skupiny",
+    "Select object classes" : "Vyberte objektové třídy",
+    "Select attributes" : "Vyberte atributy",
+    "Connection test succeeded" : "Test spojení byl úspěšný",
+    "Connection test failed" : "Test spojení selhal",
+    "Do you really want to delete the current Server Configuration?" : "Opravdu si přejete smazat současné nastavení serveru?",
+    "Confirm Deletion" : "Potvrdit smazání",
+    "_%s group found_::_%s groups found_" : ["nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"],
+    "_%s user found_::_%s users found_" : ["nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"],
+    "Could not find the desired feature" : "Nelze nalézt požadovanou vlastnost",
+    "Invalid Host" : "Neplatný hostitel",
+    "Server" : "Server",
+    "User Filter" : "Uživatelský filtr",
+    "Login Filter" : "Přihlašovací filtr",
+    "Group Filter" : "Filtr skupin",
+    "Save" : "Uložit",
+    "Test Configuration" : "Vyzkoušet nastavení",
+    "Help" : "Nápověda",
+    "Groups meeting these criteria are available in %s:" : "Skupiny splňující tyto podmínky jsou k dispozici v %s:",
+    "only those object classes:" : "pouze tyto objektové třídy:",
+    "only from those groups:" : "pouze z těchto skupin:",
+    "Edit raw filter instead" : "Edituj filtr přímo",
+    "Raw LDAP filter" : "Původní filtr LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
+    "Test Filter" : "Otestovat filtr",
+    "groups found" : "nalezené skupiny",
+    "Users login with this attribute:" : "Uživatelé se přihlašují s tímto atributem:",
+    "LDAP Username:" : "LDAP uživatelské jméno:",
+    "LDAP Email Address:" : "LDAP e-mailová adresa:",
+    "Other Attributes:" : "Další atributy:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Přidat nastavení serveru",
+    "Delete Configuration" : "Odstranit konfiguraci",
+    "Host" : "Počítač",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
+    "Port" : "Port",
+    "User DN" : "Uživatelské 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." : "DN klientského uživatele, ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte DN a heslo prázdné.",
+    "Password" : "Heslo",
+    "For anonymous access, leave DN and Password empty." : "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
+    "One Base DN per line" : "Jedna základní DN na řádku",
+    "You can specify Base DN for users and groups in the Advanced tab" : "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)",
+    "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
+    "users found" : "nalezení uživatelé",
+    "Saving" : "Ukládá se",
+    "Back" : "Zpět",
+    "Continue" : "Pokračovat",
+    "Expert" : "Expertní",
+    "Advanced" : "Pokročilé",
+    "<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval.",
+    "Connection Settings" : "Nastavení spojení",
+    "Configuration Active" : "Nastavení aktivní",
+    "When unchecked, this configuration will be skipped." : "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.",
+    "Backup (Replica) Host" : "Záložní (kopie) hostitel",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD.",
+    "Backup (Replica) Port" : "Záložní (kopie) port",
+    "Disable Main Server" : "Zakázat hlavní server",
+    "Only connect to the replica server." : "Připojit jen k záložnímu serveru.",
+    "Case insensitive LDAP server (Windows)" : "LDAP server nerozlišující velikost znaků (Windows)",
+    "Turn off SSL certificate validation." : "Vypnout ověřování SSL certifikátu.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nedoporučuje se, určeno pouze k testovacímu použití. Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.",
+    "Cache Time-To-Live" : "TTL vyrovnávací paměti",
+    "in seconds. A change empties the cache." : "v sekundách. Změna vyprázdní vyrovnávací paměť.",
+    "Directory Settings" : "Nastavení adresáře",
+    "User Display Name Field" : "Pole zobrazovaného jména uživatele",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP atribut použitý k vytvoření zobrazovaného jména uživatele.",
+    "Base User Tree" : "Základní uživatelský strom",
+    "One User Base DN per line" : "Jedna uživatelská základní DN na řádku",
+    "User Search Attributes" : "Atributy vyhledávání uživatelů",
+    "Optional; one attribute per line" : "Volitelné, jeden atribut na řádku",
+    "Group Display Name Field" : "Pole zobrazovaného jména skupiny",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP atribut použitý k vytvoření zobrazovaného jména skupiny.",
+    "Base Group Tree" : "Základní skupinový strom",
+    "One Group Base DN per line" : "Jedna skupinová základní DN na řádku",
+    "Group Search Attributes" : "Atributy vyhledávání skupin",
+    "Group-Member association" : "Asociace člena skupiny",
+    "Nested Groups" : "Vnořené skupiny",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Pokud zapnuto, je možno používat skupiny, které obsahují jiné skupiny. (Funguje pouze pokud atribut člena skupiny obsahuje DN.)",
+    "Paging chunksize" : "Velikost bloku stránkování",
+    "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.)" : "Velikost bloku použitá pro stránkování vyhledávání v LDAP, které může vracet objemné výsledky jako třeba výčet uživatelů či skupin. (Nastavení na 0 zakáže stránkovaná vyhledávání pro tyto situace.)",
+    "Special Attributes" : "Speciální atributy",
+    "Quota Field" : "Pole pro kvótu",
+    "Quota Default" : "Výchozí kvóta",
+    "in bytes" : "v bajtech",
+    "Email Field" : "Pole e-mailu",
+    "User Home Folder Naming Rule" : "Pravidlo pojmenování domovské složky uživatele",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
+    "Internal Username" : "Interní uživatelské jméno",
+    "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." : "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP.",
+    "Internal Username Attribute:" : "Atribut interního uživatelského jména:",
+    "Override UUID detection" : "Nastavit ručně UUID atribut",
+    "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." : "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP.",
+    "UUID Attribute for Users:" : "UUID atribut pro uživatele:",
+    "UUID Attribute for Groups:" : "UUID atribut pro skupiny:",
+    "Username-LDAP User Mapping" : "Mapování uživatelských jmen z LDAPu",
+    "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." : "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi.",
+    "Clear Username-LDAP User Mapping" : "Zrušit mapování uživatelských jmen LDAPu",
+    "Clear Groupname-LDAP Group Mapping" : "Zrušit mapování názvů skupin LDAPu"
+},"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/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
deleted file mode 100644
index 03e3ac578c3..00000000000
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Selhalo zrušení mapování.",
-"Failed to delete the server configuration" => "Selhalo smazání nastavení serveru",
-"The configuration is valid and the connection could be established!" => "Nastavení je v pořádku a spojení bylo navázáno.",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurace je v pořádku, ale spojení selhalo. Zkontrolujte, prosím, nastavení serveru a přihlašovací údaje.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Konfigurace je neplatná. Pro bližší informace se podívejte do logu.",
-"No action specified" => "Neurčena žádná akce",
-"No configuration specified" => "Neurčena žádná konfigurace",
-"No data specified" => "Neurčena žádná data",
-" Could not set configuration %s" => "Nelze nastavit konfiguraci %s",
-"Deletion failed" => "Mazání selhalo",
-"Take over settings from recent server configuration?" => "Převzít nastavení z nedávné konfigurace serveru?",
-"Keep settings?" => "Ponechat nastavení?",
-"{nthServer}. Server" => "{nthServer}. Server",
-"Cannot add server configuration" => "Nelze přidat nastavení serveru",
-"mappings cleared" => "mapování zrušeno",
-"Success" => "Úspěch",
-"Error" => "Chyba",
-"Please specify a Base DN" => "Uveďte prosím Base DN",
-"Could not determine Base DN" => "Nelze určit Base DN",
-"Please specify the port" => "Prosím zadejte port",
-"Configuration OK" => "Konfigurace v pořádku",
-"Configuration incorrect" => "Nesprávná konfigurace",
-"Configuration incomplete" => "Nekompletní konfigurace",
-"Select groups" => "Vyberte skupiny",
-"Select object classes" => "Vyberte objektové třídy",
-"Select attributes" => "Vyberte atributy",
-"Connection test succeeded" => "Test spojení byl úspěšný",
-"Connection test failed" => "Test spojení selhal",
-"Do you really want to delete the current Server Configuration?" => "Opravdu si přejete smazat současné nastavení serveru?",
-"Confirm Deletion" => "Potvrdit smazání",
-"_%s group found_::_%s groups found_" => array("nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"),
-"_%s user found_::_%s users found_" => array("nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"),
-"Could not find the desired feature" => "Nelze nalézt požadovanou vlastnost",
-"Invalid Host" => "Neplatný hostitel",
-"Server" => "Server",
-"User Filter" => "Uživatelský filtr",
-"Login Filter" => "Přihlašovací filtr",
-"Group Filter" => "Filtr skupin",
-"Save" => "Uložit",
-"Test Configuration" => "Vyzkoušet nastavení",
-"Help" => "Nápověda",
-"Groups meeting these criteria are available in %s:" => "Skupiny splňující tyto podmínky jsou k dispozici v %s:",
-"only those object classes:" => "pouze tyto objektové třídy:",
-"only from those groups:" => "pouze z těchto skupin:",
-"Edit raw filter instead" => "Edituj filtr přímo",
-"Raw LDAP filter" => "Původní filtr LDAP",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
-"Test Filter" => "Otestovat filtr",
-"groups found" => "nalezené skupiny",
-"Users login with this attribute:" => "Uživatelé se přihlašují s tímto atributem:",
-"LDAP Username:" => "LDAP uživatelské jméno:",
-"LDAP Email Address:" => "LDAP e-mailová adresa:",
-"Other Attributes:" => "Další atributy:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filtr při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení. Příklad: \"uid=%%uid\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Přidat nastavení serveru",
-"Delete Configuration" => "Odstranit konfiguraci",
-"Host" => "Počítač",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
-"Port" => "Port",
-"User DN" => "Uživatelské 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." => "DN klientského uživatele, ke kterému tvoříte vazbu, např. uid=agent,dc=example,dc=com. Pro anonymní přístup ponechte DN a heslo prázdné.",
-"Password" => "Heslo",
-"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup ponechte údaje DN and heslo prázdné.",
-"One Base DN per line" => "Jedna základní DN na řádku",
-"You can specify Base DN for users and groups in the Advanced tab" => "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.",
-"Manually enter LDAP filters (recommended for large directories)" => "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)",
-"Limit %s access to users meeting these criteria:" => "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
-"users found" => "nalezení uživatelé",
-"Saving" => "Ukládá se",
-"Back" => "Zpět",
-"Continue" => "Pokračovat",
-"Expert" => "Expertní",
-"Advanced" => "Pokročilé",
-"<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval.",
-"Connection Settings" => "Nastavení spojení",
-"Configuration Active" => "Nastavení aktivní",
-"When unchecked, this configuration will be skipped." => "Pokud není zaškrtnuto, bude toto nastavení přeskočeno.",
-"Backup (Replica) Host" => "Záložní (kopie) hostitel",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Zadejte volitelného záložního hostitele. Musí to být kopie hlavního serveru LDAP/AD.",
-"Backup (Replica) Port" => "Záložní (kopie) port",
-"Disable Main Server" => "Zakázat hlavní server",
-"Only connect to the replica server." => "Připojit jen k záložnímu serveru.",
-"Case insensitive LDAP server (Windows)" => "LDAP server nerozlišující velikost znaků (Windows)",
-"Turn off SSL certificate validation." => "Vypnout ověřování SSL certifikátu.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nedoporučuje se, určeno pouze k testovacímu použití. Pokud spojení funguje jen s touto volbou, importujte SSL certifikát vašeho LDAP serveru na server %s.",
-"Cache Time-To-Live" => "TTL vyrovnávací paměti",
-"in seconds. A change empties the cache." => "v sekundách. Změna vyprázdní vyrovnávací paměť.",
-"Directory Settings" => "Nastavení adresáře",
-"User Display Name Field" => "Pole zobrazovaného jména uživatele",
-"The LDAP attribute to use to generate the user's display name." => "LDAP atribut použitý k vytvoření zobrazovaného jména uživatele.",
-"Base User Tree" => "Základní uživatelský strom",
-"One User Base DN per line" => "Jedna uživatelská základní DN na řádku",
-"User Search Attributes" => "Atributy vyhledávání uživatelů",
-"Optional; one attribute per line" => "Volitelné, jeden atribut na řádku",
-"Group Display Name Field" => "Pole zobrazovaného jména skupiny",
-"The LDAP attribute to use to generate the groups's display name." => "LDAP atribut použitý k vytvoření zobrazovaného jména skupiny.",
-"Base Group Tree" => "Základní skupinový strom",
-"One Group Base DN per line" => "Jedna skupinová základní DN na řádku",
-"Group Search Attributes" => "Atributy vyhledávání skupin",
-"Group-Member association" => "Asociace člena skupiny",
-"Nested Groups" => "Vnořené skupiny",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Pokud zapnuto, je možno používat skupiny, které obsahují jiné skupiny. (Funguje pouze pokud atribut člena skupiny obsahuje DN.)",
-"Paging chunksize" => "Velikost bloku stránkování",
-"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.)" => "Velikost bloku použitá pro stránkování vyhledávání v LDAP, které může vracet objemné výsledky jako třeba výčet uživatelů či skupin. (Nastavení na 0 zakáže stránkovaná vyhledávání pro tyto situace.)",
-"Special Attributes" => "Speciální atributy",
-"Quota Field" => "Pole pro kvótu",
-"Quota Default" => "Výchozí kvóta",
-"in bytes" => "v bajtech",
-"Email Field" => "Pole e-mailu",
-"User Home Folder Naming Rule" => "Pravidlo pojmenování domovské složky uživatele",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
-"Internal Username" => "Interní uživatelské jméno",
-"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." => "Ve výchozím nastavení bude uživatelské jméno vytvořeno z UUID atributu. To zajistí unikátnost uživatelského jména a není potřeba provádět konverzi znaků. Interní uživatelské jméno je omezeno na znaky: [ a-zA-Z0-9_.@- ]. Ostatní znaky jsou nahrazeny jejich ASCII ekvivalentem nebo jednoduše vynechány. V případě kolize uživatelských jmen bude přidáno/navýšeno číslo. Interní uživatelské jméno je používáno k interní identifikaci uživatele. Je také výchozím názvem uživatelského domovského adresáře. Je také součástí URL pro vzdálený přístup, například všech *DAV služeb. S tímto nastavením může být výchozí chování změněno. Pro dosažení podobného chování jako před ownCloudem 5 uveďte atribut zobrazovaného jména do pole níže. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele z LDAP.",
-"Internal Username Attribute:" => "Atribut interního uživatelského jména:",
-"Override UUID detection" => "Nastavit ručně UUID atribut",
-"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." => "Ve výchozím nastavení je UUID atribut nalezen automaticky. UUID atribut je používán pro nezpochybnitelnou identifikaci uživatelů a skupin z LDAP. Navíc je na základě UUID tvořeno také interní uživatelské jméno, pokud není nastaveno jinak. Můžete výchozí nastavení přepsat a použít atribut, který sami zvolíte. Musíte se ale ujistit, že atribut, který vyberete, bude uveden jak u uživatelů, tak i u skupin a je unikátní. Ponechte prázdné pro výchozí chování. Změna bude mít vliv jen na nově namapované (přidané) uživatele a skupiny z LDAP.",
-"UUID Attribute for Users:" => "UUID atribut pro uživatele:",
-"UUID Attribute for Groups:" => "UUID atribut pro skupiny:",
-"Username-LDAP User Mapping" => "Mapování uživatelských jmen z LDAPu",
-"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." => "Uživatelská jména jsou používány pro uchovávání a přiřazování (meta)dat. Pro správnou identifikaci a rozpoznání uživatelů bude mít každý uživatel z LDAP interní uživatelské jméno. To vyžaduje mapování uživatelských jmen na uživatele LDAP. Vytvořené uživatelské jméno je mapováno na UUID uživatele v LDAP. Navíc je cachována DN pro zmenšení interakce s LDAP, ale není používána pro identifikaci. Pokud se DN změní, bude to správně rozpoznáno. Interní uživatelské jméno se používá celé. Vyčištění mapování zanechá zbytky všude. Vyčištění navíc není specifické konfiguraci, bude mít vliv na všechny LDAP konfigurace! Nikdy nečistěte mapování v produkčním prostředí, jen v testovací nebo experimentální fázi.",
-"Clear Username-LDAP User Mapping" => "Zrušit mapování uživatelských jmen LDAPu",
-"Clear Groupname-LDAP Group Mapping" => "Zrušit mapování názvů skupin LDAPu"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/cy_GB.js b/apps/user_ldap/l10n/cy_GB.js
new file mode 100644
index 00000000000..c07f70bb0ba
--- /dev/null
+++ b/apps/user_ldap/l10n/cy_GB.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Methwyd dileu",
+    "Error" : "Gwall",
+    "_%s group found_::_%s groups found_" : ["","","",""],
+    "_%s user found_::_%s users found_" : ["","","",""],
+    "Save" : "Cadw",
+    "Help" : "Cymorth",
+    "Password" : "Cyfrinair",
+    "Advanced" : "Uwch"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/apps/user_ldap/l10n/cy_GB.json b/apps/user_ldap/l10n/cy_GB.json
new file mode 100644
index 00000000000..aa651af882f
--- /dev/null
+++ b/apps/user_ldap/l10n/cy_GB.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Deletion failed" : "Methwyd dileu",
+    "Error" : "Gwall",
+    "_%s group found_::_%s groups found_" : ["","","",""],
+    "_%s user found_::_%s users found_" : ["","","",""],
+    "Save" : "Cadw",
+    "Help" : "Cymorth",
+    "Password" : "Cyfrinair",
+    "Advanced" : "Uwch"
+},"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_ldap/l10n/cy_GB.php b/apps/user_ldap/l10n/cy_GB.php
deleted file mode 100644
index 905c0401b3f..00000000000
--- a/apps/user_ldap/l10n/cy_GB.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Methwyd dileu",
-"Error" => "Gwall",
-"_%s group found_::_%s groups found_" => array("","","",""),
-"_%s user found_::_%s users found_" => array("","","",""),
-"Save" => "Cadw",
-"Help" => "Cymorth",
-"Password" => "Cyfrinair",
-"Advanced" => "Uwch"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
new file mode 100644
index 00000000000..53af1a4fc2b
--- /dev/null
+++ b/apps/user_ldap/l10n/da.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Mislykkedes med at rydde afbildningerne.",
+    "Failed to delete the server configuration" : "Kunne ikke slette server konfigurationen",
+    "The configuration is valid and the connection could be established!" : "Konfigurationen er korrekt og forbindelsen kunne etableres!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurationen er gyldig, men Bind'en mislykkedes. Tjek venligst serverindstillingerne og akkreditiverne.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurationen er ugyldig. Se venligst i loggen for yderligere detaljer.",
+    "No action specified" : "Der er ikke angivet en handling",
+    "No configuration specified" : "Der er ikke angivet en konfiguration",
+    "No data specified" : "Der er ikke angivet data",
+    " Could not set configuration %s" : "Kunne ikke indstille konfigurationen %s",
+    "Deletion failed" : "Fejl ved sletning",
+    "Take over settings from recent server configuration?" : "Overtag indstillinger fra nylig server konfiguration? ",
+    "Keep settings?" : "Behold indstillinger?",
+    "{nthServer}. Server" : "{nthServer}. server",
+    "Cannot add server configuration" : "Kan ikke tilføje serverkonfiguration",
+    "mappings cleared" : "afbildninger blev ryddet",
+    "Success" : "Succes",
+    "Error" : "Fejl",
+    "Please specify a Base DN" : "Angiv venligst en Base DN",
+    "Could not determine Base DN" : "Kunne ikke fastslå Base DN",
+    "Please specify the port" : "Angiv venligst porten",
+    "Configuration OK" : "Konfigurationen er OK",
+    "Configuration incorrect" : "Konfigurationen er ikke korrekt",
+    "Configuration incomplete" : "Konfigurationen er ikke komplet",
+    "Select groups" : "Vælg grupper",
+    "Select object classes" : "Vælg objektklasser",
+    "Select attributes" : "Vælg attributter",
+    "Connection test succeeded" : "Forbindelsestest lykkedes",
+    "Connection test failed" : "Forbindelsestest mislykkedes",
+    "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",
+    "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
+    "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
+    "Could not find the desired feature" : "Fandt ikke den ønskede funktion",
+    "Invalid Host" : "Ugyldig vært",
+    "Server" : "Server",
+    "User Filter" : "Brugerfilter",
+    "Login Filter" : "Login-filter",
+    "Group Filter" : "Gruppe Filter",
+    "Save" : "Gem",
+    "Test Configuration" : "Test Konfiguration",
+    "Help" : "Hjælp",
+    "Groups meeting these criteria are available in %s:" : "Grupper som modsvarer disse kriterier er tilgængelige i %s:",
+    "only those object classes:" : "kun disse objektklasser:",
+    "only from those groups:" : "kun fra disse grupper:",
+    "Edit raw filter instead" : "Redigér det rå filter i stedet",
+    "Raw LDAP filter" : "Råt LDAP-filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
+    "Test Filter" : "Testfilter",
+    "groups found" : "grupper blev fundet",
+    "Users login with this attribute:" : "Brugeres login med dette attribut:",
+    "LDAP Username:" : "LDAP-brugernavn:",
+    "LDAP Email Address:" : "LDAP-e-mailadresse:",
+    "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\"",
+    "1. Server" : "1. server",
+    "%s. Server:" : "%s. server:",
+    "Add Server Configuration" : "Tilføj Server Konfiguration",
+    "Delete Configuration" : "Slet konfiguration",
+    "Host" : "Host",
+    "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://",
+    "Port" : "Port",
+    "User DN" : "Bruger 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." : "DN'et for klientbrugeren, for hvilken bindingen skal foretages, eks. uid=agent,dc=eksempel,dc=com. For anonym adgang lades DN og Password stå tomme.",
+    "Password" : "Kodeord",
+    "For anonymous access, leave DN and Password empty." : "For anonym adgang, skal du lade DN og Adgangskode tomme.",
+    "One Base DN per line" : "Ét Base DN per linje",
+    "You can specify Base DN for users and groups in the Advanced tab" : "You can specify Base DN for users and groups in the Advanced tab",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
+    "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
+    "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.",
+    "users found" : "brugere blev fundet",
+    "Saving" : "Gemmer",
+    "Back" : "Tilbage",
+    "Continue" : "Videre",
+    "Expert" : "Ekspert",
+    "Advanced" : "Avanceret",
+    "<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>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Advarsel:</b> PHP-modulet LDAP er ikke installeret - backend'en vil ikke fungere. Anmod venligst din systemadministrator om at installere det.",
+    "Connection Settings" : "Forbindelsesindstillinger ",
+    "Configuration Active" : "Konfiguration Aktiv",
+    "When unchecked, this configuration will be skipped." : "Hvis der ikke er markeret, så springes denne konfiguration over.",
+    "Backup (Replica) Host" : "Vært for sikkerhedskopier (replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Angiv valgfrit en vært for sikkerhedskopiering. Dette skal være en replikering af den primære LDAP/AD-server.",
+    "Backup (Replica) Port" : "Port for sikkerhedskopi (replika)",
+    "Disable Main Server" : "Deaktiver Hovedserver",
+    "Only connect to the replica server." : "Forbind kun til replika serveren.",
+    "Case insensitive LDAP server (Windows)" : "LDAP-server som ikke er versalfølsom (Windows)",
+    "Turn off SSL certificate validation." : "Deaktiver SSL certifikat validering",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Anbefales ikke - bruges kun til testformål! Hvis forbindelse udelukkende fungerer med dette tilvalg, så importér LDAP-serverens SSL-certifikat i din %s-server.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "i sekunder. En ændring vil tømme cachen.",
+    "Directory Settings" : "Mappeindstillinger",
+    "User Display Name Field" : "User Display Name Field",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP-attributten som skal bruges til at oprette brugerens viste navn.",
+    "Base User Tree" : "Base Bruger Træ",
+    "One User Base DN per line" : "Én bruger-Base DN per linje",
+    "User Search Attributes" : "Attributter for brugersøgning",
+    "Optional; one attribute per line" : "Valgfrit; én attribut per linje",
+    "Group Display Name Field" : "Navnefelt for gruppevisning",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP-attributten som skal bruges til at oprette gruppens viste navn.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "Ét gruppe-Base DN per linje",
+    "Group Search Attributes" : "Attributter for gruppesøgning",
+    "Group-Member association" : "Group-Member association",
+    "Nested Groups" : "Indlejrede grupper",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Når slået til, så vil grupper som rummer grupper blive understøttet. (Dette fungerer kun, hvis attributten for gruppemedlem indeholder DN'er.)",
+    "Paging chunksize" : "Fragmentstørrelse for sideinddeling",
+    "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.)" : "Fragmentstørrelse som bruges til sideinddelte LDAP-søgninger, der kan returnere omfattende resultater såsom bruger eller gruppe-optælling. (Angivelse til 0 vil slå sideinddelte LDAP-søgninger fra for disse situationer.)",
+    "Special Attributes" : "Specielle attributter",
+    "Quota Field" : "Kvote Felt",
+    "Quota Default" : "Standard for kvota",
+    "in bytes" : "i bytes",
+    "Email Field" : "Felt for e-mail",
+    "User Home Folder Naming Rule" : "Navneregel for brugerens hjemmemappe",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lad stå tom for brugernavn (standard). Alternativt, angiv en LDAP/AD-attribut.",
+    "Internal Username" : "Internt Brugernavn",
+    "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." : "Som udgangspunkt oprettes det interne brugernavn fra UUID-attributten. Den sørger for at brugernavnet er unikt, og at der ikke kræves konvertering af tegnene. Det interne brugernavn er begrænset således, at det kun er følgende tegn som tillades: [a-zA-Z0-9_.@-] . Andre tegn erstattes med deres tilsvarende ASCII-kode eller bliver simpelthen udeladt. Ved kollisioner tilføjes/forøges et tal. Det interne brugernavn bruges til at identificere en bruger internt. Det er også standardnavnet for brugerens hjemmemappe. Det er desuden en del af fjern-URL'er, for eksempel for alle *DAV-tjenester. Med denne indstilling, så kan standardadfærden tilsidesættes. For at opnå en adfærd som ligner dén fra før ownCloud 5, så angives attributten for vist brugernavn i det følgende feed. Lad den stå tom for standardadfærd. Ændringer vil kune påvirke nyligt kortlagte (tilføjede) LDAP-brugere.",
+    "Internal Username Attribute:" : "Internt attribut for brugernavn:",
+    "Override UUID detection" : "Tilsidesæt UUID-detektering",
+    "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." : "Som udgangspunkt registreres UUID-attributten automatisk. UUID-attributten bruges til entydig identificering af LDAP-brugere og -grupper. I tillæg vil det interne brugernavn blive oprettes på basis af UUID'et, hvis andet ikke angives ovenfor. Du kan tilsidesætte indstillingen og angive en attribut efter eget valg. Du skal sørge for at dén attribut du selv vælger, kan hentes for både brugere og grupper, samt at den er unik. Lad stå tom for standardadfærd. Ændringer vil kun påvirke nyilgt kortlagte (tilføjede) LDAP-brugere  og -grupper.",
+    "UUID Attribute for Users:" : "UUID-attribut for brugere:",
+    "UUID Attribute for Groups:" : "UUID-attribut for grupper:",
+    "Username-LDAP User Mapping" : "Kortlægning mellem brugernavn og LDAP-bruger",
+    "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." : "Brugernavne bruges til at lagre og tildele (meta)data. For at kunne identificere og genkende brugere præcist, så vil hver LDAP-bruger have et internt brugernavn. Det oprettede brugernavn kortlægges til UUID'et for LDAP-brugeren. I tillæg mellemlagres DN'et for at mindske LDAP-interaktioner, men det benyttes ikke til identifikation. Hvis DN'et ændres, så vil ændringerne blive registreret. Det interne brugernavn anvendes overalt. Hvis kortlægningerne ryddes, så vil der være rester overalt. Rydning af kortlægningerne er ikke konfigurationssensitivt - det påvirker alle LDAP-konfigurationer! Ryd aldrig kortlægningerne i et produktionsmiljø, kun i et teststadie eller eksperimentelt stadie.",
+    "Clear Username-LDAP User Mapping" : "Ryd kortlægning mellem brugernavn og LDAP-bruger",
+    "Clear Groupname-LDAP Group Mapping" : "Ryd kortlægning mellem gruppenavn og LDAP-gruppe"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
new file mode 100644
index 00000000000..c4076aa148c
--- /dev/null
+++ b/apps/user_ldap/l10n/da.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Mislykkedes med at rydde afbildningerne.",
+    "Failed to delete the server configuration" : "Kunne ikke slette server konfigurationen",
+    "The configuration is valid and the connection could be established!" : "Konfigurationen er korrekt og forbindelsen kunne etableres!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurationen er gyldig, men Bind'en mislykkedes. Tjek venligst serverindstillingerne og akkreditiverne.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurationen er ugyldig. Se venligst i loggen for yderligere detaljer.",
+    "No action specified" : "Der er ikke angivet en handling",
+    "No configuration specified" : "Der er ikke angivet en konfiguration",
+    "No data specified" : "Der er ikke angivet data",
+    " Could not set configuration %s" : "Kunne ikke indstille konfigurationen %s",
+    "Deletion failed" : "Fejl ved sletning",
+    "Take over settings from recent server configuration?" : "Overtag indstillinger fra nylig server konfiguration? ",
+    "Keep settings?" : "Behold indstillinger?",
+    "{nthServer}. Server" : "{nthServer}. server",
+    "Cannot add server configuration" : "Kan ikke tilføje serverkonfiguration",
+    "mappings cleared" : "afbildninger blev ryddet",
+    "Success" : "Succes",
+    "Error" : "Fejl",
+    "Please specify a Base DN" : "Angiv venligst en Base DN",
+    "Could not determine Base DN" : "Kunne ikke fastslå Base DN",
+    "Please specify the port" : "Angiv venligst porten",
+    "Configuration OK" : "Konfigurationen er OK",
+    "Configuration incorrect" : "Konfigurationen er ikke korrekt",
+    "Configuration incomplete" : "Konfigurationen er ikke komplet",
+    "Select groups" : "Vælg grupper",
+    "Select object classes" : "Vælg objektklasser",
+    "Select attributes" : "Vælg attributter",
+    "Connection test succeeded" : "Forbindelsestest lykkedes",
+    "Connection test failed" : "Forbindelsestest mislykkedes",
+    "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",
+    "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
+    "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
+    "Could not find the desired feature" : "Fandt ikke den ønskede funktion",
+    "Invalid Host" : "Ugyldig vært",
+    "Server" : "Server",
+    "User Filter" : "Brugerfilter",
+    "Login Filter" : "Login-filter",
+    "Group Filter" : "Gruppe Filter",
+    "Save" : "Gem",
+    "Test Configuration" : "Test Konfiguration",
+    "Help" : "Hjælp",
+    "Groups meeting these criteria are available in %s:" : "Grupper som modsvarer disse kriterier er tilgængelige i %s:",
+    "only those object classes:" : "kun disse objektklasser:",
+    "only from those groups:" : "kun fra disse grupper:",
+    "Edit raw filter instead" : "Redigér det rå filter i stedet",
+    "Raw LDAP filter" : "Råt LDAP-filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
+    "Test Filter" : "Testfilter",
+    "groups found" : "grupper blev fundet",
+    "Users login with this attribute:" : "Brugeres login med dette attribut:",
+    "LDAP Username:" : "LDAP-brugernavn:",
+    "LDAP Email Address:" : "LDAP-e-mailadresse:",
+    "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\"",
+    "1. Server" : "1. server",
+    "%s. Server:" : "%s. server:",
+    "Add Server Configuration" : "Tilføj Server Konfiguration",
+    "Delete Configuration" : "Slet konfiguration",
+    "Host" : "Host",
+    "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://",
+    "Port" : "Port",
+    "User DN" : "Bruger 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." : "DN'et for klientbrugeren, for hvilken bindingen skal foretages, eks. uid=agent,dc=eksempel,dc=com. For anonym adgang lades DN og Password stå tomme.",
+    "Password" : "Kodeord",
+    "For anonymous access, leave DN and Password empty." : "For anonym adgang, skal du lade DN og Adgangskode tomme.",
+    "One Base DN per line" : "Ét Base DN per linje",
+    "You can specify Base DN for users and groups in the Advanced tab" : "You can specify Base DN for users and groups in the Advanced tab",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
+    "Limit %s access to users meeting these criteria:" : "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
+    "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.",
+    "users found" : "brugere blev fundet",
+    "Saving" : "Gemmer",
+    "Back" : "Tilbage",
+    "Continue" : "Videre",
+    "Expert" : "Ekspert",
+    "Advanced" : "Avanceret",
+    "<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>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Advarsel:</b> PHP-modulet LDAP er ikke installeret - backend'en vil ikke fungere. Anmod venligst din systemadministrator om at installere det.",
+    "Connection Settings" : "Forbindelsesindstillinger ",
+    "Configuration Active" : "Konfiguration Aktiv",
+    "When unchecked, this configuration will be skipped." : "Hvis der ikke er markeret, så springes denne konfiguration over.",
+    "Backup (Replica) Host" : "Vært for sikkerhedskopier (replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Angiv valgfrit en vært for sikkerhedskopiering. Dette skal være en replikering af den primære LDAP/AD-server.",
+    "Backup (Replica) Port" : "Port for sikkerhedskopi (replika)",
+    "Disable Main Server" : "Deaktiver Hovedserver",
+    "Only connect to the replica server." : "Forbind kun til replika serveren.",
+    "Case insensitive LDAP server (Windows)" : "LDAP-server som ikke er versalfølsom (Windows)",
+    "Turn off SSL certificate validation." : "Deaktiver SSL certifikat validering",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Anbefales ikke - bruges kun til testformål! Hvis forbindelse udelukkende fungerer med dette tilvalg, så importér LDAP-serverens SSL-certifikat i din %s-server.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "i sekunder. En ændring vil tømme cachen.",
+    "Directory Settings" : "Mappeindstillinger",
+    "User Display Name Field" : "User Display Name Field",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP-attributten som skal bruges til at oprette brugerens viste navn.",
+    "Base User Tree" : "Base Bruger Træ",
+    "One User Base DN per line" : "Én bruger-Base DN per linje",
+    "User Search Attributes" : "Attributter for brugersøgning",
+    "Optional; one attribute per line" : "Valgfrit; én attribut per linje",
+    "Group Display Name Field" : "Navnefelt for gruppevisning",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP-attributten som skal bruges til at oprette gruppens viste navn.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "Ét gruppe-Base DN per linje",
+    "Group Search Attributes" : "Attributter for gruppesøgning",
+    "Group-Member association" : "Group-Member association",
+    "Nested Groups" : "Indlejrede grupper",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Når slået til, så vil grupper som rummer grupper blive understøttet. (Dette fungerer kun, hvis attributten for gruppemedlem indeholder DN'er.)",
+    "Paging chunksize" : "Fragmentstørrelse for sideinddeling",
+    "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.)" : "Fragmentstørrelse som bruges til sideinddelte LDAP-søgninger, der kan returnere omfattende resultater såsom bruger eller gruppe-optælling. (Angivelse til 0 vil slå sideinddelte LDAP-søgninger fra for disse situationer.)",
+    "Special Attributes" : "Specielle attributter",
+    "Quota Field" : "Kvote Felt",
+    "Quota Default" : "Standard for kvota",
+    "in bytes" : "i bytes",
+    "Email Field" : "Felt for e-mail",
+    "User Home Folder Naming Rule" : "Navneregel for brugerens hjemmemappe",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lad stå tom for brugernavn (standard). Alternativt, angiv en LDAP/AD-attribut.",
+    "Internal Username" : "Internt Brugernavn",
+    "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." : "Som udgangspunkt oprettes det interne brugernavn fra UUID-attributten. Den sørger for at brugernavnet er unikt, og at der ikke kræves konvertering af tegnene. Det interne brugernavn er begrænset således, at det kun er følgende tegn som tillades: [a-zA-Z0-9_.@-] . Andre tegn erstattes med deres tilsvarende ASCII-kode eller bliver simpelthen udeladt. Ved kollisioner tilføjes/forøges et tal. Det interne brugernavn bruges til at identificere en bruger internt. Det er også standardnavnet for brugerens hjemmemappe. Det er desuden en del af fjern-URL'er, for eksempel for alle *DAV-tjenester. Med denne indstilling, så kan standardadfærden tilsidesættes. For at opnå en adfærd som ligner dén fra før ownCloud 5, så angives attributten for vist brugernavn i det følgende feed. Lad den stå tom for standardadfærd. Ændringer vil kune påvirke nyligt kortlagte (tilføjede) LDAP-brugere.",
+    "Internal Username Attribute:" : "Internt attribut for brugernavn:",
+    "Override UUID detection" : "Tilsidesæt UUID-detektering",
+    "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." : "Som udgangspunkt registreres UUID-attributten automatisk. UUID-attributten bruges til entydig identificering af LDAP-brugere og -grupper. I tillæg vil det interne brugernavn blive oprettes på basis af UUID'et, hvis andet ikke angives ovenfor. Du kan tilsidesætte indstillingen og angive en attribut efter eget valg. Du skal sørge for at dén attribut du selv vælger, kan hentes for både brugere og grupper, samt at den er unik. Lad stå tom for standardadfærd. Ændringer vil kun påvirke nyilgt kortlagte (tilføjede) LDAP-brugere  og -grupper.",
+    "UUID Attribute for Users:" : "UUID-attribut for brugere:",
+    "UUID Attribute for Groups:" : "UUID-attribut for grupper:",
+    "Username-LDAP User Mapping" : "Kortlægning mellem brugernavn og LDAP-bruger",
+    "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." : "Brugernavne bruges til at lagre og tildele (meta)data. For at kunne identificere og genkende brugere præcist, så vil hver LDAP-bruger have et internt brugernavn. Det oprettede brugernavn kortlægges til UUID'et for LDAP-brugeren. I tillæg mellemlagres DN'et for at mindske LDAP-interaktioner, men det benyttes ikke til identifikation. Hvis DN'et ændres, så vil ændringerne blive registreret. Det interne brugernavn anvendes overalt. Hvis kortlægningerne ryddes, så vil der være rester overalt. Rydning af kortlægningerne er ikke konfigurationssensitivt - det påvirker alle LDAP-konfigurationer! Ryd aldrig kortlægningerne i et produktionsmiljø, kun i et teststadie eller eksperimentelt stadie.",
+    "Clear Username-LDAP User Mapping" : "Ryd kortlægning mellem brugernavn og LDAP-bruger",
+    "Clear Groupname-LDAP Group Mapping" : "Ryd kortlægning mellem gruppenavn og LDAP-gruppe"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/da.php b/apps/user_ldap/l10n/da.php
deleted file mode 100644
index d76395ab3ba..00000000000
--- a/apps/user_ldap/l10n/da.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Mislykkedes med at rydde afbildningerne.",
-"Failed to delete the server configuration" => "Kunne ikke slette server konfigurationen",
-"The configuration is valid and the connection could be established!" => "Konfigurationen er korrekt og forbindelsen kunne etableres!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurationen er gyldig, men Bind'en mislykkedes. Tjek venligst serverindstillingerne og akkreditiverne.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Konfigurationen er ugyldig. Se venligst i loggen for yderligere detaljer.",
-"No action specified" => "Der er ikke angivet en handling",
-"No configuration specified" => "Der er ikke angivet en konfiguration",
-"No data specified" => "Der er ikke angivet data",
-" Could not set configuration %s" => "Kunne ikke indstille konfigurationen %s",
-"Deletion failed" => "Fejl ved sletning",
-"Take over settings from recent server configuration?" => "Overtag indstillinger fra nylig server konfiguration? ",
-"Keep settings?" => "Behold indstillinger?",
-"{nthServer}. Server" => "{nthServer}. server",
-"Cannot add server configuration" => "Kan ikke tilføje serverkonfiguration",
-"mappings cleared" => "afbildninger blev ryddet",
-"Success" => "Succes",
-"Error" => "Fejl",
-"Please specify a Base DN" => "Angiv venligst en Base DN",
-"Could not determine Base DN" => "Kunne ikke fastslå Base DN",
-"Please specify the port" => "Angiv venligst porten",
-"Configuration OK" => "Konfigurationen er OK",
-"Configuration incorrect" => "Konfigurationen er ikke korrekt",
-"Configuration incomplete" => "Konfigurationen er ikke komplet",
-"Select groups" => "Vælg grupper",
-"Select object classes" => "Vælg objektklasser",
-"Select attributes" => "Vælg attributter",
-"Connection test succeeded" => "Forbindelsestest lykkedes",
-"Connection test failed" => "Forbindelsestest mislykkedes",
-"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",
-"_%s group found_::_%s groups found_" => array("Der blev fundet %s gruppe","Der blev fundet %s grupper"),
-"_%s user found_::_%s users found_" => array("Der blev fundet %s bruger","Der blev fundet %s brugere"),
-"Could not find the desired feature" => "Fandt ikke den ønskede funktion",
-"Invalid Host" => "Ugyldig vært",
-"Server" => "Server",
-"User Filter" => "Brugerfilter",
-"Login Filter" => "Login-filter",
-"Group Filter" => "Gruppe Filter",
-"Save" => "Gem",
-"Test Configuration" => "Test Konfiguration",
-"Help" => "Hjælp",
-"Groups meeting these criteria are available in %s:" => "Grupper som modsvarer disse kriterier er tilgængelige i %s:",
-"only those object classes:" => "kun disse objektklasser:",
-"only from those groups:" => "kun fra disse grupper:",
-"Edit raw filter instead" => "Redigér det rå filter i stedet",
-"Raw LDAP filter" => "Råt LDAP-filter",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Filteret angiver hvilke LDAP-grupper, der skal have adgang til instansen %s.",
-"Test Filter" => "Testfilter",
-"groups found" => "grupper blev fundet",
-"Users login with this attribute:" => "Brugeres login med dette attribut:",
-"LDAP Username:" => "LDAP-brugernavn:",
-"LDAP Email Address:" => "LDAP-e-mailadresse:",
-"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\"",
-"1. Server" => "1. server",
-"%s. Server:" => "%s. server:",
-"Add Server Configuration" => "Tilføj Server Konfiguration",
-"Delete Configuration" => "Slet konfiguration",
-"Host" => "Host",
-"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://",
-"Port" => "Port",
-"User DN" => "Bruger 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." => "DN'et for klientbrugeren, for hvilken bindingen skal foretages, eks. uid=agent,dc=eksempel,dc=com. For anonym adgang lades DN og Password stå tomme.",
-"Password" => "Kodeord",
-"For anonymous access, leave DN and Password empty." => "For anonym adgang, skal du lade DN og Adgangskode tomme.",
-"One Base DN per line" => "Ét Base DN per linje",
-"You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Undgår automatiske LDAP-forespørgsler. Bedre på større opsætninger, men kræver en del LDAP-kendskab.",
-"Manually enter LDAP filters (recommended for large directories)" => "Angiv LDAP-filtre manuelt (anbefales til større kataloger)",
-"Limit %s access to users meeting these criteria:" => "Begræns %s-adgangen til brugere som imødekommer disse kriterier:",
-"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.",
-"users found" => "brugere blev fundet",
-"Saving" => "Gemmer",
-"Back" => "Tilbage",
-"Continue" => "Videre",
-"Expert" => "Ekspert",
-"Advanced" => "Avanceret",
-"<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>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advarsel:</b> PHP-modulet LDAP er ikke installeret - backend'en vil ikke fungere. Anmod venligst din systemadministrator om at installere det.",
-"Connection Settings" => "Forbindelsesindstillinger ",
-"Configuration Active" => "Konfiguration Aktiv",
-"When unchecked, this configuration will be skipped." => "Hvis der ikke er markeret, så springes denne konfiguration over.",
-"Backup (Replica) Host" => "Vært for sikkerhedskopier (replika)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Angiv valgfrit en vært for sikkerhedskopiering. Dette skal være en replikering af den primære LDAP/AD-server.",
-"Backup (Replica) Port" => "Port for sikkerhedskopi (replika)",
-"Disable Main Server" => "Deaktiver Hovedserver",
-"Only connect to the replica server." => "Forbind kun til replika serveren.",
-"Case insensitive LDAP server (Windows)" => "LDAP-server som ikke er versalfølsom (Windows)",
-"Turn off SSL certificate validation." => "Deaktiver SSL certifikat validering",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Anbefales ikke - bruges kun til testformål! Hvis forbindelse udelukkende fungerer med dette tilvalg, så importér LDAP-serverens SSL-certifikat i din %s-server.",
-"Cache Time-To-Live" => "Cache Time-To-Live",
-"in seconds. A change empties the cache." => "i sekunder. En ændring vil tømme cachen.",
-"Directory Settings" => "Mappeindstillinger",
-"User Display Name Field" => "User Display Name Field",
-"The LDAP attribute to use to generate the user's display name." => "LDAP-attributten som skal bruges til at oprette brugerens viste navn.",
-"Base User Tree" => "Base Bruger Træ",
-"One User Base DN per line" => "Én bruger-Base DN per linje",
-"User Search Attributes" => "Attributter for brugersøgning",
-"Optional; one attribute per line" => "Valgfrit; én attribut per linje",
-"Group Display Name Field" => "Navnefelt for gruppevisning",
-"The LDAP attribute to use to generate the groups's display name." => "LDAP-attributten som skal bruges til at oprette gruppens viste navn.",
-"Base Group Tree" => "Base Group Tree",
-"One Group Base DN per line" => "Ét gruppe-Base DN per linje",
-"Group Search Attributes" => "Attributter for gruppesøgning",
-"Group-Member association" => "Group-Member association",
-"Nested Groups" => "Indlejrede grupper",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Når slået til, så vil grupper som rummer grupper blive understøttet. (Dette fungerer kun, hvis attributten for gruppemedlem indeholder DN'er.)",
-"Paging chunksize" => "Fragmentstørrelse for sideinddeling",
-"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.)" => "Fragmentstørrelse som bruges til sideinddelte LDAP-søgninger, der kan returnere omfattende resultater såsom bruger eller gruppe-optælling. (Angivelse til 0 vil slå sideinddelte LDAP-søgninger fra for disse situationer.)",
-"Special Attributes" => "Specielle attributter",
-"Quota Field" => "Kvote Felt",
-"Quota Default" => "Standard for kvota",
-"in bytes" => "i bytes",
-"Email Field" => "Felt for e-mail",
-"User Home Folder Naming Rule" => "Navneregel for brugerens hjemmemappe",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lad stå tom for brugernavn (standard). Alternativt, angiv en LDAP/AD-attribut.",
-"Internal Username" => "Internt Brugernavn",
-"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." => "Som udgangspunkt oprettes det interne brugernavn fra UUID-attributten. Den sørger for at brugernavnet er unikt, og at der ikke kræves konvertering af tegnene. Det interne brugernavn er begrænset således, at det kun er følgende tegn som tillades: [a-zA-Z0-9_.@-] . Andre tegn erstattes med deres tilsvarende ASCII-kode eller bliver simpelthen udeladt. Ved kollisioner tilføjes/forøges et tal. Det interne brugernavn bruges til at identificere en bruger internt. Det er også standardnavnet for brugerens hjemmemappe. Det er desuden en del af fjern-URL'er, for eksempel for alle *DAV-tjenester. Med denne indstilling, så kan standardadfærden tilsidesættes. For at opnå en adfærd som ligner dén fra før ownCloud 5, så angives attributten for vist brugernavn i det følgende feed. Lad den stå tom for standardadfærd. Ændringer vil kune påvirke nyligt kortlagte (tilføjede) LDAP-brugere.",
-"Internal Username Attribute:" => "Internt attribut for brugernavn:",
-"Override UUID detection" => "Tilsidesæt UUID-detektering",
-"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." => "Som udgangspunkt registreres UUID-attributten automatisk. UUID-attributten bruges til entydig identificering af LDAP-brugere og -grupper. I tillæg vil det interne brugernavn blive oprettes på basis af UUID'et, hvis andet ikke angives ovenfor. Du kan tilsidesætte indstillingen og angive en attribut efter eget valg. Du skal sørge for at dén attribut du selv vælger, kan hentes for både brugere og grupper, samt at den er unik. Lad stå tom for standardadfærd. Ændringer vil kun påvirke nyilgt kortlagte (tilføjede) LDAP-brugere  og -grupper.",
-"UUID Attribute for Users:" => "UUID-attribut for brugere:",
-"UUID Attribute for Groups:" => "UUID-attribut for grupper:",
-"Username-LDAP User Mapping" => "Kortlægning mellem brugernavn og LDAP-bruger",
-"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." => "Brugernavne bruges til at lagre og tildele (meta)data. For at kunne identificere og genkende brugere præcist, så vil hver LDAP-bruger have et internt brugernavn. Det oprettede brugernavn kortlægges til UUID'et for LDAP-brugeren. I tillæg mellemlagres DN'et for at mindske LDAP-interaktioner, men det benyttes ikke til identifikation. Hvis DN'et ændres, så vil ændringerne blive registreret. Det interne brugernavn anvendes overalt. Hvis kortlægningerne ryddes, så vil der være rester overalt. Rydning af kortlægningerne er ikke konfigurationssensitivt - det påvirker alle LDAP-konfigurationer! Ryd aldrig kortlægningerne i et produktionsmiljø, kun i et teststadie eller eksperimentelt stadie.",
-"Clear Username-LDAP User Mapping" => "Ryd kortlægning mellem brugernavn og LDAP-bruger",
-"Clear Groupname-LDAP Group Mapping" => "Ryd kortlægning mellem gruppenavn og LDAP-gruppe"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
new file mode 100644
index 00000000000..6dc30ad80d3
--- /dev/null
+++ b/apps/user_ldap/l10n/de.js
@@ -0,0 +1,132 @@
+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üfe die Servereinstellungen und Anmeldeinformationen.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Die Konfiguration ist ungültig. Weitere Details kannst Du in den Logdateien nachlesen.",
+    "No action specified" : "Keine Aktion spezifiziert",
+    "No configuration specified" : "Keine Konfiguration spezifiziert",
+    "No data specified" : "Keine Daten spezifiziert",
+    " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
+    "Deletion failed" : "Löschen fehlgeschlagen",
+    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
+    "Keep settings?" : "Einstellungen beibehalten?",
+    "{nthServer}. Server" : "{nthServer}. - Server",
+    "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl",
+    "mappings cleared" : "Zuordnungen gelöscht",
+    "Success" : "Erfolgreich",
+    "Error" : "Fehler",
+    "Please specify a Base DN" : "Bitte ein Base-DN spezifizieren",
+    "Could not determine Base DN" : "Base-DN konnte nicht festgestellt werden",
+    "Please specify the port" : "Bitte Port spezifizieren",
+    "Configuration OK" : "Konfiguration OK",
+    "Configuration incorrect" : "Konfiguration nicht korrekt",
+    "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Select groups" : "Wähle Gruppen aus",
+    "Select object classes" : "Objekt-Klassen auswählen",
+    "Select attributes" : "Attribute auswählen",
+    "Connection test succeeded" : "Verbindungstest erfolgreich",
+    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "Do you really want to delete the current Server Configuration?" : "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
+    "Confirm Deletion" : "Löschung bestätigen",
+    "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
+    "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
+    "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
+    "Invalid Host" : "Ungültiger Host",
+    "Server" : "Server",
+    "User Filter" : "Nutzer-Filter",
+    "Login Filter" : "Anmeldefilter",
+    "Group Filter" : "Gruppen-Filter",
+    "Save" : "Speichern",
+    "Test Configuration" : "Testkonfiguration",
+    "Help" : "Hilfe",
+    "Groups meeting these criteria are available in %s:" : "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:",
+    "only those object classes:" : "Nur diese Objekt-Klassen:",
+    "only from those groups:" : "Nur von diesen Gruppen:",
+    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
+    "Raw LDAP filter" : "Original LDAP-Filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
+    "Test Filter" : "Test-Filter",
+    "groups found" : "Gruppen gefunden",
+    "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:",
+    "LDAP Username:" : "LDAP-Benutzername:",
+    "LDAP Email Address:" : "LDAP E-Mail-Adresse:",
+    "Other Attributes:" : "Andere Attribute:",
+    "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\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
+    "Delete Configuration" : "Konfiguration löschen",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne 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 anonymen Zugriff lasse DN und Passwort leer.",
+    "Password" : "Passwort",
+    "For anonymous access, leave DN and Password empty." : "Lasse die Felder DN und Passwort für 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" : "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.",
+    "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)",
+    "Limit %s access to users meeting these criteria:" : "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
+    "users found" : "Benutzer gefunden",
+    "Saving" : "Speichern",
+    "Back" : "Zurück",
+    "Continue" : "Fortsetzen",
+    "Expert" : "Experte",
+    "Advanced" : "Fortgeschritten",
+    "<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. Bitte\ndeinen 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. Bitte Deinen Systemadministrator das Modul zu installieren.",
+    "Connection Settings" : "Verbindungseinstellungen",
+    "Configuration Active" : "Konfiguration aktiv",
+    "When unchecked, this configuration will be skipped." : "Konfiguration wird übersprungen wenn deaktiviert",
+    "Backup (Replica) Host" : "Backup Host (Kopie)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Gib 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.",
+    "Case insensitive LDAP server (Windows)" : "LDAP-Server (Windows - Groß- und Kleinschreibung bleibt unbeachtet)",
+    "Turn off SSL certificate validation." : "Schalte die SSL-Zertifikatsprüfung aus.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
+    "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
+    "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",
+    "Nested Groups" : "Eingebundene Gruppen",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
+    "Paging chunksize" : "Seitenstücke (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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+    "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. Anderenfall trage 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äßig 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äßig 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:" : "Attribut für interne Benutzernamen:",
+    "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äßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
+    "UUID Attribute for Users:" : "UUID-Attribute für Benutzer:",
+    "UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:",
+    "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ösche 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.json b/apps/user_ldap/l10n/de.json
new file mode 100644
index 00000000000..4603f75f6f8
--- /dev/null
+++ b/apps/user_ldap/l10n/de.json
@@ -0,0 +1,130 @@
+{ "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üfe die Servereinstellungen und Anmeldeinformationen.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Die Konfiguration ist ungültig. Weitere Details kannst Du in den Logdateien nachlesen.",
+    "No action specified" : "Keine Aktion spezifiziert",
+    "No configuration specified" : "Keine Konfiguration spezifiziert",
+    "No data specified" : "Keine Daten spezifiziert",
+    " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
+    "Deletion failed" : "Löschen fehlgeschlagen",
+    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
+    "Keep settings?" : "Einstellungen beibehalten?",
+    "{nthServer}. Server" : "{nthServer}. - Server",
+    "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl",
+    "mappings cleared" : "Zuordnungen gelöscht",
+    "Success" : "Erfolgreich",
+    "Error" : "Fehler",
+    "Please specify a Base DN" : "Bitte ein Base-DN spezifizieren",
+    "Could not determine Base DN" : "Base-DN konnte nicht festgestellt werden",
+    "Please specify the port" : "Bitte Port spezifizieren",
+    "Configuration OK" : "Konfiguration OK",
+    "Configuration incorrect" : "Konfiguration nicht korrekt",
+    "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Select groups" : "Wähle Gruppen aus",
+    "Select object classes" : "Objekt-Klassen auswählen",
+    "Select attributes" : "Attribute auswählen",
+    "Connection test succeeded" : "Verbindungstest erfolgreich",
+    "Connection test failed" : "Verbindungstest fehlgeschlagen",
+    "Do you really want to delete the current Server Configuration?" : "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
+    "Confirm Deletion" : "Löschung bestätigen",
+    "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
+    "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
+    "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
+    "Invalid Host" : "Ungültiger Host",
+    "Server" : "Server",
+    "User Filter" : "Nutzer-Filter",
+    "Login Filter" : "Anmeldefilter",
+    "Group Filter" : "Gruppen-Filter",
+    "Save" : "Speichern",
+    "Test Configuration" : "Testkonfiguration",
+    "Help" : "Hilfe",
+    "Groups meeting these criteria are available in %s:" : "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:",
+    "only those object classes:" : "Nur diese Objekt-Klassen:",
+    "only from those groups:" : "Nur von diesen Gruppen:",
+    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
+    "Raw LDAP filter" : "Original LDAP-Filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
+    "Test Filter" : "Test-Filter",
+    "groups found" : "Gruppen gefunden",
+    "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:",
+    "LDAP Username:" : "LDAP-Benutzername:",
+    "LDAP Email Address:" : "LDAP E-Mail-Adresse:",
+    "Other Attributes:" : "Andere Attribute:",
+    "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\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
+    "Delete Configuration" : "Konfiguration löschen",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne 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 anonymen Zugriff lasse DN und Passwort leer.",
+    "Password" : "Passwort",
+    "For anonymous access, leave DN and Password empty." : "Lasse die Felder DN und Passwort für 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" : "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.",
+    "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)",
+    "Limit %s access to users meeting these criteria:" : "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
+    "users found" : "Benutzer gefunden",
+    "Saving" : "Speichern",
+    "Back" : "Zurück",
+    "Continue" : "Fortsetzen",
+    "Expert" : "Experte",
+    "Advanced" : "Fortgeschritten",
+    "<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. Bitte\ndeinen 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. Bitte Deinen Systemadministrator das Modul zu installieren.",
+    "Connection Settings" : "Verbindungseinstellungen",
+    "Configuration Active" : "Konfiguration aktiv",
+    "When unchecked, this configuration will be skipped." : "Konfiguration wird übersprungen wenn deaktiviert",
+    "Backup (Replica) Host" : "Backup Host (Kopie)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Gib 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.",
+    "Case insensitive LDAP server (Windows)" : "LDAP-Server (Windows - Groß- und Kleinschreibung bleibt unbeachtet)",
+    "Turn off SSL certificate validation." : "Schalte die SSL-Zertifikatsprüfung aus.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
+    "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
+    "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",
+    "Nested Groups" : "Eingebundene Gruppen",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
+    "Paging chunksize" : "Seitenstücke (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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+    "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. Anderenfall trage 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äßig 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äßig 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:" : "Attribut für interne Benutzernamen:",
+    "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äßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
+    "UUID Attribute for Users:" : "UUID-Attribute für Benutzer:",
+    "UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:",
+    "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ösche die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
+    "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
+    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
deleted file mode 100644
index e2915b85425..00000000000
--- a/apps/user_ldap/l10n/de.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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üfe die Servereinstellungen und Anmeldeinformationen.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Die Konfiguration ist ungültig. Weitere Details kannst Du in den Logdateien nachlesen.",
-"No action specified" => "Keine Aktion spezifiziert",
-"No configuration specified" => "Keine Konfiguration spezifiziert",
-"No data specified" => "Keine Daten spezifiziert",
-" Could not set configuration %s" => "Die Konfiguration %s konnte nicht gesetzt werden",
-"Deletion failed" => "Löschen fehlgeschlagen",
-"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
-"Keep settings?" => "Einstellungen beibehalten?",
-"{nthServer}. Server" => "{nthServer}. - Server",
-"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
-"mappings cleared" => "Zuordnungen gelöscht",
-"Success" => "Erfolgreich",
-"Error" => "Fehler",
-"Please specify a Base DN" => "Bitte ein Base-DN spezifizieren",
-"Could not determine Base DN" => "Base-DN konnte nicht festgestellt werden",
-"Please specify the port" => "Bitte Port spezifizieren",
-"Configuration OK" => "Konfiguration OK",
-"Configuration incorrect" => "Konfiguration nicht korrekt",
-"Configuration incomplete" => "Konfiguration nicht vollständig",
-"Select groups" => "Wähle Gruppen aus",
-"Select object classes" => "Objekt-Klassen auswählen",
-"Select attributes" => "Attribute auswählen",
-"Connection test succeeded" => "Verbindungstest erfolgreich",
-"Connection test failed" => "Verbindungstest fehlgeschlagen",
-"Do you really want to delete the current Server Configuration?" => "Möchtest Du die aktuelle Serverkonfiguration wirklich löschen?",
-"Confirm Deletion" => "Löschung bestätigen",
-"_%s group found_::_%s groups found_" => array("%s Gruppe gefunden","%s Gruppen gefunden"),
-"_%s user found_::_%s users found_" => array("%s Benutzer gefunden","%s Benutzer gefunden"),
-"Could not find the desired feature" => "Konnte die gewünschte Funktion nicht finden",
-"Invalid Host" => "Ungültiger Host",
-"Server" => "Server",
-"User Filter" => "Nutzer-Filter",
-"Login Filter" => "Anmeldefilter",
-"Group Filter" => "Gruppen-Filter",
-"Save" => "Speichern",
-"Test Configuration" => "Testkonfiguration",
-"Help" => "Hilfe",
-"Groups meeting these criteria are available in %s:" => "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:",
-"only those object classes:" => "Nur diese Objekt-Klassen:",
-"only from those groups:" => "Nur von diesen Gruppen:",
-"Edit raw filter instead" => "Original-Filter stattdessen bearbeiten",
-"Raw LDAP filter" => "Original LDAP-Filter",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
-"Test Filter" => "Test-Filter",
-"groups found" => "Gruppen gefunden",
-"Users login with this attribute:" => "Nutzeranmeldung mit diesem Merkmal:",
-"LDAP Username:" => "LDAP-Benutzername:",
-"LDAP Email Address:" => "LDAP E-Mail-Adresse:",
-"Other Attributes:" => "Andere Attribute:",
-"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\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Serverkonfiguration hinzufügen",
-"Delete Configuration" => "Konfiguration löschen",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kannst das Protokoll auslassen, außer wenn Du SSL benötigst. Beginne 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 anonymen Zugriff lasse DN und Passwort leer.",
-"Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Lasse die Felder DN und Passwort für 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" => "Du kannst Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.",
-"Manually enter LDAP filters (recommended for large directories)" => "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)",
-"Limit %s access to users meeting these criteria:" => "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
-"users found" => "Benutzer gefunden",
-"Saving" => "Speichern",
-"Back" => "Zurück",
-"Continue" => "Fortsetzen",
-"Expert" => "Experte",
-"Advanced" => "Fortgeschritten",
-"<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. Bitte\ndeinen 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. Bitte Deinen Systemadministrator das Modul zu installieren.",
-"Connection Settings" => "Verbindungseinstellungen",
-"Configuration Active" => "Konfiguration aktiv",
-"When unchecked, this configuration will be skipped." => "Konfiguration wird übersprungen wenn deaktiviert",
-"Backup (Replica) Host" => "Backup Host (Kopie)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Gib 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.",
-"Case insensitive LDAP server (Windows)" => "LDAP-Server (Windows - Groß- und Kleinschreibung bleibt unbeachtet)",
-"Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importiere das SSL-Zertifikat des LDAP-Servers in deinen %s Server.",
-"Cache Time-To-Live" => "Speichere Time-To-Live zwischen",
-"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",
-"Nested Groups" => "Eingebundene Gruppen",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
-"Paging chunksize" => "Seitenstücke (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.)" => "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
-"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. Anderenfall trage 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äßig 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äßig 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:" => "Attribut für interne Benutzernamen:",
-"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äßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Du musst allerdings sicherstellen, dass deine gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lasse es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
-"UUID Attribute for Users:" => "UUID-Attribute für Benutzer:",
-"UUID Attribute for Groups:" => "UUID-Attribute für Gruppen:",
-"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ösche 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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_AT.js b/apps/user_ldap/l10n/de_AT.js
new file mode 100644
index 00000000000..45cfc177414
--- /dev/null
+++ b/apps/user_ldap/l10n/de_AT.js
@@ -0,0 +1,90 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Löschen der Verbindungen gescheitert.",
+    "Failed to delete the server configuration" : "Löschen der Server-Konfiguration gescheitert",
+    "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und eine 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 Bindung schlug fehl. Bitte überprüfe die Server-Einstellungen und Login-Daten.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "DIe Konfiguration ist ungültig. Bitte wirf einen Blick auf die Logs für weitere Details.",
+    "No action specified" : "Keine Aktion angegeben",
+    "No configuration specified" : "Keine Konfiguration angegeben",
+    "No data specified" : "Keine Daten angegeben",
+    " Could not set configuration %s" : "Konfiguration %s konnte nicht gespeichert werden",
+    "Deletion failed" : "Löschen fehlgeschlagen",
+    "Take over settings from recent server configuration?" : "Server-Einstellungen von letztem Server übernehmen?",
+    "Keep settings?" : "Einstellungen behalten?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Server-Konfiguration konnte nicht hinzugefügt werden",
+    "mappings cleared" : "Verbindungen gelöscht",
+    "Success" : "Erfolg",
+    "Error" : "Fehler",
+    "Please specify a Base DN" : "Bitte einen Basis DN angeben",
+    "Could not determine Base DN" : "Basis DN konnte nicht festgelegt werden",
+    "Please specify the port" : "Bitte den Port angeben",
+    "Configuration OK" : "Konfiguration OK",
+    "Configuration incorrect" : "Konfiguration fehlerhaft",
+    "Configuration incomplete" : "Konfiguration unvollständig",
+    "Select groups" : "Gruppen wählen",
+    "Select object classes" : "Objekt-Klassen wählen",
+    "Select attributes" : "Attribute wählen",
+    "Connection test succeeded" : "Verbindungsversuch erfolgreich",
+    "Connection test failed" : "Verbindungsversuch gescheitert",
+    "Do you really want to delete the current Server Configuration?" : "Soll die momentane Server-Konfiguration wirklich gelöscht werden?",
+    "Confirm Deletion" : "Löschen bestätigen",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Could not find the desired feature" : "Funktion konnte nicht gefunden werden",
+    "Invalid Host" : "Ungültiger Host",
+    "Server" : "Server",
+    "User Filter" : "User Filter",
+    "Login Filter" : "Login Filter",
+    "Group Filter" : "Gruppen FIlter",
+    "Save" : "Speichern",
+    "Test Configuration" : "Konfiguration testen",
+    "Help" : "Hilfe",
+    "Groups meeting these criteria are available in %s:" : "Gruppen die den Kriterien entsprechen sind verfügbar unter %s:",
+    "only those object classes:" : "nur diese Objektklassen:",
+    "only from those groups:" : "nur von diesen Gruppen:",
+    "groups found" : "Gruppen gefunden",
+    "LDAP Username:" : "LDAP Benutzername:",
+    "LDAP Email Address:" : "LDAP Email-Adresse:",
+    "Other Attributes:" : "Andere Atribute:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Legt den beim Login verwendeten Filter fest. %%uid ersetzt den Benutzernamen beim Login. Beispiel: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Server-Konfiguration hinzufügen",
+    "Delete Configuration" : "Konfiguration löschen",
+    "Host" : "Host",
+    "Port" : "Port",
+    "User DN" : "User DN",
+    "Password" : "Passwort",
+    "For anonymous access, leave DN and Password empty." : "Für anonymen Zugriff DN und Passwort frei lassen.",
+    "One Base DN per line" : "Ein Basis DN per Zeile",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden",
+    "Limit %s access to users meeting these criteria:" : "Zugang auf %s für User die diese Kriterien erfüllen limitieren:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.",
+    "users found" : "User gefunden",
+    "Back" : "Zurück",
+    "Continue" : "Weiter",
+    "Expert" : "Experte",
+    "Advanced" : "Fortgeschritten",
+    "<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 Apps user_ldap und user_webdavauth sind Inkompatibel. Unerwartetes Verhalten kann auftreten. Bitte wende dich an den Systemadministrator um eine auszuschalten.",
+    "<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> Das PHP LDAP Modul ist nicht installiert, das Backend wird nicht funktionieren. Bitte wende dich an den Systemadministrator um es zu installieren.",
+    "Connection Settings" : "Verbindungseinstellungen",
+    "Configuration Active" : "Verbindung aktiv",
+    "Disable Main Server" : "Hauptserver ausschalten",
+    "in seconds. A change empties the cache." : "in Sekunden. Änderungen erneuern den Cache.",
+    "Directory Settings" : "Verzeichniseinstellungen",
+    "User Display Name Field" : "User Display Name Feld",
+    "The LDAP attribute to use to generate the user's display name." : "Das LDAP Atribut das für den Anzeigenamen des Users verwendet wird.",
+    "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile",
+    "The LDAP attribute to use to generate the groups's display name." : "Das LDAP Attribut das für den Anzeigenamen der Gruppe verwendet wird.",
+    "Nested Groups" : "Verschachtelte Gruppen",
+    "Special Attributes" : "Spezielle Attribute",
+    "in bytes" : "in Bytes",
+    "Email Field" : "Email-Feld",
+    "Internal Username" : "Interner Username",
+    "UUID Attribute for Users:" : "UUID Attribut für User:",
+    "UUID Attribute for Groups:" : "UUID Attribut für Gruppen:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/de_AT.json b/apps/user_ldap/l10n/de_AT.json
new file mode 100644
index 00000000000..84d565d9e77
--- /dev/null
+++ b/apps/user_ldap/l10n/de_AT.json
@@ -0,0 +1,88 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Löschen der Verbindungen gescheitert.",
+    "Failed to delete the server configuration" : "Löschen der Server-Konfiguration gescheitert",
+    "The configuration is valid and the connection could be established!" : "Die Konfiguration ist gültig und eine 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 Bindung schlug fehl. Bitte überprüfe die Server-Einstellungen und Login-Daten.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "DIe Konfiguration ist ungültig. Bitte wirf einen Blick auf die Logs für weitere Details.",
+    "No action specified" : "Keine Aktion angegeben",
+    "No configuration specified" : "Keine Konfiguration angegeben",
+    "No data specified" : "Keine Daten angegeben",
+    " Could not set configuration %s" : "Konfiguration %s konnte nicht gespeichert werden",
+    "Deletion failed" : "Löschen fehlgeschlagen",
+    "Take over settings from recent server configuration?" : "Server-Einstellungen von letztem Server übernehmen?",
+    "Keep settings?" : "Einstellungen behalten?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Server-Konfiguration konnte nicht hinzugefügt werden",
+    "mappings cleared" : "Verbindungen gelöscht",
+    "Success" : "Erfolg",
+    "Error" : "Fehler",
+    "Please specify a Base DN" : "Bitte einen Basis DN angeben",
+    "Could not determine Base DN" : "Basis DN konnte nicht festgelegt werden",
+    "Please specify the port" : "Bitte den Port angeben",
+    "Configuration OK" : "Konfiguration OK",
+    "Configuration incorrect" : "Konfiguration fehlerhaft",
+    "Configuration incomplete" : "Konfiguration unvollständig",
+    "Select groups" : "Gruppen wählen",
+    "Select object classes" : "Objekt-Klassen wählen",
+    "Select attributes" : "Attribute wählen",
+    "Connection test succeeded" : "Verbindungsversuch erfolgreich",
+    "Connection test failed" : "Verbindungsversuch gescheitert",
+    "Do you really want to delete the current Server Configuration?" : "Soll die momentane Server-Konfiguration wirklich gelöscht werden?",
+    "Confirm Deletion" : "Löschen bestätigen",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Could not find the desired feature" : "Funktion konnte nicht gefunden werden",
+    "Invalid Host" : "Ungültiger Host",
+    "Server" : "Server",
+    "User Filter" : "User Filter",
+    "Login Filter" : "Login Filter",
+    "Group Filter" : "Gruppen FIlter",
+    "Save" : "Speichern",
+    "Test Configuration" : "Konfiguration testen",
+    "Help" : "Hilfe",
+    "Groups meeting these criteria are available in %s:" : "Gruppen die den Kriterien entsprechen sind verfügbar unter %s:",
+    "only those object classes:" : "nur diese Objektklassen:",
+    "only from those groups:" : "nur von diesen Gruppen:",
+    "groups found" : "Gruppen gefunden",
+    "LDAP Username:" : "LDAP Benutzername:",
+    "LDAP Email Address:" : "LDAP Email-Adresse:",
+    "Other Attributes:" : "Andere Atribute:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Legt den beim Login verwendeten Filter fest. %%uid ersetzt den Benutzernamen beim Login. Beispiel: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Server-Konfiguration hinzufügen",
+    "Delete Configuration" : "Konfiguration löschen",
+    "Host" : "Host",
+    "Port" : "Port",
+    "User DN" : "User DN",
+    "Password" : "Passwort",
+    "For anonymous access, leave DN and Password empty." : "Für anonymen Zugriff DN und Passwort frei lassen.",
+    "One Base DN per line" : "Ein Basis DN per Zeile",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden",
+    "Limit %s access to users meeting these criteria:" : "Zugang auf %s für User die diese Kriterien erfüllen limitieren:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.",
+    "users found" : "User gefunden",
+    "Back" : "Zurück",
+    "Continue" : "Weiter",
+    "Expert" : "Experte",
+    "Advanced" : "Fortgeschritten",
+    "<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 Apps user_ldap und user_webdavauth sind Inkompatibel. Unerwartetes Verhalten kann auftreten. Bitte wende dich an den Systemadministrator um eine auszuschalten.",
+    "<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> Das PHP LDAP Modul ist nicht installiert, das Backend wird nicht funktionieren. Bitte wende dich an den Systemadministrator um es zu installieren.",
+    "Connection Settings" : "Verbindungseinstellungen",
+    "Configuration Active" : "Verbindung aktiv",
+    "Disable Main Server" : "Hauptserver ausschalten",
+    "in seconds. A change empties the cache." : "in Sekunden. Änderungen erneuern den Cache.",
+    "Directory Settings" : "Verzeichniseinstellungen",
+    "User Display Name Field" : "User Display Name Feld",
+    "The LDAP attribute to use to generate the user's display name." : "Das LDAP Atribut das für den Anzeigenamen des Users verwendet wird.",
+    "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile",
+    "The LDAP attribute to use to generate the groups's display name." : "Das LDAP Attribut das für den Anzeigenamen der Gruppe verwendet wird.",
+    "Nested Groups" : "Verschachtelte Gruppen",
+    "Special Attributes" : "Spezielle Attribute",
+    "in bytes" : "in Bytes",
+    "Email Field" : "Email-Feld",
+    "Internal Username" : "Interner Username",
+    "UUID Attribute for Users:" : "UUID Attribut für User:",
+    "UUID Attribute for Groups:" : "UUID Attribut für Gruppen:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/de_AT.php b/apps/user_ldap/l10n/de_AT.php
deleted file mode 100644
index 28d44c63ed1..00000000000
--- a/apps/user_ldap/l10n/de_AT.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Löschen der Verbindungen gescheitert.",
-"Failed to delete the server configuration" => "Löschen der Server-Konfiguration gescheitert",
-"The configuration is valid and the connection could be established!" => "Die Konfiguration ist gültig und eine 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 Bindung schlug fehl. Bitte überprüfe die Server-Einstellungen und Login-Daten.",
-"The configuration is invalid. Please have a look at the logs for further details." => "DIe Konfiguration ist ungültig. Bitte wirf einen Blick auf die Logs für weitere Details.",
-"No action specified" => "Keine Aktion angegeben",
-"No configuration specified" => "Keine Konfiguration angegeben",
-"No data specified" => "Keine Daten angegeben",
-" Could not set configuration %s" => "Konfiguration %s konnte nicht gespeichert werden",
-"Deletion failed" => "Löschen fehlgeschlagen",
-"Take over settings from recent server configuration?" => "Server-Einstellungen von letztem Server übernehmen?",
-"Keep settings?" => "Einstellungen behalten?",
-"{nthServer}. Server" => "{nthServer}. Server",
-"Cannot add server configuration" => "Server-Konfiguration konnte nicht hinzugefügt werden",
-"mappings cleared" => "Verbindungen gelöscht",
-"Success" => "Erfolg",
-"Error" => "Fehler",
-"Please specify a Base DN" => "Bitte einen Basis DN angeben",
-"Could not determine Base DN" => "Basis DN konnte nicht festgelegt werden",
-"Please specify the port" => "Bitte den Port angeben",
-"Configuration OK" => "Konfiguration OK",
-"Configuration incorrect" => "Konfiguration fehlerhaft",
-"Configuration incomplete" => "Konfiguration unvollständig",
-"Select groups" => "Gruppen wählen",
-"Select object classes" => "Objekt-Klassen wählen",
-"Select attributes" => "Attribute wählen",
-"Connection test succeeded" => "Verbindungsversuch erfolgreich",
-"Connection test failed" => "Verbindungsversuch gescheitert",
-"Do you really want to delete the current Server Configuration?" => "Soll die momentane Server-Konfiguration wirklich gelöscht werden?",
-"Confirm Deletion" => "Löschen bestätigen",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Could not find the desired feature" => "Funktion konnte nicht gefunden werden",
-"Invalid Host" => "Ungültiger Host",
-"Server" => "Server",
-"User Filter" => "User Filter",
-"Login Filter" => "Login Filter",
-"Group Filter" => "Gruppen FIlter",
-"Save" => "Speichern",
-"Test Configuration" => "Konfiguration testen",
-"Help" => "Hilfe",
-"Groups meeting these criteria are available in %s:" => "Gruppen die den Kriterien entsprechen sind verfügbar unter %s:",
-"only those object classes:" => "nur diese Objektklassen:",
-"only from those groups:" => "nur von diesen Gruppen:",
-"groups found" => "Gruppen gefunden",
-"LDAP Username:" => "LDAP Benutzername:",
-"LDAP Email Address:" => "LDAP Email-Adresse:",
-"Other Attributes:" => "Andere Atribute:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Legt den beim Login verwendeten Filter fest. %%uid ersetzt den Benutzernamen beim Login. Beispiel: \"uid=%%uid\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Server-Konfiguration hinzufügen",
-"Delete Configuration" => "Konfiguration löschen",
-"Host" => "Host",
-"Port" => "Port",
-"User DN" => "User DN",
-"Password" => "Passwort",
-"For anonymous access, leave DN and Password empty." => "Für anonymen Zugriff DN und Passwort frei lassen.",
-"One Base DN per line" => "Ein Basis DN per Zeile",
-"You can specify Base DN for users and groups in the Advanced tab" => "Basis DN für User und Gruppen können im Fortgeschritten-Tab festgelegt werden",
-"Limit %s access to users meeting these criteria:" => "Zugang auf %s für User die diese Kriterien erfüllen limitieren:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter spezifiziert welche LDAP User Zugang zu %s haben.",
-"users found" => "User gefunden",
-"Back" => "Zurück",
-"Continue" => "Weiter",
-"Expert" => "Experte",
-"Advanced" => "Fortgeschritten",
-"<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 Apps user_ldap und user_webdavauth sind Inkompatibel. Unerwartetes Verhalten kann auftreten. Bitte wende dich an den Systemadministrator um eine auszuschalten.",
-"<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> Das PHP LDAP Modul ist nicht installiert, das Backend wird nicht funktionieren. Bitte wende dich an den Systemadministrator um es zu installieren.",
-"Connection Settings" => "Verbindungseinstellungen",
-"Configuration Active" => "Verbindung aktiv",
-"Disable Main Server" => "Hauptserver ausschalten",
-"in seconds. A change empties the cache." => "in Sekunden. Änderungen erneuern den Cache.",
-"Directory Settings" => "Verzeichniseinstellungen",
-"User Display Name Field" => "User Display Name Feld",
-"The LDAP attribute to use to generate the user's display name." => "Das LDAP Atribut das für den Anzeigenamen des Users verwendet wird.",
-"Optional; one attribute per line" => "Optional; ein Attribut pro Zeile",
-"The LDAP attribute to use to generate the groups's display name." => "Das LDAP Attribut das für den Anzeigenamen der Gruppe verwendet wird.",
-"Nested Groups" => "Verschachtelte Gruppen",
-"Special Attributes" => "Spezielle Attribute",
-"in bytes" => "in Bytes",
-"Email Field" => "Email-Feld",
-"Internal Username" => "Interner Username",
-"UUID Attribute for Users:" => "UUID Attribut für User:",
-"UUID Attribute for Groups:" => "UUID Attribut für Gruppen:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_CH.js b/apps/user_ldap/l10n/de_CH.js
new file mode 100644
index 00000000000..a1028b1678a
--- /dev/null
+++ b/apps/user_ldap/l10n/de_CH.js
@@ -0,0 +1,82 @@
+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",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "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
new file mode 100644
index 00000000000..3560581d270
--- /dev/null
+++ b/apps/user_ldap/l10n/de_CH.json
@@ -0,0 +1,80 @@
+{ "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",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Group Filter" : "Gruppen-Filter",
+    "Save" : "Speichern",
+    "Test Configuration" : "Testkonfiguration",
+    "Help" : "Hilfe",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Bestimmt den Filter, welcher bei einer Anmeldung angewandt wird. %%uid ersetzt den Benutzernamen bei der Anmeldung. Beispiel: \"uid=%%uid\"",
+    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, ausser wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://",
+    "Port" : "Port",
+    "User DN" : "Benutzer-DN",
+    "The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." : "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für einen anonymen Zugriff lassen Sie DN und Passwort leer.",
+    "Password" : "Passwort",
+    "For anonymous access, leave DN and Password empty." : "Lassen Sie die Felder DN und Passwort für einen anonymen Zugang leer.",
+    "One Base DN per line" : "Ein Basis-DN pro Zeile",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Sie können Basis-DN für Benutzer und Gruppen in dem «Erweitert»-Reiter konfigurieren",
+    "Advanced" : "Erweitert",
+    "<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them." : "<b>Warnung:</b> Die Anwendungen user_ldap und user_webdavauth sind inkompatibel. Es kann demzufolge zu unerwarteten Verhalten kommen. Bitten Sie Ihren Systemadministator eine der beiden Anwendungen zu deaktivieren.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warnung:</b> Da das PHP-Modul für LDAP nicht installiert ist, wird das Backend nicht funktionieren. Bitten Sie Ihren Systemadministrator das Modul zu installieren.",
+    "Connection Settings" : "Verbindungseinstellungen",
+    "Configuration Active" : "Konfiguration aktiv",
+    "When unchecked, this configuration will be skipped." : "Wenn nicht angehakt, wird diese Konfiguration übersprungen.",
+    "Backup (Replica) Host" : "Backup Host (Kopie)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Geben Sie einen optionalen Backup Host an. Es muss sich um eine Kopie des Haupt LDAP/AD Servers handeln.",
+    "Backup (Replica) Port" : "Backup Port",
+    "Disable Main Server" : "Hauptserver deaktivieren",
+    "Only connect to the replica server." : "Nur zum Replikat-Server verbinden.",
+    "Turn off SSL certificate validation." : "Schalten Sie die SSL-Zertifikatsprüfung aus.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nur für Testzwecke geeignet, sollte Standardmäßig nicht verwendet werden. Falls die Verbindung nur mit dieser Option funktioniert, importieren Sie das SSL-Zertifikat des LDAP-Servers in Ihren %s Server.",
+    "Cache Time-To-Live" : "Speichere Time-To-Live zwischen",
+    "in seconds. A change empties the cache." : "in Sekunden. Eine Änderung leert den Cache.",
+    "Directory Settings" : "Ordnereinstellungen",
+    "User Display Name Field" : "Feld für den Anzeigenamen des Benutzers",
+    "The LDAP attribute to use to generate the user's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens des Benutzers.",
+    "Base User Tree" : "Basis-Benutzerbaum",
+    "One User Base DN per line" : "Ein Benutzer Basis-DN pro Zeile",
+    "User Search Attributes" : "Benutzersucheigenschaften",
+    "Optional; one attribute per line" : "Optional; ein Attribut pro Zeile",
+    "Group Display Name Field" : "Feld für den Anzeigenamen der Gruppe",
+    "The LDAP attribute to use to generate the groups's display name." : "Das LDAP-Attribut zur Generierung des Anzeigenamens der Gruppen.",
+    "Base Group Tree" : "Basis-Gruppenbaum",
+    "One Group Base DN per line" : "Ein Gruppen Basis-DN pro Zeile",
+    "Group Search Attributes" : "Gruppensucheigenschaften",
+    "Group-Member association" : "Assoziation zwischen Gruppe und Benutzer",
+    "Special Attributes" : "Spezielle Eigenschaften",
+    "Quota Field" : "Kontingent-Feld",
+    "Quota Default" : "Standard-Kontingent",
+    "in bytes" : "in Bytes",
+    "Email Field" : "E-Mail-Feld",
+    "User Home Folder Naming Rule" : "Benennungsregel für das Home-Verzeichnis des Benutzers",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls tragen Sie bitte ein LDAP/AD-Attribut ein.",
+    "Internal Username" : "Interner Benutzername",
+    "By default the internal username will be created from the UUID attribute. It makes sure that the username is unique and characters do not need to be converted. The internal username has the restriction that only these characters are allowed: [ a-zA-Z0-9_.@- ].  Other characters are replaced with their ASCII correspondence or simply omitted. On collisions a number will be added/increased. The internal username is used to identify a user internally. It is also the default name for the user home folder. It is also a part of remote URLs, for instance for all *DAV services. With this setting, the default behavior can be overridden. To achieve a similar behavior as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users." : "Standardmässig wird der interne Benutzername mittels des UUID-Attributes erzeugt. Dies stellt sicher, dass der Benutzername einzigartig ist und keinerlei Zeichen konvertiert werden müssen. Der interne Benutzername unterliegt Beschränkungen, die nur die nachfolgenden Zeichen erlauben: [ a-zA-Z0-9_.@- ]. Andere Zeichen werden mittels ihrer korrespondierenden Zeichen ersetzt oder einfach ausgelassen. Bei Kollisionen wird ein Zähler hinzugefügt bzw. der Zähler um einen Wert erhöht. Der interne Benutzername wird benutzt, um einen Benutzer intern zu identifizieren. Es ist ebenso der standardmässig vorausgewählte Namen des Heimatverzeichnisses. Es ist auch ein Teil der Remote-URLs - zum Beispiel für alle *DAV-Dienste. Mit dieser Einstellung kann das Standardverhalten überschrieben werden. Um ein ähnliches Verhalten wie vor ownCloud 5 zu erzielen, fügen Sie das anzuzeigende Attribut des Benutzernamens in das nachfolgende Feld ein. Lassen Sie dies hingegen für das Standardverhalten leer. Die Änderungen werden sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer auswirken.",
+    "Internal Username Attribute:" : "Interne Eigenschaften des Benutzers:",
+    "Override UUID detection" : "UUID-Erkennung überschreiben",
+    "By default, the UUID attribute is automatically detected. The UUID attribute is used to doubtlessly identify LDAP users and groups. Also, the internal username will be created based on the UUID, if not specified otherwise above. You can override the setting and pass an attribute of your choice. You must make sure that the attribute of your choice can be fetched for both users and groups and it is unique. Leave it empty for default behavior. Changes will have effect only on newly mapped (added) LDAP users and groups." : "Standardmässig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Ausserdem wird der interne Benutzername erzeugt, der auf Eigenschaften der UUID basiert, wenn es oben nicht anders angegeben wurde. Sie müssen allerdings sicherstellen, dass Ihre gewählten Eigenschaften zur Identifikation der Benutzer und Gruppen eindeutig sind und zugeordnet werden können. Lassen Sie es frei, um es beim Standardverhalten zu belassen. Änderungen wirken sich nur auf neu gemappte (hinzugefügte) LDAP-Benutzer und -Gruppen aus.",
+    "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
+    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
+    "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
+    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/de_CH.php b/apps/user_ldap/l10n/de_CH.php
deleted file mode 100644
index c0b5c80728e..00000000000
--- a/apps/user_ldap/l10n/de_CH.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
new file mode 100644
index 00000000000..3340511770e
--- /dev/null
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -0,0 +1,132 @@
+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.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Die Konfiguration ist ungültig. Weitere Details können Sie in den Logdateien nachlesen.",
+    "No action specified" : "Keine Aktion spezifiziert",
+    "No configuration specified" : "Keine Konfiguration spezifiziert",
+    "No data specified" : "Keine Daten spezifiziert",
+    " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
+    "Deletion failed" : "Löschen fehlgeschlagen",
+    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
+    "Keep settings?" : "Einstellungen beibehalten?",
+    "{nthServer}. Server" : "{nthServer}. - Server",
+    "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl",
+    "mappings cleared" : "Zuordnungen gelöscht",
+    "Success" : "Erfolg",
+    "Error" : "Fehler",
+    "Please specify a Base DN" : "Bitte ein Base-DN spezifizieren",
+    "Could not determine Base DN" : "Base-DN konnte nicht festgestellt werden",
+    "Please specify the port" : "Bitte Port spezifizieren",
+    "Configuration OK" : "Konfiguration OK",
+    "Configuration incorrect" : "Konfiguration nicht korrekt",
+    "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Select groups" : "Wähle Gruppen",
+    "Select object classes" : "Objekt-Klassen auswählen",
+    "Select attributes" : "Attribute auswählen",
+    "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",
+    "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
+    "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
+    "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
+    "Invalid Host" : "Ungültiger Host",
+    "Server" : "Server",
+    "User Filter" : "Nutzer-Filter",
+    "Login Filter" : "Anmeldefilter",
+    "Group Filter" : "Gruppen-Filter",
+    "Save" : "Speichern",
+    "Test Configuration" : "Testkonfiguration",
+    "Help" : "Hilfe",
+    "Groups meeting these criteria are available in %s:" : "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:",
+    "only those object classes:" : "Nur diese Objekt-Klassen:",
+    "only from those groups:" : "Nur von diesen Gruppen:",
+    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
+    "Raw LDAP filter" : "Original LDAP-Filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
+    "Test Filter" : "Test-Filter",
+    "groups found" : "Gruppen gefunden",
+    "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:",
+    "LDAP Username:" : "LDAP-Benutzername:",
+    "LDAP Email Address:" : "LDAP E-Mail-Adresse:",
+    "Other Attributes:" : "Andere Attribute:",
+    "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\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
+    "Delete Configuration" : "Konfiguration löschen",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, außer 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",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.",
+    "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)",
+    "Limit %s access to users meeting these criteria:" : "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
+    "users found" : "Benutzer gefunden",
+    "Saving" : "Speichern",
+    "Back" : "Zurück",
+    "Continue" : "Fortsetzen",
+    "Expert" : "Experte",
+    "Advanced" : "Fortgeschritten",
+    "<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.",
+    "Case insensitive LDAP server (Windows)" : "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
+    "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",
+    "Nested Groups" : "Eingebundene Gruppen",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
+    "Paging chunksize" : "Seitenstücke (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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+    "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äßig 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äßig 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äßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem 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.",
+    "UUID Attribute for Users:" : "UUID-Attribute für Benutzer:",
+    "UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:",
+    "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_DE.json b/apps/user_ldap/l10n/de_DE.json
new file mode 100644
index 00000000000..94be87f17ee
--- /dev/null
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -0,0 +1,130 @@
+{ "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.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Die Konfiguration ist ungültig. Weitere Details können Sie in den Logdateien nachlesen.",
+    "No action specified" : "Keine Aktion spezifiziert",
+    "No configuration specified" : "Keine Konfiguration spezifiziert",
+    "No data specified" : "Keine Daten spezifiziert",
+    " Could not set configuration %s" : "Die Konfiguration %s konnte nicht gesetzt werden",
+    "Deletion failed" : "Löschen fehlgeschlagen",
+    "Take over settings from recent server configuration?" : "Einstellungen von letzter Konfiguration übernehmen?",
+    "Keep settings?" : "Einstellungen beibehalten?",
+    "{nthServer}. Server" : "{nthServer}. - Server",
+    "Cannot add server configuration" : "Das Hinzufügen der Serverkonfiguration schlug fehl",
+    "mappings cleared" : "Zuordnungen gelöscht",
+    "Success" : "Erfolg",
+    "Error" : "Fehler",
+    "Please specify a Base DN" : "Bitte ein Base-DN spezifizieren",
+    "Could not determine Base DN" : "Base-DN konnte nicht festgestellt werden",
+    "Please specify the port" : "Bitte Port spezifizieren",
+    "Configuration OK" : "Konfiguration OK",
+    "Configuration incorrect" : "Konfiguration nicht korrekt",
+    "Configuration incomplete" : "Konfiguration nicht vollständig",
+    "Select groups" : "Wähle Gruppen",
+    "Select object classes" : "Objekt-Klassen auswählen",
+    "Select attributes" : "Attribute auswählen",
+    "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",
+    "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
+    "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
+    "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
+    "Invalid Host" : "Ungültiger Host",
+    "Server" : "Server",
+    "User Filter" : "Nutzer-Filter",
+    "Login Filter" : "Anmeldefilter",
+    "Group Filter" : "Gruppen-Filter",
+    "Save" : "Speichern",
+    "Test Configuration" : "Testkonfiguration",
+    "Help" : "Hilfe",
+    "Groups meeting these criteria are available in %s:" : "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:",
+    "only those object classes:" : "Nur diese Objekt-Klassen:",
+    "only from those groups:" : "Nur von diesen Gruppen:",
+    "Edit raw filter instead" : "Original-Filter stattdessen bearbeiten",
+    "Raw LDAP filter" : "Original LDAP-Filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
+    "Test Filter" : "Test-Filter",
+    "groups found" : "Gruppen gefunden",
+    "Users login with this attribute:" : "Nutzeranmeldung mit diesem Merkmal:",
+    "LDAP Username:" : "LDAP-Benutzername:",
+    "LDAP Email Address:" : "LDAP E-Mail-Adresse:",
+    "Other Attributes:" : "Andere Attribute:",
+    "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\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Serverkonfiguration hinzufügen",
+    "Delete Configuration" : "Konfiguration löschen",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sie können das Protokoll auslassen, außer 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",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.",
+    "Manually enter LDAP filters (recommended for large directories)" : "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)",
+    "Limit %s access to users meeting these criteria:" : "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
+    "users found" : "Benutzer gefunden",
+    "Saving" : "Speichern",
+    "Back" : "Zurück",
+    "Continue" : "Fortsetzen",
+    "Expert" : "Experte",
+    "Advanced" : "Fortgeschritten",
+    "<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.",
+    "Case insensitive LDAP server (Windows)" : "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
+    "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",
+    "Nested Groups" : "Eingebundene Gruppen",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
+    "Paging chunksize" : "Seitenstücke (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.)" : "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
+    "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äßig 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äßig 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äßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem 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.",
+    "UUID Attribute for Users:" : "UUID-Attribute für Benutzer:",
+    "UUID Attribute for Groups:" : "UUID-Attribute für Gruppen:",
+    "Username-LDAP User Mapping" : "LDAP-Benutzernamenzuordnung",
+    "Usernames are used to store and assign (meta) data. In order to precisely identify and recognize users, each LDAP user will have a internal username. This requires a mapping from username to LDAP user. The created username is mapped to the UUID of the LDAP user. Additionally the DN is cached as well to reduce LDAP interaction, but it is not used for identification. If the DN changes, the changes will be found. The internal username is used all over. Clearing the mappings will have leftovers everywhere. Clearing the mappings is not configuration sensitive, it affects all LDAP configurations! Never clear the mappings in a production environment, only in a testing or experimental stage." : "Die Benutzernamen werden genutzt, um (Meta)Daten zuzuordnen und zu speichern. Um Benutzer eindeutig und präzise zu identifizieren, hat jeder LDAP-Benutzer einen internen Benutzernamen. Dies erfordert eine Zuordnung (mappen) von Benutzernamen zum LDAP-Benutzer. Der erstellte Benutzername wird der UUID des LDAP-Benutzernamens zugeordnet. Zusätzlich wird der DN zwischengespeichert, um die Interaktion mit dem LDAP zu minimieren, was aber nicht der Identifikation dient. Ändert sich der DN, werden die Änderungen durch gefunden. Der interne Benutzername, wird in überall verwendet. Werden die Zuordnungen gelöscht, bleiben überall Reste zurück. Die Löschung der Zuordnungen kann nicht in der Konfiguration vorgenommen werden, beeinflusst aber die LDAP-Konfiguration! Löschen Sie niemals die Zuordnungen in einer produktiven Umgebung. Löschen Sie die Zuordnungen nur in einer Test- oder Experimentierumgebung.",
+    "Clear Username-LDAP User Mapping" : "Lösche LDAP-Benutzernamenzuordnung",
+    "Clear Groupname-LDAP Group Mapping" : "Lösche LDAP-Gruppennamenzuordnung"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/de_DE.php b/apps/user_ldap/l10n/de_DE.php
deleted file mode 100644
index ed1755d54a0..00000000000
--- a/apps/user_ldap/l10n/de_DE.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Die Konfiguration ist ungültig. Weitere Details können Sie in den Logdateien nachlesen.",
-"No action specified" => "Keine Aktion spezifiziert",
-"No configuration specified" => "Keine Konfiguration spezifiziert",
-"No data specified" => "Keine Daten spezifiziert",
-" Could not set configuration %s" => "Die Konfiguration %s konnte nicht gesetzt werden",
-"Deletion failed" => "Löschen fehlgeschlagen",
-"Take over settings from recent server configuration?" => "Einstellungen von letzter Konfiguration übernehmen?",
-"Keep settings?" => "Einstellungen beibehalten?",
-"{nthServer}. Server" => "{nthServer}. - Server",
-"Cannot add server configuration" => "Das Hinzufügen der Serverkonfiguration schlug fehl",
-"mappings cleared" => "Zuordnungen gelöscht",
-"Success" => "Erfolg",
-"Error" => "Fehler",
-"Please specify a Base DN" => "Bitte ein Base-DN spezifizieren",
-"Could not determine Base DN" => "Base-DN konnte nicht festgestellt werden",
-"Please specify the port" => "Bitte Port spezifizieren",
-"Configuration OK" => "Konfiguration OK",
-"Configuration incorrect" => "Konfiguration nicht korrekt",
-"Configuration incomplete" => "Konfiguration nicht vollständig",
-"Select groups" => "Wähle Gruppen",
-"Select object classes" => "Objekt-Klassen auswählen",
-"Select attributes" => "Attribute auswählen",
-"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",
-"_%s group found_::_%s groups found_" => array("%s Gruppe gefunden","%s Gruppen gefunden"),
-"_%s user found_::_%s users found_" => array("%s Benutzer gefunden","%s Benutzer gefunden"),
-"Could not find the desired feature" => "Konnte die gewünschte Funktion nicht finden",
-"Invalid Host" => "Ungültiger Host",
-"Server" => "Server",
-"User Filter" => "Nutzer-Filter",
-"Login Filter" => "Anmeldefilter",
-"Group Filter" => "Gruppen-Filter",
-"Save" => "Speichern",
-"Test Configuration" => "Testkonfiguration",
-"Help" => "Hilfe",
-"Groups meeting these criteria are available in %s:" => "Gruppen-Versammlungen mit diesen Kriterien sind verfügbar in %s:",
-"only those object classes:" => "Nur diese Objekt-Klassen:",
-"only from those groups:" => "Nur von diesen Gruppen:",
-"Edit raw filter instead" => "Original-Filter stattdessen bearbeiten",
-"Raw LDAP filter" => "Original LDAP-Filter",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Der Filter definiert welche LDAP-Gruppen Zugriff auf die %s Instanz haben sollen.",
-"Test Filter" => "Test-Filter",
-"groups found" => "Gruppen gefunden",
-"Users login with this attribute:" => "Nutzeranmeldung mit diesem Merkmal:",
-"LDAP Username:" => "LDAP-Benutzername:",
-"LDAP Email Address:" => "LDAP E-Mail-Adresse:",
-"Other Attributes:" => "Andere Attribute:",
-"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\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Serverkonfiguration hinzufügen",
-"Delete Configuration" => "Konfiguration löschen",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sie können das Protokoll auslassen, außer 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",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Verhindert automatische LDAP-Anfragen. Besser für größere Installationen, benötigt aber einiges an LDAP-Wissen.",
-"Manually enter LDAP filters (recommended for large directories)" => "LDAP-Filter manuell eingeben (erforderlich für große Verzeichnisse)",
-"Limit %s access to users meeting these criteria:" => "Beschränken Sie den %s Zugriff auf die Benutzer-Sitzungen durch folgende Kriterien:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Der Filter definiert welche LDAP-Benutzer Zugriff auf die %s Instanz haben sollen.",
-"users found" => "Benutzer gefunden",
-"Saving" => "Speichern",
-"Back" => "Zurück",
-"Continue" => "Fortsetzen",
-"Expert" => "Experte",
-"Advanced" => "Fortgeschritten",
-"<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.",
-"Case insensitive LDAP server (Windows)" => "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)",
-"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",
-"Nested Groups" => "Eingebundene Gruppen",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Wenn aktiviert, werden Gruppen, die Gruppen enthalten, unterstützt. (Funktioniert nur, wenn das Merkmal des Gruppenmitgliedes den Domain-Namen enthält.)",
-"Paging chunksize" => "Seitenstücke (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.)" => "Die Größe der Seitenstücke (Chunksize) wird für seitenbezogene LDAP-Suchen verwendet die sehr viele Ergebnisse z.B. Nutzer- und Gruppenaufzählungen liefern. (Die Einstellung 0 deaktiviert das seitenbezogene LDAP-Suchen in diesen Situationen)",
-"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äßig 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äßig 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äßig wird die UUID-Eigenschaft automatisch erkannt. Die UUID-Eigenschaft wird genutzt, um einen LDAP-Benutzer und Gruppen einwandfrei zu identifizieren. Außerdem 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.",
-"UUID Attribute for Users:" => "UUID-Attribute für Benutzer:",
-"UUID Attribute for Groups:" => "UUID-Attribute für Gruppen:",
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js
new file mode 100644
index 00000000000..8018ea00766
--- /dev/null
+++ b/apps/user_ldap/l10n/el.js
@@ -0,0 +1,132 @@
+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." : "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Η διαμόρφωση είναι άκυρη. Παρακαλώ ελέγξτε τα αρχεία σφαλμάτων για περαιτέρω λεπτομέρειες.",
+    "No action specified" : "Καμμία εντολή δεν προσδιορίστηκε",
+    "No configuration specified" : "Καμμία διαμόρφωση δεν προσδιορίστηκε",
+    "No data specified" : "Δεν προσδιορίστηκαν δεδομένα",
+    " Could not set configuration %s" : "Αδυναμία ρύθμισης %s",
+    "Deletion failed" : "Η διαγραφή απέτυχε",
+    "Take over settings from recent server configuration?" : "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
+    "Keep settings?" : "Διατήρηση ρυθμίσεων;",
+    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
+    "Cannot add server configuration" : "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
+    "mappings cleared" : "αντιστοιχίες εκκαθαρίστηκαν",
+    "Success" : "Επιτυχία",
+    "Error" : "Σφάλμα",
+    "Please specify a Base DN" : "Παρακαλώ ορίστε ένα βασικό Διακεκριμένο Όνομα",
+    "Could not determine Base DN" : "Δεν ήταν δυνατό να καθοριστεί το βασικό Διακεκριμένο Όνομα",
+    "Please specify the port" : "Παρακαλώ ορίστε την θύρα",
+    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
+    "Configuration incorrect" : "Η διαμόρφωση είναι λανθασμένη",
+    "Configuration incomplete" : "Η διαμόρφωση είναι ελλιπής",
+    "Select groups" : "Επιλέξτε ομάδες",
+    "Select object classes" : "Επιλογή κλάσης αντικειμένων",
+    "Select attributes" : "Επιλογή χαρακτηριστικών",
+    "Connection test succeeded" : "Επιτυχημένη δοκιμαστική σύνδεση",
+    "Connection test failed" : "Αποτυχημένη δοκιμαστική σύνδεσης.",
+    "Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
+    "Confirm Deletion" : "Επιβεβαίωση Διαγραφής",
+    "_%s group found_::_%s groups found_" : ["%s ομάδα βρέθηκε","%s ομάδες βρέθηκαν"],
+    "_%s user found_::_%s users found_" : ["%s χρήστης βρέθηκε","%s χρήστες βρέθηκαν"],
+    "Could not find the desired feature" : "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού",
+    "Invalid Host" : "Άκυρος εξυπηρετητής",
+    "Server" : "Διακομιστής",
+    "User Filter" : "Φίλτρο χρηστών",
+    "Login Filter" : "Φίλτρο Εισόδου",
+    "Group Filter" : "Group Filter",
+    "Save" : "Αποθήκευση",
+    "Test Configuration" : "Δοκιμαστικες ρυθμισεις",
+    "Help" : "Βοήθεια",
+    "Groups meeting these criteria are available in %s:" : "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
+    "only those object classes:" : "μόνο αυτές οι κλάσεις αντικειμένων:",
+    "only from those groups:" : "μόνο από αυτές τις ομάδες:",
+    "Edit raw filter instead" : "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
+    "Raw LDAP filter" : "Πρωτογενές φίλτρο ",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
+    "Test Filter" : "Φίλτρο Ελέγχου",
+    "groups found" : "ομάδες βρέθηκαν",
+    "Users login with this attribute:" : "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:",
+    "LDAP Username:" : "Όνομα χρήστη LDAP:",
+    "LDAP Email Address:" : "Διεύθυνση ηλ. ταχυδρομείου LDAP:",
+    "Other Attributes:" : "Άλλες Ιδιότητες:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ορίζει το φίλτρο που θα εφαρμοστεί, όταν επιχειριθεί σύνδεση. Το %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. Παράδειγμα: \"uid=%%uid\"",
+    "1. Server" : "1. Διακομιστής",
+    "%s. Server:" : "%s. Διακομιστής:",
+    "Add Server Configuration" : "Προσθήκη Ρυθμίσεων Διακομιστή",
+    "Delete Configuration" : "Απαλοιφή ρυθμίσεων",
+    "Host" : "Διακομιστής",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
+    "Port" : "Θύρα",
+    "User DN" : "User 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." : "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.",
+    "Password" : "Συνθηματικό",
+    "For anonymous access, leave DN and Password empty." : "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
+    "One Base DN per line" : "Ένα DN Βάσης ανά γραμμή ",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Αποφυγή αυτόματων αιτημάτων LDAP. Προτιμότερο για μεγαλύτερες εγκαταστάσεις, αλλά απαιτεί κάποιες γνώσεις  LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
+    "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
+    "users found" : "χρήστες βρέθηκαν",
+    "Saving" : "Αποθήκευση",
+    "Back" : "Επιστροφή",
+    "Continue" : "Συνέχεια",
+    "Expert" : "Ειδικός",
+    "Advanced" : "Για προχωρημένους",
+    "<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>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Προσοχή:</b> Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει.",
+    "Connection Settings" : "Ρυθμίσεις Σύνδεσης",
+    "Configuration Active" : "Ενεργοποιηση ρυθμισεων",
+    "When unchecked, this configuration will be skipped." : "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. ",
+    "Backup (Replica) Host" : "Δημιουργία αντιγράφων ασφαλείας (Replica) Host ",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη.",
+    "Backup (Replica) Port" : "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
+    "Disable Main Server" : "Απενεργοποιηση του κεντρικου διακομιστη",
+    "Only connect to the replica server." : "Σύνδεση μόνο με το διακομιστή-αντίγραφο.",
+    "Case insensitive LDAP server (Windows)" : "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)",
+    "Turn off SSL certificate validation." : "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
+    "Directory Settings" : "Ρυθμίσεις Καταλόγου",
+    "User Display Name Field" : "Πεδίο Ονόματος Χρήστη",
+    "The LDAP attribute to use to generate the user's display name." : "Η ιδιότητα LDAP προς χρήση για δημιουργία του προβαλλόμενου ονόματος χρήστη.",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "Ένα DN βάσης χρηστών ανά γραμμή",
+    "User Search Attributes" : "Χαρακτηριστικά αναζήτησης των χρηστών ",
+    "Optional; one attribute per line" : "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή ",
+    "Group Display Name Field" : "Group Display Name Field",
+    "The LDAP attribute to use to generate the groups's display name." : "Η ιδιότητα LDAP προς χρήση για δημιουργία του προβαλλόμενου ονόματος ομάδας.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "Μια ομαδικη Βάση DN ανά γραμμή",
+    "Group Search Attributes" : "Ομάδα Χαρακτηριστικων Αναζήτηση",
+    "Group-Member association" : "Group-Member association",
+    "Nested Groups" : "Φωλιασμένες ομάδες",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Όταν ενεργοποιηθεί, οι ομάδες που περιέχουν ομάδες υποστηρίζονται. (Λειτουργεί μόνο αν το χαρακτηριστικό μέλους ομάδες περιέχει Διακεκριμένα Ονόματα.)",
+    "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.)" : "Μέγεθος τμήματος που χρησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μπορεί να επιστρέψουν πολλά δεδομένα, όπως απαρίθμηση χρηστών ή ομάδων. (Η τιμή 0 απενεργοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτές τις περιπτώσεις.)",
+    "Special Attributes" : "Ειδικά Χαρακτηριστικά ",
+    "Quota Field" : "Ποσοσταση πεδιου",
+    "Quota Default" : "Προκαθισμενο πεδιο",
+    "in bytes" : "σε bytes",
+    "Email Field" : "Email τυπος",
+    "User Home Folder Naming Rule" : "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας ",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD.",
+    "Internal Username" : "Εσωτερικό Όνομα Χρήστη",
+    "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." : "Εξ ορισμού, το εσωτερικό όνομα χρήστη θα δημιουργηθεί από το χαρακτηριστικό UUID. Αυτό βεβαιώνει ότι το όνομα χρήστη είναι μοναδικό και δεν χρειάζεται μετατροπή χαρακτήρων. Το εσωτερικό όνομα χρήστη έχει τον περιορισμό ότι μόνο αυτοί οι χαρακτήρες επιτρέπονται: [ a-zA-Z0-9_.@- ]. Οι άλλοι χαρακτήρες αντικαθίστανται με τους αντίστοιχους ASCII ή απλά παραλείπονται. Στις συγκρούσεις ένας αριθμός θα προστεθεί / αυξηθεί. Το εσωτερικό όνομα χρήστη χρησιμοποιείται για την αναγνώριση ενός χρήστη εσωτερικά. Είναι επίσης το προεπιλεγμένο όνομα για τον αρχικό φάκελο χρήστη. Αποτελεί επίσης μέρος των απομακρυσμένων διευθύνσεων URL, για παράδειγμα για όλες τις υπηρεσίες *DAV. Με αυτή τη ρύθμιση, η προεπιλεγμένη συμπεριφορά μπορεί να παρακαμφθεί. Για να επιτευχθεί μια παρόμοια συμπεριφορά όπως πριν το ownCloud 5 εισάγετε το χαρακτηριστικό του προβαλλόμενου ονόματος χρήστη στο παρακάτω πεδίο. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε νεώτερους (προστιθέμενους) χρήστες LDAP.",
+    "Internal Username Attribute:" : "Ιδιότητα Εσωτερικού Ονόματος Χρήστη:",
+    "Override UUID detection" : "Παράκαμψη ανίχνευσης 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." : "Από προεπιλογή, το χαρακτηριστικό UUID εντοπίζεται αυτόματα. Το χαρακτηριστικό UUID χρησιμοποιείται για την αναγνώριση χωρίς αμφιβολία χρηστών και ομάδων LDAP. Επίσης, το εσωτερικό όνομα χρήστη θα δημιουργηθεί με βάση το UUID, εφόσον δεν ορίζεται διαφορετικά ανωτέρω. Μπορείτε να παρακάμψετε τη ρύθμιση και να ορίσετε ένα χαρακτηριστικό της επιλογής σας. Θα πρέπει να βεβαιωθείτε ότι το χαρακτηριστικό της επιλογής σας μπορεί να ληφθεί για τους χρήστες και τις ομάδες και ότι είναι μοναδικό. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε πρόσφατα αντιστοιχισμένους (προστιθέμενους) χρήστες και ομάδες LDAP.",
+    "UUID Attribute for Users:" : "Χαρακτηριστικό UUID για Χρήστες:",
+    "UUID Attribute for Groups:" : "Χαρακτηριστικό UUID για Ομάδες:",
+    "Username-LDAP User Mapping" : "Αντιστοίχιση Χρηστών Όνομα Χρήστη-LDAP",
+    "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." : "Τα ονόματα χρηστών χρησιμοποιούνται για την αποθήκευση και την ανάθεση (μετα) δεδομένων. Προκειμένου να προσδιοριστούν με ακρίβεια και να αναγνωρίστουν οι χρήστες, κάθε χρήστης LDAP θα έχει ένα εσωτερικό όνομα. Αυτό απαιτεί μια αντιστοίχιση του ονόματος χρήστη με το χρήστη LDAP. Το όνομα χρήστη που δημιουργήθηκε αντιστοιχίζεται στην UUID του χρήστη LDAP. Επιπροσθέτως, το DN αποθηκεύεται προσωρινά (cache) ώστε να μειωθεί η αλληλεπίδραση LDAP, αλλά δεν χρησιμοποιείται για την ταυτοποίηση. Αν το DN αλλάξει, οι αλλαγές θα βρεθούν. Το εσωτερικό όνομα χρήστη χρησιμοποιείται παντού. Η εκκαθάριση των αντιστοιχίσεων θα αφήσει κατάλοιπα παντού. Η εκκαθάριση των αντιστοιχίσεων δεν επηρεάζεται από τη διαμόρφωση, επηρεάζει όλες τις διαμορφώσεις LDAP! Μην διαγράψετε ποτέ τις αντιστοιχίσεις σε ένα λειτουργικό περιβάλλον παρά μόνο σε δοκιμές ή σε πειραματικό στάδιο.",
+    "Clear Username-LDAP User Mapping" : "Διαγραφή αντιστοίχησης Ονόματος Χρήστη LDAP-Χρήστη",
+    "Clear Groupname-LDAP Group Mapping" : "Διαγραφή αντιστοίχησης Ονόματος Ομάδας-LDAP Ομάδας"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json
new file mode 100644
index 00000000000..bd8b6aa6170
--- /dev/null
+++ b/apps/user_ldap/l10n/el.json
@@ -0,0 +1,130 @@
+{ "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." : "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Η διαμόρφωση είναι άκυρη. Παρακαλώ ελέγξτε τα αρχεία σφαλμάτων για περαιτέρω λεπτομέρειες.",
+    "No action specified" : "Καμμία εντολή δεν προσδιορίστηκε",
+    "No configuration specified" : "Καμμία διαμόρφωση δεν προσδιορίστηκε",
+    "No data specified" : "Δεν προσδιορίστηκαν δεδομένα",
+    " Could not set configuration %s" : "Αδυναμία ρύθμισης %s",
+    "Deletion failed" : "Η διαγραφή απέτυχε",
+    "Take over settings from recent server configuration?" : "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
+    "Keep settings?" : "Διατήρηση ρυθμίσεων;",
+    "{nthServer}. Server" : "{nthServer}. Διακομιστής",
+    "Cannot add server configuration" : "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
+    "mappings cleared" : "αντιστοιχίες εκκαθαρίστηκαν",
+    "Success" : "Επιτυχία",
+    "Error" : "Σφάλμα",
+    "Please specify a Base DN" : "Παρακαλώ ορίστε ένα βασικό Διακεκριμένο Όνομα",
+    "Could not determine Base DN" : "Δεν ήταν δυνατό να καθοριστεί το βασικό Διακεκριμένο Όνομα",
+    "Please specify the port" : "Παρακαλώ ορίστε την θύρα",
+    "Configuration OK" : "Η διαμόρφωση είναι εντάξει",
+    "Configuration incorrect" : "Η διαμόρφωση είναι λανθασμένη",
+    "Configuration incomplete" : "Η διαμόρφωση είναι ελλιπής",
+    "Select groups" : "Επιλέξτε ομάδες",
+    "Select object classes" : "Επιλογή κλάσης αντικειμένων",
+    "Select attributes" : "Επιλογή χαρακτηριστικών",
+    "Connection test succeeded" : "Επιτυχημένη δοκιμαστική σύνδεση",
+    "Connection test failed" : "Αποτυχημένη δοκιμαστική σύνδεσης.",
+    "Do you really want to delete the current Server Configuration?" : "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
+    "Confirm Deletion" : "Επιβεβαίωση Διαγραφής",
+    "_%s group found_::_%s groups found_" : ["%s ομάδα βρέθηκε","%s ομάδες βρέθηκαν"],
+    "_%s user found_::_%s users found_" : ["%s χρήστης βρέθηκε","%s χρήστες βρέθηκαν"],
+    "Could not find the desired feature" : "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού",
+    "Invalid Host" : "Άκυρος εξυπηρετητής",
+    "Server" : "Διακομιστής",
+    "User Filter" : "Φίλτρο χρηστών",
+    "Login Filter" : "Φίλτρο Εισόδου",
+    "Group Filter" : "Group Filter",
+    "Save" : "Αποθήκευση",
+    "Test Configuration" : "Δοκιμαστικες ρυθμισεις",
+    "Help" : "Βοήθεια",
+    "Groups meeting these criteria are available in %s:" : "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
+    "only those object classes:" : "μόνο αυτές οι κλάσεις αντικειμένων:",
+    "only from those groups:" : "μόνο από αυτές τις ομάδες:",
+    "Edit raw filter instead" : "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
+    "Raw LDAP filter" : "Πρωτογενές φίλτρο ",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
+    "Test Filter" : "Φίλτρο Ελέγχου",
+    "groups found" : "ομάδες βρέθηκαν",
+    "Users login with this attribute:" : "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:",
+    "LDAP Username:" : "Όνομα χρήστη LDAP:",
+    "LDAP Email Address:" : "Διεύθυνση ηλ. ταχυδρομείου LDAP:",
+    "Other Attributes:" : "Άλλες Ιδιότητες:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ορίζει το φίλτρο που θα εφαρμοστεί, όταν επιχειριθεί σύνδεση. Το %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. Παράδειγμα: \"uid=%%uid\"",
+    "1. Server" : "1. Διακομιστής",
+    "%s. Server:" : "%s. Διακομιστής:",
+    "Add Server Configuration" : "Προσθήκη Ρυθμίσεων Διακομιστή",
+    "Delete Configuration" : "Απαλοιφή ρυθμίσεων",
+    "Host" : "Διακομιστής",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
+    "Port" : "Θύρα",
+    "User DN" : "User 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." : "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.",
+    "Password" : "Συνθηματικό",
+    "For anonymous access, leave DN and Password empty." : "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
+    "One Base DN per line" : "Ένα DN Βάσης ανά γραμμή ",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Αποφυγή αυτόματων αιτημάτων LDAP. Προτιμότερο για μεγαλύτερες εγκαταστάσεις, αλλά απαιτεί κάποιες γνώσεις  LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
+    "Limit %s access to users meeting these criteria:" : "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
+    "users found" : "χρήστες βρέθηκαν",
+    "Saving" : "Αποθήκευση",
+    "Back" : "Επιστροφή",
+    "Continue" : "Συνέχεια",
+    "Expert" : "Ειδικός",
+    "Advanced" : "Για προχωρημένους",
+    "<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>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Προσοχή:</b> Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει.",
+    "Connection Settings" : "Ρυθμίσεις Σύνδεσης",
+    "Configuration Active" : "Ενεργοποιηση ρυθμισεων",
+    "When unchecked, this configuration will be skipped." : "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. ",
+    "Backup (Replica) Host" : "Δημιουργία αντιγράφων ασφαλείας (Replica) Host ",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη.",
+    "Backup (Replica) Port" : "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
+    "Disable Main Server" : "Απενεργοποιηση του κεντρικου διακομιστη",
+    "Only connect to the replica server." : "Σύνδεση μόνο με το διακομιστή-αντίγραφο.",
+    "Case insensitive LDAP server (Windows)" : "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)",
+    "Turn off SSL certificate validation." : "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
+    "Directory Settings" : "Ρυθμίσεις Καταλόγου",
+    "User Display Name Field" : "Πεδίο Ονόματος Χρήστη",
+    "The LDAP attribute to use to generate the user's display name." : "Η ιδιότητα LDAP προς χρήση για δημιουργία του προβαλλόμενου ονόματος χρήστη.",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "Ένα DN βάσης χρηστών ανά γραμμή",
+    "User Search Attributes" : "Χαρακτηριστικά αναζήτησης των χρηστών ",
+    "Optional; one attribute per line" : "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή ",
+    "Group Display Name Field" : "Group Display Name Field",
+    "The LDAP attribute to use to generate the groups's display name." : "Η ιδιότητα LDAP προς χρήση για δημιουργία του προβαλλόμενου ονόματος ομάδας.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "Μια ομαδικη Βάση DN ανά γραμμή",
+    "Group Search Attributes" : "Ομάδα Χαρακτηριστικων Αναζήτηση",
+    "Group-Member association" : "Group-Member association",
+    "Nested Groups" : "Φωλιασμένες ομάδες",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Όταν ενεργοποιηθεί, οι ομάδες που περιέχουν ομάδες υποστηρίζονται. (Λειτουργεί μόνο αν το χαρακτηριστικό μέλους ομάδες περιέχει Διακεκριμένα Ονόματα.)",
+    "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.)" : "Μέγεθος τμήματος που χρησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μπορεί να επιστρέψουν πολλά δεδομένα, όπως απαρίθμηση χρηστών ή ομάδων. (Η τιμή 0 απενεργοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτές τις περιπτώσεις.)",
+    "Special Attributes" : "Ειδικά Χαρακτηριστικά ",
+    "Quota Field" : "Ποσοσταση πεδιου",
+    "Quota Default" : "Προκαθισμενο πεδιο",
+    "in bytes" : "σε bytes",
+    "Email Field" : "Email τυπος",
+    "User Home Folder Naming Rule" : "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας ",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD.",
+    "Internal Username" : "Εσωτερικό Όνομα Χρήστη",
+    "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." : "Εξ ορισμού, το εσωτερικό όνομα χρήστη θα δημιουργηθεί από το χαρακτηριστικό UUID. Αυτό βεβαιώνει ότι το όνομα χρήστη είναι μοναδικό και δεν χρειάζεται μετατροπή χαρακτήρων. Το εσωτερικό όνομα χρήστη έχει τον περιορισμό ότι μόνο αυτοί οι χαρακτήρες επιτρέπονται: [ a-zA-Z0-9_.@- ]. Οι άλλοι χαρακτήρες αντικαθίστανται με τους αντίστοιχους ASCII ή απλά παραλείπονται. Στις συγκρούσεις ένας αριθμός θα προστεθεί / αυξηθεί. Το εσωτερικό όνομα χρήστη χρησιμοποιείται για την αναγνώριση ενός χρήστη εσωτερικά. Είναι επίσης το προεπιλεγμένο όνομα για τον αρχικό φάκελο χρήστη. Αποτελεί επίσης μέρος των απομακρυσμένων διευθύνσεων URL, για παράδειγμα για όλες τις υπηρεσίες *DAV. Με αυτή τη ρύθμιση, η προεπιλεγμένη συμπεριφορά μπορεί να παρακαμφθεί. Για να επιτευχθεί μια παρόμοια συμπεριφορά όπως πριν το ownCloud 5 εισάγετε το χαρακτηριστικό του προβαλλόμενου ονόματος χρήστη στο παρακάτω πεδίο. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε νεώτερους (προστιθέμενους) χρήστες LDAP.",
+    "Internal Username Attribute:" : "Ιδιότητα Εσωτερικού Ονόματος Χρήστη:",
+    "Override UUID detection" : "Παράκαμψη ανίχνευσης 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." : "Από προεπιλογή, το χαρακτηριστικό UUID εντοπίζεται αυτόματα. Το χαρακτηριστικό UUID χρησιμοποιείται για την αναγνώριση χωρίς αμφιβολία χρηστών και ομάδων LDAP. Επίσης, το εσωτερικό όνομα χρήστη θα δημιουργηθεί με βάση το UUID, εφόσον δεν ορίζεται διαφορετικά ανωτέρω. Μπορείτε να παρακάμψετε τη ρύθμιση και να ορίσετε ένα χαρακτηριστικό της επιλογής σας. Θα πρέπει να βεβαιωθείτε ότι το χαρακτηριστικό της επιλογής σας μπορεί να ληφθεί για τους χρήστες και τις ομάδες και ότι είναι μοναδικό. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε πρόσφατα αντιστοιχισμένους (προστιθέμενους) χρήστες και ομάδες LDAP.",
+    "UUID Attribute for Users:" : "Χαρακτηριστικό UUID για Χρήστες:",
+    "UUID Attribute for Groups:" : "Χαρακτηριστικό UUID για Ομάδες:",
+    "Username-LDAP User Mapping" : "Αντιστοίχιση Χρηστών Όνομα Χρήστη-LDAP",
+    "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." : "Τα ονόματα χρηστών χρησιμοποιούνται για την αποθήκευση και την ανάθεση (μετα) δεδομένων. Προκειμένου να προσδιοριστούν με ακρίβεια και να αναγνωρίστουν οι χρήστες, κάθε χρήστης LDAP θα έχει ένα εσωτερικό όνομα. Αυτό απαιτεί μια αντιστοίχιση του ονόματος χρήστη με το χρήστη LDAP. Το όνομα χρήστη που δημιουργήθηκε αντιστοιχίζεται στην UUID του χρήστη LDAP. Επιπροσθέτως, το DN αποθηκεύεται προσωρινά (cache) ώστε να μειωθεί η αλληλεπίδραση LDAP, αλλά δεν χρησιμοποιείται για την ταυτοποίηση. Αν το DN αλλάξει, οι αλλαγές θα βρεθούν. Το εσωτερικό όνομα χρήστη χρησιμοποιείται παντού. Η εκκαθάριση των αντιστοιχίσεων θα αφήσει κατάλοιπα παντού. Η εκκαθάριση των αντιστοιχίσεων δεν επηρεάζεται από τη διαμόρφωση, επηρεάζει όλες τις διαμορφώσεις LDAP! Μην διαγράψετε ποτέ τις αντιστοιχίσεις σε ένα λειτουργικό περιβάλλον παρά μόνο σε δοκιμές ή σε πειραματικό στάδιο.",
+    "Clear Username-LDAP User Mapping" : "Διαγραφή αντιστοίχησης Ονόματος Χρήστη LDAP-Χρήστη",
+    "Clear Groupname-LDAP Group Mapping" : "Διαγραφή αντιστοίχησης Ονόματος Ομάδας-LDAP Ομάδας"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
deleted file mode 100644
index 0022c367dd5..00000000000
--- a/apps/user_ldap/l10n/el.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "Οι ρυθμίσεις είναι έγκυρες, αλλά απέτυχε η σύνδεση. Παρακαλώ ελέγξτε τις ρυθμίσεις του διακομιστή και τα διαπιστευτήρια.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Η διαμόρφωση είναι άκυρη. Παρακαλώ ελέγξτε τα αρχεία σφαλμάτων για περαιτέρω λεπτομέρειες.",
-"No action specified" => "Καμμία εντολή δεν προσδιορίστηκε",
-"No configuration specified" => "Καμμία διαμόρφωση δεν προσδιορίστηκε",
-"No data specified" => "Δεν προσδιορίστηκαν δεδομένα",
-" Could not set configuration %s" => "Αδυναμία ρύθμισης %s",
-"Deletion failed" => "Η διαγραφή απέτυχε",
-"Take over settings from recent server configuration?" => "Πάρτε πάνω από τις πρόσφατες ρυθμίσεις διαμόρφωσης του διακομιστή?",
-"Keep settings?" => "Διατήρηση ρυθμίσεων;",
-"{nthServer}. Server" => "{nthServer}. Διακομιστής",
-"Cannot add server configuration" => "Αδυναμία προσθήκης ρυθμίσεων διακομιστή",
-"mappings cleared" => "αντιστοιχίες εκκαθαρίστηκαν",
-"Success" => "Επιτυχία",
-"Error" => "Σφάλμα",
-"Please specify a Base DN" => "Παρακαλώ ορίστε ένα βασικό Διακεκριμένο Όνομα",
-"Could not determine Base DN" => "Δεν ήταν δυνατό να καθοριστεί το βασικό Διακεκριμένο Όνομα",
-"Please specify the port" => "Παρακαλώ ορίστε την θύρα",
-"Configuration OK" => "Η διαμόρφωση είναι εντάξει",
-"Configuration incorrect" => "Η διαμόρφωση είναι λανθασμένη",
-"Configuration incomplete" => "Η διαμόρφωση είναι ελλιπής",
-"Select groups" => "Επιλέξτε ομάδες",
-"Select object classes" => "Επιλογή κλάσης αντικειμένων",
-"Select attributes" => "Επιλογή χαρακτηριστικών",
-"Connection test succeeded" => "Επιτυχημένη δοκιμαστική σύνδεση",
-"Connection test failed" => "Αποτυχημένη δοκιμαστική σύνδεσης.",
-"Do you really want to delete the current Server Configuration?" => "Θέλετε να διαγράψετε τις τρέχουσες ρυθμίσεις του διακομιστή;",
-"Confirm Deletion" => "Επιβεβαίωση Διαγραφής",
-"_%s group found_::_%s groups found_" => array("%s ομάδα βρέθηκε","%s ομάδες βρέθηκαν"),
-"_%s user found_::_%s users found_" => array("%s χρήστης βρέθηκε","%s χρήστες βρέθηκαν"),
-"Could not find the desired feature" => "Αδυναμία εύρεσης επιθυμητου χαρακτηριστικού",
-"Invalid Host" => "Άκυρος εξυπηρετητής",
-"Server" => "Διακομιστής",
-"User Filter" => "Φίλτρο χρηστών",
-"Login Filter" => "Φίλτρο Εισόδου",
-"Group Filter" => "Group Filter",
-"Save" => "Αποθήκευση",
-"Test Configuration" => "Δοκιμαστικες ρυθμισεις",
-"Help" => "Βοήθεια",
-"Groups meeting these criteria are available in %s:" => "Οι ομάδες που πληρούν τα κριτήρια είναι διαθέσιμες σε %s:",
-"only those object classes:" => "μόνο αυτές οι κλάσεις αντικειμένων:",
-"only from those groups:" => "μόνο από αυτές τις ομάδες:",
-"Edit raw filter instead" => "Επεξεργασία πρωτογενούς φίλτρου αντί αυτού",
-"Raw LDAP filter" => "Πρωτογενές φίλτρο ",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Το φίλτρο καθορίζει ποιες ομάδες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
-"Test Filter" => "Φίλτρο Ελέγχου",
-"groups found" => "ομάδες βρέθηκαν",
-"Users login with this attribute:" => "Οι χρήστες εισέρχονται με αυτό το χαρακτηριστικό:",
-"LDAP Username:" => "Όνομα χρήστη LDAP:",
-"LDAP Email Address:" => "Διεύθυνση ηλ. ταχυδρομείου LDAP:",
-"Other Attributes:" => "Άλλες Ιδιότητες:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Ορίζει το φίλτρο που θα εφαρμοστεί, όταν επιχειριθεί σύνδεση. Το %%uid αντικαθιστά το όνομα χρήστη κατά τη σύνδεση. Παράδειγμα: \"uid=%%uid\"",
-"1. Server" => "1. Διακομιστής",
-"%s. Server:" => "%s. Διακομιστής:",
-"Add Server Configuration" => "Προσθήκη Ρυθμίσεων Διακομιστή",
-"Delete Configuration" => "Απαλοιφή ρυθμίσεων",
-"Host" => "Διακομιστής",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Μπορείτε να παραλείψετε το πρωτόκολλο, εκτός αν απαιτείται SSL. Σε αυτή την περίπτωση ξεκινήστε με ldaps://",
-"Port" => "Θύρα",
-"User DN" => "User 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." => "Το DN του χρήστη πελάτη με το οποίο θα πρέπει να γίνει η σύνδεση, π.χ. uid=agent,dc=example,dc=com. Για χρήση χωρίς πιστοποίηση, αφήστε το DN και τον Κωδικό κενά.",
-"Password" => "Συνθηματικό",
-"For anonymous access, leave DN and Password empty." => "Για ανώνυμη πρόσβαση, αφήστε κενά τα πεδία DN και Pasword.",
-"One Base DN per line" => "Ένα DN Βάσης ανά γραμμή ",
-"You can specify Base DN for users and groups in the Advanced tab" => "Μπορείτε να καθορίσετε το Base DN για χρήστες και ομάδες από την καρτέλα Προηγμένες ρυθμίσεις",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Αποφυγή αυτόματων αιτημάτων LDAP. Προτιμότερο για μεγαλύτερες εγκαταστάσεις, αλλά απαιτεί κάποιες γνώσεις  LDAP.",
-"Manually enter LDAP filters (recommended for large directories)" => "Εισάγετε με μη αυτόματο τρόπο φίλτρα LDAP (προτείνεται για μεγάλους καταλόγους)",
-"Limit %s access to users meeting these criteria:" => "Περιορισμός της πρόσβασης %s σε χρήστες που πληρούν τα κριτήρια:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Το φίλτρο καθορίζει ποιοι χρήστες LDAP θα έχουν πρόσβαση στην εγκατάσταση %s.",
-"users found" => "χρήστες βρέθηκαν",
-"Saving" => "Αποθήκευση",
-"Back" => "Επιστροφή",
-"Continue" => "Συνέχεια",
-"Expert" => "Ειδικός",
-"Advanced" => "Για προχωρημένους",
-"<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>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Προσοχή:</b> Το άρθρωμα PHP LDAP δεν είναι εγκατεστημένο και το σύστημα υποστήριξης δεν θα δουλέψει. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να το εγκαταστήσει.",
-"Connection Settings" => "Ρυθμίσεις Σύνδεσης",
-"Configuration Active" => "Ενεργοποιηση ρυθμισεων",
-"When unchecked, this configuration will be skipped." => "Όταν δεν είναι επιλεγμένο, αυτή η ρύθμιση θα πρέπει να παραλειφθεί. ",
-"Backup (Replica) Host" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Host ",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Δώστε μια προαιρετική εφεδρική υποδοχή. Πρέπει να είναι ένα αντίγραφο του κύριου LDAP / AD διακομιστη.",
-"Backup (Replica) Port" => "Δημιουργία αντιγράφων ασφαλείας (Replica) Υποδοχη",
-"Disable Main Server" => "Απενεργοποιηση του κεντρικου διακομιστη",
-"Only connect to the replica server." => "Σύνδεση μόνο με το διακομιστή-αντίγραφο.",
-"Case insensitive LDAP server (Windows)" => "Διακομιστής LDAP με διάκριση πεζών-κεφαλαίων (Windows)",
-"Turn off SSL certificate validation." => "Απενεργοποίηση επικύρωσης πιστοποιητικού SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Δεν προτείνεται, χρησιμοποιείστε το μόνο για δοκιμές! Εάν η σύνδεση λειτουργεί μόνο με αυτή την επιλογή, εισάγετε το πιστοποιητικό SSL του διακομιστή LDAP στο %s διακομιστή σας.",
-"Cache Time-To-Live" => "Cache Time-To-Live",
-"in seconds. A change empties the cache." => "σε δευτερόλεπτα. Μια αλλαγή αδειάζει την μνήμη cache.",
-"Directory Settings" => "Ρυθμίσεις Καταλόγου",
-"User Display Name Field" => "Πεδίο Ονόματος Χρήστη",
-"The LDAP attribute to use to generate the user's display name." => "Η ιδιότητα LDAP προς χρήση για δημιουργία του προβαλλόμενου ονόματος χρήστη.",
-"Base User Tree" => "Base User Tree",
-"One User Base DN per line" => "Ένα DN βάσης χρηστών ανά γραμμή",
-"User Search Attributes" => "Χαρακτηριστικά αναζήτησης των χρηστών ",
-"Optional; one attribute per line" => "Προαιρετικά? Ένα χαρακτηριστικό ανά γραμμή ",
-"Group Display Name Field" => "Group Display Name Field",
-"The LDAP attribute to use to generate the groups's display name." => "Η ιδιότητα LDAP προς χρήση για δημιουργία του προβαλλόμενου ονόματος ομάδας.",
-"Base Group Tree" => "Base Group Tree",
-"One Group Base DN per line" => "Μια ομαδικη Βάση DN ανά γραμμή",
-"Group Search Attributes" => "Ομάδα Χαρακτηριστικων Αναζήτηση",
-"Group-Member association" => "Group-Member association",
-"Nested Groups" => "Φωλιασμένες ομάδες",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Όταν ενεργοποιηθεί, οι ομάδες που περιέχουν ομάδες υποστηρίζονται. (Λειτουργεί μόνο αν το χαρακτηριστικό μέλους ομάδες περιέχει Διακεκριμένα Ονόματα.)",
-"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.)" => "Μέγεθος τμήματος που χρησιμοποιείται για την σελιδοποίηση αναζητήσεων LDAP που μπορεί να επιστρέψουν πολλά δεδομένα, όπως απαρίθμηση χρηστών ή ομάδων. (Η τιμή 0 απενεργοποιεί την σελιδοποίηση των αναζητήσεων LDAP σε αυτές τις περιπτώσεις.)",
-"Special Attributes" => "Ειδικά Χαρακτηριστικά ",
-"Quota Field" => "Ποσοσταση πεδιου",
-"Quota Default" => "Προκαθισμενο πεδιο",
-"in bytes" => "σε bytes",
-"Email Field" => "Email τυπος",
-"User Home Folder Naming Rule" => "Χρήστης Προσωπικόςφάκελος Ονομασία Κανόνας ",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Αφήστε το κενό για το όνομα χρήστη (προεπιλογή). Διαφορετικά, συμπληρώστε μία ιδιότητα LDAP/AD.",
-"Internal Username" => "Εσωτερικό Όνομα Χρήστη",
-"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." => "Εξ ορισμού, το εσωτερικό όνομα χρήστη θα δημιουργηθεί από το χαρακτηριστικό UUID. Αυτό βεβαιώνει ότι το όνομα χρήστη είναι μοναδικό και δεν χρειάζεται μετατροπή χαρακτήρων. Το εσωτερικό όνομα χρήστη έχει τον περιορισμό ότι μόνο αυτοί οι χαρακτήρες επιτρέπονται: [ a-zA-Z0-9_.@- ]. Οι άλλοι χαρακτήρες αντικαθίστανται με τους αντίστοιχους ASCII ή απλά παραλείπονται. Στις συγκρούσεις ένας αριθμός θα προστεθεί / αυξηθεί. Το εσωτερικό όνομα χρήστη χρησιμοποιείται για την αναγνώριση ενός χρήστη εσωτερικά. Είναι επίσης το προεπιλεγμένο όνομα για τον αρχικό φάκελο χρήστη. Αποτελεί επίσης μέρος των απομακρυσμένων διευθύνσεων URL, για παράδειγμα για όλες τις υπηρεσίες *DAV. Με αυτή τη ρύθμιση, η προεπιλεγμένη συμπεριφορά μπορεί να παρακαμφθεί. Για να επιτευχθεί μια παρόμοια συμπεριφορά όπως πριν το ownCloud 5 εισάγετε το χαρακτηριστικό του προβαλλόμενου ονόματος χρήστη στο παρακάτω πεδίο. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε νεώτερους (προστιθέμενους) χρήστες LDAP.",
-"Internal Username Attribute:" => "Ιδιότητα Εσωτερικού Ονόματος Χρήστη:",
-"Override UUID detection" => "Παράκαμψη ανίχνευσης 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." => "Από προεπιλογή, το χαρακτηριστικό UUID εντοπίζεται αυτόματα. Το χαρακτηριστικό UUID χρησιμοποιείται για την αναγνώριση χωρίς αμφιβολία χρηστών και ομάδων LDAP. Επίσης, το εσωτερικό όνομα χρήστη θα δημιουργηθεί με βάση το UUID, εφόσον δεν ορίζεται διαφορετικά ανωτέρω. Μπορείτε να παρακάμψετε τη ρύθμιση και να ορίσετε ένα χαρακτηριστικό της επιλογής σας. Θα πρέπει να βεβαιωθείτε ότι το χαρακτηριστικό της επιλογής σας μπορεί να ληφθεί για τους χρήστες και τις ομάδες και ότι είναι μοναδικό. Αφήστε το κενό για την προεπιλεγμένη λειτουργία. Οι αλλαγές θα έχουν ισχύ μόνο σε πρόσφατα αντιστοιχισμένους (προστιθέμενους) χρήστες και ομάδες LDAP.",
-"UUID Attribute for Users:" => "Χαρακτηριστικό UUID για Χρήστες:",
-"UUID Attribute for Groups:" => "Χαρακτηριστικό UUID για Ομάδες:",
-"Username-LDAP User Mapping" => "Αντιστοίχιση Χρηστών Όνομα Χρήστη-LDAP",
-"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." => "Τα ονόματα χρηστών χρησιμοποιούνται για την αποθήκευση και την ανάθεση (μετα) δεδομένων. Προκειμένου να προσδιοριστούν με ακρίβεια και να αναγνωρίστουν οι χρήστες, κάθε χρήστης LDAP θα έχει ένα εσωτερικό όνομα. Αυτό απαιτεί μια αντιστοίχιση του ονόματος χρήστη με το χρήστη LDAP. Το όνομα χρήστη που δημιουργήθηκε αντιστοιχίζεται στην UUID του χρήστη LDAP. Επιπροσθέτως, το DN αποθηκεύεται προσωρινά (cache) ώστε να μειωθεί η αλληλεπίδραση LDAP, αλλά δεν χρησιμοποιείται για την ταυτοποίηση. Αν το DN αλλάξει, οι αλλαγές θα βρεθούν. Το εσωτερικό όνομα χρήστη χρησιμοποιείται παντού. Η εκκαθάριση των αντιστοιχίσεων θα αφήσει κατάλοιπα παντού. Η εκκαθάριση των αντιστοιχίσεων δεν επηρεάζεται από τη διαμόρφωση, επηρεάζει όλες τις διαμορφώσεις LDAP! Μην διαγράψετε ποτέ τις αντιστοιχίσεις σε ένα λειτουργικό περιβάλλον παρά μόνο σε δοκιμές ή σε πειραματικό στάδιο.",
-"Clear Username-LDAP User Mapping" => "Διαγραφή αντιστοίχησης Ονόματος Χρήστη LDAP-Χρήστη",
-"Clear Groupname-LDAP Group Mapping" => "Διαγραφή αντιστοίχησης Ονόματος Ομάδας-LDAP Ομάδας"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/en@pirate.js b/apps/user_ldap/l10n/en@pirate.js
new file mode 100644
index 00000000000..a97d8442981
--- /dev/null
+++ b/apps/user_ldap/l10n/en@pirate.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Password" : "Passcode"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/en@pirate.json b/apps/user_ldap/l10n/en@pirate.json
new file mode 100644
index 00000000000..7cff0521941
--- /dev/null
+++ b/apps/user_ldap/l10n/en@pirate.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Password" : "Passcode"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/en@pirate.php b/apps/user_ldap/l10n/en@pirate.php
deleted file mode 100644
index 35308522f04..00000000000
--- a/apps/user_ldap/l10n/en@pirate.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Password" => "Passcode"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js
new file mode 100644
index 00000000000..851beced763
--- /dev/null
+++ b/apps/user_ldap/l10n/en_GB.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Failed to clear the mappings.",
+    "Failed to delete the server configuration" : "Failed to delete the server configuration",
+    "The configuration is valid and the connection could be established!" : "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 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." : "The configuration is invalid. Please have a look at the logs for further details.",
+    "No action specified" : "No action specified",
+    "No configuration specified" : "No configuration specified",
+    "No data specified" : "No data specified",
+    " Could not set configuration %s" : " Could not set configuration %s",
+    "Deletion failed" : "Deletion failed",
+    "Take over settings from recent server configuration?" : "Take over settings from recent server configuration?",
+    "Keep settings?" : "Keep settings?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Cannot add server configuration",
+    "mappings cleared" : "mappings cleared",
+    "Success" : "Success",
+    "Error" : "Error",
+    "Please specify a Base DN" : "Please specify a Base DN",
+    "Could not determine Base DN" : "Could not determine Base DN",
+    "Please specify the port" : "Please specify the port",
+    "Configuration OK" : "Configuration OK",
+    "Configuration incorrect" : "Configuration incorrect",
+    "Configuration incomplete" : "Configuration incomplete",
+    "Select groups" : "Select groups",
+    "Select object classes" : "Select object classes",
+    "Select attributes" : "Select attributes",
+    "Connection test succeeded" : "Connection test succeeded",
+    "Connection test failed" : "Connection test failed",
+    "Do you really want to delete the current Server Configuration?" : "Do you really want to delete the current Server Configuration?",
+    "Confirm Deletion" : "Confirm Deletion",
+    "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
+    "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
+    "Could not find the desired feature" : "Could not find the desired feature",
+    "Invalid Host" : "Invalid Host",
+    "Server" : "Server",
+    "User Filter" : "User Filter",
+    "Login Filter" : "Login Filter",
+    "Group Filter" : "Group Filter",
+    "Save" : "Save",
+    "Test Configuration" : "Test Configuration",
+    "Help" : "Help",
+    "Groups meeting these criteria are available in %s:" : "Groups meeting these criteria are available in %s:",
+    "only those object classes:" : "only those object classes:",
+    "only from those groups:" : "only from those groups:",
+    "Edit raw filter instead" : "Edit raw filter instead",
+    "Raw LDAP filter" : "Raw LDAP filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "The filter specifies which LDAP groups shall have access to the %s instance.",
+    "Test Filter" : "Test Filter",
+    "groups found" : "groups found",
+    "Users login with this attribute:" : "Users login with this attribute:",
+    "LDAP Username:" : "LDAP Username:",
+    "LDAP Email Address:" : "LDAP Email Address:",
+    "Other Attributes:" : "Other Attributes:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Add Server Configuration",
+    "Delete Configuration" : "Delete Configuration",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "You can omit the protocol, except you require SSL. Then start with ldaps://",
+    "Port" : "Port",
+    "User DN" : "User 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." : "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.",
+    "Password" : "Password",
+    "For anonymous access, leave DN and Password empty." : "For anonymous access, leave DN and Password empty.",
+    "One Base DN per line" : "One Base DN per line",
+    "You can specify Base DN for users and groups in the Advanced tab" : "You can specify Base DN for users and groups in the Advanced tab",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)",
+    "Limit %s access to users meeting these criteria:" : "Limit %s access to users meeting these criteria:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.",
+    "users found" : "users found",
+    "Saving" : "Saving",
+    "Back" : "Back",
+    "Continue" : "Continue",
+    "Expert" : "Expert",
+    "Advanced" : "Advanced",
+    "<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>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>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.",
+    "Connection Settings" : "Connection Settings",
+    "Configuration Active" : "Configuration Active",
+    "When unchecked, this configuration will be skipped." : "When unchecked, this configuration will be skipped.",
+    "Backup (Replica) Host" : "Backup (Replica) Host",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Give an optional backup host. It must be a replica of the main LDAP/AD server.",
+    "Backup (Replica) Port" : "Backup (Replica) Port",
+    "Disable Main Server" : "Disable Main Server",
+    "Only connect to the replica server." : "Only connect to the replica server.",
+    "Case insensitive LDAP server (Windows)" : "Case insensitive LDAP server (Windows)",
+    "Turn off SSL certificate validation." : "Turn off SSL certificate validation.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "in seconds. A change empties the cache.",
+    "Directory Settings" : "Directory Settings",
+    "User Display Name Field" : "User Display Name Field",
+    "The LDAP attribute to use to generate the user's display name." : "The LDAP attribute to use to generate the user's display name.",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "One User Base DN per line",
+    "User Search Attributes" : "User Search Attributes",
+    "Optional; one attribute per line" : "Optional; one attribute per line",
+    "Group Display Name Field" : "Group Display Name Field",
+    "The LDAP attribute to use to generate the groups's display name." : "The LDAP attribute to use to generate the group's display name.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "One Group Base DN per line",
+    "Group Search Attributes" : "Group Search Attributes",
+    "Group-Member association" : "Group-Member association",
+    "Nested Groups" : "Nested Groups",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains 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 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.)",
+    "Special Attributes" : "Special Attributes",
+    "Quota Field" : "Quota Field",
+    "Quota Default" : "Quota Default",
+    "in bytes" : "in bytes",
+    "Email Field" : "Email Field",
+    "User Home Folder Naming Rule" : "User Home Folder Naming Rule",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.",
+    "Internal Username" : "Internal Username",
+    "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." : "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 behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.",
+    "Internal Username Attribute:" : "Internal Username Attribute:",
+    "Override UUID detection" : "Override UUID detection",
+    "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." : "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.",
+    "UUID Attribute for Users:" : "UUID Attribute for Users:",
+    "UUID Attribute for Groups:" : "UUID Attribute for Groups:",
+    "Username-LDAP User Mapping" : "Username-LDAP User Mapping",
+    "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." : "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise 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.",
+    "Clear Username-LDAP User Mapping" : "Clear Username-LDAP User Mapping",
+    "Clear Groupname-LDAP Group Mapping" : "Clear Groupname-LDAP Group Mapping"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json
new file mode 100644
index 00000000000..d97bd5aea25
--- /dev/null
+++ b/apps/user_ldap/l10n/en_GB.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Failed to clear the mappings.",
+    "Failed to delete the server configuration" : "Failed to delete the server configuration",
+    "The configuration is valid and the connection could be established!" : "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 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." : "The configuration is invalid. Please have a look at the logs for further details.",
+    "No action specified" : "No action specified",
+    "No configuration specified" : "No configuration specified",
+    "No data specified" : "No data specified",
+    " Could not set configuration %s" : " Could not set configuration %s",
+    "Deletion failed" : "Deletion failed",
+    "Take over settings from recent server configuration?" : "Take over settings from recent server configuration?",
+    "Keep settings?" : "Keep settings?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Cannot add server configuration",
+    "mappings cleared" : "mappings cleared",
+    "Success" : "Success",
+    "Error" : "Error",
+    "Please specify a Base DN" : "Please specify a Base DN",
+    "Could not determine Base DN" : "Could not determine Base DN",
+    "Please specify the port" : "Please specify the port",
+    "Configuration OK" : "Configuration OK",
+    "Configuration incorrect" : "Configuration incorrect",
+    "Configuration incomplete" : "Configuration incomplete",
+    "Select groups" : "Select groups",
+    "Select object classes" : "Select object classes",
+    "Select attributes" : "Select attributes",
+    "Connection test succeeded" : "Connection test succeeded",
+    "Connection test failed" : "Connection test failed",
+    "Do you really want to delete the current Server Configuration?" : "Do you really want to delete the current Server Configuration?",
+    "Confirm Deletion" : "Confirm Deletion",
+    "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
+    "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
+    "Could not find the desired feature" : "Could not find the desired feature",
+    "Invalid Host" : "Invalid Host",
+    "Server" : "Server",
+    "User Filter" : "User Filter",
+    "Login Filter" : "Login Filter",
+    "Group Filter" : "Group Filter",
+    "Save" : "Save",
+    "Test Configuration" : "Test Configuration",
+    "Help" : "Help",
+    "Groups meeting these criteria are available in %s:" : "Groups meeting these criteria are available in %s:",
+    "only those object classes:" : "only those object classes:",
+    "only from those groups:" : "only from those groups:",
+    "Edit raw filter instead" : "Edit raw filter instead",
+    "Raw LDAP filter" : "Raw LDAP filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "The filter specifies which LDAP groups shall have access to the %s instance.",
+    "Test Filter" : "Test Filter",
+    "groups found" : "groups found",
+    "Users login with this attribute:" : "Users login with this attribute:",
+    "LDAP Username:" : "LDAP Username:",
+    "LDAP Email Address:" : "LDAP Email Address:",
+    "Other Attributes:" : "Other Attributes:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Add Server Configuration",
+    "Delete Configuration" : "Delete Configuration",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "You can omit the protocol, except you require SSL. Then start with ldaps://",
+    "Port" : "Port",
+    "User DN" : "User 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." : "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.",
+    "Password" : "Password",
+    "For anonymous access, leave DN and Password empty." : "For anonymous access, leave DN and Password empty.",
+    "One Base DN per line" : "One Base DN per line",
+    "You can specify Base DN for users and groups in the Advanced tab" : "You can specify Base DN for users and groups in the Advanced tab",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Manually enter LDAP filters (recommended for large directories)",
+    "Limit %s access to users meeting these criteria:" : "Limit %s access to users meeting these criteria:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "The filter specifies which LDAP users shall have access to the %s instance.",
+    "users found" : "users found",
+    "Saving" : "Saving",
+    "Back" : "Back",
+    "Continue" : "Continue",
+    "Expert" : "Expert",
+    "Advanced" : "Advanced",
+    "<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>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>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.",
+    "Connection Settings" : "Connection Settings",
+    "Configuration Active" : "Configuration Active",
+    "When unchecked, this configuration will be skipped." : "When unchecked, this configuration will be skipped.",
+    "Backup (Replica) Host" : "Backup (Replica) Host",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Give an optional backup host. It must be a replica of the main LDAP/AD server.",
+    "Backup (Replica) Port" : "Backup (Replica) Port",
+    "Disable Main Server" : "Disable Main Server",
+    "Only connect to the replica server." : "Only connect to the replica server.",
+    "Case insensitive LDAP server (Windows)" : "Case insensitive LDAP server (Windows)",
+    "Turn off SSL certificate validation." : "Turn off SSL certificate validation.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "in seconds. A change empties the cache.",
+    "Directory Settings" : "Directory Settings",
+    "User Display Name Field" : "User Display Name Field",
+    "The LDAP attribute to use to generate the user's display name." : "The LDAP attribute to use to generate the user's display name.",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "One User Base DN per line",
+    "User Search Attributes" : "User Search Attributes",
+    "Optional; one attribute per line" : "Optional; one attribute per line",
+    "Group Display Name Field" : "Group Display Name Field",
+    "The LDAP attribute to use to generate the groups's display name." : "The LDAP attribute to use to generate the group's display name.",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "One Group Base DN per line",
+    "Group Search Attributes" : "Group Search Attributes",
+    "Group-Member association" : "Group-Member association",
+    "Nested Groups" : "Nested Groups",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains 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 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.)",
+    "Special Attributes" : "Special Attributes",
+    "Quota Field" : "Quota Field",
+    "Quota Default" : "Quota Default",
+    "in bytes" : "in bytes",
+    "Email Field" : "Email Field",
+    "User Home Folder Naming Rule" : "User Home Folder Naming Rule",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.",
+    "Internal Username" : "Internal Username",
+    "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." : "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 behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.",
+    "Internal Username Attribute:" : "Internal Username Attribute:",
+    "Override UUID detection" : "Override UUID detection",
+    "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." : "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.",
+    "UUID Attribute for Users:" : "UUID Attribute for Users:",
+    "UUID Attribute for Groups:" : "UUID Attribute for Groups:",
+    "Username-LDAP User Mapping" : "Username-LDAP User Mapping",
+    "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." : "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise 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.",
+    "Clear Username-LDAP User Mapping" : "Clear Username-LDAP User Mapping",
+    "Clear Groupname-LDAP Group Mapping" : "Clear Groupname-LDAP Group Mapping"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/en_GB.php b/apps/user_ldap/l10n/en_GB.php
deleted file mode 100644
index 35a0e8d3ef9..00000000000
--- a/apps/user_ldap/l10n/en_GB.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Failed to clear the mappings.",
-"Failed to delete the server configuration" => "Failed to delete the server configuration",
-"The configuration is valid and the connection could be established!" => "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 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." => "The configuration is invalid. Please have a look at the logs for further details.",
-"No action specified" => "No action specified",
-"No configuration specified" => "No configuration specified",
-"No data specified" => "No data specified",
-" Could not set configuration %s" => " Could not set configuration %s",
-"Deletion failed" => "Deletion failed",
-"Take over settings from recent server configuration?" => "Take over settings from recent server configuration?",
-"Keep settings?" => "Keep settings?",
-"{nthServer}. Server" => "{nthServer}. Server",
-"Cannot add server configuration" => "Cannot add server configuration",
-"mappings cleared" => "mappings cleared",
-"Success" => "Success",
-"Error" => "Error",
-"Please specify a Base DN" => "Please specify a Base DN",
-"Could not determine Base DN" => "Could not determine Base DN",
-"Please specify the port" => "Please specify the port",
-"Configuration OK" => "Configuration OK",
-"Configuration incorrect" => "Configuration incorrect",
-"Configuration incomplete" => "Configuration incomplete",
-"Select groups" => "Select groups",
-"Select object classes" => "Select object classes",
-"Select attributes" => "Select attributes",
-"Connection test succeeded" => "Connection test succeeded",
-"Connection test failed" => "Connection test failed",
-"Do you really want to delete the current Server Configuration?" => "Do you really want to delete the current Server Configuration?",
-"Confirm Deletion" => "Confirm Deletion",
-"_%s group found_::_%s groups found_" => array("%s group found","%s groups found"),
-"_%s user found_::_%s users found_" => array("%s user found","%s users found"),
-"Could not find the desired feature" => "Could not find the desired feature",
-"Invalid Host" => "Invalid Host",
-"Server" => "Server",
-"User Filter" => "User Filter",
-"Login Filter" => "Login Filter",
-"Group Filter" => "Group Filter",
-"Save" => "Save",
-"Test Configuration" => "Test Configuration",
-"Help" => "Help",
-"Groups meeting these criteria are available in %s:" => "Groups meeting these criteria are available in %s:",
-"only those object classes:" => "only those object classes:",
-"only from those groups:" => "only from those groups:",
-"Edit raw filter instead" => "Edit raw filter instead",
-"Raw LDAP filter" => "Raw LDAP filter",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "The filter specifies which LDAP groups shall have access to the %s instance.",
-"Test Filter" => "Test Filter",
-"groups found" => "groups found",
-"Users login with this attribute:" => "Users login with this attribute:",
-"LDAP Username:" => "LDAP Username:",
-"LDAP Email Address:" => "LDAP Email Address:",
-"Other Attributes:" => "Other Attributes:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Add Server Configuration",
-"Delete Configuration" => "Delete Configuration",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "You can omit the protocol, except you require SSL. Then start with ldaps://",
-"Port" => "Port",
-"User DN" => "User 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." => "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.",
-"Password" => "Password",
-"For anonymous access, leave DN and Password empty." => "For anonymous access, leave DN and Password empty.",
-"One Base DN per line" => "One Base DN per line",
-"You can specify Base DN for users and groups in the Advanced tab" => "You can specify Base DN for users and groups in the Advanced tab",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge.",
-"Manually enter LDAP filters (recommended for large directories)" => "Manually enter LDAP filters (recommended for large directories)",
-"Limit %s access to users meeting these criteria:" => "Limit %s access to users meeting these criteria:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "The filter specifies which LDAP users shall have access to the %s instance.",
-"users found" => "users found",
-"Saving" => "Saving",
-"Back" => "Back",
-"Continue" => "Continue",
-"Expert" => "Expert",
-"Advanced" => "Advanced",
-"<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>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>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it.",
-"Connection Settings" => "Connection Settings",
-"Configuration Active" => "Configuration Active",
-"When unchecked, this configuration will be skipped." => "When unchecked, this configuration will be skipped.",
-"Backup (Replica) Host" => "Backup (Replica) Host",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Give an optional backup host. It must be a replica of the main LDAP/AD server.",
-"Backup (Replica) Port" => "Backup (Replica) Port",
-"Disable Main Server" => "Disable Main Server",
-"Only connect to the replica server." => "Only connect to the replica server.",
-"Case insensitive LDAP server (Windows)" => "Case insensitive LDAP server (Windows)",
-"Turn off SSL certificate validation." => "Turn off SSL certificate validation.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server.",
-"Cache Time-To-Live" => "Cache Time-To-Live",
-"in seconds. A change empties the cache." => "in seconds. A change empties the cache.",
-"Directory Settings" => "Directory Settings",
-"User Display Name Field" => "User Display Name Field",
-"The LDAP attribute to use to generate the user's display name." => "The LDAP attribute to use to generate the user's display name.",
-"Base User Tree" => "Base User Tree",
-"One User Base DN per line" => "One User Base DN per line",
-"User Search Attributes" => "User Search Attributes",
-"Optional; one attribute per line" => "Optional; one attribute per line",
-"Group Display Name Field" => "Group Display Name Field",
-"The LDAP attribute to use to generate the groups's display name." => "The LDAP attribute to use to generate the group's display name.",
-"Base Group Tree" => "Base Group Tree",
-"One Group Base DN per line" => "One Group Base DN per line",
-"Group Search Attributes" => "Group Search Attributes",
-"Group-Member association" => "Group-Member association",
-"Nested Groups" => "Nested Groups",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains 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 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.)",
-"Special Attributes" => "Special Attributes",
-"Quota Field" => "Quota Field",
-"Quota Default" => "Quota Default",
-"in bytes" => "in bytes",
-"Email Field" => "Email Field",
-"User Home Folder Naming Rule" => "User Home Folder Naming Rule",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.",
-"Internal Username" => "Internal Username",
-"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." => "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 behaviour as before ownCloud 5 enter the user display name attribute in the following field. Leave it empty for default behaviour. Changes will have effect only on newly mapped (added) LDAP users.",
-"Internal Username Attribute:" => "Internal Username Attribute:",
-"Override UUID detection" => "Override UUID detection",
-"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." => "By default, the UUID attribute is automatically detected. The UUID attribute is used to unambiguously 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 behaviour. Changes will have effect only on newly mapped (added) LDAP users and groups.",
-"UUID Attribute for Users:" => "UUID Attribute for Users:",
-"UUID Attribute for Groups:" => "UUID Attribute for Groups:",
-"Username-LDAP User Mapping" => "Username-LDAP User Mapping",
-"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." => "Usernames are used to store and assign (meta) data. In order to precisely identify and recognise 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.",
-"Clear Username-LDAP User Mapping" => "Clear Username-LDAP User Mapping",
-"Clear Groupname-LDAP Group Mapping" => "Clear Groupname-LDAP Group Mapping"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/en_NZ.js b/apps/user_ldap/l10n/en_NZ.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/en_NZ.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/en_NZ.json
@@ -0,0 +1,5 @@
+{ "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/en_NZ.php b/apps/user_ldap/l10n/en_NZ.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/en_NZ.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/eo.js b/apps/user_ldap/l10n/eo.js
new file mode 100644
index 00000000000..4bd99570cfb
--- /dev/null
+++ b/apps/user_ldap/l10n/eo.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to delete the server configuration" : "Malsukcesis forigo de la agordo de servilo",
+    "Deletion failed" : "Forigo malsukcesis",
+    "Keep settings?" : "Ĉu daŭrigi la agordon?",
+    "{nthServer}. Server" : "{nthServer}. Servilo",
+    "Cannot add server configuration" : "Ne eblas aldoni agordon de servilo",
+    "Success" : "Sukceso",
+    "Error" : "Eraro",
+    "Configuration OK" : "La agordaro ĝustas",
+    "Configuration incorrect" : "La agordaro malĝustas",
+    "Configuration incomplete" : "La agordaro neplenas",
+    "Select groups" : "Elekti grupojn",
+    "Select object classes" : "Elekti objektoklasojn",
+    "Select attributes" : "Elekti atribuojn",
+    "Connection test succeeded" : "Provo de konekto sukcesis",
+    "Connection test failed" : "Provo de konekto malsukcesis",
+    "Confirm Deletion" : "Konfirmi forigon",
+    "_%s group found_::_%s groups found_" : ["%s grupo troviĝis","%s grupoj troviĝis"],
+    "_%s user found_::_%s users found_" : ["%s uzanto troviĝis","%s uzanto troviĝis"],
+    "Invalid Host" : "Nevalida gastigo",
+    "Server" : "Servilo",
+    "User Filter" : "Filtrilo de uzanto",
+    "Login Filter" : "Ensaluta filtrilo",
+    "Group Filter" : "Filtrilo de grupo",
+    "Save" : "Konservi",
+    "Test Configuration" : "Provi agordon",
+    "Help" : "Helpo",
+    "only those object classes:" : "nur tiuj objektoklasoj:",
+    "only from those groups:" : "nur el tiuj grupoj:",
+    "groups found" : "grupoj trovitaj",
+    "Users login with this attribute:" : "Uzantoj ensalutas kun ĉi tiu atributo:",
+    "LDAP Username:" : "LDAP-uzantonomo:",
+    "LDAP Email Address:" : "LDAP-retpoŝtadreso:",
+    "Other Attributes:" : "Aliaj atribuoj:",
+    "1. Server" : "1. Servilo",
+    "%s. Server:" : "%s. Servilo:",
+    "Add Server Configuration" : "Aldoni agordon de servilo",
+    "Delete Configuration" : "Forigi agordaron",
+    "Host" : "Gastigo",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
+    "Port" : "Pordo",
+    "User DN" : "Uzanto-DN",
+    "Password" : "Pasvorto",
+    "For anonymous access, leave DN and Password empty." : "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
+    "users found" : "uzantoj trovitaj",
+    "Back" : "Antaŭen",
+    "Expert" : "Sperta",
+    "Advanced" : "Progresinta",
+    "Connection Settings" : "Agordo de konekto",
+    "Disable Main Server" : "Malkapabligi la ĉefan servilon",
+    "Turn off SSL certificate validation." : "Malkapabligi validkontrolon de SSL-atestiloj.",
+    "Cache Time-To-Live" : "Vivotempo de la kaŝmemoro",
+    "in seconds. A change empties the cache." : "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.",
+    "Directory Settings" : "Agordo de dosierujo",
+    "User Display Name Field" : "Kampo de vidignomo de uzanto",
+    "Base User Tree" : "Baza uzantarbo",
+    "User Search Attributes" : "Atributoj de serĉo de uzanto",
+    "Group Display Name Field" : "Kampo de vidignomo de grupo",
+    "Base Group Tree" : "Baza gruparbo",
+    "Group Search Attributes" : "Atribuoj de gruposerĉo",
+    "Group-Member association" : "Asocio de grupo kaj membro",
+    "Special Attributes" : "Specialaj atribuoj",
+    "Quota Field" : "Kampo de kvoto",
+    "in bytes" : "duumoke",
+    "Email Field" : "Kampo de retpoŝto",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon.",
+    "Internal Username" : "Ena uzantonomo",
+    "Internal Username Attribute:" : "Atribuo de ena uzantonomo:",
+    "UUID Attribute for Users:" : "UUID-atribuo por uzantoj:",
+    "UUID Attribute for Groups:" : "UUID-atribuo por grupoj:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/eo.json b/apps/user_ldap/l10n/eo.json
new file mode 100644
index 00000000000..ffb3b06c9ce
--- /dev/null
+++ b/apps/user_ldap/l10n/eo.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Failed to delete the server configuration" : "Malsukcesis forigo de la agordo de servilo",
+    "Deletion failed" : "Forigo malsukcesis",
+    "Keep settings?" : "Ĉu daŭrigi la agordon?",
+    "{nthServer}. Server" : "{nthServer}. Servilo",
+    "Cannot add server configuration" : "Ne eblas aldoni agordon de servilo",
+    "Success" : "Sukceso",
+    "Error" : "Eraro",
+    "Configuration OK" : "La agordaro ĝustas",
+    "Configuration incorrect" : "La agordaro malĝustas",
+    "Configuration incomplete" : "La agordaro neplenas",
+    "Select groups" : "Elekti grupojn",
+    "Select object classes" : "Elekti objektoklasojn",
+    "Select attributes" : "Elekti atribuojn",
+    "Connection test succeeded" : "Provo de konekto sukcesis",
+    "Connection test failed" : "Provo de konekto malsukcesis",
+    "Confirm Deletion" : "Konfirmi forigon",
+    "_%s group found_::_%s groups found_" : ["%s grupo troviĝis","%s grupoj troviĝis"],
+    "_%s user found_::_%s users found_" : ["%s uzanto troviĝis","%s uzanto troviĝis"],
+    "Invalid Host" : "Nevalida gastigo",
+    "Server" : "Servilo",
+    "User Filter" : "Filtrilo de uzanto",
+    "Login Filter" : "Ensaluta filtrilo",
+    "Group Filter" : "Filtrilo de grupo",
+    "Save" : "Konservi",
+    "Test Configuration" : "Provi agordon",
+    "Help" : "Helpo",
+    "only those object classes:" : "nur tiuj objektoklasoj:",
+    "only from those groups:" : "nur el tiuj grupoj:",
+    "groups found" : "grupoj trovitaj",
+    "Users login with this attribute:" : "Uzantoj ensalutas kun ĉi tiu atributo:",
+    "LDAP Username:" : "LDAP-uzantonomo:",
+    "LDAP Email Address:" : "LDAP-retpoŝtadreso:",
+    "Other Attributes:" : "Aliaj atribuoj:",
+    "1. Server" : "1. Servilo",
+    "%s. Server:" : "%s. Servilo:",
+    "Add Server Configuration" : "Aldoni agordon de servilo",
+    "Delete Configuration" : "Forigi agordaron",
+    "Host" : "Gastigo",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
+    "Port" : "Pordo",
+    "User DN" : "Uzanto-DN",
+    "Password" : "Pasvorto",
+    "For anonymous access, leave DN and Password empty." : "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
+    "users found" : "uzantoj trovitaj",
+    "Back" : "Antaŭen",
+    "Expert" : "Sperta",
+    "Advanced" : "Progresinta",
+    "Connection Settings" : "Agordo de konekto",
+    "Disable Main Server" : "Malkapabligi la ĉefan servilon",
+    "Turn off SSL certificate validation." : "Malkapabligi validkontrolon de SSL-atestiloj.",
+    "Cache Time-To-Live" : "Vivotempo de la kaŝmemoro",
+    "in seconds. A change empties the cache." : "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.",
+    "Directory Settings" : "Agordo de dosierujo",
+    "User Display Name Field" : "Kampo de vidignomo de uzanto",
+    "Base User Tree" : "Baza uzantarbo",
+    "User Search Attributes" : "Atributoj de serĉo de uzanto",
+    "Group Display Name Field" : "Kampo de vidignomo de grupo",
+    "Base Group Tree" : "Baza gruparbo",
+    "Group Search Attributes" : "Atribuoj de gruposerĉo",
+    "Group-Member association" : "Asocio de grupo kaj membro",
+    "Special Attributes" : "Specialaj atribuoj",
+    "Quota Field" : "Kampo de kvoto",
+    "in bytes" : "duumoke",
+    "Email Field" : "Kampo de retpoŝto",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon.",
+    "Internal Username" : "Ena uzantonomo",
+    "Internal Username Attribute:" : "Atribuo de ena uzantonomo:",
+    "UUID Attribute for Users:" : "UUID-atribuo por uzantoj:",
+    "UUID Attribute for Groups:" : "UUID-atribuo por grupoj:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
deleted file mode 100644
index 1cab0f66b91..00000000000
--- a/apps/user_ldap/l10n/eo.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Malsukcesis forigo de la agordo de servilo",
-"Deletion failed" => "Forigo malsukcesis",
-"Keep settings?" => "Ĉu daŭrigi la agordon?",
-"{nthServer}. Server" => "{nthServer}. Servilo",
-"Cannot add server configuration" => "Ne eblas aldoni agordon de servilo",
-"Success" => "Sukceso",
-"Error" => "Eraro",
-"Configuration OK" => "La agordaro ĝustas",
-"Configuration incorrect" => "La agordaro malĝustas",
-"Configuration incomplete" => "La agordaro neplenas",
-"Select groups" => "Elekti grupojn",
-"Select object classes" => "Elekti objektoklasojn",
-"Select attributes" => "Elekti atribuojn",
-"Connection test succeeded" => "Provo de konekto sukcesis",
-"Connection test failed" => "Provo de konekto malsukcesis",
-"Confirm Deletion" => "Konfirmi forigon",
-"_%s group found_::_%s groups found_" => array("%s grupo troviĝis","%s grupoj troviĝis"),
-"_%s user found_::_%s users found_" => array("%s uzanto troviĝis","%s uzanto troviĝis"),
-"Invalid Host" => "Nevalida gastigo",
-"Server" => "Servilo",
-"User Filter" => "Filtrilo de uzanto",
-"Login Filter" => "Ensaluta filtrilo",
-"Group Filter" => "Filtrilo de grupo",
-"Save" => "Konservi",
-"Test Configuration" => "Provi agordon",
-"Help" => "Helpo",
-"only those object classes:" => "nur tiuj objektoklasoj:",
-"only from those groups:" => "nur el tiuj grupoj:",
-"groups found" => "grupoj trovitaj",
-"Users login with this attribute:" => "Uzantoj ensalutas kun ĉi tiu atributo:",
-"LDAP Username:" => "LDAP-uzantonomo:",
-"LDAP Email Address:" => "LDAP-retpoŝtadreso:",
-"Other Attributes:" => "Aliaj atribuoj:",
-"1. Server" => "1. Servilo",
-"%s. Server:" => "%s. Servilo:",
-"Add Server Configuration" => "Aldoni agordon de servilo",
-"Delete Configuration" => "Forigi agordaron",
-"Host" => "Gastigo",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://",
-"Port" => "Pordo",
-"User DN" => "Uzanto-DN",
-"Password" => "Pasvorto",
-"For anonymous access, leave DN and Password empty." => "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj.",
-"users found" => "uzantoj trovitaj",
-"Back" => "Antaŭen",
-"Expert" => "Sperta",
-"Advanced" => "Progresinta",
-"Connection Settings" => "Agordo de konekto",
-"Disable Main Server" => "Malkapabligi la ĉefan servilon",
-"Turn off SSL certificate validation." => "Malkapabligi validkontrolon de SSL-atestiloj.",
-"Cache Time-To-Live" => "Vivotempo de la kaŝmemoro",
-"in seconds. A change empties the cache." => "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron.",
-"Directory Settings" => "Agordo de dosierujo",
-"User Display Name Field" => "Kampo de vidignomo de uzanto",
-"Base User Tree" => "Baza uzantarbo",
-"User Search Attributes" => "Atributoj de serĉo de uzanto",
-"Group Display Name Field" => "Kampo de vidignomo de grupo",
-"Base Group Tree" => "Baza gruparbo",
-"Group Search Attributes" => "Atribuoj de gruposerĉo",
-"Group-Member association" => "Asocio de grupo kaj membro",
-"Special Attributes" => "Specialaj atribuoj",
-"Quota Field" => "Kampo de kvoto",
-"in bytes" => "duumoke",
-"Email Field" => "Kampo de retpoŝto",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon.",
-"Internal Username" => "Ena uzantonomo",
-"Internal Username Attribute:" => "Atribuo de ena uzantonomo:",
-"UUID Attribute for Users:" => "UUID-atribuo por uzantoj:",
-"UUID Attribute for Groups:" => "UUID-atribuo por grupoj:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
new file mode 100644
index 00000000000..a222523d43f
--- /dev/null
+++ b/apps/user_ldap/l10n/es.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "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 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 Enlace. 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, busque en el log para más detalles.",
+    "No action specified" : "No se ha especificado la acción",
+    "No configuration specified" : "No se ha especificado la configuración",
+    "No data specified" : "No se han especificado los datos",
+    " Could not set configuration %s" : "No se pudo establecer la configuración %s",
+    "Deletion failed" : "Falló el borrado",
+    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
+    "Keep settings?" : "¿Mantener la configuración?",
+    "{nthServer}. Server" : "{nthServer}. servidor",
+    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
+    "mappings cleared" : "Asignaciones borradas",
+    "Success" : "Éxito",
+    "Error" : "Error",
+    "Please specify a Base DN" : "Especifique un DN base",
+    "Could not determine Base DN" : "No se pudo determinar un DN base",
+    "Please specify the port" : "Especifique el puerto",
+    "Configuration OK" : "Configuración Correcta",
+    "Configuration incorrect" : "Configuración Incorrecta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Seleccionar la clase de objeto",
+    "Select attributes" : "Seleccionar atributos",
+    "Connection test succeeded" : "La prueba de conexión fue exitosa",
+    "Connection test failed" : "La prueba de conexión falló",
+    "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
+    "Confirm Deletion" : "Confirmar eliminación",
+    "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
+    "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
+    "Could not find the desired feature" : "No se puede encontrar la función deseada.",
+    "Invalid Host" : "Host inválido",
+    "Server" : "Servidor",
+    "User Filter" : "Filtro de usuario",
+    "Login Filter" : "Filtro de Login",
+    "Group Filter" : "Filtro de grupo",
+    "Save" : "Guardar",
+    "Test Configuration" : "Configuración de prueba",
+    "Help" : "Ayuda",
+    "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios están disponibles en %s:",
+    "only those object classes:" : "solamente de estas clases de objeto:",
+    "only from those groups:" : "solamente de estos grupos:",
+    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
+    "Raw LDAP filter" : "Filtro LDAP en bruto",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
+    "Test Filter" : "Filtro de prueba",
+    "groups found" : "grupos encontrados",
+    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
+    "LDAP Username:" : "Nombre de usuario LDAP:",
+    "LDAP Email Address:" : "Dirección e-mail LDAP:",
+    "Other Attributes:" : "Otros atributos:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor:",
+    "Add Server Configuration" : "Agregar configuracion del servidor",
+    "Delete Configuration" : "Borrar Configuración",
+    "Host" : "Servidor",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
+    "Port" : "Puerto",
+    "User DN" : "DN usuario",
+    "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." : "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos.",
+    "Password" : "Contraseña",
+    "For anonymous access, leave DN and Password empty." : "Para acceso anónimo, deje DN y contraseña vacíos.",
+    "One Base DN per line" : "Un DN Base por línea",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automaticas al LDAP. Mejor para grandes configuraciones, pero requiere algun conocimiento de LDAP",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
+    "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
+    "users found" : "usuarios encontrados",
+    "Saving" : "Guardando",
+    "Back" : "Atrás",
+    "Continue" : "Continuar",
+    "Expert" : "Experto",
+    "Advanced" : "Avanzado",
+    "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
+    "Connection Settings" : "Configuración de conexión",
+    "Configuration Active" : "Configuracion activa",
+    "When unchecked, this configuration will be skipped." : "Cuando deseleccione, esta configuracion sera omitida.",
+    "Backup (Replica) Host" : "Servidor de copia de seguridad (Replica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
+    "Backup (Replica) Port" : "Puerto para copias de seguridad (Replica)",
+    "Disable Main Server" : "Deshabilitar servidor principal",
+    "Only connect to the replica server." : "Conectar sólo con el servidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
+    "Turn off SSL certificate validation." : "Apagar la validación por certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.",
+    "Cache Time-To-Live" : "Cache TTL",
+    "in seconds. A change empties the cache." : "en segundos. Un cambio vacía la caché.",
+    "Directory Settings" : "Configuracion de directorio",
+    "User Display Name Field" : "Campo de nombre de usuario a mostrar",
+    "The LDAP attribute to use to generate the user's display name." : "El campo LDAP a usar para generar el nombre para mostrar del usuario.",
+    "Base User Tree" : "Árbol base de usuario",
+    "One User Base DN per line" : "Un DN Base de Usuario por línea",
+    "User Search Attributes" : "Atributos de la busqueda de usuario",
+    "Optional; one attribute per line" : "Opcional; un atributo por linea",
+    "Group Display Name Field" : "Campo de nombre de grupo a mostrar",
+    "The LDAP attribute to use to generate the groups's display name." : "El campo LDAP a usar para generar el nombre para mostrar del grupo.",
+    "Base Group Tree" : "Árbol base de grupo",
+    "One Group Base DN per line" : "Un DN Base de Grupo por línea",
+    "Group Search Attributes" : "Atributos de busqueda de grupo",
+    "Group-Member association" : "Asociación Grupo-Miembro",
+    "Nested Groups" : "Grupos anidados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Cuando se active, se permitirán grupos que contenga otros grupos (solo funciona si el atributo de miembro de grupo contiene DNs).",
+    "Paging chunksize" : "Tamaño de los fragmentos de paginación",
+    "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.)" : "Tamaño de los fragmentos usado para búsquedas LDAP paginadas que pueden devolver resultados voluminosos, como enumeración de usuarios o de grupos. (Si se establece en 0, se deshabilitan las búsquedas LDAP paginadas en esas situaciones.)",
+    "Special Attributes" : "Atributos especiales",
+    "Quota Field" : "Cuota",
+    "Quota Default" : "Cuota por defecto",
+    "in bytes" : "en bytes",
+    "Email Field" : "E-mail",
+    "User Home Folder Naming Rule" : "Regla para la carpeta Home de usuario",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+    "Internal Username" : "Nombre de usuario interno",
+    "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." : "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.",
+    "Internal Username Attribute:" : "Atributo Nombre de usuario Interno:",
+    "Override UUID detection" : "Sobrescribir la detección 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." : "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
+    "UUID Attribute for Users:" : "Atributo UUID para usuarios:",
+    "UUID Attribute for Groups:" : "Atributo UUID para Grupos:",
+    "Username-LDAP User Mapping" : "Asignación del Nombre de usuario de un usuario LDAP",
+    "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." : "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
+    "Clear Username-LDAP User Mapping" : "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
new file mode 100644
index 00000000000..fc418992bd2
--- /dev/null
+++ b/apps/user_ldap/l10n/es.json
@@ -0,0 +1,130 @@
+{ "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 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 Enlace. 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, busque en el log para más detalles.",
+    "No action specified" : "No se ha especificado la acción",
+    "No configuration specified" : "No se ha especificado la configuración",
+    "No data specified" : "No se han especificado los datos",
+    " Could not set configuration %s" : "No se pudo establecer la configuración %s",
+    "Deletion failed" : "Falló el borrado",
+    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
+    "Keep settings?" : "¿Mantener la configuración?",
+    "{nthServer}. Server" : "{nthServer}. servidor",
+    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
+    "mappings cleared" : "Asignaciones borradas",
+    "Success" : "Éxito",
+    "Error" : "Error",
+    "Please specify a Base DN" : "Especifique un DN base",
+    "Could not determine Base DN" : "No se pudo determinar un DN base",
+    "Please specify the port" : "Especifique el puerto",
+    "Configuration OK" : "Configuración Correcta",
+    "Configuration incorrect" : "Configuración Incorrecta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Seleccionar la clase de objeto",
+    "Select attributes" : "Seleccionar atributos",
+    "Connection test succeeded" : "La prueba de conexión fue exitosa",
+    "Connection test failed" : "La prueba de conexión falló",
+    "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
+    "Confirm Deletion" : "Confirmar eliminación",
+    "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
+    "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
+    "Could not find the desired feature" : "No se puede encontrar la función deseada.",
+    "Invalid Host" : "Host inválido",
+    "Server" : "Servidor",
+    "User Filter" : "Filtro de usuario",
+    "Login Filter" : "Filtro de Login",
+    "Group Filter" : "Filtro de grupo",
+    "Save" : "Guardar",
+    "Test Configuration" : "Configuración de prueba",
+    "Help" : "Ayuda",
+    "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen estos criterios están disponibles en %s:",
+    "only those object classes:" : "solamente de estas clases de objeto:",
+    "only from those groups:" : "solamente de estos grupos:",
+    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
+    "Raw LDAP filter" : "Filtro LDAP en bruto",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
+    "Test Filter" : "Filtro de prueba",
+    "groups found" : "grupos encontrados",
+    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
+    "LDAP Username:" : "Nombre de usuario LDAP:",
+    "LDAP Email Address:" : "Dirección e-mail LDAP:",
+    "Other Attributes:" : "Otros atributos:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor:",
+    "Add Server Configuration" : "Agregar configuracion del servidor",
+    "Delete Configuration" : "Borrar Configuración",
+    "Host" : "Servidor",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
+    "Port" : "Puerto",
+    "User DN" : "DN usuario",
+    "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." : "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos.",
+    "Password" : "Contraseña",
+    "For anonymous access, leave DN and Password empty." : "Para acceso anónimo, deje DN y contraseña vacíos.",
+    "One Base DN per line" : "Un DN Base por línea",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automaticas al LDAP. Mejor para grandes configuraciones, pero requiere algun conocimiento de LDAP",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
+    "Limit %s access to users meeting these criteria:" : "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
+    "users found" : "usuarios encontrados",
+    "Saving" : "Guardando",
+    "Back" : "Atrás",
+    "Continue" : "Continuar",
+    "Expert" : "Experto",
+    "Advanced" : "Avanzado",
+    "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
+    "Connection Settings" : "Configuración de conexión",
+    "Configuration Active" : "Configuracion activa",
+    "When unchecked, this configuration will be skipped." : "Cuando deseleccione, esta configuracion sera omitida.",
+    "Backup (Replica) Host" : "Servidor de copia de seguridad (Replica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
+    "Backup (Replica) Port" : "Puerto para copias de seguridad (Replica)",
+    "Disable Main Server" : "Deshabilitar servidor principal",
+    "Only connect to the replica server." : "Conectar sólo con el servidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
+    "Turn off SSL certificate validation." : "Apagar la validación por certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.",
+    "Cache Time-To-Live" : "Cache TTL",
+    "in seconds. A change empties the cache." : "en segundos. Un cambio vacía la caché.",
+    "Directory Settings" : "Configuracion de directorio",
+    "User Display Name Field" : "Campo de nombre de usuario a mostrar",
+    "The LDAP attribute to use to generate the user's display name." : "El campo LDAP a usar para generar el nombre para mostrar del usuario.",
+    "Base User Tree" : "Árbol base de usuario",
+    "One User Base DN per line" : "Un DN Base de Usuario por línea",
+    "User Search Attributes" : "Atributos de la busqueda de usuario",
+    "Optional; one attribute per line" : "Opcional; un atributo por linea",
+    "Group Display Name Field" : "Campo de nombre de grupo a mostrar",
+    "The LDAP attribute to use to generate the groups's display name." : "El campo LDAP a usar para generar el nombre para mostrar del grupo.",
+    "Base Group Tree" : "Árbol base de grupo",
+    "One Group Base DN per line" : "Un DN Base de Grupo por línea",
+    "Group Search Attributes" : "Atributos de busqueda de grupo",
+    "Group-Member association" : "Asociación Grupo-Miembro",
+    "Nested Groups" : "Grupos anidados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Cuando se active, se permitirán grupos que contenga otros grupos (solo funciona si el atributo de miembro de grupo contiene DNs).",
+    "Paging chunksize" : "Tamaño de los fragmentos de paginación",
+    "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.)" : "Tamaño de los fragmentos usado para búsquedas LDAP paginadas que pueden devolver resultados voluminosos, como enumeración de usuarios o de grupos. (Si se establece en 0, se deshabilitan las búsquedas LDAP paginadas en esas situaciones.)",
+    "Special Attributes" : "Atributos especiales",
+    "Quota Field" : "Cuota",
+    "Quota Default" : "Cuota por defecto",
+    "in bytes" : "en bytes",
+    "Email Field" : "E-mail",
+    "User Home Folder Naming Rule" : "Regla para la carpeta Home de usuario",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+    "Internal Username" : "Nombre de usuario interno",
+    "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." : "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.",
+    "Internal Username Attribute:" : "Atributo Nombre de usuario Interno:",
+    "Override UUID detection" : "Sobrescribir la detección 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." : "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
+    "UUID Attribute for Users:" : "Atributo UUID para usuarios:",
+    "UUID Attribute for Groups:" : "Atributo UUID para Grupos:",
+    "Username-LDAP User Mapping" : "Asignación del Nombre de usuario de un usuario LDAP",
+    "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." : "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
+    "Clear Username-LDAP User Mapping" : "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
deleted file mode 100644
index f85c1a67283..00000000000
--- a/apps/user_ldap/l10n/es.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 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 Enlace. 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, busque en el log para más detalles.",
-"No action specified" => "No se ha especificado la acción",
-"No configuration specified" => "No se ha especificado la configuración",
-"No data specified" => "No se han especificado los datos",
-" Could not set configuration %s" => "No se pudo establecer la configuración %s",
-"Deletion failed" => "Falló el borrado",
-"Take over settings from recent server configuration?" => "¿Asumir los ajustes actuales de la configuración del servidor?",
-"Keep settings?" => "¿Mantener la configuración?",
-"{nthServer}. Server" => "{nthServer}. servidor",
-"Cannot add server configuration" => "No se puede añadir la configuración del servidor",
-"mappings cleared" => "Asignaciones borradas",
-"Success" => "Éxito",
-"Error" => "Error",
-"Please specify a Base DN" => "Especifique un DN base",
-"Could not determine Base DN" => "No se pudo determinar un DN base",
-"Please specify the port" => "Especifique el puerto",
-"Configuration OK" => "Configuración Correcta",
-"Configuration incorrect" => "Configuración Incorrecta",
-"Configuration incomplete" => "Configuración incompleta",
-"Select groups" => "Seleccionar grupos",
-"Select object classes" => "Seleccionar la clase de objeto",
-"Select attributes" => "Seleccionar atributos",
-"Connection test succeeded" => "La prueba de conexión fue exitosa",
-"Connection test failed" => "La prueba de conexión falló",
-"Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
-"Confirm Deletion" => "Confirmar eliminación",
-"_%s group found_::_%s groups found_" => array("Grupo %s encontrado","Grupos %s encontrados"),
-"_%s user found_::_%s users found_" => array("Usuario %s encontrado","Usuarios %s encontrados"),
-"Could not find the desired feature" => "No se puede encontrar la función deseada.",
-"Invalid Host" => "Host inválido",
-"Server" => "Servidor",
-"User Filter" => "Filtro de usuario",
-"Login Filter" => "Filtro de Login",
-"Group Filter" => "Filtro de grupo",
-"Save" => "Guardar",
-"Test Configuration" => "Configuración de prueba",
-"Help" => "Ayuda",
-"Groups meeting these criteria are available in %s:" => "Los grupos que cumplen estos criterios están disponibles en %s:",
-"only those object classes:" => "solamente de estas clases de objeto:",
-"only from those groups:" => "solamente de estos grupos:",
-"Edit raw filter instead" => "Editar el filtro en bruto en su lugar",
-"Raw LDAP filter" => "Filtro LDAP en bruto",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "El filtro especifica que grupos LDAP tendrán acceso a %s.",
-"Test Filter" => "Filtro de prueba",
-"groups found" => "grupos encontrados",
-"Users login with this attribute:" => "Los usuarios inician sesión con este atributo:",
-"LDAP Username:" => "Nombre de usuario LDAP:",
-"LDAP Email Address:" => "Dirección e-mail LDAP:",
-"Other Attributes:" => "Otros atributos:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-"1. Server" => "1. Servidor",
-"%s. Server:" => "%s. Servidor:",
-"Add Server Configuration" => "Agregar configuracion del servidor",
-"Delete Configuration" => "Borrar Configuración",
-"Host" => "Servidor",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
-"Port" => "Puerto",
-"User DN" => "DN usuario",
-"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." => "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos.",
-"Password" => "Contraseña",
-"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
-"One Base DN per line" => "Un DN Base por línea",
-"You can specify Base DN for users and groups in the Advanced tab" => "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Evita peticiones automaticas al LDAP. Mejor para grandes configuraciones, pero requiere algun conocimiento de LDAP",
-"Manually enter LDAP filters (recommended for large directories)" => "Ingrese manualmente los filtros LDAP (Recomendado para grandes directorios)",
-"Limit %s access to users meeting these criteria:" => "Limitar el acceso a %s a los usuarios que cumplan estos criterios:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-"users found" => "usuarios encontrados",
-"Saving" => "Guardando",
-"Back" => "Atrás",
-"Continue" => "Continuar",
-"Expert" => "Experto",
-"Advanced" => "Avanzado",
-"<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
-"Connection Settings" => "Configuración de conexión",
-"Configuration Active" => "Configuracion activa",
-"When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
-"Backup (Replica) Host" => "Servidor de copia de seguridad (Replica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
-"Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)",
-"Disable Main Server" => "Deshabilitar servidor principal",
-"Only connect to the replica server." => "Conectar sólo con el servidor de réplica.",
-"Case insensitive LDAP server (Windows)" => "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
-"Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.",
-"Cache Time-To-Live" => "Cache TTL",
-"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.",
-"Directory Settings" => "Configuracion de directorio",
-"User Display Name Field" => "Campo de nombre de usuario a mostrar",
-"The LDAP attribute to use to generate the user's display name." => "El campo LDAP a usar para generar el nombre para mostrar del usuario.",
-"Base User Tree" => "Árbol base de usuario",
-"One User Base DN per line" => "Un DN Base de Usuario por línea",
-"User Search Attributes" => "Atributos de la busqueda de usuario",
-"Optional; one attribute per line" => "Opcional; un atributo por linea",
-"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
-"The LDAP attribute to use to generate the groups's display name." => "El campo LDAP a usar para generar el nombre para mostrar del grupo.",
-"Base Group Tree" => "Árbol base de grupo",
-"One Group Base DN per line" => "Un DN Base de Grupo por línea",
-"Group Search Attributes" => "Atributos de busqueda de grupo",
-"Group-Member association" => "Asociación Grupo-Miembro",
-"Nested Groups" => "Grupos anidados",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Cuando se active, se permitirán grupos que contenga otros grupos (solo funciona si el atributo de miembro de grupo contiene DNs).",
-"Paging chunksize" => "Tamaño de los fragmentos de paginación",
-"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.)" => "Tamaño de los fragmentos usado para búsquedas LDAP paginadas que pueden devolver resultados voluminosos, como enumeración de usuarios o de grupos. (Si se establece en 0, se deshabilitan las búsquedas LDAP paginadas en esas situaciones.)",
-"Special Attributes" => "Atributos especiales",
-"Quota Field" => "Cuota",
-"Quota Default" => "Cuota por defecto",
-"in bytes" => "en bytes",
-"Email Field" => "E-mail",
-"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
-"Internal Username" => "Nombre de usuario interno",
-"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." => "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.",
-"Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
-"Override UUID detection" => "Sobrescribir la detección 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." => "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
-"UUID Attribute for Users:" => "Atributo UUID para usuarios:",
-"UUID Attribute for Groups:" => "Atributo UUID para Grupos:",
-"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
-"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." => "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
-"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_AR.js b/apps/user_ldap/l10n/es_AR.js
new file mode 100644
index 00000000000..e563a76153a
--- /dev/null
+++ b/apps/user_ldap/l10n/es_AR.js
@@ -0,0 +1,116 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Hubo un error al borrar las asignaciones.",
+    "Failed to delete the server configuration" : "Fallo al borrar la configuración del servidor",
+    "The configuration is valid and the connection could be established!" : "La configuración es válida y la conexión pudo ser establecida.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero el enlace falló. Por favor, comprobá 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 es inválida. Por favor, verifique los logs para más detalles.",
+    "No action specified" : "No se ha especificado una acción",
+    "No configuration specified" : "No se ha especificado una configuración",
+    "No data specified" : "No se ha especificado datos",
+    " Could not set configuration %s" : "No se pudo asignar la configuración %s",
+    "Deletion failed" : "Error al borrar",
+    "Take over settings from recent server configuration?" : "Tomar los valores de la anterior configuración de servidor?",
+    "Keep settings?" : "¿Mantener preferencias?",
+    "Cannot add server configuration" : "No se pudo añadir la configuración del servidor",
+    "mappings cleared" : "Asignaciones borradas",
+    "Success" : "Éxito",
+    "Error" : "Error",
+    "Configuration OK" : "Configuración válida",
+    "Configuration incorrect" : "Configuración incorrecta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Seleccionar las clases de objetos",
+    "Select attributes" : "Seleccionar atributos",
+    "Connection test succeeded" : "El este de conexión ha sido completado satisfactoriamente",
+    "Connection test failed" : "Falló es test de conexión",
+    "Do you really want to delete the current Server Configuration?" : "¿Realmente desea borrar la configuración actual del servidor?",
+    "Confirm Deletion" : "Confirmar borrado",
+    "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
+    "_%s user found_::_%s users found_" : ["%s usuario encontrado","%s usuarios encontrados"],
+    "Could not find the desired feature" : "No se pudo encontrar la característica deseada",
+    "Invalid Host" : "Host inválido",
+    "Group Filter" : "Filtro de grupo",
+    "Save" : "Guardar",
+    "Test Configuration" : "Probar configuración",
+    "Help" : "Ayuda",
+    "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen con estos criterios están disponibles en %s:",
+    "only those object classes:" : "solo estos objetos de clases:",
+    "only from those groups:" : "solo provenientes de estos grupos:",
+    "Edit raw filter instead" : "Editar filtro en bruto",
+    "Raw LDAP filter" : "Filtro LDAP en bruto",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s.",
+    "groups found" : "grupos encontrados",
+    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
+    "LDAP Username:" : "Nombre de usuario LDAP:",
+    "LDAP Email Address:" : "Correo electrónico LDAP:",
+    "Other Attributes:" : "Otros atributos:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
+    "Add Server Configuration" : "Añadir Configuración del Servidor",
+    "Host" : "Servidor",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
+    "Port" : "Puerto",
+    "User DN" : "DN usuario",
+    "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." : "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos.",
+    "Password" : "Contraseña",
+    "For anonymous access, leave DN and Password empty." : "Para acceso anónimo, dejá DN y contraseña vacíos.",
+    "One Base DN per line" : "Una DN base por línea",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
+    "Limit %s access to users meeting these criteria:" : "Limitar acceso %s a los usuarios que cumplen con este criterio:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.",
+    "users found" : "usuarios encontrados",
+    "Back" : "Volver",
+    "Continue" : "Continuar",
+    "Advanced" : "Avanzado",
+    "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.",
+    "Connection Settings" : "Configuración de Conección",
+    "Configuration Active" : "Configuración activa",
+    "When unchecked, this configuration will be skipped." : "Si no está seleccionada, esta configuración será omitida.",
+    "Backup (Replica) Host" : "Host para copia de seguridad (réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD.",
+    "Backup (Replica) Port" : "Puerto para copia de seguridad (réplica)",
+    "Disable Main Server" : "Deshabilitar el Servidor Principal",
+    "Only connect to the replica server." : "Conectarse únicamente al servidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
+    "Turn off SSL certificate validation." : "Desactivar la validación por certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.",
+    "Cache Time-To-Live" : "Tiempo de vida del caché",
+    "in seconds. A change empties the cache." : "en segundos. Cambiarlo vacía la cache.",
+    "Directory Settings" : "Configuración de Directorio",
+    "User Display Name Field" : "Campo de nombre de usuario a mostrar",
+    "The LDAP attribute to use to generate the user's display name." : "El atributo LDAP a usar para generar el nombre de usuario mostrado.",
+    "Base User Tree" : "Árbol base de usuario",
+    "One User Base DN per line" : "Una DN base de usuario por línea",
+    "User Search Attributes" : "Atributos de la búsqueda de usuario",
+    "Optional; one attribute per line" : "Opcional; un atributo por linea",
+    "Group Display Name Field" : "Campo de nombre de grupo a mostrar",
+    "The LDAP attribute to use to generate the groups's display name." : "El atributo LDAP a usar para generar el nombre de grupo mostrado.",
+    "Base Group Tree" : "Árbol base de grupo",
+    "One Group Base DN per line" : "Una DN base de grupo por línea",
+    "Group Search Attributes" : "Atributos de búsqueda de grupo",
+    "Group-Member association" : "Asociación Grupo-Miembro",
+    "Nested Groups" : "Grupos Anidados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Cuando se activa, grupos que contienen grupos son soportados. (Solo funciona si el atributo de miembro del grupo contiene DNs)",
+    "Paging chunksize" : "Tamaño del fragmento de paginación",
+    "Special Attributes" : "Atributos Especiales",
+    "Quota Field" : "Campo de cuota",
+    "Quota Default" : "Cuota por defecto",
+    "in bytes" : "en bytes",
+    "Email Field" : "Campo de e-mail",
+    "User Home Folder Naming Rule" : "Regla de nombre de los directorios de usuario",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
+    "Internal Username" : "Nombre interno de usuario",
+    "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." : "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento  por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados).",
+    "Internal Username Attribute:" : "Atributo Nombre Interno de usuario:",
+    "Override UUID detection" : "Sobrescribir la detección 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." : "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados).",
+    "UUID Attribute for Users:" : "Atributo UUID para usuarios:",
+    "UUID Attribute for Groups:" : "Atributo UUID para grupos:",
+    "Username-LDAP User Mapping" : "Asignación del Nombre de usuario de un usuario LDAP",
+    "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." : "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental.",
+    "Clear Username-LDAP User Mapping" : "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_AR.json b/apps/user_ldap/l10n/es_AR.json
new file mode 100644
index 00000000000..7cc3ed556fd
--- /dev/null
+++ b/apps/user_ldap/l10n/es_AR.json
@@ -0,0 +1,114 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Hubo un error al borrar las asignaciones.",
+    "Failed to delete the server configuration" : "Fallo al borrar la configuración del servidor",
+    "The configuration is valid and the connection could be established!" : "La configuración es válida y la conexión pudo ser establecida.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuración es válida, pero el enlace falló. Por favor, comprobá 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 es inválida. Por favor, verifique los logs para más detalles.",
+    "No action specified" : "No se ha especificado una acción",
+    "No configuration specified" : "No se ha especificado una configuración",
+    "No data specified" : "No se ha especificado datos",
+    " Could not set configuration %s" : "No se pudo asignar la configuración %s",
+    "Deletion failed" : "Error al borrar",
+    "Take over settings from recent server configuration?" : "Tomar los valores de la anterior configuración de servidor?",
+    "Keep settings?" : "¿Mantener preferencias?",
+    "Cannot add server configuration" : "No se pudo añadir la configuración del servidor",
+    "mappings cleared" : "Asignaciones borradas",
+    "Success" : "Éxito",
+    "Error" : "Error",
+    "Configuration OK" : "Configuración válida",
+    "Configuration incorrect" : "Configuración incorrecta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Seleccionar las clases de objetos",
+    "Select attributes" : "Seleccionar atributos",
+    "Connection test succeeded" : "El este de conexión ha sido completado satisfactoriamente",
+    "Connection test failed" : "Falló es test de conexión",
+    "Do you really want to delete the current Server Configuration?" : "¿Realmente desea borrar la configuración actual del servidor?",
+    "Confirm Deletion" : "Confirmar borrado",
+    "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
+    "_%s user found_::_%s users found_" : ["%s usuario encontrado","%s usuarios encontrados"],
+    "Could not find the desired feature" : "No se pudo encontrar la característica deseada",
+    "Invalid Host" : "Host inválido",
+    "Group Filter" : "Filtro de grupo",
+    "Save" : "Guardar",
+    "Test Configuration" : "Probar configuración",
+    "Help" : "Ayuda",
+    "Groups meeting these criteria are available in %s:" : "Los grupos que cumplen con estos criterios están disponibles en %s:",
+    "only those object classes:" : "solo estos objetos de clases:",
+    "only from those groups:" : "solo provenientes de estos grupos:",
+    "Edit raw filter instead" : "Editar filtro en bruto",
+    "Raw LDAP filter" : "Filtro LDAP en bruto",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s.",
+    "groups found" : "grupos encontrados",
+    "Users login with this attribute:" : "Los usuarios inician sesión con este atributo:",
+    "LDAP Username:" : "Nombre de usuario LDAP:",
+    "LDAP Email Address:" : "Correo electrónico LDAP:",
+    "Other Attributes:" : "Otros atributos:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
+    "Add Server Configuration" : "Añadir Configuración del Servidor",
+    "Host" : "Servidor",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
+    "Port" : "Puerto",
+    "User DN" : "DN usuario",
+    "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." : "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos.",
+    "Password" : "Contraseña",
+    "For anonymous access, leave DN and Password empty." : "Para acceso anónimo, dejá DN y contraseña vacíos.",
+    "One Base DN per line" : "Una DN base por línea",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
+    "Limit %s access to users meeting these criteria:" : "Limitar acceso %s a los usuarios que cumplen con este criterio:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.",
+    "users found" : "usuarios encontrados",
+    "Back" : "Volver",
+    "Continue" : "Continuar",
+    "Advanced" : "Avanzado",
+    "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.",
+    "Connection Settings" : "Configuración de Conección",
+    "Configuration Active" : "Configuración activa",
+    "When unchecked, this configuration will be skipped." : "Si no está seleccionada, esta configuración será omitida.",
+    "Backup (Replica) Host" : "Host para copia de seguridad (réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD.",
+    "Backup (Replica) Port" : "Puerto para copia de seguridad (réplica)",
+    "Disable Main Server" : "Deshabilitar el Servidor Principal",
+    "Only connect to the replica server." : "Conectarse únicamente al servidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
+    "Turn off SSL certificate validation." : "Desactivar la validación por certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.",
+    "Cache Time-To-Live" : "Tiempo de vida del caché",
+    "in seconds. A change empties the cache." : "en segundos. Cambiarlo vacía la cache.",
+    "Directory Settings" : "Configuración de Directorio",
+    "User Display Name Field" : "Campo de nombre de usuario a mostrar",
+    "The LDAP attribute to use to generate the user's display name." : "El atributo LDAP a usar para generar el nombre de usuario mostrado.",
+    "Base User Tree" : "Árbol base de usuario",
+    "One User Base DN per line" : "Una DN base de usuario por línea",
+    "User Search Attributes" : "Atributos de la búsqueda de usuario",
+    "Optional; one attribute per line" : "Opcional; un atributo por linea",
+    "Group Display Name Field" : "Campo de nombre de grupo a mostrar",
+    "The LDAP attribute to use to generate the groups's display name." : "El atributo LDAP a usar para generar el nombre de grupo mostrado.",
+    "Base Group Tree" : "Árbol base de grupo",
+    "One Group Base DN per line" : "Una DN base de grupo por línea",
+    "Group Search Attributes" : "Atributos de búsqueda de grupo",
+    "Group-Member association" : "Asociación Grupo-Miembro",
+    "Nested Groups" : "Grupos Anidados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Cuando se activa, grupos que contienen grupos son soportados. (Solo funciona si el atributo de miembro del grupo contiene DNs)",
+    "Paging chunksize" : "Tamaño del fragmento de paginación",
+    "Special Attributes" : "Atributos Especiales",
+    "Quota Field" : "Campo de cuota",
+    "Quota Default" : "Cuota por defecto",
+    "in bytes" : "en bytes",
+    "Email Field" : "Campo de e-mail",
+    "User Home Folder Naming Rule" : "Regla de nombre de los directorios de usuario",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
+    "Internal Username" : "Nombre interno de usuario",
+    "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." : "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento  por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados).",
+    "Internal Username Attribute:" : "Atributo Nombre Interno de usuario:",
+    "Override UUID detection" : "Sobrescribir la detección 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." : "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados).",
+    "UUID Attribute for Users:" : "Atributo UUID para usuarios:",
+    "UUID Attribute for Groups:" : "Atributo UUID para grupos:",
+    "Username-LDAP User Mapping" : "Asignación del Nombre de usuario de un usuario LDAP",
+    "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." : "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental.",
+    "Clear Username-LDAP User Mapping" : "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_AR.php b/apps/user_ldap/l10n/es_AR.php
deleted file mode 100644
index 105199574e5..00000000000
--- a/apps/user_ldap/l10n/es_AR.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Hubo un error al borrar las asignaciones.",
-"Failed to delete the server configuration" => "Fallo al borrar la configuración del servidor",
-"The configuration is valid and the connection could be established!" => "La configuración es válida y la conexión pudo ser establecida.",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuración es válida, pero el enlace falló. Por favor, comprobá 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 es inválida. Por favor, verifique los logs para más detalles.",
-"No action specified" => "No se ha especificado una acción",
-"No configuration specified" => "No se ha especificado una configuración",
-"No data specified" => "No se ha especificado datos",
-" Could not set configuration %s" => "No se pudo asignar la configuración %s",
-"Deletion failed" => "Error al borrar",
-"Take over settings from recent server configuration?" => "Tomar los valores de la anterior configuración de servidor?",
-"Keep settings?" => "¿Mantener preferencias?",
-"Cannot add server configuration" => "No se pudo añadir la configuración del servidor",
-"mappings cleared" => "Asignaciones borradas",
-"Success" => "Éxito",
-"Error" => "Error",
-"Configuration OK" => "Configuración válida",
-"Configuration incorrect" => "Configuración incorrecta",
-"Configuration incomplete" => "Configuración incompleta",
-"Select groups" => "Seleccionar grupos",
-"Select object classes" => "Seleccionar las clases de objetos",
-"Select attributes" => "Seleccionar atributos",
-"Connection test succeeded" => "El este de conexión ha sido completado satisfactoriamente",
-"Connection test failed" => "Falló es test de conexión",
-"Do you really want to delete the current Server Configuration?" => "¿Realmente desea borrar la configuración actual del servidor?",
-"Confirm Deletion" => "Confirmar borrado",
-"_%s group found_::_%s groups found_" => array("%s grupo encontrado","%s grupos encontrados"),
-"_%s user found_::_%s users found_" => array("%s usuario encontrado","%s usuarios encontrados"),
-"Could not find the desired feature" => "No se pudo encontrar la característica deseada",
-"Invalid Host" => "Host inválido",
-"Group Filter" => "Filtro de grupo",
-"Save" => "Guardar",
-"Test Configuration" => "Probar configuración",
-"Help" => "Ayuda",
-"Groups meeting these criteria are available in %s:" => "Los grupos que cumplen con estos criterios están disponibles en %s:",
-"only those object classes:" => "solo estos objetos de clases:",
-"only from those groups:" => "solo provenientes de estos grupos:",
-"Edit raw filter instead" => "Editar filtro en bruto",
-"Raw LDAP filter" => "Filtro LDAP en bruto",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "El filtro especifica qué grupos LDAP deben tener acceso a la instancia %s.",
-"groups found" => "grupos encontrados",
-"Users login with this attribute:" => "Los usuarios inician sesión con este atributo:",
-"LDAP Username:" => "Nombre de usuario LDAP:",
-"LDAP Email Address:" => "Correo electrónico LDAP:",
-"Other Attributes:" => "Otros atributos:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta ingresar. %%uid remplaza el nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-"Add Server Configuration" => "Añadir Configuración del Servidor",
-"Host" => "Servidor",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://",
-"Port" => "Puerto",
-"User DN" => "DN usuario",
-"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." => "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, dejá DN y contraseña vacíos.",
-"Password" => "Contraseña",
-"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, dejá DN y contraseña vacíos.",
-"One Base DN per line" => "Una DN base por línea",
-"You can specify Base DN for users and groups in the Advanced tab" => "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\"",
-"Limit %s access to users meeting these criteria:" => "Limitar acceso %s a los usuarios que cumplen con este criterio:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "El filtro especifica cuáles usuarios LDAP deben tener acceso a la instancia %s.",
-"users found" => "usuarios encontrados",
-"Back" => "Volver",
-"Continue" => "Continuar",
-"Advanced" => "Avanzado",
-"<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede ser que experimentes comportamientos inesperados. Pedile al administrador que desactive uno de ellos.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atención:</b> El módulo PHP LDAP no está instalado, este elemento no va a funcionar. Por favor, pedile al administrador que lo instale.",
-"Connection Settings" => "Configuración de Conección",
-"Configuration Active" => "Configuración activa",
-"When unchecked, this configuration will be skipped." => "Si no está seleccionada, esta configuración será omitida.",
-"Backup (Replica) Host" => "Host para copia de seguridad (réplica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP/AD.",
-"Backup (Replica) Port" => "Puerto para copia de seguridad (réplica)",
-"Disable Main Server" => "Deshabilitar el Servidor Principal",
-"Only connect to the replica server." => "Conectarse únicamente al servidor de réplica.",
-"Case insensitive LDAP server (Windows)" => "Servidor de LDAP insensible a mayúsculas/minúsculas (Windows)",
-"Turn off SSL certificate validation." => "Desactivar la validación por certificado SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No es recomendado, ¡Usalo solamente para pruebas! Si la conexión únicamente funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor %s.",
-"Cache Time-To-Live" => "Tiempo de vida del caché",
-"in seconds. A change empties the cache." => "en segundos. Cambiarlo vacía la cache.",
-"Directory Settings" => "Configuración de Directorio",
-"User Display Name Field" => "Campo de nombre de usuario a mostrar",
-"The LDAP attribute to use to generate the user's display name." => "El atributo LDAP a usar para generar el nombre de usuario mostrado.",
-"Base User Tree" => "Árbol base de usuario",
-"One User Base DN per line" => "Una DN base de usuario por línea",
-"User Search Attributes" => "Atributos de la búsqueda de usuario",
-"Optional; one attribute per line" => "Opcional; un atributo por linea",
-"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
-"The LDAP attribute to use to generate the groups's display name." => "El atributo LDAP a usar para generar el nombre de grupo mostrado.",
-"Base Group Tree" => "Árbol base de grupo",
-"One Group Base DN per line" => "Una DN base de grupo por línea",
-"Group Search Attributes" => "Atributos de búsqueda de grupo",
-"Group-Member association" => "Asociación Grupo-Miembro",
-"Nested Groups" => "Grupos Anidados",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Cuando se activa, grupos que contienen grupos son soportados. (Solo funciona si el atributo de miembro del grupo contiene DNs)",
-"Paging chunksize" => "Tamaño del fragmento de paginación",
-"Special Attributes" => "Atributos Especiales",
-"Quota Field" => "Campo de cuota",
-"Quota Default" => "Cuota por defecto",
-"in bytes" => "en bytes",
-"Email Field" => "Campo de e-mail",
-"User Home Folder Naming Rule" => "Regla de nombre de los directorios de usuario",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD.",
-"Internal Username" => "Nombre interno de usuario",
-"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." => "Por defecto, el nombre de usuario interno es creado a partir del atributo UUID. Esto asegura que el nombre de usuario es único y no es necesaria una conversión de caracteres. El nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso colisiones, se agregará o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para el directorio personal del usuario en ownCloud. También es parte de las URLs remotas, por ejemplo, para los servicios *DAV. Con esta opción, se puede cambiar el comportamiento  por defecto. Para conseguir un comportamiento similar a versiones anteriores a ownCloud 5, ingresá el atributo del nombre mostrado en el campo siguiente. Dejalo vacío para el comportamiento por defecto. Los cambios solo tendrán efecto en los nuevos usuarios LDAP mapeados (agregados).",
-"Internal Username Attribute:" => "Atributo Nombre Interno de usuario:",
-"Override UUID detection" => "Sobrescribir la detección 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." => "Por defecto, el atributo UUID es detectado automáticamente. Este atributo es usado para identificar de manera certera usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no fue especificado otro comportamiento más arriba. Podés sobrescribir la configuración y pasar un atributo de tu elección. Tenés que asegurarte que el atributo de tu elección sea accesible por los usuarios y grupos y que sea único. Dejalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto sólo en los nuevos usuarios y grupos de LDAP mapeados (agregados).",
-"UUID Attribute for Users:" => "Atributo UUID para usuarios:",
-"UUID Attribute for Groups:" => "Atributo UUID para grupos:",
-"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
-"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." => "Los usuarios son usados para almacenar y asignar datos (metadatos). Con el fin de identificar de forma precisa y reconocer usuarios, a cada usuario de LDAP se será asignado un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es dejado en caché para reducir la interacción entre el LDAP, pero no es usado para la identificación. Si el DN cambia, los cambios van a ser aplicados. El nombre de usuario interno es usado en todos los lugares. Vaciar los mapeos, deja restos por todas partes. Vaciar los mapeos, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, solamente en fase de desarrollo o experimental.",
-"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_BO.js b/apps/user_ldap/l10n/es_BO.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/es_BO.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/es_BO.json
@@ -0,0 +1,5 @@
+{ "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.php b/apps/user_ldap/l10n/es_BO.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/es_BO.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_CL.js b/apps/user_ldap/l10n/es_CL.js
new file mode 100644
index 00000000000..98dec6f9f37
--- /dev/null
+++ b/apps/user_ldap/l10n/es_CL.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "Error",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Help" : "Ayuda",
+    "Password" : "Clave"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_CL.json b/apps/user_ldap/l10n/es_CL.json
new file mode 100644
index 00000000000..010b0dcfc5d
--- /dev/null
+++ b/apps/user_ldap/l10n/es_CL.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Error" : "Error",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Help" : "Ayuda",
+    "Password" : "Clave"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_CL.php b/apps/user_ldap/l10n/es_CL.php
deleted file mode 100644
index 2f9ce1cb498..00000000000
--- a/apps/user_ldap/l10n/es_CL.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Error",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Help" => "Ayuda",
-"Password" => "Clave"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_CO.js b/apps/user_ldap/l10n/es_CO.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/es_CO.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/es_CO.json
@@ -0,0 +1,5 @@
+{ "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.php b/apps/user_ldap/l10n/es_CO.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/es_CO.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_CR.js b/apps/user_ldap/l10n/es_CR.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/es_CR.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/es_CR.json
@@ -0,0 +1,5 @@
+{ "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.php b/apps/user_ldap/l10n/es_CR.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/es_CR.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_EC.js b/apps/user_ldap/l10n/es_EC.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/es_EC.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/es_EC.json
@@ -0,0 +1,5 @@
+{ "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.php b/apps/user_ldap/l10n/es_EC.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/es_EC.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_MX.js b/apps/user_ldap/l10n/es_MX.js
new file mode 100644
index 00000000000..30c32d5beca
--- /dev/null
+++ b/apps/user_ldap/l10n/es_MX.js
@@ -0,0 +1,108 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "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 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 Enlace. 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, busque en el log para más detalles.",
+    "No action specified" : "No se ha especificado la acción",
+    "No configuration specified" : "No se ha especificado la configuración",
+    "No data specified" : "No se han especificado los datos",
+    " Could not set configuration %s" : "No se pudo establecer la configuración %s",
+    "Deletion failed" : "Falló el borrado",
+    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
+    "Keep settings?" : "¿Mantener la configuración?",
+    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
+    "mappings cleared" : "Asignaciones borradas",
+    "Success" : "Éxito",
+    "Error" : "Error",
+    "Configuration OK" : "Configuración OK",
+    "Configuration incorrect" : "Configuración Incorrecta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Seleccionar la clase de objeto",
+    "Select attributes" : "Seleccionar atributos",
+    "Connection test succeeded" : "La prueba de conexión fue exitosa",
+    "Connection test failed" : "La prueba de conexión falló",
+    "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
+    "Confirm Deletion" : "Confirmar eliminación",
+    "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
+    "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
+    "Could not find the desired feature" : "No se puede encontrar la función deseada.",
+    "Invalid Host" : "Host inválido",
+    "Save" : "Guardar",
+    "Test Configuration" : "Configuración de prueba",
+    "Help" : "Ayuda",
+    "only those object classes:" : "solamente de estas clases de objeto:",
+    "only from those groups:" : "solamente de estos grupos:",
+    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
+    "Raw LDAP filter" : "Filtro LDAP en bruto",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
+    "groups found" : "grupos encontrados",
+    "LDAP Username:" : "Nombre de usuario LDAP:",
+    "LDAP Email Address:" : "Dirección e-mail LDAP:",
+    "Other Attributes:" : "Otros atributos:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
+    "Add Server Configuration" : "Agregar configuracion del servidor",
+    "Host" : "Servidor",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
+    "Port" : "Puerto",
+    "User DN" : "DN usuario",
+    "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." : "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos.",
+    "Password" : "Contraseña",
+    "For anonymous access, leave DN and Password empty." : "Para acceso anónimo, deje DN y contraseña vacíos.",
+    "One Base DN per line" : "Un DN Base por línea",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
+    "users found" : "usuarios encontrados",
+    "Back" : "Atrás",
+    "Continue" : "Continuar",
+    "Advanced" : "Avanzado",
+    "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
+    "Connection Settings" : "Configuración de conexión",
+    "Configuration Active" : "Configuracion activa",
+    "When unchecked, this configuration will be skipped." : "Cuando deseleccione, esta configuracion sera omitida.",
+    "Backup (Replica) Host" : "Servidor de copia de seguridad (Replica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
+    "Backup (Replica) Port" : "Puerto para copias de seguridad (Replica)",
+    "Disable Main Server" : "Deshabilitar servidor principal",
+    "Only connect to the replica server." : "Conectar sólo con el servidor de réplica.",
+    "Turn off SSL certificate validation." : "Apagar la validación por certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.",
+    "Cache Time-To-Live" : "Cache TTL",
+    "in seconds. A change empties the cache." : "en segundos. Un cambio vacía la caché.",
+    "Directory Settings" : "Configuración de directorio",
+    "User Display Name Field" : "Campo de nombre de usuario a mostrar",
+    "The LDAP attribute to use to generate the user's display name." : "El campo LDAP a usar para generar el nombre para mostrar del usuario.",
+    "Base User Tree" : "Árbol base de usuario",
+    "One User Base DN per line" : "Un DN Base de Usuario por línea",
+    "User Search Attributes" : "Atributos de la busqueda de usuario",
+    "Optional; one attribute per line" : "Opcional; un atributo por linea",
+    "Group Display Name Field" : "Campo de nombre de grupo a mostrar",
+    "The LDAP attribute to use to generate the groups's display name." : "El campo LDAP a usar para generar el nombre para mostrar del grupo.",
+    "Base Group Tree" : "Árbol base de grupo",
+    "One Group Base DN per line" : "Un DN Base de Grupo por línea",
+    "Group Search Attributes" : "Atributos de busqueda de grupo",
+    "Group-Member association" : "Asociación Grupo-Miembro",
+    "Special Attributes" : "Atributos especiales",
+    "Quota Field" : "Cuota",
+    "Quota Default" : "Cuota por defecto",
+    "in bytes" : "en bytes",
+    "Email Field" : "E-mail",
+    "User Home Folder Naming Rule" : "Regla para la carpeta Home de usuario",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+    "Internal Username" : "Nombre de usuario interno",
+    "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." : "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.",
+    "Internal Username Attribute:" : "Atributo Nombre de usuario Interno:",
+    "Override UUID detection" : "Sobrescribir la detección 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." : "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
+    "UUID Attribute for Users:" : "Atributo UUID para usuarios:",
+    "UUID Attribute for Groups:" : "Atributo UUID para Grupos:",
+    "Username-LDAP User Mapping" : "Asignación del Nombre de usuario de un usuario LDAP",
+    "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." : "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
+    "Clear Username-LDAP User Mapping" : "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/es_MX.json b/apps/user_ldap/l10n/es_MX.json
new file mode 100644
index 00000000000..bf9546306b3
--- /dev/null
+++ b/apps/user_ldap/l10n/es_MX.json
@@ -0,0 +1,106 @@
+{ "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 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 Enlace. 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, busque en el log para más detalles.",
+    "No action specified" : "No se ha especificado la acción",
+    "No configuration specified" : "No se ha especificado la configuración",
+    "No data specified" : "No se han especificado los datos",
+    " Could not set configuration %s" : "No se pudo establecer la configuración %s",
+    "Deletion failed" : "Falló el borrado",
+    "Take over settings from recent server configuration?" : "¿Asumir los ajustes actuales de la configuración del servidor?",
+    "Keep settings?" : "¿Mantener la configuración?",
+    "Cannot add server configuration" : "No se puede añadir la configuración del servidor",
+    "mappings cleared" : "Asignaciones borradas",
+    "Success" : "Éxito",
+    "Error" : "Error",
+    "Configuration OK" : "Configuración OK",
+    "Configuration incorrect" : "Configuración Incorrecta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Seleccionar la clase de objeto",
+    "Select attributes" : "Seleccionar atributos",
+    "Connection test succeeded" : "La prueba de conexión fue exitosa",
+    "Connection test failed" : "La prueba de conexión falló",
+    "Do you really want to delete the current Server Configuration?" : "¿Realmente desea eliminar la configuración actual del servidor?",
+    "Confirm Deletion" : "Confirmar eliminación",
+    "_%s group found_::_%s groups found_" : ["Grupo %s encontrado","Grupos %s encontrados"],
+    "_%s user found_::_%s users found_" : ["Usuario %s encontrado","Usuarios %s encontrados"],
+    "Could not find the desired feature" : "No se puede encontrar la función deseada.",
+    "Invalid Host" : "Host inválido",
+    "Save" : "Guardar",
+    "Test Configuration" : "Configuración de prueba",
+    "Help" : "Ayuda",
+    "only those object classes:" : "solamente de estas clases de objeto:",
+    "only from those groups:" : "solamente de estos grupos:",
+    "Edit raw filter instead" : "Editar el filtro en bruto en su lugar",
+    "Raw LDAP filter" : "Filtro LDAP en bruto",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtro especifica que grupos LDAP tendrán acceso a %s.",
+    "groups found" : "grupos encontrados",
+    "LDAP Username:" : "Nombre de usuario LDAP:",
+    "LDAP Email Address:" : "Dirección e-mail LDAP:",
+    "Other Attributes:" : "Otros atributos:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
+    "Add Server Configuration" : "Agregar configuracion del servidor",
+    "Host" : "Servidor",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
+    "Port" : "Puerto",
+    "User DN" : "DN usuario",
+    "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." : "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos.",
+    "Password" : "Contraseña",
+    "For anonymous access, leave DN and Password empty." : "Para acceso anónimo, deje DN y contraseña vacíos.",
+    "One Base DN per line" : "Un DN Base por línea",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
+    "users found" : "usuarios encontrados",
+    "Back" : "Atrás",
+    "Continue" : "Continuar",
+    "Advanced" : "Avanzado",
+    "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
+    "Connection Settings" : "Configuración de conexión",
+    "Configuration Active" : "Configuracion activa",
+    "When unchecked, this configuration will be skipped." : "Cuando deseleccione, esta configuracion sera omitida.",
+    "Backup (Replica) Host" : "Servidor de copia de seguridad (Replica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
+    "Backup (Replica) Port" : "Puerto para copias de seguridad (Replica)",
+    "Disable Main Server" : "Deshabilitar servidor principal",
+    "Only connect to the replica server." : "Conectar sólo con el servidor de réplica.",
+    "Turn off SSL certificate validation." : "Apagar la validación por certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.",
+    "Cache Time-To-Live" : "Cache TTL",
+    "in seconds. A change empties the cache." : "en segundos. Un cambio vacía la caché.",
+    "Directory Settings" : "Configuración de directorio",
+    "User Display Name Field" : "Campo de nombre de usuario a mostrar",
+    "The LDAP attribute to use to generate the user's display name." : "El campo LDAP a usar para generar el nombre para mostrar del usuario.",
+    "Base User Tree" : "Árbol base de usuario",
+    "One User Base DN per line" : "Un DN Base de Usuario por línea",
+    "User Search Attributes" : "Atributos de la busqueda de usuario",
+    "Optional; one attribute per line" : "Opcional; un atributo por linea",
+    "Group Display Name Field" : "Campo de nombre de grupo a mostrar",
+    "The LDAP attribute to use to generate the groups's display name." : "El campo LDAP a usar para generar el nombre para mostrar del grupo.",
+    "Base Group Tree" : "Árbol base de grupo",
+    "One Group Base DN per line" : "Un DN Base de Grupo por línea",
+    "Group Search Attributes" : "Atributos de busqueda de grupo",
+    "Group-Member association" : "Asociación Grupo-Miembro",
+    "Special Attributes" : "Atributos especiales",
+    "Quota Field" : "Cuota",
+    "Quota Default" : "Cuota por defecto",
+    "in bytes" : "en bytes",
+    "Email Field" : "E-mail",
+    "User Home Folder Naming Rule" : "Regla para la carpeta Home de usuario",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
+    "Internal Username" : "Nombre de usuario interno",
+    "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." : "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.",
+    "Internal Username Attribute:" : "Atributo Nombre de usuario Interno:",
+    "Override UUID detection" : "Sobrescribir la detección 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." : "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
+    "UUID Attribute for Users:" : "Atributo UUID para usuarios:",
+    "UUID Attribute for Groups:" : "Atributo UUID para Grupos:",
+    "Username-LDAP User Mapping" : "Asignación del Nombre de usuario de un usuario LDAP",
+    "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." : "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
+    "Clear Username-LDAP User Mapping" : "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/es_MX.php b/apps/user_ldap/l10n/es_MX.php
deleted file mode 100644
index f5e44c2da8d..00000000000
--- a/apps/user_ldap/l10n/es_MX.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 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 Enlace. 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, busque en el log para más detalles.",
-"No action specified" => "No se ha especificado la acción",
-"No configuration specified" => "No se ha especificado la configuración",
-"No data specified" => "No se han especificado los datos",
-" Could not set configuration %s" => "No se pudo establecer la configuración %s",
-"Deletion failed" => "Falló el borrado",
-"Take over settings from recent server configuration?" => "¿Asumir los ajustes actuales de la configuración del servidor?",
-"Keep settings?" => "¿Mantener la configuración?",
-"Cannot add server configuration" => "No se puede añadir la configuración del servidor",
-"mappings cleared" => "Asignaciones borradas",
-"Success" => "Éxito",
-"Error" => "Error",
-"Configuration OK" => "Configuración OK",
-"Configuration incorrect" => "Configuración Incorrecta",
-"Configuration incomplete" => "Configuración incompleta",
-"Select groups" => "Seleccionar grupos",
-"Select object classes" => "Seleccionar la clase de objeto",
-"Select attributes" => "Seleccionar atributos",
-"Connection test succeeded" => "La prueba de conexión fue exitosa",
-"Connection test failed" => "La prueba de conexión falló",
-"Do you really want to delete the current Server Configuration?" => "¿Realmente desea eliminar la configuración actual del servidor?",
-"Confirm Deletion" => "Confirmar eliminación",
-"_%s group found_::_%s groups found_" => array("Grupo %s encontrado","Grupos %s encontrados"),
-"_%s user found_::_%s users found_" => array("Usuario %s encontrado","Usuarios %s encontrados"),
-"Could not find the desired feature" => "No se puede encontrar la función deseada.",
-"Invalid Host" => "Host inválido",
-"Save" => "Guardar",
-"Test Configuration" => "Configuración de prueba",
-"Help" => "Ayuda",
-"only those object classes:" => "solamente de estas clases de objeto:",
-"only from those groups:" => "solamente de estos grupos:",
-"Edit raw filter instead" => "Editar el filtro en bruto en su lugar",
-"Raw LDAP filter" => "Filtro LDAP en bruto",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "El filtro especifica que grupos LDAP tendrán acceso a %s.",
-"groups found" => "grupos encontrados",
-"LDAP Username:" => "Nombre de usuario LDAP:",
-"LDAP Email Address:" => "Dirección e-mail LDAP:",
-"Other Attributes:" => "Otros atributos:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Define el filtro a aplicar cuando se intenta identificar. %%uid remplazará al nombre de usuario en el proceso de identificación. Por ejemplo: \"uid=%%uid\"",
-"Add Server Configuration" => "Agregar configuracion del servidor",
-"Host" => "Servidor",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
-"Port" => "Puerto",
-"User DN" => "DN usuario",
-"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." => "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos.",
-"Password" => "Contraseña",
-"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
-"One Base DN per line" => "Un DN Base por línea",
-"You can specify Base DN for users and groups in the Advanced tab" => "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
-"The filter specifies which LDAP users shall have access to the %s instance." => "El filtro especifica que usuarios LDAP pueden tener acceso a %s.",
-"users found" => "usuarios encontrados",
-"Back" => "Atrás",
-"Continue" => "Continuar",
-"Advanced" => "Avanzado",
-"<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Advertencia:</b> El módulo LDAP de PHP no está instalado, el sistema no funcionará. Por favor consulte al administrador del sistema para instalarlo.",
-"Connection Settings" => "Configuración de conexión",
-"Configuration Active" => "Configuracion activa",
-"When unchecked, this configuration will be skipped." => "Cuando deseleccione, esta configuracion sera omitida.",
-"Backup (Replica) Host" => "Servidor de copia de seguridad (Replica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dar un servidor de copia de seguridad opcional. Debe ser una réplica del servidor principal LDAP / AD.",
-"Backup (Replica) Port" => "Puerto para copias de seguridad (Replica)",
-"Disable Main Server" => "Deshabilitar servidor principal",
-"Only connect to the replica server." => "Conectar sólo con el servidor de réplica.",
-"Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "No se recomienda, ¡utilízalo únicamente para pruebas! Si la conexión únicamente funciona con esta opción, importa el certificado SSL del servidor LDAP en tu servidor %s.",
-"Cache Time-To-Live" => "Cache TTL",
-"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la caché.",
-"Directory Settings" => "Configuración de directorio",
-"User Display Name Field" => "Campo de nombre de usuario a mostrar",
-"The LDAP attribute to use to generate the user's display name." => "El campo LDAP a usar para generar el nombre para mostrar del usuario.",
-"Base User Tree" => "Árbol base de usuario",
-"One User Base DN per line" => "Un DN Base de Usuario por línea",
-"User Search Attributes" => "Atributos de la busqueda de usuario",
-"Optional; one attribute per line" => "Opcional; un atributo por linea",
-"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
-"The LDAP attribute to use to generate the groups's display name." => "El campo LDAP a usar para generar el nombre para mostrar del grupo.",
-"Base Group Tree" => "Árbol base de grupo",
-"One Group Base DN per line" => "Un DN Base de Grupo por línea",
-"Group Search Attributes" => "Atributos de busqueda de grupo",
-"Group-Member association" => "Asociación Grupo-Miembro",
-"Special Attributes" => "Atributos especiales",
-"Quota Field" => "Cuota",
-"Quota Default" => "Cuota por defecto",
-"in bytes" => "en bytes",
-"Email Field" => "E-mail",
-"User Home Folder Naming Rule" => "Regla para la carpeta Home de usuario",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
-"Internal Username" => "Nombre de usuario interno",
-"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." => "El nombre de usuario interno será creado de forma predeterminada desde el atributo UUID. Esto asegura que el nombre de usuario es único y los caracteres no necesitan ser convertidos. En el nombre de usuario interno sólo se pueden usar estos caracteres: [ a-zA-Z0-9_.@- ]. El resto de caracteres son sustituidos por su correspondiente en ASCII o simplemente omitidos. En caso de duplicidades, se añadirá o incrementará un número. El nombre de usuario interno es usado para identificar un usuario. Es también el nombre predeterminado para la carpeta personal del usuario en ownCloud. También es parte de URLs remotas, por ejemplo, para todos los servicios *DAV. Con esta configuración el comportamiento predeterminado puede ser cambiado. Para conseguir un comportamiento similar a como era antes de ownCloud 5, introduzca el campo del nombre para mostrar del usuario en la siguiente caja. Déjelo vacío para el comportamiento predeterminado. Los cambios solo tendrán efecto en los usuarios LDAP mapeados (añadidos) recientemente.",
-"Internal Username Attribute:" => "Atributo Nombre de usuario Interno:",
-"Override UUID detection" => "Sobrescribir la detección 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." => "Por defecto, el atributo UUID es autodetectado. Este atributo es usado para identificar indudablemente usuarios y grupos LDAP. Además, el nombre de usuario interno será creado en base al UUID, si no ha sido especificado otro comportamiento arriba. Puedes sobrescribir la configuración y pasar un atributo de tu elección. Debes asegurarte de que el atributo de tu elección sea accesible por los usuarios y grupos y ser único. Déjalo en blanco para usar el comportamiento por defecto. Los cambios tendrán efecto solo en los usuarios y grupos de LDAP mapeados (añadidos) recientemente.",
-"UUID Attribute for Users:" => "Atributo UUID para usuarios:",
-"UUID Attribute for Groups:" => "Atributo UUID para Grupos:",
-"Username-LDAP User Mapping" => "Asignación del Nombre de usuario de un usuario LDAP",
-"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." => "Los usuarios son usados para almacenar y asignar (meta) datos. Con el fin de identificar de forma precisa y reconocer usuarios, cada usuario de LDAP tendrá un nombre de usuario interno. Esto requiere un mapeo entre el nombre de usuario y el usuario del LDAP. El nombre de usuario creado es mapeado respecto al UUID del usuario en el LDAP. De forma adicional, el DN es cacheado para reducir la interacción entre el LDAP, pero no es usado para identificar. Si el DN cambia, los cambios serán aplicados. El nombre de usuario interno es usado por encima de todo. Limpiar los mapeos dejará restos por todas partes, no es sensible a configuración, ¡afecta a todas las configuraciones del LDAP! Nunca limpies los mapeos en un entorno de producción, únicamente en una fase de desarrollo o experimental.",
-"Clear Username-LDAP User Mapping" => "Borrar la asignación de los Nombres de usuario de los usuarios LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Borrar la asignación de los Nombres de grupo de los grupos de LDAP"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_PE.js b/apps/user_ldap/l10n/es_PE.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/es_PE.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/es_PE.json
@@ -0,0 +1,5 @@
+{ "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.php b/apps/user_ldap/l10n/es_PE.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/es_PE.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_PY.js b/apps/user_ldap/l10n/es_PY.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/es_PY.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/es_PY.json
@@ -0,0 +1,5 @@
+{ "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.php b/apps/user_ldap/l10n/es_PY.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/es_PY.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_US.js b/apps/user_ldap/l10n/es_US.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/es_US.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/es_US.json
@@ -0,0 +1,5 @@
+{ "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.php b/apps/user_ldap/l10n/es_US.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/es_US.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/es_UY.js b/apps/user_ldap/l10n/es_UY.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/es_UY.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/es_UY.json
@@ -0,0 +1,5 @@
+{ "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.php b/apps/user_ldap/l10n/es_UY.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/es_UY.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js
new file mode 100644
index 00000000000..7ff4b4564b3
--- /dev/null
+++ b/apps/user_ldap/l10n/et_EE.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Vastendususte puhastamine ebaõnnestus.",
+    "Failed to delete the server configuration" : "Serveri seadistuse kustutamine ebaõnnestus",
+    "The configuration is valid and the connection could be established!" : "Seadistus on korrektne ning ühendus on olemas!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Seadistus on korrektne, kuid ühendus ebaõnnestus. Palun kontrolli serveri seadeid ja ühenduseks kasutatavaid kasutajatunnuseid.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Seadistus on vigane. Lisainfot vaata palun logidest.",
+    "No action specified" : "Tegevusi pole määratletud",
+    "No configuration specified" : "Seadistust pole määratletud",
+    "No data specified" : "Andmeid pole määratletud",
+    " Could not set configuration %s" : "Ei suutnud seadistada %s",
+    "Deletion failed" : "Kustutamine ebaõnnestus",
+    "Take over settings from recent server configuration?" : "Võta sätted viimasest serveri seadistusest?",
+    "Keep settings?" : "Säilitada seadistused?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Ei suuda lisada serveri seadistust",
+    "mappings cleared" : "vastendused puhastatud",
+    "Success" : "Korras",
+    "Error" : "Viga",
+    "Please specify a Base DN" : "Palun määra baas DN",
+    "Could not determine Base DN" : "Baas DN-i tuvastamine ebaõnnestus",
+    "Please specify the port" : "Palun määra post",
+    "Configuration OK" : "Seadistus on korras",
+    "Configuration incorrect" : "Seadistus on vigane",
+    "Configuration incomplete" : "Seadistus on puudulik",
+    "Select groups" : "Vali grupid",
+    "Select object classes" : "Vali objekti klassid",
+    "Select attributes" : "Vali atribuudid",
+    "Connection test succeeded" : "Ühenduse testimine õnnestus",
+    "Connection test failed" : "Ühenduse testimine ebaõnnestus",
+    "Do you really want to delete the current Server Configuration?" : "Oled kindel, et tahad kustutada praegust serveri seadistust?",
+    "Confirm Deletion" : "Kinnita kustutamine",
+    "_%s group found_::_%s groups found_" : ["%s grupp leitud","%s gruppi leitud"],
+    "_%s user found_::_%s users found_" : ["%s kasutaja leitud","%s kasutajat leitud"],
+    "Could not find the desired feature" : "Ei suuda leida soovitud funktsioonaalsust",
+    "Invalid Host" : "Vigane server",
+    "Server" : "Server",
+    "User Filter" : "Kasutaja filter",
+    "Login Filter" : "Kasutajanime filter",
+    "Group Filter" : "Grupi filter",
+    "Save" : "Salvesta",
+    "Test Configuration" : "Testi seadistust",
+    "Help" : "Abiinfo",
+    "Groups meeting these criteria are available in %s:" : "Kriteeriumiga sobivad grupid on saadaval %s:",
+    "only those object classes:" : "ainult need objektiklassid:",
+    "only from those groups:" : "ainult nendest gruppidest:",
+    "Edit raw filter instead" : "Selle asemel muuda filtrit",
+    "Raw LDAP filter" : "LDAP filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
+    "Test Filter" : "Testi filtrit",
+    "groups found" : "gruppi leitud",
+    "Users login with this attribute:" : "Logimiseks kasutatkse atribuuti: ",
+    "LDAP Username:" : "LDAP kasutajanimi:",
+    "LDAP Email Address:" : "LDAP e-posti aadress:",
+    "Other Attributes:" : "Muud atribuudid:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Lisa serveri seadistus",
+    "Delete Configuration" : "Kustuta seadistused",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
+    "Port" : "Port",
+    "User DN" : "Kasutaja 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." : "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
+    "Password" : "Parool",
+    "For anonymous access, leave DN and Password empty." : "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
+    "One Base DN per line" : "Üks baas-DN rea kohta",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
+    "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
+    "users found" : "kasutajat leitud",
+    "Saving" : "Salvestamine",
+    "Back" : "Tagasi",
+    "Continue" : "Jätka",
+    "Expert" : "Ekspert",
+    "Advanced" : "Täpsem",
+    "<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>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada.",
+    "Connection Settings" : "Ühenduse seaded",
+    "Configuration Active" : "Seadistus aktiivne",
+    "When unchecked, this configuration will be skipped." : "Kui on märkimata, siis seadistust ei kasutata.",
+    "Backup (Replica) Host" : "Varuserver",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Lisa valikuline varuserver. See peab olema koopia peamisest LDAP/AD serverist.",
+    "Backup (Replica) Port" : "Varuserveri (replika) port",
+    "Disable Main Server" : "Ära kasuta peaserverit",
+    "Only connect to the replica server." : "Ühendu ainult replitseeriva serveriga.",
+    "Case insensitive LDAP server (Windows)" : "Tõusutundetu LDAP server (Windows)",
+    "Turn off SSL certificate validation." : "Lülita SSL sertifikaadi kontrollimine välja.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Pole soovitatav, kasuta seda ainult testimiseks! Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.",
+    "Cache Time-To-Live" : "Puhvri iga",
+    "in seconds. A change empties the cache." : "sekundites. Muudatus tühjendab vahemälu.",
+    "Directory Settings" : "Kausta seaded",
+    "User Display Name Field" : "Kasutaja näidatava nime väli",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP atribuut, mida kasutatakse kasutaja kuvatava nime loomiseks.",
+    "Base User Tree" : "Baaskasutaja puu",
+    "One User Base DN per line" : "Üks kasutaja baas-DN rea kohta",
+    "User Search Attributes" : "Kasutaja otsingu atribuudid",
+    "Optional; one attribute per line" : "Valikuline; üks atribuut rea kohta",
+    "Group Display Name Field" : "Grupi näidatava nime väli",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP atribuut, mida kasutatakse ownCloudi grupi kuvatava nime loomiseks.",
+    "Base Group Tree" : "Baasgrupi puu",
+    "One Group Base DN per line" : "Üks grupi baas-DN rea kohta",
+    "Group Search Attributes" : "Grupi otsingu atribuudid",
+    "Group-Member association" : "Grupiliikme seotus",
+    "Nested Groups" : "Sisegrupp",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Sisse lülitamisel on toetatakse gruppe sisaldavad gruppe. (Toimib, kui grupi liikme atribuut sisaldab DN-e.)",
+    "Paging chunksize" : "Kutsungi pataka suurus",
+    "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.)" : "Pataka suurust kasutatakse LDAPi kutsungite kaupa otsingute puhul, mis võivad väljastada pikki kasutajate või gruppide loetelusid. (Määrates suuruseks 0, keelatakse LDAP patakate kaupa otsing taolistes situatsioonides)",
+    "Special Attributes" : "Spetsiifilised atribuudid",
+    "Quota Field" : "Mahupiirangu atribuut",
+    "Quota Default" : "Vaikimisi mahupiirang",
+    "in bytes" : "baitides",
+    "Email Field" : "E-posti väli",
+    "User Home Folder Naming Rule" : "Kasutaja kodukataloogi nimetamise reegel",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
+    "Internal Username" : "Sisemine kasutajanimi",
+    "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." : "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, näiteks kõikidel *DAV teenustel. Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
+    "Internal Username Attribute:" : "Sisemise kasutajatunnuse atribuut:",
+    "Override UUID detection" : "Tühista UUID tuvastus",
+    "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." : "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
+    "UUID Attribute for Users:" : "UUID atribuut kasutajatele:",
+    "UUID Attribute for Groups:" : "UUID atribuut gruppidele:",
+    "Username-LDAP User Mapping" : "LDAP-Kasutajatunnus Kasutaja Vastendus",
+    "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." : "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
+    "Clear Username-LDAP User Mapping" : "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
+    "Clear Groupname-LDAP Group Mapping" : "Puhasta LDAP-Grupinimi Grupp Vastendus"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json
new file mode 100644
index 00000000000..41b5f73f575
--- /dev/null
+++ b/apps/user_ldap/l10n/et_EE.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Vastendususte puhastamine ebaõnnestus.",
+    "Failed to delete the server configuration" : "Serveri seadistuse kustutamine ebaõnnestus",
+    "The configuration is valid and the connection could be established!" : "Seadistus on korrektne ning ühendus on olemas!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Seadistus on korrektne, kuid ühendus ebaõnnestus. Palun kontrolli serveri seadeid ja ühenduseks kasutatavaid kasutajatunnuseid.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Seadistus on vigane. Lisainfot vaata palun logidest.",
+    "No action specified" : "Tegevusi pole määratletud",
+    "No configuration specified" : "Seadistust pole määratletud",
+    "No data specified" : "Andmeid pole määratletud",
+    " Could not set configuration %s" : "Ei suutnud seadistada %s",
+    "Deletion failed" : "Kustutamine ebaõnnestus",
+    "Take over settings from recent server configuration?" : "Võta sätted viimasest serveri seadistusest?",
+    "Keep settings?" : "Säilitada seadistused?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Ei suuda lisada serveri seadistust",
+    "mappings cleared" : "vastendused puhastatud",
+    "Success" : "Korras",
+    "Error" : "Viga",
+    "Please specify a Base DN" : "Palun määra baas DN",
+    "Could not determine Base DN" : "Baas DN-i tuvastamine ebaõnnestus",
+    "Please specify the port" : "Palun määra post",
+    "Configuration OK" : "Seadistus on korras",
+    "Configuration incorrect" : "Seadistus on vigane",
+    "Configuration incomplete" : "Seadistus on puudulik",
+    "Select groups" : "Vali grupid",
+    "Select object classes" : "Vali objekti klassid",
+    "Select attributes" : "Vali atribuudid",
+    "Connection test succeeded" : "Ühenduse testimine õnnestus",
+    "Connection test failed" : "Ühenduse testimine ebaõnnestus",
+    "Do you really want to delete the current Server Configuration?" : "Oled kindel, et tahad kustutada praegust serveri seadistust?",
+    "Confirm Deletion" : "Kinnita kustutamine",
+    "_%s group found_::_%s groups found_" : ["%s grupp leitud","%s gruppi leitud"],
+    "_%s user found_::_%s users found_" : ["%s kasutaja leitud","%s kasutajat leitud"],
+    "Could not find the desired feature" : "Ei suuda leida soovitud funktsioonaalsust",
+    "Invalid Host" : "Vigane server",
+    "Server" : "Server",
+    "User Filter" : "Kasutaja filter",
+    "Login Filter" : "Kasutajanime filter",
+    "Group Filter" : "Grupi filter",
+    "Save" : "Salvesta",
+    "Test Configuration" : "Testi seadistust",
+    "Help" : "Abiinfo",
+    "Groups meeting these criteria are available in %s:" : "Kriteeriumiga sobivad grupid on saadaval %s:",
+    "only those object classes:" : "ainult need objektiklassid:",
+    "only from those groups:" : "ainult nendest gruppidest:",
+    "Edit raw filter instead" : "Selle asemel muuda filtrit",
+    "Raw LDAP filter" : "LDAP filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
+    "Test Filter" : "Testi filtrit",
+    "groups found" : "gruppi leitud",
+    "Users login with this attribute:" : "Logimiseks kasutatkse atribuuti: ",
+    "LDAP Username:" : "LDAP kasutajanimi:",
+    "LDAP Email Address:" : "LDAP e-posti aadress:",
+    "Other Attributes:" : "Muud atribuudid:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Lisa serveri seadistus",
+    "Delete Configuration" : "Kustuta seadistused",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
+    "Port" : "Port",
+    "User DN" : "Kasutaja 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." : "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
+    "Password" : "Parool",
+    "For anonymous access, leave DN and Password empty." : "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
+    "One Base DN per line" : "Üks baas-DN rea kohta",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
+    "Limit %s access to users meeting these criteria:" : "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
+    "users found" : "kasutajat leitud",
+    "Saving" : "Salvestamine",
+    "Back" : "Tagasi",
+    "Continue" : "Jätka",
+    "Expert" : "Ekspert",
+    "Advanced" : "Täpsem",
+    "<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>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada.",
+    "Connection Settings" : "Ühenduse seaded",
+    "Configuration Active" : "Seadistus aktiivne",
+    "When unchecked, this configuration will be skipped." : "Kui on märkimata, siis seadistust ei kasutata.",
+    "Backup (Replica) Host" : "Varuserver",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Lisa valikuline varuserver. See peab olema koopia peamisest LDAP/AD serverist.",
+    "Backup (Replica) Port" : "Varuserveri (replika) port",
+    "Disable Main Server" : "Ära kasuta peaserverit",
+    "Only connect to the replica server." : "Ühendu ainult replitseeriva serveriga.",
+    "Case insensitive LDAP server (Windows)" : "Tõusutundetu LDAP server (Windows)",
+    "Turn off SSL certificate validation." : "Lülita SSL sertifikaadi kontrollimine välja.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Pole soovitatav, kasuta seda ainult testimiseks! Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.",
+    "Cache Time-To-Live" : "Puhvri iga",
+    "in seconds. A change empties the cache." : "sekundites. Muudatus tühjendab vahemälu.",
+    "Directory Settings" : "Kausta seaded",
+    "User Display Name Field" : "Kasutaja näidatava nime väli",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP atribuut, mida kasutatakse kasutaja kuvatava nime loomiseks.",
+    "Base User Tree" : "Baaskasutaja puu",
+    "One User Base DN per line" : "Üks kasutaja baas-DN rea kohta",
+    "User Search Attributes" : "Kasutaja otsingu atribuudid",
+    "Optional; one attribute per line" : "Valikuline; üks atribuut rea kohta",
+    "Group Display Name Field" : "Grupi näidatava nime väli",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP atribuut, mida kasutatakse ownCloudi grupi kuvatava nime loomiseks.",
+    "Base Group Tree" : "Baasgrupi puu",
+    "One Group Base DN per line" : "Üks grupi baas-DN rea kohta",
+    "Group Search Attributes" : "Grupi otsingu atribuudid",
+    "Group-Member association" : "Grupiliikme seotus",
+    "Nested Groups" : "Sisegrupp",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Sisse lülitamisel on toetatakse gruppe sisaldavad gruppe. (Toimib, kui grupi liikme atribuut sisaldab DN-e.)",
+    "Paging chunksize" : "Kutsungi pataka suurus",
+    "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.)" : "Pataka suurust kasutatakse LDAPi kutsungite kaupa otsingute puhul, mis võivad väljastada pikki kasutajate või gruppide loetelusid. (Määrates suuruseks 0, keelatakse LDAP patakate kaupa otsing taolistes situatsioonides)",
+    "Special Attributes" : "Spetsiifilised atribuudid",
+    "Quota Field" : "Mahupiirangu atribuut",
+    "Quota Default" : "Vaikimisi mahupiirang",
+    "in bytes" : "baitides",
+    "Email Field" : "E-posti väli",
+    "User Home Folder Naming Rule" : "Kasutaja kodukataloogi nimetamise reegel",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
+    "Internal Username" : "Sisemine kasutajanimi",
+    "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." : "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, näiteks kõikidel *DAV teenustel. Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
+    "Internal Username Attribute:" : "Sisemise kasutajatunnuse atribuut:",
+    "Override UUID detection" : "Tühista UUID tuvastus",
+    "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." : "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
+    "UUID Attribute for Users:" : "UUID atribuut kasutajatele:",
+    "UUID Attribute for Groups:" : "UUID atribuut gruppidele:",
+    "Username-LDAP User Mapping" : "LDAP-Kasutajatunnus Kasutaja Vastendus",
+    "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." : "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
+    "Clear Username-LDAP User Mapping" : "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
+    "Clear Groupname-LDAP Group Mapping" : "Puhasta LDAP-Grupinimi Grupp Vastendus"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
deleted file mode 100644
index feeef699fac..00000000000
--- a/apps/user_ldap/l10n/et_EE.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Vastendususte puhastamine ebaõnnestus.",
-"Failed to delete the server configuration" => "Serveri seadistuse kustutamine ebaõnnestus",
-"The configuration is valid and the connection could be established!" => "Seadistus on korrektne ning ühendus on olemas!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Seadistus on korrektne, kuid ühendus ebaõnnestus. Palun kontrolli serveri seadeid ja ühenduseks kasutatavaid kasutajatunnuseid.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Seadistus on vigane. Lisainfot vaata palun logidest.",
-"No action specified" => "Tegevusi pole määratletud",
-"No configuration specified" => "Seadistust pole määratletud",
-"No data specified" => "Andmeid pole määratletud",
-" Could not set configuration %s" => "Ei suutnud seadistada %s",
-"Deletion failed" => "Kustutamine ebaõnnestus",
-"Take over settings from recent server configuration?" => "Võta sätted viimasest serveri seadistusest?",
-"Keep settings?" => "Säilitada seadistused?",
-"{nthServer}. Server" => "{nthServer}. Server",
-"Cannot add server configuration" => "Ei suuda lisada serveri seadistust",
-"mappings cleared" => "vastendused puhastatud",
-"Success" => "Korras",
-"Error" => "Viga",
-"Please specify a Base DN" => "Palun määra baas DN",
-"Could not determine Base DN" => "Baas DN-i tuvastamine ebaõnnestus",
-"Please specify the port" => "Palun määra post",
-"Configuration OK" => "Seadistus on korras",
-"Configuration incorrect" => "Seadistus on vigane",
-"Configuration incomplete" => "Seadistus on puudulik",
-"Select groups" => "Vali grupid",
-"Select object classes" => "Vali objekti klassid",
-"Select attributes" => "Vali atribuudid",
-"Connection test succeeded" => "Ühenduse testimine õnnestus",
-"Connection test failed" => "Ühenduse testimine ebaõnnestus",
-"Do you really want to delete the current Server Configuration?" => "Oled kindel, et tahad kustutada praegust serveri seadistust?",
-"Confirm Deletion" => "Kinnita kustutamine",
-"_%s group found_::_%s groups found_" => array("%s grupp leitud","%s gruppi leitud"),
-"_%s user found_::_%s users found_" => array("%s kasutaja leitud","%s kasutajat leitud"),
-"Could not find the desired feature" => "Ei suuda leida soovitud funktsioonaalsust",
-"Invalid Host" => "Vigane server",
-"Server" => "Server",
-"User Filter" => "Kasutaja filter",
-"Login Filter" => "Kasutajanime filter",
-"Group Filter" => "Grupi filter",
-"Save" => "Salvesta",
-"Test Configuration" => "Testi seadistust",
-"Help" => "Abiinfo",
-"Groups meeting these criteria are available in %s:" => "Kriteeriumiga sobivad grupid on saadaval %s:",
-"only those object classes:" => "ainult need objektiklassid:",
-"only from those groups:" => "ainult nendest gruppidest:",
-"Edit raw filter instead" => "Selle asemel muuda filtrit",
-"Raw LDAP filter" => "LDAP filter",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Filter määrab millised LDAP grupid saavad ligipääsu sellele %s instantsile.",
-"Test Filter" => "Testi filtrit",
-"groups found" => "gruppi leitud",
-"Users login with this attribute:" => "Logimiseks kasutatkse atribuuti: ",
-"LDAP Username:" => "LDAP kasutajanimi:",
-"LDAP Email Address:" => "LDAP e-posti aadress:",
-"Other Attributes:" => "Muud atribuudid:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime. Näide: \"uid=%%uid\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Lisa serveri seadistus",
-"Delete Configuration" => "Kustuta seadistused",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://",
-"Port" => "Port",
-"User DN" => "Kasutaja 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." => "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
-"Password" => "Parool",
-"For anonymous access, leave DN and Password empty." => "Anonüümseks ligipääsuks jäta DN ja parool tühjaks.",
-"One Base DN per line" => "Üks baas-DN rea kohta",
-"You can specify Base DN for users and groups in the Advanced tab" => "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Väldib automaatseid LDAP päringuid, Parem suurematele saitidele, aga nõuab mõningaid teadmisi LDAP kohta.",
-"Manually enter LDAP filters (recommended for large directories)" => "Sisesta LDAP filtrid automaatselt (sooitatav suurtele kataloogidele)",
-"Limit %s access to users meeting these criteria:" => "Piira %s liigpääs kriteeriumiga sobivatele kasutajatele:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Filter määrab millised LDAP kasutajad pääsevad ligi %s instantsile.",
-"users found" => "kasutajat leitud",
-"Saving" => "Salvestamine",
-"Back" => "Tagasi",
-"Continue" => "Jätka",
-"Expert" => "Ekspert",
-"Advanced" => "Täpsem",
-"<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>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Hoiatus:</b>PHP LDAP moodul pole paigaldatud ning LDAP kasutamine ei ole võimalik. Palu oma süsteeihaldurit see paigaldada.",
-"Connection Settings" => "Ühenduse seaded",
-"Configuration Active" => "Seadistus aktiivne",
-"When unchecked, this configuration will be skipped." => "Kui on märkimata, siis seadistust ei kasutata.",
-"Backup (Replica) Host" => "Varuserver",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Lisa valikuline varuserver. See peab olema koopia peamisest LDAP/AD serverist.",
-"Backup (Replica) Port" => "Varuserveri (replika) port",
-"Disable Main Server" => "Ära kasuta peaserverit",
-"Only connect to the replica server." => "Ühendu ainult replitseeriva serveriga.",
-"Case insensitive LDAP server (Windows)" => "Tõusutundetu LDAP server (Windows)",
-"Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Pole soovitatav, kasuta seda ainult testimiseks! Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma %s serverisse.",
-"Cache Time-To-Live" => "Puhvri iga",
-"in seconds. A change empties the cache." => "sekundites. Muudatus tühjendab vahemälu.",
-"Directory Settings" => "Kausta seaded",
-"User Display Name Field" => "Kasutaja näidatava nime väli",
-"The LDAP attribute to use to generate the user's display name." => "LDAP atribuut, mida kasutatakse kasutaja kuvatava nime loomiseks.",
-"Base User Tree" => "Baaskasutaja puu",
-"One User Base DN per line" => "Üks kasutaja baas-DN rea kohta",
-"User Search Attributes" => "Kasutaja otsingu atribuudid",
-"Optional; one attribute per line" => "Valikuline; üks atribuut rea kohta",
-"Group Display Name Field" => "Grupi näidatava nime väli",
-"The LDAP attribute to use to generate the groups's display name." => "LDAP atribuut, mida kasutatakse ownCloudi grupi kuvatava nime loomiseks.",
-"Base Group Tree" => "Baasgrupi puu",
-"One Group Base DN per line" => "Üks grupi baas-DN rea kohta",
-"Group Search Attributes" => "Grupi otsingu atribuudid",
-"Group-Member association" => "Grupiliikme seotus",
-"Nested Groups" => "Sisegrupp",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Sisse lülitamisel on toetatakse gruppe sisaldavad gruppe. (Toimib, kui grupi liikme atribuut sisaldab DN-e.)",
-"Paging chunksize" => "Kutsungi pataka suurus",
-"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.)" => "Pataka suurust kasutatakse LDAPi kutsungite kaupa otsingute puhul, mis võivad väljastada pikki kasutajate või gruppide loetelusid. (Määrates suuruseks 0, keelatakse LDAP patakate kaupa otsing taolistes situatsioonides)",
-"Special Attributes" => "Spetsiifilised atribuudid",
-"Quota Field" => "Mahupiirangu atribuut",
-"Quota Default" => "Vaikimisi mahupiirang",
-"in bytes" => "baitides",
-"Email Field" => "E-posti väli",
-"User Home Folder Naming Rule" => "Kasutaja kodukataloogi nimetamise reegel",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
-"Internal Username" => "Sisemine kasutajanimi",
-"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." => "Vaikimisi tekitatakse sisemine kasutajanimi UUID atribuudist. See tagab, et kasutajanimi on unikaalne ja sümboleid pole vaja muuta. Sisemisel kasutajatunnuse puhul on lubatud ainult järgmised sümbolid: [ a-zA-Z0-9_.@- ]. Muud sümbolid asendatakse nende ASCII vastega või lihtsalt hüljatakse. Tõrgete korral lisatakse number või suurendatakse seda. Sisemist kasutajatunnust kasutatakse kasutaja sisemiseks tuvastamiseks. Ühtlasi on see ownCloudis kasutaja vaikimisi kodukataloogi nimeks. See on ka serveri URLi osaks, näiteks kõikidel *DAV teenustel. Selle seadistusega saab tühistada vaikimisi käitumise. Saavutamaks sarnast käitumist eelnevate ownCloud 5 versioonidega, sisesta kasutaja kuvatava nime atribuut järgnevale väljale. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
-"Internal Username Attribute:" => "Sisemise kasutajatunnuse atribuut:",
-"Override UUID detection" => "Tühista UUID tuvastus",
-"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." => "Vaikimis ownCloud tuvastab automaatselt UUID atribuudi. UUID atribuuti kasutatakse LDAP kasutajate ja gruppide kindlaks tuvastamiseks. Samuti tekitatakse sisemine kasutajanimi UUID alusel, kui pole määratud teisiti. Sa saad tühistada selle seadistuse ning määrata atribuudi omal valikul. Pead veenduma, et valitud atribuut toimib nii kasutajate kui gruppide puhul ning on unikaalne. Vaikimisi seadistuseks jäta tühjaks. Muudatused mõjutavad ainult uusi (lisatud) LDAP kasutajate vastendusi.",
-"UUID Attribute for Users:" => "UUID atribuut kasutajatele:",
-"UUID Attribute for Groups:" => "UUID atribuut gruppidele:",
-"Username-LDAP User Mapping" => "LDAP-Kasutajatunnus Kasutaja Vastendus",
-"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." => "ownCloud kasutab kasutajanime talletamaks ja omistamaks (pseudo) andmeid. Et täpselt tuvastada ja määratleda kasutajaid, peab iga LDAP kasutaja omama sisemist kasutajatunnust. See vajab ownCloud kasutajatunnuse vastendust LDAP kasutajaks. Tekitatud kasutajanimi vastendatakse LDAP kasutaja UUID-iks. Lisaks puhverdatakse DN vähendamaks LDAP päringuid, kuid seda ei kasutata tuvastamisel. ownCloud suudab tuvastada ka DN muutumise. ownCloud sisemist kasutajatunnust kasutatakse üle kogu ownCloudi. Eemaldates vastenduse tekivad kõikjal andmejäägid. Vastenduste eemaldamine ei ole konfiguratsiooni tundlik, see mõjutab kõiki LDAP seadistusi! Ära kunagi eemalda vastendusi produktsioonis! Seda võid teha ainult testis või katsetuste masinas.",
-"Clear Username-LDAP User Mapping" => "Puhasta LDAP-Kasutajatunnus Kasutaja Vastendus",
-"Clear Groupname-LDAP Group Mapping" => "Puhasta LDAP-Grupinimi Grupp Vastendus"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
new file mode 100644
index 00000000000..8c220d24bbe
--- /dev/null
+++ b/apps/user_ldap/l10n/eu.js
@@ -0,0 +1,125 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Mapeatzeen garbiketak huts egin du.",
+    "Failed to delete the server configuration" : "Zerbitzariaren konfigurazioa ezabatzeak huts egin du",
+    "The configuration is valid and the connection could be established!" : "Konfigurazioa egokia da eta konexioa ezarri daiteke!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurazioa ez dago ongi. Mesedez ikusi egunerokoak (log) informazio gehiago eskuratzeko.",
+    "No action specified" : "Ez da ekintzarik zehaztu",
+    "No configuration specified" : "Ez da konfiguraziorik zehaztu",
+    "No data specified" : "Ez da daturik zehaztu",
+    " Could not set configuration %s" : "Ezin izan da %s konfigurazioa ezarri",
+    "Deletion failed" : "Ezabaketak huts egin du",
+    "Take over settings from recent server configuration?" : "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
+    "Keep settings?" : "Mantendu ezarpenak?",
+    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
+    "Cannot add server configuration" : "Ezin da zerbitzariaren konfigurazioa gehitu",
+    "mappings cleared" : "Mapeatzeak garbi",
+    "Success" : "Arrakasta",
+    "Error" : "Errorea",
+    "Please specify a Base DN" : "Mesdez zehaztu Base DN",
+    "Could not determine Base DN" : "Ezin izan da zehaztu Base DN",
+    "Please specify the port" : "Mesdez zehaztu portua",
+    "Configuration OK" : "Konfigurazioa ongi dago",
+    "Configuration incorrect" : "Konfigurazioa ez dago ongi",
+    "Configuration incomplete" : "Konfigurazioa osatu gabe dago",
+    "Select groups" : "Hautatu taldeak",
+    "Select object classes" : "Hautatu objektu klaseak",
+    "Select attributes" : "Hautatu atributuak",
+    "Connection test succeeded" : "Konexio froga ongi burutu da",
+    "Connection test failed" : "Konexio frogak huts egin du",
+    "Do you really want to delete the current Server Configuration?" : "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
+    "Confirm Deletion" : "Baieztatu Ezabatzea",
+    "_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
+    "_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
+    "Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
+    "Invalid Host" : "Baliogabeko hostalaria",
+    "Server" : "Zerbitzaria",
+    "User Filter" : "Erabiltzaileen iragazkia",
+    "Login Filter" : "Saioa hasteko Iragazkia",
+    "Group Filter" : "Taldeen iragazkia",
+    "Save" : "Gorde",
+    "Test Configuration" : "Egiaztatu Konfigurazioa",
+    "Help" : "Laguntza",
+    "Groups meeting these criteria are available in %s:" : "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
+    "only those object classes:" : "bakarrik objektu klase hauetakoak:",
+    "only from those groups:" : "bakarrik talde hauetakoak:",
+    "Raw LDAP filter" : "Raw LDAP iragazkia",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP taldek izango duten sarrera %s instantziara:",
+    "groups found" : "talde aurkituta",
+    "Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
+    "LDAP Username:" : "LDAP Erabiltzaile izena:",
+    "LDAP Email Address:" : "LDAP Eposta helbidea:",
+    "Other Attributes:" : "Bestelako atributuak:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
+    "1. Server" : "1. Zerbitzaria",
+    "%s. Server:" : "%s. Zerbitzaria:",
+    "Add Server Configuration" : "Gehitu Zerbitzariaren Konfigurazioa",
+    "Delete Configuration" : "Ezabatu Konfigurazioa",
+    "Host" : "Hostalaria",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
+    "Port" : "Portua",
+    "User DN" : "Erabiltzaile 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." : "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
+    "Password" : "Pasahitza",
+    "For anonymous access, leave DN and Password empty." : "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
+    "One Base DN per line" : "DN Oinarri bat lerroko",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
+    "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
+    "users found" : "erabiltzaile aurkituta",
+    "Back" : "Atzera",
+    "Continue" : "Jarraitu",
+    "Expert" : "Aditua",
+    "Advanced" : "Aurreratua",
+    "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
+    "Connection Settings" : "Konexio Ezarpenak",
+    "Configuration Active" : "Konfigurazio Aktiboa",
+    "When unchecked, this configuration will be skipped." : "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko.",
+    "Backup (Replica) Host" : "Babeskopia (Replica) Ostalaria",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da.",
+    "Backup (Replica) Port" : "Babeskopia (Replica) Ataka",
+    "Disable Main Server" : "Desgaitu Zerbitzari Nagusia",
+    "Only connect to the replica server." : "Konektatu bakarrik erreplika zerbitzarira",
+    "Case insensitive LDAP server (Windows)" : "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (Windows)",
+    "Turn off SSL certificate validation." : "Ezgaitu SSL ziurtagirien egiaztapena.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Ez da gomendagarria, erabili bakarrik probarako! Konexioak aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure %s zerbitzarian.",
+    "Cache Time-To-Live" : "Katxearen Bizi-Iraupena",
+    "in seconds. A change empties the cache." : "segundutan. Aldaketak katxea husten du.",
+    "Directory Settings" : "Karpetaren Ezarpenak",
+    "User Display Name Field" : "Erabiltzaileen bistaratzeko izena duen eremua",
+    "The LDAP attribute to use to generate the user's display name." : "Erabiltzailearen bistaratze izena sortzeko erabiliko den LDAP atributua.",
+    "Base User Tree" : "Oinarrizko Erabiltzaile Zuhaitza",
+    "One User Base DN per line" : "Erabiltzaile DN Oinarri bat lerroko",
+    "User Search Attributes" : "Erabili Bilaketa Atributuak ",
+    "Optional; one attribute per line" : "Aukerakoa; atributu bat lerro bakoitzeko",
+    "Group Display Name Field" : "Taldeen bistaratzeko izena duen eremua",
+    "The LDAP attribute to use to generate the groups's display name." : "Taldearen bistaratze izena sortzeko erabiliko den LDAP atributua.",
+    "Base Group Tree" : "Oinarrizko Talde Zuhaitza",
+    "One Group Base DN per line" : "Talde DN Oinarri bat lerroko",
+    "Group Search Attributes" : "Taldekatu Bilaketa Atributuak ",
+    "Group-Member association" : "Talde-Kide elkarketak",
+    "Nested Groups" : "Talde habiaratuak",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Piztuta dagoenean, taldeak dauzkaten taldeak onartzen dira. (Bakarrik taldeko kideen atributuak DNak baditu).",
+    "Special Attributes" : "Atributu Bereziak",
+    "Quota Field" : "Kuota Eremua",
+    "Quota Default" : "Kuota Lehenetsia",
+    "in bytes" : "bytetan",
+    "Email Field" : "Eposta eremua",
+    "User Home Folder Naming Rule" : "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua.",
+    "Internal Username" : "Barneko erabiltzaile izena",
+    "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." : "Modu lehenetsian barneko erabiltzaile-izena UUID atributuan oinarritua sortuko da. Horrek bermatzen du erabiltzailea bakarra dela eta karaktereak ez direla bihurtu behar. Barneko erabiltzaile-izenak muga bat du, hain zuzen bakarrik karaktere hauek onartzen direla:  [ a-zA-Z0-9_.@- ]. Gainerako karaktereak haien ASCII kodean dagokienekin ordezten dira edo saltatu egiten dira. Talka egotekotan zenbaki bat erantsi edo handituko da. Barneko erabiltzaile-izena erabiltzailea barnean identifikatzeko erabiltzen da. Era berean izen hau da erabiltzailearen karpeta nagusiaren izen lehentsia. Bai eta URL helbidearen zatia, esate baterako *DAV zerbitzu guztietan. Ezarpen hauekin lehenetsitako jokaera alda daiteke. Lortzeko ownCloud 5aren aurreko antzeko jokaera sartu erabiltzaile-izenaren atributua hurrengo eremuan. Hutsik utzi lehenetsitako jokaera izateko. Aldaketok bakarrik eragingo diete berriki mapeatutako (erantsitako) LDAP erabiltzaileei.",
+    "Internal Username Attribute:" : "Baliogabeko Erabiltzaile Izen atributua",
+    "Override UUID detection" : "Gainidatzi UUID antzematea",
+    "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." : "Era lehenetsian, UUID atributua automatikoki atzematen da. UUID atributua LDAP erabiltzaleak eta taldeak dudik gabe identifikatzeko erabiltzen da. Gainera, barneko erabiltzaile-izena UUID atributuan oinarritua sortuko da bestelakorik zehazten ez bada. Ezarpenak alda daitezke eta bestelako atributua jar daiteke. Ziur egon behar duzu hautatzen duzun atributua erabiltzaile eta taldeek eskura dezaketela eta bakarra dela. Jokabide lehenetsi gisa utz ezazu hutsik. Aldaketok soilik LDAP-n mapeatuko (gehituko)  diren erabiltzaile eta taldeei eragingo die.",
+    "UUID Attribute for Users:" : "Erabiltzaileentzako UUID atributuak:",
+    "UUID Attribute for Groups:" : "Taldeentzako UUID atributuak:",
+    "Username-LDAP User Mapping" : "LDAP-erabiltzaile-izena erabiltzailearen mapeatzea",
+    "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." : "Erabiltzaile izenak (meta) datuak gordetzeko eta esleitzeko erabiltzen dira. Erabiltzaileak zehazki identifikatzeko eta ezagutzeko LDAP erabiltzaile bakoitzak barne erabiltzaile-izen bat edukiko du. Honek erabiltzaile izenatik LDAP erabiltzailera mapatzea eskatzen du. Sortutako erabiltzaile-izena mapatzen da LDAP erabiltzailearen UUID-ra. Gainera DN-a cachean gordetzen da ere LDAP-ren interakzioa txikitzeko,  baina DN-a ez da erabiltzen identifikatzeko. Baldin eta DN-a aldatzen bada aldaketak aurkituko dira. Barneko erabiltzaile-izena denean erabiltzen da. Mapatzea garbitzeagatik hondarrak nonnahi ageriko dira. Mapatzeak garbitzeak  eragiten dio LDAP ezarpen guztiei. Ez garbitu inoiz mapatzeak ingurune produktibo batean, egin soilik proba edo esperimentazio egoera batean.",
+    "Clear Username-LDAP User Mapping" : "Garbitu LDAP-erabiltzaile-izenaren erabiltzaile mapaketa",
+    "Clear Groupname-LDAP Group Mapping" : "Garbitu LDAP-talde-izenaren talde mapaketa"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
new file mode 100644
index 00000000000..ac0ba941005
--- /dev/null
+++ b/apps/user_ldap/l10n/eu.json
@@ -0,0 +1,123 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Mapeatzeen garbiketak huts egin du.",
+    "Failed to delete the server configuration" : "Zerbitzariaren konfigurazioa ezabatzeak huts egin du",
+    "The configuration is valid and the connection could be established!" : "Konfigurazioa egokia da eta konexioa ezarri daiteke!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurazioa ez dago ongi. Mesedez ikusi egunerokoak (log) informazio gehiago eskuratzeko.",
+    "No action specified" : "Ez da ekintzarik zehaztu",
+    "No configuration specified" : "Ez da konfiguraziorik zehaztu",
+    "No data specified" : "Ez da daturik zehaztu",
+    " Could not set configuration %s" : "Ezin izan da %s konfigurazioa ezarri",
+    "Deletion failed" : "Ezabaketak huts egin du",
+    "Take over settings from recent server configuration?" : "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
+    "Keep settings?" : "Mantendu ezarpenak?",
+    "{nthServer}. Server" : "{nthServer}. Zerbitzaria",
+    "Cannot add server configuration" : "Ezin da zerbitzariaren konfigurazioa gehitu",
+    "mappings cleared" : "Mapeatzeak garbi",
+    "Success" : "Arrakasta",
+    "Error" : "Errorea",
+    "Please specify a Base DN" : "Mesdez zehaztu Base DN",
+    "Could not determine Base DN" : "Ezin izan da zehaztu Base DN",
+    "Please specify the port" : "Mesdez zehaztu portua",
+    "Configuration OK" : "Konfigurazioa ongi dago",
+    "Configuration incorrect" : "Konfigurazioa ez dago ongi",
+    "Configuration incomplete" : "Konfigurazioa osatu gabe dago",
+    "Select groups" : "Hautatu taldeak",
+    "Select object classes" : "Hautatu objektu klaseak",
+    "Select attributes" : "Hautatu atributuak",
+    "Connection test succeeded" : "Konexio froga ongi burutu da",
+    "Connection test failed" : "Konexio frogak huts egin du",
+    "Do you really want to delete the current Server Configuration?" : "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
+    "Confirm Deletion" : "Baieztatu Ezabatzea",
+    "_%s group found_::_%s groups found_" : ["Talde %s aurkitu da","%s talde aurkitu dira"],
+    "_%s user found_::_%s users found_" : ["Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"],
+    "Could not find the desired feature" : "Ezin izan da nahi zen ezaugarria aurkitu",
+    "Invalid Host" : "Baliogabeko hostalaria",
+    "Server" : "Zerbitzaria",
+    "User Filter" : "Erabiltzaileen iragazkia",
+    "Login Filter" : "Saioa hasteko Iragazkia",
+    "Group Filter" : "Taldeen iragazkia",
+    "Save" : "Gorde",
+    "Test Configuration" : "Egiaztatu Konfigurazioa",
+    "Help" : "Laguntza",
+    "Groups meeting these criteria are available in %s:" : "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
+    "only those object classes:" : "bakarrik objektu klase hauetakoak:",
+    "only from those groups:" : "bakarrik talde hauetakoak:",
+    "Raw LDAP filter" : "Raw LDAP iragazkia",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP taldek izango duten sarrera %s instantziara:",
+    "groups found" : "talde aurkituta",
+    "Users login with this attribute:" : "Erabiltzaileak atributu honekin sartzen dira:",
+    "LDAP Username:" : "LDAP Erabiltzaile izena:",
+    "LDAP Email Address:" : "LDAP Eposta helbidea:",
+    "Other Attributes:" : "Bestelako atributuak:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
+    "1. Server" : "1. Zerbitzaria",
+    "%s. Server:" : "%s. Zerbitzaria:",
+    "Add Server Configuration" : "Gehitu Zerbitzariaren Konfigurazioa",
+    "Delete Configuration" : "Ezabatu Konfigurazioa",
+    "Host" : "Hostalaria",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
+    "Port" : "Portua",
+    "User DN" : "Erabiltzaile 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." : "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
+    "Password" : "Pasahitza",
+    "For anonymous access, leave DN and Password empty." : "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
+    "One Base DN per line" : "DN Oinarri bat lerroko",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
+    "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
+    "users found" : "erabiltzaile aurkituta",
+    "Back" : "Atzera",
+    "Continue" : "Jarraitu",
+    "Expert" : "Aditua",
+    "Advanced" : "Aurreratua",
+    "<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
+    "Connection Settings" : "Konexio Ezarpenak",
+    "Configuration Active" : "Konfigurazio Aktiboa",
+    "When unchecked, this configuration will be skipped." : "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko.",
+    "Backup (Replica) Host" : "Babeskopia (Replica) Ostalaria",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da.",
+    "Backup (Replica) Port" : "Babeskopia (Replica) Ataka",
+    "Disable Main Server" : "Desgaitu Zerbitzari Nagusia",
+    "Only connect to the replica server." : "Konektatu bakarrik erreplika zerbitzarira",
+    "Case insensitive LDAP server (Windows)" : "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (Windows)",
+    "Turn off SSL certificate validation." : "Ezgaitu SSL ziurtagirien egiaztapena.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Ez da gomendagarria, erabili bakarrik probarako! Konexioak aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure %s zerbitzarian.",
+    "Cache Time-To-Live" : "Katxearen Bizi-Iraupena",
+    "in seconds. A change empties the cache." : "segundutan. Aldaketak katxea husten du.",
+    "Directory Settings" : "Karpetaren Ezarpenak",
+    "User Display Name Field" : "Erabiltzaileen bistaratzeko izena duen eremua",
+    "The LDAP attribute to use to generate the user's display name." : "Erabiltzailearen bistaratze izena sortzeko erabiliko den LDAP atributua.",
+    "Base User Tree" : "Oinarrizko Erabiltzaile Zuhaitza",
+    "One User Base DN per line" : "Erabiltzaile DN Oinarri bat lerroko",
+    "User Search Attributes" : "Erabili Bilaketa Atributuak ",
+    "Optional; one attribute per line" : "Aukerakoa; atributu bat lerro bakoitzeko",
+    "Group Display Name Field" : "Taldeen bistaratzeko izena duen eremua",
+    "The LDAP attribute to use to generate the groups's display name." : "Taldearen bistaratze izena sortzeko erabiliko den LDAP atributua.",
+    "Base Group Tree" : "Oinarrizko Talde Zuhaitza",
+    "One Group Base DN per line" : "Talde DN Oinarri bat lerroko",
+    "Group Search Attributes" : "Taldekatu Bilaketa Atributuak ",
+    "Group-Member association" : "Talde-Kide elkarketak",
+    "Nested Groups" : "Talde habiaratuak",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Piztuta dagoenean, taldeak dauzkaten taldeak onartzen dira. (Bakarrik taldeko kideen atributuak DNak baditu).",
+    "Special Attributes" : "Atributu Bereziak",
+    "Quota Field" : "Kuota Eremua",
+    "Quota Default" : "Kuota Lehenetsia",
+    "in bytes" : "bytetan",
+    "Email Field" : "Eposta eremua",
+    "User Home Folder Naming Rule" : "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua.",
+    "Internal Username" : "Barneko erabiltzaile izena",
+    "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." : "Modu lehenetsian barneko erabiltzaile-izena UUID atributuan oinarritua sortuko da. Horrek bermatzen du erabiltzailea bakarra dela eta karaktereak ez direla bihurtu behar. Barneko erabiltzaile-izenak muga bat du, hain zuzen bakarrik karaktere hauek onartzen direla:  [ a-zA-Z0-9_.@- ]. Gainerako karaktereak haien ASCII kodean dagokienekin ordezten dira edo saltatu egiten dira. Talka egotekotan zenbaki bat erantsi edo handituko da. Barneko erabiltzaile-izena erabiltzailea barnean identifikatzeko erabiltzen da. Era berean izen hau da erabiltzailearen karpeta nagusiaren izen lehentsia. Bai eta URL helbidearen zatia, esate baterako *DAV zerbitzu guztietan. Ezarpen hauekin lehenetsitako jokaera alda daiteke. Lortzeko ownCloud 5aren aurreko antzeko jokaera sartu erabiltzaile-izenaren atributua hurrengo eremuan. Hutsik utzi lehenetsitako jokaera izateko. Aldaketok bakarrik eragingo diete berriki mapeatutako (erantsitako) LDAP erabiltzaileei.",
+    "Internal Username Attribute:" : "Baliogabeko Erabiltzaile Izen atributua",
+    "Override UUID detection" : "Gainidatzi UUID antzematea",
+    "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." : "Era lehenetsian, UUID atributua automatikoki atzematen da. UUID atributua LDAP erabiltzaleak eta taldeak dudik gabe identifikatzeko erabiltzen da. Gainera, barneko erabiltzaile-izena UUID atributuan oinarritua sortuko da bestelakorik zehazten ez bada. Ezarpenak alda daitezke eta bestelako atributua jar daiteke. Ziur egon behar duzu hautatzen duzun atributua erabiltzaile eta taldeek eskura dezaketela eta bakarra dela. Jokabide lehenetsi gisa utz ezazu hutsik. Aldaketok soilik LDAP-n mapeatuko (gehituko)  diren erabiltzaile eta taldeei eragingo die.",
+    "UUID Attribute for Users:" : "Erabiltzaileentzako UUID atributuak:",
+    "UUID Attribute for Groups:" : "Taldeentzako UUID atributuak:",
+    "Username-LDAP User Mapping" : "LDAP-erabiltzaile-izena erabiltzailearen mapeatzea",
+    "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." : "Erabiltzaile izenak (meta) datuak gordetzeko eta esleitzeko erabiltzen dira. Erabiltzaileak zehazki identifikatzeko eta ezagutzeko LDAP erabiltzaile bakoitzak barne erabiltzaile-izen bat edukiko du. Honek erabiltzaile izenatik LDAP erabiltzailera mapatzea eskatzen du. Sortutako erabiltzaile-izena mapatzen da LDAP erabiltzailearen UUID-ra. Gainera DN-a cachean gordetzen da ere LDAP-ren interakzioa txikitzeko,  baina DN-a ez da erabiltzen identifikatzeko. Baldin eta DN-a aldatzen bada aldaketak aurkituko dira. Barneko erabiltzaile-izena denean erabiltzen da. Mapatzea garbitzeagatik hondarrak nonnahi ageriko dira. Mapatzeak garbitzeak  eragiten dio LDAP ezarpen guztiei. Ez garbitu inoiz mapatzeak ingurune produktibo batean, egin soilik proba edo esperimentazio egoera batean.",
+    "Clear Username-LDAP User Mapping" : "Garbitu LDAP-erabiltzaile-izenaren erabiltzaile mapaketa",
+    "Clear Groupname-LDAP Group Mapping" : "Garbitu LDAP-talde-izenaren talde mapaketa"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
deleted file mode 100644
index 83a80f2e1db..00000000000
--- a/apps/user_ldap/l10n/eu.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Mapeatzeen garbiketak huts egin du.",
-"Failed to delete the server configuration" => "Zerbitzariaren konfigurazioa ezabatzeak huts egin du",
-"The configuration is valid and the connection could be established!" => "Konfigurazioa egokia da eta konexioa ezarri daiteke!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurazioa ongi dago, baina Bind-ek huts egin du. Mesedez egiaztatu zerbitzariaren ezarpenak eta kredentzialak.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Konfigurazioa ez dago ongi. Mesedez ikusi egunerokoak (log) informazio gehiago eskuratzeko.",
-"No action specified" => "Ez da ekintzarik zehaztu",
-"No configuration specified" => "Ez da konfiguraziorik zehaztu",
-"No data specified" => "Ez da daturik zehaztu",
-" Could not set configuration %s" => "Ezin izan da %s konfigurazioa ezarri",
-"Deletion failed" => "Ezabaketak huts egin du",
-"Take over settings from recent server configuration?" => "oraintsuko zerbitzariaren konfigurazioaren ezarpenen ardura hartu?",
-"Keep settings?" => "Mantendu ezarpenak?",
-"{nthServer}. Server" => "{nthServer}. Zerbitzaria",
-"Cannot add server configuration" => "Ezin da zerbitzariaren konfigurazioa gehitu",
-"mappings cleared" => "Mapeatzeak garbi",
-"Success" => "Arrakasta",
-"Error" => "Errorea",
-"Please specify a Base DN" => "Mesdez zehaztu Base DN",
-"Could not determine Base DN" => "Ezin izan da zehaztu Base DN",
-"Please specify the port" => "Mesdez zehaztu portua",
-"Configuration OK" => "Konfigurazioa ongi dago",
-"Configuration incorrect" => "Konfigurazioa ez dago ongi",
-"Configuration incomplete" => "Konfigurazioa osatu gabe dago",
-"Select groups" => "Hautatu taldeak",
-"Select object classes" => "Hautatu objektu klaseak",
-"Select attributes" => "Hautatu atributuak",
-"Connection test succeeded" => "Konexio froga ongi burutu da",
-"Connection test failed" => "Konexio frogak huts egin du",
-"Do you really want to delete the current Server Configuration?" => "Ziur zaude Zerbitzariaren Konfigurazioa ezabatu nahi duzula?",
-"Confirm Deletion" => "Baieztatu Ezabatzea",
-"_%s group found_::_%s groups found_" => array("Talde %s aurkitu da","%s talde aurkitu dira"),
-"_%s user found_::_%s users found_" => array("Erabiltzaile %s aurkitu da","%s erabiltzaile aurkitu dira"),
-"Could not find the desired feature" => "Ezin izan da nahi zen ezaugarria aurkitu",
-"Invalid Host" => "Baliogabeko hostalaria",
-"Server" => "Zerbitzaria",
-"User Filter" => "Erabiltzaileen iragazkia",
-"Login Filter" => "Saioa hasteko Iragazkia",
-"Group Filter" => "Taldeen iragazkia",
-"Save" => "Gorde",
-"Test Configuration" => "Egiaztatu Konfigurazioa",
-"Help" => "Laguntza",
-"Groups meeting these criteria are available in %s:" => "Baldintza horiek betetzen dituzten taldeak bertan eskuragarri %s:",
-"only those object classes:" => "bakarrik objektu klase hauetakoak:",
-"only from those groups:" => "bakarrik talde hauetakoak:",
-"Raw LDAP filter" => "Raw LDAP iragazkia",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Iragazkiak zehazten du  ze LDAP taldek izango duten sarrera %s instantziara:",
-"groups found" => "talde aurkituta",
-"Users login with this attribute:" => "Erabiltzaileak atributu honekin sartzen dira:",
-"LDAP Username:" => "LDAP Erabiltzaile izena:",
-"LDAP Email Address:" => "LDAP Eposta helbidea:",
-"Other Attributes:" => "Bestelako atributuak:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definitu aplikatu beharreko iragazkia sartzen saiatzean. %%uid erabiltzailearen izena ordezten du sartzeko ekintzan. Adibidez: \"uid=%%uid\"",
-"1. Server" => "1. Zerbitzaria",
-"%s. Server:" => "%s. Zerbitzaria:",
-"Add Server Configuration" => "Gehitu Zerbitzariaren Konfigurazioa",
-"Delete Configuration" => "Ezabatu Konfigurazioa",
-"Host" => "Hostalaria",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
-"Port" => "Portua",
-"User DN" => "Erabiltzaile 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." => "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
-"Password" => "Pasahitza",
-"For anonymous access, leave DN and Password empty." => "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
-"One Base DN per line" => "DN Oinarri bat lerroko",
-"You can specify Base DN for users and groups in the Advanced tab" => "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
-"Limit %s access to users meeting these criteria:" => "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
-"users found" => "erabiltzaile aurkituta",
-"Saving" => "Gordetzen",
-"Back" => "Atzera",
-"Continue" => "Jarraitu",
-"Expert" => "Aditua",
-"Advanced" => "Aurreratua",
-"<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>Abisua:</b> user_ldap eta user_webdavauth aplikazioak bateraezinak dira. Portaera berezia izan dezakezu. Mesedez eskatu zure sistema kudeatzaileari bietako bat desgaitzeko.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Abisua:</b> PHPk behar duen LDAP modulua ez dago instalaturik, motorrak ez du funtzionatuko. Mesedez eskatu zure sistema kudeatzaileari instala dezan.",
-"Connection Settings" => "Konexio Ezarpenak",
-"Configuration Active" => "Konfigurazio Aktiboa",
-"When unchecked, this configuration will be skipped." => "Markatuta ez dagoenean, konfigurazio hau ez da kontutan hartuko.",
-"Backup (Replica) Host" => "Babeskopia (Replica) Ostalaria",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Eman babeskopia ostalari gehigarri bat. LDAP/AD zerbitzari nagusiaren replica bat izan behar da.",
-"Backup (Replica) Port" => "Babeskopia (Replica) Ataka",
-"Disable Main Server" => "Desgaitu Zerbitzari Nagusia",
-"Only connect to the replica server." => "Konektatu bakarrik erreplika zerbitzarira",
-"Case insensitive LDAP server (Windows)" => "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (Windows)",
-"Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Ez da gomendagarria, erabili bakarrik probarako! Konexioak aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure %s zerbitzarian.",
-"Cache Time-To-Live" => "Katxearen Bizi-Iraupena",
-"in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.",
-"Directory Settings" => "Karpetaren Ezarpenak",
-"User Display Name Field" => "Erabiltzaileen bistaratzeko izena duen eremua",
-"The LDAP attribute to use to generate the user's display name." => "Erabiltzailearen bistaratze izena sortzeko erabiliko den LDAP atributua.",
-"Base User Tree" => "Oinarrizko Erabiltzaile Zuhaitza",
-"One User Base DN per line" => "Erabiltzaile DN Oinarri bat lerroko",
-"User Search Attributes" => "Erabili Bilaketa Atributuak ",
-"Optional; one attribute per line" => "Aukerakoa; atributu bat lerro bakoitzeko",
-"Group Display Name Field" => "Taldeen bistaratzeko izena duen eremua",
-"The LDAP attribute to use to generate the groups's display name." => "Taldearen bistaratze izena sortzeko erabiliko den LDAP atributua.",
-"Base Group Tree" => "Oinarrizko Talde Zuhaitza",
-"One Group Base DN per line" => "Talde DN Oinarri bat lerroko",
-"Group Search Attributes" => "Taldekatu Bilaketa Atributuak ",
-"Group-Member association" => "Talde-Kide elkarketak",
-"Nested Groups" => "Talde habiaratuak",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Piztuta dagoenean, taldeak dauzkaten taldeak onartzen dira. (Bakarrik taldeko kideen atributuak DNak baditu).",
-"Special Attributes" => "Atributu Bereziak",
-"Quota Field" => "Kuota Eremua",
-"Quota Default" => "Kuota Lehenetsia",
-"in bytes" => "bytetan",
-"Email Field" => "Eposta eremua",
-"User Home Folder Naming Rule" => "Erabiltzailearen Karpeta Nagusia Izendatzeko Patroia",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua.",
-"Internal Username" => "Barneko erabiltzaile izena",
-"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." => "Modu lehenetsian barneko erabiltzaile-izena UUID atributuan oinarritua sortuko da. Horrek bermatzen du erabiltzailea bakarra dela eta karaktereak ez direla bihurtu behar. Barneko erabiltzaile-izenak muga bat du, hain zuzen bakarrik karaktere hauek onartzen direla:  [ a-zA-Z0-9_.@- ]. Gainerako karaktereak haien ASCII kodean dagokienekin ordezten dira edo saltatu egiten dira. Talka egotekotan zenbaki bat erantsi edo handituko da. Barneko erabiltzaile-izena erabiltzailea barnean identifikatzeko erabiltzen da. Era berean izen hau da erabiltzailearen karpeta nagusiaren izen lehentsia. Bai eta URL helbidearen zatia, esate baterako *DAV zerbitzu guztietan. Ezarpen hauekin lehenetsitako jokaera alda daiteke. Lortzeko ownCloud 5aren aurreko antzeko jokaera sartu erabiltzaile-izenaren atributua hurrengo eremuan. Hutsik utzi lehenetsitako jokaera izateko. Aldaketok bakarrik eragingo diete berriki mapeatutako (erantsitako) LDAP erabiltzaileei.",
-"Internal Username Attribute:" => "Baliogabeko Erabiltzaile Izen atributua",
-"Override UUID detection" => "Gainidatzi UUID antzematea",
-"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." => "Era lehenetsian, UUID atributua automatikoki atzematen da. UUID atributua LDAP erabiltzaleak eta taldeak dudik gabe identifikatzeko erabiltzen da. Gainera, barneko erabiltzaile-izena UUID atributuan oinarritua sortuko da bestelakorik zehazten ez bada. Ezarpenak alda daitezke eta bestelako atributua jar daiteke. Ziur egon behar duzu hautatzen duzun atributua erabiltzaile eta taldeek eskura dezaketela eta bakarra dela. Jokabide lehenetsi gisa utz ezazu hutsik. Aldaketok soilik LDAP-n mapeatuko (gehituko)  diren erabiltzaile eta taldeei eragingo die.",
-"UUID Attribute for Users:" => "Erabiltzaileentzako UUID atributuak:",
-"UUID Attribute for Groups:" => "Taldeentzako UUID atributuak:",
-"Username-LDAP User Mapping" => "LDAP-erabiltzaile-izena erabiltzailearen mapeatzea",
-"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." => "Erabiltzaile izenak (meta) datuak gordetzeko eta esleitzeko erabiltzen dira. Erabiltzaileak zehazki identifikatzeko eta ezagutzeko LDAP erabiltzaile bakoitzak barne erabiltzaile-izen bat edukiko du. Honek erabiltzaile izenatik LDAP erabiltzailera mapatzea eskatzen du. Sortutako erabiltzaile-izena mapatzen da LDAP erabiltzailearen UUID-ra. Gainera DN-a cachean gordetzen da ere LDAP-ren interakzioa txikitzeko,  baina DN-a ez da erabiltzen identifikatzeko. Baldin eta DN-a aldatzen bada aldaketak aurkituko dira. Barneko erabiltzaile-izena denean erabiltzen da. Mapatzea garbitzeagatik hondarrak nonnahi ageriko dira. Mapatzeak garbitzeak  eragiten dio LDAP ezarpen guztiei. Ez garbitu inoiz mapatzeak ingurune produktibo batean, egin soilik proba edo esperimentazio egoera batean.",
-"Clear Username-LDAP User Mapping" => "Garbitu LDAP-erabiltzaile-izenaren erabiltzaile mapaketa",
-"Clear Groupname-LDAP Group Mapping" => "Garbitu LDAP-talde-izenaren talde mapaketa"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/eu_ES.js b/apps/user_ldap/l10n/eu_ES.js
new file mode 100644
index 00000000000..9ce17c7bb81
--- /dev/null
+++ b/apps/user_ldap/l10n/eu_ES.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "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
new file mode 100644
index 00000000000..2df6e9d8f59
--- /dev/null
+++ b/apps/user_ldap/l10n/eu_ES.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Gorde"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/eu_ES.php b/apps/user_ldap/l10n/eu_ES.php
deleted file mode 100644
index 6dbfd1955df..00000000000
--- a/apps/user_ldap/l10n/eu_ES.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Gorde"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/fa.js b/apps/user_ldap/l10n/fa.js
new file mode 100644
index 00000000000..9ce5edf8742
--- /dev/null
+++ b/apps/user_ldap/l10n/fa.js
@@ -0,0 +1,94 @@
+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." : "پیکربندی معتبراست، اما اتصال شکست خورد. لطفا تنظیمات و اعتبارهای سرور را بررسی کنید.",
+    "No action specified" : "فعالیتی مشخص نشده است",
+    "No configuration specified" : "هیچ پیکربندی مشخص نشده است",
+    "No data specified" : "داده ای مشخص نشده است",
+    "Deletion failed" : "حذف کردن انجام نشد",
+    "Keep settings?" : "آیا تنظیمات ذخیره شود ؟",
+    "{nthServer}. Server" : "سرور {nthServer}.",
+    "Cannot add server configuration" : "نمی توان پیکربندی سرور را اضافه نمود",
+    "mappings cleared" : "نگاشت پاک شده است",
+    "Success" : "موفقیت",
+    "Error" : "خطا",
+    "Please specify a Base DN" : "لطفا نام دامنه (DN) پایه را مشخص کنید.",
+    "Could not determine Base DN" : "امکان تشخیص نام دامنه (DN) پایه وجود ندارد",
+    "Please specify the port" : "لطفا پورت مورد نظر را مشخص کنید.",
+    "Configuration OK" : "پیکربندی صحیح است",
+    "Configuration incorrect" : "پیکربندی نادرست است",
+    "Configuration incomplete" : "پیکربندی کامل نیست",
+    "Select groups" : "انتخاب گروه ها",
+    "Select object classes" : "انتخاب کلاس های اشیا",
+    "Select attributes" : "انتخاب مشخصه ها",
+    "Connection test succeeded" : "تست اتصال با موفقیت انجام گردید",
+    "Connection test failed" : "تست اتصال ناموفق بود",
+    "Do you really want to delete the current Server Configuration?" : "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
+    "Confirm Deletion" : "تایید حذف",
+    "_%s group found_::_%s groups found_" : ["%s گروه بافت شد"],
+    "_%s user found_::_%s users found_" : ["%s کاربر بافت شد"],
+    "Invalid Host" : "هاست نامعتبر است",
+    "Server" : "سرور",
+    "User Filter" : "فیلتر کاربر",
+    "Login Filter" : "فیلتر لاگین",
+    "Group Filter" : "فیلتر گروه",
+    "Save" : "ذخیره",
+    "Test Configuration" : "امتحان پیکربندی",
+    "Help" : "راه‌نما",
+    "Raw LDAP filter" : "فیلتر ال.دپ خام",
+    "groups found" : "گروه های یافت شده",
+    "LDAP Username:" : "نام کاربری LDAP:",
+    "LDAP Email Address:" : "آدرس ایمیل LDAP:",
+    "Other Attributes:" : "مشخصه های دیگر:",
+    "1. Server" : "1. سرور",
+    "%s. Server:" : "%s. سرور:",
+    "Add Server Configuration" : "افزودن پیکربندی سرور",
+    "Delete Configuration" : "حذف پیکربندی",
+    "Host" : "میزبانی",
+    "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 مشخص کنید.",
+    "users found" : "کاربران یافت شده",
+    "Back" : "بازگشت",
+    "Continue" : "ادامه",
+    "Expert" : "حرفه ای",
+    "Advanced" : "پیشرفته",
+    "Connection Settings" : "تنظیمات اتصال",
+    "Configuration Active" : "پیکربندی فعال",
+    "When unchecked, this configuration will be skipped." : "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد.",
+    "Backup (Replica) Host" : "پشتیبان گیری (بدل) میزبان",
+    "Backup (Replica) Port" : "پشتیبان گیری (بدل) پورت",
+    "Disable Main Server" : "غیر فعال کردن سرور اصلی",
+    "Turn off SSL certificate validation." : "غیرفعال کردن اعتبار گواهی نامه SSL .",
+    "Directory Settings" : "تنظیمات پوشه",
+    "User Display Name Field" : "فیلد نام کاربر",
+    "Base User Tree" : "کاربر درخت پایه",
+    "One User Base DN per line" : "یک کاربر پایه DN در هر خط",
+    "User Search Attributes" : "ویژگی های جستجوی کاربر",
+    "Optional; one attribute per line" : "اختیاری؛ یک ویژگی در هر خط",
+    "Group Display Name Field" : "فیلد نام گروه",
+    "Base Group Tree" : "گروه درخت پایه ",
+    "One Group Base DN per line" : "یک گروه پایه DN در هر خط",
+    "Group Search Attributes" : "گروه صفات جستجو",
+    "Group-Member association" : "انجمن گروه کاربران",
+    "Special Attributes" : "ویژگی های مخصوص",
+    "Quota Field" : "سهمیه بندی انجام نشد.",
+    "Quota Default" : "سهمیه بندی پیش فرض",
+    "in bytes" : "در بایت",
+    "Email Field" : "ایمیل ارسال نشد.",
+    "User Home Folder Naming Rule" : "قانون نامگذاری پوشه خانه کاربر",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD.",
+    "Internal Username" : "نام کاربری داخلی",
+    "Internal Username Attribute:" : "ویژگی نام کاربری داخلی:",
+    "Override UUID detection" : "نادیده گرفتن تشخیص UUID ",
+    "Username-LDAP User Mapping" : "نام کاربری - نگاشت کاربر LDAP ",
+    "Clear Username-LDAP User Mapping" : "پاک کردن نام کاربری- LDAP  نگاشت کاربر ",
+    "Clear Groupname-LDAP Group Mapping" : "پاک کردن نام گروه -LDAP گروه نقشه برداری"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/fa.json b/apps/user_ldap/l10n/fa.json
new file mode 100644
index 00000000000..b8ac9269a52
--- /dev/null
+++ b/apps/user_ldap/l10n/fa.json
@@ -0,0 +1,92 @@
+{ "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." : "پیکربندی معتبراست، اما اتصال شکست خورد. لطفا تنظیمات و اعتبارهای سرور را بررسی کنید.",
+    "No action specified" : "فعالیتی مشخص نشده است",
+    "No configuration specified" : "هیچ پیکربندی مشخص نشده است",
+    "No data specified" : "داده ای مشخص نشده است",
+    "Deletion failed" : "حذف کردن انجام نشد",
+    "Keep settings?" : "آیا تنظیمات ذخیره شود ؟",
+    "{nthServer}. Server" : "سرور {nthServer}.",
+    "Cannot add server configuration" : "نمی توان پیکربندی سرور را اضافه نمود",
+    "mappings cleared" : "نگاشت پاک شده است",
+    "Success" : "موفقیت",
+    "Error" : "خطا",
+    "Please specify a Base DN" : "لطفا نام دامنه (DN) پایه را مشخص کنید.",
+    "Could not determine Base DN" : "امکان تشخیص نام دامنه (DN) پایه وجود ندارد",
+    "Please specify the port" : "لطفا پورت مورد نظر را مشخص کنید.",
+    "Configuration OK" : "پیکربندی صحیح است",
+    "Configuration incorrect" : "پیکربندی نادرست است",
+    "Configuration incomplete" : "پیکربندی کامل نیست",
+    "Select groups" : "انتخاب گروه ها",
+    "Select object classes" : "انتخاب کلاس های اشیا",
+    "Select attributes" : "انتخاب مشخصه ها",
+    "Connection test succeeded" : "تست اتصال با موفقیت انجام گردید",
+    "Connection test failed" : "تست اتصال ناموفق بود",
+    "Do you really want to delete the current Server Configuration?" : "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
+    "Confirm Deletion" : "تایید حذف",
+    "_%s group found_::_%s groups found_" : ["%s گروه بافت شد"],
+    "_%s user found_::_%s users found_" : ["%s کاربر بافت شد"],
+    "Invalid Host" : "هاست نامعتبر است",
+    "Server" : "سرور",
+    "User Filter" : "فیلتر کاربر",
+    "Login Filter" : "فیلتر لاگین",
+    "Group Filter" : "فیلتر گروه",
+    "Save" : "ذخیره",
+    "Test Configuration" : "امتحان پیکربندی",
+    "Help" : "راه‌نما",
+    "Raw LDAP filter" : "فیلتر ال.دپ خام",
+    "groups found" : "گروه های یافت شده",
+    "LDAP Username:" : "نام کاربری LDAP:",
+    "LDAP Email Address:" : "آدرس ایمیل LDAP:",
+    "Other Attributes:" : "مشخصه های دیگر:",
+    "1. Server" : "1. سرور",
+    "%s. Server:" : "%s. سرور:",
+    "Add Server Configuration" : "افزودن پیکربندی سرور",
+    "Delete Configuration" : "حذف پیکربندی",
+    "Host" : "میزبانی",
+    "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 مشخص کنید.",
+    "users found" : "کاربران یافت شده",
+    "Back" : "بازگشت",
+    "Continue" : "ادامه",
+    "Expert" : "حرفه ای",
+    "Advanced" : "پیشرفته",
+    "Connection Settings" : "تنظیمات اتصال",
+    "Configuration Active" : "پیکربندی فعال",
+    "When unchecked, this configuration will be skipped." : "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد.",
+    "Backup (Replica) Host" : "پشتیبان گیری (بدل) میزبان",
+    "Backup (Replica) Port" : "پشتیبان گیری (بدل) پورت",
+    "Disable Main Server" : "غیر فعال کردن سرور اصلی",
+    "Turn off SSL certificate validation." : "غیرفعال کردن اعتبار گواهی نامه SSL .",
+    "Directory Settings" : "تنظیمات پوشه",
+    "User Display Name Field" : "فیلد نام کاربر",
+    "Base User Tree" : "کاربر درخت پایه",
+    "One User Base DN per line" : "یک کاربر پایه DN در هر خط",
+    "User Search Attributes" : "ویژگی های جستجوی کاربر",
+    "Optional; one attribute per line" : "اختیاری؛ یک ویژگی در هر خط",
+    "Group Display Name Field" : "فیلد نام گروه",
+    "Base Group Tree" : "گروه درخت پایه ",
+    "One Group Base DN per line" : "یک گروه پایه DN در هر خط",
+    "Group Search Attributes" : "گروه صفات جستجو",
+    "Group-Member association" : "انجمن گروه کاربران",
+    "Special Attributes" : "ویژگی های مخصوص",
+    "Quota Field" : "سهمیه بندی انجام نشد.",
+    "Quota Default" : "سهمیه بندی پیش فرض",
+    "in bytes" : "در بایت",
+    "Email Field" : "ایمیل ارسال نشد.",
+    "User Home Folder Naming Rule" : "قانون نامگذاری پوشه خانه کاربر",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD.",
+    "Internal Username" : "نام کاربری داخلی",
+    "Internal Username Attribute:" : "ویژگی نام کاربری داخلی:",
+    "Override UUID detection" : "نادیده گرفتن تشخیص UUID ",
+    "Username-LDAP User Mapping" : "نام کاربری - نگاشت کاربر LDAP ",
+    "Clear Username-LDAP User Mapping" : "پاک کردن نام کاربری- LDAP  نگاشت کاربر ",
+    "Clear Groupname-LDAP Group Mapping" : "پاک کردن نام گروه -LDAP گروه نقشه برداری"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
deleted file mode 100644
index cf350991b44..00000000000
--- a/apps/user_ldap/l10n/fa.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "پیکربندی معتبراست، اما اتصال شکست خورد. لطفا تنظیمات و اعتبارهای سرور را بررسی کنید.",
-"No action specified" => "فعالیتی مشخص نشده است",
-"No configuration specified" => "هیچ پیکربندی مشخص نشده است",
-"No data specified" => "داده ای مشخص نشده است",
-"Deletion failed" => "حذف کردن انجام نشد",
-"Keep settings?" => "آیا تنظیمات ذخیره شود ؟",
-"{nthServer}. Server" => "سرور {nthServer}.",
-"Cannot add server configuration" => "نمی توان پیکربندی سرور را اضافه نمود",
-"mappings cleared" => "نگاشت پاک شده است",
-"Success" => "موفقیت",
-"Error" => "خطا",
-"Please specify a Base DN" => "لطفا نام دامنه (DN) پایه را مشخص کنید.",
-"Could not determine Base DN" => "امکان تشخیص نام دامنه (DN) پایه وجود ندارد",
-"Please specify the port" => "لطفا پورت مورد نظر را مشخص کنید.",
-"Configuration OK" => "پیکربندی صحیح است",
-"Configuration incorrect" => "پیکربندی نادرست است",
-"Configuration incomplete" => "پیکربندی کامل نیست",
-"Select groups" => "انتخاب گروه ها",
-"Select object classes" => "انتخاب کلاس های اشیا",
-"Select attributes" => "انتخاب مشخصه ها",
-"Connection test succeeded" => "تست اتصال با موفقیت انجام گردید",
-"Connection test failed" => "تست اتصال ناموفق بود",
-"Do you really want to delete the current Server Configuration?" => "آیا واقعا می خواهید پیکربندی کنونی سرور را حذف کنید؟",
-"Confirm Deletion" => "تایید حذف",
-"_%s group found_::_%s groups found_" => array("%s گروه بافت شد"),
-"_%s user found_::_%s users found_" => array("%s کاربر بافت شد"),
-"Invalid Host" => "هاست نامعتبر است",
-"Server" => "سرور",
-"User Filter" => "فیلتر کاربر",
-"Login Filter" => "فیلتر لاگین",
-"Group Filter" => "فیلتر گروه",
-"Save" => "ذخیره",
-"Test Configuration" => "امتحان پیکربندی",
-"Help" => "راه‌نما",
-"Raw LDAP filter" => "فیلتر ال.دپ خام",
-"groups found" => "گروه های یافت شده",
-"LDAP Username:" => "نام کاربری LDAP:",
-"LDAP Email Address:" => "آدرس ایمیل LDAP:",
-"Other Attributes:" => "مشخصه های دیگر:",
-"1. Server" => "1. سرور",
-"%s. Server:" => "%s. سرور:",
-"Add Server Configuration" => "افزودن پیکربندی سرور",
-"Delete Configuration" => "حذف پیکربندی",
-"Host" => "میزبانی",
-"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 مشخص کنید.",
-"users found" => "کاربران یافت شده",
-"Back" => "بازگشت",
-"Continue" => "ادامه",
-"Expert" => "حرفه ای",
-"Advanced" => "پیشرفته",
-"Connection Settings" => "تنظیمات اتصال",
-"Configuration Active" => "پیکربندی فعال",
-"When unchecked, this configuration will be skipped." => "زمانیکه انتخاب نشود، این پیکربندی نادیده گرفته خواهد شد.",
-"Backup (Replica) Host" => "پشتیبان گیری (بدل) میزبان",
-"Backup (Replica) Port" => "پشتیبان گیری (بدل) پورت",
-"Disable Main Server" => "غیر فعال کردن سرور اصلی",
-"Turn off SSL certificate validation." => "غیرفعال کردن اعتبار گواهی نامه SSL .",
-"Directory Settings" => "تنظیمات پوشه",
-"User Display Name Field" => "فیلد نام کاربر",
-"Base User Tree" => "کاربر درخت پایه",
-"One User Base DN per line" => "یک کاربر پایه DN در هر خط",
-"User Search Attributes" => "ویژگی های جستجوی کاربر",
-"Optional; one attribute per line" => "اختیاری؛ یک ویژگی در هر خط",
-"Group Display Name Field" => "فیلد نام گروه",
-"Base Group Tree" => "گروه درخت پایه ",
-"One Group Base DN per line" => "یک گروه پایه DN در هر خط",
-"Group Search Attributes" => "گروه صفات جستجو",
-"Group-Member association" => "انجمن گروه کاربران",
-"Special Attributes" => "ویژگی های مخصوص",
-"Quota Field" => "سهمیه بندی انجام نشد.",
-"Quota Default" => "سهمیه بندی پیش فرض",
-"in bytes" => "در بایت",
-"Email Field" => "ایمیل ارسال نشد.",
-"User Home Folder Naming Rule" => "قانون نامگذاری پوشه خانه کاربر",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "خالی گذاشتن برای نام کاربری (پیش فرض). در غیر این صورت، تعیین یک ویژگی LDAP/AD.",
-"Internal Username" => "نام کاربری داخلی",
-"Internal Username Attribute:" => "ویژگی نام کاربری داخلی:",
-"Override UUID detection" => "نادیده گرفتن تشخیص UUID ",
-"Username-LDAP User Mapping" => "نام کاربری - نگاشت کاربر LDAP ",
-"Clear Username-LDAP User Mapping" => "پاک کردن نام کاربری- LDAP  نگاشت کاربر ",
-"Clear Groupname-LDAP Group Mapping" => "پاک کردن نام گروه -LDAP گروه نقشه برداری"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/fi_FI.js b/apps/user_ldap/l10n/fi_FI.js
new file mode 100644
index 00000000000..a77da009fc8
--- /dev/null
+++ b/apps/user_ldap/l10n/fi_FI.js
@@ -0,0 +1,70 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to delete the server configuration" : "Palvelinmäärityksen poistaminen epäonnistui",
+    "The configuration is valid and the connection could be established!" : "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
+    "Deletion failed" : "Poisto epäonnistui",
+    "Take over settings from recent server configuration?" : "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?",
+    "Keep settings?" : "Säilytetäänkö asetukset?",
+    "Cannot add server configuration" : "Palvelinasetusten lisäys epäonnistui",
+    "Success" : "Onnistui!",
+    "Error" : "Virhe",
+    "Please specify the port" : "Määritä portti",
+    "Configuration OK" : "Määritykset OK",
+    "Configuration incorrect" : "Määritykset väärin",
+    "Configuration incomplete" : "Määritykset puutteelliset",
+    "Select groups" : "Valitse ryhmät",
+    "Connection test succeeded" : "Yhteystesti onnistui",
+    "Connection test failed" : "Yhteystesti epäonnistui",
+    "Do you really want to delete the current Server Configuration?" : "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
+    "Confirm Deletion" : "Vahvista poisto",
+    "_%s group found_::_%s groups found_" : ["%s ryhmä löytynyt","%s ryhmää löytynyt"],
+    "_%s user found_::_%s users found_" : ["%s käyttäjä löytynyt","%s käyttäjää löytynyt"],
+    "Server" : "Palvelin",
+    "Group Filter" : "Ryhmien suodatus",
+    "Save" : "Tallenna",
+    "Test Configuration" : "Testaa määritys",
+    "Help" : "Ohje",
+    "groups found" : "ryhmää löytynyt",
+    "LDAP Username:" : "LDAP-käyttäjätunnus:",
+    "LDAP Email Address:" : "LDAP-sähköpostiosoite:",
+    "1. Server" : "1. Palvelin",
+    "%s. Server:" : "%s. Palvelin:",
+    "Add Server Configuration" : "Lisää palvelinmääritys",
+    "Delete Configuration" : "Poista määritys",
+    "Host" : "Isäntä",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
+    "Port" : "Portti",
+    "User DN" : "Käyttäjän 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." : "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi.",
+    "Password" : "Salasana",
+    "For anonymous access, leave DN and Password empty." : "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  ",
+    "users found" : "käyttäjää löytynyt",
+    "Back" : "Takaisin",
+    "Continue" : "Jatka",
+    "Advanced" : "Lisäasetukset",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.",
+    "Connection Settings" : "Yhteysasetukset",
+    "Backup (Replica) Host" : "Varmuuskopioinnin (replikointi) palvelin",
+    "Backup (Replica) Port" : "Varmuuskopioinnin (replikoinnin) portti",
+    "Disable Main Server" : "Poista pääpalvelin käytöstä",
+    "Only connect to the replica server." : "Yhdistä vain replikointipalvelimeen.",
+    "Case insensitive LDAP server (Windows)" : "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
+    "Turn off SSL certificate validation." : "Poista käytöstä SSL-varmenteen vahvistus",
+    "in seconds. A change empties the cache." : "sekunneissa. Muutos tyhjentää välimuistin.",
+    "Directory Settings" : "Hakemistoasetukset",
+    "User Display Name Field" : "Käyttäjän näytettävän nimen kenttä",
+    "Base User Tree" : "Oletuskäyttäjäpuu",
+    "Group Display Name Field" : "Ryhmän \"näytettävä nimi\"-kenttä",
+    "Base Group Tree" : "Ryhmien juuri",
+    "Group-Member association" : "Ryhmän ja jäsenen assosiaatio (yhteys)",
+    "Quota Field" : "Kiintiökenttä",
+    "Quota Default" : "Oletuskiintiö",
+    "in bytes" : "tavuissa",
+    "Email Field" : "Sähköpostikenttä",
+    "User Home Folder Naming Rule" : "Käyttäjän kotihakemiston nimeämissääntö",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.",
+    "Internal Username" : "Sisäinen käyttäjänimi"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/fi_FI.json b/apps/user_ldap/l10n/fi_FI.json
new file mode 100644
index 00000000000..a8bf945741e
--- /dev/null
+++ b/apps/user_ldap/l10n/fi_FI.json
@@ -0,0 +1,68 @@
+{ "translations": {
+    "Failed to delete the server configuration" : "Palvelinmäärityksen poistaminen epäonnistui",
+    "The configuration is valid and the connection could be established!" : "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
+    "Deletion failed" : "Poisto epäonnistui",
+    "Take over settings from recent server configuration?" : "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?",
+    "Keep settings?" : "Säilytetäänkö asetukset?",
+    "Cannot add server configuration" : "Palvelinasetusten lisäys epäonnistui",
+    "Success" : "Onnistui!",
+    "Error" : "Virhe",
+    "Please specify the port" : "Määritä portti",
+    "Configuration OK" : "Määritykset OK",
+    "Configuration incorrect" : "Määritykset väärin",
+    "Configuration incomplete" : "Määritykset puutteelliset",
+    "Select groups" : "Valitse ryhmät",
+    "Connection test succeeded" : "Yhteystesti onnistui",
+    "Connection test failed" : "Yhteystesti epäonnistui",
+    "Do you really want to delete the current Server Configuration?" : "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
+    "Confirm Deletion" : "Vahvista poisto",
+    "_%s group found_::_%s groups found_" : ["%s ryhmä löytynyt","%s ryhmää löytynyt"],
+    "_%s user found_::_%s users found_" : ["%s käyttäjä löytynyt","%s käyttäjää löytynyt"],
+    "Server" : "Palvelin",
+    "Group Filter" : "Ryhmien suodatus",
+    "Save" : "Tallenna",
+    "Test Configuration" : "Testaa määritys",
+    "Help" : "Ohje",
+    "groups found" : "ryhmää löytynyt",
+    "LDAP Username:" : "LDAP-käyttäjätunnus:",
+    "LDAP Email Address:" : "LDAP-sähköpostiosoite:",
+    "1. Server" : "1. Palvelin",
+    "%s. Server:" : "%s. Palvelin:",
+    "Add Server Configuration" : "Lisää palvelinmääritys",
+    "Delete Configuration" : "Poista määritys",
+    "Host" : "Isäntä",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
+    "Port" : "Portti",
+    "User DN" : "Käyttäjän 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." : "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi.",
+    "Password" : "Salasana",
+    "For anonymous access, leave DN and Password empty." : "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  ",
+    "users found" : "käyttäjää löytynyt",
+    "Back" : "Takaisin",
+    "Continue" : "Jatka",
+    "Advanced" : "Lisäasetukset",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.",
+    "Connection Settings" : "Yhteysasetukset",
+    "Backup (Replica) Host" : "Varmuuskopioinnin (replikointi) palvelin",
+    "Backup (Replica) Port" : "Varmuuskopioinnin (replikoinnin) portti",
+    "Disable Main Server" : "Poista pääpalvelin käytöstä",
+    "Only connect to the replica server." : "Yhdistä vain replikointipalvelimeen.",
+    "Case insensitive LDAP server (Windows)" : "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
+    "Turn off SSL certificate validation." : "Poista käytöstä SSL-varmenteen vahvistus",
+    "in seconds. A change empties the cache." : "sekunneissa. Muutos tyhjentää välimuistin.",
+    "Directory Settings" : "Hakemistoasetukset",
+    "User Display Name Field" : "Käyttäjän näytettävän nimen kenttä",
+    "Base User Tree" : "Oletuskäyttäjäpuu",
+    "Group Display Name Field" : "Ryhmän \"näytettävä nimi\"-kenttä",
+    "Base Group Tree" : "Ryhmien juuri",
+    "Group-Member association" : "Ryhmän ja jäsenen assosiaatio (yhteys)",
+    "Quota Field" : "Kiintiökenttä",
+    "Quota Default" : "Oletuskiintiö",
+    "in bytes" : "tavuissa",
+    "Email Field" : "Sähköpostikenttä",
+    "User Home Folder Naming Rule" : "Käyttäjän kotihakemiston nimeämissääntö",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.",
+    "Internal Username" : "Sisäinen käyttäjänimi"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
deleted file mode 100644
index 8768c6e989f..00000000000
--- a/apps/user_ldap/l10n/fi_FI.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Palvelinmäärityksen poistaminen epäonnistui",
-"The configuration is valid and the connection could be established!" => "Määritys on kelvollinen ja yhteys kyettiin muodostamaan!",
-"Deletion failed" => "Poisto epäonnistui",
-"Take over settings from recent server configuration?" => "Otetaanko asetukset viimeisimmistä palvelinmäärityksistä?",
-"Keep settings?" => "Säilytetäänkö asetukset?",
-"Cannot add server configuration" => "Palvelinasetusten lisäys epäonnistui",
-"Success" => "Onnistui!",
-"Error" => "Virhe",
-"Please specify the port" => "Määritä portti",
-"Configuration OK" => "Määritykset OK",
-"Configuration incorrect" => "Määritykset väärin",
-"Configuration incomplete" => "Määritykset puutteelliset",
-"Select groups" => "Valitse ryhmät",
-"Connection test succeeded" => "Yhteystesti onnistui",
-"Connection test failed" => "Yhteystesti epäonnistui",
-"Do you really want to delete the current Server Configuration?" => "Haluatko varmasti poistaa nykyisen palvelinmäärityksen?",
-"Confirm Deletion" => "Vahvista poisto",
-"_%s group found_::_%s groups found_" => array("%s ryhmä löytynyt","%s ryhmää löytynyt"),
-"_%s user found_::_%s users found_" => array("%s käyttäjä löytynyt","%s käyttäjää löytynyt"),
-"Server" => "Palvelin",
-"Group Filter" => "Ryhmien suodatus",
-"Save" => "Tallenna",
-"Test Configuration" => "Testaa määritys",
-"Help" => "Ohje",
-"groups found" => "ryhmää löytynyt",
-"LDAP Username:" => "LDAP-käyttäjätunnus:",
-"LDAP Email Address:" => "LDAP-sähköpostiosoite:",
-"1. Server" => "1. Palvelin",
-"%s. Server:" => "%s. Palvelin:",
-"Add Server Configuration" => "Lisää palvelinmääritys",
-"Delete Configuration" => "Poista määritys",
-"Host" => "Isäntä",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://",
-"Port" => "Portti",
-"User DN" => "Käyttäjän 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." => "Asiakasohjelman DN, jolla yhdistäminen tehdään, ts. uid=agent,dc=example,dc=com. Mahdollistaaksesi anonyymin yhteyden, jätä DN ja salasana tyhjäksi.",
-"Password" => "Salasana",
-"For anonymous access, leave DN and Password empty." => "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi ",
-"You can specify Base DN for users and groups in the Advanced tab" => "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset'-välilehdeltä  ",
-"users found" => "käyttäjää löytynyt",
-"Back" => "Takaisin",
-"Continue" => "Jatka",
-"Advanced" => "Lisäasetukset",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.",
-"Connection Settings" => "Yhteysasetukset",
-"Backup (Replica) Host" => "Varmuuskopioinnin (replikointi) palvelin",
-"Backup (Replica) Port" => "Varmuuskopioinnin (replikoinnin) portti",
-"Disable Main Server" => "Poista pääpalvelin käytöstä",
-"Only connect to the replica server." => "Yhdistä vain replikointipalvelimeen.",
-"Case insensitive LDAP server (Windows)" => "Kirjainkoosta piittamaton LDAP-palvelin (Windows)",
-"Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus",
-"in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.",
-"Directory Settings" => "Hakemistoasetukset",
-"User Display Name Field" => "Käyttäjän näytettävän nimen kenttä",
-"Base User Tree" => "Oletuskäyttäjäpuu",
-"Group Display Name Field" => "Ryhmän \"näytettävä nimi\"-kenttä",
-"Base Group Tree" => "Ryhmien juuri",
-"Group-Member association" => "Ryhmän ja jäsenen assosiaatio (yhteys)",
-"Quota Field" => "Kiintiökenttä",
-"Quota Default" => "Oletuskiintiö",
-"in bytes" => "tavuissa",
-"Email Field" => "Sähköpostikenttä",
-"User Home Folder Naming Rule" => "Käyttäjän kotihakemiston nimeämissääntö",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.",
-"Internal Username" => "Sisäinen käyttäjänimi"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/fil.js b/apps/user_ldap/l10n/fil.js
new file mode 100644
index 00000000000..95c97db2f9c
--- /dev/null
+++ b/apps/user_ldap/l10n/fil.js
@@ -0,0 +1,7 @@
+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/fil.json b/apps/user_ldap/l10n/fil.json
new file mode 100644
index 00000000000..8e0cd6f6783
--- /dev/null
+++ b/apps/user_ldap/l10n/fil.json
@@ -0,0 +1,5 @@
+{ "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/fil.php b/apps/user_ldap/l10n/fil.php
deleted file mode 100644
index 2371ee70593..00000000000
--- a/apps/user_ldap/l10n/fil.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
new file mode 100644
index 00000000000..2433d051d83
--- /dev/null
+++ b/apps/user_ldap/l10n/fr.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Erreur lors de la suppression des associations.",
+    "Failed to delete the server configuration" : "Échec de la suppression de la configuration du serveur",
+    "The configuration is valid and the connection could be established!" : "La configuration est valide et la connexion peut être établie !",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuration est invalide. Veuillez consulter les logs pour plus de détails.",
+    "No action specified" : "Aucune action spécifiée",
+    "No configuration specified" : "Aucune configuration spécifiée",
+    "No data specified" : "Aucune donnée spécifiée",
+    " Could not set configuration %s" : "Impossible de spécifier la configuration %s",
+    "Deletion failed" : "La suppression a échoué",
+    "Take over settings from recent server configuration?" : "Récupérer les paramètres depuis une configuration récente du serveur ?",
+    "Keep settings?" : "Garder ces paramètres ?",
+    "{nthServer}. Server" : "{nthServer}. Serveur",
+    "Cannot add server configuration" : "Impossible d'ajouter la configuration du serveur",
+    "mappings cleared" : "associations supprimées",
+    "Success" : "Succès",
+    "Error" : "Erreur",
+    "Please specify a Base DN" : "Veuillez spécifier une Base DN",
+    "Could not determine Base DN" : "Impossible de déterminer la Base DN",
+    "Please specify the port" : "Veuillez indiquer le port",
+    "Configuration OK" : "Configuration OK",
+    "Configuration incorrect" : "Configuration incorrecte",
+    "Configuration incomplete" : "Configuration incomplète",
+    "Select groups" : "Sélectionnez les groupes",
+    "Select object classes" : "Sélectionner les classes d'objet",
+    "Select attributes" : "Sélectionner les attributs",
+    "Connection test succeeded" : "Test de connexion réussi",
+    "Connection test failed" : "Test de connexion échoué",
+    "Do you really want to delete the current Server Configuration?" : "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
+    "Confirm Deletion" : "Confirmer la suppression",
+    "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
+    "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
+    "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée",
+    "Invalid Host" : "Hôte invalide",
+    "Server" : "Serveur",
+    "User Filter" : "Filtre utilisateur",
+    "Login Filter" : "Filtre par nom d'utilisateur",
+    "Group Filter" : "Filtre de groupes",
+    "Save" : "Sauvegarder",
+    "Test Configuration" : "Tester la configuration",
+    "Help" : "Aide",
+    "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :",
+    "only those object classes:" : "seulement ces classes d'objet :",
+    "only from those groups:" : "seulement de ces groupes :",
+    "Edit raw filter instead" : "Éditer le filtre raw à la place",
+    "Raw LDAP filter" : "Filtre Raw LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Le filtre spécifie quels groupes LDAP doivent avoir accès à l'instance %s.",
+    "Test Filter" : "Test du filtre",
+    "groups found" : "groupes trouvés",
+    "Users login with this attribute:" : "Utilisateurs se connectant avec cet attribut :",
+    "LDAP Username:" : "Nom d'utilisateur LDAP :",
+    "LDAP Email Address:" : "Adresse email LDAP :",
+    "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 le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"",
+    "1. Server" : "1. Serveur",
+    "%s. Server:" : "%s. Serveur:",
+    "Add Server Configuration" : "Ajouter une configuration du serveur",
+    "Delete Configuration" : "Suppression de la configuration",
+    "Host" : "Hôte",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
+    "Port" : "Port",
+    "User DN" : "DN Utilisateur (Autorisé à consulter l'annuaire)",
+    "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'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
+    "Password" : "Mot de passe",
+    "For anonymous access, leave DN and Password empty." : "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
+    "One Base DN per line" : "Un DN racine par ligne",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite les requêtes LDAP automatiques. Mieux pour les installations de grande ampleur, mais demande des connaissances en LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
+    "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
+    "users found" : "utilisateurs trouvés",
+    "Saving" : "Enregistrement...",
+    "Back" : "Retour",
+    "Continue" : "Poursuivre",
+    "Expert" : "Expert",
+    "Advanced" : "Avancé",
+    "<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 et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.",
+    "Connection Settings" : "Paramètres de connexion",
+    "Configuration Active" : "Configuration active",
+    "When unchecked, this configuration will be skipped." : "Lorsque non cochée, la configuration sera ignorée.",
+    "Backup (Replica) Host" : "Serveur de backup (réplique)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fournir un serveur de backup optionnel.  Il doit s'agir d'une réplique du serveur LDAP/AD principal.",
+    "Backup (Replica) Port" : "Port du serveur de backup (réplique)",
+    "Disable Main Server" : "Désactiver le serveur principal",
+    "Only connect to the replica server." : "Se connecter uniquement au serveur de replica.",
+    "Case insensitive LDAP server (Windows)" : "Serveur LDAP insensible à la casse (Windows)",
+    "Turn off SSL certificate validation." : "Désactiver la validation du certificat SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
+    "Cache Time-To-Live" : "Durée de vie du cache",
+    "in seconds. A change empties the cache." : "en secondes. Tout changement vide le cache.",
+    "Directory Settings" : "Paramètres du répertoire",
+    "User Display Name Field" : "Champ \"nom d'affichage\" de l'utilisateur",
+    "The LDAP attribute to use to generate the user's display name." : "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.",
+    "Base User Tree" : "DN racine de l'arbre utilisateurs",
+    "One User Base DN per line" : "Un DN racine utilisateur par ligne",
+    "User Search Attributes" : "Recherche des attributs utilisateur",
+    "Optional; one attribute per line" : "Optionnel, un attribut par ligne",
+    "Group Display Name Field" : "Champ \"nom d'affichage\" du groupe",
+    "The LDAP attribute to use to generate the groups's display name." : "L'attribut LDAP utilisé pour générer le nom de groupe affiché.",
+    "Base Group Tree" : "DN racine de l'arbre groupes",
+    "One Group Base DN per line" : "Un DN racine groupe par ligne",
+    "Group Search Attributes" : "Recherche des attributs du groupe",
+    "Group-Member association" : "Association groupe-membre",
+    "Nested Groups" : "Groupes imbriqués",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
+    "Paging chunksize" : "Dimensionnement des paginations",
+    "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.)" : "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)",
+    "Special Attributes" : "Attributs spéciaux",
+    "Quota Field" : "Champ du quota",
+    "Quota Default" : "Quota par défaut",
+    "in bytes" : "en bytes",
+    "Email Field" : "Champ Email",
+    "User Home Folder Naming Rule" : "Convention de nommage du répertoire utilisateur",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
+    "Internal Username" : "Nom d'utilisateur 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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
+    "Internal Username Attribute:" : "Nom d'utilisateur interne:",
+    "Override UUID detection" : "Surcharger la détection d'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." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
+    "UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :",
+    "UUID Attribute for Groups:" : "Attribut UUID pour les groupes :",
+    "Username-LDAP User Mapping" : "Association Nom d'utilisateur-Utilisateur LDAP",
+    "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." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
+    "Clear Username-LDAP User Mapping" : "Supprimer l'association utilisateur interne-utilisateur LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Supprimer l'association nom de groupe-groupe LDAP"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
new file mode 100644
index 00000000000..11a4844add6
--- /dev/null
+++ b/apps/user_ldap/l10n/fr.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Erreur lors de la suppression des associations.",
+    "Failed to delete the server configuration" : "Échec de la suppression de la configuration du serveur",
+    "The configuration is valid and the connection could be established!" : "La configuration est valide et la connexion peut être établie !",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configuration est invalide. Veuillez consulter les logs pour plus de détails.",
+    "No action specified" : "Aucune action spécifiée",
+    "No configuration specified" : "Aucune configuration spécifiée",
+    "No data specified" : "Aucune donnée spécifiée",
+    " Could not set configuration %s" : "Impossible de spécifier la configuration %s",
+    "Deletion failed" : "La suppression a échoué",
+    "Take over settings from recent server configuration?" : "Récupérer les paramètres depuis une configuration récente du serveur ?",
+    "Keep settings?" : "Garder ces paramètres ?",
+    "{nthServer}. Server" : "{nthServer}. Serveur",
+    "Cannot add server configuration" : "Impossible d'ajouter la configuration du serveur",
+    "mappings cleared" : "associations supprimées",
+    "Success" : "Succès",
+    "Error" : "Erreur",
+    "Please specify a Base DN" : "Veuillez spécifier une Base DN",
+    "Could not determine Base DN" : "Impossible de déterminer la Base DN",
+    "Please specify the port" : "Veuillez indiquer le port",
+    "Configuration OK" : "Configuration OK",
+    "Configuration incorrect" : "Configuration incorrecte",
+    "Configuration incomplete" : "Configuration incomplète",
+    "Select groups" : "Sélectionnez les groupes",
+    "Select object classes" : "Sélectionner les classes d'objet",
+    "Select attributes" : "Sélectionner les attributs",
+    "Connection test succeeded" : "Test de connexion réussi",
+    "Connection test failed" : "Test de connexion échoué",
+    "Do you really want to delete the current Server Configuration?" : "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
+    "Confirm Deletion" : "Confirmer la suppression",
+    "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
+    "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
+    "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée",
+    "Invalid Host" : "Hôte invalide",
+    "Server" : "Serveur",
+    "User Filter" : "Filtre utilisateur",
+    "Login Filter" : "Filtre par nom d'utilisateur",
+    "Group Filter" : "Filtre de groupes",
+    "Save" : "Sauvegarder",
+    "Test Configuration" : "Tester la configuration",
+    "Help" : "Aide",
+    "Groups meeting these criteria are available in %s:" : "Les groupes respectant ces critères sont disponibles dans %s :",
+    "only those object classes:" : "seulement ces classes d'objet :",
+    "only from those groups:" : "seulement de ces groupes :",
+    "Edit raw filter instead" : "Éditer le filtre raw à la place",
+    "Raw LDAP filter" : "Filtre Raw LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Le filtre spécifie quels groupes LDAP doivent avoir accès à l'instance %s.",
+    "Test Filter" : "Test du filtre",
+    "groups found" : "groupes trouvés",
+    "Users login with this attribute:" : "Utilisateurs se connectant avec cet attribut :",
+    "LDAP Username:" : "Nom d'utilisateur LDAP :",
+    "LDAP Email Address:" : "Adresse email LDAP :",
+    "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 le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"",
+    "1. Server" : "1. Serveur",
+    "%s. Server:" : "%s. Serveur:",
+    "Add Server Configuration" : "Ajouter une configuration du serveur",
+    "Delete Configuration" : "Suppression de la configuration",
+    "Host" : "Hôte",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
+    "Port" : "Port",
+    "User DN" : "DN Utilisateur (Autorisé à consulter l'annuaire)",
+    "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'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
+    "Password" : "Mot de passe",
+    "For anonymous access, leave DN and Password empty." : "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
+    "One Base DN per line" : "Un DN racine par ligne",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Évite les requêtes LDAP automatiques. Mieux pour les installations de grande ampleur, mais demande des connaissances en LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
+    "Limit %s access to users meeting these criteria:" : "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
+    "users found" : "utilisateurs trouvés",
+    "Saving" : "Enregistrement...",
+    "Back" : "Retour",
+    "Continue" : "Poursuivre",
+    "Expert" : "Expert",
+    "Advanced" : "Avancé",
+    "<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 et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.",
+    "Connection Settings" : "Paramètres de connexion",
+    "Configuration Active" : "Configuration active",
+    "When unchecked, this configuration will be skipped." : "Lorsque non cochée, la configuration sera ignorée.",
+    "Backup (Replica) Host" : "Serveur de backup (réplique)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fournir un serveur de backup optionnel.  Il doit s'agir d'une réplique du serveur LDAP/AD principal.",
+    "Backup (Replica) Port" : "Port du serveur de backup (réplique)",
+    "Disable Main Server" : "Désactiver le serveur principal",
+    "Only connect to the replica server." : "Se connecter uniquement au serveur de replica.",
+    "Case insensitive LDAP server (Windows)" : "Serveur LDAP insensible à la casse (Windows)",
+    "Turn off SSL certificate validation." : "Désactiver la validation du certificat SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
+    "Cache Time-To-Live" : "Durée de vie du cache",
+    "in seconds. A change empties the cache." : "en secondes. Tout changement vide le cache.",
+    "Directory Settings" : "Paramètres du répertoire",
+    "User Display Name Field" : "Champ \"nom d'affichage\" de l'utilisateur",
+    "The LDAP attribute to use to generate the user's display name." : "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.",
+    "Base User Tree" : "DN racine de l'arbre utilisateurs",
+    "One User Base DN per line" : "Un DN racine utilisateur par ligne",
+    "User Search Attributes" : "Recherche des attributs utilisateur",
+    "Optional; one attribute per line" : "Optionnel, un attribut par ligne",
+    "Group Display Name Field" : "Champ \"nom d'affichage\" du groupe",
+    "The LDAP attribute to use to generate the groups's display name." : "L'attribut LDAP utilisé pour générer le nom de groupe affiché.",
+    "Base Group Tree" : "DN racine de l'arbre groupes",
+    "One Group Base DN per line" : "Un DN racine groupe par ligne",
+    "Group Search Attributes" : "Recherche des attributs du groupe",
+    "Group-Member association" : "Association groupe-membre",
+    "Nested Groups" : "Groupes imbriqués",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
+    "Paging chunksize" : "Dimensionnement des paginations",
+    "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.)" : "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)",
+    "Special Attributes" : "Attributs spéciaux",
+    "Quota Field" : "Champ du quota",
+    "Quota Default" : "Quota par défaut",
+    "in bytes" : "en bytes",
+    "Email Field" : "Champ Email",
+    "User Home Folder Naming Rule" : "Convention de nommage du répertoire utilisateur",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
+    "Internal Username" : "Nom d'utilisateur 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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
+    "Internal Username Attribute:" : "Nom d'utilisateur interne:",
+    "Override UUID detection" : "Surcharger la détection d'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." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
+    "UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :",
+    "UUID Attribute for Groups:" : "Attribut UUID pour les groupes :",
+    "Username-LDAP User Mapping" : "Association Nom d'utilisateur-Utilisateur LDAP",
+    "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." : "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
+    "Clear Username-LDAP User Mapping" : "Supprimer l'association utilisateur interne-utilisateur LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Supprimer l'association nom de groupe-groupe LDAP"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
deleted file mode 100644
index 0108c0e54bc..00000000000
--- a/apps/user_ldap/l10n/fr.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Erreur lors de la suppression des associations.",
-"Failed to delete the server configuration" => "Échec de la suppression de la configuration du serveur",
-"The configuration is valid and the connection could be established!" => "La configuration est valide et la connexion peut être établie !",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configuration est valide, mais le lien ne peut être établi. Veuillez vérifier les paramètres du serveur ainsi que vos identifiants de connexion.",
-"The configuration is invalid. Please have a look at the logs for further details." => "La configuration est invalide. Veuillez consulter les logs pour plus de détails.",
-"No action specified" => "Aucune action spécifiée",
-"No configuration specified" => "Aucune configuration spécifiée",
-"No data specified" => "Aucune donnée spécifiée",
-" Could not set configuration %s" => "Impossible de spécifier la configuration %s",
-"Deletion failed" => "La suppression a échoué",
-"Take over settings from recent server configuration?" => "Récupérer les paramètres depuis une configuration récente du serveur ?",
-"Keep settings?" => "Garder ces paramètres ?",
-"{nthServer}. Server" => "{nthServer}. Serveur",
-"Cannot add server configuration" => "Impossible d'ajouter la configuration du serveur",
-"mappings cleared" => "associations supprimées",
-"Success" => "Succès",
-"Error" => "Erreur",
-"Please specify a Base DN" => "Veuillez spécifier une Base DN",
-"Could not determine Base DN" => "Impossible de déterminer la Base DN",
-"Please specify the port" => "Veuillez indiquer le port",
-"Configuration OK" => "Configuration OK",
-"Configuration incorrect" => "Configuration incorrecte",
-"Configuration incomplete" => "Configuration incomplète",
-"Select groups" => "Sélectionnez les groupes",
-"Select object classes" => "Sélectionner les classes d'objet",
-"Select attributes" => "Sélectionner les attributs",
-"Connection test succeeded" => "Test de connexion réussi",
-"Connection test failed" => "Test de connexion échoué",
-"Do you really want to delete the current Server Configuration?" => "Êtes-vous vraiment sûr de vouloir effacer la configuration actuelle du serveur ?",
-"Confirm Deletion" => "Confirmer la suppression",
-"_%s group found_::_%s groups found_" => array("%s groupe trouvé","%s groupes trouvés"),
-"_%s user found_::_%s users found_" => array("%s utilisateur trouvé","%s utilisateurs trouvés"),
-"Could not find the desired feature" => "Impossible de trouver la fonction souhaitée",
-"Invalid Host" => "Hôte invalide",
-"Server" => "Serveur",
-"User Filter" => "Filtre utilisateur",
-"Login Filter" => "Filtre par nom d'utilisateur",
-"Group Filter" => "Filtre de groupes",
-"Save" => "Sauvegarder",
-"Test Configuration" => "Tester la configuration",
-"Help" => "Aide",
-"Groups meeting these criteria are available in %s:" => "Les groupes respectant ces critères sont disponibles dans %s :",
-"only those object classes:" => "seulement ces classes d'objet :",
-"only from those groups:" => "seulement de ces groupes :",
-"Edit raw filter instead" => "Éditer le filtre raw à la place",
-"Raw LDAP filter" => "Filtre Raw LDAP",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Le filtre spécifie quels groupes LDAP doivent avoir accès à l'instance %s.",
-"Test Filter" => "Test du filtre",
-"groups found" => "groupes trouvés",
-"Users login with this attribute:" => "Utilisateurs se connectant avec cet attribut :",
-"LDAP Username:" => "Nom d'utilisateur LDAP :",
-"LDAP Email Address:" => "Adresse email LDAP :",
-"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 le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"",
-"1. Server" => "1. Serveur",
-"%s. Server:" => "%s. Serveur:",
-"Add Server Configuration" => "Ajouter une configuration du serveur",
-"Delete Configuration" => "Suppression de la configuration",
-"Host" => "Hôte",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://",
-"Port" => "Port",
-"User DN" => "DN Utilisateur (Autorisé à consulter l'annuaire)",
-"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'utilisateur client pour lequel la liaison doit se faire, par exemple uid=agent,dc=example,dc=com. Pour un accès anonyme, laisser le DN et le mot de passe vides.",
-"Password" => "Mot de passe",
-"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN utilisateur et le mot de passe vides.",
-"One Base DN per line" => "Un DN racine par ligne",
-"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez spécifier les DN Racines de vos utilisateurs et groupes via l'onglet Avancé",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Évite les requêtes LDAP automatiques. Mieux pour les installations de grande ampleur, mais demande des connaissances en LDAP.",
-"Manually enter LDAP filters (recommended for large directories)" => "Entrée manuelle des filtres LDAP (recommandé pour les annuaires de grande ampleur)",
-"Limit %s access to users meeting these criteria:" => "Limiter l'accès à %s aux utilisateurs respectant ces critères :",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Le filtre spécifie quels utilisateurs LDAP doivent avoir accès à l'instance %s.",
-"users found" => "utilisateurs trouvés",
-"Saving" => "Enregistrement...",
-"Back" => "Retour",
-"Continue" => "Poursuivre",
-"Expert" => "Expert",
-"Advanced" => "Avancé",
-"<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 et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Attention :</b> Le module php LDAP n'est pas installé, par conséquent cette extension ne pourra fonctionner. Veuillez contacter votre administrateur système afin qu'il l'installe.",
-"Connection Settings" => "Paramètres de connexion",
-"Configuration Active" => "Configuration active",
-"When unchecked, this configuration will be skipped." => "Lorsque non cochée, la configuration sera ignorée.",
-"Backup (Replica) Host" => "Serveur de backup (réplique)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Fournir un serveur de backup optionnel.  Il doit s'agir d'une réplique du serveur LDAP/AD principal.",
-"Backup (Replica) Port" => "Port du serveur de backup (réplique)",
-"Disable Main Server" => "Désactiver le serveur principal",
-"Only connect to the replica server." => "Se connecter uniquement au serveur de replica.",
-"Case insensitive LDAP server (Windows)" => "Serveur LDAP insensible à la casse (Windows)",
-"Turn off SSL certificate validation." => "Désactiver la validation du certificat SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recommandé, à utiliser à des fins de tests uniquement. Si la connexion ne fonctionne qu'avec cette option, importez le certificat SSL du serveur LDAP dans le serveur %s.",
-"Cache Time-To-Live" => "Durée de vie du cache",
-"in seconds. A change empties the cache." => "en secondes. Tout changement vide le cache.",
-"Directory Settings" => "Paramètres du répertoire",
-"User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur",
-"The LDAP attribute to use to generate the user's display name." => "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.",
-"Base User Tree" => "DN racine de l'arbre utilisateurs",
-"One User Base DN per line" => "Un DN racine utilisateur par ligne",
-"User Search Attributes" => "Recherche des attributs utilisateur",
-"Optional; one attribute per line" => "Optionnel, un attribut par ligne",
-"Group Display Name Field" => "Champ \"nom d'affichage\" du groupe",
-"The LDAP attribute to use to generate the groups's display name." => "L'attribut LDAP utilisé pour générer le nom de groupe affiché.",
-"Base Group Tree" => "DN racine de l'arbre groupes",
-"One Group Base DN per line" => "Un DN racine groupe par ligne",
-"Group Search Attributes" => "Recherche des attributs du groupe",
-"Group-Member association" => "Association groupe-membre",
-"Nested Groups" => "Groupes imbriqués",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
-"Paging chunksize" => "Dimensionnement des paginations",
-"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.)" => "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)",
-"Special Attributes" => "Attributs spéciaux",
-"Quota Field" => "Champ du quota",
-"Quota Default" => "Quota par défaut",
-"in bytes" => "en bytes",
-"Email Field" => "Champ Email",
-"User Home Folder Naming Rule" => "Convention de nommage du répertoire utilisateur",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
-"Internal Username" => "Nom d'utilisateur 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." => "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
-"Internal Username Attribute:" => "Nom d'utilisateur interne:",
-"Override UUID detection" => "Surcharger la détection d'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." => "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
-"UUID Attribute for Users:" => "Attribut UUID pour les utilisateurs :",
-"UUID Attribute for Groups:" => "Attribut UUID pour les groupes :",
-"Username-LDAP User Mapping" => "Association Nom d'utilisateur-Utilisateur LDAP",
-"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." => "Les noms d'utilisateurs sont utilisés pour le stockage et l'assignation de (meta) données. Pour identifier et reconnaitre précisément les utilisateurs, chaque utilisateur LDAP aura un nom interne spécifique. Cela requiert l'association d'un nom d'utilisateur ownCloud à un nom d'utilisateur LDAP. Le nom d'utilisateur créé est associé à l'attribut UUID de l'utilisateur LDAP. Par ailleurs, le DN est mémorisé en cache pour limiter les interactions LDAP mais il n'est pas utilisé pour l'identification. Si le DN est modifié, ces modifications seront retrouvées. Seul le nom interne à ownCloud est utilisé au sein du produit. Supprimer les associations créera des orphelins et l'action affectera toutes les configurations LDAP. NE JAMAIS SUPPRIMER LES ASSOCIATIONS EN ENVIRONNEMENT DE PRODUCTION, mais uniquement sur des environnements de tests et d'expérimentation.",
-"Clear Username-LDAP User Mapping" => "Supprimer l'association utilisateur interne-utilisateur LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Supprimer l'association nom de groupe-groupe LDAP"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/fr_CA.js b/apps/user_ldap/l10n/fr_CA.js
new file mode 100644
index 00000000000..95c97db2f9c
--- /dev/null
+++ b/apps/user_ldap/l10n/fr_CA.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..8e0cd6f6783
--- /dev/null
+++ b/apps/user_ldap/l10n/fr_CA.json
@@ -0,0 +1,5 @@
+{ "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/fr_CA.php b/apps/user_ldap/l10n/fr_CA.php
deleted file mode 100644
index 2371ee70593..00000000000
--- a/apps/user_ldap/l10n/fr_CA.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/fy_NL.js b/apps/user_ldap/l10n/fy_NL.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/fy_NL.js
@@ -0,0 +1,7 @@
+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/fy_NL.json b/apps/user_ldap/l10n/fy_NL.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/fy_NL.json
@@ -0,0 +1,5 @@
+{ "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/fy_NL.php b/apps/user_ldap/l10n/fy_NL.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/fy_NL.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/gl.js b/apps/user_ldap/l10n/gl.js
new file mode 100644
index 00000000000..ef75c8df65c
--- /dev/null
+++ b/apps/user_ldap/l10n/gl.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Non foi posíbel limpar as asignacións.",
+    "Failed to delete the server configuration" : "Non foi posíbel eliminar a configuración do servidor",
+    "The configuration is valid and the connection could be established!" : "A configuración é correcta e pode estabelecerse a conexión.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles",
+    "No action specified" : "Non se especificou unha acción",
+    "No configuration specified" : "Non se especificou unha configuración",
+    "No data specified" : "Non se especificaron datos",
+    " Could not set configuration %s" : "Non foi posíbel estabelecer a configuración %s",
+    "Deletion failed" : "Produciuse un fallo ao eliminar",
+    "Take over settings from recent server configuration?" : "Tomar os recentes axustes de configuración do servidor?",
+    "Keep settings?" : "Manter os axustes?",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
+    "Cannot add server configuration" : "Non é posíbel engadir a configuración do servidor",
+    "mappings cleared" : "limpadas as asignacións",
+    "Success" : "Correcto",
+    "Error" : "Erro",
+    "Please specify a Base DN" : "Por favor indique un DN base",
+    "Could not determine Base DN" : "Non se puido determinar o DN base",
+    "Please specify the port" : "Por favor indique un porto",
+    "Configuration OK" : "Configuración correcta",
+    "Configuration incorrect" : "Configuración incorrecta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Seleccione as clases de obxectos",
+    "Select attributes" : "Seleccione os atributos",
+    "Connection test succeeded" : "A proba de conexión foi satisfactoria",
+    "Connection test failed" : "A proba de conexión fracasou",
+    "Do you really want to delete the current Server Configuration?" : "Confirma que quere eliminar a configuración actual do servidor?",
+    "Confirm Deletion" : "Confirmar a eliminación",
+    "_%s group found_::_%s groups found_" : ["Atopouse %s grupo","Atopáronse %s grupos"],
+    "_%s user found_::_%s users found_" : ["Atopouse %s usuario","Atopáronse %s usuarios"],
+    "Could not find the desired feature" : "Non foi posíbel atopar a función desexada",
+    "Invalid Host" : "Máquina incorrecta",
+    "Server" : "Servidor",
+    "User Filter" : "Filtro do usuario",
+    "Login Filter" : "Filtro de acceso",
+    "Group Filter" : "Filtro de grupo",
+    "Save" : "Gardar",
+    "Test Configuration" : "Probar a configuración",
+    "Help" : "Axuda",
+    "Groups meeting these criteria are available in %s:" : "Os grupos que cumpren estes criterios están dispoñíbeis en %s:",
+    "only those object classes:" : "só as clases de obxecto:",
+    "only from those groups:" : "só dos grupos:",
+    "Edit raw filter instead" : "Editar, no seu canto, o filtro en bruto",
+    "Raw LDAP filter" : "Filtro LDAP en bruto",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica que grupos LDAP teñen acceso á instancia %s.",
+    "groups found" : "atopáronse grupos",
+    "Users login with this attribute:" : "Os usuarios inician sesión con este atributo:",
+    "LDAP Username:" : "Nome de usuario LDAP:",
+    "LDAP Email Address:" : "Enderezo de correo LDAP:",
+    "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 que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor:",
+    "Add Server Configuration" : "Engadir a configuración do servidor",
+    "Delete Configuration" : "Eliminar a configuración",
+    "Host" : "Servidor",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
+    "Port" : "Porto",
+    "User DN" : "DN do usuario",
+    "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." : "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
+    "Password" : "Contrasinal",
+    "For anonymous access, leave DN and Password empty." : "Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
+    "One Base DN per line" : "Un DN base por liña",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»",
+    "Limit %s access to users meeting these criteria:" : "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.",
+    "users found" : "atopáronse usuarios",
+    "Back" : "Atrás",
+    "Continue" : "Continuar",
+    "Expert" : "Experto",
+    "Advanced" : "Avanzado",
+    "<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>Aviso:</b> As aplicacións user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar unha delas.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo.",
+    "Connection Settings" : "Axustes da conexión",
+    "Configuration Active" : "Configuración activa",
+    "When unchecked, this configuration will be skipped." : "Se está sen marcar, omítese esta configuración.",
+    "Backup (Replica) Host" : "Servidor da copia de seguranza (Réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD.",
+    "Backup (Replica) Port" : "Porto da copia de seguranza (Réplica)",
+    "Disable Main Server" : "Desactivar o servidor principal",
+    "Only connect to the replica server." : "Conectar só co servidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor LDAP non sensíbel a maiúsculas (Windows)",
+    "Turn off SSL certificate validation." : "Desactiva a validación do certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s.",
+    "Cache Time-To-Live" : "Tempo de persistencia da caché",
+    "in seconds. A change empties the cache." : "en segundos. Calquera cambio baleira a caché.",
+    "Directory Settings" : "Axustes do directorio",
+    "User Display Name Field" : "Campo de mostra do nome de usuario",
+    "The LDAP attribute to use to generate the user's display name." : "O atributo LDAP a empregar para xerar o nome de usuario para amosar.",
+    "Base User Tree" : "Base da árbore de usuarios",
+    "One User Base DN per line" : "Un DN base de usuario por liña",
+    "User Search Attributes" : "Atributos de busca do usuario",
+    "Optional; one attribute per line" : "Opcional; un atributo por liña",
+    "Group Display Name Field" : "Campo de mostra do nome de grupo",
+    "The LDAP attribute to use to generate the groups's display name." : "O atributo LDAP úsase para xerar os nomes dos grupos que amosar.",
+    "Base Group Tree" : "Base da árbore de grupo",
+    "One Group Base DN per line" : "Un DN base de grupo por liña",
+    "Group Search Attributes" : "Atributos de busca do grupo",
+    "Group-Member association" : "Asociación de grupos e membros",
+    "Nested Groups" : "Grupos aniñados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Se está activado, admítense grupos que conteñen grupos. (Só funciona se o atributo de membro de grupo conten os DN.)",
+    "Paging chunksize" : "Tamaño dos fragmentos paxinados",
+    "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.)" : "Tamaño dos fragmentos utilizados para as buscas LDAP paxinadas, que poden devolver resultados voluminosos como usuario ou enumeración de grupo. (Se se establece a 0, desactívanse as buscas LDAP paxinadas nesas situacións.)",
+    "Special Attributes" : "Atributos especiais",
+    "Quota Field" : "Campo de cota",
+    "Quota Default" : "Cota predeterminada",
+    "in bytes" : "en bytes",
+    "Email Field" : "Campo do correo",
+    "User Home Folder Naming Rule" : "Regra de nomeado do cartafol do usuario",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
+    "Internal Username" : "Nome de usuario interno",
+    "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." : "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario. Tamén é parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+    "Internal Username Attribute:" : "Atributo do nome de usuario interno:",
+    "Override UUID detection" : "Ignorar a detección do 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." : "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+    "UUID Attribute for Users:" : "Atributo do UUID para usuarios:",
+    "UUID Attribute for Groups:" : "Atributo do UUID para grupos:",
+    "Username-LDAP User Mapping" : "Asignación do usuario ao «nome de usuario LDAP»",
+    "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." : "Os nomes de usuario empréganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
+    "Clear Username-LDAP User Mapping" : "Limpar a asignación do usuario ao «nome de usuario LDAP»",
+    "Clear Groupname-LDAP Group Mapping" : "Limpar a asignación do grupo ao «nome de grupo LDAP»"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/gl.json b/apps/user_ldap/l10n/gl.json
new file mode 100644
index 00000000000..99b0807ef54
--- /dev/null
+++ b/apps/user_ldap/l10n/gl.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Non foi posíbel limpar as asignacións.",
+    "Failed to delete the server configuration" : "Non foi posíbel eliminar a configuración do servidor",
+    "The configuration is valid and the connection could be established!" : "A configuración é correcta e pode estabelecerse a conexión.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles",
+    "No action specified" : "Non se especificou unha acción",
+    "No configuration specified" : "Non se especificou unha configuración",
+    "No data specified" : "Non se especificaron datos",
+    " Could not set configuration %s" : "Non foi posíbel estabelecer a configuración %s",
+    "Deletion failed" : "Produciuse un fallo ao eliminar",
+    "Take over settings from recent server configuration?" : "Tomar os recentes axustes de configuración do servidor?",
+    "Keep settings?" : "Manter os axustes?",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
+    "Cannot add server configuration" : "Non é posíbel engadir a configuración do servidor",
+    "mappings cleared" : "limpadas as asignacións",
+    "Success" : "Correcto",
+    "Error" : "Erro",
+    "Please specify a Base DN" : "Por favor indique un DN base",
+    "Could not determine Base DN" : "Non se puido determinar o DN base",
+    "Please specify the port" : "Por favor indique un porto",
+    "Configuration OK" : "Configuración correcta",
+    "Configuration incorrect" : "Configuración incorrecta",
+    "Configuration incomplete" : "Configuración incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Seleccione as clases de obxectos",
+    "Select attributes" : "Seleccione os atributos",
+    "Connection test succeeded" : "A proba de conexión foi satisfactoria",
+    "Connection test failed" : "A proba de conexión fracasou",
+    "Do you really want to delete the current Server Configuration?" : "Confirma que quere eliminar a configuración actual do servidor?",
+    "Confirm Deletion" : "Confirmar a eliminación",
+    "_%s group found_::_%s groups found_" : ["Atopouse %s grupo","Atopáronse %s grupos"],
+    "_%s user found_::_%s users found_" : ["Atopouse %s usuario","Atopáronse %s usuarios"],
+    "Could not find the desired feature" : "Non foi posíbel atopar a función desexada",
+    "Invalid Host" : "Máquina incorrecta",
+    "Server" : "Servidor",
+    "User Filter" : "Filtro do usuario",
+    "Login Filter" : "Filtro de acceso",
+    "Group Filter" : "Filtro de grupo",
+    "Save" : "Gardar",
+    "Test Configuration" : "Probar a configuración",
+    "Help" : "Axuda",
+    "Groups meeting these criteria are available in %s:" : "Os grupos que cumpren estes criterios están dispoñíbeis en %s:",
+    "only those object classes:" : "só as clases de obxecto:",
+    "only from those groups:" : "só dos grupos:",
+    "Edit raw filter instead" : "Editar, no seu canto, o filtro en bruto",
+    "Raw LDAP filter" : "Filtro LDAP en bruto",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica que grupos LDAP teñen acceso á instancia %s.",
+    "groups found" : "atopáronse grupos",
+    "Users login with this attribute:" : "Os usuarios inician sesión con este atributo:",
+    "LDAP Username:" : "Nome de usuario LDAP:",
+    "LDAP Email Address:" : "Enderezo de correo LDAP:",
+    "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 que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor:",
+    "Add Server Configuration" : "Engadir a configuración do servidor",
+    "Delete Configuration" : "Eliminar a configuración",
+    "Host" : "Servidor",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
+    "Port" : "Porto",
+    "User DN" : "DN do usuario",
+    "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." : "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
+    "Password" : "Contrasinal",
+    "For anonymous access, leave DN and Password empty." : "Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
+    "One Base DN per line" : "Un DN base por liña",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»",
+    "Limit %s access to users meeting these criteria:" : "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.",
+    "users found" : "atopáronse usuarios",
+    "Back" : "Atrás",
+    "Continue" : "Continuar",
+    "Expert" : "Experto",
+    "Advanced" : "Avanzado",
+    "<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>Aviso:</b> As aplicacións user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar unha delas.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo.",
+    "Connection Settings" : "Axustes da conexión",
+    "Configuration Active" : "Configuración activa",
+    "When unchecked, this configuration will be skipped." : "Se está sen marcar, omítese esta configuración.",
+    "Backup (Replica) Host" : "Servidor da copia de seguranza (Réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD.",
+    "Backup (Replica) Port" : "Porto da copia de seguranza (Réplica)",
+    "Disable Main Server" : "Desactivar o servidor principal",
+    "Only connect to the replica server." : "Conectar só co servidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor LDAP non sensíbel a maiúsculas (Windows)",
+    "Turn off SSL certificate validation." : "Desactiva a validación do certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s.",
+    "Cache Time-To-Live" : "Tempo de persistencia da caché",
+    "in seconds. A change empties the cache." : "en segundos. Calquera cambio baleira a caché.",
+    "Directory Settings" : "Axustes do directorio",
+    "User Display Name Field" : "Campo de mostra do nome de usuario",
+    "The LDAP attribute to use to generate the user's display name." : "O atributo LDAP a empregar para xerar o nome de usuario para amosar.",
+    "Base User Tree" : "Base da árbore de usuarios",
+    "One User Base DN per line" : "Un DN base de usuario por liña",
+    "User Search Attributes" : "Atributos de busca do usuario",
+    "Optional; one attribute per line" : "Opcional; un atributo por liña",
+    "Group Display Name Field" : "Campo de mostra do nome de grupo",
+    "The LDAP attribute to use to generate the groups's display name." : "O atributo LDAP úsase para xerar os nomes dos grupos que amosar.",
+    "Base Group Tree" : "Base da árbore de grupo",
+    "One Group Base DN per line" : "Un DN base de grupo por liña",
+    "Group Search Attributes" : "Atributos de busca do grupo",
+    "Group-Member association" : "Asociación de grupos e membros",
+    "Nested Groups" : "Grupos aniñados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Se está activado, admítense grupos que conteñen grupos. (Só funciona se o atributo de membro de grupo conten os DN.)",
+    "Paging chunksize" : "Tamaño dos fragmentos paxinados",
+    "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.)" : "Tamaño dos fragmentos utilizados para as buscas LDAP paxinadas, que poden devolver resultados voluminosos como usuario ou enumeración de grupo. (Se se establece a 0, desactívanse as buscas LDAP paxinadas nesas situacións.)",
+    "Special Attributes" : "Atributos especiais",
+    "Quota Field" : "Campo de cota",
+    "Quota Default" : "Cota predeterminada",
+    "in bytes" : "en bytes",
+    "Email Field" : "Campo do correo",
+    "User Home Folder Naming Rule" : "Regra de nomeado do cartafol do usuario",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
+    "Internal Username" : "Nome de usuario interno",
+    "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." : "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario. Tamén é parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+    "Internal Username Attribute:" : "Atributo do nome de usuario interno:",
+    "Override UUID detection" : "Ignorar a detección do 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." : "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
+    "UUID Attribute for Users:" : "Atributo do UUID para usuarios:",
+    "UUID Attribute for Groups:" : "Atributo do UUID para grupos:",
+    "Username-LDAP User Mapping" : "Asignación do usuario ao «nome de usuario LDAP»",
+    "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." : "Os nomes de usuario empréganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
+    "Clear Username-LDAP User Mapping" : "Limpar a asignación do usuario ao «nome de usuario LDAP»",
+    "Clear Groupname-LDAP Group Mapping" : "Limpar a asignación do grupo ao «nome de grupo LDAP»"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/gl.php b/apps/user_ldap/l10n/gl.php
deleted file mode 100644
index 6dea160392b..00000000000
--- a/apps/user_ldap/l10n/gl.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Non foi posíbel limpar as asignacións.",
-"Failed to delete the server configuration" => "Non foi posíbel eliminar a configuración do servidor",
-"The configuration is valid and the connection could be established!" => "A configuración é correcta e pode estabelecerse a conexión.",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuración é correcta, mais a ligazón non. Comprobe a configuración do servidor e as credenciais.",
-"The configuration is invalid. Please have a look at the logs for further details." => "A configuración non é correcta. Vexa o rexistro de ownCloud para máis detalles",
-"No action specified" => "Non se especificou unha acción",
-"No configuration specified" => "Non se especificou unha configuración",
-"No data specified" => "Non se especificaron datos",
-" Could not set configuration %s" => "Non foi posíbel estabelecer a configuración %s",
-"Deletion failed" => "Produciuse un fallo ao eliminar",
-"Take over settings from recent server configuration?" => "Tomar os recentes axustes de configuración do servidor?",
-"Keep settings?" => "Manter os axustes?",
-"{nthServer}. Server" => "{nthServer}. Servidor",
-"Cannot add server configuration" => "Non é posíbel engadir a configuración do servidor",
-"mappings cleared" => "limpadas as asignacións",
-"Success" => "Correcto",
-"Error" => "Erro",
-"Please specify a Base DN" => "Por favor indique un DN base",
-"Could not determine Base DN" => "Non se puido determinar o DN base",
-"Please specify the port" => "Por favor indique un porto",
-"Configuration OK" => "Configuración correcta",
-"Configuration incorrect" => "Configuración incorrecta",
-"Configuration incomplete" => "Configuración incompleta",
-"Select groups" => "Seleccionar grupos",
-"Select object classes" => "Seleccione as clases de obxectos",
-"Select attributes" => "Seleccione os atributos",
-"Connection test succeeded" => "A proba de conexión foi satisfactoria",
-"Connection test failed" => "A proba de conexión fracasou",
-"Do you really want to delete the current Server Configuration?" => "Confirma que quere eliminar a configuración actual do servidor?",
-"Confirm Deletion" => "Confirmar a eliminación",
-"_%s group found_::_%s groups found_" => array("Atopouse %s grupo","Atopáronse %s grupos"),
-"_%s user found_::_%s users found_" => array("Atopouse %s usuario","Atopáronse %s usuarios"),
-"Could not find the desired feature" => "Non foi posíbel atopar a función desexada",
-"Invalid Host" => "Máquina incorrecta",
-"Server" => "Servidor",
-"User Filter" => "Filtro do usuario",
-"Login Filter" => "Filtro de acceso",
-"Group Filter" => "Filtro de grupo",
-"Save" => "Gardar",
-"Test Configuration" => "Probar a configuración",
-"Help" => "Axuda",
-"Groups meeting these criteria are available in %s:" => "Os grupos que cumpren estes criterios están dispoñíbeis en %s:",
-"only those object classes:" => "só as clases de obxecto:",
-"only from those groups:" => "só dos grupos:",
-"Edit raw filter instead" => "Editar, no seu canto, o filtro en bruto",
-"Raw LDAP filter" => "Filtro LDAP en bruto",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica que grupos LDAP teñen acceso á instancia %s.",
-"groups found" => "atopáronse grupos",
-"Users login with this attribute:" => "Os usuarios inician sesión con este atributo:",
-"LDAP Username:" => "Nome de usuario LDAP:",
-"LDAP Email Address:" => "Enderezo de correo LDAP:",
-"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 que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso. Exemplo: «uid=%%uid»",
-"1. Server" => "1. Servidor",
-"%s. Server:" => "%s. Servidor:",
-"Add Server Configuration" => "Engadir a configuración do servidor",
-"Delete Configuration" => "Eliminar a configuración",
-"Host" => "Servidor",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://",
-"Port" => "Porto",
-"User DN" => "DN do usuario",
-"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." => "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
-"Password" => "Contrasinal",
-"For anonymous access, leave DN and Password empty." => "Para o acceso anónimo deixe o DN e o contrasinal baleiros.",
-"One Base DN per line" => "Un DN base por liña",
-"You can specify Base DN for users and groups in the Advanced tab" => "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»",
-"Limit %s access to users meeting these criteria:" => "Limitar o acceso a %s para os usuarios que cumpren con estes criterios:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "O filtro especifica que usuarios LDAP teñen acceso á instancia %s.",
-"users found" => "atopáronse usuarios",
-"Back" => "Atrás",
-"Continue" => "Continuar",
-"Expert" => "Experto",
-"Advanced" => "Avanzado",
-"<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>Aviso:</b> As aplicacións user_ldap e user_webdavauth son incompatíbeis. Pode acontecer un comportamento estraño. Consulte co administrador do sistema para desactivar unha delas.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP non está instalado, o servidor non funcionará. Consulte co administrador do sistema para instalalo.",
-"Connection Settings" => "Axustes da conexión",
-"Configuration Active" => "Configuración activa",
-"When unchecked, this configuration will be skipped." => "Se está sen marcar, omítese esta configuración.",
-"Backup (Replica) Host" => "Servidor da copia de seguranza (Réplica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Indicar un servidor de copia de seguranza opcional. Debe ser unha réplica do servidor principal LDAP/AD.",
-"Backup (Replica) Port" => "Porto da copia de seguranza (Réplica)",
-"Disable Main Server" => "Desactivar o servidor principal",
-"Only connect to the replica server." => "Conectar só co servidor de réplica.",
-"Case insensitive LDAP server (Windows)" => "Servidor LDAP non sensíbel a maiúsculas (Windows)",
-"Turn off SSL certificate validation." => "Desactiva a validación do certificado SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non recomendado, utilizar só para probas! Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor %s.",
-"Cache Time-To-Live" => "Tempo de persistencia da caché",
-"in seconds. A change empties the cache." => "en segundos. Calquera cambio baleira a caché.",
-"Directory Settings" => "Axustes do directorio",
-"User Display Name Field" => "Campo de mostra do nome de usuario",
-"The LDAP attribute to use to generate the user's display name." => "O atributo LDAP a empregar para xerar o nome de usuario para amosar.",
-"Base User Tree" => "Base da árbore de usuarios",
-"One User Base DN per line" => "Un DN base de usuario por liña",
-"User Search Attributes" => "Atributos de busca do usuario",
-"Optional; one attribute per line" => "Opcional; un atributo por liña",
-"Group Display Name Field" => "Campo de mostra do nome de grupo",
-"The LDAP attribute to use to generate the groups's display name." => "O atributo LDAP úsase para xerar os nomes dos grupos que amosar.",
-"Base Group Tree" => "Base da árbore de grupo",
-"One Group Base DN per line" => "Un DN base de grupo por liña",
-"Group Search Attributes" => "Atributos de busca do grupo",
-"Group-Member association" => "Asociación de grupos e membros",
-"Nested Groups" => "Grupos aniñados",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Se está activado, admítense grupos que conteñen grupos. (Só funciona se o atributo de membro de grupo conten os DN.)",
-"Paging chunksize" => "Tamaño dos fragmentos paxinados",
-"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.)" => "Tamaño dos fragmentos utilizados para as buscas LDAP paxinadas, que poden devolver resultados voluminosos como usuario ou enumeración de grupo. (Se se establece a 0, desactívanse as buscas LDAP paxinadas nesas situacións.)",
-"Special Attributes" => "Atributos especiais",
-"Quota Field" => "Campo de cota",
-"Quota Default" => "Cota predeterminada",
-"in bytes" => "en bytes",
-"Email Field" => "Campo do correo",
-"User Home Folder Naming Rule" => "Regra de nomeado do cartafol do usuario",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD.",
-"Internal Username" => "Nome de usuario interno",
-"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." => "De xeito predeterminado, o nome de usuario interno crease a partires do atributo UUID. Asegurase de que o nome de usuario é único e de non ter que converter os caracteres. O nome de usuario interno ten a limitación de que só están permitidos estes caracteres: [ a-zA-Z0-9_.@- ].  Os outros caracteres substitúense pola súa correspondencia ASCII ou simplemente omítense. Nas colisións engadirase/incrementarase un número. O nome de usuario interno utilizase para identificar a un usuario interno. É tamén o nome predeterminado do cartafol persoal do usuario. Tamén é parte dun URL remoto, por exemplo, para todos os servizos *DAV. Con este axuste, o comportamento predeterminado pode ser sobrescrito. Para lograr un comportamento semellante ao anterior ownCloud 5 introduza o atributo do nome para amosar do usuario no seguinte campo. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
-"Internal Username Attribute:" => "Atributo do nome de usuario interno:",
-"Override UUID detection" => "Ignorar a detección do 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." => "De xeito predeterminado, o atributo UUID é detectado automaticamente. O atributo UUID utilizase para identificar, sen dúbida, aos usuarios e grupos LDAP. Ademais, crearase o usuario interno baseado no UUID, se non se especifica anteriormente o contrario. Pode anular a configuración e pasar un atributo da súa escolla. Vostede debe asegurarse de que o atributo da súa escolla pode ser recuperado polos usuarios e grupos e de que é único. Déixeo baleiro para o comportamento predeterminado. Os cambios terán efecto só nas novas asignacións (engadidos) de usuarios de LDAP.",
-"UUID Attribute for Users:" => "Atributo do UUID para usuarios:",
-"UUID Attribute for Groups:" => "Atributo do UUID para grupos:",
-"Username-LDAP User Mapping" => "Asignación do usuario ao «nome de usuario LDAP»",
-"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." => "Os nomes de usuario empréganse para almacenar e asignar (meta) datos. Coa fin de identificar con precisión e recoñecer aos usuarios, cada usuario LDAP terá un nome de usuario interno. Isto require unha asignación de ownCloud nome de usuario a usuario LDAP. O nome de usuario creado asignase ao UUID do usuario LDAP. Ademais o DN almacenase na caché, para así reducir a interacción do LDAP, mais non se utiliza para a identificación. Se o DN cambia, os cambios poden ser atopados polo ownCloud. O nome interno no ownCloud utilizase en todo o ownCloud. A limpeza das asignacións deixará rastros en todas partes. A limpeza das asignacións non é sensíbel á configuración, afecta a todas as configuracións de LDAP! Non limpar nunca as asignacións nun entorno de produción. Limpar as asignacións só en fases de proba ou experimentais.",
-"Clear Username-LDAP User Mapping" => "Limpar a asignación do usuario ao «nome de usuario LDAP»",
-"Clear Groupname-LDAP Group Mapping" => "Limpar a asignación do grupo ao «nome de grupo LDAP»"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/gu.js b/apps/user_ldap/l10n/gu.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/gu.js
@@ -0,0 +1,7 @@
+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/gu.json b/apps/user_ldap/l10n/gu.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/gu.json
@@ -0,0 +1,5 @@
+{ "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/gu.php b/apps/user_ldap/l10n/gu.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/gu.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/he.js b/apps/user_ldap/l10n/he.js
new file mode 100644
index 00000000000..4ac93ca3dba
--- /dev/null
+++ b/apps/user_ldap/l10n/he.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "מחיקה נכשלה",
+    "Keep settings?" : "האם לשמור את ההגדרות?",
+    "Cannot add server configuration" : "לא ניתן להוסיף את הגדרות השרת",
+    "Error" : "שגיאה",
+    "Connection test succeeded" : "בדיקת החיבור עברה בהצלחה",
+    "Connection test failed" : "בדיקת החיבור נכשלה",
+    "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?",
+    "Confirm Deletion" : "אישור המחיקה",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Group Filter" : "סנן קבוצה",
+    "Save" : "שמירה",
+    "Help" : "עזרה",
+    "Add Server Configuration" : "הוספת הגדרות השרת",
+    "Host" : "מארח",
+    "Port" : "פורט",
+    "User DN" : "DN משתמש",
+    "Password" : "סיסמא",
+    "For anonymous access, leave DN and Password empty." : "לגישה אנונימית, השאר את הDM והסיסמא ריקים.",
+    "Back" : "אחורה",
+    "Advanced" : "מתקדם",
+    "in seconds. A change empties the cache." : "בשניות. שינוי מרוקן את המטמון.",
+    "in bytes" : "בבתים"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/he.json b/apps/user_ldap/l10n/he.json
new file mode 100644
index 00000000000..439ddedef41
--- /dev/null
+++ b/apps/user_ldap/l10n/he.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Deletion failed" : "מחיקה נכשלה",
+    "Keep settings?" : "האם לשמור את ההגדרות?",
+    "Cannot add server configuration" : "לא ניתן להוסיף את הגדרות השרת",
+    "Error" : "שגיאה",
+    "Connection test succeeded" : "בדיקת החיבור עברה בהצלחה",
+    "Connection test failed" : "בדיקת החיבור נכשלה",
+    "Do you really want to delete the current Server Configuration?" : "האם אכן למחוק את הגדרות השרת הנוכחיות?",
+    "Confirm Deletion" : "אישור המחיקה",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Group Filter" : "סנן קבוצה",
+    "Save" : "שמירה",
+    "Help" : "עזרה",
+    "Add Server Configuration" : "הוספת הגדרות השרת",
+    "Host" : "מארח",
+    "Port" : "פורט",
+    "User DN" : "DN משתמש",
+    "Password" : "סיסמא",
+    "For anonymous access, leave DN and Password empty." : "לגישה אנונימית, השאר את הDM והסיסמא ריקים.",
+    "Back" : "אחורה",
+    "Advanced" : "מתקדם",
+    "in seconds. A change empties the cache." : "בשניות. שינוי מרוקן את המטמון.",
+    "in bytes" : "בבתים"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/he.php b/apps/user_ldap/l10n/he.php
deleted file mode 100644
index 629ade5e977..00000000000
--- a/apps/user_ldap/l10n/he.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "מחיקה נכשלה",
-"Keep settings?" => "האם לשמור את ההגדרות?",
-"Cannot add server configuration" => "לא ניתן להוסיף את הגדרות השרת",
-"Error" => "שגיאה",
-"Connection test succeeded" => "בדיקת החיבור עברה בהצלחה",
-"Connection test failed" => "בדיקת החיבור נכשלה",
-"Do you really want to delete the current Server Configuration?" => "האם אכן למחוק את הגדרות השרת הנוכחיות?",
-"Confirm Deletion" => "אישור המחיקה",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Group Filter" => "סנן קבוצה",
-"Save" => "שמירה",
-"Help" => "עזרה",
-"Add Server Configuration" => "הוספת הגדרות השרת",
-"Host" => "מארח",
-"Port" => "פורט",
-"User DN" => "DN משתמש",
-"Password" => "סיסמא",
-"For anonymous access, leave DN and Password empty." => "לגישה אנונימית, השאר את הDM והסיסמא ריקים.",
-"Back" => "אחורה",
-"Advanced" => "מתקדם",
-"in seconds. A change empties the cache." => "בשניות. שינוי מרוקן את המטמון.",
-"in bytes" => "בבתים"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hi.js b/apps/user_ldap/l10n/hi.js
new file mode 100644
index 00000000000..e6d6fd60e8c
--- /dev/null
+++ b/apps/user_ldap/l10n/hi.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "त्रुटि",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "सहेजें",
+    "Help" : "सहयोग",
+    "Password" : "पासवर्ड",
+    "Advanced" : "उन्नत"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/hi.json b/apps/user_ldap/l10n/hi.json
new file mode 100644
index 00000000000..ca4b87ff3ac
--- /dev/null
+++ b/apps/user_ldap/l10n/hi.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Error" : "त्रुटि",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "सहेजें",
+    "Help" : "सहयोग",
+    "Password" : "पासवर्ड",
+    "Advanced" : "उन्नत"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/hi.php b/apps/user_ldap/l10n/hi.php
deleted file mode 100644
index 41fbe29856f..00000000000
--- a/apps/user_ldap/l10n/hi.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "त्रुटि",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "सहेजें",
-"Help" => "सहयोग",
-"Password" => "पासवर्ड",
-"Advanced" => "उन्नत"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hr.js b/apps/user_ldap/l10n/hr.js
new file mode 100644
index 00000000000..d552505a397
--- /dev/null
+++ b/apps/user_ldap/l10n/hr.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Brisanje nije uspjelo",
+    "Error" : "Greška",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Save" : "Snimi",
+    "Help" : "Pomoć",
+    "Host" : "Poslužitelj",
+    "Port" : "Port",
+    "Password" : "Lozinka",
+    "Back" : "Natrag",
+    "Continue" : "Nastavi",
+    "Advanced" : "Napredno"
+},
+"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_ldap/l10n/hr.json b/apps/user_ldap/l10n/hr.json
new file mode 100644
index 00000000000..045019c266b
--- /dev/null
+++ b/apps/user_ldap/l10n/hr.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Deletion failed" : "Brisanje nije uspjelo",
+    "Error" : "Greška",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Save" : "Snimi",
+    "Help" : "Pomoć",
+    "Host" : "Poslužitelj",
+    "Port" : "Port",
+    "Password" : "Lozinka",
+    "Back" : "Natrag",
+    "Continue" : "Nastavi",
+    "Advanced" : "Napredno"
+},"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_ldap/l10n/hr.php b/apps/user_ldap/l10n/hr.php
deleted file mode 100644
index 20232c8a9cb..00000000000
--- a/apps/user_ldap/l10n/hr.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Brisanje nije uspjelo",
-"Error" => "Greška",
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
-"Save" => "Snimi",
-"Help" => "Pomoć",
-"Host" => "Poslužitelj",
-"Port" => "Port",
-"Password" => "Lozinka",
-"Back" => "Natrag",
-"Continue" => "Nastavi",
-"Advanced" => "Napredno"
-);
-$PLURAL_FORMS = "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_ldap/l10n/hu_HU.js b/apps/user_ldap/l10n/hu_HU.js
new file mode 100644
index 00000000000..d1baabf1ce4
--- /dev/null
+++ b/apps/user_ldap/l10n/hu_HU.js
@@ -0,0 +1,131 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Nem sikerült törölni a hozzárendeléseket.",
+    "Failed to delete the server configuration" : "Nem sikerült törölni a kiszolgáló konfigurációját",
+    "The configuration is valid and the connection could be established!" : "A konfiguráció érvényes, és a kapcsolat létrehozható!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Érvénytelen konfiguráció. További információkért nézze meg a naplófájlokat!",
+    "No action specified" : "Nincs megadva parancs",
+    "No configuration specified" : "Nincs megadva konfiguráció",
+    "No data specified" : "Nincs adat megadva",
+    " Could not set configuration %s" : "A(z) %s konfiguráció nem állítható be",
+    "Deletion failed" : "A törlés nem sikerült",
+    "Take over settings from recent server configuration?" : "Vegyük át a beállításokat az előző konfigurációból?",
+    "Keep settings?" : "Tartsuk meg a beállításokat?",
+    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
+    "Cannot add server configuration" : "Az új  kiszolgáló konfigurációja nem hozható létre",
+    "mappings cleared" : "Töröltük a hozzárendeléseket",
+    "Success" : "Sikeres végrehajtás",
+    "Error" : "Hiba",
+    "Please specify a Base DN" : "Adja meg az alap/Base/ DN-t",
+    "Could not determine Base DN" : "nem sikerült azonosítani az alap/Base/ DN-t",
+    "Please specify the port" : "Add meg a portot",
+    "Configuration OK" : "Konfiguráció OK",
+    "Configuration incorrect" : "Konfiguráió hibás",
+    "Configuration incomplete" : "Konfiguráció nincs befejezve",
+    "Select groups" : "Csoportok kiválasztása",
+    "Select object classes" : "Objektumosztályok kiválasztása",
+    "Select attributes" : "Attribútumok kiválasztása",
+    "Connection test succeeded" : "A kapcsolatellenőrzés eredménye: sikerült",
+    "Connection test failed" : "A kapcsolatellenőrzés eredménye: nem sikerült",
+    "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a kiszolgáló beállításait?",
+    "Confirm Deletion" : "A törlés megerősítése",
+    "_%s group found_::_%s groups found_" : ["%s csoport van","%s csoport van"],
+    "_%s user found_::_%s users found_" : ["%s felhasználó van","%s felhasználó van"],
+    "Could not find the desired feature" : "A kívánt funkció nem található",
+    "Invalid Host" : "Érvénytelen gépnév",
+    "Server" : "Kiszolgáló",
+    "User Filter" : "Felhasználói szűrő",
+    "Login Filter" : "Bejelentkezési szűrő",
+    "Group Filter" : "A csoportok szűrője",
+    "Save" : "Mentés",
+    "Test Configuration" : "A beállítások tesztelése",
+    "Help" : "Súgó",
+    "Groups meeting these criteria are available in %s:" : "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:",
+    "only those object classes:" : "csak ezek az objektumosztályok:",
+    "only from those groups:" : "csak ezek a csoportok:",
+    "Edit raw filter instead" : "Inkább közvetlenül megadom a szűrési kifejezést:",
+    "Raw LDAP filter" : "Az LDAP szűrőkifejezés",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
+    "Test Filter" : "Test szűrő ",
+    "groups found" : "csoport van",
+    "Users login with this attribute:" : "A felhasználók ezzel az attribútummal jelentkeznek be:",
+    "LDAP Username:" : "LDAP felhasználónév:",
+    "LDAP Email Address:" : "LDAP e-mail cím:",
+    "Other Attributes:" : "Más attribútumok:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"",
+    "1. Server" : "1. Kiszolgáló",
+    "%s. Server:" : "%s. kiszolgáló",
+    "Add Server Configuration" : "Új kiszolgáló beállításának hozzáadása",
+    "Delete Configuration" : "Konfiguráció törlés",
+    "Host" : "Kiszolgáló",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://",
+    "Port" : "Port",
+    "User DN" : "A kapcsolódó felhasználó DN-je",
+    "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." : "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
+    "Password" : "Jelszó",
+    "For anonymous access, leave DN and Password empty." : "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
+    "One Base DN per line" : "Soronként egy DN-gyökér",
+    "You can specify Base DN for users and groups in the Advanced tab" : "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára",
+    "Manually enter LDAP filters (recommended for large directories)" : "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)",
+    "Limit %s access to users meeting these criteria:" : "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
+    "users found" : "felhasználó van",
+    "Saving" : "Mentés",
+    "Back" : "Vissza",
+    "Continue" : "Folytatás",
+    "Expert" : "Profi",
+    "Advanced" : "Haladó",
+    "<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>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!",
+    "Connection Settings" : "Kapcsolati beállítások",
+    "Configuration Active" : "A beállítás aktív",
+    "When unchecked, this configuration will be skipped." : "Ha nincs kipipálva, ez a beállítás kihagyódik.",
+    "Backup (Replica) Host" : "Másodkiszolgáló (replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen.",
+    "Backup (Replica) Port" : "A másodkiszolgáló (replika) portszáma",
+    "Disable Main Server" : "A fő szerver kihagyása",
+    "Only connect to the replica server." : "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.",
+    "Case insensitive LDAP server (Windows)" : "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
+    "Turn off SSL certificate validation." : "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!",
+    "Cache Time-To-Live" : "A gyorsítótár tárolási időtartama",
+    "in seconds. A change empties the cache." : "másodpercben. A változtatás törli a cache tartalmát.",
+    "Directory Settings" : "Címtár beállítások",
+    "User Display Name Field" : "A felhasználónév mezője",
+    "The LDAP attribute to use to generate the user's display name." : "Ebből az LDAP attribútumból képződik a felhasználó megjelenítendő neve.",
+    "Base User Tree" : "A felhasználói fa gyökere",
+    "One User Base DN per line" : "Soronként egy felhasználói fa gyökerét adhatjuk meg",
+    "User Search Attributes" : "A felhasználók lekérdezett attribútumai",
+    "Optional; one attribute per line" : "Nem kötelező megadni, soronként egy attribútum",
+    "Group Display Name Field" : "A csoport nevének mezője",
+    "The LDAP attribute to use to generate the groups's display name." : "Ebből az LDAP attribútumból képződik a csoport megjelenítendő neve.",
+    "Base Group Tree" : "A csoportfa gyökere",
+    "One Group Base DN per line" : "Soronként egy csoportfa gyökerét adhatjuk meg",
+    "Group Search Attributes" : "A csoportok lekérdezett attribútumai",
+    "Group-Member association" : "A csoporttagság attribútuma",
+    "Nested Groups" : "Egymásba ágyazott csoportok",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Amikor be van kapcsolva, akkor azokat a csoportokat is kezelni tudjuk, melyekben a személyek mellett csoportok is vannak. (Csak akkor működik, ha a csoportok \"member\" attribútuma DN-eket tartalmaz.)",
+    "Paging chunksize" : "Lapméret paging esetén",
+    "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.)" : "A lapméret megadásával korlátozható az egy fordulóban kapott találatok száma, akkor is, ha az LDAP-keresés nagyon sok találatot ad, ha ezt az LDAP-kiszolgáló támogatja. (Ha 0-ra állítjuk, akkor ezáltal letiltjuk ezt a lapozó funkciót.)",
+    "Special Attributes" : "Különleges attribútumok",
+    "Quota Field" : "Kvóta mező",
+    "Quota Default" : "Alapértelmezett kvóta",
+    "in bytes" : "bájtban",
+    "Email Field" : "E-mail mező",
+    "User Home Folder Naming Rule" : "A home könyvtár elérési útvonala",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
+    "Internal Username" : "Belső felhasználónév",
+    "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." : "Alapértelmezetten a belső felhasználónév az UUID attribútumból jön létre. Ez biztosítja a felhasználónév egyediségét, ill. azt, hogy a karaktereket nem kell konvertálni benne. A belső felhasználónévben csak a következő karakterek engdélyezettek: [ a-zA-Z0-9_.@- ]. Minden más karakter vagy az ASCII kódtáblában levő megfelelőjére cserélődik ki, vagy ha ilyen nincs, akkor egyszerűen kihagyódik. Ha az így kapott nevek mégis ütköznének, akkor a végükön kiegészülnek egy növekvő sorszámmal. A  belső felhasználónév a programon belül azonosítja a felhasználót, valamint alapértelmezetten ez lesz a felhasználó személyes home könyvtárának a neve is. A belső felhasználónév adja a távoli elérések webcímének egy részét is, ilyenek pl. a *DAV szolgáltatások URL-jei. Ezzel a beállítással felülbírálhatjuk az alapértelmezett viselkedést. Ha az ownCloud 5-ös változata előtti viselkedést szeretné elérni, akkor a következő mezőben adja meg a felhasználó megjelenítési nevének attribútumát. Az alapértelmezett viselkedéshez hagyja üresen. A változtatás csak az újonnan létrejövő (újonnan megfeleltetett) LDAP felhasználók esetén érvényesül.",
+    "Internal Username Attribute:" : "A belső felhasználónév attribútuma:",
+    "Override UUID detection" : "Az UUID-felismerés felülbírálása",
+    "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." : "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes.",
+    "UUID Attribute for Users:" : "A felhasználók UUID attribútuma:",
+    "UUID Attribute for Groups:" : "A csoportok UUID attribútuma:",
+    "Username-LDAP User Mapping" : "Felhasználó - LDAP felhasználó hozzárendelés",
+    "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." : "A felhasználónevek segítségével történik a (meta)adatok tárolása és hozzárendelése. A felhasználók pontos azonosítása céljából minden LDAP felhasználóhoz egy belső felhasználónevet rendelünk. Ezt a felhasználónevet az LDAP felhasználó UUID attribútumához rendeljük hozzá. Ezen túlmenően a DN is tárolásra kerül a gyorsítótárban, hogy csökkentsük az LDAP lekérdezések számát, de a DN-t nem használjuk azonosításra. Ha a DN megváltozik, akkor a rendszer ezt észleli. A belső felhasználóneveket a rendszer igen sok helyen használja, ezért a hozzárendelések törlése sok érvénytelen adatrekordot eredményez az adatbázisban. A hozzárendelések törlése nem függ a konfigurációtól, minden LDAP konfigurációt érint! Ténylegesen működő szolgáltatás esetén sose törölje a hozzárendeléseket, csak tesztelési vagy kísérleti célú szerveren!",
+    "Clear Username-LDAP User Mapping" : "A felhasználó - LDAP felhasználó hozzárendelés törlése",
+    "Clear Groupname-LDAP Group Mapping" : "A csoport - LDAP csoport hozzárendelés törlése"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/hu_HU.json b/apps/user_ldap/l10n/hu_HU.json
new file mode 100644
index 00000000000..be919f99e47
--- /dev/null
+++ b/apps/user_ldap/l10n/hu_HU.json
@@ -0,0 +1,129 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Nem sikerült törölni a hozzárendeléseket.",
+    "Failed to delete the server configuration" : "Nem sikerült törölni a kiszolgáló konfigurációját",
+    "The configuration is valid and the connection could be established!" : "A konfiguráció érvényes, és a kapcsolat létrehozható!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Érvénytelen konfiguráció. További információkért nézze meg a naplófájlokat!",
+    "No action specified" : "Nincs megadva parancs",
+    "No configuration specified" : "Nincs megadva konfiguráció",
+    "No data specified" : "Nincs adat megadva",
+    " Could not set configuration %s" : "A(z) %s konfiguráció nem állítható be",
+    "Deletion failed" : "A törlés nem sikerült",
+    "Take over settings from recent server configuration?" : "Vegyük át a beállításokat az előző konfigurációból?",
+    "Keep settings?" : "Tartsuk meg a beállításokat?",
+    "{nthServer}. Server" : "{nthServer}. Kiszolgáló",
+    "Cannot add server configuration" : "Az új  kiszolgáló konfigurációja nem hozható létre",
+    "mappings cleared" : "Töröltük a hozzárendeléseket",
+    "Success" : "Sikeres végrehajtás",
+    "Error" : "Hiba",
+    "Please specify a Base DN" : "Adja meg az alap/Base/ DN-t",
+    "Could not determine Base DN" : "nem sikerült azonosítani az alap/Base/ DN-t",
+    "Please specify the port" : "Add meg a portot",
+    "Configuration OK" : "Konfiguráció OK",
+    "Configuration incorrect" : "Konfiguráió hibás",
+    "Configuration incomplete" : "Konfiguráció nincs befejezve",
+    "Select groups" : "Csoportok kiválasztása",
+    "Select object classes" : "Objektumosztályok kiválasztása",
+    "Select attributes" : "Attribútumok kiválasztása",
+    "Connection test succeeded" : "A kapcsolatellenőrzés eredménye: sikerült",
+    "Connection test failed" : "A kapcsolatellenőrzés eredménye: nem sikerült",
+    "Do you really want to delete the current Server Configuration?" : "Tényleg törölni szeretné a kiszolgáló beállításait?",
+    "Confirm Deletion" : "A törlés megerősítése",
+    "_%s group found_::_%s groups found_" : ["%s csoport van","%s csoport van"],
+    "_%s user found_::_%s users found_" : ["%s felhasználó van","%s felhasználó van"],
+    "Could not find the desired feature" : "A kívánt funkció nem található",
+    "Invalid Host" : "Érvénytelen gépnév",
+    "Server" : "Kiszolgáló",
+    "User Filter" : "Felhasználói szűrő",
+    "Login Filter" : "Bejelentkezési szűrő",
+    "Group Filter" : "A csoportok szűrője",
+    "Save" : "Mentés",
+    "Test Configuration" : "A beállítások tesztelése",
+    "Help" : "Súgó",
+    "Groups meeting these criteria are available in %s:" : "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:",
+    "only those object classes:" : "csak ezek az objektumosztályok:",
+    "only from those groups:" : "csak ezek a csoportok:",
+    "Edit raw filter instead" : "Inkább közvetlenül megadom a szűrési kifejezést:",
+    "Raw LDAP filter" : "Az LDAP szűrőkifejezés",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
+    "Test Filter" : "Test szűrő ",
+    "groups found" : "csoport van",
+    "Users login with this attribute:" : "A felhasználók ezzel az attribútummal jelentkeznek be:",
+    "LDAP Username:" : "LDAP felhasználónév:",
+    "LDAP Email Address:" : "LDAP e-mail cím:",
+    "Other Attributes:" : "Más attribútumok:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"",
+    "1. Server" : "1. Kiszolgáló",
+    "%s. Server:" : "%s. kiszolgáló",
+    "Add Server Configuration" : "Új kiszolgáló beállításának hozzáadása",
+    "Delete Configuration" : "Konfiguráció törlés",
+    "Host" : "Kiszolgáló",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://",
+    "Port" : "Port",
+    "User DN" : "A kapcsolódó felhasználó DN-je",
+    "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." : "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
+    "Password" : "Jelszó",
+    "For anonymous access, leave DN and Password empty." : "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
+    "One Base DN per line" : "Soronként egy DN-gyökér",
+    "You can specify Base DN for users and groups in the Advanced tab" : "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára",
+    "Manually enter LDAP filters (recommended for large directories)" : "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)",
+    "Limit %s access to users meeting these criteria:" : "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
+    "users found" : "felhasználó van",
+    "Saving" : "Mentés",
+    "Back" : "Vissza",
+    "Continue" : "Folytatás",
+    "Expert" : "Profi",
+    "Advanced" : "Haladó",
+    "<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>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!",
+    "Connection Settings" : "Kapcsolati beállítások",
+    "Configuration Active" : "A beállítás aktív",
+    "When unchecked, this configuration will be skipped." : "Ha nincs kipipálva, ez a beállítás kihagyódik.",
+    "Backup (Replica) Host" : "Másodkiszolgáló (replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen.",
+    "Backup (Replica) Port" : "A másodkiszolgáló (replika) portszáma",
+    "Disable Main Server" : "A fő szerver kihagyása",
+    "Only connect to the replica server." : "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.",
+    "Case insensitive LDAP server (Windows)" : "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
+    "Turn off SSL certificate validation." : "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!",
+    "Cache Time-To-Live" : "A gyorsítótár tárolási időtartama",
+    "in seconds. A change empties the cache." : "másodpercben. A változtatás törli a cache tartalmát.",
+    "Directory Settings" : "Címtár beállítások",
+    "User Display Name Field" : "A felhasználónév mezője",
+    "The LDAP attribute to use to generate the user's display name." : "Ebből az LDAP attribútumból képződik a felhasználó megjelenítendő neve.",
+    "Base User Tree" : "A felhasználói fa gyökere",
+    "One User Base DN per line" : "Soronként egy felhasználói fa gyökerét adhatjuk meg",
+    "User Search Attributes" : "A felhasználók lekérdezett attribútumai",
+    "Optional; one attribute per line" : "Nem kötelező megadni, soronként egy attribútum",
+    "Group Display Name Field" : "A csoport nevének mezője",
+    "The LDAP attribute to use to generate the groups's display name." : "Ebből az LDAP attribútumból képződik a csoport megjelenítendő neve.",
+    "Base Group Tree" : "A csoportfa gyökere",
+    "One Group Base DN per line" : "Soronként egy csoportfa gyökerét adhatjuk meg",
+    "Group Search Attributes" : "A csoportok lekérdezett attribútumai",
+    "Group-Member association" : "A csoporttagság attribútuma",
+    "Nested Groups" : "Egymásba ágyazott csoportok",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Amikor be van kapcsolva, akkor azokat a csoportokat is kezelni tudjuk, melyekben a személyek mellett csoportok is vannak. (Csak akkor működik, ha a csoportok \"member\" attribútuma DN-eket tartalmaz.)",
+    "Paging chunksize" : "Lapméret paging esetén",
+    "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.)" : "A lapméret megadásával korlátozható az egy fordulóban kapott találatok száma, akkor is, ha az LDAP-keresés nagyon sok találatot ad, ha ezt az LDAP-kiszolgáló támogatja. (Ha 0-ra állítjuk, akkor ezáltal letiltjuk ezt a lapozó funkciót.)",
+    "Special Attributes" : "Különleges attribútumok",
+    "Quota Field" : "Kvóta mező",
+    "Quota Default" : "Alapértelmezett kvóta",
+    "in bytes" : "bájtban",
+    "Email Field" : "E-mail mező",
+    "User Home Folder Naming Rule" : "A home könyvtár elérési útvonala",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
+    "Internal Username" : "Belső felhasználónév",
+    "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." : "Alapértelmezetten a belső felhasználónév az UUID attribútumból jön létre. Ez biztosítja a felhasználónév egyediségét, ill. azt, hogy a karaktereket nem kell konvertálni benne. A belső felhasználónévben csak a következő karakterek engdélyezettek: [ a-zA-Z0-9_.@- ]. Minden más karakter vagy az ASCII kódtáblában levő megfelelőjére cserélődik ki, vagy ha ilyen nincs, akkor egyszerűen kihagyódik. Ha az így kapott nevek mégis ütköznének, akkor a végükön kiegészülnek egy növekvő sorszámmal. A  belső felhasználónév a programon belül azonosítja a felhasználót, valamint alapértelmezetten ez lesz a felhasználó személyes home könyvtárának a neve is. A belső felhasználónév adja a távoli elérések webcímének egy részét is, ilyenek pl. a *DAV szolgáltatások URL-jei. Ezzel a beállítással felülbírálhatjuk az alapértelmezett viselkedést. Ha az ownCloud 5-ös változata előtti viselkedést szeretné elérni, akkor a következő mezőben adja meg a felhasználó megjelenítési nevének attribútumát. Az alapértelmezett viselkedéshez hagyja üresen. A változtatás csak az újonnan létrejövő (újonnan megfeleltetett) LDAP felhasználók esetén érvényesül.",
+    "Internal Username Attribute:" : "A belső felhasználónév attribútuma:",
+    "Override UUID detection" : "Az UUID-felismerés felülbírálása",
+    "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." : "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes.",
+    "UUID Attribute for Users:" : "A felhasználók UUID attribútuma:",
+    "UUID Attribute for Groups:" : "A csoportok UUID attribútuma:",
+    "Username-LDAP User Mapping" : "Felhasználó - LDAP felhasználó hozzárendelés",
+    "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." : "A felhasználónevek segítségével történik a (meta)adatok tárolása és hozzárendelése. A felhasználók pontos azonosítása céljából minden LDAP felhasználóhoz egy belső felhasználónevet rendelünk. Ezt a felhasználónevet az LDAP felhasználó UUID attribútumához rendeljük hozzá. Ezen túlmenően a DN is tárolásra kerül a gyorsítótárban, hogy csökkentsük az LDAP lekérdezések számát, de a DN-t nem használjuk azonosításra. Ha a DN megváltozik, akkor a rendszer ezt észleli. A belső felhasználóneveket a rendszer igen sok helyen használja, ezért a hozzárendelések törlése sok érvénytelen adatrekordot eredményez az adatbázisban. A hozzárendelések törlése nem függ a konfigurációtól, minden LDAP konfigurációt érint! Ténylegesen működő szolgáltatás esetén sose törölje a hozzárendeléseket, csak tesztelési vagy kísérleti célú szerveren!",
+    "Clear Username-LDAP User Mapping" : "A felhasználó - LDAP felhasználó hozzárendelés törlése",
+    "Clear Groupname-LDAP Group Mapping" : "A csoport - LDAP csoport hozzárendelés törlése"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/hu_HU.php b/apps/user_ldap/l10n/hu_HU.php
deleted file mode 100644
index fb1f1f9cdcf..00000000000
--- a/apps/user_ldap/l10n/hu_HU.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Nem sikerült törölni a hozzárendeléseket.",
-"Failed to delete the server configuration" => "Nem sikerült törölni a kiszolgáló konfigurációját",
-"The configuration is valid and the connection could be established!" => "A konfiguráció érvényes, és a kapcsolat létrehozható!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A konfiguráció érvényes, de a kapcsolat nem hozható létre. Kérem ellenőrizze a kiszolgáló beállításait, és az elérési adatokat.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Érvénytelen konfiguráció. További információkért nézze meg a naplófájlokat!",
-"No action specified" => "Nincs megadva parancs",
-"No configuration specified" => "Nincs megadva konfiguráció",
-"No data specified" => "Nincs adat megadva",
-" Could not set configuration %s" => "A(z) %s konfiguráció nem állítható be",
-"Deletion failed" => "A törlés nem sikerült",
-"Take over settings from recent server configuration?" => "Vegyük át a beállításokat az előző konfigurációból?",
-"Keep settings?" => "Tartsuk meg a beállításokat?",
-"{nthServer}. Server" => "{nthServer}. Kiszolgáló",
-"Cannot add server configuration" => "Az új  kiszolgáló konfigurációja nem hozható létre",
-"mappings cleared" => "Töröltük a hozzárendeléseket",
-"Success" => "Sikeres végrehajtás",
-"Error" => "Hiba",
-"Please specify a Base DN" => "Adja meg az alap/Base/ DN-t",
-"Could not determine Base DN" => "nem sikerült azonosítani az alap/Base/ DN-t",
-"Please specify the port" => "Add meg a portot",
-"Configuration OK" => "Konfiguráció OK",
-"Configuration incorrect" => "Konfiguráió hibás",
-"Configuration incomplete" => "Konfiguráció nincs befejezve",
-"Select groups" => "Csoportok kiválasztása",
-"Select object classes" => "Objektumosztályok kiválasztása",
-"Select attributes" => "Attribútumok kiválasztása",
-"Connection test succeeded" => "A kapcsolatellenőrzés eredménye: sikerült",
-"Connection test failed" => "A kapcsolatellenőrzés eredménye: nem sikerült",
-"Do you really want to delete the current Server Configuration?" => "Tényleg törölni szeretné a kiszolgáló beállításait?",
-"Confirm Deletion" => "A törlés megerősítése",
-"_%s group found_::_%s groups found_" => array("%s csoport van","%s csoport van"),
-"_%s user found_::_%s users found_" => array("%s felhasználó van","%s felhasználó van"),
-"Could not find the desired feature" => "A kívánt funkció nem található",
-"Invalid Host" => "Érvénytelen gépnév",
-"Server" => "Kiszolgáló",
-"User Filter" => "Felhasználói szűrő",
-"Login Filter" => "Bejelentkezési szűrő",
-"Group Filter" => "A csoportok szűrője",
-"Save" => "Mentés",
-"Test Configuration" => "A beállítások tesztelése",
-"Help" => "Súgó",
-"Groups meeting these criteria are available in %s:" => "A %s szolgáltatás azon csoportok létezését veszi figyelembe, amik a következő feltételeknek felelnek meg:",
-"only those object classes:" => "csak ezek az objektumosztályok:",
-"only from those groups:" => "csak ezek a csoportok:",
-"Edit raw filter instead" => "Inkább közvetlenül megadom a szűrési kifejezést:",
-"Raw LDAP filter" => "Az LDAP szűrőkifejezés",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "A szűrő meghatározza, hogy mely LDAP csoportok lesznek jogosultak %s elérésére.",
-"Test Filter" => "Test szűrő ",
-"groups found" => "csoport van",
-"Users login with this attribute:" => "A felhasználók ezzel az attribútummal jelentkeznek be:",
-"LDAP Username:" => "LDAP felhasználónév:",
-"LDAP Email Address:" => "LDAP e-mail cím:",
-"Other Attributes:" => "Más attribútumok:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Ez a szűrő érvényes a bejelentkezés megkísérlésekor. Ekkor az %%uid változó helyére a bejelentkezési név kerül. Például: \"uid=%%uid\"",
-"1. Server" => "1. Kiszolgáló",
-"%s. Server:" => "%s. kiszolgáló",
-"Add Server Configuration" => "Új kiszolgáló beállításának hozzáadása",
-"Delete Configuration" => "Konfiguráció törlés",
-"Host" => "Kiszolgáló",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "A protokoll előtag elhagyható, kivéve, ha SSL-t kíván használni. Ebben az esetben kezdje így:  ldaps://",
-"Port" => "Port",
-"User DN" => "A kapcsolódó felhasználó DN-je",
-"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." => "Annak a felhasználónak a DN-je, akinek a nevében bejelentkezve kapcsolódunk a kiszolgálóhoz, pl. uid=agent,dc=example,dc=com. Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
-"Password" => "Jelszó",
-"For anonymous access, leave DN and Password empty." => "Bejelentkezés nélküli eléréshez ne töltse ki a DN és Jelszó mezőket!",
-"One Base DN per line" => "Soronként egy DN-gyökér",
-"You can specify Base DN for users and groups in the Advanced tab" => "A Haladó fülre kattintva külön DN-gyökér állítható be a felhasználók és a csoportok számára",
-"Manually enter LDAP filters (recommended for large directories)" => "LDAP szűrők kézi beállitása (ajánlott a nagy könyvtáraknál)",
-"Limit %s access to users meeting these criteria:" => "Korlátozzuk a %s szolgáltatás elérését azokra a felhasználókra, akik megfelelnek a következő feltételeknek:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "A szűrő meghatározza, hogy mely LDAP felhasználók lesznek jogosultak %s elérésére.",
-"users found" => "felhasználó van",
-"Saving" => "Mentés",
-"Back" => "Vissza",
-"Continue" => "Folytatás",
-"Expert" => "Profi",
-"Advanced" => "Haladó",
-"<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>Figyelem:</b> a user_ldap és user_webdavauth alkalmazások nem kompatibilisek. Együttes használatuk váratlan eredményekhez vezethet. Kérje meg a rendszergazdát, hogy a kettő közül kapcsolja ki az egyiket.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Figyelmeztetés:</b> Az LDAP PHP modul nincs telepítve, ezért ez az alrendszer nem fog működni. Kérje meg a rendszergazdát, hogy telepítse!",
-"Connection Settings" => "Kapcsolati beállítások",
-"Configuration Active" => "A beállítás aktív",
-"When unchecked, this configuration will be skipped." => "Ha nincs kipipálva, ez a beállítás kihagyódik.",
-"Backup (Replica) Host" => "Másodkiszolgáló (replika)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Adjon meg egy opcionális másodkiszolgálót. Ez a fő LDAP/AD kiszolgáló szinkron másolata (replikája) kell legyen.",
-"Backup (Replica) Port" => "A másodkiszolgáló (replika) portszáma",
-"Disable Main Server" => "A fő szerver kihagyása",
-"Only connect to the replica server." => "Csak a másodlagos (másolati) kiszolgálóhoz kapcsolódjunk.",
-"Case insensitive LDAP server (Windows)" => "Az LDAP-kiszolgáló nem tesz különbséget a kis- és nagybetűk között (Windows)",
-"Turn off SSL certificate validation." => "Ne ellenőrizzük az SSL-tanúsítvány érvényességét",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Használata nem javasolt (kivéve tesztelési céllal). Ha a kapcsolat csak ezzel a beállítással működik, akkor importálja az LDAP-kiszolgáló SSL tanúsítványát a(z) %s kiszolgálóra!",
-"Cache Time-To-Live" => "A gyorsítótár tárolási időtartama",
-"in seconds. A change empties the cache." => "másodpercben. A változtatás törli a cache tartalmát.",
-"Directory Settings" => "Címtár beállítások",
-"User Display Name Field" => "A felhasználónév mezője",
-"The LDAP attribute to use to generate the user's display name." => "Ebből az LDAP attribútumból képződik a felhasználó megjelenítendő neve.",
-"Base User Tree" => "A felhasználói fa gyökere",
-"One User Base DN per line" => "Soronként egy felhasználói fa gyökerét adhatjuk meg",
-"User Search Attributes" => "A felhasználók lekérdezett attribútumai",
-"Optional; one attribute per line" => "Nem kötelező megadni, soronként egy attribútum",
-"Group Display Name Field" => "A csoport nevének mezője",
-"The LDAP attribute to use to generate the groups's display name." => "Ebből az LDAP attribútumból képződik a csoport megjelenítendő neve.",
-"Base Group Tree" => "A csoportfa gyökere",
-"One Group Base DN per line" => "Soronként egy csoportfa gyökerét adhatjuk meg",
-"Group Search Attributes" => "A csoportok lekérdezett attribútumai",
-"Group-Member association" => "A csoporttagság attribútuma",
-"Nested Groups" => "Egymásba ágyazott csoportok",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Amikor be van kapcsolva, akkor azokat a csoportokat is kezelni tudjuk, melyekben a személyek mellett csoportok is vannak. (Csak akkor működik, ha a csoportok \"member\" attribútuma DN-eket tartalmaz.)",
-"Paging chunksize" => "Lapméret paging esetén",
-"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.)" => "A lapméret megadásával korlátozható az egy fordulóban kapott találatok száma, akkor is, ha az LDAP-keresés nagyon sok találatot ad, ha ezt az LDAP-kiszolgáló támogatja. (Ha 0-ra állítjuk, akkor ezáltal letiltjuk ezt a lapozó funkciót.)",
-"Special Attributes" => "Különleges attribútumok",
-"Quota Field" => "Kvóta mező",
-"Quota Default" => "Alapértelmezett kvóta",
-"in bytes" => "bájtban",
-"Email Field" => "E-mail mező",
-"User Home Folder Naming Rule" => "A home könyvtár elérési útvonala",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Hagyja üresen, ha a felhasználónevet kívánja használni. Ellenkező esetben adjon meg egy LDAP/AD attribútumot!",
-"Internal Username" => "Belső felhasználónév",
-"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." => "Alapértelmezetten a belső felhasználónév az UUID attribútumból jön létre. Ez biztosítja a felhasználónév egyediségét, ill. azt, hogy a karaktereket nem kell konvertálni benne. A belső felhasználónévben csak a következő karakterek engdélyezettek: [ a-zA-Z0-9_.@- ]. Minden más karakter vagy az ASCII kódtáblában levő megfelelőjére cserélődik ki, vagy ha ilyen nincs, akkor egyszerűen kihagyódik. Ha az így kapott nevek mégis ütköznének, akkor a végükön kiegészülnek egy növekvő sorszámmal. A  belső felhasználónév a programon belül azonosítja a felhasználót, valamint alapértelmezetten ez lesz a felhasználó személyes home könyvtárának a neve is. A belső felhasználónév adja a távoli elérések webcímének egy részét is, ilyenek pl. a *DAV szolgáltatások URL-jei. Ezzel a beállítással felülbírálhatjuk az alapértelmezett viselkedést. Ha az ownCloud 5-ös változata előtti viselkedést szeretné elérni, akkor a következő mezőben adja meg a felhasználó megjelenítési nevének attribútumát. Az alapértelmezett viselkedéshez hagyja üresen. A változtatás csak az újonnan létrejövő (újonnan megfeleltetett) LDAP felhasználók esetén érvényesül.",
-"Internal Username Attribute:" => "A belső felhasználónév attribútuma:",
-"Override UUID detection" => "Az UUID-felismerés felülbírálása",
-"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." => "Az UUID attribútum alapértelmezetten felismerésre kerül. Az UUID attribútum segítségével az LDAP felhasználók és csoportok egyértelműen azonosíthatók. A belső felhasználónév is azonos lesz az UUID-vel, ha fentebb nincs másként definiálva. Ezt a beállítást felülbírálhatja és bármely attribútummal helyettesítheti. Ekkor azonban gondoskodnia kell arról, hogy a kiválasztott attribútum minden felhasználó és csoport esetén lekérdezhető és egyedi értékkel bír. Ha a mezőt üresen hagyja, akkor az alapértelmezett attribútum lesz érvényes. Egy esetleges módosítás csak az újonnan hozzárendelt (ill. létrehozott) felhasználókra és csoportokra lesz érvényes.",
-"UUID Attribute for Users:" => "A felhasználók UUID attribútuma:",
-"UUID Attribute for Groups:" => "A csoportok UUID attribútuma:",
-"Username-LDAP User Mapping" => "Felhasználó - LDAP felhasználó hozzárendelés",
-"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." => "A felhasználónevek segítségével történik a (meta)adatok tárolása és hozzárendelése. A felhasználók pontos azonosítása céljából minden LDAP felhasználóhoz egy belső felhasználónevet rendelünk. Ezt a felhasználónevet az LDAP felhasználó UUID attribútumához rendeljük hozzá. Ezen túlmenően a DN is tárolásra kerül a gyorsítótárban, hogy csökkentsük az LDAP lekérdezések számát, de a DN-t nem használjuk azonosításra. Ha a DN megváltozik, akkor a rendszer ezt észleli. A belső felhasználóneveket a rendszer igen sok helyen használja, ezért a hozzárendelések törlése sok érvénytelen adatrekordot eredményez az adatbázisban. A hozzárendelések törlése nem függ a konfigurációtól, minden LDAP konfigurációt érint! Ténylegesen működő szolgáltatás esetén sose törölje a hozzárendeléseket, csak tesztelési vagy kísérleti célú szerveren!",
-"Clear Username-LDAP User Mapping" => "A felhasználó - LDAP felhasználó hozzárendelés törlése",
-"Clear Groupname-LDAP Group Mapping" => "A csoport - LDAP csoport hozzárendelés törlése"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/hy.js b/apps/user_ldap/l10n/hy.js
new file mode 100644
index 00000000000..0d513531e49
--- /dev/null
+++ b/apps/user_ldap/l10n/hy.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Պահպանել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/hy.json b/apps/user_ldap/l10n/hy.json
new file mode 100644
index 00000000000..d9bc9061a62
--- /dev/null
+++ b/apps/user_ldap/l10n/hy.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Պահպանել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/hy.php b/apps/user_ldap/l10n/hy.php
deleted file mode 100644
index 805020b059c..00000000000
--- a/apps/user_ldap/l10n/hy.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Պահպանել"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ia.js b/apps/user_ldap/l10n/ia.js
new file mode 100644
index 00000000000..f56ec46d98a
--- /dev/null
+++ b/apps/user_ldap/l10n/ia.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Il falleva deler",
+    "Error" : "Error",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Salveguardar",
+    "Help" : "Adjuta",
+    "Password" : "Contrasigno",
+    "Back" : "Retro",
+    "Continue" : "Continuar",
+    "Advanced" : "Avantiate"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ia.json b/apps/user_ldap/l10n/ia.json
new file mode 100644
index 00000000000..22aad84b052
--- /dev/null
+++ b/apps/user_ldap/l10n/ia.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Deletion failed" : "Il falleva deler",
+    "Error" : "Error",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Salveguardar",
+    "Help" : "Adjuta",
+    "Password" : "Contrasigno",
+    "Back" : "Retro",
+    "Continue" : "Continuar",
+    "Advanced" : "Avantiate"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ia.php b/apps/user_ldap/l10n/ia.php
deleted file mode 100644
index 3d7699525c9..00000000000
--- a/apps/user_ldap/l10n/ia.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Il falleva deler",
-"Error" => "Error",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Salveguardar",
-"Help" => "Adjuta",
-"Password" => "Contrasigno",
-"Back" => "Retro",
-"Continue" => "Continuar",
-"Advanced" => "Avantiate"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js
new file mode 100644
index 00000000000..f6297a6f31c
--- /dev/null
+++ b/apps/user_ldap/l10n/id.js
@@ -0,0 +1,68 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to delete the server configuration" : "Gagal menghapus konfigurasi server",
+    "The configuration is valid and the connection could be established!" : "Konfigurasi valid dan koneksi dapat dilakukan!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
+    "Deletion failed" : "Penghapusan gagal",
+    "Take over settings from recent server configuration?" : "Ambil alih pengaturan dari konfigurasi server saat ini?",
+    "Keep settings?" : "Biarkan pengaturan?",
+    "Cannot add server configuration" : "Gagal menambah konfigurasi server",
+    "Success" : "Sukses",
+    "Error" : "Galat",
+    "Select groups" : "Pilih grup",
+    "Connection test succeeded" : "Tes koneksi sukses",
+    "Connection test failed" : "Tes koneksi gagal",
+    "Do you really want to delete the current Server Configuration?" : "Anda ingin menghapus Konfigurasi Server saat ini?",
+    "Confirm Deletion" : "Konfirmasi Penghapusan",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Server" : "Server",
+    "Group Filter" : "saringan grup",
+    "Save" : "Simpan",
+    "Test Configuration" : "Uji Konfigurasi",
+    "Help" : "Bantuan",
+    "Add Server Configuration" : "Tambah Konfigurasi Server",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://",
+    "Port" : "port",
+    "User DN" : "User 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." : "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
+    "Password" : "Sandi",
+    "For anonymous access, leave DN and Password empty." : "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
+    "One Base DN per line" : "Satu Base DN per baris",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
+    "Back" : "Kembali",
+    "Continue" : "Lanjutkan",
+    "Advanced" : "Lanjutan",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
+    "Connection Settings" : "Pengaturan Koneksi",
+    "Configuration Active" : "Konfigurasi Aktif",
+    "When unchecked, this configuration will be skipped." : "Jika tidak dicentang, konfigurasi ini dilewati.",
+    "Backup (Replica) Host" : "Host Cadangan (Replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.",
+    "Backup (Replica) Port" : "Port Cadangan (Replika)",
+    "Disable Main Server" : "Nonaktifkan Server Utama",
+    "Turn off SSL certificate validation." : "matikan validasi sertivikat SSL",
+    "Cache Time-To-Live" : "Gunakan Tembolok untuk Time-To-Live",
+    "in seconds. A change empties the cache." : "dalam detik. perubahan mengosongkan cache",
+    "Directory Settings" : "Pengaturan Direktori",
+    "User Display Name Field" : "Bidang Tampilan Nama Pengguna",
+    "Base User Tree" : "Pohon Pengguna Dasar",
+    "One User Base DN per line" : "Satu Pengguna Base DN per baris",
+    "User Search Attributes" : "Atribut Pencarian Pengguna",
+    "Optional; one attribute per line" : "Pilihan; satu atribut per baris",
+    "Group Display Name Field" : "Bidang Tampilan Nama Grup",
+    "Base Group Tree" : "Pohon Grup Dasar",
+    "One Group Base DN per line" : "Satu Grup Base DN per baris",
+    "Group Search Attributes" : "Atribut Pencarian Grup",
+    "Group-Member association" : "asosiasi Anggota-Grup",
+    "Special Attributes" : "Atribut Khusus",
+    "Quota Field" : "Bidang Kuota",
+    "Quota Default" : "Kuota Baku",
+    "in bytes" : "dalam bytes",
+    "Email Field" : "Bidang Email",
+    "User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
new file mode 100644
index 00000000000..0fff37b80a4
--- /dev/null
+++ b/apps/user_ldap/l10n/id.json
@@ -0,0 +1,66 @@
+{ "translations": {
+    "Failed to delete the server configuration" : "Gagal menghapus konfigurasi server",
+    "The configuration is valid and the connection could be established!" : "Konfigurasi valid dan koneksi dapat dilakukan!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
+    "Deletion failed" : "Penghapusan gagal",
+    "Take over settings from recent server configuration?" : "Ambil alih pengaturan dari konfigurasi server saat ini?",
+    "Keep settings?" : "Biarkan pengaturan?",
+    "Cannot add server configuration" : "Gagal menambah konfigurasi server",
+    "Success" : "Sukses",
+    "Error" : "Galat",
+    "Select groups" : "Pilih grup",
+    "Connection test succeeded" : "Tes koneksi sukses",
+    "Connection test failed" : "Tes koneksi gagal",
+    "Do you really want to delete the current Server Configuration?" : "Anda ingin menghapus Konfigurasi Server saat ini?",
+    "Confirm Deletion" : "Konfirmasi Penghapusan",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Server" : "Server",
+    "Group Filter" : "saringan grup",
+    "Save" : "Simpan",
+    "Test Configuration" : "Uji Konfigurasi",
+    "Help" : "Bantuan",
+    "Add Server Configuration" : "Tambah Konfigurasi Server",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://",
+    "Port" : "port",
+    "User DN" : "User 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." : "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
+    "Password" : "Sandi",
+    "For anonymous access, leave DN and Password empty." : "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
+    "One Base DN per line" : "Satu Base DN per baris",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
+    "Back" : "Kembali",
+    "Continue" : "Lanjutkan",
+    "Advanced" : "Lanjutan",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
+    "Connection Settings" : "Pengaturan Koneksi",
+    "Configuration Active" : "Konfigurasi Aktif",
+    "When unchecked, this configuration will be skipped." : "Jika tidak dicentang, konfigurasi ini dilewati.",
+    "Backup (Replica) Host" : "Host Cadangan (Replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.",
+    "Backup (Replica) Port" : "Port Cadangan (Replika)",
+    "Disable Main Server" : "Nonaktifkan Server Utama",
+    "Turn off SSL certificate validation." : "matikan validasi sertivikat SSL",
+    "Cache Time-To-Live" : "Gunakan Tembolok untuk Time-To-Live",
+    "in seconds. A change empties the cache." : "dalam detik. perubahan mengosongkan cache",
+    "Directory Settings" : "Pengaturan Direktori",
+    "User Display Name Field" : "Bidang Tampilan Nama Pengguna",
+    "Base User Tree" : "Pohon Pengguna Dasar",
+    "One User Base DN per line" : "Satu Pengguna Base DN per baris",
+    "User Search Attributes" : "Atribut Pencarian Pengguna",
+    "Optional; one attribute per line" : "Pilihan; satu atribut per baris",
+    "Group Display Name Field" : "Bidang Tampilan Nama Grup",
+    "Base Group Tree" : "Pohon Grup Dasar",
+    "One Group Base DN per line" : "Satu Grup Base DN per baris",
+    "Group Search Attributes" : "Atribut Pencarian Grup",
+    "Group-Member association" : "asosiasi Anggota-Grup",
+    "Special Attributes" : "Atribut Khusus",
+    "Quota Field" : "Bidang Kuota",
+    "Quota Default" : "Kuota Baku",
+    "in bytes" : "dalam bytes",
+    "Email Field" : "Bidang Email",
+    "User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
deleted file mode 100644
index 01cf269d68d..00000000000
--- a/apps/user_ldap/l10n/id.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Gagal membersihkan pemetaan.",
-"Failed to delete the server configuration" => "Gagal menghapus konfigurasi server",
-"The configuration is valid and the connection could be established!" => "Konfigurasi valid dan koneksi dapat dilakukan!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasi valid, tetapi Bind gagal. Silakan periksa pengaturan server dan kredensial.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Konfigurasi tidak sah. Silakan lihat log untuk rincian lebh lanjut.",
-"No action specified" => "Tidak ada tindakan yang ditetapkan",
-"No configuration specified" => "Tidak ada konfigurasi yang ditetapkan",
-"No data specified" => "Tidak ada data yang ditetapkan",
-" Could not set configuration %s" => "Tidak dapat menyetel konfigurasi %s",
-"Deletion failed" => "Penghapusan gagal",
-"Take over settings from recent server configuration?" => "Mengambil alih pengaturan dari konfigurasi server saat ini?",
-"Keep settings?" => "Biarkan pengaturan?",
-"{nthServer}. Server" => "{nthServer}. Server",
-"Cannot add server configuration" => "Gagal menambah konfigurasi server",
-"mappings cleared" => "pemetaan dibersihkan",
-"Success" => "Berhasil",
-"Error" => "Kesalahan",
-"Please specify a Base DN" => "Sialakan menetapkan Base DN",
-"Could not determine Base DN" => "Tidak dapat menetakan Base DN",
-"Please specify the port" => "Silakan tetapkan port",
-"Configuration OK" => "Konfigurasi Oke",
-"Configuration incorrect" => "Konfigurasi salah",
-"Configuration incomplete" => "Konfigurasi tidak lengkap",
-"Select groups" => "Pilih grup",
-"Select object classes" => "Pilik kelas obyek",
-"Select attributes" => "Pilih atribut",
-"Connection test succeeded" => "Pemeriksaan koneksi berhasil",
-"Connection test failed" => "Pemeriksaan koneksi gagal",
-"Do you really want to delete the current Server Configuration?" => "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
-"Confirm Deletion" => "Konfirmasi Penghapusan",
-"_%s group found_::_%s groups found_" => array("%s grup ditemukan"),
-"_%s user found_::_%s users found_" => array("%s pengguna ditemukan"),
-"Could not find the desired feature" => "Tidak dapat menemukan fitur yang diinginkan",
-"Invalid Host" => "Host tidak sah",
-"Server" => "Server",
-"User Filter" => "Penyaring Pengguna",
-"Login Filter" => "Penyaring Masuk",
-"Group Filter" => "Penyaring grup",
-"Save" => "Simpan",
-"Test Configuration" => "Uji Konfigurasi",
-"Help" => "Bantuan",
-"Groups meeting these criteria are available in %s:" => "Grup memenuhi kriteria ini tersedia di %s:",
-"only those object classes:" => "hanya kelas objek:",
-"only from those groups:" => "hanya dari kelompok:",
-"Edit raw filter instead" => "Sunting penyaring raw",
-"Raw LDAP filter" => "Penyaring LDAP raw",
-"Test Filter" => "Uji Penyaring",
-"groups found" => "grup ditemukan",
-"Users login with this attribute:" => "Login pengguna dengan atribut ini:",
-"LDAP Username:" => "Nama pengguna LDAP:",
-"LDAP Email Address:" => "Alamat Email LDAP:",
-"Other Attributes:" => "Atribut Lain:",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Tambah Konfigurasi Server",
-"Delete Configuration" => "Hapus Konfigurasi",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
-"Port" => "Port",
-"User DN" => "Pengguna 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." => "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
-"Password" => "Sandi",
-"For anonymous access, leave DN and Password empty." => "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
-"One Base DN per line" => "Satu Base DN per baris",
-"You can specify Base DN for users and groups in the Advanced tab" => "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
-"Manually enter LDAP filters (recommended for large directories)" => "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)",
-"Limit %s access to users meeting these criteria:" => "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:",
-"users found" => "pengguna ditemukan",
-"Saving" => "Menyimpan",
-"Back" => "Kembali",
-"Continue" => "Lanjutkan",
-"Expert" => "Lanjutan",
-"Advanced" => "Lanjutan",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
-"Connection Settings" => "Pengaturan Koneksi",
-"Configuration Active" => "Konfigurasi Aktif",
-"When unchecked, this configuration will be skipped." => "Jika tidak dicentang, konfigurasi ini dilewati.",
-"Backup (Replica) Host" => "Host Cadangan (Replika)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Berikan pilihan host cadangan. Harus merupakan replika dari server LDAP/AD utama.",
-"Backup (Replica) Port" => "Port Cadangan (Replika)",
-"Disable Main Server" => "Nonaktifkan Server Utama",
-"Turn off SSL certificate validation." => "matikan validasi sertivikat SSL",
-"Cache Time-To-Live" => "Gunakan Tembolok untuk Time-To-Live",
-"in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
-"Directory Settings" => "Pengaturan Direktori",
-"User Display Name Field" => "Bidang Tampilan Nama Pengguna",
-"Base User Tree" => "Pohon Pengguna Dasar",
-"One User Base DN per line" => "Satu Pengguna Base DN per baris",
-"User Search Attributes" => "Atribut Pencarian Pengguna",
-"Optional; one attribute per line" => "Pilihan; satu atribut per baris",
-"Group Display Name Field" => "Bidang Tampilan Nama Grup",
-"Base Group Tree" => "Pohon Grup Dasar",
-"One Group Base DN per line" => "Satu Grup Base DN per baris",
-"Group Search Attributes" => "Atribut Pencarian Grup",
-"Group-Member association" => "asosiasi Anggota-Grup",
-"Special Attributes" => "Atribut Khusus",
-"Quota Field" => "Bidang Kuota",
-"Quota Default" => "Kuota Baku",
-"in bytes" => "dalam bytes",
-"Email Field" => "Bidang Email",
-"User Home Folder Naming Rule" => "Aturan Penamaan Folder Home Pengguna",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/io.js b/apps/user_ldap/l10n/io.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/io.js
@@ -0,0 +1,7 @@
+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/io.json b/apps/user_ldap/l10n/io.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/io.json
@@ -0,0 +1,5 @@
+{ "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/io.php b/apps/user_ldap/l10n/io.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/io.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/is.js b/apps/user_ldap/l10n/is.js
new file mode 100644
index 00000000000..23669d3bb0c
--- /dev/null
+++ b/apps/user_ldap/l10n/is.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Keep settings?" : "Geyma stillingar ?",
+    "Error" : "Villa",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Vista",
+    "Test Configuration" : "Prúfa uppsetningu",
+    "Help" : "Hjálp",
+    "Host" : "Netþjónn",
+    "Password" : "Lykilorð",
+    "Advanced" : "Ítarlegt"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/is.json b/apps/user_ldap/l10n/is.json
new file mode 100644
index 00000000000..4ea4a56675e
--- /dev/null
+++ b/apps/user_ldap/l10n/is.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Keep settings?" : "Geyma stillingar ?",
+    "Error" : "Villa",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Vista",
+    "Test Configuration" : "Prúfa uppsetningu",
+    "Help" : "Hjálp",
+    "Host" : "Netþjónn",
+    "Password" : "Lykilorð",
+    "Advanced" : "Ítarlegt"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/is.php b/apps/user_ldap/l10n/is.php
deleted file mode 100644
index 148eb064030..00000000000
--- a/apps/user_ldap/l10n/is.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Keep settings?" => "Geyma stillingar ?",
-"Error" => "Villa",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Vista",
-"Test Configuration" => "Prúfa uppsetningu",
-"Help" => "Hjálp",
-"Host" => "Netþjónn",
-"Password" => "Lykilorð",
-"Advanced" => "Ítarlegt"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js
new file mode 100644
index 00000000000..1ec979a1fee
--- /dev/null
+++ b/apps/user_ldap/l10n/it.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Cancellazione delle associazioni non riuscita.",
+    "Failed to delete the server configuration" : "Eliminazione della configurazione del server non riuscita",
+    "The configuration is valid and the connection could be established!" : "La configurazione è valida e la connessione può essere stabilita.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configurazione non è valida. Controlla i log per ulteriori dettagli.",
+    "No action specified" : "Nessuna azione specificata",
+    "No configuration specified" : "Nessuna configurazione specificata",
+    "No data specified" : "Nessun dato specificato",
+    " Could not set configuration %s" : "Impossibile impostare la configurazione %s",
+    "Deletion failed" : "Eliminazione non riuscita",
+    "Take over settings from recent server configuration?" : "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
+    "Keep settings?" : "Vuoi mantenere le impostazioni?",
+    "{nthServer}. Server" : "{nthServer}. server",
+    "Cannot add server configuration" : "Impossibile aggiungere la configurazione del server",
+    "mappings cleared" : "associazioni cancellate",
+    "Success" : "Riuscito",
+    "Error" : "Errore",
+    "Please specify a Base DN" : "Specifica un DN base",
+    "Could not determine Base DN" : "Impossibile determinare il DN base",
+    "Please specify the port" : "Specifica la porta",
+    "Configuration OK" : "Configurazione corretta",
+    "Configuration incorrect" : "Configurazione non corretta",
+    "Configuration incomplete" : "Configurazione incompleta",
+    "Select groups" : "Seleziona i gruppi",
+    "Select object classes" : "Seleziona le classi di oggetti",
+    "Select attributes" : "Seleziona gli attributi",
+    "Connection test succeeded" : "Prova di connessione riuscita",
+    "Connection test failed" : "Prova di connessione non riuscita",
+    "Do you really want to delete the current Server Configuration?" : "Vuoi davvero eliminare la configurazione attuale del server?",
+    "Confirm Deletion" : "Conferma l'eliminazione",
+    "_%s group found_::_%s groups found_" : ["%s gruppo trovato","%s gruppi trovati"],
+    "_%s user found_::_%s users found_" : ["%s utente trovato","%s utenti trovati"],
+    "Could not find the desired feature" : "Impossibile trovare la funzionalità desiderata",
+    "Invalid Host" : "Host non valido",
+    "Server" : "Server",
+    "User Filter" : "Filtro utente",
+    "Login Filter" : "Filtro accesso",
+    "Group Filter" : "Filtro gruppo",
+    "Save" : "Salva",
+    "Test Configuration" : "Prova configurazione",
+    "Help" : "Aiuto",
+    "Groups meeting these criteria are available in %s:" : "I gruppi che corrispondono a questi criteri sono disponibili in %s:",
+    "only those object classes:" : "solo queste classi di oggetti:",
+    "only from those groups:" : "solo da questi gruppi:",
+    "Edit raw filter instead" : "Modifica invece il filtro grezzo",
+    "Raw LDAP filter" : "Filtro LDAP grezzo",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
+    "Test Filter" : "Prova filtro",
+    "groups found" : "gruppi trovati",
+    "Users login with this attribute:" : "Utenti con questo attributo:",
+    "LDAP Username:" : "Nome utente LDAP:",
+    "LDAP Email Address:" : "Indirizzo email LDAP:",
+    "Other Attributes:" : "Altri attributi:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
+    "1. Server" : "1. server",
+    "%s. Server:" : "%s. server:",
+    "Add Server Configuration" : "Aggiungi configurazione del server",
+    "Delete Configuration" : "Elimina configurazione",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
+    "Port" : "Porta",
+    "User DN" : "DN utente",
+    "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." : "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+    "Password" : "Password",
+    "For anonymous access, leave DN and Password empty." : "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+    "One Base DN per line" : "Un DN base per riga",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Digita manualmente i filtri LDAP (consigliato per directory grandi)",
+    "Limit %s access to users meeting these criteria:" : "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
+    "users found" : "utenti trovati",
+    "Saving" : "Salvataggio",
+    "Back" : "Indietro",
+    "Continue" : "Continua",
+    "Expert" : "Esperto",
+    "Advanced" : "Avanzate",
+    "<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne 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>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
+    "Connection Settings" : "Impostazioni di connessione",
+    "Configuration Active" : "Configurazione attiva",
+    "When unchecked, this configuration will be skipped." : "Se deselezionata, questa configurazione sarà saltata.",
+    "Backup (Replica) Host" : "Host di backup (Replica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale.",
+    "Backup (Replica) Port" : "Porta di backup (Replica)",
+    "Disable Main Server" : "Disabilita server principale",
+    "Only connect to the replica server." : "Collegati solo al server di replica.",
+    "Case insensitive LDAP server (Windows)" : "Server LDAP non sensibile alle maiuscole (Windows)",
+    "Turn off SSL certificate validation." : "Disattiva il controllo del certificato SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non consigliata, da utilizzare solo per test! Se la connessione funziona solo con questa opzione, importa il certificate SSL del server LDAP sul tuo server %s.",
+    "Cache Time-To-Live" : "Tempo di vita della cache",
+    "in seconds. A change empties the cache." : "in secondi. Il cambio svuota la cache.",
+    "Directory Settings" : "Impostazioni delle cartelle",
+    "User Display Name Field" : "Campo per la visualizzazione del nome utente",
+    "The LDAP attribute to use to generate the user's display name." : "L'attributo LDAP da usare per generare il nome visualizzato dell'utente.",
+    "Base User Tree" : "Struttura base dell'utente",
+    "One User Base DN per line" : "Un DN base utente per riga",
+    "User Search Attributes" : "Attributi di ricerca utente",
+    "Optional; one attribute per line" : "Opzionale; un attributo per riga",
+    "Group Display Name Field" : "Campo per la visualizzazione del nome del gruppo",
+    "The LDAP attribute to use to generate the groups's display name." : "L'attributo LDAP da usare per generare il nome visualizzato del gruppo.",
+    "Base Group Tree" : "Struttura base del gruppo",
+    "One Group Base DN per line" : "Un DN base gruppo per riga",
+    "Group Search Attributes" : "Attributi di ricerca gruppo",
+    "Group-Member association" : "Associazione gruppo-utente ",
+    "Nested Groups" : "Gruppi nidificati",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Quando è attivato, i gruppi che contengono altri gruppi sono supportati. (Funziona solo se l'attributo del gruppo membro contiene DN.)",
+    "Paging chunksize" : "Dimensione del blocco di paginazione",
+    "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.)" : "Dimensione del blocco per le ricerche LDAP paginate che potrebbero restituire risultati pesanti come l'enumerazione di utenti o gruppi.(L'impostazione a 0 disabilita le ricerche LDAP paginate in questi casi.)",
+    "Special Attributes" : "Attributi speciali",
+    "Quota Field" : "Campo Quota",
+    "Quota Default" : "Quota predefinita",
+    "in bytes" : "in byte",
+    "Email Field" : "Campo Email",
+    "User Home Folder Naming Rule" : "Regola di assegnazione del nome della cartella utente",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
+    "Internal Username" : "Nome utente interno",
+    "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." : "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà aggiunto/incrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
+    "Internal Username Attribute:" : "Attributo nome utente interno:",
+    "Override UUID detection" : "Ignora rilevamento 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." : "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
+    "UUID Attribute for Users:" : "Attributo UUID per gli utenti:",
+    "UUID Attribute for Groups:" : "Attributo UUID per i gruppi:",
+    "Username-LDAP User Mapping" : "Associazione Nome utente-Utente LDAP",
+    "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." : "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test.",
+    "Clear Username-LDAP User Mapping" : "Cancella associazione Nome utente-Utente LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Cancella associazione Nome gruppo-Gruppo LDAP"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json
new file mode 100644
index 00000000000..f99c2c86185
--- /dev/null
+++ b/apps/user_ldap/l10n/it.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Cancellazione delle associazioni non riuscita.",
+    "Failed to delete the server configuration" : "Eliminazione della configurazione del server non riuscita",
+    "The configuration is valid and the connection could be established!" : "La configurazione è valida e la connessione può essere stabilita.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "La configurazione non è valida. Controlla i log per ulteriori dettagli.",
+    "No action specified" : "Nessuna azione specificata",
+    "No configuration specified" : "Nessuna configurazione specificata",
+    "No data specified" : "Nessun dato specificato",
+    " Could not set configuration %s" : "Impossibile impostare la configurazione %s",
+    "Deletion failed" : "Eliminazione non riuscita",
+    "Take over settings from recent server configuration?" : "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
+    "Keep settings?" : "Vuoi mantenere le impostazioni?",
+    "{nthServer}. Server" : "{nthServer}. server",
+    "Cannot add server configuration" : "Impossibile aggiungere la configurazione del server",
+    "mappings cleared" : "associazioni cancellate",
+    "Success" : "Riuscito",
+    "Error" : "Errore",
+    "Please specify a Base DN" : "Specifica un DN base",
+    "Could not determine Base DN" : "Impossibile determinare il DN base",
+    "Please specify the port" : "Specifica la porta",
+    "Configuration OK" : "Configurazione corretta",
+    "Configuration incorrect" : "Configurazione non corretta",
+    "Configuration incomplete" : "Configurazione incompleta",
+    "Select groups" : "Seleziona i gruppi",
+    "Select object classes" : "Seleziona le classi di oggetti",
+    "Select attributes" : "Seleziona gli attributi",
+    "Connection test succeeded" : "Prova di connessione riuscita",
+    "Connection test failed" : "Prova di connessione non riuscita",
+    "Do you really want to delete the current Server Configuration?" : "Vuoi davvero eliminare la configurazione attuale del server?",
+    "Confirm Deletion" : "Conferma l'eliminazione",
+    "_%s group found_::_%s groups found_" : ["%s gruppo trovato","%s gruppi trovati"],
+    "_%s user found_::_%s users found_" : ["%s utente trovato","%s utenti trovati"],
+    "Could not find the desired feature" : "Impossibile trovare la funzionalità desiderata",
+    "Invalid Host" : "Host non valido",
+    "Server" : "Server",
+    "User Filter" : "Filtro utente",
+    "Login Filter" : "Filtro accesso",
+    "Group Filter" : "Filtro gruppo",
+    "Save" : "Salva",
+    "Test Configuration" : "Prova configurazione",
+    "Help" : "Aiuto",
+    "Groups meeting these criteria are available in %s:" : "I gruppi che corrispondono a questi criteri sono disponibili in %s:",
+    "only those object classes:" : "solo queste classi di oggetti:",
+    "only from those groups:" : "solo da questi gruppi:",
+    "Edit raw filter instead" : "Modifica invece il filtro grezzo",
+    "Raw LDAP filter" : "Filtro LDAP grezzo",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
+    "Test Filter" : "Prova filtro",
+    "groups found" : "gruppi trovati",
+    "Users login with this attribute:" : "Utenti con questo attributo:",
+    "LDAP Username:" : "Nome utente LDAP:",
+    "LDAP Email Address:" : "Indirizzo email LDAP:",
+    "Other Attributes:" : "Altri attributi:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
+    "1. Server" : "1. server",
+    "%s. Server:" : "%s. server:",
+    "Add Server Configuration" : "Aggiungi configurazione del server",
+    "Delete Configuration" : "Elimina configurazione",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
+    "Port" : "Porta",
+    "User DN" : "DN utente",
+    "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." : "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+    "Password" : "Password",
+    "For anonymous access, leave DN and Password empty." : "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+    "One Base DN per line" : "Un DN base per riga",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Digita manualmente i filtri LDAP (consigliato per directory grandi)",
+    "Limit %s access to users meeting these criteria:" : "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
+    "users found" : "utenti trovati",
+    "Saving" : "Salvataggio",
+    "Back" : "Indietro",
+    "Continue" : "Continua",
+    "Expert" : "Esperto",
+    "Advanced" : "Avanzate",
+    "<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne 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>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
+    "Connection Settings" : "Impostazioni di connessione",
+    "Configuration Active" : "Configurazione attiva",
+    "When unchecked, this configuration will be skipped." : "Se deselezionata, questa configurazione sarà saltata.",
+    "Backup (Replica) Host" : "Host di backup (Replica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale.",
+    "Backup (Replica) Port" : "Porta di backup (Replica)",
+    "Disable Main Server" : "Disabilita server principale",
+    "Only connect to the replica server." : "Collegati solo al server di replica.",
+    "Case insensitive LDAP server (Windows)" : "Server LDAP non sensibile alle maiuscole (Windows)",
+    "Turn off SSL certificate validation." : "Disattiva il controllo del certificato SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Non consigliata, da utilizzare solo per test! Se la connessione funziona solo con questa opzione, importa il certificate SSL del server LDAP sul tuo server %s.",
+    "Cache Time-To-Live" : "Tempo di vita della cache",
+    "in seconds. A change empties the cache." : "in secondi. Il cambio svuota la cache.",
+    "Directory Settings" : "Impostazioni delle cartelle",
+    "User Display Name Field" : "Campo per la visualizzazione del nome utente",
+    "The LDAP attribute to use to generate the user's display name." : "L'attributo LDAP da usare per generare il nome visualizzato dell'utente.",
+    "Base User Tree" : "Struttura base dell'utente",
+    "One User Base DN per line" : "Un DN base utente per riga",
+    "User Search Attributes" : "Attributi di ricerca utente",
+    "Optional; one attribute per line" : "Opzionale; un attributo per riga",
+    "Group Display Name Field" : "Campo per la visualizzazione del nome del gruppo",
+    "The LDAP attribute to use to generate the groups's display name." : "L'attributo LDAP da usare per generare il nome visualizzato del gruppo.",
+    "Base Group Tree" : "Struttura base del gruppo",
+    "One Group Base DN per line" : "Un DN base gruppo per riga",
+    "Group Search Attributes" : "Attributi di ricerca gruppo",
+    "Group-Member association" : "Associazione gruppo-utente ",
+    "Nested Groups" : "Gruppi nidificati",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Quando è attivato, i gruppi che contengono altri gruppi sono supportati. (Funziona solo se l'attributo del gruppo membro contiene DN.)",
+    "Paging chunksize" : "Dimensione del blocco di paginazione",
+    "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.)" : "Dimensione del blocco per le ricerche LDAP paginate che potrebbero restituire risultati pesanti come l'enumerazione di utenti o gruppi.(L'impostazione a 0 disabilita le ricerche LDAP paginate in questi casi.)",
+    "Special Attributes" : "Attributi speciali",
+    "Quota Field" : "Campo Quota",
+    "Quota Default" : "Quota predefinita",
+    "in bytes" : "in byte",
+    "Email Field" : "Campo Email",
+    "User Home Folder Naming Rule" : "Regola di assegnazione del nome della cartella utente",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
+    "Internal Username" : "Nome utente interno",
+    "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." : "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà aggiunto/incrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
+    "Internal Username Attribute:" : "Attributo nome utente interno:",
+    "Override UUID detection" : "Ignora rilevamento 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." : "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
+    "UUID Attribute for Users:" : "Attributo UUID per gli utenti:",
+    "UUID Attribute for Groups:" : "Attributo UUID per i gruppi:",
+    "Username-LDAP User Mapping" : "Associazione Nome utente-Utente LDAP",
+    "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." : "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test.",
+    "Clear Username-LDAP User Mapping" : "Cancella associazione Nome utente-Utente LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Cancella associazione Nome gruppo-Gruppo LDAP"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
deleted file mode 100644
index 34e93fd778e..00000000000
--- a/apps/user_ldap/l10n/it.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Cancellazione delle associazioni non riuscita.",
-"Failed to delete the server configuration" => "Eliminazione della configurazione del server non riuscita",
-"The configuration is valid and the connection could be established!" => "La configurazione è valida e la connessione può essere stabilita.",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "La configurazione è valida, ma il Bind non è riuscito. Controlla le impostazioni del server e le credenziali.",
-"The configuration is invalid. Please have a look at the logs for further details." => "La configurazione non è valida. Controlla i log per ulteriori dettagli.",
-"No action specified" => "Nessuna azione specificata",
-"No configuration specified" => "Nessuna configurazione specificata",
-"No data specified" => "Nessun dato specificato",
-" Could not set configuration %s" => "Impossibile impostare la configurazione %s",
-"Deletion failed" => "Eliminazione non riuscita",
-"Take over settings from recent server configuration?" => "Vuoi recuperare le impostazioni dalla configurazione recente del server?",
-"Keep settings?" => "Vuoi mantenere le impostazioni?",
-"{nthServer}. Server" => "{nthServer}. server",
-"Cannot add server configuration" => "Impossibile aggiungere la configurazione del server",
-"mappings cleared" => "associazioni cancellate",
-"Success" => "Riuscito",
-"Error" => "Errore",
-"Please specify a Base DN" => "Specifica un DN base",
-"Could not determine Base DN" => "Impossibile determinare il DN base",
-"Please specify the port" => "Specifica la porta",
-"Configuration OK" => "Configurazione corretta",
-"Configuration incorrect" => "Configurazione non corretta",
-"Configuration incomplete" => "Configurazione incompleta",
-"Select groups" => "Seleziona i gruppi",
-"Select object classes" => "Seleziona le classi di oggetti",
-"Select attributes" => "Seleziona gli attributi",
-"Connection test succeeded" => "Prova di connessione riuscita",
-"Connection test failed" => "Prova di connessione non riuscita",
-"Do you really want to delete the current Server Configuration?" => "Vuoi davvero eliminare la configurazione attuale del server?",
-"Confirm Deletion" => "Conferma l'eliminazione",
-"_%s group found_::_%s groups found_" => array("%s gruppo trovato","%s gruppi trovati"),
-"_%s user found_::_%s users found_" => array("%s utente trovato","%s utenti trovati"),
-"Could not find the desired feature" => "Impossibile trovare la funzionalità desiderata",
-"Invalid Host" => "Host non valido",
-"Server" => "Server",
-"User Filter" => "Filtro utente",
-"Login Filter" => "Filtro accesso",
-"Group Filter" => "Filtro gruppo",
-"Save" => "Salva",
-"Test Configuration" => "Prova configurazione",
-"Help" => "Aiuto",
-"Groups meeting these criteria are available in %s:" => "I gruppi che corrispondono a questi criteri sono disponibili in %s:",
-"only those object classes:" => "solo queste classi di oggetti:",
-"only from those groups:" => "solo da questi gruppi:",
-"Edit raw filter instead" => "Modifica invece il filtro grezzo",
-"Raw LDAP filter" => "Filtro LDAP grezzo",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Il filtro specifica quali gruppi LDAP devono avere accesso all'istanza %s.",
-"Test Filter" => "Prova filtro",
-"groups found" => "gruppi trovati",
-"Users login with this attribute:" => "Utenti con questo attributo:",
-"LDAP Username:" => "Nome utente LDAP:",
-"LDAP Email Address:" => "Indirizzo email LDAP:",
-"Other Attributes:" => "Altri attributi:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Specifica quale filtro utilizzare quando si tenta l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso. Esempio: \"uid=%%uid\"",
-"1. Server" => "1. server",
-"%s. Server:" => "%s. server:",
-"Add Server Configuration" => "Aggiungi configurazione del server",
-"Delete Configuration" => "Elimina configurazione",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
-"Port" => "Porta",
-"User DN" => "DN utente",
-"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." => "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
-"Password" => "Password",
-"For anonymous access, leave DN and Password empty." => "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
-"One Base DN per line" => "Un DN base per riga",
-"You can specify Base DN for users and groups in the Advanced tab" => "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Impedisce le richieste LDAP automatiche. Meglio per installazioni più grandi, ma richiede una certa conoscenza di LDAP.",
-"Manually enter LDAP filters (recommended for large directories)" => "Digita manualmente i filtri LDAP (consigliato per directory grandi)",
-"Limit %s access to users meeting these criteria:" => "Limita l'accesso a %s ai gruppi che verificano questi criteri:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Il filtro specifica quali utenti LDAP devono avere accesso all'istanza %s.",
-"users found" => "utenti trovati",
-"Saving" => "Salvataggio",
-"Back" => "Indietro",
-"Continue" => "Continua",
-"Expert" => "Esperto",
-"Advanced" => "Avanzate",
-"<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne 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>Avviso:</b> il modulo PHP LDAP non è installato, il motore non funzionerà. Chiedi al tuo amministratore di sistema di installarlo.",
-"Connection Settings" => "Impostazioni di connessione",
-"Configuration Active" => "Configurazione attiva",
-"When unchecked, this configuration will be skipped." => "Se deselezionata, questa configurazione sarà saltata.",
-"Backup (Replica) Host" => "Host di backup (Replica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Fornisci un host di backup opzionale. Deve essere una replica del server AD/LDAP principale.",
-"Backup (Replica) Port" => "Porta di backup (Replica)",
-"Disable Main Server" => "Disabilita server principale",
-"Only connect to the replica server." => "Collegati solo al server di replica.",
-"Case insensitive LDAP server (Windows)" => "Server LDAP non sensibile alle maiuscole (Windows)",
-"Turn off SSL certificate validation." => "Disattiva il controllo del certificato SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Non consigliata, da utilizzare solo per test! Se la connessione funziona solo con questa opzione, importa il certificate SSL del server LDAP sul tuo server %s.",
-"Cache Time-To-Live" => "Tempo di vita della cache",
-"in seconds. A change empties the cache." => "in secondi. Il cambio svuota la cache.",
-"Directory Settings" => "Impostazioni delle cartelle",
-"User Display Name Field" => "Campo per la visualizzazione del nome utente",
-"The LDAP attribute to use to generate the user's display name." => "L'attributo LDAP da usare per generare il nome visualizzato dell'utente.",
-"Base User Tree" => "Struttura base dell'utente",
-"One User Base DN per line" => "Un DN base utente per riga",
-"User Search Attributes" => "Attributi di ricerca utente",
-"Optional; one attribute per line" => "Opzionale; un attributo per riga",
-"Group Display Name Field" => "Campo per la visualizzazione del nome del gruppo",
-"The LDAP attribute to use to generate the groups's display name." => "L'attributo LDAP da usare per generare il nome visualizzato del gruppo.",
-"Base Group Tree" => "Struttura base del gruppo",
-"One Group Base DN per line" => "Un DN base gruppo per riga",
-"Group Search Attributes" => "Attributi di ricerca gruppo",
-"Group-Member association" => "Associazione gruppo-utente ",
-"Nested Groups" => "Gruppi nidificati",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando è attivato, i gruppi che contengono altri gruppi sono supportati. (Funziona solo se l'attributo del gruppo membro contiene DN.)",
-"Paging chunksize" => "Dimensione del blocco di paginazione",
-"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.)" => "Dimensione del blocco per le ricerche LDAP paginate che potrebbero restituire risultati pesanti come l'enumerazione di utenti o gruppi.(L'impostazione a 0 disabilita le ricerche LDAP paginate in questi casi.)",
-"Special Attributes" => "Attributi speciali",
-"Quota Field" => "Campo Quota",
-"Quota Default" => "Quota predefinita",
-"in bytes" => "in byte",
-"Email Field" => "Campo Email",
-"User Home Folder Naming Rule" => "Regola di assegnazione del nome della cartella utente",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
-"Internal Username" => "Nome utente interno",
-"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." => "In modo predefinito, il nome utente interno sarà creato dall'attributo UUID. Ciò assicura che il nome utente sia univoco e che non sia necessario convertire i caratteri. Il nome utente interno consente l'uso di determinati caratteri:  [ a-zA-Z0-9_.@- ]. Altri caratteri sono sostituiti con il corrispondente ASCII o sono semplicemente omessi. In caso di conflitto, sarà aggiunto/incrementato un numero. Il nome utente interno è utilizzato per identificare un utente internamente. Rappresenta, inoltre, il nome predefinito per la cartella home dell'utente in ownCloud. Costituisce anche una parte di URL remoti, ad esempio per tutti i servizi *DAV. Con questa impostazione, il comportamento predefinito può essere scavalcato. Per ottenere un comportamento simile alle versioni precedenti ownCloud 5, inserisci l'attributo del nome visualizzato dell'utente nel campo seguente. Lascialo vuoto per il comportamento predefinito. Le modifiche avranno effetto solo sui nuovo utenti LDAP associati (aggiunti).",
-"Internal Username Attribute:" => "Attributo nome utente interno:",
-"Override UUID detection" => "Ignora rilevamento 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." => "In modo predefinito, l'attributo UUID viene rilevato automaticamente. L'attributo UUID è utilizzato per identificare senza alcun dubbio gli utenti e i gruppi LDAP. Inoltre, il nome utente interno sarà creato sulla base dell'UUID, se non è specificato in precedenza. Puoi ignorare l'impostazione e fornire un attributo di tua scelta. Assicurati che l'attributo scelto possa essere ottenuto sia per gli utenti che per i gruppi e che sia univoco. Lascialo vuoto per ottenere il comportamento predefinito. Le modifiche avranno effetto solo sui nuovi utenti e gruppi LDAP associati (aggiunti).",
-"UUID Attribute for Users:" => "Attributo UUID per gli utenti:",
-"UUID Attribute for Groups:" => "Attributo UUID per i gruppi:",
-"Username-LDAP User Mapping" => "Associazione Nome utente-Utente LDAP",
-"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." => "I nomi utente sono utilizzati per archiviare e assegnare i (meta) dati. Per identificare con precisione e riconoscere gli utenti, ogni utente LDAP avrà un nome utente interno. Ciò richiede un'associazione tra il nome utente e l'utente LDAP. In aggiunta, il DN viene mantenuto in cache per ridurre l'interazione con LDAP, ma non è utilizzato per l'identificazione. Se il DN cambia, le modifiche saranno rilevate. Il nome utente interno è utilizzato dappertutto. La cancellazione delle associazioni lascerà tracce residue ovunque e interesserà esclusivamente la configurazione LDAP. Non cancellare mai le associazioni in un ambiente di produzione, ma solo in una fase sperimentale o di test.",
-"Clear Username-LDAP User Mapping" => "Cancella associazione Nome utente-Utente LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Cancella associazione Nome gruppo-Gruppo LDAP"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
new file mode 100644
index 00000000000..53769711a4f
--- /dev/null
+++ b/apps/user_ldap/l10n/ja.js
@@ -0,0 +1,128 @@
+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." : "設定は有効ですが、接続に失敗しました。サーバー設定と資格情報を確認してください。",
+    "The configuration is invalid. Please have a look at the logs for further details." : "設定が無効です。詳細はログを確認してください。",
+    "No action specified" : "アクションが指定されていません",
+    "No configuration specified" : "構成が指定されていません",
+    "No data specified" : "データが指定されていません",
+    " Could not set configuration %s" : "構成 %s を設定できませんでした",
+    "Deletion failed" : "削除に失敗しました",
+    "Take over settings from recent server configuration?" : "最近のサーバー設定から設定を引き継ぎますか？",
+    "Keep settings?" : "設定を保持しますか？",
+    "{nthServer}. Server" : "{nthServer}. サーバー",
+    "Cannot add server configuration" : "サーバー設定を追加できません",
+    "mappings cleared" : "マッピングをクリアしました",
+    "Success" : "成功",
+    "Error" : "エラー",
+    "Please specify a Base DN" : "ベースDN を指定してください",
+    "Could not determine Base DN" : "ベースDNを決定できませんでした",
+    "Please specify the port" : "ポートを指定してください",
+    "Configuration OK" : "設定OK",
+    "Configuration incorrect" : "設定に誤りがあります",
+    "Configuration incomplete" : "設定が不完全です",
+    "Select groups" : "グループを選択",
+    "Select object classes" : "オブジェクトクラスを選択",
+    "Select attributes" : "属性を選択",
+    "Connection test succeeded" : "接続テストに成功しました",
+    "Connection test failed" : "接続テストに失敗しました",
+    "Do you really want to delete the current Server Configuration?" : "現在のサーバー設定を本当に削除してもよろしいですか？",
+    "Confirm Deletion" : "削除の確認",
+    "_%s group found_::_%s groups found_" : ["%s グループが見つかりました"],
+    "_%s user found_::_%s users found_" : ["%s ユーザーが見つかりました"],
+    "Could not find the desired feature" : "望ましい機能は見つかりませんでした",
+    "Invalid Host" : "無効なホスト",
+    "Server" : "サーバー",
+    "User Filter" : "ユーザーフィルター",
+    "Login Filter" : "ログインフィルター",
+    "Group Filter" : "グループフィルタ",
+    "Save" : "保存",
+    "Test Configuration" : "設定をテスト",
+    "Help" : "ヘルプ",
+    "Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
+    "only those object classes:" : "それらのオブジェクトクラスのみ:",
+    "only from those groups:" : "それらのグループからのみ:",
+    "Edit raw filter instead" : "フィルタを編集",
+    "Raw LDAP filter" : "LDAP フィルタ",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+    "groups found" : "グループが見つかりました",
+    "Users login with this attribute:" : "この属性でユーザーログイン:",
+    "LDAP Username:" : "LDAPユーザー名:",
+    "LDAP Email Address:" : "LDAPメールアドレス:",
+    "Other Attributes:" : "他の属性:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. サーバー:",
+    "Add Server Configuration" : "サーバー設定を追加",
+    "Delete Configuration" : "設定を削除",
+    "Host" : "ホスト",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
+    "Port" : "ポート",
+    "User DN" : "ユーザー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." : "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。",
+    "Password" : "パスワード",
+    "For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。",
+    "One Base DN per line" : "1行に1つのベースDN",
+    "You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。",
+    "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
+    "users found" : "ユーザーが見つかりました",
+    "Back" : "戻る",
+    "Continue" : "続ける",
+    "Expert" : "エキスパート設定",
+    "Advanced" : "詳細設定",
+    "<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>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。",
+    "Connection Settings" : "接続設定",
+    "Configuration Active" : "設定はアクティブです",
+    "When unchecked, this configuration will be skipped." : "チェックを外すと、この設定はスキップされます。",
+    "Backup (Replica) Host" : "バックアップ（レプリカ）ホスト",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバーのレプリカである必要があります。",
+    "Backup (Replica) Port" : "バックアップ（レプリカ）ポート",
+    "Disable Main Server" : "メインサーバーを無効にする",
+    "Only connect to the replica server." : "レプリカサーバーにのみ接続します。",
+    "Case insensitive LDAP server (Windows)" : "大文字と小文字を区別しないLDAPサーバー (Windows)",
+    "Turn off SSL certificate validation." : "SSL証明書の確認を無効にする。",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
+    "Cache Time-To-Live" : "キャッシュのTTL",
+    "in seconds. A change empties the cache." : "秒。変更後にキャッシュがクリアされます。",
+    "Directory Settings" : "ディレクトリ設定",
+    "User Display Name Field" : "ユーザー表示名のフィールド",
+    "The LDAP attribute to use to generate the user's display name." : "ユーザーの表示名の生成に利用するLDAP属性",
+    "Base User Tree" : "ベースユーザーツリー",
+    "One User Base DN per line" : "1行に1つのユーザーベースDN",
+    "User Search Attributes" : "ユーザー検索属性",
+    "Optional; one attribute per line" : "オプション：1行に1属性",
+    "Group Display Name Field" : "グループ表示名のフィールド",
+    "The LDAP attribute to use to generate the groups's display name." : "ユーザーのグループ表示名の生成に利用するLDAP属性",
+    "Base Group Tree" : "ベースグループツリー",
+    "One Group Base DN per line" : "1行に1つのグループベースDN",
+    "Group Search Attributes" : "グループ検索属性",
+    "Group-Member association" : "グループとメンバーの関連付け",
+    "Nested Groups" : "ネスト化ブロック",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)",
+    "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.)" : "ページ分割サイズは、LDAP検索時にユーザーやグループのリスト一覧データを一括で返すデータ量を指定します。(設定が0の場合には、LDAP検索の分割転送は無効)",
+    "Special Attributes" : "特殊属性",
+    "Quota Field" : "クォータフィールド",
+    "Quota Default" : "クォータのデフォルト",
+    "in bytes" : "バイト",
+    "Email Field" : "メールフィールド",
+    "User Home Folder Naming Rule" : "ユーザーのホームフォルダー命名規則",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "ユーザー名を空のままにしてください（デフォルト）。もしくは、LDAPもしくはADの属性を指定してください。",
+    "Internal Username" : "内部ユーザー名",
+    "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." : "デフォルトでは、内部ユーザー名はUUID属性から作成されます。これにより、ユーザー名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザー名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザー名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダー名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザー表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザーにおいてのみ有効となります。",
+    "Internal Username Attribute:" : "内部ユーザー名属性:",
+    "Override UUID detection" : "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." : "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザーとLDAPグループに対してのみ有効となります。",
+    "UUID Attribute for Users:" : "ユーザーのUUID属性:",
+    "UUID Attribute for Groups:" : "グループの UUID 属性:",
+    "Username-LDAP User Mapping" : "ユーザー名とLDAPユーザのマッピング",
+    "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." : "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+    "Clear Username-LDAP User Mapping" : "ユーザー名とLDAPユーザーのマッピングをクリアする",
+    "Clear Groupname-LDAP Group Mapping" : "グループ名とLDAPグループのマッピングをクリアする"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
new file mode 100644
index 00000000000..687301902f2
--- /dev/null
+++ b/apps/user_ldap/l10n/ja.json
@@ -0,0 +1,126 @@
+{ "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." : "設定は有効ですが、接続に失敗しました。サーバー設定と資格情報を確認してください。",
+    "The configuration is invalid. Please have a look at the logs for further details." : "設定が無効です。詳細はログを確認してください。",
+    "No action specified" : "アクションが指定されていません",
+    "No configuration specified" : "構成が指定されていません",
+    "No data specified" : "データが指定されていません",
+    " Could not set configuration %s" : "構成 %s を設定できませんでした",
+    "Deletion failed" : "削除に失敗しました",
+    "Take over settings from recent server configuration?" : "最近のサーバー設定から設定を引き継ぎますか？",
+    "Keep settings?" : "設定を保持しますか？",
+    "{nthServer}. Server" : "{nthServer}. サーバー",
+    "Cannot add server configuration" : "サーバー設定を追加できません",
+    "mappings cleared" : "マッピングをクリアしました",
+    "Success" : "成功",
+    "Error" : "エラー",
+    "Please specify a Base DN" : "ベースDN を指定してください",
+    "Could not determine Base DN" : "ベースDNを決定できませんでした",
+    "Please specify the port" : "ポートを指定してください",
+    "Configuration OK" : "設定OK",
+    "Configuration incorrect" : "設定に誤りがあります",
+    "Configuration incomplete" : "設定が不完全です",
+    "Select groups" : "グループを選択",
+    "Select object classes" : "オブジェクトクラスを選択",
+    "Select attributes" : "属性を選択",
+    "Connection test succeeded" : "接続テストに成功しました",
+    "Connection test failed" : "接続テストに失敗しました",
+    "Do you really want to delete the current Server Configuration?" : "現在のサーバー設定を本当に削除してもよろしいですか？",
+    "Confirm Deletion" : "削除の確認",
+    "_%s group found_::_%s groups found_" : ["%s グループが見つかりました"],
+    "_%s user found_::_%s users found_" : ["%s ユーザーが見つかりました"],
+    "Could not find the desired feature" : "望ましい機能は見つかりませんでした",
+    "Invalid Host" : "無効なホスト",
+    "Server" : "サーバー",
+    "User Filter" : "ユーザーフィルター",
+    "Login Filter" : "ログインフィルター",
+    "Group Filter" : "グループフィルタ",
+    "Save" : "保存",
+    "Test Configuration" : "設定をテスト",
+    "Help" : "ヘルプ",
+    "Groups meeting these criteria are available in %s:" : "これらの基準を満たすグループが %s で利用可能:",
+    "only those object classes:" : "それらのオブジェクトクラスのみ:",
+    "only from those groups:" : "それらのグループからのみ:",
+    "Edit raw filter instead" : "フィルタを編集",
+    "Raw LDAP filter" : "LDAP フィルタ",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+    "groups found" : "グループが見つかりました",
+    "Users login with this attribute:" : "この属性でユーザーログイン:",
+    "LDAP Username:" : "LDAPユーザー名:",
+    "LDAP Email Address:" : "LDAPメールアドレス:",
+    "Other Attributes:" : "他の属性:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. サーバー:",
+    "Add Server Configuration" : "サーバー設定を追加",
+    "Delete Configuration" : "設定を削除",
+    "Host" : "ホスト",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
+    "Port" : "ポート",
+    "User DN" : "ユーザー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." : "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。",
+    "Password" : "パスワード",
+    "For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。",
+    "One Base DN per line" : "1行に1つのベースDN",
+    "You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。",
+    "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
+    "users found" : "ユーザーが見つかりました",
+    "Back" : "戻る",
+    "Continue" : "続ける",
+    "Expert" : "エキスパート設定",
+    "Advanced" : "詳細設定",
+    "<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>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。",
+    "Connection Settings" : "接続設定",
+    "Configuration Active" : "設定はアクティブです",
+    "When unchecked, this configuration will be skipped." : "チェックを外すと、この設定はスキップされます。",
+    "Backup (Replica) Host" : "バックアップ（レプリカ）ホスト",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバーのレプリカである必要があります。",
+    "Backup (Replica) Port" : "バックアップ（レプリカ）ポート",
+    "Disable Main Server" : "メインサーバーを無効にする",
+    "Only connect to the replica server." : "レプリカサーバーにのみ接続します。",
+    "Case insensitive LDAP server (Windows)" : "大文字と小文字を区別しないLDAPサーバー (Windows)",
+    "Turn off SSL certificate validation." : "SSL証明書の確認を無効にする。",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
+    "Cache Time-To-Live" : "キャッシュのTTL",
+    "in seconds. A change empties the cache." : "秒。変更後にキャッシュがクリアされます。",
+    "Directory Settings" : "ディレクトリ設定",
+    "User Display Name Field" : "ユーザー表示名のフィールド",
+    "The LDAP attribute to use to generate the user's display name." : "ユーザーの表示名の生成に利用するLDAP属性",
+    "Base User Tree" : "ベースユーザーツリー",
+    "One User Base DN per line" : "1行に1つのユーザーベースDN",
+    "User Search Attributes" : "ユーザー検索属性",
+    "Optional; one attribute per line" : "オプション：1行に1属性",
+    "Group Display Name Field" : "グループ表示名のフィールド",
+    "The LDAP attribute to use to generate the groups's display name." : "ユーザーのグループ表示名の生成に利用するLDAP属性",
+    "Base Group Tree" : "ベースグループツリー",
+    "One Group Base DN per line" : "1行に1つのグループベースDN",
+    "Group Search Attributes" : "グループ検索属性",
+    "Group-Member association" : "グループとメンバーの関連付け",
+    "Nested Groups" : "ネスト化ブロック",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)",
+    "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.)" : "ページ分割サイズは、LDAP検索時にユーザーやグループのリスト一覧データを一括で返すデータ量を指定します。(設定が0の場合には、LDAP検索の分割転送は無効)",
+    "Special Attributes" : "特殊属性",
+    "Quota Field" : "クォータフィールド",
+    "Quota Default" : "クォータのデフォルト",
+    "in bytes" : "バイト",
+    "Email Field" : "メールフィールド",
+    "User Home Folder Naming Rule" : "ユーザーのホームフォルダー命名規則",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "ユーザー名を空のままにしてください（デフォルト）。もしくは、LDAPもしくはADの属性を指定してください。",
+    "Internal Username" : "内部ユーザー名",
+    "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." : "デフォルトでは、内部ユーザー名はUUID属性から作成されます。これにより、ユーザー名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザー名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザー名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダー名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザー表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザーにおいてのみ有効となります。",
+    "Internal Username Attribute:" : "内部ユーザー名属性:",
+    "Override UUID detection" : "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." : "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザーとLDAPグループに対してのみ有効となります。",
+    "UUID Attribute for Users:" : "ユーザーのUUID属性:",
+    "UUID Attribute for Groups:" : "グループの UUID 属性:",
+    "Username-LDAP User Mapping" : "ユーザー名とLDAPユーザのマッピング",
+    "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." : "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+    "Clear Username-LDAP User Mapping" : "ユーザー名とLDAPユーザーのマッピングをクリアする",
+    "Clear Groupname-LDAP Group Mapping" : "グループ名とLDAPグループのマッピングをクリアする"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ja.php b/apps/user_ldap/l10n/ja.php
deleted file mode 100644
index 01430106847..00000000000
--- a/apps/user_ldap/l10n/ja.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "設定は有効ですが、接続に失敗しました。サーバー設定と資格情報を確認してください。",
-"The configuration is invalid. Please have a look at the logs for further details." => "設定が無効です。詳細はログを確認してください。",
-"No action specified" => "アクションが指定されていません",
-"No configuration specified" => "構成が指定されていません",
-"No data specified" => "データが指定されていません",
-" Could not set configuration %s" => "構成 %s を設定できませんでした",
-"Deletion failed" => "削除に失敗しました",
-"Take over settings from recent server configuration?" => "最近のサーバー設定から設定を引き継ぎますか？",
-"Keep settings?" => "設定を保持しますか？",
-"{nthServer}. Server" => "{nthServer}. サーバー",
-"Cannot add server configuration" => "サーバー設定を追加できません",
-"mappings cleared" => "マッピングをクリアしました",
-"Success" => "成功",
-"Error" => "エラー",
-"Please specify a Base DN" => "ベースDN を指定してください",
-"Could not determine Base DN" => "ベースDNを決定できませんでした",
-"Please specify the port" => "ポートを指定してください",
-"Configuration OK" => "設定OK",
-"Configuration incorrect" => "設定に誤りがあります",
-"Configuration incomplete" => "設定が不完全です",
-"Select groups" => "グループを選択",
-"Select object classes" => "オブジェクトクラスを選択",
-"Select attributes" => "属性を選択",
-"Connection test succeeded" => "接続テストに成功しました",
-"Connection test failed" => "接続テストに失敗しました",
-"Do you really want to delete the current Server Configuration?" => "現在のサーバー設定を本当に削除してもよろしいですか？",
-"Confirm Deletion" => "削除の確認",
-"_%s group found_::_%s groups found_" => array("%s グループが見つかりました"),
-"_%s user found_::_%s users found_" => array("%s ユーザーが見つかりました"),
-"Could not find the desired feature" => "望ましい機能は見つかりませんでした",
-"Invalid Host" => "無効なホスト",
-"Server" => "サーバー",
-"User Filter" => "ユーザーフィルター",
-"Login Filter" => "ログインフィルター",
-"Group Filter" => "グループフィルタ",
-"Save" => "保存",
-"Test Configuration" => "設定をテスト",
-"Help" => "ヘルプ",
-"Groups meeting these criteria are available in %s:" => "これらの基準を満たすグループが %s で利用可能:",
-"only those object classes:" => "それらのオブジェクトクラスのみ:",
-"only from those groups:" => "それらのグループからのみ:",
-"Edit raw filter instead" => "フィルタを編集",
-"Raw LDAP filter" => "LDAP フィルタ",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
-"groups found" => "グループが見つかりました",
-"Users login with this attribute:" => "この属性でユーザーログイン:",
-"LDAP Username:" => "LDAPユーザー名:",
-"LDAP Email Address:" => "LDAPメールアドレス:",
-"Other Attributes:" => "他の属性:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "ログイン実行時に適用するフィルタを定義します。%%uid にはログイン操作におけるユーザー名が入ります。例： \"uid=%%uid\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. サーバー:",
-"Add Server Configuration" => "サーバー設定を追加",
-"Delete Configuration" => "設定を削除",
-"Host" => "ホスト",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。",
-"Port" => "ポート",
-"User DN" => "ユーザー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." => "クライアントユーザーのDNは、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。",
-"Password" => "パスワード",
-"For anonymous access, leave DN and Password empty." => "匿名アクセスの場合は、DNとパスワードを空にしてください。",
-"One Base DN per line" => "1行に1つのベースDN",
-"You can specify Base DN for users and groups in the Advanced tab" => "拡張タブでユーザーとグループのベースDNを指定することができます。",
-"Limit %s access to users meeting these criteria:" => "この基準を満たすユーザーに対し %s へのアクセスを制限:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
-"users found" => "ユーザーが見つかりました",
-"Back" => "戻る",
-"Continue" => "続ける",
-"Expert" => "エキスパート設定",
-"Advanced" => "詳細設定",
-"<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>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告:</b> PHP LDAP モジュールがインストールされていません。バックエンドが正しく動作しません。システム管理者にインストールするよう問い合わせてください。",
-"Connection Settings" => "接続設定",
-"Configuration Active" => "設定はアクティブです",
-"When unchecked, this configuration will be skipped." => "チェックを外すと、この設定はスキップされます。",
-"Backup (Replica) Host" => "バックアップ（レプリカ）ホスト",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "バックアップホストをオプションで指定することができます。メインのLDAP/ADサーバーのレプリカである必要があります。",
-"Backup (Replica) Port" => "バックアップ（レプリカ）ポート",
-"Disable Main Server" => "メインサーバーを無効にする",
-"Only connect to the replica server." => "レプリカサーバーにのみ接続します。",
-"Case insensitive LDAP server (Windows)" => "大文字と小文字を区別しないLDAPサーバー (Windows)",
-"Turn off SSL certificate validation." => "SSL証明書の確認を無効にする。",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "推奨されません、テストにおいてのみ使用してください！このオプションでのみ接続が動作する場合は、LDAP サーバーのSSL証明書を %s サーバーにインポートしてください。",
-"Cache Time-To-Live" => "キャッシュのTTL",
-"in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
-"Directory Settings" => "ディレクトリ設定",
-"User Display Name Field" => "ユーザー表示名のフィールド",
-"The LDAP attribute to use to generate the user's display name." => "ユーザーの表示名の生成に利用するLDAP属性",
-"Base User Tree" => "ベースユーザーツリー",
-"One User Base DN per line" => "1行に1つのユーザーベースDN",
-"User Search Attributes" => "ユーザー検索属性",
-"Optional; one attribute per line" => "オプション：1行に1属性",
-"Group Display Name Field" => "グループ表示名のフィールド",
-"The LDAP attribute to use to generate the groups's display name." => "ユーザーのグループ表示名の生成に利用するLDAP属性",
-"Base Group Tree" => "ベースグループツリー",
-"One Group Base DN per line" => "1行に1つのグループベースDN",
-"Group Search Attributes" => "グループ検索属性",
-"Group-Member association" => "グループとメンバーの関連付け",
-"Nested Groups" => "ネスト化ブロック",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "オンに切り替えたら、グループを含むグループがサポートされます。(グループメンバーの属性がDNを含む場合のみ有効です。)",
-"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.)" => "ページ分割サイズは、LDAP検索時にユーザーやグループのリスト一覧データを一括で返すデータ量を指定します。(設定が0の場合には、LDAP検索の分割転送は無効)",
-"Special Attributes" => "特殊属性",
-"Quota Field" => "クォータフィールド",
-"Quota Default" => "クォータのデフォルト",
-"in bytes" => "バイト",
-"Email Field" => "メールフィールド",
-"User Home Folder Naming Rule" => "ユーザーのホームフォルダー命名規則",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザー名を空のままにしてください（デフォルト）。もしくは、LDAPもしくはADの属性を指定してください。",
-"Internal Username" => "内部ユーザー名",
-"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." => "デフォルトでは、内部ユーザー名はUUID属性から作成されます。これにより、ユーザー名がユニークであり、かつ文字の変換が不要であることを保証します。内部ユーザー名には、[ a-zA-Z0-9_.@- ] の文字のみが有効であるという制限があり、その他の文字は対応する ASCII コードに変換されるか単に無視されます。そのため、他のユーザ名との衝突の回数が増加するでしょう。内部ユーザー名は、内部的にユーザを識別するために用いられ、また、ownCloudにおけるデフォルトのホームフォルダー名としても用いられます。例えば*DAVサービスのように、リモートURLの一部でもあります。この設定により、デフォルトの振る舞いを再定義します。ownCloud 5 以前と同じような振る舞いにするためには、以下のフィールドにユーザー表示名の属性を入力します。空にするとデフォルトの振る舞いとなります。変更は新しくマッピング（追加）されたLDAPユーザーにおいてのみ有効となります。",
-"Internal Username Attribute:" => "内部ユーザー名属性:",
-"Override UUID detection" => "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." => "デフォルトでは、UUID 属性は自動的に検出されます。UUID属性は、LDAPユーザーとLDAPグループを間違いなく識別するために利用されます。また、もしこれを指定しない場合は、内部ユーザー名はUUIDに基づいて作成されます。この設定は再定義することができ、あなたの選択した属性を用いることができます。選択した属性がユーザーとグループの両方に対して適用でき、かつユニークであることを確認してください。空であればデフォルトの振る舞いとなります。変更は、新しくマッピング（追加）されたLDAPユーザーとLDAPグループに対してのみ有効となります。",
-"UUID Attribute for Users:" => "ユーザーのUUID属性:",
-"UUID Attribute for Groups:" => "グループの UUID 属性:",
-"Username-LDAP User Mapping" => "ユーザー名とLDAPユーザのマッピング",
-"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." => "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、すべてのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
-"Clear Username-LDAP User Mapping" => "ユーザー名とLDAPユーザーのマッピングをクリアする",
-"Clear Groupname-LDAP Group Mapping" => "グループ名とLDAPグループのマッピングをクリアする"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/jv.js b/apps/user_ldap/l10n/jv.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/jv.js
@@ -0,0 +1,7 @@
+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/jv.json b/apps/user_ldap/l10n/jv.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/jv.json
@@ -0,0 +1,5 @@
+{ "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/jv.php b/apps/user_ldap/l10n/jv.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/jv.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ka_GE.js b/apps/user_ldap/l10n/ka_GE.js
new file mode 100644
index 00000000000..a54e2a3f9f5
--- /dev/null
+++ b/apps/user_ldap/l10n/ka_GE.js
@@ -0,0 +1,65 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "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." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
+    "Deletion failed" : "წაშლა ვერ განხორციელდა",
+    "Take over settings from recent server configuration?" : "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
+    "Keep settings?" : "დავტოვოთ პარამეტრები?",
+    "Cannot add server configuration" : "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
+    "Success" : "დასრულდა",
+    "Error" : "შეცდომა",
+    "Select groups" : "ჯგუფების არჩევა",
+    "Connection test succeeded" : "კავშირის ტესტირება მოხერხდა",
+    "Connection test failed" : "კავშირის ტესტირება ვერ მოხერხდა",
+    "Do you really want to delete the current Server Configuration?" : "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
+    "Confirm Deletion" : "წაშლის დადასტურება",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "ჯგუფის ფილტრი",
+    "Save" : "შენახვა",
+    "Test Configuration" : "კავშირის ტესტირება",
+    "Help" : "დახმარება",
+    "Add Server Configuration" : "სერვერის პარამეტრების დამატება",
+    "Host" : "ჰოსტი",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
+    "Port" : "პორტი",
+    "User DN" : "მომხმარებლის 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." : "მომხმარებლის DN რომელთანაც უნდა მოხდეს დაკავშირება მოხდება შემდეგნაირად მაგ: uid=agent,dc=example,dc=com. ხოლო ანონიმური დაშვებისთვის, დატოვეთ 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 ტაბში",
+    "Advanced" : "დამატებითი ფუნქციები",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>გაფრთხილება:</b> PHP LDAP მოდული არ არის ინსტალირებული, ბექენდი არ იმუშავებს. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის.",
+    "Connection Settings" : "კავშირის პარამეტრები",
+    "Configuration Active" : "კონფიგურაცია აქტიურია",
+    "When unchecked, this configuration will be skipped." : "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება.",
+    "Backup (Replica) Host" : "ბექაფ  (რეპლიკა)  ჰოსტი",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა.",
+    "Backup (Replica) Port" : "ბექაფ (რეპლიკა) პორტი",
+    "Disable Main Server" : "გამორთეთ ძირითადი სერვერი",
+    "Turn off SSL certificate validation." : "გამორთეთ SSL სერთიფიკატის ვალიდაცია.",
+    "Cache Time-To-Live" : "ქეშის სიცოცხლის ხანგრძლივობა",
+    "in seconds. A change empties the cache." : "წამებში. ცვლილება ასუფთავებს ქეშს.",
+    "Directory Settings" : "დირექტორიის პარამეტრები",
+    "User Display Name Field" : "მომხმარებლის დისფლეის სახელის ფილდი",
+    "Base User Tree" : "ძირითად მომხმარებელთა სია",
+    "One User Base DN per line" : "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე",
+    "User Search Attributes" : "მომხმარებლის ძებნის ატრიბუტი",
+    "Optional; one attribute per line" : "ოფციონალური; თითო ატრიბუტი თითო ხაზზე",
+    "Group Display Name Field" : "ჯგუფის დისფლეის სახელის ფილდი",
+    "Base Group Tree" : "ძირითად ჯგუფთა სია",
+    "One Group Base DN per line" : "ერთი ჯგუფის საწყისი DN ერთ ხაზზე",
+    "Group Search Attributes" : "ჯგუფური ძებნის ატრიბუტი",
+    "Group-Member association" : "ჯგუფის წევრობის ასოციაცია",
+    "Special Attributes" : "სპეციალური ატრიბუტები",
+    "Quota Field" : "ქვოტას ველი",
+    "Quota Default" : "საწყისი ქვოტა",
+    "in bytes" : "ბაიტებში",
+    "Email Field" : "იმეილის ველი",
+    "User Home Folder Naming Rule" : "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/ka_GE.json b/apps/user_ldap/l10n/ka_GE.json
new file mode 100644
index 00000000000..26d9c7117dc
--- /dev/null
+++ b/apps/user_ldap/l10n/ka_GE.json
@@ -0,0 +1,63 @@
+{ "translations": {
+    "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." : "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
+    "Deletion failed" : "წაშლა ვერ განხორციელდა",
+    "Take over settings from recent server configuration?" : "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
+    "Keep settings?" : "დავტოვოთ პარამეტრები?",
+    "Cannot add server configuration" : "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
+    "Success" : "დასრულდა",
+    "Error" : "შეცდომა",
+    "Select groups" : "ჯგუფების არჩევა",
+    "Connection test succeeded" : "კავშირის ტესტირება მოხერხდა",
+    "Connection test failed" : "კავშირის ტესტირება ვერ მოხერხდა",
+    "Do you really want to delete the current Server Configuration?" : "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
+    "Confirm Deletion" : "წაშლის დადასტურება",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "ჯგუფის ფილტრი",
+    "Save" : "შენახვა",
+    "Test Configuration" : "კავშირის ტესტირება",
+    "Help" : "დახმარება",
+    "Add Server Configuration" : "სერვერის პარამეტრების დამატება",
+    "Host" : "ჰოსტი",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
+    "Port" : "პორტი",
+    "User DN" : "მომხმარებლის 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." : "მომხმარებლის DN რომელთანაც უნდა მოხდეს დაკავშირება მოხდება შემდეგნაირად მაგ: uid=agent,dc=example,dc=com. ხოლო ანონიმური დაშვებისთვის, დატოვეთ 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 ტაბში",
+    "Advanced" : "დამატებითი ფუნქციები",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>გაფრთხილება:</b> PHP LDAP მოდული არ არის ინსტალირებული, ბექენდი არ იმუშავებს. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის.",
+    "Connection Settings" : "კავშირის პარამეტრები",
+    "Configuration Active" : "კონფიგურაცია აქტიურია",
+    "When unchecked, this configuration will be skipped." : "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება.",
+    "Backup (Replica) Host" : "ბექაფ  (რეპლიკა)  ჰოსტი",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა.",
+    "Backup (Replica) Port" : "ბექაფ (რეპლიკა) პორტი",
+    "Disable Main Server" : "გამორთეთ ძირითადი სერვერი",
+    "Turn off SSL certificate validation." : "გამორთეთ SSL სერთიფიკატის ვალიდაცია.",
+    "Cache Time-To-Live" : "ქეშის სიცოცხლის ხანგრძლივობა",
+    "in seconds. A change empties the cache." : "წამებში. ცვლილება ასუფთავებს ქეშს.",
+    "Directory Settings" : "დირექტორიის პარამეტრები",
+    "User Display Name Field" : "მომხმარებლის დისფლეის სახელის ფილდი",
+    "Base User Tree" : "ძირითად მომხმარებელთა სია",
+    "One User Base DN per line" : "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე",
+    "User Search Attributes" : "მომხმარებლის ძებნის ატრიბუტი",
+    "Optional; one attribute per line" : "ოფციონალური; თითო ატრიბუტი თითო ხაზზე",
+    "Group Display Name Field" : "ჯგუფის დისფლეის სახელის ფილდი",
+    "Base Group Tree" : "ძირითად ჯგუფთა სია",
+    "One Group Base DN per line" : "ერთი ჯგუფის საწყისი DN ერთ ხაზზე",
+    "Group Search Attributes" : "ჯგუფური ძებნის ატრიბუტი",
+    "Group-Member association" : "ჯგუფის წევრობის ასოციაცია",
+    "Special Attributes" : "სპეციალური ატრიბუტები",
+    "Quota Field" : "ქვოტას ველი",
+    "Quota Default" : "საწყისი ქვოტა",
+    "in bytes" : "ბაიტებში",
+    "Email Field" : "იმეილის ველი",
+    "User Home Folder Naming Rule" : "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ka_GE.php b/apps/user_ldap/l10n/ka_GE.php
deleted file mode 100644
index 7ff2c4034b6..00000000000
--- a/apps/user_ldap/l10n/ka_GE.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "კონფიგურაცია მართებულია, მაგრამ მიერთება ვერ მოხერხდა. გთხოვთ შეამოწმოთ სერვერის პარამეტრები და აუთენთიკაციის პარამეტრები.",
-"Deletion failed" => "წაშლა ვერ განხორციელდა",
-"Take over settings from recent server configuration?" => "დაბრუნდებით სერვერის წინა კონფიგურაციაში?",
-"Keep settings?" => "დავტოვოთ პარამეტრები?",
-"Cannot add server configuration" => "სერვერის პარამეტრების დამატება ვერ მოხერხდა",
-"Success" => "დასრულდა",
-"Error" => "შეცდომა",
-"Select groups" => "ჯგუფების არჩევა",
-"Connection test succeeded" => "კავშირის ტესტირება მოხერხდა",
-"Connection test failed" => "კავშირის ტესტირება ვერ მოხერხდა",
-"Do you really want to delete the current Server Configuration?" => "ნამდვილად გინდათ წაშალოთ სერვერის მიმდინარე პარამეტრები?",
-"Confirm Deletion" => "წაშლის დადასტურება",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Group Filter" => "ჯგუფის ფილტრი",
-"Save" => "შენახვა",
-"Test Configuration" => "კავშირის ტესტირება",
-"Help" => "დახმარება",
-"Add Server Configuration" => "სერვერის პარამეტრების დამატება",
-"Host" => "ჰოსტი",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "თქვენ შეგიძლიათ გამოტოვოთ პროტოკოლი. გარდა ამისა გჭირდებათ SSL. შემდეგ დაიწყეთ ldaps://",
-"Port" => "პორტი",
-"User DN" => "მომხმარებლის 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." => "მომხმარებლის DN რომელთანაც უნდა მოხდეს დაკავშირება მოხდება შემდეგნაირად მაგ: uid=agent,dc=example,dc=com. ხოლო ანონიმური დაშვებისთვის, დატოვეთ 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 ტაბში",
-"Advanced" => "დამატებითი ფუნქციები",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>გაფრთხილება:</b> PHP LDAP მოდული არ არის ინსტალირებული, ბექენდი არ იმუშავებს. თხოვეთ თქვენს ადმინისტრატორს დააინსტალიროს ის.",
-"Connection Settings" => "კავშირის პარამეტრები",
-"Configuration Active" => "კონფიგურაცია აქტიურია",
-"When unchecked, this configuration will be skipped." => "როცა გადანიშნულია, ეს კონფიგურაცია გამოტოვებული იქნება.",
-"Backup (Replica) Host" => "ბექაფ  (რეპლიკა)  ჰოსტი",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "მიუთითეთ რაიმე ბექაფ ჰოსტი. ის უნდა იყოს ძირითადი LDAP/AD სერვერის რეპლიკა.",
-"Backup (Replica) Port" => "ბექაფ (რეპლიკა) პორტი",
-"Disable Main Server" => "გამორთეთ ძირითადი სერვერი",
-"Turn off SSL certificate validation." => "გამორთეთ SSL სერთიფიკატის ვალიდაცია.",
-"Cache Time-To-Live" => "ქეშის სიცოცხლის ხანგრძლივობა",
-"in seconds. A change empties the cache." => "წამებში. ცვლილება ასუფთავებს ქეშს.",
-"Directory Settings" => "დირექტორიის პარამეტრები",
-"User Display Name Field" => "მომხმარებლის დისფლეის სახელის ფილდი",
-"Base User Tree" => "ძირითად მომხმარებელთა სია",
-"One User Base DN per line" => "ერთი მომხმარებლის საწყისი DN ერთ ხაზზე",
-"User Search Attributes" => "მომხმარებლის ძებნის ატრიბუტი",
-"Optional; one attribute per line" => "ოფციონალური; თითო ატრიბუტი თითო ხაზზე",
-"Group Display Name Field" => "ჯგუფის დისფლეის სახელის ფილდი",
-"Base Group Tree" => "ძირითად ჯგუფთა სია",
-"One Group Base DN per line" => "ერთი ჯგუფის საწყისი DN ერთ ხაზზე",
-"Group Search Attributes" => "ჯგუფური ძებნის ატრიბუტი",
-"Group-Member association" => "ჯგუფის წევრობის ასოციაცია",
-"Special Attributes" => "სპეციალური ატრიბუტები",
-"Quota Field" => "ქვოტას ველი",
-"Quota Default" => "საწყისი ქვოტა",
-"in bytes" => "ბაიტებში",
-"Email Field" => "იმეილის ველი",
-"User Home Folder Naming Rule" => "მომხმარებლის Home დირექტორიის სახელების დარქმევის წესი",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "დატოვეთ ცარიელი მომხმარებლის სახელი (default). სხვა დანარჩენში მიუთითეთ LDAP/AD ატრიბუტი."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/km.js b/apps/user_ldap/l10n/km.js
new file mode 100644
index 00000000000..3782725c876
--- /dev/null
+++ b/apps/user_ldap/l10n/km.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to delete the server configuration" : "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច",
+    "Deletion failed" : "លុប​មិន​បាន​សម្រេច",
+    "Keep settings?" : "រក្សា​ទុក​ការ​កំណត់?",
+    "Cannot add server configuration" : "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
+    "Error" : "កំហុស",
+    "Connection test succeeded" : "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ",
+    "Connection test failed" : "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច",
+    "Do you really want to delete the current Server Configuration?" : "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?",
+    "Confirm Deletion" : "បញ្ជាក់​ការ​លុប",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Save" : "រក្សាទុក",
+    "Help" : "ជំនួយ",
+    "Add Server Configuration" : "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Port" : "ច្រក",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Back" : "ត្រឡប់ក្រោយ",
+    "Continue" : "បន្ត",
+    "Advanced" : "កម្រិត​ខ្ពស់"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/km.json b/apps/user_ldap/l10n/km.json
new file mode 100644
index 00000000000..4a54188c4ef
--- /dev/null
+++ b/apps/user_ldap/l10n/km.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Failed to delete the server configuration" : "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច",
+    "Deletion failed" : "លុប​មិន​បាន​សម្រេច",
+    "Keep settings?" : "រក្សា​ទុក​ការ​កំណត់?",
+    "Cannot add server configuration" : "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
+    "Error" : "កំហុស",
+    "Connection test succeeded" : "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ",
+    "Connection test failed" : "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច",
+    "Do you really want to delete the current Server Configuration?" : "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?",
+    "Confirm Deletion" : "បញ្ជាក់​ការ​លុប",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Save" : "រក្សាទុក",
+    "Help" : "ជំនួយ",
+    "Add Server Configuration" : "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
+    "Host" : "ម៉ាស៊ីន​ផ្ទុក",
+    "Port" : "ច្រក",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Back" : "ត្រឡប់ក្រោយ",
+    "Continue" : "បន្ត",
+    "Advanced" : "កម្រិត​ខ្ពស់"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/km.php b/apps/user_ldap/l10n/km.php
deleted file mode 100644
index c86e4b4f751..00000000000
--- a/apps/user_ldap/l10n/km.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to delete the server configuration" => "លុប​ការ​កំណត់​រចនា​សម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ មិន​បាន​សម្រេច",
-"Deletion failed" => "លុប​មិន​បាន​សម្រេច",
-"Keep settings?" => "រក្សា​ទុក​ការ​កំណត់?",
-"Cannot add server configuration" => "មិន​អាច​បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
-"Error" => "កំហុស",
-"Connection test succeeded" => "សាក​ល្បង​ការ​ត​ភ្ជាប់ បាន​ជោគជ័យ",
-"Connection test failed" => "សាកល្បង​ការ​តភ្ជាប់ មិន​បាន​សម្រេច",
-"Do you really want to delete the current Server Configuration?" => "តើ​អ្នក​ពិត​ជា​ចង់​លុប​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ​បច្ចុប្បន្ន​មែន​ទេ?",
-"Confirm Deletion" => "បញ្ជាក់​ការ​លុប",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Save" => "រក្សាទុក",
-"Help" => "ជំនួយ",
-"Add Server Configuration" => "បន្ថែម​ការ​កំណត់​រចនាសម្ព័ន្ធ​ម៉ាស៊ីន​បម្រើ",
-"Host" => "ម៉ាស៊ីន​ផ្ទុក",
-"Port" => "ច្រក",
-"Password" => "ពាក្យសម្ងាត់",
-"Back" => "ត្រឡប់ក្រោយ",
-"Continue" => "បន្ត",
-"Advanced" => "កម្រិត​ខ្ពស់"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/kn.js b/apps/user_ldap/l10n/kn.js
new file mode 100644
index 00000000000..5494dcae62e
--- /dev/null
+++ b/apps/user_ldap/l10n/kn.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/kn.json b/apps/user_ldap/l10n/kn.json
new file mode 100644
index 00000000000..75f0f056cc4
--- /dev/null
+++ b/apps/user_ldap/l10n/kn.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/kn.php b/apps/user_ldap/l10n/kn.php
deleted file mode 100644
index bba52d53a1a..00000000000
--- a/apps/user_ldap/l10n/kn.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ko.js b/apps/user_ldap/l10n/ko.js
new file mode 100644
index 00000000000..35aeea142e4
--- /dev/null
+++ b/apps/user_ldap/l10n/ko.js
@@ -0,0 +1,112 @@
+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." : "설정 정보가 올바르지만 바인딩이 실패하였습니다. 서버 설정과 인증 정보를 확인하십시오.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "설정이 올바르지 않습니다. 자세한 사항은 로그를 참고하십시오.",
+    "No action specified" : "동작이 지정되지 않음",
+    "No configuration specified" : "설정이 지정되지 않음",
+    "No data specified" : "데이터가 지정되지 않음",
+    " Could not set configuration %s" : " 설정 %s을(를) 지정할 수 없음",
+    "Deletion failed" : "삭제 실패",
+    "Take over settings from recent server configuration?" : "최근 서버 설정을 다시 불러오시겠습니까?",
+    "Keep settings?" : "설정을 유지하겠습니까?",
+    "Cannot add server configuration" : "서버 설정을 추가할 수 없음",
+    "mappings cleared" : "매핑 삭제됨",
+    "Success" : "성공",
+    "Error" : "오류",
+    "Configuration OK" : "설정 올바름",
+    "Configuration incorrect" : "설정 올바르지 않음",
+    "Configuration incomplete" : "설정 불완전함",
+    "Select groups" : "그룹 선택",
+    "Select object classes" : "객체 클래스 선택",
+    "Select attributes" : "속성 선택",
+    "Connection test succeeded" : "연결 시험 성공",
+    "Connection test failed" : "연결 시험 실패",
+    "Do you really want to delete the current Server Configuration?" : "현재 서버 설정을 지우시겠습니까?",
+    "Confirm Deletion" : "삭제 확인",
+    "_%s group found_::_%s groups found_" : ["그룹 %s개 찾음"],
+    "_%s user found_::_%s users found_" : ["사용자 %s명 찾음"],
+    "Could not find the desired feature" : "필요한 기능을 찾을 수 없음",
+    "Invalid Host" : "잘못된 호스트",
+    "Server" : "서버",
+    "User Filter" : "사용자 필터",
+    "Login Filter" : "로그인 필터",
+    "Group Filter" : "그룹 필터",
+    "Save" : "저장",
+    "Test Configuration" : "설정 시험",
+    "Help" : "도움말",
+    "only those object classes:" : "다음 객체 클래스만:",
+    "only from those groups:" : "다음 그룹에서만:",
+    "Edit raw filter instead" : "필터 직접 편집",
+    "Raw LDAP filter" : "LDAP 필터",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.",
+    "groups found" : "그룹 찾음",
+    "LDAP Username:" : "LDAP 사용자 이름:",
+    "LDAP Email Address:" : "LDAP 이메일 주소:",
+    "Other Attributes:" : "기타 속성:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "로그인을 시도할 때 적용할 필터를 입력하십시오. %%uid는 로그인 동작의 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"",
+    "Add Server Configuration" : "서버 설정 추가",
+    "Host" : "호스트",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.",
+    "Port" : "포트",
+    "User DN" : "사용자 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." : "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 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을 지정할 수 있습니다.",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.",
+    "users found" : "사용자 찾음",
+    "Back" : "뒤로",
+    "Continue" : "계속",
+    "Advanced" : "고급",
+    "<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>경고:</b> user_ldap, user_webdavauth 앱은 서로 호환되지 않습니다. 예상하지 못한 행동을 할 수도 있습니다. 시스템 관리자에게 연락하여 둘 중 하나의 앱의 사용을 중단하십시오.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
+    "Connection Settings" : "연결 설정",
+    "Configuration Active" : "구성 활성",
+    "When unchecked, this configuration will be skipped." : "선택하지 않으면 이 설정을 무시합니다.",
+    "Backup (Replica) Host" : "백업 (복제) 호스트",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "추가적인 백업 호스트를 지정합니다. 기본 LDAP/AD 서버의 복사본이어야 합니다.",
+    "Backup (Replica) Port" : "백업 (복제) 포트",
+    "Disable Main Server" : "주 서버 비활성화",
+    "Only connect to the replica server." : "복제 서버에만 연결합니다.",
+    "Turn off SSL certificate validation." : "SSL 인증서 유효성 검사를 해제합니다.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "테스트 목적으로만 사용하십시오! 이 옵션을 사용해야만 연결할 수 있으면 %s 서버에 LDAP 서버의 SSL 인증서를 설치하십시오.",
+    "Cache Time-To-Live" : "캐시 유지 시간",
+    "in seconds. A change empties the cache." : "초 단위입니다. 항목 변경 시 캐시가 갱신됩니다.",
+    "Directory Settings" : "디렉터리 설정",
+    "User Display Name Field" : "사용자의 표시 이름 필드",
+    "The LDAP attribute to use to generate the user's display name." : "사용자 표시 이름을 생성할 때 사용할 LDAP 속성입니다.",
+    "Base User Tree" : "기본 사용자 트리",
+    "One User Base DN per line" : "사용자 DN을 한 줄에 하나씩 입력하십시오",
+    "User Search Attributes" : "사용자 검색 속성",
+    "Optional; one attribute per line" : "추가적, 한 줄에 하나의 속성을 입력하십시오",
+    "Group Display Name Field" : "그룹의 표시 이름 필드",
+    "The LDAP attribute to use to generate the groups's display name." : "그룹 표시 이름을 생성할 때 사용할 LDAP 속성입니다.",
+    "Base Group Tree" : "기본 그룹 트리",
+    "One Group Base DN per line" : "그룹 기본 DN을 한 줄에 하나씩 입력하십시오",
+    "Group Search Attributes" : "그룹 검색 속성",
+    "Group-Member association" : "그룹-회원 연결",
+    "Special Attributes" : "특수 속성",
+    "Quota Field" : "할당량 필드",
+    "Quota Default" : "기본 할당량",
+    "in bytes" : "바이트 단위",
+    "Email Field" : "이메일 필드",
+    "User Home Folder Naming Rule" : "사용자 홈 폴더 이름 규칙",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오.",
+    "Internal Username" : "내부 사용자 이름",
+    "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." : "기본적으로 내부 사용자 이름은 UUID 속성에서 생성됩니다. 사용자 이름이 중복되지 않고 문자열을 변환할 필요가 없도록 합니다. 내부 사용자 이름에는 다음과 같은 문자열만 사용할 수 있습니다: [a-zA-Z0-9_.@-] 다른 문자열은 ASCII에 해당하는 문자열로 변경되거나 없는 글자로 취급됩니다. 충돌하는 경우 숫자가 붙거나 증가합니다. 내부 사용자 이름은 내부적으로 사용자를 식별하는 데 사용되며, 사용자 홈 폴더의 기본 이름입니다. 또한 *DAV와 같은 외부 URL의 일부로 사용됩니다. 이 설정을 사용하면 기본 설정을 재정의할 수 있습니다. ownCloud 5 이전의 행동을 사용하려면 아래 필드에 사용자의 표시 이름 속성을 입력하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자에게만 적용됩니다.",
+    "Internal Username Attribute:" : "내부 사용자 이름 속성:",
+    "Override UUID detection" : "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." : "기본적으로 UUID 속성은 자동적으로 감지됩니다. UUID 속성은 LDAP 사용자와 그룹을 정확히 식별하는 데 사용됩니다. 지정하지 않은 경우 내부 사용자 이름은 UUID를 기반으로 생성됩니다. 이 설정을 다시 정의하고 임의의 속성을 지정할 수 있습니다. 사용자와 그룹 모두에게 속성을 적용할 수 있고 중복된 값이 없는지 확인하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자와 그룹에만 적용됩니다.",
+    "UUID Attribute for Users:" : "사용자 UUID 속성:",
+    "UUID Attribute for Groups:" : "그룹 UUID 속성:",
+    "Username-LDAP User Mapping" : "사용자 이름-LDAP 사용자 매핑",
+    "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." : "사용자 이름은 (메타) 데이터를 저장하고 할당하는 데 사용됩니다. 사용자를 정확하게 식별하기 위하여 각각 LDAP 사용자는 내부 사용자 이름을 갖습니다. 이는 사용자 이름과 LDAP 사용자 간의 매핑이 필요합니다. 생성된 사용자 이름은 LDAP 사용자의 UUID로 매핑됩니다. 추가적으로 LDAP 통신을 줄이기 위해서 DN이 캐시에 저장되지만 식별에 사용되지는 않습니다. DN이 변경되면 변경 사항이 기록됩니다. 내부 사용자 이름은 계속 사용됩니다. 매핑을 비우면 흔적이 남아 있게 됩니다. 매핑을 비우는 작업은 모든 LDAP 설정에 영향을 줍니다! 테스트 및 실험 단계에만 사용하고, 사용 중인 서버에서는 시도하지 마십시오.",
+    "Clear Username-LDAP User Mapping" : "사용자 이름-LDAP 사용자 매핑 비우기",
+    "Clear Groupname-LDAP Group Mapping" : "그룹 이름-LDAP 그룹 매핑 비우기"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/ko.json b/apps/user_ldap/l10n/ko.json
new file mode 100644
index 00000000000..a415fc8f337
--- /dev/null
+++ b/apps/user_ldap/l10n/ko.json
@@ -0,0 +1,110 @@
+{ "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." : "설정 정보가 올바르지만 바인딩이 실패하였습니다. 서버 설정과 인증 정보를 확인하십시오.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "설정이 올바르지 않습니다. 자세한 사항은 로그를 참고하십시오.",
+    "No action specified" : "동작이 지정되지 않음",
+    "No configuration specified" : "설정이 지정되지 않음",
+    "No data specified" : "데이터가 지정되지 않음",
+    " Could not set configuration %s" : " 설정 %s을(를) 지정할 수 없음",
+    "Deletion failed" : "삭제 실패",
+    "Take over settings from recent server configuration?" : "최근 서버 설정을 다시 불러오시겠습니까?",
+    "Keep settings?" : "설정을 유지하겠습니까?",
+    "Cannot add server configuration" : "서버 설정을 추가할 수 없음",
+    "mappings cleared" : "매핑 삭제됨",
+    "Success" : "성공",
+    "Error" : "오류",
+    "Configuration OK" : "설정 올바름",
+    "Configuration incorrect" : "설정 올바르지 않음",
+    "Configuration incomplete" : "설정 불완전함",
+    "Select groups" : "그룹 선택",
+    "Select object classes" : "객체 클래스 선택",
+    "Select attributes" : "속성 선택",
+    "Connection test succeeded" : "연결 시험 성공",
+    "Connection test failed" : "연결 시험 실패",
+    "Do you really want to delete the current Server Configuration?" : "현재 서버 설정을 지우시겠습니까?",
+    "Confirm Deletion" : "삭제 확인",
+    "_%s group found_::_%s groups found_" : ["그룹 %s개 찾음"],
+    "_%s user found_::_%s users found_" : ["사용자 %s명 찾음"],
+    "Could not find the desired feature" : "필요한 기능을 찾을 수 없음",
+    "Invalid Host" : "잘못된 호스트",
+    "Server" : "서버",
+    "User Filter" : "사용자 필터",
+    "Login Filter" : "로그인 필터",
+    "Group Filter" : "그룹 필터",
+    "Save" : "저장",
+    "Test Configuration" : "설정 시험",
+    "Help" : "도움말",
+    "only those object classes:" : "다음 객체 클래스만:",
+    "only from those groups:" : "다음 그룹에서만:",
+    "Edit raw filter instead" : "필터 직접 편집",
+    "Raw LDAP filter" : "LDAP 필터",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.",
+    "groups found" : "그룹 찾음",
+    "LDAP Username:" : "LDAP 사용자 이름:",
+    "LDAP Email Address:" : "LDAP 이메일 주소:",
+    "Other Attributes:" : "기타 속성:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "로그인을 시도할 때 적용할 필터를 입력하십시오. %%uid는 로그인 동작의 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"",
+    "Add Server Configuration" : "서버 설정 추가",
+    "Host" : "호스트",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.",
+    "Port" : "포트",
+    "User DN" : "사용자 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." : "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 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을 지정할 수 있습니다.",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.",
+    "users found" : "사용자 찾음",
+    "Back" : "뒤로",
+    "Continue" : "계속",
+    "Advanced" : "고급",
+    "<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>경고:</b> user_ldap, user_webdavauth 앱은 서로 호환되지 않습니다. 예상하지 못한 행동을 할 수도 있습니다. 시스템 관리자에게 연락하여 둘 중 하나의 앱의 사용을 중단하십시오.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
+    "Connection Settings" : "연결 설정",
+    "Configuration Active" : "구성 활성",
+    "When unchecked, this configuration will be skipped." : "선택하지 않으면 이 설정을 무시합니다.",
+    "Backup (Replica) Host" : "백업 (복제) 호스트",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "추가적인 백업 호스트를 지정합니다. 기본 LDAP/AD 서버의 복사본이어야 합니다.",
+    "Backup (Replica) Port" : "백업 (복제) 포트",
+    "Disable Main Server" : "주 서버 비활성화",
+    "Only connect to the replica server." : "복제 서버에만 연결합니다.",
+    "Turn off SSL certificate validation." : "SSL 인증서 유효성 검사를 해제합니다.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "테스트 목적으로만 사용하십시오! 이 옵션을 사용해야만 연결할 수 있으면 %s 서버에 LDAP 서버의 SSL 인증서를 설치하십시오.",
+    "Cache Time-To-Live" : "캐시 유지 시간",
+    "in seconds. A change empties the cache." : "초 단위입니다. 항목 변경 시 캐시가 갱신됩니다.",
+    "Directory Settings" : "디렉터리 설정",
+    "User Display Name Field" : "사용자의 표시 이름 필드",
+    "The LDAP attribute to use to generate the user's display name." : "사용자 표시 이름을 생성할 때 사용할 LDAP 속성입니다.",
+    "Base User Tree" : "기본 사용자 트리",
+    "One User Base DN per line" : "사용자 DN을 한 줄에 하나씩 입력하십시오",
+    "User Search Attributes" : "사용자 검색 속성",
+    "Optional; one attribute per line" : "추가적, 한 줄에 하나의 속성을 입력하십시오",
+    "Group Display Name Field" : "그룹의 표시 이름 필드",
+    "The LDAP attribute to use to generate the groups's display name." : "그룹 표시 이름을 생성할 때 사용할 LDAP 속성입니다.",
+    "Base Group Tree" : "기본 그룹 트리",
+    "One Group Base DN per line" : "그룹 기본 DN을 한 줄에 하나씩 입력하십시오",
+    "Group Search Attributes" : "그룹 검색 속성",
+    "Group-Member association" : "그룹-회원 연결",
+    "Special Attributes" : "특수 속성",
+    "Quota Field" : "할당량 필드",
+    "Quota Default" : "기본 할당량",
+    "in bytes" : "바이트 단위",
+    "Email Field" : "이메일 필드",
+    "User Home Folder Naming Rule" : "사용자 홈 폴더 이름 규칙",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오.",
+    "Internal Username" : "내부 사용자 이름",
+    "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." : "기본적으로 내부 사용자 이름은 UUID 속성에서 생성됩니다. 사용자 이름이 중복되지 않고 문자열을 변환할 필요가 없도록 합니다. 내부 사용자 이름에는 다음과 같은 문자열만 사용할 수 있습니다: [a-zA-Z0-9_.@-] 다른 문자열은 ASCII에 해당하는 문자열로 변경되거나 없는 글자로 취급됩니다. 충돌하는 경우 숫자가 붙거나 증가합니다. 내부 사용자 이름은 내부적으로 사용자를 식별하는 데 사용되며, 사용자 홈 폴더의 기본 이름입니다. 또한 *DAV와 같은 외부 URL의 일부로 사용됩니다. 이 설정을 사용하면 기본 설정을 재정의할 수 있습니다. ownCloud 5 이전의 행동을 사용하려면 아래 필드에 사용자의 표시 이름 속성을 입력하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자에게만 적용됩니다.",
+    "Internal Username Attribute:" : "내부 사용자 이름 속성:",
+    "Override UUID detection" : "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." : "기본적으로 UUID 속성은 자동적으로 감지됩니다. UUID 속성은 LDAP 사용자와 그룹을 정확히 식별하는 데 사용됩니다. 지정하지 않은 경우 내부 사용자 이름은 UUID를 기반으로 생성됩니다. 이 설정을 다시 정의하고 임의의 속성을 지정할 수 있습니다. 사용자와 그룹 모두에게 속성을 적용할 수 있고 중복된 값이 없는지 확인하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자와 그룹에만 적용됩니다.",
+    "UUID Attribute for Users:" : "사용자 UUID 속성:",
+    "UUID Attribute for Groups:" : "그룹 UUID 속성:",
+    "Username-LDAP User Mapping" : "사용자 이름-LDAP 사용자 매핑",
+    "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." : "사용자 이름은 (메타) 데이터를 저장하고 할당하는 데 사용됩니다. 사용자를 정확하게 식별하기 위하여 각각 LDAP 사용자는 내부 사용자 이름을 갖습니다. 이는 사용자 이름과 LDAP 사용자 간의 매핑이 필요합니다. 생성된 사용자 이름은 LDAP 사용자의 UUID로 매핑됩니다. 추가적으로 LDAP 통신을 줄이기 위해서 DN이 캐시에 저장되지만 식별에 사용되지는 않습니다. DN이 변경되면 변경 사항이 기록됩니다. 내부 사용자 이름은 계속 사용됩니다. 매핑을 비우면 흔적이 남아 있게 됩니다. 매핑을 비우는 작업은 모든 LDAP 설정에 영향을 줍니다! 테스트 및 실험 단계에만 사용하고, 사용 중인 서버에서는 시도하지 마십시오.",
+    "Clear Username-LDAP User Mapping" : "사용자 이름-LDAP 사용자 매핑 비우기",
+    "Clear Groupname-LDAP Group Mapping" : "그룹 이름-LDAP 그룹 매핑 비우기"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ko.php b/apps/user_ldap/l10n/ko.php
deleted file mode 100644
index 21013328dc1..00000000000
--- a/apps/user_ldap/l10n/ko.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "설정 정보가 올바르지만 바인딩이 실패하였습니다. 서버 설정과 인증 정보를 확인하십시오.",
-"The configuration is invalid. Please have a look at the logs for further details." => "설정이 올바르지 않습니다. 자세한 사항은 로그를 참고하십시오.",
-"No action specified" => "동작이 지정되지 않음",
-"No configuration specified" => "설정이 지정되지 않음",
-"No data specified" => "데이터가 지정되지 않음",
-" Could not set configuration %s" => " 설정 %s을(를) 지정할 수 없음",
-"Deletion failed" => "삭제 실패",
-"Take over settings from recent server configuration?" => "최근 서버 설정을 다시 불러오시겠습니까?",
-"Keep settings?" => "설정을 유지하겠습니까?",
-"Cannot add server configuration" => "서버 설정을 추가할 수 없음",
-"mappings cleared" => "매핑 삭제됨",
-"Success" => "성공",
-"Error" => "오류",
-"Configuration OK" => "설정 올바름",
-"Configuration incorrect" => "설정 올바르지 않음",
-"Configuration incomplete" => "설정 불완전함",
-"Select groups" => "그룹 선택",
-"Select object classes" => "객체 클래스 선택",
-"Select attributes" => "속성 선택",
-"Connection test succeeded" => "연결 시험 성공",
-"Connection test failed" => "연결 시험 실패",
-"Do you really want to delete the current Server Configuration?" => "현재 서버 설정을 지우시겠습니까?",
-"Confirm Deletion" => "삭제 확인",
-"_%s group found_::_%s groups found_" => array("그룹 %s개 찾음"),
-"_%s user found_::_%s users found_" => array("사용자 %s명 찾음"),
-"Could not find the desired feature" => "필요한 기능을 찾을 수 없음",
-"Invalid Host" => "잘못된 호스트",
-"Server" => "서버",
-"User Filter" => "사용자 필터",
-"Login Filter" => "로그인 필터",
-"Group Filter" => "그룹 필터",
-"Save" => "저장",
-"Test Configuration" => "설정 시험",
-"Help" => "도움말",
-"only those object classes:" => "다음 객체 클래스만:",
-"only from those groups:" => "다음 그룹에서만:",
-"Edit raw filter instead" => "필터 직접 편집",
-"Raw LDAP filter" => "LDAP 필터",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "이 필터는 %s에 접근할 수 있는 LDAP 그룹을 설정합니다.",
-"groups found" => "그룹 찾음",
-"LDAP Username:" => "LDAP 사용자 이름:",
-"LDAP Email Address:" => "LDAP 이메일 주소:",
-"Other Attributes:" => "기타 속성:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "로그인을 시도할 때 적용할 필터를 입력하십시오. %%uid는 로그인 동작의 사용자 이름으로 대체됩니다. 예: \"uid=%%uid\"",
-"Add Server Configuration" => "서버 설정 추가",
-"Host" => "호스트",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL을 사용하지 않으면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오.",
-"Port" => "포트",
-"User DN" => "사용자 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." => "바인딩 작업을 수행할 클라이언트 사용자 DN입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 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을 지정할 수 있습니다.",
-"The filter specifies which LDAP users shall have access to the %s instance." => "이 필터는 %s에 접근할 수 있는 LDAP 사용자를 설정합니다.",
-"users found" => "사용자 찾음",
-"Back" => "뒤로",
-"Continue" => "계속",
-"Advanced" => "고급",
-"<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>경고:</b> user_ldap, user_webdavauth 앱은 서로 호환되지 않습니다. 예상하지 못한 행동을 할 수도 있습니다. 시스템 관리자에게 연락하여 둘 중 하나의 앱의 사용을 중단하십시오.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>경고:</b> PHP LDAP 모듈이 비활성화되어 있거나 설치되어 있지 않습니다. 백엔드를 사용할 수 없습니다. 시스템 관리자에게 설치를 요청하십시오.",
-"Connection Settings" => "연결 설정",
-"Configuration Active" => "구성 활성",
-"When unchecked, this configuration will be skipped." => "선택하지 않으면 이 설정을 무시합니다.",
-"Backup (Replica) Host" => "백업 (복제) 호스트",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "추가적인 백업 호스트를 지정합니다. 기본 LDAP/AD 서버의 복사본이어야 합니다.",
-"Backup (Replica) Port" => "백업 (복제) 포트",
-"Disable Main Server" => "주 서버 비활성화",
-"Only connect to the replica server." => "복제 서버에만 연결합니다.",
-"Turn off SSL certificate validation." => "SSL 인증서 유효성 검사를 해제합니다.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "테스트 목적으로만 사용하십시오! 이 옵션을 사용해야만 연결할 수 있으면 %s 서버에 LDAP 서버의 SSL 인증서를 설치하십시오.",
-"Cache Time-To-Live" => "캐시 유지 시간",
-"in seconds. A change empties the cache." => "초 단위입니다. 항목 변경 시 캐시가 갱신됩니다.",
-"Directory Settings" => "디렉터리 설정",
-"User Display Name Field" => "사용자의 표시 이름 필드",
-"The LDAP attribute to use to generate the user's display name." => "사용자 표시 이름을 생성할 때 사용할 LDAP 속성입니다.",
-"Base User Tree" => "기본 사용자 트리",
-"One User Base DN per line" => "사용자 DN을 한 줄에 하나씩 입력하십시오",
-"User Search Attributes" => "사용자 검색 속성",
-"Optional; one attribute per line" => "추가적, 한 줄에 하나의 속성을 입력하십시오",
-"Group Display Name Field" => "그룹의 표시 이름 필드",
-"The LDAP attribute to use to generate the groups's display name." => "그룹 표시 이름을 생성할 때 사용할 LDAP 속성입니다.",
-"Base Group Tree" => "기본 그룹 트리",
-"One Group Base DN per line" => "그룹 기본 DN을 한 줄에 하나씩 입력하십시오",
-"Group Search Attributes" => "그룹 검색 속성",
-"Group-Member association" => "그룹-회원 연결",
-"Special Attributes" => "특수 속성",
-"Quota Field" => "할당량 필드",
-"Quota Default" => "기본 할당량",
-"in bytes" => "바이트 단위",
-"Email Field" => "이메일 필드",
-"User Home Folder Naming Rule" => "사용자 홈 폴더 이름 규칙",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오.",
-"Internal Username" => "내부 사용자 이름",
-"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." => "기본적으로 내부 사용자 이름은 UUID 속성에서 생성됩니다. 사용자 이름이 중복되지 않고 문자열을 변환할 필요가 없도록 합니다. 내부 사용자 이름에는 다음과 같은 문자열만 사용할 수 있습니다: [a-zA-Z0-9_.@-] 다른 문자열은 ASCII에 해당하는 문자열로 변경되거나 없는 글자로 취급됩니다. 충돌하는 경우 숫자가 붙거나 증가합니다. 내부 사용자 이름은 내부적으로 사용자를 식별하는 데 사용되며, 사용자 홈 폴더의 기본 이름입니다. 또한 *DAV와 같은 외부 URL의 일부로 사용됩니다. 이 설정을 사용하면 기본 설정을 재정의할 수 있습니다. ownCloud 5 이전의 행동을 사용하려면 아래 필드에 사용자의 표시 이름 속성을 입력하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자에게만 적용됩니다.",
-"Internal Username Attribute:" => "내부 사용자 이름 속성:",
-"Override UUID detection" => "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." => "기본적으로 UUID 속성은 자동적으로 감지됩니다. UUID 속성은 LDAP 사용자와 그룹을 정확히 식별하는 데 사용됩니다. 지정하지 않은 경우 내부 사용자 이름은 UUID를 기반으로 생성됩니다. 이 설정을 다시 정의하고 임의의 속성을 지정할 수 있습니다. 사용자와 그룹 모두에게 속성을 적용할 수 있고 중복된 값이 없는지 확인하십시오. 비워 두면 기본 설정을 사용합니다. 새로 추가되거나 매핑된 LDAP 사용자와 그룹에만 적용됩니다.",
-"UUID Attribute for Users:" => "사용자 UUID 속성:",
-"UUID Attribute for Groups:" => "그룹 UUID 속성:",
-"Username-LDAP User Mapping" => "사용자 이름-LDAP 사용자 매핑",
-"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." => "사용자 이름은 (메타) 데이터를 저장하고 할당하는 데 사용됩니다. 사용자를 정확하게 식별하기 위하여 각각 LDAP 사용자는 내부 사용자 이름을 갖습니다. 이는 사용자 이름과 LDAP 사용자 간의 매핑이 필요합니다. 생성된 사용자 이름은 LDAP 사용자의 UUID로 매핑됩니다. 추가적으로 LDAP 통신을 줄이기 위해서 DN이 캐시에 저장되지만 식별에 사용되지는 않습니다. DN이 변경되면 변경 사항이 기록됩니다. 내부 사용자 이름은 계속 사용됩니다. 매핑을 비우면 흔적이 남아 있게 됩니다. 매핑을 비우는 작업은 모든 LDAP 설정에 영향을 줍니다! 테스트 및 실험 단계에만 사용하고, 사용 중인 서버에서는 시도하지 마십시오.",
-"Clear Username-LDAP User Mapping" => "사용자 이름-LDAP 사용자 매핑 비우기",
-"Clear Groupname-LDAP Group Mapping" => "그룹 이름-LDAP 그룹 매핑 비우기"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/ku_IQ.js b/apps/user_ldap/l10n/ku_IQ.js
new file mode 100644
index 00000000000..f38eea4c2e2
--- /dev/null
+++ b/apps/user_ldap/l10n/ku_IQ.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Success" : "سه‌رکه‌وتن",
+    "Error" : "هه‌ڵه",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "پاشکه‌وتکردن",
+    "Help" : "یارمەتی",
+    "Password" : "وشەی تێپەربو",
+    "Advanced" : "هه‌ڵبژاردنی پیشكه‌وتوو"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ku_IQ.json b/apps/user_ldap/l10n/ku_IQ.json
new file mode 100644
index 00000000000..0ad568fcedb
--- /dev/null
+++ b/apps/user_ldap/l10n/ku_IQ.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Success" : "سه‌رکه‌وتن",
+    "Error" : "هه‌ڵه",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "پاشکه‌وتکردن",
+    "Help" : "یارمەتی",
+    "Password" : "وشەی تێپەربو",
+    "Advanced" : "هه‌ڵبژاردنی پیشكه‌وتوو"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ku_IQ.php b/apps/user_ldap/l10n/ku_IQ.php
deleted file mode 100644
index 15609ab3cd1..00000000000
--- a/apps/user_ldap/l10n/ku_IQ.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Success" => "سه‌رکه‌وتن",
-"Error" => "هه‌ڵه",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "پاشکه‌وتکردن",
-"Help" => "یارمەتی",
-"Password" => "وشەی تێپەربو",
-"Advanced" => "هه‌ڵبژاردنی پیشكه‌وتوو"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lb.js b/apps/user_ldap/l10n/lb.js
new file mode 100644
index 00000000000..5dadc91749a
--- /dev/null
+++ b/apps/user_ldap/l10n/lb.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Konnt net läschen",
+    "Error" : "Fehler",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Späicheren",
+    "Help" : "Hëllef",
+    "Host" : "Host",
+    "Password" : "Passwuert",
+    "Back" : "Zeréck",
+    "Continue" : "Weider",
+    "Advanced" : "Avancéiert"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/lb.json b/apps/user_ldap/l10n/lb.json
new file mode 100644
index 00000000000..122c04ac1e3
--- /dev/null
+++ b/apps/user_ldap/l10n/lb.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Deletion failed" : "Konnt net läschen",
+    "Error" : "Fehler",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Späicheren",
+    "Help" : "Hëllef",
+    "Host" : "Host",
+    "Password" : "Passwuert",
+    "Back" : "Zeréck",
+    "Continue" : "Weider",
+    "Advanced" : "Avancéiert"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/lb.php b/apps/user_ldap/l10n/lb.php
deleted file mode 100644
index dabb78b6a87..00000000000
--- a/apps/user_ldap/l10n/lb.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Konnt net läschen",
-"Error" => "Fehler",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Späicheren",
-"Help" => "Hëllef",
-"Host" => "Host",
-"Password" => "Passwuert",
-"Back" => "Zeréck",
-"Continue" => "Weider",
-"Advanced" => "Avancéiert"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/lt_LT.js b/apps/user_ldap/l10n/lt_LT.js
new file mode 100644
index 00000000000..1222d4567e0
--- /dev/null
+++ b/apps/user_ldap/l10n/lt_LT.js
@@ -0,0 +1,61 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Nepavyko išvalyti sąsajų.",
+    "Failed to delete the server configuration" : "Nepavyko pašalinti serverio konfigūracijos",
+    "The configuration is valid and the connection could be established!" : "Konfigūracija yra tinkama bei prisijungta sėkmingai!",
+    "Deletion failed" : "Ištrinti nepavyko",
+    "Keep settings?" : "Išlaikyti nustatymus?",
+    "Cannot add server configuration" : "Negalima pridėti serverio konfigūracijos",
+    "mappings cleared" : "susiejimai išvalyti",
+    "Success" : "Sėkmingai",
+    "Error" : "Klaida",
+    "Select groups" : "Pasirinkti grupes",
+    "Connection test succeeded" : "Ryšio patikrinimas pavyko",
+    "Connection test failed" : "Ryšio patikrinimas nepavyko",
+    "Do you really want to delete the current Server Configuration?" : "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
+    "Confirm Deletion" : "Patvirtinkite trynimą",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Group Filter" : "Grupės filtras",
+    "Save" : "Išsaugoti",
+    "Test Configuration" : "Bandyti konfigūraciją",
+    "Help" : "Pagalba",
+    "Add Server Configuration" : "Pridėti serverio konfigūraciją",
+    "Host" : "Mazgas",
+    "Port" : "Prievadas",
+    "User DN" : "Naudotojas DN",
+    "Password" : "Slaptažodis",
+    "For anonymous access, leave DN and Password empty." : "Anoniminiam prisijungimui, palikite DN ir Slaptažodis laukus tuščius.",
+    "One Base DN per line" : "Vienas bazinis DN eilutėje",
+    "Back" : "Atgal",
+    "Continue" : "Tęsti",
+    "Advanced" : "Išplėstiniai",
+    "Connection Settings" : "Ryšio nustatymai",
+    "Configuration Active" : "Konfigūracija aktyvi",
+    "When unchecked, this configuration will be skipped." : "Kai nepažymėta, ši konfigūracija bus praleista.",
+    "Backup (Replica) Host" : "Atsarginės kopijos (Replica) mazgas",
+    "Backup (Replica) Port" : "Atsarginės kopijos (Replica) prievadas",
+    "Disable Main Server" : "Išjungti pagrindinį serverį",
+    "Only connect to the replica server." : "Tik prisijungti prie reprodukcinio (replica) serverio.",
+    "Turn off SSL certificate validation." : "Išjungti SSL sertifikato tikrinimą.",
+    "Directory Settings" : "Katalogo nustatymai",
+    "Base User Tree" : "Bazinis naudotojo medis",
+    "User Search Attributes" : "Naudotojo paieškos atributai",
+    "Base Group Tree" : "Bazinis grupės medis",
+    "Group Search Attributes" : "Grupės paieškos atributai",
+    "Group-Member association" : "Grupės-Nario sąsaja",
+    "Special Attributes" : "Specialūs atributai",
+    "Quota Field" : "Kvotos laukas",
+    "Quota Default" : "Numatyta kvota",
+    "in bytes" : "baitais",
+    "Email Field" : "El. pašto laukas",
+    "User Home Folder Naming Rule" : "Naudotojo namų aplanko pavadinimo taisyklė",
+    "Internal Username" : "Vidinis naudotojo vardas",
+    "Internal Username Attribute:" : "Vidinis naudotojo vardo atributas:",
+    "Override UUID detection" : "Perrašyti UUID aptikimą",
+    "Username-LDAP User Mapping" : "Naudotojo vardo - LDAP naudotojo sąsaja",
+    "Clear Username-LDAP User Mapping" : "Išvalyti naudotojo vardo - LDAP naudotojo sąsają",
+    "Clear Groupname-LDAP Group Mapping" : "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają"
+},
+"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_ldap/l10n/lt_LT.json b/apps/user_ldap/l10n/lt_LT.json
new file mode 100644
index 00000000000..12ec0393900
--- /dev/null
+++ b/apps/user_ldap/l10n/lt_LT.json
@@ -0,0 +1,59 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Nepavyko išvalyti sąsajų.",
+    "Failed to delete the server configuration" : "Nepavyko pašalinti serverio konfigūracijos",
+    "The configuration is valid and the connection could be established!" : "Konfigūracija yra tinkama bei prisijungta sėkmingai!",
+    "Deletion failed" : "Ištrinti nepavyko",
+    "Keep settings?" : "Išlaikyti nustatymus?",
+    "Cannot add server configuration" : "Negalima pridėti serverio konfigūracijos",
+    "mappings cleared" : "susiejimai išvalyti",
+    "Success" : "Sėkmingai",
+    "Error" : "Klaida",
+    "Select groups" : "Pasirinkti grupes",
+    "Connection test succeeded" : "Ryšio patikrinimas pavyko",
+    "Connection test failed" : "Ryšio patikrinimas nepavyko",
+    "Do you really want to delete the current Server Configuration?" : "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
+    "Confirm Deletion" : "Patvirtinkite trynimą",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Group Filter" : "Grupės filtras",
+    "Save" : "Išsaugoti",
+    "Test Configuration" : "Bandyti konfigūraciją",
+    "Help" : "Pagalba",
+    "Add Server Configuration" : "Pridėti serverio konfigūraciją",
+    "Host" : "Mazgas",
+    "Port" : "Prievadas",
+    "User DN" : "Naudotojas DN",
+    "Password" : "Slaptažodis",
+    "For anonymous access, leave DN and Password empty." : "Anoniminiam prisijungimui, palikite DN ir Slaptažodis laukus tuščius.",
+    "One Base DN per line" : "Vienas bazinis DN eilutėje",
+    "Back" : "Atgal",
+    "Continue" : "Tęsti",
+    "Advanced" : "Išplėstiniai",
+    "Connection Settings" : "Ryšio nustatymai",
+    "Configuration Active" : "Konfigūracija aktyvi",
+    "When unchecked, this configuration will be skipped." : "Kai nepažymėta, ši konfigūracija bus praleista.",
+    "Backup (Replica) Host" : "Atsarginės kopijos (Replica) mazgas",
+    "Backup (Replica) Port" : "Atsarginės kopijos (Replica) prievadas",
+    "Disable Main Server" : "Išjungti pagrindinį serverį",
+    "Only connect to the replica server." : "Tik prisijungti prie reprodukcinio (replica) serverio.",
+    "Turn off SSL certificate validation." : "Išjungti SSL sertifikato tikrinimą.",
+    "Directory Settings" : "Katalogo nustatymai",
+    "Base User Tree" : "Bazinis naudotojo medis",
+    "User Search Attributes" : "Naudotojo paieškos atributai",
+    "Base Group Tree" : "Bazinis grupės medis",
+    "Group Search Attributes" : "Grupės paieškos atributai",
+    "Group-Member association" : "Grupės-Nario sąsaja",
+    "Special Attributes" : "Specialūs atributai",
+    "Quota Field" : "Kvotos laukas",
+    "Quota Default" : "Numatyta kvota",
+    "in bytes" : "baitais",
+    "Email Field" : "El. pašto laukas",
+    "User Home Folder Naming Rule" : "Naudotojo namų aplanko pavadinimo taisyklė",
+    "Internal Username" : "Vidinis naudotojo vardas",
+    "Internal Username Attribute:" : "Vidinis naudotojo vardo atributas:",
+    "Override UUID detection" : "Perrašyti UUID aptikimą",
+    "Username-LDAP User Mapping" : "Naudotojo vardo - LDAP naudotojo sąsaja",
+    "Clear Username-LDAP User Mapping" : "Išvalyti naudotojo vardo - LDAP naudotojo sąsają",
+    "Clear Groupname-LDAP Group Mapping" : "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają"
+},"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_ldap/l10n/lt_LT.php b/apps/user_ldap/l10n/lt_LT.php
deleted file mode 100644
index ec83d9119ee..00000000000
--- a/apps/user_ldap/l10n/lt_LT.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Nepavyko išvalyti sąsajų.",
-"Failed to delete the server configuration" => "Nepavyko pašalinti serverio konfigūracijos",
-"The configuration is valid and the connection could be established!" => "Konfigūracija yra tinkama bei prisijungta sėkmingai!",
-"Deletion failed" => "Ištrinti nepavyko",
-"Keep settings?" => "Išlaikyti nustatymus?",
-"Cannot add server configuration" => "Negalima pridėti serverio konfigūracijos",
-"mappings cleared" => "susiejimai išvalyti",
-"Success" => "Sėkmingai",
-"Error" => "Klaida",
-"Select groups" => "Pasirinkti grupes",
-"Connection test succeeded" => "Ryšio patikrinimas pavyko",
-"Connection test failed" => "Ryšio patikrinimas nepavyko",
-"Do you really want to delete the current Server Configuration?" => "Ar tikrai norite ištrinti dabartinę serverio konfigūraciją?",
-"Confirm Deletion" => "Patvirtinkite trynimą",
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
-"Group Filter" => "Grupės filtras",
-"Save" => "Išsaugoti",
-"Test Configuration" => "Bandyti konfigūraciją",
-"Help" => "Pagalba",
-"Add Server Configuration" => "Pridėti serverio konfigūraciją",
-"Host" => "Mazgas",
-"Port" => "Prievadas",
-"User DN" => "Naudotojas DN",
-"Password" => "Slaptažodis",
-"For anonymous access, leave DN and Password empty." => "Anoniminiam prisijungimui, palikite DN ir Slaptažodis laukus tuščius.",
-"One Base DN per line" => "Vienas bazinis DN eilutėje",
-"Back" => "Atgal",
-"Continue" => "Tęsti",
-"Advanced" => "Išplėstiniai",
-"Connection Settings" => "Ryšio nustatymai",
-"Configuration Active" => "Konfigūracija aktyvi",
-"When unchecked, this configuration will be skipped." => "Kai nepažymėta, ši konfigūracija bus praleista.",
-"Backup (Replica) Host" => "Atsarginės kopijos (Replica) mazgas",
-"Backup (Replica) Port" => "Atsarginės kopijos (Replica) prievadas",
-"Disable Main Server" => "Išjungti pagrindinį serverį",
-"Only connect to the replica server." => "Tik prisijungti prie reprodukcinio (replica) serverio.",
-"Turn off SSL certificate validation." => "Išjungti SSL sertifikato tikrinimą.",
-"Directory Settings" => "Katalogo nustatymai",
-"Base User Tree" => "Bazinis naudotojo medis",
-"User Search Attributes" => "Naudotojo paieškos atributai",
-"Base Group Tree" => "Bazinis grupės medis",
-"Group Search Attributes" => "Grupės paieškos atributai",
-"Group-Member association" => "Grupės-Nario sąsaja",
-"Special Attributes" => "Specialūs atributai",
-"Quota Field" => "Kvotos laukas",
-"Quota Default" => "Numatyta kvota",
-"in bytes" => "baitais",
-"Email Field" => "El. pašto laukas",
-"User Home Folder Naming Rule" => "Naudotojo namų aplanko pavadinimo taisyklė",
-"Internal Username" => "Vidinis naudotojo vardas",
-"Internal Username Attribute:" => "Vidinis naudotojo vardo atributas:",
-"Override UUID detection" => "Perrašyti UUID aptikimą",
-"Username-LDAP User Mapping" => "Naudotojo vardo - LDAP naudotojo sąsaja",
-"Clear Username-LDAP User Mapping" => "Išvalyti naudotojo vardo - LDAP naudotojo sąsają",
-"Clear Groupname-LDAP Group Mapping" => "Išvalyti grupės pavadinimo - LDAP naudotojo sąsają"
-);
-$PLURAL_FORMS = "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_ldap/l10n/lv.js b/apps/user_ldap/l10n/lv.js
new file mode 100644
index 00000000000..daa376d8e28
--- /dev/null
+++ b/apps/user_ldap/l10n/lv.js
@@ -0,0 +1,64 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to delete the server configuration" : "Neizdevās izdzēst servera konfigurāciju",
+    "The configuration is valid and the connection could be established!" : "Konfigurācija ir derīga un varēja izveidot savienojumu!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus.",
+    "Deletion failed" : "Neizdevās izdzēst",
+    "Take over settings from recent server configuration?" : "Paņemt iestatījumus no nesenas servera konfigurācijas?",
+    "Keep settings?" : "Paturēt iestatījumus?",
+    "Cannot add server configuration" : "Nevar pievienot servera konfigurāciju",
+    "Error" : "Kļūda",
+    "Select groups" : "Izvēlieties grupas",
+    "Connection test succeeded" : "Savienojuma tests ir veiksmīgs",
+    "Connection test failed" : "Savienojuma tests cieta neveiksmi",
+    "Do you really want to delete the current Server Configuration?" : "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
+    "Confirm Deletion" : "Apstiprināt dzēšanu",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Group Filter" : "Grupu filtrs",
+    "Save" : "Saglabāt",
+    "Test Configuration" : "Testa konfigurācija",
+    "Help" : "Palīdzība",
+    "Add Server Configuration" : "Pievienot servera konfigurāciju",
+    "Host" : "Resursdators",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://",
+    "Port" : "Ports",
+    "User DN" : "Lietotāja 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." : "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
+    "Password" : "Parole",
+    "For anonymous access, leave DN and Password empty." : "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
+    "One Base DN per line" : "Viena bāzes DN rindā",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”",
+    "Advanced" : "Paplašināti",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt.",
+    "Connection Settings" : "Savienojuma iestatījumi",
+    "Configuration Active" : "Konfigurācija ir aktīva",
+    "When unchecked, this configuration will be skipped." : "Ja nav atzīmēts, šī konfigurācija tiks izlaista.",
+    "Backup (Replica) Host" : "Rezerves (kopija) serveris",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai.",
+    "Backup (Replica) Port" : "Rezerves (kopijas) ports",
+    "Disable Main Server" : "Deaktivēt galveno serveri",
+    "Turn off SSL certificate validation." : "Izslēgt SSL sertifikātu validēšanu.",
+    "Cache Time-To-Live" : "Kešatmiņas dzīvlaiks",
+    "in seconds. A change empties the cache." : "sekundēs. Izmaiņas iztukšos kešatmiņu.",
+    "Directory Settings" : "Direktorijas iestatījumi",
+    "User Display Name Field" : "Lietotāja redzamā vārda lauks",
+    "Base User Tree" : "Bāzes lietotāju koks",
+    "One User Base DN per line" : "Viena lietotāju bāzes DN rindā",
+    "User Search Attributes" : "Lietotāju meklēšanas atribūts",
+    "Optional; one attribute per line" : "Neobligāti; viens atribūts rindā",
+    "Group Display Name Field" : "Grupas redzamā nosaukuma lauks",
+    "Base Group Tree" : "Bāzes grupu koks",
+    "One Group Base DN per line" : "Viena grupu bāzes DN rindā",
+    "Group Search Attributes" : "Grupu meklēšanas atribūts",
+    "Group-Member association" : "Grupu piederības asociācija",
+    "Special Attributes" : "Īpašie atribūti",
+    "Quota Field" : "Kvotu lauks",
+    "Quota Default" : "Kvotas noklusējums",
+    "in bytes" : "baitos",
+    "Email Field" : "E-pasta lauks",
+    "User Home Folder Naming Rule" : "Lietotāja mājas mapes nosaukšanas kārtula",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/apps/user_ldap/l10n/lv.json b/apps/user_ldap/l10n/lv.json
new file mode 100644
index 00000000000..496a5cbc281
--- /dev/null
+++ b/apps/user_ldap/l10n/lv.json
@@ -0,0 +1,62 @@
+{ "translations": {
+    "Failed to delete the server configuration" : "Neizdevās izdzēst servera konfigurāciju",
+    "The configuration is valid and the connection could be established!" : "Konfigurācija ir derīga un varēja izveidot savienojumu!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus.",
+    "Deletion failed" : "Neizdevās izdzēst",
+    "Take over settings from recent server configuration?" : "Paņemt iestatījumus no nesenas servera konfigurācijas?",
+    "Keep settings?" : "Paturēt iestatījumus?",
+    "Cannot add server configuration" : "Nevar pievienot servera konfigurāciju",
+    "Error" : "Kļūda",
+    "Select groups" : "Izvēlieties grupas",
+    "Connection test succeeded" : "Savienojuma tests ir veiksmīgs",
+    "Connection test failed" : "Savienojuma tests cieta neveiksmi",
+    "Do you really want to delete the current Server Configuration?" : "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
+    "Confirm Deletion" : "Apstiprināt dzēšanu",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Group Filter" : "Grupu filtrs",
+    "Save" : "Saglabāt",
+    "Test Configuration" : "Testa konfigurācija",
+    "Help" : "Palīdzība",
+    "Add Server Configuration" : "Pievienot servera konfigurāciju",
+    "Host" : "Resursdators",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://",
+    "Port" : "Ports",
+    "User DN" : "Lietotāja 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." : "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
+    "Password" : "Parole",
+    "For anonymous access, leave DN and Password empty." : "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
+    "One Base DN per line" : "Viena bāzes DN rindā",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”",
+    "Advanced" : "Paplašināti",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt.",
+    "Connection Settings" : "Savienojuma iestatījumi",
+    "Configuration Active" : "Konfigurācija ir aktīva",
+    "When unchecked, this configuration will be skipped." : "Ja nav atzīmēts, šī konfigurācija tiks izlaista.",
+    "Backup (Replica) Host" : "Rezerves (kopija) serveris",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai.",
+    "Backup (Replica) Port" : "Rezerves (kopijas) ports",
+    "Disable Main Server" : "Deaktivēt galveno serveri",
+    "Turn off SSL certificate validation." : "Izslēgt SSL sertifikātu validēšanu.",
+    "Cache Time-To-Live" : "Kešatmiņas dzīvlaiks",
+    "in seconds. A change empties the cache." : "sekundēs. Izmaiņas iztukšos kešatmiņu.",
+    "Directory Settings" : "Direktorijas iestatījumi",
+    "User Display Name Field" : "Lietotāja redzamā vārda lauks",
+    "Base User Tree" : "Bāzes lietotāju koks",
+    "One User Base DN per line" : "Viena lietotāju bāzes DN rindā",
+    "User Search Attributes" : "Lietotāju meklēšanas atribūts",
+    "Optional; one attribute per line" : "Neobligāti; viens atribūts rindā",
+    "Group Display Name Field" : "Grupas redzamā nosaukuma lauks",
+    "Base Group Tree" : "Bāzes grupu koks",
+    "One Group Base DN per line" : "Viena grupu bāzes DN rindā",
+    "Group Search Attributes" : "Grupu meklēšanas atribūts",
+    "Group-Member association" : "Grupu piederības asociācija",
+    "Special Attributes" : "Īpašie atribūti",
+    "Quota Field" : "Kvotu lauks",
+    "Quota Default" : "Kvotas noklusējums",
+    "in bytes" : "baitos",
+    "Email Field" : "E-pasta lauks",
+    "User Home Folder Naming Rule" : "Lietotāja mājas mapes nosaukšanas kārtula",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
+},"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_ldap/l10n/lv.php b/apps/user_ldap/l10n/lv.php
deleted file mode 100644
index d6df44812c1..00000000000
--- a/apps/user_ldap/l10n/lv.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to delete the server configuration" => "Neizdevās izdzēst servera konfigurāciju",
-"The configuration is valid and the connection could be established!" => "Konfigurācija ir derīga un varēja izveidot savienojumu!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurācija ir derīga, bet sasaiste neizdevās. Lūdzu, pārbaudiet servera iestatījumus un akreditācijas datus.",
-"Deletion failed" => "Neizdevās izdzēst",
-"Take over settings from recent server configuration?" => "Paņemt iestatījumus no nesenas servera konfigurācijas?",
-"Keep settings?" => "Paturēt iestatījumus?",
-"Cannot add server configuration" => "Nevar pievienot servera konfigurāciju",
-"Error" => "Kļūda",
-"Select groups" => "Izvēlieties grupas",
-"Connection test succeeded" => "Savienojuma tests ir veiksmīgs",
-"Connection test failed" => "Savienojuma tests cieta neveiksmi",
-"Do you really want to delete the current Server Configuration?" => "Vai tiešām vēlaties dzēst pašreizējo servera konfigurāciju?",
-"Confirm Deletion" => "Apstiprināt dzēšanu",
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
-"Group Filter" => "Grupu filtrs",
-"Save" => "Saglabāt",
-"Test Configuration" => "Testa konfigurācija",
-"Help" => "Palīdzība",
-"Add Server Configuration" => "Pievienot servera konfigurāciju",
-"Host" => "Resursdators",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Var neiekļaut protokolu, izņemot, ja vajag SSL. Tad sākums ir ldaps://",
-"Port" => "Ports",
-"User DN" => "Lietotāja 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." => "Klienta lietotāja DN, ar ko veiks sasaisti, piemēram, uid=agent,dc=example,dc=com. Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
-"Password" => "Parole",
-"For anonymous access, leave DN and Password empty." => "Lai piekļūtu anonīmi, atstājiet DN un paroli tukšu.",
-"One Base DN per line" => "Viena bāzes DN rindā",
-"You can specify Base DN for users and groups in the Advanced tab" => "Lietotājiem un grupām bāzes DN var norādīt cilnē “Paplašināti”",
-"Advanced" => "Paplašināti",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Brīdinājums:</b> PHP LDAP modulis nav uzinstalēts, aizmugure nedarbosies. Lūdzu, prasiet savam sistēmas administratoram kādu no tām deaktivēt.",
-"Connection Settings" => "Savienojuma iestatījumi",
-"Configuration Active" => "Konfigurācija ir aktīva",
-"When unchecked, this configuration will be skipped." => "Ja nav atzīmēts, šī konfigurācija tiks izlaista.",
-"Backup (Replica) Host" => "Rezerves (kopija) serveris",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Norādi rezerves serveri (nav obligāti). Tam ir jābūt galvenā LDAP/AD servera kopijai.",
-"Backup (Replica) Port" => "Rezerves (kopijas) ports",
-"Disable Main Server" => "Deaktivēt galveno serveri",
-"Turn off SSL certificate validation." => "Izslēgt SSL sertifikātu validēšanu.",
-"Cache Time-To-Live" => "Kešatmiņas dzīvlaiks",
-"in seconds. A change empties the cache." => "sekundēs. Izmaiņas iztukšos kešatmiņu.",
-"Directory Settings" => "Direktorijas iestatījumi",
-"User Display Name Field" => "Lietotāja redzamā vārda lauks",
-"Base User Tree" => "Bāzes lietotāju koks",
-"One User Base DN per line" => "Viena lietotāju bāzes DN rindā",
-"User Search Attributes" => "Lietotāju meklēšanas atribūts",
-"Optional; one attribute per line" => "Neobligāti; viens atribūts rindā",
-"Group Display Name Field" => "Grupas redzamā nosaukuma lauks",
-"Base Group Tree" => "Bāzes grupu koks",
-"One Group Base DN per line" => "Viena grupu bāzes DN rindā",
-"Group Search Attributes" => "Grupu meklēšanas atribūts",
-"Group-Member association" => "Grupu piederības asociācija",
-"Special Attributes" => "Īpašie atribūti",
-"Quota Field" => "Kvotu lauks",
-"Quota Default" => "Kvotas noklusējums",
-"in bytes" => "baitos",
-"Email Field" => "E-pasta lauks",
-"User Home Folder Naming Rule" => "Lietotāja mājas mapes nosaukšanas kārtula",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Atstāt tukšu lietotāja vārdam (noklusējuma). Citādi, norādi LDAP/AD atribūtu."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/user_ldap/l10n/mg.js b/apps/user_ldap/l10n/mg.js
new file mode 100644
index 00000000000..95c97db2f9c
--- /dev/null
+++ b/apps/user_ldap/l10n/mg.js
@@ -0,0 +1,7 @@
+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/mg.json b/apps/user_ldap/l10n/mg.json
new file mode 100644
index 00000000000..8e0cd6f6783
--- /dev/null
+++ b/apps/user_ldap/l10n/mg.json
@@ -0,0 +1,5 @@
+{ "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/mg.php b/apps/user_ldap/l10n/mg.php
deleted file mode 100644
index 2371ee70593..00000000000
--- a/apps/user_ldap/l10n/mg.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/mk.js b/apps/user_ldap/l10n/mk.js
new file mode 100644
index 00000000000..af4983739a4
--- /dev/null
+++ b/apps/user_ldap/l10n/mk.js
@@ -0,0 +1,23 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Бришењето е неуспешно",
+    "Keep settings?" : "Да ги сочувам нагодувањата?",
+    "Cannot add server configuration" : "Не можам да ја додадам конфигурацијата на серверот",
+    "Error" : "Грешка",
+    "Connection test succeeded" : "Тестот за поврзување е успешен",
+    "Connection test failed" : "Тестот за поврзување не е успешен",
+    "Confirm Deletion" : "Потврдете го бришењето",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Сними",
+    "Help" : "Помош",
+    "Host" : "Домаќин",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
+    "Port" : "Порта",
+    "Password" : "Лозинка",
+    "Back" : "Назад",
+    "Continue" : "Продолжи",
+    "Advanced" : "Напредно"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/apps/user_ldap/l10n/mk.json b/apps/user_ldap/l10n/mk.json
new file mode 100644
index 00000000000..b094724bb85
--- /dev/null
+++ b/apps/user_ldap/l10n/mk.json
@@ -0,0 +1,21 @@
+{ "translations": {
+    "Deletion failed" : "Бришењето е неуспешно",
+    "Keep settings?" : "Да ги сочувам нагодувањата?",
+    "Cannot add server configuration" : "Не можам да ја додадам конфигурацијата на серверот",
+    "Error" : "Грешка",
+    "Connection test succeeded" : "Тестот за поврзување е успешен",
+    "Connection test failed" : "Тестот за поврзување не е успешен",
+    "Confirm Deletion" : "Потврдете го бришењето",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Сними",
+    "Help" : "Помош",
+    "Host" : "Домаќин",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
+    "Port" : "Порта",
+    "Password" : "Лозинка",
+    "Back" : "Назад",
+    "Continue" : "Продолжи",
+    "Advanced" : "Напредно"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/mk.php b/apps/user_ldap/l10n/mk.php
deleted file mode 100644
index 4efb1986fb6..00000000000
--- a/apps/user_ldap/l10n/mk.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Бришењето е неуспешно",
-"Keep settings?" => "Да ги сочувам нагодувањата?",
-"Cannot add server configuration" => "Не можам да ја додадам конфигурацијата на серверот",
-"Error" => "Грешка",
-"Connection test succeeded" => "Тестот за поврзување е успешен",
-"Connection test failed" => "Тестот за поврзување не е успешен",
-"Confirm Deletion" => "Потврдете го бришењето",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Сними",
-"Help" => "Помош",
-"Host" => "Домаќин",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Може да го скокнете протколот освен ако не ви треба SSL. Тогаш ставете ldaps://",
-"Port" => "Порта",
-"Password" => "Лозинка",
-"Back" => "Назад",
-"Continue" => "Продолжи",
-"Advanced" => "Напредно"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/user_ldap/l10n/ml.js b/apps/user_ldap/l10n/ml.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/ml.js
@@ -0,0 +1,7 @@
+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/ml.json b/apps/user_ldap/l10n/ml.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/ml.json
@@ -0,0 +1,5 @@
+{ "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/ml.php b/apps/user_ldap/l10n/ml.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/ml.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ml_IN.js b/apps/user_ldap/l10n/ml_IN.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/ml_IN.js
@@ -0,0 +1,7 @@
+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/ml_IN.json b/apps/user_ldap/l10n/ml_IN.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/ml_IN.json
@@ -0,0 +1,5 @@
+{ "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/ml_IN.php b/apps/user_ldap/l10n/ml_IN.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/ml_IN.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/mn.js b/apps/user_ldap/l10n/mn.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/mn.js
@@ -0,0 +1,7 @@
+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/mn.json b/apps/user_ldap/l10n/mn.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/mn.json
@@ -0,0 +1,5 @@
+{ "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/mn.php b/apps/user_ldap/l10n/mn.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/mn.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ms_MY.js b/apps/user_ldap/l10n/ms_MY.js
new file mode 100644
index 00000000000..2ca383fd292
--- /dev/null
+++ b/apps/user_ldap/l10n/ms_MY.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Pemadaman gagal",
+    "Error" : "Ralat",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Save" : "Simpan",
+    "Help" : "Bantuan",
+    "Password" : "Kata laluan",
+    "Back" : "Kembali",
+    "Advanced" : "Maju"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/ms_MY.json b/apps/user_ldap/l10n/ms_MY.json
new file mode 100644
index 00000000000..d2371514389
--- /dev/null
+++ b/apps/user_ldap/l10n/ms_MY.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Deletion failed" : "Pemadaman gagal",
+    "Error" : "Ralat",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Save" : "Simpan",
+    "Help" : "Bantuan",
+    "Password" : "Kata laluan",
+    "Back" : "Kembali",
+    "Advanced" : "Maju"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ms_MY.php b/apps/user_ldap/l10n/ms_MY.php
deleted file mode 100644
index e90bf1b06b2..00000000000
--- a/apps/user_ldap/l10n/ms_MY.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Pemadaman gagal",
-"Error" => "Ralat",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Save" => "Simpan",
-"Help" => "Bantuan",
-"Password" => "Kata laluan",
-"Back" => "Kembali",
-"Advanced" => "Maju"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/mt_MT.js b/apps/user_ldap/l10n/mt_MT.js
new file mode 100644
index 00000000000..8b3fcfae910
--- /dev/null
+++ b/apps/user_ldap/l10n/mt_MT.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["","","",""],
+    "_%s user found_::_%s users found_" : ["","","",""]
+},
+"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);");
diff --git a/apps/user_ldap/l10n/mt_MT.json b/apps/user_ldap/l10n/mt_MT.json
new file mode 100644
index 00000000000..cbda8c83cca
--- /dev/null
+++ b/apps/user_ldap/l10n/mt_MT.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["","","",""],
+    "_%s user found_::_%s users found_" : ["","","",""]
+},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/mt_MT.php b/apps/user_ldap/l10n/mt_MT.php
deleted file mode 100644
index 581e6a65b41..00000000000
--- a/apps/user_ldap/l10n/mt_MT.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("","","",""),
-"_%s user found_::_%s users found_" => array("","","","")
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);";
diff --git a/apps/user_ldap/l10n/my_MM.js b/apps/user_ldap/l10n/my_MM.js
new file mode 100644
index 00000000000..2fed7c15559
--- /dev/null
+++ b/apps/user_ldap/l10n/my_MM.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Help" : "အကူအညီ",
+    "Password" : "စကားဝှက်",
+    "Advanced" : "အဆင့်မြင့်"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/my_MM.json b/apps/user_ldap/l10n/my_MM.json
new file mode 100644
index 00000000000..94d2bd471e3
--- /dev/null
+++ b/apps/user_ldap/l10n/my_MM.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Help" : "အကူအညီ",
+    "Password" : "စကားဝှက်",
+    "Advanced" : "အဆင့်မြင့်"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/my_MM.php b/apps/user_ldap/l10n/my_MM.php
deleted file mode 100644
index 81f80f8d651..00000000000
--- a/apps/user_ldap/l10n/my_MM.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Help" => "အကူအညီ",
-"Password" => "စကားဝှက်",
-"Advanced" => "အဆင့်မြင့်"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/nb_NO.js b/apps/user_ldap/l10n/nb_NO.js
new file mode 100644
index 00000000000..9074ee926d6
--- /dev/null
+++ b/apps/user_ldap/l10n/nb_NO.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Klarte ikke å nullstille tilknytningene.",
+    "Failed to delete the server configuration" : "Klarte ikke å slette tjener-konfigurasjonen.",
+    "The configuration is valid and the connection could be established!" : "Konfigurasjonen er i orden og tilkoblingen skal være etablert!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og påloggingsinformasjonen.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurasjonen er ikke gyldig. Sjekk loggene for flere detaljer.",
+    "No action specified" : "Ingen handling spesifisert",
+    "No configuration specified" : "Ingen konfigurasjon spesifisert",
+    "No data specified" : "Ingen data spesifisert",
+    " Could not set configuration %s" : "Klarte ikke å sette konfigurasjon %s",
+    "Deletion failed" : "Sletting mislyktes",
+    "Take over settings from recent server configuration?" : "Hent innstillinger fra tidligere tjener-konfigurasjon?",
+    "Keep settings?" : "Behold innstillinger?",
+    "{nthServer}. Server" : "{nthServer}. server",
+    "Cannot add server configuration" : "Kan ikke legge til tjener-konfigurasjon",
+    "mappings cleared" : "tilknytninger nullstilt",
+    "Success" : "Suksess",
+    "Error" : "Feil",
+    "Please specify a Base DN" : "Vennligst spesifiser en hoved-DN",
+    "Could not determine Base DN" : "Kunne ikke fastslå hoved-DN",
+    "Please specify the port" : "Vennligst spesifiser port",
+    "Configuration OK" : "Konfigurasjon OK",
+    "Configuration incorrect" : "Konfigurasjon feil",
+    "Configuration incomplete" : "Konfigurasjon ufullstendig",
+    "Select groups" : "Velg grupper",
+    "Select object classes" : "Velg objektklasser",
+    "Select attributes" : "Velg attributter",
+    "Connection test succeeded" : "Tilkoblingstest lyktes",
+    "Connection test failed" : "Tilkoblingstest mislyktes",
+    "Do you really want to delete the current Server Configuration?" : "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
+    "Confirm Deletion" : "Bekreft sletting",
+    "_%s group found_::_%s groups found_" : ["%s gruppe funnet","%s grupper funnet"],
+    "_%s user found_::_%s users found_" : ["%s bruker funnet","%s brukere funnet"],
+    "Could not find the desired feature" : "Fant ikke den ønskede funksjonaliteten",
+    "Invalid Host" : "Ugyldig tjener",
+    "Server" : "Server",
+    "User Filter" : "Brukerfilter",
+    "Login Filter" : "Innloggingsfilter",
+    "Group Filter" : "Gruppefilter",
+    "Save" : "Lagre",
+    "Test Configuration" : "Test konfigurasjonen",
+    "Help" : "Hjelp",
+    "Groups meeting these criteria are available in %s:" : "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:",
+    "only those object classes:" : "kun de objektklassene:",
+    "only from those groups:" : "kun fra de gruppene:",
+    "Edit raw filter instead" : "Rediger ubearbeidet filter i stedet",
+    "Raw LDAP filter" : "Ubearbeidet LDAP-filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
+    "groups found" : "grupper funnet",
+    "Users login with this attribute:" : "Brukere logger inn med denne attributten:",
+    "LDAP Username:" : "LDAP-brukernavn:",
+    "LDAP Email Address:" : "LDAP-epostadresse:",
+    "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 filteret som skal brukes når noen prøver å logge inn. %%uid erstatter brukernavnet i innloggingen. Eksempel: \"uid=%%uid\"",
+    "1. Server" : "1. server",
+    "%s. Server:" : "%s. server:",
+    "Add Server Configuration" : "Legg til tjener-konfigurasjon",
+    "Delete Configuration" : "Slett konfigurasjon",
+    "Host" : "Tjener",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
+    "Port" : "Port",
+    "User DN" : "Bruker 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." : "DN nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt.",
+    "Password" : "Passord",
+    "For anonymous access, leave DN and Password empty." : "For anonym tilgang, la DN- og passord-feltet stå tomt.",
+    "One Base DN per line" : "En hoved-DN pr. linje",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Du kan spesifisere hoved-DN for brukere og grupper under Avansert fanen",
+    "Limit %s access to users meeting these criteria:" : "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
+    "users found" : "brukere funnet",
+    "Back" : "Tilbake",
+    "Continue" : "Fortsett",
+    "Expert" : "Ekspert",
+    "Advanced" : "Avansert",
+    "<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>Advarsel:</b> Appene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere en av dem.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den.",
+    "Connection Settings" : "Innstillinger for tilkobling",
+    "Configuration Active" : "Konfigurasjon aktiv",
+    "When unchecked, this configuration will be skipped." : "Når ikke huket av så vil denne konfigurasjonen bli hoppet over.",
+    "Backup (Replica) Host" : "Sikkerhetskopierings (Replica) vert",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Oppgi en valgfri reservetjener. Den må være en replika av hovedtjeneren for LDAP/AD.",
+    "Backup (Replica) Port" : "Reserve (Replika) Port",
+    "Disable Main Server" : "Deaktiver hovedtjeneren",
+    "Only connect to the replica server." : "Koble til bare replika-tjeneren.",
+    "Case insensitive LDAP server (Windows)" : "LDAP-server som ikke skiller mellom store og små bokstaver (Windows)",
+    "Turn off SSL certificate validation." : "Slå av SSL-sertifikat validering",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.",
+    "Cache Time-To-Live" : "Levetid i mellomlager",
+    "in seconds. A change empties the cache." : "i sekunder. En endring tømmer bufferen.",
+    "Directory Settings" : "Innstillinger for Katalog",
+    "User Display Name Field" : "Vis brukerens navnfelt",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP-attributten som skal brukes til å generere brukerens visningsnavn.",
+    "Base User Tree" : "Hovedbruker tre",
+    "One User Base DN per line" : "En Bruker hoved-DN pr. linje",
+    "User Search Attributes" : "Attributter for brukersøk",
+    "Optional; one attribute per line" : "Valgfritt, en attributt pr. linje",
+    "Group Display Name Field" : "Vis gruppens navnfelt",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP-attributten som skal brukes til å generere gruppens visningsnavn.",
+    "Base Group Tree" : "Hovedgruppe tre",
+    "One Group Base DN per line" : "En gruppe hoved-DN pr. linje",
+    "Group Search Attributes" : "Attributter for gruppesøk",
+    "Group-Member association" : "gruppe-medlem assosiasjon",
+    "Nested Groups" : "Nestede grupper",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Grupper som inneholder grupper er tillatt når denne er slått på. (Virker bare hvis gruppenes member-attributt inneholder DN-er.)",
+    "Paging chunksize" : "Sidestørrelse",
+    "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.)" : "Sidestørrelsen brukes for sidevise (paged) LDAP-søk som kan returnere store resultater, som f.eks. gjennomløping av brukere eller grupper. (Sett til 0 for å deaktivere sidevis LDAP-spørring i disse situasjonene.)",
+    "Special Attributes" : "Spesielle attributter",
+    "Quota Field" : "Felt med lagringskvote",
+    "Quota Default" : "Standard lagringskvote",
+    "in bytes" : "i bytes",
+    "Email Field" : "Felt med e-postadresse",
+    "User Home Folder Naming Rule" : "Navneregel for brukers hjemmemappe",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt.",
+    "Internal Username" : "Internt brukernavn",
+    "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." : "Som standard vil det interne brukernavnet bli laget utifra UUID-attributten. Dette sikrer at brukernavnet er unikt og at det ikke er nødvendig å konvertere tegn. Det interne brukernavnet har den begrensningen at bare disse tegnene er tillatt: [ a-zA-Z0-9_.@- ]. Andre tegn erstattes av tilsvarende ASCII-tegn eller blir ganske enkelt utelatt. Ved kollisjon blir et nummer lagt til / øket. Det interne brukernavnet brukes til å identifisere en bruker internt. Det er også standardnavnet på brukerens hjemmemappe. Det er også med i fjern-URL-er, for eksempel for alle *DAV-tjenester. Med denne innstillingen kan standard oppførsel overstyres. For å få en oppførsel som likner oppførselen før ownCloud 5, legg inn attributten for brukerens visningsnavn i dette feltet. La feltet stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere.",
+    "Internal Username Attribute:" : "Attributt for internt brukernavn:",
+    "Override UUID detection" : "Overstyr UUID-oppdaging",
+    "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." : "Som standard blir UUID-attributten oppdaget automatisk. UUID-attributten brukes til å identifisere LDAP-brukere og -grupper uten tvil. Det interne brukernavnet vil også bli laget basert på UUID, hvis ikke annet er spesifisert ovenfor. Du kan overstyre innstillingen og oppgi den attributten du ønsker. Du må forsikre det om at din valgte attributt kan hentes ut både for brukere og for grupper og at den er unik. La stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere og -grupper.",
+    "UUID Attribute for Users:" : "UUID-attributt for brukere:",
+    "UUID Attribute for Groups:" : "UUID-attributt for grupper:",
+    "Username-LDAP User Mapping" : "Tilknytning av brukernavn til LDAP-bruker",
+    "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." : "Brukernavn brukes til å lagre og tilordne (meta)data. For at brukere skal identifiseres og gjenkjennes presist, vil hver LDAP-bruker ha et internt brukernavn. Dette krever en tilknytning fra brukernavn til LDAP-bruker. Brukernavn som opprettes blir knyttet til LDAP-brukerens UUID. I tillegg mellomlagres DN for å redusere LDAP-kommunikasjon, men det brukes ikke til identifisering. Hvis DN endres vil endringene bli oppdaget. Det interne brukernavnet brukes alle steder. Nullstilling av tilknytningene vil etterlate seg rester overalt. Nullstilling av tilknytningene skjer ikke pr. konfigurasjon, det påvirker alle LDAP-konfigurasjoner! Nullstill aldri tilknytningene i et produksjonsmiljø, kun ved testing eller eksperimentering.",
+    "Clear Username-LDAP User Mapping" : "Nullstill tilknytning av brukernavn til LDAP-bruker",
+    "Clear Groupname-LDAP Group Mapping" : "Nullstill tilknytning av gruppenavn til LDAP-gruppe"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/nb_NO.json b/apps/user_ldap/l10n/nb_NO.json
new file mode 100644
index 00000000000..d89d8377dab
--- /dev/null
+++ b/apps/user_ldap/l10n/nb_NO.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Klarte ikke å nullstille tilknytningene.",
+    "Failed to delete the server configuration" : "Klarte ikke å slette tjener-konfigurasjonen.",
+    "The configuration is valid and the connection could be established!" : "Konfigurasjonen er i orden og tilkoblingen skal være etablert!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og påloggingsinformasjonen.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurasjonen er ikke gyldig. Sjekk loggene for flere detaljer.",
+    "No action specified" : "Ingen handling spesifisert",
+    "No configuration specified" : "Ingen konfigurasjon spesifisert",
+    "No data specified" : "Ingen data spesifisert",
+    " Could not set configuration %s" : "Klarte ikke å sette konfigurasjon %s",
+    "Deletion failed" : "Sletting mislyktes",
+    "Take over settings from recent server configuration?" : "Hent innstillinger fra tidligere tjener-konfigurasjon?",
+    "Keep settings?" : "Behold innstillinger?",
+    "{nthServer}. Server" : "{nthServer}. server",
+    "Cannot add server configuration" : "Kan ikke legge til tjener-konfigurasjon",
+    "mappings cleared" : "tilknytninger nullstilt",
+    "Success" : "Suksess",
+    "Error" : "Feil",
+    "Please specify a Base DN" : "Vennligst spesifiser en hoved-DN",
+    "Could not determine Base DN" : "Kunne ikke fastslå hoved-DN",
+    "Please specify the port" : "Vennligst spesifiser port",
+    "Configuration OK" : "Konfigurasjon OK",
+    "Configuration incorrect" : "Konfigurasjon feil",
+    "Configuration incomplete" : "Konfigurasjon ufullstendig",
+    "Select groups" : "Velg grupper",
+    "Select object classes" : "Velg objektklasser",
+    "Select attributes" : "Velg attributter",
+    "Connection test succeeded" : "Tilkoblingstest lyktes",
+    "Connection test failed" : "Tilkoblingstest mislyktes",
+    "Do you really want to delete the current Server Configuration?" : "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
+    "Confirm Deletion" : "Bekreft sletting",
+    "_%s group found_::_%s groups found_" : ["%s gruppe funnet","%s grupper funnet"],
+    "_%s user found_::_%s users found_" : ["%s bruker funnet","%s brukere funnet"],
+    "Could not find the desired feature" : "Fant ikke den ønskede funksjonaliteten",
+    "Invalid Host" : "Ugyldig tjener",
+    "Server" : "Server",
+    "User Filter" : "Brukerfilter",
+    "Login Filter" : "Innloggingsfilter",
+    "Group Filter" : "Gruppefilter",
+    "Save" : "Lagre",
+    "Test Configuration" : "Test konfigurasjonen",
+    "Help" : "Hjelp",
+    "Groups meeting these criteria are available in %s:" : "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:",
+    "only those object classes:" : "kun de objektklassene:",
+    "only from those groups:" : "kun fra de gruppene:",
+    "Edit raw filter instead" : "Rediger ubearbeidet filter i stedet",
+    "Raw LDAP filter" : "Ubearbeidet LDAP-filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
+    "groups found" : "grupper funnet",
+    "Users login with this attribute:" : "Brukere logger inn med denne attributten:",
+    "LDAP Username:" : "LDAP-brukernavn:",
+    "LDAP Email Address:" : "LDAP-epostadresse:",
+    "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 filteret som skal brukes når noen prøver å logge inn. %%uid erstatter brukernavnet i innloggingen. Eksempel: \"uid=%%uid\"",
+    "1. Server" : "1. server",
+    "%s. Server:" : "%s. server:",
+    "Add Server Configuration" : "Legg til tjener-konfigurasjon",
+    "Delete Configuration" : "Slett konfigurasjon",
+    "Host" : "Tjener",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
+    "Port" : "Port",
+    "User DN" : "Bruker 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." : "DN nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt.",
+    "Password" : "Passord",
+    "For anonymous access, leave DN and Password empty." : "For anonym tilgang, la DN- og passord-feltet stå tomt.",
+    "One Base DN per line" : "En hoved-DN pr. linje",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Du kan spesifisere hoved-DN for brukere og grupper under Avansert fanen",
+    "Limit %s access to users meeting these criteria:" : "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
+    "users found" : "brukere funnet",
+    "Back" : "Tilbake",
+    "Continue" : "Fortsett",
+    "Expert" : "Ekspert",
+    "Advanced" : "Avansert",
+    "<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>Advarsel:</b> Appene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere en av dem.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den.",
+    "Connection Settings" : "Innstillinger for tilkobling",
+    "Configuration Active" : "Konfigurasjon aktiv",
+    "When unchecked, this configuration will be skipped." : "Når ikke huket av så vil denne konfigurasjonen bli hoppet over.",
+    "Backup (Replica) Host" : "Sikkerhetskopierings (Replica) vert",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Oppgi en valgfri reservetjener. Den må være en replika av hovedtjeneren for LDAP/AD.",
+    "Backup (Replica) Port" : "Reserve (Replika) Port",
+    "Disable Main Server" : "Deaktiver hovedtjeneren",
+    "Only connect to the replica server." : "Koble til bare replika-tjeneren.",
+    "Case insensitive LDAP server (Windows)" : "LDAP-server som ikke skiller mellom store og små bokstaver (Windows)",
+    "Turn off SSL certificate validation." : "Slå av SSL-sertifikat validering",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.",
+    "Cache Time-To-Live" : "Levetid i mellomlager",
+    "in seconds. A change empties the cache." : "i sekunder. En endring tømmer bufferen.",
+    "Directory Settings" : "Innstillinger for Katalog",
+    "User Display Name Field" : "Vis brukerens navnfelt",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP-attributten som skal brukes til å generere brukerens visningsnavn.",
+    "Base User Tree" : "Hovedbruker tre",
+    "One User Base DN per line" : "En Bruker hoved-DN pr. linje",
+    "User Search Attributes" : "Attributter for brukersøk",
+    "Optional; one attribute per line" : "Valgfritt, en attributt pr. linje",
+    "Group Display Name Field" : "Vis gruppens navnfelt",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP-attributten som skal brukes til å generere gruppens visningsnavn.",
+    "Base Group Tree" : "Hovedgruppe tre",
+    "One Group Base DN per line" : "En gruppe hoved-DN pr. linje",
+    "Group Search Attributes" : "Attributter for gruppesøk",
+    "Group-Member association" : "gruppe-medlem assosiasjon",
+    "Nested Groups" : "Nestede grupper",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Grupper som inneholder grupper er tillatt når denne er slått på. (Virker bare hvis gruppenes member-attributt inneholder DN-er.)",
+    "Paging chunksize" : "Sidestørrelse",
+    "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.)" : "Sidestørrelsen brukes for sidevise (paged) LDAP-søk som kan returnere store resultater, som f.eks. gjennomløping av brukere eller grupper. (Sett til 0 for å deaktivere sidevis LDAP-spørring i disse situasjonene.)",
+    "Special Attributes" : "Spesielle attributter",
+    "Quota Field" : "Felt med lagringskvote",
+    "Quota Default" : "Standard lagringskvote",
+    "in bytes" : "i bytes",
+    "Email Field" : "Felt med e-postadresse",
+    "User Home Folder Naming Rule" : "Navneregel for brukers hjemmemappe",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt.",
+    "Internal Username" : "Internt brukernavn",
+    "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." : "Som standard vil det interne brukernavnet bli laget utifra UUID-attributten. Dette sikrer at brukernavnet er unikt og at det ikke er nødvendig å konvertere tegn. Det interne brukernavnet har den begrensningen at bare disse tegnene er tillatt: [ a-zA-Z0-9_.@- ]. Andre tegn erstattes av tilsvarende ASCII-tegn eller blir ganske enkelt utelatt. Ved kollisjon blir et nummer lagt til / øket. Det interne brukernavnet brukes til å identifisere en bruker internt. Det er også standardnavnet på brukerens hjemmemappe. Det er også med i fjern-URL-er, for eksempel for alle *DAV-tjenester. Med denne innstillingen kan standard oppførsel overstyres. For å få en oppførsel som likner oppførselen før ownCloud 5, legg inn attributten for brukerens visningsnavn i dette feltet. La feltet stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere.",
+    "Internal Username Attribute:" : "Attributt for internt brukernavn:",
+    "Override UUID detection" : "Overstyr UUID-oppdaging",
+    "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." : "Som standard blir UUID-attributten oppdaget automatisk. UUID-attributten brukes til å identifisere LDAP-brukere og -grupper uten tvil. Det interne brukernavnet vil også bli laget basert på UUID, hvis ikke annet er spesifisert ovenfor. Du kan overstyre innstillingen og oppgi den attributten du ønsker. Du må forsikre det om at din valgte attributt kan hentes ut både for brukere og for grupper og at den er unik. La stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere og -grupper.",
+    "UUID Attribute for Users:" : "UUID-attributt for brukere:",
+    "UUID Attribute for Groups:" : "UUID-attributt for grupper:",
+    "Username-LDAP User Mapping" : "Tilknytning av brukernavn til LDAP-bruker",
+    "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." : "Brukernavn brukes til å lagre og tilordne (meta)data. For at brukere skal identifiseres og gjenkjennes presist, vil hver LDAP-bruker ha et internt brukernavn. Dette krever en tilknytning fra brukernavn til LDAP-bruker. Brukernavn som opprettes blir knyttet til LDAP-brukerens UUID. I tillegg mellomlagres DN for å redusere LDAP-kommunikasjon, men det brukes ikke til identifisering. Hvis DN endres vil endringene bli oppdaget. Det interne brukernavnet brukes alle steder. Nullstilling av tilknytningene vil etterlate seg rester overalt. Nullstilling av tilknytningene skjer ikke pr. konfigurasjon, det påvirker alle LDAP-konfigurasjoner! Nullstill aldri tilknytningene i et produksjonsmiljø, kun ved testing eller eksperimentering.",
+    "Clear Username-LDAP User Mapping" : "Nullstill tilknytning av brukernavn til LDAP-bruker",
+    "Clear Groupname-LDAP Group Mapping" : "Nullstill tilknytning av gruppenavn til LDAP-gruppe"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
deleted file mode 100644
index a4aa1f699cc..00000000000
--- a/apps/user_ldap/l10n/nb_NO.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Klarte ikke å nullstille tilknytningene.",
-"Failed to delete the server configuration" => "Klarte ikke å slette tjener-konfigurasjonen.",
-"The configuration is valid and the connection could be established!" => "Konfigurasjonen er i orden og tilkoblingen skal være etablert!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurasjonen er i orden, men Bind mislyktes. Vennligst sjekk tjener-konfigurasjonen og påloggingsinformasjonen.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Konfigurasjonen er ikke gyldig. Sjekk loggene for flere detaljer.",
-"No action specified" => "Ingen handling spesifisert",
-"No configuration specified" => "Ingen konfigurasjon spesifisert",
-"No data specified" => "Ingen data spesifisert",
-" Could not set configuration %s" => "Klarte ikke å sette konfigurasjon %s",
-"Deletion failed" => "Sletting mislyktes",
-"Take over settings from recent server configuration?" => "Hent innstillinger fra tidligere tjener-konfigurasjon?",
-"Keep settings?" => "Behold innstillinger?",
-"{nthServer}. Server" => "{nthServer}. server",
-"Cannot add server configuration" => "Kan ikke legge til tjener-konfigurasjon",
-"mappings cleared" => "tilknytninger nullstilt",
-"Success" => "Suksess",
-"Error" => "Feil",
-"Please specify a Base DN" => "Vennligst spesifiser en hoved-DN",
-"Could not determine Base DN" => "Kunne ikke fastslå hoved-DN",
-"Please specify the port" => "Vennligst spesifiser port",
-"Configuration OK" => "Konfigurasjon OK",
-"Configuration incorrect" => "Konfigurasjon feil",
-"Configuration incomplete" => "Konfigurasjon ufullstendig",
-"Select groups" => "Velg grupper",
-"Select object classes" => "Velg objektklasser",
-"Select attributes" => "Velg attributter",
-"Connection test succeeded" => "Tilkoblingstest lyktes",
-"Connection test failed" => "Tilkoblingstest mislyktes",
-"Do you really want to delete the current Server Configuration?" => "Er du sikker på at du vil slette aktiv tjener-konfigurasjon?",
-"Confirm Deletion" => "Bekreft sletting",
-"_%s group found_::_%s groups found_" => array("%s gruppe funnet","%s grupper funnet"),
-"_%s user found_::_%s users found_" => array("%s bruker funnet","%s brukere funnet"),
-"Could not find the desired feature" => "Fant ikke den ønskede funksjonaliteten",
-"Invalid Host" => "Ugyldig tjener",
-"Server" => "Server",
-"User Filter" => "Brukerfilter",
-"Login Filter" => "Innloggingsfilter",
-"Group Filter" => "Gruppefilter",
-"Save" => "Lagre",
-"Test Configuration" => "Test konfigurasjonen",
-"Help" => "Hjelp",
-"Groups meeting these criteria are available in %s:" => "Grupper som tilfredsstiller disse kriteriene er tilgjengelige i %s:",
-"only those object classes:" => "kun de objektklassene:",
-"only from those groups:" => "kun fra de gruppene:",
-"Edit raw filter instead" => "Rediger ubearbeidet filter i stedet",
-"Raw LDAP filter" => "Ubearbeidet LDAP-filter",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Filteret spesifiserer hvilke LDAP-grupper som skal ha tilgang til %s-instansen.",
-"groups found" => "grupper funnet",
-"Users login with this attribute:" => "Brukere logger inn med denne attributten:",
-"LDAP Username:" => "LDAP-brukernavn:",
-"LDAP Email Address:" => "LDAP-epostadresse:",
-"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 filteret som skal brukes når noen prøver å logge inn. %%uid erstatter brukernavnet i innloggingen. Eksempel: \"uid=%%uid\"",
-"1. Server" => "1. server",
-"%s. Server:" => "%s. server:",
-"Add Server Configuration" => "Legg til tjener-konfigurasjon",
-"Delete Configuration" => "Slett konfigurasjon",
-"Host" => "Tjener",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du kan utelate protokollen, men du er påkrevd å bruke SSL.  Deretter starte med ldaps://",
-"Port" => "Port",
-"User DN" => "Bruker 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." => "DN nummeret til klienten som skal bindes til, f.eks. uid=agent,dc=example,dc=com. For anonym tilgang, la DN- og passord-feltet stå tomt.",
-"Password" => "Passord",
-"For anonymous access, leave DN and Password empty." => "For anonym tilgang, la DN- og passord-feltet stå tomt.",
-"One Base DN per line" => "En hoved-DN pr. linje",
-"You can specify Base DN for users and groups in the Advanced tab" => "Du kan spesifisere hoved-DN for brukere og grupper under Avansert fanen",
-"Limit %s access to users meeting these criteria:" => "Begrens %s-tilgang til brukere som tilfredsstiller disse kriteriene:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Filteret spesifiserer hvilke LDAP-brukere som skal ha tilgang til %s-instansen.",
-"users found" => "brukere funnet",
-"Back" => "Tilbake",
-"Continue" => "Fortsett",
-"Expert" => "Ekspert",
-"Advanced" => "Avansert",
-"<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>Advarsel:</b> Appene user_ldap og user_webdavauth er ikke kompatible med hverandre. Uventet oppførsel kan forekomme. Be systemadministratoren om å deaktivere en av dem.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Warning:</b> PHP LDAP modulen er ikke installert, hjelperen vil ikke virke. Vennligst be din system-administrator om å installere den.",
-"Connection Settings" => "Innstillinger for tilkobling",
-"Configuration Active" => "Konfigurasjon aktiv",
-"When unchecked, this configuration will be skipped." => "Når ikke huket av så vil denne konfigurasjonen bli hoppet over.",
-"Backup (Replica) Host" => "Sikkerhetskopierings (Replica) vert",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Oppgi en valgfri reservetjener. Den må være en replika av hovedtjeneren for LDAP/AD.",
-"Backup (Replica) Port" => "Reserve (Replika) Port",
-"Disable Main Server" => "Deaktiver hovedtjeneren",
-"Only connect to the replica server." => "Koble til bare replika-tjeneren.",
-"Case insensitive LDAP server (Windows)" => "LDAP-server som ikke skiller mellom store og små bokstaver (Windows)",
-"Turn off SSL certificate validation." => "Slå av SSL-sertifikat validering",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Ikke anbefalt, bruk kun for testing! Hvis tilkobling bare virker med dette valget, importer LDAP-tjenerens SSL-sertifikat i %s-serveren din.",
-"Cache Time-To-Live" => "Levetid i mellomlager",
-"in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.",
-"Directory Settings" => "Innstillinger for Katalog",
-"User Display Name Field" => "Vis brukerens navnfelt",
-"The LDAP attribute to use to generate the user's display name." => "LDAP-attributten som skal brukes til å generere brukerens visningsnavn.",
-"Base User Tree" => "Hovedbruker tre",
-"One User Base DN per line" => "En Bruker hoved-DN pr. linje",
-"User Search Attributes" => "Attributter for brukersøk",
-"Optional; one attribute per line" => "Valgfritt, en attributt pr. linje",
-"Group Display Name Field" => "Vis gruppens navnfelt",
-"The LDAP attribute to use to generate the groups's display name." => "LDAP-attributten som skal brukes til å generere gruppens visningsnavn.",
-"Base Group Tree" => "Hovedgruppe tre",
-"One Group Base DN per line" => "En gruppe hoved-DN pr. linje",
-"Group Search Attributes" => "Attributter for gruppesøk",
-"Group-Member association" => "gruppe-medlem assosiasjon",
-"Nested Groups" => "Nestede grupper",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Grupper som inneholder grupper er tillatt når denne er slått på. (Virker bare hvis gruppenes member-attributt inneholder DN-er.)",
-"Paging chunksize" => "Sidestørrelse",
-"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.)" => "Sidestørrelsen brukes for sidevise (paged) LDAP-søk som kan returnere store resultater, som f.eks. gjennomløping av brukere eller grupper. (Sett til 0 for å deaktivere sidevis LDAP-spørring i disse situasjonene.)",
-"Special Attributes" => "Spesielle attributter",
-"Quota Field" => "Felt med lagringskvote",
-"Quota Default" => "Standard lagringskvote",
-"in bytes" => "i bytes",
-"Email Field" => "Felt med e-postadresse",
-"User Home Folder Naming Rule" => "Navneregel for brukers hjemmemappe",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "La stå tom for brukernavn (standard). Ellers, spesifiser en LDAP/AD attributt.",
-"Internal Username" => "Internt brukernavn",
-"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." => "Som standard vil det interne brukernavnet bli laget utifra UUID-attributten. Dette sikrer at brukernavnet er unikt og at det ikke er nødvendig å konvertere tegn. Det interne brukernavnet har den begrensningen at bare disse tegnene er tillatt: [ a-zA-Z0-9_.@- ]. Andre tegn erstattes av tilsvarende ASCII-tegn eller blir ganske enkelt utelatt. Ved kollisjon blir et nummer lagt til / øket. Det interne brukernavnet brukes til å identifisere en bruker internt. Det er også standardnavnet på brukerens hjemmemappe. Det er også med i fjern-URL-er, for eksempel for alle *DAV-tjenester. Med denne innstillingen kan standard oppførsel overstyres. For å få en oppførsel som likner oppførselen før ownCloud 5, legg inn attributten for brukerens visningsnavn i dette feltet. La feltet stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere.",
-"Internal Username Attribute:" => "Attributt for internt brukernavn:",
-"Override UUID detection" => "Overstyr UUID-oppdaging",
-"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." => "Som standard blir UUID-attributten oppdaget automatisk. UUID-attributten brukes til å identifisere LDAP-brukere og -grupper uten tvil. Det interne brukernavnet vil også bli laget basert på UUID, hvis ikke annet er spesifisert ovenfor. Du kan overstyre innstillingen og oppgi den attributten du ønsker. Du må forsikre det om at din valgte attributt kan hentes ut både for brukere og for grupper og at den er unik. La stå tomt for standard oppførsel. Endringer vil kun påvirke nylig tilknyttede (opprettede) LDAP-brukere og -grupper.",
-"UUID Attribute for Users:" => "UUID-attributt for brukere:",
-"UUID Attribute for Groups:" => "UUID-attributt for grupper:",
-"Username-LDAP User Mapping" => "Tilknytning av brukernavn til LDAP-bruker",
-"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." => "Brukernavn brukes til å lagre og tilordne (meta)data. For at brukere skal identifiseres og gjenkjennes presist, vil hver LDAP-bruker ha et internt brukernavn. Dette krever en tilknytning fra brukernavn til LDAP-bruker. Brukernavn som opprettes blir knyttet til LDAP-brukerens UUID. I tillegg mellomlagres DN for å redusere LDAP-kommunikasjon, men det brukes ikke til identifisering. Hvis DN endres vil endringene bli oppdaget. Det interne brukernavnet brukes alle steder. Nullstilling av tilknytningene vil etterlate seg rester overalt. Nullstilling av tilknytningene skjer ikke pr. konfigurasjon, det påvirker alle LDAP-konfigurasjoner! Nullstill aldri tilknytningene i et produksjonsmiljø, kun ved testing eller eksperimentering.",
-"Clear Username-LDAP User Mapping" => "Nullstill tilknytning av brukernavn til LDAP-bruker",
-"Clear Groupname-LDAP Group Mapping" => "Nullstill tilknytning av gruppenavn til LDAP-gruppe"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nds.js b/apps/user_ldap/l10n/nds.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/nds.js
@@ -0,0 +1,7 @@
+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/nds.json b/apps/user_ldap/l10n/nds.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/nds.json
@@ -0,0 +1,5 @@
+{ "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/nds.php b/apps/user_ldap/l10n/nds.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/nds.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ne.js b/apps/user_ldap/l10n/ne.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/ne.js
@@ -0,0 +1,7 @@
+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/ne.json b/apps/user_ldap/l10n/ne.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/ne.json
@@ -0,0 +1,5 @@
+{ "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/ne.php b/apps/user_ldap/l10n/ne.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/ne.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
new file mode 100644
index 00000000000..c74584f7512
--- /dev/null
+++ b/apps/user_ldap/l10n/nl.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Niet gelukt de vertalingen leeg te maken.",
+    "Failed to delete the server configuration" : "Verwijderen serverconfiguratie mislukt",
+    "The configuration is valid and the connection could be established!" : "De configuratie is geldig en de verbinding is geslaagd!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "De configuratie is ongeldig. Bekijk de logbestanden voor meer details.",
+    "No action specified" : "Geen actie opgegeven",
+    "No configuration specified" : "Geen configuratie opgegeven",
+    "No data specified" : "Geen gegevens verstrekt",
+    " Could not set configuration %s" : "Kon configuratie %s niet instellen",
+    "Deletion failed" : "Verwijderen mislukt",
+    "Take over settings from recent server configuration?" : "Overnemen instellingen van de recente serverconfiguratie?",
+    "Keep settings?" : "Instellingen bewaren?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Kon de serverconfiguratie niet toevoegen",
+    "mappings cleared" : "vertaaltabel leeggemaakt",
+    "Success" : "Succes",
+    "Error" : "Fout",
+    "Please specify a Base DN" : "Geef een Base DN op",
+    "Could not determine Base DN" : "Kon de Base DN niet vaststellen",
+    "Please specify the port" : "Geef de poort op",
+    "Configuration OK" : "Configuratie OK",
+    "Configuration incorrect" : "Configuratie onjuist",
+    "Configuration incomplete" : "Configuratie incompleet",
+    "Select groups" : "Selecteer groepen",
+    "Select object classes" : "Selecteer objectklasse",
+    "Select attributes" : "Selecteer attributen",
+    "Connection test succeeded" : "Verbindingstest geslaagd",
+    "Connection test failed" : "Verbindingstest mislukt",
+    "Do you really want to delete the current Server Configuration?" : "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
+    "Confirm Deletion" : "Bevestig verwijderen",
+    "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"],
+    "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"],
+    "Could not find the desired feature" : "Kon de gewenste functie niet vinden",
+    "Invalid Host" : "Ongeldige server",
+    "Server" : "Server",
+    "User Filter" : "Gebruikersfilter",
+    "Login Filter" : "Inlogfilter",
+    "Group Filter" : "Groep Filter",
+    "Save" : "Bewaren",
+    "Test Configuration" : "Test configuratie",
+    "Help" : "Help",
+    "Groups meeting these criteria are available in %s:" : "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:",
+    "only those object classes:" : "alleen deze objectklassen",
+    "only from those groups:" : "alleen van deze groepen:",
+    "Edit raw filter instead" : "Bewerk raw filter",
+    "Raw LDAP filter" : "Raw 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.",
+    "Test Filter" : "Testfilter",
+    "groups found" : "groepen gevonden",
+    "Users login with this attribute:" : "Gebruikers loggen in met dit attribuut:",
+    "LDAP Username:" : "LDAP Username:",
+    "LDAP Email Address:" : "LDAP e-mailadres:",
+    "Other Attributes:" : "Overige attributen:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Toevoegen serverconfiguratie",
+    "Delete Configuration" : "Verwijder configuratie",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
+    "Port" : "Poort",
+    "User DN" : "User 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." : "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg.",
+    "Password" : "Wachtwoord",
+    "For anonymous access, leave DN and Password empty." : "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
+    "One Base DN per line" : "Een Base DN per regel",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Voorkom automatische LDAP opvragingen. Weliswaar beter voor grote installaties, maar vergt LDAP kennis.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)",
+    "Limit %s access to users meeting these criteria:" : "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
+    "users found" : "gebruikers gevonden",
+    "Saving" : "Opslaan",
+    "Back" : "Terug",
+    "Continue" : "Verder",
+    "Expert" : "Expert",
+    "Advanced" : "Geavanceerd",
+    "<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren.",
+    "Connection Settings" : "Verbindingsinstellingen",
+    "Configuration Active" : "Configuratie actief",
+    "When unchecked, this configuration will be skipped." : "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen.",
+    "Backup (Replica) Host" : "Backup (Replica) Host",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server.",
+    "Backup (Replica) Port" : "Backup (Replica) Poort",
+    "Disable Main Server" : "Deactiveren hoofdserver",
+    "Only connect to the replica server." : "Maak alleen een verbinding met de replica server.",
+    "Case insensitive LDAP server (Windows)" : "Niet-hoofdlettergevoelige LDAP server (Windows)",
+    "Turn off SSL certificate validation." : "Schakel SSL certificaat validatie uit.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Niet aanbevolen, gebruik alleen om te testen! Als de connectie alleen werkt met deze optie, importeer dan het SSL-certificaat van de LDAP-server naar uw %s server.",
+    "Cache Time-To-Live" : "Cache time-to-live",
+    "in seconds. A change empties the cache." : "in seconden. Een verandering maakt de cache leeg.",
+    "Directory Settings" : "Mapinstellingen",
+    "User Display Name Field" : "Gebruikers Schermnaam Veld",
+    "The LDAP attribute to use to generate the user's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker.",
+    "Base User Tree" : "Basis Gebruikers Structuur",
+    "One User Base DN per line" : "Een User Base DN per regel",
+    "User Search Attributes" : "Attributen voor gebruikerszoekopdrachten",
+    "Optional; one attribute per line" : "Optioneel; één attribuut per regel",
+    "Group Display Name Field" : "Groep Schermnaam Veld",
+    "The LDAP attribute to use to generate the groups's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen.",
+    "Base Group Tree" : "Basis Groupen Structuur",
+    "One Group Base DN per line" : "Een Group Base DN per regel",
+    "Group Search Attributes" : "Attributen voor groepszoekopdrachten",
+    "Group-Member association" : "Groepslid associatie",
+    "Nested Groups" : "Geneste groepen",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wanneer ingeschakeld worden groepen binnen groepen ondersteund. (Werkt alleen als het groepslid attribuut DNs bevat)",
+    "Paging chunksize" : "Paging chunkgrootte",
+    "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.)" : "De chunkgrootte die wordt gebruikt voor LDAP opvragingen die in grote aantallen resulteren, zoals gebruiker- of groepsverzamelingen. (Instellen op 0 deactiveert gepagede LDAP opvragingen in dergelijke situaties.)",
+    "Special Attributes" : "Speciale attributen",
+    "Quota Field" : "Quota veld",
+    "Quota Default" : "Quota standaard",
+    "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.",
+    "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:",
+    "Override UUID detection" : "Negeren UUID detectie",
+    "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." : "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
+    "UUID Attribute for Users:" : "UUID attribuut voor gebruikers:",
+    "UUID Attribute for Groups:" : "UUID attribuut voor groepen:",
+    "Username-LDAP User Mapping" : "Gebruikersnaam-LDAP gebruikers vertaling",
+    "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." : "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
+    "Clear Username-LDAP User Mapping" : "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
+    "Clear Groupname-LDAP Group Mapping" : "Leegmaken Groepsnaam-LDAP groep vertaling"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
new file mode 100644
index 00000000000..af6246ba39d
--- /dev/null
+++ b/apps/user_ldap/l10n/nl.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Niet gelukt de vertalingen leeg te maken.",
+    "Failed to delete the server configuration" : "Verwijderen serverconfiguratie mislukt",
+    "The configuration is valid and the connection could be established!" : "De configuratie is geldig en de verbinding is geslaagd!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "De configuratie is ongeldig. Bekijk de logbestanden voor meer details.",
+    "No action specified" : "Geen actie opgegeven",
+    "No configuration specified" : "Geen configuratie opgegeven",
+    "No data specified" : "Geen gegevens verstrekt",
+    " Could not set configuration %s" : "Kon configuratie %s niet instellen",
+    "Deletion failed" : "Verwijderen mislukt",
+    "Take over settings from recent server configuration?" : "Overnemen instellingen van de recente serverconfiguratie?",
+    "Keep settings?" : "Instellingen bewaren?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Kon de serverconfiguratie niet toevoegen",
+    "mappings cleared" : "vertaaltabel leeggemaakt",
+    "Success" : "Succes",
+    "Error" : "Fout",
+    "Please specify a Base DN" : "Geef een Base DN op",
+    "Could not determine Base DN" : "Kon de Base DN niet vaststellen",
+    "Please specify the port" : "Geef de poort op",
+    "Configuration OK" : "Configuratie OK",
+    "Configuration incorrect" : "Configuratie onjuist",
+    "Configuration incomplete" : "Configuratie incompleet",
+    "Select groups" : "Selecteer groepen",
+    "Select object classes" : "Selecteer objectklasse",
+    "Select attributes" : "Selecteer attributen",
+    "Connection test succeeded" : "Verbindingstest geslaagd",
+    "Connection test failed" : "Verbindingstest mislukt",
+    "Do you really want to delete the current Server Configuration?" : "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
+    "Confirm Deletion" : "Bevestig verwijderen",
+    "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"],
+    "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"],
+    "Could not find the desired feature" : "Kon de gewenste functie niet vinden",
+    "Invalid Host" : "Ongeldige server",
+    "Server" : "Server",
+    "User Filter" : "Gebruikersfilter",
+    "Login Filter" : "Inlogfilter",
+    "Group Filter" : "Groep Filter",
+    "Save" : "Bewaren",
+    "Test Configuration" : "Test configuratie",
+    "Help" : "Help",
+    "Groups meeting these criteria are available in %s:" : "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:",
+    "only those object classes:" : "alleen deze objectklassen",
+    "only from those groups:" : "alleen van deze groepen:",
+    "Edit raw filter instead" : "Bewerk raw filter",
+    "Raw LDAP filter" : "Raw 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.",
+    "Test Filter" : "Testfilter",
+    "groups found" : "groepen gevonden",
+    "Users login with this attribute:" : "Gebruikers loggen in met dit attribuut:",
+    "LDAP Username:" : "LDAP Username:",
+    "LDAP Email Address:" : "LDAP e-mailadres:",
+    "Other Attributes:" : "Overige attributen:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Toevoegen serverconfiguratie",
+    "Delete Configuration" : "Verwijder configuratie",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
+    "Port" : "Poort",
+    "User DN" : "User 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." : "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg.",
+    "Password" : "Wachtwoord",
+    "For anonymous access, leave DN and Password empty." : "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
+    "One Base DN per line" : "Een Base DN per regel",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Voorkom automatische LDAP opvragingen. Weliswaar beter voor grote installaties, maar vergt LDAP kennis.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)",
+    "Limit %s access to users meeting these criteria:" : "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
+    "users found" : "gebruikers gevonden",
+    "Saving" : "Opslaan",
+    "Back" : "Terug",
+    "Continue" : "Verder",
+    "Expert" : "Expert",
+    "Advanced" : "Geavanceerd",
+    "<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren.",
+    "Connection Settings" : "Verbindingsinstellingen",
+    "Configuration Active" : "Configuratie actief",
+    "When unchecked, this configuration will be skipped." : "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen.",
+    "Backup (Replica) Host" : "Backup (Replica) Host",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server.",
+    "Backup (Replica) Port" : "Backup (Replica) Poort",
+    "Disable Main Server" : "Deactiveren hoofdserver",
+    "Only connect to the replica server." : "Maak alleen een verbinding met de replica server.",
+    "Case insensitive LDAP server (Windows)" : "Niet-hoofdlettergevoelige LDAP server (Windows)",
+    "Turn off SSL certificate validation." : "Schakel SSL certificaat validatie uit.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Niet aanbevolen, gebruik alleen om te testen! Als de connectie alleen werkt met deze optie, importeer dan het SSL-certificaat van de LDAP-server naar uw %s server.",
+    "Cache Time-To-Live" : "Cache time-to-live",
+    "in seconds. A change empties the cache." : "in seconden. Een verandering maakt de cache leeg.",
+    "Directory Settings" : "Mapinstellingen",
+    "User Display Name Field" : "Gebruikers Schermnaam Veld",
+    "The LDAP attribute to use to generate the user's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker.",
+    "Base User Tree" : "Basis Gebruikers Structuur",
+    "One User Base DN per line" : "Een User Base DN per regel",
+    "User Search Attributes" : "Attributen voor gebruikerszoekopdrachten",
+    "Optional; one attribute per line" : "Optioneel; één attribuut per regel",
+    "Group Display Name Field" : "Groep Schermnaam Veld",
+    "The LDAP attribute to use to generate the groups's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen.",
+    "Base Group Tree" : "Basis Groupen Structuur",
+    "One Group Base DN per line" : "Een Group Base DN per regel",
+    "Group Search Attributes" : "Attributen voor groepszoekopdrachten",
+    "Group-Member association" : "Groepslid associatie",
+    "Nested Groups" : "Geneste groepen",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Wanneer ingeschakeld worden groepen binnen groepen ondersteund. (Werkt alleen als het groepslid attribuut DNs bevat)",
+    "Paging chunksize" : "Paging chunkgrootte",
+    "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.)" : "De chunkgrootte die wordt gebruikt voor LDAP opvragingen die in grote aantallen resulteren, zoals gebruiker- of groepsverzamelingen. (Instellen op 0 deactiveert gepagede LDAP opvragingen in dergelijke situaties.)",
+    "Special Attributes" : "Speciale attributen",
+    "Quota Field" : "Quota veld",
+    "Quota Default" : "Quota standaard",
+    "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.",
+    "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:",
+    "Override UUID detection" : "Negeren UUID detectie",
+    "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." : "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
+    "UUID Attribute for Users:" : "UUID attribuut voor gebruikers:",
+    "UUID Attribute for Groups:" : "UUID attribuut voor groepen:",
+    "Username-LDAP User Mapping" : "Gebruikersnaam-LDAP gebruikers vertaling",
+    "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." : "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
+    "Clear Username-LDAP User Mapping" : "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
+    "Clear Groupname-LDAP Group Mapping" : "Leegmaken Groepsnaam-LDAP groep vertaling"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/nl.php b/apps/user_ldap/l10n/nl.php
deleted file mode 100644
index ccf109d4d48..00000000000
--- a/apps/user_ldap/l10n/nl.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Niet gelukt de vertalingen leeg te maken.",
-"Failed to delete the server configuration" => "Verwijderen serverconfiguratie mislukt",
-"The configuration is valid and the connection could be established!" => "De configuratie is geldig en de verbinding is geslaagd!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "De configuratie is geldig, maar Bind mislukte. Controleer de serverinstellingen en inloggegevens.",
-"The configuration is invalid. Please have a look at the logs for further details." => "De configuratie is ongeldig. Bekijk de logbestanden voor meer details.",
-"No action specified" => "Geen actie opgegeven",
-"No configuration specified" => "Geen configuratie opgegeven",
-"No data specified" => "Geen gegevens verstrekt",
-" Could not set configuration %s" => "Kon configuratie %s niet instellen",
-"Deletion failed" => "Verwijderen mislukt",
-"Take over settings from recent server configuration?" => "Overnemen instellingen van de recente serverconfiguratie?",
-"Keep settings?" => "Instellingen bewaren?",
-"{nthServer}. Server" => "{nthServer}. Server",
-"Cannot add server configuration" => "Kon de serverconfiguratie niet toevoegen",
-"mappings cleared" => "vertaaltabel leeggemaakt",
-"Success" => "Succes",
-"Error" => "Fout",
-"Please specify a Base DN" => "Geef een Base DN op",
-"Could not determine Base DN" => "Kon de Base DN niet vaststellen",
-"Please specify the port" => "Geef de poort op",
-"Configuration OK" => "Configuratie OK",
-"Configuration incorrect" => "Configuratie onjuist",
-"Configuration incomplete" => "Configuratie incompleet",
-"Select groups" => "Selecteer groepen",
-"Select object classes" => "Selecteer objectklasse",
-"Select attributes" => "Selecteer attributen",
-"Connection test succeeded" => "Verbindingstest geslaagd",
-"Connection test failed" => "Verbindingstest mislukt",
-"Do you really want to delete the current Server Configuration?" => "Wilt u werkelijk de huidige Serverconfiguratie verwijderen?",
-"Confirm Deletion" => "Bevestig verwijderen",
-"_%s group found_::_%s groups found_" => array("%s groep gevonden","%s groepen gevonden"),
-"_%s user found_::_%s users found_" => array("%s gebruiker gevonden","%s gebruikers gevonden"),
-"Could not find the desired feature" => "Kon de gewenste functie niet vinden",
-"Invalid Host" => "Ongeldige server",
-"Server" => "Server",
-"User Filter" => "Gebruikersfilter",
-"Login Filter" => "Inlogfilter",
-"Group Filter" => "Groep Filter",
-"Save" => "Bewaren",
-"Test Configuration" => "Test configuratie",
-"Help" => "Help",
-"Groups meeting these criteria are available in %s:" => "Groepsafspraken die voldoen aan deze criteria zijn beschikbaar in %s:",
-"only those object classes:" => "alleen deze objectklassen",
-"only from those groups:" => "alleen van deze groepen:",
-"Edit raw filter instead" => "Bewerk raw filter",
-"Raw LDAP filter" => "Raw 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.",
-"Test Filter" => "Testfilter",
-"groups found" => "groepen gevonden",
-"Users login with this attribute:" => "Gebruikers loggen in met dit attribuut:",
-"LDAP Username:" => "LDAP Username:",
-"LDAP Email Address:" => "LDAP e-mailadres:",
-"Other Attributes:" => "Overige attributen:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definiëert het toe te passen filter als er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam bij het inloggen. Bijvoorbeeld: \"uid=%%uid\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Toevoegen serverconfiguratie",
-"Delete Configuration" => "Verwijder configuratie",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://",
-"Port" => "Poort",
-"User DN" => "User 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." => "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg.",
-"Password" => "Wachtwoord",
-"For anonymous access, leave DN and Password empty." => "Voor anonieme toegang, laat de DN en het wachtwoord leeg.",
-"One Base DN per line" => "Een Base DN per regel",
-"You can specify Base DN for users and groups in the Advanced tab" => "Je kunt het Base DN voor gebruikers en groepen specificeren in het tab Geavanceerd.",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Voorkom automatische LDAP opvragingen. Weliswaar beter voor grote installaties, maar vergt LDAP kennis.",
-"Manually enter LDAP filters (recommended for large directories)" => "Handmatig invoeren LDAP filters (aanbevolen voor grote directories)",
-"Limit %s access to users meeting these criteria:" => "Beperk %s toegang tot gebruikers die voldoen aan deze criteria:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Dit filter geeft aan welke LDAP gebruikers toegang hebben tot %s.",
-"users found" => "gebruikers gevonden",
-"Saving" => "Opslaan",
-"Back" => "Terug",
-"Continue" => "Verder",
-"Expert" => "Expert",
-"Advanced" => "Geavanceerd",
-"<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Waarschuwing:</b> De PHP LDAP module is niet geïnstalleerd, het backend zal niet werken. Vraag uw systeembeheerder om de module te installeren.",
-"Connection Settings" => "Verbindingsinstellingen",
-"Configuration Active" => "Configuratie actief",
-"When unchecked, this configuration will be skipped." => "Als dit niet is ingeschakeld wordt deze configuratie overgeslagen.",
-"Backup (Replica) Host" => "Backup (Replica) Host",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Opgeven optionele backup host. Het moet een replica van de hoofd LDAP/AD server.",
-"Backup (Replica) Port" => "Backup (Replica) Poort",
-"Disable Main Server" => "Deactiveren hoofdserver",
-"Only connect to the replica server." => "Maak alleen een verbinding met de replica server.",
-"Case insensitive LDAP server (Windows)" => "Niet-hoofdlettergevoelige LDAP server (Windows)",
-"Turn off SSL certificate validation." => "Schakel SSL certificaat validatie uit.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Niet aanbevolen, gebruik alleen om te testen! Als de connectie alleen werkt met deze optie, importeer dan het SSL-certificaat van de LDAP-server naar uw %s server.",
-"Cache Time-To-Live" => "Cache time-to-live",
-"in seconds. A change empties the cache." => "in seconden. Een verandering maakt de cache leeg.",
-"Directory Settings" => "Mapinstellingen",
-"User Display Name Field" => "Gebruikers Schermnaam Veld",
-"The LDAP attribute to use to generate the user's display name." => "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker.",
-"Base User Tree" => "Basis Gebruikers Structuur",
-"One User Base DN per line" => "Een User Base DN per regel",
-"User Search Attributes" => "Attributen voor gebruikerszoekopdrachten",
-"Optional; one attribute per line" => "Optioneel; één attribuut per regel",
-"Group Display Name Field" => "Groep Schermnaam Veld",
-"The LDAP attribute to use to generate the groups's display name." => "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen.",
-"Base Group Tree" => "Basis Groupen Structuur",
-"One Group Base DN per line" => "Een Group Base DN per regel",
-"Group Search Attributes" => "Attributen voor groepszoekopdrachten",
-"Group-Member association" => "Groepslid associatie",
-"Nested Groups" => "Geneste groepen",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Wanneer ingeschakeld worden groepen binnen groepen ondersteund. (Werkt alleen als het groepslid attribuut DNs bevat)",
-"Paging chunksize" => "Paging chunkgrootte",
-"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.)" => "De chunkgrootte die wordt gebruikt voor LDAP opvragingen die in grote aantallen resulteren, zoals gebruiker- of groepsverzamelingen. (Instellen op 0 deactiveert gepagede LDAP opvragingen in dergelijke situaties.)",
-"Special Attributes" => "Speciale attributen",
-"Quota Field" => "Quota veld",
-"Quota Default" => "Quota standaard",
-"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.",
-"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:",
-"Override UUID detection" => "Negeren UUID detectie",
-"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." => "Standaard herkent ownCloud het UUID-attribuut automatisch. Het UUID attribuut wordt gebruikt om LDAP-gebruikers en -groepen uniek te identificeren. Ook zal de interne gebruikersnaam worden aangemaakt op basis van het UUID, tenzij deze hierboven anders is aangegeven. U kunt de instelling overschrijven en zelf een waarde voor het attribuut opgeven. U moet ervoor zorgen dat het ingestelde attribuut kan worden opgehaald voor zowel gebruikers als groepen en dat het uniek is. Laat het leeg voor standaard gedrag. Veranderingen worden alleen doorgevoerd op nieuw gekoppelde (toegevoegde) LDAP-gebruikers en-groepen.",
-"UUID Attribute for Users:" => "UUID attribuut voor gebruikers:",
-"UUID Attribute for Groups:" => "UUID attribuut voor groepen:",
-"Username-LDAP User Mapping" => "Gebruikersnaam-LDAP gebruikers vertaling",
-"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." => "ownCloud maakt gebruik van gebruikersnamen om (meta) data op te slaan en toe te wijzen. Om gebruikers uniek te identificeren, krijgt elke LDAP-gebruiker ook een interne gebruikersnaam. Dit vereist een koppeling van de ownCloud gebruikersnaam aan een ​​LDAP-gebruiker. De gecreëerde gebruikersnaam is gekoppeld aan de UUID van de LDAP-gebruiker. Aanvullend wordt ook de 'DN' gecached om het aantal LDAP-interacties te verminderen, maar dit wordt niet gebruikt voor identificatie. Als de DN verandert, zullen de veranderingen worden gevonden. De interne naam wordt overal gebruikt. Het wissen van de koppeling zal overal resten achterlaten. Het wissen van koppelingen is niet configuratiegevoelig, maar het raakt wel alle LDAP instellingen! Zorg ervoor dat deze koppelingen nooit in een productieomgeving gewist worden. Maak ze alleen leeg in een test- of ontwikkelomgeving.",
-"Clear Username-LDAP User Mapping" => "Leegmaken Gebruikersnaam-LDAP gebruikers vertaling",
-"Clear Groupname-LDAP Group Mapping" => "Leegmaken Groepsnaam-LDAP groep vertaling"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nn_NO.js b/apps/user_ldap/l10n/nn_NO.js
new file mode 100644
index 00000000000..8022fa4b396
--- /dev/null
+++ b/apps/user_ldap/l10n/nn_NO.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Feil ved sletting",
+    "Error" : "Feil",
+    "Select groups" : "Vel grupper",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Lagra",
+    "Help" : "Hjelp",
+    "Host" : "Tenar",
+    "Password" : "Passord",
+    "Back" : "Tilbake",
+    "Continue" : "Gå vidare",
+    "Advanced" : "Avansert"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/nn_NO.json b/apps/user_ldap/l10n/nn_NO.json
new file mode 100644
index 00000000000..6a5a47400ae
--- /dev/null
+++ b/apps/user_ldap/l10n/nn_NO.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Deletion failed" : "Feil ved sletting",
+    "Error" : "Feil",
+    "Select groups" : "Vel grupper",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Lagra",
+    "Help" : "Hjelp",
+    "Host" : "Tenar",
+    "Password" : "Passord",
+    "Back" : "Tilbake",
+    "Continue" : "Gå vidare",
+    "Advanced" : "Avansert"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/nn_NO.php b/apps/user_ldap/l10n/nn_NO.php
deleted file mode 100644
index f8152a4c933..00000000000
--- a/apps/user_ldap/l10n/nn_NO.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Feil ved sletting",
-"Error" => "Feil",
-"Select groups" => "Vel grupper",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Lagra",
-"Help" => "Hjelp",
-"Host" => "Tenar",
-"Password" => "Passord",
-"Back" => "Tilbake",
-"Continue" => "Gå vidare",
-"Advanced" => "Avansert"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/nqo.js b/apps/user_ldap/l10n/nqo.js
new file mode 100644
index 00000000000..5494dcae62e
--- /dev/null
+++ b/apps/user_ldap/l10n/nqo.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/nqo.json b/apps/user_ldap/l10n/nqo.json
new file mode 100644
index 00000000000..75f0f056cc4
--- /dev/null
+++ b/apps/user_ldap/l10n/nqo.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/nqo.php b/apps/user_ldap/l10n/nqo.php
deleted file mode 100644
index bba52d53a1a..00000000000
--- a/apps/user_ldap/l10n/nqo.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/oc.js b/apps/user_ldap/l10n/oc.js
new file mode 100644
index 00000000000..5335f66cdea
--- /dev/null
+++ b/apps/user_ldap/l10n/oc.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Fracàs d'escafatge",
+    "Error" : "Error",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Enregistra",
+    "Help" : "Ajuda",
+    "Password" : "Senhal",
+    "Advanced" : "Avançat"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_ldap/l10n/oc.json b/apps/user_ldap/l10n/oc.json
new file mode 100644
index 00000000000..694d9abe97c
--- /dev/null
+++ b/apps/user_ldap/l10n/oc.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Deletion failed" : "Fracàs d'escafatge",
+    "Error" : "Error",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "Enregistra",
+    "Help" : "Ajuda",
+    "Password" : "Senhal",
+    "Advanced" : "Avançat"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/oc.php b/apps/user_ldap/l10n/oc.php
deleted file mode 100644
index 3d85c112afc..00000000000
--- a/apps/user_ldap/l10n/oc.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Fracàs d'escafatge",
-"Error" => "Error",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "Enregistra",
-"Help" => "Ajuda",
-"Password" => "Senhal",
-"Advanced" => "Avançat"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/or_IN.js b/apps/user_ldap/l10n/or_IN.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/or_IN.js
@@ -0,0 +1,7 @@
+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/or_IN.json b/apps/user_ldap/l10n/or_IN.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/or_IN.json
@@ -0,0 +1,5 @@
+{ "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/or_IN.php b/apps/user_ldap/l10n/or_IN.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/or_IN.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/pa.js b/apps/user_ldap/l10n/pa.js
new file mode 100644
index 00000000000..8891b4daa1b
--- /dev/null
+++ b/apps/user_ldap/l10n/pa.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "ਗਲਤੀ",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Password" : "ਪਾਸਵਰ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/pa.json b/apps/user_ldap/l10n/pa.json
new file mode 100644
index 00000000000..2fd99ae9707
--- /dev/null
+++ b/apps/user_ldap/l10n/pa.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Error" : "ਗਲਤੀ",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Password" : "ਪਾਸਵਰ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/pa.php b/apps/user_ldap/l10n/pa.php
deleted file mode 100644
index b52a4a88005..00000000000
--- a/apps/user_ldap/l10n/pa.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "ਗਲਤੀ",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Password" => "ਪਾਸਵਰ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/pl.js b/apps/user_ldap/l10n/pl.js
new file mode 100644
index 00000000000..345d4986e4b
--- /dev/null
+++ b/apps/user_ldap/l10n/pl.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Nie udało się wyczyścić mapowania.",
+    "Failed to delete the server configuration" : "Nie można usunąć konfiguracji serwera",
+    "The configuration is valid and the connection could be established!" : "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfiguracja jest nieprawidłowa. Proszę rzucić okiem na dzienniki dalszych szczegółów.",
+    "No action specified" : "Nie określono akcji",
+    "No configuration specified" : "Nie określono konfiguracji",
+    "No data specified" : "Nie określono danych",
+    " Could not set configuration %s" : "Nie można ustawić konfiguracji %s",
+    "Deletion failed" : "Usunięcie nie powiodło się",
+    "Take over settings from recent server configuration?" : "Przejmij ustawienia z ostatnich konfiguracji serwera?",
+    "Keep settings?" : "Zachować ustawienia?",
+    "{nthServer}. Server" : "{nthServer}. Serwer",
+    "Cannot add server configuration" : "Nie można dodać konfiguracji serwera",
+    "mappings cleared" : "Mapoanie wyczyszczone",
+    "Success" : "Sukces",
+    "Error" : "Błąd",
+    "Please specify a Base DN" : "Proszę podać bazowy DN",
+    "Could not determine Base DN" : "Nie można ustalić bazowego DN",
+    "Please specify the port" : "Proszę podać port",
+    "Configuration OK" : "Konfiguracja poprawna",
+    "Configuration incorrect" : "Konfiguracja niepoprawna",
+    "Configuration incomplete" : "Konfiguracja niekompletna",
+    "Select groups" : "Wybierz grupy",
+    "Select object classes" : "Wybierz obiekty klas",
+    "Select attributes" : "Wybierz atrybuty",
+    "Connection test succeeded" : "Test połączenia udany",
+    "Connection test failed" : "Test połączenia nie udany",
+    "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?",
+    "Confirm Deletion" : "Potwierdź usunięcie",
+    "_%s group found_::_%s groups found_" : ["%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"],
+    "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"],
+    "Could not find the desired feature" : "Nie można znaleźć żądanej funkcji",
+    "Invalid Host" : "Niepoprawny Host",
+    "Server" : "Serwer",
+    "User Filter" : "Filtr użytkownika",
+    "Login Filter" : "Filtr logowania",
+    "Group Filter" : "Grupa filtrów",
+    "Save" : "Zapisz",
+    "Test Configuration" : "Konfiguracja testowa",
+    "Help" : "Pomoc",
+    "Groups meeting these criteria are available in %s:" : "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:",
+    "only those object classes:" : "tylko te klasy obiektów:",
+    "only from those groups:" : "tylko z tych grup:",
+    "Edit raw filter instead" : "Edytuj zamiast tego czysty filtr",
+    "Raw LDAP filter" : "Czysty filtr LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
+    "groups found" : "grup znaleziono",
+    "Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:",
+    "LDAP Username:" : "Nazwa użytkownika LDAP:",
+    "LDAP Email Address:" : "LDAP Adres Email:",
+    "Other Attributes:" : "Inne atrybuty:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
+    "1. Server" : "1. Serwer",
+    "%s. Server:" : "%s. Serwer:",
+    "Add Server Configuration" : "Dodaj konfigurację servera",
+    "Delete Configuration" : "Usuń konfigurację",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
+    "Port" : "Port",
+    "User DN" : "Użytkownik 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." : "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste",
+    "Password" : "Hasło",
+    "For anonymous access, leave DN and Password empty." : "Dla dostępu anonimowego pozostawić DN i hasło puste.",
+    "One Base DN per line" : "Jedna baza DN na linię",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane",
+    "Limit %s access to users meeting these criteria:" : "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.",
+    "users found" : "użytkownicy znalezieni",
+    "Back" : "Wróć",
+    "Continue" : "Kontynuuj ",
+    "Expert" : "Ekspert",
+    "Advanced" : "Zaawansowane",
+    "<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>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Ostrzeżenie:</b>  Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
+    "Connection Settings" : "Konfiguracja połączeń",
+    "Configuration Active" : "Konfiguracja archiwum",
+    "When unchecked, this configuration will be skipped." : "Gdy niezaznaczone, ta konfiguracja zostanie pominięta.",
+    "Backup (Replica) Host" : "Kopia zapasowa (repliki) host",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dać opcjonalnie  hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD.",
+    "Backup (Replica) Port" : "Kopia zapasowa (repliki) Port",
+    "Disable Main Server" : "Wyłącz serwer główny",
+    "Only connect to the replica server." : "Połącz tylko do repliki serwera.",
+    "Case insensitive LDAP server (Windows)" : "Serwer LDAP nie rozróżniający wielkości liter (Windows)",
+    "Turn off SSL certificate validation." : "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s.",
+    "Cache Time-To-Live" : "Przechowuj czas życia",
+    "in seconds. A change empties the cache." : "w sekundach. Zmiana opróżnia pamięć podręczną.",
+    "Directory Settings" : "Ustawienia katalogów",
+    "User Display Name Field" : "Pole wyświetlanej nazwy użytkownika",
+    "The LDAP attribute to use to generate the user's display name." : "Atrybut LDAP służący do generowania wyświetlanej nazwy użytkownika ownCloud.",
+    "Base User Tree" : "Drzewo bazy użytkowników",
+    "One User Base DN per line" : "Jeden użytkownik Bazy DN na linię",
+    "User Search Attributes" : "Szukaj atrybutów",
+    "Optional; one attribute per line" : "Opcjonalnie; jeden atrybut w wierszu",
+    "Group Display Name Field" : "Pole wyświetlanej nazwy grupy",
+    "The LDAP attribute to use to generate the groups's display name." : "Atrybut LDAP służący do generowania wyświetlanej nazwy grupy ownCloud.",
+    "Base Group Tree" : "Drzewo bazy grup",
+    "One Group Base DN per line" : "Jedna grupa bazy DN na linię",
+    "Group Search Attributes" : "Grupa atrybutów wyszukaj",
+    "Group-Member association" : "Członek grupy stowarzyszenia",
+    "Nested Groups" : "Grupy zagnieżdżone",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Kiedy włączone, grupy, które zawierają grupy, są wspierane. (Działa tylko, jeśli członek grupy ma ustawienie DNs)",
+    "Paging chunksize" : "Wielkość stronicowania",
+    "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.)" : "Długość łańcucha jest używana do stronicowanych wyszukiwań LDAP, które mogą zwracać duże zbiory jak lista grup, czy użytkowników. (Ustawienie na 0 wyłącza stronicowane wyszukiwania w takich sytuacjach.)",
+    "Special Attributes" : "Specjalne atrybuty",
+    "Quota Field" : "Pole przydziału",
+    "Quota Default" : "Przydział domyślny",
+    "in bytes" : "w bajtach",
+    "Email Field" : "Pole email",
+    "User Home Folder Naming Rule" : "Reguły nazewnictwa folderu domowego użytkownika",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
+    "Internal Username" : "Wewnętrzna nazwa użytkownika",
+    "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." : "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna, a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu jest dodawana / zwiększana cyfra. Wewnętrzna nazwa użytkownika służy do wewnętrznej identyfikacji użytkownika. Jest to również domyślna nazwa folderu domowego użytkownika. Jest to również część zdalnego adresu URL, na przykład dla wszystkich usług *DAV. Dzięki temu ustawieniu można nadpisywać domyślne zachowanie aplikacji. Aby osiągnąć podobny efekt jak przed ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników LDAP.",
+    "Internal Username Attribute:" : "Wewnętrzny atrybut nazwy uzżytkownika:",
+    "Override UUID detection" : "Zastąp wykrywanie 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." : "Domyślnie, atrybut UUID jest wykrywany automatycznie. Atrybut UUID jest używany do niepodważalnej identyfikacji użytkowników i grup LDAP. Również wewnętrzna nazwa użytkownika zostanie stworzona na bazie UUID, jeśli nie zostanie podana powyżej. Możesz nadpisać to ustawienie i użyć atrybutu wedle uznania. Musisz się jednak upewnić, że atrybut ten może zostać pobrany zarówno dla użytkowników, jak i grup i jest unikalny. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników i grupy LDAP.",
+    "UUID Attribute for Users:" : "Atrybuty UUID dla użytkowników:",
+    "UUID Attribute for Groups:" : "Atrybuty UUID dla grup:",
+    "Username-LDAP User Mapping" : "Mapowanie użytkownika LDAP",
+    "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." : "Nazwy użytkowników są używane w celu przechowywania i przypisywania (meta) danych. Aby dokładnie zidentyfikować i rozpoznać użytkowników, każdy użytkownik LDAP będzie miał wewnętrzną nazwę. To wymaga utworzenia przypisania nazwy użytkownika do użytkownika LDAP. Utworzona nazwa użytkownika jet przypisywana do UUID użytkownika LDAP. Dodatkowo DN jest również buforowany aby zmniejszyć interakcję z LDAP, ale nie jest używany do identyfikacji. Jeśli DN się zmieni, zmiany zostaną odnalezione. Wewnętrzny użytkownik jest używany we wszystkich przypadkach. Wyczyszczenie mapowań spowoduje pozostawienie wszędzie resztek informacji. Wyczyszczenie mapowań nie jest wrażliwe na konfigurację, wpływa ono na wszystkie konfiguracje LDAP! Nigdy nie czyść mapowań w środowisku produkcyjnym, tylko podczas testów lub w fazie eksperymentalnej. ",
+    "Clear Username-LDAP User Mapping" : "Czyść Mapowanie użytkownika LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Czyść Mapowanie nazwy grupy LDAP"
+},
+"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_ldap/l10n/pl.json b/apps/user_ldap/l10n/pl.json
new file mode 100644
index 00000000000..49adb2abb51
--- /dev/null
+++ b/apps/user_ldap/l10n/pl.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Nie udało się wyczyścić mapowania.",
+    "Failed to delete the server configuration" : "Nie można usunąć konfiguracji serwera",
+    "The configuration is valid and the connection could be established!" : "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfiguracja jest nieprawidłowa. Proszę rzucić okiem na dzienniki dalszych szczegółów.",
+    "No action specified" : "Nie określono akcji",
+    "No configuration specified" : "Nie określono konfiguracji",
+    "No data specified" : "Nie określono danych",
+    " Could not set configuration %s" : "Nie można ustawić konfiguracji %s",
+    "Deletion failed" : "Usunięcie nie powiodło się",
+    "Take over settings from recent server configuration?" : "Przejmij ustawienia z ostatnich konfiguracji serwera?",
+    "Keep settings?" : "Zachować ustawienia?",
+    "{nthServer}. Server" : "{nthServer}. Serwer",
+    "Cannot add server configuration" : "Nie można dodać konfiguracji serwera",
+    "mappings cleared" : "Mapoanie wyczyszczone",
+    "Success" : "Sukces",
+    "Error" : "Błąd",
+    "Please specify a Base DN" : "Proszę podać bazowy DN",
+    "Could not determine Base DN" : "Nie można ustalić bazowego DN",
+    "Please specify the port" : "Proszę podać port",
+    "Configuration OK" : "Konfiguracja poprawna",
+    "Configuration incorrect" : "Konfiguracja niepoprawna",
+    "Configuration incomplete" : "Konfiguracja niekompletna",
+    "Select groups" : "Wybierz grupy",
+    "Select object classes" : "Wybierz obiekty klas",
+    "Select attributes" : "Wybierz atrybuty",
+    "Connection test succeeded" : "Test połączenia udany",
+    "Connection test failed" : "Test połączenia nie udany",
+    "Do you really want to delete the current Server Configuration?" : "Czy chcesz usunąć bieżącą konfigurację serwera?",
+    "Confirm Deletion" : "Potwierdź usunięcie",
+    "_%s group found_::_%s groups found_" : ["%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"],
+    "_%s user found_::_%s users found_" : ["%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"],
+    "Could not find the desired feature" : "Nie można znaleźć żądanej funkcji",
+    "Invalid Host" : "Niepoprawny Host",
+    "Server" : "Serwer",
+    "User Filter" : "Filtr użytkownika",
+    "Login Filter" : "Filtr logowania",
+    "Group Filter" : "Grupa filtrów",
+    "Save" : "Zapisz",
+    "Test Configuration" : "Konfiguracja testowa",
+    "Help" : "Pomoc",
+    "Groups meeting these criteria are available in %s:" : "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:",
+    "only those object classes:" : "tylko te klasy obiektów:",
+    "only from those groups:" : "tylko z tych grup:",
+    "Edit raw filter instead" : "Edytuj zamiast tego czysty filtr",
+    "Raw LDAP filter" : "Czysty filtr LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
+    "groups found" : "grup znaleziono",
+    "Users login with this attribute:" : "Użytkownicy zalogowani z tymi ustawieniami:",
+    "LDAP Username:" : "Nazwa użytkownika LDAP:",
+    "LDAP Email Address:" : "LDAP Adres Email:",
+    "Other Attributes:" : "Inne atrybuty:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
+    "1. Server" : "1. Serwer",
+    "%s. Server:" : "%s. Serwer:",
+    "Add Server Configuration" : "Dodaj konfigurację servera",
+    "Delete Configuration" : "Usuń konfigurację",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
+    "Port" : "Port",
+    "User DN" : "Użytkownik 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." : "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste",
+    "Password" : "Hasło",
+    "For anonymous access, leave DN and Password empty." : "Dla dostępu anonimowego pozostawić DN i hasło puste.",
+    "One Base DN per line" : "Jedna baza DN na linię",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane",
+    "Limit %s access to users meeting these criteria:" : "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.",
+    "users found" : "użytkownicy znalezieni",
+    "Back" : "Wróć",
+    "Continue" : "Kontynuuj ",
+    "Expert" : "Ekspert",
+    "Advanced" : "Zaawansowane",
+    "<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>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Ostrzeżenie:</b>  Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
+    "Connection Settings" : "Konfiguracja połączeń",
+    "Configuration Active" : "Konfiguracja archiwum",
+    "When unchecked, this configuration will be skipped." : "Gdy niezaznaczone, ta konfiguracja zostanie pominięta.",
+    "Backup (Replica) Host" : "Kopia zapasowa (repliki) host",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Dać opcjonalnie  hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD.",
+    "Backup (Replica) Port" : "Kopia zapasowa (repliki) Port",
+    "Disable Main Server" : "Wyłącz serwer główny",
+    "Only connect to the replica server." : "Połącz tylko do repliki serwera.",
+    "Case insensitive LDAP server (Windows)" : "Serwer LDAP nie rozróżniający wielkości liter (Windows)",
+    "Turn off SSL certificate validation." : "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s.",
+    "Cache Time-To-Live" : "Przechowuj czas życia",
+    "in seconds. A change empties the cache." : "w sekundach. Zmiana opróżnia pamięć podręczną.",
+    "Directory Settings" : "Ustawienia katalogów",
+    "User Display Name Field" : "Pole wyświetlanej nazwy użytkownika",
+    "The LDAP attribute to use to generate the user's display name." : "Atrybut LDAP służący do generowania wyświetlanej nazwy użytkownika ownCloud.",
+    "Base User Tree" : "Drzewo bazy użytkowników",
+    "One User Base DN per line" : "Jeden użytkownik Bazy DN na linię",
+    "User Search Attributes" : "Szukaj atrybutów",
+    "Optional; one attribute per line" : "Opcjonalnie; jeden atrybut w wierszu",
+    "Group Display Name Field" : "Pole wyświetlanej nazwy grupy",
+    "The LDAP attribute to use to generate the groups's display name." : "Atrybut LDAP służący do generowania wyświetlanej nazwy grupy ownCloud.",
+    "Base Group Tree" : "Drzewo bazy grup",
+    "One Group Base DN per line" : "Jedna grupa bazy DN na linię",
+    "Group Search Attributes" : "Grupa atrybutów wyszukaj",
+    "Group-Member association" : "Członek grupy stowarzyszenia",
+    "Nested Groups" : "Grupy zagnieżdżone",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Kiedy włączone, grupy, które zawierają grupy, są wspierane. (Działa tylko, jeśli członek grupy ma ustawienie DNs)",
+    "Paging chunksize" : "Wielkość stronicowania",
+    "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.)" : "Długość łańcucha jest używana do stronicowanych wyszukiwań LDAP, które mogą zwracać duże zbiory jak lista grup, czy użytkowników. (Ustawienie na 0 wyłącza stronicowane wyszukiwania w takich sytuacjach.)",
+    "Special Attributes" : "Specjalne atrybuty",
+    "Quota Field" : "Pole przydziału",
+    "Quota Default" : "Przydział domyślny",
+    "in bytes" : "w bajtach",
+    "Email Field" : "Pole email",
+    "User Home Folder Naming Rule" : "Reguły nazewnictwa folderu domowego użytkownika",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
+    "Internal Username" : "Wewnętrzna nazwa użytkownika",
+    "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." : "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna, a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu jest dodawana / zwiększana cyfra. Wewnętrzna nazwa użytkownika służy do wewnętrznej identyfikacji użytkownika. Jest to również domyślna nazwa folderu domowego użytkownika. Jest to również część zdalnego adresu URL, na przykład dla wszystkich usług *DAV. Dzięki temu ustawieniu można nadpisywać domyślne zachowanie aplikacji. Aby osiągnąć podobny efekt jak przed ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników LDAP.",
+    "Internal Username Attribute:" : "Wewnętrzny atrybut nazwy uzżytkownika:",
+    "Override UUID detection" : "Zastąp wykrywanie 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." : "Domyślnie, atrybut UUID jest wykrywany automatycznie. Atrybut UUID jest używany do niepodważalnej identyfikacji użytkowników i grup LDAP. Również wewnętrzna nazwa użytkownika zostanie stworzona na bazie UUID, jeśli nie zostanie podana powyżej. Możesz nadpisać to ustawienie i użyć atrybutu wedle uznania. Musisz się jednak upewnić, że atrybut ten może zostać pobrany zarówno dla użytkowników, jak i grup i jest unikalny. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników i grupy LDAP.",
+    "UUID Attribute for Users:" : "Atrybuty UUID dla użytkowników:",
+    "UUID Attribute for Groups:" : "Atrybuty UUID dla grup:",
+    "Username-LDAP User Mapping" : "Mapowanie użytkownika LDAP",
+    "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." : "Nazwy użytkowników są używane w celu przechowywania i przypisywania (meta) danych. Aby dokładnie zidentyfikować i rozpoznać użytkowników, każdy użytkownik LDAP będzie miał wewnętrzną nazwę. To wymaga utworzenia przypisania nazwy użytkownika do użytkownika LDAP. Utworzona nazwa użytkownika jet przypisywana do UUID użytkownika LDAP. Dodatkowo DN jest również buforowany aby zmniejszyć interakcję z LDAP, ale nie jest używany do identyfikacji. Jeśli DN się zmieni, zmiany zostaną odnalezione. Wewnętrzny użytkownik jest używany we wszystkich przypadkach. Wyczyszczenie mapowań spowoduje pozostawienie wszędzie resztek informacji. Wyczyszczenie mapowań nie jest wrażliwe na konfigurację, wpływa ono na wszystkie konfiguracje LDAP! Nigdy nie czyść mapowań w środowisku produkcyjnym, tylko podczas testów lub w fazie eksperymentalnej. ",
+    "Clear Username-LDAP User Mapping" : "Czyść Mapowanie użytkownika LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Czyść Mapowanie nazwy grupy LDAP"
+},"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_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
deleted file mode 100644
index da578cbb86c..00000000000
--- a/apps/user_ldap/l10n/pl.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Nie udało się wyczyścić mapowania.",
-"Failed to delete the server configuration" => "Nie można usunąć konfiguracji serwera",
-"The configuration is valid and the connection could be established!" => "Konfiguracja jest prawidłowa i można ustanowić połączenie!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfiguracja jest prawidłowa, ale Bind nie. Sprawdź ustawienia serwera i poświadczenia.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Konfiguracja jest nieprawidłowa. Proszę rzucić okiem na dzienniki dalszych szczegółów.",
-"No action specified" => "Nie określono akcji",
-"No configuration specified" => "Nie określono konfiguracji",
-"No data specified" => "Nie określono danych",
-" Could not set configuration %s" => "Nie można ustawić konfiguracji %s",
-"Deletion failed" => "Usunięcie nie powiodło się",
-"Take over settings from recent server configuration?" => "Przejmij ustawienia z ostatnich konfiguracji serwera?",
-"Keep settings?" => "Zachować ustawienia?",
-"{nthServer}. Server" => "{nthServer}. Serwer",
-"Cannot add server configuration" => "Nie można dodać konfiguracji serwera",
-"mappings cleared" => "Mapoanie wyczyszczone",
-"Success" => "Sukces",
-"Error" => "Błąd",
-"Please specify a Base DN" => "Proszę podać bazowy DN",
-"Could not determine Base DN" => "Nie można ustalić bazowego DN",
-"Please specify the port" => "Proszę podać port",
-"Configuration OK" => "Konfiguracja poprawna",
-"Configuration incorrect" => "Konfiguracja niepoprawna",
-"Configuration incomplete" => "Konfiguracja niekompletna",
-"Select groups" => "Wybierz grupy",
-"Select object classes" => "Wybierz obiekty klas",
-"Select attributes" => "Wybierz atrybuty",
-"Connection test succeeded" => "Test połączenia udany",
-"Connection test failed" => "Test połączenia nie udany",
-"Do you really want to delete the current Server Configuration?" => "Czy chcesz usunąć bieżącą konfigurację serwera?",
-"Confirm Deletion" => "Potwierdź usunięcie",
-"_%s group found_::_%s groups found_" => array("%s znaleziona grupa","%s znalezionych grup","%s znalezionych grup"),
-"_%s user found_::_%s users found_" => array("%s znaleziony użytkownik","%s znalezionych użytkowników","%s znalezionych użytkowników"),
-"Could not find the desired feature" => "Nie można znaleźć żądanej funkcji",
-"Invalid Host" => "Niepoprawny Host",
-"Server" => "Serwer",
-"User Filter" => "Filtr użytkownika",
-"Login Filter" => "Filtr logowania",
-"Group Filter" => "Grupa filtrów",
-"Save" => "Zapisz",
-"Test Configuration" => "Konfiguracja testowa",
-"Help" => "Pomoc",
-"Groups meeting these criteria are available in %s:" => "Przyłączenie do grupy z tymi ustawieniami dostępne jest w %s:",
-"only those object classes:" => "tylko te klasy obiektów:",
-"only from those groups:" => "tylko z tych grup:",
-"Edit raw filter instead" => "Edytuj zamiast tego czysty filtr",
-"Raw LDAP filter" => "Czysty filtr LDAP",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Filtr określa, które grupy LDAP powinny mieć dostęp do instancji %s.",
-"groups found" => "grup znaleziono",
-"Users login with this attribute:" => "Użytkownicy zalogowani z tymi ustawieniami:",
-"LDAP Username:" => "Nazwa użytkownika LDAP:",
-"LDAP Email Address:" => "LDAP Adres Email:",
-"Other Attributes:" => "Inne atrybuty:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Określa jakiego filtru użyć podczas próby zalogowania. %%uid zastępuje nazwę użytkownika w procesie logowania. Przykład: \"uid=%%uid\"",
-"1. Server" => "1. Serwer",
-"%s. Server:" => "%s. Serwer:",
-"Add Server Configuration" => "Dodaj konfigurację servera",
-"Delete Configuration" => "Usuń konfigurację",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://",
-"Port" => "Port",
-"User DN" => "Użytkownik 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." => "DN użytkownika klienta, z którym powiązanie wykonuje się, np. uid=agent,dc=example,dc=com. Dla dostępu anonimowego pozostawić DN i hasło puste",
-"Password" => "Hasło",
-"For anonymous access, leave DN and Password empty." => "Dla dostępu anonimowego pozostawić DN i hasło puste.",
-"One Base DN per line" => "Jedna baza DN na linię",
-"You can specify Base DN for users and groups in the Advanced tab" => "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane",
-"Limit %s access to users meeting these criteria:" => "Limit %s dostępu do podłączania użytkowników z tymi ustawieniami:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Filtr określa, którzy użytkownicy LDAP powinni mieć dostęp do instancji %s.",
-"users found" => "użytkownicy znalezieni",
-"Back" => "Wróć",
-"Continue" => "Kontynuuj ",
-"Expert" => "Ekspert",
-"Advanced" => "Zaawansowane",
-"<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>Ostrzeżenie:</b> Aplikacje user_ldap i user_webdavauth nie są  kompatybilne. Mogą powodować nieoczekiwane zachowanie. Poproś administratora o wyłączenie jednej z nich.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b>  Moduł PHP LDAP nie jest zainstalowany i nie będzie działał. Poproś administratora o włączenie go.",
-"Connection Settings" => "Konfiguracja połączeń",
-"Configuration Active" => "Konfiguracja archiwum",
-"When unchecked, this configuration will be skipped." => "Gdy niezaznaczone, ta konfiguracja zostanie pominięta.",
-"Backup (Replica) Host" => "Kopia zapasowa (repliki) host",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Dać opcjonalnie  hosta kopii zapasowej . To musi być repliką głównego serwera LDAP/AD.",
-"Backup (Replica) Port" => "Kopia zapasowa (repliki) Port",
-"Disable Main Server" => "Wyłącz serwer główny",
-"Only connect to the replica server." => "Połącz tylko do repliki serwera.",
-"Case insensitive LDAP server (Windows)" => "Serwer LDAP nie rozróżniający wielkości liter (Windows)",
-"Turn off SSL certificate validation." => "Wyłączyć sprawdzanie poprawności certyfikatu SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Nie polecane, używać tylko w celu testowania! Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP na swój %s.",
-"Cache Time-To-Live" => "Przechowuj czas życia",
-"in seconds. A change empties the cache." => "w sekundach. Zmiana opróżnia pamięć podręczną.",
-"Directory Settings" => "Ustawienia katalogów",
-"User Display Name Field" => "Pole wyświetlanej nazwy użytkownika",
-"The LDAP attribute to use to generate the user's display name." => "Atrybut LDAP służący do generowania wyświetlanej nazwy użytkownika ownCloud.",
-"Base User Tree" => "Drzewo bazy użytkowników",
-"One User Base DN per line" => "Jeden użytkownik Bazy DN na linię",
-"User Search Attributes" => "Szukaj atrybutów",
-"Optional; one attribute per line" => "Opcjonalnie; jeden atrybut w wierszu",
-"Group Display Name Field" => "Pole wyświetlanej nazwy grupy",
-"The LDAP attribute to use to generate the groups's display name." => "Atrybut LDAP służący do generowania wyświetlanej nazwy grupy ownCloud.",
-"Base Group Tree" => "Drzewo bazy grup",
-"One Group Base DN per line" => "Jedna grupa bazy DN na linię",
-"Group Search Attributes" => "Grupa atrybutów wyszukaj",
-"Group-Member association" => "Członek grupy stowarzyszenia",
-"Nested Groups" => "Grupy zagnieżdżone",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Kiedy włączone, grupy, które zawierają grupy, są wspierane. (Działa tylko, jeśli członek grupy ma ustawienie DNs)",
-"Paging chunksize" => "Wielkość stronicowania",
-"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.)" => "Długość łańcucha jest używana do stronicowanych wyszukiwań LDAP, które mogą zwracać duże zbiory jak lista grup, czy użytkowników. (Ustawienie na 0 wyłącza stronicowane wyszukiwania w takich sytuacjach.)",
-"Special Attributes" => "Specjalne atrybuty",
-"Quota Field" => "Pole przydziału",
-"Quota Default" => "Przydział domyślny",
-"in bytes" => "w bajtach",
-"Email Field" => "Pole email",
-"User Home Folder Naming Rule" => "Reguły nazewnictwa folderu domowego użytkownika",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
-"Internal Username" => "Wewnętrzna nazwa użytkownika",
-"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." => "Domyślnie, wewnętrzna nazwa użytkownika zostanie utworzona z atrybutu UUID, ang. Universally unique identifier - Unikalny identyfikator użytkownika. To daje pewność, że nazwa użytkownika jest niepowtarzalna, a znaki nie muszą być konwertowane. Wewnętrzna nazwa użytkownika dopuszcza jedynie znaki: [ a-zA-Z0-9_.@- ]. Pozostałe znaki zamieniane są na ich odpowiedniki ASCII lub po prostu pomijane. W przypadku, gdy nazwa się powtarza na końcu jest dodawana / zwiększana cyfra. Wewnętrzna nazwa użytkownika służy do wewnętrznej identyfikacji użytkownika. Jest to również domyślna nazwa folderu domowego użytkownika. Jest to również część zdalnego adresu URL, na przykład dla wszystkich usług *DAV. Dzięki temu ustawieniu można nadpisywać domyślne zachowanie aplikacji. Aby osiągnąć podobny efekt jak przed ownCloud 5 wpisz atrybut nazwy użytkownika w poniższym polu. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników LDAP.",
-"Internal Username Attribute:" => "Wewnętrzny atrybut nazwy uzżytkownika:",
-"Override UUID detection" => "Zastąp wykrywanie 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." => "Domyślnie, atrybut UUID jest wykrywany automatycznie. Atrybut UUID jest używany do niepodważalnej identyfikacji użytkowników i grup LDAP. Również wewnętrzna nazwa użytkownika zostanie stworzona na bazie UUID, jeśli nie zostanie podana powyżej. Możesz nadpisać to ustawienie i użyć atrybutu wedle uznania. Musisz się jednak upewnić, że atrybut ten może zostać pobrany zarówno dla użytkowników, jak i grup i jest unikalny. Pozostaw puste dla domyślnego zachowania. Zmiany będą miały wpływ tylko na nowo przypisanych (dodanych) użytkowników i grupy LDAP.",
-"UUID Attribute for Users:" => "Atrybuty UUID dla użytkowników:",
-"UUID Attribute for Groups:" => "Atrybuty UUID dla grup:",
-"Username-LDAP User Mapping" => "Mapowanie użytkownika LDAP",
-"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." => "Nazwy użytkowników są używane w celu przechowywania i przypisywania (meta) danych. Aby dokładnie zidentyfikować i rozpoznać użytkowników, każdy użytkownik LDAP będzie miał wewnętrzną nazwę. To wymaga utworzenia przypisania nazwy użytkownika do użytkownika LDAP. Utworzona nazwa użytkownika jet przypisywana do UUID użytkownika LDAP. Dodatkowo DN jest również buforowany aby zmniejszyć interakcję z LDAP, ale nie jest używany do identyfikacji. Jeśli DN się zmieni, zmiany zostaną odnalezione. Wewnętrzny użytkownik jest używany we wszystkich przypadkach. Wyczyszczenie mapowań spowoduje pozostawienie wszędzie resztek informacji. Wyczyszczenie mapowań nie jest wrażliwe na konfigurację, wpływa ono na wszystkie konfiguracje LDAP! Nigdy nie czyść mapowań w środowisku produkcyjnym, tylko podczas testów lub w fazie eksperymentalnej. ",
-"Clear Username-LDAP User Mapping" => "Czyść Mapowanie użytkownika LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Czyść Mapowanie nazwy grupy LDAP"
-);
-$PLURAL_FORMS = "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_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js
new file mode 100644
index 00000000000..dfd1981390c
--- /dev/null
+++ b/apps/user_ldap/l10n/pt_BR.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Falha ao limpar os mapeamentos.",
+    "Failed to delete the server configuration" : "Falha ao deletar a configuração do servidor",
+    "The configuration is valid and the connection could be established!" : "A configuração é válida e a conexão foi estabelecida!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Configuração inválida. Por favor, dê uma olhada nos logs para mais detalhes.",
+    "No action specified" : "Nenhuma ação especificada",
+    "No configuration specified" : "Nenhuma configuração especificada",
+    "No data specified" : "Não há dados especificados",
+    " Could not set configuration %s" : "Não foi possível definir a configuração %s",
+    "Deletion failed" : "Remoção falhou",
+    "Take over settings from recent server configuration?" : "Tomar parámetros de recente configuração de servidor?",
+    "Keep settings?" : "Manter configurações?",
+    "{nthServer}. Server" : "Servidor {nthServer}.",
+    "Cannot add server configuration" : "Impossível adicionar a configuração do servidor",
+    "mappings cleared" : "mapeamentos limpos",
+    "Success" : "Sucesso",
+    "Error" : "Erro",
+    "Please specify a Base DN" : "Por favor, especifique a Base DN",
+    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
+    "Please specify the port" : "Por favor, especifique a porta",
+    "Configuration OK" : "Configuração OK",
+    "Configuration incorrect" : "Configuração incorreta",
+    "Configuration incomplete" : "Configuração incompleta",
+    "Select groups" : "Selecionar grupos",
+    "Select object classes" : "Selecione classes de objetos",
+    "Select attributes" : "Selecione os atributos",
+    "Connection test succeeded" : "Teste de conexão bem sucedida",
+    "Connection test failed" : "Teste de conexão falhou",
+    "Do you really want to delete the current Server Configuration?" : "Você quer realmente deletar as atuais Configurações de Servidor?",
+    "Confirm Deletion" : "Confirmar Exclusão",
+    "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"],
+    "_%s user found_::_%s users found_" : ["usuário %s encontrado","usuários %s encontrados"],
+    "Could not find the desired feature" : "Não foi possível encontrar a função desejada",
+    "Invalid Host" : "Host Inválido",
+    "Server" : "Servidor",
+    "User Filter" : "Filtro de Usuário",
+    "Login Filter" : "Filtro de Login",
+    "Group Filter" : "Filtro de Grupo",
+    "Save" : "Salvar",
+    "Test Configuration" : "Teste de Configuração",
+    "Help" : "Ajuda",
+    "Groups meeting these criteria are available in %s:" : "Grupos que satisfazem estes critérios estão disponíveis em %s:",
+    "only those object classes:" : "apenas essas classes de objetos:",
+    "only from those groups:" : "apenas desses grupos:",
+    "Edit raw filter instead" : "Editar filtro raw ao invéz",
+    "Raw LDAP filter" : "Filtro LDAP Raw",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
+    "Test Filter" : "Filtro Teste",
+    "groups found" : "grupos encontrados",
+    "Users login with this attribute:" : "Usuários entrar com este atributo:",
+    "LDAP Username:" : "Usuário LDAP:",
+    "LDAP Email Address:" : "LDAP Endereço de E-mail:",
+    "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 ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor:",
+    "Add Server Configuration" : "Adicionar Configuração de Servidor",
+    "Delete Configuration" : "Excluir Configuração",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
+    "Port" : "Porta",
+    "User DN" : "DN Usuário",
+    "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." : "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios.",
+    "Password" : "Senha",
+    "For anonymous access, leave DN and Password empty." : "Para acesso anônimo, deixe DN e Senha vazios.",
+    "One Base DN per line" : "Uma base DN por linha",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Você pode especificar DN Base para usuários e grupos na guia Avançada",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita pedidos LDAP automáticos. Melhor para configurações maiores, mas requer algum conhecimento LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)",
+    "Limit %s access to users meeting these criteria:" : "Limitar o acesso %s para usuários que satisfazem esses critérios:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
+    "users found" : "usuários encontrados",
+    "Saving" : "Salvando",
+    "Back" : "Voltar",
+    "Continue" : "Continuar",
+    "Expert" : "Especialista",
+    "Advanced" : "Avançado",
+    "<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo.",
+    "Connection Settings" : "Configurações de Conexão",
+    "Configuration Active" : "Configuração Ativa",
+    "When unchecked, this configuration will be skipped." : "Quando não marcada, esta configuração será ignorada.",
+    "Backup (Replica) Host" : "Host de Backup (Réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal.",
+    "Backup (Replica) Port" : "Porta do Backup (Réplica)",
+    "Disable Main Server" : "Desativar Servidor Principal",
+    "Only connect to the replica server." : "Conectar-se somente ao servidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor LDAP(Windows) não distigue maiúscula de minúscula",
+    "Turn off SSL certificate validation." : "Desligar validação de certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "em segundos. Uma mudança esvaziará o cache.",
+    "Directory Settings" : "Configurações de Diretório",
+    "User Display Name Field" : "Campo Nome de Exibição de Usuário",
+    "The LDAP attribute to use to generate the user's display name." : "O atributo LDAP para usar para gerar o nome de exibição do usuário.",
+    "Base User Tree" : "Árvore de Usuário Base",
+    "One User Base DN per line" : "Um usuário-base DN por linha",
+    "User Search Attributes" : "Atributos de Busca de Usuário",
+    "Optional; one attribute per line" : "Opcional; um atributo por linha",
+    "Group Display Name Field" : "Campo Nome de Exibição de Grupo",
+    "The LDAP attribute to use to generate the groups's display name." : "O atributo LDAP para usar para gerar o nome de apresentação do grupo.",
+    "Base Group Tree" : "Árvore de Grupo Base",
+    "One Group Base DN per line" : "Um grupo-base DN por linha",
+    "Group Search Attributes" : "Atributos de Busca de Grupo",
+    "Group-Member association" : "Associação Grupo-Membro",
+    "Nested Groups" : "Grupos Aninhados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Quando habilitado, os grupos que contêm os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
+    "Paging chunksize" : "Bloco de paginação",
+    "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.)" : "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como usuário ou grupo de enumeração. (Defini-lo 0 desativa paginada pesquisas LDAP nessas situações.)",
+    "Special Attributes" : "Atributos Especiais",
+    "Quota Field" : "Campo de Cota",
+    "Quota Default" : "Cota Padrão",
+    "in bytes" : "em bytes",
+    "Email Field" : "Campo de Email",
+    "User Home Folder Naming Rule" : "Regra para Nome da Pasta Pessoal do Usuário",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.",
+    "Internal Username" : "Nome de usuário interno",
+    "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." : "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é único e que caracteres não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres são substituídos por seus correspondentes em ASCII ou simplesmente serão omitidos. Em caso de colisão um número será adicionado/aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta \"home\" do usuário. É também parte de URLs remotas, por exemplo, para todos as instâncias *DAV. Com esta definição, o comportamento padrão pode ser sobrescrito. Para alcançar um comportamento semelhante ao de antes do ownCloud 5, forneça o atributo do nome de exibição do usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários LDAP recém mapeados (adicionados).",
+    "Internal Username Attribute:" : "Atributo Interno de Nome de Usuário:",
+    "Override UUID detection" : "Substituir detecção 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." : "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados).",
+    "UUID Attribute for Users:" : "UUID Atributos para Usuários:",
+    "UUID Attribute for Groups:" : "UUID Atributos para Grupos:",
+    "Username-LDAP User Mapping" : "Usuário-LDAP Mapeamento de Usuário",
+    "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." : "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental.",
+    "Clear Username-LDAP User Mapping" : "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json
new file mode 100644
index 00000000000..694d350feba
--- /dev/null
+++ b/apps/user_ldap/l10n/pt_BR.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Falha ao limpar os mapeamentos.",
+    "Failed to delete the server configuration" : "Falha ao deletar a configuração do servidor",
+    "The configuration is valid and the connection could be established!" : "A configuração é válida e a conexão foi estabelecida!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Configuração inválida. Por favor, dê uma olhada nos logs para mais detalhes.",
+    "No action specified" : "Nenhuma ação especificada",
+    "No configuration specified" : "Nenhuma configuração especificada",
+    "No data specified" : "Não há dados especificados",
+    " Could not set configuration %s" : "Não foi possível definir a configuração %s",
+    "Deletion failed" : "Remoção falhou",
+    "Take over settings from recent server configuration?" : "Tomar parámetros de recente configuração de servidor?",
+    "Keep settings?" : "Manter configurações?",
+    "{nthServer}. Server" : "Servidor {nthServer}.",
+    "Cannot add server configuration" : "Impossível adicionar a configuração do servidor",
+    "mappings cleared" : "mapeamentos limpos",
+    "Success" : "Sucesso",
+    "Error" : "Erro",
+    "Please specify a Base DN" : "Por favor, especifique a Base DN",
+    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
+    "Please specify the port" : "Por favor, especifique a porta",
+    "Configuration OK" : "Configuração OK",
+    "Configuration incorrect" : "Configuração incorreta",
+    "Configuration incomplete" : "Configuração incompleta",
+    "Select groups" : "Selecionar grupos",
+    "Select object classes" : "Selecione classes de objetos",
+    "Select attributes" : "Selecione os atributos",
+    "Connection test succeeded" : "Teste de conexão bem sucedida",
+    "Connection test failed" : "Teste de conexão falhou",
+    "Do you really want to delete the current Server Configuration?" : "Você quer realmente deletar as atuais Configurações de Servidor?",
+    "Confirm Deletion" : "Confirmar Exclusão",
+    "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"],
+    "_%s user found_::_%s users found_" : ["usuário %s encontrado","usuários %s encontrados"],
+    "Could not find the desired feature" : "Não foi possível encontrar a função desejada",
+    "Invalid Host" : "Host Inválido",
+    "Server" : "Servidor",
+    "User Filter" : "Filtro de Usuário",
+    "Login Filter" : "Filtro de Login",
+    "Group Filter" : "Filtro de Grupo",
+    "Save" : "Salvar",
+    "Test Configuration" : "Teste de Configuração",
+    "Help" : "Ajuda",
+    "Groups meeting these criteria are available in %s:" : "Grupos que satisfazem estes critérios estão disponíveis em %s:",
+    "only those object classes:" : "apenas essas classes de objetos:",
+    "only from those groups:" : "apenas desses grupos:",
+    "Edit raw filter instead" : "Editar filtro raw ao invéz",
+    "Raw LDAP filter" : "Filtro LDAP Raw",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
+    "Test Filter" : "Filtro Teste",
+    "groups found" : "grupos encontrados",
+    "Users login with this attribute:" : "Usuários entrar com este atributo:",
+    "LDAP Username:" : "Usuário LDAP:",
+    "LDAP Email Address:" : "LDAP Endereço de E-mail:",
+    "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 ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servidor:",
+    "Add Server Configuration" : "Adicionar Configuração de Servidor",
+    "Delete Configuration" : "Excluir Configuração",
+    "Host" : "Host",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
+    "Port" : "Porta",
+    "User DN" : "DN Usuário",
+    "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." : "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios.",
+    "Password" : "Senha",
+    "For anonymous access, leave DN and Password empty." : "Para acesso anônimo, deixe DN e Senha vazios.",
+    "One Base DN per line" : "Uma base DN por linha",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Você pode especificar DN Base para usuários e grupos na guia Avançada",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita pedidos LDAP automáticos. Melhor para configurações maiores, mas requer algum conhecimento LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)",
+    "Limit %s access to users meeting these criteria:" : "Limitar o acesso %s para usuários que satisfazem esses critérios:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
+    "users found" : "usuários encontrados",
+    "Saving" : "Salvando",
+    "Back" : "Voltar",
+    "Continue" : "Continuar",
+    "Expert" : "Especialista",
+    "Advanced" : "Avançado",
+    "<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo.",
+    "Connection Settings" : "Configurações de Conexão",
+    "Configuration Active" : "Configuração Ativa",
+    "When unchecked, this configuration will be skipped." : "Quando não marcada, esta configuração será ignorada.",
+    "Backup (Replica) Host" : "Host de Backup (Réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal.",
+    "Backup (Replica) Port" : "Porta do Backup (Réplica)",
+    "Disable Main Server" : "Desativar Servidor Principal",
+    "Only connect to the replica server." : "Conectar-se somente ao servidor de réplica.",
+    "Case insensitive LDAP server (Windows)" : "Servidor LDAP(Windows) não distigue maiúscula de minúscula",
+    "Turn off SSL certificate validation." : "Desligar validação de certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "em segundos. Uma mudança esvaziará o cache.",
+    "Directory Settings" : "Configurações de Diretório",
+    "User Display Name Field" : "Campo Nome de Exibição de Usuário",
+    "The LDAP attribute to use to generate the user's display name." : "O atributo LDAP para usar para gerar o nome de exibição do usuário.",
+    "Base User Tree" : "Árvore de Usuário Base",
+    "One User Base DN per line" : "Um usuário-base DN por linha",
+    "User Search Attributes" : "Atributos de Busca de Usuário",
+    "Optional; one attribute per line" : "Opcional; um atributo por linha",
+    "Group Display Name Field" : "Campo Nome de Exibição de Grupo",
+    "The LDAP attribute to use to generate the groups's display name." : "O atributo LDAP para usar para gerar o nome de apresentação do grupo.",
+    "Base Group Tree" : "Árvore de Grupo Base",
+    "One Group Base DN per line" : "Um grupo-base DN por linha",
+    "Group Search Attributes" : "Atributos de Busca de Grupo",
+    "Group-Member association" : "Associação Grupo-Membro",
+    "Nested Groups" : "Grupos Aninhados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Quando habilitado, os grupos que contêm os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
+    "Paging chunksize" : "Bloco de paginação",
+    "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.)" : "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como usuário ou grupo de enumeração. (Defini-lo 0 desativa paginada pesquisas LDAP nessas situações.)",
+    "Special Attributes" : "Atributos Especiais",
+    "Quota Field" : "Campo de Cota",
+    "Quota Default" : "Cota Padrão",
+    "in bytes" : "em bytes",
+    "Email Field" : "Campo de Email",
+    "User Home Folder Naming Rule" : "Regra para Nome da Pasta Pessoal do Usuário",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.",
+    "Internal Username" : "Nome de usuário interno",
+    "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." : "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é único e que caracteres não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres são substituídos por seus correspondentes em ASCII ou simplesmente serão omitidos. Em caso de colisão um número será adicionado/aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta \"home\" do usuário. É também parte de URLs remotas, por exemplo, para todos as instâncias *DAV. Com esta definição, o comportamento padrão pode ser sobrescrito. Para alcançar um comportamento semelhante ao de antes do ownCloud 5, forneça o atributo do nome de exibição do usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários LDAP recém mapeados (adicionados).",
+    "Internal Username Attribute:" : "Atributo Interno de Nome de Usuário:",
+    "Override UUID detection" : "Substituir detecção 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." : "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados).",
+    "UUID Attribute for Users:" : "UUID Atributos para Usuários:",
+    "UUID Attribute for Groups:" : "UUID Atributos para Grupos:",
+    "Username-LDAP User Mapping" : "Usuário-LDAP Mapeamento de Usuário",
+    "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." : "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental.",
+    "Clear Username-LDAP User Mapping" : "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/pt_BR.php b/apps/user_ldap/l10n/pt_BR.php
deleted file mode 100644
index 870cc7ebca9..00000000000
--- a/apps/user_ldap/l10n/pt_BR.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Falha ao limpar os mapeamentos.",
-"Failed to delete the server configuration" => "Falha ao deletar a configuração do servidor",
-"The configuration is valid and the connection could be established!" => "A configuração é válida e a conexão foi estabelecida!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "A configuração é válida, mas o Bind falhou. Confira as configurações do servidor e as credenciais.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Configuração inválida. Por favor, dê uma olhada nos logs para mais detalhes.",
-"No action specified" => "Nenhuma ação especificada",
-"No configuration specified" => "Nenhuma configuração especificada",
-"No data specified" => "Não há dados especificados",
-" Could not set configuration %s" => "Não foi possível definir a configuração %s",
-"Deletion failed" => "Remoção falhou",
-"Take over settings from recent server configuration?" => "Tomar parámetros de recente configuração de servidor?",
-"Keep settings?" => "Manter configurações?",
-"{nthServer}. Server" => "Servidor {nthServer}.",
-"Cannot add server configuration" => "Impossível adicionar a configuração do servidor",
-"mappings cleared" => "mapeamentos limpos",
-"Success" => "Sucesso",
-"Error" => "Erro",
-"Please specify a Base DN" => "Por favor, especifique a Base DN",
-"Could not determine Base DN" => "Não foi possível determinar a Base DN",
-"Please specify the port" => "Por favor, especifique a porta",
-"Configuration OK" => "Configuração OK",
-"Configuration incorrect" => "Configuração incorreta",
-"Configuration incomplete" => "Configuração incompleta",
-"Select groups" => "Selecionar grupos",
-"Select object classes" => "Selecione classes de objetos",
-"Select attributes" => "Selecione os atributos",
-"Connection test succeeded" => "Teste de conexão bem sucedida",
-"Connection test failed" => "Teste de conexão falhou",
-"Do you really want to delete the current Server Configuration?" => "Você quer realmente deletar as atuais Configurações de Servidor?",
-"Confirm Deletion" => "Confirmar Exclusão",
-"_%s group found_::_%s groups found_" => array("grupo% s encontrado","grupos% s encontrado"),
-"_%s user found_::_%s users found_" => array("usuário %s encontrado","usuários %s encontrados"),
-"Could not find the desired feature" => "Não foi possível encontrar a função desejada",
-"Invalid Host" => "Host Inválido",
-"Server" => "Servidor",
-"User Filter" => "Filtro de Usuário",
-"Login Filter" => "Filtro de Login",
-"Group Filter" => "Filtro de Grupo",
-"Save" => "Salvar",
-"Test Configuration" => "Teste de Configuração",
-"Help" => "Ajuda",
-"Groups meeting these criteria are available in %s:" => "Grupos que satisfazem estes critérios estão disponíveis em %s:",
-"only those object classes:" => "apenas essas classes de objetos:",
-"only from those groups:" => "apenas desses grupos:",
-"Edit raw filter instead" => "Editar filtro raw ao invéz",
-"Raw LDAP filter" => "Filtro LDAP Raw",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "O filtro especifica quais grupos LDAP devem ter acesso à instância do %s.",
-"Test Filter" => "Filtro Teste",
-"groups found" => "grupos encontrados",
-"Users login with this attribute:" => "Usuários entrar com este atributo:",
-"LDAP Username:" => "Usuário LDAP:",
-"LDAP Email Address:" => "LDAP Endereço de E-mail:",
-"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 ser aplicado, quando o login for feito. %%uid substitui o nome do usuário na ação de login. Exemplo: \"uid=%%uid\"",
-"1. Server" => "1. Servidor",
-"%s. Server:" => "%s. Servidor:",
-"Add Server Configuration" => "Adicionar Configuração de Servidor",
-"Delete Configuration" => "Excluir Configuração",
-"Host" => "Host",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://",
-"Port" => "Porta",
-"User DN" => "DN Usuário",
-"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." => "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios.",
-"Password" => "Senha",
-"For anonymous access, leave DN and Password empty." => "Para acesso anônimo, deixe DN e Senha vazios.",
-"One Base DN per line" => "Uma base DN por linha",
-"You can specify Base DN for users and groups in the Advanced tab" => "Você pode especificar DN Base para usuários e grupos na guia Avançada",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Evita pedidos LDAP automáticos. Melhor para configurações maiores, mas requer algum conhecimento LDAP.",
-"Manually enter LDAP filters (recommended for large directories)" => "Inserir manualmente filtros LDAP (recomendado para grandes diretórios)",
-"Limit %s access to users meeting these criteria:" => "Limitar o acesso %s para usuários que satisfazem esses critérios:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "O filtro especifica quais usuários LDAP devem ter acesso à instância do %s.",
-"users found" => "usuários encontrados",
-"Saving" => "Salvando",
-"Back" => "Voltar",
-"Continue" => "Continuar",
-"Expert" => "Especialista",
-"Advanced" => "Avançado",
-"<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, o backend não funcionará. Por favor, peça ao seu administrador do sistema para instalá-lo.",
-"Connection Settings" => "Configurações de Conexão",
-"Configuration Active" => "Configuração Ativa",
-"When unchecked, this configuration will be skipped." => "Quando não marcada, esta configuração será ignorada.",
-"Backup (Replica) Host" => "Host de Backup (Réplica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Defina um servidor de backup opcional. Ele deverá ser uma réplica do servidor LDAP/AD principal.",
-"Backup (Replica) Port" => "Porta do Backup (Réplica)",
-"Disable Main Server" => "Desativar Servidor Principal",
-"Only connect to the replica server." => "Conectar-se somente ao servidor de réplica.",
-"Case insensitive LDAP server (Windows)" => "Servidor LDAP(Windows) não distigue maiúscula de minúscula",
-"Turn off SSL certificate validation." => "Desligar validação de certificado SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! Se a conexão só funciona com esta opção, importar o certificado SSL do servidor LDAP em seu servidor %s.",
-"Cache Time-To-Live" => "Cache Time-To-Live",
-"in seconds. A change empties the cache." => "em segundos. Uma mudança esvaziará o cache.",
-"Directory Settings" => "Configurações de Diretório",
-"User Display Name Field" => "Campo Nome de Exibição de Usuário",
-"The LDAP attribute to use to generate the user's display name." => "O atributo LDAP para usar para gerar o nome de exibição do usuário.",
-"Base User Tree" => "Árvore de Usuário Base",
-"One User Base DN per line" => "Um usuário-base DN por linha",
-"User Search Attributes" => "Atributos de Busca de Usuário",
-"Optional; one attribute per line" => "Opcional; um atributo por linha",
-"Group Display Name Field" => "Campo Nome de Exibição de Grupo",
-"The LDAP attribute to use to generate the groups's display name." => "O atributo LDAP para usar para gerar o nome de apresentação do grupo.",
-"Base Group Tree" => "Árvore de Grupo Base",
-"One Group Base DN per line" => "Um grupo-base DN por linha",
-"Group Search Attributes" => "Atributos de Busca de Grupo",
-"Group-Member association" => "Associação Grupo-Membro",
-"Nested Groups" => "Grupos Aninhados",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando habilitado, os grupos que contêm os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
-"Paging chunksize" => "Bloco de paginação",
-"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.)" => "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como usuário ou grupo de enumeração. (Defini-lo 0 desativa paginada pesquisas LDAP nessas situações.)",
-"Special Attributes" => "Atributos Especiais",
-"Quota Field" => "Campo de Cota",
-"Quota Default" => "Cota Padrão",
-"in bytes" => "em bytes",
-"Email Field" => "Campo de Email",
-"User Home Folder Naming Rule" => "Regra para Nome da Pasta Pessoal do Usuário",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD.",
-"Internal Username" => "Nome de usuário interno",
-"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." => "Por padrão, o nome de usuário interno será criado a partir do atributo UUID. Ele garante que o nome de usuário é único e que caracteres não precisam ser convertidos. O nome de usuário interno tem a restrição de que apenas estes caracteres são permitidos: [a-zA-Z0-9_.@- ]. Outros caracteres são substituídos por seus correspondentes em ASCII ou simplesmente serão omitidos. Em caso de colisão um número será adicionado/aumentado. O nome de usuário interno é usado para identificar um usuário internamente. É também o nome padrão da pasta \"home\" do usuário. É também parte de URLs remotas, por exemplo, para todos as instâncias *DAV. Com esta definição, o comportamento padrão pode ser sobrescrito. Para alcançar um comportamento semelhante ao de antes do ownCloud 5, forneça o atributo do nome de exibição do usuário no campo seguinte. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários LDAP recém mapeados (adicionados).",
-"Internal Username Attribute:" => "Atributo Interno de Nome de Usuário:",
-"Override UUID detection" => "Substituir detecção 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." => "Por padrão, o atributo UUID é detectado automaticamente. O atributo UUID é usado para identificar, sem dúvidas, os usuários e grupos LDAP. Além disso, o nome de usuário interno será criado com base no UUID, se não especificado acima. Você pode substituir a configuração e passar um atributo de sua escolha. Você deve certificar-se de que o atributo de sua escolha pode ser lido tanto para usuários como para grupos, e que seja único. Deixe-o vazio para o comportamento padrão. As alterações terão efeito apenas para usuários e grupos LDAP recém mapeados (adicionados).",
-"UUID Attribute for Users:" => "UUID Atributos para Usuários:",
-"UUID Attribute for Groups:" => "UUID Atributos para Grupos:",
-"Username-LDAP User Mapping" => "Usuário-LDAP Mapeamento de Usuário",
-"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." => "Nomes de usuários sãi usados para armazenar e atribuir (meta) dados. A fim de identificar com precisão e reconhecer usuários, cada usuário LDAP terá um nome de usuário interno. Isso requer um mapeamento nome de usuário para usuário LDAP. O nome de usuário criado é mapeado para o UUID do usuário LDAP. Adicionalmente, o DN fica em cache, assim como para reduzir a interação LDAP, mas não é utilizado para a identificação. Se o DN muda, as mudanças serão encontradas. O nome de usuário interno é utilizado em todo lugar. Limpar os mapeamentos não influencia a configuração. Limpar os mapeamentos deixará rastros em todo lugar. Limpar os mapeamentos não influencia a configuração, mas afeta as configurações LDAP! Somente limpe os mapeamentos em embiente de testes ou em estágio experimental.",
-"Clear Username-LDAP User Mapping" => "Limpar Mapeamento de Usuário Nome de Usuário-LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Limpar NomedoGrupo-LDAP Mapeamento do Grupo"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
new file mode 100644
index 00000000000..98fe1d16e00
--- /dev/null
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "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 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.",
+    "No action specified" : "Nenhuma acção especificada",
+    "No configuration specified" : "Nenhuma configuração especificada",
+    "No data specified" : "Nenhuma data especificada",
+    " Could not set configuration %s" : "Não foi possível definir a configuração %s",
+    "Deletion failed" : "Erro ao apagar",
+    "Take over settings from recent server configuration?" : "Assumir as configurações da configuração do servidor mais recente?",
+    "Keep settings?" : "Manter as definições?",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
+    "Cannot add server configuration" : "Não foi possível adicionar as configurações do servidor.",
+    "mappings cleared" : "Mapas limpos",
+    "Success" : "Sucesso",
+    "Error" : "Erro",
+    "Please specify a Base DN" : "Por favor indique a Base DN",
+    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
+    "Please specify the port" : "Por favor indique a porta",
+    "Configuration OK" : "Configuração OK",
+    "Configuration incorrect" : "Configuração incorreta",
+    "Configuration incomplete" : "Configuração incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Selecionar classes de objetos",
+    "Select attributes" : "Selecionar atributos",
+    "Connection test succeeded" : "Teste de ligação com sucesso.",
+    "Connection test failed" : "Erro no teste de ligação.",
+    "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?",
+    "Confirm Deletion" : "Confirmar a operação de apagar",
+    "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
+    "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
+    "Could not find the desired feature" : "Não se encontrou a função desejada",
+    "Invalid Host" : "Hospedeiro Inválido",
+    "Server" : "Servidor",
+    "User Filter" : "Filtro de utilizadores",
+    "Login Filter" : "Filtro de Login",
+    "Group Filter" : "Filtrar por grupo",
+    "Save" : "Guardar",
+    "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:",
+    "only those object classes:" : "apenas essas classes de objetos:",
+    "only from those groups:" : "apenas desses grupos:",
+    "Edit raw filter instead" : "Editar filtro raw em vez disso",
+    "Raw LDAP filter" : "Filtro LDAP Raw",
+    "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.",
+    "Test Filter" : "Testar Filtro",
+    "groups found" : "grupos encontrados",
+    "Users login with this attribute:" : "Utilizadores entrar com este atributo:",
+    "LDAP Username:" : "Nome de utilizador LDAP:",
+    "LDAP Email Address:" : "Endereço de correio eletrónico LDAP:",
+    "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\"",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servvidor",
+    "Add Server Configuration" : "Adicionar configurações do servidor",
+    "Delete Configuration" : "Apagar Configuração",
+    "Host" : "Anfitrião",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
+    "Port" : "Porto",
+    "User DN" : "DN do utilizador",
+    "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." : "O DN to cliente ",
+    "Password" : "Password",
+    "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",
+    "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.",
+    "users found" : "utilizadores encontrados",
+    "Saving" : "Guardando",
+    "Back" : "Voltar",
+    "Continue" : "Continuar",
+    "Expert" : "Perito",
+    "Advanced" : "Avançado",
+    "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar.",
+    "Connection Settings" : "Definições de ligação",
+    "Configuration Active" : "Configuração activa",
+    "When unchecked, this configuration will be skipped." : "Se não estiver marcada, esta definição não será tida em conta.",
+    "Backup (Replica) Host" : "Servidor de Backup (Réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD ",
+    "Backup (Replica) Port" : "Porta do servidor de backup (Replica)",
+    "Disable Main Server" : "Desactivar servidor principal",
+    "Only connect to the replica server." : "Ligar apenas ao servidor de réplicas.",
+    "Case insensitive LDAP server (Windows)" : "Servidor LDAP (Windows) não é sensível a maiúsculas.",
+    "Turn off SSL certificate validation." : "Desligar a validação de certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s.",
+    "Cache Time-To-Live" : "Cache do tempo de vida dos objetos no servidor",
+    "in seconds. A change empties the cache." : "em segundos. Uma alteração esvazia a cache.",
+    "Directory Settings" : "Definições de directorias",
+    "User Display Name Field" : "Mostrador do nome de utilizador.",
+    "The LDAP attribute to use to generate the user's display name." : "Atributo LDAP para gerar o nome de utilizador do ownCloud.",
+    "Base User Tree" : "Base da árvore de utilizadores.",
+    "One User Base DN per line" : "Uma base de utilizador DN por linha",
+    "User Search Attributes" : "Utilizar atributos de pesquisa",
+    "Optional; one attribute per line" : "Opcional; Um atributo por linha",
+    "Group Display Name Field" : "Mostrador do nome do grupo.",
+    "The LDAP attribute to use to generate the groups's display name." : "Atributo LDAP para gerar o nome do grupo do ownCloud.",
+    "Base Group Tree" : "Base da árvore de grupos.",
+    "One Group Base DN per line" : "Uma base de grupo DN por linha",
+    "Group Search Attributes" : "Atributos de pesquisa de grupo",
+    "Group-Member association" : "Associar utilizador ao grupo.",
+    "Nested Groups" : "Grupos agrupados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
+    "Paging chunksize" : "Bloco de paginação",
+    "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.)" : "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)",
+    "Special Attributes" : "Atributos especiais",
+    "Quota Field" : "Quota",
+    "Quota Default" : "Quota padrão",
+    "in bytes" : "em bytes",
+    "Email Field" : "Campo de email",
+    "User Home Folder Naming Rule" : "Regra da pasta inicial do utilizador",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
+    "Internal Username" : "Nome de utilizador interno",
+    "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." : "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituídos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP.",
+    "Internal Username Attribute:" : "Atributo do nome de utilizador interno",
+    "Override UUID detection" : "Passar a detecção do 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." : "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).",
+    "UUID Attribute for Users:" : "Atributo UUID para utilizadores:",
+    "UUID Attribute for Groups:" : "Atributo UUID para grupos:",
+    "Username-LDAP User Mapping" : "Mapeamento do utilizador LDAP",
+    "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." : "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
+    "Clear Username-LDAP User Mapping" : "Limpar mapeamento do utilizador-LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Limpar o mapeamento do nome de grupo LDAP"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
new file mode 100644
index 00000000000..1bcbfe018bf
--- /dev/null
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -0,0 +1,130 @@
+{ "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 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.",
+    "No action specified" : "Nenhuma acção especificada",
+    "No configuration specified" : "Nenhuma configuração especificada",
+    "No data specified" : "Nenhuma data especificada",
+    " Could not set configuration %s" : "Não foi possível definir a configuração %s",
+    "Deletion failed" : "Erro ao apagar",
+    "Take over settings from recent server configuration?" : "Assumir as configurações da configuração do servidor mais recente?",
+    "Keep settings?" : "Manter as definições?",
+    "{nthServer}. Server" : "{nthServer}. Servidor",
+    "Cannot add server configuration" : "Não foi possível adicionar as configurações do servidor.",
+    "mappings cleared" : "Mapas limpos",
+    "Success" : "Sucesso",
+    "Error" : "Erro",
+    "Please specify a Base DN" : "Por favor indique a Base DN",
+    "Could not determine Base DN" : "Não foi possível determinar a Base DN",
+    "Please specify the port" : "Por favor indique a porta",
+    "Configuration OK" : "Configuração OK",
+    "Configuration incorrect" : "Configuração incorreta",
+    "Configuration incomplete" : "Configuração incompleta",
+    "Select groups" : "Seleccionar grupos",
+    "Select object classes" : "Selecionar classes de objetos",
+    "Select attributes" : "Selecionar atributos",
+    "Connection test succeeded" : "Teste de ligação com sucesso.",
+    "Connection test failed" : "Erro no teste de ligação.",
+    "Do you really want to delete the current Server Configuration?" : "Deseja realmente apagar as configurações de servidor actuais?",
+    "Confirm Deletion" : "Confirmar a operação de apagar",
+    "_%s group found_::_%s groups found_" : ["%s grupo encontrado","%s grupos encontrados"],
+    "_%s user found_::_%s users found_" : ["%s utilizador encontrado","%s utilizadores encontrados"],
+    "Could not find the desired feature" : "Não se encontrou a função desejada",
+    "Invalid Host" : "Hospedeiro Inválido",
+    "Server" : "Servidor",
+    "User Filter" : "Filtro de utilizadores",
+    "Login Filter" : "Filtro de Login",
+    "Group Filter" : "Filtrar por grupo",
+    "Save" : "Guardar",
+    "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:",
+    "only those object classes:" : "apenas essas classes de objetos:",
+    "only from those groups:" : "apenas desses grupos:",
+    "Edit raw filter instead" : "Editar filtro raw em vez disso",
+    "Raw LDAP filter" : "Filtro LDAP Raw",
+    "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.",
+    "Test Filter" : "Testar Filtro",
+    "groups found" : "grupos encontrados",
+    "Users login with this attribute:" : "Utilizadores entrar com este atributo:",
+    "LDAP Username:" : "Nome de utilizador LDAP:",
+    "LDAP Email Address:" : "Endereço de correio eletrónico LDAP:",
+    "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\"",
+    "1. Server" : "1. Servidor",
+    "%s. Server:" : "%s. Servvidor",
+    "Add Server Configuration" : "Adicionar configurações do servidor",
+    "Delete Configuration" : "Apagar Configuração",
+    "Host" : "Anfitrião",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
+    "Port" : "Porto",
+    "User DN" : "DN do utilizador",
+    "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." : "O DN to cliente ",
+    "Password" : "Password",
+    "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",
+    "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.",
+    "users found" : "utilizadores encontrados",
+    "Saving" : "Guardando",
+    "Back" : "Voltar",
+    "Continue" : "Continuar",
+    "Expert" : "Perito",
+    "Advanced" : "Avançado",
+    "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar.",
+    "Connection Settings" : "Definições de ligação",
+    "Configuration Active" : "Configuração activa",
+    "When unchecked, this configuration will be skipped." : "Se não estiver marcada, esta definição não será tida em conta.",
+    "Backup (Replica) Host" : "Servidor de Backup (Réplica)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD ",
+    "Backup (Replica) Port" : "Porta do servidor de backup (Replica)",
+    "Disable Main Server" : "Desactivar servidor principal",
+    "Only connect to the replica server." : "Ligar apenas ao servidor de réplicas.",
+    "Case insensitive LDAP server (Windows)" : "Servidor LDAP (Windows) não é sensível a maiúsculas.",
+    "Turn off SSL certificate validation." : "Desligar a validação de certificado SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s.",
+    "Cache Time-To-Live" : "Cache do tempo de vida dos objetos no servidor",
+    "in seconds. A change empties the cache." : "em segundos. Uma alteração esvazia a cache.",
+    "Directory Settings" : "Definições de directorias",
+    "User Display Name Field" : "Mostrador do nome de utilizador.",
+    "The LDAP attribute to use to generate the user's display name." : "Atributo LDAP para gerar o nome de utilizador do ownCloud.",
+    "Base User Tree" : "Base da árvore de utilizadores.",
+    "One User Base DN per line" : "Uma base de utilizador DN por linha",
+    "User Search Attributes" : "Utilizar atributos de pesquisa",
+    "Optional; one attribute per line" : "Opcional; Um atributo por linha",
+    "Group Display Name Field" : "Mostrador do nome do grupo.",
+    "The LDAP attribute to use to generate the groups's display name." : "Atributo LDAP para gerar o nome do grupo do ownCloud.",
+    "Base Group Tree" : "Base da árvore de grupos.",
+    "One Group Base DN per line" : "Uma base de grupo DN por linha",
+    "Group Search Attributes" : "Atributos de pesquisa de grupo",
+    "Group-Member association" : "Associar utilizador ao grupo.",
+    "Nested Groups" : "Grupos agrupados",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
+    "Paging chunksize" : "Bloco de paginação",
+    "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.)" : "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)",
+    "Special Attributes" : "Atributos especiais",
+    "Quota Field" : "Quota",
+    "Quota Default" : "Quota padrão",
+    "in bytes" : "em bytes",
+    "Email Field" : "Campo de email",
+    "User Home Folder Naming Rule" : "Regra da pasta inicial do utilizador",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
+    "Internal Username" : "Nome de utilizador interno",
+    "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." : "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituídos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP.",
+    "Internal Username Attribute:" : "Atributo do nome de utilizador interno",
+    "Override UUID detection" : "Passar a detecção do 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." : "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).",
+    "UUID Attribute for Users:" : "Atributo UUID para utilizadores:",
+    "UUID Attribute for Groups:" : "Atributo UUID para grupos:",
+    "Username-LDAP User Mapping" : "Mapeamento do utilizador LDAP",
+    "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." : "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
+    "Clear Username-LDAP User Mapping" : "Limpar mapeamento do utilizador-LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Limpar o mapeamento do nome de grupo LDAP"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/pt_PT.php b/apps/user_ldap/l10n/pt_PT.php
deleted file mode 100644
index 5f20348486b..00000000000
--- a/apps/user_ldap/l10n/pt_PT.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 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.",
-"No action specified" => "Nenhuma acção especificada",
-"No configuration specified" => "Nenhuma configuração especificada",
-"No data specified" => "Nenhuma data especificada",
-" Could not set configuration %s" => "Não foi possível definir a configuração %s",
-"Deletion failed" => "Erro ao apagar",
-"Take over settings from recent server configuration?" => "Assumir as configurações da configuração do servidor mais recente?",
-"Keep settings?" => "Manter as definições?",
-"{nthServer}. Server" => "{nthServer}. Servidor",
-"Cannot add server configuration" => "Não foi possível adicionar as configurações do servidor.",
-"mappings cleared" => "Mapas limpos",
-"Success" => "Sucesso",
-"Error" => "Erro",
-"Please specify a Base DN" => "Por favor indique a Base DN",
-"Could not determine Base DN" => "Não foi possível determinar a Base DN",
-"Please specify the port" => "Por favor indique a porta",
-"Configuration OK" => "Configuração OK",
-"Configuration incorrect" => "Configuração incorreta",
-"Configuration incomplete" => "Configuração incompleta",
-"Select groups" => "Seleccionar grupos",
-"Select object classes" => "Selecionar classes de objetos",
-"Select attributes" => "Selecionar atributos",
-"Connection test succeeded" => "Teste de ligação com sucesso.",
-"Connection test failed" => "Erro no teste de ligação.",
-"Do you really want to delete the current Server Configuration?" => "Deseja realmente apagar as configurações de servidor actuais?",
-"Confirm Deletion" => "Confirmar a operação de apagar",
-"_%s group found_::_%s groups found_" => array("%s grupo encontrado","%s grupos encontrados"),
-"_%s user found_::_%s users found_" => array("%s utilizador encontrado","%s utilizadores encontrados"),
-"Could not find the desired feature" => "Não se encontrou a função desejada",
-"Invalid Host" => "Hospedeiro Inválido",
-"Server" => "Servidor",
-"User Filter" => "Filtro de utilizadores",
-"Login Filter" => "Filtro de Login",
-"Group Filter" => "Filtrar por grupo",
-"Save" => "Guardar",
-"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:",
-"only those object classes:" => "apenas essas classes de objetos:",
-"only from those groups:" => "apenas desses grupos:",
-"Edit raw filter instead" => "Editar filtro raw em vez disso",
-"Raw LDAP filter" => "Filtro LDAP Raw",
-"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.",
-"Test Filter" => "Testar Filtro",
-"groups found" => "grupos encontrados",
-"Users login with this attribute:" => "Utilizadores entrar com este atributo:",
-"LDAP Username:" => "Nome de utilizador LDAP:",
-"LDAP Email Address:" => "Endereço de correio eletrónico LDAP:",
-"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\"",
-"1. Server" => "1. Servidor",
-"%s. Server:" => "%s. Servvidor",
-"Add Server Configuration" => "Adicionar configurações do servidor",
-"Delete Configuration" => "Apagar Configuração",
-"Host" => "Anfitrião",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://",
-"Port" => "Porto",
-"User DN" => "DN do utilizador",
-"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." => "O DN to cliente ",
-"Password" => "Password",
-"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",
-"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.",
-"users found" => "utilizadores encontrados",
-"Saving" => "Guardando",
-"Back" => "Voltar",
-"Continue" => "Continuar",
-"Expert" => "Perito",
-"Advanced" => "Avançado",
-"<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Aviso:</b> O módulo PHP LDAP não está instalado, logo não irá funcionar. Por favor peça ao administrador para o instalar.",
-"Connection Settings" => "Definições de ligação",
-"Configuration Active" => "Configuração activa",
-"When unchecked, this configuration will be skipped." => "Se não estiver marcada, esta definição não será tida em conta.",
-"Backup (Replica) Host" => "Servidor de Backup (Réplica)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Forneça um servidor (anfitrião) de backup. Deve ser uma réplica do servidor principal de LDAP/AD ",
-"Backup (Replica) Port" => "Porta do servidor de backup (Replica)",
-"Disable Main Server" => "Desactivar servidor principal",
-"Only connect to the replica server." => "Ligar apenas ao servidor de réplicas.",
-"Case insensitive LDAP server (Windows)" => "Servidor LDAP (Windows) não é sensível a maiúsculas.",
-"Turn off SSL certificate validation." => "Desligar a validação de certificado SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Não recomendado, use-o somente para teste! ligação só funciona com esta opção, importar o certificado SSL do servidor LDAP para o seu servidor %s.",
-"Cache Time-To-Live" => "Cache do tempo de vida dos objetos no servidor",
-"in seconds. A change empties the cache." => "em segundos. Uma alteração esvazia a cache.",
-"Directory Settings" => "Definições de directorias",
-"User Display Name Field" => "Mostrador do nome de utilizador.",
-"The LDAP attribute to use to generate the user's display name." => "Atributo LDAP para gerar o nome de utilizador do ownCloud.",
-"Base User Tree" => "Base da árvore de utilizadores.",
-"One User Base DN per line" => "Uma base de utilizador DN por linha",
-"User Search Attributes" => "Utilizar atributos de pesquisa",
-"Optional; one attribute per line" => "Opcional; Um atributo por linha",
-"Group Display Name Field" => "Mostrador do nome do grupo.",
-"The LDAP attribute to use to generate the groups's display name." => "Atributo LDAP para gerar o nome do grupo do ownCloud.",
-"Base Group Tree" => "Base da árvore de grupos.",
-"One Group Base DN per line" => "Uma base de grupo DN por linha",
-"Group Search Attributes" => "Atributos de pesquisa de grupo",
-"Group-Member association" => "Associar utilizador ao grupo.",
-"Nested Groups" => "Grupos agrupados",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Quando habilitado os grupos, os grupos são suportados. (Só funciona se o atributo de membro de grupo contém DNs.)",
-"Paging chunksize" => "Bloco de paginação",
-"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.)" => "Tamanho do bloco usado para pesquisas LDAP paginados que podem retornar resultados volumosos como utilizador ou grupo de enumeração. (Defini-lo 0 desactiva paginada das pesquisas LDAP nessas situações.)",
-"Special Attributes" => "Atributos especiais",
-"Quota Field" => "Quota",
-"Quota Default" => "Quota padrão",
-"in bytes" => "em bytes",
-"Email Field" => "Campo de email",
-"User Home Folder Naming Rule" => "Regra da pasta inicial do utilizador",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD.",
-"Internal Username" => "Nome de utilizador interno",
-"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." => "Por padrão o nome de utilizador interno vai ser criado através do atributo UUID. Desta forma é assegurado que o nome é único e os caracteres não necessitam de serem convertidos. O nome interno tem a restrição de que apenas estes caracteres são permitidos: [ a-zA-Z0-9_.@- ]. Outros caracteres são substituídos pela sua correspondência ASCII ou simplesmente omitidos. Mesmo assim, quando for detetado uma colisão irá ser acrescentado um número. O nome interno é usado para identificar o utilizador internamente. É também o nome utilizado para a pasta inicial no ownCloud. É também parte de URLs remotos, como por exemplo os serviços *DAV. Com esta definição, o comportamento padrão é pode ser sobreposto. Para obter o mesmo comportamento antes do ownCloud 5 introduza o atributo do nome no campo seguinte. Deixe vazio para obter o comportamento padrão. As alterações apenas serão feitas para utilizadores mapeados (adicionados) LDAP.",
-"Internal Username Attribute:" => "Atributo do nome de utilizador interno",
-"Override UUID detection" => "Passar a detecção do 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." => "Por defeito, o ownCloud detecta automaticamente o atributo UUID. Este atributo é usado para identificar inequivocamente grupos e utilizadores LDAP. Igualmente, o nome de utilizador interno é criado com base no UUID, se o contrário não for especificado. Pode sobrepor esta definição colocando um atributo à sua escolha. Tenha em atenção que esse atributo deve ser válido tanto para grupos como para utilizadores, e que é único. Deixe em branco para optar pelo comportamento por defeito. Estas alteração apenas terão efeito em novos utilizadores e grupos mapeados (adicionados).",
-"UUID Attribute for Users:" => "Atributo UUID para utilizadores:",
-"UUID Attribute for Groups:" => "Atributo UUID para grupos:",
-"Username-LDAP User Mapping" => "Mapeamento do utilizador LDAP",
-"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." => "O ownCloud usa nomes de utilizadores para guardar e atribuir (meta) dados. Para identificar com precisão os utilizadores, cada utilizador de LDAP tem um nome de utilizador interno. Isto requer um mapeamento entre o utilizador LDAP e o utilizador ownCloud. Adicionalmente, o DN é colocado em cache para reduzir a interação com LDAP, porém não é usado para identificação. Se o DN muda, essas alterações serão vistas pelo ownCloud. O nome interno do ownCloud é usado em todo o lado, no ownCloud. Limpar os mapeamentos deixará vestígios em todo o lado. A limpeza dos mapeamentos não é sensível à configuração, pois afeta todas as configurações de LDAP! Nunca limpe os mapeamentos num ambiente de produção, apenas o faça numa fase de testes ou experimental.",
-"Clear Username-LDAP User Mapping" => "Limpar mapeamento do utilizador-LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Limpar o mapeamento do nome de grupo LDAP"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ro.js b/apps/user_ldap/l10n/ro.js
new file mode 100644
index 00000000000..1e96a367a2a
--- /dev/null
+++ b/apps/user_ldap/l10n/ro.js
@@ -0,0 +1,61 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "The configuration is valid and the connection could be established!" : "Configuraţia este valida şi s-a stabilit conectarea",
+    "No action specified" : "Nu este specificata nici o acţiune ",
+    "No configuration specified" : "Nu este specificata nici o configurare ",
+    "Deletion failed" : "Ștergerea a eșuat",
+    "Keep settings?" : "Păstraţi setările ?",
+    "Cannot add server configuration" : "Nu se poate adăuga configuraţia serverului ",
+    "Success" : "Succes",
+    "Error" : "Eroare",
+    "Configuration OK" : "Configuraţie valida",
+    "Configuration incorrect" : "Configuraţie incorecta ",
+    "Configuration incomplete" : "Configuraţie incompleta ",
+    "Select groups" : "Selectaţi grupuri ",
+    "Select attributes" : "Selectaţi caracteristici",
+    "Connection test succeeded" : "Testul de conectare a reuşit ",
+    "Connection test failed" : "Testul de conectare a eşuat ",
+    "Do you really want to delete the current Server Configuration?" : "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?",
+    "Confirm Deletion" : "Confirmaţi Ştergerea ",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Group Filter" : "Fitrare Grup",
+    "Save" : "Salvează",
+    "Test Configuration" : "Configurare test",
+    "Help" : "Ajutor",
+    "Other Attributes:" : "Alte caracteristici :",
+    "Add Server Configuration" : "Adăugaţi Configuraţia Serverului",
+    "Host" : "Gazdă",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
+    "Port" : "Portul",
+    "User DN" : "DN al utilizatorului",
+    "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-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere.",
+    "Password" : "Parolă",
+    "For anonymous access, leave DN and Password empty." : "Pentru acces anonim, lăsați DN și Parolă libere.",
+    "One Base DN per line" : "Un Base DN pe linie",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
+    "users found" : "Utilizatori găsiţi ",
+    "Back" : "Înapoi",
+    "Continue" : "Continuă",
+    "Advanced" : "Avansat",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
+    "Connection Settings" : "Setările de conexiune",
+    "Configuration Active" : "Configuraţie activa ",
+    "Disable Main Server" : "Dezactivaţi serverul principal",
+    "Turn off SSL certificate validation." : "Oprește validarea certificatelor SSL ",
+    "in seconds. A change empties the cache." : "în secunde. O schimbare curăță memoria tampon.",
+    "Directory Settings" : "Setările directorului",
+    "User Display Name Field" : "Câmpul cu numele vizibil al utilizatorului",
+    "Base User Tree" : "Arborele de bază al Utilizatorilor",
+    "One User Base DN per line" : "Un User Base DN pe linie",
+    "Group Display Name Field" : "Câmpul cu numele grupului",
+    "Base Group Tree" : "Arborele de bază al Grupurilor",
+    "One Group Base DN per line" : "Un Group Base DN pe linie",
+    "Group-Member association" : "Asocierea Grup-Membru",
+    "Special Attributes" : "Caracteristici speciale ",
+    "in bytes" : "în octeți",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD.",
+    "Internal Username" : "Nume utilizator intern"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/user_ldap/l10n/ro.json b/apps/user_ldap/l10n/ro.json
new file mode 100644
index 00000000000..75a1c13db5a
--- /dev/null
+++ b/apps/user_ldap/l10n/ro.json
@@ -0,0 +1,59 @@
+{ "translations": {
+    "The configuration is valid and the connection could be established!" : "Configuraţia este valida şi s-a stabilit conectarea",
+    "No action specified" : "Nu este specificata nici o acţiune ",
+    "No configuration specified" : "Nu este specificata nici o configurare ",
+    "Deletion failed" : "Ștergerea a eșuat",
+    "Keep settings?" : "Păstraţi setările ?",
+    "Cannot add server configuration" : "Nu se poate adăuga configuraţia serverului ",
+    "Success" : "Succes",
+    "Error" : "Eroare",
+    "Configuration OK" : "Configuraţie valida",
+    "Configuration incorrect" : "Configuraţie incorecta ",
+    "Configuration incomplete" : "Configuraţie incompleta ",
+    "Select groups" : "Selectaţi grupuri ",
+    "Select attributes" : "Selectaţi caracteristici",
+    "Connection test succeeded" : "Testul de conectare a reuşit ",
+    "Connection test failed" : "Testul de conectare a eşuat ",
+    "Do you really want to delete the current Server Configuration?" : "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?",
+    "Confirm Deletion" : "Confirmaţi Ştergerea ",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Group Filter" : "Fitrare Grup",
+    "Save" : "Salvează",
+    "Test Configuration" : "Configurare test",
+    "Help" : "Ajutor",
+    "Other Attributes:" : "Alte caracteristici :",
+    "Add Server Configuration" : "Adăugaţi Configuraţia Serverului",
+    "Host" : "Gazdă",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
+    "Port" : "Portul",
+    "User DN" : "DN al utilizatorului",
+    "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-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere.",
+    "Password" : "Parolă",
+    "For anonymous access, leave DN and Password empty." : "Pentru acces anonim, lăsați DN și Parolă libere.",
+    "One Base DN per line" : "Un Base DN pe linie",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
+    "users found" : "Utilizatori găsiţi ",
+    "Back" : "Înapoi",
+    "Continue" : "Continuă",
+    "Advanced" : "Avansat",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
+    "Connection Settings" : "Setările de conexiune",
+    "Configuration Active" : "Configuraţie activa ",
+    "Disable Main Server" : "Dezactivaţi serverul principal",
+    "Turn off SSL certificate validation." : "Oprește validarea certificatelor SSL ",
+    "in seconds. A change empties the cache." : "în secunde. O schimbare curăță memoria tampon.",
+    "Directory Settings" : "Setările directorului",
+    "User Display Name Field" : "Câmpul cu numele vizibil al utilizatorului",
+    "Base User Tree" : "Arborele de bază al Utilizatorilor",
+    "One User Base DN per line" : "Un User Base DN pe linie",
+    "Group Display Name Field" : "Câmpul cu numele grupului",
+    "Base Group Tree" : "Arborele de bază al Grupurilor",
+    "One Group Base DN per line" : "Un Group Base DN pe linie",
+    "Group-Member association" : "Asocierea Grup-Membru",
+    "Special Attributes" : "Caracteristici speciale ",
+    "in bytes" : "în octeți",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD.",
+    "Internal Username" : "Nume utilizator intern"
+},"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_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
deleted file mode 100644
index 357fc68633b..00000000000
--- a/apps/user_ldap/l10n/ro.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"The configuration is valid and the connection could be established!" => "Configuraţia este valida şi s-a stabilit conectarea",
-"No action specified" => "Nu este specificata nici o acţiune ",
-"No configuration specified" => "Nu este specificata nici o configurare ",
-"Deletion failed" => "Ștergerea a eșuat",
-"Keep settings?" => "Păstraţi setările ?",
-"Cannot add server configuration" => "Nu se poate adăuga configuraţia serverului ",
-"Success" => "Succes",
-"Error" => "Eroare",
-"Configuration OK" => "Configuraţie valida",
-"Configuration incorrect" => "Configuraţie incorecta ",
-"Configuration incomplete" => "Configuraţie incompleta ",
-"Select groups" => "Selectaţi grupuri ",
-"Select attributes" => "Selectaţi caracteristici",
-"Connection test succeeded" => "Testul de conectare a reuşit ",
-"Connection test failed" => "Testul de conectare a eşuat ",
-"Do you really want to delete the current Server Configuration?" => "Sunteţi sigur ca vreţi sa ştergeţi configuraţia actuala a serverului ?",
-"Confirm Deletion" => "Confirmaţi Ştergerea ",
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
-"Group Filter" => "Fitrare Grup",
-"Save" => "Salvează",
-"Test Configuration" => "Configurare test",
-"Help" => "Ajutor",
-"Other Attributes:" => "Alte caracteristici :",
-"Add Server Configuration" => "Adăugaţi Configuraţia Serverului",
-"Host" => "Gazdă",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://",
-"Port" => "Portul",
-"User DN" => "DN al utilizatorului",
-"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-ul clientului utilizator cu care se va efectua conectarea, d.e. uid=agent,dc=example,dc=com. Pentru acces anonim, lăsăți DN și Parolă libere.",
-"Password" => "Parolă",
-"For anonymous access, leave DN and Password empty." => "Pentru acces anonim, lăsați DN și Parolă libere.",
-"One Base DN per line" => "Un Base DN pe linie",
-"You can specify Base DN for users and groups in the Advanced tab" => "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat",
-"users found" => "Utilizatori găsiţi ",
-"Back" => "Înapoi",
-"Continue" => "Continuă",
-"Advanced" => "Avansat",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Atenție</b> Modulul PHP LDAP nu este instalat, infrastructura nu va funcționa. Contactează administratorul sistemului pentru al instala.",
-"Connection Settings" => "Setările de conexiune",
-"Configuration Active" => "Configuraţie activa ",
-"Disable Main Server" => "Dezactivaţi serverul principal",
-"Turn off SSL certificate validation." => "Oprește validarea certificatelor SSL ",
-"in seconds. A change empties the cache." => "în secunde. O schimbare curăță memoria tampon.",
-"Directory Settings" => "Setările directorului",
-"User Display Name Field" => "Câmpul cu numele vizibil al utilizatorului",
-"Base User Tree" => "Arborele de bază al Utilizatorilor",
-"One User Base DN per line" => "Un User Base DN pe linie",
-"Group Display Name Field" => "Câmpul cu numele grupului",
-"Base Group Tree" => "Arborele de bază al Grupurilor",
-"One Group Base DN per line" => "Un Group Base DN pe linie",
-"Group-Member association" => "Asocierea Grup-Membru",
-"Special Attributes" => "Caracteristici speciale ",
-"in bytes" => "în octeți",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD.",
-"Internal Username" => "Nume utilizator intern"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
new file mode 100644
index 00000000000..dd60f9c9907
--- /dev/null
+++ b/apps/user_ldap/l10n/ru.js
@@ -0,0 +1,128 @@
+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." : "Конфигурация верна, но операция подключения завершилась неудачно. Пожалуйста, проверьте настройки сервера и учетные данные.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация недействительна. Пожалуйста, просмотрите логи для уточнения деталей.",
+    "No action specified" : "Действие не указано",
+    "No configuration specified" : "Конфигурация не создана",
+    "No data specified" : "Нет данных",
+    " Could not set configuration %s" : "Невозможно создать конфигурацию %s",
+    "Deletion failed" : "Удаление не удалось",
+    "Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
+    "Keep settings?" : "Сохранить настройки?",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
+    "Cannot add server configuration" : "Не получилось добавить конфигурацию сервера",
+    "mappings cleared" : "Соответствия очищены",
+    "Success" : "Успешно",
+    "Error" : "Ошибка",
+    "Please specify a Base DN" : "Необходимо указать Base DN",
+    "Could not determine Base DN" : "Невозможно определить Base DN",
+    "Please specify the port" : "Укажите порт",
+    "Configuration OK" : "Конфигурация в порядке",
+    "Configuration incorrect" : "Конфигурация неправильна",
+    "Configuration incomplete" : "Конфигурация не завершена",
+    "Select groups" : "Выберите группы",
+    "Select object classes" : "Выберите объектные классы",
+    "Select attributes" : "Выберите атрибуты",
+    "Connection test succeeded" : "Проверка соединения удалась",
+    "Connection test failed" : "Проверка соединения не удалась",
+    "Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
+    "Confirm Deletion" : "Подтверждение удаления",
+    "_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"],
+    "_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"],
+    "Could not find the desired feature" : "Не могу найти требуемой функциональности",
+    "Invalid Host" : "Неверный сервер",
+    "Server" : "Сервер",
+    "User Filter" : "Пользователи",
+    "Login Filter" : "Логин",
+    "Group Filter" : "Фильтр группы",
+    "Save" : "Сохранить",
+    "Test Configuration" : "Проверить конфигурацию",
+    "Help" : "Помощь",
+    "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в  %s:",
+    "only those object classes:" : "только эти объектные классы",
+    "only from those groups:" : "только из этих групп",
+    "Edit raw filter instead" : "Редактировать исходный фильтр",
+    "Raw LDAP filter" : "Исходный LDAP фильтр",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
+    "groups found" : "групп найдено",
+    "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:",
+    "LDAP Username:" : "Имя пользователя LDAP",
+    "LDAP Email Address:" : "LDAP адрес электронной почты:",
+    "Other Attributes:" : "Другие атрибуты:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
+    "1. Server" : "1. Сервер",
+    "%s. Server:" : "%s. Сервер:",
+    "Add Server Configuration" : "Добавить конфигурацию сервера",
+    "Delete Configuration" : "Удалить конфигурацию",
+    "Host" : "Сервер",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
+    "Port" : "Порт",
+    "User DN" : "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." : "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.",
+    "Password" : "Пароль",
+    "For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.",
+    "One Base DN per line" : "По одной базе поиска (Base DN) в строке.",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
+    "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
+    "users found" : "пользователей найдено",
+    "Back" : "Назад",
+    "Continue" : "Продолжить",
+    "Expert" : "Эксперт",
+    "Advanced" : "Дополнительно",
+    "<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>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
+    "Connection Settings" : "Настройки подключения",
+    "Configuration Active" : "Конфигурация активна",
+    "When unchecked, this configuration will be skipped." : "Когда галочка снята, эта конфигурация будет пропущена.",
+    "Backup (Replica) Host" : "Адрес резервного сервера",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.",
+    "Backup (Replica) Port" : "Порт резервного сервера",
+    "Disable Main Server" : "Отключить главный сервер",
+    "Only connect to the replica server." : "Подключаться только к серверу-реплике.",
+    "Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)",
+    "Turn off SSL certificate validation." : "Отключить проверку сертификата SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
+    "Cache Time-To-Live" : "Кэш времени жизни",
+    "in seconds. A change empties the cache." : "в секундах. Изменение очистит кэш.",
+    "Directory Settings" : "Настройки каталога",
+    "User Display Name Field" : "Поле отображаемого имени пользователя",
+    "The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.",
+    "Base User Tree" : "База пользовательского дерева",
+    "One User Base DN per line" : "По одной базовому DN пользователей в строке.",
+    "User Search Attributes" : "Атрибуты поиска пользоватетелей",
+    "Optional; one attribute per line" : "Опционально; один атрибут в строке",
+    "Group Display Name Field" : "Поле отображаемого имени группы",
+    "The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени группы.",
+    "Base Group Tree" : "База группового дерева",
+    "One Group Base DN per line" : "По одной базовому DN групп в строке.",
+    "Group Search Attributes" : "Атрибуты поиска для группы",
+    "Group-Member association" : "Ассоциация Группа-Участник",
+    "Nested Groups" : "Вложенные группы",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)",
+    "Paging chunksize" : "Постраничный 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 используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его  в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
+    "Special Attributes" : "Специальные атрибуты",
+    "Quota Field" : "Поле квоты",
+    "Quota Default" : "Квота по умолчанию",
+    "in bytes" : "в байтах",
+    "Email Field" : "Поле адреса электронной почты",
+    "User Home Folder Naming Rule" : "Правило именования домашней папки пользователя",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.",
+    "Internal Username" : "Внутреннее имя пользователя",
+    "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." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для папки пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
+    "Internal Username Attribute:" : "Атрибут для внутреннего имени:",
+    "Override UUID detection" : "Переопределить нахождение 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." : "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
+    "UUID Attribute for Users:" : "UUID-атрибуты для пользователей:",
+    "UUID Attribute for Groups:" : "UUID-атрибуты для групп:",
+    "Username-LDAP User Mapping" : "Соответствия Имя-Пользователь LDAP",
+    "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." : "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется различающееся имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если различающееся имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP-подключения! Ни в коем случае не рекомендуется сбрасывать привязки, если система уже находится в эксплуатации, только на этапе тестирования.",
+    "Clear Username-LDAP User Mapping" : "Очистить соответствия Имя-Пользователь LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Очистить соответствия Группа-Группа LDAP"
+},
+"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_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
new file mode 100644
index 00000000000..065ea2f2d05
--- /dev/null
+++ b/apps/user_ldap/l10n/ru.json
@@ -0,0 +1,126 @@
+{ "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." : "Конфигурация верна, но операция подключения завершилась неудачно. Пожалуйста, проверьте настройки сервера и учетные данные.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Конфигурация недействительна. Пожалуйста, просмотрите логи для уточнения деталей.",
+    "No action specified" : "Действие не указано",
+    "No configuration specified" : "Конфигурация не создана",
+    "No data specified" : "Нет данных",
+    " Could not set configuration %s" : "Невозможно создать конфигурацию %s",
+    "Deletion failed" : "Удаление не удалось",
+    "Take over settings from recent server configuration?" : "Принять настройки из последней конфигурации сервера?",
+    "Keep settings?" : "Сохранить настройки?",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
+    "Cannot add server configuration" : "Не получилось добавить конфигурацию сервера",
+    "mappings cleared" : "Соответствия очищены",
+    "Success" : "Успешно",
+    "Error" : "Ошибка",
+    "Please specify a Base DN" : "Необходимо указать Base DN",
+    "Could not determine Base DN" : "Невозможно определить Base DN",
+    "Please specify the port" : "Укажите порт",
+    "Configuration OK" : "Конфигурация в порядке",
+    "Configuration incorrect" : "Конфигурация неправильна",
+    "Configuration incomplete" : "Конфигурация не завершена",
+    "Select groups" : "Выберите группы",
+    "Select object classes" : "Выберите объектные классы",
+    "Select attributes" : "Выберите атрибуты",
+    "Connection test succeeded" : "Проверка соединения удалась",
+    "Connection test failed" : "Проверка соединения не удалась",
+    "Do you really want to delete the current Server Configuration?" : "Вы действительно хотите удалить существующую конфигурацию сервера?",
+    "Confirm Deletion" : "Подтверждение удаления",
+    "_%s group found_::_%s groups found_" : ["%s группа найдена","%s группы найдены","%s групп найдено"],
+    "_%s user found_::_%s users found_" : ["%s пользователь найден","%s пользователя найдено","%s пользователей найдено"],
+    "Could not find the desired feature" : "Не могу найти требуемой функциональности",
+    "Invalid Host" : "Неверный сервер",
+    "Server" : "Сервер",
+    "User Filter" : "Пользователи",
+    "Login Filter" : "Логин",
+    "Group Filter" : "Фильтр группы",
+    "Save" : "Сохранить",
+    "Test Configuration" : "Проверить конфигурацию",
+    "Help" : "Помощь",
+    "Groups meeting these criteria are available in %s:" : "Группы, отвечающие этим критериям доступны в  %s:",
+    "only those object classes:" : "только эти объектные классы",
+    "only from those groups:" : "только из этих групп",
+    "Edit raw filter instead" : "Редактировать исходный фильтр",
+    "Raw LDAP filter" : "Исходный LDAP фильтр",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
+    "groups found" : "групп найдено",
+    "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:",
+    "LDAP Username:" : "Имя пользователя LDAP",
+    "LDAP Email Address:" : "LDAP адрес электронной почты:",
+    "Other Attributes:" : "Другие атрибуты:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
+    "1. Server" : "1. Сервер",
+    "%s. Server:" : "%s. Сервер:",
+    "Add Server Configuration" : "Добавить конфигурацию сервера",
+    "Delete Configuration" : "Удалить конфигурацию",
+    "Host" : "Сервер",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
+    "Port" : "Порт",
+    "User DN" : "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." : "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.",
+    "Password" : "Пароль",
+    "For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.",
+    "One Base DN per line" : "По одной базе поиска (Base DN) в строке.",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
+    "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
+    "users found" : "пользователей найдено",
+    "Back" : "Назад",
+    "Continue" : "Продолжить",
+    "Expert" : "Эксперт",
+    "Advanced" : "Дополнительно",
+    "<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>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
+    "Connection Settings" : "Настройки подключения",
+    "Configuration Active" : "Конфигурация активна",
+    "When unchecked, this configuration will be skipped." : "Когда галочка снята, эта конфигурация будет пропущена.",
+    "Backup (Replica) Host" : "Адрес резервного сервера",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.",
+    "Backup (Replica) Port" : "Порт резервного сервера",
+    "Disable Main Server" : "Отключить главный сервер",
+    "Only connect to the replica server." : "Подключаться только к серверу-реплике.",
+    "Case insensitive LDAP server (Windows)" : "Нечувствительный к регистру сервер LDAP (Windows)",
+    "Turn off SSL certificate validation." : "Отключить проверку сертификата SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
+    "Cache Time-To-Live" : "Кэш времени жизни",
+    "in seconds. A change empties the cache." : "в секундах. Изменение очистит кэш.",
+    "Directory Settings" : "Настройки каталога",
+    "User Display Name Field" : "Поле отображаемого имени пользователя",
+    "The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.",
+    "Base User Tree" : "База пользовательского дерева",
+    "One User Base DN per line" : "По одной базовому DN пользователей в строке.",
+    "User Search Attributes" : "Атрибуты поиска пользоватетелей",
+    "Optional; one attribute per line" : "Опционально; один атрибут в строке",
+    "Group Display Name Field" : "Поле отображаемого имени группы",
+    "The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, который используется для генерации отображаемого имени группы.",
+    "Base Group Tree" : "База группового дерева",
+    "One Group Base DN per line" : "По одной базовому DN групп в строке.",
+    "Group Search Attributes" : "Атрибуты поиска для группы",
+    "Group-Member association" : "Ассоциация Группа-Участник",
+    "Nested Groups" : "Вложенные группы",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)",
+    "Paging chunksize" : "Постраничный 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 используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его  в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
+    "Special Attributes" : "Специальные атрибуты",
+    "Quota Field" : "Поле квоты",
+    "Quota Default" : "Квота по умолчанию",
+    "in bytes" : "в байтах",
+    "Email Field" : "Поле адреса электронной почты",
+    "User Home Folder Naming Rule" : "Правило именования домашней папки пользователя",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.",
+    "Internal Username" : "Внутреннее имя пользователя",
+    "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." : "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для папки пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
+    "Internal Username Attribute:" : "Атрибут для внутреннего имени:",
+    "Override UUID detection" : "Переопределить нахождение 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." : "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
+    "UUID Attribute for Users:" : "UUID-атрибуты для пользователей:",
+    "UUID Attribute for Groups:" : "UUID-атрибуты для групп:",
+    "Username-LDAP User Mapping" : "Соответствия Имя-Пользователь LDAP",
+    "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." : "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется различающееся имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если различающееся имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP-подключения! Ни в коем случае не рекомендуется сбрасывать привязки, если система уже находится в эксплуатации, только на этапе тестирования.",
+    "Clear Username-LDAP User Mapping" : "Очистить соответствия Имя-Пользователь LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Очистить соответствия Группа-Группа LDAP"
+},"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_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
deleted file mode 100644
index 3bfa8ae2b1c..00000000000
--- a/apps/user_ldap/l10n/ru.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "Конфигурация верна, но операция подключения завершилась неудачно. Пожалуйста, проверьте настройки сервера и учетные данные.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Конфигурация недействительна. Пожалуйста, просмотрите логи для уточнения деталей.",
-"No action specified" => "Действие не указано",
-"No configuration specified" => "Конфигурация не создана",
-"No data specified" => "Нет данных",
-" Could not set configuration %s" => "Невозможно создать конфигурацию %s",
-"Deletion failed" => "Удаление не удалось",
-"Take over settings from recent server configuration?" => "Принять настройки из последней конфигурации сервера?",
-"Keep settings?" => "Сохранить настройки?",
-"{nthServer}. Server" => "{nthServer}. Сервер",
-"Cannot add server configuration" => "Не получилось добавить конфигурацию сервера",
-"mappings cleared" => "Соответствия очищены",
-"Success" => "Успешно",
-"Error" => "Ошибка",
-"Please specify a Base DN" => "Необходимо указать Base DN",
-"Could not determine Base DN" => "Невозможно определить Base DN",
-"Please specify the port" => "Укажите порт",
-"Configuration OK" => "Конфигурация в порядке",
-"Configuration incorrect" => "Конфигурация неправильна",
-"Configuration incomplete" => "Конфигурация не завершена",
-"Select groups" => "Выберите группы",
-"Select object classes" => "Выберите объектные классы",
-"Select attributes" => "Выберите атрибуты",
-"Connection test succeeded" => "Проверка соединения удалась",
-"Connection test failed" => "Проверка соединения не удалась",
-"Do you really want to delete the current Server Configuration?" => "Вы действительно хотите удалить существующую конфигурацию сервера?",
-"Confirm Deletion" => "Подтверждение удаления",
-"_%s group found_::_%s groups found_" => array("%s группа найдена","%s группы найдены","%s групп найдено"),
-"_%s user found_::_%s users found_" => array("%s пользователь найден","%s пользователя найдено","%s пользователей найдено"),
-"Could not find the desired feature" => "Не могу найти требуемой функциональности",
-"Invalid Host" => "Неверный сервер",
-"Server" => "Сервер",
-"User Filter" => "Пользователи",
-"Login Filter" => "Логин",
-"Group Filter" => "Фильтр группы",
-"Save" => "Сохранить",
-"Test Configuration" => "Проверить конфигурацию",
-"Help" => "Помощь",
-"Groups meeting these criteria are available in %s:" => "Группы, отвечающие этим критериям доступны в  %s:",
-"only those object classes:" => "только эти объектные классы",
-"only from those groups:" => "только из этих групп",
-"Edit raw filter instead" => "Редактировать исходный фильтр",
-"Raw LDAP filter" => "Исходный LDAP фильтр",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
-"groups found" => "групп найдено",
-"Users login with this attribute:" => "Пользователи пользуются этим атрибутом для входа:",
-"LDAP Username:" => "Имя пользователя LDAP",
-"LDAP Email Address:" => "LDAP адрес электронной почты:",
-"Other Attributes:" => "Другие атрибуты:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему. Например: \"uid=%%uid\"",
-"1. Server" => "1. Сервер",
-"%s. Server:" => "%s. Сервер:",
-"Add Server Configuration" => "Добавить конфигурацию сервера",
-"Delete Configuration" => "Удалить конфигурацию",
-"Host" => "Сервер",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /",
-"Port" => "Порт",
-"User DN" => "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." => "DN пользователя, под которым выполняется подключение, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте DN и пароль пустыми.",
-"Password" => "Пароль",
-"For anonymous access, leave DN and Password empty." => "Для анонимного доступа оставьте DN и пароль пустыми.",
-"One Base DN per line" => "По одной базе поиска (Base DN) в строке.",
-"You can specify Base DN for users and groups in the Advanced tab" => "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
-"Limit %s access to users meeting these criteria:" => "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
-"users found" => "пользователей найдено",
-"Back" => "Назад",
-"Continue" => "Продолжить",
-"Expert" => "Эксперт",
-"Advanced" => "Дополнительно",
-"<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>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Внимание:</b> Модуль LDAP для PHP не установлен, бэкенд не будет работать. Пожалуйста, попросите вашего системного администратора его установить. ",
-"Connection Settings" => "Настройки подключения",
-"Configuration Active" => "Конфигурация активна",
-"When unchecked, this configuration will be skipped." => "Когда галочка снята, эта конфигурация будет пропущена.",
-"Backup (Replica) Host" => "Адрес резервного сервера",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Укажите дополнительный резервный сервер. Он должен быть репликой главного LDAP/AD сервера.",
-"Backup (Replica) Port" => "Порт резервного сервера",
-"Disable Main Server" => "Отключить главный сервер",
-"Only connect to the replica server." => "Подключаться только к серверу-реплике.",
-"Case insensitive LDAP server (Windows)" => "Нечувствительный к регистру сервер LDAP (Windows)",
-"Turn off SSL certificate validation." => "Отключить проверку сертификата SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Не рекомендуется, используйте только в режиме тестирования! Если соединение работает только с этой опцией, импортируйте на ваш %s сервер SSL-сертификат сервера LDAP.",
-"Cache Time-To-Live" => "Кэш времени жизни",
-"in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.",
-"Directory Settings" => "Настройки каталога",
-"User Display Name Field" => "Поле отображаемого имени пользователя",
-"The LDAP attribute to use to generate the user's display name." => "Атрибут LDAP, который используется для генерации отображаемого имени пользователя.",
-"Base User Tree" => "База пользовательского дерева",
-"One User Base DN per line" => "По одной базовому DN пользователей в строке.",
-"User Search Attributes" => "Атрибуты поиска пользоватетелей",
-"Optional; one attribute per line" => "Опционально; один атрибут в строке",
-"Group Display Name Field" => "Поле отображаемого имени группы",
-"The LDAP attribute to use to generate the groups's display name." => "Атрибут LDAP, который используется для генерации отображаемого имени группы.",
-"Base Group Tree" => "База группового дерева",
-"One Group Base DN per line" => "По одной базовому DN групп в строке.",
-"Group Search Attributes" => "Атрибуты поиска для группы",
-"Group-Member association" => "Ассоциация Группа-Участник",
-"Nested Groups" => "Вложенные группы",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "При включении, активируется поддержка групп, содержащих другие группы. (Работает только если атрибут член группы содержит DN.)",
-"Paging chunksize" => "Постраничный 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 используется в страничных поисках LDAP которые могут возвращать громоздкие результаты, как например списки пользователей или групп. (Настройка его  в \"0\" отключает страничный поиск LDAP для таких ситуаций.)",
-"Special Attributes" => "Специальные атрибуты",
-"Quota Field" => "Поле квоты",
-"Quota Default" => "Квота по умолчанию",
-"in bytes" => "в байтах",
-"Email Field" => "Поле адреса электронной почты",
-"User Home Folder Naming Rule" => "Правило именования домашней папки пользователя",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте пустым для использования имени пользователя (по умолчанию). Иначе укажите атрибут LDAP/AD.",
-"Internal Username" => "Внутреннее имя пользователя",
-"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." => "По умолчанию внутреннее имя пользователя будет создано из атрибута UUID. Таким образом имя пользователя становится уникальным и не требует конвертации символов. Внутреннее имя пользователя может состоять только из следующих символов: [ a-zA-Z0-9_.@- ]. Остальные символы замещаются соответствиями из таблицы ASCII или же просто пропускаются. При совпадении к имени будет добавлено или увеличено число. Внутреннее имя пользователя используется для внутренней идентификации пользователя. Также оно является именем по умолчанию для папки пользователя в ownCloud. Оно также является частью URL, к примеру, для всех сервисов *DAV. С помощью данной настройки можно изменить поведение по умолчанию. Чтобы достичь поведения, как было до ownCloud 5, введите атрибут отображаемого имени пользователя в этом поле. Оставьте его пустым для режима по умолчанию. Изменения будут иметь эффект только для новых подключенных (добавленных) пользователей LDAP.",
-"Internal Username Attribute:" => "Атрибут для внутреннего имени:",
-"Override UUID detection" => "Переопределить нахождение 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." => "По умолчанию ownCloud определяет атрибут UUID автоматически. Этот атрибут используется для того, чтобы достоверно идентифицировать пользователей и группы LDAP. Также на основании атрибута UUID создается внутреннее имя пользователя, если выше не указано иначе. Вы можете переопределить эту настройку и указать свой атрибут по выбору. Вы должны удостовериться, что выбранный вами атрибут может быть выбран для пользователей и групп, а также то, что он уникальный. Оставьте поле пустым для поведения по умолчанию. Изменения вступят в силу только для новых подключенных (добавленных) пользователей и групп LDAP.",
-"UUID Attribute for Users:" => "UUID-атрибуты для пользователей:",
-"UUID Attribute for Groups:" => "UUID-атрибуты для групп:",
-"Username-LDAP User Mapping" => "Соответствия Имя-Пользователь LDAP",
-"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." => "ownCloud использует имена пользователей для хранения и назначения метаданных. Для точной идентификации и распознавания пользователей, каждый пользователь LDAP будет иметь свое внутреннее имя пользователя. Это требует привязки имени пользователя ownCloud к пользователю LDAP. При создании имя пользователя назначается идентификатору UUID пользователя LDAP. Помимо этого кешируется различающееся имя (DN) для уменьшения числа обращений к LDAP, однако оно не используется для идентификации. Если различающееся имя было изменено, об этом станет известно ownCloud. Внутреннее имя ownCloud используется повсеместно в ownCloud. После сброса привязок в базе могут сохраниться остатки старой информации. Сброс привязок не привязан к конфигурации, он повлияет на все LDAP-подключения! Ни в коем случае не рекомендуется сбрасывать привязки, если система уже находится в эксплуатации, только на этапе тестирования.",
-"Clear Username-LDAP User Mapping" => "Очистить соответствия Имя-Пользователь LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Очистить соответствия Группа-Группа LDAP"
-);
-$PLURAL_FORMS = "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_ldap/l10n/si_LK.js b/apps/user_ldap/l10n/si_LK.js
new file mode 100644
index 00000000000..55d132d4c61
--- /dev/null
+++ b/apps/user_ldap/l10n/si_LK.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "මකාදැමීම අසාර්ථකයි",
+    "Success" : "සාර්ථකයි",
+    "Error" : "දෝෂයක්",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Group Filter" : "කණ්ඩායම් පෙරහන",
+    "Save" : "සුරකින්න",
+    "Help" : "උදව්",
+    "Host" : "සත්කාරකය",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
+    "Port" : "තොට",
+    "Password" : "මුර පදය",
+    "Advanced" : "දියුණු/උසස්"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/si_LK.json b/apps/user_ldap/l10n/si_LK.json
new file mode 100644
index 00000000000..7a7f44c7a59
--- /dev/null
+++ b/apps/user_ldap/l10n/si_LK.json
@@ -0,0 +1,16 @@
+{ "translations": {
+    "Deletion failed" : "මකාදැමීම අසාර්ථකයි",
+    "Success" : "සාර්ථකයි",
+    "Error" : "දෝෂයක්",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Group Filter" : "කණ්ඩායම් පෙරහන",
+    "Save" : "සුරකින්න",
+    "Help" : "උදව්",
+    "Host" : "සත්කාරකය",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
+    "Port" : "තොට",
+    "Password" : "මුර පදය",
+    "Advanced" : "දියුණු/උසස්"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
deleted file mode 100644
index a3e8f466b7d..00000000000
--- a/apps/user_ldap/l10n/si_LK.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "මකාදැමීම අසාර්ථකයි",
-"Success" => "සාර්ථකයි",
-"Error" => "දෝෂයක්",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Group Filter" => "කණ්ඩායම් පෙරහන",
-"Save" => "සුරකින්න",
-"Help" => "උදව්",
-"Host" => "සත්කාරකය",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
-"Port" => "තොට",
-"Password" => "මුර පදය",
-"Advanced" => "දියුණු/උසස්"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js
new file mode 100644
index 00000000000..9a15db6bb81
--- /dev/null
+++ b/apps/user_ldap/l10n/sk_SK.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Nepodarilo sa vymazať mapovania.",
+    "Failed to delete the server configuration" : "Zlyhalo zmazanie nastavenia servera.",
+    "The configuration is valid and the connection could be established!" : "Nastavenie je v poriadku a pripojenie je stabilné.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Nastavenie je v poriadku, ale pripojenie zlyhalo. Skontrolujte nastavenia servera a prihlasovacie údaje.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurácia je chybná. Prosím, pozrite sa do logov pre ďalšie podrobnosti.",
+    "No action specified" : "Nie je vybraná akcia",
+    "No configuration specified" : "Nie je určená konfigurácia",
+    "No data specified" : "Nie sú vybraté dáta",
+    " Could not set configuration %s" : "Nemôžem nastaviť konfiguráciu %s",
+    "Deletion failed" : "Odstránenie zlyhalo",
+    "Take over settings from recent server configuration?" : "Prebrať nastavenia z nedávneho nastavenia servera?",
+    "Keep settings?" : "Ponechať nastavenia?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Nemožno pridať nastavenie servera",
+    "mappings cleared" : "mapovanie vymazané",
+    "Success" : "Úspešné",
+    "Error" : "Chyba",
+    "Please specify a Base DN" : "Prosím, zadajte základnú DN",
+    "Could not determine Base DN" : "Nemožno určiť základnú DN",
+    "Please specify the port" : "Prosím, zadajte port",
+    "Configuration OK" : "Konfigurácia je v poriadku",
+    "Configuration incorrect" : "Nesprávna konfigurácia",
+    "Configuration incomplete" : "Nekompletná konfigurácia",
+    "Select groups" : "Vybrať skupinu",
+    "Select object classes" : "Vyberte triedy objektov",
+    "Select attributes" : "Vyberte atribúty",
+    "Connection test succeeded" : "Test pripojenia bol úspešný",
+    "Connection test failed" : "Test pripojenia zlyhal",
+    "Do you really want to delete the current Server Configuration?" : "Naozaj chcete zmazať súčasné nastavenie servera?",
+    "Confirm Deletion" : "Potvrdiť vymazanie",
+    "_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"],
+    "_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"],
+    "Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu",
+    "Invalid Host" : "Neplatný hostiteľ",
+    "Server" : "Server",
+    "User Filter" : "Filter používateľov",
+    "Login Filter" : "Filter prihlasovania",
+    "Group Filter" : "Filter skupiny",
+    "Save" : "Uložiť",
+    "Test Configuration" : "Test nastavenia",
+    "Help" : "Pomoc",
+    "Groups meeting these criteria are available in %s:" : "Skupiny spĺňajúce tieto kritériá sú k dispozícii v %s:",
+    "only those object classes:" : "len tieto triedy objektov:",
+    "only from those groups:" : "len z týchto skupín:",
+    "Edit raw filter instead" : "Miesto pre úpravu raw filtra",
+    "Raw LDAP filter" : "Raw LDAP filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
+    "groups found" : "nájdené skupiny",
+    "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
+    "LDAP Username:" : "LDAP používateľské meno:",
+    "LDAP Email Address:" : "LDAP emailová adresa:",
+    "Other Attributes:" : "Iné atribúty:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Pridať nastavenia servera.",
+    "Delete Configuration" : "Zmazať nastavenia",
+    "Host" : "Hostiteľ",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
+    "Port" : "Port",
+    "User DN" : "Používateľské 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." : "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
+    "Password" : "Heslo",
+    "For anonymous access, leave DN and Password empty." : "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
+    "One Base DN per line" : "Jedno základné DN na riadok",
+    "You can specify Base DN for users and groups in the Advanced tab" : "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny",
+    "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
+    "users found" : "nájdení používatelia",
+    "Back" : "Späť",
+    "Continue" : "Pokračovať",
+    "Expert" : "Expert",
+    "Advanced" : "Rozšírené",
+    "<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>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požiadajte administrátora systému, aby ho nainštaloval.",
+    "Connection Settings" : "Nastavenie pripojenia",
+    "Configuration Active" : "Nastavenia sú aktívne ",
+    "When unchecked, this configuration will be skipped." : "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
+    "Backup (Replica) Host" : "Záložný server (kópia) hostiteľa",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera.",
+    "Backup (Replica) Port" : "Záložný server (kópia) port",
+    "Disable Main Server" : "Zakázať hlavný server",
+    "Only connect to the replica server." : "Pripojiť sa len k záložnému serveru.",
+    "Case insensitive LDAP server (Windows)" : "LDAP server je citlivý na veľkosť písmen (Windows)",
+    "Turn off SSL certificate validation." : "Vypnúť overovanie SSL certifikátu.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
+    "Cache Time-To-Live" : "Životnosť objektov vo vyrovnávacej pamäti",
+    "in seconds. A change empties the cache." : "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
+    "Directory Settings" : "Nastavenia priečinka",
+    "User Display Name Field" : "Pole pre zobrazované meno používateľa",
+    "The LDAP attribute to use to generate the user's display name." : "Atribút LDAP použitý na vygenerovanie zobrazovaného mena používateľa. ",
+    "Base User Tree" : "Základný používateľský strom",
+    "One User Base DN per line" : "Jedna používateľská základná DN na riadok",
+    "User Search Attributes" : "Atribúty vyhľadávania používateľov",
+    "Optional; one attribute per line" : "Voliteľné, jeden atribút na jeden riadok",
+    "Group Display Name Field" : "Pole pre zobrazenie mena skupiny",
+    "The LDAP attribute to use to generate the groups's display name." : "Atribút LDAP použitý na vygenerovanie zobrazovaného mena skupiny.",
+    "Base Group Tree" : "Základný skupinový strom",
+    "One Group Base DN per line" : "Jedna skupinová základná DN na riadok",
+    "Group Search Attributes" : "Atribúty vyhľadávania skupín",
+    "Group-Member association" : "Priradenie člena skupiny",
+    "Nested Groups" : "Vnorené skupiny",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Ak je zapnuté, tak je možné používať skupiny, ktoré obsahujú iné skupiny. (Funguje, len ak atribút člena skupiny obsahuje DN.)",
+    "Paging chunksize" : "Veľkosť bloku stránkovania",
+    "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.)" : "Veľkosť bloku sa používa pri vyhľadávaní v LDAP v prípadoch veľkých výsledkov hľadania ako napr. zoznamy všetkých používateľov alebo skupín. (Nastavením na 0 vypnete stránkované vyhľadávanie v LDAP v týchto situáciách.)",
+    "Special Attributes" : "Špeciálne atribúty",
+    "Quota Field" : "Pole kvóty",
+    "Quota Default" : "Predvolená kvóta",
+    "in bytes" : "v bajtoch",
+    "Email Field" : "Pole emailu",
+    "User Home Folder Naming Rule" : "Pravidlo pre nastavenie názvu používateľského priečinka dát",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút z LDAP/AD.",
+    "Internal Username" : "Interné používateľské meno",
+    "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." : "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby *DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov.",
+    "Internal Username Attribute:" : "Atribút interného používateľského mena:",
+    "Override UUID detection" : "Prepísať UUID detekciu",
+    "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." : "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné používateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri používateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP.",
+    "UUID Attribute for Users:" : "UUID atribút pre používateľov:",
+    "UUID Attribute for Groups:" : "UUID atribút pre skupiny:",
+    "Username-LDAP User Mapping" : "Mapovanie názvov LDAP používateľských mien",
+    "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." : "Používateľské mená sa používajú pre uchovávanie a priraďovanie (meta) dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapovaní vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze.",
+    "Clear Username-LDAP User Mapping" : "Zrušiť mapovanie LDAP používateľských mien",
+    "Clear Groupname-LDAP Group Mapping" : "Zrušiť mapovanie názvov LDAP skupín"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json
new file mode 100644
index 00000000000..2baab6b88b1
--- /dev/null
+++ b/apps/user_ldap/l10n/sk_SK.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Nepodarilo sa vymazať mapovania.",
+    "Failed to delete the server configuration" : "Zlyhalo zmazanie nastavenia servera.",
+    "The configuration is valid and the connection could be established!" : "Nastavenie je v poriadku a pripojenie je stabilné.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Nastavenie je v poriadku, ale pripojenie zlyhalo. Skontrolujte nastavenia servera a prihlasovacie údaje.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurácia je chybná. Prosím, pozrite sa do logov pre ďalšie podrobnosti.",
+    "No action specified" : "Nie je vybraná akcia",
+    "No configuration specified" : "Nie je určená konfigurácia",
+    "No data specified" : "Nie sú vybraté dáta",
+    " Could not set configuration %s" : "Nemôžem nastaviť konfiguráciu %s",
+    "Deletion failed" : "Odstránenie zlyhalo",
+    "Take over settings from recent server configuration?" : "Prebrať nastavenia z nedávneho nastavenia servera?",
+    "Keep settings?" : "Ponechať nastavenia?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Nemožno pridať nastavenie servera",
+    "mappings cleared" : "mapovanie vymazané",
+    "Success" : "Úspešné",
+    "Error" : "Chyba",
+    "Please specify a Base DN" : "Prosím, zadajte základnú DN",
+    "Could not determine Base DN" : "Nemožno určiť základnú DN",
+    "Please specify the port" : "Prosím, zadajte port",
+    "Configuration OK" : "Konfigurácia je v poriadku",
+    "Configuration incorrect" : "Nesprávna konfigurácia",
+    "Configuration incomplete" : "Nekompletná konfigurácia",
+    "Select groups" : "Vybrať skupinu",
+    "Select object classes" : "Vyberte triedy objektov",
+    "Select attributes" : "Vyberte atribúty",
+    "Connection test succeeded" : "Test pripojenia bol úspešný",
+    "Connection test failed" : "Test pripojenia zlyhal",
+    "Do you really want to delete the current Server Configuration?" : "Naozaj chcete zmazať súčasné nastavenie servera?",
+    "Confirm Deletion" : "Potvrdiť vymazanie",
+    "_%s group found_::_%s groups found_" : ["%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"],
+    "_%s user found_::_%s users found_" : ["%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"],
+    "Could not find the desired feature" : "Nemožno nájsť požadovanú funkciu",
+    "Invalid Host" : "Neplatný hostiteľ",
+    "Server" : "Server",
+    "User Filter" : "Filter používateľov",
+    "Login Filter" : "Filter prihlasovania",
+    "Group Filter" : "Filter skupiny",
+    "Save" : "Uložiť",
+    "Test Configuration" : "Test nastavenia",
+    "Help" : "Pomoc",
+    "Groups meeting these criteria are available in %s:" : "Skupiny spĺňajúce tieto kritériá sú k dispozícii v %s:",
+    "only those object classes:" : "len tieto triedy objektov:",
+    "only from those groups:" : "len z týchto skupín:",
+    "Edit raw filter instead" : "Miesto pre úpravu raw filtra",
+    "Raw LDAP filter" : "Raw LDAP filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
+    "groups found" : "nájdené skupiny",
+    "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
+    "LDAP Username:" : "LDAP používateľské meno:",
+    "LDAP Email Address:" : "LDAP emailová adresa:",
+    "Other Attributes:" : "Iné atribúty:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Pridať nastavenia servera.",
+    "Delete Configuration" : "Zmazať nastavenia",
+    "Host" : "Hostiteľ",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
+    "Port" : "Port",
+    "User DN" : "Používateľské 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." : "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
+    "Password" : "Heslo",
+    "For anonymous access, leave DN and Password empty." : "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
+    "One Base DN per line" : "Jedno základné DN na riadok",
+    "You can specify Base DN for users and groups in the Advanced tab" : "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny",
+    "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
+    "users found" : "nájdení používatelia",
+    "Back" : "Späť",
+    "Continue" : "Pokračovať",
+    "Expert" : "Expert",
+    "Advanced" : "Rozšírené",
+    "<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>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požiadajte administrátora systému, aby ho nainštaloval.",
+    "Connection Settings" : "Nastavenie pripojenia",
+    "Configuration Active" : "Nastavenia sú aktívne ",
+    "When unchecked, this configuration will be skipped." : "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
+    "Backup (Replica) Host" : "Záložný server (kópia) hostiteľa",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera.",
+    "Backup (Replica) Port" : "Záložný server (kópia) port",
+    "Disable Main Server" : "Zakázať hlavný server",
+    "Only connect to the replica server." : "Pripojiť sa len k záložnému serveru.",
+    "Case insensitive LDAP server (Windows)" : "LDAP server je citlivý na veľkosť písmen (Windows)",
+    "Turn off SSL certificate validation." : "Vypnúť overovanie SSL certifikátu.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
+    "Cache Time-To-Live" : "Životnosť objektov vo vyrovnávacej pamäti",
+    "in seconds. A change empties the cache." : "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
+    "Directory Settings" : "Nastavenia priečinka",
+    "User Display Name Field" : "Pole pre zobrazované meno používateľa",
+    "The LDAP attribute to use to generate the user's display name." : "Atribút LDAP použitý na vygenerovanie zobrazovaného mena používateľa. ",
+    "Base User Tree" : "Základný používateľský strom",
+    "One User Base DN per line" : "Jedna používateľská základná DN na riadok",
+    "User Search Attributes" : "Atribúty vyhľadávania používateľov",
+    "Optional; one attribute per line" : "Voliteľné, jeden atribút na jeden riadok",
+    "Group Display Name Field" : "Pole pre zobrazenie mena skupiny",
+    "The LDAP attribute to use to generate the groups's display name." : "Atribút LDAP použitý na vygenerovanie zobrazovaného mena skupiny.",
+    "Base Group Tree" : "Základný skupinový strom",
+    "One Group Base DN per line" : "Jedna skupinová základná DN na riadok",
+    "Group Search Attributes" : "Atribúty vyhľadávania skupín",
+    "Group-Member association" : "Priradenie člena skupiny",
+    "Nested Groups" : "Vnorené skupiny",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Ak je zapnuté, tak je možné používať skupiny, ktoré obsahujú iné skupiny. (Funguje, len ak atribút člena skupiny obsahuje DN.)",
+    "Paging chunksize" : "Veľkosť bloku stránkovania",
+    "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.)" : "Veľkosť bloku sa používa pri vyhľadávaní v LDAP v prípadoch veľkých výsledkov hľadania ako napr. zoznamy všetkých používateľov alebo skupín. (Nastavením na 0 vypnete stránkované vyhľadávanie v LDAP v týchto situáciách.)",
+    "Special Attributes" : "Špeciálne atribúty",
+    "Quota Field" : "Pole kvóty",
+    "Quota Default" : "Predvolená kvóta",
+    "in bytes" : "v bajtoch",
+    "Email Field" : "Pole emailu",
+    "User Home Folder Naming Rule" : "Pravidlo pre nastavenie názvu používateľského priečinka dát",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút z LDAP/AD.",
+    "Internal Username" : "Interné používateľské meno",
+    "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." : "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby *DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov.",
+    "Internal Username Attribute:" : "Atribút interného používateľského mena:",
+    "Override UUID detection" : "Prepísať UUID detekciu",
+    "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." : "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné používateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri používateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP.",
+    "UUID Attribute for Users:" : "UUID atribút pre používateľov:",
+    "UUID Attribute for Groups:" : "UUID atribút pre skupiny:",
+    "Username-LDAP User Mapping" : "Mapovanie názvov LDAP používateľských mien",
+    "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." : "Používateľské mená sa používajú pre uchovávanie a priraďovanie (meta) dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapovaní vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze.",
+    "Clear Username-LDAP User Mapping" : "Zrušiť mapovanie LDAP používateľských mien",
+    "Clear Groupname-LDAP Group Mapping" : "Zrušiť mapovanie názvov LDAP skupín"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/sk_SK.php b/apps/user_ldap/l10n/sk_SK.php
deleted file mode 100644
index f1a7da49cb8..00000000000
--- a/apps/user_ldap/l10n/sk_SK.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Nepodarilo sa vymazať mapovania.",
-"Failed to delete the server configuration" => "Zlyhalo zmazanie nastavenia servera.",
-"The configuration is valid and the connection could be established!" => "Nastavenie je v poriadku a pripojenie je stabilné.",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavenie je v poriadku, ale pripojenie zlyhalo. Skontrolujte nastavenia servera a prihlasovacie údaje.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Konfigurácia je chybná. Prosím, pozrite sa do logov pre ďalšie podrobnosti.",
-"No action specified" => "Nie je vybraná akcia",
-"No configuration specified" => "Nie je určená konfigurácia",
-"No data specified" => "Nie sú vybraté dáta",
-" Could not set configuration %s" => "Nemôžem nastaviť konfiguráciu %s",
-"Deletion failed" => "Odstránenie zlyhalo",
-"Take over settings from recent server configuration?" => "Prebrať nastavenia z nedávneho nastavenia servera?",
-"Keep settings?" => "Ponechať nastavenia?",
-"{nthServer}. Server" => "{nthServer}. Server",
-"Cannot add server configuration" => "Nemožno pridať nastavenie servera",
-"mappings cleared" => "mapovanie vymazané",
-"Success" => "Úspešné",
-"Error" => "Chyba",
-"Please specify a Base DN" => "Prosím, zadajte základnú DN",
-"Could not determine Base DN" => "Nemožno určiť základnú DN",
-"Please specify the port" => "Prosím, zadajte port",
-"Configuration OK" => "Konfigurácia je v poriadku",
-"Configuration incorrect" => "Nesprávna konfigurácia",
-"Configuration incomplete" => "Nekompletná konfigurácia",
-"Select groups" => "Vybrať skupinu",
-"Select object classes" => "Vyberte triedy objektov",
-"Select attributes" => "Vyberte atribúty",
-"Connection test succeeded" => "Test pripojenia bol úspešný",
-"Connection test failed" => "Test pripojenia zlyhal",
-"Do you really want to delete the current Server Configuration?" => "Naozaj chcete zmazať súčasné nastavenie servera?",
-"Confirm Deletion" => "Potvrdiť vymazanie",
-"_%s group found_::_%s groups found_" => array("%s nájdená skupina","%s nájdené skupiny","%s nájdených skupín"),
-"_%s user found_::_%s users found_" => array("%s nájdený používateľ","%s nájdení používatelia","%s nájdených používateľov"),
-"Could not find the desired feature" => "Nemožno nájsť požadovanú funkciu",
-"Invalid Host" => "Neplatný hostiteľ",
-"Server" => "Server",
-"User Filter" => "Filter používateľov",
-"Login Filter" => "Filter prihlasovania",
-"Group Filter" => "Filter skupiny",
-"Save" => "Uložiť",
-"Test Configuration" => "Test nastavenia",
-"Help" => "Pomoc",
-"Groups meeting these criteria are available in %s:" => "Skupiny spĺňajúce tieto kritériá sú k dispozícii v %s:",
-"only those object classes:" => "len tieto triedy objektov:",
-"only from those groups:" => "len z týchto skupín:",
-"Edit raw filter instead" => "Miesto pre úpravu raw filtra",
-"Raw LDAP filter" => "Raw LDAP filter",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
-"groups found" => "nájdené skupiny",
-"Users login with this attribute:" => "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
-"LDAP Username:" => "LDAP používateľské meno:",
-"LDAP Email Address:" => "LDAP emailová adresa:",
-"Other Attributes:" => "Iné atribúty:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahrádza používateľské meno v činnosti prihlásenia. Napríklad: \"uid=%%uid\"",
-"1. Server" => "1. Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Pridať nastavenia servera.",
-"Delete Configuration" => "Zmazať nastavenia",
-"Host" => "Hostiteľ",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Môžete vynechať protokol, okrem prípadu, kedy sa vyžaduje SSL. Vtedy začnite s ldaps://",
-"Port" => "Port",
-"User DN" => "Používateľské 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." => "DN klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
-"Password" => "Heslo",
-"For anonymous access, leave DN and Password empty." => "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
-"One Base DN per line" => "Jedno základné DN na riadok",
-"You can specify Base DN for users and groups in the Advanced tab" => "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny",
-"Limit %s access to users meeting these criteria:" => "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
-"users found" => "nájdení používatelia",
-"Back" => "Späť",
-"Continue" => "Pokračovať",
-"Expert" => "Expert",
-"Advanced" => "Rozšírené",
-"<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>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Upozornenie:</b> nie je nainštalovaný LDAP modul pre PHP, backend vrstva nebude fungovať. Požiadajte administrátora systému, aby ho nainštaloval.",
-"Connection Settings" => "Nastavenie pripojenia",
-"Configuration Active" => "Nastavenia sú aktívne ",
-"When unchecked, this configuration will be skipped." => "Ak nie je zaškrtnuté, nastavenie bude preskočené.",
-"Backup (Replica) Host" => "Záložný server (kópia) hostiteľa",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Zadajte záložný LDAP/AD. Musí to byť kópia hlavného LDAP/AD servera.",
-"Backup (Replica) Port" => "Záložný server (kópia) port",
-"Disable Main Server" => "Zakázať hlavný server",
-"Only connect to the replica server." => "Pripojiť sa len k záložnému serveru.",
-"Case insensitive LDAP server (Windows)" => "LDAP server je citlivý na veľkosť písmen (Windows)",
-"Turn off SSL certificate validation." => "Vypnúť overovanie SSL certifikátu.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Neodporúčané, použite iba pri testovaní! Pokiaľ spojenie funguje iba z daným nastavením, importujte SSL certifikát LDAP servera do vášho %s servera.",
-"Cache Time-To-Live" => "Životnosť objektov vo vyrovnávacej pamäti",
-"in seconds. A change empties the cache." => "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť.",
-"Directory Settings" => "Nastavenia priečinka",
-"User Display Name Field" => "Pole pre zobrazované meno používateľa",
-"The LDAP attribute to use to generate the user's display name." => "Atribút LDAP použitý na vygenerovanie zobrazovaného mena používateľa. ",
-"Base User Tree" => "Základný používateľský strom",
-"One User Base DN per line" => "Jedna používateľská základná DN na riadok",
-"User Search Attributes" => "Atribúty vyhľadávania používateľov",
-"Optional; one attribute per line" => "Voliteľné, jeden atribút na jeden riadok",
-"Group Display Name Field" => "Pole pre zobrazenie mena skupiny",
-"The LDAP attribute to use to generate the groups's display name." => "Atribút LDAP použitý na vygenerovanie zobrazovaného mena skupiny.",
-"Base Group Tree" => "Základný skupinový strom",
-"One Group Base DN per line" => "Jedna skupinová základná DN na riadok",
-"Group Search Attributes" => "Atribúty vyhľadávania skupín",
-"Group-Member association" => "Priradenie člena skupiny",
-"Nested Groups" => "Vnorené skupiny",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Ak je zapnuté, tak je možné používať skupiny, ktoré obsahujú iné skupiny. (Funguje, len ak atribút člena skupiny obsahuje DN.)",
-"Paging chunksize" => "Veľkosť bloku stránkovania",
-"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.)" => "Veľkosť bloku sa používa pri vyhľadávaní v LDAP v prípadoch veľkých výsledkov hľadania ako napr. zoznamy všetkých používateľov alebo skupín. (Nastavením na 0 vypnete stránkované vyhľadávanie v LDAP v týchto situáciách.)",
-"Special Attributes" => "Špeciálne atribúty",
-"Quota Field" => "Pole kvóty",
-"Quota Default" => "Predvolená kvóta",
-"in bytes" => "v bajtoch",
-"Email Field" => "Pole emailu",
-"User Home Folder Naming Rule" => "Pravidlo pre nastavenie názvu používateľského priečinka dát",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút z LDAP/AD.",
-"Internal Username" => "Interné používateľské meno",
-"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." => "V predvolenom nastavení bude interné používateľské meno vytvorené z UUID atribútu. Zabezpečí sa to, že používateľské meno bude jedinečné a znaky nemusia byť prevedené. Interné meno má obmedzenie, iba tieto znaky sú povolené: [a-zA-Z0-9_ @ -.]. Ostatné znaky sú nahradené ich ASCII alebo jednoducho vynechané. Pri kolíziách používateľských mien bude číslo pridané / odobrané. Interné používateľské meno sa používa na internú identifikáciu používateľa. Je tiež predvoleným názvom používateľského domovského priečinka v ownCloud. Je tiež súčasťou URL pre vzdialený prístup, napríklad pre všetky služby *DAV. S týmto nastavením sa dá prepísať predvolené správanie. Pre dosiahnutie podobného správania sa ako pred verziou ownCloud 5 zadajte atribút zobrazenia používateľského mena v tomto poli. Ponechajte prázdne pre predvolené správanie. Zmeny budú mať vplyv iba na novo namapovaných (pridaných) LDAP používateľov.",
-"Internal Username Attribute:" => "Atribút interného používateľského mena:",
-"Override UUID detection" => "Prepísať UUID detekciu",
-"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." => "V predvolenom nastavení je UUID atribút detekovaný automaticky. UUID atribút je použitý na jedinečnú identifikáciu používateľov a skupín z LDAP. Naviac je na základe UUID vytvorené tiež interné používateľské meno, ak nie je nastavené inak. Môžete predvolené nastavenie prepísať a použiť atribút ktorý si sami zvolíte. Musíte sa ale ubezpečiť, že atribút ktorý vyberiete bude uvedený pri používateľoch, aj pri skupinách a je jedinečný. Ponechajte prázdne pre predvolené správanie. Zmena bude mať vplyv len na novo namapovaných (pridaných) používateľov a skupiny z LDAP.",
-"UUID Attribute for Users:" => "UUID atribút pre používateľov:",
-"UUID Attribute for Groups:" => "UUID atribút pre skupiny:",
-"Username-LDAP User Mapping" => "Mapovanie názvov LDAP používateľských mien",
-"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." => "Používateľské mená sa používajú pre uchovávanie a priraďovanie (meta) dát. Pre správnu identifikáciu a rozpoznanie používateľov bude mať každý používateľ z LDAP interné používateľské meno. To je nevyhnutné pre namapovanie používateľských mien na používateľov v LDAP. Vytvorené používateľské meno je namapované na UUID používateľa v LDAP. Naviac je cachovaná DN pre obmedzenie interakcie s LDAP, ale nie je používaná pre identifikáciu. Ak sa DN zmení, bude to správne rozpoznané. Interné používateľské meno sa používa všade. Vyčistenie namapovaní vymaže zvyšky všade. Vyčistenie naviac nie je špecifické, bude mať vplyv na všetky LDAP konfigurácie! Nikdy nečistite namapovanie v produkčnom prostredí, len v testovacej alebo experimentálnej fáze.",
-"Clear Username-LDAP User Mapping" => "Zrušiť mapovanie LDAP používateľských mien",
-"Clear Groupname-LDAP Group Mapping" => "Zrušiť mapovanie názvov LDAP skupín"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js
new file mode 100644
index 00000000000..89b46edd439
--- /dev/null
+++ b/apps/user_ldap/l10n/sl.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Čiščenje preslikav je spodletelo.",
+    "Failed to delete the server configuration" : "Brisanje nastavitev strežnika je spodletelo.",
+    "The configuration is valid and the connection could be established!" : "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Nastavitev je veljavna, vendar pa je vez spodletela. Preveriti je treba nastavitve strežnika in ustreznost poveril.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Nastavitev ni veljavna. Več podrobnosti o napaki je zabeleženih v dnevniku.",
+    "No action specified" : "Ni določenega dejanja",
+    "No configuration specified" : "Ni določenih nastavitev",
+    "No data specified" : "Ni navedenih podatkov",
+    " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s",
+    "Deletion failed" : "Brisanje je spodletelo.",
+    "Take over settings from recent server configuration?" : "Ali naj bodo prevzete nedavne nastavitve strežnika?",
+    "Keep settings?" : "Ali naj se nastavitve ohranijo?",
+    "{nthServer}. Server" : "{nthServer}. strežnik",
+    "Cannot add server configuration" : "Ni mogoče dodati nastavitev strežnika",
+    "mappings cleared" : "preslikave so izbrisane",
+    "Success" : "Uspešno končano.",
+    "Error" : "Napaka",
+    "Please specify a Base DN" : "Določite osnovno enolično ime (base DN)",
+    "Could not determine Base DN" : "Ni mogoče določiti osnovnega enoličnega imena (base DN)",
+    "Please specify the port" : "Določiti je treba vrata",
+    "Configuration OK" : "Nastavitev je ustrezna",
+    "Configuration incorrect" : "Nastavitev ni ustrezna",
+    "Configuration incomplete" : "Nastavitev je nepopolna",
+    "Select groups" : "Izberi skupine",
+    "Select object classes" : "Izbor razredov predmeta",
+    "Select attributes" : "Izbor atributov",
+    "Connection test succeeded" : "Preizkus povezave je uspešno končan.",
+    "Connection test failed" : "Preizkus povezave je spodletel.",
+    "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?",
+    "Confirm Deletion" : "Potrdi brisanje",
+    "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"],
+    "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"],
+    "Could not find the desired feature" : "Želene zmožnosti ni mogoče najti",
+    "Invalid Host" : "Neveljaven gostitelj",
+    "Server" : "Strežnik",
+    "User Filter" : "Uporabniški filter",
+    "Login Filter" : "Filter prijave",
+    "Group Filter" : "Filter skupin",
+    "Save" : "Shrani",
+    "Test Configuration" : "Preizkusne nastavitve",
+    "Help" : "Pomoč",
+    "Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
+    "only those object classes:" : "le razredi predmeta:",
+    "only from those groups:" : "le iz skupin:",
+    "Edit raw filter instead" : "Uredi surov filter",
+    "Raw LDAP filter" : "Surovi filter LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
+    "groups found" : "najdenih skupin",
+    "Users login with this attribute:" : "Uporabniki se prijavijo z atributom:",
+    "LDAP Username:" : "Uporabniško ime LDAP:",
+    "LDAP Email Address:" : "Elektronski naslov LDAP:",
+    "Other Attributes:" : "Drugi atributi:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
+    "1. Server" : "1. strežnik",
+    "%s. Server:" : "%s. strežnik:",
+    "Add Server Configuration" : "Dodaj nastavitve strežnika",
+    "Delete Configuration" : "Izbriši nastavitve",
+    "Host" : "Gostitelj",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
+    "Port" : "Vrata",
+    "User DN" : "Uporabnikovo enolično ime",
+    "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." : "Enolično ime uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji prikaznega imena in gesla prazni.",
+    "Password" : "Geslo",
+    "For anonymous access, leave DN and Password empty." : "Za brezimni dostop naj bosta polji imena in gesla prazni.",
+    "One Base DN per line" : "Eno osnovno enolično ime na vrstico",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.",
+    "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
+    "users found" : "najdenih uporabnikov",
+    "Back" : "Nazaj",
+    "Continue" : "Nadaljuj",
+    "Expert" : "Napredno",
+    "Advanced" : "Napredne možnosti",
+    "<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Opozorilo:</b> modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti.",
+    "Connection Settings" : "Nastavitve povezave",
+    "Configuration Active" : "Dejavna nastavitev",
+    "When unchecked, this configuration will be skipped." : "Neizbrana možnost preskoči nastavitev.",
+    "Backup (Replica) Host" : "Varnostna kopija (replika) podatkov gostitelja",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD.",
+    "Backup (Replica) Port" : "Vrata varnostne kopije (replike)",
+    "Disable Main Server" : "Onemogoči glavni strežnik",
+    "Only connect to the replica server." : "Poveži le s podvojenim strežnikom.",
+    "Case insensitive LDAP server (Windows)" : "Strežnik LDAP (brez upoštevanja velikosti črk) (Windows)",
+    "Turn off SSL certificate validation." : "Onemogoči določanje veljavnosti potrdila SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Možnosti ni priporočljivo uporabiti; namenjena je zgolj preizkušanju! Če deluje povezava le s to možnostjo, je treba uvoziti potrdilo SSL strežnika LDAP na strežnik %s.",
+    "Cache Time-To-Live" : "Predpomni podatke TTL",
+    "in seconds. A change empties the cache." : "v sekundah. Sprememba izprazni predpomnilnik.",
+    "Directory Settings" : "Nastavitve mape",
+    "User Display Name Field" : "Polje za uporabnikovo prikazano ime",
+    "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena uporabnika.",
+    "Base User Tree" : "Osnovno uporabniško drevo",
+    "One User Base DN per line" : "Eno osnovno uporabniško ime na vrstico",
+    "User Search Attributes" : "Uporabnikovi atributi iskanja",
+    "Optional; one attribute per line" : "Izbirno; en atribut na vrstico",
+    "Group Display Name Field" : "Polje za prikazano ime skupine",
+    "The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena skupine.",
+    "Base Group Tree" : "Osnovno drevo skupine",
+    "One Group Base DN per line" : "Eno osnovno ime skupine na vrstico",
+    "Group Search Attributes" : "Skupinski atributi iskanja",
+    "Group-Member association" : "Povezava član-skupina",
+    "Nested Groups" : "Gnezdene skupine",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Možnost omogoča podporo skupinam, ki vključujejo skupine. Deluje je, če atribut članstva skupine vsebuje enolično ime (DN).",
+    "Paging chunksize" : "Velikost odvoda za razbremenitev delovnega pomnilnik",
+    "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.)" : "Velikost odvoda za razbremenitev delovnega pomnilnika, ki ga uporablja iskalnik LDAP, pri oštevilčenju uporabnika ali skupine (vrednost 0 možnost onemogoči).",
+    "Special Attributes" : "Posebni atributi",
+    "Quota Field" : "Polje količinske omejitve",
+    "Quota Default" : "Privzeta količinska omejitev",
+    "in bytes" : "v bajtih",
+    "Email Field" : "Polje elektronske pošte",
+    "User Home Folder Naming Rule" : "Pravila poimenovanja uporabniške osebne mape",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD.",
+    "Internal Username" : "Programsko uporabniško ime",
+    "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." : "Privzeto je notranje uporabniško ime ustvarjeno na osnovi atributa UUID. To omogoča določitev uporabniškega imena kot enoličnega, zato znakov ni treba pretvarjati. Notranje ime je omejeno na standardne znake: [ a-zA-Z0-9_.@- ]. Morebitni drugi znaki so zamenjani z ustreznim ASCII znakom, ali pa so enostavno izpuščeni. V primeru sporov je prišteta ali odšteta številčna vrednost. Notranje uporabniško ime je uporabljeno za določanje uporabnika in je privzeto ime uporabnikove domače mape. Hkrati je tudi del oddaljenega naslova URL, na primer za storitve *DAV. S to nastavitvijo je prepisan privzet način delovanja. Pri različicah ownCloud, nižjih od 5.0, je podoben učinek mogoče doseči z vpisom prikaznega imena oziroma z neizpolnjenim (praznim) poljem te vrednosti. Spremembe bodo uveljavljene le za nove preslikane (dodane) uporabnike LDAP.",
+    "Internal Username Attribute:" : "Programski atribut uporabniškega imena:",
+    "Override UUID detection" : "Prezri zaznavo 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." : "Privzeto je atribut UUID samodejno zaznan. Uporabljen je za določevanje uporabnikov LDAP in skupin. Notranje uporabniško ime je določeno prav na atributu UUID, če ni določeno drugače. To nastavitev je mogoče prepisati in poslati poljuben atribut. Zagotoviti je treba le, da je ta pridobljen kot enolični podatek za uporabnika ali skupino. Prazno polje določa privzeti način. Spremembe bodo vplivale na novo preslikane (dodane) uporabnike LDAP in skupine.",
+    "UUID Attribute for Users:" : "Atribut UUID za uporabnike:",
+    "UUID Attribute for Groups:" : "Atribut UUID za skupine:",
+    "Username-LDAP User Mapping" : "Uporabniška preslikava uporabniškega imena na LDAP",
+    "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." : "Uporabniška imena so uporabljena za shranjevanje in dodeljevanje (meta) podatkov. Za natančno določanje in prepoznavanje uporabnikov je uporabljen sistem notranjega uporabniškega imena vsakega uporabnika LDAP. Ta možnost zahteva preslikavo uporabniškega imena v uporabnika LDAP in preslikano na njegov UUID. Sistem predpomni enolična imena za zmanjšanje odvisnosti LDAP, vendar pa ta podatek ni uporabljen za določevanje uporabnika. Če se enolično ime spremeni, se spremeni notranje uporabniško ime. Čiščenje preslikav pušča ostanke podatkov in vpliva na vse nastavitve LDAP! V delovnem okolju zato spreminjanje preslikav ni priporočljivo, možnost pa je na voljo za preizkušanje.",
+    "Clear Username-LDAP User Mapping" : "Izbriši preslikavo uporabniškega imena na LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Izbriši preslikavo skupine na LDAP"
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json
new file mode 100644
index 00000000000..7d12c2c919d
--- /dev/null
+++ b/apps/user_ldap/l10n/sl.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Čiščenje preslikav je spodletelo.",
+    "Failed to delete the server configuration" : "Brisanje nastavitev strežnika je spodletelo.",
+    "The configuration is valid and the connection could be established!" : "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Nastavitev je veljavna, vendar pa je vez spodletela. Preveriti je treba nastavitve strežnika in ustreznost poveril.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Nastavitev ni veljavna. Več podrobnosti o napaki je zabeleženih v dnevniku.",
+    "No action specified" : "Ni določenega dejanja",
+    "No configuration specified" : "Ni določenih nastavitev",
+    "No data specified" : "Ni navedenih podatkov",
+    " Could not set configuration %s" : "Ni mogoče uveljaviti nastavitev %s",
+    "Deletion failed" : "Brisanje je spodletelo.",
+    "Take over settings from recent server configuration?" : "Ali naj bodo prevzete nedavne nastavitve strežnika?",
+    "Keep settings?" : "Ali naj se nastavitve ohranijo?",
+    "{nthServer}. Server" : "{nthServer}. strežnik",
+    "Cannot add server configuration" : "Ni mogoče dodati nastavitev strežnika",
+    "mappings cleared" : "preslikave so izbrisane",
+    "Success" : "Uspešno končano.",
+    "Error" : "Napaka",
+    "Please specify a Base DN" : "Določite osnovno enolično ime (base DN)",
+    "Could not determine Base DN" : "Ni mogoče določiti osnovnega enoličnega imena (base DN)",
+    "Please specify the port" : "Določiti je treba vrata",
+    "Configuration OK" : "Nastavitev je ustrezna",
+    "Configuration incorrect" : "Nastavitev ni ustrezna",
+    "Configuration incomplete" : "Nastavitev je nepopolna",
+    "Select groups" : "Izberi skupine",
+    "Select object classes" : "Izbor razredov predmeta",
+    "Select attributes" : "Izbor atributov",
+    "Connection test succeeded" : "Preizkus povezave je uspešno končan.",
+    "Connection test failed" : "Preizkus povezave je spodletel.",
+    "Do you really want to delete the current Server Configuration?" : "Ali res želite izbrisati trenutne nastavitve strežnika?",
+    "Confirm Deletion" : "Potrdi brisanje",
+    "_%s group found_::_%s groups found_" : ["%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"],
+    "_%s user found_::_%s users found_" : ["%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"],
+    "Could not find the desired feature" : "Želene zmožnosti ni mogoče najti",
+    "Invalid Host" : "Neveljaven gostitelj",
+    "Server" : "Strežnik",
+    "User Filter" : "Uporabniški filter",
+    "Login Filter" : "Filter prijave",
+    "Group Filter" : "Filter skupin",
+    "Save" : "Shrani",
+    "Test Configuration" : "Preizkusne nastavitve",
+    "Help" : "Pomoč",
+    "Groups meeting these criteria are available in %s:" : "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
+    "only those object classes:" : "le razredi predmeta:",
+    "only from those groups:" : "le iz skupin:",
+    "Edit raw filter instead" : "Uredi surov filter",
+    "Raw LDAP filter" : "Surovi filter LDAP",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
+    "groups found" : "najdenih skupin",
+    "Users login with this attribute:" : "Uporabniki se prijavijo z atributom:",
+    "LDAP Username:" : "Uporabniško ime LDAP:",
+    "LDAP Email Address:" : "Elektronski naslov LDAP:",
+    "Other Attributes:" : "Drugi atributi:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
+    "1. Server" : "1. strežnik",
+    "%s. Server:" : "%s. strežnik:",
+    "Add Server Configuration" : "Dodaj nastavitve strežnika",
+    "Delete Configuration" : "Izbriši nastavitve",
+    "Host" : "Gostitelj",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
+    "Port" : "Vrata",
+    "User DN" : "Uporabnikovo enolično ime",
+    "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." : "Enolično ime uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji prikaznega imena in gesla prazni.",
+    "Password" : "Geslo",
+    "For anonymous access, leave DN and Password empty." : "Za brezimni dostop naj bosta polji imena in gesla prazni.",
+    "One Base DN per line" : "Eno osnovno enolično ime na vrstico",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.",
+    "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
+    "users found" : "najdenih uporabnikov",
+    "Back" : "Nazaj",
+    "Continue" : "Nadaljuj",
+    "Expert" : "Napredno",
+    "Advanced" : "Napredne možnosti",
+    "<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Opozorilo:</b> modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti.",
+    "Connection Settings" : "Nastavitve povezave",
+    "Configuration Active" : "Dejavna nastavitev",
+    "When unchecked, this configuration will be skipped." : "Neizbrana možnost preskoči nastavitev.",
+    "Backup (Replica) Host" : "Varnostna kopija (replika) podatkov gostitelja",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD.",
+    "Backup (Replica) Port" : "Vrata varnostne kopije (replike)",
+    "Disable Main Server" : "Onemogoči glavni strežnik",
+    "Only connect to the replica server." : "Poveži le s podvojenim strežnikom.",
+    "Case insensitive LDAP server (Windows)" : "Strežnik LDAP (brez upoštevanja velikosti črk) (Windows)",
+    "Turn off SSL certificate validation." : "Onemogoči določanje veljavnosti potrdila SSL.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Možnosti ni priporočljivo uporabiti; namenjena je zgolj preizkušanju! Če deluje povezava le s to možnostjo, je treba uvoziti potrdilo SSL strežnika LDAP na strežnik %s.",
+    "Cache Time-To-Live" : "Predpomni podatke TTL",
+    "in seconds. A change empties the cache." : "v sekundah. Sprememba izprazni predpomnilnik.",
+    "Directory Settings" : "Nastavitve mape",
+    "User Display Name Field" : "Polje za uporabnikovo prikazano ime",
+    "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena uporabnika.",
+    "Base User Tree" : "Osnovno uporabniško drevo",
+    "One User Base DN per line" : "Eno osnovno uporabniško ime na vrstico",
+    "User Search Attributes" : "Uporabnikovi atributi iskanja",
+    "Optional; one attribute per line" : "Izbirno; en atribut na vrstico",
+    "Group Display Name Field" : "Polje za prikazano ime skupine",
+    "The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena skupine.",
+    "Base Group Tree" : "Osnovno drevo skupine",
+    "One Group Base DN per line" : "Eno osnovno ime skupine na vrstico",
+    "Group Search Attributes" : "Skupinski atributi iskanja",
+    "Group-Member association" : "Povezava član-skupina",
+    "Nested Groups" : "Gnezdene skupine",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Možnost omogoča podporo skupinam, ki vključujejo skupine. Deluje je, če atribut članstva skupine vsebuje enolično ime (DN).",
+    "Paging chunksize" : "Velikost odvoda za razbremenitev delovnega pomnilnik",
+    "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.)" : "Velikost odvoda za razbremenitev delovnega pomnilnika, ki ga uporablja iskalnik LDAP, pri oštevilčenju uporabnika ali skupine (vrednost 0 možnost onemogoči).",
+    "Special Attributes" : "Posebni atributi",
+    "Quota Field" : "Polje količinske omejitve",
+    "Quota Default" : "Privzeta količinska omejitev",
+    "in bytes" : "v bajtih",
+    "Email Field" : "Polje elektronske pošte",
+    "User Home Folder Naming Rule" : "Pravila poimenovanja uporabniške osebne mape",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD.",
+    "Internal Username" : "Programsko uporabniško ime",
+    "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." : "Privzeto je notranje uporabniško ime ustvarjeno na osnovi atributa UUID. To omogoča določitev uporabniškega imena kot enoličnega, zato znakov ni treba pretvarjati. Notranje ime je omejeno na standardne znake: [ a-zA-Z0-9_.@- ]. Morebitni drugi znaki so zamenjani z ustreznim ASCII znakom, ali pa so enostavno izpuščeni. V primeru sporov je prišteta ali odšteta številčna vrednost. Notranje uporabniško ime je uporabljeno za določanje uporabnika in je privzeto ime uporabnikove domače mape. Hkrati je tudi del oddaljenega naslova URL, na primer za storitve *DAV. S to nastavitvijo je prepisan privzet način delovanja. Pri različicah ownCloud, nižjih od 5.0, je podoben učinek mogoče doseči z vpisom prikaznega imena oziroma z neizpolnjenim (praznim) poljem te vrednosti. Spremembe bodo uveljavljene le za nove preslikane (dodane) uporabnike LDAP.",
+    "Internal Username Attribute:" : "Programski atribut uporabniškega imena:",
+    "Override UUID detection" : "Prezri zaznavo 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." : "Privzeto je atribut UUID samodejno zaznan. Uporabljen je za določevanje uporabnikov LDAP in skupin. Notranje uporabniško ime je določeno prav na atributu UUID, če ni določeno drugače. To nastavitev je mogoče prepisati in poslati poljuben atribut. Zagotoviti je treba le, da je ta pridobljen kot enolični podatek za uporabnika ali skupino. Prazno polje določa privzeti način. Spremembe bodo vplivale na novo preslikane (dodane) uporabnike LDAP in skupine.",
+    "UUID Attribute for Users:" : "Atribut UUID za uporabnike:",
+    "UUID Attribute for Groups:" : "Atribut UUID za skupine:",
+    "Username-LDAP User Mapping" : "Uporabniška preslikava uporabniškega imena na LDAP",
+    "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." : "Uporabniška imena so uporabljena za shranjevanje in dodeljevanje (meta) podatkov. Za natančno določanje in prepoznavanje uporabnikov je uporabljen sistem notranjega uporabniškega imena vsakega uporabnika LDAP. Ta možnost zahteva preslikavo uporabniškega imena v uporabnika LDAP in preslikano na njegov UUID. Sistem predpomni enolična imena za zmanjšanje odvisnosti LDAP, vendar pa ta podatek ni uporabljen za določevanje uporabnika. Če se enolično ime spremeni, se spremeni notranje uporabniško ime. Čiščenje preslikav pušča ostanke podatkov in vpliva na vse nastavitve LDAP! V delovnem okolju zato spreminjanje preslikav ni priporočljivo, možnost pa je na voljo za preizkušanje.",
+    "Clear Username-LDAP User Mapping" : "Izbriši preslikavo uporabniškega imena na LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Izbriši preslikavo skupine na LDAP"
+},"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_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
deleted file mode 100644
index e37caa2fd92..00000000000
--- a/apps/user_ldap/l10n/sl.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Čiščenje preslikav je spodletelo.",
-"Failed to delete the server configuration" => "Brisanje nastavitev strežnika je spodletelo.",
-"The configuration is valid and the connection could be established!" => "Nastavitev je veljavna, zato je povezavo mogoče vzpostaviti!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Nastavitev je veljavna, vendar pa je vez spodletela. Preveriti je treba nastavitve strežnika in ustreznost poveril.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Nastavitev ni veljavna. Več podrobnosti o napaki je zabeleženih v dnevniku.",
-"No action specified" => "Ni določenega dejanja",
-"No configuration specified" => "Ni določenih nastavitev",
-"No data specified" => "Ni navedenih podatkov",
-" Could not set configuration %s" => "Ni mogoče uveljaviti nastavitev %s",
-"Deletion failed" => "Brisanje je spodletelo.",
-"Take over settings from recent server configuration?" => "Ali naj bodo prevzete nedavne nastavitve strežnika?",
-"Keep settings?" => "Ali naj se nastavitve ohranijo?",
-"{nthServer}. Server" => "{nthServer}. strežnik",
-"Cannot add server configuration" => "Ni mogoče dodati nastavitev strežnika",
-"mappings cleared" => "preslikave so izbrisane",
-"Success" => "Uspešno končano.",
-"Error" => "Napaka",
-"Please specify a Base DN" => "Določite osnovno enolično ime (base DN)",
-"Could not determine Base DN" => "Ni mogoče določiti osnovnega enoličnega imena (base DN)",
-"Please specify the port" => "Določiti je treba vrata",
-"Configuration OK" => "Nastavitev je ustrezna",
-"Configuration incorrect" => "Nastavitev ni ustrezna",
-"Configuration incomplete" => "Nastavitev je nepopolna",
-"Select groups" => "Izberi skupine",
-"Select object classes" => "Izbor razredov predmeta",
-"Select attributes" => "Izbor atributov",
-"Connection test succeeded" => "Preizkus povezave je uspešno končan.",
-"Connection test failed" => "Preizkus povezave je spodletel.",
-"Do you really want to delete the current Server Configuration?" => "Ali res želite izbrisati trenutne nastavitve strežnika?",
-"Confirm Deletion" => "Potrdi brisanje",
-"_%s group found_::_%s groups found_" => array("%s najdena skupina","%s najdeni skupini","%s najdene skupine","%s najdenih skupin"),
-"_%s user found_::_%s users found_" => array("%s najden uporabnik","%s najdena uporabnika","%s najdeni uporabniki","%s najdenih uporabnikov"),
-"Could not find the desired feature" => "Želene zmožnosti ni mogoče najti",
-"Invalid Host" => "Neveljaven gostitelj",
-"Server" => "Strežnik",
-"User Filter" => "Uporabniški filter",
-"Login Filter" => "Filter prijave",
-"Group Filter" => "Filter skupin",
-"Save" => "Shrani",
-"Test Configuration" => "Preizkusne nastavitve",
-"Help" => "Pomoč",
-"Groups meeting these criteria are available in %s:" => "Skupine, ki so skladne s kriterijem, so na voljo v %s:",
-"only those object classes:" => "le razredi predmeta:",
-"only from those groups:" => "le iz skupin:",
-"Edit raw filter instead" => "Uredi surov filter",
-"Raw LDAP filter" => "Surovi filter LDAP",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
-"Test Filter" => "Preizkusi filter",
-"groups found" => "najdenih skupin",
-"Users login with this attribute:" => "Uporabniki se prijavijo z atributom:",
-"LDAP Username:" => "Uporabniško ime LDAP:",
-"LDAP Email Address:" => "Elektronski naslov LDAP:",
-"Other Attributes:" => "Drugi atributi:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Določi filter, ki bo uveljavljen ob poskusu prijave. %%uid zamenja uporabniško ime pri prijavi, na primer: \"uid=%%uid\"",
-"1. Server" => "1. strežnik",
-"%s. Server:" => "%s. strežnik:",
-"Add Server Configuration" => "Dodaj nastavitve strežnika",
-"Delete Configuration" => "Izbriši nastavitve",
-"Host" => "Gostitelj",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
-"Port" => "Vrata",
-"User DN" => "Uporabnikovo enolično ime",
-"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." => "Enolično ime uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za brezimni dostop sta polji prikaznega imena in gesla prazni.",
-"Password" => "Geslo",
-"For anonymous access, leave DN and Password empty." => "Za brezimni dostop naj bosta polji imena in gesla prazni.",
-"One Base DN per line" => "Eno osnovno enolično ime na vrstico",
-"You can specify Base DN for users and groups in the Advanced tab" => "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Preusmeri samodejne zahteve LDAP. Nastavitev je priporočljiva za obsežnejše namestitve, vendar zahteva nekaj znanja o delu z LDAP.",
-"Manually enter LDAP filters (recommended for large directories)" => "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).",
-"Limit %s access to users meeting these criteria:" => "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
-"users found" => "najdenih uporabnikov",
-"Saving" => "Poteka shranjevanje ...",
-"Back" => "Nazaj",
-"Continue" => "Nadaljuj",
-"Expert" => "Napredno",
-"Advanced" => "Napredne možnosti",
-"<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Opozorilo:</b> modul PHP LDAP mora biti nameščen, sicer vmesnik ne bo deloval. Paket je treba namestiti.",
-"Connection Settings" => "Nastavitve povezave",
-"Configuration Active" => "Dejavna nastavitev",
-"When unchecked, this configuration will be skipped." => "Neizbrana možnost preskoči nastavitev.",
-"Backup (Replica) Host" => "Varnostna kopija (replika) podatkov gostitelja",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Podati je treba izbirno varnostno kopijo gostitelja. Ta mora biti natančna replika strežnika LDAP/AD.",
-"Backup (Replica) Port" => "Vrata varnostne kopije (replike)",
-"Disable Main Server" => "Onemogoči glavni strežnik",
-"Only connect to the replica server." => "Poveži le s podvojenim strežnikom.",
-"Case insensitive LDAP server (Windows)" => "Strežnik LDAP (brez upoštevanja velikosti črk) (Windows)",
-"Turn off SSL certificate validation." => "Onemogoči določanje veljavnosti potrdila SSL.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Možnosti ni priporočljivo uporabiti; namenjena je zgolj preizkušanju! Če deluje povezava le s to možnostjo, je treba uvoziti potrdilo SSL strežnika LDAP na strežnik %s.",
-"Cache Time-To-Live" => "Predpomni podatke TTL",
-"in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.",
-"Directory Settings" => "Nastavitve mape",
-"User Display Name Field" => "Polje za uporabnikovo prikazano ime",
-"The LDAP attribute to use to generate the user's display name." => "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena uporabnika.",
-"Base User Tree" => "Osnovno uporabniško drevo",
-"One User Base DN per line" => "Eno osnovno uporabniško ime na vrstico",
-"User Search Attributes" => "Uporabnikovi atributi iskanja",
-"Optional; one attribute per line" => "Izbirno; en atribut na vrstico",
-"Group Display Name Field" => "Polje za prikazano ime skupine",
-"The LDAP attribute to use to generate the groups's display name." => "Atribut LDAP za uporabo pri ustvarjanju prikaznega imena skupine.",
-"Base Group Tree" => "Osnovno drevo skupine",
-"One Group Base DN per line" => "Eno osnovno ime skupine na vrstico",
-"Group Search Attributes" => "Skupinski atributi iskanja",
-"Group-Member association" => "Povezava član-skupina",
-"Nested Groups" => "Gnezdene skupine",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Možnost omogoča podporo skupinam, ki vključujejo skupine. Deluje je, če atribut članstva skupine vsebuje enolično ime (DN).",
-"Paging chunksize" => "Velikost odvoda za razbremenitev delovnega pomnilnik",
-"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.)" => "Velikost odvoda za razbremenitev delovnega pomnilnika, ki ga uporablja iskalnik LDAP, pri oštevilčenju uporabnika ali skupine (vrednost 0 možnost onemogoči).",
-"Special Attributes" => "Posebni atributi",
-"Quota Field" => "Polje količinske omejitve",
-"Quota Default" => "Privzeta količinska omejitev",
-"in bytes" => "v bajtih",
-"Email Field" => "Polje elektronske pošte",
-"User Home Folder Naming Rule" => "Pravila poimenovanja uporabniške osebne mape",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto), sicer navedite atribut LDAP/AD.",
-"Internal Username" => "Programsko uporabniško ime",
-"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." => "Privzeto je notranje uporabniško ime ustvarjeno na osnovi atributa UUID. To omogoča določitev uporabniškega imena kot enoličnega, zato znakov ni treba pretvarjati. Notranje ime je omejeno na standardne znake: [ a-zA-Z0-9_.@- ]. Morebitni drugi znaki so zamenjani z ustreznim ASCII znakom, ali pa so enostavno izpuščeni. V primeru sporov je prišteta ali odšteta številčna vrednost. Notranje uporabniško ime je uporabljeno za določanje uporabnika in je privzeto ime uporabnikove domače mape. Hkrati je tudi del oddaljenega naslova URL, na primer za storitve *DAV. S to nastavitvijo je prepisan privzet način delovanja. Pri različicah ownCloud, nižjih od 5.0, je podoben učinek mogoče doseči z vpisom prikaznega imena oziroma z neizpolnjenim (praznim) poljem te vrednosti. Spremembe bodo uveljavljene le za nove preslikane (dodane) uporabnike LDAP.",
-"Internal Username Attribute:" => "Programski atribut uporabniškega imena:",
-"Override UUID detection" => "Prezri zaznavo 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." => "Privzeto je atribut UUID samodejno zaznan. Uporabljen je za določevanje uporabnikov LDAP in skupin. Notranje uporabniško ime je določeno prav na atributu UUID, če ni določeno drugače. To nastavitev je mogoče prepisati in poslati poljuben atribut. Zagotoviti je treba le, da je ta pridobljen kot enolični podatek za uporabnika ali skupino. Prazno polje določa privzeti način. Spremembe bodo vplivale na novo preslikane (dodane) uporabnike LDAP in skupine.",
-"UUID Attribute for Users:" => "Atribut UUID za uporabnike:",
-"UUID Attribute for Groups:" => "Atribut UUID za skupine:",
-"Username-LDAP User Mapping" => "Uporabniška preslikava uporabniškega imena na LDAP",
-"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." => "Uporabniška imena so uporabljena za shranjevanje in dodeljevanje (meta) podatkov. Za natančno določanje in prepoznavanje uporabnikov je uporabljen sistem notranjega uporabniškega imena vsakega uporabnika LDAP. Ta možnost zahteva preslikavo uporabniškega imena v uporabnika LDAP in preslikano na njegov UUID. Sistem predpomni enolična imena za zmanjšanje odvisnosti LDAP, vendar pa ta podatek ni uporabljen za določevanje uporabnika. Če se enolično ime spremeni, se spremeni notranje uporabniško ime. Čiščenje preslikav pušča ostanke podatkov in vpliva na vse nastavitve LDAP! V delovnem okolju zato spreminjanje preslikav ni priporočljivo, možnost pa je na voljo za preizkušanje.",
-"Clear Username-LDAP User Mapping" => "Izbriši preslikavo uporabniškega imena na LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Izbriši preslikavo skupine na LDAP"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/apps/user_ldap/l10n/sq.js b/apps/user_ldap/l10n/sq.js
new file mode 100644
index 00000000000..056458c24b6
--- /dev/null
+++ b/apps/user_ldap/l10n/sq.js
@@ -0,0 +1,72 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "dështoi së pastruari planifikimet",
+    "Failed to delete the server configuration" : "dështoi fshirjen e konfigurimit të serverit",
+    "The configuration is valid and the connection could be established!" : "Konfigurimi është i vlefshem dhe lidhja mund të kryhet",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurimi është i saktë por lidhja dështoi. Kontrolloni konfigurimete serverit dhe kredencialet.",
+    "Deletion failed" : "Fshirja dështoi",
+    "Take over settings from recent server configuration?" : "Doni të rivini konfigurmet më të fundit të serverit?",
+    "Keep settings?" : "Doni të mbani konfigurimet?",
+    "Cannot add server configuration" : "E pamundur të shtohen konfigurimet në server",
+    "mappings cleared" : "planifikimi u fshi",
+    "Success" : "Sukses",
+    "Error" : "Gabim",
+    "Connection test succeeded" : "Prova e lidhjes përfundoi me sukses",
+    "Connection test failed" : "Prova e lidhjes dështoi",
+    "Do you really want to delete the current Server Configuration?" : "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?",
+    "Confirm Deletion" : "Konfirmoni Fshirjen",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Group Filter" : "Filtri i grupeve",
+    "Save" : "Ruaj",
+    "Test Configuration" : "Provoni konfigurimet",
+    "Help" : "Ndihmë",
+    "Add Server Configuration" : "Shtoni konfigurimet e serverit",
+    "Host" : "Pritësi",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Ju mund të mos vendosni protokollin ,vetëm nëse ju nevojitet SSL. atherë filloni me ldaps://",
+    "Port" : "Porta",
+    "User DN" : "Përdoruesi 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." : "DN -ja e klientit për përdoruesin që kërkon të lidhet duhet të jetë si psh,uid=agent,dc=example,dc=com. Për lidhjet anonime lini boshe hapsirat e DN dhe fjalëkalim ",
+    "Password" : "fjalëkalim",
+    "For anonymous access, leave DN and Password empty." : "Për tu lidhur në mënyre anonime, lini bosh hapsirat e DN dhe fjalëkalim",
+    "One Base DN per line" : "Një baze DN për rrjesht",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Ju mund të specifikoni Bazen DN për përdorues dhe grupe në butonin 'Të Përparuara'",
+    "Advanced" : "E përparuar",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Njoftim:</b> moduli PHP LDAP nuk është instaluar, motori nuk do të funksionojë.Kontaktoni me administratorin e sistemit.",
+    "Connection Settings" : "Të dhënat e lidhjes",
+    "Configuration Active" : "Konfigurimi Aktiv",
+    "When unchecked, this configuration will be skipped." : "Nëse nuk është i zgjedhur, ky konfigurim do të anashkalohet.",
+    "Backup (Replica) Host" : "Pritësi rezervë (Replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Jepni një pritës rezervë. Duhet të jetë replikimi i serverit AD/LDAP kryesor.",
+    "Backup (Replica) Port" : "Porta rezervë (Replika)",
+    "Disable Main Server" : "Ç'aktivizoni serverin kryesor",
+    "Turn off SSL certificate validation." : "Ç'aktivizoni kontrollin e certifikatës SSL.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "në sekonda Ndryshimi boshatis 'cache'-n.",
+    "Directory Settings" : "Konfigurimet e Dosjeve",
+    "User Display Name Field" : "Hapsira e Emrit të Përdoruesit",
+    "Base User Tree" : "Struktura bazë e përdoruesit",
+    "One User Base DN per line" : "Një përdorues baze DN për rrjesht",
+    "User Search Attributes" : "Atributet e kërkimit të përdoruesëve",
+    "Optional; one attribute per line" : "Opsionale; një atribut për rrjesht",
+    "Group Display Name Field" : "Hapsira e Emrit të Grupit",
+    "Base Group Tree" : "Struktura bazë e grupit",
+    "One Group Base DN per line" : "Një grup baze DN për rrjesht",
+    "Group Search Attributes" : "Atributet e kërkimit të grupit",
+    "Group-Member association" : "Pjestar Grup-Përdorues ",
+    "Special Attributes" : "Atribute të veçanta",
+    "Quota Field" : "Hapsira e Kuotës",
+    "Quota Default" : "Kuota e paracaktuar",
+    "in bytes" : "në byte",
+    "Email Field" : "Hapsira e Postës Elektronike",
+    "User Home Folder Naming Rule" : "Rregulli i emërimit të dosjes së përdoruesit",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lëreni bosh për emrin e përdoruesit (I Paracaktuar). Ose, përcaktoni një atribut LDAP/AD.",
+    "Internal Username" : "Emër i brëndshëm i përdoruesit",
+    "Internal Username Attribute:" : "Atributet e emrit të përdoruesit të brëndshëm",
+    "Override UUID detection" : "Mbivendosni gjetjen e UUID",
+    "Username-LDAP User Mapping" : "Emri përdoruesit-LAPD përcaktues përdoruesi",
+    "Clear Username-LDAP User Mapping" : "Fshini Emër përdoruesi-LAPD Përcaktues përdoruesi",
+    "Clear Groupname-LDAP Group Mapping" : "Fshini Emër Grupi-LADP Përcaktues grupi"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/sq.json b/apps/user_ldap/l10n/sq.json
new file mode 100644
index 00000000000..a3e87869355
--- /dev/null
+++ b/apps/user_ldap/l10n/sq.json
@@ -0,0 +1,70 @@
+{ "translations": {
+    "Failed to clear the mappings." : "dështoi së pastruari planifikimet",
+    "Failed to delete the server configuration" : "dështoi fshirjen e konfigurimit të serverit",
+    "The configuration is valid and the connection could be established!" : "Konfigurimi është i vlefshem dhe lidhja mund të kryhet",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurimi është i saktë por lidhja dështoi. Kontrolloni konfigurimete serverit dhe kredencialet.",
+    "Deletion failed" : "Fshirja dështoi",
+    "Take over settings from recent server configuration?" : "Doni të rivini konfigurmet më të fundit të serverit?",
+    "Keep settings?" : "Doni të mbani konfigurimet?",
+    "Cannot add server configuration" : "E pamundur të shtohen konfigurimet në server",
+    "mappings cleared" : "planifikimi u fshi",
+    "Success" : "Sukses",
+    "Error" : "Gabim",
+    "Connection test succeeded" : "Prova e lidhjes përfundoi me sukses",
+    "Connection test failed" : "Prova e lidhjes dështoi",
+    "Do you really want to delete the current Server Configuration?" : "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?",
+    "Confirm Deletion" : "Konfirmoni Fshirjen",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Group Filter" : "Filtri i grupeve",
+    "Save" : "Ruaj",
+    "Test Configuration" : "Provoni konfigurimet",
+    "Help" : "Ndihmë",
+    "Add Server Configuration" : "Shtoni konfigurimet e serverit",
+    "Host" : "Pritësi",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Ju mund të mos vendosni protokollin ,vetëm nëse ju nevojitet SSL. atherë filloni me ldaps://",
+    "Port" : "Porta",
+    "User DN" : "Përdoruesi 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." : "DN -ja e klientit për përdoruesin që kërkon të lidhet duhet të jetë si psh,uid=agent,dc=example,dc=com. Për lidhjet anonime lini boshe hapsirat e DN dhe fjalëkalim ",
+    "Password" : "fjalëkalim",
+    "For anonymous access, leave DN and Password empty." : "Për tu lidhur në mënyre anonime, lini bosh hapsirat e DN dhe fjalëkalim",
+    "One Base DN per line" : "Një baze DN për rrjesht",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Ju mund të specifikoni Bazen DN për përdorues dhe grupe në butonin 'Të Përparuara'",
+    "Advanced" : "E përparuar",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Njoftim:</b> moduli PHP LDAP nuk është instaluar, motori nuk do të funksionojë.Kontaktoni me administratorin e sistemit.",
+    "Connection Settings" : "Të dhënat e lidhjes",
+    "Configuration Active" : "Konfigurimi Aktiv",
+    "When unchecked, this configuration will be skipped." : "Nëse nuk është i zgjedhur, ky konfigurim do të anashkalohet.",
+    "Backup (Replica) Host" : "Pritësi rezervë (Replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Jepni një pritës rezervë. Duhet të jetë replikimi i serverit AD/LDAP kryesor.",
+    "Backup (Replica) Port" : "Porta rezervë (Replika)",
+    "Disable Main Server" : "Ç'aktivizoni serverin kryesor",
+    "Turn off SSL certificate validation." : "Ç'aktivizoni kontrollin e certifikatës SSL.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "në sekonda Ndryshimi boshatis 'cache'-n.",
+    "Directory Settings" : "Konfigurimet e Dosjeve",
+    "User Display Name Field" : "Hapsira e Emrit të Përdoruesit",
+    "Base User Tree" : "Struktura bazë e përdoruesit",
+    "One User Base DN per line" : "Një përdorues baze DN për rrjesht",
+    "User Search Attributes" : "Atributet e kërkimit të përdoruesëve",
+    "Optional; one attribute per line" : "Opsionale; një atribut për rrjesht",
+    "Group Display Name Field" : "Hapsira e Emrit të Grupit",
+    "Base Group Tree" : "Struktura bazë e grupit",
+    "One Group Base DN per line" : "Një grup baze DN për rrjesht",
+    "Group Search Attributes" : "Atributet e kërkimit të grupit",
+    "Group-Member association" : "Pjestar Grup-Përdorues ",
+    "Special Attributes" : "Atribute të veçanta",
+    "Quota Field" : "Hapsira e Kuotës",
+    "Quota Default" : "Kuota e paracaktuar",
+    "in bytes" : "në byte",
+    "Email Field" : "Hapsira e Postës Elektronike",
+    "User Home Folder Naming Rule" : "Rregulli i emërimit të dosjes së përdoruesit",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lëreni bosh për emrin e përdoruesit (I Paracaktuar). Ose, përcaktoni një atribut LDAP/AD.",
+    "Internal Username" : "Emër i brëndshëm i përdoruesit",
+    "Internal Username Attribute:" : "Atributet e emrit të përdoruesit të brëndshëm",
+    "Override UUID detection" : "Mbivendosni gjetjen e UUID",
+    "Username-LDAP User Mapping" : "Emri përdoruesit-LAPD përcaktues përdoruesi",
+    "Clear Username-LDAP User Mapping" : "Fshini Emër përdoruesi-LAPD Përcaktues përdoruesi",
+    "Clear Groupname-LDAP Group Mapping" : "Fshini Emër Grupi-LADP Përcaktues grupi"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/sq.php b/apps/user_ldap/l10n/sq.php
deleted file mode 100644
index 8d09cceb7c5..00000000000
--- a/apps/user_ldap/l10n/sq.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "dështoi së pastruari planifikimet",
-"Failed to delete the server configuration" => "dështoi fshirjen e konfigurimit të serverit",
-"The configuration is valid and the connection could be established!" => "Konfigurimi është i vlefshem dhe lidhja mund të kryhet",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurimi është i saktë por lidhja dështoi. Kontrolloni konfigurimete serverit dhe kredencialet.",
-"Deletion failed" => "Fshirja dështoi",
-"Take over settings from recent server configuration?" => "Doni të rivini konfigurmet më të fundit të serverit?",
-"Keep settings?" => "Doni të mbani konfigurimet?",
-"Cannot add server configuration" => "E pamundur të shtohen konfigurimet në server",
-"mappings cleared" => "planifikimi u fshi",
-"Success" => "Sukses",
-"Error" => "Gabim",
-"Connection test succeeded" => "Prova e lidhjes përfundoi me sukses",
-"Connection test failed" => "Prova e lidhjes dështoi",
-"Do you really want to delete the current Server Configuration?" => "Jeni vërtetë të sigurt të fshini konfigurimet aktuale të serverit?",
-"Confirm Deletion" => "Konfirmoni Fshirjen",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Group Filter" => "Filtri i grupeve",
-"Save" => "Ruaj",
-"Test Configuration" => "Provoni konfigurimet",
-"Help" => "Ndihmë",
-"Add Server Configuration" => "Shtoni konfigurimet e serverit",
-"Host" => "Pritësi",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Ju mund të mos vendosni protokollin ,vetëm nëse ju nevojitet SSL. atherë filloni me ldaps://",
-"Port" => "Porta",
-"User DN" => "Përdoruesi 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." => "DN -ja e klientit për përdoruesin që kërkon të lidhet duhet të jetë si psh,uid=agent,dc=example,dc=com. Për lidhjet anonime lini boshe hapsirat e DN dhe fjalëkalim ",
-"Password" => "fjalëkalim",
-"For anonymous access, leave DN and Password empty." => "Për tu lidhur në mënyre anonime, lini bosh hapsirat e DN dhe fjalëkalim",
-"One Base DN per line" => "Një baze DN për rrjesht",
-"You can specify Base DN for users and groups in the Advanced tab" => "Ju mund të specifikoni Bazen DN për përdorues dhe grupe në butonin 'Të Përparuara'",
-"Advanced" => "E përparuar",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Njoftim:</b> moduli PHP LDAP nuk është instaluar, motori nuk do të funksionojë.Kontaktoni me administratorin e sistemit.",
-"Connection Settings" => "Të dhënat e lidhjes",
-"Configuration Active" => "Konfigurimi Aktiv",
-"When unchecked, this configuration will be skipped." => "Nëse nuk është i zgjedhur, ky konfigurim do të anashkalohet.",
-"Backup (Replica) Host" => "Pritësi rezervë (Replika)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Jepni një pritës rezervë. Duhet të jetë replikimi i serverit AD/LDAP kryesor.",
-"Backup (Replica) Port" => "Porta rezervë (Replika)",
-"Disable Main Server" => "Ç'aktivizoni serverin kryesor",
-"Turn off SSL certificate validation." => "Ç'aktivizoni kontrollin e certifikatës SSL.",
-"Cache Time-To-Live" => "Cache Time-To-Live",
-"in seconds. A change empties the cache." => "në sekonda Ndryshimi boshatis 'cache'-n.",
-"Directory Settings" => "Konfigurimet e Dosjeve",
-"User Display Name Field" => "Hapsira e Emrit të Përdoruesit",
-"Base User Tree" => "Struktura bazë e përdoruesit",
-"One User Base DN per line" => "Një përdorues baze DN për rrjesht",
-"User Search Attributes" => "Atributet e kërkimit të përdoruesëve",
-"Optional; one attribute per line" => "Opsionale; një atribut për rrjesht",
-"Group Display Name Field" => "Hapsira e Emrit të Grupit",
-"Base Group Tree" => "Struktura bazë e grupit",
-"One Group Base DN per line" => "Një grup baze DN për rrjesht",
-"Group Search Attributes" => "Atributet e kërkimit të grupit",
-"Group-Member association" => "Pjestar Grup-Përdorues ",
-"Special Attributes" => "Atribute të veçanta",
-"Quota Field" => "Hapsira e Kuotës",
-"Quota Default" => "Kuota e paracaktuar",
-"in bytes" => "në byte",
-"Email Field" => "Hapsira e Postës Elektronike",
-"User Home Folder Naming Rule" => "Rregulli i emërimit të dosjes së përdoruesit",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lëreni bosh për emrin e përdoruesit (I Paracaktuar). Ose, përcaktoni një atribut LDAP/AD.",
-"Internal Username" => "Emër i brëndshëm i përdoruesit",
-"Internal Username Attribute:" => "Atributet e emrit të përdoruesit të brëndshëm",
-"Override UUID detection" => "Mbivendosni gjetjen e UUID",
-"Username-LDAP User Mapping" => "Emri përdoruesit-LAPD përcaktues përdoruesi",
-"Clear Username-LDAP User Mapping" => "Fshini Emër përdoruesi-LAPD Përcaktues përdoruesi",
-"Clear Groupname-LDAP Group Mapping" => "Fshini Emër Grupi-LADP Përcaktues grupi"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sr.js b/apps/user_ldap/l10n/sr.js
new file mode 100644
index 00000000000..dd41cb2ea2d
--- /dev/null
+++ b/apps/user_ldap/l10n/sr.js
@@ -0,0 +1,29 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Брисање није успело",
+    "Error" : "Грешка",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Group Filter" : "Филтер групе",
+    "Save" : "Сачувај",
+    "Help" : "Помоћ",
+    "Host" : "Домаћин",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://.",
+    "Port" : "Порт",
+    "User DN" : "Корисник 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." : "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним.",
+    "Password" : "Лозинка",
+    "For anonymous access, leave DN and Password empty." : "За анониман приступ, оставите поља DN и лозинка празним.",
+    "Back" : "Назад",
+    "Advanced" : "Напредно",
+    "Turn off SSL certificate validation." : "Искључите потврду SSL сертификата.",
+    "in seconds. A change empties the cache." : "у секундама. Промена испражњава кеш меморију.",
+    "User Display Name Field" : "Име приказа корисника",
+    "Base User Tree" : "Основно стабло корисника",
+    "Group Display Name Field" : "Име приказа групе",
+    "Base Group Tree" : "Основна стабло група",
+    "Group-Member association" : "Придруживање чланова у групу",
+    "in bytes" : "у бајтовима"
+},
+"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_ldap/l10n/sr.json b/apps/user_ldap/l10n/sr.json
new file mode 100644
index 00000000000..5fe091e5d3b
--- /dev/null
+++ b/apps/user_ldap/l10n/sr.json
@@ -0,0 +1,27 @@
+{ "translations": {
+    "Deletion failed" : "Брисање није успело",
+    "Error" : "Грешка",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Group Filter" : "Филтер групе",
+    "Save" : "Сачувај",
+    "Help" : "Помоћ",
+    "Host" : "Домаћин",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://.",
+    "Port" : "Порт",
+    "User DN" : "Корисник 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." : "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним.",
+    "Password" : "Лозинка",
+    "For anonymous access, leave DN and Password empty." : "За анониман приступ, оставите поља DN и лозинка празним.",
+    "Back" : "Назад",
+    "Advanced" : "Напредно",
+    "Turn off SSL certificate validation." : "Искључите потврду SSL сертификата.",
+    "in seconds. A change empties the cache." : "у секундама. Промена испражњава кеш меморију.",
+    "User Display Name Field" : "Име приказа корисника",
+    "Base User Tree" : "Основно стабло корисника",
+    "Group Display Name Field" : "Име приказа групе",
+    "Base Group Tree" : "Основна стабло група",
+    "Group-Member association" : "Придруживање чланова у групу",
+    "in bytes" : "у бајтовима"
+},"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_ldap/l10n/sr.php b/apps/user_ldap/l10n/sr.php
deleted file mode 100644
index 41b35d0abf8..00000000000
--- a/apps/user_ldap/l10n/sr.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Брисање није успело",
-"Error" => "Грешка",
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
-"Group Filter" => "Филтер групе",
-"Save" => "Сачувај",
-"Help" => "Помоћ",
-"Host" => "Домаћин",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можете да изоставите протокол, осим ако захтевате SSL. У том случају почните са ldaps://.",
-"Port" => "Порт",
-"User DN" => "Корисник 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." => "DN корисника клијента са којим треба да се успостави веза, нпр. uid=agent,dc=example,dc=com. За анониман приступ, оставите поља DN и лозинка празним.",
-"Password" => "Лозинка",
-"For anonymous access, leave DN and Password empty." => "За анониман приступ, оставите поља DN и лозинка празним.",
-"Back" => "Назад",
-"Advanced" => "Напредно",
-"Turn off SSL certificate validation." => "Искључите потврду SSL сертификата.",
-"in seconds. A change empties the cache." => "у секундама. Промена испражњава кеш меморију.",
-"User Display Name Field" => "Име приказа корисника",
-"Base User Tree" => "Основно стабло корисника",
-"Group Display Name Field" => "Име приказа групе",
-"Base Group Tree" => "Основна стабло група",
-"Group-Member association" => "Придруживање чланова у групу",
-"in bytes" => "у бајтовима"
-);
-$PLURAL_FORMS = "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_ldap/l10n/sr@latin.js b/apps/user_ldap/l10n/sr@latin.js
new file mode 100644
index 00000000000..aae5907b37e
--- /dev/null
+++ b/apps/user_ldap/l10n/sr@latin.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "Greška",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Save" : "Snimi",
+    "Help" : "Pomoć",
+    "Password" : "Lozinka",
+    "Continue" : "Nastavi",
+    "Advanced" : "Napredno"
+},
+"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_ldap/l10n/sr@latin.json b/apps/user_ldap/l10n/sr@latin.json
new file mode 100644
index 00000000000..421de1a4e2e
--- /dev/null
+++ b/apps/user_ldap/l10n/sr@latin.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Error" : "Greška",
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "Save" : "Snimi",
+    "Help" : "Pomoć",
+    "Password" : "Lozinka",
+    "Continue" : "Nastavi",
+    "Advanced" : "Napredno"
+},"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_ldap/l10n/sr@latin.php b/apps/user_ldap/l10n/sr@latin.php
deleted file mode 100644
index d8ff4ea993b..00000000000
--- a/apps/user_ldap/l10n/sr@latin.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Greška",
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
-"Save" => "Snimi",
-"Help" => "Pomoć",
-"Password" => "Lozinka",
-"Continue" => "Nastavi",
-"Advanced" => "Napredno"
-);
-$PLURAL_FORMS = "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_ldap/l10n/su.js b/apps/user_ldap/l10n/su.js
new file mode 100644
index 00000000000..5494dcae62e
--- /dev/null
+++ b/apps/user_ldap/l10n/su.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/su.json b/apps/user_ldap/l10n/su.json
new file mode 100644
index 00000000000..75f0f056cc4
--- /dev/null
+++ b/apps/user_ldap/l10n/su.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/su.php b/apps/user_ldap/l10n/su.php
deleted file mode 100644
index bba52d53a1a..00000000000
--- a/apps/user_ldap/l10n/su.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/sv.js b/apps/user_ldap/l10n/sv.js
new file mode 100644
index 00000000000..7d4ebe4962a
--- /dev/null
+++ b/apps/user_ldap/l10n/sv.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Fel vid rensning av mappningar",
+    "Failed to delete the server configuration" : "Misslyckades med att radera serverinställningen",
+    "The configuration is valid and the connection could be established!" : "Inställningen är giltig och anslutningen kunde upprättas!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Inställningen är ogiltig. Vänligen se ownCloud-loggen för fler detaljer.",
+    "No action specified" : "Ingen åtgärd har angetts",
+    "No configuration specified" : "Ingen konfiguration har angetts",
+    "No data specified" : "Ingen data har angetts",
+    " Could not set configuration %s" : "Kunde inte sätta inställning %s",
+    "Deletion failed" : "Raderingen misslyckades",
+    "Take over settings from recent server configuration?" : "Ta över inställningar från tidigare serverkonfiguration?",
+    "Keep settings?" : "Behåll inställningarna?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Kunde inte lägga till serverinställning",
+    "mappings cleared" : "mappningar rensade",
+    "Success" : "Lyckat",
+    "Error" : "Fel",
+    "Please specify a Base DN" : "Vänligen ange en Base DN",
+    "Could not determine Base DN" : "Det gick inte att avgöra Base DN",
+    "Please specify the port" : "Specificera en port",
+    "Configuration OK" : "Konfigurationen är OK",
+    "Configuration incorrect" : "Felaktig konfiguration",
+    "Configuration incomplete" : "Konfigurationen är ej komplett",
+    "Select groups" : "Välj grupper",
+    "Select object classes" : "Välj Objekt-klasser",
+    "Select attributes" : "Välj attribut",
+    "Connection test succeeded" : "Anslutningstestet lyckades",
+    "Connection test failed" : "Anslutningstestet misslyckades",
+    "Do you really want to delete the current Server Configuration?" : "Vill du verkligen radera den nuvarande serverinställningen?",
+    "Confirm Deletion" : "Bekräfta radering",
+    "_%s group found_::_%s groups found_" : ["%s grupp hittad","%s grupper hittade"],
+    "_%s user found_::_%s users found_" : ["%s användare hittad","%s användare hittade"],
+    "Could not find the desired feature" : "Det gick inte hitta den önskade funktionen",
+    "Invalid Host" : "Felaktig Host",
+    "Server" : "Server",
+    "User Filter" : "Användar filter",
+    "Login Filter" : "Login Filtrer",
+    "Group Filter" : "Gruppfilter",
+    "Save" : "Spara",
+    "Test Configuration" : "Testa konfigurationen",
+    "Help" : "Hjälp",
+    "Groups meeting these criteria are available in %s:" : "Grupper som uppfyller dessa kriterier finns i %s:",
+    "only those object classes:" : "Endast de objekt-klasserna:",
+    "only from those groups:" : "endast ifrån de här grupperna:",
+    "Edit raw filter instead" : "Redigera rått filter istället",
+    "Raw LDAP filter" : "Rått LDAP-filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtret specifierar vilka LDAD-grupper som ska ha åtkomst till %s instans",
+    "groups found" : "grupper hittade",
+    "Users login with this attribute:" : "Användare loggar in med detta attribut:",
+    "LDAP Username:" : "LDAP användarnamn:",
+    "LDAP Email Address:" : "LDAP e-postadress:",
+    "Other Attributes:" : "Övriga attribut:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
+    "1. Server" : "1.Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Lägg till serverinställning",
+    "Delete Configuration" : "Radera Konfiguration",
+    "Host" : "Server",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
+    "Port" : "Port",
+    "User DN" : "Användare 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." : "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt.",
+    "Password" : "Lösenord",
+    "For anonymous access, leave DN and Password empty." : "För anonym åtkomst, lämna DN och lösenord tomt.",
+    "One Base DN per line" : "Ett Start DN per rad",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Du kan ange start DN för användare och grupper under fliken Avancerat",
+    "Limit %s access to users meeting these criteria:" : "Begränsa %s tillgång till användare som uppfyller dessa kriterier:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans",
+    "users found" : "användare funna",
+    "Back" : "Tillbaka",
+    "Continue" : "Fortsätt",
+    "Expert" : "Expert",
+    "Advanced" : "Avancerad",
+    "<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>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation.",
+    "Connection Settings" : "Uppkopplingsinställningar",
+    "Configuration Active" : "Konfiguration aktiv",
+    "When unchecked, this configuration will be skipped." : "Ifall denna är avbockad så kommer konfigurationen att skippas.",
+    "Backup (Replica) Host" : "Säkerhetskopierings-värd (Replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern",
+    "Backup (Replica) Port" : "Säkerhetskopierins-port (Replika)",
+    "Disable Main Server" : "Inaktivera huvudserver",
+    "Only connect to the replica server." : "Anslut endast till replikaservern.",
+    "Case insensitive LDAP server (Windows)" : "om okänslig LDAP-server (Windows)",
+    "Turn off SSL certificate validation." : "Stäng av verifiering av SSL-certifikat.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "i sekunder. En förändring tömmer cache.",
+    "Directory Settings" : "Mappinställningar",
+    "User Display Name Field" : "Attribut för användarnamn",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP-attributet som ska användas för att generera användarens visningsnamn.",
+    "Base User Tree" : "Bas för användare i katalogtjänst",
+    "One User Base DN per line" : "En Användare start DN per rad",
+    "User Search Attributes" : "Användarsökningsattribut",
+    "Optional; one attribute per line" : "Valfritt; ett attribut per rad",
+    "Group Display Name Field" : "Attribut för gruppnamn",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP-attributet som ska användas för att generera gruppens visningsnamn.",
+    "Base Group Tree" : "Bas för grupper i katalogtjänst",
+    "One Group Base DN per line" : "En Grupp start DN per rad",
+    "Group Search Attributes" : "Gruppsökningsattribut",
+    "Group-Member association" : "Attribut för gruppmedlemmar",
+    "Nested Groups" : "Undergrupper",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "När den är påslagen, stöds grupper som innehåller grupper. (Fungerar endast om gruppmedlemmens attribut innehåller DNs.)",
+    "Paging chunksize" : "Paging klusterstorlek",
+    "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.)" : "Klusterstorlek som används för paged LDAP sökningar som kan komma att returnera skrymmande resultat som uppräknande av användare eller grupper. (Inställning av denna till 0 inaktiverar paged LDAP sökningar i de situationerna)",
+    "Special Attributes" : "Specialattribut",
+    "Quota Field" : "Kvotfält",
+    "Quota Default" : "Datakvot standard",
+    "in bytes" : "i bytes",
+    "Email Field" : "E-postfält",
+    "User Home Folder Naming Rule" : "Namnregel för hemkatalog",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut.",
+    "Internal Username" : "Internt Användarnamn",
+    "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." : "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare",
+    "Internal Username Attribute:" : "Internt Användarnamn Attribut:",
+    "Override UUID detection" : "Åsidosätt UUID detektion",
+    "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." : "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper.",
+    "UUID Attribute for Users:" : "UUID Attribut för Användare:",
+    "UUID Attribute for Groups:" : "UUID Attribut för Grupper:",
+    "Username-LDAP User Mapping" : "Användarnamn-LDAP User Mapping",
+    "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." : "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!",
+    "Clear Username-LDAP User Mapping" : "Rensa Användarnamn-LDAP User Mapping",
+    "Clear Groupname-LDAP Group Mapping" : "Rensa Gruppnamn-LDAP Group Mapping"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/sv.json b/apps/user_ldap/l10n/sv.json
new file mode 100644
index 00000000000..5f2949c2d00
--- /dev/null
+++ b/apps/user_ldap/l10n/sv.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Fel vid rensning av mappningar",
+    "Failed to delete the server configuration" : "Misslyckades med att radera serverinställningen",
+    "The configuration is valid and the connection could be established!" : "Inställningen är giltig och anslutningen kunde upprättas!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Inställningen är ogiltig. Vänligen se ownCloud-loggen för fler detaljer.",
+    "No action specified" : "Ingen åtgärd har angetts",
+    "No configuration specified" : "Ingen konfiguration har angetts",
+    "No data specified" : "Ingen data har angetts",
+    " Could not set configuration %s" : "Kunde inte sätta inställning %s",
+    "Deletion failed" : "Raderingen misslyckades",
+    "Take over settings from recent server configuration?" : "Ta över inställningar från tidigare serverkonfiguration?",
+    "Keep settings?" : "Behåll inställningarna?",
+    "{nthServer}. Server" : "{nthServer}. Server",
+    "Cannot add server configuration" : "Kunde inte lägga till serverinställning",
+    "mappings cleared" : "mappningar rensade",
+    "Success" : "Lyckat",
+    "Error" : "Fel",
+    "Please specify a Base DN" : "Vänligen ange en Base DN",
+    "Could not determine Base DN" : "Det gick inte att avgöra Base DN",
+    "Please specify the port" : "Specificera en port",
+    "Configuration OK" : "Konfigurationen är OK",
+    "Configuration incorrect" : "Felaktig konfiguration",
+    "Configuration incomplete" : "Konfigurationen är ej komplett",
+    "Select groups" : "Välj grupper",
+    "Select object classes" : "Välj Objekt-klasser",
+    "Select attributes" : "Välj attribut",
+    "Connection test succeeded" : "Anslutningstestet lyckades",
+    "Connection test failed" : "Anslutningstestet misslyckades",
+    "Do you really want to delete the current Server Configuration?" : "Vill du verkligen radera den nuvarande serverinställningen?",
+    "Confirm Deletion" : "Bekräfta radering",
+    "_%s group found_::_%s groups found_" : ["%s grupp hittad","%s grupper hittade"],
+    "_%s user found_::_%s users found_" : ["%s användare hittad","%s användare hittade"],
+    "Could not find the desired feature" : "Det gick inte hitta den önskade funktionen",
+    "Invalid Host" : "Felaktig Host",
+    "Server" : "Server",
+    "User Filter" : "Användar filter",
+    "Login Filter" : "Login Filtrer",
+    "Group Filter" : "Gruppfilter",
+    "Save" : "Spara",
+    "Test Configuration" : "Testa konfigurationen",
+    "Help" : "Hjälp",
+    "Groups meeting these criteria are available in %s:" : "Grupper som uppfyller dessa kriterier finns i %s:",
+    "only those object classes:" : "Endast de objekt-klasserna:",
+    "only from those groups:" : "endast ifrån de här grupperna:",
+    "Edit raw filter instead" : "Redigera rått filter istället",
+    "Raw LDAP filter" : "Rått LDAP-filter",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtret specifierar vilka LDAD-grupper som ska ha åtkomst till %s instans",
+    "groups found" : "grupper hittade",
+    "Users login with this attribute:" : "Användare loggar in med detta attribut:",
+    "LDAP Username:" : "LDAP användarnamn:",
+    "LDAP Email Address:" : "LDAP e-postadress:",
+    "Other Attributes:" : "Övriga attribut:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
+    "1. Server" : "1.Server",
+    "%s. Server:" : "%s. Server:",
+    "Add Server Configuration" : "Lägg till serverinställning",
+    "Delete Configuration" : "Radera Konfiguration",
+    "Host" : "Server",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
+    "Port" : "Port",
+    "User DN" : "Användare 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." : "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt.",
+    "Password" : "Lösenord",
+    "For anonymous access, leave DN and Password empty." : "För anonym åtkomst, lämna DN och lösenord tomt.",
+    "One Base DN per line" : "Ett Start DN per rad",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Du kan ange start DN för användare och grupper under fliken Avancerat",
+    "Limit %s access to users meeting these criteria:" : "Begränsa %s tillgång till användare som uppfyller dessa kriterier:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans",
+    "users found" : "användare funna",
+    "Back" : "Tillbaka",
+    "Continue" : "Fortsätt",
+    "Expert" : "Expert",
+    "Advanced" : "Avancerad",
+    "<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>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation.",
+    "Connection Settings" : "Uppkopplingsinställningar",
+    "Configuration Active" : "Konfiguration aktiv",
+    "When unchecked, this configuration will be skipped." : "Ifall denna är avbockad så kommer konfigurationen att skippas.",
+    "Backup (Replica) Host" : "Säkerhetskopierings-värd (Replika)",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern",
+    "Backup (Replica) Port" : "Säkerhetskopierins-port (Replika)",
+    "Disable Main Server" : "Inaktivera huvudserver",
+    "Only connect to the replica server." : "Anslut endast till replikaservern.",
+    "Case insensitive LDAP server (Windows)" : "om okänslig LDAP-server (Windows)",
+    "Turn off SSL certificate validation." : "Stäng av verifiering av SSL-certifikat.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.",
+    "Cache Time-To-Live" : "Cache Time-To-Live",
+    "in seconds. A change empties the cache." : "i sekunder. En förändring tömmer cache.",
+    "Directory Settings" : "Mappinställningar",
+    "User Display Name Field" : "Attribut för användarnamn",
+    "The LDAP attribute to use to generate the user's display name." : "LDAP-attributet som ska användas för att generera användarens visningsnamn.",
+    "Base User Tree" : "Bas för användare i katalogtjänst",
+    "One User Base DN per line" : "En Användare start DN per rad",
+    "User Search Attributes" : "Användarsökningsattribut",
+    "Optional; one attribute per line" : "Valfritt; ett attribut per rad",
+    "Group Display Name Field" : "Attribut för gruppnamn",
+    "The LDAP attribute to use to generate the groups's display name." : "LDAP-attributet som ska användas för att generera gruppens visningsnamn.",
+    "Base Group Tree" : "Bas för grupper i katalogtjänst",
+    "One Group Base DN per line" : "En Grupp start DN per rad",
+    "Group Search Attributes" : "Gruppsökningsattribut",
+    "Group-Member association" : "Attribut för gruppmedlemmar",
+    "Nested Groups" : "Undergrupper",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "När den är påslagen, stöds grupper som innehåller grupper. (Fungerar endast om gruppmedlemmens attribut innehåller DNs.)",
+    "Paging chunksize" : "Paging klusterstorlek",
+    "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.)" : "Klusterstorlek som används för paged LDAP sökningar som kan komma att returnera skrymmande resultat som uppräknande av användare eller grupper. (Inställning av denna till 0 inaktiverar paged LDAP sökningar i de situationerna)",
+    "Special Attributes" : "Specialattribut",
+    "Quota Field" : "Kvotfält",
+    "Quota Default" : "Datakvot standard",
+    "in bytes" : "i bytes",
+    "Email Field" : "E-postfält",
+    "User Home Folder Naming Rule" : "Namnregel för hemkatalog",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut.",
+    "Internal Username" : "Internt Användarnamn",
+    "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." : "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare",
+    "Internal Username Attribute:" : "Internt Användarnamn Attribut:",
+    "Override UUID detection" : "Åsidosätt UUID detektion",
+    "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." : "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper.",
+    "UUID Attribute for Users:" : "UUID Attribut för Användare:",
+    "UUID Attribute for Groups:" : "UUID Attribut för Grupper:",
+    "Username-LDAP User Mapping" : "Användarnamn-LDAP User Mapping",
+    "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." : "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!",
+    "Clear Username-LDAP User Mapping" : "Rensa Användarnamn-LDAP User Mapping",
+    "Clear Groupname-LDAP Group Mapping" : "Rensa Gruppnamn-LDAP Group Mapping"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
deleted file mode 100644
index e8e4862994e..00000000000
--- a/apps/user_ldap/l10n/sv.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Fel vid rensning av mappningar",
-"Failed to delete the server configuration" => "Misslyckades med att radera serverinställningen",
-"The configuration is valid and the connection could be established!" => "Inställningen är giltig och anslutningen kunde upprättas!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Konfigurationen är riktig, men Bind felade. Var vänlig och kontrollera serverinställningar och logininformation.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Inställningen är ogiltig. Vänligen se ownCloud-loggen för fler detaljer.",
-"No action specified" => "Ingen åtgärd har angetts",
-"No configuration specified" => "Ingen konfiguration har angetts",
-"No data specified" => "Ingen data har angetts",
-" Could not set configuration %s" => "Kunde inte sätta inställning %s",
-"Deletion failed" => "Raderingen misslyckades",
-"Take over settings from recent server configuration?" => "Ta över inställningar från tidigare serverkonfiguration?",
-"Keep settings?" => "Behåll inställningarna?",
-"{nthServer}. Server" => "{nthServer}. Server",
-"Cannot add server configuration" => "Kunde inte lägga till serverinställning",
-"mappings cleared" => "mappningar rensade",
-"Success" => "Lyckat",
-"Error" => "Fel",
-"Please specify a Base DN" => "Vänligen ange en Base DN",
-"Could not determine Base DN" => "Det gick inte att avgöra Base DN",
-"Please specify the port" => "Specificera en port",
-"Configuration OK" => "Konfigurationen är OK",
-"Configuration incorrect" => "Felaktig konfiguration",
-"Configuration incomplete" => "Konfigurationen är ej komplett",
-"Select groups" => "Välj grupper",
-"Select object classes" => "Välj Objekt-klasser",
-"Select attributes" => "Välj attribut",
-"Connection test succeeded" => "Anslutningstestet lyckades",
-"Connection test failed" => "Anslutningstestet misslyckades",
-"Do you really want to delete the current Server Configuration?" => "Vill du verkligen radera den nuvarande serverinställningen?",
-"Confirm Deletion" => "Bekräfta radering",
-"_%s group found_::_%s groups found_" => array("%s grupp hittad","%s grupper hittade"),
-"_%s user found_::_%s users found_" => array("%s användare hittad","%s användare hittade"),
-"Could not find the desired feature" => "Det gick inte hitta den önskade funktionen",
-"Invalid Host" => "Felaktig Host",
-"Server" => "Server",
-"User Filter" => "Användar filter",
-"Login Filter" => "Login Filtrer",
-"Group Filter" => "Gruppfilter",
-"Save" => "Spara",
-"Test Configuration" => "Testa konfigurationen",
-"Help" => "Hjälp",
-"Groups meeting these criteria are available in %s:" => "Grupper som uppfyller dessa kriterier finns i %s:",
-"only those object classes:" => "Endast de objekt-klasserna:",
-"only from those groups:" => "endast ifrån de här grupperna:",
-"Edit raw filter instead" => "Redigera rått filter istället",
-"Raw LDAP filter" => "Rått LDAP-filter",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Filtret specifierar vilka LDAD-grupper som ska ha åtkomst till %s instans",
-"groups found" => "grupper hittade",
-"Users login with this attribute:" => "Användare loggar in med detta attribut:",
-"LDAP Username:" => "LDAP användarnamn:",
-"LDAP Email Address:" => "LDAP e-postadress:",
-"Other Attributes:" => "Övriga attribut:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Definierar filter som tillämpas vid inloggning. %%uid ersätter användarnamn vid inloggningen. Exempel: \"uid=%%uid\"",
-"1. Server" => "1.Server",
-"%s. Server:" => "%s. Server:",
-"Add Server Configuration" => "Lägg till serverinställning",
-"Delete Configuration" => "Radera Konfiguration",
-"Host" => "Server",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Du behöver inte ange protokoll förutom om du använder SSL. Starta då med ldaps://",
-"Port" => "Port",
-"User DN" => "Användare 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." => "DN för användaren som skall användas, t.ex. uid=agent, dc=example, dc=com. För anonym åtkomst, lämna DN och lösenord tomt.",
-"Password" => "Lösenord",
-"For anonymous access, leave DN and Password empty." => "För anonym åtkomst, lämna DN och lösenord tomt.",
-"One Base DN per line" => "Ett Start DN per rad",
-"You can specify Base DN for users and groups in the Advanced tab" => "Du kan ange start DN för användare och grupper under fliken Avancerat",
-"Limit %s access to users meeting these criteria:" => "Begränsa %s tillgång till användare som uppfyller dessa kriterier:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Filtret specifierar vilka LDAP-användare som skall ha åtkomst till %s instans",
-"users found" => "användare funna",
-"Back" => "Tillbaka",
-"Continue" => "Fortsätt",
-"Expert" => "Expert",
-"Advanced" => "Avancerad",
-"<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>Varning:</b> Apps user_ldap och user_webdavauth är inkompatibla. Oväntade problem kan uppstå. Be din systemadministratör att inaktivera en av dom.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Varning:</b> PHP LDAP - modulen är inte installerad, serversidan kommer inte att fungera. Kontakta din systemadministratör för installation.",
-"Connection Settings" => "Uppkopplingsinställningar",
-"Configuration Active" => "Konfiguration aktiv",
-"When unchecked, this configuration will be skipped." => "Ifall denna är avbockad så kommer konfigurationen att skippas.",
-"Backup (Replica) Host" => "Säkerhetskopierings-värd (Replika)",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Ange en valfri värd för säkerhetskopiering. Den måste vara en replika av den huvudsakliga LDAP/AD-servern",
-"Backup (Replica) Port" => "Säkerhetskopierins-port (Replika)",
-"Disable Main Server" => "Inaktivera huvudserver",
-"Only connect to the replica server." => "Anslut endast till replikaservern.",
-"Case insensitive LDAP server (Windows)" => "om okänslig LDAP-server (Windows)",
-"Turn off SSL certificate validation." => "Stäng av verifiering av SSL-certifikat.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Rekommenderas inte, använd endast för test! Om anslutningen bara fungerar med denna inställning behöver du importera LDAP-serverns SSL-certifikat till din %s server.",
-"Cache Time-To-Live" => "Cache Time-To-Live",
-"in seconds. A change empties the cache." => "i sekunder. En förändring tömmer cache.",
-"Directory Settings" => "Mappinställningar",
-"User Display Name Field" => "Attribut för användarnamn",
-"The LDAP attribute to use to generate the user's display name." => "LDAP-attributet som ska användas för att generera användarens visningsnamn.",
-"Base User Tree" => "Bas för användare i katalogtjänst",
-"One User Base DN per line" => "En Användare start DN per rad",
-"User Search Attributes" => "Användarsökningsattribut",
-"Optional; one attribute per line" => "Valfritt; ett attribut per rad",
-"Group Display Name Field" => "Attribut för gruppnamn",
-"The LDAP attribute to use to generate the groups's display name." => "LDAP-attributet som ska användas för att generera gruppens visningsnamn.",
-"Base Group Tree" => "Bas för grupper i katalogtjänst",
-"One Group Base DN per line" => "En Grupp start DN per rad",
-"Group Search Attributes" => "Gruppsökningsattribut",
-"Group-Member association" => "Attribut för gruppmedlemmar",
-"Nested Groups" => "Undergrupper",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "När den är påslagen, stöds grupper som innehåller grupper. (Fungerar endast om gruppmedlemmens attribut innehåller DNs.)",
-"Paging chunksize" => "Paging klusterstorlek",
-"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.)" => "Klusterstorlek som används för paged LDAP sökningar som kan komma att returnera skrymmande resultat som uppräknande av användare eller grupper. (Inställning av denna till 0 inaktiverar paged LDAP sökningar i de situationerna)",
-"Special Attributes" => "Specialattribut",
-"Quota Field" => "Kvotfält",
-"Quota Default" => "Datakvot standard",
-"in bytes" => "i bytes",
-"Email Field" => "E-postfält",
-"User Home Folder Naming Rule" => "Namnregel för hemkatalog",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut.",
-"Internal Username" => "Internt Användarnamn",
-"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." => "Som standard skapas det interna användarnamnet från UUID-attributet. Det säkerställer att användarnamnet är unikt och tecken inte behöver konverteras. Det interna användarnamnet har restriktionerna att endast följande tecken är tillåtna:  [ a-zA-Z0-9_.@- ]. Andra tecken blir ersatta av deras motsvarighet i ASCII eller utelämnas helt. En siffra kommer att läggas till eller ökas på vid en kollision. Det interna användarnamnet används för att identifiera användaren internt. Det är även förvalt som användarens användarnamn i ownCloud. Det är även en port för fjärråtkomst, t.ex. för alla *DAV-tjänster. Med denna inställning kan det förvalda beteendet åsidosättas. För att uppnå ett liknande beteende som innan ownCloud 5, ange attributet för användarens visningsnamn i detta fält. Lämna det tomt för förvalt beteende. Ändringarna kommer endast att påverka nyligen mappade (tillagda) LDAP-användare",
-"Internal Username Attribute:" => "Internt Användarnamn Attribut:",
-"Override UUID detection" => "Åsidosätt UUID detektion",
-"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." => "Som standard upptäcker ownCloud automatiskt UUID-attributet. Det UUID-attributet används för att utan tvivel identifiera LDAP-användare och grupper. Dessutom kommer interna användarnamn skapas baserat på detta UUID, om inte annat anges ovan. Du kan åsidosätta inställningen och passera ett attribut som du själv väljer. Du måste se till att attributet som du väljer kan hämtas för både användare och grupper och att det är unikt. Lämna det tomt för standard beteende. Förändringar kommer endast att påverka nyligen mappade (tillagda) LDAP-användare och grupper.",
-"UUID Attribute for Users:" => "UUID Attribut för Användare:",
-"UUID Attribute for Groups:" => "UUID Attribut för Grupper:",
-"Username-LDAP User Mapping" => "Användarnamn-LDAP User Mapping",
-"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." => "ownCloud använder sig av användarnamn för att lagra och tilldela (meta) data. För att exakt kunna identifiera och känna igen användare, kommer varje LDAP-användare ha ett internt användarnamn. Detta kräver en mappning från ownCloud-användarnamn till LDAP-användare. Det skapade användarnamnet mappas till UUID för LDAP-användaren. Dessutom cachas DN  samt minska LDAP-interaktionen, men den används inte för identifiering. Om DN förändras, kommer förändringarna hittas av ownCloud. Det interna ownCloud-namnet används överallt i ownCloud. Om du rensar/raderar mappningarna kommer att lämna referenser överallt i systemet. Men den är inte konfigurationskänslig, den påverkar alla LDAP-konfigurationer! Rensa/radera aldrig mappningarna i en produktionsmiljö. Utan gör detta endast på i testmiljö!",
-"Clear Username-LDAP User Mapping" => "Rensa Användarnamn-LDAP User Mapping",
-"Clear Groupname-LDAP Group Mapping" => "Rensa Gruppnamn-LDAP Group Mapping"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sw_KE.js b/apps/user_ldap/l10n/sw_KE.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/sw_KE.js
@@ -0,0 +1,7 @@
+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/sw_KE.json b/apps/user_ldap/l10n/sw_KE.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/sw_KE.json
@@ -0,0 +1,5 @@
+{ "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/sw_KE.php b/apps/user_ldap/l10n/sw_KE.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/sw_KE.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ta_IN.js b/apps/user_ldap/l10n/ta_IN.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/ta_IN.js
@@ -0,0 +1,7 @@
+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/ta_IN.json b/apps/user_ldap/l10n/ta_IN.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/ta_IN.json
@@ -0,0 +1,5 @@
+{ "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/ta_IN.php b/apps/user_ldap/l10n/ta_IN.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/ta_IN.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/ta_LK.js b/apps/user_ldap/l10n/ta_LK.js
new file mode 100644
index 00000000000..c30e65c0587
--- /dev/null
+++ b/apps/user_ldap/l10n/ta_LK.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "நீக்கம் தோல்வியடைந்தது",
+    "Error" : "வழு",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "சேமிக்க ",
+    "Help" : "உதவி",
+    "Host" : "ஓம்புனர்",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
+    "Port" : "துறை ",
+    "User DN" : "பயனாளர்  DN",
+    "Password" : "கடவுச்சொல்",
+    "You can specify Base DN for users and groups in the Advanced tab" : "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் ",
+    "Back" : "பின்னுக்கு",
+    "Advanced" : "உயர்ந்த",
+    "Turn off SSL certificate validation." : "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்",
+    "in seconds. A change empties the cache." : "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்.",
+    "User Display Name Field" : "பயனாளர் காட்சிப்பெயர் புலம்",
+    "Base User Tree" : "தள பயனாளர் மரம்",
+    "Group Display Name Field" : "குழுவின் காட்சி பெயர் புலம் ",
+    "Base Group Tree" : "தள குழு மரம்",
+    "Group-Member association" : "குழு உறுப்பினர் சங்கம்",
+    "in bytes" : "bytes களில் ",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ta_LK.json b/apps/user_ldap/l10n/ta_LK.json
new file mode 100644
index 00000000000..16726a1b09b
--- /dev/null
+++ b/apps/user_ldap/l10n/ta_LK.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Deletion failed" : "நீக்கம் தோல்வியடைந்தது",
+    "Error" : "வழு",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "சேமிக்க ",
+    "Help" : "உதவி",
+    "Host" : "ஓம்புனர்",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
+    "Port" : "துறை ",
+    "User DN" : "பயனாளர்  DN",
+    "Password" : "கடவுச்சொல்",
+    "You can specify Base DN for users and groups in the Advanced tab" : "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் ",
+    "Back" : "பின்னுக்கு",
+    "Advanced" : "உயர்ந்த",
+    "Turn off SSL certificate validation." : "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்",
+    "in seconds. A change empties the cache." : "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்.",
+    "User Display Name Field" : "பயனாளர் காட்சிப்பெயர் புலம்",
+    "Base User Tree" : "தள பயனாளர் மரம்",
+    "Group Display Name Field" : "குழுவின் காட்சி பெயர் புலம் ",
+    "Base Group Tree" : "தள குழு மரம்",
+    "Group-Member association" : "குழு உறுப்பினர் சங்கம்",
+    "in bytes" : "bytes களில் ",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ta_LK.php b/apps/user_ldap/l10n/ta_LK.php
deleted file mode 100644
index 5849cfcadb6..00000000000
--- a/apps/user_ldap/l10n/ta_LK.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "நீக்கம் தோல்வியடைந்தது",
-"Error" => "வழு",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "சேமிக்க ",
-"Help" => "உதவி",
-"Host" => "ஓம்புனர்",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்",
-"Port" => "துறை ",
-"User DN" => "பயனாளர்  DN",
-"Password" => "கடவுச்சொல்",
-"You can specify Base DN for users and groups in the Advanced tab" => "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் ",
-"Back" => "பின்னுக்கு",
-"Advanced" => "உயர்ந்த",
-"Turn off SSL certificate validation." => "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்",
-"in seconds. A change empties the cache." => "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்.",
-"User Display Name Field" => "பயனாளர் காட்சிப்பெயர் புலம்",
-"Base User Tree" => "தள பயனாளர் மரம்",
-"Group Display Name Field" => "குழுவின் காட்சி பெயர் புலம் ",
-"Base Group Tree" => "தள குழு மரம்",
-"Group-Member association" => "குழு உறுப்பினர் சங்கம்",
-"in bytes" => "bytes களில் ",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/te.js b/apps/user_ldap/l10n/te.js
new file mode 100644
index 00000000000..04d070ac279
--- /dev/null
+++ b/apps/user_ldap/l10n/te.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "పొరపాటు",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "భద్రపరచు",
+    "Help" : "సహాయం",
+    "Password" : "సంకేతపదం",
+    "Continue" : "కొనసాగించు",
+    "Advanced" : "ఉన్నతం"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/te.json b/apps/user_ldap/l10n/te.json
new file mode 100644
index 00000000000..e098b6aa5d3
--- /dev/null
+++ b/apps/user_ldap/l10n/te.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Error" : "పొరపాటు",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "భద్రపరచు",
+    "Help" : "సహాయం",
+    "Password" : "సంకేతపదం",
+    "Continue" : "కొనసాగించు",
+    "Advanced" : "ఉన్నతం"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/te.php b/apps/user_ldap/l10n/te.php
deleted file mode 100644
index 4cfdbea4ccc..00000000000
--- a/apps/user_ldap/l10n/te.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "పొరపాటు",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "భద్రపరచు",
-"Help" => "సహాయం",
-"Password" => "సంకేతపదం",
-"Continue" => "కొనసాగించు",
-"Advanced" => "ఉన్నతం"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/tg_TJ.js b/apps/user_ldap/l10n/tg_TJ.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/tg_TJ.js
@@ -0,0 +1,7 @@
+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/tg_TJ.json b/apps/user_ldap/l10n/tg_TJ.json
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/tg_TJ.json
@@ -0,0 +1,5 @@
+{ "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/tg_TJ.php b/apps/user_ldap/l10n/tg_TJ.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/tg_TJ.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/th_TH.js b/apps/user_ldap/l10n/th_TH.js
new file mode 100644
index 00000000000..6aea268583f
--- /dev/null
+++ b/apps/user_ldap/l10n/th_TH.js
@@ -0,0 +1,54 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "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." : "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน",
+    "Deletion failed" : "การลบทิ้งล้มเหลว",
+    "Keep settings?" : "รักษาการตั้งค่าไว้?",
+    "Cannot add server configuration" : "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
+    "Success" : "เสร็จสิ้น",
+    "Error" : "ข้อผิดพลาด",
+    "Select groups" : "เลือกกลุ่ม",
+    "Connection test succeeded" : "ทดสอบการเชื่อมต่อสำเร็จ",
+    "Connection test failed" : "ทดสอบการเชื่อมต่อล้มเหลว",
+    "Do you really want to delete the current Server Configuration?" : "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
+    "Confirm Deletion" : "ยืนยันการลบทิ้ง",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "ตัวกรองข้อมูลกลุ่ม",
+    "Save" : "บันทึก",
+    "Help" : "ช่วยเหลือ",
+    "Add Server Configuration" : "เพิ่มการกำหนดค่าเซิร์ฟเวอร์",
+    "Host" : "โฮสต์",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
+    "Port" : "พอร์ต",
+    "User DN" : "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." : "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้",
+    "Password" : "รหัสผ่าน",
+    "For anonymous access, leave DN and Password empty." : "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้",
+    "One Base DN per line" : "หนึ่ง Base DN ต่อบรรทัด",
+    "You can specify Base DN for users and groups in the Advanced tab" : "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้",
+    "Back" : "ย้อนกลับ",
+    "Advanced" : "ขั้นสูง",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว",
+    "Connection Settings" : "ตั้งค่าการเชื่อมต่อ",
+    "Disable Main Server" : "ปิดใช้งานเซิร์ฟเวอร์หลัก",
+    "Turn off SSL certificate validation." : "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
+    "in seconds. A change empties the cache." : "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า",
+    "Directory Settings" : "ตั้งค่าไดเร็กทอรี่",
+    "User Display Name Field" : "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ",
+    "Base User Tree" : "รายการผู้ใช้งานหลักแบบ Tree",
+    "One User Base DN per line" : "หนึ่ง User Base DN ต่อบรรทัด",
+    "User Search Attributes" : "คุณลักษณะการค้นหาชื่อผู้ใช้",
+    "Optional; one attribute per line" : "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด",
+    "Group Display Name Field" : "ช่องแสดงชื่อกลุ่มที่ต้องการ",
+    "Base Group Tree" : "รายการกลุ่มหลักแบบ Tree",
+    "One Group Base DN per line" : "หนึ่ง Group Base DN ต่อบรรทัด",
+    "Group Search Attributes" : "คุณลักษณะการค้นหาแบบกลุ่ม",
+    "Group-Member association" : "ความสัมพันธ์ของสมาชิกในกลุ่ม",
+    "Special Attributes" : "คุณลักษณะพิเศษ",
+    "in bytes" : "ในหน่วยไบต์",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/th_TH.json b/apps/user_ldap/l10n/th_TH.json
new file mode 100644
index 00000000000..ddc8ddec2a3
--- /dev/null
+++ b/apps/user_ldap/l10n/th_TH.json
@@ -0,0 +1,52 @@
+{ "translations": {
+    "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." : "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน",
+    "Deletion failed" : "การลบทิ้งล้มเหลว",
+    "Keep settings?" : "รักษาการตั้งค่าไว้?",
+    "Cannot add server configuration" : "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
+    "Success" : "เสร็จสิ้น",
+    "Error" : "ข้อผิดพลาด",
+    "Select groups" : "เลือกกลุ่ม",
+    "Connection test succeeded" : "ทดสอบการเชื่อมต่อสำเร็จ",
+    "Connection test failed" : "ทดสอบการเชื่อมต่อล้มเหลว",
+    "Do you really want to delete the current Server Configuration?" : "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
+    "Confirm Deletion" : "ยืนยันการลบทิ้ง",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "ตัวกรองข้อมูลกลุ่ม",
+    "Save" : "บันทึก",
+    "Help" : "ช่วยเหลือ",
+    "Add Server Configuration" : "เพิ่มการกำหนดค่าเซิร์ฟเวอร์",
+    "Host" : "โฮสต์",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
+    "Port" : "พอร์ต",
+    "User DN" : "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." : "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้",
+    "Password" : "รหัสผ่าน",
+    "For anonymous access, leave DN and Password empty." : "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้",
+    "One Base DN per line" : "หนึ่ง Base DN ต่อบรรทัด",
+    "You can specify Base DN for users and groups in the Advanced tab" : "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้",
+    "Back" : "ย้อนกลับ",
+    "Advanced" : "ขั้นสูง",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว",
+    "Connection Settings" : "ตั้งค่าการเชื่อมต่อ",
+    "Disable Main Server" : "ปิดใช้งานเซิร์ฟเวอร์หลัก",
+    "Turn off SSL certificate validation." : "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
+    "in seconds. A change empties the cache." : "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า",
+    "Directory Settings" : "ตั้งค่าไดเร็กทอรี่",
+    "User Display Name Field" : "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ",
+    "Base User Tree" : "รายการผู้ใช้งานหลักแบบ Tree",
+    "One User Base DN per line" : "หนึ่ง User Base DN ต่อบรรทัด",
+    "User Search Attributes" : "คุณลักษณะการค้นหาชื่อผู้ใช้",
+    "Optional; one attribute per line" : "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด",
+    "Group Display Name Field" : "ช่องแสดงชื่อกลุ่มที่ต้องการ",
+    "Base Group Tree" : "รายการกลุ่มหลักแบบ Tree",
+    "One Group Base DN per line" : "หนึ่ง Group Base DN ต่อบรรทัด",
+    "Group Search Attributes" : "คุณลักษณะการค้นหาแบบกลุ่ม",
+    "Group-Member association" : "ความสัมพันธ์ของสมาชิกในกลุ่ม",
+    "Special Attributes" : "คุณลักษณะพิเศษ",
+    "in bytes" : "ในหน่วยไบต์",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
deleted file mode 100644
index 74d9fbe3150..00000000000
--- a/apps/user_ldap/l10n/th_TH.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "การกำหนดค่าถูกต้อง, แต่การผูกข้อมูลล้มเหลว, กรุณาตรวจสอบการตั้งค่าเซิร์ฟเวอร์และข้อมูลการเข้าใช้งาน",
-"Deletion failed" => "การลบทิ้งล้มเหลว",
-"Keep settings?" => "รักษาการตั้งค่าไว้?",
-"Cannot add server configuration" => "ไม่สามารถเพิ่มค่ากำหนดเซิร์ฟเวอร์ได้",
-"Success" => "เสร็จสิ้น",
-"Error" => "ข้อผิดพลาด",
-"Select groups" => "เลือกกลุ่ม",
-"Connection test succeeded" => "ทดสอบการเชื่อมต่อสำเร็จ",
-"Connection test failed" => "ทดสอบการเชื่อมต่อล้มเหลว",
-"Do you really want to delete the current Server Configuration?" => "คุณแน่ใจแล้วหรือว่าต้องการลบการกำหนดค่าเซิร์ฟเวอร์ปัจจุบันทิ้งไป?",
-"Confirm Deletion" => "ยืนยันการลบทิ้ง",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Group Filter" => "ตัวกรองข้อมูลกลุ่ม",
-"Save" => "บันทึก",
-"Help" => "ช่วยเหลือ",
-"Add Server Configuration" => "เพิ่มการกำหนดค่าเซิร์ฟเวอร์",
-"Host" => "โฮสต์",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://",
-"Port" => "พอร์ต",
-"User DN" => "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." => "DN ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้",
-"Password" => "รหัสผ่าน",
-"For anonymous access, leave DN and Password empty." => "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้",
-"One Base DN per line" => "หนึ่ง Base DN ต่อบรรทัด",
-"You can specify Base DN for users and groups in the Advanced tab" => "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้",
-"Back" => "ย้อนกลับ",
-"Advanced" => "ขั้นสูง",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>คำเตือน:</b> โมดูล PHP LDAP ยังไม่ได้ถูกติดตั้ง, ระบบด้านหลังจะไม่สามารถทำงานได้ กรุณาติดต่อผู้ดูแลระบบของคุณเพื่อทำการติดตั้งโมดูลดังกล่าว",
-"Connection Settings" => "ตั้งค่าการเชื่อมต่อ",
-"Disable Main Server" => "ปิดใช้งานเซิร์ฟเวอร์หลัก",
-"Turn off SSL certificate validation." => "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL",
-"in seconds. A change empties the cache." => "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า",
-"Directory Settings" => "ตั้งค่าไดเร็กทอรี่",
-"User Display Name Field" => "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ",
-"Base User Tree" => "รายการผู้ใช้งานหลักแบบ Tree",
-"One User Base DN per line" => "หนึ่ง User Base DN ต่อบรรทัด",
-"User Search Attributes" => "คุณลักษณะการค้นหาชื่อผู้ใช้",
-"Optional; one attribute per line" => "ตัวเลือกเพิ่มเติม; หนึ่งคุณลักษณะต่อบรรทัด",
-"Group Display Name Field" => "ช่องแสดงชื่อกลุ่มที่ต้องการ",
-"Base Group Tree" => "รายการกลุ่มหลักแบบ Tree",
-"One Group Base DN per line" => "หนึ่ง Group Base DN ต่อบรรทัด",
-"Group Search Attributes" => "คุณลักษณะการค้นหาแบบกลุ่ม",
-"Group-Member association" => "ความสัมพันธ์ของสมาชิกในกลุ่ม",
-"Special Attributes" => "คุณลักษณะพิเศษ",
-"in bytes" => "ในหน่วยไบต์",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/tl_PH.js b/apps/user_ldap/l10n/tl_PH.js
new file mode 100644
index 00000000000..95c97db2f9c
--- /dev/null
+++ b/apps/user_ldap/l10n/tl_PH.js
@@ -0,0 +1,7 @@
+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/tl_PH.json b/apps/user_ldap/l10n/tl_PH.json
new file mode 100644
index 00000000000..8e0cd6f6783
--- /dev/null
+++ b/apps/user_ldap/l10n/tl_PH.json
@@ -0,0 +1,5 @@
+{ "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/tl_PH.php b/apps/user_ldap/l10n/tl_PH.php
deleted file mode 100644
index 2371ee70593..00000000000
--- a/apps/user_ldap/l10n/tl_PH.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js
new file mode 100644
index 00000000000..8e38ca3cdd8
--- /dev/null
+++ b/apps/user_ldap/l10n/tr.js
@@ -0,0 +1,132 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Failed to clear the mappings." : "Eşleştirmeler temizlenirken hata oluştu.",
+    "Failed to delete the server configuration" : "Sunucu yapılandırmasını silme başarısız oldu",
+    "The configuration is valid and the connection could be established!" : "Yapılandırma geçerli ve bağlantı kuruldu!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen sunucu ayarları ve kimlik bilgilerini kontrol edin.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Yapılandırma geçersiz. Lütfen ayrıntılar için günlüklere bakın.",
+    "No action specified" : "Eylem belirtilmedi",
+    "No configuration specified" : "Yapılandırma belirtilmemiş",
+    "No data specified" : "Veri belirtilmemiş",
+    " Could not set configuration %s" : "%s yapılandırması ayarlanamadı",
+    "Deletion failed" : "Silme başarısız oldu",
+    "Take over settings from recent server configuration?" : "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
+    "Keep settings?" : "Ayarlar korunsun mu?",
+    "{nthServer}. Server" : "{nthServer}. Sunucu",
+    "Cannot add server configuration" : "Sunucu yapılandırması eklenemedi",
+    "mappings cleared" : "eşleştirmeler temizlendi",
+    "Success" : "Başarılı",
+    "Error" : "Hata",
+    "Please specify a Base DN" : "Lütfen bir Base DN belirtin",
+    "Could not determine Base DN" : "Base DN belirlenemedi",
+    "Please specify the port" : "Lütfen bağlantı noktasını belirtin",
+    "Configuration OK" : "Yapılandırma tamam",
+    "Configuration incorrect" : "Yapılandırma geçersiz",
+    "Configuration incomplete" : "Yapılandırma tamamlanmamış",
+    "Select groups" : "Grupları seç",
+    "Select object classes" : "Nesne sınıflarını seç",
+    "Select attributes" : "Nitelikleri seç",
+    "Connection test succeeded" : "Bağlantı testi başarılı oldu",
+    "Connection test failed" : "Bağlantı testi başarısız oldu",
+    "Do you really want to delete the current Server Configuration?" : "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
+    "Confirm Deletion" : "Silmeyi onayla",
+    "_%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 find the desired feature" : "İstenen özellik bulunamadı",
+    "Invalid Host" : "Geçersiz Makine",
+    "Server" : "Sunucu",
+    "User Filter" : "Kullanıcı Süzgeci",
+    "Login Filter" : "Oturum Süzgeci",
+    "Group Filter" : "Grup Süzgeci",
+    "Save" : "Kaydet",
+    "Test Configuration" : "Yapılandırmayı Sına",
+    "Help" : "Yardım",
+    "Groups meeting these criteria are available in %s:" : "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
+    "only those object classes:" : "sadece bu nesne sınıflarına:",
+    "only from those groups:" : "sadece bu gruplardan:",
+    "Edit raw filter instead" : "Bunun yerine ham filtreyi düzenle",
+    "Raw LDAP filter" : "Ham LDAP filtresi",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
+    "Test Filter" : "Filtreyi Test Et",
+    "groups found" : "grup bulundu",
+    "Users login with this attribute:" : "Kullanıcılar şu öznitelikle oturum açarlar:",
+    "LDAP Username:" : "LDAP Kullanıcı Adı:",
+    "LDAP Email Address:" : "LDAP E-posta Adresi:",
+    "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\"",
+    "1. Server" : "1. Sunucu",
+    "%s. Server:" : "%s. Sunucu:",
+    "Add Server Configuration" : "Sunucu Yapılandırması Ekle",
+    "Delete Configuration" : "Yapılandırmayı Sil",
+    "Host" : "Sunucu",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
+    "Port" : "Port",
+    "User DN" : "Kullanıcı 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." : "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.",
+    "Password" : "Parola",
+    "For anonymous access, leave DN and Password empty." : "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
+    "One Base DN per line" : "Her satırda tek bir Base DN",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.",
+    "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)",
+    "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
+    "users found" : "kullanıcı bulundu",
+    "Saving" : "Kaydediliyor",
+    "Back" : "Geri",
+    "Continue" : "Devam et",
+    "Expert" : "Uzman",
+    "Advanced" : "Gelişmiş",
+    "<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>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Uyarı:</b> PHP LDAP modülü kurulu değil, arka uç çalışmayacak. Lütfen kurulumu için sistem yöneticinizle iletişime geçin.",
+    "Connection Settings" : "Bağlantı Ayarları",
+    "Configuration Active" : "Yapılandırma Etkin",
+    "When unchecked, this configuration will be skipped." : "İşaretli değilse, bu yapılandırma atlanacaktır.",
+    "Backup (Replica) Host" : "Yedek (Replica) Sunucu",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "İsteğe bağlı bir yedek sunucusu belirtin. Ana LDAP/AD sunucusunun bir kopyası olmalıdır.",
+    "Backup (Replica) Port" : "Yedek (Replica) Bağlantı Noktası",
+    "Disable Main Server" : "Ana Sunucuyu Devre Dışı Bırak",
+    "Only connect to the replica server." : "Sadece yedek sunucuya bağlan.",
+    "Case insensitive LDAP server (Windows)" : "Büyük küçük harf duyarsız LDAP sunucusu (Windows)",
+    "Turn off SSL certificate validation." : "SSL sertifika doğrulamasını kapat.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.",
+    "Cache Time-To-Live" : "Önbellek Time-To-Live Değeri",
+    "in seconds. A change empties the cache." : "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
+    "Directory Settings" : "Dizin Ayarları",
+    "User Display Name Field" : "Kullanıcı Görünen Ad Alanı",
+    "The LDAP attribute to use to generate the user's display name." : "Kullanıcının görünen adını oluşturmak için kullanılacak LDAP niteliği.",
+    "Base User Tree" : "Temel Kullanıcı Ağacı",
+    "One User Base DN per line" : "Her satırda Tek Kullanıcı Base DN'si",
+    "User Search Attributes" : "Kullanıcı Arama Nitelikleri",
+    "Optional; one attribute per line" : "Tercihe bağlı; her bir satırda bir öznitelik",
+    "Group Display Name Field" : "Grup Görünen Ad Alanı",
+    "The LDAP attribute to use to generate the groups's display name." : "Grubun görünen adını oluşturmak için kullanılacak LDAP niteliği.",
+    "Base Group Tree" : "Temel Grup Ağacı",
+    "One Group Base DN per line" : "Her satırda Tek Grup Base DN'si",
+    "Group Search Attributes" : "Grup Arama Nitelikleri",
+    "Group-Member association" : "Grup-Üye işbirliği",
+    "Nested Groups" : "İç İçe Gruplar",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır).",
+    "Paging chunksize" : "Sayfalama yığın boyutu",
+    "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.)" : "Yığın boyutu, kullanıcı veya grup numaralandırması benzeri hantal sonuçlar döndürebilen sayfalandırılmış LDAP aramaları için kullanılır. (0 yapmak bu durumlarda sayfalandırılmış LDAP aramalarını devre dışı bırakır.)",
+    "Special Attributes" : "Özel Öznitelikler",
+    "Quota Field" : "Kota Alanı",
+    "Quota Default" : "Öntanımlı Kota",
+    "in bytes" : "byte cinsinden",
+    "Email Field" : "E-posta Alanı",
+    "User Home Folder Naming Rule" : "Kullanıcı Ana Dizini İsimlendirme Kuralı",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Kullanıcı adı bölümünü boş bırakın (öntanımlı). Aksi halde bir LDAP/AD özniteliği belirtin.",
+    "Internal Username" : "Dahili Kullanıcı Adı",
+    "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." : "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu ayar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır.",
+    "Internal Username Attribute:" : "Dahili Kullanıcı Adı Özniteliği:",
+    "Override UUID detection" : "UUID tespitinin üzerine yaz",
+    "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." : "Öntanımlı olarak, UUID niteliği otomatik olarak tespit edilmez. UUID niteliği LDAP kullanıcılarını ve gruplarını şüphesiz biçimde tanımlamak için kullanılır. Ayrıca yukarıda belirtilmemişse, bu UUID'ye bağlı olarak dahili bir kullanıcı adı oluşturulacaktır. Bu ayarın üzerine yazabilir ve istediğiniz bir nitelik belirtebilirsiniz. Ancak istediğiniz niteliğin benzersiz olduğundan ve hem kullanıcı hem de gruplar tarafından getirilebileceğinden emin olmalısınız. Öntanımlı davranış için boş bırakın. Değişiklikler sadece yeni eşleştirilen (eklenen) LDAP kullanıcı ve gruplarında etkili olacaktır.",
+    "UUID Attribute for Users:" : "Kullanıcılar için UUID Özniteliği:",
+    "UUID Attribute for Groups:" : "Gruplar için UUID Özniteliği:",
+    "Username-LDAP User Mapping" : "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirme",
+    "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." : "Kullanıcı adları, (üst) veri depolaması ve ataması için kullanılır. Kullanıcıları kesin olarak tanımlamak ve algılamak için, her LDAP kullanıcısı bir dahili kullanıcı adına sahip olacak. Bu kullanıcı adı ile LDAP kullanıcısı arasında bir eşleşme gerektirir. Oluşturulan kullanıcı adı LDAP kullanıcısının UUID'si ile eşleştirilir. Ek olarak LDAP etkileşimini azaltmak için DN de önbelleğe alınır ancak bu kimlik tanıma için kullanılmaz. Eğer DN değişirse, değişiklikler tespit edilir. Dahili kullanıcı her yerde kullanılır. Eşleştirmeleri temizlemek, her yerde kalıntılar bırakacaktır. Eşleştirmeleri temizlemek yapılandırmaya hassas bir şekilde bağlı değildir, tüm LDAP yapılandırmalarını etkiler! Üretim ortamında eşleştirmeleri asla temizlemeyin, sadece sınama veya deneysel aşamada kullanın.",
+    "Clear Username-LDAP User Mapping" : "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle",
+    "Clear Groupname-LDAP Group Mapping" : "Grup Adı-LDAP Grubu Eşleştirmesini Temizle"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json
new file mode 100644
index 00000000000..10418f995f6
--- /dev/null
+++ b/apps/user_ldap/l10n/tr.json
@@ -0,0 +1,130 @@
+{ "translations": {
+    "Failed to clear the mappings." : "Eşleştirmeler temizlenirken hata oluştu.",
+    "Failed to delete the server configuration" : "Sunucu yapılandırmasını silme başarısız oldu",
+    "The configuration is valid and the connection could be established!" : "Yapılandırma geçerli ve bağlantı kuruldu!",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen sunucu ayarları ve kimlik bilgilerini kontrol edin.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Yapılandırma geçersiz. Lütfen ayrıntılar için günlüklere bakın.",
+    "No action specified" : "Eylem belirtilmedi",
+    "No configuration specified" : "Yapılandırma belirtilmemiş",
+    "No data specified" : "Veri belirtilmemiş",
+    " Could not set configuration %s" : "%s yapılandırması ayarlanamadı",
+    "Deletion failed" : "Silme başarısız oldu",
+    "Take over settings from recent server configuration?" : "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
+    "Keep settings?" : "Ayarlar korunsun mu?",
+    "{nthServer}. Server" : "{nthServer}. Sunucu",
+    "Cannot add server configuration" : "Sunucu yapılandırması eklenemedi",
+    "mappings cleared" : "eşleştirmeler temizlendi",
+    "Success" : "Başarılı",
+    "Error" : "Hata",
+    "Please specify a Base DN" : "Lütfen bir Base DN belirtin",
+    "Could not determine Base DN" : "Base DN belirlenemedi",
+    "Please specify the port" : "Lütfen bağlantı noktasını belirtin",
+    "Configuration OK" : "Yapılandırma tamam",
+    "Configuration incorrect" : "Yapılandırma geçersiz",
+    "Configuration incomplete" : "Yapılandırma tamamlanmamış",
+    "Select groups" : "Grupları seç",
+    "Select object classes" : "Nesne sınıflarını seç",
+    "Select attributes" : "Nitelikleri seç",
+    "Connection test succeeded" : "Bağlantı testi başarılı oldu",
+    "Connection test failed" : "Bağlantı testi başarısız oldu",
+    "Do you really want to delete the current Server Configuration?" : "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
+    "Confirm Deletion" : "Silmeyi onayla",
+    "_%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 find the desired feature" : "İstenen özellik bulunamadı",
+    "Invalid Host" : "Geçersiz Makine",
+    "Server" : "Sunucu",
+    "User Filter" : "Kullanıcı Süzgeci",
+    "Login Filter" : "Oturum Süzgeci",
+    "Group Filter" : "Grup Süzgeci",
+    "Save" : "Kaydet",
+    "Test Configuration" : "Yapılandırmayı Sına",
+    "Help" : "Yardım",
+    "Groups meeting these criteria are available in %s:" : "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
+    "only those object classes:" : "sadece bu nesne sınıflarına:",
+    "only from those groups:" : "sadece bu gruplardan:",
+    "Edit raw filter instead" : "Bunun yerine ham filtreyi düzenle",
+    "Raw LDAP filter" : "Ham LDAP filtresi",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
+    "Test Filter" : "Filtreyi Test Et",
+    "groups found" : "grup bulundu",
+    "Users login with this attribute:" : "Kullanıcılar şu öznitelikle oturum açarlar:",
+    "LDAP Username:" : "LDAP Kullanıcı Adı:",
+    "LDAP Email Address:" : "LDAP E-posta Adresi:",
+    "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\"",
+    "1. Server" : "1. Sunucu",
+    "%s. Server:" : "%s. Sunucu:",
+    "Add Server Configuration" : "Sunucu Yapılandırması Ekle",
+    "Delete Configuration" : "Yapılandırmayı Sil",
+    "Host" : "Sunucu",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
+    "Port" : "Port",
+    "User DN" : "Kullanıcı 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." : "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.",
+    "Password" : "Parola",
+    "For anonymous access, leave DN and Password empty." : "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
+    "One Base DN per line" : "Her satırda tek bir Base DN",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.",
+    "Manually enter LDAP filters (recommended for large directories)" : "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)",
+    "Limit %s access to users meeting these criteria:" : "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
+    "users found" : "kullanıcı bulundu",
+    "Saving" : "Kaydediliyor",
+    "Back" : "Geri",
+    "Continue" : "Devam et",
+    "Expert" : "Uzman",
+    "Advanced" : "Gelişmiş",
+    "<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>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Uyarı:</b> PHP LDAP modülü kurulu değil, arka uç çalışmayacak. Lütfen kurulumu için sistem yöneticinizle iletişime geçin.",
+    "Connection Settings" : "Bağlantı Ayarları",
+    "Configuration Active" : "Yapılandırma Etkin",
+    "When unchecked, this configuration will be skipped." : "İşaretli değilse, bu yapılandırma atlanacaktır.",
+    "Backup (Replica) Host" : "Yedek (Replica) Sunucu",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "İsteğe bağlı bir yedek sunucusu belirtin. Ana LDAP/AD sunucusunun bir kopyası olmalıdır.",
+    "Backup (Replica) Port" : "Yedek (Replica) Bağlantı Noktası",
+    "Disable Main Server" : "Ana Sunucuyu Devre Dışı Bırak",
+    "Only connect to the replica server." : "Sadece yedek sunucuya bağlan.",
+    "Case insensitive LDAP server (Windows)" : "Büyük küçük harf duyarsız LDAP sunucusu (Windows)",
+    "Turn off SSL certificate validation." : "SSL sertifika doğrulamasını kapat.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.",
+    "Cache Time-To-Live" : "Önbellek Time-To-Live Değeri",
+    "in seconds. A change empties the cache." : "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
+    "Directory Settings" : "Dizin Ayarları",
+    "User Display Name Field" : "Kullanıcı Görünen Ad Alanı",
+    "The LDAP attribute to use to generate the user's display name." : "Kullanıcının görünen adını oluşturmak için kullanılacak LDAP niteliği.",
+    "Base User Tree" : "Temel Kullanıcı Ağacı",
+    "One User Base DN per line" : "Her satırda Tek Kullanıcı Base DN'si",
+    "User Search Attributes" : "Kullanıcı Arama Nitelikleri",
+    "Optional; one attribute per line" : "Tercihe bağlı; her bir satırda bir öznitelik",
+    "Group Display Name Field" : "Grup Görünen Ad Alanı",
+    "The LDAP attribute to use to generate the groups's display name." : "Grubun görünen adını oluşturmak için kullanılacak LDAP niteliği.",
+    "Base Group Tree" : "Temel Grup Ağacı",
+    "One Group Base DN per line" : "Her satırda Tek Grup Base DN'si",
+    "Group Search Attributes" : "Grup Arama Nitelikleri",
+    "Group-Member association" : "Grup-Üye işbirliği",
+    "Nested Groups" : "İç İçe Gruplar",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır).",
+    "Paging chunksize" : "Sayfalama yığın boyutu",
+    "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.)" : "Yığın boyutu, kullanıcı veya grup numaralandırması benzeri hantal sonuçlar döndürebilen sayfalandırılmış LDAP aramaları için kullanılır. (0 yapmak bu durumlarda sayfalandırılmış LDAP aramalarını devre dışı bırakır.)",
+    "Special Attributes" : "Özel Öznitelikler",
+    "Quota Field" : "Kota Alanı",
+    "Quota Default" : "Öntanımlı Kota",
+    "in bytes" : "byte cinsinden",
+    "Email Field" : "E-posta Alanı",
+    "User Home Folder Naming Rule" : "Kullanıcı Ana Dizini İsimlendirme Kuralı",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Kullanıcı adı bölümünü boş bırakın (öntanımlı). Aksi halde bir LDAP/AD özniteliği belirtin.",
+    "Internal Username" : "Dahili Kullanıcı Adı",
+    "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." : "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu ayar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır.",
+    "Internal Username Attribute:" : "Dahili Kullanıcı Adı Özniteliği:",
+    "Override UUID detection" : "UUID tespitinin üzerine yaz",
+    "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." : "Öntanımlı olarak, UUID niteliği otomatik olarak tespit edilmez. UUID niteliği LDAP kullanıcılarını ve gruplarını şüphesiz biçimde tanımlamak için kullanılır. Ayrıca yukarıda belirtilmemişse, bu UUID'ye bağlı olarak dahili bir kullanıcı adı oluşturulacaktır. Bu ayarın üzerine yazabilir ve istediğiniz bir nitelik belirtebilirsiniz. Ancak istediğiniz niteliğin benzersiz olduğundan ve hem kullanıcı hem de gruplar tarafından getirilebileceğinden emin olmalısınız. Öntanımlı davranış için boş bırakın. Değişiklikler sadece yeni eşleştirilen (eklenen) LDAP kullanıcı ve gruplarında etkili olacaktır.",
+    "UUID Attribute for Users:" : "Kullanıcılar için UUID Özniteliği:",
+    "UUID Attribute for Groups:" : "Gruplar için UUID Özniteliği:",
+    "Username-LDAP User Mapping" : "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirme",
+    "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." : "Kullanıcı adları, (üst) veri depolaması ve ataması için kullanılır. Kullanıcıları kesin olarak tanımlamak ve algılamak için, her LDAP kullanıcısı bir dahili kullanıcı adına sahip olacak. Bu kullanıcı adı ile LDAP kullanıcısı arasında bir eşleşme gerektirir. Oluşturulan kullanıcı adı LDAP kullanıcısının UUID'si ile eşleştirilir. Ek olarak LDAP etkileşimini azaltmak için DN de önbelleğe alınır ancak bu kimlik tanıma için kullanılmaz. Eğer DN değişirse, değişiklikler tespit edilir. Dahili kullanıcı her yerde kullanılır. Eşleştirmeleri temizlemek, her yerde kalıntılar bırakacaktır. Eşleştirmeleri temizlemek yapılandırmaya hassas bir şekilde bağlı değildir, tüm LDAP yapılandırmalarını etkiler! Üretim ortamında eşleştirmeleri asla temizlemeyin, sadece sınama veya deneysel aşamada kullanın.",
+    "Clear Username-LDAP User Mapping" : "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle",
+    "Clear Groupname-LDAP Group Mapping" : "Grup Adı-LDAP Grubu Eşleştirmesini Temizle"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/tr.php b/apps/user_ldap/l10n/tr.php
deleted file mode 100644
index 3527870032b..00000000000
--- a/apps/user_ldap/l10n/tr.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Failed to clear the mappings." => "Eşleştirmeler temizlenirken hata oluştu.",
-"Failed to delete the server configuration" => "Sunucu yapılandırmasını silme başarısız oldu",
-"The configuration is valid and the connection could be established!" => "Yapılandırma geçerli ve bağlantı kuruldu!",
-"The configuration is valid, but the Bind failed. Please check the server settings and credentials." => "Yapılandırma geçerli fakat bağlama (bind) başarısız. Lütfen sunucu ayarları ve kimlik bilgilerini kontrol edin.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Yapılandırma geçersiz. Lütfen ayrıntılar için günlüklere bakın.",
-"No action specified" => "Eylem belirtilmedi",
-"No configuration specified" => "Yapılandırma belirtilmemiş",
-"No data specified" => "Veri belirtilmemiş",
-" Could not set configuration %s" => "%s yapılandırması ayarlanamadı",
-"Deletion failed" => "Silme başarısız oldu",
-"Take over settings from recent server configuration?" => "Ayarlar son sunucu yapılandırmalarından devralınsın mı?",
-"Keep settings?" => "Ayarlar korunsun mu?",
-"{nthServer}. Server" => "{nthServer}. Sunucu",
-"Cannot add server configuration" => "Sunucu yapılandırması eklenemedi",
-"mappings cleared" => "eşleştirmeler temizlendi",
-"Success" => "Başarılı",
-"Error" => "Hata",
-"Please specify a Base DN" => "Lütfen bir Base DN belirtin",
-"Could not determine Base DN" => "Base DN belirlenemedi",
-"Please specify the port" => "Lütfen bağlantı noktasını belirtin",
-"Configuration OK" => "Yapılandırma tamam",
-"Configuration incorrect" => "Yapılandırma geçersiz",
-"Configuration incomplete" => "Yapılandırma tamamlanmamış",
-"Select groups" => "Grupları seç",
-"Select object classes" => "Nesne sınıflarını seç",
-"Select attributes" => "Nitelikleri seç",
-"Connection test succeeded" => "Bağlantı testi başarılı oldu",
-"Connection test failed" => "Bağlantı testi başarısız oldu",
-"Do you really want to delete the current Server Configuration?" => "Şu anki sunucu yapılandırmasını silmek istediğinizden emin misiniz?",
-"Confirm Deletion" => "Silmeyi onayla",
-"_%s group found_::_%s groups found_" => array("%s grup bulundu","%s grup bulundu"),
-"_%s user found_::_%s users found_" => array("%s kullanıcı bulundu","%s kullanıcı bulundu"),
-"Could not find the desired feature" => "İstenen özellik bulunamadı",
-"Invalid Host" => "Geçersiz Makine",
-"Server" => "Sunucu",
-"User Filter" => "Kullanıcı Süzgeci",
-"Login Filter" => "Oturum Süzgeci",
-"Group Filter" => "Grup Süzgeci",
-"Save" => "Kaydet",
-"Test Configuration" => "Yapılandırmayı Sına",
-"Help" => "Yardım",
-"Groups meeting these criteria are available in %s:" => "Bu kriterlerle eşleşen gruplar %s içinde mevcut:",
-"only those object classes:" => "sadece bu nesne sınıflarına:",
-"only from those groups:" => "sadece bu gruplardan:",
-"Edit raw filter instead" => "Bunun yerine ham filtreyi düzenle",
-"Raw LDAP filter" => "Ham LDAP filtresi",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP gruplarını belirtir.",
-"Test Filter" => "Filtreyi Test Et",
-"groups found" => "grup bulundu",
-"Users login with this attribute:" => "Kullanıcılar şu öznitelikle oturum açarlar:",
-"LDAP Username:" => "LDAP Kullanıcı Adı:",
-"LDAP Email Address:" => "LDAP E-posta Adresi:",
-"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\"",
-"1. Server" => "1. Sunucu",
-"%s. Server:" => "%s. Sunucu:",
-"Add Server Configuration" => "Sunucu Yapılandırması Ekle",
-"Delete Configuration" => "Yapılandırmayı Sil",
-"Host" => "Sunucu",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL gerekmediği takdirde protokol belirtmeyebilirsiniz. Gerekiyorsa ldaps:// ile başlayın",
-"Port" => "Port",
-"User DN" => "Kullanıcı 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." => "İstemci kullanıcısının yapılacağı atamanın DN'si. Örn. uid=agent,dc=örnek,dc=com. Anonim erişim için DN ve Parolayı boş bırakın.",
-"Password" => "Parola",
-"For anonymous access, leave DN and Password empty." => "Anonim erişim için DN ve Parola alanlarını boş bırakın.",
-"One Base DN per line" => "Her satırda tek bir Base DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "Gelişmiş sekmesinde, kullanıcılar ve gruplar için Base DN belirtebilirsiniz",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Otomatik LDAP isteklerinden kaçın. Büyük kurulumlar için daha iyi ancak LDAP bilgisi gerektirir.",
-"Manually enter LDAP filters (recommended for large directories)" => "LDAP filtrelerini el ile girin (büyük dizinler için önerilir)",
-"Limit %s access to users meeting these criteria:" => "%s erişimini, şu kriterlerle eşleşen kullanıcılara sınırla:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Filtre, %s örneğine erişmesi gereken LDAP kullanıcılarını belirtir.",
-"users found" => "kullanıcı bulundu",
-"Saving" => "Kaydediliyor",
-"Back" => "Geri",
-"Continue" => "Devam et",
-"Expert" => "Uzman",
-"Advanced" => "Gelişmiş",
-"<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>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Uyarı:</b> PHP LDAP modülü kurulu değil, arka uç çalışmayacak. Lütfen kurulumu için sistem yöneticinizle iletişime geçin.",
-"Connection Settings" => "Bağlantı Ayarları",
-"Configuration Active" => "Yapılandırma Etkin",
-"When unchecked, this configuration will be skipped." => "İşaretli değilse, bu yapılandırma atlanacaktır.",
-"Backup (Replica) Host" => "Yedek (Replica) Sunucu",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "İsteğe bağlı bir yedek sunucusu belirtin. Ana LDAP/AD sunucusunun bir kopyası olmalıdır.",
-"Backup (Replica) Port" => "Yedek (Replica) Bağlantı Noktası",
-"Disable Main Server" => "Ana Sunucuyu Devre Dışı Bırak",
-"Only connect to the replica server." => "Sadece yedek sunucuya bağlan.",
-"Case insensitive LDAP server (Windows)" => "Büyük küçük harf duyarsız LDAP sunucusu (Windows)",
-"Turn off SSL certificate validation." => "SSL sertifika doğrulamasını kapat.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Önerilmez, sadece test için kullanın! Eğer bağlantı sadece bu seçenekle çalışıyorsa %s sunucunuza LDAP sunucusunun SSL sertifikasını ekleyin.",
-"Cache Time-To-Live" => "Önbellek Time-To-Live Değeri",
-"in seconds. A change empties the cache." => "saniye cinsinden. Bir değişiklik önbelleği temizleyecektir.",
-"Directory Settings" => "Dizin Ayarları",
-"User Display Name Field" => "Kullanıcı Görünen Ad Alanı",
-"The LDAP attribute to use to generate the user's display name." => "Kullanıcının görünen adını oluşturmak için kullanılacak LDAP niteliği.",
-"Base User Tree" => "Temel Kullanıcı Ağacı",
-"One User Base DN per line" => "Her satırda Tek Kullanıcı Base DN'si",
-"User Search Attributes" => "Kullanıcı Arama Nitelikleri",
-"Optional; one attribute per line" => "Tercihe bağlı; her bir satırda bir öznitelik",
-"Group Display Name Field" => "Grup Görünen Ad Alanı",
-"The LDAP attribute to use to generate the groups's display name." => "Grubun görünen adını oluşturmak için kullanılacak LDAP niteliği.",
-"Base Group Tree" => "Temel Grup Ağacı",
-"One Group Base DN per line" => "Her satırda Tek Grup Base DN'si",
-"Group Search Attributes" => "Grup Arama Nitelikleri",
-"Group-Member association" => "Grup-Üye işbirliği",
-"Nested Groups" => "İç İçe Gruplar",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "Etkinleştirildiğinde, grup içeren gruplar desteklenir (Sadece grup üyesi DN niteliği içeriyorsa çalışır).",
-"Paging chunksize" => "Sayfalama yığın boyutu",
-"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.)" => "Yığın boyutu, kullanıcı veya grup numaralandırması benzeri hantal sonuçlar döndürebilen sayfalandırılmış LDAP aramaları için kullanılır. (0 yapmak bu durumlarda sayfalandırılmış LDAP aramalarını devre dışı bırakır.)",
-"Special Attributes" => "Özel Öznitelikler",
-"Quota Field" => "Kota Alanı",
-"Quota Default" => "Öntanımlı Kota",
-"in bytes" => "byte cinsinden",
-"Email Field" => "E-posta Alanı",
-"User Home Folder Naming Rule" => "Kullanıcı Ana Dizini İsimlendirme Kuralı",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kullanıcı adı bölümünü boş bırakın (öntanımlı). Aksi halde bir LDAP/AD özniteliği belirtin.",
-"Internal Username" => "Dahili Kullanıcı Adı",
-"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." => "Öntanımlı olarak UUID niteliğinden dahili bir kullanıcı adı oluşturulacak. Bu, kullanıcı adının benzersiz ve karakterlerinin dönüştürme gereksinimini ortadan kaldırır. Dahili kullanıcı adı, sadece bu karakterlerin izin verildiği kısıtlamaya sahip: [ a-zA-Z0-9_.@- ]. Diğer karakterler ise ASCII karşılıkları ile yer değiştirilir veya basitçe yoksayılır. Çakışmalar olduğunda ise bir numara eklenir veya arttırılır. Dahili kullanıcı adı, bir kullanıcıyı dahili olarak tanımlamak için kullanılır. Ayrıca kullanıcı ev klasörü için öntanımlı bir isimdir. Bu ayrıca uzak adreslerin (örneğin tüm *DAV hizmetleri) bir parçasıdır. Bu ayar ise, öntanımlı davranışın üzerine yazılabilir. ownCloud 5'ten önce benzer davranışı yapabilmek için aşağıdaki alana bir kullanıcı görünen adı niteliği girin. Öntanımlı davranış için boş bırakın. Değişiklikler, sadece yeni eşleştirilen (eklenen) LDAP kullanıcılarında etkili olacaktır.",
-"Internal Username Attribute:" => "Dahili Kullanıcı Adı Özniteliği:",
-"Override UUID detection" => "UUID tespitinin üzerine yaz",
-"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." => "Öntanımlı olarak, UUID niteliği otomatik olarak tespit edilmez. UUID niteliği LDAP kullanıcılarını ve gruplarını şüphesiz biçimde tanımlamak için kullanılır. Ayrıca yukarıda belirtilmemişse, bu UUID'ye bağlı olarak dahili bir kullanıcı adı oluşturulacaktır. Bu ayarın üzerine yazabilir ve istediğiniz bir nitelik belirtebilirsiniz. Ancak istediğiniz niteliğin benzersiz olduğundan ve hem kullanıcı hem de gruplar tarafından getirilebileceğinden emin olmalısınız. Öntanımlı davranış için boş bırakın. Değişiklikler sadece yeni eşleştirilen (eklenen) LDAP kullanıcı ve gruplarında etkili olacaktır.",
-"UUID Attribute for Users:" => "Kullanıcılar için UUID Özniteliği:",
-"UUID Attribute for Groups:" => "Gruplar için UUID Özniteliği:",
-"Username-LDAP User Mapping" => "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirme",
-"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." => "Kullanıcı adları, (üst) veri depolaması ve ataması için kullanılır. Kullanıcıları kesin olarak tanımlamak ve algılamak için, her LDAP kullanıcısı bir dahili kullanıcı adına sahip olacak. Bu kullanıcı adı ile LDAP kullanıcısı arasında bir eşleşme gerektirir. Oluşturulan kullanıcı adı LDAP kullanıcısının UUID'si ile eşleştirilir. Ek olarak LDAP etkileşimini azaltmak için DN de önbelleğe alınır ancak bu kimlik tanıma için kullanılmaz. Eğer DN değişirse, değişiklikler tespit edilir. Dahili kullanıcı her yerde kullanılır. Eşleştirmeleri temizlemek, her yerde kalıntılar bırakacaktır. Eşleştirmeleri temizlemek yapılandırmaya hassas bir şekilde bağlı değildir, tüm LDAP yapılandırmalarını etkiler! Üretim ortamında eşleştirmeleri asla temizlemeyin, sadece sınama veya deneysel aşamada kullanın.",
-"Clear Username-LDAP User Mapping" => "Kullanıcı Adı-LDAP Kullanıcısı Eşleştirmesini Temizle",
-"Clear Groupname-LDAP Group Mapping" => "Grup Adı-LDAP Grubu Eşleştirmesini Temizle"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_ldap/l10n/tzm.js b/apps/user_ldap/l10n/tzm.js
new file mode 100644
index 00000000000..1d621c04a77
--- /dev/null
+++ b/apps/user_ldap/l10n/tzm.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""]
+},
+"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;");
diff --git a/apps/user_ldap/l10n/tzm.json b/apps/user_ldap/l10n/tzm.json
new file mode 100644
index 00000000000..2c3a3581b99
--- /dev/null
+++ b/apps/user_ldap/l10n/tzm.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/tzm.php b/apps/user_ldap/l10n/tzm.php
deleted file mode 100644
index 5a0481c397a..00000000000
--- a/apps/user_ldap/l10n/tzm.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;";
diff --git a/apps/user_ldap/l10n/ug.js b/apps/user_ldap/l10n/ug.js
new file mode 100644
index 00000000000..408944c7442
--- /dev/null
+++ b/apps/user_ldap/l10n/ug.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "ئۆچۈرۈش مەغلۇپ بولدى",
+    "Error" : "خاتالىق",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "گۇرۇپپا سۈزگۈچ",
+    "Save" : "ساقلا",
+    "Help" : "ياردەم",
+    "Host" : "باش ئاپپارات",
+    "Port" : "ئېغىز",
+    "Password" : "ئىم",
+    "Advanced" : "ئالىي",
+    "Connection Settings" : "باغلىنىش تەڭشىكى",
+    "Configuration Active" : "سەپلىمە ئاكتىپ"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/ug.json b/apps/user_ldap/l10n/ug.json
new file mode 100644
index 00000000000..b9511d564e1
--- /dev/null
+++ b/apps/user_ldap/l10n/ug.json
@@ -0,0 +1,16 @@
+{ "translations": {
+    "Deletion failed" : "ئۆچۈرۈش مەغلۇپ بولدى",
+    "Error" : "خاتالىق",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "گۇرۇپپا سۈزگۈچ",
+    "Save" : "ساقلا",
+    "Help" : "ياردەم",
+    "Host" : "باش ئاپپارات",
+    "Port" : "ئېغىز",
+    "Password" : "ئىم",
+    "Advanced" : "ئالىي",
+    "Connection Settings" : "باغلىنىش تەڭشىكى",
+    "Configuration Active" : "سەپلىمە ئاكتىپ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ug.php b/apps/user_ldap/l10n/ug.php
deleted file mode 100644
index 02adcc0c8a5..00000000000
--- a/apps/user_ldap/l10n/ug.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "ئۆچۈرۈش مەغلۇپ بولدى",
-"Error" => "خاتالىق",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Group Filter" => "گۇرۇپپا سۈزگۈچ",
-"Save" => "ساقلا",
-"Help" => "ياردەم",
-"Host" => "باش ئاپپارات",
-"Port" => "ئېغىز",
-"Password" => "ئىم",
-"Advanced" => "ئالىي",
-"Connection Settings" => "باغلىنىش تەڭشىكى",
-"Configuration Active" => "سەپلىمە ئاكتىپ"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js
new file mode 100644
index 00000000000..538061db520
--- /dev/null
+++ b/apps/user_ldap/l10n/uk.js
@@ -0,0 +1,132 @@
+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." : "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Конфігурація є недійсною. Будь ласка, дивіться журнали для отримання додаткової інформації.",
+    "No action specified" : "Ніяких дій не вказано",
+    "No configuration specified" : "Немає конфігурації",
+    "No data specified" : "Немає даних",
+    " Could not set configuration %s" : "Не вдалося встановити конфігурацію %s",
+    "Deletion failed" : "Видалення не було виконано",
+    "Take over settings from recent server configuration?" : "Застосувати налаштування  з останньої конфігурації сервера ?",
+    "Keep settings?" : "Зберегти налаштування ?",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
+    "Cannot add server configuration" : "Неможливо додати конфігурацію сервера",
+    "mappings cleared" : "відображення очищається",
+    "Success" : "Успіх",
+    "Error" : "Помилка",
+    "Please specify a Base DN" : "Введіть Base DN",
+    "Could not determine Base DN" : "Не вдалося визначити Base DN",
+    "Please specify the port" : "Будь ласка, вкажіть порт",
+    "Configuration OK" : "Конфігурація OK",
+    "Configuration incorrect" : "Невірна конфігурація",
+    "Configuration incomplete" : "Конфігурація неповна",
+    "Select groups" : "Оберіть групи",
+    "Select object classes" : "Виберіть класи об'єктів",
+    "Select attributes" : "Виберіть атрибути",
+    "Connection test succeeded" : "Перевірка з'єднання пройшла успішно",
+    "Connection test failed" : "Перевірка з'єднання завершилась неуспішно",
+    "Do you really want to delete the current Server Configuration?" : "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
+    "Confirm Deletion" : "Підтвердіть Видалення",
+    "_%s group found_::_%s groups found_" : [" %s група знайдена "," %s груп знайдено ","%s груп знайдено "],
+    "_%s user found_::_%s users found_" : ["%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"],
+    "Could not find the desired feature" : "Не вдалося знайти потрібну функцію",
+    "Invalid Host" : "Невірний Host",
+    "Server" : "Сервер",
+    "User Filter" : "Користувацький Фільтр",
+    "Login Filter" : "Фільтр Входу",
+    "Group Filter" : "Фільтр Груп",
+    "Save" : "Зберегти",
+    "Test Configuration" : "Тестове налаштування",
+    "Help" : "Допомога",
+    "Groups meeting these criteria are available in %s:" : "Групи, що відповідають цим критеріям доступні в %s:",
+    "only those object classes:" : "тільки ці об'єктні класи:",
+    "only from those groups:" : "тільки з цих груп:",
+    "Edit raw filter instead" : "Редагувати початковий фільтр",
+    "Raw LDAP filter" : "Початковий LDAP фільтр",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
+    "Test Filter" : "Тест Фільтр",
+    "groups found" : "знайдені групи",
+    "Users login with this attribute:" : "Вхід користувачів з цим атрибутом:",
+    "LDAP Username:" : "LDAP Ім’я користувача:",
+    "LDAP Email Address:" : "LDAP E-mail адрес:",
+    "Other Attributes:" : "Інші Атрібути:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"",
+    "1. Server" : "1. Сервер",
+    "%s. Server:" : "%s. Сервер:",
+    "Add Server Configuration" : "Додати налаштування Сервера",
+    "Delete Configuration" : "Видалити Конфігурацію",
+    "Host" : "Хост",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
+    "Port" : "Порт",
+    "User DN" : "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." : "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми.",
+    "Password" : "Пароль",
+    "For anonymous access, leave DN and Password empty." : "Для анонімного доступу, залиште DN і Пароль порожніми.",
+    "One Base DN per line" : "Один Base DN на одній строчці",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Уникати автоматичні запити LDAP. Краще для великих установок, але вимагає деякого LDAP знання.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)",
+    "Limit %s access to users meeting these criteria:" : "Обмежити %s доступ до користувачів, що відповідають цим критеріям:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.",
+    "users found" : "користувачів знайдено",
+    "Saving" : "Збереження",
+    "Back" : "Назад",
+    "Continue" : "Продовжити",
+    "Expert" : "Експерт",
+    "Advanced" : "Додатково",
+    "<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
+    "Connection Settings" : "Налаштування З'єднання",
+    "Configuration Active" : "Налаштування Активне",
+    "When unchecked, this configuration will be skipped." : "Якщо \"галочка\" знята, ця конфігурація буде пропущена.",
+    "Backup (Replica) Host" : "Сервер для резервних копій",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера.",
+    "Backup (Replica) Port" : "Порт сервера для резервних копій",
+    "Disable Main Server" : "Вимкнути Головний Сервер",
+    "Only connect to the replica server." : "Підключити тільки до сервера реплік.",
+    "Case insensitive LDAP server (Windows)" : "Без урахування регістра LDAP сервер (Windows)",
+    "Turn off SSL certificate validation." : "Вимкнути перевірку SSL сертифіката.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендується, використовувати його тільки для тестування!\nЯкщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший %s сервер.",
+    "Cache Time-To-Live" : "Час актуальності Кеша",
+    "in seconds. A change empties the cache." : "в секундах. Зміна очищує кеш.",
+    "Directory Settings" : "Налаштування Каталога",
+    "User Display Name Field" : "Поле, яке відображає Ім'я Користувача",
+    "The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, який використовується для генерації імен користувачів.",
+    "Base User Tree" : "Основне Дерево Користувачів",
+    "One User Base DN per line" : "Один Користувач Base DN на одній строчці",
+    "User Search Attributes" : "Пошукові Атрибути Користувача",
+    "Optional; one attribute per line" : "Додатково; один атрибут на строчку",
+    "Group Display Name Field" : "Поле, яке відображає Ім'я Групи",
+    "The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, який використовується для генерації імен груп.",
+    "Base Group Tree" : "Основне Дерево Груп",
+    "One Group Base DN per line" : "Одна Група Base DN на одній строчці",
+    "Group Search Attributes" : "Пошукові Атрибути Групи",
+    "Group-Member association" : "Асоціація Група-Член",
+    "Nested Groups" : "Вкладені Групи",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "При включенні, групи, які містять групи підтримуються. (Працює тільки якщо атрибут члена групи містить DNS.)",
+    "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.)" : "Підкачка використовується для сторінкових пошуків LDAP, які можуть повертати громіздкі результати кількісті користувачів або груп. (Установка його 0 відключає вивантаженя пошуку LDAP в таких ситуаціях.)",
+    "Special Attributes" : "Спеціальні Атрибути",
+    "Quota Field" : "Поле Квоти",
+    "Quota Default" : "Квота за замовчанням",
+    "in bytes" : "в байтах",
+    "Email Field" : "Поле Ел. пошти",
+    "User Home Folder Naming Rule" : "Правило іменування домашньої теки користувача",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
+    "Internal Username" : "Внутрішня Ім'я користувача",
+    "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." : "За замовчуванням внутрішнє ім'я користувача буде створено з атрибуту UUID. Таким чином ім'я користувача є унікальним і не потребує перетворення символів. Внутрішнє ім'я користувача може складатися лише з наступних символів: [A-Za-z0-9 _ @ -.]. Інші символи заміняються відповідними з таблиці ASCII або пропускаються. При збігу до імені буде додано або збільшено число. Внутрішнє ім'я користувача використовується для внутрішньої ідентифікації користувача. Це також ім'я за замовчуванням для домашньої теки користувача та частина віддалених URL, наприклад, для всіх сервісів *DAV. За допомогою цієї установки можна змінити поведінку за замовчуванням. Для досягнення поведінки, що була до OwnCloud 5, введіть атрибут ім'я користувача, що відображається,  в наступне поле. Залиште порожнім для режиму за замовчуванням. Зміни будуть діяти тільки для нових підключень (доданих) користувачів LDAP.",
+    "Internal Username Attribute:" : "Внутрішня Ім'я користувача, Атрибут:",
+    "Override UUID detection" : "Перекрити вивід 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." : "За замовчуванням ownCloud визначає атрибут UUID автоматично. Цей атрибут використовується для того, щоб достовірно ідентифікувати користувачів і групи LDAP. Також на підставі атрибута UUID створюється внутрішнє ім'я користувача, якщо вище не вказано інакше. Ви можете перевизначити це налаштування та вказати свій атрибут за вибором. Ви повинні упевнитися, що обраний вами атрибут може бути вибраний для користувачів і груп, а також те, що він унікальний. Залиште поле порожнім для поведінки за замовчуванням. Зміни вступлять в силу тільки для нових підключених (доданих) користувачів і груп LDAP.",
+    "UUID Attribute for Users:" : "UUID Атрибут для користувачів:",
+    "UUID Attribute for Groups:" : "UUID Атрибут для груп:",
+    "Username-LDAP User Mapping" : "Картографія Імен користувачів-LDAP ",
+    "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." : "ownCloud використовує імена користувачів для зберігання і призначення метаданих. Для точної ідентифікації і розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатору UUID користувача LDAP. Крім цього кешується розрізнювальне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо розрізнювальне ім'я було змінене, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується скрізь в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язано до конфігурації, він вплине на всі LDAP-підключення! Ні в якому разі не рекомендується скидати прив'язки, якщо система вже знаходиться в експлуатації, тільки на етапі тестування.",
+    "Clear Username-LDAP User Mapping" : "Очистити картографію Імен користувачів-LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Очистити картографію Імен груп-LDAP"
+},
+"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_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json
new file mode 100644
index 00000000000..f0b439ac979
--- /dev/null
+++ b/apps/user_ldap/l10n/uk.json
@@ -0,0 +1,130 @@
+{ "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." : "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Конфігурація є недійсною. Будь ласка, дивіться журнали для отримання додаткової інформації.",
+    "No action specified" : "Ніяких дій не вказано",
+    "No configuration specified" : "Немає конфігурації",
+    "No data specified" : "Немає даних",
+    " Could not set configuration %s" : "Не вдалося встановити конфігурацію %s",
+    "Deletion failed" : "Видалення не було виконано",
+    "Take over settings from recent server configuration?" : "Застосувати налаштування  з останньої конфігурації сервера ?",
+    "Keep settings?" : "Зберегти налаштування ?",
+    "{nthServer}. Server" : "{nthServer}. Сервер",
+    "Cannot add server configuration" : "Неможливо додати конфігурацію сервера",
+    "mappings cleared" : "відображення очищається",
+    "Success" : "Успіх",
+    "Error" : "Помилка",
+    "Please specify a Base DN" : "Введіть Base DN",
+    "Could not determine Base DN" : "Не вдалося визначити Base DN",
+    "Please specify the port" : "Будь ласка, вкажіть порт",
+    "Configuration OK" : "Конфігурація OK",
+    "Configuration incorrect" : "Невірна конфігурація",
+    "Configuration incomplete" : "Конфігурація неповна",
+    "Select groups" : "Оберіть групи",
+    "Select object classes" : "Виберіть класи об'єктів",
+    "Select attributes" : "Виберіть атрибути",
+    "Connection test succeeded" : "Перевірка з'єднання пройшла успішно",
+    "Connection test failed" : "Перевірка з'єднання завершилась неуспішно",
+    "Do you really want to delete the current Server Configuration?" : "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
+    "Confirm Deletion" : "Підтвердіть Видалення",
+    "_%s group found_::_%s groups found_" : [" %s група знайдена "," %s груп знайдено ","%s груп знайдено "],
+    "_%s user found_::_%s users found_" : ["%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"],
+    "Could not find the desired feature" : "Не вдалося знайти потрібну функцію",
+    "Invalid Host" : "Невірний Host",
+    "Server" : "Сервер",
+    "User Filter" : "Користувацький Фільтр",
+    "Login Filter" : "Фільтр Входу",
+    "Group Filter" : "Фільтр Груп",
+    "Save" : "Зберегти",
+    "Test Configuration" : "Тестове налаштування",
+    "Help" : "Допомога",
+    "Groups meeting these criteria are available in %s:" : "Групи, що відповідають цим критеріям доступні в %s:",
+    "only those object classes:" : "тільки ці об'єктні класи:",
+    "only from those groups:" : "тільки з цих груп:",
+    "Edit raw filter instead" : "Редагувати початковий фільтр",
+    "Raw LDAP filter" : "Початковий LDAP фільтр",
+    "The filter specifies which LDAP groups shall have access to the %s instance." : "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
+    "Test Filter" : "Тест Фільтр",
+    "groups found" : "знайдені групи",
+    "Users login with this attribute:" : "Вхід користувачів з цим атрибутом:",
+    "LDAP Username:" : "LDAP Ім’я користувача:",
+    "LDAP Email Address:" : "LDAP E-mail адрес:",
+    "Other Attributes:" : "Інші Атрібути:",
+    "Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" : "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"",
+    "1. Server" : "1. Сервер",
+    "%s. Server:" : "%s. Сервер:",
+    "Add Server Configuration" : "Додати налаштування Сервера",
+    "Delete Configuration" : "Видалити Конфігурацію",
+    "Host" : "Хост",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
+    "Port" : "Порт",
+    "User DN" : "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." : "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми.",
+    "Password" : "Пароль",
+    "For anonymous access, leave DN and Password empty." : "Для анонімного доступу, залиште DN і Пароль порожніми.",
+    "One Base DN per line" : "Один Base DN на одній строчці",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Уникати автоматичні запити LDAP. Краще для великих установок, але вимагає деякого LDAP знання.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)",
+    "Limit %s access to users meeting these criteria:" : "Обмежити %s доступ до користувачів, що відповідають цим критеріям:",
+    "The filter specifies which LDAP users shall have access to the %s instance." : "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.",
+    "users found" : "користувачів знайдено",
+    "Saving" : "Збереження",
+    "Back" : "Назад",
+    "Continue" : "Продовжити",
+    "Expert" : "Експерт",
+    "Advanced" : "Додатково",
+    "<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
+    "Connection Settings" : "Налаштування З'єднання",
+    "Configuration Active" : "Налаштування Активне",
+    "When unchecked, this configuration will be skipped." : "Якщо \"галочка\" знята, ця конфігурація буде пропущена.",
+    "Backup (Replica) Host" : "Сервер для резервних копій",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера.",
+    "Backup (Replica) Port" : "Порт сервера для резервних копій",
+    "Disable Main Server" : "Вимкнути Головний Сервер",
+    "Only connect to the replica server." : "Підключити тільки до сервера реплік.",
+    "Case insensitive LDAP server (Windows)" : "Без урахування регістра LDAP сервер (Windows)",
+    "Turn off SSL certificate validation." : "Вимкнути перевірку SSL сертифіката.",
+    "Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." : "Не рекомендується, використовувати його тільки для тестування!\nЯкщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший %s сервер.",
+    "Cache Time-To-Live" : "Час актуальності Кеша",
+    "in seconds. A change empties the cache." : "в секундах. Зміна очищує кеш.",
+    "Directory Settings" : "Налаштування Каталога",
+    "User Display Name Field" : "Поле, яке відображає Ім'я Користувача",
+    "The LDAP attribute to use to generate the user's display name." : "Атрибут LDAP, який використовується для генерації імен користувачів.",
+    "Base User Tree" : "Основне Дерево Користувачів",
+    "One User Base DN per line" : "Один Користувач Base DN на одній строчці",
+    "User Search Attributes" : "Пошукові Атрибути Користувача",
+    "Optional; one attribute per line" : "Додатково; один атрибут на строчку",
+    "Group Display Name Field" : "Поле, яке відображає Ім'я Групи",
+    "The LDAP attribute to use to generate the groups's display name." : "Атрибут LDAP, який використовується для генерації імен груп.",
+    "Base Group Tree" : "Основне Дерево Груп",
+    "One Group Base DN per line" : "Одна Група Base DN на одній строчці",
+    "Group Search Attributes" : "Пошукові Атрибути Групи",
+    "Group-Member association" : "Асоціація Група-Член",
+    "Nested Groups" : "Вкладені Групи",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "При включенні, групи, які містять групи підтримуються. (Працює тільки якщо атрибут члена групи містить DNS.)",
+    "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.)" : "Підкачка використовується для сторінкових пошуків LDAP, які можуть повертати громіздкі результати кількісті користувачів або груп. (Установка його 0 відключає вивантаженя пошуку LDAP в таких ситуаціях.)",
+    "Special Attributes" : "Спеціальні Атрибути",
+    "Quota Field" : "Поле Квоти",
+    "Quota Default" : "Квота за замовчанням",
+    "in bytes" : "в байтах",
+    "Email Field" : "Поле Ел. пошти",
+    "User Home Folder Naming Rule" : "Правило іменування домашньої теки користувача",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
+    "Internal Username" : "Внутрішня Ім'я користувача",
+    "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." : "За замовчуванням внутрішнє ім'я користувача буде створено з атрибуту UUID. Таким чином ім'я користувача є унікальним і не потребує перетворення символів. Внутрішнє ім'я користувача може складатися лише з наступних символів: [A-Za-z0-9 _ @ -.]. Інші символи заміняються відповідними з таблиці ASCII або пропускаються. При збігу до імені буде додано або збільшено число. Внутрішнє ім'я користувача використовується для внутрішньої ідентифікації користувача. Це також ім'я за замовчуванням для домашньої теки користувача та частина віддалених URL, наприклад, для всіх сервісів *DAV. За допомогою цієї установки можна змінити поведінку за замовчуванням. Для досягнення поведінки, що була до OwnCloud 5, введіть атрибут ім'я користувача, що відображається,  в наступне поле. Залиште порожнім для режиму за замовчуванням. Зміни будуть діяти тільки для нових підключень (доданих) користувачів LDAP.",
+    "Internal Username Attribute:" : "Внутрішня Ім'я користувача, Атрибут:",
+    "Override UUID detection" : "Перекрити вивід 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." : "За замовчуванням ownCloud визначає атрибут UUID автоматично. Цей атрибут використовується для того, щоб достовірно ідентифікувати користувачів і групи LDAP. Також на підставі атрибута UUID створюється внутрішнє ім'я користувача, якщо вище не вказано інакше. Ви можете перевизначити це налаштування та вказати свій атрибут за вибором. Ви повинні упевнитися, що обраний вами атрибут може бути вибраний для користувачів і груп, а також те, що він унікальний. Залиште поле порожнім для поведінки за замовчуванням. Зміни вступлять в силу тільки для нових підключених (доданих) користувачів і груп LDAP.",
+    "UUID Attribute for Users:" : "UUID Атрибут для користувачів:",
+    "UUID Attribute for Groups:" : "UUID Атрибут для груп:",
+    "Username-LDAP User Mapping" : "Картографія Імен користувачів-LDAP ",
+    "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." : "ownCloud використовує імена користувачів для зберігання і призначення метаданих. Для точної ідентифікації і розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатору UUID користувача LDAP. Крім цього кешується розрізнювальне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо розрізнювальне ім'я було змінене, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується скрізь в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язано до конфігурації, він вплине на всі LDAP-підключення! Ні в якому разі не рекомендується скидати прив'язки, якщо система вже знаходиться в експлуатації, тільки на етапі тестування.",
+    "Clear Username-LDAP User Mapping" : "Очистити картографію Імен користувачів-LDAP",
+    "Clear Groupname-LDAP Group Mapping" : "Очистити картографію Імен груп-LDAP"
+},"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_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
deleted file mode 100644
index 7259fc8ba13..00000000000
--- a/apps/user_ldap/l10n/uk.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "Конфігурація вірна, але встановити зв'язок не вдалося. Будь ласка, перевірте налаштування сервера і облікові дані.",
-"The configuration is invalid. Please have a look at the logs for further details." => "Конфігурація є недійсною. Будь ласка, дивіться журнали для отримання додаткової інформації.",
-"No action specified" => "Ніяких дій не вказано",
-"No configuration specified" => "Немає конфігурації",
-"No data specified" => "Немає даних",
-" Could not set configuration %s" => "Не вдалося встановити конфігурацію %s",
-"Deletion failed" => "Видалення не було виконано",
-"Take over settings from recent server configuration?" => "Застосувати налаштування  з останньої конфігурації сервера ?",
-"Keep settings?" => "Зберегти налаштування ?",
-"{nthServer}. Server" => "{nthServer}. Сервер",
-"Cannot add server configuration" => "Неможливо додати конфігурацію сервера",
-"mappings cleared" => "відображення очищається",
-"Success" => "Успіх",
-"Error" => "Помилка",
-"Please specify a Base DN" => "Введіть Base DN",
-"Could not determine Base DN" => "Не вдалося визначити Base DN",
-"Please specify the port" => "Будь ласка, вкажіть порт",
-"Configuration OK" => "Конфігурація OK",
-"Configuration incorrect" => "Невірна конфігурація",
-"Configuration incomplete" => "Конфігурація неповна",
-"Select groups" => "Оберіть групи",
-"Select object classes" => "Виберіть класи об'єктів",
-"Select attributes" => "Виберіть атрибути",
-"Connection test succeeded" => "Перевірка з'єднання пройшла успішно",
-"Connection test failed" => "Перевірка з'єднання завершилась неуспішно",
-"Do you really want to delete the current Server Configuration?" => "Ви дійсно бажаєте видалити поточну конфігурацію сервера ?",
-"Confirm Deletion" => "Підтвердіть Видалення",
-"_%s group found_::_%s groups found_" => array(" %s група знайдена "," %s груп знайдено ","%s груп знайдено "),
-"_%s user found_::_%s users found_" => array("%s користувач знайден","%s користувачів знайдено","%s користувачів знайдено"),
-"Could not find the desired feature" => "Не вдалося знайти потрібну функцію",
-"Invalid Host" => "Невірний Host",
-"Server" => "Сервер",
-"User Filter" => "Користувацький Фільтр",
-"Login Filter" => "Фільтр Входу",
-"Group Filter" => "Фільтр Груп",
-"Save" => "Зберегти",
-"Test Configuration" => "Тестове налаштування",
-"Help" => "Допомога",
-"Groups meeting these criteria are available in %s:" => "Групи, що відповідають цим критеріям доступні в %s:",
-"only those object classes:" => "тільки ці об'єктні класи:",
-"only from those groups:" => "тільки з цих груп:",
-"Edit raw filter instead" => "Редагувати початковий фільтр",
-"Raw LDAP filter" => "Початковий LDAP фільтр",
-"The filter specifies which LDAP groups shall have access to the %s instance." => "Фільтр визначає, які LDAP групи повинні мати доступ до %s примірника.",
-"Test Filter" => "Тест Фільтр",
-"groups found" => "знайдені групи",
-"Users login with this attribute:" => "Вхід користувачів з цим атрибутом:",
-"LDAP Username:" => "LDAP Ім’я користувача:",
-"LDAP Email Address:" => "LDAP E-mail адрес:",
-"Other Attributes:" => "Інші Атрібути:",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action. Example: \"uid=%%uid\"" => "Визначає фільтр, який слід застосовувати при спробі входу.\n%%uid замінює ім'я користувача при вході в систему. Приклад: \"uid=%%uid\"",
-"1. Server" => "1. Сервер",
-"%s. Server:" => "%s. Сервер:",
-"Add Server Configuration" => "Додати налаштування Сервера",
-"Delete Configuration" => "Видалити Конфігурацію",
-"Host" => "Хост",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://",
-"Port" => "Порт",
-"User DN" => "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." => "DN клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми.",
-"Password" => "Пароль",
-"For anonymous access, leave DN and Password empty." => "Для анонімного доступу, залиште DN і Пароль порожніми.",
-"One Base DN per line" => "Один Base DN на одній строчці",
-"You can specify Base DN for users and groups in the Advanced tab" => "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково",
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." => "Уникати автоматичні запити LDAP. Краще для великих установок, але вимагає деякого LDAP знання.",
-"Manually enter LDAP filters (recommended for large directories)" => "Вручну введіть LDAP фільтри (рекомендується для великих каталогів)",
-"Limit %s access to users meeting these criteria:" => "Обмежити %s доступ до користувачів, що відповідають цим критеріям:",
-"The filter specifies which LDAP users shall have access to the %s instance." => "Фільтр визначає, які користувачі LDAP повині мати доступ до примірника %s.",
-"users found" => "користувачів знайдено",
-"Saving" => "Збереження",
-"Back" => "Назад",
-"Continue" => "Продовжити",
-"Expert" => "Експерт",
-"Advanced" => "Додатково",
-"<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>Увага:</ b> Потрібний модуль PHP LDAP не встановлено, базова програма працювати не буде. Будь ласка, зверніться до системного адміністратора, щоб встановити його.",
-"Connection Settings" => "Налаштування З'єднання",
-"Configuration Active" => "Налаштування Активне",
-"When unchecked, this configuration will be skipped." => "Якщо \"галочка\" знята, ця конфігурація буде пропущена.",
-"Backup (Replica) Host" => "Сервер для резервних копій",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "Вкажіть додатковий резервний сервер. Він повинен бути копією головного LDAP/AD сервера.",
-"Backup (Replica) Port" => "Порт сервера для резервних копій",
-"Disable Main Server" => "Вимкнути Головний Сервер",
-"Only connect to the replica server." => "Підключити тільки до сервера реплік.",
-"Case insensitive LDAP server (Windows)" => "Без урахування регістра LDAP сервер (Windows)",
-"Turn off SSL certificate validation." => "Вимкнути перевірку SSL сертифіката.",
-"Not recommended, use it for testing only! If connection only works with this option, import the LDAP server's SSL certificate in your %s server." => "Не рекомендується, використовувати його тільки для тестування!\nЯкщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший %s сервер.",
-"Cache Time-To-Live" => "Час актуальності Кеша",
-"in seconds. A change empties the cache." => "в секундах. Зміна очищує кеш.",
-"Directory Settings" => "Налаштування Каталога",
-"User Display Name Field" => "Поле, яке відображає Ім'я Користувача",
-"The LDAP attribute to use to generate the user's display name." => "Атрибут LDAP, який використовується для генерації імен користувачів.",
-"Base User Tree" => "Основне Дерево Користувачів",
-"One User Base DN per line" => "Один Користувач Base DN на одній строчці",
-"User Search Attributes" => "Пошукові Атрибути Користувача",
-"Optional; one attribute per line" => "Додатково; один атрибут на строчку",
-"Group Display Name Field" => "Поле, яке відображає Ім'я Групи",
-"The LDAP attribute to use to generate the groups's display name." => "Атрибут LDAP, який використовується для генерації імен груп.",
-"Base Group Tree" => "Основне Дерево Груп",
-"One Group Base DN per line" => "Одна Група Base DN на одній строчці",
-"Group Search Attributes" => "Пошукові Атрибути Групи",
-"Group-Member association" => "Асоціація Група-Член",
-"Nested Groups" => "Вкладені Групи",
-"When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" => "При включенні, групи, які містять групи підтримуються. (Працює тільки якщо атрибут члена групи містить DNS.)",
-"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.)" => "Підкачка використовується для сторінкових пошуків LDAP, які можуть повертати громіздкі результати кількісті користувачів або груп. (Установка його 0 відключає вивантаженя пошуку LDAP в таких ситуаціях.)",
-"Special Attributes" => "Спеціальні Атрибути",
-"Quota Field" => "Поле Квоти",
-"Quota Default" => "Квота за замовчанням",
-"in bytes" => "в байтах",
-"Email Field" => "Поле Ел. пошти",
-"User Home Folder Naming Rule" => "Правило іменування домашньої теки користувача",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD.",
-"Internal Username" => "Внутрішня Ім'я користувача",
-"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." => "За замовчуванням внутрішнє ім'я користувача буде створено з атрибуту UUID. Таким чином ім'я користувача є унікальним і не потребує перетворення символів. Внутрішнє ім'я користувача може складатися лише з наступних символів: [A-Za-z0-9 _ @ -.]. Інші символи заміняються відповідними з таблиці ASCII або пропускаються. При збігу до імені буде додано або збільшено число. Внутрішнє ім'я користувача використовується для внутрішньої ідентифікації користувача. Це також ім'я за замовчуванням для домашньої теки користувача та частина віддалених URL, наприклад, для всіх сервісів *DAV. За допомогою цієї установки можна змінити поведінку за замовчуванням. Для досягнення поведінки, що була до OwnCloud 5, введіть атрибут ім'я користувача, що відображається,  в наступне поле. Залиште порожнім для режиму за замовчуванням. Зміни будуть діяти тільки для нових підключень (доданих) користувачів LDAP.",
-"Internal Username Attribute:" => "Внутрішня Ім'я користувача, Атрибут:",
-"Override UUID detection" => "Перекрити вивід 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." => "За замовчуванням ownCloud визначає атрибут UUID автоматично. Цей атрибут використовується для того, щоб достовірно ідентифікувати користувачів і групи LDAP. Також на підставі атрибута UUID створюється внутрішнє ім'я користувача, якщо вище не вказано інакше. Ви можете перевизначити це налаштування та вказати свій атрибут за вибором. Ви повинні упевнитися, що обраний вами атрибут може бути вибраний для користувачів і груп, а також те, що він унікальний. Залиште поле порожнім для поведінки за замовчуванням. Зміни вступлять в силу тільки для нових підключених (доданих) користувачів і груп LDAP.",
-"UUID Attribute for Users:" => "UUID Атрибут для користувачів:",
-"UUID Attribute for Groups:" => "UUID Атрибут для груп:",
-"Username-LDAP User Mapping" => "Картографія Імен користувачів-LDAP ",
-"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." => "ownCloud використовує імена користувачів для зберігання і призначення метаданих. Для точної ідентифікації і розпізнавання користувачів, кожен користувач LDAP буде мати своє внутрішнє ім'я користувача. Це вимагає прив'язки імені користувача ownCloud до користувача LDAP. При створенні ім'я користувача призначається ідентифікатору UUID користувача LDAP. Крім цього кешується розрізнювальне ім'я (DN) для зменшення числа звернень до LDAP, однак воно не використовується для ідентифікації. Якщо розрізнювальне ім'я було змінене, про це стане відомо ownCloud. Внутрішнє ім'я ownCloud використовується скрізь в ownCloud. Після скидання прив'язок в базі можуть зберегтися залишки старої інформації. Скидання прив'язок не прив'язано до конфігурації, він вплине на всі LDAP-підключення! Ні в якому разі не рекомендується скидати прив'язки, якщо система вже знаходиться в експлуатації, тільки на етапі тестування.",
-"Clear Username-LDAP User Mapping" => "Очистити картографію Імен користувачів-LDAP",
-"Clear Groupname-LDAP Group Mapping" => "Очистити картографію Імен груп-LDAP"
-);
-$PLURAL_FORMS = "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_ldap/l10n/ur_PK.js b/apps/user_ldap/l10n/ur_PK.js
new file mode 100644
index 00000000000..f65a89d3129
--- /dev/null
+++ b/apps/user_ldap/l10n/ur_PK.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "ایرر",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "حفظ",
+    "Help" : "مدد",
+    "Password" : "پاسورڈ",
+    "Continue" : "جاری",
+    "Advanced" : "ایڈوانسڈ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ur_PK.json b/apps/user_ldap/l10n/ur_PK.json
new file mode 100644
index 00000000000..0e943e9360f
--- /dev/null
+++ b/apps/user_ldap/l10n/ur_PK.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Error" : "ایرر",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "Save" : "حفظ",
+    "Help" : "مدد",
+    "Password" : "پاسورڈ",
+    "Continue" : "جاری",
+    "Advanced" : "ایڈوانسڈ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ur_PK.php b/apps/user_ldap/l10n/ur_PK.php
deleted file mode 100644
index 12ca746d7d4..00000000000
--- a/apps/user_ldap/l10n/ur_PK.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "ایرر",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("",""),
-"Save" => "حفظ",
-"Help" => "مدد",
-"Password" => "پاسورڈ",
-"Continue" => "جاری",
-"Advanced" => "ایڈوانسڈ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/uz.js b/apps/user_ldap/l10n/uz.js
new file mode 100644
index 00000000000..5494dcae62e
--- /dev/null
+++ b/apps/user_ldap/l10n/uz.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/uz.json b/apps/user_ldap/l10n/uz.json
new file mode 100644
index 00000000000..75f0f056cc4
--- /dev/null
+++ b/apps/user_ldap/l10n/uz.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/uz.php b/apps/user_ldap/l10n/uz.php
deleted file mode 100644
index bba52d53a1a..00000000000
--- a/apps/user_ldap/l10n/uz.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/vi.js b/apps/user_ldap/l10n/vi.js
new file mode 100644
index 00000000000..591ee3b536a
--- /dev/null
+++ b/apps/user_ldap/l10n/vi.js
@@ -0,0 +1,42 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Deletion failed" : "Xóa thất bại",
+    "Success" : "Thành công",
+    "Error" : "Lỗi",
+    "Select groups" : "Chọn nhóm",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "Bộ lọc nhóm",
+    "Save" : "Lưu",
+    "Help" : "Giúp đỡ",
+    "Host" : "Máy chủ",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
+    "Port" : "Cổng",
+    "User DN" : "Người dùng 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." : "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống.",
+    "Password" : "Mật khẩu",
+    "For anonymous access, leave DN and Password empty." : "Cho phép truy cập nặc danh , DN và mật khẩu trống.",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced",
+    "Back" : "Trở lại",
+    "Continue" : "Tiếp tục",
+    "Advanced" : "Nâng cao",
+    "Connection Settings" : "Connection Settings",
+    "Backup (Replica) Port" : "Cổng sao lưu (Replica)",
+    "Disable Main Server" : "Tắt máy chủ chính",
+    "Turn off SSL certificate validation." : "Tắt xác thực chứng nhận SSL",
+    "in seconds. A change empties the cache." : "trong vài giây. Một sự thay đổi bộ nhớ cache.",
+    "Directory Settings" : "Directory Settings",
+    "User Display Name Field" : "Hiển thị tên người sử dụng",
+    "Base User Tree" : "Cây người dùng cơ bản",
+    "User Search Attributes" : "User Search Attributes",
+    "Optional; one attribute per line" : "Optional; one attribute per line",
+    "Group Display Name Field" : "Hiển thị tên nhóm",
+    "Base Group Tree" : "Cây nhóm cơ bản",
+    "Group Search Attributes" : "Group Search Attributes",
+    "Group-Member association" : "Nhóm thành viên Cộng đồng",
+    "Special Attributes" : "Special Attributes",
+    "in bytes" : "Theo Byte",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/vi.json b/apps/user_ldap/l10n/vi.json
new file mode 100644
index 00000000000..1d30979d877
--- /dev/null
+++ b/apps/user_ldap/l10n/vi.json
@@ -0,0 +1,40 @@
+{ "translations": {
+    "Deletion failed" : "Xóa thất bại",
+    "Success" : "Thành công",
+    "Error" : "Lỗi",
+    "Select groups" : "Chọn nhóm",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "Bộ lọc nhóm",
+    "Save" : "Lưu",
+    "Help" : "Giúp đỡ",
+    "Host" : "Máy chủ",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
+    "Port" : "Cổng",
+    "User DN" : "Người dùng 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." : "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống.",
+    "Password" : "Mật khẩu",
+    "For anonymous access, leave DN and Password empty." : "Cho phép truy cập nặc danh , DN và mật khẩu trống.",
+    "You can specify Base DN for users and groups in the Advanced tab" : "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced",
+    "Back" : "Trở lại",
+    "Continue" : "Tiếp tục",
+    "Advanced" : "Nâng cao",
+    "Connection Settings" : "Connection Settings",
+    "Backup (Replica) Port" : "Cổng sao lưu (Replica)",
+    "Disable Main Server" : "Tắt máy chủ chính",
+    "Turn off SSL certificate validation." : "Tắt xác thực chứng nhận SSL",
+    "in seconds. A change empties the cache." : "trong vài giây. Một sự thay đổi bộ nhớ cache.",
+    "Directory Settings" : "Directory Settings",
+    "User Display Name Field" : "Hiển thị tên người sử dụng",
+    "Base User Tree" : "Cây người dùng cơ bản",
+    "User Search Attributes" : "User Search Attributes",
+    "Optional; one attribute per line" : "Optional; one attribute per line",
+    "Group Display Name Field" : "Hiển thị tên nhóm",
+    "Base Group Tree" : "Cây nhóm cơ bản",
+    "Group Search Attributes" : "Group Search Attributes",
+    "Group-Member association" : "Nhóm thành viên Cộng đồng",
+    "Special Attributes" : "Special Attributes",
+    "in bytes" : "Theo Byte",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
deleted file mode 100644
index 8c2fe2a0afc..00000000000
--- a/apps/user_ldap/l10n/vi.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Deletion failed" => "Xóa thất bại",
-"Success" => "Thành công",
-"Error" => "Lỗi",
-"Select groups" => "Chọn nhóm",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Group Filter" => "Bộ lọc nhóm",
-"Save" => "Lưu",
-"Help" => "Giúp đỡ",
-"Host" => "Máy chủ",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://",
-"Port" => "Cổng",
-"User DN" => "Người dùng 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." => "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống.",
-"Password" => "Mật khẩu",
-"For anonymous access, leave DN and Password empty." => "Cho phép truy cập nặc danh , DN và mật khẩu trống.",
-"You can specify Base DN for users and groups in the Advanced tab" => "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced",
-"Back" => "Trở lại",
-"Continue" => "Tiếp tục",
-"Advanced" => "Nâng cao",
-"Connection Settings" => "Connection Settings",
-"Backup (Replica) Port" => "Cổng sao lưu (Replica)",
-"Disable Main Server" => "Tắt máy chủ chính",
-"Turn off SSL certificate validation." => "Tắt xác thực chứng nhận SSL",
-"in seconds. A change empties the cache." => "trong vài giây. Một sự thay đổi bộ nhớ cache.",
-"Directory Settings" => "Directory Settings",
-"User Display Name Field" => "Hiển thị tên người sử dụng",
-"Base User Tree" => "Cây người dùng cơ bản",
-"User Search Attributes" => "User Search Attributes",
-"Optional; one attribute per line" => "Optional; one attribute per line",
-"Group Display Name Field" => "Hiển thị tên nhóm",
-"Base Group Tree" => "Cây nhóm cơ bản",
-"Group Search Attributes" => "Group Search Attributes",
-"Group-Member association" => "Nhóm thành viên Cộng đồng",
-"Special Attributes" => "Special Attributes",
-"in bytes" => "Theo Byte",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_CN.js b/apps/user_ldap/l10n/zh_CN.js
new file mode 100644
index 00000000000..6ca18829fe0
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_CN.js
@@ -0,0 +1,85 @@
+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." : "配置有效但绑定失败。请检查服务器设置和认证信息。",
+    "Deletion failed" : "删除失败",
+    "Take over settings from recent server configuration?" : "从近期的服务器配置中导入设置？",
+    "Keep settings?" : "保留设置吗？",
+    "Cannot add server configuration" : "无法增加服务器配置",
+    "mappings cleared" : "清除映射",
+    "Success" : "成功",
+    "Error" : "错误",
+    "Select groups" : "选择分组",
+    "Connection test succeeded" : "连接测试成功",
+    "Connection test failed" : "连接测试失败",
+    "Do you really want to delete the current Server Configuration?" : "您真的想要删除当前服务器配置吗？",
+    "Confirm Deletion" : "确认删除",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Invalid Host" : "无效的主机",
+    "Group Filter" : "组过滤",
+    "Save" : "保存",
+    "Test Configuration" : "测试配置",
+    "Help" : "帮助",
+    "groups found" : "找到组",
+    "Add Server Configuration" : "增加服务器配置",
+    "Host" : "主机",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
+    "Port" : "端口",
+    "User DN" : "User 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." : "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空",
+    "Password" : "密码",
+    "For anonymous access, leave DN and Password empty." : "启用匿名访问，将DN和密码保留为空",
+    "One Base DN per line" : "每行一个基本判别名",
+    "You can specify Base DN for users and groups in the Advanced tab" : "您可以在高级选项卡里为用户和组指定Base DN",
+    "users found" : "找到用户",
+    "Back" : "返回",
+    "Continue" : "继续",
+    "Advanced" : "高级",
+    "<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>警告：</b> 应用 user_ldap 和 user_webdavauth 之间不兼容。您可能遭遇未预料的行为。请让系统管理员禁用其中一个。",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。",
+    "Connection Settings" : "连接设置",
+    "Configuration Active" : "现行配置",
+    "When unchecked, this configuration will be skipped." : "当反选后，此配置将被忽略。",
+    "Backup (Replica) Host" : "备份 (镜像) 主机",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。",
+    "Backup (Replica) Port" : "备份 (镜像) 端口",
+    "Disable Main Server" : "禁用主服务器",
+    "Only connect to the replica server." : "只能连接到复制服务器",
+    "Turn off SSL certificate validation." : "关闭SSL证书验证",
+    "Cache Time-To-Live" : "缓存存活时间",
+    "in seconds. A change empties the cache." : "以秒计。修改将清空缓存。",
+    "Directory Settings" : "目录设置",
+    "User Display Name Field" : "用户显示名称字段",
+    "The LDAP attribute to use to generate the user's display name." : "用来生成用户的显示名称的 LDAP 属性。",
+    "Base User Tree" : "基础用户树",
+    "One User Base DN per line" : "每行一个用户基准判别名",
+    "User Search Attributes" : "用户搜索属性",
+    "Optional; one attribute per line" : "可选;每行一个属性",
+    "Group Display Name Field" : "组显示名称字段",
+    "The LDAP attribute to use to generate the groups's display name." : "用来生成组的显示名称的 LDAP 属性。",
+    "Base Group Tree" : "基础组树",
+    "One Group Base DN per line" : "每行一个群组基准判别名",
+    "Group Search Attributes" : "群组搜索属性",
+    "Group-Member association" : "组成员关联",
+    "Special Attributes" : "特殊属性",
+    "Quota Field" : "配额字段",
+    "Quota Default" : "默认配额",
+    "in bytes" : "字节数",
+    "Email Field" : "电邮字段",
+    "User Home Folder Naming Rule" : "用户主目录命名规则",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "指定一个 LDAP/AD 属性。留空，则使用用户名称（默认）。",
+    "Internal Username" : "内部用户名",
+    "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." : "默认情况下，内部用户名具有唯一识别属性，以确保用户名唯一，且字符不用经过转换。内部用户名有严格的字符限制，只允许使用 [ a-zA-Z0-9_.@- ]。其他字符会被 ASCII 码取代，或者被忽略。当出现冲突时，用户名后会增加或者减少一个数字。内部用户名用于内部用户识别，同时也作为 ownCloud 中用户根文件夹的默认名。其也作为远程 URLs 的一部分，如在所有的 *DAV 服务中。在这种设置下，默认行为可以被覆盖。要实现在 ownCloud 5 之前的类似的效果，在下框中输入用户的显示名称属性。如果留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户。",
+    "Internal Username Attribute:" : "内部用户名属性：",
+    "Override UUID detection" : "超越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." : "ownCloud 默认会自动检测 UUID 属性。UUID 属性用来无误地识别 LDAP 用户和组。同时，如果上面没有特别设置，内部用户名也基于 UUID 创建。也可以覆盖设置，直接指定一个属性。但一定要确保指定的属性取得的用户和组是唯一的。留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户和组。",
+    "Username-LDAP User Mapping" : "用户名-LDAP用户映射",
+    "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." : "用户名用于存储和分配数据 (元)。为了准确地识别和确认用户，每个用户都有一个内部用户名。这需要一个 ownCloud 用户名到 LDAP 用户的映射。创建的用户名被映射到 LDAP 用户的 UUID。此外，DN 也会被缓存，以减少 LDAP 连接，但它不用于识别。DN 的变化会被监视到。内部用户名会被用于所有地方。清除映射将导致一片混乱。清除映射不是常用的设置，它会影响到所有的 LDAP 配置！千万不要在正式环境中清除映射，只有在测试或试验时才这样做。",
+    "Clear Username-LDAP User Mapping" : "清除用户-LDAP用户映射",
+    "Clear Groupname-LDAP Group Mapping" : "清除组用户-LDAP级映射"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/zh_CN.json b/apps/user_ldap/l10n/zh_CN.json
new file mode 100644
index 00000000000..04f94691b99
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_CN.json
@@ -0,0 +1,83 @@
+{ "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." : "配置有效但绑定失败。请检查服务器设置和认证信息。",
+    "Deletion failed" : "删除失败",
+    "Take over settings from recent server configuration?" : "从近期的服务器配置中导入设置？",
+    "Keep settings?" : "保留设置吗？",
+    "Cannot add server configuration" : "无法增加服务器配置",
+    "mappings cleared" : "清除映射",
+    "Success" : "成功",
+    "Error" : "错误",
+    "Select groups" : "选择分组",
+    "Connection test succeeded" : "连接测试成功",
+    "Connection test failed" : "连接测试失败",
+    "Do you really want to delete the current Server Configuration?" : "您真的想要删除当前服务器配置吗？",
+    "Confirm Deletion" : "确认删除",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Invalid Host" : "无效的主机",
+    "Group Filter" : "组过滤",
+    "Save" : "保存",
+    "Test Configuration" : "测试配置",
+    "Help" : "帮助",
+    "groups found" : "找到组",
+    "Add Server Configuration" : "增加服务器配置",
+    "Host" : "主机",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
+    "Port" : "端口",
+    "User DN" : "User 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." : "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空",
+    "Password" : "密码",
+    "For anonymous access, leave DN and Password empty." : "启用匿名访问，将DN和密码保留为空",
+    "One Base DN per line" : "每行一个基本判别名",
+    "You can specify Base DN for users and groups in the Advanced tab" : "您可以在高级选项卡里为用户和组指定Base DN",
+    "users found" : "找到用户",
+    "Back" : "返回",
+    "Continue" : "继续",
+    "Advanced" : "高级",
+    "<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>警告：</b> 应用 user_ldap 和 user_webdavauth 之间不兼容。您可能遭遇未预料的行为。请让系统管理员禁用其中一个。",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。",
+    "Connection Settings" : "连接设置",
+    "Configuration Active" : "现行配置",
+    "When unchecked, this configuration will be skipped." : "当反选后，此配置将被忽略。",
+    "Backup (Replica) Host" : "备份 (镜像) 主机",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。",
+    "Backup (Replica) Port" : "备份 (镜像) 端口",
+    "Disable Main Server" : "禁用主服务器",
+    "Only connect to the replica server." : "只能连接到复制服务器",
+    "Turn off SSL certificate validation." : "关闭SSL证书验证",
+    "Cache Time-To-Live" : "缓存存活时间",
+    "in seconds. A change empties the cache." : "以秒计。修改将清空缓存。",
+    "Directory Settings" : "目录设置",
+    "User Display Name Field" : "用户显示名称字段",
+    "The LDAP attribute to use to generate the user's display name." : "用来生成用户的显示名称的 LDAP 属性。",
+    "Base User Tree" : "基础用户树",
+    "One User Base DN per line" : "每行一个用户基准判别名",
+    "User Search Attributes" : "用户搜索属性",
+    "Optional; one attribute per line" : "可选;每行一个属性",
+    "Group Display Name Field" : "组显示名称字段",
+    "The LDAP attribute to use to generate the groups's display name." : "用来生成组的显示名称的 LDAP 属性。",
+    "Base Group Tree" : "基础组树",
+    "One Group Base DN per line" : "每行一个群组基准判别名",
+    "Group Search Attributes" : "群组搜索属性",
+    "Group-Member association" : "组成员关联",
+    "Special Attributes" : "特殊属性",
+    "Quota Field" : "配额字段",
+    "Quota Default" : "默认配额",
+    "in bytes" : "字节数",
+    "Email Field" : "电邮字段",
+    "User Home Folder Naming Rule" : "用户主目录命名规则",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "指定一个 LDAP/AD 属性。留空，则使用用户名称（默认）。",
+    "Internal Username" : "内部用户名",
+    "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." : "默认情况下，内部用户名具有唯一识别属性，以确保用户名唯一，且字符不用经过转换。内部用户名有严格的字符限制，只允许使用 [ a-zA-Z0-9_.@- ]。其他字符会被 ASCII 码取代，或者被忽略。当出现冲突时，用户名后会增加或者减少一个数字。内部用户名用于内部用户识别，同时也作为 ownCloud 中用户根文件夹的默认名。其也作为远程 URLs 的一部分，如在所有的 *DAV 服务中。在这种设置下，默认行为可以被覆盖。要实现在 ownCloud 5 之前的类似的效果，在下框中输入用户的显示名称属性。如果留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户。",
+    "Internal Username Attribute:" : "内部用户名属性：",
+    "Override UUID detection" : "超越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." : "ownCloud 默认会自动检测 UUID 属性。UUID 属性用来无误地识别 LDAP 用户和组。同时，如果上面没有特别设置，内部用户名也基于 UUID 创建。也可以覆盖设置，直接指定一个属性。但一定要确保指定的属性取得的用户和组是唯一的。留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户和组。",
+    "Username-LDAP User Mapping" : "用户名-LDAP用户映射",
+    "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." : "用户名用于存储和分配数据 (元)。为了准确地识别和确认用户，每个用户都有一个内部用户名。这需要一个 ownCloud 用户名到 LDAP 用户的映射。创建的用户名被映射到 LDAP 用户的 UUID。此外，DN 也会被缓存，以减少 LDAP 连接，但它不用于识别。DN 的变化会被监视到。内部用户名会被用于所有地方。清除映射将导致一片混乱。清除映射不是常用的设置，它会影响到所有的 LDAP 配置！千万不要在正式环境中清除映射，只有在测试或试验时才这样做。",
+    "Clear Username-LDAP User Mapping" : "清除用户-LDAP用户映射",
+    "Clear Groupname-LDAP Group Mapping" : "清除组用户-LDAP级映射"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
deleted file mode 100644
index 93d5636aad6..00000000000
--- a/apps/user_ldap/l10n/zh_CN.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "配置有效但绑定失败。请检查服务器设置和认证信息。",
-"Deletion failed" => "删除失败",
-"Take over settings from recent server configuration?" => "从近期的服务器配置中导入设置？",
-"Keep settings?" => "保留设置吗？",
-"Cannot add server configuration" => "无法增加服务器配置",
-"mappings cleared" => "清除映射",
-"Success" => "成功",
-"Error" => "错误",
-"Select groups" => "选择分组",
-"Connection test succeeded" => "连接测试成功",
-"Connection test failed" => "连接测试失败",
-"Do you really want to delete the current Server Configuration?" => "您真的想要删除当前服务器配置吗？",
-"Confirm Deletion" => "确认删除",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Invalid Host" => "无效的主机",
-"Group Filter" => "组过滤",
-"Save" => "保存",
-"Test Configuration" => "测试配置",
-"Help" => "帮助",
-"groups found" => "找到组",
-"Add Server Configuration" => "增加服务器配置",
-"Host" => "主机",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
-"Port" => "端口",
-"User DN" => "User 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." => "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空",
-"Password" => "密码",
-"For anonymous access, leave DN and Password empty." => "启用匿名访问，将DN和密码保留为空",
-"One Base DN per line" => "每行一个基本判别名",
-"You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡里为用户和组指定Base DN",
-"users found" => "找到用户",
-"Back" => "返回",
-"Continue" => "继续",
-"Advanced" => "高级",
-"<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>警告：</b> 应用 user_ldap 和 user_webdavauth 之间不兼容。您可能遭遇未预料的行为。请让系统管理员禁用其中一个。",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告：</b> PHP LDAP 模块未安装，后端将无法工作。请请求您的系统管理员安装该模块。",
-"Connection Settings" => "连接设置",
-"Configuration Active" => "现行配置",
-"When unchecked, this configuration will be skipped." => "当反选后，此配置将被忽略。",
-"Backup (Replica) Host" => "备份 (镜像) 主机",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "给出一个可选的备份主机。它必须为主 LDAP/AD 服务器的一个镜像。",
-"Backup (Replica) Port" => "备份 (镜像) 端口",
-"Disable Main Server" => "禁用主服务器",
-"Only connect to the replica server." => "只能连接到复制服务器",
-"Turn off SSL certificate validation." => "关闭SSL证书验证",
-"Cache Time-To-Live" => "缓存存活时间",
-"in seconds. A change empties the cache." => "以秒计。修改将清空缓存。",
-"Directory Settings" => "目录设置",
-"User Display Name Field" => "用户显示名称字段",
-"The LDAP attribute to use to generate the user's display name." => "用来生成用户的显示名称的 LDAP 属性。",
-"Base User Tree" => "基础用户树",
-"One User Base DN per line" => "每行一个用户基准判别名",
-"User Search Attributes" => "用户搜索属性",
-"Optional; one attribute per line" => "可选;每行一个属性",
-"Group Display Name Field" => "组显示名称字段",
-"The LDAP attribute to use to generate the groups's display name." => "用来生成组的显示名称的 LDAP 属性。",
-"Base Group Tree" => "基础组树",
-"One Group Base DN per line" => "每行一个群组基准判别名",
-"Group Search Attributes" => "群组搜索属性",
-"Group-Member association" => "组成员关联",
-"Special Attributes" => "特殊属性",
-"Quota Field" => "配额字段",
-"Quota Default" => "默认配额",
-"in bytes" => "字节数",
-"Email Field" => "电邮字段",
-"User Home Folder Naming Rule" => "用户主目录命名规则",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "指定一个 LDAP/AD 属性。留空，则使用用户名称（默认）。",
-"Internal Username" => "内部用户名",
-"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." => "默认情况下，内部用户名具有唯一识别属性，以确保用户名唯一，且字符不用经过转换。内部用户名有严格的字符限制，只允许使用 [ a-zA-Z0-9_.@- ]。其他字符会被 ASCII 码取代，或者被忽略。当出现冲突时，用户名后会增加或者减少一个数字。内部用户名用于内部用户识别，同时也作为 ownCloud 中用户根文件夹的默认名。其也作为远程 URLs 的一部分，如在所有的 *DAV 服务中。在这种设置下，默认行为可以被覆盖。要实现在 ownCloud 5 之前的类似的效果，在下框中输入用户的显示名称属性。如果留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户。",
-"Internal Username Attribute:" => "内部用户名属性：",
-"Override UUID detection" => "超越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." => "ownCloud 默认会自动检测 UUID 属性。UUID 属性用来无误地识别 LDAP 用户和组。同时，如果上面没有特别设置，内部用户名也基于 UUID 创建。也可以覆盖设置，直接指定一个属性。但一定要确保指定的属性取得的用户和组是唯一的。留空，则执行默认操作。更改只影响新映射 (或增加) 的 LDAP 用户和组。",
-"Username-LDAP User Mapping" => "用户名-LDAP用户映射",
-"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." => "用户名用于存储和分配数据 (元)。为了准确地识别和确认用户，每个用户都有一个内部用户名。这需要一个 ownCloud 用户名到 LDAP 用户的映射。创建的用户名被映射到 LDAP 用户的 UUID。此外，DN 也会被缓存，以减少 LDAP 连接，但它不用于识别。DN 的变化会被监视到。内部用户名会被用于所有地方。清除映射将导致一片混乱。清除映射不是常用的设置，它会影响到所有的 LDAP 配置！千万不要在正式环境中清除映射，只有在测试或试验时才这样做。",
-"Clear Username-LDAP User Mapping" => "清除用户-LDAP用户映射",
-"Clear Groupname-LDAP Group Mapping" => "清除组用户-LDAP级映射"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_HK.js b/apps/user_ldap/l10n/zh_HK.js
new file mode 100644
index 00000000000..27ecbc63e53
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_HK.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Success" : "成功",
+    "Error" : "錯誤",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Save" : "儲存",
+    "Help" : "幫助",
+    "Port" : "連接埠",
+    "Password" : "密碼",
+    "Advanced" : "進階"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/zh_HK.json b/apps/user_ldap/l10n/zh_HK.json
new file mode 100644
index 00000000000..d75229ec90e
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_HK.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Success" : "成功",
+    "Error" : "錯誤",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Save" : "儲存",
+    "Help" : "幫助",
+    "Port" : "連接埠",
+    "Password" : "密碼",
+    "Advanced" : "進階"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/zh_HK.php b/apps/user_ldap/l10n/zh_HK.php
deleted file mode 100644
index 95ee4c5c080..00000000000
--- a/apps/user_ldap/l10n/zh_HK.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Success" => "成功",
-"Error" => "錯誤",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Save" => "儲存",
-"Help" => "幫助",
-"Port" => "連接埠",
-"Password" => "密碼",
-"Advanced" => "進階"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_ldap/l10n/zh_TW.js b/apps/user_ldap/l10n/zh_TW.js
new file mode 100644
index 00000000000..ea05e4418cf
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_TW.js
@@ -0,0 +1,70 @@
+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." : "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
+    "Deletion failed" : "移除失敗",
+    "Take over settings from recent server configuration?" : "要使用最近一次的伺服器設定嗎？",
+    "Keep settings?" : "維持設定嗎？",
+    "Cannot add server configuration" : "無法新增伺服器設定",
+    "mappings cleared" : "映射已清除",
+    "Success" : "成功",
+    "Error" : "錯誤",
+    "Select groups" : "選擇群組",
+    "Connection test succeeded" : "連線測試成功",
+    "Connection test failed" : "連線測試失敗",
+    "Do you really want to delete the current Server Configuration?" : "您真的要刪除現在的伺服器設定嗎？",
+    "Confirm Deletion" : "確認刪除",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "Group Filter",
+    "Save" : "儲存",
+    "Test Configuration" : "測試此設定",
+    "Help" : "說明",
+    "Add Server Configuration" : "新增伺服器設定",
+    "Host" : "主機",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
+    "Port" : "連接埠",
+    "User DN" : "User 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." : "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。",
+    "Password" : "密碼",
+    "For anonymous access, leave DN and Password empty." : "匿名連接時請將 DN 與密碼欄位留白",
+    "One Base DN per line" : "一行一個 Base DN",
+    "You can specify Base DN for users and groups in the Advanced tab" : "您可以在進階標籤頁裡面指定使用者及群組的 Base DN",
+    "Back" : "返回",
+    "Continue" : "繼續",
+    "Advanced" : "進階",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>警告：</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。",
+    "Connection Settings" : "連線設定",
+    "Configuration Active" : "設定使用中",
+    "When unchecked, this configuration will be skipped." : "沒有被勾選時，此設定會被略過。",
+    "Backup (Replica) Host" : "備用主機",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。",
+    "Backup (Replica) Port" : "備用（複本）連接埠",
+    "Disable Main Server" : "停用主伺服器",
+    "Turn off SSL certificate validation." : "關閉 SSL 憑證檢查",
+    "Cache Time-To-Live" : "快取的存活時間",
+    "in seconds. A change empties the cache." : "以秒為單位。變更後會清空快取。",
+    "Directory Settings" : "目錄設定",
+    "User Display Name Field" : "使用者顯示名稱欄位",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "一行一個使用者 Base DN",
+    "User Search Attributes" : "User Search Attributes",
+    "Optional; one attribute per line" : "非必要，一行一項屬性",
+    "Group Display Name Field" : "群組顯示名稱欄位",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "一行一個 Group Base DN",
+    "Group Search Attributes" : "Group Search Attributes",
+    "Group-Member association" : "Group-Member association",
+    "Special Attributes" : "特殊屬性",
+    "Quota Field" : "配額欄位",
+    "Quota Default" : "預設配額",
+    "in bytes" : "以位元組為單位",
+    "Email Field" : "電郵欄位",
+    "User Home Folder Naming Rule" : "使用者家目錄的命名規則",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。",
+    "Internal Username" : "內部使用者名稱"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/zh_TW.json b/apps/user_ldap/l10n/zh_TW.json
new file mode 100644
index 00000000000..5f8faaa0083
--- /dev/null
+++ b/apps/user_ldap/l10n/zh_TW.json
@@ -0,0 +1,68 @@
+{ "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." : "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
+    "Deletion failed" : "移除失敗",
+    "Take over settings from recent server configuration?" : "要使用最近一次的伺服器設定嗎？",
+    "Keep settings?" : "維持設定嗎？",
+    "Cannot add server configuration" : "無法新增伺服器設定",
+    "mappings cleared" : "映射已清除",
+    "Success" : "成功",
+    "Error" : "錯誤",
+    "Select groups" : "選擇群組",
+    "Connection test succeeded" : "連線測試成功",
+    "Connection test failed" : "連線測試失敗",
+    "Do you really want to delete the current Server Configuration?" : "您真的要刪除現在的伺服器設定嗎？",
+    "Confirm Deletion" : "確認刪除",
+    "_%s group found_::_%s groups found_" : [""],
+    "_%s user found_::_%s users found_" : [""],
+    "Group Filter" : "Group Filter",
+    "Save" : "儲存",
+    "Test Configuration" : "測試此設定",
+    "Help" : "說明",
+    "Add Server Configuration" : "新增伺服器設定",
+    "Host" : "主機",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
+    "Port" : "連接埠",
+    "User DN" : "User 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." : "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。",
+    "Password" : "密碼",
+    "For anonymous access, leave DN and Password empty." : "匿名連接時請將 DN 與密碼欄位留白",
+    "One Base DN per line" : "一行一個 Base DN",
+    "You can specify Base DN for users and groups in the Advanced tab" : "您可以在進階標籤頁裡面指定使用者及群組的 Base DN",
+    "Back" : "返回",
+    "Continue" : "繼續",
+    "Advanced" : "進階",
+    "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>警告：</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。",
+    "Connection Settings" : "連線設定",
+    "Configuration Active" : "設定使用中",
+    "When unchecked, this configuration will be skipped." : "沒有被勾選時，此設定會被略過。",
+    "Backup (Replica) Host" : "備用主機",
+    "Give an optional backup host. It must be a replica of the main LDAP/AD server." : "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。",
+    "Backup (Replica) Port" : "備用（複本）連接埠",
+    "Disable Main Server" : "停用主伺服器",
+    "Turn off SSL certificate validation." : "關閉 SSL 憑證檢查",
+    "Cache Time-To-Live" : "快取的存活時間",
+    "in seconds. A change empties the cache." : "以秒為單位。變更後會清空快取。",
+    "Directory Settings" : "目錄設定",
+    "User Display Name Field" : "使用者顯示名稱欄位",
+    "Base User Tree" : "Base User Tree",
+    "One User Base DN per line" : "一行一個使用者 Base DN",
+    "User Search Attributes" : "User Search Attributes",
+    "Optional; one attribute per line" : "非必要，一行一項屬性",
+    "Group Display Name Field" : "群組顯示名稱欄位",
+    "Base Group Tree" : "Base Group Tree",
+    "One Group Base DN per line" : "一行一個 Group Base DN",
+    "Group Search Attributes" : "Group Search Attributes",
+    "Group-Member association" : "Group-Member association",
+    "Special Attributes" : "特殊屬性",
+    "Quota Field" : "配額欄位",
+    "Quota Default" : "預設配額",
+    "in bytes" : "以位元組為單位",
+    "Email Field" : "電郵欄位",
+    "User Home Folder Naming Rule" : "使用者家目錄的命名規則",
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。",
+    "Internal Username" : "內部使用者名稱"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/zh_TW.php b/apps/user_ldap/l10n/zh_TW.php
deleted file mode 100644
index 345546da72d..00000000000
--- a/apps/user_ldap/l10n/zh_TW.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "設定有效但連線無法建立，請檢查伺服器設定與認證資料。",
-"Deletion failed" => "移除失敗",
-"Take over settings from recent server configuration?" => "要使用最近一次的伺服器設定嗎？",
-"Keep settings?" => "維持設定嗎？",
-"Cannot add server configuration" => "無法新增伺服器設定",
-"mappings cleared" => "映射已清除",
-"Success" => "成功",
-"Error" => "錯誤",
-"Select groups" => "選擇群組",
-"Connection test succeeded" => "連線測試成功",
-"Connection test failed" => "連線測試失敗",
-"Do you really want to delete the current Server Configuration?" => "您真的要刪除現在的伺服器設定嗎？",
-"Confirm Deletion" => "確認刪除",
-"_%s group found_::_%s groups found_" => array(""),
-"_%s user found_::_%s users found_" => array(""),
-"Group Filter" => "Group Filter",
-"Save" => "儲存",
-"Test Configuration" => "測試此設定",
-"Help" => "說明",
-"Add Server Configuration" => "新增伺服器設定",
-"Host" => "主機",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "若您不需要 SSL 加密連線則不需輸入通訊協定，反之請輸入 ldaps://",
-"Port" => "連接埠",
-"User DN" => "User 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." => "客戶端使用者的DN與特定字詞的連結需要完善，例如:uid=agent,dc=example,dc=com。若是匿名連接，則將DN與密碼欄位留白。",
-"Password" => "密碼",
-"For anonymous access, leave DN and Password empty." => "匿名連接時請將 DN 與密碼欄位留白",
-"One Base DN per line" => "一行一個 Base DN",
-"You can specify Base DN for users and groups in the Advanced tab" => "您可以在進階標籤頁裡面指定使用者及群組的 Base DN",
-"Back" => "返回",
-"Continue" => "繼續",
-"Advanced" => "進階",
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." => "<b>警告：</b>沒有安裝 PHP LDAP 模組，後端系統將無法運作，請要求您的系統管理員安裝模組。",
-"Connection Settings" => "連線設定",
-"Configuration Active" => "設定使用中",
-"When unchecked, this configuration will be skipped." => "沒有被勾選時，此設定會被略過。",
-"Backup (Replica) Host" => "備用主機",
-"Give an optional backup host. It must be a replica of the main LDAP/AD server." => "可以選擇性設定備用主機，必須是 LDAP/AD 中央伺服器的複本。",
-"Backup (Replica) Port" => "備用（複本）連接埠",
-"Disable Main Server" => "停用主伺服器",
-"Turn off SSL certificate validation." => "關閉 SSL 憑證檢查",
-"Cache Time-To-Live" => "快取的存活時間",
-"in seconds. A change empties the cache." => "以秒為單位。變更後會清空快取。",
-"Directory Settings" => "目錄設定",
-"User Display Name Field" => "使用者顯示名稱欄位",
-"Base User Tree" => "Base User Tree",
-"One User Base DN per line" => "一行一個使用者 Base DN",
-"User Search Attributes" => "User Search Attributes",
-"Optional; one attribute per line" => "非必要，一行一項屬性",
-"Group Display Name Field" => "群組顯示名稱欄位",
-"Base Group Tree" => "Base Group Tree",
-"One Group Base DN per line" => "一行一個 Group Base DN",
-"Group Search Attributes" => "Group Search Attributes",
-"Group-Member association" => "Group-Member association",
-"Special Attributes" => "特殊屬性",
-"Quota Field" => "配額欄位",
-"Quota Default" => "預設配額",
-"in bytes" => "以位元組為單位",
-"Email Field" => "電郵欄位",
-"User Home Folder Naming Rule" => "使用者家目錄的命名規則",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "使用者名稱請留白(預設)。若不留白請指定一個LDAP/AD屬性。",
-"Internal Username" => "內部使用者名稱"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ar.js b/apps/user_webdavauth/l10n/ar.js
new file mode 100644
index 00000000000..4b78f99ec6f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ar.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..d424faf0abc
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ar.json
@@ -0,0 +1,7 @@
+{ "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/ar.php b/apps/user_webdavauth/l10n/ar.php
deleted file mode 100644
index b9717a4c034..00000000000
--- a/apps/user_webdavauth/l10n/ar.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 كمعلومات غير صحيحة, أما غيرها فسيعتبر صحيح."
-);
-$PLURAL_FORMS = "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/ast.js b/apps/user_webdavauth/l10n/ast.js
new file mode 100644
index 00000000000..87a890666cb
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ast.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..52172d5afb9
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ast.json
@@ -0,0 +1,7 @@
+{ "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/ast.php b/apps/user_webdavauth/l10n/ast.php
deleted file mode 100644
index fbc8eb7ad23..00000000000
--- a/apps/user_webdavauth/l10n/ast.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/az.js b/apps/user_webdavauth/l10n/az.js
new file mode 100644
index 00000000000..e39b9a160e0
--- /dev/null
+++ b/apps/user_webdavauth/l10n/az.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..cd63759e75c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/az.json
@@ -0,0 +1,7 @@
+{ "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/az.php b/apps/user_webdavauth/l10n/az.php
deleted file mode 100644
index 4d6530245e2..00000000000
--- a/apps/user_webdavauth/l10n/az.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/bg_BG.js b/apps/user_webdavauth/l10n/bg_BG.js
new file mode 100644
index 00000000000..7a1272be90c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bg_BG.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..4ab9458e8e4
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bg_BG.json
@@ -0,0 +1,7 @@
+{ "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/bg_BG.php b/apps/user_webdavauth/l10n/bg_BG.php
deleted file mode 100644
index 8b47194fc28..00000000000
--- a/apps/user_webdavauth/l10n/bg_BG.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 като невалидни, а всички останали като потвърдена идентификация."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/bn_BD.js b/apps/user_webdavauth/l10n/bn_BD.js
new file mode 100644
index 00000000000..9773db8bef6
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bn_BD.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..cda6cf08e31
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bn_BD.json
@@ -0,0 +1,7 @@
+{ "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_BD.php b/apps/user_webdavauth/l10n/bn_BD.php
deleted file mode 100644
index e182e26e9f5..00000000000
--- a/apps/user_webdavauth/l10n/bn_BD.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 কে অবৈধ তথ্যাদিরূপে অনুবাদ করে অন্য সকল প্রত্যুত্তরকে বৈধতা দেবে। "
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/bn_IN.js b/apps/user_webdavauth/l10n/bn_IN.js
new file mode 100644
index 00000000000..6790de24520
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bn_IN.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..3542f14a7b1
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bn_IN.json
@@ -0,0 +1,7 @@
+{ "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/bn_IN.php b/apps/user_webdavauth/l10n/bn_IN.php
deleted file mode 100644
index 965b0aaa6e3..00000000000
--- a/apps/user_webdavauth/l10n/bn_IN.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 কে অবৈধ প্রমাণপত্রাদি হিসাবে ব্যাখা করে,এবং সমস্ত অন্যান্য প্রত্যুত্তর বৈধ প্রমাণপত্রাদি হিসেবে ব্যাখ্যা করে।"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/bs.js b/apps/user_webdavauth/l10n/bs.js
new file mode 100644
index 00000000000..becf43aa7f4
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bs.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "Save" : "Spasi"
+},
+"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
new file mode 100644
index 00000000000..18aa0254d19
--- /dev/null
+++ b/apps/user_webdavauth/l10n/bs.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Spasi"
+},"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/bs.php b/apps/user_webdavauth/l10n/bs.php
deleted file mode 100644
index 2624f90daa8..00000000000
--- a/apps/user_webdavauth/l10n/bs.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Spasi"
-);
-$PLURAL_FORMS = "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/ca.js b/apps/user_webdavauth/l10n/ca.js
new file mode 100644
index 00000000000..baaa239098f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ca.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..715c286af48
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ca.json
@@ -0,0 +1,7 @@
+{ "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/ca.php b/apps/user_webdavauth/l10n/ca.php
deleted file mode 100644
index 968b3f2b6b8..00000000000
--- a/apps/user_webdavauth/l10n/ca.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/cs_CZ.js b/apps/user_webdavauth/l10n/cs_CZ.js
new file mode 100644
index 00000000000..0fbf38d53ef
--- /dev/null
+++ b/apps/user_webdavauth/l10n/cs_CZ.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..0ee73e9a9dd
--- /dev/null
+++ b/apps/user_webdavauth/l10n/cs_CZ.json
@@ -0,0 +1,7 @@
+{ "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/cs_CZ.php b/apps/user_webdavauth/l10n/cs_CZ.php
deleted file mode 100644
index 760349def72..00000000000
--- a/apps/user_webdavauth/l10n/cs_CZ.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/cy_GB.js b/apps/user_webdavauth/l10n/cy_GB.js
new file mode 100644
index 00000000000..739908abf4b
--- /dev/null
+++ b/apps/user_webdavauth/l10n/cy_GB.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..e0ec790857f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/cy_GB.json
@@ -0,0 +1,4 @@
+{ "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/cy_GB.php b/apps/user_webdavauth/l10n/cy_GB.php
deleted file mode 100644
index 765f844a90c..00000000000
--- a/apps/user_webdavauth/l10n/cy_GB.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Cadw"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/apps/user_webdavauth/l10n/da.js b/apps/user_webdavauth/l10n/da.js
new file mode 100644
index 00000000000..9fc6a4e161f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/da.js
@@ -0,0 +1,9 @@
+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. Plugin'et registrerer responsen 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
new file mode 100644
index 00000000000..9e967eb3158
--- /dev/null
+++ b/apps/user_webdavauth/l10n/da.json
@@ -0,0 +1,7 @@
+{ "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. Plugin'et registrerer responsen 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/da.php b/apps/user_webdavauth/l10n/da.php
deleted file mode 100644
index da23d6ddd66..00000000000
--- a/apps/user_webdavauth/l10n/da.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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. Plugin'et registrerer responsen og fortolker HTTP-statuskode 401 og 403 som ugyldige oplysninger, men alle andre besvarelser som gyldige oplysninger."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de.js b/apps/user_webdavauth/l10n/de.js
new file mode 100644
index 00000000000..aead50e2b72
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "WebDAV Authentication" : "WebDAV Authentifikation",
+    "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
new file mode 100644
index 00000000000..6a9a9520dce
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "WebDAV Authentication" : "WebDAV Authentifikation",
+    "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.php b/apps/user_webdavauth/l10n/de.php
deleted file mode 100644
index 86b2da8d9ef..00000000000
--- a/apps/user_webdavauth/l10n/de.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Authentifikation",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de_AT.js b/apps/user_webdavauth/l10n/de_AT.js
new file mode 100644
index 00000000000..61b244f4ae4
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_AT.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..a61814a0978
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_AT.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Speichern"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/de_AT.php b/apps/user_webdavauth/l10n/de_AT.php
deleted file mode 100644
index 60e8abdbf26..00000000000
--- a/apps/user_webdavauth/l10n/de_AT.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Speichern"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de_CH.js b/apps/user_webdavauth/l10n/de_CH.js
new file mode 100644
index 00000000000..84bcb9d4efb
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_CH.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..1c47d57a349
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_CH.json
@@ -0,0 +1,6 @@
+{ "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/de_CH.php b/apps/user_webdavauth/l10n/de_CH.php
deleted file mode 100644
index 1683c56e4da..00000000000
--- a/apps/user_webdavauth/l10n/de_CH.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/de_DE.js b/apps/user_webdavauth/l10n/de_DE.js
new file mode 100644
index 00000000000..6e667dca0b7
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_DE.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..f347f7724e5
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_DE.json
@@ -0,0 +1,7 @@
+{ "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_DE.php b/apps/user_webdavauth/l10n/de_DE.php
deleted file mode 100644
index 5888529624d..00000000000
--- a/apps/user_webdavauth/l10n/de_DE.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/el.js b/apps/user_webdavauth/l10n/el.js
new file mode 100644
index 00000000000..81a2cea52fd
--- /dev/null
+++ b/apps/user_webdavauth/l10n/el.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..2335801c723
--- /dev/null
+++ b/apps/user_webdavauth/l10n/el.json
@@ -0,0 +1,7 @@
+{ "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/el.php b/apps/user_webdavauth/l10n/el.php
deleted file mode 100644
index ad610ae7d61..00000000000
--- a/apps/user_webdavauth/l10n/el.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 ως μη έγκυρα διαπιστευτήρια και όλες τις άλλες αποκρίσεις ως έγκυρα διαπιστευτήρια."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/en_GB.js b/apps/user_webdavauth/l10n/en_GB.js
new file mode 100644
index 00000000000..5eaa8449d4d
--- /dev/null
+++ b/apps/user_webdavauth/l10n/en_GB.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..12957ea2b02
--- /dev/null
+++ b/apps/user_webdavauth/l10n/en_GB.json
@@ -0,0 +1,7 @@
+{ "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/en_GB.php b/apps/user_webdavauth/l10n/en_GB.php
deleted file mode 100644
index a751b1fa25c..00000000000
--- a/apps/user_webdavauth/l10n/en_GB.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eo.js b/apps/user_webdavauth/l10n/eo.js
new file mode 100644
index 00000000000..657042a08f6
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eo.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..17bb6935824
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eo.json
@@ -0,0 +1,5 @@
+{ "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/eo.php b/apps/user_webdavauth/l10n/eo.php
deleted file mode 100644
index b5d824fdc99..00000000000
--- a/apps/user_webdavauth/l10n/eo.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV-aŭtentigo",
-"Save" => "Konservi"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es.js b/apps/user_webdavauth/l10n/es.js
new file mode 100644
index 00000000000..107e7332e4e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/es.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..57d2c4f7027
--- /dev/null
+++ b/apps/user_webdavauth/l10n/es.json
@@ -0,0 +1,7 @@
+{ "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.php b/apps/user_webdavauth/l10n/es.php
deleted file mode 100644
index 3e11ba378e6..00000000000
--- a/apps/user_webdavauth/l10n/es.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es_AR.js b/apps/user_webdavauth/l10n/es_AR.js
new file mode 100644
index 00000000000..ab1e59432ba
--- /dev/null
+++ b/apps/user_webdavauth/l10n/es_AR.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..36947d9c1a6
--- /dev/null
+++ b/apps/user_webdavauth/l10n/es_AR.json
@@ -0,0 +1,6 @@
+{ "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_AR.php b/apps/user_webdavauth/l10n/es_AR.php
deleted file mode 100644
index 38164f9fba4..00000000000
--- a/apps/user_webdavauth/l10n/es_AR.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/es_MX.js b/apps/user_webdavauth/l10n/es_MX.js
new file mode 100644
index 00000000000..57412d0c230
--- /dev/null
+++ b/apps/user_webdavauth/l10n/es_MX.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..26b45a98600
--- /dev/null
+++ b/apps/user_webdavauth/l10n/es_MX.json
@@ -0,0 +1,6 @@
+{ "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/es_MX.php b/apps/user_webdavauth/l10n/es_MX.php
deleted file mode 100644
index 360724f8986..00000000000
--- a/apps/user_webdavauth/l10n/es_MX.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/et_EE.js b/apps/user_webdavauth/l10n/et_EE.js
new file mode 100644
index 00000000000..3644bb8cd8d
--- /dev/null
+++ b/apps/user_webdavauth/l10n/et_EE.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..5893006b4a5
--- /dev/null
+++ b/apps/user_webdavauth/l10n/et_EE.json
@@ -0,0 +1,7 @@
+{ "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/et_EE.php b/apps/user_webdavauth/l10n/et_EE.php
deleted file mode 100644
index 76b5cd4a864..00000000000
--- a/apps/user_webdavauth/l10n/et_EE.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eu.js b/apps/user_webdavauth/l10n/eu.js
new file mode 100644
index 00000000000..abc45c1adf3
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eu.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..83763ecaaff
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eu.json
@@ -0,0 +1,7 @@
+{ "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/eu.php b/apps/user_webdavauth/l10n/eu.php
deleted file mode 100644
index dcf9e0d3ef0..00000000000
--- a/apps/user_webdavauth/l10n/eu.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/eu_ES.js b/apps/user_webdavauth/l10n/eu_ES.js
new file mode 100644
index 00000000000..68ab406f834
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eu_ES.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..7a78f4becee
--- /dev/null
+++ b/apps/user_webdavauth/l10n/eu_ES.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Gorde"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/eu_ES.php b/apps/user_webdavauth/l10n/eu_ES.php
deleted file mode 100644
index a1d57a93b52..00000000000
--- a/apps/user_webdavauth/l10n/eu_ES.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Gorde"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fa.js b/apps/user_webdavauth/l10n/fa.js
new file mode 100644
index 00000000000..13f994c5520
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fa.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..e200dc46986
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fa.json
@@ -0,0 +1,7 @@
+{ "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/fa.php b/apps/user_webdavauth/l10n/fa.php
deleted file mode 100644
index cfaf8ce1a07..00000000000
--- a/apps/user_webdavauth/l10n/fa.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 را به عنوان اعتبارات غیر معتبر ترجمه می کند، و باقی موارد را به عنوان موارد معتبر تشخیص می دهد."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/fi_FI.js b/apps/user_webdavauth/l10n/fi_FI.js
new file mode 100644
index 00000000000..4d98c51d778
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fi_FI.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..412813eea4a
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fi_FI.json
@@ -0,0 +1,7 @@
+{ "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/fi_FI.php b/apps/user_webdavauth/l10n/fi_FI.php
deleted file mode 100644
index 7209a889f1b..00000000000
--- a/apps/user_webdavauth/l10n/fi_FI.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/fr.js b/apps/user_webdavauth/l10n/fr.js
new file mode 100644
index 00000000000..5b36d5aa5b1
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fr.js
@@ -0,0 +1,9 @@
+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 tout 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
new file mode 100644
index 00000000000..fe8c4b521ad
--- /dev/null
+++ b/apps/user_webdavauth/l10n/fr.json
@@ -0,0 +1,7 @@
+{ "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 tout 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/fr.php b/apps/user_webdavauth/l10n/fr.php
deleted file mode 100644
index efa6f2ea3d3..00000000000
--- a/apps/user_webdavauth/l10n/fr.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 tout autre valeur comme une authentification valide."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/gl.js b/apps/user_webdavauth/l10n/gl.js
new file mode 100644
index 00000000000..cd561a4ee56
--- /dev/null
+++ b/apps/user_webdavauth/l10n/gl.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..54a2af90867
--- /dev/null
+++ b/apps/user_webdavauth/l10n/gl.json
@@ -0,0 +1,7 @@
+{ "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/gl.php b/apps/user_webdavauth/l10n/gl.php
deleted file mode 100644
index 93ea1773cb1..00000000000
--- a/apps/user_webdavauth/l10n/gl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/he.js b/apps/user_webdavauth/l10n/he.js
new file mode 100644
index 00000000000..b88c6b72aac
--- /dev/null
+++ b/apps/user_webdavauth/l10n/he.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..fc168aae3d6
--- /dev/null
+++ b/apps/user_webdavauth/l10n/he.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "WebDAV Authentication" : "הזדהות מול WebDAV",
+    "Save" : "שמירה"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/he.php b/apps/user_webdavauth/l10n/he.php
deleted file mode 100644
index 4b037cc537f..00000000000
--- a/apps/user_webdavauth/l10n/he.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "הזדהות מול WebDAV",
-"Save" => "שמירה"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/hi.js b/apps/user_webdavauth/l10n/hi.js
new file mode 100644
index 00000000000..840317d2906
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hi.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..8ddb046ec63
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hi.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "सहेजें"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hi.php b/apps/user_webdavauth/l10n/hi.php
deleted file mode 100644
index d373ff080cb..00000000000
--- a/apps/user_webdavauth/l10n/hi.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "सहेजें"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/hr.js b/apps/user_webdavauth/l10n/hr.js
new file mode 100644
index 00000000000..041fea254dc
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hr.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "Save" : "Snimi"
+},
+"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
new file mode 100644
index 00000000000..d7da18a7a96
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hr.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Snimi"
+},"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/hr.php b/apps/user_webdavauth/l10n/hr.php
deleted file mode 100644
index 5df22b34400..00000000000
--- a/apps/user_webdavauth/l10n/hr.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Snimi"
-);
-$PLURAL_FORMS = "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/hu_HU.js b/apps/user_webdavauth/l10n/hu_HU.js
new file mode 100644
index 00000000000..354283be7b9
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hu_HU.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..6631ee61c63
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hu_HU.json
@@ -0,0 +1,7 @@
+{ "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/hu_HU.php b/apps/user_webdavauth/l10n/hu_HU.php
deleted file mode 100644
index 4cd053fecdb..00000000000
--- a/apps/user_webdavauth/l10n/hu_HU.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/hy.js b/apps/user_webdavauth/l10n/hy.js
new file mode 100644
index 00000000000..97e5a7316c6
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hy.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "Save" : "Պահպանել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/hy.json b/apps/user_webdavauth/l10n/hy.json
new file mode 100644
index 00000000000..cb94f4404a5
--- /dev/null
+++ b/apps/user_webdavauth/l10n/hy.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Պահպանել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/hy.php b/apps/user_webdavauth/l10n/hy.php
deleted file mode 100644
index 3f79bc37ffa..00000000000
--- a/apps/user_webdavauth/l10n/hy.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Պահպանել"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ia.js b/apps/user_webdavauth/l10n/ia.js
new file mode 100644
index 00000000000..651840bf0c1
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ia.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..91d310a33b7
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ia.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Salveguardar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ia.php b/apps/user_webdavauth/l10n/ia.php
deleted file mode 100644
index 413d8990659..00000000000
--- a/apps/user_webdavauth/l10n/ia.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Salveguardar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/id.js b/apps/user_webdavauth/l10n/id.js
new file mode 100644
index 00000000000..a7902dbf3b2
--- /dev/null
+++ b/apps/user_webdavauth/l10n/id.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "WebDAV Authentication" : "Otentikasi WebDAV",
+    "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 menafsirkan 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
new file mode 100644
index 00000000000..88638eb47c6
--- /dev/null
+++ b/apps/user_webdavauth/l10n/id.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "WebDAV Authentication" : "Otentikasi WebDAV",
+    "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 menafsirkan 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/id.php b/apps/user_webdavauth/l10n/id.php
deleted file mode 100644
index 25d5d6cac02..00000000000
--- a/apps/user_webdavauth/l10n/id.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "Otentikasi WebDAV",
-"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 menafsirkan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/is.js b/apps/user_webdavauth/l10n/is.js
new file mode 100644
index 00000000000..c6580e434b5
--- /dev/null
+++ b/apps/user_webdavauth/l10n/is.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "WebDAV Authentication" : "WebDAV Auðkenni",
+    "Save" : "Vista"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/is.json b/apps/user_webdavauth/l10n/is.json
new file mode 100644
index 00000000000..a9ab8d7246c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/is.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "WebDAV Authentication" : "WebDAV Auðkenni",
+    "Save" : "Vista"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/is.php b/apps/user_webdavauth/l10n/is.php
deleted file mode 100644
index c583862c311..00000000000
--- a/apps/user_webdavauth/l10n/is.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Auðkenni",
-"Save" => "Vista"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/it.js b/apps/user_webdavauth/l10n/it.js
new file mode 100644
index 00000000000..cd129949e0b
--- /dev/null
+++ b/apps/user_webdavauth/l10n/it.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..c842c6c19e6
--- /dev/null
+++ b/apps/user_webdavauth/l10n/it.json
@@ -0,0 +1,7 @@
+{ "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/it.php b/apps/user_webdavauth/l10n/it.php
deleted file mode 100644
index f068209d3fc..00000000000
--- a/apps/user_webdavauth/l10n/it.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ja.js b/apps/user_webdavauth/l10n/ja.js
new file mode 100644
index 00000000000..52e8445ff00
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ja.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..dbf17d776e0
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ja.json
@@ -0,0 +1,7 @@
+{ "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/ja.php b/apps/user_webdavauth/l10n/ja.php
deleted file mode 100644
index 05797176626..00000000000
--- a/apps/user_webdavauth/l10n/ja.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 の場合は無効な資格情報とし、他の応答はすべて有効な資格情報として処理します。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ka_GE.js b/apps/user_webdavauth/l10n/ka_GE.js
new file mode 100644
index 00000000000..c8eb069dc21
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ka_GE.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..05851e83eed
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ka_GE.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "WebDAV Authentication" : "WebDAV აუთენთიფიკაცია",
+    "Save" : "შენახვა"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ka_GE.php b/apps/user_webdavauth/l10n/ka_GE.php
deleted file mode 100644
index e5deb0ea67d..00000000000
--- a/apps/user_webdavauth/l10n/ka_GE.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV აუთენთიფიკაცია",
-"Save" => "შენახვა"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/km.js b/apps/user_webdavauth/l10n/km.js
new file mode 100644
index 00000000000..118d2c483d9
--- /dev/null
+++ b/apps/user_webdavauth/l10n/km.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..a93f04a0e31
--- /dev/null
+++ b/apps/user_webdavauth/l10n/km.json
@@ -0,0 +1,6 @@
+{ "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/km.php b/apps/user_webdavauth/l10n/km.php
deleted file mode 100644
index eee76d08214..00000000000
--- a/apps/user_webdavauth/l10n/km.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 ថា​ជា​អត្តសញ្ញាណ​មិន​ត្រឹម​ត្រូវ ហើយ​និង​ចម្លើយ​តប​ផ្សេងៗ​ថា​ត្រឹម​ត្រូវ។"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ko.js b/apps/user_webdavauth/l10n/ko.js
new file mode 100644
index 00000000000..e8b5ee69816
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ko.js
@@ -0,0 +1,8 @@
+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." : "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
new file mode 100644
index 00000000000..90fde9abd62
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ko.json
@@ -0,0 +1,6 @@
+{ "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." : "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ko.php b/apps/user_webdavauth/l10n/ko.php
deleted file mode 100644
index 68a113025b2..00000000000
--- a/apps/user_webdavauth/l10n/ko.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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." => "ownCloud에서 이 URL로 사용자 인증 정보를 보냅니다. 이 플러그인은 응답을 확인하여 HTTP 상태 코드 401이나 403이 돌아온 경우에 잘못된 인증 정보로 간주합니다. 다른 모든 상태 코드는 올바른 인증 정보로 간주합니다."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/ku_IQ.js b/apps/user_webdavauth/l10n/ku_IQ.js
new file mode 100644
index 00000000000..cdfe62f14ba
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ku_IQ.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..63f5aac1d28
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ku_IQ.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "پاشکه‌وتکردن"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ku_IQ.php b/apps/user_webdavauth/l10n/ku_IQ.php
deleted file mode 100644
index 4e2be8ad0d6..00000000000
--- a/apps/user_webdavauth/l10n/ku_IQ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "پاشکه‌وتکردن"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/lb.js b/apps/user_webdavauth/l10n/lb.js
new file mode 100644
index 00000000000..b358220a867
--- /dev/null
+++ b/apps/user_webdavauth/l10n/lb.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..e6ae53e9625
--- /dev/null
+++ b/apps/user_webdavauth/l10n/lb.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Späicheren"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/lb.php b/apps/user_webdavauth/l10n/lb.php
deleted file mode 100644
index 053c7e747d5..00000000000
--- a/apps/user_webdavauth/l10n/lb.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Späicheren"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/lt_LT.js b/apps/user_webdavauth/l10n/lt_LT.js
new file mode 100644
index 00000000000..33b674d7a73
--- /dev/null
+++ b/apps/user_webdavauth/l10n/lt_LT.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..0d43b99518d
--- /dev/null
+++ b/apps/user_webdavauth/l10n/lt_LT.json
@@ -0,0 +1,7 @@
+{ "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/lt_LT.php b/apps/user_webdavauth/l10n/lt_LT.php
deleted file mode 100644
index 921f62b82bf..00000000000
--- a/apps/user_webdavauth/l10n/lt_LT.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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. "
-);
-$PLURAL_FORMS = "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/lv.js b/apps/user_webdavauth/l10n/lv.js
new file mode 100644
index 00000000000..4fe05c1e1f3
--- /dev/null
+++ b/apps/user_webdavauth/l10n/lv.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..5887d845d79
--- /dev/null
+++ b/apps/user_webdavauth/l10n/lv.json
@@ -0,0 +1,5 @@
+{ "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/lv.php b/apps/user_webdavauth/l10n/lv.php
deleted file mode 100644
index a55bb24ee8d..00000000000
--- a/apps/user_webdavauth/l10n/lv.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV autentifikācija",
-"Save" => "Saglabāt"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/apps/user_webdavauth/l10n/mk.js b/apps/user_webdavauth/l10n/mk.js
new file mode 100644
index 00000000000..6a853ecbd9e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/mk.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..2960717f448
--- /dev/null
+++ b/apps/user_webdavauth/l10n/mk.json
@@ -0,0 +1,4 @@
+{ "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/mk.php b/apps/user_webdavauth/l10n/mk.php
deleted file mode 100644
index 2146b817452..00000000000
--- a/apps/user_webdavauth/l10n/mk.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Сними"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/apps/user_webdavauth/l10n/ms_MY.js b/apps/user_webdavauth/l10n/ms_MY.js
new file mode 100644
index 00000000000..50d5a443e6a
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ms_MY.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..875c2f6c288
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ms_MY.json
@@ -0,0 +1,7 @@
+{ "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/ms_MY.php b/apps/user_webdavauth/l10n/ms_MY.php
deleted file mode 100644
index b7f947fc5cd..00000000000
--- a/apps/user_webdavauth/l10n/ms_MY.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/nb_NO.js b/apps/user_webdavauth/l10n/nb_NO.js
new file mode 100644
index 00000000000..72a099875e9
--- /dev/null
+++ b/apps/user_webdavauth/l10n/nb_NO.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..0ef46124f93
--- /dev/null
+++ b/apps/user_webdavauth/l10n/nb_NO.json
@@ -0,0 +1,7 @@
+{ "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/nb_NO.php b/apps/user_webdavauth/l10n/nb_NO.php
deleted file mode 100644
index d151e2bf308..00000000000
--- a/apps/user_webdavauth/l10n/nb_NO.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/nl.js b/apps/user_webdavauth/l10n/nl.js
new file mode 100644
index 00000000000..8633c851fbc
--- /dev/null
+++ b/apps/user_webdavauth/l10n/nl.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..73bb6f40e51
--- /dev/null
+++ b/apps/user_webdavauth/l10n/nl.json
@@ -0,0 +1,7 @@
+{ "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/nl.php b/apps/user_webdavauth/l10n/nl.php
deleted file mode 100644
index 8b015bf7ae6..00000000000
--- a/apps/user_webdavauth/l10n/nl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/nn_NO.js b/apps/user_webdavauth/l10n/nn_NO.js
new file mode 100644
index 00000000000..4777921772f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/nn_NO.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..2ad0b5b6448
--- /dev/null
+++ b/apps/user_webdavauth/l10n/nn_NO.json
@@ -0,0 +1,6 @@
+{ "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/nn_NO.php b/apps/user_webdavauth/l10n/nn_NO.php
deleted file mode 100644
index e52c6c653fc..00000000000
--- a/apps/user_webdavauth/l10n/nn_NO.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/oc.js b/apps/user_webdavauth/l10n/oc.js
new file mode 100644
index 00000000000..0191f0de883
--- /dev/null
+++ b/apps/user_webdavauth/l10n/oc.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "Save" : "Enregistra"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/apps/user_webdavauth/l10n/oc.json b/apps/user_webdavauth/l10n/oc.json
new file mode 100644
index 00000000000..de8f9ed6d96
--- /dev/null
+++ b/apps/user_webdavauth/l10n/oc.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Enregistra"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/oc.php b/apps/user_webdavauth/l10n/oc.php
deleted file mode 100644
index 42ef978066e..00000000000
--- a/apps/user_webdavauth/l10n/oc.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Enregistra"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/pl.js b/apps/user_webdavauth/l10n/pl.js
new file mode 100644
index 00000000000..4104adfa6b0
--- /dev/null
+++ b/apps/user_webdavauth/l10n/pl.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..64cc4899d07
--- /dev/null
+++ b/apps/user_webdavauth/l10n/pl.json
@@ -0,0 +1,7 @@
+{ "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/pl.php b/apps/user_webdavauth/l10n/pl.php
deleted file mode 100644
index 66e685243de..00000000000
--- a/apps/user_webdavauth/l10n/pl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "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/pt_BR.js b/apps/user_webdavauth/l10n/pt_BR.js
new file mode 100644
index 00000000000..b553c1b50fc
--- /dev/null
+++ b/apps/user_webdavauth/l10n/pt_BR.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..b42d7a6b514
--- /dev/null
+++ b/apps/user_webdavauth/l10n/pt_BR.json
@@ -0,0 +1,7 @@
+{ "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_BR.php b/apps/user_webdavauth/l10n/pt_BR.php
deleted file mode 100644
index 37f17df4c61..00000000000
--- a/apps/user_webdavauth/l10n/pt_BR.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/pt_PT.js b/apps/user_webdavauth/l10n/pt_PT.js
new file mode 100644
index 00000000000..c06d80a3e7d
--- /dev/null
+++ b/apps/user_webdavauth/l10n/pt_PT.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..c2a7ebf3685
--- /dev/null
+++ b/apps/user_webdavauth/l10n/pt_PT.json
@@ -0,0 +1,7 @@
+{ "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/pt_PT.php b/apps/user_webdavauth/l10n/pt_PT.php
deleted file mode 100644
index f9e63bf2af5..00000000000
--- a/apps/user_webdavauth/l10n/pt_PT.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ro.js b/apps/user_webdavauth/l10n/ro.js
new file mode 100644
index 00000000000..4bc803850dc
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ro.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "WebDAV Authentication" : "Autentificare WebDAV",
+    "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
new file mode 100644
index 00000000000..74666c22a5e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ro.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "WebDAV Authentication" : "Autentificare WebDAV",
+    "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/ro.php b/apps/user_webdavauth/l10n/ro.php
deleted file mode 100644
index 8fafe932ad0..00000000000
--- a/apps/user_webdavauth/l10n/ro.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "Autentificare WebDAV",
-"Save" => "Salvează"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/apps/user_webdavauth/l10n/ru.js b/apps/user_webdavauth/l10n/ru.js
new file mode 100644
index 00000000000..b52d1ed81be
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ru.js
@@ -0,0 +1,9 @@
+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/ru.json b/apps/user_webdavauth/l10n/ru.json
new file mode 100644
index 00000000000..e265fc80ed4
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ru.json
@@ -0,0 +1,7 @@
+{ "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/ru.php b/apps/user_webdavauth/l10n/ru.php
deleted file mode 100644
index 2b3726c246c..00000000000
--- a/apps/user_webdavauth/l10n/ru.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 как неверные учётные данные, при любом другом ответе - учётные данные пользователя верны."
-);
-$PLURAL_FORMS = "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/si_LK.js b/apps/user_webdavauth/l10n/si_LK.js
new file mode 100644
index 00000000000..4a408625e4f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/si_LK.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..cf286f67edf
--- /dev/null
+++ b/apps/user_webdavauth/l10n/si_LK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "සුරකින්න"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/si_LK.php b/apps/user_webdavauth/l10n/si_LK.php
deleted file mode 100644
index 661a8495c30..00000000000
--- a/apps/user_webdavauth/l10n/si_LK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "සුරකින්න"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/sk_SK.js b/apps/user_webdavauth/l10n/sk_SK.js
new file mode 100644
index 00000000000..455d18213e3
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sk_SK.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..bffebf3f253
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sk_SK.json
@@ -0,0 +1,7 @@
+{ "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/sk_SK.php b/apps/user_webdavauth/l10n/sk_SK.php
deleted file mode 100644
index 029c3171e7b..00000000000
--- a/apps/user_webdavauth/l10n/sk_SK.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_webdavauth/l10n/sl.js b/apps/user_webdavauth/l10n/sl.js
new file mode 100644
index 00000000000..e175c9b3c0c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sl.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..184d2df74b2
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sl.json
@@ -0,0 +1,7 @@
+{ "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/sl.php b/apps/user_webdavauth/l10n/sl.php
deleted file mode 100644
index b14a2204c83..00000000000
--- a/apps/user_webdavauth/l10n/sl.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "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/sq.js b/apps/user_webdavauth/l10n/sq.js
new file mode 100644
index 00000000000..73b3024dce2
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sq.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..c3290a31319
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sq.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Ruaj"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/sq.php b/apps/user_webdavauth/l10n/sq.php
deleted file mode 100644
index 66d3b2fb102..00000000000
--- a/apps/user_webdavauth/l10n/sq.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Ruaj"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/sr.js b/apps/user_webdavauth/l10n/sr.js
new file mode 100644
index 00000000000..9413d934a2c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sr.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "WebDAV Authentication" : "WebDAV провера идентитета",
+    "Save" : "Сачувај"
+},
+"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
new file mode 100644
index 00000000000..7e50e7c4132
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sr.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "WebDAV Authentication" : "WebDAV провера идентитета",
+    "Save" : "Сачувај"
+},"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.php b/apps/user_webdavauth/l10n/sr.php
deleted file mode 100644
index 78f24013e5e..00000000000
--- a/apps/user_webdavauth/l10n/sr.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV провера идентитета",
-"Save" => "Сачувај"
-);
-$PLURAL_FORMS = "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.js b/apps/user_webdavauth/l10n/sr@latin.js
new file mode 100644
index 00000000000..c6b89e58319
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sr@latin.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "Save" : "Snimi"
+},
+"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
new file mode 100644
index 00000000000..5cca2be8eec
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sr@latin.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "Snimi"
+},"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.php b/apps/user_webdavauth/l10n/sr@latin.php
deleted file mode 100644
index 3eb28111769..00000000000
--- a/apps/user_webdavauth/l10n/sr@latin.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Snimi"
-);
-$PLURAL_FORMS = "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/sv.js b/apps/user_webdavauth/l10n/sv.js
new file mode 100644
index 00000000000..d80f3c22307
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sv.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..f11a1610ec3
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sv.json
@@ -0,0 +1,7 @@
+{ "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/sv.php b/apps/user_webdavauth/l10n/sv.php
deleted file mode 100644
index ed9b19db315..00000000000
--- a/apps/user_webdavauth/l10n/sv.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/ta_LK.js b/apps/user_webdavauth/l10n/ta_LK.js
new file mode 100644
index 00000000000..d71f18fe198
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ta_LK.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..e881e682241
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ta_LK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "சேமிக்க "
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ta_LK.php b/apps/user_webdavauth/l10n/ta_LK.php
deleted file mode 100644
index fdf3ac7b15e..00000000000
--- a/apps/user_webdavauth/l10n/ta_LK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "சேமிக்க "
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/te.js b/apps/user_webdavauth/l10n/te.js
new file mode 100644
index 00000000000..e632cc07e4f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/te.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..d250e26411e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/te.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "భద్రపరచు"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/te.php b/apps/user_webdavauth/l10n/te.php
deleted file mode 100644
index f3bf5e83cde..00000000000
--- a/apps/user_webdavauth/l10n/te.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "భద్రపరచు"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/th_TH.js b/apps/user_webdavauth/l10n/th_TH.js
new file mode 100644
index 00000000000..303af823112
--- /dev/null
+++ b/apps/user_webdavauth/l10n/th_TH.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "WebDAV Authentication" : "WebDAV Authentication",
+    "Save" : "บันทึก"
+},
+"nplurals=1; plural=0;");
diff --git a/apps/user_webdavauth/l10n/th_TH.json b/apps/user_webdavauth/l10n/th_TH.json
new file mode 100644
index 00000000000..da4e255d6e1
--- /dev/null
+++ b/apps/user_webdavauth/l10n/th_TH.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "WebDAV Authentication" : "WebDAV Authentication",
+    "Save" : "บันทึก"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/th_TH.php b/apps/user_webdavauth/l10n/th_TH.php
deleted file mode 100644
index c6120ba3090..00000000000
--- a/apps/user_webdavauth/l10n/th_TH.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV Authentication",
-"Save" => "บันทึก"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/tr.js b/apps/user_webdavauth/l10n/tr.js
new file mode 100644
index 00000000000..dd0a66a45ef
--- /dev/null
+++ b/apps/user_webdavauth/l10n/tr.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..3c8845256c3
--- /dev/null
+++ b/apps/user_webdavauth/l10n/tr.json
@@ -0,0 +1,7 @@
+{ "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/tr.php b/apps/user_webdavauth/l10n/tr.php
deleted file mode 100644
index f07b3d81746..00000000000
--- a/apps/user_webdavauth/l10n/tr.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/apps/user_webdavauth/l10n/ug.js b/apps/user_webdavauth/l10n/ug.js
new file mode 100644
index 00000000000..2fe5c26fe23
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ug.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..a897a27d54a
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ug.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "WebDAV Authentication" : "WebDAV سالاھىيەت دەلىللەش",
+    "Save" : "ساقلا"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ug.php b/apps/user_webdavauth/l10n/ug.php
deleted file mode 100644
index f4e736952c4..00000000000
--- a/apps/user_webdavauth/l10n/ug.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "WebDAV سالاھىيەت دەلىللەش",
-"Save" => "ساقلا"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/uk.js b/apps/user_webdavauth/l10n/uk.js
new file mode 100644
index 00000000000..f0febc1d21c
--- /dev/null
+++ b/apps/user_webdavauth/l10n/uk.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..1bec19cbbdd
--- /dev/null
+++ b/apps/user_webdavauth/l10n/uk.json
@@ -0,0 +1,7 @@
+{ "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/uk.php b/apps/user_webdavauth/l10n/uk.php
deleted file mode 100644
index 1b1463e5b75..00000000000
--- a/apps/user_webdavauth/l10n/uk.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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, як неправильні облікові дані, а всі інші відповіді, вважатимуться правильними."
-);
-$PLURAL_FORMS = "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/ur_PK.js b/apps/user_webdavauth/l10n/ur_PK.js
new file mode 100644
index 00000000000..45493bf7bf3
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ur_PK.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..2c8f5af7ae5
--- /dev/null
+++ b/apps/user_webdavauth/l10n/ur_PK.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Save" : "حفظ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/ur_PK.php b/apps/user_webdavauth/l10n/ur_PK.php
deleted file mode 100644
index 3546754a0d2..00000000000
--- a/apps/user_webdavauth/l10n/ur_PK.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "حفظ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_webdavauth/l10n/vi.js b/apps/user_webdavauth/l10n/vi.js
new file mode 100644
index 00000000000..60ce096e7b2
--- /dev/null
+++ b/apps/user_webdavauth/l10n/vi.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "user_webdavauth",
+    {
+    "WebDAV Authentication" : "Xác thực WebDAV",
+    "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
new file mode 100644
index 00000000000..53163ca5310
--- /dev/null
+++ b/apps/user_webdavauth/l10n/vi.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "WebDAV Authentication" : "Xác thực WebDAV",
+    "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/vi.php b/apps/user_webdavauth/l10n/vi.php
deleted file mode 100644
index ee8a47151ce..00000000000
--- a/apps/user_webdavauth/l10n/vi.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"WebDAV Authentication" => "Xác thực WebDAV",
-"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ệ."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_CN.js b/apps/user_webdavauth/l10n/zh_CN.js
new file mode 100644
index 00000000000..9cca337fd6d
--- /dev/null
+++ b/apps/user_webdavauth/l10n/zh_CN.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..5bd8489403d
--- /dev/null
+++ b/apps/user_webdavauth/l10n/zh_CN.json
@@ -0,0 +1,7 @@
+{ "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_CN.php b/apps/user_webdavauth/l10n/zh_CN.php
deleted file mode 100644
index 56569f1448b..00000000000
--- a/apps/user_webdavauth/l10n/zh_CN.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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 解释为非法身份，其他所有返回值为合法身份。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_HK.js b/apps/user_webdavauth/l10n/zh_HK.js
new file mode 100644
index 00000000000..87e29b7432f
--- /dev/null
+++ b/apps/user_webdavauth/l10n/zh_HK.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..a2108b738be
--- /dev/null
+++ b/apps/user_webdavauth/l10n/zh_HK.json
@@ -0,0 +1,7 @@
+{ "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_HK.php b/apps/user_webdavauth/l10n/zh_HK.php
deleted file mode 100644
index 993a253fc3d..00000000000
--- a/apps/user_webdavauth/l10n/zh_HK.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/apps/user_webdavauth/l10n/zh_TW.js b/apps/user_webdavauth/l10n/zh_TW.js
new file mode 100644
index 00000000000..a4de3acc406
--- /dev/null
+++ b/apps/user_webdavauth/l10n/zh_TW.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..aca5151be08
--- /dev/null
+++ b/apps/user_webdavauth/l10n/zh_TW.json
@@ -0,0 +1,6 @@
+{ "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/zh_TW.php b/apps/user_webdavauth/l10n/zh_TW.php
deleted file mode 100644
index fa0e987fa3c..00000000000
--- a/apps/user_webdavauth/l10n/zh_TW.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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將會被理解為無效憑證，而所有其他的回應將會被理解為有效憑證。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ach.js b/core/l10n/ach.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/ach.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/ach.json b/core/l10n/ach.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/ach.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ach.php b/core/l10n/ach.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/ach.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/ady.js b/core/l10n/ady.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ady.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ady.json b/core/l10n/ady.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ady.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ady.php b/core/l10n/ady.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ady.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
new file mode 100644
index 00000000000..c74d7112e61
--- /dev/null
+++ b/core/l10n/af_ZA.js
@@ -0,0 +1,129 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kon nie e-pos aan die volgende gebruikers stuur nie: %s",
+    "Turned on maintenance mode" : "Instandhouding aangeskakel",
+    "Turned off maintenance mode" : "Instandhouding uitgeskakel",
+    "Updated database" : "Databasis opgedateer",
+    "Checked database schema update" : "Databasis skema opdatering nagegaan",
+    "Checked database schema update for apps" : "Databasis skema opdatering nagegaan vir sagteware",
+    "Updated \"%s\" to %s" : "\"%s\" opgedateer na %s",
+    "Disabled incompatible apps: %s" : "Onversoenbare sagteware onaktief gemaak: %s",
+    "No image or file provided" : "Geen prent of lêer voorsien",
+    "Unknown filetype" : "Onbekende lêertipe",
+    "Invalid image" : "Ongeldige prent",
+    "No temporary profile picture available, try again" : "Geen tydelike profiel foto beskikbaar nie, probeer weer",
+    "No crop data provided" : "Geen \"crop\" data verskaf",
+    "Sunday" : "Sondag",
+    "Monday" : "Maandag",
+    "Tuesday" : "Dinsdag",
+    "Wednesday" : "Woensdag",
+    "Thursday" : "Donderdag",
+    "Friday" : "Vrydag",
+    "Saturday" : "Saterdag",
+    "January" : "Januarie",
+    "February" : "Februarie",
+    "March" : "Maart",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Junie",
+    "July" : "Julie",
+    "August" : "Augustus",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Instellings",
+    "File" : "Lêer",
+    "Folder" : "Omslag",
+    "Image" : "Prent",
+    "Audio" : "Audio",
+    "Saving..." : "Stoor...",
+    "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",
+    "Reset password" : "Herstel wagwoord",
+    "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
+    "No" : "Nee",
+    "Yes" : "Ja",
+    "Choose" : "Kies",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "One file conflict" : "Een lêer konflik",
+    "New Files" : "Nuwe lêers",
+    "Already existing files" : "Bestaande lêers",
+    "Cancel" : "Kanselleer",
+    "Continue" : "Gaan voort",
+    "Very weak password" : "Baie swak wagwoord",
+    "Weak password" : "Swak wagwoord",
+    "So-so password" : "So-so wagwoord",
+    "Good password" : "Goeie wagwoord",
+    "Strong password" : "Sterk wagwoord",
+    "Shared" : "Gedeel",
+    "Share" : "Deel",
+    "Error" : "Fout",
+    "Error while sharing" : "Deel veroorsaak fout",
+    "Error while unsharing" : "Deel terugneem veroorsaak fout",
+    "Error while changing permissions" : "Fout met verandering van regte",
+    "Shared with you and the group {group} by {owner}" : "Met jou en die groep {group} gedeel deur {owner}",
+    "Shared with you by {owner}" : "Met jou gedeel deur {owner}",
+    "Password protect" : "Beskerm met Wagwoord",
+    "Allow Public Upload" : "Laat Publieke Oplaai toe",
+    "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 in {item} with {user}" : "Gedeel in {item} met {user}",
+    "Unshare" : "Deel terug neem",
+    "can edit" : "kan wysig",
+    "access control" : "toegang beheer",
+    "create" : "skep",
+    "update" : "opdateer",
+    "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",
+    "Warning" : "Waarskuwing",
+    "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
+    "Add" : "Voeg by",
+    "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
+    "%s password reset" : "%s wagwoord herstel",
+    "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
+    "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
+    "Username" : "Gebruikersnaam",
+    "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel",
+    "New password" : "Nuwe wagwoord",
+    "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
+    "Personal" : "Persoonlik",
+    "Users" : "Gebruikers",
+    "Apps" : "Toepassings",
+    "Admin" : "Admin",
+    "Help" : "Hulp",
+    "Access forbidden" : "Toegang verbode",
+    "Security Warning" : "Sekuriteits waarskuwing",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jou PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Opdateer asseblief jou PHP installasie om %s veilig te gebruik",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
+    "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
+    "Password" : "Wagwoord",
+    "Data folder" : "Data omslag",
+    "Configure the database" : "Stel databasis op",
+    "Database user" : "Databasis-gebruiker",
+    "Database password" : "Databasis-wagwoord",
+    "Database name" : "Databasis naam",
+    "Database tablespace" : "Databasis tabelspasie",
+    "Database host" : "Databasis gasheer",
+    "Finish setup" : "Maak opstelling klaar",
+    "%s is available. Get more information on how to update." : "%s is beskikbaar. Kry meer inligting oor opdatering.",
+    "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>"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
new file mode 100644
index 00000000000..2065555d7d3
--- /dev/null
+++ b/core/l10n/af_ZA.json
@@ -0,0 +1,127 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kon nie e-pos aan die volgende gebruikers stuur nie: %s",
+    "Turned on maintenance mode" : "Instandhouding aangeskakel",
+    "Turned off maintenance mode" : "Instandhouding uitgeskakel",
+    "Updated database" : "Databasis opgedateer",
+    "Checked database schema update" : "Databasis skema opdatering nagegaan",
+    "Checked database schema update for apps" : "Databasis skema opdatering nagegaan vir sagteware",
+    "Updated \"%s\" to %s" : "\"%s\" opgedateer na %s",
+    "Disabled incompatible apps: %s" : "Onversoenbare sagteware onaktief gemaak: %s",
+    "No image or file provided" : "Geen prent of lêer voorsien",
+    "Unknown filetype" : "Onbekende lêertipe",
+    "Invalid image" : "Ongeldige prent",
+    "No temporary profile picture available, try again" : "Geen tydelike profiel foto beskikbaar nie, probeer weer",
+    "No crop data provided" : "Geen \"crop\" data verskaf",
+    "Sunday" : "Sondag",
+    "Monday" : "Maandag",
+    "Tuesday" : "Dinsdag",
+    "Wednesday" : "Woensdag",
+    "Thursday" : "Donderdag",
+    "Friday" : "Vrydag",
+    "Saturday" : "Saterdag",
+    "January" : "Januarie",
+    "February" : "Februarie",
+    "March" : "Maart",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Junie",
+    "July" : "Julie",
+    "August" : "Augustus",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Instellings",
+    "File" : "Lêer",
+    "Folder" : "Omslag",
+    "Image" : "Prent",
+    "Audio" : "Audio",
+    "Saving..." : "Stoor...",
+    "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",
+    "Reset password" : "Herstel wagwoord",
+    "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
+    "No" : "Nee",
+    "Yes" : "Ja",
+    "Choose" : "Kies",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "One file conflict" : "Een lêer konflik",
+    "New Files" : "Nuwe lêers",
+    "Already existing files" : "Bestaande lêers",
+    "Cancel" : "Kanselleer",
+    "Continue" : "Gaan voort",
+    "Very weak password" : "Baie swak wagwoord",
+    "Weak password" : "Swak wagwoord",
+    "So-so password" : "So-so wagwoord",
+    "Good password" : "Goeie wagwoord",
+    "Strong password" : "Sterk wagwoord",
+    "Shared" : "Gedeel",
+    "Share" : "Deel",
+    "Error" : "Fout",
+    "Error while sharing" : "Deel veroorsaak fout",
+    "Error while unsharing" : "Deel terugneem veroorsaak fout",
+    "Error while changing permissions" : "Fout met verandering van regte",
+    "Shared with you and the group {group} by {owner}" : "Met jou en die groep {group} gedeel deur {owner}",
+    "Shared with you by {owner}" : "Met jou gedeel deur {owner}",
+    "Password protect" : "Beskerm met Wagwoord",
+    "Allow Public Upload" : "Laat Publieke Oplaai toe",
+    "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 in {item} with {user}" : "Gedeel in {item} met {user}",
+    "Unshare" : "Deel terug neem",
+    "can edit" : "kan wysig",
+    "access control" : "toegang beheer",
+    "create" : "skep",
+    "update" : "opdateer",
+    "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",
+    "Warning" : "Waarskuwing",
+    "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
+    "Add" : "Voeg by",
+    "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
+    "%s password reset" : "%s wagwoord herstel",
+    "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
+    "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
+    "Username" : "Gebruikersnaam",
+    "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel",
+    "New password" : "Nuwe wagwoord",
+    "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
+    "Personal" : "Persoonlik",
+    "Users" : "Gebruikers",
+    "Apps" : "Toepassings",
+    "Admin" : "Admin",
+    "Help" : "Hulp",
+    "Access forbidden" : "Toegang verbode",
+    "Security Warning" : "Sekuriteits waarskuwing",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jou PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Opdateer asseblief jou PHP installasie om %s veilig te gebruik",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
+    "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
+    "Password" : "Wagwoord",
+    "Data folder" : "Data omslag",
+    "Configure the database" : "Stel databasis op",
+    "Database user" : "Databasis-gebruiker",
+    "Database password" : "Databasis-wagwoord",
+    "Database name" : "Databasis naam",
+    "Database tablespace" : "Databasis tabelspasie",
+    "Database host" : "Databasis gasheer",
+    "Finish setup" : "Maak opstelling klaar",
+    "%s is available. Get more information on how to update." : "%s is beskikbaar. Kry meer inligting oor opdatering.",
+    "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);"
+}
\ No newline at end of file
diff --git a/core/l10n/af_ZA.php b/core/l10n/af_ZA.php
deleted file mode 100644
index 404c7195c07..00000000000
--- a/core/l10n/af_ZA.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kon nie e-pos aan die volgende gebruikers stuur nie: %s",
-"Turned on maintenance mode" => "Instandhouding aangeskakel",
-"Turned off maintenance mode" => "Instandhouding uitgeskakel",
-"Updated database" => "Databasis opgedateer",
-"Checked database schema update" => "Databasis skema opdatering nagegaan",
-"Checked database schema update for apps" => "Databasis skema opdatering nagegaan vir sagteware",
-"Updated \"%s\" to %s" => "\"%s\" opgedateer na %s",
-"Disabled incompatible apps: %s" => "Onversoenbare sagteware onaktief gemaak: %s",
-"No image or file provided" => "Geen prent of lêer voorsien",
-"Unknown filetype" => "Onbekende lêertipe",
-"Invalid image" => "Ongeldige prent",
-"No temporary profile picture available, try again" => "Geen tydelike profiel foto beskikbaar nie, probeer weer",
-"No crop data provided" => "Geen \"crop\" data verskaf",
-"Sunday" => "Sondag",
-"Monday" => "Maandag",
-"Tuesday" => "Dinsdag",
-"Wednesday" => "Woensdag",
-"Thursday" => "Donderdag",
-"Friday" => "Vrydag",
-"Saturday" => "Saterdag",
-"January" => "Januarie",
-"February" => "Februarie",
-"March" => "Maart",
-"April" => "April",
-"May" => "Mei",
-"June" => "Junie",
-"July" => "Julie",
-"August" => "Augustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Settings" => "Instellings",
-"File" => "Lêer",
-"Folder" => "Omslag",
-"Image" => "Prent",
-"Audio" => "Audio",
-"Saving..." => "Stoor...",
-"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",
-"Reset password" => "Herstel wagwoord",
-"Password can not be changed. Please contact your administrator." => "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
-"No" => "Nee",
-"Yes" => "Ja",
-"Choose" => "Kies",
-"Ok" => "OK",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"One file conflict" => "Een lêer konflik",
-"New Files" => "Nuwe lêers",
-"Already existing files" => "Bestaande lêers",
-"Cancel" => "Kanselleer",
-"Continue" => "Gaan voort",
-"Very weak password" => "Baie swak wagwoord",
-"Weak password" => "Swak wagwoord",
-"So-so password" => "So-so wagwoord",
-"Good password" => "Goeie wagwoord",
-"Strong password" => "Sterk wagwoord",
-"Shared" => "Gedeel",
-"Share" => "Deel",
-"Error" => "Fout",
-"Error while sharing" => "Deel veroorsaak fout",
-"Error while unsharing" => "Deel terugneem veroorsaak fout",
-"Error while changing permissions" => "Fout met verandering van regte",
-"Shared with you and the group {group} by {owner}" => "Met jou en die groep {group} gedeel deur {owner}",
-"Shared with you by {owner}" => "Met jou gedeel deur {owner}",
-"Password protect" => "Beskerm met Wagwoord",
-"Allow Public Upload" => "Laat Publieke Oplaai toe",
-"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 in {item} with {user}" => "Gedeel in {item} met {user}",
-"Unshare" => "Deel terug neem",
-"can edit" => "kan wysig",
-"access control" => "toegang beheer",
-"create" => "skep",
-"update" => "opdateer",
-"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",
-"Warning" => "Waarskuwing",
-"The object type is not specified." => "Hierdie objek tipe is nie gespesifiseer nie.",
-"Add" => "Voeg by",
-"The update was successful. Redirecting you to ownCloud now." => "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
-"%s password reset" => "%s wagwoord herstel",
-"Use the following link to reset your password: {link}" => "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
-"You will receive a link to reset your password via Email." => "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
-"Username" => "Gebruikersnaam",
-"Yes, I really want to reset my password now" => "Ja, Ek wil regtig my wagwoord herstel",
-"New password" => "Nuwe wagwoord",
-"For the best results, please consider using a GNU/Linux server instead." => "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
-"Personal" => "Persoonlik",
-"Users" => "Gebruikers",
-"Apps" => "Toepassings",
-"Admin" => "Admin",
-"Help" => "Hulp",
-"Access forbidden" => "Toegang verbode",
-"Security Warning" => "Sekuriteits waarskuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jou PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Opdateer asseblief jou PHP installasie om %s veilig te gebruik",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
-"Create an <strong>admin account</strong>" => "Skep `n <strong>admin-rekening</strong>",
-"Password" => "Wagwoord",
-"Data folder" => "Data omslag",
-"Configure the database" => "Stel databasis op",
-"Database user" => "Databasis-gebruiker",
-"Database password" => "Databasis-wagwoord",
-"Database name" => "Databasis naam",
-"Database tablespace" => "Databasis tabelspasie",
-"Database host" => "Databasis gasheer",
-"Finish setup" => "Maak opstelling klaar",
-"%s is available. Get more information on how to update." => "%s is beskikbaar. Kry meer inligting oor opdatering.",
-"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>"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ak.js b/core/l10n/ak.js
new file mode 100644
index 00000000000..8d5d3325583
--- /dev/null
+++ b/core/l10n/ak.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=n > 1;");
diff --git a/core/l10n/ak.json b/core/l10n/ak.json
new file mode 100644
index 00000000000..eda7891f2e2
--- /dev/null
+++ b/core/l10n/ak.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=n > 1;"
+}
\ No newline at end of file
diff --git a/core/l10n/ak.php b/core/l10n/ak.php
deleted file mode 100644
index df47d5b95c2..00000000000
--- a/core/l10n/ak.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=n > 1;";
diff --git a/core/l10n/am_ET.js b/core/l10n/am_ET.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/am_ET.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/am_ET.json b/core/l10n/am_ET.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/am_ET.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/am_ET.php b/core/l10n/am_ET.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/am_ET.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
new file mode 100644
index 00000000000..e7a2a1df351
--- /dev/null
+++ b/core/l10n/ar.js
@@ -0,0 +1,110 @@
+OC.L10N.register(
+    "core",
+    {
+    "Updated database" : "قاعدة بيانات المرفوعات",
+    "Unknown filetype" : "نوع الملف غير معروف",
+    "Invalid image" : "الصورة غير صالحة",
+    "Sunday" : "الأحد",
+    "Monday" : "الأثنين",
+    "Tuesday" : "الثلاثاء",
+    "Wednesday" : "الاربعاء",
+    "Thursday" : "الخميس",
+    "Friday" : "الجمعه",
+    "Saturday" : "السبت",
+    "January" : "كانون الثاني",
+    "February" : "شباط",
+    "March" : "آذار",
+    "April" : "نيسان",
+    "May" : "أيار",
+    "June" : "حزيران",
+    "July" : "تموز",
+    "August" : "آب",
+    "September" : "أيلول",
+    "October" : "تشرين الاول",
+    "November" : "تشرين الثاني",
+    "December" : "كانون الاول",
+    "Settings" : "إعدادات",
+    "File" : "ملف",
+    "Folder" : "مجلد",
+    "Saving..." : "جاري الحفظ...",
+    "Reset password" : "تعديل كلمة السر",
+    "No" : "لا",
+    "Yes" : "نعم",
+    "Choose" : "اختيار",
+    "Ok" : "موافق",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","","","",""],
+    "Cancel" : "الغاء",
+    "Very weak password" : "كلمة السر ضعيفة جدا",
+    "Weak password" : "كلمة السر ضعيفة",
+    "Good password" : "كلمة السر جيدة",
+    "Strong password" : "كلمة السر قوية",
+    "Your web server is not yet properly setup to allow files 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 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." : "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات",
+    "Shared" : "مشارك",
+    "Share" : "شارك",
+    "Error" : "خطأ",
+    "Error while sharing" : "حصل خطأ عند عملية المشاركة",
+    "Error while unsharing" : "حصل خطأ عند عملية إزالة المشاركة",
+    "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
+    "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
+    "Shared with you by {owner}" : "شورك معك من قبل {owner}",
+    "Share link" : "شارك الرابط",
+    "Password protect" : "حماية كلمة السر",
+    "Allow Public Upload" : "اسمح بالرفع للعامة",
+    "Email link to person" : "ارسل الرابط بالبريد الى صديق",
+    "Send" : "أرسل",
+    "Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
+    "Expiration date" : "تاريخ إنتهاء الصلاحية",
+    "group" : "مجموعة",
+    "Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
+    "Shared in {item} with {user}" : "شورك في {item} مع {user}",
+    "Unshare" : "إلغاء مشاركة",
+    "can share" : "يمكن المشاركة",
+    "can edit" : "التحرير مسموح",
+    "access control" : "ضبط الوصول",
+    "create" : "إنشاء",
+    "update" : "تحديث",
+    "delete" : "حذف",
+    "Password protected" : "محمي بكلمة السر",
+    "Error unsetting expiration date" : "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
+    "Error setting expiration date" : "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+    "Sending ..." : "جاري الارسال ...",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Warning" : "تحذير",
+    "The object type is not specified." : "نوع العنصر غير محدد.",
+    "Delete" : "إلغاء",
+    "Add" : "اضف",
+    "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
+    "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
+    "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
+    "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
+    "Username" : "إسم المستخدم",
+    "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري",
+    "New password" : "كلمات سر جديدة",
+    "Personal" : "شخصي",
+    "Users" : "المستخدمين",
+    "Apps" : "التطبيقات",
+    "Admin" : "المدير",
+    "Help" : "المساعدة",
+    "Access forbidden" : "التوصّل محظور",
+    "Security Warning" : "تحذير أمان",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "يرجى تحديث نسخة PHP لاستخدام %s بطريقة آمنة",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
+    "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
+    "Password" : "كلمة المرور",
+    "Data folder" : "مجلد المعلومات",
+    "Configure the database" : "أسس قاعدة البيانات",
+    "Database user" : "مستخدم قاعدة البيانات",
+    "Database password" : "كلمة سر مستخدم قاعدة البيانات",
+    "Database name" : "إسم قاعدة البيانات",
+    "Database tablespace" : "مساحة جدول قاعدة البيانات",
+    "Database host" : "خادم قاعدة البيانات",
+    "Finish setup" : "انهاء التعديلات",
+    "Log out" : "الخروج",
+    "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
new file mode 100644
index 00000000000..7a26a719cec
--- /dev/null
+++ b/core/l10n/ar.json
@@ -0,0 +1,108 @@
+{ "translations": {
+    "Updated database" : "قاعدة بيانات المرفوعات",
+    "Unknown filetype" : "نوع الملف غير معروف",
+    "Invalid image" : "الصورة غير صالحة",
+    "Sunday" : "الأحد",
+    "Monday" : "الأثنين",
+    "Tuesday" : "الثلاثاء",
+    "Wednesday" : "الاربعاء",
+    "Thursday" : "الخميس",
+    "Friday" : "الجمعه",
+    "Saturday" : "السبت",
+    "January" : "كانون الثاني",
+    "February" : "شباط",
+    "March" : "آذار",
+    "April" : "نيسان",
+    "May" : "أيار",
+    "June" : "حزيران",
+    "July" : "تموز",
+    "August" : "آب",
+    "September" : "أيلول",
+    "October" : "تشرين الاول",
+    "November" : "تشرين الثاني",
+    "December" : "كانون الاول",
+    "Settings" : "إعدادات",
+    "File" : "ملف",
+    "Folder" : "مجلد",
+    "Saving..." : "جاري الحفظ...",
+    "Reset password" : "تعديل كلمة السر",
+    "No" : "لا",
+    "Yes" : "نعم",
+    "Choose" : "اختيار",
+    "Ok" : "موافق",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","","","",""],
+    "Cancel" : "الغاء",
+    "Very weak password" : "كلمة السر ضعيفة جدا",
+    "Weak password" : "كلمة السر ضعيفة",
+    "Good password" : "كلمة السر جيدة",
+    "Strong password" : "كلمة السر قوية",
+    "Your web server is not yet properly setup to allow files 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 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." : "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات",
+    "Shared" : "مشارك",
+    "Share" : "شارك",
+    "Error" : "خطأ",
+    "Error while sharing" : "حصل خطأ عند عملية المشاركة",
+    "Error while unsharing" : "حصل خطأ عند عملية إزالة المشاركة",
+    "Error while changing permissions" : "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
+    "Shared with you and the group {group} by {owner}" : "شورك معك ومع المجموعة {group} من قبل {owner}",
+    "Shared with you by {owner}" : "شورك معك من قبل {owner}",
+    "Share link" : "شارك الرابط",
+    "Password protect" : "حماية كلمة السر",
+    "Allow Public Upload" : "اسمح بالرفع للعامة",
+    "Email link to person" : "ارسل الرابط بالبريد الى صديق",
+    "Send" : "أرسل",
+    "Set expiration date" : "تعيين تاريخ إنتهاء الصلاحية",
+    "Expiration date" : "تاريخ إنتهاء الصلاحية",
+    "group" : "مجموعة",
+    "Resharing is not allowed" : "لا يسمح بعملية إعادة المشاركة",
+    "Shared in {item} with {user}" : "شورك في {item} مع {user}",
+    "Unshare" : "إلغاء مشاركة",
+    "can share" : "يمكن المشاركة",
+    "can edit" : "التحرير مسموح",
+    "access control" : "ضبط الوصول",
+    "create" : "إنشاء",
+    "update" : "تحديث",
+    "delete" : "حذف",
+    "Password protected" : "محمي بكلمة السر",
+    "Error unsetting expiration date" : "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
+    "Error setting expiration date" : "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
+    "Sending ..." : "جاري الارسال ...",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Warning" : "تحذير",
+    "The object type is not specified." : "نوع العنصر غير محدد.",
+    "Delete" : "إلغاء",
+    "Add" : "اضف",
+    "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
+    "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
+    "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
+    "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
+    "Username" : "إسم المستخدم",
+    "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري",
+    "New password" : "كلمات سر جديدة",
+    "Personal" : "شخصي",
+    "Users" : "المستخدمين",
+    "Apps" : "التطبيقات",
+    "Admin" : "المدير",
+    "Help" : "المساعدة",
+    "Access forbidden" : "التوصّل محظور",
+    "Security Warning" : "تحذير أمان",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "يرجى تحديث نسخة PHP لاستخدام %s بطريقة آمنة",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
+    "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
+    "Password" : "كلمة المرور",
+    "Data folder" : "مجلد المعلومات",
+    "Configure the database" : "أسس قاعدة البيانات",
+    "Database user" : "مستخدم قاعدة البيانات",
+    "Database password" : "كلمة سر مستخدم قاعدة البيانات",
+    "Database name" : "إسم قاعدة البيانات",
+    "Database tablespace" : "مساحة جدول قاعدة البيانات",
+    "Database host" : "خادم قاعدة البيانات",
+    "Finish setup" : "انهاء التعديلات",
+    "Log out" : "الخروج",
+    "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/ar.php b/core/l10n/ar.php
deleted file mode 100644
index 0f1f613b801..00000000000
--- a/core/l10n/ar.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Updated database" => "قاعدة بيانات المرفوعات",
-"Unknown filetype" => "نوع الملف غير معروف",
-"Invalid image" => "الصورة غير صالحة",
-"Sunday" => "الأحد",
-"Monday" => "الأثنين",
-"Tuesday" => "الثلاثاء",
-"Wednesday" => "الاربعاء",
-"Thursday" => "الخميس",
-"Friday" => "الجمعه",
-"Saturday" => "السبت",
-"January" => "كانون الثاني",
-"February" => "شباط",
-"March" => "آذار",
-"April" => "نيسان",
-"May" => "أيار",
-"June" => "حزيران",
-"July" => "تموز",
-"August" => "آب",
-"September" => "أيلول",
-"October" => "تشرين الاول",
-"November" => "تشرين الثاني",
-"December" => "كانون الاول",
-"Settings" => "إعدادات",
-"File" => "ملف",
-"Folder" => "مجلد",
-"Saving..." => "جاري الحفظ...",
-"Reset password" => "تعديل كلمة السر",
-"No" => "لا",
-"Yes" => "نعم",
-"Choose" => "اختيار",
-"Ok" => "موافق",
-"_{count} file conflict_::_{count} file conflicts_" => array("","","","","",""),
-"Cancel" => "الغاء",
-"Very weak password" => "كلمة السر ضعيفة جدا",
-"Weak password" => "كلمة السر ضعيفة",
-"Good password" => "كلمة السر جيدة",
-"Strong password" => "كلمة السر قوية",
-"Your web server is not yet properly setup to allow files 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 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." => "هذا الخادم لا يوجد لدية اتصال انترنت. هذا يعني ان بعض الميزات مثل mounting التخزين الخارجي , تنبيهات عن التحديثات او تنزيلات برامج الطرف الثالث3  لا تعمل. الدخول للملفات البعيدة و ارسال تنبيهات البريد الالكتروني ممكن ان لا تعمل ايضا. نحن نقترح بتفعيل اتصال الانترنت لهذا الخادم لتتمكن من الاستفادة من كل الميزات",
-"Shared" => "مشارك",
-"Share" => "شارك",
-"Error" => "خطأ",
-"Error while sharing" => "حصل خطأ عند عملية المشاركة",
-"Error while unsharing" => "حصل خطأ عند عملية إزالة المشاركة",
-"Error while changing permissions" => "حصل خطأ عند عملية إعادة تعيين التصريح بالتوصل",
-"Shared with you and the group {group} by {owner}" => "شورك معك ومع المجموعة {group} من قبل {owner}",
-"Shared with you by {owner}" => "شورك معك من قبل {owner}",
-"Share link" => "شارك الرابط",
-"Password protect" => "حماية كلمة السر",
-"Allow Public Upload" => "اسمح بالرفع للعامة",
-"Email link to person" => "ارسل الرابط بالبريد الى صديق",
-"Send" => "أرسل",
-"Set expiration date" => "تعيين تاريخ إنتهاء الصلاحية",
-"Expiration date" => "تاريخ إنتهاء الصلاحية",
-"group" => "مجموعة",
-"Resharing is not allowed" => "لا يسمح بعملية إعادة المشاركة",
-"Shared in {item} with {user}" => "شورك في {item} مع {user}",
-"Unshare" => "إلغاء مشاركة",
-"can share" => "يمكن المشاركة",
-"can edit" => "التحرير مسموح",
-"access control" => "ضبط الوصول",
-"create" => "إنشاء",
-"update" => "تحديث",
-"delete" => "حذف",
-"Password protected" => "محمي بكلمة السر",
-"Error unsetting expiration date" => "حصل خطأ عند عملية إزالة تاريخ إنتهاء الصلاحية",
-"Error setting expiration date" => "حصل خطأ عند عملية تعيين تاريخ إنتهاء الصلاحية",
-"Sending ..." => "جاري الارسال ...",
-"Email sent" => "تم ارسال البريد الالكتروني",
-"Warning" => "تحذير",
-"The object type is not specified." => "نوع العنصر غير محدد.",
-"Delete" => "إلغاء",
-"Add" => "اضف",
-"The update was successful. Redirecting you to ownCloud now." => "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
-"%s password reset" => "تمت إعادة ضبط كلمة مرور %s",
-"Use the following link to reset your password: {link}" => "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
-"You will receive a link to reset your password via Email." => "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-"Username" => "إسم المستخدم",
-"Yes, I really want to reset my password now" => "نعم، أريد إعادة ضبظ كلمة مروري",
-"New password" => "كلمات سر جديدة",
-"Personal" => "شخصي",
-"Users" => "المستخدمين",
-"Apps" => "التطبيقات",
-"Admin" => "المدير",
-"Help" => "المساعدة",
-"Access forbidden" => "التوصّل محظور",
-"Security Warning" => "تحذير أمان",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "يرجى تحديث نسخة PHP لاستخدام %s بطريقة آمنة",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
-"Create an <strong>admin account</strong>" => "أضف </strong>مستخدم رئيسي <strong>",
-"Password" => "كلمة المرور",
-"Data folder" => "مجلد المعلومات",
-"Configure the database" => "أسس قاعدة البيانات",
-"Database user" => "مستخدم قاعدة البيانات",
-"Database password" => "كلمة سر مستخدم قاعدة البيانات",
-"Database name" => "إسم قاعدة البيانات",
-"Database tablespace" => "مساحة جدول قاعدة البيانات",
-"Database host" => "خادم قاعدة البيانات",
-"Finish setup" => "انهاء التعديلات",
-"Log out" => "الخروج",
-"remember" => "تذكر",
-"Log in" => "أدخل",
-"Alternative Logins" => "اسماء دخول بديلة"
-);
-$PLURAL_FORMS = "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
new file mode 100644
index 00000000000..54be6e32d84
--- /dev/null
+++ b/core/l10n/ast.js
@@ -0,0 +1,189 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nun pudo unviase'l corréu a los usuarios siguientes: %s",
+    "Turned on maintenance mode" : "Activáu'l mou de caltenimientu",
+    "Turned off maintenance mode" : "Apagáu'l mou de caltenimientu",
+    "Updated database" : "Base de datos anovada",
+    "Checked database schema update" : "Anovamientu del esquema de base de datos revisáu",
+    "Updated \"%s\" to %s" : "Anováu \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivaes: %s",
+    "No image or file provided" : "Nun s'especificó nenguna imaxe o ficheru",
+    "Unknown filetype" : "Triba de ficheru desconocida",
+    "Invalid image" : "Imaxe inválida",
+    "No temporary profile picture available, try again" : "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
+    "No crop data provided" : "Nun s'apurrió'l retayu de datos",
+    "Sunday" : "Domingu",
+    "Monday" : "Llunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Xueves",
+    "Friday" : "Vienres",
+    "Saturday" : "Sábadu",
+    "January" : "Xineru",
+    "February" : "Febreru",
+    "March" : "Marzu",
+    "April" : "Abril",
+    "May" : "Mayu",
+    "June" : "Xunu",
+    "July" : "Xunetu",
+    "August" : "Agostu",
+    "September" : "Setiembre",
+    "October" : "Ochobre",
+    "November" : "Payares",
+    "December" : "Avientu",
+    "Settings" : "Axustes",
+    "File" : "Ficheru",
+    "Folder" : "Carpeta",
+    "Image" : "Imaxe",
+    "Audio" : "Audiu",
+    "Saving..." : "Guardando...",
+    "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?",
+    "I know what I'm doing" : "Sé lo que toi faciendo",
+    "Reset password" : "Restablecer contraseña",
+    "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
+    "No" : "Non",
+    "Yes" : "Sí",
+    "Choose" : "Esbillar",
+    "Error loading file picker template: {error}" : "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
+    "Ok" : "Aceutar",
+    "Error loading message template: {error}" : "Fallu cargando'l mensaxe de la plantía: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflictu de ficheru","{count} conflictos de ficheru "],
+    "One file conflict" : "Conflictu nun ficheru",
+    "New Files" : "Ficheros nuevos",
+    "Already existing files" : "Ficheros qu'esisten yá",
+    "Which files do you want to keep?" : "¿Qué ficheros quies caltener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleiciones dambes versiones, el ficheru copiáu va tener un númberu amestáu al so nome",
+    "Cancel" : "Encaboxar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(esbillao too)",
+    "({count} selected)" : "(esbillaos {count})",
+    "Error loading file exists template" : "Falu cargando plantía de ficheru esistente",
+    "Very weak password" : "Contraseña mui feble",
+    "Weak password" : "Contraseña feble",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña bona",
+    "Strong password" : "Contraseña mui bona",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
+    "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." : "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
+    "Shared" : "Compartíu",
+    "Shared with {recipients}" : "Compartío con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Fallu",
+    "Error while sharing" : "Fallu mientres la compartición",
+    "Error while unsharing" : "Fallu mientres se dexaba de compartir",
+    "Error while changing permissions" : "Fallu mientres camudaben los permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
+    "Shared with you by {owner}" : "Compartíu contigo por {owner}",
+    "Share with user or group …" : "Compartir col usuariu o grupu ...",
+    "Share link" : "Compartir enllaz",
+    "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
+    "Password protect" : "Protexer con contraseña",
+    "Choose a password for the public link" : "Escueyi una contraseña pal enllaz públicu",
+    "Allow Public Upload" : "Permitir xuba pública",
+    "Email link to person" : "Enllaz de corréu-e a la persona",
+    "Send" : "Unviar",
+    "Set expiration date" : "Afitar la data de caducidá",
+    "Expiration date" : "Data de caducidá",
+    "group" : "grupu",
+    "Resharing is not allowed" : "Recompartir nun ta permitíu",
+    "Shared in {item} with {user}" : "Compartíu en {item} con {user}",
+    "Unshare" : "Dexar de compartir",
+    "notify by email" : "notificar per corréu",
+    "can share" : "pue compartir",
+    "can edit" : "pue editar",
+    "access control" : "control d'accesu",
+    "create" : "crear",
+    "update" : "xubir",
+    "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",
+    "Warning" : "Avisu",
+    "The object type is not specified." : "El tipu d'oxetu nun ta especificáu.",
+    "Enter new" : "Introducir nueva",
+    "Delete" : "Desaniciar",
+    "Add" : "Amestar",
+    "Edit tags" : "Editar etiquetes",
+    "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
+    "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
+    "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
+    "Please reload the page." : "Por favor, recarga la páxina",
+    "The update was unsuccessful." : "L'anovamientu nun foi esitosu.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nun pudo unviase'l corréu. Por favor, asegurate que'l to nome d'usuariu seya correutu",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
+    "Username" : "Nome d'usuariu",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
+    "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora",
+    "Reset" : "Reaniciar",
+    "New password" : "Contraseña nueva",
+    "New Password" : "Contraseña nueva",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicaciones",
+    "Admin" : "Alministrador",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Fallu cargando les etiquetes",
+    "Tag already exists" : "Yá esiste la etiqueta",
+    "Error deleting tag(s)" : "Fallu desaniciando etiqueta(es)",
+    "Error tagging" : "Fallu etiquetando",
+    "Error untagging" : "Fallu al quitar etiquetes",
+    "Error favoriting" : "Fallu al marcar favoritos",
+    "Error unfavoriting" : "Fallu al desmarcar favoritos",
+    "Access forbidden" : "Accesu denegáu",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
+    "The share will expire on %s." : "La compartición va caducar el %s.",
+    "Cheers!" : "¡Salú!",
+    "Security Warning" : "Avisu de seguridá",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
+    "Password" : "Contraseña",
+    "Storage & database" : "Almacenamientu y Base de datos",
+    "Data folder" : "Carpeta de datos",
+    "Configure the database" : "Configura la base de datos",
+    "Only %s is available." : "Namái ta disponible %s",
+    "Database user" : "Usuariu de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nome de la base de datos",
+    "Database tablespace" : "Espaciu de tables de la base de datos",
+    "Database host" : "Agospiador de la base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Va usase SQLite como base de datos. Pa instalaciones más grandes, recomiéndase cambiar esto.",
+    "Finish setup" : "Finar la configuración ",
+    "Finishing …" : "Finando ...",
+    "%s is available. Get more information on how to update." : "Ta disponible %s. Consigui más información en cómo anovar·",
+    "Log out" : "Zarrar sesión",
+    "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
+    "Please contact your administrator." : "Por favor, contauta col to alministrador",
+    "Forgot your password? Reset it!" : "¿Escaeciesti la to contraseña? ¡Reaníciala!",
+    "remember" : "recordar",
+    "Log in" : "Aniciar sesión",
+    "Alternative Logins" : "Anicios de sesión alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
+    "This means only administrators can use the instance." : "Esto quier dicir que namái pue usala un alministrador.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contauta col alministrador si esti problema sigui apaeciendo.",
+    "Thank you for your patience." : "Gracies pola to paciencia.",
+    "You are accessing the server from an untrusted domain." : "Tas accediendo al sirvidor dende un dominiu non confiáu.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contauta col alministrador. Si yes l'alministrador, configura l'axuste \"trusted_domain\" en config/config.php. Hai un exemplu en config/config.sample.php.",
+    "Add \"%s\" as trusted domain" : "Amestáu \"%s\" como dominiu de confianza",
+    "%s will be updated to version %s." : "%s anovaráse a la versión %s.",
+    "The following apps will be disabled:" : "Deshabilitaránse les siguientes aplicaciones:",
+    "The theme %s has been disabled." : "Deshabilitóse'l tema %s.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enantes de siguir, asegúrate de que se fizo una copia de seguridá de la base de datos, la carpeta de configuración y la carpeta de datos.",
+    "Start update" : "Aniciar anovamientu"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
new file mode 100644
index 00000000000..f8e69885e07
--- /dev/null
+++ b/core/l10n/ast.json
@@ -0,0 +1,187 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nun pudo unviase'l corréu a los usuarios siguientes: %s",
+    "Turned on maintenance mode" : "Activáu'l mou de caltenimientu",
+    "Turned off maintenance mode" : "Apagáu'l mou de caltenimientu",
+    "Updated database" : "Base de datos anovada",
+    "Checked database schema update" : "Anovamientu del esquema de base de datos revisáu",
+    "Updated \"%s\" to %s" : "Anováu \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivaes: %s",
+    "No image or file provided" : "Nun s'especificó nenguna imaxe o ficheru",
+    "Unknown filetype" : "Triba de ficheru desconocida",
+    "Invalid image" : "Imaxe inválida",
+    "No temporary profile picture available, try again" : "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
+    "No crop data provided" : "Nun s'apurrió'l retayu de datos",
+    "Sunday" : "Domingu",
+    "Monday" : "Llunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Xueves",
+    "Friday" : "Vienres",
+    "Saturday" : "Sábadu",
+    "January" : "Xineru",
+    "February" : "Febreru",
+    "March" : "Marzu",
+    "April" : "Abril",
+    "May" : "Mayu",
+    "June" : "Xunu",
+    "July" : "Xunetu",
+    "August" : "Agostu",
+    "September" : "Setiembre",
+    "October" : "Ochobre",
+    "November" : "Payares",
+    "December" : "Avientu",
+    "Settings" : "Axustes",
+    "File" : "Ficheru",
+    "Folder" : "Carpeta",
+    "Image" : "Imaxe",
+    "Audio" : "Audiu",
+    "Saving..." : "Guardando...",
+    "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?",
+    "I know what I'm doing" : "Sé lo que toi faciendo",
+    "Reset password" : "Restablecer contraseña",
+    "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
+    "No" : "Non",
+    "Yes" : "Sí",
+    "Choose" : "Esbillar",
+    "Error loading file picker template: {error}" : "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
+    "Ok" : "Aceutar",
+    "Error loading message template: {error}" : "Fallu cargando'l mensaxe de la plantía: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflictu de ficheru","{count} conflictos de ficheru "],
+    "One file conflict" : "Conflictu nun ficheru",
+    "New Files" : "Ficheros nuevos",
+    "Already existing files" : "Ficheros qu'esisten yá",
+    "Which files do you want to keep?" : "¿Qué ficheros quies caltener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleiciones dambes versiones, el ficheru copiáu va tener un númberu amestáu al so nome",
+    "Cancel" : "Encaboxar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(esbillao too)",
+    "({count} selected)" : "(esbillaos {count})",
+    "Error loading file exists template" : "Falu cargando plantía de ficheru esistente",
+    "Very weak password" : "Contraseña mui feble",
+    "Weak password" : "Contraseña feble",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña bona",
+    "Strong password" : "Contraseña mui bona",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
+    "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." : "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
+    "Shared" : "Compartíu",
+    "Shared with {recipients}" : "Compartío con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Fallu",
+    "Error while sharing" : "Fallu mientres la compartición",
+    "Error while unsharing" : "Fallu mientres se dexaba de compartir",
+    "Error while changing permissions" : "Fallu mientres camudaben los permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
+    "Shared with you by {owner}" : "Compartíu contigo por {owner}",
+    "Share with user or group …" : "Compartir col usuariu o grupu ...",
+    "Share link" : "Compartir enllaz",
+    "The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
+    "Password protect" : "Protexer con contraseña",
+    "Choose a password for the public link" : "Escueyi una contraseña pal enllaz públicu",
+    "Allow Public Upload" : "Permitir xuba pública",
+    "Email link to person" : "Enllaz de corréu-e a la persona",
+    "Send" : "Unviar",
+    "Set expiration date" : "Afitar la data de caducidá",
+    "Expiration date" : "Data de caducidá",
+    "group" : "grupu",
+    "Resharing is not allowed" : "Recompartir nun ta permitíu",
+    "Shared in {item} with {user}" : "Compartíu en {item} con {user}",
+    "Unshare" : "Dexar de compartir",
+    "notify by email" : "notificar per corréu",
+    "can share" : "pue compartir",
+    "can edit" : "pue editar",
+    "access control" : "control d'accesu",
+    "create" : "crear",
+    "update" : "xubir",
+    "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",
+    "Warning" : "Avisu",
+    "The object type is not specified." : "El tipu d'oxetu nun ta especificáu.",
+    "Enter new" : "Introducir nueva",
+    "Delete" : "Desaniciar",
+    "Add" : "Amestar",
+    "Edit tags" : "Editar etiquetes",
+    "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
+    "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
+    "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
+    "Please reload the page." : "Por favor, recarga la páxina",
+    "The update was unsuccessful." : "L'anovamientu nun foi esitosu.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nun pudo unviase'l corréu. Por favor, asegurate que'l to nome d'usuariu seya correutu",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
+    "Username" : "Nome d'usuariu",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
+    "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora",
+    "Reset" : "Reaniciar",
+    "New password" : "Contraseña nueva",
+    "New Password" : "Contraseña nueva",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicaciones",
+    "Admin" : "Alministrador",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Fallu cargando les etiquetes",
+    "Tag already exists" : "Yá esiste la etiqueta",
+    "Error deleting tag(s)" : "Fallu desaniciando etiqueta(es)",
+    "Error tagging" : "Fallu etiquetando",
+    "Error untagging" : "Fallu al quitar etiquetes",
+    "Error favoriting" : "Fallu al marcar favoritos",
+    "Error unfavoriting" : "Fallu al desmarcar favoritos",
+    "Access forbidden" : "Accesu denegáu",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
+    "The share will expire on %s." : "La compartición va caducar el %s.",
+    "Cheers!" : "¡Salú!",
+    "Security Warning" : "Avisu de seguridá",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
+    "Password" : "Contraseña",
+    "Storage & database" : "Almacenamientu y Base de datos",
+    "Data folder" : "Carpeta de datos",
+    "Configure the database" : "Configura la base de datos",
+    "Only %s is available." : "Namái ta disponible %s",
+    "Database user" : "Usuariu de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nome de la base de datos",
+    "Database tablespace" : "Espaciu de tables de la base de datos",
+    "Database host" : "Agospiador de la base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Va usase SQLite como base de datos. Pa instalaciones más grandes, recomiéndase cambiar esto.",
+    "Finish setup" : "Finar la configuración ",
+    "Finishing …" : "Finando ...",
+    "%s is available. Get more information on how to update." : "Ta disponible %s. Consigui más información en cómo anovar·",
+    "Log out" : "Zarrar sesión",
+    "Server side authentication failed!" : "Falló l'autenticación nel sirvidor!",
+    "Please contact your administrator." : "Por favor, contauta col to alministrador",
+    "Forgot your password? Reset it!" : "¿Escaeciesti la to contraseña? ¡Reaníciala!",
+    "remember" : "recordar",
+    "Log in" : "Aniciar sesión",
+    "Alternative Logins" : "Anicios de sesión alternativos",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
+    "This means only administrators can use the instance." : "Esto quier dicir que namái pue usala un alministrador.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contauta col alministrador si esti problema sigui apaeciendo.",
+    "Thank you for your patience." : "Gracies pola to paciencia.",
+    "You are accessing the server from an untrusted domain." : "Tas accediendo al sirvidor dende un dominiu non confiáu.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contauta col alministrador. Si yes l'alministrador, configura l'axuste \"trusted_domain\" en config/config.php. Hai un exemplu en config/config.sample.php.",
+    "Add \"%s\" as trusted domain" : "Amestáu \"%s\" como dominiu de confianza",
+    "%s will be updated to version %s." : "%s anovaráse a la versión %s.",
+    "The following apps will be disabled:" : "Deshabilitaránse les siguientes aplicaciones:",
+    "The theme %s has been disabled." : "Deshabilitóse'l tema %s.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Enantes de siguir, asegúrate de que se fizo una copia de seguridá de la base de datos, la carpeta de configuración y la carpeta de datos.",
+    "Start update" : "Aniciar anovamientu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ast.php b/core/l10n/ast.php
deleted file mode 100644
index 43ea5f16b34..00000000000
--- a/core/l10n/ast.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nun pudo unviase'l corréu a los usuarios siguientes: %s",
-"Turned on maintenance mode" => "Activáu'l mou de caltenimientu",
-"Turned off maintenance mode" => "Apagáu'l mou de caltenimientu",
-"Updated database" => "Base de datos anovada",
-"Checked database schema update" => "Anovamientu del esquema de base de datos revisáu",
-"Updated \"%s\" to %s" => "Anováu \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Aplicaciones incompatibles desactivaes: %s",
-"No image or file provided" => "Nun s'especificó nenguna imaxe o ficheru",
-"Unknown filetype" => "Triba de ficheru desconocida",
-"Invalid image" => "Imaxe inválida",
-"No temporary profile picture available, try again" => "Nengún perfil d'imaxe temporal disponible, intentalo de nueves",
-"No crop data provided" => "Nun s'apurrió'l retayu de datos",
-"Sunday" => "Domingu",
-"Monday" => "Llunes",
-"Tuesday" => "Martes",
-"Wednesday" => "Miércoles",
-"Thursday" => "Xueves",
-"Friday" => "Vienres",
-"Saturday" => "Sábadu",
-"January" => "Xineru",
-"February" => "Febreru",
-"March" => "Marzu",
-"April" => "Abril",
-"May" => "Mayu",
-"June" => "Xunu",
-"July" => "Xunetu",
-"August" => "Agostu",
-"September" => "Setiembre",
-"October" => "Ochobre",
-"November" => "Payares",
-"December" => "Avientu",
-"Settings" => "Axustes",
-"File" => "Ficheru",
-"Folder" => "Carpeta",
-"Image" => "Imaxe",
-"Audio" => "Audiu",
-"Saving..." => "Guardando...",
-"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?",
-"I know what I'm doing" => "Sé lo que toi faciendo",
-"Reset password" => "Restablecer contraseña",
-"Password can not be changed. Please contact your administrator." => "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
-"No" => "Non",
-"Yes" => "Sí",
-"Choose" => "Esbillar",
-"Error loading file picker template: {error}" => "Fallu cargando'l ficheru de plantía d'escoyeta: {error}",
-"Ok" => "Aceutar",
-"Error loading message template: {error}" => "Fallu cargando'l mensaxe de la plantía: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflictu de ficheru","{count} conflictos de ficheru "),
-"One file conflict" => "Conflictu nun ficheru",
-"New Files" => "Ficheros nuevos",
-"Already existing files" => "Ficheros qu'esisten yá",
-"Which files do you want to keep?" => "¿Qué ficheros quies caltener?",
-"If you select both versions, the copied file will have a number added to its name." => "Si seleiciones dambes versiones, el ficheru copiáu va tener un númberu amestáu al so nome",
-"Cancel" => "Encaboxar",
-"Continue" => "Continuar",
-"(all selected)" => "(esbillao too)",
-"({count} selected)" => "(esbillaos {count})",
-"Error loading file exists template" => "Falu cargando plantía de ficheru esistente",
-"Very weak password" => "Contraseña mui feble",
-"Weak password" => "Contraseña feble",
-"So-so password" => "Contraseña pasable",
-"Good password" => "Contraseña bona",
-"Strong password" => "Contraseña mui bona",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "El to sirvidor web entá nun ta configuráu afayadizamente pa permitir la sincronización de ficheros porque la interfaz WebDAV paez tar rota.",
-"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." => "Esti sirvidor nun tien conexón a Internet. Esto significa que dalgunes de les carauterístiques nun van funcionar, como'l montaxe d'almacenamiento esternu, les notificaciones sobre anovamientos, la instalación d'aplicaciones de terceros, l'accesu a los ficheros de mou remotu o l'unviu de correos-e de notificación. Suxerimos habilitar una conexón a Internet nesti sirvidor pa esfrutar de toles funciones.",
-"Shared" => "Compartíu",
-"Shared with {recipients}" => "Compartío con {recipients}",
-"Share" => "Compartir",
-"Error" => "Fallu",
-"Error while sharing" => "Fallu mientres la compartición",
-"Error while unsharing" => "Fallu mientres se dexaba de compartir",
-"Error while changing permissions" => "Fallu mientres camudaben los permisos",
-"Shared with you and the group {group} by {owner}" => "Compartíu contigo y col grupu {group} por {owner}",
-"Shared with you by {owner}" => "Compartíu contigo por {owner}",
-"Share with user or group …" => "Compartir col usuariu o grupu ...",
-"Share link" => "Compartir enllaz",
-"The public link will expire no later than {days} days after it is created" => "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
-"Password protect" => "Protexer con contraseña",
-"Choose a password for the public link" => "Escueyi una contraseña pal enllaz públicu",
-"Allow Public Upload" => "Permitir xuba pública",
-"Email link to person" => "Enllaz de corréu-e a la persona",
-"Send" => "Unviar",
-"Set expiration date" => "Afitar la data de caducidá",
-"Expiration date" => "Data de caducidá",
-"group" => "grupu",
-"Resharing is not allowed" => "Recompartir nun ta permitíu",
-"Shared in {item} with {user}" => "Compartíu en {item} con {user}",
-"Unshare" => "Dexar de compartir",
-"notify by email" => "notificar per corréu",
-"can share" => "pue compartir",
-"can edit" => "pue editar",
-"access control" => "control d'accesu",
-"create" => "crear",
-"update" => "xubir",
-"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",
-"Warning" => "Avisu",
-"The object type is not specified." => "El tipu d'oxetu nun ta especificáu.",
-"Enter new" => "Introducir nueva",
-"Delete" => "Desaniciar",
-"Add" => "Amestar",
-"Edit tags" => "Editar etiquetes",
-"Error loading dialog template: {error}" => "Fallu cargando plantía de diálogu: {error}",
-"No tags selected for deletion." => "Nun s'esbillaron etiquetes pa desaniciar.",
-"Updating {productName} to version {version}, this may take a while." => "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
-"Please reload the page." => "Por favor, recarga la páxina",
-"The update was unsuccessful." => "L'anovamientu nun foi esitosu.",
-"The update was successful. Redirecting you to ownCloud now." => "L'anovamientu fízose con ésitu. Redirixiendo agora al to ownCloud.",
-"Couldn't reset password because the token is invalid" => "Nun pudo reaniciase la contraseña porque'l token ye inválidu",
-"Couldn't send reset email. Please make sure your username is correct." => "Nun pudo unviase'l corréu. Por favor, asegurate que'l to nome d'usuariu seya correutu",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
-"%s password reset" => "%s restablecer contraseña",
-"Use the following link to reset your password: {link}" => "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
-"You will receive a link to reset your password via Email." => "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
-"Username" => "Nome d'usuariu",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" => "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
-"Yes, I really want to reset my password now" => "Sí, quiero reaniciar daveres la mio contraseña agora",
-"Reset" => "Reaniciar",
-"New password" => "Contraseña nueva",
-"New Password" => "Contraseña nueva",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
-"For the best results, please consider using a GNU/Linux server instead." => "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
-"Personal" => "Personal",
-"Users" => "Usuarios",
-"Apps" => "Aplicaciones",
-"Admin" => "Alministrador",
-"Help" => "Ayuda",
-"Error loading tags" => "Fallu cargando les etiquetes",
-"Tag already exists" => "Yá esiste la etiqueta",
-"Error deleting tag(s)" => "Fallu desaniciando etiqueta(es)",
-"Error tagging" => "Fallu etiquetando",
-"Error untagging" => "Fallu al quitar etiquetes",
-"Error favoriting" => "Fallu al marcar favoritos",
-"Error unfavoriting" => "Fallu al desmarcar favoritos",
-"Access forbidden" => "Accesu denegáu",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola, ¿qué hai?\n\nnamái déxanos dicite que %s compartió %s contigo.\nVelu: %s\n\n",
-"The share will expire on %s." => "La compartición va caducar el %s.",
-"Cheers!" => "¡Salú!",
-"Security Warning" => "Avisu de seguridá",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La to versión de PHP ye vulnerable al ataque NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor, anova la to instalación de PHP pa usar %s de mou seguru.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crea una <strong>cuenta d'alministrador</strong>",
-"Password" => "Contraseña",
-"Storage & database" => "Almacenamientu y Base de datos",
-"Data folder" => "Carpeta de datos",
-"Configure the database" => "Configura la base de datos",
-"Only %s is available." => "Namái ta disponible %s",
-"Database user" => "Usuariu de la base de datos",
-"Database password" => "Contraseña de la base de datos",
-"Database name" => "Nome de la base de datos",
-"Database tablespace" => "Espaciu de tables de la base de datos",
-"Database host" => "Agospiador de la base de datos",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Va usase SQLite como base de datos. Pa instalaciones más grandes, recomiéndase cambiar esto.",
-"Finish setup" => "Finar la configuración ",
-"Finishing …" => "Finando ...",
-"%s is available. Get more information on how to update." => "Ta disponible %s. Consigui más información en cómo anovar·",
-"Log out" => "Zarrar sesión",
-"Server side authentication failed!" => "Falló l'autenticación nel sirvidor!",
-"Please contact your administrator." => "Por favor, contauta col to alministrador",
-"Forgot your password? Reset it!" => "¿Escaeciesti la to contraseña? ¡Reaníciala!",
-"remember" => "recordar",
-"Log in" => "Aniciar sesión",
-"Alternative Logins" => "Anicios de sesión alternativos",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hola, ¿qué hai?,<br><br>namái déxamos dicite que %s compartió <strong>%s</strong> contigo.\n<br><a href=\"%s\">¡Velu!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Esta instalación d'ownCloud ta en mou d'usuariu únicu.",
-"This means only administrators can use the instance." => "Esto quier dicir que namái pue usala un alministrador.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contauta col alministrador si esti problema sigui apaeciendo.",
-"Thank you for your patience." => "Gracies pola to paciencia.",
-"You are accessing the server from an untrusted domain." => "Tas accediendo al sirvidor dende un dominiu non confiáu.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor, contauta col alministrador. Si yes l'alministrador, configura l'axuste \"trusted_domain\" en config/config.php. Hai un exemplu en config/config.sample.php.",
-"Add \"%s\" as trusted domain" => "Amestáu \"%s\" como dominiu de confianza",
-"%s will be updated to version %s." => "%s anovaráse a la versión %s.",
-"The following apps will be disabled:" => "Deshabilitaránse les siguientes aplicaciones:",
-"The theme %s has been disabled." => "Deshabilitóse'l tema %s.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Enantes de siguir, asegúrate de que se fizo una copia de seguridá de la base de datos, la carpeta de configuración y la carpeta de datos.",
-"Start update" => "Aniciar anovamientu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/az.js b/core/l10n/az.js
new file mode 100644
index 00000000000..c6221df7f2f
--- /dev/null
+++ b/core/l10n/az.js
@@ -0,0 +1,49 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Məktubu göstərilən istifadəçilərə göndərmək mümkün olmadı: %s",
+    "Turned on maintenance mode" : "Xidməti rejimə keçilmişdir",
+    "Turned off maintenance mode" : "Xidməti rejim söndürüldü",
+    "Updated database" : "Yenilənmiş verilənlər bazası",
+    "Checked database schema update" : "Baza sxeminin yenilənməsi yoxlanıldı",
+    "Unknown filetype" : "Fayl tipi bəlli deyil.",
+    "Invalid image" : "Yalnış şəkil",
+    "No temporary profile picture available, try again" : "Profaylın müvəqqəti şəklinə çatmaq mümkün olmadı, yenidən təkrarlayın.",
+    "Sunday" : "Bazar",
+    "Monday" : "Bazar ertəsi",
+    "Settings" : "Quraşdırmalar",
+    "Folder" : "Qovluq",
+    "Saving..." : "Saxlama...",
+    "No" : "Xeyir",
+    "Yes" : "Bəli",
+    "Ok" : "Oldu",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Dayandır",
+    "Very weak password" : "Çox asan şifrə",
+    "Weak password" : "Asan şifrə",
+    "So-so password" : "Elə-belə şifrə",
+    "Good password" : "Yaxşı şifrə",
+    "Strong password" : "Çətin şifrə",
+    "Share" : "Yayımla",
+    "Error" : "Səhv",
+    "Share link" : "Linki yayımla",
+    "Send" : "Göndər",
+    "group" : "qrup",
+    "can share" : "yayımlaya bilərsiniz",
+    "delete" : "sil",
+    "Email sent" : "Məktub göndərildi",
+    "Warning" : "Xəbərdarlıq",
+    "Delete" : "Sil",
+    "Add" : "Əlavə etmək",
+    "Username" : "İstifadəçi adı",
+    "Reset" : "Sıfırla",
+    "Personal" : "Şəxsi",
+    "Users" : "İstifadəçilər",
+    "Admin" : "İnzibatçı",
+    "Help" : "Kömək",
+    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Password" : "Şifrə",
+    "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."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/az.json b/core/l10n/az.json
new file mode 100644
index 00000000000..927cf0ec0b9
--- /dev/null
+++ b/core/l10n/az.json
@@ -0,0 +1,47 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Məktubu göstərilən istifadəçilərə göndərmək mümkün olmadı: %s",
+    "Turned on maintenance mode" : "Xidməti rejimə keçilmişdir",
+    "Turned off maintenance mode" : "Xidməti rejim söndürüldü",
+    "Updated database" : "Yenilənmiş verilənlər bazası",
+    "Checked database schema update" : "Baza sxeminin yenilənməsi yoxlanıldı",
+    "Unknown filetype" : "Fayl tipi bəlli deyil.",
+    "Invalid image" : "Yalnış şəkil",
+    "No temporary profile picture available, try again" : "Profaylın müvəqqəti şəklinə çatmaq mümkün olmadı, yenidən təkrarlayın.",
+    "Sunday" : "Bazar",
+    "Monday" : "Bazar ertəsi",
+    "Settings" : "Quraşdırmalar",
+    "Folder" : "Qovluq",
+    "Saving..." : "Saxlama...",
+    "No" : "Xeyir",
+    "Yes" : "Bəli",
+    "Ok" : "Oldu",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Dayandır",
+    "Very weak password" : "Çox asan şifrə",
+    "Weak password" : "Asan şifrə",
+    "So-so password" : "Elə-belə şifrə",
+    "Good password" : "Yaxşı şifrə",
+    "Strong password" : "Çətin şifrə",
+    "Share" : "Yayımla",
+    "Error" : "Səhv",
+    "Share link" : "Linki yayımla",
+    "Send" : "Göndər",
+    "group" : "qrup",
+    "can share" : "yayımlaya bilərsiniz",
+    "delete" : "sil",
+    "Email sent" : "Məktub göndərildi",
+    "Warning" : "Xəbərdarlıq",
+    "Delete" : "Sil",
+    "Add" : "Əlavə etmək",
+    "Username" : "İstifadəçi adı",
+    "Reset" : "Sıfırla",
+    "Personal" : "Şəxsi",
+    "Users" : "İstifadəçilər",
+    "Admin" : "İnzibatçı",
+    "Help" : "Kömək",
+    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Password" : "Şifrə",
+    "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);"
+}
\ No newline at end of file
diff --git a/core/l10n/az.php b/core/l10n/az.php
deleted file mode 100644
index a2b65e38217..00000000000
--- a/core/l10n/az.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Məktubu göstərilən istifadəçilərə göndərmək mümkün olmadı: %s",
-"Turned on maintenance mode" => "Xidməti rejimə keçilmişdir",
-"Turned off maintenance mode" => "Xidməti rejim söndürüldü",
-"Updated database" => "Yenilənmiş verilənlər bazası",
-"Checked database schema update" => "Baza sxeminin yenilənməsi yoxlanıldı",
-"Unknown filetype" => "Fayl tipi bəlli deyil.",
-"Invalid image" => "Yalnış şəkil",
-"No temporary profile picture available, try again" => "Profaylın müvəqqəti şəklinə çatmaq mümkün olmadı, yenidən təkrarlayın.",
-"Sunday" => "Bazar",
-"Monday" => "Bazar ertəsi",
-"Settings" => "Quraşdırmalar",
-"Folder" => "Qovluq",
-"Saving..." => "Saxlama...",
-"No" => "Xeyir",
-"Yes" => "Bəli",
-"Ok" => "Oldu",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Dayandır",
-"Very weak password" => "Çox asan şifrə",
-"Weak password" => "Asan şifrə",
-"So-so password" => "Elə-belə şifrə",
-"Good password" => "Yaxşı şifrə",
-"Strong password" => "Çətin şifrə",
-"Share" => "Yayımla",
-"Error" => "Səhv",
-"Share link" => "Linki yayımla",
-"Send" => "Göndər",
-"group" => "qrup",
-"can share" => "yayımlaya bilərsiniz",
-"delete" => "sil",
-"Email sent" => "Məktub göndərildi",
-"Warning" => "Xəbərdarlıq",
-"Delete" => "Sil",
-"Add" => "Əlavə etmək",
-"Username" => "İstifadəçi adı",
-"Reset" => "Sıfırla",
-"Personal" => "Şəxsi",
-"Users" => "İstifadəçilər",
-"Admin" => "İnzibatçı",
-"Help" => "Kömək",
-"Security Warning" => "Təhlükəsizlik xəbərdarlığı",
-"Password" => "Şifrə",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/be.js b/core/l10n/be.js
new file mode 100644
index 00000000000..4f00b1f6d71
--- /dev/null
+++ b/core/l10n/be.js
@@ -0,0 +1,33 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Нядзеля",
+    "Monday" : "Панядзелак",
+    "Tuesday" : "Аўторак",
+    "Wednesday" : "Серада",
+    "Thursday" : "Чацвер",
+    "Friday" : "Пятніца",
+    "Saturday" : "Субота",
+    "January" : "Студзень",
+    "February" : "Люты",
+    "March" : "Сакавік",
+    "April" : "Красавік",
+    "May" : "Май",
+    "June" : "Чэрвень",
+    "July" : "Ліпень",
+    "August" : "Жнівень",
+    "September" : "Верасень",
+    "October" : "Кастрычнік",
+    "November" : "Лістапад",
+    "December" : "Снежань",
+    "Settings" : "Налады",
+    "No" : "Не",
+    "Yes" : "Так",
+    "Choose" : "Выбар",
+    "Ok" : "Добра",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "Error" : "Памылка",
+    "The object type is not specified." : "Тып аб'екта не ўдакладняецца.",
+    "Finish setup" : "Завяршыць ўстаноўку."
+},
+"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/be.json b/core/l10n/be.json
new file mode 100644
index 00000000000..b055f53ad2b
--- /dev/null
+++ b/core/l10n/be.json
@@ -0,0 +1,31 @@
+{ "translations": {
+    "Sunday" : "Нядзеля",
+    "Monday" : "Панядзелак",
+    "Tuesday" : "Аўторак",
+    "Wednesday" : "Серада",
+    "Thursday" : "Чацвер",
+    "Friday" : "Пятніца",
+    "Saturday" : "Субота",
+    "January" : "Студзень",
+    "February" : "Люты",
+    "March" : "Сакавік",
+    "April" : "Красавік",
+    "May" : "Май",
+    "June" : "Чэрвень",
+    "July" : "Ліпень",
+    "August" : "Жнівень",
+    "September" : "Верасень",
+    "October" : "Кастрычнік",
+    "November" : "Лістапад",
+    "December" : "Снежань",
+    "Settings" : "Налады",
+    "No" : "Не",
+    "Yes" : "Так",
+    "Choose" : "Выбар",
+    "Ok" : "Добра",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "Error" : "Памылка",
+    "The object type is not specified." : "Тып аб'екта не ўдакладняецца.",
+    "Finish setup" : "Завяршыць ўстаноўку."
+},"pluralForm" :"nplurals=4; 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/be.php b/core/l10n/be.php
deleted file mode 100644
index cf0e5e0c59b..00000000000
--- a/core/l10n/be.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Нядзеля",
-"Monday" => "Панядзелак",
-"Tuesday" => "Аўторак",
-"Wednesday" => "Серада",
-"Thursday" => "Чацвер",
-"Friday" => "Пятніца",
-"Saturday" => "Субота",
-"January" => "Студзень",
-"February" => "Люты",
-"March" => "Сакавік",
-"April" => "Красавік",
-"May" => "Май",
-"June" => "Чэрвень",
-"July" => "Ліпень",
-"August" => "Жнівень",
-"September" => "Верасень",
-"October" => "Кастрычнік",
-"November" => "Лістапад",
-"December" => "Снежань",
-"Settings" => "Налады",
-"No" => "Не",
-"Yes" => "Так",
-"Choose" => "Выбар",
-"Ok" => "Добра",
-"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
-"Error" => "Памылка",
-"The object type is not specified." => "Тып аб'екта не ўдакладняецца.",
-"Finish setup" => "Завяршыць ўстаноўку."
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
new file mode 100644
index 00000000000..e99c1be0532
--- /dev/null
+++ b/core/l10n/bg_BG.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Неуспешно изпращане на имейл до следните потребители: %s.",
+    "Turned on maintenance mode" : "Режим за поддръжка включен.",
+    "Turned off maintenance mode" : "Режим за поддръжка изключен.",
+    "Updated database" : "Базата данни обоновена.",
+    "Checked database schema update" : "Промяна на схемата на базата данни проверена.",
+    "Checked database schema update for apps" : "Промяна на схемата на базата данни за приложения проверена.",
+    "Updated \"%s\" to %s" : "Обновен \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Изключени са несъвместимите програми: %s.",
+    "No image or file provided" : "Нито Изображение, нито файл бяха зададени.",
+    "Unknown filetype" : "Непознат тип файл.",
+    "Invalid image" : "Невалидно изображение.",
+    "No temporary profile picture available, try again" : "Липсва временен аватар, опитай отново.",
+    "No crop data provided" : "Липсва информация за клъцването.",
+    "Sunday" : "Неделя",
+    "Monday" : "Понеделник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Сряда",
+    "Thursday" : "Четвъртък",
+    "Friday" : "Петък",
+    "Saturday" : "Събота",
+    "January" : "Януари",
+    "February" : "Февруари",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Май",
+    "June" : "Юни",
+    "July" : "Юли",
+    "August" : "Август",
+    "September" : "Септември",
+    "October" : "Октомври",
+    "November" : "Ноември",
+    "December" : "Декември",
+    "Settings" : "Настройки",
+    "File" : "Файл",
+    "Folder" : "Папка",
+    "Image" : "Изображение",
+    "Audio" : "Аудио",
+    "Saving..." : "Записване...",
+    "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/>Наистина ли си сигурен, че искаш да продължиш?",
+    "I know what I'm doing" : "Знам какво правя!",
+    "Reset password" : "Възстановяване на парола",
+    "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Избери",
+    "Error loading file picker template: {error}" : "Грешка при зареждането на шаблон за избор на файл: {error}",
+    "Ok" : "Добре",
+    "Error loading message template: {error}" : "Грешка при зареждането на шаблон за съобщения: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файлов проблем","{count} файлови проблема"],
+    "One file conflict" : "Един файлов проблем",
+    "New Files" : "Нови файлове",
+    "Already existing files" : "Вече съществуващи файлове",
+    "Which files do you want to keep?" : "Кои файлове желаеш да запазиш?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ако избереш и двете версии, към името на копирания файл ще бъде добавено число.",
+    "Cancel" : "Отказ",
+    "Continue" : "Продължи",
+    "(all selected)" : "(всички избрани)",
+    "({count} selected)" : "({count} избрани)",
+    "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуваш файл.",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "So-so password" : "Не особено добра парола",
+    "Good password" : "Добра парола",
+    "Strong password" : "Сигурна парола",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Твоят web сървър все още не е правилно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
+    "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." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+    "Error occurred while checking server setup" : "Настъпи грешка при проверката на настройките на сървъра.",
+    "Shared" : "Споделено",
+    "Shared with {recipients}" : "Споделено с {recipients}.",
+    "Share" : "Споделяне",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделянето.",
+    "Error while unsharing" : "Грешка докато се премахва споделянето.",
+    "Error while changing permissions" : "Грешка при промяна на достъпа.",
+    "Shared with you and the group {group} by {owner}" : "Споделено с теб и група {group} от {owner}.",
+    "Shared with you by {owner}" : "Споделено с теб от {owner}.",
+    "Share with user or group …" : "Сподели с потребител или група...",
+    "Share link" : "Връзка за споделяне",
+    "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дена след създаването й.",
+    "Password protect" : "Защитено с парола",
+    "Choose a password for the public link" : "Избери парола за общодостъпната връзка",
+    "Allow Public Upload" : "Разреши Общодостъпно Качване",
+    "Email link to person" : "Изпрати връзка до нечия пощата",
+    "Send" : "Изпрати",
+    "Set expiration date" : "Посочи дата на изтичане",
+    "Expiration date" : "Дата на изтичане",
+    "Adding user..." : "Добавяне на потребител...",
+    "group" : "група",
+    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
+    "Shared in {item} with {user}" : "Споделено в {item} с {user}.",
+    "Unshare" : "Премахни споделяне",
+    "notify by email" : "уведоми по имейла",
+    "can share" : "може да споделя",
+    "can edit" : "може да променя",
+    "access control" : "контрол на достъпа",
+    "create" : "Създаване",
+    "update" : "Обновяване",
+    "delete" : "изтрий",
+    "Password protected" : "Защитено с парола",
+    "Error unsetting expiration date" : "Грешка при премахване на дата за изтичане",
+    "Error setting expiration date" : "Грешка при поставяне на дата за изтичане",
+    "Sending ..." : "Изпращане ...",
+    "Email sent" : "Имейла е изпратен",
+    "Warning" : "Предупреждение",
+    "The object type is not specified." : "Видът на обекта не е избран.",
+    "Enter new" : "Въведи нов",
+    "Delete" : "Изтрий",
+    "Add" : "Добавяне",
+    "Edit tags" : "Промяна на етикетите",
+    "Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
+    "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. Redirecting you to ownCloud now." : "Обновяването е успешно. Пренасочване към твоя ownCloud сега.",
+    "Couldn't reset password because the token is invalid" : "Невалиден линк за промяна на паролата.",
+    "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 е променена.",
+    "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
+    "You will receive a link to reset your password via Email." : "Ще получиш връзка за възстановяване на паролата посредством емейл.",
+    "Username" : "Потребител",
+    "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?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?",
+    "Yes, I really want to reset my password now" : "Да, наистина желая да възстановя паролата си сега.",
+    "Reset" : "Възстанови",
+    "New password" : "Нова парола",
+    "New Password" : "Нова Парола",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
+    "Personal" : "Лични",
+    "Users" : "Потребители",
+    "Apps" : "Приложения",
+    "Admin" : "Админ",
+    "Help" : "Помощ",
+    "Error loading tags" : "Грешка при зареждане на етикети.",
+    "Tag already exists" : "Етикетите вече съществуват.",
+    "Error deleting tag(s)" : "Грешка при изтриване на етикет(и).",
+    "Error tagging" : "Грешка при задаване на етикета.",
+    "Error untagging" : "Грешка при премахване на етикета.",
+    "Error favoriting" : "Грешка при отбелязване за любим.",
+    "Error unfavoriting" : "Грешка при премахване отбелязването за любим.",
+    "Access forbidden" : "Достъпът е забранен",
+    "File not found" : "Файлът не е открит.",
+    "The specified document has not been found on the server." : "Избраният документ не е намерн на сървъра.",
+    "You can click here to return to %s." : "Можеш да натиснеш тук, за да се върнеш на %s",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здрасти,\n\nсамо да те уведомя, че %s сподели %s с теб.\nРазгледай го: %s\n\n",
+    "The share will expire on %s." : "Споделянето ще изтече на %s.",
+    "Cheers!" : "Поздрави!",
+    "Internal Server Error" : "Вътрешна системна грешка",
+    "The server encountered an internal error and was unable to complete your request." : "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
+    "More details can be found in the server log." : "Допълнителна информация може да бъде открита в сървърните доклади.",
+    "Technical details" : "Техническа информация",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Предупреждение за Сигурноста",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Твоята PHP версия е податлива на NULL Byte атака (CVE-2006-7243).",
+    "Please update your PHP installation to use %s securely." : "Моля, обнови своята PHP инсталация, за да използваш %s сигурно.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
+    "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
+    "Password" : "Парола",
+    "Storage & database" : "Дисково пространство и база данни",
+    "Data folder" : "Директория за данни",
+    "Configure the database" : "Конфигуриране на базата данни",
+    "Only %s is available." : "Само %s е достъпен.",
+    "Database user" : "Потребител за базата данни",
+    "Database password" : "Парола за базата данни",
+    "Database name" : "Име на базата данни",
+    "Database tablespace" : "Tablespace-а за базата данни",
+    "Database host" : "Хост за базата данни",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite ще бъде използван за база данни. За по-големи инсталации препоръчваме това да бъде променено.",
+    "Finish setup" : "Завършване на настройките",
+    "Finishing …" : "Завършване...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Програмата изисква JavaScript, за да функционира правилно. Моля, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включи JavaScript</a> и презареди страницата.",
+    "%s is available. Get more information on how to update." : "%s е на разположение. Прочети повече как да обновиш. ",
+    "Log out" : "Отписване",
+    "Server side authentication failed!" : "Заверяването в сървъра неуспешно!",
+    "Please contact your administrator." : "Моля, свържи се с админстратора.",
+    "Forgot your password? Reset it!" : "Забрави паролата? Възстанови я!",
+    "remember" : "запомни",
+    "Log in" : "Вписване",
+    "Alternative Logins" : "Други Потребителски Имена",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
+    "This ownCloud instance is currently in single user mode." : "В момента този ownCloud е в режим допускащ само един потребител.",
+    "This means only administrators can use the instance." : "Това означава, че само администраторът може да го използва.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Свържи се със системния си администратор ако това съобщение се задържи твърде дълго или се е появило неочаквано.",
+    "Thank you for your patience." : "Благодарим за търпението.",
+    "You are accessing the server from an untrusted domain." : "Свръзваш се със сървъра от неодобрен домейн.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Моля, свържи се с администратора. Ако ти си администраторът, на този сървър, промени \"trusted_domain\" настройките в  config/config.php. Примерна конфигурация е приложена в config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимост от конфигурацията ти, като администратор може натискайки бутонът по-долу да отбележиш домейнът като сигурен.",
+    "Add \"%s\" as trusted domain" : "Добави \"%s\" като сигурен домейн",
+    "%s will be updated to version %s." : "%s ще бъде обновена до версия %s.",
+    "The following apps will be disabled:" : "Следните програми ще бъдат изключени:",
+    "The theme %s has been disabled." : "Темата %s бе изключена.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Моля, увери се, че си направил копия на базата данни, папките с настройки и данни, преди да продължиш.",
+    "Start update" : "Започни обновяването",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "За да избегнеш таймаутове при по-големи инсталации, можеш да изпълниш следните команди в инсталанционната директория:",
+    "This %s instance is currently being updated, which may take a while." : "В момента този %s се обновява, а това може да отнеме време.",
+    "This page will refresh itself when the %s instance is available again." : "Тази страница ще се опресни автоматично, когато %s е отново на линия."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
new file mode 100644
index 00000000000..c918fe20618
--- /dev/null
+++ b/core/l10n/bg_BG.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Неуспешно изпращане на имейл до следните потребители: %s.",
+    "Turned on maintenance mode" : "Режим за поддръжка включен.",
+    "Turned off maintenance mode" : "Режим за поддръжка изключен.",
+    "Updated database" : "Базата данни обоновена.",
+    "Checked database schema update" : "Промяна на схемата на базата данни проверена.",
+    "Checked database schema update for apps" : "Промяна на схемата на базата данни за приложения проверена.",
+    "Updated \"%s\" to %s" : "Обновен \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Изключени са несъвместимите програми: %s.",
+    "No image or file provided" : "Нито Изображение, нито файл бяха зададени.",
+    "Unknown filetype" : "Непознат тип файл.",
+    "Invalid image" : "Невалидно изображение.",
+    "No temporary profile picture available, try again" : "Липсва временен аватар, опитай отново.",
+    "No crop data provided" : "Липсва информация за клъцването.",
+    "Sunday" : "Неделя",
+    "Monday" : "Понеделник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Сряда",
+    "Thursday" : "Четвъртък",
+    "Friday" : "Петък",
+    "Saturday" : "Събота",
+    "January" : "Януари",
+    "February" : "Февруари",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Май",
+    "June" : "Юни",
+    "July" : "Юли",
+    "August" : "Август",
+    "September" : "Септември",
+    "October" : "Октомври",
+    "November" : "Ноември",
+    "December" : "Декември",
+    "Settings" : "Настройки",
+    "File" : "Файл",
+    "Folder" : "Папка",
+    "Image" : "Изображение",
+    "Audio" : "Аудио",
+    "Saving..." : "Записване...",
+    "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/>Наистина ли си сигурен, че искаш да продължиш?",
+    "I know what I'm doing" : "Знам какво правя!",
+    "Reset password" : "Възстановяване на парола",
+    "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Избери",
+    "Error loading file picker template: {error}" : "Грешка при зареждането на шаблон за избор на файл: {error}",
+    "Ok" : "Добре",
+    "Error loading message template: {error}" : "Грешка при зареждането на шаблон за съобщения: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файлов проблем","{count} файлови проблема"],
+    "One file conflict" : "Един файлов проблем",
+    "New Files" : "Нови файлове",
+    "Already existing files" : "Вече съществуващи файлове",
+    "Which files do you want to keep?" : "Кои файлове желаеш да запазиш?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ако избереш и двете версии, към името на копирания файл ще бъде добавено число.",
+    "Cancel" : "Отказ",
+    "Continue" : "Продължи",
+    "(all selected)" : "(всички избрани)",
+    "({count} selected)" : "({count} избрани)",
+    "Error loading file exists template" : "Грешка при зареждането на шаблон за вече съществуваш файл.",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "So-so password" : "Не особено добра парола",
+    "Good password" : "Добра парола",
+    "Strong password" : "Сигурна парола",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Твоят web сървър все още не е правилно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
+    "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." : "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
+    "Error occurred while checking server setup" : "Настъпи грешка при проверката на настройките на сървъра.",
+    "Shared" : "Споделено",
+    "Shared with {recipients}" : "Споделено с {recipients}.",
+    "Share" : "Споделяне",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделянето.",
+    "Error while unsharing" : "Грешка докато се премахва споделянето.",
+    "Error while changing permissions" : "Грешка при промяна на достъпа.",
+    "Shared with you and the group {group} by {owner}" : "Споделено с теб и група {group} от {owner}.",
+    "Shared with you by {owner}" : "Споделено с теб от {owner}.",
+    "Share with user or group …" : "Сподели с потребител или група...",
+    "Share link" : "Връзка за споделяне",
+    "The public link will expire no later than {days} days after it is created" : "Общодостъпната връзка ще изтече не по-късно от {days} дена след създаването й.",
+    "Password protect" : "Защитено с парола",
+    "Choose a password for the public link" : "Избери парола за общодостъпната връзка",
+    "Allow Public Upload" : "Разреши Общодостъпно Качване",
+    "Email link to person" : "Изпрати връзка до нечия пощата",
+    "Send" : "Изпрати",
+    "Set expiration date" : "Посочи дата на изтичане",
+    "Expiration date" : "Дата на изтичане",
+    "Adding user..." : "Добавяне на потребител...",
+    "group" : "група",
+    "Resharing is not allowed" : "Повторно споделяне не е разрешено.",
+    "Shared in {item} with {user}" : "Споделено в {item} с {user}.",
+    "Unshare" : "Премахни споделяне",
+    "notify by email" : "уведоми по имейла",
+    "can share" : "може да споделя",
+    "can edit" : "може да променя",
+    "access control" : "контрол на достъпа",
+    "create" : "Създаване",
+    "update" : "Обновяване",
+    "delete" : "изтрий",
+    "Password protected" : "Защитено с парола",
+    "Error unsetting expiration date" : "Грешка при премахване на дата за изтичане",
+    "Error setting expiration date" : "Грешка при поставяне на дата за изтичане",
+    "Sending ..." : "Изпращане ...",
+    "Email sent" : "Имейла е изпратен",
+    "Warning" : "Предупреждение",
+    "The object type is not specified." : "Видът на обекта не е избран.",
+    "Enter new" : "Въведи нов",
+    "Delete" : "Изтрий",
+    "Add" : "Добавяне",
+    "Edit tags" : "Промяна на етикетите",
+    "Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
+    "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. Redirecting you to ownCloud now." : "Обновяването е успешно. Пренасочване към твоя ownCloud сега.",
+    "Couldn't reset password because the token is invalid" : "Невалиден линк за промяна на паролата.",
+    "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 е променена.",
+    "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
+    "You will receive a link to reset your password via Email." : "Ще получиш връзка за възстановяване на паролата посредством емейл.",
+    "Username" : "Потребител",
+    "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?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?",
+    "Yes, I really want to reset my password now" : "Да, наистина желая да възстановя паролата си сега.",
+    "Reset" : "Възстанови",
+    "New password" : "Нова парола",
+    "New Password" : "Нова Парола",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
+    "Personal" : "Лични",
+    "Users" : "Потребители",
+    "Apps" : "Приложения",
+    "Admin" : "Админ",
+    "Help" : "Помощ",
+    "Error loading tags" : "Грешка при зареждане на етикети.",
+    "Tag already exists" : "Етикетите вече съществуват.",
+    "Error deleting tag(s)" : "Грешка при изтриване на етикет(и).",
+    "Error tagging" : "Грешка при задаване на етикета.",
+    "Error untagging" : "Грешка при премахване на етикета.",
+    "Error favoriting" : "Грешка при отбелязване за любим.",
+    "Error unfavoriting" : "Грешка при премахване отбелязването за любим.",
+    "Access forbidden" : "Достъпът е забранен",
+    "File not found" : "Файлът не е открит.",
+    "The specified document has not been found on the server." : "Избраният документ не е намерн на сървъра.",
+    "You can click here to return to %s." : "Можеш да натиснеш тук, за да се върнеш на %s",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здрасти,\n\nсамо да те уведомя, че %s сподели %s с теб.\nРазгледай го: %s\n\n",
+    "The share will expire on %s." : "Споделянето ще изтече на %s.",
+    "Cheers!" : "Поздрави!",
+    "Internal Server Error" : "Вътрешна системна грешка",
+    "The server encountered an internal error and was unable to complete your request." : "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
+    "More details can be found in the server log." : "Допълнителна информация може да бъде открита в сървърните доклади.",
+    "Technical details" : "Техническа информация",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Предупреждение за Сигурноста",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Твоята PHP версия е податлива на NULL Byte атака (CVE-2006-7243).",
+    "Please update your PHP installation to use %s securely." : "Моля, обнови своята PHP инсталация, за да използваш %s сигурно.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
+    "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
+    "Password" : "Парола",
+    "Storage & database" : "Дисково пространство и база данни",
+    "Data folder" : "Директория за данни",
+    "Configure the database" : "Конфигуриране на базата данни",
+    "Only %s is available." : "Само %s е достъпен.",
+    "Database user" : "Потребител за базата данни",
+    "Database password" : "Парола за базата данни",
+    "Database name" : "Име на базата данни",
+    "Database tablespace" : "Tablespace-а за базата данни",
+    "Database host" : "Хост за базата данни",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite ще бъде използван за база данни. За по-големи инсталации препоръчваме това да бъде променено.",
+    "Finish setup" : "Завършване на настройките",
+    "Finishing …" : "Завършване...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Програмата изисква JavaScript, за да функционира правилно. Моля, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включи JavaScript</a> и презареди страницата.",
+    "%s is available. Get more information on how to update." : "%s е на разположение. Прочети повече как да обновиш. ",
+    "Log out" : "Отписване",
+    "Server side authentication failed!" : "Заверяването в сървъра неуспешно!",
+    "Please contact your administrator." : "Моля, свържи се с админстратора.",
+    "Forgot your password? Reset it!" : "Забрави паролата? Възстанови я!",
+    "remember" : "запомни",
+    "Log in" : "Вписване",
+    "Alternative Logins" : "Други Потребителски Имена",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
+    "This ownCloud instance is currently in single user mode." : "В момента този ownCloud е в режим допускащ само един потребител.",
+    "This means only administrators can use the instance." : "Това означава, че само администраторът може да го използва.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Свържи се със системния си администратор ако това съобщение се задържи твърде дълго или се е появило неочаквано.",
+    "Thank you for your patience." : "Благодарим за търпението.",
+    "You are accessing the server from an untrusted domain." : "Свръзваш се със сървъра от неодобрен домейн.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Моля, свържи се с администратора. Ако ти си администраторът, на този сървър, промени \"trusted_domain\" настройките в  config/config.php. Примерна конфигурация е приложена в config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимост от конфигурацията ти, като администратор може натискайки бутонът по-долу да отбележиш домейнът като сигурен.",
+    "Add \"%s\" as trusted domain" : "Добави \"%s\" като сигурен домейн",
+    "%s will be updated to version %s." : "%s ще бъде обновена до версия %s.",
+    "The following apps will be disabled:" : "Следните програми ще бъдат изключени:",
+    "The theme %s has been disabled." : "Темата %s бе изключена.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Моля, увери се, че си направил копия на базата данни, папките с настройки и данни, преди да продължиш.",
+    "Start update" : "Започни обновяването",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "За да избегнеш таймаутове при по-големи инсталации, можеш да изпълниш следните команди в инсталанционната директория:",
+    "This %s instance is currently being updated, which may take a while." : "В момента този %s се обновява, а това може да отнеме време.",
+    "This page will refresh itself when the %s instance is available again." : "Тази страница ще се опресни автоматично, когато %s е отново на линия."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/bg_BG.php b/core/l10n/bg_BG.php
deleted file mode 100644
index 717eba17d6c..00000000000
--- a/core/l10n/bg_BG.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Неуспешно изпращане на имейл до следните потребители: %s.",
-"Turned on maintenance mode" => "Режим за поддръжка включен.",
-"Turned off maintenance mode" => "Режим за поддръжка изключен.",
-"Updated database" => "Базата данни обоновена.",
-"Checked database schema update" => "Промяна на схемата на базата данни проверена.",
-"Checked database schema update for apps" => "Промяна на схемата на базата данни за приложения проверена.",
-"Updated \"%s\" to %s" => "Обновен \"%s\" до %s",
-"Disabled incompatible apps: %s" => "Изключени са несъвместимите програми: %s.",
-"No image or file provided" => "Нито Изображение, нито файл бяха зададени.",
-"Unknown filetype" => "Непознат тип файл.",
-"Invalid image" => "Невалидно изображение.",
-"No temporary profile picture available, try again" => "Липсва временен аватар, опитай отново.",
-"No crop data provided" => "Липсва информация за клъцването.",
-"Sunday" => "Неделя",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Сряда",
-"Thursday" => "Четвъртък",
-"Friday" => "Петък",
-"Saturday" => "Събота",
-"January" => "Януари",
-"February" => "Февруари",
-"March" => "Март",
-"April" => "Април",
-"May" => "Май",
-"June" => "Юни",
-"July" => "Юли",
-"August" => "Август",
-"September" => "Септември",
-"October" => "Октомври",
-"November" => "Ноември",
-"December" => "Декември",
-"Settings" => "Настройки",
-"File" => "Файл",
-"Folder" => "Папка",
-"Image" => "Изображение",
-"Audio" => "Аудио",
-"Saving..." => "Записване...",
-"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/>Наистина ли си сигурен, че искаш да продължиш?",
-"I know what I'm doing" => "Знам какво правя!",
-"Reset password" => "Възстановяване на парола",
-"Password can not be changed. Please contact your administrator." => "Паролата не може да бъде промена. Моля, свържи се с администратора.",
-"No" => "Не",
-"Yes" => "Да",
-"Choose" => "Избери",
-"Error loading file picker template: {error}" => "Грешка при зареждането на шаблон за избор на файл: {error}",
-"Ok" => "Добре",
-"Error loading message template: {error}" => "Грешка при зареждането на шаблон за съобщения: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} файлов проблем","{count} файлови проблема"),
-"One file conflict" => "Един файлов проблем",
-"New Files" => "Нови файлове",
-"Already existing files" => "Вече съществуващи файлове",
-"Which files do you want to keep?" => "Кои файлове желаеш да запазиш?",
-"If you select both versions, the copied file will have a number added to its name." => "Ако избереш и двете версии, към името на копирания файл ще бъде добавено число.",
-"Cancel" => "Отказ",
-"Continue" => "Продължи",
-"(all selected)" => "(всички избрани)",
-"({count} selected)" => "({count} избрани)",
-"Error loading file exists template" => "Грешка при зареждането на шаблон за вече съществуваш файл.",
-"Very weak password" => "Много слаба парола",
-"Weak password" => "Слаба парола",
-"So-so password" => "Не особено добра парола",
-"Good password" => "Добра парола",
-"Strong password" => "Сигурна парола",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Твоят web сървър все още не е правилно настроен да позволява синхронизация на файлове, защото WebDAV интерфейсът изглежда не работи.",
-"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." => "Сървърът няма работеща интернет връзка. Това означава, че някои функции като прикачването на външни дискови устройства, уведомления за обновяване или инсталиране на външни приложения няма да работят. Достъпът на файлове отвън или изпращане на имейли за уведомление вероятно също няма да работят. Препоръчваме да включиш интернет връзката за този сървър ако искаш да използваш всички тези функции.",
-"Error occurred while checking server setup" => "Настъпи грешка при проверката на настройките на сървъра.",
-"Shared" => "Споделено",
-"Shared with {recipients}" => "Споделено с {recipients}.",
-"Share" => "Споделяне",
-"Error" => "Грешка",
-"Error while sharing" => "Грешка при споделянето.",
-"Error while unsharing" => "Грешка докато се премахва споделянето.",
-"Error while changing permissions" => "Грешка при промяна на достъпа.",
-"Shared with you and the group {group} by {owner}" => "Споделено с теб и група {group} от {owner}.",
-"Shared with you by {owner}" => "Споделено с теб от {owner}.",
-"Share with user or group …" => "Сподели с потребител или група...",
-"Share link" => "Връзка за споделяне",
-"The public link will expire no later than {days} days after it is created" => "Общодостъпната връзка ще изтече не по-късно от {days} дена след създаването й.",
-"Password protect" => "Защитено с парола",
-"Choose a password for the public link" => "Избери парола за общодостъпната връзка",
-"Allow Public Upload" => "Разреши Общодостъпно Качване",
-"Email link to person" => "Изпрати връзка до нечия пощата",
-"Send" => "Изпрати",
-"Set expiration date" => "Посочи дата на изтичане",
-"Expiration date" => "Дата на изтичане",
-"Adding user..." => "Добавяне на потребител...",
-"group" => "група",
-"Resharing is not allowed" => "Повторно споделяне не е разрешено.",
-"Shared in {item} with {user}" => "Споделено в {item} с {user}.",
-"Unshare" => "Премахни споделяне",
-"notify by email" => "уведоми по имейла",
-"can share" => "може да споделя",
-"can edit" => "може да променя",
-"access control" => "контрол на достъпа",
-"create" => "Създаване",
-"update" => "Обновяване",
-"delete" => "изтрий",
-"Password protected" => "Защитено с парола",
-"Error unsetting expiration date" => "Грешка при премахване на дата за изтичане",
-"Error setting expiration date" => "Грешка при поставяне на дата за изтичане",
-"Sending ..." => "Изпращане ...",
-"Email sent" => "Имейла е изпратен",
-"Warning" => "Предупреждение",
-"The object type is not specified." => "Видът на обекта не е избран.",
-"Enter new" => "Въведи нов",
-"Delete" => "Изтрий",
-"Add" => "Добавяне",
-"Edit tags" => "Промяна на етикетите",
-"Error loading dialog template: {error}" => "Грешка при зареждането на шаблоn за диалог: {error}.",
-"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. Redirecting you to ownCloud now." => "Обновяването е успешно. Пренасочване към твоя ownCloud сега.",
-"Couldn't reset password because the token is invalid" => "Невалиден линк за промяна на паролата.",
-"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 е променена.",
-"Use the following link to reset your password: {link}" => "Използвай следната връзка, за да възстановиш паролата си: {link}",
-"You will receive a link to reset your password via Email." => "Ще получиш връзка за възстановяване на паролата посредством емейл.",
-"Username" => "Потребител",
-"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?" => "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?",
-"Yes, I really want to reset my password now" => "Да, наистина желая да възстановя паролата си сега.",
-"Reset" => "Възстанови",
-"New password" => "Нова парола",
-"New Password" => "Нова Парола",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
-"For the best results, please consider using a GNU/Linux server instead." => "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
-"Personal" => "Лични",
-"Users" => "Потребители",
-"Apps" => "Приложения",
-"Admin" => "Админ",
-"Help" => "Помощ",
-"Error loading tags" => "Грешка при зареждане на етикети.",
-"Tag already exists" => "Етикетите вече съществуват.",
-"Error deleting tag(s)" => "Грешка при изтриване на етикет(и).",
-"Error tagging" => "Грешка при задаване на етикета.",
-"Error untagging" => "Грешка при премахване на етикета.",
-"Error favoriting" => "Грешка при отбелязване за любим.",
-"Error unfavoriting" => "Грешка при премахване отбелязването за любим.",
-"Access forbidden" => "Достъпът е забранен",
-"File not found" => "Файлът не е открит.",
-"The specified document has not been found on the server." => "Избраният документ не е намерн на сървъра.",
-"You can click here to return to %s." => "Можеш да натиснеш тук, за да се върнеш на %s",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здрасти,\n\nсамо да те уведомя, че %s сподели %s с теб.\nРазгледай го: %s\n\n",
-"The share will expire on %s." => "Споделянето ще изтече на %s.",
-"Cheers!" => "Поздрави!",
-"Internal Server Error" => "Вътрешна системна грешка",
-"The server encountered an internal error and was unable to complete your request." => "Сървърът се натъкна на вътрешна грешка и неуспя да завърши заявката.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Моля, свържи се със сървърния администратор ако тази грешка се появи отново, моля, включи техническите данни показани в доклада по-долу.",
-"More details can be found in the server log." => "Допълнителна информация може да бъде открита в сървърните доклади.",
-"Technical details" => "Техническа информация",
-"Remote Address: %s" => "Remote Address: %s",
-"Request ID: %s" => "Request ID: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Message: %s",
-"File: %s" => "File: %s",
-"Line: %s" => "Line: %s",
-"Trace" => "Trace",
-"Security Warning" => "Предупреждение за Сигурноста",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Твоята PHP версия е податлива на NULL Byte атака (CVE-2006-7243).",
-"Please update your PHP installation to use %s securely." => "Моля, обнови своята PHP инсталация, за да използваш %s сигурно.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
-"Create an <strong>admin account</strong>" => "Създаване на <strong>админ профил</strong>.",
-"Password" => "Парола",
-"Storage & database" => "Дисково пространство и база данни",
-"Data folder" => "Директория за данни",
-"Configure the database" => "Конфигуриране на базата данни",
-"Only %s is available." => "Само %s е достъпен.",
-"Database user" => "Потребител за базата данни",
-"Database password" => "Парола за базата данни",
-"Database name" => "Име на базата данни",
-"Database tablespace" => "Tablespace-а за базата данни",
-"Database host" => "Хост за базата данни",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite ще бъде използван за база данни. За по-големи инсталации препоръчваме това да бъде променено.",
-"Finish setup" => "Завършване на настройките",
-"Finishing …" => "Завършване...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Програмата изисква JavaScript, за да функционира правилно. Моля, <a href=\"http://enable-javascript.com/\" target=\"_blank\">включи JavaScript</a> и презареди страницата.",
-"%s is available. Get more information on how to update." => "%s е на разположение. Прочети повече как да обновиш. ",
-"Log out" => "Отписване",
-"Server side authentication failed!" => "Заверяването в сървъра неуспешно!",
-"Please contact your administrator." => "Моля, свържи се с админстратора.",
-"Forgot your password? Reset it!" => "Забрави паролата? Възстанови я!",
-"remember" => "запомни",
-"Log in" => "Вписване",
-"Alternative Logins" => "Други Потребителски Имена",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здрасти,<br><br>само да те уведомя, че %s сподели <strong>%s</strong> с теб.\n<br><a href=\"%s\">Разгледай го!</a><br><br>.",
-"This ownCloud instance is currently in single user mode." => "В момента този ownCloud е в режим допускащ само един потребител.",
-"This means only administrators can use the instance." => "Това означава, че само администраторът може да го използва.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Свържи се със системния си администратор ако това съобщение се задържи твърде дълго или се е появило неочаквано.",
-"Thank you for your patience." => "Благодарим за търпението.",
-"You are accessing the server from an untrusted domain." => "Свръзваш се със сървъра от неодобрен домейн.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Моля, свържи се с администратора. Ако ти си администраторът, на този сървър, промени \"trusted_domain\" настройките в  config/config.php. Примерна конфигурация е приложена в config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "В зависимост от конфигурацията ти, като администратор може натискайки бутонът по-долу да отбележиш домейнът като сигурен.",
-"Add \"%s\" as trusted domain" => "Добави \"%s\" като сигурен домейн",
-"%s will be updated to version %s." => "%s ще бъде обновена до версия %s.",
-"The following apps will be disabled:" => "Следните програми ще бъдат изключени:",
-"The theme %s has been disabled." => "Темата %s бе изключена.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Моля, увери се, че си направил копия на базата данни, папките с настройки и данни, преди да продължиш.",
-"Start update" => "Започни обновяването",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "За да избегнеш таймаутове при по-големи инсталации, можеш да изпълниш следните команди в инсталанционната директория:",
-"This %s instance is currently being updated, which may take a while." => "В момента този %s се обновява, а това може да отнеме време.",
-"This page will refresh itself when the %s instance is available again." => "Тази страница ще се опресни автоматично, когато %s е отново на линия."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
new file mode 100644
index 00000000000..04d9864b5ed
--- /dev/null
+++ b/core/l10n/bn_BD.js
@@ -0,0 +1,120 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "নিম্নোক্ত ব্যবহারকারীকে মেইল পাঠানো গেলনা: %s",
+    "Turned on maintenance mode" : "রক্ষণাবেক্ষণ মোড চালু হয়েছে",
+    "Turned off maintenance mode" : "রক্ষণাবেক্ষণ মোড বন্ধ হয়েছে",
+    "Updated database" : "ডাটাবেজ নবায়ন করা হয়েছে",
+    "No image or file provided" : "কোন ইমেজ বা ফাইল প্রদান করা হয়নি",
+    "Unknown filetype" : "অজানা প্রকৃতির ফাইল",
+    "Invalid image" : "অবৈধ চিত্র",
+    "Sunday" : "রবিবার",
+    "Monday" : "সোমবার",
+    "Tuesday" : "মঙ্গলবার",
+    "Wednesday" : "বুধবার",
+    "Thursday" : "বৃহস্পতিবার",
+    "Friday" : "শুক্রবার",
+    "Saturday" : "শনিবার",
+    "January" : "জানুয়ারি",
+    "February" : "ফেব্রুয়ারি",
+    "March" : "মার্চ",
+    "April" : "এপ্রিল",
+    "May" : "মে",
+    "June" : "জুন",
+    "July" : "জুলাই",
+    "August" : "অগাষ্ট",
+    "September" : "সেপ্টেম্বর",
+    "October" : "অক্টোবর",
+    "November" : "নভেম্বর",
+    "December" : "ডিসেম্বর",
+    "Settings" : "নিয়ামকসমূহ",
+    "File" : "ফাইল",
+    "Folder" : "ফোল্ডার",
+    "Image" : "চিত্র",
+    "Audio" : "অডিও",
+    "Saving..." : "সংরক্ষণ করা হচ্ছে..",
+    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
+    "No" : "না",
+    "Yes" : "হ্যাঁ",
+    "Choose" : "বেছে নিন",
+    "Ok" : "তথাস্তু",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} সাংঘর্ষিক ফাইল","{count} সাংঘর্ষিক ফাইল"],
+    "One file conflict" : "একটি সাংঘর্ষিক ফাইল",
+    "New Files" : "নতুন ফাইল",
+    "Already existing files" : "বিদ্যমান ফাইল",
+    "Which files do you want to keep?" : "কোন ফাইলগুলো রেখে দিতে চান?",
+    "Cancel" : "বাতিল",
+    "Continue" : "চালিয়ে যাও",
+    "Strong password" : "শক্তিশালী কুটশব্দ",
+    "Shared" : "ভাগাভাগিকৃত",
+    "Share" : "ভাগাভাগি কর",
+    "Error" : "সমস্যা",
+    "Error while sharing" : "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
+    "Error while unsharing" : "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
+    "Error while changing permissions" : "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
+    "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
+    "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
+    "Share link" : "লিংক ভাগাভাগি করেন",
+    "Password protect" : "কূটশব্দ সুরক্ষিত",
+    "Email link to person" : "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
+    "Send" : "পাঠাও",
+    "Set expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
+    "Expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
+    "group" : "দল",
+    "Resharing is not allowed" : "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
+    "Shared in {item} with {user}" : "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
+    "Unshare" : "ভাগাভাগি বাতিল ",
+    "can share" : "ভাগাভাগি করেত পারেন",
+    "can edit" : "সম্পাদনা করতে পারবেন",
+    "access control" : "অধিগম্যতা নিয়ন্ত্রণ",
+    "create" : "তৈরী করুন",
+    "update" : "পরিবর্ধন কর",
+    "delete" : "মুছে ফেল",
+    "Password protected" : "কূটশব্দদ্বারা সুরক্ষিত",
+    "Error unsetting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
+    "Error setting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
+    "Sending ..." : "পাঠানো হচ্ছে......",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "Warning" : "সতর্কবাণী",
+    "The object type is not specified." : "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
+    "Enter new" : "নতুন লিখুন",
+    "Delete" : "মুছে",
+    "Add" : "যোগ কর",
+    "Edit tags" : "ট্যাগ সম্পাদনা",
+    "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
+    "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
+    "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
+    "Username" : "ব্যবহারকারী",
+    "Reset" : "পূণঃনির্ধানণ",
+    "New password" : "নতুন কূটশব্দ",
+    "New Password" : "নতুন কূটশব্দ",
+    "Personal" : "ব্যক্তিগত",
+    "Users" : "ব্যবহারকারী",
+    "Apps" : "অ্যাপ",
+    "Admin" : "প্রশাসন",
+    "Help" : "সহায়িকা",
+    "Error deleting tag(s)" : "ট্যাগ(সমূহ) অপসারণে সমস্যা",
+    "Error tagging" : "ট্যাগ করতে সমস্যা",
+    "Error untagging" : "ট্যাগ বাতিল করতে সমস্যা",
+    "Error favoriting" : "প্রিয় তালিকাভুক্তিতে সমস্যা",
+    "Access forbidden" : "অধিগমনের অনুমতি নেই",
+    "File not found" : "ফাইল খুঁজে পাওয়া গেল না",
+    "Cheers!" : "শুভেচ্ছা!",
+    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
+    "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+    "Password" : "কূটশব্দ",
+    "Data folder" : "ডাটা ফোল্ডার ",
+    "Configure the database" : "ডাটাবেচ কনফিগার করুন",
+    "Database user" : "ডাটাবেজ ব্যবহারকারী",
+    "Database password" : "ডাটাবেজ কূটশব্দ",
+    "Database name" : "ডাটাবেজের নাম",
+    "Database tablespace" : "ডাটাবেজ টেবলস্পেস",
+    "Database host" : "ডাটাবেজ হোস্ট",
+    "Finish setup" : "সেটআপ সুসম্পন্ন কর",
+    "Finishing …" : "সম্পন্ন হচ্ছে....",
+    "Log out" : "প্রস্থান",
+    "remember" : "মনে রাখ",
+    "Log in" : "প্রবেশ",
+    "Alternative Logins" : "বিকল্প লগইন"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
new file mode 100644
index 00000000000..95d0ce6fe8b
--- /dev/null
+++ b/core/l10n/bn_BD.json
@@ -0,0 +1,118 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "নিম্নোক্ত ব্যবহারকারীকে মেইল পাঠানো গেলনা: %s",
+    "Turned on maintenance mode" : "রক্ষণাবেক্ষণ মোড চালু হয়েছে",
+    "Turned off maintenance mode" : "রক্ষণাবেক্ষণ মোড বন্ধ হয়েছে",
+    "Updated database" : "ডাটাবেজ নবায়ন করা হয়েছে",
+    "No image or file provided" : "কোন ইমেজ বা ফাইল প্রদান করা হয়নি",
+    "Unknown filetype" : "অজানা প্রকৃতির ফাইল",
+    "Invalid image" : "অবৈধ চিত্র",
+    "Sunday" : "রবিবার",
+    "Monday" : "সোমবার",
+    "Tuesday" : "মঙ্গলবার",
+    "Wednesday" : "বুধবার",
+    "Thursday" : "বৃহস্পতিবার",
+    "Friday" : "শুক্রবার",
+    "Saturday" : "শনিবার",
+    "January" : "জানুয়ারি",
+    "February" : "ফেব্রুয়ারি",
+    "March" : "মার্চ",
+    "April" : "এপ্রিল",
+    "May" : "মে",
+    "June" : "জুন",
+    "July" : "জুলাই",
+    "August" : "অগাষ্ট",
+    "September" : "সেপ্টেম্বর",
+    "October" : "অক্টোবর",
+    "November" : "নভেম্বর",
+    "December" : "ডিসেম্বর",
+    "Settings" : "নিয়ামকসমূহ",
+    "File" : "ফাইল",
+    "Folder" : "ফোল্ডার",
+    "Image" : "চিত্র",
+    "Audio" : "অডিও",
+    "Saving..." : "সংরক্ষণ করা হচ্ছে..",
+    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
+    "No" : "না",
+    "Yes" : "হ্যাঁ",
+    "Choose" : "বেছে নিন",
+    "Ok" : "তথাস্তু",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} সাংঘর্ষিক ফাইল","{count} সাংঘর্ষিক ফাইল"],
+    "One file conflict" : "একটি সাংঘর্ষিক ফাইল",
+    "New Files" : "নতুন ফাইল",
+    "Already existing files" : "বিদ্যমান ফাইল",
+    "Which files do you want to keep?" : "কোন ফাইলগুলো রেখে দিতে চান?",
+    "Cancel" : "বাতিল",
+    "Continue" : "চালিয়ে যাও",
+    "Strong password" : "শক্তিশালী কুটশব্দ",
+    "Shared" : "ভাগাভাগিকৃত",
+    "Share" : "ভাগাভাগি কর",
+    "Error" : "সমস্যা",
+    "Error while sharing" : "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
+    "Error while unsharing" : "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
+    "Error while changing permissions" : "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
+    "Shared with you and the group {group} by {owner}" : "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
+    "Shared with you by {owner}" : "{owner} আপনার সাথে ভাগাভাগি করেছেন",
+    "Share link" : "লিংক ভাগাভাগি করেন",
+    "Password protect" : "কূটশব্দ সুরক্ষিত",
+    "Email link to person" : "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
+    "Send" : "পাঠাও",
+    "Set expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
+    "Expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
+    "group" : "দল",
+    "Resharing is not allowed" : "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
+    "Shared in {item} with {user}" : "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
+    "Unshare" : "ভাগাভাগি বাতিল ",
+    "can share" : "ভাগাভাগি করেত পারেন",
+    "can edit" : "সম্পাদনা করতে পারবেন",
+    "access control" : "অধিগম্যতা নিয়ন্ত্রণ",
+    "create" : "তৈরী করুন",
+    "update" : "পরিবর্ধন কর",
+    "delete" : "মুছে ফেল",
+    "Password protected" : "কূটশব্দদ্বারা সুরক্ষিত",
+    "Error unsetting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
+    "Error setting expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
+    "Sending ..." : "পাঠানো হচ্ছে......",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "Warning" : "সতর্কবাণী",
+    "The object type is not specified." : "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
+    "Enter new" : "নতুন লিখুন",
+    "Delete" : "মুছে",
+    "Add" : "যোগ কর",
+    "Edit tags" : "ট্যাগ সম্পাদনা",
+    "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
+    "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
+    "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
+    "Username" : "ব্যবহারকারী",
+    "Reset" : "পূণঃনির্ধানণ",
+    "New password" : "নতুন কূটশব্দ",
+    "New Password" : "নতুন কূটশব্দ",
+    "Personal" : "ব্যক্তিগত",
+    "Users" : "ব্যবহারকারী",
+    "Apps" : "অ্যাপ",
+    "Admin" : "প্রশাসন",
+    "Help" : "সহায়িকা",
+    "Error deleting tag(s)" : "ট্যাগ(সমূহ) অপসারণে সমস্যা",
+    "Error tagging" : "ট্যাগ করতে সমস্যা",
+    "Error untagging" : "ট্যাগ বাতিল করতে সমস্যা",
+    "Error favoriting" : "প্রিয় তালিকাভুক্তিতে সমস্যা",
+    "Access forbidden" : "অধিগমনের অনুমতি নেই",
+    "File not found" : "ফাইল খুঁজে পাওয়া গেল না",
+    "Cheers!" : "শুভেচ্ছা!",
+    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
+    "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+    "Password" : "কূটশব্দ",
+    "Data folder" : "ডাটা ফোল্ডার ",
+    "Configure the database" : "ডাটাবেচ কনফিগার করুন",
+    "Database user" : "ডাটাবেজ ব্যবহারকারী",
+    "Database password" : "ডাটাবেজ কূটশব্দ",
+    "Database name" : "ডাটাবেজের নাম",
+    "Database tablespace" : "ডাটাবেজ টেবলস্পেস",
+    "Database host" : "ডাটাবেজ হোস্ট",
+    "Finish setup" : "সেটআপ সুসম্পন্ন কর",
+    "Finishing …" : "সম্পন্ন হচ্ছে....",
+    "Log out" : "প্রস্থান",
+    "remember" : "মনে রাখ",
+    "Log in" : "প্রবেশ",
+    "Alternative Logins" : "বিকল্প লগইন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/bn_BD.php b/core/l10n/bn_BD.php
deleted file mode 100644
index d00864db20b..00000000000
--- a/core/l10n/bn_BD.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "নিম্নোক্ত ব্যবহারকারীকে মেইল পাঠানো গেলনা: %s",
-"Turned on maintenance mode" => "রক্ষণাবেক্ষণ মোড চালু হয়েছে",
-"Turned off maintenance mode" => "রক্ষণাবেক্ষণ মোড বন্ধ হয়েছে",
-"Updated database" => "ডাটাবেজ নবায়ন করা হয়েছে",
-"No image or file provided" => "কোন ইমেজ বা ফাইল প্রদান করা হয়নি",
-"Unknown filetype" => "অজানা প্রকৃতির ফাইল",
-"Invalid image" => "অবৈধ চিত্র",
-"Sunday" => "রবিবার",
-"Monday" => "সোমবার",
-"Tuesday" => "মঙ্গলবার",
-"Wednesday" => "বুধবার",
-"Thursday" => "বৃহস্পতিবার",
-"Friday" => "শুক্রবার",
-"Saturday" => "শনিবার",
-"January" => "জানুয়ারি",
-"February" => "ফেব্রুয়ারি",
-"March" => "মার্চ",
-"April" => "এপ্রিল",
-"May" => "মে",
-"June" => "জুন",
-"July" => "জুলাই",
-"August" => "অগাষ্ট",
-"September" => "সেপ্টেম্বর",
-"October" => "অক্টোবর",
-"November" => "নভেম্বর",
-"December" => "ডিসেম্বর",
-"Settings" => "নিয়ামকসমূহ",
-"File" => "ফাইল",
-"Folder" => "ফোল্ডার",
-"Image" => "চিত্র",
-"Audio" => "অডিও",
-"Saving..." => "সংরক্ষণ করা হচ্ছে..",
-"Reset password" => "কূটশব্দ পূনঃনির্ধারণ কর",
-"No" => "না",
-"Yes" => "হ্যাঁ",
-"Choose" => "বেছে নিন",
-"Ok" => "তথাস্তু",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} সাংঘর্ষিক ফাইল","{count} সাংঘর্ষিক ফাইল"),
-"One file conflict" => "একটি সাংঘর্ষিক ফাইল",
-"New Files" => "নতুন ফাইল",
-"Already existing files" => "বিদ্যমান ফাইল",
-"Which files do you want to keep?" => "কোন ফাইলগুলো রেখে দিতে চান?",
-"Cancel" => "বাতিল",
-"Continue" => "চালিয়ে যাও",
-"Strong password" => "শক্তিশালী কুটশব্দ",
-"Shared" => "ভাগাভাগিকৃত",
-"Share" => "ভাগাভাগি কর",
-"Error" => "সমস্যা",
-"Error while sharing" => "ভাগাভাগি করতে সমস্যা দেখা দিয়েছে  ",
-"Error while unsharing" => "ভাগাভাগি বাতিল করতে সমস্যা দেখা দিয়েছে",
-"Error while changing permissions" => "অনুমতিসমূহ  পরিবর্তন করতে সমস্যা দেখা দিয়েছে",
-"Shared with you and the group {group} by {owner}" => "{owner} আপনার এবং {group} গোষ্ঠীর সাথে ভাগাভাগি করেছেন",
-"Shared with you by {owner}" => "{owner} আপনার সাথে ভাগাভাগি করেছেন",
-"Share link" => "লিংক ভাগাভাগি করেন",
-"Password protect" => "কূটশব্দ সুরক্ষিত",
-"Email link to person" => "ব্যক্তির সাথে ই-মেইল যুক্ত কর",
-"Send" => "পাঠাও",
-"Set expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করুন",
-"Expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ",
-"group" => "দল",
-"Resharing is not allowed" => "পূনঃরায় ভাগাভাগি অনুমোদিত নয়",
-"Shared in {item} with {user}" => "{user} এর সাথে {item} ভাগাভাগি করা হয়েছে",
-"Unshare" => "ভাগাভাগি বাতিল ",
-"can share" => "ভাগাভাগি করেত পারেন",
-"can edit" => "সম্পাদনা করতে পারবেন",
-"access control" => "অধিগম্যতা নিয়ন্ত্রণ",
-"create" => "তৈরী করুন",
-"update" => "পরিবর্ধন কর",
-"delete" => "মুছে ফেল",
-"Password protected" => "কূটশব্দদ্বারা সুরক্ষিত",
-"Error unsetting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ বাতিল করতে সমস্যা দেখা দিয়েছে",
-"Error setting expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ নির্ধারণ করতে সমস্যা দেখা দিয়েছে",
-"Sending ..." => "পাঠানো হচ্ছে......",
-"Email sent" => "ই-মেইল পাঠানো হয়েছে",
-"Warning" => "সতর্কবাণী",
-"The object type is not specified." => "অবজেক্টের ধরণটি সুনির্দিষ্ট নয়।",
-"Enter new" => "নতুন লিখুন",
-"Delete" => "মুছে",
-"Add" => "যোগ কর",
-"Edit tags" => "ট্যাগ সম্পাদনা",
-"Please reload the page." => "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
-"Use the following link to reset your password: {link}" => "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
-"You will receive a link to reset your password via Email." => "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
-"Username" => "ব্যবহারকারী",
-"Reset" => "পূণঃনির্ধানণ",
-"New password" => "নতুন কূটশব্দ",
-"New Password" => "নতুন কূটশব্দ",
-"Personal" => "ব্যক্তিগত",
-"Users" => "ব্যবহারকারী",
-"Apps" => "অ্যাপ",
-"Admin" => "প্রশাসন",
-"Help" => "সহায়িকা",
-"Error deleting tag(s)" => "ট্যাগ(সমূহ) অপসারণে সমস্যা",
-"Error tagging" => "ট্যাগ করতে সমস্যা",
-"Error untagging" => "ট্যাগ বাতিল করতে সমস্যা",
-"Error favoriting" => "প্রিয় তালিকাভুক্তিতে সমস্যা",
-"Access forbidden" => "অধিগমনের অনুমতি নেই",
-"File not found" => "ফাইল খুঁজে পাওয়া গেল না",
-"Cheers!" => "শুভেচ্ছা!",
-"Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
-"Create an <strong>admin account</strong>" => "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
-"Password" => "কূটশব্দ",
-"Data folder" => "ডাটা ফোল্ডার ",
-"Configure the database" => "ডাটাবেচ কনফিগার করুন",
-"Database user" => "ডাটাবেজ ব্যবহারকারী",
-"Database password" => "ডাটাবেজ কূটশব্দ",
-"Database name" => "ডাটাবেজের নাম",
-"Database tablespace" => "ডাটাবেজ টেবলস্পেস",
-"Database host" => "ডাটাবেজ হোস্ট",
-"Finish setup" => "সেটআপ সুসম্পন্ন কর",
-"Finishing …" => "সম্পন্ন হচ্ছে....",
-"Log out" => "প্রস্থান",
-"remember" => "মনে রাখ",
-"Log in" => "প্রবেশ",
-"Alternative Logins" => "বিকল্প লগইন"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bn_IN.js b/core/l10n/bn_IN.js
new file mode 100644
index 00000000000..675fbacc07a
--- /dev/null
+++ b/core/l10n/bn_IN.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "core",
+    {
+    "Settings" : "সেটিংস",
+    "Folder" : "ফোল্ডার",
+    "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "বাতিল করা",
+    "Share" : "শেয়ার",
+    "Error" : "ভুল",
+    "Warning" : "সতর্কীকরণ",
+    "Delete" : "মুছে ফেলা",
+    "Add" : "যোগ করা",
+    "Username" : "ইউজারনেম",
+    "Reset" : "রিসেট করুন"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bn_IN.json b/core/l10n/bn_IN.json
new file mode 100644
index 00000000000..e0234ccca68
--- /dev/null
+++ b/core/l10n/bn_IN.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Settings" : "সেটিংস",
+    "Folder" : "ফোল্ডার",
+    "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "বাতিল করা",
+    "Share" : "শেয়ার",
+    "Error" : "ভুল",
+    "Warning" : "সতর্কীকরণ",
+    "Delete" : "মুছে ফেলা",
+    "Add" : "যোগ করা",
+    "Username" : "ইউজারনেম",
+    "Reset" : "রিসেট করুন"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/bn_IN.php b/core/l10n/bn_IN.php
deleted file mode 100644
index 987c0c6585d..00000000000
--- a/core/l10n/bn_IN.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "সেটিংস",
-"Folder" => "ফোল্ডার",
-"Saving..." => "সংরক্ষণ করা হচ্ছে ...",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "বাতিল করা",
-"Share" => "শেয়ার",
-"Error" => "ভুল",
-"Warning" => "সতর্কীকরণ",
-"Delete" => "মুছে ফেলা",
-"Add" => "যোগ করা",
-"Username" => "ইউজারনেম",
-"Reset" => "রিসেট করুন"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
new file mode 100644
index 00000000000..18766a747f9
--- /dev/null
+++ b/core/l10n/bs.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "core",
+    {
+    "Folder" : "Fasikla",
+    "Saving..." : "Spašavam...",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Share" : "Podijeli",
+    "Add" : "Dodaj"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
new file mode 100644
index 00000000000..a79d18e6baa
--- /dev/null
+++ b/core/l10n/bs.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Folder" : "Fasikla",
+    "Saving..." : "Spašavam...",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Share" : "Podijeli",
+    "Add" : "Dodaj"
+},"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/bs.php b/core/l10n/bs.php
deleted file mode 100644
index 69e8e29f438..00000000000
--- a/core/l10n/bs.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Folder" => "Fasikla",
-"Saving..." => "Spašavam...",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"Share" => "Podijeli",
-"Add" => "Dodaj"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
new file mode 100644
index 00000000000..6702145e121
--- /dev/null
+++ b/core/l10n/ca.js
@@ -0,0 +1,205 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "No s'ha pogut enviar correu als usuaris següents: %s",
+    "Turned on maintenance mode" : "Activat el mode de manteniment",
+    "Turned off maintenance mode" : "Desactivat el mode de manteniment",
+    "Updated database" : "Actualitzada la base de dades",
+    "Checked database schema update" : "S'ha comprobat l'actualització de l'esquema de la base de dades",
+    "Checked database schema update for apps" : "S'ha comprobat l'actualització de l'esquema de la base de dades per les apps",
+    "Updated \"%s\" to %s" : "Actualitzat \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicacions incompatibles desactivades: %s",
+    "No image or file provided" : "No s'han proporcionat imatges o fitxers",
+    "Unknown filetype" : "Tipus de fitxer desconegut",
+    "Invalid image" : "Imatge no vàlida",
+    "No temporary profile picture available, try again" : "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
+    "No crop data provided" : "No heu proporcionat dades del retall",
+    "Sunday" : "Diumenge",
+    "Monday" : "Dilluns",
+    "Tuesday" : "Dimarts",
+    "Wednesday" : "Dimecres",
+    "Thursday" : "Dijous",
+    "Friday" : "Divendres",
+    "Saturday" : "Dissabte",
+    "January" : "Gener",
+    "February" : "Febrer",
+    "March" : "Març",
+    "April" : "Abril",
+    "May" : "Maig",
+    "June" : "Juny",
+    "July" : "Juliol",
+    "August" : "Agost",
+    "September" : "Setembre",
+    "October" : "Octubre",
+    "November" : "Novembre",
+    "December" : "Desembre",
+    "Settings" : "Configuració",
+    "File" : "Fitxer",
+    "Folder" : "Carpeta",
+    "Image" : "Imatge",
+    "Audio" : "Audio",
+    "Saving..." : "Desant...",
+    "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?",
+    "I know what I'm doing" : "Sé el que faig",
+    "Reset password" : "Reinicialitza la contrasenya",
+    "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Escull",
+    "Error loading file picker template: {error}" : "Error en carregar la plantilla de càrrega de fitxers: {error}",
+    "Ok" : "D'acord",
+    "Error loading message template: {error}" : "Error en carregar la plantilla de missatge: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicte de fitxer","{count} conflictes de fitxer"],
+    "One file conflict" : "Un fitxer en conflicte",
+    "New Files" : "Fitxers nous",
+    "Already existing files" : "Fitxers que ja existeixen",
+    "Which files do you want to keep?" : "Quin fitxer voleu conservar?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.",
+    "Cancel" : "Cancel·la",
+    "Continue" : "Continua",
+    "(all selected)" : "(selecciona-ho tot)",
+    "({count} selected)" : "({count} seleccionats)",
+    "Error loading file exists template" : "Error en carregar la plantilla de fitxer existent",
+    "Very weak password" : "Contrasenya massa feble",
+    "Weak password" : "Contrasenya feble",
+    "So-so password" : "Contrasenya passable",
+    "Good password" : "Contrasenya bona",
+    "Strong password" : "Contrasenya forta",
+    "Your web server is not yet properly setup to allow files 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 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." : "Aquest servidor no té cap connexió a internet que funcioni. 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.",
+    "Error occurred while checking server setup" : "Hi ha hagut un error en comprovar la configuració del servidor",
+    "Shared" : "Compartit",
+    "Shared with {recipients}" : "Compartit amb {recipients}",
+    "Share" : "Comparteix",
+    "Error" : "Error",
+    "Error while sharing" : "Error en compartir",
+    "Error while unsharing" : "Error en deixar de compartir",
+    "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 user or group …" : "Comparteix amb usuari o grup...",
+    "Share link" : "Enllaç de compartició",
+    "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
+    "Password protect" : "Protegir amb contrasenya",
+    "Choose a password for the public link" : "Escolliu una contrasenya per l'enllaç públic",
+    "Allow Public Upload" : "Permet pujada pública",
+    "Email link to person" : "Enllaç per correu electrónic amb la persona",
+    "Send" : "Envia",
+    "Set expiration date" : "Estableix la data de venciment",
+    "Expiration date" : "Data de venciment",
+    "Adding user..." : "Afegint usuari...",
+    "group" : "grup",
+    "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",
+    "can share" : "pot compartir",
+    "can edit" : "pot editar",
+    "access control" : "control d'accés",
+    "create" : "crea",
+    "update" : "actualitza",
+    "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",
+    "Warning" : "Avís",
+    "The object type is not specified." : "No s'ha especificat el tipus d'objecte.",
+    "Enter new" : "Escriu nou",
+    "Delete" : "Esborra",
+    "Add" : "Afegeix",
+    "Edit tags" : "Edita etiquetes",
+    "Error loading dialog template: {error}" : "Error en carregar la plantilla de diàleg: {error}",
+    "No tags selected for deletion." : "No heu seleccionat les etiquetes a eliminar.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
+    "Please reload the page." : "Carregueu la pàgina de nou.",
+    "The update was unsuccessful." : "L'actualització no ha tingut èxit.",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Useu l'enllaç següent per restablir la contrasenya: {link}",
+    "You will receive a link to reset your password via Email." : "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
+    "Username" : "Nom d'usuari",
+    "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?" : "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. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
+    "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya",
+    "Reset" : "Estableix de nou",
+    "New password" : "Contrasenya nova",
+    "New Password" : "Contrasenya nova",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
+    "Personal" : "Personal",
+    "Users" : "Usuaris",
+    "Apps" : "Aplicacions",
+    "Admin" : "Administració",
+    "Help" : "Ajuda",
+    "Error loading tags" : "Error en carregar les etiquetes",
+    "Tag already exists" : "L'etiqueta ja existeix",
+    "Error deleting tag(s)" : "Error en eliminar etiqueta(s)",
+    "Error tagging" : "Error en etiquetar",
+    "Error untagging" : "Error en treure les etiquetes",
+    "Error favoriting" : "Error en posar a preferits",
+    "Error unfavoriting" : "Error en treure de preferits",
+    "Access forbidden" : "Accés prohibit",
+    "File not found" : "No s'ha trobat l'arxiu",
+    "The specified document has not been found on the server." : "El document especificat no s'ha trobat al servidor.",
+    "You can click here to return to %s." : "Pots clicar aquí per tornar a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho a: %s\n\n",
+    "The share will expire on %s." : "La compartició venç el %s.",
+    "Cheers!" : "Salut!",
+    "The server encountered an internal error and was unable to complete your request." : "El servidor ha trobat un error intern i no pot finalitzar la teva petició.",
+    "More details can be found in the server log." : "Pots trobar més detalls al llistat del servidor.",
+    "Technical details" : "Detalls tècnics",
+    "Remote Address: %s" : "Adreça remota: %s",
+    "Code: %s" : "Codi: %s",
+    "Message: %s" : "Missatge: %s",
+    "File: %s" : "Fitxer: %s",
+    "Security Warning" : "Avís de seguretat",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Actualitzeu la instal·lació de PHP per usar %s de forma segura.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
+    "Password" : "Contrasenya",
+    "Storage & database" : "Emmagatzematge i base de dades",
+    "Data folder" : "Carpeta de dades",
+    "Configure the database" : "Configura la base de dades",
+    "Only %s is available." : "Només hi ha disponible %s",
+    "Database user" : "Usuari de la base de dades",
+    "Database password" : "Contrasenya de la base de dades",
+    "Database name" : "Nom de la base de dades",
+    "Database tablespace" : "Espai de taula de la base de dades",
+    "Database host" : "Ordinador central de la base de dades",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "S'utilitzarà SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu.",
+    "Finish setup" : "Acaba la configuració",
+    "Finishing …" : "Acabant...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aquesta aplicació requereix JavaScrip pel seu correcte funcionament. Si us plau <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i actualitzeu la pàgina.",
+    "%s is available. Get more information on how to update." : "%s està disponible. Obtingueu més informació de com actualitzar.",
+    "Log out" : "Surt",
+    "Server side authentication failed!" : "L'autenticació del servidor ha fallat!",
+    "Please contact your administrator." : "Contacteu amb l'administrador.",
+    "Forgot your password? Reset it!" : "Heu oblidat la contrasenya? Restabliu-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.",
+    "This means only administrators can use the instance." : "Això significa que només els administradors poden usar la instància.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
+    "Thank you for your patience." : "Gràcies per la paciència.",
+    "You are accessing the server from an untrusted domain." : "Esteu accedint el servidor des d'un domini no fiable",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
+    "Add \"%s\" as trusted domain" : "Afegeix \"%s\" com a domini de confiança",
+    "%s will be updated to version %s." : "%s s'actualitzarà a la versió %s.",
+    "The following apps will be disabled:" : "Les següents aplicacions es desactivaran:",
+    "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ó",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitar que s'esgoti el temps d'espera en instalacions grans, pots en el seu lloc fer córrer la següent comanda en el directori d'instalació. "
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
new file mode 100644
index 00000000000..fdebffb0805
--- /dev/null
+++ b/core/l10n/ca.json
@@ -0,0 +1,203 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "No s'ha pogut enviar correu als usuaris següents: %s",
+    "Turned on maintenance mode" : "Activat el mode de manteniment",
+    "Turned off maintenance mode" : "Desactivat el mode de manteniment",
+    "Updated database" : "Actualitzada la base de dades",
+    "Checked database schema update" : "S'ha comprobat l'actualització de l'esquema de la base de dades",
+    "Checked database schema update for apps" : "S'ha comprobat l'actualització de l'esquema de la base de dades per les apps",
+    "Updated \"%s\" to %s" : "Actualitzat \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicacions incompatibles desactivades: %s",
+    "No image or file provided" : "No s'han proporcionat imatges o fitxers",
+    "Unknown filetype" : "Tipus de fitxer desconegut",
+    "Invalid image" : "Imatge no vàlida",
+    "No temporary profile picture available, try again" : "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
+    "No crop data provided" : "No heu proporcionat dades del retall",
+    "Sunday" : "Diumenge",
+    "Monday" : "Dilluns",
+    "Tuesday" : "Dimarts",
+    "Wednesday" : "Dimecres",
+    "Thursday" : "Dijous",
+    "Friday" : "Divendres",
+    "Saturday" : "Dissabte",
+    "January" : "Gener",
+    "February" : "Febrer",
+    "March" : "Març",
+    "April" : "Abril",
+    "May" : "Maig",
+    "June" : "Juny",
+    "July" : "Juliol",
+    "August" : "Agost",
+    "September" : "Setembre",
+    "October" : "Octubre",
+    "November" : "Novembre",
+    "December" : "Desembre",
+    "Settings" : "Configuració",
+    "File" : "Fitxer",
+    "Folder" : "Carpeta",
+    "Image" : "Imatge",
+    "Audio" : "Audio",
+    "Saving..." : "Desant...",
+    "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?",
+    "I know what I'm doing" : "Sé el que faig",
+    "Reset password" : "Reinicialitza la contrasenya",
+    "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Escull",
+    "Error loading file picker template: {error}" : "Error en carregar la plantilla de càrrega de fitxers: {error}",
+    "Ok" : "D'acord",
+    "Error loading message template: {error}" : "Error en carregar la plantilla de missatge: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicte de fitxer","{count} conflictes de fitxer"],
+    "One file conflict" : "Un fitxer en conflicte",
+    "New Files" : "Fitxers nous",
+    "Already existing files" : "Fitxers que ja existeixen",
+    "Which files do you want to keep?" : "Quin fitxer voleu conservar?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.",
+    "Cancel" : "Cancel·la",
+    "Continue" : "Continua",
+    "(all selected)" : "(selecciona-ho tot)",
+    "({count} selected)" : "({count} seleccionats)",
+    "Error loading file exists template" : "Error en carregar la plantilla de fitxer existent",
+    "Very weak password" : "Contrasenya massa feble",
+    "Weak password" : "Contrasenya feble",
+    "So-so password" : "Contrasenya passable",
+    "Good password" : "Contrasenya bona",
+    "Strong password" : "Contrasenya forta",
+    "Your web server is not yet properly setup to allow files 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 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." : "Aquest servidor no té cap connexió a internet que funcioni. 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.",
+    "Error occurred while checking server setup" : "Hi ha hagut un error en comprovar la configuració del servidor",
+    "Shared" : "Compartit",
+    "Shared with {recipients}" : "Compartit amb {recipients}",
+    "Share" : "Comparteix",
+    "Error" : "Error",
+    "Error while sharing" : "Error en compartir",
+    "Error while unsharing" : "Error en deixar de compartir",
+    "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 user or group …" : "Comparteix amb usuari o grup...",
+    "Share link" : "Enllaç de compartició",
+    "The public link will expire no later than {days} days after it is created" : "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
+    "Password protect" : "Protegir amb contrasenya",
+    "Choose a password for the public link" : "Escolliu una contrasenya per l'enllaç públic",
+    "Allow Public Upload" : "Permet pujada pública",
+    "Email link to person" : "Enllaç per correu electrónic amb la persona",
+    "Send" : "Envia",
+    "Set expiration date" : "Estableix la data de venciment",
+    "Expiration date" : "Data de venciment",
+    "Adding user..." : "Afegint usuari...",
+    "group" : "grup",
+    "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",
+    "can share" : "pot compartir",
+    "can edit" : "pot editar",
+    "access control" : "control d'accés",
+    "create" : "crea",
+    "update" : "actualitza",
+    "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",
+    "Warning" : "Avís",
+    "The object type is not specified." : "No s'ha especificat el tipus d'objecte.",
+    "Enter new" : "Escriu nou",
+    "Delete" : "Esborra",
+    "Add" : "Afegeix",
+    "Edit tags" : "Edita etiquetes",
+    "Error loading dialog template: {error}" : "Error en carregar la plantilla de diàleg: {error}",
+    "No tags selected for deletion." : "No heu seleccionat les etiquetes a eliminar.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
+    "Please reload the page." : "Carregueu la pàgina de nou.",
+    "The update was unsuccessful." : "L'actualització no ha tingut èxit.",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Useu l'enllaç següent per restablir la contrasenya: {link}",
+    "You will receive a link to reset your password via Email." : "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
+    "Username" : "Nom d'usuari",
+    "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?" : "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. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
+    "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya",
+    "Reset" : "Estableix de nou",
+    "New password" : "Contrasenya nova",
+    "New Password" : "Contrasenya nova",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
+    "Personal" : "Personal",
+    "Users" : "Usuaris",
+    "Apps" : "Aplicacions",
+    "Admin" : "Administració",
+    "Help" : "Ajuda",
+    "Error loading tags" : "Error en carregar les etiquetes",
+    "Tag already exists" : "L'etiqueta ja existeix",
+    "Error deleting tag(s)" : "Error en eliminar etiqueta(s)",
+    "Error tagging" : "Error en etiquetar",
+    "Error untagging" : "Error en treure les etiquetes",
+    "Error favoriting" : "Error en posar a preferits",
+    "Error unfavoriting" : "Error en treure de preferits",
+    "Access forbidden" : "Accés prohibit",
+    "File not found" : "No s'ha trobat l'arxiu",
+    "The specified document has not been found on the server." : "El document especificat no s'ha trobat al servidor.",
+    "You can click here to return to %s." : "Pots clicar aquí per tornar a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho a: %s\n\n",
+    "The share will expire on %s." : "La compartició venç el %s.",
+    "Cheers!" : "Salut!",
+    "The server encountered an internal error and was unable to complete your request." : "El servidor ha trobat un error intern i no pot finalitzar la teva petició.",
+    "More details can be found in the server log." : "Pots trobar més detalls al llistat del servidor.",
+    "Technical details" : "Detalls tècnics",
+    "Remote Address: %s" : "Adreça remota: %s",
+    "Code: %s" : "Codi: %s",
+    "Message: %s" : "Missatge: %s",
+    "File: %s" : "Fitxer: %s",
+    "Security Warning" : "Avís de seguretat",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Actualitzeu la instal·lació de PHP per usar %s de forma segura.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
+    "Password" : "Contrasenya",
+    "Storage & database" : "Emmagatzematge i base de dades",
+    "Data folder" : "Carpeta de dades",
+    "Configure the database" : "Configura la base de dades",
+    "Only %s is available." : "Només hi ha disponible %s",
+    "Database user" : "Usuari de la base de dades",
+    "Database password" : "Contrasenya de la base de dades",
+    "Database name" : "Nom de la base de dades",
+    "Database tablespace" : "Espai de taula de la base de dades",
+    "Database host" : "Ordinador central de la base de dades",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "S'utilitzarà SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu.",
+    "Finish setup" : "Acaba la configuració",
+    "Finishing …" : "Acabant...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aquesta aplicació requereix JavaScrip pel seu correcte funcionament. Si us plau <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i actualitzeu la pàgina.",
+    "%s is available. Get more information on how to update." : "%s està disponible. Obtingueu més informació de com actualitzar.",
+    "Log out" : "Surt",
+    "Server side authentication failed!" : "L'autenticació del servidor ha fallat!",
+    "Please contact your administrator." : "Contacteu amb l'administrador.",
+    "Forgot your password? Reset it!" : "Heu oblidat la contrasenya? Restabliu-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.",
+    "This means only administrators can use the instance." : "Això significa que només els administradors poden usar la instància.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
+    "Thank you for your patience." : "Gràcies per la paciència.",
+    "You are accessing the server from an untrusted domain." : "Esteu accedint el servidor des d'un domini no fiable",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
+    "Add \"%s\" as trusted domain" : "Afegeix \"%s\" com a domini de confiança",
+    "%s will be updated to version %s." : "%s s'actualitzarà a la versió %s.",
+    "The following apps will be disabled:" : "Les següents aplicacions es desactivaran:",
+    "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ó",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitar que s'esgoti el temps d'espera en instalacions grans, pots en el seu lloc fer córrer la següent comanda en el directori d'instalació. "
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
deleted file mode 100644
index 8f23961feff..00000000000
--- a/core/l10n/ca.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "No s'ha pogut enviar correu als usuaris següents: %s",
-"Turned on maintenance mode" => "Activat el mode de manteniment",
-"Turned off maintenance mode" => "Desactivat el mode de manteniment",
-"Updated database" => "Actualitzada la base de dades",
-"Checked database schema update" => "S'ha comprobat l'actualització de l'esquema de la base de dades",
-"Checked database schema update for apps" => "S'ha comprobat l'actualització de l'esquema de la base de dades per les apps",
-"Updated \"%s\" to %s" => "Actualitzat \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Aplicacions incompatibles desactivades: %s",
-"No image or file provided" => "No s'han proporcionat imatges o fitxers",
-"Unknown filetype" => "Tipus de fitxer desconegut",
-"Invalid image" => "Imatge no vàlida",
-"No temporary profile picture available, try again" => "No hi ha imatge temporal de perfil disponible, torneu a intentar-ho",
-"No crop data provided" => "No heu proporcionat dades del retall",
-"Sunday" => "Diumenge",
-"Monday" => "Dilluns",
-"Tuesday" => "Dimarts",
-"Wednesday" => "Dimecres",
-"Thursday" => "Dijous",
-"Friday" => "Divendres",
-"Saturday" => "Dissabte",
-"January" => "Gener",
-"February" => "Febrer",
-"March" => "Març",
-"April" => "Abril",
-"May" => "Maig",
-"June" => "Juny",
-"July" => "Juliol",
-"August" => "Agost",
-"September" => "Setembre",
-"October" => "Octubre",
-"November" => "Novembre",
-"December" => "Desembre",
-"Settings" => "Configuració",
-"File" => "Fitxer",
-"Folder" => "Carpeta",
-"Image" => "Imatge",
-"Audio" => "Audio",
-"Saving..." => "Desant...",
-"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?",
-"I know what I'm doing" => "Sé el que faig",
-"Reset password" => "Reinicialitza la contrasenya",
-"Password can not be changed. Please contact your administrator." => "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
-"No" => "No",
-"Yes" => "Sí",
-"Choose" => "Escull",
-"Error loading file picker template: {error}" => "Error en carregar la plantilla de càrrega de fitxers: {error}",
-"Ok" => "D'acord",
-"Error loading message template: {error}" => "Error en carregar la plantilla de missatge: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicte de fitxer","{count} conflictes de fitxer"),
-"One file conflict" => "Un fitxer en conflicte",
-"New Files" => "Fitxers nous",
-"Already existing files" => "Fitxers que ja existeixen",
-"Which files do you want to keep?" => "Quin fitxer voleu conservar?",
-"If you select both versions, the copied file will have a number added to its name." => "Si seleccioneu les dues versions, el fitxer copiat tindrà un número afegit al seu nom.",
-"Cancel" => "Cancel·la",
-"Continue" => "Continua",
-"(all selected)" => "(selecciona-ho tot)",
-"({count} selected)" => "({count} seleccionats)",
-"Error loading file exists template" => "Error en carregar la plantilla de fitxer existent",
-"Very weak password" => "Contrasenya massa feble",
-"Weak password" => "Contrasenya feble",
-"So-so password" => "Contrasenya passable",
-"Good password" => "Contrasenya bona",
-"Strong password" => "Contrasenya forta",
-"Your web server is not yet properly setup to allow files 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 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." => "Aquest servidor no té cap connexió a internet que funcioni. 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.",
-"Error occurred while checking server setup" => "Hi ha hagut un error en comprovar la configuració del servidor",
-"Shared" => "Compartit",
-"Shared with {recipients}" => "Compartit amb {recipients}",
-"Share" => "Comparteix",
-"Error" => "Error",
-"Error while sharing" => "Error en compartir",
-"Error while unsharing" => "Error en deixar de compartir",
-"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 user or group …" => "Comparteix amb usuari o grup...",
-"Share link" => "Enllaç de compartició",
-"The public link will expire no later than {days} days after it is created" => "L'enllaç públic tindrà venciment abans de {days} dies després de crear-lo",
-"Password protect" => "Protegir amb contrasenya",
-"Choose a password for the public link" => "Escolliu una contrasenya per l'enllaç públic",
-"Allow Public Upload" => "Permet pujada pública",
-"Email link to person" => "Enllaç per correu electrónic amb la persona",
-"Send" => "Envia",
-"Set expiration date" => "Estableix la data de venciment",
-"Expiration date" => "Data de venciment",
-"Adding user..." => "Afegint usuari...",
-"group" => "grup",
-"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",
-"can share" => "pot compartir",
-"can edit" => "pot editar",
-"access control" => "control d'accés",
-"create" => "crea",
-"update" => "actualitza",
-"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",
-"Warning" => "Avís",
-"The object type is not specified." => "No s'ha especificat el tipus d'objecte.",
-"Enter new" => "Escriu nou",
-"Delete" => "Esborra",
-"Add" => "Afegeix",
-"Edit tags" => "Edita etiquetes",
-"Error loading dialog template: {error}" => "Error en carregar la plantilla de diàleg: {error}",
-"No tags selected for deletion." => "No heu seleccionat les etiquetes a eliminar.",
-"Updating {productName} to version {version}, this may take a while." => "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
-"Please reload the page." => "Carregueu la pàgina de nou.",
-"The update was unsuccessful." => "L'actualització no ha tingut èxit.",
-"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 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",
-"Use the following link to reset your password: {link}" => "Useu l'enllaç següent per restablir la contrasenya: {link}",
-"You will receive a link to reset your password via Email." => "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
-"Username" => "Nom d'usuari",
-"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?" => "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. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
-"Yes, I really want to reset my password now" => "Sí, vull restablir ara la contrasenya",
-"Reset" => "Estableix de nou",
-"New password" => "Contrasenya nova",
-"New Password" => "Contrasenya nova",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
-"For the best results, please consider using a GNU/Linux server instead." => "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
-"Personal" => "Personal",
-"Users" => "Usuaris",
-"Apps" => "Aplicacions",
-"Admin" => "Administració",
-"Help" => "Ajuda",
-"Error loading tags" => "Error en carregar les etiquetes",
-"Tag already exists" => "L'etiqueta ja existeix",
-"Error deleting tag(s)" => "Error en eliminar etiqueta(s)",
-"Error tagging" => "Error en etiquetar",
-"Error untagging" => "Error en treure les etiquetes",
-"Error favoriting" => "Error en posar a preferits",
-"Error unfavoriting" => "Error en treure de preferits",
-"Access forbidden" => "Accés prohibit",
-"File not found" => "No s'ha trobat l'arxiu",
-"The specified document has not been found on the server." => "El document especificat no s'ha trobat al servidor.",
-"You can click here to return to %s." => "Pots clicar aquí per tornar a %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ei,\n\nnomés fer-te saber que %s ha compartit %s amb tu.\nMira-ho a: %s\n\n",
-"The share will expire on %s." => "La compartició venç el %s.",
-"Cheers!" => "Salut!",
-"The server encountered an internal error and was unable to complete your request." => "El servidor ha trobat un error intern i no pot finalitzar la teva petició.",
-"More details can be found in the server log." => "Pots trobar més detalls al llistat del servidor.",
-"Technical details" => "Detalls tècnics",
-"Remote Address: %s" => "Adreça remota: %s",
-"Code: %s" => "Codi: %s",
-"Message: %s" => "Missatge: %s",
-"File: %s" => "Fitxer: %s",
-"Security Warning" => "Avís de seguretat",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versió de PHP que useu és vulnerable a l'atac per NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Actualitzeu la instal·lació de PHP per usar %s de forma segura.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
-"Create an <strong>admin account</strong>" => "Crea un <strong>compte d'administrador</strong>",
-"Password" => "Contrasenya",
-"Storage & database" => "Emmagatzematge i base de dades",
-"Data folder" => "Carpeta de dades",
-"Configure the database" => "Configura la base de dades",
-"Only %s is available." => "Només hi ha disponible %s",
-"Database user" => "Usuari de la base de dades",
-"Database password" => "Contrasenya de la base de dades",
-"Database name" => "Nom de la base de dades",
-"Database tablespace" => "Espai de taula de la base de dades",
-"Database host" => "Ordinador central de la base de dades",
-"SQLite will be used as database. For larger installations we recommend to change this." => "S'utilitzarà SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu.",
-"Finish setup" => "Acaba la configuració",
-"Finishing …" => "Acabant...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Aquesta aplicació requereix JavaScrip pel seu correcte funcionament. Si us plau <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeu JavaScript</a> i actualitzeu la pàgina.",
-"%s is available. Get more information on how to update." => "%s està disponible. Obtingueu més informació de com actualitzar.",
-"Log out" => "Surt",
-"Server side authentication failed!" => "L'autenticació del servidor ha fallat!",
-"Please contact your administrator." => "Contacteu amb l'administrador.",
-"Forgot your password? Reset it!" => "Heu oblidat la contrasenya? Restabliu-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.",
-"This means only administrators can use the instance." => "Això significa que només els administradors poden usar la instància.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
-"Thank you for your patience." => "Gràcies per la paciència.",
-"You are accessing the server from an untrusted domain." => "Esteu accedint el servidor des d'un domini no fiable",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contacteu amb l'administrador. Si sou un administrador d'aquesta instància, configureu el paràmetre \"trusted_domain\" a config/config.php. Hi ha un exemple de configuració a config/config.sampe.php",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "En funció de la teva configuració, com a administrador podries utilitzar el botó d'abaix per confiar en aquest domini.",
-"Add \"%s\" as trusted domain" => "Afegeix \"%s\" com a domini de confiança",
-"%s will be updated to version %s." => "%s s'actualitzarà a la versió %s.",
-"The following apps will be disabled:" => "Les següents aplicacions es desactivaran:",
-"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ó",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Per evitar que s'esgoti el temps d'espera en instalacions grans, pots en el seu lloc fer córrer la següent comanda en el directori d'instalació. "
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ca@valencia.js b/core/l10n/ca@valencia.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ca@valencia.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ca@valencia.json b/core/l10n/ca@valencia.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ca@valencia.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ca@valencia.php b/core/l10n/ca@valencia.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ca@valencia.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
new file mode 100644
index 00000000000..3ec5192562f
--- /dev/null
+++ b/core/l10n/cs_CZ.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nebylo možné odeslat e-mail následujícím uživatelům: %s",
+    "Turned on maintenance mode" : "Zapnut režim údržby",
+    "Turned off maintenance mode" : "Vypnut režim údržby",
+    "Updated database" : "Zaktualizována databáze",
+    "Checked database schema update" : "Aktualizace schéma databáze byla ověřena",
+    "Checked database schema update for apps" : "Aktualizace schéma databáze aplikací byla ověřena",
+    "Updated \"%s\" to %s" : "Aktualizováno z \"%s\" na %s",
+    "Disabled incompatible apps: %s" : "Zakázané nekompatibilní aplikace: %s",
+    "No image or file provided" : "Soubor nebo obrázek nebyl zadán",
+    "Unknown filetype" : "Neznámý typ souboru",
+    "Invalid image" : "Chybný obrázek",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázek není k dispozici, zkuste to znovu",
+    "No crop data provided" : "Nebyla poskytnuta data pro oříznutí obrázku",
+    "Sunday" : "Neděle",
+    "Monday" : "Pondělí",
+    "Tuesday" : "Úterý",
+    "Wednesday" : "Středa",
+    "Thursday" : "Čtvrtek",
+    "Friday" : "Pátek",
+    "Saturday" : "Sobota",
+    "January" : "Leden",
+    "February" : "Únor",
+    "March" : "Březen",
+    "April" : "Duben",
+    "May" : "Květen",
+    "June" : "Červen",
+    "July" : "Červenec",
+    "August" : "Srpen",
+    "September" : "Září",
+    "October" : "Říjen",
+    "November" : "Listopad",
+    "December" : "Prosinec",
+    "Settings" : "Nastavení",
+    "File" : "Soubor",
+    "Folder" : "Složka",
+    "Image" : "Obrázek",
+    "Audio" : "Audio",
+    "Saving..." : "Ukládám...",
+    "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho 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 obnovení hesla byl odeslán na vaši e-mailovou 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 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?" : "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.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého administrátora než budete pokračovat. <br />Opravdu si přejete pokračovat?",
+    "I know what I'm doing" : "Vím co dělám",
+    "Reset password" : "Obnovit heslo",
+    "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého administrátora.",
+    "No" : "Ne",
+    "Yes" : "Ano",
+    "Choose" : "Vybrat",
+    "Error loading file picker template: {error}" : "Chyba při nahrávání šablony výběru souborů: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba při nahrávání šablony zprávy: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"],
+    "One file conflict" : "Jeden konflikt souboru",
+    "New Files" : "Nové soubory",
+    "Already existing files" : "Již existující soubory",
+    "Which files do you want to keep?" : "Které soubory chcete ponechat?",
+    "If you select both versions, the copied file will have a number added to its name." : "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.",
+    "Cancel" : "Zrušit",
+    "Continue" : "Pokračovat",
+    "(all selected)" : "(vybráno vše)",
+    "({count} selected)" : "(vybráno {count})",
+    "Error loading file exists template" : "Chyba při nahrávání šablony existence souboru",
+    "Very weak password" : "Velmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Středně silné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
+    "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." : "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
+    "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě",
+    "Shared" : "Sdílené",
+    "Shared with {recipients}" : "Sdíleno s {recipients}",
+    "Share" : "Sdílet",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba při sdílení",
+    "Error while unsharing" : "Chyba při rušení sdílení",
+    "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 user or group …" : "Sdílet s uživatelem nebo skupinou",
+    "Share link" : "Sdílet odkaz",
+    "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
+    "Password protect" : "Chránit heslem",
+    "Choose a password for the public link" : "Zadej heslo pro tento veřejný odkaz",
+    "Allow Public Upload" : "Povolit veřejné nahrávání",
+    "Email link to person" : "Odeslat osobě odkaz e-mailem",
+    "Send" : "Odeslat",
+    "Set expiration date" : "Nastavit datum vypršení platnosti",
+    "Expiration date" : "Datum vypršení platnosti",
+    "Adding user..." : "Přidávám uživatele...",
+    "group" : "skupina",
+    "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 e-mailem",
+    "can share" : "může sdílet",
+    "can edit" : "lze upravovat",
+    "access control" : "řízení přístupu",
+    "create" : "vytvořit",
+    "update" : "aktualizovat",
+    "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" : "E-mail odeslán",
+    "Warning" : "Varování",
+    "The object type is not specified." : "Není určen typ objektu.",
+    "Enter new" : "Zadat nový",
+    "Delete" : "Smazat",
+    "Add" : "Přidat",
+    "Edit tags" : "Editovat štítky",
+    "Error loading dialog template: {error}" : "Chyba při načítání šablony dialogu: {error}",
+    "No tags selected for deletion." : "Žádné štítky nebyly vybrány ke smazání.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
+    "Please reload the page." : "Načtěte stránku znovu, prosím.",
+    "The update was unsuccessful." : "Aktualizace nebyla úspěš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 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 e-mailová adresa. Kontaktujte prosím svého administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}",
+    "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
+    "Username" : "Uživatelské jméno",
+    "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?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
+    "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo",
+    "Reset" : "Restartovat složku",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
+    "Personal" : "Osobní",
+    "Users" : "Uživatelé",
+    "Apps" : "Aplikace",
+    "Admin" : "Administrace",
+    "Help" : "Nápověda",
+    "Error loading tags" : "Chyba při načítání štítků",
+    "Tag already exists" : "Štítek již existuje",
+    "Error deleting tag(s)" : "Chyba při mazání štítku(ů)",
+    "Error tagging" : "Chyba při označování štítkem",
+    "Error untagging" : "Chyba při odznačování štítků",
+    "Error favoriting" : "Chyba při označování jako oblíbené",
+    "Error unfavoriting" : "Chyba při odznačování jako oblíbené",
+    "Access forbidden" : "Přístup zakázán",
+    "File not found" : "Soubor nenalezen",
+    "The specified document has not been found on the server." : "Požadovaný dokument nebyl na serveru nalezen.",
+    "You can click here to return to %s." : "Klikněte zde pro návrat na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n",
+    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Cheers!" : "Ať slouží!",
+    "Internal Server Error" : "Vnitřní chyba serveru",
+    "The server encountered an internal error and was unable to complete your request." : "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
+    "More details can be found in the server log." : "Více podrobností k nalezení v serverovém logu.",
+    "Technical details" : "Technické detaily",
+    "Remote Address: %s" : "Vzdálená adresa: %s",
+    "Request ID: %s" : "ID požadavku: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Zpráva: %s",
+    "File: %s" : "Soubor: %s",
+    "Line: %s" : "Řádka: %s",
+    "Trace" : "Trasa",
+    "Security Warning" : "Bezpečnostní upozornění",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vaši instanci PHP pro bezpečné používání %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
+    "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
+    "Password" : "Heslo",
+    "Storage & database" : "Úložiště & databáze",
+    "Data folder" : "Složka s daty",
+    "Configure the database" : "Nastavit databázi",
+    "Only %s is available." : "Pouze %s je dostupný.",
+    "Database user" : "Uživatel databáze",
+    "Database password" : "Heslo databáze",
+    "Database name" : "Název databáze",
+    "Database tablespace" : "Tabulkový prostor databáze",
+    "Database host" : "Hostitel databáze",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Bude použita databáze SQLite. Pro větší instalace doporučujeme toto změnit.",
+    "Finish setup" : "Dokončit nastavení",
+    "Finishing …" : "Dokončuji...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte stránku.",
+    "%s is available. Get more information on how to update." : "%s je dostupná. Získejte více informací k postupu aktualizace.",
+    "Log out" : "Odhlásit se",
+    "Server side authentication failed!" : "Autentizace na serveru selhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vašeho správce.",
+    "Forgot your password? Reset it!" : "Zapomenuté heslo? Nastavte si nové!",
+    "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>" : "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
+    "This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
+    "Thank you for your patience." : "Děkuji za trpělivost.",
+    "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
+    "Add \"%s\" as trusted domain" : "Přidat \"%s\" jako důvěryhodnou doménu",
+    "%s will be updated to version %s." : "%s bude aktualizován na verzi %s.",
+    "The following apps will be disabled:" : "Následující aplikace budou zakázány:",
+    "The theme %s has been disabled." : "Vzhled %s byl zakázán.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
+    "Start update" : "Spustit aktualizaci",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:",
+    "This %s instance is currently being updated, which may take a while." : "Tato instalace %s je právě aktualizována a to může chvíli trvat.",
+    "This page will refresh itself when the %s instance is available again." : "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s."
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
new file mode 100644
index 00000000000..2102050a976
--- /dev/null
+++ b/core/l10n/cs_CZ.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nebylo možné odeslat e-mail následujícím uživatelům: %s",
+    "Turned on maintenance mode" : "Zapnut režim údržby",
+    "Turned off maintenance mode" : "Vypnut režim údržby",
+    "Updated database" : "Zaktualizována databáze",
+    "Checked database schema update" : "Aktualizace schéma databáze byla ověřena",
+    "Checked database schema update for apps" : "Aktualizace schéma databáze aplikací byla ověřena",
+    "Updated \"%s\" to %s" : "Aktualizováno z \"%s\" na %s",
+    "Disabled incompatible apps: %s" : "Zakázané nekompatibilní aplikace: %s",
+    "No image or file provided" : "Soubor nebo obrázek nebyl zadán",
+    "Unknown filetype" : "Neznámý typ souboru",
+    "Invalid image" : "Chybný obrázek",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázek není k dispozici, zkuste to znovu",
+    "No crop data provided" : "Nebyla poskytnuta data pro oříznutí obrázku",
+    "Sunday" : "Neděle",
+    "Monday" : "Pondělí",
+    "Tuesday" : "Úterý",
+    "Wednesday" : "Středa",
+    "Thursday" : "Čtvrtek",
+    "Friday" : "Pátek",
+    "Saturday" : "Sobota",
+    "January" : "Leden",
+    "February" : "Únor",
+    "March" : "Březen",
+    "April" : "Duben",
+    "May" : "Květen",
+    "June" : "Červen",
+    "July" : "Červenec",
+    "August" : "Srpen",
+    "September" : "Září",
+    "October" : "Říjen",
+    "November" : "Listopad",
+    "December" : "Prosinec",
+    "Settings" : "Nastavení",
+    "File" : "Soubor",
+    "Folder" : "Složka",
+    "Image" : "Obrázek",
+    "Audio" : "Audio",
+    "Saving..." : "Ukládám...",
+    "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho 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 obnovení hesla byl odeslán na vaši e-mailovou 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 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?" : "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.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého administrátora než budete pokračovat. <br />Opravdu si přejete pokračovat?",
+    "I know what I'm doing" : "Vím co dělám",
+    "Reset password" : "Obnovit heslo",
+    "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého administrátora.",
+    "No" : "Ne",
+    "Yes" : "Ano",
+    "Choose" : "Vybrat",
+    "Error loading file picker template: {error}" : "Chyba při nahrávání šablony výběru souborů: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba při nahrávání šablony zprávy: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"],
+    "One file conflict" : "Jeden konflikt souboru",
+    "New Files" : "Nové soubory",
+    "Already existing files" : "Již existující soubory",
+    "Which files do you want to keep?" : "Které soubory chcete ponechat?",
+    "If you select both versions, the copied file will have a number added to its name." : "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.",
+    "Cancel" : "Zrušit",
+    "Continue" : "Pokračovat",
+    "(all selected)" : "(vybráno vše)",
+    "({count} selected)" : "(vybráno {count})",
+    "Error loading file exists template" : "Chyba při nahrávání šablony existence souboru",
+    "Very weak password" : "Velmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Středně silné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
+    "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." : "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
+    "Error occurred while checking server setup" : "Při ověřování nastavení serveru došlo k chybě",
+    "Shared" : "Sdílené",
+    "Shared with {recipients}" : "Sdíleno s {recipients}",
+    "Share" : "Sdílet",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba při sdílení",
+    "Error while unsharing" : "Chyba při rušení sdílení",
+    "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 user or group …" : "Sdílet s uživatelem nebo skupinou",
+    "Share link" : "Sdílet odkaz",
+    "The public link will expire no later than {days} days after it is created" : "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
+    "Password protect" : "Chránit heslem",
+    "Choose a password for the public link" : "Zadej heslo pro tento veřejný odkaz",
+    "Allow Public Upload" : "Povolit veřejné nahrávání",
+    "Email link to person" : "Odeslat osobě odkaz e-mailem",
+    "Send" : "Odeslat",
+    "Set expiration date" : "Nastavit datum vypršení platnosti",
+    "Expiration date" : "Datum vypršení platnosti",
+    "Adding user..." : "Přidávám uživatele...",
+    "group" : "skupina",
+    "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 e-mailem",
+    "can share" : "může sdílet",
+    "can edit" : "lze upravovat",
+    "access control" : "řízení přístupu",
+    "create" : "vytvořit",
+    "update" : "aktualizovat",
+    "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" : "E-mail odeslán",
+    "Warning" : "Varování",
+    "The object type is not specified." : "Není určen typ objektu.",
+    "Enter new" : "Zadat nový",
+    "Delete" : "Smazat",
+    "Add" : "Přidat",
+    "Edit tags" : "Editovat štítky",
+    "Error loading dialog template: {error}" : "Chyba při načítání šablony dialogu: {error}",
+    "No tags selected for deletion." : "Žádné štítky nebyly vybrány ke smazání.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
+    "Please reload the page." : "Načtěte stránku znovu, prosím.",
+    "The update was unsuccessful." : "Aktualizace nebyla úspěš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 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 e-mailová adresa. Kontaktujte prosím svého administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}",
+    "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
+    "Username" : "Uživatelské jméno",
+    "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?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
+    "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo",
+    "Reset" : "Restartovat složku",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
+    "Personal" : "Osobní",
+    "Users" : "Uživatelé",
+    "Apps" : "Aplikace",
+    "Admin" : "Administrace",
+    "Help" : "Nápověda",
+    "Error loading tags" : "Chyba při načítání štítků",
+    "Tag already exists" : "Štítek již existuje",
+    "Error deleting tag(s)" : "Chyba při mazání štítku(ů)",
+    "Error tagging" : "Chyba při označování štítkem",
+    "Error untagging" : "Chyba při odznačování štítků",
+    "Error favoriting" : "Chyba při označování jako oblíbené",
+    "Error unfavoriting" : "Chyba při odznačování jako oblíbené",
+    "Access forbidden" : "Přístup zakázán",
+    "File not found" : "Soubor nenalezen",
+    "The specified document has not been found on the server." : "Požadovaný dokument nebyl na serveru nalezen.",
+    "You can click here to return to %s." : "Klikněte zde pro návrat na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n",
+    "The share will expire on %s." : "Sdílení vyprší %s.",
+    "Cheers!" : "Ať slouží!",
+    "Internal Server Error" : "Vnitřní chyba serveru",
+    "The server encountered an internal error and was unable to complete your request." : "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
+    "More details can be found in the server log." : "Více podrobností k nalezení v serverovém logu.",
+    "Technical details" : "Technické detaily",
+    "Remote Address: %s" : "Vzdálená adresa: %s",
+    "Request ID: %s" : "ID požadavku: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Zpráva: %s",
+    "File: %s" : "Soubor: %s",
+    "Line: %s" : "Řádka: %s",
+    "Trace" : "Trasa",
+    "Security Warning" : "Bezpečnostní upozornění",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vaši instanci PHP pro bezpečné používání %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
+    "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
+    "Password" : "Heslo",
+    "Storage & database" : "Úložiště & databáze",
+    "Data folder" : "Složka s daty",
+    "Configure the database" : "Nastavit databázi",
+    "Only %s is available." : "Pouze %s je dostupný.",
+    "Database user" : "Uživatel databáze",
+    "Database password" : "Heslo databáze",
+    "Database name" : "Název databáze",
+    "Database tablespace" : "Tabulkový prostor databáze",
+    "Database host" : "Hostitel databáze",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Bude použita databáze SQLite. Pro větší instalace doporučujeme toto změnit.",
+    "Finish setup" : "Dokončit nastavení",
+    "Finishing …" : "Dokončuji...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte stránku.",
+    "%s is available. Get more information on how to update." : "%s je dostupná. Získejte více informací k postupu aktualizace.",
+    "Log out" : "Odhlásit se",
+    "Server side authentication failed!" : "Autentizace na serveru selhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vašeho správce.",
+    "Forgot your password? Reset it!" : "Zapomenuté heslo? Nastavte si nové!",
+    "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>" : "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
+    "This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
+    "Thank you for your patience." : "Děkuji za trpělivost.",
+    "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
+    "Add \"%s\" as trusted domain" : "Přidat \"%s\" jako důvěryhodnou doménu",
+    "%s will be updated to version %s." : "%s bude aktualizován na verzi %s.",
+    "The following apps will be disabled:" : "Následující aplikace budou zakázány:",
+    "The theme %s has been disabled." : "Vzhled %s byl zakázán.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
+    "Start update" : "Spustit aktualizaci",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:",
+    "This %s instance is currently being updated, which may take a while." : "Tato instalace %s je právě aktualizována a to může chvíli trvat.",
+    "This page will refresh itself when the %s instance is available again." : "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s."
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
deleted file mode 100644
index ac7642f6c86..00000000000
--- a/core/l10n/cs_CZ.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nebylo možné odeslat e-mail následujícím uživatelům: %s",
-"Turned on maintenance mode" => "Zapnut režim údržby",
-"Turned off maintenance mode" => "Vypnut režim údržby",
-"Updated database" => "Zaktualizována databáze",
-"Checked database schema update" => "Aktualizace schéma databáze byla ověřena",
-"Checked database schema update for apps" => "Aktualizace schéma databáze aplikací byla ověřena",
-"Updated \"%s\" to %s" => "Aktualizováno z \"%s\" na %s",
-"Disabled incompatible apps: %s" => "Zakázané nekompatibilní aplikace: %s",
-"No image or file provided" => "Soubor nebo obrázek nebyl zadán",
-"Unknown filetype" => "Neznámý typ souboru",
-"Invalid image" => "Chybný obrázek",
-"No temporary profile picture available, try again" => "Dočasný profilový obrázek není k dispozici, zkuste to znovu",
-"No crop data provided" => "Nebyla poskytnuta data pro oříznutí obrázku",
-"Sunday" => "Neděle",
-"Monday" => "Pondělí",
-"Tuesday" => "Úterý",
-"Wednesday" => "Středa",
-"Thursday" => "Čtvrtek",
-"Friday" => "Pátek",
-"Saturday" => "Sobota",
-"January" => "Leden",
-"February" => "Únor",
-"March" => "Březen",
-"April" => "Duben",
-"May" => "Květen",
-"June" => "Červen",
-"July" => "Červenec",
-"August" => "Srpen",
-"September" => "Září",
-"October" => "Říjen",
-"November" => "Listopad",
-"December" => "Prosinec",
-"Settings" => "Nastavení",
-"File" => "Soubor",
-"Folder" => "Složka",
-"Image" => "Obrázek",
-"Audio" => "Audio",
-"Saving..." => "Ukládám...",
-"Couldn't send reset email. Please contact your administrator." => "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho 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 obnovení hesla byl odeslán na vaši e-mailovou 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 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?" => "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.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého administrátora než budete pokračovat. <br />Opravdu si přejete pokračovat?",
-"I know what I'm doing" => "Vím co dělám",
-"Reset password" => "Obnovit heslo",
-"Password can not be changed. Please contact your administrator." => "Heslo nelze změnit. Kontaktujte prosím svého administrátora.",
-"No" => "Ne",
-"Yes" => "Ano",
-"Choose" => "Vybrat",
-"Error loading file picker template: {error}" => "Chyba při nahrávání šablony výběru souborů: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Chyba při nahrávání šablony zprávy: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} souborový konflikt","{count} souborové konflikty","{count} souborových konfliktů"),
-"One file conflict" => "Jeden konflikt souboru",
-"New Files" => "Nové soubory",
-"Already existing files" => "Již existující soubory",
-"Which files do you want to keep?" => "Které soubory chcete ponechat?",
-"If you select both versions, the copied file will have a number added to its name." => "Pokud zvolíte obě verze, zkopírovaný soubor bude mít název doplněný o číslo.",
-"Cancel" => "Zrušit",
-"Continue" => "Pokračovat",
-"(all selected)" => "(vybráno vše)",
-"({count} selected)" => "(vybráno {count})",
-"Error loading file exists template" => "Chyba při nahrávání šablony existence souboru",
-"Very weak password" => "Velmi slabé heslo",
-"Weak password" => "Slabé heslo",
-"So-so password" => "Středně silné heslo",
-"Good password" => "Dobré heslo",
-"Strong password" => "Silné heslo",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server není správně nastaven pro umožnění synchronizace, rozhraní WebDAV se zdá být rozbité.",
-"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." => "Server nemá funkční připojení k internetu. Některé moduly jako např. externí úložiště, oznámení o dostupných aktualizacích nebo instalace aplikací třetích stran nebudou fungovat. Přístup k souborům z jiných míst a odesílání oznamovacích e-mailů také nemusí fungovat. Pokud si přejete využívat všech vlastností ownCloud, doporučujeme povolit připojení k internetu tomuto serveru.",
-"Error occurred while checking server setup" => "Při ověřování nastavení serveru došlo k chybě",
-"Shared" => "Sdílené",
-"Shared with {recipients}" => "Sdíleno s {recipients}",
-"Share" => "Sdílet",
-"Error" => "Chyba",
-"Error while sharing" => "Chyba při sdílení",
-"Error while unsharing" => "Chyba při rušení sdílení",
-"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 user or group …" => "Sdílet s uživatelem nebo skupinou",
-"Share link" => "Sdílet odkaz",
-"The public link will expire no later than {days} days after it is created" => "Veřejný odkaz vyprší nejpozději {days} dní od svého vytvoření",
-"Password protect" => "Chránit heslem",
-"Choose a password for the public link" => "Zadej heslo pro tento veřejný odkaz",
-"Allow Public Upload" => "Povolit veřejné nahrávání",
-"Email link to person" => "Odeslat osobě odkaz e-mailem",
-"Send" => "Odeslat",
-"Set expiration date" => "Nastavit datum vypršení platnosti",
-"Expiration date" => "Datum vypršení platnosti",
-"Adding user..." => "Přidávám uživatele...",
-"group" => "skupina",
-"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 e-mailem",
-"can share" => "může sdílet",
-"can edit" => "lze upravovat",
-"access control" => "řízení přístupu",
-"create" => "vytvořit",
-"update" => "aktualizovat",
-"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" => "E-mail odeslán",
-"Warning" => "Varování",
-"The object type is not specified." => "Není určen typ objektu.",
-"Enter new" => "Zadat nový",
-"Delete" => "Smazat",
-"Add" => "Přidat",
-"Edit tags" => "Editovat štítky",
-"Error loading dialog template: {error}" => "Chyba při načítání šablony dialogu: {error}",
-"No tags selected for deletion." => "Žádné štítky nebyly vybrány ke smazání.",
-"Updating {productName} to version {version}, this may take a while." => "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
-"Please reload the page." => "Načtěte stránku znovu, prosím.",
-"The update was unsuccessful." => "Aktualizace nebyla úspěš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 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 e-mailová adresa. Kontaktujte prosím svého administrátora.",
-"%s password reset" => "reset hesla %s",
-"Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
-"You will receive a link to reset your password via Email." => "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
-"Username" => "Uživatelské jméno",
-"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?" => "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
-"Yes, I really want to reset my password now" => "Ano, opravdu si nyní přeji obnovit mé heslo",
-"Reset" => "Restartovat složku",
-"New password" => "Nové heslo",
-"New Password" => "Nové heslo",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
-"For the best results, please consider using a GNU/Linux server instead." => "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
-"Personal" => "Osobní",
-"Users" => "Uživatelé",
-"Apps" => "Aplikace",
-"Admin" => "Administrace",
-"Help" => "Nápověda",
-"Error loading tags" => "Chyba při načítání štítků",
-"Tag already exists" => "Štítek již existuje",
-"Error deleting tag(s)" => "Chyba při mazání štítku(ů)",
-"Error tagging" => "Chyba při označování štítkem",
-"Error untagging" => "Chyba při odznačování štítků",
-"Error favoriting" => "Chyba při označování jako oblíbené",
-"Error unfavoriting" => "Chyba při odznačování jako oblíbené",
-"Access forbidden" => "Přístup zakázán",
-"File not found" => "Soubor nenalezen",
-"The specified document has not been found on the server." => "Požadovaný dokument nebyl na serveru nalezen.",
-"You can click here to return to %s." => "Klikněte zde pro návrat na %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej ty tam,\n\njen ti chci dát vědět, že %s sdílel %s s tebou.\nZobraz si to: %s\n\n",
-"The share will expire on %s." => "Sdílení vyprší %s.",
-"Cheers!" => "Ať slouží!",
-"Internal Server Error" => "Vnitřní chyba serveru",
-"The server encountered an internal error and was unable to complete your request." => "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
-"More details can be found in the server log." => "Více podrobností k nalezení v serverovém logu.",
-"Technical details" => "Technické detaily",
-"Remote Address: %s" => "Vzdálená adresa: %s",
-"Request ID: %s" => "ID požadavku: %s",
-"Code: %s" => "Kód: %s",
-"Message: %s" => "Zpráva: %s",
-"File: %s" => "Soubor: %s",
-"Line: %s" => "Řádka: %s",
-"Trace" => "Trasa",
-"Security Warning" => "Bezpečnostní upozornění",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verze vašeho PHP je napadnutelná pomocí techniky \"NULL Byte\" (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Aktualizujte prosím vaši instanci PHP pro bezpečné používání %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
-"Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
-"Password" => "Heslo",
-"Storage & database" => "Úložiště & databáze",
-"Data folder" => "Složka s daty",
-"Configure the database" => "Nastavit databázi",
-"Only %s is available." => "Pouze %s je dostupný.",
-"Database user" => "Uživatel databáze",
-"Database password" => "Heslo databáze",
-"Database name" => "Název databáze",
-"Database tablespace" => "Tabulkový prostor databáze",
-"Database host" => "Hostitel databáze",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Bude použita databáze SQLite. Pro větší instalace doporučujeme toto změnit.",
-"Finish setup" => "Dokončit nastavení",
-"Finishing …" => "Dokončuji...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Tato aplikace potřebuje pro správnou funkčnost JavaScript. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">povolte JavaScript</a> a znovu načtěte stránku.",
-"%s is available. Get more information on how to update." => "%s je dostupná. Získejte více informací k postupu aktualizace.",
-"Log out" => "Odhlásit se",
-"Server side authentication failed!" => "Autentizace na serveru selhala!",
-"Please contact your administrator." => "Kontaktujte prosím vašeho správce.",
-"Forgot your password? Reset it!" => "Zapomenuté heslo? Nastavte si nové!",
-"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>" => "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
-"This means only administrators can use the instance." => "To znamená, že pouze správci systému mohou aplikaci používat.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
-"Thank you for your patience." => "Děkuji za trpělivost.",
-"You are accessing the server from an untrusted domain." => "Přistupujete na server z nedůvěryhodné domény.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
-"Add \"%s\" as trusted domain" => "Přidat \"%s\" jako důvěryhodnou doménu",
-"%s will be updated to version %s." => "%s bude aktualizován na verzi %s.",
-"The following apps will be disabled:" => "Následující aplikace budou zakázány:",
-"The theme %s has been disabled." => "Vzhled %s byl zakázán.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
-"Start update" => "Spustit aktualizaci",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:",
-"This %s instance is currently being updated, which may take a while." => "Tato instalace %s je právě aktualizována a to může chvíli trvat.",
-"This page will refresh itself when the %s instance is available again." => "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
new file mode 100644
index 00000000000..62231977115
--- /dev/null
+++ b/core/l10n/cy_GB.js
@@ -0,0 +1,95 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Sul",
+    "Monday" : "Llun",
+    "Tuesday" : "Mawrth",
+    "Wednesday" : "Mercher",
+    "Thursday" : "Iau",
+    "Friday" : "Gwener",
+    "Saturday" : "Sadwrn",
+    "January" : "Ionawr",
+    "February" : "Chwefror",
+    "March" : "Mawrth",
+    "April" : "Ebrill",
+    "May" : "Mai",
+    "June" : "Mehefin",
+    "July" : "Gorffennaf",
+    "August" : "Awst",
+    "September" : "Medi",
+    "October" : "Hydref",
+    "November" : "Tachwedd",
+    "December" : "Rhagfyr",
+    "Settings" : "Gosodiadau",
+    "Folder" : "Plygell",
+    "Saving..." : "Yn cadw...",
+    "Reset password" : "Ailosod cyfrinair",
+    "No" : "Na",
+    "Yes" : "Ie",
+    "Choose" : "Dewisiwch",
+    "Ok" : "Iawn",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "Cancel" : "Diddymu",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
+    "Shared" : "Rhannwyd",
+    "Share" : "Rhannu",
+    "Error" : "Gwall",
+    "Error while sharing" : "Gwall wrth rannu",
+    "Error while unsharing" : "Gwall wrth ddad-rannu",
+    "Error while changing permissions" : "Gwall wrth newid caniatâd",
+    "Shared with you and the group {group} by {owner}" : "Rhannwyd â chi a'r grŵp {group} gan {owner}",
+    "Shared with you by {owner}" : "Rhannwyd â chi gan {owner}",
+    "Password protect" : "Diogelu 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 in {item} with {user}" : "Rhannwyd yn {item} â {user}",
+    "Unshare" : "Dad-rannu",
+    "can edit" : "yn gallu golygu",
+    "access control" : "rheolaeth mynediad",
+    "create" : "creu",
+    "update" : "diweddaru",
+    "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",
+    "Warning" : "Rhybudd",
+    "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
+    "Delete" : "Dileu",
+    "Add" : "Ychwanegu",
+    "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
+    "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
+    "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
+    "Username" : "Enw defnyddiwr",
+    "New password" : "Cyfrinair newydd",
+    "Personal" : "Personol",
+    "Users" : "Defnyddwyr",
+    "Apps" : "Pecynnau",
+    "Admin" : "Gweinyddu",
+    "Help" : "Cymorth",
+    "Access forbidden" : "Mynediad wedi'i wahardd",
+    "Security Warning" : "Rhybudd Diogelwch",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
+    "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
+    "Password" : "Cyfrinair",
+    "Data folder" : "Plygell data",
+    "Configure the database" : "Cyflunio'r gronfa ddata",
+    "Database user" : "Defnyddiwr cronfa ddata",
+    "Database password" : "Cyfrinair cronfa ddata",
+    "Database name" : "Enw cronfa ddata",
+    "Database tablespace" : "Tablespace cronfa ddata",
+    "Database host" : "Gwesteiwr cronfa ddata",
+    "Finish setup" : "Gorffen sefydlu",
+    "%s is available. Get more information on how to update." : "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru.",
+    "Log out" : "Allgofnodi",
+    "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
new file mode 100644
index 00000000000..fc9664a8236
--- /dev/null
+++ b/core/l10n/cy_GB.json
@@ -0,0 +1,93 @@
+{ "translations": {
+    "Sunday" : "Sul",
+    "Monday" : "Llun",
+    "Tuesday" : "Mawrth",
+    "Wednesday" : "Mercher",
+    "Thursday" : "Iau",
+    "Friday" : "Gwener",
+    "Saturday" : "Sadwrn",
+    "January" : "Ionawr",
+    "February" : "Chwefror",
+    "March" : "Mawrth",
+    "April" : "Ebrill",
+    "May" : "Mai",
+    "June" : "Mehefin",
+    "July" : "Gorffennaf",
+    "August" : "Awst",
+    "September" : "Medi",
+    "October" : "Hydref",
+    "November" : "Tachwedd",
+    "December" : "Rhagfyr",
+    "Settings" : "Gosodiadau",
+    "Folder" : "Plygell",
+    "Saving..." : "Yn cadw...",
+    "Reset password" : "Ailosod cyfrinair",
+    "No" : "Na",
+    "Yes" : "Ie",
+    "Choose" : "Dewisiwch",
+    "Ok" : "Iawn",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "Cancel" : "Diddymu",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
+    "Shared" : "Rhannwyd",
+    "Share" : "Rhannu",
+    "Error" : "Gwall",
+    "Error while sharing" : "Gwall wrth rannu",
+    "Error while unsharing" : "Gwall wrth ddad-rannu",
+    "Error while changing permissions" : "Gwall wrth newid caniatâd",
+    "Shared with you and the group {group} by {owner}" : "Rhannwyd â chi a'r grŵp {group} gan {owner}",
+    "Shared with you by {owner}" : "Rhannwyd â chi gan {owner}",
+    "Password protect" : "Diogelu 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 in {item} with {user}" : "Rhannwyd yn {item} â {user}",
+    "Unshare" : "Dad-rannu",
+    "can edit" : "yn gallu golygu",
+    "access control" : "rheolaeth mynediad",
+    "create" : "creu",
+    "update" : "diweddaru",
+    "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",
+    "Warning" : "Rhybudd",
+    "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
+    "Delete" : "Dileu",
+    "Add" : "Ychwanegu",
+    "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
+    "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
+    "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
+    "Username" : "Enw defnyddiwr",
+    "New password" : "Cyfrinair newydd",
+    "Personal" : "Personol",
+    "Users" : "Defnyddwyr",
+    "Apps" : "Pecynnau",
+    "Admin" : "Gweinyddu",
+    "Help" : "Cymorth",
+    "Access forbidden" : "Mynediad wedi'i wahardd",
+    "Security Warning" : "Rhybudd Diogelwch",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
+    "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
+    "Password" : "Cyfrinair",
+    "Data folder" : "Plygell data",
+    "Configure the database" : "Cyflunio'r gronfa ddata",
+    "Database user" : "Defnyddiwr cronfa ddata",
+    "Database password" : "Cyfrinair cronfa ddata",
+    "Database name" : "Enw cronfa ddata",
+    "Database tablespace" : "Tablespace cronfa ddata",
+    "Database host" : "Gwesteiwr cronfa ddata",
+    "Finish setup" : "Gorffen sefydlu",
+    "%s is available. Get more information on how to update." : "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru.",
+    "Log out" : "Allgofnodi",
+    "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/cy_GB.php b/core/l10n/cy_GB.php
deleted file mode 100644
index 4b805f11899..00000000000
--- a/core/l10n/cy_GB.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Sul",
-"Monday" => "Llun",
-"Tuesday" => "Mawrth",
-"Wednesday" => "Mercher",
-"Thursday" => "Iau",
-"Friday" => "Gwener",
-"Saturday" => "Sadwrn",
-"January" => "Ionawr",
-"February" => "Chwefror",
-"March" => "Mawrth",
-"April" => "Ebrill",
-"May" => "Mai",
-"June" => "Mehefin",
-"July" => "Gorffennaf",
-"August" => "Awst",
-"September" => "Medi",
-"October" => "Hydref",
-"November" => "Tachwedd",
-"December" => "Rhagfyr",
-"Settings" => "Gosodiadau",
-"Folder" => "Plygell",
-"Saving..." => "Yn cadw...",
-"Reset password" => "Ailosod cyfrinair",
-"No" => "Na",
-"Yes" => "Ie",
-"Choose" => "Dewisiwch",
-"Ok" => "Iawn",
-"_{count} file conflict_::_{count} file conflicts_" => array("","","",""),
-"Cancel" => "Diddymu",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Nid yw eich gweinydd wedi'i gyflunio eto i ganiatáu cydweddu ffeiliau oherwydd bod y rhyngwyneb WebDAV wedi torri.",
-"Shared" => "Rhannwyd",
-"Share" => "Rhannu",
-"Error" => "Gwall",
-"Error while sharing" => "Gwall wrth rannu",
-"Error while unsharing" => "Gwall wrth ddad-rannu",
-"Error while changing permissions" => "Gwall wrth newid caniatâd",
-"Shared with you and the group {group} by {owner}" => "Rhannwyd â chi a'r grŵp {group} gan {owner}",
-"Shared with you by {owner}" => "Rhannwyd â chi gan {owner}",
-"Password protect" => "Diogelu 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 in {item} with {user}" => "Rhannwyd yn {item} â {user}",
-"Unshare" => "Dad-rannu",
-"can edit" => "yn gallu golygu",
-"access control" => "rheolaeth mynediad",
-"create" => "creu",
-"update" => "diweddaru",
-"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",
-"Warning" => "Rhybudd",
-"The object type is not specified." => "Nid yw'r math o wrthrych wedi cael ei nodi.",
-"Delete" => "Dileu",
-"Add" => "Ychwanegu",
-"The update was successful. Redirecting you to ownCloud now." => "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
-"Use the following link to reset your password: {link}" => "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
-"You will receive a link to reset your password via Email." => "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
-"Username" => "Enw defnyddiwr",
-"New password" => "Cyfrinair newydd",
-"Personal" => "Personol",
-"Users" => "Defnyddwyr",
-"Apps" => "Pecynnau",
-"Admin" => "Gweinyddu",
-"Help" => "Cymorth",
-"Access forbidden" => "Mynediad wedi'i wahardd",
-"Security Warning" => "Rhybudd Diogelwch",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
-"Create an <strong>admin account</strong>" => "Crewch <strong>gyfrif gweinyddol</strong>",
-"Password" => "Cyfrinair",
-"Data folder" => "Plygell data",
-"Configure the database" => "Cyflunio'r gronfa ddata",
-"Database user" => "Defnyddiwr cronfa ddata",
-"Database password" => "Cyfrinair cronfa ddata",
-"Database name" => "Enw cronfa ddata",
-"Database tablespace" => "Tablespace cronfa ddata",
-"Database host" => "Gwesteiwr cronfa ddata",
-"Finish setup" => "Gorffen sefydlu",
-"%s is available. Get more information on how to update." => "%s ar gael. Mwy o wybodaeth am sut i ddiweddaru.",
-"Log out" => "Allgofnodi",
-"remember" => "cofio",
-"Log in" => "Mewngofnodi",
-"Alternative Logins" => "Mewngofnodiadau Amgen"
-);
-$PLURAL_FORMS = "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
new file mode 100644
index 00000000000..c75c3d0dace
--- /dev/null
+++ b/core/l10n/da.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s",
+    "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
+    "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
+    "Updated database" : "Opdaterede database",
+    "Checked database schema update" : "Tjekket database schema opdatering",
+    "Checked database schema update for apps" : "Tjekkede databaseskemaets opdatering for apps",
+    "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s",
+    "Disabled incompatible apps: %s" : "Deaktiverer inkompatible apps: %s",
+    "No image or file provided" : "Ingen fil eller billede givet",
+    "Unknown filetype" : "Ukendt filtype",
+    "Invalid image" : "Ugyldigt billede",
+    "No temporary profile picture available, try again" : "Intet midlertidigt profilbillede tilgængeligt, prøv igen",
+    "No crop data provided" : "Ingen beskæringsdata give",
+    "Sunday" : "Søndag",
+    "Monday" : "Mandag",
+    "Tuesday" : "Tirsdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lørdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Marts",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Indstillinger",
+    "File" : "Fil",
+    "Folder" : "Mappe",
+    "Image" : "Billede",
+    "Audio" : "Lyd",
+    "Saving..." : "Gemmer...",
+    "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
+    "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
+    "Reset password" : "Nulstil kodeord",
+    "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
+    "No" : "Nej",
+    "Yes" : "Ja",
+    "Choose" : "Vælg",
+    "Error loading file picker template: {error}" : "Fejl ved indlæsning af filvælger skabelon: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fejl ved indlæsning af besked skabelon: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nye filer",
+    "Already existing files" : "Allerede eksisterende filer",
+    "Which files do you want to keep?" : "Hvilke filer ønsker du at beholde?",
+    "If you select both versions, the copied file will have a number added to its name." : "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.",
+    "Cancel" : "Annuller",
+    "Continue" : "Videre",
+    "(all selected)" : "(alle valgt)",
+    "({count} selected)" : "({count} valgt)",
+    "Error loading file exists template" : "Fejl ved inlæsning af; fil eksistere skabelon",
+    "Very weak password" : "Meget svagt kodeord",
+    "Weak password" : "Svagt kodeord",
+    "So-so password" : "Jævnt kodeord",
+    "Good password" : "Godt kodeord",
+    "Strong password" : "Stærkt kodeord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
+    "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." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+    "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
+    "Shared" : "Delt",
+    "Shared with {recipients}" : "Delt med {recipients}",
+    "Share" : "Del",
+    "Error" : "Fejl",
+    "Error while sharing" : "Fejl under deling",
+    "Error while unsharing" : "Fejl under annullering af deling",
+    "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 user or group …" : "Del med bruger eller gruppe ...",
+    "Share link" : "Del link",
+    "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
+    "Password protect" : "Beskyt med adgangskode",
+    "Choose a password for the public link" : "Vælg et kodeord til det offentlige link",
+    "Allow Public Upload" : "Tillad Offentlig Upload",
+    "Email link to person" : "E-mail link til person",
+    "Send" : "Send",
+    "Set expiration date" : "Vælg udløbsdato",
+    "Expiration date" : "Udløbsdato",
+    "Adding user..." : "Tilføjer bruger...",
+    "group" : "gruppe",
+    "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",
+    "can share" : "kan dele",
+    "can edit" : "kan redigere",
+    "access control" : "Adgangskontrol",
+    "create" : "opret",
+    "update" : "opdater",
+    "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",
+    "Warning" : "Advarsel",
+    "The object type is not specified." : "Objekttypen er ikke angivet.",
+    "Enter new" : "Indtast nyt",
+    "Delete" : "Slet",
+    "Add" : "Tilføj",
+    "Edit tags" : "Rediger tags",
+    "Error loading dialog template: {error}" : "Fejl ved indlæsning dialog skabelon: {error}",
+    "No tags selected for deletion." : "Ingen tags markeret til sletning.",
+    "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
+    "Please reload the page." : "Genindlæs venligst siden",
+    "The update was unsuccessful." : "Opdateringen mislykkedes.",
+    "The update was successful. Redirecting you to ownCloud now." : "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
+    "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
+    "%s password reset" : "%s adgangskode nulstillet",
+    "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}",
+    "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
+    "Username" : "Brugernavn",
+    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
+    "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
+    "Reset" : "Nulstil",
+    "New password" : "Nyt kodeord",
+    "New Password" : "Ny adgangskode",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
+    "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
+    "Personal" : "Personligt",
+    "Users" : "Brugere",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Hjælp",
+    "Error loading tags" : "Fejl ved indlæsning af tags",
+    "Tag already exists" : "Tag eksistere allerede",
+    "Error deleting tag(s)" : "Fejl ved sletning af tag(s)",
+    "Error tagging" : "Fejl ved tagging",
+    "Error untagging" : "Fejl ved fjernelse af tag",
+    "Error favoriting" : "Fejl ved favoritering",
+    "Error unfavoriting" : "Fejl ved fjernelse af favorisering.",
+    "Access forbidden" : "Adgang forbudt",
+    "File not found" : "Filen blev ikke fundet",
+    "The specified document has not been found on the server." : "Det angivne dokument blev ikke fundet på serveren.",
+    "You can click here to return to %s." : "Du kan klikke her for at gå tilbage til %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej med dig\n\nDette blot for at lade dig vide, at %s har delt %s med dig.\nSe det her: %s\n\n",
+    "The share will expire on %s." : "Delingen vil udløbe om %s.",
+    "Cheers!" : "Hej!",
+    "Internal Server Error" : "Intern serverfejl",
+    "The server encountered an internal error and was unable to complete your request." : "Servern stødte på en intern fejl og var ikke i stand til at fuldføre din forespørgsel.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontakt venligst serveradministratoren, hvis denne fejl gentager sig flere gange - medtag venligst de tekniske detaljer nedenfor i din rapport.",
+    "More details can be found in the server log." : "Flere detaljer kan fås i serverloggen.",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Fjernadresse: %s",
+    "Request ID: %s" : "Forespørgsels-ID: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Besked: %s",
+    "File: %s" : "Fil: %s",
+    "Line: %s" : "Linje: %s",
+    "Trace" : "Sporing",
+    "Security Warning" : "Sikkerhedsadvarsel",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Din PHP-version er sårbar overfor et NULL Byte angreb (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Opdater venligst din PHP installation for at anvende %s sikkert.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
+    "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
+    "Password" : "Adgangskode",
+    "Storage & database" : "Lager & database",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Konfigurer databasen",
+    "Only %s is available." : "Kun %s er tilgængelig.",
+    "Database user" : "Databasebruger",
+    "Database password" : "Databasekodeord",
+    "Database name" : "Navn på database",
+    "Database tablespace" : "Database tabelplads",
+    "Database host" : "Databasehost",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite bliver brugt som database. For større installationer anbefaler vi at ændre dette.",
+    "Finish setup" : "Afslut opsætning",
+    "Finishing …" : "Færdigbehandler ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Applikationen kræver JavaScript for at fungere korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Slå venligst JavaScript til</a> og genindlæs siden.",
+    "%s is available. Get more information on how to update." : "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
+    "Log out" : "Log ud",
+    "Server side authentication failed!" : "Server side godkendelse mislykkedes!",
+    "Please contact your administrator." : "Kontakt venligst din administrator",
+    "Forgot your password? Reset it!" : "Glemt din adgangskode? Nulstil det!",
+    "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.",
+    "This means only administrators can use the instance." : "Det betyder at det kun er administrator, som kan benytte ownCloud.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.",
+    "Thank you for your patience." : "Tak for din tålmodighed.",
+    "You are accessing the server from an untrusted domain." : "Du tilgår serveren fra et utroværdigt domæne",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontakt venligst din administrator. Hvis du er administrator, konfigurer \"trusted_domain\" indstillingen i config/config.php. Et eksempel kan ses i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhænger af din konfiguration, da du som administrator eventuelt også er i stand til at gøre brug af knappen nedenfor til at tildele tillid til dette domæne.",
+    "Add \"%s\" as trusted domain" : "Tilføj \"%s\" som et troværdigt domæne",
+    "%s will be updated to version %s." : "%s vil blive opdateret til version %s.",
+    "The following apps will be disabled:" : "Følgende apps bliver deaktiveret:",
+    "The theme %s has been disabled." : "Temaet, %s, er blevet deaktiveret.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
+    "Start update" : "Begynd opdatering",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
+    "This %s instance is currently being updated, which may take a while." : "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
+    "This page will refresh itself when the %s instance is available again." : "Denne side vil genopfriske sig selv, når %s-instancen er tilgængelig igen."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/da.json b/core/l10n/da.json
new file mode 100644
index 00000000000..01d09334568
--- /dev/null
+++ b/core/l10n/da.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kunne ikke sende mail til følgende brugere: %s",
+    "Turned on maintenance mode" : "Startede vedligeholdelsestilstand",
+    "Turned off maintenance mode" : "standsede vedligeholdelsestilstand",
+    "Updated database" : "Opdaterede database",
+    "Checked database schema update" : "Tjekket database schema opdatering",
+    "Checked database schema update for apps" : "Tjekkede databaseskemaets opdatering for apps",
+    "Updated \"%s\" to %s" : "Opdaterede \"%s\" til %s",
+    "Disabled incompatible apps: %s" : "Deaktiverer inkompatible apps: %s",
+    "No image or file provided" : "Ingen fil eller billede givet",
+    "Unknown filetype" : "Ukendt filtype",
+    "Invalid image" : "Ugyldigt billede",
+    "No temporary profile picture available, try again" : "Intet midlertidigt profilbillede tilgængeligt, prøv igen",
+    "No crop data provided" : "Ingen beskæringsdata give",
+    "Sunday" : "Søndag",
+    "Monday" : "Mandag",
+    "Tuesday" : "Tirsdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lørdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Marts",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Indstillinger",
+    "File" : "Fil",
+    "Folder" : "Mappe",
+    "Image" : "Billede",
+    "Audio" : "Lyd",
+    "Saving..." : "Gemmer...",
+    "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
+    "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
+    "Reset password" : "Nulstil kodeord",
+    "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
+    "No" : "Nej",
+    "Yes" : "Ja",
+    "Choose" : "Vælg",
+    "Error loading file picker template: {error}" : "Fejl ved indlæsning af filvælger skabelon: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fejl ved indlæsning af besked skabelon: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nye filer",
+    "Already existing files" : "Allerede eksisterende filer",
+    "Which files do you want to keep?" : "Hvilke filer ønsker du at beholde?",
+    "If you select both versions, the copied file will have a number added to its name." : "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.",
+    "Cancel" : "Annuller",
+    "Continue" : "Videre",
+    "(all selected)" : "(alle valgt)",
+    "({count} selected)" : "({count} valgt)",
+    "Error loading file exists template" : "Fejl ved inlæsning af; fil eksistere skabelon",
+    "Very weak password" : "Meget svagt kodeord",
+    "Weak password" : "Svagt kodeord",
+    "So-so password" : "Jævnt kodeord",
+    "Good password" : "Godt kodeord",
+    "Strong password" : "Stærkt kodeord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
+    "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." : "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
+    "Error occurred while checking server setup" : "Der opstod fejl under tjek af serveropsætningen",
+    "Shared" : "Delt",
+    "Shared with {recipients}" : "Delt med {recipients}",
+    "Share" : "Del",
+    "Error" : "Fejl",
+    "Error while sharing" : "Fejl under deling",
+    "Error while unsharing" : "Fejl under annullering af deling",
+    "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 user or group …" : "Del med bruger eller gruppe ...",
+    "Share link" : "Del link",
+    "The public link will expire no later than {days} days after it is created" : "Det offentlige link udløber senest {days} dage efter det blev oprettet",
+    "Password protect" : "Beskyt med adgangskode",
+    "Choose a password for the public link" : "Vælg et kodeord til det offentlige link",
+    "Allow Public Upload" : "Tillad Offentlig Upload",
+    "Email link to person" : "E-mail link til person",
+    "Send" : "Send",
+    "Set expiration date" : "Vælg udløbsdato",
+    "Expiration date" : "Udløbsdato",
+    "Adding user..." : "Tilføjer bruger...",
+    "group" : "gruppe",
+    "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",
+    "can share" : "kan dele",
+    "can edit" : "kan redigere",
+    "access control" : "Adgangskontrol",
+    "create" : "opret",
+    "update" : "opdater",
+    "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",
+    "Warning" : "Advarsel",
+    "The object type is not specified." : "Objekttypen er ikke angivet.",
+    "Enter new" : "Indtast nyt",
+    "Delete" : "Slet",
+    "Add" : "Tilføj",
+    "Edit tags" : "Rediger tags",
+    "Error loading dialog template: {error}" : "Fejl ved indlæsning dialog skabelon: {error}",
+    "No tags selected for deletion." : "Ingen tags markeret til sletning.",
+    "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
+    "Please reload the page." : "Genindlæs venligst siden",
+    "The update was unsuccessful." : "Opdateringen mislykkedes.",
+    "The update was successful. Redirecting you to ownCloud now." : "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
+    "Couldn't send reset email. Please make sure your username is correct." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
+    "%s password reset" : "%s adgangskode nulstillet",
+    "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}",
+    "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
+    "Username" : "Brugernavn",
+    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
+    "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
+    "Reset" : "Nulstil",
+    "New password" : "Nyt kodeord",
+    "New Password" : "Ny adgangskode",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
+    "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
+    "Personal" : "Personligt",
+    "Users" : "Brugere",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Hjælp",
+    "Error loading tags" : "Fejl ved indlæsning af tags",
+    "Tag already exists" : "Tag eksistere allerede",
+    "Error deleting tag(s)" : "Fejl ved sletning af tag(s)",
+    "Error tagging" : "Fejl ved tagging",
+    "Error untagging" : "Fejl ved fjernelse af tag",
+    "Error favoriting" : "Fejl ved favoritering",
+    "Error unfavoriting" : "Fejl ved fjernelse af favorisering.",
+    "Access forbidden" : "Adgang forbudt",
+    "File not found" : "Filen blev ikke fundet",
+    "The specified document has not been found on the server." : "Det angivne dokument blev ikke fundet på serveren.",
+    "You can click here to return to %s." : "Du kan klikke her for at gå tilbage til %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej med dig\n\nDette blot for at lade dig vide, at %s har delt %s med dig.\nSe det her: %s\n\n",
+    "The share will expire on %s." : "Delingen vil udløbe om %s.",
+    "Cheers!" : "Hej!",
+    "Internal Server Error" : "Intern serverfejl",
+    "The server encountered an internal error and was unable to complete your request." : "Servern stødte på en intern fejl og var ikke i stand til at fuldføre din forespørgsel.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontakt venligst serveradministratoren, hvis denne fejl gentager sig flere gange - medtag venligst de tekniske detaljer nedenfor i din rapport.",
+    "More details can be found in the server log." : "Flere detaljer kan fås i serverloggen.",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Fjernadresse: %s",
+    "Request ID: %s" : "Forespørgsels-ID: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Besked: %s",
+    "File: %s" : "Fil: %s",
+    "Line: %s" : "Linje: %s",
+    "Trace" : "Sporing",
+    "Security Warning" : "Sikkerhedsadvarsel",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Din PHP-version er sårbar overfor et NULL Byte angreb (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Opdater venligst din PHP installation for at anvende %s sikkert.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
+    "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
+    "Password" : "Adgangskode",
+    "Storage & database" : "Lager & database",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Konfigurer databasen",
+    "Only %s is available." : "Kun %s er tilgængelig.",
+    "Database user" : "Databasebruger",
+    "Database password" : "Databasekodeord",
+    "Database name" : "Navn på database",
+    "Database tablespace" : "Database tabelplads",
+    "Database host" : "Databasehost",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite bliver brugt som database. For større installationer anbefaler vi at ændre dette.",
+    "Finish setup" : "Afslut opsætning",
+    "Finishing …" : "Færdigbehandler ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Applikationen kræver JavaScript for at fungere korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Slå venligst JavaScript til</a> og genindlæs siden.",
+    "%s is available. Get more information on how to update." : "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
+    "Log out" : "Log ud",
+    "Server side authentication failed!" : "Server side godkendelse mislykkedes!",
+    "Please contact your administrator." : "Kontakt venligst din administrator",
+    "Forgot your password? Reset it!" : "Glemt din adgangskode? Nulstil det!",
+    "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.",
+    "This means only administrators can use the instance." : "Det betyder at det kun er administrator, som kan benytte ownCloud.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.",
+    "Thank you for your patience." : "Tak for din tålmodighed.",
+    "You are accessing the server from an untrusted domain." : "Du tilgår serveren fra et utroværdigt domæne",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontakt venligst din administrator. Hvis du er administrator, konfigurer \"trusted_domain\" indstillingen i config/config.php. Et eksempel kan ses i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhænger af din konfiguration, da du som administrator eventuelt også er i stand til at gøre brug af knappen nedenfor til at tildele tillid til dette domæne.",
+    "Add \"%s\" as trusted domain" : "Tilføj \"%s\" som et troværdigt domæne",
+    "%s will be updated to version %s." : "%s vil blive opdateret til version %s.",
+    "The following apps will be disabled:" : "Følgende apps bliver deaktiveret:",
+    "The theme %s has been disabled." : "Temaet, %s, er blevet deaktiveret.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
+    "Start update" : "Begynd opdatering",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
+    "This %s instance is currently being updated, which may take a while." : "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
+    "This page will refresh itself when the %s instance is available again." : "Denne side vil genopfriske sig selv, når %s-instancen er tilgængelig igen."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/da.php b/core/l10n/da.php
deleted file mode 100644
index ce415eca549..00000000000
--- a/core/l10n/da.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kunne ikke sende mail til følgende brugere: %s",
-"Turned on maintenance mode" => "Startede vedligeholdelsestilstand",
-"Turned off maintenance mode" => "standsede vedligeholdelsestilstand",
-"Updated database" => "Opdaterede database",
-"Checked database schema update" => "Tjekket database schema opdatering",
-"Checked database schema update for apps" => "Tjekkede databaseskemaets opdatering for apps",
-"Updated \"%s\" to %s" => "Opdaterede \"%s\" til %s",
-"Disabled incompatible apps: %s" => "Deaktiverer inkompatible apps: %s",
-"No image or file provided" => "Ingen fil eller billede givet",
-"Unknown filetype" => "Ukendt filtype",
-"Invalid image" => "Ugyldigt billede",
-"No temporary profile picture available, try again" => "Intet midlertidigt profilbillede tilgængeligt, prøv igen",
-"No crop data provided" => "Ingen beskæringsdata give",
-"Sunday" => "Søndag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Marts",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"Settings" => "Indstillinger",
-"File" => "Fil",
-"Folder" => "Mappe",
-"Image" => "Billede",
-"Audio" => "Lyd",
-"Saving..." => "Gemmer...",
-"Couldn't send reset email. Please contact your administrator." => "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
-"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
-"I know what I'm doing" => "Jeg ved, hvad jeg har gang i",
-"Reset password" => "Nulstil kodeord",
-"Password can not be changed. Please contact your administrator." => "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
-"No" => "Nej",
-"Yes" => "Ja",
-"Choose" => "Vælg",
-"Error loading file picker template: {error}" => "Fejl ved indlæsning af filvælger skabelon: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Fejl ved indlæsning af besked skabelon: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
-"One file conflict" => "En filkonflikt",
-"New Files" => "Nye filer",
-"Already existing files" => "Allerede eksisterende filer",
-"Which files do you want to keep?" => "Hvilke filer ønsker du at beholde?",
-"If you select both versions, the copied file will have a number added to its name." => "Hvis du vælger begge versioner, vil den kopierede fil få tilføjet et nummer til sit navn.",
-"Cancel" => "Annuller",
-"Continue" => "Videre",
-"(all selected)" => "(alle valgt)",
-"({count} selected)" => "({count} valgt)",
-"Error loading file exists template" => "Fejl ved inlæsning af; fil eksistere skabelon",
-"Very weak password" => "Meget svagt kodeord",
-"Weak password" => "Svagt kodeord",
-"So-so password" => "Jævnt kodeord",
-"Good password" => "Godt kodeord",
-"Strong password" => "Stærkt kodeord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webserver er endnu ikke sat op til at tillade fil synkronisering fordi WebDAV grænsefladen virker ødelagt.",
-"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." => "Denne ownCloud-server har ikke en fungerende forbindelse til internettet. Det betyder, at visse funktioner som montering af eksterne drev, oplysninger om opdatering eller installation af 3.-parts applikationer ikke fungerer. Det vil sandsynligvis heller ikke fungere at tilgå filer fra eksterne drev eller informations-e-mails. Vi opfordrer til at etablere forbindelse til internettet for denne server, såfremt du ønsker samtlige funktioner.",
-"Error occurred while checking server setup" => "Der opstod fejl under tjek af serveropsætningen",
-"Shared" => "Delt",
-"Shared with {recipients}" => "Delt med {recipients}",
-"Share" => "Del",
-"Error" => "Fejl",
-"Error while sharing" => "Fejl under deling",
-"Error while unsharing" => "Fejl under annullering af deling",
-"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 user or group …" => "Del med bruger eller gruppe ...",
-"Share link" => "Del link",
-"The public link will expire no later than {days} days after it is created" => "Det offentlige link udløber senest {days} dage efter det blev oprettet",
-"Password protect" => "Beskyt med adgangskode",
-"Choose a password for the public link" => "Vælg et kodeord til det offentlige link",
-"Allow Public Upload" => "Tillad Offentlig Upload",
-"Email link to person" => "E-mail link til person",
-"Send" => "Send",
-"Set expiration date" => "Vælg udløbsdato",
-"Expiration date" => "Udløbsdato",
-"Adding user..." => "Tilføjer bruger...",
-"group" => "gruppe",
-"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",
-"can share" => "kan dele",
-"can edit" => "kan redigere",
-"access control" => "Adgangskontrol",
-"create" => "opret",
-"update" => "opdater",
-"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",
-"Warning" => "Advarsel",
-"The object type is not specified." => "Objekttypen er ikke angivet.",
-"Enter new" => "Indtast nyt",
-"Delete" => "Slet",
-"Add" => "Tilføj",
-"Edit tags" => "Rediger tags",
-"Error loading dialog template: {error}" => "Fejl ved indlæsning dialog skabelon: {error}",
-"No tags selected for deletion." => "Ingen tags markeret til sletning.",
-"Updating {productName} to version {version}, this may take a while." => "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
-"Please reload the page." => "Genindlæs venligst siden",
-"The update was unsuccessful." => "Opdateringen mislykkedes.",
-"The update was successful. Redirecting you to ownCloud now." => "Opdateringen blev udført korrekt. Du bliver nu viderestillet til ownCloud.",
-"Couldn't reset password because the token is invalid" => "Kunne ikke nulstille kodeordet, fordi symboludtrykket er ugyldigt",
-"Couldn't send reset email. Please make sure your username is correct." => "Der opstod et problem under afsendelse af nulstillings-e-mailen. Kontroller venligst om dit brugernavnet er korrekt",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
-"%s password reset" => "%s adgangskode nulstillet",
-"Use the following link to reset your password: {link}" => "Anvend følgende link til at nulstille din adgangskode: {link}",
-"You will receive a link to reset your password via Email." => "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
-"Username" => "Brugernavn",
-"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?" => "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
-"Yes, I really want to reset my password now" => "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
-"Reset" => "Nulstil",
-"New password" => "Nyt kodeord",
-"New Password" => "Ny adgangskode",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
-"For the best results, please consider using a GNU/Linux server instead." => "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
-"Personal" => "Personligt",
-"Users" => "Brugere",
-"Apps" => "Apps",
-"Admin" => "Admin",
-"Help" => "Hjælp",
-"Error loading tags" => "Fejl ved indlæsning af tags",
-"Tag already exists" => "Tag eksistere allerede",
-"Error deleting tag(s)" => "Fejl ved sletning af tag(s)",
-"Error tagging" => "Fejl ved tagging",
-"Error untagging" => "Fejl ved fjernelse af tag",
-"Error favoriting" => "Fejl ved favoritering",
-"Error unfavoriting" => "Fejl ved fjernelse af favorisering.",
-"Access forbidden" => "Adgang forbudt",
-"File not found" => "Filen blev ikke fundet",
-"The specified document has not been found on the server." => "Det angivne dokument blev ikke fundet på serveren.",
-"You can click here to return to %s." => "Du kan klikke her for at gå tilbage til %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej med dig\n\nDette blot for at lade dig vide, at %s har delt %s med dig.\nSe det her: %s\n\n",
-"The share will expire on %s." => "Delingen vil udløbe om %s.",
-"Cheers!" => "Hej!",
-"Internal Server Error" => "Intern serverfejl",
-"The server encountered an internal error and was unable to complete your request." => "Servern stødte på en intern fejl og var ikke i stand til at fuldføre din forespørgsel.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontakt venligst serveradministratoren, hvis denne fejl gentager sig flere gange - medtag venligst de tekniske detaljer nedenfor i din rapport.",
-"More details can be found in the server log." => "Flere detaljer kan fås i serverloggen.",
-"Technical details" => "Tekniske detaljer",
-"Remote Address: %s" => "Fjernadresse: %s",
-"Request ID: %s" => "Forespørgsels-ID: %s",
-"Code: %s" => "Kode: %s",
-"Message: %s" => "Besked: %s",
-"File: %s" => "Fil: %s",
-"Line: %s" => "Linje: %s",
-"Trace" => "Sporing",
-"Security Warning" => "Sikkerhedsadvarsel",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din PHP-version er sårbar overfor et NULL Byte angreb (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Opdater venligst din PHP installation for at anvende %s sikkert.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
-"Create an <strong>admin account</strong>" => "Opret en <strong>administratorkonto</strong>",
-"Password" => "Adgangskode",
-"Storage & database" => "Lager & database",
-"Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"Only %s is available." => "Kun %s er tilgængelig.",
-"Database user" => "Databasebruger",
-"Database password" => "Databasekodeord",
-"Database name" => "Navn på database",
-"Database tablespace" => "Database tabelplads",
-"Database host" => "Databasehost",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite bliver brugt som database. For større installationer anbefaler vi at ændre dette.",
-"Finish setup" => "Afslut opsætning",
-"Finishing …" => "Færdigbehandler ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Applikationen kræver JavaScript for at fungere korrekt. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Slå venligst JavaScript til</a> og genindlæs siden.",
-"%s is available. Get more information on how to update." => "%s er tilgængelig. Få mere information om, hvordan du opdaterer.",
-"Log out" => "Log ud",
-"Server side authentication failed!" => "Server side godkendelse mislykkedes!",
-"Please contact your administrator." => "Kontakt venligst din administrator",
-"Forgot your password? Reset it!" => "Glemt din adgangskode? Nulstil det!",
-"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.",
-"This means only administrators can use the instance." => "Det betyder at det kun er administrator, som kan benytte ownCloud.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren, hvis denne meddelelse fortsætter eller optrådte uventet.",
-"Thank you for your patience." => "Tak for din tålmodighed.",
-"You are accessing the server from an untrusted domain." => "Du tilgår serveren fra et utroværdigt domæne",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kontakt venligst din administrator. Hvis du er administrator, konfigurer \"trusted_domain\" indstillingen i config/config.php. Et eksempel kan ses i config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Afhænger af din konfiguration, da du som administrator eventuelt også er i stand til at gøre brug af knappen nedenfor til at tildele tillid til dette domæne.",
-"Add \"%s\" as trusted domain" => "Tilføj \"%s\" som et troværdigt domæne",
-"%s will be updated to version %s." => "%s vil blive opdateret til version %s.",
-"The following apps will be disabled:" => "Følgende apps bliver deaktiveret:",
-"The theme %s has been disabled." => "Temaet, %s, er blevet deaktiveret.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Sørg venligst for at sikre, at databasen, config-mappen og data-mappen er blevet sikkerhedskopieret inden vi fortsætter.",
-"Start update" => "Begynd opdatering",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "For at undgå tidsudløb med større installationer, så kan du i stedet køre følgende kommando fra din installationsmappe:",
-"This %s instance is currently being updated, which may take a while." => "Denne %s-instans bliver i øjeblikket opdateret, hvilket kan tage et stykke tid.",
-"This page will refresh itself when the %s instance is available again." => "Denne side vil genopfriske sig selv, når %s-instancen er tilgængelig igen."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de.js b/core/l10n/de.js
new file mode 100644
index 00000000000..1fda0e1deae
--- /dev/null
+++ b/core/l10n/de.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Checked database schema update" : "Datenbank-Schemenaktualisierung geprüft",
+    "Checked database schema update for apps" : "Datenbank-Schemenaktualisierung für Apps geprüft",
+    "Updated \"%s\" to %s" : "\"%s\" zu %s aktualisiert",
+    "Disabled incompatible apps: %s" : "Deaktivierte inkompatible Apps: %s",
+    "No image or file provided" : "Kein Bild oder Datei zur Verfügung gestellt",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal",
+    "No crop data provided" : "Keine Zuschnittdaten zur Verfügung gestellt",
+    "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",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Image" : "Bild",
+    "Audio" : "Audio",
+    "Saving..." : "Speichern...",
+    "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+    "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 Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage 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?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß, was ich mache",
+    "Reset password" : "Passwort zurücksetzen",
+    "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Dateiauswahlvorlage: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Die Dateien existieren bereits",
+    "Which files do you want to keep?" : "Welche Dateien möchtest Du behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(Alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Durchschnittliches Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, 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, dass 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.",
+    "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
+    "Shared" : "Geteilt",
+    "Shared with {recipients}" : "Geteilt mit {recipients}",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "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 user or group …" : "Mit Benutzer oder Gruppe teilen ....",
+    "Share link" : "Link Teilen",
+    "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+    "Password protect" : "Passwortschutz",
+    "Choose a password for the public link" : "Wählen Sie ein Passwort für den öffentlichen Link",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Setze ein Ablaufdatum",
+    "Expiration date" : "Ablaufdatum",
+    "Adding user..." : "Benutzer wird hinzugefügt …",
+    "group" : "Gruppe",
+    "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 informieren",
+    "can share" : "Kann teilen",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "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 ..." : "Sende ...",
+    "Email sent" : "E-Mail wurde verschickt",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Enter new" : "Neuen eingeben",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "Edit tags" : "Schlagwörter bearbeiten",
+    "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
+    "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
+    "Please reload the page." : "Bitte lade diese Seite neu.",
+    "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
+    "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" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
+    "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Stelle sicher, dass Dein Nutzername korrekt ist.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein 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?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "New Password" : "Neues Passwort",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administration",
+    "Help" : "Hilfe",
+    "Error loading tags" : "Fehler beim Laden der Schlagwörter",
+    "Tag already exists" : "Schlagwort ist bereits vorhanden",
+    "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
+    "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter",
+    "Error untagging" : "Fehler beim Entfernen der Schlagwörter",
+    "Error favoriting" : "Fehler beim Favorisieren",
+    "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten",
+    "Access forbidden" : "Zugriff verboten",
+    "File not found" : "Datei nicht gefunden",
+    "The specified document has not been found on the server." : "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
+    "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\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Hallo!",
+    "Internal Server Error" : "Interner Server-Fehler",
+    "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, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
+    "More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
+    "Technical details" : "Technische Details",
+    "Remote Address: %s" : "IP Adresse: %s",
+    "Request ID: %s" : "Anforderungskennung: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Nachricht: %s",
+    "File: %s" : "Datei: %s",
+    "Line: %s" : "Zeile: %s",
+    "Trace" : "Spur",
+    "Security Warning" : "Sicherheitswarnung",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisiere Deine 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." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Storage & database" : "Speicher & Datenbank",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
+    "Finish setup" : "Installation abschließen",
+    "Finishing …" : "Abschließen ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb.  Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
+    "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
+    "Forgot your password? Reset it!" : "Passwort vergessen? Setze es zurück!",
+    "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>wir möchten dich nur wissen lassen, dass %s <strong>%s</strong> mit dir geteilt hat.<br><a href=\"%s\">Ansehen!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
+    "This means only administrators can use the instance." : "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Thank you for your patience." : "Vielen Dank für Deine Geduld.",
+    "You are accessing the server from an untrusted domain." : "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+    "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 aktuell Administrator dieser Instanz bist, konfiguriere bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Abhängig vonDeiner Konfiguration kannst Du auch als Administrator, zum Vertrauen dieser Domain, den unteren Button verwenden.",
+    "Add \"%s\" as trusted domain" : "\"%s\" als vertrauenswürdige Domain hinzufügen",
+    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
+    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "The theme %s has been disabled." : "Das Theme %s wurde deaktiviert.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.",
+    "Start update" : "Aktualisierung starten",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen kannst Du stattdessen den folgenden Befehl in Deinem Installationsverzeichnis ausführen:",
+    "This %s instance is currently being updated, which may take a while." : "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de.json b/core/l10n/de.json
new file mode 100644
index 00000000000..42f74fe126f
--- /dev/null
+++ b/core/l10n/de.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Checked database schema update" : "Datenbank-Schemenaktualisierung geprüft",
+    "Checked database schema update for apps" : "Datenbank-Schemenaktualisierung für Apps geprüft",
+    "Updated \"%s\" to %s" : "\"%s\" zu %s aktualisiert",
+    "Disabled incompatible apps: %s" : "Deaktivierte inkompatible Apps: %s",
+    "No image or file provided" : "Kein Bild oder Datei zur Verfügung gestellt",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal",
+    "No crop data provided" : "Keine Zuschnittdaten zur Verfügung gestellt",
+    "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",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Image" : "Bild",
+    "Audio" : "Audio",
+    "Saving..." : "Speichern...",
+    "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+    "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 Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage 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?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß, was ich mache",
+    "Reset password" : "Passwort zurücksetzen",
+    "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Dateiauswahlvorlage: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Die Dateien existieren bereits",
+    "Which files do you want to keep?" : "Welche Dateien möchtest Du behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(Alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Durchschnittliches Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, 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, dass 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.",
+    "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
+    "Shared" : "Geteilt",
+    "Shared with {recipients}" : "Geteilt mit {recipients}",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "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 user or group …" : "Mit Benutzer oder Gruppe teilen ....",
+    "Share link" : "Link Teilen",
+    "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+    "Password protect" : "Passwortschutz",
+    "Choose a password for the public link" : "Wählen Sie ein Passwort für den öffentlichen Link",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Setze ein Ablaufdatum",
+    "Expiration date" : "Ablaufdatum",
+    "Adding user..." : "Benutzer wird hinzugefügt …",
+    "group" : "Gruppe",
+    "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 informieren",
+    "can share" : "Kann teilen",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "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 ..." : "Sende ...",
+    "Email sent" : "E-Mail wurde verschickt",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Enter new" : "Neuen eingeben",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "Edit tags" : "Schlagwörter bearbeiten",
+    "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
+    "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
+    "Please reload the page." : "Bitte lade diese Seite neu.",
+    "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
+    "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" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
+    "Couldn't send reset email. Please make sure your username is correct." : "E-Mail zum Zurücksetzen kann nicht versendet werden. Stelle sicher, dass Dein Nutzername korrekt ist.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein 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?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "New Password" : "Neues Passwort",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administration",
+    "Help" : "Hilfe",
+    "Error loading tags" : "Fehler beim Laden der Schlagwörter",
+    "Tag already exists" : "Schlagwort ist bereits vorhanden",
+    "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
+    "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter",
+    "Error untagging" : "Fehler beim Entfernen der Schlagwörter",
+    "Error favoriting" : "Fehler beim Favorisieren",
+    "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten",
+    "Access forbidden" : "Zugriff verboten",
+    "File not found" : "Datei nicht gefunden",
+    "The specified document has not been found on the server." : "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
+    "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\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Hallo!",
+    "Internal Server Error" : "Interner Server-Fehler",
+    "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, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
+    "More details can be found in the server log." : "Weitere Details können im Serverprotokoll gefunden werden.",
+    "Technical details" : "Technische Details",
+    "Remote Address: %s" : "IP Adresse: %s",
+    "Request ID: %s" : "Anforderungskennung: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Nachricht: %s",
+    "File: %s" : "Datei: %s",
+    "Line: %s" : "Zeile: %s",
+    "Trace" : "Spur",
+    "Security Warning" : "Sicherheitswarnung",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisiere Deine 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." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Storage & database" : "Speicher & Datenbank",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
+    "Finish setup" : "Installation abschließen",
+    "Finishing …" : "Abschließen ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb.  Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "Server side authentication failed!" : "Serverseitige Authentifizierung fehlgeschlagen!",
+    "Please contact your administrator." : "Bitte kontaktiere Deinen Administrator.",
+    "Forgot your password? Reset it!" : "Passwort vergessen? Setze es zurück!",
+    "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>wir möchten dich nur wissen lassen, dass %s <strong>%s</strong> mit dir geteilt hat.<br><a href=\"%s\">Ansehen!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
+    "This means only administrators can use the instance." : "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Thank you for your patience." : "Vielen Dank für Deine Geduld.",
+    "You are accessing the server from an untrusted domain." : "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+    "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 aktuell Administrator dieser Instanz bist, konfiguriere bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Abhängig vonDeiner Konfiguration kannst Du auch als Administrator, zum Vertrauen dieser Domain, den unteren Button verwenden.",
+    "Add \"%s\" as trusted domain" : "\"%s\" als vertrauenswürdige Domain hinzufügen",
+    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
+    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "The theme %s has been disabled." : "Das Theme %s wurde deaktiviert.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.",
+    "Start update" : "Aktualisierung starten",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen kannst Du stattdessen den folgenden Befehl in Deinem Installationsverzeichnis ausführen:",
+    "This %s instance is currently being updated, which may take a while." : "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/de.php b/core/l10n/de.php
deleted file mode 100644
index 5aa1dc14a9a..00000000000
--- a/core/l10n/de.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Die E-Mail konnte nicht an folgende Benutzer gesendet werden: %s",
-"Turned on maintenance mode" => "Wartungsmodus eingeschaltet",
-"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
-"Updated database" => "Datenbank aktualisiert",
-"Checked database schema update" => "Datenbank-Schemenaktualisierung geprüft",
-"Checked database schema update for apps" => "Datenbank-Schemenaktualisierung für Apps geprüft",
-"Updated \"%s\" to %s" => "\"%s\" zu %s aktualisiert",
-"Disabled incompatible apps: %s" => "Deaktivierte inkompatible Apps: %s",
-"No image or file provided" => "Kein Bild oder Datei zur Verfügung gestellt",
-"Unknown filetype" => "Unbekannter Dateityp",
-"Invalid image" => "Ungültiges Bild",
-"No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuche es nochmal",
-"No crop data provided" => "Keine Zuschnittdaten zur Verfügung gestellt",
-"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",
-"File" => "Datei",
-"Folder" => "Ordner",
-"Image" => "Bild",
-"Audio" => "Audio",
-"Saving..." => "Speichern...",
-"Couldn't send reset email. Please contact your administrator." => "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
-"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 Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage 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?" => "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
-"I know what I'm doing" => "Ich weiß, was ich mache",
-"Reset password" => "Passwort zurücksetzen",
-"Password can not be changed. Please contact your administrator." => "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
-"No" => "Nein",
-"Yes" => "Ja",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
-"One file conflict" => "Ein Dateikonflikt",
-"New Files" => "Neue Dateien",
-"Already existing files" => "Die Dateien existieren bereits",
-"Which files do you want to keep?" => "Welche Dateien möchtest Du behalten?",
-"If you select both versions, the copied file will have a number added to its name." => "Wenn Du beide Versionen auswählst, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
-"Cancel" => "Abbrechen",
-"Continue" => "Fortsetzen",
-"(all selected)" => "(Alle ausgewählt)",
-"({count} selected)" => "({count} ausgewählt)",
-"Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
-"Very weak password" => "Sehr schwaches Passwort",
-"Weak password" => "Schwaches Passwort",
-"So-so password" => "Durchschnittliches Passwort",
-"Good password" => "Gutes Passwort",
-"Strong password" => "Starkes Passwort",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Dein Web-Server ist noch nicht für Datei-Synchronisation bereit, 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, dass 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.",
-"Error occurred while checking server setup" => "Fehler beim Überprüfen der Servereinrichtung",
-"Shared" => "Geteilt",
-"Shared with {recipients}" => "Geteilt mit {recipients}",
-"Share" => "Teilen",
-"Error" => "Fehler",
-"Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
-"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 user or group …" => "Mit Benutzer oder Gruppe teilen ....",
-"Share link" => "Link Teilen",
-"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
-"Password protect" => "Passwortschutz",
-"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
-"Allow Public Upload" => "Öffentliches Hochladen erlauben",
-"Email link to person" => "Link per E-Mail verschicken",
-"Send" => "Senden",
-"Set expiration date" => "Setze ein Ablaufdatum",
-"Expiration date" => "Ablaufdatum",
-"Adding user..." => "Benutzer wird hinzugefügt …",
-"group" => "Gruppe",
-"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 informieren",
-"can share" => "Kann teilen",
-"can edit" => "kann bearbeiten",
-"access control" => "Zugriffskontrolle",
-"create" => "erstellen",
-"update" => "aktualisieren",
-"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 ..." => "Sende ...",
-"Email sent" => "E-Mail wurde verschickt",
-"Warning" => "Warnung",
-"The object type is not specified." => "Der Objekttyp ist nicht angegeben.",
-"Enter new" => "Neuen eingeben",
-"Delete" => "Löschen",
-"Add" => "Hinzufügen",
-"Edit tags" => "Schlagwörter bearbeiten",
-"Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
-"No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
-"Updating {productName} to version {version}, this may take a while." => "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
-"Please reload the page." => "Bitte lade diese Seite neu.",
-"The update was unsuccessful." => "Die Aktualisierung war erfolgreich.",
-"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" => "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
-"Couldn't send reset email. Please make sure your username is correct." => "E-Mail zum Zurücksetzen kann nicht versendet werden. Stelle sicher, dass Dein Nutzername korrekt ist.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
-"%s password reset" => "%s-Passwort zurücksetzen",
-"Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-"You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein 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?" => "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
-"Yes, I really want to reset my password now" => "Ja, ich will mein Passwort jetzt zurücksetzen",
-"Reset" => "Zurücksetzen",
-"New password" => "Neues Passwort",
-"New Password" => "Neues Passwort",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
-"For the best results, please consider using a GNU/Linux server instead." => "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
-"Personal" => "Persönlich",
-"Users" => "Benutzer",
-"Apps" => "Apps",
-"Admin" => "Administration",
-"Help" => "Hilfe",
-"Error loading tags" => "Fehler beim Laden der Schlagwörter",
-"Tag already exists" => "Schlagwort ist bereits vorhanden",
-"Error deleting tag(s)" => "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
-"Error tagging" => "Fehler beim Hinzufügen der Schlagwörter",
-"Error untagging" => "Fehler beim Entfernen der Schlagwörter",
-"Error favoriting" => "Fehler beim Favorisieren",
-"Error unfavoriting" => "Fehler beim Entfernen aus den Favoriten",
-"Access forbidden" => "Zugriff verboten",
-"File not found" => "Datei nicht gefunden",
-"The specified document has not been found on the server." => "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
-"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\nich wollte Dich nur wissen lassen, dass %s %s mit Dir teilt.\nSchaue es Dir an: %s\n\n",
-"The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
-"Cheers!" => "Hallo!",
-"Internal Server Error" => "Interner Server-Fehler",
-"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, wenn dieser Fehler mehrfach auftritt. Füge deinem Bericht, bitte die untenstehenden technischen Details hinzu.",
-"More details can be found in the server log." => "Weitere Details können im Serverprotokoll gefunden werden.",
-"Technical details" => "Technische Details",
-"Remote Address: %s" => "IP Adresse: %s",
-"Request ID: %s" => "Anforderungskennung: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Nachricht: %s",
-"File: %s" => "Datei: %s",
-"Line: %s" => "Zeile: %s",
-"Trace" => "Spur",
-"Security Warning" => "Sicherheitswarnung",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deine PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
-"Please update your PHP installation to use %s securely." => "Bitte aktualisiere Deine 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." => "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
-"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Password" => "Passwort",
-"Storage & database" => "Speicher & Datenbank",
-"Data folder" => "Datenverzeichnis",
-"Configure the database" => "Datenbank einrichten",
-"Only %s is available." => "Es sind nur %s verfügbar.",
-"Database user" => "Datenbank-Benutzer",
-"Database password" => "Datenbank-Passwort",
-"Database name" => "Datenbank-Name",
-"Database tablespace" => "Datenbank-Tablespace",
-"Database host" => "Datenbank-Host",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dies zu ändern.",
-"Finish setup" => "Installation abschließen",
-"Finishing …" => "Abschließen ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Diese Anwendung benötigt ein aktiviertes JavaScript zum korrekten Betrieb.  Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiviere JavaScript</a> und lade diese Seite neu.",
-"%s is available. Get more information on how to update." => "%s ist verfügbar. Hole weitere Informationen zu Aktualisierungen ein.",
-"Log out" => "Abmelden",
-"Server side authentication failed!" => "Serverseitige Authentifizierung fehlgeschlagen!",
-"Please contact your administrator." => "Bitte kontaktiere Deinen Administrator.",
-"Forgot your password? Reset it!" => "Passwort vergessen? Setze es zurück!",
-"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>wir möchten dich nur wissen lassen, dass %s <strong>%s</strong> mit dir geteilt hat.<br><a href=\"%s\">Ansehen!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
-"This means only administrators can use the instance." => "Dies bedeutet, dass diese Instanz nur von Administratoren genutzt werden kann.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktiere Deinen Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
-"Thank you for your patience." => "Vielen Dank für Deine Geduld.",
-"You are accessing the server from an untrusted domain." => "Du greifst von einer nicht vertrauenswürdigen Domain auf den Server zu.",
-"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 aktuell Administrator dieser Instanz bist, konfiguriere bitte die \"trusted_domain\" - Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit gestellt.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Abhängig vonDeiner Konfiguration kannst Du auch als Administrator, zum Vertrauen dieser Domain, den unteren Button verwenden.",
-"Add \"%s\" as trusted domain" => "\"%s\" als vertrauenswürdige Domain hinzufügen",
-"%s will be updated to version %s." => "%s wird auf Version %s aktualisiert.",
-"The following apps will be disabled:" => "Die folgenden Apps werden deaktiviert:",
-"The theme %s has been disabled." => "Das Theme %s wurde deaktiviert.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Stelle vor dem Fortsetzen sicher, dass die Datenbank, der Konfigurationsordner und der Datenordner gesichert wurde.",
-"Start update" => "Aktualisierung starten",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Zur Vermeidung von Zeitüberschreitungen bei größeren Installationen kannst Du stattdessen den folgenden Befehl in Deinem Installationsverzeichnis ausführen:",
-"This %s instance is currently being updated, which may take a while." => "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
-"This page will refresh itself when the %s instance is available again." => "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_AT.js b/core/l10n/de_AT.js
new file mode 100644
index 00000000000..98fb44e5d60
--- /dev/null
+++ b/core/l10n/de_AT.js
@@ -0,0 +1,38 @@
+OC.L10N.register(
+    "core",
+    {
+    "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",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Abbrechen",
+    "Continue" : "Weiter",
+    "Share" : "Freigeben",
+    "Error" : "Fehler",
+    "group" : "Gruppe",
+    "Unshare" : "Teilung zurücknehmen",
+    "can share" : "Kann teilen",
+    "can edit" : "kann bearbeiten",
+    "Delete" : "Löschen",
+    "Personal" : "Persönlich",
+    "Help" : "Hilfe",
+    "Password" : "Passwort"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_AT.json b/core/l10n/de_AT.json
new file mode 100644
index 00000000000..2f44aaea3da
--- /dev/null
+++ b/core/l10n/de_AT.json
@@ -0,0 +1,36 @@
+{ "translations": {
+    "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",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Abbrechen",
+    "Continue" : "Weiter",
+    "Share" : "Freigeben",
+    "Error" : "Fehler",
+    "group" : "Gruppe",
+    "Unshare" : "Teilung zurücknehmen",
+    "can share" : "Kann teilen",
+    "can edit" : "kann bearbeiten",
+    "Delete" : "Löschen",
+    "Personal" : "Persönlich",
+    "Help" : "Hilfe",
+    "Password" : "Passwort"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/de_AT.php b/core/l10n/de_AT.php
deleted file mode 100644
index cd17ea0bc16..00000000000
--- a/core/l10n/de_AT.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Abbrechen",
-"Continue" => "Weiter",
-"Share" => "Freigeben",
-"Error" => "Fehler",
-"group" => "Gruppe",
-"Unshare" => "Teilung zurücknehmen",
-"can share" => "Kann teilen",
-"can edit" => "kann bearbeiten",
-"Delete" => "Löschen",
-"Personal" => "Persönlich",
-"Help" => "Hilfe",
-"Password" => "Passwort"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_CH.js b/core/l10n/de_CH.js
new file mode 100644
index 00000000000..514e2d6c196
--- /dev/null
+++ b/core/l10n/de_CH.js
@@ -0,0 +1,108 @@
+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",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Saving..." : "Speichern...",
+    "Reset password" : "Passwort zurücksetzen",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "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
new file mode 100644
index 00000000000..b549592ed06
--- /dev/null
+++ b/core/l10n/de_CH.json
@@ -0,0 +1,106 @@
+{ "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",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Saving..." : "Speichern...",
+    "Reset password" : "Passwort zurücksetzen",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "New Files" : "Neue Dateien",
+    "Cancel" : "Abbrechen",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Web-Server ist noch nicht für eine Datei-Synchronisation konfiguriert, weil die WebDAV-Schnittstelle vermutlich defekt ist.",
+    "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." : "Dieser Server hat keine funktionierende Internetverbindung. Dies bedeutet das einige Funktionen wie z.B. das Einbinden von externen Speichern, Update-Benachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Senden von Benachrichtigungsmails funktioniert eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren wenn Sie alle Funktionen nutzen wollen.",
+    "Shared" : "Geteilt",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "Error while changing permissions" : "Fehler bei der Änderung der Rechte",
+    "Shared with you and the group {group} by {owner}" : "Von {owner} mit Ihnen und der Gruppe {group} geteilt.",
+    "Shared with you by {owner}" : "Von {owner} mit Ihnen geteilt.",
+    "Password protect" : "Passwortschutz",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration date" : "Ablaufdatum",
+    "group" : "Gruppe",
+    "Resharing is not allowed" : "Das Weiterverteilen ist nicht erlaubt",
+    "Shared in {item} with {user}" : "Freigegeben in {item} von {user}",
+    "Unshare" : "Freigabe aufheben",
+    "can edit" : "kann bearbeiten",
+    "access control" : "Zugriffskontrolle",
+    "create" : "erstellen",
+    "update" : "aktualisieren",
+    "delete" : "löschen",
+    "Password protected" : "Passwortgeschützt",
+    "Error unsetting expiration date" : "Fehler beim Entfernen des Ablaufdatums",
+    "Error setting expiration date" : "Fehler beim Setzen des Ablaufdatums",
+    "Sending ..." : "Sende ...",
+    "Email sent" : "Email gesendet",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "The update was successful. Redirecting you to ownCloud now." : "Das Update war erfolgreich. Sie werden nun zu ownCloud weitergeleitet.",
+    "%s password reset" : "%s-Passwort zurücksetzen",
+    "Use the following link to reset your password: {link}" : "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
+    "Username" : "Benutzername",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wiederzubekommen, nachdem Ihr Passwort zurückgesetzt wurde. Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren. Wollen Sie wirklich fortfahren?",
+    "Yes, I really want to reset my password now" : "Ja, ich möchte jetzt mein Passwort wirklich zurücksetzen.",
+    "Reset" : "Zurücksetzen",
+    "New password" : "Neues Passwort",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administrator",
+    "Help" : "Hilfe",
+    "Access forbidden" : "Zugriff verboten",
+    "Security Warning" : "Sicherheitshinweis",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ihre PHP Version ist durch die NULL Byte Attacke (CVE-2006-7243) angreifbar",
+    "Please update your PHP installation to use %s securely." : "Bitte aktualisieren Sie Ihre PHP-Installation um %s sicher nutzen zu können.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Sie Ihren Server richtig konfigurieren lesen Sie bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "Finish setup" : "Installation abschliessen",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "remember" : "merken",
+    "Log in" : "Einloggen",
+    "Alternative Logins" : "Alternative Logins"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/de_CH.php b/core/l10n/de_CH.php
deleted file mode 100644
index 749be51dc33..00000000000
--- a/core/l10n/de_CH.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"File" => "Datei",
-"Folder" => "Ordner",
-"Saving..." => "Speichern...",
-"Reset password" => "Passwort zurücksetzen",
-"No" => "Nein",
-"Yes" => "Ja",
-"Choose" => "Auswählen",
-"Ok" => "OK",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
new file mode 100644
index 00000000000..7de8818152a
--- /dev/null
+++ b/core/l10n/de_DE.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Checked database schema update" : "Aktualisierung des Datenbankschemas wurde überprüft",
+    "Checked database schema update for apps" : "Aktualisierung des Datenbankschemas für Apps wurde überprüft",
+    "Updated \"%s\" to %s" : "»%s« zu %s aktualisiert",
+    "Disabled incompatible apps: %s" : "Deaktivierte inkompatible Apps: %s",
+    "No image or file provided" : "Weder Bild noch eine Datei wurden zur Verfügung gestellt",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal",
+    "No crop data provided" : "Keine Zuschnittdaten zur Verfügung gestellt",
+    "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",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Image" : "Bild",
+    "Audio" : "Audio",
+    "Saving..." : "Speichervorgang …",
+    "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "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 Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß, was ich mache",
+    "Reset password" : "Passwort zurücksetzen",
+    "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Dateiauswahlvorlage: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Die Dateien existieren bereits",
+    "Which files do you want to keep?" : "Welche Dateien möchten Sie behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(Alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Passables Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Internetserver ist noch nicht richtig konfiguriert, um Dateisynchronisation zu erlauben, 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. Dieses bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Aktualisierungsbenachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von E-Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen benutzen wollen.",
+    "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
+    "Shared" : "Geteilt",
+    "Shared with {recipients}" : "Geteilt mit {recipients}",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "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 user or group …" : "Mit Benutzer oder Gruppe teilen …",
+    "Share link" : "Link teilen",
+    "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+    "Password protect" : "Passwortschutz",
+    "Choose a password for the public link" : "Wählen Sie ein Passwort für den öffentlichen Link",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration date" : "Ablaufdatum",
+    "Adding user..." : "Benutzer wird hinzugefügt …",
+    "group" : "Gruppe",
+    "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 informieren",
+    "can share" : "kann geteilt werden",
+    "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.",
+    "Enter new" : "Neuen eingeben",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "Edit tags" : "Schlagwörter bearbeiten",
+    "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
+    "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
+    "Please reload the page." : "Bitte laden Sie diese Seite neu.",
+    "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
+    "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" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
+    "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, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "%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",
+    "New Password" : "Neues Passwort",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administrator",
+    "Help" : "Hilfe",
+    "Error loading tags" : "Fehler beim Laden der Schlagwörter",
+    "Tag already exists" : "Schlagwort ist bereits vorhanden",
+    "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
+    "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter",
+    "Error untagging" : "Fehler beim Entfernen der Schlagwörter",
+    "Error favoriting" : "Fehler beim Hinzufügen zu den Favoriten",
+    "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten",
+    "Access forbidden" : "Zugriff verboten",
+    "File not found" : "Datei nicht gefunden",
+    "The specified document has not been found on the server." : "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
+    "You can click here to return to %s." : "Sie können 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\n%s hat %s mit Ihnen geteilt.\nAnsehen: %s\n\n",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
+    "Internal Server Error" : "Interner Server-Fehler",
+    "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 wenden Sie sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, geben Sie bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.",
+    "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",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Nachricht: %s",
+    "File: %s" : "Datei: %s",
+    "Line: %s" : "Zeile: %s",
+    "Trace" : "Spur",
+    "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>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Storage & database" : "Speicher & Datenbank",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dieses zu ändern.",
+    "Finish setup" : "Installation abschließen",
+    "Finishing …" : "Abschließen ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "Server side authentication failed!" : "Die Legitimierung auf dem Server ist fehlgeschlagen!",
+    "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
+    "Forgot your password? Reset it!" : "Passwort vergessen? Zurückstellen!",
+    "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>wir möchten Sie wissen lassen, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Ansehen</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
+    "This means only administrators can use the instance." : "Das bedeutet, dass diese Instanz nur von Administratoren benutzt werden kann.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Thank you for your patience." : "Vielen Dank für Ihre Geduld.",
+    "You are accessing the server from an untrusted domain." : "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+    "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 aktuell Administrator dieser Instanz sind, konfigurieren Sie bitte die »trusted_domain«-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit bereitgestellt.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Abhängig von Ihrer Konfiguration, können Sie als Administrator dieser Domain vertrauen, indem Sie den unteren Knopf benutzen.",
+    "Add \"%s\" as trusted domain" : "»%s« als vertrauenswürdige Domain hinzufügen",
+    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
+    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "The theme %s has been disabled." : "Das 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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen, bei größeren Installationen, können Sie stattdessen den folgenden Befehl, in Ihrem Installationsverzeichnis, ausführen:",
+    "This %s instance is currently being updated, which may take a while." : "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
new file mode 100644
index 00000000000..db643f834f5
--- /dev/null
+++ b/core/l10n/de_DE.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
+    "Turned on maintenance mode" : "Wartungsmodus eingeschaltet ",
+    "Turned off maintenance mode" : "Wartungsmodus ausgeschaltet",
+    "Updated database" : "Datenbank aktualisiert",
+    "Checked database schema update" : "Aktualisierung des Datenbankschemas wurde überprüft",
+    "Checked database schema update for apps" : "Aktualisierung des Datenbankschemas für Apps wurde überprüft",
+    "Updated \"%s\" to %s" : "»%s« zu %s aktualisiert",
+    "Disabled incompatible apps: %s" : "Deaktivierte inkompatible Apps: %s",
+    "No image or file provided" : "Weder Bild noch eine Datei wurden zur Verfügung gestellt",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "No temporary profile picture available, try again" : "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal",
+    "No crop data provided" : "Keine Zuschnittdaten zur Verfügung gestellt",
+    "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",
+    "File" : "Datei",
+    "Folder" : "Ordner",
+    "Image" : "Bild",
+    "Audio" : "Audio",
+    "Saving..." : "Speichervorgang …",
+    "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "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 Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
+    "I know what I'm doing" : "Ich weiß, was ich mache",
+    "Reset password" : "Passwort zurücksetzen",
+    "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "No" : "Nein",
+    "Yes" : "Ja",
+    "Choose" : "Auswählen",
+    "Error loading file picker template: {error}" : "Fehler beim Laden der Dateiauswahlvorlage: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Fehler beim Laden der Nachrichtenvorlage: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} Dateikonflikt","{count} Dateikonflikte"],
+    "One file conflict" : "Ein Dateikonflikt",
+    "New Files" : "Neue Dateien",
+    "Already existing files" : "Die Dateien existieren bereits",
+    "Which files do you want to keep?" : "Welche Dateien möchten Sie behalten?",
+    "If you select both versions, the copied file will have a number added to its name." : "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
+    "Cancel" : "Abbrechen",
+    "Continue" : "Fortsetzen",
+    "(all selected)" : "(Alle ausgewählt)",
+    "({count} selected)" : "({count} ausgewählt)",
+    "Error loading file exists template" : "Fehler beim Laden der vorhanden Dateivorlage",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Passables Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ihr Internetserver ist noch nicht richtig konfiguriert, um Dateisynchronisation zu erlauben, 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. Dieses bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Aktualisierungsbenachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von E-Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen benutzen wollen.",
+    "Error occurred while checking server setup" : "Fehler beim Überprüfen der Servereinrichtung",
+    "Shared" : "Geteilt",
+    "Shared with {recipients}" : "Geteilt mit {recipients}",
+    "Share" : "Teilen",
+    "Error" : "Fehler",
+    "Error while sharing" : "Fehler beim Teilen",
+    "Error while unsharing" : "Fehler beim Aufheben der Freigabe",
+    "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 user or group …" : "Mit Benutzer oder Gruppe teilen …",
+    "Share link" : "Link teilen",
+    "The public link will expire no later than {days} days after it is created" : "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
+    "Password protect" : "Passwortschutz",
+    "Choose a password for the public link" : "Wählen Sie ein Passwort für den öffentlichen Link",
+    "Allow Public Upload" : "Öffentliches Hochladen erlauben",
+    "Email link to person" : "Link per E-Mail verschicken",
+    "Send" : "Senden",
+    "Set expiration date" : "Ein Ablaufdatum setzen",
+    "Expiration date" : "Ablaufdatum",
+    "Adding user..." : "Benutzer wird hinzugefügt …",
+    "group" : "Gruppe",
+    "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 informieren",
+    "can share" : "kann geteilt werden",
+    "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.",
+    "Enter new" : "Neuen eingeben",
+    "Delete" : "Löschen",
+    "Add" : "Hinzufügen",
+    "Edit tags" : "Schlagwörter bearbeiten",
+    "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
+    "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
+    "Please reload the page." : "Bitte laden Sie diese Seite neu.",
+    "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
+    "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" : "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
+    "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, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
+    "%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",
+    "New Password" : "Neues Passwort",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
+    "Personal" : "Persönlich",
+    "Users" : "Benutzer",
+    "Apps" : "Apps",
+    "Admin" : "Administrator",
+    "Help" : "Hilfe",
+    "Error loading tags" : "Fehler beim Laden der Schlagwörter",
+    "Tag already exists" : "Schlagwort ist bereits vorhanden",
+    "Error deleting tag(s)" : "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
+    "Error tagging" : "Fehler beim Hinzufügen der Schlagwörter",
+    "Error untagging" : "Fehler beim Entfernen der Schlagwörter",
+    "Error favoriting" : "Fehler beim Hinzufügen zu den Favoriten",
+    "Error unfavoriting" : "Fehler beim Entfernen aus den Favoriten",
+    "Access forbidden" : "Zugriff verboten",
+    "File not found" : "Datei nicht gefunden",
+    "The specified document has not been found on the server." : "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
+    "You can click here to return to %s." : "Sie können 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\n%s hat %s mit Ihnen geteilt.\nAnsehen: %s\n\n",
+    "The share will expire on %s." : "Die Freigabe wird am %s ablaufen.",
+    "Cheers!" : "Noch einen schönen Tag!",
+    "Internal Server Error" : "Interner Server-Fehler",
+    "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 wenden Sie sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, geben Sie bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.",
+    "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",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Nachricht: %s",
+    "File: %s" : "Datei: %s",
+    "Line: %s" : "Zeile: %s",
+    "Trace" : "Spur",
+    "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>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
+    "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Password" : "Passwort",
+    "Storage & database" : "Speicher & Datenbank",
+    "Data folder" : "Datenverzeichnis",
+    "Configure the database" : "Datenbank einrichten",
+    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Database user" : "Datenbank-Benutzer",
+    "Database password" : "Datenbank-Passwort",
+    "Database name" : "Datenbank-Name",
+    "Database tablespace" : "Datenbank-Tablespace",
+    "Database host" : "Datenbank-Host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dieses zu ändern.",
+    "Finish setup" : "Installation abschließen",
+    "Finishing …" : "Abschließen ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.",
+    "%s is available. Get more information on how to update." : "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
+    "Log out" : "Abmelden",
+    "Server side authentication failed!" : "Die Legitimierung auf dem Server ist fehlgeschlagen!",
+    "Please contact your administrator." : "Bitte kontaktieren Sie Ihren Administrator.",
+    "Forgot your password? Reset it!" : "Passwort vergessen? Zurückstellen!",
+    "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>wir möchten Sie wissen lassen, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Ansehen</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
+    "This means only administrators can use the instance." : "Das bedeutet, dass diese Instanz nur von Administratoren benutzt werden kann.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
+    "Thank you for your patience." : "Vielen Dank für Ihre Geduld.",
+    "You are accessing the server from an untrusted domain." : "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
+    "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 aktuell Administrator dieser Instanz sind, konfigurieren Sie bitte die »trusted_domain«-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit bereitgestellt.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Abhängig von Ihrer Konfiguration, können Sie als Administrator dieser Domain vertrauen, indem Sie den unteren Knopf benutzen.",
+    "Add \"%s\" as trusted domain" : "»%s« als vertrauenswürdige Domain hinzufügen",
+    "%s will be updated to version %s." : "%s wird auf Version %s aktualisiert.",
+    "The following apps will be disabled:" : "Die folgenden Apps werden deaktiviert:",
+    "The theme %s has been disabled." : "Das 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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Zur Vermeidung von Zeitüberschreitungen, bei größeren Installationen, können Sie stattdessen den folgenden Befehl, in Ihrem Installationsverzeichnis, ausführen:",
+    "This %s instance is currently being updated, which may take a while." : "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
+    "This page will refresh itself when the %s instance is available again." : "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
deleted file mode 100644
index f50b3d6b07b..00000000000
--- a/core/l10n/de_DE.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "An folgende Benutzer konnte keine E-Mail gesendet werden: %s",
-"Turned on maintenance mode" => "Wartungsmodus eingeschaltet ",
-"Turned off maintenance mode" => "Wartungsmodus ausgeschaltet",
-"Updated database" => "Datenbank aktualisiert",
-"Checked database schema update" => "Aktualisierung des Datenbankschemas wurde überprüft",
-"Checked database schema update for apps" => "Aktualisierung des Datenbankschemas für Apps wurde überprüft",
-"Updated \"%s\" to %s" => "»%s« zu %s aktualisiert",
-"Disabled incompatible apps: %s" => "Deaktivierte inkompatible Apps: %s",
-"No image or file provided" => "Weder Bild noch eine Datei wurden zur Verfügung gestellt",
-"Unknown filetype" => "Unbekannter Dateityp",
-"Invalid image" => "Ungültiges Bild",
-"No temporary profile picture available, try again" => "Kein temporäres Profilbild verfügbar, bitte versuchen Sie es nochmal",
-"No crop data provided" => "Keine Zuschnittdaten zur Verfügung gestellt",
-"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",
-"File" => "Datei",
-"Folder" => "Ordner",
-"Image" => "Bild",
-"Audio" => "Audio",
-"Saving..." => "Speichervorgang …",
-"Couldn't send reset email. Please contact your administrator." => "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
-"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 Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
-"I know what I'm doing" => "Ich weiß, was ich mache",
-"Reset password" => "Passwort zurücksetzen",
-"Password can not be changed. Please contact your administrator." => "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
-"No" => "Nein",
-"Yes" => "Ja",
-"Choose" => "Auswählen",
-"Error loading file picker template: {error}" => "Fehler beim Laden der Dateiauswahlvorlage: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Fehler beim Laden der Nachrichtenvorlage: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} Dateikonflikt","{count} Dateikonflikte"),
-"One file conflict" => "Ein Dateikonflikt",
-"New Files" => "Neue Dateien",
-"Already existing files" => "Die Dateien existieren bereits",
-"Which files do you want to keep?" => "Welche Dateien möchten Sie behalten?",
-"If you select both versions, the copied file will have a number added to its name." => "Wenn Sie beide Versionen auswählen, erhält die kopierte Datei eine Zahl am Ende des Dateinamens.",
-"Cancel" => "Abbrechen",
-"Continue" => "Fortsetzen",
-"(all selected)" => "(Alle ausgewählt)",
-"({count} selected)" => "({count} ausgewählt)",
-"Error loading file exists template" => "Fehler beim Laden der vorhanden Dateivorlage",
-"Very weak password" => "Sehr schwaches Passwort",
-"Weak password" => "Schwaches Passwort",
-"So-so password" => "Passables Passwort",
-"Good password" => "Gutes Passwort",
-"Strong password" => "Starkes Passwort",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ihr Internetserver ist noch nicht richtig konfiguriert, um Dateisynchronisation zu erlauben, 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. Dieses bedeutet, dass einige Funktionen wie z.B. das Einbinden von externen Speichern, Aktualisierungsbenachrichtigungen oder die Installation von Drittanbieter-Apps nicht funktionieren. Der Fernzugriff auf Dateien und das Versenden von E-Mail-Benachrichtigungen funktionieren eventuell ebenfalls nicht. Wir empfehlen die Internetverbindung für diesen Server zu aktivieren, wenn Sie alle Funktionen benutzen wollen.",
-"Error occurred while checking server setup" => "Fehler beim Überprüfen der Servereinrichtung",
-"Shared" => "Geteilt",
-"Shared with {recipients}" => "Geteilt mit {recipients}",
-"Share" => "Teilen",
-"Error" => "Fehler",
-"Error while sharing" => "Fehler beim Teilen",
-"Error while unsharing" => "Fehler beim Aufheben der Freigabe",
-"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 user or group …" => "Mit Benutzer oder Gruppe teilen …",
-"Share link" => "Link teilen",
-"The public link will expire no later than {days} days after it is created" => "Der öffentliche Link wird spätestens nach {days} Tagen, nach Erstellung, ablaufen",
-"Password protect" => "Passwortschutz",
-"Choose a password for the public link" => "Wählen Sie ein Passwort für den öffentlichen Link",
-"Allow Public Upload" => "Öffentliches Hochladen erlauben",
-"Email link to person" => "Link per E-Mail verschicken",
-"Send" => "Senden",
-"Set expiration date" => "Ein Ablaufdatum setzen",
-"Expiration date" => "Ablaufdatum",
-"Adding user..." => "Benutzer wird hinzugefügt …",
-"group" => "Gruppe",
-"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 informieren",
-"can share" => "kann geteilt werden",
-"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.",
-"Enter new" => "Neuen eingeben",
-"Delete" => "Löschen",
-"Add" => "Hinzufügen",
-"Edit tags" => "Schlagwörter bearbeiten",
-"Error loading dialog template: {error}" => "Fehler beim Laden der Dialogvorlage: {error}",
-"No tags selected for deletion." => "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
-"Updating {productName} to version {version}, this may take a while." => "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
-"Please reload the page." => "Bitte laden Sie diese Seite neu.",
-"The update was unsuccessful." => "Die Aktualisierung war erfolgreich.",
-"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" => "Aufgrund eines ungültigen Tokens kann das Passwort nicht zurück gesetzt werden",
-"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, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
-"%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",
-"New Password" => "Neues Passwort",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
-"For the best results, please consider using a GNU/Linux server instead." => "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
-"Personal" => "Persönlich",
-"Users" => "Benutzer",
-"Apps" => "Apps",
-"Admin" => "Administrator",
-"Help" => "Hilfe",
-"Error loading tags" => "Fehler beim Laden der Schlagwörter",
-"Tag already exists" => "Schlagwort ist bereits vorhanden",
-"Error deleting tag(s)" => "Fehler beim Löschen des Schlagwortes bzw. der Schlagwörter",
-"Error tagging" => "Fehler beim Hinzufügen der Schlagwörter",
-"Error untagging" => "Fehler beim Entfernen der Schlagwörter",
-"Error favoriting" => "Fehler beim Hinzufügen zu den Favoriten",
-"Error unfavoriting" => "Fehler beim Entfernen aus den Favoriten",
-"Access forbidden" => "Zugriff verboten",
-"File not found" => "Datei nicht gefunden",
-"The specified document has not been found on the server." => "Das ausgewählte Dokument wurde auf dem Server nicht gefunden.",
-"You can click here to return to %s." => "Sie können 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\n%s hat %s mit Ihnen geteilt.\nAnsehen: %s\n\n",
-"The share will expire on %s." => "Die Freigabe wird am %s ablaufen.",
-"Cheers!" => "Noch einen schönen Tag!",
-"Internal Server Error" => "Interner Server-Fehler",
-"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 wenden Sie sich an den Serveradministrator, wenn dieser Fehler mehrfach auftritt, geben Sie bitte die, unten stehenden, technischen Details in Ihrem Bericht mit an.",
-"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",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Nachricht: %s",
-"File: %s" => "Datei: %s",
-"Line: %s" => "Zeile: %s",
-"Trace" => "Spur",
-"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>." => "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
-"Create an <strong>admin account</strong>" => "<strong>Administrator-Konto</strong> anlegen",
-"Password" => "Passwort",
-"Storage & database" => "Speicher & Datenbank",
-"Data folder" => "Datenverzeichnis",
-"Configure the database" => "Datenbank einrichten",
-"Only %s is available." => "Es sind nur %s verfügbar.",
-"Database user" => "Datenbank-Benutzer",
-"Database password" => "Datenbank-Passwort",
-"Database name" => "Datenbank-Name",
-"Database tablespace" => "Datenbank-Tablespace",
-"Database host" => "Datenbank-Host",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite wird als Datenbank benutzt. Für größere Installationen wird empfohlen, dieses zu ändern.",
-"Finish setup" => "Installation abschließen",
-"Finishing …" => "Abschließen ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Diese Anwendung benötigt ein aktiviertes JavaScript, um richtig zu funktionieren. Bitte <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivieren Sie JavaScript</a> und laden Sie diese Seite neu.",
-"%s is available. Get more information on how to update." => "%s ist verfügbar. Holen Sie weitere Informationen zu Aktualisierungen ein.",
-"Log out" => "Abmelden",
-"Server side authentication failed!" => "Die Legitimierung auf dem Server ist fehlgeschlagen!",
-"Please contact your administrator." => "Bitte kontaktieren Sie Ihren Administrator.",
-"Forgot your password? Reset it!" => "Passwort vergessen? Zurückstellen!",
-"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>wir möchten Sie wissen lassen, dass %s <strong>%s</strong> mit Ihnen geteilt hat.<br><a href=\"%s\">Ansehen</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Diese ownClound-Instanz befindet sich derzeit im Einzelbenutzermodus.",
-"This means only administrators can use the instance." => "Das bedeutet, dass diese Instanz nur von Administratoren benutzt werden kann.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktieren Sie Ihren Systemadministrator, wenn diese Meldung dauerhaft oder unerwartet erscheint.",
-"Thank you for your patience." => "Vielen Dank für Ihre Geduld.",
-"You are accessing the server from an untrusted domain." => "Sie greifen von einer nicht vertrauenswürdigen Domain auf den Server zu.",
-"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 aktuell Administrator dieser Instanz sind, konfigurieren Sie bitte die »trusted_domain«-Einstellung in config/config.php. Eine Beispielkonfiguration wird unter config/config.sample.php bereit bereitgestellt.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Abhängig von Ihrer Konfiguration, können Sie als Administrator dieser Domain vertrauen, indem Sie den unteren Knopf benutzen.",
-"Add \"%s\" as trusted domain" => "»%s« als vertrauenswürdige Domain hinzufügen",
-"%s will be updated to version %s." => "%s wird auf Version %s aktualisiert.",
-"The following apps will be disabled:" => "Die folgenden Apps werden deaktiviert:",
-"The theme %s has been disabled." => "Das 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",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Zur Vermeidung von Zeitüberschreitungen, bei größeren Installationen, können Sie stattdessen den folgenden Befehl, in Ihrem Installationsverzeichnis, ausführen:",
-"This %s instance is currently being updated, which may take a while." => "Diese %s - Instanz wird gerade aktualisiert, was eine Weile dauert.",
-"This page will refresh itself when the %s instance is available again." => "Diese Seite aktualisert sich automatisch, wenn die %s - Instanz wieder verfügbar ist."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/el.js b/core/l10n/el.js
new file mode 100644
index 00000000000..33bd00826b8
--- /dev/null
+++ b/core/l10n/el.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
+    "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
+    "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
+    "Updated database" : "Ενημερωμένη βάση δεδομένων",
+    "Checked database schema update" : "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων",
+    "Checked database schema update for apps" : "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων για εφαρμογές",
+    "Updated \"%s\" to %s" : "Αναβαθμίστηκε \"%s\" σε %s",
+    "Disabled incompatible apps: %s" : "Απενεργοποιημένες μη συμβατές εφαρμογές: %s",
+    "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
+    "Unknown filetype" : "Άγνωστος τύπος αρχείου",
+    "Invalid image" : "Μη έγκυρη εικόνα",
+    "No temporary profile picture available, try again" : "Δεν υπάρχει προσωρινή φωτογραφία προφίλ διαθέσιμη, δοκιμάστε ξανά",
+    "No crop data provided" : "Δεν δόθηκαν δεδομένα περικοπής",
+    "Sunday" : "Κυριακή",
+    "Monday" : "Δευτέρα",
+    "Tuesday" : "Τρίτη",
+    "Wednesday" : "Τετάρτη",
+    "Thursday" : "Πέμπτη",
+    "Friday" : "Παρασκευή",
+    "Saturday" : "Σάββατο",
+    "January" : "Ιανουάριος",
+    "February" : "Φεβρουάριος",
+    "March" : "Μάρτιος",
+    "April" : "Απρίλιος",
+    "May" : "Μάϊος",
+    "June" : "Ιούνιος",
+    "July" : "Ιούλιος",
+    "August" : "Αύγουστος",
+    "September" : "Σεπτέμβριος",
+    "October" : "Οκτώβριος",
+    "November" : "Νοέμβριος",
+    "December" : "Δεκέμβριος",
+    "Settings" : "Ρυθμίσεις",
+    "File" : "Αρχείο",
+    "Folder" : "Φάκελος",
+    "Image" : "Εικόνα",
+    "Audio" : "Ήχος",
+    "Saving..." : "Γίνεται αποθήκευση...",
+    "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 />Θέλετε στ' αλήθεια να συνεχίσετε;",
+    "I know what I'm doing" : "Γνωρίζω τι κάνω",
+    "Reset password" : "Επαναφορά συνθηματικού",
+    "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+    "No" : "Όχι",
+    "Yes" : "Ναι",
+    "Choose" : "Επιλέξτε",
+    "Error loading file picker template: {error}" : "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
+    "Ok" : "Οκ",
+    "Error loading message template: {error}" : "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"],
+    "One file conflict" : "Ένα αρχείο διαφέρει",
+    "New Files" : "Νέα Αρχεία",
+    "Already existing files" : "Ήδη υπάρχοντα αρχεία",
+    "Which files do you want to keep?" : "Ποια αρχεία θέλετε να κρατήσετε;",
+    "If you select both versions, the copied file will have a number added to its name." : "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο.",
+    "Cancel" : "Άκυρο",
+    "Continue" : "Συνέχεια",
+    "(all selected)" : "(όλα τα επιλεγμένα)",
+    "({count} selected)" : "({count} επιλέχθησαν)",
+    "Error loading file exists template" : "Σφάλμα κατά την φόρτωση του προτύπου \"αρχείο υπάρχει\"",
+    "Very weak password" : "Πολύ αδύναμο συνθηματικό",
+    "Weak password" : "Αδύναμο συνθηματικό",
+    "So-so password" : "Μέτριο συνθηματικό",
+    "Good password" : "Καλό συνθηματικό",
+    "Strong password" : "Δυνατό συνθηματικό",
+    "Your web server is not yet properly setup to allow files 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 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." : "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
+    "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
+    "Shared" : "Κοινόχρηστα",
+    "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}",
+    "Share" : "Διαμοιρασμός",
+    "Error" : "Σφάλμα",
+    "Error while sharing" : "Σφάλμα κατά τον διαμοιρασμό",
+    "Error while unsharing" : "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
+    "Error while changing permissions" : "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
+    "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
+    "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
+    "Share with user or group …" : "Διαμοιρασμός με χρήστη ή ομάδα ...",
+    "Share link" : "Διαμοιρασμός συνδέσμου",
+    "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
+    "Password protect" : "Προστασία συνθηματικού",
+    "Choose a password for the public link" : "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο",
+    "Allow Public Upload" : "Επιτρέπεται η Δημόσια Αποστολή",
+    "Email link to person" : "Αποστολή συνδέσμου με email ",
+    "Send" : "Αποστολή",
+    "Set expiration date" : "Ορισμός ημ. λήξης",
+    "Expiration date" : "Ημερομηνία λήξης",
+    "Adding user..." : "Προσθήκη χρήστη ...",
+    "group" : "ομάδα",
+    "Resharing is not allowed" : "Ξαναμοιρασμός δεν επιτρέπεται",
+    "Shared in {item} with {user}" : "Διαμοιρασμός του {item} με τον {user}",
+    "Unshare" : "Διακοπή διαμοιρασμού",
+    "notify by email" : "ειδοποίηση με email",
+    "can share" : "δυνατότητα διαμοιρασμού",
+    "can edit" : "δυνατότητα αλλαγής",
+    "access control" : "έλεγχος πρόσβασης",
+    "create" : "δημιουργία",
+    "update" : "ενημέρωση",
+    "delete" : "διαγραφή",
+    "Password protected" : "Προστασία με συνθηματικό",
+    "Error unsetting expiration date" : "Σφάλμα κατά την διαγραφή της ημ. λήξης",
+    "Error setting expiration date" : "Σφάλμα κατά τον ορισμό ημ. λήξης",
+    "Sending ..." : "Αποστολή...",
+    "Email sent" : "Το Email απεστάλη ",
+    "Warning" : "Προειδοποίηση",
+    "The object type is not specified." : "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
+    "Enter new" : "Εισαγωγή νέου",
+    "Delete" : "Διαγραφή",
+    "Add" : "Προσθήκη",
+    "Edit tags" : "Επεξεργασία ετικετών",
+    "Error loading dialog template: {error}" : "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
+    "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. Redirecting you to ownCloud now." : "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
+    "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 επαναφορά κωδικού πρόσβασης",
+    "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
+    "You will receive a link to reset your password via Email." : "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
+    "Username" : "Όνομα χρήστη",
+    "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?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
+    "Yes, I really want to reset my password now" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
+    "Reset" : "Επαναφορά",
+    "New password" : "Νέο συνθηματικό",
+    "New Password" : "Νέος Κωδικός",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
+    "Personal" : "Προσωπικά",
+    "Users" : "Χρήστες",
+    "Apps" : "Εφαρμογές",
+    "Admin" : "Διαχείριση",
+    "Help" : "Βοήθεια",
+    "Error loading tags" : "Σφάλμα φόρτωσης ετικετών",
+    "Tag already exists" : "Υπάρχει ήδη η ετικέτα",
+    "Error deleting tag(s)" : "Σφάλμα διαγραφής ετικέτας(ων)",
+    "Error tagging" : "Σφάλμα προσθήκης ετικέτας",
+    "Error untagging" : "Σφάλμα αφαίρεσης ετικέτας",
+    "Error favoriting" : "Σφάλμα προσθήκης στα αγαπημένα",
+    "Error unfavoriting" : "Σφάλμα αφαίρεσης από τα αγαπημένα",
+    "Access forbidden" : "Δεν επιτρέπεται η πρόσβαση",
+    "File not found" : "Το αρχείο δεν βρέθηκε",
+    "The specified document has not been found on the server." : "Το συγκεκριμένο έγγραφο δεν έχει βρεθεί στο διακομιστή.",
+    "You can click here to return to %s." : "Μπορείτε να κάνετε κλικ εδώ για να επιστρέψετε στο %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Γειά χαρά,\n\nαπλά σας ενημερώνω πως ο %s μοιράστηκε το %s με εσάς.\nΔείτε το: %s\n\n",
+    "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
+    "Cheers!" : "Χαιρετισμούς!",
+    "Internal Server Error" : "Εσωτερικό Σφάλμα Διακομιστή",
+    "The server encountered an internal error and was unable to complete your request." : "Ο διακομιστής αντιμετώπισε ένα εσωτερικό σφάλμα και δεν μπόρεσε να ολοκληρώσει το αίτημά σας.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Παρακαλώ επικοινωνήστε με το διαχειριστή του διακομιστή, εάν αυτό το σφάλμα επανεμφανίζεται πολλές φορές, παρακαλούμε να συμπεριλάβετε τις τεχνικές λεπτομέρειες παρακάτω στην αναφορά σας.",
+    "More details can be found in the server log." : "Περισσότερες λεπτομέρειες μπορείτε να βρείτε στο αρχείο καταγραφής του διακομιστή.",
+    "Technical details" : "Τεχνικές λεπτομέρειες",
+    "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
+    "Request ID: %s" : "Αίτημα ID: %s",
+    "Code: %s" : "Κωδικός: %s",
+    "Message: %s" : "Μήνυμα: %s",
+    "File: %s" : "Αρχείο: %s",
+    "Line: %s" : "Γραμμή: %s",
+    "Trace" : "Ανίχνευση",
+    "Security Warning" : "Προειδοποίηση Ασφαλείας",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Η PHP ειναι ευαλωτη στην NULL Byte επιθεση (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Παρακαλώ ενημερώστε την εγκατάσταση της PHP ώστε να χρησιμοποιήσετε το %s με ασφάλεια.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
+    "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+    "Password" : "Συνθηματικό",
+    "Storage & database" : "Αποθήκευση & βάση δεδομένων",
+    "Data folder" : "Φάκελος δεδομένων",
+    "Configure the database" : "Ρύθμιση της βάσης δεδομένων",
+    "Only %s is available." : "Μόνο %s είναι διαθέσιμο.",
+    "Database user" : "Χρήστης της βάσης δεδομένων",
+    "Database password" : "Συνθηματικό βάσης δεδομένων",
+    "Database name" : "Όνομα βάσης δεδομένων",
+    "Database tablespace" : "Κενά Πινάκων Βάσης Δεδομένων",
+    "Database host" : "Διακομιστής βάσης δεδομένων",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Η SQLIte θα χρησιμοποιηθεί ως βάση δεδομένων. Για μεγαλύτερες εγκαταστάσεις σας συνιστούμε να το αλλάξετε.",
+    "Finish setup" : "Ολοκλήρωση εγκατάστασης",
+    "Finishing …" : "Ολοκλήρωση...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για τη σωστή λειτουργία. Παρακαλώ  <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε τη σελίδα.",
+    "%s is available. Get more information on how to update." : "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
+    "Log out" : "Αποσύνδεση",
+    "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
+    "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
+    "Forgot your password? Reset it!" : "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
+    "remember" : "απομνημόνευση",
+    "Log in" : "Είσοδος",
+    "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
+    "This means only administrators can use the instance." : "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.",
+    "Thank you for your patience." : "Σας ευχαριστούμε για την υπομονή σας.",
+    "You are accessing the server from an untrusted domain." : "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ανάλογα με τις ρυθμίσεις σας, σαν διαχειριστής θα μπορούσατε επίσης να χρησιμοποιήσετε το παρακάτω κουμπί για να εμπιστευθείτε αυτή την περιοχή.",
+    "Add \"%s\" as trusted domain" : "Προσθήκη \"%s\" ως αξιόπιστη περιοχή",
+    "%s will be updated to version %s." : "Το %s θα ενημερωθεί στην έκδοση %s.",
+    "The following apps will be disabled:" : "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:",
+    "The theme %s has been disabled." : "Το θέμα %s έχει απενεργοποιηθεί.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.",
+    "Start update" : "Έναρξη ενημέρωσης",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Για να αποφύγετε τη λήξη χρόνου με μεγαλύτερες εγκαταστάσεις, μπορείτε αντί αυτού να τρέξετε την ακόλουθη εντολή από τον κατάλογο αρχείων εφαρμογών:",
+    "This %s instance is currently being updated, which may take a while." : "Αυτή %s η εγκατάσταση είναι υπό ενημέρωση, η οποία μπορεί να πάρει κάποιο χρόνο.",
+    "This page will refresh itself when the %s instance is available again." : "Αυτή η σελίδα θα ανανεωθεί από μόνη της όταν η %s εγκατάσταση είναι διαθέσιμη ξανά."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/el.json b/core/l10n/el.json
new file mode 100644
index 00000000000..5a35c89dfc3
--- /dev/null
+++ b/core/l10n/el.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
+    "Turned on maintenance mode" : "Η κατάσταση συντήρησης ενεργοποιήθηκε",
+    "Turned off maintenance mode" : "Η κατάσταση συντήρησης απενεργοποιήθηκε",
+    "Updated database" : "Ενημερωμένη βάση δεδομένων",
+    "Checked database schema update" : "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων",
+    "Checked database schema update for apps" : "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων για εφαρμογές",
+    "Updated \"%s\" to %s" : "Αναβαθμίστηκε \"%s\" σε %s",
+    "Disabled incompatible apps: %s" : "Απενεργοποιημένες μη συμβατές εφαρμογές: %s",
+    "No image or file provided" : "Δεν δόθηκε εικόνα ή αρχείο",
+    "Unknown filetype" : "Άγνωστος τύπος αρχείου",
+    "Invalid image" : "Μη έγκυρη εικόνα",
+    "No temporary profile picture available, try again" : "Δεν υπάρχει προσωρινή φωτογραφία προφίλ διαθέσιμη, δοκιμάστε ξανά",
+    "No crop data provided" : "Δεν δόθηκαν δεδομένα περικοπής",
+    "Sunday" : "Κυριακή",
+    "Monday" : "Δευτέρα",
+    "Tuesday" : "Τρίτη",
+    "Wednesday" : "Τετάρτη",
+    "Thursday" : "Πέμπτη",
+    "Friday" : "Παρασκευή",
+    "Saturday" : "Σάββατο",
+    "January" : "Ιανουάριος",
+    "February" : "Φεβρουάριος",
+    "March" : "Μάρτιος",
+    "April" : "Απρίλιος",
+    "May" : "Μάϊος",
+    "June" : "Ιούνιος",
+    "July" : "Ιούλιος",
+    "August" : "Αύγουστος",
+    "September" : "Σεπτέμβριος",
+    "October" : "Οκτώβριος",
+    "November" : "Νοέμβριος",
+    "December" : "Δεκέμβριος",
+    "Settings" : "Ρυθμίσεις",
+    "File" : "Αρχείο",
+    "Folder" : "Φάκελος",
+    "Image" : "Εικόνα",
+    "Audio" : "Ήχος",
+    "Saving..." : "Γίνεται αποθήκευση...",
+    "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 />Θέλετε στ' αλήθεια να συνεχίσετε;",
+    "I know what I'm doing" : "Γνωρίζω τι κάνω",
+    "Reset password" : "Επαναφορά συνθηματικού",
+    "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
+    "No" : "Όχι",
+    "Yes" : "Ναι",
+    "Choose" : "Επιλέξτε",
+    "Error loading file picker template: {error}" : "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
+    "Ok" : "Οκ",
+    "Error loading message template: {error}" : "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"],
+    "One file conflict" : "Ένα αρχείο διαφέρει",
+    "New Files" : "Νέα Αρχεία",
+    "Already existing files" : "Ήδη υπάρχοντα αρχεία",
+    "Which files do you want to keep?" : "Ποια αρχεία θέλετε να κρατήσετε;",
+    "If you select both versions, the copied file will have a number added to its name." : "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο.",
+    "Cancel" : "Άκυρο",
+    "Continue" : "Συνέχεια",
+    "(all selected)" : "(όλα τα επιλεγμένα)",
+    "({count} selected)" : "({count} επιλέχθησαν)",
+    "Error loading file exists template" : "Σφάλμα κατά την φόρτωση του προτύπου \"αρχείο υπάρχει\"",
+    "Very weak password" : "Πολύ αδύναμο συνθηματικό",
+    "Weak password" : "Αδύναμο συνθηματικό",
+    "So-so password" : "Μέτριο συνθηματικό",
+    "Good password" : "Καλό συνθηματικό",
+    "Strong password" : "Δυνατό συνθηματικό",
+    "Your web server is not yet properly setup to allow files 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 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." : "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
+    "Error occurred while checking server setup" : "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
+    "Shared" : "Κοινόχρηστα",
+    "Shared with {recipients}" : "Διαμοιράστηκε με {recipients}",
+    "Share" : "Διαμοιρασμός",
+    "Error" : "Σφάλμα",
+    "Error while sharing" : "Σφάλμα κατά τον διαμοιρασμό",
+    "Error while unsharing" : "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
+    "Error while changing permissions" : "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
+    "Shared with you and the group {group} by {owner}" : "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
+    "Shared with you by {owner}" : "Διαμοιράστηκε με σας από τον {owner}",
+    "Share with user or group …" : "Διαμοιρασμός με χρήστη ή ομάδα ...",
+    "Share link" : "Διαμοιρασμός συνδέσμου",
+    "The public link will expire no later than {days} days after it is created" : "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
+    "Password protect" : "Προστασία συνθηματικού",
+    "Choose a password for the public link" : "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο",
+    "Allow Public Upload" : "Επιτρέπεται η Δημόσια Αποστολή",
+    "Email link to person" : "Αποστολή συνδέσμου με email ",
+    "Send" : "Αποστολή",
+    "Set expiration date" : "Ορισμός ημ. λήξης",
+    "Expiration date" : "Ημερομηνία λήξης",
+    "Adding user..." : "Προσθήκη χρήστη ...",
+    "group" : "ομάδα",
+    "Resharing is not allowed" : "Ξαναμοιρασμός δεν επιτρέπεται",
+    "Shared in {item} with {user}" : "Διαμοιρασμός του {item} με τον {user}",
+    "Unshare" : "Διακοπή διαμοιρασμού",
+    "notify by email" : "ειδοποίηση με email",
+    "can share" : "δυνατότητα διαμοιρασμού",
+    "can edit" : "δυνατότητα αλλαγής",
+    "access control" : "έλεγχος πρόσβασης",
+    "create" : "δημιουργία",
+    "update" : "ενημέρωση",
+    "delete" : "διαγραφή",
+    "Password protected" : "Προστασία με συνθηματικό",
+    "Error unsetting expiration date" : "Σφάλμα κατά την διαγραφή της ημ. λήξης",
+    "Error setting expiration date" : "Σφάλμα κατά τον ορισμό ημ. λήξης",
+    "Sending ..." : "Αποστολή...",
+    "Email sent" : "Το Email απεστάλη ",
+    "Warning" : "Προειδοποίηση",
+    "The object type is not specified." : "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
+    "Enter new" : "Εισαγωγή νέου",
+    "Delete" : "Διαγραφή",
+    "Add" : "Προσθήκη",
+    "Edit tags" : "Επεξεργασία ετικετών",
+    "Error loading dialog template: {error}" : "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
+    "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. Redirecting you to ownCloud now." : "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
+    "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 επαναφορά κωδικού πρόσβασης",
+    "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
+    "You will receive a link to reset your password via Email." : "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
+    "Username" : "Όνομα χρήστη",
+    "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?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
+    "Yes, I really want to reset my password now" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
+    "Reset" : "Επαναφορά",
+    "New password" : "Νέο συνθηματικό",
+    "New Password" : "Νέος Κωδικός",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
+    "Personal" : "Προσωπικά",
+    "Users" : "Χρήστες",
+    "Apps" : "Εφαρμογές",
+    "Admin" : "Διαχείριση",
+    "Help" : "Βοήθεια",
+    "Error loading tags" : "Σφάλμα φόρτωσης ετικετών",
+    "Tag already exists" : "Υπάρχει ήδη η ετικέτα",
+    "Error deleting tag(s)" : "Σφάλμα διαγραφής ετικέτας(ων)",
+    "Error tagging" : "Σφάλμα προσθήκης ετικέτας",
+    "Error untagging" : "Σφάλμα αφαίρεσης ετικέτας",
+    "Error favoriting" : "Σφάλμα προσθήκης στα αγαπημένα",
+    "Error unfavoriting" : "Σφάλμα αφαίρεσης από τα αγαπημένα",
+    "Access forbidden" : "Δεν επιτρέπεται η πρόσβαση",
+    "File not found" : "Το αρχείο δεν βρέθηκε",
+    "The specified document has not been found on the server." : "Το συγκεκριμένο έγγραφο δεν έχει βρεθεί στο διακομιστή.",
+    "You can click here to return to %s." : "Μπορείτε να κάνετε κλικ εδώ για να επιστρέψετε στο %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Γειά χαρά,\n\nαπλά σας ενημερώνω πως ο %s μοιράστηκε το %s με εσάς.\nΔείτε το: %s\n\n",
+    "The share will expire on %s." : "Ο διαμοιρασμός θα λήξει σε %s.",
+    "Cheers!" : "Χαιρετισμούς!",
+    "Internal Server Error" : "Εσωτερικό Σφάλμα Διακομιστή",
+    "The server encountered an internal error and was unable to complete your request." : "Ο διακομιστής αντιμετώπισε ένα εσωτερικό σφάλμα και δεν μπόρεσε να ολοκληρώσει το αίτημά σας.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Παρακαλώ επικοινωνήστε με το διαχειριστή του διακομιστή, εάν αυτό το σφάλμα επανεμφανίζεται πολλές φορές, παρακαλούμε να συμπεριλάβετε τις τεχνικές λεπτομέρειες παρακάτω στην αναφορά σας.",
+    "More details can be found in the server log." : "Περισσότερες λεπτομέρειες μπορείτε να βρείτε στο αρχείο καταγραφής του διακομιστή.",
+    "Technical details" : "Τεχνικές λεπτομέρειες",
+    "Remote Address: %s" : "Απομακρυσμένη Διεύθυνση: %s",
+    "Request ID: %s" : "Αίτημα ID: %s",
+    "Code: %s" : "Κωδικός: %s",
+    "Message: %s" : "Μήνυμα: %s",
+    "File: %s" : "Αρχείο: %s",
+    "Line: %s" : "Γραμμή: %s",
+    "Trace" : "Ανίχνευση",
+    "Security Warning" : "Προειδοποίηση Ασφαλείας",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Η PHP ειναι ευαλωτη στην NULL Byte επιθεση (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Παρακαλώ ενημερώστε την εγκατάσταση της PHP ώστε να χρησιμοποιήσετε το %s με ασφάλεια.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
+    "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+    "Password" : "Συνθηματικό",
+    "Storage & database" : "Αποθήκευση & βάση δεδομένων",
+    "Data folder" : "Φάκελος δεδομένων",
+    "Configure the database" : "Ρύθμιση της βάσης δεδομένων",
+    "Only %s is available." : "Μόνο %s είναι διαθέσιμο.",
+    "Database user" : "Χρήστης της βάσης δεδομένων",
+    "Database password" : "Συνθηματικό βάσης δεδομένων",
+    "Database name" : "Όνομα βάσης δεδομένων",
+    "Database tablespace" : "Κενά Πινάκων Βάσης Δεδομένων",
+    "Database host" : "Διακομιστής βάσης δεδομένων",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Η SQLIte θα χρησιμοποιηθεί ως βάση δεδομένων. Για μεγαλύτερες εγκαταστάσεις σας συνιστούμε να το αλλάξετε.",
+    "Finish setup" : "Ολοκλήρωση εγκατάστασης",
+    "Finishing …" : "Ολοκλήρωση...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Αυτή η εφαρμογή απαιτεί JavaScript για τη σωστή λειτουργία. Παρακαλώ  <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε τη σελίδα.",
+    "%s is available. Get more information on how to update." : "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
+    "Log out" : "Αποσύνδεση",
+    "Server side authentication failed!" : "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
+    "Please contact your administrator." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
+    "Forgot your password? Reset it!" : "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
+    "remember" : "απομνημόνευση",
+    "Log in" : "Είσοδος",
+    "Alternative Logins" : "Εναλλακτικές Συνδέσεις",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
+    "This means only administrators can use the instance." : "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.",
+    "Thank you for your patience." : "Σας ευχαριστούμε για την υπομονή σας.",
+    "You are accessing the server from an untrusted domain." : "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ανάλογα με τις ρυθμίσεις σας, σαν διαχειριστής θα μπορούσατε επίσης να χρησιμοποιήσετε το παρακάτω κουμπί για να εμπιστευθείτε αυτή την περιοχή.",
+    "Add \"%s\" as trusted domain" : "Προσθήκη \"%s\" ως αξιόπιστη περιοχή",
+    "%s will be updated to version %s." : "Το %s θα ενημερωθεί στην έκδοση %s.",
+    "The following apps will be disabled:" : "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:",
+    "The theme %s has been disabled." : "Το θέμα %s έχει απενεργοποιηθεί.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.",
+    "Start update" : "Έναρξη ενημέρωσης",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Για να αποφύγετε τη λήξη χρόνου με μεγαλύτερες εγκαταστάσεις, μπορείτε αντί αυτού να τρέξετε την ακόλουθη εντολή από τον κατάλογο αρχείων εφαρμογών:",
+    "This %s instance is currently being updated, which may take a while." : "Αυτή %s η εγκατάσταση είναι υπό ενημέρωση, η οποία μπορεί να πάρει κάποιο χρόνο.",
+    "This page will refresh itself when the %s instance is available again." : "Αυτή η σελίδα θα ανανεωθεί από μόνη της όταν η %s εγκατάσταση είναι διαθέσιμη ξανά."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/el.php b/core/l10n/el.php
deleted file mode 100644
index c48ac9a4909..00000000000
--- a/core/l10n/el.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Αδυναμία αποστολής μηνύματος στους ακόλουθους χρήστες: %s",
-"Turned on maintenance mode" => "Η κατάσταση συντήρησης ενεργοποιήθηκε",
-"Turned off maintenance mode" => "Η κατάσταση συντήρησης απενεργοποιήθηκε",
-"Updated database" => "Ενημερωμένη βάση δεδομένων",
-"Checked database schema update" => "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων",
-"Checked database schema update for apps" => "Έλεγχος ενημέρωσης σχήματος βάσης δεδομένων για εφαρμογές",
-"Updated \"%s\" to %s" => "Αναβαθμίστηκε \"%s\" σε %s",
-"Disabled incompatible apps: %s" => "Απενεργοποιημένες μη συμβατές εφαρμογές: %s",
-"No image or file provided" => "Δεν δόθηκε εικόνα ή αρχείο",
-"Unknown filetype" => "Άγνωστος τύπος αρχείου",
-"Invalid image" => "Μη έγκυρη εικόνα",
-"No temporary profile picture available, try again" => "Δεν υπάρχει προσωρινή φωτογραφία προφίλ διαθέσιμη, δοκιμάστε ξανά",
-"No crop data provided" => "Δεν δόθηκαν δεδομένα περικοπής",
-"Sunday" => "Κυριακή",
-"Monday" => "Δευτέρα",
-"Tuesday" => "Τρίτη",
-"Wednesday" => "Τετάρτη",
-"Thursday" => "Πέμπτη",
-"Friday" => "Παρασκευή",
-"Saturday" => "Σάββατο",
-"January" => "Ιανουάριος",
-"February" => "Φεβρουάριος",
-"March" => "Μάρτιος",
-"April" => "Απρίλιος",
-"May" => "Μάϊος",
-"June" => "Ιούνιος",
-"July" => "Ιούλιος",
-"August" => "Αύγουστος",
-"September" => "Σεπτέμβριος",
-"October" => "Οκτώβριος",
-"November" => "Νοέμβριος",
-"December" => "Δεκέμβριος",
-"Settings" => "Ρυθμίσεις",
-"File" => "Αρχείο",
-"Folder" => "Φάκελος",
-"Image" => "Εικόνα",
-"Audio" => "Ήχος",
-"Saving..." => "Γίνεται αποθήκευση...",
-"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 />Θέλετε στ' αλήθεια να συνεχίσετε;",
-"I know what I'm doing" => "Γνωρίζω τι κάνω",
-"Reset password" => "Επαναφορά συνθηματικού",
-"Password can not be changed. Please contact your administrator." => "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
-"No" => "Όχι",
-"Yes" => "Ναι",
-"Choose" => "Επιλέξτε",
-"Error loading file picker template: {error}" => "Σφάλμα κατά την φόρτωση προτύπου επιλογέα αρχείων: {σφάλμα}",
-"Ok" => "Οκ",
-"Error loading message template: {error}" => "Σφάλμα φόρτωσης προτύπου μηνυμάτων: {σφάλμα}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} αρχείο διαφέρει","{count} αρχεία διαφέρουν"),
-"One file conflict" => "Ένα αρχείο διαφέρει",
-"New Files" => "Νέα Αρχεία",
-"Already existing files" => "Ήδη υπάρχοντα αρχεία",
-"Which files do you want to keep?" => "Ποια αρχεία θέλετε να κρατήσετε;",
-"If you select both versions, the copied file will have a number added to its name." => "Εάν επιλέξετε και τις δυο εκδοχές, ένας αριθμός θα προστεθεί στο αντιγραφόμενο αρχείο.",
-"Cancel" => "Άκυρο",
-"Continue" => "Συνέχεια",
-"(all selected)" => "(όλα τα επιλεγμένα)",
-"({count} selected)" => "({count} επιλέχθησαν)",
-"Error loading file exists template" => "Σφάλμα κατά την φόρτωση του προτύπου \"αρχείο υπάρχει\"",
-"Very weak password" => "Πολύ αδύναμο συνθηματικό",
-"Weak password" => "Αδύναμο συνθηματικό",
-"So-so password" => "Μέτριο συνθηματικό",
-"Good password" => "Καλό συνθηματικό",
-"Strong password" => "Δυνατό συνθηματικό",
-"Your web server is not yet properly setup to allow files 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 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." => "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.",
-"Error occurred while checking server setup" => "Παρουσιάστηκε σφάλμα κατά τον έλεγχο της εγκατάστασης με το διακομιστή",
-"Shared" => "Κοινόχρηστα",
-"Shared with {recipients}" => "Διαμοιράστηκε με {recipients}",
-"Share" => "Διαμοιρασμός",
-"Error" => "Σφάλμα",
-"Error while sharing" => "Σφάλμα κατά τον διαμοιρασμό",
-"Error while unsharing" => "Σφάλμα κατά το σταμάτημα του διαμοιρασμού",
-"Error while changing permissions" => "Σφάλμα κατά την αλλαγή των δικαιωμάτων",
-"Shared with you and the group {group} by {owner}" => "Διαμοιράστηκε με σας και με την ομάδα {group} του {owner}",
-"Shared with you by {owner}" => "Διαμοιράστηκε με σας από τον {owner}",
-"Share with user or group …" => "Διαμοιρασμός με χρήστη ή ομάδα ...",
-"Share link" => "Διαμοιρασμός συνδέσμου",
-"The public link will expire no later than {days} days after it is created" => "Ο δημόσιος σύνδεσμος θα απενεργοποιηθεί το πολύ {days} ημέρες μετά την δημιουργία του",
-"Password protect" => "Προστασία συνθηματικού",
-"Choose a password for the public link" => "Επιλέξτε κωδικό για τον δημόσιο σύνδεσμο",
-"Allow Public Upload" => "Επιτρέπεται η Δημόσια Αποστολή",
-"Email link to person" => "Αποστολή συνδέσμου με email ",
-"Send" => "Αποστολή",
-"Set expiration date" => "Ορισμός ημ. λήξης",
-"Expiration date" => "Ημερομηνία λήξης",
-"Adding user..." => "Προσθήκη χρήστη ...",
-"group" => "ομάδα",
-"Resharing is not allowed" => "Ξαναμοιρασμός δεν επιτρέπεται",
-"Shared in {item} with {user}" => "Διαμοιρασμός του {item} με τον {user}",
-"Unshare" => "Διακοπή διαμοιρασμού",
-"notify by email" => "ειδοποίηση με email",
-"can share" => "δυνατότητα διαμοιρασμού",
-"can edit" => "δυνατότητα αλλαγής",
-"access control" => "έλεγχος πρόσβασης",
-"create" => "δημιουργία",
-"update" => "ενημέρωση",
-"delete" => "διαγραφή",
-"Password protected" => "Προστασία με συνθηματικό",
-"Error unsetting expiration date" => "Σφάλμα κατά την διαγραφή της ημ. λήξης",
-"Error setting expiration date" => "Σφάλμα κατά τον ορισμό ημ. λήξης",
-"Sending ..." => "Αποστολή...",
-"Email sent" => "Το Email απεστάλη ",
-"Warning" => "Προειδοποίηση",
-"The object type is not specified." => "Δεν καθορίστηκε ο τύπος του αντικειμένου.",
-"Enter new" => "Εισαγωγή νέου",
-"Delete" => "Διαγραφή",
-"Add" => "Προσθήκη",
-"Edit tags" => "Επεξεργασία ετικετών",
-"Error loading dialog template: {error}" => "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
-"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. Redirecting you to ownCloud now." => "Η ενημέρωση ήταν επιτυχής. Μετάβαση στο ownCloud.",
-"Couldn't reset password because the token is invalid" => "Αδυναμία επαναφοράς κωδικού πρόσβασης καθώς το τεκμήριο είναι άκυρο",
-"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 επαναφορά κωδικού πρόσβασης",
-"Use the following link to reset your password: {link}" => "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
-"You will receive a link to reset your password via Email." => "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
-"Username" => "Όνομα χρήστη",
-"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?" => "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
-"Yes, I really want to reset my password now" => "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
-"Reset" => "Επαναφορά",
-"New password" => "Νέο συνθηματικό",
-"New Password" => "Νέος Κωδικός",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
-"For the best results, please consider using a GNU/Linux server instead." => "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
-"Personal" => "Προσωπικά",
-"Users" => "Χρήστες",
-"Apps" => "Εφαρμογές",
-"Admin" => "Διαχείριση",
-"Help" => "Βοήθεια",
-"Error loading tags" => "Σφάλμα φόρτωσης ετικετών",
-"Tag already exists" => "Υπάρχει ήδη η ετικέτα",
-"Error deleting tag(s)" => "Σφάλμα διαγραφής ετικέτας(ων)",
-"Error tagging" => "Σφάλμα προσθήκης ετικέτας",
-"Error untagging" => "Σφάλμα αφαίρεσης ετικέτας",
-"Error favoriting" => "Σφάλμα προσθήκης στα αγαπημένα",
-"Error unfavoriting" => "Σφάλμα αφαίρεσης από τα αγαπημένα",
-"Access forbidden" => "Δεν επιτρέπεται η πρόσβαση",
-"File not found" => "Το αρχείο δεν βρέθηκε",
-"The specified document has not been found on the server." => "Το συγκεκριμένο έγγραφο δεν έχει βρεθεί στο διακομιστή.",
-"You can click here to return to %s." => "Μπορείτε να κάνετε κλικ εδώ για να επιστρέψετε στο %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Γειά χαρά,\n\nαπλά σας ενημερώνω πως ο %s μοιράστηκε το %s με εσάς.\nΔείτε το: %s\n\n",
-"The share will expire on %s." => "Ο διαμοιρασμός θα λήξει σε %s.",
-"Cheers!" => "Χαιρετισμούς!",
-"Internal Server Error" => "Εσωτερικό Σφάλμα Διακομιστή",
-"The server encountered an internal error and was unable to complete your request." => "Ο διακομιστής αντιμετώπισε ένα εσωτερικό σφάλμα και δεν μπόρεσε να ολοκληρώσει το αίτημά σας.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Παρακαλώ επικοινωνήστε με το διαχειριστή του διακομιστή, εάν αυτό το σφάλμα επανεμφανίζεται πολλές φορές, παρακαλούμε να συμπεριλάβετε τις τεχνικές λεπτομέρειες παρακάτω στην αναφορά σας.",
-"More details can be found in the server log." => "Περισσότερες λεπτομέρειες μπορείτε να βρείτε στο αρχείο καταγραφής του διακομιστή.",
-"Technical details" => "Τεχνικές λεπτομέρειες",
-"Remote Address: %s" => "Απομακρυσμένη Διεύθυνση: %s",
-"Request ID: %s" => "Αίτημα ID: %s",
-"Code: %s" => "Κωδικός: %s",
-"Message: %s" => "Μήνυμα: %s",
-"File: %s" => "Αρχείο: %s",
-"Line: %s" => "Γραμμή: %s",
-"Trace" => "Ανίχνευση",
-"Security Warning" => "Προειδοποίηση Ασφαλείας",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Η PHP ειναι ευαλωτη στην NULL Byte επιθεση (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Παρακαλώ ενημερώστε την εγκατάσταση της PHP ώστε να χρησιμοποιήσετε το %s με ασφάλεια.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
-"Create an <strong>admin account</strong>" => "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
-"Password" => "Συνθηματικό",
-"Storage & database" => "Αποθήκευση & βάση δεδομένων",
-"Data folder" => "Φάκελος δεδομένων",
-"Configure the database" => "Ρύθμιση της βάσης δεδομένων",
-"Only %s is available." => "Μόνο %s είναι διαθέσιμο.",
-"Database user" => "Χρήστης της βάσης δεδομένων",
-"Database password" => "Συνθηματικό βάσης δεδομένων",
-"Database name" => "Όνομα βάσης δεδομένων",
-"Database tablespace" => "Κενά Πινάκων Βάσης Δεδομένων",
-"Database host" => "Διακομιστής βάσης δεδομένων",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Η SQLIte θα χρησιμοποιηθεί ως βάση δεδομένων. Για μεγαλύτερες εγκαταστάσεις σας συνιστούμε να το αλλάξετε.",
-"Finish setup" => "Ολοκλήρωση εγκατάστασης",
-"Finishing …" => "Ολοκλήρωση...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Αυτή η εφαρμογή απαιτεί JavaScript για τη σωστή λειτουργία. Παρακαλώ  <a href=\"http://enable-javascript.com/\" target=\"_blank\">ενεργοποιήστε τη JavaScript</a> και επαναφορτώστε τη σελίδα.",
-"%s is available. Get more information on how to update." => "%s είναι διαθέσιμη. Δείτε περισσότερες πληροφορίες στο πώς να αναβαθμίσετε.",
-"Log out" => "Αποσύνδεση",
-"Server side authentication failed!" => "Η διαδικασία επικύρωσης απέτυχε από την πλευρά του διακομιστή!",
-"Please contact your administrator." => "Παρακαλώ επικοινωνήστε με τον διαχειριστή.",
-"Forgot your password? Reset it!" => "Ξεχάσατε τον κωδικό πρόσβασής σας; Επαναφέρετέ τον!",
-"remember" => "απομνημόνευση",
-"Log in" => "Είσοδος",
-"Alternative Logins" => "Εναλλακτικές Συνδέσεις",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Γειά χαρά,<br><br>απλά σας ενημερώνω πως ο %s μοιράστηκε το<strong>%s</strong> με εσάς.<br><a href=\"%s\">Δείτε το!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Αυτή η εγκατάσταση ownCloud είναι τώρα σε κατάσταση ενός χρήστη.",
-"This means only administrators can use the instance." => "Αυτό σημαίνει ότι μόνο διαχειριστές μπορούν να χρησιμοποιήσουν την εγκατάσταση.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Επικοινωνήστε με το διαχειριστή του συστήματος αν αυτό το μήνυμα συνεχίζει να εμφανίζεται ή εμφανίστηκε απρόσμενα.",
-"Thank you for your patience." => "Σας ευχαριστούμε για την υπομονή σας.",
-"You are accessing the server from an untrusted domain." => "Η προσπέλαση του διακομιστή γίνεται από μη έμπιστο τομέα.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Παρακαλώ επικοινωνήστε με τον διαχειριστή συστημάτων σας. Αν είστε διαχειριστής αυτού του στιγμιοτύπο, ρυθμίστε το κλειδί \"trusted_domain\" στο αρχείο config/config.php. Ένα παράδειγμα παρέχεται στο αρχείο config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Ανάλογα με τις ρυθμίσεις σας, σαν διαχειριστής θα μπορούσατε επίσης να χρησιμοποιήσετε το παρακάτω κουμπί για να εμπιστευθείτε αυτή την περιοχή.",
-"Add \"%s\" as trusted domain" => "Προσθήκη \"%s\" ως αξιόπιστη περιοχή",
-"%s will be updated to version %s." => "Το %s θα ενημερωθεί στην έκδοση %s.",
-"The following apps will be disabled:" => "Οι παρακάτω εφαρμογές θα απενεργοποιηθούν:",
-"The theme %s has been disabled." => "Το θέμα %s έχει απενεργοποιηθεί.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Παρακαλώ βεβαιωθείτε ότι έχουν ληψθεί αντίγραφα ασφαλείας της βάσης δεδομένων, του φακέλου ρυθμίσεων και του φακέλου δεδομένων πριν προχωρήσετε.",
-"Start update" => "Έναρξη ενημέρωσης",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Για να αποφύγετε τη λήξη χρόνου με μεγαλύτερες εγκαταστάσεις, μπορείτε αντί αυτού να τρέξετε την ακόλουθη εντολή από τον κατάλογο αρχείων εφαρμογών:",
-"This %s instance is currently being updated, which may take a while." => "Αυτή %s η εγκατάσταση είναι υπό ενημέρωση, η οποία μπορεί να πάρει κάποιο χρόνο.",
-"This page will refresh itself when the %s instance is available again." => "Αυτή η σελίδα θα ανανεωθεί από μόνη της όταν η %s εγκατάσταση είναι διαθέσιμη ξανά."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en@pirate.js b/core/l10n/en@pirate.js
new file mode 100644
index 00000000000..0869bb9f0a3
--- /dev/null
+++ b/core/l10n/en@pirate.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Password" : "Passcode"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en@pirate.json b/core/l10n/en@pirate.json
new file mode 100644
index 00000000000..6a15bfb20b5
--- /dev/null
+++ b/core/l10n/en@pirate.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Password" : "Passcode"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/en@pirate.php b/core/l10n/en@pirate.php
deleted file mode 100644
index 44114abbc8d..00000000000
--- a/core/l10n/en@pirate.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Password" => "Passcode"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
new file mode 100644
index 00000000000..9dc918f12eb
--- /dev/null
+++ b/core/l10n/en_GB.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Couldn't send mail to following users: %s ",
+    "Turned on maintenance mode" : "Turned on maintenance mode",
+    "Turned off maintenance mode" : "Turned off maintenance mode",
+    "Updated database" : "Updated database",
+    "Checked database schema update" : "Checked database schema update",
+    "Checked database schema update for apps" : "Checked database schema update for apps",
+    "Updated \"%s\" to %s" : "Updated \"%s\" to %s",
+    "Disabled incompatible apps: %s" : "Disabled incompatible apps: %s",
+    "No image or file provided" : "No image or file provided",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "No temporary profile picture available, try again" : "No temporary profile picture available, try again",
+    "No crop data provided" : "No crop data provided",
+    "Sunday" : "Sunday",
+    "Monday" : "Monday",
+    "Tuesday" : "Tuesday",
+    "Wednesday" : "Wednesday",
+    "Thursday" : "Thursday",
+    "Friday" : "Friday",
+    "Saturday" : "Saturday",
+    "January" : "January",
+    "February" : "February",
+    "March" : "March",
+    "April" : "April",
+    "May" : "May",
+    "June" : "June",
+    "July" : "July",
+    "August" : "August",
+    "September" : "September",
+    "October" : "October",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Settings",
+    "File" : "File",
+    "Folder" : "Folder",
+    "Image" : "Image",
+    "Audio" : "Audio",
+    "Saving..." : "Saving...",
+    "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?",
+    "I know what I'm doing" : "I know what I'm doing",
+    "Reset password" : "Reset password",
+    "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
+    "No" : "No",
+    "Yes" : "Yes",
+    "Choose" : "Choose",
+    "Error loading file picker template: {error}" : "Error loading file picker template: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Error loading message template: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file conflict","{count} file conflicts"],
+    "One file conflict" : "One file conflict",
+    "New Files" : "New Files",
+    "Already existing files" : "Already existing files",
+    "Which files do you want to keep?" : "Which files do you wish to keep?",
+    "If you select both versions, the copied file will have a number added to its name." : "If you select both versions, the copied file will have a number added to its name.",
+    "Cancel" : "Cancel",
+    "Continue" : "Continue",
+    "(all selected)" : "(all selected)",
+    "({count} selected)" : "({count} selected)",
+    "Error loading file exists template" : "Error loading file exists template",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
+    "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." : "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.",
+    "Error occurred while checking server setup" : "Error occurred whilst checking server setup",
+    "Shared" : "Shared",
+    "Shared with {recipients}" : "Shared with {recipients}",
+    "Share" : "Share",
+    "Error" : "Error",
+    "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 user or group …" : "Share with user or group …",
+    "Share link" : "Share link",
+    "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
+    "Password protect" : "Password protect",
+    "Choose a password for the public link" : "Choose a password for the public link",
+    "Allow Public Upload" : "Allow Public Upload",
+    "Email link to person" : "Email link to person",
+    "Send" : "Send",
+    "Set expiration date" : "Set expiration date",
+    "Expiration date" : "Expiration date",
+    "Adding user..." : "Adding user...",
+    "group" : "group",
+    "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",
+    "can share" : "can share",
+    "can edit" : "can edit",
+    "access control" : "access control",
+    "create" : "create",
+    "update" : "update",
+    "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",
+    "Warning" : "Warning",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Enter new",
+    "Delete" : "Delete",
+    "Add" : "Add",
+    "Edit tags" : "Edit tags",
+    "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
+    "No tags selected for deletion." : "No tags selected for deletion.",
+    "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
+    "Please reload the page." : "Please reload the page.",
+    "The update was unsuccessful." : "The update was unsuccessful.",
+    "The update was successful. Redirecting you to ownCloud now." : "The update was successful. Redirecting you to ownCloud now.",
+    "Couldn't reset password because the token is invalid" : "Couldn't reset password because the token is invalid",
+    "Couldn't send reset email. Please make sure your username is correct." : "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." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
+    "%s password reset" : "%s password reset",
+    "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
+    "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.",
+    "Username" : "Username",
+    "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?" : "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?",
+    "Yes, I really want to reset my password now" : "Yes, I really want to reset my password now",
+    "Reset" : "Reset",
+    "New password" : "New password",
+    "New Password" : "New Password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
+    "Personal" : "Personal",
+    "Users" : "Users",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Help",
+    "Error loading tags" : "Error loading tags",
+    "Tag already exists" : "Tag already exists",
+    "Error deleting tag(s)" : "Error deleting tag(s)",
+    "Error tagging" : "Error tagging",
+    "Error untagging" : "Error untagging",
+    "Error favoriting" : "Error favouriting",
+    "Error unfavoriting" : "Error unfavouriting",
+    "Access forbidden" : "Access denied",
+    "File not found" : "File not found",
+    "The specified document has not been found on the server." : "The specified document has not been found on the server.",
+    "You can click here to return to %s." : "You can click here to return to %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
+    "Internal Server Error" : "Internal Server Error",
+    "The server encountered an internal error and was unable to complete your request." : "The server encountered an internal error and was unable to complete your request.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
+    "More details can be found in the server log." : "More details can be found in the server log.",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Security Warning",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Please update your PHP installation to use %s securely.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Storage & database",
+    "Data folder" : "Data folder",
+    "Configure the database" : "Configure the database",
+    "Only %s is available." : "Only %s is available.",
+    "Database user" : "Database user",
+    "Database password" : "Database password",
+    "Database name" : "Database name",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Database host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite will be used as database. For larger installations we recommend changing this.",
+    "Finish setup" : "Finish setup",
+    "Finishing …" : "Finishing …",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page.",
+    "%s is available. Get more information on how to update." : "%s is available. Get more information on how to update.",
+    "Log out" : "Log out",
+    "Server side authentication failed!" : "Server side authentication failed!",
+    "Please contact your administrator." : "Please contact your administrator.",
+    "Forgot your password? Reset it!" : "Forgot your password? Reset it!",
+    "remember" : "remember",
+    "Log in" : "Log in",
+    "Alternative Logins" : "Alternative Logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "This ownCloud instance is currently in single user mode.",
+    "This means only administrators can use the instance." : "This means only administrators can use the instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contact your system administrator if this message persists or appeared unexpectedly.",
+    "Thank you for your patience." : "Thank you for your patience.",
+    "You are accessing the server from an untrusted domain." : "You are accessing the server from an untrusted domain.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
+    "Add \"%s\" as trusted domain" : "Add \"%s\" as a trusted domain",
+    "%s will be updated to version %s." : "%s will be updated to version %s.",
+    "The following apps will be disabled:" : "The following apps will be disabled:",
+    "The theme %s has been disabled." : "The theme %s has been disabled.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
+    "Start update" : "Start update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:",
+    "This %s instance is currently being updated, which may take a while." : "This %s instance is currently being updated, which may take a while.",
+    "This page will refresh itself when the %s instance is available again." : "This page will refresh itself when the %s instance is available again."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
new file mode 100644
index 00000000000..a1768bcf0bd
--- /dev/null
+++ b/core/l10n/en_GB.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Couldn't send mail to following users: %s ",
+    "Turned on maintenance mode" : "Turned on maintenance mode",
+    "Turned off maintenance mode" : "Turned off maintenance mode",
+    "Updated database" : "Updated database",
+    "Checked database schema update" : "Checked database schema update",
+    "Checked database schema update for apps" : "Checked database schema update for apps",
+    "Updated \"%s\" to %s" : "Updated \"%s\" to %s",
+    "Disabled incompatible apps: %s" : "Disabled incompatible apps: %s",
+    "No image or file provided" : "No image or file provided",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "No temporary profile picture available, try again" : "No temporary profile picture available, try again",
+    "No crop data provided" : "No crop data provided",
+    "Sunday" : "Sunday",
+    "Monday" : "Monday",
+    "Tuesday" : "Tuesday",
+    "Wednesday" : "Wednesday",
+    "Thursday" : "Thursday",
+    "Friday" : "Friday",
+    "Saturday" : "Saturday",
+    "January" : "January",
+    "February" : "February",
+    "March" : "March",
+    "April" : "April",
+    "May" : "May",
+    "June" : "June",
+    "July" : "July",
+    "August" : "August",
+    "September" : "September",
+    "October" : "October",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Settings",
+    "File" : "File",
+    "Folder" : "Folder",
+    "Image" : "Image",
+    "Audio" : "Audio",
+    "Saving..." : "Saving...",
+    "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?",
+    "I know what I'm doing" : "I know what I'm doing",
+    "Reset password" : "Reset password",
+    "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
+    "No" : "No",
+    "Yes" : "Yes",
+    "Choose" : "Choose",
+    "Error loading file picker template: {error}" : "Error loading file picker template: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Error loading message template: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file conflict","{count} file conflicts"],
+    "One file conflict" : "One file conflict",
+    "New Files" : "New Files",
+    "Already existing files" : "Already existing files",
+    "Which files do you want to keep?" : "Which files do you wish to keep?",
+    "If you select both versions, the copied file will have a number added to its name." : "If you select both versions, the copied file will have a number added to its name.",
+    "Cancel" : "Cancel",
+    "Continue" : "Continue",
+    "(all selected)" : "(all selected)",
+    "({count} selected)" : "({count} selected)",
+    "Error loading file exists template" : "Error loading file exists template",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
+    "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." : "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.",
+    "Error occurred while checking server setup" : "Error occurred whilst checking server setup",
+    "Shared" : "Shared",
+    "Shared with {recipients}" : "Shared with {recipients}",
+    "Share" : "Share",
+    "Error" : "Error",
+    "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 user or group …" : "Share with user or group …",
+    "Share link" : "Share link",
+    "The public link will expire no later than {days} days after it is created" : "The public link will expire no later than {days} days after it is created",
+    "Password protect" : "Password protect",
+    "Choose a password for the public link" : "Choose a password for the public link",
+    "Allow Public Upload" : "Allow Public Upload",
+    "Email link to person" : "Email link to person",
+    "Send" : "Send",
+    "Set expiration date" : "Set expiration date",
+    "Expiration date" : "Expiration date",
+    "Adding user..." : "Adding user...",
+    "group" : "group",
+    "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",
+    "can share" : "can share",
+    "can edit" : "can edit",
+    "access control" : "access control",
+    "create" : "create",
+    "update" : "update",
+    "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",
+    "Warning" : "Warning",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Enter new",
+    "Delete" : "Delete",
+    "Add" : "Add",
+    "Edit tags" : "Edit tags",
+    "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
+    "No tags selected for deletion." : "No tags selected for deletion.",
+    "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
+    "Please reload the page." : "Please reload the page.",
+    "The update was unsuccessful." : "The update was unsuccessful.",
+    "The update was successful. Redirecting you to ownCloud now." : "The update was successful. Redirecting you to ownCloud now.",
+    "Couldn't reset password because the token is invalid" : "Couldn't reset password because the token is invalid",
+    "Couldn't send reset email. Please make sure your username is correct." : "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." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
+    "%s password reset" : "%s password reset",
+    "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
+    "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.",
+    "Username" : "Username",
+    "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?" : "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?",
+    "Yes, I really want to reset my password now" : "Yes, I really want to reset my password now",
+    "Reset" : "Reset",
+    "New password" : "New password",
+    "New Password" : "New Password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
+    "Personal" : "Personal",
+    "Users" : "Users",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Help",
+    "Error loading tags" : "Error loading tags",
+    "Tag already exists" : "Tag already exists",
+    "Error deleting tag(s)" : "Error deleting tag(s)",
+    "Error tagging" : "Error tagging",
+    "Error untagging" : "Error untagging",
+    "Error favoriting" : "Error favouriting",
+    "Error unfavoriting" : "Error unfavouriting",
+    "Access forbidden" : "Access denied",
+    "File not found" : "File not found",
+    "The specified document has not been found on the server." : "The specified document has not been found on the server.",
+    "You can click here to return to %s." : "You can click here to return to %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
+    "The share will expire on %s." : "The share will expire on %s.",
+    "Cheers!" : "Cheers!",
+    "Internal Server Error" : "Internal Server Error",
+    "The server encountered an internal error and was unable to complete your request." : "The server encountered an internal error and was unable to complete your request.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
+    "More details can be found in the server log." : "More details can be found in the server log.",
+    "Technical details" : "Technical details",
+    "Remote Address: %s" : "Remote Address: %s",
+    "Request ID: %s" : "Request ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Line: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Security Warning",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Please update your PHP installation to use %s securely.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Storage & database",
+    "Data folder" : "Data folder",
+    "Configure the database" : "Configure the database",
+    "Only %s is available." : "Only %s is available.",
+    "Database user" : "Database user",
+    "Database password" : "Database password",
+    "Database name" : "Database name",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Database host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite will be used as database. For larger installations we recommend changing this.",
+    "Finish setup" : "Finish setup",
+    "Finishing …" : "Finishing …",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page.",
+    "%s is available. Get more information on how to update." : "%s is available. Get more information on how to update.",
+    "Log out" : "Log out",
+    "Server side authentication failed!" : "Server side authentication failed!",
+    "Please contact your administrator." : "Please contact your administrator.",
+    "Forgot your password? Reset it!" : "Forgot your password? Reset it!",
+    "remember" : "remember",
+    "Log in" : "Log in",
+    "Alternative Logins" : "Alternative Logins",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "This ownCloud instance is currently in single user mode.",
+    "This means only administrators can use the instance." : "This means only administrators can use the instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contact your system administrator if this message persists or appeared unexpectedly.",
+    "Thank you for your patience." : "Thank you for your patience.",
+    "You are accessing the server from an untrusted domain." : "You are accessing the server from an untrusted domain.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
+    "Add \"%s\" as trusted domain" : "Add \"%s\" as a trusted domain",
+    "%s will be updated to version %s." : "%s will be updated to version %s.",
+    "The following apps will be disabled:" : "The following apps will be disabled:",
+    "The theme %s has been disabled." : "The theme %s has been disabled.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
+    "Start update" : "Start update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:",
+    "This %s instance is currently being updated, which may take a while." : "This %s instance is currently being updated, which may take a while.",
+    "This page will refresh itself when the %s instance is available again." : "This page will refresh itself when the %s instance is available again."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/en_GB.php b/core/l10n/en_GB.php
deleted file mode 100644
index 831a0dd511f..00000000000
--- a/core/l10n/en_GB.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Couldn't send mail to following users: %s ",
-"Turned on maintenance mode" => "Turned on maintenance mode",
-"Turned off maintenance mode" => "Turned off maintenance mode",
-"Updated database" => "Updated database",
-"Checked database schema update" => "Checked database schema update",
-"Checked database schema update for apps" => "Checked database schema update for apps",
-"Updated \"%s\" to %s" => "Updated \"%s\" to %s",
-"Disabled incompatible apps: %s" => "Disabled incompatible apps: %s",
-"No image or file provided" => "No image or file provided",
-"Unknown filetype" => "Unknown filetype",
-"Invalid image" => "Invalid image",
-"No temporary profile picture available, try again" => "No temporary profile picture available, try again",
-"No crop data provided" => "No crop data provided",
-"Sunday" => "Sunday",
-"Monday" => "Monday",
-"Tuesday" => "Tuesday",
-"Wednesday" => "Wednesday",
-"Thursday" => "Thursday",
-"Friday" => "Friday",
-"Saturday" => "Saturday",
-"January" => "January",
-"February" => "February",
-"March" => "March",
-"April" => "April",
-"May" => "May",
-"June" => "June",
-"July" => "July",
-"August" => "August",
-"September" => "September",
-"October" => "October",
-"November" => "November",
-"December" => "December",
-"Settings" => "Settings",
-"File" => "File",
-"Folder" => "Folder",
-"Image" => "Image",
-"Audio" => "Audio",
-"Saving..." => "Saving...",
-"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?",
-"I know what I'm doing" => "I know what I'm doing",
-"Reset password" => "Reset password",
-"Password can not be changed. Please contact your administrator." => "Password can not be changed. Please contact your administrator.",
-"No" => "No",
-"Yes" => "Yes",
-"Choose" => "Choose",
-"Error loading file picker template: {error}" => "Error loading file picker template: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Error loading message template: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} file conflict","{count} file conflicts"),
-"One file conflict" => "One file conflict",
-"New Files" => "New Files",
-"Already existing files" => "Already existing files",
-"Which files do you want to keep?" => "Which files do you wish to keep?",
-"If you select both versions, the copied file will have a number added to its name." => "If you select both versions, the copied file will have a number added to its name.",
-"Cancel" => "Cancel",
-"Continue" => "Continue",
-"(all selected)" => "(all selected)",
-"({count} selected)" => "({count} selected)",
-"Error loading file exists template" => "Error loading file exists template",
-"Very weak password" => "Very weak password",
-"Weak password" => "Weak password",
-"So-so password" => "So-so password",
-"Good password" => "Good password",
-"Strong password" => "Strong password",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
-"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." => "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.",
-"Error occurred while checking server setup" => "Error occurred whilst checking server setup",
-"Shared" => "Shared",
-"Shared with {recipients}" => "Shared with {recipients}",
-"Share" => "Share",
-"Error" => "Error",
-"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 user or group …" => "Share with user or group …",
-"Share link" => "Share link",
-"The public link will expire no later than {days} days after it is created" => "The public link will expire no later than {days} days after it is created",
-"Password protect" => "Password protect",
-"Choose a password for the public link" => "Choose a password for the public link",
-"Allow Public Upload" => "Allow Public Upload",
-"Email link to person" => "Email link to person",
-"Send" => "Send",
-"Set expiration date" => "Set expiration date",
-"Expiration date" => "Expiration date",
-"Adding user..." => "Adding user...",
-"group" => "group",
-"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",
-"can share" => "can share",
-"can edit" => "can edit",
-"access control" => "access control",
-"create" => "create",
-"update" => "update",
-"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",
-"Warning" => "Warning",
-"The object type is not specified." => "The object type is not specified.",
-"Enter new" => "Enter new",
-"Delete" => "Delete",
-"Add" => "Add",
-"Edit tags" => "Edit tags",
-"Error loading dialog template: {error}" => "Error loading dialog template: {error}",
-"No tags selected for deletion." => "No tags selected for deletion.",
-"Updating {productName} to version {version}, this may take a while." => "Updating {productName} to version {version}, this may take a while.",
-"Please reload the page." => "Please reload the page.",
-"The update was unsuccessful." => "The update was unsuccessful.",
-"The update was successful. Redirecting you to ownCloud now." => "The update was successful. Redirecting you to ownCloud now.",
-"Couldn't reset password because the token is invalid" => "Couldn't reset password because the token is invalid",
-"Couldn't send reset email. Please make sure your username is correct." => "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." => "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
-"%s password reset" => "%s password reset",
-"Use the following link to reset your password: {link}" => "Use the following link to reset your password: {link}",
-"You will receive a link to reset your password via Email." => "You will receive a link to reset your password via email.",
-"Username" => "Username",
-"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?" => "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?",
-"Yes, I really want to reset my password now" => "Yes, I really want to reset my password now",
-"Reset" => "Reset",
-"New password" => "New password",
-"New Password" => "New Password",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
-"For the best results, please consider using a GNU/Linux server instead." => "For the best results, please consider using a GNU/Linux server instead.",
-"Personal" => "Personal",
-"Users" => "Users",
-"Apps" => "Apps",
-"Admin" => "Admin",
-"Help" => "Help",
-"Error loading tags" => "Error loading tags",
-"Tag already exists" => "Tag already exists",
-"Error deleting tag(s)" => "Error deleting tag(s)",
-"Error tagging" => "Error tagging",
-"Error untagging" => "Error untagging",
-"Error favoriting" => "Error favouriting",
-"Error unfavoriting" => "Error unfavouriting",
-"Access forbidden" => "Access denied",
-"File not found" => "File not found",
-"The specified document has not been found on the server." => "The specified document has not been found on the server.",
-"You can click here to return to %s." => "You can click here to return to %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n",
-"The share will expire on %s." => "The share will expire on %s.",
-"Cheers!" => "Cheers!",
-"Internal Server Error" => "Internal Server Error",
-"The server encountered an internal error and was unable to complete your request." => "The server encountered an internal error and was unable to complete your request.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report.",
-"More details can be found in the server log." => "More details can be found in the server log.",
-"Technical details" => "Technical details",
-"Remote Address: %s" => "Remote Address: %s",
-"Request ID: %s" => "Request ID: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Message: %s",
-"File: %s" => "File: %s",
-"Line: %s" => "Line: %s",
-"Trace" => "Trace",
-"Security Warning" => "Security Warning",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Please update your PHP installation to use %s securely.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
-"Create an <strong>admin account</strong>" => "Create an <strong>admin account</strong>",
-"Password" => "Password",
-"Storage & database" => "Storage & database",
-"Data folder" => "Data folder",
-"Configure the database" => "Configure the database",
-"Only %s is available." => "Only %s is available.",
-"Database user" => "Database user",
-"Database password" => "Database password",
-"Database name" => "Database name",
-"Database tablespace" => "Database tablespace",
-"Database host" => "Database host",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite will be used as database. For larger installations we recommend changing this.",
-"Finish setup" => "Finish setup",
-"Finishing …" => "Finishing …",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page.",
-"%s is available. Get more information on how to update." => "%s is available. Get more information on how to update.",
-"Log out" => "Log out",
-"Server side authentication failed!" => "Server side authentication failed!",
-"Please contact your administrator." => "Please contact your administrator.",
-"Forgot your password? Reset it!" => "Forgot your password? Reset it!",
-"remember" => "remember",
-"Log in" => "Log in",
-"Alternative Logins" => "Alternative Logins",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "This ownCloud instance is currently in single user mode.",
-"This means only administrators can use the instance." => "This means only administrators can use the instance.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contact your system administrator if this message persists or appeared unexpectedly.",
-"Thank you for your patience." => "Thank you for your patience.",
-"You are accessing the server from an untrusted domain." => "You are accessing the server from an untrusted domain.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain.",
-"Add \"%s\" as trusted domain" => "Add \"%s\" as a trusted domain",
-"%s will be updated to version %s." => "%s will be updated to version %s.",
-"The following apps will be disabled:" => "The following apps will be disabled:",
-"The theme %s has been disabled." => "The theme %s has been disabled.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Please make sure that the database, the config folder and the data folder have been backed up before proceeding.",
-"Start update" => "Start update",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:",
-"This %s instance is currently being updated, which may take a while." => "This %s instance is currently being updated, which may take a while.",
-"This page will refresh itself when the %s instance is available again." => "This page will refresh itself when the %s instance is available again."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/en_NZ.js b/core/l10n/en_NZ.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/en_NZ.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_NZ.json b/core/l10n/en_NZ.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/en_NZ.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/en_NZ.php b/core/l10n/en_NZ.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/en_NZ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
new file mode 100644
index 00000000000..736d82c9f30
--- /dev/null
+++ b/core/l10n/eo.js
@@ -0,0 +1,128 @@
+OC.L10N.register(
+    "core",
+    {
+    "Updated database" : "Ĝisdatiĝis datumbazo",
+    "Unknown filetype" : "Ne konatas dosiertipo",
+    "Invalid image" : "Ne validas bildo",
+    "Sunday" : "dimanĉo",
+    "Monday" : "lundo",
+    "Tuesday" : "mardo",
+    "Wednesday" : "merkredo",
+    "Thursday" : "ĵaŭdo",
+    "Friday" : "vendredo",
+    "Saturday" : "sabato",
+    "January" : "Januaro",
+    "February" : "Februaro",
+    "March" : "Marto",
+    "April" : "Aprilo",
+    "May" : "Majo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Aŭgusto",
+    "September" : "Septembro",
+    "October" : "Oktobro",
+    "November" : "Novembro",
+    "December" : "Decembro",
+    "Settings" : "Agordo",
+    "File" : "Dosiero",
+    "Folder" : "Dosierujo",
+    "Image" : "Bildo",
+    "Saving..." : "Konservante...",
+    "Reset password" : "Rekomenci la pasvorton",
+    "No" : "Ne",
+    "Yes" : "Jes",
+    "Choose" : "Elekti",
+    "Ok" : "Akcepti",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} dosierkonflikto","{count} dosierkonfliktoj"],
+    "One file conflict" : "Unu dosierkonflikto",
+    "New Files" : "Novaj dosieroj",
+    "Which files do you want to keep?" : "Kiujn dosierojn vi volas konservi?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo.",
+    "Cancel" : "Nuligi",
+    "(all selected)" : "(ĉiuj elektitas)",
+    "({count} selected)" : "({count} elektitas)",
+    "Very weak password" : "Tre malforta pasvorto",
+    "Weak password" : "Malforta pasvorto",
+    "So-so password" : "Mezaĉa pasvorto",
+    "Good password" : "Bona pasvorto",
+    "Strong password" : "Forta pasvorto",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
+    "Shared" : "Dividita",
+    "Share" : "Kunhavigi",
+    "Error" : "Eraro",
+    "Error while sharing" : "Eraro dum kunhavigo",
+    "Error while unsharing" : "Eraro dum malkunhavigo",
+    "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
+    "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
+    "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
+    "Share with user or group …" : "Kunhavigi kun uzanto aŭ grupo...",
+    "Share link" : "Konhavigi ligilon",
+    "Password protect" : "Protekti per pasvorto",
+    "Email link to person" : "Retpoŝti la ligilon al ulo",
+    "Send" : "Sendi",
+    "Set expiration date" : "Agordi limdaton",
+    "Expiration date" : "Limdato",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Rekunhavigo ne permesatas",
+    "Shared in {item} with {user}" : "Kunhavigita en {item} kun {user}",
+    "Unshare" : "Malkunhavigi",
+    "notify by email" : "avizi per retpoŝto",
+    "can share" : "kunhavebla",
+    "can edit" : "povas redakti",
+    "access control" : "alirkontrolo",
+    "create" : "krei",
+    "update" : "ĝisdatigi",
+    "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",
+    "Warning" : "Averto",
+    "The object type is not specified." : "Ne indikiĝis tipo de la objekto.",
+    "Enter new" : "Enigu novan",
+    "Delete" : "Forigi",
+    "Add" : "Aldoni",
+    "Edit tags" : "Redakti etikedojn",
+    "No tags selected for deletion." : "Neniu etikedo elektitas por forigo.",
+    "Please reload the page." : "Bonvolu reŝargi la paĝon.",
+    "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
+    "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
+    "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
+    "Username" : "Uzantonomo",
+    "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun",
+    "New password" : "Nova pasvorto",
+    "Personal" : "Persona",
+    "Users" : "Uzantoj",
+    "Apps" : "Aplikaĵoj",
+    "Admin" : "Administranto",
+    "Help" : "Helpo",
+    "Error loading tags" : "Eraris ŝargo de etikedoj",
+    "Tag already exists" : "La etikedo jam ekzistas",
+    "Error deleting tag(s)" : "Eraris forigo de etikedo(j)",
+    "Error tagging" : "Eraris etikedado",
+    "Error untagging" : "Eraris maletikedado",
+    "Access forbidden" : "Aliro estas malpermesata",
+    "Security Warning" : "Sekureca averto",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
+    "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
+    "Password" : "Pasvorto",
+    "Data folder" : "Datuma dosierujo",
+    "Configure the database" : "Agordi la datumbazon",
+    "Database user" : "Datumbaza uzanto",
+    "Database password" : "Datumbaza pasvorto",
+    "Database name" : "Datumbaza nomo",
+    "Database tablespace" : "Datumbaza tabelospaco",
+    "Database host" : "Datumbaza gastigo",
+    "Finish setup" : "Fini la instalon",
+    "Finishing …" : "Finante...",
+    "%s is available. Get more information on how to update." : "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
+    "Log out" : "Elsaluti",
+    "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."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
new file mode 100644
index 00000000000..5520e2beb95
--- /dev/null
+++ b/core/l10n/eo.json
@@ -0,0 +1,126 @@
+{ "translations": {
+    "Updated database" : "Ĝisdatiĝis datumbazo",
+    "Unknown filetype" : "Ne konatas dosiertipo",
+    "Invalid image" : "Ne validas bildo",
+    "Sunday" : "dimanĉo",
+    "Monday" : "lundo",
+    "Tuesday" : "mardo",
+    "Wednesday" : "merkredo",
+    "Thursday" : "ĵaŭdo",
+    "Friday" : "vendredo",
+    "Saturday" : "sabato",
+    "January" : "Januaro",
+    "February" : "Februaro",
+    "March" : "Marto",
+    "April" : "Aprilo",
+    "May" : "Majo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Aŭgusto",
+    "September" : "Septembro",
+    "October" : "Oktobro",
+    "November" : "Novembro",
+    "December" : "Decembro",
+    "Settings" : "Agordo",
+    "File" : "Dosiero",
+    "Folder" : "Dosierujo",
+    "Image" : "Bildo",
+    "Saving..." : "Konservante...",
+    "Reset password" : "Rekomenci la pasvorton",
+    "No" : "Ne",
+    "Yes" : "Jes",
+    "Choose" : "Elekti",
+    "Ok" : "Akcepti",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} dosierkonflikto","{count} dosierkonfliktoj"],
+    "One file conflict" : "Unu dosierkonflikto",
+    "New Files" : "Novaj dosieroj",
+    "Which files do you want to keep?" : "Kiujn dosierojn vi volas konservi?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo.",
+    "Cancel" : "Nuligi",
+    "(all selected)" : "(ĉiuj elektitas)",
+    "({count} selected)" : "({count} elektitas)",
+    "Very weak password" : "Tre malforta pasvorto",
+    "Weak password" : "Malforta pasvorto",
+    "So-so password" : "Mezaĉa pasvorto",
+    "Good password" : "Bona pasvorto",
+    "Strong password" : "Forta pasvorto",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
+    "Shared" : "Dividita",
+    "Share" : "Kunhavigi",
+    "Error" : "Eraro",
+    "Error while sharing" : "Eraro dum kunhavigo",
+    "Error while unsharing" : "Eraro dum malkunhavigo",
+    "Error while changing permissions" : "Eraro dum ŝanĝo de permesoj",
+    "Shared with you and the group {group} by {owner}" : "Kunhavigita kun vi kaj la grupo {group} de {owner}",
+    "Shared with you by {owner}" : "Kunhavigita kun vi de {owner}",
+    "Share with user or group …" : "Kunhavigi kun uzanto aŭ grupo...",
+    "Share link" : "Konhavigi ligilon",
+    "Password protect" : "Protekti per pasvorto",
+    "Email link to person" : "Retpoŝti la ligilon al ulo",
+    "Send" : "Sendi",
+    "Set expiration date" : "Agordi limdaton",
+    "Expiration date" : "Limdato",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Rekunhavigo ne permesatas",
+    "Shared in {item} with {user}" : "Kunhavigita en {item} kun {user}",
+    "Unshare" : "Malkunhavigi",
+    "notify by email" : "avizi per retpoŝto",
+    "can share" : "kunhavebla",
+    "can edit" : "povas redakti",
+    "access control" : "alirkontrolo",
+    "create" : "krei",
+    "update" : "ĝisdatigi",
+    "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",
+    "Warning" : "Averto",
+    "The object type is not specified." : "Ne indikiĝis tipo de la objekto.",
+    "Enter new" : "Enigu novan",
+    "Delete" : "Forigi",
+    "Add" : "Aldoni",
+    "Edit tags" : "Redakti etikedojn",
+    "No tags selected for deletion." : "Neniu etikedo elektitas por forigo.",
+    "Please reload the page." : "Bonvolu reŝargi la paĝon.",
+    "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
+    "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
+    "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
+    "Username" : "Uzantonomo",
+    "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun",
+    "New password" : "Nova pasvorto",
+    "Personal" : "Persona",
+    "Users" : "Uzantoj",
+    "Apps" : "Aplikaĵoj",
+    "Admin" : "Administranto",
+    "Help" : "Helpo",
+    "Error loading tags" : "Eraris ŝargo de etikedoj",
+    "Tag already exists" : "La etikedo jam ekzistas",
+    "Error deleting tag(s)" : "Eraris forigo de etikedo(j)",
+    "Error tagging" : "Eraris etikedado",
+    "Error untagging" : "Eraris maletikedado",
+    "Access forbidden" : "Aliro estas malpermesata",
+    "Security Warning" : "Sekureca averto",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
+    "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
+    "Password" : "Pasvorto",
+    "Data folder" : "Datuma dosierujo",
+    "Configure the database" : "Agordi la datumbazon",
+    "Database user" : "Datumbaza uzanto",
+    "Database password" : "Datumbaza pasvorto",
+    "Database name" : "Datumbaza nomo",
+    "Database tablespace" : "Datumbaza tabelospaco",
+    "Database host" : "Datumbaza gastigo",
+    "Finish setup" : "Fini la instalon",
+    "Finishing …" : "Finante...",
+    "%s is available. Get more information on how to update." : "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
+    "Log out" : "Elsaluti",
+    "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);"
+}
\ No newline at end of file
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
deleted file mode 100644
index be5327e8e63..00000000000
--- a/core/l10n/eo.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Updated database" => "Ĝisdatiĝis datumbazo",
-"Unknown filetype" => "Ne konatas dosiertipo",
-"Invalid image" => "Ne validas bildo",
-"Sunday" => "dimanĉo",
-"Monday" => "lundo",
-"Tuesday" => "mardo",
-"Wednesday" => "merkredo",
-"Thursday" => "ĵaŭdo",
-"Friday" => "vendredo",
-"Saturday" => "sabato",
-"January" => "Januaro",
-"February" => "Februaro",
-"March" => "Marto",
-"April" => "Aprilo",
-"May" => "Majo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Aŭgusto",
-"September" => "Septembro",
-"October" => "Oktobro",
-"November" => "Novembro",
-"December" => "Decembro",
-"Settings" => "Agordo",
-"File" => "Dosiero",
-"Folder" => "Dosierujo",
-"Image" => "Bildo",
-"Saving..." => "Konservante...",
-"Reset password" => "Rekomenci la pasvorton",
-"No" => "Ne",
-"Yes" => "Jes",
-"Choose" => "Elekti",
-"Ok" => "Akcepti",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosierkonflikto","{count} dosierkonfliktoj"),
-"One file conflict" => "Unu dosierkonflikto",
-"New Files" => "Novaj dosieroj",
-"Which files do you want to keep?" => "Kiujn dosierojn vi volas konservi?",
-"If you select both versions, the copied file will have a number added to its name." => "Se vi elektos ambaŭ eldonojn, la kopiota dosiero havos numeron aldonitan al sia nomo.",
-"Cancel" => "Nuligi",
-"(all selected)" => "(ĉiuj elektitas)",
-"({count} selected)" => "({count} elektitas)",
-"Very weak password" => "Tre malforta pasvorto",
-"Weak password" => "Malforta pasvorto",
-"So-so password" => "Mezaĉa pasvorto",
-"Good password" => "Bona pasvorto",
-"Strong password" => "Forta pasvorto",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Via TTT-servilo ankoraŭ ne ĝuste agordiĝis por permesi sinkronigi dosierojn ĉar la WebDAV-interfaco ŝajnas rompita.",
-"Shared" => "Dividita",
-"Share" => "Kunhavigi",
-"Error" => "Eraro",
-"Error while sharing" => "Eraro dum kunhavigo",
-"Error while unsharing" => "Eraro dum malkunhavigo",
-"Error while changing permissions" => "Eraro dum ŝanĝo de permesoj",
-"Shared with you and the group {group} by {owner}" => "Kunhavigita kun vi kaj la grupo {group} de {owner}",
-"Shared with you by {owner}" => "Kunhavigita kun vi de {owner}",
-"Share with user or group …" => "Kunhavigi kun uzanto aŭ grupo...",
-"Share link" => "Konhavigi ligilon",
-"Password protect" => "Protekti per pasvorto",
-"Email link to person" => "Retpoŝti la ligilon al ulo",
-"Send" => "Sendi",
-"Set expiration date" => "Agordi limdaton",
-"Expiration date" => "Limdato",
-"group" => "grupo",
-"Resharing is not allowed" => "Rekunhavigo ne permesatas",
-"Shared in {item} with {user}" => "Kunhavigita en {item} kun {user}",
-"Unshare" => "Malkunhavigi",
-"notify by email" => "avizi per retpoŝto",
-"can share" => "kunhavebla",
-"can edit" => "povas redakti",
-"access control" => "alirkontrolo",
-"create" => "krei",
-"update" => "ĝisdatigi",
-"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",
-"Warning" => "Averto",
-"The object type is not specified." => "Ne indikiĝis tipo de la objekto.",
-"Enter new" => "Enigu novan",
-"Delete" => "Forigi",
-"Add" => "Aldoni",
-"Edit tags" => "Redakti etikedojn",
-"No tags selected for deletion." => "Neniu etikedo elektitas por forigo.",
-"Please reload the page." => "Bonvolu reŝargi la paĝon.",
-"The update was successful. Redirecting you to ownCloud now." => "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
-"Use the following link to reset your password: {link}" => "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
-"You will receive a link to reset your password via Email." => "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-"Username" => "Uzantonomo",
-"Yes, I really want to reset my password now" => "Jes, mi vere volas restarigi mian pasvorton nun",
-"New password" => "Nova pasvorto",
-"Personal" => "Persona",
-"Users" => "Uzantoj",
-"Apps" => "Aplikaĵoj",
-"Admin" => "Administranto",
-"Help" => "Helpo",
-"Error loading tags" => "Eraris ŝargo de etikedoj",
-"Tag already exists" => "La etikedo jam ekzistas",
-"Error deleting tag(s)" => "Eraris forigo de etikedo(j)",
-"Error tagging" => "Eraris etikedado",
-"Error untagging" => "Eraris maletikedado",
-"Access forbidden" => "Aliro estas malpermesata",
-"Security Warning" => "Sekureca averto",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
-"Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
-"Password" => "Pasvorto",
-"Data folder" => "Datuma dosierujo",
-"Configure the database" => "Agordi la datumbazon",
-"Database user" => "Datumbaza uzanto",
-"Database password" => "Datumbaza pasvorto",
-"Database name" => "Datumbaza nomo",
-"Database tablespace" => "Datumbaza tabelospaco",
-"Database host" => "Datumbaza gastigo",
-"Finish setup" => "Fini la instalon",
-"Finishing …" => "Finante...",
-"%s is available. Get more information on how to update." => "%s haveblas. Ekhavi pli da informo pri kiel ĝisdatigi.",
-"Log out" => "Elsaluti",
-"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."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es.js b/core/l10n/es.js
new file mode 100644
index 00000000000..683e03cb708
--- /dev/null
+++ b/core/l10n/es.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+    "Turned on maintenance mode" : "Modo mantenimiento activado",
+    "Turned off maintenance mode" : "Modo mantenimiento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "Checked database schema update" : "Actualización del esquema de base de datos revisado",
+    "Checked database schema update for apps" : "Chequeada actualización de esquema de la base de datos para aplicaciones",
+    "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivadas: %s",
+    "No image or file provided" : "No se especificó ningún archivo o imagen",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "No temporary profile picture available, try again" : "No hay disponible una imagen temporal de perfil, pruebe de nuevo",
+    "No crop data provided" : "No se proporcionó datos del recorte",
+    "Sunday" : "Domingo",
+    "Monday" : "Lunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Jueves",
+    "Friday" : "Viernes",
+    "Saturday" : "Sábado",
+    "January" : "Enero",
+    "February" : "Febrero",
+    "March" : "Marzo",
+    "April" : "Abril",
+    "May" : "Mayo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Agosto",
+    "September" : "Septiembre",
+    "October" : "Octubre",
+    "November" : "Noviembre",
+    "December" : "Diciembre",
+    "Settings" : "Ajustes",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Image" : "Imagen",
+    "Audio" : "Audio",
+    "Saving..." : "Guardando...",
+    "Couldn't send reset email. Please contact your administrator." : "La reiniciación de este  correo electrónico no pudo ser enviada. Por favor, contacte a 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." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte 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 has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
+    "I know what I'm doing" : "Yo se lo que estoy haciendo",
+    "Reset password" : "Restablecer contraseña",
+    "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Seleccionar",
+    "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de archivo","{count} conflictos de archivo"],
+    "One file conflict" : "On conflicto de archivo",
+    "New Files" : "Nuevos Archivos",
+    "Already existing files" : "Archivos ya existentes",
+    "Which files do you want to keep?" : "¿Que archivos deseas mantener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(seleccionados todos)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando plantilla de archivo existente",
+    "Very weak password" : "Contraseña muy débil",
+    "Weak password" : "Contraseña débil",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña buena",
+    "Strong password" : "Contraseña muy buena",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+    "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." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+    "Error occurred while checking server setup" : "Ha ocurrido un error la revisar la configuración del servidor",
+    "Shared" : "Compartido",
+    "Shared with {recipients}" : "Compartido con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error al compartir",
+    "Error while unsharing" : "Error al dejar de compartir",
+    "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 user or group …" : "Compartido con el usuario o con el grupo ...",
+    "Share link" : "Enlace compartido",
+    "The public link will expire no later than {days} days after it is created" : "El link publico no expirará antes de {days} desde que fué creado",
+    "Password protect" : "Protección con contraseña",
+    "Choose a password for the public link" : "Elija una contraseña para el enlace publico",
+    "Allow Public Upload" : "Permitir Subida Pública",
+    "Email link to person" : "Enviar enlace por correo electrónico a una persona",
+    "Send" : "Enviar",
+    "Set expiration date" : "Establecer fecha de caducidad",
+    "Expiration date" : "Fecha de caducidad",
+    "Adding user..." : "Añadiendo usuario...",
+    "group" : "grupo",
+    "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",
+    "can share" : "puede compartir",
+    "can edit" : "puede editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "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",
+    "Warning" : "Precaución",
+    "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "Enter new" : "Ingresar nueva",
+    "Delete" : "Eliminar",
+    "Add" : "Agregar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
+    "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
+    "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." : "Falló la actualización",
+    "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 nulo.",
+    "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar la reiniciación de su correo electrónico. 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 la reiniciación del correo electrónico, 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",
+    "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
+    "Username" : "Nombre de usuario",
+    "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?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
+    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
+    "Reset" : "Reiniciar",
+    "New password" : "Nueva contraseña",
+    "New Password" : "Nueva contraseña",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicaciones",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Error cargando etiquetas.",
+    "Tag already exists" : "La etiqueta ya existe",
+    "Error deleting tag(s)" : "Error borrando etiqueta(s)",
+    "Error tagging" : "Error al etiquetar",
+    "Error untagging" : "Error al quitar etiqueta",
+    "Error favoriting" : "Error al marcar como favorito",
+    "Error unfavoriting" : "Error al quitar como favorito",
+    "Access forbidden" : "Acceso denegado",
+    "File not found" : "Archivo no encontrado",
+    "The specified document has not been found on the server." : "El documento indicado no se ha encontrado en el servidor.",
+    "You can click here to return to %s." : "Puede hacer clic aquí para volver a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
+    "Internal Server Error" : "Error interno del servidor",
+    "The server encountered an internal error and was unable to complete your request." : "El servidor ha encontrado un error y no puede completar la solicitud.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor contacte con el administrador del servidor si este error reaparece multiples veces. Por favor incluya los detalles tecnicos que se muestran acontinuación.",
+    "More details can be found in the server log." : "Mas detalles pueden verse en el log del servidor.",
+    "Technical details" : "Detalles tecnicos",
+    "Remote Address: %s" : "Dirección remota: %s",
+    "Request ID: %s" : "ID solicitado: %s",
+    "Code: %s" : "Codigo: %s",
+    "Message: %s" : "Mensaje: %s",
+    "File: %s" : "Archivo: %s",
+    "Line: %s" : "Linea: %s",
+    "Trace" : "Trazas",
+    "Security Warning" : "Advertencia de seguridad",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, actualice su instalación PHP para usar %s con seguridad.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Password" : "Contraseña",
+    "Storage & database" : "Almacenamiento y base de datos",
+    "Data folder" : "Directorio de datos",
+    "Configure the database" : "Configurar la base de datos",
+    "Only %s is available." : "Solo %s está disponible.",
+    "Database user" : "Usuario de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nombre de la base de datos",
+    "Database tablespace" : "Espacio de tablas de la base de datos",
+    "Database host" : "Host de la base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Se usará SQLite como base de datos. Para instalaciones más grandes, es recomendable cambiar esto.",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "La aplicación requiere JavaScript para poder operar correctamente. Sírvase <a href=\"http://enable-javascript.com/\" target=\"_blank\">activar JavaScript</a> y volver a cargar la página.",
+    "%s is available. Get more information on how to update." : "%s está disponible. Obtener más información de como actualizar.",
+    "Log out" : "Salir",
+    "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
+    "Please contact your administrator." : "Por favor, contacte con el administrador.",
+    "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Reiniciala!",
+    "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.",
+    "This means only administrators can use the instance." : "Esto quiere decir que solo un administrador puede usarla.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
+    "Thank you for your patience." : "Gracias por su paciencia.",
+    "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacte a su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.",
+    "Add \"%s\" as trusted domain" : "Agregar \"%s\" como un dominio de confianza",
+    "%s will be updated to version %s." : "%s será actualizado a la versión %s.",
+    "The following apps will be disabled:" : "Las siguientes aplicaciones serán desactivadas:",
+    "The theme %s has been disabled." : "El tema %s ha sido desactivado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.",
+    "Start update" : "Iniciar actualización",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tiempos de espera en grandes instalaciones, en su lugar puede ejecutar el siguiente comando desde el directorio de instalación:",
+    "This %s instance is currently being updated, which may take a while." : "Está instancia %s está siendo actualizada, lo que puede llevar un tiempo.",
+    "This page will refresh itself when the %s instance is available again." : "La página se refrescará por sí misma cuando la instancia %s vuelva a estar disponible."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es.json b/core/l10n/es.json
new file mode 100644
index 00000000000..3eaedab0621
--- /dev/null
+++ b/core/l10n/es.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+    "Turned on maintenance mode" : "Modo mantenimiento activado",
+    "Turned off maintenance mode" : "Modo mantenimiento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "Checked database schema update" : "Actualización del esquema de base de datos revisado",
+    "Checked database schema update for apps" : "Chequeada actualización de esquema de la base de datos para aplicaciones",
+    "Updated \"%s\" to %s" : "Se ha actualizado \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivadas: %s",
+    "No image or file provided" : "No se especificó ningún archivo o imagen",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "No temporary profile picture available, try again" : "No hay disponible una imagen temporal de perfil, pruebe de nuevo",
+    "No crop data provided" : "No se proporcionó datos del recorte",
+    "Sunday" : "Domingo",
+    "Monday" : "Lunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Jueves",
+    "Friday" : "Viernes",
+    "Saturday" : "Sábado",
+    "January" : "Enero",
+    "February" : "Febrero",
+    "March" : "Marzo",
+    "April" : "Abril",
+    "May" : "Mayo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Agosto",
+    "September" : "Septiembre",
+    "October" : "Octubre",
+    "November" : "Noviembre",
+    "December" : "Diciembre",
+    "Settings" : "Ajustes",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Image" : "Imagen",
+    "Audio" : "Audio",
+    "Saving..." : "Guardando...",
+    "Couldn't send reset email. Please contact your administrator." : "La reiniciación de este  correo electrónico no pudo ser enviada. Por favor, contacte a 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." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte 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 has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
+    "I know what I'm doing" : "Yo se lo que estoy haciendo",
+    "Reset password" : "Restablecer contraseña",
+    "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Seleccionar",
+    "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de archivo","{count} conflictos de archivo"],
+    "One file conflict" : "On conflicto de archivo",
+    "New Files" : "Nuevos Archivos",
+    "Already existing files" : "Archivos ya existentes",
+    "Which files do you want to keep?" : "¿Que archivos deseas mantener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(seleccionados todos)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando plantilla de archivo existente",
+    "Very weak password" : "Contraseña muy débil",
+    "Weak password" : "Contraseña débil",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña buena",
+    "Strong password" : "Contraseña muy buena",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+    "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." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+    "Error occurred while checking server setup" : "Ha ocurrido un error la revisar la configuración del servidor",
+    "Shared" : "Compartido",
+    "Shared with {recipients}" : "Compartido con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error al compartir",
+    "Error while unsharing" : "Error al dejar de compartir",
+    "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 user or group …" : "Compartido con el usuario o con el grupo ...",
+    "Share link" : "Enlace compartido",
+    "The public link will expire no later than {days} days after it is created" : "El link publico no expirará antes de {days} desde que fué creado",
+    "Password protect" : "Protección con contraseña",
+    "Choose a password for the public link" : "Elija una contraseña para el enlace publico",
+    "Allow Public Upload" : "Permitir Subida Pública",
+    "Email link to person" : "Enviar enlace por correo electrónico a una persona",
+    "Send" : "Enviar",
+    "Set expiration date" : "Establecer fecha de caducidad",
+    "Expiration date" : "Fecha de caducidad",
+    "Adding user..." : "Añadiendo usuario...",
+    "group" : "grupo",
+    "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",
+    "can share" : "puede compartir",
+    "can edit" : "puede editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "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",
+    "Warning" : "Precaución",
+    "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "Enter new" : "Ingresar nueva",
+    "Delete" : "Eliminar",
+    "Add" : "Agregar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
+    "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
+    "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." : "Falló la actualización",
+    "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 nulo.",
+    "Couldn't send reset email. Please make sure your username is correct." : "No se pudo enviar la reiniciación de su correo electrónico. 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 la reiniciación del correo electrónico, 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",
+    "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
+    "Username" : "Nombre de usuario",
+    "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?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
+    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
+    "Reset" : "Reiniciar",
+    "New password" : "Nueva contraseña",
+    "New Password" : "Nueva contraseña",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicaciones",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Error cargando etiquetas.",
+    "Tag already exists" : "La etiqueta ya existe",
+    "Error deleting tag(s)" : "Error borrando etiqueta(s)",
+    "Error tagging" : "Error al etiquetar",
+    "Error untagging" : "Error al quitar etiqueta",
+    "Error favoriting" : "Error al marcar como favorito",
+    "Error unfavoriting" : "Error al quitar como favorito",
+    "Access forbidden" : "Acceso denegado",
+    "File not found" : "Archivo no encontrado",
+    "The specified document has not been found on the server." : "El documento indicado no se ha encontrado en el servidor.",
+    "You can click here to return to %s." : "Puede hacer clic aquí para volver a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
+    "Internal Server Error" : "Error interno del servidor",
+    "The server encountered an internal error and was unable to complete your request." : "El servidor ha encontrado un error y no puede completar la solicitud.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor contacte con el administrador del servidor si este error reaparece multiples veces. Por favor incluya los detalles tecnicos que se muestran acontinuación.",
+    "More details can be found in the server log." : "Mas detalles pueden verse en el log del servidor.",
+    "Technical details" : "Detalles tecnicos",
+    "Remote Address: %s" : "Dirección remota: %s",
+    "Request ID: %s" : "ID solicitado: %s",
+    "Code: %s" : "Codigo: %s",
+    "Message: %s" : "Mensaje: %s",
+    "File: %s" : "Archivo: %s",
+    "Line: %s" : "Linea: %s",
+    "Trace" : "Trazas",
+    "Security Warning" : "Advertencia de seguridad",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, actualice su instalación PHP para usar %s con seguridad.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Password" : "Contraseña",
+    "Storage & database" : "Almacenamiento y base de datos",
+    "Data folder" : "Directorio de datos",
+    "Configure the database" : "Configurar la base de datos",
+    "Only %s is available." : "Solo %s está disponible.",
+    "Database user" : "Usuario de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nombre de la base de datos",
+    "Database tablespace" : "Espacio de tablas de la base de datos",
+    "Database host" : "Host de la base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Se usará SQLite como base de datos. Para instalaciones más grandes, es recomendable cambiar esto.",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "La aplicación requiere JavaScript para poder operar correctamente. Sírvase <a href=\"http://enable-javascript.com/\" target=\"_blank\">activar JavaScript</a> y volver a cargar la página.",
+    "%s is available. Get more information on how to update." : "%s está disponible. Obtener más información de como actualizar.",
+    "Log out" : "Salir",
+    "Server side authentication failed!" : "La autenticación a fallado en el servidor.",
+    "Please contact your administrator." : "Por favor, contacte con el administrador.",
+    "Forgot your password? Reset it!" : "¿Olvidó su contraseña? ¡Reiniciala!",
+    "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.",
+    "This means only administrators can use the instance." : "Esto quiere decir que solo un administrador puede usarla.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
+    "Thank you for your patience." : "Gracias por su paciencia.",
+    "You are accessing the server from an untrusted domain." : "Está accediendo al servidor desde un dominio inseguro.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contacte a su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.",
+    "Add \"%s\" as trusted domain" : "Agregar \"%s\" como un dominio de confianza",
+    "%s will be updated to version %s." : "%s será actualizado a la versión %s.",
+    "The following apps will be disabled:" : "Las siguientes aplicaciones serán desactivadas:",
+    "The theme %s has been disabled." : "El tema %s ha sido desactivado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.",
+    "Start update" : "Iniciar actualización",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tiempos de espera en grandes instalaciones, en su lugar puede ejecutar el siguiente comando desde el directorio de instalación:",
+    "This %s instance is currently being updated, which may take a while." : "Está instancia %s está siendo actualizada, lo que puede llevar un tiempo.",
+    "This page will refresh itself when the %s instance is available again." : "La página se refrescará por sí misma cuando la instancia %s vuelva a estar disponible."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es.php b/core/l10n/es.php
deleted file mode 100644
index c7ca3c1580d..00000000000
--- a/core/l10n/es.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "No se pudo enviar el mensaje a los siguientes usuarios: %s",
-"Turned on maintenance mode" => "Modo mantenimiento activado",
-"Turned off maintenance mode" => "Modo mantenimiento desactivado",
-"Updated database" => "Base de datos actualizada",
-"Checked database schema update" => "Actualización del esquema de base de datos revisado",
-"Checked database schema update for apps" => "Chequeada actualización de esquema de la base de datos para aplicaciones",
-"Updated \"%s\" to %s" => "Se ha actualizado \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Aplicaciones incompatibles desactivadas: %s",
-"No image or file provided" => "No se especificó ningún archivo o imagen",
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen inválida",
-"No temporary profile picture available, try again" => "No hay disponible una imagen temporal de perfil, pruebe de nuevo",
-"No crop data provided" => "No se proporcionó datos del recorte",
-"Sunday" => "Domingo",
-"Monday" => "Lunes",
-"Tuesday" => "Martes",
-"Wednesday" => "Miércoles",
-"Thursday" => "Jueves",
-"Friday" => "Viernes",
-"Saturday" => "Sábado",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
-"Settings" => "Ajustes",
-"File" => "Archivo",
-"Folder" => "Carpeta",
-"Image" => "Imagen",
-"Audio" => "Audio",
-"Saving..." => "Guardando...",
-"Couldn't send reset email. Please contact your administrator." => "La reiniciación de este  correo electrónico no pudo ser enviada. Por favor, contacte a 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." => "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte 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 has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
-"I know what I'm doing" => "Yo se lo que estoy haciendo",
-"Reset password" => "Restablecer contraseña",
-"Password can not be changed. Please contact your administrator." => "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
-"No" => "No",
-"Yes" => "Sí",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
-"Ok" => "Aceptar",
-"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
-"One file conflict" => "On conflicto de archivo",
-"New Files" => "Nuevos Archivos",
-"Already existing files" => "Archivos ya existentes",
-"Which files do you want to keep?" => "¿Que archivos deseas mantener?",
-"If you select both versions, the copied file will have a number added to its name." => "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(seleccionados todos)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Error cargando plantilla de archivo existente",
-"Very weak password" => "Contraseña muy débil",
-"Weak password" => "Contraseña débil",
-"So-so password" => "Contraseña pasable",
-"Good password" => "Contraseña buena",
-"Strong password" => "Contraseña muy buena",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
-"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." => "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
-"Error occurred while checking server setup" => "Ha ocurrido un error la revisar la configuración del servidor",
-"Shared" => "Compartido",
-"Shared with {recipients}" => "Compartido con {recipients}",
-"Share" => "Compartir",
-"Error" => "Error",
-"Error while sharing" => "Error al compartir",
-"Error while unsharing" => "Error al dejar de compartir",
-"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 user or group …" => "Compartido con el usuario o con el grupo ...",
-"Share link" => "Enlace compartido",
-"The public link will expire no later than {days} days after it is created" => "El link publico no expirará antes de {days} desde que fué creado",
-"Password protect" => "Protección con contraseña",
-"Choose a password for the public link" => "Elija una contraseña para el enlace publico",
-"Allow Public Upload" => "Permitir Subida Pública",
-"Email link to person" => "Enviar enlace por correo electrónico a una persona",
-"Send" => "Enviar",
-"Set expiration date" => "Establecer fecha de caducidad",
-"Expiration date" => "Fecha de caducidad",
-"Adding user..." => "Añadiendo usuario...",
-"group" => "grupo",
-"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",
-"can share" => "puede compartir",
-"can edit" => "puede editar",
-"access control" => "control de acceso",
-"create" => "crear",
-"update" => "actualizar",
-"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",
-"Warning" => "Precaución",
-"The object type is not specified." => "El tipo de objeto no está especificado.",
-"Enter new" => "Ingresar nueva",
-"Delete" => "Eliminar",
-"Add" => "Agregar",
-"Edit tags" => "Editar etiquetas",
-"Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
-"No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
-"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." => "Falló la actualización",
-"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 nulo.",
-"Couldn't send reset email. Please make sure your username is correct." => "No se pudo enviar la reiniciación de su correo electrónico. 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 la reiniciación del correo electrónico, 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",
-"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-"You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-"Username" => "Nombre de usuario",
-"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?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-"Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora",
-"Reset" => "Reiniciar",
-"New password" => "Nueva contraseña",
-"New Password" => "Nueva contraseña",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
-"For the best results, please consider using a GNU/Linux server instead." => "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
-"Personal" => "Personal",
-"Users" => "Usuarios",
-"Apps" => "Aplicaciones",
-"Admin" => "Administración",
-"Help" => "Ayuda",
-"Error loading tags" => "Error cargando etiquetas.",
-"Tag already exists" => "La etiqueta ya existe",
-"Error deleting tag(s)" => "Error borrando etiqueta(s)",
-"Error tagging" => "Error al etiquetar",
-"Error untagging" => "Error al quitar etiqueta",
-"Error favoriting" => "Error al marcar como favorito",
-"Error unfavoriting" => "Error al quitar como favorito",
-"Access forbidden" => "Acceso denegado",
-"File not found" => "Archivo no encontrado",
-"The specified document has not been found on the server." => "El documento indicado no se ha encontrado en el servidor.",
-"You can click here to return to %s." => "Puede hacer clic aquí para volver a %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
-"The share will expire on %s." => "El objeto dejará de ser compartido el %s.",
-"Cheers!" => "¡Saludos!",
-"Internal Server Error" => "Error interno del servidor",
-"The server encountered an internal error and was unable to complete your request." => "El servidor ha encontrado un error y no puede completar la solicitud.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Por favor contacte con el administrador del servidor si este error reaparece multiples veces. Por favor incluya los detalles tecnicos que se muestran acontinuación.",
-"More details can be found in the server log." => "Mas detalles pueden verse en el log del servidor.",
-"Technical details" => "Detalles tecnicos",
-"Remote Address: %s" => "Dirección remota: %s",
-"Request ID: %s" => "ID solicitado: %s",
-"Code: %s" => "Codigo: %s",
-"Message: %s" => "Mensaje: %s",
-"File: %s" => "Archivo: %s",
-"Line: %s" => "Linea: %s",
-"Trace" => "Trazas",
-"Security Warning" => "Advertencia de seguridad",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor, actualice su instalación PHP para usar %s con seguridad.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
-"Password" => "Contraseña",
-"Storage & database" => "Almacenamiento y base de datos",
-"Data folder" => "Directorio de datos",
-"Configure the database" => "Configurar la base de datos",
-"Only %s is available." => "Solo %s está disponible.",
-"Database user" => "Usuario de la base de datos",
-"Database password" => "Contraseña de la base de datos",
-"Database name" => "Nombre de la base de datos",
-"Database tablespace" => "Espacio de tablas de la base de datos",
-"Database host" => "Host de la base de datos",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Se usará SQLite como base de datos. Para instalaciones más grandes, es recomendable cambiar esto.",
-"Finish setup" => "Completar la instalación",
-"Finishing …" => "Finalizando...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "La aplicación requiere JavaScript para poder operar correctamente. Sírvase <a href=\"http://enable-javascript.com/\" target=\"_blank\">activar JavaScript</a> y volver a cargar la página.",
-"%s is available. Get more information on how to update." => "%s está disponible. Obtener más información de como actualizar.",
-"Log out" => "Salir",
-"Server side authentication failed!" => "La autenticación a fallado en el servidor.",
-"Please contact your administrator." => "Por favor, contacte con el administrador.",
-"Forgot your password? Reset it!" => "¿Olvidó su contraseña? ¡Reiniciala!",
-"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.",
-"This means only administrators can use the instance." => "Esto quiere decir que solo un administrador puede usarla.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
-"Thank you for your patience." => "Gracias por su paciencia.",
-"You are accessing the server from an untrusted domain." => "Está accediendo al servidor desde un dominio inseguro.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contacte a su administrador. Si usted es el administrador, configure \"trusted_domain\" en config/config.php. En config/config.sample.php se encuentra un ejemplo para la configuración.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Dependiendo de su configuración, como administrador, debería poder usar el botón de abajo para confiar en este dominio.",
-"Add \"%s\" as trusted domain" => "Agregar \"%s\" como un dominio de confianza",
-"%s will be updated to version %s." => "%s será actualizado a la versión %s.",
-"The following apps will be disabled:" => "Las siguientes aplicaciones serán desactivadas:",
-"The theme %s has been disabled." => "El tema %s ha sido desactivado.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Antes de proceder, asegúrese de que se haya hecho un respaldo de la base de datos, la carpeta de configuración y la carpeta de datos.",
-"Start update" => "Iniciar actualización",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Para evitar tiempos de espera en grandes instalaciones, en su lugar puede ejecutar el siguiente comando desde el directorio de instalación:",
-"This %s instance is currently being updated, which may take a while." => "Está instancia %s está siendo actualizada, lo que puede llevar un tiempo.",
-"This page will refresh itself when the %s instance is available again." => "La página se refrescará por sí misma cuando la instancia %s vuelva a estar disponible."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
new file mode 100644
index 00000000000..f9b54cc8d81
--- /dev/null
+++ b/core/l10n/es_AR.js
@@ -0,0 +1,155 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "No se pudieron mandar correos a los siguientes usuarios: %s",
+    "Turned on maintenance mode" : "Modo de mantenimiento activado",
+    "Turned off maintenance mode" : "Modo de mantenimiento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "No image or file provided" : "No se ha proveído de una imágen o archivo.",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "No temporary profile picture available, try again" : "No hay una imágen temporal del perfil disponible, intente de nuevo",
+    "No crop data provided" : "No se proveyeron datos de recorte",
+    "Sunday" : "Domingo",
+    "Monday" : "Lunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Jueves",
+    "Friday" : "Viernes",
+    "Saturday" : "Sábado",
+    "January" : "enero",
+    "February" : "febrero",
+    "March" : "marzo",
+    "April" : "abril",
+    "May" : "mayo",
+    "June" : "junio",
+    "July" : "julio",
+    "August" : "agosto",
+    "September" : "septiembre",
+    "October" : "octubre",
+    "November" : "noviembre",
+    "December" : "diciembre",
+    "Settings" : "Configuración",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Image" : "Imagen",
+    "Saving..." : "Guardando...",
+    "Reset password" : "Restablecer contraseña",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Elegir",
+    "Error loading file picker template: {error}" : "Error cargando la plantilla del selector de archivo: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando la plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["un archivo en conflicto","{count} archivos en conflicto"],
+    "One file conflict" : "Un archivo en conflicto",
+    "New Files" : "Nuevos archivos",
+    "Which files do you want to keep?" : "¿Qué archivos deseas retener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos están seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando la plantilla de archivo existente",
+    "Very weak password" : "Contraseña muy débil.",
+    "Weak password" : "Contraseña débil.",
+    "So-so password" : "Contraseña de nivel medio. ",
+    "Good password" : "Buena contraseña. ",
+    "Strong password" : "Contraseña fuerte.",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+    "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." : "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error al compartir",
+    "Error while unsharing" : "Error en al dejar de compartir",
+    "Error while changing permissions" : "Error al cambiar permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vos por {owner}",
+    "Share with user or group …" : "Compartir con usuario o grupo ...",
+    "Share link" : "Compartir vínculo",
+    "Password protect" : "Proteger con contraseña ",
+    "Allow Public Upload" : "Permitir Subida Pública",
+    "Email link to person" : "Enviar el enlace por e-mail.",
+    "Send" : "Mandar",
+    "Set expiration date" : "Asignar fecha de vencimiento",
+    "Expiration date" : "Fecha de vencimiento",
+    "group" : "grupo",
+    "Resharing is not allowed" : "No se permite volver a compartir",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
+    "Unshare" : "Dejar de compartir",
+    "notify by email" : "notificar por correo",
+    "can share" : "puede compartir",
+    "can edit" : "podés editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "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",
+    "Warning" : "Atención",
+    "The object type is not specified." : "El tipo de objeto no está especificado. ",
+    "Enter new" : "Entrar nuevo",
+    "Delete" : "Borrar",
+    "Add" : "Agregar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Error cargando la plantilla de dialogo: {error}",
+    "No tags selected for deletion." : "No se han seleccionado etiquetas para eliminar.",
+    "Please reload the page." : "Por favor, recargue la página.",
+    "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
+    "Username" : "Nombre de usuario",
+    "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?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
+    "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora",
+    "Reset" : "Resetear",
+    "New password" : "Nueva contraseña:",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Apps",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Error cargando las etiquetas",
+    "Tag already exists" : "La etiqueta ya existe",
+    "Error deleting tag(s)" : "Error borrando etiquetas(s)",
+    "Error tagging" : "Error al etiquetar",
+    "Error untagging" : "Error al sacar la etiqueta",
+    "Error favoriting" : "Error al favorecer",
+    "Error unfavoriting" : "Error al desfavorecer",
+    "Access forbidden" : "Acceso prohibido",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
+    "The share will expire on %s." : "El compartir expirará en %s.",
+    "Cheers!" : "¡Saludos!",
+    "Security Warning" : "Advertencia de seguridad",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Password" : "Contraseña",
+    "Data folder" : "Directorio de almacenamiento",
+    "Configure the database" : "Configurar la base de datos",
+    "Database user" : "Usuario de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nombre de la base de datos",
+    "Database tablespace" : "Espacio de tablas de la base de datos",
+    "Database host" : "Huésped de la base de datos",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando...",
+    "%s is available. Get more information on how to update." : "%s está disponible. Obtené más información sobre cómo actualizar.",
+    "Log out" : "Cerrar la sesión",
+    "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.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
+    "Thank you for your patience." : "Gracias por su paciencia."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
new file mode 100644
index 00000000000..621626a366b
--- /dev/null
+++ b/core/l10n/es_AR.json
@@ -0,0 +1,153 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "No se pudieron mandar correos a los siguientes usuarios: %s",
+    "Turned on maintenance mode" : "Modo de mantenimiento activado",
+    "Turned off maintenance mode" : "Modo de mantenimiento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "No image or file provided" : "No se ha proveído de una imágen o archivo.",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "No temporary profile picture available, try again" : "No hay una imágen temporal del perfil disponible, intente de nuevo",
+    "No crop data provided" : "No se proveyeron datos de recorte",
+    "Sunday" : "Domingo",
+    "Monday" : "Lunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Jueves",
+    "Friday" : "Viernes",
+    "Saturday" : "Sábado",
+    "January" : "enero",
+    "February" : "febrero",
+    "March" : "marzo",
+    "April" : "abril",
+    "May" : "mayo",
+    "June" : "junio",
+    "July" : "julio",
+    "August" : "agosto",
+    "September" : "septiembre",
+    "October" : "octubre",
+    "November" : "noviembre",
+    "December" : "diciembre",
+    "Settings" : "Configuración",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Image" : "Imagen",
+    "Saving..." : "Guardando...",
+    "Reset password" : "Restablecer contraseña",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Elegir",
+    "Error loading file picker template: {error}" : "Error cargando la plantilla del selector de archivo: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando la plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["un archivo en conflicto","{count} archivos en conflicto"],
+    "One file conflict" : "Un archivo en conflicto",
+    "New Files" : "Nuevos archivos",
+    "Which files do you want to keep?" : "¿Qué archivos deseas retener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos están seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando la plantilla de archivo existente",
+    "Very weak password" : "Contraseña muy débil.",
+    "Weak password" : "Contraseña débil.",
+    "So-so password" : "Contraseña de nivel medio. ",
+    "Good password" : "Buena contraseña. ",
+    "Strong password" : "Contraseña fuerte.",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
+    "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." : "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error al compartir",
+    "Error while unsharing" : "Error en al dejar de compartir",
+    "Error while changing permissions" : "Error al cambiar permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartido con vos y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido con vos por {owner}",
+    "Share with user or group …" : "Compartir con usuario o grupo ...",
+    "Share link" : "Compartir vínculo",
+    "Password protect" : "Proteger con contraseña ",
+    "Allow Public Upload" : "Permitir Subida Pública",
+    "Email link to person" : "Enviar el enlace por e-mail.",
+    "Send" : "Mandar",
+    "Set expiration date" : "Asignar fecha de vencimiento",
+    "Expiration date" : "Fecha de vencimiento",
+    "group" : "grupo",
+    "Resharing is not allowed" : "No se permite volver a compartir",
+    "Shared in {item} with {user}" : "Compartido en {item} con {user}",
+    "Unshare" : "Dejar de compartir",
+    "notify by email" : "notificar por correo",
+    "can share" : "puede compartir",
+    "can edit" : "podés editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "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",
+    "Warning" : "Atención",
+    "The object type is not specified." : "El tipo de objeto no está especificado. ",
+    "Enter new" : "Entrar nuevo",
+    "Delete" : "Borrar",
+    "Add" : "Agregar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Error cargando la plantilla de dialogo: {error}",
+    "No tags selected for deletion." : "No se han seleccionado etiquetas para eliminar.",
+    "Please reload the page." : "Por favor, recargue la página.",
+    "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
+    "Username" : "Nombre de usuario",
+    "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?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
+    "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora",
+    "Reset" : "Resetear",
+    "New password" : "Nueva contraseña:",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Apps",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Error cargando las etiquetas",
+    "Tag already exists" : "La etiqueta ya existe",
+    "Error deleting tag(s)" : "Error borrando etiquetas(s)",
+    "Error tagging" : "Error al etiquetar",
+    "Error untagging" : "Error al sacar la etiqueta",
+    "Error favoriting" : "Error al favorecer",
+    "Error unfavoriting" : "Error al desfavorecer",
+    "Access forbidden" : "Acceso prohibido",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
+    "The share will expire on %s." : "El compartir expirará en %s.",
+    "Cheers!" : "¡Saludos!",
+    "Security Warning" : "Advertencia de seguridad",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Password" : "Contraseña",
+    "Data folder" : "Directorio de almacenamiento",
+    "Configure the database" : "Configurar la base de datos",
+    "Database user" : "Usuario de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nombre de la base de datos",
+    "Database tablespace" : "Espacio de tablas de la base de datos",
+    "Database host" : "Huésped de la base de datos",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando...",
+    "%s is available. Get more information on how to update." : "%s está disponible. Obtené más información sobre cómo actualizar.",
+    "Log out" : "Cerrar la sesión",
+    "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.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
+    "Thank you for your patience." : "Gracias por su paciencia."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
deleted file mode 100644
index 89d7b721ce0..00000000000
--- a/core/l10n/es_AR.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "No se pudieron mandar correos a los siguientes usuarios: %s",
-"Turned on maintenance mode" => "Modo de mantenimiento activado",
-"Turned off maintenance mode" => "Modo de mantenimiento desactivado",
-"Updated database" => "Base de datos actualizada",
-"No image or file provided" => "No se ha proveído de una imágen o archivo.",
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen inválida",
-"No temporary profile picture available, try again" => "No hay una imágen temporal del perfil disponible, intente de nuevo",
-"No crop data provided" => "No se proveyeron datos de recorte",
-"Sunday" => "Domingo",
-"Monday" => "Lunes",
-"Tuesday" => "Martes",
-"Wednesday" => "Miércoles",
-"Thursday" => "Jueves",
-"Friday" => "Viernes",
-"Saturday" => "Sábado",
-"January" => "enero",
-"February" => "febrero",
-"March" => "marzo",
-"April" => "abril",
-"May" => "mayo",
-"June" => "junio",
-"July" => "julio",
-"August" => "agosto",
-"September" => "septiembre",
-"October" => "octubre",
-"November" => "noviembre",
-"December" => "diciembre",
-"Settings" => "Configuración",
-"File" => "Archivo",
-"Folder" => "Carpeta",
-"Image" => "Imagen",
-"Saving..." => "Guardando...",
-"Reset password" => "Restablecer contraseña",
-"No" => "No",
-"Yes" => "Sí",
-"Choose" => "Elegir",
-"Error loading file picker template: {error}" => "Error cargando la plantilla del selector de archivo: {error}",
-"Ok" => "Aceptar",
-"Error loading message template: {error}" => "Error cargando la plantilla del mensaje: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("un archivo en conflicto","{count} archivos en conflicto"),
-"One file conflict" => "Un archivo en conflicto",
-"New Files" => "Nuevos archivos",
-"Which files do you want to keep?" => "¿Qué archivos deseas retener?",
-"If you select both versions, the copied file will have a number added to its name." => "Si tu seleccionas ambas versiones, el archivo copiado tendrá un número agregado a su nombre.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todos están seleccionados)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Error cargando la plantilla de archivo existente",
-"Very weak password" => "Contraseña muy débil.",
-"Weak password" => "Contraseña débil.",
-"So-so password" => "Contraseña de nivel medio. ",
-"Good password" => "Buena contraseña. ",
-"Strong password" => "Contraseña fuerte.",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tu servidor web no está configurado todavía para permitir sincronización de archivos porque la interfaz WebDAV parece no funcionar.",
-"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." => "El servidor no posee una conexión a Internet activa. Esto significa que algunas características como el montaje de un almacenamiento externo, las notificaciones acerca de actualizaciones o la instalación de aplicaciones de terceros no funcionarán. El acceso a archivos de forma remota y el envío de correos con notificaciones es posible que tampoco funcionen. Sugerimos habilitar la conexión a Internet para este servidor si deseas tener todas estas características.",
-"Shared" => "Compartido",
-"Share" => "Compartir",
-"Error" => "Error",
-"Error while sharing" => "Error al compartir",
-"Error while unsharing" => "Error en al dejar de compartir",
-"Error while changing permissions" => "Error al cambiar permisos",
-"Shared with you and the group {group} by {owner}" => "Compartido con vos y el grupo {group} por {owner}",
-"Shared with you by {owner}" => "Compartido con vos por {owner}",
-"Share with user or group …" => "Compartir con usuario o grupo ...",
-"Share link" => "Compartir vínculo",
-"Password protect" => "Proteger con contraseña ",
-"Allow Public Upload" => "Permitir Subida Pública",
-"Email link to person" => "Enviar el enlace por e-mail.",
-"Send" => "Mandar",
-"Set expiration date" => "Asignar fecha de vencimiento",
-"Expiration date" => "Fecha de vencimiento",
-"group" => "grupo",
-"Resharing is not allowed" => "No se permite volver a compartir",
-"Shared in {item} with {user}" => "Compartido en {item} con {user}",
-"Unshare" => "Dejar de compartir",
-"notify by email" => "notificar por correo",
-"can share" => "puede compartir",
-"can edit" => "podés editar",
-"access control" => "control de acceso",
-"create" => "crear",
-"update" => "actualizar",
-"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",
-"Warning" => "Atención",
-"The object type is not specified." => "El tipo de objeto no está especificado. ",
-"Enter new" => "Entrar nuevo",
-"Delete" => "Borrar",
-"Add" => "Agregar",
-"Edit tags" => "Editar etiquetas",
-"Error loading dialog template: {error}" => "Error cargando la plantilla de dialogo: {error}",
-"No tags selected for deletion." => "No se han seleccionado etiquetas para eliminar.",
-"Please reload the page." => "Por favor, recargue la página.",
-"The update was successful. Redirecting you to ownCloud now." => "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
-"%s password reset" => "%s restablecer contraseña",
-"Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
-"You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
-"Username" => "Nombre de usuario",
-"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?" => "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
-"Yes, I really want to reset my password now" => "Sí, definitivamente quiero restablecer mi contraseña ahora",
-"Reset" => "Resetear",
-"New password" => "Nueva contraseña:",
-"Personal" => "Personal",
-"Users" => "Usuarios",
-"Apps" => "Apps",
-"Admin" => "Administración",
-"Help" => "Ayuda",
-"Error loading tags" => "Error cargando las etiquetas",
-"Tag already exists" => "La etiqueta ya existe",
-"Error deleting tag(s)" => "Error borrando etiquetas(s)",
-"Error tagging" => "Error al etiquetar",
-"Error untagging" => "Error al sacar la etiqueta",
-"Error favoriting" => "Error al favorecer",
-"Error unfavoriting" => "Error al desfavorecer",
-"Access forbidden" => "Acceso prohibido",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "¡Hola!\n\nsólo te quería decir que %s acaba de compartir %s contigo.\nVerlo: %s\n\n",
-"The share will expire on %s." => "El compartir expirará en %s.",
-"Cheers!" => "¡Saludos!",
-"Security Warning" => "Advertencia de seguridad",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La versión de PHP que tenés, es vulnerable al ataque de byte NULL (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor, actualizá tu instalación PHP para poder usar %s de manera segura.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
-"Password" => "Contraseña",
-"Data folder" => "Directorio de almacenamiento",
-"Configure the database" => "Configurar la base de datos",
-"Database user" => "Usuario de la base de datos",
-"Database password" => "Contraseña de la base de datos",
-"Database name" => "Nombre de la base de datos",
-"Database tablespace" => "Espacio de tablas de la base de datos",
-"Database host" => "Huésped de la base de datos",
-"Finish setup" => "Completar la instalación",
-"Finishing …" => "Finalizando...",
-"%s is available. Get more information on how to update." => "%s está disponible. Obtené más información sobre cómo actualizar.",
-"Log out" => "Cerrar la sesión",
-"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.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte su administrador de sistema si este mensaje persiste o aparece inesperadamente.",
-"Thank you for your patience." => "Gracias por su paciencia."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_BO.js b/core/l10n/es_BO.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_BO.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_BO.json b/core/l10n/es_BO.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_BO.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_BO.php b/core/l10n/es_BO.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_BO.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
new file mode 100644
index 00000000000..64a8ed0c706
--- /dev/null
+++ b/core/l10n/es_CL.js
@@ -0,0 +1,48 @@
+OC.L10N.register(
+    "core",
+    {
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen no válida",
+    "Sunday" : "Domingo",
+    "Monday" : "Lunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Jueves",
+    "Friday" : "Viernes",
+    "Saturday" : "Sábado",
+    "January" : "Enero",
+    "February" : "Febrero",
+    "March" : "Marzo",
+    "April" : "Abril",
+    "May" : "Mayo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Agosto",
+    "September" : "Septiembre",
+    "October" : "Octubre",
+    "November" : "Noviembre",
+    "December" : "Diciembre",
+    "Settings" : "Configuración",
+    "No" : "No",
+    "Yes" : "Si",
+    "Choose" : "Choose",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Cancelar",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Ocurrió un error mientras compartía",
+    "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
+    "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
+    "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "Username" : "Usuario",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Password" : "Clave",
+    "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
new file mode 100644
index 00000000000..22bab061129
--- /dev/null
+++ b/core/l10n/es_CL.json
@@ -0,0 +1,46 @@
+{ "translations": {
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen no válida",
+    "Sunday" : "Domingo",
+    "Monday" : "Lunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Jueves",
+    "Friday" : "Viernes",
+    "Saturday" : "Sábado",
+    "January" : "Enero",
+    "February" : "Febrero",
+    "March" : "Marzo",
+    "April" : "Abril",
+    "May" : "Mayo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Agosto",
+    "September" : "Septiembre",
+    "October" : "Octubre",
+    "November" : "Noviembre",
+    "December" : "Diciembre",
+    "Settings" : "Configuración",
+    "No" : "No",
+    "Yes" : "Si",
+    "Choose" : "Choose",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Cancelar",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Ocurrió un error mientras compartía",
+    "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
+    "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
+    "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "Username" : "Usuario",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Password" : "Clave",
+    "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_CL.php b/core/l10n/es_CL.php
deleted file mode 100644
index 68d82086933..00000000000
--- a/core/l10n/es_CL.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen no válida",
-"Sunday" => "Domingo",
-"Monday" => "Lunes",
-"Tuesday" => "Martes",
-"Wednesday" => "Miércoles",
-"Thursday" => "Jueves",
-"Friday" => "Viernes",
-"Saturday" => "Sábado",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
-"Settings" => "Configuración",
-"No" => "No",
-"Yes" => "Si",
-"Choose" => "Choose",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Cancelar",
-"Shared" => "Compartido",
-"Share" => "Compartir",
-"Error" => "Error",
-"Error while sharing" => "Ocurrió un error mientras compartía",
-"Error while unsharing" => "Ocurrió un error mientras dejaba de compartir",
-"Error while changing permissions" => "Ocurrió un error mientras se cambiaban los permisos",
-"The object type is not specified." => "El tipo de objeto no está especificado.",
-"Username" => "Usuario",
-"Personal" => "Personal",
-"Users" => "Usuarios",
-"Admin" => "Administración",
-"Help" => "Ayuda",
-"Password" => "Clave",
-"You are accessing the server from an untrusted domain." => "Usted está accediendo al servidor desde un dominio no confiable.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CO.js b/core/l10n/es_CO.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_CO.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CO.json b/core/l10n/es_CO.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_CO.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_CO.php b/core/l10n/es_CO.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_CO.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_CR.js b/core/l10n/es_CR.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_CR.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CR.json b/core/l10n/es_CR.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_CR.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_CR.php b/core/l10n/es_CR.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_CR.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_EC.js b/core/l10n/es_EC.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_EC.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_EC.json b/core/l10n/es_EC.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_EC.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_EC.php b/core/l10n/es_EC.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_EC.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
new file mode 100644
index 00000000000..0134945fa45
--- /dev/null
+++ b/core/l10n/es_MX.js
@@ -0,0 +1,148 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+    "Turned on maintenance mode" : "Modo mantenimiento activado",
+    "Turned off maintenance mode" : "Modo mantenimiento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "No image or file provided" : "No se especificó ningún archivo o imagen",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "No temporary profile picture available, try again" : "No hay disponible una imagen temporal de perfil, pruebe de nuevo",
+    "No crop data provided" : "No se proporcionó datos del recorte",
+    "Sunday" : "Domingo",
+    "Monday" : "Lunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Jueves",
+    "Friday" : "Viernes",
+    "Saturday" : "Sábado",
+    "January" : "Enero",
+    "February" : "Febrero",
+    "March" : "Marzo",
+    "April" : "Abril",
+    "May" : "Mayo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Agosto",
+    "September" : "Septiembre",
+    "October" : "Octubre",
+    "November" : "Noviembre",
+    "December" : "Diciembre",
+    "Settings" : "Ajustes",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Saving..." : "Guardando...",
+    "Reset password" : "Restablecer contraseña",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Seleccionar",
+    "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de archivo","{count} conflictos de archivo"],
+    "One file conflict" : "Un conflicto de archivo",
+    "Which files do you want to keep?" : "¿Que archivos deseas mantener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando plantilla de archivo existente",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+    "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." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error al compartir",
+    "Error while unsharing" : "Error al dejar de compartir",
+    "Error while changing permissions" : "Error al cambiar permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido contigo por {owner}",
+    "Share with user or group …" : "Compartido con el usuario o con el grupo …",
+    "Share link" : "Enlace compartido",
+    "Password protect" : "Protección con contraseña",
+    "Allow Public Upload" : "Permitir Subida Pública",
+    "Email link to person" : "Enviar enlace por correo electrónico a una persona",
+    "Send" : "Enviar",
+    "Set expiration date" : "Establecer fecha de caducidad",
+    "Expiration date" : "Fecha de caducidad",
+    "group" : "grupo",
+    "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 al usuario por correo electrónico",
+    "can share" : "puede compartir",
+    "can edit" : "puede editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "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",
+    "Warning" : "Precaución",
+    "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "Enter new" : "Ingresar nueva",
+    "Delete" : "Eliminar",
+    "Add" : "Agregar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
+    "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
+    "Please reload the page." : "Vuelva a cargar la página.",
+    "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
+    "Username" : "Nombre de usuario",
+    "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?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
+    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
+    "Reset" : "Reiniciar",
+    "New password" : "Nueva contraseña",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicaciones",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Error cargando etiquetas.",
+    "Tag already exists" : "La etiqueta ya existe",
+    "Error deleting tag(s)" : "Error borrando etiqueta(s)",
+    "Error tagging" : "Error al etiquetar",
+    "Error untagging" : "Error al quitar etiqueta",
+    "Error favoriting" : "Error al marcar como favorito",
+    "Error unfavoriting" : "Error al quitar como favorito",
+    "Access forbidden" : "Acceso denegado",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
+    "Security Warning" : "Advertencia de seguridad",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, actualice su instalación PHP para usar %s con seguridad.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Password" : "Contraseña",
+    "Data folder" : "Directorio de datos",
+    "Configure the database" : "Configurar la base de datos",
+    "Database user" : "Usuario de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nombre de la base de datos",
+    "Database tablespace" : "Espacio de tablas de la base de datos",
+    "Database host" : "Host de la base de datos",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando …",
+    "%s is available. Get more information on how to update." : "%s esta disponible. Obtener mas información de como actualizar.",
+    "Log out" : "Salir",
+    "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.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
+    "Thank you for your patience." : "Gracias por su paciencia."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
new file mode 100644
index 00000000000..a620c6ca020
--- /dev/null
+++ b/core/l10n/es_MX.json
@@ -0,0 +1,146 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "No se pudo enviar el mensaje a los siguientes usuarios: %s",
+    "Turned on maintenance mode" : "Modo mantenimiento activado",
+    "Turned off maintenance mode" : "Modo mantenimiento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "No image or file provided" : "No se especificó ningún archivo o imagen",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "No temporary profile picture available, try again" : "No hay disponible una imagen temporal de perfil, pruebe de nuevo",
+    "No crop data provided" : "No se proporcionó datos del recorte",
+    "Sunday" : "Domingo",
+    "Monday" : "Lunes",
+    "Tuesday" : "Martes",
+    "Wednesday" : "Miércoles",
+    "Thursday" : "Jueves",
+    "Friday" : "Viernes",
+    "Saturday" : "Sábado",
+    "January" : "Enero",
+    "February" : "Febrero",
+    "March" : "Marzo",
+    "April" : "Abril",
+    "May" : "Mayo",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Agosto",
+    "September" : "Septiembre",
+    "October" : "Octubre",
+    "November" : "Noviembre",
+    "December" : "Diciembre",
+    "Settings" : "Ajustes",
+    "File" : "Archivo",
+    "Folder" : "Carpeta",
+    "Saving..." : "Guardando...",
+    "Reset password" : "Restablecer contraseña",
+    "No" : "No",
+    "Yes" : "Sí",
+    "Choose" : "Seleccionar",
+    "Error loading file picker template: {error}" : "Error cargando plantilla del seleccionador de archivos: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Error cargando plantilla del mensaje: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de archivo","{count} conflictos de archivo"],
+    "One file conflict" : "Un conflicto de archivo",
+    "Which files do you want to keep?" : "¿Que archivos deseas mantener?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Error cargando plantilla de archivo existente",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
+    "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." : "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
+    "Shared" : "Compartido",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error al compartir",
+    "Error while unsharing" : "Error al dejar de compartir",
+    "Error while changing permissions" : "Error al cambiar permisos",
+    "Shared with you and the group {group} by {owner}" : "Compartido contigo y el grupo {group} por {owner}",
+    "Shared with you by {owner}" : "Compartido contigo por {owner}",
+    "Share with user or group …" : "Compartido con el usuario o con el grupo …",
+    "Share link" : "Enlace compartido",
+    "Password protect" : "Protección con contraseña",
+    "Allow Public Upload" : "Permitir Subida Pública",
+    "Email link to person" : "Enviar enlace por correo electrónico a una persona",
+    "Send" : "Enviar",
+    "Set expiration date" : "Establecer fecha de caducidad",
+    "Expiration date" : "Fecha de caducidad",
+    "group" : "grupo",
+    "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 al usuario por correo electrónico",
+    "can share" : "puede compartir",
+    "can edit" : "puede editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "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",
+    "Warning" : "Precaución",
+    "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "Enter new" : "Ingresar nueva",
+    "Delete" : "Eliminar",
+    "Add" : "Agregar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
+    "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
+    "Please reload the page." : "Vuelva a cargar la página.",
+    "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
+    "%s password reset" : "%s restablecer contraseña",
+    "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
+    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
+    "Username" : "Nombre de usuario",
+    "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?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
+    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
+    "Reset" : "Reiniciar",
+    "New password" : "Nueva contraseña",
+    "Personal" : "Personal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicaciones",
+    "Admin" : "Administración",
+    "Help" : "Ayuda",
+    "Error loading tags" : "Error cargando etiquetas.",
+    "Tag already exists" : "La etiqueta ya existe",
+    "Error deleting tag(s)" : "Error borrando etiqueta(s)",
+    "Error tagging" : "Error al etiquetar",
+    "Error untagging" : "Error al quitar etiqueta",
+    "Error favoriting" : "Error al marcar como favorito",
+    "Error unfavoriting" : "Error al quitar como favorito",
+    "Access forbidden" : "Acceso denegado",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
+    "The share will expire on %s." : "El objeto dejará de ser compartido el %s.",
+    "Cheers!" : "¡Saludos!",
+    "Security Warning" : "Advertencia de seguridad",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, actualice su instalación PHP para usar %s con seguridad.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Password" : "Contraseña",
+    "Data folder" : "Directorio de datos",
+    "Configure the database" : "Configurar la base de datos",
+    "Database user" : "Usuario de la base de datos",
+    "Database password" : "Contraseña de la base de datos",
+    "Database name" : "Nombre de la base de datos",
+    "Database tablespace" : "Espacio de tablas de la base de datos",
+    "Database host" : "Host de la base de datos",
+    "Finish setup" : "Completar la instalación",
+    "Finishing …" : "Finalizando …",
+    "%s is available. Get more information on how to update." : "%s esta disponible. Obtener mas información de como actualizar.",
+    "Log out" : "Salir",
+    "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.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
+    "Thank you for your patience." : "Gracias por su paciencia."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_MX.php b/core/l10n/es_MX.php
deleted file mode 100644
index 1575822ee50..00000000000
--- a/core/l10n/es_MX.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "No se pudo enviar el mensaje a los siguientes usuarios: %s",
-"Turned on maintenance mode" => "Modo mantenimiento activado",
-"Turned off maintenance mode" => "Modo mantenimiento desactivado",
-"Updated database" => "Base de datos actualizada",
-"No image or file provided" => "No se especificó ningún archivo o imagen",
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen inválida",
-"No temporary profile picture available, try again" => "No hay disponible una imagen temporal de perfil, pruebe de nuevo",
-"No crop data provided" => "No se proporcionó datos del recorte",
-"Sunday" => "Domingo",
-"Monday" => "Lunes",
-"Tuesday" => "Martes",
-"Wednesday" => "Miércoles",
-"Thursday" => "Jueves",
-"Friday" => "Viernes",
-"Saturday" => "Sábado",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
-"Settings" => "Ajustes",
-"File" => "Archivo",
-"Folder" => "Carpeta",
-"Saving..." => "Guardando...",
-"Reset password" => "Restablecer contraseña",
-"No" => "No",
-"Yes" => "Sí",
-"Choose" => "Seleccionar",
-"Error loading file picker template: {error}" => "Error cargando plantilla del seleccionador de archivos: {error}",
-"Ok" => "Aceptar",
-"Error loading message template: {error}" => "Error cargando plantilla del mensaje: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de archivo","{count} conflictos de archivo"),
-"One file conflict" => "Un conflicto de archivo",
-"Which files do you want to keep?" => "¿Que archivos deseas mantener?",
-"If you select both versions, the copied file will have a number added to its name." => "Si seleccionas ambas versiones, el archivo copiado tendrá añadido un número en su nombre.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todos seleccionados)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Error cargando plantilla de archivo existente",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Su servidor web aún no está configurado adecuadamente para permitir la sincronización de archivos ya que la interfaz WebDAV parece no estar funcionando.",
-"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." => "Este servidor no tiene conexión a Internet. Esto significa que algunas de las características no funcionarán, como el montaje de almacenamiento externo, las notificaciones sobre actualizaciones, la instalación de aplicaciones de terceros, el acceso a los archivos de forma remota o el envío de correos electrónicos de notificación. Sugerimos habilitar una conexión a Internet en este servidor para disfrutar de todas las funciones.",
-"Shared" => "Compartido",
-"Share" => "Compartir",
-"Error" => "Error",
-"Error while sharing" => "Error al compartir",
-"Error while unsharing" => "Error al dejar de compartir",
-"Error while changing permissions" => "Error al cambiar permisos",
-"Shared with you and the group {group} by {owner}" => "Compartido contigo y el grupo {group} por {owner}",
-"Shared with you by {owner}" => "Compartido contigo por {owner}",
-"Share with user or group …" => "Compartido con el usuario o con el grupo …",
-"Share link" => "Enlace compartido",
-"Password protect" => "Protección con contraseña",
-"Allow Public Upload" => "Permitir Subida Pública",
-"Email link to person" => "Enviar enlace por correo electrónico a una persona",
-"Send" => "Enviar",
-"Set expiration date" => "Establecer fecha de caducidad",
-"Expiration date" => "Fecha de caducidad",
-"group" => "grupo",
-"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 al usuario por correo electrónico",
-"can share" => "puede compartir",
-"can edit" => "puede editar",
-"access control" => "control de acceso",
-"create" => "crear",
-"update" => "actualizar",
-"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",
-"Warning" => "Precaución",
-"The object type is not specified." => "El tipo de objeto no está especificado.",
-"Enter new" => "Ingresar nueva",
-"Delete" => "Eliminar",
-"Add" => "Agregar",
-"Edit tags" => "Editar etiquetas",
-"Error loading dialog template: {error}" => "Error cargando plantilla de diálogo: {error}",
-"No tags selected for deletion." => "No hay etiquetas seleccionadas para borrar.",
-"Please reload the page." => "Vuelva a cargar la página.",
-"The update was successful. Redirecting you to ownCloud now." => "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
-"%s password reset" => "%s restablecer contraseña",
-"Use the following link to reset your password: {link}" => "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-"You will receive a link to reset your password via Email." => "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-"Username" => "Nombre de usuario",
-"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?" => "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-"Yes, I really want to reset my password now" => "Sí. Realmente deseo resetear mi contraseña ahora",
-"Reset" => "Reiniciar",
-"New password" => "Nueva contraseña",
-"Personal" => "Personal",
-"Users" => "Usuarios",
-"Apps" => "Aplicaciones",
-"Admin" => "Administración",
-"Help" => "Ayuda",
-"Error loading tags" => "Error cargando etiquetas.",
-"Tag already exists" => "La etiqueta ya existe",
-"Error deleting tag(s)" => "Error borrando etiqueta(s)",
-"Error tagging" => "Error al etiquetar",
-"Error untagging" => "Error al quitar etiqueta",
-"Error favoriting" => "Error al marcar como favorito",
-"Error unfavoriting" => "Error al quitar como favorito",
-"Access forbidden" => "Acceso denegado",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hola:\n\nTan solo queremos informarte que %s compartió %s contigo.\nMíralo aquí: %s\n\n",
-"The share will expire on %s." => "El objeto dejará de ser compartido el %s.",
-"Cheers!" => "¡Saludos!",
-"Security Warning" => "Advertencia de seguridad",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Su versión de PHP es vulnerable al ataque de Byte NULL (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor, actualice su instalación PHP para usar %s con seguridad.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crear una <strong>cuenta de administrador</strong>",
-"Password" => "Contraseña",
-"Data folder" => "Directorio de datos",
-"Configure the database" => "Configurar la base de datos",
-"Database user" => "Usuario de la base de datos",
-"Database password" => "Contraseña de la base de datos",
-"Database name" => "Nombre de la base de datos",
-"Database tablespace" => "Espacio de tablas de la base de datos",
-"Database host" => "Host de la base de datos",
-"Finish setup" => "Completar la instalación",
-"Finishing …" => "Finalizando …",
-"%s is available. Get more information on how to update." => "%s esta disponible. Obtener mas información de como actualizar.",
-"Log out" => "Salir",
-"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.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte con su administrador de sistemas si este mensaje persiste o aparece de forma inesperada.",
-"Thank you for your patience." => "Gracias por su paciencia."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_PE.js b/core/l10n/es_PE.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_PE.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PE.json b/core/l10n/es_PE.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_PE.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_PE.php b/core/l10n/es_PE.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_PE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_PY.js b/core/l10n/es_PY.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_PY.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PY.json b/core/l10n/es_PY.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_PY.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_PY.php b/core/l10n/es_PY.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_PY.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_US.js b/core/l10n/es_US.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_US.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_US.json b/core/l10n/es_US.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_US.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_US.php b/core/l10n/es_US.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_US.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/es_UY.js b/core/l10n/es_UY.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/es_UY.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_UY.json b/core/l10n/es_UY.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/es_UY.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/es_UY.php b/core/l10n/es_UY.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/es_UY.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
new file mode 100644
index 00000000000..5b2e2511005
--- /dev/null
+++ b/core/l10n/et_EE.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
+    "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud",
+    "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud",
+    "Updated database" : "Uuendatud andmebaas",
+    "Checked database schema update" : "Andmebaasi skeemi uuendus kontrollitud",
+    "Checked database schema update for apps" : "Andmebaasi skeemi uuendus rakendustele on kontrollitud",
+    "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s",
+    "Disabled incompatible apps: %s" : "Keelatud mitteühilduvad rakendid: %s",
+    "No image or file provided" : "Ühtegi pilti või faili pole pakutud",
+    "Unknown filetype" : "Tundmatu failitüüp",
+    "Invalid image" : "Vigane pilt",
+    "No temporary profile picture available, try again" : "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti",
+    "No crop data provided" : "Lõikeandmeid ei leitud",
+    "Sunday" : "Pühapäev",
+    "Monday" : "Esmaspäev",
+    "Tuesday" : "Teisipäev",
+    "Wednesday" : "Kolmapäev",
+    "Thursday" : "Neljapäev",
+    "Friday" : "Reede",
+    "Saturday" : "Laupäev",
+    "January" : "Jaanuar",
+    "February" : "Veebruar",
+    "March" : "Märts",
+    "April" : "Aprill",
+    "May" : "Mai",
+    "June" : "Juuni",
+    "July" : "Juuli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktoober",
+    "November" : "November",
+    "December" : "Detsember",
+    "Settings" : "Seaded",
+    "File" : "Fail",
+    "Folder" : "Kaust",
+    "Image" : "Pilt",
+    "Audio" : "Helid",
+    "Saving..." : "Salvestamine...",
+    "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?",
+    "I know what I'm doing" : "Ma tean mida teen",
+    "Reset password" : "Nulli parool",
+    "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
+    "No" : "Ei",
+    "Yes" : "Jah",
+    "Choose" : "Vali",
+    "Error loading file picker template: {error}" : "Viga failivalija malli laadimisel:  {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Viga sõnumi malli laadimisel: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} failikonflikt","{count} failikonflikti"],
+    "One file conflict" : "Üks failikonflikt",
+    "New Files" : "Uued failid",
+    "Already existing files" : "Juba olemasolevad failid",
+    "Which files do you want to keep?" : "Milliseid faile sa soovid alles hoida?",
+    "If you select both versions, the copied file will have a number added to its name." : "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.",
+    "Cancel" : "Loobu",
+    "Continue" : "Jätka",
+    "(all selected)" : "(kõik valitud)",
+    "({count} selected)" : "({count} valitud)",
+    "Error loading file exists template" : "Viga faili olemasolu malli laadimisel",
+    "Very weak password" : "Väga nõrk parool",
+    "Weak password" : "Nõrk parool",
+    "So-so password" : "Enam-vähem sobiv parool",
+    "Good password" : "Hea parool",
+    "Strong password" : "Väga hea parool",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
+    "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." : "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
+    "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga",
+    "Shared" : "Jagatud",
+    "Shared with {recipients}" : "Jagatud {recipients}",
+    "Share" : "Jaga",
+    "Error" : "Viga",
+    "Error while sharing" : "Viga jagamisel",
+    "Error while unsharing" : "Viga jagamise lõpetamisel",
+    "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 user or group …" : "Jaga kasutaja või grupiga ...",
+    "Share link" : "Jaga linki",
+    "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
+    "Password protect" : "Parooliga kaitstud",
+    "Choose a password for the public link" : "Vali avaliku lingi jaoks parool",
+    "Allow Public Upload" : "Luba avalik üleslaadimine",
+    "Email link to person" : "Saada link isikule e-postiga",
+    "Send" : "Saada",
+    "Set expiration date" : "Määra aegumise kuupäev",
+    "Expiration date" : "Aegumise kuupäev",
+    "Adding user..." : "Kasutaja lisamine...",
+    "group" : "grupp",
+    "Resharing is not allowed" : "Edasijagamine pole lubatud",
+    "Shared in {item} with {user}" : "Jagatud {item} kasutajaga {user}",
+    "Unshare" : "Lõpeta jagamine",
+    "notify by email" : "teavita e-postiga",
+    "can share" : "saab jagada",
+    "can edit" : "saab muuta",
+    "access control" : "ligipääsukontroll",
+    "create" : "loo",
+    "update" : "uuenda",
+    "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",
+    "Warning" : "Hoiatus",
+    "The object type is not specified." : "Objekti tüüp pole määratletud.",
+    "Enter new" : "Sisesta uus",
+    "Delete" : "Kustuta",
+    "Add" : "Lisa",
+    "Edit tags" : "Muuda silte",
+    "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
+    "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
+    "Please reload the page." : "Palun laadi see uuesti.",
+    "The update was unsuccessful." : "Uuendus ebaõnnestus.",
+    "The update was successful. Redirecting you to ownCloud now." : "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
+    "Couldn't reset password because the token is invalid" : "Ei saanud parooli taastada, kuna märgend on vigane",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
+    "%s password reset" : "%s parooli lähtestus",
+    "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
+    "You will receive a link to reset your password via Email." : "Sinu parooli taastamise link saadetakse sulle e-postile.",
+    "Username" : "Kasutajanimi",
+    "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?" : "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. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
+    "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada",
+    "Reset" : "Algseaded",
+    "New password" : "Uus parool",
+    "New Password" : "Uus parool",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
+    "Personal" : "Isiklik",
+    "Users" : "Kasutajad",
+    "Apps" : "Rakendused",
+    "Admin" : "Admin",
+    "Help" : "Abiinfo",
+    "Error loading tags" : "Viga siltide laadimisel",
+    "Tag already exists" : "Silt on juba olemas",
+    "Error deleting tag(s)" : "Viga sildi (siltide) kustutamisel",
+    "Error tagging" : "Viga sildi lisamisel",
+    "Error untagging" : "Viga sildi eemaldamisel",
+    "Error favoriting" : "Viga lemmikuks lisamisel",
+    "Error unfavoriting" : "Viga lemmikutest eemaldamisel",
+    "Access forbidden" : "Ligipääs on keelatud",
+    "File not found" : "Faili ei leitud",
+    "The specified document has not been found on the server." : "Määratud dokumenti serverist ei leitud.",
+    "You can click here to return to %s." : "%s tagasi minemiseks võid sa siia klikkida.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
+    "The share will expire on %s." : "Jagamine aegub %s.",
+    "Cheers!" : "Terekest!",
+    "Internal Server Error" : "Serveri sisemine viga",
+    "The server encountered an internal error and was unable to complete your request." : "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.",
+    "More details can be found in the server log." : "Lisainfot võib leida serveri logist.",
+    "Technical details" : "Tehnilised andmed",
+    "Remote Address: %s" : "Kaugaadress: %s",
+    "Request ID: %s" : "Päringu ID: %s",
+    "Code: %s" : "Kood: %s",
+    "Message: %s" : "Sõnum: %s",
+    "File: %s" : "Fail: %s",
+    "Line: %s" : "Rida: %s",
+    "Trace" : "Jälita",
+    "Security Warning" : "Turvahoiatus",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
+    "Please update your PHP installation to use %s securely." : "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
+    "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
+    "Password" : "Parool",
+    "Storage & database" : "Andmehoidla ja andmebaas",
+    "Data folder" : "Andmete kaust",
+    "Configure the database" : "Seadista andmebaasi",
+    "Only %s is available." : "Ainult %s on saadaval.",
+    "Database user" : "Andmebaasi kasutaja",
+    "Database password" : "Andmebaasi parool",
+    "Database name" : "Andmebasi nimi",
+    "Database tablespace" : "Andmebaasi tabeliruum",
+    "Database host" : "Andmebaasi host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta.",
+    "Finish setup" : "Lõpeta seadistamine",
+    "Finishing …" : "Lõpetamine ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
+    "%s is available. Get more information on how to update." : "%s on saadaval. Vaata lähemalt kuidas uuendada.",
+    "Log out" : "Logi välja",
+    "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!",
+    "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.",
+    "Forgot your password? Reset it!" : "Unustasid parooli? Taasta see!",
+    "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.",
+    "This means only administrators can use the instance." : "See tähendab, et seda saavad kasutada ainult administraatorid.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
+    "Thank you for your patience." : "Täname kannatlikkuse eest.",
+    "You are accessing the server from an untrusted domain." : "Sa kasutad serverit usalduseta asukohast",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
+    "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina",
+    "%s will be updated to version %s." : "%s uuendatakse versioonile %s.",
+    "The following apps will be disabled:" : "Järgnevad rakendid keelatakse:",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:",
+    "This %s instance is currently being updated, which may take a while." : "Seda %s ownCloud instantsi hetkel uuendatakse, see võib võtta veidi aega.",
+    "This page will refresh itself when the %s instance is available again." : "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
new file mode 100644
index 00000000000..ba3f3b8e8f2
--- /dev/null
+++ b/core/l10n/et_EE.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
+    "Turned on maintenance mode" : "Haldusrežiimis sisse lülitatud",
+    "Turned off maintenance mode" : "Haldusrežiimis välja lülitatud",
+    "Updated database" : "Uuendatud andmebaas",
+    "Checked database schema update" : "Andmebaasi skeemi uuendus kontrollitud",
+    "Checked database schema update for apps" : "Andmebaasi skeemi uuendus rakendustele on kontrollitud",
+    "Updated \"%s\" to %s" : "Uuendatud \"%s\" -> %s",
+    "Disabled incompatible apps: %s" : "Keelatud mitteühilduvad rakendid: %s",
+    "No image or file provided" : "Ühtegi pilti või faili pole pakutud",
+    "Unknown filetype" : "Tundmatu failitüüp",
+    "Invalid image" : "Vigane pilt",
+    "No temporary profile picture available, try again" : "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti",
+    "No crop data provided" : "Lõikeandmeid ei leitud",
+    "Sunday" : "Pühapäev",
+    "Monday" : "Esmaspäev",
+    "Tuesday" : "Teisipäev",
+    "Wednesday" : "Kolmapäev",
+    "Thursday" : "Neljapäev",
+    "Friday" : "Reede",
+    "Saturday" : "Laupäev",
+    "January" : "Jaanuar",
+    "February" : "Veebruar",
+    "March" : "Märts",
+    "April" : "Aprill",
+    "May" : "Mai",
+    "June" : "Juuni",
+    "July" : "Juuli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktoober",
+    "November" : "November",
+    "December" : "Detsember",
+    "Settings" : "Seaded",
+    "File" : "Fail",
+    "Folder" : "Kaust",
+    "Image" : "Pilt",
+    "Audio" : "Helid",
+    "Saving..." : "Salvestamine...",
+    "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?",
+    "I know what I'm doing" : "Ma tean mida teen",
+    "Reset password" : "Nulli parool",
+    "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
+    "No" : "Ei",
+    "Yes" : "Jah",
+    "Choose" : "Vali",
+    "Error loading file picker template: {error}" : "Viga failivalija malli laadimisel:  {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Viga sõnumi malli laadimisel: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} failikonflikt","{count} failikonflikti"],
+    "One file conflict" : "Üks failikonflikt",
+    "New Files" : "Uued failid",
+    "Already existing files" : "Juba olemasolevad failid",
+    "Which files do you want to keep?" : "Milliseid faile sa soovid alles hoida?",
+    "If you select both versions, the copied file will have a number added to its name." : "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.",
+    "Cancel" : "Loobu",
+    "Continue" : "Jätka",
+    "(all selected)" : "(kõik valitud)",
+    "({count} selected)" : "({count} valitud)",
+    "Error loading file exists template" : "Viga faili olemasolu malli laadimisel",
+    "Very weak password" : "Väga nõrk parool",
+    "Weak password" : "Nõrk parool",
+    "So-so password" : "Enam-vähem sobiv parool",
+    "Good password" : "Hea parool",
+    "Strong password" : "Väga hea parool",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
+    "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." : "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
+    "Error occurred while checking server setup" : "Serveri seadete kontrolimisel tekkis viga",
+    "Shared" : "Jagatud",
+    "Shared with {recipients}" : "Jagatud {recipients}",
+    "Share" : "Jaga",
+    "Error" : "Viga",
+    "Error while sharing" : "Viga jagamisel",
+    "Error while unsharing" : "Viga jagamise lõpetamisel",
+    "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 user or group …" : "Jaga kasutaja või grupiga ...",
+    "Share link" : "Jaga linki",
+    "The public link will expire no later than {days} days after it is created" : "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
+    "Password protect" : "Parooliga kaitstud",
+    "Choose a password for the public link" : "Vali avaliku lingi jaoks parool",
+    "Allow Public Upload" : "Luba avalik üleslaadimine",
+    "Email link to person" : "Saada link isikule e-postiga",
+    "Send" : "Saada",
+    "Set expiration date" : "Määra aegumise kuupäev",
+    "Expiration date" : "Aegumise kuupäev",
+    "Adding user..." : "Kasutaja lisamine...",
+    "group" : "grupp",
+    "Resharing is not allowed" : "Edasijagamine pole lubatud",
+    "Shared in {item} with {user}" : "Jagatud {item} kasutajaga {user}",
+    "Unshare" : "Lõpeta jagamine",
+    "notify by email" : "teavita e-postiga",
+    "can share" : "saab jagada",
+    "can edit" : "saab muuta",
+    "access control" : "ligipääsukontroll",
+    "create" : "loo",
+    "update" : "uuenda",
+    "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",
+    "Warning" : "Hoiatus",
+    "The object type is not specified." : "Objekti tüüp pole määratletud.",
+    "Enter new" : "Sisesta uus",
+    "Delete" : "Kustuta",
+    "Add" : "Lisa",
+    "Edit tags" : "Muuda silte",
+    "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
+    "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
+    "Please reload the page." : "Palun laadi see uuesti.",
+    "The update was unsuccessful." : "Uuendus ebaõnnestus.",
+    "The update was successful. Redirecting you to ownCloud now." : "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
+    "Couldn't reset password because the token is invalid" : "Ei saanud parooli taastada, kuna märgend on vigane",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
+    "%s password reset" : "%s parooli lähtestus",
+    "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
+    "You will receive a link to reset your password via Email." : "Sinu parooli taastamise link saadetakse sulle e-postile.",
+    "Username" : "Kasutajanimi",
+    "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?" : "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. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
+    "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada",
+    "Reset" : "Algseaded",
+    "New password" : "Uus parool",
+    "New Password" : "Uus parool",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
+    "Personal" : "Isiklik",
+    "Users" : "Kasutajad",
+    "Apps" : "Rakendused",
+    "Admin" : "Admin",
+    "Help" : "Abiinfo",
+    "Error loading tags" : "Viga siltide laadimisel",
+    "Tag already exists" : "Silt on juba olemas",
+    "Error deleting tag(s)" : "Viga sildi (siltide) kustutamisel",
+    "Error tagging" : "Viga sildi lisamisel",
+    "Error untagging" : "Viga sildi eemaldamisel",
+    "Error favoriting" : "Viga lemmikuks lisamisel",
+    "Error unfavoriting" : "Viga lemmikutest eemaldamisel",
+    "Access forbidden" : "Ligipääs on keelatud",
+    "File not found" : "Faili ei leitud",
+    "The specified document has not been found on the server." : "Määratud dokumenti serverist ei leitud.",
+    "You can click here to return to %s." : "%s tagasi minemiseks võid sa siia klikkida.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
+    "The share will expire on %s." : "Jagamine aegub %s.",
+    "Cheers!" : "Terekest!",
+    "Internal Server Error" : "Serveri sisemine viga",
+    "The server encountered an internal error and was unable to complete your request." : "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.",
+    "More details can be found in the server log." : "Lisainfot võib leida serveri logist.",
+    "Technical details" : "Tehnilised andmed",
+    "Remote Address: %s" : "Kaugaadress: %s",
+    "Request ID: %s" : "Päringu ID: %s",
+    "Code: %s" : "Kood: %s",
+    "Message: %s" : "Sõnum: %s",
+    "File: %s" : "Fail: %s",
+    "Line: %s" : "Rida: %s",
+    "Trace" : "Jälita",
+    "Security Warning" : "Turvahoiatus",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
+    "Please update your PHP installation to use %s securely." : "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
+    "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
+    "Password" : "Parool",
+    "Storage & database" : "Andmehoidla ja andmebaas",
+    "Data folder" : "Andmete kaust",
+    "Configure the database" : "Seadista andmebaasi",
+    "Only %s is available." : "Ainult %s on saadaval.",
+    "Database user" : "Andmebaasi kasutaja",
+    "Database password" : "Andmebaasi parool",
+    "Database name" : "Andmebasi nimi",
+    "Database tablespace" : "Andmebaasi tabeliruum",
+    "Database host" : "Andmebaasi host",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta.",
+    "Finish setup" : "Lõpeta seadistamine",
+    "Finishing …" : "Lõpetamine ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
+    "%s is available. Get more information on how to update." : "%s on saadaval. Vaata lähemalt kuidas uuendada.",
+    "Log out" : "Logi välja",
+    "Server side authentication failed!" : "Serveripoolne autentimine ebaõnnestus!",
+    "Please contact your administrator." : "Palun kontakteeru oma süsteemihalduriga.",
+    "Forgot your password? Reset it!" : "Unustasid parooli? Taasta see!",
+    "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.",
+    "This means only administrators can use the instance." : "See tähendab, et seda saavad kasutada ainult administraatorid.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
+    "Thank you for your patience." : "Täname kannatlikkuse eest.",
+    "You are accessing the server from an untrusted domain." : "Sa kasutad serverit usalduseta asukohast",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
+    "Add \"%s\" as trusted domain" : "Lisa \"%s\" usaldusväärse domeenina",
+    "%s will be updated to version %s." : "%s uuendatakse versioonile %s.",
+    "The following apps will be disabled:" : "Järgnevad rakendid keelatakse:",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:",
+    "This %s instance is currently being updated, which may take a while." : "Seda %s ownCloud instantsi hetkel uuendatakse, see võib võtta veidi aega.",
+    "This page will refresh itself when the %s instance is available again." : "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
deleted file mode 100644
index 2aa5d95d18e..00000000000
--- a/core/l10n/et_EE.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kirja saatmine järgnevatele kasutajatele ebaõnnestus: %s ",
-"Turned on maintenance mode" => "Haldusrežiimis sisse lülitatud",
-"Turned off maintenance mode" => "Haldusrežiimis välja lülitatud",
-"Updated database" => "Uuendatud andmebaas",
-"Checked database schema update" => "Andmebaasi skeemi uuendus kontrollitud",
-"Checked database schema update for apps" => "Andmebaasi skeemi uuendus rakendustele on kontrollitud",
-"Updated \"%s\" to %s" => "Uuendatud \"%s\" -> %s",
-"Disabled incompatible apps: %s" => "Keelatud mitteühilduvad rakendid: %s",
-"No image or file provided" => "Ühtegi pilti või faili pole pakutud",
-"Unknown filetype" => "Tundmatu failitüüp",
-"Invalid image" => "Vigane pilt",
-"No temporary profile picture available, try again" => "Ühtegi ajutist profiili pilti pole saadaval, proovi uuesti",
-"No crop data provided" => "Lõikeandmeid ei leitud",
-"Sunday" => "Pühapäev",
-"Monday" => "Esmaspäev",
-"Tuesday" => "Teisipäev",
-"Wednesday" => "Kolmapäev",
-"Thursday" => "Neljapäev",
-"Friday" => "Reede",
-"Saturday" => "Laupäev",
-"January" => "Jaanuar",
-"February" => "Veebruar",
-"March" => "Märts",
-"April" => "Aprill",
-"May" => "Mai",
-"June" => "Juuni",
-"July" => "Juuli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktoober",
-"November" => "November",
-"December" => "Detsember",
-"Settings" => "Seaded",
-"File" => "Fail",
-"Folder" => "Kaust",
-"Image" => "Pilt",
-"Audio" => "Helid",
-"Saving..." => "Salvestamine...",
-"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?",
-"I know what I'm doing" => "Ma tean mida teen",
-"Reset password" => "Nulli parool",
-"Password can not be changed. Please contact your administrator." => "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
-"No" => "Ei",
-"Yes" => "Jah",
-"Choose" => "Vali",
-"Error loading file picker template: {error}" => "Viga failivalija malli laadimisel:  {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Viga sõnumi malli laadimisel: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} failikonflikt","{count} failikonflikti"),
-"One file conflict" => "Üks failikonflikt",
-"New Files" => "Uued failid",
-"Already existing files" => "Juba olemasolevad failid",
-"Which files do you want to keep?" => "Milliseid faile sa soovid alles hoida?",
-"If you select both versions, the copied file will have a number added to its name." => "Kui valid mõlemad versioonid, siis lisatakse kopeeritud faili nimele number.",
-"Cancel" => "Loobu",
-"Continue" => "Jätka",
-"(all selected)" => "(kõik valitud)",
-"({count} selected)" => "({count} valitud)",
-"Error loading file exists template" => "Viga faili olemasolu malli laadimisel",
-"Very weak password" => "Väga nõrk parool",
-"Weak password" => "Nõrk parool",
-"So-so password" => "Enam-vähem sobiv parool",
-"Good password" => "Hea parool",
-"Strong password" => "Väga hea parool",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Veebiserveri ei ole veel korralikult seadistatud võimaldamaks failide sünkroniseerimist, kuna WebDAV liides näib olevat mittetoimiv.",
-"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." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.",
-"Error occurred while checking server setup" => "Serveri seadete kontrolimisel tekkis viga",
-"Shared" => "Jagatud",
-"Shared with {recipients}" => "Jagatud {recipients}",
-"Share" => "Jaga",
-"Error" => "Viga",
-"Error while sharing" => "Viga jagamisel",
-"Error while unsharing" => "Viga jagamise lõpetamisel",
-"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 user or group …" => "Jaga kasutaja või grupiga ...",
-"Share link" => "Jaga linki",
-"The public link will expire no later than {days} days after it is created" => "Avalik link aegub mitte hiljem kui pärast {days} päeva selle loomist",
-"Password protect" => "Parooliga kaitstud",
-"Choose a password for the public link" => "Vali avaliku lingi jaoks parool",
-"Allow Public Upload" => "Luba avalik üleslaadimine",
-"Email link to person" => "Saada link isikule e-postiga",
-"Send" => "Saada",
-"Set expiration date" => "Määra aegumise kuupäev",
-"Expiration date" => "Aegumise kuupäev",
-"Adding user..." => "Kasutaja lisamine...",
-"group" => "grupp",
-"Resharing is not allowed" => "Edasijagamine pole lubatud",
-"Shared in {item} with {user}" => "Jagatud {item} kasutajaga {user}",
-"Unshare" => "Lõpeta jagamine",
-"notify by email" => "teavita e-postiga",
-"can share" => "saab jagada",
-"can edit" => "saab muuta",
-"access control" => "ligipääsukontroll",
-"create" => "loo",
-"update" => "uuenda",
-"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",
-"Warning" => "Hoiatus",
-"The object type is not specified." => "Objekti tüüp pole määratletud.",
-"Enter new" => "Sisesta uus",
-"Delete" => "Kustuta",
-"Add" => "Lisa",
-"Edit tags" => "Muuda silte",
-"Error loading dialog template: {error}" => "Viga dialoogi malli laadimisel: {error}",
-"No tags selected for deletion." => "Kustutamiseks pole ühtegi silti valitud.",
-"Updating {productName} to version {version}, this may take a while." => "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
-"Please reload the page." => "Palun laadi see uuesti.",
-"The update was unsuccessful." => "Uuendus ebaõnnestus.",
-"The update was successful. Redirecting you to ownCloud now." => "Uuendus oli edukas. Kohe suunatakse Sind ownCloudi.",
-"Couldn't reset password because the token is invalid" => "Ei saanud parooli taastada, kuna märgend on vigane",
-"Couldn't send reset email. Please make sure your username is correct." => "Ei suutnud lähtestada e-maili. Palun veendu, et kasutajatunnus on õige.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
-"%s password reset" => "%s parooli lähtestus",
-"Use the following link to reset your password: {link}" => "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
-"You will receive a link to reset your password via Email." => "Sinu parooli taastamise link saadetakse sulle e-postile.",
-"Username" => "Kasutajanimi",
-"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?" => "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. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
-"Yes, I really want to reset my password now" => "Jah, ma tõesti soovin oma parooli praegu taastada",
-"Reset" => "Algseaded",
-"New password" => "Uus parool",
-"New Password" => "Uus parool",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
-"For the best results, please consider using a GNU/Linux server instead." => "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
-"Personal" => "Isiklik",
-"Users" => "Kasutajad",
-"Apps" => "Rakendused",
-"Admin" => "Admin",
-"Help" => "Abiinfo",
-"Error loading tags" => "Viga siltide laadimisel",
-"Tag already exists" => "Silt on juba olemas",
-"Error deleting tag(s)" => "Viga sildi (siltide) kustutamisel",
-"Error tagging" => "Viga sildi lisamisel",
-"Error untagging" => "Viga sildi eemaldamisel",
-"Error favoriting" => "Viga lemmikuks lisamisel",
-"Error unfavoriting" => "Viga lemmikutest eemaldamisel",
-"Access forbidden" => "Ligipääs on keelatud",
-"File not found" => "Faili ei leitud",
-"The specified document has not been found on the server." => "Määratud dokumenti serverist ei leitud.",
-"You can click here to return to %s." => "%s tagasi minemiseks võid sa siia klikkida.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Tere,\n\n%s jagas sulle välja %s.\nVaata siit: %s\n\n",
-"The share will expire on %s." => "Jagamine aegub %s.",
-"Cheers!" => "Terekest!",
-"Internal Server Error" => "Serveri sisemine viga",
-"The server encountered an internal error and was unable to complete your request." => "Serveris tekkis sisemine tõrge ja sinu päringu täitmine ebaõnnestus.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kui seda veateadet näidatakse mitu korda, siis palun võta ühendust serveri administraatoriga. Palun lisa alla aruandesse tehnilised üksikasjad.",
-"More details can be found in the server log." => "Lisainfot võib leida serveri logist.",
-"Technical details" => "Tehnilised andmed",
-"Remote Address: %s" => "Kaugaadress: %s",
-"Request ID: %s" => "Päringu ID: %s",
-"Code: %s" => "Kood: %s",
-"Message: %s" => "Sõnum: %s",
-"File: %s" => "Fail: %s",
-"Line: %s" => "Rida: %s",
-"Trace" => "Jälita",
-"Security Warning" => "Turvahoiatus",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sinu PHP versioon on haavatav NULL Baidi (CVE-2006-7243) rünnakuga.",
-"Please update your PHP installation to use %s securely." => "Palun uuenda oma paigaldatud PHP-d tagamaks %s turvalisus.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
-"Create an <strong>admin account</strong>" => "Loo <strong>admini konto</strong>",
-"Password" => "Parool",
-"Storage & database" => "Andmehoidla ja andmebaas",
-"Data folder" => "Andmete kaust",
-"Configure the database" => "Seadista andmebaasi",
-"Only %s is available." => "Ainult %s on saadaval.",
-"Database user" => "Andmebaasi kasutaja",
-"Database password" => "Andmebaasi parool",
-"Database name" => "Andmebasi nimi",
-"Database tablespace" => "Andmebaasi tabeliruum",
-"Database host" => "Andmebaasi host",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta.",
-"Finish setup" => "Lõpeta seadistamine",
-"Finishing …" => "Lõpetamine ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "See rakendus vajab toimimiseks JavaScripti. Palun <a href=\"http://enable-javascript.com/\" target=\"_blank\">luba JavaScript</a> ning laadi see leht uuesti.",
-"%s is available. Get more information on how to update." => "%s on saadaval. Vaata lähemalt kuidas uuendada.",
-"Log out" => "Logi välja",
-"Server side authentication failed!" => "Serveripoolne autentimine ebaõnnestus!",
-"Please contact your administrator." => "Palun kontakteeru oma süsteemihalduriga.",
-"Forgot your password? Reset it!" => "Unustasid parooli? Taasta see!",
-"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.",
-"This means only administrators can use the instance." => "See tähendab, et seda saavad kasutada ainult administraatorid.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakteeru oma süsteemihalduriga, kui see teade püsib või on tekkinud ootamatult.",
-"Thank you for your patience." => "Täname kannatlikkuse eest.",
-"You are accessing the server from an untrusted domain." => "Sa kasutad serverit usalduseta asukohast",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Palun võta ühendust oma saidi administraatoriga. Kui sa oled ise administraator, siis seadista failis config/config.php sätet \"trusted_domain\". Näidis seadistused leiad failist config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Sõltuvalt sinu seadetest võib ka administraator kasutada allolevat nuppu, et seda domeeni usaldusväärseks märkida.",
-"Add \"%s\" as trusted domain" => "Lisa \"%s\" usaldusväärse domeenina",
-"%s will be updated to version %s." => "%s uuendatakse versioonile %s.",
-"The following apps will be disabled:" => "Järgnevad rakendid keelatakse:",
-"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",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Suurtel saitidel aegumise vältimiseks võid sa paigalduskaustas käivitada järgmise käsu:",
-"This %s instance is currently being updated, which may take a while." => "Seda %s ownCloud instantsi hetkel uuendatakse, see võib võtta veidi aega.",
-"This page will refresh itself when the %s instance is available again." => "Se leht laetakse uuesti, kui %s instantsi on uuesti saadaval."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
new file mode 100644
index 00000000000..7f03d568dc9
--- /dev/null
+++ b/core/l10n/eu.js
@@ -0,0 +1,192 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
+    "Turned on maintenance mode" : "Mantenu modua gaitu da",
+    "Turned off maintenance mode" : "Mantenu modua desgaitu da",
+    "Updated database" : "Datu basea eguneratu da",
+    "Checked database schema update" : "Egiaztatuta datu-basearen zerbitzariaren eguneraketa",
+    "Checked database schema update for apps" : "Egiaztatuta aplikazioen datu-basearen zerbitzariaren eguneraketa",
+    "Updated \"%s\" to %s" : "\"%s\" %s-ra eguneratua",
+    "Disabled incompatible apps: %s" : "Bateragarriak ez diren desgaitutako aplikazioak: %s",
+    "No image or file provided" : "Ez da irudi edo fitxategirik zehaztu",
+    "Unknown filetype" : "Fitxategi mota ezezaguna",
+    "Invalid image" : "Baliogabeko irudia",
+    "No temporary profile picture available, try again" : "Ez dago behin-behineko profil irudirik, saiatu berriro",
+    "No crop data provided" : "Ez da ebaketarako daturik zehaztu",
+    "Sunday" : "Igandea",
+    "Monday" : "Astelehena",
+    "Tuesday" : "Asteartea",
+    "Wednesday" : "Asteazkena",
+    "Thursday" : "Osteguna",
+    "Friday" : "Ostirala",
+    "Saturday" : "Larunbata",
+    "January" : "Urtarrila",
+    "February" : "Otsaila",
+    "March" : "Martxoa",
+    "April" : "Apirila",
+    "May" : "Maiatza",
+    "June" : "Ekaina",
+    "July" : "Uztaila",
+    "August" : "Abuztua",
+    "September" : "Iraila",
+    "October" : "Urria",
+    "November" : "Azaroa",
+    "December" : "Abendua",
+    "Settings" : "Ezarpenak",
+    "File" : "Fitxategia",
+    "Folder" : "Karpeta",
+    "Image" : "Irudia",
+    "Audio" : "Audio",
+    "Saving..." : "Gordetzen...",
+    "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?",
+    "I know what I'm doing" : "Badakit zer ari naizen egiten",
+    "Reset password" : "Berrezarri pasahitza",
+    "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
+    "No" : "Ez",
+    "Yes" : "Bai",
+    "Choose" : "Aukeratu",
+    "Error loading file picker template: {error}" : "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
+    "Ok" : "Ados",
+    "Error loading message template: {error}" : "Errorea mezu txantiloia kargatzean: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"],
+    "One file conflict" : "Fitxategi batek konfliktua sortu du",
+    "New Files" : "Fitxategi Berriak",
+    "Already existing files" : "Dagoeneko existitzen diren fitxategiak",
+    "Which files do you want to keep?" : "Ze fitxategi mantendu nahi duzu?",
+    "If you select both versions, the copied file will have a number added to its name." : "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio.",
+    "Cancel" : "Ezeztatu",
+    "Continue" : "Jarraitu",
+    "(all selected)" : "(denak hautatuta)",
+    "({count} selected)" : "({count} hautatuta)",
+    "Error loading file exists template" : "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
+    "Very weak password" : "Pasahitz oso ahula",
+    "Weak password" : "Pasahitz ahula",
+    "So-so password" : "Halamoduzko pasahitza",
+    "Good password" : "Pasahitz ona",
+    "Strong password" : "Pasahitz sendoa",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
+    "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." : "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+    "Shared" : "Elkarbanatuta",
+    "Shared with {recipients}" : "{recipients}-rekin partekatua.",
+    "Share" : "Elkarbanatu",
+    "Error" : "Errorea",
+    "Error while sharing" : "Errore bat egon da elkarbanatzean",
+    "Error while unsharing" : "Errore bat egon da elkarbanaketa desegitean",
+    "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
+    "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+    "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
+    "Share with user or group …" : "Elkarbanatu erabiltzaile edo taldearekin...",
+    "Share link" : "Elkarbanatu lotura",
+    "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
+    "Password protect" : "Babestu pasahitzarekin",
+    "Choose a password for the public link" : "Aukeratu pasahitz bat esteka publikorako",
+    "Allow Public Upload" : "Gaitu igotze publikoa",
+    "Email link to person" : "Postaz bidali lotura ",
+    "Send" : "Bidali",
+    "Set expiration date" : "Ezarri muga data",
+    "Expiration date" : "Muga data",
+    "group" : "taldea",
+    "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",
+    "can share" : "elkarbana dezake",
+    "can edit" : "editatu dezake",
+    "access control" : "sarrera kontrola",
+    "create" : "sortu",
+    "update" : "eguneratu",
+    "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",
+    "Warning" : "Abisua",
+    "The object type is not specified." : "Objetu mota ez dago zehaztuta.",
+    "Enter new" : "Sartu berria",
+    "Delete" : "Ezabatu",
+    "Add" : "Gehitu",
+    "Edit tags" : "Editatu etiketak",
+    "Error loading dialog template: {error}" : "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
+    "No tags selected for deletion." : "Ez dira ezabatzeko etiketak hautatu.",
+    "Updating {productName} to version {version}, this may take a while." : "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
+    "Please reload the page." : "Mesedez birkargatu orria.",
+    "The update was unsuccessful." : "Eguneraketak ez du arrakasta izan.",
+    "The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
+    "Couldn't reset password because the token is invalid" : "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
+    "%s password reset" : "%s pasahitza berrezarri",
+    "Use the following link to reset your password: {link}" : "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
+    "You will receive a link to reset your password via Email." : "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
+    "Username" : "Erabiltzaile izena",
+    "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?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
+    "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut",
+    "Reset" : "Berrezarri",
+    "New password" : "Pasahitz berria",
+    "New Password" : "Pasahitz Berria",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
+    "Personal" : "Pertsonala",
+    "Users" : "Erabiltzaileak",
+    "Apps" : "Aplikazioak",
+    "Admin" : "Admin",
+    "Help" : "Laguntza",
+    "Error loading tags" : "Errore bat izan da etiketak kargatzearkoan.",
+    "Tag already exists" : "Etiketa dagoeneko existitzen da",
+    "Error deleting tag(s)" : "Errore bat izan da etiketa(k) ezabatzerakoan",
+    "Error tagging" : "Errorea etiketa ezartzerakoan",
+    "Error untagging" : "Errorea etiketa kentzerakoan",
+    "Error favoriting" : "Errorea gogokoetara gehitzerakoan",
+    "Error unfavoriting" : "Errorea gogokoetatik kentzerakoan",
+    "Access forbidden" : "Sarrera debekatuta",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
+    "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
+    "Cheers!" : "Ongi izan!",
+    "Security Warning" : "Segurtasun abisua",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
+    "Please update your PHP installation to use %s securely." : "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
+    "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
+    "Password" : "Pasahitza",
+    "Storage & database" : "Biltegia & datubasea",
+    "Data folder" : "Datuen karpeta",
+    "Configure the database" : "Konfiguratu datu basea",
+    "Only %s is available." : "Soilik %s dago eskuragarri.",
+    "Database user" : "Datubasearen erabiltzailea",
+    "Database password" : "Datubasearen pasahitza",
+    "Database name" : "Datubasearen izena",
+    "Database tablespace" : "Datu basearen taula-lekua",
+    "Database host" : "Datubasearen hostalaria",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
+    "Finish setup" : "Bukatu konfigurazioa",
+    "Finishing …" : "Bukatzen...",
+    "%s is available. Get more information on how to update." : "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
+    "Log out" : "Saioa bukatu",
+    "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
+    "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
+    "Forgot your password? Reset it!" : "Pasahitza ahaztu duzu? Berrezarri!",
+    "remember" : "gogoratu",
+    "Log in" : "Hasi saioa",
+    "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.",
+    "This means only administrators can use the instance." : "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
+    "Thank you for your patience." : "Milesker zure patzientziagatik.",
+    "You are accessing the server from an untrusted domain." : "Zerbitzaria domeinu ez fidagarri batetik eskuratzen ari zara.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mesedez harremanetan jarri kudeatzailearekin. Zu kudeatzailea bazara, konfiguratu \"trusted_domain\" ezarpena config/config.php fitxategian. Adibidezko konfigurazko bat  config/config.sample.php fitxategian dago.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Zure ezarpenen gorabehera, administratzaile bezala posible duzu ere azpiko botoia erabiltzea fidatzeko domeinu horrekin.",
+    "Add \"%s\" as trusted domain" : "Gehitu \"%s\" domeinu fidagarri gisa",
+    "%s will be updated to version %s." : "%s %s bertsiora eguneratuko da.",
+    "The following apps will be disabled:" : "Ondorengo aplikazioak desgaituko dira:",
+    "The theme %s has been disabled." : "%s gaia desgaitu da.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
+    "Start update" : "Hasi eguneraketa",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
new file mode 100644
index 00000000000..5bd339cd793
--- /dev/null
+++ b/core/l10n/eu.json
@@ -0,0 +1,190 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
+    "Turned on maintenance mode" : "Mantenu modua gaitu da",
+    "Turned off maintenance mode" : "Mantenu modua desgaitu da",
+    "Updated database" : "Datu basea eguneratu da",
+    "Checked database schema update" : "Egiaztatuta datu-basearen zerbitzariaren eguneraketa",
+    "Checked database schema update for apps" : "Egiaztatuta aplikazioen datu-basearen zerbitzariaren eguneraketa",
+    "Updated \"%s\" to %s" : "\"%s\" %s-ra eguneratua",
+    "Disabled incompatible apps: %s" : "Bateragarriak ez diren desgaitutako aplikazioak: %s",
+    "No image or file provided" : "Ez da irudi edo fitxategirik zehaztu",
+    "Unknown filetype" : "Fitxategi mota ezezaguna",
+    "Invalid image" : "Baliogabeko irudia",
+    "No temporary profile picture available, try again" : "Ez dago behin-behineko profil irudirik, saiatu berriro",
+    "No crop data provided" : "Ez da ebaketarako daturik zehaztu",
+    "Sunday" : "Igandea",
+    "Monday" : "Astelehena",
+    "Tuesday" : "Asteartea",
+    "Wednesday" : "Asteazkena",
+    "Thursday" : "Osteguna",
+    "Friday" : "Ostirala",
+    "Saturday" : "Larunbata",
+    "January" : "Urtarrila",
+    "February" : "Otsaila",
+    "March" : "Martxoa",
+    "April" : "Apirila",
+    "May" : "Maiatza",
+    "June" : "Ekaina",
+    "July" : "Uztaila",
+    "August" : "Abuztua",
+    "September" : "Iraila",
+    "October" : "Urria",
+    "November" : "Azaroa",
+    "December" : "Abendua",
+    "Settings" : "Ezarpenak",
+    "File" : "Fitxategia",
+    "Folder" : "Karpeta",
+    "Image" : "Irudia",
+    "Audio" : "Audio",
+    "Saving..." : "Gordetzen...",
+    "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?",
+    "I know what I'm doing" : "Badakit zer ari naizen egiten",
+    "Reset password" : "Berrezarri pasahitza",
+    "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
+    "No" : "Ez",
+    "Yes" : "Bai",
+    "Choose" : "Aukeratu",
+    "Error loading file picker template: {error}" : "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
+    "Ok" : "Ados",
+    "Error loading message template: {error}" : "Errorea mezu txantiloia kargatzean: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"],
+    "One file conflict" : "Fitxategi batek konfliktua sortu du",
+    "New Files" : "Fitxategi Berriak",
+    "Already existing files" : "Dagoeneko existitzen diren fitxategiak",
+    "Which files do you want to keep?" : "Ze fitxategi mantendu nahi duzu?",
+    "If you select both versions, the copied file will have a number added to its name." : "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio.",
+    "Cancel" : "Ezeztatu",
+    "Continue" : "Jarraitu",
+    "(all selected)" : "(denak hautatuta)",
+    "({count} selected)" : "({count} hautatuta)",
+    "Error loading file exists template" : "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
+    "Very weak password" : "Pasahitz oso ahula",
+    "Weak password" : "Pasahitz ahula",
+    "So-so password" : "Halamoduzko pasahitza",
+    "Good password" : "Pasahitz ona",
+    "Strong password" : "Pasahitz sendoa",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
+    "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." : "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+    "Shared" : "Elkarbanatuta",
+    "Shared with {recipients}" : "{recipients}-rekin partekatua.",
+    "Share" : "Elkarbanatu",
+    "Error" : "Errorea",
+    "Error while sharing" : "Errore bat egon da elkarbanatzean",
+    "Error while unsharing" : "Errore bat egon da elkarbanaketa desegitean",
+    "Error while changing permissions" : "Errore bat egon da baimenak aldatzean",
+    "Shared with you and the group {group} by {owner}" : "{owner}-k zu eta {group} taldearekin elkarbanatuta",
+    "Shared with you by {owner}" : "{owner}-k zurekin elkarbanatuta",
+    "Share with user or group …" : "Elkarbanatu erabiltzaile edo taldearekin...",
+    "Share link" : "Elkarbanatu lotura",
+    "The public link will expire no later than {days} days after it is created" : "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
+    "Password protect" : "Babestu pasahitzarekin",
+    "Choose a password for the public link" : "Aukeratu pasahitz bat esteka publikorako",
+    "Allow Public Upload" : "Gaitu igotze publikoa",
+    "Email link to person" : "Postaz bidali lotura ",
+    "Send" : "Bidali",
+    "Set expiration date" : "Ezarri muga data",
+    "Expiration date" : "Muga data",
+    "group" : "taldea",
+    "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",
+    "can share" : "elkarbana dezake",
+    "can edit" : "editatu dezake",
+    "access control" : "sarrera kontrola",
+    "create" : "sortu",
+    "update" : "eguneratu",
+    "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",
+    "Warning" : "Abisua",
+    "The object type is not specified." : "Objetu mota ez dago zehaztuta.",
+    "Enter new" : "Sartu berria",
+    "Delete" : "Ezabatu",
+    "Add" : "Gehitu",
+    "Edit tags" : "Editatu etiketak",
+    "Error loading dialog template: {error}" : "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
+    "No tags selected for deletion." : "Ez dira ezabatzeko etiketak hautatu.",
+    "Updating {productName} to version {version}, this may take a while." : "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
+    "Please reload the page." : "Mesedez birkargatu orria.",
+    "The update was unsuccessful." : "Eguneraketak ez du arrakasta izan.",
+    "The update was successful. Redirecting you to ownCloud now." : "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
+    "Couldn't reset password because the token is invalid" : "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
+    "%s password reset" : "%s pasahitza berrezarri",
+    "Use the following link to reset your password: {link}" : "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
+    "You will receive a link to reset your password via Email." : "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
+    "Username" : "Erabiltzaile izena",
+    "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?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
+    "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut",
+    "Reset" : "Berrezarri",
+    "New password" : "Pasahitz berria",
+    "New Password" : "Pasahitz Berria",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
+    "Personal" : "Pertsonala",
+    "Users" : "Erabiltzaileak",
+    "Apps" : "Aplikazioak",
+    "Admin" : "Admin",
+    "Help" : "Laguntza",
+    "Error loading tags" : "Errore bat izan da etiketak kargatzearkoan.",
+    "Tag already exists" : "Etiketa dagoeneko existitzen da",
+    "Error deleting tag(s)" : "Errore bat izan da etiketa(k) ezabatzerakoan",
+    "Error tagging" : "Errorea etiketa ezartzerakoan",
+    "Error untagging" : "Errorea etiketa kentzerakoan",
+    "Error favoriting" : "Errorea gogokoetara gehitzerakoan",
+    "Error unfavoriting" : "Errorea gogokoetatik kentzerakoan",
+    "Access forbidden" : "Sarrera debekatuta",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
+    "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
+    "Cheers!" : "Ongi izan!",
+    "Security Warning" : "Segurtasun abisua",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
+    "Please update your PHP installation to use %s securely." : "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
+    "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
+    "Password" : "Pasahitza",
+    "Storage & database" : "Biltegia & datubasea",
+    "Data folder" : "Datuen karpeta",
+    "Configure the database" : "Konfiguratu datu basea",
+    "Only %s is available." : "Soilik %s dago eskuragarri.",
+    "Database user" : "Datubasearen erabiltzailea",
+    "Database password" : "Datubasearen pasahitza",
+    "Database name" : "Datubasearen izena",
+    "Database tablespace" : "Datu basearen taula-lekua",
+    "Database host" : "Datubasearen hostalaria",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
+    "Finish setup" : "Bukatu konfigurazioa",
+    "Finishing …" : "Bukatzen...",
+    "%s is available. Get more information on how to update." : "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
+    "Log out" : "Saioa bukatu",
+    "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
+    "Please contact your administrator." : "Mesedez jarri harremetan zure administradorearekin.",
+    "Forgot your password? Reset it!" : "Pasahitza ahaztu duzu? Berrezarri!",
+    "remember" : "gogoratu",
+    "Log in" : "Hasi saioa",
+    "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.",
+    "This means only administrators can use the instance." : "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
+    "Thank you for your patience." : "Milesker zure patzientziagatik.",
+    "You are accessing the server from an untrusted domain." : "Zerbitzaria domeinu ez fidagarri batetik eskuratzen ari zara.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mesedez harremanetan jarri kudeatzailearekin. Zu kudeatzailea bazara, konfiguratu \"trusted_domain\" ezarpena config/config.php fitxategian. Adibidezko konfigurazko bat  config/config.sample.php fitxategian dago.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Zure ezarpenen gorabehera, administratzaile bezala posible duzu ere azpiko botoia erabiltzea fidatzeko domeinu horrekin.",
+    "Add \"%s\" as trusted domain" : "Gehitu \"%s\" domeinu fidagarri gisa",
+    "%s will be updated to version %s." : "%s %s bertsiora eguneratuko da.",
+    "The following apps will be disabled:" : "Ondorengo aplikazioak desgaituko dira:",
+    "The theme %s has been disabled." : "%s gaia desgaitu da.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
+    "Start update" : "Hasi eguneraketa",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
deleted file mode 100644
index e2fef47647f..00000000000
--- a/core/l10n/eu.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Ezin izan da posta bidali hurrengo erabiltzaileei: %s",
-"Turned on maintenance mode" => "Mantenu modua gaitu da",
-"Turned off maintenance mode" => "Mantenu modua desgaitu da",
-"Updated database" => "Datu basea eguneratu da",
-"Checked database schema update" => "Egiaztatuta datu-basearen zerbitzariaren eguneraketa",
-"Checked database schema update for apps" => "Egiaztatuta aplikazioen datu-basearen zerbitzariaren eguneraketa",
-"Updated \"%s\" to %s" => "\"%s\" %s-ra eguneratua",
-"Disabled incompatible apps: %s" => "Bateragarriak ez diren desgaitutako aplikazioak: %s",
-"No image or file provided" => "Ez da irudi edo fitxategirik zehaztu",
-"Unknown filetype" => "Fitxategi mota ezezaguna",
-"Invalid image" => "Baliogabeko irudia",
-"No temporary profile picture available, try again" => "Ez dago behin-behineko profil irudirik, saiatu berriro",
-"No crop data provided" => "Ez da ebaketarako daturik zehaztu",
-"Sunday" => "Igandea",
-"Monday" => "Astelehena",
-"Tuesday" => "Asteartea",
-"Wednesday" => "Asteazkena",
-"Thursday" => "Osteguna",
-"Friday" => "Ostirala",
-"Saturday" => "Larunbata",
-"January" => "Urtarrila",
-"February" => "Otsaila",
-"March" => "Martxoa",
-"April" => "Apirila",
-"May" => "Maiatza",
-"June" => "Ekaina",
-"July" => "Uztaila",
-"August" => "Abuztua",
-"September" => "Iraila",
-"October" => "Urria",
-"November" => "Azaroa",
-"December" => "Abendua",
-"Settings" => "Ezarpenak",
-"File" => "Fitxategia",
-"Folder" => "Karpeta",
-"Image" => "Irudia",
-"Audio" => "Audio",
-"Saving..." => "Gordetzen...",
-"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?",
-"I know what I'm doing" => "Badakit zer ari naizen egiten",
-"Reset password" => "Berrezarri pasahitza",
-"Password can not be changed. Please contact your administrator." => "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
-"No" => "Ez",
-"Yes" => "Bai",
-"Choose" => "Aukeratu",
-"Error loading file picker template: {error}" => "Errorea fitxategi hautatzaile txantiloiak kargatzerakoan: {error}",
-"Ok" => "Ados",
-"Error loading message template: {error}" => "Errorea mezu txantiloia kargatzean: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("fitxategi {count}ek konfliktua sortu du","{count} fitxategik konfliktua sortu dute"),
-"One file conflict" => "Fitxategi batek konfliktua sortu du",
-"New Files" => "Fitxategi Berriak",
-"Already existing files" => "Dagoeneko existitzen diren fitxategiak",
-"Which files do you want to keep?" => "Ze fitxategi mantendu nahi duzu?",
-"If you select both versions, the copied file will have a number added to its name." => "Bi bertsioak hautatzen badituzu, kopiatutako fitxategiaren izenean zenbaki bat atxikituko zaio.",
-"Cancel" => "Ezeztatu",
-"Continue" => "Jarraitu",
-"(all selected)" => "(denak hautatuta)",
-"({count} selected)" => "({count} hautatuta)",
-"Error loading file exists template" => "Errorea fitxategia existitzen da txantiloiak kargatzerakoan",
-"Very weak password" => "Pasahitz oso ahula",
-"Weak password" => "Pasahitz ahula",
-"So-so password" => "Halamoduzko pasahitza",
-"Good password" => "Pasahitz ona",
-"Strong password" => "Pasahitz sendoa",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
-"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." => "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
-"Error occurred while checking server setup" => "Errore bat gertatu da zerbitzariaren konfigurazioa egiaztatzerakoan.",
-"Shared" => "Elkarbanatuta",
-"Shared with {recipients}" => "{recipients}-rekin partekatua.",
-"Share" => "Elkarbanatu",
-"Error" => "Errorea",
-"Error while sharing" => "Errore bat egon da elkarbanatzean",
-"Error while unsharing" => "Errore bat egon da elkarbanaketa desegitean",
-"Error while changing permissions" => "Errore bat egon da baimenak aldatzean",
-"Shared with you and the group {group} by {owner}" => "{owner}-k zu eta {group} taldearekin elkarbanatuta",
-"Shared with you by {owner}" => "{owner}-k zurekin elkarbanatuta",
-"Share with user or group …" => "Elkarbanatu erabiltzaile edo taldearekin...",
-"Share link" => "Elkarbanatu lotura",
-"The public link will expire no later than {days} days after it is created" => "Esteka publikoak iraungi egingo du, askoz jota, sortu eta  {days} egunetara.",
-"Password protect" => "Babestu pasahitzarekin",
-"Choose a password for the public link" => "Aukeratu pasahitz bat esteka publikorako",
-"Allow Public Upload" => "Gaitu igotze publikoa",
-"Email link to person" => "Postaz bidali lotura ",
-"Send" => "Bidali",
-"Set expiration date" => "Ezarri muga data",
-"Expiration date" => "Muga data",
-"Adding user..." => "Erabiltzailea gehitzen...",
-"group" => "taldea",
-"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",
-"can share" => "elkarbana dezake",
-"can edit" => "editatu dezake",
-"access control" => "sarrera kontrola",
-"create" => "sortu",
-"update" => "eguneratu",
-"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",
-"Warning" => "Abisua",
-"The object type is not specified." => "Objetu mota ez dago zehaztuta.",
-"Enter new" => "Sartu berria",
-"Delete" => "Ezabatu",
-"Add" => "Gehitu",
-"Edit tags" => "Editatu etiketak",
-"Error loading dialog template: {error}" => "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
-"No tags selected for deletion." => "Ez dira ezabatzeko etiketak hautatu.",
-"Updating {productName} to version {version}, this may take a while." => "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
-"Please reload the page." => "Mesedez birkargatu orria.",
-"The update was unsuccessful." => "Eguneraketak ez du arrakasta izan.",
-"The update was successful. Redirecting you to ownCloud now." => "Eguneraketa ongi egin da. Orain zure ownClouderea berbideratua izango zara.",
-"Couldn't reset password because the token is invalid" => "Ezin izan da pasahitza berrezarri tokena baliogabea delako",
-"Couldn't send reset email. Please make sure your username is correct." => "Ezin izan da berrezartzeko eposta bidali. Ziurtatu zure erabiltzaile izena egokia dela.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
-"%s password reset" => "%s pasahitza berrezarri",
-"Use the following link to reset your password: {link}" => "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
-"You will receive a link to reset your password via Email." => "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
-"Username" => "Erabiltzaile izena",
-"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?" => "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
-"Yes, I really want to reset my password now" => "Bai, nire pasahitza orain berrabiarazi nahi dut",
-"Reset" => "Berrezarri",
-"New password" => "Pasahitz berria",
-"New Password" => "Pasahitz Berria",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
-"For the best results, please consider using a GNU/Linux server instead." => "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
-"Personal" => "Pertsonala",
-"Users" => "Erabiltzaileak",
-"Apps" => "Aplikazioak",
-"Admin" => "Admin",
-"Help" => "Laguntza",
-"Error loading tags" => "Errore bat izan da etiketak kargatzearkoan.",
-"Tag already exists" => "Etiketa dagoeneko existitzen da",
-"Error deleting tag(s)" => "Errore bat izan da etiketa(k) ezabatzerakoan",
-"Error tagging" => "Errorea etiketa ezartzerakoan",
-"Error untagging" => "Errorea etiketa kentzerakoan",
-"Error favoriting" => "Errorea gogokoetara gehitzerakoan",
-"Error unfavoriting" => "Errorea gogokoetatik kentzerakoan",
-"Access forbidden" => "Sarrera debekatuta",
-"File not found" => "Ez da fitxategia aurkitu",
-"The specified document has not been found on the server." => "Zehaztutako dokumentua ez da zerbitzarian aurkitu.",
-"You can click here to return to %s." => "Hemen klika dezakezu %sra itzultzeko.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
-"The share will expire on %s." => "Elkarbanaketa %s-n iraungiko da.",
-"Cheers!" => "Ongi izan!",
-"Internal Server Error" => "Zerbitzariaren Barne Errorea",
-"The server encountered an internal error and was unable to complete your request." => "Zerbitzariak barne errore bat izan du eta ez da gai izan zure eskaria osatzeko.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Mesedez harremanetan jarri zerbitzariaren kudeatzailearekin errore hau aldi askotan agertzekotan, mesedez gehitu beheko zehaztapen teknikoak zure txostenean.",
-"More details can be found in the server log." => "Zehaztapen gehiago zerbitzariaren egunerokoan aurki daitezke.",
-"Technical details" => "Arazo teknikoak",
-"Remote Address: %s" => "Urruneko Helbidea: %s",
-"Request ID: %s" => "Eskariaren IDa: %s",
-"Code: %s" => "Kodea: %s",
-"Message: %s" => "Mezua: %s",
-"File: %s" => "Fitxategia: %s",
-"Line: %s" => "Lerroa: %s",
-"Trace" => "Arrastoa",
-"Security Warning" => "Segurtasun abisua",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
-"Please update your PHP installation to use %s securely." => "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
-"Create an <strong>admin account</strong>" => "Sortu <strong>kudeatzaile kontu<strong> bat",
-"Password" => "Pasahitza",
-"Storage & database" => "Biltegia & datubasea",
-"Data folder" => "Datuen karpeta",
-"Configure the database" => "Konfiguratu datu basea",
-"Only %s is available." => "Soilik %s dago eskuragarri.",
-"Database user" => "Datubasearen erabiltzailea",
-"Database password" => "Datubasearen pasahitza",
-"Database name" => "Datubasearen izena",
-"Database tablespace" => "Datu basearen taula-lekua",
-"Database host" => "Datubasearen hostalaria",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
-"Finish setup" => "Bukatu konfigurazioa",
-"Finishing …" => "Bukatzen...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Aplikazio honek ongi funtzionatzeko JavaScript behar du. Mesedez  <a href=\"http://enable-javascript.com/\" target=\"_blank\">gaitu JavaScript</a> eta birkargatu orri hau.",
-"%s is available. Get more information on how to update." => "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
-"Log out" => "Saioa bukatu",
-"Server side authentication failed!" => "Zerbitzari aldeko autentifikazioak huts egin du!",
-"Please contact your administrator." => "Mesedez jarri harremetan zure administradorearekin.",
-"Forgot your password? Reset it!" => "Pasahitza ahaztu duzu? Berrezarri!",
-"remember" => "gogoratu",
-"Log in" => "Hasi saioa",
-"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.",
-"This means only administrators can use the instance." => "Honek administradoreak bakarrik erabili dezakeela esan nahi du.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Jarri harremanetan zure sistema administratzailearekin mezu hau irauten badu edo bat-batean agertu bada.",
-"Thank you for your patience." => "Milesker zure patzientziagatik.",
-"You are accessing the server from an untrusted domain." => "Zerbitzaria domeinu ez fidagarri batetik eskuratzen ari zara.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Mesedez harremanetan jarri kudeatzailearekin. Zu kudeatzailea bazara, konfiguratu \"trusted_domain\" ezarpena config/config.php fitxategian. Adibidezko konfigurazko bat  config/config.sample.php fitxategian dago.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Zure ezarpenen gorabehera, administratzaile bezala posible duzu ere azpiko botoia erabiltzea fidatzeko domeinu horrekin.",
-"Add \"%s\" as trusted domain" => "Gehitu \"%s\" domeinu fidagarri gisa",
-"%s will be updated to version %s." => "%s %s bertsiora eguneratuko da.",
-"The following apps will be disabled:" => "Ondorengo aplikazioak desgaituko dira:",
-"The theme %s has been disabled." => "%s gaia desgaitu da.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
-"Start update" => "Hasi eguneraketa",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:",
-"This %s instance is currently being updated, which may take a while." => "%s instantzia hau eguneratzen ari da, honek denbora har dezake.",
-"This page will refresh itself when the %s instance is available again." => "Orri honek bere burua eguneratuko du %s instantzia berriz prest dagoenean."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/eu_ES.js b/core/l10n/eu_ES.js
new file mode 100644
index 00000000000..5f64fb906bd
--- /dev/null
+++ b/core/l10n/eu_ES.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "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
new file mode 100644
index 00000000000..083ff038d8d
--- /dev/null
+++ b/core/l10n/eu_ES.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Ezeztatu",
+    "Delete" : "Ezabatu",
+    "Personal" : "Pertsonala"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/eu_ES.php b/core/l10n/eu_ES.php
deleted file mode 100644
index 92e64924b61..00000000000
--- a/core/l10n/eu_ES.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Ezeztatu",
-"Delete" => "Ezabatu",
-"Personal" => "Pertsonala"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
new file mode 100644
index 00000000000..e6951221983
--- /dev/null
+++ b/core/l10n/fa.js
@@ -0,0 +1,152 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s",
+    "Turned on maintenance mode" : "حالت \" در دست تعمیر \" فعال شد .",
+    "Turned off maintenance mode" : "حالت \" در دست تعمیر \" غیرفعال شد .",
+    "Updated database" : "بروز رسانی پایگاه داده انجام شد .",
+    "Disabled incompatible apps: %s" : "اپ های ناسازگار غیرفعال شدند : %s",
+    "No image or file provided" : "هیچ فایل یا تصویری وارد نشده است",
+    "Unknown filetype" : "نوع فایل ناشناخته",
+    "Invalid image" : "عکس نامعتبر",
+    "No temporary profile picture available, try again" : "تصویر پروفایل موقت در حال حاضر در دسترس نیست ، دوباره تلاش کنید ",
+    "Sunday" : "یکشنبه",
+    "Monday" : "دوشنبه",
+    "Tuesday" : "سه شنبه",
+    "Wednesday" : "چهارشنبه",
+    "Thursday" : "پنجشنبه",
+    "Friday" : "جمعه",
+    "Saturday" : "شنبه",
+    "January" : "ژانویه",
+    "February" : "فبریه",
+    "March" : "مارس",
+    "April" : "آوریل",
+    "May" : "می",
+    "June" : "ژوئن",
+    "July" : "جولای",
+    "August" : "آگوست",
+    "September" : "سپتامبر",
+    "October" : "اکتبر",
+    "November" : "نوامبر",
+    "December" : "دسامبر",
+    "Settings" : "تنظیمات",
+    "File" : "فایل",
+    "Folder" : "پوشه",
+    "Image" : "تصویر",
+    "Audio" : "صدا",
+    "Saving..." : "در حال ذخیره سازی...",
+    "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?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
+    "I know what I'm doing" : "اطلاع از انجام این کار دارم",
+    "Reset password" : "تنظیم مجدد رمز عبور",
+    "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
+    "No" : "نه",
+    "Yes" : "بله",
+    "Choose" : "انتخاب کردن",
+    "Error loading file picker template: {error}" : "خطا در بارگذاری قالب انتخاب فایل : {error}",
+    "Ok" : "قبول",
+    "Error loading message template: {error}" : "خطا در بارگذاری قالب پیام : {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "One file conflict" : "یک فایل متضاد",
+    "New Files" : "فایل های جدید",
+    "Already existing files" : "فایل های موجود در حال حاضر ",
+    "Which files do you want to keep?" : "کدام فایل ها را می خواهید نگه دارید ؟",
+    "Cancel" : "منصرف شدن",
+    "Continue" : "ادامه",
+    "(all selected)" : "(همه انتخاب شده اند)",
+    "({count} selected)" : "({count} انتخاب شده)",
+    "Very weak password" : "رمز عبور بسیار ضعیف",
+    "Weak password" : "رمز عبور ضعیف",
+    "So-so password" : "رمز عبور متوسط",
+    "Good password" : "رمز عبور خوب",
+    "Strong password" : "رمز عبور قوی",
+    "Your web server is not yet properly setup to allow files 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 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." : "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
+    "Shared" : "اشتراک گذاشته شده",
+    "Shared with {recipients}" : "به اشتراک گذاشته شده با {recipients}",
+    "Share" : "اشتراک‌گذاری",
+    "Error" : "خطا",
+    "Error while sharing" : "خطا درحال به اشتراک گذاشتن",
+    "Error while unsharing" : "خطا درحال لغو اشتراک",
+    "Error while changing permissions" : "خطا در حال تغییر مجوز",
+    "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
+    "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
+    "Share with user or group …" : "به اشتراک گذاری با کاربر یا گروه",
+    "Share link" : "اشتراک گذاشتن لینک",
+    "Password protect" : "نگهداری کردن رمز عبور",
+    "Allow Public Upload" : "اجازه آپلود عمومی",
+    "Email link to person" : "پیوند ایمیل برای شخص.",
+    "Send" : "ارسال",
+    "Set expiration date" : "تنظیم تاریخ انقضا",
+    "Expiration date" : "تاریخ انقضا",
+    "group" : "گروه",
+    "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
+    "Shared in {item} with {user}" : "به اشتراک گذاشته شده در {بخش} با {کاربر}",
+    "Unshare" : "لغو اشتراک",
+    "notify by email" : "دریافت هشدار از طریق ایمیل",
+    "can share" : "قابل به اشتراک گذاری",
+    "can edit" : "می توان ویرایش کرد",
+    "access control" : "کنترل دسترسی",
+    "create" : "ایجاد",
+    "update" : "به روز",
+    "delete" : "پاک کردن",
+    "Password protected" : "نگهداری از رمز عبور",
+    "Error unsetting expiration date" : "خطا در تنظیم نکردن تاریخ انقضا ",
+    "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
+    "Sending ..." : "درحال ارسال ...",
+    "Email sent" : "ایمیل ارسال شد",
+    "Warning" : "اخطار",
+    "The object type is not specified." : "نوع شی تعیین نشده است.",
+    "Enter new" : "مورد جدید را وارد کنید",
+    "Delete" : "حذف",
+    "Add" : "افزودن",
+    "Edit tags" : "ویرایش تگ ها",
+    "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
+    "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
+    "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
+    "You will receive a link to reset your password via Email." : "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
+    "Username" : "نام کاربری",
+    "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?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
+    "Yes, I really want to reset my password now" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
+    "Reset" : "تنظیم مجدد",
+    "New password" : "گذرواژه جدید",
+    "Personal" : "شخصی",
+    "Users" : "کاربران",
+    "Apps" : "  برنامه ها",
+    "Admin" : "مدیر",
+    "Help" : "راه‌نما",
+    "Error loading tags" : "خطا در هنگام بارگزاری تگ ها",
+    "Tag already exists" : "تگ از قبل وجود دارد",
+    "Error deleting tag(s)" : "خطا در هنگام حذف تگ (ها)",
+    "Error tagging" : "خطا در هنگام تگ گذاری",
+    "Error untagging" : "خطا در هنگام حذف تگ",
+    "Error favoriting" : "خطا هنگام افزودن به موارد محبوب",
+    "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
+    "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
+    "Cheers!" : "سلامتی!",
+    "Security Warning" : "اخطار امنیتی",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
+    "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+    "Password" : "گذرواژه",
+    "Storage & database" : "انبارش و پایگاه داده",
+    "Data folder" : "پوشه اطلاعاتی",
+    "Configure the database" : "پایگاه داده برنامه ریزی شدند",
+    "Only %s is available." : "تنها %s موجود است.",
+    "Database user" : "شناسه پایگاه داده",
+    "Database password" : "پسورد پایگاه داده",
+    "Database name" : "نام پایگاه داده",
+    "Database tablespace" : "جدول پایگاه داده",
+    "Database host" : "هاست پایگاه داده",
+    "Finish setup" : "اتمام نصب",
+    "Finishing …" : "در حال اتمام ...",
+    "%s is available. Get more information on how to update." : "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید.",
+    "Log out" : "خروج",
+    "remember" : "بیاد آوری",
+    "Log in" : "ورود",
+    "Alternative Logins" : "ورود متناوب",
+    "Thank you for your patience." : "از صبر شما متشکریم",
+    "Start update" : "اغاز به روز رسانی"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
new file mode 100644
index 00000000000..80b130bdcde
--- /dev/null
+++ b/core/l10n/fa.json
@@ -0,0 +1,150 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s",
+    "Turned on maintenance mode" : "حالت \" در دست تعمیر \" فعال شد .",
+    "Turned off maintenance mode" : "حالت \" در دست تعمیر \" غیرفعال شد .",
+    "Updated database" : "بروز رسانی پایگاه داده انجام شد .",
+    "Disabled incompatible apps: %s" : "اپ های ناسازگار غیرفعال شدند : %s",
+    "No image or file provided" : "هیچ فایل یا تصویری وارد نشده است",
+    "Unknown filetype" : "نوع فایل ناشناخته",
+    "Invalid image" : "عکس نامعتبر",
+    "No temporary profile picture available, try again" : "تصویر پروفایل موقت در حال حاضر در دسترس نیست ، دوباره تلاش کنید ",
+    "Sunday" : "یکشنبه",
+    "Monday" : "دوشنبه",
+    "Tuesday" : "سه شنبه",
+    "Wednesday" : "چهارشنبه",
+    "Thursday" : "پنجشنبه",
+    "Friday" : "جمعه",
+    "Saturday" : "شنبه",
+    "January" : "ژانویه",
+    "February" : "فبریه",
+    "March" : "مارس",
+    "April" : "آوریل",
+    "May" : "می",
+    "June" : "ژوئن",
+    "July" : "جولای",
+    "August" : "آگوست",
+    "September" : "سپتامبر",
+    "October" : "اکتبر",
+    "November" : "نوامبر",
+    "December" : "دسامبر",
+    "Settings" : "تنظیمات",
+    "File" : "فایل",
+    "Folder" : "پوشه",
+    "Image" : "تصویر",
+    "Audio" : "صدا",
+    "Saving..." : "در حال ذخیره سازی...",
+    "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?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
+    "I know what I'm doing" : "اطلاع از انجام این کار دارم",
+    "Reset password" : "تنظیم مجدد رمز عبور",
+    "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
+    "No" : "نه",
+    "Yes" : "بله",
+    "Choose" : "انتخاب کردن",
+    "Error loading file picker template: {error}" : "خطا در بارگذاری قالب انتخاب فایل : {error}",
+    "Ok" : "قبول",
+    "Error loading message template: {error}" : "خطا در بارگذاری قالب پیام : {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "One file conflict" : "یک فایل متضاد",
+    "New Files" : "فایل های جدید",
+    "Already existing files" : "فایل های موجود در حال حاضر ",
+    "Which files do you want to keep?" : "کدام فایل ها را می خواهید نگه دارید ؟",
+    "Cancel" : "منصرف شدن",
+    "Continue" : "ادامه",
+    "(all selected)" : "(همه انتخاب شده اند)",
+    "({count} selected)" : "({count} انتخاب شده)",
+    "Very weak password" : "رمز عبور بسیار ضعیف",
+    "Weak password" : "رمز عبور ضعیف",
+    "So-so password" : "رمز عبور متوسط",
+    "Good password" : "رمز عبور خوب",
+    "Strong password" : "رمز عبور قوی",
+    "Your web server is not yet properly setup to allow files 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 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." : "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
+    "Shared" : "اشتراک گذاشته شده",
+    "Shared with {recipients}" : "به اشتراک گذاشته شده با {recipients}",
+    "Share" : "اشتراک‌گذاری",
+    "Error" : "خطا",
+    "Error while sharing" : "خطا درحال به اشتراک گذاشتن",
+    "Error while unsharing" : "خطا درحال لغو اشتراک",
+    "Error while changing permissions" : "خطا در حال تغییر مجوز",
+    "Shared with you and the group {group} by {owner}" : "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
+    "Shared with you by {owner}" : "به اشتراک گذاشته شده با شما توسط { دارنده}",
+    "Share with user or group …" : "به اشتراک گذاری با کاربر یا گروه",
+    "Share link" : "اشتراک گذاشتن لینک",
+    "Password protect" : "نگهداری کردن رمز عبور",
+    "Allow Public Upload" : "اجازه آپلود عمومی",
+    "Email link to person" : "پیوند ایمیل برای شخص.",
+    "Send" : "ارسال",
+    "Set expiration date" : "تنظیم تاریخ انقضا",
+    "Expiration date" : "تاریخ انقضا",
+    "group" : "گروه",
+    "Resharing is not allowed" : "اشتراک گذاری مجدد مجاز نمی باشد",
+    "Shared in {item} with {user}" : "به اشتراک گذاشته شده در {بخش} با {کاربر}",
+    "Unshare" : "لغو اشتراک",
+    "notify by email" : "دریافت هشدار از طریق ایمیل",
+    "can share" : "قابل به اشتراک گذاری",
+    "can edit" : "می توان ویرایش کرد",
+    "access control" : "کنترل دسترسی",
+    "create" : "ایجاد",
+    "update" : "به روز",
+    "delete" : "پاک کردن",
+    "Password protected" : "نگهداری از رمز عبور",
+    "Error unsetting expiration date" : "خطا در تنظیم نکردن تاریخ انقضا ",
+    "Error setting expiration date" : "خطا در تنظیم تاریخ انقضا",
+    "Sending ..." : "درحال ارسال ...",
+    "Email sent" : "ایمیل ارسال شد",
+    "Warning" : "اخطار",
+    "The object type is not specified." : "نوع شی تعیین نشده است.",
+    "Enter new" : "مورد جدید را وارد کنید",
+    "Delete" : "حذف",
+    "Add" : "افزودن",
+    "Edit tags" : "ویرایش تگ ها",
+    "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
+    "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
+    "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
+    "You will receive a link to reset your password via Email." : "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
+    "Username" : "نام کاربری",
+    "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?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
+    "Yes, I really want to reset my password now" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
+    "Reset" : "تنظیم مجدد",
+    "New password" : "گذرواژه جدید",
+    "Personal" : "شخصی",
+    "Users" : "کاربران",
+    "Apps" : "  برنامه ها",
+    "Admin" : "مدیر",
+    "Help" : "راه‌نما",
+    "Error loading tags" : "خطا در هنگام بارگزاری تگ ها",
+    "Tag already exists" : "تگ از قبل وجود دارد",
+    "Error deleting tag(s)" : "خطا در هنگام حذف تگ (ها)",
+    "Error tagging" : "خطا در هنگام تگ گذاری",
+    "Error untagging" : "خطا در هنگام حذف تگ",
+    "Error favoriting" : "خطا هنگام افزودن به موارد محبوب",
+    "Error unfavoriting" : "خطا هنگام حذف از موارد محبوب",
+    "Access forbidden" : "اجازه دسترسی به مناطق ممنوعه را ندارید",
+    "Cheers!" : "سلامتی!",
+    "Security Warning" : "اخطار امنیتی",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
+    "Create an <strong>admin account</strong>" : "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
+    "Password" : "گذرواژه",
+    "Storage & database" : "انبارش و پایگاه داده",
+    "Data folder" : "پوشه اطلاعاتی",
+    "Configure the database" : "پایگاه داده برنامه ریزی شدند",
+    "Only %s is available." : "تنها %s موجود است.",
+    "Database user" : "شناسه پایگاه داده",
+    "Database password" : "پسورد پایگاه داده",
+    "Database name" : "نام پایگاه داده",
+    "Database tablespace" : "جدول پایگاه داده",
+    "Database host" : "هاست پایگاه داده",
+    "Finish setup" : "اتمام نصب",
+    "Finishing …" : "در حال اتمام ...",
+    "%s is available. Get more information on how to update." : "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید.",
+    "Log out" : "خروج",
+    "remember" : "بیاد آوری",
+    "Log in" : "ورود",
+    "Alternative Logins" : "ورود متناوب",
+    "Thank you for your patience." : "از صبر شما متشکریم",
+    "Start update" : "اغاز به روز رسانی"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
deleted file mode 100644
index 6506102e360..00000000000
--- a/core/l10n/fa.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "ارسال ایمیل برای کاربران روبرو با شکست مواجه شد : %s",
-"Turned on maintenance mode" => "حالت \" در دست تعمیر \" فعال شد .",
-"Turned off maintenance mode" => "حالت \" در دست تعمیر \" غیرفعال شد .",
-"Updated database" => "بروز رسانی پایگاه داده انجام شد .",
-"Disabled incompatible apps: %s" => "اپ های ناسازگار غیرفعال شدند : %s",
-"No image or file provided" => "هیچ فایل یا تصویری وارد نشده است",
-"Unknown filetype" => "نوع فایل ناشناخته",
-"Invalid image" => "عکس نامعتبر",
-"No temporary profile picture available, try again" => "تصویر پروفایل موقت در حال حاضر در دسترس نیست ، دوباره تلاش کنید ",
-"Sunday" => "یکشنبه",
-"Monday" => "دوشنبه",
-"Tuesday" => "سه شنبه",
-"Wednesday" => "چهارشنبه",
-"Thursday" => "پنجشنبه",
-"Friday" => "جمعه",
-"Saturday" => "شنبه",
-"January" => "ژانویه",
-"February" => "فبریه",
-"March" => "مارس",
-"April" => "آوریل",
-"May" => "می",
-"June" => "ژوئن",
-"July" => "جولای",
-"August" => "آگوست",
-"September" => "سپتامبر",
-"October" => "اکتبر",
-"November" => "نوامبر",
-"December" => "دسامبر",
-"Settings" => "تنظیمات",
-"File" => "فایل",
-"Folder" => "پوشه",
-"Image" => "تصویر",
-"Audio" => "صدا",
-"Saving..." => "در حال ذخیره سازی...",
-"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?" => "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
-"I know what I'm doing" => "اطلاع از انجام این کار دارم",
-"Reset password" => "تنظیم مجدد رمز عبور",
-"Password can not be changed. Please contact your administrator." => "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
-"No" => "نه",
-"Yes" => "بله",
-"Choose" => "انتخاب کردن",
-"Error loading file picker template: {error}" => "خطا در بارگذاری قالب انتخاب فایل : {error}",
-"Ok" => "قبول",
-"Error loading message template: {error}" => "خطا در بارگذاری قالب پیام : {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"One file conflict" => "یک فایل متضاد",
-"New Files" => "فایل های جدید",
-"Already existing files" => "فایل های موجود در حال حاضر ",
-"Which files do you want to keep?" => "کدام فایل ها را می خواهید نگه دارید ؟",
-"Cancel" => "منصرف شدن",
-"Continue" => "ادامه",
-"(all selected)" => "(همه انتخاب شده اند)",
-"({count} selected)" => "({count} انتخاب شده)",
-"Very weak password" => "رمز عبور بسیار ضعیف",
-"Weak password" => "رمز عبور ضعیف",
-"So-so password" => "رمز عبور متوسط",
-"Good password" => "رمز عبور خوب",
-"Strong password" => "رمز عبور قوی",
-"Your web server is not yet properly setup to allow files 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 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." => "این سرور ارتباط اینترنتی ندارد. این بدین معناست که بعضی از امکانات نظیر مرتبط سازی یک منبع ذخیره‌ی خارجی، اطلاعات رسانی در مورد بروزرسانی‌ها یا نصب برنامه های جانبی کار نمی‌کنند. دسترسی به فایل ها از راه دور و ارسال اطلاع رسانی توسط ایمیل ممکن است همچنان کار نکند. ما پیشنهاد می‌کنیم که ارتباط اینترنتی مربوط به این سرور را فعال کنید تا تمامی امکانات را در اختیار داشته باشید.",
-"Shared" => "اشتراک گذاشته شده",
-"Shared with {recipients}" => "به اشتراک گذاشته شده با {recipients}",
-"Share" => "اشتراک‌گذاری",
-"Error" => "خطا",
-"Error while sharing" => "خطا درحال به اشتراک گذاشتن",
-"Error while unsharing" => "خطا درحال لغو اشتراک",
-"Error while changing permissions" => "خطا در حال تغییر مجوز",
-"Shared with you and the group {group} by {owner}" => "به اشتراک گذاشته شده با شما و گروه {گروه} توسط {دارنده}",
-"Shared with you by {owner}" => "به اشتراک گذاشته شده با شما توسط { دارنده}",
-"Share with user or group …" => "به اشتراک گذاری با کاربر یا گروه",
-"Share link" => "اشتراک گذاشتن لینک",
-"Password protect" => "نگهداری کردن رمز عبور",
-"Allow Public Upload" => "اجازه آپلود عمومی",
-"Email link to person" => "پیوند ایمیل برای شخص.",
-"Send" => "ارسال",
-"Set expiration date" => "تنظیم تاریخ انقضا",
-"Expiration date" => "تاریخ انقضا",
-"group" => "گروه",
-"Resharing is not allowed" => "اشتراک گذاری مجدد مجاز نمی باشد",
-"Shared in {item} with {user}" => "به اشتراک گذاشته شده در {بخش} با {کاربر}",
-"Unshare" => "لغو اشتراک",
-"notify by email" => "دریافت هشدار از طریق ایمیل",
-"can share" => "قابل به اشتراک گذاری",
-"can edit" => "می توان ویرایش کرد",
-"access control" => "کنترل دسترسی",
-"create" => "ایجاد",
-"update" => "به روز",
-"delete" => "پاک کردن",
-"Password protected" => "نگهداری از رمز عبور",
-"Error unsetting expiration date" => "خطا در تنظیم نکردن تاریخ انقضا ",
-"Error setting expiration date" => "خطا در تنظیم تاریخ انقضا",
-"Sending ..." => "درحال ارسال ...",
-"Email sent" => "ایمیل ارسال شد",
-"Warning" => "اخطار",
-"The object type is not specified." => "نوع شی تعیین نشده است.",
-"Enter new" => "مورد جدید را وارد کنید",
-"Delete" => "حذف",
-"Add" => "افزودن",
-"Edit tags" => "ویرایش تگ ها",
-"The update was unsuccessful." => "بروزرسانی موفقیت آمیز نبود.",
-"The update was successful. Redirecting you to ownCloud now." => "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
-"Use the following link to reset your password: {link}" => "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
-"You will receive a link to reset your password via Email." => "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
-"Username" => "نام کاربری",
-"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?" => "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
-"Yes, I really want to reset my password now" => "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
-"Reset" => "تنظیم مجدد",
-"New password" => "گذرواژه جدید",
-"Personal" => "شخصی",
-"Users" => "کاربران",
-"Apps" => "  برنامه ها",
-"Admin" => "مدیر",
-"Help" => "راه‌نما",
-"Error loading tags" => "خطا در هنگام بارگزاری تگ ها",
-"Tag already exists" => "تگ از قبل وجود دارد",
-"Error deleting tag(s)" => "خطا در هنگام حذف تگ (ها)",
-"Error tagging" => "خطا در هنگام تگ گذاری",
-"Error untagging" => "خطا در هنگام حذف تگ",
-"Error favoriting" => "خطا هنگام افزودن به موارد محبوب",
-"Error unfavoriting" => "خطا هنگام حذف از موارد محبوب",
-"Access forbidden" => "اجازه دسترسی به مناطق ممنوعه را ندارید",
-"Cheers!" => "سلامتی!",
-"Security Warning" => "اخطار امنیتی",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "فایلها و فهرست های داده های شما قابل از اینترنت قابل دسترسی هستند، چونکه فایل htacces. کار نمی کند.",
-"Create an <strong>admin account</strong>" => "لطفا یک <strong> شناسه برای مدیر</strong> بسازید",
-"Password" => "گذرواژه",
-"Storage & database" => "انبارش و پایگاه داده",
-"Data folder" => "پوشه اطلاعاتی",
-"Configure the database" => "پایگاه داده برنامه ریزی شدند",
-"Only %s is available." => "تنها %s موجود است.",
-"Database user" => "شناسه پایگاه داده",
-"Database password" => "پسورد پایگاه داده",
-"Database name" => "نام پایگاه داده",
-"Database tablespace" => "جدول پایگاه داده",
-"Database host" => "هاست پایگاه داده",
-"Finish setup" => "اتمام نصب",
-"Finishing …" => "در حال اتمام ...",
-"%s is available. Get more information on how to update." => "%s در دسترس است. برای چگونگی به روز رسانی اطلاعات بیشتر را دریافت نمایید.",
-"Log out" => "خروج",
-"remember" => "بیاد آوری",
-"Log in" => "ورود",
-"Alternative Logins" => "ورود متناوب",
-"Thank you for your patience." => "از صبر شما متشکریم",
-"Start update" => "اغاز به روز رسانی"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
new file mode 100644
index 00000000000..b7924c1710c
--- /dev/null
+++ b/core/l10n/fi_FI.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
+    "Turned on maintenance mode" : "Siirrytty ylläpitotilaan",
+    "Turned off maintenance mode" : "Ylläpitotila laitettu pois päältä",
+    "Updated database" : "Tietokanta ajan tasalla",
+    "Checked database schema update" : "Tarkistettu tietokannan skeemapäivitys",
+    "Updated \"%s\" to %s" : "Päivitetty \"%s\" versioon %s",
+    "Disabled incompatible apps: %s" : "Yhteensopimattomat sovellukset poistettiin käytöstä: %s",
+    "No image or file provided" : "Kuvaa tai tiedostoa ei määritelty",
+    "Unknown filetype" : "Tuntematon tiedostotyyppi",
+    "Invalid image" : "Virhellinen kuva",
+    "No temporary profile picture available, try again" : "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen",
+    "No crop data provided" : "Puutteellinen tieto",
+    "Sunday" : "sunnuntai",
+    "Monday" : "maanantai",
+    "Tuesday" : "tiistai",
+    "Wednesday" : "keskiviikko",
+    "Thursday" : "torstai",
+    "Friday" : "perjantai",
+    "Saturday" : "lauantai",
+    "January" : "tammikuu",
+    "February" : "helmikuu",
+    "March" : "maaliskuu",
+    "April" : "huhtikuu",
+    "May" : "toukokuu",
+    "June" : "kesäkuu",
+    "July" : "heinäkuu",
+    "August" : "elokuu",
+    "September" : "syyskuu",
+    "October" : "lokakuu",
+    "November" : "marraskuu",
+    "December" : "joulukuu",
+    "Settings" : "Asetukset",
+    "File" : "Tiedosto",
+    "Folder" : "Kansio",
+    "Image" : "Kuva",
+    "Audio" : "Ääni",
+    "Saving..." : "Tallennetaan...",
+    "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
+    "I know what I'm doing" : "Tiedän mitä teen",
+    "Reset password" : "Palauta salasana",
+    "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
+    "No" : "Ei",
+    "Yes" : "Kyllä",
+    "Choose" : "Valitse",
+    "Error loading file picker template: {error}" : "Virhe ladatessa tiedostopohjia: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Virhe ladatessa viestipohjaa: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} tiedoston ristiriita","{count} tiedoston ristiriita"],
+    "One file conflict" : "Yhden tiedoston ristiriita",
+    "New Files" : "Uudet tiedostot",
+    "Already existing files" : "Jo olemassa olevat tiedostot",
+    "Which files do you want to keep?" : "Mitkä tiedostot haluat säilyttää?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.",
+    "Cancel" : "Peru",
+    "Continue" : "Jatka",
+    "(all selected)" : "(kaikki valittu)",
+    "({count} selected)" : "({count} valittu)",
+    "Error loading file exists template" : "Virhe ladatessa mallipohjaa",
+    "Very weak password" : "Erittäin heikko salasana",
+    "Weak password" : "Heikko salasana",
+    "So-so password" : "Kohtalainen salasana",
+    "Good password" : "Hyvä salasana",
+    "Strong password" : "Vahva salasana",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
+    "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." : "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillisten tallennustilojen liittäminen, ilmoitukset päivityksistä tai kolmansien osapuolten sovellusten asentaminen eivät toimi. Tiedostojen käyttäminen etäältä ja ilmoitusten lähettäminen sähköpostitse eivät myöskään välttämättä toimi. Jos haluat käyttää kaikkia palvelimen ominaisuuksia, kytke palvelin internetiin.",
+    "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
+    "Shared" : "Jaettu",
+    "Shared with {recipients}" : "Jaettu henkilöiden {recipients} kanssa",
+    "Share" : "Jaa",
+    "Error" : "Virhe",
+    "Error while sharing" : "Virhe jaettaessa",
+    "Error while unsharing" : "Virhe jakoa peruttaessa",
+    "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 user or group …" : "Jaa käyttäjän tai ryhmän kanssa…",
+    "Share link" : "Jaa linkki",
+    "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
+    "Password protect" : "Suojaa salasanalla",
+    "Choose a password for the public link" : "Valitse salasana julkiselle linkille",
+    "Allow Public Upload" : "Salli julkinen lähetys",
+    "Email link to person" : "Lähetä linkki sähköpostitse",
+    "Send" : "Lähetä",
+    "Set expiration date" : "Aseta päättymispäivä",
+    "Expiration date" : "Päättymispäivä",
+    "Adding user..." : "Lisätään käyttäjä...",
+    "group" : "ryhmä",
+    "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",
+    "can share" : "jaa",
+    "can edit" : "voi muokata",
+    "access control" : "Pääsyn hallinta",
+    "create" : "luo",
+    "update" : "päivitä",
+    "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",
+    "Warning" : "Varoitus",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Kirjoita uusi",
+    "Delete" : "Poista",
+    "Add" : "Lisää",
+    "Edit tags" : "Muokkaa tunnisteita",
+    "Error loading dialog template: {error}" : "Virhe ladatessa keskustelupohja: {error}",
+    "No tags selected for deletion." : "Tunnisteita ei valittu poistettavaksi.",
+    "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
+    "Please reload the page." : "Päivitä sivu.",
+    "The update was unsuccessful." : "Päivitys epäonnistui.",
+    "The update was successful. Redirecting you to ownCloud now." : "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
+    "Couldn't reset password because the token is invalid" : "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
+    "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
+    "%s password reset" : "%s salasanan palautus",
+    "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+    "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.",
+    "Username" : "Käyttäjätunnus",
+    "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?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
+    "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt",
+    "Reset" : "Palauta salasana",
+    "New password" : "Uusi salasana",
+    "New Password" : "Uusi salasana",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
+    "Personal" : "Henkilökohtainen",
+    "Users" : "Käyttäjät",
+    "Apps" : "Sovellukset",
+    "Admin" : "Ylläpito",
+    "Help" : "Ohje",
+    "Error loading tags" : "Virhe tunnisteita ladattaessa",
+    "Tag already exists" : "Tunniste on jo olemassa",
+    "Error deleting tag(s)" : "Virhe tunnisteita poistaessa",
+    "Error tagging" : "Tunnisteiden kirjoitusvirhe",
+    "Error untagging" : "Tunisteiden poisto virhe",
+    "Error favoriting" : "Suosituksen kirjoitusvirhe",
+    "Error unfavoriting" : "Suosituksen poisto virhe",
+    "Access forbidden" : "Pääsy estetty",
+    "File not found" : "Tiedostoa ei löytynyt",
+    "The specified document has not been found on the server." : "Määritettyä asiakirjaa ei löytynyt palvelimelta.",
+    "You can click here to return to %s." : "Napsauta tästä palataksesi %siin.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
+    "The share will expire on %s." : "Jakaminen päättyy %s.",
+    "Cheers!" : "Kippis!",
+    "Internal Server Error" : "Sisäinen palvelinvirhe",
+    "The server encountered an internal error and was unable to complete your request." : "Palvelin kohtasi sisäisen virheen, eikä pystynyt viimeistelmään pyyntöäsi.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Ota yhteys palvelimen ylläpitäjään, jos tämä virhe ilmenee useita kertoja. Lisää yhteydenottoosi alla olevat tekniset tiedot.",
+    "More details can be found in the server log." : "Lisätietoja on palvelimen lokitiedostossa.",
+    "Technical details" : "Tekniset tiedot",
+    "Remote Address: %s" : "Etäosoite: %s",
+    "Request ID: %s" : "Pyynnön tunniste: %s",
+    "Code: %s" : "Koodi: %s",
+    "Message: %s" : "Viesti: %s",
+    "File: %s" : "Tiedosto: %s",
+    "Line: %s" : "Rivi: %s",
+    "Trace" : "Jälki",
+    "Security Warning" : "Turvallisuusvaroitus",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
+    "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
+    "Password" : "Salasana",
+    "Storage & database" : "Tallennus ja tietokanta",
+    "Data folder" : "Datakansio",
+    "Configure the database" : "Muokkaa tietokantaa",
+    "Only %s is available." : "Vain %s on käytettävissä.",
+    "Database user" : "Tietokannan käyttäjä",
+    "Database password" : "Tietokannan salasana",
+    "Database name" : "Tietokannan nimi",
+    "Database tablespace" : "Tietokannan taulukkotila",
+    "Database host" : "Tietokantapalvelin",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
+    "Finish setup" : "Viimeistele asennus",
+    "Finishing …" : "Valmistellaan…",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tämä sovellus vaatii JavaScript-tuen toimiakseen. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä sivu.",
+    "%s is available. Get more information on how to update." : "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
+    "Log out" : "Kirjaudu ulos",
+    "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!",
+    "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
+    "Forgot your password? Reset it!" : "Unohditko salasanasi? Palauta se!",
+    "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.",
+    "This means only administrators can use the instance." : "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
+    "Thank you for your patience." : "Kiitos kärsivällisyydestäsi.",
+    "You are accessing the server from an untrusted domain." : "Olet yhteydessä palvelimeen epäluotettavasta verkko-osoitteesta.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ota yhteys ylläpitäjään. Jos olet tämän ownCloudin ylläpitäjä, määritä \"trusted_domain\"-asetus tiedostossa config/config.php. Esimerkkimääritys on nähtävillä tiedostossa config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Riippuen määrityksistä, ylläpitäjänä saatat kyetä käyttämään alla olevaa painiketta luodaksesi luottamussuhteen tähän toimialueeseen.",
+    "Add \"%s\" as trusted domain" : "Lisää \"%s\" luotetuksi toimialueeksi",
+    "%s will be updated to version %s." : "%s päivitetään versioon %s.",
+    "The following apps will be disabled:" : "Seuraavat sovellukset poistetaan käytöstä:",
+    "The theme %s has been disabled." : "Teema %s on poistettu käytöstä.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
+    "Start update" : "Käynnistä päivitys",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Välttääksesi aikakatkaisuja suurikokoisten asennusten kanssa, voit suorittaa vaihtoehtoisesti seuraavan komennon asennushakemistossa:",
+    "This %s instance is currently being updated, which may take a while." : "Tätä %s-asennusta päivitetään parhaillaan, päivityksessä saattaa kestää hetki.",
+    "This page will refresh itself when the %s instance is available again." : "Tämä sivu päivittää itsensä, kun %s on jälleen käytettävissä."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
new file mode 100644
index 00000000000..0b5c5dcb4fc
--- /dev/null
+++ b/core/l10n/fi_FI.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
+    "Turned on maintenance mode" : "Siirrytty ylläpitotilaan",
+    "Turned off maintenance mode" : "Ylläpitotila laitettu pois päältä",
+    "Updated database" : "Tietokanta ajan tasalla",
+    "Checked database schema update" : "Tarkistettu tietokannan skeemapäivitys",
+    "Updated \"%s\" to %s" : "Päivitetty \"%s\" versioon %s",
+    "Disabled incompatible apps: %s" : "Yhteensopimattomat sovellukset poistettiin käytöstä: %s",
+    "No image or file provided" : "Kuvaa tai tiedostoa ei määritelty",
+    "Unknown filetype" : "Tuntematon tiedostotyyppi",
+    "Invalid image" : "Virhellinen kuva",
+    "No temporary profile picture available, try again" : "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen",
+    "No crop data provided" : "Puutteellinen tieto",
+    "Sunday" : "sunnuntai",
+    "Monday" : "maanantai",
+    "Tuesday" : "tiistai",
+    "Wednesday" : "keskiviikko",
+    "Thursday" : "torstai",
+    "Friday" : "perjantai",
+    "Saturday" : "lauantai",
+    "January" : "tammikuu",
+    "February" : "helmikuu",
+    "March" : "maaliskuu",
+    "April" : "huhtikuu",
+    "May" : "toukokuu",
+    "June" : "kesäkuu",
+    "July" : "heinäkuu",
+    "August" : "elokuu",
+    "September" : "syyskuu",
+    "October" : "lokakuu",
+    "November" : "marraskuu",
+    "December" : "joulukuu",
+    "Settings" : "Asetukset",
+    "File" : "Tiedosto",
+    "Folder" : "Kansio",
+    "Image" : "Kuva",
+    "Audio" : "Ääni",
+    "Saving..." : "Tallennetaan...",
+    "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
+    "I know what I'm doing" : "Tiedän mitä teen",
+    "Reset password" : "Palauta salasana",
+    "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
+    "No" : "Ei",
+    "Yes" : "Kyllä",
+    "Choose" : "Valitse",
+    "Error loading file picker template: {error}" : "Virhe ladatessa tiedostopohjia: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Virhe ladatessa viestipohjaa: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} tiedoston ristiriita","{count} tiedoston ristiriita"],
+    "One file conflict" : "Yhden tiedoston ristiriita",
+    "New Files" : "Uudet tiedostot",
+    "Already existing files" : "Jo olemassa olevat tiedostot",
+    "Which files do you want to keep?" : "Mitkä tiedostot haluat säilyttää?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.",
+    "Cancel" : "Peru",
+    "Continue" : "Jatka",
+    "(all selected)" : "(kaikki valittu)",
+    "({count} selected)" : "({count} valittu)",
+    "Error loading file exists template" : "Virhe ladatessa mallipohjaa",
+    "Very weak password" : "Erittäin heikko salasana",
+    "Weak password" : "Heikko salasana",
+    "So-so password" : "Kohtalainen salasana",
+    "Good password" : "Hyvä salasana",
+    "Strong password" : "Vahva salasana",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
+    "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." : "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillisten tallennustilojen liittäminen, ilmoitukset päivityksistä tai kolmansien osapuolten sovellusten asentaminen eivät toimi. Tiedostojen käyttäminen etäältä ja ilmoitusten lähettäminen sähköpostitse eivät myöskään välttämättä toimi. Jos haluat käyttää kaikkia palvelimen ominaisuuksia, kytke palvelin internetiin.",
+    "Error occurred while checking server setup" : "Virhe palvelimen määrityksiä tarkistaessa",
+    "Shared" : "Jaettu",
+    "Shared with {recipients}" : "Jaettu henkilöiden {recipients} kanssa",
+    "Share" : "Jaa",
+    "Error" : "Virhe",
+    "Error while sharing" : "Virhe jaettaessa",
+    "Error while unsharing" : "Virhe jakoa peruttaessa",
+    "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 user or group …" : "Jaa käyttäjän tai ryhmän kanssa…",
+    "Share link" : "Jaa linkki",
+    "The public link will expire no later than {days} days after it is created" : "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
+    "Password protect" : "Suojaa salasanalla",
+    "Choose a password for the public link" : "Valitse salasana julkiselle linkille",
+    "Allow Public Upload" : "Salli julkinen lähetys",
+    "Email link to person" : "Lähetä linkki sähköpostitse",
+    "Send" : "Lähetä",
+    "Set expiration date" : "Aseta päättymispäivä",
+    "Expiration date" : "Päättymispäivä",
+    "Adding user..." : "Lisätään käyttäjä...",
+    "group" : "ryhmä",
+    "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",
+    "can share" : "jaa",
+    "can edit" : "voi muokata",
+    "access control" : "Pääsyn hallinta",
+    "create" : "luo",
+    "update" : "päivitä",
+    "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",
+    "Warning" : "Varoitus",
+    "The object type is not specified." : "The object type is not specified.",
+    "Enter new" : "Kirjoita uusi",
+    "Delete" : "Poista",
+    "Add" : "Lisää",
+    "Edit tags" : "Muokkaa tunnisteita",
+    "Error loading dialog template: {error}" : "Virhe ladatessa keskustelupohja: {error}",
+    "No tags selected for deletion." : "Tunnisteita ei valittu poistettavaksi.",
+    "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
+    "Please reload the page." : "Päivitä sivu.",
+    "The update was unsuccessful." : "Päivitys epäonnistui.",
+    "The update was successful. Redirecting you to ownCloud now." : "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
+    "Couldn't reset password because the token is invalid" : "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
+    "Couldn't send reset email. Please make sure your username is correct." : "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
+    "%s password reset" : "%s salasanan palautus",
+    "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
+    "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.",
+    "Username" : "Käyttäjätunnus",
+    "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?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
+    "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt",
+    "Reset" : "Palauta salasana",
+    "New password" : "Uusi salasana",
+    "New Password" : "Uusi salasana",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
+    "Personal" : "Henkilökohtainen",
+    "Users" : "Käyttäjät",
+    "Apps" : "Sovellukset",
+    "Admin" : "Ylläpito",
+    "Help" : "Ohje",
+    "Error loading tags" : "Virhe tunnisteita ladattaessa",
+    "Tag already exists" : "Tunniste on jo olemassa",
+    "Error deleting tag(s)" : "Virhe tunnisteita poistaessa",
+    "Error tagging" : "Tunnisteiden kirjoitusvirhe",
+    "Error untagging" : "Tunisteiden poisto virhe",
+    "Error favoriting" : "Suosituksen kirjoitusvirhe",
+    "Error unfavoriting" : "Suosituksen poisto virhe",
+    "Access forbidden" : "Pääsy estetty",
+    "File not found" : "Tiedostoa ei löytynyt",
+    "The specified document has not been found on the server." : "Määritettyä asiakirjaa ei löytynyt palvelimelta.",
+    "You can click here to return to %s." : "Napsauta tästä palataksesi %siin.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
+    "The share will expire on %s." : "Jakaminen päättyy %s.",
+    "Cheers!" : "Kippis!",
+    "Internal Server Error" : "Sisäinen palvelinvirhe",
+    "The server encountered an internal error and was unable to complete your request." : "Palvelin kohtasi sisäisen virheen, eikä pystynyt viimeistelmään pyyntöäsi.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Ota yhteys palvelimen ylläpitäjään, jos tämä virhe ilmenee useita kertoja. Lisää yhteydenottoosi alla olevat tekniset tiedot.",
+    "More details can be found in the server log." : "Lisätietoja on palvelimen lokitiedostossa.",
+    "Technical details" : "Tekniset tiedot",
+    "Remote Address: %s" : "Etäosoite: %s",
+    "Request ID: %s" : "Pyynnön tunniste: %s",
+    "Code: %s" : "Koodi: %s",
+    "Message: %s" : "Viesti: %s",
+    "File: %s" : "Tiedosto: %s",
+    "Line: %s" : "Rivi: %s",
+    "Trace" : "Jälki",
+    "Security Warning" : "Turvallisuusvaroitus",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
+    "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
+    "Password" : "Salasana",
+    "Storage & database" : "Tallennus ja tietokanta",
+    "Data folder" : "Datakansio",
+    "Configure the database" : "Muokkaa tietokantaa",
+    "Only %s is available." : "Vain %s on käytettävissä.",
+    "Database user" : "Tietokannan käyttäjä",
+    "Database password" : "Tietokannan salasana",
+    "Database name" : "Tietokannan nimi",
+    "Database tablespace" : "Tietokannan taulukkotila",
+    "Database host" : "Tietokantapalvelin",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
+    "Finish setup" : "Viimeistele asennus",
+    "Finishing …" : "Valmistellaan…",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Tämä sovellus vaatii JavaScript-tuen toimiakseen. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä sivu.",
+    "%s is available. Get more information on how to update." : "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
+    "Log out" : "Kirjaudu ulos",
+    "Server side authentication failed!" : "Palvelimen puoleinen tunnistautuminen epäonnistui!",
+    "Please contact your administrator." : "Ota yhteys ylläpitäjään.",
+    "Forgot your password? Reset it!" : "Unohditko salasanasi? Palauta se!",
+    "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.",
+    "This means only administrators can use the instance." : "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
+    "Thank you for your patience." : "Kiitos kärsivällisyydestäsi.",
+    "You are accessing the server from an untrusted domain." : "Olet yhteydessä palvelimeen epäluotettavasta verkko-osoitteesta.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ota yhteys ylläpitäjään. Jos olet tämän ownCloudin ylläpitäjä, määritä \"trusted_domain\"-asetus tiedostossa config/config.php. Esimerkkimääritys on nähtävillä tiedostossa config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Riippuen määrityksistä, ylläpitäjänä saatat kyetä käyttämään alla olevaa painiketta luodaksesi luottamussuhteen tähän toimialueeseen.",
+    "Add \"%s\" as trusted domain" : "Lisää \"%s\" luotetuksi toimialueeksi",
+    "%s will be updated to version %s." : "%s päivitetään versioon %s.",
+    "The following apps will be disabled:" : "Seuraavat sovellukset poistetaan käytöstä:",
+    "The theme %s has been disabled." : "Teema %s on poistettu käytöstä.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
+    "Start update" : "Käynnistä päivitys",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Välttääksesi aikakatkaisuja suurikokoisten asennusten kanssa, voit suorittaa vaihtoehtoisesti seuraavan komennon asennushakemistossa:",
+    "This %s instance is currently being updated, which may take a while." : "Tätä %s-asennusta päivitetään parhaillaan, päivityksessä saattaa kestää hetki.",
+    "This page will refresh itself when the %s instance is available again." : "Tämä sivu päivittää itsensä, kun %s on jälleen käytettävissä."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
deleted file mode 100644
index e72bc5b8e7d..00000000000
--- a/core/l10n/fi_FI.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Sähköpostin lähetys seuraaville käyttäjille epäonnistui: %s",
-"Turned on maintenance mode" => "Siirrytty ylläpitotilaan",
-"Turned off maintenance mode" => "Ylläpitotila laitettu pois päältä",
-"Updated database" => "Tietokanta ajan tasalla",
-"Checked database schema update" => "Tarkistettu tietokannan skeemapäivitys",
-"Updated \"%s\" to %s" => "Päivitetty \"%s\" versioon %s",
-"Disabled incompatible apps: %s" => "Yhteensopimattomat sovellukset poistettiin käytöstä: %s",
-"No image or file provided" => "Kuvaa tai tiedostoa ei määritelty",
-"Unknown filetype" => "Tuntematon tiedostotyyppi",
-"Invalid image" => "Virhellinen kuva",
-"No temporary profile picture available, try again" => "Väliaikaista profiilikuvaa ei ole käytettävissä, yritä uudelleen",
-"No crop data provided" => "Puutteellinen tieto",
-"Sunday" => "sunnuntai",
-"Monday" => "maanantai",
-"Tuesday" => "tiistai",
-"Wednesday" => "keskiviikko",
-"Thursday" => "torstai",
-"Friday" => "perjantai",
-"Saturday" => "lauantai",
-"January" => "tammikuu",
-"February" => "helmikuu",
-"March" => "maaliskuu",
-"April" => "huhtikuu",
-"May" => "toukokuu",
-"June" => "kesäkuu",
-"July" => "heinäkuu",
-"August" => "elokuu",
-"September" => "syyskuu",
-"October" => "lokakuu",
-"November" => "marraskuu",
-"December" => "joulukuu",
-"Settings" => "Asetukset",
-"File" => "Tiedosto",
-"Folder" => "Kansio",
-"Image" => "Kuva",
-"Audio" => "Ääni",
-"Saving..." => "Tallennetaan...",
-"Couldn't send reset email. Please contact your administrator." => "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
-"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
-"I know what I'm doing" => "Tiedän mitä teen",
-"Reset password" => "Palauta salasana",
-"Password can not be changed. Please contact your administrator." => "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
-"No" => "Ei",
-"Yes" => "Kyllä",
-"Choose" => "Valitse",
-"Error loading file picker template: {error}" => "Virhe ladatessa tiedostopohjia: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Virhe ladatessa viestipohjaa: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} tiedoston ristiriita","{count} tiedoston ristiriita"),
-"One file conflict" => "Yhden tiedoston ristiriita",
-"New Files" => "Uudet tiedostot",
-"Already existing files" => "Jo olemassa olevat tiedostot",
-"Which files do you want to keep?" => "Mitkä tiedostot haluat säilyttää?",
-"If you select both versions, the copied file will have a number added to its name." => "Jos valitset kummatkin versiot, kopioidun tiedoston nimeen lisätään numero.",
-"Cancel" => "Peru",
-"Continue" => "Jatka",
-"(all selected)" => "(kaikki valittu)",
-"({count} selected)" => "({count} valittu)",
-"Error loading file exists template" => "Virhe ladatessa mallipohjaa",
-"Very weak password" => "Erittäin heikko salasana",
-"Weak password" => "Heikko salasana",
-"So-so password" => "Kohtalainen salasana",
-"Good password" => "Hyvä salasana",
-"Strong password" => "Vahva salasana",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web-palvelimen asetukset eivät ole kelvolliset tiedostojen synkronointia varten, koska WebDAV-liitäntä vaikuttaa olevan rikki.",
-"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." => "Tällä palvelimella ei ole toimivaa internetyhteyttä. Sen seurauksena jotkin ominaisuudet, kuten erillisten tallennustilojen liittäminen, ilmoitukset päivityksistä tai kolmansien osapuolten sovellusten asentaminen eivät toimi. Tiedostojen käyttäminen etäältä ja ilmoitusten lähettäminen sähköpostitse eivät myöskään välttämättä toimi. Jos haluat käyttää kaikkia palvelimen ominaisuuksia, kytke palvelin internetiin.",
-"Error occurred while checking server setup" => "Virhe palvelimen määrityksiä tarkistaessa",
-"Shared" => "Jaettu",
-"Shared with {recipients}" => "Jaettu henkilöiden {recipients} kanssa",
-"Share" => "Jaa",
-"Error" => "Virhe",
-"Error while sharing" => "Virhe jaettaessa",
-"Error while unsharing" => "Virhe jakoa peruttaessa",
-"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 user or group …" => "Jaa käyttäjän tai ryhmän kanssa…",
-"Share link" => "Jaa linkki",
-"The public link will expire no later than {days} days after it is created" => "Julkinen linkki vanhenee {days} päivän jälkeen sen luomisesta",
-"Password protect" => "Suojaa salasanalla",
-"Choose a password for the public link" => "Valitse salasana julkiselle linkille",
-"Allow Public Upload" => "Salli julkinen lähetys",
-"Email link to person" => "Lähetä linkki sähköpostitse",
-"Send" => "Lähetä",
-"Set expiration date" => "Aseta päättymispäivä",
-"Expiration date" => "Päättymispäivä",
-"Adding user..." => "Lisätään käyttäjä...",
-"group" => "ryhmä",
-"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",
-"can share" => "jaa",
-"can edit" => "voi muokata",
-"access control" => "Pääsyn hallinta",
-"create" => "luo",
-"update" => "päivitä",
-"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",
-"Warning" => "Varoitus",
-"The object type is not specified." => "The object type is not specified.",
-"Enter new" => "Kirjoita uusi",
-"Delete" => "Poista",
-"Add" => "Lisää",
-"Edit tags" => "Muokkaa tunnisteita",
-"Error loading dialog template: {error}" => "Virhe ladatessa keskustelupohja: {error}",
-"No tags selected for deletion." => "Tunnisteita ei valittu poistettavaksi.",
-"Updating {productName} to version {version}, this may take a while." => "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
-"Please reload the page." => "Päivitä sivu.",
-"The update was unsuccessful." => "Päivitys epäonnistui.",
-"The update was successful. Redirecting you to ownCloud now." => "Päivitys onnistui. Selain ohjautuu nyt ownCloudiisi.",
-"Couldn't reset password because the token is invalid" => "Salasanaa ei voitu palauttaa koska valtuutus on virheellinen",
-"Couldn't send reset email. Please make sure your username is correct." => "Palautussähköpostin lähettäminen ei onnistunut. Varmista, että käyttäjätunnuksesi on oikein.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
-"%s password reset" => "%s salasanan palautus",
-"Use the following link to reset your password: {link}" => "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
-"You will receive a link to reset your password via Email." => "Saat sähköpostitse linkin palauttaaksesi salasanan.",
-"Username" => "Käyttäjätunnus",
-"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?" => "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
-"Yes, I really want to reset my password now" => "Kyllä, haluan palauttaa salasanani nyt",
-"Reset" => "Palauta salasana",
-"New password" => "Uusi salasana",
-"New Password" => "Uusi salasana",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
-"For the best results, please consider using a GNU/Linux server instead." => "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
-"Personal" => "Henkilökohtainen",
-"Users" => "Käyttäjät",
-"Apps" => "Sovellukset",
-"Admin" => "Ylläpito",
-"Help" => "Ohje",
-"Error loading tags" => "Virhe tunnisteita ladattaessa",
-"Tag already exists" => "Tunniste on jo olemassa",
-"Error deleting tag(s)" => "Virhe tunnisteita poistaessa",
-"Error tagging" => "Tunnisteiden kirjoitusvirhe",
-"Error untagging" => "Tunisteiden poisto virhe",
-"Error favoriting" => "Suosituksen kirjoitusvirhe",
-"Error unfavoriting" => "Suosituksen poisto virhe",
-"Access forbidden" => "Pääsy estetty",
-"File not found" => "Tiedostoa ei löytynyt",
-"The specified document has not been found on the server." => "Määritettyä asiakirjaa ei löytynyt palvelimelta.",
-"You can click here to return to %s." => "Napsauta tästä palataksesi %siin.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei sinä!\n\n%s jakoi kohteen %s kanssasi.\nTutustu siihen: %s\n\n",
-"The share will expire on %s." => "Jakaminen päättyy %s.",
-"Cheers!" => "Kippis!",
-"Internal Server Error" => "Sisäinen palvelinvirhe",
-"The server encountered an internal error and was unable to complete your request." => "Palvelin kohtasi sisäisen virheen, eikä pystynyt viimeistelmään pyyntöäsi.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Ota yhteys palvelimen ylläpitäjään, jos tämä virhe ilmenee useita kertoja. Lisää yhteydenottoosi alla olevat tekniset tiedot.",
-"More details can be found in the server log." => "Lisätietoja on palvelimen lokitiedostossa.",
-"Technical details" => "Tekniset tiedot",
-"Remote Address: %s" => "Etäosoite: %s",
-"Request ID: %s" => "Pyynnön tunniste: %s",
-"Code: %s" => "Koodi: %s",
-"Message: %s" => "Viesti: %s",
-"File: %s" => "Tiedosto: %s",
-"Line: %s" => "Rivi: %s",
-"Trace" => "Jälki",
-"Security Warning" => "Turvallisuusvaroitus",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-asennuksesi on haavoittuvainen NULL Byte -hyökkäykselle (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Päivitä PHP-asennus varmistaaksesi, että %s on turvallinen käyttää.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
-"Create an <strong>admin account</strong>" => "Luo <strong>ylläpitäjän tunnus</strong>",
-"Password" => "Salasana",
-"Storage & database" => "Tallennus ja tietokanta",
-"Data folder" => "Datakansio",
-"Configure the database" => "Muokkaa tietokantaa",
-"Only %s is available." => "Vain %s on käytettävissä.",
-"Database user" => "Tietokannan käyttäjä",
-"Database password" => "Tietokannan salasana",
-"Database name" => "Tietokannan nimi",
-"Database tablespace" => "Tietokannan taulukkotila",
-"Database host" => "Tietokantapalvelin",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. ",
-"Finish setup" => "Viimeistele asennus",
-"Finishing …" => "Valmistellaan…",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Tämä sovellus vaatii JavaScript-tuen toimiakseen. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Ota JavaScript käyttöön</a> ja päivitä sivu.",
-"%s is available. Get more information on how to update." => "%s on saatavilla. Lue lisätietoja, miten päivitys asennetaan.",
-"Log out" => "Kirjaudu ulos",
-"Server side authentication failed!" => "Palvelimen puoleinen tunnistautuminen epäonnistui!",
-"Please contact your administrator." => "Ota yhteys ylläpitäjään.",
-"Forgot your password? Reset it!" => "Unohditko salasanasi? Palauta se!",
-"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.",
-"This means only administrators can use the instance." => "Se tarkoittaa, että vain ylläpitäjät voivat nyt käyttää tätä ownCloudia.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Ota yhteys järjestelmän ylläpitäjään, jos tämä viesti ilmenee uudelleen tai odottamatta.",
-"Thank you for your patience." => "Kiitos kärsivällisyydestäsi.",
-"You are accessing the server from an untrusted domain." => "Olet yhteydessä palvelimeen epäluotettavasta verkko-osoitteesta.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Ota yhteys ylläpitäjään. Jos olet tämän ownCloudin ylläpitäjä, määritä \"trusted_domain\"-asetus tiedostossa config/config.php. Esimerkkimääritys on nähtävillä tiedostossa config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Riippuen määrityksistä, ylläpitäjänä saatat kyetä käyttämään alla olevaa painiketta luodaksesi luottamussuhteen tähän toimialueeseen.",
-"Add \"%s\" as trusted domain" => "Lisää \"%s\" luotetuksi toimialueeksi",
-"%s will be updated to version %s." => "%s päivitetään versioon %s.",
-"The following apps will be disabled:" => "Seuraavat sovellukset poistetaan käytöstä:",
-"The theme %s has been disabled." => "Teema %s on poistettu käytöstä.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Varmista ennen jatkamista, että tietokanta, asetuskansio ja datakansio on varmuuskopioitu.",
-"Start update" => "Käynnistä päivitys",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Välttääksesi aikakatkaisuja suurikokoisten asennusten kanssa, voit suorittaa vaihtoehtoisesti seuraavan komennon asennushakemistossa:",
-"This %s instance is currently being updated, which may take a while." => "Tätä %s-asennusta päivitetään parhaillaan, päivityksessä saattaa kestää hetki.",
-"This page will refresh itself when the %s instance is available again." => "Tämä sivu päivittää itsensä, kun %s on jälleen käytettävissä."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/fil.js b/core/l10n/fil.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/fil.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fil.json b/core/l10n/fil.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/fil.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fil.php b/core/l10n/fil.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/fil.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
new file mode 100644
index 00000000000..ba430852edc
--- /dev/null
+++ b/core/l10n/fr.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
+    "Turned on maintenance mode" : "Mode de maintenance activé",
+    "Turned off maintenance mode" : "Mode de maintenance désactivé",
+    "Updated database" : "Base de données mise à jour",
+    "Checked database schema update" : "Mise à jour du schéma de la base de données vérifiée",
+    "Checked database schema update for apps" : "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
+    "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
+    "Disabled incompatible apps: %s" : "Applications incompatibles désactivées : %s",
+    "No image or file provided" : "Aucun fichier fourni",
+    "Unknown filetype" : "Type de fichier inconnu",
+    "Invalid image" : "Image non valable",
+    "No temporary profile picture available, try again" : "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
+    "No crop data provided" : "Aucune donnée de recadrage fournie",
+    "Sunday" : "Dimanche",
+    "Monday" : "Lundi",
+    "Tuesday" : "Mardi",
+    "Wednesday" : "Mercredi",
+    "Thursday" : "Jeudi",
+    "Friday" : "Vendredi",
+    "Saturday" : "Samedi",
+    "January" : "janvier",
+    "February" : "février",
+    "March" : "mars",
+    "April" : "avril",
+    "May" : "mai",
+    "June" : "juin",
+    "July" : "juillet",
+    "August" : "août",
+    "September" : "septembre",
+    "October" : "octobre",
+    "November" : "novembre",
+    "December" : "décembre",
+    "Settings" : "Paramètres",
+    "File" : "Fichier",
+    "Folder" : "Dossier",
+    "Image" : "Image",
+    "Audio" : "Audio",
+    "Saving..." : "Enregistrement…",
+    "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." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
+    "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(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
+    "I know what I'm doing" : "Je sais ce que je fais",
+    "Reset password" : "Réinitialiser le mot de passe",
+    "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
+    "No" : "Non",
+    "Yes" : "Oui",
+    "Choose" : "Choisir",
+    "Error loading file picker template: {error}" : "Erreur lors du chargement du modèle du sélecteur de fichiers : {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erreur de chargement du modèle de message : {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} fichier en conflit","{count} fichiers en conflit"],
+    "One file conflict" : "Un conflit de fichier",
+    "New Files" : "Nouveaux fichiers",
+    "Already existing files" : "Fichiers déjà existants",
+    "Which files do you want to keep?" : "Quels fichiers désirez-vous garder ?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
+    "Cancel" : "Annuler",
+    "Continue" : "Continuer",
+    "(all selected)" : "(tous sélectionnés)",
+    "({count} selected)" : "({count} sélectionné(s))",
+    "Error loading file exists template" : "Erreur de chargement du modèle de fichier existant",
+    "Very weak password" : "Mot de passe très faible",
+    "Weak password" : "Mot de passe faible",
+    "So-so password" : "Mot de passe tout juste acceptable",
+    "Good password" : "Mot de passe de sécurité suffisante",
+    "Strong password" : "Mot de passe fort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav semble ne pas fonctionner.",
+    "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." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel ne fonctionneront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
+    "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
+    "Shared" : "Partagé",
+    "Shared with {recipients}" : "Partagé avec {recipients}",
+    "Share" : "Partager",
+    "Error" : "Erreur",
+    "Error while sharing" : "Erreur lors de la mise en partage",
+    "Error while unsharing" : "Erreur lors de l'annulation du partage",
+    "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 user or group …" : "Partager avec un utilisateur ou un groupe...",
+    "Share link" : "Partager par lien public",
+    "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
+    "Password protect" : "Protéger par un mot de passe",
+    "Choose a password for the public link" : "Choisissez un mot de passe pour le lien public",
+    "Allow Public Upload" : "Autoriser l'ajout de fichiers par des utilisateurs non enregistrés",
+    "Email link to person" : "Envoyer le lien par courriel",
+    "Send" : "Envoyer",
+    "Set expiration date" : "Spécifier une date d'expiration",
+    "Expiration date" : "Date d'expiration",
+    "Adding user..." : "Utilisateur en cours d'ajout...",
+    "group" : "groupe",
+    "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",
+    "can share" : "peut partager",
+    "can edit" : "peut modifier",
+    "access control" : "contrôle d'accès",
+    "create" : "créer",
+    "update" : "mettre à jour",
+    "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é",
+    "Warning" : "Attention",
+    "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
+    "Enter new" : "Saisir un nouveau",
+    "Delete" : "Supprimer",
+    "Add" : "Ajouter",
+    "Edit tags" : "Modifier les marqueurs",
+    "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
+    "No tags selected for deletion." : "Aucun marqueur sélectionné pour la suppression.",
+    "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
+    "Please reload the page." : "Veuillez recharger la page.",
+    "The update was unsuccessful." : "La mise à jour a échoué.",
+    "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé(e) 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 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",
+    "Use the following link to reset your password: {link}" : "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
+    "You will receive a link to reset your password via Email." : "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.",
+    "Username" : "Nom d'utilisateur",
+    "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?" : "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é. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
+    "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
+    "Reset" : "Réinitialiser",
+    "New password" : "Nouveau mot de passe",
+    "New Password" : "Nouveau mot de passe",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
+    "Personal" : "Personnel",
+    "Users" : "Utilisateurs",
+    "Apps" : "Applications",
+    "Admin" : "Administration",
+    "Help" : "Aide",
+    "Error loading tags" : "Erreur de chargement des marqueurs.",
+    "Tag already exists" : "Le marqueur existe déjà.",
+    "Error deleting tag(s)" : "Erreur de suppression de(s) marqueur(s)",
+    "Error tagging" : "Erreur lors de la mise en place du marqueur",
+    "Error untagging" : "Erreur lors de la suppression du marqueur",
+    "Error favoriting" : "Erreur lors de la mise en favori",
+    "Error unfavoriting" : "Erreur lors de la suppression des favoris",
+    "Access forbidden" : "Accès interdit",
+    "File not found" : "Fichier non trouvé",
+    "The specified document has not been found on the server." : "Impossible de trouver le document spécifié sur le serveur.",
+    "You can click here to return to %s." : "Vous pouvez cliquer ici pour retourner à %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Bonjour,\n\nNous vous informons que %s a partagé %s avec vous.\nConsultez-le : %s\n",
+    "The share will expire on %s." : "Le partage expirera le %s.",
+    "Cheers!" : "À bientôt !",
+    "Internal Server Error" : "Erreur interne du serveur",
+    "The server encountered an internal error and was unable to complete your request." : "Le serveur a rencontré une erreur interne et est incapable d'exécuter votre requête.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Veuillez contacter l'administrateur du serveur si cette erreur apparaît plusieurs fois. Veuillez joindre les détails techniques à votre rapport.",
+    "More details can be found in the server log." : "Le fichier journal du serveur peut fournir plus de renseignements.",
+    "Technical details" : "Renseignements techniques",
+    "Remote Address: %s" : "Adresse distante : %s",
+    "Request ID: %s" : "ID de la demande : %s",
+    "Code: %s" : "Code : %s",
+    "Message: %s" : "Message : %s",
+    "File: %s" : "Fichier : %s",
+    "Line: %s" : "Ligne : %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Avertissement de sécurité",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
+    "Password" : "Mot de passe",
+    "Storage & database" : "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.",
+    "Database user" : "Utilisateur de la base de données",
+    "Database password" : "Mot de passe de la base de données",
+    "Database name" : "Nom de la base de données",
+    "Database tablespace" : "Tablespace de la base de données",
+    "Database host" : "Hôte de la base de données",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite va être utilisée comme base de données. Pour des installations plus volumineuses, nous vous conseillons de changer ce réglage.",
+    "Finish setup" : "Terminer l'installation",
+    "Finishing …" : "Finalisation …",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Cette application nécessite JavaScript pour fonctionner correctement.  Veuillez <a href=\"http://www.enable-javascript.com/fr/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette page.",
+    "%s is available. Get more information on how to update." : "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
+    "Log out" : "Se déconnecter",
+    "Server side authentication failed!" : "L'authentification sur le serveur a échoué !",
+    "Please contact your administrator." : "Veuillez contacter votre administrateur.",
+    "Forgot your password? Reset it!" : "Mot de passe oublié ? Réinitialisez-le !",
+    "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\">Consultez-le !</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
+    "This means only administrators can use the instance." : "Cela signifie que seuls les administrateurs peuvent utiliser l'instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Veuillez contacter votre administrateur système si ce message persiste ou apparaît de façon inattendue.",
+    "Thank you for your patience." : "Merci de votre patience.",
+    "You are accessing the server from an untrusted domain." : "Vous accédez au serveur à partir d'un domaine non approuvé.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Veuillez contacter votre administrateur. Si vous êtes administrateur de cette instance, configurez le paramètre « trusted_domain » dans le fichier config/config.php. Un exemple de configuration est fourni dans le fichier config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En fonction de votre configuration, en tant qu'administrateur vous pouvez également utiliser le bouton ci-dessous pour approuver ce domaine.",
+    "Add \"%s\" as trusted domain" : "Ajouter \"%s\" à la liste des domaines approuvés",
+    "%s will be updated to version %s." : "%s sera mis à jour vers la version %s.",
+    "The following apps will be disabled:" : "Les applications suivantes seront désactivées :",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Afin d'éviter les dépassements de délai (timeouts) avec les installations de plus grande ampleur, vous pouvez exécuter la commande suivante depuis le répertoire d'installation :",
+    "This %s instance is currently being updated, which may take a while." : "Cette instance de %s est en cours de mise à jour, cela peut prendre du temps.",
+    "This page will refresh itself when the %s instance is available again." : "Cette page se rafraîchira d'elle-même lorsque l'instance %s sera à nouveau disponible."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
new file mode 100644
index 00000000000..b123afbb0d8
--- /dev/null
+++ b/core/l10n/fr.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
+    "Turned on maintenance mode" : "Mode de maintenance activé",
+    "Turned off maintenance mode" : "Mode de maintenance désactivé",
+    "Updated database" : "Base de données mise à jour",
+    "Checked database schema update" : "Mise à jour du schéma de la base de données vérifiée",
+    "Checked database schema update for apps" : "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
+    "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
+    "Disabled incompatible apps: %s" : "Applications incompatibles désactivées : %s",
+    "No image or file provided" : "Aucun fichier fourni",
+    "Unknown filetype" : "Type de fichier inconnu",
+    "Invalid image" : "Image non valable",
+    "No temporary profile picture available, try again" : "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
+    "No crop data provided" : "Aucune donnée de recadrage fournie",
+    "Sunday" : "Dimanche",
+    "Monday" : "Lundi",
+    "Tuesday" : "Mardi",
+    "Wednesday" : "Mercredi",
+    "Thursday" : "Jeudi",
+    "Friday" : "Vendredi",
+    "Saturday" : "Samedi",
+    "January" : "janvier",
+    "February" : "février",
+    "March" : "mars",
+    "April" : "avril",
+    "May" : "mai",
+    "June" : "juin",
+    "July" : "juillet",
+    "August" : "août",
+    "September" : "septembre",
+    "October" : "octobre",
+    "November" : "novembre",
+    "December" : "décembre",
+    "Settings" : "Paramètres",
+    "File" : "Fichier",
+    "Folder" : "Dossier",
+    "Image" : "Image",
+    "Audio" : "Audio",
+    "Saving..." : "Enregistrement…",
+    "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." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
+    "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(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
+    "I know what I'm doing" : "Je sais ce que je fais",
+    "Reset password" : "Réinitialiser le mot de passe",
+    "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
+    "No" : "Non",
+    "Yes" : "Oui",
+    "Choose" : "Choisir",
+    "Error loading file picker template: {error}" : "Erreur lors du chargement du modèle du sélecteur de fichiers : {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erreur de chargement du modèle de message : {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} fichier en conflit","{count} fichiers en conflit"],
+    "One file conflict" : "Un conflit de fichier",
+    "New Files" : "Nouveaux fichiers",
+    "Already existing files" : "Fichiers déjà existants",
+    "Which files do you want to keep?" : "Quels fichiers désirez-vous garder ?",
+    "If you select both versions, the copied file will have a number added to its name." : "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
+    "Cancel" : "Annuler",
+    "Continue" : "Continuer",
+    "(all selected)" : "(tous sélectionnés)",
+    "({count} selected)" : "({count} sélectionné(s))",
+    "Error loading file exists template" : "Erreur de chargement du modèle de fichier existant",
+    "Very weak password" : "Mot de passe très faible",
+    "Weak password" : "Mot de passe faible",
+    "So-so password" : "Mot de passe tout juste acceptable",
+    "Good password" : "Mot de passe de sécurité suffisante",
+    "Strong password" : "Mot de passe fort",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav semble ne pas fonctionner.",
+    "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." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel ne fonctionneront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
+    "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
+    "Shared" : "Partagé",
+    "Shared with {recipients}" : "Partagé avec {recipients}",
+    "Share" : "Partager",
+    "Error" : "Erreur",
+    "Error while sharing" : "Erreur lors de la mise en partage",
+    "Error while unsharing" : "Erreur lors de l'annulation du partage",
+    "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 user or group …" : "Partager avec un utilisateur ou un groupe...",
+    "Share link" : "Partager par lien public",
+    "The public link will expire no later than {days} days after it is created" : "Ce lien public expirera au plus tard {days} jours après sa création.",
+    "Password protect" : "Protéger par un mot de passe",
+    "Choose a password for the public link" : "Choisissez un mot de passe pour le lien public",
+    "Allow Public Upload" : "Autoriser l'ajout de fichiers par des utilisateurs non enregistrés",
+    "Email link to person" : "Envoyer le lien par courriel",
+    "Send" : "Envoyer",
+    "Set expiration date" : "Spécifier une date d'expiration",
+    "Expiration date" : "Date d'expiration",
+    "Adding user..." : "Utilisateur en cours d'ajout...",
+    "group" : "groupe",
+    "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",
+    "can share" : "peut partager",
+    "can edit" : "peut modifier",
+    "access control" : "contrôle d'accès",
+    "create" : "créer",
+    "update" : "mettre à jour",
+    "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é",
+    "Warning" : "Attention",
+    "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
+    "Enter new" : "Saisir un nouveau",
+    "Delete" : "Supprimer",
+    "Add" : "Ajouter",
+    "Edit tags" : "Modifier les marqueurs",
+    "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
+    "No tags selected for deletion." : "Aucun marqueur sélectionné pour la suppression.",
+    "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
+    "Please reload the page." : "Veuillez recharger la page.",
+    "The update was unsuccessful." : "La mise à jour a échoué.",
+    "The update was successful. Redirecting you to ownCloud now." : "La mise à jour a réussi. Vous êtes maintenant redirigé(e) 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 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",
+    "Use the following link to reset your password: {link}" : "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
+    "You will receive a link to reset your password via Email." : "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.",
+    "Username" : "Nom d'utilisateur",
+    "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?" : "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é. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
+    "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
+    "Reset" : "Réinitialiser",
+    "New password" : "Nouveau mot de passe",
+    "New Password" : "Nouveau mot de passe",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
+    "Personal" : "Personnel",
+    "Users" : "Utilisateurs",
+    "Apps" : "Applications",
+    "Admin" : "Administration",
+    "Help" : "Aide",
+    "Error loading tags" : "Erreur de chargement des marqueurs.",
+    "Tag already exists" : "Le marqueur existe déjà.",
+    "Error deleting tag(s)" : "Erreur de suppression de(s) marqueur(s)",
+    "Error tagging" : "Erreur lors de la mise en place du marqueur",
+    "Error untagging" : "Erreur lors de la suppression du marqueur",
+    "Error favoriting" : "Erreur lors de la mise en favori",
+    "Error unfavoriting" : "Erreur lors de la suppression des favoris",
+    "Access forbidden" : "Accès interdit",
+    "File not found" : "Fichier non trouvé",
+    "The specified document has not been found on the server." : "Impossible de trouver le document spécifié sur le serveur.",
+    "You can click here to return to %s." : "Vous pouvez cliquer ici pour retourner à %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Bonjour,\n\nNous vous informons que %s a partagé %s avec vous.\nConsultez-le : %s\n",
+    "The share will expire on %s." : "Le partage expirera le %s.",
+    "Cheers!" : "À bientôt !",
+    "Internal Server Error" : "Erreur interne du serveur",
+    "The server encountered an internal error and was unable to complete your request." : "Le serveur a rencontré une erreur interne et est incapable d'exécuter votre requête.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Veuillez contacter l'administrateur du serveur si cette erreur apparaît plusieurs fois. Veuillez joindre les détails techniques à votre rapport.",
+    "More details can be found in the server log." : "Le fichier journal du serveur peut fournir plus de renseignements.",
+    "Technical details" : "Renseignements techniques",
+    "Remote Address: %s" : "Adresse distante : %s",
+    "Request ID: %s" : "ID de la demande : %s",
+    "Code: %s" : "Code : %s",
+    "Message: %s" : "Message : %s",
+    "File: %s" : "Fichier : %s",
+    "Line: %s" : "Ligne : %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Avertissement de sécurité",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
+    "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
+    "Password" : "Mot de passe",
+    "Storage & database" : "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.",
+    "Database user" : "Utilisateur de la base de données",
+    "Database password" : "Mot de passe de la base de données",
+    "Database name" : "Nom de la base de données",
+    "Database tablespace" : "Tablespace de la base de données",
+    "Database host" : "Hôte de la base de données",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite va être utilisée comme base de données. Pour des installations plus volumineuses, nous vous conseillons de changer ce réglage.",
+    "Finish setup" : "Terminer l'installation",
+    "Finishing …" : "Finalisation …",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Cette application nécessite JavaScript pour fonctionner correctement.  Veuillez <a href=\"http://www.enable-javascript.com/fr/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette page.",
+    "%s is available. Get more information on how to update." : "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
+    "Log out" : "Se déconnecter",
+    "Server side authentication failed!" : "L'authentification sur le serveur a échoué !",
+    "Please contact your administrator." : "Veuillez contacter votre administrateur.",
+    "Forgot your password? Reset it!" : "Mot de passe oublié ? Réinitialisez-le !",
+    "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\">Consultez-le !</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
+    "This means only administrators can use the instance." : "Cela signifie que seuls les administrateurs peuvent utiliser l'instance.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Veuillez contacter votre administrateur système si ce message persiste ou apparaît de façon inattendue.",
+    "Thank you for your patience." : "Merci de votre patience.",
+    "You are accessing the server from an untrusted domain." : "Vous accédez au serveur à partir d'un domaine non approuvé.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Veuillez contacter votre administrateur. Si vous êtes administrateur de cette instance, configurez le paramètre « trusted_domain » dans le fichier config/config.php. Un exemple de configuration est fourni dans le fichier config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "En fonction de votre configuration, en tant qu'administrateur vous pouvez également utiliser le bouton ci-dessous pour approuver ce domaine.",
+    "Add \"%s\" as trusted domain" : "Ajouter \"%s\" à la liste des domaines approuvés",
+    "%s will be updated to version %s." : "%s sera mis à jour vers la version %s.",
+    "The following apps will be disabled:" : "Les applications suivantes seront désactivées :",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Afin d'éviter les dépassements de délai (timeouts) avec les installations de plus grande ampleur, vous pouvez exécuter la commande suivante depuis le répertoire d'installation :",
+    "This %s instance is currently being updated, which may take a while." : "Cette instance de %s est en cours de mise à jour, cela peut prendre du temps.",
+    "This page will refresh itself when the %s instance is available again." : "Cette page se rafraîchira d'elle-même lorsque l'instance %s sera à nouveau disponible."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
deleted file mode 100644
index ea6736a1648..00000000000
--- a/core/l10n/fr.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Impossible d'envoyer un courriel aux utilisateurs suivants : %s",
-"Turned on maintenance mode" => "Mode de maintenance activé",
-"Turned off maintenance mode" => "Mode de maintenance désactivé",
-"Updated database" => "Base de données mise à jour",
-"Checked database schema update" => "Mise à jour du schéma de la base de données vérifiée",
-"Checked database schema update for apps" => "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
-"Updated \"%s\" to %s" => "Mise à jour de « %s » vers %s",
-"Disabled incompatible apps: %s" => "Applications incompatibles désactivées : %s",
-"No image or file provided" => "Aucun fichier fourni",
-"Unknown filetype" => "Type de fichier inconnu",
-"Invalid image" => "Image non valable",
-"No temporary profile picture available, try again" => "Aucune image temporaire disponible pour le profil. Essayez à nouveau.",
-"No crop data provided" => "Aucune donnée de recadrage fournie",
-"Sunday" => "Dimanche",
-"Monday" => "Lundi",
-"Tuesday" => "Mardi",
-"Wednesday" => "Mercredi",
-"Thursday" => "Jeudi",
-"Friday" => "Vendredi",
-"Saturday" => "Samedi",
-"January" => "janvier",
-"February" => "février",
-"March" => "mars",
-"April" => "avril",
-"May" => "mai",
-"June" => "juin",
-"July" => "juillet",
-"August" => "août",
-"September" => "septembre",
-"October" => "octobre",
-"November" => "novembre",
-"December" => "décembre",
-"Settings" => "Paramètres",
-"File" => "Fichier",
-"Folder" => "Dossier",
-"Image" => "Image",
-"Audio" => "Audio",
-"Saving..." => "Enregistrement…",
-"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." => "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
-"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(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
-"I know what I'm doing" => "Je sais ce que je fais",
-"Reset password" => "Réinitialiser le mot de passe",
-"Password can not be changed. Please contact your administrator." => "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
-"No" => "Non",
-"Yes" => "Oui",
-"Choose" => "Choisir",
-"Error loading file picker template: {error}" => "Erreur lors du chargement du modèle du sélecteur de fichiers : {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Erreur de chargement du modèle de message : {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} fichier en conflit","{count} fichiers en conflit"),
-"One file conflict" => "Un conflit de fichier",
-"New Files" => "Nouveaux fichiers",
-"Already existing files" => "Fichiers déjà existants",
-"Which files do you want to keep?" => "Quels fichiers désirez-vous garder ?",
-"If you select both versions, the copied file will have a number added to its name." => "Si vous sélectionnez les deux versions, un nombre sera ajouté au nom du fichier copié.",
-"Cancel" => "Annuler",
-"Continue" => "Continuer",
-"(all selected)" => "(tous sélectionnés)",
-"({count} selected)" => "({count} sélectionné(s))",
-"Error loading file exists template" => "Erreur de chargement du modèle de fichier existant",
-"Very weak password" => "Mot de passe très faible",
-"Weak password" => "Mot de passe faible",
-"So-so password" => "Mot de passe tout juste acceptable",
-"Good password" => "Mot de passe de sécurité suffisante",
-"Strong password" => "Mot de passe fort",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav semble ne pas fonctionner.",
-"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." => "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel ne fonctionneront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
-"Error occurred while checking server setup" => "Une erreur s'est produite lors de la vérification de la configuration du serveur",
-"Shared" => "Partagé",
-"Shared with {recipients}" => "Partagé avec {recipients}",
-"Share" => "Partager",
-"Error" => "Erreur",
-"Error while sharing" => "Erreur lors de la mise en partage",
-"Error while unsharing" => "Erreur lors de l'annulation du partage",
-"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 user or group …" => "Partager avec un utilisateur ou un groupe...",
-"Share link" => "Partager par lien public",
-"The public link will expire no later than {days} days after it is created" => "Ce lien public expirera au plus tard {days} jours après sa création.",
-"Password protect" => "Protéger par un mot de passe",
-"Choose a password for the public link" => "Choisissez un mot de passe pour le lien public",
-"Allow Public Upload" => "Autoriser l'ajout de fichiers par des utilisateurs non enregistrés",
-"Email link to person" => "Envoyer le lien par courriel",
-"Send" => "Envoyer",
-"Set expiration date" => "Spécifier une date d'expiration",
-"Expiration date" => "Date d'expiration",
-"Adding user..." => "Utilisateur en cours d'ajout...",
-"group" => "groupe",
-"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",
-"can share" => "peut partager",
-"can edit" => "peut modifier",
-"access control" => "contrôle d'accès",
-"create" => "créer",
-"update" => "mettre à jour",
-"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é",
-"Warning" => "Attention",
-"The object type is not specified." => "Le type d'objet n'est pas spécifié.",
-"Enter new" => "Saisir un nouveau",
-"Delete" => "Supprimer",
-"Add" => "Ajouter",
-"Edit tags" => "Modifier les marqueurs",
-"Error loading dialog template: {error}" => "Erreur lors du chargement du modèle de dialogue : {error}",
-"No tags selected for deletion." => "Aucun marqueur sélectionné pour la suppression.",
-"Updating {productName} to version {version}, this may take a while." => "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
-"Please reload the page." => "Veuillez recharger la page.",
-"The update was unsuccessful." => "La mise à jour a échoué.",
-"The update was successful. Redirecting you to ownCloud now." => "La mise à jour a réussi. Vous êtes maintenant redirigé(e) 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 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",
-"Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
-"You will receive a link to reset your password via Email." => "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.",
-"Username" => "Nom d'utilisateur",
-"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?" => "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é. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
-"Yes, I really want to reset my password now" => "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
-"Reset" => "Réinitialiser",
-"New password" => "Nouveau mot de passe",
-"New Password" => "Nouveau mot de passe",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
-"For the best results, please consider using a GNU/Linux server instead." => "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
-"Personal" => "Personnel",
-"Users" => "Utilisateurs",
-"Apps" => "Applications",
-"Admin" => "Administration",
-"Help" => "Aide",
-"Error loading tags" => "Erreur de chargement des marqueurs.",
-"Tag already exists" => "Le marqueur existe déjà.",
-"Error deleting tag(s)" => "Erreur de suppression de(s) marqueur(s)",
-"Error tagging" => "Erreur lors de la mise en place du marqueur",
-"Error untagging" => "Erreur lors de la suppression du marqueur",
-"Error favoriting" => "Erreur lors de la mise en favori",
-"Error unfavoriting" => "Erreur lors de la suppression des favoris",
-"Access forbidden" => "Accès interdit",
-"File not found" => "Fichier non trouvé",
-"The specified document has not been found on the server." => "Impossible de trouver le document spécifié sur le serveur.",
-"You can click here to return to %s." => "Vous pouvez cliquer ici pour retourner à %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Bonjour,\n\nNous vous informons que %s a partagé %s avec vous.\nConsultez-le : %s\n",
-"The share will expire on %s." => "Le partage expirera le %s.",
-"Cheers!" => "À bientôt !",
-"Internal Server Error" => "Erreur interne du serveur",
-"The server encountered an internal error and was unable to complete your request." => "Le serveur a rencontré une erreur interne et est incapable d'exécuter votre requête.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Veuillez contacter l'administrateur du serveur si cette erreur apparaît plusieurs fois. Veuillez joindre les détails techniques à votre rapport.",
-"More details can be found in the server log." => "Le fichier journal du serveur peut fournir plus de renseignements.",
-"Technical details" => "Renseignements techniques",
-"Remote Address: %s" => "Adresse distante : %s",
-"Request ID: %s" => "ID de la demande : %s",
-"Code: %s" => "Code : %s",
-"Message: %s" => "Message : %s",
-"File: %s" => "Fichier : %s",
-"Line: %s" => "Ligne : %s",
-"Trace" => "Trace",
-"Security Warning" => "Avertissement de sécurité",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Votre version de PHP est vulnérable à l'attaque par caractère NULL (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Veuillez mettre à jour votre installation PHP pour utiliser %s de façon sécurisée.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
-"Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
-"Password" => "Mot de passe",
-"Storage & database" => "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.",
-"Database user" => "Utilisateur de la base de données",
-"Database password" => "Mot de passe de la base de données",
-"Database name" => "Nom de la base de données",
-"Database tablespace" => "Tablespace de la base de données",
-"Database host" => "Hôte de la base de données",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite va être utilisée comme base de données. Pour des installations plus volumineuses, nous vous conseillons de changer ce réglage.",
-"Finish setup" => "Terminer l'installation",
-"Finishing …" => "Finalisation …",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Cette application nécessite JavaScript pour fonctionner correctement.  Veuillez <a href=\"http://www.enable-javascript.com/fr/\" target=\"_blank\">activer JavaScript</a> puis charger à nouveau cette page.",
-"%s is available. Get more information on how to update." => "%s est disponible. Obtenez plus d'informations sur la façon de mettre à jour.",
-"Log out" => "Se déconnecter",
-"Server side authentication failed!" => "L'authentification sur le serveur a échoué !",
-"Please contact your administrator." => "Veuillez contacter votre administrateur.",
-"Forgot your password? Reset it!" => "Mot de passe oublié ? Réinitialisez-le !",
-"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\">Consultez-le !</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Cette instance de ownCloud est actuellement en mode utilisateur unique.",
-"This means only administrators can use the instance." => "Cela signifie que seuls les administrateurs peuvent utiliser l'instance.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Veuillez contacter votre administrateur système si ce message persiste ou apparaît de façon inattendue.",
-"Thank you for your patience." => "Merci de votre patience.",
-"You are accessing the server from an untrusted domain." => "Vous accédez au serveur à partir d'un domaine non approuvé.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Veuillez contacter votre administrateur. Si vous êtes administrateur de cette instance, configurez le paramètre « trusted_domain » dans le fichier config/config.php. Un exemple de configuration est fourni dans le fichier config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "En fonction de votre configuration, en tant qu'administrateur vous pouvez également utiliser le bouton ci-dessous pour approuver ce domaine.",
-"Add \"%s\" as trusted domain" => "Ajouter \"%s\" à la liste des domaines approuvés",
-"%s will be updated to version %s." => "%s sera mis à jour vers la version %s.",
-"The following apps will be disabled:" => "Les applications suivantes seront désactivées :",
-"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",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Afin d'éviter les dépassements de délai (timeouts) avec les installations de plus grande ampleur, vous pouvez exécuter la commande suivante depuis le répertoire d'installation :",
-"This %s instance is currently being updated, which may take a while." => "Cette instance de %s est en cours de mise à jour, cela peut prendre du temps.",
-"This page will refresh itself when the %s instance is available again." => "Cette page se rafraîchira d'elle-même lorsque l'instance %s sera à nouveau disponible."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/fr_CA.js b/core/l10n/fr_CA.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/fr_CA.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fr_CA.json b/core/l10n/fr_CA.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/fr_CA.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fr_CA.php b/core/l10n/fr_CA.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/fr_CA.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/fy_NL.js b/core/l10n/fy_NL.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/fy_NL.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/fy_NL.json b/core/l10n/fy_NL.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/fy_NL.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/fy_NL.php b/core/l10n/fy_NL.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/fy_NL.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
new file mode 100644
index 00000000000..21092fce15b
--- /dev/null
+++ b/core/l10n/gl.js
@@ -0,0 +1,188 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Non é posíbel enviar correo aos usuarios seguintes: %s",
+    "Turned on maintenance mode" : "Modo de mantemento activado",
+    "Turned off maintenance mode" : "Modo de mantemento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "Checked database schema update" : "Comprobada a actualización do esquema da base de datos",
+    "Disabled incompatible apps: %s" : "Aplicacións incompatíbeis desactivadas: %s",
+    "No image or file provided" : "Non forneceu ningunha imaxe ou ficheiro",
+    "Unknown filetype" : "Tipo de ficheiro descoñecido",
+    "Invalid image" : "Imaxe incorrecta",
+    "No temporary profile picture available, try again" : "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo",
+    "No crop data provided" : "Non indicou como recortar",
+    "Sunday" : "domingo",
+    "Monday" : "luns",
+    "Tuesday" : "martes",
+    "Wednesday" : "mércores",
+    "Thursday" : "xoves",
+    "Friday" : "venres",
+    "Saturday" : "sábado",
+    "January" : "xaneiro",
+    "February" : "febreiro",
+    "March" : "marzo",
+    "April" : "abril",
+    "May" : "maio",
+    "June" : "xuño",
+    "July" : "xullo",
+    "August" : "agosto",
+    "September" : "setembro",
+    "October" : "outubro",
+    "November" : "novembro",
+    "December" : "decembro",
+    "Settings" : "Axustes",
+    "File" : "Ficheiro",
+    "Folder" : "Cartafol",
+    "Image" : "Imaxe",
+    "Audio" : "Son",
+    "Saving..." : "Gardando...",
+    "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. 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?",
+    "I know what I'm doing" : "Sei o estou a facer",
+    "Reset password" : "Restabelecer o contrasinal",
+    "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
+    "No" : "Non",
+    "Yes" : "Si",
+    "Choose" : "Escoller",
+    "Error loading file picker template: {error}" : "Produciuse un erro ao cargar o modelo do selector: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de ficheiro","{count} conflitos de ficheiros"],
+    "One file conflict" : "Un conflito de ficheiro",
+    "New Files" : "Ficheiros novos",
+    "Already existing files" : "Ficheiros xa existentes",
+    "Which files do you want to keep?" : "Que ficheiros quere conservar?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todo o seleccionado)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Produciuse un erro ao cargar o modelo de ficheiro existente",
+    "Very weak password" : "Contrasinal moi feble",
+    "Weak password" : "Contrasinal feble",
+    "So-so password" : "Contrasinal non moi aló",
+    "Good password" : "Bo contrasinal",
+    "Strong password" : "Contrasinal forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
+    "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." : "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
+    "Shared" : "Compartido",
+    "Shared with {recipients}" : "Compartido con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Erro",
+    "Error while sharing" : "Produciuse un erro ao compartir",
+    "Error while unsharing" : "Produciuse un erro ao deixar de compartir",
+    "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 user or group …" : "Compartir cun usuario ou grupo ...",
+    "Share link" : "Ligazón para compartir",
+    "The public link will expire no later than {days} days after it is created" : "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
+    "Password protect" : "Protexido con contrasinal",
+    "Choose a password for the public link" : "Escolla un contrasinal para a ligazón pública",
+    "Allow Public Upload" : "Permitir o envío público",
+    "Email link to person" : "Enviar ligazón por correo",
+    "Send" : "Enviar",
+    "Set expiration date" : "Definir a data de caducidade",
+    "Expiration date" : "Data de caducidade",
+    "group" : "grupo",
+    "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",
+    "can share" : "pode compartir",
+    "can edit" : "pode editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "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",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "Non se especificou o tipo de obxecto.",
+    "Enter new" : "Introduza o novo",
+    "Delete" : "Eliminar",
+    "Add" : "Engadir",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}",
+    "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
+    "Please reload the page." : "Volva cargar a páxina.",
+    "The update was unsuccessful." : "A actualización foi satisfactoria.",
+    "The update was successful. Redirecting you to ownCloud now." : "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
+    "Couldn't reset password because the token is invalid" : "No, foi posíbel restabelecer o contrasinal, a marca non é correcta",
+    "Couldn't send reset email. Please make sure your username is correct." : "Non foi posíbel enviar o coreo do restablecemento. Asegúrese de que o nome de usuario é o correcto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
+    "%s password reset" : "Restabelecer o contrasinal %s",
+    "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
+    "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal",
+    "Username" : "Nome de usuario",
+    "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?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
+    "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal",
+    "Reset" : "Restabelecer",
+    "New password" : "Novo contrasinal",
+    "New Password" : "Novo contrasinal",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
+    "Personal" : "Persoal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicacións",
+    "Admin" : "Administración",
+    "Help" : "Axuda",
+    "Error loading tags" : "Produciuse un erro ao cargar as etiquetas",
+    "Tag already exists" : "Xa existe a etiqueta",
+    "Error deleting tag(s)" : "Produciuse un erro ao eliminar a(s) etiqueta(s)",
+    "Error tagging" : "Produciuse un erro ao etiquetar",
+    "Error untagging" : "Produciuse un erro ao eliminar a etiqueta",
+    "Error favoriting" : "Produciuse un erro ao marcar como favorito",
+    "Error unfavoriting" : "Produciuse un erro ao desmarcar como favorito",
+    "Access forbidden" : "Acceso denegado",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
+    "The share will expire on %s." : "Esta compartición caduca o %s.",
+    "Cheers!" : "Saúdos!",
+    "Security Warning" : "Aviso de seguranza",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Actualice a instalación de PHP para empregar %s de xeito seguro.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
+    "Password" : "Contrasinal",
+    "Storage & database" : "Almacenamento e base de datos",
+    "Data folder" : "Cartafol de datos",
+    "Configure the database" : "Configurar a base de datos",
+    "Only %s is available." : "Só está dispoñíbel %s.",
+    "Database user" : "Usuario da base de datos",
+    "Database password" : "Contrasinal da base de datos",
+    "Database name" : "Nome da base de datos",
+    "Database tablespace" : "Táboa de espazos da base de datos",
+    "Database host" : "Servidor da base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
+    "Finish setup" : "Rematar a configuración",
+    "Finishing …" : "Rematando ...",
+    "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
+    "Log out" : "Desconectar",
+    "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!",
+    "Please contact your administrator." : "Contacte co administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu o contrasinal? Restabelézao!",
+    "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.",
+    "This means only administrators can use the instance." : "Isto significa que só os administradores poden utilizar a instancia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
+    "Thank you for your patience." : "Grazas pola súa paciencia.",
+    "You are accessing the server from an untrusted domain." : "Esta accedendo desde un dominio non fiábel.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
+    "%s will be updated to version %s." : "%s actualizarase á versión %s.",
+    "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:",
+    "The theme %s has been disabled." : "O tema %s foi desactivado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
+    "Start update" : "Iniciar a actualización",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
new file mode 100644
index 00000000000..5817851838c
--- /dev/null
+++ b/core/l10n/gl.json
@@ -0,0 +1,186 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Non é posíbel enviar correo aos usuarios seguintes: %s",
+    "Turned on maintenance mode" : "Modo de mantemento activado",
+    "Turned off maintenance mode" : "Modo de mantemento desactivado",
+    "Updated database" : "Base de datos actualizada",
+    "Checked database schema update" : "Comprobada a actualización do esquema da base de datos",
+    "Disabled incompatible apps: %s" : "Aplicacións incompatíbeis desactivadas: %s",
+    "No image or file provided" : "Non forneceu ningunha imaxe ou ficheiro",
+    "Unknown filetype" : "Tipo de ficheiro descoñecido",
+    "Invalid image" : "Imaxe incorrecta",
+    "No temporary profile picture available, try again" : "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo",
+    "No crop data provided" : "Non indicou como recortar",
+    "Sunday" : "domingo",
+    "Monday" : "luns",
+    "Tuesday" : "martes",
+    "Wednesday" : "mércores",
+    "Thursday" : "xoves",
+    "Friday" : "venres",
+    "Saturday" : "sábado",
+    "January" : "xaneiro",
+    "February" : "febreiro",
+    "March" : "marzo",
+    "April" : "abril",
+    "May" : "maio",
+    "June" : "xuño",
+    "July" : "xullo",
+    "August" : "agosto",
+    "September" : "setembro",
+    "October" : "outubro",
+    "November" : "novembro",
+    "December" : "decembro",
+    "Settings" : "Axustes",
+    "File" : "Ficheiro",
+    "Folder" : "Cartafol",
+    "Image" : "Imaxe",
+    "Audio" : "Son",
+    "Saving..." : "Gardando...",
+    "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. 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?",
+    "I know what I'm doing" : "Sei o estou a facer",
+    "Reset password" : "Restabelecer o contrasinal",
+    "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
+    "No" : "Non",
+    "Yes" : "Si",
+    "Choose" : "Escoller",
+    "Error loading file picker template: {error}" : "Produciuse un erro ao cargar o modelo do selector: {error}",
+    "Ok" : "Aceptar",
+    "Error loading message template: {error}" : "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de ficheiro","{count} conflitos de ficheiros"],
+    "One file conflict" : "Un conflito de ficheiro",
+    "New Files" : "Ficheiros novos",
+    "Already existing files" : "Ficheiros xa existentes",
+    "Which files do you want to keep?" : "Que ficheiros quere conservar?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todo o seleccionado)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Produciuse un erro ao cargar o modelo de ficheiro existente",
+    "Very weak password" : "Contrasinal moi feble",
+    "Weak password" : "Contrasinal feble",
+    "So-so password" : "Contrasinal non moi aló",
+    "Good password" : "Bo contrasinal",
+    "Strong password" : "Contrasinal forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
+    "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." : "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
+    "Shared" : "Compartido",
+    "Shared with {recipients}" : "Compartido con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Erro",
+    "Error while sharing" : "Produciuse un erro ao compartir",
+    "Error while unsharing" : "Produciuse un erro ao deixar de compartir",
+    "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 user or group …" : "Compartir cun usuario ou grupo ...",
+    "Share link" : "Ligazón para compartir",
+    "The public link will expire no later than {days} days after it is created" : "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
+    "Password protect" : "Protexido con contrasinal",
+    "Choose a password for the public link" : "Escolla un contrasinal para a ligazón pública",
+    "Allow Public Upload" : "Permitir o envío público",
+    "Email link to person" : "Enviar ligazón por correo",
+    "Send" : "Enviar",
+    "Set expiration date" : "Definir a data de caducidade",
+    "Expiration date" : "Data de caducidade",
+    "group" : "grupo",
+    "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",
+    "can share" : "pode compartir",
+    "can edit" : "pode editar",
+    "access control" : "control de acceso",
+    "create" : "crear",
+    "update" : "actualizar",
+    "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",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "Non se especificou o tipo de obxecto.",
+    "Enter new" : "Introduza o novo",
+    "Delete" : "Eliminar",
+    "Add" : "Engadir",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}",
+    "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.",
+    "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
+    "Please reload the page." : "Volva cargar a páxina.",
+    "The update was unsuccessful." : "A actualización foi satisfactoria.",
+    "The update was successful. Redirecting you to ownCloud now." : "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
+    "Couldn't reset password because the token is invalid" : "No, foi posíbel restabelecer o contrasinal, a marca non é correcta",
+    "Couldn't send reset email. Please make sure your username is correct." : "Non foi posíbel enviar o coreo do restablecemento. Asegúrese de que o nome de usuario é o correcto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
+    "%s password reset" : "Restabelecer o contrasinal %s",
+    "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
+    "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal",
+    "Username" : "Nome de usuario",
+    "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?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
+    "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal",
+    "Reset" : "Restabelecer",
+    "New password" : "Novo contrasinal",
+    "New Password" : "Novo contrasinal",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
+    "Personal" : "Persoal",
+    "Users" : "Usuarios",
+    "Apps" : "Aplicacións",
+    "Admin" : "Administración",
+    "Help" : "Axuda",
+    "Error loading tags" : "Produciuse un erro ao cargar as etiquetas",
+    "Tag already exists" : "Xa existe a etiqueta",
+    "Error deleting tag(s)" : "Produciuse un erro ao eliminar a(s) etiqueta(s)",
+    "Error tagging" : "Produciuse un erro ao etiquetar",
+    "Error untagging" : "Produciuse un erro ao eliminar a etiqueta",
+    "Error favoriting" : "Produciuse un erro ao marcar como favorito",
+    "Error unfavoriting" : "Produciuse un erro ao desmarcar como favorito",
+    "Access forbidden" : "Acceso denegado",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
+    "The share will expire on %s." : "Esta compartición caduca o %s.",
+    "Cheers!" : "Saúdos!",
+    "Security Warning" : "Aviso de seguranza",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Actualice a instalación de PHP para empregar %s de xeito seguro.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
+    "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
+    "Password" : "Contrasinal",
+    "Storage & database" : "Almacenamento e base de datos",
+    "Data folder" : "Cartafol de datos",
+    "Configure the database" : "Configurar a base de datos",
+    "Only %s is available." : "Só está dispoñíbel %s.",
+    "Database user" : "Usuario da base de datos",
+    "Database password" : "Contrasinal da base de datos",
+    "Database name" : "Nome da base de datos",
+    "Database tablespace" : "Táboa de espazos da base de datos",
+    "Database host" : "Servidor da base de datos",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
+    "Finish setup" : "Rematar a configuración",
+    "Finishing …" : "Rematando ...",
+    "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
+    "Log out" : "Desconectar",
+    "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!",
+    "Please contact your administrator." : "Contacte co administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu o contrasinal? Restabelézao!",
+    "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.",
+    "This means only administrators can use the instance." : "Isto significa que só os administradores poden utilizar a instancia.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
+    "Thank you for your patience." : "Grazas pola súa paciencia.",
+    "You are accessing the server from an untrusted domain." : "Esta accedendo desde un dominio non fiábel.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
+    "%s will be updated to version %s." : "%s actualizarase á versión %s.",
+    "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:",
+    "The theme %s has been disabled." : "O tema %s foi desactivado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
+    "Start update" : "Iniciar a actualización",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
deleted file mode 100644
index 9f9b3a8e34c..00000000000
--- a/core/l10n/gl.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Non é posíbel enviar correo aos usuarios seguintes: %s",
-"Turned on maintenance mode" => "Modo de mantemento activado",
-"Turned off maintenance mode" => "Modo de mantemento desactivado",
-"Updated database" => "Base de datos actualizada",
-"Checked database schema update" => "Comprobada a actualización do esquema da base de datos",
-"Disabled incompatible apps: %s" => "Aplicacións incompatíbeis desactivadas: %s",
-"No image or file provided" => "Non forneceu ningunha imaxe ou ficheiro",
-"Unknown filetype" => "Tipo de ficheiro descoñecido",
-"Invalid image" => "Imaxe incorrecta",
-"No temporary profile picture available, try again" => "Non hai unha imaxe temporal de perfil dispoñíbel, volva tentalo",
-"No crop data provided" => "Non indicou como recortar",
-"Sunday" => "domingo",
-"Monday" => "luns",
-"Tuesday" => "martes",
-"Wednesday" => "mércores",
-"Thursday" => "xoves",
-"Friday" => "venres",
-"Saturday" => "sábado",
-"January" => "xaneiro",
-"February" => "febreiro",
-"March" => "marzo",
-"April" => "abril",
-"May" => "maio",
-"June" => "xuño",
-"July" => "xullo",
-"August" => "agosto",
-"September" => "setembro",
-"October" => "outubro",
-"November" => "novembro",
-"December" => "decembro",
-"Settings" => "Axustes",
-"File" => "Ficheiro",
-"Folder" => "Cartafol",
-"Image" => "Imaxe",
-"Audio" => "Son",
-"Saving..." => "Gardando...",
-"Couldn't send reset email. Please contact your administrator." => "Non foi posíbel enviar o coreo do restablecemento. 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?",
-"I know what I'm doing" => "Sei o estou a facer",
-"Reset password" => "Restabelecer o contrasinal",
-"Password can not be changed. Please contact your administrator." => "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
-"No" => "Non",
-"Yes" => "Si",
-"Choose" => "Escoller",
-"Error loading file picker template: {error}" => "Produciuse un erro ao cargar o modelo do selector: {error}",
-"Ok" => "Aceptar",
-"Error loading message template: {error}" => "Produciuse un erro ao cargar o modelo da mensaxe: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de ficheiro","{count} conflitos de ficheiros"),
-"One file conflict" => "Un conflito de ficheiro",
-"New Files" => "Ficheiros novos",
-"Already existing files" => "Ficheiros xa existentes",
-"Which files do you want to keep?" => "Que ficheiros quere conservar?",
-"If you select both versions, the copied file will have a number added to its name." => "Se selecciona ambas versións, o ficheiro copiado terá un número engadido ao nome.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todo o seleccionado)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Produciuse un erro ao cargar o modelo de ficheiro existente",
-"Very weak password" => "Contrasinal moi feble",
-"Weak password" => "Contrasinal feble",
-"So-so password" => "Contrasinal non moi aló",
-"Good password" => "Bo contrasinal",
-"Strong password" => "Contrasinal forte",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
-"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." => "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
-"Shared" => "Compartido",
-"Shared with {recipients}" => "Compartido con {recipients}",
-"Share" => "Compartir",
-"Error" => "Erro",
-"Error while sharing" => "Produciuse un erro ao compartir",
-"Error while unsharing" => "Produciuse un erro ao deixar de compartir",
-"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 user or group …" => "Compartir cun usuario ou grupo ...",
-"Share link" => "Ligazón para compartir",
-"The public link will expire no later than {days} days after it is created" => "A ligazón pública caducará, a máis tardar, {days} días após a súa creación",
-"Password protect" => "Protexido con contrasinal",
-"Choose a password for the public link" => "Escolla un contrasinal para a ligazón pública",
-"Allow Public Upload" => "Permitir o envío público",
-"Email link to person" => "Enviar ligazón por correo",
-"Send" => "Enviar",
-"Set expiration date" => "Definir a data de caducidade",
-"Expiration date" => "Data de caducidade",
-"group" => "grupo",
-"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",
-"can share" => "pode compartir",
-"can edit" => "pode editar",
-"access control" => "control de acceso",
-"create" => "crear",
-"update" => "actualizar",
-"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",
-"Warning" => "Aviso",
-"The object type is not specified." => "Non se especificou o tipo de obxecto.",
-"Enter new" => "Introduza o novo",
-"Delete" => "Eliminar",
-"Add" => "Engadir",
-"Edit tags" => "Editar etiquetas",
-"Error loading dialog template: {error}" => "Produciuse un erro ao cargar o modelo do dialogo: {error}",
-"No tags selected for deletion." => "Non se seleccionaron etiquetas para borrado.",
-"Updating {productName} to version {version}, this may take a while." => "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
-"Please reload the page." => "Volva cargar a páxina.",
-"The update was unsuccessful." => "A actualización foi satisfactoria.",
-"The update was successful. Redirecting you to ownCloud now." => "A actualización realizouse correctamente. Redirixíndoo agora á ownCloud.",
-"Couldn't reset password because the token is invalid" => "No, foi posíbel restabelecer o contrasinal, a marca non é correcta",
-"Couldn't send reset email. Please make sure your username is correct." => "Non foi posíbel enviar o coreo do restablecemento. Asegúrese de que o nome de usuario é o correcto.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
-"%s password reset" => "Restabelecer o contrasinal %s",
-"Use the following link to reset your password: {link}" => "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
-"You will receive a link to reset your password via Email." => "Recibirá unha ligazón por correo para restabelecer o contrasinal",
-"Username" => "Nome de usuario",
-"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?" => "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
-"Yes, I really want to reset my password now" => "Si, confirmo que quero restabelecer agora o meu contrasinal",
-"Reset" => "Restabelecer",
-"New password" => "Novo contrasinal",
-"New Password" => "Novo contrasinal",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
-"For the best results, please consider using a GNU/Linux server instead." => "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
-"Personal" => "Persoal",
-"Users" => "Usuarios",
-"Apps" => "Aplicacións",
-"Admin" => "Administración",
-"Help" => "Axuda",
-"Error loading tags" => "Produciuse un erro ao cargar as etiquetas",
-"Tag already exists" => "Xa existe a etiqueta",
-"Error deleting tag(s)" => "Produciuse un erro ao eliminar a(s) etiqueta(s)",
-"Error tagging" => "Produciuse un erro ao etiquetar",
-"Error untagging" => "Produciuse un erro ao eliminar a etiqueta",
-"Error favoriting" => "Produciuse un erro ao marcar como favorito",
-"Error unfavoriting" => "Produciuse un erro ao desmarcar como favorito",
-"Access forbidden" => "Acceso denegado",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
-"The share will expire on %s." => "Esta compartición caduca o %s.",
-"Cheers!" => "Saúdos!",
-"Security Warning" => "Aviso de seguranza",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Actualice a instalación de PHP para empregar %s de xeito seguro.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
-"Create an <strong>admin account</strong>" => "Crear unha <strong>contra de administrador</strong>",
-"Password" => "Contrasinal",
-"Storage & database" => "Almacenamento e base de datos",
-"Data folder" => "Cartafol de datos",
-"Configure the database" => "Configurar a base de datos",
-"Only %s is available." => "Só está dispoñíbel %s.",
-"Database user" => "Usuario da base de datos",
-"Database password" => "Contrasinal da base de datos",
-"Database name" => "Nome da base de datos",
-"Database tablespace" => "Táboa de espazos da base de datos",
-"Database host" => "Servidor da base de datos",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
-"Finish setup" => "Rematar a configuración",
-"Finishing …" => "Rematando ...",
-"%s is available. Get more information on how to update." => "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
-"Log out" => "Desconectar",
-"Server side authentication failed!" => "A autenticación fracasou do lado do servidor!",
-"Please contact your administrator." => "Contacte co administrador.",
-"Forgot your password? Reset it!" => "Esqueceu o contrasinal? Restabelézao!",
-"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.",
-"This means only administrators can use the instance." => "Isto significa que só os administradores poden utilizar a instancia.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Póñase en contacto co administrador do sistema se persiste esta mensaxe ou se aparece de forma inesperada.",
-"Thank you for your patience." => "Grazas pola súa paciencia.",
-"You are accessing the server from an untrusted domain." => "Esta accedendo desde un dominio non fiábel.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
-"%s will be updated to version %s." => "%s actualizarase á versión %s.",
-"The following apps will be disabled:" => "Van desactivarse as seguintes aplicacións:",
-"The theme %s has been disabled." => "O tema %s foi desactivado.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
-"Start update" => "Iniciar a actualización",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/gu.js b/core/l10n/gu.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/gu.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/gu.json b/core/l10n/gu.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/gu.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/gu.php b/core/l10n/gu.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/gu.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/he.js b/core/l10n/he.js
new file mode 100644
index 00000000000..fc09eb2b03b
--- /dev/null
+++ b/core/l10n/he.js
@@ -0,0 +1,100 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "יום ראשון",
+    "Monday" : "יום שני",
+    "Tuesday" : "יום שלישי",
+    "Wednesday" : "יום רביעי",
+    "Thursday" : "יום חמישי",
+    "Friday" : "יום שישי",
+    "Saturday" : "שבת",
+    "January" : "ינואר",
+    "February" : "פברואר",
+    "March" : "מרץ",
+    "April" : "אפריל",
+    "May" : "מאי",
+    "June" : "יוני",
+    "July" : "יולי",
+    "August" : "אוגוסט",
+    "September" : "ספטמבר",
+    "October" : "אוקטובר",
+    "November" : "נובמבר",
+    "December" : "דצמבר",
+    "Settings" : "הגדרות",
+    "Folder" : "תיקייה",
+    "Saving..." : "שמירה…",
+    "Reset password" : "איפוס ססמה",
+    "No" : "לא",
+    "Yes" : "כן",
+    "Choose" : "בחירה",
+    "Ok" : "בסדר",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "New Files" : "קבצים חדשים",
+    "Cancel" : "ביטול",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
+    "Shared" : "שותף",
+    "Share" : "שתף",
+    "Error" : "שגיאה",
+    "Error while sharing" : "שגיאה במהלך השיתוף",
+    "Error while unsharing" : "שגיאה במהלך ביטול השיתוף",
+    "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות",
+    "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
+    "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
+    "Share link" : "קישור לשיתוף",
+    "Password protect" : "הגנה בססמה",
+    "Email link to person" : "שליחת קישור בדוא״ל למשתמש",
+    "Send" : "שליחה",
+    "Set expiration date" : "הגדרת תאריך תפוגה",
+    "Expiration date" : "תאריך התפוגה",
+    "group" : "קבוצה",
+    "Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
+    "Shared in {item} with {user}" : "שותף תחת {item} עם {user}",
+    "Unshare" : "הסר שיתוף",
+    "can share" : "ניתן לשתף",
+    "can edit" : "ניתן לערוך",
+    "access control" : "בקרת גישה",
+    "create" : "יצירה",
+    "update" : "עדכון",
+    "delete" : "מחיקה",
+    "Password protected" : "מוגן בססמה",
+    "Error unsetting expiration date" : "אירעה שגיאה בביטול תאריך התפוגה",
+    "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+    "Sending ..." : "מתבצעת שליחה ...",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "Warning" : "אזהרה",
+    "The object type is not specified." : "סוג הפריט לא צוין.",
+    "Delete" : "מחיקה",
+    "Add" : "הוספה",
+    "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
+    "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
+    "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
+    "Username" : "שם משתמש",
+    "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
+    "New password" : "ססמה חדשה",
+    "Personal" : "אישי",
+    "Users" : "משתמשים",
+    "Apps" : "יישומים",
+    "Admin" : "מנהל",
+    "Help" : "עזרה",
+    "Access forbidden" : "הגישה נחסמה",
+    "Security Warning" : "אזהרת אבטחה",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
+    "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
+    "Password" : "סיסמא",
+    "Data folder" : "תיקיית נתונים",
+    "Configure the database" : "הגדרת מסד הנתונים",
+    "Database user" : "שם משתמש במסד הנתונים",
+    "Database password" : "ססמת מסד הנתונים",
+    "Database name" : "שם מסד הנתונים",
+    "Database tablespace" : "מרחב הכתובות של מסד הנתונים",
+    "Database host" : "שרת בסיס נתונים",
+    "Finish setup" : "סיום התקנה",
+    "%s is available. Get more information on how to update." : "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
+    "Log out" : "התנתקות",
+    "remember" : "שמירת הססמה",
+    "Log in" : "כניסה",
+    "Alternative Logins" : "כניסות אלטרנטיביות"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/he.json b/core/l10n/he.json
new file mode 100644
index 00000000000..ea7f1e5e058
--- /dev/null
+++ b/core/l10n/he.json
@@ -0,0 +1,98 @@
+{ "translations": {
+    "Sunday" : "יום ראשון",
+    "Monday" : "יום שני",
+    "Tuesday" : "יום שלישי",
+    "Wednesday" : "יום רביעי",
+    "Thursday" : "יום חמישי",
+    "Friday" : "יום שישי",
+    "Saturday" : "שבת",
+    "January" : "ינואר",
+    "February" : "פברואר",
+    "March" : "מרץ",
+    "April" : "אפריל",
+    "May" : "מאי",
+    "June" : "יוני",
+    "July" : "יולי",
+    "August" : "אוגוסט",
+    "September" : "ספטמבר",
+    "October" : "אוקטובר",
+    "November" : "נובמבר",
+    "December" : "דצמבר",
+    "Settings" : "הגדרות",
+    "Folder" : "תיקייה",
+    "Saving..." : "שמירה…",
+    "Reset password" : "איפוס ססמה",
+    "No" : "לא",
+    "Yes" : "כן",
+    "Choose" : "בחירה",
+    "Ok" : "בסדר",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "New Files" : "קבצים חדשים",
+    "Cancel" : "ביטול",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
+    "Shared" : "שותף",
+    "Share" : "שתף",
+    "Error" : "שגיאה",
+    "Error while sharing" : "שגיאה במהלך השיתוף",
+    "Error while unsharing" : "שגיאה במהלך ביטול השיתוף",
+    "Error while changing permissions" : "שגיאה במהלך שינוי ההגדרות",
+    "Shared with you and the group {group} by {owner}" : "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
+    "Shared with you by {owner}" : "שותף אתך על ידי {owner}",
+    "Share link" : "קישור לשיתוף",
+    "Password protect" : "הגנה בססמה",
+    "Email link to person" : "שליחת קישור בדוא״ל למשתמש",
+    "Send" : "שליחה",
+    "Set expiration date" : "הגדרת תאריך תפוגה",
+    "Expiration date" : "תאריך התפוגה",
+    "group" : "קבוצה",
+    "Resharing is not allowed" : "אסור לעשות שיתוף מחדש",
+    "Shared in {item} with {user}" : "שותף תחת {item} עם {user}",
+    "Unshare" : "הסר שיתוף",
+    "can share" : "ניתן לשתף",
+    "can edit" : "ניתן לערוך",
+    "access control" : "בקרת גישה",
+    "create" : "יצירה",
+    "update" : "עדכון",
+    "delete" : "מחיקה",
+    "Password protected" : "מוגן בססמה",
+    "Error unsetting expiration date" : "אירעה שגיאה בביטול תאריך התפוגה",
+    "Error setting expiration date" : "אירעה שגיאה בעת הגדרת תאריך התפוגה",
+    "Sending ..." : "מתבצעת שליחה ...",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "Warning" : "אזהרה",
+    "The object type is not specified." : "סוג הפריט לא צוין.",
+    "Delete" : "מחיקה",
+    "Add" : "הוספה",
+    "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
+    "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
+    "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
+    "Username" : "שם משתמש",
+    "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
+    "New password" : "ססמה חדשה",
+    "Personal" : "אישי",
+    "Users" : "משתמשים",
+    "Apps" : "יישומים",
+    "Admin" : "מנהל",
+    "Help" : "עזרה",
+    "Access forbidden" : "הגישה נחסמה",
+    "Security Warning" : "אזהרת אבטחה",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
+    "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
+    "Password" : "סיסמא",
+    "Data folder" : "תיקיית נתונים",
+    "Configure the database" : "הגדרת מסד הנתונים",
+    "Database user" : "שם משתמש במסד הנתונים",
+    "Database password" : "ססמת מסד הנתונים",
+    "Database name" : "שם מסד הנתונים",
+    "Database tablespace" : "מרחב הכתובות של מסד הנתונים",
+    "Database host" : "שרת בסיס נתונים",
+    "Finish setup" : "סיום התקנה",
+    "%s is available. Get more information on how to update." : "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
+    "Log out" : "התנתקות",
+    "remember" : "שמירת הססמה",
+    "Log in" : "כניסה",
+    "Alternative Logins" : "כניסות אלטרנטיביות"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/he.php b/core/l10n/he.php
deleted file mode 100644
index 39ce0956dd7..00000000000
--- a/core/l10n/he.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "יום ראשון",
-"Monday" => "יום שני",
-"Tuesday" => "יום שלישי",
-"Wednesday" => "יום רביעי",
-"Thursday" => "יום חמישי",
-"Friday" => "יום שישי",
-"Saturday" => "שבת",
-"January" => "ינואר",
-"February" => "פברואר",
-"March" => "מרץ",
-"April" => "אפריל",
-"May" => "מאי",
-"June" => "יוני",
-"July" => "יולי",
-"August" => "אוגוסט",
-"September" => "ספטמבר",
-"October" => "אוקטובר",
-"November" => "נובמבר",
-"December" => "דצמבר",
-"Settings" => "הגדרות",
-"Folder" => "תיקייה",
-"Saving..." => "שמירה…",
-"Reset password" => "איפוס ססמה",
-"No" => "לא",
-"Yes" => "כן",
-"Choose" => "בחירה",
-"Ok" => "בסדר",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"New Files" => "קבצים חדשים",
-"Cancel" => "ביטול",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "שרת האינטרנט שלך אינו מוגדר לצורכי סנכרון קבצים עדיין כיוון שמנשק ה־WebDAV כנראה אינו תקין.",
-"Shared" => "שותף",
-"Share" => "שתף",
-"Error" => "שגיאה",
-"Error while sharing" => "שגיאה במהלך השיתוף",
-"Error while unsharing" => "שגיאה במהלך ביטול השיתוף",
-"Error while changing permissions" => "שגיאה במהלך שינוי ההגדרות",
-"Shared with you and the group {group} by {owner}" => "שותף אתך ועם הקבוצה {group} שבבעלות {owner}",
-"Shared with you by {owner}" => "שותף אתך על ידי {owner}",
-"Share link" => "קישור לשיתוף",
-"Password protect" => "הגנה בססמה",
-"Email link to person" => "שליחת קישור בדוא״ל למשתמש",
-"Send" => "שליחה",
-"Set expiration date" => "הגדרת תאריך תפוגה",
-"Expiration date" => "תאריך התפוגה",
-"group" => "קבוצה",
-"Resharing is not allowed" => "אסור לעשות שיתוף מחדש",
-"Shared in {item} with {user}" => "שותף תחת {item} עם {user}",
-"Unshare" => "הסר שיתוף",
-"can share" => "ניתן לשתף",
-"can edit" => "ניתן לערוך",
-"access control" => "בקרת גישה",
-"create" => "יצירה",
-"update" => "עדכון",
-"delete" => "מחיקה",
-"Password protected" => "מוגן בססמה",
-"Error unsetting expiration date" => "אירעה שגיאה בביטול תאריך התפוגה",
-"Error setting expiration date" => "אירעה שגיאה בעת הגדרת תאריך התפוגה",
-"Sending ..." => "מתבצעת שליחה ...",
-"Email sent" => "הודעת הדוא״ל נשלחה",
-"Warning" => "אזהרה",
-"The object type is not specified." => "סוג הפריט לא צוין.",
-"Delete" => "מחיקה",
-"Add" => "הוספה",
-"The update was successful. Redirecting you to ownCloud now." => "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
-"Use the following link to reset your password: {link}" => "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
-"You will receive a link to reset your password via Email." => "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-"Username" => "שם משתמש",
-"Yes, I really want to reset my password now" => "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
-"New password" => "ססמה חדשה",
-"Personal" => "אישי",
-"Users" => "משתמשים",
-"Apps" => "יישומים",
-"Admin" => "מנהל",
-"Help" => "עזרה",
-"Access forbidden" => "הגישה נחסמה",
-"Security Warning" => "אזהרת אבטחה",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "גרסת ה־PHP פגיעה בפני התקפת בית NULL/ריק (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
-"Create an <strong>admin account</strong>" => "יצירת <strong>חשבון מנהל</strong>",
-"Password" => "סיסמא",
-"Data folder" => "תיקיית נתונים",
-"Configure the database" => "הגדרת מסד הנתונים",
-"Database user" => "שם משתמש במסד הנתונים",
-"Database password" => "ססמת מסד הנתונים",
-"Database name" => "שם מסד הנתונים",
-"Database tablespace" => "מרחב הכתובות של מסד הנתונים",
-"Database host" => "שרת בסיס נתונים",
-"Finish setup" => "סיום התקנה",
-"%s is available. Get more information on how to update." => "%s זמינה להורדה. ניתן ללחוץ כדי לקבל מידע נוסף כיצד לעדכן.",
-"Log out" => "התנתקות",
-"remember" => "שמירת הססמה",
-"Log in" => "כניסה",
-"Alternative Logins" => "כניסות אלטרנטיביות"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
new file mode 100644
index 00000000000..a58e175149a
--- /dev/null
+++ b/core/l10n/hi.js
@@ -0,0 +1,53 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "रविवार",
+    "Monday" : "सोमवार",
+    "Tuesday" : "मंगलवार",
+    "Wednesday" : "बुधवार",
+    "Thursday" : "बृहस्पतिवार",
+    "Friday" : "शुक्रवार",
+    "Saturday" : "शनिवार",
+    "January" : "जनवरी",
+    "February" : "फरवरी",
+    "March" : "मार्च",
+    "April" : "अप्रैल",
+    "May" : "मई",
+    "June" : "जून",
+    "July" : "जुलाई",
+    "August" : "अगस्त",
+    "September" : "सितम्बर",
+    "October" : "अक्टूबर",
+    "November" : "नवंबर",
+    "December" : "दिसम्बर",
+    "Settings" : "सेटिंग्स",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "रद्द करें ",
+    "Share" : "साझा करें",
+    "Error" : "त्रुटि",
+    "Send" : "भेजें",
+    "Sending ..." : "भेजा जा रहा है",
+    "Email sent" : "ईमेल भेज दिया गया है ",
+    "Warning" : "चेतावनी ",
+    "Add" : "डाले",
+    "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
+    "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
+    "Username" : "प्रयोक्ता का नाम",
+    "New password" : "नया पासवर्ड",
+    "Personal" : "यक्तिगत",
+    "Users" : "उपयोगकर्ता",
+    "Apps" : "Apps",
+    "Help" : "सहयोग",
+    "Security Warning" : "सुरक्षा चेतावनी ",
+    "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
+    "Password" : "पासवर्ड",
+    "Data folder" : "डाटा फोल्डर",
+    "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ",
+    "Database user" : "डेटाबेस उपयोगकर्ता",
+    "Database password" : "डेटाबेस पासवर्ड",
+    "Database name" : "डेटाबेस का नाम",
+    "Finish setup" : "सेटअप समाप्त करे",
+    "Log out" : "लोग  आउट",
+    "remember" : "याद रखें"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
new file mode 100644
index 00000000000..c1041efafb9
--- /dev/null
+++ b/core/l10n/hi.json
@@ -0,0 +1,51 @@
+{ "translations": {
+    "Sunday" : "रविवार",
+    "Monday" : "सोमवार",
+    "Tuesday" : "मंगलवार",
+    "Wednesday" : "बुधवार",
+    "Thursday" : "बृहस्पतिवार",
+    "Friday" : "शुक्रवार",
+    "Saturday" : "शनिवार",
+    "January" : "जनवरी",
+    "February" : "फरवरी",
+    "March" : "मार्च",
+    "April" : "अप्रैल",
+    "May" : "मई",
+    "June" : "जून",
+    "July" : "जुलाई",
+    "August" : "अगस्त",
+    "September" : "सितम्बर",
+    "October" : "अक्टूबर",
+    "November" : "नवंबर",
+    "December" : "दिसम्बर",
+    "Settings" : "सेटिंग्स",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "रद्द करें ",
+    "Share" : "साझा करें",
+    "Error" : "त्रुटि",
+    "Send" : "भेजें",
+    "Sending ..." : "भेजा जा रहा है",
+    "Email sent" : "ईमेल भेज दिया गया है ",
+    "Warning" : "चेतावनी ",
+    "Add" : "डाले",
+    "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
+    "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
+    "Username" : "प्रयोक्ता का नाम",
+    "New password" : "नया पासवर्ड",
+    "Personal" : "यक्तिगत",
+    "Users" : "उपयोगकर्ता",
+    "Apps" : "Apps",
+    "Help" : "सहयोग",
+    "Security Warning" : "सुरक्षा चेतावनी ",
+    "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
+    "Password" : "पासवर्ड",
+    "Data folder" : "डाटा फोल्डर",
+    "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ",
+    "Database user" : "डेटाबेस उपयोगकर्ता",
+    "Database password" : "डेटाबेस पासवर्ड",
+    "Database name" : "डेटाबेस का नाम",
+    "Finish setup" : "सेटअप समाप्त करे",
+    "Log out" : "लोग  आउट",
+    "remember" : "याद रखें"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/hi.php b/core/l10n/hi.php
deleted file mode 100644
index ef81f978aa3..00000000000
--- a/core/l10n/hi.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "रविवार",
-"Monday" => "सोमवार",
-"Tuesday" => "मंगलवार",
-"Wednesday" => "बुधवार",
-"Thursday" => "बृहस्पतिवार",
-"Friday" => "शुक्रवार",
-"Saturday" => "शनिवार",
-"January" => "जनवरी",
-"February" => "फरवरी",
-"March" => "मार्च",
-"April" => "अप्रैल",
-"May" => "मई",
-"June" => "जून",
-"July" => "जुलाई",
-"August" => "अगस्त",
-"September" => "सितम्बर",
-"October" => "अक्टूबर",
-"November" => "नवंबर",
-"December" => "दिसम्बर",
-"Settings" => "सेटिंग्स",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "रद्द करें ",
-"Share" => "साझा करें",
-"Error" => "त्रुटि",
-"Send" => "भेजें",
-"Sending ..." => "भेजा जा रहा है",
-"Email sent" => "ईमेल भेज दिया गया है ",
-"Warning" => "चेतावनी ",
-"Add" => "डाले",
-"Use the following link to reset your password: {link}" => "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
-"You will receive a link to reset your password via Email." => "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
-"Username" => "प्रयोक्ता का नाम",
-"New password" => "नया पासवर्ड",
-"Personal" => "यक्तिगत",
-"Users" => "उपयोगकर्ता",
-"Apps" => "Apps",
-"Help" => "सहयोग",
-"Security Warning" => "सुरक्षा चेतावनी ",
-"Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
-"Password" => "पासवर्ड",
-"Data folder" => "डाटा फोल्डर",
-"Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
-"Database user" => "डेटाबेस उपयोगकर्ता",
-"Database password" => "डेटाबेस पासवर्ड",
-"Database name" => "डेटाबेस का नाम",
-"Finish setup" => "सेटअप समाप्त करे",
-"Log out" => "लोग  आउट",
-"remember" => "याद रखें"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
new file mode 100644
index 00000000000..019b5a5f6a4
--- /dev/null
+++ b/core/l10n/hr.js
@@ -0,0 +1,193 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nije moguće slanje pošte sljedećim korisnicima: %s",
+    "Turned on maintenance mode" : "Način rada za održavanje uključen",
+    "Turned off maintenance mode" : "Način rada za održavanje isključen",
+    "Updated database" : " Baza podataka ažurirana",
+    "Checked database schema update" : "Provjereno ažuriranje sheme  baze podataka",
+    "Checked database schema update for apps" : "Provjereno ažuriranje sheme baze podataka za aplikacije",
+    "Updated \"%s\" to %s" : "Ažurirano \"%s\" u %s",
+    "Disabled incompatible apps: %s" : "Onemogućene inkompatibilne applikacije: %s",
+    "No image or file provided" : "Nijedna slika ili datoteka nije dobavljena",
+    "Unknown filetype" : "Vrsta datoteke nepoznata",
+    "Invalid image" : "Slika neispravna",
+    "No temporary profile picture available, try again" : "Slike privremenih profila nisu dostupne, pokušajte ponovno",
+    "No crop data provided" : "Nema podataka o obrezivanju",
+    "Sunday" : "Nedjelja",
+    "Monday" : "Ponedjeljak",
+    "Tuesday" : "Utorak",
+    "Wednesday" : "Srijeda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Siječanj",
+    "February" : "Veljača",
+    "March" : "Ožujak",
+    "April" : "Travanj",
+    "May" : "Svibanj",
+    "June" : "Lipanj",
+    "July" : "Srpanj",
+    "August" : "Kolovoz",
+    "September" : "Rujan",
+    "October" : "Listopad",
+    "November" : "Studeni",
+    "December" : "Prosinac",
+    "Settings" : "Postavke",
+    "File" : "Datoteka",
+    "Folder" : "Mapa",
+    "Image" : "Slika",
+    "Audio" : "Audio",
+    "Saving..." : "Spremanje...",
+    "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?",
+    "I know what I'm doing" : "Znam što radim",
+    "Reset password" : "Resetirajte lozinku",
+    "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Odaberite",
+    "Error loading file picker template: {error}" : "Pogrešno učitavanje predloška za pronalazača datoteke: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Pogrešno učitavanje predloška za poruke: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["neželjeno podudaranje u {count} datoteci","neželjeno podudaranje u {count} datoteke","neželjeno podudaranje u {count} datoteke"],
+    "One file conflict" : "Konflikt u jednoj datoteci",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Postojeće datoteke",
+    "Which files do you want to keep?" : "Koje datoteke želite zadržati?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ako odaberete obje verzije, kopirana će datoteka uz svoje ime imati i broj.",
+    "Cancel" : "Odustani",
+    "Continue" : "Nastavi",
+    "(all selected)" : "(sve odabrano)",
+    "({count} selected)" : "({count} odabran)",
+    "Error loading file exists template" : "Pogrešno učitavanje predloška DATOTEKA POSTOJI",
+    "Very weak password" : "Lozinka vrlo slaba",
+    "Weak password" : "Lozinka Slaba",
+    "So-so password" : "Lozinka tako-tako",
+    "Good password" : "Lozinka dobra",
+    "Strong password" : "Lozinka snažna",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Vaš web poslužitelj još nije propisno postavljen da bi omogućio sinkronizaciju datoteka jer izgleda da jesučelje WebDAV neispravno.",
+    "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." : "Ovaj poslužitelj nema nikakvu radnu vezu s internetom. To znači da ne rade neke od njegovihfunkcija kao što su spajanje na vanjsku memoriju, notifikacije o ažuriranju ili instalacijiaplikacija treće strane. Također, možda je onemogućen daljinski pristup datotekama i slanjenotifikacijske e-pošte. Savjetujemo vam da, ako želite da sve njegove funkcije rade,omogućite vezuovog poslužitelja s internetom.",
+    "Shared" : "Resurs podijeljen",
+    "Shared with {recipients}" : "Resurs podijeljen s {recipients}",
+    "Share" : "Podijelite",
+    "Error" : "Pogreška",
+    "Error while sharing" : "Pogreška pri dijeljenju",
+    "Error while unsharing" : "Pogreška pri prestanku dijeljenja",
+    "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "S vama podijelio {owner}",
+    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
+    "Share link" : "Podijelite vezu",
+    "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Password protect" : "Zaštititi lozinkom",
+    "Choose a password for the public link" : "Odaberite lozinku za javnu vezu",
+    "Allow Public Upload" : "Omogućite javno učitavanje",
+    "Email link to person" : "Pošaljite osobi vezu e-poštom",
+    "Send" : "Pošaljite",
+    "Set expiration date" : "Odredite datum isteka",
+    "Expiration date" : "Datum isteka",
+    "group" : "Grupa",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
+    "Unshare" : "Prestanite dijeliti",
+    "notify by email" : "Obavijestite e-poštom",
+    "can share" : "Dijeljenje moguće",
+    "can edit" : "Uređivanje moguće",
+    "access control" : "Kontrola pristupa",
+    "create" : "Kreirajte",
+    "update" : "Ažurirajte",
+    "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",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Vrsta objekta nije specificirana.",
+    "Enter new" : "Unesite novi",
+    "Delete" : "Izbrišite",
+    "Add" : "Dodajte",
+    "Edit tags" : "Uredite oznake",
+    "Error loading dialog template: {error}" : "Pogrešno učitavanje predloška dijaloga: {error}",
+    "No tags selected for deletion." : "Nijedna oznaka nije odabrana za brisanje.",
+    "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
+    "Please reload the page." : "Molimo, ponovno učitajte stranicu",
+    "The update was unsuccessful." : "Ažuriranje nije uspjelo",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Resetiranje lozinke nije moguće jer je token neispravan.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Resetiranu e-poštu nije moguće poslati.Molimo provjerite ispravnost svoga korisničkog imena.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
+    "%s password reset" : "%s lozinka resetirana",
+    "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
+    "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
+    "Username" : "Korisničko ime",
+    "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?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
+    "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.",
+    "Reset" : "Resetirajte",
+    "New password" : "Nova lozinka",
+    "New Password" : "Nova lozinka",
+    "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.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
+    "Personal" : "Osobno",
+    "Users" : "Korisnici",
+    "Apps" : "Aplikacije",
+    "Admin" : "Admin",
+    "Help" : "Pomoć",
+    "Error loading tags" : "Pogrešno učitavanje oznaka",
+    "Tag already exists" : "Oznaka već postoji",
+    "Error deleting tag(s)" : "Pogrešno brisanje oznake (oznaka)",
+    "Error tagging" : "Pogrešno označavanje",
+    "Error untagging" : "Pogrešno uklanjanje oznaka",
+    "Error favoriting" : "Pogrešno dodavanje u favorite",
+    "Error unfavoriting" : "Pogrešno uklanjanje iz favorita",
+    "Access forbidden" : "Pristup zabranjen",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej, \n\nsamo vam javljamo da je %s podijelio %s s vama.\nPogledajte ga: %s\n\n",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
+    "Security Warning" : "Sigurnosno upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je podložna napadu NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Molimo ažurirajte svoju PHP instalaciju da biste mogli sigurno koristiti %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
+    "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
+    "Password" : "Lozinka",
+    "Storage & database" : "Pohrana & baza podataka",
+    "Data folder" : "Mapa za podatke",
+    "Configure the database" : "Konfigurirajte bazu podataka",
+    "Only %s is available." : "Jedino je %s dostupan.",
+    "Database user" : "Korisnik baze podataka",
+    "Database password" : "Lozinka baze podataka",
+    "Database name" : "Naziv baze podataka",
+    "Database tablespace" : "Tablespace (?) baze podataka",
+    "Database host" : "Glavno računalo baze podataka",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
+    "Finish setup" : "Završite postavljanje",
+    "Finishing …" : "Završavanje...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
+    "%s is available. Get more information on how to update." : "%s je dostupan. Saznajte više informacija o tome kako ažurirati.",
+    "Log out" : "Odjavite se",
+    "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
+    "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
+    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetirajte ju!",
+    "remember" : "Sjetite se",
+    "Log in" : "Prijavite se",
+    "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.",
+    "This means only administrators can use the instance." : "To znači da tu instancu mogu koristiti samo administratori.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktirajte svog administratora sustava ako se ova poruka ponavlja ili sepojavila neočekivano.",
+    "Thank you for your patience." : "Hvala vam na strpljenju",
+    "You are accessing the server from an untrusted domain." : "Poslužitelju pristupate iz nepouzdane domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molimo kontaktirajte svog administratora. Ako ste vi administrator ove instance,konfigurirajte postavku \"trusted_domain\" config/config.php.Primjer konfiguracije ponuđen je u config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristitigumb dolje za pristup toj domeni.",
+    "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao pouzdanu domenu.",
+    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
+    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene",
+    "The theme %s has been disabled." : "Tema %s je onemogućena",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego li nastavite, molimo osigurajte da su baza podataka, mapa konfiguracije i mapaza podatke sigurnosno kopirani.",
+    "Start update" : "Započnite ažuriranje",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Da biste izbjegli vremensko prekoračenje s većim instalacijama, možete pokrenutisljedeću naredbu iz svoga instalacijskog direktorija:"
+},
+"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
new file mode 100644
index 00000000000..17985b11abc
--- /dev/null
+++ b/core/l10n/hr.json
@@ -0,0 +1,191 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nije moguće slanje pošte sljedećim korisnicima: %s",
+    "Turned on maintenance mode" : "Način rada za održavanje uključen",
+    "Turned off maintenance mode" : "Način rada za održavanje isključen",
+    "Updated database" : " Baza podataka ažurirana",
+    "Checked database schema update" : "Provjereno ažuriranje sheme  baze podataka",
+    "Checked database schema update for apps" : "Provjereno ažuriranje sheme baze podataka za aplikacije",
+    "Updated \"%s\" to %s" : "Ažurirano \"%s\" u %s",
+    "Disabled incompatible apps: %s" : "Onemogućene inkompatibilne applikacije: %s",
+    "No image or file provided" : "Nijedna slika ili datoteka nije dobavljena",
+    "Unknown filetype" : "Vrsta datoteke nepoznata",
+    "Invalid image" : "Slika neispravna",
+    "No temporary profile picture available, try again" : "Slike privremenih profila nisu dostupne, pokušajte ponovno",
+    "No crop data provided" : "Nema podataka o obrezivanju",
+    "Sunday" : "Nedjelja",
+    "Monday" : "Ponedjeljak",
+    "Tuesday" : "Utorak",
+    "Wednesday" : "Srijeda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Siječanj",
+    "February" : "Veljača",
+    "March" : "Ožujak",
+    "April" : "Travanj",
+    "May" : "Svibanj",
+    "June" : "Lipanj",
+    "July" : "Srpanj",
+    "August" : "Kolovoz",
+    "September" : "Rujan",
+    "October" : "Listopad",
+    "November" : "Studeni",
+    "December" : "Prosinac",
+    "Settings" : "Postavke",
+    "File" : "Datoteka",
+    "Folder" : "Mapa",
+    "Image" : "Slika",
+    "Audio" : "Audio",
+    "Saving..." : "Spremanje...",
+    "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?",
+    "I know what I'm doing" : "Znam što radim",
+    "Reset password" : "Resetirajte lozinku",
+    "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Odaberite",
+    "Error loading file picker template: {error}" : "Pogrešno učitavanje predloška za pronalazača datoteke: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Pogrešno učitavanje predloška za poruke: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["neželjeno podudaranje u {count} datoteci","neželjeno podudaranje u {count} datoteke","neželjeno podudaranje u {count} datoteke"],
+    "One file conflict" : "Konflikt u jednoj datoteci",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Postojeće datoteke",
+    "Which files do you want to keep?" : "Koje datoteke želite zadržati?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ako odaberete obje verzije, kopirana će datoteka uz svoje ime imati i broj.",
+    "Cancel" : "Odustani",
+    "Continue" : "Nastavi",
+    "(all selected)" : "(sve odabrano)",
+    "({count} selected)" : "({count} odabran)",
+    "Error loading file exists template" : "Pogrešno učitavanje predloška DATOTEKA POSTOJI",
+    "Very weak password" : "Lozinka vrlo slaba",
+    "Weak password" : "Lozinka Slaba",
+    "So-so password" : "Lozinka tako-tako",
+    "Good password" : "Lozinka dobra",
+    "Strong password" : "Lozinka snažna",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Vaš web poslužitelj još nije propisno postavljen da bi omogućio sinkronizaciju datoteka jer izgleda da jesučelje WebDAV neispravno.",
+    "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." : "Ovaj poslužitelj nema nikakvu radnu vezu s internetom. To znači da ne rade neke od njegovihfunkcija kao što su spajanje na vanjsku memoriju, notifikacije o ažuriranju ili instalacijiaplikacija treće strane. Također, možda je onemogućen daljinski pristup datotekama i slanjenotifikacijske e-pošte. Savjetujemo vam da, ako želite da sve njegove funkcije rade,omogućite vezuovog poslužitelja s internetom.",
+    "Shared" : "Resurs podijeljen",
+    "Shared with {recipients}" : "Resurs podijeljen s {recipients}",
+    "Share" : "Podijelite",
+    "Error" : "Pogreška",
+    "Error while sharing" : "Pogreška pri dijeljenju",
+    "Error while unsharing" : "Pogreška pri prestanku dijeljenja",
+    "Error while changing permissions" : "POgreška pri mijenjanju dozvola",
+    "Shared with you and the group {group} by {owner}" : "Dijeljeno s vama i grupom {group} vlasnika {owner}",
+    "Shared with you by {owner}" : "S vama podijelio {owner}",
+    "Share with user or group …" : "Podijelite s korisnikom ili grupom ...",
+    "Share link" : "Podijelite vezu",
+    "The public link will expire no later than {days} days after it is created" : " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
+    "Password protect" : "Zaštititi lozinkom",
+    "Choose a password for the public link" : "Odaberite lozinku za javnu vezu",
+    "Allow Public Upload" : "Omogućite javno učitavanje",
+    "Email link to person" : "Pošaljite osobi vezu e-poštom",
+    "Send" : "Pošaljite",
+    "Set expiration date" : "Odredite datum isteka",
+    "Expiration date" : "Datum isteka",
+    "group" : "Grupa",
+    "Resharing is not allowed" : "Ponovno dijeljenje nije dopušteno",
+    "Shared in {item} with {user}" : "Podijeljeno u {item} s {user}",
+    "Unshare" : "Prestanite dijeliti",
+    "notify by email" : "Obavijestite e-poštom",
+    "can share" : "Dijeljenje moguće",
+    "can edit" : "Uređivanje moguće",
+    "access control" : "Kontrola pristupa",
+    "create" : "Kreirajte",
+    "update" : "Ažurirajte",
+    "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",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Vrsta objekta nije specificirana.",
+    "Enter new" : "Unesite novi",
+    "Delete" : "Izbrišite",
+    "Add" : "Dodajte",
+    "Edit tags" : "Uredite oznake",
+    "Error loading dialog template: {error}" : "Pogrešno učitavanje predloška dijaloga: {error}",
+    "No tags selected for deletion." : "Nijedna oznaka nije odabrana za brisanje.",
+    "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
+    "Please reload the page." : "Molimo, ponovno učitajte stranicu",
+    "The update was unsuccessful." : "Ažuriranje nije uspjelo",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Resetiranje lozinke nije moguće jer je token neispravan.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Resetiranu e-poštu nije moguće poslati.Molimo provjerite ispravnost svoga korisničkog imena.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
+    "%s password reset" : "%s lozinka resetirana",
+    "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
+    "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
+    "Username" : "Korisničko ime",
+    "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?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
+    "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.",
+    "Reset" : "Resetirajte",
+    "New password" : "Nova lozinka",
+    "New Password" : "Nova lozinka",
+    "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.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
+    "Personal" : "Osobno",
+    "Users" : "Korisnici",
+    "Apps" : "Aplikacije",
+    "Admin" : "Admin",
+    "Help" : "Pomoć",
+    "Error loading tags" : "Pogrešno učitavanje oznaka",
+    "Tag already exists" : "Oznaka već postoji",
+    "Error deleting tag(s)" : "Pogrešno brisanje oznake (oznaka)",
+    "Error tagging" : "Pogrešno označavanje",
+    "Error untagging" : "Pogrešno uklanjanje oznaka",
+    "Error favoriting" : "Pogrešno dodavanje u favorite",
+    "Error unfavoriting" : "Pogrešno uklanjanje iz favorita",
+    "Access forbidden" : "Pristup zabranjen",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej, \n\nsamo vam javljamo da je %s podijelio %s s vama.\nPogledajte ga: %s\n\n",
+    "The share will expire on %s." : "Podijeljeni resurs će isteći na %s.",
+    "Cheers!" : "Cheers!",
+    "Security Warning" : "Sigurnosno upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je podložna napadu NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Molimo ažurirajte svoju PHP instalaciju da biste mogli sigurno koristiti %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
+    "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
+    "Password" : "Lozinka",
+    "Storage & database" : "Pohrana & baza podataka",
+    "Data folder" : "Mapa za podatke",
+    "Configure the database" : "Konfigurirajte bazu podataka",
+    "Only %s is available." : "Jedino je %s dostupan.",
+    "Database user" : "Korisnik baze podataka",
+    "Database password" : "Lozinka baze podataka",
+    "Database name" : "Naziv baze podataka",
+    "Database tablespace" : "Tablespace (?) baze podataka",
+    "Database host" : "Glavno računalo baze podataka",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
+    "Finish setup" : "Završite postavljanje",
+    "Finishing …" : "Završavanje...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
+    "%s is available. Get more information on how to update." : "%s je dostupan. Saznajte više informacija o tome kako ažurirati.",
+    "Log out" : "Odjavite se",
+    "Server side authentication failed!" : "Autentikacija na strani poslužitelja nije uspjela!",
+    "Please contact your administrator." : "Molimo kontaktirajte svog administratora.",
+    "Forgot your password? Reset it!" : "Zaboravili ste svoju lozinku? Resetirajte ju!",
+    "remember" : "Sjetite se",
+    "Log in" : "Prijavite se",
+    "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.",
+    "This means only administrators can use the instance." : "To znači da tu instancu mogu koristiti samo administratori.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktirajte svog administratora sustava ako se ova poruka ponavlja ili sepojavila neočekivano.",
+    "Thank you for your patience." : "Hvala vam na strpljenju",
+    "You are accessing the server from an untrusted domain." : "Poslužitelju pristupate iz nepouzdane domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Molimo kontaktirajte svog administratora. Ako ste vi administrator ove instance,konfigurirajte postavku \"trusted_domain\" config/config.php.Primjer konfiguracije ponuđen je u config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristitigumb dolje za pristup toj domeni.",
+    "Add \"%s\" as trusted domain" : "Dodajte \"%s\" kao pouzdanu domenu.",
+    "%s will be updated to version %s." : "%s će biti ažuriran u verziju %s",
+    "The following apps will be disabled:" : "Sljedeće aplikacije bit će onemogućene",
+    "The theme %s has been disabled." : "Tema %s je onemogućena",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Prije nego li nastavite, molimo osigurajte da su baza podataka, mapa konfiguracije i mapaza podatke sigurnosno kopirani.",
+    "Start update" : "Započnite ažuriranje",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Da biste izbjegli vremensko prekoračenje s većim instalacijama, možete pokrenutisljedeću naredbu iz svoga instalacijskog direktorija:"
+},"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/hr.php b/core/l10n/hr.php
deleted file mode 100644
index ae71027dd74..00000000000
--- a/core/l10n/hr.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nije moguće slanje pošte sljedećim korisnicima: %s",
-"Turned on maintenance mode" => "Način rada za održavanje uključen",
-"Turned off maintenance mode" => "Način rada za održavanje isključen",
-"Updated database" => " Baza podataka ažurirana",
-"Checked database schema update" => "Provjereno ažuriranje sheme  baze podataka",
-"Checked database schema update for apps" => "Provjereno ažuriranje sheme baze podataka za aplikacije",
-"Updated \"%s\" to %s" => "Ažurirano \"%s\" u %s",
-"Disabled incompatible apps: %s" => "Onemogućene inkompatibilne applikacije: %s",
-"No image or file provided" => "Nijedna slika ili datoteka nije dobavljena",
-"Unknown filetype" => "Vrsta datoteke nepoznata",
-"Invalid image" => "Slika neispravna",
-"No temporary profile picture available, try again" => "Slike privremenih profila nisu dostupne, pokušajte ponovno",
-"No crop data provided" => "Nema podataka o obrezivanju",
-"Sunday" => "Nedjelja",
-"Monday" => "Ponedjeljak",
-"Tuesday" => "Utorak",
-"Wednesday" => "Srijeda",
-"Thursday" => "Četvrtak",
-"Friday" => "Petak",
-"Saturday" => "Subota",
-"January" => "Siječanj",
-"February" => "Veljača",
-"March" => "Ožujak",
-"April" => "Travanj",
-"May" => "Svibanj",
-"June" => "Lipanj",
-"July" => "Srpanj",
-"August" => "Kolovoz",
-"September" => "Rujan",
-"October" => "Listopad",
-"November" => "Studeni",
-"December" => "Prosinac",
-"Settings" => "Postavke",
-"File" => "Datoteka",
-"Folder" => "Mapa",
-"Image" => "Slika",
-"Audio" => "Audio",
-"Saving..." => "Spremanje...",
-"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?",
-"I know what I'm doing" => "Znam što radim",
-"Reset password" => "Resetirajte lozinku",
-"Password can not be changed. Please contact your administrator." => "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
-"No" => "Ne",
-"Yes" => "Da",
-"Choose" => "Odaberite",
-"Error loading file picker template: {error}" => "Pogrešno učitavanje predloška za pronalazača datoteke: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Pogrešno učitavanje predloška za poruke: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("neželjeno podudaranje u {count} datoteci","neželjeno podudaranje u {count} datoteke","neželjeno podudaranje u {count} datoteke"),
-"One file conflict" => "Konflikt u jednoj datoteci",
-"New Files" => "Nove datoteke",
-"Already existing files" => "Postojeće datoteke",
-"Which files do you want to keep?" => "Koje datoteke želite zadržati?",
-"If you select both versions, the copied file will have a number added to its name." => "Ako odaberete obje verzije, kopirana će datoteka uz svoje ime imati i broj.",
-"Cancel" => "Odustani",
-"Continue" => "Nastavi",
-"(all selected)" => "(sve odabrano)",
-"({count} selected)" => "({count} odabran)",
-"Error loading file exists template" => "Pogrešno učitavanje predloška DATOTEKA POSTOJI",
-"Very weak password" => "Lozinka vrlo slaba",
-"Weak password" => "Lozinka Slaba",
-"So-so password" => "Lozinka tako-tako",
-"Good password" => "Lozinka dobra",
-"Strong password" => "Lozinka snažna",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Vaš web poslužitelj još nije propisno postavljen da bi omogućio sinkronizaciju datoteka jer izgleda da jesučelje WebDAV neispravno.",
-"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." => "Ovaj poslužitelj nema nikakvu radnu vezu s internetom. To znači da ne rade neke od njegovihfunkcija kao što su spajanje na vanjsku memoriju, notifikacije o ažuriranju ili instalacijiaplikacija treće strane. Također, možda je onemogućen daljinski pristup datotekama i slanjenotifikacijske e-pošte. Savjetujemo vam da, ako želite da sve njegove funkcije rade,omogućite vezuovog poslužitelja s internetom.",
-"Shared" => "Resurs podijeljen",
-"Shared with {recipients}" => "Resurs podijeljen s {recipients}",
-"Share" => "Podijelite",
-"Error" => "Pogreška",
-"Error while sharing" => "Pogreška pri dijeljenju",
-"Error while unsharing" => "Pogreška pri prestanku dijeljenja",
-"Error while changing permissions" => "POgreška pri mijenjanju dozvola",
-"Shared with you and the group {group} by {owner}" => "Dijeljeno s vama i grupom {group} vlasnika {owner}",
-"Shared with you by {owner}" => "S vama podijelio {owner}",
-"Share with user or group …" => "Podijelite s korisnikom ili grupom ...",
-"Share link" => "Podijelite vezu",
-"The public link will expire no later than {days} days after it is created" => " Javna veza ističe najkasnije {days} dana nakon što je kreirana",
-"Password protect" => "Zaštititi lozinkom",
-"Choose a password for the public link" => "Odaberite lozinku za javnu vezu",
-"Allow Public Upload" => "Omogućite javno učitavanje",
-"Email link to person" => "Pošaljite osobi vezu e-poštom",
-"Send" => "Pošaljite",
-"Set expiration date" => "Odredite datum isteka",
-"Expiration date" => "Datum isteka",
-"group" => "Grupa",
-"Resharing is not allowed" => "Ponovno dijeljenje nije dopušteno",
-"Shared in {item} with {user}" => "Podijeljeno u {item} s {user}",
-"Unshare" => "Prestanite dijeliti",
-"notify by email" => "Obavijestite e-poštom",
-"can share" => "Dijeljenje moguće",
-"can edit" => "Uređivanje moguće",
-"access control" => "Kontrola pristupa",
-"create" => "Kreirajte",
-"update" => "Ažurirajte",
-"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",
-"Warning" => "Upozorenje",
-"The object type is not specified." => "Vrsta objekta nije specificirana.",
-"Enter new" => "Unesite novi",
-"Delete" => "Izbrišite",
-"Add" => "Dodajte",
-"Edit tags" => "Uredite oznake",
-"Error loading dialog template: {error}" => "Pogrešno učitavanje predloška dijaloga: {error}",
-"No tags selected for deletion." => "Nijedna oznaka nije odabrana za brisanje.",
-"Updating {productName} to version {version}, this may take a while." => "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
-"Please reload the page." => "Molimo, ponovno učitajte stranicu",
-"The update was unsuccessful." => "Ažuriranje nije uspjelo",
-"The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspjelo. Upravo ste preusmjeravani na ownCloud.",
-"Couldn't reset password because the token is invalid" => "Resetiranje lozinke nije moguće jer je token neispravan.",
-"Couldn't send reset email. Please make sure your username is correct." => "Resetiranu e-poštu nije moguće poslati.Molimo provjerite ispravnost svoga korisničkog imena.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
-"%s password reset" => "%s lozinka resetirana",
-"Use the following link to reset your password: {link}" => "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
-"You will receive a link to reset your password via Email." => "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
-"Username" => "Korisničko ime",
-"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?" => "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
-"Yes, I really want to reset my password now" => "Da, ja doista želim sada resetirati svojju lozinku.",
-"Reset" => "Resetirajte",
-"New password" => "Nova lozinka",
-"New Password" => "Nova lozinka",
-"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.",
-"For the best results, please consider using a GNU/Linux server instead." => "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
-"Personal" => "Osobno",
-"Users" => "Korisnici",
-"Apps" => "Aplikacije",
-"Admin" => "Admin",
-"Help" => "Pomoć",
-"Error loading tags" => "Pogrešno učitavanje oznaka",
-"Tag already exists" => "Oznaka već postoji",
-"Error deleting tag(s)" => "Pogrešno brisanje oznake (oznaka)",
-"Error tagging" => "Pogrešno označavanje",
-"Error untagging" => "Pogrešno uklanjanje oznaka",
-"Error favoriting" => "Pogrešno dodavanje u favorite",
-"Error unfavoriting" => "Pogrešno uklanjanje iz favorita",
-"Access forbidden" => "Pristup zabranjen",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej, \n\nsamo vam javljamo da je %s podijelio %s s vama.\nPogledajte ga: %s\n\n",
-"The share will expire on %s." => "Podijeljeni resurs će isteći na %s.",
-"Cheers!" => "Cheers!",
-"Security Warning" => "Sigurnosno upozorenje",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Vaša PHP verzija je podložna napadu NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Molimo ažurirajte svoju PHP instalaciju da biste mogli sigurno koristiti %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
-"Create an <strong>admin account</strong>" => "Kreirajte <strong>admin račun</strong>",
-"Password" => "Lozinka",
-"Storage & database" => "Pohrana & baza podataka",
-"Data folder" => "Mapa za podatke",
-"Configure the database" => "Konfigurirajte bazu podataka",
-"Only %s is available." => "Jedino je %s dostupan.",
-"Database user" => "Korisnik baze podataka",
-"Database password" => "Lozinka baze podataka",
-"Database name" => "Naziv baze podataka",
-"Database tablespace" => "Tablespace (?) baze podataka",
-"Database host" => "Glavno računalo baze podataka",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite će se koristiti kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.",
-"Finish setup" => "Završite postavljanje",
-"Finishing …" => "Završavanje...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Ova aplikacija zahtjeva JavaScript za ispravan rad. Molimo <a href=\"http://enable-javascript.com/\" target=\"_blank\"> uključite JavaScript</a> i ponovno učitajte stranicu.",
-"%s is available. Get more information on how to update." => "%s je dostupan. Saznajte više informacija o tome kako ažurirati.",
-"Log out" => "Odjavite se",
-"Server side authentication failed!" => "Autentikacija na strani poslužitelja nije uspjela!",
-"Please contact your administrator." => "Molimo kontaktirajte svog administratora.",
-"Forgot your password? Reset it!" => "Zaboravili ste svoju lozinku? Resetirajte ju!",
-"remember" => "Sjetite se",
-"Log in" => "Prijavite se",
-"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.",
-"This means only administrators can use the instance." => "To znači da tu instancu mogu koristiti samo administratori.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktirajte svog administratora sustava ako se ova poruka ponavlja ili sepojavila neočekivano.",
-"Thank you for your patience." => "Hvala vam na strpljenju",
-"You are accessing the server from an untrusted domain." => "Poslužitelju pristupate iz nepouzdane domene.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Molimo kontaktirajte svog administratora. Ako ste vi administrator ove instance,konfigurirajte postavku \"trusted_domain\" config/config.php.Primjer konfiguracije ponuđen je u config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Ovisno o vašoj konfiguraciji, kao administrator vi biste također mogli koristitigumb dolje za pristup toj domeni.",
-"Add \"%s\" as trusted domain" => "Dodajte \"%s\" kao pouzdanu domenu.",
-"%s will be updated to version %s." => "%s će biti ažuriran u verziju %s",
-"The following apps will be disabled:" => "Sljedeće aplikacije bit će onemogućene",
-"The theme %s has been disabled." => "Tema %s je onemogućena",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Prije nego li nastavite, molimo osigurajte da su baza podataka, mapa konfiguracije i mapaza podatke sigurnosno kopirani.",
-"Start update" => "Započnite ažuriranje",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Da biste izbjegli vremensko prekoračenje s većim instalacijama, možete pokrenutisljedeću naredbu iz svoga instalacijskog direktorija:"
-);
-$PLURAL_FORMS = "nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;";
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
new file mode 100644
index 00000000000..1220cf05713
--- /dev/null
+++ b/core/l10n/hu_HU.js
@@ -0,0 +1,205 @@
+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",
+    "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
+    "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
+    "Updated database" : "Az adatbázis frissítése megtörtént",
+    "Checked database schema update" : "Az adatbázis séma frissítését ellenőriztük",
+    "Checked database schema update for apps" : "Az adatbázis séma frissítését ellenőriztük az alkalmazásokra vontakozóan",
+    "Updated \"%s\" to %s" : "Frissítettük  \"%s\"-t erre: %s",
+    "Disabled incompatible apps: %s" : "Letiltásra került inkompatibilis alkalmazások: %s",
+    "No image or file provided" : "Nincs kép vagy fájl megadva",
+    "Unknown filetype" : "Ismeretlen fájltípus",
+    "Invalid image" : "Hibás kép",
+    "No temporary profile picture available, try again" : "Az átmeneti profilkép nem elérhető, próbálja újra",
+    "No crop data provided" : "Vágáshoz nincs adat megadva",
+    "Sunday" : "vasárnap",
+    "Monday" : "hétfő",
+    "Tuesday" : "kedd",
+    "Wednesday" : "szerda",
+    "Thursday" : "csütörtök",
+    "Friday" : "péntek",
+    "Saturday" : "szombat",
+    "January" : "január",
+    "February" : "február",
+    "March" : "március",
+    "April" : "április",
+    "May" : "május",
+    "June" : "június",
+    "July" : "július",
+    "August" : "augusztus",
+    "September" : "szeptember",
+    "October" : "október",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Beállítások",
+    "File" : "Fájl",
+    "Folder" : "Mappa",
+    "Image" : "Kép",
+    "Audio" : "Hang",
+    "Saving..." : "Mentés...",
+    "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "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?",
+    "I know what I'm doing" : "Tudom mit csinálok.",
+    "Reset password" : "Jelszó-visszaállítás",
+    "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
+    "No" : "Nem",
+    "Yes" : "Igen",
+    "Choose" : "Válasszon",
+    "Error loading file picker template: {error}" : "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Nem sikerült betölteni az üzenet sablont: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} fájl ütközik","{count} fájl ütközik"],
+    "One file conflict" : "Egy fájl ütközik",
+    "New Files" : "Új fájlok",
+    "Already existing files" : "A fájlok már léteznek",
+    "Which files do you want to keep?" : "Melyik fájlokat akarja megtartani?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.",
+    "Cancel" : "Mégsem",
+    "Continue" : "Folytatás",
+    "(all selected)" : "(az összes ki lett választva)",
+    "({count} selected)" : "({count} lett kiválasztva)",
+    "Error loading file exists template" : "Hiba a létezőfájl-sablon betöltésekor",
+    "Very weak password" : "Nagyon gyenge jelszó",
+    "Weak password" : "Gyenge jelszó",
+    "So-so password" : "Nem túl jó jelszó",
+    "Good password" : "Jó jelszó",
+    "Strong password" : "Erős jelszó",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
+    "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." : "A kiszolgálónak nem működik az internetkapcsolata. Ez azt jelenti, hogy bizonyos funkciók nem fognak működni, mint pl. külső tárolók becsatolása, automatikus frissítési értesítések vagy más fejlesztők /3rd party/ által írt alkalmazások telepítése. Az állományok távolról történő elérése valamint e-mail értesítések küldése szintén lehet, hogy nem fog működni. Javasoljuk, hogy engedélyezze a kiszolgáló internetelérését, ha az összes funkciót szeretné használni.",
+    "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
+    "Shared" : "Megosztott",
+    "Shared with {recipients}" : "Megosztva ővelük: {recipients}",
+    "Share" : "Megosztás",
+    "Error" : "Hiba",
+    "Error while sharing" : "Nem sikerült létrehozni a megosztást",
+    "Error while unsharing" : "Nem sikerült visszavonni a megosztást",
+    "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 user or group …" : "Megosztani egy felhasználóval vagy csoporttal ...",
+    "Share link" : "Megosztás hivatkozással",
+    "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
+    "Password protect" : "Jelszóval is védem",
+    "Choose a password for the public link" : "Válasszon egy jelszót a nyilvános linkhez",
+    "Allow Public Upload" : "Feltöltést is engedélyezek",
+    "Email link to person" : "Email címre küldjük el",
+    "Send" : "Küldjük el",
+    "Set expiration date" : "Legyen lejárati idő",
+    "Expiration date" : "A lejárati idő",
+    "Adding user..." : "Felhasználó hozzáadása...",
+    "group" : "csoport",
+    "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",
+    "can share" : "megosztható",
+    "can edit" : "módosíthat",
+    "access control" : "jogosultság",
+    "create" : "létrehoz",
+    "update" : "szerkeszt",
+    "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",
+    "Warning" : "Figyelmeztetés",
+    "The object type is not specified." : "Az objektum típusa nincs megadva.",
+    "Enter new" : "Új beírása",
+    "Delete" : "Törlés",
+    "Add" : "Hozzáadás",
+    "Edit tags" : "Címkék szerkesztése",
+    "Error loading dialog template: {error}" : "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
+    "No tags selected for deletion." : "Nincs törlésre kijelölt címke.",
+    "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
+    "Please reload the page." : "Kérjük frissítse az oldalt!",
+    "The update was unsuccessful." : "A frissítés nem sikerült.",
+    "The update was successful. Redirecting you to ownCloud now." : "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
+    "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "%s password reset" : "%s jelszó visszaállítás",
+    "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}",
+    "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
+    "Username" : "Felhasználónév",
+    "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?" : "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?",
+    "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam",
+    "Reset" : "Visszaállítás",
+    "New password" : "Az új jelszó",
+    "New Password" : "Új jelszó",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
+    "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
+    "Personal" : "Személyes",
+    "Users" : "Felhasználók",
+    "Apps" : "Alkalmazások",
+    "Admin" : "Adminsztráció",
+    "Help" : "Súgó",
+    "Error loading tags" : "Hiba a címkék betöltésekor",
+    "Tag already exists" : "A címke már létezik",
+    "Error deleting tag(s)" : "Hiba a címkék törlésekor",
+    "Error tagging" : "Hiba a címkézéskor",
+    "Error untagging" : "Hiba a címkék eltávolításakor",
+    "Error favoriting" : "Hiba a kedvencekhez adáskor",
+    "Error unfavoriting" : "Hiba a kedvencekből törléskor",
+    "Access forbidden" : "A hozzáférés nem engedélyezett",
+    "File not found" : "Fájl nem található",
+    "The specified document has not been found on the server." : "A meghatározott dokumentum nem található a szerveren.",
+    "You can click here to return to %s." : "Ide kattintva visszatérhetsz ide: %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
+    "The share will expire on %s." : "A megosztás lejár ekkor %s",
+    "Cheers!" : "Üdv.",
+    "Internal Server Error" : "Belső szerver hiba",
+    "Technical details" : "Technikai adatok",
+    "Remote Address: %s" : "Távoli cím: %s",
+    "Request ID: %s" : "Kérelem azonosító: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Üzenet: %s",
+    "File: %s" : "Fájl: %s",
+    "Line: %s" : "Sor: %s",
+    "Security Warning" : "Biztonsági figyelmeztetés",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
+    "Password" : "Jelszó",
+    "Storage & database" : "Tárolás és adatbázis",
+    "Data folder" : "Adatkönyvtár",
+    "Configure the database" : "Adatbázis konfigurálása",
+    "Only %s is available." : "Csak %s érhető el.",
+    "Database user" : "Adatbázis felhasználónév",
+    "Database password" : "Adatbázis jelszó",
+    "Database name" : "Az adatbázis neve",
+    "Database tablespace" : "Az adatbázis táblázattér (tablespace)",
+    "Database host" : "Adatbázis szerver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.",
+    "Finish setup" : "A beállítások befejezése",
+    "Finishing …" : "Befejezés ...",
+    "%s is available. Get more information on how to update." : "%s rendelkezésre áll. További információ a frissítéshez.",
+    "Log out" : "Kilépés",
+    "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!",
+    "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "Forgot your password? Reset it!" : "Elfelejtette a jelszavát? Állítsa vissza!",
+    "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.",
+    "This means only administrators can use the instance." : "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!",
+    "Thank you for your patience." : "Köszönjük a türelmét.",
+    "You are accessing the server from an untrusted domain." : "A kiszolgálót nem megbízható tartományból éri el.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kérjük keresse fel a rendszergazdát! Ha ennek a telepítésnek Ön a rendszergazdája, akkor állítsa be a config/config.php állományban a \"trusted_domain\" paramétert! A config/config.sample.php állományban talál példát a beállításra.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "A beállításoktól függően, rendszergazdaként lehetséges, hogy az alábbi gombot is használhatja a tartomány megbízhatóvá tételéhez.",
+    "Add \"%s\" as trusted domain" : "Adjuk hozzá \"%s\"-t a megbízható tartományokhoz!",
+    "%s will be updated to version %s." : "%s frissítődni fog erre a verzióra: %s.",
+    "The following apps will be disabled:" : "A következő alkalmazások lesznek letiltva:",
+    "The theme %s has been disabled." : "Ez a smink: %s letiltásra került.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.",
+    "Start update" : "A frissítés megkezdése",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Nagyobb telepítések esetén úgy kerülhetők el az időtúllépések, ha inkább a következő parancsot adja ki a telepítési alkönyvtárban:"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
new file mode 100644
index 00000000000..28b3ecb3c45
--- /dev/null
+++ b/core/l10n/hu_HU.json
@@ -0,0 +1,203 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
+    "Turned on maintenance mode" : "A karbantartási mód bekapcsolva",
+    "Turned off maintenance mode" : "A karbantartási mód kikapcsolva",
+    "Updated database" : "Az adatbázis frissítése megtörtént",
+    "Checked database schema update" : "Az adatbázis séma frissítését ellenőriztük",
+    "Checked database schema update for apps" : "Az adatbázis séma frissítését ellenőriztük az alkalmazásokra vontakozóan",
+    "Updated \"%s\" to %s" : "Frissítettük  \"%s\"-t erre: %s",
+    "Disabled incompatible apps: %s" : "Letiltásra került inkompatibilis alkalmazások: %s",
+    "No image or file provided" : "Nincs kép vagy fájl megadva",
+    "Unknown filetype" : "Ismeretlen fájltípus",
+    "Invalid image" : "Hibás kép",
+    "No temporary profile picture available, try again" : "Az átmeneti profilkép nem elérhető, próbálja újra",
+    "No crop data provided" : "Vágáshoz nincs adat megadva",
+    "Sunday" : "vasárnap",
+    "Monday" : "hétfő",
+    "Tuesday" : "kedd",
+    "Wednesday" : "szerda",
+    "Thursday" : "csütörtök",
+    "Friday" : "péntek",
+    "Saturday" : "szombat",
+    "January" : "január",
+    "February" : "február",
+    "March" : "március",
+    "April" : "április",
+    "May" : "május",
+    "June" : "június",
+    "July" : "július",
+    "August" : "augusztus",
+    "September" : "szeptember",
+    "October" : "október",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Beállítások",
+    "File" : "Fájl",
+    "Folder" : "Mappa",
+    "Image" : "Kép",
+    "Audio" : "Hang",
+    "Saving..." : "Mentés...",
+    "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "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?",
+    "I know what I'm doing" : "Tudom mit csinálok.",
+    "Reset password" : "Jelszó-visszaállítás",
+    "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
+    "No" : "Nem",
+    "Yes" : "Igen",
+    "Choose" : "Válasszon",
+    "Error loading file picker template: {error}" : "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Nem sikerült betölteni az üzenet sablont: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} fájl ütközik","{count} fájl ütközik"],
+    "One file conflict" : "Egy fájl ütközik",
+    "New Files" : "Új fájlok",
+    "Already existing files" : "A fájlok már léteznek",
+    "Which files do you want to keep?" : "Melyik fájlokat akarja megtartani?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.",
+    "Cancel" : "Mégsem",
+    "Continue" : "Folytatás",
+    "(all selected)" : "(az összes ki lett választva)",
+    "({count} selected)" : "({count} lett kiválasztva)",
+    "Error loading file exists template" : "Hiba a létezőfájl-sablon betöltésekor",
+    "Very weak password" : "Nagyon gyenge jelszó",
+    "Weak password" : "Gyenge jelszó",
+    "So-so password" : "Nem túl jó jelszó",
+    "Good password" : "Jó jelszó",
+    "Strong password" : "Erős jelszó",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
+    "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." : "A kiszolgálónak nem működik az internetkapcsolata. Ez azt jelenti, hogy bizonyos funkciók nem fognak működni, mint pl. külső tárolók becsatolása, automatikus frissítési értesítések vagy más fejlesztők /3rd party/ által írt alkalmazások telepítése. Az állományok távolról történő elérése valamint e-mail értesítések küldése szintén lehet, hogy nem fog működni. Javasoljuk, hogy engedélyezze a kiszolgáló internetelérését, ha az összes funkciót szeretné használni.",
+    "Error occurred while checking server setup" : "Hiba történt a szerver beállítások ellenőrzése közben",
+    "Shared" : "Megosztott",
+    "Shared with {recipients}" : "Megosztva ővelük: {recipients}",
+    "Share" : "Megosztás",
+    "Error" : "Hiba",
+    "Error while sharing" : "Nem sikerült létrehozni a megosztást",
+    "Error while unsharing" : "Nem sikerült visszavonni a megosztást",
+    "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 user or group …" : "Megosztani egy felhasználóval vagy csoporttal ...",
+    "Share link" : "Megosztás hivatkozással",
+    "The public link will expire no later than {days} days after it is created" : "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
+    "Password protect" : "Jelszóval is védem",
+    "Choose a password for the public link" : "Válasszon egy jelszót a nyilvános linkhez",
+    "Allow Public Upload" : "Feltöltést is engedélyezek",
+    "Email link to person" : "Email címre küldjük el",
+    "Send" : "Küldjük el",
+    "Set expiration date" : "Legyen lejárati idő",
+    "Expiration date" : "A lejárati idő",
+    "Adding user..." : "Felhasználó hozzáadása...",
+    "group" : "csoport",
+    "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",
+    "can share" : "megosztható",
+    "can edit" : "módosíthat",
+    "access control" : "jogosultság",
+    "create" : "létrehoz",
+    "update" : "szerkeszt",
+    "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",
+    "Warning" : "Figyelmeztetés",
+    "The object type is not specified." : "Az objektum típusa nincs megadva.",
+    "Enter new" : "Új beírása",
+    "Delete" : "Törlés",
+    "Add" : "Hozzáadás",
+    "Edit tags" : "Címkék szerkesztése",
+    "Error loading dialog template: {error}" : "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
+    "No tags selected for deletion." : "Nincs törlésre kijelölt címke.",
+    "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
+    "Please reload the page." : "Kérjük frissítse az oldalt!",
+    "The update was unsuccessful." : "A frissítés nem sikerült.",
+    "The update was successful. Redirecting you to ownCloud now." : "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
+    "Couldn't reset password because the token is invalid" : "Nem lehet a jelszót törölni, mert a token érvénytelen.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "%s password reset" : "%s jelszó visszaállítás",
+    "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}",
+    "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
+    "Username" : "Felhasználónév",
+    "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?" : "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?",
+    "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam",
+    "Reset" : "Visszaállítás",
+    "New password" : "Az új jelszó",
+    "New Password" : "Új jelszó",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
+    "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
+    "Personal" : "Személyes",
+    "Users" : "Felhasználók",
+    "Apps" : "Alkalmazások",
+    "Admin" : "Adminsztráció",
+    "Help" : "Súgó",
+    "Error loading tags" : "Hiba a címkék betöltésekor",
+    "Tag already exists" : "A címke már létezik",
+    "Error deleting tag(s)" : "Hiba a címkék törlésekor",
+    "Error tagging" : "Hiba a címkézéskor",
+    "Error untagging" : "Hiba a címkék eltávolításakor",
+    "Error favoriting" : "Hiba a kedvencekhez adáskor",
+    "Error unfavoriting" : "Hiba a kedvencekből törléskor",
+    "Access forbidden" : "A hozzáférés nem engedélyezett",
+    "File not found" : "Fájl nem található",
+    "The specified document has not been found on the server." : "A meghatározott dokumentum nem található a szerveren.",
+    "You can click here to return to %s." : "Ide kattintva visszatérhetsz ide: %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
+    "The share will expire on %s." : "A megosztás lejár ekkor %s",
+    "Cheers!" : "Üdv.",
+    "Internal Server Error" : "Belső szerver hiba",
+    "Technical details" : "Technikai adatok",
+    "Remote Address: %s" : "Távoli cím: %s",
+    "Request ID: %s" : "Kérelem azonosító: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Üzenet: %s",
+    "File: %s" : "Fájl: %s",
+    "Line: %s" : "Sor: %s",
+    "Security Warning" : "Biztonsági figyelmeztetés",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
+    "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
+    "Password" : "Jelszó",
+    "Storage & database" : "Tárolás és adatbázis",
+    "Data folder" : "Adatkönyvtár",
+    "Configure the database" : "Adatbázis konfigurálása",
+    "Only %s is available." : "Csak %s érhető el.",
+    "Database user" : "Adatbázis felhasználónév",
+    "Database password" : "Adatbázis jelszó",
+    "Database name" : "Az adatbázis neve",
+    "Database tablespace" : "Az adatbázis táblázattér (tablespace)",
+    "Database host" : "Adatbázis szerver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.",
+    "Finish setup" : "A beállítások befejezése",
+    "Finishing …" : "Befejezés ...",
+    "%s is available. Get more information on how to update." : "%s rendelkezésre áll. További információ a frissítéshez.",
+    "Log out" : "Kilépés",
+    "Server side authentication failed!" : "A szerveroldali hitelesítés sikertelen!",
+    "Please contact your administrator." : "Kérjük, lépjen kapcsolatba a rendszergazdával.",
+    "Forgot your password? Reset it!" : "Elfelejtette a jelszavát? Állítsa vissza!",
+    "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.",
+    "This means only administrators can use the instance." : "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!",
+    "Thank you for your patience." : "Köszönjük a türelmét.",
+    "You are accessing the server from an untrusted domain." : "A kiszolgálót nem megbízható tartományból éri el.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kérjük keresse fel a rendszergazdát! Ha ennek a telepítésnek Ön a rendszergazdája, akkor állítsa be a config/config.php állományban a \"trusted_domain\" paramétert! A config/config.sample.php állományban talál példát a beállításra.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "A beállításoktól függően, rendszergazdaként lehetséges, hogy az alábbi gombot is használhatja a tartomány megbízhatóvá tételéhez.",
+    "Add \"%s\" as trusted domain" : "Adjuk hozzá \"%s\"-t a megbízható tartományokhoz!",
+    "%s will be updated to version %s." : "%s frissítődni fog erre a verzióra: %s.",
+    "The following apps will be disabled:" : "A következő alkalmazások lesznek letiltva:",
+    "The theme %s has been disabled." : "Ez a smink: %s letiltásra került.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.",
+    "Start update" : "A frissítés megkezdése",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Nagyobb telepítések esetén úgy kerülhetők el az időtúllépések, ha inkább a következő parancsot adja ki a telepítési alkönyvtárban:"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
deleted file mode 100644
index b5e28333cc9..00000000000
--- a/core/l10n/hu_HU.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nem sikerült e-mailt küldeni a következő felhasználóknak: %s",
-"Turned on maintenance mode" => "A karbantartási mód bekapcsolva",
-"Turned off maintenance mode" => "A karbantartási mód kikapcsolva",
-"Updated database" => "Az adatbázis frissítése megtörtént",
-"Checked database schema update" => "Az adatbázis séma frissítését ellenőriztük",
-"Checked database schema update for apps" => "Az adatbázis séma frissítését ellenőriztük az alkalmazásokra vontakozóan",
-"Updated \"%s\" to %s" => "Frissítettük  \"%s\"-t erre: %s",
-"Disabled incompatible apps: %s" => "Letiltásra került inkompatibilis alkalmazások: %s",
-"No image or file provided" => "Nincs kép vagy fájl megadva",
-"Unknown filetype" => "Ismeretlen fájltípus",
-"Invalid image" => "Hibás kép",
-"No temporary profile picture available, try again" => "Az átmeneti profilkép nem elérhető, próbálja újra",
-"No crop data provided" => "Vágáshoz nincs adat megadva",
-"Sunday" => "vasárnap",
-"Monday" => "hétfő",
-"Tuesday" => "kedd",
-"Wednesday" => "szerda",
-"Thursday" => "csütörtök",
-"Friday" => "péntek",
-"Saturday" => "szombat",
-"January" => "január",
-"February" => "február",
-"March" => "március",
-"April" => "április",
-"May" => "május",
-"June" => "június",
-"July" => "július",
-"August" => "augusztus",
-"September" => "szeptember",
-"October" => "október",
-"November" => "november",
-"December" => "december",
-"Settings" => "Beállítások",
-"File" => "Fájl",
-"Folder" => "Mappa",
-"Image" => "Kép",
-"Audio" => "Hang",
-"Saving..." => "Mentés...",
-"Couldn't send reset email. Please contact your administrator." => "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
-"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?",
-"I know what I'm doing" => "Tudom mit csinálok.",
-"Reset password" => "Jelszó-visszaállítás",
-"Password can not be changed. Please contact your administrator." => "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
-"No" => "Nem",
-"Yes" => "Igen",
-"Choose" => "Válasszon",
-"Error loading file picker template: {error}" => "Nem sikerült betölteni a fájlkiválasztó sablont: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Nem sikerült betölteni az üzenet sablont: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} fájl ütközik","{count} fájl ütközik"),
-"One file conflict" => "Egy fájl ütközik",
-"New Files" => "Új fájlok",
-"Already existing files" => "A fájlok már léteznek",
-"Which files do you want to keep?" => "Melyik fájlokat akarja megtartani?",
-"If you select both versions, the copied file will have a number added to its name." => "Ha mindkét verziót kiválasztja, a másolt fájlok neve sorszámozva lesz.",
-"Cancel" => "Mégsem",
-"Continue" => "Folytatás",
-"(all selected)" => "(az összes ki lett választva)",
-"({count} selected)" => "({count} lett kiválasztva)",
-"Error loading file exists template" => "Hiba a létezőfájl-sablon betöltésekor",
-"Very weak password" => "Nagyon gyenge jelszó",
-"Weak password" => "Gyenge jelszó",
-"So-so password" => "Nem túl jó jelszó",
-"Good password" => "Jó jelszó",
-"Strong password" => "Erős jelszó",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Az Ön webkiszolgálója nincs megfelelően beállítva az állományok szinkronizálásához, mert a WebDAV-elérés úgy tűnik, nem működik.",
-"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." => "A kiszolgálónak nem működik az internetkapcsolata. Ez azt jelenti, hogy bizonyos funkciók nem fognak működni, mint pl. külső tárolók becsatolása, automatikus frissítési értesítések vagy más fejlesztők /3rd party/ által írt alkalmazások telepítése. Az állományok távolról történő elérése valamint e-mail értesítések küldése szintén lehet, hogy nem fog működni. Javasoljuk, hogy engedélyezze a kiszolgáló internetelérését, ha az összes funkciót szeretné használni.",
-"Error occurred while checking server setup" => "Hiba történt a szerver beállítások ellenőrzése közben",
-"Shared" => "Megosztott",
-"Shared with {recipients}" => "Megosztva ővelük: {recipients}",
-"Share" => "Megosztás",
-"Error" => "Hiba",
-"Error while sharing" => "Nem sikerült létrehozni a megosztást",
-"Error while unsharing" => "Nem sikerült visszavonni a megosztást",
-"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 user or group …" => "Megosztani egy felhasználóval vagy csoporttal ...",
-"Share link" => "Megosztás hivatkozással",
-"The public link will expire no later than {days} days after it is created" => "A nyilvános link érvényessége legkorábban {days} nappal a létrehozása után jár csak le",
-"Password protect" => "Jelszóval is védem",
-"Choose a password for the public link" => "Válasszon egy jelszót a nyilvános linkhez",
-"Allow Public Upload" => "Feltöltést is engedélyezek",
-"Email link to person" => "Email címre küldjük el",
-"Send" => "Küldjük el",
-"Set expiration date" => "Legyen lejárati idő",
-"Expiration date" => "A lejárati idő",
-"Adding user..." => "Felhasználó hozzáadása...",
-"group" => "csoport",
-"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",
-"can share" => "megosztható",
-"can edit" => "módosíthat",
-"access control" => "jogosultság",
-"create" => "létrehoz",
-"update" => "szerkeszt",
-"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",
-"Warning" => "Figyelmeztetés",
-"The object type is not specified." => "Az objektum típusa nincs megadva.",
-"Enter new" => "Új beírása",
-"Delete" => "Törlés",
-"Add" => "Hozzáadás",
-"Edit tags" => "Címkék szerkesztése",
-"Error loading dialog template: {error}" => "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
-"No tags selected for deletion." => "Nincs törlésre kijelölt címke.",
-"Updating {productName} to version {version}, this may take a while." => " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
-"Please reload the page." => "Kérjük frissítse az oldalt!",
-"The update was unsuccessful." => "A frissítés nem sikerült.",
-"The update was successful. Redirecting you to ownCloud now." => "A frissítés sikeres volt. Visszairányítjuk az ownCloud szolgáltatáshoz.",
-"Couldn't reset password because the token is invalid" => "Nem lehet a jelszót törölni, mert a token érvénytelen.",
-"Couldn't send reset email. Please make sure your username is correct." => "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával. ",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
-"%s password reset" => "%s jelszó visszaállítás",
-"Use the following link to reset your password: {link}" => "Használja ezt a linket a jelszó ismételt beállításához: {link}",
-"You will receive a link to reset your password via Email." => "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
-"Username" => "Felhasználónév",
-"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?" => "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?",
-"Yes, I really want to reset my password now" => "Igen, tényleg meg akarom változtatni a jelszavam",
-"Reset" => "Visszaállítás",
-"New password" => "Az új jelszó",
-"New Password" => "Új jelszó",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
-"For the best results, please consider using a GNU/Linux server instead." => "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
-"Personal" => "Személyes",
-"Users" => "Felhasználók",
-"Apps" => "Alkalmazások",
-"Admin" => "Adminsztráció",
-"Help" => "Súgó",
-"Error loading tags" => "Hiba a címkék betöltésekor",
-"Tag already exists" => "A címke már létezik",
-"Error deleting tag(s)" => "Hiba a címkék törlésekor",
-"Error tagging" => "Hiba a címkézéskor",
-"Error untagging" => "Hiba a címkék eltávolításakor",
-"Error favoriting" => "Hiba a kedvencekhez adáskor",
-"Error unfavoriting" => "Hiba a kedvencekből törléskor",
-"Access forbidden" => "A hozzáférés nem engedélyezett",
-"File not found" => "Fájl nem található",
-"The specified document has not been found on the server." => "A meghatározott dokumentum nem található a szerveren.",
-"You can click here to return to %s." => "Ide kattintva visszatérhetsz ide: %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Üdv!\\n\n\\n\nÉrtesítjük, hogy %s megosztotta Önnel a következőt: %s.\\n\nItt lehet megnézni: %s\\n\n\\n",
-"The share will expire on %s." => "A megosztás lejár ekkor %s",
-"Cheers!" => "Üdv.",
-"Internal Server Error" => "Belső szerver hiba",
-"Technical details" => "Technikai adatok",
-"Remote Address: %s" => "Távoli cím: %s",
-"Request ID: %s" => "Kérelem azonosító: %s",
-"Code: %s" => "Kód: %s",
-"Message: %s" => "Üzenet: %s",
-"File: %s" => "Fájl: %s",
-"Line: %s" => "Sor: %s",
-"Security Warning" => "Biztonsági figyelmeztetés",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Az Ön PHP verziója sebezhető a NULL bájtos támadással szemben (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Kérjük frissítse a telepített PHP csomagjait, hogy biztonságos legyen az %s szolgáltatása.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
-"Create an <strong>admin account</strong>" => "<strong>Rendszergazdai belépés</strong> létrehozása",
-"Password" => "Jelszó",
-"Storage & database" => "Tárolás és adatbázis",
-"Data folder" => "Adatkönyvtár",
-"Configure the database" => "Adatbázis konfigurálása",
-"Only %s is available." => "Csak %s érhető el.",
-"Database user" => "Adatbázis felhasználónév",
-"Database password" => "Adatbázis jelszó",
-"Database name" => "Az adatbázis neve",
-"Database tablespace" => "Az adatbázis táblázattér (tablespace)",
-"Database host" => "Adatbázis szerver",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Adatbázisként az SQLite-ot fogjuk használni. Nagyobb telepítések esetén javasoljuk, hogy változtassa meg ezt a beállítást.",
-"Finish setup" => "A beállítások befejezése",
-"Finishing …" => "Befejezés ...",
-"%s is available. Get more information on how to update." => "%s rendelkezésre áll. További információ a frissítéshez.",
-"Log out" => "Kilépés",
-"Server side authentication failed!" => "A szerveroldali hitelesítés sikertelen!",
-"Please contact your administrator." => "Kérjük, lépjen kapcsolatba a rendszergazdával.",
-"Forgot your password? Reset it!" => "Elfelejtette a jelszavát? Állítsa vissza!",
-"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.",
-"This means only administrators can use the instance." => "Ez azt jelenti, hogy csak az adminisztrátor használhatja ezt a példányt",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Ha ez az üzenet ismételten vagy indokolatlanul megjelenik, akkor keresse a rendszergazda segítségét!",
-"Thank you for your patience." => "Köszönjük a türelmét.",
-"You are accessing the server from an untrusted domain." => "A kiszolgálót nem megbízható tartományból éri el.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Kérjük keresse fel a rendszergazdát! Ha ennek a telepítésnek Ön a rendszergazdája, akkor állítsa be a config/config.php állományban a \"trusted_domain\" paramétert! A config/config.sample.php állományban talál példát a beállításra.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "A beállításoktól függően, rendszergazdaként lehetséges, hogy az alábbi gombot is használhatja a tartomány megbízhatóvá tételéhez.",
-"Add \"%s\" as trusted domain" => "Adjuk hozzá \"%s\"-t a megbízható tartományokhoz!",
-"%s will be updated to version %s." => "%s frissítődni fog erre a verzióra: %s.",
-"The following apps will be disabled:" => "A következő alkalmazások lesznek letiltva:",
-"The theme %s has been disabled." => "Ez a smink: %s letiltásra került.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Kérjük gondoskodjon róla, hogy elmentse az adatbázist, a konfigurációs mappa és az adatamappa tartalmát, mielőtt folytatja.",
-"Start update" => "A frissítés megkezdése",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Nagyobb telepítések esetén úgy kerülhetők el az időtúllépések, ha inkább a következő parancsot adja ki a telepítési alkönyvtárban:"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/hy.js b/core/l10n/hy.js
new file mode 100644
index 00000000000..7f69d32fa34
--- /dev/null
+++ b/core/l10n/hy.js
@@ -0,0 +1,26 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Կիրակի",
+    "Monday" : "Երկուշաբթի",
+    "Tuesday" : "Երեքշաբթի",
+    "Wednesday" : "Չորեքշաբթի",
+    "Thursday" : "Հինգշաբթի",
+    "Friday" : "Ուրբաթ",
+    "Saturday" : "Շաբաթ",
+    "January" : "Հունվար",
+    "February" : "Փետրվար",
+    "March" : "Մարտ",
+    "April" : "Ապրիլ",
+    "May" : "Մայիս",
+    "June" : "Հունիս",
+    "July" : "Հուլիս",
+    "August" : "Օգոստոս",
+    "September" : "Սեպտեմբեր",
+    "October" : "Հոկտեմբեր",
+    "November" : "Նոյեմբեր",
+    "December" : "Դեկտեմբեր",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Delete" : "Ջնջել"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hy.json b/core/l10n/hy.json
new file mode 100644
index 00000000000..d650d6ee92b
--- /dev/null
+++ b/core/l10n/hy.json
@@ -0,0 +1,24 @@
+{ "translations": {
+    "Sunday" : "Կիրակի",
+    "Monday" : "Երկուշաբթի",
+    "Tuesday" : "Երեքշաբթի",
+    "Wednesday" : "Չորեքշաբթի",
+    "Thursday" : "Հինգշաբթի",
+    "Friday" : "Ուրբաթ",
+    "Saturday" : "Շաբաթ",
+    "January" : "Հունվար",
+    "February" : "Փետրվար",
+    "March" : "Մարտ",
+    "April" : "Ապրիլ",
+    "May" : "Մայիս",
+    "June" : "Հունիս",
+    "July" : "Հուլիս",
+    "August" : "Օգոստոս",
+    "September" : "Սեպտեմբեր",
+    "October" : "Հոկտեմբեր",
+    "November" : "Նոյեմբեր",
+    "December" : "Դեկտեմբեր",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Delete" : "Ջնջել"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/hy.php b/core/l10n/hy.php
deleted file mode 100644
index 956fe561b5a..00000000000
--- a/core/l10n/hy.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Կիրակի",
-"Monday" => "Երկուշաբթի",
-"Tuesday" => "Երեքշաբթի",
-"Wednesday" => "Չորեքշաբթի",
-"Thursday" => "Հինգշաբթի",
-"Friday" => "Ուրբաթ",
-"Saturday" => "Շաբաթ",
-"January" => "Հունվար",
-"February" => "Փետրվար",
-"March" => "Մարտ",
-"April" => "Ապրիլ",
-"May" => "Մայիս",
-"June" => "Հունիս",
-"July" => "Հուլիս",
-"August" => "Օգոստոս",
-"September" => "Սեպտեմբեր",
-"October" => "Հոկտեմբեր",
-"November" => "Նոյեմբեր",
-"December" => "Դեկտեմբեր",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Delete" => "Ջնջել"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
new file mode 100644
index 00000000000..515d612244d
--- /dev/null
+++ b/core/l10n/ia.js
@@ -0,0 +1,161 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "On non pote inviar message de e-posta a le usatores sequente: %s",
+    "Turned on maintenance mode" : "Activate modo de mantenentia",
+    "Turned off maintenance mode" : "De-activar modo de mantenentia",
+    "Updated database" : "Base de datos actualisate",
+    "Checked database schema update" : "Il ha verificate actualisation de schema de base de datos",
+    "Checked database schema update for apps" : "Il ha verificate actualisation de schema de base de datos pro apps",
+    "Updated \"%s\" to %s" : "Actualisava \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Apps non compatibile ha essite dishabilitate: %s",
+    "No image or file provided" : "Il forniva necun imagine o file",
+    "Unknown filetype" : "Typo de file incognite",
+    "Invalid image" : "Imagine invalide",
+    "No temporary profile picture available, try again" : "Necun photo de profilo temporanee disponibile, essaya novemente",
+    "Sunday" : "Dominica",
+    "Monday" : "Lunedi",
+    "Tuesday" : "Martedi",
+    "Wednesday" : "Mercuridi",
+    "Thursday" : "Jovedi",
+    "Friday" : "Venerdi",
+    "Saturday" : "Sabbato",
+    "January" : "januario",
+    "February" : "Februario",
+    "March" : "Martio",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Augusto",
+    "September" : "Septembre",
+    "October" : "Octobre",
+    "November" : "Novembre",
+    "December" : "Decembre",
+    "Settings" : "Configurationes",
+    "File" : "File",
+    "Folder" : "Dossier",
+    "Image" : "Imagine",
+    "Audio" : "Audio",
+    "Saving..." : "Salveguardante...",
+    "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
+    "I know what I'm doing" : "Io sape lo que io es facente",
+    "Reset password" : "Reinitialisar contrasigno",
+    "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
+    "No" : "No",
+    "Yes" : "Si",
+    "Choose" : "Seliger",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de file","{count} conflictos de file"],
+    "One file conflict" : "Un conflicto de file",
+    "New Files" : "Nove files",
+    "Already existing files" : "Files jam existente",
+    "Which files do you want to keep?" : "Qual files tu vole mantener?",
+    "Cancel" : "Cancellar",
+    "Continue" : "Continuar",
+    "Error loading file exists template" : "Error quando on incargava patrono de file existente",
+    "Very weak password" : "Contrasigno multo debile",
+    "Weak password" : "Contrasigno debile",
+    "So-so password" : "Contrasigno passabile",
+    "Good password" : "Contrasigno bon",
+    "Strong password" : "Contrasigno forte",
+    "Error occurred while checking server setup" : "Un error occurreva quando on verificava le configuration de le servitor.",
+    "Shared" : "Compartite",
+    "Shared with {recipients}" : "Compatite con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error quando on compartiva",
+    "Error while unsharing" : "Error quando on levava le compartir",
+    "Error while changing permissions" : "Error quando on modificava permissiones",
+    "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
+    "Shared with you by {owner}" : "Compartite con te per {owner} ",
+    "Share with user or group …" : "Compartir con usator o gruppo ...",
+    "Share link" : "Compartir ligamine",
+    "Password protect" : "Protegite per contrasigno",
+    "Choose a password for the public link" : "Selige un contrasigno pro le ligamine public",
+    "Allow Public Upload" : "Permitter incargamento 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 in {item} with {user}" : "Compartite in  {item} con {user}",
+    "Unshare" : "Leva compartir",
+    "notify by email" : "notificar per message de e-posta",
+    "can share" : "pote compartir",
+    "can edit" : "pote modificar",
+    "access control" : "controlo de accesso",
+    "create" : "crear",
+    "update" : "actualisar",
+    "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",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "Le typo de objecto non es specificate",
+    "Enter new" : "Inserta nove",
+    "Delete" : "Deler",
+    "Add" : "Adder",
+    "Edit tags" : "Modifica etiquettas",
+    "Please reload the page." : "Pro favor recarga le pagina.",
+    "The update was unsuccessful." : "Le actualisation esseva successose.",
+    "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
+    "%s password reset" : "%s contrasigno re-fixate",
+    "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
+    "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
+    "Username" : "Nomine de usator",
+    "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc",
+    "Reset" : "Re-fixar",
+    "New password" : "Nove contrasigno",
+    "New Password" : "Nove contrasigno",
+    "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.",
+    "Personal" : "Personal",
+    "Users" : "Usatores",
+    "Apps" : "Applicationes",
+    "Admin" : "Administration",
+    "Help" : "Adjuta",
+    "Error loading tags" : "Error quando on cargava etiquettas",
+    "Tag already exists" : "Etiquetta ja existe",
+    "Access forbidden" : "Accesso prohibite",
+    "File not found" : "File non trovate",
+    "The specified document has not been found on the server." : "Le documento specificate non ha essite trovate sur le servitor.",
+    "The share will expire on %s." : "Le compartir expirara le %s.",
+    "Cheers!" : "Acclamationes!",
+    "Technical details" : "Detalios technic",
+    "Remote Address: %s" : "Adresse remote: %s",
+    "Request ID: %s" : "ID de requesta: %s",
+    "Code: %s" : "Codice: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Rango: %s",
+    "Trace" : "Tracia",
+    "Security Warning" : "Aviso de securitate",
+    "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
+    "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
+    "Password" : "Contrasigno",
+    "Storage & database" : "Immagazinage & base de datos",
+    "Data folder" : "Dossier de datos",
+    "Configure the database" : "Configurar le base de datos",
+    "Only %s is available." : "Solmente %s es disponibile",
+    "Database user" : "Usator de base de datos",
+    "Database password" : "Contrasigno de base de datos",
+    "Database name" : "Nomine de base de datos",
+    "Database tablespace" : "Spatio de tabella de base de datos",
+    "Database host" : "Hospite de base de datos",
+    "Finish setup" : "Terminar configuration",
+    "Finishing …" : "Terminante ...",
+    "Log out" : "Clauder le session",
+    "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
+    "Please contact your administrator." : "Pro favor continge tu administrator.",
+    "Forgot your password? Reset it!" : "Tu oblidava tu contrasigno? Re-configura lo!",
+    "remember" : "memora",
+    "Log in" : "Aperir session",
+    "Alternative Logins" : "Accessos de autorisation alternative",
+    "Thank you for your patience." : "Gratias pro tu patientia.",
+    "Start update" : "Initia actualisation"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
new file mode 100644
index 00000000000..9814ab98abe
--- /dev/null
+++ b/core/l10n/ia.json
@@ -0,0 +1,159 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "On non pote inviar message de e-posta a le usatores sequente: %s",
+    "Turned on maintenance mode" : "Activate modo de mantenentia",
+    "Turned off maintenance mode" : "De-activar modo de mantenentia",
+    "Updated database" : "Base de datos actualisate",
+    "Checked database schema update" : "Il ha verificate actualisation de schema de base de datos",
+    "Checked database schema update for apps" : "Il ha verificate actualisation de schema de base de datos pro apps",
+    "Updated \"%s\" to %s" : "Actualisava \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Apps non compatibile ha essite dishabilitate: %s",
+    "No image or file provided" : "Il forniva necun imagine o file",
+    "Unknown filetype" : "Typo de file incognite",
+    "Invalid image" : "Imagine invalide",
+    "No temporary profile picture available, try again" : "Necun photo de profilo temporanee disponibile, essaya novemente",
+    "Sunday" : "Dominica",
+    "Monday" : "Lunedi",
+    "Tuesday" : "Martedi",
+    "Wednesday" : "Mercuridi",
+    "Thursday" : "Jovedi",
+    "Friday" : "Venerdi",
+    "Saturday" : "Sabbato",
+    "January" : "januario",
+    "February" : "Februario",
+    "March" : "Martio",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Junio",
+    "July" : "Julio",
+    "August" : "Augusto",
+    "September" : "Septembre",
+    "October" : "Octobre",
+    "November" : "Novembre",
+    "December" : "Decembre",
+    "Settings" : "Configurationes",
+    "File" : "File",
+    "Folder" : "Dossier",
+    "Image" : "Imagine",
+    "Audio" : "Audio",
+    "Saving..." : "Salveguardante...",
+    "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
+    "I know what I'm doing" : "Io sape lo que io es facente",
+    "Reset password" : "Reinitialisar contrasigno",
+    "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
+    "No" : "No",
+    "Yes" : "Si",
+    "Choose" : "Seliger",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de file","{count} conflictos de file"],
+    "One file conflict" : "Un conflicto de file",
+    "New Files" : "Nove files",
+    "Already existing files" : "Files jam existente",
+    "Which files do you want to keep?" : "Qual files tu vole mantener?",
+    "Cancel" : "Cancellar",
+    "Continue" : "Continuar",
+    "Error loading file exists template" : "Error quando on incargava patrono de file existente",
+    "Very weak password" : "Contrasigno multo debile",
+    "Weak password" : "Contrasigno debile",
+    "So-so password" : "Contrasigno passabile",
+    "Good password" : "Contrasigno bon",
+    "Strong password" : "Contrasigno forte",
+    "Error occurred while checking server setup" : "Un error occurreva quando on verificava le configuration de le servitor.",
+    "Shared" : "Compartite",
+    "Shared with {recipients}" : "Compatite con {recipients}",
+    "Share" : "Compartir",
+    "Error" : "Error",
+    "Error while sharing" : "Error quando on compartiva",
+    "Error while unsharing" : "Error quando on levava le compartir",
+    "Error while changing permissions" : "Error quando on modificava permissiones",
+    "Shared with you and the group {group} by {owner}" : "Compartite con te e le gruppo {group} per {owner}",
+    "Shared with you by {owner}" : "Compartite con te per {owner} ",
+    "Share with user or group …" : "Compartir con usator o gruppo ...",
+    "Share link" : "Compartir ligamine",
+    "Password protect" : "Protegite per contrasigno",
+    "Choose a password for the public link" : "Selige un contrasigno pro le ligamine public",
+    "Allow Public Upload" : "Permitter incargamento 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 in {item} with {user}" : "Compartite in  {item} con {user}",
+    "Unshare" : "Leva compartir",
+    "notify by email" : "notificar per message de e-posta",
+    "can share" : "pote compartir",
+    "can edit" : "pote modificar",
+    "access control" : "controlo de accesso",
+    "create" : "crear",
+    "update" : "actualisar",
+    "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",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "Le typo de objecto non es specificate",
+    "Enter new" : "Inserta nove",
+    "Delete" : "Deler",
+    "Add" : "Adder",
+    "Edit tags" : "Modifica etiquettas",
+    "Please reload the page." : "Pro favor recarga le pagina.",
+    "The update was unsuccessful." : "Le actualisation esseva successose.",
+    "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
+    "%s password reset" : "%s contrasigno re-fixate",
+    "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
+    "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
+    "Username" : "Nomine de usator",
+    "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc",
+    "Reset" : "Re-fixar",
+    "New password" : "Nove contrasigno",
+    "New Password" : "Nove contrasigno",
+    "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.",
+    "Personal" : "Personal",
+    "Users" : "Usatores",
+    "Apps" : "Applicationes",
+    "Admin" : "Administration",
+    "Help" : "Adjuta",
+    "Error loading tags" : "Error quando on cargava etiquettas",
+    "Tag already exists" : "Etiquetta ja existe",
+    "Access forbidden" : "Accesso prohibite",
+    "File not found" : "File non trovate",
+    "The specified document has not been found on the server." : "Le documento specificate non ha essite trovate sur le servitor.",
+    "The share will expire on %s." : "Le compartir expirara le %s.",
+    "Cheers!" : "Acclamationes!",
+    "Technical details" : "Detalios technic",
+    "Remote Address: %s" : "Adresse remote: %s",
+    "Request ID: %s" : "ID de requesta: %s",
+    "Code: %s" : "Codice: %s",
+    "Message: %s" : "Message: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Rango: %s",
+    "Trace" : "Tracia",
+    "Security Warning" : "Aviso de securitate",
+    "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
+    "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
+    "Password" : "Contrasigno",
+    "Storage & database" : "Immagazinage & base de datos",
+    "Data folder" : "Dossier de datos",
+    "Configure the database" : "Configurar le base de datos",
+    "Only %s is available." : "Solmente %s es disponibile",
+    "Database user" : "Usator de base de datos",
+    "Database password" : "Contrasigno de base de datos",
+    "Database name" : "Nomine de base de datos",
+    "Database tablespace" : "Spatio de tabella de base de datos",
+    "Database host" : "Hospite de base de datos",
+    "Finish setup" : "Terminar configuration",
+    "Finishing …" : "Terminante ...",
+    "Log out" : "Clauder le session",
+    "Server side authentication failed!" : "Il falleva authentication de latere servitor!",
+    "Please contact your administrator." : "Pro favor continge tu administrator.",
+    "Forgot your password? Reset it!" : "Tu oblidava tu contrasigno? Re-configura lo!",
+    "remember" : "memora",
+    "Log in" : "Aperir session",
+    "Alternative Logins" : "Accessos de autorisation alternative",
+    "Thank you for your patience." : "Gratias pro tu patientia.",
+    "Start update" : "Initia actualisation"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ia.php b/core/l10n/ia.php
deleted file mode 100644
index 941f831c01c..00000000000
--- a/core/l10n/ia.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "On non pote inviar message de e-posta a le usatores sequente: %s",
-"Turned on maintenance mode" => "Activate modo de mantenentia",
-"Turned off maintenance mode" => "De-activar modo de mantenentia",
-"Updated database" => "Base de datos actualisate",
-"Checked database schema update" => "Il ha verificate actualisation de schema de base de datos",
-"Checked database schema update for apps" => "Il ha verificate actualisation de schema de base de datos pro apps",
-"Updated \"%s\" to %s" => "Actualisava \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Apps non compatibile ha essite dishabilitate: %s",
-"No image or file provided" => "Il forniva necun imagine o file",
-"Unknown filetype" => "Typo de file incognite",
-"Invalid image" => "Imagine invalide",
-"No temporary profile picture available, try again" => "Necun photo de profilo temporanee disponibile, essaya novemente",
-"Sunday" => "Dominica",
-"Monday" => "Lunedi",
-"Tuesday" => "Martedi",
-"Wednesday" => "Mercuridi",
-"Thursday" => "Jovedi",
-"Friday" => "Venerdi",
-"Saturday" => "Sabbato",
-"January" => "januario",
-"February" => "Februario",
-"March" => "Martio",
-"April" => "April",
-"May" => "Mai",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Augusto",
-"September" => "Septembre",
-"October" => "Octobre",
-"November" => "Novembre",
-"December" => "Decembre",
-"Settings" => "Configurationes",
-"File" => "File",
-"Folder" => "Dossier",
-"Image" => "Imagine",
-"Audio" => "Audio",
-"Saving..." => "Salveguardante...",
-"Couldn't send reset email. Please contact your administrator." => "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
-"I know what I'm doing" => "Io sape lo que io es facente",
-"Reset password" => "Reinitialisar contrasigno",
-"Password can not be changed. Please contact your administrator." => "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
-"No" => "No",
-"Yes" => "Si",
-"Choose" => "Seliger",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de file","{count} conflictos de file"),
-"One file conflict" => "Un conflicto de file",
-"New Files" => "Nove files",
-"Already existing files" => "Files jam existente",
-"Which files do you want to keep?" => "Qual files tu vole mantener?",
-"Cancel" => "Cancellar",
-"Continue" => "Continuar",
-"Error loading file exists template" => "Error quando on incargava patrono de file existente",
-"Very weak password" => "Contrasigno multo debile",
-"Weak password" => "Contrasigno debile",
-"So-so password" => "Contrasigno passabile",
-"Good password" => "Contrasigno bon",
-"Strong password" => "Contrasigno forte",
-"Error occurred while checking server setup" => "Un error occurreva quando on verificava le configuration de le servitor.",
-"Shared" => "Compartite",
-"Shared with {recipients}" => "Compatite con {recipients}",
-"Share" => "Compartir",
-"Error" => "Error",
-"Error while sharing" => "Error quando on compartiva",
-"Error while unsharing" => "Error quando on levava le compartir",
-"Error while changing permissions" => "Error quando on modificava permissiones",
-"Shared with you and the group {group} by {owner}" => "Compartite con te e le gruppo {group} per {owner}",
-"Shared with you by {owner}" => "Compartite con te per {owner} ",
-"Share with user or group …" => "Compartir con usator o gruppo ...",
-"Share link" => "Compartir ligamine",
-"Password protect" => "Protegite per contrasigno",
-"Choose a password for the public link" => "Selige un contrasigno pro le ligamine public",
-"Allow Public Upload" => "Permitter incargamento 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 in {item} with {user}" => "Compartite in  {item} con {user}",
-"Unshare" => "Leva compartir",
-"notify by email" => "notificar per message de e-posta",
-"can share" => "pote compartir",
-"can edit" => "pote modificar",
-"access control" => "controlo de accesso",
-"create" => "crear",
-"update" => "actualisar",
-"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",
-"Warning" => "Aviso",
-"The object type is not specified." => "Le typo de objecto non es specificate",
-"Enter new" => "Inserta nove",
-"Delete" => "Deler",
-"Add" => "Adder",
-"Edit tags" => "Modifica etiquettas",
-"Please reload the page." => "Pro favor recarga le pagina.",
-"The update was unsuccessful." => "Le actualisation esseva successose.",
-"The update was successful. Redirecting you to ownCloud now." => "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
-"%s password reset" => "%s contrasigno re-fixate",
-"Use the following link to reset your password: {link}" => "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
-"You will receive a link to reset your password via Email." => "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
-"Username" => "Nomine de usator",
-"Yes, I really want to reset my password now" => "Si, io vermente vole re-configurar mi contrasigno nunc",
-"Reset" => "Re-fixar",
-"New password" => "Nove contrasigno",
-"New Password" => "Nove contrasigno",
-"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.",
-"Personal" => "Personal",
-"Users" => "Usatores",
-"Apps" => "Applicationes",
-"Admin" => "Administration",
-"Help" => "Adjuta",
-"Error loading tags" => "Error quando on cargava etiquettas",
-"Tag already exists" => "Etiquetta ja existe",
-"Access forbidden" => "Accesso prohibite",
-"File not found" => "File non trovate",
-"The specified document has not been found on the server." => "Le documento specificate non ha essite trovate sur le servitor.",
-"The share will expire on %s." => "Le compartir expirara le %s.",
-"Cheers!" => "Acclamationes!",
-"Technical details" => "Detalios technic",
-"Remote Address: %s" => "Adresse remote: %s",
-"Request ID: %s" => "ID de requesta: %s",
-"Code: %s" => "Codice: %s",
-"Message: %s" => "Message: %s",
-"File: %s" => "File: %s",
-"Line: %s" => "Rango: %s",
-"Trace" => "Tracia",
-"Security Warning" => "Aviso de securitate",
-"Please update your PHP installation to use %s securely." => "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
-"Create an <strong>admin account</strong>" => "Crear un <strong>conto de administration</strong>",
-"Password" => "Contrasigno",
-"Storage & database" => "Immagazinage & base de datos",
-"Data folder" => "Dossier de datos",
-"Configure the database" => "Configurar le base de datos",
-"Only %s is available." => "Solmente %s es disponibile",
-"Database user" => "Usator de base de datos",
-"Database password" => "Contrasigno de base de datos",
-"Database name" => "Nomine de base de datos",
-"Database tablespace" => "Spatio de tabella de base de datos",
-"Database host" => "Hospite de base de datos",
-"Finish setup" => "Terminar configuration",
-"Finishing …" => "Terminante ...",
-"Log out" => "Clauder le session",
-"Server side authentication failed!" => "Il falleva authentication de latere servitor!",
-"Please contact your administrator." => "Pro favor continge tu administrator.",
-"Forgot your password? Reset it!" => "Tu oblidava tu contrasigno? Re-configura lo!",
-"remember" => "memora",
-"Log in" => "Aperir session",
-"Alternative Logins" => "Accessos de autorisation alternative",
-"Thank you for your patience." => "Gratias pro tu patientia.",
-"Start update" => "Initia actualisation"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/id.js b/core/l10n/id.js
new file mode 100644
index 00000000000..171d4141a2c
--- /dev/null
+++ b/core/l10n/id.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Tidak dapat mengirim Email ke pengguna berikut: %s",
+    "Turned on maintenance mode" : "Hidupkan mode perawatan",
+    "Turned off maintenance mode" : "Matikan mode perawatan",
+    "Updated database" : "Basis data terbaru",
+    "Checked database schema update" : "Pembaruan skema basis data terperiksa",
+    "Checked database schema update for apps" : "Pembaruan skema basis data terperiksa untuk aplikasi",
+    "Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s",
+    "Disabled incompatible apps: %s" : "Aplikasi tidak kompatibel yang dinonaktifkan: %s",
+    "No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
+    "Unknown filetype" : "Tipe berkas tidak dikenal",
+    "Invalid image" : "Gambar tidak sah",
+    "No temporary profile picture available, try again" : "Tidak ada gambar profil sementara yang tersedia, coba lagi",
+    "No crop data provided" : "Tidak ada data krop tersedia",
+    "Sunday" : "Minggu",
+    "Monday" : "Senin",
+    "Tuesday" : "Selasa",
+    "Wednesday" : "Rabu",
+    "Thursday" : "Kamis",
+    "Friday" : "Jumat",
+    "Saturday" : "Sabtu",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Maret",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Agustus",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Pengaturan",
+    "File" : "Berkas",
+    "Folder" : "Folder",
+    "Image" : "gambar",
+    "Audio" : "Audio",
+    "Saving..." : "Menyimpan...",
+    "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?",
+    "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
+    "Reset password" : "Setel ulang sandi",
+    "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
+    "No" : "Tidak",
+    "Yes" : "Ya",
+    "Choose" : "Pilih",
+    "Error loading file picker template: {error}" : "Galat memuat templat berkas pemilih: {error}",
+    "Ok" : "Oke",
+    "Error loading message template: {error}" : "Kesalahan memuat templat pesan: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} berkas konflik"],
+    "One file conflict" : "Satu berkas konflik",
+    "New Files" : "Berkas Baru",
+    "Already existing files" : "Berkas sudah ada",
+    "Which files do you want to keep?" : "Berkas mana yang ingin anda pertahankan?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya.",
+    "Cancel" : "Batal",
+    "Continue" : "Lanjutkan",
+    "(all selected)" : "(semua terpilih)",
+    "({count} selected)" : "({count} terpilih)",
+    "Error loading file exists template" : "Kesalahan memuat templat berkas yang sudah ada",
+    "Very weak password" : "Sandi sangat lemah",
+    "Weak password" : "Sandi lemah",
+    "So-so password" : "Sandi lumayan",
+    "Good password" : "Sandi baik",
+    "Strong password" : "Sandi kuat",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
+    "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." : "Server ini tidak memiliki koneksi internet. Hal ini berarti bahwa beberapa fitur seperti mengaitkan penyimpanan eksternal, pemberitahuan tentang pembaruan atau instalasi aplikasi pihak ke-3 tidak akan bisa. Mengakses berkas dari remote dan mengirim email notifikasi juga tidak akan bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda menginginkan semua fitur.",
+    "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
+    "Shared" : "Dibagikan",
+    "Shared with {recipients}" : "Dibagikan dengan {recipients}",
+    "Share" : "Bagikan",
+    "Error" : "Galat",
+    "Error while sharing" : "Galat ketika membagikan",
+    "Error while unsharing" : "Galat ketika membatalkan pembagian",
+    "Error while changing permissions" : "Galat ketika 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 user or group …" : "Bagikan dengan pengguna atau grup ...",
+    "Share link" : "Bagikan tautan",
+    "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
+    "Password protect" : "Lindungi dengan sandi",
+    "Choose a password for the public link" : "Tetapkan sandi untuk tautan publik",
+    "Allow Public Upload" : "Izinkan Unggahan Publik",
+    "Email link to person" : "Emailkan tautan ini ke orang",
+    "Send" : "Kirim",
+    "Set expiration date" : "Atur tanggal kedaluwarsa",
+    "Expiration date" : "Tanggal kedaluwarsa",
+    "Adding user..." : "Menambahkan pengguna...",
+    "group" : "grup",
+    "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",
+    "can share" : "dapat berbagi",
+    "can edit" : "dapat sunting",
+    "access control" : "kontrol akses",
+    "create" : "buat",
+    "update" : "perbarui",
+    "delete" : "hapus",
+    "Password protected" : "Sandi dilindungi",
+    "Error unsetting expiration date" : "Galat ketika menghapus tanggal kedaluwarsa",
+    "Error setting expiration date" : "Galat ketika mengatur tanggal kedaluwarsa",
+    "Sending ..." : "Mengirim ...",
+    "Email sent" : "Email terkirim",
+    "Warning" : "Peringatan",
+    "The object type is not specified." : "Tipe objek tidak ditentukan.",
+    "Enter new" : "Masukkan baru",
+    "Delete" : "Hapus",
+    "Add" : "Tambah",
+    "Edit tags" : "Sunting label",
+    "Error loading dialog template: {error}" : "Galat memuat templat dialog: {error}",
+    "No tags selected for deletion." : "Tidak ada label yang dipilih untuk dihapus.",
+    "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
+    "Please reload the page." : "Silakan muat ulang halaman.",
+    "The update was unsuccessful." : "Pembaruan tidak berhasil",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
+    "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
+    "Username" : "Nama pengguna",
+    "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?" : "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?",
+    "Yes, I really want to reset my password now" : "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
+    "Reset" : "Atur Ulang",
+    "New password" : "Sandi baru",
+    "New Password" : "Sandi Baru",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
+    "Personal" : "Pribadi",
+    "Users" : "Pengguna",
+    "Apps" : "Aplikasi",
+    "Admin" : "Admin",
+    "Help" : "Bantuan",
+    "Error loading tags" : "Galat saat memuat tag",
+    "Tag already exists" : "Tag sudah ada",
+    "Error deleting tag(s)" : "Galat saat menghapus tag",
+    "Error tagging" : "Galat saat memberikan tag",
+    "Error untagging" : "Galat saat menghapus tag",
+    "Error favoriting" : "Galat saat memberikan sebagai favorit",
+    "Error unfavoriting" : "Galat saat menghapus sebagai favorit",
+    "Access forbidden" : "Akses ditolak",
+    "File not found" : "Berkas tidak ditemukan",
+    "The specified document has not been found on the server." : "Dokumen yang diminta tidak tersedia pada server.",
+    "You can click here to return to %s." : "Anda dapat klik disini unutk kembali ke %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hai,\n\nhanya supaya anda tahu bahwa %s membagikan %s dengan anda.\nLihat: %s\n\n",
+    "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
+    "Cheers!" : "Horee!",
+    "Internal Server Error" : "Kesalahan Server Internal",
+    "The server encountered an internal error and was unable to complete your request." : "Server mengalami kesalahan internal dan tidak dapat menyelesaikan permintaan Anda.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Silahkan hubungi administrator server jika kesalahan ini muncul kembali berulang kali, harap sertakan rincian teknis di bawah ini dalam laporan Anda.",
+    "More details can be found in the server log." : "Rincian lebih lengkap dapat ditemukan di log server.",
+    "Technical details" : "Rincian teknis",
+    "Remote Address: %s" : "Alamat remote: %s",
+    "Request ID: %s" : "ID Permintaan: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Pesan: %s",
+    "File: %s" : "Berkas: %s",
+    "Line: %s" : "Baris: %s",
+    "Trace" : "Jejak",
+    "Security Warning" : "Peringatan Keamanan",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Silakan perbarui instalasi PHP anda untuk menggunakan %s dengan aman.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
+    "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
+    "Password" : "Sandi",
+    "Storage & database" : "Penyimpanan & Basis data",
+    "Data folder" : "Folder data",
+    "Configure the database" : "Konfigurasikan basis data",
+    "Only %s is available." : "Hanya %s yang tersedia",
+    "Database user" : "Pengguna basis data",
+    "Database password" : "Sandi basis data",
+    "Database name" : "Nama basis data",
+    "Database tablespace" : "Tablespace basis data",
+    "Database host" : "Host basis data",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
+    "Finish setup" : "Selesaikan instalasi",
+    "Finishing …" : "Menyelesaikan ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
+    "%s is available. Get more information on how to update." : "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
+    "Log out" : "Keluar",
+    "Server side authentication failed!" : "Otentikasi dari sisi server gagal!",
+    "Please contact your administrator." : "Silahkan hubungi administrator anda.",
+    "Forgot your password? Reset it!" : "Lupa sandi Anda? Setel 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.",
+    "This means only administrators can use the instance." : "Ini berarti hanya administrator yang dapat menggunakan ownCloud.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
+    "Thank you for your patience." : "Terima kasih atas kesabaran anda.",
+    "You are accessing the server from an untrusted domain." : "Anda mengakses server dari domain yang tidak terpercaya.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
+    "Add \"%s\" as trusted domain" : "tambahkan \"%s\" sebagai domain terpercaya",
+    "%s will be updated to version %s." : "%s akan diperbarui ke versi %s.",
+    "The following apps will be disabled:" : "Aplikasi berikut akan dinonaktifkan:",
+    "The theme %s has been disabled." : "Tema %s telah dinonaktfkan.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
+    "Start update" : "Jalankan pembaruan",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
+    "This %s instance is currently being updated, which may take a while." : "Instansi %s ini sedang melakukan pembaruan, ini memerlukan beberapa waktu.",
+    "This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/id.json b/core/l10n/id.json
new file mode 100644
index 00000000000..de9ef83abd5
--- /dev/null
+++ b/core/l10n/id.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Tidak dapat mengirim Email ke pengguna berikut: %s",
+    "Turned on maintenance mode" : "Hidupkan mode perawatan",
+    "Turned off maintenance mode" : "Matikan mode perawatan",
+    "Updated database" : "Basis data terbaru",
+    "Checked database schema update" : "Pembaruan skema basis data terperiksa",
+    "Checked database schema update for apps" : "Pembaruan skema basis data terperiksa untuk aplikasi",
+    "Updated \"%s\" to %s" : "Terbaru \"%s\" sampai %s",
+    "Disabled incompatible apps: %s" : "Aplikasi tidak kompatibel yang dinonaktifkan: %s",
+    "No image or file provided" : "Tidak ada gambar atau berkas yang disediakan",
+    "Unknown filetype" : "Tipe berkas tidak dikenal",
+    "Invalid image" : "Gambar tidak sah",
+    "No temporary profile picture available, try again" : "Tidak ada gambar profil sementara yang tersedia, coba lagi",
+    "No crop data provided" : "Tidak ada data krop tersedia",
+    "Sunday" : "Minggu",
+    "Monday" : "Senin",
+    "Tuesday" : "Selasa",
+    "Wednesday" : "Rabu",
+    "Thursday" : "Kamis",
+    "Friday" : "Jumat",
+    "Saturday" : "Sabtu",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Maret",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Agustus",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Pengaturan",
+    "File" : "Berkas",
+    "Folder" : "Folder",
+    "Image" : "gambar",
+    "Audio" : "Audio",
+    "Saving..." : "Menyimpan...",
+    "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?",
+    "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
+    "Reset password" : "Setel ulang sandi",
+    "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
+    "No" : "Tidak",
+    "Yes" : "Ya",
+    "Choose" : "Pilih",
+    "Error loading file picker template: {error}" : "Galat memuat templat berkas pemilih: {error}",
+    "Ok" : "Oke",
+    "Error loading message template: {error}" : "Kesalahan memuat templat pesan: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} berkas konflik"],
+    "One file conflict" : "Satu berkas konflik",
+    "New Files" : "Berkas Baru",
+    "Already existing files" : "Berkas sudah ada",
+    "Which files do you want to keep?" : "Berkas mana yang ingin anda pertahankan?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya.",
+    "Cancel" : "Batal",
+    "Continue" : "Lanjutkan",
+    "(all selected)" : "(semua terpilih)",
+    "({count} selected)" : "({count} terpilih)",
+    "Error loading file exists template" : "Kesalahan memuat templat berkas yang sudah ada",
+    "Very weak password" : "Sandi sangat lemah",
+    "Weak password" : "Sandi lemah",
+    "So-so password" : "Sandi lumayan",
+    "Good password" : "Sandi baik",
+    "Strong password" : "Sandi kuat",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
+    "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." : "Server ini tidak memiliki koneksi internet. Hal ini berarti bahwa beberapa fitur seperti mengaitkan penyimpanan eksternal, pemberitahuan tentang pembaruan atau instalasi aplikasi pihak ke-3 tidak akan bisa. Mengakses berkas dari remote dan mengirim email notifikasi juga tidak akan bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda menginginkan semua fitur.",
+    "Error occurred while checking server setup" : "Kesalahan tidak terduga saat memeriksa setelan server",
+    "Shared" : "Dibagikan",
+    "Shared with {recipients}" : "Dibagikan dengan {recipients}",
+    "Share" : "Bagikan",
+    "Error" : "Galat",
+    "Error while sharing" : "Galat ketika membagikan",
+    "Error while unsharing" : "Galat ketika membatalkan pembagian",
+    "Error while changing permissions" : "Galat ketika 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 user or group …" : "Bagikan dengan pengguna atau grup ...",
+    "Share link" : "Bagikan tautan",
+    "The public link will expire no later than {days} days after it is created" : "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
+    "Password protect" : "Lindungi dengan sandi",
+    "Choose a password for the public link" : "Tetapkan sandi untuk tautan publik",
+    "Allow Public Upload" : "Izinkan Unggahan Publik",
+    "Email link to person" : "Emailkan tautan ini ke orang",
+    "Send" : "Kirim",
+    "Set expiration date" : "Atur tanggal kedaluwarsa",
+    "Expiration date" : "Tanggal kedaluwarsa",
+    "Adding user..." : "Menambahkan pengguna...",
+    "group" : "grup",
+    "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",
+    "can share" : "dapat berbagi",
+    "can edit" : "dapat sunting",
+    "access control" : "kontrol akses",
+    "create" : "buat",
+    "update" : "perbarui",
+    "delete" : "hapus",
+    "Password protected" : "Sandi dilindungi",
+    "Error unsetting expiration date" : "Galat ketika menghapus tanggal kedaluwarsa",
+    "Error setting expiration date" : "Galat ketika mengatur tanggal kedaluwarsa",
+    "Sending ..." : "Mengirim ...",
+    "Email sent" : "Email terkirim",
+    "Warning" : "Peringatan",
+    "The object type is not specified." : "Tipe objek tidak ditentukan.",
+    "Enter new" : "Masukkan baru",
+    "Delete" : "Hapus",
+    "Add" : "Tambah",
+    "Edit tags" : "Sunting label",
+    "Error loading dialog template: {error}" : "Galat memuat templat dialog: {error}",
+    "No tags selected for deletion." : "Tidak ada label yang dipilih untuk dihapus.",
+    "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
+    "Please reload the page." : "Silakan muat ulang halaman.",
+    "The update was unsuccessful." : "Pembaruan tidak berhasil",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
+    "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
+    "Username" : "Nama pengguna",
+    "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?" : "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?",
+    "Yes, I really want to reset my password now" : "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
+    "Reset" : "Atur Ulang",
+    "New password" : "Sandi baru",
+    "New Password" : "Sandi Baru",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
+    "Personal" : "Pribadi",
+    "Users" : "Pengguna",
+    "Apps" : "Aplikasi",
+    "Admin" : "Admin",
+    "Help" : "Bantuan",
+    "Error loading tags" : "Galat saat memuat tag",
+    "Tag already exists" : "Tag sudah ada",
+    "Error deleting tag(s)" : "Galat saat menghapus tag",
+    "Error tagging" : "Galat saat memberikan tag",
+    "Error untagging" : "Galat saat menghapus tag",
+    "Error favoriting" : "Galat saat memberikan sebagai favorit",
+    "Error unfavoriting" : "Galat saat menghapus sebagai favorit",
+    "Access forbidden" : "Akses ditolak",
+    "File not found" : "Berkas tidak ditemukan",
+    "The specified document has not been found on the server." : "Dokumen yang diminta tidak tersedia pada server.",
+    "You can click here to return to %s." : "Anda dapat klik disini unutk kembali ke %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hai,\n\nhanya supaya anda tahu bahwa %s membagikan %s dengan anda.\nLihat: %s\n\n",
+    "The share will expire on %s." : "Pembagian akan berakhir pada %s.",
+    "Cheers!" : "Horee!",
+    "Internal Server Error" : "Kesalahan Server Internal",
+    "The server encountered an internal error and was unable to complete your request." : "Server mengalami kesalahan internal dan tidak dapat menyelesaikan permintaan Anda.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Silahkan hubungi administrator server jika kesalahan ini muncul kembali berulang kali, harap sertakan rincian teknis di bawah ini dalam laporan Anda.",
+    "More details can be found in the server log." : "Rincian lebih lengkap dapat ditemukan di log server.",
+    "Technical details" : "Rincian teknis",
+    "Remote Address: %s" : "Alamat remote: %s",
+    "Request ID: %s" : "ID Permintaan: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Pesan: %s",
+    "File: %s" : "Berkas: %s",
+    "Line: %s" : "Baris: %s",
+    "Trace" : "Jejak",
+    "Security Warning" : "Peringatan Keamanan",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Silakan perbarui instalasi PHP anda untuk menggunakan %s dengan aman.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
+    "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
+    "Password" : "Sandi",
+    "Storage & database" : "Penyimpanan & Basis data",
+    "Data folder" : "Folder data",
+    "Configure the database" : "Konfigurasikan basis data",
+    "Only %s is available." : "Hanya %s yang tersedia",
+    "Database user" : "Pengguna basis data",
+    "Database password" : "Sandi basis data",
+    "Database name" : "Nama basis data",
+    "Database tablespace" : "Tablespace basis data",
+    "Database host" : "Host basis data",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
+    "Finish setup" : "Selesaikan instalasi",
+    "Finishing …" : "Menyelesaikan ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
+    "%s is available. Get more information on how to update." : "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
+    "Log out" : "Keluar",
+    "Server side authentication failed!" : "Otentikasi dari sisi server gagal!",
+    "Please contact your administrator." : "Silahkan hubungi administrator anda.",
+    "Forgot your password? Reset it!" : "Lupa sandi Anda? Setel 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.",
+    "This means only administrators can use the instance." : "Ini berarti hanya administrator yang dapat menggunakan ownCloud.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
+    "Thank you for your patience." : "Terima kasih atas kesabaran anda.",
+    "You are accessing the server from an untrusted domain." : "Anda mengakses server dari domain yang tidak terpercaya.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
+    "Add \"%s\" as trusted domain" : "tambahkan \"%s\" sebagai domain terpercaya",
+    "%s will be updated to version %s." : "%s akan diperbarui ke versi %s.",
+    "The following apps will be disabled:" : "Aplikasi berikut akan dinonaktifkan:",
+    "The theme %s has been disabled." : "Tema %s telah dinonaktfkan.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
+    "Start update" : "Jalankan pembaruan",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
+    "This %s instance is currently being updated, which may take a while." : "Instansi %s ini sedang melakukan pembaruan, ini memerlukan beberapa waktu.",
+    "This page will refresh itself when the %s instance is available again." : "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/id.php b/core/l10n/id.php
deleted file mode 100644
index 558bc161e06..00000000000
--- a/core/l10n/id.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Tidak dapat mengirim Email ke pengguna berikut: %s",
-"Turned on maintenance mode" => "Hidupkan mode perawatan",
-"Turned off maintenance mode" => "Matikan mode perawatan",
-"Updated database" => "Basis data terbaru",
-"Checked database schema update" => "Pembaruan skema basis data terperiksa",
-"Checked database schema update for apps" => "Pembaruan skema basis data terperiksa untuk aplikasi",
-"Updated \"%s\" to %s" => "Terbaru \"%s\" sampai %s",
-"Disabled incompatible apps: %s" => "Aplikasi tidak kompatibel yang dinonaktifkan: %s",
-"No image or file provided" => "Tidak ada gambar atau berkas yang disediakan",
-"Unknown filetype" => "Tipe berkas tidak dikenal",
-"Invalid image" => "Gambar tidak sah",
-"No temporary profile picture available, try again" => "Tidak ada gambar profil sementara yang tersedia, coba lagi",
-"No crop data provided" => "Tidak ada data krop tersedia",
-"Sunday" => "Minggu",
-"Monday" => "Senin",
-"Tuesday" => "Selasa",
-"Wednesday" => "Rabu",
-"Thursday" => "Kamis",
-"Friday" => "Jumat",
-"Saturday" => "Sabtu",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Maret",
-"April" => "April",
-"May" => "Mei",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Agustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Settings" => "Pengaturan",
-"File" => "Berkas",
-"Folder" => "Folder",
-"Image" => "gambar",
-"Audio" => "Audio",
-"Saving..." => "Menyimpan...",
-"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?",
-"I know what I'm doing" => "Saya tahu apa yang saya lakukan",
-"Reset password" => "Setel ulang sandi",
-"Password can not be changed. Please contact your administrator." => "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
-"No" => "Tidak",
-"Yes" => "Ya",
-"Choose" => "Pilih",
-"Error loading file picker template: {error}" => "Galat memuat templat berkas pemilih: {error}",
-"Ok" => "Oke",
-"Error loading message template: {error}" => "Kesalahan memuat templat pesan: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} berkas konflik"),
-"One file conflict" => "Satu berkas konflik",
-"New Files" => "Berkas Baru",
-"Already existing files" => "Berkas sudah ada",
-"Which files do you want to keep?" => "Berkas mana yang ingin anda pertahankan?",
-"If you select both versions, the copied file will have a number added to its name." => "Jika anda memilih kedua versi, berkas yang disalin akan memiliki nomor yang ditambahkan sesuai namanya.",
-"Cancel" => "Batal",
-"Continue" => "Lanjutkan",
-"(all selected)" => "(semua terpilih)",
-"({count} selected)" => "({count} terpilih)",
-"Error loading file exists template" => "Kesalahan memuat templat berkas yang sudah ada",
-"Very weak password" => "Sandi sangat lemah",
-"Weak password" => "Sandi lemah",
-"So-so password" => "Sandi lumayan",
-"Good password" => "Sandi baik",
-"Strong password" => "Sandi kuat",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web server Anda belum dikonfigurasikan dengan baik untuk mengizinkan sinkronisasi berkas karena tampaknya antarmuka WebDAV rusak.",
-"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." => "Server ini tidak memiliki koneksi internet. Hal ini berarti bahwa beberapa fitur seperti mengaitkan penyimpanan eksternal, pemberitahuan tentang pembaruan atau instalasi aplikasi pihak ke-3 tidak akan bisa. Mengakses berkas dari remote dan mengirim email notifikasi juga tidak akan bekerja. Kami menyarankan untuk mengaktifkan koneksi internet untuk server ini jika Anda menginginkan semua fitur.",
-"Error occurred while checking server setup" => "Kesalahan tidak terduga saat memeriksa setelan server",
-"Shared" => "Dibagikan",
-"Shared with {recipients}" => "Dibagikan dengan {recipients}",
-"Share" => "Bagikan",
-"Error" => "Galat",
-"Error while sharing" => "Galat ketika membagikan",
-"Error while unsharing" => "Galat ketika membatalkan pembagian",
-"Error while changing permissions" => "Galat ketika 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 user or group …" => "Bagikan dengan pengguna atau grup ...",
-"Share link" => "Bagikan tautan",
-"The public link will expire no later than {days} days after it is created" => "Tautan publik akan kadaluarsa tidak lebih dari {days} hari setelah ini dibuat",
-"Password protect" => "Lindungi dengan sandi",
-"Choose a password for the public link" => "Tetapkan sandi untuk tautan publik",
-"Allow Public Upload" => "Izinkan Unggahan Publik",
-"Email link to person" => "Emailkan tautan ini ke orang",
-"Send" => "Kirim",
-"Set expiration date" => "Atur tanggal kedaluwarsa",
-"Expiration date" => "Tanggal kedaluwarsa",
-"Adding user..." => "Menambahkan pengguna...",
-"group" => "grup",
-"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",
-"can share" => "dapat berbagi",
-"can edit" => "dapat sunting",
-"access control" => "kontrol akses",
-"create" => "buat",
-"update" => "perbarui",
-"delete" => "hapus",
-"Password protected" => "Sandi dilindungi",
-"Error unsetting expiration date" => "Galat ketika menghapus tanggal kedaluwarsa",
-"Error setting expiration date" => "Galat ketika mengatur tanggal kedaluwarsa",
-"Sending ..." => "Mengirim ...",
-"Email sent" => "Email terkirim",
-"Warning" => "Peringatan",
-"The object type is not specified." => "Tipe objek tidak ditentukan.",
-"Enter new" => "Masukkan baru",
-"Delete" => "Hapus",
-"Add" => "Tambah",
-"Edit tags" => "Sunting label",
-"Error loading dialog template: {error}" => "Galat memuat templat dialog: {error}",
-"No tags selected for deletion." => "Tidak ada label yang dipilih untuk dihapus.",
-"Updating {productName} to version {version}, this may take a while." => "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
-"Please reload the page." => "Silakan muat ulang halaman.",
-"The update was unsuccessful." => "Pembaruan tidak berhasil",
-"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 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",
-"Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
-"You will receive a link to reset your password via Email." => "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-"Username" => "Nama pengguna",
-"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?" => "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?",
-"Yes, I really want to reset my password now" => "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
-"Reset" => "Atur Ulang",
-"New password" => "Sandi baru",
-"New Password" => "Sandi Baru",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
-"For the best results, please consider using a GNU/Linux server instead." => "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
-"Personal" => "Pribadi",
-"Users" => "Pengguna",
-"Apps" => "Aplikasi",
-"Admin" => "Admin",
-"Help" => "Bantuan",
-"Error loading tags" => "Galat saat memuat tag",
-"Tag already exists" => "Tag sudah ada",
-"Error deleting tag(s)" => "Galat saat menghapus tag",
-"Error tagging" => "Galat saat memberikan tag",
-"Error untagging" => "Galat saat menghapus tag",
-"Error favoriting" => "Galat saat memberikan sebagai favorit",
-"Error unfavoriting" => "Galat saat menghapus sebagai favorit",
-"Access forbidden" => "Akses ditolak",
-"File not found" => "Berkas tidak ditemukan",
-"The specified document has not been found on the server." => "Dokumen yang diminta tidak tersedia pada server.",
-"You can click here to return to %s." => "Anda dapat klik disini unutk kembali ke %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hai,\n\nhanya supaya anda tahu bahwa %s membagikan %s dengan anda.\nLihat: %s\n\n",
-"The share will expire on %s." => "Pembagian akan berakhir pada %s.",
-"Cheers!" => "Horee!",
-"Internal Server Error" => "Kesalahan Server Internal",
-"The server encountered an internal error and was unable to complete your request." => "Server mengalami kesalahan internal dan tidak dapat menyelesaikan permintaan Anda.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Silahkan hubungi administrator server jika kesalahan ini muncul kembali berulang kali, harap sertakan rincian teknis di bawah ini dalam laporan Anda.",
-"More details can be found in the server log." => "Rincian lebih lengkap dapat ditemukan di log server.",
-"Technical details" => "Rincian teknis",
-"Remote Address: %s" => "Alamat remote: %s",
-"Request ID: %s" => "ID Permintaan: %s",
-"Code: %s" => "Kode: %s",
-"Message: %s" => "Pesan: %s",
-"File: %s" => "Berkas: %s",
-"Line: %s" => "Baris: %s",
-"Trace" => "Jejak",
-"Security Warning" => "Peringatan Keamanan",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versi PHP Anda rentan terhadap serangan NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Silakan perbarui instalasi PHP anda untuk menggunakan %s dengan aman.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
-"Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
-"Password" => "Sandi",
-"Storage & database" => "Penyimpanan & Basis data",
-"Data folder" => "Folder data",
-"Configure the database" => "Konfigurasikan basis data",
-"Only %s is available." => "Hanya %s yang tersedia",
-"Database user" => "Pengguna basis data",
-"Database password" => "Sandi basis data",
-"Database name" => "Nama basis data",
-"Database tablespace" => "Tablespace basis data",
-"Database host" => "Host basis data",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite akan digunakan sebagai basis data. Untuk instalasi yang lebih besar, kami merekomendasikan untuk mengubah setelan ini.",
-"Finish setup" => "Selesaikan instalasi",
-"Finishing …" => "Menyelesaikan ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Aplikasi ini memerlukan JavaScript untuk beroperasi dengan benar. Mohon <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktifkan JavaScript</a> dan muat ulang halaman.",
-"%s is available. Get more information on how to update." => "%s tersedia. Dapatkan informasi lebih lanjut tentang cara memperbarui.",
-"Log out" => "Keluar",
-"Server side authentication failed!" => "Otentikasi dari sisi server gagal!",
-"Please contact your administrator." => "Silahkan hubungi administrator anda.",
-"Forgot your password? Reset it!" => "Lupa sandi Anda? Setel 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.",
-"This means only administrators can use the instance." => "Ini berarti hanya administrator yang dapat menggunakan ownCloud.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Hubungi administrator sistem anda jika pesan ini terus muncul atau muncul tiba-tiba.",
-"Thank you for your patience." => "Terima kasih atas kesabaran anda.",
-"You are accessing the server from an untrusted domain." => "Anda mengakses server dari domain yang tidak terpercaya.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Mohon hubungi administrator Anda. Jika Anda seorang administrator dari instansi ini, konfigurasikan pengaturan \"trusted_domain\" didalam config/config.php. Contoh konfigurasi talah disediakan didalam config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Tergantung pada konfigurasi Anda, sebagai seorang administrator Anda kemungkinan dapat menggunakan tombol bawah untuk mempercayai domain ini.",
-"Add \"%s\" as trusted domain" => "tambahkan \"%s\" sebagai domain terpercaya",
-"%s will be updated to version %s." => "%s akan diperbarui ke versi %s.",
-"The following apps will be disabled:" => "Aplikasi berikut akan dinonaktifkan:",
-"The theme %s has been disabled." => "Tema %s telah dinonaktfkan.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pastikan bahwa basis data, folder konfig, dan folder data telah dicadangkan sebelum melanjutkan.",
-"Start update" => "Jalankan pembaruan",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Untuk menghindari waktu habis dengan instalasi yang lebih besar, Anda bisa menjalankan perintah berikut dari direktori instalasi Anda:",
-"This %s instance is currently being updated, which may take a while." => "Instansi %s ini sedang melakukan pembaruan, ini memerlukan beberapa waktu.",
-"This page will refresh itself when the %s instance is available again." => "Halaman ini akan disegarkan dengan sendiri saat instansi %s tersebut tersedia kembali."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/io.js b/core/l10n/io.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/io.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/io.json b/core/l10n/io.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/io.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/io.php b/core/l10n/io.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/io.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/is.js b/core/l10n/is.js
new file mode 100644
index 00000000000..6fe19ee9db9
--- /dev/null
+++ b/core/l10n/is.js
@@ -0,0 +1,90 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Sunnudagur",
+    "Monday" : "Mánudagur",
+    "Tuesday" : "Þriðjudagur",
+    "Wednesday" : "Miðvikudagur",
+    "Thursday" : "Fimmtudagur",
+    "Friday" : "Föstudagur",
+    "Saturday" : "Laugardagur",
+    "January" : "Janúar",
+    "February" : "Febrúar",
+    "March" : "Mars",
+    "April" : "Apríl",
+    "May" : "Maí",
+    "June" : "Júní",
+    "July" : "Júlí",
+    "August" : "Ágúst",
+    "September" : "September",
+    "October" : "Október",
+    "November" : "Nóvember",
+    "December" : "Desember",
+    "Settings" : "Stillingar",
+    "Folder" : "Mappa",
+    "Saving..." : "Er að vista ...",
+    "Reset password" : "Endursetja lykilorð",
+    "No" : "Nei",
+    "Yes" : "Já",
+    "Choose" : "Veldu",
+    "Ok" : "Í lagi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Hætta við",
+    "Shared" : "Deilt",
+    "Share" : "Deila",
+    "Error" : "Villa",
+    "Error while sharing" : "Villa við deilingu",
+    "Error while unsharing" : "Villa við að hætta deilingu",
+    "Error while changing permissions" : "Villa við að breyta aðgangsheimildum",
+    "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
+    "Shared with you by {owner}" : "Deilt með þér af {owner}",
+    "Password protect" : "Verja með lykilorði",
+    "Email link to person" : "Senda vefhlekk í tölvupóstu til notenda",
+    "Send" : "Senda",
+    "Set expiration date" : "Setja gildistíma",
+    "Expiration date" : "Gildir til",
+    "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
+    "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
+    "Unshare" : "Hætta deilingu",
+    "can edit" : "getur breytt",
+    "access control" : "aðgangsstýring",
+    "create" : "mynda",
+    "update" : "uppfæra",
+    "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",
+    "Warning" : "Aðvörun",
+    "The object type is not specified." : "Tegund ekki tilgreind",
+    "Delete" : "Eyða",
+    "Add" : "Bæta við",
+    "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
+    "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
+    "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
+    "Username" : "Notendanafn",
+    "New password" : "Nýtt lykilorð",
+    "Personal" : "Um mig",
+    "Users" : "Notendur",
+    "Apps" : "Forrit",
+    "Admin" : "Stjórnun",
+    "Help" : "Hjálp",
+    "Access forbidden" : "Aðgangur bannaður",
+    "Security Warning" : "Öryggis aðvörun",
+    "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
+    "Password" : "Lykilorð",
+    "Data folder" : "Gagnamappa",
+    "Configure the database" : "Stilla gagnagrunn",
+    "Database user" : "Gagnagrunns notandi",
+    "Database password" : "Gagnagrunns lykilorð",
+    "Database name" : "Nafn gagnagrunns",
+    "Database tablespace" : "Töflusvæði gagnagrunns",
+    "Database host" : "Netþjónn gagnagrunns",
+    "Finish setup" : "Virkja uppsetningu",
+    "%s is available. Get more information on how to update." : "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir.",
+    "Log out" : "Útskrá",
+    "remember" : "muna eftir mér",
+    "Log in" : "<strong>Skrá inn</strong>"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/is.json b/core/l10n/is.json
new file mode 100644
index 00000000000..5f24eae33ac
--- /dev/null
+++ b/core/l10n/is.json
@@ -0,0 +1,88 @@
+{ "translations": {
+    "Sunday" : "Sunnudagur",
+    "Monday" : "Mánudagur",
+    "Tuesday" : "Þriðjudagur",
+    "Wednesday" : "Miðvikudagur",
+    "Thursday" : "Fimmtudagur",
+    "Friday" : "Föstudagur",
+    "Saturday" : "Laugardagur",
+    "January" : "Janúar",
+    "February" : "Febrúar",
+    "March" : "Mars",
+    "April" : "Apríl",
+    "May" : "Maí",
+    "June" : "Júní",
+    "July" : "Júlí",
+    "August" : "Ágúst",
+    "September" : "September",
+    "October" : "Október",
+    "November" : "Nóvember",
+    "December" : "Desember",
+    "Settings" : "Stillingar",
+    "Folder" : "Mappa",
+    "Saving..." : "Er að vista ...",
+    "Reset password" : "Endursetja lykilorð",
+    "No" : "Nei",
+    "Yes" : "Já",
+    "Choose" : "Veldu",
+    "Ok" : "Í lagi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Hætta við",
+    "Shared" : "Deilt",
+    "Share" : "Deila",
+    "Error" : "Villa",
+    "Error while sharing" : "Villa við deilingu",
+    "Error while unsharing" : "Villa við að hætta deilingu",
+    "Error while changing permissions" : "Villa við að breyta aðgangsheimildum",
+    "Shared with you and the group {group} by {owner}" : "Deilt með þér og hópnum {group} af {owner}",
+    "Shared with you by {owner}" : "Deilt með þér af {owner}",
+    "Password protect" : "Verja með lykilorði",
+    "Email link to person" : "Senda vefhlekk í tölvupóstu til notenda",
+    "Send" : "Senda",
+    "Set expiration date" : "Setja gildistíma",
+    "Expiration date" : "Gildir til",
+    "Resharing is not allowed" : "Endurdeiling er ekki leyfð",
+    "Shared in {item} with {user}" : "Deilt með {item} ásamt {user}",
+    "Unshare" : "Hætta deilingu",
+    "can edit" : "getur breytt",
+    "access control" : "aðgangsstýring",
+    "create" : "mynda",
+    "update" : "uppfæra",
+    "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",
+    "Warning" : "Aðvörun",
+    "The object type is not specified." : "Tegund ekki tilgreind",
+    "Delete" : "Eyða",
+    "Add" : "Bæta við",
+    "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
+    "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
+    "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
+    "Username" : "Notendanafn",
+    "New password" : "Nýtt lykilorð",
+    "Personal" : "Um mig",
+    "Users" : "Notendur",
+    "Apps" : "Forrit",
+    "Admin" : "Stjórnun",
+    "Help" : "Hjálp",
+    "Access forbidden" : "Aðgangur bannaður",
+    "Security Warning" : "Öryggis aðvörun",
+    "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
+    "Password" : "Lykilorð",
+    "Data folder" : "Gagnamappa",
+    "Configure the database" : "Stilla gagnagrunn",
+    "Database user" : "Gagnagrunns notandi",
+    "Database password" : "Gagnagrunns lykilorð",
+    "Database name" : "Nafn gagnagrunns",
+    "Database tablespace" : "Töflusvæði gagnagrunns",
+    "Database host" : "Netþjónn gagnagrunns",
+    "Finish setup" : "Virkja uppsetningu",
+    "%s is available. Get more information on how to update." : "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir.",
+    "Log out" : "Útskrá",
+    "remember" : "muna eftir mér",
+    "Log in" : "<strong>Skrá inn</strong>"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/is.php b/core/l10n/is.php
deleted file mode 100644
index cec7226680d..00000000000
--- a/core/l10n/is.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Sunnudagur",
-"Monday" => "Mánudagur",
-"Tuesday" => "Þriðjudagur",
-"Wednesday" => "Miðvikudagur",
-"Thursday" => "Fimmtudagur",
-"Friday" => "Föstudagur",
-"Saturday" => "Laugardagur",
-"January" => "Janúar",
-"February" => "Febrúar",
-"March" => "Mars",
-"April" => "Apríl",
-"May" => "Maí",
-"June" => "Júní",
-"July" => "Júlí",
-"August" => "Ágúst",
-"September" => "September",
-"October" => "Október",
-"November" => "Nóvember",
-"December" => "Desember",
-"Settings" => "Stillingar",
-"Folder" => "Mappa",
-"Saving..." => "Er að vista ...",
-"Reset password" => "Endursetja lykilorð",
-"No" => "Nei",
-"Yes" => "Já",
-"Choose" => "Veldu",
-"Ok" => "Í lagi",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Hætta við",
-"Shared" => "Deilt",
-"Share" => "Deila",
-"Error" => "Villa",
-"Error while sharing" => "Villa við deilingu",
-"Error while unsharing" => "Villa við að hætta deilingu",
-"Error while changing permissions" => "Villa við að breyta aðgangsheimildum",
-"Shared with you and the group {group} by {owner}" => "Deilt með þér og hópnum {group} af {owner}",
-"Shared with you by {owner}" => "Deilt með þér af {owner}",
-"Password protect" => "Verja með lykilorði",
-"Email link to person" => "Senda vefhlekk í tölvupóstu til notenda",
-"Send" => "Senda",
-"Set expiration date" => "Setja gildistíma",
-"Expiration date" => "Gildir til",
-"Resharing is not allowed" => "Endurdeiling er ekki leyfð",
-"Shared in {item} with {user}" => "Deilt með {item} ásamt {user}",
-"Unshare" => "Hætta deilingu",
-"can edit" => "getur breytt",
-"access control" => "aðgangsstýring",
-"create" => "mynda",
-"update" => "uppfæra",
-"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",
-"Warning" => "Aðvörun",
-"The object type is not specified." => "Tegund ekki tilgreind",
-"Delete" => "Eyða",
-"Add" => "Bæta við",
-"The update was successful. Redirecting you to ownCloud now." => "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
-"Use the following link to reset your password: {link}" => "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
-"You will receive a link to reset your password via Email." => "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
-"Username" => "Notendanafn",
-"New password" => "Nýtt lykilorð",
-"Personal" => "Um mig",
-"Users" => "Notendur",
-"Apps" => "Forrit",
-"Admin" => "Stjórnun",
-"Help" => "Hjálp",
-"Access forbidden" => "Aðgangur bannaður",
-"Security Warning" => "Öryggis aðvörun",
-"Create an <strong>admin account</strong>" => "Útbúa <strong>vefstjóra aðgang</strong>",
-"Password" => "Lykilorð",
-"Data folder" => "Gagnamappa",
-"Configure the database" => "Stilla gagnagrunn",
-"Database user" => "Gagnagrunns notandi",
-"Database password" => "Gagnagrunns lykilorð",
-"Database name" => "Nafn gagnagrunns",
-"Database tablespace" => "Töflusvæði gagnagrunns",
-"Database host" => "Netþjónn gagnagrunns",
-"Finish setup" => "Virkja uppsetningu",
-"%s is available. Get more information on how to update." => "%s er til boða. Fáðu meiri upplýsingar um hvernig þú uppfærir.",
-"Log out" => "Útskrá",
-"remember" => "muna eftir mér",
-"Log in" => "<strong>Skrá inn</strong>"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/it.js b/core/l10n/it.js
new file mode 100644
index 00000000000..d444a0a9fb7
--- /dev/null
+++ b/core/l10n/it.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
+    "Turned on maintenance mode" : "Modalità di manutenzione attivata",
+    "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
+    "Updated database" : "Database aggiornato",
+    "Checked database schema update" : "Verificato l'aggiornamento dello schema del database",
+    "Checked database schema update for apps" : "Verificato l'aggiornamento dello schema del database per le applicazioni",
+    "Updated \"%s\" to %s" : "Aggiornato \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Applicazione incompatibili disabilitate: %s",
+    "No image or file provided" : "Non è stata fornita alcun immagine o file",
+    "Unknown filetype" : "Tipo di file sconosciuto",
+    "Invalid image" : "Immagine non valida",
+    "No temporary profile picture available, try again" : "Nessuna immagine di profilo provvisoria disponibile, riprova",
+    "No crop data provided" : "Dati di ritaglio non forniti",
+    "Sunday" : "Domenica",
+    "Monday" : "Lunedì",
+    "Tuesday" : "Martedì",
+    "Wednesday" : "Mercoledì",
+    "Thursday" : "Giovedì",
+    "Friday" : "Venerdì",
+    "Saturday" : "Sabato",
+    "January" : "Gennaio",
+    "February" : "Febbraio",
+    "March" : "Marzo",
+    "April" : "Aprile",
+    "May" : "Maggio",
+    "June" : "Giugno",
+    "July" : "Luglio",
+    "August" : "Agosto",
+    "September" : "Settembre",
+    "October" : "Ottobre",
+    "November" : "Novembre",
+    "December" : "Dicembre",
+    "Settings" : "Impostazioni",
+    "File" : "File",
+    "Folder" : "Cartella",
+    "Image" : "Immagine",
+    "Audio" : "Audio",
+    "Saving..." : "Salvataggio in corso...",
+    "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?",
+    "I know what I'm doing" : "So cosa sto facendo",
+    "Reset password" : "Ripristina la password",
+    "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
+    "No" : "No",
+    "Yes" : "Sì",
+    "Choose" : "Scegli",
+    "Error loading file picker template: {error}" : "Errore durante il caricamento del modello del selettore file: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Errore durante il caricamento del modello di messaggio: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file in conflitto","{count} file in conflitto"],
+    "One file conflict" : "Un file in conflitto",
+    "New Files" : "File nuovi",
+    "Already existing files" : "File già esistenti",
+    "Which files do you want to keep?" : "Quali file vuoi mantenere?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato.",
+    "Cancel" : "Annulla",
+    "Continue" : "Continua",
+    "(all selected)" : "(tutti i selezionati)",
+    "({count} selected)" : "({count} selezionati)",
+    "Error loading file exists template" : "Errore durante il caricamento del modello del file esistente",
+    "Very weak password" : "Password molto debole",
+    "Weak password" : "Password debole",
+    "So-so password" : "Password così-così",
+    "Good password" : "Password buona",
+    "Strong password" : "Password forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra no funzionare correttamente.",
+    "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." : "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
+    "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
+    "Shared" : "Condivisi",
+    "Shared with {recipients}" : "Condiviso con {recipients}",
+    "Share" : "Condividi",
+    "Error" : "Errore",
+    "Error while sharing" : "Errore durante la condivisione",
+    "Error while unsharing" : "Errore durante la rimozione della condivisione",
+    "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 user or group …" : "Condividi con utente o gruppo ...",
+    "Share link" : "Condividi collegamento",
+    "The public link will expire no later than {days} days after it is created" : "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
+    "Password protect" : "Proteggi con password",
+    "Choose a password for the public link" : "Scegli una password per il collegamento pubblico",
+    "Allow Public Upload" : "Consenti caricamento pubblico",
+    "Email link to person" : "Invia collegamento via email",
+    "Send" : "Invia",
+    "Set expiration date" : "Imposta data di scadenza",
+    "Expiration date" : "Data di scadenza",
+    "Adding user..." : "Aggiunta utente in corso...",
+    "group" : "gruppo",
+    "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",
+    "can share" : "può condividere",
+    "can edit" : "può modificare",
+    "access control" : "controllo d'accesso",
+    "create" : "creare",
+    "update" : "aggiornare",
+    "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",
+    "Warning" : "Avviso",
+    "The object type is not specified." : "Il tipo di oggetto non è specificato.",
+    "Enter new" : "Inserisci nuovo",
+    "Delete" : "Elimina",
+    "Add" : "Aggiungi",
+    "Edit tags" : "Modifica etichette",
+    "Error loading dialog template: {error}" : "Errore durante il caricamento del modello di finestra: {error}",
+    "No tags selected for deletion." : "Nessuna etichetta selezionata per l'eliminazione.",
+    "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
+    "Please reload the page." : "Ricarica la pagina.",
+    "The update was unsuccessful." : "L'aggiornamento non è riuscito.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
+    "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
+    "%s password reset" : "Ripristino password di %s",
+    "Use the following link to reset your password: {link}" : "Usa il collegamento seguente per ripristinare la password: {link}",
+    "You will receive a link to reset your password via Email." : "Riceverai un collegamento per ripristinare la tua password via email",
+    "Username" : "Nome utente",
+    "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?" : "I 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à ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
+    "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso",
+    "Reset" : "Ripristina",
+    "New password" : "Nuova password",
+    "New Password" : "Nuova password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
+    "Personal" : "Personale",
+    "Users" : "Utenti",
+    "Apps" : "Applicazioni",
+    "Admin" : "Admin",
+    "Help" : "Aiuto",
+    "Error loading tags" : "Errore di caricamento delle etichette",
+    "Tag already exists" : "L'etichetta esiste già",
+    "Error deleting tag(s)" : "Errore di eliminazione delle etichette",
+    "Error tagging" : "Errore di assegnazione delle etichette",
+    "Error untagging" : "Errore di rimozione delle etichette",
+    "Error favoriting" : "Errore di creazione dei preferiti",
+    "Error unfavoriting" : "Errore di rimozione dai preferiti",
+    "Access forbidden" : "Accesso negato",
+    "File not found" : "File non trovato",
+    "The specified document has not been found on the server." : "Il documento specificato non è stato trovato sul server.",
+    "You can click here to return to %s." : "Puoi fare clic qui per tornare a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
+    "The share will expire on %s." : "La condivisione scadrà il %s.",
+    "Cheers!" : "Saluti!",
+    "Internal Server Error" : "Errore interno del server",
+    "The server encountered an internal error and was unable to complete your request." : "Il server ha riscontrato un errore interno e non è stato in grado di completare la tua richiesta.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Contatta l'amministratore del server se questo errore riappare più volte, includendo i dettagli tecnici sotto riportati nella tua segnalazione.",
+    "More details can be found in the server log." : "Ulteriori dettagli sono disponibili nel log del server.",
+    "Technical details" : "Dettagli tecnici",
+    "Remote Address: %s" : "Indirizzo remoto: %s",
+    "Request ID: %s" : "ID richiesta: %s",
+    "Code: %s" : "Codice: %s",
+    "Message: %s" : "Messaggio: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Riga: %s",
+    "Trace" : "Traccia",
+    "Security Warning" : "Avviso di sicurezza",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Archiviazione e database",
+    "Data folder" : "Cartella dati",
+    "Configure the database" : "Configura il database",
+    "Only %s is available." : "È disponibile solo %s.",
+    "Database user" : "Utente del database",
+    "Database password" : "Password del database",
+    "Database name" : "Nome del database",
+    "Database tablespace" : "Spazio delle tabelle del database",
+    "Database host" : "Host del database",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
+    "Finish setup" : "Termina la configurazione",
+    "Finishing …" : "Completamento...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa pagina.",
+    "%s is available. Get more information on how to update." : "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
+    "Log out" : "Esci",
+    "Server side authentication failed!" : "Autenticazione lato server non riuscita!",
+    "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
+    "Forgot your password? Reset it!" : "Hai dimenticato la password? Reimpostala!",
+    "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.",
+    "This means only administrators can use the instance." : "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
+    "Thank you for your patience." : "Grazie per la pazienza.",
+    "You are accessing the server from an untrusted domain." : "Stai accedendo al server da un dominio non attendibile.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contatta il tuo amministratore di sistema. Se sei un amministratore di questa istanza, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "In base alla tua configurazione, come amministratore potrai utilizzare anche il pulsante in basso per rendere attendibile questo dominio.",
+    "Add \"%s\" as trusted domain" : "Aggiungi \"%s\" come dominio attendibile",
+    "%s will be updated to version %s." : "%s sarà aggiornato alla versione %s.",
+    "The following apps will be disabled:" : "Le seguenti applicazioni saranno disabilitate:",
+    "The theme %s has been disabled." : "Il tema %s è stato disabilitato.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
+    "Start update" : "Avvia l'aggiornamento",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitare timeout con installazioni di grandi dimensioni, puoi eseguire il comando che segue dalla cartella di installazione:",
+    "This %s instance is currently being updated, which may take a while." : "Questa istanza di %s è in fase di aggiornamento, potrebbe richiedere del tempo.",
+    "This page will refresh itself when the %s instance is available again." : "Questa pagina si aggiornerà quando l'istanza di %s sarà nuovamente disponibile."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/it.json b/core/l10n/it.json
new file mode 100644
index 00000000000..2be5d0fcd44
--- /dev/null
+++ b/core/l10n/it.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Impossibile inviare email ai seguenti utenti: %s",
+    "Turned on maintenance mode" : "Modalità di manutenzione attivata",
+    "Turned off maintenance mode" : "Modalità di manutenzione disattivata",
+    "Updated database" : "Database aggiornato",
+    "Checked database schema update" : "Verificato l'aggiornamento dello schema del database",
+    "Checked database schema update for apps" : "Verificato l'aggiornamento dello schema del database per le applicazioni",
+    "Updated \"%s\" to %s" : "Aggiornato \"%s\" a %s",
+    "Disabled incompatible apps: %s" : "Applicazione incompatibili disabilitate: %s",
+    "No image or file provided" : "Non è stata fornita alcun immagine o file",
+    "Unknown filetype" : "Tipo di file sconosciuto",
+    "Invalid image" : "Immagine non valida",
+    "No temporary profile picture available, try again" : "Nessuna immagine di profilo provvisoria disponibile, riprova",
+    "No crop data provided" : "Dati di ritaglio non forniti",
+    "Sunday" : "Domenica",
+    "Monday" : "Lunedì",
+    "Tuesday" : "Martedì",
+    "Wednesday" : "Mercoledì",
+    "Thursday" : "Giovedì",
+    "Friday" : "Venerdì",
+    "Saturday" : "Sabato",
+    "January" : "Gennaio",
+    "February" : "Febbraio",
+    "March" : "Marzo",
+    "April" : "Aprile",
+    "May" : "Maggio",
+    "June" : "Giugno",
+    "July" : "Luglio",
+    "August" : "Agosto",
+    "September" : "Settembre",
+    "October" : "Ottobre",
+    "November" : "Novembre",
+    "December" : "Dicembre",
+    "Settings" : "Impostazioni",
+    "File" : "File",
+    "Folder" : "Cartella",
+    "Image" : "Immagine",
+    "Audio" : "Audio",
+    "Saving..." : "Salvataggio in corso...",
+    "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?",
+    "I know what I'm doing" : "So cosa sto facendo",
+    "Reset password" : "Ripristina la password",
+    "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
+    "No" : "No",
+    "Yes" : "Sì",
+    "Choose" : "Scegli",
+    "Error loading file picker template: {error}" : "Errore durante il caricamento del modello del selettore file: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Errore durante il caricamento del modello di messaggio: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} file in conflitto","{count} file in conflitto"],
+    "One file conflict" : "Un file in conflitto",
+    "New Files" : "File nuovi",
+    "Already existing files" : "File già esistenti",
+    "Which files do you want to keep?" : "Quali file vuoi mantenere?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato.",
+    "Cancel" : "Annulla",
+    "Continue" : "Continua",
+    "(all selected)" : "(tutti i selezionati)",
+    "({count} selected)" : "({count} selezionati)",
+    "Error loading file exists template" : "Errore durante il caricamento del modello del file esistente",
+    "Very weak password" : "Password molto debole",
+    "Weak password" : "Password debole",
+    "So-so password" : "Password così-così",
+    "Good password" : "Password buona",
+    "Strong password" : "Password forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra no funzionare correttamente.",
+    "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." : "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
+    "Error occurred while checking server setup" : "Si è verificato un errore durante il controllo della configurazione del server",
+    "Shared" : "Condivisi",
+    "Shared with {recipients}" : "Condiviso con {recipients}",
+    "Share" : "Condividi",
+    "Error" : "Errore",
+    "Error while sharing" : "Errore durante la condivisione",
+    "Error while unsharing" : "Errore durante la rimozione della condivisione",
+    "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 user or group …" : "Condividi con utente o gruppo ...",
+    "Share link" : "Condividi collegamento",
+    "The public link will expire no later than {days} days after it is created" : "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
+    "Password protect" : "Proteggi con password",
+    "Choose a password for the public link" : "Scegli una password per il collegamento pubblico",
+    "Allow Public Upload" : "Consenti caricamento pubblico",
+    "Email link to person" : "Invia collegamento via email",
+    "Send" : "Invia",
+    "Set expiration date" : "Imposta data di scadenza",
+    "Expiration date" : "Data di scadenza",
+    "Adding user..." : "Aggiunta utente in corso...",
+    "group" : "gruppo",
+    "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",
+    "can share" : "può condividere",
+    "can edit" : "può modificare",
+    "access control" : "controllo d'accesso",
+    "create" : "creare",
+    "update" : "aggiornare",
+    "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",
+    "Warning" : "Avviso",
+    "The object type is not specified." : "Il tipo di oggetto non è specificato.",
+    "Enter new" : "Inserisci nuovo",
+    "Delete" : "Elimina",
+    "Add" : "Aggiungi",
+    "Edit tags" : "Modifica etichette",
+    "Error loading dialog template: {error}" : "Errore durante il caricamento del modello di finestra: {error}",
+    "No tags selected for deletion." : "Nessuna etichetta selezionata per l'eliminazione.",
+    "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
+    "Please reload the page." : "Ricarica la pagina.",
+    "The update was unsuccessful." : "L'aggiornamento non è riuscito.",
+    "The update was successful. Redirecting you to ownCloud now." : "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Impossibile reimpostare la password poiché il token non è valido",
+    "Couldn't send reset email. Please make sure your username is correct." : "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
+    "%s password reset" : "Ripristino password di %s",
+    "Use the following link to reset your password: {link}" : "Usa il collegamento seguente per ripristinare la password: {link}",
+    "You will receive a link to reset your password via Email." : "Riceverai un collegamento per ripristinare la tua password via email",
+    "Username" : "Nome utente",
+    "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?" : "I 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à ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
+    "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso",
+    "Reset" : "Ripristina",
+    "New password" : "Nuova password",
+    "New Password" : "Nuova password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
+    "Personal" : "Personale",
+    "Users" : "Utenti",
+    "Apps" : "Applicazioni",
+    "Admin" : "Admin",
+    "Help" : "Aiuto",
+    "Error loading tags" : "Errore di caricamento delle etichette",
+    "Tag already exists" : "L'etichetta esiste già",
+    "Error deleting tag(s)" : "Errore di eliminazione delle etichette",
+    "Error tagging" : "Errore di assegnazione delle etichette",
+    "Error untagging" : "Errore di rimozione delle etichette",
+    "Error favoriting" : "Errore di creazione dei preferiti",
+    "Error unfavoriting" : "Errore di rimozione dai preferiti",
+    "Access forbidden" : "Accesso negato",
+    "File not found" : "File non trovato",
+    "The specified document has not been found on the server." : "Il documento specificato non è stato trovato sul server.",
+    "You can click here to return to %s." : "Puoi fare clic qui per tornare a %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
+    "The share will expire on %s." : "La condivisione scadrà il %s.",
+    "Cheers!" : "Saluti!",
+    "Internal Server Error" : "Errore interno del server",
+    "The server encountered an internal error and was unable to complete your request." : "Il server ha riscontrato un errore interno e non è stato in grado di completare la tua richiesta.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Contatta l'amministratore del server se questo errore riappare più volte, includendo i dettagli tecnici sotto riportati nella tua segnalazione.",
+    "More details can be found in the server log." : "Ulteriori dettagli sono disponibili nel log del server.",
+    "Technical details" : "Dettagli tecnici",
+    "Remote Address: %s" : "Indirizzo remoto: %s",
+    "Request ID: %s" : "ID richiesta: %s",
+    "Code: %s" : "Codice: %s",
+    "Message: %s" : "Messaggio: %s",
+    "File: %s" : "File: %s",
+    "Line: %s" : "Riga: %s",
+    "Trace" : "Traccia",
+    "Security Warning" : "Avviso di sicurezza",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Archiviazione e database",
+    "Data folder" : "Cartella dati",
+    "Configure the database" : "Configura il database",
+    "Only %s is available." : "È disponibile solo %s.",
+    "Database user" : "Utente del database",
+    "Database password" : "Password del database",
+    "Database name" : "Nome del database",
+    "Database tablespace" : "Spazio delle tabelle del database",
+    "Database host" : "Host del database",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
+    "Finish setup" : "Termina la configurazione",
+    "Finishing …" : "Completamento...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Questa applicazione richiede JavaScript per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa pagina.",
+    "%s is available. Get more information on how to update." : "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
+    "Log out" : "Esci",
+    "Server side authentication failed!" : "Autenticazione lato server non riuscita!",
+    "Please contact your administrator." : "Contatta il tuo amministratore di sistema.",
+    "Forgot your password? Reset it!" : "Hai dimenticato la password? Reimpostala!",
+    "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.",
+    "This means only administrators can use the instance." : "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
+    "Thank you for your patience." : "Grazie per la pazienza.",
+    "You are accessing the server from an untrusted domain." : "Stai accedendo al server da un dominio non attendibile.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Contatta il tuo amministratore di sistema. Se sei un amministratore di questa istanza, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "In base alla tua configurazione, come amministratore potrai utilizzare anche il pulsante in basso per rendere attendibile questo dominio.",
+    "Add \"%s\" as trusted domain" : "Aggiungi \"%s\" come dominio attendibile",
+    "%s will be updated to version %s." : "%s sarà aggiornato alla versione %s.",
+    "The following apps will be disabled:" : "Le seguenti applicazioni saranno disabilitate:",
+    "The theme %s has been disabled." : "Il tema %s è stato disabilitato.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
+    "Start update" : "Avvia l'aggiornamento",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Per evitare timeout con installazioni di grandi dimensioni, puoi eseguire il comando che segue dalla cartella di installazione:",
+    "This %s instance is currently being updated, which may take a while." : "Questa istanza di %s è in fase di aggiornamento, potrebbe richiedere del tempo.",
+    "This page will refresh itself when the %s instance is available again." : "Questa pagina si aggiornerà quando l'istanza di %s sarà nuovamente disponibile."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/it.php b/core/l10n/it.php
deleted file mode 100644
index ae3fd59861f..00000000000
--- a/core/l10n/it.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Impossibile inviare email ai seguenti utenti: %s",
-"Turned on maintenance mode" => "Modalità di manutenzione attivata",
-"Turned off maintenance mode" => "Modalità di manutenzione disattivata",
-"Updated database" => "Database aggiornato",
-"Checked database schema update" => "Verificato l'aggiornamento dello schema del database",
-"Checked database schema update for apps" => "Verificato l'aggiornamento dello schema del database per le applicazioni",
-"Updated \"%s\" to %s" => "Aggiornato \"%s\" a %s",
-"Disabled incompatible apps: %s" => "Applicazione incompatibili disabilitate: %s",
-"No image or file provided" => "Non è stata fornita alcun immagine o file",
-"Unknown filetype" => "Tipo di file sconosciuto",
-"Invalid image" => "Immagine non valida",
-"No temporary profile picture available, try again" => "Nessuna immagine di profilo provvisoria disponibile, riprova",
-"No crop data provided" => "Dati di ritaglio non forniti",
-"Sunday" => "Domenica",
-"Monday" => "Lunedì",
-"Tuesday" => "Martedì",
-"Wednesday" => "Mercoledì",
-"Thursday" => "Giovedì",
-"Friday" => "Venerdì",
-"Saturday" => "Sabato",
-"January" => "Gennaio",
-"February" => "Febbraio",
-"March" => "Marzo",
-"April" => "Aprile",
-"May" => "Maggio",
-"June" => "Giugno",
-"July" => "Luglio",
-"August" => "Agosto",
-"September" => "Settembre",
-"October" => "Ottobre",
-"November" => "Novembre",
-"December" => "Dicembre",
-"Settings" => "Impostazioni",
-"File" => "File",
-"Folder" => "Cartella",
-"Image" => "Immagine",
-"Audio" => "Audio",
-"Saving..." => "Salvataggio in corso...",
-"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?",
-"I know what I'm doing" => "So cosa sto facendo",
-"Reset password" => "Ripristina la password",
-"Password can not be changed. Please contact your administrator." => "La password non può essere cambiata. Contatta il tuo amministratore.",
-"No" => "No",
-"Yes" => "Sì",
-"Choose" => "Scegli",
-"Error loading file picker template: {error}" => "Errore durante il caricamento del modello del selettore file: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Errore durante il caricamento del modello di messaggio: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} file in conflitto","{count} file in conflitto"),
-"One file conflict" => "Un file in conflitto",
-"New Files" => "File nuovi",
-"Already existing files" => "File già esistenti",
-"Which files do you want to keep?" => "Quali file vuoi mantenere?",
-"If you select both versions, the copied file will have a number added to its name." => "Se selezioni entrambe le versioni, sarà aggiunto un numero al nome del file copiato.",
-"Cancel" => "Annulla",
-"Continue" => "Continua",
-"(all selected)" => "(tutti i selezionati)",
-"({count} selected)" => "({count} selezionati)",
-"Error loading file exists template" => "Errore durante il caricamento del modello del file esistente",
-"Very weak password" => "Password molto debole",
-"Weak password" => "Password debole",
-"So-so password" => "Password così-così",
-"Good password" => "Password buona",
-"Strong password" => "Password forte",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Il tuo server web non è configurato correttamente per consentire la sincronizzazione dei file poiché l'interfaccia WebDAV sembra no funzionare correttamente.",
-"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." => "Questo server non ha una connessione a Internet funzionante. Ciò significa che alcune delle funzionalità come il montaggio di archivi esterni, le notifiche degli aggiornamenti o l'installazione di applicazioni di terze parti non funzioneranno. L'accesso remoto ai file e l'invio di email di notifica potrebbero non funzionare. Ti suggeriamo di abilitare la connessione a Internet del server se desideri disporre di tutte le funzionalità.",
-"Error occurred while checking server setup" => "Si è verificato un errore durante il controllo della configurazione del server",
-"Shared" => "Condivisi",
-"Shared with {recipients}" => "Condiviso con {recipients}",
-"Share" => "Condividi",
-"Error" => "Errore",
-"Error while sharing" => "Errore durante la condivisione",
-"Error while unsharing" => "Errore durante la rimozione della condivisione",
-"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 user or group …" => "Condividi con utente o gruppo ...",
-"Share link" => "Condividi collegamento",
-"The public link will expire no later than {days} days after it is created" => "Il collegamento pubblico scadrà non più tardi di {days} giorni dopo la sua creazione",
-"Password protect" => "Proteggi con password",
-"Choose a password for the public link" => "Scegli una password per il collegamento pubblico",
-"Allow Public Upload" => "Consenti caricamento pubblico",
-"Email link to person" => "Invia collegamento via email",
-"Send" => "Invia",
-"Set expiration date" => "Imposta data di scadenza",
-"Expiration date" => "Data di scadenza",
-"Adding user..." => "Aggiunta utente in corso...",
-"group" => "gruppo",
-"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",
-"can share" => "può condividere",
-"can edit" => "può modificare",
-"access control" => "controllo d'accesso",
-"create" => "creare",
-"update" => "aggiornare",
-"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",
-"Warning" => "Avviso",
-"The object type is not specified." => "Il tipo di oggetto non è specificato.",
-"Enter new" => "Inserisci nuovo",
-"Delete" => "Elimina",
-"Add" => "Aggiungi",
-"Edit tags" => "Modifica etichette",
-"Error loading dialog template: {error}" => "Errore durante il caricamento del modello di finestra: {error}",
-"No tags selected for deletion." => "Nessuna etichetta selezionata per l'eliminazione.",
-"Updating {productName} to version {version}, this may take a while." => "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
-"Please reload the page." => "Ricarica la pagina.",
-"The update was unsuccessful." => "L'aggiornamento non è riuscito.",
-"The update was successful. Redirecting you to ownCloud now." => "L'aggiornamento è stato effettuato correttamente. Stai per essere reindirizzato a ownCloud.",
-"Couldn't reset password because the token is invalid" => "Impossibile reimpostare la password poiché il token non è valido",
-"Couldn't send reset email. Please make sure your username is correct." => "Impossibile inviare l'email di reimpostazione. Assicurati che il nome utente sia corretto.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
-"%s password reset" => "Ripristino password di %s",
-"Use the following link to reset your password: {link}" => "Usa il collegamento seguente per ripristinare la password: {link}",
-"You will receive a link to reset your password via Email." => "Riceverai un collegamento per ripristinare la tua password via email",
-"Username" => "Nome utente",
-"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?" => "I 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à ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
-"Yes, I really want to reset my password now" => "Sì, voglio davvero ripristinare la mia password adesso",
-"Reset" => "Ripristina",
-"New password" => "Nuova password",
-"New Password" => "Nuova password",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
-"For the best results, please consider using a GNU/Linux server instead." => "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
-"Personal" => "Personale",
-"Users" => "Utenti",
-"Apps" => "Applicazioni",
-"Admin" => "Admin",
-"Help" => "Aiuto",
-"Error loading tags" => "Errore di caricamento delle etichette",
-"Tag already exists" => "L'etichetta esiste già",
-"Error deleting tag(s)" => "Errore di eliminazione delle etichette",
-"Error tagging" => "Errore di assegnazione delle etichette",
-"Error untagging" => "Errore di rimozione delle etichette",
-"Error favoriting" => "Errore di creazione dei preferiti",
-"Error unfavoriting" => "Errore di rimozione dai preferiti",
-"Access forbidden" => "Accesso negato",
-"File not found" => "File non trovato",
-"The specified document has not been found on the server." => "Il documento specificato non è stato trovato sul server.",
-"You can click here to return to %s." => "Puoi fare clic qui per tornare a %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Ciao,\n\nvolevo informarti che %s ha condiviso %s con te.\nVedi: %s\n\n",
-"The share will expire on %s." => "La condivisione scadrà il %s.",
-"Cheers!" => "Saluti!",
-"Internal Server Error" => "Errore interno del server",
-"The server encountered an internal error and was unable to complete your request." => "Il server ha riscontrato un errore interno e non è stato in grado di completare la tua richiesta.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Contatta l'amministratore del server se questo errore riappare più volte, includendo i dettagli tecnici sotto riportati nella tua segnalazione.",
-"More details can be found in the server log." => "Ulteriori dettagli sono disponibili nel log del server.",
-"Technical details" => "Dettagli tecnici",
-"Remote Address: %s" => "Indirizzo remoto: %s",
-"Request ID: %s" => "ID richiesta: %s",
-"Code: %s" => "Codice: %s",
-"Message: %s" => "Messaggio: %s",
-"File: %s" => "File: %s",
-"Line: %s" => "Riga: %s",
-"Trace" => "Traccia",
-"Security Warning" => "Avviso di sicurezza",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "La tua versione di PHP è vulnerabile all'attacco NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Aggiorna la tua installazione di PHP per utilizzare %s in sicurezza.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
-"Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
-"Password" => "Password",
-"Storage & database" => "Archiviazione e database",
-"Data folder" => "Cartella dati",
-"Configure the database" => "Configura il database",
-"Only %s is available." => "È disponibile solo %s.",
-"Database user" => "Utente del database",
-"Database password" => "Password del database",
-"Database name" => "Nome del database",
-"Database tablespace" => "Spazio delle tabelle del database",
-"Database host" => "Host del database",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite sarà utilizzato come database. Per installazioni più grandi consigliamo di cambiarlo.",
-"Finish setup" => "Termina la configurazione",
-"Finishing …" => "Completamento...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Questa applicazione richiede JavaScript per un corretto funzionamento. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Abilita JavaScript</a> e ricarica questa pagina.",
-"%s is available. Get more information on how to update." => "%s è disponibile. Ottieni ulteriori informazioni sull'aggiornamento.",
-"Log out" => "Esci",
-"Server side authentication failed!" => "Autenticazione lato server non riuscita!",
-"Please contact your administrator." => "Contatta il tuo amministratore di sistema.",
-"Forgot your password? Reset it!" => "Hai dimenticato la password? Reimpostala!",
-"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.",
-"This means only administrators can use the instance." => "Ciò significa che solo gli amministratori possono utilizzare l'istanza.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contatta il tuo amministratore di sistema se questo messaggio persiste o appare inaspettatamente.",
-"Thank you for your patience." => "Grazie per la pazienza.",
-"You are accessing the server from an untrusted domain." => "Stai accedendo al server da un dominio non attendibile.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Contatta il tuo amministratore di sistema. Se sei un amministratore di questa istanza, configura l'impostazione \"trusted_domain\" in config/config.php. Un esempio di configurazione è disponibile in config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "In base alla tua configurazione, come amministratore potrai utilizzare anche il pulsante in basso per rendere attendibile questo dominio.",
-"Add \"%s\" as trusted domain" => "Aggiungi \"%s\" come dominio attendibile",
-"%s will be updated to version %s." => "%s sarà aggiornato alla versione %s.",
-"The following apps will be disabled:" => "Le seguenti applicazioni saranno disabilitate:",
-"The theme %s has been disabled." => "Il tema %s è stato disabilitato.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Assicurati di aver creato una copia di sicurezza del database, della cartella config e della cartella data prima di procedere. ",
-"Start update" => "Avvia l'aggiornamento",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Per evitare timeout con installazioni di grandi dimensioni, puoi eseguire il comando che segue dalla cartella di installazione:",
-"This %s instance is currently being updated, which may take a while." => "Questa istanza di %s è in fase di aggiornamento, potrebbe richiedere del tempo.",
-"This page will refresh itself when the %s instance is available again." => "Questa pagina si aggiornerà quando l'istanza di %s sarà nuovamente disponibile."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
new file mode 100644
index 00000000000..b84b14ef20c
--- /dev/null
+++ b/core/l10n/ja.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "次のユーザーにメールを送信できませんでした: %s",
+    "Turned on maintenance mode" : "メンテナンスモードがオンになりました",
+    "Turned off maintenance mode" : "メンテナンスモードがオフになりました",
+    "Updated database" : "データベース更新完了",
+    "Checked database schema update" : "指定データベースのスキーマを更新",
+    "Checked database schema update for apps" : "アプリの指定データベースのスキーマを更新",
+    "Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。",
+    "Disabled incompatible apps: %s" : "無効化された非互換アプリ：%s",
+    "No image or file provided" : "画像もしくはファイルが提供されていません",
+    "Unknown filetype" : "不明なファイルタイプ",
+    "Invalid image" : "無効な画像",
+    "No temporary profile picture available, try again" : "一時的なプロファイル用画像が利用できません。もう一度試してください",
+    "No crop data provided" : "クロップデータは提供されません",
+    "Sunday" : "日",
+    "Monday" : "月",
+    "Tuesday" : "火",
+    "Wednesday" : "水",
+    "Thursday" : "木",
+    "Friday" : "金",
+    "Saturday" : "土",
+    "January" : "1月",
+    "February" : "2月",
+    "March" : "3月",
+    "April" : "4月",
+    "May" : "5月",
+    "June" : "6月",
+    "July" : "7月",
+    "August" : "8月",
+    "September" : "9月",
+    "October" : "10月",
+    "November" : "11月",
+    "December" : "12月",
+    "Settings" : "設定",
+    "File" : "ファイル",
+    "Folder" : "フォルダー",
+    "Image" : "画像",
+    "Audio" : "オーディオ",
+    "Saving..." : "保存中...",
+    "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 />続けてよろしいでしょうか?",
+    "I know what I'm doing" : "どういう操作をしているか理解しています",
+    "Reset password" : "パスワードをリセット",
+    "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
+    "No" : "いいえ",
+    "Yes" : "はい",
+    "Choose" : "選択",
+    "Error loading file picker template: {error}" : "ファイル選択テンプレートの読み込みエラー: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} ファイルが競合"],
+    "One file conflict" : "1ファイルが競合",
+    "New Files" : "新しいファイル",
+    "Already existing files" : "既存のファイル",
+    "Which files do you want to keep?" : "どちらのファイルを保持しますか？",
+    "If you select both versions, the copied file will have a number added to its name." : "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。",
+    "Cancel" : "キャンセル",
+    "Continue" : "続ける",
+    "(all selected)" : "(すべて選択)",
+    "({count} selected)" : "({count} 選択)",
+    "Error loading file exists template" : "既存ファイルのテンプレートの読み込みエラー",
+    "Very weak password" : "非常に弱いパスワード",
+    "Weak password" : "弱いパスワード",
+    "So-so password" : "まずまずのパスワード",
+    "Good password" : "良好なパスワード",
+    "Strong password" : "強いパスワード",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+    "This server has no working internet connection. This means that some of the features like mounting 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." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+    "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
+    "Shared" : "共有中",
+    "Shared with {recipients}" : "{recipients} と共有",
+    "Share" : "共有",
+    "Error" : "エラー",
+    "Error while sharing" : "共有でエラー発生",
+    "Error while unsharing" : "共有解除でエラー発生",
+    "Error while changing permissions" : "権限変更でエラー発生",
+    "Shared with you and the group {group} by {owner}" : "あなたと {owner} のグループ {group} で共有中",
+    "Shared with you by {owner}" : "{owner} と共有中",
+    "Share with user or group …" : "ユーザーもしくはグループと共有 ...",
+    "Share link" : "URLで共有",
+    "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+    "Password protect" : "パスワード保護を有効化",
+    "Choose a password for the public link" : "URLによる共有のパスワードを入力",
+    "Allow Public Upload" : "アップロードを許可",
+    "Email link to person" : "メールリンク",
+    "Send" : "送信",
+    "Set expiration date" : "有効期限を設定",
+    "Expiration date" : "有効期限",
+    "Adding user..." : "ユーザー追加中...",
+    "group" : "グループ",
+    "Resharing is not allowed" : "再共有は許可されていません",
+    "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
+    "Unshare" : "共有解除",
+    "notify by email" : "メールで通知",
+    "can share" : "共有可",
+    "can edit" : "編集を許可",
+    "access control" : "アクセス権限",
+    "create" : "作成",
+    "update" : "アップデート",
+    "delete" : "削除",
+    "Password protected" : "パスワード保護",
+    "Error unsetting expiration date" : "有効期限の未設定エラー",
+    "Error setting expiration date" : "有効期限の設定でエラー発生",
+    "Sending ..." : "送信中...",
+    "Email sent" : "メールを送信しました",
+    "Warning" : "警告",
+    "The object type is not specified." : "オブジェクトタイプが指定されていません。",
+    "Enter new" : "新規に入力",
+    "Delete" : "削除",
+    "Add" : "追加",
+    "Edit tags" : "タグを編集",
+    "Error loading dialog template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "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. Redirecting you to ownCloud now." : "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
+    "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
+    "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 パスワードリセット",
+    "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
+    "You will receive a link to reset your password via Email." : "メールでパスワードをリセットするリンクが届きます。",
+    "Username" : "ユーザー名",
+    "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?" : "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
+    "Yes, I really want to reset my password now" : "はい、今すぐパスワードをリセットします。",
+    "Reset" : "リセット",
+    "New password" : "新しいパスワードを入力",
+    "New Password" : "新しいパスワード",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
+    "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
+    "Personal" : "個人",
+    "Users" : "ユーザー",
+    "Apps" : "アプリ",
+    "Admin" : "管理",
+    "Help" : "ヘルプ",
+    "Error loading tags" : "タグの読み込みエラー",
+    "Tag already exists" : "タグはすでに存在します",
+    "Error deleting tag(s)" : "タグの削除エラー",
+    "Error tagging" : "タグの付与エラー",
+    "Error untagging" : "タグの解除エラー",
+    "Error favoriting" : "お気に入りに追加エラー",
+    "Error unfavoriting" : "お気に入りから削除エラー",
+    "Access forbidden" : "アクセスが禁止されています",
+    "File not found" : "ファイルが見つかりません",
+    "The specified document has not been found on the server." : "サーバーに指定されたファイルが見つかりませんでした。",
+    "You can click here to return to %s." : "ここをクリックすると、 %s に戻れます。",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n",
+    "The share will expire on %s." : "共有は %s で有効期限が切れます。",
+    "Cheers!" : "それでは！",
+    "The server encountered an internal error and was unable to complete your request." : "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
+    "More details can be found in the server log." : "詳しい情報は、サーバーのログを確認してください。",
+    "Technical details" : "技術詳細",
+    "Remote Address: %s" : "リモートアドレス: %s",
+    "Request ID: %s" : "リクエスト ID: %s",
+    "Code: %s" : "コード: %s",
+    "Message: %s" : "メッセージ: %s",
+    "File: %s" : "ファイル: %s",
+    "Line: %s" : "行: %s",
+    "Trace" : "トレース",
+    "Security Warning" : "セキュリティ警告",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
+    "Please update your PHP installation to use %s securely." : "%s を安全に利用するため、インストールされているPHPをアップデートしてください。",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
+    "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
+    "Password" : "パスワード",
+    "Storage & database" : "ストレージとデータベース",
+    "Data folder" : "データフォルダー",
+    "Configure the database" : "データベースを設定してください",
+    "Only %s is available." : "%s のみ有効です。",
+    "Database user" : "データベースのユーザー名",
+    "Database password" : "データベースのパスワード",
+    "Database name" : "データベース名",
+    "Database tablespace" : "データベースの表領域",
+    "Database host" : "データベースのホスト名",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。",
+    "Finish setup" : "セットアップを完了します",
+    "Finishing …" : "作業を完了しています ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
+    "%s is available. Get more information on how to update." : "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
+    "Log out" : "ログアウト",
+    "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！",
+    "Please contact your administrator." : "管理者に問い合わせてください。",
+    "Forgot your password? Reset it!" : "パスワードを忘れましたか？リセットします！",
+    "remember" : "パスワードを保存",
+    "Log in" : "ログイン",
+    "Alternative Logins" : "代替ログイン",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "このownCloudインスタンスは、現在シングルユーザーモードです。",
+    "This means only administrators can use the instance." : "これは、管理者のみがインスタンスを利用できることを意味しています。",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。",
+    "Thank you for your patience." : "しばらくお待ちください。",
+    "You are accessing the server from an untrusted domain." : "信頼されていないドメインからサーバーにアクセスしています。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
+    "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加",
+    "%s will be updated to version %s." : "%s はバージョン %s にアップデートされました。",
+    "The following apps will be disabled:" : "以下のアプリは無効です：",
+    "The theme %s has been disabled." : "テーマ %s が無効になっています。",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
+    "Start update" : "アップデートを開始",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性がある為、インストールディレクトリで次のコマンドを実行しても構いません。",
+    "This %s instance is currently being updated, 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/ja.json b/core/l10n/ja.json
new file mode 100644
index 00000000000..d5112b77df9
--- /dev/null
+++ b/core/l10n/ja.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "次のユーザーにメールを送信できませんでした: %s",
+    "Turned on maintenance mode" : "メンテナンスモードがオンになりました",
+    "Turned off maintenance mode" : "メンテナンスモードがオフになりました",
+    "Updated database" : "データベース更新完了",
+    "Checked database schema update" : "指定データベースのスキーマを更新",
+    "Checked database schema update for apps" : "アプリの指定データベースのスキーマを更新",
+    "Updated \"%s\" to %s" : "\"%s\" を %s にアップデートしました。",
+    "Disabled incompatible apps: %s" : "無効化された非互換アプリ：%s",
+    "No image or file provided" : "画像もしくはファイルが提供されていません",
+    "Unknown filetype" : "不明なファイルタイプ",
+    "Invalid image" : "無効な画像",
+    "No temporary profile picture available, try again" : "一時的なプロファイル用画像が利用できません。もう一度試してください",
+    "No crop data provided" : "クロップデータは提供されません",
+    "Sunday" : "日",
+    "Monday" : "月",
+    "Tuesday" : "火",
+    "Wednesday" : "水",
+    "Thursday" : "木",
+    "Friday" : "金",
+    "Saturday" : "土",
+    "January" : "1月",
+    "February" : "2月",
+    "March" : "3月",
+    "April" : "4月",
+    "May" : "5月",
+    "June" : "6月",
+    "July" : "7月",
+    "August" : "8月",
+    "September" : "9月",
+    "October" : "10月",
+    "November" : "11月",
+    "December" : "12月",
+    "Settings" : "設定",
+    "File" : "ファイル",
+    "Folder" : "フォルダー",
+    "Image" : "画像",
+    "Audio" : "オーディオ",
+    "Saving..." : "保存中...",
+    "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 />続けてよろしいでしょうか?",
+    "I know what I'm doing" : "どういう操作をしているか理解しています",
+    "Reset password" : "パスワードをリセット",
+    "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
+    "No" : "いいえ",
+    "Yes" : "はい",
+    "Choose" : "選択",
+    "Error loading file picker template: {error}" : "ファイル選択テンプレートの読み込みエラー: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} ファイルが競合"],
+    "One file conflict" : "1ファイルが競合",
+    "New Files" : "新しいファイル",
+    "Already existing files" : "既存のファイル",
+    "Which files do you want to keep?" : "どちらのファイルを保持しますか？",
+    "If you select both versions, the copied file will have a number added to its name." : "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。",
+    "Cancel" : "キャンセル",
+    "Continue" : "続ける",
+    "(all selected)" : "(すべて選択)",
+    "({count} selected)" : "({count} 選択)",
+    "Error loading file exists template" : "既存ファイルのテンプレートの読み込みエラー",
+    "Very weak password" : "非常に弱いパスワード",
+    "Weak password" : "弱いパスワード",
+    "So-so password" : "まずまずのパスワード",
+    "Good password" : "良好なパスワード",
+    "Strong password" : "強いパスワード",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+    "This server has no working internet connection. This means that some of the features like mounting 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." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+    "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
+    "Shared" : "共有中",
+    "Shared with {recipients}" : "{recipients} と共有",
+    "Share" : "共有",
+    "Error" : "エラー",
+    "Error while sharing" : "共有でエラー発生",
+    "Error while unsharing" : "共有解除でエラー発生",
+    "Error while changing permissions" : "権限変更でエラー発生",
+    "Shared with you and the group {group} by {owner}" : "あなたと {owner} のグループ {group} で共有中",
+    "Shared with you by {owner}" : "{owner} と共有中",
+    "Share with user or group …" : "ユーザーもしくはグループと共有 ...",
+    "Share link" : "URLで共有",
+    "The public link will expire no later than {days} days after it is created" : "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
+    "Password protect" : "パスワード保護を有効化",
+    "Choose a password for the public link" : "URLによる共有のパスワードを入力",
+    "Allow Public Upload" : "アップロードを許可",
+    "Email link to person" : "メールリンク",
+    "Send" : "送信",
+    "Set expiration date" : "有効期限を設定",
+    "Expiration date" : "有効期限",
+    "Adding user..." : "ユーザー追加中...",
+    "group" : "グループ",
+    "Resharing is not allowed" : "再共有は許可されていません",
+    "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
+    "Unshare" : "共有解除",
+    "notify by email" : "メールで通知",
+    "can share" : "共有可",
+    "can edit" : "編集を許可",
+    "access control" : "アクセス権限",
+    "create" : "作成",
+    "update" : "アップデート",
+    "delete" : "削除",
+    "Password protected" : "パスワード保護",
+    "Error unsetting expiration date" : "有効期限の未設定エラー",
+    "Error setting expiration date" : "有効期限の設定でエラー発生",
+    "Sending ..." : "送信中...",
+    "Email sent" : "メールを送信しました",
+    "Warning" : "警告",
+    "The object type is not specified." : "オブジェクトタイプが指定されていません。",
+    "Enter new" : "新規に入力",
+    "Delete" : "削除",
+    "Add" : "追加",
+    "Edit tags" : "タグを編集",
+    "Error loading dialog template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
+    "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. Redirecting you to ownCloud now." : "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
+    "Couldn't reset password because the token is invalid" : "トークンが無効なため、パスワードをリセットできませんでした",
+    "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 パスワードリセット",
+    "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
+    "You will receive a link to reset your password via Email." : "メールでパスワードをリセットするリンクが届きます。",
+    "Username" : "ユーザー名",
+    "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?" : "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
+    "Yes, I really want to reset my password now" : "はい、今すぐパスワードをリセットします。",
+    "Reset" : "リセット",
+    "New password" : "新しいパスワードを入力",
+    "New Password" : "新しいパスワード",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
+    "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
+    "Personal" : "個人",
+    "Users" : "ユーザー",
+    "Apps" : "アプリ",
+    "Admin" : "管理",
+    "Help" : "ヘルプ",
+    "Error loading tags" : "タグの読み込みエラー",
+    "Tag already exists" : "タグはすでに存在します",
+    "Error deleting tag(s)" : "タグの削除エラー",
+    "Error tagging" : "タグの付与エラー",
+    "Error untagging" : "タグの解除エラー",
+    "Error favoriting" : "お気に入りに追加エラー",
+    "Error unfavoriting" : "お気に入りから削除エラー",
+    "Access forbidden" : "アクセスが禁止されています",
+    "File not found" : "ファイルが見つかりません",
+    "The specified document has not been found on the server." : "サーバーに指定されたファイルが見つかりませんでした。",
+    "You can click here to return to %s." : "ここをクリックすると、 %s に戻れます。",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n",
+    "The share will expire on %s." : "共有は %s で有効期限が切れます。",
+    "Cheers!" : "それでは！",
+    "The server encountered an internal error and was unable to complete your request." : "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
+    "More details can be found in the server log." : "詳しい情報は、サーバーのログを確認してください。",
+    "Technical details" : "技術詳細",
+    "Remote Address: %s" : "リモートアドレス: %s",
+    "Request ID: %s" : "リクエスト ID: %s",
+    "Code: %s" : "コード: %s",
+    "Message: %s" : "メッセージ: %s",
+    "File: %s" : "ファイル: %s",
+    "Line: %s" : "行: %s",
+    "Trace" : "トレース",
+    "Security Warning" : "セキュリティ警告",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
+    "Please update your PHP installation to use %s securely." : "%s を安全に利用するため、インストールされているPHPをアップデートしてください。",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
+    "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
+    "Password" : "パスワード",
+    "Storage & database" : "ストレージとデータベース",
+    "Data folder" : "データフォルダー",
+    "Configure the database" : "データベースを設定してください",
+    "Only %s is available." : "%s のみ有効です。",
+    "Database user" : "データベースのユーザー名",
+    "Database password" : "データベースのパスワード",
+    "Database name" : "データベース名",
+    "Database tablespace" : "データベースの表領域",
+    "Database host" : "データベースのホスト名",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。",
+    "Finish setup" : "セットアップを完了します",
+    "Finishing …" : "作業を完了しています ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
+    "%s is available. Get more information on how to update." : "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
+    "Log out" : "ログアウト",
+    "Server side authentication failed!" : "サーバーサイドの認証に失敗しました！",
+    "Please contact your administrator." : "管理者に問い合わせてください。",
+    "Forgot your password? Reset it!" : "パスワードを忘れましたか？リセットします！",
+    "remember" : "パスワードを保存",
+    "Log in" : "ログイン",
+    "Alternative Logins" : "代替ログイン",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "このownCloudインスタンスは、現在シングルユーザーモードです。",
+    "This means only administrators can use the instance." : "これは、管理者のみがインスタンスを利用できることを意味しています。",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。",
+    "Thank you for your patience." : "しばらくお待ちください。",
+    "You are accessing the server from an untrusted domain." : "信頼されていないドメインからサーバーにアクセスしています。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
+    "Add \"%s\" as trusted domain" : "\"%s\" を信頼するドメイン名に追加",
+    "%s will be updated to version %s." : "%s はバージョン %s にアップデートされました。",
+    "The following apps will be disabled:" : "以下のアプリは無効です：",
+    "The theme %s has been disabled." : "テーマ %s が無効になっています。",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
+    "Start update" : "アップデートを開始",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "大規模なサイトの場合、ブラウザーがタイムアウトする可能性がある為、インストールディレクトリで次のコマンドを実行しても構いません。",
+    "This %s instance is currently being updated, which may take a while." : "このサーバー %s は現在更新中です。しばらくお待ちください。",
+    "This page will refresh itself when the %s instance is available again." : "この画面は、サーバー %s の再起動後に自動的に更新されます。"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ja.php b/core/l10n/ja.php
deleted file mode 100644
index 450e3adc2e3..00000000000
--- a/core/l10n/ja.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "次のユーザーにメールを送信できませんでした: %s",
-"Turned on maintenance mode" => "メンテナンスモードがオンになりました",
-"Turned off maintenance mode" => "メンテナンスモードがオフになりました",
-"Updated database" => "データベース更新完了",
-"Checked database schema update" => "指定データベースのスキーマを更新",
-"Checked database schema update for apps" => "アプリの指定データベースのスキーマを更新",
-"Updated \"%s\" to %s" => "\"%s\" を %s にアップデートしました。",
-"Disabled incompatible apps: %s" => "無効化された非互換アプリ：%s",
-"No image or file provided" => "画像もしくはファイルが提供されていません",
-"Unknown filetype" => "不明なファイルタイプ",
-"Invalid image" => "無効な画像",
-"No temporary profile picture available, try again" => "一時的なプロファイル用画像が利用できません。もう一度試してください",
-"No crop data provided" => "クロップデータは提供されません",
-"Sunday" => "日",
-"Monday" => "月",
-"Tuesday" => "火",
-"Wednesday" => "水",
-"Thursday" => "木",
-"Friday" => "金",
-"Saturday" => "土",
-"January" => "1月",
-"February" => "2月",
-"March" => "3月",
-"April" => "4月",
-"May" => "5月",
-"June" => "6月",
-"July" => "7月",
-"August" => "8月",
-"September" => "9月",
-"October" => "10月",
-"November" => "11月",
-"December" => "12月",
-"Settings" => "設定",
-"File" => "ファイル",
-"Folder" => "フォルダー",
-"Image" => "画像",
-"Audio" => "オーディオ",
-"Saving..." => "保存中...",
-"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 />続けてよろしいでしょうか?",
-"I know what I'm doing" => "どういう操作をしているか理解しています",
-"Reset password" => "パスワードをリセット",
-"Password can not be changed. Please contact your administrator." => "パスワードは変更できません。管理者に問い合わせてください。",
-"No" => "いいえ",
-"Yes" => "はい",
-"Choose" => "選択",
-"Error loading file picker template: {error}" => "ファイル選択テンプレートの読み込みエラー: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} ファイルが競合"),
-"One file conflict" => "1ファイルが競合",
-"New Files" => "新しいファイル",
-"Already existing files" => "既存のファイル",
-"Which files do you want to keep?" => "どちらのファイルを保持しますか？",
-"If you select both versions, the copied file will have a number added to its name." => "両方のバージョンを選択した場合は、ファイル名の後ろに数字を追加したファイルのコピーを作成します。",
-"Cancel" => "キャンセル",
-"Continue" => "続ける",
-"(all selected)" => "(すべて選択)",
-"({count} selected)" => "({count} 選択)",
-"Error loading file exists template" => "既存ファイルのテンプレートの読み込みエラー",
-"Very weak password" => "非常に弱いパスワード",
-"Weak password" => "弱いパスワード",
-"So-so password" => "まずまずのパスワード",
-"Good password" => "良好なパスワード",
-"Strong password" => "強いパスワード",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "WebDAVインターフェースに問題があると思われるため、Webサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
-"This server has no working internet connection. This means that some of the features like mounting 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." => "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。すべての機能を利用したい場合は、このサーバーがインターネット接続できるようにすることをお勧めします。",
-"Error occurred while checking server setup" => "サーバー設定のチェック中にエラーが発生しました",
-"Shared" => "共有中",
-"Shared with {recipients}" => "{recipients} と共有",
-"Share" => "共有",
-"Error" => "エラー",
-"Error while sharing" => "共有でエラー発生",
-"Error while unsharing" => "共有解除でエラー発生",
-"Error while changing permissions" => "権限変更でエラー発生",
-"Shared with you and the group {group} by {owner}" => "あなたと {owner} のグループ {group} で共有中",
-"Shared with you by {owner}" => "{owner} と共有中",
-"Share with user or group …" => "ユーザーもしくはグループと共有 ...",
-"Share link" => "URLで共有",
-"The public link will expire no later than {days} days after it is created" => "URLによる共有は、作成してから {days} 日以内に有効期限切れになります",
-"Password protect" => "パスワード保護を有効化",
-"Choose a password for the public link" => "URLによる共有のパスワードを入力",
-"Allow Public Upload" => "アップロードを許可",
-"Email link to person" => "メールリンク",
-"Send" => "送信",
-"Set expiration date" => "有効期限を設定",
-"Expiration date" => "有効期限",
-"Adding user..." => "ユーザーを追加しています...",
-"group" => "グループ",
-"Resharing is not allowed" => "再共有は許可されていません",
-"Shared in {item} with {user}" => "{item} 内で {user} と共有中",
-"Unshare" => "共有解除",
-"notify by email" => "メールで通知",
-"can share" => "共有可",
-"can edit" => "編集を許可",
-"access control" => "アクセス権限",
-"create" => "作成",
-"update" => "アップデート",
-"delete" => "削除",
-"Password protected" => "パスワード保護",
-"Error unsetting expiration date" => "有効期限の未設定エラー",
-"Error setting expiration date" => "有効期限の設定でエラー発生",
-"Sending ..." => "送信中...",
-"Email sent" => "メールを送信しました",
-"Warning" => "警告",
-"The object type is not specified." => "オブジェクトタイプが指定されていません。",
-"Enter new" => "新規に入力",
-"Delete" => "削除",
-"Add" => "追加",
-"Edit tags" => "タグを編集",
-"Error loading dialog template: {error}" => "メッセージテンプレートの読み込みエラー: {error}",
-"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. Redirecting you to ownCloud now." => "アップデートに成功しました。今すぐownCloudにリダイレクトします。",
-"Couldn't reset password because the token is invalid" => "トークンが無効なため、パスワードをリセットできませんでした",
-"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 パスワードリセット",
-"Use the following link to reset your password: {link}" => "パスワードをリセットするには次のリンクをクリックしてください: {link}",
-"You will receive a link to reset your password via Email." => "メールでパスワードをリセットするリンクが届きます。",
-"Username" => "ユーザー名",
-"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?" => "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
-"Yes, I really want to reset my password now" => "はい、今すぐパスワードをリセットします。",
-"Reset" => "リセット",
-"New password" => "新しいパスワードを入力",
-"New Password" => "新しいパスワード",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
-"For the best results, please consider using a GNU/Linux server instead." => "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
-"Personal" => "個人",
-"Users" => "ユーザー",
-"Apps" => "アプリ",
-"Admin" => "管理",
-"Help" => "ヘルプ",
-"Error loading tags" => "タグの読み込みエラー",
-"Tag already exists" => "タグはすでに存在します",
-"Error deleting tag(s)" => "タグの削除エラー",
-"Error tagging" => "タグの付与エラー",
-"Error untagging" => "タグの解除エラー",
-"Error favoriting" => "お気に入りに追加エラー",
-"Error unfavoriting" => "お気に入りから削除エラー",
-"Access forbidden" => "アクセスが禁止されています",
-"File not found" => "ファイルが見つかりません",
-"The specified document has not been found on the server." => "サーバーに指定されたファイルが見つかりませんでした。",
-"You can click here to return to %s." => "ここをクリックすると、 %s に戻れます。",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n",
-"The share will expire on %s." => "共有は %s で有効期限が切れます。",
-"Cheers!" => "それでは！",
-"The server encountered an internal error and was unable to complete your request." => "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
-"More details can be found in the server log." => "詳しい情報は、サーバーのログを確認してください。",
-"Technical details" => "技術詳細",
-"Remote Address: %s" => "リモートアドレス: %s",
-"Request ID: %s" => "リクエスト ID: %s",
-"Code: %s" => "コード: %s",
-"Message: %s" => "メッセージ: %s",
-"File: %s" => "ファイル: %s",
-"Line: %s" => "行: %s",
-"Trace" => "トレース",
-"Security Warning" => "セキュリティ警告",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "あなたのPHPのバージョンには、Null Byte攻撃(CVE-2006-7243)という脆弱性が含まれています。",
-"Please update your PHP installation to use %s securely." => "%s を安全に利用するため、インストールされているPHPをアップデートしてください。",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
-"Create an <strong>admin account</strong>" => "<strong>管理者アカウント</strong>を作成してください",
-"Password" => "パスワード",
-"Storage & database" => "ストレージとデータベース",
-"Data folder" => "データフォルダー",
-"Configure the database" => "データベースを設定してください",
-"Only %s is available." => "%s のみ有効です。",
-"Database user" => "データベースのユーザー名",
-"Database password" => "データベースのパスワード",
-"Database name" => "データベース名",
-"Database tablespace" => "データベースの表領域",
-"Database host" => "データベースのホスト名",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite をデータベースとして利用します。大規模な運用では、利用しないことをお勧めします。",
-"Finish setup" => "セットアップを完了します",
-"Finishing …" => "作業を完了しています ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "このアプリケーションは使用する為、JavaScriptが必要です。\n<a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScriptを有効にし</a>、ページを更新してください。 ",
-"%s is available. Get more information on how to update." => "%s が利用可能です。アップデート方法について詳細情報を確認してください。",
-"Log out" => "ログアウト",
-"Server side authentication failed!" => "サーバーサイドの認証に失敗しました！",
-"Please contact your administrator." => "管理者に問い合わせてください。",
-"Forgot your password? Reset it!" => "パスワードを忘れましたか？リセットします！",
-"remember" => "パスワードを保存",
-"Log in" => "ログイン",
-"Alternative Logins" => "代替ログイン",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "こんにちは、<br><br>%sがあなたと »%s« を共有したことをお知らせします。<br><a href=\"%s\">それを表示</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "このownCloudインスタンスは、現在シングルユーザーモードです。",
-"This means only administrators can use the instance." => "これは、管理者のみがインスタンスを利用できることを意味しています。",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "このメッセージが引き続きもしくは予期せず現れる場合は、システム管理者に連絡してください。",
-"Thank you for your patience." => "しばらくお待ちください。",
-"You are accessing the server from an untrusted domain." => "信頼されていないドメインからサーバーにアクセスしています。",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "管理者に連絡してください。このサーバーの管理者の場合は、\"trusted_domain\" の設定を config/config.php に設定してください。config/config.sample.php にサンプルの設定方法が記載してあります。",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "環境により、下のボタンで信頼するドメインに追加する必要があるかもしれません。",
-"Add \"%s\" as trusted domain" => "\"%s\" を信頼するドメイン名に追加",
-"%s will be updated to version %s." => "%s はバージョン %s にアップデートされました。",
-"The following apps will be disabled:" => "以下のアプリは無効です：",
-"The theme %s has been disabled." => "テーマ %s が無効になっています。",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "データベースを確認してください。実行前にconfigフォルダーとdataフォルダーをバックアップします。",
-"Start update" => "アップデートを開始",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "大規模なサイトの場合、ブラウザーがタイムアウトする可能性がある為、インストールディレクトリで次のコマンドを実行しても構いません。",
-"This %s instance is currently being updated, which may take a while." => "このサーバー %s は現在更新中です。しばらくお待ちください。",
-"This page will refresh itself when the %s instance is available again." => "この画面は、サーバー %s の再起動後に自動的に更新されます。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/jv.js b/core/l10n/jv.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/jv.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/jv.json b/core/l10n/jv.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/jv.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/jv.php b/core/l10n/jv.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/jv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
new file mode 100644
index 00000000000..98843464fd5
--- /dev/null
+++ b/core/l10n/ka_GE.js
@@ -0,0 +1,96 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "კვირა",
+    "Monday" : "ორშაბათი",
+    "Tuesday" : "სამშაბათი",
+    "Wednesday" : "ოთხშაბათი",
+    "Thursday" : "ხუთშაბათი",
+    "Friday" : "პარასკევი",
+    "Saturday" : "შაბათი",
+    "January" : "იანვარი",
+    "February" : "თებერვალი",
+    "March" : "მარტი",
+    "April" : "აპრილი",
+    "May" : "მაისი",
+    "June" : "ივნისი",
+    "July" : "ივლისი",
+    "August" : "აგვისტო",
+    "September" : "სექტემბერი",
+    "October" : "ოქტომბერი",
+    "November" : "ნოემბერი",
+    "December" : "დეკემბერი",
+    "Settings" : "პარამეტრები",
+    "Folder" : "საქაღალდე",
+    "Image" : "სურათი",
+    "Saving..." : "შენახვა...",
+    "Reset password" : "პაროლის შეცვლა",
+    "No" : "არა",
+    "Yes" : "კი",
+    "Choose" : "არჩევა",
+    "Ok" : "დიახ",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ახალი ფაილები",
+    "Cancel" : "უარყოფა",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
+    "Shared" : "გაზიარებული",
+    "Share" : "გაზიარება",
+    "Error" : "შეცდომა",
+    "Error while sharing" : "შეცდომა გაზიარების დროს",
+    "Error while unsharing" : "შეცდომა გაზიარების გაუქმების დროს",
+    "Error while changing permissions" : "შეცდომა დაშვების ცვლილების დროს",
+    "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
+    "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
+    "Password protect" : "პაროლით დაცვა",
+    "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
+    "Send" : "გაგზავნა",
+    "Set expiration date" : "მიუთითე ვადის გასვლის დრო",
+    "Expiration date" : "ვადის გასვლის დრო",
+    "group" : "ჯგუფი",
+    "Resharing is not allowed" : "მეორეჯერ გაზიარება არ არის დაშვებული",
+    "Shared in {item} with {user}" : "გაზიარდა {item}–ში  {user}–ის მიერ",
+    "Unshare" : "გაუზიარებადი",
+    "can edit" : "შეგიძლია შეცვლა",
+    "access control" : "დაშვების კონტროლი",
+    "create" : "შექმნა",
+    "update" : "განახლება",
+    "delete" : "წაშლა",
+    "Password protected" : "პაროლით დაცული",
+    "Error unsetting expiration date" : "შეცდომა ვადის გასვლის მოხსნის დროს",
+    "Error setting expiration date" : "შეცდომა ვადის გასვლის მითითების დროს",
+    "Sending ..." : "გაგზავნა ....",
+    "Email sent" : "იმეილი გაიგზავნა",
+    "Warning" : "გაფრთხილება",
+    "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
+    "Delete" : "წაშლა",
+    "Add" : "დამატება",
+    "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
+    "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
+    "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
+    "Username" : "მომხმარებლის სახელი",
+    "New password" : "ახალი პაროლი",
+    "Personal" : "პირადი",
+    "Users" : "მომხმარებელი",
+    "Apps" : "აპლიკაციები",
+    "Admin" : "ადმინისტრატორი",
+    "Help" : "დახმარება",
+    "Access forbidden" : "წვდომა აკრძალულია",
+    "Security Warning" : "უსაფრთხოების გაფრთხილება",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
+    "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
+    "Password" : "პაროლი",
+    "Data folder" : "მონაცემთა საქაღალდე",
+    "Configure the database" : "მონაცემთა ბაზის კონფიგურირება",
+    "Database user" : "მონაცემთა ბაზის მომხმარებელი",
+    "Database password" : "მონაცემთა ბაზის პაროლი",
+    "Database name" : "მონაცემთა ბაზის სახელი",
+    "Database tablespace" : "ბაზის ცხრილის ზომა",
+    "Database host" : "მონაცემთა ბაზის ჰოსტი",
+    "Finish setup" : "კონფიგურაციის დასრულება",
+    "Log out" : "გამოსვლა",
+    "remember" : "დამახსოვრება",
+    "Log in" : "შესვლა",
+    "Alternative Logins" : "ალტერნატიული Login–ი"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
new file mode 100644
index 00000000000..ca45ac7076a
--- /dev/null
+++ b/core/l10n/ka_GE.json
@@ -0,0 +1,94 @@
+{ "translations": {
+    "Sunday" : "კვირა",
+    "Monday" : "ორშაბათი",
+    "Tuesday" : "სამშაბათი",
+    "Wednesday" : "ოთხშაბათი",
+    "Thursday" : "ხუთშაბათი",
+    "Friday" : "პარასკევი",
+    "Saturday" : "შაბათი",
+    "January" : "იანვარი",
+    "February" : "თებერვალი",
+    "March" : "მარტი",
+    "April" : "აპრილი",
+    "May" : "მაისი",
+    "June" : "ივნისი",
+    "July" : "ივლისი",
+    "August" : "აგვისტო",
+    "September" : "სექტემბერი",
+    "October" : "ოქტომბერი",
+    "November" : "ნოემბერი",
+    "December" : "დეკემბერი",
+    "Settings" : "პარამეტრები",
+    "Folder" : "საქაღალდე",
+    "Image" : "სურათი",
+    "Saving..." : "შენახვა...",
+    "Reset password" : "პაროლის შეცვლა",
+    "No" : "არა",
+    "Yes" : "კი",
+    "Choose" : "არჩევა",
+    "Ok" : "დიახ",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ახალი ფაილები",
+    "Cancel" : "უარყოფა",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
+    "Shared" : "გაზიარებული",
+    "Share" : "გაზიარება",
+    "Error" : "შეცდომა",
+    "Error while sharing" : "შეცდომა გაზიარების დროს",
+    "Error while unsharing" : "შეცდომა გაზიარების გაუქმების დროს",
+    "Error while changing permissions" : "შეცდომა დაშვების ცვლილების დროს",
+    "Shared with you and the group {group} by {owner}" : "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
+    "Shared with you by {owner}" : "გაზიარდა თქვენთვის {owner}–ის მიერ",
+    "Password protect" : "პაროლით დაცვა",
+    "Email link to person" : "ლინკის პიროვნების იმეილზე გაგზავნა",
+    "Send" : "გაგზავნა",
+    "Set expiration date" : "მიუთითე ვადის გასვლის დრო",
+    "Expiration date" : "ვადის გასვლის დრო",
+    "group" : "ჯგუფი",
+    "Resharing is not allowed" : "მეორეჯერ გაზიარება არ არის დაშვებული",
+    "Shared in {item} with {user}" : "გაზიარდა {item}–ში  {user}–ის მიერ",
+    "Unshare" : "გაუზიარებადი",
+    "can edit" : "შეგიძლია შეცვლა",
+    "access control" : "დაშვების კონტროლი",
+    "create" : "შექმნა",
+    "update" : "განახლება",
+    "delete" : "წაშლა",
+    "Password protected" : "პაროლით დაცული",
+    "Error unsetting expiration date" : "შეცდომა ვადის გასვლის მოხსნის დროს",
+    "Error setting expiration date" : "შეცდომა ვადის გასვლის მითითების დროს",
+    "Sending ..." : "გაგზავნა ....",
+    "Email sent" : "იმეილი გაიგზავნა",
+    "Warning" : "გაფრთხილება",
+    "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
+    "Delete" : "წაშლა",
+    "Add" : "დამატება",
+    "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
+    "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
+    "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
+    "Username" : "მომხმარებლის სახელი",
+    "New password" : "ახალი პაროლი",
+    "Personal" : "პირადი",
+    "Users" : "მომხმარებელი",
+    "Apps" : "აპლიკაციები",
+    "Admin" : "ადმინისტრატორი",
+    "Help" : "დახმარება",
+    "Access forbidden" : "წვდომა აკრძალულია",
+    "Security Warning" : "უსაფრთხოების გაფრთხილება",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
+    "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
+    "Password" : "პაროლი",
+    "Data folder" : "მონაცემთა საქაღალდე",
+    "Configure the database" : "მონაცემთა ბაზის კონფიგურირება",
+    "Database user" : "მონაცემთა ბაზის მომხმარებელი",
+    "Database password" : "მონაცემთა ბაზის პაროლი",
+    "Database name" : "მონაცემთა ბაზის სახელი",
+    "Database tablespace" : "ბაზის ცხრილის ზომა",
+    "Database host" : "მონაცემთა ბაზის ჰოსტი",
+    "Finish setup" : "კონფიგურაციის დასრულება",
+    "Log out" : "გამოსვლა",
+    "remember" : "დამახსოვრება",
+    "Log in" : "შესვლა",
+    "Alternative Logins" : "ალტერნატიული Login–ი"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
deleted file mode 100644
index 2ba7d4d7cca..00000000000
--- a/core/l10n/ka_GE.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "კვირა",
-"Monday" => "ორშაბათი",
-"Tuesday" => "სამშაბათი",
-"Wednesday" => "ოთხშაბათი",
-"Thursday" => "ხუთშაბათი",
-"Friday" => "პარასკევი",
-"Saturday" => "შაბათი",
-"January" => "იანვარი",
-"February" => "თებერვალი",
-"March" => "მარტი",
-"April" => "აპრილი",
-"May" => "მაისი",
-"June" => "ივნისი",
-"July" => "ივლისი",
-"August" => "აგვისტო",
-"September" => "სექტემბერი",
-"October" => "ოქტომბერი",
-"November" => "ნოემბერი",
-"December" => "დეკემბერი",
-"Settings" => "პარამეტრები",
-"Folder" => "საქაღალდე",
-"Image" => "სურათი",
-"Saving..." => "შენახვა...",
-"Reset password" => "პაროლის შეცვლა",
-"No" => "არა",
-"Yes" => "კი",
-"Choose" => "არჩევა",
-"Ok" => "დიახ",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"New Files" => "ახალი ფაილები",
-"Cancel" => "უარყოფა",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "თქვენი web სერვერი არ არის კონფიგურირებული ფაილ სინქრონიზაციისთვის, რადგან WebDAV ინტერფეისი შეიძლება იყოს გატეხილი.",
-"Shared" => "გაზიარებული",
-"Share" => "გაზიარება",
-"Error" => "შეცდომა",
-"Error while sharing" => "შეცდომა გაზიარების დროს",
-"Error while unsharing" => "შეცდომა გაზიარების გაუქმების დროს",
-"Error while changing permissions" => "შეცდომა დაშვების ცვლილების დროს",
-"Shared with you and the group {group} by {owner}" => "გაზიარდა თქვენთვის და ჯგუფისთვის {group}, {owner}–ის მიერ",
-"Shared with you by {owner}" => "გაზიარდა თქვენთვის {owner}–ის მიერ",
-"Password protect" => "პაროლით დაცვა",
-"Email link to person" => "ლინკის პიროვნების იმეილზე გაგზავნა",
-"Send" => "გაგზავნა",
-"Set expiration date" => "მიუთითე ვადის გასვლის დრო",
-"Expiration date" => "ვადის გასვლის დრო",
-"group" => "ჯგუფი",
-"Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
-"Shared in {item} with {user}" => "გაზიარდა {item}–ში  {user}–ის მიერ",
-"Unshare" => "გაუზიარებადი",
-"can edit" => "შეგიძლია შეცვლა",
-"access control" => "დაშვების კონტროლი",
-"create" => "შექმნა",
-"update" => "განახლება",
-"delete" => "წაშლა",
-"Password protected" => "პაროლით დაცული",
-"Error unsetting expiration date" => "შეცდომა ვადის გასვლის მოხსნის დროს",
-"Error setting expiration date" => "შეცდომა ვადის გასვლის მითითების დროს",
-"Sending ..." => "გაგზავნა ....",
-"Email sent" => "იმეილი გაიგზავნა",
-"Warning" => "გაფრთხილება",
-"The object type is not specified." => "ობიექტის ტიპი არ არის მითითებული.",
-"Delete" => "წაშლა",
-"Add" => "დამატება",
-"The update was successful. Redirecting you to ownCloud now." => "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
-"Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
-"You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-"Username" => "მომხმარებლის სახელი",
-"New password" => "ახალი პაროლი",
-"Personal" => "პირადი",
-"Users" => "მომხმარებელი",
-"Apps" => "აპლიკაციები",
-"Admin" => "ადმინისტრატორი",
-"Help" => "დახმარება",
-"Access forbidden" => "წვდომა აკრძალულია",
-"Security Warning" => "უსაფრთხოების გაფრთხილება",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
-"Create an <strong>admin account</strong>" => "შექმენი <strong>ადმინ ექაუნტი</strong>",
-"Password" => "პაროლი",
-"Data folder" => "მონაცემთა საქაღალდე",
-"Configure the database" => "მონაცემთა ბაზის კონფიგურირება",
-"Database user" => "მონაცემთა ბაზის მომხმარებელი",
-"Database password" => "მონაცემთა ბაზის პაროლი",
-"Database name" => "მონაცემთა ბაზის სახელი",
-"Database tablespace" => "ბაზის ცხრილის ზომა",
-"Database host" => "მონაცემთა ბაზის ჰოსტი",
-"Finish setup" => "კონფიგურაციის დასრულება",
-"Log out" => "გამოსვლა",
-"remember" => "დამახსოვრება",
-"Log in" => "შესვლა",
-"Alternative Logins" => "ალტერნატიული Login–ი"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/km.js b/core/l10n/km.js
new file mode 100644
index 00000000000..9a5f98d62ec
--- /dev/null
+++ b/core/l10n/km.js
@@ -0,0 +1,102 @@
+OC.L10N.register(
+    "core",
+    {
+    "Unknown filetype" : "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
+    "Invalid image" : "រូបភាព​មិន​ត្រឹម​ត្រូវ",
+    "Sunday" : "ថ្ងៃអាទិត្យ",
+    "Monday" : "ថ្ងៃចន្ទ",
+    "Tuesday" : "ថ្ងៃអង្គារ",
+    "Wednesday" : "ថ្ងៃពុធ",
+    "Thursday" : "ថ្ងៃព្រហស្បតិ៍",
+    "Friday" : "ថ្ងៃសុក្រ",
+    "Saturday" : "ថ្ងៃសៅរ៍",
+    "January" : "ខែមករា",
+    "February" : "ខែកុម្ភៈ",
+    "March" : "ខែមីនា",
+    "April" : "ខែមេសា",
+    "May" : "ខែឧសភា",
+    "June" : "ខែមិថុនា",
+    "July" : "ខែកក្កដា",
+    "August" : "ខែសីហា",
+    "September" : "ខែកញ្ញា",
+    "October" : "ខែតុលា",
+    "November" : "ខែវិច្ឆិកា",
+    "December" : "ខែធ្នូ",
+    "Settings" : "ការកំណត់",
+    "Folder" : "ថត",
+    "Saving..." : "កំពុង​រក្សាទុក",
+    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
+    "No" : "ទេ",
+    "Yes" : "ព្រម",
+    "Choose" : "ជ្រើស",
+    "Ok" : "ព្រម",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ឯកសារ​ថ្មី",
+    "Already existing files" : "មាន​ឯកសារ​នេះ​រួច​ហើយ",
+    "Cancel" : "លើកលែង",
+    "Continue" : "បន្ត",
+    "(all selected)" : "(បាន​ជ្រើស​ទាំង​អស់)",
+    "({count} selected)" : "(បាន​ជ្រើស {count})",
+    "Very weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+    "Weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ",
+    "So-so password" : "ពាក្យ​សម្ងាត់​ធម្មតា",
+    "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
+    "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "ម៉ាស៊ីន​មេ​វេប​របស់​អ្នក​មិន​បានរៀបចំត្រឹមត្រូវ ដើម្បី​អនុញ្ញាតិ​អោយ​មាន​ឯកសារ​ធ្វើ​សមកាលកម្មបាន​ទេ ព្រោះថា WebDAV ហាក់​បី​ដូច​ជាខូចហើយ។",
+    "Shared" : "បាន​ចែក​រំលែក",
+    "Share" : "ចែក​រំលែក",
+    "Error" : "កំហុស",
+    "Error while sharing" : "កំហុស​ពេល​ចែក​រំលែក",
+    "Error while unsharing" : "កំពុង​ពេល​លែង​ចែក​រំលែក",
+    "Error while changing permissions" : "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
+    "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
+    "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
+    "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Allow Public Upload" : "អនុញ្ញាត​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ",
+    "Send" : "ផ្ញើ",
+    "Set expiration date" : "កំណត់​ពេល​ផុត​កំណត់",
+    "Expiration date" : "ពេល​ផុត​កំណត់",
+    "group" : "ក្រុម",
+    "Resharing is not allowed" : "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
+    "Shared in {item} with {user}" : "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
+    "Unshare" : "លែង​ចែក​រំលែក",
+    "can share" : "អាច​ចែក​រំលែក",
+    "can edit" : "អាច​កែប្រែ",
+    "access control" : "សិទ្ធិ​បញ្ជា",
+    "create" : "បង្កើត",
+    "update" : "ធ្វើ​បច្ចុប្បន្នភាព",
+    "delete" : "លុប",
+    "Password protected" : "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Sending ..." : "កំពុង​ផ្ញើ ...",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "Warning" : "បម្រាម",
+    "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
+    "Delete" : "លុប",
+    "Add" : "បញ្ចូល",
+    "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Users" : "អ្នកប្រើ",
+    "Apps" : "កម្មវិធី",
+    "Admin" : "អ្នក​គ្រប់​គ្រង",
+    "Help" : "ជំនួយ",
+    "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
+    "Security Warning" : "បម្រាម​សុវត្ថិភាព",
+    "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
+    "Data folder" : "ថត​ទិន្នន័យ",
+    "Configure the database" : "កំណត់​សណ្ឋាន​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database user" : "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database password" : "ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database name" : "ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database host" : "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្នន័យ",
+    "Finish setup" : "បញ្ចប់​ការ​ដំឡើង",
+    "Finishing …" : "កំពុង​បញ្ចប់ ...",
+    "Log out" : "ចាក​ចេញ",
+    "remember" : "ចងចាំ",
+    "Log in" : "ចូល",
+    "Alternative Logins" : "ការ​ចូល​ជំនួស"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/km.json b/core/l10n/km.json
new file mode 100644
index 00000000000..0dc4d605b23
--- /dev/null
+++ b/core/l10n/km.json
@@ -0,0 +1,100 @@
+{ "translations": {
+    "Unknown filetype" : "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
+    "Invalid image" : "រូបភាព​មិន​ត្រឹម​ត្រូវ",
+    "Sunday" : "ថ្ងៃអាទិត្យ",
+    "Monday" : "ថ្ងៃចន្ទ",
+    "Tuesday" : "ថ្ងៃអង្គារ",
+    "Wednesday" : "ថ្ងៃពុធ",
+    "Thursday" : "ថ្ងៃព្រហស្បតិ៍",
+    "Friday" : "ថ្ងៃសុក្រ",
+    "Saturday" : "ថ្ងៃសៅរ៍",
+    "January" : "ខែមករា",
+    "February" : "ខែកុម្ភៈ",
+    "March" : "ខែមីនា",
+    "April" : "ខែមេសា",
+    "May" : "ខែឧសភា",
+    "June" : "ខែមិថុនា",
+    "July" : "ខែកក្កដា",
+    "August" : "ខែសីហា",
+    "September" : "ខែកញ្ញា",
+    "October" : "ខែតុលា",
+    "November" : "ខែវិច្ឆិកា",
+    "December" : "ខែធ្នូ",
+    "Settings" : "ការកំណត់",
+    "Folder" : "ថត",
+    "Saving..." : "កំពុង​រក្សាទុក",
+    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
+    "No" : "ទេ",
+    "Yes" : "ព្រម",
+    "Choose" : "ជ្រើស",
+    "Ok" : "ព្រម",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ឯកសារ​ថ្មី",
+    "Already existing files" : "មាន​ឯកសារ​នេះ​រួច​ហើយ",
+    "Cancel" : "លើកលែង",
+    "Continue" : "បន្ត",
+    "(all selected)" : "(បាន​ជ្រើស​ទាំង​អស់)",
+    "({count} selected)" : "(បាន​ជ្រើស {count})",
+    "Very weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+    "Weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ",
+    "So-so password" : "ពាក្យ​សម្ងាត់​ធម្មតា",
+    "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
+    "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "ម៉ាស៊ីន​មេ​វេប​របស់​អ្នក​មិន​បានរៀបចំត្រឹមត្រូវ ដើម្បី​អនុញ្ញាតិ​អោយ​មាន​ឯកសារ​ធ្វើ​សមកាលកម្មបាន​ទេ ព្រោះថា WebDAV ហាក់​បី​ដូច​ជាខូចហើយ។",
+    "Shared" : "បាន​ចែក​រំលែក",
+    "Share" : "ចែក​រំលែក",
+    "Error" : "កំហុស",
+    "Error while sharing" : "កំហុស​ពេល​ចែក​រំលែក",
+    "Error while unsharing" : "កំពុង​ពេល​លែង​ចែក​រំលែក",
+    "Error while changing permissions" : "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
+    "Shared with you and the group {group} by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
+    "Shared with you by {owner}" : "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
+    "Password protect" : "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Allow Public Upload" : "អនុញ្ញាត​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ",
+    "Send" : "ផ្ញើ",
+    "Set expiration date" : "កំណត់​ពេល​ផុត​កំណត់",
+    "Expiration date" : "ពេល​ផុត​កំណត់",
+    "group" : "ក្រុម",
+    "Resharing is not allowed" : "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
+    "Shared in {item} with {user}" : "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
+    "Unshare" : "លែង​ចែក​រំលែក",
+    "can share" : "អាច​ចែក​រំលែក",
+    "can edit" : "អាច​កែប្រែ",
+    "access control" : "សិទ្ធិ​បញ្ជា",
+    "create" : "បង្កើត",
+    "update" : "ធ្វើ​បច្ចុប្បន្នភាព",
+    "delete" : "លុប",
+    "Password protected" : "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
+    "Sending ..." : "កំពុង​ផ្ញើ ...",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "Warning" : "បម្រាម",
+    "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
+    "Delete" : "លុប",
+    "Add" : "បញ្ចូល",
+    "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Users" : "អ្នកប្រើ",
+    "Apps" : "កម្មវិធី",
+    "Admin" : "អ្នក​គ្រប់​គ្រង",
+    "Help" : "ជំនួយ",
+    "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
+    "Security Warning" : "បម្រាម​សុវត្ថិភាព",
+    "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
+    "Data folder" : "ថត​ទិន្នន័យ",
+    "Configure the database" : "កំណត់​សណ្ឋាន​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database user" : "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database password" : "ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database name" : "ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
+    "Database host" : "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្នន័យ",
+    "Finish setup" : "បញ្ចប់​ការ​ដំឡើង",
+    "Finishing …" : "កំពុង​បញ្ចប់ ...",
+    "Log out" : "ចាក​ចេញ",
+    "remember" : "ចងចាំ",
+    "Log in" : "ចូល",
+    "Alternative Logins" : "ការ​ចូល​ជំនួស"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/km.php b/core/l10n/km.php
deleted file mode 100644
index 1e7c3b93df9..00000000000
--- a/core/l10n/km.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Unknown filetype" => "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
-"Invalid image" => "រូបភាព​មិន​ត្រឹម​ត្រូវ",
-"Sunday" => "ថ្ងៃអាទិត្យ",
-"Monday" => "ថ្ងៃចន្ទ",
-"Tuesday" => "ថ្ងៃអង្គារ",
-"Wednesday" => "ថ្ងៃពុធ",
-"Thursday" => "ថ្ងៃព្រហស្បតិ៍",
-"Friday" => "ថ្ងៃសុក្រ",
-"Saturday" => "ថ្ងៃសៅរ៍",
-"January" => "ខែមករា",
-"February" => "ខែកុម្ភៈ",
-"March" => "ខែមីនា",
-"April" => "ខែមេសា",
-"May" => "ខែឧសភា",
-"June" => "ខែមិថុនា",
-"July" => "ខែកក្កដា",
-"August" => "ខែសីហា",
-"September" => "ខែកញ្ញា",
-"October" => "ខែតុលា",
-"November" => "ខែវិច្ឆិកា",
-"December" => "ខែធ្នូ",
-"Settings" => "ការកំណត់",
-"Folder" => "ថត",
-"Saving..." => "កំពុង​រក្សាទុក",
-"Reset password" => "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
-"No" => "ទេ",
-"Yes" => "ព្រម",
-"Choose" => "ជ្រើស",
-"Ok" => "ព្រម",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"New Files" => "ឯកសារ​ថ្មី",
-"Already existing files" => "មាន​ឯកសារ​នេះ​រួច​ហើយ",
-"Cancel" => "លើកលែង",
-"Continue" => "បន្ត",
-"(all selected)" => "(បាន​ជ្រើស​ទាំង​អស់)",
-"({count} selected)" => "(បាន​ជ្រើស {count})",
-"Very weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
-"Weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ",
-"So-so password" => "ពាក្យ​សម្ងាត់​ធម្មតា",
-"Good password" => "ពាក្យ​សម្ងាត់​ល្អ",
-"Strong password" => "ពាក្យ​សម្ងាត់​ខ្លាំង",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "ម៉ាស៊ីន​មេ​វេប​របស់​អ្នក​មិន​បានរៀបចំត្រឹមត្រូវ ដើម្បី​អនុញ្ញាតិ​អោយ​មាន​ឯកសារ​ធ្វើ​សមកាលកម្មបាន​ទេ ព្រោះថា WebDAV ហាក់​បី​ដូច​ជាខូចហើយ។",
-"Shared" => "បាន​ចែក​រំលែក",
-"Share" => "ចែក​រំលែក",
-"Error" => "កំហុស",
-"Error while sharing" => "កំហុស​ពេល​ចែក​រំលែក",
-"Error while unsharing" => "កំពុង​ពេល​លែង​ចែក​រំលែក",
-"Error while changing permissions" => "មាន​កំហុស​នៅ​ពេល​ប្ដូរ​សិទ្ធិ",
-"Shared with you and the group {group} by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក និង​ក្រុម {group} ដោយ {owner}",
-"Shared with you by {owner}" => "បាន​ចែក​រំលែក​ជាមួយ​អ្នក​ដោយ {owner}",
-"Password protect" => "ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-"Allow Public Upload" => "អនុញ្ញាត​ការ​ផ្ទុកឡើង​ជា​សាធារណៈ",
-"Send" => "ផ្ញើ",
-"Set expiration date" => "កំណត់​ពេល​ផុត​កំណត់",
-"Expiration date" => "ពេល​ផុត​កំណត់",
-"group" => "ក្រុម",
-"Resharing is not allowed" => "មិន​អនុញ្ញាត​ឲ្យ​មាន​ការ​ចែក​រំលែក​ឡើង​វិញ",
-"Shared in {item} with {user}" => "បាន​ចែក​រំលែក​ក្នុង {item} ជាមួយ {user}",
-"Unshare" => "លែង​ចែក​រំលែក",
-"can share" => "អាច​ចែក​រំលែក",
-"can edit" => "អាច​កែប្រែ",
-"access control" => "សិទ្ធិ​បញ្ជា",
-"create" => "បង្កើត",
-"update" => "ធ្វើ​បច្ចុប្បន្នភាព",
-"delete" => "លុប",
-"Password protected" => "បាន​ការ​ពារ​ដោយ​ពាក្យ​សម្ងាត់",
-"Sending ..." => "កំពុង​ផ្ញើ ...",
-"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
-"Warning" => "បម្រាម",
-"The object type is not specified." => "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
-"Delete" => "លុប",
-"Add" => "បញ្ចូល",
-"Please reload the page." => "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
-"Username" => "ឈ្មោះ​អ្នកប្រើ",
-"New password" => "ពាក្យ​សម្ងាត់​ថ្មី",
-"Personal" => "ផ្ទាល់​ខ្លួន",
-"Users" => "អ្នកប្រើ",
-"Apps" => "កម្មវិធី",
-"Admin" => "អ្នក​គ្រប់​គ្រង",
-"Help" => "ជំនួយ",
-"Access forbidden" => "បាន​ហាមឃាត់​ការ​ចូល",
-"Security Warning" => "បម្រាម​សុវត្ថិភាព",
-"Create an <strong>admin account</strong>" => "បង្កើត​<strong>គណនី​អភិបាល</strong>",
-"Password" => "ពាក្យសម្ងាត់",
-"Storage & database" => "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
-"Data folder" => "ថត​ទិន្នន័យ",
-"Configure the database" => "កំណត់​សណ្ឋាន​មូលដ្ឋាន​ទិន្នន័យ",
-"Database user" => "អ្នក​ប្រើ​មូលដ្ឋាន​ទិន្នន័យ",
-"Database password" => "ពាក្យ​សម្ងាត់​មូលដ្ឋាន​ទិន្នន័យ",
-"Database name" => "ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
-"Database host" => "ម៉ាស៊ីន​មូលដ្ឋាន​ទិន្នន័យ",
-"Finish setup" => "បញ្ចប់​ការ​ដំឡើង",
-"Finishing …" => "កំពុង​បញ្ចប់ ...",
-"Log out" => "ចាក​ចេញ",
-"remember" => "ចងចាំ",
-"Log in" => "ចូល",
-"Alternative Logins" => "ការ​ចូល​ជំនួស"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/kn.js b/core/l10n/kn.js
new file mode 100644
index 00000000000..87077ecad97
--- /dev/null
+++ b/core/l10n/kn.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/kn.json b/core/l10n/kn.json
new file mode 100644
index 00000000000..c499f696550
--- /dev/null
+++ b/core/l10n/kn.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/kn.php b/core/l10n/kn.php
deleted file mode 100644
index 1191769faa7..00000000000
--- a/core/l10n/kn.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
new file mode 100644
index 00000000000..d727727cf9f
--- /dev/null
+++ b/core/l10n/ko.js
@@ -0,0 +1,163 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
+    "Turned on maintenance mode" : "유지 보수 모드 켜짐",
+    "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
+    "Updated database" : "데이터베이스 업데이트 됨",
+    "No image or file provided" : "이미지나 파일이 없음",
+    "Unknown filetype" : "알려지지 않은 파일 형식",
+    "Invalid image" : "잘못된 이미지",
+    "No temporary profile picture available, try again" : "사용 가능한 프로필 사진이 없습니다. 다시 시도하십시오.",
+    "No crop data provided" : "선택된 데이터가 없습니다.",
+    "Sunday" : "일요일",
+    "Monday" : "월요일",
+    "Tuesday" : "화요일",
+    "Wednesday" : "수요일",
+    "Thursday" : "목요일",
+    "Friday" : "금요일",
+    "Saturday" : "토요일",
+    "January" : "1월",
+    "February" : "2월",
+    "March" : "3월",
+    "April" : "4월",
+    "May" : "5월",
+    "June" : "6월",
+    "July" : "7월",
+    "August" : "8월",
+    "September" : "9월",
+    "October" : "10월",
+    "November" : "11월",
+    "December" : "12월",
+    "Settings" : "설정",
+    "File" : "파일",
+    "Folder" : "폴더",
+    "Image" : "그림",
+    "Saving..." : "저장 중...",
+    "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
+    "Reset password" : "암호 재설정",
+    "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
+    "No" : "아니요",
+    "Yes" : "예",
+    "Choose" : "선택",
+    "Error loading file picker template: {error}" : "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
+    "Ok" : "확인",
+    "Error loading message template: {error}" : "메시지 템플릿을 불러오는 중 오류 발생: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["파일 {count}개 충돌"],
+    "One file conflict" : "파일 1개 충돌",
+    "New Files" : "새 파일",
+    "Already existing files" : "파일이 이미 존재합니다",
+    "Which files do you want to keep?" : "어느 파일을 유지하시겠습니까?",
+    "If you select both versions, the copied file will have a number added to its name." : "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다.",
+    "Cancel" : "취소",
+    "Continue" : "계속",
+    "(all selected)" : "(모두 선택됨)",
+    "({count} selected)" : "({count}개 선택됨)",
+    "Error loading file exists template" : "파일 존재함 템플릿을 불러오는 중 오류 발생",
+    "Very weak password" : "매우 약한 암호",
+    "Weak password" : "약한 암호",
+    "So-so password" : "그저 그런 암호",
+    "Good password" : "좋은 암호",
+    "Strong password" : "강력한 암호",
+    "Your web server is not yet properly setup to allow files 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 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." : "서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 일부 기능을 사용할 수 없습니다. 외부에서 파일에 접근하거나 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
+    "Shared" : "공유됨",
+    "Share" : "공유",
+    "Error" : "오류",
+    "Error while sharing" : "공유하는 중 오류 발생",
+    "Error while unsharing" : "공유 해제하는 중 오류 발생",
+    "Error while changing permissions" : "권한 변경하는 중 오류 발생",
+    "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
+    "Shared with you by {owner}" : "{owner} 님이 공유 중",
+    "Share with user or group …" : "사용자 및 그룹과 공유...",
+    "Share link" : "링크 공유",
+    "Password protect" : "암호 보호",
+    "Allow Public Upload" : "공개 업로드 허용",
+    "Email link to person" : "이메일 주소",
+    "Send" : "전송",
+    "Set expiration date" : "만료 날짜 설정",
+    "Expiration date" : "만료 날짜",
+    "group" : "그룹",
+    "Resharing is not allowed" : "다시 공유할 수 없습니다",
+    "Shared in {item} with {user}" : "{user} 님과 {item}에서 공유 중",
+    "Unshare" : "공유 해제",
+    "notify by email" : "이메일로 알림",
+    "can share" : "공유 가능",
+    "can edit" : "편집 가능",
+    "access control" : "접근 제어",
+    "create" : "생성",
+    "update" : "업데이트",
+    "delete" : "삭제",
+    "Password protected" : "암호로 보호됨",
+    "Error unsetting expiration date" : "만료 날짜 해제 오류",
+    "Error setting expiration date" : "만료 날짜 설정 오류",
+    "Sending ..." : "전송 중...",
+    "Email sent" : "이메일 발송됨",
+    "Warning" : "경고",
+    "The object type is not specified." : "객체 유형이 지정되지 않았습니다.",
+    "Enter new" : "새로운 값 입력",
+    "Delete" : "삭제",
+    "Add" : "추가",
+    "Edit tags" : "태그 편집",
+    "Error loading dialog template: {error}" : "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
+    "No tags selected for deletion." : "삭제할 태그를 선택하지 않았습니다.",
+    "Please reload the page." : "페이지를 새로 고치십시오.",
+    "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
+    "%s password reset" : "%s 암호 재설정",
+    "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
+    "You will receive a link to reset your password via Email." : "이메일로 암호 재설정 링크를 보냈습니다.",
+    "Username" : "사용자 이름",
+    "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?" : "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?",
+    "Yes, I really want to reset my password now" : "예, 지금 내 암호를 재설정합니다",
+    "Reset" : "재설정",
+    "New password" : "새 암호",
+    "New Password" : "새 암호",
+    "Personal" : "개인",
+    "Users" : "사용자",
+    "Apps" : "앱",
+    "Admin" : "관리자",
+    "Help" : "도움말",
+    "Error loading tags" : "태그 불러오기 오류",
+    "Tag already exists" : "태그가 이미 존재합니다",
+    "Error deleting tag(s)" : "태그 삭제 오류",
+    "Error tagging" : "태그 추가 오류",
+    "Error untagging" : "태그 해제 오류",
+    "Error favoriting" : "즐겨찾기 추가 오류",
+    "Error unfavoriting" : "즐겨찾기 삭제 오류",
+    "Access forbidden" : "접근 금지됨",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "안녕하세요,\n\n%s 님이 %s을(를) 공유하였음을 알려 드립니다.\n보기 링크: %s\n\n",
+    "The share will expire on %s." : "이 공유는 %s 까지 유지됩니다.",
+    "Cheers!" : "감사합니다!",
+    "Security Warning" : "보안 경고",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "사용 중인 PHP 버전이 NULL 바이트 공격에 취약합니다 (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "%s의 보안을 위하여 PHP 버전을 업데이트하십시오.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
+    "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
+    "Password" : "암호",
+    "Storage & database" : "스토리지 & 데이터베이스",
+    "Data folder" : "데이터 폴더",
+    "Configure the database" : "데이터베이스 설정",
+    "Only %s is available." : "%s 만 가능합니다.",
+    "Database user" : "데이터베이스 사용자",
+    "Database password" : "데이터베이스 암호",
+    "Database name" : "데이터베이스 이름",
+    "Database tablespace" : "데이터베이스 테이블 공간",
+    "Database host" : "데이터베이스 호스트",
+    "Finish setup" : "설치 완료",
+    "Finishing …" : "완료 중 ...",
+    "%s is available. Get more information on how to update." : "%s을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 자세한 정보를 얻으십시오.",
+    "Log out" : "로그아웃",
+    "Server side authentication failed!" : "서버 인증 실패!",
+    "Please contact your administrator." : "관리자에게 문의하십시오.",
+    "Forgot your password? Reset it!" : "암호를 잊으셨다구요? 재설정하세요!",
+    "remember" : "기억하기",
+    "Log in" : "로그인",
+    "Alternative Logins" : "대체 로그인",
+    "This ownCloud instance is currently in single user mode." : "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
+    "This means only administrators can use the instance." : "현재 시스템 관리자만 인스턴스를 사용할 수 있습니다.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "이 메시지가 계속 표시되거나, 예상하지 못하였을 때 표시된다면 시스템 관리자에게 연락하십시오",
+    "Thank you for your patience." : "기다려 주셔서 감사합니다.",
+    "Start update" : "업데이트 시작"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
new file mode 100644
index 00000000000..2ddffff685b
--- /dev/null
+++ b/core/l10n/ko.json
@@ -0,0 +1,161 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "%s 님에게 메일을 보낼 수 없습니다.",
+    "Turned on maintenance mode" : "유지 보수 모드 켜짐",
+    "Turned off maintenance mode" : "유지 보수 모드 꺼짐",
+    "Updated database" : "데이터베이스 업데이트 됨",
+    "No image or file provided" : "이미지나 파일이 없음",
+    "Unknown filetype" : "알려지지 않은 파일 형식",
+    "Invalid image" : "잘못된 이미지",
+    "No temporary profile picture available, try again" : "사용 가능한 프로필 사진이 없습니다. 다시 시도하십시오.",
+    "No crop data provided" : "선택된 데이터가 없습니다.",
+    "Sunday" : "일요일",
+    "Monday" : "월요일",
+    "Tuesday" : "화요일",
+    "Wednesday" : "수요일",
+    "Thursday" : "목요일",
+    "Friday" : "금요일",
+    "Saturday" : "토요일",
+    "January" : "1월",
+    "February" : "2월",
+    "March" : "3월",
+    "April" : "4월",
+    "May" : "5월",
+    "June" : "6월",
+    "July" : "7월",
+    "August" : "8월",
+    "September" : "9월",
+    "October" : "10월",
+    "November" : "11월",
+    "December" : "12월",
+    "Settings" : "설정",
+    "File" : "파일",
+    "Folder" : "폴더",
+    "Image" : "그림",
+    "Saving..." : "저장 중...",
+    "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
+    "Reset password" : "암호 재설정",
+    "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
+    "No" : "아니요",
+    "Yes" : "예",
+    "Choose" : "선택",
+    "Error loading file picker template: {error}" : "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
+    "Ok" : "확인",
+    "Error loading message template: {error}" : "메시지 템플릿을 불러오는 중 오류 발생: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["파일 {count}개 충돌"],
+    "One file conflict" : "파일 1개 충돌",
+    "New Files" : "새 파일",
+    "Already existing files" : "파일이 이미 존재합니다",
+    "Which files do you want to keep?" : "어느 파일을 유지하시겠습니까?",
+    "If you select both versions, the copied file will have a number added to its name." : "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다.",
+    "Cancel" : "취소",
+    "Continue" : "계속",
+    "(all selected)" : "(모두 선택됨)",
+    "({count} selected)" : "({count}개 선택됨)",
+    "Error loading file exists template" : "파일 존재함 템플릿을 불러오는 중 오류 발생",
+    "Very weak password" : "매우 약한 암호",
+    "Weak password" : "약한 암호",
+    "So-so password" : "그저 그런 암호",
+    "Good password" : "좋은 암호",
+    "Strong password" : "강력한 암호",
+    "Your web server is not yet properly setup to allow files 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 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." : "서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 일부 기능을 사용할 수 없습니다. 외부에서 파일에 접근하거나 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
+    "Shared" : "공유됨",
+    "Share" : "공유",
+    "Error" : "오류",
+    "Error while sharing" : "공유하는 중 오류 발생",
+    "Error while unsharing" : "공유 해제하는 중 오류 발생",
+    "Error while changing permissions" : "권한 변경하는 중 오류 발생",
+    "Shared with you and the group {group} by {owner}" : "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
+    "Shared with you by {owner}" : "{owner} 님이 공유 중",
+    "Share with user or group …" : "사용자 및 그룹과 공유...",
+    "Share link" : "링크 공유",
+    "Password protect" : "암호 보호",
+    "Allow Public Upload" : "공개 업로드 허용",
+    "Email link to person" : "이메일 주소",
+    "Send" : "전송",
+    "Set expiration date" : "만료 날짜 설정",
+    "Expiration date" : "만료 날짜",
+    "group" : "그룹",
+    "Resharing is not allowed" : "다시 공유할 수 없습니다",
+    "Shared in {item} with {user}" : "{user} 님과 {item}에서 공유 중",
+    "Unshare" : "공유 해제",
+    "notify by email" : "이메일로 알림",
+    "can share" : "공유 가능",
+    "can edit" : "편집 가능",
+    "access control" : "접근 제어",
+    "create" : "생성",
+    "update" : "업데이트",
+    "delete" : "삭제",
+    "Password protected" : "암호로 보호됨",
+    "Error unsetting expiration date" : "만료 날짜 해제 오류",
+    "Error setting expiration date" : "만료 날짜 설정 오류",
+    "Sending ..." : "전송 중...",
+    "Email sent" : "이메일 발송됨",
+    "Warning" : "경고",
+    "The object type is not specified." : "객체 유형이 지정되지 않았습니다.",
+    "Enter new" : "새로운 값 입력",
+    "Delete" : "삭제",
+    "Add" : "추가",
+    "Edit tags" : "태그 편집",
+    "Error loading dialog template: {error}" : "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
+    "No tags selected for deletion." : "삭제할 태그를 선택하지 않았습니다.",
+    "Please reload the page." : "페이지를 새로 고치십시오.",
+    "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
+    "%s password reset" : "%s 암호 재설정",
+    "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
+    "You will receive a link to reset your password via Email." : "이메일로 암호 재설정 링크를 보냈습니다.",
+    "Username" : "사용자 이름",
+    "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?" : "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?",
+    "Yes, I really want to reset my password now" : "예, 지금 내 암호를 재설정합니다",
+    "Reset" : "재설정",
+    "New password" : "새 암호",
+    "New Password" : "새 암호",
+    "Personal" : "개인",
+    "Users" : "사용자",
+    "Apps" : "앱",
+    "Admin" : "관리자",
+    "Help" : "도움말",
+    "Error loading tags" : "태그 불러오기 오류",
+    "Tag already exists" : "태그가 이미 존재합니다",
+    "Error deleting tag(s)" : "태그 삭제 오류",
+    "Error tagging" : "태그 추가 오류",
+    "Error untagging" : "태그 해제 오류",
+    "Error favoriting" : "즐겨찾기 추가 오류",
+    "Error unfavoriting" : "즐겨찾기 삭제 오류",
+    "Access forbidden" : "접근 금지됨",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "안녕하세요,\n\n%s 님이 %s을(를) 공유하였음을 알려 드립니다.\n보기 링크: %s\n\n",
+    "The share will expire on %s." : "이 공유는 %s 까지 유지됩니다.",
+    "Cheers!" : "감사합니다!",
+    "Security Warning" : "보안 경고",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "사용 중인 PHP 버전이 NULL 바이트 공격에 취약합니다 (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "%s의 보안을 위하여 PHP 버전을 업데이트하십시오.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
+    "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
+    "Password" : "암호",
+    "Storage & database" : "스토리지 & 데이터베이스",
+    "Data folder" : "데이터 폴더",
+    "Configure the database" : "데이터베이스 설정",
+    "Only %s is available." : "%s 만 가능합니다.",
+    "Database user" : "데이터베이스 사용자",
+    "Database password" : "데이터베이스 암호",
+    "Database name" : "데이터베이스 이름",
+    "Database tablespace" : "데이터베이스 테이블 공간",
+    "Database host" : "데이터베이스 호스트",
+    "Finish setup" : "설치 완료",
+    "Finishing …" : "완료 중 ...",
+    "%s is available. Get more information on how to update." : "%s을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 자세한 정보를 얻으십시오.",
+    "Log out" : "로그아웃",
+    "Server side authentication failed!" : "서버 인증 실패!",
+    "Please contact your administrator." : "관리자에게 문의하십시오.",
+    "Forgot your password? Reset it!" : "암호를 잊으셨다구요? 재설정하세요!",
+    "remember" : "기억하기",
+    "Log in" : "로그인",
+    "Alternative Logins" : "대체 로그인",
+    "This ownCloud instance is currently in single user mode." : "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
+    "This means only administrators can use the instance." : "현재 시스템 관리자만 인스턴스를 사용할 수 있습니다.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "이 메시지가 계속 표시되거나, 예상하지 못하였을 때 표시된다면 시스템 관리자에게 연락하십시오",
+    "Thank you for your patience." : "기다려 주셔서 감사합니다.",
+    "Start update" : "업데이트 시작"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
deleted file mode 100644
index 71eff300d06..00000000000
--- a/core/l10n/ko.php
+++ /dev/null
@@ -1,162 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "%s 님에게 메일을 보낼 수 없습니다.",
-"Turned on maintenance mode" => "유지 보수 모드 켜짐",
-"Turned off maintenance mode" => "유지 보수 모드 꺼짐",
-"Updated database" => "데이터베이스 업데이트 됨",
-"No image or file provided" => "이미지나 파일이 없음",
-"Unknown filetype" => "알려지지 않은 파일 형식",
-"Invalid image" => "잘못된 이미지",
-"No temporary profile picture available, try again" => "사용 가능한 프로필 사진이 없습니다. 다시 시도하십시오.",
-"No crop data provided" => "선택된 데이터가 없습니다.",
-"Sunday" => "일요일",
-"Monday" => "월요일",
-"Tuesday" => "화요일",
-"Wednesday" => "수요일",
-"Thursday" => "목요일",
-"Friday" => "금요일",
-"Saturday" => "토요일",
-"January" => "1월",
-"February" => "2월",
-"March" => "3월",
-"April" => "4월",
-"May" => "5월",
-"June" => "6월",
-"July" => "7월",
-"August" => "8월",
-"September" => "9월",
-"October" => "10월",
-"November" => "11월",
-"December" => "12월",
-"Settings" => "설정",
-"File" => "파일",
-"Folder" => "폴더",
-"Image" => "그림",
-"Saving..." => "저장 중...",
-"Couldn't send reset email. Please contact your administrator." => "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
-"Reset password" => "암호 재설정",
-"Password can not be changed. Please contact your administrator." => "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
-"No" => "아니요",
-"Yes" => "예",
-"Choose" => "선택",
-"Error loading file picker template: {error}" => "파일 선택 템플릿을 불러오는 중 오류 발생: {error}",
-"Ok" => "확인",
-"Error loading message template: {error}" => "메시지 템플릿을 불러오는 중 오류 발생: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("파일 {count}개 충돌"),
-"One file conflict" => "파일 1개 충돌",
-"New Files" => "새 파일",
-"Already existing files" => "파일이 이미 존재합니다",
-"Which files do you want to keep?" => "어느 파일을 유지하시겠습니까?",
-"If you select both versions, the copied file will have a number added to its name." => "두 버전을 모두 선택하면, 파일 이름에 번호가 추가될 것입니다.",
-"Cancel" => "취소",
-"Continue" => "계속",
-"(all selected)" => "(모두 선택됨)",
-"({count} selected)" => "({count}개 선택됨)",
-"Error loading file exists template" => "파일 존재함 템플릿을 불러오는 중 오류 발생",
-"Very weak password" => "매우 약한 암호",
-"Weak password" => "약한 암호",
-"So-so password" => "그저 그런 암호",
-"Good password" => "좋은 암호",
-"Strong password" => "강력한 암호",
-"Your web server is not yet properly setup to allow files 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 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." => "서버에서 인터넷에 연결할 수 없습니다. 외부 저장소 마운트, 업데이트 알림, 제 3자 앱 설치 등 일부 기능을 사용할 수 없습니다. 외부에서 파일에 접근하거나 알림 이메일을 보내지 못할 수도 있습니다. 모든 기능을 사용하려면 인터넷에 연결하는 것을 추천합니다.",
-"Shared" => "공유됨",
-"Share" => "공유",
-"Error" => "오류",
-"Error while sharing" => "공유하는 중 오류 발생",
-"Error while unsharing" => "공유 해제하는 중 오류 발생",
-"Error while changing permissions" => "권한 변경하는 중 오류 발생",
-"Shared with you and the group {group} by {owner}" => "{owner} 님이 여러분 및 그룹 {group}와(과) 공유 중",
-"Shared with you by {owner}" => "{owner} 님이 공유 중",
-"Share with user or group …" => "사용자 및 그룹과 공유...",
-"Share link" => "링크 공유",
-"Password protect" => "암호 보호",
-"Allow Public Upload" => "공개 업로드 허용",
-"Email link to person" => "이메일 주소",
-"Send" => "전송",
-"Set expiration date" => "만료 날짜 설정",
-"Expiration date" => "만료 날짜",
-"group" => "그룹",
-"Resharing is not allowed" => "다시 공유할 수 없습니다",
-"Shared in {item} with {user}" => "{user} 님과 {item}에서 공유 중",
-"Unshare" => "공유 해제",
-"notify by email" => "이메일로 알림",
-"can share" => "공유 가능",
-"can edit" => "편집 가능",
-"access control" => "접근 제어",
-"create" => "생성",
-"update" => "업데이트",
-"delete" => "삭제",
-"Password protected" => "암호로 보호됨",
-"Error unsetting expiration date" => "만료 날짜 해제 오류",
-"Error setting expiration date" => "만료 날짜 설정 오류",
-"Sending ..." => "전송 중...",
-"Email sent" => "이메일 발송됨",
-"Warning" => "경고",
-"The object type is not specified." => "객체 유형이 지정되지 않았습니다.",
-"Enter new" => "새로운 값 입력",
-"Delete" => "삭제",
-"Add" => "추가",
-"Edit tags" => "태그 편집",
-"Error loading dialog template: {error}" => "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
-"No tags selected for deletion." => "삭제할 태그를 선택하지 않았습니다.",
-"Please reload the page." => "페이지를 새로 고치십시오.",
-"The update was successful. Redirecting you to ownCloud now." => "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
-"%s password reset" => "%s 암호 재설정",
-"Use the following link to reset your password: {link}" => "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
-"You will receive a link to reset your password via Email." => "이메일로 암호 재설정 링크를 보냈습니다.",
-"Username" => "사용자 이름",
-"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?" => "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?",
-"Yes, I really want to reset my password now" => "예, 지금 내 암호를 재설정합니다",
-"Reset" => "재설정",
-"New password" => "새 암호",
-"New Password" => "새 암호",
-"Personal" => "개인",
-"Users" => "사용자",
-"Apps" => "앱",
-"Admin" => "관리자",
-"Help" => "도움말",
-"Error loading tags" => "태그 불러오기 오류",
-"Tag already exists" => "태그가 이미 존재합니다",
-"Error deleting tag(s)" => "태그 삭제 오류",
-"Error tagging" => "태그 추가 오류",
-"Error untagging" => "태그 해제 오류",
-"Error favoriting" => "즐겨찾기 추가 오류",
-"Error unfavoriting" => "즐겨찾기 삭제 오류",
-"Access forbidden" => "접근 금지됨",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "안녕하세요,\n\n%s 님이 %s을(를) 공유하였음을 알려 드립니다.\n보기 링크: %s\n\n",
-"The share will expire on %s." => "이 공유는 %s 까지 유지됩니다.",
-"Cheers!" => "감사합니다!",
-"Security Warning" => "보안 경고",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "사용 중인 PHP 버전이 NULL 바이트 공격에 취약합니다 (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "%s의 보안을 위하여 PHP 버전을 업데이트하십시오.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
-"Create an <strong>admin account</strong>" => "<strong>관리자 계정</strong> 만들기",
-"Password" => "암호",
-"Storage & database" => "스토리지 & 데이터베이스",
-"Data folder" => "데이터 폴더",
-"Configure the database" => "데이터베이스 설정",
-"Only %s is available." => "%s 만 가능합니다.",
-"Database user" => "데이터베이스 사용자",
-"Database password" => "데이터베이스 암호",
-"Database name" => "데이터베이스 이름",
-"Database tablespace" => "데이터베이스 테이블 공간",
-"Database host" => "데이터베이스 호스트",
-"Finish setup" => "설치 완료",
-"Finishing …" => "완료 중 ...",
-"%s is available. Get more information on how to update." => "%s을(를) 사용할 수 있습니다. 업데이트하는 방법에 대해서 자세한 정보를 얻으십시오.",
-"Log out" => "로그아웃",
-"Server side authentication failed!" => "서버 인증 실패!",
-"Please contact your administrator." => "관리자에게 문의하십시오.",
-"Forgot your password? Reset it!" => "암호를 잊으셨다구요? 재설정하세요!",
-"remember" => "기억하기",
-"Log in" => "로그인",
-"Alternative Logins" => "대체 로그인",
-"This ownCloud instance is currently in single user mode." => "ownCloud 인스턴스가 현재 단일 사용자 모드로 동작 중입니다.",
-"This means only administrators can use the instance." => "현재 시스템 관리자만 인스턴스를 사용할 수 있습니다.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "이 메시지가 계속 표시되거나, 예상하지 못하였을 때 표시된다면 시스템 관리자에게 연락하십시오",
-"Thank you for your patience." => "기다려 주셔서 감사합니다.",
-"Start update" => "업데이트 시작"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js
new file mode 100644
index 00000000000..7e41b5614a9
--- /dev/null
+++ b/core/l10n/ku_IQ.js
@@ -0,0 +1,31 @@
+OC.L10N.register(
+    "core",
+    {
+    "Settings" : "ده‌ستكاری",
+    "Folder" : "بوخچه",
+    "Saving..." : "پاشکه‌وتده‌کات...",
+    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
+    "No" : "نەخێر",
+    "Yes" : "بەڵێ",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "لابردن",
+    "Share" : "هاوبەشی کردن",
+    "Error" : "هه‌ڵه",
+    "Warning" : "ئاگاداری",
+    "Add" : "زیادکردن",
+    "Username" : "ناوی به‌کارهێنه‌ر",
+    "New password" : "وشەی نهێنی نوێ",
+    "Users" : "به‌كارهێنه‌ر",
+    "Apps" : "به‌رنامه‌كان",
+    "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+    "Help" : "یارمەتی",
+    "Password" : "وشەی تێپەربو",
+    "Data folder" : "زانیاری فۆڵده‌ر",
+    "Database user" : "به‌كارهێنه‌ری داتابه‌یس",
+    "Database password" : "وشه‌ی نهێنی داتا به‌یس",
+    "Database name" : "ناوی داتابه‌یس",
+    "Database host" : "هۆستی داتابه‌یس",
+    "Finish setup" : "كۆتایی هات ده‌ستكاریه‌كان",
+    "Log out" : "چوونەدەرەوە"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json
new file mode 100644
index 00000000000..aa06ff50be6
--- /dev/null
+++ b/core/l10n/ku_IQ.json
@@ -0,0 +1,29 @@
+{ "translations": {
+    "Settings" : "ده‌ستكاری",
+    "Folder" : "بوخچه",
+    "Saving..." : "پاشکه‌وتده‌کات...",
+    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
+    "No" : "نەخێر",
+    "Yes" : "بەڵێ",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "لابردن",
+    "Share" : "هاوبەشی کردن",
+    "Error" : "هه‌ڵه",
+    "Warning" : "ئاگاداری",
+    "Add" : "زیادکردن",
+    "Username" : "ناوی به‌کارهێنه‌ر",
+    "New password" : "وشەی نهێنی نوێ",
+    "Users" : "به‌كارهێنه‌ر",
+    "Apps" : "به‌رنامه‌كان",
+    "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+    "Help" : "یارمەتی",
+    "Password" : "وشەی تێپەربو",
+    "Data folder" : "زانیاری فۆڵده‌ر",
+    "Database user" : "به‌كارهێنه‌ری داتابه‌یس",
+    "Database password" : "وشه‌ی نهێنی داتا به‌یس",
+    "Database name" : "ناوی داتابه‌یس",
+    "Database host" : "هۆستی داتابه‌یس",
+    "Finish setup" : "كۆتایی هات ده‌ستكاریه‌كان",
+    "Log out" : "چوونەدەرەوە"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ku_IQ.php b/core/l10n/ku_IQ.php
deleted file mode 100644
index d188db0dab6..00000000000
--- a/core/l10n/ku_IQ.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "ده‌ستكاری",
-"Folder" => "بوخچه",
-"Saving..." => "پاشکه‌وتده‌کات...",
-"Reset password" => "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
-"No" => "نەخێر",
-"Yes" => "بەڵێ",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "لابردن",
-"Share" => "هاوبەشی کردن",
-"Error" => "هه‌ڵه",
-"Warning" => "ئاگاداری",
-"Add" => "زیادکردن",
-"Username" => "ناوی به‌کارهێنه‌ر",
-"New password" => "وشەی نهێنی نوێ",
-"Users" => "به‌كارهێنه‌ر",
-"Apps" => "به‌رنامه‌كان",
-"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
-"Help" => "یارمەتی",
-"Password" => "وشەی تێپەربو",
-"Data folder" => "زانیاری فۆڵده‌ر",
-"Database user" => "به‌كارهێنه‌ری داتابه‌یس",
-"Database password" => "وشه‌ی نهێنی داتا به‌یس",
-"Database name" => "ناوی داتابه‌یس",
-"Database host" => "هۆستی داتابه‌یس",
-"Finish setup" => "كۆتایی هات ده‌ستكاریه‌كان",
-"Log out" => "چوونەدەرەوە"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
new file mode 100644
index 00000000000..c5e76d21f53
--- /dev/null
+++ b/core/l10n/lb.js
@@ -0,0 +1,121 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "Maintenance Modus ass un",
+    "Turned off maintenance mode" : "Maintenance Modus ass aus",
+    "Updated database" : "Datebank ass geupdate ginn",
+    "No image or file provided" : "Kee Bild oder Fichier uginn",
+    "Unknown filetype" : "Onbekannten Fichier Typ",
+    "Invalid image" : "Ongülteg d'Bild",
+    "Sunday" : "Sonndeg",
+    "Monday" : "Méindeg",
+    "Tuesday" : "Dënschdeg",
+    "Wednesday" : "Mëttwoch",
+    "Thursday" : "Donneschdeg",
+    "Friday" : "Freideg",
+    "Saturday" : "Samschdeg",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mäerz",
+    "April" : "Abrëll",
+    "May" : "Mee",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Astellungen",
+    "File" : "Fichier",
+    "Folder" : "Dossier",
+    "Saving..." : "Speicheren...",
+    "Reset password" : "Passwuert zréck setzen",
+    "No" : "Nee",
+    "Yes" : "Jo",
+    "Choose" : "Auswielen",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Which files do you want to keep?" : "Weieng Fichieren wëlls de gär behalen?",
+    "Cancel" : "Ofbriechen",
+    "Continue" : "Weider",
+    "(all selected)" : "(all ausgewielt)",
+    "({count} selected)" : "({count} ausgewielt)",
+    "Shared" : "Gedeelt",
+    "Share" : "Deelen",
+    "Error" : "Feeler",
+    "Error while sharing" : "Feeler beim Deelen",
+    "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
+    "Error while changing permissions" : "Feeler beim Ännere vun de Rechter",
+    "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
+    "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
+    "Share link" : "Link deelen",
+    "Password protect" : "Passwuertgeschützt",
+    "Allow Public Upload" : "Ëffentlechen Upload erlaaben",
+    "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 in {item} with {user}" : "Gedeelt an {item} mat {user}",
+    "Unshare" : "Net méi deelen",
+    "notify by email" : "via e-mail Bescheed ginn",
+    "can share" : "kann deelen",
+    "can edit" : "kann änneren",
+    "access control" : "Zougrëffskontroll",
+    "create" : "erstellen",
+    "update" : "aktualiséieren",
+    "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",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Den Typ vum Object ass net uginn.",
+    "Enter new" : "Gëff nei an",
+    "Delete" : "Läschen",
+    "Add" : "Dobäisetzen",
+    "Edit tags" : "Tags editéieren",
+    "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+    "%s password reset" : "%s Passwuert ass nei gesat",
+    "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
+    "Username" : "Benotzernumm",
+    "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?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
+    "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen",
+    "Reset" : "Zeréck setzen",
+    "New password" : "Neit Passwuert",
+    "Personal" : "Perséinlech",
+    "Users" : "Benotzer",
+    "Apps" : "Applikatiounen",
+    "Admin" : "Admin",
+    "Help" : "Hëllef",
+    "Error tagging" : "Fehler beim Taggen",
+    "Error untagging" : "Fehler beim Tag läschen",
+    "Access forbidden" : "Zougrëff net erlaabt",
+    "Cheers!" : "Prost!",
+    "Security Warning" : "Sécherheets-Warnung",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
+    "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
+    "Password" : "Passwuert",
+    "Data folder" : "Daten-Dossier",
+    "Configure the database" : "D'Datebank konfiguréieren",
+    "Database user" : "Datebank-Benotzer",
+    "Database password" : "Datebank-Passwuert",
+    "Database name" : "Datebank Numm",
+    "Database tablespace" : "Tabelle-Plaz vun der Datebank",
+    "Database host" : "Datebank-Server",
+    "Finish setup" : "Installatioun ofschléissen",
+    "Finishing …" : "Schléissen of ...",
+    "%s is available. Get more information on how to update." : "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft.",
+    "Log out" : "Ofmellen",
+    "remember" : "verhalen",
+    "Log in" : "Umellen",
+    "Alternative Logins" : "Alternativ Umeldungen",
+    "Thank you for your patience." : "Merci fir deng Gedold."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
new file mode 100644
index 00000000000..58f01166dfd
--- /dev/null
+++ b/core/l10n/lb.json
@@ -0,0 +1,119 @@
+{ "translations": {
+    "Turned on maintenance mode" : "Maintenance Modus ass un",
+    "Turned off maintenance mode" : "Maintenance Modus ass aus",
+    "Updated database" : "Datebank ass geupdate ginn",
+    "No image or file provided" : "Kee Bild oder Fichier uginn",
+    "Unknown filetype" : "Onbekannten Fichier Typ",
+    "Invalid image" : "Ongülteg d'Bild",
+    "Sunday" : "Sonndeg",
+    "Monday" : "Méindeg",
+    "Tuesday" : "Dënschdeg",
+    "Wednesday" : "Mëttwoch",
+    "Thursday" : "Donneschdeg",
+    "Friday" : "Freideg",
+    "Saturday" : "Samschdeg",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mäerz",
+    "April" : "Abrëll",
+    "May" : "Mee",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Dezember",
+    "Settings" : "Astellungen",
+    "File" : "Fichier",
+    "Folder" : "Dossier",
+    "Saving..." : "Speicheren...",
+    "Reset password" : "Passwuert zréck setzen",
+    "No" : "Nee",
+    "Yes" : "Jo",
+    "Choose" : "Auswielen",
+    "Ok" : "OK",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Which files do you want to keep?" : "Weieng Fichieren wëlls de gär behalen?",
+    "Cancel" : "Ofbriechen",
+    "Continue" : "Weider",
+    "(all selected)" : "(all ausgewielt)",
+    "({count} selected)" : "({count} ausgewielt)",
+    "Shared" : "Gedeelt",
+    "Share" : "Deelen",
+    "Error" : "Feeler",
+    "Error while sharing" : "Feeler beim Deelen",
+    "Error while unsharing" : "Feeler beim Annuléiere vum Deelen",
+    "Error while changing permissions" : "Feeler beim Ännere vun de Rechter",
+    "Shared with you and the group {group} by {owner}" : "Gedeelt mat dir an der Grupp {group} vum {owner}",
+    "Shared with you by {owner}" : "Gedeelt mat dir vum {owner}",
+    "Share link" : "Link deelen",
+    "Password protect" : "Passwuertgeschützt",
+    "Allow Public Upload" : "Ëffentlechen Upload erlaaben",
+    "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 in {item} with {user}" : "Gedeelt an {item} mat {user}",
+    "Unshare" : "Net méi deelen",
+    "notify by email" : "via e-mail Bescheed ginn",
+    "can share" : "kann deelen",
+    "can edit" : "kann änneren",
+    "access control" : "Zougrëffskontroll",
+    "create" : "erstellen",
+    "update" : "aktualiséieren",
+    "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",
+    "Warning" : "Warnung",
+    "The object type is not specified." : "Den Typ vum Object ass net uginn.",
+    "Enter new" : "Gëff nei an",
+    "Delete" : "Läschen",
+    "Add" : "Dobäisetzen",
+    "Edit tags" : "Tags editéieren",
+    "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
+    "%s password reset" : "%s Passwuert ass nei gesat",
+    "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
+    "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
+    "Username" : "Benotzernumm",
+    "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?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
+    "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen",
+    "Reset" : "Zeréck setzen",
+    "New password" : "Neit Passwuert",
+    "Personal" : "Perséinlech",
+    "Users" : "Benotzer",
+    "Apps" : "Applikatiounen",
+    "Admin" : "Admin",
+    "Help" : "Hëllef",
+    "Error tagging" : "Fehler beim Taggen",
+    "Error untagging" : "Fehler beim Tag läschen",
+    "Access forbidden" : "Zougrëff net erlaabt",
+    "Cheers!" : "Prost!",
+    "Security Warning" : "Sécherheets-Warnung",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
+    "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
+    "Password" : "Passwuert",
+    "Data folder" : "Daten-Dossier",
+    "Configure the database" : "D'Datebank konfiguréieren",
+    "Database user" : "Datebank-Benotzer",
+    "Database password" : "Datebank-Passwuert",
+    "Database name" : "Datebank Numm",
+    "Database tablespace" : "Tabelle-Plaz vun der Datebank",
+    "Database host" : "Datebank-Server",
+    "Finish setup" : "Installatioun ofschléissen",
+    "Finishing …" : "Schléissen of ...",
+    "%s is available. Get more information on how to update." : "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft.",
+    "Log out" : "Ofmellen",
+    "remember" : "verhalen",
+    "Log in" : "Umellen",
+    "Alternative Logins" : "Alternativ Umeldungen",
+    "Thank you for your patience." : "Merci fir deng Gedold."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
deleted file mode 100644
index e448a2b500d..00000000000
--- a/core/l10n/lb.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "Maintenance Modus ass un",
-"Turned off maintenance mode" => "Maintenance Modus ass aus",
-"Updated database" => "Datebank ass geupdate ginn",
-"No image or file provided" => "Kee Bild oder Fichier uginn",
-"Unknown filetype" => "Onbekannten Fichier Typ",
-"Invalid image" => "Ongülteg d'Bild",
-"Sunday" => "Sonndeg",
-"Monday" => "Méindeg",
-"Tuesday" => "Dënschdeg",
-"Wednesday" => "Mëttwoch",
-"Thursday" => "Donneschdeg",
-"Friday" => "Freideg",
-"Saturday" => "Samschdeg",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mäerz",
-"April" => "Abrëll",
-"May" => "Mee",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Dezember",
-"Settings" => "Astellungen",
-"File" => "Fichier",
-"Folder" => "Dossier",
-"Saving..." => "Speicheren...",
-"Reset password" => "Passwuert zréck setzen",
-"No" => "Nee",
-"Yes" => "Jo",
-"Choose" => "Auswielen",
-"Ok" => "OK",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Which files do you want to keep?" => "Weieng Fichieren wëlls de gär behalen?",
-"Cancel" => "Ofbriechen",
-"Continue" => "Weider",
-"(all selected)" => "(all ausgewielt)",
-"({count} selected)" => "({count} ausgewielt)",
-"Shared" => "Gedeelt",
-"Share" => "Deelen",
-"Error" => "Feeler",
-"Error while sharing" => "Feeler beim Deelen",
-"Error while unsharing" => "Feeler beim Annuléiere vum Deelen",
-"Error while changing permissions" => "Feeler beim Ännere vun de Rechter",
-"Shared with you and the group {group} by {owner}" => "Gedeelt mat dir an der Grupp {group} vum {owner}",
-"Shared with you by {owner}" => "Gedeelt mat dir vum {owner}",
-"Share link" => "Link deelen",
-"Password protect" => "Passwuertgeschützt",
-"Allow Public Upload" => "Ëffentlechen Upload erlaaben",
-"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 in {item} with {user}" => "Gedeelt an {item} mat {user}",
-"Unshare" => "Net méi deelen",
-"notify by email" => "via e-mail Bescheed ginn",
-"can share" => "kann deelen",
-"can edit" => "kann änneren",
-"access control" => "Zougrëffskontroll",
-"create" => "erstellen",
-"update" => "aktualiséieren",
-"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",
-"Warning" => "Warnung",
-"The object type is not specified." => "Den Typ vum Object ass net uginn.",
-"Enter new" => "Gëff nei an",
-"Delete" => "Läschen",
-"Add" => "Dobäisetzen",
-"Edit tags" => "Tags editéieren",
-"The update was successful. Redirecting you to ownCloud now." => "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
-"%s password reset" => "%s Passwuert ass nei gesat",
-"Use the following link to reset your password: {link}" => "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
-"You will receive a link to reset your password via Email." => "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
-"Username" => "Benotzernumm",
-"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?" => "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
-"Yes, I really want to reset my password now" => "Jo, ech wëll mäi Passwuert elo zrécksetzen",
-"Reset" => "Zeréck setzen",
-"New password" => "Neit Passwuert",
-"Personal" => "Perséinlech",
-"Users" => "Benotzer",
-"Apps" => "Applikatiounen",
-"Admin" => "Admin",
-"Help" => "Hëllef",
-"Error tagging" => "Fehler beim Taggen",
-"Error untagging" => "Fehler beim Tag läschen",
-"Access forbidden" => "Zougrëff net erlaabt",
-"Cheers!" => "Prost!",
-"Security Warning" => "Sécherheets-Warnung",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Deng PHP-Versioun ass verwonnbar duerch d'NULL-Byte-Attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
-"Create an <strong>admin account</strong>" => "En <strong>Admin-Account</strong> uleeën",
-"Password" => "Passwuert",
-"Data folder" => "Daten-Dossier",
-"Configure the database" => "D'Datebank konfiguréieren",
-"Database user" => "Datebank-Benotzer",
-"Database password" => "Datebank-Passwuert",
-"Database name" => "Datebank Numm",
-"Database tablespace" => "Tabelle-Plaz vun der Datebank",
-"Database host" => "Datebank-Server",
-"Finish setup" => "Installatioun ofschléissen",
-"Finishing …" => "Schléissen of ...",
-"%s is available. Get more information on how to update." => "%s ass verfügbar. Kréi méi Informatiounen doriwwer wéi d'Aktualiséierung ofleeft.",
-"Log out" => "Ofmellen",
-"remember" => "verhalen",
-"Log in" => "Umellen",
-"Alternative Logins" => "Alternativ Umeldungen",
-"Thank you for your patience." => "Merci fir deng Gedold."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
new file mode 100644
index 00000000000..e407dcafa21
--- /dev/null
+++ b/core/l10n/lt_LT.js
@@ -0,0 +1,148 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
+    "Turned on maintenance mode" : "Įjungta priežiūros veiksena",
+    "Turned off maintenance mode" : "Išjungta priežiūros veiksena",
+    "Updated database" : "Atnaujinta duomenų bazė",
+    "No image or file provided" : "Nenurodytas paveikslėlis ar failas",
+    "Unknown filetype" : "Nežinomas failo tipas",
+    "Invalid image" : "Netinkamas paveikslėlis",
+    "No temporary profile picture available, try again" : "Nėra laikino profilio paveikslėlio, bandykite dar kartą",
+    "No crop data provided" : "Nenurodyti apkirpimo duomenys",
+    "Sunday" : "Sekmadienis",
+    "Monday" : "Pirmadienis",
+    "Tuesday" : "Antradienis",
+    "Wednesday" : "Trečiadienis",
+    "Thursday" : "Ketvirtadienis",
+    "Friday" : "Penktadienis",
+    "Saturday" : "Šeštadienis",
+    "January" : "Sausis",
+    "February" : "Vasaris",
+    "March" : "Kovas",
+    "April" : "Balandis",
+    "May" : "Gegužė",
+    "June" : "Birželis",
+    "July" : "Liepa",
+    "August" : "Rugpjūtis",
+    "September" : "Rugsėjis",
+    "October" : "Spalis",
+    "November" : "Lapkritis",
+    "December" : "Gruodis",
+    "Settings" : "Nustatymai",
+    "File" : "Failas",
+    "Folder" : "Katalogas",
+    "Saving..." : "Saugoma...",
+    "Reset password" : "Atkurti slaptažodį",
+    "No" : "Ne",
+    "Yes" : "Taip",
+    "Choose" : "Pasirinkite",
+    "Error loading file picker template: {error}" : "Klaida įkeliant failo parinkimo ruošinį: {error}",
+    "Ok" : "Gerai",
+    "Error loading message template: {error}" : "Klaida įkeliant žinutės ruošinį: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"],
+    "One file conflict" : "Vienas failo konfliktas",
+    "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",
+    "Continue" : "Tęsti",
+    "(all selected)" : "(visi pažymėti)",
+    "({count} selected)" : "({count} pažymėtų)",
+    "Error loading file exists template" : "Klaida įkeliant esančių failų ruošinį",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+    "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." : "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
+    "Shared" : "Dalinamasi",
+    "Share" : "Dalintis",
+    "Error" : "Klaida",
+    "Error while sharing" : "Klaida, dalijimosi metu",
+    "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
+    "Error while changing permissions" : "Klaida, keičiant privilegijas",
+    "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
+    "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
+    "Share with user or group …" : "Dalintis su vartotoju arba grupe...",
+    "Share link" : "Dalintis nuoroda",
+    "Password protect" : "Apsaugotas slaptažodžiu",
+    "Allow Public Upload" : "Leisti viešą įkėlimą",
+    "Email link to person" : "Nusiųsti nuorodą paštu",
+    "Send" : "Siųsti",
+    "Set expiration date" : "Nustatykite galiojimo laiką",
+    "Expiration date" : "Galiojimo laikas",
+    "group" : "grupė",
+    "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",
+    "can share" : "gali dalintis",
+    "can edit" : "gali redaguoti",
+    "access control" : "priėjimo kontrolė",
+    "create" : "sukurti",
+    "update" : "atnaujinti",
+    "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",
+    "Warning" : "Įspėjimas",
+    "The object type is not specified." : "Objekto tipas nenurodytas.",
+    "Enter new" : "Įveskite naują",
+    "Delete" : "Ištrinti",
+    "Add" : "Pridėti",
+    "Edit tags" : "Redaguoti žymes",
+    "Error loading dialog template: {error}" : "Klaida įkeliant dialogo ruošinį: {error}",
+    "No tags selected for deletion." : "Trynimui nepasirinkta jokia žymė.",
+    "Please reload the page." : "Prašome perkrauti puslapį.",
+    "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
+    "%s password reset" : "%s slaptažodžio atnaujinimas",
+    "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
+    "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
+    "Username" : "Prisijungimo vardas",
+    "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?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
+    "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį",
+    "Reset" : "Atstatyti",
+    "New password" : "Naujas slaptažodis",
+    "Personal" : "Asmeniniai",
+    "Users" : "Vartotojai",
+    "Apps" : "Programos",
+    "Admin" : "Administravimas",
+    "Help" : "Pagalba",
+    "Error loading tags" : "Klaida įkeliant žymes",
+    "Tag already exists" : "Žymė jau egzistuoja",
+    "Error deleting tag(s)" : "Klaida trinant žymę(-es)",
+    "Error tagging" : "Klaida pridedant žymę",
+    "Error untagging" : "Klaida šalinant žymę",
+    "Error favoriting" : "Klaida įtraukiant į mėgstamus.",
+    "Error unfavoriting" : "Klaida pašalinant iš mėgstamų.",
+    "Access forbidden" : "Priėjimas draudžiamas",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
+    "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
+    "Cheers!" : "Sveikinimai!",
+    "Security Warning" : "Saugumo pranešimas",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
+    "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
+    "Password" : "Slaptažodis",
+    "Data folder" : "Duomenų katalogas",
+    "Configure the database" : "Nustatyti duomenų bazę",
+    "Database user" : "Duomenų bazės vartotojas",
+    "Database password" : "Duomenų bazės slaptažodis",
+    "Database name" : "Duomenų bazės pavadinimas",
+    "Database tablespace" : "Duomenų bazės loginis saugojimas",
+    "Database host" : "Duomenų bazės serveris",
+    "Finish setup" : "Baigti diegimą",
+    "Finishing …" : "Baigiama ...",
+    "%s is available. Get more information on how to update." : "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
+    "Log out" : "Atsijungti",
+    "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.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
+    "Thank you for your patience." : "Dėkojame už jūsų kantrumą."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
new file mode 100644
index 00000000000..97dafb6fa00
--- /dev/null
+++ b/core/l10n/lt_LT.json
@@ -0,0 +1,146 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
+    "Turned on maintenance mode" : "Įjungta priežiūros veiksena",
+    "Turned off maintenance mode" : "Išjungta priežiūros veiksena",
+    "Updated database" : "Atnaujinta duomenų bazė",
+    "No image or file provided" : "Nenurodytas paveikslėlis ar failas",
+    "Unknown filetype" : "Nežinomas failo tipas",
+    "Invalid image" : "Netinkamas paveikslėlis",
+    "No temporary profile picture available, try again" : "Nėra laikino profilio paveikslėlio, bandykite dar kartą",
+    "No crop data provided" : "Nenurodyti apkirpimo duomenys",
+    "Sunday" : "Sekmadienis",
+    "Monday" : "Pirmadienis",
+    "Tuesday" : "Antradienis",
+    "Wednesday" : "Trečiadienis",
+    "Thursday" : "Ketvirtadienis",
+    "Friday" : "Penktadienis",
+    "Saturday" : "Šeštadienis",
+    "January" : "Sausis",
+    "February" : "Vasaris",
+    "March" : "Kovas",
+    "April" : "Balandis",
+    "May" : "Gegužė",
+    "June" : "Birželis",
+    "July" : "Liepa",
+    "August" : "Rugpjūtis",
+    "September" : "Rugsėjis",
+    "October" : "Spalis",
+    "November" : "Lapkritis",
+    "December" : "Gruodis",
+    "Settings" : "Nustatymai",
+    "File" : "Failas",
+    "Folder" : "Katalogas",
+    "Saving..." : "Saugoma...",
+    "Reset password" : "Atkurti slaptažodį",
+    "No" : "Ne",
+    "Yes" : "Taip",
+    "Choose" : "Pasirinkite",
+    "Error loading file picker template: {error}" : "Klaida įkeliant failo parinkimo ruošinį: {error}",
+    "Ok" : "Gerai",
+    "Error loading message template: {error}" : "Klaida įkeliant žinutės ruošinį: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"],
+    "One file conflict" : "Vienas failo konfliktas",
+    "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",
+    "Continue" : "Tęsti",
+    "(all selected)" : "(visi pažymėti)",
+    "({count} selected)" : "({count} pažymėtų)",
+    "Error loading file exists template" : "Klaida įkeliant esančių failų ruošinį",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
+    "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." : "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
+    "Shared" : "Dalinamasi",
+    "Share" : "Dalintis",
+    "Error" : "Klaida",
+    "Error while sharing" : "Klaida, dalijimosi metu",
+    "Error while unsharing" : "Klaida, kai atšaukiamas dalijimasis",
+    "Error while changing permissions" : "Klaida, keičiant privilegijas",
+    "Shared with you and the group {group} by {owner}" : "Pasidalino su Jumis ir {group} grupe {owner}",
+    "Shared with you by {owner}" : "Pasidalino su Jumis {owner}",
+    "Share with user or group …" : "Dalintis su vartotoju arba grupe...",
+    "Share link" : "Dalintis nuoroda",
+    "Password protect" : "Apsaugotas slaptažodžiu",
+    "Allow Public Upload" : "Leisti viešą įkėlimą",
+    "Email link to person" : "Nusiųsti nuorodą paštu",
+    "Send" : "Siųsti",
+    "Set expiration date" : "Nustatykite galiojimo laiką",
+    "Expiration date" : "Galiojimo laikas",
+    "group" : "grupė",
+    "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",
+    "can share" : "gali dalintis",
+    "can edit" : "gali redaguoti",
+    "access control" : "priėjimo kontrolė",
+    "create" : "sukurti",
+    "update" : "atnaujinti",
+    "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",
+    "Warning" : "Įspėjimas",
+    "The object type is not specified." : "Objekto tipas nenurodytas.",
+    "Enter new" : "Įveskite naują",
+    "Delete" : "Ištrinti",
+    "Add" : "Pridėti",
+    "Edit tags" : "Redaguoti žymes",
+    "Error loading dialog template: {error}" : "Klaida įkeliant dialogo ruošinį: {error}",
+    "No tags selected for deletion." : "Trynimui nepasirinkta jokia žymė.",
+    "Please reload the page." : "Prašome perkrauti puslapį.",
+    "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
+    "%s password reset" : "%s slaptažodžio atnaujinimas",
+    "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
+    "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
+    "Username" : "Prisijungimo vardas",
+    "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?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
+    "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį",
+    "Reset" : "Atstatyti",
+    "New password" : "Naujas slaptažodis",
+    "Personal" : "Asmeniniai",
+    "Users" : "Vartotojai",
+    "Apps" : "Programos",
+    "Admin" : "Administravimas",
+    "Help" : "Pagalba",
+    "Error loading tags" : "Klaida įkeliant žymes",
+    "Tag already exists" : "Žymė jau egzistuoja",
+    "Error deleting tag(s)" : "Klaida trinant žymę(-es)",
+    "Error tagging" : "Klaida pridedant žymę",
+    "Error untagging" : "Klaida šalinant žymę",
+    "Error favoriting" : "Klaida įtraukiant į mėgstamus.",
+    "Error unfavoriting" : "Klaida pašalinant iš mėgstamų.",
+    "Access forbidden" : "Priėjimas draudžiamas",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
+    "The share will expire on %s." : "Bendrinimo laikas baigsis %s.",
+    "Cheers!" : "Sveikinimai!",
+    "Security Warning" : "Saugumo pranešimas",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
+    "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
+    "Password" : "Slaptažodis",
+    "Data folder" : "Duomenų katalogas",
+    "Configure the database" : "Nustatyti duomenų bazę",
+    "Database user" : "Duomenų bazės vartotojas",
+    "Database password" : "Duomenų bazės slaptažodis",
+    "Database name" : "Duomenų bazės pavadinimas",
+    "Database tablespace" : "Duomenų bazės loginis saugojimas",
+    "Database host" : "Duomenų bazės serveris",
+    "Finish setup" : "Baigti diegimą",
+    "Finishing …" : "Baigiama ...",
+    "%s is available. Get more information on how to update." : "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
+    "Log out" : "Atsijungti",
+    "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.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
+    "Thank you for your patience." : "Dėkojame už jūsų kantrumą."
+},"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/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
deleted file mode 100644
index d3b98951506..00000000000
--- a/core/l10n/lt_LT.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nepavyko nusiųsti el. pašto šiems naudotojams: %s ",
-"Turned on maintenance mode" => "Įjungta priežiūros veiksena",
-"Turned off maintenance mode" => "Išjungta priežiūros veiksena",
-"Updated database" => "Atnaujinta duomenų bazė",
-"No image or file provided" => "Nenurodytas paveikslėlis ar failas",
-"Unknown filetype" => "Nežinomas failo tipas",
-"Invalid image" => "Netinkamas paveikslėlis",
-"No temporary profile picture available, try again" => "Nėra laikino profilio paveikslėlio, bandykite dar kartą",
-"No crop data provided" => "Nenurodyti apkirpimo duomenys",
-"Sunday" => "Sekmadienis",
-"Monday" => "Pirmadienis",
-"Tuesday" => "Antradienis",
-"Wednesday" => "Trečiadienis",
-"Thursday" => "Ketvirtadienis",
-"Friday" => "Penktadienis",
-"Saturday" => "Šeštadienis",
-"January" => "Sausis",
-"February" => "Vasaris",
-"March" => "Kovas",
-"April" => "Balandis",
-"May" => "Gegužė",
-"June" => "Birželis",
-"July" => "Liepa",
-"August" => "Rugpjūtis",
-"September" => "Rugsėjis",
-"October" => "Spalis",
-"November" => "Lapkritis",
-"December" => "Gruodis",
-"Settings" => "Nustatymai",
-"File" => "Failas",
-"Folder" => "Katalogas",
-"Saving..." => "Saugoma...",
-"Reset password" => "Atkurti slaptažodį",
-"No" => "Ne",
-"Yes" => "Taip",
-"Choose" => "Pasirinkite",
-"Error loading file picker template: {error}" => "Klaida įkeliant failo parinkimo ruošinį: {error}",
-"Ok" => "Gerai",
-"Error loading message template: {error}" => "Klaida įkeliant žinutės ruošinį: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} failas konfliktuoja","{count} failai konfliktuoja","{count} failų konfliktų"),
-"One file conflict" => "Vienas failo konfliktas",
-"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",
-"Continue" => "Tęsti",
-"(all selected)" => "(visi pažymėti)",
-"({count} selected)" => "({count} pažymėtų)",
-"Error loading file exists template" => "Klaida įkeliant esančių failų ruošinį",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsų serveris nėra tvarkingai nustatytas leisti failų sinchronizaciją, nes WebDAV sąsaja panašu, kad yra sugadinta.",
-"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." => "Šis serveris neturi veikiančio ryšio. Tai reiškia, kas kai kurios funkcijos kaip išorinės saugyklos prijungimas, perspėjimai apie atnaujinimus ar trečių šalių programų įdiegimas neveikia. Failų pasiekimas iš kitur ir pranešimų siuntimas el. paštu gali taip pat neveikti. Rekomenduojame įjungti interneto ryšį šiame serveryje, jei norite naudoti visas funkcijas.",
-"Shared" => "Dalinamasi",
-"Share" => "Dalintis",
-"Error" => "Klaida",
-"Error while sharing" => "Klaida, dalijimosi metu",
-"Error while unsharing" => "Klaida, kai atšaukiamas dalijimasis",
-"Error while changing permissions" => "Klaida, keičiant privilegijas",
-"Shared with you and the group {group} by {owner}" => "Pasidalino su Jumis ir {group} grupe {owner}",
-"Shared with you by {owner}" => "Pasidalino su Jumis {owner}",
-"Share with user or group …" => "Dalintis su vartotoju arba grupe...",
-"Share link" => "Dalintis nuoroda",
-"Password protect" => "Apsaugotas slaptažodžiu",
-"Allow Public Upload" => "Leisti viešą įkėlimą",
-"Email link to person" => "Nusiųsti nuorodą paštu",
-"Send" => "Siųsti",
-"Set expiration date" => "Nustatykite galiojimo laiką",
-"Expiration date" => "Galiojimo laikas",
-"group" => "grupė",
-"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",
-"can share" => "gali dalintis",
-"can edit" => "gali redaguoti",
-"access control" => "priėjimo kontrolė",
-"create" => "sukurti",
-"update" => "atnaujinti",
-"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",
-"Warning" => "Įspėjimas",
-"The object type is not specified." => "Objekto tipas nenurodytas.",
-"Enter new" => "Įveskite naują",
-"Delete" => "Ištrinti",
-"Add" => "Pridėti",
-"Edit tags" => "Redaguoti žymes",
-"Error loading dialog template: {error}" => "Klaida įkeliant dialogo ruošinį: {error}",
-"No tags selected for deletion." => "Trynimui nepasirinkta jokia žymė.",
-"Please reload the page." => "Prašome perkrauti puslapį.",
-"The update was successful. Redirecting you to ownCloud now." => "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
-"%s password reset" => "%s slaptažodžio atnaujinimas",
-"Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
-"You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
-"Username" => "Prisijungimo vardas",
-"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?" => "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
-"Yes, I really want to reset my password now" => "Taip, aš tikrai noriu atnaujinti slaptažodį",
-"Reset" => "Atstatyti",
-"New password" => "Naujas slaptažodis",
-"Personal" => "Asmeniniai",
-"Users" => "Vartotojai",
-"Apps" => "Programos",
-"Admin" => "Administravimas",
-"Help" => "Pagalba",
-"Error loading tags" => "Klaida įkeliant žymes",
-"Tag already exists" => "Žymė jau egzistuoja",
-"Error deleting tag(s)" => "Klaida trinant žymę(-es)",
-"Error tagging" => "Klaida pridedant žymę",
-"Error untagging" => "Klaida šalinant žymę",
-"Error favoriting" => "Klaida įtraukiant į mėgstamus.",
-"Error unfavoriting" => "Klaida pašalinant iš mėgstamų.",
-"Access forbidden" => "Priėjimas draudžiamas",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Labas,\n\nInformuojame, kad %s pasidalino su Jumis %s.\nPažiūrėti tai: %s\n",
-"The share will expire on %s." => "Bendrinimo laikas baigsis %s.",
-"Cheers!" => "Sveikinimai!",
-"Security Warning" => "Saugumo pranešimas",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsų PHP versija yra pažeidžiama prieš NULL Byte ataką (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Prašome atnaujinti savo PHP, kad saugiai naudoti %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
-"Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
-"Password" => "Slaptažodis",
-"Data folder" => "Duomenų katalogas",
-"Configure the database" => "Nustatyti duomenų bazę",
-"Database user" => "Duomenų bazės vartotojas",
-"Database password" => "Duomenų bazės slaptažodis",
-"Database name" => "Duomenų bazės pavadinimas",
-"Database tablespace" => "Duomenų bazės loginis saugojimas",
-"Database host" => "Duomenų bazės serveris",
-"Finish setup" => "Baigti diegimą",
-"Finishing …" => "Baigiama ...",
-"%s is available. Get more information on how to update." => "%s yra prieinama. Gaukite daugiau informacijos apie atnaujinimą.",
-"Log out" => "Atsijungti",
-"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.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Susisiekite su savo sistemos administratoriumi jei šis pranešimas nedingsta arba jei jis pasirodė netikėtai.",
-"Thank you for your patience." => "Dėkojame už jūsų kantrumą."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
new file mode 100644
index 00000000000..b075199d180
--- /dev/null
+++ b/core/l10n/lv.js
@@ -0,0 +1,103 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Svētdiena",
+    "Monday" : "Pirmdiena",
+    "Tuesday" : "Otrdiena",
+    "Wednesday" : "Trešdiena",
+    "Thursday" : "Ceturtdiena",
+    "Friday" : "Piektdiena",
+    "Saturday" : "Sestdiena",
+    "January" : "Janvāris",
+    "February" : "Februāris",
+    "March" : "Marts",
+    "April" : "Aprīlis",
+    "May" : "Maijs",
+    "June" : "Jūnijs",
+    "July" : "Jūlijs",
+    "August" : "Augusts",
+    "September" : "Septembris",
+    "October" : "Oktobris",
+    "November" : "Novembris",
+    "December" : "Decembris",
+    "Settings" : "Iestatījumi",
+    "Folder" : "Mape",
+    "Saving..." : "Saglabā...",
+    "Reset password" : "Mainīt paroli",
+    "No" : "Nē",
+    "Yes" : "Jā",
+    "Choose" : "Izvēlieties",
+    "Ok" : "Labi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "New Files" : "Jaunās datnes",
+    "Cancel" : "Atcelt",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
+    "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." : "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
+    "Shared" : "Kopīgs",
+    "Share" : "Dalīties",
+    "Error" : "Kļūda",
+    "Error while sharing" : "Kļūda, daloties",
+    "Error while unsharing" : "Kļūda, beidzot dalīties",
+    "Error while changing permissions" : "Kļūda, mainot atļaujas",
+    "Shared with you and the group {group} by {owner}" : "{owner} dalījās ar jums un grupu {group}",
+    "Shared with you by {owner}" : "{owner} dalījās ar jums",
+    "Password protect" : "Aizsargāt ar paroli",
+    "Allow Public Upload" : "Ļaut publisko augšupielādi.",
+    "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 in {item} with {user}" : "Dalījās ar {item} ar {user}",
+    "Unshare" : "Pārtraukt dalīšanos",
+    "can edit" : "var rediģēt",
+    "access control" : "piekļuves vadība",
+    "create" : "izveidot",
+    "update" : "atjaunināt",
+    "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",
+    "Warning" : "Brīdinājums",
+    "The object type is not specified." : "Nav norādīts objekta tips.",
+    "Delete" : "Dzēst",
+    "Add" : "Pievienot",
+    "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
+    "%s password reset" : "%s paroles maiņa",
+    "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
+    "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
+    "Username" : "Lietotājvārds",
+    "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?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
+    "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli",
+    "New password" : "Jauna parole",
+    "Personal" : "Personīgi",
+    "Users" : "Lietotāji",
+    "Apps" : "Lietotnes",
+    "Admin" : "Administratori",
+    "Help" : "Palīdzība",
+    "Access forbidden" : "Pieeja ir liegta",
+    "Security Warning" : "Brīdinājums par drošību",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
+    "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Password" : "Parole",
+    "Data folder" : "Datu mape",
+    "Configure the database" : "Konfigurēt datubāzi",
+    "Database user" : "Datubāzes lietotājs",
+    "Database password" : "Datubāzes parole",
+    "Database name" : "Datubāzes nosaukums",
+    "Database tablespace" : "Datubāzes tabulas telpa",
+    "Database host" : "Datubāzes serveris",
+    "Finish setup" : "Pabeigt iestatīšanu",
+    "%s is available. Get more information on how to update." : "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
+    "Log out" : "Izrakstīties",
+    "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
new file mode 100644
index 00000000000..a9eabfb9289
--- /dev/null
+++ b/core/l10n/lv.json
@@ -0,0 +1,101 @@
+{ "translations": {
+    "Sunday" : "Svētdiena",
+    "Monday" : "Pirmdiena",
+    "Tuesday" : "Otrdiena",
+    "Wednesday" : "Trešdiena",
+    "Thursday" : "Ceturtdiena",
+    "Friday" : "Piektdiena",
+    "Saturday" : "Sestdiena",
+    "January" : "Janvāris",
+    "February" : "Februāris",
+    "March" : "Marts",
+    "April" : "Aprīlis",
+    "May" : "Maijs",
+    "June" : "Jūnijs",
+    "July" : "Jūlijs",
+    "August" : "Augusts",
+    "September" : "Septembris",
+    "October" : "Oktobris",
+    "November" : "Novembris",
+    "December" : "Decembris",
+    "Settings" : "Iestatījumi",
+    "Folder" : "Mape",
+    "Saving..." : "Saglabā...",
+    "Reset password" : "Mainīt paroli",
+    "No" : "Nē",
+    "Yes" : "Jā",
+    "Choose" : "Izvēlieties",
+    "Ok" : "Labi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "New Files" : "Jaunās datnes",
+    "Cancel" : "Atcelt",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
+    "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." : "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
+    "Shared" : "Kopīgs",
+    "Share" : "Dalīties",
+    "Error" : "Kļūda",
+    "Error while sharing" : "Kļūda, daloties",
+    "Error while unsharing" : "Kļūda, beidzot dalīties",
+    "Error while changing permissions" : "Kļūda, mainot atļaujas",
+    "Shared with you and the group {group} by {owner}" : "{owner} dalījās ar jums un grupu {group}",
+    "Shared with you by {owner}" : "{owner} dalījās ar jums",
+    "Password protect" : "Aizsargāt ar paroli",
+    "Allow Public Upload" : "Ļaut publisko augšupielādi.",
+    "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 in {item} with {user}" : "Dalījās ar {item} ar {user}",
+    "Unshare" : "Pārtraukt dalīšanos",
+    "can edit" : "var rediģēt",
+    "access control" : "piekļuves vadība",
+    "create" : "izveidot",
+    "update" : "atjaunināt",
+    "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",
+    "Warning" : "Brīdinājums",
+    "The object type is not specified." : "Nav norādīts objekta tips.",
+    "Delete" : "Dzēst",
+    "Add" : "Pievienot",
+    "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
+    "%s password reset" : "%s paroles maiņa",
+    "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
+    "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
+    "Username" : "Lietotājvārds",
+    "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?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
+    "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli",
+    "New password" : "Jauna parole",
+    "Personal" : "Personīgi",
+    "Users" : "Lietotāji",
+    "Apps" : "Lietotnes",
+    "Admin" : "Administratori",
+    "Help" : "Palīdzība",
+    "Access forbidden" : "Pieeja ir liegta",
+    "Security Warning" : "Brīdinājums par drošību",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
+    "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Password" : "Parole",
+    "Data folder" : "Datu mape",
+    "Configure the database" : "Konfigurēt datubāzi",
+    "Database user" : "Datubāzes lietotājs",
+    "Database password" : "Datubāzes parole",
+    "Database name" : "Datubāzes nosaukums",
+    "Database tablespace" : "Datubāzes tabulas telpa",
+    "Database host" : "Datubāzes serveris",
+    "Finish setup" : "Pabeigt iestatīšanu",
+    "%s is available. Get more information on how to update." : "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
+    "Log out" : "Izrakstīties",
+    "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/lv.php b/core/l10n/lv.php
deleted file mode 100644
index 4ed068bf751..00000000000
--- a/core/l10n/lv.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Svētdiena",
-"Monday" => "Pirmdiena",
-"Tuesday" => "Otrdiena",
-"Wednesday" => "Trešdiena",
-"Thursday" => "Ceturtdiena",
-"Friday" => "Piektdiena",
-"Saturday" => "Sestdiena",
-"January" => "Janvāris",
-"February" => "Februāris",
-"March" => "Marts",
-"April" => "Aprīlis",
-"May" => "Maijs",
-"June" => "Jūnijs",
-"July" => "Jūlijs",
-"August" => "Augusts",
-"September" => "Septembris",
-"October" => "Oktobris",
-"November" => "Novembris",
-"December" => "Decembris",
-"Settings" => "Iestatījumi",
-"Folder" => "Mape",
-"Saving..." => "Saglabā...",
-"Reset password" => "Mainīt paroli",
-"No" => "Nē",
-"Yes" => "Jā",
-"Choose" => "Izvēlieties",
-"Ok" => "Labi",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"New Files" => "Jaunās datnes",
-"Cancel" => "Atcelt",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Jūsu serveris vēl nav pareizi iestatīts, lai ļautu sinhronizēt datnes, jo izskatās, ka WebDAV saskarne ir salauzta.",
-"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." => "Šim serverim nav savienojums ar internetu. Tas nozīmē ka nebūs tādas iespējas kā ārējo datu nesēju montēšana, paziņojumi par atjauninājumiem vai citu izstrādātāju programmu uzstādīšana. Attālināta failu piekļuve vai paziņojumu epastu sūtīšana iespējams arī nedarbosies. Ir rekomendēts iespējot interneta savienojumu lai gūtu iespēju izmantotu visus risinājumus.",
-"Shared" => "Kopīgs",
-"Share" => "Dalīties",
-"Error" => "Kļūda",
-"Error while sharing" => "Kļūda, daloties",
-"Error while unsharing" => "Kļūda, beidzot dalīties",
-"Error while changing permissions" => "Kļūda, mainot atļaujas",
-"Shared with you and the group {group} by {owner}" => "{owner} dalījās ar jums un grupu {group}",
-"Shared with you by {owner}" => "{owner} dalījās ar jums",
-"Password protect" => "Aizsargāt ar paroli",
-"Allow Public Upload" => "Ļaut publisko augšupielādi.",
-"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 in {item} with {user}" => "Dalījās ar {item} ar {user}",
-"Unshare" => "Pārtraukt dalīšanos",
-"can edit" => "var rediģēt",
-"access control" => "piekļuves vadība",
-"create" => "izveidot",
-"update" => "atjaunināt",
-"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",
-"Warning" => "Brīdinājums",
-"The object type is not specified." => "Nav norādīts objekta tips.",
-"Delete" => "Dzēst",
-"Add" => "Pievienot",
-"The update was successful. Redirecting you to ownCloud now." => "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
-"%s password reset" => "%s paroles maiņa",
-"Use the following link to reset your password: {link}" => "Izmantojiet šo saiti, lai mainītu paroli: {link}",
-"You will receive a link to reset your password via Email." => "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-"Username" => "Lietotājvārds",
-"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?" => "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
-"Yes, I really want to reset my password now" => "Jā, Es tiešām vēlos mainīt savu paroli",
-"New password" => "Jauna parole",
-"Personal" => "Personīgi",
-"Users" => "Lietotāji",
-"Apps" => "Lietotnes",
-"Admin" => "Administratori",
-"Help" => "Palīdzība",
-"Access forbidden" => "Pieeja ir liegta",
-"Security Warning" => "Brīdinājums par drošību",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Jūsu PHP ir ievainojamība pret NULL Byte uzbrukumiem (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Lūdzu atjauniniet PHP instalāciju lai varētu droši izmantot %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
-"Create an <strong>admin account</strong>" => "Izveidot <strong>administratora kontu</strong>",
-"Password" => "Parole",
-"Data folder" => "Datu mape",
-"Configure the database" => "Konfigurēt datubāzi",
-"Database user" => "Datubāzes lietotājs",
-"Database password" => "Datubāzes parole",
-"Database name" => "Datubāzes nosaukums",
-"Database tablespace" => "Datubāzes tabulas telpa",
-"Database host" => "Datubāzes serveris",
-"Finish setup" => "Pabeigt iestatīšanu",
-"%s is available. Get more information on how to update." => "%s ir pieejams. Uzziniet vairāk kā atjaunināt.",
-"Log out" => "Izrakstīties",
-"remember" => "atcerēties",
-"Log in" => "Ierakstīties",
-"Alternative Logins" => "Alternatīvās pieteikšanās"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/core/l10n/mg.js b/core/l10n/mg.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/mg.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/mg.json b/core/l10n/mg.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/mg.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/mg.php b/core/l10n/mg.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/mg.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
new file mode 100644
index 00000000000..1104f50f255
--- /dev/null
+++ b/core/l10n/mk.js
@@ -0,0 +1,131 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "Вклучен е модот за одржување",
+    "Turned off maintenance mode" : "Ислкучен е модот за одржување",
+    "Updated database" : "Базата е надградена",
+    "No image or file provided" : "Не е доставена фотографија или датотека",
+    "Unknown filetype" : "Непознат тип на датотека",
+    "Invalid image" : "Невалидна фотографија",
+    "Sunday" : "Недела",
+    "Monday" : "Понеделник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четврток",
+    "Friday" : "Петок",
+    "Saturday" : "Сабота",
+    "January" : "Јануари",
+    "February" : "Февруари",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Мај",
+    "June" : "Јуни",
+    "July" : "Јули",
+    "August" : "Август",
+    "September" : "Септември",
+    "October" : "Октомври",
+    "November" : "Ноември",
+    "December" : "Декември",
+    "Settings" : "Подесувања",
+    "Folder" : "Папка",
+    "Saving..." : "Снимам...",
+    "Reset password" : "Ресетирај лозинка",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Избери",
+    "Ok" : "Во ред",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "One file conflict" : "Конфликт со една датотека",
+    "Cancel" : "Откажи",
+    "Continue" : "Продолжи",
+    "(all selected)" : "(сите одбрани)",
+    "({count} selected)" : "({count} одбраните)",
+    "Error loading file exists template" : "Грешка при вчитување на датотеката, шаблонот постои ",
+    "Very weak password" : "Многу слаба лозинка",
+    "Weak password" : "Слаба лозинка",
+    "So-so password" : "Така така лозинка",
+    "Good password" : "Добра лозинка",
+    "Strong password" : "Јака лозинка",
+    "Shared" : "Споделен",
+    "Share" : "Сподели",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделување",
+    "Error while unsharing" : "Грешка при прекин на споделување",
+    "Error while changing permissions" : "Грешка при промена на привилегии",
+    "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}",
+    "Shared with you by {owner}" : "Споделено со Вас од {owner}",
+    "Share link" : "Сподели ја врската",
+    "Password protect" : "Заштити со лозинка",
+    "Allow Public Upload" : "Дозволи јавен аплоуд",
+    "Email link to person" : "Прати врска по е-пошта на личност",
+    "Send" : "Прати",
+    "Set expiration date" : "Постави рок на траење",
+    "Expiration date" : "Рок на траење",
+    "group" : "група",
+    "Resharing is not allowed" : "Повторно споделување не е дозволено",
+    "Shared in {item} with {user}" : "Споделено во {item} со {user}",
+    "Unshare" : "Не споделувај",
+    "notify by email" : "извести преку електронска пошта",
+    "can edit" : "може да се измени",
+    "access control" : "контрола на пристап",
+    "create" : "креирај",
+    "update" : "ажурирај",
+    "delete" : "избриши",
+    "Password protected" : "Заштитено со лозинка",
+    "Error unsetting expiration date" : "Грешка при тргање на рокот на траење",
+    "Error setting expiration date" : "Грешка при поставување на рок на траење",
+    "Sending ..." : "Праќање...",
+    "Email sent" : "Е-порака пратена",
+    "Warning" : "Предупредување",
+    "The object type is not specified." : "Не е специфициран типот на објект.",
+    "Enter new" : "Внеси нов",
+    "Delete" : "Избриши",
+    "Add" : "Додади",
+    "Edit tags" : "Уреди ги таговите",
+    "No tags selected for deletion." : "Не се селектирани тагови за бришење.",
+    "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
+    "%s password reset" : "%s ресетирање на лозинката",
+    "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
+    "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
+    "Username" : "Корисничко име",
+    "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка",
+    "Reset" : "Поништи",
+    "New password" : "Нова лозинка",
+    "Personal" : "Лично",
+    "Users" : "Корисници",
+    "Apps" : "Аппликации",
+    "Admin" : "Админ",
+    "Help" : "Помош",
+    "Error loading tags" : "Грешка при вчитување на таговите",
+    "Tag already exists" : "Тагот веќе постои",
+    "Error deleting tag(s)" : "Грешка при бришење на таго(вите)",
+    "Error tagging" : "Грешка при тагување",
+    "Error untagging" : "Грешка при отстранување на таговите",
+    "Error favoriting" : "Грешка при ",
+    "Access forbidden" : "Забранет пристап",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
+    "Cheers!" : "Поздрав!",
+    "Security Warning" : "Безбедносно предупредување",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
+    "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
+    "Password" : "Лозинка",
+    "Data folder" : "Фолдер со податоци",
+    "Configure the database" : "Конфигурирај ја базата",
+    "Database user" : "Корисник на база",
+    "Database password" : "Лозинка на база",
+    "Database name" : "Име на база",
+    "Database tablespace" : "Табела во базата на податоци",
+    "Database host" : "Сервер со база",
+    "Finish setup" : "Заврши го подесувањето",
+    "Finishing …" : "Завршувам ...",
+    "Log out" : "Одјава",
+    "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." : "Благодариме на вашето трпение."
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
new file mode 100644
index 00000000000..1301731bf95
--- /dev/null
+++ b/core/l10n/mk.json
@@ -0,0 +1,129 @@
+{ "translations": {
+    "Turned on maintenance mode" : "Вклучен е модот за одржување",
+    "Turned off maintenance mode" : "Ислкучен е модот за одржување",
+    "Updated database" : "Базата е надградена",
+    "No image or file provided" : "Не е доставена фотографија или датотека",
+    "Unknown filetype" : "Непознат тип на датотека",
+    "Invalid image" : "Невалидна фотографија",
+    "Sunday" : "Недела",
+    "Monday" : "Понеделник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четврток",
+    "Friday" : "Петок",
+    "Saturday" : "Сабота",
+    "January" : "Јануари",
+    "February" : "Февруари",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Мај",
+    "June" : "Јуни",
+    "July" : "Јули",
+    "August" : "Август",
+    "September" : "Септември",
+    "October" : "Октомври",
+    "November" : "Ноември",
+    "December" : "Декември",
+    "Settings" : "Подесувања",
+    "Folder" : "Папка",
+    "Saving..." : "Снимам...",
+    "Reset password" : "Ресетирај лозинка",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Избери",
+    "Ok" : "Во ред",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "One file conflict" : "Конфликт со една датотека",
+    "Cancel" : "Откажи",
+    "Continue" : "Продолжи",
+    "(all selected)" : "(сите одбрани)",
+    "({count} selected)" : "({count} одбраните)",
+    "Error loading file exists template" : "Грешка при вчитување на датотеката, шаблонот постои ",
+    "Very weak password" : "Многу слаба лозинка",
+    "Weak password" : "Слаба лозинка",
+    "So-so password" : "Така така лозинка",
+    "Good password" : "Добра лозинка",
+    "Strong password" : "Јака лозинка",
+    "Shared" : "Споделен",
+    "Share" : "Сподели",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка при споделување",
+    "Error while unsharing" : "Грешка при прекин на споделување",
+    "Error while changing permissions" : "Грешка при промена на привилегии",
+    "Shared with you and the group {group} by {owner}" : "Споделено со Вас и групата {group} од {owner}",
+    "Shared with you by {owner}" : "Споделено со Вас од {owner}",
+    "Share link" : "Сподели ја врската",
+    "Password protect" : "Заштити со лозинка",
+    "Allow Public Upload" : "Дозволи јавен аплоуд",
+    "Email link to person" : "Прати врска по е-пошта на личност",
+    "Send" : "Прати",
+    "Set expiration date" : "Постави рок на траење",
+    "Expiration date" : "Рок на траење",
+    "group" : "група",
+    "Resharing is not allowed" : "Повторно споделување не е дозволено",
+    "Shared in {item} with {user}" : "Споделено во {item} со {user}",
+    "Unshare" : "Не споделувај",
+    "notify by email" : "извести преку електронска пошта",
+    "can edit" : "може да се измени",
+    "access control" : "контрола на пристап",
+    "create" : "креирај",
+    "update" : "ажурирај",
+    "delete" : "избриши",
+    "Password protected" : "Заштитено со лозинка",
+    "Error unsetting expiration date" : "Грешка при тргање на рокот на траење",
+    "Error setting expiration date" : "Грешка при поставување на рок на траење",
+    "Sending ..." : "Праќање...",
+    "Email sent" : "Е-порака пратена",
+    "Warning" : "Предупредување",
+    "The object type is not specified." : "Не е специфициран типот на објект.",
+    "Enter new" : "Внеси нов",
+    "Delete" : "Избриши",
+    "Add" : "Додади",
+    "Edit tags" : "Уреди ги таговите",
+    "No tags selected for deletion." : "Не се селектирани тагови за бришење.",
+    "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
+    "%s password reset" : "%s ресетирање на лозинката",
+    "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
+    "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
+    "Username" : "Корисничко име",
+    "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка",
+    "Reset" : "Поништи",
+    "New password" : "Нова лозинка",
+    "Personal" : "Лично",
+    "Users" : "Корисници",
+    "Apps" : "Аппликации",
+    "Admin" : "Админ",
+    "Help" : "Помош",
+    "Error loading tags" : "Грешка при вчитување на таговите",
+    "Tag already exists" : "Тагот веќе постои",
+    "Error deleting tag(s)" : "Грешка при бришење на таго(вите)",
+    "Error tagging" : "Грешка при тагување",
+    "Error untagging" : "Грешка при отстранување на таговите",
+    "Error favoriting" : "Грешка при ",
+    "Access forbidden" : "Забранет пристап",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
+    "Cheers!" : "Поздрав!",
+    "Security Warning" : "Безбедносно предупредување",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
+    "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
+    "Password" : "Лозинка",
+    "Data folder" : "Фолдер со податоци",
+    "Configure the database" : "Конфигурирај ја базата",
+    "Database user" : "Корисник на база",
+    "Database password" : "Лозинка на база",
+    "Database name" : "Име на база",
+    "Database tablespace" : "Табела во базата на податоци",
+    "Database host" : "Сервер со база",
+    "Finish setup" : "Заврши го подесувањето",
+    "Finishing …" : "Завршувам ...",
+    "Log out" : "Одјава",
+    "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." : "Благодариме на вашето трпение."
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
deleted file mode 100644
index ed41f264605..00000000000
--- a/core/l10n/mk.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "Вклучен е модот за одржување",
-"Turned off maintenance mode" => "Ислкучен е модот за одржување",
-"Updated database" => "Базата е надградена",
-"No image or file provided" => "Не е доставена фотографија или датотека",
-"Unknown filetype" => "Непознат тип на датотека",
-"Invalid image" => "Невалидна фотографија",
-"Sunday" => "Недела",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четврток",
-"Friday" => "Петок",
-"Saturday" => "Сабота",
-"January" => "Јануари",
-"February" => "Февруари",
-"March" => "Март",
-"April" => "Април",
-"May" => "Мај",
-"June" => "Јуни",
-"July" => "Јули",
-"August" => "Август",
-"September" => "Септември",
-"October" => "Октомври",
-"November" => "Ноември",
-"December" => "Декември",
-"Settings" => "Подесувања",
-"Folder" => "Папка",
-"Saving..." => "Снимам...",
-"Reset password" => "Ресетирај лозинка",
-"No" => "Не",
-"Yes" => "Да",
-"Choose" => "Избери",
-"Ok" => "Во ред",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"One file conflict" => "Конфликт со една датотека",
-"Cancel" => "Откажи",
-"Continue" => "Продолжи",
-"(all selected)" => "(сите одбрани)",
-"({count} selected)" => "({count} одбраните)",
-"Error loading file exists template" => "Грешка при вчитување на датотеката, шаблонот постои ",
-"Very weak password" => "Многу слаба лозинка",
-"Weak password" => "Слаба лозинка",
-"So-so password" => "Така така лозинка",
-"Good password" => "Добра лозинка",
-"Strong password" => "Јака лозинка",
-"Shared" => "Споделен",
-"Share" => "Сподели",
-"Error" => "Грешка",
-"Error while sharing" => "Грешка при споделување",
-"Error while unsharing" => "Грешка при прекин на споделување",
-"Error while changing permissions" => "Грешка при промена на привилегии",
-"Shared with you and the group {group} by {owner}" => "Споделено со Вас и групата {group} од {owner}",
-"Shared with you by {owner}" => "Споделено со Вас од {owner}",
-"Share link" => "Сподели ја врската",
-"Password protect" => "Заштити со лозинка",
-"Allow Public Upload" => "Дозволи јавен аплоуд",
-"Email link to person" => "Прати врска по е-пошта на личност",
-"Send" => "Прати",
-"Set expiration date" => "Постави рок на траење",
-"Expiration date" => "Рок на траење",
-"group" => "група",
-"Resharing is not allowed" => "Повторно споделување не е дозволено",
-"Shared in {item} with {user}" => "Споделено во {item} со {user}",
-"Unshare" => "Не споделувај",
-"notify by email" => "извести преку електронска пошта",
-"can edit" => "може да се измени",
-"access control" => "контрола на пристап",
-"create" => "креирај",
-"update" => "ажурирај",
-"delete" => "избриши",
-"Password protected" => "Заштитено со лозинка",
-"Error unsetting expiration date" => "Грешка при тргање на рокот на траење",
-"Error setting expiration date" => "Грешка при поставување на рок на траење",
-"Sending ..." => "Праќање...",
-"Email sent" => "Е-порака пратена",
-"Warning" => "Предупредување",
-"The object type is not specified." => "Не е специфициран типот на објект.",
-"Enter new" => "Внеси нов",
-"Delete" => "Избриши",
-"Add" => "Додади",
-"Edit tags" => "Уреди ги таговите",
-"No tags selected for deletion." => "Не се селектирани тагови за бришење.",
-"The update was successful. Redirecting you to ownCloud now." => "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
-"%s password reset" => "%s ресетирање на лозинката",
-"Use the following link to reset your password: {link}" => "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
-"You will receive a link to reset your password via Email." => "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-"Username" => "Корисничко име",
-"Yes, I really want to reset my password now" => "Да, јас сега навистина сакам да ја поништам својата лозинка",
-"Reset" => "Поништи",
-"New password" => "Нова лозинка",
-"Personal" => "Лично",
-"Users" => "Корисници",
-"Apps" => "Аппликации",
-"Admin" => "Админ",
-"Help" => "Помош",
-"Error loading tags" => "Грешка при вчитување на таговите",
-"Tag already exists" => "Тагот веќе постои",
-"Error deleting tag(s)" => "Грешка при бришење на таго(вите)",
-"Error tagging" => "Грешка при тагување",
-"Error untagging" => "Грешка при отстранување на таговите",
-"Error favoriting" => "Грешка при ",
-"Access forbidden" => "Забранет пристап",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здраво,\n\nСамо да ве известам дека  %s shared %s with you.\nView it: %s\n\n",
-"Cheers!" => "Поздрав!",
-"Security Warning" => "Безбедносно предупредување",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
-"Create an <strong>admin account</strong>" => "Направете <strong>администраторска сметка</strong>",
-"Password" => "Лозинка",
-"Data folder" => "Фолдер со податоци",
-"Configure the database" => "Конфигурирај ја базата",
-"Database user" => "Корисник на база",
-"Database password" => "Лозинка на база",
-"Database name" => "Име на база",
-"Database tablespace" => "Табела во базата на податоци",
-"Database host" => "Сервер со база",
-"Finish setup" => "Заврши го подесувањето",
-"Finishing …" => "Завршувам ...",
-"Log out" => "Одјава",
-"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." => "Благодариме на вашето трпение."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/core/l10n/ml.js b/core/l10n/ml.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ml.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ml.json b/core/l10n/ml.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ml.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ml.php b/core/l10n/ml.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ml.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ml_IN.js b/core/l10n/ml_IN.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ml_IN.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ml_IN.json b/core/l10n/ml_IN.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ml_IN.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ml_IN.php b/core/l10n/ml_IN.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ml_IN.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/mn.js b/core/l10n/mn.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/mn.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/mn.json b/core/l10n/mn.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/mn.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/mn.php b/core/l10n/mn.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/mn.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
new file mode 100644
index 00000000000..e59d7eafff5
--- /dev/null
+++ b/core/l10n/ms_MY.js
@@ -0,0 +1,64 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Ahad",
+    "Monday" : "Isnin",
+    "Tuesday" : "Selasa",
+    "Wednesday" : "Rabu",
+    "Thursday" : "Khamis",
+    "Friday" : "Jumaat",
+    "Saturday" : "Sabtu",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Mac",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Jun",
+    "July" : "Julai",
+    "August" : "Ogos",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Disember",
+    "Settings" : "Tetapan",
+    "Folder" : "Folder",
+    "Saving..." : "Simpan...",
+    "Reset password" : "Penetapan semula kata laluan",
+    "No" : "Tidak",
+    "Yes" : "Ya",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "Batal",
+    "Share" : "Kongsi",
+    "Error" : "Ralat",
+    "group" : "kumpulan",
+    "can share" : "boleh berkongsi",
+    "can edit" : "boleh mengubah",
+    "Warning" : "Amaran",
+    "Delete" : "Padam",
+    "Add" : "Tambah",
+    "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
+    "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
+    "Username" : "Nama pengguna",
+    "New password" : "Kata laluan baru",
+    "Personal" : "Peribadi",
+    "Users" : "Pengguna",
+    "Apps" : "Aplikasi",
+    "Admin" : "Admin",
+    "Help" : "Bantuan",
+    "Access forbidden" : "Larangan akses",
+    "Security Warning" : "Amaran keselamatan",
+    "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
+    "Password" : "Kata laluan",
+    "Data folder" : "Fail data",
+    "Configure the database" : "Konfigurasi pangkalan data",
+    "Database user" : "Nama pengguna pangkalan data",
+    "Database password" : "Kata laluan pangkalan data",
+    "Database name" : "Nama pangkalan data",
+    "Database host" : "Hos pangkalan data",
+    "Finish setup" : "Setup selesai",
+    "Log out" : "Log keluar",
+    "remember" : "ingat",
+    "Log in" : "Log masuk"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
new file mode 100644
index 00000000000..5a18fca03d4
--- /dev/null
+++ b/core/l10n/ms_MY.json
@@ -0,0 +1,62 @@
+{ "translations": {
+    "Sunday" : "Ahad",
+    "Monday" : "Isnin",
+    "Tuesday" : "Selasa",
+    "Wednesday" : "Rabu",
+    "Thursday" : "Khamis",
+    "Friday" : "Jumaat",
+    "Saturday" : "Sabtu",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Mac",
+    "April" : "April",
+    "May" : "Mei",
+    "June" : "Jun",
+    "July" : "Julai",
+    "August" : "Ogos",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Disember",
+    "Settings" : "Tetapan",
+    "Folder" : "Folder",
+    "Saving..." : "Simpan...",
+    "Reset password" : "Penetapan semula kata laluan",
+    "No" : "Tidak",
+    "Yes" : "Ya",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "Batal",
+    "Share" : "Kongsi",
+    "Error" : "Ralat",
+    "group" : "kumpulan",
+    "can share" : "boleh berkongsi",
+    "can edit" : "boleh mengubah",
+    "Warning" : "Amaran",
+    "Delete" : "Padam",
+    "Add" : "Tambah",
+    "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
+    "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
+    "Username" : "Nama pengguna",
+    "New password" : "Kata laluan baru",
+    "Personal" : "Peribadi",
+    "Users" : "Pengguna",
+    "Apps" : "Aplikasi",
+    "Admin" : "Admin",
+    "Help" : "Bantuan",
+    "Access forbidden" : "Larangan akses",
+    "Security Warning" : "Amaran keselamatan",
+    "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
+    "Password" : "Kata laluan",
+    "Data folder" : "Fail data",
+    "Configure the database" : "Konfigurasi pangkalan data",
+    "Database user" : "Nama pengguna pangkalan data",
+    "Database password" : "Kata laluan pangkalan data",
+    "Database name" : "Nama pangkalan data",
+    "Database host" : "Hos pangkalan data",
+    "Finish setup" : "Setup selesai",
+    "Log out" : "Log keluar",
+    "remember" : "ingat",
+    "Log in" : "Log masuk"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
deleted file mode 100644
index 414b190fe6c..00000000000
--- a/core/l10n/ms_MY.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Ahad",
-"Monday" => "Isnin",
-"Tuesday" => "Selasa",
-"Wednesday" => "Rabu",
-"Thursday" => "Khamis",
-"Friday" => "Jumaat",
-"Saturday" => "Sabtu",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mac",
-"April" => "April",
-"May" => "Mei",
-"June" => "Jun",
-"July" => "Julai",
-"August" => "Ogos",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Disember",
-"Settings" => "Tetapan",
-"Folder" => "Folder",
-"Saving..." => "Simpan...",
-"Reset password" => "Penetapan semula kata laluan",
-"No" => "Tidak",
-"Yes" => "Ya",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Cancel" => "Batal",
-"Share" => "Kongsi",
-"Error" => "Ralat",
-"group" => "kumpulan",
-"can share" => "boleh berkongsi",
-"can edit" => "boleh mengubah",
-"Warning" => "Amaran",
-"Delete" => "Padam",
-"Add" => "Tambah",
-"Use the following link to reset your password: {link}" => "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
-"You will receive a link to reset your password via Email." => "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
-"Username" => "Nama pengguna",
-"New password" => "Kata laluan baru",
-"Personal" => "Peribadi",
-"Users" => "Pengguna",
-"Apps" => "Aplikasi",
-"Admin" => "Admin",
-"Help" => "Bantuan",
-"Access forbidden" => "Larangan akses",
-"Security Warning" => "Amaran keselamatan",
-"Create an <strong>admin account</strong>" => "buat <strong>akaun admin</strong>",
-"Password" => "Kata laluan",
-"Data folder" => "Fail data",
-"Configure the database" => "Konfigurasi pangkalan data",
-"Database user" => "Nama pengguna pangkalan data",
-"Database password" => "Kata laluan pangkalan data",
-"Database name" => "Nama pangkalan data",
-"Database host" => "Hos pangkalan data",
-"Finish setup" => "Setup selesai",
-"Log out" => "Log keluar",
-"remember" => "ingat",
-"Log in" => "Log masuk"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/mt_MT.js b/core/l10n/mt_MT.js
new file mode 100644
index 00000000000..67c2c3e89fc
--- /dev/null
+++ b/core/l10n/mt_MT.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""]
+},
+"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);");
diff --git a/core/l10n/mt_MT.json b/core/l10n/mt_MT.json
new file mode 100644
index 00000000000..3a66955ce40
--- /dev/null
+++ b/core/l10n/mt_MT.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""]
+},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/core/l10n/mt_MT.php b/core/l10n/mt_MT.php
deleted file mode 100644
index 98de84e3313..00000000000
--- a/core/l10n/mt_MT.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","","","")
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);";
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
new file mode 100644
index 00000000000..22634059032
--- /dev/null
+++ b/core/l10n/my_MM.js
@@ -0,0 +1,48 @@
+OC.L10N.register(
+    "core",
+    {
+    "January" : "ဇန်နဝါရီ",
+    "February" : "ဖေဖော်ဝါရီ",
+    "March" : "မတ်",
+    "April" : "ဧပြီ",
+    "May" : "မေ",
+    "June" : "ဇွန်",
+    "July" : "ဇူလိုင်",
+    "August" : "ဩဂုတ်",
+    "September" : "စက်တင်ဘာ",
+    "October" : "အောက်တိုဘာ",
+    "November" : "နိုဝင်ဘာ",
+    "December" : "ဒီဇင်ဘာ",
+    "No" : "မဟုတ်ဘူး",
+    "Yes" : "ဟုတ်",
+    "Choose" : "ရွေးချယ်",
+    "Ok" : "အိုကေ",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Set expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
+    "Expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်",
+    "Resharing is not allowed" : "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+    "can edit" : "ပြင်ဆင်နိုင်",
+    "create" : "ဖန်တီးမည်",
+    "delete" : "ဖျက်မည်",
+    "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
+    "Add" : "ပေါင်းထည့်",
+    "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
+    "Username" : "သုံးစွဲသူအမည်",
+    "New password" : "စကားဝှက်အသစ်",
+    "Users" : "သုံးစွဲသူ",
+    "Apps" : "Apps",
+    "Admin" : "အက်ဒမင်",
+    "Help" : "အကူအညီ",
+    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
+    "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+    "Password" : "စကားဝှက်",
+    "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
+    "Database user" : "Database သုံးစွဲသူ",
+    "Database password" : "Database စကားဝှက်",
+    "Database name" : "Database အမည်",
+    "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+    "remember" : "မှတ်မိစေသည်",
+    "Log in" : "ဝင်ရောက်ရန်"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
new file mode 100644
index 00000000000..f1cf06aa7bf
--- /dev/null
+++ b/core/l10n/my_MM.json
@@ -0,0 +1,46 @@
+{ "translations": {
+    "January" : "ဇန်နဝါရီ",
+    "February" : "ဖေဖော်ဝါရီ",
+    "March" : "မတ်",
+    "April" : "ဧပြီ",
+    "May" : "မေ",
+    "June" : "ဇွန်",
+    "July" : "ဇူလိုင်",
+    "August" : "ဩဂုတ်",
+    "September" : "စက်တင်ဘာ",
+    "October" : "အောက်တိုဘာ",
+    "November" : "နိုဝင်ဘာ",
+    "December" : "ဒီဇင်ဘာ",
+    "No" : "မဟုတ်ဘူး",
+    "Yes" : "ဟုတ်",
+    "Choose" : "ရွေးချယ်",
+    "Ok" : "အိုကေ",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Set expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
+    "Expiration date" : "သက်တမ်းကုန်ဆုံးမည့်ရက်",
+    "Resharing is not allowed" : "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
+    "can edit" : "ပြင်ဆင်နိုင်",
+    "create" : "ဖန်တီးမည်",
+    "delete" : "ဖျက်မည်",
+    "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
+    "Add" : "ပေါင်းထည့်",
+    "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
+    "Username" : "သုံးစွဲသူအမည်",
+    "New password" : "စကားဝှက်အသစ်",
+    "Users" : "သုံးစွဲသူ",
+    "Apps" : "Apps",
+    "Admin" : "အက်ဒမင်",
+    "Help" : "အကူအညီ",
+    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
+    "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+    "Password" : "စကားဝှက်",
+    "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
+    "Database user" : "Database သုံးစွဲသူ",
+    "Database password" : "Database စကားဝှက်",
+    "Database name" : "Database အမည်",
+    "Finish setup" : "တပ်ဆင်ခြင်းပြီးပါပြီ။",
+    "remember" : "မှတ်မိစေသည်",
+    "Log in" : "ဝင်ရောက်ရန်"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/my_MM.php b/core/l10n/my_MM.php
deleted file mode 100644
index eec76317284..00000000000
--- a/core/l10n/my_MM.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"January" => "ဇန်နဝါရီ",
-"February" => "ဖေဖော်ဝါရီ",
-"March" => "မတ်",
-"April" => "ဧပြီ",
-"May" => "မေ",
-"June" => "ဇွန်",
-"July" => "ဇူလိုင်",
-"August" => "ဩဂုတ်",
-"September" => "စက်တင်ဘာ",
-"October" => "အောက်တိုဘာ",
-"November" => "နိုဝင်ဘာ",
-"December" => "ဒီဇင်ဘာ",
-"No" => "မဟုတ်ဘူး",
-"Yes" => "ဟုတ်",
-"Choose" => "ရွေးချယ်",
-"Ok" => "အိုကေ",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Cancel" => "ပယ်ဖျက်မည်",
-"Set expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်သတ်မှတ်မည်",
-"Expiration date" => "သက်တမ်းကုန်ဆုံးမည့်ရက်",
-"Resharing is not allowed" => "ပြန်လည်ဝေမျှခြင်းခွင့်မပြုပါ",
-"can edit" => "ပြင်ဆင်နိုင်",
-"create" => "ဖန်တီးမည်",
-"delete" => "ဖျက်မည်",
-"Password protected" => "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
-"Add" => "ပေါင်းထည့်",
-"You will receive a link to reset your password via Email." => "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
-"Username" => "သုံးစွဲသူအမည်",
-"New password" => "စကားဝှက်အသစ်",
-"Users" => "သုံးစွဲသူ",
-"Apps" => "Apps",
-"Admin" => "အက်ဒမင်",
-"Help" => "အကူအညီ",
-"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
-"Create an <strong>admin account</strong>" => "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
-"Password" => "စကားဝှက်",
-"Data folder" => "အချက်အလက်ဖိုလ်ဒါလ်",
-"Database user" => "Database သုံးစွဲသူ",
-"Database password" => "Database စကားဝှက်",
-"Database name" => "Database အမည်",
-"Finish setup" => "တပ်ဆင်ခြင်းပြီးပါပြီ။",
-"remember" => "မှတ်မိစေသည်",
-"Log in" => "ဝင်ရောက်ရန်"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
new file mode 100644
index 00000000000..b9002240d49
--- /dev/null
+++ b/core/l10n/nb_NO.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Klarte ikke å sende mail til følgende brukere: %s",
+    "Turned on maintenance mode" : "Slo på vedlikeholdsmodus",
+    "Turned off maintenance mode" : "Slo av vedlikeholdsmodus",
+    "Updated database" : "Oppdaterte databasen",
+    "Checked database schema update" : "Sjekket oppdatering av databaseskjema",
+    "Checked database schema update for apps" : "Sjekket databaseskjema-oppdatering for apper",
+    "Updated \"%s\" to %s" : "Oppdaterte \"%s\" til %s",
+    "Disabled incompatible apps: %s" : "Deaktiverte ukompatible apper: %s",
+    "No image or file provided" : "Bilde eller fil ikke angitt",
+    "Unknown filetype" : "Ukjent filtype",
+    "Invalid image" : "Ugyldig bilde",
+    "No temporary profile picture available, try again" : "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen",
+    "No crop data provided" : "Ingen beskjæringsinformasjon angitt",
+    "Sunday" : "Søndag",
+    "Monday" : "Mandag",
+    "Tuesday" : "Tirsdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lørdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Innstillinger",
+    "File" : "Fil",
+    "Folder" : "Mappe",
+    "Image" : "Bilde",
+    "Audio" : "Audio",
+    "Saving..." : "Lagrer...",
+    "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?",
+    "I know what I'm doing" : "Jeg vet hva jeg gjør",
+    "Reset password" : "Tilbakestill passord",
+    "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
+    "No" : "Nei",
+    "Yes" : "Ja",
+    "Choose" : "Velg",
+    "Error loading file picker template: {error}" : "Feil ved lasting av filvelger-mal: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Feil ved lasting av meldingsmal: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nye filer",
+    "Already existing files" : "Allerede eksisterende filer",
+    "Which files do you want to keep?" : "Hvilke filer vil du beholde?",
+    "If you select both versions, the copied file will have a number added to its name." : "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Fortsett",
+    "(all selected)" : "(alle valgt)",
+    "({count} selected)" : "({count} valgt)",
+    "Error loading file exists template" : "Feil ved lasting av \"filen eksisterer\"-mal",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "So-so password" : "So-so-passord",
+    "Good password" : "Bra passord",
+    "Strong password" : "Sterkt passord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din nettserver er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke fungere.",
+    "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." : "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
+    "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
+    "Shared" : "Delt",
+    "Shared with {recipients}" : "Delt med {recipients}",
+    "Share" : "Del",
+    "Error" : "Feil",
+    "Error while sharing" : "Feil under deling",
+    "Error while unsharing" : "Feil ved oppheving av deling",
+    "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 user or group …" : "Del med bruker eller gruppe …",
+    "Share link" : "Del lenke",
+    "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
+    "Password protect" : "Passordbeskyttet",
+    "Choose a password for the public link" : "Velg et passord for den offentlige lenken",
+    "Allow Public Upload" : "Tillat Offentlig Opplasting",
+    "Email link to person" : "Email lenke til person",
+    "Send" : "Send",
+    "Set expiration date" : "Sett utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "Adding user..." : "Legger til bruker...",
+    "group" : "gruppe",
+    "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",
+    "can share" : "kan dele",
+    "can edit" : "kan endre",
+    "access control" : "tilgangskontroll",
+    "create" : "opprette",
+    "update" : "oppdatere",
+    "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",
+    "Warning" : "Advarsel",
+    "The object type is not specified." : "Objekttypen er ikke spesifisert.",
+    "Enter new" : "Oppgi ny",
+    "Delete" : "Slett",
+    "Add" : "Legg til",
+    "Edit tags" : "Rediger merkelapper",
+    "Error loading dialog template: {error}" : "Feil ved lasting av dialogmal: {error}",
+    "No tags selected for deletion." : "Ingen merkelapper valgt for sletting.",
+    "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
+    "Please reload the page." : "Vennligst last siden på nytt.",
+    "The update was unsuccessful." : "Oppdateringen var vellykket.",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
+    "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
+    "Username" : "Brukernavn",
+    "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?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
+    "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
+    "Reset" : "Tilbakestill",
+    "New password" : "Nytt passord",
+    "New Password" : "Nytt passord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
+    "Personal" : "Personlig",
+    "Users" : "Brukere",
+    "Apps" : "Apper",
+    "Admin" : "Admin",
+    "Help" : "Hjelp",
+    "Error loading tags" : "Feil ved lasting av merkelapper",
+    "Tag already exists" : "Merkelappen finnes allerede",
+    "Error deleting tag(s)" : "Feil ved sletting av merkelapp(er)",
+    "Error tagging" : "Feil ved merking",
+    "Error untagging" : "Feil ved fjerning av merkelapp",
+    "Error favoriting" : "Feil ved favorittmerking",
+    "Error unfavoriting" : "Feil ved fjerning av favorittmerking",
+    "Access forbidden" : "Tilgang nektet",
+    "File not found" : "Finner ikke filen",
+    "The specified document has not been found on the server." : "Det angitte dokumentet ble ikke funnet på serveren.",
+    "You can click here to return to %s." : "Du kan klikke her for å gå tilbake til %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hei,\n\nDette er en beskjed om at %s delte %s med deg.\nVis den: %s\n\n",
+    "The share will expire on %s." : "Delingen vil opphøre %s.",
+    "Cheers!" : "Ha det!",
+    "The server encountered an internal error and was unable to complete your request." : "Serveren støtte på en intern feil og kunne ikke fullføre forespørselen din.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontakt server-administratoren hvis denne feilen oppstår flere ganger. Vennligst ta med de tekniske detaljene nedenfor i rapporten din.",
+    "More details can be found in the server log." : "Flere detaljer finnes i server-loggen.",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Ekstern adresse: %s",
+    "Request ID: %s" : "Forespørsels-ID: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Melding: %s",
+    "File: %s" : "Fil: %s",
+    "Line: %s" : "Linje: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Sikkerhetsadvarsel",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-versjonen din er sårbar for NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Vennligst oppdater PHP-installasjonen din for å bruke %s på en sikker måte.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
+    "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
+    "Password" : "Passord",
+    "Storage & database" : "Lagring og database",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Konfigurer databasen",
+    "Only %s is available." : "Kun %s er tilgjengelig.",
+    "Database user" : "Databasebruker",
+    "Database password" : "Databasepassord",
+    "Database name" : "Databasenavn",
+    "Database tablespace" : "Database tabellområde",
+    "Database host" : "Databasevert",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite vil bli brukt som database. For større installasjoner anbefaler vi å endre dette.",
+    "Finish setup" : "Fullfør oppsetting",
+    "Finishing …" : "Ferdigstiller ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last siden på nytt.",
+    "%s is available. Get more information on how to update." : "%s er tilgjengelig. Få mer informasjon om hvordan du kan oppdatere.",
+    "Log out" : "Logg ut",
+    "Server side authentication failed!" : "Autentisering feilet på serveren!",
+    "Please contact your administrator." : "Vennligst kontakt administratoren din.",
+    "Forgot your password? Reset it!" : "Glemt passordet ditt? Tilbakestill det!",
+    "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.",
+    "This means only administrators can use the instance." : "Dette betyr at kun administratorer kan bruke instansen.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
+    "Thank you for your patience." : "Takk for din tålmodighet.",
+    "You are accessing the server from an untrusted domain." : "Du aksesserer serveren fra et ikke tiltrodd domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
+    "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene",
+    "%s will be updated to version %s." : "%s vil bli oppdatert til versjon %s.",
+    "The following apps will be disabled:" : "Følgende apper vil bli deaktivert:",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For å unngå tidsavbrudd ved store installasjoner, kan du i stedet kjøre følgende kommando fra installasjonsmappen:",
+    "This %s instance is currently being updated, which may take a while." : "%s-instansen er under oppdatering, noe som kan ta litt tid.",
+    "This page will refresh itself when the %s instance is available again." : "Denne siden vil bli lastet på nytt når %s-instansen er tilgjengelig igjen."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
new file mode 100644
index 00000000000..efc4c5babb4
--- /dev/null
+++ b/core/l10n/nb_NO.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Klarte ikke å sende mail til følgende brukere: %s",
+    "Turned on maintenance mode" : "Slo på vedlikeholdsmodus",
+    "Turned off maintenance mode" : "Slo av vedlikeholdsmodus",
+    "Updated database" : "Oppdaterte databasen",
+    "Checked database schema update" : "Sjekket oppdatering av databaseskjema",
+    "Checked database schema update for apps" : "Sjekket databaseskjema-oppdatering for apper",
+    "Updated \"%s\" to %s" : "Oppdaterte \"%s\" til %s",
+    "Disabled incompatible apps: %s" : "Deaktiverte ukompatible apper: %s",
+    "No image or file provided" : "Bilde eller fil ikke angitt",
+    "Unknown filetype" : "Ukjent filtype",
+    "Invalid image" : "Ugyldig bilde",
+    "No temporary profile picture available, try again" : "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen",
+    "No crop data provided" : "Ingen beskjæringsinformasjon angitt",
+    "Sunday" : "Søndag",
+    "Monday" : "Mandag",
+    "Tuesday" : "Tirsdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lørdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Innstillinger",
+    "File" : "Fil",
+    "Folder" : "Mappe",
+    "Image" : "Bilde",
+    "Audio" : "Audio",
+    "Saving..." : "Lagrer...",
+    "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?",
+    "I know what I'm doing" : "Jeg vet hva jeg gjør",
+    "Reset password" : "Tilbakestill passord",
+    "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
+    "No" : "Nei",
+    "Yes" : "Ja",
+    "Choose" : "Velg",
+    "Error loading file picker template: {error}" : "Feil ved lasting av filvelger-mal: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Feil ved lasting av meldingsmal: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nye filer",
+    "Already existing files" : "Allerede eksisterende filer",
+    "Which files do you want to keep?" : "Hvilke filer vil du beholde?",
+    "If you select both versions, the copied file will have a number added to its name." : "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Fortsett",
+    "(all selected)" : "(alle valgt)",
+    "({count} selected)" : "({count} valgt)",
+    "Error loading file exists template" : "Feil ved lasting av \"filen eksisterer\"-mal",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "So-so password" : "So-so-passord",
+    "Good password" : "Bra passord",
+    "Strong password" : "Sterkt passord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din nettserver er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke fungere.",
+    "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." : "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
+    "Error occurred while checking server setup" : "Feil oppstod ved sjekking av server-oppsett",
+    "Shared" : "Delt",
+    "Shared with {recipients}" : "Delt med {recipients}",
+    "Share" : "Del",
+    "Error" : "Feil",
+    "Error while sharing" : "Feil under deling",
+    "Error while unsharing" : "Feil ved oppheving av deling",
+    "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 user or group …" : "Del med bruker eller gruppe …",
+    "Share link" : "Del lenke",
+    "The public link will expire no later than {days} days after it is created" : "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
+    "Password protect" : "Passordbeskyttet",
+    "Choose a password for the public link" : "Velg et passord for den offentlige lenken",
+    "Allow Public Upload" : "Tillat Offentlig Opplasting",
+    "Email link to person" : "Email lenke til person",
+    "Send" : "Send",
+    "Set expiration date" : "Sett utløpsdato",
+    "Expiration date" : "Utløpsdato",
+    "Adding user..." : "Legger til bruker...",
+    "group" : "gruppe",
+    "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",
+    "can share" : "kan dele",
+    "can edit" : "kan endre",
+    "access control" : "tilgangskontroll",
+    "create" : "opprette",
+    "update" : "oppdatere",
+    "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",
+    "Warning" : "Advarsel",
+    "The object type is not specified." : "Objekttypen er ikke spesifisert.",
+    "Enter new" : "Oppgi ny",
+    "Delete" : "Slett",
+    "Add" : "Legg til",
+    "Edit tags" : "Rediger merkelapper",
+    "Error loading dialog template: {error}" : "Feil ved lasting av dialogmal: {error}",
+    "No tags selected for deletion." : "Ingen merkelapper valgt for sletting.",
+    "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
+    "Please reload the page." : "Vennligst last siden på nytt.",
+    "The update was unsuccessful." : "Oppdateringen var vellykket.",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
+    "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
+    "Username" : "Brukernavn",
+    "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?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
+    "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
+    "Reset" : "Tilbakestill",
+    "New password" : "Nytt passord",
+    "New Password" : "Nytt passord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
+    "Personal" : "Personlig",
+    "Users" : "Brukere",
+    "Apps" : "Apper",
+    "Admin" : "Admin",
+    "Help" : "Hjelp",
+    "Error loading tags" : "Feil ved lasting av merkelapper",
+    "Tag already exists" : "Merkelappen finnes allerede",
+    "Error deleting tag(s)" : "Feil ved sletting av merkelapp(er)",
+    "Error tagging" : "Feil ved merking",
+    "Error untagging" : "Feil ved fjerning av merkelapp",
+    "Error favoriting" : "Feil ved favorittmerking",
+    "Error unfavoriting" : "Feil ved fjerning av favorittmerking",
+    "Access forbidden" : "Tilgang nektet",
+    "File not found" : "Finner ikke filen",
+    "The specified document has not been found on the server." : "Det angitte dokumentet ble ikke funnet på serveren.",
+    "You can click here to return to %s." : "Du kan klikke her for å gå tilbake til %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hei,\n\nDette er en beskjed om at %s delte %s med deg.\nVis den: %s\n\n",
+    "The share will expire on %s." : "Delingen vil opphøre %s.",
+    "Cheers!" : "Ha det!",
+    "The server encountered an internal error and was unable to complete your request." : "Serveren støtte på en intern feil og kunne ikke fullføre forespørselen din.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontakt server-administratoren hvis denne feilen oppstår flere ganger. Vennligst ta med de tekniske detaljene nedenfor i rapporten din.",
+    "More details can be found in the server log." : "Flere detaljer finnes i server-loggen.",
+    "Technical details" : "Tekniske detaljer",
+    "Remote Address: %s" : "Ekstern adresse: %s",
+    "Request ID: %s" : "Forespørsels-ID: %s",
+    "Code: %s" : "Kode: %s",
+    "Message: %s" : "Melding: %s",
+    "File: %s" : "Fil: %s",
+    "Line: %s" : "Linje: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Sikkerhetsadvarsel",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-versjonen din er sårbar for NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Vennligst oppdater PHP-installasjonen din for å bruke %s på en sikker måte.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
+    "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
+    "Password" : "Passord",
+    "Storage & database" : "Lagring og database",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Konfigurer databasen",
+    "Only %s is available." : "Kun %s er tilgjengelig.",
+    "Database user" : "Databasebruker",
+    "Database password" : "Databasepassord",
+    "Database name" : "Databasenavn",
+    "Database tablespace" : "Database tabellområde",
+    "Database host" : "Databasevert",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite vil bli brukt som database. For større installasjoner anbefaler vi å endre dette.",
+    "Finish setup" : "Fullfør oppsetting",
+    "Finishing …" : "Ferdigstiller ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last siden på nytt.",
+    "%s is available. Get more information on how to update." : "%s er tilgjengelig. Få mer informasjon om hvordan du kan oppdatere.",
+    "Log out" : "Logg ut",
+    "Server side authentication failed!" : "Autentisering feilet på serveren!",
+    "Please contact your administrator." : "Vennligst kontakt administratoren din.",
+    "Forgot your password? Reset it!" : "Glemt passordet ditt? Tilbakestill det!",
+    "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.",
+    "This means only administrators can use the instance." : "Dette betyr at kun administratorer kan bruke instansen.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
+    "Thank you for your patience." : "Takk for din tålmodighet.",
+    "You are accessing the server from an untrusted domain." : "Du aksesserer serveren fra et ikke tiltrodd domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
+    "Add \"%s\" as trusted domain" : "Legg til \"%s\" som et tiltrodd domene",
+    "%s will be updated to version %s." : "%s vil bli oppdatert til versjon %s.",
+    "The following apps will be disabled:" : "Følgende apper vil bli deaktivert:",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "For å unngå tidsavbrudd ved store installasjoner, kan du i stedet kjøre følgende kommando fra installasjonsmappen:",
+    "This %s instance is currently being updated, which may take a while." : "%s-instansen er under oppdatering, noe som kan ta litt tid.",
+    "This page will refresh itself when the %s instance is available again." : "Denne siden vil bli lastet på nytt når %s-instansen er tilgjengelig igjen."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
deleted file mode 100644
index 1074ad1b217..00000000000
--- a/core/l10n/nb_NO.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Klarte ikke å sende mail til følgende brukere: %s",
-"Turned on maintenance mode" => "Slo på vedlikeholdsmodus",
-"Turned off maintenance mode" => "Slo av vedlikeholdsmodus",
-"Updated database" => "Oppdaterte databasen",
-"Checked database schema update" => "Sjekket oppdatering av databaseskjema",
-"Checked database schema update for apps" => "Sjekket databaseskjema-oppdatering for apper",
-"Updated \"%s\" to %s" => "Oppdaterte \"%s\" til %s",
-"Disabled incompatible apps: %s" => "Deaktiverte ukompatible apper: %s",
-"No image or file provided" => "Bilde eller fil ikke angitt",
-"Unknown filetype" => "Ukjent filtype",
-"Invalid image" => "Ugyldig bilde",
-"No temporary profile picture available, try again" => "Foreløpig profilbilde ikke tilgjengelig. Prøv igjen",
-"No crop data provided" => "Ingen beskjæringsinformasjon angitt",
-"Sunday" => "Søndag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Settings" => "Innstillinger",
-"File" => "Fil",
-"Folder" => "Mappe",
-"Image" => "Bilde",
-"Audio" => "Audio",
-"Saving..." => "Lagrer...",
-"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?",
-"I know what I'm doing" => "Jeg vet hva jeg gjør",
-"Reset password" => "Tilbakestill passord",
-"Password can not be changed. Please contact your administrator." => "Passordet kan ikke endres. Kontakt administratoren din.",
-"No" => "Nei",
-"Yes" => "Ja",
-"Choose" => "Velg",
-"Error loading file picker template: {error}" => "Feil ved lasting av filvelger-mal: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Feil ved lasting av meldingsmal: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
-"One file conflict" => "En filkonflikt",
-"New Files" => "Nye filer",
-"Already existing files" => "Allerede eksisterende filer",
-"Which files do you want to keep?" => "Hvilke filer vil du beholde?",
-"If you select both versions, the copied file will have a number added to its name." => "Hvis du velger begge versjonene vil den kopierte filen få et nummer lagt til i navnet.",
-"Cancel" => "Avbryt",
-"Continue" => "Fortsett",
-"(all selected)" => "(alle valgt)",
-"({count} selected)" => "({count} valgt)",
-"Error loading file exists template" => "Feil ved lasting av \"filen eksisterer\"-mal",
-"Very weak password" => "Veldig svakt passord",
-"Weak password" => "Svakt passord",
-"So-so password" => "So-so-passord",
-"Good password" => "Bra passord",
-"Strong password" => "Sterkt passord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din nettserver er ikke konfigurert korrekt for filsynkronisering. WebDAV ser ut til å ikke fungere.",
-"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." => "Denne serveren har ikke en fungerende Internett-tilkobling. Dette betyr at noen av funksjonene, f.eks. å koble opp ekstern lagring, påminnelser om oppdatering eller installering av 3-parts apper ikke fungerer. Fjerntilgang til filer og utsending av påminnelser i e-post virker kanskje ikke heller. Vi anbefaler at Internett-forbindelsen for denne serveren aktiveres hvis du vil ha full funksjonalitet.",
-"Error occurred while checking server setup" => "Feil oppstod ved sjekking av server-oppsett",
-"Shared" => "Delt",
-"Shared with {recipients}" => "Delt med {recipients}",
-"Share" => "Del",
-"Error" => "Feil",
-"Error while sharing" => "Feil under deling",
-"Error while unsharing" => "Feil ved oppheving av deling",
-"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 user or group …" => "Del med bruker eller gruppe …",
-"Share link" => "Del lenke",
-"The public link will expire no later than {days} days after it is created" => "Den offentlige lenken vil utløpe senest {days} dager etter at den lages",
-"Password protect" => "Passordbeskyttet",
-"Choose a password for the public link" => "Velg et passord for den offentlige lenken",
-"Allow Public Upload" => "Tillat Offentlig Opplasting",
-"Email link to person" => "Email lenke til person",
-"Send" => "Send",
-"Set expiration date" => "Sett utløpsdato",
-"Expiration date" => "Utløpsdato",
-"Adding user..." => "Legger til bruker...",
-"group" => "gruppe",
-"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",
-"can share" => "kan dele",
-"can edit" => "kan endre",
-"access control" => "tilgangskontroll",
-"create" => "opprette",
-"update" => "oppdatere",
-"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",
-"Warning" => "Advarsel",
-"The object type is not specified." => "Objekttypen er ikke spesifisert.",
-"Enter new" => "Oppgi ny",
-"Delete" => "Slett",
-"Add" => "Legg til",
-"Edit tags" => "Rediger merkelapper",
-"Error loading dialog template: {error}" => "Feil ved lasting av dialogmal: {error}",
-"No tags selected for deletion." => "Ingen merkelapper valgt for sletting.",
-"Updating {productName} to version {version}, this may take a while." => "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
-"Please reload the page." => "Vennligst last siden på nytt.",
-"The update was unsuccessful." => "Oppdateringen var vellykket.",
-"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 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",
-"Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
-"You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
-"Username" => "Brukernavn",
-"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?" => "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
-"Yes, I really want to reset my password now" => "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
-"Reset" => "Tilbakestill",
-"New password" => "Nytt passord",
-"New Password" => "Nytt passord",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
-"For the best results, please consider using a GNU/Linux server instead." => "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
-"Personal" => "Personlig",
-"Users" => "Brukere",
-"Apps" => "Apper",
-"Admin" => "Admin",
-"Help" => "Hjelp",
-"Error loading tags" => "Feil ved lasting av merkelapper",
-"Tag already exists" => "Merkelappen finnes allerede",
-"Error deleting tag(s)" => "Feil ved sletting av merkelapp(er)",
-"Error tagging" => "Feil ved merking",
-"Error untagging" => "Feil ved fjerning av merkelapp",
-"Error favoriting" => "Feil ved favorittmerking",
-"Error unfavoriting" => "Feil ved fjerning av favorittmerking",
-"Access forbidden" => "Tilgang nektet",
-"File not found" => "Finner ikke filen",
-"The specified document has not been found on the server." => "Det angitte dokumentet ble ikke funnet på serveren.",
-"You can click here to return to %s." => "Du kan klikke her for å gå tilbake til %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hei,\n\nDette er en beskjed om at %s delte %s med deg.\nVis den: %s\n\n",
-"The share will expire on %s." => "Delingen vil opphøre %s.",
-"Cheers!" => "Ha det!",
-"The server encountered an internal error and was unable to complete your request." => "Serveren støtte på en intern feil og kunne ikke fullføre forespørselen din.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Kontakt server-administratoren hvis denne feilen oppstår flere ganger. Vennligst ta med de tekniske detaljene nedenfor i rapporten din.",
-"More details can be found in the server log." => "Flere detaljer finnes i server-loggen.",
-"Technical details" => "Tekniske detaljer",
-"Remote Address: %s" => "Ekstern adresse: %s",
-"Request ID: %s" => "Forespørsels-ID: %s",
-"Code: %s" => "Kode: %s",
-"Message: %s" => "Melding: %s",
-"File: %s" => "Fil: %s",
-"Line: %s" => "Linje: %s",
-"Trace" => "Trace",
-"Security Warning" => "Sikkerhetsadvarsel",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-versjonen din er sårbar for NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Vennligst oppdater PHP-installasjonen din for å bruke %s på en sikker måte.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
-"Create an <strong>admin account</strong>" => "Opprett en <strong>administrator-konto</strong>",
-"Password" => "Passord",
-"Storage & database" => "Lagring og database",
-"Data folder" => "Datamappe",
-"Configure the database" => "Konfigurer databasen",
-"Only %s is available." => "Kun %s er tilgjengelig.",
-"Database user" => "Databasebruker",
-"Database password" => "Databasepassord",
-"Database name" => "Databasenavn",
-"Database tablespace" => "Database tabellområde",
-"Database host" => "Databasevert",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite vil bli brukt som database. For større installasjoner anbefaler vi å endre dette.",
-"Finish setup" => "Fullfør oppsetting",
-"Finishing …" => "Ferdigstiller ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Denne applikasjonen krever JavaScript for å fungere korrekt. Vennligst <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktiver JavaScript</a> og last siden på nytt.",
-"%s is available. Get more information on how to update." => "%s er tilgjengelig. Få mer informasjon om hvordan du kan oppdatere.",
-"Log out" => "Logg ut",
-"Server side authentication failed!" => "Autentisering feilet på serveren!",
-"Please contact your administrator." => "Vennligst kontakt administratoren din.",
-"Forgot your password? Reset it!" => "Glemt passordet ditt? Tilbakestill det!",
-"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.",
-"This means only administrators can use the instance." => "Dette betyr at kun administratorer kan bruke instansen.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontakt systemadministratoren hvis denne meldingen var uventet eller ikke forsvinner.",
-"Thank you for your patience." => "Takk for din tålmodighet.",
-"You are accessing the server from an untrusted domain." => "Du aksesserer serveren fra et ikke tiltrodd domene.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Vennligst kontakt administratoren. Hvis du er administrator for denne instansen, konfigurer innstillingen \"trusted_domain\" i config/config.php. En eksempelkonfigurasjon er gitt i config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Avhengig av konfigurasjonen kan du, som administrator, kanskje også bruke kanppen nedenfor til å stole på dette domenet.",
-"Add \"%s\" as trusted domain" => "Legg til \"%s\" som et tiltrodd domene",
-"%s will be updated to version %s." => "%s vil bli oppdatert til versjon %s.",
-"The following apps will be disabled:" => "Følgende apper vil bli deaktivert:",
-"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",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "For å unngå tidsavbrudd ved store installasjoner, kan du i stedet kjøre følgende kommando fra installasjonsmappen:",
-"This %s instance is currently being updated, which may take a while." => "%s-instansen er under oppdatering, noe som kan ta litt tid.",
-"This page will refresh itself when the %s instance is available again." => "Denne siden vil bli lastet på nytt når %s-instansen er tilgjengelig igjen."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nds.js b/core/l10n/nds.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/nds.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nds.json b/core/l10n/nds.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/nds.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/nds.php b/core/l10n/nds.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/nds.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ne.js b/core/l10n/ne.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/ne.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ne.json b/core/l10n/ne.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/ne.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ne.php b/core/l10n/ne.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/ne.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
new file mode 100644
index 00000000000..df638124f77
--- /dev/null
+++ b/core/l10n/nl.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
+    "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
+    "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
+    "Updated database" : "Database bijgewerkt",
+    "Checked database schema update" : "Database schema-update gecontroleerd",
+    "Checked database schema update for apps" : "Database schema-update voor apps gecontroleerd",
+    "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s",
+    "Disabled incompatible apps: %s" : "Gedeactiveerde incompatibele apps: %s",
+    "No image or file provided" : "Geen afbeelding of bestand opgegeven",
+    "Unknown filetype" : "Onbekend bestandsformaat",
+    "Invalid image" : "Ongeldige afbeelding",
+    "No temporary profile picture available, try again" : "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw",
+    "No crop data provided" : "Geen bijsnijdingsgegevens opgegeven",
+    "Sunday" : "zondag",
+    "Monday" : "maandag",
+    "Tuesday" : "dinsdag",
+    "Wednesday" : "woensdag",
+    "Thursday" : "donderdag",
+    "Friday" : "vrijdag",
+    "Saturday" : "zaterdag",
+    "January" : "januari",
+    "February" : "februari",
+    "March" : "maart",
+    "April" : "april",
+    "May" : "mei",
+    "June" : "juni",
+    "July" : "juli",
+    "August" : "augustus",
+    "September" : "september",
+    "October" : "oktober",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Instellingen",
+    "File" : "Bestand",
+    "Folder" : "Map",
+    "Image" : "Afbeelding",
+    "Audio" : "Audio",
+    "Saving..." : "Opslaan",
+    "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?",
+    "I know what I'm doing" : "Ik weet wat ik doe",
+    "Reset password" : "Reset wachtwoord",
+    "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
+    "No" : "Nee",
+    "Yes" : "Ja",
+    "Choose" : "Kies",
+    "Error loading file picker template: {error}" : "Fout bij laden bestandenselecteur sjabloon: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fout bij laden berichtensjabloon: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} bestandsconflict","{count} bestandsconflicten"],
+    "One file conflict" : "Een bestandsconflict",
+    "New Files" : "Nieuwe bestanden",
+    "Already existing files" : "Al aanwezige bestanden",
+    "Which files do you want to keep?" : "Welke bestanden wilt u bewaren?",
+    "If you select both versions, the copied file will have a number added to its name." : "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen.",
+    "Cancel" : "Annuleer",
+    "Continue" : "Verder",
+    "(all selected)" : "(alles geselecteerd)",
+    "({count} selected)" : "({count} geselecteerd)",
+    "Error loading file exists template" : "Fout bij laden bestand bestaat al sjabloon",
+    "Very weak password" : "Zeer zwak wachtwoord",
+    "Weak password" : "Zwak wachtwoord",
+    "So-so password" : "Matig wachtwoord",
+    "Good password" : "Goed wachtwoord",
+    "Strong password" : "Sterk wachtwoord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
+    "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." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
+    "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
+    "Shared" : "Gedeeld",
+    "Shared with {recipients}" : "Gedeeld met {recipients}",
+    "Share" : "Delen",
+    "Error" : "Fout",
+    "Error while sharing" : "Fout tijdens het delen",
+    "Error while unsharing" : "Fout tijdens het stoppen met delen",
+    "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 user or group …" : "Delen met gebruiker of groep ...",
+    "Share link" : "Deel link",
+    "The public link will expire no later than {days} days after it is created" : "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
+    "Password protect" : "Wachtwoord beveiligd",
+    "Choose a password for the public link" : "Kies een wachtwoord voor de openbare link",
+    "Allow Public Upload" : "Sta publieke uploads toe",
+    "Email link to person" : "E-mail link naar persoon",
+    "Send" : "Versturen",
+    "Set expiration date" : "Stel vervaldatum in",
+    "Expiration date" : "Vervaldatum",
+    "Adding user..." : "Toevoegen gebruiker...",
+    "group" : "groep",
+    "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",
+    "can share" : "kan delen",
+    "can edit" : "kan wijzigen",
+    "access control" : "toegangscontrole",
+    "create" : "creëer",
+    "update" : "bijwerken",
+    "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",
+    "Warning" : "Waarschuwing",
+    "The object type is not specified." : "Het object type is niet gespecificeerd.",
+    "Enter new" : "Opgeven nieuw",
+    "Delete" : "Verwijder",
+    "Add" : "Toevoegen",
+    "Edit tags" : "Bewerken tags",
+    "Error loading dialog template: {error}" : "Fout bij laden dialoog sjabloon: {error}",
+    "No tags selected for deletion." : "Geen tags geselecteerd voor verwijdering.",
+    "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
+    "Please reload the page." : "Herlaad deze pagina.",
+    "The update was unsuccessful." : "De update is niet geslaagd.",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
+    "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
+    "Username" : "Gebruikersnaam",
+    "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?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
+    "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten",
+    "Reset" : "Reset",
+    "New password" : "Nieuw wachtwoord",
+    "New Password" : "Nieuw wachtwoord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
+    "Personal" : "Persoonlijk",
+    "Users" : "Gebruikers",
+    "Apps" : "Apps",
+    "Admin" : "Beheerder",
+    "Help" : "Help",
+    "Error loading tags" : "Fout bij laden tags",
+    "Tag already exists" : "Tag bestaat al",
+    "Error deleting tag(s)" : "Fout bij verwijderen tag(s)",
+    "Error tagging" : "Fout bij taggen",
+    "Error untagging" : "Fout bij ont-taggen",
+    "Error favoriting" : "Fout bij favoriet maken",
+    "Error unfavoriting" : "Fout bij verwijderen favorietstatus",
+    "Access forbidden" : "Toegang verboden",
+    "File not found" : "Bestand niet gevonden",
+    "The specified document has not been found on the server." : "Het opgegeven document is niet gevonden op deze server.",
+    "You can click here to return to %s." : "Klik hier om terug te keren naar %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
+    "The share will expire on %s." : "De share vervalt op %s.",
+    "Cheers!" : "Proficiat!",
+    "Internal Server Error" : "Interne serverfout",
+    "The server encountered an internal error and was unable to complete your request." : "De server ontdekte een interne fout en kon uw aanvraag niet verder uitvoeren.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Neem contact op mer de serverbeheerder als deze fout meerdere keren optreedt en neem de onderstaande technische details op in uw melding.",
+    "More details can be found in the server log." : "Meer details in de serverlogging,",
+    "Technical details" : "Technische details",
+    "Remote Address: %s" : "Extern adres: %s",
+    "Request ID: %s" : "Aanvraag ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Boodschap: %s",
+    "File: %s" : "Bestand: %s",
+    "Line: %s" : "Regel: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Beveiligingswaarschuwing",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
+    "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
+    "Password" : "Wachtwoord",
+    "Storage & database" : "Opslag & database",
+    "Data folder" : "Gegevensmap",
+    "Configure the database" : "Configureer de database",
+    "Only %s is available." : "Alleen %s is beschikbaar.",
+    "Database user" : "Gebruiker database",
+    "Database password" : "Wachtwoord database",
+    "Database name" : "Naam database",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Databaseserver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit te veranderen.",
+    "Finish setup" : "Installatie afronden",
+    "Finishing …" : "Afronden ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Deze applicatie heeft JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
+    "%s is available. Get more information on how to update." : "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
+    "Log out" : "Afmelden",
+    "Server side authentication failed!" : "Authenticatie bij de server mislukte!",
+    "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
+    "Forgot your password? Reset it!" : "Wachtwoord vergeten? Herstel het!",
+    "remember" : "onthoud gegevens",
+    "Log in" : "Meld u aan",
+    "Alternative Logins" : "Alternatieve inlogs",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
+    "This means only administrators can use the instance." : "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Neem contact op met uw systeembeheerder als deze melding aanhoudt of onverwacht verscheen.",
+    "Thank you for your patience." : "Bedankt voor uw geduld.",
+    "You are accessing the server from an untrusted domain." : "U benadert de server vanaf een niet vertrouwd domein.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhankelijk van uw configuratie zou u als beheerder ook de onderstaande knop kunnen gebruiken om dit domein te vertrouwen.",
+    "Add \"%s\" as trusted domain" : "\"%s\" toevoegen als vertrouwd domein",
+    "%s will be updated to version %s." : "%s wordt bijgewerkt naar versie %s.",
+    "The following apps will be disabled:" : "De volgende apps worden uitgeschakeld:",
+    "The theme %s has been disabled." : "Het thema %s is uitgeschakeld.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
+    "Start update" : "Begin de update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Om time-outs tijdens grotere installaties te voorkomen, kunt u in plaats hiervan de volgende opdracht geven vanaf uw installatiedirectory:",
+    "This %s instance is currently being updated, which may take a while." : "Deze %s-installatie wordt momenteel geüpdatet. Dat kan enige tijd duren.",
+    "This page will refresh itself when the %s instance is available again." : "Deze pagina wordt ververst als de %s-installatie weer beschikbaar is."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
new file mode 100644
index 00000000000..a25e8c5d50e
--- /dev/null
+++ b/core/l10n/nl.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kon geen e-mail sturen aan de volgende gebruikers: %s",
+    "Turned on maintenance mode" : "Onderhoudsmodus ingeschakeld",
+    "Turned off maintenance mode" : "Onderhoudsmodus uitgeschakeld",
+    "Updated database" : "Database bijgewerkt",
+    "Checked database schema update" : "Database schema-update gecontroleerd",
+    "Checked database schema update for apps" : "Database schema-update voor apps gecontroleerd",
+    "Updated \"%s\" to %s" : "Bijgewerkt \"%s\" naar %s",
+    "Disabled incompatible apps: %s" : "Gedeactiveerde incompatibele apps: %s",
+    "No image or file provided" : "Geen afbeelding of bestand opgegeven",
+    "Unknown filetype" : "Onbekend bestandsformaat",
+    "Invalid image" : "Ongeldige afbeelding",
+    "No temporary profile picture available, try again" : "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw",
+    "No crop data provided" : "Geen bijsnijdingsgegevens opgegeven",
+    "Sunday" : "zondag",
+    "Monday" : "maandag",
+    "Tuesday" : "dinsdag",
+    "Wednesday" : "woensdag",
+    "Thursday" : "donderdag",
+    "Friday" : "vrijdag",
+    "Saturday" : "zaterdag",
+    "January" : "januari",
+    "February" : "februari",
+    "March" : "maart",
+    "April" : "april",
+    "May" : "mei",
+    "June" : "juni",
+    "July" : "juli",
+    "August" : "augustus",
+    "September" : "september",
+    "October" : "oktober",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Instellingen",
+    "File" : "Bestand",
+    "Folder" : "Map",
+    "Image" : "Afbeelding",
+    "Audio" : "Audio",
+    "Saving..." : "Opslaan",
+    "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?",
+    "I know what I'm doing" : "Ik weet wat ik doe",
+    "Reset password" : "Reset wachtwoord",
+    "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
+    "No" : "Nee",
+    "Yes" : "Ja",
+    "Choose" : "Kies",
+    "Error loading file picker template: {error}" : "Fout bij laden bestandenselecteur sjabloon: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fout bij laden berichtensjabloon: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} bestandsconflict","{count} bestandsconflicten"],
+    "One file conflict" : "Een bestandsconflict",
+    "New Files" : "Nieuwe bestanden",
+    "Already existing files" : "Al aanwezige bestanden",
+    "Which files do you want to keep?" : "Welke bestanden wilt u bewaren?",
+    "If you select both versions, the copied file will have a number added to its name." : "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen.",
+    "Cancel" : "Annuleer",
+    "Continue" : "Verder",
+    "(all selected)" : "(alles geselecteerd)",
+    "({count} selected)" : "({count} geselecteerd)",
+    "Error loading file exists template" : "Fout bij laden bestand bestaat al sjabloon",
+    "Very weak password" : "Zeer zwak wachtwoord",
+    "Weak password" : "Zwak wachtwoord",
+    "So-so password" : "Matig wachtwoord",
+    "Good password" : "Goed wachtwoord",
+    "Strong password" : "Sterk wachtwoord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
+    "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." : "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
+    "Error occurred while checking server setup" : "Een fout trad op bij checken serverconfiguratie",
+    "Shared" : "Gedeeld",
+    "Shared with {recipients}" : "Gedeeld met {recipients}",
+    "Share" : "Delen",
+    "Error" : "Fout",
+    "Error while sharing" : "Fout tijdens het delen",
+    "Error while unsharing" : "Fout tijdens het stoppen met delen",
+    "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 user or group …" : "Delen met gebruiker of groep ...",
+    "Share link" : "Deel link",
+    "The public link will expire no later than {days} days after it is created" : "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
+    "Password protect" : "Wachtwoord beveiligd",
+    "Choose a password for the public link" : "Kies een wachtwoord voor de openbare link",
+    "Allow Public Upload" : "Sta publieke uploads toe",
+    "Email link to person" : "E-mail link naar persoon",
+    "Send" : "Versturen",
+    "Set expiration date" : "Stel vervaldatum in",
+    "Expiration date" : "Vervaldatum",
+    "Adding user..." : "Toevoegen gebruiker...",
+    "group" : "groep",
+    "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",
+    "can share" : "kan delen",
+    "can edit" : "kan wijzigen",
+    "access control" : "toegangscontrole",
+    "create" : "creëer",
+    "update" : "bijwerken",
+    "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",
+    "Warning" : "Waarschuwing",
+    "The object type is not specified." : "Het object type is niet gespecificeerd.",
+    "Enter new" : "Opgeven nieuw",
+    "Delete" : "Verwijder",
+    "Add" : "Toevoegen",
+    "Edit tags" : "Bewerken tags",
+    "Error loading dialog template: {error}" : "Fout bij laden dialoog sjabloon: {error}",
+    "No tags selected for deletion." : "Geen tags geselecteerd voor verwijdering.",
+    "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
+    "Please reload the page." : "Herlaad deze pagina.",
+    "The update was unsuccessful." : "De update is niet geslaagd.",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
+    "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
+    "Username" : "Gebruikersnaam",
+    "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?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
+    "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten",
+    "Reset" : "Reset",
+    "New password" : "Nieuw wachtwoord",
+    "New Password" : "Nieuw wachtwoord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
+    "Personal" : "Persoonlijk",
+    "Users" : "Gebruikers",
+    "Apps" : "Apps",
+    "Admin" : "Beheerder",
+    "Help" : "Help",
+    "Error loading tags" : "Fout bij laden tags",
+    "Tag already exists" : "Tag bestaat al",
+    "Error deleting tag(s)" : "Fout bij verwijderen tag(s)",
+    "Error tagging" : "Fout bij taggen",
+    "Error untagging" : "Fout bij ont-taggen",
+    "Error favoriting" : "Fout bij favoriet maken",
+    "Error unfavoriting" : "Fout bij verwijderen favorietstatus",
+    "Access forbidden" : "Toegang verboden",
+    "File not found" : "Bestand niet gevonden",
+    "The specified document has not been found on the server." : "Het opgegeven document is niet gevonden op deze server.",
+    "You can click here to return to %s." : "Klik hier om terug te keren naar %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
+    "The share will expire on %s." : "De share vervalt op %s.",
+    "Cheers!" : "Proficiat!",
+    "Internal Server Error" : "Interne serverfout",
+    "The server encountered an internal error and was unable to complete your request." : "De server ontdekte een interne fout en kon uw aanvraag niet verder uitvoeren.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Neem contact op mer de serverbeheerder als deze fout meerdere keren optreedt en neem de onderstaande technische details op in uw melding.",
+    "More details can be found in the server log." : "Meer details in de serverlogging,",
+    "Technical details" : "Technische details",
+    "Remote Address: %s" : "Extern adres: %s",
+    "Request ID: %s" : "Aanvraag ID: %s",
+    "Code: %s" : "Code: %s",
+    "Message: %s" : "Boodschap: %s",
+    "File: %s" : "Bestand: %s",
+    "Line: %s" : "Regel: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Beveiligingswaarschuwing",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
+    "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
+    "Password" : "Wachtwoord",
+    "Storage & database" : "Opslag & database",
+    "Data folder" : "Gegevensmap",
+    "Configure the database" : "Configureer de database",
+    "Only %s is available." : "Alleen %s is beschikbaar.",
+    "Database user" : "Gebruiker database",
+    "Database password" : "Wachtwoord database",
+    "Database name" : "Naam database",
+    "Database tablespace" : "Database tablespace",
+    "Database host" : "Databaseserver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit te veranderen.",
+    "Finish setup" : "Installatie afronden",
+    "Finishing …" : "Afronden ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Deze applicatie heeft JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
+    "%s is available. Get more information on how to update." : "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
+    "Log out" : "Afmelden",
+    "Server side authentication failed!" : "Authenticatie bij de server mislukte!",
+    "Please contact your administrator." : "Neem contact op met uw systeembeheerder.",
+    "Forgot your password? Reset it!" : "Wachtwoord vergeten? Herstel het!",
+    "remember" : "onthoud gegevens",
+    "Log in" : "Meld u aan",
+    "Alternative Logins" : "Alternatieve inlogs",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
+    "This means only administrators can use the instance." : "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Neem contact op met uw systeembeheerder als deze melding aanhoudt of onverwacht verscheen.",
+    "Thank you for your patience." : "Bedankt voor uw geduld.",
+    "You are accessing the server from an untrusted domain." : "U benadert de server vanaf een niet vertrouwd domein.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Afhankelijk van uw configuratie zou u als beheerder ook de onderstaande knop kunnen gebruiken om dit domein te vertrouwen.",
+    "Add \"%s\" as trusted domain" : "\"%s\" toevoegen als vertrouwd domein",
+    "%s will be updated to version %s." : "%s wordt bijgewerkt naar versie %s.",
+    "The following apps will be disabled:" : "De volgende apps worden uitgeschakeld:",
+    "The theme %s has been disabled." : "Het thema %s is uitgeschakeld.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
+    "Start update" : "Begin de update",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Om time-outs tijdens grotere installaties te voorkomen, kunt u in plaats hiervan de volgende opdracht geven vanaf uw installatiedirectory:",
+    "This %s instance is currently being updated, which may take a while." : "Deze %s-installatie wordt momenteel geüpdatet. Dat kan enige tijd duren.",
+    "This page will refresh itself when the %s instance is available again." : "Deze pagina wordt ververst als de %s-installatie weer beschikbaar is."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
deleted file mode 100644
index b6c3b5ce401..00000000000
--- a/core/l10n/nl.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kon geen e-mail sturen aan de volgende gebruikers: %s",
-"Turned on maintenance mode" => "Onderhoudsmodus ingeschakeld",
-"Turned off maintenance mode" => "Onderhoudsmodus uitgeschakeld",
-"Updated database" => "Database bijgewerkt",
-"Checked database schema update" => "Database schema-update gecontroleerd",
-"Checked database schema update for apps" => "Database schema-update voor apps gecontroleerd",
-"Updated \"%s\" to %s" => "Bijgewerkt \"%s\" naar %s",
-"Disabled incompatible apps: %s" => "Gedeactiveerde incompatibele apps: %s",
-"No image or file provided" => "Geen afbeelding of bestand opgegeven",
-"Unknown filetype" => "Onbekend bestandsformaat",
-"Invalid image" => "Ongeldige afbeelding",
-"No temporary profile picture available, try again" => "Geen tijdelijke profielafbeelding beschikbaar. Probeer het opnieuw",
-"No crop data provided" => "Geen bijsnijdingsgegevens opgegeven",
-"Sunday" => "zondag",
-"Monday" => "maandag",
-"Tuesday" => "dinsdag",
-"Wednesday" => "woensdag",
-"Thursday" => "donderdag",
-"Friday" => "vrijdag",
-"Saturday" => "zaterdag",
-"January" => "januari",
-"February" => "februari",
-"March" => "maart",
-"April" => "april",
-"May" => "mei",
-"June" => "juni",
-"July" => "juli",
-"August" => "augustus",
-"September" => "september",
-"October" => "oktober",
-"November" => "november",
-"December" => "december",
-"Settings" => "Instellingen",
-"File" => "Bestand",
-"Folder" => "Map",
-"Image" => "Afbeelding",
-"Audio" => "Audio",
-"Saving..." => "Opslaan",
-"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?",
-"I know what I'm doing" => "Ik weet wat ik doe",
-"Reset password" => "Reset wachtwoord",
-"Password can not be changed. Please contact your administrator." => "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
-"No" => "Nee",
-"Yes" => "Ja",
-"Choose" => "Kies",
-"Error loading file picker template: {error}" => "Fout bij laden bestandenselecteur sjabloon: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Fout bij laden berichtensjabloon: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} bestandsconflict","{count} bestandsconflicten"),
-"One file conflict" => "Een bestandsconflict",
-"New Files" => "Nieuwe bestanden",
-"Already existing files" => "Al aanwezige bestanden",
-"Which files do you want to keep?" => "Welke bestanden wilt u bewaren?",
-"If you select both versions, the copied file will have a number added to its name." => "Als u beide versies selecteerde, zal het gekopieerde bestand een nummer aan de naam toegevoegd krijgen.",
-"Cancel" => "Annuleer",
-"Continue" => "Verder",
-"(all selected)" => "(alles geselecteerd)",
-"({count} selected)" => "({count} geselecteerd)",
-"Error loading file exists template" => "Fout bij laden bestand bestaat al sjabloon",
-"Very weak password" => "Zeer zwak wachtwoord",
-"Weak password" => "Zwak wachtwoord",
-"So-so password" => "Matig wachtwoord",
-"Good password" => "Goed wachtwoord",
-"Strong password" => "Sterk wachtwoord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Uw webserver is nog niet goed ingesteld voor bestandssynchronisatie omdat de WebDAV interface verbroken lijkt.",
-"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." => "Deze server heeft geen actieve internetverbinding. Dat betekent dat sommige functies, zoals aankoppelen van externe opslag, notificaties over updates of installatie van apps van 3e partijen niet werken. Ook het benaderen van bestanden vanaf een remote locatie en het versturen van notificatie emails kan mislukken. We adviseren om de internetverbinding voor deze server in te schakelen als u alle functies wilt gebruiken.",
-"Error occurred while checking server setup" => "Een fout trad op bij checken serverconfiguratie",
-"Shared" => "Gedeeld",
-"Shared with {recipients}" => "Gedeeld met {recipients}",
-"Share" => "Delen",
-"Error" => "Fout",
-"Error while sharing" => "Fout tijdens het delen",
-"Error while unsharing" => "Fout tijdens het stoppen met delen",
-"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 user or group …" => "Delen met gebruiker of groep ...",
-"Share link" => "Deel link",
-"The public link will expire no later than {days} days after it is created" => "De openbare link vervalt niet eerder dan {days} dagen na het aanmaken",
-"Password protect" => "Wachtwoord beveiligd",
-"Choose a password for the public link" => "Kies een wachtwoord voor de openbare link",
-"Allow Public Upload" => "Sta publieke uploads toe",
-"Email link to person" => "E-mail link naar persoon",
-"Send" => "Versturen",
-"Set expiration date" => "Stel vervaldatum in",
-"Expiration date" => "Vervaldatum",
-"Adding user..." => "Toevoegen gebruiker...",
-"group" => "groep",
-"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",
-"can share" => "kan delen",
-"can edit" => "kan wijzigen",
-"access control" => "toegangscontrole",
-"create" => "creëer",
-"update" => "bijwerken",
-"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",
-"Warning" => "Waarschuwing",
-"The object type is not specified." => "Het object type is niet gespecificeerd.",
-"Enter new" => "Opgeven nieuw",
-"Delete" => "Verwijder",
-"Add" => "Toevoegen",
-"Edit tags" => "Bewerken tags",
-"Error loading dialog template: {error}" => "Fout bij laden dialoog sjabloon: {error}",
-"No tags selected for deletion." => "Geen tags geselecteerd voor verwijdering.",
-"Updating {productName} to version {version}, this may take a while." => "Bijwerken {productName} naar versie {version}, dit kan even duren.",
-"Please reload the page." => "Herlaad deze pagina.",
-"The update was unsuccessful." => "De update is niet geslaagd.",
-"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 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",
-"Use the following link to reset your password: {link}" => "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
-"You will receive a link to reset your password via Email." => "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
-"Username" => "Gebruikersnaam",
-"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?" => "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
-"Yes, I really want to reset my password now" => "Ja, ik wil mijn wachtwoord nu echt resetten",
-"Reset" => "Reset",
-"New password" => "Nieuw wachtwoord",
-"New Password" => "Nieuw wachtwoord",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
-"For the best results, please consider using a GNU/Linux server instead." => "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
-"Personal" => "Persoonlijk",
-"Users" => "Gebruikers",
-"Apps" => "Apps",
-"Admin" => "Beheerder",
-"Help" => "Help",
-"Error loading tags" => "Fout bij laden tags",
-"Tag already exists" => "Tag bestaat al",
-"Error deleting tag(s)" => "Fout bij verwijderen tag(s)",
-"Error tagging" => "Fout bij taggen",
-"Error untagging" => "Fout bij ont-taggen",
-"Error favoriting" => "Fout bij favoriet maken",
-"Error unfavoriting" => "Fout bij verwijderen favorietstatus",
-"Access forbidden" => "Toegang verboden",
-"File not found" => "Bestand niet gevonden",
-"The specified document has not been found on the server." => "Het opgegeven document is niet gevonden op deze server.",
-"You can click here to return to %s." => "Klik hier om terug te keren naar %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hallo,\n\n%s deelt %s met u.\nBekijk het hier: %s\n\n",
-"The share will expire on %s." => "De share vervalt op %s.",
-"Cheers!" => "Proficiat!",
-"Internal Server Error" => "Interne serverfout",
-"The server encountered an internal error and was unable to complete your request." => "De server ontdekte een interne fout en kon uw aanvraag niet verder uitvoeren.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Neem contact op mer de serverbeheerder als deze fout meerdere keren optreedt en neem de onderstaande technische details op in uw melding.",
-"More details can be found in the server log." => "Meer details in de serverlogging,",
-"Technical details" => "Technische details",
-"Remote Address: %s" => "Extern adres: %s",
-"Request ID: %s" => "Aanvraag ID: %s",
-"Code: %s" => "Code: %s",
-"Message: %s" => "Boodschap: %s",
-"File: %s" => "Bestand: %s",
-"Line: %s" => "Regel: %s",
-"Trace" => "Trace",
-"Security Warning" => "Beveiligingswaarschuwing",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uw PHP-versie is kwetsbaar voor de NULL byte aanval (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Werk uw PHP installatie bij om %s veilig te kunnen gebruiken.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
-"Create an <strong>admin account</strong>" => "Maak een <strong>beheerdersaccount</strong> aan",
-"Password" => "Wachtwoord",
-"Storage & database" => "Opslag & database",
-"Data folder" => "Gegevensmap",
-"Configure the database" => "Configureer de database",
-"Only %s is available." => "Alleen %s is beschikbaar.",
-"Database user" => "Gebruiker database",
-"Database password" => "Wachtwoord database",
-"Database name" => "Naam database",
-"Database tablespace" => "Database tablespace",
-"Database host" => "Databaseserver",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit te veranderen.",
-"Finish setup" => "Installatie afronden",
-"Finishing …" => "Afronden ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Deze applicatie heeft JavaScript nodig. <a href=\"http://enable-javascript.com/\" target=\"_blank\">Activeer JavaScript</a> en herlaad deze interface.",
-"%s is available. Get more information on how to update." => "%s is beschikbaar. Verkrijg meer informatie over het bijwerken.",
-"Log out" => "Afmelden",
-"Server side authentication failed!" => "Authenticatie bij de server mislukte!",
-"Please contact your administrator." => "Neem contact op met uw systeembeheerder.",
-"Forgot your password? Reset it!" => "Wachtwoord vergeten? Herstel het!",
-"remember" => "onthoud gegevens",
-"Log in" => "Meld u aan",
-"Alternative Logins" => "Alternatieve inlogs",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Hallo,<br><br>%s deelt <strong>%s</strong> met u.<br><a href=\"%s\">Bekijk het!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Deze ownCloud werkt momenteel in enkele gebruiker modus.",
-"This means only administrators can use the instance." => "Dat betekent dat alleen beheerders deze installatie kunnen gebruiken.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Neem contact op met uw systeembeheerder als deze melding aanhoudt of onverwacht verscheen.",
-"Thank you for your patience." => "Bedankt voor uw geduld.",
-"You are accessing the server from an untrusted domain." => "U benadert de server vanaf een niet vertrouwd domein.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Neem contact op met uw beheerder. Als u de beheerder van deze service bent, configureer dan de \"trusted_domain\" instelling in config/config.php. Een voorbeeldconfiguratie is gegeven in config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Afhankelijk van uw configuratie zou u als beheerder ook de onderstaande knop kunnen gebruiken om dit domein te vertrouwen.",
-"Add \"%s\" as trusted domain" => "\"%s\" toevoegen als vertrouwd domein",
-"%s will be updated to version %s." => "%s wordt bijgewerkt naar versie %s.",
-"The following apps will be disabled:" => "De volgende apps worden uitgeschakeld:",
-"The theme %s has been disabled." => "Het thema %s is uitgeschakeld.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Let erop dat de database, de config map en de data map zijn gebackupped voordat u verder gaat.",
-"Start update" => "Begin de update",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Om time-outs tijdens grotere installaties te voorkomen, kunt u in plaats hiervan de volgende opdracht geven vanaf uw installatiedirectory:",
-"This %s instance is currently being updated, which may take a while." => "Deze %s-installatie wordt momenteel geüpdatet. Dat kan enige tijd duren.",
-"This page will refresh itself when the %s instance is available again." => "Deze pagina wordt ververst als de %s-installatie weer beschikbaar is."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
new file mode 100644
index 00000000000..ed4f66d57df
--- /dev/null
+++ b/core/l10n/nn_NO.js
@@ -0,0 +1,126 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Kunne ikkje snede e-post til følgande brukarar: %s ",
+    "Turned on maintenance mode" : "Skrudde på vedlikehaldsmodus",
+    "Turned off maintenance mode" : "Skrudde av vedlikehaldsmodus",
+    "Updated database" : "Database oppdatert",
+    "No image or file provided" : "Inga bilete eller fil gitt",
+    "Unknown filetype" : "Ukjend filtype",
+    "Invalid image" : "Ugyldig bilete",
+    "No temporary profile picture available, try again" : "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
+    "No crop data provided" : "Ingen beskjeringsdata gitt",
+    "Sunday" : "Søndag",
+    "Monday" : "Måndag",
+    "Tuesday" : "Tysdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Laurdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Innstillingar",
+    "Folder" : "Mappe",
+    "Saving..." : "Lagrar …",
+    "I know what I'm doing" : "Eg veit kva eg gjer",
+    "Reset password" : "Nullstill passord",
+    "No" : "Nei",
+    "Yes" : "Ja",
+    "Choose" : "Vel",
+    "Error loading file picker template: {error}" : "Klarte ikkje å lasta filplukkarmal: {error}",
+    "Ok" : "Greitt",
+    "Error loading message template: {error}" : "Klarte ikkje å lasta meldingsmal: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonfliktar"],
+    "One file conflict" : "Éin filkonflikt",
+    "Which files do you want to keep?" : "Kva filer vil du spara?",
+    "If you select both versions, the copied file will have a number added to its name." : "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Gå vidare",
+    "(all selected)" : "(alle valte)",
+    "({count} selected)" : "({count} valte)",
+    "Error loading file exists template" : "Klarte ikkje å lasta fil-finst-mal",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+    "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." : "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
+    "Shared" : "Delt",
+    "Share" : "Del",
+    "Error" : "Feil",
+    "Error while sharing" : "Feil ved deling",
+    "Error while unsharing" : "Feil ved udeling",
+    "Error while changing permissions" : "Feil ved endring av tillatingar",
+    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppa {group} av {owner}",
+    "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Share link" : "Del lenkje",
+    "Password protect" : "Passordvern",
+    "Choose a password for the public link" : "Vel eit passord for den offentlege lenkja",
+    "Allow Public Upload" : "Tillat offentleg opplasting",
+    "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 in {item} with {user}" : "Delt i {item} med {brukar}",
+    "Unshare" : "Udel",
+    "can share" : "kan dela",
+    "can edit" : "kan endra",
+    "access control" : "tilgangskontroll",
+    "create" : "lag",
+    "update" : "oppdater",
+    "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",
+    "Warning" : "Åtvaring",
+    "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
+    "Delete" : "Slett",
+    "Add" : "Legg til",
+    "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+    "%s password reset" : "%s passordnullstilling",
+    "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
+    "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
+    "Username" : "Brukarnamn",
+    "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?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
+    "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no",
+    "New password" : "Nytt passord",
+    "Personal" : "Personleg",
+    "Users" : "Brukarar",
+    "Apps" : "Program",
+    "Admin" : "Admin",
+    "Help" : "Hjelp",
+    "Access forbidden" : "Tilgang forbudt",
+    "Security Warning" : "Tryggleiksåtvaring",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
+    "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
+    "Password" : "Passord",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Set opp databasen",
+    "Database user" : "Databasebrukar",
+    "Database password" : "Databasepassord",
+    "Database name" : "Databasenamn",
+    "Database tablespace" : "Tabellnamnrom for database",
+    "Database host" : "Databasetenar",
+    "Finish setup" : "Fullfør oppsettet",
+    "%s is available. Get more information on how to update." : "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.",
+    "Log out" : "Logg ut",
+    "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
new file mode 100644
index 00000000000..a4be2d9acee
--- /dev/null
+++ b/core/l10n/nn_NO.json
@@ -0,0 +1,124 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Kunne ikkje snede e-post til følgande brukarar: %s ",
+    "Turned on maintenance mode" : "Skrudde på vedlikehaldsmodus",
+    "Turned off maintenance mode" : "Skrudde av vedlikehaldsmodus",
+    "Updated database" : "Database oppdatert",
+    "No image or file provided" : "Inga bilete eller fil gitt",
+    "Unknown filetype" : "Ukjend filtype",
+    "Invalid image" : "Ugyldig bilete",
+    "No temporary profile picture available, try again" : "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
+    "No crop data provided" : "Ingen beskjeringsdata gitt",
+    "Sunday" : "Søndag",
+    "Monday" : "Måndag",
+    "Tuesday" : "Tysdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Laurdag",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Mai",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "August",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "Desember",
+    "Settings" : "Innstillingar",
+    "Folder" : "Mappe",
+    "Saving..." : "Lagrar …",
+    "I know what I'm doing" : "Eg veit kva eg gjer",
+    "Reset password" : "Nullstill passord",
+    "No" : "Nei",
+    "Yes" : "Ja",
+    "Choose" : "Vel",
+    "Error loading file picker template: {error}" : "Klarte ikkje å lasta filplukkarmal: {error}",
+    "Ok" : "Greitt",
+    "Error loading message template: {error}" : "Klarte ikkje å lasta meldingsmal: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonfliktar"],
+    "One file conflict" : "Éin filkonflikt",
+    "Which files do you want to keep?" : "Kva filer vil du spara?",
+    "If you select both versions, the copied file will have a number added to its name." : "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Gå vidare",
+    "(all selected)" : "(alle valte)",
+    "({count} selected)" : "({count} valte)",
+    "Error loading file exists template" : "Klarte ikkje å lasta fil-finst-mal",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
+    "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." : "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
+    "Shared" : "Delt",
+    "Share" : "Del",
+    "Error" : "Feil",
+    "Error while sharing" : "Feil ved deling",
+    "Error while unsharing" : "Feil ved udeling",
+    "Error while changing permissions" : "Feil ved endring av tillatingar",
+    "Shared with you and the group {group} by {owner}" : "Delt med deg og gruppa {group} av {owner}",
+    "Shared with you by {owner}" : "Delt med deg av {owner}",
+    "Share link" : "Del lenkje",
+    "Password protect" : "Passordvern",
+    "Choose a password for the public link" : "Vel eit passord for den offentlege lenkja",
+    "Allow Public Upload" : "Tillat offentleg opplasting",
+    "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 in {item} with {user}" : "Delt i {item} med {brukar}",
+    "Unshare" : "Udel",
+    "can share" : "kan dela",
+    "can edit" : "kan endra",
+    "access control" : "tilgangskontroll",
+    "create" : "lag",
+    "update" : "oppdater",
+    "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",
+    "Warning" : "Åtvaring",
+    "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
+    "Delete" : "Slett",
+    "Add" : "Legg til",
+    "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
+    "%s password reset" : "%s passordnullstilling",
+    "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
+    "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
+    "Username" : "Brukarnamn",
+    "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?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
+    "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no",
+    "New password" : "Nytt passord",
+    "Personal" : "Personleg",
+    "Users" : "Brukarar",
+    "Apps" : "Program",
+    "Admin" : "Admin",
+    "Help" : "Hjelp",
+    "Access forbidden" : "Tilgang forbudt",
+    "Security Warning" : "Tryggleiksåtvaring",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
+    "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
+    "Password" : "Passord",
+    "Data folder" : "Datamappe",
+    "Configure the database" : "Set opp databasen",
+    "Database user" : "Databasebrukar",
+    "Database password" : "Databasepassord",
+    "Database name" : "Databasenamn",
+    "Database tablespace" : "Tabellnamnrom for database",
+    "Database host" : "Databasetenar",
+    "Finish setup" : "Fullfør oppsettet",
+    "%s is available. Get more information on how to update." : "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.",
+    "Log out" : "Logg ut",
+    "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/nn_NO.php b/core/l10n/nn_NO.php
deleted file mode 100644
index dcbad11138d..00000000000
--- a/core/l10n/nn_NO.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Kunne ikkje snede e-post til følgande brukarar: %s ",
-"Turned on maintenance mode" => "Skrudde på vedlikehaldsmodus",
-"Turned off maintenance mode" => "Skrudde av vedlikehaldsmodus",
-"Updated database" => "Database oppdatert",
-"No image or file provided" => "Inga bilete eller fil gitt",
-"Unknown filetype" => "Ukjend filtype",
-"Invalid image" => "Ugyldig bilete",
-"No temporary profile picture available, try again" => "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
-"No crop data provided" => "Ingen beskjeringsdata gitt",
-"Sunday" => "Søndag",
-"Monday" => "Måndag",
-"Tuesday" => "Tysdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Laurdag",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"Settings" => "Innstillingar",
-"Folder" => "Mappe",
-"Saving..." => "Lagrar …",
-"I know what I'm doing" => "Eg veit kva eg gjer",
-"Reset password" => "Nullstill passord",
-"No" => "Nei",
-"Yes" => "Ja",
-"Choose" => "Vel",
-"Error loading file picker template: {error}" => "Klarte ikkje å lasta filplukkarmal: {error}",
-"Ok" => "Greitt",
-"Error loading message template: {error}" => "Klarte ikkje å lasta meldingsmal: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonfliktar"),
-"One file conflict" => "Éin filkonflikt",
-"Which files do you want to keep?" => "Kva filer vil du spara?",
-"If you select both versions, the copied file will have a number added to its name." => "Viss du vel begge utgåvene, vil den kopierte fila få eit tal lagt til namnet.",
-"Cancel" => "Avbryt",
-"Continue" => "Gå vidare",
-"(all selected)" => "(alle valte)",
-"({count} selected)" => "({count} valte)",
-"Error loading file exists template" => "Klarte ikkje å lasta fil-finst-mal",
-"Very weak password" => "Veldig svakt passord",
-"Weak password" => "Svakt passord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Tenaren din er ikkje enno rett innstilt til å tilby filsynkronisering sidan WebDAV-grensesnittet ser ut til å vera øydelagt.",
-"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." => "Denne tenaren har ikkje ei fungerande nettilkopling. Dette vil seia at visse funksjonar, som montering av ekstern lagring, meldingar om oppdateringar eller installering av tredjepartsprogram, ikkje vil fungera. Det kan òg henda at du ikkje får tilgang til filene dine utanfrå, eller ikkje får sendt varslingsepostar. Me rår deg til å skru på nettilkoplinga for denne tenaren viss du ønskjer desse funksjonane.",
-"Shared" => "Delt",
-"Share" => "Del",
-"Error" => "Feil",
-"Error while sharing" => "Feil ved deling",
-"Error while unsharing" => "Feil ved udeling",
-"Error while changing permissions" => "Feil ved endring av tillatingar",
-"Shared with you and the group {group} by {owner}" => "Delt med deg og gruppa {group} av {owner}",
-"Shared with you by {owner}" => "Delt med deg av {owner}",
-"Share link" => "Del lenkje",
-"Password protect" => "Passordvern",
-"Choose a password for the public link" => "Vel eit passord for den offentlege lenkja",
-"Allow Public Upload" => "Tillat offentleg opplasting",
-"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 in {item} with {user}" => "Delt i {item} med {brukar}",
-"Unshare" => "Udel",
-"can share" => "kan dela",
-"can edit" => "kan endra",
-"access control" => "tilgangskontroll",
-"create" => "lag",
-"update" => "oppdater",
-"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",
-"Warning" => "Åtvaring",
-"The object type is not specified." => "Objekttypen er ikkje spesifisert.",
-"Delete" => "Slett",
-"Add" => "Legg til",
-"The update was successful. Redirecting you to ownCloud now." => "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
-"%s password reset" => "%s passordnullstilling",
-"Use the following link to reset your password: {link}" => "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
-"You will receive a link to reset your password via Email." => "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
-"Username" => "Brukarnamn",
-"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?" => "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
-"Yes, I really want to reset my password now" => "Ja, eg vil nullstilla passordet mitt no",
-"New password" => "Nytt passord",
-"Personal" => "Personleg",
-"Users" => "Brukarar",
-"Apps" => "Program",
-"Admin" => "Admin",
-"Help" => "Hjelp",
-"Access forbidden" => "Tilgang forbudt",
-"Security Warning" => "Tryggleiksåtvaring",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP-utgåva di er sårbar for NULL-byteåtaket (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Ver venleg og oppdater PHP-installasjonen din til å brukar %s trygt.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
-"Create an <strong>admin account</strong>" => "Lag ein <strong>admin-konto</strong>",
-"Password" => "Passord",
-"Data folder" => "Datamappe",
-"Configure the database" => "Set opp databasen",
-"Database user" => "Databasebrukar",
-"Database password" => "Databasepassord",
-"Database name" => "Databasenamn",
-"Database tablespace" => "Tabellnamnrom for database",
-"Database host" => "Databasetenar",
-"Finish setup" => "Fullfør oppsettet",
-"%s is available. Get more information on how to update." => "%s er tilgjengeleg. Få meir informasjon om korleis du oppdaterer.",
-"Log out" => "Logg ut",
-"remember" => "hugs",
-"Log in" => "Logg inn",
-"Alternative Logins" => "Alternative innloggingar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/nqo.js b/core/l10n/nqo.js
new file mode 100644
index 00000000000..87077ecad97
--- /dev/null
+++ b/core/l10n/nqo.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/nqo.json b/core/l10n/nqo.json
new file mode 100644
index 00000000000..c499f696550
--- /dev/null
+++ b/core/l10n/nqo.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/nqo.php b/core/l10n/nqo.php
deleted file mode 100644
index 1191769faa7..00000000000
--- a/core/l10n/nqo.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
new file mode 100644
index 00000000000..42d1151455d
--- /dev/null
+++ b/core/l10n/oc.js
@@ -0,0 +1,79 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Dimenge",
+    "Monday" : "Diluns",
+    "Tuesday" : "Dimarç",
+    "Wednesday" : "Dimecres",
+    "Thursday" : "Dijòus",
+    "Friday" : "Divendres",
+    "Saturday" : "Dissabte",
+    "January" : "genièr",
+    "February" : "febrièr",
+    "March" : "març",
+    "April" : "abril",
+    "May" : "mai",
+    "June" : "junh",
+    "July" : "julhet",
+    "August" : "agost",
+    "September" : "septembre",
+    "October" : "octobre",
+    "November" : "Novembre",
+    "December" : "Decembre",
+    "Settings" : "Configuracion",
+    "Folder" : "Dorsièr",
+    "Saving..." : "Enregistra...",
+    "Reset password" : "Senhal tornat botar",
+    "No" : "Non",
+    "Yes" : "Òc",
+    "Choose" : "Causís",
+    "Ok" : "D'accòrdi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Annula",
+    "Share" : "Parteja",
+    "Error" : "Error",
+    "Error while sharing" : "Error al partejar",
+    "Error while unsharing" : "Error al non partejar",
+    "Error while changing permissions" : "Error al cambiar permissions",
+    "Password protect" : "Parat per senhal",
+    "Set expiration date" : "Met la data d'expiracion",
+    "Expiration date" : "Data d'expiracion",
+    "group" : "grop",
+    "Resharing is not allowed" : "Tornar partejar es pas permis",
+    "Unshare" : "Pas partejador",
+    "can edit" : "pòt modificar",
+    "access control" : "Contraròtle d'acces",
+    "create" : "crea",
+    "update" : "met a jorn",
+    "delete" : "escafa",
+    "Password protected" : "Parat per senhal",
+    "Error unsetting expiration date" : "Error al metre de la data d'expiracion",
+    "Error setting expiration date" : "Error setting expiration date",
+    "Delete" : "Escafa",
+    "Add" : "Ajusta",
+    "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
+    "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
+    "Username" : "Non d'usancièr",
+    "New password" : "Senhal novèl",
+    "Personal" : "Personal",
+    "Users" : "Usancièrs",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Access forbidden" : "Acces enebit",
+    "Security Warning" : "Avertiment de securitat",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
+    "Password" : "Senhal",
+    "Data folder" : "Dorsièr de donadas",
+    "Configure the database" : "Configura la basa de donadas",
+    "Database user" : "Usancièr de la basa de donadas",
+    "Database password" : "Senhal de la basa de donadas",
+    "Database name" : "Nom de la basa de donadas",
+    "Database tablespace" : "Espandi de taula de basa de donadas",
+    "Database host" : "Òste de basa de donadas",
+    "Finish setup" : "Configuracion acabada",
+    "Log out" : "Sortida",
+    "remember" : "bremba-te",
+    "Log in" : "Dintrada"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
new file mode 100644
index 00000000000..4faa8cd0be1
--- /dev/null
+++ b/core/l10n/oc.json
@@ -0,0 +1,77 @@
+{ "translations": {
+    "Sunday" : "Dimenge",
+    "Monday" : "Diluns",
+    "Tuesday" : "Dimarç",
+    "Wednesday" : "Dimecres",
+    "Thursday" : "Dijòus",
+    "Friday" : "Divendres",
+    "Saturday" : "Dissabte",
+    "January" : "genièr",
+    "February" : "febrièr",
+    "March" : "març",
+    "April" : "abril",
+    "May" : "mai",
+    "June" : "junh",
+    "July" : "julhet",
+    "August" : "agost",
+    "September" : "septembre",
+    "October" : "octobre",
+    "November" : "Novembre",
+    "December" : "Decembre",
+    "Settings" : "Configuracion",
+    "Folder" : "Dorsièr",
+    "Saving..." : "Enregistra...",
+    "Reset password" : "Senhal tornat botar",
+    "No" : "Non",
+    "Yes" : "Òc",
+    "Choose" : "Causís",
+    "Ok" : "D'accòrdi",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Annula",
+    "Share" : "Parteja",
+    "Error" : "Error",
+    "Error while sharing" : "Error al partejar",
+    "Error while unsharing" : "Error al non partejar",
+    "Error while changing permissions" : "Error al cambiar permissions",
+    "Password protect" : "Parat per senhal",
+    "Set expiration date" : "Met la data d'expiracion",
+    "Expiration date" : "Data d'expiracion",
+    "group" : "grop",
+    "Resharing is not allowed" : "Tornar partejar es pas permis",
+    "Unshare" : "Pas partejador",
+    "can edit" : "pòt modificar",
+    "access control" : "Contraròtle d'acces",
+    "create" : "crea",
+    "update" : "met a jorn",
+    "delete" : "escafa",
+    "Password protected" : "Parat per senhal",
+    "Error unsetting expiration date" : "Error al metre de la data d'expiracion",
+    "Error setting expiration date" : "Error setting expiration date",
+    "Delete" : "Escafa",
+    "Add" : "Ajusta",
+    "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
+    "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
+    "Username" : "Non d'usancièr",
+    "New password" : "Senhal novèl",
+    "Personal" : "Personal",
+    "Users" : "Usancièrs",
+    "Apps" : "Apps",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Access forbidden" : "Acces enebit",
+    "Security Warning" : "Avertiment de securitat",
+    "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
+    "Password" : "Senhal",
+    "Data folder" : "Dorsièr de donadas",
+    "Configure the database" : "Configura la basa de donadas",
+    "Database user" : "Usancièr de la basa de donadas",
+    "Database password" : "Senhal de la basa de donadas",
+    "Database name" : "Nom de la basa de donadas",
+    "Database tablespace" : "Espandi de taula de basa de donadas",
+    "Database host" : "Òste de basa de donadas",
+    "Finish setup" : "Configuracion acabada",
+    "Log out" : "Sortida",
+    "remember" : "bremba-te",
+    "Log in" : "Dintrada"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/oc.php b/core/l10n/oc.php
deleted file mode 100644
index d785441ee28..00000000000
--- a/core/l10n/oc.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Dimenge",
-"Monday" => "Diluns",
-"Tuesday" => "Dimarç",
-"Wednesday" => "Dimecres",
-"Thursday" => "Dijòus",
-"Friday" => "Divendres",
-"Saturday" => "Dissabte",
-"January" => "genièr",
-"February" => "febrièr",
-"March" => "març",
-"April" => "abril",
-"May" => "mai",
-"June" => "junh",
-"July" => "julhet",
-"August" => "agost",
-"September" => "septembre",
-"October" => "octobre",
-"November" => "Novembre",
-"December" => "Decembre",
-"Settings" => "Configuracion",
-"Folder" => "Dorsièr",
-"Saving..." => "Enregistra...",
-"Reset password" => "Senhal tornat botar",
-"No" => "Non",
-"Yes" => "Òc",
-"Choose" => "Causís",
-"Ok" => "D'accòrdi",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Annula",
-"Share" => "Parteja",
-"Error" => "Error",
-"Error while sharing" => "Error al partejar",
-"Error while unsharing" => "Error al non partejar",
-"Error while changing permissions" => "Error al cambiar permissions",
-"Password protect" => "Parat per senhal",
-"Set expiration date" => "Met la data d'expiracion",
-"Expiration date" => "Data d'expiracion",
-"group" => "grop",
-"Resharing is not allowed" => "Tornar partejar es pas permis",
-"Unshare" => "Pas partejador",
-"can edit" => "pòt modificar",
-"access control" => "Contraròtle d'acces",
-"create" => "crea",
-"update" => "met a jorn",
-"delete" => "escafa",
-"Password protected" => "Parat per senhal",
-"Error unsetting expiration date" => "Error al metre de la data d'expiracion",
-"Error setting expiration date" => "Error setting expiration date",
-"Delete" => "Escafa",
-"Add" => "Ajusta",
-"Use the following link to reset your password: {link}" => "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
-"You will receive a link to reset your password via Email." => "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-"Username" => "Non d'usancièr",
-"New password" => "Senhal novèl",
-"Personal" => "Personal",
-"Users" => "Usancièrs",
-"Apps" => "Apps",
-"Admin" => "Admin",
-"Help" => "Ajuda",
-"Access forbidden" => "Acces enebit",
-"Security Warning" => "Avertiment de securitat",
-"Create an <strong>admin account</strong>" => "Crea un <strong>compte admin</strong>",
-"Password" => "Senhal",
-"Data folder" => "Dorsièr de donadas",
-"Configure the database" => "Configura la basa de donadas",
-"Database user" => "Usancièr de la basa de donadas",
-"Database password" => "Senhal de la basa de donadas",
-"Database name" => "Nom de la basa de donadas",
-"Database tablespace" => "Espandi de taula de basa de donadas",
-"Database host" => "Òste de basa de donadas",
-"Finish setup" => "Configuracion acabada",
-"Log out" => "Sortida",
-"remember" => "bremba-te",
-"Log in" => "Dintrada"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/or_IN.js b/core/l10n/or_IN.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/or_IN.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/or_IN.json b/core/l10n/or_IN.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/or_IN.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/or_IN.php b/core/l10n/or_IN.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/or_IN.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
new file mode 100644
index 00000000000..8be57366967
--- /dev/null
+++ b/core/l10n/pa.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "ਐਤਵਾਰ",
+    "Monday" : "ਸੋਮਵਾਰ",
+    "Tuesday" : "ਮੰਗਲਵਾਰ",
+    "Wednesday" : "ਬੁੱਧਵਾਰ",
+    "Thursday" : "ਵੀਰਵਾਰ",
+    "Friday" : "ਸ਼ੁੱਕਰਵਾਰ",
+    "Saturday" : "ਸ਼ਨਿੱਚਰਵਾਰ",
+    "January" : "ਜਨਵਰੀ",
+    "February" : "ਫਰਵਰੀ",
+    "March" : "ਮਾਰਚ",
+    "April" : "ਅਪਰੈ",
+    "May" : "ਮਈ",
+    "June" : "ਜੂਨ",
+    "July" : "ਜੁਲਾਈ",
+    "August" : "ਅਗਸਤ",
+    "September" : "ਸਤੰਬ",
+    "October" : "ਅਕਤੂਬਰ",
+    "November" : "ਨਵੰਬ",
+    "December" : "ਦਸੰਬਰ",
+    "Settings" : "ਸੈਟਿੰਗ",
+    "Saving..." : "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
+    "No" : "ਨਹੀਂ",
+    "Yes" : "ਹਾਂ",
+    "Choose" : "ਚੁਣੋ",
+    "Ok" : "ਠੀਕ ਹੈ",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
+    "Error" : "ਗਲ",
+    "Send" : "ਭੇਜੋ",
+    "Warning" : "ਚੇਤਾਵਨੀ",
+    "Delete" : "ਹਟਾਓ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
+    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Password" : "ਪਾਸਵਰ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
new file mode 100644
index 00000000000..d801809d018
--- /dev/null
+++ b/core/l10n/pa.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Sunday" : "ਐਤਵਾਰ",
+    "Monday" : "ਸੋਮਵਾਰ",
+    "Tuesday" : "ਮੰਗਲਵਾਰ",
+    "Wednesday" : "ਬੁੱਧਵਾਰ",
+    "Thursday" : "ਵੀਰਵਾਰ",
+    "Friday" : "ਸ਼ੁੱਕਰਵਾਰ",
+    "Saturday" : "ਸ਼ਨਿੱਚਰਵਾਰ",
+    "January" : "ਜਨਵਰੀ",
+    "February" : "ਫਰਵਰੀ",
+    "March" : "ਮਾਰਚ",
+    "April" : "ਅਪਰੈ",
+    "May" : "ਮਈ",
+    "June" : "ਜੂਨ",
+    "July" : "ਜੁਲਾਈ",
+    "August" : "ਅਗਸਤ",
+    "September" : "ਸਤੰਬ",
+    "October" : "ਅਕਤੂਬਰ",
+    "November" : "ਨਵੰਬ",
+    "December" : "ਦਸੰਬਰ",
+    "Settings" : "ਸੈਟਿੰਗ",
+    "Saving..." : "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
+    "No" : "ਨਹੀਂ",
+    "Yes" : "ਹਾਂ",
+    "Choose" : "ਚੁਣੋ",
+    "Ok" : "ਠੀਕ ਹੈ",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Share" : "ਸਾਂਝਾ ਕਰੋ",
+    "Error" : "ਗਲ",
+    "Send" : "ਭੇਜੋ",
+    "Warning" : "ਚੇਤਾਵਨੀ",
+    "Delete" : "ਹਟਾਓ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
+    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Password" : "ਪਾਸਵਰ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/pa.php b/core/l10n/pa.php
deleted file mode 100644
index 820ea0280eb..00000000000
--- a/core/l10n/pa.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "ਐਤਵਾਰ",
-"Monday" => "ਸੋਮਵਾਰ",
-"Tuesday" => "ਮੰਗਲਵਾਰ",
-"Wednesday" => "ਬੁੱਧਵਾਰ",
-"Thursday" => "ਵੀਰਵਾਰ",
-"Friday" => "ਸ਼ੁੱਕਰਵਾਰ",
-"Saturday" => "ਸ਼ਨਿੱਚਰਵਾਰ",
-"January" => "ਜਨਵਰੀ",
-"February" => "ਫਰਵਰੀ",
-"March" => "ਮਾਰਚ",
-"April" => "ਅਪਰੈ",
-"May" => "ਮਈ",
-"June" => "ਜੂਨ",
-"July" => "ਜੁਲਾਈ",
-"August" => "ਅਗਸਤ",
-"September" => "ਸਤੰਬ",
-"October" => "ਅਕਤੂਬਰ",
-"November" => "ਨਵੰਬ",
-"December" => "ਦਸੰਬਰ",
-"Settings" => "ਸੈਟਿੰਗ",
-"Saving..." => "...ਸੰਭਾਲਿਆ ਜਾ ਰਿਹਾ ਹੈ",
-"No" => "ਨਹੀਂ",
-"Yes" => "ਹਾਂ",
-"Choose" => "ਚੁਣੋ",
-"Ok" => "ਠੀਕ ਹੈ",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "ਰੱਦ ਕਰੋ",
-"Share" => "ਸਾਂਝਾ ਕਰੋ",
-"Error" => "ਗਲ",
-"Send" => "ਭੇਜੋ",
-"Warning" => "ਚੇਤਾਵਨੀ",
-"Delete" => "ਹਟਾਓ",
-"Username" => "ਯੂਜ਼ਰ-ਨਾਂ",
-"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
-"Password" => "ਪਾਸਵਰ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
new file mode 100644
index 00000000000..c330e002863
--- /dev/null
+++ b/core/l10n/pl.js
@@ -0,0 +1,210 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nie można było wysłać wiadomości do następujących użytkowników: %s",
+    "Turned on maintenance mode" : "Włączony tryb konserwacji",
+    "Turned off maintenance mode" : "Wyłączony tryb konserwacji",
+    "Updated database" : "Zaktualizuj bazę",
+    "Checked database schema update" : "Sprawdzono aktualizację schematu bazy danych",
+    "Checked database schema update for apps" : "Sprawdzono aktualizację schematu bazy danych dla aplikacji",
+    "Updated \"%s\" to %s" : "Zaktualizowano \"%s\" do %s",
+    "Disabled incompatible apps: %s" : "Wyłączone niekompatybilne aplikacja: %s",
+    "No image or file provided" : "Brak obrazu lub pliku dostarczonego",
+    "Unknown filetype" : "Nieznany typ pliku",
+    "Invalid image" : "Nieprawidłowe zdjęcie",
+    "No temporary profile picture available, try again" : "Brak obrazka profilu tymczasowego, spróbuj ponownie",
+    "No crop data provided" : "Brak danych do przycięcia",
+    "Sunday" : "Niedziela",
+    "Monday" : "Poniedziałek",
+    "Tuesday" : "Wtorek",
+    "Wednesday" : "Środa",
+    "Thursday" : "Czwartek",
+    "Friday" : "Piątek",
+    "Saturday" : "Sobota",
+    "January" : "Styczeń",
+    "February" : "Luty",
+    "March" : "Marzec",
+    "April" : "Kwiecień",
+    "May" : "Maj",
+    "June" : "Czerwiec",
+    "July" : "Lipiec",
+    "August" : "Sierpień",
+    "September" : "Wrzesień",
+    "October" : "Październik",
+    "November" : "Listopad",
+    "December" : "Grudzień",
+    "Settings" : "Ustawienia",
+    "File" : "Plik",
+    "Folder" : "Folder",
+    "Image" : "Obraz",
+    "Audio" : "Dźwięk",
+    "Saving..." : "Zapisywanie...",
+    "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 ",
+    "I know what I'm doing" : "Wiem co robię",
+    "Reset password" : "Zresetuj hasło",
+    "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
+    "No" : "Nie",
+    "Yes" : "Tak",
+    "Choose" : "Wybierz",
+    "Error loading file picker template: {error}" : "Błąd podczas ładowania pliku wybranego szablonu: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Błąd podczas ładowania szablonu wiadomości: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"],
+    "One file conflict" : "Konflikt pliku",
+    "New Files" : "Nowe pliki",
+    "Already existing files" : "Już istniejące pliki",
+    "Which files do you want to keep?" : "Które pliki chcesz zachować?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie",
+    "Cancel" : "Anuluj",
+    "Continue" : "Kontynuuj ",
+    "(all selected)" : "(wszystkie zaznaczone)",
+    "({count} selected)" : "({count} zaznaczonych)",
+    "Error loading file exists template" : "Błąd podczas ładowania szablonu istniejącego pliku",
+    "Very weak password" : "Bardzo słabe hasło",
+    "Weak password" : "Słabe hasło",
+    "So-so password" : "Mało skomplikowane hasło",
+    "Good password" : "Dobre hasło",
+    "Strong password" : "Mocne hasło",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
+    "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." : "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub aplikacje firm 3-trzecich nie działają. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy podłączenie tego serwera do internetu, jeśli chcesz mieć wszystkie funkcje.",
+    "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
+    "Shared" : "Udostępniono",
+    "Shared with {recipients}" : "Współdzielony z {recipients}",
+    "Share" : "Udostępnij",
+    "Error" : "Błąd",
+    "Error while sharing" : "Błąd podczas współdzielenia",
+    "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
+    "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 user or group …" : "Współdziel z użytkownikiem lub grupą ...",
+    "Share link" : "Udostępnij link",
+    "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+    "Password protect" : "Zabezpiecz hasłem",
+    "Choose a password for the public link" : "Wybierz hasło dla linku publicznego",
+    "Allow Public Upload" : "Pozwól na  publiczne wczytywanie",
+    "Email link to person" : "Wyślij osobie odnośnik poprzez e-mail",
+    "Send" : "Wyślij",
+    "Set expiration date" : "Ustaw datę wygaśnięcia",
+    "Expiration date" : "Data wygaśnięcia",
+    "group" : "grupa",
+    "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",
+    "can share" : "może współdzielić",
+    "can edit" : "może edytować",
+    "access control" : "kontrola dostępu",
+    "create" : "utwórz",
+    "update" : "uaktualnij",
+    "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",
+    "Warning" : "Ostrzeżenie",
+    "The object type is not specified." : "Nie określono typu obiektu.",
+    "Enter new" : "Wpisz nowy",
+    "Delete" : "Usuń",
+    "Add" : "Dodaj",
+    "Edit tags" : "Edytuj tagi",
+    "Error loading dialog template: {error}" : "Błąd podczas ładowania szablonu dialogu: {error}",
+    "No tags selected for deletion." : "Nie zaznaczono tagów do usunięcia.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
+    "Please reload the page." : "Proszę przeładować stronę",
+    "The update was unsuccessful." : "Aktualizacja nie powiodła się.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nie można zresetować hasła, ponieważ token jest niepoprawny",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
+    "%s password reset" : "%s reset hasła",
+    "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}",
+    "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
+    "Username" : "Nazwa użytkownika",
+    "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?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
+    "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz",
+    "Reset" : "Resetuj",
+    "New password" : "Nowe hasło",
+    "New Password" : "Nowe hasło",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
+    "Personal" : "Osobiste",
+    "Users" : "Użytkownicy",
+    "Apps" : "Aplikacje",
+    "Admin" : "Administrator",
+    "Help" : "Pomoc",
+    "Error loading tags" : "Błąd ładowania tagów",
+    "Tag already exists" : "Tag już istnieje",
+    "Error deleting tag(s)" : "Błąd przy osuwaniu tag(ów)",
+    "Error tagging" : "Błąd tagowania",
+    "Error untagging" : "Błąd odtagowania",
+    "Error favoriting" : "Błąd podczas dodawania do ulubionch",
+    "Error unfavoriting" : "Błąd przy usuwaniu z ulubionych",
+    "Access forbidden" : "Dostęp zabroniony",
+    "File not found" : "Nie odnaleziono pliku",
+    "The specified document has not been found on the server." : "Wskazany dokument nie został znaleziony na serwerze.",
+    "You can click here to return to %s." : "Możesz kliknąć tutaj aby powrócić do %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Witaj,\n\ntylko informuję, że %s współdzieli z Tobą %s.\nZobacz tutaj: %s\n\n",
+    "The share will expire on %s." : "Ten zasób wygaśnie %s",
+    "Cheers!" : "Pozdrawiam!",
+    "The server encountered an internal error and was unable to complete your request." : "Serwer napotkał błąd wewnętrzny i nie był w stanie ukończyć Twojego żądania.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Proszę skontaktować się z administratorem jeśli ten błąd będzie się pojawiał wielokrotnie, proszę do zgłoszenia dołączyć szczegóły techniczne opisane poniżej.",
+    "More details can be found in the server log." : "Więcej szczegółów można znaleźć w logu serwera.",
+    "Technical details" : "Szczegóły techniczne",
+    "Remote Address: %s" : "Adres zdalny: %s",
+    "Request ID: %s" : "ID żądania: %s",
+    "Code: %s" : "Kod: %s",
+    "Message: %s" : "Komunikat: %s",
+    "File: %s" : "Plik: %s",
+    "Line: %s" : "Linia: %s",
+    "Trace" : "Ślad",
+    "Security Warning" : "Ostrzeżenie o zabezpieczeniach",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
+    "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
+    "Password" : "Hasło",
+    "Storage & database" : "Zasoby dysku & baza danych",
+    "Data folder" : "Katalog danych",
+    "Configure the database" : "Skonfiguruj bazę danych",
+    "Only %s is available." : "Dostępne jest wyłącznie %s.",
+    "Database user" : "Użytkownik bazy danych",
+    "Database password" : "Hasło do bazy danych",
+    "Database name" : "Nazwa bazy danych",
+    "Database tablespace" : "Obszar tabel bazy danych",
+    "Database host" : "Komputer bazy danych",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Jako baza danych zostanie użyty SQLite. Dla większych instalacji doradzamy zmianę na inną.",
+    "Finish setup" : "Zakończ konfigurowanie",
+    "Finishing …" : "Kończę ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę <a href=\"http://enable-javascript.com/\" target=\"_blank\">włącz JavaScript</a> i przeładuj stronę.",
+    "%s is available. Get more information on how to update." : "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
+    "Log out" : "Wyloguj",
+    "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
+    "Please contact your administrator." : "Skontaktuj się z administratorem",
+    "Forgot your password? Reset it!" : "Nie pamiętasz hasła? Zresetuj je!",
+    "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.",
+    "This means only administrators can use the instance." : "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
+    "Thank you for your patience." : "Dziękuję za cierpliwość.",
+    "You are accessing the server from an untrusted domain." : "Dostajesz się do serwera z niezaufanej domeny.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "W zależności od konfiguracji, jako administrator możesz także użyć poniższego przycisku aby zaufać tej domenie.",
+    "Add \"%s\" as trusted domain" : "Dodaj \"%s\" jako domenę zaufaną",
+    "%s will be updated to version %s." : "%s zostanie zaktualizowane do wersji %s.",
+    "The following apps will be disabled:" : "Następujące aplikacje zostaną zablokowane:",
+    "The theme %s has been disabled." : "Motyw %s został wyłączony.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.",
+    "Start update" : "Rozpocznij aktualizację",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Aby uniknąć timeout-ów przy większych instalacjach, możesz zamiast tego uruchomić następującą komendę w katalogu Twojej instalacji:",
+    "This %s instance is currently being updated, which may take a while." : "Ta instancja %s jest właśnie aktualizowana, co może chwilę potrwać.",
+    "This page will refresh itself when the %s instance is available again." : "Strona odświeży się gdy instancja %s będzie ponownie dostępna."
+},
+"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
new file mode 100644
index 00000000000..ccfa0685c2a
--- /dev/null
+++ b/core/l10n/pl.json
@@ -0,0 +1,208 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nie można było wysłać wiadomości do następujących użytkowników: %s",
+    "Turned on maintenance mode" : "Włączony tryb konserwacji",
+    "Turned off maintenance mode" : "Wyłączony tryb konserwacji",
+    "Updated database" : "Zaktualizuj bazę",
+    "Checked database schema update" : "Sprawdzono aktualizację schematu bazy danych",
+    "Checked database schema update for apps" : "Sprawdzono aktualizację schematu bazy danych dla aplikacji",
+    "Updated \"%s\" to %s" : "Zaktualizowano \"%s\" do %s",
+    "Disabled incompatible apps: %s" : "Wyłączone niekompatybilne aplikacja: %s",
+    "No image or file provided" : "Brak obrazu lub pliku dostarczonego",
+    "Unknown filetype" : "Nieznany typ pliku",
+    "Invalid image" : "Nieprawidłowe zdjęcie",
+    "No temporary profile picture available, try again" : "Brak obrazka profilu tymczasowego, spróbuj ponownie",
+    "No crop data provided" : "Brak danych do przycięcia",
+    "Sunday" : "Niedziela",
+    "Monday" : "Poniedziałek",
+    "Tuesday" : "Wtorek",
+    "Wednesday" : "Środa",
+    "Thursday" : "Czwartek",
+    "Friday" : "Piątek",
+    "Saturday" : "Sobota",
+    "January" : "Styczeń",
+    "February" : "Luty",
+    "March" : "Marzec",
+    "April" : "Kwiecień",
+    "May" : "Maj",
+    "June" : "Czerwiec",
+    "July" : "Lipiec",
+    "August" : "Sierpień",
+    "September" : "Wrzesień",
+    "October" : "Październik",
+    "November" : "Listopad",
+    "December" : "Grudzień",
+    "Settings" : "Ustawienia",
+    "File" : "Plik",
+    "Folder" : "Folder",
+    "Image" : "Obraz",
+    "Audio" : "Dźwięk",
+    "Saving..." : "Zapisywanie...",
+    "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 ",
+    "I know what I'm doing" : "Wiem co robię",
+    "Reset password" : "Zresetuj hasło",
+    "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
+    "No" : "Nie",
+    "Yes" : "Tak",
+    "Choose" : "Wybierz",
+    "Error loading file picker template: {error}" : "Błąd podczas ładowania pliku wybranego szablonu: {error}",
+    "Ok" : "OK",
+    "Error loading message template: {error}" : "Błąd podczas ładowania szablonu wiadomości: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"],
+    "One file conflict" : "Konflikt pliku",
+    "New Files" : "Nowe pliki",
+    "Already existing files" : "Już istniejące pliki",
+    "Which files do you want to keep?" : "Które pliki chcesz zachować?",
+    "If you select both versions, the copied file will have a number added to its name." : "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie",
+    "Cancel" : "Anuluj",
+    "Continue" : "Kontynuuj ",
+    "(all selected)" : "(wszystkie zaznaczone)",
+    "({count} selected)" : "({count} zaznaczonych)",
+    "Error loading file exists template" : "Błąd podczas ładowania szablonu istniejącego pliku",
+    "Very weak password" : "Bardzo słabe hasło",
+    "Weak password" : "Słabe hasło",
+    "So-so password" : "Mało skomplikowane hasło",
+    "Good password" : "Dobre hasło",
+    "Strong password" : "Mocne hasło",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
+    "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." : "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub aplikacje firm 3-trzecich nie działają. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy podłączenie tego serwera do internetu, jeśli chcesz mieć wszystkie funkcje.",
+    "Error occurred while checking server setup" : "Pojawił się błąd podczas sprawdzania ustawień serwera",
+    "Shared" : "Udostępniono",
+    "Shared with {recipients}" : "Współdzielony z {recipients}",
+    "Share" : "Udostępnij",
+    "Error" : "Błąd",
+    "Error while sharing" : "Błąd podczas współdzielenia",
+    "Error while unsharing" : "Błąd podczas zatrzymywania współdzielenia",
+    "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 user or group …" : "Współdziel z użytkownikiem lub grupą ...",
+    "Share link" : "Udostępnij link",
+    "The public link will expire no later than {days} days after it is created" : "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
+    "Password protect" : "Zabezpiecz hasłem",
+    "Choose a password for the public link" : "Wybierz hasło dla linku publicznego",
+    "Allow Public Upload" : "Pozwól na  publiczne wczytywanie",
+    "Email link to person" : "Wyślij osobie odnośnik poprzez e-mail",
+    "Send" : "Wyślij",
+    "Set expiration date" : "Ustaw datę wygaśnięcia",
+    "Expiration date" : "Data wygaśnięcia",
+    "group" : "grupa",
+    "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",
+    "can share" : "może współdzielić",
+    "can edit" : "może edytować",
+    "access control" : "kontrola dostępu",
+    "create" : "utwórz",
+    "update" : "uaktualnij",
+    "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",
+    "Warning" : "Ostrzeżenie",
+    "The object type is not specified." : "Nie określono typu obiektu.",
+    "Enter new" : "Wpisz nowy",
+    "Delete" : "Usuń",
+    "Add" : "Dodaj",
+    "Edit tags" : "Edytuj tagi",
+    "Error loading dialog template: {error}" : "Błąd podczas ładowania szablonu dialogu: {error}",
+    "No tags selected for deletion." : "Nie zaznaczono tagów do usunięcia.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
+    "Please reload the page." : "Proszę przeładować stronę",
+    "The update was unsuccessful." : "Aktualizacja nie powiodła się.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Nie można zresetować hasła, ponieważ token jest niepoprawny",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
+    "%s password reset" : "%s reset hasła",
+    "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}",
+    "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
+    "Username" : "Nazwa użytkownika",
+    "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?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
+    "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz",
+    "Reset" : "Resetuj",
+    "New password" : "Nowe hasło",
+    "New Password" : "Nowe hasło",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
+    "Personal" : "Osobiste",
+    "Users" : "Użytkownicy",
+    "Apps" : "Aplikacje",
+    "Admin" : "Administrator",
+    "Help" : "Pomoc",
+    "Error loading tags" : "Błąd ładowania tagów",
+    "Tag already exists" : "Tag już istnieje",
+    "Error deleting tag(s)" : "Błąd przy osuwaniu tag(ów)",
+    "Error tagging" : "Błąd tagowania",
+    "Error untagging" : "Błąd odtagowania",
+    "Error favoriting" : "Błąd podczas dodawania do ulubionch",
+    "Error unfavoriting" : "Błąd przy usuwaniu z ulubionych",
+    "Access forbidden" : "Dostęp zabroniony",
+    "File not found" : "Nie odnaleziono pliku",
+    "The specified document has not been found on the server." : "Wskazany dokument nie został znaleziony na serwerze.",
+    "You can click here to return to %s." : "Możesz kliknąć tutaj aby powrócić do %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Witaj,\n\ntylko informuję, że %s współdzieli z Tobą %s.\nZobacz tutaj: %s\n\n",
+    "The share will expire on %s." : "Ten zasób wygaśnie %s",
+    "Cheers!" : "Pozdrawiam!",
+    "The server encountered an internal error and was unable to complete your request." : "Serwer napotkał błąd wewnętrzny i nie był w stanie ukończyć Twojego żądania.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Proszę skontaktować się z administratorem jeśli ten błąd będzie się pojawiał wielokrotnie, proszę do zgłoszenia dołączyć szczegóły techniczne opisane poniżej.",
+    "More details can be found in the server log." : "Więcej szczegółów można znaleźć w logu serwera.",
+    "Technical details" : "Szczegóły techniczne",
+    "Remote Address: %s" : "Adres zdalny: %s",
+    "Request ID: %s" : "ID żądania: %s",
+    "Code: %s" : "Kod: %s",
+    "Message: %s" : "Komunikat: %s",
+    "File: %s" : "Plik: %s",
+    "Line: %s" : "Linia: %s",
+    "Trace" : "Ślad",
+    "Security Warning" : "Ostrzeżenie o zabezpieczeniach",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
+    "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
+    "Password" : "Hasło",
+    "Storage & database" : "Zasoby dysku & baza danych",
+    "Data folder" : "Katalog danych",
+    "Configure the database" : "Skonfiguruj bazę danych",
+    "Only %s is available." : "Dostępne jest wyłącznie %s.",
+    "Database user" : "Użytkownik bazy danych",
+    "Database password" : "Hasło do bazy danych",
+    "Database name" : "Nazwa bazy danych",
+    "Database tablespace" : "Obszar tabel bazy danych",
+    "Database host" : "Komputer bazy danych",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Jako baza danych zostanie użyty SQLite. Dla większych instalacji doradzamy zmianę na inną.",
+    "Finish setup" : "Zakończ konfigurowanie",
+    "Finishing …" : "Kończę ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę <a href=\"http://enable-javascript.com/\" target=\"_blank\">włącz JavaScript</a> i przeładuj stronę.",
+    "%s is available. Get more information on how to update." : "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
+    "Log out" : "Wyloguj",
+    "Server side authentication failed!" : "Uwierzytelnianie po stronie serwera nie powiodło się!",
+    "Please contact your administrator." : "Skontaktuj się z administratorem",
+    "Forgot your password? Reset it!" : "Nie pamiętasz hasła? Zresetuj je!",
+    "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.",
+    "This means only administrators can use the instance." : "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
+    "Thank you for your patience." : "Dziękuję za cierpliwość.",
+    "You are accessing the server from an untrusted domain." : "Dostajesz się do serwera z niezaufanej domeny.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "W zależności od konfiguracji, jako administrator możesz także użyć poniższego przycisku aby zaufać tej domenie.",
+    "Add \"%s\" as trusted domain" : "Dodaj \"%s\" jako domenę zaufaną",
+    "%s will be updated to version %s." : "%s zostanie zaktualizowane do wersji %s.",
+    "The following apps will be disabled:" : "Następujące aplikacje zostaną zablokowane:",
+    "The theme %s has been disabled." : "Motyw %s został wyłączony.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.",
+    "Start update" : "Rozpocznij aktualizację",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Aby uniknąć timeout-ów przy większych instalacjach, możesz zamiast tego uruchomić następującą komendę w katalogu Twojej instalacji:",
+    "This %s instance is currently being updated, which may take a while." : "Ta instancja %s jest właśnie aktualizowana, co może chwilę potrwać.",
+    "This page will refresh itself when the %s instance is available again." : "Strona odświeży się gdy instancja %s będzie ponownie dostępna."
+},"pluralForm" :"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
deleted file mode 100644
index 98d041bc34f..00000000000
--- a/core/l10n/pl.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nie można było wysłać wiadomości do następujących użytkowników: %s",
-"Turned on maintenance mode" => "Włączony tryb konserwacji",
-"Turned off maintenance mode" => "Wyłączony tryb konserwacji",
-"Updated database" => "Zaktualizuj bazę",
-"Checked database schema update" => "Sprawdzono aktualizację schematu bazy danych",
-"Checked database schema update for apps" => "Sprawdzono aktualizację schematu bazy danych dla aplikacji",
-"Updated \"%s\" to %s" => "Zaktualizowano \"%s\" do %s",
-"Disabled incompatible apps: %s" => "Wyłączone niekompatybilne aplikacja: %s",
-"No image or file provided" => "Brak obrazu lub pliku dostarczonego",
-"Unknown filetype" => "Nieznany typ pliku",
-"Invalid image" => "Nieprawidłowe zdjęcie",
-"No temporary profile picture available, try again" => "Brak obrazka profilu tymczasowego, spróbuj ponownie",
-"No crop data provided" => "Brak danych do przycięcia",
-"Sunday" => "Niedziela",
-"Monday" => "Poniedziałek",
-"Tuesday" => "Wtorek",
-"Wednesday" => "Środa",
-"Thursday" => "Czwartek",
-"Friday" => "Piątek",
-"Saturday" => "Sobota",
-"January" => "Styczeń",
-"February" => "Luty",
-"March" => "Marzec",
-"April" => "Kwiecień",
-"May" => "Maj",
-"June" => "Czerwiec",
-"July" => "Lipiec",
-"August" => "Sierpień",
-"September" => "Wrzesień",
-"October" => "Październik",
-"November" => "Listopad",
-"December" => "Grudzień",
-"Settings" => "Ustawienia",
-"File" => "Plik",
-"Folder" => "Folder",
-"Image" => "Obraz",
-"Audio" => "Dźwięk",
-"Saving..." => "Zapisywanie...",
-"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 ",
-"I know what I'm doing" => "Wiem co robię",
-"Reset password" => "Zresetuj hasło",
-"Password can not be changed. Please contact your administrator." => "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
-"No" => "Nie",
-"Yes" => "Tak",
-"Choose" => "Wybierz",
-"Error loading file picker template: {error}" => "Błąd podczas ładowania pliku wybranego szablonu: {error}",
-"Ok" => "OK",
-"Error loading message template: {error}" => "Błąd podczas ładowania szablonu wiadomości: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} konfliktów plików","{count} konfliktów plików","{count} konfliktów plików"),
-"One file conflict" => "Konflikt pliku",
-"New Files" => "Nowe pliki",
-"Already existing files" => "Już istniejące pliki",
-"Which files do you want to keep?" => "Które pliki chcesz zachować?",
-"If you select both versions, the copied file will have a number added to its name." => "Jeśli wybierzesz obie wersje, skopiowany plik będzie miał dodany numerek w nazwie",
-"Cancel" => "Anuluj",
-"Continue" => "Kontynuuj ",
-"(all selected)" => "(wszystkie zaznaczone)",
-"({count} selected)" => "({count} zaznaczonych)",
-"Error loading file exists template" => "Błąd podczas ładowania szablonu istniejącego pliku",
-"Very weak password" => "Bardzo słabe hasło",
-"Weak password" => "Słabe hasło",
-"So-so password" => "Mało skomplikowane hasło",
-"Good password" => "Dobre hasło",
-"Strong password" => "Mocne hasło",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serwer internetowy nie jest jeszcze poprawnie skonfigurowany, aby umożliwić synchronizację plików, ponieważ interfejs WebDAV wydaje się być uszkodzony.",
-"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." => "Ten serwer OwnCloud nie ma połączenia z Internetem. Oznacza to, że niektóre z funkcji, takich jak montowanie zewnętrznych zasobów, powiadomienia o aktualizacji lub aplikacje firm 3-trzecich nie działają. Dostęp do plików z zewnątrz i wysyłanie powiadomień e-mail może również nie działać. Sugerujemy podłączenie tego serwera do internetu, jeśli chcesz mieć wszystkie funkcje.",
-"Error occurred while checking server setup" => "Pojawił się błąd podczas sprawdzania ustawień serwera",
-"Shared" => "Udostępniono",
-"Shared with {recipients}" => "Współdzielony z {recipients}",
-"Share" => "Udostępnij",
-"Error" => "Błąd",
-"Error while sharing" => "Błąd podczas współdzielenia",
-"Error while unsharing" => "Błąd podczas zatrzymywania współdzielenia",
-"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 user or group …" => "Współdziel z użytkownikiem lub grupą ...",
-"Share link" => "Udostępnij link",
-"The public link will expire no later than {days} days after it is created" => "Link publiczny wygaśnie nie później niż po {days} dniach od utworzenia",
-"Password protect" => "Zabezpiecz hasłem",
-"Choose a password for the public link" => "Wybierz hasło dla linku publicznego",
-"Allow Public Upload" => "Pozwól na  publiczne wczytywanie",
-"Email link to person" => "Wyślij osobie odnośnik poprzez e-mail",
-"Send" => "Wyślij",
-"Set expiration date" => "Ustaw datę wygaśnięcia",
-"Expiration date" => "Data wygaśnięcia",
-"group" => "grupa",
-"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",
-"can share" => "może współdzielić",
-"can edit" => "może edytować",
-"access control" => "kontrola dostępu",
-"create" => "utwórz",
-"update" => "uaktualnij",
-"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",
-"Warning" => "Ostrzeżenie",
-"The object type is not specified." => "Nie określono typu obiektu.",
-"Enter new" => "Wpisz nowy",
-"Delete" => "Usuń",
-"Add" => "Dodaj",
-"Edit tags" => "Edytuj tagi",
-"Error loading dialog template: {error}" => "Błąd podczas ładowania szablonu dialogu: {error}",
-"No tags selected for deletion." => "Nie zaznaczono tagów do usunięcia.",
-"Updating {productName} to version {version}, this may take a while." => "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
-"Please reload the page." => "Proszę przeładować stronę",
-"The update was unsuccessful." => "Aktualizacja nie powiodła się.",
-"The update was successful. Redirecting you to ownCloud now." => "Aktualizacji zakończyła się powodzeniem. Przekierowuję do ownCloud.",
-"Couldn't reset password because the token is invalid" => "Nie można zresetować hasła, ponieważ token jest niepoprawny",
-"Couldn't send reset email. Please make sure your username is correct." => "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika jest poprawna.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
-"%s password reset" => "%s reset hasła",
-"Use the following link to reset your password: {link}" => "Użyj tego odnośnika by zresetować hasło: {link}",
-"You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
-"Username" => "Nazwa użytkownika",
-"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?" => "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
-"Yes, I really want to reset my password now" => "Tak, naprawdę chcę zresetować hasło teraz",
-"Reset" => "Resetuj",
-"New password" => "Nowe hasło",
-"New Password" => "Nowe hasło",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
-"For the best results, please consider using a GNU/Linux server instead." => "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
-"Personal" => "Osobiste",
-"Users" => "Użytkownicy",
-"Apps" => "Aplikacje",
-"Admin" => "Administrator",
-"Help" => "Pomoc",
-"Error loading tags" => "Błąd ładowania tagów",
-"Tag already exists" => "Tag już istnieje",
-"Error deleting tag(s)" => "Błąd przy osuwaniu tag(ów)",
-"Error tagging" => "Błąd tagowania",
-"Error untagging" => "Błąd odtagowania",
-"Error favoriting" => "Błąd podczas dodawania do ulubionch",
-"Error unfavoriting" => "Błąd przy usuwaniu z ulubionych",
-"Access forbidden" => "Dostęp zabroniony",
-"File not found" => "Nie odnaleziono pliku",
-"The specified document has not been found on the server." => "Wskazany dokument nie został znaleziony na serwerze.",
-"You can click here to return to %s." => "Możesz kliknąć tutaj aby powrócić do %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Witaj,\n\ntylko informuję, że %s współdzieli z Tobą %s.\nZobacz tutaj: %s\n\n",
-"The share will expire on %s." => "Ten zasób wygaśnie %s",
-"Cheers!" => "Pozdrawiam!",
-"The server encountered an internal error and was unable to complete your request." => "Serwer napotkał błąd wewnętrzny i nie był w stanie ukończyć Twojego żądania.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Proszę skontaktować się z administratorem jeśli ten błąd będzie się pojawiał wielokrotnie, proszę do zgłoszenia dołączyć szczegóły techniczne opisane poniżej.",
-"More details can be found in the server log." => "Więcej szczegółów można znaleźć w logu serwera.",
-"Technical details" => "Szczegóły techniczne",
-"Remote Address: %s" => "Adres zdalny: %s",
-"Request ID: %s" => "ID żądania: %s",
-"Code: %s" => "Kod: %s",
-"Message: %s" => "Komunikat: %s",
-"File: %s" => "Plik: %s",
-"Line: %s" => "Linia: %s",
-"Trace" => "Ślad",
-"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Twója wersja PHP jest narażona na NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Proszę uaktualnij swoją instalacje PHP aby używać %s bezpiecznie.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
-"Create an <strong>admin account</strong>" => "Utwórz <strong>konta administratora</strong>",
-"Password" => "Hasło",
-"Storage & database" => "Zasoby dysku & baza danych",
-"Data folder" => "Katalog danych",
-"Configure the database" => "Skonfiguruj bazę danych",
-"Only %s is available." => "Dostępne jest wyłącznie %s.",
-"Database user" => "Użytkownik bazy danych",
-"Database password" => "Hasło do bazy danych",
-"Database name" => "Nazwa bazy danych",
-"Database tablespace" => "Obszar tabel bazy danych",
-"Database host" => "Komputer bazy danych",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Jako baza danych zostanie użyty SQLite. Dla większych instalacji doradzamy zmianę na inną.",
-"Finish setup" => "Zakończ konfigurowanie",
-"Finishing …" => "Kończę ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Ta aplikacja wymaga JavaScript do poprawnego działania. Proszę <a href=\"http://enable-javascript.com/\" target=\"_blank\">włącz JavaScript</a> i przeładuj stronę.",
-"%s is available. Get more information on how to update." => "%s jest dostępna. Dowiedz się więcej na temat aktualizacji.",
-"Log out" => "Wyloguj",
-"Server side authentication failed!" => "Uwierzytelnianie po stronie serwera nie powiodło się!",
-"Please contact your administrator." => "Skontaktuj się z administratorem",
-"Forgot your password? Reset it!" => "Nie pamiętasz hasła? Zresetuj je!",
-"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.",
-"This means only administrators can use the instance." => "To oznacza, że tylko administratorzy mogą w tej chwili używać aplikacji.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Skontaktuj się z administratorem, jeśli ten komunikat pojawił się nieoczekiwanie lub wyświetla się ciągle.",
-"Thank you for your patience." => "Dziękuję za cierpliwość.",
-"You are accessing the server from an untrusted domain." => "Dostajesz się do serwera z niezaufanej domeny.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Proszę skontaktuj się z administratorem. Jeśli jesteś administratorem tej instancji, skonfiguruj parametr \"trusted_domain\" w pliku config/config.php. Przykładowa konfiguracja jest dostępna w pliku config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "W zależności od konfiguracji, jako administrator możesz także użyć poniższego przycisku aby zaufać tej domenie.",
-"Add \"%s\" as trusted domain" => "Dodaj \"%s\" jako domenę zaufaną",
-"%s will be updated to version %s." => "%s zostanie zaktualizowane do wersji %s.",
-"The following apps will be disabled:" => "Następujące aplikacje zostaną zablokowane:",
-"The theme %s has been disabled." => "Motyw %s został wyłączony.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Proszę się upewnić, że baza danych, folder konfiguracji oraz folder danych zostały zarchiwizowane przed przejściem dalej.",
-"Start update" => "Rozpocznij aktualizację",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Aby uniknąć timeout-ów przy większych instalacjach, możesz zamiast tego uruchomić następującą komendę w katalogu Twojej instalacji:",
-"This %s instance is currently being updated, which may take a while." => "Ta instancja %s jest właśnie aktualizowana, co może chwilę potrwać.",
-"This page will refresh itself when the %s instance is available again." => "Strona odświeży się gdy instancja %s będzie ponownie dostępna."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
new file mode 100644
index 00000000000..0ec3aa08f20
--- /dev/null
+++ b/core/l10n/pt_BR.js
@@ -0,0 +1,212 @@
+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",
+    "Turned on maintenance mode" : "Ativar modo de manutenção",
+    "Turned off maintenance mode" : "Desligar o modo de manutenção",
+    "Updated database" : "Atualizar o banco de dados",
+    "Checked database schema update" : "Verificado atualização do esquema de banco de dados",
+    "Checked database schema update for apps" : "Verificar atualização do esquema de banco de dados para aplicativos",
+    "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
+    "Disabled incompatible apps: %s" : "Desabilitar aplicativos incompatíveis : %s",
+    "No image or file provided" : "Nenhuma imagem ou arquivo fornecido",
+    "Unknown filetype" : "Tipo de arquivo desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "No temporary profile picture available, try again" : "Nenhuma imagem temporária disponível no perfil, tente novamente",
+    "No crop data provided" : "Nenhum dado para coleta foi fornecido",
+    "Sunday" : "Domingo",
+    "Monday" : "Segunda-feira",
+    "Tuesday" : "Terça-feira",
+    "Wednesday" : "Quarta-feira",
+    "Thursday" : "Quinta-feira",
+    "Friday" : "Sexta-feira",
+    "Saturday" : "Sábado",
+    "January" : "Janeiro",
+    "February" : "Fevereiro",
+    "March" : "Março",
+    "April" : "Abril",
+    "May" : "Maio",
+    "June" : "Junho",
+    "July" : "Julho",
+    "August" : "Agosto",
+    "September" : "Setembro",
+    "October" : "Outubro",
+    "November" : "Novembro",
+    "December" : "Dezembro",
+    "Settings" : "Configurações",
+    "File" : "Arquivo",
+    "Folder" : "Pasta",
+    "Image" : "Imagem",
+    "Audio" : "Audio",
+    "Saving..." : "Salvando...",
+    "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
+    "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?",
+    "I know what I'm doing" : "Eu sei o que estou fazendo",
+    "Reset password" : "Redefinir senha",
+    "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
+    "No" : "Não",
+    "Yes" : "Sim",
+    "Choose" : "Escolher",
+    "Error loading file picker template: {error}" : "Erro no seletor de carregamento modelo de arquivos: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erro no carregamento de modelo de mensagem: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de arquivo","{count} conflitos de arquivos"],
+    "One file conflict" : "Conflito em um arquivo",
+    "New Files" : "Novos Arquivos",
+    "Already existing files" : "Arquivos já existentes",
+    "Which files do you want to keep?" : "Qual arquivo você quer manter?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos os selecionados)",
+    "({count} selected)" : "({count} selecionados)",
+    "Error loading file exists template" : "Erro ao carregar arquivo existe modelo",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha mais ou menos",
+    "Good password" : "Boa senha",
+    "Strong password" : "Senha forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
+    "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." : "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
+    "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
+    "Shared" : "Compartilhados",
+    "Shared with {recipients}" : "Compartilhado com {recipients}",
+    "Share" : "Compartilhar",
+    "Error" : "Erro",
+    "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 user or group …" : "Compartilhar com usuário ou grupo ...",
+    "Share link" : "Compartilhar link",
+    "The public link will expire no later than {days} days after it is created" : "O link público irá expirar não antes de {days} depois de ser criado",
+    "Password protect" : "Proteger com senha",
+    "Choose a password for the public link" : "Escolha uma senha para o link público",
+    "Allow Public Upload" : "Permitir Envio Público",
+    "Email link to person" : "Enviar link por e-mail",
+    "Send" : "Enviar",
+    "Set expiration date" : "Definir data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Adding user..." : "Adicionando usuário...",
+    "group" : "grupo",
+    "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",
+    "can share" : "pode compartilhar",
+    "can edit" : "pode editar",
+    "access control" : "controle de acesso",
+    "create" : "criar",
+    "update" : "atualizar",
+    "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",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "O tipo de objeto não foi especificado.",
+    "Enter new" : "Entrar uma nova",
+    "Delete" : "Eliminar",
+    "Add" : "Adicionar",
+    "Edit tags" : "Editar etiqueta",
+    "Error loading dialog template: {error}" : "Erro carregando diálogo de formatação: {error}",
+    "No tags selected for deletion." : "Nenhuma etiqueta selecionada para deleção.",
+    "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
+    "Please reload the page." : "Por favor recarregue a página",
+    "The update was unsuccessful." : "A atualização não foi bem sucedida.",
+    "The update was successful. Redirecting you to ownCloud now." : "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
+    "Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
+    "Couldn't send reset email. Please make sure your username is correct." : "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
+    "%s password reset" : "%s redefinir senha",
+    "Use the following link to reset your password: {link}" : "Use o seguinte link para redefinir sua senha: {link}",
+    "You will receive a link to reset your password via Email." : "Você receberá um link para redefinir sua senha por e-mail.",
+    "Username" : "Nome de usuário",
+    "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?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
+    "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.",
+    "Reset" : "Resetar",
+    "New password" : "Nova senha",
+    "New Password" : "Nova Senha",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
+    "Personal" : "Pessoal",
+    "Users" : "Usuários",
+    "Apps" : "Aplicações",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Error loading tags" : " Erro carregando etiqueta",
+    "Tag already exists" : "Etiqueta já existe",
+    "Error deleting tag(s)" : "Erro deletando etiqueta(s)",
+    "Error tagging" : "Erro etiquetando",
+    "Error untagging" : "Erro retirando etiqueta",
+    "Error favoriting" : "Erro colocando nos favoritos",
+    "Error unfavoriting" : "Erro retirando do favoritos",
+    "Access forbidden" : "Acesso proibido",
+    "File not found" : "Arquivo não encontrado",
+    "The specified document has not been found on the server." : "O documento especificado não foi encontrado no servidor.",
+    "You can click here to return to %s." : "Você pode clicar aqui para retornar para %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com você.\nVeja isto: %s\n\n",
+    "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
+    "Cheers!" : "Saúde!",
+    "Internal Server Error" : "Erro Interno do Servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Entre em contato com o administrador do servidor se este erro reaparece várias vezes, por favor, inclua os detalhes técnicos abaixo em seu relatório.",
+    "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
+    "Technical details" : "Detalhes técnicos",
+    "Remote Address: %s" : "Endereço Remoto: %s",
+    "Request ID: %s" : "ID do Pedido: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensagem: %s",
+    "File: %s" : "Arquivo: %s",
+    "Line: %s" : "Linha: %s",
+    "Trace" : "Rastreamento",
+    "Security Warning" : "Aviso de Segurança",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, atualize sua instalação PHP para usar %s segurança.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
+    "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
+    "Password" : "Senha",
+    "Storage & database" : "Armazenamento & banco de dados",
+    "Data folder" : "Pasta de dados",
+    "Configure the database" : "Configurar o banco de dados",
+    "Only %s is available." : "Somente %s está disponível.",
+    "Database user" : "Usuário do banco de dados",
+    "Database password" : "Senha do banco de dados",
+    "Database name" : "Nome do banco de dados",
+    "Database tablespace" : "Espaço de tabela do banco de dados",
+    "Database host" : "Host do banco de dados",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "O SQLite será usado como banco de dados. Para grandes instalações nós recomendamos mudar isto.",
+    "Finish setup" : "Concluir configuração",
+    "Finishing …" : "Finalizando ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recerregue a página.",
+    "%s is available. Get more information on how to update." : "%s está disponível. Obtenha mais informações sobre como atualizar.",
+    "Log out" : "Sair",
+    "Server side authentication failed!" : "Autenticação do servidor falhou!",
+    "Please contact your administrator." : "Por favor, contate o administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu sua senha? 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.",
+    "This means only administrators can use the instance." : "Isso significa que apenas os administradores podem usar esta instância.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
+    "Thank you for your patience." : "Obrigado pela sua paciência.",
+    "You are accessing the server from an untrusted domain." : "Você está acessando o servidor a partir de um domínio não confiável.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
+    "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio confiavel",
+    "%s will be updated to version %s." : "%s será atualizado para a versão %s.",
+    "The following apps will be disabled:" : "Os seguintes aplicativos serão desativados:",
+    "The theme %s has been disabled." : "O tema %s foi desativado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
+    "Start update" : "Iniciar atualização",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instância %s está sendo atualizada, o que pode demorar um pouco.",
+    "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
new file mode 100644
index 00000000000..f3a23935723
--- /dev/null
+++ b/core/l10n/pt_BR.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar e-mail para os seguintes usuários: %s",
+    "Turned on maintenance mode" : "Ativar modo de manutenção",
+    "Turned off maintenance mode" : "Desligar o modo de manutenção",
+    "Updated database" : "Atualizar o banco de dados",
+    "Checked database schema update" : "Verificado atualização do esquema de banco de dados",
+    "Checked database schema update for apps" : "Verificar atualização do esquema de banco de dados para aplicativos",
+    "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
+    "Disabled incompatible apps: %s" : "Desabilitar aplicativos incompatíveis : %s",
+    "No image or file provided" : "Nenhuma imagem ou arquivo fornecido",
+    "Unknown filetype" : "Tipo de arquivo desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "No temporary profile picture available, try again" : "Nenhuma imagem temporária disponível no perfil, tente novamente",
+    "No crop data provided" : "Nenhum dado para coleta foi fornecido",
+    "Sunday" : "Domingo",
+    "Monday" : "Segunda-feira",
+    "Tuesday" : "Terça-feira",
+    "Wednesday" : "Quarta-feira",
+    "Thursday" : "Quinta-feira",
+    "Friday" : "Sexta-feira",
+    "Saturday" : "Sábado",
+    "January" : "Janeiro",
+    "February" : "Fevereiro",
+    "March" : "Março",
+    "April" : "Abril",
+    "May" : "Maio",
+    "June" : "Junho",
+    "July" : "Julho",
+    "August" : "Agosto",
+    "September" : "Setembro",
+    "October" : "Outubro",
+    "November" : "Novembro",
+    "December" : "Dezembro",
+    "Settings" : "Configurações",
+    "File" : "Arquivo",
+    "Folder" : "Pasta",
+    "Image" : "Imagem",
+    "Audio" : "Audio",
+    "Saving..." : "Salvando...",
+    "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
+    "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?",
+    "I know what I'm doing" : "Eu sei o que estou fazendo",
+    "Reset password" : "Redefinir senha",
+    "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
+    "No" : "Não",
+    "Yes" : "Sim",
+    "Choose" : "Escolher",
+    "Error loading file picker template: {error}" : "Erro no seletor de carregamento modelo de arquivos: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erro no carregamento de modelo de mensagem: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflito de arquivo","{count} conflitos de arquivos"],
+    "One file conflict" : "Conflito em um arquivo",
+    "New Files" : "Novos Arquivos",
+    "Already existing files" : "Arquivos já existentes",
+    "Which files do you want to keep?" : "Qual arquivo você quer manter?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos os selecionados)",
+    "({count} selected)" : "({count} selecionados)",
+    "Error loading file exists template" : "Erro ao carregar arquivo existe modelo",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha mais ou menos",
+    "Good password" : "Boa senha",
+    "Strong password" : "Senha forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
+    "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." : "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
+    "Error occurred while checking server setup" : "Erro ao verificar a configuração do servidor",
+    "Shared" : "Compartilhados",
+    "Shared with {recipients}" : "Compartilhado com {recipients}",
+    "Share" : "Compartilhar",
+    "Error" : "Erro",
+    "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 user or group …" : "Compartilhar com usuário ou grupo ...",
+    "Share link" : "Compartilhar link",
+    "The public link will expire no later than {days} days after it is created" : "O link público irá expirar não antes de {days} depois de ser criado",
+    "Password protect" : "Proteger com senha",
+    "Choose a password for the public link" : "Escolha uma senha para o link público",
+    "Allow Public Upload" : "Permitir Envio Público",
+    "Email link to person" : "Enviar link por e-mail",
+    "Send" : "Enviar",
+    "Set expiration date" : "Definir data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Adding user..." : "Adicionando usuário...",
+    "group" : "grupo",
+    "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",
+    "can share" : "pode compartilhar",
+    "can edit" : "pode editar",
+    "access control" : "controle de acesso",
+    "create" : "criar",
+    "update" : "atualizar",
+    "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",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "O tipo de objeto não foi especificado.",
+    "Enter new" : "Entrar uma nova",
+    "Delete" : "Eliminar",
+    "Add" : "Adicionar",
+    "Edit tags" : "Editar etiqueta",
+    "Error loading dialog template: {error}" : "Erro carregando diálogo de formatação: {error}",
+    "No tags selected for deletion." : "Nenhuma etiqueta selecionada para deleção.",
+    "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
+    "Please reload the page." : "Por favor recarregue a página",
+    "The update was unsuccessful." : "A atualização não foi bem sucedida.",
+    "The update was successful. Redirecting you to ownCloud now." : "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
+    "Couldn't reset password because the token is invalid" : "Não foi possível redefinir a senha porque o token é inválido",
+    "Couldn't send reset email. Please make sure your username is correct." : "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
+    "%s password reset" : "%s redefinir senha",
+    "Use the following link to reset your password: {link}" : "Use o seguinte link para redefinir sua senha: {link}",
+    "You will receive a link to reset your password via Email." : "Você receberá um link para redefinir sua senha por e-mail.",
+    "Username" : "Nome de usuário",
+    "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?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
+    "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.",
+    "Reset" : "Resetar",
+    "New password" : "Nova senha",
+    "New Password" : "Nova Senha",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
+    "Personal" : "Pessoal",
+    "Users" : "Usuários",
+    "Apps" : "Aplicações",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Error loading tags" : " Erro carregando etiqueta",
+    "Tag already exists" : "Etiqueta já existe",
+    "Error deleting tag(s)" : "Erro deletando etiqueta(s)",
+    "Error tagging" : "Erro etiquetando",
+    "Error untagging" : "Erro retirando etiqueta",
+    "Error favoriting" : "Erro colocando nos favoritos",
+    "Error unfavoriting" : "Erro retirando do favoritos",
+    "Access forbidden" : "Acesso proibido",
+    "File not found" : "Arquivo não encontrado",
+    "The specified document has not been found on the server." : "O documento especificado não foi encontrado no servidor.",
+    "You can click here to return to %s." : "Você pode clicar aqui para retornar para %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com você.\nVeja isto: %s\n\n",
+    "The share will expire on %s." : "O compartilhamento irá expirar em %s.",
+    "Cheers!" : "Saúde!",
+    "Internal Server Error" : "Erro Interno do Servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Entre em contato com o administrador do servidor se este erro reaparece várias vezes, por favor, inclua os detalhes técnicos abaixo em seu relatório.",
+    "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
+    "Technical details" : "Detalhes técnicos",
+    "Remote Address: %s" : "Endereço Remoto: %s",
+    "Request ID: %s" : "ID do Pedido: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensagem: %s",
+    "File: %s" : "Arquivo: %s",
+    "Line: %s" : "Linha: %s",
+    "Trace" : "Rastreamento",
+    "Security Warning" : "Aviso de Segurança",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor, atualize sua instalação PHP para usar %s segurança.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
+    "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
+    "Password" : "Senha",
+    "Storage & database" : "Armazenamento & banco de dados",
+    "Data folder" : "Pasta de dados",
+    "Configure the database" : "Configurar o banco de dados",
+    "Only %s is available." : "Somente %s está disponível.",
+    "Database user" : "Usuário do banco de dados",
+    "Database password" : "Senha do banco de dados",
+    "Database name" : "Nome do banco de dados",
+    "Database tablespace" : "Espaço de tabela do banco de dados",
+    "Database host" : "Host do banco de dados",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "O SQLite será usado como banco de dados. Para grandes instalações nós recomendamos mudar isto.",
+    "Finish setup" : "Concluir configuração",
+    "Finishing …" : "Finalizando ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para sua correta operação. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recerregue a página.",
+    "%s is available. Get more information on how to update." : "%s está disponível. Obtenha mais informações sobre como atualizar.",
+    "Log out" : "Sair",
+    "Server side authentication failed!" : "Autenticação do servidor falhou!",
+    "Please contact your administrator." : "Por favor, contate o administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu sua senha? 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.",
+    "This means only administrators can use the instance." : "Isso significa que apenas os administradores podem usar esta instância.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
+    "Thank you for your patience." : "Obrigado pela sua paciência.",
+    "You are accessing the server from an untrusted domain." : "Você está acessando o servidor a partir de um domínio não confiável.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
+    "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio confiavel",
+    "%s will be updated to version %s." : "%s será atualizado para a versão %s.",
+    "The following apps will be disabled:" : "Os seguintes aplicativos serão desativados:",
+    "The theme %s has been disabled." : "O tema %s foi desativado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
+    "Start update" : "Iniciar atualização",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instância %s está sendo atualizada, o que pode demorar um pouco.",
+    "This page will refresh itself when the %s instance is available again." : "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
deleted file mode 100644
index 7d653d12dd4..00000000000
--- a/core/l10n/pt_BR.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Não foi possível enviar e-mail para os seguintes usuários: %s",
-"Turned on maintenance mode" => "Ativar modo de manutenção",
-"Turned off maintenance mode" => "Desligar o modo de manutenção",
-"Updated database" => "Atualizar o banco de dados",
-"Checked database schema update" => "Verificado atualização do esquema de banco de dados",
-"Checked database schema update for apps" => "Verificar atualização do esquema de banco de dados para aplicativos",
-"Updated \"%s\" to %s" => "Atualizado \"%s\" para %s",
-"Disabled incompatible apps: %s" => "Desabilitar aplicativos incompatíveis : %s",
-"No image or file provided" => "Nenhuma imagem ou arquivo fornecido",
-"Unknown filetype" => "Tipo de arquivo desconhecido",
-"Invalid image" => "Imagem inválida",
-"No temporary profile picture available, try again" => "Nenhuma imagem temporária disponível no perfil, tente novamente",
-"No crop data provided" => "Nenhum dado para coleta foi fornecido",
-"Sunday" => "Domingo",
-"Monday" => "Segunda-feira",
-"Tuesday" => "Terça-feira",
-"Wednesday" => "Quarta-feira",
-"Thursday" => "Quinta-feira",
-"Friday" => "Sexta-feira",
-"Saturday" => "Sábado",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "Março",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
-"Settings" => "Configurações",
-"File" => "Arquivo",
-"Folder" => "Pasta",
-"Image" => "Imagem",
-"Audio" => "Audio",
-"Saving..." => "Salvando...",
-"Couldn't send reset email. Please contact your administrator." => "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
-"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?",
-"I know what I'm doing" => "Eu sei o que estou fazendo",
-"Reset password" => "Redefinir senha",
-"Password can not be changed. Please contact your administrator." => "A senha não pode ser alterada. Por favor, contate o administrador.",
-"No" => "Não",
-"Yes" => "Sim",
-"Choose" => "Escolher",
-"Error loading file picker template: {error}" => "Erro no seletor de carregamento modelo de arquivos: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Erro no carregamento de modelo de mensagem: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflito de arquivo","{count} conflitos de arquivos"),
-"One file conflict" => "Conflito em um arquivo",
-"New Files" => "Novos Arquivos",
-"Already existing files" => "Arquivos já existentes",
-"Which files do you want to keep?" => "Qual arquivo você quer manter?",
-"If you select both versions, the copied file will have a number added to its name." => "Se você selecionar ambas as versões, o arquivo copiado terá um número adicionado ao seu nome.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todos os selecionados)",
-"({count} selected)" => "({count} selecionados)",
-"Error loading file exists template" => "Erro ao carregar arquivo existe modelo",
-"Very weak password" => "Senha muito fraca",
-"Weak password" => "Senha fraca",
-"So-so password" => "Senha mais ou menos",
-"Good password" => "Boa senha",
-"Strong password" => "Senha forte",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Seu servidor web não está configurado corretamente para permitir sincronização de arquivos porque a interface WebDAV parece não estar funcionando.",
-"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." => "Este servidor não tem conexão com a internet. Isso significa que algumas das características como a montagem de armazenamento externo, notificações sobre atualizações ou instalação de aplicativos de 3ºs terceiros não funcionam. Acessar arquivos remotamente e envio de e-mails de notificação também não podem funcionar. Sugerimos permitir conexão com a internet para esse servidor, se você deseja ter todas as funcionalidades.",
-"Error occurred while checking server setup" => "Erro ao verificar a configuração do servidor",
-"Shared" => "Compartilhados",
-"Shared with {recipients}" => "Compartilhado com {recipients}",
-"Share" => "Compartilhar",
-"Error" => "Erro",
-"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 user or group …" => "Compartilhar com usuário ou grupo ...",
-"Share link" => "Compartilhar link",
-"The public link will expire no later than {days} days after it is created" => "O link público irá expirar não antes de {days} depois de ser criado",
-"Password protect" => "Proteger com senha",
-"Choose a password for the public link" => "Escolha uma senha para o link público",
-"Allow Public Upload" => "Permitir Envio Público",
-"Email link to person" => "Enviar link por e-mail",
-"Send" => "Enviar",
-"Set expiration date" => "Definir data de expiração",
-"Expiration date" => "Data de expiração",
-"Adding user..." => "Adicionando usuário...",
-"group" => "grupo",
-"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",
-"can share" => "pode compartilhar",
-"can edit" => "pode editar",
-"access control" => "controle de acesso",
-"create" => "criar",
-"update" => "atualizar",
-"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",
-"Warning" => "Aviso",
-"The object type is not specified." => "O tipo de objeto não foi especificado.",
-"Enter new" => "Entrar uma nova",
-"Delete" => "Eliminar",
-"Add" => "Adicionar",
-"Edit tags" => "Editar etiqueta",
-"Error loading dialog template: {error}" => "Erro carregando diálogo de formatação: {error}",
-"No tags selected for deletion." => "Nenhuma etiqueta selecionada para deleção.",
-"Updating {productName} to version {version}, this may take a while." => "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
-"Please reload the page." => "Por favor recarregue a página",
-"The update was unsuccessful." => "A atualização não foi bem sucedida.",
-"The update was successful. Redirecting you to ownCloud now." => "A atualização teve êxito. Você será redirecionado ao ownCloud agora.",
-"Couldn't reset password because the token is invalid" => "Não foi possível redefinir a senha porque o token é inválido",
-"Couldn't send reset email. Please make sure your username is correct." => "Não foi possível enviar e-mail de redefinição. Verifique se o seu nome de usuário está correto.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
-"%s password reset" => "%s redefinir senha",
-"Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
-"You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha por e-mail.",
-"Username" => "Nome de usuário",
-"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?" => "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
-"Yes, I really want to reset my password now" => "Sim, realmente quero criar uma nova senha.",
-"Reset" => "Resetar",
-"New password" => "Nova senha",
-"New Password" => "Nova Senha",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
-"For the best results, please consider using a GNU/Linux server instead." => "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
-"Personal" => "Pessoal",
-"Users" => "Usuários",
-"Apps" => "Aplicações",
-"Admin" => "Admin",
-"Help" => "Ajuda",
-"Error loading tags" => " Erro carregando etiqueta",
-"Tag already exists" => "Etiqueta já existe",
-"Error deleting tag(s)" => "Erro deletando etiqueta(s)",
-"Error tagging" => "Erro etiquetando",
-"Error untagging" => "Erro retirando etiqueta",
-"Error favoriting" => "Erro colocando nos favoritos",
-"Error unfavoriting" => "Erro retirando do favoritos",
-"Access forbidden" => "Acesso proibido",
-"File not found" => "Arquivo não encontrado",
-"The specified document has not been found on the server." => "O documento especificado não foi encontrado no servidor.",
-"You can click here to return to %s." => "Você pode clicar aqui para retornar para %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\ngostaria que você soubesse que %s compartilhou %s com você.\nVeja isto: %s\n\n",
-"The share will expire on %s." => "O compartilhamento irá expirar em %s.",
-"Cheers!" => "Saúde!",
-"Internal Server Error" => "Erro Interno do Servidor",
-"The server encountered an internal error and was unable to complete your request." => "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Entre em contato com o administrador do servidor se este erro reaparece várias vezes, por favor, inclua os detalhes técnicos abaixo em seu relatório.",
-"More details can be found in the server log." => "Mais detalhes podem ser encontrados no log do servidor.",
-"Technical details" => "Detalhes técnicos",
-"Remote Address: %s" => "Endereço Remoto: %s",
-"Request ID: %s" => "ID do Pedido: %s",
-"Code: %s" => "Código: %s",
-"Message: %s" => "Mensagem: %s",
-"File: %s" => "Arquivo: %s",
-"Line: %s" => "Linha: %s",
-"Trace" => "Rastreamento",
-"Security Warning" => "Aviso de Segurança",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Sua versão do PHP está vulnerável ao ataque NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor, atualize sua instalação PHP para usar %s segurança.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
-"Create an <strong>admin account</strong>" => "Criar uma <strong>conta de administrador</strong>",
-"Password" => "Senha",
-"Storage & database" => "Armazenamento & banco de dados",
-"Data folder" => "Pasta de dados",
-"Configure the database" => "Configurar o banco de dados",
-"Only %s is available." => "Somente %s está disponível.",
-"Database user" => "Usuário do banco de dados",
-"Database password" => "Senha do banco de dados",
-"Database name" => "Nome do banco de dados",
-"Database tablespace" => "Espaço de tabela do banco de dados",
-"Database host" => "Host do banco de dados",
-"SQLite will be used as database. For larger installations we recommend to change this." => "O SQLite será usado como banco de dados. Para grandes instalações nós recomendamos mudar isto.",
-"Finish setup" => "Concluir configuração",
-"Finishing …" => "Finalizando ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Esta aplicação requer JavaScript para sua correta operação. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recerregue a página.",
-"%s is available. Get more information on how to update." => "%s está disponível. Obtenha mais informações sobre como atualizar.",
-"Log out" => "Sair",
-"Server side authentication failed!" => "Autenticação do servidor falhou!",
-"Please contact your administrator." => "Por favor, contate o administrador.",
-"Forgot your password? Reset it!" => "Esqueceu sua senha? 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.",
-"This means only administrators can use the instance." => "Isso significa que apenas os administradores podem usar esta instância.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador do sistema se esta mensagem persistir ou aparecer inesperadamente.",
-"Thank you for your patience." => "Obrigado pela sua paciência.",
-"You are accessing the server from an untrusted domain." => "Você está acessando o servidor a partir de um domínio não confiável.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor, contate o administrador. Se você é um administrador desta instância, configurre o \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
-"Add \"%s\" as trusted domain" => "Adicionar \"%s\" como um domínio confiavel",
-"%s will be updated to version %s." => "%s será atualizado para a versão %s.",
-"The following apps will be disabled:" => "Os seguintes aplicativos serão desativados:",
-"The theme %s has been disabled." => "O tema %s foi desativado.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Por favor, certifique-se de que o banco de dados, a pasta config e a pasta de dados foram copiados antes de prosseguir.",
-"Start update" => "Iniciar atualização",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Para evitar tempos de espera com instalações maiores, você pode em vez disso executar o seguinte comando a partir do diretório de instalação:",
-"This %s instance is currently being updated, which may take a while." => "Esta instância %s está sendo atualizada, o que pode demorar um pouco.",
-"This page will refresh itself when the %s instance is available again." => "Esta página será atualizada automaticamente quando esta instância %s estiver disponível novamente."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
new file mode 100644
index 00000000000..416a593cdcd
--- /dev/null
+++ b/core/l10n/pt_PT.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Não conseguiu enviar correio aos seguintes utilizadores: %s",
+    "Turned on maintenance mode" : "Activado o modo de manutenção",
+    "Turned off maintenance mode" : "Desactivado o modo de manutenção",
+    "Updated database" : "Base de dados actualizada",
+    "Checked database schema update" : "Atualização do esquema da base de dados verificada.",
+    "Checked database schema update for apps" : "Atualização do esquema da base de dados verificada.",
+    "Updated \"%s\" to %s" : "Actualizado \"%s\" para %s",
+    "Disabled incompatible apps: %s" : "Apps incompatíveis desativadas: %s",
+    "No image or file provided" : "Não foi selecionado nenhum ficheiro para importar",
+    "Unknown filetype" : "Ficheiro desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "No temporary profile picture available, try again" : "Foto temporária de perfil indisponível, tente novamente",
+    "No crop data provided" : "Sem dados de corte fornecidos",
+    "Sunday" : "Domingo",
+    "Monday" : "Segunda",
+    "Tuesday" : "Terça",
+    "Wednesday" : "Quarta",
+    "Thursday" : "Quinta",
+    "Friday" : "Sexta",
+    "Saturday" : "Sábado",
+    "January" : "Janeiro",
+    "February" : "Fevereiro",
+    "March" : "Março",
+    "April" : "Abril",
+    "May" : "Maio",
+    "June" : "Junho",
+    "July" : "Julho",
+    "August" : "Agosto",
+    "September" : "Setembro",
+    "October" : "Outubro",
+    "November" : "Novembro",
+    "December" : "Dezembro",
+    "Settings" : "Configurações",
+    "File" : "Ficheiro",
+    "Folder" : "Pasta",
+    "Image" : "Imagem",
+    "Audio" : "Audio",
+    "Saving..." : "A guardar...",
+    "Couldn't send reset email. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "I know what I'm doing" : "Tenho a certeza",
+    "Reset password" : "Repor password",
+    "Password can not be changed. Please contact your administrator." : "A password não pode ser alterada. Contacte o seu administrador.",
+    "No" : "Não",
+    "Yes" : "Sim",
+    "Choose" : "Escolha",
+    "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erro ao carregar o template: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"],
+    "One file conflict" : "Um conflito no ficheiro",
+    "New Files" : "Ficheiros Novos",
+    "Already existing files" : "Ficheiro já existente",
+    "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
+    "Very weak password" : "Password muito fraca",
+    "Weak password" : "Password fraca",
+    "So-so password" : "Password aceitável",
+    "Good password" : "Password Forte",
+    "Strong password" : "Password muito forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
+    "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." : "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
+    "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
+    "Shared" : "Partilhado",
+    "Shared with {recipients}" : "Partilhado com {recipients}",
+    "Share" : "Partilhar",
+    "Error" : "Erro",
+    "Error while sharing" : "Erro ao partilhar",
+    "Error while unsharing" : "Erro ao deixar de partilhar",
+    "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 user or group …" : "Partilhar com utilizador ou grupo...",
+    "Share link" : "Partilhar o link",
+    "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
+    "Password protect" : "Proteger com palavra-passe",
+    "Choose a password for the public link" : "Defina a palavra-passe para o link público",
+    "Allow Public Upload" : "Permitir Envios Públicos",
+    "Email link to person" : "Enviar o link por e-mail",
+    "Send" : "Enviar",
+    "Set expiration date" : "Especificar data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Adding user..." : "A adicionar utilizador...",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Não é permitido partilhar de novo",
+    "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
+    "Unshare" : "Deixar de partilhar",
+    "notify by email" : "Notificar por email",
+    "can share" : "pode partilhar",
+    "can edit" : "pode editar",
+    "access control" : "Controlo de acesso",
+    "create" : "criar",
+    "update" : "actualizar",
+    "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" : "E-mail enviado",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "O tipo de objecto não foi especificado",
+    "Enter new" : "Introduza novo",
+    "Delete" : "Eliminar",
+    "Add" : "Adicionar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Erro ao carregar modelo de diálogo: {error}",
+    "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
+    "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
+    "Please reload the page." : "Por favor recarregue a página.",
+    "The update was unsuccessful." : "Não foi possível atualizar.",
+    "The update was successful. 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" : "É impossível efetuar reset à password. ",
+    "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 password",
+    "Use the following link to reset your password: {link}" : "Use o seguinte endereço para repor a sua password: {link}",
+    "You will receive a link to reset your password via Email." : "Vai receber um endereço para repor a sua password",
+    "Username" : "Nome de utilizador",
+    "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?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "Yes, I really want to reset my password now" : "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
+    "Reset" : "Repor",
+    "New password" : "Nova palavra-chave",
+    "New Password" : "Nova password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
+    "Personal" : "Pessoal",
+    "Users" : "Utilizadores",
+    "Apps" : "Aplicações",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Error loading tags" : "Erro ao carregar etiquetas",
+    "Tag already exists" : "A etiqueta já existe",
+    "Error deleting tag(s)" : "Erro ao apagar etiqueta(s)",
+    "Error tagging" : "Erro ao etiquetar",
+    "Error untagging" : "Erro ao desetiquetar",
+    "Error favoriting" : "Erro a definir como favorito",
+    "Error unfavoriting" : "Erro a remover como favorito",
+    "Access forbidden" : "Acesso interdito",
+    "File not found" : "Ficheiro não encontrado",
+    "The specified document has not been found on the server." : "O documento especificado não foi encontrado no servidor.",
+    "You can click here to return to %s." : "Pode clicar aqui para retornar para %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
+    "The share will expire on %s." : "Esta partilha vai expirar em %s.",
+    "Cheers!" : "Parabéns!",
+    "Internal Server Error" : "Erro Interno do Servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Entra em contacto com o administrador do servidor se este erro aparecer várias vezes, inclui também os detalhes técnicos abaixo no seu contacto.",
+    "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
+    "Technical details" : "Detalhes técnicos",
+    "Remote Address: %s" : "Endereço remoto: %s",
+    "Request ID: %s" : "ID do Pedido: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensagem: %s",
+    "File: %s" : "Ficheiro: %s",
+    "Line: %s" : "Linha: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Aviso de Segurança",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
+    "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Armazenamento e base de dados",
+    "Data folder" : "Pasta de dados",
+    "Configure the database" : "Configure a base de dados",
+    "Only %s is available." : "Apenas %s está disponível.",
+    "Database user" : "Utilizador da base de dados",
+    "Database password" : "Password da base de dados",
+    "Database name" : "Nome da base de dados",
+    "Database tablespace" : "Tablespace da base de dados",
+    "Database host" : "Anfitrião da base de dados",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Será usado SQLite como base de dados. Para instalações maiores é recomendável a sua alteração.",
+    "Finish setup" : "Acabar instalação",
+    "Finishing …" : "A terminar...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para functionar correctamente. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">active o JavaScript</a> e recarregue a página.",
+    "%s is available. Get more information on how to update." : "%s está disponível. Tenha mais informações como actualizar.",
+    "Log out" : "Sair",
+    "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
+    "Please contact your administrator." : "Por favor contacte o administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu-se da password? Recupere-a!",
+    "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.",
+    "This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
+    "Thank you for your patience." : "Obrigado pela sua paciência.",
+    "You are accessing the server from an untrusted domain." : "Está a aceder ao servidor a partir de um domínio que não é de confiança.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte o seu administrador. Se é um administrador desta instância, configure as definições \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
+    "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio de confiança",
+    "%s will be updated to version %s." : "O %s irá ser atualizado para a versão %s.",
+    "The following apps will be disabled:" : "As seguintes apps irão ser desativadas:",
+    "The theme %s has been disabled." : "O tema %s foi desativado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
+    "Start update" : "Iniciar atualização",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso, executar o seguinte comando a partir do diretório de instalação:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instância %s está actualmente a ser actualizada, poderá demorar algum tempo.",
+    "This page will refresh itself when the %s instance is available again." : "Esta página irá ser recarregada novamente quando a instância %s ficar novamente disponível."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
new file mode 100644
index 00000000000..5d2de169e32
--- /dev/null
+++ b/core/l10n/pt_PT.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Não conseguiu enviar correio aos seguintes utilizadores: %s",
+    "Turned on maintenance mode" : "Activado o modo de manutenção",
+    "Turned off maintenance mode" : "Desactivado o modo de manutenção",
+    "Updated database" : "Base de dados actualizada",
+    "Checked database schema update" : "Atualização do esquema da base de dados verificada.",
+    "Checked database schema update for apps" : "Atualização do esquema da base de dados verificada.",
+    "Updated \"%s\" to %s" : "Actualizado \"%s\" para %s",
+    "Disabled incompatible apps: %s" : "Apps incompatíveis desativadas: %s",
+    "No image or file provided" : "Não foi selecionado nenhum ficheiro para importar",
+    "Unknown filetype" : "Ficheiro desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "No temporary profile picture available, try again" : "Foto temporária de perfil indisponível, tente novamente",
+    "No crop data provided" : "Sem dados de corte fornecidos",
+    "Sunday" : "Domingo",
+    "Monday" : "Segunda",
+    "Tuesday" : "Terça",
+    "Wednesday" : "Quarta",
+    "Thursday" : "Quinta",
+    "Friday" : "Sexta",
+    "Saturday" : "Sábado",
+    "January" : "Janeiro",
+    "February" : "Fevereiro",
+    "March" : "Março",
+    "April" : "Abril",
+    "May" : "Maio",
+    "June" : "Junho",
+    "July" : "Julho",
+    "August" : "Agosto",
+    "September" : "Setembro",
+    "October" : "Outubro",
+    "November" : "Novembro",
+    "December" : "Dezembro",
+    "Settings" : "Configurações",
+    "File" : "Ficheiro",
+    "Folder" : "Pasta",
+    "Image" : "Imagem",
+    "Audio" : "Audio",
+    "Saving..." : "A guardar...",
+    "Couldn't send reset email. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "I know what I'm doing" : "Tenho a certeza",
+    "Reset password" : "Repor password",
+    "Password can not be changed. Please contact your administrator." : "A password não pode ser alterada. Contacte o seu administrador.",
+    "No" : "Não",
+    "Yes" : "Sim",
+    "Choose" : "Escolha",
+    "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Erro ao carregar o template: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"],
+    "One file conflict" : "Um conflito no ficheiro",
+    "New Files" : "Ficheiros Novos",
+    "Already existing files" : "Ficheiro já existente",
+    "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
+    "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
+    "Cancel" : "Cancelar",
+    "Continue" : "Continuar",
+    "(all selected)" : "(todos seleccionados)",
+    "({count} selected)" : "({count} seleccionados)",
+    "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
+    "Very weak password" : "Password muito fraca",
+    "Weak password" : "Password fraca",
+    "So-so password" : "Password aceitável",
+    "Good password" : "Password Forte",
+    "Strong password" : "Password muito forte",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
+    "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." : "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
+    "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
+    "Shared" : "Partilhado",
+    "Shared with {recipients}" : "Partilhado com {recipients}",
+    "Share" : "Partilhar",
+    "Error" : "Erro",
+    "Error while sharing" : "Erro ao partilhar",
+    "Error while unsharing" : "Erro ao deixar de partilhar",
+    "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 user or group …" : "Partilhar com utilizador ou grupo...",
+    "Share link" : "Partilhar o link",
+    "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
+    "Password protect" : "Proteger com palavra-passe",
+    "Choose a password for the public link" : "Defina a palavra-passe para o link público",
+    "Allow Public Upload" : "Permitir Envios Públicos",
+    "Email link to person" : "Enviar o link por e-mail",
+    "Send" : "Enviar",
+    "Set expiration date" : "Especificar data de expiração",
+    "Expiration date" : "Data de expiração",
+    "Adding user..." : "A adicionar utilizador...",
+    "group" : "grupo",
+    "Resharing is not allowed" : "Não é permitido partilhar de novo",
+    "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
+    "Unshare" : "Deixar de partilhar",
+    "notify by email" : "Notificar por email",
+    "can share" : "pode partilhar",
+    "can edit" : "pode editar",
+    "access control" : "Controlo de acesso",
+    "create" : "criar",
+    "update" : "actualizar",
+    "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" : "E-mail enviado",
+    "Warning" : "Aviso",
+    "The object type is not specified." : "O tipo de objecto não foi especificado",
+    "Enter new" : "Introduza novo",
+    "Delete" : "Eliminar",
+    "Add" : "Adicionar",
+    "Edit tags" : "Editar etiquetas",
+    "Error loading dialog template: {error}" : "Erro ao carregar modelo de diálogo: {error}",
+    "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
+    "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
+    "Please reload the page." : "Por favor recarregue a página.",
+    "The update was unsuccessful." : "Não foi possível atualizar.",
+    "The update was successful. 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" : "É impossível efetuar reset à password. ",
+    "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 password",
+    "Use the following link to reset your password: {link}" : "Use o seguinte endereço para repor a sua password: {link}",
+    "You will receive a link to reset your password via Email." : "Vai receber um endereço para repor a sua password",
+    "Username" : "Nome de utilizador",
+    "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?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
+    "Yes, I really want to reset my password now" : "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
+    "Reset" : "Repor",
+    "New password" : "Nova palavra-chave",
+    "New Password" : "Nova password",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
+    "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
+    "Personal" : "Pessoal",
+    "Users" : "Utilizadores",
+    "Apps" : "Aplicações",
+    "Admin" : "Admin",
+    "Help" : "Ajuda",
+    "Error loading tags" : "Erro ao carregar etiquetas",
+    "Tag already exists" : "A etiqueta já existe",
+    "Error deleting tag(s)" : "Erro ao apagar etiqueta(s)",
+    "Error tagging" : "Erro ao etiquetar",
+    "Error untagging" : "Erro ao desetiquetar",
+    "Error favoriting" : "Erro a definir como favorito",
+    "Error unfavoriting" : "Erro a remover como favorito",
+    "Access forbidden" : "Acesso interdito",
+    "File not found" : "Ficheiro não encontrado",
+    "The specified document has not been found on the server." : "O documento especificado não foi encontrado no servidor.",
+    "You can click here to return to %s." : "Pode clicar aqui para retornar para %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
+    "The share will expire on %s." : "Esta partilha vai expirar em %s.",
+    "Cheers!" : "Parabéns!",
+    "Internal Server Error" : "Erro Interno do Servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Entra em contacto com o administrador do servidor se este erro aparecer várias vezes, inclui também os detalhes técnicos abaixo no seu contacto.",
+    "More details can be found in the server log." : "Mais detalhes podem ser encontrados no log do servidor.",
+    "Technical details" : "Detalhes técnicos",
+    "Remote Address: %s" : "Endereço remoto: %s",
+    "Request ID: %s" : "ID do Pedido: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensagem: %s",
+    "File: %s" : "Ficheiro: %s",
+    "Line: %s" : "Linha: %s",
+    "Trace" : "Trace",
+    "Security Warning" : "Aviso de Segurança",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
+    "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
+    "Password" : "Password",
+    "Storage & database" : "Armazenamento e base de dados",
+    "Data folder" : "Pasta de dados",
+    "Configure the database" : "Configure a base de dados",
+    "Only %s is available." : "Apenas %s está disponível.",
+    "Database user" : "Utilizador da base de dados",
+    "Database password" : "Password da base de dados",
+    "Database name" : "Nome da base de dados",
+    "Database tablespace" : "Tablespace da base de dados",
+    "Database host" : "Anfitrião da base de dados",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Será usado SQLite como base de dados. Para instalações maiores é recomendável a sua alteração.",
+    "Finish setup" : "Acabar instalação",
+    "Finishing …" : "A terminar...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Esta aplicação requer JavaScript para functionar correctamente. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">active o JavaScript</a> e recarregue a página.",
+    "%s is available. Get more information on how to update." : "%s está disponível. Tenha mais informações como actualizar.",
+    "Log out" : "Sair",
+    "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
+    "Please contact your administrator." : "Por favor contacte o administrador.",
+    "Forgot your password? Reset it!" : "Esqueceu-se da password? Recupere-a!",
+    "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.",
+    "This means only administrators can use the instance." : "Isto significa que apenas os administradores podem usar a instância.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
+    "Thank you for your patience." : "Obrigado pela sua paciência.",
+    "You are accessing the server from an untrusted domain." : "Está a aceder ao servidor a partir de um domínio que não é de confiança.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte o seu administrador. Se é um administrador desta instância, configure as definições \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
+    "Add \"%s\" as trusted domain" : "Adicionar \"%s\" como um domínio de confiança",
+    "%s will be updated to version %s." : "O %s irá ser atualizado para a versão %s.",
+    "The following apps will be disabled:" : "As seguintes apps irão ser desativadas:",
+    "The theme %s has been disabled." : "O tema %s foi desativado.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
+    "Start update" : "Iniciar atualização",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera com instalações maiores, você pode em vez disso, executar o seguinte comando a partir do diretório de instalação:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instância %s está actualmente a ser actualizada, poderá demorar algum tempo.",
+    "This page will refresh itself when the %s instance is available again." : "Esta página irá ser recarregada novamente quando a instância %s ficar novamente disponível."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
deleted file mode 100644
index 229ecfbccb5..00000000000
--- a/core/l10n/pt_PT.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Não conseguiu enviar correio aos seguintes utilizadores: %s",
-"Turned on maintenance mode" => "Activado o modo de manutenção",
-"Turned off maintenance mode" => "Desactivado o modo de manutenção",
-"Updated database" => "Base de dados actualizada",
-"Checked database schema update" => "Atualização do esquema da base de dados verificada.",
-"Checked database schema update for apps" => "Atualização do esquema da base de dados verificada.",
-"Updated \"%s\" to %s" => "Actualizado \"%s\" para %s",
-"Disabled incompatible apps: %s" => "Apps incompatíveis desativadas: %s",
-"No image or file provided" => "Não foi selecionado nenhum ficheiro para importar",
-"Unknown filetype" => "Ficheiro desconhecido",
-"Invalid image" => "Imagem inválida",
-"No temporary profile picture available, try again" => "Foto temporária de perfil indisponível, tente novamente",
-"No crop data provided" => "Sem dados de corte fornecidos",
-"Sunday" => "Domingo",
-"Monday" => "Segunda",
-"Tuesday" => "Terça",
-"Wednesday" => "Quarta",
-"Thursday" => "Quinta",
-"Friday" => "Sexta",
-"Saturday" => "Sábado",
-"January" => "Janeiro",
-"February" => "Fevereiro",
-"March" => "Março",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Junho",
-"July" => "Julho",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Dezembro",
-"Settings" => "Configurações",
-"File" => "Ficheiro",
-"Folder" => "Pasta",
-"Image" => "Imagem",
-"Audio" => "Audio",
-"Saving..." => "A guardar...",
-"Couldn't send reset email. Please contact your administrator." => "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
-"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-"I know what I'm doing" => "Tenho a certeza",
-"Reset password" => "Repor password",
-"Password can not be changed. Please contact your administrator." => "A password não pode ser alterada. Contacte o seu administrador.",
-"No" => "Não",
-"Yes" => "Sim",
-"Choose" => "Escolha",
-"Error loading file picker template: {error}" => "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Erro ao carregar o template: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} conflicto de ficheiro","{count} conflitos de ficheiro"),
-"One file conflict" => "Um conflito no ficheiro",
-"New Files" => "Ficheiros Novos",
-"Already existing files" => "Ficheiro já existente",
-"Which files do you want to keep?" => "Quais os ficheiros que pretende manter?",
-"If you select both versions, the copied file will have a number added to its name." => "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
-"Cancel" => "Cancelar",
-"Continue" => "Continuar",
-"(all selected)" => "(todos seleccionados)",
-"({count} selected)" => "({count} seleccionados)",
-"Error loading file exists template" => "Erro ao carregar o modelo de existências do ficheiro",
-"Very weak password" => "Password muito fraca",
-"Weak password" => "Password fraca",
-"So-so password" => "Password aceitável",
-"Good password" => "Password Forte",
-"Strong password" => "Password muito forte",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
-"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." => "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
-"Error occurred while checking server setup" => "Ocorreu um erro durante a verificação da configuração do servidor",
-"Shared" => "Partilhado",
-"Shared with {recipients}" => "Partilhado com {recipients}",
-"Share" => "Partilhar",
-"Error" => "Erro",
-"Error while sharing" => "Erro ao partilhar",
-"Error while unsharing" => "Erro ao deixar de partilhar",
-"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 user or group …" => "Partilhar com utilizador ou grupo...",
-"Share link" => "Partilhar o link",
-"The public link will expire no later than {days} days after it is created" => "O link público expira, o mais tardar {days} dias após sua criação",
-"Password protect" => "Proteger com palavra-passe",
-"Choose a password for the public link" => "Defina a palavra-passe para o link público",
-"Allow Public Upload" => "Permitir Envios Públicos",
-"Email link to person" => "Enviar o link por e-mail",
-"Send" => "Enviar",
-"Set expiration date" => "Especificar data de expiração",
-"Expiration date" => "Data de expiração",
-"Adding user..." => "A adicionar utilizador...",
-"group" => "grupo",
-"Resharing is not allowed" => "Não é permitido partilhar de novo",
-"Shared in {item} with {user}" => "Partilhado em {item} com {user}",
-"Unshare" => "Deixar de partilhar",
-"notify by email" => "Notificar por email",
-"can share" => "pode partilhar",
-"can edit" => "pode editar",
-"access control" => "Controlo de acesso",
-"create" => "criar",
-"update" => "actualizar",
-"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" => "E-mail enviado",
-"Warning" => "Aviso",
-"The object type is not specified." => "O tipo de objecto não foi especificado",
-"Enter new" => "Introduza novo",
-"Delete" => "Eliminar",
-"Add" => "Adicionar",
-"Edit tags" => "Editar etiquetas",
-"Error loading dialog template: {error}" => "Erro ao carregar modelo de diálogo: {error}",
-"No tags selected for deletion." => "Não foram escolhidas etiquetas para apagar.",
-"Updating {productName} to version {version}, this may take a while." => "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
-"Please reload the page." => "Por favor recarregue a página.",
-"The update was unsuccessful." => "Não foi possível atualizar.",
-"The update was successful. 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" => "É impossível efetuar reset à password. ",
-"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 password",
-"Use the following link to reset your password: {link}" => "Use o seguinte endereço para repor a sua password: {link}",
-"You will receive a link to reset your password via Email." => "Vai receber um endereço para repor a sua password",
-"Username" => "Nome de utilizador",
-"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?" => "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-"Yes, I really want to reset my password now" => "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
-"Reset" => "Repor",
-"New password" => "Nova palavra-chave",
-"New Password" => "Nova password",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
-"For the best results, please consider using a GNU/Linux server instead." => "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
-"Personal" => "Pessoal",
-"Users" => "Utilizadores",
-"Apps" => "Aplicações",
-"Admin" => "Admin",
-"Help" => "Ajuda",
-"Error loading tags" => "Erro ao carregar etiquetas",
-"Tag already exists" => "A etiqueta já existe",
-"Error deleting tag(s)" => "Erro ao apagar etiqueta(s)",
-"Error tagging" => "Erro ao etiquetar",
-"Error untagging" => "Erro ao desetiquetar",
-"Error favoriting" => "Erro a definir como favorito",
-"Error unfavoriting" => "Erro a remover como favorito",
-"Access forbidden" => "Acesso interdito",
-"File not found" => "Ficheiro não encontrado",
-"The specified document has not been found on the server." => "O documento especificado não foi encontrado no servidor.",
-"You can click here to return to %s." => "Pode clicar aqui para retornar para %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Olá,\n\napenas para informar que %s partilhou »%s« consigo.\nConsulte aqui: %s\n",
-"The share will expire on %s." => "Esta partilha vai expirar em %s.",
-"Cheers!" => "Parabéns!",
-"Internal Server Error" => "Erro Interno do Servidor",
-"The server encountered an internal error and was unable to complete your request." => "O servidor encontrou um erro interno e não conseguiu concluir o seu pedido.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Entra em contacto com o administrador do servidor se este erro aparecer várias vezes, inclui também os detalhes técnicos abaixo no seu contacto.",
-"More details can be found in the server log." => "Mais detalhes podem ser encontrados no log do servidor.",
-"Technical details" => "Detalhes técnicos",
-"Remote Address: %s" => "Endereço remoto: %s",
-"Request ID: %s" => "ID do Pedido: %s",
-"Code: %s" => "Código: %s",
-"Message: %s" => "Mensagem: %s",
-"File: %s" => "Ficheiro: %s",
-"Line: %s" => "Linha: %s",
-"Trace" => "Trace",
-"Security Warning" => "Aviso de Segurança",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "A sua versão do PHP é vulnerável ao ataque Byte Null (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Por favor atualize a sua versão PHP instalada para usar o %s com segurança.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
-"Create an <strong>admin account</strong>" => "Criar uma <strong>conta administrativa</strong>",
-"Password" => "Password",
-"Storage & database" => "Armazenamento e base de dados",
-"Data folder" => "Pasta de dados",
-"Configure the database" => "Configure a base de dados",
-"Only %s is available." => "Apenas %s está disponível.",
-"Database user" => "Utilizador da base de dados",
-"Database password" => "Password da base de dados",
-"Database name" => "Nome da base de dados",
-"Database tablespace" => "Tablespace da base de dados",
-"Database host" => "Anfitrião da base de dados",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Será usado SQLite como base de dados. Para instalações maiores é recomendável a sua alteração.",
-"Finish setup" => "Acabar instalação",
-"Finishing …" => "A terminar...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Esta aplicação requer JavaScript para functionar correctamente. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">active o JavaScript</a> e recarregue a página.",
-"%s is available. Get more information on how to update." => "%s está disponível. Tenha mais informações como actualizar.",
-"Log out" => "Sair",
-"Server side authentication failed!" => "Autenticação do lado do servidor falhou!",
-"Please contact your administrator." => "Por favor contacte o administrador.",
-"Forgot your password? Reset it!" => "Esqueceu-se da password? Recupere-a!",
-"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.",
-"This means only administrators can use the instance." => "Isto significa que apenas os administradores podem usar a instância.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Contacte o seu administrador de sistema se esta mensagem continuar a aparecer ou apareceu inesperadamente.",
-"Thank you for your patience." => "Obrigado pela sua paciência.",
-"You are accessing the server from an untrusted domain." => "Está a aceder ao servidor a partir de um domínio que não é de confiança.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Por favor contacte o seu administrador. Se é um administrador desta instância, configure as definições \"trusted_domain\" em config/config.php. Um exemplo de configuração é fornecido em config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Dependendo da configuração, como administrador, você também pode ser capaz de usar o botão abaixo para confiar neste domínio.",
-"Add \"%s\" as trusted domain" => "Adicionar \"%s\" como um domínio de confiança",
-"%s will be updated to version %s." => "O %s irá ser atualizado para a versão %s.",
-"The following apps will be disabled:" => "As seguintes apps irão ser desativadas:",
-"The theme %s has been disabled." => "O tema %s foi desativado.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Por favor garanta a cópia de segurança da base de dados e das pastas 'config' e 'data' antes de prosseguir.",
-"Start update" => "Iniciar atualização",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Para evitar tempos de espera com instalações maiores, você pode em vez disso, executar o seguinte comando a partir do diretório de instalação:",
-"This %s instance is currently being updated, which may take a while." => "Esta instância %s está actualmente a ser actualizada, poderá demorar algum tempo.",
-"This page will refresh itself when the %s instance is available again." => "Esta página irá ser recarregada novamente quando a instância %s ficar novamente disponível."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
new file mode 100644
index 00000000000..bf1eb72942f
--- /dev/null
+++ b/core/l10n/ro.js
@@ -0,0 +1,140 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nu s-a putut trimite mesajul către următorii utilizatori: %s",
+    "Turned on maintenance mode" : "Modul mentenanță a fost activat",
+    "Turned off maintenance mode" : "Modul mentenanță a fost dezactivat",
+    "Updated database" : "Bază de date actualizată",
+    "Disabled incompatible apps: %s" : "Aplicatii incompatibile oprite: %s",
+    "No image or file provided" : "Nu a fost furnizat vreo imagine sau fișier",
+    "Unknown filetype" : "Tip fișier necunoscut",
+    "Invalid image" : "Imagine invalidă",
+    "Sunday" : "Duminică",
+    "Monday" : "Luni",
+    "Tuesday" : "Marți",
+    "Wednesday" : "Miercuri",
+    "Thursday" : "Joi",
+    "Friday" : "Vineri",
+    "Saturday" : "Sâmbătă",
+    "January" : "Ianuarie",
+    "February" : "Februarie",
+    "March" : "Martie",
+    "April" : "Aprilie",
+    "May" : "Mai",
+    "June" : "Iunie",
+    "July" : "Iulie",
+    "August" : "August",
+    "September" : "Septembrie",
+    "October" : "Octombrie",
+    "November" : "Noiembrie",
+    "December" : "Decembrie",
+    "Settings" : "Setări",
+    "File" : "Fişier ",
+    "Folder" : "Dosar",
+    "Image" : "Imagine",
+    "Audio" : "Audio",
+    "Saving..." : "Se salvează...",
+    "I know what I'm doing" : "Eu știu ce fac",
+    "Reset password" : "Resetează parola",
+    "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
+    "No" : "Nu",
+    "Yes" : "Da",
+    "Choose" : "Alege",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "One file conflict" : "Un conflict de fișier",
+    "New Files" : "Fișiere noi",
+    "Already existing files" : "Fișiere deja existente",
+    "Which files do you want to keep?" : "Ce fișiere vrei să păstrezi?",
+    "If you select both versions, the copied file will have a number added to its name." : "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.",
+    "Cancel" : "Anulare",
+    "Continue" : "Continuă",
+    "({count} selected)" : "({count} selectate)",
+    "Very weak password" : "Parolă foarte slabă",
+    "Weak password" : "Parolă slabă",
+    "Good password" : "Parolă bună",
+    "Strong password" : "Parolă puternică",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
+    "Shared" : "Partajat",
+    "Shared with {recipients}" : "Partajat cu {recipients}",
+    "Share" : "Partajează",
+    "Error" : "Eroare",
+    "Error while sharing" : "Eroare la partajare",
+    "Error while unsharing" : "Eroare la anularea partajării",
+    "Error while changing permissions" : "Eroare la modificarea permisiunilor",
+    "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
+    "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
+    "Password protect" : "Protejare cu parolă",
+    "Allow Public Upload" : "Permiteţi încărcarea publică.",
+    "Email link to person" : "Expediază legătura prin poșta electronică",
+    "Send" : "Expediază",
+    "Set expiration date" : "Specifică data expirării",
+    "Expiration date" : "Data expirării",
+    "group" : "grup",
+    "Resharing is not allowed" : "Repartajarea nu este permisă",
+    "Shared in {item} with {user}" : "Distribuie in {item} si {user}",
+    "Unshare" : "Anulare partajare",
+    "notify by email" : "notifică prin email",
+    "can share" : "se poate partaja",
+    "can edit" : "poate edita",
+    "access control" : "control acces",
+    "create" : "creare",
+    "update" : "actualizare",
+    "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",
+    "Warning" : "Atenție",
+    "The object type is not specified." : "Tipul obiectului nu este specificat.",
+    "Enter new" : "Introducere nou",
+    "Delete" : "Șterge",
+    "Add" : "Adaugă",
+    "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
+    "Please reload the page." : "Te rugăm să reîncarci pagina.",
+    "The update was unsuccessful." : "Actualizare eșuată.",
+    "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
+    "%s password reset" : "%s resetare parola",
+    "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}",
+    "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.",
+    "Username" : "Nume utilizator",
+    "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?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
+    "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum",
+    "Reset" : "Resetare",
+    "New password" : "Noua parolă",
+    "New Password" : "Noua parolă",
+    "Personal" : "Personal",
+    "Users" : "Utilizatori",
+    "Apps" : "Aplicații",
+    "Admin" : "Administrator",
+    "Help" : "Ajutor",
+    "Access forbidden" : "Acces restricționat",
+    "The share will expire on %s." : "Partajarea va expira în data de %s.",
+    "Security Warning" : "Avertisment de securitate",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versiunea dvs. PHP este vulnerabilă la un atac cu un octet NULL  (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Te rog actualizează versiunea PHP pentru a utiliza %s în mod securizat.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
+    "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
+    "Password" : "Parolă",
+    "Storage & database" : "Stocare și baza de date",
+    "Data folder" : "Director date",
+    "Configure the database" : "Configurează baza de date",
+    "Database user" : "Utilizatorul bazei de date",
+    "Database password" : "Parola bazei de date",
+    "Database name" : "Numele bazei de date",
+    "Database tablespace" : "Tabela de spațiu a bazei de date",
+    "Database host" : "Bază date",
+    "Finish setup" : "Finalizează instalarea",
+    "%s is available. Get more information on how to update." : "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
+    "Log out" : "Ieșire",
+    "Forgot your password? Reset it!" : "Ți-ai uitat parola? Resetează!",
+    "remember" : "amintește",
+    "Log in" : "Autentificare",
+    "Alternative Logins" : "Conectări alternative",
+    "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
+    "%s will be updated to version %s." : "%s va fi actualizat la versiunea %s.",
+    "Start update" : "Începe actualizarea"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
new file mode 100644
index 00000000000..c8089bd5baf
--- /dev/null
+++ b/core/l10n/ro.json
@@ -0,0 +1,138 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nu s-a putut trimite mesajul către următorii utilizatori: %s",
+    "Turned on maintenance mode" : "Modul mentenanță a fost activat",
+    "Turned off maintenance mode" : "Modul mentenanță a fost dezactivat",
+    "Updated database" : "Bază de date actualizată",
+    "Disabled incompatible apps: %s" : "Aplicatii incompatibile oprite: %s",
+    "No image or file provided" : "Nu a fost furnizat vreo imagine sau fișier",
+    "Unknown filetype" : "Tip fișier necunoscut",
+    "Invalid image" : "Imagine invalidă",
+    "Sunday" : "Duminică",
+    "Monday" : "Luni",
+    "Tuesday" : "Marți",
+    "Wednesday" : "Miercuri",
+    "Thursday" : "Joi",
+    "Friday" : "Vineri",
+    "Saturday" : "Sâmbătă",
+    "January" : "Ianuarie",
+    "February" : "Februarie",
+    "March" : "Martie",
+    "April" : "Aprilie",
+    "May" : "Mai",
+    "June" : "Iunie",
+    "July" : "Iulie",
+    "August" : "August",
+    "September" : "Septembrie",
+    "October" : "Octombrie",
+    "November" : "Noiembrie",
+    "December" : "Decembrie",
+    "Settings" : "Setări",
+    "File" : "Fişier ",
+    "Folder" : "Dosar",
+    "Image" : "Imagine",
+    "Audio" : "Audio",
+    "Saving..." : "Se salvează...",
+    "I know what I'm doing" : "Eu știu ce fac",
+    "Reset password" : "Resetează parola",
+    "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
+    "No" : "Nu",
+    "Yes" : "Da",
+    "Choose" : "Alege",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "One file conflict" : "Un conflict de fișier",
+    "New Files" : "Fișiere noi",
+    "Already existing files" : "Fișiere deja existente",
+    "Which files do you want to keep?" : "Ce fișiere vrei să păstrezi?",
+    "If you select both versions, the copied file will have a number added to its name." : "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.",
+    "Cancel" : "Anulare",
+    "Continue" : "Continuă",
+    "({count} selected)" : "({count} selectate)",
+    "Very weak password" : "Parolă foarte slabă",
+    "Weak password" : "Parolă slabă",
+    "Good password" : "Parolă bună",
+    "Strong password" : "Parolă puternică",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
+    "Shared" : "Partajat",
+    "Shared with {recipients}" : "Partajat cu {recipients}",
+    "Share" : "Partajează",
+    "Error" : "Eroare",
+    "Error while sharing" : "Eroare la partajare",
+    "Error while unsharing" : "Eroare la anularea partajării",
+    "Error while changing permissions" : "Eroare la modificarea permisiunilor",
+    "Shared with you and the group {group} by {owner}" : "Distribuie cu tine si grupul {group} de {owner}",
+    "Shared with you by {owner}" : "Distribuie cu tine de {owner}",
+    "Password protect" : "Protejare cu parolă",
+    "Allow Public Upload" : "Permiteţi încărcarea publică.",
+    "Email link to person" : "Expediază legătura prin poșta electronică",
+    "Send" : "Expediază",
+    "Set expiration date" : "Specifică data expirării",
+    "Expiration date" : "Data expirării",
+    "group" : "grup",
+    "Resharing is not allowed" : "Repartajarea nu este permisă",
+    "Shared in {item} with {user}" : "Distribuie in {item} si {user}",
+    "Unshare" : "Anulare partajare",
+    "notify by email" : "notifică prin email",
+    "can share" : "se poate partaja",
+    "can edit" : "poate edita",
+    "access control" : "control acces",
+    "create" : "creare",
+    "update" : "actualizare",
+    "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",
+    "Warning" : "Atenție",
+    "The object type is not specified." : "Tipul obiectului nu este specificat.",
+    "Enter new" : "Introducere nou",
+    "Delete" : "Șterge",
+    "Add" : "Adaugă",
+    "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
+    "Please reload the page." : "Te rugăm să reîncarci pagina.",
+    "The update was unsuccessful." : "Actualizare eșuată.",
+    "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
+    "%s password reset" : "%s resetare parola",
+    "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}",
+    "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.",
+    "Username" : "Nume utilizator",
+    "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?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
+    "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum",
+    "Reset" : "Resetare",
+    "New password" : "Noua parolă",
+    "New Password" : "Noua parolă",
+    "Personal" : "Personal",
+    "Users" : "Utilizatori",
+    "Apps" : "Aplicații",
+    "Admin" : "Administrator",
+    "Help" : "Ajutor",
+    "Access forbidden" : "Acces restricționat",
+    "The share will expire on %s." : "Partajarea va expira în data de %s.",
+    "Security Warning" : "Avertisment de securitate",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versiunea dvs. PHP este vulnerabilă la un atac cu un octet NULL  (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Te rog actualizează versiunea PHP pentru a utiliza %s în mod securizat.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
+    "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
+    "Password" : "Parolă",
+    "Storage & database" : "Stocare și baza de date",
+    "Data folder" : "Director date",
+    "Configure the database" : "Configurează baza de date",
+    "Database user" : "Utilizatorul bazei de date",
+    "Database password" : "Parola bazei de date",
+    "Database name" : "Numele bazei de date",
+    "Database tablespace" : "Tabela de spațiu a bazei de date",
+    "Database host" : "Bază date",
+    "Finish setup" : "Finalizează instalarea",
+    "%s is available. Get more information on how to update." : "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
+    "Log out" : "Ieșire",
+    "Forgot your password? Reset it!" : "Ți-ai uitat parola? Resetează!",
+    "remember" : "amintește",
+    "Log in" : "Autentificare",
+    "Alternative Logins" : "Conectări alternative",
+    "Thank you for your patience." : "Îți mulțumim pentru răbrade.",
+    "%s will be updated to version %s." : "%s va fi actualizat la versiunea %s.",
+    "Start update" : "Începe actualizarea"
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
\ No newline at end of file
diff --git a/core/l10n/ro.php b/core/l10n/ro.php
deleted file mode 100644
index 591cd7e2850..00000000000
--- a/core/l10n/ro.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nu s-a putut trimite mesajul către următorii utilizatori: %s",
-"Turned on maintenance mode" => "Modul mentenanță a fost activat",
-"Turned off maintenance mode" => "Modul mentenanță a fost dezactivat",
-"Updated database" => "Bază de date actualizată",
-"Disabled incompatible apps: %s" => "Aplicatii incompatibile oprite: %s",
-"No image or file provided" => "Nu a fost furnizat vreo imagine sau fișier",
-"Unknown filetype" => "Tip fișier necunoscut",
-"Invalid image" => "Imagine invalidă",
-"Sunday" => "Duminică",
-"Monday" => "Luni",
-"Tuesday" => "Marți",
-"Wednesday" => "Miercuri",
-"Thursday" => "Joi",
-"Friday" => "Vineri",
-"Saturday" => "Sâmbătă",
-"January" => "Ianuarie",
-"February" => "Februarie",
-"March" => "Martie",
-"April" => "Aprilie",
-"May" => "Mai",
-"June" => "Iunie",
-"July" => "Iulie",
-"August" => "August",
-"September" => "Septembrie",
-"October" => "Octombrie",
-"November" => "Noiembrie",
-"December" => "Decembrie",
-"Settings" => "Setări",
-"File" => "Fişier ",
-"Folder" => "Dosar",
-"Image" => "Imagine",
-"Audio" => "Audio",
-"Saving..." => "Se salvează...",
-"I know what I'm doing" => "Eu știu ce fac",
-"Reset password" => "Resetează parola",
-"Password can not be changed. Please contact your administrator." => "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
-"No" => "Nu",
-"Yes" => "Da",
-"Choose" => "Alege",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"One file conflict" => "Un conflict de fișier",
-"New Files" => "Fișiere noi",
-"Already existing files" => "Fișiere deja existente",
-"Which files do you want to keep?" => "Ce fișiere vrei să păstrezi?",
-"If you select both versions, the copied file will have a number added to its name." => "Dacă alegi ambele versiuni, fișierul copiat va avea un număr atașat la denumirea sa.",
-"Cancel" => "Anulare",
-"Continue" => "Continuă",
-"({count} selected)" => "({count} selectate)",
-"Very weak password" => "Parolă foarte slabă",
-"Weak password" => "Parolă slabă",
-"Good password" => "Parolă bună",
-"Strong password" => "Parolă puternică",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Serverul de web nu este încă setat corespunzător pentru a permite sincronizarea fișierelor deoarece interfața WebDAV pare a fi întreruptă.",
-"Shared" => "Partajat",
-"Shared with {recipients}" => "Partajat cu {recipients}",
-"Share" => "Partajează",
-"Error" => "Eroare",
-"Error while sharing" => "Eroare la partajare",
-"Error while unsharing" => "Eroare la anularea partajării",
-"Error while changing permissions" => "Eroare la modificarea permisiunilor",
-"Shared with you and the group {group} by {owner}" => "Distribuie cu tine si grupul {group} de {owner}",
-"Shared with you by {owner}" => "Distribuie cu tine de {owner}",
-"Password protect" => "Protejare cu parolă",
-"Allow Public Upload" => "Permiteţi încărcarea publică.",
-"Email link to person" => "Expediază legătura prin poșta electronică",
-"Send" => "Expediază",
-"Set expiration date" => "Specifică data expirării",
-"Expiration date" => "Data expirării",
-"group" => "grup",
-"Resharing is not allowed" => "Repartajarea nu este permisă",
-"Shared in {item} with {user}" => "Distribuie in {item} si {user}",
-"Unshare" => "Anulare partajare",
-"notify by email" => "notifică prin email",
-"can share" => "se poate partaja",
-"can edit" => "poate edita",
-"access control" => "control acces",
-"create" => "creare",
-"update" => "actualizare",
-"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",
-"Warning" => "Atenție",
-"The object type is not specified." => "Tipul obiectului nu este specificat.",
-"Enter new" => "Introducere nou",
-"Delete" => "Șterge",
-"Add" => "Adaugă",
-"Updating {productName} to version {version}, this may take a while." => "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
-"Please reload the page." => "Te rugăm să reîncarci pagina.",
-"The update was unsuccessful." => "Actualizare eșuată.",
-"The update was successful. Redirecting you to ownCloud now." => "Actualizare reușită. Ești redirecționat către ownCloud.",
-"%s password reset" => "%s resetare parola",
-"Use the following link to reset your password: {link}" => "Folosește următorul link pentru a reseta parola: {link}",
-"You will receive a link to reset your password via Email." => "Vei primi un mesaj prin care vei putea reseta parola via email.",
-"Username" => "Nume utilizator",
-"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?" => "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
-"Yes, I really want to reset my password now" => "Da, eu chiar doresc să îmi resetez parola acum",
-"Reset" => "Resetare",
-"New password" => "Noua parolă",
-"New Password" => "Noua parolă",
-"Personal" => "Personal",
-"Users" => "Utilizatori",
-"Apps" => "Aplicații",
-"Admin" => "Administrator",
-"Help" => "Ajutor",
-"Access forbidden" => "Acces restricționat",
-"The share will expire on %s." => "Partajarea va expira în data de %s.",
-"Security Warning" => "Avertisment de securitate",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versiunea dvs. PHP este vulnerabilă la un atac cu un octet NULL  (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Te rog actualizează versiunea PHP pentru a utiliza %s în mod securizat.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
-"Create an <strong>admin account</strong>" => "Crează un <strong>cont de administrator</strong>",
-"Password" => "Parolă",
-"Storage & database" => "Stocare și baza de date",
-"Data folder" => "Director date",
-"Configure the database" => "Configurează baza de date",
-"Database user" => "Utilizatorul bazei de date",
-"Database password" => "Parola bazei de date",
-"Database name" => "Numele bazei de date",
-"Database tablespace" => "Tabela de spațiu a bazei de date",
-"Database host" => "Bază date",
-"Finish setup" => "Finalizează instalarea",
-"%s is available. Get more information on how to update." => "%s este disponibil. Vezi mai multe informații despre procesul de actualizare.",
-"Log out" => "Ieșire",
-"Forgot your password? Reset it!" => "Ți-ai uitat parola? Resetează!",
-"remember" => "amintește",
-"Log in" => "Autentificare",
-"Alternative Logins" => "Conectări alternative",
-"Thank you for your patience." => "Îți mulțumim pentru răbrade.",
-"%s will be updated to version %s." => "%s va fi actualizat la versiunea %s.",
-"Start update" => "Începe actualizarea"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
new file mode 100644
index 00000000000..2e3c566bf43
--- /dev/null
+++ b/core/l10n/ru.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Невозможно отправить письмо следующим пользователям: %s",
+    "Turned on maintenance mode" : "Режим отладки включён",
+    "Turned off maintenance mode" : "Режим отладки отключён",
+    "Updated database" : "База данных обновлена",
+    "Checked database schema update" : "Проверено обновление схемы БД",
+    "Checked database schema update for apps" : "Проверено обновление схемы БД для приложений",
+    "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Отключенные несовместимые приложения: %s",
+    "No image or file provided" : "Не указано изображение или файл",
+    "Unknown filetype" : "Неизвестный тип файла",
+    "Invalid image" : "Некорректное изображение",
+    "No temporary profile picture available, try again" : "Временная картинка профиля недоступна, повторите попытку",
+    "No crop data provided" : "Не указана информация о кадрировании",
+    "Sunday" : "Воскресенье",
+    "Monday" : "Понедельник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четверг",
+    "Friday" : "Пятница",
+    "Saturday" : "Суббота",
+    "January" : "Январь",
+    "February" : "Февраль",
+    "March" : "Март",
+    "April" : "Апрель",
+    "May" : "Май",
+    "June" : "Июнь",
+    "July" : "Июль",
+    "August" : "Август",
+    "September" : "Сентябрь",
+    "October" : "Октябрь",
+    "November" : "Ноябрь",
+    "December" : "Декабрь",
+    "Settings" : "Настройки",
+    "File" : "Файл",
+    "Folder" : "Каталог",
+    "Image" : "Изображение",
+    "Audio" : "Аудио",
+    "Saving..." : "Сохранение...",
+    "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 />Вытдействительно хотите продолжить?",
+    "I know what I'm doing" : "Я понимаю, что делаю",
+    "Reset password" : "Сбросить пароль",
+    "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
+    "No" : "Нет",
+    "Yes" : "Да",
+    "Choose" : "Выбрать",
+    "Error loading file picker template: {error}" : "Ошибка при загрузке шаблона выбора файлов: {error}",
+    "Ok" : "Ок",
+    "Error loading message template: {error}" : "Ошибка загрузки шаблона сообщений: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"],
+    "One file conflict" : "Один конфликт в файлах",
+    "New Files" : "Новые файлы",
+    "Already existing files" : "Существующие файлы",
+    "Which files do you want to keep?" : "Какие файлы вы хотите сохранить?",
+    "If you select both versions, the copied file will have a number added to its name." : "При выборе обоих версий,  к названию копируемого файла будет добавлена цифра",
+    "Cancel" : "Отменить",
+    "Continue" : "Продолжить",
+    "(all selected)" : "(выбраны все)",
+    "({count} selected)" : "({count} выбрано)",
+    "Error loading file exists template" : "Ошибка при загрузке шаблона существующего файла",
+    "Very weak password" : "Очень слабый пароль",
+    "Weak password" : "Слабый пароль",
+    "So-so password" : "Так себе пароль",
+    "Good password" : "Хороший пароль",
+    "Strong password" : "Устойчивый к взлому пароль",
+    "Your web server is not yet properly setup to allow files 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 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." : "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности.",
+    "Error occurred while checking server setup" : "Произошла ошибка при проверке настройки сервера",
+    "Shared" : "Общие",
+    "Shared with {recipients}" : "Доступ открыт {recipients}",
+    "Share" : "Открыть доступ",
+    "Error" : "Ошибка",
+    "Error while sharing" : "Ошибка при открытии доступа",
+    "Error while unsharing" : "Ошибка при закрытии доступа",
+    "Error while changing permissions" : "Ошибка при смене разрешений",
+    "Shared with you and the group {group} by {owner}" : "{owner} открыл доступ для Вас и группы {group} ",
+    "Shared with you by {owner}" : "{owner} открыл доступ для Вас",
+    "Share with user or group …" : "Поделиться с пользователем или группой...",
+    "Share link" : "Поделиться ссылкой",
+    "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней, после её создания",
+    "Password protect" : "Защитить паролем",
+    "Choose a password for the public link" : "Выберите пароль для публичной ссылки",
+    "Allow Public Upload" : "Разрешить загрузку",
+    "Email link to person" : "Почтовая ссылка на персону",
+    "Send" : "Отправить",
+    "Set expiration date" : "Установить срок доступа",
+    "Expiration date" : "Дата окончания",
+    "Adding user..." : "Добавляем пользователя...",
+    "group" : "группа",
+    "Resharing is not allowed" : "Общий доступ не разрешен",
+    "Shared in {item} with {user}" : "Общий доступ к {item} с {user}",
+    "Unshare" : "Закрыть общий доступ",
+    "notify by email" : "уведомить по почте",
+    "can share" : "можно дать доступ",
+    "can edit" : "может редактировать",
+    "access control" : "контроль доступа",
+    "create" : "создать",
+    "update" : "обновить",
+    "delete" : "удалить",
+    "Password protected" : "Защищено паролем",
+    "Error unsetting expiration date" : "Ошибка при отмене срока доступа",
+    "Error setting expiration date" : "Ошибка при установке срока доступа",
+    "Sending ..." : "Отправляется ...",
+    "Email sent" : "Письмо отправлено",
+    "Warning" : "Предупреждение",
+    "The object type is not specified." : "Тип объекта не указан",
+    "Enter new" : "Ввести новое",
+    "Delete" : "Удалить",
+    "Add" : "Добавить",
+    "Edit tags" : "Изменить метки",
+    "Error loading dialog template: {error}" : "Ошибка загрузки шаблона диалога: {error}",
+    "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. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
+    "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль потому, что ключ неправильный",
+    "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 сброс пароля",
+    "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}",
+    "You will receive a link to reset your password via Email." : "На ваш адрес Email выслана ссылка для сброса пароля.",
+    "Username" : "Имя пользователя",
+    "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?" : "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
+    "Yes, I really want to reset my password now" : "Да, я действительно хочу сбросить свой пароль",
+    "Reset" : "Сброс",
+    "New password" : "Новый пароль",
+    "New Password" : "Новый пароль",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
+    "Personal" : "Личное",
+    "Users" : "Пользователи",
+    "Apps" : "Приложения",
+    "Admin" : "Админпанель",
+    "Help" : "Помощь",
+    "Error loading tags" : "Ошибка загрузки меток",
+    "Tag already exists" : "Метка уже существует",
+    "Error deleting tag(s)" : "Ошибка удаления метки(ок)",
+    "Error tagging" : "Ошибка присваивания метки",
+    "Error untagging" : "Ошибка снятия метки",
+    "Error favoriting" : "Ошибка размещения в любимых",
+    "Error unfavoriting" : "Ошибка удаления из любимых",
+    "Access forbidden" : "Доступ запрещён",
+    "File not found" : "Файл не найден",
+    "The specified document has not been found on the server." : "Указанный документ не может быть найден на сервере.",
+    "You can click here to return to %s." : "Вы можете нажать здесь, чтобы вернуться в %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здравствуйте,\n\n%s предоставил Вам доступ к %s.\nПосмотреть: %s\n\n",
+    "The share will expire on %s." : "Доступ будет закрыт %s",
+    "Cheers!" : "Удачи!",
+    "The server encountered an internal error and was unable to complete your request." : "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
+    "More details can be found in the server log." : "Больше деталей может быть найдено в журнале сервера.",
+    "Technical details" : "Технические детали",
+    "Remote Address: %s" : "Удаленный Адрес: %s",
+    "Request ID: %s" : "ID Запроса: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Сообщение: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Линия: %s",
+    "Trace" : "След",
+    "Security Warning" : "Предупреждение безопасности",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Пожалуйста обновите Вашу PHP конфигурацию для безопасного использования %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
+    "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
+    "Password" : "Пароль",
+    "Storage & database" : "Система хранения данных & база данных",
+    "Data folder" : "Директория с данными",
+    "Configure the database" : "Настройка базы данных",
+    "Only %s is available." : "Только %s доступно.",
+    "Database user" : "Пользователь базы данных",
+    "Database password" : "Пароль базы данных",
+    "Database name" : "Название базы данных",
+    "Database tablespace" : "Табличое пространство базы данных",
+    "Database host" : "Хост базы данных",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite будет использован в качестве базы данных. Мы рекомендуем изменить это для крупных установок.",
+    "Finish setup" : "Завершить установку",
+    "Finishing …" : "Завершаем...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Этому приложению нужен включенный Джаваскрипт. Пожалуйста, <a href=\"http://www.enable-javascript.com/ru/\" target=\"_blank\">включите Джаваскрипт</a> и перезагрузите страницу.",
+    "%s is available. Get more information on how to update." : "%s доступно. Получить дополнительную информацию о порядке обновления.",
+    "Log out" : "Выйти",
+    "Server side authentication failed!" : "Неудачная аутентификация с сервером!",
+    "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
+    "Forgot your password? Reset it!" : "Забыли пароль? Сбросьте его!",
+    "remember" : "запомнить",
+    "Log in" : "Войти",
+    "Alternative Logins" : "Альтернативные имена пользователя",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s предоставил Вам доступ к <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы загрузить информацию<br><br>",
+    "This ownCloud instance is currently in single user mode." : "Эта установка ownCloud в настоящее время в однопользовательском режиме.",
+    "This means only administrators can use the instance." : "Это значит, что только администраторы могут использовать эту установку.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
+    "Thank you for your patience." : "Спасибо за терпение.",
+    "You are accessing the server from an untrusted domain." : "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, свяжитесь с администратором. Если вы администратор этого хранилища, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, вы, будучи администратором, можете также внести домен в доверенные при помощи кнопки снизу.",
+    "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
+    "%s will be updated to version %s." : "%s будет обновлено до версии %s.",
+    "The following apps will be disabled:" : "Следующие приложения будут отключены:",
+    "The theme %s has been disabled." : "Тема %s была отключена.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Пожалуйста, перед тем, как продолжить, убедитесь в том, что вы сделали резервную копию базы данных, директории конфигурации и директории с данными.",
+    "Start update" : "Запустить обновление",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек при больших объёмах, вы можете выполнить следующую команду в директории установки:",
+    "This %s instance is currently being updated, which may take a while." : "Этот экземпляр %s в данный момент обновляется, это может занять некоторое время.",
+    "This page will refresh itself when the %s instance is available again." : "Эта страница обновится, когда экземпляр %s станет снова доступным."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
new file mode 100644
index 00000000000..719a0cc1027
--- /dev/null
+++ b/core/l10n/ru.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Невозможно отправить письмо следующим пользователям: %s",
+    "Turned on maintenance mode" : "Режим отладки включён",
+    "Turned off maintenance mode" : "Режим отладки отключён",
+    "Updated database" : "База данных обновлена",
+    "Checked database schema update" : "Проверено обновление схемы БД",
+    "Checked database schema update for apps" : "Проверено обновление схемы БД для приложений",
+    "Updated \"%s\" to %s" : "Обновлено \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Отключенные несовместимые приложения: %s",
+    "No image or file provided" : "Не указано изображение или файл",
+    "Unknown filetype" : "Неизвестный тип файла",
+    "Invalid image" : "Некорректное изображение",
+    "No temporary profile picture available, try again" : "Временная картинка профиля недоступна, повторите попытку",
+    "No crop data provided" : "Не указана информация о кадрировании",
+    "Sunday" : "Воскресенье",
+    "Monday" : "Понедельник",
+    "Tuesday" : "Вторник",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четверг",
+    "Friday" : "Пятница",
+    "Saturday" : "Суббота",
+    "January" : "Январь",
+    "February" : "Февраль",
+    "March" : "Март",
+    "April" : "Апрель",
+    "May" : "Май",
+    "June" : "Июнь",
+    "July" : "Июль",
+    "August" : "Август",
+    "September" : "Сентябрь",
+    "October" : "Октябрь",
+    "November" : "Ноябрь",
+    "December" : "Декабрь",
+    "Settings" : "Настройки",
+    "File" : "Файл",
+    "Folder" : "Каталог",
+    "Image" : "Изображение",
+    "Audio" : "Аудио",
+    "Saving..." : "Сохранение...",
+    "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 />Вытдействительно хотите продолжить?",
+    "I know what I'm doing" : "Я понимаю, что делаю",
+    "Reset password" : "Сбросить пароль",
+    "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
+    "No" : "Нет",
+    "Yes" : "Да",
+    "Choose" : "Выбрать",
+    "Error loading file picker template: {error}" : "Ошибка при загрузке шаблона выбора файлов: {error}",
+    "Ok" : "Ок",
+    "Error loading message template: {error}" : "Ошибка загрузки шаблона сообщений: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"],
+    "One file conflict" : "Один конфликт в файлах",
+    "New Files" : "Новые файлы",
+    "Already existing files" : "Существующие файлы",
+    "Which files do you want to keep?" : "Какие файлы вы хотите сохранить?",
+    "If you select both versions, the copied file will have a number added to its name." : "При выборе обоих версий,  к названию копируемого файла будет добавлена цифра",
+    "Cancel" : "Отменить",
+    "Continue" : "Продолжить",
+    "(all selected)" : "(выбраны все)",
+    "({count} selected)" : "({count} выбрано)",
+    "Error loading file exists template" : "Ошибка при загрузке шаблона существующего файла",
+    "Very weak password" : "Очень слабый пароль",
+    "Weak password" : "Слабый пароль",
+    "So-so password" : "Так себе пароль",
+    "Good password" : "Хороший пароль",
+    "Strong password" : "Устойчивый к взлому пароль",
+    "Your web server is not yet properly setup to allow files 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 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." : "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности.",
+    "Error occurred while checking server setup" : "Произошла ошибка при проверке настройки сервера",
+    "Shared" : "Общие",
+    "Shared with {recipients}" : "Доступ открыт {recipients}",
+    "Share" : "Открыть доступ",
+    "Error" : "Ошибка",
+    "Error while sharing" : "Ошибка при открытии доступа",
+    "Error while unsharing" : "Ошибка при закрытии доступа",
+    "Error while changing permissions" : "Ошибка при смене разрешений",
+    "Shared with you and the group {group} by {owner}" : "{owner} открыл доступ для Вас и группы {group} ",
+    "Shared with you by {owner}" : "{owner} открыл доступ для Вас",
+    "Share with user or group …" : "Поделиться с пользователем или группой...",
+    "Share link" : "Поделиться ссылкой",
+    "The public link will expire no later than {days} days after it is created" : "Срок действия публичной ссылки истекает не позже чем через {days} дней, после её создания",
+    "Password protect" : "Защитить паролем",
+    "Choose a password for the public link" : "Выберите пароль для публичной ссылки",
+    "Allow Public Upload" : "Разрешить загрузку",
+    "Email link to person" : "Почтовая ссылка на персону",
+    "Send" : "Отправить",
+    "Set expiration date" : "Установить срок доступа",
+    "Expiration date" : "Дата окончания",
+    "Adding user..." : "Добавляем пользователя...",
+    "group" : "группа",
+    "Resharing is not allowed" : "Общий доступ не разрешен",
+    "Shared in {item} with {user}" : "Общий доступ к {item} с {user}",
+    "Unshare" : "Закрыть общий доступ",
+    "notify by email" : "уведомить по почте",
+    "can share" : "можно дать доступ",
+    "can edit" : "может редактировать",
+    "access control" : "контроль доступа",
+    "create" : "создать",
+    "update" : "обновить",
+    "delete" : "удалить",
+    "Password protected" : "Защищено паролем",
+    "Error unsetting expiration date" : "Ошибка при отмене срока доступа",
+    "Error setting expiration date" : "Ошибка при установке срока доступа",
+    "Sending ..." : "Отправляется ...",
+    "Email sent" : "Письмо отправлено",
+    "Warning" : "Предупреждение",
+    "The object type is not specified." : "Тип объекта не указан",
+    "Enter new" : "Ввести новое",
+    "Delete" : "Удалить",
+    "Add" : "Добавить",
+    "Edit tags" : "Изменить метки",
+    "Error loading dialog template: {error}" : "Ошибка загрузки шаблона диалога: {error}",
+    "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. Redirecting you to ownCloud now." : "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
+    "Couldn't reset password because the token is invalid" : "Невозможно сбросить пароль потому, что ключ неправильный",
+    "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 сброс пароля",
+    "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}",
+    "You will receive a link to reset your password via Email." : "На ваш адрес Email выслана ссылка для сброса пароля.",
+    "Username" : "Имя пользователя",
+    "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?" : "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
+    "Yes, I really want to reset my password now" : "Да, я действительно хочу сбросить свой пароль",
+    "Reset" : "Сброс",
+    "New password" : "Новый пароль",
+    "New Password" : "Новый пароль",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
+    "Personal" : "Личное",
+    "Users" : "Пользователи",
+    "Apps" : "Приложения",
+    "Admin" : "Админпанель",
+    "Help" : "Помощь",
+    "Error loading tags" : "Ошибка загрузки меток",
+    "Tag already exists" : "Метка уже существует",
+    "Error deleting tag(s)" : "Ошибка удаления метки(ок)",
+    "Error tagging" : "Ошибка присваивания метки",
+    "Error untagging" : "Ошибка снятия метки",
+    "Error favoriting" : "Ошибка размещения в любимых",
+    "Error unfavoriting" : "Ошибка удаления из любимых",
+    "Access forbidden" : "Доступ запрещён",
+    "File not found" : "Файл не найден",
+    "The specified document has not been found on the server." : "Указанный документ не может быть найден на сервере.",
+    "You can click here to return to %s." : "Вы можете нажать здесь, чтобы вернуться в %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здравствуйте,\n\n%s предоставил Вам доступ к %s.\nПосмотреть: %s\n\n",
+    "The share will expire on %s." : "Доступ будет закрыт %s",
+    "Cheers!" : "Удачи!",
+    "The server encountered an internal error and was unable to complete your request." : "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
+    "More details can be found in the server log." : "Больше деталей может быть найдено в журнале сервера.",
+    "Technical details" : "Технические детали",
+    "Remote Address: %s" : "Удаленный Адрес: %s",
+    "Request ID: %s" : "ID Запроса: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Сообщение: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Линия: %s",
+    "Trace" : "След",
+    "Security Warning" : "Предупреждение безопасности",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Пожалуйста обновите Вашу PHP конфигурацию для безопасного использования %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
+    "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
+    "Password" : "Пароль",
+    "Storage & database" : "Система хранения данных & база данных",
+    "Data folder" : "Директория с данными",
+    "Configure the database" : "Настройка базы данных",
+    "Only %s is available." : "Только %s доступно.",
+    "Database user" : "Пользователь базы данных",
+    "Database password" : "Пароль базы данных",
+    "Database name" : "Название базы данных",
+    "Database tablespace" : "Табличое пространство базы данных",
+    "Database host" : "Хост базы данных",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite будет использован в качестве базы данных. Мы рекомендуем изменить это для крупных установок.",
+    "Finish setup" : "Завершить установку",
+    "Finishing …" : "Завершаем...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Этому приложению нужен включенный Джаваскрипт. Пожалуйста, <a href=\"http://www.enable-javascript.com/ru/\" target=\"_blank\">включите Джаваскрипт</a> и перезагрузите страницу.",
+    "%s is available. Get more information on how to update." : "%s доступно. Получить дополнительную информацию о порядке обновления.",
+    "Log out" : "Выйти",
+    "Server side authentication failed!" : "Неудачная аутентификация с сервером!",
+    "Please contact your administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
+    "Forgot your password? Reset it!" : "Забыли пароль? Сбросьте его!",
+    "remember" : "запомнить",
+    "Log in" : "Войти",
+    "Alternative Logins" : "Альтернативные имена пользователя",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Здравствуйте,<br><br>%s предоставил Вам доступ к <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы загрузить информацию<br><br>",
+    "This ownCloud instance is currently in single user mode." : "Эта установка ownCloud в настоящее время в однопользовательском режиме.",
+    "This means only administrators can use the instance." : "Это значит, что только администраторы могут использовать эту установку.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
+    "Thank you for your patience." : "Спасибо за терпение.",
+    "You are accessing the server from an untrusted domain." : "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Пожалуйста, свяжитесь с администратором. Если вы администратор этого хранилища, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "В зависимости от конфигурации, вы, будучи администратором, можете также внести домен в доверенные при помощи кнопки снизу.",
+    "Add \"%s\" as trusted domain" : "Добавить \"%s\" как доверенный домен",
+    "%s will be updated to version %s." : "%s будет обновлено до версии %s.",
+    "The following apps will be disabled:" : "Следующие приложения будут отключены:",
+    "The theme %s has been disabled." : "Тема %s была отключена.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Пожалуйста, перед тем, как продолжить, убедитесь в том, что вы сделали резервную копию базы данных, директории конфигурации и директории с данными.",
+    "Start update" : "Запустить обновление",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Чтобы избежать задержек при больших объёмах, вы можете выполнить следующую команду в директории установки:",
+    "This %s instance is currently being updated, which may take a while." : "Этот экземпляр %s в данный момент обновляется, это может занять некоторое время.",
+    "This page will refresh itself when the %s instance is available again." : "Эта страница обновится, когда экземпляр %s станет снова доступным."
+},"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/ru.php b/core/l10n/ru.php
deleted file mode 100644
index aef239fd288..00000000000
--- a/core/l10n/ru.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Невозможно отправить письмо следующим пользователям: %s",
-"Turned on maintenance mode" => "Режим отладки включён",
-"Turned off maintenance mode" => "Режим отладки отключён",
-"Updated database" => "База данных обновлена",
-"Checked database schema update" => "Проверено обновление схемы БД",
-"Checked database schema update for apps" => "Проверено обновление схемы БД для приложений",
-"Updated \"%s\" to %s" => "Обновлено \"%s\" до %s",
-"Disabled incompatible apps: %s" => "Отключенные несовместимые приложения: %s",
-"No image or file provided" => "Не указано изображение или файл",
-"Unknown filetype" => "Неизвестный тип файла",
-"Invalid image" => "Некорректное изображение",
-"No temporary profile picture available, try again" => "Временная картинка профиля недоступна, повторите попытку",
-"No crop data provided" => "Не указана информация о кадрировании",
-"Sunday" => "Воскресенье",
-"Monday" => "Понедельник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Среда",
-"Thursday" => "Четверг",
-"Friday" => "Пятница",
-"Saturday" => "Суббота",
-"January" => "Январь",
-"February" => "Февраль",
-"March" => "Март",
-"April" => "Апрель",
-"May" => "Май",
-"June" => "Июнь",
-"July" => "Июль",
-"August" => "Август",
-"September" => "Сентябрь",
-"October" => "Октябрь",
-"November" => "Ноябрь",
-"December" => "Декабрь",
-"Settings" => "Настройки",
-"File" => "Файл",
-"Folder" => "Каталог",
-"Image" => "Изображение",
-"Audio" => "Аудио",
-"Saving..." => "Сохранение...",
-"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 />Вытдействительно хотите продолжить?",
-"I know what I'm doing" => "Я понимаю, что делаю",
-"Reset password" => "Сбросить пароль",
-"Password can not be changed. Please contact your administrator." => "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
-"No" => "Нет",
-"Yes" => "Да",
-"Choose" => "Выбрать",
-"Error loading file picker template: {error}" => "Ошибка при загрузке шаблона выбора файлов: {error}",
-"Ok" => "Ок",
-"Error loading message template: {error}" => "Ошибка загрузки шаблона сообщений: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} конфликт в файлах","{count} конфликта в файлах","{count} конфликтов в файлах"),
-"One file conflict" => "Один конфликт в файлах",
-"New Files" => "Новые файлы",
-"Already existing files" => "Существующие файлы",
-"Which files do you want to keep?" => "Какие файлы вы хотите сохранить?",
-"If you select both versions, the copied file will have a number added to its name." => "При выборе обоих версий,  к названию копируемого файла будет добавлена цифра",
-"Cancel" => "Отменить",
-"Continue" => "Продолжить",
-"(all selected)" => "(выбраны все)",
-"({count} selected)" => "({count} выбрано)",
-"Error loading file exists template" => "Ошибка при загрузке шаблона существующего файла",
-"Very weak password" => "Очень слабый пароль",
-"Weak password" => "Слабый пароль",
-"So-so password" => "Так себе пароль",
-"Good password" => "Хороший пароль",
-"Strong password" => "Устойчивый к взлому пароль",
-"Your web server is not yet properly setup to allow files 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 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." => "Этот сервер не имеет подключения к сети интернет. Это значит, что некоторые возможности, такие как подключение внешних дисков, уведомления об обновлениях или установка сторонних приложений – не работают. Удалённый доступ к файлам и отправка уведомлений по электронной почте вероятнее всего тоже не будут работать. Предлагаем включить соединение с интернетом для этого сервера, если Вы хотите иметь все возможности.",
-"Error occurred while checking server setup" => "Произошла ошибка при проверке настройки сервера",
-"Shared" => "Общие",
-"Shared with {recipients}" => "Доступ открыт {recipients}",
-"Share" => "Открыть доступ",
-"Error" => "Ошибка",
-"Error while sharing" => "Ошибка при открытии доступа",
-"Error while unsharing" => "Ошибка при закрытии доступа",
-"Error while changing permissions" => "Ошибка при смене разрешений",
-"Shared with you and the group {group} by {owner}" => "{owner} открыл доступ для Вас и группы {group} ",
-"Shared with you by {owner}" => "{owner} открыл доступ для Вас",
-"Share with user or group …" => "Поделиться с пользователем или группой...",
-"Share link" => "Поделиться ссылкой",
-"The public link will expire no later than {days} days after it is created" => "Срок действия публичной ссылки истекает не позже чем через {days} дней, после её создания",
-"Password protect" => "Защитить паролем",
-"Choose a password for the public link" => "Выберите пароль для публичной ссылки",
-"Allow Public Upload" => "Разрешить загрузку",
-"Email link to person" => "Почтовая ссылка на персону",
-"Send" => "Отправить",
-"Set expiration date" => "Установить срок доступа",
-"Expiration date" => "Дата окончания",
-"Adding user..." => "Добавляем пользователя...",
-"group" => "группа",
-"Resharing is not allowed" => "Общий доступ не разрешен",
-"Shared in {item} with {user}" => "Общий доступ к {item} с {user}",
-"Unshare" => "Закрыть общий доступ",
-"notify by email" => "уведомить по почте",
-"can share" => "можно дать доступ",
-"can edit" => "может редактировать",
-"access control" => "контроль доступа",
-"create" => "создать",
-"update" => "обновить",
-"delete" => "удалить",
-"Password protected" => "Защищено паролем",
-"Error unsetting expiration date" => "Ошибка при отмене срока доступа",
-"Error setting expiration date" => "Ошибка при установке срока доступа",
-"Sending ..." => "Отправляется ...",
-"Email sent" => "Письмо отправлено",
-"Warning" => "Предупреждение",
-"The object type is not specified." => "Тип объекта не указан",
-"Enter new" => "Ввести новое",
-"Delete" => "Удалить",
-"Add" => "Добавить",
-"Edit tags" => "Изменить метки",
-"Error loading dialog template: {error}" => "Ошибка загрузки шаблона диалога: {error}",
-"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. Redirecting you to ownCloud now." => "Обновление прошло успешно. Перенаправляемся в Ваш ownCloud...",
-"Couldn't reset password because the token is invalid" => "Невозможно сбросить пароль потому, что ключ неправильный",
-"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 сброс пароля",
-"Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
-"You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
-"Username" => "Имя пользователя",
-"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?" => "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
-"Yes, I really want to reset my password now" => "Да, я действительно хочу сбросить свой пароль",
-"Reset" => "Сброс",
-"New password" => "Новый пароль",
-"New Password" => "Новый пароль",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
-"For the best results, please consider using a GNU/Linux server instead." => "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
-"Personal" => "Личное",
-"Users" => "Пользователи",
-"Apps" => "Приложения",
-"Admin" => "Админпанель",
-"Help" => "Помощь",
-"Error loading tags" => "Ошибка загрузки меток",
-"Tag already exists" => "Метка уже существует",
-"Error deleting tag(s)" => "Ошибка удаления метки(ок)",
-"Error tagging" => "Ошибка присваивания метки",
-"Error untagging" => "Ошибка снятия метки",
-"Error favoriting" => "Ошибка размещения в любимых",
-"Error unfavoriting" => "Ошибка удаления из любимых",
-"Access forbidden" => "Доступ запрещён",
-"File not found" => "Файл не найден",
-"The specified document has not been found on the server." => "Указанный документ не может быть найден на сервере.",
-"You can click here to return to %s." => "Вы можете нажать здесь, чтобы вернуться в %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Здравствуйте,\n\n%s предоставил Вам доступ к %s.\nПосмотреть: %s\n\n",
-"The share will expire on %s." => "Доступ будет закрыт %s",
-"Cheers!" => "Удачи!",
-"Internal Server Error" => "Внутренняя ошибка сервера",
-"The server encountered an internal error and was unable to complete your request." => "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
-"More details can be found in the server log." => "Больше деталей может быть найдено в журнале сервера.",
-"Technical details" => "Технические детали",
-"Remote Address: %s" => "Удаленный Адрес: %s",
-"Request ID: %s" => "ID Запроса: %s",
-"Code: %s" => "Код: %s",
-"Message: %s" => "Сообщение: %s",
-"File: %s" => "Файл: %s",
-"Line: %s" => "Линия: %s",
-"Trace" => "След",
-"Security Warning" => "Предупреждение безопасности",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версия PHP уязвима к атаке NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Пожалуйста обновите Вашу PHP конфигурацию для безопасного использования %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
-"Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
-"Password" => "Пароль",
-"Storage & database" => "Система хранения данных & база данных",
-"Data folder" => "Директория с данными",
-"Configure the database" => "Настройка базы данных",
-"Only %s is available." => "Только %s доступно.",
-"Database user" => "Пользователь базы данных",
-"Database password" => "Пароль базы данных",
-"Database name" => "Название базы данных",
-"Database tablespace" => "Табличое пространство базы данных",
-"Database host" => "Хост базы данных",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite будет использован в качестве базы данных. Мы рекомендуем изменить это для крупных установок.",
-"Finish setup" => "Завершить установку",
-"Finishing …" => "Завершаем...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Этому приложению нужен включенный Джаваскрипт. Пожалуйста, <a href=\"http://www.enable-javascript.com/ru/\" target=\"_blank\">включите Джаваскрипт</a> и перезагрузите страницу.",
-"%s is available. Get more information on how to update." => "%s доступно. Получить дополнительную информацию о порядке обновления.",
-"Log out" => "Выйти",
-"Server side authentication failed!" => "Неудачная аутентификация с сервером!",
-"Please contact your administrator." => "Пожалуйста, свяжитесь с вашим администратором.",
-"Forgot your password? Reset it!" => "Забыли пароль? Сбросьте его!",
-"remember" => "запомнить",
-"Log in" => "Войти",
-"Alternative Logins" => "Альтернативные имена пользователя",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Здравствуйте,<br><br>%s предоставил Вам доступ к <strong>%s</strong>.<br>Перейдите по <a href=\"%s\">ссылке</a>, чтобы загрузить информацию<br><br>",
-"This ownCloud instance is currently in single user mode." => "Эта установка ownCloud в настоящее время в однопользовательском режиме.",
-"This means only administrators can use the instance." => "Это значит, что только администраторы могут использовать эту установку.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Обратитесь к вашему системному администратору если это сообщение не исчезает или появляется неожиданно.",
-"Thank you for your patience." => "Спасибо за терпение.",
-"You are accessing the server from an untrusted domain." => "Вы пытаетесь получить доступ к серверу с неподтверждённого домена.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Пожалуйста, свяжитесь с администратором. Если вы администратор этого хранилища, сконфигурируйте \"trusted_domain\" в config/config.php. Пример настройки можно найти в /config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "В зависимости от конфигурации, вы, будучи администратором, можете также внести домен в доверенные при помощи кнопки снизу.",
-"Add \"%s\" as trusted domain" => "Добавить \"%s\" как доверенный домен",
-"%s will be updated to version %s." => "%s будет обновлено до версии %s.",
-"The following apps will be disabled:" => "Следующие приложения будут отключены:",
-"The theme %s has been disabled." => "Тема %s была отключена.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Пожалуйста, перед тем, как продолжить, убедитесь в том, что вы сделали резервную копию базы данных, директории конфигурации и директории с данными.",
-"Start update" => "Запустить обновление",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Чтобы избежать задержек при больших объёмах, вы можете выполнить следующую команду в директории установки:",
-"This %s instance is currently being updated, which may take a while." => "Этот экземпляр %s в данный момент обновляется, это может занять некоторое время.",
-"This page will refresh itself when the %s instance is available again." => "Эта страница обновится, когда экземпляр %s станет снова доступным."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
new file mode 100644
index 00000000000..63edcfb6065
--- /dev/null
+++ b/core/l10n/si_LK.js
@@ -0,0 +1,74 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "ඉරිදා",
+    "Monday" : "සඳුදා",
+    "Tuesday" : "අඟහරුවාදා",
+    "Wednesday" : "බදාදා",
+    "Thursday" : "බ්‍රහස්පතින්දා",
+    "Friday" : "සිකුරාදා",
+    "Saturday" : "සෙනසුරාදා",
+    "January" : "ජනවාරි",
+    "February" : "පෙබරවාරි",
+    "March" : "මාර්තු",
+    "April" : "අප්‍රේල්",
+    "May" : "මැයි",
+    "June" : "ජූනි",
+    "July" : "ජූලි",
+    "August" : "අගෝස්තු",
+    "September" : "සැප්තැම්බර්",
+    "October" : "ඔක්තෝබර",
+    "November" : "නොවැම්බර්",
+    "December" : "දෙසැම්බර්",
+    "Settings" : "සිටුවම්",
+    "Folder" : "ෆෝල්ඩරය",
+    "Image" : "පින්තූරය",
+    "Saving..." : "සුරැකෙමින් පවතී...",
+    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
+    "No" : "එපා",
+    "Yes" : "ඔව්",
+    "Choose" : "තෝරන්න",
+    "Ok" : "හරි",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "එපා",
+    "Share" : "බෙදා හදා ගන්න",
+    "Error" : "දෝෂයක්",
+    "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
+    "Set expiration date" : "කල් ඉකුත් විමේ දිනය දමන්න",
+    "Expiration date" : "කල් ඉකුත් විමේ දිනය",
+    "group" : "කණ්ඩායම",
+    "Unshare" : "නොබෙදු",
+    "can edit" : "සංස්කරණය කළ හැක",
+    "access control" : "ප්‍රවේශ පාලනය",
+    "create" : "සදන්න",
+    "update" : "යාවත්කාලීන කරන්න",
+    "delete" : "මකන්න",
+    "Password protected" : "මුර පදයකින් ආරක්ශාකර ඇත",
+    "Error unsetting expiration date" : "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
+    "Error setting expiration date" : "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
+    "Warning" : "අවවාදය",
+    "Delete" : "මකා දමන්න",
+    "Add" : "එකතු කරන්න",
+    "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
+    "Username" : "පරිශීලක නම",
+    "New password" : "නව මුරපදය",
+    "Personal" : "පෞද්ගලික",
+    "Users" : "පරිශීලකයන්",
+    "Apps" : "යෙදුම්",
+    "Admin" : "පරිපාලක",
+    "Help" : "උදව්",
+    "Access forbidden" : "ඇතුල් වීම තහනම්",
+    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Password" : "මුර පදය",
+    "Data folder" : "දත්ත ෆෝල්ඩරය",
+    "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
+    "Database user" : "දත්තගබඩා භාවිතාකරු",
+    "Database password" : "දත්තගබඩාවේ මුරපදය",
+    "Database name" : "දත්තගබඩාවේ නම",
+    "Database host" : "දත්තගබඩා සේවාදායකයා",
+    "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
+    "Log out" : "නික්මීම",
+    "remember" : "මතක තබාගන්න",
+    "Log in" : "ප්‍රවේශවන්න"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
new file mode 100644
index 00000000000..f04c86b9898
--- /dev/null
+++ b/core/l10n/si_LK.json
@@ -0,0 +1,72 @@
+{ "translations": {
+    "Sunday" : "ඉරිදා",
+    "Monday" : "සඳුදා",
+    "Tuesday" : "අඟහරුවාදා",
+    "Wednesday" : "බදාදා",
+    "Thursday" : "බ්‍රහස්පතින්දා",
+    "Friday" : "සිකුරාදා",
+    "Saturday" : "සෙනසුරාදා",
+    "January" : "ජනවාරි",
+    "February" : "පෙබරවාරි",
+    "March" : "මාර්තු",
+    "April" : "අප්‍රේල්",
+    "May" : "මැයි",
+    "June" : "ජූනි",
+    "July" : "ජූලි",
+    "August" : "අගෝස්තු",
+    "September" : "සැප්තැම්බර්",
+    "October" : "ඔක්තෝබර",
+    "November" : "නොවැම්බර්",
+    "December" : "දෙසැම්බර්",
+    "Settings" : "සිටුවම්",
+    "Folder" : "ෆෝල්ඩරය",
+    "Image" : "පින්තූරය",
+    "Saving..." : "සුරැකෙමින් පවතී...",
+    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
+    "No" : "එපා",
+    "Yes" : "ඔව්",
+    "Choose" : "තෝරන්න",
+    "Ok" : "හරි",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "එපා",
+    "Share" : "බෙදා හදා ගන්න",
+    "Error" : "දෝෂයක්",
+    "Password protect" : "මුර පදයකින් ආරක්ශාකරන්න",
+    "Set expiration date" : "කල් ඉකුත් විමේ දිනය දමන්න",
+    "Expiration date" : "කල් ඉකුත් විමේ දිනය",
+    "group" : "කණ්ඩායම",
+    "Unshare" : "නොබෙදු",
+    "can edit" : "සංස්කරණය කළ හැක",
+    "access control" : "ප්‍රවේශ පාලනය",
+    "create" : "සදන්න",
+    "update" : "යාවත්කාලීන කරන්න",
+    "delete" : "මකන්න",
+    "Password protected" : "මුර පදයකින් ආරක්ශාකර ඇත",
+    "Error unsetting expiration date" : "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
+    "Error setting expiration date" : "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
+    "Warning" : "අවවාදය",
+    "Delete" : "මකා දමන්න",
+    "Add" : "එකතු කරන්න",
+    "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
+    "Username" : "පරිශීලක නම",
+    "New password" : "නව මුරපදය",
+    "Personal" : "පෞද්ගලික",
+    "Users" : "පරිශීලකයන්",
+    "Apps" : "යෙදුම්",
+    "Admin" : "පරිපාලක",
+    "Help" : "උදව්",
+    "Access forbidden" : "ඇතුල් වීම තහනම්",
+    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Password" : "මුර පදය",
+    "Data folder" : "දත්ත ෆෝල්ඩරය",
+    "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
+    "Database user" : "දත්තගබඩා භාවිතාකරු",
+    "Database password" : "දත්තගබඩාවේ මුරපදය",
+    "Database name" : "දත්තගබඩාවේ නම",
+    "Database host" : "දත්තගබඩා සේවාදායකයා",
+    "Finish setup" : "ස්ථාපනය කිරීම අවසන් කරන්න",
+    "Log out" : "නික්මීම",
+    "remember" : "මතක තබාගන්න",
+    "Log in" : "ප්‍රවේශවන්න"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
deleted file mode 100644
index 57de60748e9..00000000000
--- a/core/l10n/si_LK.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "ඉරිදා",
-"Monday" => "සඳුදා",
-"Tuesday" => "අඟහරුවාදා",
-"Wednesday" => "බදාදා",
-"Thursday" => "බ්‍රහස්පතින්දා",
-"Friday" => "සිකුරාදා",
-"Saturday" => "සෙනසුරාදා",
-"January" => "ජනවාරි",
-"February" => "පෙබරවාරි",
-"March" => "මාර්තු",
-"April" => "අප්‍රේල්",
-"May" => "මැයි",
-"June" => "ජූනි",
-"July" => "ජූලි",
-"August" => "අගෝස්තු",
-"September" => "සැප්තැම්බර්",
-"October" => "ඔක්තෝබර",
-"November" => "නොවැම්බර්",
-"December" => "දෙසැම්බර්",
-"Settings" => "සිටුවම්",
-"Folder" => "ෆෝල්ඩරය",
-"Image" => "පින්තූරය",
-"Saving..." => "සුරැකෙමින් පවතී...",
-"Reset password" => "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
-"No" => "එපා",
-"Yes" => "ඔව්",
-"Choose" => "තෝරන්න",
-"Ok" => "හරි",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "එපා",
-"Share" => "බෙදා හදා ගන්න",
-"Error" => "දෝෂයක්",
-"Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
-"Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
-"Expiration date" => "කල් ඉකුත් විමේ දිනය",
-"group" => "කණ්ඩායම",
-"Unshare" => "නොබෙදු",
-"can edit" => "සංස්කරණය කළ හැක",
-"access control" => "ප්‍රවේශ පාලනය",
-"create" => "සදන්න",
-"update" => "යාවත්කාලීන කරන්න",
-"delete" => "මකන්න",
-"Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත",
-"Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
-"Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
-"Warning" => "අවවාදය",
-"Delete" => "මකා දමන්න",
-"Add" => "එකතු කරන්න",
-"You will receive a link to reset your password via Email." => "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
-"Username" => "පරිශීලක නම",
-"New password" => "නව මුරපදය",
-"Personal" => "පෞද්ගලික",
-"Users" => "පරිශීලකයන්",
-"Apps" => "යෙදුම්",
-"Admin" => "පරිපාලක",
-"Help" => "උදව්",
-"Access forbidden" => "ඇතුල් වීම තහනම්",
-"Security Warning" => "ආරක්ෂක නිවේදනයක්",
-"Password" => "මුර පදය",
-"Data folder" => "දත්ත ෆෝල්ඩරය",
-"Configure the database" => "දත්ත සමුදාය හැඩගැසීම",
-"Database user" => "දත්තගබඩා භාවිතාකරු",
-"Database password" => "දත්තගබඩාවේ මුරපදය",
-"Database name" => "දත්තගබඩාවේ නම",
-"Database host" => "දත්තගබඩා සේවාදායකයා",
-"Finish setup" => "ස්ථාපනය කිරීම අවසන් කරන්න",
-"Log out" => "නික්මීම",
-"remember" => "මතක තබාගන්න",
-"Log in" => "ප්‍රවේශවන්න"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
new file mode 100644
index 00000000000..10da03f7667
--- /dev/null
+++ b/core/l10n/sk_SK.js
@@ -0,0 +1,190 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Nebolo možné odoslať email týmto používateľom: %s ",
+    "Turned on maintenance mode" : "Mód údržby je zapnutý",
+    "Turned off maintenance mode" : "Mód údržby e vypnutý",
+    "Updated database" : "Databáza je aktualizovaná",
+    "Checked database schema update" : "Skontrolovať aktualizáciu schémy databázy",
+    "Checked database schema update for apps" : "Aktualizácia schémy databázy aplikácií bola overená",
+    "Updated \"%s\" to %s" : "Aktualizované \"%s\" na %s",
+    "Disabled incompatible apps: %s" : "Zakázané nekompatibilné aplikácie: %s",
+    "No image or file provided" : "Obrázok alebo súbor nebol zadaný",
+    "Unknown filetype" : "Neznámy typ súboru",
+    "Invalid image" : "Chybný obrázok",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
+    "No crop data provided" : "Dáta pre orezanie neboli zadané",
+    "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",
+    "File" : "Súbor",
+    "Folder" : "Priečinok",
+    "Image" : "Obrázok",
+    "Audio" : "Zvuk",
+    "Saving..." : "Ukladám...",
+    "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
+    "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ť?",
+    "I know what I'm doing" : "Viem, čo robím",
+    "Reset password" : "Obnovenie hesla",
+    "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
+    "No" : "Nie",
+    "Yes" : "Áno",
+    "Choose" : "Vybrať",
+    "Error loading file picker template: {error}" : "Chyba pri nahrávaní šablóny výberu súborov: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba pri nahrávaní šablóny správy: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"],
+    "One file conflict" : "Jeden konflikt súboru",
+    "New Files" : "Nové súbory",
+    "Already existing files" : "Už existujúce súbory",
+    "Which files do you want to keep?" : "Ktoré súbory chcete ponechať?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
+    "Cancel" : "Zrušiť",
+    "Continue" : "Pokračovať",
+    "(all selected)" : "(všetko vybrané)",
+    "({count} selected)" : "({count} vybraných)",
+    "Error loading file exists template" : "Chyba pri nahrávaní šablóny existencie súboru",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
+    "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." : "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru.",
+    "Shared" : "Zdieľané",
+    "Shared with {recipients}" : "Zdieľa s {recipients}",
+    "Share" : "Zdieľať",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba počas zdieľania",
+    "Error while unsharing" : "Chyba počas ukončenia zdieľania",
+    "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 user or group …" : "Zdieľať s používateľom alebo skupinou ...",
+    "Share link" : "Zdieľať linku",
+    "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
+    "Password protect" : "Chrániť heslom",
+    "Choose a password for the public link" : "Zadajte heslo pre tento verejný odkaz",
+    "Allow Public Upload" : "Povoliť verejné nahrávanie",
+    "Email link to person" : "Odoslať odkaz emailom",
+    "Send" : "Odoslať",
+    "Set expiration date" : "Nastaviť dátum expirácie",
+    "Expiration date" : "Dátum expirácie",
+    "group" : "skupina",
+    "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",
+    "can share" : "môže zdieľať",
+    "can edit" : "môže upraviť",
+    "access control" : "prístupové práva",
+    "create" : "vytvoriť",
+    "update" : "aktualizovať",
+    "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ý",
+    "Warning" : "Varovanie",
+    "The object type is not specified." : "Nešpecifikovaný typ objektu.",
+    "Enter new" : "Zadať nový",
+    "Delete" : "Zmazať",
+    "Add" : "Pridať",
+    "Edit tags" : "Upraviť štítky",
+    "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
+    "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
+    "Please reload the page." : "Obnovte prosím stránku.",
+    "The update was unsuccessful." : "Aktualizácia zlyhala.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
+    "Couldn't reset password because the token is invalid" : "Nemožno zmeniť heslo pre neplatnosť tokenu.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
+    "You will receive a link to reset your password via Email." : "Odkaz pre obnovenie hesla obdržíte emailom.",
+    "Username" : "Meno používateľa",
+    "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?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
+    "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo",
+    "Reset" : "Resetovať",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
+    "Personal" : "Osobné",
+    "Users" : "Používatelia",
+    "Apps" : "Aplikácie",
+    "Admin" : "Administrácia",
+    "Help" : "Pomoc",
+    "Error loading tags" : "Chyba pri načítaní štítkov",
+    "Tag already exists" : "Štítok už existuje",
+    "Error deleting tag(s)" : "Chyba pri mazaní štítka(ov)",
+    "Error tagging" : "Chyba pri pridaní štítka",
+    "Error untagging" : "Chyba pri odobratí štítka",
+    "Error favoriting" : "Chyba pri pridaní do obľúbených",
+    "Error unfavoriting" : "Chyba pri odobratí z obľúbených",
+    "Access forbidden" : "Prístup odmietnutý",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
+    "The share will expire on %s." : "Zdieľanie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
+    "Security Warning" : "Bezpečnostné varovanie",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
+    "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Password" : "Heslo",
+    "Storage & database" : "Úložislo & databáza",
+    "Data folder" : "Priečinok dát",
+    "Configure the database" : "Nastaviť databázu",
+    "Only %s is available." : "Len %s je dostupný.",
+    "Database user" : "Používateľ databázy",
+    "Database password" : "Heslo databázy",
+    "Database name" : "Meno databázy",
+    "Database tablespace" : "Tabuľkový priestor databázy",
+    "Database host" : "Server databázy",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
+    "Finish setup" : "Dokončiť inštaláciu",
+    "Finishing …" : "Dokončujem...",
+    "%s is available. Get more information on how to update." : "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
+    "Log out" : "Odhlásiť",
+    "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
+    "Forgot your password? Reset it!" : "Zabudli ste heslo? Obnovte si ho!",
+    "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.",
+    "This means only administrators can use the instance." : "Len správca systému môže používať túto inštanciu.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
+    "Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.",
+    "You are accessing the server from an untrusted domain." : "Pristupujete na server v nedôveryhodnej doméne.",
+    "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 administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
+    "Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
+    "%s will be updated to version %s." : "%s bude zaktualizovaný na verziu %s.",
+    "The following apps will be disabled:" : "Tieto aplikácie budú zakázané:",
+    "The theme %s has been disabled." : "Téma %s bola zakázaná.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
+    "Start update" : "Spustiť aktualizáciu"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
new file mode 100644
index 00000000000..0a964f375e4
--- /dev/null
+++ b/core/l10n/sk_SK.json
@@ -0,0 +1,188 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Nebolo možné odoslať email týmto používateľom: %s ",
+    "Turned on maintenance mode" : "Mód údržby je zapnutý",
+    "Turned off maintenance mode" : "Mód údržby e vypnutý",
+    "Updated database" : "Databáza je aktualizovaná",
+    "Checked database schema update" : "Skontrolovať aktualizáciu schémy databázy",
+    "Checked database schema update for apps" : "Aktualizácia schémy databázy aplikácií bola overená",
+    "Updated \"%s\" to %s" : "Aktualizované \"%s\" na %s",
+    "Disabled incompatible apps: %s" : "Zakázané nekompatibilné aplikácie: %s",
+    "No image or file provided" : "Obrázok alebo súbor nebol zadaný",
+    "Unknown filetype" : "Neznámy typ súboru",
+    "Invalid image" : "Chybný obrázok",
+    "No temporary profile picture available, try again" : "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
+    "No crop data provided" : "Dáta pre orezanie neboli zadané",
+    "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",
+    "File" : "Súbor",
+    "Folder" : "Priečinok",
+    "Image" : "Obrázok",
+    "Audio" : "Zvuk",
+    "Saving..." : "Ukladám...",
+    "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
+    "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ť?",
+    "I know what I'm doing" : "Viem, čo robím",
+    "Reset password" : "Obnovenie hesla",
+    "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
+    "No" : "Nie",
+    "Yes" : "Áno",
+    "Choose" : "Vybrať",
+    "Error loading file picker template: {error}" : "Chyba pri nahrávaní šablóny výberu súborov: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Chyba pri nahrávaní šablóny správy: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"],
+    "One file conflict" : "Jeden konflikt súboru",
+    "New Files" : "Nové súbory",
+    "Already existing files" : "Už existujúce súbory",
+    "Which files do you want to keep?" : "Ktoré súbory chcete ponechať?",
+    "If you select both versions, the copied file will have a number added to its name." : "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
+    "Cancel" : "Zrušiť",
+    "Continue" : "Pokračovať",
+    "(all selected)" : "(všetko vybrané)",
+    "({count} selected)" : "({count} vybraných)",
+    "Error loading file exists template" : "Chyba pri nahrávaní šablóny existencie súboru",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
+    "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." : "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru.",
+    "Shared" : "Zdieľané",
+    "Shared with {recipients}" : "Zdieľa s {recipients}",
+    "Share" : "Zdieľať",
+    "Error" : "Chyba",
+    "Error while sharing" : "Chyba počas zdieľania",
+    "Error while unsharing" : "Chyba počas ukončenia zdieľania",
+    "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 user or group …" : "Zdieľať s používateľom alebo skupinou ...",
+    "Share link" : "Zdieľať linku",
+    "The public link will expire no later than {days} days after it is created" : "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
+    "Password protect" : "Chrániť heslom",
+    "Choose a password for the public link" : "Zadajte heslo pre tento verejný odkaz",
+    "Allow Public Upload" : "Povoliť verejné nahrávanie",
+    "Email link to person" : "Odoslať odkaz emailom",
+    "Send" : "Odoslať",
+    "Set expiration date" : "Nastaviť dátum expirácie",
+    "Expiration date" : "Dátum expirácie",
+    "group" : "skupina",
+    "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",
+    "can share" : "môže zdieľať",
+    "can edit" : "môže upraviť",
+    "access control" : "prístupové práva",
+    "create" : "vytvoriť",
+    "update" : "aktualizovať",
+    "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ý",
+    "Warning" : "Varovanie",
+    "The object type is not specified." : "Nešpecifikovaný typ objektu.",
+    "Enter new" : "Zadať nový",
+    "Delete" : "Zmazať",
+    "Add" : "Pridať",
+    "Edit tags" : "Upraviť štítky",
+    "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
+    "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
+    "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
+    "Please reload the page." : "Obnovte prosím stránku.",
+    "The update was unsuccessful." : "Aktualizácia zlyhala.",
+    "The update was successful. Redirecting you to ownCloud now." : "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
+    "Couldn't reset password because the token is invalid" : "Nemožno zmeniť heslo pre neplatnosť tokenu.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
+    "%s password reset" : "reset hesla %s",
+    "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
+    "You will receive a link to reset your password via Email." : "Odkaz pre obnovenie hesla obdržíte emailom.",
+    "Username" : "Meno používateľa",
+    "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?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
+    "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo",
+    "Reset" : "Resetovať",
+    "New password" : "Nové heslo",
+    "New Password" : "Nové heslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
+    "Personal" : "Osobné",
+    "Users" : "Používatelia",
+    "Apps" : "Aplikácie",
+    "Admin" : "Administrácia",
+    "Help" : "Pomoc",
+    "Error loading tags" : "Chyba pri načítaní štítkov",
+    "Tag already exists" : "Štítok už existuje",
+    "Error deleting tag(s)" : "Chyba pri mazaní štítka(ov)",
+    "Error tagging" : "Chyba pri pridaní štítka",
+    "Error untagging" : "Chyba pri odobratí štítka",
+    "Error favoriting" : "Chyba pri pridaní do obľúbených",
+    "Error unfavoriting" : "Chyba pri odobratí z obľúbených",
+    "Access forbidden" : "Prístup odmietnutý",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
+    "The share will expire on %s." : "Zdieľanie vyprší %s.",
+    "Cheers!" : "Pekný deň!",
+    "Security Warning" : "Bezpečnostné varovanie",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
+    "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Password" : "Heslo",
+    "Storage & database" : "Úložislo & databáza",
+    "Data folder" : "Priečinok dát",
+    "Configure the database" : "Nastaviť databázu",
+    "Only %s is available." : "Len %s je dostupný.",
+    "Database user" : "Používateľ databázy",
+    "Database password" : "Heslo databázy",
+    "Database name" : "Meno databázy",
+    "Database tablespace" : "Tabuľkový priestor databázy",
+    "Database host" : "Server databázy",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
+    "Finish setup" : "Dokončiť inštaláciu",
+    "Finishing …" : "Dokončujem...",
+    "%s is available. Get more information on how to update." : "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
+    "Log out" : "Odhlásiť",
+    "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!",
+    "Please contact your administrator." : "Kontaktujte prosím vášho administrátora.",
+    "Forgot your password? Reset it!" : "Zabudli ste heslo? Obnovte si ho!",
+    "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.",
+    "This means only administrators can use the instance." : "Len správca systému môže používať túto inštanciu.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
+    "Thank you for your patience." : "Ďakujeme za Vašu trpezlivosť.",
+    "You are accessing the server from an untrusted domain." : "Pristupujete na server v nedôveryhodnej doméne.",
+    "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 administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
+    "Add \"%s\" as trusted domain" : "Pridať \"%s\" ako dôveryhodnú doménu",
+    "%s will be updated to version %s." : "%s bude zaktualizovaný na verziu %s.",
+    "The following apps will be disabled:" : "Tieto aplikácie budú zakázané:",
+    "The theme %s has been disabled." : "Téma %s bola zakázaná.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
+    "Start update" : "Spustiť aktualizáciu"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
deleted file mode 100644
index cae7bfd3a5a..00000000000
--- a/core/l10n/sk_SK.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Nebolo možné odoslať email týmto používateľom: %s ",
-"Turned on maintenance mode" => "Mód údržby je zapnutý",
-"Turned off maintenance mode" => "Mód údržby e vypnutý",
-"Updated database" => "Databáza je aktualizovaná",
-"Checked database schema update" => "Skontrolovať aktualizáciu schémy databázy",
-"Checked database schema update for apps" => "Aktualizácia schémy databázy aplikácií bola overená",
-"Updated \"%s\" to %s" => "Aktualizované \"%s\" na %s",
-"Disabled incompatible apps: %s" => "Zakázané nekompatibilné aplikácie: %s",
-"No image or file provided" => "Obrázok alebo súbor nebol zadaný",
-"Unknown filetype" => "Neznámy typ súboru",
-"Invalid image" => "Chybný obrázok",
-"No temporary profile picture available, try again" => "Dočasný profilový obrázok nie je k dispozícii, skúste to znovu",
-"No crop data provided" => "Dáta pre orezanie neboli zadané",
-"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",
-"File" => "Súbor",
-"Folder" => "Priečinok",
-"Image" => "Obrázok",
-"Audio" => "Zvuk",
-"Saving..." => "Ukladám...",
-"Couldn't send reset email. Please contact your administrator." => "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
-"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ť?",
-"I know what I'm doing" => "Viem, čo robím",
-"Reset password" => "Obnovenie hesla",
-"Password can not be changed. Please contact your administrator." => "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
-"No" => "Nie",
-"Yes" => "Áno",
-"Choose" => "Vybrať",
-"Error loading file picker template: {error}" => "Chyba pri nahrávaní šablóny výberu súborov: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Chyba pri nahrávaní šablóny správy: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} konflikt súboru","{count} konflikty súboru","{count} konfliktov súboru"),
-"One file conflict" => "Jeden konflikt súboru",
-"New Files" => "Nové súbory",
-"Already existing files" => "Už existujúce súbory",
-"Which files do you want to keep?" => "Ktoré súbory chcete ponechať?",
-"If you select both versions, the copied file will have a number added to its name." => "Ak zvolíte obe verzie, názov nakopírovaného súboru bude doplnený o číslo.",
-"Cancel" => "Zrušiť",
-"Continue" => "Pokračovať",
-"(all selected)" => "(všetko vybrané)",
-"({count} selected)" => "({count} vybraných)",
-"Error loading file exists template" => "Chyba pri nahrávaní šablóny existencie súboru",
-"Very weak password" => "Veľmi slabé heslo",
-"Weak password" => "Slabé heslo",
-"So-so password" => "Priemerné heslo",
-"Good password" => "Dobré heslo",
-"Strong password" => "Silné heslo",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Váš webový server nie je správne nastavený na synchronizáciu, pretože rozhranie WebDAV je poškodené.",
-"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." => "Server nemá funkčné pripojenie k internetu. Niektoré moduly ako napr. externé úložisko, oznámenie o dostupných aktualizáciách alebo inštalácia aplikácií tretích strán nebudú fungovať. Prístup k súborom z iných miest a odosielanie oznamovacích emailov tiež nemusí fungovať. Ak chcete využívať všetky vlastnosti ownCloudu, odporúčame povoliť pripojenie k internetu tomuto serveru.",
-"Shared" => "Zdieľané",
-"Shared with {recipients}" => "Zdieľa s {recipients}",
-"Share" => "Zdieľať",
-"Error" => "Chyba",
-"Error while sharing" => "Chyba počas zdieľania",
-"Error while unsharing" => "Chyba počas ukončenia zdieľania",
-"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 user or group …" => "Zdieľať s používateľom alebo skupinou ...",
-"Share link" => "Zdieľať linku",
-"The public link will expire no later than {days} days after it is created" => "Verejný odkaz nevyprší skôr než za {days} dní po vytvorení",
-"Password protect" => "Chrániť heslom",
-"Choose a password for the public link" => "Zadajte heslo pre tento verejný odkaz",
-"Allow Public Upload" => "Povoliť verejné nahrávanie",
-"Email link to person" => "Odoslať odkaz emailom",
-"Send" => "Odoslať",
-"Set expiration date" => "Nastaviť dátum expirácie",
-"Expiration date" => "Dátum expirácie",
-"group" => "skupina",
-"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",
-"can share" => "môže zdieľať",
-"can edit" => "môže upraviť",
-"access control" => "prístupové práva",
-"create" => "vytvoriť",
-"update" => "aktualizovať",
-"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ý",
-"Warning" => "Varovanie",
-"The object type is not specified." => "Nešpecifikovaný typ objektu.",
-"Enter new" => "Zadať nový",
-"Delete" => "Zmazať",
-"Add" => "Pridať",
-"Edit tags" => "Upraviť štítky",
-"Error loading dialog template: {error}" => "Chyba pri načítaní šablóny dialógu: {error}",
-"No tags selected for deletion." => "Nie sú vybraté štítky na zmazanie.",
-"Updating {productName} to version {version}, this may take a while." => "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
-"Please reload the page." => "Obnovte prosím stránku.",
-"The update was unsuccessful." => "Aktualizácia zlyhala.",
-"The update was successful. Redirecting you to ownCloud now." => "Aktualizácia bola úspešná. Presmerovávam vás na prihlasovaciu stránku.",
-"Couldn't reset password because the token is invalid" => "Nemožno zmeniť heslo pre neplatnosť tokenu.",
-"Couldn't send reset email. Please make sure your username is correct." => "Nemožno poslať email pre obnovu. Uistite sa, či vkladáte správne používateľské meno.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
-"%s password reset" => "reset hesla %s",
-"Use the following link to reset your password: {link}" => "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
-"You will receive a link to reset your password via Email." => "Odkaz pre obnovenie hesla obdržíte emailom.",
-"Username" => "Meno používateľa",
-"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?" => "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
-"Yes, I really want to reset my password now" => "Áno, želám si teraz obnoviť svoje heslo",
-"Reset" => "Resetovať",
-"New password" => "Nové heslo",
-"New Password" => "Nové heslo",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
-"For the best results, please consider using a GNU/Linux server instead." => "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
-"Personal" => "Osobné",
-"Users" => "Používatelia",
-"Apps" => "Aplikácie",
-"Admin" => "Administrácia",
-"Help" => "Pomoc",
-"Error loading tags" => "Chyba pri načítaní štítkov",
-"Tag already exists" => "Štítok už existuje",
-"Error deleting tag(s)" => "Chyba pri mazaní štítka(ov)",
-"Error tagging" => "Chyba pri pridaní štítka",
-"Error untagging" => "Chyba pri odobratí štítka",
-"Error favoriting" => "Chyba pri pridaní do obľúbených",
-"Error unfavoriting" => "Chyba pri odobratí z obľúbených",
-"Access forbidden" => "Prístup odmietnutý",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
-"The share will expire on %s." => "Zdieľanie vyprší %s.",
-"Cheers!" => "Pekný deň!",
-"Security Warning" => "Bezpečnostné varovanie",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
-"Create an <strong>admin account</strong>" => "Vytvoriť <strong>administrátorský účet</strong>",
-"Password" => "Heslo",
-"Storage & database" => "Úložislo & databáza",
-"Data folder" => "Priečinok dát",
-"Configure the database" => "Nastaviť databázu",
-"Only %s is available." => "Len %s je dostupný.",
-"Database user" => "Používateľ databázy",
-"Database password" => "Heslo databázy",
-"Database name" => "Meno databázy",
-"Database tablespace" => "Tabuľkový priestor databázy",
-"Database host" => "Server databázy",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
-"Finish setup" => "Dokončiť inštaláciu",
-"Finishing …" => "Dokončujem...",
-"%s is available. Get more information on how to update." => "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
-"Log out" => "Odhlásiť",
-"Server side authentication failed!" => "Autentifikácia na serveri zlyhala!",
-"Please contact your administrator." => "Kontaktujte prosím vášho administrátora.",
-"Forgot your password? Reset it!" => "Zabudli ste heslo? Obnovte si ho!",
-"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.",
-"This means only administrators can use the instance." => "Len správca systému môže používať túto inštanciu.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Kontaktujte prosím správcu systému, ak sa táto správa objavuje opakovane alebo neočakávane.",
-"Thank you for your patience." => "Ďakujeme za Vašu trpezlivosť.",
-"You are accessing the server from an untrusted domain." => "Pristupujete na server v nedôveryhodnej doméne.",
-"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 administrátora. Ak ste administrátorom tejto inštancie, nakonfigurujte správne nastavenie \"trusted_domain\" v config/config.php. Vzorová konfigurácia je uvedená v config/config.sample.php.",
-"Add \"%s\" as trusted domain" => "Pridať \"%s\" ako dôveryhodnú doménu",
-"%s will be updated to version %s." => "%s bude zaktualizovaný na verziu %s.",
-"The following apps will be disabled:" => "Tieto aplikácie budú zakázané:",
-"The theme %s has been disabled." => "Téma %s bola zakázaná.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pred vykonaním ďalšieho kroku sa presvedčte, že databáza, konfiguračný a dátový priečinok sú zazálohované.",
-"Start update" => "Spustiť aktualizáciu"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
new file mode 100644
index 00000000000..d790db499fb
--- /dev/null
+++ b/core/l10n/sl.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Ni mogoče poslati sporočila za: %s",
+    "Turned on maintenance mode" : "Vzdrževalni način je omogočen",
+    "Turned off maintenance mode" : "Vzdrževalni način je onemogočen",
+    "Updated database" : "Posodobljena podatkovna zbirka",
+    "Checked database schema update" : "Izbrana posodobitev sheme podatkovne zbirke",
+    "Checked database schema update for apps" : "Izbrana posodobitev sheme podatkovne zbirke za programe",
+    "Updated \"%s\" to %s" : "Datoteka \"%s\" je posodobljena na %s",
+    "Disabled incompatible apps: %s" : "Onemogočeni neskladni programi: %s",
+    "No image or file provided" : "Ni podane datoteke ali slike",
+    "Unknown filetype" : "Neznana vrsta datoteke",
+    "Invalid image" : "Neveljavna slika",
+    "No temporary profile picture available, try again" : "Na voljo ni nobene začasne slike za profil. Poskusite znova.",
+    "No crop data provided" : "Ni podanih podatkov obreza",
+    "Sunday" : "nedelja",
+    "Monday" : "ponedeljek",
+    "Tuesday" : "torek",
+    "Wednesday" : "sreda",
+    "Thursday" : "četrtek",
+    "Friday" : "petek",
+    "Saturday" : "sobota",
+    "January" : "januar",
+    "February" : "februar",
+    "March" : "marec",
+    "April" : "april",
+    "May" : "maj",
+    "June" : "junij",
+    "July" : "julij",
+    "August" : "avgust",
+    "September" : "september",
+    "October" : "oktober",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Nastavitve",
+    "File" : "Datoteka",
+    "Folder" : "Mapa",
+    "Image" : "Slika",
+    "Audio" : "Zvok",
+    "Saving..." : "Poteka shranjevanje ...",
+    "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
+    "I know what I'm doing" : "Vem, kaj delam!",
+    "Reset password" : "Ponastavi geslo",
+    "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izbor",
+    "Error loading file picker template: {error}" : "Napaka nalaganja predloge izbirnika datotek: {error}",
+    "Ok" : "V redu",
+    "Error loading message template: {error}" : "Napaka nalaganja predloge sporočil: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"],
+    "One file conflict" : "En spor datotek",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Obstoječe datoteke",
+    "Which files do you want to keep?" : "Katare datoteke želite ohraniti?",
+    "If you select both versions, the copied file will have a number added to its name." : "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
+    "Cancel" : "Prekliči",
+    "Continue" : "Nadaljuj",
+    "(all selected)" : "(vse izbrano)",
+    "({count} selected)" : "({count} izbranih)",
+    "Error loading file exists template" : "Napaka nalaganja predloge obstoječih datotek",
+    "Very weak password" : "Zelo šibko geslo",
+    "Weak password" : "Šibko geslo",
+    "So-so password" : "Slabo geslo",
+    "Good password" : "Dobro geslo",
+    "Strong password" : "Odlično geslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev vmesnika WebDAV okvarjena.",
+    "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." : "Na voljo ni delujoče internetne povezave. To pomeni, da nekaterih možnosti, kot so priklapljanje zunanje shrambe, obveščanja o posodobitvah in nameščanje programov tretje roke ni podprto. Dostop do datotek z oddaljenih mest in pošiljanje obvestil preko elektronske pošte prav tako verjetno ne deluje. Za omogočanje vseh zmožnosti mora biti vzpostavljena tudi ustrezna internetna povezava.",
+    "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika",
+    "Shared" : "V souporabi",
+    "Shared with {recipients}" : "V souporabi z {recipients}",
+    "Share" : "Souporaba",
+    "Error" : "Napaka",
+    "Error while sharing" : "Napaka med souporabo",
+    "Error while unsharing" : "Napaka med odstranjevanjem souporabe",
+    "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
+    "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
+    "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
+    "Share with user or group …" : "Souporaba z uporabnikom ali skupino ...",
+    "Share link" : "Povezava za prejem",
+    "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
+    "Password protect" : "Zaščiti z geslom",
+    "Choose a password for the public link" : "Izberite geslo za javno povezavo",
+    "Allow Public Upload" : "Dovoli javno pošiljanje na strežnik",
+    "Email link to person" : "Posreduj povezavo po elektronski pošti",
+    "Send" : "Pošlji",
+    "Set expiration date" : "Nastavi datum preteka",
+    "Expiration date" : "Datum preteka",
+    "Adding user..." : "Dodajanje uporabnika ...",
+    "group" : "skupina",
+    "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",
+    "can share" : "lahko omogoči souporabo",
+    "can edit" : "lahko ureja",
+    "access control" : "nadzor dostopa",
+    "create" : "ustvari",
+    "update" : "posodobi",
+    "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",
+    "Warning" : "Opozorilo",
+    "The object type is not specified." : "Vrsta predmeta ni podana.",
+    "Enter new" : "Vnesite novo",
+    "Delete" : "Izbriši",
+    "Add" : "Dodaj",
+    "Edit tags" : "Uredi oznake",
+    "Error loading dialog template: {error}" : "Napaka nalaganja predloge pogovornega okna: {error}",
+    "No tags selected for deletion." : "Ni izbranih oznak za izbris.",
+    "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
+    "Please reload the page." : "Stran je treba ponovno naložiti",
+    "The update was unsuccessful." : "Posodobitev je spodletela",
+    "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
+    "%s password reset" : "Ponastavitev gesla %s",
+    "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}",
+    "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
+    "Username" : "Uporabniško ime",
+    "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?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
+    "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla",
+    "Reset" : "Ponastavi",
+    "New password" : "Novo geslo",
+    "New Password" : "Novo geslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
+    "Personal" : "Osebno",
+    "Users" : "Uporabniki",
+    "Apps" : "Programi",
+    "Admin" : "Skrbništvo",
+    "Help" : "Pomoč",
+    "Error loading tags" : "Napaka nalaganja oznak",
+    "Tag already exists" : "Oznaka že obstaja",
+    "Error deleting tag(s)" : "Napaka brisanja oznak",
+    "Error tagging" : "Napaka označevanja",
+    "Error untagging" : "Napaka odstranjevanja oznak",
+    "Error favoriting" : "Napaka označevanja priljubljenosti",
+    "Error unfavoriting" : "Napaka odstranjevanja oznake priljubljenosti",
+    "Access forbidden" : "Dostop je prepovedan",
+    "File not found" : "Datoteke ni mogoče najti",
+    "The specified document has not been found on the server." : "Določenega dokumenta na strežniku ni mogoče najti.",
+    "You can click here to return to %s." : "S klikom na povezavo boste vrnjeni na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n",
+    "The share will expire on %s." : "Povezava souporabe bo potekla %s.",
+    "Cheers!" : "Na zdravje!",
+    "Internal Server Error" : "Notranja  napaka strežnika",
+    "The server encountered an internal error and was unable to complete your request." : "Prišlo je do notranje napake, zato ni mogoče končati zahteve.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.",
+    "More details can be found in the server log." : "Več podrobnosti je zabeleženih v dnevniku strežnika.",
+    "Technical details" : "Tehnične podrobnosti",
+    "Remote Address: %s" : "Oddaljen naslov: %s",
+    "Request ID: %s" : "ID zahteve: %s",
+    "Code: %s" : "Koda: %s",
+    "Message: %s" : "Sporočilo: %s",
+    "File: %s" : "Datoteka: %s",
+    "Line: %s" : "Vrstica: %s",
+    "Trace" : "Sledenje povezav",
+    "Security Warning" : "Varnostno opozorilo",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
+    "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
+    "Password" : "Geslo",
+    "Storage & database" : "Shramba in podatkovna zbirka",
+    "Data folder" : "Podatkovna mapa",
+    "Configure the database" : "Nastavi podatkovno zbirko",
+    "Only %s is available." : "Le %s je na voljo.",
+    "Database user" : "Uporabnik podatkovne zbirke",
+    "Database password" : "Geslo podatkovne zbirke",
+    "Database name" : "Ime podatkovne zbirke",
+    "Database tablespace" : "Razpredelnica podatkovne zbirke",
+    "Database host" : "Gostitelj podatkovne zbirke",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.",
+    "Finish setup" : "Končaj nastavitev",
+    "Finishing …" : "Poteka zaključevanje opravila ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Omogočite <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in ponovno osvežite stran.",
+    "%s is available. Get more information on how to update." : "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
+    "Log out" : "Odjava",
+    "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
+    "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
+    "Forgot your password? Reset it!" : "Ali ste pozabili geslo? Ponastavite ga!",
+    "remember" : "zapomni si",
+    "Log in" : "Prijava",
+    "Alternative Logins" : "Druge prijavne možnosti",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
+    "This means only administrators can use the instance." : "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
+    "Thank you for your patience." : "Hvala za potrpežljivost!",
+    "You are accessing the server from an untrusted domain." : "Trenutno je vzpostavljena povezava s strežnikom preko ne-varne domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Stopite v stik s skrbnikom ali pa nastavite možnost \"varna_domena\" v datoteki config/config.php. Primer nastavitve je razložen v datoteki config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
+    "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kot varno domeno",
+    "%s will be updated to version %s." : "%s bo posodobljen na različico %s.",
+    "The following apps will be disabled:" : "Navedeni programi bodo onemogočeni:",
+    "The theme %s has been disabled." : "Tema %s je onemogočena za uporabo.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.",
+    "Start update" : "Začni posodobitev",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Za razreševanje časovnih zahtev večjih namestitev lahko uporabite ukaz iz namestitvene mape:",
+    "This %s instance is currently being updated, which may take a while." : "Povezava %s se posodablja. Opravilo je lahko dolgotrajno.",
+    "This page will refresh itself when the %s instance is available again." : "Stran bo osvežena ko bo %s spet na voljo."
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
new file mode 100644
index 00000000000..17f5216d872
--- /dev/null
+++ b/core/l10n/sl.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Ni mogoče poslati sporočila za: %s",
+    "Turned on maintenance mode" : "Vzdrževalni način je omogočen",
+    "Turned off maintenance mode" : "Vzdrževalni način je onemogočen",
+    "Updated database" : "Posodobljena podatkovna zbirka",
+    "Checked database schema update" : "Izbrana posodobitev sheme podatkovne zbirke",
+    "Checked database schema update for apps" : "Izbrana posodobitev sheme podatkovne zbirke za programe",
+    "Updated \"%s\" to %s" : "Datoteka \"%s\" je posodobljena na %s",
+    "Disabled incompatible apps: %s" : "Onemogočeni neskladni programi: %s",
+    "No image or file provided" : "Ni podane datoteke ali slike",
+    "Unknown filetype" : "Neznana vrsta datoteke",
+    "Invalid image" : "Neveljavna slika",
+    "No temporary profile picture available, try again" : "Na voljo ni nobene začasne slike za profil. Poskusite znova.",
+    "No crop data provided" : "Ni podanih podatkov obreza",
+    "Sunday" : "nedelja",
+    "Monday" : "ponedeljek",
+    "Tuesday" : "torek",
+    "Wednesday" : "sreda",
+    "Thursday" : "četrtek",
+    "Friday" : "petek",
+    "Saturday" : "sobota",
+    "January" : "januar",
+    "February" : "februar",
+    "March" : "marec",
+    "April" : "april",
+    "May" : "maj",
+    "June" : "junij",
+    "July" : "julij",
+    "August" : "avgust",
+    "September" : "september",
+    "October" : "oktober",
+    "November" : "november",
+    "December" : "december",
+    "Settings" : "Nastavitve",
+    "File" : "Datoteka",
+    "Folder" : "Mapa",
+    "Image" : "Slika",
+    "Audio" : "Zvok",
+    "Saving..." : "Poteka shranjevanje ...",
+    "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
+    "I know what I'm doing" : "Vem, kaj delam!",
+    "Reset password" : "Ponastavi geslo",
+    "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izbor",
+    "Error loading file picker template: {error}" : "Napaka nalaganja predloge izbirnika datotek: {error}",
+    "Ok" : "V redu",
+    "Error loading message template: {error}" : "Napaka nalaganja predloge sporočil: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"],
+    "One file conflict" : "En spor datotek",
+    "New Files" : "Nove datoteke",
+    "Already existing files" : "Obstoječe datoteke",
+    "Which files do you want to keep?" : "Katare datoteke želite ohraniti?",
+    "If you select both versions, the copied file will have a number added to its name." : "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
+    "Cancel" : "Prekliči",
+    "Continue" : "Nadaljuj",
+    "(all selected)" : "(vse izbrano)",
+    "({count} selected)" : "({count} izbranih)",
+    "Error loading file exists template" : "Napaka nalaganja predloge obstoječih datotek",
+    "Very weak password" : "Zelo šibko geslo",
+    "Weak password" : "Šibko geslo",
+    "So-so password" : "Slabo geslo",
+    "Good password" : "Dobro geslo",
+    "Strong password" : "Odlično geslo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev vmesnika WebDAV okvarjena.",
+    "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." : "Na voljo ni delujoče internetne povezave. To pomeni, da nekaterih možnosti, kot so priklapljanje zunanje shrambe, obveščanja o posodobitvah in nameščanje programov tretje roke ni podprto. Dostop do datotek z oddaljenih mest in pošiljanje obvestil preko elektronske pošte prav tako verjetno ne deluje. Za omogočanje vseh zmožnosti mora biti vzpostavljena tudi ustrezna internetna povezava.",
+    "Error occurred while checking server setup" : "Prišlo je do napake med preverjanjem nastavitev strežnika",
+    "Shared" : "V souporabi",
+    "Shared with {recipients}" : "V souporabi z {recipients}",
+    "Share" : "Souporaba",
+    "Error" : "Napaka",
+    "Error while sharing" : "Napaka med souporabo",
+    "Error while unsharing" : "Napaka med odstranjevanjem souporabe",
+    "Error while changing permissions" : "Napaka med spreminjanjem dovoljenj",
+    "Shared with you and the group {group} by {owner}" : "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
+    "Shared with you by {owner}" : "V souporabi z vami. Lastnik je {owner}.",
+    "Share with user or group …" : "Souporaba z uporabnikom ali skupino ...",
+    "Share link" : "Povezava za prejem",
+    "The public link will expire no later than {days} days after it is created" : "Javna povezava bo potekla {days} dni po ustvarjanju.",
+    "Password protect" : "Zaščiti z geslom",
+    "Choose a password for the public link" : "Izberite geslo za javno povezavo",
+    "Allow Public Upload" : "Dovoli javno pošiljanje na strežnik",
+    "Email link to person" : "Posreduj povezavo po elektronski pošti",
+    "Send" : "Pošlji",
+    "Set expiration date" : "Nastavi datum preteka",
+    "Expiration date" : "Datum preteka",
+    "Adding user..." : "Dodajanje uporabnika ...",
+    "group" : "skupina",
+    "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",
+    "can share" : "lahko omogoči souporabo",
+    "can edit" : "lahko ureja",
+    "access control" : "nadzor dostopa",
+    "create" : "ustvari",
+    "update" : "posodobi",
+    "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",
+    "Warning" : "Opozorilo",
+    "The object type is not specified." : "Vrsta predmeta ni podana.",
+    "Enter new" : "Vnesite novo",
+    "Delete" : "Izbriši",
+    "Add" : "Dodaj",
+    "Edit tags" : "Uredi oznake",
+    "Error loading dialog template: {error}" : "Napaka nalaganja predloge pogovornega okna: {error}",
+    "No tags selected for deletion." : "Ni izbranih oznak za izbris.",
+    "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
+    "Please reload the page." : "Stran je treba ponovno naložiti",
+    "The update was unsuccessful." : "Posodobitev je spodletela",
+    "The update was successful. Redirecting you to ownCloud now." : "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
+    "%s password reset" : "Ponastavitev gesla %s",
+    "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}",
+    "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
+    "Username" : "Uporabniško ime",
+    "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?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
+    "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla",
+    "Reset" : "Ponastavi",
+    "New password" : "Novo geslo",
+    "New Password" : "Novo geslo",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
+    "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
+    "Personal" : "Osebno",
+    "Users" : "Uporabniki",
+    "Apps" : "Programi",
+    "Admin" : "Skrbništvo",
+    "Help" : "Pomoč",
+    "Error loading tags" : "Napaka nalaganja oznak",
+    "Tag already exists" : "Oznaka že obstaja",
+    "Error deleting tag(s)" : "Napaka brisanja oznak",
+    "Error tagging" : "Napaka označevanja",
+    "Error untagging" : "Napaka odstranjevanja oznak",
+    "Error favoriting" : "Napaka označevanja priljubljenosti",
+    "Error unfavoriting" : "Napaka odstranjevanja oznake priljubljenosti",
+    "Access forbidden" : "Dostop je prepovedan",
+    "File not found" : "Datoteke ni mogoče najti",
+    "The specified document has not been found on the server." : "Določenega dokumenta na strežniku ni mogoče najti.",
+    "You can click here to return to %s." : "S klikom na povezavo boste vrnjeni na %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n",
+    "The share will expire on %s." : "Povezava souporabe bo potekla %s.",
+    "Cheers!" : "Na zdravje!",
+    "Internal Server Error" : "Notranja  napaka strežnika",
+    "The server encountered an internal error and was unable to complete your request." : "Prišlo je do notranje napake, zato ni mogoče končati zahteve.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.",
+    "More details can be found in the server log." : "Več podrobnosti je zabeleženih v dnevniku strežnika.",
+    "Technical details" : "Tehnične podrobnosti",
+    "Remote Address: %s" : "Oddaljen naslov: %s",
+    "Request ID: %s" : "ID zahteve: %s",
+    "Code: %s" : "Koda: %s",
+    "Message: %s" : "Sporočilo: %s",
+    "File: %s" : "Datoteka: %s",
+    "Line: %s" : "Vrstica: %s",
+    "Trace" : "Sledenje povezav",
+    "Security Warning" : "Varnostno opozorilo",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
+    "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
+    "Password" : "Geslo",
+    "Storage & database" : "Shramba in podatkovna zbirka",
+    "Data folder" : "Podatkovna mapa",
+    "Configure the database" : "Nastavi podatkovno zbirko",
+    "Only %s is available." : "Le %s je na voljo.",
+    "Database user" : "Uporabnik podatkovne zbirke",
+    "Database password" : "Geslo podatkovne zbirke",
+    "Database name" : "Ime podatkovne zbirke",
+    "Database tablespace" : "Razpredelnica podatkovne zbirke",
+    "Database host" : "Gostitelj podatkovne zbirke",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.",
+    "Finish setup" : "Končaj nastavitev",
+    "Finishing …" : "Poteka zaključevanje opravila ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Program zahteva podporo JavaScript za pravilno delovanje. Omogočite <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in ponovno osvežite stran.",
+    "%s is available. Get more information on how to update." : "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
+    "Log out" : "Odjava",
+    "Server side authentication failed!" : "Overitev s strežnika je spodletela!",
+    "Please contact your administrator." : "Stopite v stik s skrbnikom sistema.",
+    "Forgot your password? Reset it!" : "Ali ste pozabili geslo? Ponastavite ga!",
+    "remember" : "zapomni si",
+    "Log in" : "Prijava",
+    "Alternative Logins" : "Druge prijavne možnosti",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
+    "This means only administrators can use the instance." : "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
+    "Thank you for your patience." : "Hvala za potrpežljivost!",
+    "You are accessing the server from an untrusted domain." : "Trenutno je vzpostavljena povezava s strežnikom preko ne-varne domene.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Stopite v stik s skrbnikom ali pa nastavite možnost \"varna_domena\" v datoteki config/config.php. Primer nastavitve je razložen v datoteki config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
+    "Add \"%s\" as trusted domain" : "Dodaj \"%s\" kot varno domeno",
+    "%s will be updated to version %s." : "%s bo posodobljen na različico %s.",
+    "The following apps will be disabled:" : "Navedeni programi bodo onemogočeni:",
+    "The theme %s has been disabled." : "Tema %s je onemogočena za uporabo.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.",
+    "Start update" : "Začni posodobitev",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Za razreševanje časovnih zahtev večjih namestitev lahko uporabite ukaz iz namestitvene mape:",
+    "This %s instance is currently being updated, which may take a while." : "Povezava %s se posodablja. Opravilo je lahko dolgotrajno.",
+    "This page will refresh itself when the %s instance is available again." : "Stran bo osvežena ko bo %s spet na voljo."
+},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
deleted file mode 100644
index 20a8d9b8fc0..00000000000
--- a/core/l10n/sl.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Ni mogoče poslati sporočila za: %s",
-"Turned on maintenance mode" => "Vzdrževalni način je omogočen",
-"Turned off maintenance mode" => "Vzdrževalni način je onemogočen",
-"Updated database" => "Posodobljena podatkovna zbirka",
-"Checked database schema update" => "Izbrana posodobitev sheme podatkovne zbirke",
-"Checked database schema update for apps" => "Izbrana posodobitev sheme podatkovne zbirke za programe",
-"Updated \"%s\" to %s" => "Datoteka \"%s\" je posodobljena na %s",
-"Disabled incompatible apps: %s" => "Onemogočeni neskladni programi: %s",
-"No image or file provided" => "Ni podane datoteke ali slike",
-"Unknown filetype" => "Neznana vrsta datoteke",
-"Invalid image" => "Neveljavna slika",
-"No temporary profile picture available, try again" => "Na voljo ni nobene začasne slike za profil. Poskusite znova.",
-"No crop data provided" => "Ni podanih podatkov obreza",
-"Sunday" => "nedelja",
-"Monday" => "ponedeljek",
-"Tuesday" => "torek",
-"Wednesday" => "sreda",
-"Thursday" => "četrtek",
-"Friday" => "petek",
-"Saturday" => "sobota",
-"January" => "januar",
-"February" => "februar",
-"March" => "marec",
-"April" => "april",
-"May" => "maj",
-"June" => "junij",
-"July" => "julij",
-"August" => "avgust",
-"September" => "september",
-"October" => "oktober",
-"November" => "november",
-"December" => "december",
-"Settings" => "Nastavitve",
-"File" => "Datoteka",
-"Folder" => "Mapa",
-"Image" => "Slika",
-"Audio" => "Zvok",
-"Saving..." => "Poteka shranjevanje ...",
-"Couldn't send reset email. Please contact your administrator." => "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
-"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
-"I know what I'm doing" => "Vem, kaj delam!",
-"Reset password" => "Ponastavi geslo",
-"Password can not be changed. Please contact your administrator." => "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
-"No" => "Ne",
-"Yes" => "Da",
-"Choose" => "Izbor",
-"Error loading file picker template: {error}" => "Napaka nalaganja predloge izbirnika datotek: {error}",
-"Ok" => "V redu",
-"Error loading message template: {error}" => "Napaka nalaganja predloge sporočil: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} spor datotek","{count} spora datotek","{count} spori datotek","{count} sporov datotek"),
-"One file conflict" => "En spor datotek",
-"New Files" => "Nove datoteke",
-"Already existing files" => "Obstoječe datoteke",
-"Which files do you want to keep?" => "Katare datoteke želite ohraniti?",
-"If you select both versions, the copied file will have a number added to its name." => "Če izberete obe različici, bo kopirani datoteki k imenu dodana številka.",
-"Cancel" => "Prekliči",
-"Continue" => "Nadaljuj",
-"(all selected)" => "(vse izbrano)",
-"({count} selected)" => "({count} izbranih)",
-"Error loading file exists template" => "Napaka nalaganja predloge obstoječih datotek",
-"Very weak password" => "Zelo šibko geslo",
-"Weak password" => "Šibko geslo",
-"So-so password" => "Slabo geslo",
-"Good password" => "Dobro geslo",
-"Strong password" => "Odlično geslo",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Spletni stražnik še ni ustrezno nastavljen in ne omogoča usklajevanja, saj je nastavitev vmesnika WebDAV okvarjena.",
-"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." => "Na voljo ni delujoče internetne povezave. To pomeni, da nekaterih možnosti, kot so priklapljanje zunanje shrambe, obveščanja o posodobitvah in nameščanje programov tretje roke ni podprto. Dostop do datotek z oddaljenih mest in pošiljanje obvestil preko elektronske pošte prav tako verjetno ne deluje. Za omogočanje vseh zmožnosti mora biti vzpostavljena tudi ustrezna internetna povezava.",
-"Error occurred while checking server setup" => "Prišlo je do napake med preverjanjem nastavitev strežnika",
-"Shared" => "V souporabi",
-"Shared with {recipients}" => "V souporabi z {recipients}",
-"Share" => "Souporaba",
-"Error" => "Napaka",
-"Error while sharing" => "Napaka med souporabo",
-"Error while unsharing" => "Napaka med odstranjevanjem souporabe",
-"Error while changing permissions" => "Napaka med spreminjanjem dovoljenj",
-"Shared with you and the group {group} by {owner}" => "V souporabi z vami in skupino {group}. Lastnik je {owner}.",
-"Shared with you by {owner}" => "V souporabi z vami. Lastnik je {owner}.",
-"Share with user or group …" => "Souporaba z uporabnikom ali skupino ...",
-"Share link" => "Povezava za prejem",
-"The public link will expire no later than {days} days after it is created" => "Javna povezava bo potekla {days} dni po ustvarjanju.",
-"Password protect" => "Zaščiti z geslom",
-"Choose a password for the public link" => "Izberite geslo za javno povezavo",
-"Allow Public Upload" => "Dovoli javno pošiljanje na strežnik",
-"Email link to person" => "Posreduj povezavo po elektronski pošti",
-"Send" => "Pošlji",
-"Set expiration date" => "Nastavi datum preteka",
-"Expiration date" => "Datum preteka",
-"Adding user..." => "Dodajanje uporabnika ...",
-"group" => "skupina",
-"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",
-"can share" => "lahko omogoči souporabo",
-"can edit" => "lahko ureja",
-"access control" => "nadzor dostopa",
-"create" => "ustvari",
-"update" => "posodobi",
-"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",
-"Warning" => "Opozorilo",
-"The object type is not specified." => "Vrsta predmeta ni podana.",
-"Enter new" => "Vnesite novo",
-"Delete" => "Izbriši",
-"Add" => "Dodaj",
-"Edit tags" => "Uredi oznake",
-"Error loading dialog template: {error}" => "Napaka nalaganja predloge pogovornega okna: {error}",
-"No tags selected for deletion." => "Ni izbranih oznak za izbris.",
-"Updating {productName} to version {version}, this may take a while." => "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
-"Please reload the page." => "Stran je treba ponovno naložiti",
-"The update was unsuccessful." => "Posodobitev je spodletela",
-"The update was successful. Redirecting you to ownCloud now." => "Posodobitev je uspešno končana. Stran bo preusmerjena na oblak ownCloud.",
-"Couldn't reset password because the token is invalid" => "Ni mogoče ponastaviti gesla zaradi neustreznega žetona.",
-"Couldn't send reset email. Please make sure your username is correct." => "Ni mogoče poslati elektronskega sporočila. Prepričajte se, da je uporabniško ime pravilno.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
-"%s password reset" => "Ponastavitev gesla %s",
-"Use the following link to reset your password: {link}" => "Za ponastavitev gesla uporabite povezavo: {link}",
-"You will receive a link to reset your password via Email." => "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-"Username" => "Uporabniško ime",
-"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?" => "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
-"Yes, I really want to reset my password now" => "Da, potrjujem ponastavitev gesla",
-"Reset" => "Ponastavi",
-"New password" => "Novo geslo",
-"New Password" => "Novo geslo",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
-"For the best results, please consider using a GNU/Linux server instead." => "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
-"Personal" => "Osebno",
-"Users" => "Uporabniki",
-"Apps" => "Programi",
-"Admin" => "Skrbništvo",
-"Help" => "Pomoč",
-"Error loading tags" => "Napaka nalaganja oznak",
-"Tag already exists" => "Oznaka že obstaja",
-"Error deleting tag(s)" => "Napaka brisanja oznak",
-"Error tagging" => "Napaka označevanja",
-"Error untagging" => "Napaka odstranjevanja oznak",
-"Error favoriting" => "Napaka označevanja priljubljenosti",
-"Error unfavoriting" => "Napaka odstranjevanja oznake priljubljenosti",
-"Access forbidden" => "Dostop je prepovedan",
-"File not found" => "Datoteke ni mogoče najti",
-"The specified document has not been found on the server." => "Določenega dokumenta na strežniku ni mogoče najti.",
-"You can click here to return to %s." => "S klikom na povezavo boste vrnjeni na %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Pozdravljeni,\n\noseba %s vam je omogočila souporabo %s.\nVir si lahko ogledate: %s\n\n",
-"The share will expire on %s." => "Povezava souporabe bo potekla %s.",
-"Cheers!" => "Na zdravje!",
-"Internal Server Error" => "Notranja  napaka strežnika",
-"The server encountered an internal error and was unable to complete your request." => "Prišlo je do notranje napake, zato ni mogoče končati zahteve.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Stopite v stik s skrbnikom sistema, če se napaka pojavlja pogosto. V poročilo vključite tudi tehnične podatke v dnevniški datoteki.",
-"More details can be found in the server log." => "Več podrobnosti je zabeleženih v dnevniku strežnika.",
-"Technical details" => "Tehnične podrobnosti",
-"Remote Address: %s" => "Oddaljen naslov: %s",
-"Request ID: %s" => "ID zahteve: %s",
-"Code: %s" => "Koda: %s",
-"Message: %s" => "Sporočilo: %s",
-"File: %s" => "Datoteka: %s",
-"Line: %s" => "Vrstica: %s",
-"Trace" => "Sledenje povezav",
-"Security Warning" => "Varnostno opozorilo",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Uporabljena različica PHP je ranljiva za napad NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Za varno uporabo storitve %s, je treba posodobiti namestitev PHP",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
-"Create an <strong>admin account</strong>" => "Ustvari <strong>skrbniški račun</strong>",
-"Password" => "Geslo",
-"Storage & database" => "Shramba in podatkovna zbirka",
-"Data folder" => "Podatkovna mapa",
-"Configure the database" => "Nastavi podatkovno zbirko",
-"Only %s is available." => "Le %s je na voljo.",
-"Database user" => "Uporabnik podatkovne zbirke",
-"Database password" => "Geslo podatkovne zbirke",
-"Database name" => "Ime podatkovne zbirke",
-"Database tablespace" => "Razpredelnica podatkovne zbirke",
-"Database host" => "Gostitelj podatkovne zbirke",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Za podatkovno zbirko bo uporabljen SQLite. Za večje zbirke je priporočljivo to zamenjati.",
-"Finish setup" => "Končaj nastavitev",
-"Finishing …" => "Poteka zaključevanje opravila ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Program zahteva podporo JavaScript za pravilno delovanje. Omogočite <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript</a> in ponovno osvežite stran.",
-"%s is available. Get more information on how to update." => "%s je na voljo. Pridobite več podrobnosti za posodobitev.",
-"Log out" => "Odjava",
-"Server side authentication failed!" => "Overitev s strežnika je spodletela!",
-"Please contact your administrator." => "Stopite v stik s skrbnikom sistema.",
-"Forgot your password? Reset it!" => "Ali ste pozabili geslo? Ponastavite ga!",
-"remember" => "zapomni si",
-"Log in" => "Prijava",
-"Alternative Logins" => "Druge prijavne možnosti",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Pozdravljeni,<br><br>uporabnik %s vam je omogočil souporabo <strong>%s</strong>.<br><a href=\"%s\">Oglejte si vsebino!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Ta seja oblaka ownCloud je trenutno v načinu enega sočasnega uporabnika.",
-"This means only administrators can use the instance." => "To pomeni, da lahko oblak uporabljajo le osebe s skrbniškimi dovoljenji.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Stopite v stik s skrbnikom sistema, če se bo sporočilo še naprej nepričakovano prikazovalo.",
-"Thank you for your patience." => "Hvala za potrpežljivost!",
-"You are accessing the server from an untrusted domain." => "Trenutno je vzpostavljena povezava s strežnikom preko ne-varne domene.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Stopite v stik s skrbnikom ali pa nastavite možnost \"varna_domena\" v datoteki config/config.php. Primer nastavitve je razložen v datoteki config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Glede na nastavitve bi lahko kot skrbnik uporabili spodnji gumb in domeno ročno določili kot varno.",
-"Add \"%s\" as trusted domain" => "Dodaj \"%s\" kot varno domeno",
-"%s will be updated to version %s." => "%s bo posodobljen na različico %s.",
-"The following apps will be disabled:" => "Navedeni programi bodo onemogočeni:",
-"The theme %s has been disabled." => "Tema %s je onemogočena za uporabo.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Pred nadaljevanjem se prepričajte se, da je ustvarjena varnostna kopija podatkovne zbirke, nastavitvenih datotek in podatkovne mape.",
-"Start update" => "Začni posodobitev",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Za razreševanje časovnih zahtev večjih namestitev lahko uporabite ukaz iz namestitvene mape:",
-"This %s instance is currently being updated, which may take a while." => "Povezava %s se posodablja. Opravilo je lahko dolgotrajno.",
-"This page will refresh itself when the %s instance is available again." => "Stran bo osvežena ko bo %s spet na voljo."
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
new file mode 100644
index 00000000000..525359304ed
--- /dev/null
+++ b/core/l10n/sq.js
@@ -0,0 +1,104 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua",
+    "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua",
+    "Updated database" : "Database-i u azhurnua",
+    "Sunday" : "E djelë",
+    "Monday" : "E hënë",
+    "Tuesday" : "E martë",
+    "Wednesday" : "E mërkurë",
+    "Thursday" : "E enjte",
+    "Friday" : "E premte",
+    "Saturday" : "E shtunë",
+    "January" : "Janar",
+    "February" : "Shkurt",
+    "March" : "Mars",
+    "April" : "Prill",
+    "May" : "Maj",
+    "June" : "Qershor",
+    "July" : "Korrik",
+    "August" : "Gusht",
+    "September" : "Shtator",
+    "October" : "Tetor",
+    "November" : "Nëntor",
+    "December" : "Dhjetor",
+    "Settings" : "Parametra",
+    "Folder" : "Dosje",
+    "Saving..." : "Duke ruajtur...",
+    "Reset password" : "Rivendos kodin",
+    "No" : "Jo",
+    "Yes" : "Po",
+    "Choose" : "Zgjidh",
+    "Ok" : "Në rregull",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Anulo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar.",
+    "Shared" : "Ndarë",
+    "Share" : "Nda",
+    "Error" : "Veprim i gabuar",
+    "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
+    "Error while unsharing" : "Veprim i gabuar gjatë heqjes së ndarjes",
+    "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
+    "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
+    "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
+    "Password protect" : "Mbro me kod",
+    "Allow Public Upload" : "Lejo Ngarkimin Publik",
+    "Email link to person" : "Dërgo email me lidhjen",
+    "Send" : "Dërgo",
+    "Set expiration date" : "Cakto datën e përfundimit",
+    "Expiration date" : "Data e përfundimit",
+    "group" : "grupi",
+    "Resharing is not allowed" : "Rindarja nuk lejohet",
+    "Shared in {item} with {user}" : "Ndarë në {item} me {user}",
+    "Unshare" : "Hiq ndarjen",
+    "can share" : "mund të ndajnë",
+    "can edit" : "mund të ndryshosh",
+    "access control" : "kontrollimi i hyrjeve",
+    "create" : "krijo",
+    "update" : "azhurno",
+    "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",
+    "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
+    "Delete" : "Elimino",
+    "Add" : "Shto",
+    "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+    "%s password reset" : "Kodi i %s -it u rivendos",
+    "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
+    "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
+    "Username" : "Përdoruesi",
+    "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?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
+    "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani",
+    "New password" : "Kodi i ri",
+    "Personal" : "Personale",
+    "Users" : "Përdoruesit",
+    "Apps" : "App",
+    "Admin" : "Admin",
+    "Help" : "Ndihmë",
+    "Access forbidden" : "Ndalohet hyrja",
+    "Security Warning" : "Paralajmërim sigurie",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
+    "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
+    "Password" : "Kodi",
+    "Data folder" : "Emri i dosjes",
+    "Configure the database" : "Konfiguro database-in",
+    "Database user" : "Përdoruesi i database-it",
+    "Database password" : "Kodi i database-it",
+    "Database name" : "Emri i database-it",
+    "Database tablespace" : "Tablespace-i i database-it",
+    "Database host" : "Pozicioni (host) i database-it",
+    "Finish setup" : "Mbaro setup-in",
+    "%s is available. Get more information on how to update." : "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
+    "Log out" : "Dalje",
+    "remember" : "kujto",
+    "Log in" : "Hyrje",
+    "Alternative Logins" : "Hyrje alternative"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
new file mode 100644
index 00000000000..d9850c8ab5a
--- /dev/null
+++ b/core/l10n/sq.json
@@ -0,0 +1,102 @@
+{ "translations": {
+    "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua",
+    "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua",
+    "Updated database" : "Database-i u azhurnua",
+    "Sunday" : "E djelë",
+    "Monday" : "E hënë",
+    "Tuesday" : "E martë",
+    "Wednesday" : "E mërkurë",
+    "Thursday" : "E enjte",
+    "Friday" : "E premte",
+    "Saturday" : "E shtunë",
+    "January" : "Janar",
+    "February" : "Shkurt",
+    "March" : "Mars",
+    "April" : "Prill",
+    "May" : "Maj",
+    "June" : "Qershor",
+    "July" : "Korrik",
+    "August" : "Gusht",
+    "September" : "Shtator",
+    "October" : "Tetor",
+    "November" : "Nëntor",
+    "December" : "Dhjetor",
+    "Settings" : "Parametra",
+    "Folder" : "Dosje",
+    "Saving..." : "Duke ruajtur...",
+    "Reset password" : "Rivendos kodin",
+    "No" : "Jo",
+    "Yes" : "Po",
+    "Choose" : "Zgjidh",
+    "Ok" : "Në rregull",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "Anulo",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar.",
+    "Shared" : "Ndarë",
+    "Share" : "Nda",
+    "Error" : "Veprim i gabuar",
+    "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
+    "Error while unsharing" : "Veprim i gabuar gjatë heqjes së ndarjes",
+    "Error while changing permissions" : "Veprim i gabuar gjatë ndryshimit të lejeve",
+    "Shared with you and the group {group} by {owner}" : "Ndarë me ju dhe me grupin {group} nga {owner}",
+    "Shared with you by {owner}" : "Ndarë me ju nga {owner}",
+    "Password protect" : "Mbro me kod",
+    "Allow Public Upload" : "Lejo Ngarkimin Publik",
+    "Email link to person" : "Dërgo email me lidhjen",
+    "Send" : "Dërgo",
+    "Set expiration date" : "Cakto datën e përfundimit",
+    "Expiration date" : "Data e përfundimit",
+    "group" : "grupi",
+    "Resharing is not allowed" : "Rindarja nuk lejohet",
+    "Shared in {item} with {user}" : "Ndarë në {item} me {user}",
+    "Unshare" : "Hiq ndarjen",
+    "can share" : "mund të ndajnë",
+    "can edit" : "mund të ndryshosh",
+    "access control" : "kontrollimi i hyrjeve",
+    "create" : "krijo",
+    "update" : "azhurno",
+    "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",
+    "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
+    "Delete" : "Elimino",
+    "Add" : "Shto",
+    "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+    "%s password reset" : "Kodi i %s -it u rivendos",
+    "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
+    "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
+    "Username" : "Përdoruesi",
+    "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?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
+    "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani",
+    "New password" : "Kodi i ri",
+    "Personal" : "Personale",
+    "Users" : "Përdoruesit",
+    "Apps" : "App",
+    "Admin" : "Admin",
+    "Help" : "Ndihmë",
+    "Access forbidden" : "Ndalohet hyrja",
+    "Security Warning" : "Paralajmërim sigurie",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
+    "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
+    "Password" : "Kodi",
+    "Data folder" : "Emri i dosjes",
+    "Configure the database" : "Konfiguro database-in",
+    "Database user" : "Përdoruesi i database-it",
+    "Database password" : "Kodi i database-it",
+    "Database name" : "Emri i database-it",
+    "Database tablespace" : "Tablespace-i i database-it",
+    "Database host" : "Pozicioni (host) i database-it",
+    "Finish setup" : "Mbaro setup-in",
+    "%s is available. Get more information on how to update." : "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
+    "Log out" : "Dalje",
+    "remember" : "kujto",
+    "Log in" : "Hyrje",
+    "Alternative Logins" : "Hyrje alternative"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/sq.php b/core/l10n/sq.php
deleted file mode 100644
index 7ae33ee303d..00000000000
--- a/core/l10n/sq.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "Mënyra e mirëmbajtjes u aktivizua",
-"Turned off maintenance mode" => "Mënyra e mirëmbajtjes u çaktivizua",
-"Updated database" => "Database-i u azhurnua",
-"Sunday" => "E djelë",
-"Monday" => "E hënë",
-"Tuesday" => "E martë",
-"Wednesday" => "E mërkurë",
-"Thursday" => "E enjte",
-"Friday" => "E premte",
-"Saturday" => "E shtunë",
-"January" => "Janar",
-"February" => "Shkurt",
-"March" => "Mars",
-"April" => "Prill",
-"May" => "Maj",
-"June" => "Qershor",
-"July" => "Korrik",
-"August" => "Gusht",
-"September" => "Shtator",
-"October" => "Tetor",
-"November" => "Nëntor",
-"December" => "Dhjetor",
-"Settings" => "Parametra",
-"Folder" => "Dosje",
-"Saving..." => "Duke ruajtur...",
-"Reset password" => "Rivendos kodin",
-"No" => "Jo",
-"Yes" => "Po",
-"Choose" => "Zgjidh",
-"Ok" => "Në rregull",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "Anulo",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar.",
-"Shared" => "Ndarë",
-"Share" => "Nda",
-"Error" => "Veprim i gabuar",
-"Error while sharing" => "Veprim i gabuar gjatë ndarjes",
-"Error while unsharing" => "Veprim i gabuar gjatë heqjes së ndarjes",
-"Error while changing permissions" => "Veprim i gabuar gjatë ndryshimit të lejeve",
-"Shared with you and the group {group} by {owner}" => "Ndarë me ju dhe me grupin {group} nga {owner}",
-"Shared with you by {owner}" => "Ndarë me ju nga {owner}",
-"Password protect" => "Mbro me kod",
-"Allow Public Upload" => "Lejo Ngarkimin Publik",
-"Email link to person" => "Dërgo email me lidhjen",
-"Send" => "Dërgo",
-"Set expiration date" => "Cakto datën e përfundimit",
-"Expiration date" => "Data e përfundimit",
-"group" => "grupi",
-"Resharing is not allowed" => "Rindarja nuk lejohet",
-"Shared in {item} with {user}" => "Ndarë në {item} me {user}",
-"Unshare" => "Hiq ndarjen",
-"can share" => "mund të ndajnë",
-"can edit" => "mund të ndryshosh",
-"access control" => "kontrollimi i hyrjeve",
-"create" => "krijo",
-"update" => "azhurno",
-"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",
-"The object type is not specified." => "Nuk është specifikuar tipi i objektit.",
-"Delete" => "Elimino",
-"Add" => "Shto",
-"The update was successful. Redirecting you to ownCloud now." => "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
-"%s password reset" => "Kodi i %s -it u rivendos",
-"Use the following link to reset your password: {link}" => "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
-"You will receive a link to reset your password via Email." => "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
-"Username" => "Përdoruesi",
-"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?" => "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
-"Yes, I really want to reset my password now" => "Po, dua ta rivendos kodin tani",
-"New password" => "Kodi i ri",
-"Personal" => "Personale",
-"Users" => "Përdoruesit",
-"Apps" => "App",
-"Admin" => "Admin",
-"Help" => "Ndihmë",
-"Access forbidden" => "Ndalohet hyrja",
-"Security Warning" => "Paralajmërim sigurie",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
-"Create an <strong>admin account</strong>" => "Krijo një <strong>llogari administruesi</strong>",
-"Password" => "Kodi",
-"Data folder" => "Emri i dosjes",
-"Configure the database" => "Konfiguro database-in",
-"Database user" => "Përdoruesi i database-it",
-"Database password" => "Kodi i database-it",
-"Database name" => "Emri i database-it",
-"Database tablespace" => "Tablespace-i i database-it",
-"Database host" => "Pozicioni (host) i database-it",
-"Finish setup" => "Mbaro setup-in",
-"%s is available. Get more information on how to update." => "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
-"Log out" => "Dalje",
-"remember" => "kujto",
-"Log in" => "Hyrje",
-"Alternative Logins" => "Hyrje alternative"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
new file mode 100644
index 00000000000..f8576df9d50
--- /dev/null
+++ b/core/l10n/sr.js
@@ -0,0 +1,88 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Недеља",
+    "Monday" : "Понедељак",
+    "Tuesday" : "Уторак",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четвртак",
+    "Friday" : "Петак",
+    "Saturday" : "Субота",
+    "January" : "Јануар",
+    "February" : "Фебруар",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Мај",
+    "June" : "Јун",
+    "July" : "Јул",
+    "August" : "Август",
+    "September" : "Септембар",
+    "October" : "Октобар",
+    "November" : "Новембар",
+    "December" : "Децембар",
+    "Settings" : "Поставке",
+    "Folder" : "фасцикла",
+    "Saving..." : "Чување у току...",
+    "Reset password" : "Ресетуј лозинку",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Одабери",
+    "Ok" : "У реду",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Откажи",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
+    "Share" : "Дели",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка у дељењу",
+    "Error while unsharing" : "Грешка код искључења дељења",
+    "Error while changing permissions" : "Грешка код промене дозвола",
+    "Shared with you and the group {group} by {owner}" : "Дељено са вама и са групом {group}. Поделио {owner}.",
+    "Shared with you by {owner}" : "Поделио са вама {owner}",
+    "Password protect" : "Заштићено лозинком",
+    "Send" : "Пошаљи",
+    "Set expiration date" : "Постави датум истека",
+    "Expiration date" : "Датум истека",
+    "group" : "група",
+    "Resharing is not allowed" : "Поновно дељење није дозвољено",
+    "Shared in {item} with {user}" : "Подељено унутар {item} са {user}",
+    "Unshare" : "Укини дељење",
+    "can edit" : "може да мења",
+    "access control" : "права приступа",
+    "create" : "направи",
+    "update" : "ажурирај",
+    "delete" : "обриши",
+    "Password protected" : "Заштићено лозинком",
+    "Error unsetting expiration date" : "Грешка код поништавања датума истека",
+    "Error setting expiration date" : "Грешка код постављања датума истека",
+    "Sending ..." : "Шаљем...",
+    "Email sent" : "Порука је послата",
+    "Warning" : "Упозорење",
+    "The object type is not specified." : "Врста објекта није подешена.",
+    "Delete" : "Обриши",
+    "Add" : "Додај",
+    "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
+    "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
+    "Username" : "Корисничко име",
+    "New password" : "Нова лозинка",
+    "Personal" : "Лично",
+    "Users" : "Корисници",
+    "Apps" : "Апликације",
+    "Admin" : "Администратор",
+    "Help" : "Помоћ",
+    "Access forbidden" : "Забрањен приступ",
+    "Security Warning" : "Сигурносно упозорење",
+    "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
+    "Password" : "Лозинка",
+    "Data folder" : "Фацикла података",
+    "Configure the database" : "Подешавање базе",
+    "Database user" : "Корисник базе",
+    "Database password" : "Лозинка базе",
+    "Database name" : "Име базе",
+    "Database tablespace" : "Радни простор базе података",
+    "Database host" : "Домаћин базе",
+    "Finish setup" : "Заврши подешавање",
+    "Log out" : "Одјава",
+    "remember" : "упамти",
+    "Log in" : "Пријава"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
new file mode 100644
index 00000000000..998deee1988
--- /dev/null
+++ b/core/l10n/sr.json
@@ -0,0 +1,86 @@
+{ "translations": {
+    "Sunday" : "Недеља",
+    "Monday" : "Понедељак",
+    "Tuesday" : "Уторак",
+    "Wednesday" : "Среда",
+    "Thursday" : "Четвртак",
+    "Friday" : "Петак",
+    "Saturday" : "Субота",
+    "January" : "Јануар",
+    "February" : "Фебруар",
+    "March" : "Март",
+    "April" : "Април",
+    "May" : "Мај",
+    "June" : "Јун",
+    "July" : "Јул",
+    "August" : "Август",
+    "September" : "Септембар",
+    "October" : "Октобар",
+    "November" : "Новембар",
+    "December" : "Децембар",
+    "Settings" : "Поставке",
+    "Folder" : "фасцикла",
+    "Saving..." : "Чување у току...",
+    "Reset password" : "Ресетуј лозинку",
+    "No" : "Не",
+    "Yes" : "Да",
+    "Choose" : "Одабери",
+    "Ok" : "У реду",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Откажи",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
+    "Share" : "Дели",
+    "Error" : "Грешка",
+    "Error while sharing" : "Грешка у дељењу",
+    "Error while unsharing" : "Грешка код искључења дељења",
+    "Error while changing permissions" : "Грешка код промене дозвола",
+    "Shared with you and the group {group} by {owner}" : "Дељено са вама и са групом {group}. Поделио {owner}.",
+    "Shared with you by {owner}" : "Поделио са вама {owner}",
+    "Password protect" : "Заштићено лозинком",
+    "Send" : "Пошаљи",
+    "Set expiration date" : "Постави датум истека",
+    "Expiration date" : "Датум истека",
+    "group" : "група",
+    "Resharing is not allowed" : "Поновно дељење није дозвољено",
+    "Shared in {item} with {user}" : "Подељено унутар {item} са {user}",
+    "Unshare" : "Укини дељење",
+    "can edit" : "може да мења",
+    "access control" : "права приступа",
+    "create" : "направи",
+    "update" : "ажурирај",
+    "delete" : "обриши",
+    "Password protected" : "Заштићено лозинком",
+    "Error unsetting expiration date" : "Грешка код поништавања датума истека",
+    "Error setting expiration date" : "Грешка код постављања датума истека",
+    "Sending ..." : "Шаљем...",
+    "Email sent" : "Порука је послата",
+    "Warning" : "Упозорење",
+    "The object type is not specified." : "Врста објекта није подешена.",
+    "Delete" : "Обриши",
+    "Add" : "Додај",
+    "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
+    "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
+    "Username" : "Корисничко име",
+    "New password" : "Нова лозинка",
+    "Personal" : "Лично",
+    "Users" : "Корисници",
+    "Apps" : "Апликације",
+    "Admin" : "Администратор",
+    "Help" : "Помоћ",
+    "Access forbidden" : "Забрањен приступ",
+    "Security Warning" : "Сигурносно упозорење",
+    "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
+    "Password" : "Лозинка",
+    "Data folder" : "Фацикла података",
+    "Configure the database" : "Подешавање базе",
+    "Database user" : "Корисник базе",
+    "Database password" : "Лозинка базе",
+    "Database name" : "Име базе",
+    "Database tablespace" : "Радни простор базе података",
+    "Database host" : "Домаћин базе",
+    "Finish setup" : "Заврши подешавање",
+    "Log out" : "Одјава",
+    "remember" : "упамти",
+    "Log in" : "Пријава"
+},"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/sr.php b/core/l10n/sr.php
deleted file mode 100644
index 2d994100867..00000000000
--- a/core/l10n/sr.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Недеља",
-"Monday" => "Понедељак",
-"Tuesday" => "Уторак",
-"Wednesday" => "Среда",
-"Thursday" => "Четвртак",
-"Friday" => "Петак",
-"Saturday" => "Субота",
-"January" => "Јануар",
-"February" => "Фебруар",
-"March" => "Март",
-"April" => "Април",
-"May" => "Мај",
-"June" => "Јун",
-"July" => "Јул",
-"August" => "Август",
-"September" => "Септембар",
-"October" => "Октобар",
-"November" => "Новембар",
-"December" => "Децембар",
-"Settings" => "Поставке",
-"Folder" => "фасцикла",
-"Saving..." => "Чување у току...",
-"Reset password" => "Ресетуј лозинку",
-"No" => "Не",
-"Yes" => "Да",
-"Choose" => "Одабери",
-"Ok" => "У реду",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"Cancel" => "Откажи",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш веб сервер тренутно не подржава синхронизацију датотека јер се чини да је WebDAV сучеље неисправно.",
-"Share" => "Дели",
-"Error" => "Грешка",
-"Error while sharing" => "Грешка у дељењу",
-"Error while unsharing" => "Грешка код искључења дељења",
-"Error while changing permissions" => "Грешка код промене дозвола",
-"Shared with you and the group {group} by {owner}" => "Дељено са вама и са групом {group}. Поделио {owner}.",
-"Shared with you by {owner}" => "Поделио са вама {owner}",
-"Password protect" => "Заштићено лозинком",
-"Send" => "Пошаљи",
-"Set expiration date" => "Постави датум истека",
-"Expiration date" => "Датум истека",
-"group" => "група",
-"Resharing is not allowed" => "Поновно дељење није дозвољено",
-"Shared in {item} with {user}" => "Подељено унутар {item} са {user}",
-"Unshare" => "Укини дељење",
-"can edit" => "може да мења",
-"access control" => "права приступа",
-"create" => "направи",
-"update" => "ажурирај",
-"delete" => "обриши",
-"Password protected" => "Заштићено лозинком",
-"Error unsetting expiration date" => "Грешка код поништавања датума истека",
-"Error setting expiration date" => "Грешка код постављања датума истека",
-"Sending ..." => "Шаљем...",
-"Email sent" => "Порука је послата",
-"Warning" => "Упозорење",
-"The object type is not specified." => "Врста објекта није подешена.",
-"Delete" => "Обриши",
-"Add" => "Додај",
-"Use the following link to reset your password: {link}" => "Овом везом ресетујте своју лозинку: {link}",
-"You will receive a link to reset your password via Email." => "Добићете везу за ресетовање лозинке путем е-поште.",
-"Username" => "Корисничко име",
-"New password" => "Нова лозинка",
-"Personal" => "Лично",
-"Users" => "Корисници",
-"Apps" => "Апликације",
-"Admin" => "Администратор",
-"Help" => "Помоћ",
-"Access forbidden" => "Забрањен приступ",
-"Security Warning" => "Сигурносно упозорење",
-"Create an <strong>admin account</strong>" => "Направи <strong>административни налог</strong>",
-"Password" => "Лозинка",
-"Data folder" => "Фацикла података",
-"Configure the database" => "Подешавање базе",
-"Database user" => "Корисник базе",
-"Database password" => "Лозинка базе",
-"Database name" => "Име базе",
-"Database tablespace" => "Радни простор базе података",
-"Database host" => "Домаћин базе",
-"Finish setup" => "Заврши подешавање",
-"Log out" => "Одјава",
-"remember" => "упамти",
-"Log in" => "Пријава"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
new file mode 100644
index 00000000000..9ea14c5db68
--- /dev/null
+++ b/core/l10n/sr@latin.js
@@ -0,0 +1,100 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "Nedelja",
+    "Monday" : "Ponedeljak",
+    "Tuesday" : "Utorak",
+    "Wednesday" : "Sreda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mart",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Jun",
+    "July" : "Jul",
+    "August" : "Avgust",
+    "September" : "Septembar",
+    "October" : "Oktobar",
+    "November" : "Novembar",
+    "December" : "Decembar",
+    "Settings" : "Podešavanja",
+    "File" : "Fajl",
+    "Folder" : "Direktorijum",
+    "Image" : "Slika",
+    "I know what I'm doing" : "Znam šta radim",
+    "Reset password" : "Resetuj lozinku",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izaberi",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Otkaži",
+    "Continue" : "Nastavi",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Osrednja lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Shared" : "Deljeno",
+    "Shared with {recipients}" : "Podeljeno sa {recipients}",
+    "Share" : "Podeli",
+    "Error" : "Greška",
+    "Error while sharing" : "Greška pri deljenju",
+    "Error while unsharing" : "Greška u uklanjanju deljenja",
+    "Error while changing permissions" : "Greška u promeni dozvola",
+    "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
+    "Shared with you by {owner}" : "Sa vama podelio {owner}",
+    "Password protect" : "Zaštita lozinkom",
+    "Email link to person" : "Pošalji link e-mailom",
+    "Send" : "Pošalji",
+    "Set expiration date" : "Datum isteka",
+    "Expiration date" : "Datum isteka",
+    "Resharing is not allowed" : "Dalje deljenje nije dozvoljeno",
+    "Shared in {item} with {user}" : "Deljeno u {item} sa {user}",
+    "Unshare" : "Ukljoni deljenje",
+    "can edit" : "dozvoljene izmene",
+    "access control" : "kontrola pristupa",
+    "create" : "napravi",
+    "update" : "ažuriranje",
+    "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",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Tip objekta nije zadan.",
+    "Delete" : "Obriši",
+    "Add" : "Dodaj",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
+    "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
+    "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
+    "Username" : "Korisničko ime",
+    "New password" : "Nova lozinka",
+    "Personal" : "Lično",
+    "Users" : "Korisnici",
+    "Apps" : "Programi",
+    "Admin" : "Adninistracija",
+    "Help" : "Pomoć",
+    "Access forbidden" : "Pristup zabranjen",
+    "Security Warning" : "Bezbednosno upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
+    "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
+    "Password" : "Lozinka",
+    "Data folder" : "Fascikla podataka",
+    "Configure the database" : "Podešavanje baze",
+    "Database user" : "Korisnik baze",
+    "Database password" : "Lozinka baze",
+    "Database name" : "Ime baze",
+    "Database tablespace" : "tablespace baze",
+    "Database host" : "Domaćin baze",
+    "Finish setup" : "Završi podešavanje",
+    "Log out" : "Odjava",
+    "remember" : "upamti",
+    "Log in" : "Prijavi se"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
new file mode 100644
index 00000000000..aea1e83a2ed
--- /dev/null
+++ b/core/l10n/sr@latin.json
@@ -0,0 +1,98 @@
+{ "translations": {
+    "Sunday" : "Nedelja",
+    "Monday" : "Ponedeljak",
+    "Tuesday" : "Utorak",
+    "Wednesday" : "Sreda",
+    "Thursday" : "Četvrtak",
+    "Friday" : "Petak",
+    "Saturday" : "Subota",
+    "January" : "Januar",
+    "February" : "Februar",
+    "March" : "Mart",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Jun",
+    "July" : "Jul",
+    "August" : "Avgust",
+    "September" : "Septembar",
+    "October" : "Oktobar",
+    "November" : "Novembar",
+    "December" : "Decembar",
+    "Settings" : "Podešavanja",
+    "File" : "Fajl",
+    "Folder" : "Direktorijum",
+    "Image" : "Slika",
+    "I know what I'm doing" : "Znam šta radim",
+    "Reset password" : "Resetuj lozinku",
+    "No" : "Ne",
+    "Yes" : "Da",
+    "Choose" : "Izaberi",
+    "Ok" : "Ok",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Otkaži",
+    "Continue" : "Nastavi",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Osrednja lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Shared" : "Deljeno",
+    "Shared with {recipients}" : "Podeljeno sa {recipients}",
+    "Share" : "Podeli",
+    "Error" : "Greška",
+    "Error while sharing" : "Greška pri deljenju",
+    "Error while unsharing" : "Greška u uklanjanju deljenja",
+    "Error while changing permissions" : "Greška u promeni dozvola",
+    "Shared with you and the group {group} by {owner}" : "{owner} podelio sa Vama i grupom {group} ",
+    "Shared with you by {owner}" : "Sa vama podelio {owner}",
+    "Password protect" : "Zaštita lozinkom",
+    "Email link to person" : "Pošalji link e-mailom",
+    "Send" : "Pošalji",
+    "Set expiration date" : "Datum isteka",
+    "Expiration date" : "Datum isteka",
+    "Resharing is not allowed" : "Dalje deljenje nije dozvoljeno",
+    "Shared in {item} with {user}" : "Deljeno u {item} sa {user}",
+    "Unshare" : "Ukljoni deljenje",
+    "can edit" : "dozvoljene izmene",
+    "access control" : "kontrola pristupa",
+    "create" : "napravi",
+    "update" : "ažuriranje",
+    "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",
+    "Warning" : "Upozorenje",
+    "The object type is not specified." : "Tip objekta nije zadan.",
+    "Delete" : "Obriši",
+    "Add" : "Dodaj",
+    "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
+    "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
+    "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
+    "Username" : "Korisničko ime",
+    "New password" : "Nova lozinka",
+    "Personal" : "Lično",
+    "Users" : "Korisnici",
+    "Apps" : "Programi",
+    "Admin" : "Adninistracija",
+    "Help" : "Pomoć",
+    "Access forbidden" : "Pristup zabranjen",
+    "Security Warning" : "Bezbednosno upozorenje",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
+    "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
+    "Password" : "Lozinka",
+    "Data folder" : "Fascikla podataka",
+    "Configure the database" : "Podešavanje baze",
+    "Database user" : "Korisnik baze",
+    "Database password" : "Lozinka baze",
+    "Database name" : "Ime baze",
+    "Database tablespace" : "tablespace baze",
+    "Database host" : "Domaćin baze",
+    "Finish setup" : "Završi podešavanje",
+    "Log out" : "Odjava",
+    "remember" : "upamti",
+    "Log in" : "Prijavi se"
+},"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/sr@latin.php b/core/l10n/sr@latin.php
deleted file mode 100644
index 28009eccb0d..00000000000
--- a/core/l10n/sr@latin.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "Nedelja",
-"Monday" => "Ponedeljak",
-"Tuesday" => "Utorak",
-"Wednesday" => "Sreda",
-"Thursday" => "Četvrtak",
-"Friday" => "Petak",
-"Saturday" => "Subota",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mart",
-"April" => "April",
-"May" => "Maj",
-"June" => "Jun",
-"July" => "Jul",
-"August" => "Avgust",
-"September" => "Septembar",
-"October" => "Oktobar",
-"November" => "Novembar",
-"December" => "Decembar",
-"Settings" => "Podešavanja",
-"File" => "Fajl",
-"Folder" => "Direktorijum",
-"Image" => "Slika",
-"I know what I'm doing" => "Znam šta radim",
-"Reset password" => "Resetuj lozinku",
-"No" => "Ne",
-"Yes" => "Da",
-"Choose" => "Izaberi",
-"Ok" => "Ok",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"Cancel" => "Otkaži",
-"Continue" => "Nastavi",
-"Very weak password" => "Veoma slaba lozinka",
-"Weak password" => "Slaba lozinka",
-"So-so password" => "Osrednja lozinka",
-"Good password" => "Dobra lozinka",
-"Strong password" => "Jaka lozinka",
-"Shared" => "Deljeno",
-"Shared with {recipients}" => "Podeljeno sa {recipients}",
-"Share" => "Podeli",
-"Error" => "Greška",
-"Error while sharing" => "Greška pri deljenju",
-"Error while unsharing" => "Greška u uklanjanju deljenja",
-"Error while changing permissions" => "Greška u promeni dozvola",
-"Shared with you and the group {group} by {owner}" => "{owner} podelio sa Vama i grupom {group} ",
-"Shared with you by {owner}" => "Sa vama podelio {owner}",
-"Password protect" => "Zaštita lozinkom",
-"Email link to person" => "Pošalji link e-mailom",
-"Send" => "Pošalji",
-"Set expiration date" => "Datum isteka",
-"Expiration date" => "Datum isteka",
-"Resharing is not allowed" => "Dalje deljenje nije dozvoljeno",
-"Shared in {item} with {user}" => "Deljeno u {item} sa {user}",
-"Unshare" => "Ukljoni deljenje",
-"can edit" => "dozvoljene izmene",
-"access control" => "kontrola pristupa",
-"create" => "napravi",
-"update" => "ažuriranje",
-"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",
-"Warning" => "Upozorenje",
-"The object type is not specified." => "Tip objekta nije zadan.",
-"Delete" => "Obriši",
-"Add" => "Dodaj",
-"The update was successful. Redirecting you to ownCloud now." => "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
-"Use the following link to reset your password: {link}" => "Koristite sledeći link za reset lozinke: {link}",
-"You will receive a link to reset your password via Email." => "Dobićete vezu za resetovanje lozinke putem e-pošte.",
-"Username" => "Korisničko ime",
-"New password" => "Nova lozinka",
-"Personal" => "Lično",
-"Users" => "Korisnici",
-"Apps" => "Programi",
-"Admin" => "Adninistracija",
-"Help" => "Pomoć",
-"Access forbidden" => "Pristup zabranjen",
-"Security Warning" => "Bezbednosno upozorenje",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Vaša PHP verzija je ranjiva na ",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
-"Create an <strong>admin account</strong>" => "Napravi <strong>administrativni nalog</strong>",
-"Password" => "Lozinka",
-"Data folder" => "Fascikla podataka",
-"Configure the database" => "Podešavanje baze",
-"Database user" => "Korisnik baze",
-"Database password" => "Lozinka baze",
-"Database name" => "Ime baze",
-"Database tablespace" => "tablespace baze",
-"Database host" => "Domaćin baze",
-"Finish setup" => "Završi podešavanje",
-"Log out" => "Odjava",
-"remember" => "upamti",
-"Log in" => "Prijavi se"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/su.js b/core/l10n/su.js
new file mode 100644
index 00000000000..87077ecad97
--- /dev/null
+++ b/core/l10n/su.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/su.json b/core/l10n/su.json
new file mode 100644
index 00000000000..c499f696550
--- /dev/null
+++ b/core/l10n/su.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/su.php b/core/l10n/su.php
deleted file mode 100644
index 1191769faa7..00000000000
--- a/core/l10n/su.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
new file mode 100644
index 00000000000..634e9c6bc22
--- /dev/null
+++ b/core/l10n/sv.js
@@ -0,0 +1,192 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Gick inte att skicka e-post till följande användare: %s",
+    "Turned on maintenance mode" : "Aktiverade underhållsläge",
+    "Turned off maintenance mode" : "Deaktiverade underhållsläge",
+    "Updated database" : "Uppdaterade databasen",
+    "Updated \"%s\" to %s" : "Uppdaterade \"%s\" till %s",
+    "Disabled incompatible apps: %s" : "Inaktiverade inkompatibla appar: %s",
+    "No image or file provided" : "Ingen bild eller fil har tillhandahållits",
+    "Unknown filetype" : "Okänd filtyp",
+    "Invalid image" : "Ogiltig bild",
+    "No temporary profile picture available, try again" : "Ingen temporär profilbild finns tillgänglig, försök igen",
+    "No crop data provided" : "Ingen beskärdata har angivits",
+    "Sunday" : "Söndag",
+    "Monday" : "Måndag",
+    "Tuesday" : "Tisdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lördag",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Augusti",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Inställningar",
+    "File" : "Fil",
+    "Folder" : "Mapp",
+    "Image" : "Bild",
+    "Audio" : "Ljud",
+    "Saving..." : "Sparar...",
+    "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?",
+    "I know what I'm doing" : "Jag är säker på vad jag gör",
+    "Reset password" : "Återställ lösenordet",
+    "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
+    "No" : "Nej",
+    "Yes" : "Ja",
+    "Choose" : "Välj",
+    "Error loading file picker template: {error}" : "Fel uppstod för filväljarmall: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fel uppstod under inläsningen av meddelandemallen: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nya filer",
+    "Already existing files" : "Filer som redan existerar",
+    "Which files do you want to keep?" : "Vilken fil vill du behålla?",
+    "If you select both versions, the copied file will have a number added to its name." : "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Fortsätt",
+    "(all selected)" : "(Alla valda)",
+    "({count} selected)" : "({count} valda)",
+    "Error loading file exists template" : "Fel uppstod filmall existerar",
+    "Very weak password" : "Väldigt svagt lösenord",
+    "Weak password" : "Svagt lösenord",
+    "So-so password" : "Okej lösenord",
+    "Good password" : "Bra lösenord",
+    "Strong password" : "Starkt lösenord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
+    "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." : "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner.",
+    "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes",
+    "Shared" : "Delad",
+    "Shared with {recipients}" : "Delad med {recipients}",
+    "Share" : "Dela",
+    "Error" : "Fel",
+    "Error while sharing" : "Fel vid delning",
+    "Error while unsharing" : "Fel när delning skulle avslutas",
+    "Error while changing permissions" : "Fel vid ändring av rättigheter",
+    "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delad med dig av {owner}",
+    "Share with user or group …" : "Dela med användare eller grupp...",
+    "Share link" : "Dela länk",
+    "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+    "Password protect" : "Lösenordsskydda",
+    "Choose a password for the public link" : "Välj ett lösenord för den publika länken",
+    "Allow Public Upload" : "Tillåt publik uppladdning",
+    "Email link to person" : "E-posta länk till person",
+    "Send" : "Skicka",
+    "Set expiration date" : "Sätt utgångsdatum",
+    "Expiration date" : "Utgångsdatum",
+    "Adding user..." : "Lägger till användare...",
+    "group" : "Grupp",
+    "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",
+    "can share" : "får dela",
+    "can edit" : "kan redigera",
+    "access control" : "åtkomstkontroll",
+    "create" : "skapa",
+    "update" : "uppdatera",
+    "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",
+    "Warning" : "Varning",
+    "The object type is not specified." : "Objekttypen är inte specificerad.",
+    "Enter new" : "Skriv nytt",
+    "Delete" : "Radera",
+    "Add" : "Lägg till",
+    "Edit tags" : "Editera taggar",
+    "Error loading dialog template: {error}" : "Fel under laddning utav dialog mall: {fel}",
+    "No tags selected for deletion." : "Inga taggar valda för borttagning.",
+    "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
+    "Please reload the page." : "Vänligen ladda om sidan.",
+    "The update was unsuccessful." : "Uppdateringen misslyckades.",
+    "The update was successful. Redirecting you to ownCloud now." : "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
+    "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token",
+    "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
+    "%s password reset" : "%s återställ lösenord",
+    "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
+    "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.",
+    "Username" : "Användarnamn",
+    "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?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
+    "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu",
+    "Reset" : "Återställ",
+    "New password" : "Nytt lösenord",
+    "New Password" : "Nytt lösenord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
+    "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
+    "Personal" : "Personligt",
+    "Users" : "Användare",
+    "Apps" : "Program",
+    "Admin" : "Admin",
+    "Help" : "Hjälp",
+    "Error loading tags" : "Fel vid laddning utav taggar",
+    "Tag already exists" : "Tagg existerar redan",
+    "Error deleting tag(s)" : "Fel vid borttagning utav tagg(ar)",
+    "Error tagging" : "Fel taggning",
+    "Error untagging" : "Fel av taggning",
+    "Error favoriting" : "Fel favorisering",
+    "Error unfavoriting" : "Fel av favorisering ",
+    "Access forbidden" : "Åtkomst förbjuden",
+    "File not found" : "Filen kunde inte hittas",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
+    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Cheers!" : "Ha de fint!",
+    "Security Warning" : "Säkerhetsvarning",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Var god uppdatera din PHP-installation för att använda %s säkert.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
+    "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
+    "Password" : "Lösenord",
+    "Storage & database" : "Lagring & databas",
+    "Data folder" : "Datamapp",
+    "Configure the database" : "Konfigurera databasen",
+    "Only %s is available." : "Endast %s är tillgänglig.",
+    "Database user" : "Databasanvändare",
+    "Database password" : "Lösenord till databasen",
+    "Database name" : "Databasnamn",
+    "Database tablespace" : "Databas tabellutrymme",
+    "Database host" : "Databasserver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite kommer att användas som databas. För större installationer rekommenderar vi att du ändrar databastyp.",
+    "Finish setup" : "Avsluta installation",
+    "Finishing …" : "Avslutar ...",
+    "%s is available. Get more information on how to update." : "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
+    "Log out" : "Logga ut",
+    "Server side authentication failed!" : "Servern misslyckades med autentisering!",
+    "Please contact your administrator." : "Kontakta din administratör.",
+    "Forgot your password? Reset it!" : "Glömt ditt lösenord? Återställ det!",
+    "remember" : "kom ihåg",
+    "Log in" : "Logga in",
+    "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",
+    "This means only administrators can use the instance." : "Detta betyder att endast administartörer kan använda instansen.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
+    "Thank you for your patience." : "Tack för ditt tålamod.",
+    "You are accessing the server from an untrusted domain." : "Du ansluter till servern från en osäker domän.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
+    "Add \"%s\" as trusted domain" : "Lägg till \"%s\" som en trusted domain",
+    "%s will be updated to version %s." : "%s kommer att uppdateras till version %s.",
+    "The following apps will be disabled:" : "Följande appar kommer att inaktiveras:",
+    "The theme %s has been disabled." : "Temat  %s har blivit inaktiverat.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
+    "Start update" : "Starta uppdateringen"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
new file mode 100644
index 00000000000..a7108b44fcd
--- /dev/null
+++ b/core/l10n/sv.json
@@ -0,0 +1,190 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Gick inte att skicka e-post till följande användare: %s",
+    "Turned on maintenance mode" : "Aktiverade underhållsläge",
+    "Turned off maintenance mode" : "Deaktiverade underhållsläge",
+    "Updated database" : "Uppdaterade databasen",
+    "Updated \"%s\" to %s" : "Uppdaterade \"%s\" till %s",
+    "Disabled incompatible apps: %s" : "Inaktiverade inkompatibla appar: %s",
+    "No image or file provided" : "Ingen bild eller fil har tillhandahållits",
+    "Unknown filetype" : "Okänd filtyp",
+    "Invalid image" : "Ogiltig bild",
+    "No temporary profile picture available, try again" : "Ingen temporär profilbild finns tillgänglig, försök igen",
+    "No crop data provided" : "Ingen beskärdata har angivits",
+    "Sunday" : "Söndag",
+    "Monday" : "Måndag",
+    "Tuesday" : "Tisdag",
+    "Wednesday" : "Onsdag",
+    "Thursday" : "Torsdag",
+    "Friday" : "Fredag",
+    "Saturday" : "Lördag",
+    "January" : "Januari",
+    "February" : "Februari",
+    "March" : "Mars",
+    "April" : "April",
+    "May" : "Maj",
+    "June" : "Juni",
+    "July" : "Juli",
+    "August" : "Augusti",
+    "September" : "September",
+    "October" : "Oktober",
+    "November" : "November",
+    "December" : "December",
+    "Settings" : "Inställningar",
+    "File" : "Fil",
+    "Folder" : "Mapp",
+    "Image" : "Bild",
+    "Audio" : "Ljud",
+    "Saving..." : "Sparar...",
+    "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?",
+    "I know what I'm doing" : "Jag är säker på vad jag gör",
+    "Reset password" : "Återställ lösenordet",
+    "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
+    "No" : "Nej",
+    "Yes" : "Ja",
+    "Choose" : "Välj",
+    "Error loading file picker template: {error}" : "Fel uppstod för filväljarmall: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Fel uppstod under inläsningen av meddelandemallen: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} filkonflikt","{count} filkonflikter"],
+    "One file conflict" : "En filkonflikt",
+    "New Files" : "Nya filer",
+    "Already existing files" : "Filer som redan existerar",
+    "Which files do you want to keep?" : "Vilken fil vill du behålla?",
+    "If you select both versions, the copied file will have a number added to its name." : "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
+    "Cancel" : "Avbryt",
+    "Continue" : "Fortsätt",
+    "(all selected)" : "(Alla valda)",
+    "({count} selected)" : "({count} valda)",
+    "Error loading file exists template" : "Fel uppstod filmall existerar",
+    "Very weak password" : "Väldigt svagt lösenord",
+    "Weak password" : "Svagt lösenord",
+    "So-so password" : "Okej lösenord",
+    "Good password" : "Bra lösenord",
+    "Strong password" : "Starkt lösenord",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
+    "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." : "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner.",
+    "Error occurred while checking server setup" : "Ett fel inträffade när en kontroll utav servens setup gjordes",
+    "Shared" : "Delad",
+    "Shared with {recipients}" : "Delad med {recipients}",
+    "Share" : "Dela",
+    "Error" : "Fel",
+    "Error while sharing" : "Fel vid delning",
+    "Error while unsharing" : "Fel när delning skulle avslutas",
+    "Error while changing permissions" : "Fel vid ändring av rättigheter",
+    "Shared with you and the group {group} by {owner}" : "Delad med dig och gruppen {group} av {owner}",
+    "Shared with you by {owner}" : "Delad med dig av {owner}",
+    "Share with user or group …" : "Dela med användare eller grupp...",
+    "Share link" : "Dela länk",
+    "The public link will expire no later than {days} days after it is created" : "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
+    "Password protect" : "Lösenordsskydda",
+    "Choose a password for the public link" : "Välj ett lösenord för den publika länken",
+    "Allow Public Upload" : "Tillåt publik uppladdning",
+    "Email link to person" : "E-posta länk till person",
+    "Send" : "Skicka",
+    "Set expiration date" : "Sätt utgångsdatum",
+    "Expiration date" : "Utgångsdatum",
+    "Adding user..." : "Lägger till användare...",
+    "group" : "Grupp",
+    "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",
+    "can share" : "får dela",
+    "can edit" : "kan redigera",
+    "access control" : "åtkomstkontroll",
+    "create" : "skapa",
+    "update" : "uppdatera",
+    "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",
+    "Warning" : "Varning",
+    "The object type is not specified." : "Objekttypen är inte specificerad.",
+    "Enter new" : "Skriv nytt",
+    "Delete" : "Radera",
+    "Add" : "Lägg till",
+    "Edit tags" : "Editera taggar",
+    "Error loading dialog template: {error}" : "Fel under laddning utav dialog mall: {fel}",
+    "No tags selected for deletion." : "Inga taggar valda för borttagning.",
+    "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
+    "Please reload the page." : "Vänligen ladda om sidan.",
+    "The update was unsuccessful." : "Uppdateringen misslyckades.",
+    "The update was successful. Redirecting you to ownCloud now." : "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
+    "Couldn't reset password because the token is invalid" : "Kunde inte återställa lösenordet på grund av felaktig token",
+    "Couldn't send reset email. Please make sure your username is correct." : "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
+    "%s password reset" : "%s återställ lösenord",
+    "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
+    "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.",
+    "Username" : "Användarnamn",
+    "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?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
+    "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu",
+    "Reset" : "Återställ",
+    "New password" : "Nytt lösenord",
+    "New Password" : "Nytt lösenord",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
+    "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
+    "Personal" : "Personligt",
+    "Users" : "Användare",
+    "Apps" : "Program",
+    "Admin" : "Admin",
+    "Help" : "Hjälp",
+    "Error loading tags" : "Fel vid laddning utav taggar",
+    "Tag already exists" : "Tagg existerar redan",
+    "Error deleting tag(s)" : "Fel vid borttagning utav tagg(ar)",
+    "Error tagging" : "Fel taggning",
+    "Error untagging" : "Fel av taggning",
+    "Error favoriting" : "Fel favorisering",
+    "Error unfavoriting" : "Fel av favorisering ",
+    "Access forbidden" : "Åtkomst förbjuden",
+    "File not found" : "Filen kunde inte hittas",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
+    "The share will expire on %s." : "Utdelningen kommer att upphöra %s.",
+    "Cheers!" : "Ha de fint!",
+    "Security Warning" : "Säkerhetsvarning",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Var god uppdatera din PHP-installation för att använda %s säkert.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
+    "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
+    "Password" : "Lösenord",
+    "Storage & database" : "Lagring & databas",
+    "Data folder" : "Datamapp",
+    "Configure the database" : "Konfigurera databasen",
+    "Only %s is available." : "Endast %s är tillgänglig.",
+    "Database user" : "Databasanvändare",
+    "Database password" : "Lösenord till databasen",
+    "Database name" : "Databasnamn",
+    "Database tablespace" : "Databas tabellutrymme",
+    "Database host" : "Databasserver",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite kommer att användas som databas. För större installationer rekommenderar vi att du ändrar databastyp.",
+    "Finish setup" : "Avsluta installation",
+    "Finishing …" : "Avslutar ...",
+    "%s is available. Get more information on how to update." : "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
+    "Log out" : "Logga ut",
+    "Server side authentication failed!" : "Servern misslyckades med autentisering!",
+    "Please contact your administrator." : "Kontakta din administratör.",
+    "Forgot your password? Reset it!" : "Glömt ditt lösenord? Återställ det!",
+    "remember" : "kom ihåg",
+    "Log in" : "Logga in",
+    "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",
+    "This means only administrators can use the instance." : "Detta betyder att endast administartörer kan använda instansen.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
+    "Thank you for your patience." : "Tack för ditt tålamod.",
+    "You are accessing the server from an untrusted domain." : "Du ansluter till servern från en osäker domän.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
+    "Add \"%s\" as trusted domain" : "Lägg till \"%s\" som en trusted domain",
+    "%s will be updated to version %s." : "%s kommer att uppdateras till version %s.",
+    "The following apps will be disabled:" : "Följande appar kommer att inaktiveras:",
+    "The theme %s has been disabled." : "Temat  %s har blivit inaktiverat.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
+    "Start update" : "Starta uppdateringen"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
deleted file mode 100644
index 389fbd15758..00000000000
--- a/core/l10n/sv.php
+++ /dev/null
@@ -1,191 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Gick inte att skicka e-post till följande användare: %s",
-"Turned on maintenance mode" => "Aktiverade underhållsläge",
-"Turned off maintenance mode" => "Deaktiverade underhållsläge",
-"Updated database" => "Uppdaterade databasen",
-"Updated \"%s\" to %s" => "Uppdaterade \"%s\" till %s",
-"Disabled incompatible apps: %s" => "Inaktiverade inkompatibla appar: %s",
-"No image or file provided" => "Ingen bild eller fil har tillhandahållits",
-"Unknown filetype" => "Okänd filtyp",
-"Invalid image" => "Ogiltig bild",
-"No temporary profile picture available, try again" => "Ingen temporär profilbild finns tillgänglig, försök igen",
-"No crop data provided" => "Ingen beskärdata har angivits",
-"Sunday" => "Söndag",
-"Monday" => "Måndag",
-"Tuesday" => "Tisdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lördag",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mars",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Augusti",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"Settings" => "Inställningar",
-"File" => "Fil",
-"Folder" => "Mapp",
-"Image" => "Bild",
-"Audio" => "Ljud",
-"Saving..." => "Sparar...",
-"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?",
-"I know what I'm doing" => "Jag är säker på vad jag gör",
-"Reset password" => "Återställ lösenordet",
-"Password can not be changed. Please contact your administrator." => "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
-"No" => "Nej",
-"Yes" => "Ja",
-"Choose" => "Välj",
-"Error loading file picker template: {error}" => "Fel uppstod för filväljarmall: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Fel uppstod under inläsningen av meddelandemallen: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} filkonflikt","{count} filkonflikter"),
-"One file conflict" => "En filkonflikt",
-"New Files" => "Nya filer",
-"Already existing files" => "Filer som redan existerar",
-"Which files do you want to keep?" => "Vilken fil vill du behålla?",
-"If you select both versions, the copied file will have a number added to its name." => "Om du väljer båda versionerna kommer de kopierade filerna ha nummer tillagda i filnamnet.",
-"Cancel" => "Avbryt",
-"Continue" => "Fortsätt",
-"(all selected)" => "(Alla valda)",
-"({count} selected)" => "({count} valda)",
-"Error loading file exists template" => "Fel uppstod filmall existerar",
-"Very weak password" => "Väldigt svagt lösenord",
-"Weak password" => "Svagt lösenord",
-"So-so password" => "Okej lösenord",
-"Good password" => "Bra lösenord",
-"Strong password" => "Starkt lösenord",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Din webbserver är inte korrekt konfigurerad för att tillåta filsynkronisering eftersom WebDAV inte verkar fungera.",
-"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." => "Servern har ingen fungerande internetanslutning. Detta innebär att en del av de funktioner som montering av extern lagring, notifieringar om uppdateringar eller installation av 3: e part appar inte fungerar. Åtkomst till filer och skicka e-postmeddelanden fungerar troligen inte heller. Vi rekommenderar starkt att aktivera en internetuppkoppling för denna server om du vill ha alla funktioner.",
-"Error occurred while checking server setup" => "Ett fel inträffade när en kontroll utav servens setup gjordes",
-"Shared" => "Delad",
-"Shared with {recipients}" => "Delad med {recipients}",
-"Share" => "Dela",
-"Error" => "Fel",
-"Error while sharing" => "Fel vid delning",
-"Error while unsharing" => "Fel när delning skulle avslutas",
-"Error while changing permissions" => "Fel vid ändring av rättigheter",
-"Shared with you and the group {group} by {owner}" => "Delad med dig och gruppen {group} av {owner}",
-"Shared with you by {owner}" => "Delad med dig av {owner}",
-"Share with user or group …" => "Dela med användare eller grupp...",
-"Share link" => "Dela länk",
-"The public link will expire no later than {days} days after it is created" => "Den publika länken kommer sluta gälla inte senare än {days} dagar efter att den skapades",
-"Password protect" => "Lösenordsskydda",
-"Choose a password for the public link" => "Välj ett lösenord för den publika länken",
-"Allow Public Upload" => "Tillåt publik uppladdning",
-"Email link to person" => "E-posta länk till person",
-"Send" => "Skicka",
-"Set expiration date" => "Sätt utgångsdatum",
-"Expiration date" => "Utgångsdatum",
-"Adding user..." => "Lägger till användare...",
-"group" => "Grupp",
-"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",
-"can share" => "får dela",
-"can edit" => "kan redigera",
-"access control" => "åtkomstkontroll",
-"create" => "skapa",
-"update" => "uppdatera",
-"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",
-"Warning" => "Varning",
-"The object type is not specified." => "Objekttypen är inte specificerad.",
-"Enter new" => "Skriv nytt",
-"Delete" => "Radera",
-"Add" => "Lägg till",
-"Edit tags" => "Editera taggar",
-"Error loading dialog template: {error}" => "Fel under laddning utav dialog mall: {fel}",
-"No tags selected for deletion." => "Inga taggar valda för borttagning.",
-"Updating {productName} to version {version}, this may take a while." => "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
-"Please reload the page." => "Vänligen ladda om sidan.",
-"The update was unsuccessful." => "Uppdateringen misslyckades.",
-"The update was successful. Redirecting you to ownCloud now." => "Uppdateringen lyckades. Du omdirigeras nu till OwnCloud.",
-"Couldn't reset password because the token is invalid" => "Kunde inte återställa lösenordet på grund av felaktig token",
-"Couldn't send reset email. Please make sure your username is correct." => "Kunde inte skicka återställningsmail. Vänligen kontrollera att ditt användarnamn är korrekt.",
-"Couldn't send reset email because there is no email address for this username. Please contact your administrator." => "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
-"%s password reset" => "%s återställ lösenord",
-"Use the following link to reset your password: {link}" => "Använd följande länk för att återställa lösenordet: {link}",
-"You will receive a link to reset your password via Email." => "Du får en länk att återställa ditt lösenord via e-post.",
-"Username" => "Användarnamn",
-"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?" => "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
-"Yes, I really want to reset my password now" => "Ja, jag vill verkligen återställa mitt lösenord nu",
-"Reset" => "Återställ",
-"New password" => "Nytt lösenord",
-"New Password" => "Nytt lösenord",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
-"For the best results, please consider using a GNU/Linux server instead." => "För bästa resultat, överväg att använda en GNU/Linux server istället.",
-"Personal" => "Personligt",
-"Users" => "Användare",
-"Apps" => "Program",
-"Admin" => "Admin",
-"Help" => "Hjälp",
-"Error loading tags" => "Fel vid laddning utav taggar",
-"Tag already exists" => "Tagg existerar redan",
-"Error deleting tag(s)" => "Fel vid borttagning utav tagg(ar)",
-"Error tagging" => "Fel taggning",
-"Error untagging" => "Fel av taggning",
-"Error favoriting" => "Fel favorisering",
-"Error unfavoriting" => "Fel av favorisering ",
-"Access forbidden" => "Åtkomst förbjuden",
-"File not found" => "Filen kunde inte hittas",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Hej där!,\n\nVi vill bara meddela att %s delade %s med dig.\nTitta på den här: %s\n\n",
-"The share will expire on %s." => "Utdelningen kommer att upphöra %s.",
-"Cheers!" => "Ha de fint!",
-"Security Warning" => "Säkerhetsvarning",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Din version av PHP är sårbar för NULL byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Var god uppdatera din PHP-installation för att använda %s säkert.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
-"Create an <strong>admin account</strong>" => "Skapa ett <strong>administratörskonto</strong>",
-"Password" => "Lösenord",
-"Storage & database" => "Lagring & databas",
-"Data folder" => "Datamapp",
-"Configure the database" => "Konfigurera databasen",
-"Only %s is available." => "Endast %s är tillgänglig.",
-"Database user" => "Databasanvändare",
-"Database password" => "Lösenord till databasen",
-"Database name" => "Databasnamn",
-"Database tablespace" => "Databas tabellutrymme",
-"Database host" => "Databasserver",
-"SQLite will be used as database. For larger installations we recommend to change this." => "SQLite kommer att användas som databas. För större installationer rekommenderar vi att du ändrar databastyp.",
-"Finish setup" => "Avsluta installation",
-"Finishing …" => "Avslutar ...",
-"%s is available. Get more information on how to update." => "%s är tillgänglig. Få mer information om hur du går tillväga för att uppdatera.",
-"Log out" => "Logga ut",
-"Server side authentication failed!" => "Servern misslyckades med autentisering!",
-"Please contact your administrator." => "Kontakta din administratör.",
-"Forgot your password? Reset it!" => "Glömt ditt lösenord? Återställ det!",
-"remember" => "kom ihåg",
-"Log in" => "Logga in",
-"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",
-"This means only administrators can use the instance." => "Detta betyder att endast administartörer kan använda instansen.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Hör av dig till din system administratör ifall detta meddelande fortsätter eller visas oväntat.",
-"Thank you for your patience." => "Tack för ditt tålamod.",
-"You are accessing the server from an untrusted domain." => "Du ansluter till servern från en osäker domän.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Vänligen kontakta din administratör. Om du är en administratör, konfigurera inställningen \"trusted_domain\" i  config/config.php. En exempelkonfiguration finns i tillgänglig i config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Beroende på din konfiguartion, så finns det möjlighet att du som administratör kan använda knappen nedan för att verifiera på denna domän.",
-"Add \"%s\" as trusted domain" => "Lägg till \"%s\" som en trusted domain",
-"%s will be updated to version %s." => "%s kommer att uppdateras till version %s.",
-"The following apps will be disabled:" => "Följande appar kommer att inaktiveras:",
-"The theme %s has been disabled." => "Temat  %s har blivit inaktiverat.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Vänligen säkerställ att en säkerhetskopia har gjorts av databasen, konfigurations- och datamappen innan du fortsätter.",
-"Start update" => "Starta uppdateringen"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sw_KE.js b/core/l10n/sw_KE.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/sw_KE.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sw_KE.json b/core/l10n/sw_KE.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/sw_KE.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/sw_KE.php b/core/l10n/sw_KE.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/sw_KE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ta_IN.js b/core/l10n/ta_IN.js
new file mode 100644
index 00000000000..eaa7584de0e
--- /dev/null
+++ b/core/l10n/ta_IN.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "core",
+    {
+    "Settings" : "அமைப்புகள்",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Send" : "அனுப்பவும்"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_IN.json b/core/l10n/ta_IN.json
new file mode 100644
index 00000000000..0bfa5f4eed1
--- /dev/null
+++ b/core/l10n/ta_IN.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Settings" : "அமைப்புகள்",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Send" : "அனுப்பவும்"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ta_IN.php b/core/l10n/ta_IN.php
deleted file mode 100644
index f363cf0c9bf..00000000000
--- a/core/l10n/ta_IN.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "அமைப்புகள்",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Send" => "அனுப்பவும்"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
new file mode 100644
index 00000000000..af71be68cfa
--- /dev/null
+++ b/core/l10n/ta_LK.js
@@ -0,0 +1,84 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "ஞாயிற்றுக்கிழமை",
+    "Monday" : "திங்கட்கிழமை",
+    "Tuesday" : "செவ்வாய்க்கிழமை",
+    "Wednesday" : "புதன்கிழமை",
+    "Thursday" : "வியாழக்கிழமை",
+    "Friday" : "வெள்ளிக்கிழமை",
+    "Saturday" : "சனிக்கிழமை",
+    "January" : "தை",
+    "February" : "மாசி",
+    "March" : "பங்குனி",
+    "April" : "சித்திரை",
+    "May" : "வைகாசி",
+    "June" : "ஆனி",
+    "July" : "ஆடி",
+    "August" : "ஆவணி",
+    "September" : "புரட்டாசி",
+    "October" : "ஐப்பசி",
+    "November" : "கார்த்திகை",
+    "December" : "மார்கழி",
+    "Settings" : "அமைப்புகள்",
+    "Folder" : "கோப்புறை",
+    "Saving..." : "சேமிக்கப்படுகிறது...",
+    "Reset password" : "மீளமைத்த கடவுச்சொல்",
+    "No" : "இல்லை",
+    "Yes" : "ஆம்",
+    "Choose" : "தெரிவுசெய்க ",
+    "Ok" : "சரி",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "இரத்து செய்க",
+    "Share" : "பகிர்வு",
+    "Error" : "வழு",
+    "Error while sharing" : "பகிரும் போதான வழு",
+    "Error while unsharing" : "பகிராமல் உள்ளப்போதான வழு",
+    "Error while changing permissions" : "அனுமதிகள் மாறும்போதான வழு",
+    "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
+    "Set expiration date" : "காலாவதி தேதியை குறிப்பிடுக",
+    "Expiration date" : "காலவதியாகும் திகதி",
+    "group" : "குழு",
+    "Resharing is not allowed" : "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
+    "Shared in {item} with {user}" : "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
+    "Unshare" : "பகிரப்படாதது",
+    "can edit" : "தொகுக்க முடியும்",
+    "access control" : "கட்டுப்பாடான அணுகல்",
+    "create" : "உருவவாக்கல்",
+    "update" : "இற்றைப்படுத்தல்",
+    "delete" : "நீக்குக",
+    "Password protected" : "கடவுச்சொல் பாதுகாக்கப்பட்டது",
+    "Error unsetting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
+    "Error setting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
+    "Warning" : "எச்சரிக்கை",
+    "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
+    "Delete" : "நீக்குக",
+    "Add" : "சேர்க்க",
+    "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
+    "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
+    "Username" : "பயனாளர் பெயர்",
+    "New password" : "புதிய கடவுச்சொல்",
+    "Personal" : "தனிப்பட்ட",
+    "Users" : "பயனாளர்",
+    "Apps" : "செயலிகள்",
+    "Admin" : "நிர்வாகம்",
+    "Help" : "உதவி",
+    "Access forbidden" : "அணுக தடை",
+    "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
+    "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+    "Password" : "கடவுச்சொல்",
+    "Data folder" : "தரவு கோப்புறை",
+    "Configure the database" : "தரவுத்தளத்தை தகவமைக்க",
+    "Database user" : "தரவுத்தள பயனாளர்",
+    "Database password" : "தரவுத்தள கடவுச்சொல்",
+    "Database name" : "தரவுத்தள பெயர்",
+    "Database tablespace" : "தரவுத்தள அட்டவணை",
+    "Database host" : "தரவுத்தள ஓம்புனர்",
+    "Finish setup" : "அமைப்பை முடிக்க",
+    "Log out" : "விடுபதிகை செய்க",
+    "remember" : "ஞாபகப்படுத்துக",
+    "Log in" : "புகுபதிகை"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
new file mode 100644
index 00000000000..079bdb64147
--- /dev/null
+++ b/core/l10n/ta_LK.json
@@ -0,0 +1,82 @@
+{ "translations": {
+    "Sunday" : "ஞாயிற்றுக்கிழமை",
+    "Monday" : "திங்கட்கிழமை",
+    "Tuesday" : "செவ்வாய்க்கிழமை",
+    "Wednesday" : "புதன்கிழமை",
+    "Thursday" : "வியாழக்கிழமை",
+    "Friday" : "வெள்ளிக்கிழமை",
+    "Saturday" : "சனிக்கிழமை",
+    "January" : "தை",
+    "February" : "மாசி",
+    "March" : "பங்குனி",
+    "April" : "சித்திரை",
+    "May" : "வைகாசி",
+    "June" : "ஆனி",
+    "July" : "ஆடி",
+    "August" : "ஆவணி",
+    "September" : "புரட்டாசி",
+    "October" : "ஐப்பசி",
+    "November" : "கார்த்திகை",
+    "December" : "மார்கழி",
+    "Settings" : "அமைப்புகள்",
+    "Folder" : "கோப்புறை",
+    "Saving..." : "சேமிக்கப்படுகிறது...",
+    "Reset password" : "மீளமைத்த கடவுச்சொல்",
+    "No" : "இல்லை",
+    "Yes" : "ஆம்",
+    "Choose" : "தெரிவுசெய்க ",
+    "Ok" : "சரி",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "இரத்து செய்க",
+    "Share" : "பகிர்வு",
+    "Error" : "வழு",
+    "Error while sharing" : "பகிரும் போதான வழு",
+    "Error while unsharing" : "பகிராமல் உள்ளப்போதான வழு",
+    "Error while changing permissions" : "அனுமதிகள் மாறும்போதான வழு",
+    "Shared with you and the group {group} by {owner}" : "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Shared with you by {owner}" : "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
+    "Password protect" : "கடவுச்சொல்லை பாதுகாத்தல்",
+    "Set expiration date" : "காலாவதி தேதியை குறிப்பிடுக",
+    "Expiration date" : "காலவதியாகும் திகதி",
+    "group" : "குழு",
+    "Resharing is not allowed" : "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
+    "Shared in {item} with {user}" : "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
+    "Unshare" : "பகிரப்படாதது",
+    "can edit" : "தொகுக்க முடியும்",
+    "access control" : "கட்டுப்பாடான அணுகல்",
+    "create" : "உருவவாக்கல்",
+    "update" : "இற்றைப்படுத்தல்",
+    "delete" : "நீக்குக",
+    "Password protected" : "கடவுச்சொல் பாதுகாக்கப்பட்டது",
+    "Error unsetting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
+    "Error setting expiration date" : "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
+    "Warning" : "எச்சரிக்கை",
+    "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
+    "Delete" : "நீக்குக",
+    "Add" : "சேர்க்க",
+    "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
+    "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
+    "Username" : "பயனாளர் பெயர்",
+    "New password" : "புதிய கடவுச்சொல்",
+    "Personal" : "தனிப்பட்ட",
+    "Users" : "பயனாளர்",
+    "Apps" : "செயலிகள்",
+    "Admin" : "நிர்வாகம்",
+    "Help" : "உதவி",
+    "Access forbidden" : "அணுக தடை",
+    "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
+    "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+    "Password" : "கடவுச்சொல்",
+    "Data folder" : "தரவு கோப்புறை",
+    "Configure the database" : "தரவுத்தளத்தை தகவமைக்க",
+    "Database user" : "தரவுத்தள பயனாளர்",
+    "Database password" : "தரவுத்தள கடவுச்சொல்",
+    "Database name" : "தரவுத்தள பெயர்",
+    "Database tablespace" : "தரவுத்தள அட்டவணை",
+    "Database host" : "தரவுத்தள ஓம்புனர்",
+    "Finish setup" : "அமைப்பை முடிக்க",
+    "Log out" : "விடுபதிகை செய்க",
+    "remember" : "ஞாபகப்படுத்துக",
+    "Log in" : "புகுபதிகை"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
deleted file mode 100644
index 30262c1fbf8..00000000000
--- a/core/l10n/ta_LK.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "ஞாயிற்றுக்கிழமை",
-"Monday" => "திங்கட்கிழமை",
-"Tuesday" => "செவ்வாய்க்கிழமை",
-"Wednesday" => "புதன்கிழமை",
-"Thursday" => "வியாழக்கிழமை",
-"Friday" => "வெள்ளிக்கிழமை",
-"Saturday" => "சனிக்கிழமை",
-"January" => "தை",
-"February" => "மாசி",
-"March" => "பங்குனி",
-"April" => "சித்திரை",
-"May" => "வைகாசி",
-"June" => "ஆனி",
-"July" => "ஆடி",
-"August" => "ஆவணி",
-"September" => "புரட்டாசி",
-"October" => "ஐப்பசி",
-"November" => "கார்த்திகை",
-"December" => "மார்கழி",
-"Settings" => "அமைப்புகள்",
-"Folder" => "கோப்புறை",
-"Saving..." => "சேமிக்கப்படுகிறது...",
-"Reset password" => "மீளமைத்த கடவுச்சொல்",
-"No" => "இல்லை",
-"Yes" => "ஆம்",
-"Choose" => "தெரிவுசெய்க ",
-"Ok" => "சரி",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "இரத்து செய்க",
-"Share" => "பகிர்வு",
-"Error" => "வழு",
-"Error while sharing" => "பகிரும் போதான வழு",
-"Error while unsharing" => "பகிராமல் உள்ளப்போதான வழு",
-"Error while changing permissions" => "அனுமதிகள் மாறும்போதான வழு",
-"Shared with you and the group {group} by {owner}" => "உங்களுடனும் குழுவுக்கிடையிலும் {குழு} பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-"Shared with you by {owner}" => "உங்களுடன் பகிரப்பட்டுள்ளது {உரிமையாளர்}",
-"Password protect" => "கடவுச்சொல்லை பாதுகாத்தல்",
-"Set expiration date" => "காலாவதி தேதியை குறிப்பிடுக",
-"Expiration date" => "காலவதியாகும் திகதி",
-"group" => "குழு",
-"Resharing is not allowed" => "மீள்பகிர்வதற்கு அனுமதி இல்லை ",
-"Shared in {item} with {user}" => "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது",
-"Unshare" => "பகிரப்படாதது",
-"can edit" => "தொகுக்க முடியும்",
-"access control" => "கட்டுப்பாடான அணுகல்",
-"create" => "உருவவாக்கல்",
-"update" => "இற்றைப்படுத்தல்",
-"delete" => "நீக்குக",
-"Password protected" => "கடவுச்சொல் பாதுகாக்கப்பட்டது",
-"Error unsetting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு",
-"Error setting expiration date" => "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு",
-"Warning" => "எச்சரிக்கை",
-"The object type is not specified." => "பொருள் வகை குறிப்பிடப்படவில்லை.",
-"Delete" => "நீக்குக",
-"Add" => "சேர்க்க",
-"Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
-"You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-"Username" => "பயனாளர் பெயர்",
-"New password" => "புதிய கடவுச்சொல்",
-"Personal" => "தனிப்பட்ட",
-"Users" => "பயனாளர்",
-"Apps" => "செயலிகள்",
-"Admin" => "நிர்வாகம்",
-"Help" => "உதவி",
-"Access forbidden" => "அணுக தடை",
-"Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
-"Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
-"Password" => "கடவுச்சொல்",
-"Data folder" => "தரவு கோப்புறை",
-"Configure the database" => "தரவுத்தளத்தை தகவமைக்க",
-"Database user" => "தரவுத்தள பயனாளர்",
-"Database password" => "தரவுத்தள கடவுச்சொல்",
-"Database name" => "தரவுத்தள பெயர்",
-"Database tablespace" => "தரவுத்தள அட்டவணை",
-"Database host" => "தரவுத்தள ஓம்புனர்",
-"Finish setup" => "அமைப்பை முடிக்க",
-"Log out" => "விடுபதிகை செய்க",
-"remember" => "ஞாபகப்படுத்துக",
-"Log in" => "புகுபதிகை"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/te.js b/core/l10n/te.js
new file mode 100644
index 00000000000..e6490dc40f7
--- /dev/null
+++ b/core/l10n/te.js
@@ -0,0 +1,46 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "ఆదివారం",
+    "Monday" : "సోమవారం",
+    "Tuesday" : "మంగళవారం",
+    "Wednesday" : "బుధవారం",
+    "Thursday" : "గురువారం",
+    "Friday" : "శుక్రవారం",
+    "Saturday" : "శనివారం",
+    "January" : "జనవరి",
+    "February" : "ఫిబ్రవరి",
+    "March" : "మార్చి",
+    "April" : "ఏప్రిల్",
+    "May" : "మే",
+    "June" : "జూన్",
+    "July" : "జూలై",
+    "August" : "ఆగస్ట్",
+    "September" : "సెప్టెంబర్",
+    "October" : "అక్టోబర్",
+    "November" : "నవంబర్",
+    "December" : "డిసెంబర్",
+    "Settings" : "అమరికలు",
+    "Folder" : "సంచయం",
+    "No" : "కాదు",
+    "Yes" : "అవును",
+    "Ok" : "సరే",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "రద్దుచేయి",
+    "Continue" : "కొనసాగించు",
+    "Error" : "పొరపాటు",
+    "Send" : "పంపించు",
+    "Expiration date" : "కాలం చెల్లు తేదీ",
+    "delete" : "తొలగించు",
+    "Warning" : "హెచ్చరిక",
+    "Delete" : "తొలగించు",
+    "Add" : "చేర్చు",
+    "Username" : "వాడుకరి పేరు",
+    "New password" : "కొత్త సంకేతపదం",
+    "Personal" : "వ్యక్తిగతం",
+    "Users" : "వాడుకరులు",
+    "Help" : "సహాయం",
+    "Password" : "సంకేతపదం",
+    "Log out" : "నిష్క్రమించు"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/te.json b/core/l10n/te.json
new file mode 100644
index 00000000000..e3bd9a50496
--- /dev/null
+++ b/core/l10n/te.json
@@ -0,0 +1,44 @@
+{ "translations": {
+    "Sunday" : "ఆదివారం",
+    "Monday" : "సోమవారం",
+    "Tuesday" : "మంగళవారం",
+    "Wednesday" : "బుధవారం",
+    "Thursday" : "గురువారం",
+    "Friday" : "శుక్రవారం",
+    "Saturday" : "శనివారం",
+    "January" : "జనవరి",
+    "February" : "ఫిబ్రవరి",
+    "March" : "మార్చి",
+    "April" : "ఏప్రిల్",
+    "May" : "మే",
+    "June" : "జూన్",
+    "July" : "జూలై",
+    "August" : "ఆగస్ట్",
+    "September" : "సెప్టెంబర్",
+    "October" : "అక్టోబర్",
+    "November" : "నవంబర్",
+    "December" : "డిసెంబర్",
+    "Settings" : "అమరికలు",
+    "Folder" : "సంచయం",
+    "No" : "కాదు",
+    "Yes" : "అవును",
+    "Ok" : "సరే",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Cancel" : "రద్దుచేయి",
+    "Continue" : "కొనసాగించు",
+    "Error" : "పొరపాటు",
+    "Send" : "పంపించు",
+    "Expiration date" : "కాలం చెల్లు తేదీ",
+    "delete" : "తొలగించు",
+    "Warning" : "హెచ్చరిక",
+    "Delete" : "తొలగించు",
+    "Add" : "చేర్చు",
+    "Username" : "వాడుకరి పేరు",
+    "New password" : "కొత్త సంకేతపదం",
+    "Personal" : "వ్యక్తిగతం",
+    "Users" : "వాడుకరులు",
+    "Help" : "సహాయం",
+    "Password" : "సంకేతపదం",
+    "Log out" : "నిష్క్రమించు"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/te.php b/core/l10n/te.php
deleted file mode 100644
index c8b742c8c90..00000000000
--- a/core/l10n/te.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "ఆదివారం",
-"Monday" => "సోమవారం",
-"Tuesday" => "మంగళవారం",
-"Wednesday" => "బుధవారం",
-"Thursday" => "గురువారం",
-"Friday" => "శుక్రవారం",
-"Saturday" => "శనివారం",
-"January" => "జనవరి",
-"February" => "ఫిబ్రవరి",
-"March" => "మార్చి",
-"April" => "ఏప్రిల్",
-"May" => "మే",
-"June" => "జూన్",
-"July" => "జూలై",
-"August" => "ఆగస్ట్",
-"September" => "సెప్టెంబర్",
-"October" => "అక్టోబర్",
-"November" => "నవంబర్",
-"December" => "డిసెంబర్",
-"Settings" => "అమరికలు",
-"Folder" => "సంచయం",
-"No" => "కాదు",
-"Yes" => "అవును",
-"Ok" => "సరే",
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Cancel" => "రద్దుచేయి",
-"Continue" => "కొనసాగించు",
-"Error" => "పొరపాటు",
-"Send" => "పంపించు",
-"Expiration date" => "కాలం చెల్లు తేదీ",
-"delete" => "తొలగించు",
-"Warning" => "హెచ్చరిక",
-"Delete" => "తొలగించు",
-"Add" => "చేర్చు",
-"Username" => "వాడుకరి పేరు",
-"New password" => "కొత్త సంకేతపదం",
-"Personal" => "వ్యక్తిగతం",
-"Users" => "వాడుకరులు",
-"Help" => "సహాయం",
-"Password" => "సంకేతపదం",
-"Log out" => "నిష్క్రమించు"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/tg_TJ.js b/core/l10n/tg_TJ.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/tg_TJ.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/tg_TJ.json b/core/l10n/tg_TJ.json
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/tg_TJ.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/tg_TJ.php b/core/l10n/tg_TJ.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/tg_TJ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
new file mode 100644
index 00000000000..25203866731
--- /dev/null
+++ b/core/l10n/th_TH.js
@@ -0,0 +1,93 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "วันอาทิตย์",
+    "Monday" : "วันจันทร์",
+    "Tuesday" : "วันอังคาร",
+    "Wednesday" : "วันพุธ",
+    "Thursday" : "วันพฤหัสบดี",
+    "Friday" : "วันศุกร์",
+    "Saturday" : "วันเสาร์",
+    "January" : "มกราคม",
+    "February" : "กุมภาพันธ์",
+    "March" : "มีนาคม",
+    "April" : "เมษายน",
+    "May" : "พฤษภาคม",
+    "June" : "มิถุนายน",
+    "July" : "กรกฏาคม",
+    "August" : "สิงหาคม",
+    "September" : "กันยายน",
+    "October" : "ตุลาคม",
+    "November" : "พฤศจิกายน",
+    "December" : "ธันวาคม",
+    "Settings" : "ตั้งค่า",
+    "Folder" : "แฟ้มเอกสาร",
+    "Image" : "รูปภาพ",
+    "Saving..." : "กำลังบันทึกข้อมูล...",
+    "Reset password" : "เปลี่ยนรหัสผ่าน",
+    "No" : "ไม่ตกลง",
+    "Yes" : "ตกลง",
+    "Choose" : "เลือก",
+    "Ok" : "ตกลง",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ไฟล์ใหม่",
+    "Cancel" : "ยกเลิก",
+    "Shared" : "แชร์แล้ว",
+    "Share" : "แชร์",
+    "Error" : "ข้อผิดพลาด",
+    "Error while sharing" : "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
+    "Error while unsharing" : "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
+    "Error while changing permissions" : "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
+    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
+    "Password protect" : "ใส่รหัสผ่านไว้",
+    "Email link to person" : "ส่งลิงก์ให้ทางอีเมล",
+    "Send" : "ส่ง",
+    "Set expiration date" : "กำหนดวันที่หมดอายุ",
+    "Expiration date" : "วันที่หมดอายุ",
+    "group" : "กลุ่มผู้ใช้งาน",
+    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
+    "Shared in {item} with {user}" : "ได้แชร์ {item} ให้กับ {user}",
+    "Unshare" : "ยกเลิกการแชร์",
+    "can share" : "สามารถแชร์ได้",
+    "can edit" : "สามารถแก้ไข",
+    "access control" : "ระดับควบคุมการเข้าใช้งาน",
+    "create" : "สร้าง",
+    "update" : "อัพเดท",
+    "delete" : "ลบ",
+    "Password protected" : "ใส่รหัสผ่านไว้",
+    "Error unsetting expiration date" : "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
+    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
+    "Sending ..." : "กำลังส่ง...",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "Warning" : "คำเตือน",
+    "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
+    "Delete" : "ลบ",
+    "Add" : "เพิ่ม",
+    "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
+    "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
+    "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "New password" : "รหัสผ่านใหม่",
+    "Personal" : "ส่วนตัว",
+    "Users" : "ผู้ใช้งาน",
+    "Apps" : "แอปฯ",
+    "Admin" : "ผู้ดูแล",
+    "Help" : "ช่วยเหลือ",
+    "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
+    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
+    "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Password" : "รหัสผ่าน",
+    "Data folder" : "โฟลเดอร์เก็บข้อมูล",
+    "Configure the database" : "กำหนดค่าฐานข้อมูล",
+    "Database user" : "ชื่อผู้ใช้งานฐานข้อมูล",
+    "Database password" : "รหัสผ่านฐานข้อมูล",
+    "Database name" : "ชื่อฐานข้อมูล",
+    "Database tablespace" : "พื้นที่ตารางในฐานข้อมูล",
+    "Database host" : "Database host",
+    "Finish setup" : "ติดตั้งเรียบร้อยแล้ว",
+    "Log out" : "ออกจากระบบ",
+    "remember" : "จำรหัสผ่าน",
+    "Log in" : "เข้าสู่ระบบ"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
new file mode 100644
index 00000000000..94c2c6f0c62
--- /dev/null
+++ b/core/l10n/th_TH.json
@@ -0,0 +1,91 @@
+{ "translations": {
+    "Sunday" : "วันอาทิตย์",
+    "Monday" : "วันจันทร์",
+    "Tuesday" : "วันอังคาร",
+    "Wednesday" : "วันพุธ",
+    "Thursday" : "วันพฤหัสบดี",
+    "Friday" : "วันศุกร์",
+    "Saturday" : "วันเสาร์",
+    "January" : "มกราคม",
+    "February" : "กุมภาพันธ์",
+    "March" : "มีนาคม",
+    "April" : "เมษายน",
+    "May" : "พฤษภาคม",
+    "June" : "มิถุนายน",
+    "July" : "กรกฏาคม",
+    "August" : "สิงหาคม",
+    "September" : "กันยายน",
+    "October" : "ตุลาคม",
+    "November" : "พฤศจิกายน",
+    "December" : "ธันวาคม",
+    "Settings" : "ตั้งค่า",
+    "Folder" : "แฟ้มเอกสาร",
+    "Image" : "รูปภาพ",
+    "Saving..." : "กำลังบันทึกข้อมูล...",
+    "Reset password" : "เปลี่ยนรหัสผ่าน",
+    "No" : "ไม่ตกลง",
+    "Yes" : "ตกลง",
+    "Choose" : "เลือก",
+    "Ok" : "ตกลง",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "New Files" : "ไฟล์ใหม่",
+    "Cancel" : "ยกเลิก",
+    "Shared" : "แชร์แล้ว",
+    "Share" : "แชร์",
+    "Error" : "ข้อผิดพลาด",
+    "Error while sharing" : "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
+    "Error while unsharing" : "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
+    "Error while changing permissions" : "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
+    "Shared with you and the group {group} by {owner}" : "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
+    "Shared with you by {owner}" : "ถูกแชร์ให้กับคุณโดย {owner}",
+    "Password protect" : "ใส่รหัสผ่านไว้",
+    "Email link to person" : "ส่งลิงก์ให้ทางอีเมล",
+    "Send" : "ส่ง",
+    "Set expiration date" : "กำหนดวันที่หมดอายุ",
+    "Expiration date" : "วันที่หมดอายุ",
+    "group" : "กลุ่มผู้ใช้งาน",
+    "Resharing is not allowed" : "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
+    "Shared in {item} with {user}" : "ได้แชร์ {item} ให้กับ {user}",
+    "Unshare" : "ยกเลิกการแชร์",
+    "can share" : "สามารถแชร์ได้",
+    "can edit" : "สามารถแก้ไข",
+    "access control" : "ระดับควบคุมการเข้าใช้งาน",
+    "create" : "สร้าง",
+    "update" : "อัพเดท",
+    "delete" : "ลบ",
+    "Password protected" : "ใส่รหัสผ่านไว้",
+    "Error unsetting expiration date" : "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
+    "Error setting expiration date" : "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
+    "Sending ..." : "กำลังส่ง...",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "Warning" : "คำเตือน",
+    "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
+    "Delete" : "ลบ",
+    "Add" : "เพิ่ม",
+    "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
+    "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
+    "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "New password" : "รหัสผ่านใหม่",
+    "Personal" : "ส่วนตัว",
+    "Users" : "ผู้ใช้งาน",
+    "Apps" : "แอปฯ",
+    "Admin" : "ผู้ดูแล",
+    "Help" : "ช่วยเหลือ",
+    "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
+    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
+    "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Password" : "รหัสผ่าน",
+    "Data folder" : "โฟลเดอร์เก็บข้อมูล",
+    "Configure the database" : "กำหนดค่าฐานข้อมูล",
+    "Database user" : "ชื่อผู้ใช้งานฐานข้อมูล",
+    "Database password" : "รหัสผ่านฐานข้อมูล",
+    "Database name" : "ชื่อฐานข้อมูล",
+    "Database tablespace" : "พื้นที่ตารางในฐานข้อมูล",
+    "Database host" : "Database host",
+    "Finish setup" : "ติดตั้งเรียบร้อยแล้ว",
+    "Log out" : "ออกจากระบบ",
+    "remember" : "จำรหัสผ่าน",
+    "Log in" : "เข้าสู่ระบบ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
deleted file mode 100644
index c27fbe4c335..00000000000
--- a/core/l10n/th_TH.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "วันอาทิตย์",
-"Monday" => "วันจันทร์",
-"Tuesday" => "วันอังคาร",
-"Wednesday" => "วันพุธ",
-"Thursday" => "วันพฤหัสบดี",
-"Friday" => "วันศุกร์",
-"Saturday" => "วันเสาร์",
-"January" => "มกราคม",
-"February" => "กุมภาพันธ์",
-"March" => "มีนาคม",
-"April" => "เมษายน",
-"May" => "พฤษภาคม",
-"June" => "มิถุนายน",
-"July" => "กรกฏาคม",
-"August" => "สิงหาคม",
-"September" => "กันยายน",
-"October" => "ตุลาคม",
-"November" => "พฤศจิกายน",
-"December" => "ธันวาคม",
-"Settings" => "ตั้งค่า",
-"Folder" => "แฟ้มเอกสาร",
-"Image" => "รูปภาพ",
-"Saving..." => "กำลังบันทึกข้อมูล...",
-"Reset password" => "เปลี่ยนรหัสผ่าน",
-"No" => "ไม่ตกลง",
-"Yes" => "ตกลง",
-"Choose" => "เลือก",
-"Ok" => "ตกลง",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"New Files" => "ไฟล์ใหม่",
-"Cancel" => "ยกเลิก",
-"Shared" => "แชร์แล้ว",
-"Share" => "แชร์",
-"Error" => "ข้อผิดพลาด",
-"Error while sharing" => "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล",
-"Error while unsharing" => "เกิดข้อผิดพลาดในการยกเลิกการแชร์ข้อมูล",
-"Error while changing permissions" => "เกิดข้อผิดพลาดในการเปลี่ยนสิทธิ์การเข้าใช้งาน",
-"Shared with you and the group {group} by {owner}" => "ได้แชร์ให้กับคุณ และกลุ่ม {group} โดย {owner}",
-"Shared with you by {owner}" => "ถูกแชร์ให้กับคุณโดย {owner}",
-"Password protect" => "ใส่รหัสผ่านไว้",
-"Email link to person" => "ส่งลิงก์ให้ทางอีเมล",
-"Send" => "ส่ง",
-"Set expiration date" => "กำหนดวันที่หมดอายุ",
-"Expiration date" => "วันที่หมดอายุ",
-"group" => "กลุ่มผู้ใช้งาน",
-"Resharing is not allowed" => "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้",
-"Shared in {item} with {user}" => "ได้แชร์ {item} ให้กับ {user}",
-"Unshare" => "ยกเลิกการแชร์",
-"can share" => "สามารถแชร์ได้",
-"can edit" => "สามารถแก้ไข",
-"access control" => "ระดับควบคุมการเข้าใช้งาน",
-"create" => "สร้าง",
-"update" => "อัพเดท",
-"delete" => "ลบ",
-"Password protected" => "ใส่รหัสผ่านไว้",
-"Error unsetting expiration date" => "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ",
-"Error setting expiration date" => "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ",
-"Sending ..." => "กำลังส่ง...",
-"Email sent" => "ส่งอีเมล์แล้ว",
-"Warning" => "คำเตือน",
-"The object type is not specified." => "ชนิดของวัตถุยังไม่ได้รับการระบุ",
-"Delete" => "ลบ",
-"Add" => "เพิ่ม",
-"The update was successful. Redirecting you to ownCloud now." => "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
-"Use the following link to reset your password: {link}" => "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
-"You will receive a link to reset your password via Email." => "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-"Username" => "ชื่อผู้ใช้งาน",
-"New password" => "รหัสผ่านใหม่",
-"Personal" => "ส่วนตัว",
-"Users" => "ผู้ใช้งาน",
-"Apps" => "แอปฯ",
-"Admin" => "ผู้ดูแล",
-"Help" => "ช่วยเหลือ",
-"Access forbidden" => "การเข้าถึงถูกหวงห้าม",
-"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
-"Create an <strong>admin account</strong>" => "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
-"Password" => "รหัสผ่าน",
-"Data folder" => "โฟลเดอร์เก็บข้อมูล",
-"Configure the database" => "กำหนดค่าฐานข้อมูล",
-"Database user" => "ชื่อผู้ใช้งานฐานข้อมูล",
-"Database password" => "รหัสผ่านฐานข้อมูล",
-"Database name" => "ชื่อฐานข้อมูล",
-"Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
-"Database host" => "Database host",
-"Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
-"Log out" => "ออกจากระบบ",
-"remember" => "จำรหัสผ่าน",
-"Log in" => "เข้าสู่ระบบ"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/tl_PH.js b/core/l10n/tl_PH.js
new file mode 100644
index 00000000000..bc4e6c6bc64
--- /dev/null
+++ b/core/l10n/tl_PH.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/tl_PH.json b/core/l10n/tl_PH.json
new file mode 100644
index 00000000000..4ebc0d2d45d
--- /dev/null
+++ b/core/l10n/tl_PH.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/tl_PH.php b/core/l10n/tl_PH.php
deleted file mode 100644
index e012fb1656e..00000000000
--- a/core/l10n/tl_PH.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
new file mode 100644
index 00000000000..607d766c3fa
--- /dev/null
+++ b/core/l10n/tr.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
+    "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
+    "Turned off maintenance mode" : "Bakım kipi kapatıldı",
+    "Updated database" : "Veritabanı güncellendi",
+    "Checked database schema update" : "Veritabanı şema güncellemesi denetlendi",
+    "Checked database schema update for apps" : "Uygulamalar için veritabanı şema güncellemesi denetlendi",
+    "Updated \"%s\" to %s" : "\"%s\", %s sürümüne güncellendi",
+    "Disabled incompatible apps: %s" : "Uyumsuz uygulamalar devre dışı bırakıldı: %s",
+    "No image or file provided" : "Resim veya dosya belirtilmedi",
+    "Unknown filetype" : "Bilinmeyen dosya türü",
+    "Invalid image" : "Geçersiz resim",
+    "No temporary profile picture available, try again" : "Kullanılabilir geçici profil resmi yok, tekrar deneyin",
+    "No crop data provided" : "Kesme verisi sağlanmamış",
+    "Sunday" : "Pazar",
+    "Monday" : "Pazartesi",
+    "Tuesday" : "Salı",
+    "Wednesday" : "Çarşamba",
+    "Thursday" : "Perşembe",
+    "Friday" : "Cuma",
+    "Saturday" : "Cumartesi",
+    "January" : "Ocak",
+    "February" : "Şubat",
+    "March" : "Mart",
+    "April" : "Nisan",
+    "May" : "Mayıs",
+    "June" : "Haziran",
+    "July" : "Temmuz",
+    "August" : "Ağustos",
+    "September" : "Eylül",
+    "October" : "Ekim",
+    "November" : "Kasım",
+    "December" : "Aralık",
+    "Settings" : "Ayarlar",
+    "File" : "Dosya",
+    "Folder" : "Klasör",
+    "Image" : "Resim",
+    "Audio" : "Ses",
+    "Saving..." : "Kaydediliyor...",
+    "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
+    "I know what I'm doing" : "Ne yaptığımı biliyorum",
+    "Reset password" : "Parolayı sıfırla",
+    "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "No" : "Hayır",
+    "Yes" : "Evet",
+    "Choose" : "Seç",
+    "Error loading file picker template: {error}" : "Dosya seçici şablonu yüklenirken hata: {error}",
+    "Ok" : "Tamam",
+    "Error loading message template: {error}" : "İleti şablonu yüklenirken hata: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} dosya çakışması","{count} dosya çakışması"],
+    "One file conflict" : "Bir dosya çakışması",
+    "New Files" : "Yeni Dosyalar",
+    "Already existing files" : "Zaten mevcut olan dosyalar",
+    "Which files do you want to keep?" : "Hangi dosyaları saklamak istiyorsunuz?",
+    "If you select both versions, the copied file will have a number added to its name." : "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir.",
+    "Cancel" : "İptal",
+    "Continue" : "Devam et",
+    "(all selected)" : "(tümü seçildi)",
+    "({count} selected)" : "({count} seçildi)",
+    "Error loading file exists template" : "Dosya mevcut şablonu yüklenirken hata",
+    "Very weak password" : "Çok güçsüz parola",
+    "Weak password" : "Güçsüz parola",
+    "So-so password" : "Normal parola",
+    "Good password" : "İyi parola",
+    "Strong password" : "Güçlü parola",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
+    "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." : "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacağı anlamına gelmektedir. Uzaktan dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
+    "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu",
+    "Shared" : "Paylaşılan",
+    "Shared with {recipients}" : "{recipients} ile paylaşılmış",
+    "Share" : "Paylaş",
+    "Error" : "Hata",
+    "Error while sharing" : "Paylaşım sırasında hata",
+    "Error while unsharing" : "Paylaşım iptal edilirken hata",
+    "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 user or group …" : "Kullanıcı veya grup ile paylaş...",
+    "Share link" : "Paylaşma bağlantısı",
+    "The public link will expire no later than {days} days after it is created" : "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
+    "Password protect" : "Parola koruması",
+    "Choose a password for the public link" : "Herkese açık bağlantı için bir parola seçin",
+    "Allow Public Upload" : "Herkes Tarafından Gönderime İzin Ver",
+    "Email link to person" : "Bağlantıyı e-posta ile gönder",
+    "Send" : "Gönder",
+    "Set expiration date" : "Son kullanma tarihini ayarla",
+    "Expiration date" : "Son kullanım tarihi",
+    "Adding user..." : "Kullanıcı ekleniyor...",
+    "group" : "grup",
+    "Resharing is not allowed" : "Tekrar paylaşmaya izin verilmiyor",
+    "Shared in {item} with {user}" : "{item} içinde {user} ile paylaşılanlar",
+    "Unshare" : "Paylaşmayı Kaldır",
+    "notify by email" : "e-posta ile bildir",
+    "can share" : "paylaşabilir",
+    "can edit" : "düzenleyebilir",
+    "access control" : "erişim kontrolü",
+    "create" : "oluştur",
+    "update" : "güncelle",
+    "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",
+    "Warning" : "Uyarı",
+    "The object type is not specified." : "Nesne türü belirtilmemiş.",
+    "Enter new" : "Yeni girin",
+    "Delete" : "Sil",
+    "Add" : "Ekle",
+    "Edit tags" : "Etiketleri düzenle",
+    "Error loading dialog template: {error}" : "İletişim şablonu yüklenirken hata: {error}",
+    "No tags selected for deletion." : "Silmek için bir etiket seçilmedi.",
+    "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
+    "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
+    "The update was unsuccessful." : "Güncelleme başarısız oldu.",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
+    "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
+    "Username" : "Kullanıcı Adı",
+    "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?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
+    "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
+    "Reset" : "Sıfırla",
+    "New password" : "Yeni parola",
+    "New Password" : "Yeni Parola",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
+    "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
+    "Personal" : "Kişisel",
+    "Users" : "Kullanıcılar",
+    "Apps" : "Uygulamalar",
+    "Admin" : "Yönetici",
+    "Help" : "Yardım",
+    "Error loading tags" : "Etiketler yüklenirken hata",
+    "Tag already exists" : "Etiket zaten mevcut",
+    "Error deleting tag(s)" : "Etiket(ler) silinirken hata",
+    "Error tagging" : "Etiketleme hatası",
+    "Error untagging" : "Etiket kaldırma hatası",
+    "Error favoriting" : "Beğenilirken hata",
+    "Error unfavoriting" : "Beğeniden kaldırılırken hata",
+    "Access forbidden" : "Erişim yasak",
+    "File not found" : "Dosya bulunamadı",
+    "The specified document has not been found on the server." : "Belirtilen dosya sunucuda bulunamadı.",
+    "You can click here to return to %s." : "%s ana sayfasına dönmek için buraya tıklayabilirsiniz.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n",
+    "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
+    "Cheers!" : "Hoşça kalın!",
+    "Internal Server Error" : "Dahili Sunucu Hatası",
+    "The server encountered an internal error and was unable to complete your request." : "Sunucu dahili bir hatayla karşılaştı ve isteğinizi tamamlayamadı.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Eğer bu hata birden çok kez oluştuysa, lütfen sunucu yöneticisine aşağıdaki teknik ayrıntılar ile birlikte iletişime geçin.",
+    "More details can be found in the server log." : "Daha fazla ayrıntı sunucu günlüğünde bulanabilir.",
+    "Technical details" : "Teknik ayrıntılar",
+    "Remote Address: %s" : "Uzak Adres: %s",
+    "Request ID: %s" : "İstek Kimliği: %s",
+    "Code: %s" : "Kod: %s",
+    "Message: %s" : "Mesaj: %s",
+    "File: %s" : "Dosya: %s",
+    "Line: %s" : "Satır: %s",
+    "Trace" : "İz",
+    "Security Warning" : "Güvenlik Uyarısı",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
+    "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
+    "Password" : "Parola",
+    "Storage & database" : "Depolama ve veritabanı",
+    "Data folder" : "Veri klasörü",
+    "Configure the database" : "Veritabanını yapılandır",
+    "Only %s is available." : "Sadece %s kullanılabilir.",
+    "Database user" : "Veritabanı kullanıcı adı",
+    "Database password" : "Veritabanı parolası",
+    "Database name" : "Veritabanı adı",
+    "Database tablespace" : "Veritabanı tablo alanı",
+    "Database host" : "Veritabanı sunucusu",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
+    "Finish setup" : "Kurulumu tamamla",
+    "Finishing …" : "Tamamlanıyor ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Uygulama, doğru çalışabilmesi için JavaScript gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve sayfayı yeniden yükleyin.",
+    "%s is available. Get more information on how to update." : "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+    "Log out" : "Çıkış yap",
+    "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!",
+    "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
+    "Forgot your password? Reset it!" : "Parolanızı mı unuttunuz? Sıfırlayın!",
+    "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.",
+    "This means only administrators can use the instance." : "Bu, örneği sadece yöneticiler kullanabilir demektir.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
+    "Thank you for your patience." : "Sabrınız için teşekkür ederiz.",
+    "You are accessing the server from an untrusted domain." : "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
+    "Add \"%s\" as trusted domain" : "\"%s\" alan adını güvenilir olarak ekle",
+    "%s will be updated to version %s." : "%s, %s sürümüne güncellenecek.",
+    "The following apps will be disabled:" : "Aşağıdaki uygulamalar devre dışı bırakılacak:",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Daha büyük kurulumlarda zaman aşımlarının önüne geçmek için, kurulum dizininizden aşağıdaki komutu da çalıştırabilirsiniz:",
+    "This %s instance is currently being updated, which may take a while." : "Bu %s örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
+    "This page will refresh itself when the %s instance is available again." : "Bu sayfa, %s örneği tekrar kullanılabilir olduğunda kendini yenileyecektir."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
new file mode 100644
index 00000000000..51e08e3c722
--- /dev/null
+++ b/core/l10n/tr.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Şu kullanıcılara posta gönderilemedi: %s",
+    "Turned on maintenance mode" : "Bakım kipi etkinleştirildi",
+    "Turned off maintenance mode" : "Bakım kipi kapatıldı",
+    "Updated database" : "Veritabanı güncellendi",
+    "Checked database schema update" : "Veritabanı şema güncellemesi denetlendi",
+    "Checked database schema update for apps" : "Uygulamalar için veritabanı şema güncellemesi denetlendi",
+    "Updated \"%s\" to %s" : "\"%s\", %s sürümüne güncellendi",
+    "Disabled incompatible apps: %s" : "Uyumsuz uygulamalar devre dışı bırakıldı: %s",
+    "No image or file provided" : "Resim veya dosya belirtilmedi",
+    "Unknown filetype" : "Bilinmeyen dosya türü",
+    "Invalid image" : "Geçersiz resim",
+    "No temporary profile picture available, try again" : "Kullanılabilir geçici profil resmi yok, tekrar deneyin",
+    "No crop data provided" : "Kesme verisi sağlanmamış",
+    "Sunday" : "Pazar",
+    "Monday" : "Pazartesi",
+    "Tuesday" : "Salı",
+    "Wednesday" : "Çarşamba",
+    "Thursday" : "Perşembe",
+    "Friday" : "Cuma",
+    "Saturday" : "Cumartesi",
+    "January" : "Ocak",
+    "February" : "Şubat",
+    "March" : "Mart",
+    "April" : "Nisan",
+    "May" : "Mayıs",
+    "June" : "Haziran",
+    "July" : "Temmuz",
+    "August" : "Ağustos",
+    "September" : "Eylül",
+    "October" : "Ekim",
+    "November" : "Kasım",
+    "December" : "Aralık",
+    "Settings" : "Ayarlar",
+    "File" : "Dosya",
+    "Folder" : "Klasör",
+    "Image" : "Resim",
+    "Audio" : "Ses",
+    "Saving..." : "Kaydediliyor...",
+    "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
+    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
+    "I know what I'm doing" : "Ne yaptığımı biliyorum",
+    "Reset password" : "Parolayı sıfırla",
+    "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
+    "No" : "Hayır",
+    "Yes" : "Evet",
+    "Choose" : "Seç",
+    "Error loading file picker template: {error}" : "Dosya seçici şablonu yüklenirken hata: {error}",
+    "Ok" : "Tamam",
+    "Error loading message template: {error}" : "İleti şablonu yüklenirken hata: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} dosya çakışması","{count} dosya çakışması"],
+    "One file conflict" : "Bir dosya çakışması",
+    "New Files" : "Yeni Dosyalar",
+    "Already existing files" : "Zaten mevcut olan dosyalar",
+    "Which files do you want to keep?" : "Hangi dosyaları saklamak istiyorsunuz?",
+    "If you select both versions, the copied file will have a number added to its name." : "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir.",
+    "Cancel" : "İptal",
+    "Continue" : "Devam et",
+    "(all selected)" : "(tümü seçildi)",
+    "({count} selected)" : "({count} seçildi)",
+    "Error loading file exists template" : "Dosya mevcut şablonu yüklenirken hata",
+    "Very weak password" : "Çok güçsüz parola",
+    "Weak password" : "Güçsüz parola",
+    "So-so password" : "Normal parola",
+    "Good password" : "İyi parola",
+    "Strong password" : "Güçlü parola",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
+    "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." : "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacağı anlamına gelmektedir. Uzaktan dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
+    "Error occurred while checking server setup" : "Sunucu yapılandırması denetlenirken hata oluştu",
+    "Shared" : "Paylaşılan",
+    "Shared with {recipients}" : "{recipients} ile paylaşılmış",
+    "Share" : "Paylaş",
+    "Error" : "Hata",
+    "Error while sharing" : "Paylaşım sırasında hata",
+    "Error while unsharing" : "Paylaşım iptal edilirken hata",
+    "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 user or group …" : "Kullanıcı veya grup ile paylaş...",
+    "Share link" : "Paylaşma bağlantısı",
+    "The public link will expire no later than {days} days after it is created" : "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
+    "Password protect" : "Parola koruması",
+    "Choose a password for the public link" : "Herkese açık bağlantı için bir parola seçin",
+    "Allow Public Upload" : "Herkes Tarafından Gönderime İzin Ver",
+    "Email link to person" : "Bağlantıyı e-posta ile gönder",
+    "Send" : "Gönder",
+    "Set expiration date" : "Son kullanma tarihini ayarla",
+    "Expiration date" : "Son kullanım tarihi",
+    "Adding user..." : "Kullanıcı ekleniyor...",
+    "group" : "grup",
+    "Resharing is not allowed" : "Tekrar paylaşmaya izin verilmiyor",
+    "Shared in {item} with {user}" : "{item} içinde {user} ile paylaşılanlar",
+    "Unshare" : "Paylaşmayı Kaldır",
+    "notify by email" : "e-posta ile bildir",
+    "can share" : "paylaşabilir",
+    "can edit" : "düzenleyebilir",
+    "access control" : "erişim kontrolü",
+    "create" : "oluştur",
+    "update" : "güncelle",
+    "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",
+    "Warning" : "Uyarı",
+    "The object type is not specified." : "Nesne türü belirtilmemiş.",
+    "Enter new" : "Yeni girin",
+    "Delete" : "Sil",
+    "Add" : "Ekle",
+    "Edit tags" : "Etiketleri düzenle",
+    "Error loading dialog template: {error}" : "İletişim şablonu yüklenirken hata: {error}",
+    "No tags selected for deletion." : "Silmek için bir etiket seçilmedi.",
+    "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
+    "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
+    "The update was unsuccessful." : "Güncelleme başarısız oldu.",
+    "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 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",
+    "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
+    "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
+    "Username" : "Kullanıcı Adı",
+    "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?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
+    "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
+    "Reset" : "Sıfırla",
+    "New password" : "Yeni parola",
+    "New Password" : "Yeni Parola",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
+    "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
+    "Personal" : "Kişisel",
+    "Users" : "Kullanıcılar",
+    "Apps" : "Uygulamalar",
+    "Admin" : "Yönetici",
+    "Help" : "Yardım",
+    "Error loading tags" : "Etiketler yüklenirken hata",
+    "Tag already exists" : "Etiket zaten mevcut",
+    "Error deleting tag(s)" : "Etiket(ler) silinirken hata",
+    "Error tagging" : "Etiketleme hatası",
+    "Error untagging" : "Etiket kaldırma hatası",
+    "Error favoriting" : "Beğenilirken hata",
+    "Error unfavoriting" : "Beğeniden kaldırılırken hata",
+    "Access forbidden" : "Erişim yasak",
+    "File not found" : "Dosya bulunamadı",
+    "The specified document has not been found on the server." : "Belirtilen dosya sunucuda bulunamadı.",
+    "You can click here to return to %s." : "%s ana sayfasına dönmek için buraya tıklayabilirsiniz.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n",
+    "The share will expire on %s." : "Bu paylaşım %s tarihinde sona erecek.",
+    "Cheers!" : "Hoşça kalın!",
+    "Internal Server Error" : "Dahili Sunucu Hatası",
+    "The server encountered an internal error and was unable to complete your request." : "Sunucu dahili bir hatayla karşılaştı ve isteğinizi tamamlayamadı.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Eğer bu hata birden çok kez oluştuysa, lütfen sunucu yöneticisine aşağıdaki teknik ayrıntılar ile birlikte iletişime geçin.",
+    "More details can be found in the server log." : "Daha fazla ayrıntı sunucu günlüğünde bulanabilir.",
+    "Technical details" : "Teknik ayrıntılar",
+    "Remote Address: %s" : "Uzak Adres: %s",
+    "Request ID: %s" : "İstek Kimliği: %s",
+    "Code: %s" : "Kod: %s",
+    "Message: %s" : "Mesaj: %s",
+    "File: %s" : "Dosya: %s",
+    "Line: %s" : "Satır: %s",
+    "Trace" : "İz",
+    "Security Warning" : "Güvenlik Uyarısı",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
+    "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
+    "Password" : "Parola",
+    "Storage & database" : "Depolama ve veritabanı",
+    "Data folder" : "Veri klasörü",
+    "Configure the database" : "Veritabanını yapılandır",
+    "Only %s is available." : "Sadece %s kullanılabilir.",
+    "Database user" : "Veritabanı kullanıcı adı",
+    "Database password" : "Veritabanı parolası",
+    "Database name" : "Veritabanı adı",
+    "Database tablespace" : "Veritabanı tablo alanı",
+    "Database host" : "Veritabanı sunucusu",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
+    "Finish setup" : "Kurulumu tamamla",
+    "Finishing …" : "Tamamlanıyor ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Uygulama, doğru çalışabilmesi için JavaScript gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve sayfayı yeniden yükleyin.",
+    "%s is available. Get more information on how to update." : "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
+    "Log out" : "Çıkış yap",
+    "Server side authentication failed!" : "Sunucu taraflı yetkilendirme başarısız!",
+    "Please contact your administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
+    "Forgot your password? Reset it!" : "Parolanızı mı unuttunuz? Sıfırlayın!",
+    "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.",
+    "This means only administrators can use the instance." : "Bu, örneği sadece yöneticiler kullanabilir demektir.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
+    "Thank you for your patience." : "Sabrınız için teşekkür ederiz.",
+    "You are accessing the server from an untrusted domain." : "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
+    "Add \"%s\" as trusted domain" : "\"%s\" alan adını güvenilir olarak ekle",
+    "%s will be updated to version %s." : "%s, %s sürümüne güncellenecek.",
+    "The following apps will be disabled:" : "Aşağıdaki uygulamalar devre dışı bırakılacak:",
+    "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",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Daha büyük kurulumlarda zaman aşımlarının önüne geçmek için, kurulum dizininizden aşağıdaki komutu da çalıştırabilirsiniz:",
+    "This %s instance is currently being updated, which may take a while." : "Bu %s örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
+    "This page will refresh itself when the %s instance is available again." : "Bu sayfa, %s örneği tekrar kullanılabilir olduğunda kendini yenileyecektir."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
deleted file mode 100644
index 7a1def5d18b..00000000000
--- a/core/l10n/tr.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Şu kullanıcılara posta gönderilemedi: %s",
-"Turned on maintenance mode" => "Bakım kipi etkinleştirildi",
-"Turned off maintenance mode" => "Bakım kipi kapatıldı",
-"Updated database" => "Veritabanı güncellendi",
-"Checked database schema update" => "Veritabanı şema güncellemesi denetlendi",
-"Checked database schema update for apps" => "Uygulamalar için veritabanı şema güncellemesi denetlendi",
-"Updated \"%s\" to %s" => "\"%s\", %s sürümüne güncellendi",
-"Disabled incompatible apps: %s" => "Uyumsuz uygulamalar devre dışı bırakıldı: %s",
-"No image or file provided" => "Resim veya dosya belirtilmedi",
-"Unknown filetype" => "Bilinmeyen dosya türü",
-"Invalid image" => "Geçersiz resim",
-"No temporary profile picture available, try again" => "Kullanılabilir geçici profil resmi yok, tekrar deneyin",
-"No crop data provided" => "Kesme verisi sağlanmamış",
-"Sunday" => "Pazar",
-"Monday" => "Pazartesi",
-"Tuesday" => "Salı",
-"Wednesday" => "Çarşamba",
-"Thursday" => "Perşembe",
-"Friday" => "Cuma",
-"Saturday" => "Cumartesi",
-"January" => "Ocak",
-"February" => "Şubat",
-"March" => "Mart",
-"April" => "Nisan",
-"May" => "Mayıs",
-"June" => "Haziran",
-"July" => "Temmuz",
-"August" => "Ağustos",
-"September" => "Eylül",
-"October" => "Ekim",
-"November" => "Kasım",
-"December" => "Aralık",
-"Settings" => "Ayarlar",
-"File" => "Dosya",
-"Folder" => "Klasör",
-"Image" => "Resim",
-"Audio" => "Ses",
-"Saving..." => "Kaydediliyor...",
-"Couldn't send reset email. Please contact your administrator." => "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
-"The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." => "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
-"Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" => "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
-"I know what I'm doing" => "Ne yaptığımı biliyorum",
-"Reset password" => "Parolayı sıfırla",
-"Password can not be changed. Please contact your administrator." => "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
-"No" => "Hayır",
-"Yes" => "Evet",
-"Choose" => "Seç",
-"Error loading file picker template: {error}" => "Dosya seçici şablonu yüklenirken hata: {error}",
-"Ok" => "Tamam",
-"Error loading message template: {error}" => "İleti şablonu yüklenirken hata: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} dosya çakışması","{count} dosya çakışması"),
-"One file conflict" => "Bir dosya çakışması",
-"New Files" => "Yeni Dosyalar",
-"Already existing files" => "Zaten mevcut olan dosyalar",
-"Which files do you want to keep?" => "Hangi dosyaları saklamak istiyorsunuz?",
-"If you select both versions, the copied file will have a number added to its name." => "İki sürümü de seçerseniz, kopyalanan dosyanın ismine bir sayı ilave edilecektir.",
-"Cancel" => "İptal",
-"Continue" => "Devam et",
-"(all selected)" => "(tümü seçildi)",
-"({count} selected)" => "({count} seçildi)",
-"Error loading file exists template" => "Dosya mevcut şablonu yüklenirken hata",
-"Very weak password" => "Çok güçsüz parola",
-"Weak password" => "Güçsüz parola",
-"So-so password" => "Normal parola",
-"Good password" => "İyi parola",
-"Strong password" => "Güçlü parola",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya eşitlemesine izin vermek üzere düzgün bir şekilde yapılandırılmamış. WebDAV arayüzü sorunlu görünüyor.",
-"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." => "Bu sunucunun çalışan bir internet bağlantısı yok. Bu, harici depolama alanı bağlama, güncelleştirme bildirimleri veya 3. parti uygulama kurma gibi bazı özellikler çalışmayacağı anlamına gelmektedir. Uzaktan dosyalara erişim ve e-posta ile bildirim gönderme de çalışmayacaktır. Eğer bu özelliklerin tamamını kullanmak istiyorsanız, sunucu için internet bağlantısını etkinleştirmenizi öneriyoruz.",
-"Error occurred while checking server setup" => "Sunucu yapılandırması denetlenirken hata oluştu",
-"Shared" => "Paylaşılan",
-"Shared with {recipients}" => "{recipients} ile paylaşılmış",
-"Share" => "Paylaş",
-"Error" => "Hata",
-"Error while sharing" => "Paylaşım sırasında hata",
-"Error while unsharing" => "Paylaşım iptal edilirken hata",
-"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 user or group …" => "Kullanıcı veya grup ile paylaş...",
-"Share link" => "Paylaşma bağlantısı",
-"The public link will expire no later than {days} days after it is created" => "Herkese açık bağlantı, oluşturulduktan en geç {days} gün sonra sona erecek",
-"Password protect" => "Parola koruması",
-"Choose a password for the public link" => "Herkese açık bağlantı için bir parola seçin",
-"Allow Public Upload" => "Herkes Tarafından Gönderime İzin Ver",
-"Email link to person" => "Bağlantıyı e-posta ile gönder",
-"Send" => "Gönder",
-"Set expiration date" => "Son kullanma tarihini ayarla",
-"Expiration date" => "Son kullanım tarihi",
-"Adding user..." => "Kullanıcı ekleniyor...",
-"group" => "grup",
-"Resharing is not allowed" => "Tekrar paylaşmaya izin verilmiyor",
-"Shared in {item} with {user}" => "{item} içinde {user} ile paylaşılanlar",
-"Unshare" => "Paylaşmayı Kaldır",
-"notify by email" => "e-posta ile bildir",
-"can share" => "paylaşabilir",
-"can edit" => "düzenleyebilir",
-"access control" => "erişim kontrolü",
-"create" => "oluştur",
-"update" => "güncelle",
-"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",
-"Warning" => "Uyarı",
-"The object type is not specified." => "Nesne türü belirtilmemiş.",
-"Enter new" => "Yeni girin",
-"Delete" => "Sil",
-"Add" => "Ekle",
-"Edit tags" => "Etiketleri düzenle",
-"Error loading dialog template: {error}" => "İletişim şablonu yüklenirken hata: {error}",
-"No tags selected for deletion." => "Silmek için bir etiket seçilmedi.",
-"Updating {productName} to version {version}, this may take a while." => "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
-"Please reload the page." => "Lütfen sayfayı yeniden yükleyin.",
-"The update was unsuccessful." => "Güncelleme başarısız oldu.",
-"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 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",
-"Use the following link to reset your password: {link}" => "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
-"You will receive a link to reset your password via Email." => "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
-"Username" => "Kullanıcı Adı",
-"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?" => "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
-"Yes, I really want to reset my password now" => "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
-"Reset" => "Sıfırla",
-"New password" => "Yeni parola",
-"New Password" => "Yeni Parola",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
-"For the best results, please consider using a GNU/Linux server instead." => "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
-"Personal" => "Kişisel",
-"Users" => "Kullanıcılar",
-"Apps" => "Uygulamalar",
-"Admin" => "Yönetici",
-"Help" => "Yardım",
-"Error loading tags" => "Etiketler yüklenirken hata",
-"Tag already exists" => "Etiket zaten mevcut",
-"Error deleting tag(s)" => "Etiket(ler) silinirken hata",
-"Error tagging" => "Etiketleme hatası",
-"Error untagging" => "Etiket kaldırma hatası",
-"Error favoriting" => "Beğenilirken hata",
-"Error unfavoriting" => "Beğeniden kaldırılırken hata",
-"Access forbidden" => "Erişim yasak",
-"File not found" => "Dosya bulunamadı",
-"The specified document has not been found on the server." => "Belirtilen dosya sunucuda bulunamadı.",
-"You can click here to return to %s." => "%s ana sayfasına dönmek için buraya tıklayabilirsiniz.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Merhaba,\n\nSadece %s sizinle %s paylaşımını yaptığını bildiriyoruz.\nBuradan bakabilirsiniz: %s\n\n",
-"The share will expire on %s." => "Bu paylaşım %s tarihinde sona erecek.",
-"Cheers!" => "Hoşça kalın!",
-"Internal Server Error" => "Dahili Sunucu Hatası",
-"The server encountered an internal error and was unable to complete your request." => "Sunucu dahili bir hatayla karşılaştı ve isteğinizi tamamlayamadı.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Eğer bu hata birden çok kez oluştuysa, lütfen sunucu yöneticisine aşağıdaki teknik ayrıntılar ile birlikte iletişime geçin.",
-"More details can be found in the server log." => "Daha fazla ayrıntı sunucu günlüğünde bulanabilir.",
-"Technical details" => "Teknik ayrıntılar",
-"Remote Address: %s" => "Uzak Adres: %s",
-"Request ID: %s" => "İstek Kimliği: %s",
-"Code: %s" => "Kod: %s",
-"Message: %s" => "Mesaj: %s",
-"File: %s" => "Dosya: %s",
-"Line: %s" => "Satır: %s",
-"Trace" => "İz",
-"Security Warning" => "Güvenlik Uyarısı",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "PHP sürümünüz NULL Byte saldırısına açık (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "%s yazılımını güvenli olarak kullanmak için, lütfen PHP kurulumunuzu güncelleyin.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
-"Create an <strong>admin account</strong>" => "Bir <strong>yönetici hesabı</strong> oluşturun",
-"Password" => "Parola",
-"Storage & database" => "Depolama ve veritabanı",
-"Data folder" => "Veri klasörü",
-"Configure the database" => "Veritabanını yapılandır",
-"Only %s is available." => "Sadece %s kullanılabilir.",
-"Database user" => "Veritabanı kullanıcı adı",
-"Database password" => "Veritabanı parolası",
-"Database name" => "Veritabanı adı",
-"Database tablespace" => "Veritabanı tablo alanı",
-"Database host" => "Veritabanı sunucusu",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Veritabanı olarak SQLite kullanılacak. Daha büyük kurulumlar için bunu değiştirmenizi öneririz.",
-"Finish setup" => "Kurulumu tamamla",
-"Finishing …" => "Tamamlanıyor ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Uygulama, doğru çalışabilmesi için JavaScript gerektiriyor. Lütfen <a href=\"http://enable-javascript.com/\" target=\"_blank\">JavaScript'i etkinleştirin</a> ve sayfayı yeniden yükleyin.",
-"%s is available. Get more information on how to update." => "%s kullanılabilir. Nasıl güncelleyeceğiniz hakkında daha fazla bilgi alın.",
-"Log out" => "Çıkış yap",
-"Server side authentication failed!" => "Sunucu taraflı yetkilendirme başarısız!",
-"Please contact your administrator." => "Lütfen sistem yöneticiniz ile iletişime geçin.",
-"Forgot your password? Reset it!" => "Parolanızı mı unuttunuz? Sıfırlayın!",
-"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.",
-"This means only administrators can use the instance." => "Bu, örneği sadece yöneticiler kullanabilir demektir.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Eğer bu ileti görünmeye devam ederse veya beklenmedik şekilde ortaya çıkmışsa sistem yöneticinizle iletişime geçin.",
-"Thank you for your patience." => "Sabrınız için teşekkür ederiz.",
-"You are accessing the server from an untrusted domain." => "Sunucuya güvenilmeyen bir alan adından ulaşıyorsunuz.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Lütfen yöneticiniz ile iletişime geçin. Eğer bu örneğin bir yöneticisi iseniz, config/config.php dosyası içerisindeki \"trusted_domain\" ayarını yapılandırın. Bu yapılandırmanın bir örneği config/config.sample.php dosyasında verilmiştir.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Yapılandırmanıza bağlı olarak, bir yönetici olarak bu alan adına güvenmek için aşağıdaki düğmeyi de kullanabilirsiniz.",
-"Add \"%s\" as trusted domain" => "\"%s\" alan adını güvenilir olarak ekle",
-"%s will be updated to version %s." => "%s, %s sürümüne güncellenecek.",
-"The following apps will be disabled:" => "Aşağıdaki uygulamalar devre dışı bırakılacak:",
-"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",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Daha büyük kurulumlarda zaman aşımlarının önüne geçmek için, kurulum dizininizden aşağıdaki komutu da çalıştırabilirsiniz:",
-"This %s instance is currently being updated, which may take a while." => "Bu %s örneği şu anda güncelleniyor, bu biraz zaman alabilir.",
-"This page will refresh itself when the %s instance is available again." => "Bu sayfa, %s örneği tekrar kullanılabilir olduğunda kendini yenileyecektir."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/core/l10n/tzm.js b/core/l10n/tzm.js
new file mode 100644
index 00000000000..e7a57a1ef8a
--- /dev/null
+++ b/core/l10n/tzm.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},
+"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;");
diff --git a/core/l10n/tzm.json b/core/l10n/tzm.json
new file mode 100644
index 00000000000..653f556ff14
--- /dev/null
+++ b/core/l10n/tzm.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/core/l10n/tzm.php b/core/l10n/tzm.php
deleted file mode 100644
index 63fd3b90a53..00000000000
--- a/core/l10n/tzm.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;";
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
new file mode 100644
index 00000000000..5895d94b3e5
--- /dev/null
+++ b/core/l10n/ug.js
@@ -0,0 +1,52 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "يەكشەنبە",
+    "Monday" : "دۈشەنبە",
+    "Tuesday" : "سەيشەنبە",
+    "Wednesday" : "چارشەنبە",
+    "Thursday" : "پەيشەنبە",
+    "Friday" : "جۈمە",
+    "Saturday" : "شەنبە",
+    "January" : "قەھرىتان",
+    "February" : "ھۇت",
+    "March" : "نەۋرۇز",
+    "April" : "ئۇمۇت",
+    "May" : "باھار",
+    "June" : "سەپەر",
+    "July" : "چىللە",
+    "August" : "تومۇز",
+    "September" : "مىزان",
+    "October" : "ئوغۇز",
+    "November" : "ئوغلاق",
+    "December" : "كۆنەك",
+    "Settings" : "تەڭشەكلەر",
+    "Folder" : "قىسقۇچ",
+    "Saving..." : "ساقلاۋاتىدۇ…",
+    "No" : "ياق",
+    "Yes" : "ھەئە",
+    "Ok" : "جەزملە",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "ۋاز كەچ",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
+    "Share" : "ھەمبەھىر",
+    "Error" : "خاتالىق",
+    "Send" : "يوللا",
+    "group" : "گۇرۇپپا",
+    "Unshare" : "ھەمبەھىرلىمە",
+    "delete" : "ئۆچۈر",
+    "Warning" : "ئاگاھلاندۇرۇش",
+    "Delete" : "ئۆچۈر",
+    "Add" : "قوش",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "New password" : "يېڭى ئىم",
+    "Personal" : "شەخسىي",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Apps" : "ئەپلەر",
+    "Help" : "ياردەم",
+    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Password" : "ئىم",
+    "Finish setup" : "تەڭشەك تامام",
+    "Log out" : "تىزىمدىن چىق"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
new file mode 100644
index 00000000000..e253d465ab7
--- /dev/null
+++ b/core/l10n/ug.json
@@ -0,0 +1,50 @@
+{ "translations": {
+    "Sunday" : "يەكشەنبە",
+    "Monday" : "دۈشەنبە",
+    "Tuesday" : "سەيشەنبە",
+    "Wednesday" : "چارشەنبە",
+    "Thursday" : "پەيشەنبە",
+    "Friday" : "جۈمە",
+    "Saturday" : "شەنبە",
+    "January" : "قەھرىتان",
+    "February" : "ھۇت",
+    "March" : "نەۋرۇز",
+    "April" : "ئۇمۇت",
+    "May" : "باھار",
+    "June" : "سەپەر",
+    "July" : "چىللە",
+    "August" : "تومۇز",
+    "September" : "مىزان",
+    "October" : "ئوغۇز",
+    "November" : "ئوغلاق",
+    "December" : "كۆنەك",
+    "Settings" : "تەڭشەكلەر",
+    "Folder" : "قىسقۇچ",
+    "Saving..." : "ساقلاۋاتىدۇ…",
+    "No" : "ياق",
+    "Yes" : "ھەئە",
+    "Ok" : "جەزملە",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "ۋاز كەچ",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
+    "Share" : "ھەمبەھىر",
+    "Error" : "خاتالىق",
+    "Send" : "يوللا",
+    "group" : "گۇرۇپپا",
+    "Unshare" : "ھەمبەھىرلىمە",
+    "delete" : "ئۆچۈر",
+    "Warning" : "ئاگاھلاندۇرۇش",
+    "Delete" : "ئۆچۈر",
+    "Add" : "قوش",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "New password" : "يېڭى ئىم",
+    "Personal" : "شەخسىي",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Apps" : "ئەپلەر",
+    "Help" : "ياردەم",
+    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Password" : "ئىم",
+    "Finish setup" : "تەڭشەك تامام",
+    "Log out" : "تىزىمدىن چىق"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/ug.php b/core/l10n/ug.php
deleted file mode 100644
index 418563352bd..00000000000
--- a/core/l10n/ug.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "يەكشەنبە",
-"Monday" => "دۈشەنبە",
-"Tuesday" => "سەيشەنبە",
-"Wednesday" => "چارشەنبە",
-"Thursday" => "پەيشەنبە",
-"Friday" => "جۈمە",
-"Saturday" => "شەنبە",
-"January" => "قەھرىتان",
-"February" => "ھۇت",
-"March" => "نەۋرۇز",
-"April" => "ئۇمۇت",
-"May" => "باھار",
-"June" => "سەپەر",
-"July" => "چىللە",
-"August" => "تومۇز",
-"September" => "مىزان",
-"October" => "ئوغۇز",
-"November" => "ئوغلاق",
-"December" => "كۆنەك",
-"Settings" => "تەڭشەكلەر",
-"Folder" => "قىسقۇچ",
-"Saving..." => "ساقلاۋاتىدۇ…",
-"No" => "ياق",
-"Yes" => "ھەئە",
-"Ok" => "جەزملە",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Cancel" => "ۋاز كەچ",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "سىزنىڭ تور مۇلازىمېتىرىڭىز ھۆججەت قەدەمداشلاشقا يول قويىدىغان قىلىپ توغرا تەڭشەلمەپتۇ، چۈنكى WebDAV نىڭ ئېغىزى بۇزۇلغاندەك تۇرىدۇ.",
-"Share" => "ھەمبەھىر",
-"Error" => "خاتالىق",
-"Send" => "يوللا",
-"group" => "گۇرۇپپا",
-"Unshare" => "ھەمبەھىرلىمە",
-"delete" => "ئۆچۈر",
-"Warning" => "ئاگاھلاندۇرۇش",
-"Delete" => "ئۆچۈر",
-"Add" => "قوش",
-"Username" => "ئىشلەتكۈچى ئاتى",
-"New password" => "يېڭى ئىم",
-"Personal" => "شەخسىي",
-"Users" => "ئىشلەتكۈچىلەر",
-"Apps" => "ئەپلەر",
-"Help" => "ياردەم",
-"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
-"Password" => "ئىم",
-"Finish setup" => "تەڭشەك تامام",
-"Log out" => "تىزىمدىن چىق"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
new file mode 100644
index 00000000000..4f3e9c2cba5
--- /dev/null
+++ b/core/l10n/uk.js
@@ -0,0 +1,212 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Неможливо надіслати пошту наступним користувачам: %s ",
+    "Turned on maintenance mode" : "Увімкнено захищений режим",
+    "Turned off maintenance mode" : "Вимкнено захищений режим",
+    "Updated database" : "Базу даних оновлено",
+    "Checked database schema update" : "Перевірено оновлення схеми бази даних",
+    "Checked database schema update for apps" : "Перевірено оновлення схеми бази даних для додатків",
+    "Updated \"%s\" to %s" : "Оновлено \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Вимкнені несумісні додатки: %s",
+    "No image or file provided" : "Немає наданого зображення або файлу",
+    "Unknown filetype" : "Невідомий тип файлу",
+    "Invalid image" : "Невірне зображення",
+    "No temporary profile picture available, try again" : "Немає доступного тимчасового профілю для малюнків, спробуйте ще раз",
+    "No crop data provided" : "Немає інформації щодо обрізки даних",
+    "Sunday" : "Неділя",
+    "Monday" : "Понеділок",
+    "Tuesday" : "Вівторок",
+    "Wednesday" : "Середа",
+    "Thursday" : "Четвер",
+    "Friday" : "П'ятниця",
+    "Saturday" : "Субота",
+    "January" : "Січень",
+    "February" : "Лютий",
+    "March" : "Березень",
+    "April" : "Квітень",
+    "May" : "Травень",
+    "June" : "Червень",
+    "July" : "Липень",
+    "August" : "Серпень",
+    "September" : "Вересень",
+    "October" : "Жовтень",
+    "November" : "Листопад",
+    "December" : "Грудень",
+    "Settings" : "Налаштування",
+    "File" : "Файл",
+    "Folder" : "Тека",
+    "Image" : "Зображення",
+    "Audio" : "Аудіо",
+    "Saving..." : "Зберігаю...",
+    "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 /> Ви дійсно хочете продовжити?",
+    "I know what I'm doing" : "Я знаю що роблю",
+    "Reset password" : "Скинути пароль",
+    "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
+    "No" : "Ні",
+    "Yes" : "Так",
+    "Choose" : "Обрати",
+    "Error loading file picker template: {error}" : "Помилка при завантаженні шаблону вибору: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Помилка при завантаженні шаблону повідомлення: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"],
+    "One file conflict" : "Один файловий конфлікт",
+    "New Files" : "Нових Файлів",
+    "Already existing files" : "Файли що вже існують",
+    "Which files do you want to keep?" : "Які файли ви хочете залишити?",
+    "If you select both versions, the copied file will have a number added to its name." : "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я.",
+    "Cancel" : "Відмінити",
+    "Continue" : "Продовжити",
+    "(all selected)" : "(все вибрано)",
+    "({count} selected)" : "({count} вибрано)",
+    "Error loading file exists template" : "Помилка при завантаженні файлу існуючого шаблону",
+    "Very weak password" : "Дуже слабкий пароль",
+    "Weak password" : "Слабкий пароль",
+    "So-so password" : "Такий собі пароль",
+    "Good password" : "Добрий пароль",
+    "Strong password" : "Надійний пароль",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
+    "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." : "Цей сервер не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх сховищ, повідомлення про оновлення або встановлення допоміжних програм не будуть працювати. Віддалений доступ до файлів та надсилання повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.",
+    "Error occurred while checking server setup" : "При перевірці налаштувань серверу сталася помилка",
+    "Shared" : "Опубліковано",
+    "Shared with {recipients}" : "Опубліковано для {recipients}",
+    "Share" : "Поділитися",
+    "Error" : "Помилка",
+    "Error while sharing" : "Помилка під час публікації",
+    "Error while unsharing" : "Помилка під час відміни публікації",
+    "Error while changing permissions" : "Помилка при зміні повноважень",
+    "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
+    "Shared with you by {owner}" : "{owner} опублікував для Вас",
+    "Share with user or group …" : "Поділитися з користувачем або групою ...",
+    "Share link" : "Опублікувати посилання",
+    "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
+    "Password protect" : "Захистити паролем",
+    "Choose a password for the public link" : "Оберіть пароль для опублікованого посилання",
+    "Allow Public Upload" : "Дозволити Публічне Завантаження",
+    "Email link to person" : "Ел. пошта належить Пану",
+    "Send" : "Надіслати",
+    "Set expiration date" : "Встановити термін дії",
+    "Expiration date" : "Термін дії",
+    "Adding user..." : "Додавання користувача...",
+    "group" : "група",
+    "Resharing is not allowed" : "Пере-публікація не дозволяється",
+    "Shared in {item} with {user}" : "Опубліковано {item} для {user}",
+    "Unshare" : "Закрити доступ",
+    "notify by email" : "повідомити по Email",
+    "can share" : "можна поділитися",
+    "can edit" : "може редагувати",
+    "access control" : "контроль доступу",
+    "create" : "створити",
+    "update" : "оновити",
+    "delete" : "видалити",
+    "Password protected" : "Захищено паролем",
+    "Error unsetting expiration date" : "Помилка при відміні терміна дії",
+    "Error setting expiration date" : "Помилка при встановленні терміна дії",
+    "Sending ..." : "Надсилання...",
+    "Email sent" : "Ел. пошта надіслана",
+    "Warning" : "Попередження",
+    "The object type is not specified." : "Не визначено тип об'єкту.",
+    "Enter new" : "Введіть новий",
+    "Delete" : "Видалити",
+    "Add" : "Додати",
+    "Edit tags" : "Редагувати теги",
+    "Error loading dialog template: {error}" : "Помилка при завантаженні шаблону діалогу: {error}",
+    "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. Redirecting you to ownCloud now." : "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Неможливо скинути пароль, бо маркер є недійсним",
+    "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 пароль скинуто",
+    "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}",
+    "You will receive a link to reset your password via Email." : "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
+    "Username" : "Ім'я користувача",
+    "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?" : "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?",
+    "Yes, I really want to reset my password now" : "Так, я справді бажаю скинути мій пароль зараз",
+    "Reset" : "Перевстановити",
+    "New password" : "Новий пароль",
+    "New Password" : "Новий пароль",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
+    "Personal" : "Особисте",
+    "Users" : "Користувачі",
+    "Apps" : "Додатки",
+    "Admin" : "Адмін",
+    "Help" : "Допомога",
+    "Error loading tags" : "Помилка завантаження тегів.",
+    "Tag already exists" : "Тег вже існує",
+    "Error deleting tag(s)" : "Помилка видалення тегу(ів)",
+    "Error tagging" : "Помилка встановлення тегів",
+    "Error untagging" : "Помилка зняття тегів",
+    "Error favoriting" : "Помилка позначення улюблених",
+    "Error unfavoriting" : "Помилка зняття позначки улюблених",
+    "Access forbidden" : "Доступ заборонено",
+    "File not found" : "Файл не знайдено",
+    "The specified document has not been found on the server." : "Не вдалось знайти вказаний документ на сервері.",
+    "You can click here to return to %s." : "Ви можете натиснути тут для повернення до %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Агов,\n\nпросто щоб ви знали, що %s поділився %s з вами.\nПодивіться: %s\n\n",
+    "The share will expire on %s." : "Доступ до спільних даних вичерпається %s.",
+    "Cheers!" : "Будьмо!",
+    "Internal Server Error" : "Внутрішня помилка серверу",
+    "The server encountered an internal error and was unable to complete your request." : "На сервері сталася внутрішня помилка, тому він не зміг виконати ваш запит.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Будь ласка, зверніться до адміністратора сервера, якщо ця помилка з'являється кілька разів, будь ласка, вкажіть технічні подробиці нижче в звіті.",
+    "More details can be found in the server log." : "Більше деталей може бути в журналі серверу.",
+    "Technical details" : "Технічні деталі",
+    "Remote Address: %s" : "Віддалена Адреса: %s",
+    "Request ID: %s" : "Запит ID: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Повідомлення: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Рядок: %s",
+    "Trace" : "Трасування",
+    "Security Warning" : "Попередження про небезпеку",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Будь ласка, оновіть вашу інсталяцію PHP для використання %s безпеки.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
+    "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
+    "Password" : "Пароль",
+    "Storage & database" : "Сховище і база даних",
+    "Data folder" : "Каталог даних",
+    "Configure the database" : "Налаштування бази даних",
+    "Only %s is available." : "Тільки %s доступно.",
+    "Database user" : "Користувач бази даних",
+    "Database password" : "Пароль для бази даних",
+    "Database name" : "Назва бази даних",
+    "Database tablespace" : "Таблиця бази даних",
+    "Database host" : "Хост бази даних",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
+    "Finish setup" : "Завершити налаштування",
+    "Finishing …" : "Завершується ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
+    "%s is available. Get more information on how to update." : "%s доступний. Отримай більше інформації про те, як оновити.",
+    "Log out" : "Вихід",
+    "Server side authentication failed!" : "Помилка аутентифікації на боці Сервера !",
+    "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
+    "Forgot your password? Reset it!" : "Забули ваш пароль? Скиньте його!",
+    "remember" : "запам'ятати",
+    "Log in" : "Вхід",
+    "Alternative Logins" : "Альтернативні Логіни",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто щоб ви знали, що %s поділився »%s« з вами.<br><a href=\"%s\">Подивіться!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Цей екземпляр OwnCloud зараз працює в монопольному режимі одного користувача",
+    "This means only administrators can use the instance." : "Це означає, що лише адміністратори можуть використовувати цей екземпляр.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Зверніться до системного адміністратора, якщо це повідомлення зберігається або з'являєтья несподівано.",
+    "Thank you for your patience." : "Дякуємо за ваше терпіння.",
+    "You are accessing the server from an untrusted domain." : "Ви зайшли на сервер з ненадійного домену.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходится в файлі config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
+    "Add \"%s\" as trusted domain" : "Додати \"%s\" як довірений",
+    "%s will be updated to version %s." : "%s буде оновлено до версії %s.",
+    "The following apps will be disabled:" : "Наступні додатки будуть відключені:",
+    "The theme %s has been disabled." : "Тему %s було вимкнено.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перш ніж продовжити, будь ласка, переконайтеся, що база даних, папка конфігурації і папка даних були дубльовані.",
+    "Start update" : "Почати оновлення",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Щоб уникнути великих таймаутів з більш тяжкими встановленнями, ви можете виконати наступну команду відносно директорії встановлення:",
+    "This %s instance is currently being updated, which may take a while." : "Цей %s екземпляр нині оновлюється, що може зайняти деякий час.",
+    "This page will refresh itself when the %s instance is available again." : "Ця сторінка автоматично перезавантажиться коли екземпляр %s стане знову доступний."
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
new file mode 100644
index 00000000000..d6b2b9dbc24
--- /dev/null
+++ b/core/l10n/uk.json
@@ -0,0 +1,210 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Неможливо надіслати пошту наступним користувачам: %s ",
+    "Turned on maintenance mode" : "Увімкнено захищений режим",
+    "Turned off maintenance mode" : "Вимкнено захищений режим",
+    "Updated database" : "Базу даних оновлено",
+    "Checked database schema update" : "Перевірено оновлення схеми бази даних",
+    "Checked database schema update for apps" : "Перевірено оновлення схеми бази даних для додатків",
+    "Updated \"%s\" to %s" : "Оновлено \"%s\" до %s",
+    "Disabled incompatible apps: %s" : "Вимкнені несумісні додатки: %s",
+    "No image or file provided" : "Немає наданого зображення або файлу",
+    "Unknown filetype" : "Невідомий тип файлу",
+    "Invalid image" : "Невірне зображення",
+    "No temporary profile picture available, try again" : "Немає доступного тимчасового профілю для малюнків, спробуйте ще раз",
+    "No crop data provided" : "Немає інформації щодо обрізки даних",
+    "Sunday" : "Неділя",
+    "Monday" : "Понеділок",
+    "Tuesday" : "Вівторок",
+    "Wednesday" : "Середа",
+    "Thursday" : "Четвер",
+    "Friday" : "П'ятниця",
+    "Saturday" : "Субота",
+    "January" : "Січень",
+    "February" : "Лютий",
+    "March" : "Березень",
+    "April" : "Квітень",
+    "May" : "Травень",
+    "June" : "Червень",
+    "July" : "Липень",
+    "August" : "Серпень",
+    "September" : "Вересень",
+    "October" : "Жовтень",
+    "November" : "Листопад",
+    "December" : "Грудень",
+    "Settings" : "Налаштування",
+    "File" : "Файл",
+    "Folder" : "Тека",
+    "Image" : "Зображення",
+    "Audio" : "Аудіо",
+    "Saving..." : "Зберігаю...",
+    "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 /> Ви дійсно хочете продовжити?",
+    "I know what I'm doing" : "Я знаю що роблю",
+    "Reset password" : "Скинути пароль",
+    "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
+    "No" : "Ні",
+    "Yes" : "Так",
+    "Choose" : "Обрати",
+    "Error loading file picker template: {error}" : "Помилка при завантаженні шаблону вибору: {error}",
+    "Ok" : "Ok",
+    "Error loading message template: {error}" : "Помилка при завантаженні шаблону повідомлення: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"],
+    "One file conflict" : "Один файловий конфлікт",
+    "New Files" : "Нових Файлів",
+    "Already existing files" : "Файли що вже існують",
+    "Which files do you want to keep?" : "Які файли ви хочете залишити?",
+    "If you select both versions, the copied file will have a number added to its name." : "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я.",
+    "Cancel" : "Відмінити",
+    "Continue" : "Продовжити",
+    "(all selected)" : "(все вибрано)",
+    "({count} selected)" : "({count} вибрано)",
+    "Error loading file exists template" : "Помилка при завантаженні файлу існуючого шаблону",
+    "Very weak password" : "Дуже слабкий пароль",
+    "Weak password" : "Слабкий пароль",
+    "So-so password" : "Такий собі пароль",
+    "Good password" : "Добрий пароль",
+    "Strong password" : "Надійний пароль",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
+    "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." : "Цей сервер не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх сховищ, повідомлення про оновлення або встановлення допоміжних програм не будуть працювати. Віддалений доступ до файлів та надсилання повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.",
+    "Error occurred while checking server setup" : "При перевірці налаштувань серверу сталася помилка",
+    "Shared" : "Опубліковано",
+    "Shared with {recipients}" : "Опубліковано для {recipients}",
+    "Share" : "Поділитися",
+    "Error" : "Помилка",
+    "Error while sharing" : "Помилка під час публікації",
+    "Error while unsharing" : "Помилка під час відміни публікації",
+    "Error while changing permissions" : "Помилка при зміні повноважень",
+    "Shared with you and the group {group} by {owner}" : " {owner} опублікував для Вас та для групи {group}",
+    "Shared with you by {owner}" : "{owner} опублікував для Вас",
+    "Share with user or group …" : "Поділитися з користувачем або групою ...",
+    "Share link" : "Опублікувати посилання",
+    "The public link will expire no later than {days} days after it is created" : "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
+    "Password protect" : "Захистити паролем",
+    "Choose a password for the public link" : "Оберіть пароль для опублікованого посилання",
+    "Allow Public Upload" : "Дозволити Публічне Завантаження",
+    "Email link to person" : "Ел. пошта належить Пану",
+    "Send" : "Надіслати",
+    "Set expiration date" : "Встановити термін дії",
+    "Expiration date" : "Термін дії",
+    "Adding user..." : "Додавання користувача...",
+    "group" : "група",
+    "Resharing is not allowed" : "Пере-публікація не дозволяється",
+    "Shared in {item} with {user}" : "Опубліковано {item} для {user}",
+    "Unshare" : "Закрити доступ",
+    "notify by email" : "повідомити по Email",
+    "can share" : "можна поділитися",
+    "can edit" : "може редагувати",
+    "access control" : "контроль доступу",
+    "create" : "створити",
+    "update" : "оновити",
+    "delete" : "видалити",
+    "Password protected" : "Захищено паролем",
+    "Error unsetting expiration date" : "Помилка при відміні терміна дії",
+    "Error setting expiration date" : "Помилка при встановленні терміна дії",
+    "Sending ..." : "Надсилання...",
+    "Email sent" : "Ел. пошта надіслана",
+    "Warning" : "Попередження",
+    "The object type is not specified." : "Не визначено тип об'єкту.",
+    "Enter new" : "Введіть новий",
+    "Delete" : "Видалити",
+    "Add" : "Додати",
+    "Edit tags" : "Редагувати теги",
+    "Error loading dialog template: {error}" : "Помилка при завантаженні шаблону діалогу: {error}",
+    "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. Redirecting you to ownCloud now." : "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
+    "Couldn't reset password because the token is invalid" : "Неможливо скинути пароль, бо маркер є недійсним",
+    "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 пароль скинуто",
+    "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}",
+    "You will receive a link to reset your password via Email." : "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
+    "Username" : "Ім'я користувача",
+    "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?" : "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?",
+    "Yes, I really want to reset my password now" : "Так, я справді бажаю скинути мій пароль зараз",
+    "Reset" : "Перевстановити",
+    "New password" : "Новий пароль",
+    "New Password" : "Новий пароль",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
+    "Personal" : "Особисте",
+    "Users" : "Користувачі",
+    "Apps" : "Додатки",
+    "Admin" : "Адмін",
+    "Help" : "Допомога",
+    "Error loading tags" : "Помилка завантаження тегів.",
+    "Tag already exists" : "Тег вже існує",
+    "Error deleting tag(s)" : "Помилка видалення тегу(ів)",
+    "Error tagging" : "Помилка встановлення тегів",
+    "Error untagging" : "Помилка зняття тегів",
+    "Error favoriting" : "Помилка позначення улюблених",
+    "Error unfavoriting" : "Помилка зняття позначки улюблених",
+    "Access forbidden" : "Доступ заборонено",
+    "File not found" : "Файл не знайдено",
+    "The specified document has not been found on the server." : "Не вдалось знайти вказаний документ на сервері.",
+    "You can click here to return to %s." : "Ви можете натиснути тут для повернення до %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Агов,\n\nпросто щоб ви знали, що %s поділився %s з вами.\nПодивіться: %s\n\n",
+    "The share will expire on %s." : "Доступ до спільних даних вичерпається %s.",
+    "Cheers!" : "Будьмо!",
+    "Internal Server Error" : "Внутрішня помилка серверу",
+    "The server encountered an internal error and was unable to complete your request." : "На сервері сталася внутрішня помилка, тому він не зміг виконати ваш запит.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Будь ласка, зверніться до адміністратора сервера, якщо ця помилка з'являється кілька разів, будь ласка, вкажіть технічні подробиці нижче в звіті.",
+    "More details can be found in the server log." : "Більше деталей може бути в журналі серверу.",
+    "Technical details" : "Технічні деталі",
+    "Remote Address: %s" : "Віддалена Адреса: %s",
+    "Request ID: %s" : "Запит ID: %s",
+    "Code: %s" : "Код: %s",
+    "Message: %s" : "Повідомлення: %s",
+    "File: %s" : "Файл: %s",
+    "Line: %s" : "Рядок: %s",
+    "Trace" : "Трасування",
+    "Security Warning" : "Попередження про небезпеку",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Будь ласка, оновіть вашу інсталяцію PHP для використання %s безпеки.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
+    "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
+    "Password" : "Пароль",
+    "Storage & database" : "Сховище і база даних",
+    "Data folder" : "Каталог даних",
+    "Configure the database" : "Налаштування бази даних",
+    "Only %s is available." : "Тільки %s доступно.",
+    "Database user" : "Користувач бази даних",
+    "Database password" : "Пароль для бази даних",
+    "Database name" : "Назва бази даних",
+    "Database tablespace" : "Таблиця бази даних",
+    "Database host" : "Хост бази даних",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
+    "Finish setup" : "Завершити налаштування",
+    "Finishing …" : "Завершується ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
+    "%s is available. Get more information on how to update." : "%s доступний. Отримай більше інформації про те, як оновити.",
+    "Log out" : "Вихід",
+    "Server side authentication failed!" : "Помилка аутентифікації на боці Сервера !",
+    "Please contact your administrator." : "Будь ласка, зверніться до вашого Адміністратора.",
+    "Forgot your password? Reset it!" : "Забули ваш пароль? Скиньте його!",
+    "remember" : "запам'ятати",
+    "Log in" : "Вхід",
+    "Alternative Logins" : "Альтернативні Логіни",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Агов,<br><br>просто щоб ви знали, що %s поділився »%s« з вами.<br><a href=\"%s\">Подивіться!</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "Цей екземпляр OwnCloud зараз працює в монопольному режимі одного користувача",
+    "This means only administrators can use the instance." : "Це означає, що лише адміністратори можуть використовувати цей екземпляр.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Зверніться до системного адміністратора, якщо це повідомлення зберігається або з'являєтья несподівано.",
+    "Thank you for your patience." : "Дякуємо за ваше терпіння.",
+    "You are accessing the server from an untrusted domain." : "Ви зайшли на сервер з ненадійного домену.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходится в файлі config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
+    "Add \"%s\" as trusted domain" : "Додати \"%s\" як довірений",
+    "%s will be updated to version %s." : "%s буде оновлено до версії %s.",
+    "The following apps will be disabled:" : "Наступні додатки будуть відключені:",
+    "The theme %s has been disabled." : "Тему %s було вимкнено.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Перш ніж продовжити, будь ласка, переконайтеся, що база даних, папка конфігурації і папка даних були дубльовані.",
+    "Start update" : "Почати оновлення",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Щоб уникнути великих таймаутів з більш тяжкими встановленнями, ви можете виконати наступну команду відносно директорії встановлення:",
+    "This %s instance is currently being updated, which may take a while." : "Цей %s екземпляр нині оновлюється, що може зайняти деякий час.",
+    "This page will refresh itself when the %s instance is available again." : "Ця сторінка автоматично перезавантажиться коли екземпляр %s стане знову доступний."
+},"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/uk.php b/core/l10n/uk.php
deleted file mode 100644
index 591198fd7d9..00000000000
--- a/core/l10n/uk.php
+++ /dev/null
@@ -1,211 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Неможливо надіслати пошту наступним користувачам: %s ",
-"Turned on maintenance mode" => "Увімкнено захищений режим",
-"Turned off maintenance mode" => "Вимкнено захищений режим",
-"Updated database" => "Базу даних оновлено",
-"Checked database schema update" => "Перевірено оновлення схеми бази даних",
-"Checked database schema update for apps" => "Перевірено оновлення схеми бази даних для додатків",
-"Updated \"%s\" to %s" => "Оновлено \"%s\" до %s",
-"Disabled incompatible apps: %s" => "Вимкнені несумісні додатки: %s",
-"No image or file provided" => "Немає наданого зображення або файлу",
-"Unknown filetype" => "Невідомий тип файлу",
-"Invalid image" => "Невірне зображення",
-"No temporary profile picture available, try again" => "Немає доступного тимчасового профілю для малюнків, спробуйте ще раз",
-"No crop data provided" => "Немає інформації щодо обрізки даних",
-"Sunday" => "Неділя",
-"Monday" => "Понеділок",
-"Tuesday" => "Вівторок",
-"Wednesday" => "Середа",
-"Thursday" => "Четвер",
-"Friday" => "П'ятниця",
-"Saturday" => "Субота",
-"January" => "Січень",
-"February" => "Лютий",
-"March" => "Березень",
-"April" => "Квітень",
-"May" => "Травень",
-"June" => "Червень",
-"July" => "Липень",
-"August" => "Серпень",
-"September" => "Вересень",
-"October" => "Жовтень",
-"November" => "Листопад",
-"December" => "Грудень",
-"Settings" => "Налаштування",
-"File" => "Файл",
-"Folder" => "Тека",
-"Image" => "Зображення",
-"Audio" => "Аудіо",
-"Saving..." => "Зберігаю...",
-"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 /> Ви дійсно хочете продовжити?",
-"I know what I'm doing" => "Я знаю що роблю",
-"Reset password" => "Скинути пароль",
-"Password can not be changed. Please contact your administrator." => "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
-"No" => "Ні",
-"Yes" => "Так",
-"Choose" => "Обрати",
-"Error loading file picker template: {error}" => "Помилка при завантаженні шаблону вибору: {error}",
-"Ok" => "Ok",
-"Error loading message template: {error}" => "Помилка при завантаженні шаблону повідомлення: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} файловий конфлікт","{count} файлових конфліктів","{count} файлових конфліктів"),
-"One file conflict" => "Один файловий конфлікт",
-"New Files" => "Нових Файлів",
-"Already existing files" => "Файли що вже існують",
-"Which files do you want to keep?" => "Які файли ви хочете залишити?",
-"If you select both versions, the copied file will have a number added to its name." => "Якщо ви оберете обидві версії, скопійований файл буде мати номер, доданий у його ім'я.",
-"Cancel" => "Відмінити",
-"Continue" => "Продовжити",
-"(all selected)" => "(все вибрано)",
-"({count} selected)" => "({count} вибрано)",
-"Error loading file exists template" => "Помилка при завантаженні файлу існуючого шаблону",
-"Very weak password" => "Дуже слабкий пароль",
-"Weak password" => "Слабкий пароль",
-"So-so password" => "Такий собі пароль",
-"Good password" => "Добрий пароль",
-"Strong password" => "Надійний пароль",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Ваш Web-сервер ще не налаштований належним чином для того, щоб дозволити синхронізацію файлів, через те що інтерфейс WebDAV, здається, зламаний.",
-"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." => "Цей сервер не має під'єднання до Інтернету. Це означає, що деякі функції, такі як монтування зовнішніх сховищ, повідомлення про оновлення або встановлення допоміжних програм не будуть працювати. Віддалений доступ до файлів та надсилання повідомлень електронною поштою також може не працювати. Ми пропонуємо увімкнути під'єднання до Інтернету для даного сервера, якщо ви хочете мати всі можливості ownCloud.",
-"Error occurred while checking server setup" => "При перевірці налаштувань серверу сталася помилка",
-"Shared" => "Опубліковано",
-"Shared with {recipients}" => "Опубліковано для {recipients}",
-"Share" => "Поділитися",
-"Error" => "Помилка",
-"Error while sharing" => "Помилка під час публікації",
-"Error while unsharing" => "Помилка під час відміни публікації",
-"Error while changing permissions" => "Помилка при зміні повноважень",
-"Shared with you and the group {group} by {owner}" => " {owner} опублікував для Вас та для групи {group}",
-"Shared with you by {owner}" => "{owner} опублікував для Вас",
-"Share with user or group …" => "Поділитися з користувачем або групою ...",
-"Share link" => "Опублікувати посилання",
-"The public link will expire no later than {days} days after it is created" => "Доступ до опублікованого посилання буде припинено не пізніше ніж через {days} днів з моменту створення",
-"Password protect" => "Захистити паролем",
-"Choose a password for the public link" => "Оберіть пароль для опублікованого посилання",
-"Allow Public Upload" => "Дозволити Публічне Завантаження",
-"Email link to person" => "Ел. пошта належить Пану",
-"Send" => "Надіслати",
-"Set expiration date" => "Встановити термін дії",
-"Expiration date" => "Термін дії",
-"Adding user..." => "Додавання користувача...",
-"group" => "група",
-"Resharing is not allowed" => "Пере-публікація не дозволяється",
-"Shared in {item} with {user}" => "Опубліковано {item} для {user}",
-"Unshare" => "Закрити доступ",
-"notify by email" => "повідомити по Email",
-"can share" => "можна поділитися",
-"can edit" => "може редагувати",
-"access control" => "контроль доступу",
-"create" => "створити",
-"update" => "оновити",
-"delete" => "видалити",
-"Password protected" => "Захищено паролем",
-"Error unsetting expiration date" => "Помилка при відміні терміна дії",
-"Error setting expiration date" => "Помилка при встановленні терміна дії",
-"Sending ..." => "Надсилання...",
-"Email sent" => "Ел. пошта надіслана",
-"Warning" => "Попередження",
-"The object type is not specified." => "Не визначено тип об'єкту.",
-"Enter new" => "Введіть новий",
-"Delete" => "Видалити",
-"Add" => "Додати",
-"Edit tags" => "Редагувати теги",
-"Error loading dialog template: {error}" => "Помилка при завантаженні шаблону діалогу: {error}",
-"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. Redirecting you to ownCloud now." => "Оновлення виконалось успішно. Перенаправляємо вас на  ownCloud.",
-"Couldn't reset password because the token is invalid" => "Неможливо скинути пароль, бо маркер є недійсним",
-"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 пароль скинуто",
-"Use the following link to reset your password: {link}" => "Використовуйте наступне посилання для скидання пароля: {link}",
-"You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
-"Username" => "Ім'я користувача",
-"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?" => "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?",
-"Yes, I really want to reset my password now" => "Так, я справді бажаю скинути мій пароль зараз",
-"Reset" => "Перевстановити",
-"New password" => "Новий пароль",
-"New Password" => "Новий пароль",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
-"For the best results, please consider using a GNU/Linux server instead." => "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
-"Personal" => "Особисте",
-"Users" => "Користувачі",
-"Apps" => "Додатки",
-"Admin" => "Адмін",
-"Help" => "Допомога",
-"Error loading tags" => "Помилка завантаження тегів.",
-"Tag already exists" => "Тег вже існує",
-"Error deleting tag(s)" => "Помилка видалення тегу(ів)",
-"Error tagging" => "Помилка встановлення тегів",
-"Error untagging" => "Помилка зняття тегів",
-"Error favoriting" => "Помилка позначення улюблених",
-"Error unfavoriting" => "Помилка зняття позначки улюблених",
-"Access forbidden" => "Доступ заборонено",
-"File not found" => "Файл не знайдено",
-"The specified document has not been found on the server." => "Не вдалось знайти вказаний документ на сервері.",
-"You can click here to return to %s." => "Ви можете натиснути тут для повернення до %s.",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Агов,\n\nпросто щоб ви знали, що %s поділився %s з вами.\nПодивіться: %s\n\n",
-"The share will expire on %s." => "Доступ до спільних даних вичерпається %s.",
-"Cheers!" => "Будьмо!",
-"Internal Server Error" => "Внутрішня помилка серверу",
-"The server encountered an internal error and was unable to complete your request." => "На сервері сталася внутрішня помилка, тому він не зміг виконати ваш запит.",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "Будь ласка, зверніться до адміністратора сервера, якщо ця помилка з'являється кілька разів, будь ласка, вкажіть технічні подробиці нижче в звіті.",
-"More details can be found in the server log." => "Більше деталей може бути в журналі серверу.",
-"Technical details" => "Технічні деталі",
-"Remote Address: %s" => "Віддалена Адреса: %s",
-"Request ID: %s" => "Запит ID: %s",
-"Code: %s" => "Код: %s",
-"Message: %s" => "Повідомлення: %s",
-"File: %s" => "Файл: %s",
-"Line: %s" => "Рядок: %s",
-"Trace" => "Трасування",
-"Security Warning" => "Попередження про небезпеку",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Ваша версія PHP вразлива для атак NULL Byte (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Будь ласка, оновіть вашу інсталяцію PHP для використання %s безпеки.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
-"Create an <strong>admin account</strong>" => "Створити <strong>обліковий запис адміністратора</strong>",
-"Password" => "Пароль",
-"Storage & database" => "Сховище і база даних",
-"Data folder" => "Каталог даних",
-"Configure the database" => "Налаштування бази даних",
-"Only %s is available." => "Тільки %s доступно.",
-"Database user" => "Користувач бази даних",
-"Database password" => "Пароль для бази даних",
-"Database name" => "Назва бази даних",
-"Database tablespace" => "Таблиця бази даних",
-"Database host" => "Хост бази даних",
-"SQLite will be used as database. For larger installations we recommend to change this." => "Ви використовуете SQLite для вашої бази даних. Для більш навантажених серверів, ми рекомендуемо змінити це.",
-"Finish setup" => "Завершити налаштування",
-"Finishing …" => "Завершується ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "Для цього додатка потрібна наявність Java для коректної роботи. Будь ласка, <a href=\"http://enable-javascript.com/\" target=\"_blank\"> увімкніть JavaScript </a> і перезавантажте сторінку.",
-"%s is available. Get more information on how to update." => "%s доступний. Отримай більше інформації про те, як оновити.",
-"Log out" => "Вихід",
-"Server side authentication failed!" => "Помилка аутентифікації на боці Сервера !",
-"Please contact your administrator." => "Будь ласка, зверніться до вашого Адміністратора.",
-"Forgot your password? Reset it!" => "Забули ваш пароль? Скиньте його!",
-"remember" => "запам'ятати",
-"Log in" => "Вхід",
-"Alternative Logins" => "Альтернативні Логіни",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "Агов,<br><br>просто щоб ви знали, що %s поділився »%s« з вами.<br><a href=\"%s\">Подивіться!</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "Цей екземпляр OwnCloud зараз працює в монопольному режимі одного користувача",
-"This means only administrators can use the instance." => "Це означає, що лише адміністратори можуть використовувати цей екземпляр.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Зверніться до системного адміністратора, якщо це повідомлення зберігається або з'являєтья несподівано.",
-"Thank you for your patience." => "Дякуємо за ваше терпіння.",
-"You are accessing the server from an untrusted domain." => "Ви зайшли на сервер з ненадійного домену.",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "Будь ласка, зверніться до адміністратора. Якщо ви є адміністратором цього серверу, ви можете налаштувати опцію \"trusted_domain\" в конфігураційному файлі config/config.php. Приклад конфігурації знаходится в файлі config/config.sample.php.",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "Залежно від конфігурації Ви як адміністратор можете додати цей домен у список довірених, використовуйте кнопку нижче.",
-"Add \"%s\" as trusted domain" => "Додати \"%s\" як довірений",
-"%s will be updated to version %s." => "%s буде оновлено до версії %s.",
-"The following apps will be disabled:" => "Наступні додатки будуть відключені:",
-"The theme %s has been disabled." => "Тему %s було вимкнено.",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "Перш ніж продовжити, будь ласка, переконайтеся, що база даних, папка конфігурації і папка даних були дубльовані.",
-"Start update" => "Почати оновлення",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "Щоб уникнути великих таймаутів з більш тяжкими встановленнями, ви можете виконати наступну команду відносно директорії встановлення:",
-"This %s instance is currently being updated, which may take a while." => "Цей %s екземпляр нині оновлюється, що може зайняти деякий час.",
-"This page will refresh itself when the %s instance is available again." => "Ця сторінка автоматично перезавантажиться коли екземпляр %s стане знову доступний."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
new file mode 100644
index 00000000000..bd8a3bba292
--- /dev/null
+++ b/core/l10n/ur_PK.js
@@ -0,0 +1,127 @@
+OC.L10N.register(
+    "core",
+    {
+    "Turned on maintenance mode" : "بحالی موڈ چالو ہے",
+    "Turned off maintenance mode" : "بحالی موڈ بند ہے",
+    "Updated database" : "اپ ڈیٹ ہوئ ڈیٹا بیس",
+    "No image or file provided" : "کوئی تصویر یا فائل فراہم نہیں",
+    "Unknown filetype" : "غیر معرروف قسم کی فائل",
+    "Invalid image" : "غلط تصویر",
+    "No crop data provided" : "کوئی کروپ ڈیٹا ميسر نہیں ",
+    "Sunday" : "اتوار",
+    "Monday" : "سوموار",
+    "Tuesday" : "منگل",
+    "Wednesday" : "بدھ",
+    "Thursday" : "جمعرات",
+    "Friday" : "جمعہ",
+    "Saturday" : "ہفتہ",
+    "January" : "جنوری",
+    "February" : "فرورئ",
+    "March" : "مارچ",
+    "April" : "اپریل",
+    "May" : "مئی",
+    "June" : "جون",
+    "July" : "جولائی",
+    "August" : "اگست",
+    "September" : "ستمبر",
+    "October" : "اکتوبر",
+    "November" : "نومبر",
+    "December" : "دسمبر",
+    "Settings" : "ترتیبات",
+    "Saving..." : "محفوظ ھو رہا ہے ...",
+    "Reset password" : "ری سیٹ پاسورڈ",
+    "No" : "نہیں",
+    "Yes" : "ہاں",
+    "Choose" : "منتخب کریں",
+    "Ok" : "اوکے",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{گنتی} فائل متصادم ","{گنتی} فائل متصادم "],
+    "One file conflict" : "اایک فائل متصادم ہے",
+    "New Files" : "جدید فائلیں",
+    "Already existing files" : "پہلے سے موجودجدید فائلیں",
+    "Which files do you want to keep?" : "آپ کون سی فائلیں رکھنا چاہتے ہیں  ؟",
+    "Cancel" : "منسوخ کریں",
+    "Continue" : "جاری",
+    "(all selected)" : "(سب منتخب شدہ)",
+    "({count} selected)" : "({گنتی} منتخب شدہ)",
+    "Very weak password" : "بہت کمزور پاسورڈ",
+    "Weak password" : "کمزور پاسورڈ",
+    "So-so password" : "نص نص پاسورڈ",
+    "Good password" : "اچھا پاسورڈ",
+    "Strong password" : "مضبوط پاسورڈ",
+    "Shared" : "اشتراک شدہ",
+    "Share" : "اشتراک",
+    "Error" : "خرابی",
+    "Error while sharing" : "اشتراک کے دوران خرابی ",
+    "Error while unsharing" : "اشترک ختم کرنے کے دوران خرابی",
+    "Error while changing permissions" : "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
+    "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
+    "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
+    "Share with user or group …" : "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
+    "Share link" : "اشتراک لنک",
+    "Password protect" : "محفوظ پاسورڈ",
+    "Choose a password for the public link" : "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
+    "Allow Public Upload" : "پبلک اپ لوڈ کرنے کی اجازت دیں",
+    "Email link to person" : "شحص کے لیے ای میل لنک",
+    "Send" : "بھجیں",
+    "Set expiration date" : "تاریخ معیاد سیٹ کریں",
+    "Expiration date" : "تاریخ معیاد",
+    "group" : "مجموعہ",
+    "Resharing is not allowed" : "دوبارہ اشتراک کی اجازت نہیں",
+    "Shared in {item} with {user}" : "شراکت میں {آئٹم}اور {مستخدم}",
+    "Unshare" : "شئیرنگ ختم کریں",
+    "notify by email" : "ای میل کے ذریعے مطلع کریں",
+    "can edit" : "تبدیل کر سکے ھیں",
+    "access control" : "اسیس کنٹرول",
+    "create" : "نیا بنائیں",
+    "update" : "اپ ڈیٹ",
+    "delete" : "ختم کریں",
+    "Password protected" : "پاسورڈ سے محفوظ کیا گیا ہے",
+    "Error unsetting expiration date" : "خرابی غیر تصحیح تاریخ معیاد",
+    "Error setting expiration date" : "خرابی  تصحیح تاریخ معیاد",
+    "Sending ..." : "ارسال ہو رہا ھے",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Warning" : "انتباہ",
+    "The object type is not specified." : "اس چیز کی قسم کی وضاحت نہیں",
+    "Enter new" : "جدید درج کریں",
+    "Delete" : "حذف کریں",
+    "Add" : "شامل کریں",
+    "Edit tags" : "ترمیم ٹیگز",
+    "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
+    "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
+    "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
+    "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
+    "Username" : "یوزر نیم",
+    "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
+    "Reset" : "ری سیٹ",
+    "New password" : "نیا پاسورڈ",
+    "Personal" : "شخصی",
+    "Users" : "صارفین",
+    "Apps" : "ایپز",
+    "Admin" : "ایڈمن",
+    "Help" : "مدد",
+    "Access forbidden" : "رسائ منقطع ہے",
+    "Cheers!" : "واہ!",
+    "Security Warning" : "حفاظتی انتباہ",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
+    "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+    "Password" : "پاسورڈ",
+    "Storage & database" : "ذخیرہ اور ڈیٹا بیس",
+    "Data folder" : "ڈیٹا فولڈر",
+    "Configure the database" : "ڈیٹا بیس کونفگر کریں",
+    "Database user" : "ڈیٹابیس یوزر",
+    "Database password" : "ڈیٹابیس پاسورڈ",
+    "Database name" : "ڈیٹابیس کا نام",
+    "Database tablespace" : "ڈیٹابیس ٹیبل سپیس",
+    "Database host" : "ڈیٹابیس ہوسٹ",
+    "Finish setup" : "سیٹ اپ ختم کریں",
+    "Finishing …" : "تکمیل ...",
+    "%s is available. Get more information on how to update." : "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں.",
+    "Log out" : "لاگ آؤٹ",
+    "remember" : "یاد رکھیں",
+    "Log in" : "لاگ ان",
+    "Alternative Logins" : "متبادل لاگ ان ",
+    "Thank you for your patience." : "آپ کے صبر کا شکریہ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
new file mode 100644
index 00000000000..d4477e742ec
--- /dev/null
+++ b/core/l10n/ur_PK.json
@@ -0,0 +1,125 @@
+{ "translations": {
+    "Turned on maintenance mode" : "بحالی موڈ چالو ہے",
+    "Turned off maintenance mode" : "بحالی موڈ بند ہے",
+    "Updated database" : "اپ ڈیٹ ہوئ ڈیٹا بیس",
+    "No image or file provided" : "کوئی تصویر یا فائل فراہم نہیں",
+    "Unknown filetype" : "غیر معرروف قسم کی فائل",
+    "Invalid image" : "غلط تصویر",
+    "No crop data provided" : "کوئی کروپ ڈیٹا ميسر نہیں ",
+    "Sunday" : "اتوار",
+    "Monday" : "سوموار",
+    "Tuesday" : "منگل",
+    "Wednesday" : "بدھ",
+    "Thursday" : "جمعرات",
+    "Friday" : "جمعہ",
+    "Saturday" : "ہفتہ",
+    "January" : "جنوری",
+    "February" : "فرورئ",
+    "March" : "مارچ",
+    "April" : "اپریل",
+    "May" : "مئی",
+    "June" : "جون",
+    "July" : "جولائی",
+    "August" : "اگست",
+    "September" : "ستمبر",
+    "October" : "اکتوبر",
+    "November" : "نومبر",
+    "December" : "دسمبر",
+    "Settings" : "ترتیبات",
+    "Saving..." : "محفوظ ھو رہا ہے ...",
+    "Reset password" : "ری سیٹ پاسورڈ",
+    "No" : "نہیں",
+    "Yes" : "ہاں",
+    "Choose" : "منتخب کریں",
+    "Ok" : "اوکے",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{گنتی} فائل متصادم ","{گنتی} فائل متصادم "],
+    "One file conflict" : "اایک فائل متصادم ہے",
+    "New Files" : "جدید فائلیں",
+    "Already existing files" : "پہلے سے موجودجدید فائلیں",
+    "Which files do you want to keep?" : "آپ کون سی فائلیں رکھنا چاہتے ہیں  ؟",
+    "Cancel" : "منسوخ کریں",
+    "Continue" : "جاری",
+    "(all selected)" : "(سب منتخب شدہ)",
+    "({count} selected)" : "({گنتی} منتخب شدہ)",
+    "Very weak password" : "بہت کمزور پاسورڈ",
+    "Weak password" : "کمزور پاسورڈ",
+    "So-so password" : "نص نص پاسورڈ",
+    "Good password" : "اچھا پاسورڈ",
+    "Strong password" : "مضبوط پاسورڈ",
+    "Shared" : "اشتراک شدہ",
+    "Share" : "اشتراک",
+    "Error" : "خرابی",
+    "Error while sharing" : "اشتراک کے دوران خرابی ",
+    "Error while unsharing" : "اشترک ختم کرنے کے دوران خرابی",
+    "Error while changing permissions" : "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
+    "Shared with you and the group {group} by {owner}" : "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
+    "Shared with you by {owner}" : "اشتراک شدہ آپ سے{مالک}",
+    "Share with user or group …" : "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
+    "Share link" : "اشتراک لنک",
+    "Password protect" : "محفوظ پاسورڈ",
+    "Choose a password for the public link" : "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
+    "Allow Public Upload" : "پبلک اپ لوڈ کرنے کی اجازت دیں",
+    "Email link to person" : "شحص کے لیے ای میل لنک",
+    "Send" : "بھجیں",
+    "Set expiration date" : "تاریخ معیاد سیٹ کریں",
+    "Expiration date" : "تاریخ معیاد",
+    "group" : "مجموعہ",
+    "Resharing is not allowed" : "دوبارہ اشتراک کی اجازت نہیں",
+    "Shared in {item} with {user}" : "شراکت میں {آئٹم}اور {مستخدم}",
+    "Unshare" : "شئیرنگ ختم کریں",
+    "notify by email" : "ای میل کے ذریعے مطلع کریں",
+    "can edit" : "تبدیل کر سکے ھیں",
+    "access control" : "اسیس کنٹرول",
+    "create" : "نیا بنائیں",
+    "update" : "اپ ڈیٹ",
+    "delete" : "ختم کریں",
+    "Password protected" : "پاسورڈ سے محفوظ کیا گیا ہے",
+    "Error unsetting expiration date" : "خرابی غیر تصحیح تاریخ معیاد",
+    "Error setting expiration date" : "خرابی  تصحیح تاریخ معیاد",
+    "Sending ..." : "ارسال ہو رہا ھے",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Warning" : "انتباہ",
+    "The object type is not specified." : "اس چیز کی قسم کی وضاحت نہیں",
+    "Enter new" : "جدید درج کریں",
+    "Delete" : "حذف کریں",
+    "Add" : "شامل کریں",
+    "Edit tags" : "ترمیم ٹیگز",
+    "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
+    "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
+    "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
+    "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
+    "Username" : "یوزر نیم",
+    "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
+    "Reset" : "ری سیٹ",
+    "New password" : "نیا پاسورڈ",
+    "Personal" : "شخصی",
+    "Users" : "صارفین",
+    "Apps" : "ایپز",
+    "Admin" : "ایڈمن",
+    "Help" : "مدد",
+    "Access forbidden" : "رسائ منقطع ہے",
+    "Cheers!" : "واہ!",
+    "Security Warning" : "حفاظتی انتباہ",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
+    "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+    "Password" : "پاسورڈ",
+    "Storage & database" : "ذخیرہ اور ڈیٹا بیس",
+    "Data folder" : "ڈیٹا فولڈر",
+    "Configure the database" : "ڈیٹا بیس کونفگر کریں",
+    "Database user" : "ڈیٹابیس یوزر",
+    "Database password" : "ڈیٹابیس پاسورڈ",
+    "Database name" : "ڈیٹابیس کا نام",
+    "Database tablespace" : "ڈیٹابیس ٹیبل سپیس",
+    "Database host" : "ڈیٹابیس ہوسٹ",
+    "Finish setup" : "سیٹ اپ ختم کریں",
+    "Finishing …" : "تکمیل ...",
+    "%s is available. Get more information on how to update." : "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں.",
+    "Log out" : "لاگ آؤٹ",
+    "remember" : "یاد رکھیں",
+    "Log in" : "لاگ ان",
+    "Alternative Logins" : "متبادل لاگ ان ",
+    "Thank you for your patience." : "آپ کے صبر کا شکریہ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ur_PK.php b/core/l10n/ur_PK.php
deleted file mode 100644
index fa7fcbcf6db..00000000000
--- a/core/l10n/ur_PK.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Turned on maintenance mode" => "بحالی موڈ چالو ہے",
-"Turned off maintenance mode" => "بحالی موڈ بند ہے",
-"Updated database" => "اپ ڈیٹ ہوئ ڈیٹا بیس",
-"No image or file provided" => "کوئی تصویر یا فائل فراہم نہیں",
-"Unknown filetype" => "غیر معرروف قسم کی فائل",
-"Invalid image" => "غلط تصویر",
-"No crop data provided" => "کوئی کروپ ڈیٹا ميسر نہیں ",
-"Sunday" => "اتوار",
-"Monday" => "سوموار",
-"Tuesday" => "منگل",
-"Wednesday" => "بدھ",
-"Thursday" => "جمعرات",
-"Friday" => "جمعہ",
-"Saturday" => "ہفتہ",
-"January" => "جنوری",
-"February" => "فرورئ",
-"March" => "مارچ",
-"April" => "اپریل",
-"May" => "مئی",
-"June" => "جون",
-"July" => "جولائی",
-"August" => "اگست",
-"September" => "ستمبر",
-"October" => "اکتوبر",
-"November" => "نومبر",
-"December" => "دسمبر",
-"Settings" => "ترتیبات",
-"Saving..." => "محفوظ ھو رہا ہے ...",
-"Reset password" => "ری سیٹ پاسورڈ",
-"No" => "نہیں",
-"Yes" => "ہاں",
-"Choose" => "منتخب کریں",
-"Ok" => "اوکے",
-"_{count} file conflict_::_{count} file conflicts_" => array("{گنتی} فائل متصادم ","{گنتی} فائل متصادم "),
-"One file conflict" => "اایک فائل متصادم ہے",
-"New Files" => "جدید فائلیں",
-"Already existing files" => "پہلے سے موجودجدید فائلیں",
-"Which files do you want to keep?" => "آپ کون سی فائلیں رکھنا چاہتے ہیں  ؟",
-"Cancel" => "منسوخ کریں",
-"Continue" => "جاری",
-"(all selected)" => "(سب منتخب شدہ)",
-"({count} selected)" => "({گنتی} منتخب شدہ)",
-"Very weak password" => "بہت کمزور پاسورڈ",
-"Weak password" => "کمزور پاسورڈ",
-"So-so password" => "نص نص پاسورڈ",
-"Good password" => "اچھا پاسورڈ",
-"Strong password" => "مضبوط پاسورڈ",
-"Shared" => "اشتراک شدہ",
-"Share" => "اشتراک",
-"Error" => "خرابی",
-"Error while sharing" => "اشتراک کے دوران خرابی ",
-"Error while unsharing" => "اشترک ختم کرنے کے دوران خرابی",
-"Error while changing permissions" => "اختیارات کو تبدیل کرنے کے دوران  خرابی ",
-"Shared with you and the group {group} by {owner}" => "آپ اور گروہ سے مشترق شدہ {گروہ } سے {مالک}",
-"Shared with you by {owner}" => "اشتراک شدہ آپ سے{مالک}",
-"Share with user or group …" => "صارف یا مجموعہ کے ساتھ اشتراک کریں ...",
-"Share link" => "اشتراک لنک",
-"Password protect" => "محفوظ پاسورڈ",
-"Choose a password for the public link" => "عوامی لنک کے لئےپاس ورڈ منتخب کریں",
-"Allow Public Upload" => "پبلک اپ لوڈ کرنے کی اجازت دیں",
-"Email link to person" => "شحص کے لیے ای میل لنک",
-"Send" => "بھجیں",
-"Set expiration date" => "تاریخ معیاد سیٹ کریں",
-"Expiration date" => "تاریخ معیاد",
-"group" => "مجموعہ",
-"Resharing is not allowed" => "دوبارہ اشتراک کی اجازت نہیں",
-"Shared in {item} with {user}" => "شراکت میں {آئٹم}اور {مستخدم}",
-"Unshare" => "شئیرنگ ختم کریں",
-"notify by email" => "ای میل کے ذریعے مطلع کریں",
-"can edit" => "تبدیل کر سکے ھیں",
-"access control" => "اسیس کنٹرول",
-"create" => "نیا بنائیں",
-"update" => "اپ ڈیٹ",
-"delete" => "ختم کریں",
-"Password protected" => "پاسورڈ سے محفوظ کیا گیا ہے",
-"Error unsetting expiration date" => "خرابی غیر تصحیح تاریخ معیاد",
-"Error setting expiration date" => "خرابی  تصحیح تاریخ معیاد",
-"Sending ..." => "ارسال ہو رہا ھے",
-"Email sent" => "ارسال شدہ ای میل ",
-"Warning" => "انتباہ",
-"The object type is not specified." => "اس چیز کی قسم کی وضاحت نہیں",
-"Enter new" => "جدید درج کریں",
-"Delete" => "حذف کریں",
-"Add" => "شامل کریں",
-"Edit tags" => "ترمیم ٹیگز",
-"Please reload the page." => "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
-"The update was successful. Redirecting you to ownCloud now." => "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
-"Use the following link to reset your password: {link}" => "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
-"You will receive a link to reset your password via Email." => "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
-"Username" => "یوزر نیم",
-"Yes, I really want to reset my password now" => "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
-"Reset" => "ری سیٹ",
-"New password" => "نیا پاسورڈ",
-"Personal" => "شخصی",
-"Users" => "صارفین",
-"Apps" => "ایپز",
-"Admin" => "ایڈمن",
-"Help" => "مدد",
-"Access forbidden" => "رسائ منقطع ہے",
-"Cheers!" => "واہ!",
-"Security Warning" => "حفاظتی انتباہ",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "آپ کا پی ایچ پی ورین نل بائٹ کے حملے کے خطرے سے دوچار  ہے (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
-"Create an <strong>admin account</strong>" => "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
-"Password" => "پاسورڈ",
-"Storage & database" => "ذخیرہ اور ڈیٹا بیس",
-"Data folder" => "ڈیٹا فولڈر",
-"Configure the database" => "ڈیٹا بیس کونفگر کریں",
-"Database user" => "ڈیٹابیس یوزر",
-"Database password" => "ڈیٹابیس پاسورڈ",
-"Database name" => "ڈیٹابیس کا نام",
-"Database tablespace" => "ڈیٹابیس ٹیبل سپیس",
-"Database host" => "ڈیٹابیس ہوسٹ",
-"Finish setup" => "سیٹ اپ ختم کریں",
-"Finishing …" => "تکمیل ...",
-"%s is available. Get more information on how to update." => "%s دستیاب ہے. اپ ڈیٹ کرنے کے  بارے میں مزید معلومات حاصل کریں.",
-"Log out" => "لاگ آؤٹ",
-"remember" => "یاد رکھیں",
-"Log in" => "لاگ ان",
-"Alternative Logins" => "متبادل لاگ ان ",
-"Thank you for your patience." => "آپ کے صبر کا شکریہ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/uz.js b/core/l10n/uz.js
new file mode 100644
index 00000000000..87077ecad97
--- /dev/null
+++ b/core/l10n/uz.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/uz.json b/core/l10n/uz.json
new file mode 100644
index 00000000000..c499f696550
--- /dev/null
+++ b/core/l10n/uz.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : [""]
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/uz.php b/core/l10n/uz.php
deleted file mode 100644
index 1191769faa7..00000000000
--- a/core/l10n/uz.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
new file mode 100644
index 00000000000..76ad5232fd6
--- /dev/null
+++ b/core/l10n/vi.js
@@ -0,0 +1,144 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "Không thể gửi thư cho người dùng: %s",
+    "Turned on maintenance mode" : "Bật chế độ bảo trì",
+    "Turned off maintenance mode" : "Tắt chế độ bảo trì",
+    "Updated database" : "Cơ sở dữ liệu đã được cập nhật",
+    "No image or file provided" : "Không có hình ảnh hoặc tập tin được cung cấp",
+    "Unknown filetype" : "Không biết kiểu tập tin",
+    "Invalid image" : "Hình ảnh không hợp lệ",
+    "No temporary profile picture available, try again" : "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại",
+    "No crop data provided" : "Không có dữ liệu nguồn được cung cấp",
+    "Sunday" : "Chủ nhật",
+    "Monday" : "Thứ 2",
+    "Tuesday" : "Thứ 3",
+    "Wednesday" : "Thứ 4",
+    "Thursday" : "Thứ 5",
+    "Friday" : "Thứ ",
+    "Saturday" : "Thứ 7",
+    "January" : "Tháng 1",
+    "February" : "Tháng 2",
+    "March" : "Tháng 3",
+    "April" : "Tháng 4",
+    "May" : "Tháng 5",
+    "June" : "Tháng 6",
+    "July" : "Tháng 7",
+    "August" : "Tháng 8",
+    "September" : "Tháng 9",
+    "October" : "Tháng 10",
+    "November" : "Tháng 11",
+    "December" : "Tháng 12",
+    "Settings" : "Cài đặt",
+    "Folder" : "Thư mục",
+    "Saving..." : "Đang lưu...",
+    "Reset password" : "Khôi phục mật khẩu",
+    "No" : "Không",
+    "Yes" : "Có",
+    "Choose" : "Chọn",
+    "Error loading file picker template: {error}" : "Lỗi khi tải mẫu tập tin picker: {error}",
+    "Ok" : "Đồng ý",
+    "Error loading message template: {error}" : "Lỗi khi tải mẫu thông điệp: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} tập tin xung đột"],
+    "One file conflict" : "Một tập tin xung đột",
+    "New Files" : "File mới",
+    "Which files do you want to keep?" : "Bạn muốn tiếp tục với những tập tin nào?",
+    "If you select both versions, the copied file will have a number added to its name." : "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó.",
+    "Cancel" : "Hủy",
+    "Continue" : "Tiếp tục",
+    "(all selected)" : "(Tất cả các lựa chọn)",
+    "({count} selected)" : "({count} được chọn)",
+    "Error loading file exists template" : "Lỗi khi tải tập tin mẫu đã tồn tại",
+    "Shared" : "Được chia sẻ",
+    "Share" : "Chia sẻ",
+    "Error" : "Lỗi",
+    "Error while sharing" : "Lỗi trong quá trình chia sẻ",
+    "Error while unsharing" : "Lỗi trong quá trình gỡ chia sẻ",
+    "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
+    "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
+    "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
+    "Share with user or group …" : "Chia sẻ với người dùng hoặc nhóm",
+    "Share link" : "Chia sẻ liên kết",
+    "Password protect" : "Mật khẩu bảo vệ",
+    "Allow Public Upload" : "Cho phép công khai tập tin tải lên",
+    "Email link to person" : "Liên kết email tới cá nhân",
+    "Send" : "Gởi",
+    "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 in {item} with {user}" : "Đã được chia sẽ trong {item} với {user}",
+    "Unshare" : "Bỏ chia sẻ",
+    "notify by email" : "Thông báo qua email",
+    "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",
+    "update" : "cập nhật",
+    "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",
+    "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",
+    "Delete" : "Xóa",
+    "Add" : "Thêm",
+    "Edit tags" : "Sửa thẻ",
+    "Error loading dialog template: {error}" : "Lỗi khi tải mẫu hội thoại: {error}",
+    "No tags selected for deletion." : "Không có thẻ nào được chọn để xóa",
+    "Please reload the page." : "Vui lòng tải lại trang.",
+    "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
+    "%s password reset" : "%s thiết lập lại mật khẩu",
+    "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
+    "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
+    "Username" : "Tên đăng nhập",
+    "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?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
+    "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
+    "Reset" : "Khởi động lại",
+    "New password" : "Mật khẩu mới",
+    "Personal" : "Cá nhân",
+    "Users" : "Người dùng",
+    "Apps" : "Ứng dụng",
+    "Admin" : "Quản trị",
+    "Help" : "Giúp đỡ",
+    "Error loading tags" : "Lỗi khi tải thẻ",
+    "Tag already exists" : "Thẻ đã tồn tại",
+    "Error deleting tag(s)" : "Lỗi khi xóa (nhiều)thẻ",
+    "Error tagging" : "Lỗi gắn thẻ",
+    "Error untagging" : "Lỗi không gắn thẻ",
+    "Access forbidden" : "Truy cập bị cấm",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
+    "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!",
+    "Security Warning" : "Cảnh bảo bảo mật",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Vui lòng cập nhật bản cài đặt PHP để sử dụng %s một cách an toàn.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
+    "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
+    "Password" : "Mật khẩu",
+    "Data folder" : "Thư mục dữ liệu",
+    "Configure the database" : "Cấu hình cơ sở dữ liệu",
+    "Database user" : "Người dùng cơ sở dữ liệu",
+    "Database password" : "Mật khẩu cơ sở dữ liệu",
+    "Database name" : "Tên cơ sở dữ liệu",
+    "Database tablespace" : "Cơ sở dữ liệu tablespace",
+    "Database host" : "Database host",
+    "Finish setup" : "Cài đặt hoàn tất",
+    "Finishing …" : "Đang hoàn thành ...",
+    "%s is available. Get more information on how to update." : "%s còn trống. Xem thêm thông tin cách cập nhật.",
+    "Log out" : "Đăng xuất",
+    "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.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ.",
+    "Thank you for your patience." : "Cảm ơn sự kiên nhẫn của bạn."
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
new file mode 100644
index 00000000000..befec743e03
--- /dev/null
+++ b/core/l10n/vi.json
@@ -0,0 +1,142 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "Không thể gửi thư cho người dùng: %s",
+    "Turned on maintenance mode" : "Bật chế độ bảo trì",
+    "Turned off maintenance mode" : "Tắt chế độ bảo trì",
+    "Updated database" : "Cơ sở dữ liệu đã được cập nhật",
+    "No image or file provided" : "Không có hình ảnh hoặc tập tin được cung cấp",
+    "Unknown filetype" : "Không biết kiểu tập tin",
+    "Invalid image" : "Hình ảnh không hợp lệ",
+    "No temporary profile picture available, try again" : "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại",
+    "No crop data provided" : "Không có dữ liệu nguồn được cung cấp",
+    "Sunday" : "Chủ nhật",
+    "Monday" : "Thứ 2",
+    "Tuesday" : "Thứ 3",
+    "Wednesday" : "Thứ 4",
+    "Thursday" : "Thứ 5",
+    "Friday" : "Thứ ",
+    "Saturday" : "Thứ 7",
+    "January" : "Tháng 1",
+    "February" : "Tháng 2",
+    "March" : "Tháng 3",
+    "April" : "Tháng 4",
+    "May" : "Tháng 5",
+    "June" : "Tháng 6",
+    "July" : "Tháng 7",
+    "August" : "Tháng 8",
+    "September" : "Tháng 9",
+    "October" : "Tháng 10",
+    "November" : "Tháng 11",
+    "December" : "Tháng 12",
+    "Settings" : "Cài đặt",
+    "Folder" : "Thư mục",
+    "Saving..." : "Đang lưu...",
+    "Reset password" : "Khôi phục mật khẩu",
+    "No" : "Không",
+    "Yes" : "Có",
+    "Choose" : "Chọn",
+    "Error loading file picker template: {error}" : "Lỗi khi tải mẫu tập tin picker: {error}",
+    "Ok" : "Đồng ý",
+    "Error loading message template: {error}" : "Lỗi khi tải mẫu thông điệp: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} tập tin xung đột"],
+    "One file conflict" : "Một tập tin xung đột",
+    "New Files" : "File mới",
+    "Which files do you want to keep?" : "Bạn muốn tiếp tục với những tập tin nào?",
+    "If you select both versions, the copied file will have a number added to its name." : "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó.",
+    "Cancel" : "Hủy",
+    "Continue" : "Tiếp tục",
+    "(all selected)" : "(Tất cả các lựa chọn)",
+    "({count} selected)" : "({count} được chọn)",
+    "Error loading file exists template" : "Lỗi khi tải tập tin mẫu đã tồn tại",
+    "Shared" : "Được chia sẻ",
+    "Share" : "Chia sẻ",
+    "Error" : "Lỗi",
+    "Error while sharing" : "Lỗi trong quá trình chia sẻ",
+    "Error while unsharing" : "Lỗi trong quá trình gỡ chia sẻ",
+    "Error while changing permissions" : "Lỗi trong quá trình phân quyền",
+    "Shared with you and the group {group} by {owner}" : "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
+    "Shared with you by {owner}" : "Đã được chia sẽ bởi {owner}",
+    "Share with user or group …" : "Chia sẻ với người dùng hoặc nhóm",
+    "Share link" : "Chia sẻ liên kết",
+    "Password protect" : "Mật khẩu bảo vệ",
+    "Allow Public Upload" : "Cho phép công khai tập tin tải lên",
+    "Email link to person" : "Liên kết email tới cá nhân",
+    "Send" : "Gởi",
+    "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 in {item} with {user}" : "Đã được chia sẽ trong {item} với {user}",
+    "Unshare" : "Bỏ chia sẻ",
+    "notify by email" : "Thông báo qua email",
+    "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",
+    "update" : "cập nhật",
+    "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",
+    "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",
+    "Delete" : "Xóa",
+    "Add" : "Thêm",
+    "Edit tags" : "Sửa thẻ",
+    "Error loading dialog template: {error}" : "Lỗi khi tải mẫu hội thoại: {error}",
+    "No tags selected for deletion." : "Không có thẻ nào được chọn để xóa",
+    "Please reload the page." : "Vui lòng tải lại trang.",
+    "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
+    "%s password reset" : "%s thiết lập lại mật khẩu",
+    "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
+    "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
+    "Username" : "Tên đăng nhập",
+    "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?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
+    "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
+    "Reset" : "Khởi động lại",
+    "New password" : "Mật khẩu mới",
+    "Personal" : "Cá nhân",
+    "Users" : "Người dùng",
+    "Apps" : "Ứng dụng",
+    "Admin" : "Quản trị",
+    "Help" : "Giúp đỡ",
+    "Error loading tags" : "Lỗi khi tải thẻ",
+    "Tag already exists" : "Thẻ đã tồn tại",
+    "Error deleting tag(s)" : "Lỗi khi xóa (nhiều)thẻ",
+    "Error tagging" : "Lỗi gắn thẻ",
+    "Error untagging" : "Lỗi không gắn thẻ",
+    "Access forbidden" : "Truy cập bị cấm",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
+    "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!",
+    "Security Warning" : "Cảnh bảo bảo mật",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "Vui lòng cập nhật bản cài đặt PHP để sử dụng %s một cách an toàn.",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
+    "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
+    "Password" : "Mật khẩu",
+    "Data folder" : "Thư mục dữ liệu",
+    "Configure the database" : "Cấu hình cơ sở dữ liệu",
+    "Database user" : "Người dùng cơ sở dữ liệu",
+    "Database password" : "Mật khẩu cơ sở dữ liệu",
+    "Database name" : "Tên cơ sở dữ liệu",
+    "Database tablespace" : "Cơ sở dữ liệu tablespace",
+    "Database host" : "Database host",
+    "Finish setup" : "Cài đặt hoàn tất",
+    "Finishing …" : "Đang hoàn thành ...",
+    "%s is available. Get more information on how to update." : "%s còn trống. Xem thêm thông tin cách cập nhật.",
+    "Log out" : "Đăng xuất",
+    "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.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ.",
+    "Thank you for your patience." : "Cảm ơn sự kiên nhẫn của bạn."
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
deleted file mode 100644
index 255cff617d5..00000000000
--- a/core/l10n/vi.php
+++ /dev/null
@@ -1,143 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "Không thể gửi thư cho người dùng: %s",
-"Turned on maintenance mode" => "Bật chế độ bảo trì",
-"Turned off maintenance mode" => "Tắt chế độ bảo trì",
-"Updated database" => "Cơ sở dữ liệu đã được cập nhật",
-"No image or file provided" => "Không có hình ảnh hoặc tập tin được cung cấp",
-"Unknown filetype" => "Không biết kiểu tập tin",
-"Invalid image" => "Hình ảnh không hợp lệ",
-"No temporary profile picture available, try again" => "Ảnh cá nhân tạm thời không có giá trị, hãy thử lại",
-"No crop data provided" => "Không có dữ liệu nguồn được cung cấp",
-"Sunday" => "Chủ nhật",
-"Monday" => "Thứ 2",
-"Tuesday" => "Thứ 3",
-"Wednesday" => "Thứ 4",
-"Thursday" => "Thứ 5",
-"Friday" => "Thứ ",
-"Saturday" => "Thứ 7",
-"January" => "Tháng 1",
-"February" => "Tháng 2",
-"March" => "Tháng 3",
-"April" => "Tháng 4",
-"May" => "Tháng 5",
-"June" => "Tháng 6",
-"July" => "Tháng 7",
-"August" => "Tháng 8",
-"September" => "Tháng 9",
-"October" => "Tháng 10",
-"November" => "Tháng 11",
-"December" => "Tháng 12",
-"Settings" => "Cài đặt",
-"Folder" => "Thư mục",
-"Saving..." => "Đang lưu...",
-"Reset password" => "Khôi phục mật khẩu",
-"No" => "Không",
-"Yes" => "Có",
-"Choose" => "Chọn",
-"Error loading file picker template: {error}" => "Lỗi khi tải mẫu tập tin picker: {error}",
-"Ok" => "Đồng ý",
-"Error loading message template: {error}" => "Lỗi khi tải mẫu thông điệp: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} tập tin xung đột"),
-"One file conflict" => "Một tập tin xung đột",
-"New Files" => "File mới",
-"Which files do you want to keep?" => "Bạn muốn tiếp tục với những tập tin nào?",
-"If you select both versions, the copied file will have a number added to its name." => "Nếu bạn chọn cả hai phiên bản, tập tin được sao chép sẽ được đánh thêm số vào tên của nó.",
-"Cancel" => "Hủy",
-"Continue" => "Tiếp tục",
-"(all selected)" => "(Tất cả các lựa chọn)",
-"({count} selected)" => "({count} được chọn)",
-"Error loading file exists template" => "Lỗi khi tải tập tin mẫu đã tồn tại",
-"Shared" => "Được chia sẻ",
-"Share" => "Chia sẻ",
-"Error" => "Lỗi",
-"Error while sharing" => "Lỗi trong quá trình chia sẻ",
-"Error while unsharing" => "Lỗi trong quá trình gỡ chia sẻ",
-"Error while changing permissions" => "Lỗi trong quá trình phân quyền",
-"Shared with you and the group {group} by {owner}" => "Đã được chia sẽ với bạn và nhóm {group} bởi {owner}",
-"Shared with you by {owner}" => "Đã được chia sẽ bởi {owner}",
-"Share with user or group …" => "Chia sẻ với người dùng hoặc nhóm",
-"Share link" => "Chia sẻ liên kết",
-"Password protect" => "Mật khẩu bảo vệ",
-"Allow Public Upload" => "Cho phép công khai tập tin tải lên",
-"Email link to person" => "Liên kết email tới cá nhân",
-"Send" => "Gởi",
-"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 in {item} with {user}" => "Đã được chia sẽ trong {item} với {user}",
-"Unshare" => "Bỏ chia sẻ",
-"notify by email" => "Thông báo qua email",
-"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",
-"update" => "cập nhật",
-"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",
-"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",
-"Delete" => "Xóa",
-"Add" => "Thêm",
-"Edit tags" => "Sửa thẻ",
-"Error loading dialog template: {error}" => "Lỗi khi tải mẫu hội thoại: {error}",
-"No tags selected for deletion." => "Không có thẻ nào được chọn để xóa",
-"Please reload the page." => "Vui lòng tải lại trang.",
-"The update was successful. Redirecting you to ownCloud now." => "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
-"%s password reset" => "%s thiết lập lại mật khẩu",
-"Use the following link to reset your password: {link}" => "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
-"You will receive a link to reset your password via Email." => "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-"Username" => "Tên đăng nhập",
-"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?" => "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
-"Yes, I really want to reset my password now" => "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
-"Reset" => "Khởi động lại",
-"New password" => "Mật khẩu mới",
-"Personal" => "Cá nhân",
-"Users" => "Người dùng",
-"Apps" => "Ứng dụng",
-"Admin" => "Quản trị",
-"Help" => "Giúp đỡ",
-"Error loading tags" => "Lỗi khi tải thẻ",
-"Tag already exists" => "Thẻ đã tồn tại",
-"Error deleting tag(s)" => "Lỗi khi xóa (nhiều)thẻ",
-"Error tagging" => "Lỗi gắn thẻ",
-"Error untagging" => "Lỗi không gắn thẻ",
-"Access forbidden" => "Truy cập bị cấm",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "Xin chào,\n\nbáo cho bạn biết rằng %s đã chia sẽ %s với bạn.\nXem nó: %s\n\n",
-"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!",
-"Security Warning" => "Cảnh bảo bảo mật",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "Phiên bản PHP của bạn có lỗ hổng NULL Byte attack (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "Vui lòng cập nhật bản cài đặt PHP để sử dụng %s một cách an toàn.",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
-"Create an <strong>admin account</strong>" => "Tạo một <strong>tài khoản quản trị</strong>",
-"Password" => "Mật khẩu",
-"Data folder" => "Thư mục dữ liệu",
-"Configure the database" => "Cấu hình cơ sở dữ liệu",
-"Database user" => "Người dùng cơ sở dữ liệu",
-"Database password" => "Mật khẩu cơ sở dữ liệu",
-"Database name" => "Tên cơ sở dữ liệu",
-"Database tablespace" => "Cơ sở dữ liệu tablespace",
-"Database host" => "Database host",
-"Finish setup" => "Cài đặt hoàn tất",
-"Finishing …" => "Đang hoàn thành ...",
-"%s is available. Get more information on how to update." => "%s còn trống. Xem thêm thông tin cách cập nhật.",
-"Log out" => "Đăng xuất",
-"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.",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "Liên hệ với người quản trị nếu lỗi này vẫn tồn tại hoặc xuất hiện bất ngờ.",
-"Thank you for your patience." => "Cảm ơn sự kiên nhẫn của bạn."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
new file mode 100644
index 00000000000..6037208c8a8
--- /dev/null
+++ b/core/l10n/zh_CN.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "发送失败，用户如下: %s ",
+    "Turned on maintenance mode" : "启用维护模式",
+    "Turned off maintenance mode" : "关闭维护模式",
+    "Updated database" : "数据库已更新",
+    "Checked database schema update" : "已经检查数据库架构更新",
+    "Checked database schema update for apps" : "已经检查数据库架构更新",
+    "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s",
+    "Disabled incompatible apps: %s" : "禁用不兼容应用：%s",
+    "No image or file provided" : "没有提供图片或文件",
+    "Unknown filetype" : "未知的文件类型",
+    "Invalid image" : "无效的图像",
+    "No temporary profile picture available, try again" : "没有临时概览页图片可用，请重试",
+    "No crop data provided" : "没有提供相应数据",
+    "Sunday" : "星期日",
+    "Monday" : "星期一",
+    "Tuesday" : "星期二",
+    "Wednesday" : "星期三",
+    "Thursday" : "星期四",
+    "Friday" : "星期五",
+    "Saturday" : "星期六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "设置",
+    "File" : "文件",
+    "Folder" : "文件夹",
+    "Image" : "图像",
+    "Audio" : "声音",
+    "Saving..." : "保存中",
+    "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 />确认继续？",
+    "I know what I'm doing" : "我知道我在做什么",
+    "Reset password" : "重置密码",
+    "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
+    "No" : "否",
+    "Yes" : "是",
+    "Choose" : "选择(&C)...",
+    "Error loading file picker template: {error}" : "加载文件分拣模板出错: {error}",
+    "Ok" : "好",
+    "Error loading message template: {error}" : "加载消息模板出错: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} 个文件冲突"],
+    "One file conflict" : "1个文件冲突",
+    "New Files" : "新文件",
+    "Already existing files" : "已经存在的文件",
+    "Which files do you want to keep?" : "想要保留哪一个文件呢？",
+    "If you select both versions, the copied file will have a number added to its name." : "如果同时选择了两个版本，复制的文件名将会增加上一个数字。",
+    "Cancel" : "取消",
+    "Continue" : "继续",
+    "(all selected)" : "(选中全部)",
+    "({count} selected)" : "(选择了{count}个)",
+    "Error loading file exists template" : "加载文件存在性模板失败",
+    "Very weak password" : "非常弱的密码",
+    "Weak password" : "弱密码",
+    "So-so password" : "一般强度的密码",
+    "Good password" : "较强的密码",
+    "Strong password" : "强密码",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
+    "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." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
+    "Error occurred while checking server setup" : "当检查服务器启动时出错",
+    "Shared" : "已共享",
+    "Shared with {recipients}" : "由{recipients}分享",
+    "Share" : "分享",
+    "Error" : "错误",
+    "Error while sharing" : "共享时出错",
+    "Error while unsharing" : "取消共享时出错",
+    "Error while changing permissions" : "修改权限时出错",
+    "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
+    "Shared with you by {owner}" : "{owner} 与您共享",
+    "Share with user or group …" : "分享给其他用户或组 ...",
+    "Share link" : "分享链接",
+    "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
+    "Password protect" : "密码保护",
+    "Choose a password for the public link" : "为共享链接设置密码",
+    "Allow Public Upload" : "允许公开上传",
+    "Email link to person" : "发送链接到个人",
+    "Send" : "发送",
+    "Set expiration date" : "设置过期日期",
+    "Expiration date" : "过期日期",
+    "Adding user..." : "添加用户中...",
+    "group" : "组",
+    "Resharing is not allowed" : "不允许二次共享",
+    "Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
+    "Unshare" : "取消共享",
+    "notify by email" : "以邮件通知",
+    "can share" : "可共享",
+    "can edit" : "可以修改",
+    "access control" : "访问控制",
+    "create" : "创建",
+    "update" : "更新",
+    "delete" : "删除",
+    "Password protected" : "密码已受保护",
+    "Error unsetting expiration date" : "取消设置过期日期时出错",
+    "Error setting expiration date" : "设置过期日期时出错",
+    "Sending ..." : "正在发送...",
+    "Email sent" : "邮件已发送",
+    "Warning" : "警告",
+    "The object type is not specified." : "未指定对象类型。",
+    "Enter new" : "输入新...",
+    "Delete" : "删除",
+    "Add" : "增加",
+    "Edit tags" : "编辑标签",
+    "Error loading dialog template: {error}" : "加载对话框模板出错: {error}",
+    "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. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
+    "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
+    "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 的密码",
+    "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
+    "You will receive a link to reset your password via Email." : "您将会收到包含可以重置密码链接的邮件。",
+    "Username" : "用户名",
+    "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?" : "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
+    "Yes, I really want to reset my password now" : "使得，我真的要现在重设密码",
+    "Reset" : "重置",
+    "New password" : "新密码",
+    "New Password" : "新密码",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
+    "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
+    "Personal" : "个人",
+    "Users" : "用户",
+    "Apps" : "应用",
+    "Admin" : "管理",
+    "Help" : "帮助",
+    "Error loading tags" : "加载标签出错",
+    "Tag already exists" : "标签已存在",
+    "Error deleting tag(s)" : "删除标签(s)时出错",
+    "Error tagging" : "增加标签时出错",
+    "Error untagging" : "移除标签时出错",
+    "Error favoriting" : "收藏时出错",
+    "Error unfavoriting" : "删除收藏时出错",
+    "Access forbidden" : "访问禁止",
+    "File not found" : "文件未找到",
+    "The specified document has not been found on the server." : "在服务器上没找到指定的文件。",
+    "You can click here to return to %s." : "你可以点击这里返回 %s。",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n",
+    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "Cheers!" : "干杯！",
+    "The server encountered an internal error and was unable to complete your request." : "服务器发送一个内部错误并且无法完成你的请求。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
+    "More details can be found in the server log." : "更多细节能在服务器日志中找到。",
+    "Technical details" : "技术细节",
+    "Remote Address: %s" : "远程地址： %s",
+    "Request ID: %s" : "请求 ID: %s",
+    "Code: %s" : "代码: %s",
+    "Message: %s" : "消息: %s",
+    "File: %s" : "文件: %s",
+    "Line: %s" : "行: %s",
+    "Trace" : "追踪",
+    "Security Warning" : "安全警告",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "为保证安全使用 %s 请更新您的PHP。",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
+    "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Password" : "密码",
+    "Storage & database" : "存储 & 数据库",
+    "Data folder" : "数据目录",
+    "Configure the database" : "配置数据库",
+    "Only %s is available." : "仅 %s 可用。",
+    "Database user" : "数据库用户",
+    "Database password" : "数据库密码",
+    "Database name" : "数据库名",
+    "Database tablespace" : "数据库表空间",
+    "Database host" : "数据库主机",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
+    "Finish setup" : "安装完成",
+    "Finishing …" : "正在结束 ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
+    "%s is available. Get more information on how to update." : "%s 可用。获取更多关于如何升级的信息。",
+    "Log out" : "注销",
+    "Server side authentication failed!" : "服务端验证失败！",
+    "Please contact your administrator." : "请联系你的管理员。",
+    "Forgot your password? Reset it!" : "忘记密码？立即重置！",
+    "remember" : "记住",
+    "Log in" : "登录",
+    "Alternative Logins" : "其他登录方式",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "当前ownCloud实例运行在单用户模式下。",
+    "This means only administrators can use the instance." : "这意味着只有管理员才能在实例上操作。",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "如果这个消息一直存在或不停出现，请联系你的系统管理员。",
+    "Thank you for your patience." : "感谢让你久等了。",
+    "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
+    "Add \"%s\" as trusted domain" : "添加 \"%s\"为信任域",
+    "%s will be updated to version %s." : "%s 将会更新到版本 %s。",
+    "The following apps will be disabled:" : "以下应用将会被禁用：",
+    "The theme %s has been disabled." : "%s 主题已被禁用。",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
+    "Start update" : "开始更新",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：",
+    "This %s instance is currently being updated, which may take a while." : "当前ownCloud实例 %s 正在更新，可能需要一段时间。",
+    "This page will refresh itself when the %s instance is available again." : "当实例 %s 再次可用时这个页面将刷新。"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
new file mode 100644
index 00000000000..ec286eae039
--- /dev/null
+++ b/core/l10n/zh_CN.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "发送失败，用户如下: %s ",
+    "Turned on maintenance mode" : "启用维护模式",
+    "Turned off maintenance mode" : "关闭维护模式",
+    "Updated database" : "数据库已更新",
+    "Checked database schema update" : "已经检查数据库架构更新",
+    "Checked database schema update for apps" : "已经检查数据库架构更新",
+    "Updated \"%s\" to %s" : "更新 \"%s\" 为 %s",
+    "Disabled incompatible apps: %s" : "禁用不兼容应用：%s",
+    "No image or file provided" : "没有提供图片或文件",
+    "Unknown filetype" : "未知的文件类型",
+    "Invalid image" : "无效的图像",
+    "No temporary profile picture available, try again" : "没有临时概览页图片可用，请重试",
+    "No crop data provided" : "没有提供相应数据",
+    "Sunday" : "星期日",
+    "Monday" : "星期一",
+    "Tuesday" : "星期二",
+    "Wednesday" : "星期三",
+    "Thursday" : "星期四",
+    "Friday" : "星期五",
+    "Saturday" : "星期六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "设置",
+    "File" : "文件",
+    "Folder" : "文件夹",
+    "Image" : "图像",
+    "Audio" : "声音",
+    "Saving..." : "保存中",
+    "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 />确认继续？",
+    "I know what I'm doing" : "我知道我在做什么",
+    "Reset password" : "重置密码",
+    "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
+    "No" : "否",
+    "Yes" : "是",
+    "Choose" : "选择(&C)...",
+    "Error loading file picker template: {error}" : "加载文件分拣模板出错: {error}",
+    "Ok" : "好",
+    "Error loading message template: {error}" : "加载消息模板出错: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} 个文件冲突"],
+    "One file conflict" : "1个文件冲突",
+    "New Files" : "新文件",
+    "Already existing files" : "已经存在的文件",
+    "Which files do you want to keep?" : "想要保留哪一个文件呢？",
+    "If you select both versions, the copied file will have a number added to its name." : "如果同时选择了两个版本，复制的文件名将会增加上一个数字。",
+    "Cancel" : "取消",
+    "Continue" : "继续",
+    "(all selected)" : "(选中全部)",
+    "({count} selected)" : "(选择了{count}个)",
+    "Error loading file exists template" : "加载文件存在性模板失败",
+    "Very weak password" : "非常弱的密码",
+    "Weak password" : "弱密码",
+    "So-so password" : "一般强度的密码",
+    "Good password" : "较强的密码",
+    "Strong password" : "强密码",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
+    "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." : "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
+    "Error occurred while checking server setup" : "当检查服务器启动时出错",
+    "Shared" : "已共享",
+    "Shared with {recipients}" : "由{recipients}分享",
+    "Share" : "分享",
+    "Error" : "错误",
+    "Error while sharing" : "共享时出错",
+    "Error while unsharing" : "取消共享时出错",
+    "Error while changing permissions" : "修改权限时出错",
+    "Shared with you and the group {group} by {owner}" : "{owner} 共享给您及 {group} 组",
+    "Shared with you by {owner}" : "{owner} 与您共享",
+    "Share with user or group …" : "分享给其他用户或组 ...",
+    "Share link" : "分享链接",
+    "The public link will expire no later than {days} days after it is created" : "这个共享链接将在创建后 {days} 天失效",
+    "Password protect" : "密码保护",
+    "Choose a password for the public link" : "为共享链接设置密码",
+    "Allow Public Upload" : "允许公开上传",
+    "Email link to person" : "发送链接到个人",
+    "Send" : "发送",
+    "Set expiration date" : "设置过期日期",
+    "Expiration date" : "过期日期",
+    "Adding user..." : "添加用户中...",
+    "group" : "组",
+    "Resharing is not allowed" : "不允许二次共享",
+    "Shared in {item} with {user}" : "在 {item} 与 {user} 共享。",
+    "Unshare" : "取消共享",
+    "notify by email" : "以邮件通知",
+    "can share" : "可共享",
+    "can edit" : "可以修改",
+    "access control" : "访问控制",
+    "create" : "创建",
+    "update" : "更新",
+    "delete" : "删除",
+    "Password protected" : "密码已受保护",
+    "Error unsetting expiration date" : "取消设置过期日期时出错",
+    "Error setting expiration date" : "设置过期日期时出错",
+    "Sending ..." : "正在发送...",
+    "Email sent" : "邮件已发送",
+    "Warning" : "警告",
+    "The object type is not specified." : "未指定对象类型。",
+    "Enter new" : "输入新...",
+    "Delete" : "删除",
+    "Add" : "增加",
+    "Edit tags" : "编辑标签",
+    "Error loading dialog template: {error}" : "加载对话框模板出错: {error}",
+    "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. Redirecting you to ownCloud now." : "更新成功。正在重定向至 ownCloud。",
+    "Couldn't reset password because the token is invalid" : "令牌无效，无法重置密码",
+    "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 的密码",
+    "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
+    "You will receive a link to reset your password via Email." : "您将会收到包含可以重置密码链接的邮件。",
+    "Username" : "用户名",
+    "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?" : "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
+    "Yes, I really want to reset my password now" : "使得，我真的要现在重设密码",
+    "Reset" : "重置",
+    "New password" : "新密码",
+    "New Password" : "新密码",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
+    "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
+    "Personal" : "个人",
+    "Users" : "用户",
+    "Apps" : "应用",
+    "Admin" : "管理",
+    "Help" : "帮助",
+    "Error loading tags" : "加载标签出错",
+    "Tag already exists" : "标签已存在",
+    "Error deleting tag(s)" : "删除标签(s)时出错",
+    "Error tagging" : "增加标签时出错",
+    "Error untagging" : "移除标签时出错",
+    "Error favoriting" : "收藏时出错",
+    "Error unfavoriting" : "删除收藏时出错",
+    "Access forbidden" : "访问禁止",
+    "File not found" : "文件未找到",
+    "The specified document has not been found on the server." : "在服务器上没找到指定的文件。",
+    "You can click here to return to %s." : "你可以点击这里返回 %s。",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n",
+    "The share will expire on %s." : "此分享将在 %s 过期。",
+    "Cheers!" : "干杯！",
+    "The server encountered an internal error and was unable to complete your request." : "服务器发送一个内部错误并且无法完成你的请求。",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
+    "More details can be found in the server log." : "更多细节能在服务器日志中找到。",
+    "Technical details" : "技术细节",
+    "Remote Address: %s" : "远程地址： %s",
+    "Request ID: %s" : "请求 ID: %s",
+    "Code: %s" : "代码: %s",
+    "Message: %s" : "消息: %s",
+    "File: %s" : "文件: %s",
+    "Line: %s" : "行: %s",
+    "Trace" : "追踪",
+    "Security Warning" : "安全警告",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "为保证安全使用 %s 请更新您的PHP。",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
+    "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Password" : "密码",
+    "Storage & database" : "存储 & 数据库",
+    "Data folder" : "数据目录",
+    "Configure the database" : "配置数据库",
+    "Only %s is available." : "仅 %s 可用。",
+    "Database user" : "数据库用户",
+    "Database password" : "数据库密码",
+    "Database name" : "数据库名",
+    "Database tablespace" : "数据库表空间",
+    "Database host" : "数据库主机",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
+    "Finish setup" : "安装完成",
+    "Finishing …" : "正在结束 ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
+    "%s is available. Get more information on how to update." : "%s 可用。获取更多关于如何升级的信息。",
+    "Log out" : "注销",
+    "Server side authentication failed!" : "服务端验证失败！",
+    "Please contact your administrator." : "请联系你的管理员。",
+    "Forgot your password? Reset it!" : "忘记密码？立即重置！",
+    "remember" : "记住",
+    "Log in" : "登录",
+    "Alternative Logins" : "其他登录方式",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "当前ownCloud实例运行在单用户模式下。",
+    "This means only administrators can use the instance." : "这意味着只有管理员才能在实例上操作。",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "如果这个消息一直存在或不停出现，请联系你的系统管理员。",
+    "Thank you for your patience." : "感谢让你久等了。",
+    "You are accessing the server from an untrusted domain." : "您正在访问来自不信任域名的服务器。",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
+    "Add \"%s\" as trusted domain" : "添加 \"%s\"为信任域",
+    "%s will be updated to version %s." : "%s 将会更新到版本 %s。",
+    "The following apps will be disabled:" : "以下应用将会被禁用：",
+    "The theme %s has been disabled." : "%s 主题已被禁用。",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
+    "Start update" : "开始更新",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：",
+    "This %s instance is currently being updated, which may take a while." : "当前ownCloud实例 %s 正在更新，可能需要一段时间。",
+    "This page will refresh itself when the %s instance is available again." : "当实例 %s 再次可用时这个页面将刷新。"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
deleted file mode 100644
index 3f177994c22..00000000000
--- a/core/l10n/zh_CN.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "发送失败，用户如下: %s ",
-"Turned on maintenance mode" => "启用维护模式",
-"Turned off maintenance mode" => "关闭维护模式",
-"Updated database" => "数据库已更新",
-"Checked database schema update" => "已经检查数据库架构更新",
-"Checked database schema update for apps" => "已经检查数据库架构更新",
-"Updated \"%s\" to %s" => "更新 \"%s\" 为 %s",
-"Disabled incompatible apps: %s" => "禁用不兼容应用：%s",
-"No image or file provided" => "没有提供图片或文件",
-"Unknown filetype" => "未知的文件类型",
-"Invalid image" => "无效的图像",
-"No temporary profile picture available, try again" => "没有临时概览页图片可用，请重试",
-"No crop data provided" => "没有提供相应数据",
-"Sunday" => "星期日",
-"Monday" => "星期一",
-"Tuesday" => "星期二",
-"Wednesday" => "星期三",
-"Thursday" => "星期四",
-"Friday" => "星期五",
-"Saturday" => "星期六",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"Settings" => "设置",
-"File" => "文件",
-"Folder" => "文件夹",
-"Image" => "图像",
-"Audio" => "声音",
-"Saving..." => "保存中",
-"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 />确认继续？",
-"I know what I'm doing" => "我知道我在做什么",
-"Reset password" => "重置密码",
-"Password can not be changed. Please contact your administrator." => "无法修改密码，请联系管理员。",
-"No" => "否",
-"Yes" => "是",
-"Choose" => "选择(&C)...",
-"Error loading file picker template: {error}" => "加载文件分拣模板出错: {error}",
-"Ok" => "好",
-"Error loading message template: {error}" => "加载消息模板出错: {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} 个文件冲突"),
-"One file conflict" => "1个文件冲突",
-"New Files" => "新文件",
-"Already existing files" => "已经存在的文件",
-"Which files do you want to keep?" => "想要保留哪一个文件呢？",
-"If you select both versions, the copied file will have a number added to its name." => "如果同时选择了两个版本，复制的文件名将会增加上一个数字。",
-"Cancel" => "取消",
-"Continue" => "继续",
-"(all selected)" => "(选中全部)",
-"({count} selected)" => "(选择了{count}个)",
-"Error loading file exists template" => "加载文件存在性模板失败",
-"Very weak password" => "非常弱的密码",
-"Weak password" => "弱密码",
-"So-so password" => "一般强度的密码",
-"Good password" => "较强的密码",
-"Strong password" => "强密码",
-"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "您的Web服务器尚未正确设置以允许文件同步, 因为WebDAV的接口似乎已损坏.",
-"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." => "此服务器上没有可用的因特网连接. 这意味着某些特性将无法工作，例如挂载外部存储器, 提醒更新或安装第三方应用等. 从远程访问文件和发送提醒电子邮件也可能无法工作. 如果你想要ownCloud的所有特性, 我们建议启用此服务器的因特网连接.",
-"Error occurred while checking server setup" => "当检查服务器启动时出错",
-"Shared" => "已共享",
-"Shared with {recipients}" => "由{recipients}分享",
-"Share" => "分享",
-"Error" => "错误",
-"Error while sharing" => "共享时出错",
-"Error while unsharing" => "取消共享时出错",
-"Error while changing permissions" => "修改权限时出错",
-"Shared with you and the group {group} by {owner}" => "{owner} 共享给您及 {group} 组",
-"Shared with you by {owner}" => "{owner} 与您共享",
-"Share with user or group …" => "分享给其他用户或组 ...",
-"Share link" => "分享链接",
-"The public link will expire no later than {days} days after it is created" => "这个共享链接将在创建后 {days} 天失效",
-"Password protect" => "密码保护",
-"Choose a password for the public link" => "为共享链接设置密码",
-"Allow Public Upload" => "允许公开上传",
-"Email link to person" => "发送链接到个人",
-"Send" => "发送",
-"Set expiration date" => "设置过期日期",
-"Expiration date" => "过期日期",
-"Adding user..." => "添加用户中...",
-"group" => "组",
-"Resharing is not allowed" => "不允许二次共享",
-"Shared in {item} with {user}" => "在 {item} 与 {user} 共享。",
-"Unshare" => "取消共享",
-"notify by email" => "以邮件通知",
-"can share" => "可共享",
-"can edit" => "可以修改",
-"access control" => "访问控制",
-"create" => "创建",
-"update" => "更新",
-"delete" => "删除",
-"Password protected" => "密码已受保护",
-"Error unsetting expiration date" => "取消设置过期日期时出错",
-"Error setting expiration date" => "设置过期日期时出错",
-"Sending ..." => "正在发送...",
-"Email sent" => "邮件已发送",
-"Warning" => "警告",
-"The object type is not specified." => "未指定对象类型。",
-"Enter new" => "输入新...",
-"Delete" => "删除",
-"Add" => "增加",
-"Edit tags" => "编辑标签",
-"Error loading dialog template: {error}" => "加载对话框模板出错: {error}",
-"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. Redirecting you to ownCloud now." => "更新成功。正在重定向至 ownCloud。",
-"Couldn't reset password because the token is invalid" => "令牌无效，无法重置密码",
-"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 的密码",
-"Use the following link to reset your password: {link}" => "使用以下链接重置您的密码：{link}",
-"You will receive a link to reset your password via Email." => "您将会收到包含可以重置密码链接的邮件。",
-"Username" => "用户名",
-"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?" => "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
-"Yes, I really want to reset my password now" => "使得，我真的要现在重设密码",
-"Reset" => "重置",
-"New password" => "新密码",
-"New Password" => "新密码",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
-"For the best results, please consider using a GNU/Linux server instead." => "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
-"Personal" => "个人",
-"Users" => "用户",
-"Apps" => "应用",
-"Admin" => "管理",
-"Help" => "帮助",
-"Error loading tags" => "加载标签出错",
-"Tag already exists" => "标签已存在",
-"Error deleting tag(s)" => "删除标签(s)时出错",
-"Error tagging" => "增加标签时出错",
-"Error untagging" => "移除标签时出错",
-"Error favoriting" => "收藏时出错",
-"Error unfavoriting" => "删除收藏时出错",
-"Access forbidden" => "访问禁止",
-"File not found" => "文件未找到",
-"The specified document has not been found on the server." => "在服务器上没找到指定的文件。",
-"You can click here to return to %s." => "你可以点击这里返回 %s。",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨、你好,\n\n只想让你知道 %s 分享了 %s 给你。\n现在查看: %s\n",
-"The share will expire on %s." => "此分享将在 %s 过期。",
-"Cheers!" => "干杯！",
-"The server encountered an internal error and was unable to complete your request." => "服务器发送一个内部错误并且无法完成你的请求。",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "请联系服务器管理员，如果多次出现这个错误，请把下面的技术细节包含在您的报告里。",
-"More details can be found in the server log." => "更多细节能在服务器日志中找到。",
-"Technical details" => "技术细节",
-"Remote Address: %s" => "远程地址： %s",
-"Request ID: %s" => "请求 ID: %s",
-"Code: %s" => "代码: %s",
-"Message: %s" => "消息: %s",
-"File: %s" => "文件: %s",
-"Line: %s" => "行: %s",
-"Trace" => "追踪",
-"Security Warning" => "安全警告",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "你的PHP版本容易受到空字节攻击 (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "为保证安全使用 %s 请更新您的PHP。",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
-"Create an <strong>admin account</strong>" => "创建<strong>管理员账号</strong>",
-"Password" => "密码",
-"Storage & database" => "存储 & 数据库",
-"Data folder" => "数据目录",
-"Configure the database" => "配置数据库",
-"Only %s is available." => "仅 %s 可用。",
-"Database user" => "数据库用户",
-"Database password" => "数据库密码",
-"Database name" => "数据库名",
-"Database tablespace" => "数据库表空间",
-"Database host" => "数据库主机",
-"SQLite will be used as database. For larger installations we recommend to change this." => "将会使用 SQLite 为数据库。我们不建议大型站点使用 SQLite。",
-"Finish setup" => "安装完成",
-"Finishing …" => "正在结束 ...",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "此程序需要启用JavaScript才能正常运行。请<a href=\"http://enable-javascript.com/\" target=\"_blank\">启用JavaScript</a> 并重新加载此页面。",
-"%s is available. Get more information on how to update." => "%s 可用。获取更多关于如何升级的信息。",
-"Log out" => "注销",
-"Server side authentication failed!" => "服务端验证失败！",
-"Please contact your administrator." => "请联系你的管理员。",
-"Forgot your password? Reset it!" => "忘记密码？立即重置！",
-"remember" => "记住",
-"Log in" => "登录",
-"Alternative Logins" => "其他登录方式",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "嗨、你好,<br><br>只想让你知道 %s 分享了 <strong>%s</strong> 给你。<br><a href=\"%s\">现在查看！</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "当前ownCloud实例运行在单用户模式下。",
-"This means only administrators can use the instance." => "这意味着只有管理员才能在实例上操作。",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "如果这个消息一直存在或不停出现，请联系你的系统管理员。",
-"Thank you for your patience." => "感谢让你久等了。",
-"You are accessing the server from an untrusted domain." => "您正在访问来自不信任域名的服务器。",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "请联系你的系统管理员。如果你是系统管理员，配置config/config.php文件中参数\"trusted_domain\" 设置。可以在config/config.sample.php文件中找到例子。",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "基于你的配置，作为系统管理员，你可能还能点击下面的按钮来信任这个域。",
-"Add \"%s\" as trusted domain" => "添加 \"%s\"为信任域",
-"%s will be updated to version %s." => "%s 将会更新到版本 %s。",
-"The following apps will be disabled:" => "以下应用将会被禁用：",
-"The theme %s has been disabled." => "%s 主题已被禁用。",
-"Please make sure that the database, the config folder and the data folder have been backed up before proceeding." => "在继续之前，请确认数据库、配置文件夹和数据文件夹已经备份。",
-"Start update" => "开始更新",
-"To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" => "为避免更大的安装演示，你能在你的安装目录下面运行这些命令：",
-"This %s instance is currently being updated, which may take a while." => "当前ownCloud实例 %s 正在更新，可能需要一段时间。",
-"This page will refresh itself when the %s instance is available again." => "当实例 %s 再次可用时这个页面将刷新。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
new file mode 100644
index 00000000000..5caaa4a2f36
--- /dev/null
+++ b/core/l10n/zh_HK.js
@@ -0,0 +1,80 @@
+OC.L10N.register(
+    "core",
+    {
+    "Sunday" : "星期日",
+    "Monday" : "星期一",
+    "Tuesday" : "星期二",
+    "Wednesday" : "星期三",
+    "Thursday" : "星期四",
+    "Friday" : "星期五",
+    "Saturday" : "星期六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "設定",
+    "File" : "文件",
+    "Folder" : "資料夾",
+    "Image" : "圖片",
+    "Audio" : "聲音",
+    "Saving..." : "儲存中...",
+    "Reset password" : "重設密碼",
+    "No" : "否",
+    "Yes" : "是",
+    "Ok" : "確認",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "取消",
+    "Shared" : "已分享",
+    "Share" : "分享",
+    "Error" : "錯誤",
+    "Error while sharing" : "分享時發生錯誤",
+    "Error while unsharing" : "取消分享時發生錯誤",
+    "Error while changing permissions" : "更改權限時發生錯誤",
+    "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
+    "Shared with you by {owner}" : "{owner}與你的分享",
+    "Share link" : "分享連結",
+    "Password protect" : "密碼保護",
+    "Send" : "傳送",
+    "Set expiration date" : "設定分享期限",
+    "Expiration date" : "分享期限",
+    "Unshare" : "取消分享",
+    "create" : "新增",
+    "update" : "更新",
+    "delete" : "刪除",
+    "Password protected" : "密碼保護",
+    "Sending ..." : "發送中...",
+    "Email sent" : "郵件已傳",
+    "Warning" : "警告",
+    "Delete" : "刪除",
+    "Add" : "加入",
+    "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
+    "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
+    "You will receive a link to reset your password via Email." : "你將收到一封電郵",
+    "Username" : "用戶名稱",
+    "Reset" : "重設",
+    "New password" : "新密碼",
+    "New Password" : "新密碼",
+    "Personal" : "個人",
+    "Users" : "用戶",
+    "Apps" : "軟件",
+    "Admin" : "管理",
+    "Help" : "幫助",
+    "Create an <strong>admin account</strong>" : "建立管理員帳戶",
+    "Password" : "密碼",
+    "Configure the database" : "設定資料庫",
+    "Database user" : "資料庫帳戶",
+    "Database password" : "資料庫密碼",
+    "Database name" : "資料庫名稱",
+    "Log out" : "登出",
+    "remember" : "記住",
+    "Log in" : "登入"
+},
+"nplurals=1; plural=0;");
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
new file mode 100644
index 00000000000..4d3bbaa8aea
--- /dev/null
+++ b/core/l10n/zh_HK.json
@@ -0,0 +1,78 @@
+{ "translations": {
+    "Sunday" : "星期日",
+    "Monday" : "星期一",
+    "Tuesday" : "星期二",
+    "Wednesday" : "星期三",
+    "Thursday" : "星期四",
+    "Friday" : "星期五",
+    "Saturday" : "星期六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "設定",
+    "File" : "文件",
+    "Folder" : "資料夾",
+    "Image" : "圖片",
+    "Audio" : "聲音",
+    "Saving..." : "儲存中...",
+    "Reset password" : "重設密碼",
+    "No" : "否",
+    "Yes" : "是",
+    "Ok" : "確認",
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "Cancel" : "取消",
+    "Shared" : "已分享",
+    "Share" : "分享",
+    "Error" : "錯誤",
+    "Error while sharing" : "分享時發生錯誤",
+    "Error while unsharing" : "取消分享時發生錯誤",
+    "Error while changing permissions" : "更改權限時發生錯誤",
+    "Shared with you and the group {group} by {owner}" : "{owner}與你及群組的分享",
+    "Shared with you by {owner}" : "{owner}與你的分享",
+    "Share link" : "分享連結",
+    "Password protect" : "密碼保護",
+    "Send" : "傳送",
+    "Set expiration date" : "設定分享期限",
+    "Expiration date" : "分享期限",
+    "Unshare" : "取消分享",
+    "create" : "新增",
+    "update" : "更新",
+    "delete" : "刪除",
+    "Password protected" : "密碼保護",
+    "Sending ..." : "發送中...",
+    "Email sent" : "郵件已傳",
+    "Warning" : "警告",
+    "Delete" : "刪除",
+    "Add" : "加入",
+    "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
+    "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
+    "You will receive a link to reset your password via Email." : "你將收到一封電郵",
+    "Username" : "用戶名稱",
+    "Reset" : "重設",
+    "New password" : "新密碼",
+    "New Password" : "新密碼",
+    "Personal" : "個人",
+    "Users" : "用戶",
+    "Apps" : "軟件",
+    "Admin" : "管理",
+    "Help" : "幫助",
+    "Create an <strong>admin account</strong>" : "建立管理員帳戶",
+    "Password" : "密碼",
+    "Configure the database" : "設定資料庫",
+    "Database user" : "資料庫帳戶",
+    "Database password" : "資料庫密碼",
+    "Database name" : "資料庫名稱",
+    "Log out" : "登出",
+    "remember" : "記住",
+    "Log in" : "登入"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
deleted file mode 100644
index 45a52a3ca0f..00000000000
--- a/core/l10n/zh_HK.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Sunday" => "星期日",
-"Monday" => "星期一",
-"Tuesday" => "星期二",
-"Wednesday" => "星期三",
-"Thursday" => "星期四",
-"Friday" => "星期五",
-"Saturday" => "星期六",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"Settings" => "設定",
-"File" => "文件",
-"Folder" => "資料夾",
-"Image" => "圖片",
-"Audio" => "聲音",
-"Saving..." => "儲存中...",
-"Reset password" => "重設密碼",
-"No" => "否",
-"Yes" => "是",
-"Ok" => "確認",
-"_{count} file conflict_::_{count} file conflicts_" => array(""),
-"Cancel" => "取消",
-"Shared" => "已分享",
-"Share" => "分享",
-"Error" => "錯誤",
-"Error while sharing" => "分享時發生錯誤",
-"Error while unsharing" => "取消分享時發生錯誤",
-"Error while changing permissions" => "更改權限時發生錯誤",
-"Shared with you and the group {group} by {owner}" => "{owner}與你及群組的分享",
-"Shared with you by {owner}" => "{owner}與你的分享",
-"Share link" => "分享連結",
-"Password protect" => "密碼保護",
-"Send" => "傳送",
-"Set expiration date" => "設定分享期限",
-"Expiration date" => "分享期限",
-"Unshare" => "取消分享",
-"create" => "新增",
-"update" => "更新",
-"delete" => "刪除",
-"Password protected" => "密碼保護",
-"Sending ..." => "發送中...",
-"Email sent" => "郵件已傳",
-"Warning" => "警告",
-"Delete" => "刪除",
-"Add" => "加入",
-"The update was successful. Redirecting you to ownCloud now." => "更新成功, 正",
-"Use the following link to reset your password: {link}" => "請用以下連結重設你的密碼: {link}",
-"You will receive a link to reset your password via Email." => "你將收到一封電郵",
-"Username" => "用戶名稱",
-"Reset" => "重設",
-"New password" => "新密碼",
-"New Password" => "新密碼",
-"Personal" => "個人",
-"Users" => "用戶",
-"Apps" => "軟件",
-"Admin" => "管理",
-"Help" => "幫助",
-"Create an <strong>admin account</strong>" => "建立管理員帳戶",
-"Password" => "密碼",
-"Configure the database" => "設定資料庫",
-"Database user" => "資料庫帳戶",
-"Database password" => "資料庫密碼",
-"Database name" => "資料庫名稱",
-"Log out" => "登出",
-"remember" => "記住",
-"Log in" => "登入"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
new file mode 100644
index 00000000000..a112af12d07
--- /dev/null
+++ b/core/l10n/zh_TW.js
@@ -0,0 +1,211 @@
+OC.L10N.register(
+    "core",
+    {
+    "Couldn't send mail to following users: %s " : "無法寄送郵件給這些使用者：%s",
+    "Turned on maintenance mode" : "已啓用維護模式",
+    "Turned off maintenance mode" : "已停用維護模式",
+    "Updated database" : "已更新資料庫",
+    "Checked database schema update" : "已檢查資料庫格式更新",
+    "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
+    "Updated \"%s\" to %s" : "已更新 %s 到 %s",
+    "Disabled incompatible apps: %s" : "停用不相容的應用程式：%s",
+    "No image or file provided" : "未提供圖片或檔案",
+    "Unknown filetype" : "未知的檔案類型",
+    "Invalid image" : "無效的圖片",
+    "No temporary profile picture available, try again" : "沒有臨時用的大頭貼，請再試一次",
+    "No crop data provided" : "未設定剪裁",
+    "Sunday" : "週日",
+    "Monday" : "週一",
+    "Tuesday" : "週二",
+    "Wednesday" : "週三",
+    "Thursday" : "週四",
+    "Friday" : "週五",
+    "Saturday" : "週六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "設定",
+    "File" : "檔案",
+    "Folder" : "資料夾",
+    "Image" : "圖片",
+    "Audio" : "音訊",
+    "Saving..." : "儲存中...",
+    "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/>您確定要繼續嗎？",
+    "I know what I'm doing" : "我知道我在幹嘛",
+    "Reset password" : "重設密碼",
+    "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
+    "No" : "否",
+    "Yes" : "是",
+    "Choose" : "選擇",
+    "Error loading file picker template: {error}" : "載入檔案選擇器樣板出錯： {error}",
+    "Ok" : "好",
+    "Error loading message template: {error}" : "載入訊息樣板出錯： {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} 個檔案衝突"],
+    "One file conflict" : "一個檔案衝突",
+    "New Files" : "新檔案",
+    "Already existing files" : "已經存在的檔案",
+    "Which files do you want to keep?" : "您要保留哪一個檔案？",
+    "If you select both versions, the copied file will have a number added to its name." : "如果您同時選擇兩個版本，被複製的那個檔案名稱後面會加上編號",
+    "Cancel" : "取消",
+    "Continue" : "繼續",
+    "(all selected)" : "（已全選）",
+    "({count} selected)" : "（已選 {count} 項）",
+    "Error loading file exists template" : "載入檔案存在樣板出錯",
+    "Very weak password" : "非常弱的密碼",
+    "Weak password" : "弱的密碼",
+    "So-so password" : "普通的密碼",
+    "Good password" : "好的密碼",
+    "Strong password" : "很強的密碼",
+    "Your web server is not yet properly setup to allow files 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 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." : "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。",
+    "Error occurred while checking server setup" : "檢查伺服器配置時發生錯誤",
+    "Shared" : "已分享",
+    "Shared with {recipients}" : "與 {recipients} 分享",
+    "Share" : "分享",
+    "Error" : "錯誤",
+    "Error while sharing" : "分享時發生錯誤",
+    "Error while unsharing" : "取消分享時發生錯誤",
+    "Error while changing permissions" : "修改權限時發生錯誤",
+    "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
+    "Shared with you by {owner}" : "{owner} 已經和您分享",
+    "Share with user or group …" : "與用戶或群組分享",
+    "Share link" : "分享連結",
+    "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
+    "Password protect" : "密碼保護",
+    "Choose a password for the public link" : "為公開連結選一個密碼",
+    "Allow Public Upload" : "允許任何人上傳",
+    "Email link to person" : "將連結 email 給別人",
+    "Send" : "寄出",
+    "Set expiration date" : "指定到期日",
+    "Expiration date" : "到期日",
+    "Adding user..." : "新增使用者……",
+    "group" : "群組",
+    "Resharing is not allowed" : "不允許重新分享",
+    "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
+    "Unshare" : "取消分享",
+    "notify by email" : "以 email 通知",
+    "can share" : "可分享",
+    "can edit" : "可編輯",
+    "access control" : "存取控制",
+    "create" : "建立",
+    "update" : "更新",
+    "delete" : "刪除",
+    "Password protected" : "受密碼保護",
+    "Error unsetting expiration date" : "取消到期日設定失敗",
+    "Error setting expiration date" : "設定到期日發生錯誤",
+    "Sending ..." : "正在傳送…",
+    "Email sent" : "Email 已寄出",
+    "Warning" : "警告",
+    "The object type is not specified." : "未指定物件類型",
+    "Enter new" : "輸入新的",
+    "Delete" : "刪除",
+    "Add" : "增加",
+    "Edit tags" : "編輯標籤",
+    "Error loading dialog template: {error}" : "載入對話樣板出錯：{error}",
+    "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. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
+    "Couldn't reset password because the token is invalid" : "無法重設密碼因為 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 密碼重設",
+    "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}",
+    "You will receive a link to reset your password via Email." : "重設密碼的連結將會寄到您的電子郵件信箱。",
+    "Username" : "使用者名稱",
+    "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?" : "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？",
+    "Yes, I really want to reset my password now" : "對，我現在想要重設我的密碼。",
+    "Reset" : "重設",
+    "New password" : "新密碼",
+    "New Password" : "新密碼",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
+    "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
+    "Personal" : "個人",
+    "Users" : "使用者",
+    "Apps" : "應用程式",
+    "Admin" : "管理",
+    "Help" : "說明",
+    "Error loading tags" : "載入標籤出錯",
+    "Tag already exists" : "標籤已經存在",
+    "Error deleting tag(s)" : "刪除標籤出錯",
+    "Error tagging" : "貼標籤發生錯誤",
+    "Error untagging" : "移除標籤失敗",
+    "Error favoriting" : "加入最愛時出錯",
+    "Error unfavoriting" : "從最愛移除出錯",
+    "Access forbidden" : "存取被拒",
+    "File not found" : "找不到檔案",
+    "The specified document has not been found on the server." : "該文件不存在於伺服器上",
+    "You can click here to return to %s." : "點這裡以回到 %s",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n",
+    "The share will expire on %s." : "這個分享將會於 %s 過期",
+    "Cheers!" : "太棒了！",
+    "The server encountered an internal error and was unable to complete your request." : "伺服器遭遇內部錯誤，無法完成您的要求",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節",
+    "More details can be found in the server log." : "伺服器記錄檔裡面有更多細節",
+    "Technical details" : "技術細節",
+    "Remote Address: %s" : "遠端位置：%s",
+    "Request ID: %s" : "請求編號：%s",
+    "Code: %s" : "代碼：%s",
+    "Message: %s" : "訊息：%s",
+    "File: %s" : "檔案：%s",
+    "Line: %s" : "行數：%s",
+    "Trace" : "追蹤",
+    "Security Warning" : "安全性警告",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "請更新 PHP 以安全地使用 %s。",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
+    "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
+    "Password" : "密碼",
+    "Storage & database" : "儲存空間和資料庫",
+    "Data folder" : "資料儲存位置",
+    "Configure the database" : "設定資料庫",
+    "Only %s is available." : "剩下 %s 可使用",
+    "Database user" : "資料庫使用者",
+    "Database password" : "資料庫密碼",
+    "Database name" : "資料庫名稱",
+    "Database tablespace" : "資料庫 tablespace",
+    "Database host" : "資料庫主機",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "將會使用 SQLite 作為資料庫，在大型安裝中建議使用其他種資料庫",
+    "Finish setup" : "完成設定",
+    "Finishing …" : "即將完成…",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "這個應用程式需要 Javascript 才能正常運作，請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
+    "%s is available. Get more information on how to update." : "%s 已經釋出，瞭解更多資訊以進行更新。",
+    "Log out" : "登出",
+    "Server side authentication failed!" : "伺服器端認證失敗！",
+    "Please contact your administrator." : "請聯絡系統管理員。",
+    "Forgot your password? Reset it!" : "忘了密碼？重設它！",
+    "remember" : "記住",
+    "Log in" : "登入",
+    "Alternative Logins" : "其他登入方法",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式",
+    "This means only administrators can use the instance." : "這表示只有系統管理員能夠使用",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現，請聯絡系統管理員",
+    "Thank you for your patience." : "感謝您的耐心",
+    "You are accessing the server from an untrusted domain." : "你正在從一個未信任的網域存取伺服器",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
+    "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域",
+    "%s will be updated to version %s." : "%s 將會被升級到版本 %s",
+    "The following apps will be disabled:" : "這些應用程式會被停用：",
+    "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 being updated, 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
new file mode 100644
index 00000000000..0f09ca62862
--- /dev/null
+++ b/core/l10n/zh_TW.json
@@ -0,0 +1,209 @@
+{ "translations": {
+    "Couldn't send mail to following users: %s " : "無法寄送郵件給這些使用者：%s",
+    "Turned on maintenance mode" : "已啓用維護模式",
+    "Turned off maintenance mode" : "已停用維護模式",
+    "Updated database" : "已更新資料庫",
+    "Checked database schema update" : "已檢查資料庫格式更新",
+    "Checked database schema update for apps" : "已檢查應用程式的資料庫格式更新",
+    "Updated \"%s\" to %s" : "已更新 %s 到 %s",
+    "Disabled incompatible apps: %s" : "停用不相容的應用程式：%s",
+    "No image or file provided" : "未提供圖片或檔案",
+    "Unknown filetype" : "未知的檔案類型",
+    "Invalid image" : "無效的圖片",
+    "No temporary profile picture available, try again" : "沒有臨時用的大頭貼，請再試一次",
+    "No crop data provided" : "未設定剪裁",
+    "Sunday" : "週日",
+    "Monday" : "週一",
+    "Tuesday" : "週二",
+    "Wednesday" : "週三",
+    "Thursday" : "週四",
+    "Friday" : "週五",
+    "Saturday" : "週六",
+    "January" : "一月",
+    "February" : "二月",
+    "March" : "三月",
+    "April" : "四月",
+    "May" : "五月",
+    "June" : "六月",
+    "July" : "七月",
+    "August" : "八月",
+    "September" : "九月",
+    "October" : "十月",
+    "November" : "十一月",
+    "December" : "十二月",
+    "Settings" : "設定",
+    "File" : "檔案",
+    "Folder" : "資料夾",
+    "Image" : "圖片",
+    "Audio" : "音訊",
+    "Saving..." : "儲存中...",
+    "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/>您確定要繼續嗎？",
+    "I know what I'm doing" : "我知道我在幹嘛",
+    "Reset password" : "重設密碼",
+    "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
+    "No" : "否",
+    "Yes" : "是",
+    "Choose" : "選擇",
+    "Error loading file picker template: {error}" : "載入檔案選擇器樣板出錯： {error}",
+    "Ok" : "好",
+    "Error loading message template: {error}" : "載入訊息樣板出錯： {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} 個檔案衝突"],
+    "One file conflict" : "一個檔案衝突",
+    "New Files" : "新檔案",
+    "Already existing files" : "已經存在的檔案",
+    "Which files do you want to keep?" : "您要保留哪一個檔案？",
+    "If you select both versions, the copied file will have a number added to its name." : "如果您同時選擇兩個版本，被複製的那個檔案名稱後面會加上編號",
+    "Cancel" : "取消",
+    "Continue" : "繼續",
+    "(all selected)" : "（已全選）",
+    "({count} selected)" : "（已選 {count} 項）",
+    "Error loading file exists template" : "載入檔案存在樣板出錯",
+    "Very weak password" : "非常弱的密碼",
+    "Weak password" : "弱的密碼",
+    "So-so password" : "普通的密碼",
+    "Good password" : "好的密碼",
+    "Strong password" : "很強的密碼",
+    "Your web server is not yet properly setup to allow files 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 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." : "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。",
+    "Error occurred while checking server setup" : "檢查伺服器配置時發生錯誤",
+    "Shared" : "已分享",
+    "Shared with {recipients}" : "與 {recipients} 分享",
+    "Share" : "分享",
+    "Error" : "錯誤",
+    "Error while sharing" : "分享時發生錯誤",
+    "Error while unsharing" : "取消分享時發生錯誤",
+    "Error while changing permissions" : "修改權限時發生錯誤",
+    "Shared with you and the group {group} by {owner}" : "由 {owner} 分享給您和 {group}",
+    "Shared with you by {owner}" : "{owner} 已經和您分享",
+    "Share with user or group …" : "與用戶或群組分享",
+    "Share link" : "分享連結",
+    "The public link will expire no later than {days} days after it is created" : "這個公開連結會在 {days} 天內失效",
+    "Password protect" : "密碼保護",
+    "Choose a password for the public link" : "為公開連結選一個密碼",
+    "Allow Public Upload" : "允許任何人上傳",
+    "Email link to person" : "將連結 email 給別人",
+    "Send" : "寄出",
+    "Set expiration date" : "指定到期日",
+    "Expiration date" : "到期日",
+    "Adding user..." : "新增使用者……",
+    "group" : "群組",
+    "Resharing is not allowed" : "不允許重新分享",
+    "Shared in {item} with {user}" : "已和 {user} 分享 {item}",
+    "Unshare" : "取消分享",
+    "notify by email" : "以 email 通知",
+    "can share" : "可分享",
+    "can edit" : "可編輯",
+    "access control" : "存取控制",
+    "create" : "建立",
+    "update" : "更新",
+    "delete" : "刪除",
+    "Password protected" : "受密碼保護",
+    "Error unsetting expiration date" : "取消到期日設定失敗",
+    "Error setting expiration date" : "設定到期日發生錯誤",
+    "Sending ..." : "正在傳送…",
+    "Email sent" : "Email 已寄出",
+    "Warning" : "警告",
+    "The object type is not specified." : "未指定物件類型",
+    "Enter new" : "輸入新的",
+    "Delete" : "刪除",
+    "Add" : "增加",
+    "Edit tags" : "編輯標籤",
+    "Error loading dialog template: {error}" : "載入對話樣板出錯：{error}",
+    "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. Redirecting you to ownCloud now." : "升級成功，正將您重新導向至 ownCloud 。",
+    "Couldn't reset password because the token is invalid" : "無法重設密碼因為 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 密碼重設",
+    "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}",
+    "You will receive a link to reset your password via Email." : "重設密碼的連結將會寄到您的電子郵件信箱。",
+    "Username" : "使用者名稱",
+    "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?" : "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？",
+    "Yes, I really want to reset my password now" : "對，我現在想要重設我的密碼。",
+    "Reset" : "重設",
+    "New password" : "新密碼",
+    "New Password" : "新密碼",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
+    "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
+    "Personal" : "個人",
+    "Users" : "使用者",
+    "Apps" : "應用程式",
+    "Admin" : "管理",
+    "Help" : "說明",
+    "Error loading tags" : "載入標籤出錯",
+    "Tag already exists" : "標籤已經存在",
+    "Error deleting tag(s)" : "刪除標籤出錯",
+    "Error tagging" : "貼標籤發生錯誤",
+    "Error untagging" : "移除標籤失敗",
+    "Error favoriting" : "加入最愛時出錯",
+    "Error unfavoriting" : "從最愛移除出錯",
+    "Access forbidden" : "存取被拒",
+    "File not found" : "找不到檔案",
+    "The specified document has not been found on the server." : "該文件不存在於伺服器上",
+    "You can click here to return to %s." : "點這裡以回到 %s",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n",
+    "The share will expire on %s." : "這個分享將會於 %s 過期",
+    "Cheers!" : "太棒了！",
+    "The server encountered an internal error and was unable to complete your request." : "伺服器遭遇內部錯誤，無法完成您的要求",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節",
+    "More details can be found in the server log." : "伺服器記錄檔裡面有更多細節",
+    "Technical details" : "技術細節",
+    "Remote Address: %s" : "遠端位置：%s",
+    "Request ID: %s" : "請求編號：%s",
+    "Code: %s" : "代碼：%s",
+    "Message: %s" : "訊息：%s",
+    "File: %s" : "檔案：%s",
+    "Line: %s" : "行數：%s",
+    "Trace" : "追蹤",
+    "Security Warning" : "安全性警告",
+    "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
+    "Please update your PHP installation to use %s securely." : "請更新 PHP 以安全地使用 %s。",
+    "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
+    "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
+    "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
+    "Password" : "密碼",
+    "Storage & database" : "儲存空間和資料庫",
+    "Data folder" : "資料儲存位置",
+    "Configure the database" : "設定資料庫",
+    "Only %s is available." : "剩下 %s 可使用",
+    "Database user" : "資料庫使用者",
+    "Database password" : "資料庫密碼",
+    "Database name" : "資料庫名稱",
+    "Database tablespace" : "資料庫 tablespace",
+    "Database host" : "資料庫主機",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "將會使用 SQLite 作為資料庫，在大型安裝中建議使用其他種資料庫",
+    "Finish setup" : "完成設定",
+    "Finishing …" : "即將完成…",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "這個應用程式需要 Javascript 才能正常運作，請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
+    "%s is available. Get more information on how to update." : "%s 已經釋出，瞭解更多資訊以進行更新。",
+    "Log out" : "登出",
+    "Server side authentication failed!" : "伺服器端認證失敗！",
+    "Please contact your administrator." : "請聯絡系統管理員。",
+    "Forgot your password? Reset it!" : "忘了密碼？重設它！",
+    "remember" : "記住",
+    "Log in" : "登入",
+    "Alternative Logins" : "其他登入方法",
+    "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
+    "This ownCloud instance is currently in single user mode." : "這個 ownCloud 伺服器目前運作於單一使用者模式",
+    "This means only administrators can use the instance." : "這表示只有系統管理員能夠使用",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "若這個訊息持續出現，請聯絡系統管理員",
+    "Thank you for your patience." : "感謝您的耐心",
+    "You are accessing the server from an untrusted domain." : "你正在從一個未信任的網域存取伺服器",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
+    "Add \"%s\" as trusted domain" : "將 %s 加入到信任的網域",
+    "%s will be updated to version %s." : "%s 將會被升級到版本 %s",
+    "The following apps will be disabled:" : "這些應用程式會被停用：",
+    "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 being updated, which may take a while." : "正在更新這個 %s 安裝，需要一段時間",
+    "This page will refresh itself when the %s instance is available again." : "%s 安裝恢復可用之後，本頁會自動重新整理"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
deleted file mode 100644
index a431c6670da..00000000000
--- a/core/l10n/zh_TW.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Couldn't send mail to following users: %s " => "無法寄送郵件給這些使用者：%s",
-"Turned on maintenance mode" => "已啓用維護模式",
-"Turned off maintenance mode" => "已停用維護模式",
-"Updated database" => "已更新資料庫",
-"Checked database schema update" => "已檢查資料庫格式更新",
-"Checked database schema update for apps" => "已檢查應用程式的資料庫格式更新",
-"Updated \"%s\" to %s" => "已更新 %s 到 %s",
-"Disabled incompatible apps: %s" => "停用不相容的應用程式：%s",
-"No image or file provided" => "未提供圖片或檔案",
-"Unknown filetype" => "未知的檔案類型",
-"Invalid image" => "無效的圖片",
-"No temporary profile picture available, try again" => "沒有臨時用的大頭貼，請再試一次",
-"No crop data provided" => "未設定剪裁",
-"Sunday" => "週日",
-"Monday" => "週一",
-"Tuesday" => "週二",
-"Wednesday" => "週三",
-"Thursday" => "週四",
-"Friday" => "週五",
-"Saturday" => "週六",
-"January" => "一月",
-"February" => "二月",
-"March" => "三月",
-"April" => "四月",
-"May" => "五月",
-"June" => "六月",
-"July" => "七月",
-"August" => "八月",
-"September" => "九月",
-"October" => "十月",
-"November" => "十一月",
-"December" => "十二月",
-"Settings" => "設定",
-"File" => "檔案",
-"Folder" => "資料夾",
-"Image" => "圖片",
-"Audio" => "音訊",
-"Saving..." => "儲存中...",
-"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/>您確定要繼續嗎？",
-"I know what I'm doing" => "我知道我在幹嘛",
-"Reset password" => "重設密碼",
-"Password can not be changed. Please contact your administrator." => "無法變更密碼，請聯絡您的系統管理員",
-"No" => "否",
-"Yes" => "是",
-"Choose" => "選擇",
-"Error loading file picker template: {error}" => "載入檔案選擇器樣板出錯： {error}",
-"Ok" => "好",
-"Error loading message template: {error}" => "載入訊息樣板出錯： {error}",
-"_{count} file conflict_::_{count} file conflicts_" => array("{count} 個檔案衝突"),
-"One file conflict" => "一個檔案衝突",
-"New Files" => "新檔案",
-"Already existing files" => "已經存在的檔案",
-"Which files do you want to keep?" => "您要保留哪一個檔案？",
-"If you select both versions, the copied file will have a number added to its name." => "如果您同時選擇兩個版本，被複製的那個檔案名稱後面會加上編號",
-"Cancel" => "取消",
-"Continue" => "繼續",
-"(all selected)" => "（已全選）",
-"({count} selected)" => "（已選 {count} 項）",
-"Error loading file exists template" => "載入檔案存在樣板出錯",
-"Very weak password" => "非常弱的密碼",
-"Weak password" => "弱的密碼",
-"So-so password" => "普通的密碼",
-"Good password" => "好的密碼",
-"Strong password" => "很強的密碼",
-"Your web server is not yet properly setup to allow files 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 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." => "這臺 ownCloud 伺服器沒有連接到網際網路，因此有些功能像是掛載外部儲存空間、更新 ownCloud 或應用程式的通知沒有辦法運作。透過網際網路存取檔案還有電子郵件通知可能也無法運作。如果想要 ownCloud 完整的功能，建議您將這臺伺服器連接至網際網路。",
-"Error occurred while checking server setup" => "檢查伺服器配置時發生錯誤",
-"Shared" => "已分享",
-"Shared with {recipients}" => "與 {recipients} 分享",
-"Share" => "分享",
-"Error" => "錯誤",
-"Error while sharing" => "分享時發生錯誤",
-"Error while unsharing" => "取消分享時發生錯誤",
-"Error while changing permissions" => "修改權限時發生錯誤",
-"Shared with you and the group {group} by {owner}" => "由 {owner} 分享給您和 {group}",
-"Shared with you by {owner}" => "{owner} 已經和您分享",
-"Share with user or group …" => "與用戶或群組分享",
-"Share link" => "分享連結",
-"The public link will expire no later than {days} days after it is created" => "這個公開連結會在 {days} 天內失效",
-"Password protect" => "密碼保護",
-"Choose a password for the public link" => "為公開連結選一個密碼",
-"Allow Public Upload" => "允許任何人上傳",
-"Email link to person" => "將連結 email 給別人",
-"Send" => "寄出",
-"Set expiration date" => "指定到期日",
-"Expiration date" => "到期日",
-"Adding user..." => "新增使用者……",
-"group" => "群組",
-"Resharing is not allowed" => "不允許重新分享",
-"Shared in {item} with {user}" => "已和 {user} 分享 {item}",
-"Unshare" => "取消分享",
-"notify by email" => "以 email 通知",
-"can share" => "可分享",
-"can edit" => "可編輯",
-"access control" => "存取控制",
-"create" => "建立",
-"update" => "更新",
-"delete" => "刪除",
-"Password protected" => "受密碼保護",
-"Error unsetting expiration date" => "取消到期日設定失敗",
-"Error setting expiration date" => "設定到期日發生錯誤",
-"Sending ..." => "正在傳送…",
-"Email sent" => "Email 已寄出",
-"Warning" => "警告",
-"The object type is not specified." => "未指定物件類型",
-"Enter new" => "輸入新的",
-"Delete" => "刪除",
-"Add" => "增加",
-"Edit tags" => "編輯標籤",
-"Error loading dialog template: {error}" => "載入對話樣板出錯：{error}",
-"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. Redirecting you to ownCloud now." => "升級成功，正將您重新導向至 ownCloud 。",
-"Couldn't reset password because the token is invalid" => "無法重設密碼因為 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 密碼重設",
-"Use the following link to reset your password: {link}" => "請至以下連結重設您的密碼： {link}",
-"You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到您的電子郵件信箱。",
-"Username" => "使用者名稱",
-"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?" => "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？",
-"Yes, I really want to reset my password now" => "對，我現在想要重設我的密碼。",
-"Reset" => "重設",
-"New password" => "新密碼",
-"New Password" => "新密碼",
-"Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " => "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
-"For the best results, please consider using a GNU/Linux server instead." => "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
-"Personal" => "個人",
-"Users" => "使用者",
-"Apps" => "應用程式",
-"Admin" => "管理",
-"Help" => "說明",
-"Error loading tags" => "載入標籤出錯",
-"Tag already exists" => "標籤已經存在",
-"Error deleting tag(s)" => "刪除標籤出錯",
-"Error tagging" => "貼標籤發生錯誤",
-"Error untagging" => "移除標籤失敗",
-"Error favoriting" => "加入最愛時出錯",
-"Error unfavoriting" => "從最愛移除出錯",
-"Access forbidden" => "存取被拒",
-"File not found" => "找不到檔案",
-"The specified document has not been found on the server." => "該文件不存在於伺服器上",
-"You can click here to return to %s." => "點這裡以回到 %s",
-"Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" => "嗨，\n\n%s 和你分享了 %s ，到這裡看它：%s\n",
-"The share will expire on %s." => "這個分享將會於 %s 過期",
-"Cheers!" => "太棒了！",
-"The server encountered an internal error and was unable to complete your request." => "伺服器遭遇內部錯誤，無法完成您的要求",
-"Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." => "如果這個錯誤重複出現，請聯絡系統管理員，並附上以下的錯誤細節",
-"More details can be found in the server log." => "伺服器記錄檔裡面有更多細節",
-"Technical details" => "技術細節",
-"Remote Address: %s" => "遠端位置：%s",
-"Request ID: %s" => "請求編號：%s",
-"Code: %s" => "代碼：%s",
-"Message: %s" => "訊息：%s",
-"File: %s" => "檔案：%s",
-"Line: %s" => "行數：%s",
-"Trace" => "追蹤",
-"Security Warning" => "安全性警告",
-"Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" => "您的 PHP 版本無法抵抗 NULL Byte 攻擊 (CVE-2006-7243)",
-"Please update your PHP installation to use %s securely." => "請更新 PHP 以安全地使用 %s。",
-"Your data directory and files are probably accessible from the internet because the .htaccess file does not work." => "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
-"For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." => "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
-"Create an <strong>admin account</strong>" => "建立一個<strong>管理者帳號</strong>",
-"Password" => "密碼",
-"Storage & database" => "儲存空間和資料庫",
-"Data folder" => "資料儲存位置",
-"Configure the database" => "設定資料庫",
-"Only %s is available." => "剩下 %s 可使用",
-"Database user" => "資料庫使用者",
-"Database password" => "資料庫密碼",
-"Database name" => "資料庫名稱",
-"Database tablespace" => "資料庫 tablespace",
-"Database host" => "資料庫主機",
-"SQLite will be used as database. For larger installations we recommend to change this." => "將會使用 SQLite 作為資料庫，在大型安裝中建議使用其他種資料庫",
-"Finish setup" => "完成設定",
-"Finishing …" => "即將完成…",
-"This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." => "這個應用程式需要 Javascript 才能正常運作，請<a href=\"http://enable-javascript.com/\" target=\"_blank\">啟用 Javascript</a> 然後重新整理。",
-"%s is available. Get more information on how to update." => "%s 已經釋出，瞭解更多資訊以進行更新。",
-"Log out" => "登出",
-"Server side authentication failed!" => "伺服器端認證失敗！",
-"Please contact your administrator." => "請聯絡系統管理員。",
-"Forgot your password? Reset it!" => "忘了密碼？重設它！",
-"remember" => "記住",
-"Log in" => "登入",
-"Alternative Logins" => "其他登入方法",
-"Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" => "嗨，<br><br>%s 與你分享了<strong>%s</strong>。<br><a href=\"%s\">檢視</a><br><br>",
-"This ownCloud instance is currently in single user mode." => "這個 ownCloud 伺服器目前運作於單一使用者模式",
-"This means only administrators can use the instance." => "這表示只有系統管理員能夠使用",
-"Contact your system administrator if this message persists or appeared unexpectedly." => "若這個訊息持續出現，請聯絡系統管理員",
-"Thank you for your patience." => "感謝您的耐心",
-"You are accessing the server from an untrusted domain." => "你正在從一個未信任的網域存取伺服器",
-"Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." => "請聯絡您的系統管理員，如果您就是系統管理員，請設定 config/config.php 中的 \"trusted_domain\" 選項。範例設定提供於 config/config.sample.php",
-"Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." => "依照設定而定，您身為系統管理員可能也可以使用底下的按鈕來信任這個網域",
-"Add \"%s\" as trusted domain" => "將 %s 加入到信任的網域",
-"%s will be updated to version %s." => "%s 將會被升級到版本 %s",
-"The following apps will be disabled:" => "這些應用程式會被停用：",
-"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 being updated, which may take a while." => "正在更新這個 %s 安裝，需要一段時間",
-"This page will refresh itself when the %s instance is available again." => "%s 安裝恢復可用之後，本頁會自動重新整理"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ach.js b/lib/l10n/ach.js
new file mode 100644
index 00000000000..9ac3e05d6c6
--- /dev/null
+++ b/lib/l10n/ach.js
@@ -0,0 +1,9 @@
+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/ach.json b/lib/l10n/ach.json
new file mode 100644
index 00000000000..82a8a99d300
--- /dev/null
+++ b/lib/l10n/ach.json
@@ -0,0 +1,7 @@
+{ "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/ach.php b/lib/l10n/ach.php
deleted file mode 100644
index 406ff5f5a26..00000000000
--- a/lib/l10n/ach.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/ady.js b/lib/l10n/ady.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/ady.js
@@ -0,0 +1,9 @@
+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/ady.json b/lib/l10n/ady.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/ady.json
@@ -0,0 +1,7 @@
+{ "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/ady.php b/lib/l10n/ady.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/ady.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/af_ZA.js b/lib/l10n/af_ZA.js
new file mode 100644
index 00000000000..fd0ff979e2c
--- /dev/null
+++ b/lib/l10n/af_ZA.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Hulp",
+    "Personal" : "Persoonlik",
+    "Settings" : "Instellings",
+    "Users" : "Gebruikers",
+    "Admin" : "Admin",
+    "Unknown filetype" : "Onbekende leertipe",
+    "Invalid image" : "Ongeldige prent",
+    "web services under your control" : "webdienste onder jou beheer",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["","%n ure gelede"],
+    "today" : "vandag",
+    "_%n day go_::_%n days ago_" : ["","%n dae gelede"],
+    "_%n month ago_::_%n months ago_" : ["","%n maande gelede"]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/af_ZA.json b/lib/l10n/af_ZA.json
new file mode 100644
index 00000000000..0a2bd668866
--- /dev/null
+++ b/lib/l10n/af_ZA.json
@@ -0,0 +1,16 @@
+{ "translations": {
+    "Help" : "Hulp",
+    "Personal" : "Persoonlik",
+    "Settings" : "Instellings",
+    "Users" : "Gebruikers",
+    "Admin" : "Admin",
+    "Unknown filetype" : "Onbekende leertipe",
+    "Invalid image" : "Ongeldige prent",
+    "web services under your control" : "webdienste onder jou beheer",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["","%n ure gelede"],
+    "today" : "vandag",
+    "_%n day go_::_%n days ago_" : ["","%n dae gelede"],
+    "_%n month ago_::_%n months ago_" : ["","%n maande gelede"]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/af_ZA.php b/lib/l10n/af_ZA.php
deleted file mode 100644
index 3f3095ccb9a..00000000000
--- a/lib/l10n/af_ZA.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Hulp",
-"Personal" => "Persoonlik",
-"Settings" => "Instellings",
-"Users" => "Gebruikers",
-"Admin" => "Admin",
-"Unknown filetype" => "Onbekende leertipe",
-"Invalid image" => "Ongeldige prent",
-"web services under your control" => "webdienste onder jou beheer",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("","%n ure gelede"),
-"today" => "vandag",
-"_%n day go_::_%n days ago_" => array("","%n dae gelede"),
-"_%n month ago_::_%n months ago_" => array("","%n maande gelede")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ak.js b/lib/l10n/ak.js
new file mode 100644
index 00000000000..27ded1c7f3b
--- /dev/null
+++ b/lib/l10n/ak.js
@@ -0,0 +1,9 @@
+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/ak.json b/lib/l10n/ak.json
new file mode 100644
index 00000000000..a488fce3cc6
--- /dev/null
+++ b/lib/l10n/ak.json
@@ -0,0 +1,7 @@
+{ "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/ak.php b/lib/l10n/ak.php
deleted file mode 100644
index 4124ad0d880..00000000000
--- a/lib/l10n/ak.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=n > 1;";
diff --git a/lib/l10n/am_ET.js b/lib/l10n/am_ET.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/am_ET.js
@@ -0,0 +1,9 @@
+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/am_ET.json b/lib/l10n/am_ET.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/am_ET.json
@@ -0,0 +1,7 @@
+{ "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/am_ET.php b/lib/l10n/am_ET.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/am_ET.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ar.js b/lib/l10n/ar.js
new file mode 100644
index 00000000000..5fec5a1a818
--- /dev/null
+++ b/lib/l10n/ar.js
@@ -0,0 +1,53 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "المساعدة",
+    "Personal" : "شخصي",
+    "Settings" : "إعدادات",
+    "Users" : "المستخدمين",
+    "Admin" : "المدير",
+    "No app name specified" : "لا يوجد برنامج بهذا الاسم",
+    "Unknown filetype" : "نوع الملف غير معروف",
+    "Invalid image" : "الصورة غير صالحة",
+    "web services under your control" : "خدمات الشبكة تحت سيطرتك",
+    "App directory already exists" : "مجلد التطبيق موجود مسبقا",
+    "Can't create app folder. Please fix permissions. %s" : "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s",
+    "No source specified when installing app" : "لم يتم تحديد المصدر عن تثبيت البرنامج",
+    "Archives of type %s are not supported" : "الأرشيفات من نوع  %s غير مدعومة",
+    "App does not provide an info.xml file" : "التطبيق لا يتوفر على ملف info.xml",
+    "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 لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
+    "MS SQL username and/or password not valid: %s" : "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s",
+    "You need to enter either an existing account or the administrator." : "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
+    "MySQL/MariaDB username and/or password not valid" : "اسم مستخدم أو كلمة مرور MySQL/MariaDB  غير صحيحين",
+    "DB Error: \"%s\"" : "خطأ في قواعد البيانات : \"%s\"",
+    "Offending command was: \"%s\"" : "الأمر المخالف كان : \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "مستخدم MySQL/MariaDB '%s'@'localhost' موجود مسبقا",
+    "Drop this user from MySQL/MariaDB." : "حذف هذا المستخدم من MySQL/MariaDB",
+    "Oracle connection could not be established" : "لم تنجح محاولة اتصال Oracle",
+    "Oracle username and/or password not valid" : "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح",
+    "Offending command was: \"%s\", name: %s, password: %s" : "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
+    "PostgreSQL username and/or password not valid" : "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
+    "Set an admin username." : "اعداد اسم مستخدم للمدير",
+    "Set an admin password." : "اعداد كلمة مرور للمدير",
+    "%s shared »%s« with you" : "%s شارك »%s« معك",
+    "Could not find category \"%s\"" : "تعذر العثور على المجلد \"%s\"",
+    "seconds ago" : "منذ ثواني",
+    "_%n minute ago_::_%n minutes ago_" : ["","","","","",""],
+    "_%n hour ago_::_%n hours ago_" : ["","","","","",""],
+    "today" : "اليوم",
+    "yesterday" : "يوم أمس",
+    "_%n day go_::_%n days ago_" : ["","","","","",""],
+    "last month" : "الشهر الماضي",
+    "_%n month ago_::_%n months ago_" : ["","","","","",""],
+    "last year" : "السنةالماضية",
+    "years ago" : "سنة مضت",
+    "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
+    "A valid password must be provided" : "يجب ادخال كلمة مرور صحيحة"
+},
+"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/ar.json b/lib/l10n/ar.json
new file mode 100644
index 00000000000..64af68df990
--- /dev/null
+++ b/lib/l10n/ar.json
@@ -0,0 +1,51 @@
+{ "translations": {
+    "Help" : "المساعدة",
+    "Personal" : "شخصي",
+    "Settings" : "إعدادات",
+    "Users" : "المستخدمين",
+    "Admin" : "المدير",
+    "No app name specified" : "لا يوجد برنامج بهذا الاسم",
+    "Unknown filetype" : "نوع الملف غير معروف",
+    "Invalid image" : "الصورة غير صالحة",
+    "web services under your control" : "خدمات الشبكة تحت سيطرتك",
+    "App directory already exists" : "مجلد التطبيق موجود مسبقا",
+    "Can't create app folder. Please fix permissions. %s" : "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s",
+    "No source specified when installing app" : "لم يتم تحديد المصدر عن تثبيت البرنامج",
+    "Archives of type %s are not supported" : "الأرشيفات من نوع  %s غير مدعومة",
+    "App does not provide an info.xml file" : "التطبيق لا يتوفر على ملف info.xml",
+    "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 لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
+    "MS SQL username and/or password not valid: %s" : "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s",
+    "You need to enter either an existing account or the administrator." : "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
+    "MySQL/MariaDB username and/or password not valid" : "اسم مستخدم أو كلمة مرور MySQL/MariaDB  غير صحيحين",
+    "DB Error: \"%s\"" : "خطأ في قواعد البيانات : \"%s\"",
+    "Offending command was: \"%s\"" : "الأمر المخالف كان : \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "مستخدم MySQL/MariaDB '%s'@'localhost' موجود مسبقا",
+    "Drop this user from MySQL/MariaDB." : "حذف هذا المستخدم من MySQL/MariaDB",
+    "Oracle connection could not be established" : "لم تنجح محاولة اتصال Oracle",
+    "Oracle username and/or password not valid" : "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح",
+    "Offending command was: \"%s\", name: %s, password: %s" : "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
+    "PostgreSQL username and/or password not valid" : "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
+    "Set an admin username." : "اعداد اسم مستخدم للمدير",
+    "Set an admin password." : "اعداد كلمة مرور للمدير",
+    "%s shared »%s« with you" : "%s شارك »%s« معك",
+    "Could not find category \"%s\"" : "تعذر العثور على المجلد \"%s\"",
+    "seconds ago" : "منذ ثواني",
+    "_%n minute ago_::_%n minutes ago_" : ["","","","","",""],
+    "_%n hour ago_::_%n hours ago_" : ["","","","","",""],
+    "today" : "اليوم",
+    "yesterday" : "يوم أمس",
+    "_%n day go_::_%n days ago_" : ["","","","","",""],
+    "last month" : "الشهر الماضي",
+    "_%n month ago_::_%n months ago_" : ["","","","","",""],
+    "last year" : "السنةالماضية",
+    "years ago" : "سنة مضت",
+    "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;"
+}
\ No newline at end of file
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
deleted file mode 100644
index d4bf458383e..00000000000
--- a/lib/l10n/ar.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "المساعدة",
-"Personal" => "شخصي",
-"Settings" => "إعدادات",
-"Users" => "المستخدمين",
-"Admin" => "المدير",
-"No app name specified" => "لا يوجد برنامج بهذا الاسم",
-"Unknown filetype" => "نوع الملف غير معروف",
-"Invalid image" => "الصورة غير صالحة",
-"web services under your control" => "خدمات الشبكة تحت سيطرتك",
-"App directory already exists" => "مجلد التطبيق موجود مسبقا",
-"Can't create app folder. Please fix permissions. %s" => "لا يمكن إنشاء مجلد التطبيق. يرجى تعديل الصلاحيات. %s",
-"No source specified when installing app" => "لم يتم تحديد المصدر عن تثبيت البرنامج",
-"Archives of type %s are not supported" => "الأرشيفات من نوع  %s غير مدعومة",
-"App does not provide an info.xml file" => "التطبيق لا يتوفر على ملف info.xml",
-"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 لا يسمح لك باستخدام نقطه (.) في اسم قاعدة البيانات",
-"MS SQL username and/or password not valid: %s" => "اسم المستخدم  و/أو  كلمة المرور لنظام MS SQL غير صحيح : %s",
-"You need to enter either an existing account or the administrator." => "انت بحاجة لكتابة اسم مستخدم موجود أو حساب المدير.",
-"MySQL/MariaDB username and/or password not valid" => "اسم مستخدم أو كلمة مرور MySQL/MariaDB  غير صحيحين",
-"DB Error: \"%s\"" => "خطأ في قواعد البيانات : \"%s\"",
-"Offending command was: \"%s\"" => "الأمر المخالف كان : \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "مستخدم MySQL/MariaDB '%s'@'localhost' موجود مسبقا",
-"Drop this user from MySQL/MariaDB." => "حذف هذا المستخدم من MySQL/MariaDB",
-"Oracle connection could not be established" => "لم تنجح محاولة اتصال Oracle",
-"Oracle username and/or password not valid" => "اسم المستخدم  و/أو  كلمة المرور لنظام Oracle غير صحيح",
-"Offending command was: \"%s\", name: %s, password: %s" => "الأمر المخالف كان : \"%s\", اسم المستخدم : %s, كلمة المرور: %s",
-"PostgreSQL username and/or password not valid" => "اسم المستخدم / أو كلمة المرور الخاصة بـPostgreSQL غير صحيحة",
-"Set an admin username." => "اعداد اسم مستخدم للمدير",
-"Set an admin password." => "اعداد كلمة مرور للمدير",
-"%s shared »%s« with you" => "%s شارك »%s« معك",
-"Could not find category \"%s\"" => "تعذر العثور على المجلد \"%s\"",
-"seconds ago" => "منذ ثواني",
-"_%n minute ago_::_%n minutes ago_" => array("","","","","",""),
-"_%n hour ago_::_%n hours ago_" => array("","","","","",""),
-"today" => "اليوم",
-"yesterday" => "يوم أمس",
-"_%n day go_::_%n days ago_" => array("","","","","",""),
-"last month" => "الشهر الماضي",
-"_%n month ago_::_%n months ago_" => array("","","","","",""),
-"last year" => "السنةالماضية",
-"years ago" => "سنة مضت",
-"A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
-"A valid password must be provided" => "يجب ادخال كلمة مرور صحيحة"
-);
-$PLURAL_FORMS = "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
new file mode 100644
index 00000000000..89fbe3b173d
--- /dev/null
+++ b/lib/l10n/ast.js
@@ -0,0 +1,119 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "¡Nun pue escribise nel direutoriu \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Davezu esto pue iguase dándo-y al sirvidor web accesu d'escritura al direutoriu de configuración",
+    "See %s" : "Mira %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Davezu esto pue iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu de configuración%s.",
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Axustes",
+    "Users" : "Usuarios",
+    "Admin" : "Almin",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'aplicación \\\"%s\\\" nun pue instalase porque nun ye compatible con esta versión d'ownCloud",
+    "No app name specified" : "Nun s'especificó nome de l'aplicación",
+    "Unknown filetype" : "Triba de ficheru desconocida",
+    "Invalid image" : "Imaxe inválida",
+    "web services under your control" : "servicios web baxo'l to control",
+    "App directory already exists" : "El direutoriu de l'aplicación yá esiste",
+    "Can't create app folder. Please fix permissions. %s" : "Nun pue crease la carpeta de l'aplicación. Por favor, igua los permisos. %s",
+    "No source specified when installing app" : "Nun s'especificó nenguna fonte al instalar app",
+    "No href specified when installing app from http" : "Nun s'especificó href al instalar la app dende http",
+    "No path specified when installing app from local file" : "Nun s'especificó camín dende un ficheru llocal al instalar l'aplicación",
+    "Archives of type %s are not supported" : "Los ficheros de triba %s nun tán sofitaos",
+    "Failed to open archive when installing app" : "Falló al abrir el ficheru al instalar l'aplicación",
+    "App does not provide an info.xml file" : "L'aplicación nun apurre un ficheru info.xml",
+    "App can't be installed because of not allowed code in the App" : "Nun pue instalase l'aplicación por causa d'un códigu non permitíu na App",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicación nun pue instalase porque contién la etiqueta <shipped>true</shipped> que nun ta permitida p'aplicaciones non distribuyíes",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Nun pue instalase l'aplicación porque'l númberu de versión en info.xml/version nun ye'l mesmu que la versión qu'apaez na app store",
+    "Application is not enabled" : "L'aplicación nun ta habilitada",
+    "Authentication error" : "Fallu d'autenticación",
+    "Token expired. Please reload page." : "Token caducáu. Recarga la páxina.",
+    "Unknown user" : "Usuariu desconocíu",
+    "%s enter the database username." : "%s introducir l'usuariu de la base de datos.",
+    "%s enter the database name." : "%s introducir nome de la base de datos.",
+    "%s you may not use dots in the database name" : "%s nun pues usar puntos nel nome de la base de datos",
+    "MS SQL username and/or password not valid: %s" : "Nome d'usuariu o contraseña MS SQL non válidos: %s",
+    "You need to enter either an existing account or the administrator." : "Tienes d'inxertar una cuenta esistente o la del alministrador.",
+    "MySQL/MariaDB username and/or password not valid" : "Nome d'usuariu o contraseña MySQL/MariaDB non válidos",
+    "DB Error: \"%s\"" : "Fallu BD: \"%s\"",
+    "Offending command was: \"%s\"" : "Comandu infractor: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "usuariu MySQL/MariaDB '%s'@'localhost' yá esiste.",
+    "Drop this user from MySQL/MariaDB" : "Desaniciar esti usuariu de MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Yá esiste l'usuariu de MySQL/MariaDB '%s'@'%%'",
+    "Drop this user from MySQL/MariaDB." : "Desaniciar esti usuariu de MySQL/MariaDB",
+    "Oracle connection could not be established" : "Nun pudo afitase la conexón d'Oracle",
+    "Oracle username and/or password not valid" : "Nome d'usuariu o contraseña d'Oracle non válidos",
+    "Offending command was: \"%s\", name: %s, password: %s" : "El comandu infractor foi: \"%s\", nome: %s, contraseña: %s",
+    "PostgreSQL username and/or password not valid" : "Nome d'usuariu o contraseña PostgreSQL non válidos",
+    "Set an admin username." : "Afitar nome d'usuariu p'almin",
+    "Set an admin password." : "Afitar contraseña p'almin",
+    "%s shared »%s« with you" : "%s compartió »%s« contigo",
+    "Sharing %s failed, because the file does not exist" : "Compartir %s falló, porque'l ficheru nun esiste",
+    "You are not allowed to share %s" : "Nun tienes permisu pa compartir %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Compartir %s falló, yá que l'usuariu %s ye'l dueñu del elementu",
+    "Sharing %s failed, because the user %s does not exist" : "Compartir %s falló, yá que l'usuariu %s nun esiste",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Compartir %s falló, yá que l'usuariu %s nun ye miembru de nengún de los grupos de los que ye miembru %s",
+    "Sharing %s failed, because this item is already shared with %s" : "Compartir %s falló, porque esti elementu yá ta compartiéndose con %s",
+    "Sharing %s failed, because the group %s does not exist" : "Compartir %s falló, porque'l grupu %s nun esiste",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Compartir %s falló, porque %s nun ye miembru del grupu %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Necesites apurrir una contraseña pa crear un enllaz públicu, namái tan permitíos los enllaces protexíos",
+    "Sharing %s failed, because sharing with links is not allowed" : "Compartir %s falló, porque nun se permite compartir con enllaces",
+    "Share type %s is not valid for %s" : "La triba de compartición %s nun ye válida pa %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Falló dar permisos a %s, porque los permisos son mayores que los otorgaos a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Falló dar permisos a %s, porque l'elementu nun s'atopó",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nun pue afitase la data de caducidá. Ficheros compartíos nun puen caducar dempués de %s de compartise",
+    "Cannot set expiration date. Expiration date is in the past" : "Nun pue afitase la data d'espiración. La data d'espiración ta nel pasáu",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El motor compartíu %s tien d'implementar la interfaz OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Nun s'alcontró'l botón de compartición %s",
+    "Sharing backend for %s not found" : "Nun s'alcontró'l botón de partición pa %s",
+    "Sharing %s failed, because the user %s is the original sharer" : "Compartir %s falló, yá que l'usuariu %s ye'l compartidor orixinal",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Compartir %s falló, porque los permisos perpasen los otorgaos a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Compartir %s falló, porque nun se permite la re-compartición",
+    "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.\"",
+    "seconds ago" : "hai segundos",
+    "_%n minute ago_::_%n minutes ago_" : ["hai %n minutu","hai %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["hai %n hora","hai %n hores"],
+    "today" : "güei",
+    "yesterday" : "ayeri",
+    "_%n day go_::_%n days ago_" : ["hai %n día","hai %n díes"],
+    "last month" : "mes caberu",
+    "_%n month ago_::_%n months ago_" : ["hai %n mes","hai %n meses"],
+    "last year" : "añu caberu",
+    "years ago" : "hai años",
+    "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",
+    "The username is already being used" : "El nome d'usuariu yá ta usándose",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nun hai controladores de bases de datos  (sqlite, mysql, o postgresql)",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Davezu los permisos puen iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu raigañu%s.",
+    "Cannot write into \"config\" directory" : "Nun pue escribise nel direutoriu \"config\"",
+    "Cannot write into \"apps\" directory" : "Nun pue escribise nel direutoriu \"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 pue iguase %sdando permisos d'escritura al sirvidor Web nel direutoriu%s d'apps o deshabilitando la tienda d'apps nel ficheru de configuración.",
+    "Cannot create \"data\" directory (%s)" : "Nun pue crease'l direutoriu \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto pue iguase davezu <a href=\"%s\" target=\"_blank\">dándo-y accesu d'escritura al direutoriu raigañu</a>.",
+    "Setting locale to %s failed" : "Falló l'activación del idioma %s",
+    "Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.",
+    "PHP module %s not installed." : "Nun ta instaláu'l módulu PHP %s",
+    "PHP %s or higher is required." : "Necesítase PHP %s o superior",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor, entrúga-y al to alministrador del sirvidor p'anovar PHP a la cabera versión. La to versión PHP nun ta sofitada por ownCloud y la comunidá PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Ta habilitáu'l mou seguru de PHP. ownCloud requier que tea deshabilitáu pa furrular afayadízamente",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Mou seguru de PHP ye un entornu en desusu que tien de desactivase. Contauta col alministrador del sirvidor pa desactivalu en php.ini o na configuración del sirvidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Tán habilitaes les Magic Quotes. ownCloud requier que les deshabilites pa funcionar afayadizamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes ye un entornu en desusu y tien de desactivase. Consulta col alministrador del sirvidor pa desactivalu en php.ini o na configuración del sirvidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse los módulos PHP, ¿pero tán entá llistaos como faltantes?",
+    "Please ask your server administrator to restart the web server." : "Por favor, entruga al to alministrador pa reaniciar el sirvidor web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 requeríu",
+    "Please upgrade your database version" : "Por favor, anueva la versión de la to base de datos",
+    "Error occurred while checking PostgreSQL version" : "Asocedió un fallu mientres se comprobaba la versión de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Por favor, asegúrate que tienes PostgreSQL >= 9 o comprueba los rexistros pa más información tocante al fallu",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor, camuda los permisos a 0770 pa que'l direutoriu nun pueda llistase por otros usuarios.",
+    "Data directory (%s) is readable by other users" : "El direutoriu de datos (%s) ye llexible por otros usuarios",
+    "Data directory (%s) is invalid" : "Ye inválidu'l direutoriu de datos (%s)",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifica que'l direutoriu de datos contién un ficheru \".ocdata\" nel direutoriu raigañu.",
+    "Could not obtain lock type %d on \"%s\"." : "Nun pudo facese'l bloquéu %d en \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
new file mode 100644
index 00000000000..c069b132a30
--- /dev/null
+++ b/lib/l10n/ast.json
@@ -0,0 +1,117 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "¡Nun pue escribise nel direutoriu \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Davezu esto pue iguase dándo-y al sirvidor web accesu d'escritura al direutoriu de configuración",
+    "See %s" : "Mira %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Davezu esto pue iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu de configuración%s.",
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Axustes",
+    "Users" : "Usuarios",
+    "Admin" : "Almin",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'aplicación \\\"%s\\\" nun pue instalase porque nun ye compatible con esta versión d'ownCloud",
+    "No app name specified" : "Nun s'especificó nome de l'aplicación",
+    "Unknown filetype" : "Triba de ficheru desconocida",
+    "Invalid image" : "Imaxe inválida",
+    "web services under your control" : "servicios web baxo'l to control",
+    "App directory already exists" : "El direutoriu de l'aplicación yá esiste",
+    "Can't create app folder. Please fix permissions. %s" : "Nun pue crease la carpeta de l'aplicación. Por favor, igua los permisos. %s",
+    "No source specified when installing app" : "Nun s'especificó nenguna fonte al instalar app",
+    "No href specified when installing app from http" : "Nun s'especificó href al instalar la app dende http",
+    "No path specified when installing app from local file" : "Nun s'especificó camín dende un ficheru llocal al instalar l'aplicación",
+    "Archives of type %s are not supported" : "Los ficheros de triba %s nun tán sofitaos",
+    "Failed to open archive when installing app" : "Falló al abrir el ficheru al instalar l'aplicación",
+    "App does not provide an info.xml file" : "L'aplicación nun apurre un ficheru info.xml",
+    "App can't be installed because of not allowed code in the App" : "Nun pue instalase l'aplicación por causa d'un códigu non permitíu na App",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicación nun pue instalase porque contién la etiqueta <shipped>true</shipped> que nun ta permitida p'aplicaciones non distribuyíes",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Nun pue instalase l'aplicación porque'l númberu de versión en info.xml/version nun ye'l mesmu que la versión qu'apaez na app store",
+    "Application is not enabled" : "L'aplicación nun ta habilitada",
+    "Authentication error" : "Fallu d'autenticación",
+    "Token expired. Please reload page." : "Token caducáu. Recarga la páxina.",
+    "Unknown user" : "Usuariu desconocíu",
+    "%s enter the database username." : "%s introducir l'usuariu de la base de datos.",
+    "%s enter the database name." : "%s introducir nome de la base de datos.",
+    "%s you may not use dots in the database name" : "%s nun pues usar puntos nel nome de la base de datos",
+    "MS SQL username and/or password not valid: %s" : "Nome d'usuariu o contraseña MS SQL non válidos: %s",
+    "You need to enter either an existing account or the administrator." : "Tienes d'inxertar una cuenta esistente o la del alministrador.",
+    "MySQL/MariaDB username and/or password not valid" : "Nome d'usuariu o contraseña MySQL/MariaDB non válidos",
+    "DB Error: \"%s\"" : "Fallu BD: \"%s\"",
+    "Offending command was: \"%s\"" : "Comandu infractor: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "usuariu MySQL/MariaDB '%s'@'localhost' yá esiste.",
+    "Drop this user from MySQL/MariaDB" : "Desaniciar esti usuariu de MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Yá esiste l'usuariu de MySQL/MariaDB '%s'@'%%'",
+    "Drop this user from MySQL/MariaDB." : "Desaniciar esti usuariu de MySQL/MariaDB",
+    "Oracle connection could not be established" : "Nun pudo afitase la conexón d'Oracle",
+    "Oracle username and/or password not valid" : "Nome d'usuariu o contraseña d'Oracle non válidos",
+    "Offending command was: \"%s\", name: %s, password: %s" : "El comandu infractor foi: \"%s\", nome: %s, contraseña: %s",
+    "PostgreSQL username and/or password not valid" : "Nome d'usuariu o contraseña PostgreSQL non válidos",
+    "Set an admin username." : "Afitar nome d'usuariu p'almin",
+    "Set an admin password." : "Afitar contraseña p'almin",
+    "%s shared »%s« with you" : "%s compartió »%s« contigo",
+    "Sharing %s failed, because the file does not exist" : "Compartir %s falló, porque'l ficheru nun esiste",
+    "You are not allowed to share %s" : "Nun tienes permisu pa compartir %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Compartir %s falló, yá que l'usuariu %s ye'l dueñu del elementu",
+    "Sharing %s failed, because the user %s does not exist" : "Compartir %s falló, yá que l'usuariu %s nun esiste",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Compartir %s falló, yá que l'usuariu %s nun ye miembru de nengún de los grupos de los que ye miembru %s",
+    "Sharing %s failed, because this item is already shared with %s" : "Compartir %s falló, porque esti elementu yá ta compartiéndose con %s",
+    "Sharing %s failed, because the group %s does not exist" : "Compartir %s falló, porque'l grupu %s nun esiste",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Compartir %s falló, porque %s nun ye miembru del grupu %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Necesites apurrir una contraseña pa crear un enllaz públicu, namái tan permitíos los enllaces protexíos",
+    "Sharing %s failed, because sharing with links is not allowed" : "Compartir %s falló, porque nun se permite compartir con enllaces",
+    "Share type %s is not valid for %s" : "La triba de compartición %s nun ye válida pa %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Falló dar permisos a %s, porque los permisos son mayores que los otorgaos a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Falló dar permisos a %s, porque l'elementu nun s'atopó",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nun pue afitase la data de caducidá. Ficheros compartíos nun puen caducar dempués de %s de compartise",
+    "Cannot set expiration date. Expiration date is in the past" : "Nun pue afitase la data d'espiración. La data d'espiración ta nel pasáu",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El motor compartíu %s tien d'implementar la interfaz OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Nun s'alcontró'l botón de compartición %s",
+    "Sharing backend for %s not found" : "Nun s'alcontró'l botón de partición pa %s",
+    "Sharing %s failed, because the user %s is the original sharer" : "Compartir %s falló, yá que l'usuariu %s ye'l compartidor orixinal",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Compartir %s falló, porque los permisos perpasen los otorgaos a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Compartir %s falló, porque nun se permite la re-compartición",
+    "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.\"",
+    "seconds ago" : "hai segundos",
+    "_%n minute ago_::_%n minutes ago_" : ["hai %n minutu","hai %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["hai %n hora","hai %n hores"],
+    "today" : "güei",
+    "yesterday" : "ayeri",
+    "_%n day go_::_%n days ago_" : ["hai %n día","hai %n díes"],
+    "last month" : "mes caberu",
+    "_%n month ago_::_%n months ago_" : ["hai %n mes","hai %n meses"],
+    "last year" : "añu caberu",
+    "years ago" : "hai años",
+    "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",
+    "The username is already being used" : "El nome d'usuariu yá ta usándose",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nun hai controladores de bases de datos  (sqlite, mysql, o postgresql)",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Davezu los permisos puen iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu raigañu%s.",
+    "Cannot write into \"config\" directory" : "Nun pue escribise nel direutoriu \"config\"",
+    "Cannot write into \"apps\" directory" : "Nun pue escribise nel direutoriu \"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 pue iguase %sdando permisos d'escritura al sirvidor Web nel direutoriu%s d'apps o deshabilitando la tienda d'apps nel ficheru de configuración.",
+    "Cannot create \"data\" directory (%s)" : "Nun pue crease'l direutoriu \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto pue iguase davezu <a href=\"%s\" target=\"_blank\">dándo-y accesu d'escritura al direutoriu raigañu</a>.",
+    "Setting locale to %s failed" : "Falló l'activación del idioma %s",
+    "Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.",
+    "PHP module %s not installed." : "Nun ta instaláu'l módulu PHP %s",
+    "PHP %s or higher is required." : "Necesítase PHP %s o superior",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor, entrúga-y al to alministrador del sirvidor p'anovar PHP a la cabera versión. La to versión PHP nun ta sofitada por ownCloud y la comunidá PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Ta habilitáu'l mou seguru de PHP. ownCloud requier que tea deshabilitáu pa furrular afayadízamente",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Mou seguru de PHP ye un entornu en desusu que tien de desactivase. Contauta col alministrador del sirvidor pa desactivalu en php.ini o na configuración del sirvidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Tán habilitaes les Magic Quotes. ownCloud requier que les deshabilites pa funcionar afayadizamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes ye un entornu en desusu y tien de desactivase. Consulta col alministrador del sirvidor pa desactivalu en php.ini o na configuración del sirvidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse los módulos PHP, ¿pero tán entá llistaos como faltantes?",
+    "Please ask your server administrator to restart the web server." : "Por favor, entruga al to alministrador pa reaniciar el sirvidor web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 requeríu",
+    "Please upgrade your database version" : "Por favor, anueva la versión de la to base de datos",
+    "Error occurred while checking PostgreSQL version" : "Asocedió un fallu mientres se comprobaba la versión de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Por favor, asegúrate que tienes PostgreSQL >= 9 o comprueba los rexistros pa más información tocante al fallu",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor, camuda los permisos a 0770 pa que'l direutoriu nun pueda llistase por otros usuarios.",
+    "Data directory (%s) is readable by other users" : "El direutoriu de datos (%s) ye llexible por otros usuarios",
+    "Data directory (%s) is invalid" : "Ye inválidu'l direutoriu de datos (%s)",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifica que'l direutoriu de datos contién un ficheru \".ocdata\" nel direutoriu raigañu.",
+    "Could not obtain lock type %d on \"%s\"." : "Nun pudo facese'l bloquéu %d en \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/ast.php b/lib/l10n/ast.php
deleted file mode 100644
index 5209495a970..00000000000
--- a/lib/l10n/ast.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "¡Nun pue escribise nel direutoriu \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Davezu esto pue iguase dándo-y al sirvidor web accesu d'escritura al direutoriu de configuración",
-"See %s" => "Mira %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Davezu esto pue iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu de configuración%s.",
-"Help" => "Ayuda",
-"Personal" => "Personal",
-"Settings" => "Axustes",
-"Users" => "Usuarios",
-"Admin" => "Almin",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'aplicación \\\"%s\\\" nun pue instalase porque nun ye compatible con esta versión d'ownCloud",
-"No app name specified" => "Nun s'especificó nome de l'aplicación",
-"Unknown filetype" => "Triba de ficheru desconocida",
-"Invalid image" => "Imaxe inválida",
-"web services under your control" => "servicios web baxo'l to control",
-"App directory already exists" => "El direutoriu de l'aplicación yá esiste",
-"Can't create app folder. Please fix permissions. %s" => "Nun pue crease la carpeta de l'aplicación. Por favor, igua los permisos. %s",
-"No source specified when installing app" => "Nun s'especificó nenguna fonte al instalar app",
-"No href specified when installing app from http" => "Nun s'especificó href al instalar la app dende http",
-"No path specified when installing app from local file" => "Nun s'especificó camín dende un ficheru llocal al instalar l'aplicación",
-"Archives of type %s are not supported" => "Los ficheros de triba %s nun tán sofitaos",
-"Failed to open archive when installing app" => "Falló al abrir el ficheru al instalar l'aplicación",
-"App does not provide an info.xml file" => "L'aplicación nun apurre un ficheru info.xml",
-"App can't be installed because of not allowed code in the App" => "Nun pue instalase l'aplicación por causa d'un códigu non permitíu na App",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Nun pue instalase l'aplicación porque nun ye compatible con esta versión d'ownCloud.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'aplicación nun pue instalase porque contién la etiqueta <shipped>true</shipped> que nun ta permitida p'aplicaciones non distribuyíes",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Nun pue instalase l'aplicación porque'l númberu de versión en info.xml/version nun ye'l mesmu que la versión qu'apaez na app store",
-"Application is not enabled" => "L'aplicación nun ta habilitada",
-"Authentication error" => "Fallu d'autenticación",
-"Token expired. Please reload page." => "Token caducáu. Recarga la páxina.",
-"Unknown user" => "Usuariu desconocíu",
-"%s enter the database username." => "%s introducir l'usuariu de la base de datos.",
-"%s enter the database name." => "%s introducir nome de la base de datos.",
-"%s you may not use dots in the database name" => "%s nun pues usar puntos nel nome de la base de datos",
-"MS SQL username and/or password not valid: %s" => "Nome d'usuariu o contraseña MS SQL non válidos: %s",
-"You need to enter either an existing account or the administrator." => "Tienes d'inxertar una cuenta esistente o la del alministrador.",
-"MySQL/MariaDB username and/or password not valid" => "Nome d'usuariu o contraseña MySQL/MariaDB non válidos",
-"DB Error: \"%s\"" => "Fallu BD: \"%s\"",
-"Offending command was: \"%s\"" => "Comandu infractor: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "usuariu MySQL/MariaDB '%s'@'localhost' yá esiste.",
-"Drop this user from MySQL/MariaDB" => "Desaniciar esti usuariu de MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Yá esiste l'usuariu de MySQL/MariaDB '%s'@'%%'",
-"Drop this user from MySQL/MariaDB." => "Desaniciar esti usuariu de MySQL/MariaDB",
-"Oracle connection could not be established" => "Nun pudo afitase la conexón d'Oracle",
-"Oracle username and/or password not valid" => "Nome d'usuariu o contraseña d'Oracle non válidos",
-"Offending command was: \"%s\", name: %s, password: %s" => "El comandu infractor foi: \"%s\", nome: %s, contraseña: %s",
-"PostgreSQL username and/or password not valid" => "Nome d'usuariu o contraseña PostgreSQL non válidos",
-"Set an admin username." => "Afitar nome d'usuariu p'almin",
-"Set an admin password." => "Afitar contraseña p'almin",
-"%s shared »%s« with you" => "%s compartió »%s« contigo",
-"Sharing %s failed, because the file does not exist" => "Compartir %s falló, porque'l ficheru nun esiste",
-"You are not allowed to share %s" => "Nun tienes permisu pa compartir %s",
-"Sharing %s failed, because the user %s is the item owner" => "Compartir %s falló, yá que l'usuariu %s ye'l dueñu del elementu",
-"Sharing %s failed, because the user %s does not exist" => "Compartir %s falló, yá que l'usuariu %s nun esiste",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Compartir %s falló, yá que l'usuariu %s nun ye miembru de nengún de los grupos de los que ye miembru %s",
-"Sharing %s failed, because this item is already shared with %s" => "Compartir %s falló, porque esti elementu yá ta compartiéndose con %s",
-"Sharing %s failed, because the group %s does not exist" => "Compartir %s falló, porque'l grupu %s nun esiste",
-"Sharing %s failed, because %s is not a member of the group %s" => "Compartir %s falló, porque %s nun ye miembru del grupu %s",
-"You need to provide a password to create a public link, only protected links are allowed" => "Necesites apurrir una contraseña pa crear un enllaz públicu, namái tan permitíos los enllaces protexíos",
-"Sharing %s failed, because sharing with links is not allowed" => "Compartir %s falló, porque nun se permite compartir con enllaces",
-"Share type %s is not valid for %s" => "La triba de compartición %s nun ye válida pa %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Falló dar permisos a %s, porque los permisos son mayores que los otorgaos a %s",
-"Setting permissions for %s failed, because the item was not found" => "Falló dar permisos a %s, porque l'elementu nun s'atopó",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Nun pue afitase la data de caducidá. Ficheros compartíos nun puen caducar dempués de %s de compartise",
-"Cannot set expiration date. Expiration date is in the past" => "Nun pue afitase la data d'espiración. La data d'espiración ta nel pasáu",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "El motor compartíu %s tien d'implementar la interfaz OCP\\Share_Backend",
-"Sharing backend %s not found" => "Nun s'alcontró'l botón de compartición %s",
-"Sharing backend for %s not found" => "Nun s'alcontró'l botón de partición pa %s",
-"Sharing %s failed, because the user %s is the original sharer" => "Compartir %s falló, yá que l'usuariu %s ye'l compartidor orixinal",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Compartir %s falló, porque los permisos perpasen los otorgaos a %s",
-"Sharing %s failed, because resharing is not allowed" => "Compartir %s falló, porque nun se permite la re-compartición",
-"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.\"",
-"seconds ago" => "hai segundos",
-"_%n minute ago_::_%n minutes ago_" => array("hai %n minutu","hai %n minutos"),
-"_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n hores"),
-"today" => "güei",
-"yesterday" => "ayeri",
-"_%n day go_::_%n days ago_" => array("hai %n día","hai %n díes"),
-"last month" => "mes caberu",
-"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
-"last year" => "añu caberu",
-"years ago" => "hai años",
-"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",
-"The username is already being used" => "El nome d'usuariu yá ta usándose",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Nun hai controladores de bases de datos  (sqlite, mysql, o postgresql)",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Davezu los permisos puen iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu raigañu%s.",
-"Cannot write into \"config\" directory" => "Nun pue escribise nel direutoriu \"config\"",
-"Cannot write into \"apps\" directory" => "Nun pue escribise nel direutoriu \"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 pue iguase %sdando permisos d'escritura al sirvidor Web nel direutoriu%s d'apps o deshabilitando la tienda d'apps nel ficheru de configuración.",
-"Cannot create \"data\" directory (%s)" => "Nun pue crease'l direutoriu \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Esto pue iguase davezu <a href=\"%s\" target=\"_blank\">dándo-y accesu d'escritura al direutoriu raigañu</a>.",
-"Setting locale to %s failed" => "Falló l'activación del idioma %s",
-"Please ask your server administrator to install the module." => "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.",
-"PHP module %s not installed." => "Nun ta instaláu'l módulu PHP %s",
-"PHP %s or higher is required." => "Necesítase PHP %s o superior",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Por favor, entrúga-y al to alministrador del sirvidor p'anovar PHP a la cabera versión. La to versión PHP nun ta sofitada por ownCloud y la comunidá PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Ta habilitáu'l mou seguru de PHP. ownCloud requier que tea deshabilitáu pa furrular afayadízamente",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Mou seguru de PHP ye un entornu en desusu que tien de desactivase. Contauta col alministrador del sirvidor pa desactivalu en php.ini o na configuración del sirvidor web.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Tán habilitaes les Magic Quotes. ownCloud requier que les deshabilites pa funcionar afayadizamente.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes ye un entornu en desusu y tien de desactivase. Consulta col alministrador del sirvidor pa desactivalu en php.ini o na configuración del sirvidor web.",
-"PHP modules have been installed, but they are still listed as missing?" => "Instaláronse los módulos PHP, ¿pero tán entá llistaos como faltantes?",
-"Please ask your server administrator to restart the web server." => "Por favor, entruga al to alministrador pa reaniciar el sirvidor web.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 requeríu",
-"Please upgrade your database version" => "Por favor, anueva la versión de la to base de datos",
-"Error occurred while checking PostgreSQL version" => "Asocedió un fallu mientres se comprobaba la versión de PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Por favor, asegúrate que tienes PostgreSQL >= 9 o comprueba los rexistros pa más información tocante al fallu",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Por favor, camuda los permisos a 0770 pa que'l direutoriu nun pueda llistase por otros usuarios.",
-"Data directory (%s) is readable by other users" => "El direutoriu de datos (%s) ye llexible por otros usuarios",
-"Data directory (%s) is invalid" => "Ye inválidu'l direutoriu de datos (%s)",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Verifica que'l direutoriu de datos contién un ficheru \".ocdata\" nel direutoriu raigañu.",
-"Could not obtain lock type %d on \"%s\"." => "Nun pudo facese'l bloquéu %d en \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/az.js b/lib/l10n/az.js
new file mode 100644
index 00000000000..700c3353556
--- /dev/null
+++ b/lib/l10n/az.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "\"configurasiya\" direktoriyasının daxilində yazmaq mümkün deyil",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Adətən tez həll etmək üçün WEB serverdə yazma yetkisi verilir",
+    "See %s" : "Bax %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Bu adətən %s config qovluğuna web server üçün yazma yetkisi verdikdə, %s tərəfindən fix edilə bilir. ",
+    "Sample configuration detected" : "Konfiqurasiya nüsxəsi təyin edildi",
+    "Help" : "Kömək",
+    "Personal" : "Şəxsi",
+    "Settings" : "Quraşdırmalar",
+    "Users" : "İstifadəçilər",
+    "Admin" : "İnzibatçı",
+    "No app name specified" : "Proqram adı təyin edilməyib",
+    "Unknown filetype" : "Fayl tipi bəlli deyil.",
+    "Invalid image" : "Yalnış şəkil",
+    "App directory already exists" : "Proqram təminatı qovluğu artıq mövcuddur.",
+    "Can't create app folder. Please fix permissions. %s" : "Proqram təminatı qovluğunu yaratmaq mümkün olmadı. Xahiş edilir yetkiləri düzgün təyin edəsiniz. %s",
+    "Application is not enabled" : "Proqram təminatı aktiv edilməyib",
+    "Authentication error" : "Təyinat metodikası",
+    "Token expired. Please reload page." : "Token vaxtı bitib. Xahiş olunur səhifəni yenidən yükləyəsiniz.",
+    "Unknown user" : "Istifadəçi tanınmır ",
+    "%s enter the database username." : "Verilənlər bazası istifadəçi adını %s daxil et.",
+    "%s enter the database name." : "Verilənlər bazası adını %s daxil et.",
+    "MS SQL username and/or password not valid: %s" : "MS SQL istifadəçi adı və/ya şifrəsi düzgün deyil : %s",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB istifadəçi adı və/ya şifrəsi düzgün deyil :",
+    "DB Error: \"%s\"" : "DB səhvi: \"%s\"",
+    "Drop this user from MySQL/MariaDB" : "Bu istifadəçini MySQL/MariaDB-dən sil",
+    "Drop this user from MySQL/MariaDB." : "Bu istifadəçini MySQL/MariaDB-dən sil.",
+    "Oracle connection could not be established" : "Oracle qoşulması alınmır",
+    "Oracle username and/or password not valid" : "Oracle istifadəçi adı və/ya şifrəsi düzgün deyil",
+    "Set an admin username." : "İnzibatçı istifadəçi adını təyin et.",
+    "Set an admin password." : "İnzibatçı şifrəsini təyin et.",
+    "%s shared »%s« with you" : "%s yayımlandı »%s« sizinlə",
+    "Sharing %s failed, because the file does not exist" : "%s yayımlanmasında səhv baş verdi ona görə ki, fayl mövcud deyil.",
+    "You are not allowed to share %s" : "%s-in yayimlanmasına sizə izin verilmir",
+    "Share type %s is not valid for %s" : "Yayımlanma  tipi %s etibarlı deyil %s üçün",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "_%n day go_::_%n days ago_" : ["",""],
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir",
+    "A valid password must be provided" : "Düzgün şifrə daxil edilməlidir"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/az.json b/lib/l10n/az.json
new file mode 100644
index 00000000000..b0348a52ef3
--- /dev/null
+++ b/lib/l10n/az.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "\"configurasiya\" direktoriyasının daxilində yazmaq mümkün deyil",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Adətən tez həll etmək üçün WEB serverdə yazma yetkisi verilir",
+    "See %s" : "Bax %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Bu adətən %s config qovluğuna web server üçün yazma yetkisi verdikdə, %s tərəfindən fix edilə bilir. ",
+    "Sample configuration detected" : "Konfiqurasiya nüsxəsi təyin edildi",
+    "Help" : "Kömək",
+    "Personal" : "Şəxsi",
+    "Settings" : "Quraşdırmalar",
+    "Users" : "İstifadəçilər",
+    "Admin" : "İnzibatçı",
+    "No app name specified" : "Proqram adı təyin edilməyib",
+    "Unknown filetype" : "Fayl tipi bəlli deyil.",
+    "Invalid image" : "Yalnış şəkil",
+    "App directory already exists" : "Proqram təminatı qovluğu artıq mövcuddur.",
+    "Can't create app folder. Please fix permissions. %s" : "Proqram təminatı qovluğunu yaratmaq mümkün olmadı. Xahiş edilir yetkiləri düzgün təyin edəsiniz. %s",
+    "Application is not enabled" : "Proqram təminatı aktiv edilməyib",
+    "Authentication error" : "Təyinat metodikası",
+    "Token expired. Please reload page." : "Token vaxtı bitib. Xahiş olunur səhifəni yenidən yükləyəsiniz.",
+    "Unknown user" : "Istifadəçi tanınmır ",
+    "%s enter the database username." : "Verilənlər bazası istifadəçi adını %s daxil et.",
+    "%s enter the database name." : "Verilənlər bazası adını %s daxil et.",
+    "MS SQL username and/or password not valid: %s" : "MS SQL istifadəçi adı və/ya şifrəsi düzgün deyil : %s",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB istifadəçi adı və/ya şifrəsi düzgün deyil :",
+    "DB Error: \"%s\"" : "DB səhvi: \"%s\"",
+    "Drop this user from MySQL/MariaDB" : "Bu istifadəçini MySQL/MariaDB-dən sil",
+    "Drop this user from MySQL/MariaDB." : "Bu istifadəçini MySQL/MariaDB-dən sil.",
+    "Oracle connection could not be established" : "Oracle qoşulması alınmır",
+    "Oracle username and/or password not valid" : "Oracle istifadəçi adı və/ya şifrəsi düzgün deyil",
+    "Set an admin username." : "İnzibatçı istifadəçi adını təyin et.",
+    "Set an admin password." : "İnzibatçı şifrəsini təyin et.",
+    "%s shared »%s« with you" : "%s yayımlandı »%s« sizinlə",
+    "Sharing %s failed, because the file does not exist" : "%s yayımlanmasında səhv baş verdi ona görə ki, fayl mövcud deyil.",
+    "You are not allowed to share %s" : "%s-in yayimlanmasına sizə izin verilmir",
+    "Share type %s is not valid for %s" : "Yayımlanma  tipi %s etibarlı deyil %s üçün",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "_%n day go_::_%n days ago_" : ["",""],
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir",
+    "A valid password must be provided" : "Düzgün şifrə daxil edilməlidir"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/az.php b/lib/l10n/az.php
deleted file mode 100644
index a527b8edf5d..00000000000
--- a/lib/l10n/az.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "\"configurasiya\" direktoriyasının daxilində yazmaq mümkün deyil",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Adətən tez həll etmək üçün WEB serverdə yazma yetkisi verilir",
-"See %s" => "Bax %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Bu adətən %s config qovluğuna web server üçün yazma yetkisi verdikdə, %s tərəfindən fix edilə bilir. ",
-"Sample configuration detected" => "Konfiqurasiya nüsxəsi təyin edildi",
-"Help" => "Kömək",
-"Personal" => "Şəxsi",
-"Settings" => "Quraşdırmalar",
-"Users" => "İstifadəçilər",
-"Admin" => "İnzibatçı",
-"No app name specified" => "Proqram adı təyin edilməyib",
-"Unknown filetype" => "Fayl tipi bəlli deyil.",
-"Invalid image" => "Yalnış şəkil",
-"App directory already exists" => "Proqram təminatı qovluğu artıq mövcuddur.",
-"Can't create app folder. Please fix permissions. %s" => "Proqram təminatı qovluğunu yaratmaq mümkün olmadı. Xahiş edilir yetkiləri düzgün təyin edəsiniz. %s",
-"Application is not enabled" => "Proqram təminatı aktiv edilməyib",
-"Authentication error" => "Təyinat metodikası",
-"Token expired. Please reload page." => "Token vaxtı bitib. Xahiş olunur səhifəni yenidən yükləyəsiniz.",
-"Unknown user" => "Istifadəçi tanınmır ",
-"%s enter the database username." => "Verilənlər bazası istifadəçi adını %s daxil et.",
-"%s enter the database name." => "Verilənlər bazası adını %s daxil et.",
-"MS SQL username and/or password not valid: %s" => "MS SQL istifadəçi adı və/ya şifrəsi düzgün deyil : %s",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB istifadəçi adı və/ya şifrəsi düzgün deyil :",
-"DB Error: \"%s\"" => "DB səhvi: \"%s\"",
-"Drop this user from MySQL/MariaDB" => "Bu istifadəçini MySQL/MariaDB-dən sil",
-"Drop this user from MySQL/MariaDB." => "Bu istifadəçini MySQL/MariaDB-dən sil.",
-"Oracle connection could not be established" => "Oracle qoşulması alınmır",
-"Oracle username and/or password not valid" => "Oracle istifadəçi adı və/ya şifrəsi düzgün deyil",
-"Set an admin username." => "İnzibatçı istifadəçi adını təyin et.",
-"Set an admin password." => "İnzibatçı şifrəsini təyin et.",
-"%s shared »%s« with you" => "%s yayımlandı »%s« sizinlə",
-"Sharing %s failed, because the file does not exist" => "%s yayımlanmasında səhv baş verdi ona görə ki, fayl mövcud deyil.",
-"You are not allowed to share %s" => "%s-in yayimlanmasına sizə izin verilmir",
-"Share type %s is not valid for %s" => "Yayımlanma  tipi %s etibarlı deyil %s üçün",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("",""),
-"A valid username must be provided" => "Düzgün istifadəçi adı daxil edilməlidir",
-"A valid password must be provided" => "Düzgün şifrə daxil edilməlidir"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/be.js b/lib/l10n/be.js
new file mode 100644
index 00000000000..b75e4fa2e67
--- /dev/null
+++ b/lib/l10n/be.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Settings" : "Налады",
+    "seconds ago" : "Секунд таму",
+    "_%n minute ago_::_%n minutes ago_" : ["","","",""],
+    "_%n hour ago_::_%n hours ago_" : ["","","",""],
+    "today" : "Сёння",
+    "yesterday" : "Ўчора",
+    "_%n day go_::_%n days ago_" : ["","","",""],
+    "last month" : "У мінулым месяцы",
+    "_%n month ago_::_%n months ago_" : ["","","",""],
+    "last year" : "У мінулым годзе",
+    "years ago" : "Гадоў таму"
+},
+"nplurals=4; 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/be.json b/lib/l10n/be.json
new file mode 100644
index 00000000000..891b64361dc
--- /dev/null
+++ b/lib/l10n/be.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Settings" : "Налады",
+    "seconds ago" : "Секунд таму",
+    "_%n minute ago_::_%n minutes ago_" : ["","","",""],
+    "_%n hour ago_::_%n hours ago_" : ["","","",""],
+    "today" : "Сёння",
+    "yesterday" : "Ўчора",
+    "_%n day go_::_%n days ago_" : ["","","",""],
+    "last month" : "У мінулым месяцы",
+    "_%n month ago_::_%n months ago_" : ["","","",""],
+    "last year" : "У мінулым годзе",
+    "years ago" : "Гадоў таму"
+},"pluralForm" :"nplurals=4; 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/be.php b/lib/l10n/be.php
deleted file mode 100644
index b1cf270aba2..00000000000
--- a/lib/l10n/be.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "Налады",
-"seconds ago" => "Секунд таму",
-"_%n minute ago_::_%n minutes ago_" => array("","","",""),
-"_%n hour ago_::_%n hours ago_" => array("","","",""),
-"today" => "Сёння",
-"yesterday" => "Ўчора",
-"_%n day go_::_%n days ago_" => array("","","",""),
-"last month" => "У мінулым месяцы",
-"_%n month ago_::_%n months ago_" => array("","","",""),
-"last year" => "У мінулым годзе",
-"years ago" => "Гадоў таму"
-);
-$PLURAL_FORMS = "nplurals=4; 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/bg_BG.js b/lib/l10n/bg_BG.js
new file mode 100644
index 00000000000..82f0f3e51fc
--- /dev/null
+++ b/lib/l10n/bg_BG.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Неуспешен опит за запис в \"config\" папката!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Това може да бъде решено единствено като разрешиш на уеб сървъра да пише в config папката.",
+    "See %s" : "Виж %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в config папката %s.",
+    "Sample configuration detected" : "Открита е примерна конфигурация",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Усетено беше че примерната конфигурация е копирана. Това може да развли инсталацията ти и не се поддържа. Моля, прочети документацията преди да правиш промени на config.php",
+    "Help" : "Помощ",
+    "Personal" : "Лични",
+    "Settings" : "Настройки",
+    "Users" : "Потребители",
+    "Admin" : "Админ",
+    "Recommended" : "Препоръчано",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Приложението \\\"%s\\\" не може да бъде инсталирано, защото не е съвместимо с тази версия на ownCloud.",
+    "No app name specified" : "Не е зададено име на преложението",
+    "Unknown filetype" : "Непознат тип файл.",
+    "Invalid image" : "Невалидно изображение.",
+    "web services under your control" : "уеб услуги под твой контрол",
+    "App directory already exists" : "Папката на приложението вече съществува.",
+    "Can't create app folder. Please fix permissions. %s" : "Неуспешно създаване на папката за приложението. Моля, оправете разрешенията. %s",
+    "No source specified when installing app" : "Не е зададен източник при инсталацията на приложението.",
+    "No href specified when installing app from http" : "Липсва съдържанието на връзката за инсталиране на приложението",
+    "No path specified when installing app from local file" : "Не е зададен пътя до локалния файл за инсталиране на приложението.",
+    "Archives of type %s are not supported" : "Архиви от тип %s не се подържат",
+    "Failed to open archive when installing app" : "Неуспешно отваряне на архив по времен на инсталацията на приложението.",
+    "App does not provide an info.xml file" : "Приложенението не добавило info.xml",
+    "App can't be installed because of not allowed code in the App" : "Приложението няма да бъде инсталирано, защото използва неразрешен код.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Приложението няма да бъде инсталирано, защото не е съвместимо с текущата версия на ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложението няма да бъде инсталирано, защото съдържа <shipped>true</shipped>, който таг не е разрешен за не ship-нати приложения.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Приложението няма да бъде инсталирано, защото версията в info.xml/version не съвпада с версията публикувана в магазина за приложения.",
+    "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, не може да ползваш точки в името на базата данни.",
+    "MS SQL username and/or password not valid: %s" : "Невалидно MS SQL потребителско име и/или парола: %s.",
+    "You need to enter either an existing account or the administrator." : "Необходимо е да въведеш съществуващ профил или като администратор.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB потребителското име и/или паролата са невалидни.",
+    "DB Error: \"%s\"" : "Грешка в базата данни: \"%s\".",
+    "Offending command was: \"%s\"" : "Проблемната команда беше: \"%s\".",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB потребител '%s'@'localhost' вече съществува.",
+    "Drop this user from MySQL/MariaDB" : "Премахни този потребител от MySQL/MariaDB.",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB потребител '%s'@'%%' вече съществува.",
+    "Drop this user from MySQL/MariaDB." : "Премахни този потребител от MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Oracle връзка не можа да се осъществи.",
+    "Oracle username and/or password not valid" : "Невалидно Oracle потребителско име и/или парола.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Проблемната команда беше: \"%s\", име: %s, парола: %s.",
+    "PostgreSQL username and/or password not valid" : "Невалидно PostgreSQL потребителско име и/или парола.",
+    "Set an admin username." : "Задай потребителско име за администратор.",
+    "Set an admin password." : "Задай парола за администратор.",
+    "Can't create or write into the data directory %s" : "Неуспешно създаване или записване в \"data\" папката %s",
+    "%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.",
+    "Sharing %s failed, because the user %s is the item owner" : "Споделяне на %s е неуспешно, защото потребител %s е оригиналния собственик.",
+    "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 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" : "Трябва да зададеш парола, за да създадеш общодостъпен линк за споделяне, само защитени с пароли линкове са разрешени.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Неуспешно споделяне на %s, защото споделянето посредством връзки не е разрешено.",
+    "Share type %s is not valid for %s" : "Споделянето на тип %s не валидно за %s.",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Неуспешна промяна на правата за достъп за %s, защото промените надвишават правата на достъп дадени на %s.",
+    "Setting permissions for %s failed, because the item was not found" : "Неуспешна промяна на правата за достъп за %s, защото съдържанието не е открито.",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Неуспешно задаване на дата на изтичане. Споделни папки или файлове не могат да изтичат по-късно от %s след като са били споделени",
+    "Cannot set expiration date. Expiration date is in the past" : "Неуспешно задаване на дата на изтичане. Датата на изтичане е в миналото",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Споделянето на сървърния %s трябва да поддържа OCP\\Share_Backend интерфейс.",
+    "Sharing backend %s not found" : "Споделянето на сървърния %s не е открито.",
+    "Sharing backend for %s not found" : "Споделянето на сървъра за %s не е открито.",
+    "Sharing %s failed, because the user %s is the original sharer" : "Споделяне на %s е неуспешно, защото потребител %s е оригиналния собственик.",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Неуспешно споделяне на %s, защото промените надвишават правата на достъп дадени на %s.",
+    "Sharing %s failed, because resharing is not allowed" : "Неуспешно споделяне на %s, защото повторно споделяне не е разрешено.",
+    "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\".",
+    "seconds ago" : "преди секунди",
+    "_%n minute ago_::_%n minutes ago_" : ["","преди %n минути"],
+    "_%n hour ago_::_%n hours ago_" : ["","преди %n часа"],
+    "today" : "днес",
+    "yesterday" : "вчера",
+    "_%n day go_::_%n days ago_" : ["","преди %n дена"],
+    "last month" : "миналия месец",
+    "_%n month ago_::_%n months ago_" : ["","преди %n месеца"],
+    "last year" : "миналата година",
+    "years ago" : "преди години",
+    "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" : "Валидна парола трябва да бъде зададена.",
+    "The username is already being used" : "Това потребителско име е вече заето.",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Липсват инсталирани драйвери за бази данни(sqlite, mysql или postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Правата за достъп обикновено могат да бъдат оправени като %s даде разрешение на уеб сървъра да пише в root папката %s.",
+    "Cannot write into \"config\" directory" : "Неуспешен опит за запис в \"config\" папката.",
+    "Cannot write into \"apps\" directory" : "Неуспешен опит за запис в \"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." : "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в app папката %s или като изключи магазина за приложения в config файла.",
+    "Cannot create \"data\" directory (%s)" : "Неуспешен опит за създаване на \"data\" папката (%s).",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Това обикновено може да бъде оправено като <a href=\"%s\" target=\"_blank\">дадеш разрешение на уеб сървъра да записва в root  папката</a>.",
+    "Setting locale to %s failed" : "Неуспешно задаване на %s като настройка език-държава.",
+    "Please install one of these locales on your system and restart your webserver." : "Моля, инсталирай едно от следните език-държава на сървъра и рестартирай уеб сървъра.",
+    "Please ask your server administrator to install the module." : "Моля, поискай твоят администратор да инсталира модула.",
+    "PHP module %s not installed." : "PHP модулът %s не е инсталиран.",
+    "PHP %s or higher is required." : "Изисква се PHP %s или по-нова.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Моля, поискай твоят администратор да обнови PHP до най-новата верския. Твоята PHP версия вече не се поддържа от ownCloud и PHP общността.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode е включен. ownCloud изисква този режим да бъде изключен, за да функионира нормално.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode е непропръчителна и общо взето безсмислена настройка и трябва да бъде изключена. Моля, поискай твоя администратор да я изключи ви php.ini или в конфигурацията на уве сървъра.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes е включен. ownCloud изисква да е изключен, за да функнионира нормално.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes е непропръчителна и общо взето безсмислена настройка и трябва да бъде изключена. Моля, поискай твоя администратор да я изключи ви php.ini или в конфигурацията на уве сървъра.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP модулите са инсталирани, но все още се обявяват като липсващи?",
+    "Please ask your server administrator to restart the web server." : "Моля, поискай от своя администратор да рестартира уеб сървъра.",
+    "PostgreSQL >= 9 required" : "Изисква се PostgreSQL >= 9",
+    "Please upgrade your database version" : "Моля, обнови базата данни.",
+    "Error occurred while checking PostgreSQL version" : "Настъпи грешка при проверката на версията на PostgreSQL.",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Моля, увери се, че PostgreSQL >= 9 или провери докладите за повече информация относно грешката.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Моля, промени правата за достъп на 0770, за да не може директорията да бъде видяна от други потребители.",
+    "Data directory (%s) is readable by other users" : "Data папката (%s) може да бъде разгледана от други потребители",
+    "Data directory (%s) is invalid" : "Data папката (%s) e невалидна",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Моля, увери се, че data папката съдържа файл \".ocdata\" в себе си.",
+    "Could not obtain lock type %d on \"%s\"." : "Неуспешен опит за ексклузивен достъп от типa %d върху \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg_BG.json
new file mode 100644
index 00000000000..62c0ea60f07
--- /dev/null
+++ b/lib/l10n/bg_BG.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Неуспешен опит за запис в \"config\" папката!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Това може да бъде решено единствено като разрешиш на уеб сървъра да пише в config папката.",
+    "See %s" : "Виж %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в config папката %s.",
+    "Sample configuration detected" : "Открита е примерна конфигурация",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Усетено беше че примерната конфигурация е копирана. Това може да развли инсталацията ти и не се поддържа. Моля, прочети документацията преди да правиш промени на config.php",
+    "Help" : "Помощ",
+    "Personal" : "Лични",
+    "Settings" : "Настройки",
+    "Users" : "Потребители",
+    "Admin" : "Админ",
+    "Recommended" : "Препоръчано",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Приложението \\\"%s\\\" не може да бъде инсталирано, защото не е съвместимо с тази версия на ownCloud.",
+    "No app name specified" : "Не е зададено име на преложението",
+    "Unknown filetype" : "Непознат тип файл.",
+    "Invalid image" : "Невалидно изображение.",
+    "web services under your control" : "уеб услуги под твой контрол",
+    "App directory already exists" : "Папката на приложението вече съществува.",
+    "Can't create app folder. Please fix permissions. %s" : "Неуспешно създаване на папката за приложението. Моля, оправете разрешенията. %s",
+    "No source specified when installing app" : "Не е зададен източник при инсталацията на приложението.",
+    "No href specified when installing app from http" : "Липсва съдържанието на връзката за инсталиране на приложението",
+    "No path specified when installing app from local file" : "Не е зададен пътя до локалния файл за инсталиране на приложението.",
+    "Archives of type %s are not supported" : "Архиви от тип %s не се подържат",
+    "Failed to open archive when installing app" : "Неуспешно отваряне на архив по времен на инсталацията на приложението.",
+    "App does not provide an info.xml file" : "Приложенението не добавило info.xml",
+    "App can't be installed because of not allowed code in the App" : "Приложението няма да бъде инсталирано, защото използва неразрешен код.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Приложението няма да бъде инсталирано, защото не е съвместимо с текущата версия на ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложението няма да бъде инсталирано, защото съдържа <shipped>true</shipped>, който таг не е разрешен за не ship-нати приложения.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Приложението няма да бъде инсталирано, защото версията в info.xml/version не съвпада с версията публикувана в магазина за приложения.",
+    "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, не може да ползваш точки в името на базата данни.",
+    "MS SQL username and/or password not valid: %s" : "Невалидно MS SQL потребителско име и/или парола: %s.",
+    "You need to enter either an existing account or the administrator." : "Необходимо е да въведеш съществуващ профил или като администратор.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB потребителското име и/или паролата са невалидни.",
+    "DB Error: \"%s\"" : "Грешка в базата данни: \"%s\".",
+    "Offending command was: \"%s\"" : "Проблемната команда беше: \"%s\".",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB потребител '%s'@'localhost' вече съществува.",
+    "Drop this user from MySQL/MariaDB" : "Премахни този потребител от MySQL/MariaDB.",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB потребител '%s'@'%%' вече съществува.",
+    "Drop this user from MySQL/MariaDB." : "Премахни този потребител от MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Oracle връзка не можа да се осъществи.",
+    "Oracle username and/or password not valid" : "Невалидно Oracle потребителско име и/или парола.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Проблемната команда беше: \"%s\", име: %s, парола: %s.",
+    "PostgreSQL username and/or password not valid" : "Невалидно PostgreSQL потребителско име и/или парола.",
+    "Set an admin username." : "Задай потребителско име за администратор.",
+    "Set an admin password." : "Задай парола за администратор.",
+    "Can't create or write into the data directory %s" : "Неуспешно създаване или записване в \"data\" папката %s",
+    "%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.",
+    "Sharing %s failed, because the user %s is the item owner" : "Споделяне на %s е неуспешно, защото потребител %s е оригиналния собственик.",
+    "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 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" : "Трябва да зададеш парола, за да създадеш общодостъпен линк за споделяне, само защитени с пароли линкове са разрешени.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Неуспешно споделяне на %s, защото споделянето посредством връзки не е разрешено.",
+    "Share type %s is not valid for %s" : "Споделянето на тип %s не валидно за %s.",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Неуспешна промяна на правата за достъп за %s, защото промените надвишават правата на достъп дадени на %s.",
+    "Setting permissions for %s failed, because the item was not found" : "Неуспешна промяна на правата за достъп за %s, защото съдържанието не е открито.",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Неуспешно задаване на дата на изтичане. Споделни папки или файлове не могат да изтичат по-късно от %s след като са били споделени",
+    "Cannot set expiration date. Expiration date is in the past" : "Неуспешно задаване на дата на изтичане. Датата на изтичане е в миналото",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Споделянето на сървърния %s трябва да поддържа OCP\\Share_Backend интерфейс.",
+    "Sharing backend %s not found" : "Споделянето на сървърния %s не е открито.",
+    "Sharing backend for %s not found" : "Споделянето на сървъра за %s не е открито.",
+    "Sharing %s failed, because the user %s is the original sharer" : "Споделяне на %s е неуспешно, защото потребител %s е оригиналния собственик.",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Неуспешно споделяне на %s, защото промените надвишават правата на достъп дадени на %s.",
+    "Sharing %s failed, because resharing is not allowed" : "Неуспешно споделяне на %s, защото повторно споделяне не е разрешено.",
+    "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\".",
+    "seconds ago" : "преди секунди",
+    "_%n minute ago_::_%n minutes ago_" : ["","преди %n минути"],
+    "_%n hour ago_::_%n hours ago_" : ["","преди %n часа"],
+    "today" : "днес",
+    "yesterday" : "вчера",
+    "_%n day go_::_%n days ago_" : ["","преди %n дена"],
+    "last month" : "миналия месец",
+    "_%n month ago_::_%n months ago_" : ["","преди %n месеца"],
+    "last year" : "миналата година",
+    "years ago" : "преди години",
+    "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" : "Валидна парола трябва да бъде зададена.",
+    "The username is already being used" : "Това потребителско име е вече заето.",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Липсват инсталирани драйвери за бази данни(sqlite, mysql или postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Правата за достъп обикновено могат да бъдат оправени като %s даде разрешение на уеб сървъра да пише в root папката %s.",
+    "Cannot write into \"config\" directory" : "Неуспешен опит за запис в \"config\" папката.",
+    "Cannot write into \"apps\" directory" : "Неуспешен опит за запис в \"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." : "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в app папката %s или като изключи магазина за приложения в config файла.",
+    "Cannot create \"data\" directory (%s)" : "Неуспешен опит за създаване на \"data\" папката (%s).",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Това обикновено може да бъде оправено като <a href=\"%s\" target=\"_blank\">дадеш разрешение на уеб сървъра да записва в root  папката</a>.",
+    "Setting locale to %s failed" : "Неуспешно задаване на %s като настройка език-държава.",
+    "Please install one of these locales on your system and restart your webserver." : "Моля, инсталирай едно от следните език-държава на сървъра и рестартирай уеб сървъра.",
+    "Please ask your server administrator to install the module." : "Моля, поискай твоят администратор да инсталира модула.",
+    "PHP module %s not installed." : "PHP модулът %s не е инсталиран.",
+    "PHP %s or higher is required." : "Изисква се PHP %s или по-нова.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Моля, поискай твоят администратор да обнови PHP до най-новата верския. Твоята PHP версия вече не се поддържа от ownCloud и PHP общността.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode е включен. ownCloud изисква този режим да бъде изключен, за да функионира нормално.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode е непропръчителна и общо взето безсмислена настройка и трябва да бъде изключена. Моля, поискай твоя администратор да я изключи ви php.ini или в конфигурацията на уве сървъра.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes е включен. ownCloud изисква да е изключен, за да функнионира нормално.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes е непропръчителна и общо взето безсмислена настройка и трябва да бъде изключена. Моля, поискай твоя администратор да я изключи ви php.ini или в конфигурацията на уве сървъра.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP модулите са инсталирани, но все още се обявяват като липсващи?",
+    "Please ask your server administrator to restart the web server." : "Моля, поискай от своя администратор да рестартира уеб сървъра.",
+    "PostgreSQL >= 9 required" : "Изисква се PostgreSQL >= 9",
+    "Please upgrade your database version" : "Моля, обнови базата данни.",
+    "Error occurred while checking PostgreSQL version" : "Настъпи грешка при проверката на версията на PostgreSQL.",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Моля, увери се, че PostgreSQL >= 9 или провери докладите за повече информация относно грешката.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Моля, промени правата за достъп на 0770, за да не може директорията да бъде видяна от други потребители.",
+    "Data directory (%s) is readable by other users" : "Data папката (%s) може да бъде разгледана от други потребители",
+    "Data directory (%s) is invalid" : "Data папката (%s) e невалидна",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Моля, увери се, че data папката съдържа файл \".ocdata\" в себе си.",
+    "Could not obtain lock type %d on \"%s\"." : "Неуспешен опит за ексклузивен достъп от типa %d върху \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
deleted file mode 100644
index caa7a558d57..00000000000
--- a/lib/l10n/bg_BG.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Неуспешен опит за запис в \"config\" папката!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Това може да бъде решено единствено като разрешиш на уеб сървъра да пише в config папката.",
-"See %s" => "Виж %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в config папката %s.",
-"Sample configuration detected" => "Открита е примерна конфигурация",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Усетено беше че примерната конфигурация е копирана. Това може да развли инсталацията ти и не се поддържа. Моля, прочети документацията преди да правиш промени на config.php",
-"Help" => "Помощ",
-"Personal" => "Лични",
-"Settings" => "Настройки",
-"Users" => "Потребители",
-"Admin" => "Админ",
-"Recommended" => "Препоръчано",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Приложението \\\"%s\\\" не може да бъде инсталирано, защото не е съвместимо с тази версия на ownCloud.",
-"No app name specified" => "Не е зададено име на преложението",
-"Unknown filetype" => "Непознат тип файл.",
-"Invalid image" => "Невалидно изображение.",
-"web services under your control" => "уеб услуги под твой контрол",
-"App directory already exists" => "Папката на приложението вече съществува.",
-"Can't create app folder. Please fix permissions. %s" => "Неуспешно създаване на папката за приложението. Моля, оправете разрешенията. %s",
-"No source specified when installing app" => "Не е зададен източник при инсталацията на приложението.",
-"No href specified when installing app from http" => "Липсва съдържанието на връзката за инсталиране на приложението",
-"No path specified when installing app from local file" => "Не е зададен пътя до локалния файл за инсталиране на приложението.",
-"Archives of type %s are not supported" => "Архиви от тип %s не се подържат",
-"Failed to open archive when installing app" => "Неуспешно отваряне на архив по времен на инсталацията на приложението.",
-"App does not provide an info.xml file" => "Приложенението не добавило info.xml",
-"App can't be installed because of not allowed code in the App" => "Приложението няма да бъде инсталирано, защото използва неразрешен код.",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Приложението няма да бъде инсталирано, защото не е съвместимо с текущата версия на ownCloud.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Приложението няма да бъде инсталирано, защото съдържа <shipped>true</shipped>, който таг не е разрешен за не ship-нати приложения.",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Приложението няма да бъде инсталирано, защото версията в info.xml/version не съвпада с версията публикувана в магазина за приложения.",
-"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, не може да ползваш точки в името на базата данни.",
-"MS SQL username and/or password not valid: %s" => "Невалидно MS SQL потребителско име и/или парола: %s.",
-"You need to enter either an existing account or the administrator." => "Необходимо е да въведеш съществуващ профил или като администратор.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB потребителското име и/или паролата са невалидни.",
-"DB Error: \"%s\"" => "Грешка в базата данни: \"%s\".",
-"Offending command was: \"%s\"" => "Проблемната команда беше: \"%s\".",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB потребител '%s'@'localhost' вече съществува.",
-"Drop this user from MySQL/MariaDB" => "Премахни този потребител от MySQL/MariaDB.",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB потребител '%s'@'%%' вече съществува.",
-"Drop this user from MySQL/MariaDB." => "Премахни този потребител от MySQL/MariaDB.",
-"Oracle connection could not be established" => "Oracle връзка не можа да се осъществи.",
-"Oracle username and/or password not valid" => "Невалидно Oracle потребителско име и/или парола.",
-"Offending command was: \"%s\", name: %s, password: %s" => "Проблемната команда беше: \"%s\", име: %s, парола: %s.",
-"PostgreSQL username and/or password not valid" => "Невалидно PostgreSQL потребителско име и/или парола.",
-"Set an admin username." => "Задай потребителско име за администратор.",
-"Set an admin password." => "Задай парола за администратор.",
-"Can't create or write into the data directory %s" => "Неуспешно създаване или записване в \"data\" папката %s",
-"%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.",
-"Sharing %s failed, because the user %s is the item owner" => "Споделяне на %s е неуспешно, защото потребител %s е оригиналния собственик.",
-"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 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" => "Трябва да зададеш парола, за да създадеш общодостъпен линк за споделяне, само защитени с пароли линкове са разрешени.",
-"Sharing %s failed, because sharing with links is not allowed" => "Неуспешно споделяне на %s, защото споделянето посредством връзки не е разрешено.",
-"Share type %s is not valid for %s" => "Споделянето на тип %s не валидно за %s.",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Неуспешна промяна на правата за достъп за %s, защото промените надвишават правата на достъп дадени на %s.",
-"Setting permissions for %s failed, because the item was not found" => "Неуспешна промяна на правата за достъп за %s, защото съдържанието не е открито.",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Неуспешно задаване на дата на изтичане. Споделни папки или файлове не могат да изтичат по-късно от %s след като са били споделени",
-"Cannot set expiration date. Expiration date is in the past" => "Неуспешно задаване на дата на изтичане. Датата на изтичане е в миналото",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Споделянето на сървърния %s трябва да поддържа OCP\\Share_Backend интерфейс.",
-"Sharing backend %s not found" => "Споделянето на сървърния %s не е открито.",
-"Sharing backend for %s not found" => "Споделянето на сървъра за %s не е открито.",
-"Sharing %s failed, because the user %s is the original sharer" => "Споделяне на %s е неуспешно, защото потребител %s е оригиналния собственик.",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Неуспешно споделяне на %s, защото промените надвишават правата на достъп дадени на %s.",
-"Sharing %s failed, because resharing is not allowed" => "Неуспешно споделяне на %s, защото повторно споделяне не е разрешено.",
-"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\".",
-"seconds ago" => "преди секунди",
-"_%n minute ago_::_%n minutes ago_" => array("","преди %n минути"),
-"_%n hour ago_::_%n hours ago_" => array("","преди %n часа"),
-"today" => "днес",
-"yesterday" => "вчера",
-"_%n day go_::_%n days ago_" => array("","преди %n дена"),
-"last month" => "миналия месец",
-"_%n month ago_::_%n months ago_" => array("","преди %n месеца"),
-"last year" => "миналата година",
-"years ago" => "преди години",
-"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" => "Валидна парола трябва да бъде зададена.",
-"The username is already being used" => "Това потребителско име е вече заето.",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Липсват инсталирани драйвери за бази данни(sqlite, mysql или postgresql).",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Правата за достъп обикновено могат да бъдат оправени като %s даде разрешение на уеб сървъра да пише в root папката %s.",
-"Cannot write into \"config\" directory" => "Неуспешен опит за запис в \"config\" папката.",
-"Cannot write into \"apps\" directory" => "Неуспешен опит за запис в \"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." => "Това обикновено може да бъде оправено като %s даде разрешение на уеб сървъра да записва в app папката %s или като изключи магазина за приложения в config файла.",
-"Cannot create \"data\" directory (%s)" => "Неуспешен опит за създаване на \"data\" папката (%s).",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Това обикновено може да бъде оправено като <a href=\"%s\" target=\"_blank\">дадеш разрешение на уеб сървъра да записва в root  папката</a>.",
-"Setting locale to %s failed" => "Неуспешно задаване на %s като настройка език-държава.",
-"Please install one of these locales on your system and restart your webserver." => "Моля, инсталирай едно от следните език-държава на сървъра и рестартирай уеб сървъра.",
-"Please ask your server administrator to install the module." => "Моля, поискай твоят администратор да инсталира модула.",
-"PHP module %s not installed." => "PHP модулът %s не е инсталиран.",
-"PHP %s or higher is required." => "Изисква се PHP %s или по-нова.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Моля, поискай твоят администратор да обнови PHP до най-новата верския. Твоята PHP версия вече не се поддържа от ownCloud и PHP общността.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode е включен. ownCloud изисква този режим да бъде изключен, за да функионира нормално.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode е непропръчителна и общо взето безсмислена настройка и трябва да бъде изключена. Моля, поискай твоя администратор да я изключи ви php.ini или в конфигурацията на уве сървъра.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes е включен. ownCloud изисква да е изключен, за да функнионира нормално.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes е непропръчителна и общо взето безсмислена настройка и трябва да бъде изключена. Моля, поискай твоя администратор да я изключи ви php.ini или в конфигурацията на уве сървъра.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP модулите са инсталирани, но все още се обявяват като липсващи?",
-"Please ask your server administrator to restart the web server." => "Моля, поискай от своя администратор да рестартира уеб сървъра.",
-"PostgreSQL >= 9 required" => "Изисква се PostgreSQL >= 9",
-"Please upgrade your database version" => "Моля, обнови базата данни.",
-"Error occurred while checking PostgreSQL version" => "Настъпи грешка при проверката на версията на PostgreSQL.",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Моля, увери се, че PostgreSQL >= 9 или провери докладите за повече информация относно грешката.",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Моля, промени правата за достъп на 0770, за да не може директорията да бъде видяна от други потребители.",
-"Data directory (%s) is readable by other users" => "Data папката (%s) може да бъде разгледана от други потребители",
-"Data directory (%s) is invalid" => "Data папката (%s) e невалидна",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Моля, увери се, че data папката съдържа файл \".ocdata\" в себе си.",
-"Could not obtain lock type %d on \"%s\"." => "Неуспешен опит за ексклузивен достъп от типa %d върху \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bn_BD.js b/lib/l10n/bn_BD.js
new file mode 100644
index 00000000000..ea94de9912e
--- /dev/null
+++ b/lib/l10n/bn_BD.js
@@ -0,0 +1,45 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "\"config\" ডিরেক্টরিতে লেখা যায়না!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "সাধারণতঃ ওয়বসার্ভারকে কনফিগ ডিরেক্টরিতে লেখার অধিকার দিয়ে এই সমস্যা সমাধান করা যায়",
+    "See %s" : "%s দেখ",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "সাধারণতঃ ওয়বসার্ভারকে কনফিগ ডিরেক্টরি%sতে লেখার অধিকার দিয়ে%s এই সমস্যা সমাধান করা যায়",
+    "Sample configuration detected" : "নমুনা কনফিগারেশন পাওয়া গেছে",
+    "Help" : "সহায়িকা",
+    "Personal" : "ব্যক্তিগত",
+    "Settings" : "নিয়ামকসমূহ",
+    "Users" : "ব্যবহারকারী",
+    "Admin" : "প্রশাসন",
+    "No app name specified" : "কোন অ্যাপ নাম সুনির্দিষ্ট নয়",
+    "Unknown filetype" : "অজানা প্রকৃতির ফাইল",
+    "Invalid image" : "অবৈধ চিত্র",
+    "web services under your control" : "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
+    "App directory already exists" : "এই অ্যাপ ডিরেক্টরিটি পূর্ব থেকেই বিদ্যমান",
+    "Can't create app folder. Please fix permissions. %s" : "অ্যাপ ফোল্ডার বানানো হেলনা। অনুমতি নির্ধারণ করুন। %s",
+    "No source specified when installing app" : "অ্যাপ ইনস্টল করতে যেয়ে কোন উৎস নির্দিষ্ট করা হয়নি",
+    "Failed to open archive when installing app" : "অ্যাপ ইনস্টল করতে যেয়ে আর্কাইভ উম্মুক্তকরণ ব্যার্থ  হলো",
+    "App does not provide an info.xml file" : "অ্যাপের সঙ্গে একটি  info.xml ফাইল নেই",
+    "App can't be installed because of not allowed code in the App" : "অ্যাপের সাথে অননুমোদিত কোড থাকায় অ্যাপটি ইনস্টল করা যাবেনা",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "অ্যাপ ইনস্টল করা যাবেনা কারণ এতে ননশিপড অ্যাপ এর জন্য অননুমোদিত <shipped>true</shipped> ট্যাগ বিদ্যমান ",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : " info.xml/version এর উল্লেখিত সংষ্করণ এবং অ্যাপ স্টোর হতে প্রদান করা সংষ্করণ একরকম না হওয়াতে অ্যাপটি ইনস্টল করা যাবেনা",
+    "Application is not enabled" : "অ্যাপ্লিকেসনটি সক্রিয় নয়",
+    "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
+    "Token expired. Please reload page." : "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
+    "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 ভাগাভাগি করতে পারবেননা",
+    "seconds ago" : "সেকেন্ড পূর্বে",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "আজ",
+    "yesterday" : "গতকাল",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "গত মাস",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "গত বছর",
+    "years ago" : "বছর পূর্বে",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "পিএইচপি সেফ মোড কার্যকর আছে। গউনক্লাউড সঠিকভাবে কাজ করতে হলে এটি অকার্যকর করা প্রয়োজন।"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/bn_BD.json b/lib/l10n/bn_BD.json
new file mode 100644
index 00000000000..bcf7ae8e1b7
--- /dev/null
+++ b/lib/l10n/bn_BD.json
@@ -0,0 +1,43 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "\"config\" ডিরেক্টরিতে লেখা যায়না!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "সাধারণতঃ ওয়বসার্ভারকে কনফিগ ডিরেক্টরিতে লেখার অধিকার দিয়ে এই সমস্যা সমাধান করা যায়",
+    "See %s" : "%s দেখ",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "সাধারণতঃ ওয়বসার্ভারকে কনফিগ ডিরেক্টরি%sতে লেখার অধিকার দিয়ে%s এই সমস্যা সমাধান করা যায়",
+    "Sample configuration detected" : "নমুনা কনফিগারেশন পাওয়া গেছে",
+    "Help" : "সহায়িকা",
+    "Personal" : "ব্যক্তিগত",
+    "Settings" : "নিয়ামকসমূহ",
+    "Users" : "ব্যবহারকারী",
+    "Admin" : "প্রশাসন",
+    "No app name specified" : "কোন অ্যাপ নাম সুনির্দিষ্ট নয়",
+    "Unknown filetype" : "অজানা প্রকৃতির ফাইল",
+    "Invalid image" : "অবৈধ চিত্র",
+    "web services under your control" : "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
+    "App directory already exists" : "এই অ্যাপ ডিরেক্টরিটি পূর্ব থেকেই বিদ্যমান",
+    "Can't create app folder. Please fix permissions. %s" : "অ্যাপ ফোল্ডার বানানো হেলনা। অনুমতি নির্ধারণ করুন। %s",
+    "No source specified when installing app" : "অ্যাপ ইনস্টল করতে যেয়ে কোন উৎস নির্দিষ্ট করা হয়নি",
+    "Failed to open archive when installing app" : "অ্যাপ ইনস্টল করতে যেয়ে আর্কাইভ উম্মুক্তকরণ ব্যার্থ  হলো",
+    "App does not provide an info.xml file" : "অ্যাপের সঙ্গে একটি  info.xml ফাইল নেই",
+    "App can't be installed because of not allowed code in the App" : "অ্যাপের সাথে অননুমোদিত কোড থাকায় অ্যাপটি ইনস্টল করা যাবেনা",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "অ্যাপ ইনস্টল করা যাবেনা কারণ এতে ননশিপড অ্যাপ এর জন্য অননুমোদিত <shipped>true</shipped> ট্যাগ বিদ্যমান ",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : " info.xml/version এর উল্লেখিত সংষ্করণ এবং অ্যাপ স্টোর হতে প্রদান করা সংষ্করণ একরকম না হওয়াতে অ্যাপটি ইনস্টল করা যাবেনা",
+    "Application is not enabled" : "অ্যাপ্লিকেসনটি সক্রিয় নয়",
+    "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
+    "Token expired. Please reload page." : "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
+    "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 ভাগাভাগি করতে পারবেননা",
+    "seconds ago" : "সেকেন্ড পূর্বে",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "আজ",
+    "yesterday" : "গতকাল",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "গত মাস",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "গত বছর",
+    "years ago" : "বছর পূর্বে",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "পিএইচপি সেফ মোড কার্যকর আছে। গউনক্লাউড সঠিকভাবে কাজ করতে হলে এটি অকার্যকর করা প্রয়োজন।"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/bn_BD.php b/lib/l10n/bn_BD.php
deleted file mode 100644
index 5ebc8c431b8..00000000000
--- a/lib/l10n/bn_BD.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "\"config\" ডিরেক্টরিতে লেখা যায়না!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "সাধারণতঃ ওয়বসার্ভারকে কনফিগ ডিরেক্টরিতে লেখার অধিকার দিয়ে এই সমস্যা সমাধান করা যায়",
-"See %s" => "%s দেখ",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "সাধারণতঃ ওয়বসার্ভারকে কনফিগ ডিরেক্টরি%sতে লেখার অধিকার দিয়ে%s এই সমস্যা সমাধান করা যায়",
-"Sample configuration detected" => "নমুনা কনফিগারেশন পাওয়া গেছে",
-"Help" => "সহায়িকা",
-"Personal" => "ব্যক্তিগত",
-"Settings" => "নিয়ামকসমূহ",
-"Users" => "ব্যবহারকারী",
-"Admin" => "প্রশাসন",
-"No app name specified" => "কোন অ্যাপ নাম সুনির্দিষ্ট নয়",
-"Unknown filetype" => "অজানা প্রকৃতির ফাইল",
-"Invalid image" => "অবৈধ চিত্র",
-"web services under your control" => "ওয়েব সার্ভিস আপনার হাতের মুঠোয়",
-"App directory already exists" => "এই অ্যাপ ডিরেক্টরিটি পূর্ব থেকেই বিদ্যমান",
-"Can't create app folder. Please fix permissions. %s" => "অ্যাপ ফোল্ডার বানানো হেলনা। অনুমতি নির্ধারণ করুন। %s",
-"No source specified when installing app" => "অ্যাপ ইনস্টল করতে যেয়ে কোন উৎস নির্দিষ্ট করা হয়নি",
-"Failed to open archive when installing app" => "অ্যাপ ইনস্টল করতে যেয়ে আর্কাইভ উম্মুক্তকরণ ব্যার্থ  হলো",
-"App does not provide an info.xml file" => "অ্যাপের সঙ্গে একটি  info.xml ফাইল নেই",
-"App can't be installed because of not allowed code in the App" => "অ্যাপের সাথে অননুমোদিত কোড থাকায় অ্যাপটি ইনস্টল করা যাবেনা",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "অ্যাপ ইনস্টল করা যাবেনা কারণ এতে ননশিপড অ্যাপ এর জন্য অননুমোদিত <shipped>true</shipped> ট্যাগ বিদ্যমান ",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => " info.xml/version এর উল্লেখিত সংষ্করণ এবং অ্যাপ স্টোর হতে প্রদান করা সংষ্করণ একরকম না হওয়াতে অ্যাপটি ইনস্টল করা যাবেনা",
-"Application is not enabled" => "অ্যাপ্লিকেসনটি সক্রিয় নয়",
-"Authentication error" => "অনুমোদন ঘটিত সমস্যা",
-"Token expired. Please reload page." => "টোকেন মেয়াদোত্তীর্ণ। দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
-"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 ভাগাভাগি করতে পারবেননা",
-"seconds ago" => "সেকেন্ড পূর্বে",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "আজ",
-"yesterday" => "গতকাল",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "গত মাস",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "গত বছর",
-"years ago" => "বছর পূর্বে",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "পিএইচপি সেফ মোড কার্যকর আছে। গউনক্লাউড সঠিকভাবে কাজ করতে হলে এটি অকার্যকর করা প্রয়োজন।"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bn_IN.js b/lib/l10n/bn_IN.js
new file mode 100644
index 00000000000..e8129c3586d
--- /dev/null
+++ b/lib/l10n/bn_IN.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Settings" : "সেটিংস",
+    "_%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/bn_IN.json b/lib/l10n/bn_IN.json
new file mode 100644
index 00000000000..052226c8728
--- /dev/null
+++ b/lib/l10n/bn_IN.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Settings" : "সেটিংস",
+    "_%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/bn_IN.php b/lib/l10n/bn_IN.php
deleted file mode 100644
index d247c8f8da4..00000000000
--- a/lib/l10n/bn_IN.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "সেটিংস",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/bs.js b/lib/l10n/bs.js
new file mode 100644
index 00000000000..e977f036b3c
--- /dev/null
+++ b/lib/l10n/bs.js
@@ -0,0 +1,9 @@
+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=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/bs.json b/lib/l10n/bs.json
new file mode 100644
index 00000000000..e6627bb2354
--- /dev/null
+++ b/lib/l10n/bs.json
@@ -0,0 +1,7 @@
+{ "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=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/bs.php b/lib/l10n/bs.php
deleted file mode 100644
index 3cb98906e62..00000000000
--- a/lib/l10n/bs.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
-"_%n day go_::_%n days ago_" => array("","",""),
-"_%n month ago_::_%n months ago_" => array("","","")
-);
-$PLURAL_FORMS = "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/ca.js b/lib/l10n/ca.js
new file mode 100644
index 00000000000..d416b93503a
--- /dev/null
+++ b/lib/l10n/ca.js
@@ -0,0 +1,122 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "No es pot escriure a la carpeta \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Això normalment es pot solucionar donant al servidor web permís d'escriptura a la carpeta de configuració",
+    "See %s" : "Comproveu %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
+    "Sample configuration detected" : "Configuració d'exemple detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "S'ha detectat que la configuració d'exemple ha estat copiada. Això no està suportat, i podria corrompre la vostra instalació. Siusplau, llegiu la documentació abans de realitzar canvis a config.php",
+    "Help" : "Ajuda",
+    "Personal" : "Personal",
+    "Settings" : "Configuració",
+    "Users" : "Usuaris",
+    "Admin" : "Administració",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'aplicació \\\"%s\\\" no es pot instal·lar perquè no es compatible amb aquesta versió de ownCloud.",
+    "No app name specified" : "No heu especificat cap nom d'aplicació",
+    "Unknown filetype" : "Tipus de fitxer desconegut",
+    "Invalid image" : "Imatge no vàlida",
+    "web services under your control" : "controleu els vostres serveis web",
+    "App directory already exists" : "La carpeta de l'aplicació ja existeix",
+    "Can't create app folder. Please fix permissions. %s" : "No es pot crear la carpeta de l'aplicació. Arregleu els permisos. %s",
+    "No source specified when installing app" : "No heu especificat la font en instal·lar l'aplicació",
+    "No href specified when installing app from http" : "No heu especificat href en instal·lar l'aplicació des de http",
+    "No path specified when installing app from local file" : "No heu seleccionat el camí en instal·lar una aplicació des d'un fitxer local",
+    "Archives of type %s are not supported" : "Els fitxers del tipus %s no són compatibles",
+    "Failed to open archive when installing app" : "Ha fallat l'obertura del fitxer en instal·lar l'aplicació",
+    "App does not provide an info.xml file" : "L'aplicació no proporciona un fitxer info.xml",
+    "App can't be installed because of not allowed code in the App" : "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades",
+    "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'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions",
+    "Application is not enabled" : "L'aplicació no està habilitada",
+    "Authentication error" : "Error d'autenticació",
+    "Token expired. Please reload page." : "El testimoni ha expirat. Torneu a carregar la pàgina.",
+    "Unknown user" : "Usuari desconegut",
+    "%s enter the database username." : "%s escriviu el nom d'usuari de la base de dades.",
+    "%s enter the database name." : "%s escriviu el nom de la base de dades.",
+    "%s you may not use dots in the database name" : "%s no podeu usar punts en el nom de la base de dades",
+    "MS SQL username and/or password not valid: %s" : "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
+    "You need to enter either an existing account or the administrator." : "Heu d'escriure un compte existent o el d'administrador.",
+    "MySQL/MariaDB username and/or password not valid" : "El nom d'usuari i/o la contrasenya de MySQL/MariaDB no són vàlids",
+    "DB Error: \"%s\"" : "Error DB: \"%s\"",
+    "Offending command was: \"%s\"" : "L'ordre en conflicte és: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "L'usuari MySQL/MariaDB '%s'@'localhost' ja existeix.",
+    "Drop this user from MySQL/MariaDB" : "Esborreu aquest usuari de MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "L'usuari MySQL/MariaDB '%s'@'%%' ja existeix",
+    "Drop this user from MySQL/MariaDB." : "Esborreu aquest usuari de MySQL/MariaDB.",
+    "Oracle connection could not be established" : "No s'ha pogut establir la connexió Oracle",
+    "Oracle username and/or password not valid" : "Nom d'usuari i/o contrasenya Oracle no vàlids",
+    "Offending command was: \"%s\", name: %s, password: %s" : "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
+    "PostgreSQL username and/or password not valid" : "Nom d'usuari i/o contrasenya PostgreSQL no vàlids",
+    "Set an admin username." : "Establiu un nom d'usuari per l'administrador.",
+    "Set an admin password." : "Establiu una contrasenya per l'administrador.",
+    "%s shared »%s« with you" : "%s ha compartit »%s« amb tu",
+    "Sharing %s failed, because the file does not exist" : "Ha fallat en compartir %s, perquè el fitxer no existeix",
+    "You are not allowed to share %s" : "No se us permet compartir %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Ha fallat en compartir %s, perquè l'usuari %s és el propietari de l'element",
+    "Sharing %s failed, because the user %s does not exist" : "Ha fallat en compartir %s, perquè l'usuari %s no existeix",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Ha fallat en compartir %s, perquè l'usuari %s no és membre de cap grup dels que %s és membre",
+    "Sharing %s failed, because this item is already shared with %s" : "Ha fallat en compartir %s, perquè l'element ja està compartit amb %s",
+    "Sharing %s failed, because the group %s does not exist" : "Ha fallat en compartir %s, perquè el grup %s no existeix",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Ha fallat en compartir %s, perquè %s no és membre del grup %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Heu de proporcionar una contrasenya per crear un enllaç públic. Només es permeten enllaços segurs.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Ha fallat en compartir %s, perquè no es permet compartir amb enllaços",
+    "Share type %s is not valid for %s" : "La compartició tipus %s no és vàlida per %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Ha fallat en establir els permisos per %s perquè aquests excedeixen els permesos per a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Ha fallat en establir els permisos per %s, perquè no s'ha trobat l'element",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "No es pot guardar la data d'expiració. Els fitxers o carpetes compartits no poden expirar més tard de %s després d'haver-se compratit.",
+    "Cannot set expiration date. Expiration date is in the past" : "No es pot guardar la data d'expiració. La data d'expiració ja ha passat.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El rerefons de compartició %s ha d'implementar la interfície OCP\\Share_Backend",
+    "Sharing backend %s not found" : "El rerefons de compartició %s no s'ha trobat",
+    "Sharing backend for %s not found" : "El rerefons de compartició per a %s no s'ha trobat",
+    "Sharing %s failed, because the user %s is the original sharer" : "Ha fallat en compartir %s perquè l'usuari %s és qui comparteix inicialment",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Ha fallat en compartir %s perquè els permisos excedeixen els permesos per a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Ha fallat en compartir %s, perquè no es permet compartir de nou",
+    "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\"",
+    "seconds ago" : "segons enrere",
+    "_%n minute ago_::_%n minutes ago_" : ["fa %n minut","fa %n minuts"],
+    "_%n hour ago_::_%n hours ago_" : ["fa %n hora","fa %n hores"],
+    "today" : "avui",
+    "yesterday" : "ahir",
+    "_%n day go_::_%n days ago_" : ["fa %n dia","fa %n dies"],
+    "last month" : "el mes passat",
+    "_%n month ago_::_%n months ago_" : ["fa %n mes","fa %n mesos"],
+    "last year" : "l'any passat",
+    "years ago" : "anys enrere",
+    "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",
+    "The username is already being used" : "El nom d'usuari ja està en ús",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "No hi ha instal·lats controladors de bases de dades (sqlite, mysql o postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
+    "Cannot write into \"config\" directory" : "No es pot escriure a la carpeta \"config\"",
+    "Cannot write into \"apps\" directory" : "No es pot escriure a la carpeta \"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." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta d'aplicacions %s o inhabilitant la botiga d'aplicacions en el fitxer de configuració.",
+    "Cannot create \"data\" directory (%s)" : "No es pot crear la carpeta \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Aixó normalment es por solucionar <a href=\"%s\" target=\"_blank\">donant al servidor web permís d'accés a la carpeta arrel</a>",
+    "Setting locale to %s failed" : "Ha fallat en establir la llengua a %s",
+    "Please install one of these locales on your system and restart your webserver." : "Siusplau, instal·li un d'aquests arxius de localització en el seu sistema, i reinicii el seu servidor web.",
+    "Please ask your server administrator to install the module." : "Demaneu a l'administrador del sistema que instal·li el mòdul.",
+    "PHP module %s not installed." : "El mòdul PHP %s no està instal·lat.",
+    "PHP %s or higher is required." : "Es requereix PHP %s o superior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Demaneu a l'administrador que actualitzi PHP a l'última versió. La versió que teniu instal·lada no té suport d'ownCloud ni de la comunitat PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "El mode segur de PHP està activat. OwnCloud requereix que es desactivi per funcionar correctament.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "El mode segur de PHP està desfasat i és principalment inútil i hauria de desactivar-se. Demaneu a l'administrador que el desactivi a php.ini o a la configuració del servidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Les Magic Quotes estan activades. OwnCloud requereix que les desactiveu per funcionar correctament.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes està desfassat i és principalment inútil i hauria de desactivar-se. Demaneu a l'administrador que el desactivi a php.ini o a la configuració del servidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "S'han instal·lat mòduls PHP, però encara es llisten com una mancança?",
+    "Please ask your server administrator to restart the web server." : "Demaneu a l'administrador que reinici el servidor web.",
+    "PostgreSQL >= 9 required" : "Es requereix PostgreSQL >= 9",
+    "Please upgrade your database version" : "Actualitzeu la versió de la base de dades",
+    "Error occurred while checking PostgreSQL version" : "Hi ha hagut un error en comprovar la versió de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Assegureu-vos que teniu PostgreSQL >= 9 o comproveu els registres per més informació quant a l'error",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Canvieu els permisos a 0770 per tal que la carpeta no es pugui llistar per altres usuaris.",
+    "Data directory (%s) is readable by other users" : "La carpeta de dades (%s) és llegible per altres usuaris",
+    "Data directory (%s) is invalid" : "La carpeta de dades (%s) no és vàlida",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Comproveu que la carpeta de dades contingui un fitxer \".ocdata\" a la seva arrel.",
+    "Could not obtain lock type %d on \"%s\"." : "No s'ha pogut obtenir un bloqueig tipus %d a \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json
new file mode 100644
index 00000000000..2698ed1846f
--- /dev/null
+++ b/lib/l10n/ca.json
@@ -0,0 +1,120 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "No es pot escriure a la carpeta \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Això normalment es pot solucionar donant al servidor web permís d'escriptura a la carpeta de configuració",
+    "See %s" : "Comproveu %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
+    "Sample configuration detected" : "Configuració d'exemple detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "S'ha detectat que la configuració d'exemple ha estat copiada. Això no està suportat, i podria corrompre la vostra instalació. Siusplau, llegiu la documentació abans de realitzar canvis a config.php",
+    "Help" : "Ajuda",
+    "Personal" : "Personal",
+    "Settings" : "Configuració",
+    "Users" : "Usuaris",
+    "Admin" : "Administració",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'aplicació \\\"%s\\\" no es pot instal·lar perquè no es compatible amb aquesta versió de ownCloud.",
+    "No app name specified" : "No heu especificat cap nom d'aplicació",
+    "Unknown filetype" : "Tipus de fitxer desconegut",
+    "Invalid image" : "Imatge no vàlida",
+    "web services under your control" : "controleu els vostres serveis web",
+    "App directory already exists" : "La carpeta de l'aplicació ja existeix",
+    "Can't create app folder. Please fix permissions. %s" : "No es pot crear la carpeta de l'aplicació. Arregleu els permisos. %s",
+    "No source specified when installing app" : "No heu especificat la font en instal·lar l'aplicació",
+    "No href specified when installing app from http" : "No heu especificat href en instal·lar l'aplicació des de http",
+    "No path specified when installing app from local file" : "No heu seleccionat el camí en instal·lar una aplicació des d'un fitxer local",
+    "Archives of type %s are not supported" : "Els fitxers del tipus %s no són compatibles",
+    "Failed to open archive when installing app" : "Ha fallat l'obertura del fitxer en instal·lar l'aplicació",
+    "App does not provide an info.xml file" : "L'aplicació no proporciona un fitxer info.xml",
+    "App can't be installed because of not allowed code in the App" : "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades",
+    "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'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions",
+    "Application is not enabled" : "L'aplicació no està habilitada",
+    "Authentication error" : "Error d'autenticació",
+    "Token expired. Please reload page." : "El testimoni ha expirat. Torneu a carregar la pàgina.",
+    "Unknown user" : "Usuari desconegut",
+    "%s enter the database username." : "%s escriviu el nom d'usuari de la base de dades.",
+    "%s enter the database name." : "%s escriviu el nom de la base de dades.",
+    "%s you may not use dots in the database name" : "%s no podeu usar punts en el nom de la base de dades",
+    "MS SQL username and/or password not valid: %s" : "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
+    "You need to enter either an existing account or the administrator." : "Heu d'escriure un compte existent o el d'administrador.",
+    "MySQL/MariaDB username and/or password not valid" : "El nom d'usuari i/o la contrasenya de MySQL/MariaDB no són vàlids",
+    "DB Error: \"%s\"" : "Error DB: \"%s\"",
+    "Offending command was: \"%s\"" : "L'ordre en conflicte és: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "L'usuari MySQL/MariaDB '%s'@'localhost' ja existeix.",
+    "Drop this user from MySQL/MariaDB" : "Esborreu aquest usuari de MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "L'usuari MySQL/MariaDB '%s'@'%%' ja existeix",
+    "Drop this user from MySQL/MariaDB." : "Esborreu aquest usuari de MySQL/MariaDB.",
+    "Oracle connection could not be established" : "No s'ha pogut establir la connexió Oracle",
+    "Oracle username and/or password not valid" : "Nom d'usuari i/o contrasenya Oracle no vàlids",
+    "Offending command was: \"%s\", name: %s, password: %s" : "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
+    "PostgreSQL username and/or password not valid" : "Nom d'usuari i/o contrasenya PostgreSQL no vàlids",
+    "Set an admin username." : "Establiu un nom d'usuari per l'administrador.",
+    "Set an admin password." : "Establiu una contrasenya per l'administrador.",
+    "%s shared »%s« with you" : "%s ha compartit »%s« amb tu",
+    "Sharing %s failed, because the file does not exist" : "Ha fallat en compartir %s, perquè el fitxer no existeix",
+    "You are not allowed to share %s" : "No se us permet compartir %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Ha fallat en compartir %s, perquè l'usuari %s és el propietari de l'element",
+    "Sharing %s failed, because the user %s does not exist" : "Ha fallat en compartir %s, perquè l'usuari %s no existeix",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Ha fallat en compartir %s, perquè l'usuari %s no és membre de cap grup dels que %s és membre",
+    "Sharing %s failed, because this item is already shared with %s" : "Ha fallat en compartir %s, perquè l'element ja està compartit amb %s",
+    "Sharing %s failed, because the group %s does not exist" : "Ha fallat en compartir %s, perquè el grup %s no existeix",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Ha fallat en compartir %s, perquè %s no és membre del grup %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Heu de proporcionar una contrasenya per crear un enllaç públic. Només es permeten enllaços segurs.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Ha fallat en compartir %s, perquè no es permet compartir amb enllaços",
+    "Share type %s is not valid for %s" : "La compartició tipus %s no és vàlida per %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Ha fallat en establir els permisos per %s perquè aquests excedeixen els permesos per a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Ha fallat en establir els permisos per %s, perquè no s'ha trobat l'element",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "No es pot guardar la data d'expiració. Els fitxers o carpetes compartits no poden expirar més tard de %s després d'haver-se compratit.",
+    "Cannot set expiration date. Expiration date is in the past" : "No es pot guardar la data d'expiració. La data d'expiració ja ha passat.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El rerefons de compartició %s ha d'implementar la interfície OCP\\Share_Backend",
+    "Sharing backend %s not found" : "El rerefons de compartició %s no s'ha trobat",
+    "Sharing backend for %s not found" : "El rerefons de compartició per a %s no s'ha trobat",
+    "Sharing %s failed, because the user %s is the original sharer" : "Ha fallat en compartir %s perquè l'usuari %s és qui comparteix inicialment",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Ha fallat en compartir %s perquè els permisos excedeixen els permesos per a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Ha fallat en compartir %s, perquè no es permet compartir de nou",
+    "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\"",
+    "seconds ago" : "segons enrere",
+    "_%n minute ago_::_%n minutes ago_" : ["fa %n minut","fa %n minuts"],
+    "_%n hour ago_::_%n hours ago_" : ["fa %n hora","fa %n hores"],
+    "today" : "avui",
+    "yesterday" : "ahir",
+    "_%n day go_::_%n days ago_" : ["fa %n dia","fa %n dies"],
+    "last month" : "el mes passat",
+    "_%n month ago_::_%n months ago_" : ["fa %n mes","fa %n mesos"],
+    "last year" : "l'any passat",
+    "years ago" : "anys enrere",
+    "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",
+    "The username is already being used" : "El nom d'usuari ja està en ús",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "No hi ha instal·lats controladors de bases de dades (sqlite, mysql o postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
+    "Cannot write into \"config\" directory" : "No es pot escriure a la carpeta \"config\"",
+    "Cannot write into \"apps\" directory" : "No es pot escriure a la carpeta \"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." : "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta d'aplicacions %s o inhabilitant la botiga d'aplicacions en el fitxer de configuració.",
+    "Cannot create \"data\" directory (%s)" : "No es pot crear la carpeta \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Aixó normalment es por solucionar <a href=\"%s\" target=\"_blank\">donant al servidor web permís d'accés a la carpeta arrel</a>",
+    "Setting locale to %s failed" : "Ha fallat en establir la llengua a %s",
+    "Please install one of these locales on your system and restart your webserver." : "Siusplau, instal·li un d'aquests arxius de localització en el seu sistema, i reinicii el seu servidor web.",
+    "Please ask your server administrator to install the module." : "Demaneu a l'administrador del sistema que instal·li el mòdul.",
+    "PHP module %s not installed." : "El mòdul PHP %s no està instal·lat.",
+    "PHP %s or higher is required." : "Es requereix PHP %s o superior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Demaneu a l'administrador que actualitzi PHP a l'última versió. La versió que teniu instal·lada no té suport d'ownCloud ni de la comunitat PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "El mode segur de PHP està activat. OwnCloud requereix que es desactivi per funcionar correctament.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "El mode segur de PHP està desfasat i és principalment inútil i hauria de desactivar-se. Demaneu a l'administrador que el desactivi a php.ini o a la configuració del servidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Les Magic Quotes estan activades. OwnCloud requereix que les desactiveu per funcionar correctament.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes està desfassat i és principalment inútil i hauria de desactivar-se. Demaneu a l'administrador que el desactivi a php.ini o a la configuració del servidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "S'han instal·lat mòduls PHP, però encara es llisten com una mancança?",
+    "Please ask your server administrator to restart the web server." : "Demaneu a l'administrador que reinici el servidor web.",
+    "PostgreSQL >= 9 required" : "Es requereix PostgreSQL >= 9",
+    "Please upgrade your database version" : "Actualitzeu la versió de la base de dades",
+    "Error occurred while checking PostgreSQL version" : "Hi ha hagut un error en comprovar la versió de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Assegureu-vos que teniu PostgreSQL >= 9 o comproveu els registres per més informació quant a l'error",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Canvieu els permisos a 0770 per tal que la carpeta no es pugui llistar per altres usuaris.",
+    "Data directory (%s) is readable by other users" : "La carpeta de dades (%s) és llegible per altres usuaris",
+    "Data directory (%s) is invalid" : "La carpeta de dades (%s) no és vàlida",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Comproveu que la carpeta de dades contingui un fitxer \".ocdata\" a la seva arrel.",
+    "Could not obtain lock type %d on \"%s\"." : "No s'ha pogut obtenir un bloqueig tipus %d a \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
deleted file mode 100644
index 456211ad0c1..00000000000
--- a/lib/l10n/ca.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "No es pot escriure a la carpeta \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Això normalment es pot solucionar donant al servidor web permís d'escriptura a la carpeta de configuració",
-"See %s" => "Comproveu %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
-"Sample configuration detected" => "Configuració d'exemple detectada",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "S'ha detectat que la configuració d'exemple ha estat copiada. Això no està suportat, i podria corrompre la vostra instalació. Siusplau, llegiu la documentació abans de realitzar canvis a config.php",
-"Help" => "Ajuda",
-"Personal" => "Personal",
-"Settings" => "Configuració",
-"Users" => "Usuaris",
-"Admin" => "Administració",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'aplicació \\\"%s\\\" no es pot instal·lar perquè no es compatible amb aquesta versió de ownCloud.",
-"No app name specified" => "No heu especificat cap nom d'aplicació",
-"Unknown filetype" => "Tipus de fitxer desconegut",
-"Invalid image" => "Imatge no vàlida",
-"web services under your control" => "controleu els vostres serveis web",
-"App directory already exists" => "La carpeta de l'aplicació ja existeix",
-"Can't create app folder. Please fix permissions. %s" => "No es pot crear la carpeta de l'aplicació. Arregleu els permisos. %s",
-"No source specified when installing app" => "No heu especificat la font en instal·lar l'aplicació",
-"No href specified when installing app from http" => "No heu especificat href en instal·lar l'aplicació des de http",
-"No path specified when installing app from local file" => "No heu seleccionat el camí en instal·lar una aplicació des d'un fitxer local",
-"Archives of type %s are not supported" => "Els fitxers del tipus %s no són compatibles",
-"Failed to open archive when installing app" => "Ha fallat l'obertura del fitxer en instal·lar l'aplicació",
-"App does not provide an info.xml file" => "L'aplicació no proporciona un fitxer info.xml",
-"App can't be installed because of not allowed code in the App" => "L'aplicació no es pot instal·lar perquè hi ha codi no autoritzat en l'aplicació",
-"App can't be installed because it is not compatible with this version of ownCloud" => "L'aplicació no es pot instal·lar perquè no és compatible amb aquesta versió d'ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'aplicació no es pot instal·lar perquè conté l'etiqueta <shipped>vertader</shipped> que no es permet per aplicacions no enviades",
-"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'aplicació no es pot instal·lar perquè la versió a info.xml/version no és la mateixa que la versió indicada des de la botiga d'aplicacions",
-"Application is not enabled" => "L'aplicació no està habilitada",
-"Authentication error" => "Error d'autenticació",
-"Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pàgina.",
-"Unknown user" => "Usuari desconegut",
-"%s enter the database username." => "%s escriviu el nom d'usuari de la base de dades.",
-"%s enter the database name." => "%s escriviu el nom de la base de dades.",
-"%s you may not use dots in the database name" => "%s no podeu usar punts en el nom de la base de dades",
-"MS SQL username and/or password not valid: %s" => "Nom d'usuari i/o contrasenya MS SQL no vàlids: %s",
-"You need to enter either an existing account or the administrator." => "Heu d'escriure un compte existent o el d'administrador.",
-"MySQL/MariaDB username and/or password not valid" => "El nom d'usuari i/o la contrasenya de MySQL/MariaDB no són vàlids",
-"DB Error: \"%s\"" => "Error DB: \"%s\"",
-"Offending command was: \"%s\"" => "L'ordre en conflicte és: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "L'usuari MySQL/MariaDB '%s'@'localhost' ja existeix.",
-"Drop this user from MySQL/MariaDB" => "Esborreu aquest usuari de MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "L'usuari MySQL/MariaDB '%s'@'%%' ja existeix",
-"Drop this user from MySQL/MariaDB." => "Esborreu aquest usuari de MySQL/MariaDB.",
-"Oracle connection could not be established" => "No s'ha pogut establir la connexió Oracle",
-"Oracle username and/or password not valid" => "Nom d'usuari i/o contrasenya Oracle no vàlids",
-"Offending command was: \"%s\", name: %s, password: %s" => "L'ordre en conflicte és: \"%s\", nom: %s, contrasenya: %s",
-"PostgreSQL username and/or password not valid" => "Nom d'usuari i/o contrasenya PostgreSQL no vàlids",
-"Set an admin username." => "Establiu un nom d'usuari per l'administrador.",
-"Set an admin password." => "Establiu una contrasenya per l'administrador.",
-"%s shared »%s« with you" => "%s ha compartit »%s« amb tu",
-"Sharing %s failed, because the file does not exist" => "Ha fallat en compartir %s, perquè el fitxer no existeix",
-"You are not allowed to share %s" => "No se us permet compartir %s",
-"Sharing %s failed, because the user %s is the item owner" => "Ha fallat en compartir %s, perquè l'usuari %s és el propietari de l'element",
-"Sharing %s failed, because the user %s does not exist" => "Ha fallat en compartir %s, perquè l'usuari %s no existeix",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Ha fallat en compartir %s, perquè l'usuari %s no és membre de cap grup dels que %s és membre",
-"Sharing %s failed, because this item is already shared with %s" => "Ha fallat en compartir %s, perquè l'element ja està compartit amb %s",
-"Sharing %s failed, because the group %s does not exist" => "Ha fallat en compartir %s, perquè el grup %s no existeix",
-"Sharing %s failed, because %s is not a member of the group %s" => "Ha fallat en compartir %s, perquè %s no és membre del grup %s",
-"You need to provide a password to create a public link, only protected links are allowed" => "Heu de proporcionar una contrasenya per crear un enllaç públic. Només es permeten enllaços segurs.",
-"Sharing %s failed, because sharing with links is not allowed" => "Ha fallat en compartir %s, perquè no es permet compartir amb enllaços",
-"Share type %s is not valid for %s" => "La compartició tipus %s no és vàlida per %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ha fallat en establir els permisos per %s perquè aquests excedeixen els permesos per a %s",
-"Setting permissions for %s failed, because the item was not found" => "Ha fallat en establir els permisos per %s, perquè no s'ha trobat l'element",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "No es pot guardar la data d'expiració. Els fitxers o carpetes compartits no poden expirar més tard de %s després d'haver-se compratit.",
-"Cannot set expiration date. Expiration date is in the past" => "No es pot guardar la data d'expiració. La data d'expiració ja ha passat.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "El rerefons de compartició %s ha d'implementar la interfície OCP\\Share_Backend",
-"Sharing backend %s not found" => "El rerefons de compartició %s no s'ha trobat",
-"Sharing backend for %s not found" => "El rerefons de compartició per a %s no s'ha trobat",
-"Sharing %s failed, because the user %s is the original sharer" => "Ha fallat en compartir %s perquè l'usuari %s és qui comparteix inicialment",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Ha fallat en compartir %s perquè els permisos excedeixen els permesos per a %s",
-"Sharing %s failed, because resharing is not allowed" => "Ha fallat en compartir %s, perquè no es permet compartir de nou",
-"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\"",
-"seconds ago" => "segons enrere",
-"_%n minute ago_::_%n minutes ago_" => array("fa %n minut","fa %n minuts"),
-"_%n hour ago_::_%n hours ago_" => array("fa %n hora","fa %n hores"),
-"today" => "avui",
-"yesterday" => "ahir",
-"_%n day go_::_%n days ago_" => array("fa %n dia","fa %n dies"),
-"last month" => "el mes passat",
-"_%n month ago_::_%n months ago_" => array("fa %n mes","fa %n mesos"),
-"last year" => "l'any passat",
-"years ago" => "anys enrere",
-"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",
-"The username is already being used" => "El nom d'usuari ja està en ús",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "No hi ha instal·lats controladors de bases de dades (sqlite, mysql o postgresql).",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta de configuració %s",
-"Cannot write into \"config\" directory" => "No es pot escriure a la carpeta \"config\"",
-"Cannot write into \"apps\" directory" => "No es pot escriure a la carpeta \"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." => "Això normalment es pot solucionar donant a %s permís d'escriptura a la carpeta d'aplicacions %s o inhabilitant la botiga d'aplicacions en el fitxer de configuració.",
-"Cannot create \"data\" directory (%s)" => "No es pot crear la carpeta \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Aixó normalment es por solucionar <a href=\"%s\" target=\"_blank\">donant al servidor web permís d'accés a la carpeta arrel</a>",
-"Setting locale to %s failed" => "Ha fallat en establir la llengua a %s",
-"Please install one of these locales on your system and restart your webserver." => "Siusplau, instal·li un d'aquests arxius de localització en el seu sistema, i reinicii el seu servidor web.",
-"Please ask your server administrator to install the module." => "Demaneu a l'administrador del sistema que instal·li el mòdul.",
-"PHP module %s not installed." => "El mòdul PHP %s no està instal·lat.",
-"PHP %s or higher is required." => "Es requereix PHP %s o superior.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Demaneu a l'administrador que actualitzi PHP a l'última versió. La versió que teniu instal·lada no té suport d'ownCloud ni de la comunitat PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "El mode segur de PHP està activat. OwnCloud requereix que es desactivi per funcionar correctament.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "El mode segur de PHP està desfasat i és principalment inútil i hauria de desactivar-se. Demaneu a l'administrador que el desactivi a php.ini o a la configuració del servidor web.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Les Magic Quotes estan activades. OwnCloud requereix que les desactiveu per funcionar correctament.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes està desfassat i és principalment inútil i hauria de desactivar-se. Demaneu a l'administrador que el desactivi a php.ini o a la configuració del servidor web.",
-"PHP modules have been installed, but they are still listed as missing?" => "S'han instal·lat mòduls PHP, però encara es llisten com una mancança?",
-"Please ask your server administrator to restart the web server." => "Demaneu a l'administrador que reinici el servidor web.",
-"PostgreSQL >= 9 required" => "Es requereix PostgreSQL >= 9",
-"Please upgrade your database version" => "Actualitzeu la versió de la base de dades",
-"Error occurred while checking PostgreSQL version" => "Hi ha hagut un error en comprovar la versió de PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Assegureu-vos que teniu PostgreSQL >= 9 o comproveu els registres per més informació quant a l'error",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Canvieu els permisos a 0770 per tal que la carpeta no es pugui llistar per altres usuaris.",
-"Data directory (%s) is readable by other users" => "La carpeta de dades (%s) és llegible per altres usuaris",
-"Data directory (%s) is invalid" => "La carpeta de dades (%s) no és vàlida",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Comproveu que la carpeta de dades contingui un fitxer \".ocdata\" a la seva arrel.",
-"Could not obtain lock type %d on \"%s\"." => "No s'ha pogut obtenir un bloqueig tipus %d a \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ca@valencia.js b/lib/l10n/ca@valencia.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/ca@valencia.js
@@ -0,0 +1,9 @@
+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/ca@valencia.json b/lib/l10n/ca@valencia.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/ca@valencia.json
@@ -0,0 +1,7 @@
+{ "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/ca@valencia.php b/lib/l10n/ca@valencia.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/ca@valencia.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
new file mode 100644
index 00000000000..113f32d40c5
--- /dev/null
+++ b/lib/l10n/cs_CZ.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Nelze zapisovat do adresáře \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "To lze obvykle vyřešit povolením zápisu webovému serveru do konfiguračního adresáře",
+    "See %s" : "Viz %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To lze obvykle vyřešit %spovolením zápisu webovému serveru do konfiguračního adresáře%s.",
+    "Sample configuration detected" : "Byla detekována vzorová konfigurace",
+    "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" : "Pravděpodobně byla zkopírována konfigurační nastavení ze vzorových souborů. Toto není podporováno a může poškodit vaši instalaci. Nahlédněte prosím do dokumentace před prováděním změn v souboru config.php",
+    "Help" : "Nápověda",
+    "Personal" : "Osobní",
+    "Settings" : "Nastavení",
+    "Users" : "Uživatelé",
+    "Admin" : "Administrace",
+    "Recommended" : "Doporučené",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikace \\\"%s\\\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.",
+    "No app name specified" : "Nebyl zadan název aplikace",
+    "Unknown filetype" : "Neznámý typ souboru",
+    "Invalid image" : "Chybný obrázek",
+    "web services under your control" : "webové služby pod Vaší kontrolou",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Archivy typu %s nejsou podporovány",
+    "Failed to open archive when installing app" : "Chyba při otevírání archivu během instalace aplikace",
+    "App does not provide an info.xml file" : "Aplikace neposkytuje soubor info.xml",
+    "App can't be installed because of not allowed code in the App" : "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací.",
+    "Application is not enabled" : "Aplikace není povolena",
+    "Authentication error" : "Chyba ověření",
+    "Token expired. Please reload page." : "Token vypršel. Obnovte prosím stránku.",
+    "Unknown user" : "Neznámý uživatel",
+    "%s enter the database username." : "Zadejte uživatelské jméno %s databáze.",
+    "%s enter the database name." : "Zadejte název databáze pro %s databáze.",
+    "%s you may not use dots in the database name" : "V názvu databáze %s nesmíte používat tečky.",
+    "MS SQL username and/or password not valid: %s" : "Uživatelské jméno či heslo MSSQL není platné: %s",
+    "You need to enter either an existing account or the administrator." : "Musíte zadat existující účet či správce.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB uživatelské jméno a/nebo heslo je neplatné",
+    "DB Error: \"%s\"" : "Chyba databáze: \"%s\"",
+    "Offending command was: \"%s\"" : "Příslušný příkaz byl: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB uživatel '%s'@'localhost' již existuje.",
+    "Drop this user from MySQL/MariaDB" : "Smazat tohoto uživatele z MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB uživatel '%s'@'%%' již existuje",
+    "Drop this user from MySQL/MariaDB." : "Smazat tohoto uživatele z MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Spojení s Oracle nemohlo být navázáno",
+    "Oracle username and/or password not valid" : "Uživatelské jméno či heslo Oracle není platné",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Příslušný příkaz byl: \"%s\", jméno: %s, heslo: %s",
+    "PostgreSQL username and/or password not valid" : "Uživatelské jméno či heslo PostgreSQL není platné",
+    "Set an admin username." : "Zadejte uživatelské jméno správce.",
+    "Set an admin password." : "Zadejte heslo správce.",
+    "Can't create or write into the data directory %s" : "Nelze vytvořit nebo zapisovat do datového adresáře %s",
+    "%s shared »%s« with you" : "%s s vámi sdílí »%s«",
+    "Sharing %s failed, because the file does not exist" : "Sdílení %s selhalo, protože soubor neexistuje",
+    "You are not allowed to share %s" : "Nemáte povoleno sdílet %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Sdílení položky %s selhalo, protože uživatel %s je jejím vlastníkem",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Sdílení položky %s selhalo, protože sdílení pomocí linků není povoleno",
+    "Share type %s is not valid for %s" : "Sdílení typu %s není korektní pro %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavení oprávnění pro %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla povolena pro %s",
+    "Setting permissions for %s failed, because the item was not found" : "Nastavení práv pro %s selhalo, protože položka nebyla nalezena",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nelze nastavit datum vypršení platnosti. Sdílení nemůže vypršet později než za %s po zveřejnění",
+    "Cannot set expiration date. Expiration date is in the past" : "Nelze nastavit datum vypršení platnosti. Datum vypršení je v minulosti",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Úložiště pro sdílení %s musí implementovat rozhraní OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Úložiště sdílení %s nenalezeno",
+    "Sharing backend for %s not found" : "Úložiště  sdílení pro %s nenalezeno",
+    "Sharing %s failed, because the user %s is the original sharer" : "Sdílení položky %s selhalo, protože byla sdílena uživatelem %s jako první",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Sdílení položky %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla %s povolena.",
+    "Sharing %s failed, because resharing is not allowed" : "Sdílení položky %s selhalo, protože znovu-sdílení není povoleno",
+    "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\"",
+    "seconds ago" : "před pár sekundami",
+    "_%n minute ago_::_%n minutes ago_" : ["před %n minutou","před %n minutami","před %n minutami"],
+    "_%n hour ago_::_%n hours ago_" : ["před %n hodinou","před %n hodinami","před %n hodinami"],
+    "today" : "dnes",
+    "yesterday" : "včera",
+    "_%n day go_::_%n days ago_" : ["před %n dnem","před %n dny","před %n dny"],
+    "last month" : "minulý měsíc",
+    "_%n month ago_::_%n months ago_" : ["před %n měsícem","před %n měsíci","před %n měsíci"],
+    "last year" : "minulý rok",
+    "years ago" : "před lety",
+    "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",
+    "The username is already being used" : "Uživatelské jméno je již využíváno",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nejsou instalovány ovladače databází (sqlite, mysql nebo postresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnění lze obvykle napravit %spovolením zápisu webovému serveru do kořenového adresáře%s.",
+    "Cannot write into \"config\" directory" : "Nelze zapisovat do adresáře \"config\"",
+    "Cannot write into \"apps\" directory" : "Nelze zapisovat do adresáře \"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." : "To lze obvykle vyřešit %spovolením zápisu webovému serveru do adresáře apps%s nebo zakázáním appstore v konfiguračním souboru.",
+    "Cannot create \"data\" directory (%s)" : "Nelze vytvořit adresář \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "To lze obvykle vyřešit <a href=\"%s\" target=\"_blank\">povolením zápisu webovému serveru do kořenového adresáře</a>.",
+    "Setting locale to %s failed" : "Nastavení jazyka na %s selhalo",
+    "Please install one of these locales on your system and restart your webserver." : "Prosím nainstalujte alespoň jeden z těchto jazyků do svého systému a restartujte webový server.",
+    "Please ask your server administrator to install the module." : "Požádejte svého administrátora o instalaci tohoto modulu.",
+    "PHP module %s not installed." : "PHP modul %s není nainstalován.",
+    "PHP %s or higher is required." : "Je vyžadováno PHP %s nebo vyšší.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Požádejte svého administrátora o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Je zapnut PHP Safe Mode. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Je povoleno nastavení Magic Quotes. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?",
+    "Please ask your server administrator to restart the web server." : "Požádejte svého administrátora o restart webového serveru.",
+    "PostgreSQL >= 9 required" : "Je vyžadováno PostgreSQL >= 9",
+    "Please upgrade your database version" : "Aktualizujte prosím verzi své databáze",
+    "Error occurred while checking PostgreSQL version" : "Při zjišťování verze PostgreSQL došlo k chybě",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Ujistěte se, že máte PostgreSQL >= 9, a zkontrolujte logy pro více informací o chybě.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Změňte prosím práva na 0770, aby adresář nemohl být otevřen ostatními uživateli.",
+    "Data directory (%s) is readable by other users" : "Datový adresář (%s) je čitelný i ostatními uživateli",
+    "Data directory (%s) is invalid" : "Datový adresář (%s) je neplatný",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Ověřte prosím, že kořenový adresář s daty obsahuje soubor \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Nelze získat zámek typu %d na \"%s\"."
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
new file mode 100644
index 00000000000..e8806f406ae
--- /dev/null
+++ b/lib/l10n/cs_CZ.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Nelze zapisovat do adresáře \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "To lze obvykle vyřešit povolením zápisu webovému serveru do konfiguračního adresáře",
+    "See %s" : "Viz %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To lze obvykle vyřešit %spovolením zápisu webovému serveru do konfiguračního adresáře%s.",
+    "Sample configuration detected" : "Byla detekována vzorová konfigurace",
+    "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" : "Pravděpodobně byla zkopírována konfigurační nastavení ze vzorových souborů. Toto není podporováno a může poškodit vaši instalaci. Nahlédněte prosím do dokumentace před prováděním změn v souboru config.php",
+    "Help" : "Nápověda",
+    "Personal" : "Osobní",
+    "Settings" : "Nastavení",
+    "Users" : "Uživatelé",
+    "Admin" : "Administrace",
+    "Recommended" : "Doporučené",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikace \\\"%s\\\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.",
+    "No app name specified" : "Nebyl zadan název aplikace",
+    "Unknown filetype" : "Neznámý typ souboru",
+    "Invalid image" : "Chybný obrázek",
+    "web services under your control" : "webové služby pod Vaší kontrolou",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Archivy typu %s nejsou podporovány",
+    "Failed to open archive when installing app" : "Chyba při otevírání archivu během instalace aplikace",
+    "App does not provide an info.xml file" : "Aplikace neposkytuje soubor info.xml",
+    "App can't be installed because of not allowed code in the App" : "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací.",
+    "Application is not enabled" : "Aplikace není povolena",
+    "Authentication error" : "Chyba ověření",
+    "Token expired. Please reload page." : "Token vypršel. Obnovte prosím stránku.",
+    "Unknown user" : "Neznámý uživatel",
+    "%s enter the database username." : "Zadejte uživatelské jméno %s databáze.",
+    "%s enter the database name." : "Zadejte název databáze pro %s databáze.",
+    "%s you may not use dots in the database name" : "V názvu databáze %s nesmíte používat tečky.",
+    "MS SQL username and/or password not valid: %s" : "Uživatelské jméno či heslo MSSQL není platné: %s",
+    "You need to enter either an existing account or the administrator." : "Musíte zadat existující účet či správce.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB uživatelské jméno a/nebo heslo je neplatné",
+    "DB Error: \"%s\"" : "Chyba databáze: \"%s\"",
+    "Offending command was: \"%s\"" : "Příslušný příkaz byl: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB uživatel '%s'@'localhost' již existuje.",
+    "Drop this user from MySQL/MariaDB" : "Smazat tohoto uživatele z MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB uživatel '%s'@'%%' již existuje",
+    "Drop this user from MySQL/MariaDB." : "Smazat tohoto uživatele z MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Spojení s Oracle nemohlo být navázáno",
+    "Oracle username and/or password not valid" : "Uživatelské jméno či heslo Oracle není platné",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Příslušný příkaz byl: \"%s\", jméno: %s, heslo: %s",
+    "PostgreSQL username and/or password not valid" : "Uživatelské jméno či heslo PostgreSQL není platné",
+    "Set an admin username." : "Zadejte uživatelské jméno správce.",
+    "Set an admin password." : "Zadejte heslo správce.",
+    "Can't create or write into the data directory %s" : "Nelze vytvořit nebo zapisovat do datového adresáře %s",
+    "%s shared »%s« with you" : "%s s vámi sdílí »%s«",
+    "Sharing %s failed, because the file does not exist" : "Sdílení %s selhalo, protože soubor neexistuje",
+    "You are not allowed to share %s" : "Nemáte povoleno sdílet %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Sdílení položky %s selhalo, protože uživatel %s je jejím vlastníkem",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Sdílení položky %s selhalo, protože sdílení pomocí linků není povoleno",
+    "Share type %s is not valid for %s" : "Sdílení typu %s není korektní pro %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavení oprávnění pro %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla povolena pro %s",
+    "Setting permissions for %s failed, because the item was not found" : "Nastavení práv pro %s selhalo, protože položka nebyla nalezena",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nelze nastavit datum vypršení platnosti. Sdílení nemůže vypršet později než za %s po zveřejnění",
+    "Cannot set expiration date. Expiration date is in the past" : "Nelze nastavit datum vypršení platnosti. Datum vypršení je v minulosti",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Úložiště pro sdílení %s musí implementovat rozhraní OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Úložiště sdílení %s nenalezeno",
+    "Sharing backend for %s not found" : "Úložiště  sdílení pro %s nenalezeno",
+    "Sharing %s failed, because the user %s is the original sharer" : "Sdílení položky %s selhalo, protože byla sdílena uživatelem %s jako první",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Sdílení položky %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla %s povolena.",
+    "Sharing %s failed, because resharing is not allowed" : "Sdílení položky %s selhalo, protože znovu-sdílení není povoleno",
+    "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\"",
+    "seconds ago" : "před pár sekundami",
+    "_%n minute ago_::_%n minutes ago_" : ["před %n minutou","před %n minutami","před %n minutami"],
+    "_%n hour ago_::_%n hours ago_" : ["před %n hodinou","před %n hodinami","před %n hodinami"],
+    "today" : "dnes",
+    "yesterday" : "včera",
+    "_%n day go_::_%n days ago_" : ["před %n dnem","před %n dny","před %n dny"],
+    "last month" : "minulý měsíc",
+    "_%n month ago_::_%n months ago_" : ["před %n měsícem","před %n měsíci","před %n měsíci"],
+    "last year" : "minulý rok",
+    "years ago" : "před lety",
+    "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",
+    "The username is already being used" : "Uživatelské jméno je již využíváno",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nejsou instalovány ovladače databází (sqlite, mysql nebo postresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnění lze obvykle napravit %spovolením zápisu webovému serveru do kořenového adresáře%s.",
+    "Cannot write into \"config\" directory" : "Nelze zapisovat do adresáře \"config\"",
+    "Cannot write into \"apps\" directory" : "Nelze zapisovat do adresáře \"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." : "To lze obvykle vyřešit %spovolením zápisu webovému serveru do adresáře apps%s nebo zakázáním appstore v konfiguračním souboru.",
+    "Cannot create \"data\" directory (%s)" : "Nelze vytvořit adresář \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "To lze obvykle vyřešit <a href=\"%s\" target=\"_blank\">povolením zápisu webovému serveru do kořenového adresáře</a>.",
+    "Setting locale to %s failed" : "Nastavení jazyka na %s selhalo",
+    "Please install one of these locales on your system and restart your webserver." : "Prosím nainstalujte alespoň jeden z těchto jazyků do svého systému a restartujte webový server.",
+    "Please ask your server administrator to install the module." : "Požádejte svého administrátora o instalaci tohoto modulu.",
+    "PHP module %s not installed." : "PHP modul %s není nainstalován.",
+    "PHP %s or higher is required." : "Je vyžadováno PHP %s nebo vyšší.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Požádejte svého administrátora o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Je zapnut PHP Safe Mode. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Je povoleno nastavení Magic Quotes. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?",
+    "Please ask your server administrator to restart the web server." : "Požádejte svého administrátora o restart webového serveru.",
+    "PostgreSQL >= 9 required" : "Je vyžadováno PostgreSQL >= 9",
+    "Please upgrade your database version" : "Aktualizujte prosím verzi své databáze",
+    "Error occurred while checking PostgreSQL version" : "Při zjišťování verze PostgreSQL došlo k chybě",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Ujistěte se, že máte PostgreSQL >= 9, a zkontrolujte logy pro více informací o chybě.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Změňte prosím práva na 0770, aby adresář nemohl být otevřen ostatními uživateli.",
+    "Data directory (%s) is readable by other users" : "Datový adresář (%s) je čitelný i ostatními uživateli",
+    "Data directory (%s) is invalid" : "Datový adresář (%s) je neplatný",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Ověřte prosím, že kořenový adresář s daty obsahuje soubor \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Nelze získat zámek typu %d na \"%s\"."
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
deleted file mode 100644
index a8143d4e431..00000000000
--- a/lib/l10n/cs_CZ.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Nelze zapisovat do adresáře \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "To lze obvykle vyřešit povolením zápisu webovému serveru do konfiguračního adresáře",
-"See %s" => "Viz %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "To lze obvykle vyřešit %spovolením zápisu webovému serveru do konfiguračního adresáře%s.",
-"Sample configuration detected" => "Byla detekována vzorová konfigurace",
-"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" => "Pravděpodobně byla zkopírována konfigurační nastavení ze vzorových souborů. Toto není podporováno a může poškodit vaši instalaci. Nahlédněte prosím do dokumentace před prováděním změn v souboru config.php",
-"Help" => "Nápověda",
-"Personal" => "Osobní",
-"Settings" => "Nastavení",
-"Users" => "Uživatelé",
-"Admin" => "Administrace",
-"Recommended" => "Doporučené",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikace \\\"%s\\\" nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud.",
-"No app name specified" => "Nebyl zadan název aplikace",
-"Unknown filetype" => "Neznámý typ souboru",
-"Invalid image" => "Chybný obrázek",
-"web services under your control" => "webové služby pod Vaší kontrolou",
-"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",
-"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",
-"Archives of type %s are not supported" => "Archivy typu %s nejsou podporovány",
-"Failed to open archive when installing app" => "Chyba při otevírání archivu během instalace aplikace",
-"App does not provide an info.xml file" => "Aplikace neposkytuje soubor info.xml",
-"App can't be installed because of not allowed code in the App" => "Aplikace nemůže být nainstalována, protože obsahuje nepovolený kód",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikace nemůže být nainstalována, protože není kompatibilní s touto verzí ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikace nemůže být nainstalována, protože obsahuje značku\n<shipped>\n\ntrue\n</shipped>\n\ncož není povoleno pro nedodávané aplikace",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikace nemůže být nainstalována, protože verze uvedená v info.xml/version nesouhlasí s verzí oznámenou z úložiště aplikací.",
-"Application is not enabled" => "Aplikace není povolena",
-"Authentication error" => "Chyba ověření",
-"Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.",
-"Unknown user" => "Neznámý uživatel",
-"%s enter the database username." => "Zadejte uživatelské jméno %s databáze.",
-"%s enter the database name." => "Zadejte název databáze pro %s databáze.",
-"%s you may not use dots in the database name" => "V názvu databáze %s nesmíte používat tečky.",
-"MS SQL username and/or password not valid: %s" => "Uživatelské jméno či heslo MSSQL není platné: %s",
-"You need to enter either an existing account or the administrator." => "Musíte zadat existující účet či správce.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB uživatelské jméno a/nebo heslo je neplatné",
-"DB Error: \"%s\"" => "Chyba databáze: \"%s\"",
-"Offending command was: \"%s\"" => "Příslušný příkaz byl: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB uživatel '%s'@'localhost' již existuje.",
-"Drop this user from MySQL/MariaDB" => "Smazat tohoto uživatele z MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB uživatel '%s'@'%%' již existuje",
-"Drop this user from MySQL/MariaDB." => "Smazat tohoto uživatele z MySQL/MariaDB.",
-"Oracle connection could not be established" => "Spojení s Oracle nemohlo být navázáno",
-"Oracle username and/or password not valid" => "Uživatelské jméno či heslo Oracle není platné",
-"Offending command was: \"%s\", name: %s, password: %s" => "Příslušný příkaz byl: \"%s\", jméno: %s, heslo: %s",
-"PostgreSQL username and/or password not valid" => "Uživatelské jméno či heslo PostgreSQL není platné",
-"Set an admin username." => "Zadejte uživatelské jméno správce.",
-"Set an admin password." => "Zadejte heslo správce.",
-"Can't create or write into the data directory %s" => "Nelze vytvořit nebo zapisovat do datového adresáře %s",
-"%s shared »%s« with you" => "%s s vámi sdílí »%s«",
-"Sharing %s failed, because the file does not exist" => "Sdílení %s selhalo, protože soubor neexistuje",
-"You are not allowed to share %s" => "Nemáte povoleno sdílet %s",
-"Sharing %s failed, because the user %s is the item owner" => "Sdílení položky %s selhalo, protože uživatel %s je jejím vlastníkem",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Sdílení položky %s selhalo, protože sdílení pomocí linků není povoleno",
-"Share type %s is not valid for %s" => "Sdílení typu %s není korektní pro %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Nastavení oprávnění pro %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla povolena pro %s",
-"Setting permissions for %s failed, because the item was not found" => "Nastavení práv pro %s selhalo, protože položka nebyla nalezena",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Nelze nastavit datum vypršení platnosti. Sdílení nemůže vypršet později než za %s po zveřejnění",
-"Cannot set expiration date. Expiration date is in the past" => "Nelze nastavit datum vypršení platnosti. Datum vypršení je v minulosti",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Úložiště pro sdílení %s musí implementovat rozhraní OCP\\Share_Backend",
-"Sharing backend %s not found" => "Úložiště sdílení %s nenalezeno",
-"Sharing backend for %s not found" => "Úložiště  sdílení pro %s nenalezeno",
-"Sharing %s failed, because the user %s is the original sharer" => "Sdílení položky %s selhalo, protože byla sdílena uživatelem %s jako první",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Sdílení položky %s selhalo, protože jsou k tomu nutná vyšší oprávnění, než jaká byla %s povolena.",
-"Sharing %s failed, because resharing is not allowed" => "Sdílení položky %s selhalo, protože znovu-sdílení není povoleno",
-"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\"",
-"seconds ago" => "před pár sekundami",
-"_%n minute ago_::_%n minutes ago_" => array("před %n minutou","před %n minutami","před %n minutami"),
-"_%n hour ago_::_%n hours ago_" => array("před %n hodinou","před %n hodinami","před %n hodinami"),
-"today" => "dnes",
-"yesterday" => "včera",
-"_%n day go_::_%n days ago_" => array("před %n dnem","před %n dny","před %n dny"),
-"last month" => "minulý měsíc",
-"_%n month ago_::_%n months ago_" => array("před %n měsícem","před %n měsíci","před %n měsíci"),
-"last year" => "minulý rok",
-"years ago" => "před lety",
-"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",
-"The username is already being used" => "Uživatelské jméno je již využíváno",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Nejsou instalovány ovladače databází (sqlite, mysql nebo postresql).",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Oprávnění lze obvykle napravit %spovolením zápisu webovému serveru do kořenového adresáře%s.",
-"Cannot write into \"config\" directory" => "Nelze zapisovat do adresáře \"config\"",
-"Cannot write into \"apps\" directory" => "Nelze zapisovat do adresáře \"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." => "To lze obvykle vyřešit %spovolením zápisu webovému serveru do adresáře apps%s nebo zakázáním appstore v konfiguračním souboru.",
-"Cannot create \"data\" directory (%s)" => "Nelze vytvořit adresář \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "To lze obvykle vyřešit <a href=\"%s\" target=\"_blank\">povolením zápisu webovému serveru do kořenového adresáře</a>.",
-"Setting locale to %s failed" => "Nastavení jazyka na %s selhalo",
-"Please install one of these locales on your system and restart your webserver." => "Prosím nainstalujte alespoň jeden z těchto jazyků do svého systému a restartujte webový server.",
-"Please ask your server administrator to install the module." => "Požádejte svého administrátora o instalaci tohoto modulu.",
-"PHP module %s not installed." => "PHP modul %s není nainstalován.",
-"PHP %s or higher is required." => "Je vyžadováno PHP %s nebo vyšší.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Požádejte svého administrátora o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Je zapnut PHP Safe Mode. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Je povoleno nastavení Magic Quotes. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?",
-"Please ask your server administrator to restart the web server." => "Požádejte svého administrátora o restart webového serveru.",
-"PostgreSQL >= 9 required" => "Je vyžadováno PostgreSQL >= 9",
-"Please upgrade your database version" => "Aktualizujte prosím verzi své databáze",
-"Error occurred while checking PostgreSQL version" => "Při zjišťování verze PostgreSQL došlo k chybě",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Ujistěte se, že máte PostgreSQL >= 9, a zkontrolujte logy pro více informací o chybě.",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Změňte prosím práva na 0770, aby adresář nemohl být otevřen ostatními uživateli.",
-"Data directory (%s) is readable by other users" => "Datový adresář (%s) je čitelný i ostatními uživateli",
-"Data directory (%s) is invalid" => "Datový adresář (%s) je neplatný",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Ověřte prosím, že kořenový adresář s daty obsahuje soubor \".ocdata\".",
-"Could not obtain lock type %d on \"%s\"." => "Nelze získat zámek typu %d na \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/cy_GB.js b/lib/l10n/cy_GB.js
new file mode 100644
index 00000000000..1e9cae3d483
--- /dev/null
+++ b/lib/l10n/cy_GB.js
@@ -0,0 +1,37 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Cymorth",
+    "Personal" : "Personol",
+    "Settings" : "Gosodiadau",
+    "Users" : "Defnyddwyr",
+    "Admin" : "Gweinyddu",
+    "web services under your control" : "gwasanaethau gwe a reolir gennych",
+    "Application is not enabled" : "Nid yw'r pecyn wedi'i alluogi",
+    "Authentication error" : "Gwall dilysu",
+    "Token expired. Please reload page." : "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.",
+    "%s enter the database username." : "%s rhowch enw defnyddiwr y gronfa ddata.",
+    "%s enter the database name." : "%s rhowch enw'r gronfa ddata.",
+    "%s you may not use dots in the database name" : "%s does dim hawl defnyddio dot yn enw'r gronfa ddata",
+    "MS SQL username and/or password not valid: %s" : "Enw a/neu gyfrinair MS SQL annilys: %s",
+    "You need to enter either an existing account or the administrator." : "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr.",
+    "DB Error: \"%s\"" : "Gwall DB: \"%s\"",
+    "Offending command was: \"%s\"" : "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\"",
+    "Oracle username and/or password not valid" : "Enw a/neu gyfrinair Oracle annilys",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s",
+    "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\"",
+    "seconds ago" : "eiliad yn ôl",
+    "_%n minute ago_::_%n minutes ago_" : ["","","",""],
+    "_%n hour ago_::_%n hours ago_" : ["","","",""],
+    "today" : "heddiw",
+    "yesterday" : "ddoe",
+    "_%n day go_::_%n days ago_" : ["","","",""],
+    "last month" : "mis diwethaf",
+    "_%n month ago_::_%n months ago_" : ["","","",""],
+    "last year" : "y llynedd",
+    "years ago" : "blwyddyn yn ôl"
+},
+"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
new file mode 100644
index 00000000000..c60d5ea976b
--- /dev/null
+++ b/lib/l10n/cy_GB.json
@@ -0,0 +1,35 @@
+{ "translations": {
+    "Help" : "Cymorth",
+    "Personal" : "Personol",
+    "Settings" : "Gosodiadau",
+    "Users" : "Defnyddwyr",
+    "Admin" : "Gweinyddu",
+    "web services under your control" : "gwasanaethau gwe a reolir gennych",
+    "Application is not enabled" : "Nid yw'r pecyn wedi'i alluogi",
+    "Authentication error" : "Gwall dilysu",
+    "Token expired. Please reload page." : "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.",
+    "%s enter the database username." : "%s rhowch enw defnyddiwr y gronfa ddata.",
+    "%s enter the database name." : "%s rhowch enw'r gronfa ddata.",
+    "%s you may not use dots in the database name" : "%s does dim hawl defnyddio dot yn enw'r gronfa ddata",
+    "MS SQL username and/or password not valid: %s" : "Enw a/neu gyfrinair MS SQL annilys: %s",
+    "You need to enter either an existing account or the administrator." : "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr.",
+    "DB Error: \"%s\"" : "Gwall DB: \"%s\"",
+    "Offending command was: \"%s\"" : "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\"",
+    "Oracle username and/or password not valid" : "Enw a/neu gyfrinair Oracle annilys",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s",
+    "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\"",
+    "seconds ago" : "eiliad yn ôl",
+    "_%n minute ago_::_%n minutes ago_" : ["","","",""],
+    "_%n hour ago_::_%n hours ago_" : ["","","",""],
+    "today" : "heddiw",
+    "yesterday" : "ddoe",
+    "_%n day go_::_%n days ago_" : ["","","",""],
+    "last month" : "mis diwethaf",
+    "_%n month ago_::_%n months ago_" : ["","","",""],
+    "last year" : "y llynedd",
+    "years ago" : "blwyddyn yn ôl"
+},"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/cy_GB.php b/lib/l10n/cy_GB.php
deleted file mode 100644
index 8e0af7f2cfb..00000000000
--- a/lib/l10n/cy_GB.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Cymorth",
-"Personal" => "Personol",
-"Settings" => "Gosodiadau",
-"Users" => "Defnyddwyr",
-"Admin" => "Gweinyddu",
-"web services under your control" => "gwasanaethau gwe a reolir gennych",
-"Application is not enabled" => "Nid yw'r pecyn wedi'i alluogi",
-"Authentication error" => "Gwall dilysu",
-"Token expired. Please reload page." => "Tocyn wedi dod i ben. Ail-lwythwch y dudalen.",
-"%s enter the database username." => "%s rhowch enw defnyddiwr y gronfa ddata.",
-"%s enter the database name." => "%s rhowch enw'r gronfa ddata.",
-"%s you may not use dots in the database name" => "%s does dim hawl defnyddio dot yn enw'r gronfa ddata",
-"MS SQL username and/or password not valid: %s" => "Enw a/neu gyfrinair MS SQL annilys: %s",
-"You need to enter either an existing account or the administrator." => "Rhaid i chi naill ai gyflwyno cyfrif presennol neu'r gweinyddwr.",
-"DB Error: \"%s\"" => "Gwall DB: \"%s\"",
-"Offending command was: \"%s\"" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\"",
-"Oracle username and/or password not valid" => "Enw a/neu gyfrinair Oracle annilys",
-"Offending command was: \"%s\", name: %s, password: %s" => "Y gorchymyn wnaeth beri tramgwydd oedd: \"%s\", enw: %s, cyfrinair: %s",
-"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\"",
-"seconds ago" => "eiliad yn ôl",
-"_%n minute ago_::_%n minutes ago_" => array("","","",""),
-"_%n hour ago_::_%n hours ago_" => array("","","",""),
-"today" => "heddiw",
-"yesterday" => "ddoe",
-"_%n day go_::_%n days ago_" => array("","","",""),
-"last month" => "mis diwethaf",
-"_%n month ago_::_%n months ago_" => array("","","",""),
-"last year" => "y llynedd",
-"years ago" => "blwyddyn yn ôl"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
new file mode 100644
index 00000000000..6c49ba9b038
--- /dev/null
+++ b/lib/l10n/da.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Kan ikke skrive til mappen \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dette kan normalvis ordnes ved at give webserveren skrive adgang til config mappen",
+    "See %s" : "Se %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til config-mappen%s.",
+    "Sample configuration detected" : "Eksempel for konfiguration registreret",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Der er registreret at eksempel for konfiguration er blevet kopieret. Dette kan ødelægge din installation og understøttes ikke. Læs venligst dokumentationen før der foretages ændringer i config.php",
+    "Help" : "Hjælp",
+    "Personal" : "Personligt",
+    "Settings" : "Indstillinger",
+    "Users" : "Brugere",
+    "Admin" : "Admin",
+    "Recommended" : "Anbefalet",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App'en \\\"%s\\\" kan ikke installeres, da den ikke er kompatible med denne version af ownCloud.",
+    "No app name specified" : "Intet app-navn angivet",
+    "Unknown filetype" : "Ukendt filtype",
+    "Invalid image" : "Ugyldigt billede",
+    "web services under your control" : "Webtjenester under din kontrol",
+    "App directory already exists" : "App-mappe findes allerede",
+    "Can't create app folder. Please fix permissions. %s" : "Kan ikke oprette app-mappe. Ret tilladelser. %s",
+    "No source specified when installing app" : "Ingen kilde angivet under installation af app",
+    "No href specified when installing app from http" : "Ingen href angivet under installation af app via http",
+    "No path specified when installing app from local file" : "Ingen sti angivet under installation af app fra lokal fil",
+    "Archives of type %s are not supported" : "Arkiver af type %s understøttes ikke",
+    "Failed to open archive when installing app" : "Kunne ikke åbne arkiv under installation af appen",
+    "App does not provide an info.xml file" : "Der følger ingen info.xml-fil med appen",
+    "App can't be installed because of not allowed code in the App" : "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
+    "Application is not enabled" : "Programmet er ikke aktiveret",
+    "Authentication error" : "Adgangsfejl",
+    "Token expired. Please reload page." : "Adgang er udløbet. Genindlæs siden.",
+    "Unknown user" : "Ukendt bruger",
+    "%s enter the database username." : "%s indtast database brugernavnet.",
+    "%s enter the database name." : "%s indtast database navnet.",
+    "%s you may not use dots in the database name" : "%s du må ikke bruge punktummer i databasenavnet.",
+    "MS SQL username and/or password not valid: %s" : "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
+    "You need to enter either an existing account or the administrator." : "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator.",
+    "MySQL/MariaDB username and/or password not valid" : "Ugyldigt MySQL/MariaDB brugernavn og/eller kodeord ",
+    "DB Error: \"%s\"" : "Databasefejl: \"%s\"",
+    "Offending command was: \"%s\"" : "Fejlende kommando var: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB bruger '%s'@'localhost' eksistere allerede.",
+    "Drop this user from MySQL/MariaDB" : "Slet denne bruger fra MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB bruger '%s'@'%%' eksistere allerede",
+    "Drop this user from MySQL/MariaDB." : "Drop denne bruger fra MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Oracle forbindelsen kunne ikke etableres",
+    "Oracle username and/or password not valid" : "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Fejlende kommando var: \"%s\", navn: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
+    "Set an admin username." : "Angiv et admin brugernavn.",
+    "Set an admin password." : "Angiv et admin kodeord.",
+    "Can't create or write into the data directory %s" : "Kan ikke oprette eller skrive ind i datamappen %s",
+    "%s shared »%s« with you" : "%s delte »%s« med sig",
+    "Sharing %s failed, because the file does not exist" : "Deling af %s mislykkedes, fordi filen ikke eksisterer",
+    "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Der skete en fejl ved deling af %s, brugeren %s er ejer af objektet",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Der skete en fejl ved deling af %s, det er ikke tilladt at dele links",
+    "Share type %s is not valid for %s" : "Delingstypen %s er ikke gyldig for %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Angivelse af tilladelser for %s mislykkedes, fordi tilladelserne overskred de som var tildelt %s",
+    "Setting permissions for %s failed, because the item was not found" : "Angivelse af tilladelser for %s mislykkedes, fordi artiklen ikke blev fundet",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Kan ikke angive udløbsdato. Delinger kan ikke udløbe senere end %s efter at de er blevet delt",
+    "Cannot set expiration date. Expiration date is in the past" : "Kan ikke angive udløbsdato. Udløbsdato er allerede passeret",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delingsbackend'en %s skal implementere grænsefladen OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Delingsbackend'en %s blev ikke fundet",
+    "Sharing backend for %s not found" : "Delingsbackend'en for %s blev ikke fundet",
+    "Sharing %s failed, because the user %s is the original sharer" : "Deling af %s mislykkedes, fordi brugeren %s er den som delte oprindeligt",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Deling af %s mislykkedes, fordi tilladelserne overskred de tillaldelser som %s var tildelt",
+    "Sharing %s failed, because resharing is not allowed" : "Deling af %s mislykkedes, fordi videredeling ikke er tilladt",
+    "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\"",
+    "seconds ago" : "sekunder siden",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minut siden","%n minutter siden"],
+    "_%n hour ago_::_%n hours ago_" : ["%n time siden","%n timer siden"],
+    "today" : "i dag",
+    "yesterday" : "i går",
+    "_%n day go_::_%n days ago_" : ["%n dag siden","%n dage siden"],
+    "last month" : "sidste måned",
+    "_%n month ago_::_%n months ago_" : ["%n måned siden","%n måneder siden"],
+    "last year" : "sidste år",
+    "years ago" : "år siden",
+    "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",
+    "The username is already being used" : "Brugernavnet er allerede i brug",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen database driver (sqlite, mysql eller postgresql) er installeret.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rettigheder kan som regel rettes ved %sat give webserveren skriveadgang til rodmappen%s.",
+    "Cannot write into \"config\" directory" : "Kan ikke skrive til mappen \"config\"",
+    "Cannot write into \"apps\" directory" : "Kan ikke skrive til mappen \"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." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til apps-mappen%s eller slå appstore fra i config-filen.",
+    "Cannot create \"data\" directory (%s)" : "Kan ikke oprette mappen \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dette kan som regel rettes ved <a href=\"%s\" target=\"_blank\">give webserveren skriveadgang til rodmappen</a>.",
+    "Setting locale to %s failed" : "Angivelse af %s for lokalitet mislykkedes",
+    "Please install one of these locales on your system and restart your webserver." : "Installér venligst én af disse lokaliteter på dit system, og genstart din webserver.",
+    "Please ask your server administrator to install the module." : "Du bedes anmode din serveradministrator om at installere modulet.",
+    "PHP module %s not installed." : "PHP-modulet %s er ikke installeret.",
+    "PHP %s or higher is required." : "Der kræves PHP %s eller nyere.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bed venligst din serveradministrator om at opdatere PHP til seneste version. Din PHP-version understøttes ikke længere af ownCload og PHP-fællesskabet.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode er slået til. ownCload kræver at denne er slået fra, for at fungere ordentligt.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode er udgået og stort set en ubrugelig indstilling, der bør slås fra. Spørg venligst din serveradministrator om at slå den fra i php.ini eller din webeserver-konfiguration.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes er slået til. ownCloud kræver at denne er slået fra, for at fungere ordentligt.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes er udgået og stort set en ubrugelig indstilling, der bør slås fra. Spørg venligst din serveradministrator om at slå den fra i php.ini eller din webeserver-konfiguration.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremgår stadig som fraværende?",
+    "Please ask your server administrator to restart the web server." : "Du bedes anmode din serveradministrator om at genstarte webserveren.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 kræves",
+    "Please upgrade your database version" : "Opgradér venligst din databaseversion",
+    "Error occurred while checking PostgreSQL version" : "Der opstod fejl under tjek af PostgreSQL-versionen",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Sørg venligst for at du har PostgreSQL >= 9 eller tjek loggen for flere informationer om fejlen",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Tilpas venligst rettigheder til 0770, så mappen ikke fremvises for andre brugere.",
+    "Data directory (%s) is readable by other users" : "Datamappen (%s) kan læses af andre brugere",
+    "Data directory (%s) is invalid" : "Datamappen (%s) er ugyldig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Tjek venligst at datamappen indeholder en fil, \".ocdata\" i dens rod.",
+    "Could not obtain lock type %d on \"%s\"." : "Kunne ikke opnå en låsetype %d på \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
new file mode 100644
index 00000000000..fe2858f182d
--- /dev/null
+++ b/lib/l10n/da.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Kan ikke skrive til mappen \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dette kan normalvis ordnes ved at give webserveren skrive adgang til config mappen",
+    "See %s" : "Se %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til config-mappen%s.",
+    "Sample configuration detected" : "Eksempel for konfiguration registreret",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Der er registreret at eksempel for konfiguration er blevet kopieret. Dette kan ødelægge din installation og understøttes ikke. Læs venligst dokumentationen før der foretages ændringer i config.php",
+    "Help" : "Hjælp",
+    "Personal" : "Personligt",
+    "Settings" : "Indstillinger",
+    "Users" : "Brugere",
+    "Admin" : "Admin",
+    "Recommended" : "Anbefalet",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App'en \\\"%s\\\" kan ikke installeres, da den ikke er kompatible med denne version af ownCloud.",
+    "No app name specified" : "Intet app-navn angivet",
+    "Unknown filetype" : "Ukendt filtype",
+    "Invalid image" : "Ugyldigt billede",
+    "web services under your control" : "Webtjenester under din kontrol",
+    "App directory already exists" : "App-mappe findes allerede",
+    "Can't create app folder. Please fix permissions. %s" : "Kan ikke oprette app-mappe. Ret tilladelser. %s",
+    "No source specified when installing app" : "Ingen kilde angivet under installation af app",
+    "No href specified when installing app from http" : "Ingen href angivet under installation af app via http",
+    "No path specified when installing app from local file" : "Ingen sti angivet under installation af app fra lokal fil",
+    "Archives of type %s are not supported" : "Arkiver af type %s understøttes ikke",
+    "Failed to open archive when installing app" : "Kunne ikke åbne arkiv under installation af appen",
+    "App does not provide an info.xml file" : "Der følger ingen info.xml-fil med appen",
+    "App can't be installed because of not allowed code in the App" : "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
+    "Application is not enabled" : "Programmet er ikke aktiveret",
+    "Authentication error" : "Adgangsfejl",
+    "Token expired. Please reload page." : "Adgang er udløbet. Genindlæs siden.",
+    "Unknown user" : "Ukendt bruger",
+    "%s enter the database username." : "%s indtast database brugernavnet.",
+    "%s enter the database name." : "%s indtast database navnet.",
+    "%s you may not use dots in the database name" : "%s du må ikke bruge punktummer i databasenavnet.",
+    "MS SQL username and/or password not valid: %s" : "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
+    "You need to enter either an existing account or the administrator." : "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator.",
+    "MySQL/MariaDB username and/or password not valid" : "Ugyldigt MySQL/MariaDB brugernavn og/eller kodeord ",
+    "DB Error: \"%s\"" : "Databasefejl: \"%s\"",
+    "Offending command was: \"%s\"" : "Fejlende kommando var: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB bruger '%s'@'localhost' eksistere allerede.",
+    "Drop this user from MySQL/MariaDB" : "Slet denne bruger fra MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB bruger '%s'@'%%' eksistere allerede",
+    "Drop this user from MySQL/MariaDB." : "Drop denne bruger fra MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Oracle forbindelsen kunne ikke etableres",
+    "Oracle username and/or password not valid" : "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Fejlende kommando var: \"%s\", navn: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
+    "Set an admin username." : "Angiv et admin brugernavn.",
+    "Set an admin password." : "Angiv et admin kodeord.",
+    "Can't create or write into the data directory %s" : "Kan ikke oprette eller skrive ind i datamappen %s",
+    "%s shared »%s« with you" : "%s delte »%s« med sig",
+    "Sharing %s failed, because the file does not exist" : "Deling af %s mislykkedes, fordi filen ikke eksisterer",
+    "You are not allowed to share %s" : "Du har ikke tilladelse til at dele %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Der skete en fejl ved deling af %s, brugeren %s er ejer af objektet",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Der skete en fejl ved deling af %s, det er ikke tilladt at dele links",
+    "Share type %s is not valid for %s" : "Delingstypen %s er ikke gyldig for %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Angivelse af tilladelser for %s mislykkedes, fordi tilladelserne overskred de som var tildelt %s",
+    "Setting permissions for %s failed, because the item was not found" : "Angivelse af tilladelser for %s mislykkedes, fordi artiklen ikke blev fundet",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Kan ikke angive udløbsdato. Delinger kan ikke udløbe senere end %s efter at de er blevet delt",
+    "Cannot set expiration date. Expiration date is in the past" : "Kan ikke angive udløbsdato. Udløbsdato er allerede passeret",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delingsbackend'en %s skal implementere grænsefladen OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Delingsbackend'en %s blev ikke fundet",
+    "Sharing backend for %s not found" : "Delingsbackend'en for %s blev ikke fundet",
+    "Sharing %s failed, because the user %s is the original sharer" : "Deling af %s mislykkedes, fordi brugeren %s er den som delte oprindeligt",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Deling af %s mislykkedes, fordi tilladelserne overskred de tillaldelser som %s var tildelt",
+    "Sharing %s failed, because resharing is not allowed" : "Deling af %s mislykkedes, fordi videredeling ikke er tilladt",
+    "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\"",
+    "seconds ago" : "sekunder siden",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minut siden","%n minutter siden"],
+    "_%n hour ago_::_%n hours ago_" : ["%n time siden","%n timer siden"],
+    "today" : "i dag",
+    "yesterday" : "i går",
+    "_%n day go_::_%n days ago_" : ["%n dag siden","%n dage siden"],
+    "last month" : "sidste måned",
+    "_%n month ago_::_%n months ago_" : ["%n måned siden","%n måneder siden"],
+    "last year" : "sidste år",
+    "years ago" : "år siden",
+    "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",
+    "The username is already being used" : "Brugernavnet er allerede i brug",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen database driver (sqlite, mysql eller postgresql) er installeret.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Rettigheder kan som regel rettes ved %sat give webserveren skriveadgang til rodmappen%s.",
+    "Cannot write into \"config\" directory" : "Kan ikke skrive til mappen \"config\"",
+    "Cannot write into \"apps\" directory" : "Kan ikke skrive til mappen \"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." : "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til apps-mappen%s eller slå appstore fra i config-filen.",
+    "Cannot create \"data\" directory (%s)" : "Kan ikke oprette mappen \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dette kan som regel rettes ved <a href=\"%s\" target=\"_blank\">give webserveren skriveadgang til rodmappen</a>.",
+    "Setting locale to %s failed" : "Angivelse af %s for lokalitet mislykkedes",
+    "Please install one of these locales on your system and restart your webserver." : "Installér venligst én af disse lokaliteter på dit system, og genstart din webserver.",
+    "Please ask your server administrator to install the module." : "Du bedes anmode din serveradministrator om at installere modulet.",
+    "PHP module %s not installed." : "PHP-modulet %s er ikke installeret.",
+    "PHP %s or higher is required." : "Der kræves PHP %s eller nyere.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bed venligst din serveradministrator om at opdatere PHP til seneste version. Din PHP-version understøttes ikke længere af ownCload og PHP-fællesskabet.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode er slået til. ownCload kræver at denne er slået fra, for at fungere ordentligt.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode er udgået og stort set en ubrugelig indstilling, der bør slås fra. Spørg venligst din serveradministrator om at slå den fra i php.ini eller din webeserver-konfiguration.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes er slået til. ownCloud kræver at denne er slået fra, for at fungere ordentligt.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes er udgået og stort set en ubrugelig indstilling, der bør slås fra. Spørg venligst din serveradministrator om at slå den fra i php.ini eller din webeserver-konfiguration.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Der er installeret PHP-moduler, men de fremgår stadig som fraværende?",
+    "Please ask your server administrator to restart the web server." : "Du bedes anmode din serveradministrator om at genstarte webserveren.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 kræves",
+    "Please upgrade your database version" : "Opgradér venligst din databaseversion",
+    "Error occurred while checking PostgreSQL version" : "Der opstod fejl under tjek af PostgreSQL-versionen",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Sørg venligst for at du har PostgreSQL >= 9 eller tjek loggen for flere informationer om fejlen",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Tilpas venligst rettigheder til 0770, så mappen ikke fremvises for andre brugere.",
+    "Data directory (%s) is readable by other users" : "Datamappen (%s) kan læses af andre brugere",
+    "Data directory (%s) is invalid" : "Datamappen (%s) er ugyldig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Tjek venligst at datamappen indeholder en fil, \".ocdata\" i dens rod.",
+    "Could not obtain lock type %d on \"%s\"." : "Kunne ikke opnå en låsetype %d på \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
deleted file mode 100644
index 8ae7d847a09..00000000000
--- a/lib/l10n/da.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Kan ikke skrive til mappen \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Dette kan normalvis ordnes ved at give webserveren skrive adgang til config mappen",
-"See %s" => "Se %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til config-mappen%s.",
-"Sample configuration detected" => "Eksempel for konfiguration registreret",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Der er registreret at eksempel for konfiguration er blevet kopieret. Dette kan ødelægge din installation og understøttes ikke. Læs venligst dokumentationen før der foretages ændringer i config.php",
-"Help" => "Hjælp",
-"Personal" => "Personligt",
-"Settings" => "Indstillinger",
-"Users" => "Brugere",
-"Admin" => "Admin",
-"Recommended" => "Anbefalet",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App'en \\\"%s\\\" kan ikke installeres, da den ikke er kompatible med denne version af ownCloud.",
-"No app name specified" => "Intet app-navn angivet",
-"Unknown filetype" => "Ukendt filtype",
-"Invalid image" => "Ugyldigt billede",
-"web services under your control" => "Webtjenester under din kontrol",
-"App directory already exists" => "App-mappe findes allerede",
-"Can't create app folder. Please fix permissions. %s" => "Kan ikke oprette app-mappe. Ret tilladelser. %s",
-"No source specified when installing app" => "Ingen kilde angivet under installation af app",
-"No href specified when installing app from http" => "Ingen href angivet under installation af app via http",
-"No path specified when installing app from local file" => "Ingen sti angivet under installation af app fra lokal fil",
-"Archives of type %s are not supported" => "Arkiver af type %s understøttes ikke",
-"Failed to open archive when installing app" => "Kunne ikke åbne arkiv under installation af appen",
-"App does not provide an info.xml file" => "Der følger ingen info.xml-fil med appen",
-"App can't be installed because of not allowed code in the App" => "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
-"Application is not enabled" => "Programmet er ikke aktiveret",
-"Authentication error" => "Adgangsfejl",
-"Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
-"Unknown user" => "Ukendt bruger",
-"%s enter the database username." => "%s indtast database brugernavnet.",
-"%s enter the database name." => "%s indtast database navnet.",
-"%s you may not use dots in the database name" => "%s du må ikke bruge punktummer i databasenavnet.",
-"MS SQL username and/or password not valid: %s" => "MS SQL brugernavn og/eller adgangskode ikke er gyldigt: %s",
-"You need to enter either an existing account or the administrator." => "Du bliver nødt til at indtaste en eksisterende bruger eller en administrator.",
-"MySQL/MariaDB username and/or password not valid" => "Ugyldigt MySQL/MariaDB brugernavn og/eller kodeord ",
-"DB Error: \"%s\"" => "Databasefejl: \"%s\"",
-"Offending command was: \"%s\"" => "Fejlende kommando var: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB bruger '%s'@'localhost' eksistere allerede.",
-"Drop this user from MySQL/MariaDB" => "Slet denne bruger fra MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB bruger '%s'@'%%' eksistere allerede",
-"Drop this user from MySQL/MariaDB." => "Drop denne bruger fra MySQL/MariaDB.",
-"Oracle connection could not be established" => "Oracle forbindelsen kunne ikke etableres",
-"Oracle username and/or password not valid" => "Oracle brugernavn og/eller kodeord er ikke gyldigt.",
-"Offending command was: \"%s\", name: %s, password: %s" => "Fejlende kommando var: \"%s\", navn: %s, password: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL brugernavn og/eller kodeord er ikke gyldigt.",
-"Set an admin username." => "Angiv et admin brugernavn.",
-"Set an admin password." => "Angiv et admin kodeord.",
-"Can't create or write into the data directory %s" => "Kan ikke oprette eller skrive ind i datamappen %s",
-"%s shared »%s« with you" => "%s delte »%s« med sig",
-"Sharing %s failed, because the file does not exist" => "Deling af %s mislykkedes, fordi filen ikke eksisterer",
-"You are not allowed to share %s" => "Du har ikke tilladelse til at dele %s",
-"Sharing %s failed, because the user %s is the item owner" => "Der skete en fejl ved deling af %s, brugeren %s er ejer af objektet",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Der skete en fejl ved deling af %s, det er ikke tilladt at dele links",
-"Share type %s is not valid for %s" => "Delingstypen %s er ikke gyldig for %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Angivelse af tilladelser for %s mislykkedes, fordi tilladelserne overskred de som var tildelt %s",
-"Setting permissions for %s failed, because the item was not found" => "Angivelse af tilladelser for %s mislykkedes, fordi artiklen ikke blev fundet",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Kan ikke angive udløbsdato. Delinger kan ikke udløbe senere end %s efter at de er blevet delt",
-"Cannot set expiration date. Expiration date is in the past" => "Kan ikke angive udløbsdato. Udløbsdato er allerede passeret",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Delingsbackend'en %s skal implementere grænsefladen OCP\\Share_Backend",
-"Sharing backend %s not found" => "Delingsbackend'en %s blev ikke fundet",
-"Sharing backend for %s not found" => "Delingsbackend'en for %s blev ikke fundet",
-"Sharing %s failed, because the user %s is the original sharer" => "Deling af %s mislykkedes, fordi brugeren %s er den som delte oprindeligt",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Deling af %s mislykkedes, fordi tilladelserne overskred de tillaldelser som %s var tildelt",
-"Sharing %s failed, because resharing is not allowed" => "Deling af %s mislykkedes, fordi videredeling ikke er tilladt",
-"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\"",
-"seconds ago" => "sekunder siden",
-"_%n minute ago_::_%n minutes ago_" => array("%n minut siden","%n minutter siden"),
-"_%n hour ago_::_%n hours ago_" => array("%n time siden","%n timer siden"),
-"today" => "i dag",
-"yesterday" => "i går",
-"_%n day go_::_%n days ago_" => array("%n dag siden","%n dage siden"),
-"last month" => "sidste måned",
-"_%n month ago_::_%n months ago_" => array("%n måned siden","%n måneder siden"),
-"last year" => "sidste år",
-"years ago" => "år siden",
-"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",
-"The username is already being used" => "Brugernavnet er allerede i brug",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Ingen database driver (sqlite, mysql eller postgresql) er installeret.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Rettigheder kan som regel rettes ved %sat give webserveren skriveadgang til rodmappen%s.",
-"Cannot write into \"config\" directory" => "Kan ikke skrive til mappen \"config\"",
-"Cannot write into \"apps\" directory" => "Kan ikke skrive til mappen \"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." => "Dette kan som regel rettes ved at %sgive webserveren skriveadgang til apps-mappen%s eller slå appstore fra i config-filen.",
-"Cannot create \"data\" directory (%s)" => "Kan ikke oprette mappen \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dette kan som regel rettes ved <a href=\"%s\" target=\"_blank\">give webserveren skriveadgang til rodmappen</a>.",
-"Setting locale to %s failed" => "Angivelse af %s for lokalitet mislykkedes",
-"Please install one of these locales on your system and restart your webserver." => "Installér venligst én af disse lokaliteter på dit system, og genstart din webserver.",
-"Please ask your server administrator to install the module." => "Du bedes anmode din serveradministrator om at installere modulet.",
-"PHP module %s not installed." => "PHP-modulet %s er ikke installeret.",
-"PHP %s or higher is required." => "Der kræves PHP %s eller nyere.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Bed venligst din serveradministrator om at opdatere PHP til seneste version. Din PHP-version understøttes ikke længere af ownCload og PHP-fællesskabet.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode er slået til. ownCload kræver at denne er slået fra, for at fungere ordentligt.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode er udgået og stort set en ubrugelig indstilling, der bør slås fra. Spørg venligst din serveradministrator om at slå den fra i php.ini eller din webeserver-konfiguration.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes er slået til. ownCloud kræver at denne er slået fra, for at fungere ordentligt.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes er udgået og stort set en ubrugelig indstilling, der bør slås fra. Spørg venligst din serveradministrator om at slå den fra i php.ini eller din webeserver-konfiguration.",
-"PHP modules have been installed, but they are still listed as missing?" => "Der er installeret PHP-moduler, men de fremgår stadig som fraværende?",
-"Please ask your server administrator to restart the web server." => "Du bedes anmode din serveradministrator om at genstarte webserveren.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 kræves",
-"Please upgrade your database version" => "Opgradér venligst din databaseversion",
-"Error occurred while checking PostgreSQL version" => "Der opstod fejl under tjek af PostgreSQL-versionen",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Sørg venligst for at du har PostgreSQL >= 9 eller tjek loggen for flere informationer om fejlen",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Tilpas venligst rettigheder til 0770, så mappen ikke fremvises for andre brugere.",
-"Data directory (%s) is readable by other users" => "Datamappen (%s) kan læses af andre brugere",
-"Data directory (%s) is invalid" => "Datamappen (%s) er ugyldig",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Tjek venligst at datamappen indeholder en fil, \".ocdata\" i dens rod.",
-"Could not obtain lock type %d on \"%s\"." => "Kunne ikke opnå en låsetype %d på \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
new file mode 100644
index 00000000000..e512c9d1d4c
--- /dev/null
+++ b/lib/l10n/de.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Das Schreiben in das \"config\"-Verzeichnis nicht möglich!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dies kann normalerweise repariert werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird",
+    "See %s" : "Siehe %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das config-Verzeichnis %s gegeben wird.",
+    "Sample configuration detected" : "Beispielkonfiguration gefunden",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde, Dies wird nicht unterstützt kann zum Abruch Ihrer Installation führen. Bitte lese die Dokumentation vor der Änderung an der config.php.",
+    "Help" : "Hilfe",
+    "Personal" : "Persönlich",
+    "Settings" : "Einstellungen",
+    "Users" : "Benutzer",
+    "Admin" : "Administration",
+    "Recommended" : "Empfohlen",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Applikation \\\"%s\\\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
+    "No app name specified" : "Es wurde kein Applikation-Name angegeben",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "web services under your control" : "Web-Services unter Deiner Kontrolle",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Archive vom Typ %s werden nicht unterstützt",
+    "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
+    "App does not provide an info.xml file" : "Die Applikation enthält keine info,xml Datei",
+    "App can't be installed because of not allowed code in the App" : "Die Applikation kann auf Grund von unerlaubtem Code nicht installiert werden",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
+    "Application is not enabled" : "Die Anwendung ist nicht aktiviert",
+    "Authentication error" : "Fehler bei der Anmeldung",
+    "Token expired. Please reload page." : "Token abgelaufen. Bitte lade die Seite neu.",
+    "Unknown user" : "Unbekannter Benutzer",
+    "%s enter the database username." : "%s gib den Datenbank-Benutzernamen an.",
+    "%s enter the database name." : "%s gib 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 Password ungültig: %s",
+    "You need to enter either an existing account or the administrator." : "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
+    "DB Error: \"%s\"" : "DB Fehler: \"%s\"",
+    "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
+    "Drop this user from MySQL/MariaDB" : "Lösche diesen Benutzer von MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
+    "Drop this user from MySQL/MariaDB." : "Lösche diesen Benutzer von MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt 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",
+    "Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder beschreiben werden",
+    "%s shared »%s« with you" : "%s teilte »%s« mit Dir",
+    "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
+    "You are not allowed to share %s" : "Die Freigabe von %s ist Dir nicht erlaubt",
+    "Sharing %s failed, because the user %s is the item owner" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
+    "Share type %s is not valid for %s" : "Freigabetyp %s ist nicht gültig für %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
+    "Setting permissions for %s failed, because the item was not found" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ablaufdatum kann nicht gesetzt werden. Freigaben können nach dem Teilen, nicht länger als %s gültig sein.",
+    "Cannot set expiration date. Expiration date is in the past" : "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden",
+    "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden",
+    "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden",
+    "Sharing %s failed, because the user %s is the original sharer" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten",
+    "Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist",
+    "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.",
+    "seconds ago" : "Gerade eben",
+    "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"],
+    "_%n hour ago_::_%n hours ago_" : ["Vor %n Stunde","Vor %n Stunden"],
+    "today" : "Heute",
+    "yesterday" : "Gestern",
+    "_%n day go_::_%n days ago_" : ["Vor %n Tag","Vor %n Tagen"],
+    "last month" : "Letzten Monat",
+    "_%n month ago_::_%n months ago_" : ["Vor %n Monat","Vor %n Monaten"],
+    "last year" : "Letztes Jahr",
+    "years ago" : "Vor Jahren",
+    "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",
+    "The username is already being used" : "Dieser Benutzername existiert bereits",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL, oder PostgreSQL) installiert.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.",
+    "Cannot write into \"config\" directory" : "Das Schreiben in das \"config\"-Verzeichnis nicht möglich",
+    "Cannot write into \"apps\" directory" : "Das Schreiben in das \"apps\"-Verzeichnis nicht möglich",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.",
+    "Cannot create \"data\" directory (%s)" : "Das Erstellen des \"data\"-Verzeichnisses nicht möglich (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.",
+    "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen",
+    "Please install one of these locales on your system and restart your webserver." : "Bitte installiere eine dieser Sprachen auf Deinem System und starte den Webserver neu.",
+    "Please ask your server administrator to install the module." : "Bitte frage, für die Installation des Moduls, Deinen Server-Administrator.",
+    "PHP module %s not installed." : "PHP-Modul %s nicht installiert.",
+    "PHP %s or higher is required." : "PHP %s oder höher wird benötigt.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bitte frage zur Aktualisierung von PHP auf die letzte Version Deinen Server-Administrator. Deine PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP-Sicherheitsmodus ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Der PHP-Sicherheitsmodus ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte frage Deinen Server-Administrator zur Deaktivierung in der php.ini oder Deiner Webserver-Konfiguration.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte frage Deinen Server-Administrator zur Deaktivierung in der php.ini oder Deiner Webserver-Konfiguration.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
+    "Please ask your server administrator to restart the web server." : "Bitte frage Deinen Server-Administrator zum Neustart des Webservers.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 benötigt",
+    "Please upgrade your database version" : "Bitte aktualisiere Deine Datenbankversion",
+    "Error occurred while checking PostgreSQL version" : "Es ist ein Fehler beim Prüfen der PostgreSQL-Version aufgetreten",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Stelle bitte sicher, dass Du PostgreSQL >= 9 verwendest oder prüfe die Logs für weitere Informationen über den Fehler",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändere die Berechtigungen auf 0770 sodass das Verzeichnis nicht von anderen Nutzer angezeigt werden kann.",
+    "Data directory (%s) is readable by other users" : "Daten-Verzeichnis (%s) ist von anderen Nutzern lesbar",
+    "Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) ist ungültig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stelle sicher, dass das Daten-Verzeichnis eine Datei namens \".ocdata\" im Wurzelverzeichnis enthält.",
+    "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf \"%s\" konnte nicht ermittelt werden."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
new file mode 100644
index 00000000000..27dd6781ae7
--- /dev/null
+++ b/lib/l10n/de.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Das Schreiben in das \"config\"-Verzeichnis nicht möglich!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dies kann normalerweise repariert werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird",
+    "See %s" : "Siehe %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das config-Verzeichnis %s gegeben wird.",
+    "Sample configuration detected" : "Beispielkonfiguration gefunden",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde, Dies wird nicht unterstützt kann zum Abruch Ihrer Installation führen. Bitte lese die Dokumentation vor der Änderung an der config.php.",
+    "Help" : "Hilfe",
+    "Personal" : "Persönlich",
+    "Settings" : "Einstellungen",
+    "Users" : "Benutzer",
+    "Admin" : "Administration",
+    "Recommended" : "Empfohlen",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Applikation \\\"%s\\\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
+    "No app name specified" : "Es wurde kein Applikation-Name angegeben",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "web services under your control" : "Web-Services unter Deiner Kontrolle",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Archive vom Typ %s werden nicht unterstützt",
+    "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
+    "App does not provide an info.xml file" : "Die Applikation enthält keine info,xml Datei",
+    "App can't be installed because of not allowed code in the App" : "Die Applikation kann auf Grund von unerlaubtem Code nicht installiert werden",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
+    "Application is not enabled" : "Die Anwendung ist nicht aktiviert",
+    "Authentication error" : "Fehler bei der Anmeldung",
+    "Token expired. Please reload page." : "Token abgelaufen. Bitte lade die Seite neu.",
+    "Unknown user" : "Unbekannter Benutzer",
+    "%s enter the database username." : "%s gib den Datenbank-Benutzernamen an.",
+    "%s enter the database name." : "%s gib 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 Password ungültig: %s",
+    "You need to enter either an existing account or the administrator." : "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
+    "DB Error: \"%s\"" : "DB Fehler: \"%s\"",
+    "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
+    "Drop this user from MySQL/MariaDB" : "Lösche diesen Benutzer von MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
+    "Drop this user from MySQL/MariaDB." : "Lösche diesen Benutzer von MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt 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",
+    "Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder beschreiben werden",
+    "%s shared »%s« with you" : "%s teilte »%s« mit Dir",
+    "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
+    "You are not allowed to share %s" : "Die Freigabe von %s ist Dir nicht erlaubt",
+    "Sharing %s failed, because the user %s is the item owner" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
+    "Share type %s is not valid for %s" : "Freigabetyp %s ist nicht gültig für %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
+    "Setting permissions for %s failed, because the item was not found" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ablaufdatum kann nicht gesetzt werden. Freigaben können nach dem Teilen, nicht länger als %s gültig sein.",
+    "Cannot set expiration date. Expiration date is in the past" : "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden",
+    "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden",
+    "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden",
+    "Sharing %s failed, because the user %s is the original sharer" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten",
+    "Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist",
+    "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.",
+    "seconds ago" : "Gerade eben",
+    "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"],
+    "_%n hour ago_::_%n hours ago_" : ["Vor %n Stunde","Vor %n Stunden"],
+    "today" : "Heute",
+    "yesterday" : "Gestern",
+    "_%n day go_::_%n days ago_" : ["Vor %n Tag","Vor %n Tagen"],
+    "last month" : "Letzten Monat",
+    "_%n month ago_::_%n months ago_" : ["Vor %n Monat","Vor %n Monaten"],
+    "last year" : "Letztes Jahr",
+    "years ago" : "Vor Jahren",
+    "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",
+    "The username is already being used" : "Dieser Benutzername existiert bereits",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL, oder PostgreSQL) installiert.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.",
+    "Cannot write into \"config\" directory" : "Das Schreiben in das \"config\"-Verzeichnis nicht möglich",
+    "Cannot write into \"apps\" directory" : "Das Schreiben in das \"apps\"-Verzeichnis nicht möglich",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.",
+    "Cannot create \"data\" directory (%s)" : "Das Erstellen des \"data\"-Verzeichnisses nicht möglich (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.",
+    "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen",
+    "Please install one of these locales on your system and restart your webserver." : "Bitte installiere eine dieser Sprachen auf Deinem System und starte den Webserver neu.",
+    "Please ask your server administrator to install the module." : "Bitte frage, für die Installation des Moduls, Deinen Server-Administrator.",
+    "PHP module %s not installed." : "PHP-Modul %s nicht installiert.",
+    "PHP %s or higher is required." : "PHP %s oder höher wird benötigt.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bitte frage zur Aktualisierung von PHP auf die letzte Version Deinen Server-Administrator. Deine PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP-Sicherheitsmodus ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Der PHP-Sicherheitsmodus ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte frage Deinen Server-Administrator zur Deaktivierung in der php.ini oder Deiner Webserver-Konfiguration.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte frage Deinen Server-Administrator zur Deaktivierung in der php.ini oder Deiner Webserver-Konfiguration.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
+    "Please ask your server administrator to restart the web server." : "Bitte frage Deinen Server-Administrator zum Neustart des Webservers.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 benötigt",
+    "Please upgrade your database version" : "Bitte aktualisiere Deine Datenbankversion",
+    "Error occurred while checking PostgreSQL version" : "Es ist ein Fehler beim Prüfen der PostgreSQL-Version aufgetreten",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Stelle bitte sicher, dass Du PostgreSQL >= 9 verwendest oder prüfe die Logs für weitere Informationen über den Fehler",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändere die Berechtigungen auf 0770 sodass das Verzeichnis nicht von anderen Nutzer angezeigt werden kann.",
+    "Data directory (%s) is readable by other users" : "Daten-Verzeichnis (%s) ist von anderen Nutzern lesbar",
+    "Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) ist ungültig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stelle sicher, dass das Daten-Verzeichnis eine Datei namens \".ocdata\" im Wurzelverzeichnis enthält.",
+    "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf \"%s\" konnte nicht ermittelt werden."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
deleted file mode 100644
index ac359e34f52..00000000000
--- a/lib/l10n/de.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Das Schreiben in das \"config\"-Verzeichnis nicht möglich!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Dies kann normalerweise repariert werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird",
-"See %s" => "Siehe %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das config-Verzeichnis %s gegeben wird.",
-"Sample configuration detected" => "Beispielkonfiguration gefunden",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde, Dies wird nicht unterstützt kann zum Abruch Ihrer Installation führen. Bitte lese die Dokumentation vor der Änderung an der config.php.",
-"Help" => "Hilfe",
-"Personal" => "Persönlich",
-"Settings" => "Einstellungen",
-"Users" => "Benutzer",
-"Admin" => "Administration",
-"Recommended" => "Empfohlen",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Applikation \\\"%s\\\" kann nicht installiert werden, da sie mit dieser ownCloud Version nicht kompatibel ist.",
-"No app name specified" => "Es wurde kein Applikation-Name angegeben",
-"Unknown filetype" => "Unbekannter Dateityp",
-"Invalid image" => "Ungültiges Bild",
-"web services under your control" => "Web-Services unter Deiner Kontrolle",
-"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",
-"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",
-"Archives of type %s are not supported" => "Archive vom Typ %s werden nicht unterstützt",
-"Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
-"App does not provide an info.xml file" => "Die Applikation enthält keine info,xml Datei",
-"App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubtem Code nicht installiert werden",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
-"Application is not enabled" => "Die Anwendung ist nicht aktiviert",
-"Authentication error" => "Fehler bei der Anmeldung",
-"Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
-"Unknown user" => "Unbekannter Benutzer",
-"%s enter the database username." => "%s gib den Datenbank-Benutzernamen an.",
-"%s enter the database name." => "%s gib 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 Password ungültig: %s",
-"You need to enter either an existing account or the administrator." => "Du musst entweder ein existierendes Benutzerkonto oder das Administratoren-Konto angeben.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
-"DB Error: \"%s\"" => "DB Fehler: \"%s\"",
-"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
-"Drop this user from MySQL/MariaDB" => "Lösche diesen Benutzer von MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL/MariaDB." => "Lösche diesen Benutzer von MySQL/MariaDB.",
-"Oracle connection could not be established" => "Es konnte keine Verbindung zur Oracle-Datenbank hergestellt 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",
-"Can't create or write into the data directory %s" => "Das Datenverzeichnis %s kann nicht erstellt oder beschreiben werden",
-"%s shared »%s« with you" => "%s teilte »%s« mit Dir",
-"Sharing %s failed, because the file does not exist" => "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
-"You are not allowed to share %s" => "Die Freigabe von %s ist Dir nicht erlaubt",
-"Sharing %s failed, because the user %s is the item owner" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
-"Share type %s is not valid for %s" => "Freigabetyp %s ist nicht gültig für %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
-"Setting permissions for %s failed, because the item was not found" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Ablaufdatum kann nicht gesetzt werden. Freigaben können nach dem Teilen, nicht länger als %s gültig sein.",
-"Cannot set expiration date. Expiration date is in the past" => "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden",
-"Sharing backend %s not found" => "Freigabe-Backend %s nicht gefunden",
-"Sharing backend for %s not found" => "Freigabe-Backend für %s nicht gefunden",
-"Sharing %s failed, because the user %s is the original sharer" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten",
-"Sharing %s failed, because resharing is not allowed" => "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist",
-"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.",
-"seconds ago" => "Gerade eben",
-"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
-"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
-"today" => "Heute",
-"yesterday" => "Gestern",
-"_%n day go_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"),
-"last month" => "Letzten Monat",
-"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
-"last year" => "Letztes Jahr",
-"years ago" => "Vor Jahren",
-"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",
-"The username is already being used" => "Dieser Benutzername existiert bereits",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Keine Datenbanktreiber (SQLite, MYSQL, oder PostgreSQL) installiert.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.",
-"Cannot write into \"config\" directory" => "Das Schreiben in das \"config\"-Verzeichnis nicht möglich",
-"Cannot write into \"apps\" directory" => "Das Schreiben in das \"apps\"-Verzeichnis nicht möglich",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.",
-"Cannot create \"data\" directory (%s)" => "Das Erstellen des \"data\"-Verzeichnisses nicht möglich (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.",
-"Setting locale to %s failed" => "Das Setzen der Umgebungslokale auf %s fehlgeschlagen",
-"Please install one of these locales on your system and restart your webserver." => "Bitte installiere eine dieser Sprachen auf Deinem System und starte den Webserver neu.",
-"Please ask your server administrator to install the module." => "Bitte frage, für die Installation des Moduls, Deinen Server-Administrator.",
-"PHP module %s not installed." => "PHP-Modul %s nicht installiert.",
-"PHP %s or higher is required." => "PHP %s oder höher wird benötigt.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Bitte frage zur Aktualisierung von PHP auf die letzte Version Deinen Server-Administrator. Deine PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP-Sicherheitsmodus ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Der PHP-Sicherheitsmodus ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte frage Deinen Server-Administrator zur Deaktivierung in der php.ini oder Deiner Webserver-Konfiguration.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte frage Deinen Server-Administrator zur Deaktivierung in der php.ini oder Deiner Webserver-Konfiguration.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
-"Please ask your server administrator to restart the web server." => "Bitte frage Deinen Server-Administrator zum Neustart des Webservers.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 benötigt",
-"Please upgrade your database version" => "Bitte aktualisiere Deine Datenbankversion",
-"Error occurred while checking PostgreSQL version" => "Es ist ein Fehler beim Prüfen der PostgreSQL-Version aufgetreten",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Stelle bitte sicher, dass Du PostgreSQL >= 9 verwendest oder prüfe die Logs für weitere Informationen über den Fehler",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Bitte ändere die Berechtigungen auf 0770 sodass das Verzeichnis nicht von anderen Nutzer angezeigt werden kann.",
-"Data directory (%s) is readable by other users" => "Daten-Verzeichnis (%s) ist von anderen Nutzern lesbar",
-"Data directory (%s) is invalid" => "Daten-Verzeichnis (%s) ist ungültig",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Bitte stelle sicher, dass das Daten-Verzeichnis eine Datei namens \".ocdata\" im Wurzelverzeichnis enthält.",
-"Could not obtain lock type %d on \"%s\"." => "Sperrtyp %d auf \"%s\" konnte nicht ermittelt werden."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_AT.js b/lib/l10n/de_AT.js
new file mode 100644
index 00000000000..c36f0b9371d
--- /dev/null
+++ b/lib/l10n/de_AT.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Hilfe",
+    "Personal" : "Persönlich",
+    "Settings" : "Einstellungen",
+    "_%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/de_AT.json b/lib/l10n/de_AT.json
new file mode 100644
index 00000000000..da5c7feaad2
--- /dev/null
+++ b/lib/l10n/de_AT.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Help" : "Hilfe",
+    "Personal" : "Persönlich",
+    "Settings" : "Einstellungen",
+    "_%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/de_AT.php b/lib/l10n/de_AT.php
deleted file mode 100644
index 58f78490d7f..00000000000
--- a/lib/l10n/de_AT.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Hilfe",
-"Personal" => "Persönlich",
-"Settings" => "Einstellungen",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_CH.js b/lib/l10n/de_CH.js
new file mode 100644
index 00000000000..c8b1181dc9b
--- /dev/null
+++ b/lib/l10n/de_CH.js
@@ -0,0 +1,44 @@
+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",
+    "_%n minute ago_::_%n minutes ago_" : ["","Vor %n Minuten"],
+    "_%n hour ago_::_%n hours ago_" : ["","Vor %n Stunden"],
+    "today" : "Heute",
+    "yesterday" : "Gestern",
+    "_%n day go_::_%n days ago_" : ["","Vor %n Tagen"],
+    "last month" : "Letzten Monat",
+    "_%n month ago_::_%n months ago_" : ["","Vor %n Monaten"],
+    "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
new file mode 100644
index 00000000000..468f2a175b9
--- /dev/null
+++ b/lib/l10n/de_CH.json
@@ -0,0 +1,42 @@
+{ "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",
+    "_%n minute ago_::_%n minutes ago_" : ["","Vor %n Minuten"],
+    "_%n hour ago_::_%n hours ago_" : ["","Vor %n Stunden"],
+    "today" : "Heute",
+    "yesterday" : "Gestern",
+    "_%n day go_::_%n days ago_" : ["","Vor %n Tagen"],
+    "last month" : "Letzten Monat",
+    "_%n month ago_::_%n months ago_" : ["","Vor %n Monaten"],
+    "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/de_CH.php b/lib/l10n/de_CH.php
deleted file mode 100644
index 7da33218774..00000000000
--- a/lib/l10n/de_CH.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"_%n minute ago_::_%n minutes ago_" => array("","Vor %n Minuten"),
-"_%n hour ago_::_%n hours ago_" => array("","Vor %n Stunden"),
-"today" => "Heute",
-"yesterday" => "Gestern",
-"_%n day go_::_%n days ago_" => array("","Vor %n Tagen"),
-"last month" => "Letzten Monat",
-"_%n month ago_::_%n months ago_" => array("","Vor %n Monaten"),
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
new file mode 100644
index 00000000000..48f236f3e04
--- /dev/null
+++ b/lib/l10n/de_DE.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Das Schreiben in das »config«-Verzeichnis nicht möglich!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dies kann normalerweise repariert werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird",
+    "See %s" : "Siehe %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das config-Verzeichnis %s gegeben wird.",
+    "Sample configuration detected" : "Beispielkonfiguration gefunden",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde, Dies wird nicht unterstützt kann zum Abruch Ihrer Installation führen. Bitte lesen Sie die Dokumentation vor der Änderung an der config.php.",
+    "Help" : "Hilfe",
+    "Personal" : "Persönlich",
+    "Settings" : "Einstellungen",
+    "Users" : "Benutzer",
+    "Admin" : "Administrator",
+    "Recommended" : "Empfohlen",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App »%s« kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.",
+    "No app name specified" : "Es wurde kein Applikation-Name angegeben",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "web services under your control" : "Web-Services unter Ihrer Kontrolle",
+    "App directory already exists" : "Der Ordner für die Anwendung ist bereits vorhanden.",
+    "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %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" : "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
+    "No path specified when installing app from local file" : "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
+    "Archives of type %s are not supported" : "Archive des Typs %s werden nicht unterstützt.",
+    "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
+    "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei",
+    "App can't be installed because of not allowed code in the App" : "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
+    "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.",
+    "Unknown user" : "Unbekannter Benutzer",
+    "%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.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
+    "DB Error: \"%s\"" : "DB Fehler: \"%s\"",
+    "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
+    "Drop this user from MySQL/MariaDB" : "Löschen Sie diesen Benutzer von MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
+    "Drop this user from MySQL/MariaDB." : "Löschen Sie diesen Benutzer von MySQL/MariaDB.",
+    "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",
+    "Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder beschreiben werden",
+    "%s shared »%s« with you" : "%s hat »%s« mit Ihnen geteilt",
+    "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
+    "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
+    "Sharing %s failed, because the user %s is the item owner" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
+    "Share type %s is not valid for %s" : "Freigabetyp %s ist nicht gültig für %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
+    "Setting permissions for %s failed, because the item was not found" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ablaufdatum kann nicht gesetzt werden. Freigaben können nach dem Teilen, nicht länger als %s gültig sein.",
+    "Cannot set expiration date. Expiration date is in the past" : "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden",
+    "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden",
+    "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden",
+    "Sharing %s failed, because the user %s is the original sharer" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten",
+    "Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist",
+    "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.",
+    "seconds ago" : "Gerade eben",
+    "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"],
+    "_%n hour ago_::_%n hours ago_" : ["Vor %n Stunde","Vor %n Stunden"],
+    "today" : "Heute",
+    "yesterday" : "Gestern",
+    "_%n day go_::_%n days ago_" : ["Vor %n Tag","Vor %n Tagen"],
+    "last month" : "Letzten Monat",
+    "_%n month ago_::_%n months ago_" : ["Vor %n Monat","Vor %n Monaten"],
+    "last year" : "Letztes Jahr",
+    "years ago" : "Vor  Jahren",
+    "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",
+    "The username is already being used" : "Der Benutzername existiert bereits",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL, oder PostgreSQL) installiert.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.",
+    "Cannot write into \"config\" directory" : "Das Schreiben in das »config«-Verzeichnis ist nicht möglich",
+    "Cannot write into \"apps\" directory" : "Das Schreiben in das »apps«-Verzeichnis ist nicht möglich",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.",
+    "Cannot create \"data\" directory (%s)" : "Das Erstellen des »data«-Verzeichnisses ist nicht möglich (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.",
+    "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen",
+    "Please install one of these locales on your system and restart your webserver." : "Bitte installieren Sie eine dieser Sprachen auf Ihrem System und starten Sie den Webserver neu.",
+    "Please ask your server administrator to install the module." : "Bitte fragen Sie, für die Installation des Moduls, Ihren Server-Administrator.",
+    "PHP module %s not installed." : "PHP-Modul %s nicht installiert.",
+    "PHP %s or higher is required." : "PHP %s oder höher wird benötigt.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bitte fragen Sie zur Aktualisierung von PHP auf die letzte Version Ihren Server-Administrator. Ihre PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP-Sicherheitsmodus ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Der PHP-Sicherheitsmodus ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte fragen Sie Ihren Server-Administrator zur Deaktivierung in der php.ini oder Ihrer Webserver-Konfiguration.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte fragen Sie Ihren Server-Administrator zur Deaktivierung in der php.ini oder Ihrer Webserver-Konfiguration.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
+    "Please ask your server administrator to restart the web server." : "Bitte fragen Sie Ihren Server-Administrator zum Neustart des Webservers.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 benötigt",
+    "Please upgrade your database version" : "Bitte aktualisieren Sie Ihre Datenbankversion",
+    "Error occurred while checking PostgreSQL version" : "Es ist ein Fehler beim Prüfen der PostgreSQL-Version aufgetreten",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Stellen Sie sicher, dass Sie PostgreSQL >= 9 verwenden oder prüfen Sie die Logs für weitere Informationen über den Fehler",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändern Sie die Berechtigungen auf 0770 sodass das Verzeichnis nicht von anderen Nutzer angezeigt werden kann.",
+    "Data directory (%s) is readable by other users" : "Daten-Verzeichnis (%s) ist von anderen Nutzern lesbar",
+    "Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) ist ungültig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stellen Sie sicher, dass das Daten-Verzeichnis eine Datei namens \".ocdata\" im Wurzelverzeichnis enthält.",
+    "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf »%s« konnte nicht ermittelt werden."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
new file mode 100644
index 00000000000..e67d2ccc57c
--- /dev/null
+++ b/lib/l10n/de_DE.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Das Schreiben in das »config«-Verzeichnis nicht möglich!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dies kann normalerweise repariert werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird",
+    "See %s" : "Siehe %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das config-Verzeichnis %s gegeben wird.",
+    "Sample configuration detected" : "Beispielkonfiguration gefunden",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde, Dies wird nicht unterstützt kann zum Abruch Ihrer Installation führen. Bitte lesen Sie die Dokumentation vor der Änderung an der config.php.",
+    "Help" : "Hilfe",
+    "Personal" : "Persönlich",
+    "Settings" : "Einstellungen",
+    "Users" : "Benutzer",
+    "Admin" : "Administrator",
+    "Recommended" : "Empfohlen",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App »%s« kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.",
+    "No app name specified" : "Es wurde kein Applikation-Name angegeben",
+    "Unknown filetype" : "Unbekannter Dateityp",
+    "Invalid image" : "Ungültiges Bild",
+    "web services under your control" : "Web-Services unter Ihrer Kontrolle",
+    "App directory already exists" : "Der Ordner für die Anwendung ist bereits vorhanden.",
+    "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %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" : "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
+    "No path specified when installing app from local file" : "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
+    "Archives of type %s are not supported" : "Archive des Typs %s werden nicht unterstützt.",
+    "Failed to open archive when installing app" : "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
+    "App does not provide an info.xml file" : "Die Applikation enthält keine info.xml Datei",
+    "App can't be installed because of not allowed code in the App" : "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
+    "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.",
+    "Unknown user" : "Unbekannter Benutzer",
+    "%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.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
+    "DB Error: \"%s\"" : "DB Fehler: \"%s\"",
+    "Offending command was: \"%s\"" : "Fehlerhafter Befehl war: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
+    "Drop this user from MySQL/MariaDB" : "Löschen Sie diesen Benutzer von MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
+    "Drop this user from MySQL/MariaDB." : "Löschen Sie diesen Benutzer von MySQL/MariaDB.",
+    "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",
+    "Can't create or write into the data directory %s" : "Das Datenverzeichnis %s kann nicht erstellt oder beschreiben werden",
+    "%s shared »%s« with you" : "%s hat »%s« mit Ihnen geteilt",
+    "Sharing %s failed, because the file does not exist" : "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
+    "You are not allowed to share %s" : "Die Freigabe von %s ist Ihnen nicht erlaubt",
+    "Sharing %s failed, because the user %s is the item owner" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
+    "Share type %s is not valid for %s" : "Freigabetyp %s ist nicht gültig für %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
+    "Setting permissions for %s failed, because the item was not found" : "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ablaufdatum kann nicht gesetzt werden. Freigaben können nach dem Teilen, nicht länger als %s gültig sein.",
+    "Cannot set expiration date. Expiration date is in the past" : "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden",
+    "Sharing backend %s not found" : "Freigabe-Backend %s nicht gefunden",
+    "Sharing backend for %s not found" : "Freigabe-Backend für %s nicht gefunden",
+    "Sharing %s failed, because the user %s is the original sharer" : "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten",
+    "Sharing %s failed, because resharing is not allowed" : "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist",
+    "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.",
+    "seconds ago" : "Gerade eben",
+    "_%n minute ago_::_%n minutes ago_" : ["Vor %n Minute","Vor %n Minuten"],
+    "_%n hour ago_::_%n hours ago_" : ["Vor %n Stunde","Vor %n Stunden"],
+    "today" : "Heute",
+    "yesterday" : "Gestern",
+    "_%n day go_::_%n days ago_" : ["Vor %n Tag","Vor %n Tagen"],
+    "last month" : "Letzten Monat",
+    "_%n month ago_::_%n months ago_" : ["Vor %n Monat","Vor %n Monaten"],
+    "last year" : "Letztes Jahr",
+    "years ago" : "Vor  Jahren",
+    "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",
+    "The username is already being used" : "Der Benutzername existiert bereits",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Keine Datenbanktreiber (SQLite, MYSQL, oder PostgreSQL) installiert.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.",
+    "Cannot write into \"config\" directory" : "Das Schreiben in das »config«-Verzeichnis ist nicht möglich",
+    "Cannot write into \"apps\" directory" : "Das Schreiben in das »apps«-Verzeichnis ist nicht möglich",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.",
+    "Cannot create \"data\" directory (%s)" : "Das Erstellen des »data«-Verzeichnisses ist nicht möglich (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.",
+    "Setting locale to %s failed" : "Das Setzen der Umgebungslokale auf %s fehlgeschlagen",
+    "Please install one of these locales on your system and restart your webserver." : "Bitte installieren Sie eine dieser Sprachen auf Ihrem System und starten Sie den Webserver neu.",
+    "Please ask your server administrator to install the module." : "Bitte fragen Sie, für die Installation des Moduls, Ihren Server-Administrator.",
+    "PHP module %s not installed." : "PHP-Modul %s nicht installiert.",
+    "PHP %s or higher is required." : "PHP %s oder höher wird benötigt.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Bitte fragen Sie zur Aktualisierung von PHP auf die letzte Version Ihren Server-Administrator. Ihre PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP-Sicherheitsmodus ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Der PHP-Sicherheitsmodus ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte fragen Sie Ihren Server-Administrator zur Deaktivierung in der php.ini oder Ihrer Webserver-Konfiguration.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte fragen Sie Ihren Server-Administrator zur Deaktivierung in der php.ini oder Ihrer Webserver-Konfiguration.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
+    "Please ask your server administrator to restart the web server." : "Bitte fragen Sie Ihren Server-Administrator zum Neustart des Webservers.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 benötigt",
+    "Please upgrade your database version" : "Bitte aktualisieren Sie Ihre Datenbankversion",
+    "Error occurred while checking PostgreSQL version" : "Es ist ein Fehler beim Prüfen der PostgreSQL-Version aufgetreten",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Stellen Sie sicher, dass Sie PostgreSQL >= 9 verwenden oder prüfen Sie die Logs für weitere Informationen über den Fehler",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Bitte ändern Sie die Berechtigungen auf 0770 sodass das Verzeichnis nicht von anderen Nutzer angezeigt werden kann.",
+    "Data directory (%s) is readable by other users" : "Daten-Verzeichnis (%s) ist von anderen Nutzern lesbar",
+    "Data directory (%s) is invalid" : "Daten-Verzeichnis (%s) ist ungültig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Bitte stellen Sie sicher, dass das Daten-Verzeichnis eine Datei namens \".ocdata\" im Wurzelverzeichnis enthält.",
+    "Could not obtain lock type %d on \"%s\"." : "Sperrtyp %d auf »%s« konnte nicht ermittelt werden."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
deleted file mode 100644
index 006f28d6066..00000000000
--- a/lib/l10n/de_DE.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Das Schreiben in das »config«-Verzeichnis nicht möglich!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Dies kann normalerweise repariert werden, indem dem Webserver Schreibzugriff auf das config-Verzeichnis gegeben wird",
-"See %s" => "Siehe %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das config-Verzeichnis %s gegeben wird.",
-"Sample configuration detected" => "Beispielkonfiguration gefunden",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Es wurde festgestellt, dass die Beispielkonfiguration kopiert wurde, Dies wird nicht unterstützt kann zum Abruch Ihrer Installation führen. Bitte lesen Sie die Dokumentation vor der Änderung an der config.php.",
-"Help" => "Hilfe",
-"Personal" => "Persönlich",
-"Settings" => "Einstellungen",
-"Users" => "Benutzer",
-"Admin" => "Administrator",
-"Recommended" => "Empfohlen",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App »%s« kann nicht installiert werden, da sie mit dieser ownCloud-Version nicht kompatibel ist.",
-"No app name specified" => "Es wurde kein Applikation-Name angegeben",
-"Unknown filetype" => "Unbekannter Dateityp",
-"Invalid image" => "Ungültiges Bild",
-"web services under your control" => "Web-Services unter Ihrer Kontrolle",
-"App directory already exists" => "Der Ordner für die Anwendung ist bereits vorhanden.",
-"Can't create app folder. Please fix permissions. %s" => "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %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" => "Der Link (href) wurde nicht angegeben um die Applikation per http zu installieren",
-"No path specified when installing app from local file" => "Bei der Installation der Applikation aus einer lokalen Datei wurde kein Pfad angegeben",
-"Archives of type %s are not supported" => "Archive des Typs %s werden nicht unterstützt.",
-"Failed to open archive when installing app" => "Das Archiv konnte bei der Installation der Applikation nicht geöffnet werden",
-"App does not provide an info.xml file" => "Die Applikation enthält keine info.xml Datei",
-"App can't be installed because of not allowed code in the App" => "Die Applikation kann auf Grund von unerlaubten Code nicht installiert werden",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Die Anwendung konnte nicht installiert werden, weil Sie nicht mit dieser Version von ownCloud kompatibel ist.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Die Applikation konnte nicht installiert werden, da diese das <shipped>true</shipped> Tag beinhaltet und dieses, bei nicht mitausgelieferten Applikationen, nicht erlaubt ist ist",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Die Applikation konnte nicht installiert werden, da die Version in der info.xml nicht die gleiche Version wie im App-Store ist",
-"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.",
-"Unknown user" => "Unbekannter Benutzer",
-"%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.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB Benutzername und/oder Passwort sind nicht gültig",
-"DB Error: \"%s\"" => "DB Fehler: \"%s\"",
-"Offending command was: \"%s\"" => "Fehlerhafter Befehl war: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB Benutzer '%s'@'localhost' existiert bereits.",
-"Drop this user from MySQL/MariaDB" => "Löschen Sie diesen Benutzer von MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB Benutzer '%s'@'%%' existiert bereits",
-"Drop this user from MySQL/MariaDB." => "Löschen Sie diesen Benutzer von MySQL/MariaDB.",
-"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",
-"Can't create or write into the data directory %s" => "Das Datenverzeichnis %s kann nicht erstellt oder beschreiben werden",
-"%s shared »%s« with you" => "%s hat »%s« mit Ihnen geteilt",
-"Sharing %s failed, because the file does not exist" => "Freigabe von %s fehlgeschlagen, da die Datei nicht existiert",
-"You are not allowed to share %s" => "Die Freigabe von %s ist Ihnen nicht erlaubt",
-"Sharing %s failed, because the user %s is the item owner" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s Besitzer des Objektes ist",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Freigabe von %s fehlgeschlagen, da das Teilen von Verknüpfungen nicht erlaubt ist",
-"Share type %s is not valid for %s" => "Freigabetyp %s ist nicht gültig für %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da die Berechtigungen, die erteilten Berechtigungen %s überschreiten",
-"Setting permissions for %s failed, because the item was not found" => "Das Setzen der Berechtigungen für %s ist fehlgeschlagen, da das Objekt nicht gefunden wurde",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Ablaufdatum kann nicht gesetzt werden. Freigaben können nach dem Teilen, nicht länger als %s gültig sein.",
-"Cannot set expiration date. Expiration date is in the past" => "Ablaufdatum kann nicht gesetzt werden. Ablaufdatum liegt in der Vergangenheit.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Freigabe-Backend %s muss in der OCP\\Share_Backend - Schnittstelle implementiert werden",
-"Sharing backend %s not found" => "Freigabe-Backend %s nicht gefunden",
-"Sharing backend for %s not found" => "Freigabe-Backend für %s nicht gefunden",
-"Sharing %s failed, because the user %s is the original sharer" => "Freigabe von %s fehlgeschlagen, da der Nutzer %s der offizielle Freigeber ist",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Freigabe von %s fehlgeschlagen, da die Berechtigungen die erteilten Berechtigungen %s überschreiten",
-"Sharing %s failed, because resharing is not allowed" => "Freigabe von %s fehlgeschlagen, da das nochmalige Freigeben einer Freigabe nicht erlaubt ist",
-"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.",
-"seconds ago" => "Gerade eben",
-"_%n minute ago_::_%n minutes ago_" => array("Vor %n Minute","Vor %n Minuten"),
-"_%n hour ago_::_%n hours ago_" => array("Vor %n Stunde","Vor %n Stunden"),
-"today" => "Heute",
-"yesterday" => "Gestern",
-"_%n day go_::_%n days ago_" => array("Vor %n Tag","Vor %n Tagen"),
-"last month" => "Letzten Monat",
-"_%n month ago_::_%n months ago_" => array("Vor %n Monat","Vor %n Monaten"),
-"last year" => "Letztes Jahr",
-"years ago" => "Vor  Jahren",
-"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",
-"The username is already being used" => "Der Benutzername existiert bereits",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Keine Datenbanktreiber (SQLite, MYSQL, oder PostgreSQL) installiert.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Berechtigungen können normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Wurzelverzeichnis %s gegeben wird.",
-"Cannot write into \"config\" directory" => "Das Schreiben in das »config«-Verzeichnis ist nicht möglich",
-"Cannot write into \"apps\" directory" => "Das Schreiben in das »apps«-Verzeichnis ist nicht möglich",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Dies kann normalerweise repariert werden, indem dem Webserver %s Schreibzugriff auf das Anwendungsverzeichnis %s gegeben wird oder die Anwendungsauswahl in der Konfigurationsdatei deaktiviert wird.",
-"Cannot create \"data\" directory (%s)" => "Das Erstellen des »data«-Verzeichnisses ist nicht möglich (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dies kann normalerweise repariert werden, indem dem Webserver <a href=\"%s\" target=\"_blank\" Schreibzugriff auf das Wurzelverzeichnis gegeben wird</a>.",
-"Setting locale to %s failed" => "Das Setzen der Umgebungslokale auf %s fehlgeschlagen",
-"Please install one of these locales on your system and restart your webserver." => "Bitte installieren Sie eine dieser Sprachen auf Ihrem System und starten Sie den Webserver neu.",
-"Please ask your server administrator to install the module." => "Bitte fragen Sie, für die Installation des Moduls, Ihren Server-Administrator.",
-"PHP module %s not installed." => "PHP-Modul %s nicht installiert.",
-"PHP %s or higher is required." => "PHP %s oder höher wird benötigt.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Bitte fragen Sie zur Aktualisierung von PHP auf die letzte Version Ihren Server-Administrator. Ihre PHP-Version wird nicht länger durch ownCloud und der PHP-Gemeinschaft unterstützt.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP-Sicherheitsmodus ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Der PHP-Sicherheitsmodus ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte fragen Sie Ihren Server-Administrator zur Deaktivierung in der php.ini oder Ihrer Webserver-Konfiguration.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes ist aktiviert. ownCloud benötigt für eine korrekte Funktion eine Deaktivierung von diesem Modus.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes ist eine veraltete und meist nutzlose Einstellung, die deaktiviert  werden sollte. Bitte fragen Sie Ihren Server-Administrator zur Deaktivierung in der php.ini oder Ihrer Webserver-Konfiguration.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP-Module wurden installiert, werden aber als noch fehlend gelistet?",
-"Please ask your server administrator to restart the web server." => "Bitte fragen Sie Ihren Server-Administrator zum Neustart des Webservers.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 benötigt",
-"Please upgrade your database version" => "Bitte aktualisieren Sie Ihre Datenbankversion",
-"Error occurred while checking PostgreSQL version" => "Es ist ein Fehler beim Prüfen der PostgreSQL-Version aufgetreten",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Stellen Sie sicher, dass Sie PostgreSQL >= 9 verwenden oder prüfen Sie die Logs für weitere Informationen über den Fehler",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Bitte ändern Sie die Berechtigungen auf 0770 sodass das Verzeichnis nicht von anderen Nutzer angezeigt werden kann.",
-"Data directory (%s) is readable by other users" => "Daten-Verzeichnis (%s) ist von anderen Nutzern lesbar",
-"Data directory (%s) is invalid" => "Daten-Verzeichnis (%s) ist ungültig",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Bitte stellen Sie sicher, dass das Daten-Verzeichnis eine Datei namens \".ocdata\" im Wurzelverzeichnis enthält.",
-"Could not obtain lock type %d on \"%s\"." => "Sperrtyp %d auf »%s« konnte nicht ermittelt werden."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/el.js b/lib/l10n/el.js
new file mode 100644
index 00000000000..5d0048837fb
--- /dev/null
+++ b/lib/l10n/el.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Αδυναμία εγγραφής στον κατάλογο \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Αυτό μπορεί συνήθως να διορθωθεί παρέχοντας δικαιώματα εγγραφής για το φάκελο config στο διακομιστή δικτύου",
+    "See %s" : "Δείτε %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Αυτό μπορεί συνήθως να διορθωθεί %sπαρέχοντας δικαιώματα εγγραφής για το φάκελο config στο διακομιστή δικτύου%s.",
+    "Sample configuration detected" : "Ανιχνεύθηκε δείγμα εγκατάστασης",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Έχει ανιχνευθεί ότι το δείγμα εγκατάστασης έχει αντιγραφεί. Αυτό μπορεί να σπάσει την εγκατάστασή σας και δεν υποστηρίζεται. Παρακαλώ διαβάστε την τεκμηρίωση πριν εκτελέσετε αλλαγές στο config.php",
+    "Help" : "Βοήθεια",
+    "Personal" : "Προσωπικά",
+    "Settings" : "Ρυθμίσεις",
+    "Users" : "Χρήστες",
+    "Admin" : "Διαχείριση",
+    "Recommended" : "Προτείνεται",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση του ownCloud.",
+    "No app name specified" : "Δεν προδιορίστηκε όνομα εφαρμογής",
+    "Unknown filetype" : "Άγνωστος τύπος αρχείου",
+    "Invalid image" : "Μη έγκυρη εικόνα",
+    "web services under your control" : "υπηρεσίες δικτύου υπό τον έλεγχό σας",
+    "App directory already exists" : "Ο κατάλογος εφαρμογών υπάρχει ήδη",
+    "Can't create app folder. Please fix permissions. %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" : "Δεν προσδιορίστηκε μονοπάτι κατά την εγκατάσταση εφαρμογής από τοπικό αρχείο",
+    "Archives of type %s are not supported" : "Συλλογές αρχείων τύπου %s δεν υποστηρίζονται",
+    "Failed to open archive when installing app" : "Αποτυχία ανοίγματος συλλογής αρχείων κατά την εγκατάσταση εφαρμογής",
+    "App does not provide an info.xml file" : "Η εφαρμογή δεν παρέχει αρχείο info.xml",
+    "App can't be installed because of not allowed code in the App" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί λόγω μη-επιτρεπόμενου κώδικα μέσα στην Εφαρμογή",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή περιέχει την ετικέτα <shipped>σωστή</shipped> που δεν επιτρέπεται για μη-ενσωματωμένες εφαρμογές",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή η έκδοση στο info.xml/version δεν είναι η ίδια με την έκδοση που αναφέρεται στο κατάστημα εφαρμογών",
+    "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 μάλλον δεν χρησιμοποιείτε τελείες στο όνομα της βάσης δεδομένων",
+    "MS SQL username and/or password not valid: %s" : "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s",
+    "You need to enter either an existing account or the administrator." : "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή.",
+    "MySQL/MariaDB username and/or password not valid" : "Μη έγκυρο όνομα χρήστη ή/και συνθηματικό της MySQL/MariaDB",
+    "DB Error: \"%s\"" : "Σφάλμα Βάσης Δεδομένων: \"%s\"",
+    "Offending command was: \"%s\"" : "Η εντολη παραβατικοτητας ηταν: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL/MariaDB",
+    "Drop this user from MySQL/MariaDB" : "Κατάργηση του χρήστη από MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Υπάρχει ήδη ο χρήστης '%s'@'%%' της MySQL/MariaDB",
+    "Drop this user from MySQL/MariaDB." : "Κατάργηση του χρήστη από MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Αδυναμία σύνδεσης Oracle",
+    "Oracle username and/or password not valid" : "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s",
+    "PostgreSQL username and/or password not valid" : "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
+    "Set an admin username." : "Εισάγετε όνομα χρήστη διαχειριστή.",
+    "Set an admin password." : "Εισάγετε συνθηματικό διαχειριστή.",
+    "Can't create or write into the data directory %s" : "Αδύνατη η δημιουργία ή συγγραφή στον κατάλογο δεδομένων %s",
+    "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s είναι ο ιδιοκτήτης του αντικειμένου",
+    "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 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" : "Πρέπει να εισάγετε έναν κωδικό για να δημιουργήσετε έναν δημόσιο σύνδεσμο. Μόνο προστατευμένοι σύνδεσμοι επιτρέπονται",
+    "Sharing %s failed, because sharing with links is not allowed" : "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο διαμοιρασμός με συνδέσμους",
+    "Share type %s is not valid for %s" : "Ο τύπος διαμοιρασμού %s δεν είναι έγκυρος για το %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s",
+    "Setting permissions for %s failed, because the item was not found" : "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί το αντικείμενο δεν βρέθηκε",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Δεν μπορεί να οριστεί ημερομηνία λήξης. Οι κοινοποιήσεις δεν μπορεί να λήγουν αργότερα από %s αφού έχουν διαμοιραστεί.",
+    "Cannot set expiration date. Expiration date is in the past" : "Δεν μπορεί να οριστεί ημερομηνία λήξης. Η ημερομηνία λήξης είναι στο παρελθόν",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Το σύστημα διαμοιρασμού %s πρέπει να υλοποιεί την διεπαφή OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Το σύστημα διαμοιρασμού %s δεν βρέθηκε",
+    "Sharing backend for %s not found" : "Το σύστημα διαμοιρασμού για το %s δεν βρέθηκε",
+    "Sharing %s failed, because the user %s is the original sharer" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο αρχικά από τον χρήστη %s",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s",
+    "Sharing %s failed, because resharing is not allowed" : "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο επαναδιαμοιρασμός",
+    "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\"",
+    "seconds ago" : "δευτερόλεπτα πριν",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n λεπτά πριν"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n ώρες πριν"],
+    "today" : "σήμερα",
+    "yesterday" : "χτες",
+    "_%n day go_::_%n days ago_" : ["","%n ημέρες πριν"],
+    "last month" : "τελευταίο μήνα",
+    "_%n month ago_::_%n months ago_" : ["","%n μήνες πριν"],
+    "last year" : "τελευταίο χρόνο",
+    "years ago" : "χρόνια πριν",
+    "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" : "Πρέπει να δοθεί έγκυρο συνθηματικό",
+    "The username is already being used" : "Το όνομα χρήστη είναι κατειλημμένο",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Δεν βρέθηκαν εγκατεστημένοι οδηγοί βάσεων δεδομένων (sqlite, mysql, or postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Τα δικαιώματα πρόσβασης μπορούν συνήθως να διορθωθούν %sδίνοντας δικαιώματα εγγραφής για τον βασικό κατάλογο στο διακομιστή δικτύου%s.",
+    "Cannot write into \"config\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"config\"",
+    "Cannot write into \"apps\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"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." : "Αυτό μπορεί συνήθως να διορθωθεί %sδίνοντας διακαιώματα εγγραφής για τον κατάλογο εφαρμογών στο διακομιστή δικτύου%s ή απενεργοποιώντας το κέντρο εφαρμογών στο αρχείο config.",
+    "Cannot create \"data\" directory (%s)" : "Αδυναμία δημιουργίας του καταλόγου \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Αυτό μπορεί συνήθως να διορθωθεί <a href=\"%s\" target=\"_blank\">δίνοντας δικαιώματα εγγραφής για το βασικό κατάλογο στο διακομιστή δικτύου</a>.",
+    "Setting locale to %s failed" : "Ρύθμιση τοπικών ρυθμίσεων σε %s απέτυχε",
+    "Please install one of these locales on your system and restart your webserver." : "Παρακαλώ να εγκαταστήσετε μία από αυτές τις τοπικές ρυθμίσεις στο σύστημά σας και να επανεκκινήσετε τον διακομιστή δικτύου σας.",
+    "Please ask your server administrator to install the module." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να εγκαταστήσει τη μονάδα.",
+    "PHP module %s not installed." : "Η μονάδα %s PHP δεν είναι εγκατεστημένη. ",
+    "PHP %s or higher is required." : "PHP %s ή νεώτερη απαιτείται.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να ενημερώσει τον PHP στη νεώτερη έκδοση. Η έκδοση του PHP σας δεν υποστηρίζεται πλεον από το ownCloud και την κοινότητα PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Η Ασφαλής Λειτουργία PHP έχει ενεργοποιηθεί. Το ownCloud απαιτεί να είναι απενεργοποιημένη για να λειτουργεί σωστά.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Η Ασφαλής Λειτουργεία PHP είναι μια ξεπερασμένη και κατά κύριο λόγο άχρηστη ρύθμιση που θα πρέπει να είναι απενεργοποιημένη. Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να την απενεργοποιήσει στο php.ini ή στις ρυθμίσεις του διακομιστή δικτύου σας.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Οι Magic Quotes είναι ενεργοποιημένες. Το ownCloud απαιτεί να είναι απενεργοποιημένες για να λειτουργεί σωστά.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Οι Magic Quotes είναι μια ξεπερασμένη και κατά κύριο λόγο άχρηστη ρύθμιση που θα πρέπει να είναι απενεργοποιημένη. Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να την απενεργοποιήσει στο php.ini ή στις ρυθμίσεις του διακομιστή δικτύου σας.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Κάποιες μονάδες PHP έχουν εγκατασταθεί, αλλά είναι ακόμα καταγεγραμμένες ως απούσες;",
+    "Please ask your server administrator to restart the web server." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να επανεκκινήσει το διακομιστή δικτύου σας.",
+    "PostgreSQL >= 9 required" : "Απαιτείται PostgreSQL >= 9",
+    "Please upgrade your database version" : "Παρακαλώ αναβαθμίστε την έκδοση της βάσης δεδομένων σας",
+    "Error occurred while checking PostgreSQL version" : "Προέκυψε σφάλμα κατά τον έλεγχο της έκδοσης PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Παρακαλώ ελέγξτε ότι έχετε PostgreSQL >= 9 ή ελέγξτε στα ιστορικό σφαλμάτων για περισσότερες πληροφορίες για το σφάλμα",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Παρακαλώ αλλάξτε τις ρυθμίσεις σε 0770 έτσι ώστε ο κατάλογος να μην μπορεί να προβάλλεται από άλλους χρήστες.",
+    "Data directory (%s) is readable by other users" : "Ο κατάλογος δεδομένων (%s) είναι διαθέσιμος προς ανάγνωση για άλλους χρήστες",
+    "Data directory (%s) is invalid" : "Ο κατάλογος δεδομένων (%s) είναι άκυρος",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Παρακαλώ ελέγξτε ότι ο κατάλογος δεδομένων περιέχει ένα αρχείο \".ocdata\" στη βάση του.",
+    "Could not obtain lock type %d on \"%s\"." : "Αδυναμία ανάκτησης τύπου κλειδιού %d στο \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/el.json b/lib/l10n/el.json
new file mode 100644
index 00000000000..65ff3ab3aa1
--- /dev/null
+++ b/lib/l10n/el.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Αδυναμία εγγραφής στον κατάλογο \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Αυτό μπορεί συνήθως να διορθωθεί παρέχοντας δικαιώματα εγγραφής για το φάκελο config στο διακομιστή δικτύου",
+    "See %s" : "Δείτε %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Αυτό μπορεί συνήθως να διορθωθεί %sπαρέχοντας δικαιώματα εγγραφής για το φάκελο config στο διακομιστή δικτύου%s.",
+    "Sample configuration detected" : "Ανιχνεύθηκε δείγμα εγκατάστασης",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Έχει ανιχνευθεί ότι το δείγμα εγκατάστασης έχει αντιγραφεί. Αυτό μπορεί να σπάσει την εγκατάστασή σας και δεν υποστηρίζεται. Παρακαλώ διαβάστε την τεκμηρίωση πριν εκτελέσετε αλλαγές στο config.php",
+    "Help" : "Βοήθεια",
+    "Personal" : "Προσωπικά",
+    "Settings" : "Ρυθμίσεις",
+    "Users" : "Χρήστες",
+    "Admin" : "Διαχείριση",
+    "Recommended" : "Προτείνεται",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση του ownCloud.",
+    "No app name specified" : "Δεν προδιορίστηκε όνομα εφαρμογής",
+    "Unknown filetype" : "Άγνωστος τύπος αρχείου",
+    "Invalid image" : "Μη έγκυρη εικόνα",
+    "web services under your control" : "υπηρεσίες δικτύου υπό τον έλεγχό σας",
+    "App directory already exists" : "Ο κατάλογος εφαρμογών υπάρχει ήδη",
+    "Can't create app folder. Please fix permissions. %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" : "Δεν προσδιορίστηκε μονοπάτι κατά την εγκατάσταση εφαρμογής από τοπικό αρχείο",
+    "Archives of type %s are not supported" : "Συλλογές αρχείων τύπου %s δεν υποστηρίζονται",
+    "Failed to open archive when installing app" : "Αποτυχία ανοίγματος συλλογής αρχείων κατά την εγκατάσταση εφαρμογής",
+    "App does not provide an info.xml file" : "Η εφαρμογή δεν παρέχει αρχείο info.xml",
+    "App can't be installed because of not allowed code in the App" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί λόγω μη-επιτρεπόμενου κώδικα μέσα στην Εφαρμογή",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή περιέχει την ετικέτα <shipped>σωστή</shipped> που δεν επιτρέπεται για μη-ενσωματωμένες εφαρμογές",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή η έκδοση στο info.xml/version δεν είναι η ίδια με την έκδοση που αναφέρεται στο κατάστημα εφαρμογών",
+    "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 μάλλον δεν χρησιμοποιείτε τελείες στο όνομα της βάσης δεδομένων",
+    "MS SQL username and/or password not valid: %s" : "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s",
+    "You need to enter either an existing account or the administrator." : "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή.",
+    "MySQL/MariaDB username and/or password not valid" : "Μη έγκυρο όνομα χρήστη ή/και συνθηματικό της MySQL/MariaDB",
+    "DB Error: \"%s\"" : "Σφάλμα Βάσης Δεδομένων: \"%s\"",
+    "Offending command was: \"%s\"" : "Η εντολη παραβατικοτητας ηταν: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL/MariaDB",
+    "Drop this user from MySQL/MariaDB" : "Κατάργηση του χρήστη από MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Υπάρχει ήδη ο χρήστης '%s'@'%%' της MySQL/MariaDB",
+    "Drop this user from MySQL/MariaDB." : "Κατάργηση του χρήστη από MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Αδυναμία σύνδεσης Oracle",
+    "Oracle username and/or password not valid" : "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s",
+    "PostgreSQL username and/or password not valid" : "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
+    "Set an admin username." : "Εισάγετε όνομα χρήστη διαχειριστή.",
+    "Set an admin password." : "Εισάγετε συνθηματικό διαχειριστή.",
+    "Can't create or write into the data directory %s" : "Αδύνατη η δημιουργία ή συγγραφή στον κατάλογο δεδομένων %s",
+    "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s είναι ο ιδιοκτήτης του αντικειμένου",
+    "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 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" : "Πρέπει να εισάγετε έναν κωδικό για να δημιουργήσετε έναν δημόσιο σύνδεσμο. Μόνο προστατευμένοι σύνδεσμοι επιτρέπονται",
+    "Sharing %s failed, because sharing with links is not allowed" : "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο διαμοιρασμός με συνδέσμους",
+    "Share type %s is not valid for %s" : "Ο τύπος διαμοιρασμού %s δεν είναι έγκυρος για το %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s",
+    "Setting permissions for %s failed, because the item was not found" : "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί το αντικείμενο δεν βρέθηκε",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Δεν μπορεί να οριστεί ημερομηνία λήξης. Οι κοινοποιήσεις δεν μπορεί να λήγουν αργότερα από %s αφού έχουν διαμοιραστεί.",
+    "Cannot set expiration date. Expiration date is in the past" : "Δεν μπορεί να οριστεί ημερομηνία λήξης. Η ημερομηνία λήξης είναι στο παρελθόν",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Το σύστημα διαμοιρασμού %s πρέπει να υλοποιεί την διεπαφή OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Το σύστημα διαμοιρασμού %s δεν βρέθηκε",
+    "Sharing backend for %s not found" : "Το σύστημα διαμοιρασμού για το %s δεν βρέθηκε",
+    "Sharing %s failed, because the user %s is the original sharer" : "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο αρχικά από τον χρήστη %s",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Ο διαμοιρασμός του %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s",
+    "Sharing %s failed, because resharing is not allowed" : "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο επαναδιαμοιρασμός",
+    "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\"",
+    "seconds ago" : "δευτερόλεπτα πριν",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n λεπτά πριν"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n ώρες πριν"],
+    "today" : "σήμερα",
+    "yesterday" : "χτες",
+    "_%n day go_::_%n days ago_" : ["","%n ημέρες πριν"],
+    "last month" : "τελευταίο μήνα",
+    "_%n month ago_::_%n months ago_" : ["","%n μήνες πριν"],
+    "last year" : "τελευταίο χρόνο",
+    "years ago" : "χρόνια πριν",
+    "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" : "Πρέπει να δοθεί έγκυρο συνθηματικό",
+    "The username is already being used" : "Το όνομα χρήστη είναι κατειλημμένο",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Δεν βρέθηκαν εγκατεστημένοι οδηγοί βάσεων δεδομένων (sqlite, mysql, or postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Τα δικαιώματα πρόσβασης μπορούν συνήθως να διορθωθούν %sδίνοντας δικαιώματα εγγραφής για τον βασικό κατάλογο στο διακομιστή δικτύου%s.",
+    "Cannot write into \"config\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"config\"",
+    "Cannot write into \"apps\" directory" : "Αδυναμία εγγραφής στον κατάλογο \"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." : "Αυτό μπορεί συνήθως να διορθωθεί %sδίνοντας διακαιώματα εγγραφής για τον κατάλογο εφαρμογών στο διακομιστή δικτύου%s ή απενεργοποιώντας το κέντρο εφαρμογών στο αρχείο config.",
+    "Cannot create \"data\" directory (%s)" : "Αδυναμία δημιουργίας του καταλόγου \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Αυτό μπορεί συνήθως να διορθωθεί <a href=\"%s\" target=\"_blank\">δίνοντας δικαιώματα εγγραφής για το βασικό κατάλογο στο διακομιστή δικτύου</a>.",
+    "Setting locale to %s failed" : "Ρύθμιση τοπικών ρυθμίσεων σε %s απέτυχε",
+    "Please install one of these locales on your system and restart your webserver." : "Παρακαλώ να εγκαταστήσετε μία από αυτές τις τοπικές ρυθμίσεις στο σύστημά σας και να επανεκκινήσετε τον διακομιστή δικτύου σας.",
+    "Please ask your server administrator to install the module." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να εγκαταστήσει τη μονάδα.",
+    "PHP module %s not installed." : "Η μονάδα %s PHP δεν είναι εγκατεστημένη. ",
+    "PHP %s or higher is required." : "PHP %s ή νεώτερη απαιτείται.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να ενημερώσει τον PHP στη νεώτερη έκδοση. Η έκδοση του PHP σας δεν υποστηρίζεται πλεον από το ownCloud και την κοινότητα PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Η Ασφαλής Λειτουργία PHP έχει ενεργοποιηθεί. Το ownCloud απαιτεί να είναι απενεργοποιημένη για να λειτουργεί σωστά.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Η Ασφαλής Λειτουργεία PHP είναι μια ξεπερασμένη και κατά κύριο λόγο άχρηστη ρύθμιση που θα πρέπει να είναι απενεργοποιημένη. Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να την απενεργοποιήσει στο php.ini ή στις ρυθμίσεις του διακομιστή δικτύου σας.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Οι Magic Quotes είναι ενεργοποιημένες. Το ownCloud απαιτεί να είναι απενεργοποιημένες για να λειτουργεί σωστά.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Οι Magic Quotes είναι μια ξεπερασμένη και κατά κύριο λόγο άχρηστη ρύθμιση που θα πρέπει να είναι απενεργοποιημένη. Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να την απενεργοποιήσει στο php.ini ή στις ρυθμίσεις του διακομιστή δικτύου σας.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Κάποιες μονάδες PHP έχουν εγκατασταθεί, αλλά είναι ακόμα καταγεγραμμένες ως απούσες;",
+    "Please ask your server administrator to restart the web server." : "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να επανεκκινήσει το διακομιστή δικτύου σας.",
+    "PostgreSQL >= 9 required" : "Απαιτείται PostgreSQL >= 9",
+    "Please upgrade your database version" : "Παρακαλώ αναβαθμίστε την έκδοση της βάσης δεδομένων σας",
+    "Error occurred while checking PostgreSQL version" : "Προέκυψε σφάλμα κατά τον έλεγχο της έκδοσης PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Παρακαλώ ελέγξτε ότι έχετε PostgreSQL >= 9 ή ελέγξτε στα ιστορικό σφαλμάτων για περισσότερες πληροφορίες για το σφάλμα",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Παρακαλώ αλλάξτε τις ρυθμίσεις σε 0770 έτσι ώστε ο κατάλογος να μην μπορεί να προβάλλεται από άλλους χρήστες.",
+    "Data directory (%s) is readable by other users" : "Ο κατάλογος δεδομένων (%s) είναι διαθέσιμος προς ανάγνωση για άλλους χρήστες",
+    "Data directory (%s) is invalid" : "Ο κατάλογος δεδομένων (%s) είναι άκυρος",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Παρακαλώ ελέγξτε ότι ο κατάλογος δεδομένων περιέχει ένα αρχείο \".ocdata\" στη βάση του.",
+    "Could not obtain lock type %d on \"%s\"." : "Αδυναμία ανάκτησης τύπου κλειδιού %d στο \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
deleted file mode 100644
index 2814328efdb..00000000000
--- a/lib/l10n/el.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Αδυναμία εγγραφής στον κατάλογο \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Αυτό μπορεί συνήθως να διορθωθεί παρέχοντας δικαιώματα εγγραφής για το φάκελο config στο διακομιστή δικτύου",
-"See %s" => "Δείτε %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Αυτό μπορεί συνήθως να διορθωθεί %sπαρέχοντας δικαιώματα εγγραφής για το φάκελο config στο διακομιστή δικτύου%s.",
-"Sample configuration detected" => "Ανιχνεύθηκε δείγμα εγκατάστασης",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Έχει ανιχνευθεί ότι το δείγμα εγκατάστασης έχει αντιγραφεί. Αυτό μπορεί να σπάσει την εγκατάστασή σας και δεν υποστηρίζεται. Παρακαλώ διαβάστε την τεκμηρίωση πριν εκτελέσετε αλλαγές στο config.php",
-"Help" => "Βοήθεια",
-"Personal" => "Προσωπικά",
-"Settings" => "Ρυθμίσεις",
-"Users" => "Χρήστες",
-"Admin" => "Διαχείριση",
-"Recommended" => "Προτείνεται",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Η εφαρμογή \"%s\" δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση του ownCloud.",
-"No app name specified" => "Δεν προδιορίστηκε όνομα εφαρμογής",
-"Unknown filetype" => "Άγνωστος τύπος αρχείου",
-"Invalid image" => "Μη έγκυρη εικόνα",
-"web services under your control" => "υπηρεσίες δικτύου υπό τον έλεγχό σας",
-"App directory already exists" => "Ο κατάλογος εφαρμογών υπάρχει ήδη",
-"Can't create app folder. Please fix permissions. %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" => "Δεν προσδιορίστηκε μονοπάτι κατά την εγκατάσταση εφαρμογής από τοπικό αρχείο",
-"Archives of type %s are not supported" => "Συλλογές αρχείων τύπου %s δεν υποστηρίζονται",
-"Failed to open archive when installing app" => "Αποτυχία ανοίγματος συλλογής αρχείων κατά την εγκατάσταση εφαρμογής",
-"App does not provide an info.xml file" => "Η εφαρμογή δεν παρέχει αρχείο info.xml",
-"App can't be installed because of not allowed code in the App" => "Η εφαρμογή δεν μπορεί να εγκατασταθεί λόγω μη-επιτρεπόμενου κώδικα μέσα στην Εφαρμογή",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή δεν είναι συμβατή με αυτή την έκδοση ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή περιέχει την ετικέτα <shipped>σωστή</shipped> που δεν επιτρέπεται για μη-ενσωματωμένες εφαρμογές",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Η εφαρμογή δεν μπορεί να εγκατασταθεί επειδή η έκδοση στο info.xml/version δεν είναι η ίδια με την έκδοση που αναφέρεται στο κατάστημα εφαρμογών",
-"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 μάλλον δεν χρησιμοποιείτε τελείες στο όνομα της βάσης δεδομένων",
-"MS SQL username and/or password not valid: %s" => "Το όνομα χρήστη και/ή ο κωδικός της MS SQL δεν είναι έγκυρα: %s",
-"You need to enter either an existing account or the administrator." => "Χρειάζεται να εισάγετε είτε έναν υπάρχον λογαριασμό ή του διαχειριστή.",
-"MySQL/MariaDB username and/or password not valid" => "Μη έγκυρο όνομα χρήστη ή/και συνθηματικό της MySQL/MariaDB",
-"DB Error: \"%s\"" => "Σφάλμα Βάσης Δεδομένων: \"%s\"",
-"Offending command was: \"%s\"" => "Η εντολη παραβατικοτητας ηταν: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "Υπάρχει ήδη ο χρήστης '%s'@'localhost' της MySQL/MariaDB",
-"Drop this user from MySQL/MariaDB" => "Κατάργηση του χρήστη από MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Υπάρχει ήδη ο χρήστης '%s'@'%%' της MySQL/MariaDB",
-"Drop this user from MySQL/MariaDB." => "Κατάργηση του χρήστη από MySQL/MariaDB.",
-"Oracle connection could not be established" => "Αδυναμία σύνδεσης Oracle",
-"Oracle username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της Oracle",
-"Offending command was: \"%s\", name: %s, password: %s" => "Η εντολη παραβατικοτητας ηταν: \"%s\", ονομα: %s, κωδικος: %s",
-"PostgreSQL username and/or password not valid" => "Μη έγκυρος χρήστης και/ή συνθηματικό της PostgreSQL",
-"Set an admin username." => "Εισάγετε όνομα χρήστη διαχειριστή.",
-"Set an admin password." => "Εισάγετε συνθηματικό διαχειριστή.",
-"Can't create or write into the data directory %s" => "Αδύνατη η δημιουργία ή συγγραφή στον κατάλογο δεδομένων %s",
-"%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",
-"Sharing %s failed, because the user %s is the item owner" => "Ο διαμοιρασμός του %s απέτυχε, γιατί ο χρήστης %s είναι ο ιδιοκτήτης του αντικειμένου",
-"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 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" => "Πρέπει να εισάγετε έναν κωδικό για να δημιουργήσετε έναν δημόσιο σύνδεσμο. Μόνο προστατευμένοι σύνδεσμοι επιτρέπονται",
-"Sharing %s failed, because sharing with links is not allowed" => "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο διαμοιρασμός με συνδέσμους",
-"Share type %s is not valid for %s" => "Ο τύπος διαμοιρασμού %s δεν είναι έγκυρος για το %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s",
-"Setting permissions for %s failed, because the item was not found" => "Ο ορισμός δικαιωμάτων για το %s απέτυχε, γιατί το αντικείμενο δεν βρέθηκε",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Δεν μπορεί να οριστεί ημερομηνία λήξης. Οι κοινοποιήσεις δεν μπορεί να λήγουν αργότερα από %s αφού έχουν διαμοιραστεί.",
-"Cannot set expiration date. Expiration date is in the past" => "Δεν μπορεί να οριστεί ημερομηνία λήξης. Η ημερομηνία λήξης είναι στο παρελθόν",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Το σύστημα διαμοιρασμού %s πρέπει να υλοποιεί την διεπαφή OCP\\Share_Backend",
-"Sharing backend %s not found" => "Το σύστημα διαμοιρασμού %s δεν βρέθηκε",
-"Sharing backend for %s not found" => "Το σύστημα διαμοιρασμού για το %s δεν βρέθηκε",
-"Sharing %s failed, because the user %s is the original sharer" => "Ο διαμοιρασμός του %s απέτυχε, γιατί το αντικείμενο είναι διαμοιρασμένο αρχικά από τον χρήστη %s",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Ο διαμοιρασμός του %s απέτυχε, γιατί τα δικαιώματα υπερτερούν αυτά που είναι ορισμένα για το %s",
-"Sharing %s failed, because resharing is not allowed" => "Ο διαμοιρασμός του %s απέτυχε, γιατί δεν επιτρέπεται ο επαναδιαμοιρασμός",
-"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\"",
-"seconds ago" => "δευτερόλεπτα πριν",
-"_%n minute ago_::_%n minutes ago_" => array("","%n λεπτά πριν"),
-"_%n hour ago_::_%n hours ago_" => array("","%n ώρες πριν"),
-"today" => "σήμερα",
-"yesterday" => "χτες",
-"_%n day go_::_%n days ago_" => array("","%n ημέρες πριν"),
-"last month" => "τελευταίο μήνα",
-"_%n month ago_::_%n months ago_" => array("","%n μήνες πριν"),
-"last year" => "τελευταίο χρόνο",
-"years ago" => "χρόνια πριν",
-"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" => "Πρέπει να δοθεί έγκυρο συνθηματικό",
-"The username is already being used" => "Το όνομα χρήστη είναι κατειλημμένο",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Δεν βρέθηκαν εγκατεστημένοι οδηγοί βάσεων δεδομένων (sqlite, mysql, or postgresql).",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Τα δικαιώματα πρόσβασης μπορούν συνήθως να διορθωθούν %sδίνοντας δικαιώματα εγγραφής για τον βασικό κατάλογο στο διακομιστή δικτύου%s.",
-"Cannot write into \"config\" directory" => "Αδυναμία εγγραφής στον κατάλογο \"config\"",
-"Cannot write into \"apps\" directory" => "Αδυναμία εγγραφής στον κατάλογο \"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." => "Αυτό μπορεί συνήθως να διορθωθεί %sδίνοντας διακαιώματα εγγραφής για τον κατάλογο εφαρμογών στο διακομιστή δικτύου%s ή απενεργοποιώντας το κέντρο εφαρμογών στο αρχείο config.",
-"Cannot create \"data\" directory (%s)" => "Αδυναμία δημιουργίας του καταλόγου \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Αυτό μπορεί συνήθως να διορθωθεί <a href=\"%s\" target=\"_blank\">δίνοντας δικαιώματα εγγραφής για το βασικό κατάλογο στο διακομιστή δικτύου</a>.",
-"Setting locale to %s failed" => "Ρύθμιση τοπικών ρυθμίσεων σε %s απέτυχε",
-"Please install one of these locales on your system and restart your webserver." => "Παρακαλώ να εγκαταστήσετε μία από αυτές τις τοπικές ρυθμίσεις στο σύστημά σας και να επανεκκινήσετε τον διακομιστή δικτύου σας.",
-"Please ask your server administrator to install the module." => "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να εγκαταστήσει τη μονάδα.",
-"PHP module %s not installed." => "Η μονάδα %s PHP δεν είναι εγκατεστημένη. ",
-"PHP %s or higher is required." => "PHP %s ή νεώτερη απαιτείται.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να ενημερώσει τον PHP στη νεώτερη έκδοση. Η έκδοση του PHP σας δεν υποστηρίζεται πλεον από το ownCloud και την κοινότητα PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Η Ασφαλής Λειτουργία PHP έχει ενεργοποιηθεί. Το ownCloud απαιτεί να είναι απενεργοποιημένη για να λειτουργεί σωστά.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Η Ασφαλής Λειτουργεία PHP είναι μια ξεπερασμένη και κατά κύριο λόγο άχρηστη ρύθμιση που θα πρέπει να είναι απενεργοποιημένη. Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να την απενεργοποιήσει στο php.ini ή στις ρυθμίσεις του διακομιστή δικτύου σας.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Οι Magic Quotes είναι ενεργοποιημένες. Το ownCloud απαιτεί να είναι απενεργοποιημένες για να λειτουργεί σωστά.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Οι Magic Quotes είναι μια ξεπερασμένη και κατά κύριο λόγο άχρηστη ρύθμιση που θα πρέπει να είναι απενεργοποιημένη. Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να την απενεργοποιήσει στο php.ini ή στις ρυθμίσεις του διακομιστή δικτύου σας.",
-"PHP modules have been installed, but they are still listed as missing?" => "Κάποιες μονάδες PHP έχουν εγκατασταθεί, αλλά είναι ακόμα καταγεγραμμένες ως απούσες;",
-"Please ask your server administrator to restart the web server." => "Παρακαλώ ζητήστε από το διαχειριστή του διακομιστή σας να επανεκκινήσει το διακομιστή δικτύου σας.",
-"PostgreSQL >= 9 required" => "Απαιτείται PostgreSQL >= 9",
-"Please upgrade your database version" => "Παρακαλώ αναβαθμίστε την έκδοση της βάσης δεδομένων σας",
-"Error occurred while checking PostgreSQL version" => "Προέκυψε σφάλμα κατά τον έλεγχο της έκδοσης PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Παρακαλώ ελέγξτε ότι έχετε PostgreSQL >= 9 ή ελέγξτε στα ιστορικό σφαλμάτων για περισσότερες πληροφορίες για το σφάλμα",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Παρακαλώ αλλάξτε τις ρυθμίσεις σε 0770 έτσι ώστε ο κατάλογος να μην μπορεί να προβάλλεται από άλλους χρήστες.",
-"Data directory (%s) is readable by other users" => "Ο κατάλογος δεδομένων (%s) είναι διαθέσιμος προς ανάγνωση για άλλους χρήστες",
-"Data directory (%s) is invalid" => "Ο κατάλογος δεδομένων (%s) είναι άκυρος",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Παρακαλώ ελέγξτε ότι ο κατάλογος δεδομένων περιέχει ένα αρχείο \".ocdata\" στη βάση του.",
-"Could not obtain lock type %d on \"%s\"." => "Αδυναμία ανάκτησης τύπου κλειδιού %d στο \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en@pirate.js b/lib/l10n/en@pirate.js
new file mode 100644
index 00000000000..ad57745199e
--- /dev/null
+++ b/lib/l10n/en@pirate.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "lib",
+    {
+    "web services under your control" : "web services under your control",
+    "_%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/en@pirate.json b/lib/l10n/en@pirate.json
new file mode 100644
index 00000000000..c2cd03ea8f3
--- /dev/null
+++ b/lib/l10n/en@pirate.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "web services under your control" : "web services under your control",
+    "_%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/en@pirate.php b/lib/l10n/en@pirate.php
deleted file mode 100644
index a8175b1400f..00000000000
--- a/lib/l10n/en@pirate.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"web services under your control" => "web services under your control",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
new file mode 100644
index 00000000000..43f7edb5258
--- /dev/null
+++ b/lib/l10n/en_GB.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Cannot write into \"config\" directory!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "This can usually be fixed by giving the webserver write access to the config directory",
+    "See %s" : "See %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "This can usually be fixed by %sgiving the webserver write access to the config directory%s.",
+    "Sample configuration detected" : "Sample configuration detected",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php",
+    "Help" : "Help",
+    "Personal" : "Personal",
+    "Settings" : "Settings",
+    "Users" : "Users",
+    "Admin" : "Admin",
+    "Recommended" : "Recommended",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud.",
+    "No app name specified" : "No app name specified",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "web services under your control" : "web services under your control",
+    "App directory already exists" : "App directory already exists",
+    "Can't create app folder. Please fix permissions. %s" : "Can't create app folder. Please fix permissions. %s",
+    "No source specified when installing app" : "No source specified when installing app",
+    "No href specified when installing app from http" : "No href specified when installing app from http",
+    "No path specified when installing app from local file" : "No path specified when installing app from local file",
+    "Archives of type %s are not supported" : "Archives of type %s are not supported",
+    "Failed to open archive when installing app" : "Failed to open archive when installing app",
+    "App does not provide an info.xml file" : "App does not provide an info.xml file",
+    "App can't be installed because of not allowed code in the App" : "App can't be installed because of unallowed code in the App",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "App can't be installed because it is not compatible with this version of ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store",
+    "Application is not enabled" : "Application is not enabled",
+    "Authentication error" : "Authentication error",
+    "Token expired. Please reload page." : "Token expired. Please reload page.",
+    "Unknown user" : "Unknown user",
+    "%s enter the database username." : "%s enter the database username.",
+    "%s enter the database name." : "%s enter the database name.",
+    "%s you may not use dots in the database name" : "%s you may not use dots in the database name",
+    "MS SQL username and/or password not valid: %s" : "MS SQL username and/or password not valid: %s",
+    "You need to enter either an existing account or the administrator." : "You need to enter either an existing account or the administrator.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB username and/or password not valid",
+    "DB Error: \"%s\"" : "DB Error: \"%s\"",
+    "Offending command was: \"%s\"" : "Offending command was: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB user '%s'@'localhost' exists already.",
+    "Drop this user from MySQL/MariaDB" : "Drop this user from MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB user '%s'@'%%' already exists",
+    "Drop this user from MySQL/MariaDB." : "Drop this user from MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Oracle connection could not be established",
+    "Oracle username and/or password not valid" : "Oracle username and/or password not valid",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Offending command was: \"%s\", name: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL username and/or password not valid",
+    "Set an admin username." : "Set an admin username.",
+    "Set an admin password." : "Set an admin password.",
+    "Can't create or write into the data directory %s" : "Can't create or write into the data directory %s",
+    "%s shared »%s« with you" : "%s shared \"%s\" with you",
+    "Sharing %s failed, because the file does not exist" : "Sharing %s failed, because the file does not exist",
+    "You are not allowed to share %s" : "You are not allowed to share %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Sharing %s failed, because the user %s is the item owner",
+    "Sharing %s failed, because the user %s does not exist" : "Sharing %s failed, because the user %s does not exist",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of",
+    "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
+    "Sharing %s failed, because the group %s does not exist" : "Sharing %s failed, because the group %s does not exist",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Sharing %s failed, because %s is not a member of the group %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "You need to provide a password to create a public link, only protected links are allowed",
+    "Sharing %s failed, because sharing with links is not allowed" : "Sharing %s failed, because sharing with links is not allowed",
+    "Share type %s is not valid for %s" : "Share type %s is not valid for %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
+    "Setting permissions for %s failed, because the item was not found" : "Setting permissions for %s failed, because the item was not found",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Cannot set expiry date. Shares cannot expire later than %s after they have been shared",
+    "Cannot set expiration date. Expiration date is in the past" : "Cannot set expiry date. Expiry date is in the past",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Sharing backend %s not found",
+    "Sharing backend for %s not found" : "Sharing backend for %s not found",
+    "Sharing %s failed, because the user %s is the original sharer" : "Sharing %s failed, because the user %s is the original sharer",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Sharing %s failed, because the permissions exceed permissions granted to %s",
+    "Sharing %s failed, because resharing is not allowed" : "Sharing %s failed, because resharing is not allowed",
+    "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\"",
+    "seconds ago" : "seconds ago",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minute ago","%n minutes ago"],
+    "_%n hour ago_::_%n hours ago_" : ["%n hour ago","%n hours ago"],
+    "today" : "today",
+    "yesterday" : "yesterday",
+    "_%n day go_::_%n days ago_" : ["%n day go","%n days ago"],
+    "last month" : "last month",
+    "_%n month ago_::_%n months ago_" : ["%n month ago","%n months ago"],
+    "last year" : "last year",
+    "years ago" : "years ago",
+    "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",
+    "The username is already being used" : "The username is already being used",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "No database drivers (sqlite, mysql, or postgresql) installed.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.",
+    "Cannot write into \"config\" directory" : "Cannot write into \"config\" directory",
+    "Cannot write into \"apps\" directory" : "Cannot write into \"apps\" directory",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.",
+    "Cannot create \"data\" directory (%s)" : "Cannot create \"data\" directory (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>.",
+    "Setting locale to %s failed" : "Setting locale to %s failed",
+    "Please install one of these locales on your system and restart your webserver." : "Please install one of these locales on your system and restart your webserver.",
+    "Please ask your server administrator to install the module." : "Please ask your server administrator to install the module.",
+    "PHP module %s not installed." : "PHP module %s not installed.",
+    "PHP %s or higher is required." : "PHP %s or higher is required.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?",
+    "Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 required",
+    "Please upgrade your database version" : "Please upgrade your database version",
+    "Error occurred while checking PostgreSQL version" : "Error occurred while checking PostgreSQL version",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
+    "Data directory (%s) is readable by other users" : "Data directory (%s) is readable by other users",
+    "Data directory (%s) is invalid" : "Data directory (%s) is invalid",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Please check that the data directory contains a file \".ocdata\" in its root.",
+    "Could not obtain lock type %d on \"%s\"." : "Could not obtain lock type %d on \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
new file mode 100644
index 00000000000..7e7756cec9c
--- /dev/null
+++ b/lib/l10n/en_GB.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Cannot write into \"config\" directory!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "This can usually be fixed by giving the webserver write access to the config directory",
+    "See %s" : "See %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "This can usually be fixed by %sgiving the webserver write access to the config directory%s.",
+    "Sample configuration detected" : "Sample configuration detected",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php",
+    "Help" : "Help",
+    "Personal" : "Personal",
+    "Settings" : "Settings",
+    "Users" : "Users",
+    "Admin" : "Admin",
+    "Recommended" : "Recommended",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud.",
+    "No app name specified" : "No app name specified",
+    "Unknown filetype" : "Unknown filetype",
+    "Invalid image" : "Invalid image",
+    "web services under your control" : "web services under your control",
+    "App directory already exists" : "App directory already exists",
+    "Can't create app folder. Please fix permissions. %s" : "Can't create app folder. Please fix permissions. %s",
+    "No source specified when installing app" : "No source specified when installing app",
+    "No href specified when installing app from http" : "No href specified when installing app from http",
+    "No path specified when installing app from local file" : "No path specified when installing app from local file",
+    "Archives of type %s are not supported" : "Archives of type %s are not supported",
+    "Failed to open archive when installing app" : "Failed to open archive when installing app",
+    "App does not provide an info.xml file" : "App does not provide an info.xml file",
+    "App can't be installed because of not allowed code in the App" : "App can't be installed because of unallowed code in the App",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "App can't be installed because it is not compatible with this version of ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store",
+    "Application is not enabled" : "Application is not enabled",
+    "Authentication error" : "Authentication error",
+    "Token expired. Please reload page." : "Token expired. Please reload page.",
+    "Unknown user" : "Unknown user",
+    "%s enter the database username." : "%s enter the database username.",
+    "%s enter the database name." : "%s enter the database name.",
+    "%s you may not use dots in the database name" : "%s you may not use dots in the database name",
+    "MS SQL username and/or password not valid: %s" : "MS SQL username and/or password not valid: %s",
+    "You need to enter either an existing account or the administrator." : "You need to enter either an existing account or the administrator.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB username and/or password not valid",
+    "DB Error: \"%s\"" : "DB Error: \"%s\"",
+    "Offending command was: \"%s\"" : "Offending command was: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB user '%s'@'localhost' exists already.",
+    "Drop this user from MySQL/MariaDB" : "Drop this user from MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB user '%s'@'%%' already exists",
+    "Drop this user from MySQL/MariaDB." : "Drop this user from MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Oracle connection could not be established",
+    "Oracle username and/or password not valid" : "Oracle username and/or password not valid",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Offending command was: \"%s\", name: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL username and/or password not valid",
+    "Set an admin username." : "Set an admin username.",
+    "Set an admin password." : "Set an admin password.",
+    "Can't create or write into the data directory %s" : "Can't create or write into the data directory %s",
+    "%s shared »%s« with you" : "%s shared \"%s\" with you",
+    "Sharing %s failed, because the file does not exist" : "Sharing %s failed, because the file does not exist",
+    "You are not allowed to share %s" : "You are not allowed to share %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Sharing %s failed, because the user %s is the item owner",
+    "Sharing %s failed, because the user %s does not exist" : "Sharing %s failed, because the user %s does not exist",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of",
+    "Sharing %s failed, because this item is already shared with %s" : "Sharing %s failed, because this item is already shared with %s",
+    "Sharing %s failed, because the group %s does not exist" : "Sharing %s failed, because the group %s does not exist",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Sharing %s failed, because %s is not a member of the group %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "You need to provide a password to create a public link, only protected links are allowed",
+    "Sharing %s failed, because sharing with links is not allowed" : "Sharing %s failed, because sharing with links is not allowed",
+    "Share type %s is not valid for %s" : "Share type %s is not valid for %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
+    "Setting permissions for %s failed, because the item was not found" : "Setting permissions for %s failed, because the item was not found",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Cannot set expiry date. Shares cannot expire later than %s after they have been shared",
+    "Cannot set expiration date. Expiration date is in the past" : "Cannot set expiry date. Expiry date is in the past",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Sharing backend %s must implement the interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Sharing backend %s not found",
+    "Sharing backend for %s not found" : "Sharing backend for %s not found",
+    "Sharing %s failed, because the user %s is the original sharer" : "Sharing %s failed, because the user %s is the original sharer",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Sharing %s failed, because the permissions exceed permissions granted to %s",
+    "Sharing %s failed, because resharing is not allowed" : "Sharing %s failed, because resharing is not allowed",
+    "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\"",
+    "seconds ago" : "seconds ago",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minute ago","%n minutes ago"],
+    "_%n hour ago_::_%n hours ago_" : ["%n hour ago","%n hours ago"],
+    "today" : "today",
+    "yesterday" : "yesterday",
+    "_%n day go_::_%n days ago_" : ["%n day go","%n days ago"],
+    "last month" : "last month",
+    "_%n month ago_::_%n months ago_" : ["%n month ago","%n months ago"],
+    "last year" : "last year",
+    "years ago" : "years ago",
+    "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",
+    "The username is already being used" : "The username is already being used",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "No database drivers (sqlite, mysql, or postgresql) installed.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.",
+    "Cannot write into \"config\" directory" : "Cannot write into \"config\" directory",
+    "Cannot write into \"apps\" directory" : "Cannot write into \"apps\" directory",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.",
+    "Cannot create \"data\" directory (%s)" : "Cannot create \"data\" directory (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>.",
+    "Setting locale to %s failed" : "Setting locale to %s failed",
+    "Please install one of these locales on your system and restart your webserver." : "Please install one of these locales on your system and restart your webserver.",
+    "Please ask your server administrator to install the module." : "Please ask your server administrator to install the module.",
+    "PHP module %s not installed." : "PHP module %s not installed.",
+    "PHP %s or higher is required." : "PHP %s or higher is required.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP modules have been installed, but they are still listed as missing?",
+    "Please ask your server administrator to restart the web server." : "Please ask your server administrator to restart the web server.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 required",
+    "Please upgrade your database version" : "Please upgrade your database version",
+    "Error occurred while checking PostgreSQL version" : "Error occurred while checking PostgreSQL version",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
+    "Data directory (%s) is readable by other users" : "Data directory (%s) is readable by other users",
+    "Data directory (%s) is invalid" : "Data directory (%s) is invalid",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Please check that the data directory contains a file \".ocdata\" in its root.",
+    "Could not obtain lock type %d on \"%s\"." : "Could not obtain lock type %d on \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/en_GB.php b/lib/l10n/en_GB.php
deleted file mode 100644
index 5a3ba3a6c54..00000000000
--- a/lib/l10n/en_GB.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Cannot write into \"config\" directory!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "This can usually be fixed by giving the webserver write access to the config directory",
-"See %s" => "See %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "This can usually be fixed by %sgiving the webserver write access to the config directory%s.",
-"Sample configuration detected" => "Sample configuration detected",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php",
-"Help" => "Help",
-"Personal" => "Personal",
-"Settings" => "Settings",
-"Users" => "Users",
-"Admin" => "Admin",
-"Recommended" => "Recommended",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud.",
-"No app name specified" => "No app name specified",
-"Unknown filetype" => "Unknown filetype",
-"Invalid image" => "Invalid image",
-"web services under your control" => "web services under your control",
-"App directory already exists" => "App directory already exists",
-"Can't create app folder. Please fix permissions. %s" => "Can't create app folder. Please fix permissions. %s",
-"No source specified when installing app" => "No source specified when installing app",
-"No href specified when installing app from http" => "No href specified when installing app from http",
-"No path specified when installing app from local file" => "No path specified when installing app from local file",
-"Archives of type %s are not supported" => "Archives of type %s are not supported",
-"Failed to open archive when installing app" => "Failed to open archive when installing app",
-"App does not provide an info.xml file" => "App does not provide an info.xml file",
-"App can't be installed because of not allowed code in the App" => "App can't be installed because of unallowed code in the App",
-"App can't be installed because it is not compatible with this version of ownCloud" => "App can't be installed because it is not compatible with this version of ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store",
-"Application is not enabled" => "Application is not enabled",
-"Authentication error" => "Authentication error",
-"Token expired. Please reload page." => "Token expired. Please reload page.",
-"Unknown user" => "Unknown user",
-"%s enter the database username." => "%s enter the database username.",
-"%s enter the database name." => "%s enter the database name.",
-"%s you may not use dots in the database name" => "%s you may not use dots in the database name",
-"MS SQL username and/or password not valid: %s" => "MS SQL username and/or password not valid: %s",
-"You need to enter either an existing account or the administrator." => "You need to enter either an existing account or the administrator.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB username and/or password not valid",
-"DB Error: \"%s\"" => "DB Error: \"%s\"",
-"Offending command was: \"%s\"" => "Offending command was: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB user '%s'@'localhost' exists already.",
-"Drop this user from MySQL/MariaDB" => "Drop this user from MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB user '%s'@'%%' already exists",
-"Drop this user from MySQL/MariaDB." => "Drop this user from MySQL/MariaDB.",
-"Oracle connection could not be established" => "Oracle connection could not be established",
-"Oracle username and/or password not valid" => "Oracle username and/or password not valid",
-"Offending command was: \"%s\", name: %s, password: %s" => "Offending command was: \"%s\", name: %s, password: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL username and/or password not valid",
-"Set an admin username." => "Set an admin username.",
-"Set an admin password." => "Set an admin password.",
-"Can't create or write into the data directory %s" => "Can't create or write into the data directory %s",
-"%s shared »%s« with you" => "%s shared \"%s\" with you",
-"Sharing %s failed, because the file does not exist" => "Sharing %s failed, because the file does not exist",
-"You are not allowed to share %s" => "You are not allowed to share %s",
-"Sharing %s failed, because the user %s is the item owner" => "Sharing %s failed, because the user %s is the item owner",
-"Sharing %s failed, because the user %s does not exist" => "Sharing %s failed, because the user %s does not exist",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of",
-"Sharing %s failed, because this item is already shared with %s" => "Sharing %s failed, because this item is already shared with %s",
-"Sharing %s failed, because the group %s does not exist" => "Sharing %s failed, because the group %s does not exist",
-"Sharing %s failed, because %s is not a member of the group %s" => "Sharing %s failed, because %s is not a member of the group %s",
-"You need to provide a password to create a public link, only protected links are allowed" => "You need to provide a password to create a public link, only protected links are allowed",
-"Sharing %s failed, because sharing with links is not allowed" => "Sharing %s failed, because sharing with links is not allowed",
-"Share type %s is not valid for %s" => "Share type %s is not valid for %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Setting permissions for %s failed, because the permissions exceed permissions granted to %s",
-"Setting permissions for %s failed, because the item was not found" => "Setting permissions for %s failed, because the item was not found",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Cannot set expiry date. Shares cannot expire later than %s after they have been shared",
-"Cannot set expiration date. Expiration date is in the past" => "Cannot set expiry date. Expiry date is in the past",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Sharing backend %s must implement the interface OCP\\Share_Backend",
-"Sharing backend %s not found" => "Sharing backend %s not found",
-"Sharing backend for %s not found" => "Sharing backend for %s not found",
-"Sharing %s failed, because the user %s is the original sharer" => "Sharing %s failed, because the user %s is the original sharer",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Sharing %s failed, because the permissions exceed permissions granted to %s",
-"Sharing %s failed, because resharing is not allowed" => "Sharing %s failed, because resharing is not allowed",
-"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\"",
-"seconds ago" => "seconds ago",
-"_%n minute ago_::_%n minutes ago_" => array("%n minute ago","%n minutes ago"),
-"_%n hour ago_::_%n hours ago_" => array("%n hour ago","%n hours ago"),
-"today" => "today",
-"yesterday" => "yesterday",
-"_%n day go_::_%n days ago_" => array("%n day go","%n days ago"),
-"last month" => "last month",
-"_%n month ago_::_%n months ago_" => array("%n month ago","%n months ago"),
-"last year" => "last year",
-"years ago" => "years ago",
-"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",
-"The username is already being used" => "The username is already being used",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "No database drivers (sqlite, mysql, or postgresql) installed.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s.",
-"Cannot write into \"config\" directory" => "Cannot write into \"config\" directory",
-"Cannot write into \"apps\" directory" => "Cannot write into \"apps\" directory",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file.",
-"Cannot create \"data\" directory (%s)" => "Cannot create \"data\" directory (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>.",
-"Setting locale to %s failed" => "Setting locale to %s failed",
-"Please install one of these locales on your system and restart your webserver." => "Please install one of these locales on your system and restart your webserver.",
-"Please ask your server administrator to install the module." => "Please ask your server administrator to install the module.",
-"PHP module %s not installed." => "PHP module %s not installed.",
-"PHP %s or higher is required." => "PHP %s or higher is required.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP modules have been installed, but they are still listed as missing?",
-"Please ask your server administrator to restart the web server." => "Please ask your server administrator to restart the web server.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 required",
-"Please upgrade your database version" => "Please upgrade your database version",
-"Error occurred while checking PostgreSQL version" => "Error occurred while checking PostgreSQL version",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Please change the permissions to 0770 so that the directory cannot be listed by other users.",
-"Data directory (%s) is readable by other users" => "Data directory (%s) is readable by other users",
-"Data directory (%s) is invalid" => "Data directory (%s) is invalid",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Please check that the data directory contains a file \".ocdata\" in its root.",
-"Could not obtain lock type %d on \"%s\"." => "Could not obtain lock type %d on \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/en_NZ.js b/lib/l10n/en_NZ.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/en_NZ.js
@@ -0,0 +1,9 @@
+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/en_NZ.json b/lib/l10n/en_NZ.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/en_NZ.json
@@ -0,0 +1,7 @@
+{ "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/en_NZ.php b/lib/l10n/en_NZ.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/en_NZ.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/eo.js b/lib/l10n/eo.js
new file mode 100644
index 00000000000..ea912c1cca0
--- /dev/null
+++ b/lib/l10n/eo.js
@@ -0,0 +1,56 @@
+OC.L10N.register(
+    "lib",
+    {
+    "See %s" : "Vidi %s",
+    "Help" : "Helpo",
+    "Personal" : "Persona",
+    "Settings" : "Agordo",
+    "Users" : "Uzantoj",
+    "Admin" : "Administranto",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplikaĵo “%s” ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud.",
+    "Unknown filetype" : "Ne konatas dosiertipo",
+    "Invalid image" : "Ne validas bildo",
+    "web services under your control" : "TTT-servoj regataj de vi",
+    "App directory already exists" : "La dosierujo de la aplikaĵo jam ekzistas",
+    "App does not provide an info.xml file" : "La aplikaĵo ne provizas dosieron info.xml",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "La aplikaĵo ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud",
+    "Application is not enabled" : "La aplikaĵo ne estas kapabligita",
+    "Authentication error" : "Aŭtentiga eraro",
+    "Token expired. Please reload page." : "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon.",
+    "Unknown user" : "Nekonata uzanto",
+    "%s enter the database username." : "%s enigu la uzantonomon de la datumbazo.",
+    "%s enter the database name." : "%s enigu la nomon de la datumbazo.",
+    "%s you may not use dots in the database name" : "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
+    "MS SQL username and/or password not valid: %s" : "La uzantonomo de MS SQL aŭ la pasvorto ne validas: %s",
+    "MySQL/MariaDB username and/or password not valid" : "La MySQL/MariaDB-uzantonomo kajaŭ pasvorto ne validas.",
+    "DB Error: \"%s\"" : "Datumbaza eraro: “%s”",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "La MySQL/MariaDB-uzanto '%s'@'localhost' jam ekzistas.",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "La MySQL/MariaDB-uzanto '%s'@'%%' jam ekzistas",
+    "Oracle connection could not be established" : "Konekto al Oracle ne povas stariĝi",
+    "Oracle username and/or password not valid" : "La uzantonomo de Oracle aŭ la pasvorto ne validas",
+    "PostgreSQL username and/or password not valid" : "La uzantonomo de PostgreSQL aŭ la pasvorto ne validas",
+    "Set an admin username." : "Starigi administran uzantonomon.",
+    "Set an admin password." : "Starigi administran pasvorton.",
+    "%s shared »%s« with you" : "%s kunhavigis “%s” kun vi",
+    "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s",
+    "Could not find category \"%s\"" : "Ne troviĝis kategorio “%s”",
+    "seconds ago" : "sekundoj antaŭe",
+    "_%n minute ago_::_%n minutes ago_" : ["","antaŭ %n minutoj"],
+    "_%n hour ago_::_%n hours ago_" : ["","antaŭ %n horoj"],
+    "today" : "hodiaŭ",
+    "yesterday" : "hieraŭ",
+    "_%n day go_::_%n days ago_" : ["","antaŭ %n tagoj"],
+    "last month" : "lastamonate",
+    "_%n month ago_::_%n months ago_" : ["","antaŭ %n monatoj"],
+    "last year" : "lastajare",
+    "years ago" : "jaroj antaŭe",
+    "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",
+    "The username is already being used" : "La uzantonomo jam uzatas",
+    "Please ask your server administrator to install the module." : "Bonvolu peti vian sistemadministranton, ke ĝi instalu la modulon.",
+    "PHP module %s not installed." : "La PHP-modulo %s ne instalitas.",
+    "PHP %s or higher is required." : "PHP %s aŭ pli alta necesas.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 necesas"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/eo.json b/lib/l10n/eo.json
new file mode 100644
index 00000000000..7e1ed7bb813
--- /dev/null
+++ b/lib/l10n/eo.json
@@ -0,0 +1,54 @@
+{ "translations": {
+    "See %s" : "Vidi %s",
+    "Help" : "Helpo",
+    "Personal" : "Persona",
+    "Settings" : "Agordo",
+    "Users" : "Uzantoj",
+    "Admin" : "Administranto",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplikaĵo “%s” ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud.",
+    "Unknown filetype" : "Ne konatas dosiertipo",
+    "Invalid image" : "Ne validas bildo",
+    "web services under your control" : "TTT-servoj regataj de vi",
+    "App directory already exists" : "La dosierujo de la aplikaĵo jam ekzistas",
+    "App does not provide an info.xml file" : "La aplikaĵo ne provizas dosieron info.xml",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "La aplikaĵo ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud",
+    "Application is not enabled" : "La aplikaĵo ne estas kapabligita",
+    "Authentication error" : "Aŭtentiga eraro",
+    "Token expired. Please reload page." : "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon.",
+    "Unknown user" : "Nekonata uzanto",
+    "%s enter the database username." : "%s enigu la uzantonomon de la datumbazo.",
+    "%s enter the database name." : "%s enigu la nomon de la datumbazo.",
+    "%s you may not use dots in the database name" : "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
+    "MS SQL username and/or password not valid: %s" : "La uzantonomo de MS SQL aŭ la pasvorto ne validas: %s",
+    "MySQL/MariaDB username and/or password not valid" : "La MySQL/MariaDB-uzantonomo kajaŭ pasvorto ne validas.",
+    "DB Error: \"%s\"" : "Datumbaza eraro: “%s”",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "La MySQL/MariaDB-uzanto '%s'@'localhost' jam ekzistas.",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "La MySQL/MariaDB-uzanto '%s'@'%%' jam ekzistas",
+    "Oracle connection could not be established" : "Konekto al Oracle ne povas stariĝi",
+    "Oracle username and/or password not valid" : "La uzantonomo de Oracle aŭ la pasvorto ne validas",
+    "PostgreSQL username and/or password not valid" : "La uzantonomo de PostgreSQL aŭ la pasvorto ne validas",
+    "Set an admin username." : "Starigi administran uzantonomon.",
+    "Set an admin password." : "Starigi administran pasvorton.",
+    "%s shared »%s« with you" : "%s kunhavigis “%s” kun vi",
+    "You are not allowed to share %s" : "Vi ne permesatas kunhavigi %s",
+    "Could not find category \"%s\"" : "Ne troviĝis kategorio “%s”",
+    "seconds ago" : "sekundoj antaŭe",
+    "_%n minute ago_::_%n minutes ago_" : ["","antaŭ %n minutoj"],
+    "_%n hour ago_::_%n hours ago_" : ["","antaŭ %n horoj"],
+    "today" : "hodiaŭ",
+    "yesterday" : "hieraŭ",
+    "_%n day go_::_%n days ago_" : ["","antaŭ %n tagoj"],
+    "last month" : "lastamonate",
+    "_%n month ago_::_%n months ago_" : ["","antaŭ %n monatoj"],
+    "last year" : "lastajare",
+    "years ago" : "jaroj antaŭe",
+    "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",
+    "The username is already being used" : "La uzantonomo jam uzatas",
+    "Please ask your server administrator to install the module." : "Bonvolu peti vian sistemadministranton, ke ĝi instalu la modulon.",
+    "PHP module %s not installed." : "La PHP-modulo %s ne instalitas.",
+    "PHP %s or higher is required." : "PHP %s aŭ pli alta necesas.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 necesas"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
deleted file mode 100644
index cea288bfe06..00000000000
--- a/lib/l10n/eo.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"See %s" => "Vidi %s",
-"Help" => "Helpo",
-"Personal" => "Persona",
-"Settings" => "Agordo",
-"Users" => "Uzantoj",
-"Admin" => "Administranto",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "La aplikaĵo “%s” ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud.",
-"Unknown filetype" => "Ne konatas dosiertipo",
-"Invalid image" => "Ne validas bildo",
-"web services under your control" => "TTT-servoj regataj de vi",
-"App directory already exists" => "La dosierujo de la aplikaĵo jam ekzistas",
-"App does not provide an info.xml file" => "La aplikaĵo ne provizas dosieron info.xml",
-"App can't be installed because it is not compatible with this version of ownCloud" => "La aplikaĵo ne povas instaliĝi ĉar ĝi ne kongruas kun ĉi tiu eldono de ownCloud",
-"Application is not enabled" => "La aplikaĵo ne estas kapabligita",
-"Authentication error" => "Aŭtentiga eraro",
-"Token expired. Please reload page." => "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon.",
-"Unknown user" => "Nekonata uzanto",
-"%s enter the database username." => "%s enigu la uzantonomon de la datumbazo.",
-"%s enter the database name." => "%s enigu la nomon de la datumbazo.",
-"%s you may not use dots in the database name" => "%s vi ne povas uzi punktojn en la nomo de la datumbazo",
-"MS SQL username and/or password not valid: %s" => "La uzantonomo de MS SQL aŭ la pasvorto ne validas: %s",
-"MySQL/MariaDB username and/or password not valid" => "La MySQL/MariaDB-uzantonomo kajaŭ pasvorto ne validas.",
-"DB Error: \"%s\"" => "Datumbaza eraro: “%s”",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "La MySQL/MariaDB-uzanto '%s'@'localhost' jam ekzistas.",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "La MySQL/MariaDB-uzanto '%s'@'%%' jam ekzistas",
-"Oracle connection could not be established" => "Konekto al Oracle ne povas stariĝi",
-"Oracle username and/or password not valid" => "La uzantonomo de Oracle aŭ la pasvorto ne validas",
-"PostgreSQL username and/or password not valid" => "La uzantonomo de PostgreSQL aŭ la pasvorto ne validas",
-"Set an admin username." => "Starigi administran uzantonomon.",
-"Set an admin password." => "Starigi administran pasvorton.",
-"%s shared »%s« with you" => "%s kunhavigis “%s” kun vi",
-"You are not allowed to share %s" => "Vi ne permesatas kunhavigi %s",
-"Could not find category \"%s\"" => "Ne troviĝis kategorio “%s”",
-"seconds ago" => "sekundoj antaŭe",
-"_%n minute ago_::_%n minutes ago_" => array("","antaŭ %n minutoj"),
-"_%n hour ago_::_%n hours ago_" => array("","antaŭ %n horoj"),
-"today" => "hodiaŭ",
-"yesterday" => "hieraŭ",
-"_%n day go_::_%n days ago_" => array("","antaŭ %n tagoj"),
-"last month" => "lastamonate",
-"_%n month ago_::_%n months ago_" => array("","antaŭ %n monatoj"),
-"last year" => "lastajare",
-"years ago" => "jaroj antaŭe",
-"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",
-"The username is already being used" => "La uzantonomo jam uzatas",
-"Please ask your server administrator to install the module." => "Bonvolu peti vian sistemadministranton, ke ĝi instalu la modulon.",
-"PHP module %s not installed." => "La PHP-modulo %s ne instalitas.",
-"PHP %s or higher is required." => "PHP %s aŭ pli alta necesas.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 necesas"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
new file mode 100644
index 00000000000..76a44a4bed7
--- /dev/null
+++ b/lib/l10n/es.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "¡No se puede escribir en el directorio de Configuración!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Esto puede ser facilmente solucionado, dando permisos de escritura al directorio de configuración en el servidor Web",
+    "See %s" : "Mirar %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Esto puede ser facilmente solucionado, %sdando permisos de escritura al directorio de configuración en el servidor Web%s.",
+    "Sample configuration detected" : "Ejemplo de configuración detectado",
+    "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" : "Se ha detectado que el ejemplo de configuración ha sido copiado. Esto puede arruinar su instalación y es un caso para el que no se brinda soporte. Lea la documentación antes de hacer cambios en config.php",
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Ajustes",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "Recommended" : "Recomendado",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplicación \\\"%s\\\" no se puede instalar porque no es compatible con esta versión de ownCloud.",
+    "No app name specified" : "No se ha especificado nombre de la aplicación",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "web services under your control" : "Servicios web bajo su control",
+    "App directory already exists" : "El directorio de la aplicación ya existe",
+    "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
+    "No source specified when installing app" : "No se ha especificado origen cuando se ha instalado la aplicación",
+    "No href specified when installing app from http" : "No href especificado cuando se ha instalado la aplicación",
+    "No path specified when installing app from local file" : "Sin path especificado  cuando se ha instalado la aplicación desde el fichero local",
+    "Archives of type %s are not supported" : "Ficheros de tipo %s no son soportados",
+    "Failed to open archive when installing app" : "Fallo de apertura de fichero mientras se instala la aplicación",
+    "App does not provide an info.xml file" : "La aplicación no suministra un fichero info.xml",
+    "App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
+    "Application is not enabled" : "La aplicación no está habilitada",
+    "Authentication error" : "Error de autenticación",
+    "Token expired. Please reload page." : "Token expirado. Por favor, recarga la página.",
+    "Unknown user" : "Usuario desconocido",
+    "%s enter the database username." : "%s ingresar el usuario de la base de datos.",
+    "%s enter the database name." : "%s ingresar el nombre de la base de datos",
+    "%s you may not use dots in the database name" : "%s puede utilizar puntos en el nombre de la base de datos",
+    "MS SQL username and/or password not valid: %s" : "Usuario y/o contraseña de MS SQL no válidos: %s",
+    "You need to enter either an existing account or the administrator." : "Tiene que ingresar una cuenta existente o la del administrador.",
+    "MySQL/MariaDB username and/or password not valid" : "Nombre de usuario y/o contraseña de MySQL/MariaDB inválidos",
+    "DB Error: \"%s\"" : "Error BD: \"%s\"",
+    "Offending command was: \"%s\"" : "Comando infractor: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "El usuario de MySQL/MariaDB '%s'@'localhost' ya existe.",
+    "Drop this user from MySQL/MariaDB" : "Eliminar este usuario de MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "El usuario de MySQL/MariaDB '%s'@'%%' ya existe",
+    "Drop this user from MySQL/MariaDB." : "Eliminar este usuario de MySQL/MariaDB.",
+    "Oracle connection could not be established" : "No se pudo establecer la conexión a Oracle",
+    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle no válidos",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
+    "PostgreSQL username and/or password not valid" : "Usuario y/o contraseña de PostgreSQL no válidos",
+    "Set an admin username." : "Configurar un nombre de usuario del administrador",
+    "Set an admin password." : "Configurar la contraseña del administrador.",
+    "Can't create or write into the data directory %s" : "No es posible crear o escribir en el directorio de datos %s",
+    "%s shared »%s« with you" : "%s ha compartido »%s« contigo",
+    "Sharing %s failed, because the file does not exist" : "No se pudo compartir %s porque el archivo no existe",
+    "You are not allowed to share %s" : "Usted no está autorizado para compartir %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Compartiendo %s ha fallado, ya que el usuario %s es el dueño del elemento",
+    "Sharing %s failed, because the user %s does not exist" : "Compartiendo %s ha fallado, 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" : "Compartiendo %s ha fallado, ya que el usuario %s no es miembro de algún grupo que %s es miembro",
+    "Sharing %s failed, because this item is already shared with %s" : "Compartiendo %s ha fallado, ya que este elemento ya está compartido con %s",
+    "Sharing %s failed, because the group %s does not exist" : "Compartiendo %s ha fallado, ya que el grupo %s no existe",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Compartiendo %s ha fallado, 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Compartiendo %s ha fallado, ya que compartir con enlaces no está permitido",
+    "Share type %s is not valid for %s" : "Compartir tipo %s no es válido para %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "No se puede fijar fecha de caducidad. Archivos compartidos no pueden caducar luego de %s de ser compartidos",
+    "Cannot set expiration date. Expiration date is in the past" : "No se puede fijar la fecha de caducidad. La fecha de caducidad está en el pasado.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend",
+    "Sharing backend %s not found" : "El motor compartido %s no se ha encontrado",
+    "Sharing backend for %s not found" : "Motor compartido para %s no encontrado",
+    "Sharing %s failed, because the user %s is the original sharer" : "Compartiendo %s ha fallado, ya que el usuario %s es el compartidor original",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Compartiendo %s ha fallado, ya que los permisos superan los permisos otorgados a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Compartiendo %s ha fallado, ya que volver a compartir no está permitido",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "Compartir %s falló 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" : "Compartiendo %s ha fallado, ya que el archivo no pudo ser encontrado en el cache de archivo",
+    "Could not find category \"%s\"" : "No puede encontrar la categoria \"%s\"",
+    "seconds ago" : "hace segundos",
+    "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["Hace %n hora","Hace %n horas"],
+    "today" : "hoy",
+    "yesterday" : "ayer",
+    "_%n day go_::_%n days ago_" : ["Hace %n día","Hace %n días"],
+    "last month" : "mes pasado",
+    "_%n month ago_::_%n months ago_" : ["Hace %n mes","Hace %n meses"],
+    "last year" : "año pasado",
+    "years ago" : "hace años",
+    "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",
+    "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)",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Los permisos usualmente pueden ser  solucionados, %sdando permisos de escritura al directorio de configuración en el servidor Web%s.",
+    "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 ser facilmente solucionado, %sdando permisos de escritura al servidor Web en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.",
+    "Cannot create \"data\" directory (%s)" : "No puedo crear del directorio \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto puede ser solucionado <a href=\"%s\" target=\"_blank\">dando al servidor web permisos de escritura en el directorio raíz</a>.",
+    "Setting locale to %s failed" : "Falló la activación del idioma %s ",
+    "Please install one of these locales on your system and restart your webserver." : "Instale uno de estos idiomas en su sistema y reinicie su servidor web.",
+    "Please ask your server administrator to install the module." : "Consulte al administrador de su servidor para instalar el módulo.",
+    "PHP module %s not installed." : "El ódulo PHP %s no está instalado.",
+    "PHP %s or higher is required." : "Se requiere PHP %s o superior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Consulte a su administrador del servidor para actualizar PHP a la versión más reciente. Su versión de PHP ya no es apoyado por ownCloud y la comunidad PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe mode está habilitado. ownCloud requiere que se desactive para que funcione correctamente.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Modo Seguro de PHP es un entorno en desuso y en su mayoría inútil que debe ser desactivada. Contacte al administrador del servidor para desactivarlo en php.ini o en la configuración del servidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes está habilitado. ownCloud requiere que se desactive para que funcione correctamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes es un entorno en desuso y en su mayoría inútil que debe ser desactivada. Consulte a su administrador del servidor para desactivarlo en php.ini o en la configuración del servidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Los módulos PHP se han instalado, pero aparecen listados como si faltaran",
+    "Please ask your server administrator to restart the web server." : "Consulte al administrador de su servidor para reiniciar el servidor web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL 9 o superior requerido.",
+    "Please upgrade your database version" : "Actualice su versión de base de datos.",
+    "Error occurred while checking PostgreSQL version" : "Error ocurrido mientras se chequeaba la versión de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Por favor, asegúrese de que tiene PostgreSQL 9 o superior, o revise los registros para obtener más información acerca del error.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambie los permisos a 0770 para que el directorio no se pueda mostrar para otros usuarios.",
+    "Data directory (%s) is readable by other users" : "Directorio de datos (%s) se puede leer por otros usuarios.",
+    "Data directory (%s) is invalid" : "Directorio de datos (%s) no es válida",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifique que el directorio de datos contiene un archivo \".ocdata\" en su directorio raíz.",
+    "Could not obtain lock type %d on \"%s\"." : "No se pudo realizar el bloqueo %d en \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
new file mode 100644
index 00000000000..a6bee7f24db
--- /dev/null
+++ b/lib/l10n/es.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "¡No se puede escribir en el directorio de Configuración!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Esto puede ser facilmente solucionado, dando permisos de escritura al directorio de configuración en el servidor Web",
+    "See %s" : "Mirar %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Esto puede ser facilmente solucionado, %sdando permisos de escritura al directorio de configuración en el servidor Web%s.",
+    "Sample configuration detected" : "Ejemplo de configuración detectado",
+    "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" : "Se ha detectado que el ejemplo de configuración ha sido copiado. Esto puede arruinar su instalación y es un caso para el que no se brinda soporte. Lea la documentación antes de hacer cambios en config.php",
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Ajustes",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "Recommended" : "Recomendado",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplicación \\\"%s\\\" no se puede instalar porque no es compatible con esta versión de ownCloud.",
+    "No app name specified" : "No se ha especificado nombre de la aplicación",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "web services under your control" : "Servicios web bajo su control",
+    "App directory already exists" : "El directorio de la aplicación ya existe",
+    "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
+    "No source specified when installing app" : "No se ha especificado origen cuando se ha instalado la aplicación",
+    "No href specified when installing app from http" : "No href especificado cuando se ha instalado la aplicación",
+    "No path specified when installing app from local file" : "Sin path especificado  cuando se ha instalado la aplicación desde el fichero local",
+    "Archives of type %s are not supported" : "Ficheros de tipo %s no son soportados",
+    "Failed to open archive when installing app" : "Fallo de apertura de fichero mientras se instala la aplicación",
+    "App does not provide an info.xml file" : "La aplicación no suministra un fichero info.xml",
+    "App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
+    "Application is not enabled" : "La aplicación no está habilitada",
+    "Authentication error" : "Error de autenticación",
+    "Token expired. Please reload page." : "Token expirado. Por favor, recarga la página.",
+    "Unknown user" : "Usuario desconocido",
+    "%s enter the database username." : "%s ingresar el usuario de la base de datos.",
+    "%s enter the database name." : "%s ingresar el nombre de la base de datos",
+    "%s you may not use dots in the database name" : "%s puede utilizar puntos en el nombre de la base de datos",
+    "MS SQL username and/or password not valid: %s" : "Usuario y/o contraseña de MS SQL no válidos: %s",
+    "You need to enter either an existing account or the administrator." : "Tiene que ingresar una cuenta existente o la del administrador.",
+    "MySQL/MariaDB username and/or password not valid" : "Nombre de usuario y/o contraseña de MySQL/MariaDB inválidos",
+    "DB Error: \"%s\"" : "Error BD: \"%s\"",
+    "Offending command was: \"%s\"" : "Comando infractor: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "El usuario de MySQL/MariaDB '%s'@'localhost' ya existe.",
+    "Drop this user from MySQL/MariaDB" : "Eliminar este usuario de MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "El usuario de MySQL/MariaDB '%s'@'%%' ya existe",
+    "Drop this user from MySQL/MariaDB." : "Eliminar este usuario de MySQL/MariaDB.",
+    "Oracle connection could not be established" : "No se pudo establecer la conexión a Oracle",
+    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle no válidos",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
+    "PostgreSQL username and/or password not valid" : "Usuario y/o contraseña de PostgreSQL no válidos",
+    "Set an admin username." : "Configurar un nombre de usuario del administrador",
+    "Set an admin password." : "Configurar la contraseña del administrador.",
+    "Can't create or write into the data directory %s" : "No es posible crear o escribir en el directorio de datos %s",
+    "%s shared »%s« with you" : "%s ha compartido »%s« contigo",
+    "Sharing %s failed, because the file does not exist" : "No se pudo compartir %s porque el archivo no existe",
+    "You are not allowed to share %s" : "Usted no está autorizado para compartir %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Compartiendo %s ha fallado, ya que el usuario %s es el dueño del elemento",
+    "Sharing %s failed, because the user %s does not exist" : "Compartiendo %s ha fallado, 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" : "Compartiendo %s ha fallado, ya que el usuario %s no es miembro de algún grupo que %s es miembro",
+    "Sharing %s failed, because this item is already shared with %s" : "Compartiendo %s ha fallado, ya que este elemento ya está compartido con %s",
+    "Sharing %s failed, because the group %s does not exist" : "Compartiendo %s ha fallado, ya que el grupo %s no existe",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Compartiendo %s ha fallado, 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Compartiendo %s ha fallado, ya que compartir con enlaces no está permitido",
+    "Share type %s is not valid for %s" : "Compartir tipo %s no es válido para %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "No se puede fijar fecha de caducidad. Archivos compartidos no pueden caducar luego de %s de ser compartidos",
+    "Cannot set expiration date. Expiration date is in the past" : "No se puede fijar la fecha de caducidad. La fecha de caducidad está en el pasado.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend",
+    "Sharing backend %s not found" : "El motor compartido %s no se ha encontrado",
+    "Sharing backend for %s not found" : "Motor compartido para %s no encontrado",
+    "Sharing %s failed, because the user %s is the original sharer" : "Compartiendo %s ha fallado, ya que el usuario %s es el compartidor original",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Compartiendo %s ha fallado, ya que los permisos superan los permisos otorgados a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Compartiendo %s ha fallado, ya que volver a compartir no está permitido",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "Compartir %s falló 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" : "Compartiendo %s ha fallado, ya que el archivo no pudo ser encontrado en el cache de archivo",
+    "Could not find category \"%s\"" : "No puede encontrar la categoria \"%s\"",
+    "seconds ago" : "hace segundos",
+    "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["Hace %n hora","Hace %n horas"],
+    "today" : "hoy",
+    "yesterday" : "ayer",
+    "_%n day go_::_%n days ago_" : ["Hace %n día","Hace %n días"],
+    "last month" : "mes pasado",
+    "_%n month ago_::_%n months ago_" : ["Hace %n mes","Hace %n meses"],
+    "last year" : "año pasado",
+    "years ago" : "hace años",
+    "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",
+    "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)",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Los permisos usualmente pueden ser  solucionados, %sdando permisos de escritura al directorio de configuración en el servidor Web%s.",
+    "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 ser facilmente solucionado, %sdando permisos de escritura al servidor Web en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.",
+    "Cannot create \"data\" directory (%s)" : "No puedo crear del directorio \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto puede ser solucionado <a href=\"%s\" target=\"_blank\">dando al servidor web permisos de escritura en el directorio raíz</a>.",
+    "Setting locale to %s failed" : "Falló la activación del idioma %s ",
+    "Please install one of these locales on your system and restart your webserver." : "Instale uno de estos idiomas en su sistema y reinicie su servidor web.",
+    "Please ask your server administrator to install the module." : "Consulte al administrador de su servidor para instalar el módulo.",
+    "PHP module %s not installed." : "El ódulo PHP %s no está instalado.",
+    "PHP %s or higher is required." : "Se requiere PHP %s o superior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Consulte a su administrador del servidor para actualizar PHP a la versión más reciente. Su versión de PHP ya no es apoyado por ownCloud y la comunidad PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe mode está habilitado. ownCloud requiere que se desactive para que funcione correctamente.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Modo Seguro de PHP es un entorno en desuso y en su mayoría inútil que debe ser desactivada. Contacte al administrador del servidor para desactivarlo en php.ini o en la configuración del servidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes está habilitado. ownCloud requiere que se desactive para que funcione correctamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes es un entorno en desuso y en su mayoría inútil que debe ser desactivada. Consulte a su administrador del servidor para desactivarlo en php.ini o en la configuración del servidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Los módulos PHP se han instalado, pero aparecen listados como si faltaran",
+    "Please ask your server administrator to restart the web server." : "Consulte al administrador de su servidor para reiniciar el servidor web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL 9 o superior requerido.",
+    "Please upgrade your database version" : "Actualice su versión de base de datos.",
+    "Error occurred while checking PostgreSQL version" : "Error ocurrido mientras se chequeaba la versión de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Por favor, asegúrese de que tiene PostgreSQL 9 o superior, o revise los registros para obtener más información acerca del error.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor cambie los permisos a 0770 para que el directorio no se pueda mostrar para otros usuarios.",
+    "Data directory (%s) is readable by other users" : "Directorio de datos (%s) se puede leer por otros usuarios.",
+    "Data directory (%s) is invalid" : "Directorio de datos (%s) no es válida",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifique que el directorio de datos contiene un archivo \".ocdata\" en su directorio raíz.",
+    "Could not obtain lock type %d on \"%s\"." : "No se pudo realizar el bloqueo %d en \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
deleted file mode 100644
index 553ccd519fd..00000000000
--- a/lib/l10n/es.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "¡No se puede escribir en el directorio de Configuración!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Esto puede ser facilmente solucionado, dando permisos de escritura al directorio de configuración en el servidor Web",
-"See %s" => "Mirar %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Esto puede ser facilmente solucionado, %sdando permisos de escritura al directorio de configuración en el servidor Web%s.",
-"Sample configuration detected" => "Ejemplo de configuración detectado",
-"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" => "Se ha detectado que el ejemplo de configuración ha sido copiado. Esto puede arruinar su instalación y es un caso para el que no se brinda soporte. Lea la documentación antes de hacer cambios en config.php",
-"Help" => "Ayuda",
-"Personal" => "Personal",
-"Settings" => "Ajustes",
-"Users" => "Usuarios",
-"Admin" => "Administración",
-"Recommended" => "Recomendado",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "La aplicación \\\"%s\\\" no se puede instalar porque no es compatible con esta versión de ownCloud.",
-"No app name specified" => "No se ha especificado nombre de la aplicación",
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen inválida",
-"web services under your control" => "Servicios web bajo su control",
-"App directory already exists" => "El directorio de la aplicación ya existe",
-"Can't create app folder. Please fix permissions. %s" => "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
-"No source specified when installing app" => "No se ha especificado origen cuando se ha instalado la aplicación",
-"No href specified when installing app from http" => "No href especificado cuando se ha instalado la aplicación",
-"No path specified when installing app from local file" => "Sin path especificado  cuando se ha instalado la aplicación desde el fichero local",
-"Archives of type %s are not supported" => "Ficheros de tipo %s no son soportados",
-"Failed to open archive when installing app" => "Fallo de apertura de fichero mientras se instala la aplicación",
-"App does not provide an info.xml file" => "La aplicación no suministra un fichero info.xml",
-"App can't be installed because of not allowed code in the App" => "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
-"App can't be installed because it is not compatible with this version of ownCloud" => "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
-"Application is not enabled" => "La aplicación no está habilitada",
-"Authentication error" => "Error de autenticación",
-"Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
-"Unknown user" => "Usuario desconocido",
-"%s enter the database username." => "%s ingresar el usuario de la base de datos.",
-"%s enter the database name." => "%s ingresar el nombre de la base de datos",
-"%s you may not use dots in the database name" => "%s puede utilizar puntos en el nombre de la base de datos",
-"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
-"You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
-"MySQL/MariaDB username and/or password not valid" => "Nombre de usuario y/o contraseña de MySQL/MariaDB inválidos",
-"DB Error: \"%s\"" => "Error BD: \"%s\"",
-"Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "El usuario de MySQL/MariaDB '%s'@'localhost' ya existe.",
-"Drop this user from MySQL/MariaDB" => "Eliminar este usuario de MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "El usuario de MySQL/MariaDB '%s'@'%%' ya existe",
-"Drop this user from MySQL/MariaDB." => "Eliminar este usuario de MySQL/MariaDB.",
-"Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
-"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
-"Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
-"PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
-"Set an admin username." => "Configurar un nombre de usuario del administrador",
-"Set an admin password." => "Configurar la contraseña del administrador.",
-"Can't create or write into the data directory %s" => "No es posible crear o escribir en el directorio de datos %s",
-"%s shared »%s« with you" => "%s ha compartido »%s« contigo",
-"Sharing %s failed, because the file does not exist" => "No se pudo compartir %s porque el archivo no existe",
-"You are not allowed to share %s" => "Usted no está autorizado para compartir %s",
-"Sharing %s failed, because the user %s is the item owner" => "Compartiendo %s ha fallado, ya que el usuario %s es el dueño del elemento",
-"Sharing %s failed, because the user %s does not exist" => "Compartiendo %s ha fallado, 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" => "Compartiendo %s ha fallado, ya que el usuario %s no es miembro de algún grupo que %s es miembro",
-"Sharing %s failed, because this item is already shared with %s" => "Compartiendo %s ha fallado, ya que este elemento ya está compartido con %s",
-"Sharing %s failed, because the group %s does not exist" => "Compartiendo %s ha fallado, ya que el grupo %s no existe",
-"Sharing %s failed, because %s is not a member of the group %s" => "Compartiendo %s ha fallado, 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Compartiendo %s ha fallado, ya que compartir con enlaces no está permitido",
-"Share type %s is not valid for %s" => "Compartir tipo %s no es válido para %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Configuración de permisos para %s ha fallado, ya que los permisos superan los permisos dados a %s",
-"Setting permissions for %s failed, because the item was not found" => "Configuración de permisos para %s ha fallado, ya que el elemento no fue encontrado",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "No se puede fijar fecha de caducidad. Archivos compartidos no pueden caducar luego de %s de ser compartidos",
-"Cannot set expiration date. Expiration date is in the past" => "No se puede fijar la fecha de caducidad. La fecha de caducidad está en el pasado.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "El motor compartido %s debe implementar la interfaz OCP\\Share_Backend",
-"Sharing backend %s not found" => "El motor compartido %s no se ha encontrado",
-"Sharing backend for %s not found" => "Motor compartido para %s no encontrado",
-"Sharing %s failed, because the user %s is the original sharer" => "Compartiendo %s ha fallado, ya que el usuario %s es el compartidor original",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Compartiendo %s ha fallado, ya que los permisos superan los permisos otorgados a %s",
-"Sharing %s failed, because resharing is not allowed" => "Compartiendo %s ha fallado, ya que volver a compartir no está permitido",
-"Sharing %s failed, because the sharing backend for %s could not find its source" => "Compartir %s falló 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" => "Compartiendo %s ha fallado, ya que el archivo no pudo ser encontrado en el cache de archivo",
-"Could not find category \"%s\"" => "No puede encontrar la categoria \"%s\"",
-"seconds ago" => "hace segundos",
-"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
-"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
-"today" => "hoy",
-"yesterday" => "ayer",
-"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"),
-"last month" => "mes pasado",
-"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
-"last year" => "año pasado",
-"years ago" => "hace años",
-"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",
-"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)",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Los permisos usualmente pueden ser  solucionados, %sdando permisos de escritura al directorio de configuración en el servidor Web%s.",
-"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 ser facilmente solucionado, %sdando permisos de escritura al servidor Web en el directorio%s de apps o deshabilitando la tienda de apps en el archivo de configuración.",
-"Cannot create \"data\" directory (%s)" => "No puedo crear del directorio \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Esto puede ser solucionado <a href=\"%s\" target=\"_blank\">dando al servidor web permisos de escritura en el directorio raíz</a>.",
-"Setting locale to %s failed" => "Falló la activación del idioma %s ",
-"Please install one of these locales on your system and restart your webserver." => "Instale uno de estos idiomas en su sistema y reinicie su servidor web.",
-"Please ask your server administrator to install the module." => "Consulte al administrador de su servidor para instalar el módulo.",
-"PHP module %s not installed." => "El ódulo PHP %s no está instalado.",
-"PHP %s or higher is required." => "Se requiere PHP %s o superior.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Consulte a su administrador del servidor para actualizar PHP a la versión más reciente. Su versión de PHP ya no es apoyado por ownCloud y la comunidad PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe mode está habilitado. ownCloud requiere que se desactive para que funcione correctamente.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Modo Seguro de PHP es un entorno en desuso y en su mayoría inútil que debe ser desactivada. Contacte al administrador del servidor para desactivarlo en php.ini o en la configuración del servidor web.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes está habilitado. ownCloud requiere que se desactive para que funcione correctamente.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes es un entorno en desuso y en su mayoría inútil que debe ser desactivada. Consulte a su administrador del servidor para desactivarlo en php.ini o en la configuración del servidor web.",
-"PHP modules have been installed, but they are still listed as missing?" => "Los módulos PHP se han instalado, pero aparecen listados como si faltaran",
-"Please ask your server administrator to restart the web server." => "Consulte al administrador de su servidor para reiniciar el servidor web.",
-"PostgreSQL >= 9 required" => "PostgreSQL 9 o superior requerido.",
-"Please upgrade your database version" => "Actualice su versión de base de datos.",
-"Error occurred while checking PostgreSQL version" => "Error ocurrido mientras se chequeaba la versión de PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Por favor, asegúrese de que tiene PostgreSQL 9 o superior, o revise los registros para obtener más información acerca del error.",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Por favor cambie los permisos a 0770 para que el directorio no se pueda mostrar para otros usuarios.",
-"Data directory (%s) is readable by other users" => "Directorio de datos (%s) se puede leer por otros usuarios.",
-"Data directory (%s) is invalid" => "Directorio de datos (%s) no es válida",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Verifique que el directorio de datos contiene un archivo \".ocdata\" en su directorio raíz.",
-"Could not obtain lock type %d on \"%s\"." => "No se pudo realizar el bloqueo %d en \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_AR.js b/lib/l10n/es_AR.js
new file mode 100644
index 00000000000..eb60e6eacbe
--- /dev/null
+++ b/lib/l10n/es_AR.js
@@ -0,0 +1,56 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Configuración",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "No app name specified" : "No fue especificado el nombre de la app",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "web services under your control" : "servicios web sobre los que tenés control",
+    "App directory already exists" : "El directorio de la app ya existe",
+    "Can't create app folder. Please fix permissions. %s" : "No se puede crear el directorio para la app. Corregí los permisos. %s",
+    "No source specified when installing app" : "No se especificó el origen al instalar la app",
+    "No href specified when installing app from http" : "No se especificó href al instalar la app",
+    "No path specified when installing app from local file" : "No se especificó PATH al instalar la app desde el archivo local",
+    "Archives of type %s are not supported" : "No hay soporte para archivos de tipo %s",
+    "Failed to open archive when installing app" : "Error al abrir archivo mientras se instalaba la app",
+    "App does not provide an info.xml file" : "La app no suministra un archivo info.xml",
+    "App can't be installed because of not allowed code in the App" : "No puede ser instalada la app por tener código no autorizado",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "No se puede instalar la app porque no es compatible con esta versión de ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store",
+    "Application is not enabled" : "La aplicación no está habilitada",
+    "Authentication error" : "Error al autenticar",
+    "Token expired. Please reload page." : "Token expirado. Por favor, recargá la página.",
+    "%s enter the database username." : "%s Entrá el usuario de la base de datos",
+    "%s enter the database name." : "%s Entrá el nombre de la base de datos.",
+    "%s you may not use dots in the database name" : "%s no podés usar puntos en el nombre de la base de datos",
+    "MS SQL username and/or password not valid: %s" : "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
+    "You need to enter either an existing account or the administrator." : "Tenés que ingresar una cuenta existente o el administrador.",
+    "DB Error: \"%s\"" : "Error DB: \"%s\"",
+    "Offending command was: \"%s\"" : "El comando no comprendido es: \"%s\"",
+    "Oracle connection could not be established" : "No fue posible establecer la conexión a Oracle",
+    "Oracle username and/or password not valid" : "El nombre de usuario y/o contraseña no son válidos",
+    "Offending command was: \"%s\", name: %s, password: %s" : "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
+    "PostgreSQL username and/or password not valid" : "Nombre de usuario o contraseña PostgradeSQL inválido.",
+    "Set an admin username." : "Configurar un nombre de administrador.",
+    "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\"",
+    "seconds ago" : "segundos atrás",
+    "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["Hace %n hora","Hace %n horas"],
+    "today" : "hoy",
+    "yesterday" : "ayer",
+    "_%n day go_::_%n days ago_" : ["Hace %n día","Hace %n días"],
+    "last month" : "el mes pasado",
+    "_%n month ago_::_%n months ago_" : ["Hace %n mes","Hace %n meses"],
+    "last year" : "el año pasado",
+    "years ago" : "años atrás",
+    "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"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_AR.json b/lib/l10n/es_AR.json
new file mode 100644
index 00000000000..237819d2837
--- /dev/null
+++ b/lib/l10n/es_AR.json
@@ -0,0 +1,54 @@
+{ "translations": {
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Configuración",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "No app name specified" : "No fue especificado el nombre de la app",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "web services under your control" : "servicios web sobre los que tenés control",
+    "App directory already exists" : "El directorio de la app ya existe",
+    "Can't create app folder. Please fix permissions. %s" : "No se puede crear el directorio para la app. Corregí los permisos. %s",
+    "No source specified when installing app" : "No se especificó el origen al instalar la app",
+    "No href specified when installing app from http" : "No se especificó href al instalar la app",
+    "No path specified when installing app from local file" : "No se especificó PATH al instalar la app desde el archivo local",
+    "Archives of type %s are not supported" : "No hay soporte para archivos de tipo %s",
+    "Failed to open archive when installing app" : "Error al abrir archivo mientras se instalaba la app",
+    "App does not provide an info.xml file" : "La app no suministra un archivo info.xml",
+    "App can't be installed because of not allowed code in the App" : "No puede ser instalada la app por tener código no autorizado",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "No se puede instalar la app porque no es compatible con esta versión de ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store",
+    "Application is not enabled" : "La aplicación no está habilitada",
+    "Authentication error" : "Error al autenticar",
+    "Token expired. Please reload page." : "Token expirado. Por favor, recargá la página.",
+    "%s enter the database username." : "%s Entrá el usuario de la base de datos",
+    "%s enter the database name." : "%s Entrá el nombre de la base de datos.",
+    "%s you may not use dots in the database name" : "%s no podés usar puntos en el nombre de la base de datos",
+    "MS SQL username and/or password not valid: %s" : "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
+    "You need to enter either an existing account or the administrator." : "Tenés que ingresar una cuenta existente o el administrador.",
+    "DB Error: \"%s\"" : "Error DB: \"%s\"",
+    "Offending command was: \"%s\"" : "El comando no comprendido es: \"%s\"",
+    "Oracle connection could not be established" : "No fue posible establecer la conexión a Oracle",
+    "Oracle username and/or password not valid" : "El nombre de usuario y/o contraseña no son válidos",
+    "Offending command was: \"%s\", name: %s, password: %s" : "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
+    "PostgreSQL username and/or password not valid" : "Nombre de usuario o contraseña PostgradeSQL inválido.",
+    "Set an admin username." : "Configurar un nombre de administrador.",
+    "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\"",
+    "seconds ago" : "segundos atrás",
+    "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["Hace %n hora","Hace %n horas"],
+    "today" : "hoy",
+    "yesterday" : "ayer",
+    "_%n day go_::_%n days ago_" : ["Hace %n día","Hace %n días"],
+    "last month" : "el mes pasado",
+    "_%n month ago_::_%n months ago_" : ["Hace %n mes","Hace %n meses"],
+    "last year" : "el año pasado",
+    "years ago" : "años atrás",
+    "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);"
+}
\ No newline at end of file
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
deleted file mode 100644
index 85531b4ce7a..00000000000
--- a/lib/l10n/es_AR.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Ayuda",
-"Personal" => "Personal",
-"Settings" => "Configuración",
-"Users" => "Usuarios",
-"Admin" => "Administración",
-"No app name specified" => "No fue especificado el nombre de la app",
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen inválida",
-"web services under your control" => "servicios web sobre los que tenés control",
-"App directory already exists" => "El directorio de la app ya existe",
-"Can't create app folder. Please fix permissions. %s" => "No se puede crear el directorio para la app. Corregí los permisos. %s",
-"No source specified when installing app" => "No se especificó el origen al instalar la app",
-"No href specified when installing app from http" => "No se especificó href al instalar la app",
-"No path specified when installing app from local file" => "No se especificó PATH al instalar la app desde el archivo local",
-"Archives of type %s are not supported" => "No hay soporte para archivos de tipo %s",
-"Failed to open archive when installing app" => "Error al abrir archivo mientras se instalaba la app",
-"App does not provide an info.xml file" => "La app no suministra un archivo info.xml",
-"App can't be installed because of not allowed code in the App" => "No puede ser instalada la app por tener código no autorizado",
-"App can't be installed because it is not compatible with this version of ownCloud" => "No se puede instalar la app porque no es compatible con esta versión de ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "La app no se puede instalar porque contiene la etiqueta <shipped>true</shipped> que no está permitida para apps no distribuidas",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La app no puede ser instalada porque la versión en info.xml/version no es la misma que la establecida en el app store",
-"Application is not enabled" => "La aplicación no está habilitada",
-"Authentication error" => "Error al autenticar",
-"Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
-"%s enter the database username." => "%s Entrá el usuario de la base de datos",
-"%s enter the database name." => "%s Entrá el nombre de la base de datos.",
-"%s you may not use dots in the database name" => "%s no podés usar puntos en el nombre de la base de datos",
-"MS SQL username and/or password not valid: %s" => "Nombre de usuario y contraseña de MS SQL no son válidas: %s",
-"You need to enter either an existing account or the administrator." => "Tenés que ingresar una cuenta existente o el administrador.",
-"DB Error: \"%s\"" => "Error DB: \"%s\"",
-"Offending command was: \"%s\"" => "El comando no comprendido es: \"%s\"",
-"Oracle connection could not be established" => "No fue posible establecer la conexión a Oracle",
-"Oracle username and/or password not valid" => "El nombre de usuario y/o contraseña no son válidos",
-"Offending command was: \"%s\", name: %s, password: %s" => "El comando no comprendido es: \"%s\", nombre: \"%s\", contraseña: \"%s\"",
-"PostgreSQL username and/or password not valid" => "Nombre de usuario o contraseña PostgradeSQL inválido.",
-"Set an admin username." => "Configurar un nombre de administrador.",
-"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\"",
-"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
-"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
-"today" => "hoy",
-"yesterday" => "ayer",
-"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"),
-"last month" => "el mes pasado",
-"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
-"last year" => "el año pasado",
-"years ago" => "años atrás",
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_BO.js b/lib/l10n/es_BO.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/es_BO.js
@@ -0,0 +1,9 @@
+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/es_BO.json b/lib/l10n/es_BO.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/es_BO.json
@@ -0,0 +1,7 @@
+{ "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/es_BO.php b/lib/l10n/es_BO.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/es_BO.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_CL.js b/lib/l10n/es_CL.js
new file mode 100644
index 00000000000..12f107f8ddf
--- /dev/null
+++ b/lib/l10n/es_CL.js
@@ -0,0 +1,32 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "No se puede escribir en el directorio \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Generalmente esto se puede resolver otorgando permisos de escritura al servidor web en la carpeta configurada",
+    "See %s" : "Ver %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Generalmente esto se puede resolver %s otorgando permisos de escritura al servidor web en la carpeta configurada %s",
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Configuración",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplicación \\\"%s\\\" no puede ser instalada debido a que no es compatible con esta versión de ownCloud.",
+    "No app name specified" : "No se especificó el nombre de la aplicación",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen no válida",
+    "web services under your control" : "Servicios Web bajo su control",
+    "App directory already exists" : "El directorio de la aplicación ya existe",
+    "Can't create app folder. Please fix permissions. %s" : "No se puede crear el directorio de aplicación. Por favor corregir los permisos. %s",
+    "No source specified when installing app" : "No se especificó el origen al instalar la aplicación",
+    "seconds ago" : "segundos antes",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "hoy",
+    "yesterday" : "ayer",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "mes anterior",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "último año",
+    "years ago" : "años anteriores"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_CL.json b/lib/l10n/es_CL.json
new file mode 100644
index 00000000000..4c66ed935ac
--- /dev/null
+++ b/lib/l10n/es_CL.json
@@ -0,0 +1,30 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "No se puede escribir en el directorio \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Generalmente esto se puede resolver otorgando permisos de escritura al servidor web en la carpeta configurada",
+    "See %s" : "Ver %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Generalmente esto se puede resolver %s otorgando permisos de escritura al servidor web en la carpeta configurada %s",
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Configuración",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "La aplicación \\\"%s\\\" no puede ser instalada debido a que no es compatible con esta versión de ownCloud.",
+    "No app name specified" : "No se especificó el nombre de la aplicación",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen no válida",
+    "web services under your control" : "Servicios Web bajo su control",
+    "App directory already exists" : "El directorio de la aplicación ya existe",
+    "Can't create app folder. Please fix permissions. %s" : "No se puede crear el directorio de aplicación. Por favor corregir los permisos. %s",
+    "No source specified when installing app" : "No se especificó el origen al instalar la aplicación",
+    "seconds ago" : "segundos antes",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "hoy",
+    "yesterday" : "ayer",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "mes anterior",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "último año",
+    "years ago" : "años anteriores"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/es_CL.php b/lib/l10n/es_CL.php
deleted file mode 100644
index 7f7c4fe3f68..00000000000
--- a/lib/l10n/es_CL.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "No se puede escribir en el directorio \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Generalmente esto se puede resolver otorgando permisos de escritura al servidor web en la carpeta configurada",
-"See %s" => "Ver %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Generalmente esto se puede resolver %s otorgando permisos de escritura al servidor web en la carpeta configurada %s",
-"Help" => "Ayuda",
-"Personal" => "Personal",
-"Settings" => "Configuración",
-"Users" => "Usuarios",
-"Admin" => "Administración",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "La aplicación \\\"%s\\\" no puede ser instalada debido a que no es compatible con esta versión de ownCloud.",
-"No app name specified" => "No se especificó el nombre de la aplicación",
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen no válida",
-"web services under your control" => "Servicios Web bajo su control",
-"App directory already exists" => "El directorio de la aplicación ya existe",
-"Can't create app folder. Please fix permissions. %s" => "No se puede crear el directorio de aplicación. Por favor corregir los permisos. %s",
-"No source specified when installing app" => "No se especificó el origen al instalar la aplicación",
-"seconds ago" => "segundos antes",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "hoy",
-"yesterday" => "ayer",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "mes anterior",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "último año",
-"years ago" => "años anteriores"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_CO.js b/lib/l10n/es_CO.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/es_CO.js
@@ -0,0 +1,9 @@
+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/es_CO.json b/lib/l10n/es_CO.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/es_CO.json
@@ -0,0 +1,7 @@
+{ "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/es_CO.php b/lib/l10n/es_CO.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/es_CO.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_CR.js b/lib/l10n/es_CR.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/es_CR.js
@@ -0,0 +1,9 @@
+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/es_CR.json b/lib/l10n/es_CR.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/es_CR.json
@@ -0,0 +1,7 @@
+{ "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/es_CR.php b/lib/l10n/es_CR.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/es_CR.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_EC.js b/lib/l10n/es_EC.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/es_EC.js
@@ -0,0 +1,9 @@
+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/es_EC.json b/lib/l10n/es_EC.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/es_EC.json
@@ -0,0 +1,7 @@
+{ "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/es_EC.php b/lib/l10n/es_EC.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/es_EC.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_MX.js b/lib/l10n/es_MX.js
new file mode 100644
index 00000000000..2e2083415e5
--- /dev/null
+++ b/lib/l10n/es_MX.js
@@ -0,0 +1,56 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Ajustes",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "No app name specified" : "No se ha especificado nombre de la aplicación",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "web services under your control" : "Servicios web bajo su control",
+    "App directory already exists" : "El directorio de la aplicación ya existe",
+    "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
+    "No source specified when installing app" : "No se ha especificado origen cuando se ha instalado la aplicación",
+    "No href specified when installing app from http" : "No href especificado cuando se ha instalado la aplicación",
+    "No path specified when installing app from local file" : "Sin path especificado cuando se ha instalado la aplicación desde el archivo local",
+    "Archives of type %s are not supported" : "Archivos de tipo %s no son soportados",
+    "Failed to open archive when installing app" : "Fallo de abrir archivo mientras se instala la aplicación",
+    "App does not provide an info.xml file" : "La aplicación no suministra un archivo info.xml",
+    "App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
+    "Application is not enabled" : "La aplicación no está habilitada",
+    "Authentication error" : "Error de autenticación",
+    "Token expired. Please reload page." : "Token expirado. Por favor, recarga la página.",
+    "%s enter the database username." : "%s ingresar el usuario de la base de datos.",
+    "%s enter the database name." : "%s ingresar el nombre de la base de datos",
+    "%s you may not use dots in the database name" : "%s puede utilizar puntos en el nombre de la base de datos",
+    "MS SQL username and/or password not valid: %s" : "Usuario y/o contraseña de MS SQL no válidos: %s",
+    "You need to enter either an existing account or the administrator." : "Tiene que ingresar una cuenta existente o la del administrador.",
+    "DB Error: \"%s\"" : "Error BD: \"%s\"",
+    "Offending command was: \"%s\"" : "Comando infractor: \"%s\"",
+    "Oracle connection could not be established" : "No se pudo establecer la conexión a Oracle",
+    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle no válidos",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
+    "PostgreSQL username and/or password not valid" : "Usuario y/o contraseña de PostgreSQL no válidos",
+    "Set an admin username." : "Configurar un nombre de usuario del administrador",
+    "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\"",
+    "seconds ago" : "hace segundos",
+    "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["Hace %n hora","Hace %n horas"],
+    "today" : "hoy",
+    "yesterday" : "ayer",
+    "_%n day go_::_%n days ago_" : ["Hace %n día","Hace %n días"],
+    "last month" : "mes pasado",
+    "_%n month ago_::_%n months ago_" : ["Hace %n mes","Hace %n meses"],
+    "last year" : "año pasado",
+    "years ago" : "hace años",
+    "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"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/es_MX.json b/lib/l10n/es_MX.json
new file mode 100644
index 00000000000..b9fe48a6eea
--- /dev/null
+++ b/lib/l10n/es_MX.json
@@ -0,0 +1,54 @@
+{ "translations": {
+    "Help" : "Ayuda",
+    "Personal" : "Personal",
+    "Settings" : "Ajustes",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "No app name specified" : "No se ha especificado nombre de la aplicación",
+    "Unknown filetype" : "Tipo de archivo desconocido",
+    "Invalid image" : "Imagen inválida",
+    "web services under your control" : "Servicios web bajo su control",
+    "App directory already exists" : "El directorio de la aplicación ya existe",
+    "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
+    "No source specified when installing app" : "No se ha especificado origen cuando se ha instalado la aplicación",
+    "No href specified when installing app from http" : "No href especificado cuando se ha instalado la aplicación",
+    "No path specified when installing app from local file" : "Sin path especificado cuando se ha instalado la aplicación desde el archivo local",
+    "Archives of type %s are not supported" : "Archivos de tipo %s no son soportados",
+    "Failed to open archive when installing app" : "Fallo de abrir archivo mientras se instala la aplicación",
+    "App does not provide an info.xml file" : "La aplicación no suministra un archivo info.xml",
+    "App can't be installed because of not allowed code in the App" : "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
+    "Application is not enabled" : "La aplicación no está habilitada",
+    "Authentication error" : "Error de autenticación",
+    "Token expired. Please reload page." : "Token expirado. Por favor, recarga la página.",
+    "%s enter the database username." : "%s ingresar el usuario de la base de datos.",
+    "%s enter the database name." : "%s ingresar el nombre de la base de datos",
+    "%s you may not use dots in the database name" : "%s puede utilizar puntos en el nombre de la base de datos",
+    "MS SQL username and/or password not valid: %s" : "Usuario y/o contraseña de MS SQL no válidos: %s",
+    "You need to enter either an existing account or the administrator." : "Tiene que ingresar una cuenta existente o la del administrador.",
+    "DB Error: \"%s\"" : "Error BD: \"%s\"",
+    "Offending command was: \"%s\"" : "Comando infractor: \"%s\"",
+    "Oracle connection could not be established" : "No se pudo establecer la conexión a Oracle",
+    "Oracle username and/or password not valid" : "Usuario y/o contraseña de Oracle no válidos",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
+    "PostgreSQL username and/or password not valid" : "Usuario y/o contraseña de PostgreSQL no válidos",
+    "Set an admin username." : "Configurar un nombre de usuario del administrador",
+    "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\"",
+    "seconds ago" : "hace segundos",
+    "_%n minute ago_::_%n minutes ago_" : ["Hace %n minuto","Hace %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["Hace %n hora","Hace %n horas"],
+    "today" : "hoy",
+    "yesterday" : "ayer",
+    "_%n day go_::_%n days ago_" : ["Hace %n día","Hace %n días"],
+    "last month" : "mes pasado",
+    "_%n month ago_::_%n months ago_" : ["Hace %n mes","Hace %n meses"],
+    "last year" : "año pasado",
+    "years ago" : "hace años",
+    "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);"
+}
\ No newline at end of file
diff --git a/lib/l10n/es_MX.php b/lib/l10n/es_MX.php
deleted file mode 100644
index 4a3ff58cd74..00000000000
--- a/lib/l10n/es_MX.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Ayuda",
-"Personal" => "Personal",
-"Settings" => "Ajustes",
-"Users" => "Usuarios",
-"Admin" => "Administración",
-"No app name specified" => "No se ha especificado nombre de la aplicación",
-"Unknown filetype" => "Tipo de archivo desconocido",
-"Invalid image" => "Imagen inválida",
-"web services under your control" => "Servicios web bajo su control",
-"App directory already exists" => "El directorio de la aplicación ya existe",
-"Can't create app folder. Please fix permissions. %s" => "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
-"No source specified when installing app" => "No se ha especificado origen cuando se ha instalado la aplicación",
-"No href specified when installing app from http" => "No href especificado cuando se ha instalado la aplicación",
-"No path specified when installing app from local file" => "Sin path especificado cuando se ha instalado la aplicación desde el archivo local",
-"Archives of type %s are not supported" => "Archivos de tipo %s no son soportados",
-"Failed to open archive when installing app" => "Fallo de abrir archivo mientras se instala la aplicación",
-"App does not provide an info.xml file" => "La aplicación no suministra un archivo info.xml",
-"App can't be installed because of not allowed code in the App" => "La aplicación no puede ser instalada por tener código no autorizado en la aplicación",
-"App can't be installed because it is not compatible with this version of ownCloud" => "La aplicación no se puede instalar porque no es compatible con esta versión de ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "La aplicación no se puede instalar porque contiene la etiqueta\n<shipped>\ntrue\n</shipped>\nque no está permitida para aplicaciones no distribuidas",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "La aplicación no puede ser instalada por que la versión en info.xml/version no es la misma que la establecida en la app store",
-"Application is not enabled" => "La aplicación no está habilitada",
-"Authentication error" => "Error de autenticación",
-"Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
-"%s enter the database username." => "%s ingresar el usuario de la base de datos.",
-"%s enter the database name." => "%s ingresar el nombre de la base de datos",
-"%s you may not use dots in the database name" => "%s puede utilizar puntos en el nombre de la base de datos",
-"MS SQL username and/or password not valid: %s" => "Usuario y/o contraseña de MS SQL no válidos: %s",
-"You need to enter either an existing account or the administrator." => "Tiene que ingresar una cuenta existente o la del administrador.",
-"DB Error: \"%s\"" => "Error BD: \"%s\"",
-"Offending command was: \"%s\"" => "Comando infractor: \"%s\"",
-"Oracle connection could not be established" => "No se pudo establecer la conexión a Oracle",
-"Oracle username and/or password not valid" => "Usuario y/o contraseña de Oracle no válidos",
-"Offending command was: \"%s\", name: %s, password: %s" => "Comando infractor: \"%s\", nombre: %s, contraseña: %s",
-"PostgreSQL username and/or password not valid" => "Usuario y/o contraseña de PostgreSQL no válidos",
-"Set an admin username." => "Configurar un nombre de usuario del administrador",
-"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\"",
-"seconds ago" => "hace segundos",
-"_%n minute ago_::_%n minutes ago_" => array("Hace %n minuto","Hace %n minutos"),
-"_%n hour ago_::_%n hours ago_" => array("Hace %n hora","Hace %n horas"),
-"today" => "hoy",
-"yesterday" => "ayer",
-"_%n day go_::_%n days ago_" => array("Hace %n día","Hace %n días"),
-"last month" => "mes pasado",
-"_%n month ago_::_%n months ago_" => array("Hace %n mes","Hace %n meses"),
-"last year" => "año pasado",
-"years ago" => "hace años",
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_PE.js b/lib/l10n/es_PE.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/es_PE.js
@@ -0,0 +1,9 @@
+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/es_PE.json b/lib/l10n/es_PE.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/es_PE.json
@@ -0,0 +1,7 @@
+{ "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/es_PE.php b/lib/l10n/es_PE.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/es_PE.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_PY.js b/lib/l10n/es_PY.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/es_PY.js
@@ -0,0 +1,9 @@
+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/es_PY.json b/lib/l10n/es_PY.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/es_PY.json
@@ -0,0 +1,7 @@
+{ "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/es_PY.php b/lib/l10n/es_PY.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/es_PY.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_US.js b/lib/l10n/es_US.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/es_US.js
@@ -0,0 +1,9 @@
+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/es_US.json b/lib/l10n/es_US.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/es_US.json
@@ -0,0 +1,7 @@
+{ "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/es_US.php b/lib/l10n/es_US.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/es_US.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/es_UY.js b/lib/l10n/es_UY.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/es_UY.js
@@ -0,0 +1,9 @@
+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/es_UY.json b/lib/l10n/es_UY.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/es_UY.json
@@ -0,0 +1,7 @@
+{ "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/es_UY.php b/lib/l10n/es_UY.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/es_UY.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/et_EE.js b/lib/l10n/et_EE.js
new file mode 100644
index 00000000000..8fbc25c4403
--- /dev/null
+++ b/lib/l10n/et_EE.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Ei saa kirjutada \"config\" kataloogi!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Tavaliselt saab selle lahendada andes veebiserverile seatete kataloogile \"config\" kirjutusõigused",
+    "See %s" : "Vaata %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tavaliselt saab selle lahendada %s andes veebiserverile seadete kataloogile \"config\" kirjutusõigused %s",
+    "Sample configuration detected" : "Tuvastati näidisseaded",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Tuvastati, et kopeeriti näidisseaded. See võib lõhkuda sinu saidi ja see pole toetatud. Palun loe enne faili config.php muutmist dokumentatsiooni",
+    "Help" : "Abiinfo",
+    "Personal" : "Isiklik",
+    "Settings" : "Seaded",
+    "Users" : "Kasutajad",
+    "Admin" : "Admin",
+    "Recommended" : "Soovitatud",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Rakendit \\\"%s\\\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
+    "No app name specified" : "Ühegi rakendi nime pole määratletud",
+    "Unknown filetype" : "Tundmatu failitüüp",
+    "Invalid image" : "Vigane pilt",
+    "web services under your control" : "veebitenused sinu kontrolli all",
+    "App directory already exists" : "Rakendi kataloog on juba olemas",
+    "Can't create app folder. Please fix permissions. %s" : "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s",
+    "No source specified when installing app" : "Ühegi lähteallikat pole rakendi paigalduseks määratletud",
+    "No href specified when installing app from http" : "Ühtegi aadressi pole määratletud rakendi paigalduseks veebist",
+    "No path specified when installing app from local file" : "Ühtegi teed pole määratletud paigaldamaks rakendit kohalikust failist",
+    "Archives of type %s are not supported" : "%s tüüpi arhiivid pole toetatud",
+    "Failed to open archive when installing app" : "Arhiivi avamine ebaõnnestus rakendi paigalduse käigus",
+    "App does not provide an info.xml file" : "Rakend ei paku ühtegi info.xml faili",
+    "App can't be installed because of not allowed code in the App" : "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos.",
+    "Application is not enabled" : "Rakendus pole sisse lülitatud",
+    "Authentication error" : "Autentimise viga",
+    "Token expired. Please reload page." : "Kontrollkood aegus. Paelun lae leht uuesti.",
+    "Unknown user" : "Tundmatu kasutaja",
+    "%s enter the database username." : "%s sisesta andmebaasi kasutajatunnus.",
+    "%s enter the database name." : "%s sisesta andmebaasi nimi.",
+    "%s you may not use dots in the database name" : "%s punktide kasutamine andmebaasi nimes pole lubatud",
+    "MS SQL username and/or password not valid: %s" : "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
+    "You need to enter either an existing account or the administrator." : "Sisesta kas juba olemasolev konto või administrator.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB kasutajatunnus ja/või parool pole õiged",
+    "DB Error: \"%s\"" : "Andmebaasi viga: \"%s\"",
+    "Offending command was: \"%s\"" : "Tõrkuv käsk oli: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB kasutaja '%s'@'localhost' on juba olemas.",
+    "Drop this user from MySQL/MariaDB" : "Kustuta see MySQL/MariaDB kasutaja",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB user '%s'@'%%' on juba olemas",
+    "Drop this user from MySQL/MariaDB." : "Kustuta see MySQL/MariaDB kasutaja.",
+    "Oracle connection could not be established" : "Ei suuda luua ühendust Oracle baasiga",
+    "Oracle username and/or password not valid" : "Oracle kasutajatunnus ja/või parool pole õiged",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL kasutajatunnus ja/või parool pole õiged",
+    "Set an admin username." : "Määra admin kasutajanimi.",
+    "Set an admin password." : "Määra admini parool.",
+    "Can't create or write into the data directory %s" : "Ei suuda luua või kirjutada andmete kataloogi %s",
+    "%s shared »%s« with you" : "%s jagas sinuga »%s«",
+    "Sharing %s failed, because the file does not exist" : "%s jagamine ebaõnnestus, kuna faili pole olemas",
+    "You are not allowed to share %s" : "Sul pole lubatud %s jagada",
+    "Sharing %s failed, because the user %s is the item owner" : "%s jagamine ebaõnnestus, kuna kuna kasutaja %s on üksuse omanik",
+    "Sharing %s failed, because the user %s does not exist" : "%s jagamine ebaõnnestus, kuna kasutajat %s pole olemas",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s jagamine ebaõnnestus, kuna kasutaja %s pole ühegi grupi liige, millede liige on %s",
+    "Sharing %s failed, because this item is already shared with %s" : "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s",
+    "Sharing %s failed, because the group %s does not exist" : "%s jagamine ebaõnnestus, kuna gruppi %s pole olemas",
+    "Sharing %s failed, because %s is not a member of the group %s" : "%s jagamine ebaõnnestus, kuna %s pole grupi %s liige",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Avaliku viite tekitamiseks pead sisestama parooli, ainult kaitstud viited on lubatud",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s jagamine ebaõnnestus, kuna linkidega jagamine pole lubatud",
+    "Share type %s is not valid for %s" : "Jagamise tüüp %s ei ole õige %s jaoks",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Lubade seadistus %s jaoks ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi",
+    "Setting permissions for %s failed, because the item was not found" : "Lubade seadistus %s jaoks ebaõnnestus, kuna üksust ei leitud",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Aegumise kuupäeva ei saa määrata. Jagamised ei saa aeguda hiljem kui %s peale jagamist.",
+    "Cannot set expiration date. Expiration date is in the past" : "Aegumiskuupäeva ei saa määrata. Aegumise kuupäev on minevikus",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese",
+    "Sharing backend %s not found" : "Jagamise tagarakendit %s ei leitud",
+    "Sharing backend for %s not found" : "Jagamise tagarakendit %s jaoks ei leitud",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s jagamine ebaõnnestus, kuna kasutaja %s on algne jagaja",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s jagamine ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi",
+    "Sharing %s failed, because resharing is not allowed" : "%s jagamine ebaõnnestus, kuna edasijagamine pole lubatud",
+    "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\"",
+    "seconds ago" : "sekundit tagasi",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minutit tagasi"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n tundi tagasi"],
+    "today" : "täna",
+    "yesterday" : "eile",
+    "_%n day go_::_%n days ago_" : ["","%n päeva tagasi"],
+    "last month" : "viimasel kuul",
+    "_%n month ago_::_%n months ago_" : ["","%n kuud tagasi"],
+    "last year" : "viimasel aastal",
+    "years ago" : "aastat tagasi",
+    "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",
+    "The username is already being used" : "Kasutajanimi on juba kasutuses",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ühtegi andmebaasi (sqlite, mysql või postgresql) draiverit pole paigaldatud.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Õigused saab tavaliselt paika %s andes veebiserverile juurkataloogile kirjutusõigused %s",
+    "Cannot write into \"config\" directory" : "Ei saa kirjutada \"config\" kataloogi",
+    "Cannot write into \"apps\" directory" : "Ei saa kirjutada \"apps\" kataloogi!",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Tavaliselt saab selle lahendada %s andes veebiserverile rakendite kataloogile kirjutusõigused %s või keelates seadetes rakendikogu.",
+    "Cannot create \"data\" directory (%s)" : "Ei suuda luua \"data\" kataloogi (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Tavaliselt saab selle lahendada <a href=\"%s\" target=\"_blank\">andes veebiserverile juur-kataloogile kirjutusõigused</a>.",
+    "Setting locale to %s failed" : "Lokaadi %s määramine ebaõnnestus.",
+    "Please install one of these locales on your system and restart your webserver." : "Palun paigalda mõni neist lokaatides oma süsteemi ning taaskäivita veebiserver.",
+    "Please ask your server administrator to install the module." : "Palu oma serveri haldajal moodul paigadalda.",
+    "PHP module %s not installed." : "PHP moodulit %s pole paigaldatud.",
+    "PHP %s or higher is required." : "PHP %s või uuem on nõutav.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Palu oma serveri haldajal uuendada PHP viimasele versioonile. Sinu PHP versioon pole enam toetatud ownCloud-i ja PHP kogukonna poolt.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode on lubatud. ownCloud vajab normaalseks toimimiseks, et see oleks keelatud.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode on aegunud ja üldiselt kasutu seadistus, mis tuleks keelata. Palu oma serveri haldajal see keelata php.ini failis või veebiserveri seadetes.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes on lubatud. ownCloud vajab normaalseks toimimiseks, et see oleks keelatud.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes on aegunud ja üldiselt kasutu seadistus, mis tuleks keelata. Palu oma serveri haldajal see keelata php.ini failis või veebiserveri seadetes.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moodulid on paigaldatud, kuid neid näitatakse endiselt kui puuduolevad?",
+    "Please ask your server administrator to restart the web server." : "Palu oma serveri haldajal veebiserver taaskäivitada.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 on nõutav",
+    "Please upgrade your database version" : "Palun uuenda oma andmebaasi versiooni",
+    "Error occurred while checking PostgreSQL version" : "Viga PostgreSQL versiooni kontrollimisel",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Palun veendu, et kasutad PostgreSQL >=9 või vaata logidest vea kohta detailsemat informatsiooni",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Palun muuda kataloogi õigused 0770-ks, et kataloogi sisu poleks teistele kasutajatele nähtav",
+    "Data directory (%s) is readable by other users" : "Andmete kataloog (%s) on teistele kasutajate loetav",
+    "Data directory (%s) is invalid" : "Andmete kataloog (%s) pole korrektne",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Palun veendu, et andmete kataloogis sisaldub fail \".ocdata\" ",
+    "Could not obtain lock type %d on \"%s\"." : "Ei suutnud hankida %d tüüpi lukustust \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/et_EE.json b/lib/l10n/et_EE.json
new file mode 100644
index 00000000000..099000bd74a
--- /dev/null
+++ b/lib/l10n/et_EE.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Ei saa kirjutada \"config\" kataloogi!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Tavaliselt saab selle lahendada andes veebiserverile seatete kataloogile \"config\" kirjutusõigused",
+    "See %s" : "Vaata %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tavaliselt saab selle lahendada %s andes veebiserverile seadete kataloogile \"config\" kirjutusõigused %s",
+    "Sample configuration detected" : "Tuvastati näidisseaded",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Tuvastati, et kopeeriti näidisseaded. See võib lõhkuda sinu saidi ja see pole toetatud. Palun loe enne faili config.php muutmist dokumentatsiooni",
+    "Help" : "Abiinfo",
+    "Personal" : "Isiklik",
+    "Settings" : "Seaded",
+    "Users" : "Kasutajad",
+    "Admin" : "Admin",
+    "Recommended" : "Soovitatud",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Rakendit \\\"%s\\\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
+    "No app name specified" : "Ühegi rakendi nime pole määratletud",
+    "Unknown filetype" : "Tundmatu failitüüp",
+    "Invalid image" : "Vigane pilt",
+    "web services under your control" : "veebitenused sinu kontrolli all",
+    "App directory already exists" : "Rakendi kataloog on juba olemas",
+    "Can't create app folder. Please fix permissions. %s" : "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s",
+    "No source specified when installing app" : "Ühegi lähteallikat pole rakendi paigalduseks määratletud",
+    "No href specified when installing app from http" : "Ühtegi aadressi pole määratletud rakendi paigalduseks veebist",
+    "No path specified when installing app from local file" : "Ühtegi teed pole määratletud paigaldamaks rakendit kohalikust failist",
+    "Archives of type %s are not supported" : "%s tüüpi arhiivid pole toetatud",
+    "Failed to open archive when installing app" : "Arhiivi avamine ebaõnnestus rakendi paigalduse käigus",
+    "App does not provide an info.xml file" : "Rakend ei paku ühtegi info.xml faili",
+    "App can't be installed because of not allowed code in the App" : "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos.",
+    "Application is not enabled" : "Rakendus pole sisse lülitatud",
+    "Authentication error" : "Autentimise viga",
+    "Token expired. Please reload page." : "Kontrollkood aegus. Paelun lae leht uuesti.",
+    "Unknown user" : "Tundmatu kasutaja",
+    "%s enter the database username." : "%s sisesta andmebaasi kasutajatunnus.",
+    "%s enter the database name." : "%s sisesta andmebaasi nimi.",
+    "%s you may not use dots in the database name" : "%s punktide kasutamine andmebaasi nimes pole lubatud",
+    "MS SQL username and/or password not valid: %s" : "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
+    "You need to enter either an existing account or the administrator." : "Sisesta kas juba olemasolev konto või administrator.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB kasutajatunnus ja/või parool pole õiged",
+    "DB Error: \"%s\"" : "Andmebaasi viga: \"%s\"",
+    "Offending command was: \"%s\"" : "Tõrkuv käsk oli: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB kasutaja '%s'@'localhost' on juba olemas.",
+    "Drop this user from MySQL/MariaDB" : "Kustuta see MySQL/MariaDB kasutaja",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB user '%s'@'%%' on juba olemas",
+    "Drop this user from MySQL/MariaDB." : "Kustuta see MySQL/MariaDB kasutaja.",
+    "Oracle connection could not be established" : "Ei suuda luua ühendust Oracle baasiga",
+    "Oracle username and/or password not valid" : "Oracle kasutajatunnus ja/või parool pole õiged",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL kasutajatunnus ja/või parool pole õiged",
+    "Set an admin username." : "Määra admin kasutajanimi.",
+    "Set an admin password." : "Määra admini parool.",
+    "Can't create or write into the data directory %s" : "Ei suuda luua või kirjutada andmete kataloogi %s",
+    "%s shared »%s« with you" : "%s jagas sinuga »%s«",
+    "Sharing %s failed, because the file does not exist" : "%s jagamine ebaõnnestus, kuna faili pole olemas",
+    "You are not allowed to share %s" : "Sul pole lubatud %s jagada",
+    "Sharing %s failed, because the user %s is the item owner" : "%s jagamine ebaõnnestus, kuna kuna kasutaja %s on üksuse omanik",
+    "Sharing %s failed, because the user %s does not exist" : "%s jagamine ebaõnnestus, kuna kasutajat %s pole olemas",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s jagamine ebaõnnestus, kuna kasutaja %s pole ühegi grupi liige, millede liige on %s",
+    "Sharing %s failed, because this item is already shared with %s" : "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s",
+    "Sharing %s failed, because the group %s does not exist" : "%s jagamine ebaõnnestus, kuna gruppi %s pole olemas",
+    "Sharing %s failed, because %s is not a member of the group %s" : "%s jagamine ebaõnnestus, kuna %s pole grupi %s liige",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Avaliku viite tekitamiseks pead sisestama parooli, ainult kaitstud viited on lubatud",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s jagamine ebaõnnestus, kuna linkidega jagamine pole lubatud",
+    "Share type %s is not valid for %s" : "Jagamise tüüp %s ei ole õige %s jaoks",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Lubade seadistus %s jaoks ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi",
+    "Setting permissions for %s failed, because the item was not found" : "Lubade seadistus %s jaoks ebaõnnestus, kuna üksust ei leitud",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Aegumise kuupäeva ei saa määrata. Jagamised ei saa aeguda hiljem kui %s peale jagamist.",
+    "Cannot set expiration date. Expiration date is in the past" : "Aegumiskuupäeva ei saa määrata. Aegumise kuupäev on minevikus",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese",
+    "Sharing backend %s not found" : "Jagamise tagarakendit %s ei leitud",
+    "Sharing backend for %s not found" : "Jagamise tagarakendit %s jaoks ei leitud",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s jagamine ebaõnnestus, kuna kasutaja %s on algne jagaja",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s jagamine ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi",
+    "Sharing %s failed, because resharing is not allowed" : "%s jagamine ebaõnnestus, kuna edasijagamine pole lubatud",
+    "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\"",
+    "seconds ago" : "sekundit tagasi",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minutit tagasi"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n tundi tagasi"],
+    "today" : "täna",
+    "yesterday" : "eile",
+    "_%n day go_::_%n days ago_" : ["","%n päeva tagasi"],
+    "last month" : "viimasel kuul",
+    "_%n month ago_::_%n months ago_" : ["","%n kuud tagasi"],
+    "last year" : "viimasel aastal",
+    "years ago" : "aastat tagasi",
+    "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",
+    "The username is already being used" : "Kasutajanimi on juba kasutuses",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ühtegi andmebaasi (sqlite, mysql või postgresql) draiverit pole paigaldatud.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Õigused saab tavaliselt paika %s andes veebiserverile juurkataloogile kirjutusõigused %s",
+    "Cannot write into \"config\" directory" : "Ei saa kirjutada \"config\" kataloogi",
+    "Cannot write into \"apps\" directory" : "Ei saa kirjutada \"apps\" kataloogi!",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Tavaliselt saab selle lahendada %s andes veebiserverile rakendite kataloogile kirjutusõigused %s või keelates seadetes rakendikogu.",
+    "Cannot create \"data\" directory (%s)" : "Ei suuda luua \"data\" kataloogi (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Tavaliselt saab selle lahendada <a href=\"%s\" target=\"_blank\">andes veebiserverile juur-kataloogile kirjutusõigused</a>.",
+    "Setting locale to %s failed" : "Lokaadi %s määramine ebaõnnestus.",
+    "Please install one of these locales on your system and restart your webserver." : "Palun paigalda mõni neist lokaatides oma süsteemi ning taaskäivita veebiserver.",
+    "Please ask your server administrator to install the module." : "Palu oma serveri haldajal moodul paigadalda.",
+    "PHP module %s not installed." : "PHP moodulit %s pole paigaldatud.",
+    "PHP %s or higher is required." : "PHP %s või uuem on nõutav.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Palu oma serveri haldajal uuendada PHP viimasele versioonile. Sinu PHP versioon pole enam toetatud ownCloud-i ja PHP kogukonna poolt.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode on lubatud. ownCloud vajab normaalseks toimimiseks, et see oleks keelatud.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode on aegunud ja üldiselt kasutu seadistus, mis tuleks keelata. Palu oma serveri haldajal see keelata php.ini failis või veebiserveri seadetes.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes on lubatud. ownCloud vajab normaalseks toimimiseks, et see oleks keelatud.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes on aegunud ja üldiselt kasutu seadistus, mis tuleks keelata. Palu oma serveri haldajal see keelata php.ini failis või veebiserveri seadetes.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moodulid on paigaldatud, kuid neid näitatakse endiselt kui puuduolevad?",
+    "Please ask your server administrator to restart the web server." : "Palu oma serveri haldajal veebiserver taaskäivitada.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 on nõutav",
+    "Please upgrade your database version" : "Palun uuenda oma andmebaasi versiooni",
+    "Error occurred while checking PostgreSQL version" : "Viga PostgreSQL versiooni kontrollimisel",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Palun veendu, et kasutad PostgreSQL >=9 või vaata logidest vea kohta detailsemat informatsiooni",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Palun muuda kataloogi õigused 0770-ks, et kataloogi sisu poleks teistele kasutajatele nähtav",
+    "Data directory (%s) is readable by other users" : "Andmete kataloog (%s) on teistele kasutajate loetav",
+    "Data directory (%s) is invalid" : "Andmete kataloog (%s) pole korrektne",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Palun veendu, et andmete kataloogis sisaldub fail \".ocdata\" ",
+    "Could not obtain lock type %d on \"%s\"." : "Ei suutnud hankida %d tüüpi lukustust \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
deleted file mode 100644
index 5dd406ac399..00000000000
--- a/lib/l10n/et_EE.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Ei saa kirjutada \"config\" kataloogi!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Tavaliselt saab selle lahendada andes veebiserverile seatete kataloogile \"config\" kirjutusõigused",
-"See %s" => "Vaata %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Tavaliselt saab selle lahendada %s andes veebiserverile seadete kataloogile \"config\" kirjutusõigused %s",
-"Sample configuration detected" => "Tuvastati näidisseaded",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Tuvastati, et kopeeriti näidisseaded. See võib lõhkuda sinu saidi ja see pole toetatud. Palun loe enne faili config.php muutmist dokumentatsiooni",
-"Help" => "Abiinfo",
-"Personal" => "Isiklik",
-"Settings" => "Seaded",
-"Users" => "Kasutajad",
-"Admin" => "Admin",
-"Recommended" => "Soovitatud",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Rakendit \\\"%s\\\" ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
-"No app name specified" => "Ühegi rakendi nime pole määratletud",
-"Unknown filetype" => "Tundmatu failitüüp",
-"Invalid image" => "Vigane pilt",
-"web services under your control" => "veebitenused sinu kontrolli all",
-"App directory already exists" => "Rakendi kataloog on juba olemas",
-"Can't create app folder. Please fix permissions. %s" => "Ei saa luua rakendi kataloogi. Palun korrigeeri õigusi. %s",
-"No source specified when installing app" => "Ühegi lähteallikat pole rakendi paigalduseks määratletud",
-"No href specified when installing app from http" => "Ühtegi aadressi pole määratletud rakendi paigalduseks veebist",
-"No path specified when installing app from local file" => "Ühtegi teed pole määratletud paigaldamaks rakendit kohalikust failist",
-"Archives of type %s are not supported" => "%s tüüpi arhiivid pole toetatud",
-"Failed to open archive when installing app" => "Arhiivi avamine ebaõnnestus rakendi paigalduse käigus",
-"App does not provide an info.xml file" => "Rakend ei paku ühtegi info.xml faili",
-"App can't be installed because of not allowed code in the App" => "Rakendit ei saa paigaldada, kuna sisaldab lubamatud koodi",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Rakendit ei saa paigaldada, kuna see pole ühilduv selle ownCloud versiooniga.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Rakendit ei saa paigaldada, kuna see sisaldab \n<shipped>\n\ntrue\n</shipped>\nmärgendit, mis pole lubatud mitte veetud (non shipped) rakendites",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Rakendit ei saa paigaldada, kuna selle versioon info.xml/version pole sama, mis on märgitud rakendite laos.",
-"Application is not enabled" => "Rakendus pole sisse lülitatud",
-"Authentication error" => "Autentimise viga",
-"Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
-"Unknown user" => "Tundmatu kasutaja",
-"%s enter the database username." => "%s sisesta andmebaasi kasutajatunnus.",
-"%s enter the database name." => "%s sisesta andmebaasi nimi.",
-"%s you may not use dots in the database name" => "%s punktide kasutamine andmebaasi nimes pole lubatud",
-"MS SQL username and/or password not valid: %s" => "MS SQL kasutajatunnus ja/või parool pole õiged: %s",
-"You need to enter either an existing account or the administrator." => "Sisesta kas juba olemasolev konto või administrator.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB kasutajatunnus ja/või parool pole õiged",
-"DB Error: \"%s\"" => "Andmebaasi viga: \"%s\"",
-"Offending command was: \"%s\"" => "Tõrkuv käsk oli: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB kasutaja '%s'@'localhost' on juba olemas.",
-"Drop this user from MySQL/MariaDB" => "Kustuta see MySQL/MariaDB kasutaja",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB user '%s'@'%%' on juba olemas",
-"Drop this user from MySQL/MariaDB." => "Kustuta see MySQL/MariaDB kasutaja.",
-"Oracle connection could not be established" => "Ei suuda luua ühendust Oracle baasiga",
-"Oracle username and/or password not valid" => "Oracle kasutajatunnus ja/või parool pole õiged",
-"Offending command was: \"%s\", name: %s, password: %s" => "Tõrkuv käsk oli: \"%s\", nimi: %s, parool: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL kasutajatunnus ja/või parool pole õiged",
-"Set an admin username." => "Määra admin kasutajanimi.",
-"Set an admin password." => "Määra admini parool.",
-"Can't create or write into the data directory %s" => "Ei suuda luua või kirjutada andmete kataloogi %s",
-"%s shared »%s« with you" => "%s jagas sinuga »%s«",
-"Sharing %s failed, because the file does not exist" => "%s jagamine ebaõnnestus, kuna faili pole olemas",
-"You are not allowed to share %s" => "Sul pole lubatud %s jagada",
-"Sharing %s failed, because the user %s is the item owner" => "%s jagamine ebaõnnestus, kuna kuna kasutaja %s on üksuse omanik",
-"Sharing %s failed, because the user %s does not exist" => "%s jagamine ebaõnnestus, kuna kasutajat %s pole olemas",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s jagamine ebaõnnestus, kuna kasutaja %s pole ühegi grupi liige, millede liige on %s",
-"Sharing %s failed, because this item is already shared with %s" => "%s jagamine ebaõnnestus, kuna see üksus on juba jagatud %s",
-"Sharing %s failed, because the group %s does not exist" => "%s jagamine ebaõnnestus, kuna gruppi %s pole olemas",
-"Sharing %s failed, because %s is not a member of the group %s" => "%s jagamine ebaõnnestus, kuna %s pole grupi %s liige",
-"You need to provide a password to create a public link, only protected links are allowed" => "Avaliku viite tekitamiseks pead sisestama parooli, ainult kaitstud viited on lubatud",
-"Sharing %s failed, because sharing with links is not allowed" => "%s jagamine ebaõnnestus, kuna linkidega jagamine pole lubatud",
-"Share type %s is not valid for %s" => "Jagamise tüüp %s ei ole õige %s jaoks",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Lubade seadistus %s jaoks ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi",
-"Setting permissions for %s failed, because the item was not found" => "Lubade seadistus %s jaoks ebaõnnestus, kuna üksust ei leitud",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Aegumise kuupäeva ei saa määrata. Jagamised ei saa aeguda hiljem kui %s peale jagamist.",
-"Cannot set expiration date. Expiration date is in the past" => "Aegumiskuupäeva ei saa määrata. Aegumise kuupäev on minevikus",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Jagamise tagarakend %s peab kasutusele võtma OCP\\Share_Backend liidese",
-"Sharing backend %s not found" => "Jagamise tagarakendit %s ei leitud",
-"Sharing backend for %s not found" => "Jagamise tagarakendit %s jaoks ei leitud",
-"Sharing %s failed, because the user %s is the original sharer" => "%s jagamine ebaõnnestus, kuna kasutaja %s on algne jagaja",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s jagamine ebaõnnestus, kuna antud õigused ületavad %s jaoks määratud õigusi",
-"Sharing %s failed, because resharing is not allowed" => "%s jagamine ebaõnnestus, kuna edasijagamine pole lubatud",
-"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\"",
-"seconds ago" => "sekundit tagasi",
-"_%n minute ago_::_%n minutes ago_" => array("","%n minutit tagasi"),
-"_%n hour ago_::_%n hours ago_" => array("","%n tundi tagasi"),
-"today" => "täna",
-"yesterday" => "eile",
-"_%n day go_::_%n days ago_" => array("","%n päeva tagasi"),
-"last month" => "viimasel kuul",
-"_%n month ago_::_%n months ago_" => array("","%n kuud tagasi"),
-"last year" => "viimasel aastal",
-"years ago" => "aastat tagasi",
-"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",
-"The username is already being used" => "Kasutajanimi on juba kasutuses",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Ühtegi andmebaasi (sqlite, mysql või postgresql) draiverit pole paigaldatud.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Õigused saab tavaliselt paika %s andes veebiserverile juurkataloogile kirjutusõigused %s",
-"Cannot write into \"config\" directory" => "Ei saa kirjutada \"config\" kataloogi",
-"Cannot write into \"apps\" directory" => "Ei saa kirjutada \"apps\" kataloogi!",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Tavaliselt saab selle lahendada %s andes veebiserverile rakendite kataloogile kirjutusõigused %s või keelates seadetes rakendikogu.",
-"Cannot create \"data\" directory (%s)" => "Ei suuda luua \"data\" kataloogi (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Tavaliselt saab selle lahendada <a href=\"%s\" target=\"_blank\">andes veebiserverile juur-kataloogile kirjutusõigused</a>.",
-"Setting locale to %s failed" => "Lokaadi %s määramine ebaõnnestus.",
-"Please install one of these locales on your system and restart your webserver." => "Palun paigalda mõni neist lokaatides oma süsteemi ning taaskäivita veebiserver.",
-"Please ask your server administrator to install the module." => "Palu oma serveri haldajal moodul paigadalda.",
-"PHP module %s not installed." => "PHP moodulit %s pole paigaldatud.",
-"PHP %s or higher is required." => "PHP %s või uuem on nõutav.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Palu oma serveri haldajal uuendada PHP viimasele versioonile. Sinu PHP versioon pole enam toetatud ownCloud-i ja PHP kogukonna poolt.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode on lubatud. ownCloud vajab normaalseks toimimiseks, et see oleks keelatud.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode on aegunud ja üldiselt kasutu seadistus, mis tuleks keelata. Palu oma serveri haldajal see keelata php.ini failis või veebiserveri seadetes.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes on lubatud. ownCloud vajab normaalseks toimimiseks, et see oleks keelatud.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes on aegunud ja üldiselt kasutu seadistus, mis tuleks keelata. Palu oma serveri haldajal see keelata php.ini failis või veebiserveri seadetes.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP moodulid on paigaldatud, kuid neid näitatakse endiselt kui puuduolevad?",
-"Please ask your server administrator to restart the web server." => "Palu oma serveri haldajal veebiserver taaskäivitada.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 on nõutav",
-"Please upgrade your database version" => "Palun uuenda oma andmebaasi versiooni",
-"Error occurred while checking PostgreSQL version" => "Viga PostgreSQL versiooni kontrollimisel",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Palun veendu, et kasutad PostgreSQL >=9 või vaata logidest vea kohta detailsemat informatsiooni",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Palun muuda kataloogi õigused 0770-ks, et kataloogi sisu poleks teistele kasutajatele nähtav",
-"Data directory (%s) is readable by other users" => "Andmete kataloog (%s) on teistele kasutajate loetav",
-"Data directory (%s) is invalid" => "Andmete kataloog (%s) pole korrektne",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Palun veendu, et andmete kataloogis sisaldub fail \".ocdata\" ",
-"Could not obtain lock type %d on \"%s\"." => "Ei suutnud hankida %d tüüpi lukustust \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js
new file mode 100644
index 00000000000..0c281671303
--- /dev/null
+++ b/lib/l10n/eu.js
@@ -0,0 +1,122 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Ezin da idatzi \"config\" karpetan!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Hau normalean konpondu daitekesweb zerbitzarira config karpetan idazteko baimenak emanez",
+    "See %s" : "Ikusi %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira config karpetan idazteko baimenak emanez%s.",
+    "Sample configuration detected" : "Adibide-ezarpena detektatua",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detektatu da adibide-ezarpena kopiatu dela. Honek zure instalazioa apur dezake eta ez da onartzen. Irakurri dokumentazioa config.php fitxategia aldatu aurretik.",
+    "Help" : "Laguntza",
+    "Personal" : "Pertsonala",
+    "Settings" : "Ezarpenak",
+    "Users" : "Erabiltzaileak",
+    "Admin" : "Admin",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "\\\"%s\\\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako.",
+    "No app name specified" : "Ez da aplikazioaren izena zehaztu",
+    "Unknown filetype" : "Fitxategi mota ezezaguna",
+    "Invalid image" : "Baliogabeko irudia",
+    "web services under your control" : "web zerbitzuak zure kontrolpean",
+    "App directory already exists" : "Aplikazioaren karpeta dagoeneko existitzen da",
+    "Can't create app folder. Please fix permissions. %s" : "Ezin izan da aplikazioaren karpeta sortu. Mesdez konpondu baimenak. %s",
+    "No source specified when installing app" : "Ez da jatorririk zehaztu aplikazioa instalatzerakoan",
+    "No href specified when installing app from http" : "Ez da href parametrorik zehaztu http bidez aplikazioa instalatzerakoan",
+    "No path specified when installing app from local file" : "Ez da kokalekurik zehaztu fitxategi lokal moduan aplikazioa instalatzerakoan",
+    "Archives of type %s are not supported" : "%s motako fitxategiak ez dira onartzen",
+    "Failed to open archive when installing app" : "Fitxategia irekitzeak huts egin du aplikazioa instalatzerakoan",
+    "App does not provide an info.xml file" : "Aplikazioak ez du info.xml fitxategia",
+    "App can't be installed because of not allowed code in the App" : "Aplikazioa ezin da instalatu bertan duen baimendu gabeko kodea dela eta",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikazioa ezin da instalatu <shipped>true</shipped> etiketa duelako eta etiketa hau ez da onartzen banaketan ez datozen aplikazioetan",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikazioa ezin da instalatu info.xml/version bertsioa ez delako \"app store\"an jartzen duenaren berdina",
+    "Application is not enabled" : "Aplikazioa ez dago gaituta",
+    "Authentication error" : "Autentifikazio errorea",
+    "Token expired. Please reload page." : "Tokena iraungitu da. Mesedez birkargatu orria.",
+    "Unknown user" : "Erabiltzaile ezezaguna",
+    "%s enter the database username." : "%s sartu datu basearen erabiltzaile izena.",
+    "%s enter the database name." : "%s sartu datu basearen izena.",
+    "%s you may not use dots in the database name" : "%s ezin duzu punturik erabili datu basearen izenean.",
+    "MS SQL username and/or password not valid: %s" : "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
+    "You need to enter either an existing account or the administrator." : "Existitzen den kontu bat edo administradorearena jarri behar duzu.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB erabiltzaile edota pasahitza ez dira egokiak",
+    "DB Error: \"%s\"" : "DB errorea: \"%s\"",
+    "Offending command was: \"%s\"" : "Errorea komando honek sortu du: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB '%s'@'localhost' erabiltzailea dagoeneko existitzen da.",
+    "Drop this user from MySQL/MariaDB" : "Ezabatu erabiltzaile hau MySQL/MariaDBtik",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB '%s'@'%%' erabiltzailea dagoeneko existitzen da",
+    "Drop this user from MySQL/MariaDB." : "Ezabatu erabiltzaile hau MySQL/MariaDBtik.",
+    "Oracle connection could not be established" : "Ezin da Oracle konexioa sortu",
+    "Oracle username and/or password not valid" : "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
+    "Set an admin username." : "Ezarri administraziorako erabiltzaile izena.",
+    "Set an admin password." : "Ezarri administraziorako pasahitza.",
+    "%s shared »%s« with you" : "%s-ek »%s« zurekin partekatu du",
+    "Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
+    "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
+    "Sharing %s failed, because the user %s is the item owner" : "%s elkarbanatzeak huts egin du, %s erabiltzailea jabea delako",
+    "Sharing %s failed, because the user %s does not exist" : "%s elkarbanatzeak huts egin du, %s erabiltzailea existitzen ez delako",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s elkarbanatzeak huts egin du, %s erabiltzailea ez delako %s partaide den talderen bateko partaidea",
+    "Sharing %s failed, because this item is already shared with %s" : "%s elkarbanatzeak huts egin du, dagoeneko %s erabiltzailearekin elkarbanatuta dagoelako",
+    "Sharing %s failed, because the group %s does not exist" : "%s elkarbanatzeak huts egin du, %s taldea ez delako existitzen",
+    "Sharing %s failed, because %s is not a member of the group %s" : "%s elkarbanatzeak huts egin du, %s ez delako %s taldearen partaidea",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako",
+    "Share type %s is not valid for %s" : "%s elkarbanaketa mota ez da %srentzako egokia",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%srentzako baimenak ezartzea huts egin du, baimenak %sri emandakoak baino gehiago direlako",
+    "Setting permissions for %s failed, because the item was not found" : "%srentzako baimenak ezartzea huts egin du, aurkitu ez delako",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ezin izan da jarri iraungitze data. Konpartitzea ezin da iraungi konpartitu eta %s ondoren.",
+    "Cannot set expiration date. Expiration date is in the past" : "Ezin da jarri iraungitze data. Iraungitze data iragan da.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s elkarbanaketa motorra  OCP\\Share_Backend interfazea inplementatu behar du ",
+    "Sharing backend %s not found" : "Ez da %s elkarbanaketa motorra aurkitu",
+    "Sharing backend for %s not found" : "Ez da %srako elkarbanaketa motorrik aurkitu",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s elkarbanatzeak huts egin du, %s erabiltzailea jatorrizko elkarbanatzailea delako",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s elkarbanatzeak huts egin du, baimenak %sri emandakoak baino gehiago direlako",
+    "Sharing %s failed, because resharing is not allowed" : "%s elkarbanatzeak huts egin du, ber-elkarbanatzea baimenduta ez dagoelako",
+    "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",
+    "seconds ago" : "segundu",
+    "_%n minute ago_::_%n minutes ago_" : ["orain dela minutu %n","orain dela %n minutu"],
+    "_%n hour ago_::_%n hours ago_" : ["orain dela ordu %n","orain dela %n ordu"],
+    "today" : "gaur",
+    "yesterday" : "atzo",
+    "_%n day go_::_%n days ago_" : ["orain dela egun %n","orain dela %n egun"],
+    "last month" : "joan den hilabetean",
+    "_%n month ago_::_%n months ago_" : ["orain dela hilabete %n","orain dela %n hilabete"],
+    "last year" : "joan den urtean",
+    "years ago" : "urte",
+    "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",
+    "The username is already being used" : "Erabiltzaile izena dagoeneko erabiltzen ari da",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ez dago datubaseen (sqlite, mysql edo postgresql) driverrik instalatuta.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira erro karpetan idazteko baimenak emanez%s.",
+    "Cannot write into \"config\" directory" : "Ezin da idatzi \"config\" karpetan",
+    "Cannot write into \"apps\" directory" : "Ezin da idatzi \"apps\" karpetan",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Hau normalean konpondu daiteke %sweb zerbitzarira apps karpetan idazteko baimenak emanez%s edo konfigurazio fitxategian appstorea ez gaituz.",
+    "Cannot create \"data\" directory (%s)" : "Ezin da \"data\" karpeta sortu (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Hau normalean konpondu daiteke  <a href=\"%s\" target=\"_blank\">web zerbitzarira erro karpetan idazteko baimenak emanez</a>.",
+    "Setting locale to %s failed" : "Lokala %sra ezartzeak huts egin du",
+    "Please install one of these locales on your system and restart your webserver." : "Instalatu hauetako lokal bat zure sisteman eta berrabiarazi zure web zerbitzaria.",
+    "Please ask your server administrator to install the module." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.",
+    "PHP module %s not installed." : "PHPren %s modulua ez dago instalaturik.",
+    "PHP %s or higher is required." : "PHP %s edo berriagoa behar da.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari PHP azkenengo bertsiora eguneratzea. Zure PHP bertsioa ez dute ez ownCloud eta ez PHP komunitateek mantentzen.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP SafeMode gaitua dago. ownCloudek ongi funtzionatzeko desgaitua behar du.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode ia erabiligabeko ezarpen zahar bat da eta desgaituta egon beharko luke. Mesedez eskatu zerbitzariaren kudeatzaileari php.ini edo zure web zerbitzariaren konfigurazioan desgaitu dezan.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes gaitua dago. ownCloudek ongi funtzionatzeko desgaitua behar du.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes ia erabiligabeko ezarpen zahar bat da eta desgaituta egon beharko luke. Mesedez eskatu zerbitzariaren kudeatzaileari php.ini edo zure web zerbitzariaren konfigurazioan desgaitu dezan.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moduluak instalatu dira, baina oraindik faltan bezala markatuta daude?",
+    "Please ask your server administrator to restart the web server." : "Mesedez eskatu zerbitzariaren kudeatzaileari web zerbitzaria berrabiarazteko.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 behar da",
+    "Please upgrade your database version" : "Mesedez eguneratu zure datu basearen bertsioa",
+    "Error occurred while checking PostgreSQL version" : "Errore bat gertatu da PostgreSQLren bertsioa egiaztatzerakoan",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Mesedez ziurtatu PostgreSQL >= 9 duzula edo begiratu logak erroreari buruzko informazio gehiago lortzeko",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Mesedez aldatu baimenak 0770ra beste erabiltzaileek karpetan sartu ezin izateko.",
+    "Data directory (%s) is readable by other users" : "Data karpeta (%s) beste erabiltzaileek irakur dezakete",
+    "Data directory (%s) is invalid" : "Datuen karpeta (%s) ez da baliogarria",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Mesedez egiaztatu data karpeta \".ocdata\" fitxategia duela bere erroan.",
+    "Could not obtain lock type %d on \"%s\"." : "Ezin da lortu sarraia mota %d \"%s\"-an."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json
new file mode 100644
index 00000000000..a8213f297e3
--- /dev/null
+++ b/lib/l10n/eu.json
@@ -0,0 +1,120 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Ezin da idatzi \"config\" karpetan!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Hau normalean konpondu daitekesweb zerbitzarira config karpetan idazteko baimenak emanez",
+    "See %s" : "Ikusi %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira config karpetan idazteko baimenak emanez%s.",
+    "Sample configuration detected" : "Adibide-ezarpena detektatua",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detektatu da adibide-ezarpena kopiatu dela. Honek zure instalazioa apur dezake eta ez da onartzen. Irakurri dokumentazioa config.php fitxategia aldatu aurretik.",
+    "Help" : "Laguntza",
+    "Personal" : "Pertsonala",
+    "Settings" : "Ezarpenak",
+    "Users" : "Erabiltzaileak",
+    "Admin" : "Admin",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "\\\"%s\\\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako.",
+    "No app name specified" : "Ez da aplikazioaren izena zehaztu",
+    "Unknown filetype" : "Fitxategi mota ezezaguna",
+    "Invalid image" : "Baliogabeko irudia",
+    "web services under your control" : "web zerbitzuak zure kontrolpean",
+    "App directory already exists" : "Aplikazioaren karpeta dagoeneko existitzen da",
+    "Can't create app folder. Please fix permissions. %s" : "Ezin izan da aplikazioaren karpeta sortu. Mesdez konpondu baimenak. %s",
+    "No source specified when installing app" : "Ez da jatorririk zehaztu aplikazioa instalatzerakoan",
+    "No href specified when installing app from http" : "Ez da href parametrorik zehaztu http bidez aplikazioa instalatzerakoan",
+    "No path specified when installing app from local file" : "Ez da kokalekurik zehaztu fitxategi lokal moduan aplikazioa instalatzerakoan",
+    "Archives of type %s are not supported" : "%s motako fitxategiak ez dira onartzen",
+    "Failed to open archive when installing app" : "Fitxategia irekitzeak huts egin du aplikazioa instalatzerakoan",
+    "App does not provide an info.xml file" : "Aplikazioak ez du info.xml fitxategia",
+    "App can't be installed because of not allowed code in the App" : "Aplikazioa ezin da instalatu bertan duen baimendu gabeko kodea dela eta",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikazioa ezin da instalatu <shipped>true</shipped> etiketa duelako eta etiketa hau ez da onartzen banaketan ez datozen aplikazioetan",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikazioa ezin da instalatu info.xml/version bertsioa ez delako \"app store\"an jartzen duenaren berdina",
+    "Application is not enabled" : "Aplikazioa ez dago gaituta",
+    "Authentication error" : "Autentifikazio errorea",
+    "Token expired. Please reload page." : "Tokena iraungitu da. Mesedez birkargatu orria.",
+    "Unknown user" : "Erabiltzaile ezezaguna",
+    "%s enter the database username." : "%s sartu datu basearen erabiltzaile izena.",
+    "%s enter the database name." : "%s sartu datu basearen izena.",
+    "%s you may not use dots in the database name" : "%s ezin duzu punturik erabili datu basearen izenean.",
+    "MS SQL username and/or password not valid: %s" : "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
+    "You need to enter either an existing account or the administrator." : "Existitzen den kontu bat edo administradorearena jarri behar duzu.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB erabiltzaile edota pasahitza ez dira egokiak",
+    "DB Error: \"%s\"" : "DB errorea: \"%s\"",
+    "Offending command was: \"%s\"" : "Errorea komando honek sortu du: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB '%s'@'localhost' erabiltzailea dagoeneko existitzen da.",
+    "Drop this user from MySQL/MariaDB" : "Ezabatu erabiltzaile hau MySQL/MariaDBtik",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB '%s'@'%%' erabiltzailea dagoeneko existitzen da",
+    "Drop this user from MySQL/MariaDB." : "Ezabatu erabiltzaile hau MySQL/MariaDBtik.",
+    "Oracle connection could not be established" : "Ezin da Oracle konexioa sortu",
+    "Oracle username and/or password not valid" : "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
+    "Set an admin username." : "Ezarri administraziorako erabiltzaile izena.",
+    "Set an admin password." : "Ezarri administraziorako pasahitza.",
+    "%s shared »%s« with you" : "%s-ek »%s« zurekin partekatu du",
+    "Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
+    "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
+    "Sharing %s failed, because the user %s is the item owner" : "%s elkarbanatzeak huts egin du, %s erabiltzailea jabea delako",
+    "Sharing %s failed, because the user %s does not exist" : "%s elkarbanatzeak huts egin du, %s erabiltzailea existitzen ez delako",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s elkarbanatzeak huts egin du, %s erabiltzailea ez delako %s partaide den talderen bateko partaidea",
+    "Sharing %s failed, because this item is already shared with %s" : "%s elkarbanatzeak huts egin du, dagoeneko %s erabiltzailearekin elkarbanatuta dagoelako",
+    "Sharing %s failed, because the group %s does not exist" : "%s elkarbanatzeak huts egin du, %s taldea ez delako existitzen",
+    "Sharing %s failed, because %s is not a member of the group %s" : "%s elkarbanatzeak huts egin du, %s ez delako %s taldearen partaidea",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako",
+    "Share type %s is not valid for %s" : "%s elkarbanaketa mota ez da %srentzako egokia",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%srentzako baimenak ezartzea huts egin du, baimenak %sri emandakoak baino gehiago direlako",
+    "Setting permissions for %s failed, because the item was not found" : "%srentzako baimenak ezartzea huts egin du, aurkitu ez delako",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ezin izan da jarri iraungitze data. Konpartitzea ezin da iraungi konpartitu eta %s ondoren.",
+    "Cannot set expiration date. Expiration date is in the past" : "Ezin da jarri iraungitze data. Iraungitze data iragan da.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s elkarbanaketa motorra  OCP\\Share_Backend interfazea inplementatu behar du ",
+    "Sharing backend %s not found" : "Ez da %s elkarbanaketa motorra aurkitu",
+    "Sharing backend for %s not found" : "Ez da %srako elkarbanaketa motorrik aurkitu",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s elkarbanatzeak huts egin du, %s erabiltzailea jatorrizko elkarbanatzailea delako",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s elkarbanatzeak huts egin du, baimenak %sri emandakoak baino gehiago direlako",
+    "Sharing %s failed, because resharing is not allowed" : "%s elkarbanatzeak huts egin du, ber-elkarbanatzea baimenduta ez dagoelako",
+    "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",
+    "seconds ago" : "segundu",
+    "_%n minute ago_::_%n minutes ago_" : ["orain dela minutu %n","orain dela %n minutu"],
+    "_%n hour ago_::_%n hours ago_" : ["orain dela ordu %n","orain dela %n ordu"],
+    "today" : "gaur",
+    "yesterday" : "atzo",
+    "_%n day go_::_%n days ago_" : ["orain dela egun %n","orain dela %n egun"],
+    "last month" : "joan den hilabetean",
+    "_%n month ago_::_%n months ago_" : ["orain dela hilabete %n","orain dela %n hilabete"],
+    "last year" : "joan den urtean",
+    "years ago" : "urte",
+    "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",
+    "The username is already being used" : "Erabiltzaile izena dagoeneko erabiltzen ari da",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ez dago datubaseen (sqlite, mysql edo postgresql) driverrik instalatuta.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Hau normalean konpondu daiteke %sweb zerbitzarira erro karpetan idazteko baimenak emanez%s.",
+    "Cannot write into \"config\" directory" : "Ezin da idatzi \"config\" karpetan",
+    "Cannot write into \"apps\" directory" : "Ezin da idatzi \"apps\" karpetan",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Hau normalean konpondu daiteke %sweb zerbitzarira apps karpetan idazteko baimenak emanez%s edo konfigurazio fitxategian appstorea ez gaituz.",
+    "Cannot create \"data\" directory (%s)" : "Ezin da \"data\" karpeta sortu (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Hau normalean konpondu daiteke  <a href=\"%s\" target=\"_blank\">web zerbitzarira erro karpetan idazteko baimenak emanez</a>.",
+    "Setting locale to %s failed" : "Lokala %sra ezartzeak huts egin du",
+    "Please install one of these locales on your system and restart your webserver." : "Instalatu hauetako lokal bat zure sisteman eta berrabiarazi zure web zerbitzaria.",
+    "Please ask your server administrator to install the module." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.",
+    "PHP module %s not installed." : "PHPren %s modulua ez dago instalaturik.",
+    "PHP %s or higher is required." : "PHP %s edo berriagoa behar da.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Mesedez eskatu zure zerbitzariaren kudeatzaileari PHP azkenengo bertsiora eguneratzea. Zure PHP bertsioa ez dute ez ownCloud eta ez PHP komunitateek mantentzen.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP SafeMode gaitua dago. ownCloudek ongi funtzionatzeko desgaitua behar du.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode ia erabiligabeko ezarpen zahar bat da eta desgaituta egon beharko luke. Mesedez eskatu zerbitzariaren kudeatzaileari php.ini edo zure web zerbitzariaren konfigurazioan desgaitu dezan.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes gaitua dago. ownCloudek ongi funtzionatzeko desgaitua behar du.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes ia erabiligabeko ezarpen zahar bat da eta desgaituta egon beharko luke. Mesedez eskatu zerbitzariaren kudeatzaileari php.ini edo zure web zerbitzariaren konfigurazioan desgaitu dezan.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moduluak instalatu dira, baina oraindik faltan bezala markatuta daude?",
+    "Please ask your server administrator to restart the web server." : "Mesedez eskatu zerbitzariaren kudeatzaileari web zerbitzaria berrabiarazteko.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 behar da",
+    "Please upgrade your database version" : "Mesedez eguneratu zure datu basearen bertsioa",
+    "Error occurred while checking PostgreSQL version" : "Errore bat gertatu da PostgreSQLren bertsioa egiaztatzerakoan",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Mesedez ziurtatu PostgreSQL >= 9 duzula edo begiratu logak erroreari buruzko informazio gehiago lortzeko",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Mesedez aldatu baimenak 0770ra beste erabiltzaileek karpetan sartu ezin izateko.",
+    "Data directory (%s) is readable by other users" : "Data karpeta (%s) beste erabiltzaileek irakur dezakete",
+    "Data directory (%s) is invalid" : "Datuen karpeta (%s) ez da baliogarria",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Mesedez egiaztatu data karpeta \".ocdata\" fitxategia duela bere erroan.",
+    "Could not obtain lock type %d on \"%s\"." : "Ezin da lortu sarraia mota %d \"%s\"-an."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
deleted file mode 100644
index b7b609d3754..00000000000
--- a/lib/l10n/eu.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Ezin da idatzi \"config\" karpetan!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Hau normalean konpondu daitekesweb zerbitzarira config karpetan idazteko baimenak emanez",
-"See %s" => "Ikusi %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Hau normalean konpondu daiteke %sweb zerbitzarira config karpetan idazteko baimenak emanez%s.",
-"Sample configuration detected" => "Adibide-ezarpena detektatua",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Detektatu da adibide-ezarpena kopiatu dela. Honek zure instalazioa apur dezake eta ez da onartzen. Irakurri dokumentazioa config.php fitxategia aldatu aurretik.",
-"Help" => "Laguntza",
-"Personal" => "Pertsonala",
-"Settings" => "Ezarpenak",
-"Users" => "Erabiltzaileak",
-"Admin" => "Admin",
-"Recommended" => "Aholkatuta",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "\\\"%s\\\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako.",
-"No app name specified" => "Ez da aplikazioaren izena zehaztu",
-"Unknown filetype" => "Fitxategi mota ezezaguna",
-"Invalid image" => "Baliogabeko irudia",
-"web services under your control" => "web zerbitzuak zure kontrolpean",
-"App directory already exists" => "Aplikazioaren karpeta dagoeneko existitzen da",
-"Can't create app folder. Please fix permissions. %s" => "Ezin izan da aplikazioaren karpeta sortu. Mesdez konpondu baimenak. %s",
-"No source specified when installing app" => "Ez da jatorririk zehaztu aplikazioa instalatzerakoan",
-"No href specified when installing app from http" => "Ez da href parametrorik zehaztu http bidez aplikazioa instalatzerakoan",
-"No path specified when installing app from local file" => "Ez da kokalekurik zehaztu fitxategi lokal moduan aplikazioa instalatzerakoan",
-"Archives of type %s are not supported" => "%s motako fitxategiak ez dira onartzen",
-"Failed to open archive when installing app" => "Fitxategia irekitzeak huts egin du aplikazioa instalatzerakoan",
-"App does not provide an info.xml file" => "Aplikazioak ez du info.xml fitxategia",
-"App can't be installed because of not allowed code in the App" => "Aplikazioa ezin da instalatu bertan duen baimendu gabeko kodea dela eta",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikazioa ezin da instalatu <shipped>true</shipped> etiketa duelako eta etiketa hau ez da onartzen banaketan ez datozen aplikazioetan",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikazioa ezin da instalatu info.xml/version bertsioa ez delako \"app store\"an jartzen duenaren berdina",
-"Application is not enabled" => "Aplikazioa ez dago gaituta",
-"Authentication error" => "Autentifikazio errorea",
-"Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
-"Unknown user" => "Erabiltzaile ezezaguna",
-"%s enter the database username." => "%s sartu datu basearen erabiltzaile izena.",
-"%s enter the database name." => "%s sartu datu basearen izena.",
-"%s you may not use dots in the database name" => "%s ezin duzu punturik erabili datu basearen izenean.",
-"MS SQL username and/or password not valid: %s" => "MS SQL erabiltzaile izena edota pasahitza ez dira egokiak: %s",
-"You need to enter either an existing account or the administrator." => "Existitzen den kontu bat edo administradorearena jarri behar duzu.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB erabiltzaile edota pasahitza ez dira egokiak",
-"DB Error: \"%s\"" => "DB errorea: \"%s\"",
-"Offending command was: \"%s\"" => "Errorea komando honek sortu du: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB '%s'@'localhost' erabiltzailea dagoeneko existitzen da.",
-"Drop this user from MySQL/MariaDB" => "Ezabatu erabiltzaile hau MySQL/MariaDBtik",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB '%s'@'%%' erabiltzailea dagoeneko existitzen da",
-"Drop this user from MySQL/MariaDB." => "Ezabatu erabiltzaile hau MySQL/MariaDBtik.",
-"Oracle connection could not be established" => "Ezin da Oracle konexioa sortu",
-"Oracle username and/or password not valid" => "Oracle erabiltzaile edota pasahitza ez dira egokiak.",
-"Offending command was: \"%s\", name: %s, password: %s" => "Errorea komando honek sortu du: \"%s\", izena: %s, pasahitza: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
-"Set an admin username." => "Ezarri administraziorako erabiltzaile izena.",
-"Set an admin password." => "Ezarri administraziorako pasahitza.",
-"Can't create or write into the data directory %s" => "Ezin da %s datu karpeta sortu edo bertan idatzi ",
-"%s shared »%s« with you" => "%s-ek »%s« zurekin partekatu du",
-"Sharing %s failed, because the file does not exist" => "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
-"You are not allowed to share %s" => "Ez zadue %s elkarbanatzeko baimendua",
-"Sharing %s failed, because the user %s is the item owner" => "%s elkarbanatzeak huts egin du, %s erabiltzailea jabea delako",
-"Sharing %s failed, because the user %s does not exist" => "%s elkarbanatzeak huts egin du, %s erabiltzailea existitzen ez delako",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s elkarbanatzeak huts egin du, %s erabiltzailea ez delako %s partaide den talderen bateko partaidea",
-"Sharing %s failed, because this item is already shared with %s" => "%s elkarbanatzeak huts egin du, dagoeneko %s erabiltzailearekin elkarbanatuta dagoelako",
-"Sharing %s failed, because the group %s does not exist" => "%s elkarbanatzeak huts egin du, %s taldea ez delako existitzen",
-"Sharing %s failed, because %s is not a member of the group %s" => "%s elkarbanatzeak huts egin du, %s ez delako %s taldearen partaidea",
-"You need to provide a password to create a public link, only protected links are allowed" => "Lotura publiko bat sortzeko pasahitza idatzi behar duzu, bakarrik babestutako loturak baimenduta daude",
-"Sharing %s failed, because sharing with links is not allowed" => "%s elkarbanatzeak huts egin du, lotura bidezko elkarbanatzea baimendua ez dagoelako",
-"Share type %s is not valid for %s" => "%s elkarbanaketa mota ez da %srentzako egokia",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%srentzako baimenak ezartzea huts egin du, baimenak %sri emandakoak baino gehiago direlako",
-"Setting permissions for %s failed, because the item was not found" => "%srentzako baimenak ezartzea huts egin du, aurkitu ez delako",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Ezin izan da jarri iraungitze data. Konpartitzea ezin da iraungi konpartitu eta %s ondoren.",
-"Cannot set expiration date. Expiration date is in the past" => "Ezin da jarri iraungitze data. Iraungitze data iragan da.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s elkarbanaketa motorra  OCP\\Share_Backend interfazea inplementatu behar du ",
-"Sharing backend %s not found" => "Ez da %s elkarbanaketa motorra aurkitu",
-"Sharing backend for %s not found" => "Ez da %srako elkarbanaketa motorrik aurkitu",
-"Sharing %s failed, because the user %s is the original sharer" => "%s elkarbanatzeak huts egin du, %s erabiltzailea jatorrizko elkarbanatzailea delako",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s elkarbanatzeak huts egin du, baimenak %sri emandakoak baino gehiago direlako",
-"Sharing %s failed, because resharing is not allowed" => "%s elkarbanatzeak huts egin du, ber-elkarbanatzea baimenduta ez dagoelako",
-"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",
-"seconds ago" => "segundu",
-"_%n minute ago_::_%n minutes ago_" => array("orain dela minutu %n","orain dela %n minutu"),
-"_%n hour ago_::_%n hours ago_" => array("orain dela ordu %n","orain dela %n ordu"),
-"today" => "gaur",
-"yesterday" => "atzo",
-"_%n day go_::_%n days ago_" => array("orain dela egun %n","orain dela %n egun"),
-"last month" => "joan den hilabetean",
-"_%n month ago_::_%n months ago_" => array("orain dela hilabete %n","orain dela %n hilabete"),
-"last year" => "joan den urtean",
-"years ago" => "urte",
-"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",
-"The username is already being used" => "Erabiltzaile izena dagoeneko erabiltzen ari da",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Ez dago datubaseen (sqlite, mysql edo postgresql) driverrik instalatuta.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Hau normalean konpondu daiteke %sweb zerbitzarira erro karpetan idazteko baimenak emanez%s.",
-"Cannot write into \"config\" directory" => "Ezin da idatzi \"config\" karpetan",
-"Cannot write into \"apps\" directory" => "Ezin da idatzi \"apps\" karpetan",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Hau normalean konpondu daiteke %sweb zerbitzarira apps karpetan idazteko baimenak emanez%s edo konfigurazio fitxategian appstorea ez gaituz.",
-"Cannot create \"data\" directory (%s)" => "Ezin da \"data\" karpeta sortu (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Hau normalean konpondu daiteke  <a href=\"%s\" target=\"_blank\">web zerbitzarira erro karpetan idazteko baimenak emanez</a>.",
-"Setting locale to %s failed" => "Lokala %sra ezartzeak huts egin du",
-"Please install one of these locales on your system and restart your webserver." => "Instalatu hauetako lokal bat zure sisteman eta berrabiarazi zure web zerbitzaria.",
-"Please ask your server administrator to install the module." => "Mesedez eskatu zure zerbitzariaren kudeatzaileari modulua instala dezan.",
-"PHP module %s not installed." => "PHPren %s modulua ez dago instalaturik.",
-"PHP %s or higher is required." => "PHP %s edo berriagoa behar da.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Mesedez eskatu zure zerbitzariaren kudeatzaileari PHP azkenengo bertsiora eguneratzea. Zure PHP bertsioa ez dute ez ownCloud eta ez PHP komunitateek mantentzen.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP SafeMode gaitua dago. ownCloudek ongi funtzionatzeko desgaitua behar du.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode ia erabiligabeko ezarpen zahar bat da eta desgaituta egon beharko luke. Mesedez eskatu zerbitzariaren kudeatzaileari php.ini edo zure web zerbitzariaren konfigurazioan desgaitu dezan.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes gaitua dago. ownCloudek ongi funtzionatzeko desgaitua behar du.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes ia erabiligabeko ezarpen zahar bat da eta desgaituta egon beharko luke. Mesedez eskatu zerbitzariaren kudeatzaileari php.ini edo zure web zerbitzariaren konfigurazioan desgaitu dezan.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP moduluak instalatu dira, baina oraindik faltan bezala markatuta daude?",
-"Please ask your server administrator to restart the web server." => "Mesedez eskatu zerbitzariaren kudeatzaileari web zerbitzaria berrabiarazteko.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 behar da",
-"Please upgrade your database version" => "Mesedez eguneratu zure datu basearen bertsioa",
-"Error occurred while checking PostgreSQL version" => "Errore bat gertatu da PostgreSQLren bertsioa egiaztatzerakoan",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Mesedez ziurtatu PostgreSQL >= 9 duzula edo begiratu logak erroreari buruzko informazio gehiago lortzeko",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Mesedez aldatu baimenak 0770ra beste erabiltzaileek karpetan sartu ezin izateko.",
-"Data directory (%s) is readable by other users" => "Data karpeta (%s) beste erabiltzaileek irakur dezakete",
-"Data directory (%s) is invalid" => "Datuen karpeta (%s) ez da baliogarria",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Mesedez egiaztatu data karpeta \".ocdata\" fitxategia duela bere erroan.",
-"Could not obtain lock type %d on \"%s\"." => "Ezin da lortu sarraia mota %d \"%s\"-an."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/eu_ES.js b/lib/l10n/eu_ES.js
new file mode 100644
index 00000000000..a9f41884d58
--- /dev/null
+++ b/lib/l10n/eu_ES.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Personal" : "Pertsonala",
+    "_%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/eu_ES.json b/lib/l10n/eu_ES.json
new file mode 100644
index 00000000000..9ac9f22cb92
--- /dev/null
+++ b/lib/l10n/eu_ES.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Personal" : "Pertsonala",
+    "_%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/eu_ES.php b/lib/l10n/eu_ES.php
deleted file mode 100644
index 35192433a2a..00000000000
--- a/lib/l10n/eu_ES.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Personal" => "Pertsonala",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fa.js b/lib/l10n/fa.js
new file mode 100644
index 00000000000..451274e4767
--- /dev/null
+++ b/lib/l10n/fa.js
@@ -0,0 +1,43 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "راه‌نما",
+    "Personal" : "شخصی",
+    "Settings" : "تنظیمات",
+    "Users" : "کاربران",
+    "Admin" : "مدیر",
+    "Unknown filetype" : "نوع فایل ناشناخته",
+    "Invalid image" : "عکس نامعتبر",
+    "web services under your control" : "سرویس های تحت وب در کنترل شما",
+    "Application is not enabled" : "برنامه فعال نشده است",
+    "Authentication error" : "خطا در اعتبار سنجی",
+    "Token expired. Please reload page." : "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
+    "%s enter the database username." : "%s نام کاربری پایگاه داده را وارد نمایید.",
+    "%s enter the database name." : "%s نام پایگاه داده را وارد نمایید.",
+    "%s you may not use dots in the database name" : "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید.",
+    "MS SQL username and/or password not valid: %s" : "نام کاربری و / یا رمزعبور MS SQL معتبر نیست:  %s",
+    "You need to enter either an existing account or the administrator." : "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید.",
+    "DB Error: \"%s\"" : "خطای پایگاه داده: \"%s\"",
+    "Offending command was: \"%s\"" : "دستور متخلف عبارت است از: \"%s\"",
+    "Oracle connection could not be established" : "ارتباط اراکل نمیتواند برقرار باشد.",
+    "Oracle username and/or password not valid" : "نام کاربری و / یا رمزعبور اراکل معتبر نیست.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "دستور متخلف عبارت است از: \"%s\"، نام: \"%s\"، رمزعبور:\"%s\"",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL نام کاربری و / یا رمزعبور معتبر نیست.",
+    "Set an admin username." : "یک نام کاربری برای مدیر تنظیم نمایید.",
+    "Set an admin password." : "یک رمزعبور برای مدیر تنظیم نمایید.",
+    "%s shared »%s« with you" : "%s به اشتراک گذاشته شده است »%s« توسط شما",
+    "Could not find category \"%s\"" : "دسته بندی %s یافت نشد",
+    "seconds ago" : "ثانیه‌ها پیش",
+    "_%n minute ago_::_%n minutes ago_" : ["%n دقیقه قبل"],
+    "_%n hour ago_::_%n hours ago_" : ["%n ساعت قبل"],
+    "today" : "امروز",
+    "yesterday" : "دیروز",
+    "_%n day go_::_%n days ago_" : ["%n روز قبل"],
+    "last month" : "ماه قبل",
+    "_%n month ago_::_%n months ago_" : ["%n ماه قبل"],
+    "last year" : "سال قبل",
+    "years ago" : "سال‌های قبل",
+    "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
+    "A valid password must be provided" : "رمز عبور صحیح باید وارد شود"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/fa.json b/lib/l10n/fa.json
new file mode 100644
index 00000000000..9dfeaa59954
--- /dev/null
+++ b/lib/l10n/fa.json
@@ -0,0 +1,41 @@
+{ "translations": {
+    "Help" : "راه‌نما",
+    "Personal" : "شخصی",
+    "Settings" : "تنظیمات",
+    "Users" : "کاربران",
+    "Admin" : "مدیر",
+    "Unknown filetype" : "نوع فایل ناشناخته",
+    "Invalid image" : "عکس نامعتبر",
+    "web services under your control" : "سرویس های تحت وب در کنترل شما",
+    "Application is not enabled" : "برنامه فعال نشده است",
+    "Authentication error" : "خطا در اعتبار سنجی",
+    "Token expired. Please reload page." : "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
+    "%s enter the database username." : "%s نام کاربری پایگاه داده را وارد نمایید.",
+    "%s enter the database name." : "%s نام پایگاه داده را وارد نمایید.",
+    "%s you may not use dots in the database name" : "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید.",
+    "MS SQL username and/or password not valid: %s" : "نام کاربری و / یا رمزعبور MS SQL معتبر نیست:  %s",
+    "You need to enter either an existing account or the administrator." : "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید.",
+    "DB Error: \"%s\"" : "خطای پایگاه داده: \"%s\"",
+    "Offending command was: \"%s\"" : "دستور متخلف عبارت است از: \"%s\"",
+    "Oracle connection could not be established" : "ارتباط اراکل نمیتواند برقرار باشد.",
+    "Oracle username and/or password not valid" : "نام کاربری و / یا رمزعبور اراکل معتبر نیست.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "دستور متخلف عبارت است از: \"%s\"، نام: \"%s\"، رمزعبور:\"%s\"",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL نام کاربری و / یا رمزعبور معتبر نیست.",
+    "Set an admin username." : "یک نام کاربری برای مدیر تنظیم نمایید.",
+    "Set an admin password." : "یک رمزعبور برای مدیر تنظیم نمایید.",
+    "%s shared »%s« with you" : "%s به اشتراک گذاشته شده است »%s« توسط شما",
+    "Could not find category \"%s\"" : "دسته بندی %s یافت نشد",
+    "seconds ago" : "ثانیه‌ها پیش",
+    "_%n minute ago_::_%n minutes ago_" : ["%n دقیقه قبل"],
+    "_%n hour ago_::_%n hours ago_" : ["%n ساعت قبل"],
+    "today" : "امروز",
+    "yesterday" : "دیروز",
+    "_%n day go_::_%n days ago_" : ["%n روز قبل"],
+    "last month" : "ماه قبل",
+    "_%n month ago_::_%n months ago_" : ["%n ماه قبل"],
+    "last year" : "سال قبل",
+    "years ago" : "سال‌های قبل",
+    "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
+    "A valid password must be provided" : "رمز عبور صحیح باید وارد شود"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
deleted file mode 100644
index 0081c2e27e6..00000000000
--- a/lib/l10n/fa.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "راه‌نما",
-"Personal" => "شخصی",
-"Settings" => "تنظیمات",
-"Users" => "کاربران",
-"Admin" => "مدیر",
-"Unknown filetype" => "نوع فایل ناشناخته",
-"Invalid image" => "عکس نامعتبر",
-"web services under your control" => "سرویس های تحت وب در کنترل شما",
-"Application is not enabled" => "برنامه فعال نشده است",
-"Authentication error" => "خطا در اعتبار سنجی",
-"Token expired. Please reload page." => "رمز منقضی شده است. لطفا دوباره صفحه را بارگذاری نمایید.",
-"%s enter the database username." => "%s نام کاربری پایگاه داده را وارد نمایید.",
-"%s enter the database name." => "%s نام پایگاه داده را وارد نمایید.",
-"%s you may not use dots in the database name" => "%s شما نباید از نقطه در نام پایگاه داده استفاده نمایید.",
-"MS SQL username and/or password not valid: %s" => "نام کاربری و / یا رمزعبور MS SQL معتبر نیست:  %s",
-"You need to enter either an existing account or the administrator." => "شما نیاز به وارد کردن یک حساب کاربری موجود یا حساب مدیریتی دارید.",
-"DB Error: \"%s\"" => "خطای پایگاه داده: \"%s\"",
-"Offending command was: \"%s\"" => "دستور متخلف عبارت است از: \"%s\"",
-"Oracle connection could not be established" => "ارتباط اراکل نمیتواند برقرار باشد.",
-"Oracle username and/or password not valid" => "نام کاربری و / یا رمزعبور اراکل معتبر نیست.",
-"Offending command was: \"%s\", name: %s, password: %s" => "دستور متخلف عبارت است از: \"%s\"، نام: \"%s\"، رمزعبور:\"%s\"",
-"PostgreSQL username and/or password not valid" => "PostgreSQL نام کاربری و / یا رمزعبور معتبر نیست.",
-"Set an admin username." => "یک نام کاربری برای مدیر تنظیم نمایید.",
-"Set an admin password." => "یک رمزعبور برای مدیر تنظیم نمایید.",
-"%s shared »%s« with you" => "%s به اشتراک گذاشته شده است »%s« توسط شما",
-"Could not find category \"%s\"" => "دسته بندی %s یافت نشد",
-"seconds ago" => "ثانیه‌ها پیش",
-"_%n minute ago_::_%n minutes ago_" => array("%n دقیقه قبل"),
-"_%n hour ago_::_%n hours ago_" => array("%n ساعت قبل"),
-"today" => "امروز",
-"yesterday" => "دیروز",
-"_%n day go_::_%n days ago_" => array("%n روز قبل"),
-"last month" => "ماه قبل",
-"_%n month ago_::_%n months ago_" => array("%n ماه قبل"),
-"last year" => "سال قبل",
-"years ago" => "سال‌های قبل",
-"A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
-"A valid password must be provided" => "رمز عبور صحیح باید وارد شود"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
new file mode 100644
index 00000000000..f387090da60
--- /dev/null
+++ b/lib/l10n/fi_FI.js
@@ -0,0 +1,110 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Hakemistoon \"config\" kirjoittaminen ei onnistu!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Tämän voi yleensä korjata antamalla http-palvelimelle kirjoitusoikeuden asetushakemistoon",
+    "See %s" : "Katso %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tämän voi yleensä korjata antamalla %shttp-palvelimelle kirjoitusoikeuden asetushakemistoon%s.",
+    "Sample configuration detected" : "Esimerkkimääritykset havaittu",
+    "Help" : "Ohje",
+    "Personal" : "Henkilökohtainen",
+    "Settings" : "Asetukset",
+    "Users" : "Käyttäjät",
+    "Admin" : "Ylläpito",
+    "Recommended" : "Suositeltu",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Sovellusta \\\"%s\\\" ei voi asentaa, koska se ei ole yhteensopiva tämän ownCloud-version kanssa.",
+    "No app name specified" : "Sovelluksen nimeä ei määritelty",
+    "Unknown filetype" : "Tuntematon tiedostotyyppi",
+    "Invalid image" : "Virheellinen kuva",
+    "web services under your control" : "verkkopalvelut hallinnassasi",
+    "App directory already exists" : "Sovelluskansio on jo olemassa",
+    "Can't create app folder. Please fix permissions. %s" : "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
+    "No source specified when installing app" : "Lähdettä ei määritelty sovellusta asennettaessa",
+    "No href specified when installing app from http" : "Href-määritettä ei asetettu asennettaessa sovellusta http:n yli",
+    "No path specified when installing app from local file" : "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta",
+    "Archives of type %s are not supported" : "Tyypin %s arkistot eivät ole tuettuja",
+    "Failed to open archive when installing app" : "Pakettitiedoston avaaminen epäonnistui sovellusta asennettaessa",
+    "App does not provide an info.xml file" : "Sovellus ei sisällä info.xml-tiedostoa",
+    "App can't be installed because of not allowed code in the App" : "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Sovellusta ei voi asentaa, koska info.xml/version ilmoittaa versioksi eri arvon kuin sovelluskauppa",
+    "Application is not enabled" : "Sovellusta ei ole otettu käyttöön",
+    "Authentication error" : "Tunnistautumisvirhe",
+    "Token expired. Please reload page." : "Valtuutus vanheni. Lataa sivu uudelleen.",
+    "Unknown user" : "Tuntematon käyttäjä",
+    "%s enter the database username." : "%s anna tietokannan käyttäjätunnus.",
+    "%s enter the database name." : "%s anna tietokannan nimi.",
+    "%s you may not use dots in the database name" : "%s et voi käyttää pisteitä tietokannan nimessä",
+    "MS SQL username and/or password not valid: %s" : "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB-käyttäjätunnus ja/tai salasana on virheellinen",
+    "DB Error: \"%s\"" : "Tietokantavirhe: \"%s\"",
+    "Offending command was: \"%s\"" : "Loukkaava komento oli: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB-käyttäjä '%s'@'localhost' on jo olemassa.",
+    "Drop this user from MySQL/MariaDB" : "Pudota tämä käyttäjä MySQL/MariaDB:stä",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB-käyttäjä '%s'@'%%' on jo olemassa",
+    "Drop this user from MySQL/MariaDB." : "Pudota tämä käyttäjä MySQL/MariaDB:stä.",
+    "Oracle connection could not be established" : "Oracle-yhteyttä ei voitu muodostaa",
+    "Oracle username and/or password not valid" : "Oraclen käyttäjätunnus ja/tai salasana on väärin",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Loukkaava komento oli: \"%s\", nimi: %s, salasana: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
+    "Set an admin username." : "Aseta ylläpitäjän käyttäjätunnus.",
+    "Set an admin password." : "Aseta ylläpitäjän salasana.",
+    "%s shared »%s« with you" : "%s jakoi kohteen »%s« kanssasi",
+    "Sharing %s failed, because the file does not exist" : "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa",
+    "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Kohteen %s jakaminen epäonnistui, koska jakaminen linkkejä käyttäen ei ole sallittu",
+    "Setting permissions for %s failed, because the item was not found" : "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt",
+    "Cannot set expiration date. Expiration date is in the past" : "Vanhentumispäivää ei voi asettaa. Vanhentumispäivä on jo mennyt",
+    "Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt",
+    "Sharing backend for %s not found" : "Jakamisen taustaosaa kohteelle %s ei löytynyt",
+    "Sharing %s failed, because the user %s is the original sharer" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on alkuperäinen jakaja",
+    "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",
+    "seconds ago" : "sekuntia sitten",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minuutti sitten","%n minuuttia sitten"],
+    "_%n hour ago_::_%n hours ago_" : ["%n tunti sitten","%n tuntia sitten"],
+    "today" : "tänään",
+    "yesterday" : "eilen",
+    "_%n day go_::_%n days ago_" : ["%n päivä sitten","%n päivää sitten"],
+    "last month" : "viime kuussa",
+    "_%n month ago_::_%n months ago_" : ["%n kuukausi sitten","%n kuukautta sitten"],
+    "last year" : "viime vuonna",
+    "years ago" : "vuotta sitten",
+    "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",
+    "The username is already being used" : "Käyttäjätunnus on jo käytössä",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Tietokanta-ajureita (sqlite, mysql tai postgresql) ei ole asennettu.",
+    "Cannot write into \"config\" directory" : "Hakemistoon \"config\" kirjoittaminen ei onnistu",
+    "Cannot write into \"apps\" directory" : "Hakemistoon \"apps\" kirjoittaminen ei onnistu",
+    "Cannot create \"data\" directory (%s)" : "Kansion \"data\" luominen ei onnistu (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Tämä on yleensä korjattavissa <a href=\"%s\" target=\"_blank\">antamalla http-palvelimelle kirjoitusoikeuden juurihakemistoon</a>.",
+    "Setting locale to %s failed" : "Maa-asetuksen %s asettaminen epäonnistui",
+    "Please install one of these locales on your system and restart your webserver." : "Asenna ainakin yksi kyseisistä maa-asetuksista järjestelmään ja käynnistä http-palvelin uudelleen.",
+    "Please ask your server administrator to install the module." : "Pyydä palvelimen ylläpitäjää asentamaan moduulin.",
+    "PHP module %s not installed." : "PHP-moduulia %s ei ole asennettu.",
+    "PHP %s or higher is required." : "PHP %s tai sitä uudempi vaaditaan.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pyydä palvelimen ylläpitäjää päivittämään PHP uusimpaan versioon. Käyttämäsi PHP-versio ei ole enää tuettu ownCloud- ja PHP-yhteisön toimesta.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP:n \"Safe Mode\" on käytössä. ownCloud vaatii toimiakseen \"Safe Moden\" poistamisen käytöstä.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP:n Safe Mode on vanhennettu ja muutenkin lähes hyödytön asetus, joka tulee poistaa käytöstä. Pyydä järjestelmän ylläpitäjää poistamaan ominaisuus käytöstä php.ini-tiedoston kautta tai http-palvelimen asetuksista.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes -asetus on käytössä. ownCloud vaatii toimiakseen kyseisen asetuksen poistamisen käytöstä.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes -asetus on vanhennettu ja pääosin hyödytön, joten se tulisi poistaa käytöstä. Pyydä palvelimen ylläpitäjää poistamaan asetus käytöstä php.ini-tiedoston avulla tai http-palvelimen asetuksista.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?",
+    "Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 vaaditaan",
+    "Please upgrade your database version" : "Päivitä tietokantasi versio",
+    "Error occurred while checking PostgreSQL version" : "Virhe PostgreSQL:n versiota tarkistaessa",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Varmista, että käytössäsi on PostgreSQL >= 9 tai tarkista lokit saadaksesi lisätietoja virheestä",
+    "Data directory (%s) is readable by other users" : "Datakansio (%s) on muiden käyttäjien luettavissa",
+    "Data directory (%s) is invalid" : "Datakansio (%s) on virheellinen",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Varmista, että datakansion juuressa on tiedosto \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Lukitustapaa %d ei saatu kohteelle \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
new file mode 100644
index 00000000000..7c26af25f66
--- /dev/null
+++ b/lib/l10n/fi_FI.json
@@ -0,0 +1,108 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Hakemistoon \"config\" kirjoittaminen ei onnistu!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Tämän voi yleensä korjata antamalla http-palvelimelle kirjoitusoikeuden asetushakemistoon",
+    "See %s" : "Katso %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Tämän voi yleensä korjata antamalla %shttp-palvelimelle kirjoitusoikeuden asetushakemistoon%s.",
+    "Sample configuration detected" : "Esimerkkimääritykset havaittu",
+    "Help" : "Ohje",
+    "Personal" : "Henkilökohtainen",
+    "Settings" : "Asetukset",
+    "Users" : "Käyttäjät",
+    "Admin" : "Ylläpito",
+    "Recommended" : "Suositeltu",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Sovellusta \\\"%s\\\" ei voi asentaa, koska se ei ole yhteensopiva tämän ownCloud-version kanssa.",
+    "No app name specified" : "Sovelluksen nimeä ei määritelty",
+    "Unknown filetype" : "Tuntematon tiedostotyyppi",
+    "Invalid image" : "Virheellinen kuva",
+    "web services under your control" : "verkkopalvelut hallinnassasi",
+    "App directory already exists" : "Sovelluskansio on jo olemassa",
+    "Can't create app folder. Please fix permissions. %s" : "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
+    "No source specified when installing app" : "Lähdettä ei määritelty sovellusta asennettaessa",
+    "No href specified when installing app from http" : "Href-määritettä ei asetettu asennettaessa sovellusta http:n yli",
+    "No path specified when installing app from local file" : "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta",
+    "Archives of type %s are not supported" : "Tyypin %s arkistot eivät ole tuettuja",
+    "Failed to open archive when installing app" : "Pakettitiedoston avaaminen epäonnistui sovellusta asennettaessa",
+    "App does not provide an info.xml file" : "Sovellus ei sisällä info.xml-tiedostoa",
+    "App can't be installed because of not allowed code in the App" : "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Sovellusta ei voi asentaa, koska info.xml/version ilmoittaa versioksi eri arvon kuin sovelluskauppa",
+    "Application is not enabled" : "Sovellusta ei ole otettu käyttöön",
+    "Authentication error" : "Tunnistautumisvirhe",
+    "Token expired. Please reload page." : "Valtuutus vanheni. Lataa sivu uudelleen.",
+    "Unknown user" : "Tuntematon käyttäjä",
+    "%s enter the database username." : "%s anna tietokannan käyttäjätunnus.",
+    "%s enter the database name." : "%s anna tietokannan nimi.",
+    "%s you may not use dots in the database name" : "%s et voi käyttää pisteitä tietokannan nimessä",
+    "MS SQL username and/or password not valid: %s" : "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB-käyttäjätunnus ja/tai salasana on virheellinen",
+    "DB Error: \"%s\"" : "Tietokantavirhe: \"%s\"",
+    "Offending command was: \"%s\"" : "Loukkaava komento oli: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB-käyttäjä '%s'@'localhost' on jo olemassa.",
+    "Drop this user from MySQL/MariaDB" : "Pudota tämä käyttäjä MySQL/MariaDB:stä",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB-käyttäjä '%s'@'%%' on jo olemassa",
+    "Drop this user from MySQL/MariaDB." : "Pudota tämä käyttäjä MySQL/MariaDB:stä.",
+    "Oracle connection could not be established" : "Oracle-yhteyttä ei voitu muodostaa",
+    "Oracle username and/or password not valid" : "Oraclen käyttäjätunnus ja/tai salasana on väärin",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Loukkaava komento oli: \"%s\", nimi: %s, salasana: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
+    "Set an admin username." : "Aseta ylläpitäjän käyttäjätunnus.",
+    "Set an admin password." : "Aseta ylläpitäjän salasana.",
+    "%s shared »%s« with you" : "%s jakoi kohteen »%s« kanssasi",
+    "Sharing %s failed, because the file does not exist" : "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa",
+    "You are not allowed to share %s" : "Oikeutesi eivät riitä kohteen %s jakamiseen.",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Kohteen %s jakaminen epäonnistui, koska jakaminen linkkejä käyttäen ei ole sallittu",
+    "Setting permissions for %s failed, because the item was not found" : "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt",
+    "Cannot set expiration date. Expiration date is in the past" : "Vanhentumispäivää ei voi asettaa. Vanhentumispäivä on jo mennyt",
+    "Sharing backend %s not found" : "Jakamisen taustaosaa %s ei löytynyt",
+    "Sharing backend for %s not found" : "Jakamisen taustaosaa kohteelle %s ei löytynyt",
+    "Sharing %s failed, because the user %s is the original sharer" : "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on alkuperäinen jakaja",
+    "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",
+    "seconds ago" : "sekuntia sitten",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minuutti sitten","%n minuuttia sitten"],
+    "_%n hour ago_::_%n hours ago_" : ["%n tunti sitten","%n tuntia sitten"],
+    "today" : "tänään",
+    "yesterday" : "eilen",
+    "_%n day go_::_%n days ago_" : ["%n päivä sitten","%n päivää sitten"],
+    "last month" : "viime kuussa",
+    "_%n month ago_::_%n months ago_" : ["%n kuukausi sitten","%n kuukautta sitten"],
+    "last year" : "viime vuonna",
+    "years ago" : "vuotta sitten",
+    "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",
+    "The username is already being used" : "Käyttäjätunnus on jo käytössä",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Tietokanta-ajureita (sqlite, mysql tai postgresql) ei ole asennettu.",
+    "Cannot write into \"config\" directory" : "Hakemistoon \"config\" kirjoittaminen ei onnistu",
+    "Cannot write into \"apps\" directory" : "Hakemistoon \"apps\" kirjoittaminen ei onnistu",
+    "Cannot create \"data\" directory (%s)" : "Kansion \"data\" luominen ei onnistu (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Tämä on yleensä korjattavissa <a href=\"%s\" target=\"_blank\">antamalla http-palvelimelle kirjoitusoikeuden juurihakemistoon</a>.",
+    "Setting locale to %s failed" : "Maa-asetuksen %s asettaminen epäonnistui",
+    "Please install one of these locales on your system and restart your webserver." : "Asenna ainakin yksi kyseisistä maa-asetuksista järjestelmään ja käynnistä http-palvelin uudelleen.",
+    "Please ask your server administrator to install the module." : "Pyydä palvelimen ylläpitäjää asentamaan moduulin.",
+    "PHP module %s not installed." : "PHP-moduulia %s ei ole asennettu.",
+    "PHP %s or higher is required." : "PHP %s tai sitä uudempi vaaditaan.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pyydä palvelimen ylläpitäjää päivittämään PHP uusimpaan versioon. Käyttämäsi PHP-versio ei ole enää tuettu ownCloud- ja PHP-yhteisön toimesta.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP:n \"Safe Mode\" on käytössä. ownCloud vaatii toimiakseen \"Safe Moden\" poistamisen käytöstä.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP:n Safe Mode on vanhennettu ja muutenkin lähes hyödytön asetus, joka tulee poistaa käytöstä. Pyydä järjestelmän ylläpitäjää poistamaan ominaisuus käytöstä php.ini-tiedoston kautta tai http-palvelimen asetuksista.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes -asetus on käytössä. ownCloud vaatii toimiakseen kyseisen asetuksen poistamisen käytöstä.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes -asetus on vanhennettu ja pääosin hyödytön, joten se tulisi poistaa käytöstä. Pyydä palvelimen ylläpitäjää poistamaan asetus käytöstä php.ini-tiedoston avulla tai http-palvelimen asetuksista.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?",
+    "Please ask your server administrator to restart the web server." : "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 vaaditaan",
+    "Please upgrade your database version" : "Päivitä tietokantasi versio",
+    "Error occurred while checking PostgreSQL version" : "Virhe PostgreSQL:n versiota tarkistaessa",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Varmista, että käytössäsi on PostgreSQL >= 9 tai tarkista lokit saadaksesi lisätietoja virheestä",
+    "Data directory (%s) is readable by other users" : "Datakansio (%s) on muiden käyttäjien luettavissa",
+    "Data directory (%s) is invalid" : "Datakansio (%s) on virheellinen",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Varmista, että datakansion juuressa on tiedosto \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Lukitustapaa %d ei saatu kohteelle \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
deleted file mode 100644
index 5c9a6442c76..00000000000
--- a/lib/l10n/fi_FI.php
+++ /dev/null
@@ -1,109 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Hakemistoon \"config\" kirjoittaminen ei onnistu!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Tämän voi yleensä korjata antamalla http-palvelimelle kirjoitusoikeuden asetushakemistoon",
-"See %s" => "Katso %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Tämän voi yleensä korjata antamalla %shttp-palvelimelle kirjoitusoikeuden asetushakemistoon%s.",
-"Sample configuration detected" => "Esimerkkimääritykset havaittu",
-"Help" => "Ohje",
-"Personal" => "Henkilökohtainen",
-"Settings" => "Asetukset",
-"Users" => "Käyttäjät",
-"Admin" => "Ylläpito",
-"Recommended" => "Suositeltu",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Sovellusta \\\"%s\\\" ei voi asentaa, koska se ei ole yhteensopiva tämän ownCloud-version kanssa.",
-"No app name specified" => "Sovelluksen nimeä ei määritelty",
-"Unknown filetype" => "Tuntematon tiedostotyyppi",
-"Invalid image" => "Virheellinen kuva",
-"web services under your control" => "verkkopalvelut hallinnassasi",
-"App directory already exists" => "Sovelluskansio on jo olemassa",
-"Can't create app folder. Please fix permissions. %s" => "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
-"No source specified when installing app" => "Lähdettä ei määritelty sovellusta asennettaessa",
-"No href specified when installing app from http" => "Href-määritettä ei asetettu asennettaessa sovellusta http:n yli",
-"No path specified when installing app from local file" => "Polkua ei määritelty sovellusta asennettaessa paikallisesta tiedostosta",
-"Archives of type %s are not supported" => "Tyypin %s arkistot eivät ole tuettuja",
-"Failed to open archive when installing app" => "Pakettitiedoston avaaminen epäonnistui sovellusta asennettaessa",
-"App does not provide an info.xml file" => "Sovellus ei sisällä info.xml-tiedostoa",
-"App can't be installed because of not allowed code in the App" => "Sovellusta ei voi asentaa, koska sovellus sisältää kiellettyä koodia",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Sovellusta ei voi asentaa, koska se ei ole yhteensopiva käytössä olevan ownCloud-version kanssa",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Sovellusta ei voi asentaa, koska info.xml/version ilmoittaa versioksi eri arvon kuin sovelluskauppa",
-"Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
-"Authentication error" => "Tunnistautumisvirhe",
-"Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
-"Unknown user" => "Tuntematon käyttäjä",
-"%s enter the database username." => "%s anna tietokannan käyttäjätunnus.",
-"%s enter the database name." => "%s anna tietokannan nimi.",
-"%s you may not use dots in the database name" => "%s et voi käyttää pisteitä tietokannan nimessä",
-"MS SQL username and/or password not valid: %s" => "MS SQL -käyttäjätunnus ja/tai -salasana on väärin: %s",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB-käyttäjätunnus ja/tai salasana on virheellinen",
-"DB Error: \"%s\"" => "Tietokantavirhe: \"%s\"",
-"Offending command was: \"%s\"" => "Loukkaava komento oli: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB-käyttäjä '%s'@'localhost' on jo olemassa.",
-"Drop this user from MySQL/MariaDB" => "Pudota tämä käyttäjä MySQL/MariaDB:stä",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB-käyttäjä '%s'@'%%' on jo olemassa",
-"Drop this user from MySQL/MariaDB." => "Pudota tämä käyttäjä MySQL/MariaDB:stä.",
-"Oracle connection could not be established" => "Oracle-yhteyttä ei voitu muodostaa",
-"Oracle username and/or password not valid" => "Oraclen käyttäjätunnus ja/tai salasana on väärin",
-"Offending command was: \"%s\", name: %s, password: %s" => "Loukkaava komento oli: \"%s\", nimi: %s, salasana: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL:n käyttäjätunnus ja/tai salasana on väärin",
-"Set an admin username." => "Aseta ylläpitäjän käyttäjätunnus.",
-"Set an admin password." => "Aseta ylläpitäjän salasana.",
-"%s shared »%s« with you" => "%s jakoi kohteen »%s« kanssasi",
-"Sharing %s failed, because the file does not exist" => "Kohteen %s jakaminen epäonnistui, koska tiedostoa ei ole olemassa",
-"You are not allowed to share %s" => "Oikeutesi eivät riitä kohteen %s jakamiseen.",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Kohteen %s jakaminen epäonnistui, koska jakaminen linkkejä käyttäen ei ole sallittu",
-"Setting permissions for %s failed, because the item was not found" => "Kohteen %s oikeuksien asettaminen epäonnistui, koska kohdetta ei löytynyt",
-"Cannot set expiration date. Expiration date is in the past" => "Vanhentumispäivää ei voi asettaa. Vanhentumispäivä on jo mennyt",
-"Sharing backend %s not found" => "Jakamisen taustaosaa %s ei löytynyt",
-"Sharing backend for %s not found" => "Jakamisen taustaosaa kohteelle %s ei löytynyt",
-"Sharing %s failed, because the user %s is the original sharer" => "Kohteen %s jakaminen epäonnistui, koska käyttäjä %s on alkuperäinen jakaja",
-"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",
-"seconds ago" => "sekuntia sitten",
-"_%n minute ago_::_%n minutes ago_" => array("%n minuutti sitten","%n minuuttia sitten"),
-"_%n hour ago_::_%n hours ago_" => array("%n tunti sitten","%n tuntia sitten"),
-"today" => "tänään",
-"yesterday" => "eilen",
-"_%n day go_::_%n days ago_" => array("%n päivä sitten","%n päivää sitten"),
-"last month" => "viime kuussa",
-"_%n month ago_::_%n months ago_" => array("%n kuukausi sitten","%n kuukautta sitten"),
-"last year" => "viime vuonna",
-"years ago" => "vuotta sitten",
-"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",
-"The username is already being used" => "Käyttäjätunnus on jo käytössä",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Tietokanta-ajureita (sqlite, mysql tai postgresql) ei ole asennettu.",
-"Cannot write into \"config\" directory" => "Hakemistoon \"config\" kirjoittaminen ei onnistu",
-"Cannot write into \"apps\" directory" => "Hakemistoon \"apps\" kirjoittaminen ei onnistu",
-"Cannot create \"data\" directory (%s)" => "Kansion \"data\" luominen ei onnistu (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Tämä on yleensä korjattavissa <a href=\"%s\" target=\"_blank\">antamalla http-palvelimelle kirjoitusoikeuden juurihakemistoon</a>.",
-"Setting locale to %s failed" => "Maa-asetuksen %s asettaminen epäonnistui",
-"Please install one of these locales on your system and restart your webserver." => "Asenna ainakin yksi kyseisistä maa-asetuksista järjestelmään ja käynnistä http-palvelin uudelleen.",
-"Please ask your server administrator to install the module." => "Pyydä palvelimen ylläpitäjää asentamaan moduulin.",
-"PHP module %s not installed." => "PHP-moduulia %s ei ole asennettu.",
-"PHP %s or higher is required." => "PHP %s tai sitä uudempi vaaditaan.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Pyydä palvelimen ylläpitäjää päivittämään PHP uusimpaan versioon. Käyttämäsi PHP-versio ei ole enää tuettu ownCloud- ja PHP-yhteisön toimesta.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP:n \"Safe Mode\" on käytössä. ownCloud vaatii toimiakseen \"Safe Moden\" poistamisen käytöstä.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP:n Safe Mode on vanhennettu ja muutenkin lähes hyödytön asetus, joka tulee poistaa käytöstä. Pyydä järjestelmän ylläpitäjää poistamaan ominaisuus käytöstä php.ini-tiedoston kautta tai http-palvelimen asetuksista.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes -asetus on käytössä. ownCloud vaatii toimiakseen kyseisen asetuksen poistamisen käytöstä.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes -asetus on vanhennettu ja pääosin hyödytön, joten se tulisi poistaa käytöstä. Pyydä palvelimen ylläpitäjää poistamaan asetus käytöstä php.ini-tiedoston avulla tai http-palvelimen asetuksista.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP-moduulit on asennettu, mutta ovatko ne vieläkin listattu puuttuviksi?",
-"Please ask your server administrator to restart the web server." => "Pyydä palvelimen ylläpitäjää käynnistämään web-palvelin uudelleen.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 vaaditaan",
-"Please upgrade your database version" => "Päivitä tietokantasi versio",
-"Error occurred while checking PostgreSQL version" => "Virhe PostgreSQL:n versiota tarkistaessa",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Varmista, että käytössäsi on PostgreSQL >= 9 tai tarkista lokit saadaksesi lisätietoja virheestä",
-"Data directory (%s) is readable by other users" => "Datakansio (%s) on muiden käyttäjien luettavissa",
-"Data directory (%s) is invalid" => "Datakansio (%s) on virheellinen",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Varmista, että datakansion juuressa on tiedosto \".ocdata\".",
-"Could not obtain lock type %d on \"%s\"." => "Lukitustapaa %d ei saatu kohteelle \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/fil.js b/lib/l10n/fil.js
new file mode 100644
index 00000000000..9ac3e05d6c6
--- /dev/null
+++ b/lib/l10n/fil.js
@@ -0,0 +1,9 @@
+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/fil.json b/lib/l10n/fil.json
new file mode 100644
index 00000000000..82a8a99d300
--- /dev/null
+++ b/lib/l10n/fil.json
@@ -0,0 +1,7 @@
+{ "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/fil.php b/lib/l10n/fil.php
deleted file mode 100644
index 406ff5f5a26..00000000000
--- a/lib/l10n/fil.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
new file mode 100644
index 00000000000..becc21ab649
--- /dev/null
+++ b/lib/l10n/fr.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Impossible d’écrire dans le répertoire « config » !",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Ce problème est généralement résolu en donnant au serveur web un accès en écriture à ce répertoire",
+    "See %s" : "Voir %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire de configuration%s.",
+    "Sample configuration detected" : "Configuration d'exemple détectée",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Il a été détecté que la configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas pris en charge. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
+    "Help" : "Aide",
+    "Personal" : "Personnel",
+    "Settings" : "Paramètres",
+    "Users" : "Utilisateurs",
+    "Admin" : "Administration",
+    "Recommended" : "Recommandée",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'application \\\"%s\\\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.",
+    "No app name specified" : "Aucun nom d'application spécifié",
+    "Unknown filetype" : "Type de fichier inconnu",
+    "Invalid image" : "Image non valable",
+    "web services under your control" : "services web sous votre contrôle",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Les archives de type %s ne sont pas supportées",
+    "Failed to open archive when installing app" : "Échec de l'ouverture de l'archive lors de l'installation de l'application",
+    "App does not provide an info.xml file" : "L'application ne fournit pas de fichier info.xml",
+    "App can't be installed because of not allowed code in the App" : "L'application ne peut être installée car elle contient du code non-autorisé",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées",
+    "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'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store",
+    "Application is not enabled" : "L'application n'est pas activée",
+    "Authentication error" : "Erreur d'authentification",
+    "Token expired. Please reload page." : "La session a expiré. Veuillez recharger la page.",
+    "Unknown user" : "Utilisateur inconnu",
+    "%s enter the database username." : "%s entrez le nom d'utilisateur de la base de données.",
+    "%s enter the database name." : "%s entrez le nom de la base de données.",
+    "%s you may not use dots in the database name" : "%s vous nez pouvez pas utiliser de points dans le nom de la base de données",
+    "MS SQL username and/or password not valid: %s" : "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
+    "You need to enter either an existing account or the administrator." : "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.",
+    "MySQL/MariaDB username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe MySQL/MariaDB invalide",
+    "DB Error: \"%s\"" : "Erreur de la base de données : \"%s\"",
+    "Offending command was: \"%s\"" : "La requête en cause est : \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "L'utilisateur MySQL/MariaDB '%s'@'localhost' existe déjà.",
+    "Drop this user from MySQL/MariaDB" : "Retirer cet utilisateur de la base MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "L'utilisateur MySQL/MariaDB '%s'@'%%' existe déjà",
+    "Drop this user from MySQL/MariaDB." : "Retirer cet utilisateur de la base MySQL/MariaDB.",
+    "Oracle connection could not be established" : "La connexion Oracle ne peut pas être établie",
+    "Oracle username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
+    "Offending command was: \"%s\", name: %s, password: %s" : "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
+    "PostgreSQL username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide",
+    "Set an admin username." : "Spécifiez un nom d'utilisateur pour l'administrateur.",
+    "Set an admin password." : "Spécifiez un mot de passe administrateur.",
+    "Can't create or write into the data directory %s" : "Impossible de créer ou d'écrire dans le répertoire des données %s",
+    "%s shared »%s« with you" : "%s partagé »%s« avec vous",
+    "Sharing %s failed, because the file does not exist" : "Le partage de %s a échoué car le fichier n'existe pas",
+    "You are not allowed to share %s" : "Vous n'êtes pas autorisé à partager %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Le partage de %s a échoué car l'utilisateur %s est le propriétaire de l'objet",
+    "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 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, seul les liens protégés sont autorisées.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Le partage de %s a échoué car le partage par lien n'est pas permis",
+    "Share type %s is not valid for %s" : "Le type de partage %s n'est pas valide pour %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Le réglage des permissions pour %s a échoué car les permissions dépassent celles accordées à %s",
+    "Setting permissions for %s failed, because the item was not found" : "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Impossible de configurer la date d'expiration. Un partage ne peut expirer plus de %s après sa création",
+    "Cannot set expiration date. Expiration date is in the past" : "Impossible de configurer la date d'expiration. La date d'expiration est dans le passé.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "L'emplacement du partage %s doit implémenter l'interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Emplacement de partage %s introuvable",
+    "Sharing backend for %s not found" : "L'emplacement du partage %s est introuvable",
+    "Sharing %s failed, because the user %s is the original sharer" : "Le partage de %s a échoué car l'utilisateur %s est l'utilisateur à l'origine du partage.",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s",
+    "Sharing %s failed, because resharing is not allowed" : "Le partage de %s a échoué car le repartage n'est pas autorisé",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage %s a échoué parce que la source n'a é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\"",
+    "seconds ago" : "il y a quelques secondes",
+    "_%n minute ago_::_%n minutes ago_" : ["","il y a %n minutes"],
+    "_%n hour ago_::_%n hours ago_" : ["","Il y a %n heures"],
+    "today" : "aujourd'hui",
+    "yesterday" : "hier",
+    "_%n day go_::_%n days ago_" : ["","il y a %n jours"],
+    "last month" : "le mois dernier",
+    "_%n month ago_::_%n months ago_" : ["","Il y a %n mois"],
+    "last year" : "l'année dernière",
+    "years ago" : "il y a plusieurs années",
+    "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",
+    "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Aucun pilote de base de données (sqlite, mysql, ou postgresql) n’est installé.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Les permissions peuvent, généralement, être résolues %sen donnant au serveur web un accès en écriture au répertoire racine%s",
+    "Cannot write into \"config\" directory" : "Impossible d’écrire dans le répertoire \"config\"",
+    "Cannot write into \"apps\" directory" : "Impossible d’écrire dans le répertoire \"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." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire apps%s ou en désactivant l'appstore dans le fichier de configuration.",
+    "Cannot create \"data\" directory (%s)" : "Impossible de créer le répertoire \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ce problème est généralement résolu <a href=\"%s\" target=\"_blank\">en donnant au serveur web un accès en écriture au répertoire racine</a>.",
+    "Setting locale to %s failed" : "Le choix de la langue pour %s a échoué",
+    "Please install one of these locales on your system and restart your webserver." : "Veuillez installer l'une de ces langues sur votre système et redémarrer votre serveur web.",
+    "Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.",
+    "PHP module %s not installed." : "Le module PHP %s n’est pas installé.",
+    "PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus supportée par ownCloud, de même que par la communauté PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode est déprécié, inutile la plupart du temps, et doit être désactivé. Veuillez demander à votre administrateur serveur de le désactiver dans le fichier php.ini ou dans votre configuration du serveur web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes est déprécié, inutile la plupart du temps, et doit être désactivé. Veuillez demander à votre administrateur serveur de le désactiver dans le fichier php.ini ou dans votre configuration du serveur web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?",
+    "Please ask your server administrator to restart the web server." : "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 requis",
+    "Please upgrade your database version" : "Veuillez mettre à jour votre base de données",
+    "Error occurred while checking PostgreSQL version" : "Une erreur s’est produite pendant la récupération du numéro de version de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Veuillez vérifier que vous utilisez PostgreSQL >= 9 , ou regardez dans le journal d’erreur pour plus d’informations sur ce problème",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Veuillez changer les permissions du répertoire en mode 0770 afin que son contenu puisse être listé par les autres utilisateurs.",
+    "Data directory (%s) is readable by other users" : "Le répertoire (%s) est lisible par les autres utilisateurs",
+    "Data directory (%s) is invalid" : "Le répertoire (%s) est invalide",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Veuillez vérifier que le répertoire de données contient un fichier \".ocdata\" à sa racine.",
+    "Could not obtain lock type %d on \"%s\"." : "Impossible d'obtenir le verrouillage de type %d sur \"%s\"."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
new file mode 100644
index 00000000000..51452abce9e
--- /dev/null
+++ b/lib/l10n/fr.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Impossible d’écrire dans le répertoire « config » !",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Ce problème est généralement résolu en donnant au serveur web un accès en écriture à ce répertoire",
+    "See %s" : "Voir %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire de configuration%s.",
+    "Sample configuration detected" : "Configuration d'exemple détectée",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Il a été détecté que la configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas pris en charge. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
+    "Help" : "Aide",
+    "Personal" : "Personnel",
+    "Settings" : "Paramètres",
+    "Users" : "Utilisateurs",
+    "Admin" : "Administration",
+    "Recommended" : "Recommandée",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'application \\\"%s\\\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.",
+    "No app name specified" : "Aucun nom d'application spécifié",
+    "Unknown filetype" : "Type de fichier inconnu",
+    "Invalid image" : "Image non valable",
+    "web services under your control" : "services web sous votre contrôle",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Les archives de type %s ne sont pas supportées",
+    "Failed to open archive when installing app" : "Échec de l'ouverture de l'archive lors de l'installation de l'application",
+    "App does not provide an info.xml file" : "L'application ne fournit pas de fichier info.xml",
+    "App can't be installed because of not allowed code in the App" : "L'application ne peut être installée car elle contient du code non-autorisé",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées",
+    "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'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store",
+    "Application is not enabled" : "L'application n'est pas activée",
+    "Authentication error" : "Erreur d'authentification",
+    "Token expired. Please reload page." : "La session a expiré. Veuillez recharger la page.",
+    "Unknown user" : "Utilisateur inconnu",
+    "%s enter the database username." : "%s entrez le nom d'utilisateur de la base de données.",
+    "%s enter the database name." : "%s entrez le nom de la base de données.",
+    "%s you may not use dots in the database name" : "%s vous nez pouvez pas utiliser de points dans le nom de la base de données",
+    "MS SQL username and/or password not valid: %s" : "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
+    "You need to enter either an existing account or the administrator." : "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.",
+    "MySQL/MariaDB username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe MySQL/MariaDB invalide",
+    "DB Error: \"%s\"" : "Erreur de la base de données : \"%s\"",
+    "Offending command was: \"%s\"" : "La requête en cause est : \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "L'utilisateur MySQL/MariaDB '%s'@'localhost' existe déjà.",
+    "Drop this user from MySQL/MariaDB" : "Retirer cet utilisateur de la base MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "L'utilisateur MySQL/MariaDB '%s'@'%%' existe déjà",
+    "Drop this user from MySQL/MariaDB." : "Retirer cet utilisateur de la base MySQL/MariaDB.",
+    "Oracle connection could not be established" : "La connexion Oracle ne peut pas être établie",
+    "Oracle username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
+    "Offending command was: \"%s\", name: %s, password: %s" : "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
+    "PostgreSQL username and/or password not valid" : "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide",
+    "Set an admin username." : "Spécifiez un nom d'utilisateur pour l'administrateur.",
+    "Set an admin password." : "Spécifiez un mot de passe administrateur.",
+    "Can't create or write into the data directory %s" : "Impossible de créer ou d'écrire dans le répertoire des données %s",
+    "%s shared »%s« with you" : "%s partagé »%s« avec vous",
+    "Sharing %s failed, because the file does not exist" : "Le partage de %s a échoué car le fichier n'existe pas",
+    "You are not allowed to share %s" : "Vous n'êtes pas autorisé à partager %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Le partage de %s a échoué car l'utilisateur %s est le propriétaire de l'objet",
+    "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 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, seul les liens protégés sont autorisées.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Le partage de %s a échoué car le partage par lien n'est pas permis",
+    "Share type %s is not valid for %s" : "Le type de partage %s n'est pas valide pour %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Le réglage des permissions pour %s a échoué car les permissions dépassent celles accordées à %s",
+    "Setting permissions for %s failed, because the item was not found" : "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Impossible de configurer la date d'expiration. Un partage ne peut expirer plus de %s après sa création",
+    "Cannot set expiration date. Expiration date is in the past" : "Impossible de configurer la date d'expiration. La date d'expiration est dans le passé.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "L'emplacement du partage %s doit implémenter l'interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Emplacement de partage %s introuvable",
+    "Sharing backend for %s not found" : "L'emplacement du partage %s est introuvable",
+    "Sharing %s failed, because the user %s is the original sharer" : "Le partage de %s a échoué car l'utilisateur %s est l'utilisateur à l'origine du partage.",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s",
+    "Sharing %s failed, because resharing is not allowed" : "Le partage de %s a échoué car le repartage n'est pas autorisé",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "Le partage %s a échoué parce que la source n'a é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\"",
+    "seconds ago" : "il y a quelques secondes",
+    "_%n minute ago_::_%n minutes ago_" : ["","il y a %n minutes"],
+    "_%n hour ago_::_%n hours ago_" : ["","Il y a %n heures"],
+    "today" : "aujourd'hui",
+    "yesterday" : "hier",
+    "_%n day go_::_%n days ago_" : ["","il y a %n jours"],
+    "last month" : "le mois dernier",
+    "_%n month ago_::_%n months ago_" : ["","Il y a %n mois"],
+    "last year" : "l'année dernière",
+    "years ago" : "il y a plusieurs années",
+    "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",
+    "The username is already being used" : "Ce nom d'utilisateur est déjà utilisé",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Aucun pilote de base de données (sqlite, mysql, ou postgresql) n’est installé.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Les permissions peuvent, généralement, être résolues %sen donnant au serveur web un accès en écriture au répertoire racine%s",
+    "Cannot write into \"config\" directory" : "Impossible d’écrire dans le répertoire \"config\"",
+    "Cannot write into \"apps\" directory" : "Impossible d’écrire dans le répertoire \"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." : "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire apps%s ou en désactivant l'appstore dans le fichier de configuration.",
+    "Cannot create \"data\" directory (%s)" : "Impossible de créer le répertoire \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ce problème est généralement résolu <a href=\"%s\" target=\"_blank\">en donnant au serveur web un accès en écriture au répertoire racine</a>.",
+    "Setting locale to %s failed" : "Le choix de la langue pour %s a échoué",
+    "Please install one of these locales on your system and restart your webserver." : "Veuillez installer l'une de ces langues sur votre système et redémarrer votre serveur web.",
+    "Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.",
+    "PHP module %s not installed." : "Le module PHP %s n’est pas installé.",
+    "PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus supportée par ownCloud, de même que par la communauté PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode est déprécié, inutile la plupart du temps, et doit être désactivé. Veuillez demander à votre administrateur serveur de le désactiver dans le fichier php.ini ou dans votre configuration du serveur web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes est déprécié, inutile la plupart du temps, et doit être désactivé. Veuillez demander à votre administrateur serveur de le désactiver dans le fichier php.ini ou dans votre configuration du serveur web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?",
+    "Please ask your server administrator to restart the web server." : "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 requis",
+    "Please upgrade your database version" : "Veuillez mettre à jour votre base de données",
+    "Error occurred while checking PostgreSQL version" : "Une erreur s’est produite pendant la récupération du numéro de version de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Veuillez vérifier que vous utilisez PostgreSQL >= 9 , ou regardez dans le journal d’erreur pour plus d’informations sur ce problème",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Veuillez changer les permissions du répertoire en mode 0770 afin que son contenu puisse être listé par les autres utilisateurs.",
+    "Data directory (%s) is readable by other users" : "Le répertoire (%s) est lisible par les autres utilisateurs",
+    "Data directory (%s) is invalid" : "Le répertoire (%s) est invalide",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Veuillez vérifier que le répertoire de données contient un fichier \".ocdata\" à sa racine.",
+    "Could not obtain lock type %d on \"%s\"." : "Impossible d'obtenir le verrouillage de type %d sur \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
deleted file mode 100644
index 8a61c6ff8ad..00000000000
--- a/lib/l10n/fr.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Impossible d’écrire dans le répertoire « config » !",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Ce problème est généralement résolu en donnant au serveur web un accès en écriture à ce répertoire",
-"See %s" => "Voir %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire de configuration%s.",
-"Sample configuration detected" => "Configuration d'exemple détectée",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Il a été détecté que la configuration donnée à titre d'exemple a été copiée. Cela peut rendre votre installation inopérante et n'est pas pris en charge. Veuillez lire la documentation avant d'effectuer des modifications dans config.php",
-"Help" => "Aide",
-"Personal" => "Personnel",
-"Settings" => "Paramètres",
-"Users" => "Utilisateurs",
-"Admin" => "Administration",
-"Recommended" => "Recommandée",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'application \\\"%s\\\" ne peut pas être installée car elle n'est pas compatible avec cette version de ownCloud.",
-"No app name specified" => "Aucun nom d'application spécifié",
-"Unknown filetype" => "Type de fichier inconnu",
-"Invalid image" => "Image non valable",
-"web services under your control" => "services web sous votre contrôle",
-"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",
-"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",
-"Archives of type %s are not supported" => "Les archives de type %s ne sont pas supportées",
-"Failed to open archive when installing app" => "Échec de l'ouverture de l'archive lors de l'installation de l'application",
-"App does not provide an info.xml file" => "L'application ne fournit pas de fichier info.xml",
-"App can't be installed because of not allowed code in the App" => "L'application ne peut être installée car elle contient du code non-autorisé",
-"App can't be installed because it is not compatible with this version of ownCloud" => "L'application ne peut être installée car elle n'est pas compatible avec cette version de ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'application ne peut être installée car elle contient la balise <shipped>true</shipped> qui n'est pas autorisée pour les applications non-diffusées",
-"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'application ne peut être installée car la version de info.xml/version n'est identique à celle indiquée sur l'app store",
-"Application is not enabled" => "L'application n'est pas activée",
-"Authentication error" => "Erreur d'authentification",
-"Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
-"Unknown user" => "Utilisateur inconnu",
-"%s enter the database username." => "%s entrez le nom d'utilisateur de la base de données.",
-"%s enter the database name." => "%s entrez le nom de la base de données.",
-"%s you may not use dots in the database name" => "%s vous nez pouvez pas utiliser de points dans le nom de la base de données",
-"MS SQL username and/or password not valid: %s" => "Le nom d'utilisateur et/ou le mot de passe de la base MS SQL est invalide : %s",
-"You need to enter either an existing account or the administrator." => "Vous devez spécifier soit le nom d'un compte existant, soit celui de l'administrateur.",
-"MySQL/MariaDB username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe MySQL/MariaDB invalide",
-"DB Error: \"%s\"" => "Erreur de la base de données : \"%s\"",
-"Offending command was: \"%s\"" => "La requête en cause est : \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "L'utilisateur MySQL/MariaDB '%s'@'localhost' existe déjà.",
-"Drop this user from MySQL/MariaDB" => "Retirer cet utilisateur de la base MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "L'utilisateur MySQL/MariaDB '%s'@'%%' existe déjà",
-"Drop this user from MySQL/MariaDB." => "Retirer cet utilisateur de la base MySQL/MariaDB.",
-"Oracle connection could not be established" => "La connexion Oracle ne peut pas être établie",
-"Oracle username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base Oracle invalide",
-"Offending command was: \"%s\", name: %s, password: %s" => "La requête en cause est : \"%s\", nom : %s, mot de passe : %s",
-"PostgreSQL username and/or password not valid" => "Nom d'utilisateur et/ou mot de passe de la base PostgreSQL invalide",
-"Set an admin username." => "Spécifiez un nom d'utilisateur pour l'administrateur.",
-"Set an admin password." => "Spécifiez un mot de passe administrateur.",
-"Can't create or write into the data directory %s" => "Impossible de créer ou d'écrire dans le répertoire des données %s",
-"%s shared »%s« with you" => "%s partagé »%s« avec vous",
-"Sharing %s failed, because the file does not exist" => "Le partage de %s a échoué car le fichier n'existe pas",
-"You are not allowed to share %s" => "Vous n'êtes pas autorisé à partager %s",
-"Sharing %s failed, because the user %s is the item owner" => "Le partage de %s a échoué car l'utilisateur %s est le propriétaire de l'objet",
-"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 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, seul les liens protégés sont autorisées.",
-"Sharing %s failed, because sharing with links is not allowed" => "Le partage de %s a échoué car le partage par lien n'est pas permis",
-"Share type %s is not valid for %s" => "Le type de partage %s n'est pas valide pour %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Le réglage des permissions pour %s a échoué car les permissions dépassent celles accordées à %s",
-"Setting permissions for %s failed, because the item was not found" => "Le réglage des permissions pour %s a échoué car l'objet n'a pas été trouvé",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Impossible de configurer la date d'expiration. Un partage ne peut expirer plus de %s après sa création",
-"Cannot set expiration date. Expiration date is in the past" => "Impossible de configurer la date d'expiration. La date d'expiration est dans le passé.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "L'emplacement du partage %s doit implémenter l'interface OCP\\Share_Backend",
-"Sharing backend %s not found" => "Emplacement de partage %s introuvable",
-"Sharing backend for %s not found" => "L'emplacement du partage %s est introuvable",
-"Sharing %s failed, because the user %s is the original sharer" => "Le partage de %s a échoué car l'utilisateur %s est l'utilisateur à l'origine du partage.",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Le partage de %s a échoué car les permissions dépassent les permissions accordées à %s",
-"Sharing %s failed, because resharing is not allowed" => "Le partage de %s a échoué car le repartage n'est pas autorisé",
-"Sharing %s failed, because the sharing backend for %s could not find its source" => "Le partage %s a échoué parce que la source n'a é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\"",
-"seconds ago" => "il y a quelques secondes",
-"_%n minute ago_::_%n minutes ago_" => array("","il y a %n minutes"),
-"_%n hour ago_::_%n hours ago_" => array("","Il y a %n heures"),
-"today" => "aujourd'hui",
-"yesterday" => "hier",
-"_%n day go_::_%n days ago_" => array("","il y a %n jours"),
-"last month" => "le mois dernier",
-"_%n month ago_::_%n months ago_" => array("","Il y a %n mois"),
-"last year" => "l'année dernière",
-"years ago" => "il y a plusieurs années",
-"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",
-"The username is already being used" => "Ce nom d'utilisateur est déjà utilisé",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Aucun pilote de base de données (sqlite, mysql, ou postgresql) n’est installé.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Les permissions peuvent, généralement, être résolues %sen donnant au serveur web un accès en écriture au répertoire racine%s",
-"Cannot write into \"config\" directory" => "Impossible d’écrire dans le répertoire \"config\"",
-"Cannot write into \"apps\" directory" => "Impossible d’écrire dans le répertoire \"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." => "Ce problème est généralement résolu %sen donnant au serveur web un accès en écriture au répertoire apps%s ou en désactivant l'appstore dans le fichier de configuration.",
-"Cannot create \"data\" directory (%s)" => "Impossible de créer le répertoire \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Ce problème est généralement résolu <a href=\"%s\" target=\"_blank\">en donnant au serveur web un accès en écriture au répertoire racine</a>.",
-"Setting locale to %s failed" => "Le choix de la langue pour %s a échoué",
-"Please install one of these locales on your system and restart your webserver." => "Veuillez installer l'une de ces langues sur votre système et redémarrer votre serveur web.",
-"Please ask your server administrator to install the module." => "Veuillez demander à votre administrateur d’installer le module.",
-"PHP module %s not installed." => "Le module PHP %s n’est pas installé.",
-"PHP %s or higher is required." => "PHP %s ou supérieur est requis.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus supportée par ownCloud, de même que par la communauté PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode est déprécié, inutile la plupart du temps, et doit être désactivé. Veuillez demander à votre administrateur serveur de le désactiver dans le fichier php.ini ou dans votre configuration du serveur web.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes est déprécié, inutile la plupart du temps, et doit être désactivé. Veuillez demander à votre administrateur serveur de le désactiver dans le fichier php.ini ou dans votre configuration du serveur web.",
-"PHP modules have been installed, but they are still listed as missing?" => "Les modules PHP ont été installés mais sont toujours indiqués comme manquants ?",
-"Please ask your server administrator to restart the web server." => "Veuillez demander à votre administrateur serveur de redémarrer le serveur web.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 requis",
-"Please upgrade your database version" => "Veuillez mettre à jour votre base de données",
-"Error occurred while checking PostgreSQL version" => "Une erreur s’est produite pendant la récupération du numéro de version de PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Veuillez vérifier que vous utilisez PostgreSQL >= 9 , ou regardez dans le journal d’erreur pour plus d’informations sur ce problème",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Veuillez changer les permissions du répertoire en mode 0770 afin que son contenu puisse être listé par les autres utilisateurs.",
-"Data directory (%s) is readable by other users" => "Le répertoire (%s) est lisible par les autres utilisateurs",
-"Data directory (%s) is invalid" => "Le répertoire (%s) est invalide",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Veuillez vérifier que le répertoire de données contient un fichier \".ocdata\" à sa racine.",
-"Could not obtain lock type %d on \"%s\"." => "Impossible d'obtenir le verrouillage de type %d sur \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/fr_CA.js b/lib/l10n/fr_CA.js
new file mode 100644
index 00000000000..9ac3e05d6c6
--- /dev/null
+++ b/lib/l10n/fr_CA.js
@@ -0,0 +1,9 @@
+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/fr_CA.json b/lib/l10n/fr_CA.json
new file mode 100644
index 00000000000..82a8a99d300
--- /dev/null
+++ b/lib/l10n/fr_CA.json
@@ -0,0 +1,7 @@
+{ "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/fr_CA.php b/lib/l10n/fr_CA.php
deleted file mode 100644
index 406ff5f5a26..00000000000
--- a/lib/l10n/fr_CA.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/fy_NL.js b/lib/l10n/fy_NL.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/fy_NL.js
@@ -0,0 +1,9 @@
+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/fy_NL.json b/lib/l10n/fy_NL.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/fy_NL.json
@@ -0,0 +1,7 @@
+{ "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/fy_NL.php b/lib/l10n/fy_NL.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/fy_NL.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
new file mode 100644
index 00000000000..24d4ba9a600
--- /dev/null
+++ b/lib/l10n/gl.js
@@ -0,0 +1,120 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Non é posíbel escribir no directorio «config»!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Polo xeral, isto pode ser fixado para permitirlle ao servidor web acceso de escritura  ao directorio «config»",
+    "See %s" : "Vexa %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «config»%s.",
+    "Help" : "Axuda",
+    "Personal" : "Persoal",
+    "Settings" : "Axustes",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Non é posíbel instalar a aplicación «%s» por non seren compatíbel con esta versión do ownCloud.",
+    "No app name specified" : "Non se especificou o nome da aplicación",
+    "Unknown filetype" : "Tipo de ficheiro descoñecido",
+    "Invalid image" : "Imaxe incorrecta",
+    "web services under your control" : "servizos web baixo o seu control",
+    "App directory already exists" : "Xa existe o directorio da aplicación",
+    "Can't create app folder. Please fix permissions. %s" : "Non é posíbel crear o cartafol de aplicacións. Corrixa os permisos. %s",
+    "No source specified when installing app" : "Non foi especificada ningunha orixe ao instalar aplicacións",
+    "No href specified when installing app from http" : "Non foi especificada ningunha href ao instalar aplicacións",
+    "No path specified when installing app from local file" : "Non foi especificada ningunha ruta ao instalar aplicacións desde un ficheiro local",
+    "Archives of type %s are not supported" : "Os arquivos do tipo %s non están admitidos",
+    "Failed to open archive when installing app" : "Non foi posíbel abrir o arquivo ao instalar aplicacións",
+    "App does not provide an info.xml file" : "A aplicación non fornece un ficheiro info.xml",
+    "App can't be installed because of not allowed code in the App" : "Non é posíbel instalar a aplicación por mor de conter código non permitido",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Non é posíbel instalar a aplicación por non seren compatíbel  con esta versión do ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Non é posíbel instalar a aplicación por conter a etiqueta <shipped>true</shipped> que non está permitida para as aplicacións non enviadas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Non é posíbel instalar a aplicación xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store",
+    "Application is not enabled" : "A aplicación non está activada",
+    "Authentication error" : "Produciuse un erro de autenticación",
+    "Token expired. Please reload page." : "Testemuña caducada. Recargue a páxina.",
+    "Unknown user" : "Usuario descoñecido",
+    "%s enter the database username." : "%s introduza o nome de usuario da base de datos",
+    "%s enter the database name." : "%s introduza o nome da base de datos",
+    "%s you may not use dots in the database name" : "%s non se poden empregar puntos na base de datos",
+    "MS SQL username and/or password not valid: %s" : "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
+    "You need to enter either an existing account or the administrator." : "Deberá introducir unha conta existente ou o administrador.",
+    "MySQL/MariaDB username and/or password not valid" : "O nome e/ou o contrasinal do usuario de MySQL/MariaDB non é correcto",
+    "DB Error: \"%s\"" : "Produciuse un erro na base de datos: «%s»",
+    "Offending command was: \"%s\"" : "A orde infractora foi: «%s»",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Xa existe o usuario «%s»@«localhost» no MySQL/MariaDB.",
+    "Drop this user from MySQL/MariaDB" : "Eliminar este usuario do MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Xa existe o usuario «%s»@«%%» no MySQL/MariaDB",
+    "Drop this user from MySQL/MariaDB." : "Eliminar este usuario do MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Non foi posíbel estabelecer a conexión con Oracle",
+    "Oracle username and/or password not valid" : "Nome de usuario e/ou contrasinal de Oracle incorrecto",
+    "Offending command was: \"%s\", name: %s, password: %s" : "A orde infractora foi: «%s», nome: %s, contrasinal: %s",
+    "PostgreSQL username and/or password not valid" : "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
+    "Set an admin username." : "Estabeleza un nome de usuario administrador",
+    "Set an admin password." : "Estabeleza un contrasinal de administrador",
+    "%s shared »%s« with you" : "%s compartiu «%s» con vostede",
+    "Sharing %s failed, because the file does not exist" : "Fallou a compartición de %s, o ficheiro non existe",
+    "You are not allowed to share %s" : "Non ten permiso para compartir %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Fallou a compartición de %s, o propietario do elemento é o usuario %s",
+    "Sharing %s failed, because the user %s does not exist" : "Fallou a compartición de %s, o usuario %s non existe",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Fallou a compartición de %s, o usuario %s non é membro de ningún grupo que sexa membro de %s",
+    "Sharing %s failed, because this item is already shared with %s" : "Fallou a compartición de %s, este elemento xa está compartido con %s",
+    "Sharing %s failed, because the group %s does not exist" : "Fallou a compartición de %s, o grupo %s non existe",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Fallou a compartición de %s, %s non é membro do grupo %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas",
+    "Sharing %s failed, because sharing with links is not allowed" : "Fallou a compartición de %s, non está permitido compartir con ligazóns",
+    "Share type %s is not valid for %s" : "Non se admite a compartición do tipo %s para %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Non é posíbel estabelecer permisos para %s, non se atopa o elemento",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Non é posíbel estabelecer a data de caducidade. As comparticións non poden caducar máis aló de %s após de seren compartidas",
+    "Cannot set expiration date. Expiration date is in the past" : "Non é posíbel estabelecer a data de caducidade. A data de caducidade está no pasado.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Non se atopou a infraestrutura de compartición %s",
+    "Sharing backend for %s not found" : "Non se atopou a infraestrutura de compartición para %s",
+    "Sharing %s failed, because the user %s is the original sharer" : "Fallou a compartición de %s, a compartición orixinal é do usuario %s",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Fallou a compartición de %s, os permisos superan os permisos concedidos a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Fallou a compartición de %s, non está permitido repetir a compartción",
+    "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»",
+    "seconds ago" : "segundos atrás",
+    "_%n minute ago_::_%n minutes ago_" : ["hai %n minuto","hai %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["hai %n hora","hai %n horas"],
+    "today" : "hoxe",
+    "yesterday" : "onte",
+    "_%n day go_::_%n days ago_" : ["hai %n día","vai %n días"],
+    "last month" : "último mes",
+    "_%n month ago_::_%n months ago_" : ["hai %n mes","hai %n meses"],
+    "last year" : "último ano",
+    "years ago" : "anos atrás",
+    "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",
+    "The username is already being used" : "Este nome de usuario xa está a ser usado",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Non hay controladores de base de datos (sqlite, mysql, ou postgresql) instalados.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «root»%s.",
+    "Cannot write into \"config\" directory" : "Non é posíbel escribir no directorio «config»",
+    "Cannot write into \"apps\" directory" : "Non é posíbel escribir no directorio «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." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «apps»%s ou a desactivación da «appstore» no ficheiro de configuración.",
+    "Cannot create \"data\" directory (%s)" : "Non é posíbel crear o directorio «data» (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Polo xeral, isto pode ser fixado para <a href=\"%s\" target=\"_blank\">permitirlle ao servidor web acceso de escritura  ao directorio «root»</a>.",
+    "Setting locale to %s failed" : "Fallou o axuste da configuración local a %s",
+    "Please install one of these locales on your system and restart your webserver." : "Instale unha destas configuracións locais no seu sistema e reinicie o servidor web.",
+    "Please ask your server administrator to install the module." : "Pregúntelle ao administrador do servidor pola instalación do módulo.",
+    "PHP module %s not installed." : "O módulo PHP %s non está instalado.",
+    "PHP %s or higher is required." : "Requirese PHP %s ou superior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "O modo seguro de PHP está activado. ownCloud precisa que estea desactivado para traballar doadamente.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "O modo seguro de PHP é un entorno en desuso e maiormente inútil que ten que seren desactivado. Pregúntelle ao administrador do servidor pola desactivación en php.ini ou na configuración do servidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "«Magic Quotes» está activado. ownCloud precisa que estea desactivado para traballar doadamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "«Magic Quotes» é un entorno en desuso e maiormente inútil que ten que seren desactivado. Pregúntelle ao administrador do servidor pola desactivación en php.ini ou na configuración do servidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?",
+    "Please ask your server administrator to restart the web server." : "Pregúntelle ao administrador do servidor polo reinicio do servidor web..",
+    "PostgreSQL >= 9 required" : "Requírese PostgreSQL >= 9",
+    "Please upgrade your database version" : "Anove a versión da súa base de datos",
+    "Error occurred while checking PostgreSQL version" : "Produciuse un erro mentres comprobaba a versión de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Asegúrese de que dispón do PostgreSQL >= 9 ou comprobe os rexistros para obter máis información sobre este erro",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Cambie os permisos a 0770 para que o directorio non poida seren listado por outros usuarios.",
+    "Data directory (%s) is readable by other users" : "O directorio de datos (%s) é lexíbel por outros usuarios",
+    "Data directory (%s) is invalid" : "O directorio de datos (%s) non é correcto",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Comprobe que o directorio de datos conten un ficheiro «.ocdata» na súa raíz.",
+    "Could not obtain lock type %d on \"%s\"." : "Non foi posíbel obter un bloqueo do tipo %d en «%s»."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
new file mode 100644
index 00000000000..24815e3a085
--- /dev/null
+++ b/lib/l10n/gl.json
@@ -0,0 +1,118 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Non é posíbel escribir no directorio «config»!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Polo xeral, isto pode ser fixado para permitirlle ao servidor web acceso de escritura  ao directorio «config»",
+    "See %s" : "Vexa %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «config»%s.",
+    "Help" : "Axuda",
+    "Personal" : "Persoal",
+    "Settings" : "Axustes",
+    "Users" : "Usuarios",
+    "Admin" : "Administración",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Non é posíbel instalar a aplicación «%s» por non seren compatíbel con esta versión do ownCloud.",
+    "No app name specified" : "Non se especificou o nome da aplicación",
+    "Unknown filetype" : "Tipo de ficheiro descoñecido",
+    "Invalid image" : "Imaxe incorrecta",
+    "web services under your control" : "servizos web baixo o seu control",
+    "App directory already exists" : "Xa existe o directorio da aplicación",
+    "Can't create app folder. Please fix permissions. %s" : "Non é posíbel crear o cartafol de aplicacións. Corrixa os permisos. %s",
+    "No source specified when installing app" : "Non foi especificada ningunha orixe ao instalar aplicacións",
+    "No href specified when installing app from http" : "Non foi especificada ningunha href ao instalar aplicacións",
+    "No path specified when installing app from local file" : "Non foi especificada ningunha ruta ao instalar aplicacións desde un ficheiro local",
+    "Archives of type %s are not supported" : "Os arquivos do tipo %s non están admitidos",
+    "Failed to open archive when installing app" : "Non foi posíbel abrir o arquivo ao instalar aplicacións",
+    "App does not provide an info.xml file" : "A aplicación non fornece un ficheiro info.xml",
+    "App can't be installed because of not allowed code in the App" : "Non é posíbel instalar a aplicación por mor de conter código non permitido",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Non é posíbel instalar a aplicación por non seren compatíbel  con esta versión do ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Non é posíbel instalar a aplicación por conter a etiqueta <shipped>true</shipped> que non está permitida para as aplicacións non enviadas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Non é posíbel instalar a aplicación xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store",
+    "Application is not enabled" : "A aplicación non está activada",
+    "Authentication error" : "Produciuse un erro de autenticación",
+    "Token expired. Please reload page." : "Testemuña caducada. Recargue a páxina.",
+    "Unknown user" : "Usuario descoñecido",
+    "%s enter the database username." : "%s introduza o nome de usuario da base de datos",
+    "%s enter the database name." : "%s introduza o nome da base de datos",
+    "%s you may not use dots in the database name" : "%s non se poden empregar puntos na base de datos",
+    "MS SQL username and/or password not valid: %s" : "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
+    "You need to enter either an existing account or the administrator." : "Deberá introducir unha conta existente ou o administrador.",
+    "MySQL/MariaDB username and/or password not valid" : "O nome e/ou o contrasinal do usuario de MySQL/MariaDB non é correcto",
+    "DB Error: \"%s\"" : "Produciuse un erro na base de datos: «%s»",
+    "Offending command was: \"%s\"" : "A orde infractora foi: «%s»",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Xa existe o usuario «%s»@«localhost» no MySQL/MariaDB.",
+    "Drop this user from MySQL/MariaDB" : "Eliminar este usuario do MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Xa existe o usuario «%s»@«%%» no MySQL/MariaDB",
+    "Drop this user from MySQL/MariaDB." : "Eliminar este usuario do MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Non foi posíbel estabelecer a conexión con Oracle",
+    "Oracle username and/or password not valid" : "Nome de usuario e/ou contrasinal de Oracle incorrecto",
+    "Offending command was: \"%s\", name: %s, password: %s" : "A orde infractora foi: «%s», nome: %s, contrasinal: %s",
+    "PostgreSQL username and/or password not valid" : "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
+    "Set an admin username." : "Estabeleza un nome de usuario administrador",
+    "Set an admin password." : "Estabeleza un contrasinal de administrador",
+    "%s shared »%s« with you" : "%s compartiu «%s» con vostede",
+    "Sharing %s failed, because the file does not exist" : "Fallou a compartición de %s, o ficheiro non existe",
+    "You are not allowed to share %s" : "Non ten permiso para compartir %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Fallou a compartición de %s, o propietario do elemento é o usuario %s",
+    "Sharing %s failed, because the user %s does not exist" : "Fallou a compartición de %s, o usuario %s non existe",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Fallou a compartición de %s, o usuario %s non é membro de ningún grupo que sexa membro de %s",
+    "Sharing %s failed, because this item is already shared with %s" : "Fallou a compartición de %s, este elemento xa está compartido con %s",
+    "Sharing %s failed, because the group %s does not exist" : "Fallou a compartición de %s, o grupo %s non existe",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Fallou a compartición de %s, %s non é membro do grupo %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas",
+    "Sharing %s failed, because sharing with links is not allowed" : "Fallou a compartición de %s, non está permitido compartir con ligazóns",
+    "Share type %s is not valid for %s" : "Non se admite a compartición do tipo %s para %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Non é posíbel estabelecer permisos para %s, non se atopa o elemento",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Non é posíbel estabelecer a data de caducidade. As comparticións non poden caducar máis aló de %s após de seren compartidas",
+    "Cannot set expiration date. Expiration date is in the past" : "Non é posíbel estabelecer a data de caducidade. A data de caducidade está no pasado.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Non se atopou a infraestrutura de compartición %s",
+    "Sharing backend for %s not found" : "Non se atopou a infraestrutura de compartición para %s",
+    "Sharing %s failed, because the user %s is the original sharer" : "Fallou a compartición de %s, a compartición orixinal é do usuario %s",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Fallou a compartición de %s, os permisos superan os permisos concedidos a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Fallou a compartición de %s, non está permitido repetir a compartción",
+    "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»",
+    "seconds ago" : "segundos atrás",
+    "_%n minute ago_::_%n minutes ago_" : ["hai %n minuto","hai %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["hai %n hora","hai %n horas"],
+    "today" : "hoxe",
+    "yesterday" : "onte",
+    "_%n day go_::_%n days ago_" : ["hai %n día","vai %n días"],
+    "last month" : "último mes",
+    "_%n month ago_::_%n months ago_" : ["hai %n mes","hai %n meses"],
+    "last year" : "último ano",
+    "years ago" : "anos atrás",
+    "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",
+    "The username is already being used" : "Este nome de usuario xa está a ser usado",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Non hay controladores de base de datos (sqlite, mysql, ou postgresql) instalados.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «root»%s.",
+    "Cannot write into \"config\" directory" : "Non é posíbel escribir no directorio «config»",
+    "Cannot write into \"apps\" directory" : "Non é posíbel escribir no directorio «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." : "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «apps»%s ou a desactivación da «appstore» no ficheiro de configuración.",
+    "Cannot create \"data\" directory (%s)" : "Non é posíbel crear o directorio «data» (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Polo xeral, isto pode ser fixado para <a href=\"%s\" target=\"_blank\">permitirlle ao servidor web acceso de escritura  ao directorio «root»</a>.",
+    "Setting locale to %s failed" : "Fallou o axuste da configuración local a %s",
+    "Please install one of these locales on your system and restart your webserver." : "Instale unha destas configuracións locais no seu sistema e reinicie o servidor web.",
+    "Please ask your server administrator to install the module." : "Pregúntelle ao administrador do servidor pola instalación do módulo.",
+    "PHP module %s not installed." : "O módulo PHP %s non está instalado.",
+    "PHP %s or higher is required." : "Requirese PHP %s ou superior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "O modo seguro de PHP está activado. ownCloud precisa que estea desactivado para traballar doadamente.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "O modo seguro de PHP é un entorno en desuso e maiormente inútil que ten que seren desactivado. Pregúntelle ao administrador do servidor pola desactivación en php.ini ou na configuración do servidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "«Magic Quotes» está activado. ownCloud precisa que estea desactivado para traballar doadamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "«Magic Quotes» é un entorno en desuso e maiormente inútil que ten que seren desactivado. Pregúntelle ao administrador do servidor pola desactivación en php.ini ou na configuración do servidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?",
+    "Please ask your server administrator to restart the web server." : "Pregúntelle ao administrador do servidor polo reinicio do servidor web..",
+    "PostgreSQL >= 9 required" : "Requírese PostgreSQL >= 9",
+    "Please upgrade your database version" : "Anove a versión da súa base de datos",
+    "Error occurred while checking PostgreSQL version" : "Produciuse un erro mentres comprobaba a versión de PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Asegúrese de que dispón do PostgreSQL >= 9 ou comprobe os rexistros para obter máis información sobre este erro",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Cambie os permisos a 0770 para que o directorio non poida seren listado por outros usuarios.",
+    "Data directory (%s) is readable by other users" : "O directorio de datos (%s) é lexíbel por outros usuarios",
+    "Data directory (%s) is invalid" : "O directorio de datos (%s) non é correcto",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Comprobe que o directorio de datos conten un ficheiro «.ocdata» na súa raíz.",
+    "Could not obtain lock type %d on \"%s\"." : "Non foi posíbel obter un bloqueo do tipo %d en «%s»."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
deleted file mode 100644
index ee55a862a54..00000000000
--- a/lib/l10n/gl.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Non é posíbel escribir no directorio «config»!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Polo xeral, isto pode ser fixado para permitirlle ao servidor web acceso de escritura  ao directorio «config»",
-"See %s" => "Vexa %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «config»%s.",
-"Help" => "Axuda",
-"Personal" => "Persoal",
-"Settings" => "Axustes",
-"Users" => "Usuarios",
-"Admin" => "Administración",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Non é posíbel instalar a aplicación «%s» por non seren compatíbel con esta versión do ownCloud.",
-"No app name specified" => "Non se especificou o nome da aplicación",
-"Unknown filetype" => "Tipo de ficheiro descoñecido",
-"Invalid image" => "Imaxe incorrecta",
-"web services under your control" => "servizos web baixo o seu control",
-"App directory already exists" => "Xa existe o directorio da aplicación",
-"Can't create app folder. Please fix permissions. %s" => "Non é posíbel crear o cartafol de aplicacións. Corrixa os permisos. %s",
-"No source specified when installing app" => "Non foi especificada ningunha orixe ao instalar aplicacións",
-"No href specified when installing app from http" => "Non foi especificada ningunha href ao instalar aplicacións",
-"No path specified when installing app from local file" => "Non foi especificada ningunha ruta ao instalar aplicacións desde un ficheiro local",
-"Archives of type %s are not supported" => "Os arquivos do tipo %s non están admitidos",
-"Failed to open archive when installing app" => "Non foi posíbel abrir o arquivo ao instalar aplicacións",
-"App does not provide an info.xml file" => "A aplicación non fornece un ficheiro info.xml",
-"App can't be installed because of not allowed code in the App" => "Non é posíbel instalar a aplicación por mor de conter código non permitido",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Non é posíbel instalar a aplicación por non seren compatíbel  con esta versión do ownCloud.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Non é posíbel instalar a aplicación por conter a etiqueta <shipped>true</shipped> que non está permitida para as aplicacións non enviadas",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Non é posíbel instalar a aplicación xa que a versión en info.xml/version non é a mesma que a versión informada desde a App Store",
-"Application is not enabled" => "A aplicación non está activada",
-"Authentication error" => "Produciuse un erro de autenticación",
-"Token expired. Please reload page." => "Testemuña caducada. Recargue a páxina.",
-"Unknown user" => "Usuario descoñecido",
-"%s enter the database username." => "%s introduza o nome de usuario da base de datos",
-"%s enter the database name." => "%s introduza o nome da base de datos",
-"%s you may not use dots in the database name" => "%s non se poden empregar puntos na base de datos",
-"MS SQL username and/or password not valid: %s" => "Nome de usuario e/ou contrasinal de MS SQL incorrecto: %s",
-"You need to enter either an existing account or the administrator." => "Deberá introducir unha conta existente ou o administrador.",
-"MySQL/MariaDB username and/or password not valid" => "O nome e/ou o contrasinal do usuario de MySQL/MariaDB non é correcto",
-"DB Error: \"%s\"" => "Produciuse un erro na base de datos: «%s»",
-"Offending command was: \"%s\"" => "A orde infractora foi: «%s»",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "Xa existe o usuario «%s»@«localhost» no MySQL/MariaDB.",
-"Drop this user from MySQL/MariaDB" => "Eliminar este usuario do MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Xa existe o usuario «%s»@«%%» no MySQL/MariaDB",
-"Drop this user from MySQL/MariaDB." => "Eliminar este usuario do MySQL/MariaDB.",
-"Oracle connection could not be established" => "Non foi posíbel estabelecer a conexión con Oracle",
-"Oracle username and/or password not valid" => "Nome de usuario e/ou contrasinal de Oracle incorrecto",
-"Offending command was: \"%s\", name: %s, password: %s" => "A orde infractora foi: «%s», nome: %s, contrasinal: %s",
-"PostgreSQL username and/or password not valid" => "Nome de usuario e/ou contrasinal de PostgreSQL incorrecto",
-"Set an admin username." => "Estabeleza un nome de usuario administrador",
-"Set an admin password." => "Estabeleza un contrasinal de administrador",
-"%s shared »%s« with you" => "%s compartiu «%s» con vostede",
-"Sharing %s failed, because the file does not exist" => "Fallou a compartición de %s, o ficheiro non existe",
-"You are not allowed to share %s" => "Non ten permiso para compartir %s",
-"Sharing %s failed, because the user %s is the item owner" => "Fallou a compartición de %s, o propietario do elemento é o usuario %s",
-"Sharing %s failed, because the user %s does not exist" => "Fallou a compartición de %s, o usuario %s non existe",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Fallou a compartición de %s, o usuario %s non é membro de ningún grupo que sexa membro de %s",
-"Sharing %s failed, because this item is already shared with %s" => "Fallou a compartición de %s, este elemento xa está compartido con %s",
-"Sharing %s failed, because the group %s does not exist" => "Fallou a compartición de %s, o grupo %s non existe",
-"Sharing %s failed, because %s is not a member of the group %s" => "Fallou a compartición de %s, %s non é membro do grupo %s",
-"You need to provide a password to create a public link, only protected links are allowed" => "Ten que fornecer un contrasinal para a ligazón pública, só se permiten ligazóns protexidas",
-"Sharing %s failed, because sharing with links is not allowed" => "Fallou a compartición de %s, non está permitido compartir con ligazóns",
-"Share type %s is not valid for %s" => "Non se admite a compartición do tipo %s para %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Non é posíbel estabelecer permisos para %s, os permisos superan os permisos concedidos a %s",
-"Setting permissions for %s failed, because the item was not found" => "Non é posíbel estabelecer permisos para %s, non se atopa o elemento",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Non é posíbel estabelecer a data de caducidade. As comparticións non poden caducar máis aló de %s após de seren compartidas",
-"Cannot set expiration date. Expiration date is in the past" => "Non é posíbel estabelecer a data de caducidade. A data de caducidade está no pasado.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "A infraestrutura de compartición %s ten que implementar a interface OCP\\Share_Backend",
-"Sharing backend %s not found" => "Non se atopou a infraestrutura de compartición %s",
-"Sharing backend for %s not found" => "Non se atopou a infraestrutura de compartición para %s",
-"Sharing %s failed, because the user %s is the original sharer" => "Fallou a compartición de %s, a compartición orixinal é do usuario %s",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Fallou a compartición de %s, os permisos superan os permisos concedidos a %s",
-"Sharing %s failed, because resharing is not allowed" => "Fallou a compartición de %s, non está permitido repetir a compartción",
-"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»",
-"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("hai %n minuto","hai %n minutos"),
-"_%n hour ago_::_%n hours ago_" => array("hai %n hora","hai %n horas"),
-"today" => "hoxe",
-"yesterday" => "onte",
-"_%n day go_::_%n days ago_" => array("hai %n día","vai %n días"),
-"last month" => "último mes",
-"_%n month ago_::_%n months ago_" => array("hai %n mes","hai %n meses"),
-"last year" => "último ano",
-"years ago" => "anos atrás",
-"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",
-"The username is already being used" => "Este nome de usuario xa está a ser usado",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Non hay controladores de base de datos (sqlite, mysql, ou postgresql) instalados.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «root»%s.",
-"Cannot write into \"config\" directory" => "Non é posíbel escribir no directorio «config»",
-"Cannot write into \"apps\" directory" => "Non é posíbel escribir no directorio «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." => "Polo xeral, isto pode ser fixado para %spermitirlle ao servidor web acceso de escritura  ao directorio «apps»%s ou a desactivación da «appstore» no ficheiro de configuración.",
-"Cannot create \"data\" directory (%s)" => "Non é posíbel crear o directorio «data» (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Polo xeral, isto pode ser fixado para <a href=\"%s\" target=\"_blank\">permitirlle ao servidor web acceso de escritura  ao directorio «root»</a>.",
-"Setting locale to %s failed" => "Fallou o axuste da configuración local a %s",
-"Please install one of these locales on your system and restart your webserver." => "Instale unha destas configuracións locais no seu sistema e reinicie o servidor web.",
-"Please ask your server administrator to install the module." => "Pregúntelle ao administrador do servidor pola instalación do módulo.",
-"PHP module %s not installed." => "O módulo PHP %s non está instalado.",
-"PHP %s or higher is required." => "Requirese PHP %s ou superior.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Pregúntelle ao administrador do servidor pola actualización de PHP á versión máis recente. A súa versión de PHP xa non é asistida polas comunidades de ownCloud e PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "O modo seguro de PHP está activado. ownCloud precisa que estea desactivado para traballar doadamente.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "O modo seguro de PHP é un entorno en desuso e maiormente inútil que ten que seren desactivado. Pregúntelle ao administrador do servidor pola desactivación en php.ini ou na configuración do servidor web.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "«Magic Quotes» está activado. ownCloud precisa que estea desactivado para traballar doadamente.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "«Magic Quotes» é un entorno en desuso e maiormente inútil que ten que seren desactivado. Pregúntelle ao administrador do servidor pola desactivación en php.ini ou na configuración do servidor web.",
-"PHP modules have been installed, but they are still listed as missing?" => "Instaláronse os módulos de PHP, mais aínda aparecen listados como perdidos?",
-"Please ask your server administrator to restart the web server." => "Pregúntelle ao administrador do servidor polo reinicio do servidor web..",
-"PostgreSQL >= 9 required" => "Requírese PostgreSQL >= 9",
-"Please upgrade your database version" => "Anove a versión da súa base de datos",
-"Error occurred while checking PostgreSQL version" => "Produciuse un erro mentres comprobaba a versión de PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Asegúrese de que dispón do PostgreSQL >= 9 ou comprobe os rexistros para obter máis información sobre este erro",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Cambie os permisos a 0770 para que o directorio non poida seren listado por outros usuarios.",
-"Data directory (%s) is readable by other users" => "O directorio de datos (%s) é lexíbel por outros usuarios",
-"Data directory (%s) is invalid" => "O directorio de datos (%s) non é correcto",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Comprobe que o directorio de datos conten un ficheiro «.ocdata» na súa raíz.",
-"Could not obtain lock type %d on \"%s\"." => "Non foi posíbel obter un bloqueo do tipo %d en «%s»."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/gu.js b/lib/l10n/gu.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/gu.js
@@ -0,0 +1,9 @@
+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/gu.json b/lib/l10n/gu.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/gu.json
@@ -0,0 +1,7 @@
+{ "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/gu.php b/lib/l10n/gu.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/gu.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/he.js b/lib/l10n/he.js
new file mode 100644
index 00000000000..c34ce27bb01
--- /dev/null
+++ b/lib/l10n/he.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "עזרה",
+    "Personal" : "אישי",
+    "Settings" : "הגדרות",
+    "Users" : "משתמשים",
+    "Admin" : "מנהל",
+    "web services under your control" : "שירותי רשת תחת השליטה שלך",
+    "Application is not enabled" : "יישומים אינם מופעלים",
+    "Authentication error" : "שגיאת הזדהות",
+    "Token expired. Please reload page." : "פג תוקף. נא לטעון שוב את הדף.",
+    "%s shared »%s« with you" : "%s שיתף/שיתפה איתך את »%s«",
+    "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“",
+    "seconds ago" : "שניות",
+    "_%n minute ago_::_%n minutes ago_" : ["","לפני %n דקות"],
+    "_%n hour ago_::_%n hours ago_" : ["","לפני %n שעות"],
+    "today" : "היום",
+    "yesterday" : "אתמול",
+    "_%n day go_::_%n days ago_" : ["","לפני %n ימים"],
+    "last month" : "חודש שעבר",
+    "_%n month ago_::_%n months ago_" : ["","לפני %n חודשים"],
+    "last year" : "שנה שעברה",
+    "years ago" : "שנים",
+    "A valid username must be provided" : "יש לספק שם משתמש תקני",
+    "A valid password must be provided" : "יש לספק ססמה תקנית"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/he.json b/lib/l10n/he.json
new file mode 100644
index 00000000000..c97d585b901
--- /dev/null
+++ b/lib/l10n/he.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Help" : "עזרה",
+    "Personal" : "אישי",
+    "Settings" : "הגדרות",
+    "Users" : "משתמשים",
+    "Admin" : "מנהל",
+    "web services under your control" : "שירותי רשת תחת השליטה שלך",
+    "Application is not enabled" : "יישומים אינם מופעלים",
+    "Authentication error" : "שגיאת הזדהות",
+    "Token expired. Please reload page." : "פג תוקף. נא לטעון שוב את הדף.",
+    "%s shared »%s« with you" : "%s שיתף/שיתפה איתך את »%s«",
+    "Could not find category \"%s\"" : "לא ניתן למצוא את הקטגוריה „%s“",
+    "seconds ago" : "שניות",
+    "_%n minute ago_::_%n minutes ago_" : ["","לפני %n דקות"],
+    "_%n hour ago_::_%n hours ago_" : ["","לפני %n שעות"],
+    "today" : "היום",
+    "yesterday" : "אתמול",
+    "_%n day go_::_%n days ago_" : ["","לפני %n ימים"],
+    "last month" : "חודש שעבר",
+    "_%n month ago_::_%n months ago_" : ["","לפני %n חודשים"],
+    "last year" : "שנה שעברה",
+    "years ago" : "שנים",
+    "A valid username must be provided" : "יש לספק שם משתמש תקני",
+    "A valid password must be provided" : "יש לספק ססמה תקנית"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
deleted file mode 100644
index abb15388449..00000000000
--- a/lib/l10n/he.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "עזרה",
-"Personal" => "אישי",
-"Settings" => "הגדרות",
-"Users" => "משתמשים",
-"Admin" => "מנהל",
-"web services under your control" => "שירותי רשת תחת השליטה שלך",
-"Application is not enabled" => "יישומים אינם מופעלים",
-"Authentication error" => "שגיאת הזדהות",
-"Token expired. Please reload page." => "פג תוקף. נא לטעון שוב את הדף.",
-"%s shared »%s« with you" => "%s שיתף/שיתפה איתך את »%s«",
-"Could not find category \"%s\"" => "לא ניתן למצוא את הקטגוריה „%s“",
-"seconds ago" => "שניות",
-"_%n minute ago_::_%n minutes ago_" => array("","לפני %n דקות"),
-"_%n hour ago_::_%n hours ago_" => array("","לפני %n שעות"),
-"today" => "היום",
-"yesterday" => "אתמול",
-"_%n day go_::_%n days ago_" => array("","לפני %n ימים"),
-"last month" => "חודש שעבר",
-"_%n month ago_::_%n months ago_" => array("","לפני %n חודשים"),
-"last year" => "שנה שעברה",
-"years ago" => "שנים",
-"A valid username must be provided" => "יש לספק שם משתמש תקני",
-"A valid password must be provided" => "יש לספק ססמה תקנית"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hi.js b/lib/l10n/hi.js
new file mode 100644
index 00000000000..cc987c48024
--- /dev/null
+++ b/lib/l10n/hi.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "सहयोग",
+    "Personal" : "यक्तिगत",
+    "Settings" : "सेटिंग्स",
+    "Users" : "उपयोगकर्ता",
+    "_%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.json b/lib/l10n/hi.json
new file mode 100644
index 00000000000..bf18b7731ad
--- /dev/null
+++ b/lib/l10n/hi.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Help" : "सहयोग",
+    "Personal" : "यक्तिगत",
+    "Settings" : "सेटिंग्स",
+    "Users" : "उपयोगकर्ता",
+    "_%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/hi.php b/lib/l10n/hi.php
deleted file mode 100644
index 039dfa4465d..00000000000
--- a/lib/l10n/hi.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "सहयोग",
-"Personal" => "यक्तिगत",
-"Settings" => "सेटिंग्स",
-"Users" => "उपयोगकर्ता",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hr.js b/lib/l10n/hr.js
new file mode 100644
index 00000000000..ead1e15d2cf
--- /dev/null
+++ b/lib/l10n/hr.js
@@ -0,0 +1,122 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Pisanje u \"config\" direktoriju nije moguće!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Ovo se obično može popraviti tako da se Web poslužitelju dopusti pristup za pisanje u config direktoriju",
+    "See %s" : "Vidite %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u config direktoriju%s.",
+    "Sample configuration detected" : "Nađena ogledna konfiguracija",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Otkriveno je da je ogledna konfiguracija kopirana. To može vašu instalaciju prekinuti i nije podržano.Molimo pročitajte dokumentaciju prije nego li izvršite promjene na config.php",
+    "Help" : "Pomoć",
+    "Personal" : "Osobno",
+    "Settings" : "Postavke",
+    "Users" : "Korisnici",
+    "Admin" : "Admin",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikacija \\\"%s\\\" se ne može instalirati jer nije kompatibilna s ovom verzijom ownClouda.",
+    "No app name specified" : "Nikakav naziv aplikacije nije naveden",
+    "Unknown filetype" : "Vrsta datoteke nepoznata",
+    "Invalid image" : "Neispravna slika",
+    "web services under your control" : "web usluge pod vašom kontrolom",
+    "App directory already exists" : "Direktorij aplikacije već postoji",
+    "Can't create app folder. Please fix permissions. %s" : "Nije moguće kreirati mapu aplikacija. molimo popravite dozvole. %s",
+    "No source specified when installing app" : "Pri instaliranju aplikacija nijedan izvor nije specificiran",
+    "No href specified when installing app from http" : "Pri instaliranju aplikacija iz http nijedan href nije specificiran.",
+    "No path specified when installing app from local file" : "Pri instaliranju aplikacija iz lokalne datoteke nijedan put nije specificiran.",
+    "Archives of type %s are not supported" : "Arhive tipa %s nisu podržane",
+    "Failed to open archive when installing app" : "Otvaranje arhive pri instaliranju aplikacija nije uspjelo.",
+    "App does not provide an info.xml file" : "Aplikacija ne pruža info.xml datoteku",
+    "App can't be installed because of not allowed code in the App" : "Aplikaciju nije moguće instalirati zbog nedopuštenog koda u njoj.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikaciju nije moguće instalirati jer nije kompatibilna s ovom verzijom ownClouda.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikaciju nije moguće instalirati jer sadrži oznaku <otpremljeno>istinito</otpremljeno>.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikaciju nije moguće instalirati jer verzija u info.xml/version nije ista kaoverzija koju je prijavio app store",
+    "Application is not enabled" : "Aplikacija nije aktivirana",
+    "Authentication error" : "Pogrešna autentikacija",
+    "Token expired. Please reload page." : "Token je istekao. Molimo, ponovno učitajte stranicu.",
+    "Unknown user" : "Korisnik nepoznat",
+    "%s enter the database username." : "%s unesite naziva korisnika baze podataka.",
+    "%s enter the database name." : "%s unesite naziv baze podataka",
+    "%s you may not use dots in the database name" : "%s ne smijete koristiti točke u nazivu baze podataka",
+    "MS SQL username and/or password not valid: %s" : "MS SQL korisničko ime i/ili lozinka neispravni: %s",
+    "You need to enter either an existing account or the administrator." : "Trebate unijeti neki postojeći račun ili administratora.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB korisničko ime i/ili lozinka neispravni",
+    "DB Error: \"%s\"" : "DB pogreška: \"%s\"",
+    "Offending command was: \"%s\"" : "Neispravna naredba je bila: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB korisnik '%s'@'localhost' već postoji.",
+    "Drop this user from MySQL/MariaDB" : "Ispustite ovog korisnika iz MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB korisnik '%s'@'%%' već postoji",
+    "Drop this user from MySQL/MariaDB." : "Ispustite ovog korisnika iz MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Vezu Oracle nije moguće uspostaviti",
+    "Oracle username and/or password not valid" : "Korisničko ime i/ili lozinka Oracle neispravni",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Neispravna naredba je bila: \"%s\", ime: %s, lozinka: %s",
+    "PostgreSQL username and/or password not valid" : "Korisničko ime i/ili lozinka PostgreSQL neispravni",
+    "Set an admin username." : "Navedite admin korisničko ime.",
+    "Set an admin password." : "Navedite admin lozinku.",
+    "%s shared »%s« with you" : "%s je s vama podijelio »%s«",
+    "Sharing %s failed, because the file does not exist" : "Dijeljenje %s nije uspjelo jer ta datoteka ne postoji",
+    "You are not allowed to share %s" : "Nije vam dopušteno dijeliti %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Dijeljenje %s nije uspjelo jer je korisnik %s vlasnik te stavke",
+    "Sharing %s failed, because the user %s does not exist" : "Dijeljenje %s nije uspjelo jer korisnik %s ne postoji",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Dijeljenje %s nije uspjelo jer korisnik %s nije član niti jedne grupe u kojoj je %s član",
+    "Sharing %s failed, because this item is already shared with %s" : "Dijeljenje %s nije uspjelo jer je ova stavka već podijeljena s %s",
+    "Sharing %s failed, because the group %s does not exist" : "Dijeljenje %s nije uspjelo jer grupa %s ne postoji",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Dijeljenje %s nije uspjelo jer %s nije član grupe %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Da biste kreirali javnu vezu, morate navesti lozinku, samo zaštićene veze su dopuštene.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Dijeljenje %s nije uspjelo jer dijeljenje s vezama nije dopušteno.",
+    "Share type %s is not valid for %s" : "Tip dijeljenja %s nije dopušteni tip za %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Postavke dozvola za %s nisu uspjele jer dozvole premašuju dozvole za koje %s ima odobrenje",
+    "Setting permissions for %s failed, because the item was not found" : "Postavke dozvola za %s nisu uspjele jer stavka nije nađena.",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nije moguće postaviti datum isteka. Nakon što su podijeljeni, resursi ne mogu isteći kasnije nego %s ",
+    "Cannot set expiration date. Expiration date is in the past" : "Nije moguće postaviti datum isteka. Datum isteka je u prošlosti",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Dijeljenje pozadine %s mora implementirati sučelje OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Dijeljenje pozadine %s nije nađeno",
+    "Sharing backend for %s not found" : "Dijeljenje pozadine za %s nije nađeno",
+    "Sharing %s failed, because the user %s is the original sharer" : "Dijeljenje %s nije uspjelo jer je korisnik %s izvorni djelitelj",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Dijeljenje %s nije uspjelo jer dozvole premašuju dozvole za koje %s ima odobrenje.",
+    "Sharing %s failed, because resharing is not allowed" : "Dijeljenje %s nije uspjelo jer ponovno dijeljenje nije dopušteno.",
+    "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",
+    "seconds ago" : "prije par sekundi",
+    "_%n minute ago_::_%n minutes ago_" : ["prije %n minute","prije %n minuta","prije %n minuta"],
+    "_%n hour ago_::_%n hours ago_" : ["prije %n sata","prije %n sati","prije %n sati"],
+    "today" : "Danas",
+    "yesterday" : "Jučer",
+    "_%n day go_::_%n days ago_" : ["prije %n dana","prije %n dana","prije %n dana"],
+    "last month" : "Prošli mjesec",
+    "_%n month ago_::_%n months ago_" : ["prije %n mjeseca","prije %n mjeseci","prije %n mjeseci"],
+    "last year" : "Prošle godine",
+    "years ago" : "Prije više godina",
+    "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",
+    "The username is already being used" : "Korisničko ime se već koristi",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Pogonski programi baze podataka (sqlite, mysql, ili postgresql) nisu instalirani.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dozvole se obično mogu popraviti %sdavanjem pristupa web poslužitelju za pisanje u korijenskom direktoriju%s",
+    "Cannot write into \"config\" directory" : "Nije moguće zapisivati u \"config\" direktorij",
+    "Cannot write into \"apps\" directory" : "Nije moguće zapisivati u \"apps\" direktorij",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u apps direktorij%sili isključivanjem appstorea u konfiguracijskoj datoteci.",
+    "Cannot create \"data\" directory (%s)" : "Kreiranje \"data\" direktorija (%s) nije moguće",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ovo obično može popraviti <a href=\"%s\"target=\"_blank\">davanjem pristupa web poslužiteljuza pisanje u korijenskom direktoriju</a>.",
+    "Setting locale to %s failed" : "Postavljanje regionalne sheme u %s nije uspjelo",
+    "Please install one of these locales on your system and restart your webserver." : "Molimo instalirajte jednu od ovih regionalnih shema u svoj sustav i ponovno pokrenite svoj web poslužitelj.",
+    "Please ask your server administrator to install the module." : "Molimo zamolite svog administratora poslužitelja da instalira modul.",
+    "PHP module %s not installed." : "PHP modul %s nije instaliran.",
+    "PHP %s or higher is required." : "PHP verzija treba biti %s ili viša.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Molimo zamolite svog administratora poslužitelja da ažurira PHP na najnoviju verziju.Vašu PHP verziju ownCloud i PHP zajednica više ne podržavaju.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Aktiviran je PHP siguran način rada. Da bi ownCloud radio kako treba, taj mod treba oemogućiti.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP siguran način rada je zastarjela i uglavnom beskorisna postavka koju treba onemogućiti. Molimo zamolite svogadministratora poslužitelja da je onemogući, bilo u php.ini ili u vašoj konfiguraciji web poslužitelja.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Postavka Magic Quotes je omogućena. Da bi ownCloud radio kako treba, tu postavku treba onemogućiti.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zastarjela i uglavnom beskorisna postavka koju treba onemogućiti. MOlimo zamolite svogadministratora poslužitelja da je onemogući, bilo u php.ini ili u vašoj konfiguraciji web poslužitelja.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?",
+    "Please ask your server administrator to restart the web server." : "Molimo zamolite  svog administratora poslužitelja da ponovno pokrene web poslužitelj.",
+    "PostgreSQL >= 9 required" : "Potreban je PostgreSQL >= 9",
+    "Please upgrade your database version" : "Molimo, ažurirajte svoju verziju baze podataka",
+    "Error occurred while checking PostgreSQL version" : "Došlo je do pogreške tijekom provjeravanja verzije PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Pobrinite se da imate PostgreSQL >= 9. Za više informacija provjerite zapisnike.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Molimo promijenite dozvole na 0770 tako da se tim direktorijem ne mogu služiti drugi korisnici",
+    "Data directory (%s) is readable by other users" : "Podatkovni direktorij (%s) čitljiv je za druge korisnike",
+    "Data directory (%s) is invalid" : "Podatkovni direktorij (%s) nije ispravan",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Molimo provjerite sadrži li podatkovni direktorij u svom korijenu datoteku \".ocdata\"",
+    "Could not obtain lock type %d on \"%s\"." : "Nije moguće dobiti lock tip %d na \"%s\"."
+},
+"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/hr.json b/lib/l10n/hr.json
new file mode 100644
index 00000000000..01bd54eccfc
--- /dev/null
+++ b/lib/l10n/hr.json
@@ -0,0 +1,120 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Pisanje u \"config\" direktoriju nije moguće!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Ovo se obično može popraviti tako da se Web poslužitelju dopusti pristup za pisanje u config direktoriju",
+    "See %s" : "Vidite %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u config direktoriju%s.",
+    "Sample configuration detected" : "Nađena ogledna konfiguracija",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Otkriveno je da je ogledna konfiguracija kopirana. To može vašu instalaciju prekinuti i nije podržano.Molimo pročitajte dokumentaciju prije nego li izvršite promjene na config.php",
+    "Help" : "Pomoć",
+    "Personal" : "Osobno",
+    "Settings" : "Postavke",
+    "Users" : "Korisnici",
+    "Admin" : "Admin",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikacija \\\"%s\\\" se ne može instalirati jer nije kompatibilna s ovom verzijom ownClouda.",
+    "No app name specified" : "Nikakav naziv aplikacije nije naveden",
+    "Unknown filetype" : "Vrsta datoteke nepoznata",
+    "Invalid image" : "Neispravna slika",
+    "web services under your control" : "web usluge pod vašom kontrolom",
+    "App directory already exists" : "Direktorij aplikacije već postoji",
+    "Can't create app folder. Please fix permissions. %s" : "Nije moguće kreirati mapu aplikacija. molimo popravite dozvole. %s",
+    "No source specified when installing app" : "Pri instaliranju aplikacija nijedan izvor nije specificiran",
+    "No href specified when installing app from http" : "Pri instaliranju aplikacija iz http nijedan href nije specificiran.",
+    "No path specified when installing app from local file" : "Pri instaliranju aplikacija iz lokalne datoteke nijedan put nije specificiran.",
+    "Archives of type %s are not supported" : "Arhive tipa %s nisu podržane",
+    "Failed to open archive when installing app" : "Otvaranje arhive pri instaliranju aplikacija nije uspjelo.",
+    "App does not provide an info.xml file" : "Aplikacija ne pruža info.xml datoteku",
+    "App can't be installed because of not allowed code in the App" : "Aplikaciju nije moguće instalirati zbog nedopuštenog koda u njoj.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikaciju nije moguće instalirati jer nije kompatibilna s ovom verzijom ownClouda.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikaciju nije moguće instalirati jer sadrži oznaku <otpremljeno>istinito</otpremljeno>.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikaciju nije moguće instalirati jer verzija u info.xml/version nije ista kaoverzija koju je prijavio app store",
+    "Application is not enabled" : "Aplikacija nije aktivirana",
+    "Authentication error" : "Pogrešna autentikacija",
+    "Token expired. Please reload page." : "Token je istekao. Molimo, ponovno učitajte stranicu.",
+    "Unknown user" : "Korisnik nepoznat",
+    "%s enter the database username." : "%s unesite naziva korisnika baze podataka.",
+    "%s enter the database name." : "%s unesite naziv baze podataka",
+    "%s you may not use dots in the database name" : "%s ne smijete koristiti točke u nazivu baze podataka",
+    "MS SQL username and/or password not valid: %s" : "MS SQL korisničko ime i/ili lozinka neispravni: %s",
+    "You need to enter either an existing account or the administrator." : "Trebate unijeti neki postojeći račun ili administratora.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB korisničko ime i/ili lozinka neispravni",
+    "DB Error: \"%s\"" : "DB pogreška: \"%s\"",
+    "Offending command was: \"%s\"" : "Neispravna naredba je bila: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB korisnik '%s'@'localhost' već postoji.",
+    "Drop this user from MySQL/MariaDB" : "Ispustite ovog korisnika iz MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB korisnik '%s'@'%%' već postoji",
+    "Drop this user from MySQL/MariaDB." : "Ispustite ovog korisnika iz MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Vezu Oracle nije moguće uspostaviti",
+    "Oracle username and/or password not valid" : "Korisničko ime i/ili lozinka Oracle neispravni",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Neispravna naredba je bila: \"%s\", ime: %s, lozinka: %s",
+    "PostgreSQL username and/or password not valid" : "Korisničko ime i/ili lozinka PostgreSQL neispravni",
+    "Set an admin username." : "Navedite admin korisničko ime.",
+    "Set an admin password." : "Navedite admin lozinku.",
+    "%s shared »%s« with you" : "%s je s vama podijelio »%s«",
+    "Sharing %s failed, because the file does not exist" : "Dijeljenje %s nije uspjelo jer ta datoteka ne postoji",
+    "You are not allowed to share %s" : "Nije vam dopušteno dijeliti %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Dijeljenje %s nije uspjelo jer je korisnik %s vlasnik te stavke",
+    "Sharing %s failed, because the user %s does not exist" : "Dijeljenje %s nije uspjelo jer korisnik %s ne postoji",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Dijeljenje %s nije uspjelo jer korisnik %s nije član niti jedne grupe u kojoj je %s član",
+    "Sharing %s failed, because this item is already shared with %s" : "Dijeljenje %s nije uspjelo jer je ova stavka već podijeljena s %s",
+    "Sharing %s failed, because the group %s does not exist" : "Dijeljenje %s nije uspjelo jer grupa %s ne postoji",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Dijeljenje %s nije uspjelo jer %s nije član grupe %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Da biste kreirali javnu vezu, morate navesti lozinku, samo zaštićene veze su dopuštene.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Dijeljenje %s nije uspjelo jer dijeljenje s vezama nije dopušteno.",
+    "Share type %s is not valid for %s" : "Tip dijeljenja %s nije dopušteni tip za %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Postavke dozvola za %s nisu uspjele jer dozvole premašuju dozvole za koje %s ima odobrenje",
+    "Setting permissions for %s failed, because the item was not found" : "Postavke dozvola za %s nisu uspjele jer stavka nije nađena.",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nije moguće postaviti datum isteka. Nakon što su podijeljeni, resursi ne mogu isteći kasnije nego %s ",
+    "Cannot set expiration date. Expiration date is in the past" : "Nije moguće postaviti datum isteka. Datum isteka je u prošlosti",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Dijeljenje pozadine %s mora implementirati sučelje OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Dijeljenje pozadine %s nije nađeno",
+    "Sharing backend for %s not found" : "Dijeljenje pozadine za %s nije nađeno",
+    "Sharing %s failed, because the user %s is the original sharer" : "Dijeljenje %s nije uspjelo jer je korisnik %s izvorni djelitelj",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Dijeljenje %s nije uspjelo jer dozvole premašuju dozvole za koje %s ima odobrenje.",
+    "Sharing %s failed, because resharing is not allowed" : "Dijeljenje %s nije uspjelo jer ponovno dijeljenje nije dopušteno.",
+    "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",
+    "seconds ago" : "prije par sekundi",
+    "_%n minute ago_::_%n minutes ago_" : ["prije %n minute","prije %n minuta","prije %n minuta"],
+    "_%n hour ago_::_%n hours ago_" : ["prije %n sata","prije %n sati","prije %n sati"],
+    "today" : "Danas",
+    "yesterday" : "Jučer",
+    "_%n day go_::_%n days ago_" : ["prije %n dana","prije %n dana","prije %n dana"],
+    "last month" : "Prošli mjesec",
+    "_%n month ago_::_%n months ago_" : ["prije %n mjeseca","prije %n mjeseci","prije %n mjeseci"],
+    "last year" : "Prošle godine",
+    "years ago" : "Prije više godina",
+    "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",
+    "The username is already being used" : "Korisničko ime se već koristi",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Pogonski programi baze podataka (sqlite, mysql, ili postgresql) nisu instalirani.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dozvole se obično mogu popraviti %sdavanjem pristupa web poslužitelju za pisanje u korijenskom direktoriju%s",
+    "Cannot write into \"config\" directory" : "Nije moguće zapisivati u \"config\" direktorij",
+    "Cannot write into \"apps\" directory" : "Nije moguće zapisivati u \"apps\" direktorij",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u apps direktorij%sili isključivanjem appstorea u konfiguracijskoj datoteci.",
+    "Cannot create \"data\" directory (%s)" : "Kreiranje \"data\" direktorija (%s) nije moguće",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ovo obično može popraviti <a href=\"%s\"target=\"_blank\">davanjem pristupa web poslužiteljuza pisanje u korijenskom direktoriju</a>.",
+    "Setting locale to %s failed" : "Postavljanje regionalne sheme u %s nije uspjelo",
+    "Please install one of these locales on your system and restart your webserver." : "Molimo instalirajte jednu od ovih regionalnih shema u svoj sustav i ponovno pokrenite svoj web poslužitelj.",
+    "Please ask your server administrator to install the module." : "Molimo zamolite svog administratora poslužitelja da instalira modul.",
+    "PHP module %s not installed." : "PHP modul %s nije instaliran.",
+    "PHP %s or higher is required." : "PHP verzija treba biti %s ili viša.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Molimo zamolite svog administratora poslužitelja da ažurira PHP na najnoviju verziju.Vašu PHP verziju ownCloud i PHP zajednica više ne podržavaju.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Aktiviran je PHP siguran način rada. Da bi ownCloud radio kako treba, taj mod treba oemogućiti.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP siguran način rada je zastarjela i uglavnom beskorisna postavka koju treba onemogućiti. Molimo zamolite svogadministratora poslužitelja da je onemogući, bilo u php.ini ili u vašoj konfiguraciji web poslužitelja.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Postavka Magic Quotes je omogućena. Da bi ownCloud radio kako treba, tu postavku treba onemogućiti.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zastarjela i uglavnom beskorisna postavka koju treba onemogućiti. MOlimo zamolite svogadministratora poslužitelja da je onemogući, bilo u php.ini ili u vašoj konfiguraciji web poslužitelja.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?",
+    "Please ask your server administrator to restart the web server." : "Molimo zamolite  svog administratora poslužitelja da ponovno pokrene web poslužitelj.",
+    "PostgreSQL >= 9 required" : "Potreban je PostgreSQL >= 9",
+    "Please upgrade your database version" : "Molimo, ažurirajte svoju verziju baze podataka",
+    "Error occurred while checking PostgreSQL version" : "Došlo je do pogreške tijekom provjeravanja verzije PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Pobrinite se da imate PostgreSQL >= 9. Za više informacija provjerite zapisnike.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Molimo promijenite dozvole na 0770 tako da se tim direktorijem ne mogu služiti drugi korisnici",
+    "Data directory (%s) is readable by other users" : "Podatkovni direktorij (%s) čitljiv je za druge korisnike",
+    "Data directory (%s) is invalid" : "Podatkovni direktorij (%s) nije ispravan",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Molimo provjerite sadrži li podatkovni direktorij u svom korijenu datoteku \".ocdata\"",
+    "Could not obtain lock type %d on \"%s\"." : "Nije moguće dobiti lock tip %d na \"%s\"."
+},"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/hr.php b/lib/l10n/hr.php
deleted file mode 100644
index 6831ce38d0f..00000000000
--- a/lib/l10n/hr.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Pisanje u \"config\" direktoriju nije moguće!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Ovo se obično može popraviti tako da se Web poslužitelju dopusti pristup za pisanje u config direktoriju",
-"See %s" => "Vidite %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u config direktoriju%s.",
-"Sample configuration detected" => "Nađena ogledna konfiguracija",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Otkriveno je da je ogledna konfiguracija kopirana. To može vašu instalaciju prekinuti i nije podržano.Molimo pročitajte dokumentaciju prije nego li izvršite promjene na config.php",
-"Help" => "Pomoć",
-"Personal" => "Osobno",
-"Settings" => "Postavke",
-"Users" => "Korisnici",
-"Admin" => "Admin",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikacija \\\"%s\\\" se ne može instalirati jer nije kompatibilna s ovom verzijom ownClouda.",
-"No app name specified" => "Nikakav naziv aplikacije nije naveden",
-"Unknown filetype" => "Vrsta datoteke nepoznata",
-"Invalid image" => "Neispravna slika",
-"web services under your control" => "web usluge pod vašom kontrolom",
-"App directory already exists" => "Direktorij aplikacije već postoji",
-"Can't create app folder. Please fix permissions. %s" => "Nije moguće kreirati mapu aplikacija. molimo popravite dozvole. %s",
-"No source specified when installing app" => "Pri instaliranju aplikacija nijedan izvor nije specificiran",
-"No href specified when installing app from http" => "Pri instaliranju aplikacija iz http nijedan href nije specificiran.",
-"No path specified when installing app from local file" => "Pri instaliranju aplikacija iz lokalne datoteke nijedan put nije specificiran.",
-"Archives of type %s are not supported" => "Arhive tipa %s nisu podržane",
-"Failed to open archive when installing app" => "Otvaranje arhive pri instaliranju aplikacija nije uspjelo.",
-"App does not provide an info.xml file" => "Aplikacija ne pruža info.xml datoteku",
-"App can't be installed because of not allowed code in the App" => "Aplikaciju nije moguće instalirati zbog nedopuštenog koda u njoj.",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikaciju nije moguće instalirati jer nije kompatibilna s ovom verzijom ownClouda.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikaciju nije moguće instalirati jer sadrži oznaku <otpremljeno>istinito</otpremljeno>.",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikaciju nije moguće instalirati jer verzija u info.xml/version nije ista kaoverzija koju je prijavio app store",
-"Application is not enabled" => "Aplikacija nije aktivirana",
-"Authentication error" => "Pogrešna autentikacija",
-"Token expired. Please reload page." => "Token je istekao. Molimo, ponovno učitajte stranicu.",
-"Unknown user" => "Korisnik nepoznat",
-"%s enter the database username." => "%s unesite naziva korisnika baze podataka.",
-"%s enter the database name." => "%s unesite naziv baze podataka",
-"%s you may not use dots in the database name" => "%s ne smijete koristiti točke u nazivu baze podataka",
-"MS SQL username and/or password not valid: %s" => "MS SQL korisničko ime i/ili lozinka neispravni: %s",
-"You need to enter either an existing account or the administrator." => "Trebate unijeti neki postojeći račun ili administratora.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB korisničko ime i/ili lozinka neispravni",
-"DB Error: \"%s\"" => "DB pogreška: \"%s\"",
-"Offending command was: \"%s\"" => "Neispravna naredba je bila: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB korisnik '%s'@'localhost' već postoji.",
-"Drop this user from MySQL/MariaDB" => "Ispustite ovog korisnika iz MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB korisnik '%s'@'%%' već postoji",
-"Drop this user from MySQL/MariaDB." => "Ispustite ovog korisnika iz MySQL/MariaDB.",
-"Oracle connection could not be established" => "Vezu Oracle nije moguće uspostaviti",
-"Oracle username and/or password not valid" => "Korisničko ime i/ili lozinka Oracle neispravni",
-"Offending command was: \"%s\", name: %s, password: %s" => "Neispravna naredba je bila: \"%s\", ime: %s, lozinka: %s",
-"PostgreSQL username and/or password not valid" => "Korisničko ime i/ili lozinka PostgreSQL neispravni",
-"Set an admin username." => "Navedite admin korisničko ime.",
-"Set an admin password." => "Navedite admin lozinku.",
-"%s shared »%s« with you" => "%s je s vama podijelio »%s«",
-"Sharing %s failed, because the file does not exist" => "Dijeljenje %s nije uspjelo jer ta datoteka ne postoji",
-"You are not allowed to share %s" => "Nije vam dopušteno dijeliti %s",
-"Sharing %s failed, because the user %s is the item owner" => "Dijeljenje %s nije uspjelo jer je korisnik %s vlasnik te stavke",
-"Sharing %s failed, because the user %s does not exist" => "Dijeljenje %s nije uspjelo jer korisnik %s ne postoji",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Dijeljenje %s nije uspjelo jer korisnik %s nije član niti jedne grupe u kojoj je %s član",
-"Sharing %s failed, because this item is already shared with %s" => "Dijeljenje %s nije uspjelo jer je ova stavka već podijeljena s %s",
-"Sharing %s failed, because the group %s does not exist" => "Dijeljenje %s nije uspjelo jer grupa %s ne postoji",
-"Sharing %s failed, because %s is not a member of the group %s" => "Dijeljenje %s nije uspjelo jer %s nije član grupe %s",
-"You need to provide a password to create a public link, only protected links are allowed" => "Da biste kreirali javnu vezu, morate navesti lozinku, samo zaštićene veze su dopuštene.",
-"Sharing %s failed, because sharing with links is not allowed" => "Dijeljenje %s nije uspjelo jer dijeljenje s vezama nije dopušteno.",
-"Share type %s is not valid for %s" => "Tip dijeljenja %s nije dopušteni tip za %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Postavke dozvola za %s nisu uspjele jer dozvole premašuju dozvole za koje %s ima odobrenje",
-"Setting permissions for %s failed, because the item was not found" => "Postavke dozvola za %s nisu uspjele jer stavka nije nađena.",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Nije moguće postaviti datum isteka. Nakon što su podijeljeni, resursi ne mogu isteći kasnije nego %s ",
-"Cannot set expiration date. Expiration date is in the past" => "Nije moguće postaviti datum isteka. Datum isteka je u prošlosti",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Dijeljenje pozadine %s mora implementirati sučelje OCP\\Share_Backend",
-"Sharing backend %s not found" => "Dijeljenje pozadine %s nije nađeno",
-"Sharing backend for %s not found" => "Dijeljenje pozadine za %s nije nađeno",
-"Sharing %s failed, because the user %s is the original sharer" => "Dijeljenje %s nije uspjelo jer je korisnik %s izvorni djelitelj",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Dijeljenje %s nije uspjelo jer dozvole premašuju dozvole za koje %s ima odobrenje.",
-"Sharing %s failed, because resharing is not allowed" => "Dijeljenje %s nije uspjelo jer ponovno dijeljenje nije dopušteno.",
-"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",
-"seconds ago" => "prije par sekundi",
-"_%n minute ago_::_%n minutes ago_" => array("prije %n minute","prije %n minuta","prije %n minuta"),
-"_%n hour ago_::_%n hours ago_" => array("prije %n sata","prije %n sati","prije %n sati"),
-"today" => "Danas",
-"yesterday" => "Jučer",
-"_%n day go_::_%n days ago_" => array("prije %n dana","prije %n dana","prije %n dana"),
-"last month" => "Prošli mjesec",
-"_%n month ago_::_%n months ago_" => array("prije %n mjeseca","prije %n mjeseci","prije %n mjeseci"),
-"last year" => "Prošle godine",
-"years ago" => "Prije više godina",
-"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",
-"The username is already being used" => "Korisničko ime se već koristi",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Pogonski programi baze podataka (sqlite, mysql, ili postgresql) nisu instalirani.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Dozvole se obično mogu popraviti %sdavanjem pristupa web poslužitelju za pisanje u korijenskom direktoriju%s",
-"Cannot write into \"config\" directory" => "Nije moguće zapisivati u \"config\" direktorij",
-"Cannot write into \"apps\" directory" => "Nije moguće zapisivati u \"apps\" direktorij",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Ovo se obično može popraviti %sdavanjem pristupa web poslužitelju za pisanje u apps direktorij%sili isključivanjem appstorea u konfiguracijskoj datoteci.",
-"Cannot create \"data\" directory (%s)" => "Kreiranje \"data\" direktorija (%s) nije moguće",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Ovo obično može popraviti <a href=\"%s\"target=\"_blank\">davanjem pristupa web poslužiteljuza pisanje u korijenskom direktoriju</a>.",
-"Setting locale to %s failed" => "Postavljanje regionalne sheme u %s nije uspjelo",
-"Please install one of these locales on your system and restart your webserver." => "Molimo instalirajte jednu od ovih regionalnih shema u svoj sustav i ponovno pokrenite svoj web poslužitelj.",
-"Please ask your server administrator to install the module." => "Molimo zamolite svog administratora poslužitelja da instalira modul.",
-"PHP module %s not installed." => "PHP modul %s nije instaliran.",
-"PHP %s or higher is required." => "PHP verzija treba biti %s ili viša.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Molimo zamolite svog administratora poslužitelja da ažurira PHP na najnoviju verziju.Vašu PHP verziju ownCloud i PHP zajednica više ne podržavaju.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Aktiviran je PHP siguran način rada. Da bi ownCloud radio kako treba, taj mod treba oemogućiti.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP siguran način rada je zastarjela i uglavnom beskorisna postavka koju treba onemogućiti. Molimo zamolite svogadministratora poslužitelja da je onemogući, bilo u php.ini ili u vašoj konfiguraciji web poslužitelja.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Postavka Magic Quotes je omogućena. Da bi ownCloud radio kako treba, tu postavku treba onemogućiti.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes je zastarjela i uglavnom beskorisna postavka koju treba onemogućiti. MOlimo zamolite svogadministratora poslužitelja da je onemogući, bilo u php.ini ili u vašoj konfiguraciji web poslužitelja.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP moduli su instalirani, ali još uvijek su na popisu onih koji nedostaju?",
-"Please ask your server administrator to restart the web server." => "Molimo zamolite  svog administratora poslužitelja da ponovno pokrene web poslužitelj.",
-"PostgreSQL >= 9 required" => "Potreban je PostgreSQL >= 9",
-"Please upgrade your database version" => "Molimo, ažurirajte svoju verziju baze podataka",
-"Error occurred while checking PostgreSQL version" => "Došlo je do pogreške tijekom provjeravanja verzije PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Pobrinite se da imate PostgreSQL >= 9. Za više informacija provjerite zapisnike.",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Molimo promijenite dozvole na 0770 tako da se tim direktorijem ne mogu služiti drugi korisnici",
-"Data directory (%s) is readable by other users" => "Podatkovni direktorij (%s) čitljiv je za druge korisnike",
-"Data directory (%s) is invalid" => "Podatkovni direktorij (%s) nije ispravan",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Molimo provjerite sadrži li podatkovni direktorij u svom korijenu datoteku \".ocdata\"",
-"Could not obtain lock type %d on \"%s\"." => "Nije moguće dobiti lock tip %d na \"%s\"."
-);
-$PLURAL_FORMS = "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/hu_HU.js b/lib/l10n/hu_HU.js
new file mode 100644
index 00000000000..be14e2d1f66
--- /dev/null
+++ b/lib/l10n/hu_HU.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Nem írható a \"config\" könyvtár!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Ez rendszerint úgy oldható meg, hogy írási jogot adunk a webszervernek a config könyvtárra.",
+    "See %s" : "Lásd %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek a config könyvtárra%s.",
+    "Sample configuration detected" : "A példabeállítások vannak beállítva",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Úgy tűnik a példakonfigurációt próbálja ténylegesen használni. Ez nem támogatott, és működésképtelenné teheti a telepítést. Kérjük olvassa el a dokumentációt és azt követően változtasson a config.php-n!",
+    "Help" : "Súgó",
+    "Personal" : "Személyes",
+    "Settings" : "Beállítások",
+    "Users" : "Felhasználók",
+    "Admin" : "Adminsztráció",
+    "Recommended" : "Ajánlott",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : " \\\"%s\\\" alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen változatával.",
+    "No app name specified" : "Nincs az alkalmazás név megadva.",
+    "Unknown filetype" : "Ismeretlen file tipús",
+    "Invalid image" : "Hibás kép",
+    "web services under your control" : "webszolgáltatások saját kézben",
+    "App directory already exists" : "Az alkalmazás mappája már létezik",
+    "Can't create app folder. Please fix permissions. %s" : "Nem lehetett létrehozni az alkalmazás mappáját. Kérem ellenőrizze a jogosultságokat. %s",
+    "No source specified when installing app" : "Az alkalmazás telepítéséhez nincs forrás megadva",
+    "No href specified when installing app from http" : "Az alkalmazás http-n keresztül történő telepítéséhez nincs href hivetkozás megadva",
+    "No path specified when installing app from local file" : "Az alkalmazás helyi telepítéséhez nincs útvonal (mappa) megadva",
+    "Archives of type %s are not supported" : "A(z) %s típusú tömörített állomány nem támogatott",
+    "Failed to open archive when installing app" : "Nem sikerült megnyitni a tömörített állományt a telepítés során",
+    "App does not provide an info.xml file" : "Az alkalmazás nem szolgáltatott info.xml file-t",
+    "App can't be installed because of not allowed code in the App" : "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Az alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen verziójával.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-kiszolgálón feltüntetett verzióval.",
+    "Application is not enabled" : "Az alkalmazás nincs engedélyezve",
+    "Authentication error" : "Azonosítási hiba",
+    "Token expired. Please reload page." : "A token lejárt. Frissítse az oldalt.",
+    "Unknown user" : "Ismeretlen felhasználó",
+    "%s enter the database username." : "%s adja meg az adatbázist elérő felhasználó login nevét.",
+    "%s enter the database name." : "%s adja meg az adatbázis nevét.",
+    "%s you may not use dots in the database name" : "%s az adatbázis neve nem tartalmazhat pontot",
+    "MS SQL username and/or password not valid: %s" : "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
+    "You need to enter either an existing account or the administrator." : "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia",
+    "MySQL/MariaDB username and/or password not valid" : "A MySQL/MariaDB felhasználónév és/vagy jelszó nem megfelelő",
+    "DB Error: \"%s\"" : "Adatbázis hiba: \"%s\"",
+    "Offending command was: \"%s\"" : "A hibát ez a parancs okozta: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "A MySQL/MariaDB felhasználó '%s'@'localhost' már létezik.",
+    "Drop this user from MySQL/MariaDB" : "Töröljük ez a felhasználót a MySQL/MariaDB-rendszerből",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "A MySQL/MariaDB felhasználó '%s'@'%%' már létezik.",
+    "Drop this user from MySQL/MariaDB." : "Töröljük ez a felhasználót a MySQL/MariaDB-rendszerből.",
+    "Oracle connection could not be established" : "Az Oracle kapcsolat nem hozható létre",
+    "Oracle username and/or password not valid" : "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
+    "Offending command was: \"%s\", name: %s, password: %s" : "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
+    "PostgreSQL username and/or password not valid" : "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
+    "Set an admin username." : "Állítson be egy felhasználói nevet az adminisztrációhoz.",
+    "Set an admin password." : "Állítson be egy jelszót az adminisztrációhoz.",
+    "Can't create or write into the data directory %s" : "Nem sikerült  létrehozni vagy irni  a \"data\" könyvtárba %s",
+    "%s shared »%s« with you" : "%s megosztotta Önnel ezt:  »%s«",
+    "Sharing %s failed, because the file does not exist" : "%s megosztása sikertelen, mert a fájl nem létezik",
+    "You are not allowed to share %s" : "Önnek nincs jogosultsága %s megosztására",
+    "Sharing %s failed, because the user %s is the item owner" : "%s megosztása nem sikerült, mert %s felhasználó az állomány tulajdonosa",
+    "Sharing %s failed, because the user %s does not exist" : "%s megosztása nem sikerült, mert %s felhasználó nem létezik",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s megosztása nem sikerült, mert %s felhasználó nem tagja egyik olyan csoportnak sem, aminek %s tagja",
+    "Sharing %s failed, because this item is already shared with %s" : "%s megosztása nem sikerült, mert ez már meg van osztva %s-vel",
+    "Sharing %s failed, because the group %s does not exist" : "%s megosztása nem sikerült, mert %s csoport nem létezik",
+    "Sharing %s failed, because %s is not a member of the group %s" : "%s megosztása nem sikerült, mert %s felhasználó nem tagja a %s csoportnak",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Meg kell adnia egy jelszót is, mert a nyilvános linkek csak jelszóval védetten használhatók",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s megosztása nem sikerült, mert a linkekkel történő megosztás nincs engedélyezve",
+    "Share type %s is not valid for %s" : "A %s megosztási típus nem érvényes %s-re",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nem sikerült %s-re beállítani az elérési jogosultságokat, mert a megadottak túllépik a %s-re érvényes jogosultságokat",
+    "Setting permissions for %s failed, because the item was not found" : "Nem sikerült %s-re beállítani az elérési jogosultságokat, mert a kérdéses állomány nem található",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nem lehet beállítani a lejárati időt. A megosztások legfeljebb ennyi idővel járhatnak le a létrehozásukat követően: %s",
+    "Cannot set expiration date. Expiration date is in the past" : "Nem lehet beállítani a lejárati időt, mivel a megadott lejárati időpont már elmúlt.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Az %s megosztási alrendszernek támogatnia kell az OCP\\Share_Backend interface-t",
+    "Sharing backend %s not found" : "A %s megosztási alrendszer nem található",
+    "Sharing backend for %s not found" : "%s megosztási alrendszere nem található",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s megosztása nem sikerült, mert %s felhasználó az eredeti megosztó",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s megosztása nem sikerült, mert a jogosultságok túllépik azt, ami %s rendelkezésére áll",
+    "Sharing %s failed, because resharing is not allowed" : "%s megosztása nem sikerült, mert a megosztás továbbadása nincs engedélyezve",
+    "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\"",
+    "seconds ago" : "pár másodperce",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n perccel ezelőtt"],
+    "_%n hour ago_::_%n hours ago_" : ["%n órával ezelőtt","%n órával ezelőtt"],
+    "today" : "ma",
+    "yesterday" : "tegnap",
+    "_%n day go_::_%n days ago_" : ["%n nappal ezelőtt","%n nappal ezelőtt"],
+    "last month" : "múlt hónapban",
+    "_%n month ago_::_%n months ago_" : ["%n hónappal ezelőtt","%n hónappal ezelőtt"],
+    "last year" : "tavaly",
+    "years ago" : "több éve",
+    "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",
+    "The username is already being used" : "Ez a bejelentkezési név már foglalt",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nincs telepítve adatbázis-meghajtóprogram (sqlite, mysql vagy postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Az elérési problémák rendszerint megoldhatók azzal, ha a %swebszervernek írásjogot adunk a gyökérkönyvtárra%s.",
+    "Cannot write into \"config\" directory" : "Nem írható a \"config\" könyvtár",
+    "Cannot write into \"apps\" directory" : "Nem írható az \"apps\" könyvtár",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek az app könyvtárra%s, vagy letiltjuk a config fájlban az appstore használatát.",
+    "Cannot create \"data\" directory (%s)" : "Nem sikerült létrehozni a \"data\" könyvtárt (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ez rendszerint úgy oldható meg, hogy <a href=\"%s\" target=\"_blank\">írásjogot adunk a webszervernek a gyökérkönyvtárra</a>.",
+    "Setting locale to %s failed" : "A lokalizáció %s-re való állítása nem sikerült",
+    "Please install one of these locales on your system and restart your webserver." : "Kérjük állítsa be a következő lokalizációk valamelyikét a rendszeren és indítsa újra a webszervert!",
+    "Please ask your server administrator to install the module." : "Kérje meg a rendszergazdát, hogy telepítse a modult!",
+    "PHP module %s not installed." : "A %s PHP modul nincs telepítve.",
+    "PHP %s or higher is required." : "PHP %s vagy ennél újabb szükséges.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Kérje meg a rendszergazdát, hogy frissítse a PHP-t újabb változatra! Ezt a PHP változatot már nem támogatja az ownCloud és a PHP fejlesztői közösség.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Be van állítva a PHP Safe Mode. Az ownCloud megfelelő működéséhez szükséges, hogy ez ki legyen kapcsolva.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "A PHP Safe Mode egy régi, már nem támogatott és haszontalan üzemmód, amit érdemes letiltani. Kérje meg a rendszergazdát, hogy tiltsa le vagy a php.ini-ben, vagy a webszerver beállításokban!",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Be van álltva a Magic Quotes. Az ownCloud megfelelő működéséhez szükséges, hogy ez le legyen tiltva.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "A Magic Quotes egy régi, már nem támogatott és haszontalan üzemmód, amit érdemes letiltani. Kérje meg a rendszergazdát, hogy tiltsa le vagy a php.ini-ben, vagy a webszerver beállításokban!",
+    "PHP modules have been installed, but they are still listed as missing?" : "A PHP modulok telepítve vannak, de a listában mégsincsenek felsorolva?",
+    "Please ask your server administrator to restart the web server." : "Kérje meg a rendszergazdát, hogy indítsa újra a webszervert!",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 szükséges",
+    "Please upgrade your database version" : "Kérem frissítse az adatbázis-szoftvert!",
+    "Error occurred while checking PostgreSQL version" : "Hiba történt a PostgreSQL verziójának ellenőrzése közben",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Kérjük gondoskodjon róla, hogy a PostgreSQL legalább 9-es verziójú legyen, vagy ellenőrizze a naplófájlokat, hogy mi okozta a hibát!",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Kérjük módosítsa a könyvtár elérhetőségi engedélybeállítását 0770-re, hogy a tartalmát más felhasználó ne listázhassa!",
+    "Data directory (%s) is readable by other users" : "Az adatkönyvtár (%s) más felhasználók számára is olvasható ",
+    "Data directory (%s) is invalid" : "Érvénytelen a megadott adatkönyvtár (%s) ",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Kérjük ellenőrizze, hogy az adatkönyvtár tartalmaz a gyökerében egy \".ocdata\" nevű állományt!",
+    "Could not obtain lock type %d on \"%s\"." : "Nem sikerült %d típusú zárolást elérni itt: \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/hu_HU.json b/lib/l10n/hu_HU.json
new file mode 100644
index 00000000000..434b2bbde9b
--- /dev/null
+++ b/lib/l10n/hu_HU.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Nem írható a \"config\" könyvtár!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Ez rendszerint úgy oldható meg, hogy írási jogot adunk a webszervernek a config könyvtárra.",
+    "See %s" : "Lásd %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek a config könyvtárra%s.",
+    "Sample configuration detected" : "A példabeállítások vannak beállítva",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Úgy tűnik a példakonfigurációt próbálja ténylegesen használni. Ez nem támogatott, és működésképtelenné teheti a telepítést. Kérjük olvassa el a dokumentációt és azt követően változtasson a config.php-n!",
+    "Help" : "Súgó",
+    "Personal" : "Személyes",
+    "Settings" : "Beállítások",
+    "Users" : "Felhasználók",
+    "Admin" : "Adminsztráció",
+    "Recommended" : "Ajánlott",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : " \\\"%s\\\" alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen változatával.",
+    "No app name specified" : "Nincs az alkalmazás név megadva.",
+    "Unknown filetype" : "Ismeretlen file tipús",
+    "Invalid image" : "Hibás kép",
+    "web services under your control" : "webszolgáltatások saját kézben",
+    "App directory already exists" : "Az alkalmazás mappája már létezik",
+    "Can't create app folder. Please fix permissions. %s" : "Nem lehetett létrehozni az alkalmazás mappáját. Kérem ellenőrizze a jogosultságokat. %s",
+    "No source specified when installing app" : "Az alkalmazás telepítéséhez nincs forrás megadva",
+    "No href specified when installing app from http" : "Az alkalmazás http-n keresztül történő telepítéséhez nincs href hivetkozás megadva",
+    "No path specified when installing app from local file" : "Az alkalmazás helyi telepítéséhez nincs útvonal (mappa) megadva",
+    "Archives of type %s are not supported" : "A(z) %s típusú tömörített állomány nem támogatott",
+    "Failed to open archive when installing app" : "Nem sikerült megnyitni a tömörített állományt a telepítés során",
+    "App does not provide an info.xml file" : "Az alkalmazás nem szolgáltatott info.xml file-t",
+    "App can't be installed because of not allowed code in the App" : "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Az alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen verziójával.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-kiszolgálón feltüntetett verzióval.",
+    "Application is not enabled" : "Az alkalmazás nincs engedélyezve",
+    "Authentication error" : "Azonosítási hiba",
+    "Token expired. Please reload page." : "A token lejárt. Frissítse az oldalt.",
+    "Unknown user" : "Ismeretlen felhasználó",
+    "%s enter the database username." : "%s adja meg az adatbázist elérő felhasználó login nevét.",
+    "%s enter the database name." : "%s adja meg az adatbázis nevét.",
+    "%s you may not use dots in the database name" : "%s az adatbázis neve nem tartalmazhat pontot",
+    "MS SQL username and/or password not valid: %s" : "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
+    "You need to enter either an existing account or the administrator." : "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia",
+    "MySQL/MariaDB username and/or password not valid" : "A MySQL/MariaDB felhasználónév és/vagy jelszó nem megfelelő",
+    "DB Error: \"%s\"" : "Adatbázis hiba: \"%s\"",
+    "Offending command was: \"%s\"" : "A hibát ez a parancs okozta: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "A MySQL/MariaDB felhasználó '%s'@'localhost' már létezik.",
+    "Drop this user from MySQL/MariaDB" : "Töröljük ez a felhasználót a MySQL/MariaDB-rendszerből",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "A MySQL/MariaDB felhasználó '%s'@'%%' már létezik.",
+    "Drop this user from MySQL/MariaDB." : "Töröljük ez a felhasználót a MySQL/MariaDB-rendszerből.",
+    "Oracle connection could not be established" : "Az Oracle kapcsolat nem hozható létre",
+    "Oracle username and/or password not valid" : "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
+    "Offending command was: \"%s\", name: %s, password: %s" : "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
+    "PostgreSQL username and/or password not valid" : "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
+    "Set an admin username." : "Állítson be egy felhasználói nevet az adminisztrációhoz.",
+    "Set an admin password." : "Állítson be egy jelszót az adminisztrációhoz.",
+    "Can't create or write into the data directory %s" : "Nem sikerült  létrehozni vagy irni  a \"data\" könyvtárba %s",
+    "%s shared »%s« with you" : "%s megosztotta Önnel ezt:  »%s«",
+    "Sharing %s failed, because the file does not exist" : "%s megosztása sikertelen, mert a fájl nem létezik",
+    "You are not allowed to share %s" : "Önnek nincs jogosultsága %s megosztására",
+    "Sharing %s failed, because the user %s is the item owner" : "%s megosztása nem sikerült, mert %s felhasználó az állomány tulajdonosa",
+    "Sharing %s failed, because the user %s does not exist" : "%s megosztása nem sikerült, mert %s felhasználó nem létezik",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "%s megosztása nem sikerült, mert %s felhasználó nem tagja egyik olyan csoportnak sem, aminek %s tagja",
+    "Sharing %s failed, because this item is already shared with %s" : "%s megosztása nem sikerült, mert ez már meg van osztva %s-vel",
+    "Sharing %s failed, because the group %s does not exist" : "%s megosztása nem sikerült, mert %s csoport nem létezik",
+    "Sharing %s failed, because %s is not a member of the group %s" : "%s megosztása nem sikerült, mert %s felhasználó nem tagja a %s csoportnak",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Meg kell adnia egy jelszót is, mert a nyilvános linkek csak jelszóval védetten használhatók",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s megosztása nem sikerült, mert a linkekkel történő megosztás nincs engedélyezve",
+    "Share type %s is not valid for %s" : "A %s megosztási típus nem érvényes %s-re",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nem sikerült %s-re beállítani az elérési jogosultságokat, mert a megadottak túllépik a %s-re érvényes jogosultságokat",
+    "Setting permissions for %s failed, because the item was not found" : "Nem sikerült %s-re beállítani az elérési jogosultságokat, mert a kérdéses állomány nem található",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nem lehet beállítani a lejárati időt. A megosztások legfeljebb ennyi idővel járhatnak le a létrehozásukat követően: %s",
+    "Cannot set expiration date. Expiration date is in the past" : "Nem lehet beállítani a lejárati időt, mivel a megadott lejárati időpont már elmúlt.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Az %s megosztási alrendszernek támogatnia kell az OCP\\Share_Backend interface-t",
+    "Sharing backend %s not found" : "A %s megosztási alrendszer nem található",
+    "Sharing backend for %s not found" : "%s megosztási alrendszere nem található",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s megosztása nem sikerült, mert %s felhasználó az eredeti megosztó",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s megosztása nem sikerült, mert a jogosultságok túllépik azt, ami %s rendelkezésére áll",
+    "Sharing %s failed, because resharing is not allowed" : "%s megosztása nem sikerült, mert a megosztás továbbadása nincs engedélyezve",
+    "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\"",
+    "seconds ago" : "pár másodperce",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n perccel ezelőtt"],
+    "_%n hour ago_::_%n hours ago_" : ["%n órával ezelőtt","%n órával ezelőtt"],
+    "today" : "ma",
+    "yesterday" : "tegnap",
+    "_%n day go_::_%n days ago_" : ["%n nappal ezelőtt","%n nappal ezelőtt"],
+    "last month" : "múlt hónapban",
+    "_%n month ago_::_%n months ago_" : ["%n hónappal ezelőtt","%n hónappal ezelőtt"],
+    "last year" : "tavaly",
+    "years ago" : "több éve",
+    "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",
+    "The username is already being used" : "Ez a bejelentkezési név már foglalt",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nincs telepítve adatbázis-meghajtóprogram (sqlite, mysql vagy postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Az elérési problémák rendszerint megoldhatók azzal, ha a %swebszervernek írásjogot adunk a gyökérkönyvtárra%s.",
+    "Cannot write into \"config\" directory" : "Nem írható a \"config\" könyvtár",
+    "Cannot write into \"apps\" directory" : "Nem írható az \"apps\" könyvtár",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek az app könyvtárra%s, vagy letiltjuk a config fájlban az appstore használatát.",
+    "Cannot create \"data\" directory (%s)" : "Nem sikerült létrehozni a \"data\" könyvtárt (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ez rendszerint úgy oldható meg, hogy <a href=\"%s\" target=\"_blank\">írásjogot adunk a webszervernek a gyökérkönyvtárra</a>.",
+    "Setting locale to %s failed" : "A lokalizáció %s-re való állítása nem sikerült",
+    "Please install one of these locales on your system and restart your webserver." : "Kérjük állítsa be a következő lokalizációk valamelyikét a rendszeren és indítsa újra a webszervert!",
+    "Please ask your server administrator to install the module." : "Kérje meg a rendszergazdát, hogy telepítse a modult!",
+    "PHP module %s not installed." : "A %s PHP modul nincs telepítve.",
+    "PHP %s or higher is required." : "PHP %s vagy ennél újabb szükséges.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Kérje meg a rendszergazdát, hogy frissítse a PHP-t újabb változatra! Ezt a PHP változatot már nem támogatja az ownCloud és a PHP fejlesztői közösség.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Be van állítva a PHP Safe Mode. Az ownCloud megfelelő működéséhez szükséges, hogy ez ki legyen kapcsolva.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "A PHP Safe Mode egy régi, már nem támogatott és haszontalan üzemmód, amit érdemes letiltani. Kérje meg a rendszergazdát, hogy tiltsa le vagy a php.ini-ben, vagy a webszerver beállításokban!",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Be van álltva a Magic Quotes. Az ownCloud megfelelő működéséhez szükséges, hogy ez le legyen tiltva.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "A Magic Quotes egy régi, már nem támogatott és haszontalan üzemmód, amit érdemes letiltani. Kérje meg a rendszergazdát, hogy tiltsa le vagy a php.ini-ben, vagy a webszerver beállításokban!",
+    "PHP modules have been installed, but they are still listed as missing?" : "A PHP modulok telepítve vannak, de a listában mégsincsenek felsorolva?",
+    "Please ask your server administrator to restart the web server." : "Kérje meg a rendszergazdát, hogy indítsa újra a webszervert!",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 szükséges",
+    "Please upgrade your database version" : "Kérem frissítse az adatbázis-szoftvert!",
+    "Error occurred while checking PostgreSQL version" : "Hiba történt a PostgreSQL verziójának ellenőrzése közben",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Kérjük gondoskodjon róla, hogy a PostgreSQL legalább 9-es verziójú legyen, vagy ellenőrizze a naplófájlokat, hogy mi okozta a hibát!",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Kérjük módosítsa a könyvtár elérhetőségi engedélybeállítását 0770-re, hogy a tartalmát más felhasználó ne listázhassa!",
+    "Data directory (%s) is readable by other users" : "Az adatkönyvtár (%s) más felhasználók számára is olvasható ",
+    "Data directory (%s) is invalid" : "Érvénytelen a megadott adatkönyvtár (%s) ",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Kérjük ellenőrizze, hogy az adatkönyvtár tartalmaz a gyökerében egy \".ocdata\" nevű állományt!",
+    "Could not obtain lock type %d on \"%s\"." : "Nem sikerült %d típusú zárolást elérni itt: \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
deleted file mode 100644
index 60d5897df6c..00000000000
--- a/lib/l10n/hu_HU.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Nem írható a \"config\" könyvtár!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Ez rendszerint úgy oldható meg, hogy írási jogot adunk a webszervernek a config könyvtárra.",
-"See %s" => "Lásd %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek a config könyvtárra%s.",
-"Sample configuration detected" => "A példabeállítások vannak beállítva",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Úgy tűnik a példakonfigurációt próbálja ténylegesen használni. Ez nem támogatott, és működésképtelenné teheti a telepítést. Kérjük olvassa el a dokumentációt és azt követően változtasson a config.php-n!",
-"Help" => "Súgó",
-"Personal" => "Személyes",
-"Settings" => "Beállítások",
-"Users" => "Felhasználók",
-"Admin" => "Adminsztráció",
-"Recommended" => "Ajánlott",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => " \\\"%s\\\" alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen változatával.",
-"No app name specified" => "Nincs az alkalmazás név megadva.",
-"Unknown filetype" => "Ismeretlen file tipús",
-"Invalid image" => "Hibás kép",
-"web services under your control" => "webszolgáltatások saját kézben",
-"App directory already exists" => "Az alkalmazás mappája már létezik",
-"Can't create app folder. Please fix permissions. %s" => "Nem lehetett létrehozni az alkalmazás mappáját. Kérem ellenőrizze a jogosultságokat. %s",
-"No source specified when installing app" => "Az alkalmazás telepítéséhez nincs forrás megadva",
-"No href specified when installing app from http" => "Az alkalmazás http-n keresztül történő telepítéséhez nincs href hivetkozás megadva",
-"No path specified when installing app from local file" => "Az alkalmazás helyi telepítéséhez nincs útvonal (mappa) megadva",
-"Archives of type %s are not supported" => "A(z) %s típusú tömörített állomány nem támogatott",
-"Failed to open archive when installing app" => "Nem sikerült megnyitni a tömörített állományt a telepítés során",
-"App does not provide an info.xml file" => "Az alkalmazás nem szolgáltatott info.xml file-t",
-"App can't be installed because of not allowed code in the App" => "Az alkalmazást nem lehet telepíteni, mert abban nem engedélyezett programkód szerepel",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Az alkalmazás nem telepíthető, mert nem kompatibilis az ownCloud jelen verziójával.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Az alkalmazást nem lehet telepíteni, mert tartalmazza a \n<shipped>\ntrue\n</shipped>\ncímkét, ami a nem szállított alkalmazások esetén nem engedélyezett",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Az alkalmazást nem lehet telepíteni, mert az info.xml/version-ben megadott verzió nem egyezik az alkalmazás-kiszolgálón feltüntetett verzióval.",
-"Application is not enabled" => "Az alkalmazás nincs engedélyezve",
-"Authentication error" => "Azonosítási hiba",
-"Token expired. Please reload page." => "A token lejárt. Frissítse az oldalt.",
-"Unknown user" => "Ismeretlen felhasználó",
-"%s enter the database username." => "%s adja meg az adatbázist elérő felhasználó login nevét.",
-"%s enter the database name." => "%s adja meg az adatbázis nevét.",
-"%s you may not use dots in the database name" => "%s az adatbázis neve nem tartalmazhat pontot",
-"MS SQL username and/or password not valid: %s" => "Az MS SQL felhasználónév és/vagy jelszó érvénytelen: %s",
-"You need to enter either an existing account or the administrator." => "Vagy egy létező felhasználó vagy az adminisztrátor bejelentkezési nevét kell megadnia",
-"MySQL/MariaDB username and/or password not valid" => "A MySQL/MariaDB felhasználónév és/vagy jelszó nem megfelelő",
-"DB Error: \"%s\"" => "Adatbázis hiba: \"%s\"",
-"Offending command was: \"%s\"" => "A hibát ez a parancs okozta: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "A MySQL/MariaDB felhasználó '%s'@'localhost' már létezik.",
-"Drop this user from MySQL/MariaDB" => "Töröljük ez a felhasználót a MySQL/MariaDB-rendszerből",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "A MySQL/MariaDB felhasználó '%s'@'%%' már létezik.",
-"Drop this user from MySQL/MariaDB." => "Töröljük ez a felhasználót a MySQL/MariaDB-rendszerből.",
-"Oracle connection could not be established" => "Az Oracle kapcsolat nem hozható létre",
-"Oracle username and/or password not valid" => "Az Oracle felhasználói név és/vagy jelszó érvénytelen",
-"Offending command was: \"%s\", name: %s, password: %s" => "A hibát okozó parancs ez volt: \"%s\", login név: %s, jelszó: %s",
-"PostgreSQL username and/or password not valid" => "A PostgreSQL felhasználói név és/vagy jelszó érvénytelen",
-"Set an admin username." => "Állítson be egy felhasználói nevet az adminisztrációhoz.",
-"Set an admin password." => "Állítson be egy jelszót az adminisztrációhoz.",
-"Can't create or write into the data directory %s" => "Nem sikerült  létrehozni vagy irni  a \"data\" könyvtárba %s",
-"%s shared »%s« with you" => "%s megosztotta Önnel ezt:  »%s«",
-"Sharing %s failed, because the file does not exist" => "%s megosztása sikertelen, mert a fájl nem létezik",
-"You are not allowed to share %s" => "Önnek nincs jogosultsága %s megosztására",
-"Sharing %s failed, because the user %s is the item owner" => "%s megosztása nem sikerült, mert %s felhasználó az állomány tulajdonosa",
-"Sharing %s failed, because the user %s does not exist" => "%s megosztása nem sikerült, mert %s felhasználó nem létezik",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "%s megosztása nem sikerült, mert %s felhasználó nem tagja egyik olyan csoportnak sem, aminek %s tagja",
-"Sharing %s failed, because this item is already shared with %s" => "%s megosztása nem sikerült, mert ez már meg van osztva %s-vel",
-"Sharing %s failed, because the group %s does not exist" => "%s megosztása nem sikerült, mert %s csoport nem létezik",
-"Sharing %s failed, because %s is not a member of the group %s" => "%s megosztása nem sikerült, mert %s felhasználó nem tagja a %s csoportnak",
-"You need to provide a password to create a public link, only protected links are allowed" => "Meg kell adnia egy jelszót is, mert a nyilvános linkek csak jelszóval védetten használhatók",
-"Sharing %s failed, because sharing with links is not allowed" => "%s megosztása nem sikerült, mert a linkekkel történő megosztás nincs engedélyezve",
-"Share type %s is not valid for %s" => "A %s megosztási típus nem érvényes %s-re",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Nem sikerült %s-re beállítani az elérési jogosultságokat, mert a megadottak túllépik a %s-re érvényes jogosultságokat",
-"Setting permissions for %s failed, because the item was not found" => "Nem sikerült %s-re beállítani az elérési jogosultságokat, mert a kérdéses állomány nem található",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Nem lehet beállítani a lejárati időt. A megosztások legfeljebb ennyi idővel járhatnak le a létrehozásukat követően: %s",
-"Cannot set expiration date. Expiration date is in the past" => "Nem lehet beállítani a lejárati időt, mivel a megadott lejárati időpont már elmúlt.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Az %s megosztási alrendszernek támogatnia kell az OCP\\Share_Backend interface-t",
-"Sharing backend %s not found" => "A %s megosztási alrendszer nem található",
-"Sharing backend for %s not found" => "%s megosztási alrendszere nem található",
-"Sharing %s failed, because the user %s is the original sharer" => "%s megosztása nem sikerült, mert %s felhasználó az eredeti megosztó",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s megosztása nem sikerült, mert a jogosultságok túllépik azt, ami %s rendelkezésére áll",
-"Sharing %s failed, because resharing is not allowed" => "%s megosztása nem sikerült, mert a megosztás továbbadása nincs engedélyezve",
-"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\"",
-"seconds ago" => "pár másodperce",
-"_%n minute ago_::_%n minutes ago_" => array("","%n perccel ezelőtt"),
-"_%n hour ago_::_%n hours ago_" => array("%n órával ezelőtt","%n órával ezelőtt"),
-"today" => "ma",
-"yesterday" => "tegnap",
-"_%n day go_::_%n days ago_" => array("%n nappal ezelőtt","%n nappal ezelőtt"),
-"last month" => "múlt hónapban",
-"_%n month ago_::_%n months ago_" => array("%n hónappal ezelőtt","%n hónappal ezelőtt"),
-"last year" => "tavaly",
-"years ago" => "több éve",
-"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",
-"The username is already being used" => "Ez a bejelentkezési név már foglalt",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Nincs telepítve adatbázis-meghajtóprogram (sqlite, mysql vagy postgresql).",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Az elérési problémák rendszerint megoldhatók azzal, ha a %swebszervernek írásjogot adunk a gyökérkönyvtárra%s.",
-"Cannot write into \"config\" directory" => "Nem írható a \"config\" könyvtár",
-"Cannot write into \"apps\" directory" => "Nem írható az \"apps\" könyvtár",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Ez rendszerint úgy oldható meg, hogy %sírási jogot adunk a webszervernek az app könyvtárra%s, vagy letiltjuk a config fájlban az appstore használatát.",
-"Cannot create \"data\" directory (%s)" => "Nem sikerült létrehozni a \"data\" könyvtárt (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Ez rendszerint úgy oldható meg, hogy <a href=\"%s\" target=\"_blank\">írásjogot adunk a webszervernek a gyökérkönyvtárra</a>.",
-"Setting locale to %s failed" => "A lokalizáció %s-re való állítása nem sikerült",
-"Please install one of these locales on your system and restart your webserver." => "Kérjük állítsa be a következő lokalizációk valamelyikét a rendszeren és indítsa újra a webszervert!",
-"Please ask your server administrator to install the module." => "Kérje meg a rendszergazdát, hogy telepítse a modult!",
-"PHP module %s not installed." => "A %s PHP modul nincs telepítve.",
-"PHP %s or higher is required." => "PHP %s vagy ennél újabb szükséges.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Kérje meg a rendszergazdát, hogy frissítse a PHP-t újabb változatra! Ezt a PHP változatot már nem támogatja az ownCloud és a PHP fejlesztői közösség.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Be van állítva a PHP Safe Mode. Az ownCloud megfelelő működéséhez szükséges, hogy ez ki legyen kapcsolva.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "A PHP Safe Mode egy régi, már nem támogatott és haszontalan üzemmód, amit érdemes letiltani. Kérje meg a rendszergazdát, hogy tiltsa le vagy a php.ini-ben, vagy a webszerver beállításokban!",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Be van álltva a Magic Quotes. Az ownCloud megfelelő működéséhez szükséges, hogy ez le legyen tiltva.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "A Magic Quotes egy régi, már nem támogatott és haszontalan üzemmód, amit érdemes letiltani. Kérje meg a rendszergazdát, hogy tiltsa le vagy a php.ini-ben, vagy a webszerver beállításokban!",
-"PHP modules have been installed, but they are still listed as missing?" => "A PHP modulok telepítve vannak, de a listában mégsincsenek felsorolva?",
-"Please ask your server administrator to restart the web server." => "Kérje meg a rendszergazdát, hogy indítsa újra a webszervert!",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 szükséges",
-"Please upgrade your database version" => "Kérem frissítse az adatbázis-szoftvert!",
-"Error occurred while checking PostgreSQL version" => "Hiba történt a PostgreSQL verziójának ellenőrzése közben",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Kérjük gondoskodjon róla, hogy a PostgreSQL legalább 9-es verziójú legyen, vagy ellenőrizze a naplófájlokat, hogy mi okozta a hibát!",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Kérjük módosítsa a könyvtár elérhetőségi engedélybeállítását 0770-re, hogy a tartalmát más felhasználó ne listázhassa!",
-"Data directory (%s) is readable by other users" => "Az adatkönyvtár (%s) más felhasználók számára is olvasható ",
-"Data directory (%s) is invalid" => "Érvénytelen a megadott adatkönyvtár (%s) ",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Kérjük ellenőrizze, hogy az adatkönyvtár tartalmaz a gyökerében egy \".ocdata\" nevű állományt!",
-"Could not obtain lock type %d on \"%s\"." => "Nem sikerült %d típusú zárolást elérni itt: \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/hy.js b/lib/l10n/hy.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/hy.js
@@ -0,0 +1,9 @@
+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/hy.json b/lib/l10n/hy.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/hy.json
@@ -0,0 +1,7 @@
+{ "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/hy.php b/lib/l10n/hy.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/hy.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ia.js b/lib/l10n/ia.js
new file mode 100644
index 00000000000..938d9c4a680
--- /dev/null
+++ b/lib/l10n/ia.js
@@ -0,0 +1,23 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Adjuta",
+    "Personal" : "Personal",
+    "Settings" : "Configurationes",
+    "Users" : "Usatores",
+    "Admin" : "Administration",
+    "Unknown filetype" : "Typo de file incognite",
+    "Invalid image" : "Imagine invalide",
+    "web services under your control" : "servicios web sub tu controlo",
+    "seconds ago" : "secundas passate",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minutas passate"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n horas passate"],
+    "today" : "hodie",
+    "yesterday" : "heri",
+    "_%n day go_::_%n days ago_" : ["","%n dies ante"],
+    "last month" : "ultime mense",
+    "_%n month ago_::_%n months ago_" : ["","%n menses ante"],
+    "last year" : "ultime anno",
+    "years ago" : "annos passate"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ia.json b/lib/l10n/ia.json
new file mode 100644
index 00000000000..21c437af71a
--- /dev/null
+++ b/lib/l10n/ia.json
@@ -0,0 +1,21 @@
+{ "translations": {
+    "Help" : "Adjuta",
+    "Personal" : "Personal",
+    "Settings" : "Configurationes",
+    "Users" : "Usatores",
+    "Admin" : "Administration",
+    "Unknown filetype" : "Typo de file incognite",
+    "Invalid image" : "Imagine invalide",
+    "web services under your control" : "servicios web sub tu controlo",
+    "seconds ago" : "secundas passate",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minutas passate"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n horas passate"],
+    "today" : "hodie",
+    "yesterday" : "heri",
+    "_%n day go_::_%n days ago_" : ["","%n dies ante"],
+    "last month" : "ultime mense",
+    "_%n month ago_::_%n months ago_" : ["","%n menses ante"],
+    "last year" : "ultime anno",
+    "years ago" : "annos passate"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php
deleted file mode 100644
index 03fbad47682..00000000000
--- a/lib/l10n/ia.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Adjuta",
-"Personal" => "Personal",
-"Settings" => "Configurationes",
-"Users" => "Usatores",
-"Admin" => "Administration",
-"Unknown filetype" => "Typo de file incognite",
-"Invalid image" => "Imagine invalide",
-"web services under your control" => "servicios web sub tu controlo",
-"seconds ago" => "secundas passate",
-"_%n minute ago_::_%n minutes ago_" => array("","%n minutas passate"),
-"_%n hour ago_::_%n hours ago_" => array("","%n horas passate"),
-"today" => "hodie",
-"yesterday" => "heri",
-"_%n day go_::_%n days ago_" => array("","%n dies ante"),
-"last month" => "ultime mense",
-"_%n month ago_::_%n months ago_" => array("","%n menses ante"),
-"last year" => "ultime anno",
-"years ago" => "annos passate"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/id.js b/lib/l10n/id.js
new file mode 100644
index 00000000000..42de487f655
--- /dev/null
+++ b/lib/l10n/id.js
@@ -0,0 +1,57 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Bantuan",
+    "Personal" : "Pribadi",
+    "Settings" : "Pengaturan",
+    "Users" : "Pengguna",
+    "Admin" : "Admin",
+    "Recommended" : "Direkomendasikan",
+    "No app name specified" : "Tidak ada nama apl yang ditentukan",
+    "Unknown filetype" : "Tipe berkas tak dikenal",
+    "Invalid image" : "Gambar tidak sah",
+    "web services under your control" : "layanan web dalam kendali anda",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Arsip dengan tipe %s tidak didukung",
+    "Failed to open archive when installing app" : "Gagal membuka arsip saat menginstal apl",
+    "App does not provide an info.xml file" : "Apl tidak menyediakan berkas info.xml",
+    "App can't be installed because of not allowed code in the App" : "Apl tidak dapat diinstal karena terdapat kode yang tidak diizinkan didalam Apl",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Apl tidak dapat diinstal karena tidak kompatibel dengan versi ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Apl tidak dapat diinstal karena mengandung tag <shipped>true</shipped> yang tidak diizinkan untuk apl yang bukan bawaan.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Apl tidak dapat diinstal karena versi di info.xml/versi tidak sama dengan versi yang dilansir dari toko apl",
+    "Application is not enabled" : "Aplikasi tidak diaktifkan",
+    "Authentication error" : "Galat saat otentikasi",
+    "Token expired. Please reload page." : "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
+    "%s enter the database username." : "%s masukkan nama pengguna basis data.",
+    "%s enter the database name." : "%s masukkan nama basis data.",
+    "%s you may not use dots in the database name" : "%s anda tidak boleh menggunakan karakter titik pada nama basis data",
+    "MS SQL username and/or password not valid: %s" : "Nama pengguna dan/atau sandi MySQL tidak sah: %s",
+    "You need to enter either an existing account or the administrator." : "Anda harus memasukkan akun yang sudah ada atau administrator.",
+    "DB Error: \"%s\"" : "Galat Basis Data: \"%s\"",
+    "Offending command was: \"%s\"" : "Perintah yang bermasalah: \"%s\"",
+    "Oracle connection could not be established" : "Koneksi Oracle tidak dapat dibuat",
+    "Oracle username and/or password not valid" : "Nama pengguna dan/atau sandi Oracle tidak sah",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
+    "PostgreSQL username and/or password not valid" : "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
+    "Set an admin username." : "Atur nama pengguna admin.",
+    "Set an admin password." : "Atur sandi admin.",
+    "%s shared »%s« with you" : "%s membagikan »%s« dengan anda",
+    "Could not find category \"%s\"" : "Tidak menemukan kategori \"%s\"",
+    "seconds ago" : "beberapa detik yang lalu",
+    "_%n minute ago_::_%n minutes ago_" : ["%n menit yang lalu"],
+    "_%n hour ago_::_%n hours ago_" : ["%n jam yang lalu"],
+    "today" : "hari ini",
+    "yesterday" : "kemarin",
+    "_%n day go_::_%n days ago_" : ["%n hari yang lalu"],
+    "last month" : "bulan kemarin",
+    "_%n month ago_::_%n months ago_" : ["%n bulan yang lalu"],
+    "last year" : "tahun kemarin",
+    "years ago" : "beberapa tahun lalu",
+    "A valid username must be provided" : "Tuliskan nama pengguna yang valid",
+    "A valid password must be provided" : "Tuliskan sandi yang valid"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
new file mode 100644
index 00000000000..6bc8f736223
--- /dev/null
+++ b/lib/l10n/id.json
@@ -0,0 +1,55 @@
+{ "translations": {
+    "Help" : "Bantuan",
+    "Personal" : "Pribadi",
+    "Settings" : "Pengaturan",
+    "Users" : "Pengguna",
+    "Admin" : "Admin",
+    "Recommended" : "Direkomendasikan",
+    "No app name specified" : "Tidak ada nama apl yang ditentukan",
+    "Unknown filetype" : "Tipe berkas tak dikenal",
+    "Invalid image" : "Gambar tidak sah",
+    "web services under your control" : "layanan web dalam kendali anda",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Arsip dengan tipe %s tidak didukung",
+    "Failed to open archive when installing app" : "Gagal membuka arsip saat menginstal apl",
+    "App does not provide an info.xml file" : "Apl tidak menyediakan berkas info.xml",
+    "App can't be installed because of not allowed code in the App" : "Apl tidak dapat diinstal karena terdapat kode yang tidak diizinkan didalam Apl",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Apl tidak dapat diinstal karena tidak kompatibel dengan versi ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Apl tidak dapat diinstal karena mengandung tag <shipped>true</shipped> yang tidak diizinkan untuk apl yang bukan bawaan.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Apl tidak dapat diinstal karena versi di info.xml/versi tidak sama dengan versi yang dilansir dari toko apl",
+    "Application is not enabled" : "Aplikasi tidak diaktifkan",
+    "Authentication error" : "Galat saat otentikasi",
+    "Token expired. Please reload page." : "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
+    "%s enter the database username." : "%s masukkan nama pengguna basis data.",
+    "%s enter the database name." : "%s masukkan nama basis data.",
+    "%s you may not use dots in the database name" : "%s anda tidak boleh menggunakan karakter titik pada nama basis data",
+    "MS SQL username and/or password not valid: %s" : "Nama pengguna dan/atau sandi MySQL tidak sah: %s",
+    "You need to enter either an existing account or the administrator." : "Anda harus memasukkan akun yang sudah ada atau administrator.",
+    "DB Error: \"%s\"" : "Galat Basis Data: \"%s\"",
+    "Offending command was: \"%s\"" : "Perintah yang bermasalah: \"%s\"",
+    "Oracle connection could not be established" : "Koneksi Oracle tidak dapat dibuat",
+    "Oracle username and/or password not valid" : "Nama pengguna dan/atau sandi Oracle tidak sah",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
+    "PostgreSQL username and/or password not valid" : "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
+    "Set an admin username." : "Atur nama pengguna admin.",
+    "Set an admin password." : "Atur sandi admin.",
+    "%s shared »%s« with you" : "%s membagikan »%s« dengan anda",
+    "Could not find category \"%s\"" : "Tidak menemukan kategori \"%s\"",
+    "seconds ago" : "beberapa detik yang lalu",
+    "_%n minute ago_::_%n minutes ago_" : ["%n menit yang lalu"],
+    "_%n hour ago_::_%n hours ago_" : ["%n jam yang lalu"],
+    "today" : "hari ini",
+    "yesterday" : "kemarin",
+    "_%n day go_::_%n days ago_" : ["%n hari yang lalu"],
+    "last month" : "bulan kemarin",
+    "_%n month ago_::_%n months ago_" : ["%n bulan yang lalu"],
+    "last year" : "tahun kemarin",
+    "years ago" : "beberapa tahun lalu",
+    "A valid username must be provided" : "Tuliskan nama pengguna yang valid",
+    "A valid password must be provided" : "Tuliskan sandi yang valid"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
deleted file mode 100644
index 9e2e9282f7d..00000000000
--- a/lib/l10n/id.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Tidak dapat menulis kedalam direktori \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Hal ini biasanya dapat diperbaiki dengan memberikan akses tulis bagi situs web ke direktori config",
-"See %s" => "Lihat %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori config.",
-"Sample configuration detected" => "Konfigurasi sampel ditemukan",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php",
-"Help" => "Bantuan",
-"Personal" => "Pribadi",
-"Settings" => "Pengaturan",
-"Users" => "Pengguna",
-"Admin" => "Admin",
-"Recommended" => "Direkomendasikan",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikasi \\\"%s\\\" tidak dapat diinstal karena tidak kompatibel denga versi ownCloud ini.",
-"No app name specified" => "Tidak ada nama apl yang ditentukan",
-"Unknown filetype" => "Tipe berkas tak dikenal",
-"Invalid image" => "Gambar tidak sah",
-"web services under your control" => "layanan web dalam kendali anda",
-"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",
-"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",
-"Archives of type %s are not supported" => "Arsip dengan tipe %s tidak didukung",
-"Failed to open archive when installing app" => "Gagal membuka arsip saat menginstal apl",
-"App does not provide an info.xml file" => "Apl tidak menyediakan berkas info.xml",
-"App can't be installed because of not allowed code in the App" => "Apl tidak dapat diinstal karena terdapat kode yang tidak diizinkan didalam Apl",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Apl tidak dapat diinstal karena tidak kompatibel dengan versi ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Apl tidak dapat diinstal karena mengandung tag <shipped>true</shipped> yang tidak diizinkan untuk apl yang bukan bawaan.",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Apl tidak dapat diinstal karena versi di info.xml/versi tidak sama dengan versi yang dilansir dari toko apl",
-"Application is not enabled" => "Aplikasi tidak diaktifkan",
-"Authentication error" => "Galat saat otentikasi",
-"Token expired. Please reload page." => "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
-"Unknown user" => "Pengguna tidak dikenal",
-"%s enter the database username." => "%s masukkan nama pengguna basis data.",
-"%s enter the database name." => "%s masukkan nama basis data.",
-"%s you may not use dots in the database name" => "%s anda tidak boleh menggunakan karakter titik pada nama basis data",
-"MS SQL username and/or password not valid: %s" => "Nama pengguna dan/atau sandi MySQL tidak sah: %s",
-"You need to enter either an existing account or the administrator." => "Anda harus memasukkan akun yang sudah ada atau administrator.",
-"MySQL/MariaDB username and/or password not valid" => "Nama pengguna dan/atau sandi MySQL/MariaDB tidak sah",
-"DB Error: \"%s\"" => "Kesalahan Basis Data: \"%s\"",
-"Offending command was: \"%s\"" => "Perintah yang bermasalah: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "'%s'@'localhost' pengguna MySQL/MariaDB sudah ada.",
-"Drop this user from MySQL/MariaDB" => "Drop pengguna ini dari MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "'%s'@'%%' pengguna MySQL/MariaDB sudah ada.",
-"Drop this user from MySQL/MariaDB." => "Drop pengguna ini dari MySQL/MariaDB.",
-"Oracle connection could not be established" => "Koneksi Oracle tidak dapat dibuat",
-"Oracle username and/or password not valid" => "Nama pengguna dan/atau sandi Oracle tidak sah",
-"Offending command was: \"%s\", name: %s, password: %s" => "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
-"PostgreSQL username and/or password not valid" => "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
-"Set an admin username." => "Tetapkan nama pengguna admin.",
-"Set an admin password." => "Tetapkan sandi admin.",
-"Can't create or write into the data directory %s" => "Tidak dapat membuat atau menulis kedalam direktori data %s",
-"%s shared »%s« with you" => "%s membagikan »%s« dengan anda",
-"Sharing %s failed, because the file does not exist" => "Gagal membagikan %s, karena berkas tidak ada",
-"You are not allowed to share %s" => "Anda tidak diizinkan untuk membagikan %s",
-"Sharing %s failed, because the user %s is the item owner" => "Gagal membagikan %s, karena pengguna %s adalah pemilik item",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Gagal membagikan %s, karena berbag dengan tautan tidak diizinkan",
-"Share type %s is not valid for %s" => "Barbagi tipe %s tidak sah untuk %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Pengaturan perizinan untuk %s gagal, karena karena izin melebihi izin yang diberikan untuk %s",
-"Setting permissions for %s failed, because the item was not found" => "Pengaturan perizinan untuk %s gagal, karena item tidak ditemukan",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Tidak dapat menyetel tanggal kadaluarsa. Pembagian tidak dapat kadaluarsa lebih lambat dari %s setelah mereka dibagikan.",
-"Cannot set expiration date. Expiration date is in the past" => "Tidak dapat menyetel tanggal kadaluarsa. Tanggal kadaluarsa dimasa lalu",
-"Sharing %s failed, because the user %s is the original sharer" => "Gagal berbagi %s. karena pengguna %s adalah yang membagikan pertama",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Gagal membagikan %s, karena izin melebihi izin yang diberikan untuk %s",
-"Sharing %s failed, because resharing is not allowed" => "Gagal berbagi %s, karena membagikan ulang tidak diizinkan",
-"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\"",
-"seconds ago" => "beberapa detik yang lalu",
-"_%n minute ago_::_%n minutes ago_" => array("%n menit yang lalu"),
-"_%n hour ago_::_%n hours ago_" => array("%n jam yang lalu"),
-"today" => "hari ini",
-"yesterday" => "kemarin",
-"_%n day go_::_%n days ago_" => array("%n hari yang lalu"),
-"last month" => "bulan kemarin",
-"_%n month ago_::_%n months ago_" => array("%n bulan yang lalu"),
-"last year" => "tahun kemarin",
-"years ago" => "beberapa tahun lalu",
-"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",
-"The username is already being used" => "Nama pengguna ini telah digunakan",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Tidak ada driver (sqlite, mysql, or postgresql) yang terinstal.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Perizinan biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori root.",
-"Cannot write into \"config\" directory" => "Tidak dapat menulis kedalam direktori \"config\"",
-"Cannot write into \"apps\" directory" => "Tidak dapat menulis kedalam direktori \"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." => "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori apps atau menonaktifkan toko aplikasi didalam berkas config.",
-"Cannot create \"data\" directory (%s)" => "Tidak dapat membuat direktori (%s) \"data\"",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Hal ini biasanya dapat diperbaiki dengan <a href=\"%s\" target=\"_blank\">memberikan akses tulis bagi situs web ke direktori root</a>.",
-"Setting locale to %s failed" => "Pengaturan lokal ke %s gagal",
-"Please install one of these locales on your system and restart your webserver." => "Mohon instal paling tidak satu lokal pada sistem Anda dan jalankan ulang server web.",
-"Please ask your server administrator to install the module." => "Mohon tanyakan administrator Anda untuk menginstal module.",
-"PHP module %s not installed." => "Module PHP %s tidak terinstal.",
-"PHP %s or higher is required." => "Diperlukan PHP %s atau yang lebih tinggi.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Mohon tanyakan administrator Anda untuk memperbarui PHP ke versi terkini. Versi PHP Anda tidak lagi didukung oleh ownCloud dan komunitas PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode diaktifkan. ownCloud memerlukan ini untuk dinonaktifkan untuk dapat bekerja dengan banar.",
-"PHP modules have been installed, but they are still listed as missing?" => "Modul PHP telah terinstal, tetapi mereka terlihat tidak ada?",
-"Please ask your server administrator to restart the web server." => "Mohon minta administrator Anda untuk menjalankan ulang server web.",
-"PostgreSQL >= 9 required" => "Diperlukan PostgreSQL >= 9",
-"Please upgrade your database version" => "Mohon perbarui versi basis data Anda",
-"Error occurred while checking PostgreSQL version" => "Terjadi kesalahan saat memeriksa versi PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Pastikan bahwa Anda memiliki PostgreSQL >= 9 atau periksa log untuk informasi lebih lanjut tentang kesalahan",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Mohon ubah perizinan menjadi 0770 sehingga direktori tersebut tidak dapat dilihat oleh pengguna lain.",
-"Data directory (%s) is readable by other users" => "Direktori data (%s) dapat dibaca oleh pengguna lain",
-"Data directory (%s) is invalid" => "Direktori data (%s) tidak sah",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Mohon periksa apakah direktori data berisi sebuah berkas \".ocdata\".",
-"Could not obtain lock type %d on \"%s\"." => "Tidak bisa memperoleh jenis kunci %d pada \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/io.js b/lib/l10n/io.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/io.js
@@ -0,0 +1,9 @@
+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/io.json b/lib/l10n/io.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/io.json
@@ -0,0 +1,7 @@
+{ "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/io.php b/lib/l10n/io.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/io.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/is.js b/lib/l10n/is.js
new file mode 100644
index 00000000000..8a9b95c6120
--- /dev/null
+++ b/lib/l10n/is.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Hjálp",
+    "Personal" : "Um mig",
+    "Settings" : "Stillingar",
+    "Users" : "Notendur",
+    "Admin" : "Stjórnun",
+    "web services under your control" : "vefþjónusta undir þinni stjórn",
+    "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\"",
+    "seconds ago" : "sek.",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "í dag",
+    "yesterday" : "í gær",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "síðasta mánuði",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "síðasta ári",
+    "years ago" : "einhverjum árum"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/is.json b/lib/l10n/is.json
new file mode 100644
index 00000000000..9d168fc2aca
--- /dev/null
+++ b/lib/l10n/is.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Help" : "Hjálp",
+    "Personal" : "Um mig",
+    "Settings" : "Stillingar",
+    "Users" : "Notendur",
+    "Admin" : "Stjórnun",
+    "web services under your control" : "vefþjónusta undir þinni stjórn",
+    "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\"",
+    "seconds ago" : "sek.",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "í dag",
+    "yesterday" : "í gær",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "síðasta mánuði",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "síðasta ári",
+    "years ago" : "einhverjum árum"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/is.php b/lib/l10n/is.php
deleted file mode 100644
index 36459b68259..00000000000
--- a/lib/l10n/is.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Hjálp",
-"Personal" => "Um mig",
-"Settings" => "Stillingar",
-"Users" => "Notendur",
-"Admin" => "Stjórnun",
-"web services under your control" => "vefþjónusta undir þinni stjórn",
-"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\"",
-"seconds ago" => "sek.",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "í dag",
-"yesterday" => "í gær",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "síðasta mánuði",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "síðasta ári",
-"years ago" => "einhverjum árum"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
new file mode 100644
index 00000000000..2874653823b
--- /dev/null
+++ b/lib/l10n/it.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Impossibile scrivere nella cartella \"config\".",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Ciò può essere normalmente corretto fornendo al server web accesso in scrittura alla cartella \"config\"",
+    "See %s" : "Vedere %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"config\"%s",
+    "Sample configuration detected" : "Configurazione di esempio rilevata",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "È stato rilevato che la configurazione di esempio è stata copiata. Ciò può compromettere la tua installazione e non è supportato. Leggi la documentazione prima di modificare il file config.php",
+    "Help" : "Aiuto",
+    "Personal" : "Personale",
+    "Settings" : "Impostazioni",
+    "Users" : "Utenti",
+    "Admin" : "Admin",
+    "Recommended" : "Consigliata",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'applicazione \\\"%s\\\" non può essere installata poiché non è compatibile con questa versione di ownCloud.",
+    "No app name specified" : "Il nome dell'applicazione non è specificato",
+    "Unknown filetype" : "Tipo di file sconosciuto",
+    "Invalid image" : "Immagine non valida",
+    "web services under your control" : "servizi web nelle tue mani",
+    "App directory already exists" : "La cartella dell'applicazione esiste già",
+    "Can't create app folder. Please fix permissions. %s" : "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
+    "No source specified when installing app" : "Nessuna fonte specificata durante l'installazione dell'applicazione",
+    "No href specified when installing app from http" : "Nessun href specificato durante l'installazione dell'applicazione da http",
+    "No path specified when installing app from local file" : "Nessun percorso specificato durante l'installazione dell'applicazione da file locale",
+    "Archives of type %s are not supported" : "Gli archivi di tipo %s non sono supportati",
+    "Failed to open archive when installing app" : "Apertura archivio non riuscita durante l'installazione dell'applicazione",
+    "App does not provide an info.xml file" : "L'applicazione non fornisce un file info.xml",
+    "App can't be installed because of not allowed code in the App" : "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che è consentito per le applicazioni native",
+    "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'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
+    "Application is not enabled" : "L'applicazione  non è abilitata",
+    "Authentication error" : "Errore di autenticazione",
+    "Token expired. Please reload page." : "Token scaduto. Ricarica la pagina.",
+    "Unknown user" : "Utente sconosciuto",
+    "%s enter the database username." : "%s digita il nome utente del database.",
+    "%s enter the database name." : "%s digita il nome del database.",
+    "%s you may not use dots in the database name" : "%s non dovresti utilizzare punti nel nome del database",
+    "MS SQL username and/or password not valid: %s" : "Nome utente e/o password MS SQL non validi: %s",
+    "You need to enter either an existing account or the administrator." : "È necessario inserire un account esistente o l'amministratore.",
+    "MySQL/MariaDB username and/or password not valid" : "Nome utente e/o password di MySQL/MariaDB non validi",
+    "DB Error: \"%s\"" : "Errore DB: \"%s\"",
+    "Offending command was: \"%s\"" : "Il comando non consentito era: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "L'utente MySQL/MariaDB '%s'@'localhost' esiste già.",
+    "Drop this user from MySQL/MariaDB" : "Elimina questo utente da MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "L'utente MySQL/MariaDB '%s'@'%%' esiste già",
+    "Drop this user from MySQL/MariaDB." : "Elimina questo utente da MySQL/MariaDB.",
+    "Oracle connection could not be established" : "La connessione a Oracle non può essere stabilita",
+    "Oracle username and/or password not valid" : "Nome utente e/o password di Oracle non validi",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Il comando non consentito era: \"%s\", nome: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "Nome utente e/o password di PostgreSQL non validi",
+    "Set an admin username." : "Imposta un nome utente di amministrazione.",
+    "Set an admin password." : "Imposta una password di amministrazione.",
+    "Can't create or write into the data directory %s" : "Impossibile creare o scrivere nella cartella dei dati %s",
+    "%s shared »%s« with you" : "%s ha condiviso «%s» con te",
+    "Sharing %s failed, because the file does not exist" : "Condivisione di %s non riuscita, poiché il file non esiste",
+    "You are not allowed to share %s" : "Non ti è consentito condividere %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Condivisione di %s non riuscita, poiché l'utente %s è il proprietario dell'oggetto",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Condivisione di %s non riuscita, poiché i collegamenti non sono consentiti",
+    "Share type %s is not valid for %s" : "Il tipo di condivisione %s non è valido per %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Impostazione permessi per %s non riuscita, poiché l'elemento non è stato trovato",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Impossibile impostare la data di scadenza. Le condivisioni non possono scadere più tardi di %s dalla loro attivazione",
+    "Cannot set expiration date. Expiration date is in the past" : "Impossibile impostare la data di scadenza. La data di scadenza è nel passato.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Motore di condivisione %s non trovato",
+    "Sharing backend for %s not found" : "Motore di condivisione di %s non trovato",
+    "Sharing %s failed, because the user %s is the original sharer" : "Condivisione di %s non riuscita, poiché l'utente %s l'ha condiviso precedentemente",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Condivisione di %s non riuscita, poiché i permessi superano quelli accordati a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Condivisione di %s non riuscita, poiché la ri-condivisione non è consentita",
+    "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\"",
+    "seconds ago" : "secondi fa",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minuto fa","%n minuti fa"],
+    "_%n hour ago_::_%n hours ago_" : ["%n ora fa","%n ore fa"],
+    "today" : "oggi",
+    "yesterday" : "ieri",
+    "_%n day go_::_%n days ago_" : ["%n giorno fa","%n giorni fa"],
+    "last month" : "mese scorso",
+    "_%n month ago_::_%n months ago_" : ["%n mese fa","%n mesi fa"],
+    "last year" : "anno scorso",
+    "years ago" : "anni fa",
+    "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",
+    "The username is already being used" : "Il nome utente è già utilizzato",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nessun driver di database (sqlite, mysql o postgresql) installato",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "I permessi possono essere normalmente corretti %sfornendo al server web accesso in scrittura alla cartella radice%s.",
+    "Cannot write into \"config\" directory" : "Impossibile scrivere nella cartella \"config\"",
+    "Cannot write into \"apps\" directory" : "Impossibile scrivere nella cartella \"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." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"apps\"%s o disabilitando il negozio di applicazioni nel file di configurazione.",
+    "Cannot create \"data\" directory (%s)" : "Impossibile creare la cartella \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ciò può essere normalmente corretto <a href=\"%s\" target=\"_blank\">fornendo al server web accesso in scrittura alla cartella radice</a>.",
+    "Setting locale to %s failed" : "L'impostazione della localizzazione a %s non è riuscita",
+    "Please install one of these locales on your system and restart your webserver." : "Installa una delle seguenti localizzazioni sul tuo sistema e riavvia il server web.",
+    "Please ask your server administrator to install the module." : "Chiedi all'amministratore del tuo server di installare il modulo.",
+    "PHP module %s not installed." : "Il modulo PHP %s non è installato.",
+    "PHP %s or higher is required." : "Richiesto PHP %s o superiore",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Chiedi al tuo amministratore di aggiornare PHP all'ultima versione. La tua versione di PHP non è più supportata da ownCloud e dalla comunità di PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode è abilitato. ownCloud richiede che sia disabilitato per funzionare correttamente.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode è un'impostazione sconsigliata e solitamente inutile che dovrebbe essere disabilitata. Chiedi al tuo amministratore di disabilitarlo nel file php.ini o nella configurazione del server web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes è abilitato. ownCloud richiede che sia disabilitato per funzionare correttamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes è un'impostazione sconsigliata e solitamente inutile che dovrebbe essere disabilitata. Chiedi al tuo amministratore di disabilitarlo nel file php.ini o nella configurazione del server web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Sono stati installati moduli PHP, ma sono elencati ancora come mancanti?",
+    "Please ask your server administrator to restart the web server." : "Chiedi all'amministratore di riavviare il server web.",
+    "PostgreSQL >= 9 required" : "Richiesto PostgreSQL >= 9",
+    "Please upgrade your database version" : "Aggiorna la versione del tuo database",
+    "Error occurred while checking PostgreSQL version" : "Si è verificato un errore durante il controllo della versione di PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Assicurati di avere PostgreSQL  >= 9 o controlla i log per ulteriori informazioni sull'errore",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Modifica i permessi in 0770 in modo tale che la cartella non sia leggibile dagli altri utenti.",
+    "Data directory (%s) is readable by other users" : "La cartella dei dati (%s) è leggibile dagli altri utenti",
+    "Data directory (%s) is invalid" : "La cartella dei dati (%s) non è valida",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifica che la cartella dei dati contenga un file \".ocdata\" nella sua radice.",
+    "Could not obtain lock type %d on \"%s\"." : "Impossibile ottenere il blocco di tipo %d su \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
new file mode 100644
index 00000000000..ca5beb1b802
--- /dev/null
+++ b/lib/l10n/it.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Impossibile scrivere nella cartella \"config\".",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Ciò può essere normalmente corretto fornendo al server web accesso in scrittura alla cartella \"config\"",
+    "See %s" : "Vedere %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"config\"%s",
+    "Sample configuration detected" : "Configurazione di esempio rilevata",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "È stato rilevato che la configurazione di esempio è stata copiata. Ciò può compromettere la tua installazione e non è supportato. Leggi la documentazione prima di modificare il file config.php",
+    "Help" : "Aiuto",
+    "Personal" : "Personale",
+    "Settings" : "Impostazioni",
+    "Users" : "Utenti",
+    "Admin" : "Admin",
+    "Recommended" : "Consigliata",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'applicazione \\\"%s\\\" non può essere installata poiché non è compatibile con questa versione di ownCloud.",
+    "No app name specified" : "Il nome dell'applicazione non è specificato",
+    "Unknown filetype" : "Tipo di file sconosciuto",
+    "Invalid image" : "Immagine non valida",
+    "web services under your control" : "servizi web nelle tue mani",
+    "App directory already exists" : "La cartella dell'applicazione esiste già",
+    "Can't create app folder. Please fix permissions. %s" : "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
+    "No source specified when installing app" : "Nessuna fonte specificata durante l'installazione dell'applicazione",
+    "No href specified when installing app from http" : "Nessun href specificato durante l'installazione dell'applicazione da http",
+    "No path specified when installing app from local file" : "Nessun percorso specificato durante l'installazione dell'applicazione da file locale",
+    "Archives of type %s are not supported" : "Gli archivi di tipo %s non sono supportati",
+    "Failed to open archive when installing app" : "Apertura archivio non riuscita durante l'installazione dell'applicazione",
+    "App does not provide an info.xml file" : "L'applicazione non fornisce un file info.xml",
+    "App can't be installed because of not allowed code in the App" : "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che è consentito per le applicazioni native",
+    "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'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
+    "Application is not enabled" : "L'applicazione  non è abilitata",
+    "Authentication error" : "Errore di autenticazione",
+    "Token expired. Please reload page." : "Token scaduto. Ricarica la pagina.",
+    "Unknown user" : "Utente sconosciuto",
+    "%s enter the database username." : "%s digita il nome utente del database.",
+    "%s enter the database name." : "%s digita il nome del database.",
+    "%s you may not use dots in the database name" : "%s non dovresti utilizzare punti nel nome del database",
+    "MS SQL username and/or password not valid: %s" : "Nome utente e/o password MS SQL non validi: %s",
+    "You need to enter either an existing account or the administrator." : "È necessario inserire un account esistente o l'amministratore.",
+    "MySQL/MariaDB username and/or password not valid" : "Nome utente e/o password di MySQL/MariaDB non validi",
+    "DB Error: \"%s\"" : "Errore DB: \"%s\"",
+    "Offending command was: \"%s\"" : "Il comando non consentito era: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "L'utente MySQL/MariaDB '%s'@'localhost' esiste già.",
+    "Drop this user from MySQL/MariaDB" : "Elimina questo utente da MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "L'utente MySQL/MariaDB '%s'@'%%' esiste già",
+    "Drop this user from MySQL/MariaDB." : "Elimina questo utente da MySQL/MariaDB.",
+    "Oracle connection could not be established" : "La connessione a Oracle non può essere stabilita",
+    "Oracle username and/or password not valid" : "Nome utente e/o password di Oracle non validi",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Il comando non consentito era: \"%s\", nome: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "Nome utente e/o password di PostgreSQL non validi",
+    "Set an admin username." : "Imposta un nome utente di amministrazione.",
+    "Set an admin password." : "Imposta una password di amministrazione.",
+    "Can't create or write into the data directory %s" : "Impossibile creare o scrivere nella cartella dei dati %s",
+    "%s shared »%s« with you" : "%s ha condiviso «%s» con te",
+    "Sharing %s failed, because the file does not exist" : "Condivisione di %s non riuscita, poiché il file non esiste",
+    "You are not allowed to share %s" : "Non ti è consentito condividere %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Condivisione di %s non riuscita, poiché l'utente %s è il proprietario dell'oggetto",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Condivisione di %s non riuscita, poiché i collegamenti non sono consentiti",
+    "Share type %s is not valid for %s" : "Il tipo di condivisione %s non è valido per %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Impostazione permessi per %s non riuscita, poiché l'elemento non è stato trovato",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Impossibile impostare la data di scadenza. Le condivisioni non possono scadere più tardi di %s dalla loro attivazione",
+    "Cannot set expiration date. Expiration date is in the past" : "Impossibile impostare la data di scadenza. La data di scadenza è nel passato.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Motore di condivisione %s non trovato",
+    "Sharing backend for %s not found" : "Motore di condivisione di %s non trovato",
+    "Sharing %s failed, because the user %s is the original sharer" : "Condivisione di %s non riuscita, poiché l'utente %s l'ha condiviso precedentemente",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Condivisione di %s non riuscita, poiché i permessi superano quelli accordati a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Condivisione di %s non riuscita, poiché la ri-condivisione non è consentita",
+    "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\"",
+    "seconds ago" : "secondi fa",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minuto fa","%n minuti fa"],
+    "_%n hour ago_::_%n hours ago_" : ["%n ora fa","%n ore fa"],
+    "today" : "oggi",
+    "yesterday" : "ieri",
+    "_%n day go_::_%n days ago_" : ["%n giorno fa","%n giorni fa"],
+    "last month" : "mese scorso",
+    "_%n month ago_::_%n months ago_" : ["%n mese fa","%n mesi fa"],
+    "last year" : "anno scorso",
+    "years ago" : "anni fa",
+    "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",
+    "The username is already being used" : "Il nome utente è già utilizzato",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nessun driver di database (sqlite, mysql o postgresql) installato",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "I permessi possono essere normalmente corretti %sfornendo al server web accesso in scrittura alla cartella radice%s.",
+    "Cannot write into \"config\" directory" : "Impossibile scrivere nella cartella \"config\"",
+    "Cannot write into \"apps\" directory" : "Impossibile scrivere nella cartella \"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." : "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"apps\"%s o disabilitando il negozio di applicazioni nel file di configurazione.",
+    "Cannot create \"data\" directory (%s)" : "Impossibile creare la cartella \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ciò può essere normalmente corretto <a href=\"%s\" target=\"_blank\">fornendo al server web accesso in scrittura alla cartella radice</a>.",
+    "Setting locale to %s failed" : "L'impostazione della localizzazione a %s non è riuscita",
+    "Please install one of these locales on your system and restart your webserver." : "Installa una delle seguenti localizzazioni sul tuo sistema e riavvia il server web.",
+    "Please ask your server administrator to install the module." : "Chiedi all'amministratore del tuo server di installare il modulo.",
+    "PHP module %s not installed." : "Il modulo PHP %s non è installato.",
+    "PHP %s or higher is required." : "Richiesto PHP %s o superiore",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Chiedi al tuo amministratore di aggiornare PHP all'ultima versione. La tua versione di PHP non è più supportata da ownCloud e dalla comunità di PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode è abilitato. ownCloud richiede che sia disabilitato per funzionare correttamente.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode è un'impostazione sconsigliata e solitamente inutile che dovrebbe essere disabilitata. Chiedi al tuo amministratore di disabilitarlo nel file php.ini o nella configurazione del server web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes è abilitato. ownCloud richiede che sia disabilitato per funzionare correttamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes è un'impostazione sconsigliata e solitamente inutile che dovrebbe essere disabilitata. Chiedi al tuo amministratore di disabilitarlo nel file php.ini o nella configurazione del server web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Sono stati installati moduli PHP, ma sono elencati ancora come mancanti?",
+    "Please ask your server administrator to restart the web server." : "Chiedi all'amministratore di riavviare il server web.",
+    "PostgreSQL >= 9 required" : "Richiesto PostgreSQL >= 9",
+    "Please upgrade your database version" : "Aggiorna la versione del tuo database",
+    "Error occurred while checking PostgreSQL version" : "Si è verificato un errore durante il controllo della versione di PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Assicurati di avere PostgreSQL  >= 9 o controlla i log per ulteriori informazioni sull'errore",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Modifica i permessi in 0770 in modo tale che la cartella non sia leggibile dagli altri utenti.",
+    "Data directory (%s) is readable by other users" : "La cartella dei dati (%s) è leggibile dagli altri utenti",
+    "Data directory (%s) is invalid" : "La cartella dei dati (%s) non è valida",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifica che la cartella dei dati contenga un file \".ocdata\" nella sua radice.",
+    "Could not obtain lock type %d on \"%s\"." : "Impossibile ottenere il blocco di tipo %d su \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
deleted file mode 100644
index c9eaff8a35c..00000000000
--- a/lib/l10n/it.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Impossibile scrivere nella cartella \"config\".",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Ciò può essere normalmente corretto fornendo al server web accesso in scrittura alla cartella \"config\"",
-"See %s" => "Vedere %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"config\"%s",
-"Sample configuration detected" => "Configurazione di esempio rilevata",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "È stato rilevato che la configurazione di esempio è stata copiata. Ciò può compromettere la tua installazione e non è supportato. Leggi la documentazione prima di modificare il file config.php",
-"Help" => "Aiuto",
-"Personal" => "Personale",
-"Settings" => "Impostazioni",
-"Users" => "Utenti",
-"Admin" => "Admin",
-"Recommended" => "Consigliata",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "L'applicazione \\\"%s\\\" non può essere installata poiché non è compatibile con questa versione di ownCloud.",
-"No app name specified" => "Il nome dell'applicazione non è specificato",
-"Unknown filetype" => "Tipo di file sconosciuto",
-"Invalid image" => "Immagine non valida",
-"web services under your control" => "servizi web nelle tue mani",
-"App directory already exists" => "La cartella dell'applicazione esiste già",
-"Can't create app folder. Please fix permissions. %s" => "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
-"No source specified when installing app" => "Nessuna fonte specificata durante l'installazione dell'applicazione",
-"No href specified when installing app from http" => "Nessun href specificato durante l'installazione dell'applicazione da http",
-"No path specified when installing app from local file" => "Nessun percorso specificato durante l'installazione dell'applicazione da file locale",
-"Archives of type %s are not supported" => "Gli archivi di tipo %s non sono supportati",
-"Failed to open archive when installing app" => "Apertura archivio non riuscita durante l'installazione dell'applicazione",
-"App does not provide an info.xml file" => "L'applicazione non fornisce un file info.xml",
-"App can't be installed because of not allowed code in the App" => "L'applicazione non può essere installata a causa di codice non consentito al suo interno",
-"App can't be installed because it is not compatible with this version of ownCloud" => "L'applicazione non può essere installata poiché non è compatibile con questa versione di ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "L'applicazione non può essere installata poiché contiene il tag <shipped>true<shipped> che è consentito per le applicazioni native",
-"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'applicazione non può essere installata poiché la versione in info.xml/version non è la stessa riportata dall'app store",
-"Application is not enabled" => "L'applicazione  non è abilitata",
-"Authentication error" => "Errore di autenticazione",
-"Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
-"Unknown user" => "Utente sconosciuto",
-"%s enter the database username." => "%s digita il nome utente del database.",
-"%s enter the database name." => "%s digita il nome del database.",
-"%s you may not use dots in the database name" => "%s non dovresti utilizzare punti nel nome del database",
-"MS SQL username and/or password not valid: %s" => "Nome utente e/o password MS SQL non validi: %s",
-"You need to enter either an existing account or the administrator." => "È necessario inserire un account esistente o l'amministratore.",
-"MySQL/MariaDB username and/or password not valid" => "Nome utente e/o password di MySQL/MariaDB non validi",
-"DB Error: \"%s\"" => "Errore DB: \"%s\"",
-"Offending command was: \"%s\"" => "Il comando non consentito era: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "L'utente MySQL/MariaDB '%s'@'localhost' esiste già.",
-"Drop this user from MySQL/MariaDB" => "Elimina questo utente da MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "L'utente MySQL/MariaDB '%s'@'%%' esiste già",
-"Drop this user from MySQL/MariaDB." => "Elimina questo utente da MySQL/MariaDB.",
-"Oracle connection could not be established" => "La connessione a Oracle non può essere stabilita",
-"Oracle username and/or password not valid" => "Nome utente e/o password di Oracle non validi",
-"Offending command was: \"%s\", name: %s, password: %s" => "Il comando non consentito era: \"%s\", nome: %s, password: %s",
-"PostgreSQL username and/or password not valid" => "Nome utente e/o password di PostgreSQL non validi",
-"Set an admin username." => "Imposta un nome utente di amministrazione.",
-"Set an admin password." => "Imposta una password di amministrazione.",
-"Can't create or write into the data directory %s" => "Impossibile creare o scrivere nella cartella dei dati %s",
-"%s shared »%s« with you" => "%s ha condiviso «%s» con te",
-"Sharing %s failed, because the file does not exist" => "Condivisione di %s non riuscita, poiché il file non esiste",
-"You are not allowed to share %s" => "Non ti è consentito condividere %s",
-"Sharing %s failed, because the user %s is the item owner" => "Condivisione di %s non riuscita, poiché l'utente %s è il proprietario dell'oggetto",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Condivisione di %s non riuscita, poiché i collegamenti non sono consentiti",
-"Share type %s is not valid for %s" => "Il tipo di condivisione %s non è valido per %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Impostazione permessi per %s non riuscita, poiché i permessi superano i permessi accordati a %s",
-"Setting permissions for %s failed, because the item was not found" => "Impostazione permessi per %s non riuscita, poiché l'elemento non è stato trovato",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Impossibile impostare la data di scadenza. Le condivisioni non possono scadere più tardi di %s dalla loro attivazione",
-"Cannot set expiration date. Expiration date is in the past" => "Impossibile impostare la data di scadenza. La data di scadenza è nel passato.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Il motore di condivisione %s deve implementare l'interfaccia OCP\\Share_Backend",
-"Sharing backend %s not found" => "Motore di condivisione %s non trovato",
-"Sharing backend for %s not found" => "Motore di condivisione di %s non trovato",
-"Sharing %s failed, because the user %s is the original sharer" => "Condivisione di %s non riuscita, poiché l'utente %s l'ha condiviso precedentemente",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Condivisione di %s non riuscita, poiché i permessi superano quelli accordati a %s",
-"Sharing %s failed, because resharing is not allowed" => "Condivisione di %s non riuscita, poiché la ri-condivisione non è consentita",
-"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\"",
-"seconds ago" => "secondi fa",
-"_%n minute ago_::_%n minutes ago_" => array("%n minuto fa","%n minuti fa"),
-"_%n hour ago_::_%n hours ago_" => array("%n ora fa","%n ore fa"),
-"today" => "oggi",
-"yesterday" => "ieri",
-"_%n day go_::_%n days ago_" => array("%n giorno fa","%n giorni fa"),
-"last month" => "mese scorso",
-"_%n month ago_::_%n months ago_" => array("%n mese fa","%n mesi fa"),
-"last year" => "anno scorso",
-"years ago" => "anni fa",
-"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",
-"The username is already being used" => "Il nome utente è già utilizzato",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Nessun driver di database (sqlite, mysql o postgresql) installato",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "I permessi possono essere normalmente corretti %sfornendo al server web accesso in scrittura alla cartella radice%s.",
-"Cannot write into \"config\" directory" => "Impossibile scrivere nella cartella \"config\"",
-"Cannot write into \"apps\" directory" => "Impossibile scrivere nella cartella \"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." => "Ciò può essere normalmente corretto %sfornendo al server web accesso in scrittura alla cartella \"apps\"%s o disabilitando il negozio di applicazioni nel file di configurazione.",
-"Cannot create \"data\" directory (%s)" => "Impossibile creare la cartella \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Ciò può essere normalmente corretto <a href=\"%s\" target=\"_blank\">fornendo al server web accesso in scrittura alla cartella radice</a>.",
-"Setting locale to %s failed" => "L'impostazione della localizzazione a %s non è riuscita",
-"Please install one of these locales on your system and restart your webserver." => "Installa una delle seguenti localizzazioni sul tuo sistema e riavvia il server web.",
-"Please ask your server administrator to install the module." => "Chiedi all'amministratore del tuo server di installare il modulo.",
-"PHP module %s not installed." => "Il modulo PHP %s non è installato.",
-"PHP %s or higher is required." => "Richiesto PHP %s o superiore",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Chiedi al tuo amministratore di aggiornare PHP all'ultima versione. La tua versione di PHP non è più supportata da ownCloud e dalla comunità di PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode è abilitato. ownCloud richiede che sia disabilitato per funzionare correttamente.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode è un'impostazione sconsigliata e solitamente inutile che dovrebbe essere disabilitata. Chiedi al tuo amministratore di disabilitarlo nel file php.ini o nella configurazione del server web.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes è abilitato. ownCloud richiede che sia disabilitato per funzionare correttamente.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes è un'impostazione sconsigliata e solitamente inutile che dovrebbe essere disabilitata. Chiedi al tuo amministratore di disabilitarlo nel file php.ini o nella configurazione del server web.",
-"PHP modules have been installed, but they are still listed as missing?" => "Sono stati installati moduli PHP, ma sono elencati ancora come mancanti?",
-"Please ask your server administrator to restart the web server." => "Chiedi all'amministratore di riavviare il server web.",
-"PostgreSQL >= 9 required" => "Richiesto PostgreSQL >= 9",
-"Please upgrade your database version" => "Aggiorna la versione del tuo database",
-"Error occurred while checking PostgreSQL version" => "Si è verificato un errore durante il controllo della versione di PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Assicurati di avere PostgreSQL  >= 9 o controlla i log per ulteriori informazioni sull'errore",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Modifica i permessi in 0770 in modo tale che la cartella non sia leggibile dagli altri utenti.",
-"Data directory (%s) is readable by other users" => "La cartella dei dati (%s) è leggibile dagli altri utenti",
-"Data directory (%s) is invalid" => "La cartella dei dati (%s) non è valida",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Verifica che la cartella dei dati contenga un file \".ocdata\" nella sua radice.",
-"Could not obtain lock type %d on \"%s\"." => "Impossibile ottenere il blocco di tipo %d su \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
new file mode 100644
index 00000000000..87411743f1e
--- /dev/null
+++ b/lib/l10n/ja.js
@@ -0,0 +1,123 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "\"config\"ディレクトリに書き込めません！",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "多くの場合、これはWebサーバーにconfigディレクトリへの書き込み権限を与えることで解決できます。",
+    "See %s" : "%s を閲覧",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "多くの場合、これは %s Webサーバーにconfigディレクトリ %s への書き込み権限を与えることで解決できます。",
+    "Sample configuration detected" : "サンプル設定が見つかりました。",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "サンプル設定がコピーされてそのままです。このままではインストールが失敗し、サポート対象外になります。config.phpを変更する前にドキュメントを確認してください。",
+    "Help" : "ヘルプ",
+    "Personal" : "個人",
+    "Settings" : "設定",
+    "Users" : "ユーザー",
+    "Admin" : "管理",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "アプリ \\\"%s\\\" をインストールできません。現在のownCloudのバージョンと互換性がありません。",
+    "No app name specified" : "アプリ名が未指定",
+    "Unknown filetype" : "不明なファイルタイプ",
+    "Invalid image" : "無効な画像",
+    "web services under your control" : "あなたの管理下のウェブサービス",
+    "App directory already exists" : "アプリディレクトリはすでに存在します",
+    "Can't create app folder. Please fix permissions. %s" : "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
+    "No source specified when installing app" : "アプリインストール時のソースが未指定",
+    "No href specified when installing app from http" : "アプリインストール時のhttpの URL が未指定",
+    "No path specified when installing app from local file" : "アプリインストール時のローカルファイルのパスが未指定",
+    "Archives of type %s are not supported" : "\"%s\"タイプのアーカイブ形式は未サポート",
+    "Failed to open archive when installing app" : "アプリをインストール中にアーカイブファイルを開けませんでした。",
+    "App does not provide an info.xml file" : "アプリにinfo.xmlファイルが入っていません",
+    "App can't be installed because of not allowed code in the App" : "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
+    "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 ではデータベース名にドットを利用できないかもしれません。",
+    "MS SQL username and/or password not valid: %s" : "MS SQL Serverのユーザー名/パスワードが正しくありません: %s",
+    "You need to enter either an existing account or the administrator." : "既存のアカウントもしくは管理者のどちらかを入力する必要があります。",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB のユーザー名及び/またはパスワードが無効",
+    "DB Error: \"%s\"" : "DBエラー: \"%s\"",
+    "Offending command was: \"%s\"" : "違反コマンド: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB のユーザー '%s'@'localhost' はすでに存在します。",
+    "Drop this user from MySQL/MariaDB" : "MySQL/MariaDB からこのユーザーを削除",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB のユーザー '%s'@'%%' はすでに存在します",
+    "Drop this user from MySQL/MariaDB." : "MySQL/MariaDB からこのユーザーを削除。",
+    "Oracle connection could not be established" : "Oracleへの接続が確立できませんでした。",
+    "Oracle username and/or password not valid" : "Oracleのユーザー名もしくはパスワードは有効ではありません",
+    "Offending command was: \"%s\", name: %s, password: %s" : "違反コマンド: \"%s\"、名前: %s、パスワード: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQLのユーザー名もしくはパスワードは有効ではありません",
+    "Set an admin username." : "管理者のユーザー名を設定",
+    "Set an admin password." : "管理者のパスワードを設定。",
+    "Can't create or write into the data directory %s" : "%s データディレクトリに作成、書き込みができません",
+    "%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 を共有することを許可されていません。",
+    "Sharing %s failed, because the user %s is the item owner" : "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。",
+    "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 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" : "公開用リンクの作成にはパスワードの設定が必要です",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s の共有に失敗しました。リンクでの共有は許可されていません。",
+    "Share type %s is not valid for %s" : "%s の共有方法は、%s には適用できません。",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s の権限設定に失敗しました。%s に許可されている権限を越えています。",
+    "Setting permissions for %s failed, because the item was not found" : "%s の権限設定に失敗しました。アイテムが存在しません。",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "有効期限を設定できません。共有開始から %s 以降に有効期限を設定することはできません。",
+    "Cannot set expiration date. Expiration date is in the past" : "有効期限を設定できません。有効期限が過去を示しています。",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s のバックエンドの共有には、OCP\\Share_Backend　インターフェースを実装しなければなりません。",
+    "Sharing backend %s not found" : "共有バックエンド %s が見つかりません",
+    "Sharing backend for %s not found" : "%s のための共有バックエンドが見つかりません",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s の共有に失敗しました。ユーザー %s が元々の共有者であるからです。",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s の共有に失敗しました。%s に付与されている許可を超えているからです。",
+    "Sharing %s failed, because resharing is not allowed" : "%s の共有に失敗しました。再共有が許されていないからです。",
+    "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\" が見つかりませんでした",
+    "seconds ago" : "数秒前",
+    "_%n minute ago_::_%n minutes ago_" : ["%n 分前"],
+    "_%n hour ago_::_%n hours ago_" : ["%n 時間前"],
+    "today" : "今日",
+    "yesterday" : "1日前",
+    "_%n day go_::_%n days ago_" : ["%n日前"],
+    "last month" : "1ヶ月前",
+    "_%n month ago_::_%n months ago_" : ["%nヶ月前"],
+    "last year" : "1年前",
+    "years ago" : "年前",
+    "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" : "有効なパスワードを指定する必要があります",
+    "The username is already being used" : "ユーザー名はすでに使われています",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "データベースドライバー (sqlite, mysql, postgresql) がインストールされていません。",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "多くの場合、パーミッションは %s Webサーバーにルートディレクトリ %s への書き込み権限を与えることで解決できます。",
+    "Cannot write into \"config\" directory" : "\"config\" ディレクトリに書き込みができません",
+    "Cannot write into \"apps\" directory" : "\"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." : "多くの場合、これは %s Webサーバーにappsディレクトリ %s への書き込み権限を与えるか、設定ファイルでアプリストアを無効化することで解決できます。",
+    "Cannot create \"data\" directory (%s)" : "\"data\" ディレクトリ (%s) を作成できません",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "多くの場合、これは<a href=\"%s\" target=\"_blank\">Webサーバーにルートディレクトリへの書き込み権限を与える</a>ことで解決できます。",
+    "Setting locale to %s failed" : "ロケールを %s に設定できませんでした",
+    "Please install one of these locales on your system and restart your webserver." : "これらのロケールのうちいずれかをシステムにインストールし、Webサーバーを再起動してください。",
+    "Please ask your server administrator to install the module." : "サーバー管理者にモジュールのインストールを依頼してください。",
+    "PHP module %s not installed." : "PHP のモジュール %s がインストールされていません。",
+    "PHP %s or higher is required." : "PHP %s 以上が必要です。",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "PHPを最新バージョンに更新するようサーバー管理者に依頼してください。現在のPHPのバージョンは、ownCloudおよびPHPコミュニティでサポートされていません。",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHPセーフモードは有効です。ownCloudを適切に動作させるには無効化する必要があります。",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHPセーフモードは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "マジッククォートは有効です。ownCloudを適切に動作させるには無効にする必要があります。",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "マジッククォートは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？",
+    "Please ask your server administrator to restart the web server." : "サーバー管理者にWEBサーバーを再起動するよう依頼してください。",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 が必要です",
+    "Please upgrade your database version" : "新しいバージョンのデータベースにアップグレードしてください",
+    "Error occurred while checking PostgreSQL version" : "PostgreSQL のバージョンチェック中にエラーが発生しました",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "PostgreSQL >= 9 がインストールされているかどうか確認してください。もしくは、ログからエラーに関する詳細な情報を確認してください。",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "ディレクトリが他のユーザーから見えないように、パーミッションを 0770 に変更してください。",
+    "Data directory (%s) is readable by other users" : "データディレクトリ (%s) は他のユーザーも閲覧することができます",
+    "Data directory (%s) is invalid" : "データディレクトリ (%s) は無効です",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "データディレクトリに \".ocdata\" ファイルが含まれていることを確認してください。",
+    "Could not obtain lock type %d on \"%s\"." : "\"%s\" で %d タイプのロックを取得できませんでした。"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
new file mode 100644
index 00000000000..dee2589dac3
--- /dev/null
+++ b/lib/l10n/ja.json
@@ -0,0 +1,121 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "\"config\"ディレクトリに書き込めません！",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "多くの場合、これはWebサーバーにconfigディレクトリへの書き込み権限を与えることで解決できます。",
+    "See %s" : "%s を閲覧",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "多くの場合、これは %s Webサーバーにconfigディレクトリ %s への書き込み権限を与えることで解決できます。",
+    "Sample configuration detected" : "サンプル設定が見つかりました。",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "サンプル設定がコピーされてそのままです。このままではインストールが失敗し、サポート対象外になります。config.phpを変更する前にドキュメントを確認してください。",
+    "Help" : "ヘルプ",
+    "Personal" : "個人",
+    "Settings" : "設定",
+    "Users" : "ユーザー",
+    "Admin" : "管理",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "アプリ \\\"%s\\\" をインストールできません。現在のownCloudのバージョンと互換性がありません。",
+    "No app name specified" : "アプリ名が未指定",
+    "Unknown filetype" : "不明なファイルタイプ",
+    "Invalid image" : "無効な画像",
+    "web services under your control" : "あなたの管理下のウェブサービス",
+    "App directory already exists" : "アプリディレクトリはすでに存在します",
+    "Can't create app folder. Please fix permissions. %s" : "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
+    "No source specified when installing app" : "アプリインストール時のソースが未指定",
+    "No href specified when installing app from http" : "アプリインストール時のhttpの URL が未指定",
+    "No path specified when installing app from local file" : "アプリインストール時のローカルファイルのパスが未指定",
+    "Archives of type %s are not supported" : "\"%s\"タイプのアーカイブ形式は未サポート",
+    "Failed to open archive when installing app" : "アプリをインストール中にアーカイブファイルを開けませんでした。",
+    "App does not provide an info.xml file" : "アプリにinfo.xmlファイルが入っていません",
+    "App can't be installed because of not allowed code in the App" : "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
+    "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 ではデータベース名にドットを利用できないかもしれません。",
+    "MS SQL username and/or password not valid: %s" : "MS SQL Serverのユーザー名/パスワードが正しくありません: %s",
+    "You need to enter either an existing account or the administrator." : "既存のアカウントもしくは管理者のどちらかを入力する必要があります。",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB のユーザー名及び/またはパスワードが無効",
+    "DB Error: \"%s\"" : "DBエラー: \"%s\"",
+    "Offending command was: \"%s\"" : "違反コマンド: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB のユーザー '%s'@'localhost' はすでに存在します。",
+    "Drop this user from MySQL/MariaDB" : "MySQL/MariaDB からこのユーザーを削除",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB のユーザー '%s'@'%%' はすでに存在します",
+    "Drop this user from MySQL/MariaDB." : "MySQL/MariaDB からこのユーザーを削除。",
+    "Oracle connection could not be established" : "Oracleへの接続が確立できませんでした。",
+    "Oracle username and/or password not valid" : "Oracleのユーザー名もしくはパスワードは有効ではありません",
+    "Offending command was: \"%s\", name: %s, password: %s" : "違反コマンド: \"%s\"、名前: %s、パスワード: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQLのユーザー名もしくはパスワードは有効ではありません",
+    "Set an admin username." : "管理者のユーザー名を設定",
+    "Set an admin password." : "管理者のパスワードを設定。",
+    "Can't create or write into the data directory %s" : "%s データディレクトリに作成、書き込みができません",
+    "%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 を共有することを許可されていません。",
+    "Sharing %s failed, because the user %s is the item owner" : "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。",
+    "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 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" : "公開用リンクの作成にはパスワードの設定が必要です",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s の共有に失敗しました。リンクでの共有は許可されていません。",
+    "Share type %s is not valid for %s" : "%s の共有方法は、%s には適用できません。",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s の権限設定に失敗しました。%s に許可されている権限を越えています。",
+    "Setting permissions for %s failed, because the item was not found" : "%s の権限設定に失敗しました。アイテムが存在しません。",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "有効期限を設定できません。共有開始から %s 以降に有効期限を設定することはできません。",
+    "Cannot set expiration date. Expiration date is in the past" : "有効期限を設定できません。有効期限が過去を示しています。",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "%s のバックエンドの共有には、OCP\\Share_Backend　インターフェースを実装しなければなりません。",
+    "Sharing backend %s not found" : "共有バックエンド %s が見つかりません",
+    "Sharing backend for %s not found" : "%s のための共有バックエンドが見つかりません",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s の共有に失敗しました。ユーザー %s が元々の共有者であるからです。",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s の共有に失敗しました。%s に付与されている許可を超えているからです。",
+    "Sharing %s failed, because resharing is not allowed" : "%s の共有に失敗しました。再共有が許されていないからです。",
+    "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\" が見つかりませんでした",
+    "seconds ago" : "数秒前",
+    "_%n minute ago_::_%n minutes ago_" : ["%n 分前"],
+    "_%n hour ago_::_%n hours ago_" : ["%n 時間前"],
+    "today" : "今日",
+    "yesterday" : "1日前",
+    "_%n day go_::_%n days ago_" : ["%n日前"],
+    "last month" : "1ヶ月前",
+    "_%n month ago_::_%n months ago_" : ["%nヶ月前"],
+    "last year" : "1年前",
+    "years ago" : "年前",
+    "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" : "有効なパスワードを指定する必要があります",
+    "The username is already being used" : "ユーザー名はすでに使われています",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "データベースドライバー (sqlite, mysql, postgresql) がインストールされていません。",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "多くの場合、パーミッションは %s Webサーバーにルートディレクトリ %s への書き込み権限を与えることで解決できます。",
+    "Cannot write into \"config\" directory" : "\"config\" ディレクトリに書き込みができません",
+    "Cannot write into \"apps\" directory" : "\"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." : "多くの場合、これは %s Webサーバーにappsディレクトリ %s への書き込み権限を与えるか、設定ファイルでアプリストアを無効化することで解決できます。",
+    "Cannot create \"data\" directory (%s)" : "\"data\" ディレクトリ (%s) を作成できません",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "多くの場合、これは<a href=\"%s\" target=\"_blank\">Webサーバーにルートディレクトリへの書き込み権限を与える</a>ことで解決できます。",
+    "Setting locale to %s failed" : "ロケールを %s に設定できませんでした",
+    "Please install one of these locales on your system and restart your webserver." : "これらのロケールのうちいずれかをシステムにインストールし、Webサーバーを再起動してください。",
+    "Please ask your server administrator to install the module." : "サーバー管理者にモジュールのインストールを依頼してください。",
+    "PHP module %s not installed." : "PHP のモジュール %s がインストールされていません。",
+    "PHP %s or higher is required." : "PHP %s 以上が必要です。",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "PHPを最新バージョンに更新するようサーバー管理者に依頼してください。現在のPHPのバージョンは、ownCloudおよびPHPコミュニティでサポートされていません。",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHPセーフモードは有効です。ownCloudを適切に動作させるには無効化する必要があります。",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHPセーフモードは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "マジッククォートは有効です。ownCloudを適切に動作させるには無効にする必要があります。",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "マジッククォートは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？",
+    "Please ask your server administrator to restart the web server." : "サーバー管理者にWEBサーバーを再起動するよう依頼してください。",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 が必要です",
+    "Please upgrade your database version" : "新しいバージョンのデータベースにアップグレードしてください",
+    "Error occurred while checking PostgreSQL version" : "PostgreSQL のバージョンチェック中にエラーが発生しました",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "PostgreSQL >= 9 がインストールされているかどうか確認してください。もしくは、ログからエラーに関する詳細な情報を確認してください。",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "ディレクトリが他のユーザーから見えないように、パーミッションを 0770 に変更してください。",
+    "Data directory (%s) is readable by other users" : "データディレクトリ (%s) は他のユーザーも閲覧することができます",
+    "Data directory (%s) is invalid" : "データディレクトリ (%s) は無効です",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "データディレクトリに \".ocdata\" ファイルが含まれていることを確認してください。",
+    "Could not obtain lock type %d on \"%s\"." : "\"%s\" で %d タイプのロックを取得できませんでした。"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/ja.php b/lib/l10n/ja.php
deleted file mode 100644
index ca54f105377..00000000000
--- a/lib/l10n/ja.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "\"config\"ディレクトリに書き込めません！",
-"This can usually be fixed by giving the webserver write access to the config directory" => "多くの場合、これはWebサーバーにconfigディレクトリへの書き込み権限を与えることで解決できます。",
-"See %s" => "%s を閲覧",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "多くの場合、これは %s Webサーバーにconfigディレクトリ %s への書き込み権限を与えることで解決できます。",
-"Sample configuration detected" => "サンプル設定が見つかりました。",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "サンプル設定がコピーされてそのままです。このままではインストールが失敗し、サポート対象外になります。config.phpを変更する前にドキュメントを確認してください。",
-"Help" => "ヘルプ",
-"Personal" => "個人",
-"Settings" => "設定",
-"Users" => "ユーザー",
-"Admin" => "管理",
-"Recommended" => "推奨",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "アプリ \\\"%s\\\" をインストールできません。現在のownCloudのバージョンと互換性がありません。",
-"No app name specified" => "アプリ名が未指定",
-"Unknown filetype" => "不明なファイルタイプ",
-"Invalid image" => "無効な画像",
-"web services under your control" => "あなたの管理下のウェブサービス",
-"App directory already exists" => "アプリディレクトリはすでに存在します",
-"Can't create app folder. Please fix permissions. %s" => "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
-"No source specified when installing app" => "アプリインストール時のソースが未指定",
-"No href specified when installing app from http" => "アプリインストール時のhttpの URL が未指定",
-"No path specified when installing app from local file" => "アプリインストール時のローカルファイルのパスが未指定",
-"Archives of type %s are not supported" => "\"%s\"タイプのアーカイブ形式は未サポート",
-"Failed to open archive when installing app" => "アプリをインストール中にアーカイブファイルを開けませんでした。",
-"App does not provide an info.xml file" => "アプリにinfo.xmlファイルが入っていません",
-"App can't be installed because of not allowed code in the App" => "アプリで許可されないコードが入っているのが原因でアプリがインストールできません",
-"App can't be installed because it is not compatible with this version of ownCloud" => "アプリは、このバージョンのownCloudと互換性がないためインストールできません。",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "非shippedアプリには許可されない<shipped>true</shipped>タグが含まれているためにアプリをインストールできません。",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/versionのバージョンがアプリストアのバージョンと合っていないため、アプリはインストールされません",
-"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 ではデータベース名にドットを利用できないかもしれません。",
-"MS SQL username and/or password not valid: %s" => "MS SQL Serverのユーザー名/パスワードが正しくありません: %s",
-"You need to enter either an existing account or the administrator." => "既存のアカウントもしくは管理者のどちらかを入力する必要があります。",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB のユーザー名及び/またはパスワードが無効",
-"DB Error: \"%s\"" => "DBエラー: \"%s\"",
-"Offending command was: \"%s\"" => "違反コマンド: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB のユーザー '%s'@'localhost' はすでに存在します。",
-"Drop this user from MySQL/MariaDB" => "MySQL/MariaDB からこのユーザーを削除",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB のユーザー '%s'@'%%' はすでに存在します",
-"Drop this user from MySQL/MariaDB." => "MySQL/MariaDB からこのユーザーを削除。",
-"Oracle connection could not be established" => "Oracleへの接続が確立できませんでした。",
-"Oracle username and/or password not valid" => "Oracleのユーザー名もしくはパスワードは有効ではありません",
-"Offending command was: \"%s\", name: %s, password: %s" => "違反コマンド: \"%s\"、名前: %s、パスワード: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQLのユーザー名もしくはパスワードは有効ではありません",
-"Set an admin username." => "管理者のユーザー名を設定",
-"Set an admin password." => "管理者のパスワードを設定。",
-"Can't create or write into the data directory %s" => "%s データディレクトリに作成、書き込みができません",
-"%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 を共有することを許可されていません。",
-"Sharing %s failed, because the user %s is the item owner" => "%s の共有に失敗しました。ユーザー %s がアイテム所有者です。",
-"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 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" => "公開用リンクの作成にはパスワードの設定が必要です",
-"Sharing %s failed, because sharing with links is not allowed" => "%s の共有に失敗しました。リンクでの共有は許可されていません。",
-"Share type %s is not valid for %s" => "%s の共有方法は、%s には適用できません。",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s の権限設定に失敗しました。%s に許可されている権限を越えています。",
-"Setting permissions for %s failed, because the item was not found" => "%s の権限設定に失敗しました。アイテムが存在しません。",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "有効期限を設定できません。共有開始から %s 以降に有効期限を設定することはできません。",
-"Cannot set expiration date. Expiration date is in the past" => "有効期限を設定できません。有効期限が過去を示しています。",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "%s のバックエンドの共有には、OCP\\Share_Backend　インターフェースを実装しなければなりません。",
-"Sharing backend %s not found" => "共有バックエンド %s が見つかりません",
-"Sharing backend for %s not found" => "%s のための共有バックエンドが見つかりません",
-"Sharing %s failed, because the user %s is the original sharer" => "%s の共有に失敗しました。ユーザー %s が元々の共有者であるからです。",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s の共有に失敗しました。%s に付与されている許可を超えているからです。",
-"Sharing %s failed, because resharing is not allowed" => "%s の共有に失敗しました。再共有が許されていないからです。",
-"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\" が見つかりませんでした",
-"seconds ago" => "数秒前",
-"_%n minute ago_::_%n minutes ago_" => array("%n 分前"),
-"_%n hour ago_::_%n hours ago_" => array("%n 時間前"),
-"today" => "今日",
-"yesterday" => "1日前",
-"_%n day go_::_%n days ago_" => array("%n日前"),
-"last month" => "1ヶ月前",
-"_%n month ago_::_%n months ago_" => array("%nヶ月前"),
-"last year" => "1年前",
-"years ago" => "年前",
-"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" => "有効なパスワードを指定する必要があります",
-"The username is already being used" => "ユーザー名はすでに使われています",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "データベースドライバー (sqlite, mysql, postgresql) がインストールされていません。",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "多くの場合、パーミッションは %s Webサーバーにルートディレクトリ %s への書き込み権限を与えることで解決できます。",
-"Cannot write into \"config\" directory" => "\"config\" ディレクトリに書き込みができません",
-"Cannot write into \"apps\" directory" => "\"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." => "多くの場合、これは %s Webサーバーにappsディレクトリ %s への書き込み権限を与えるか、設定ファイルでアプリストアを無効化することで解決できます。",
-"Cannot create \"data\" directory (%s)" => "\"data\" ディレクトリ (%s) を作成できません",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "多くの場合、これは<a href=\"%s\" target=\"_blank\">Webサーバーにルートディレクトリへの書き込み権限を与える</a>ことで解決できます。",
-"Setting locale to %s failed" => "ロケールを %s に設定できませんでした",
-"Please install one of these locales on your system and restart your webserver." => "これらのロケールのうちいずれかをシステムにインストールし、Webサーバーを再起動してください。",
-"Please ask your server administrator to install the module." => "サーバー管理者にモジュールのインストールを依頼してください。",
-"PHP module %s not installed." => "PHP のモジュール %s がインストールされていません。",
-"PHP %s or higher is required." => "PHP %s 以上が必要です。",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "PHPを最新バージョンに更新するようサーバー管理者に依頼してください。現在のPHPのバージョンは、ownCloudおよびPHPコミュニティでサポートされていません。",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHPセーフモードは有効です。ownCloudを適切に動作させるには無効化する必要があります。",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHPセーフモードは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "マジッククォートは有効です。ownCloudを適切に動作させるには無効にする必要があります。",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "マジッククォートは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？",
-"Please ask your server administrator to restart the web server." => "サーバー管理者にWebサーバーを再起動するよう依頼してください。",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 が必要です",
-"Please upgrade your database version" => "新しいバージョンのデータベースにアップグレードしてください",
-"Error occurred while checking PostgreSQL version" => "PostgreSQL のバージョンチェック中にエラーが発生しました",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "PostgreSQL >= 9 がインストールされているかどうか確認してください。もしくは、ログからエラーに関する詳細な情報を確認してください。",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "ディレクトリが他のユーザーから見えないように、パーミッションを 0770 に変更してください。",
-"Data directory (%s) is readable by other users" => "データディレクトリ (%s) は他のユーザーも閲覧することができます",
-"Data directory (%s) is invalid" => "データディレクトリ (%s) は無効です",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "データディレクトリに \".ocdata\" ファイルが含まれていることを確認してください。",
-"Could not obtain lock type %d on \"%s\"." => "\"%s\" で %d タイプのロックを取得できませんでした。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/jv.js b/lib/l10n/jv.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/jv.js
@@ -0,0 +1,9 @@
+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/jv.json b/lib/l10n/jv.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/jv.json
@@ -0,0 +1,7 @@
+{ "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/jv.php b/lib/l10n/jv.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/jv.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ka_GE.js b/lib/l10n/ka_GE.js
new file mode 100644
index 00000000000..756f13f67b9
--- /dev/null
+++ b/lib/l10n/ka_GE.js
@@ -0,0 +1,39 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "დახმარება",
+    "Personal" : "პირადი",
+    "Settings" : "პარამეტრები",
+    "Users" : "მომხმარებელი",
+    "Admin" : "ადმინისტრატორი",
+    "web services under your control" : "web services under your control",
+    "Application is not enabled" : "აპლიკაცია არ არის აქტიური",
+    "Authentication error" : "ავთენტიფიკაციის შეცდომა",
+    "Token expired. Please reload page." : "Token–ს ვადა გაუვიდა. გთხოვთ განაახლოთ გვერდი.",
+    "%s enter the database username." : "%s შეიყვანეთ ბაზის იუზერნეიმი.",
+    "%s enter the database name." : "%s შეიყვანეთ ბაზის სახელი.",
+    "%s you may not use dots in the database name" : "%s არ მიუთითოთ წერტილი ბაზის სახელში",
+    "MS SQL username and/or password not valid: %s" : "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s",
+    "You need to enter either an existing account or the administrator." : "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი.",
+    "DB Error: \"%s\"" : "DB შეცდომა: \"%s\"",
+    "Offending command was: \"%s\"" : "Offending ბრძანება იყო: \"%s\"",
+    "Oracle username and/or password not valid" : "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
+    "Set an admin username." : "დააყენეთ ადმინისტრატორის სახელი.",
+    "Set an admin password." : "დააყენეთ ადმინისტრატორის პაროლი.",
+    "Could not find category \"%s\"" : "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა",
+    "seconds ago" : "წამის წინ",
+    "_%n minute ago_::_%n minutes ago_" : [""],
+    "_%n hour ago_::_%n hours ago_" : [""],
+    "today" : "დღეს",
+    "yesterday" : "გუშინ",
+    "_%n day go_::_%n days ago_" : [""],
+    "last month" : "გასულ თვეში",
+    "_%n month ago_::_%n months ago_" : [""],
+    "last year" : "ბოლო წელს",
+    "years ago" : "წლის წინ",
+    "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
+    "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/ka_GE.json b/lib/l10n/ka_GE.json
new file mode 100644
index 00000000000..a9e86ecb1ab
--- /dev/null
+++ b/lib/l10n/ka_GE.json
@@ -0,0 +1,37 @@
+{ "translations": {
+    "Help" : "დახმარება",
+    "Personal" : "პირადი",
+    "Settings" : "პარამეტრები",
+    "Users" : "მომხმარებელი",
+    "Admin" : "ადმინისტრატორი",
+    "web services under your control" : "web services under your control",
+    "Application is not enabled" : "აპლიკაცია არ არის აქტიური",
+    "Authentication error" : "ავთენტიფიკაციის შეცდომა",
+    "Token expired. Please reload page." : "Token–ს ვადა გაუვიდა. გთხოვთ განაახლოთ გვერდი.",
+    "%s enter the database username." : "%s შეიყვანეთ ბაზის იუზერნეიმი.",
+    "%s enter the database name." : "%s შეიყვანეთ ბაზის სახელი.",
+    "%s you may not use dots in the database name" : "%s არ მიუთითოთ წერტილი ბაზის სახელში",
+    "MS SQL username and/or password not valid: %s" : "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s",
+    "You need to enter either an existing account or the administrator." : "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი.",
+    "DB Error: \"%s\"" : "DB შეცდომა: \"%s\"",
+    "Offending command was: \"%s\"" : "Offending ბრძანება იყო: \"%s\"",
+    "Oracle username and/or password not valid" : "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
+    "Set an admin username." : "დააყენეთ ადმინისტრატორის სახელი.",
+    "Set an admin password." : "დააყენეთ ადმინისტრატორის პაროლი.",
+    "Could not find category \"%s\"" : "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა",
+    "seconds ago" : "წამის წინ",
+    "_%n minute ago_::_%n minutes ago_" : [""],
+    "_%n hour ago_::_%n hours ago_" : [""],
+    "today" : "დღეს",
+    "yesterday" : "გუშინ",
+    "_%n day go_::_%n days ago_" : [""],
+    "last month" : "გასულ თვეში",
+    "_%n month ago_::_%n months ago_" : [""],
+    "last year" : "ბოლო წელს",
+    "years ago" : "წლის წინ",
+    "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
+    "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
deleted file mode 100644
index c5f71357219..00000000000
--- a/lib/l10n/ka_GE.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "დახმარება",
-"Personal" => "პირადი",
-"Settings" => "პარამეტრები",
-"Users" => "მომხმარებელი",
-"Admin" => "ადმინისტრატორი",
-"web services under your control" => "web services under your control",
-"Application is not enabled" => "აპლიკაცია არ არის აქტიური",
-"Authentication error" => "ავთენტიფიკაციის შეცდომა",
-"Token expired. Please reload page." => "Token–ს ვადა გაუვიდა. გთხოვთ განაახლოთ გვერდი.",
-"%s enter the database username." => "%s შეიყვანეთ ბაზის იუზერნეიმი.",
-"%s enter the database name." => "%s შეიყვანეთ ბაზის სახელი.",
-"%s you may not use dots in the database name" => "%s არ მიუთითოთ წერტილი ბაზის სახელში",
-"MS SQL username and/or password not valid: %s" => "MS SQL მომხმარებელი და/ან პაროლი არ არის მართებული: %s",
-"You need to enter either an existing account or the administrator." => "თქვენ უნდა შეიყვანოთ არსებული მომხმარებელის სახელი ან ადმინისტრატორი.",
-"DB Error: \"%s\"" => "DB შეცდომა: \"%s\"",
-"Offending command was: \"%s\"" => "Offending ბრძანება იყო: \"%s\"",
-"Oracle username and/or password not valid" => "Oracle იუზერნეიმი და/ან პაროლი არ არის სწორი",
-"Offending command was: \"%s\", name: %s, password: %s" => "Offending ბრძანება იყო: \"%s\", სახელი: %s, პაროლი: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL იუზერნეიმი და/ან პაროლი არ არის სწორი",
-"Set an admin username." => "დააყენეთ ადმინისტრატორის სახელი.",
-"Set an admin password." => "დააყენეთ ადმინისტრატორის პაროლი.",
-"Could not find category \"%s\"" => "\"%s\" კატეგორიის მოძებნა ვერ მოხერხდა",
-"seconds ago" => "წამის წინ",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"today" => "დღეს",
-"yesterday" => "გუშინ",
-"_%n day go_::_%n days ago_" => array(""),
-"last month" => "გასულ თვეში",
-"_%n month ago_::_%n months ago_" => array(""),
-"last year" => "ბოლო წელს",
-"years ago" => "წლის წინ",
-"A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
-"A valid password must be provided" => "უნდა მიუთითოთ არსებული პაროლი"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/km.js b/lib/l10n/km.js
new file mode 100644
index 00000000000..cfa1ea89ebb
--- /dev/null
+++ b/lib/l10n/km.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "ជំនួយ",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Settings" : "ការកំណត់",
+    "Users" : "អ្នកប្រើ",
+    "Admin" : "អ្នក​គ្រប់​គ្រង",
+    "No app name specified" : "មិន​បាន​បញ្ជាក់​ឈ្មោះ​កម្មវិធី",
+    "Unknown filetype" : "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
+    "Invalid image" : "រូបភាព​មិន​ត្រឹម​ត្រូវ",
+    "web services under your control" : "សេវាកម្ម​វេប​ក្រោម​ការ​ការ​បញ្ជា​របស់​អ្នក",
+    "App directory already exists" : "មាន​ទីតាំង​ផ្ទុក​កម្មវិធី​រួច​ហើយ",
+    "Can't create app folder. Please fix permissions. %s" : "មិន​អាច​បង្កើត​ថត​កម្មវិធី។ សូម​កែ​សម្រួល​សិទ្ធិ។ %s",
+    "Application is not enabled" : "មិន​បាន​បើក​កម្មវិធី",
+    "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
+    "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 អ្នក​អាច​មិន​ប្រើ​សញ្ញា​ចុច​នៅ​ក្នុង​ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
+    "DB Error: \"%s\"" : "កំហុស DB៖ \"%s\"",
+    "Oracle connection could not be established" : "មិន​អាច​បង្កើត​ការ​តភ្ជាប់ Oracle",
+    "PostgreSQL username and/or password not valid" : "ឈ្មោះ​អ្នក​ប្រើ និង/ឬ ពាក្យ​សម្ងាត់ PostgreSQL គឺ​មិន​ត្រូវ​ទេ",
+    "Set an admin username." : "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។",
+    "Set an admin password." : "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។",
+    "Could not find category \"%s\"" : "រក​មិន​ឃើញ​ចំណាត់​ក្រុម \"%s\"",
+    "seconds ago" : "វិនាទី​មុន",
+    "_%n minute ago_::_%n minutes ago_" : ["%n នាទី​មុន"],
+    "_%n hour ago_::_%n hours ago_" : ["%n ម៉ោង​មុន"],
+    "today" : "ថ្ងៃនេះ",
+    "yesterday" : "ម្សិលមិញ",
+    "_%n day go_::_%n days ago_" : ["%n ថ្ងៃ​មុន"],
+    "last month" : "ខែមុន",
+    "_%n month ago_::_%n months ago_" : ["%n ខែ​មុន"],
+    "last year" : "ឆ្នាំ​មុន",
+    "years ago" : "ឆ្នាំ​មុន",
+    "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/km.json b/lib/l10n/km.json
new file mode 100644
index 00000000000..32b6173ba0d
--- /dev/null
+++ b/lib/l10n/km.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Help" : "ជំនួយ",
+    "Personal" : "ផ្ទាល់​ខ្លួន",
+    "Settings" : "ការកំណត់",
+    "Users" : "អ្នកប្រើ",
+    "Admin" : "អ្នក​គ្រប់​គ្រង",
+    "No app name specified" : "មិន​បាន​បញ្ជាក់​ឈ្មោះ​កម្មវិធី",
+    "Unknown filetype" : "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
+    "Invalid image" : "រូបភាព​មិន​ត្រឹម​ត្រូវ",
+    "web services under your control" : "សេវាកម្ម​វេប​ក្រោម​ការ​ការ​បញ្ជា​របស់​អ្នក",
+    "App directory already exists" : "មាន​ទីតាំង​ផ្ទុក​កម្មវិធី​រួច​ហើយ",
+    "Can't create app folder. Please fix permissions. %s" : "មិន​អាច​បង្កើត​ថត​កម្មវិធី។ សូម​កែ​សម្រួល​សិទ្ធិ។ %s",
+    "Application is not enabled" : "មិន​បាន​បើក​កម្មវិធី",
+    "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
+    "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 អ្នក​អាច​មិន​ប្រើ​សញ្ញា​ចុច​នៅ​ក្នុង​ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
+    "DB Error: \"%s\"" : "កំហុស DB៖ \"%s\"",
+    "Oracle connection could not be established" : "មិន​អាច​បង្កើត​ការ​តភ្ជាប់ Oracle",
+    "PostgreSQL username and/or password not valid" : "ឈ្មោះ​អ្នក​ប្រើ និង/ឬ ពាក្យ​សម្ងាត់ PostgreSQL គឺ​មិន​ត្រូវ​ទេ",
+    "Set an admin username." : "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។",
+    "Set an admin password." : "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។",
+    "Could not find category \"%s\"" : "រក​មិន​ឃើញ​ចំណាត់​ក្រុម \"%s\"",
+    "seconds ago" : "វិនាទី​មុន",
+    "_%n minute ago_::_%n minutes ago_" : ["%n នាទី​មុន"],
+    "_%n hour ago_::_%n hours ago_" : ["%n ម៉ោង​មុន"],
+    "today" : "ថ្ងៃនេះ",
+    "yesterday" : "ម្សិលមិញ",
+    "_%n day go_::_%n days ago_" : ["%n ថ្ងៃ​មុន"],
+    "last month" : "ខែមុន",
+    "_%n month ago_::_%n months ago_" : ["%n ខែ​មុន"],
+    "last year" : "ឆ្នាំ​មុន",
+    "years ago" : "ឆ្នាំ​មុន",
+    "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/km.php b/lib/l10n/km.php
deleted file mode 100644
index 2170b0c9313..00000000000
--- a/lib/l10n/km.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "ជំនួយ",
-"Personal" => "ផ្ទាល់​ខ្លួន",
-"Settings" => "ការកំណត់",
-"Users" => "អ្នកប្រើ",
-"Admin" => "អ្នក​គ្រប់​គ្រង",
-"No app name specified" => "មិន​បាន​បញ្ជាក់​ឈ្មោះ​កម្មវិធី",
-"Unknown filetype" => "មិន​ស្គាល់​ប្រភេទ​ឯកសារ",
-"Invalid image" => "រូបភាព​មិន​ត្រឹម​ត្រូវ",
-"web services under your control" => "សេវាកម្ម​វេប​ក្រោម​ការ​ការ​បញ្ជា​របស់​អ្នក",
-"App directory already exists" => "មាន​ទីតាំង​ផ្ទុក​កម្មវិធី​រួច​ហើយ",
-"Can't create app folder. Please fix permissions. %s" => "មិន​អាច​បង្កើត​ថត​កម្មវិធី។ សូម​កែ​សម្រួល​សិទ្ធិ។ %s",
-"Application is not enabled" => "មិន​បាន​បើក​កម្មវិធី",
-"Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
-"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 អ្នក​អាច​មិន​ប្រើ​សញ្ញា​ចុច​នៅ​ក្នុង​ឈ្មោះ​មូលដ្ឋាន​ទិន្នន័យ",
-"DB Error: \"%s\"" => "កំហុស DB៖ \"%s\"",
-"Oracle connection could not be established" => "មិន​អាច​បង្កើត​ការ​តភ្ជាប់ Oracle",
-"PostgreSQL username and/or password not valid" => "ឈ្មោះ​អ្នក​ប្រើ និង/ឬ ពាក្យ​សម្ងាត់ PostgreSQL គឺ​មិន​ត្រូវ​ទេ",
-"Set an admin username." => "កំណត់​ឈ្មោះ​អ្នក​គ្រប់គ្រង។",
-"Set an admin password." => "កំណត់​ពាក្យ​សម្ងាត់​អ្នក​គ្រប់គ្រង។",
-"Could not find category \"%s\"" => "រក​មិន​ឃើញ​ចំណាត់​ក្រុម \"%s\"",
-"seconds ago" => "វិនាទី​មុន",
-"_%n minute ago_::_%n minutes ago_" => array("%n នាទី​មុន"),
-"_%n hour ago_::_%n hours ago_" => array("%n ម៉ោង​មុន"),
-"today" => "ថ្ងៃនេះ",
-"yesterday" => "ម្សិលមិញ",
-"_%n day go_::_%n days ago_" => array("%n ថ្ងៃ​មុន"),
-"last month" => "ខែមុន",
-"_%n month ago_::_%n months ago_" => array("%n ខែ​មុន"),
-"last year" => "ឆ្នាំ​មុន",
-"years ago" => "ឆ្នាំ​មុន",
-"A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
-"A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/kn.js b/lib/l10n/kn.js
new file mode 100644
index 00000000000..0f4a002019e
--- /dev/null
+++ b/lib/l10n/kn.js
@@ -0,0 +1,9 @@
+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=1; plural=0;");
diff --git a/lib/l10n/kn.json b/lib/l10n/kn.json
new file mode 100644
index 00000000000..4a03cf5047e
--- /dev/null
+++ b/lib/l10n/kn.json
@@ -0,0 +1,7 @@
+{ "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=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/kn.php b/lib/l10n/kn.php
deleted file mode 100644
index e7b09649a24..00000000000
--- a/lib/l10n/kn.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"_%n day go_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ko.js b/lib/l10n/ko.js
new file mode 100644
index 00000000000..22f8cb191ae
--- /dev/null
+++ b/lib/l10n/ko.js
@@ -0,0 +1,69 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "도움말",
+    "Personal" : "개인",
+    "Settings" : "설정",
+    "Users" : "사용자",
+    "Admin" : "관리자",
+    "No app name specified" : "앱 이름이 지정되지 않았습니다.",
+    "Unknown filetype" : "알 수 없는 파일 형식",
+    "Invalid image" : "잘못된 그림",
+    "web services under your control" : "내가 관리하는 웹 서비스",
+    "App directory already exists" : "앱 디렉터리가 이미 존재합니다.",
+    "Can't create app folder. Please fix permissions. %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" : "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
+    "Archives of type %s are not supported" : "%s 타입 아카이브는 지원되지 않습니다.",
+    "Failed to open archive when installing app" : "앱을 설치할 때 아카이브를 열지 못했습니다.",
+    "App does not provide an info.xml file" : "앱에서 info.xml 파일이 제공되지 않았습니다.",
+    "App can't be installed because of not allowed code in the App" : "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "출시되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다.",
+    "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 데이터베이스 이름에는 마침표를 사용할 수 없습니다",
+    "MS SQL username and/or password not valid: %s" : "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s",
+    "You need to enter either an existing account or the administrator." : "기존 계정이나 administrator(관리자)를 입력해야 합니다.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB 사용자 명 혹은 비밀번호가 일치하지 않습니다",
+    "DB Error: \"%s\"" : "DB 오류: \"%s\"",
+    "Offending command was: \"%s\"" : "잘못된 명령: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB '%s'@'localhost' 사용자가 이미 존재합니다",
+    "Drop this user from MySQL/MariaDB" : "MySQL/MariaDB에서 이 사용자 제거하기",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB '%s'@'%%' 사용자가 이미 존재합니다",
+    "Drop this user from MySQL/MariaDB." : "MySQL/MariaDB에서 이 사용자 제거하기",
+    "Oracle connection could not be established" : "Oracle 연결을 수립할 수 없습니다.",
+    "Oracle username and/or password not valid" : "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "잘못된 명령: \"%s\", 이름: %s, 암호: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL의 사용자 이름 또는 암호가 잘못되었습니다",
+    "Set an admin username." : "관리자의 사용자 이름을 설정합니다.",
+    "Set an admin password." : "관리자의 암호를 설정합니다.",
+    "%s shared »%s« with you" : "%s 님이 %s을(를) 공유하였습니다",
+    "Could not find category \"%s\"" : "분류 \"%s\"을(를) 찾을 수 없습니다.",
+    "seconds ago" : "초 전",
+    "_%n minute ago_::_%n minutes ago_" : ["%n분 전 "],
+    "_%n hour ago_::_%n hours ago_" : ["%n시간 전 "],
+    "today" : "오늘",
+    "yesterday" : "어제",
+    "_%n day go_::_%n days ago_" : ["%n일 전 "],
+    "last month" : "지난 달",
+    "_%n month ago_::_%n months ago_" : ["%n달 전 "],
+    "last year" : "작년",
+    "years ago" : "년 전",
+    "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" : "올바른 암호를 입력해야 함",
+    "The username is already being used" : "이 사용자명은 현재 사용중입니다",
+    "PHP module %s not installed." : "%s PHP 모듈이 설치되지 않았습니다.",
+    "PHP %s or higher is required." : "%s 버전의 PHP 혹은 높은 버전을 필요로 합니다.",
+    "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/ko.json b/lib/l10n/ko.json
new file mode 100644
index 00000000000..4743476540c
--- /dev/null
+++ b/lib/l10n/ko.json
@@ -0,0 +1,67 @@
+{ "translations": {
+    "Help" : "도움말",
+    "Personal" : "개인",
+    "Settings" : "설정",
+    "Users" : "사용자",
+    "Admin" : "관리자",
+    "No app name specified" : "앱 이름이 지정되지 않았습니다.",
+    "Unknown filetype" : "알 수 없는 파일 형식",
+    "Invalid image" : "잘못된 그림",
+    "web services under your control" : "내가 관리하는 웹 서비스",
+    "App directory already exists" : "앱 디렉터리가 이미 존재합니다.",
+    "Can't create app folder. Please fix permissions. %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" : "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
+    "Archives of type %s are not supported" : "%s 타입 아카이브는 지원되지 않습니다.",
+    "Failed to open archive when installing app" : "앱을 설치할 때 아카이브를 열지 못했습니다.",
+    "App does not provide an info.xml file" : "앱에서 info.xml 파일이 제공되지 않았습니다.",
+    "App can't be installed because of not allowed code in the App" : "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "출시되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다.",
+    "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 데이터베이스 이름에는 마침표를 사용할 수 없습니다",
+    "MS SQL username and/or password not valid: %s" : "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s",
+    "You need to enter either an existing account or the administrator." : "기존 계정이나 administrator(관리자)를 입력해야 합니다.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB 사용자 명 혹은 비밀번호가 일치하지 않습니다",
+    "DB Error: \"%s\"" : "DB 오류: \"%s\"",
+    "Offending command was: \"%s\"" : "잘못된 명령: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB '%s'@'localhost' 사용자가 이미 존재합니다",
+    "Drop this user from MySQL/MariaDB" : "MySQL/MariaDB에서 이 사용자 제거하기",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB '%s'@'%%' 사용자가 이미 존재합니다",
+    "Drop this user from MySQL/MariaDB." : "MySQL/MariaDB에서 이 사용자 제거하기",
+    "Oracle connection could not be established" : "Oracle 연결을 수립할 수 없습니다.",
+    "Oracle username and/or password not valid" : "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
+    "Offending command was: \"%s\", name: %s, password: %s" : "잘못된 명령: \"%s\", 이름: %s, 암호: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL의 사용자 이름 또는 암호가 잘못되었습니다",
+    "Set an admin username." : "관리자의 사용자 이름을 설정합니다.",
+    "Set an admin password." : "관리자의 암호를 설정합니다.",
+    "%s shared »%s« with you" : "%s 님이 %s을(를) 공유하였습니다",
+    "Could not find category \"%s\"" : "분류 \"%s\"을(를) 찾을 수 없습니다.",
+    "seconds ago" : "초 전",
+    "_%n minute ago_::_%n minutes ago_" : ["%n분 전 "],
+    "_%n hour ago_::_%n hours ago_" : ["%n시간 전 "],
+    "today" : "오늘",
+    "yesterday" : "어제",
+    "_%n day go_::_%n days ago_" : ["%n일 전 "],
+    "last month" : "지난 달",
+    "_%n month ago_::_%n months ago_" : ["%n달 전 "],
+    "last year" : "작년",
+    "years ago" : "년 전",
+    "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" : "올바른 암호를 입력해야 함",
+    "The username is already being used" : "이 사용자명은 현재 사용중입니다",
+    "PHP module %s not installed." : "%s PHP 모듈이 설치되지 않았습니다.",
+    "PHP %s or higher is required." : "%s 버전의 PHP 혹은 높은 버전을 필요로 합니다.",
+    "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/lib/l10n/ko.php b/lib/l10n/ko.php
deleted file mode 100644
index 6c45d136861..00000000000
--- a/lib/l10n/ko.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "도움말",
-"Personal" => "개인",
-"Settings" => "설정",
-"Users" => "사용자",
-"Admin" => "관리자",
-"No app name specified" => "앱 이름이 지정되지 않았습니다.",
-"Unknown filetype" => "알 수 없는 파일 형식",
-"Invalid image" => "잘못된 그림",
-"web services under your control" => "내가 관리하는 웹 서비스",
-"App directory already exists" => "앱 디렉터리가 이미 존재합니다.",
-"Can't create app folder. Please fix permissions. %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" => "로컬 파일에서 앱을 설치할 때 경로가 지정되지 않았습니다.",
-"Archives of type %s are not supported" => "%s 타입 아카이브는 지원되지 않습니다.",
-"Failed to open archive when installing app" => "앱을 설치할 때 아카이브를 열지 못했습니다.",
-"App does not provide an info.xml file" => "앱에서 info.xml 파일이 제공되지 않았습니다.",
-"App can't be installed because of not allowed code in the App" => "앱에 허용되지 않는 코드가 있어서 앱을 설치할 수 없습니다.",
-"App can't be installed because it is not compatible with this version of ownCloud" => "현재 ownCloud 버전과 호환되지 않기 때문에 앱을 설치할 수 없습니다.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "출시되지 않은 앱에 허용되지 않는 <shipped>true</shipped> 태그를 포함하고 있기 때문에 앱을 설치할 수 없습니다.",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "info.xml/version에 포함된 버전과 앱 스토어에 보고된 버전이 같지 않아서 앱을 설치할 수 없습니다.",
-"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 데이터베이스 이름에는 마침표를 사용할 수 없습니다",
-"MS SQL username and/or password not valid: %s" => "MS SQL 사용자 이름이나 암호가 잘못되었습니다: %s",
-"You need to enter either an existing account or the administrator." => "기존 계정이나 administrator(관리자)를 입력해야 합니다.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB 사용자 명 혹은 비밀번호가 일치하지 않습니다",
-"DB Error: \"%s\"" => "DB 오류: \"%s\"",
-"Offending command was: \"%s\"" => "잘못된 명령: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB '%s'@'localhost' 사용자가 이미 존재합니다",
-"Drop this user from MySQL/MariaDB" => "MySQL/MariaDB에서 이 사용자 제거하기",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB '%s'@'%%' 사용자가 이미 존재합니다",
-"Drop this user from MySQL/MariaDB." => "MySQL/MariaDB에서 이 사용자 제거하기",
-"Oracle connection could not be established" => "Oracle 연결을 수립할 수 없습니다.",
-"Oracle username and/or password not valid" => "Oracle 사용자 이름이나 암호가 잘못되었습니다.",
-"Offending command was: \"%s\", name: %s, password: %s" => "잘못된 명령: \"%s\", 이름: %s, 암호: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL의 사용자 이름 또는 암호가 잘못되었습니다",
-"Set an admin username." => "관리자의 사용자 이름을 설정합니다.",
-"Set an admin password." => "관리자의 암호를 설정합니다.",
-"%s shared »%s« with you" => "%s 님이 %s을(를) 공유하였습니다",
-"Could not find category \"%s\"" => "분류 \"%s\"을(를) 찾을 수 없습니다.",
-"seconds ago" => "초 전",
-"_%n minute ago_::_%n minutes ago_" => array("%n분 전 "),
-"_%n hour ago_::_%n hours ago_" => array("%n시간 전 "),
-"today" => "오늘",
-"yesterday" => "어제",
-"_%n day go_::_%n days ago_" => array("%n일 전 "),
-"last month" => "지난 달",
-"_%n month ago_::_%n months ago_" => array("%n달 전 "),
-"last year" => "작년",
-"years ago" => "년 전",
-"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" => "올바른 암호를 입력해야 함",
-"The username is already being used" => "이 사용자명은 현재 사용중입니다",
-"PHP module %s not installed." => "%s PHP 모듈이 설치되지 않았습니다.",
-"PHP %s or higher is required." => "%s 버전의 PHP 혹은 높은 버전을 필요로 합니다.",
-"PostgreSQL >= 9 required" => "PostgreSQL 9 혹은 이상 버전을 필요로합니다",
-"Please upgrade your database version" => "데이터베이스 버전을 업그레이드 하십시오",
-"Error occurred while checking PostgreSQL version" => "PostgreSQL 버전을 확인하던중 오류가 발생하였습니다"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/ku_IQ.js b/lib/l10n/ku_IQ.js
new file mode 100644
index 00000000000..11313e28323
--- /dev/null
+++ b/lib/l10n/ku_IQ.js
@@ -0,0 +1,14 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "یارمەتی",
+    "Settings" : "ده‌ستكاری",
+    "Users" : "به‌كارهێنه‌ر",
+    "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+    "web services under your control" : "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
+    "_%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/ku_IQ.json b/lib/l10n/ku_IQ.json
new file mode 100644
index 00000000000..6a40446ac9d
--- /dev/null
+++ b/lib/l10n/ku_IQ.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Help" : "یارمەتی",
+    "Settings" : "ده‌ستكاری",
+    "Users" : "به‌كارهێنه‌ر",
+    "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
+    "web services under your control" : "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
+    "_%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/ku_IQ.php b/lib/l10n/ku_IQ.php
deleted file mode 100644
index c99f9dd2a12..00000000000
--- a/lib/l10n/ku_IQ.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "یارمەتی",
-"Settings" => "ده‌ستكاری",
-"Users" => "به‌كارهێنه‌ر",
-"Admin" => "به‌ڕێوه‌به‌ری سه‌ره‌كی",
-"web services under your control" => "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/lb.js b/lib/l10n/lb.js
new file mode 100644
index 00000000000..4a8b8277bbc
--- /dev/null
+++ b/lib/l10n/lb.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Hëllef",
+    "Personal" : "Perséinlech",
+    "Settings" : "Astellungen",
+    "Users" : "Benotzer",
+    "Admin" : "Admin",
+    "Unknown filetype" : "Onbekannten Fichier Typ",
+    "Invalid image" : "Ongülteg d'Bild",
+    "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",
+    "seconds ago" : "Sekonnen hir",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n Minutten hir"],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "haut",
+    "yesterday" : "gëschter",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "Läschte Mount",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "Läscht Joer",
+    "years ago" : "Joren hier"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/lb.json b/lib/l10n/lb.json
new file mode 100644
index 00000000000..e205f5e2fc3
--- /dev/null
+++ b/lib/l10n/lb.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Help" : "Hëllef",
+    "Personal" : "Perséinlech",
+    "Settings" : "Astellungen",
+    "Users" : "Benotzer",
+    "Admin" : "Admin",
+    "Unknown filetype" : "Onbekannten Fichier Typ",
+    "Invalid image" : "Ongülteg d'Bild",
+    "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",
+    "seconds ago" : "Sekonnen hir",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n Minutten hir"],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "haut",
+    "yesterday" : "gëschter",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "Läschte Mount",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "Läscht Joer",
+    "years ago" : "Joren hier"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
deleted file mode 100644
index 6107d79a0d3..00000000000
--- a/lib/l10n/lb.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Hëllef",
-"Personal" => "Perséinlech",
-"Settings" => "Astellungen",
-"Users" => "Benotzer",
-"Admin" => "Admin",
-"Unknown filetype" => "Onbekannten Fichier Typ",
-"Invalid image" => "Ongülteg d'Bild",
-"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",
-"seconds ago" => "Sekonnen hir",
-"_%n minute ago_::_%n minutes ago_" => array("","%n Minutten hir"),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "haut",
-"yesterday" => "gëschter",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "Läschte Mount",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "Läscht Joer",
-"years ago" => "Joren hier"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/lt_LT.js b/lib/l10n/lt_LT.js
new file mode 100644
index 00000000000..999be472453
--- /dev/null
+++ b/lib/l10n/lt_LT.js
@@ -0,0 +1,56 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Pagalba",
+    "Personal" : "Asmeniniai",
+    "Settings" : "Nustatymai",
+    "Users" : "Vartotojai",
+    "Admin" : "Administravimas",
+    "No app name specified" : "Nenurodytas programos pavadinimas",
+    "Unknown filetype" : "Nežinomas failo tipas",
+    "Invalid image" : "Netinkamas paveikslėlis",
+    "web services under your control" : "jūsų valdomos web paslaugos",
+    "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ą",
+    "No href specified when installing app from http" : "Nenurodytas href diegiant programą iš http",
+    "No path specified when installing app from local file" : "Nenurodytas kelias diegiant programą iš vietinio failo",
+    "Archives of type %s are not supported" : "%s tipo archyvai nepalaikomi",
+    "Failed to open archive when installing app" : "Nepavyko atverti archyvo diegiant programą",
+    "App does not provide an info.xml file" : "Programa nepateikia info.xml failo",
+    "App can't be installed because of not allowed code in the App" : "Programa negali būti įdiegta, nes turi neleistiną kodą",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje",
+    "Application is not enabled" : "Programa neįjungta",
+    "Authentication error" : "Autentikacijos klaida",
+    "Token expired. Please reload page." : "Sesija baigėsi. Prašome perkrauti puslapį.",
+    "%s enter the database username." : "%s įrašykite duombazės naudotojo vardą.",
+    "%s enter the database name." : "%s įrašykite duombazės pavadinimą.",
+    "%s you may not use dots in the database name" : "%s negalite naudoti taškų duombazės pavadinime",
+    "MS SQL username and/or password not valid: %s" : "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s",
+    "You need to enter either an existing account or the administrator." : "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi.",
+    "DB Error: \"%s\"" : "DB klaida: \"%s\"",
+    "Offending command was: \"%s\"" : "Vykdyta komanda buvo: \"%s\"",
+    "Oracle connection could not be established" : "Nepavyko sukurti Oracle ryšio",
+    "Oracle username and/or password not valid" : "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Vykdyta komanda buvo: \"%s\", name: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis",
+    "Set an admin username." : "Nustatyti administratoriaus naudotojo vardą.",
+    "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“",
+    "seconds ago" : "prieš sekundę",
+    "_%n minute ago_::_%n minutes ago_" : ["prieš %n min.","Prieš % minutes","Prieš %n minučių"],
+    "_%n hour ago_::_%n hours ago_" : ["Prieš %n valandą","Prieš %n valandas","Prieš %n valandų"],
+    "today" : "šiandien",
+    "yesterday" : "vakar",
+    "_%n day go_::_%n days ago_" : ["Prieš %n dieną","Prieš %n dienas","Prieš %n dienų"],
+    "last month" : "praeitą mėnesį",
+    "_%n month ago_::_%n months ago_" : ["Prieš %n mėnesį","Prieš %n mėnesius","Prieš %n mėnesių"],
+    "last year" : "praeitais metais",
+    "years ago" : "prieš metus",
+    "A valid username must be provided" : "Vartotojo vardas turi būti tinkamas",
+    "A valid password must be provided" : "Slaptažodis turi būti tinkamas"
+},
+"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/lt_LT.json b/lib/l10n/lt_LT.json
new file mode 100644
index 00000000000..fb4908440fb
--- /dev/null
+++ b/lib/l10n/lt_LT.json
@@ -0,0 +1,54 @@
+{ "translations": {
+    "Help" : "Pagalba",
+    "Personal" : "Asmeniniai",
+    "Settings" : "Nustatymai",
+    "Users" : "Vartotojai",
+    "Admin" : "Administravimas",
+    "No app name specified" : "Nenurodytas programos pavadinimas",
+    "Unknown filetype" : "Nežinomas failo tipas",
+    "Invalid image" : "Netinkamas paveikslėlis",
+    "web services under your control" : "jūsų valdomos web paslaugos",
+    "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ą",
+    "No href specified when installing app from http" : "Nenurodytas href diegiant programą iš http",
+    "No path specified when installing app from local file" : "Nenurodytas kelias diegiant programą iš vietinio failo",
+    "Archives of type %s are not supported" : "%s tipo archyvai nepalaikomi",
+    "Failed to open archive when installing app" : "Nepavyko atverti archyvo diegiant programą",
+    "App does not provide an info.xml file" : "Programa nepateikia info.xml failo",
+    "App can't be installed because of not allowed code in the App" : "Programa negali būti įdiegta, nes turi neleistiną kodą",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje",
+    "Application is not enabled" : "Programa neįjungta",
+    "Authentication error" : "Autentikacijos klaida",
+    "Token expired. Please reload page." : "Sesija baigėsi. Prašome perkrauti puslapį.",
+    "%s enter the database username." : "%s įrašykite duombazės naudotojo vardą.",
+    "%s enter the database name." : "%s įrašykite duombazės pavadinimą.",
+    "%s you may not use dots in the database name" : "%s negalite naudoti taškų duombazės pavadinime",
+    "MS SQL username and/or password not valid: %s" : "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s",
+    "You need to enter either an existing account or the administrator." : "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi.",
+    "DB Error: \"%s\"" : "DB klaida: \"%s\"",
+    "Offending command was: \"%s\"" : "Vykdyta komanda buvo: \"%s\"",
+    "Oracle connection could not be established" : "Nepavyko sukurti Oracle ryšio",
+    "Oracle username and/or password not valid" : "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Vykdyta komanda buvo: \"%s\", name: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis",
+    "Set an admin username." : "Nustatyti administratoriaus naudotojo vardą.",
+    "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“",
+    "seconds ago" : "prieš sekundę",
+    "_%n minute ago_::_%n minutes ago_" : ["prieš %n min.","Prieš % minutes","Prieš %n minučių"],
+    "_%n hour ago_::_%n hours ago_" : ["Prieš %n valandą","Prieš %n valandas","Prieš %n valandų"],
+    "today" : "šiandien",
+    "yesterday" : "vakar",
+    "_%n day go_::_%n days ago_" : ["Prieš %n dieną","Prieš %n dienas","Prieš %n dienų"],
+    "last month" : "praeitą mėnesį",
+    "_%n month ago_::_%n months ago_" : ["Prieš %n mėnesį","Prieš %n mėnesius","Prieš %n mėnesių"],
+    "last year" : "praeitais metais",
+    "years ago" : "prieš metus",
+    "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);"
+}
\ No newline at end of file
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
deleted file mode 100644
index 61aed21ec5e..00000000000
--- a/lib/l10n/lt_LT.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Pagalba",
-"Personal" => "Asmeniniai",
-"Settings" => "Nustatymai",
-"Users" => "Vartotojai",
-"Admin" => "Administravimas",
-"No app name specified" => "Nenurodytas programos pavadinimas",
-"Unknown filetype" => "Nežinomas failo tipas",
-"Invalid image" => "Netinkamas paveikslėlis",
-"web services under your control" => "jūsų valdomos web paslaugos",
-"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ą",
-"No href specified when installing app from http" => "Nenurodytas href diegiant programą iš http",
-"No path specified when installing app from local file" => "Nenurodytas kelias diegiant programą iš vietinio failo",
-"Archives of type %s are not supported" => "%s tipo archyvai nepalaikomi",
-"Failed to open archive when installing app" => "Nepavyko atverti archyvo diegiant programą",
-"App does not provide an info.xml file" => "Programa nepateikia info.xml failo",
-"App can't be installed because of not allowed code in the App" => "Programa negali būti įdiegta, nes turi neleistiną kodą",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Programa negali būti įdiegta, nes yra nesuderinama su šia ownCloud versija",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Programa negali būti įdiegta, nes turi <shipped>true</shipped> žymę, kuri yra neleistina ne kartu platinamoms programoms",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Programa negali būti įdiegta, nes versija pateikta info.xml/version nesutampa su versija deklaruota programų saugykloje",
-"Application is not enabled" => "Programa neįjungta",
-"Authentication error" => "Autentikacijos klaida",
-"Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.",
-"%s enter the database username." => "%s įrašykite duombazės naudotojo vardą.",
-"%s enter the database name." => "%s įrašykite duombazės pavadinimą.",
-"%s you may not use dots in the database name" => "%s negalite naudoti taškų duombazės pavadinime",
-"MS SQL username and/or password not valid: %s" => "MS SQL naudotojo vardas ir/arba slaptažodis netinka: %s",
-"You need to enter either an existing account or the administrator." => "Turite prisijungti su egzistuojančia paskyra arba su administratoriumi.",
-"DB Error: \"%s\"" => "DB klaida: \"%s\"",
-"Offending command was: \"%s\"" => "Vykdyta komanda buvo: \"%s\"",
-"Oracle connection could not be established" => "Nepavyko sukurti Oracle ryšio",
-"Oracle username and/or password not valid" => "Neteisingas Oracle naudotojo vardas ir/arba slaptažodis",
-"Offending command was: \"%s\", name: %s, password: %s" => "Vykdyta komanda buvo: \"%s\", name: %s, password: %s",
-"PostgreSQL username and/or password not valid" => "Neteisingas PostgreSQL naudotojo vardas ir/arba slaptažodis",
-"Set an admin username." => "Nustatyti administratoriaus naudotojo vardą.",
-"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“",
-"seconds ago" => "prieš sekundę",
-"_%n minute ago_::_%n minutes ago_" => array("prieš %n min.","Prieš % minutes","Prieš %n minučių"),
-"_%n hour ago_::_%n hours ago_" => array("Prieš %n valandą","Prieš %n valandas","Prieš %n valandų"),
-"today" => "šiandien",
-"yesterday" => "vakar",
-"_%n day go_::_%n days ago_" => array("Prieš %n dieną","Prieš %n dienas","Prieš %n dienų"),
-"last month" => "praeitą mėnesį",
-"_%n month ago_::_%n months ago_" => array("Prieš %n mėnesį","Prieš %n mėnesius","Prieš %n mėnesių"),
-"last year" => "praeitais metais",
-"years ago" => "prieš metus",
-"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
-"A valid password must be provided" => "Slaptažodis turi būti tinkamas"
-);
-$PLURAL_FORMS = "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
new file mode 100644
index 00000000000..666d2e9d5f6
--- /dev/null
+++ b/lib/l10n/lv.js
@@ -0,0 +1,42 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Palīdzība",
+    "Personal" : "Personīgi",
+    "Settings" : "Iestatījumi",
+    "Users" : "Lietotāji",
+    "Admin" : "Administratori",
+    "web services under your control" : "tīmekļa servisi tavā varā",
+    "Application is not enabled" : "Lietotne nav aktivēta",
+    "Authentication error" : "Autentifikācijas kļūda",
+    "Token expired. Please reload page." : "Pilnvarai ir beidzies termiņš. Lūdzu, pārlādējiet lapu.",
+    "%s enter the database username." : "%s ievadiet datubāzes lietotājvārdu.",
+    "%s enter the database name." : "%s ievadiet datubāzes nosaukumu.",
+    "%s you may not use dots in the database name" : "%s datubāžu nosaukumos nedrīkst izmantot punktus",
+    "MS SQL username and/or password not valid: %s" : "Nav derīga MySQL parole un/vai lietotājvārds — %s",
+    "You need to enter either an existing account or the administrator." : "Jums jāievada vai nu esošs vai administratora konts.",
+    "DB Error: \"%s\"" : "DB kļūda — “%s”",
+    "Offending command was: \"%s\"" : "Vainīgā komanda bija “%s”",
+    "Oracle connection could not be established" : "Nevar izveidot savienojumu ar Oracle",
+    "Oracle username and/or password not valid" : "Nav derīga Oracle parole un/vai lietotājvārds",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
+    "PostgreSQL username and/or password not valid" : "Nav derīga PostgreSQL parole un/vai lietotājvārds",
+    "Set an admin username." : "Iestatiet administratora lietotājvārdu.",
+    "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”",
+    "seconds ago" : "sekundes atpakaļ",
+    "_%n minute ago_::_%n minutes ago_" : ["","","Pirms %n minūtēm"],
+    "_%n hour ago_::_%n hours ago_" : ["","","Pirms %n stundām"],
+    "today" : "šodien",
+    "yesterday" : "vakar",
+    "_%n day go_::_%n days ago_" : ["","","Pirms %n dienām"],
+    "last month" : "pagājušajā mēnesī",
+    "_%n month ago_::_%n months ago_" : ["","","Pirms %n mēnešiem"],
+    "last year" : "gājušajā gadā",
+    "years ago" : "gadus atpakaļ",
+    "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"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/lib/l10n/lv.json b/lib/l10n/lv.json
new file mode 100644
index 00000000000..42bcc70e12d
--- /dev/null
+++ b/lib/l10n/lv.json
@@ -0,0 +1,40 @@
+{ "translations": {
+    "Help" : "Palīdzība",
+    "Personal" : "Personīgi",
+    "Settings" : "Iestatījumi",
+    "Users" : "Lietotāji",
+    "Admin" : "Administratori",
+    "web services under your control" : "tīmekļa servisi tavā varā",
+    "Application is not enabled" : "Lietotne nav aktivēta",
+    "Authentication error" : "Autentifikācijas kļūda",
+    "Token expired. Please reload page." : "Pilnvarai ir beidzies termiņš. Lūdzu, pārlādējiet lapu.",
+    "%s enter the database username." : "%s ievadiet datubāzes lietotājvārdu.",
+    "%s enter the database name." : "%s ievadiet datubāzes nosaukumu.",
+    "%s you may not use dots in the database name" : "%s datubāžu nosaukumos nedrīkst izmantot punktus",
+    "MS SQL username and/or password not valid: %s" : "Nav derīga MySQL parole un/vai lietotājvārds — %s",
+    "You need to enter either an existing account or the administrator." : "Jums jāievada vai nu esošs vai administratora konts.",
+    "DB Error: \"%s\"" : "DB kļūda — “%s”",
+    "Offending command was: \"%s\"" : "Vainīgā komanda bija “%s”",
+    "Oracle connection could not be established" : "Nevar izveidot savienojumu ar Oracle",
+    "Oracle username and/or password not valid" : "Nav derīga Oracle parole un/vai lietotājvārds",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
+    "PostgreSQL username and/or password not valid" : "Nav derīga PostgreSQL parole un/vai lietotājvārds",
+    "Set an admin username." : "Iestatiet administratora lietotājvārdu.",
+    "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”",
+    "seconds ago" : "sekundes atpakaļ",
+    "_%n minute ago_::_%n minutes ago_" : ["","","Pirms %n minūtēm"],
+    "_%n hour ago_::_%n hours ago_" : ["","","Pirms %n stundām"],
+    "today" : "šodien",
+    "yesterday" : "vakar",
+    "_%n day go_::_%n days ago_" : ["","","Pirms %n dienām"],
+    "last month" : "pagājušajā mēnesī",
+    "_%n month ago_::_%n months ago_" : ["","","Pirms %n mēnešiem"],
+    "last year" : "gājušajā gadā",
+    "years ago" : "gadus atpakaļ",
+    "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"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
deleted file mode 100644
index f1d0a7338f9..00000000000
--- a/lib/l10n/lv.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Palīdzība",
-"Personal" => "Personīgi",
-"Settings" => "Iestatījumi",
-"Users" => "Lietotāji",
-"Admin" => "Administratori",
-"web services under your control" => "tīmekļa servisi tavā varā",
-"Application is not enabled" => "Lietotne nav aktivēta",
-"Authentication error" => "Autentifikācijas kļūda",
-"Token expired. Please reload page." => "Pilnvarai ir beidzies termiņš. Lūdzu, pārlādējiet lapu.",
-"%s enter the database username." => "%s ievadiet datubāzes lietotājvārdu.",
-"%s enter the database name." => "%s ievadiet datubāzes nosaukumu.",
-"%s you may not use dots in the database name" => "%s datubāžu nosaukumos nedrīkst izmantot punktus",
-"MS SQL username and/or password not valid: %s" => "Nav derīga MySQL parole un/vai lietotājvārds — %s",
-"You need to enter either an existing account or the administrator." => "Jums jāievada vai nu esošs vai administratora konts.",
-"DB Error: \"%s\"" => "DB kļūda — “%s”",
-"Offending command was: \"%s\"" => "Vainīgā komanda bija “%s”",
-"Oracle connection could not be established" => "Nevar izveidot savienojumu ar Oracle",
-"Oracle username and/or password not valid" => "Nav derīga Oracle parole un/vai lietotājvārds",
-"Offending command was: \"%s\", name: %s, password: %s" => "Vainīgā komanda bija \"%s\", vārds: %s, parole: %s",
-"PostgreSQL username and/or password not valid" => "Nav derīga PostgreSQL parole un/vai lietotājvārds",
-"Set an admin username." => "Iestatiet administratora lietotājvārdu.",
-"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”",
-"seconds ago" => "sekundes atpakaļ",
-"_%n minute ago_::_%n minutes ago_" => array("","","Pirms %n minūtēm"),
-"_%n hour ago_::_%n hours ago_" => array("","","Pirms %n stundām"),
-"today" => "šodien",
-"yesterday" => "vakar",
-"_%n day go_::_%n days ago_" => array("","","Pirms %n dienām"),
-"last month" => "pagājušajā mēnesī",
-"_%n month ago_::_%n months ago_" => array("","","Pirms %n mēnešiem"),
-"last year" => "gājušajā gadā",
-"years ago" => "gadus atpakaļ",
-"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"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/lib/l10n/mg.js b/lib/l10n/mg.js
new file mode 100644
index 00000000000..9ac3e05d6c6
--- /dev/null
+++ b/lib/l10n/mg.js
@@ -0,0 +1,9 @@
+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/mg.json b/lib/l10n/mg.json
new file mode 100644
index 00000000000..82a8a99d300
--- /dev/null
+++ b/lib/l10n/mg.json
@@ -0,0 +1,7 @@
+{ "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/mg.php b/lib/l10n/mg.php
deleted file mode 100644
index 406ff5f5a26..00000000000
--- a/lib/l10n/mg.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/mk.js b/lib/l10n/mk.js
new file mode 100644
index 00000000000..35166454dd2
--- /dev/null
+++ b/lib/l10n/mk.js
@@ -0,0 +1,42 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Помош",
+    "Personal" : "Лично",
+    "Settings" : "Подесувања",
+    "Users" : "Корисници",
+    "Admin" : "Админ",
+    "No app name specified" : "Не е специфицирано име на апликацијата",
+    "Unknown filetype" : "Непознат тип на датотека",
+    "Invalid image" : "Невалидна фотографија",
+    "web services under your control" : "веб сервиси под Ваша контрола",
+    "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 не можеш да користиш точки во името на базата",
+    "DB Error: \"%s\"" : "DB грешка: \"%s\"",
+    "Offending command was: \"%s\"" : "Навредувшката команда беше: \"%s\"",
+    "Oracle username and/or password not valid" : "Oracle корисничкото име и/или лозинката не се валидни",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL корисничкото име и/или лозинка не се валидни",
+    "Set an admin username." : "Постави администраторско корисничко име",
+    "Set an admin password." : "Постави администраторска лозинка.",
+    "%s shared »%s« with you" : "%s споделено »%s« со вас",
+    "Could not find category \"%s\"" : "Не можам да најдам категорија „%s“",
+    "seconds ago" : "пред секунди",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "денеска",
+    "yesterday" : "вчера",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "минатиот месец",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "минатата година",
+    "years ago" : "пред години",
+    "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ",
+    "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
+    "The username is already being used" : "Корисничкото име е веќе во употреба"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/lib/l10n/mk.json b/lib/l10n/mk.json
new file mode 100644
index 00000000000..89e839919b9
--- /dev/null
+++ b/lib/l10n/mk.json
@@ -0,0 +1,40 @@
+{ "translations": {
+    "Help" : "Помош",
+    "Personal" : "Лично",
+    "Settings" : "Подесувања",
+    "Users" : "Корисници",
+    "Admin" : "Админ",
+    "No app name specified" : "Не е специфицирано име на апликацијата",
+    "Unknown filetype" : "Непознат тип на датотека",
+    "Invalid image" : "Невалидна фотографија",
+    "web services under your control" : "веб сервиси под Ваша контрола",
+    "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 не можеш да користиш точки во името на базата",
+    "DB Error: \"%s\"" : "DB грешка: \"%s\"",
+    "Offending command was: \"%s\"" : "Навредувшката команда беше: \"%s\"",
+    "Oracle username and/or password not valid" : "Oracle корисничкото име и/или лозинката не се валидни",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL корисничкото име и/или лозинка не се валидни",
+    "Set an admin username." : "Постави администраторско корисничко име",
+    "Set an admin password." : "Постави администраторска лозинка.",
+    "%s shared »%s« with you" : "%s споделено »%s« со вас",
+    "Could not find category \"%s\"" : "Не можам да најдам категорија „%s“",
+    "seconds ago" : "пред секунди",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "денеска",
+    "yesterday" : "вчера",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "минатиот месец",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "минатата година",
+    "years ago" : "пред години",
+    "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ",
+    "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
+    "The username is already being used" : "Корисничкото име е веќе во употреба"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
deleted file mode 100644
index 3b7b1fbce0b..00000000000
--- a/lib/l10n/mk.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Помош",
-"Personal" => "Лично",
-"Settings" => "Подесувања",
-"Users" => "Корисници",
-"Admin" => "Админ",
-"No app name specified" => "Не е специфицирано име на апликацијата",
-"Unknown filetype" => "Непознат тип на датотека",
-"Invalid image" => "Невалидна фотографија",
-"web services under your control" => "веб сервиси под Ваша контрола",
-"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 не можеш да користиш точки во името на базата",
-"DB Error: \"%s\"" => "DB грешка: \"%s\"",
-"Offending command was: \"%s\"" => "Навредувшката команда беше: \"%s\"",
-"Oracle username and/or password not valid" => "Oracle корисничкото име и/или лозинката не се валидни",
-"PostgreSQL username and/or password not valid" => "PostgreSQL корисничкото име и/или лозинка не се валидни",
-"Set an admin username." => "Постави администраторско корисничко име",
-"Set an admin password." => "Постави администраторска лозинка.",
-"%s shared »%s« with you" => "%s споделено »%s« со вас",
-"Could not find category \"%s\"" => "Не можам да најдам категорија „%s“",
-"seconds ago" => "пред секунди",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "денеска",
-"yesterday" => "вчера",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "минатиот месец",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "минатата година",
-"years ago" => "пред години",
-"A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
-"A valid password must be provided" => "Мора да се обезбеди валидна лозинка",
-"The username is already being used" => "Корисничкото име е веќе во употреба"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/lib/l10n/ml.js b/lib/l10n/ml.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/ml.js
@@ -0,0 +1,9 @@
+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/ml.json b/lib/l10n/ml.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/ml.json
@@ -0,0 +1,7 @@
+{ "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/ml.php b/lib/l10n/ml.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/ml.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ml_IN.js b/lib/l10n/ml_IN.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/ml_IN.js
@@ -0,0 +1,9 @@
+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/ml_IN.json b/lib/l10n/ml_IN.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/ml_IN.json
@@ -0,0 +1,7 @@
+{ "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/ml_IN.php b/lib/l10n/ml_IN.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/ml_IN.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/mn.js b/lib/l10n/mn.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/mn.js
@@ -0,0 +1,9 @@
+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/mn.json b/lib/l10n/mn.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/mn.json
@@ -0,0 +1,7 @@
+{ "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/mn.php b/lib/l10n/mn.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/mn.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ms_MY.js b/lib/l10n/ms_MY.js
new file mode 100644
index 00000000000..2a74f51e2f6
--- /dev/null
+++ b/lib/l10n/ms_MY.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Bantuan",
+    "Personal" : "Peribadi",
+    "Settings" : "Tetapan",
+    "Users" : "Pengguna",
+    "Admin" : "Admin",
+    "web services under your control" : "Perkhidmatan web di bawah kawalan anda",
+    "Authentication error" : "Ralat pengesahan",
+    "_%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=1; plural=0;");
diff --git a/lib/l10n/ms_MY.json b/lib/l10n/ms_MY.json
new file mode 100644
index 00000000000..5285610e70a
--- /dev/null
+++ b/lib/l10n/ms_MY.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Help" : "Bantuan",
+    "Personal" : "Peribadi",
+    "Settings" : "Tetapan",
+    "Users" : "Pengguna",
+    "Admin" : "Admin",
+    "web services under your control" : "Perkhidmatan web di bawah kawalan anda",
+    "Authentication error" : "Ralat pengesahan",
+    "_%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=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
deleted file mode 100644
index 710ac8b79a0..00000000000
--- a/lib/l10n/ms_MY.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Bantuan",
-"Personal" => "Peribadi",
-"Settings" => "Tetapan",
-"Users" => "Pengguna",
-"Admin" => "Admin",
-"web services under your control" => "Perkhidmatan web di bawah kawalan anda",
-"Authentication error" => "Ralat pengesahan",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"_%n day go_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/mt_MT.js b/lib/l10n/mt_MT.js
new file mode 100644
index 00000000000..9112b35ebe4
--- /dev/null
+++ b/lib/l10n/mt_MT.js
@@ -0,0 +1,9 @@
+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=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);");
diff --git a/lib/l10n/mt_MT.json b/lib/l10n/mt_MT.json
new file mode 100644
index 00000000000..6b794297014
--- /dev/null
+++ b/lib/l10n/mt_MT.json
@@ -0,0 +1,7 @@
+{ "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=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/lib/l10n/mt_MT.php b/lib/l10n/mt_MT.php
deleted file mode 100644
index 5a0c40c09fe..00000000000
--- a/lib/l10n/mt_MT.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("","","",""),
-"_%n hour ago_::_%n hours ago_" => array("","","",""),
-"_%n day go_::_%n days ago_" => array("","","",""),
-"_%n month ago_::_%n months ago_" => array("","","","")
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);";
diff --git a/lib/l10n/my_MM.js b/lib/l10n/my_MM.js
new file mode 100644
index 00000000000..c08021fdbd3
--- /dev/null
+++ b/lib/l10n/my_MM.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "အကူအညီ",
+    "Users" : "သုံးစွဲသူ",
+    "Admin" : "အက်ဒမင်",
+    "web services under your control" : "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
+    "Authentication error" : "ခွင့်ပြုချက်မအောင်မြင်",
+    "Could not find category \"%s\"" : "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ",
+    "seconds ago" : "စက္ကန့်အနည်းငယ်က",
+    "_%n minute ago_::_%n minutes ago_" : [""],
+    "_%n hour ago_::_%n hours ago_" : [""],
+    "today" : "ယနေ့",
+    "yesterday" : "မနေ့က",
+    "_%n day go_::_%n days ago_" : [""],
+    "last month" : "ပြီးခဲ့သောလ",
+    "_%n month ago_::_%n months ago_" : [""],
+    "last year" : "မနှစ်က",
+    "years ago" : "နှစ် အရင်က"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/my_MM.json b/lib/l10n/my_MM.json
new file mode 100644
index 00000000000..3756c65ae0b
--- /dev/null
+++ b/lib/l10n/my_MM.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Help" : "အကူအညီ",
+    "Users" : "သုံးစွဲသူ",
+    "Admin" : "အက်ဒမင်",
+    "web services under your control" : "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
+    "Authentication error" : "ခွင့်ပြုချက်မအောင်မြင်",
+    "Could not find category \"%s\"" : "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ",
+    "seconds ago" : "စက္ကန့်အနည်းငယ်က",
+    "_%n minute ago_::_%n minutes ago_" : [""],
+    "_%n hour ago_::_%n hours ago_" : [""],
+    "today" : "ယနေ့",
+    "yesterday" : "မနေ့က",
+    "_%n day go_::_%n days ago_" : [""],
+    "last month" : "ပြီးခဲ့သောလ",
+    "_%n month ago_::_%n months ago_" : [""],
+    "last year" : "မနှစ်က",
+    "years ago" : "နှစ် အရင်က"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/my_MM.php b/lib/l10n/my_MM.php
deleted file mode 100644
index f8733265376..00000000000
--- a/lib/l10n/my_MM.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "အကူအညီ",
-"Users" => "သုံးစွဲသူ",
-"Admin" => "အက်ဒမင်",
-"web services under your control" => "သင်၏ထိန်းချုပ်မှု့အောက်တွင်ရှိသော Web services",
-"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
-"Could not find category \"%s\"" => "\"%s\"ခေါင်းစဉ်ကို ရှာမတွေ့ပါ",
-"seconds ago" => "စက္ကန့်အနည်းငယ်က",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"today" => "ယနေ့",
-"yesterday" => "မနေ့က",
-"_%n day go_::_%n days ago_" => array(""),
-"last month" => "ပြီးခဲ့သောလ",
-"_%n month ago_::_%n months ago_" => array(""),
-"last year" => "မနှစ်က",
-"years ago" => "နှစ် အရင်က"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/nb_NO.js b/lib/l10n/nb_NO.js
new file mode 100644
index 00000000000..c50537ce67d
--- /dev/null
+++ b/lib/l10n/nb_NO.js
@@ -0,0 +1,123 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Kan ikke skrive i \"config\"-mappen!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dette kan vanligvis ordnes ved å gi web-serveren skrivetilgang til config-mappen",
+    "See %s" : "Se %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til config-mappen%s.",
+    "Sample configuration detected" : "Eksempelkonfigurasjon oppdaget",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Det ble oppdaget at eksempelkonfigurasjonen er blitt kopiert. Dette kan ødelegge installasjonen din og støttes ikke. Les dokumentasjonen før du gjør endringer i config.php",
+    "Help" : "Hjelp",
+    "Personal" : "Personlig",
+    "Settings" : "Innstillinger",
+    "Users" : "Brukere",
+    "Admin" : "Admin",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App \\\"%s\\\" kan ikke installeres fordi den ikke er kompatibel med denne versjoen av ownCloud.",
+    "No app name specified" : "Intet app-navn spesifisert",
+    "Unknown filetype" : "Ukjent filtype",
+    "Invalid image" : "Ugyldig bilde",
+    "web services under your control" : "webtjenester som du kontrollerer",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Arkiver av type %s støttes ikke",
+    "Failed to open archive when installing app" : "Klarte ikke å åpne arkiv ved installering av app",
+    "App does not provide an info.xml file" : "App-en inneholder ikke filen info.xml",
+    "App can't be installed because of not allowed code in the App" : "App kan ikke installeres på grunn av ulovlig kode i appen.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres fordi versjonen i info.xml/version ikke er den samme som versjonen som rapporteres fra app-butikken",
+    "Application is not enabled" : "Applikasjon er ikke påslått",
+    "Authentication error" : "Autentikasjonsfeil",
+    "Token expired. Please reload page." : "Symbol utløpt. Vennligst last inn siden på nytt.",
+    "Unknown user" : "Ukjent bruker",
+    "%s enter the database username." : "%s legg inn brukernavn for databasen.",
+    "%s enter the database name." : "%s legg inn navnet på databasen.",
+    "%s you may not use dots in the database name" : "%s du kan ikke bruke punktum i databasenavnet",
+    "MS SQL username and/or password not valid: %s" : "MS SQL-brukernavn og/eller passord ikke gyldig: %s",
+    "You need to enter either an existing account or the administrator." : "Du må legge inn enten en eksisterende konto eller administratoren.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB-brukernavn og/eller -passord ikke gyldig",
+    "DB Error: \"%s\"" : "Databasefeil: \"%s\"",
+    "Offending command was: \"%s\"" : "Kommandoen som feilet: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB-bruker '%s'@'localhost' finnes allerede.",
+    "Drop this user from MySQL/MariaDB" : "Fjern denne brukeren fra MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB-bruker '%s'@'%%' finnes allerede",
+    "Drop this user from MySQL/MariaDB." : "Fjern denne brukeren fra MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Klarte ikke å etablere forbindelse til Oracle",
+    "Oracle username and/or password not valid" : "Oracle-brukernavn og/eller passord er ikke gyldig",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Kommando som feilet: \"%s\", navn: %s, passord: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL-brukernavn og/eller passord er ikke gyldig",
+    "Set an admin username." : "Sett et admin-brukernavn.",
+    "Set an admin password." : "Sett et admin-passord.",
+    "Can't create or write into the data directory %s" : "Kan ikke opprette eller skrive i datamappen %s",
+    "%s shared »%s« with you" : "%s delte »%s« med deg",
+    "Sharing %s failed, because the file does not exist" : "Deling av %s feilet, fordi filen ikke eksisterer",
+    "You are not allowed to share %s" : "Du har ikke lov til å dele %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Deling av %s feilet, fordi brukeren %s er eier av elementet",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Deling av %s feilet, fordi deling med lenker ikke er tillatt",
+    "Share type %s is not valid for %s" : "Delingstype %s er ikke gyldig for %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting av tillatelser for %s feilet, fordi tillatelsene gikk ut over tillatelsene som er gitt til %s",
+    "Setting permissions for %s failed, because the item was not found" : "Setting av tillatelser for %s feilet, fordi elementet ikke ble funnet",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Kan ikke sette utøpsdato. Delinger kan ikke utløpe senere enn %s etter at de har blitt delt",
+    "Cannot set expiration date. Expiration date is in the past" : "Kan ikke sette utløpsdato. Utløpsdato er tilbake i tid",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delings-server %s må implementere grensesnittet OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Delings-server %s ikke funnet",
+    "Sharing backend for %s not found" : "Delings-server for %s ikke funnet",
+    "Sharing %s failed, because the user %s is the original sharer" : "Deling av %s feilet, fordi brukeren %s er den opprinnelige eieren",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Deling av %s feilet, fordi tillatelsene går utover tillatelsene som er gitt til %s",
+    "Sharing %s failed, because resharing is not allowed" : "Deling av %s feilet, fordi videre-deling ikke er tillatt",
+    "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\"",
+    "seconds ago" : "for få sekunder siden",
+    "_%n minute ago_::_%n minutes ago_" : ["for %n minutt siden","for %n minutter siden"],
+    "_%n hour ago_::_%n hours ago_" : ["for %n time siden","for %n timer siden"],
+    "today" : "i dag",
+    "yesterday" : "i går",
+    "_%n day go_::_%n days ago_" : ["for %n dag siden","for %n dager siden"],
+    "last month" : "forrige måned",
+    "_%n month ago_::_%n months ago_" : ["for %n måned siden","for %n måneder siden"],
+    "last year" : "forrige år",
+    "years ago" : "årevis siden",
+    "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",
+    "The username is already being used" : "Brukernavnet er allerede i bruk",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen databasedrivere (sqlite, mysql, or postgresql) installert.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Tillatelser kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til rotmappen%s.",
+    "Cannot write into \"config\" directory" : "Kan ikke skrive i \"config\"-mappen",
+    "Cannot write into \"apps\" directory" : "Kan ikke skrive i \"apps\"-mappen",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til apps-mappen%s eller ved å deaktivere app-butikken i config-filen.",
+    "Cannot create \"data\" directory (%s)" : "Kan ikke opprette \"data\"-mappen (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dette kan vanligvis ordnes ved <a href=\"%s\" target=\"_blank\">gi web-serveren skrivetilgang til rotmappen</a>.",
+    "Setting locale to %s failed" : "Setting av nasjonale innstillinger til %s feilet.",
+    "Please install one of these locales on your system and restart your webserver." : "Vennligst installer en av disse nasjonale innstillingene på systemet ditt og start webserveren på nytt.",
+    "Please ask your server administrator to install the module." : "Be server-administratoren om å installere modulen.",
+    "PHP module %s not installed." : "PHP-modul %s er ikke installert.",
+    "PHP %s or higher is required." : "PHP %s eller nyere kreves.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Be server-administratoren om å oppdatere PHP til nyeste versjon. PHP-versjonen du bruker støttes ikke lenger av ownCloud og PHP-fellesskapet.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode er aktivert. ownCloud krever at det deaktiveres for å fungere korrekt.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode er en avskrevet og stort sett unyttig innstilling som bør deaktiveres. Be server-administratoren om å deaktivere det i php.ini eller i konfigurasjonen for web-serveren.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes er aktivert. ownCloud krever at det deaktiveres for å fungere korrekt.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes er en avskrevet og stort sett unyttig innstilling som bør deaktiveres. Be server-administratoren om å deaktivere det i php.ini eller i konfigurasjonen for web-serveren.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har blitt installert, men de listes fortsatt som fraværende?",
+    "Please ask your server administrator to restart the web server." : "Be server-administratoren om å starte web-serveren på nytt.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 kreves",
+    "Please upgrade your database version" : "Vennligst oppgrader versjonen av databasen din",
+    "Error occurred while checking PostgreSQL version" : "Det oppstod en feil ved sjekking av PostgreSQL-versjon",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Sjekk at du har PostgreSQL >= 9 eller sjekk loggene for mer informasjon om feilen",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Endre tillatelsene til 0770 slik at mappen ikke kan listes av andre brukere.",
+    "Data directory (%s) is readable by other users" : "Data-mappen (%s) kan leses av andre brukere",
+    "Data directory (%s) is invalid" : "Data-mappe (%s) er ugyldig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Sjekk at det ligger en fil \".ocdata\" i roten av data-mappen.",
+    "Could not obtain lock type %d on \"%s\"." : "Klarte ikke å låse med type %d på \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/nb_NO.json b/lib/l10n/nb_NO.json
new file mode 100644
index 00000000000..4fe3148dc19
--- /dev/null
+++ b/lib/l10n/nb_NO.json
@@ -0,0 +1,121 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Kan ikke skrive i \"config\"-mappen!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dette kan vanligvis ordnes ved å gi web-serveren skrivetilgang til config-mappen",
+    "See %s" : "Se %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til config-mappen%s.",
+    "Sample configuration detected" : "Eksempelkonfigurasjon oppdaget",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Det ble oppdaget at eksempelkonfigurasjonen er blitt kopiert. Dette kan ødelegge installasjonen din og støttes ikke. Les dokumentasjonen før du gjør endringer i config.php",
+    "Help" : "Hjelp",
+    "Personal" : "Personlig",
+    "Settings" : "Innstillinger",
+    "Users" : "Brukere",
+    "Admin" : "Admin",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App \\\"%s\\\" kan ikke installeres fordi den ikke er kompatibel med denne versjoen av ownCloud.",
+    "No app name specified" : "Intet app-navn spesifisert",
+    "Unknown filetype" : "Ukjent filtype",
+    "Invalid image" : "Ugyldig bilde",
+    "web services under your control" : "webtjenester som du kontrollerer",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Arkiver av type %s støttes ikke",
+    "Failed to open archive when installing app" : "Klarte ikke å åpne arkiv ved installering av app",
+    "App does not provide an info.xml file" : "App-en inneholder ikke filen info.xml",
+    "App can't be installed because of not allowed code in the App" : "App kan ikke installeres på grunn av ulovlig kode i appen.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres fordi versjonen i info.xml/version ikke er den samme som versjonen som rapporteres fra app-butikken",
+    "Application is not enabled" : "Applikasjon er ikke påslått",
+    "Authentication error" : "Autentikasjonsfeil",
+    "Token expired. Please reload page." : "Symbol utløpt. Vennligst last inn siden på nytt.",
+    "Unknown user" : "Ukjent bruker",
+    "%s enter the database username." : "%s legg inn brukernavn for databasen.",
+    "%s enter the database name." : "%s legg inn navnet på databasen.",
+    "%s you may not use dots in the database name" : "%s du kan ikke bruke punktum i databasenavnet",
+    "MS SQL username and/or password not valid: %s" : "MS SQL-brukernavn og/eller passord ikke gyldig: %s",
+    "You need to enter either an existing account or the administrator." : "Du må legge inn enten en eksisterende konto eller administratoren.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB-brukernavn og/eller -passord ikke gyldig",
+    "DB Error: \"%s\"" : "Databasefeil: \"%s\"",
+    "Offending command was: \"%s\"" : "Kommandoen som feilet: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB-bruker '%s'@'localhost' finnes allerede.",
+    "Drop this user from MySQL/MariaDB" : "Fjern denne brukeren fra MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB-bruker '%s'@'%%' finnes allerede",
+    "Drop this user from MySQL/MariaDB." : "Fjern denne brukeren fra MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Klarte ikke å etablere forbindelse til Oracle",
+    "Oracle username and/or password not valid" : "Oracle-brukernavn og/eller passord er ikke gyldig",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Kommando som feilet: \"%s\", navn: %s, passord: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL-brukernavn og/eller passord er ikke gyldig",
+    "Set an admin username." : "Sett et admin-brukernavn.",
+    "Set an admin password." : "Sett et admin-passord.",
+    "Can't create or write into the data directory %s" : "Kan ikke opprette eller skrive i datamappen %s",
+    "%s shared »%s« with you" : "%s delte »%s« med deg",
+    "Sharing %s failed, because the file does not exist" : "Deling av %s feilet, fordi filen ikke eksisterer",
+    "You are not allowed to share %s" : "Du har ikke lov til å dele %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Deling av %s feilet, fordi brukeren %s er eier av elementet",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Deling av %s feilet, fordi deling med lenker ikke er tillatt",
+    "Share type %s is not valid for %s" : "Delingstype %s er ikke gyldig for %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Setting av tillatelser for %s feilet, fordi tillatelsene gikk ut over tillatelsene som er gitt til %s",
+    "Setting permissions for %s failed, because the item was not found" : "Setting av tillatelser for %s feilet, fordi elementet ikke ble funnet",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Kan ikke sette utøpsdato. Delinger kan ikke utløpe senere enn %s etter at de har blitt delt",
+    "Cannot set expiration date. Expiration date is in the past" : "Kan ikke sette utløpsdato. Utløpsdato er tilbake i tid",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delings-server %s må implementere grensesnittet OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Delings-server %s ikke funnet",
+    "Sharing backend for %s not found" : "Delings-server for %s ikke funnet",
+    "Sharing %s failed, because the user %s is the original sharer" : "Deling av %s feilet, fordi brukeren %s er den opprinnelige eieren",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Deling av %s feilet, fordi tillatelsene går utover tillatelsene som er gitt til %s",
+    "Sharing %s failed, because resharing is not allowed" : "Deling av %s feilet, fordi videre-deling ikke er tillatt",
+    "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\"",
+    "seconds ago" : "for få sekunder siden",
+    "_%n minute ago_::_%n minutes ago_" : ["for %n minutt siden","for %n minutter siden"],
+    "_%n hour ago_::_%n hours ago_" : ["for %n time siden","for %n timer siden"],
+    "today" : "i dag",
+    "yesterday" : "i går",
+    "_%n day go_::_%n days ago_" : ["for %n dag siden","for %n dager siden"],
+    "last month" : "forrige måned",
+    "_%n month ago_::_%n months ago_" : ["for %n måned siden","for %n måneder siden"],
+    "last year" : "forrige år",
+    "years ago" : "årevis siden",
+    "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",
+    "The username is already being used" : "Brukernavnet er allerede i bruk",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ingen databasedrivere (sqlite, mysql, or postgresql) installert.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Tillatelser kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til rotmappen%s.",
+    "Cannot write into \"config\" directory" : "Kan ikke skrive i \"config\"-mappen",
+    "Cannot write into \"apps\" directory" : "Kan ikke skrive i \"apps\"-mappen",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til apps-mappen%s eller ved å deaktivere app-butikken i config-filen.",
+    "Cannot create \"data\" directory (%s)" : "Kan ikke opprette \"data\"-mappen (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dette kan vanligvis ordnes ved <a href=\"%s\" target=\"_blank\">gi web-serveren skrivetilgang til rotmappen</a>.",
+    "Setting locale to %s failed" : "Setting av nasjonale innstillinger til %s feilet.",
+    "Please install one of these locales on your system and restart your webserver." : "Vennligst installer en av disse nasjonale innstillingene på systemet ditt og start webserveren på nytt.",
+    "Please ask your server administrator to install the module." : "Be server-administratoren om å installere modulen.",
+    "PHP module %s not installed." : "PHP-modul %s er ikke installert.",
+    "PHP %s or higher is required." : "PHP %s eller nyere kreves.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Be server-administratoren om å oppdatere PHP til nyeste versjon. PHP-versjonen du bruker støttes ikke lenger av ownCloud og PHP-fellesskapet.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode er aktivert. ownCloud krever at det deaktiveres for å fungere korrekt.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode er en avskrevet og stort sett unyttig innstilling som bør deaktiveres. Be server-administratoren om å deaktivere det i php.ini eller i konfigurasjonen for web-serveren.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes er aktivert. ownCloud krever at det deaktiveres for å fungere korrekt.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes er en avskrevet og stort sett unyttig innstilling som bør deaktiveres. Be server-administratoren om å deaktivere det i php.ini eller i konfigurasjonen for web-serveren.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP-moduler har blitt installert, men de listes fortsatt som fraværende?",
+    "Please ask your server administrator to restart the web server." : "Be server-administratoren om å starte web-serveren på nytt.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 kreves",
+    "Please upgrade your database version" : "Vennligst oppgrader versjonen av databasen din",
+    "Error occurred while checking PostgreSQL version" : "Det oppstod en feil ved sjekking av PostgreSQL-versjon",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Sjekk at du har PostgreSQL >= 9 eller sjekk loggene for mer informasjon om feilen",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Endre tillatelsene til 0770 slik at mappen ikke kan listes av andre brukere.",
+    "Data directory (%s) is readable by other users" : "Data-mappen (%s) kan leses av andre brukere",
+    "Data directory (%s) is invalid" : "Data-mappe (%s) er ugyldig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Sjekk at det ligger en fil \".ocdata\" i roten av data-mappen.",
+    "Could not obtain lock type %d on \"%s\"." : "Klarte ikke å låse med type %d på \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
deleted file mode 100644
index b093f4d1800..00000000000
--- a/lib/l10n/nb_NO.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Kan ikke skrive i \"config\"-mappen!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Dette kan vanligvis ordnes ved å gi web-serveren skrivetilgang til config-mappen",
-"See %s" => "Se %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til config-mappen%s.",
-"Sample configuration detected" => "Eksempelkonfigurasjon oppdaget",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Det ble oppdaget at eksempelkonfigurasjonen er blitt kopiert. Dette kan ødelegge installasjonen din og støttes ikke. Les dokumentasjonen før du gjør endringer i config.php",
-"Help" => "Hjelp",
-"Personal" => "Personlig",
-"Settings" => "Innstillinger",
-"Users" => "Brukere",
-"Admin" => "Admin",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" kan ikke installeres fordi den ikke er kompatibel med denne versjoen av ownCloud.",
-"No app name specified" => "Intet app-navn spesifisert",
-"Unknown filetype" => "Ukjent filtype",
-"Invalid image" => "Ugyldig bilde",
-"web services under your control" => "webtjenester som du kontrollerer",
-"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",
-"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",
-"Archives of type %s are not supported" => "Arkiver av type %s støttes ikke",
-"Failed to open archive when installing app" => "Klarte ikke å åpne arkiv ved installering av app",
-"App does not provide an info.xml file" => "App-en inneholder ikke filen info.xml",
-"App can't be installed because of not allowed code in the App" => "App kan ikke installeres på grunn av ulovlig kode i appen.",
-"App can't be installed because it is not compatible with this version of ownCloud" => "App kan ikke installeres fordi den ikke er kompatibel med denne versjonen av ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "App kan ikke installeres fordi den inneholder tag <shipped>true</shipped> som ikke er tillatt for apper som ikke leveres med systemet",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App kan ikke installeres fordi versjonen i info.xml/version ikke er den samme som versjonen som rapporteres fra app-butikken",
-"Application is not enabled" => "Applikasjon er ikke påslått",
-"Authentication error" => "Autentikasjonsfeil",
-"Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
-"Unknown user" => "Ukjent bruker",
-"%s enter the database username." => "%s legg inn brukernavn for databasen.",
-"%s enter the database name." => "%s legg inn navnet på databasen.",
-"%s you may not use dots in the database name" => "%s du kan ikke bruke punktum i databasenavnet",
-"MS SQL username and/or password not valid: %s" => "MS SQL-brukernavn og/eller passord ikke gyldig: %s",
-"You need to enter either an existing account or the administrator." => "Du må legge inn enten en eksisterende konto eller administratoren.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB-brukernavn og/eller -passord ikke gyldig",
-"DB Error: \"%s\"" => "Databasefeil: \"%s\"",
-"Offending command was: \"%s\"" => "Kommandoen som feilet: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB-bruker '%s'@'localhost' finnes allerede.",
-"Drop this user from MySQL/MariaDB" => "Fjern denne brukeren fra MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB-bruker '%s'@'%%' finnes allerede",
-"Drop this user from MySQL/MariaDB." => "Fjern denne brukeren fra MySQL/MariaDB.",
-"Oracle connection could not be established" => "Klarte ikke å etablere forbindelse til Oracle",
-"Oracle username and/or password not valid" => "Oracle-brukernavn og/eller passord er ikke gyldig",
-"Offending command was: \"%s\", name: %s, password: %s" => "Kommando som feilet: \"%s\", navn: %s, passord: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL-brukernavn og/eller passord er ikke gyldig",
-"Set an admin username." => "Sett et admin-brukernavn.",
-"Set an admin password." => "Sett et admin-passord.",
-"Can't create or write into the data directory %s" => "Kan ikke opprette eller skrive i datamappen %s",
-"%s shared »%s« with you" => "%s delte »%s« med deg",
-"Sharing %s failed, because the file does not exist" => "Deling av %s feilet, fordi filen ikke eksisterer",
-"You are not allowed to share %s" => "Du har ikke lov til å dele %s",
-"Sharing %s failed, because the user %s is the item owner" => "Deling av %s feilet, fordi brukeren %s er eier av elementet",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Deling av %s feilet, fordi deling med lenker ikke er tillatt",
-"Share type %s is not valid for %s" => "Delingstype %s er ikke gyldig for %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Setting av tillatelser for %s feilet, fordi tillatelsene gikk ut over tillatelsene som er gitt til %s",
-"Setting permissions for %s failed, because the item was not found" => "Setting av tillatelser for %s feilet, fordi elementet ikke ble funnet",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Kan ikke sette utøpsdato. Delinger kan ikke utløpe senere enn %s etter at de har blitt delt",
-"Cannot set expiration date. Expiration date is in the past" => "Kan ikke sette utløpsdato. Utløpsdato er tilbake i tid",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Delings-server %s må implementere grensesnittet OCP\\Share_Backend",
-"Sharing backend %s not found" => "Delings-server %s ikke funnet",
-"Sharing backend for %s not found" => "Delings-server for %s ikke funnet",
-"Sharing %s failed, because the user %s is the original sharer" => "Deling av %s feilet, fordi brukeren %s er den opprinnelige eieren",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Deling av %s feilet, fordi tillatelsene går utover tillatelsene som er gitt til %s",
-"Sharing %s failed, because resharing is not allowed" => "Deling av %s feilet, fordi videre-deling ikke er tillatt",
-"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\"",
-"seconds ago" => "for få sekunder siden",
-"_%n minute ago_::_%n minutes ago_" => array("for %n minutt siden","for %n minutter siden"),
-"_%n hour ago_::_%n hours ago_" => array("for %n time siden","for %n timer siden"),
-"today" => "i dag",
-"yesterday" => "i går",
-"_%n day go_::_%n days ago_" => array("for %n dag siden","for %n dager siden"),
-"last month" => "forrige måned",
-"_%n month ago_::_%n months ago_" => array("for %n måned siden","for %n måneder siden"),
-"last year" => "forrige år",
-"years ago" => "årevis siden",
-"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",
-"The username is already being used" => "Brukernavnet er allerede i bruk",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Ingen databasedrivere (sqlite, mysql, or postgresql) installert.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Tillatelser kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til rotmappen%s.",
-"Cannot write into \"config\" directory" => "Kan ikke skrive i \"config\"-mappen",
-"Cannot write into \"apps\" directory" => "Kan ikke skrive i \"apps\"-mappen",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Dette kan vanligvis ordnes ved %så gi web-serveren skrivetilgang til apps-mappen%s eller ved å deaktivere app-butikken i config-filen.",
-"Cannot create \"data\" directory (%s)" => "Kan ikke opprette \"data\"-mappen (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dette kan vanligvis ordnes ved <a href=\"%s\" target=\"_blank\">gi web-serveren skrivetilgang til rotmappen</a>.",
-"Setting locale to %s failed" => "Setting av nasjonale innstillinger til %s feilet.",
-"Please install one of these locales on your system and restart your webserver." => "Vennligst installer en av disse nasjonale innstillingene på systemet ditt og start webserveren på nytt.",
-"Please ask your server administrator to install the module." => "Be server-administratoren om å installere modulen.",
-"PHP module %s not installed." => "PHP-modul %s er ikke installert.",
-"PHP %s or higher is required." => "PHP %s eller nyere kreves.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Be server-administratoren om å oppdatere PHP til nyeste versjon. PHP-versjonen du bruker støttes ikke lenger av ownCloud og PHP-fellesskapet.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode er aktivert. ownCloud krever at det deaktiveres for å fungere korrekt.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode er en avskrevet og stort sett unyttig innstilling som bør deaktiveres. Be server-administratoren om å deaktivere det i php.ini eller i konfigurasjonen for web-serveren.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes er aktivert. ownCloud krever at det deaktiveres for å fungere korrekt.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes er en avskrevet og stort sett unyttig innstilling som bør deaktiveres. Be server-administratoren om å deaktivere det i php.ini eller i konfigurasjonen for web-serveren.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP-moduler har blitt installert, men de listes fortsatt som fraværende?",
-"Please ask your server administrator to restart the web server." => "Be server-administratoren om å starte web-serveren på nytt.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 kreves",
-"Please upgrade your database version" => "Vennligst oppgrader versjonen av databasen din",
-"Error occurred while checking PostgreSQL version" => "Det oppstod en feil ved sjekking av PostgreSQL-versjon",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Sjekk at du har PostgreSQL >= 9 eller sjekk loggene for mer informasjon om feilen",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Endre tillatelsene til 0770 slik at mappen ikke kan listes av andre brukere.",
-"Data directory (%s) is readable by other users" => "Data-mappen (%s) kan leses av andre brukere",
-"Data directory (%s) is invalid" => "Data-mappe (%s) er ugyldig",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Sjekk at det ligger en fil \".ocdata\" i roten av data-mappen.",
-"Could not obtain lock type %d on \"%s\"." => "Klarte ikke å låse med type %d på \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nds.js b/lib/l10n/nds.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/nds.js
@@ -0,0 +1,9 @@
+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/nds.json b/lib/l10n/nds.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/nds.json
@@ -0,0 +1,7 @@
+{ "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/nds.php b/lib/l10n/nds.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/nds.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ne.js b/lib/l10n/ne.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/ne.js
@@ -0,0 +1,9 @@
+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/ne.json b/lib/l10n/ne.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/ne.json
@@ -0,0 +1,7 @@
+{ "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/ne.php b/lib/l10n/ne.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/ne.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
new file mode 100644
index 00000000000..9ec355862f3
--- /dev/null
+++ b/lib/l10n/nl.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dit kan hersteld worden door de webserver schrijfrechten te geven op de de config directory",
+    "See %s" : "Zie %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %sgeven op de de config directory%s",
+    "Sample configuration detected" : "Voorbeeldconfiguratie gevonden",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert",
+    "Help" : "Help",
+    "Personal" : "Persoonlijk",
+    "Settings" : "Instellingen",
+    "Users" : "Gebruikers",
+    "Admin" : "Beheerder",
+    "Recommended" : "Aanbevolen",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.",
+    "No app name specified" : "De app naam is niet gespecificeerd.",
+    "Unknown filetype" : "Onbekend bestandsformaat",
+    "Invalid image" : "Ongeldige afbeelding",
+    "web services under your control" : "Webdiensten in eigen beheer",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Archiefbestanden van type %s niet ondersteund",
+    "Failed to open archive when installing app" : "Kon archiefbestand bij installatie van de app niet openen",
+    "App does not provide an info.xml file" : "De app heeft geen info.xml bestand",
+    "App can't be installed because of not allowed code in the App" : "De app kan niet worden geïnstalleerd wegens onjuiste code in de app",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld",
+    "Application is not enabled" : "De applicatie is niet actief",
+    "Authentication error" : "Authenticatie fout",
+    "Token expired. Please reload page." : "Token verlopen.  Herlaad de pagina.",
+    "Unknown user" : "Onbekende gebruiker",
+    "%s enter the database username." : "%s opgeven database gebruikersnaam.",
+    "%s enter the database name." : "%s opgeven databasenaam.",
+    "%s you may not use dots in the database name" : "%s er mogen geen puntjes in de databasenaam voorkomen",
+    "MS SQL username and/or password not valid: %s" : "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
+    "You need to enter either an existing account or the administrator." : "Geef of een bestaand account op of het beheerdersaccount.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB gebruikersnaam en/of wachtwoord ongeldig",
+    "DB Error: \"%s\"" : "DB Fout: \"%s\"",
+    "Offending command was: \"%s\"" : "Onjuiste commande was: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB gebruiker '%s'@'localhost' bestaat al.",
+    "Drop this user from MySQL/MariaDB" : "Verwijder deze gebruiker uit MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB gebruiker '%s'@'%%' bestaat al",
+    "Drop this user from MySQL/MariaDB." : "Verwijder deze gebruiker uit MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Er kon geen verbinding met Oracle worden bereikt",
+    "Oracle username and/or password not valid" : "Oracle gebruikersnaam en/of wachtwoord ongeldig",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
+    "Set an admin username." : "Stel de gebruikersnaam van de beheerder in.",
+    "Set an admin password." : "Stel een beheerderswachtwoord in.",
+    "Can't create or write into the data directory %s" : "Kan niets creëren of wegschrijven in datadirectory %s",
+    "%s shared »%s« with you" : "%s deelde »%s« met u",
+    "Sharing %s failed, because the file does not exist" : "Delen van %s is mislukt, omdat het bestand niet bestaat",
+    "You are not allowed to share %s" : "U bent niet bevoegd om %s te delen",
+    "Sharing %s failed, because the user %s is the item owner" : "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Delen van %s is mislukt, omdat het delen met links niet is toegestaan",
+    "Share type %s is not valid for %s" : "Delen van type %s is niet geldig voor %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies",
+    "Setting permissions for %s failed, because the item was not found" : "Instellen van de permissies voor %s is mislukt, omdat het object niet is gevonden",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Kon vervaldatum niet instellen. Shares kunnen niet langer dan %s vervallen na het moment van delen",
+    "Cannot set expiration date. Expiration date is in the past" : "Kon vervaldatum niet instellen. De vervaldatum ligt in het verleden",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Het share-backend %s moet de OCP\\Share_Backend interface implementeren",
+    "Sharing backend %s not found" : "Het share-backend %s is niet gevonden",
+    "Sharing backend for %s not found" : "Het share-backend voor %s is niet gevonden",
+    "Sharing %s failed, because the user %s is the original sharer" : "Delen van %s is mislukt, omdat gebruiker %s de originele deler is",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Delen van %s is mislukt, omdat de rechten de aan %s toegekende autorisaties overschrijden",
+    "Sharing %s failed, because resharing is not allowed" : "Delen van %s is mislukt, omdat her-delen niet is toegestaan",
+    "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",
+    "seconds ago" : "seconden geleden",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minuut geleden","%n minuten geleden"],
+    "_%n hour ago_::_%n hours ago_" : ["%n uur geleden","%n uur geleden"],
+    "today" : "vandaag",
+    "yesterday" : "gisteren",
+    "_%n day go_::_%n days ago_" : ["%n dag terug","%n dagen geleden"],
+    "last month" : "vorige maand",
+    "_%n month ago_::_%n months ago_" : ["%n maand geleden","%n maanden geleden"],
+    "last year" : "vorig jaar",
+    "years ago" : "jaar geleden",
+    "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",
+    "The username is already being used" : "De gebruikersnaam bestaat al",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Geen database drivers (sqlite, mysql of postgres) geïnstalleerd.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.",
+    "Cannot write into \"config\" directory" : "Kan niet schrijven naar de \"config\" directory",
+    "Cannot write into \"apps\" directory" : "Kan niet schrijven naar de \"apps\" directory",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.",
+    "Cannot create \"data\" directory (%s)" : "Kan de \"data\" directory (%s) niet aanmaken",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dit kan worden hersteld door <a href=\"%s\" target=\"_blank\"> de webserver schrijfrechten te geven tot de hoofddirectory</a>.",
+    "Setting locale to %s failed" : "Instellen taal op %s mislukte",
+    "Please install one of these locales on your system and restart your webserver." : "Installeer één van de talen op uw systeem en herstart uw webserver.",
+    "Please ask your server administrator to install the module." : "Vraag uw beheerder om de module te installeren.",
+    "PHP module %s not installed." : "PHP module %s niet geïnstalleerd.",
+    "PHP %s or higher is required." : "PHP %s of hoger vereist.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Vraag uw beheerder om PHP bij te werken tot de laatste versie. Uw PHP versie wordt niet langer ondersteund door ownCloud en de PHP community.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode is ingeschakeld. Voor een goede werking van ownCloud moet die modus zijn uitgeschakeld.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode is niet langer zinvol en zou eigenlijk gedeactiveerd moeten worden. Vraag uw beheerder om Safe Mode in php.ini of in de webserver configuratie te deactiveren.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes is geactiveerd. Voor een goede werking van ownCloud moet dit zijn uitgeschakeld.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes is niet langer zinvol en zou eigenlijk gedeactiveerd moeten worden. Vraag uw beheerder om Safe Mode in php.ini of in de webserver configuratie te deactiveren.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP modules zijn geïnstalleerd, maar worden ze nog steeds als ontbrekend aangegeven?",
+    "Please ask your server administrator to restart the web server." : "Vraag uw beheerder de webserver opnieuw op te starten.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 vereist",
+    "Please upgrade your database version" : "Werk uw database versie bij",
+    "Error occurred while checking PostgreSQL version" : "Een fout trad op bij checken PostgreSQL versie",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Verifieer dat u PostgreSQL >=9 draait of check de logs voor meer informatie over deze fout",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Wijzig de permissies in 0770 zodat de directory niet door anderen bekeken kan worden.",
+    "Data directory (%s) is readable by other users" : "De datadirectory (%s) is leesbaar voor andere gebruikers",
+    "Data directory (%s) is invalid" : "Data directory (%s) is ongeldig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifieer dat de data directory een bestand \".ocdata\" in de hoofdmap heeft.",
+    "Could not obtain lock type %d on \"%s\"." : "Kon geen lock type %d krijgen op \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
new file mode 100644
index 00000000000..43c46b25704
--- /dev/null
+++ b/lib/l10n/nl.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Dit kan hersteld worden door de webserver schrijfrechten te geven op de de config directory",
+    "See %s" : "Zie %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %sgeven op de de config directory%s",
+    "Sample configuration detected" : "Voorbeeldconfiguratie gevonden",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert",
+    "Help" : "Help",
+    "Personal" : "Persoonlijk",
+    "Settings" : "Instellingen",
+    "Users" : "Gebruikers",
+    "Admin" : "Beheerder",
+    "Recommended" : "Aanbevolen",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.",
+    "No app name specified" : "De app naam is niet gespecificeerd.",
+    "Unknown filetype" : "Onbekend bestandsformaat",
+    "Invalid image" : "Ongeldige afbeelding",
+    "web services under your control" : "Webdiensten in eigen beheer",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Archiefbestanden van type %s niet ondersteund",
+    "Failed to open archive when installing app" : "Kon archiefbestand bij installatie van de app niet openen",
+    "App does not provide an info.xml file" : "De app heeft geen info.xml bestand",
+    "App can't be installed because of not allowed code in the App" : "De app kan niet worden geïnstalleerd wegens onjuiste code in de app",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld",
+    "Application is not enabled" : "De applicatie is niet actief",
+    "Authentication error" : "Authenticatie fout",
+    "Token expired. Please reload page." : "Token verlopen.  Herlaad de pagina.",
+    "Unknown user" : "Onbekende gebruiker",
+    "%s enter the database username." : "%s opgeven database gebruikersnaam.",
+    "%s enter the database name." : "%s opgeven databasenaam.",
+    "%s you may not use dots in the database name" : "%s er mogen geen puntjes in de databasenaam voorkomen",
+    "MS SQL username and/or password not valid: %s" : "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
+    "You need to enter either an existing account or the administrator." : "Geef of een bestaand account op of het beheerdersaccount.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB gebruikersnaam en/of wachtwoord ongeldig",
+    "DB Error: \"%s\"" : "DB Fout: \"%s\"",
+    "Offending command was: \"%s\"" : "Onjuiste commande was: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB gebruiker '%s'@'localhost' bestaat al.",
+    "Drop this user from MySQL/MariaDB" : "Verwijder deze gebruiker uit MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB gebruiker '%s'@'%%' bestaat al",
+    "Drop this user from MySQL/MariaDB." : "Verwijder deze gebruiker uit MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Er kon geen verbinding met Oracle worden bereikt",
+    "Oracle username and/or password not valid" : "Oracle gebruikersnaam en/of wachtwoord ongeldig",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
+    "Set an admin username." : "Stel de gebruikersnaam van de beheerder in.",
+    "Set an admin password." : "Stel een beheerderswachtwoord in.",
+    "Can't create or write into the data directory %s" : "Kan niets creëren of wegschrijven in datadirectory %s",
+    "%s shared »%s« with you" : "%s deelde »%s« met u",
+    "Sharing %s failed, because the file does not exist" : "Delen van %s is mislukt, omdat het bestand niet bestaat",
+    "You are not allowed to share %s" : "U bent niet bevoegd om %s te delen",
+    "Sharing %s failed, because the user %s is the item owner" : "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Delen van %s is mislukt, omdat het delen met links niet is toegestaan",
+    "Share type %s is not valid for %s" : "Delen van type %s is niet geldig voor %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies",
+    "Setting permissions for %s failed, because the item was not found" : "Instellen van de permissies voor %s is mislukt, omdat het object niet is gevonden",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Kon vervaldatum niet instellen. Shares kunnen niet langer dan %s vervallen na het moment van delen",
+    "Cannot set expiration date. Expiration date is in the past" : "Kon vervaldatum niet instellen. De vervaldatum ligt in het verleden",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Het share-backend %s moet de OCP\\Share_Backend interface implementeren",
+    "Sharing backend %s not found" : "Het share-backend %s is niet gevonden",
+    "Sharing backend for %s not found" : "Het share-backend voor %s is niet gevonden",
+    "Sharing %s failed, because the user %s is the original sharer" : "Delen van %s is mislukt, omdat gebruiker %s de originele deler is",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Delen van %s is mislukt, omdat de rechten de aan %s toegekende autorisaties overschrijden",
+    "Sharing %s failed, because resharing is not allowed" : "Delen van %s is mislukt, omdat her-delen niet is toegestaan",
+    "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",
+    "seconds ago" : "seconden geleden",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minuut geleden","%n minuten geleden"],
+    "_%n hour ago_::_%n hours ago_" : ["%n uur geleden","%n uur geleden"],
+    "today" : "vandaag",
+    "yesterday" : "gisteren",
+    "_%n day go_::_%n days ago_" : ["%n dag terug","%n dagen geleden"],
+    "last month" : "vorige maand",
+    "_%n month ago_::_%n months ago_" : ["%n maand geleden","%n maanden geleden"],
+    "last year" : "vorig jaar",
+    "years ago" : "jaar geleden",
+    "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",
+    "The username is already being used" : "De gebruikersnaam bestaat al",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Geen database drivers (sqlite, mysql of postgres) geïnstalleerd.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.",
+    "Cannot write into \"config\" directory" : "Kan niet schrijven naar de \"config\" directory",
+    "Cannot write into \"apps\" directory" : "Kan niet schrijven naar de \"apps\" directory",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.",
+    "Cannot create \"data\" directory (%s)" : "Kan de \"data\" directory (%s) niet aanmaken",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Dit kan worden hersteld door <a href=\"%s\" target=\"_blank\"> de webserver schrijfrechten te geven tot de hoofddirectory</a>.",
+    "Setting locale to %s failed" : "Instellen taal op %s mislukte",
+    "Please install one of these locales on your system and restart your webserver." : "Installeer één van de talen op uw systeem en herstart uw webserver.",
+    "Please ask your server administrator to install the module." : "Vraag uw beheerder om de module te installeren.",
+    "PHP module %s not installed." : "PHP module %s niet geïnstalleerd.",
+    "PHP %s or higher is required." : "PHP %s of hoger vereist.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Vraag uw beheerder om PHP bij te werken tot de laatste versie. Uw PHP versie wordt niet langer ondersteund door ownCloud en de PHP community.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode is ingeschakeld. Voor een goede werking van ownCloud moet die modus zijn uitgeschakeld.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode is niet langer zinvol en zou eigenlijk gedeactiveerd moeten worden. Vraag uw beheerder om Safe Mode in php.ini of in de webserver configuratie te deactiveren.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes is geactiveerd. Voor een goede werking van ownCloud moet dit zijn uitgeschakeld.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes is niet langer zinvol en zou eigenlijk gedeactiveerd moeten worden. Vraag uw beheerder om Safe Mode in php.ini of in de webserver configuratie te deactiveren.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP modules zijn geïnstalleerd, maar worden ze nog steeds als ontbrekend aangegeven?",
+    "Please ask your server administrator to restart the web server." : "Vraag uw beheerder de webserver opnieuw op te starten.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 vereist",
+    "Please upgrade your database version" : "Werk uw database versie bij",
+    "Error occurred while checking PostgreSQL version" : "Een fout trad op bij checken PostgreSQL versie",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Verifieer dat u PostgreSQL >=9 draait of check de logs voor meer informatie over deze fout",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Wijzig de permissies in 0770 zodat de directory niet door anderen bekeken kan worden.",
+    "Data directory (%s) is readable by other users" : "De datadirectory (%s) is leesbaar voor andere gebruikers",
+    "Data directory (%s) is invalid" : "Data directory (%s) is ongeldig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Verifieer dat de data directory een bestand \".ocdata\" in de hoofdmap heeft.",
+    "Could not obtain lock type %d on \"%s\"." : "Kon geen lock type %d krijgen op \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
deleted file mode 100644
index f5a81dd6ee3..00000000000
--- a/lib/l10n/nl.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Kan niet schrijven naar de \"config\" directory!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Dit kan hersteld worden door de webserver schrijfrechten te geven op de de config directory",
-"See %s" => "Zie %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Dit kan hersteld worden door de webserver schrijfrechten te %sgeven op de de config directory%s",
-"Sample configuration detected" => "Voorbeeldconfiguratie gevonden",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert",
-"Help" => "Help",
-"Personal" => "Persoonlijk",
-"Settings" => "Instellingen",
-"Users" => "Gebruikers",
-"Admin" => "Beheerder",
-"Recommended" => "Aanbevolen",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.",
-"No app name specified" => "De app naam is niet gespecificeerd.",
-"Unknown filetype" => "Onbekend bestandsformaat",
-"Invalid image" => "Ongeldige afbeelding",
-"web services under your control" => "Webdiensten in eigen beheer",
-"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",
-"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",
-"Archives of type %s are not supported" => "Archiefbestanden van type %s niet ondersteund",
-"Failed to open archive when installing app" => "Kon archiefbestand bij installatie van de app niet openen",
-"App does not provide an info.xml file" => "De app heeft geen info.xml bestand",
-"App can't be installed because of not allowed code in the App" => "De app kan niet worden geïnstalleerd wegens onjuiste code in de app",
-"App can't be installed because it is not compatible with this version of ownCloud" => "De app kan niet worden geïnstalleerd omdat die niet compatible is met deze versie van ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "De app kan niet worden geïnstallerd omdat het de <shipped>true</shipped> tag bevat die niet is toegestaan voor niet gepubliceerde apps",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "De app kan niet worden geïnstalleerd omdat de versie in info.xml/version niet dezelfde is als de versie zoals die in de app store staat vermeld",
-"Application is not enabled" => "De applicatie is niet actief",
-"Authentication error" => "Authenticatie fout",
-"Token expired. Please reload page." => "Token verlopen.  Herlaad de pagina.",
-"Unknown user" => "Onbekende gebruiker",
-"%s enter the database username." => "%s opgeven database gebruikersnaam.",
-"%s enter the database name." => "%s opgeven databasenaam.",
-"%s you may not use dots in the database name" => "%s er mogen geen puntjes in de databasenaam voorkomen",
-"MS SQL username and/or password not valid: %s" => "MS SQL gebruikersnaam en/of wachtwoord niet geldig: %s",
-"You need to enter either an existing account or the administrator." => "Geef of een bestaand account op of het beheerdersaccount.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB gebruikersnaam en/of wachtwoord ongeldig",
-"DB Error: \"%s\"" => "DB Fout: \"%s\"",
-"Offending command was: \"%s\"" => "Onjuiste commande was: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB gebruiker '%s'@'localhost' bestaat al.",
-"Drop this user from MySQL/MariaDB" => "Verwijder deze gebruiker uit MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB gebruiker '%s'@'%%' bestaat al",
-"Drop this user from MySQL/MariaDB." => "Verwijder deze gebruiker uit MySQL/MariaDB.",
-"Oracle connection could not be established" => "Er kon geen verbinding met Oracle worden bereikt",
-"Oracle username and/or password not valid" => "Oracle gebruikersnaam en/of wachtwoord ongeldig",
-"Offending command was: \"%s\", name: %s, password: %s" => "Onjuiste commando was: \"%s\", naam: %s, wachtwoord: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL gebruikersnaam en/of wachtwoord ongeldig",
-"Set an admin username." => "Stel de gebruikersnaam van de beheerder in.",
-"Set an admin password." => "Stel een beheerderswachtwoord in.",
-"Can't create or write into the data directory %s" => "Kan niets creëren of wegschrijven in datadirectory %s",
-"%s shared »%s« with you" => "%s deelde »%s« met u",
-"Sharing %s failed, because the file does not exist" => "Delen van %s is mislukt, omdat het bestand niet bestaat",
-"You are not allowed to share %s" => "U bent niet bevoegd om %s te delen",
-"Sharing %s failed, because the user %s is the item owner" => "Delen van %s is mislukt, omdat de gebruiker %s de eigenaar is",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Delen van %s is mislukt, omdat het delen met links niet is toegestaan",
-"Share type %s is not valid for %s" => "Delen van type %s is niet geldig voor %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Instellen van de permissies voor %s is mislukt, omdat de permissies hoger zijn dan de aan %s toegekende permissies",
-"Setting permissions for %s failed, because the item was not found" => "Instellen van de permissies voor %s is mislukt, omdat het object niet is gevonden",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Kon vervaldatum niet instellen. Shares kunnen niet langer dan %s vervallen na het moment van delen",
-"Cannot set expiration date. Expiration date is in the past" => "Kon vervaldatum niet instellen. De vervaldatum ligt in het verleden",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Het share-backend %s moet de OCP\\Share_Backend interface implementeren",
-"Sharing backend %s not found" => "Het share-backend %s is niet gevonden",
-"Sharing backend for %s not found" => "Het share-backend voor %s is niet gevonden",
-"Sharing %s failed, because the user %s is the original sharer" => "Delen van %s is mislukt, omdat gebruiker %s de originele deler is",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Delen van %s is mislukt, omdat de rechten de aan %s toegekende autorisaties overschrijden",
-"Sharing %s failed, because resharing is not allowed" => "Delen van %s is mislukt, omdat her-delen niet is toegestaan",
-"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",
-"seconds ago" => "seconden geleden",
-"_%n minute ago_::_%n minutes ago_" => array("%n minuut geleden","%n minuten geleden"),
-"_%n hour ago_::_%n hours ago_" => array("%n uur geleden","%n uur geleden"),
-"today" => "vandaag",
-"yesterday" => "gisteren",
-"_%n day go_::_%n days ago_" => array("%n dag terug","%n dagen geleden"),
-"last month" => "vorige maand",
-"_%n month ago_::_%n months ago_" => array("%n maand geleden","%n maanden geleden"),
-"last year" => "vorig jaar",
-"years ago" => "jaar geleden",
-"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",
-"The username is already being used" => "De gebruikersnaam bestaat al",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Geen database drivers (sqlite, mysql of postgres) geïnstalleerd.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de hoofddirectory %s.",
-"Cannot write into \"config\" directory" => "Kan niet schrijven naar de \"config\" directory",
-"Cannot write into \"apps\" directory" => "Kan niet schrijven naar de \"apps\" directory",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Dit kan hersteld worden door de webserver schrijfrechten te %s geven op de appsdirectory %s of door de appstore te deactiveren in het configbestand.",
-"Cannot create \"data\" directory (%s)" => "Kan de \"data\" directory (%s) niet aanmaken",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Dit kan worden hersteld door <a href=\"%s\" target=\"_blank\"> de webserver schrijfrechten te geven tot de hoofddirectory</a>.",
-"Setting locale to %s failed" => "Instellen taal op %s mislukte",
-"Please install one of these locales on your system and restart your webserver." => "Installeer één van de talen op uw systeem en herstart uw webserver.",
-"Please ask your server administrator to install the module." => "Vraag uw beheerder om de module te installeren.",
-"PHP module %s not installed." => "PHP module %s niet geïnstalleerd.",
-"PHP %s or higher is required." => "PHP %s of hoger vereist.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Vraag uw beheerder om PHP bij te werken tot de laatste versie. Uw PHP versie wordt niet langer ondersteund door ownCloud en de PHP community.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode is ingeschakeld. Voor een goede werking van ownCloud moet die modus zijn uitgeschakeld.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode is niet langer zinvol en zou eigenlijk gedeactiveerd moeten worden. Vraag uw beheerder om Safe Mode in php.ini of in de webserver configuratie te deactiveren.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes is geactiveerd. Voor een goede werking van ownCloud moet dit zijn uitgeschakeld.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes is niet langer zinvol en zou eigenlijk gedeactiveerd moeten worden. Vraag uw beheerder om Safe Mode in php.ini of in de webserver configuratie te deactiveren.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP modules zijn geïnstalleerd, maar worden ze nog steeds als ontbrekend aangegeven?",
-"Please ask your server administrator to restart the web server." => "Vraag uw beheerder de webserver opnieuw op te starten.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 vereist",
-"Please upgrade your database version" => "Werk uw database versie bij",
-"Error occurred while checking PostgreSQL version" => "Een fout trad op bij checken PostgreSQL versie",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Verifieer dat u PostgreSQL >=9 draait of check de logs voor meer informatie over deze fout",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Wijzig de permissies in 0770 zodat de directory niet door anderen bekeken kan worden.",
-"Data directory (%s) is readable by other users" => "De datadirectory (%s) is leesbaar voor andere gebruikers",
-"Data directory (%s) is invalid" => "Data directory (%s) is ongeldig",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Verifieer dat de data directory een bestand \".ocdata\" in de hoofdmap heeft.",
-"Could not obtain lock type %d on \"%s\"." => "Kon geen lock type %d krijgen op \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nn_NO.js b/lib/l10n/nn_NO.js
new file mode 100644
index 00000000000..a8424759edd
--- /dev/null
+++ b/lib/l10n/nn_NO.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Hjelp",
+    "Personal" : "Personleg",
+    "Settings" : "Innstillingar",
+    "Users" : "Brukarar",
+    "Admin" : "Administrer",
+    "Unknown filetype" : "Ukjend filtype",
+    "Invalid image" : "Ugyldig bilete",
+    "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",
+    "seconds ago" : "sekund sidan",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minutt sidan"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n timar sidan"],
+    "today" : "i dag",
+    "yesterday" : "i går",
+    "_%n day go_::_%n days ago_" : ["","%n dagar sidan"],
+    "last month" : "førre månad",
+    "_%n month ago_::_%n months ago_" : ["","%n månadar sidan"],
+    "last year" : "i fjor",
+    "years ago" : "år sidan",
+    "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
+    "A valid password must be provided" : "Du må oppgje eit gyldig passord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/nn_NO.json b/lib/l10n/nn_NO.json
new file mode 100644
index 00000000000..582a7289718
--- /dev/null
+++ b/lib/l10n/nn_NO.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Help" : "Hjelp",
+    "Personal" : "Personleg",
+    "Settings" : "Innstillingar",
+    "Users" : "Brukarar",
+    "Admin" : "Administrer",
+    "Unknown filetype" : "Ukjend filtype",
+    "Invalid image" : "Ugyldig bilete",
+    "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",
+    "seconds ago" : "sekund sidan",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minutt sidan"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n timar sidan"],
+    "today" : "i dag",
+    "yesterday" : "i går",
+    "_%n day go_::_%n days ago_" : ["","%n dagar sidan"],
+    "last month" : "førre månad",
+    "_%n month ago_::_%n months ago_" : ["","%n månadar sidan"],
+    "last year" : "i fjor",
+    "years ago" : "år sidan",
+    "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);"
+}
\ No newline at end of file
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
deleted file mode 100644
index c381e81ff28..00000000000
--- a/lib/l10n/nn_NO.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Hjelp",
-"Personal" => "Personleg",
-"Settings" => "Innstillingar",
-"Users" => "Brukarar",
-"Admin" => "Administrer",
-"Unknown filetype" => "Ukjend filtype",
-"Invalid image" => "Ugyldig bilete",
-"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",
-"seconds ago" => "sekund sidan",
-"_%n minute ago_::_%n minutes ago_" => array("","%n minutt sidan"),
-"_%n hour ago_::_%n hours ago_" => array("","%n timar sidan"),
-"today" => "i dag",
-"yesterday" => "i går",
-"_%n day go_::_%n days ago_" => array("","%n dagar sidan"),
-"last month" => "førre månad",
-"_%n month ago_::_%n months ago_" => array("","%n månadar sidan"),
-"last year" => "i fjor",
-"years ago" => "år sidan",
-"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
-"A valid password must be provided" => "Du må oppgje eit gyldig passord"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/nqo.js b/lib/l10n/nqo.js
new file mode 100644
index 00000000000..0f4a002019e
--- /dev/null
+++ b/lib/l10n/nqo.js
@@ -0,0 +1,9 @@
+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=1; plural=0;");
diff --git a/lib/l10n/nqo.json b/lib/l10n/nqo.json
new file mode 100644
index 00000000000..4a03cf5047e
--- /dev/null
+++ b/lib/l10n/nqo.json
@@ -0,0 +1,7 @@
+{ "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=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/nqo.php b/lib/l10n/nqo.php
deleted file mode 100644
index e7b09649a24..00000000000
--- a/lib/l10n/nqo.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"_%n day go_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/oc.js b/lib/l10n/oc.js
new file mode 100644
index 00000000000..b6419372101
--- /dev/null
+++ b/lib/l10n/oc.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Ajuda",
+    "Personal" : "Personal",
+    "Settings" : "Configuracion",
+    "Users" : "Usancièrs",
+    "Admin" : "Admin",
+    "web services under your control" : "Services web jos ton contraròtle",
+    "Authentication error" : "Error d'autentificacion",
+    "seconds ago" : "segonda a",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "uèi",
+    "yesterday" : "ièr",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "mes passat",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "an passat",
+    "years ago" : "ans a"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/oc.json b/lib/l10n/oc.json
new file mode 100644
index 00000000000..df72d194def
--- /dev/null
+++ b/lib/l10n/oc.json
@@ -0,0 +1,20 @@
+{ "translations": {
+    "Help" : "Ajuda",
+    "Personal" : "Personal",
+    "Settings" : "Configuracion",
+    "Users" : "Usancièrs",
+    "Admin" : "Admin",
+    "web services under your control" : "Services web jos ton contraròtle",
+    "Authentication error" : "Error d'autentificacion",
+    "seconds ago" : "segonda a",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "uèi",
+    "yesterday" : "ièr",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "mes passat",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "an passat",
+    "years ago" : "ans a"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php
deleted file mode 100644
index 417b3825bf0..00000000000
--- a/lib/l10n/oc.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Ajuda",
-"Personal" => "Personal",
-"Settings" => "Configuracion",
-"Users" => "Usancièrs",
-"Admin" => "Admin",
-"web services under your control" => "Services web jos ton contraròtle",
-"Authentication error" => "Error d'autentificacion",
-"seconds ago" => "segonda a",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "uèi",
-"yesterday" => "ièr",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "mes passat",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "an passat",
-"years ago" => "ans a"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/or_IN.js b/lib/l10n/or_IN.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/or_IN.js
@@ -0,0 +1,9 @@
+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/or_IN.json b/lib/l10n/or_IN.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/or_IN.json
@@ -0,0 +1,7 @@
+{ "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/or_IN.php b/lib/l10n/or_IN.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/or_IN.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/pa.js b/lib/l10n/pa.js
new file mode 100644
index 00000000000..0c3dd4c553e
--- /dev/null
+++ b/lib/l10n/pa.js
@@ -0,0 +1,16 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Settings" : "ਸੈਟਿੰਗ",
+    "seconds ago" : "ਸਕਿੰਟ ਪਹਿਲਾਂ",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "ਅੱਜ",
+    "yesterday" : "ਕੱਲ੍ਹ",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "ਪਿਛਲੇ ਮਹੀਨੇ",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "ਪਿਛਲੇ ਸਾਲ",
+    "years ago" : "ਸਾਲਾਂ ਪਹਿਲਾਂ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/pa.json b/lib/l10n/pa.json
new file mode 100644
index 00000000000..4fc6757c692
--- /dev/null
+++ b/lib/l10n/pa.json
@@ -0,0 +1,14 @@
+{ "translations": {
+    "Settings" : "ਸੈਟਿੰਗ",
+    "seconds ago" : "ਸਕਿੰਟ ਪਹਿਲਾਂ",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "ਅੱਜ",
+    "yesterday" : "ਕੱਲ੍ਹ",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "ਪਿਛਲੇ ਮਹੀਨੇ",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "ਪਿਛਲੇ ਸਾਲ",
+    "years ago" : "ਸਾਲਾਂ ਪਹਿਲਾਂ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/pa.php b/lib/l10n/pa.php
deleted file mode 100644
index 07738a90917..00000000000
--- a/lib/l10n/pa.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "ਸੈਟਿੰਗ",
-"seconds ago" => "ਸਕਿੰਟ ਪਹਿਲਾਂ",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "ਅੱਜ",
-"yesterday" => "ਕੱਲ੍ਹ",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "ਪਿਛਲੇ ਮਹੀਨੇ",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "ਪਿਛਲੇ ਸਾਲ",
-"years ago" => "ਸਾਲਾਂ ਪਹਿਲਾਂ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
new file mode 100644
index 00000000000..318c9c44345
--- /dev/null
+++ b/lib/l10n/pl.js
@@ -0,0 +1,122 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Nie można zapisać do katalogu \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Można to zwykle rozwiązać przez dodanie serwerowi www uprawnień zapisu do katalogu config.",
+    "See %s" : "Zobacz %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu config%s.",
+    "Sample configuration detected" : "Wykryto przykładową konfigurację",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Wykryto skopiowanie przykładowej konfiguracji. To może popsuć Twoją instalację i nie jest wspierane. Proszę przeczytać dokumentację przed dokonywaniem zmian w config.php",
+    "Help" : "Pomoc",
+    "Personal" : "Osobiste",
+    "Settings" : "Ustawienia",
+    "Users" : "Użytkownicy",
+    "Admin" : "Administrator",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikacja  \\\"%s\\\" nie może zostać zainstalowana ponieważ nie jest kompatybilna z tą wersją ownCloud.",
+    "No app name specified" : "Nie określono nazwy aplikacji",
+    "Unknown filetype" : "Nieznany typ pliku",
+    "Invalid image" : "Błędne zdjęcie",
+    "web services under your control" : "Kontrolowane serwisy",
+    "App directory already exists" : "Katalog aplikacji już isnieje",
+    "Can't create app folder. Please fix permissions. %s" : "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s",
+    "No source specified when installing app" : "Nie określono źródła  podczas instalacji aplikacji",
+    "No href specified when installing app from http" : "Nie określono linku skąd aplikacja ma być zainstalowana",
+    "No path specified when installing app from local file" : "Nie określono lokalnego pliku z którego miała być instalowana aplikacja",
+    "Archives of type %s are not supported" : "Typ archiwum %s nie jest obsługiwany",
+    "Failed to open archive when installing app" : "Nie udało się otworzyć archiwum podczas instalacji aplikacji",
+    "App does not provide an info.xml file" : "Aplikacja nie posiada pliku info.xml",
+    "App can't be installed because of not allowed code in the App" : "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store",
+    "Application is not enabled" : "Aplikacja nie jest włączona",
+    "Authentication error" : "Błąd uwierzytelniania",
+    "Token expired. Please reload page." : "Token wygasł. Proszę ponownie załadować stronę.",
+    "Unknown user" : "Nieznany użytkownik",
+    "%s enter the database username." : "%s wpisz nazwę użytkownika do  bazy",
+    "%s enter the database name." : "%s wpisz nazwę bazy.",
+    "%s you may not use dots in the database name" : "%s nie można używać kropki w nazwie bazy danych",
+    "MS SQL username and/or password not valid: %s" : "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
+    "You need to enter either an existing account or the administrator." : "Należy wprowadzić istniejące konto użytkownika lub  administratora.",
+    "MySQL/MariaDB username and/or password not valid" : "Użytkownik i/lub hasło do MySQL/MariaDB są niepoprawne",
+    "DB Error: \"%s\"" : "Błąd DB: \"%s\"",
+    "Offending command was: \"%s\"" : "Niepoprawna komenda: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Użytkownik '%s'@'localhost' MySQL/MariaDB już istnieje.",
+    "Drop this user from MySQL/MariaDB" : "Usuń tego użytkownika z MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Użytkownik  '%s'@'%%' MySQL/MariaDB już istnieje.",
+    "Drop this user from MySQL/MariaDB." : "Usuń tego użytkownika z MySQL/MariaDB",
+    "Oracle connection could not be established" : "Nie można ustanowić połączenia z bazą Oracle",
+    "Oracle username and/or password not valid" : "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
+    "Set an admin username." : "Ustaw nazwę administratora.",
+    "Set an admin password." : "Ustaw hasło administratora.",
+    "%s shared »%s« with you" : "%s Współdzielone »%s« z tobą",
+    "Sharing %s failed, because the file does not exist" : "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
+    "You are not allowed to share %s" : "Nie masz uprawnień aby udostępnić %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest właścicielem elementu",
+    "Sharing %s failed, because the user %s does not exist" : "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie istnieje",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie jest członkiem żadnej grupy której członkiem jest %s",
+    "Sharing %s failed, because this item is already shared with %s" : "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s",
+    "Sharing %s failed, because the group %s does not exist" : "Współdzielenie %s nie powiodło się, ponieważ grupa %s nie istnieje",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Współdzielenie %s nie powiodło się, ponieważ %s nie jest członkiem grupy %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Musisz zapewnić hasło aby utworzyć link publiczny, dozwolone są tylko linki chronione",
+    "Sharing %s failed, because sharing with links is not allowed" : "Współdzielenie %s nie powiodło się, ponieważ współdzielenie z linkami nie jest dozwolone",
+    "Share type %s is not valid for %s" : "Typ udziału %s nie jest właściwy dla %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s",
+    "Setting permissions for %s failed, because the item was not found" : "Ustawienie uprawnień dla %s nie powiodło się, ponieważ element nie został znaleziony",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nie można ustawić daty wygaśnięcia. Udziały nie mogą wygasać później niż %s od momentu udostępnienia",
+    "Cannot set expiration date. Expiration date is in the past" : "Nie można ustawić daty wygaśnięcia. Data wygaśnięcia jest w przeszłości.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Zaplecze do współdzielenia %s musi implementować interfejs OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Zaplecze %s do współdzielenia nie zostało znalezione",
+    "Sharing backend for %s not found" : "Zaplecze do współdzielenia %s nie zostało znalezione",
+    "Sharing %s failed, because the user %s is the original sharer" : "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest udostępniającym",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Współdzielenie %s nie powiodło się, ponieważ uprawnienia przekraczają te udzielone %s",
+    "Sharing %s failed, because resharing is not allowed" : "Współdzielenie %s nie powiodło się, ponieważ ponowne współdzielenie nie jest dozwolone",
+    "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\"",
+    "seconds ago" : "sekund temu",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minute temu","%n minut temu","%n minut temu"],
+    "_%n hour ago_::_%n hours ago_" : ["%n godzinę temu","%n godzin temu","%n godzin temu"],
+    "today" : "dziś",
+    "yesterday" : "wczoraj",
+    "_%n day go_::_%n days ago_" : ["%n dzień temu","%n dni temu","%n dni temu"],
+    "last month" : "w zeszłym miesiącu",
+    "_%n month ago_::_%n months ago_" : ["%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"],
+    "last year" : "w zeszłym roku",
+    "years ago" : "lat temu",
+    "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",
+    "The username is already being used" : "Ta nazwa użytkownika jest już używana",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Brak sterowników bazy danych (sqlite, mysql or postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Problemy z uprawnieniami można zwykle naprawić  przez %sdodanie serwerowi www uprawnień zapisu do katalogu głównego%s.",
+    "Cannot write into \"config\" directory" : "Nie można zapisać do katalogu \"config\"",
+    "Cannot write into \"apps\" directory" : "Nie można zapisać do katalogu \"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." : "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu apps%s lub wyłączenie appstore w pliku konfiguracyjnym.",
+    "Cannot create \"data\" directory (%s)" : "Nie można utworzyć katalogu \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Można to zwykle rozwiązać przez <a href=\"%s\" target=\"_blank\">dodanie serwerowi www uprawnień zapisu do katalogu głównego</a>.",
+    "Setting locale to %s failed" : "Nie udało się zmienić języka na %s",
+    "Please install one of these locales on your system and restart your webserver." : "Proszę zainstalować jedno z poniższych locale w Twoim systemie i uruchomić ponownie serwer www.",
+    "Please ask your server administrator to install the module." : "Proszę poproś administratora serwera aby zainstalował ten moduł.",
+    "PHP module %s not installed." : "Moduł PHP %s nie jest zainstalowany.",
+    "PHP %s or higher is required." : "PHP %s lub wyższe jest wymagane.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Proszę poproś administratora serwera aby zaktualizował PHP do najnowszej wersji. Twoja wersja PHP nie jest już dłużej wspierana przez ownCloud i społeczność PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Bezpieczny tryb PHP jest aktywny. ownCloud do poprawnej pracy wymaga aby był on wyłączony.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Bezpieczny tryb PHP jest przestarzały i w większości bezużyteczny i powinien być wyłączony. Proszę poproś administratora serwera aby wyłączył go w php.ini lub w pliku konfiguracyjnym serwera www.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes są włączone. Do poprawnego działania ownCloud wymagane jest ich wyłączenie.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes to przestarzałe i zasadniczo bezużyteczne ustawienie, które powinno być wyłączone. Poproś administratora serwera, by wyłączył je w php.ini albo w konfiguracji serwera www.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Moduły PHP zostały zainstalowane, ale nadal brakuje ich na liście?",
+    "Please ask your server administrator to restart the web server." : "Poproś administratora serwera o restart serwera www.",
+    "PostgreSQL >= 9 required" : "Wymagany PostgreSQL >= 9",
+    "Please upgrade your database version" : "Uaktualnij wersję bazy danych",
+    "Error occurred while checking PostgreSQL version" : "Wystąpił błąd podczas sprawdzania wersji PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Upewnij się, że PostgreSQL jest w wersji co najmniej 9 lub sprawdź log by uzyskać więcej informacji na temat błędu",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Zmień uprawnienia na 0770, żeby ukryć zawartość katalogu przed innymi użytkownikami.",
+    "Data directory (%s) is readable by other users" : "Katalog danych (%s) jest możliwy do odczytania przez innych użytkowników",
+    "Data directory (%s) is invalid" : "Katalog danych (%s) jest nieprawidłowy",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Sprawdź, czy katalog danych zawiera plik \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Nie można uzyskać blokady typu %d na \"%s\"."
+},
+"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
new file mode 100644
index 00000000000..354dfb065b4
--- /dev/null
+++ b/lib/l10n/pl.json
@@ -0,0 +1,120 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Nie można zapisać do katalogu \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Można to zwykle rozwiązać przez dodanie serwerowi www uprawnień zapisu do katalogu config.",
+    "See %s" : "Zobacz %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu config%s.",
+    "Sample configuration detected" : "Wykryto przykładową konfigurację",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Wykryto skopiowanie przykładowej konfiguracji. To może popsuć Twoją instalację i nie jest wspierane. Proszę przeczytać dokumentację przed dokonywaniem zmian w config.php",
+    "Help" : "Pomoc",
+    "Personal" : "Osobiste",
+    "Settings" : "Ustawienia",
+    "Users" : "Użytkownicy",
+    "Admin" : "Administrator",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikacja  \\\"%s\\\" nie może zostać zainstalowana ponieważ nie jest kompatybilna z tą wersją ownCloud.",
+    "No app name specified" : "Nie określono nazwy aplikacji",
+    "Unknown filetype" : "Nieznany typ pliku",
+    "Invalid image" : "Błędne zdjęcie",
+    "web services under your control" : "Kontrolowane serwisy",
+    "App directory already exists" : "Katalog aplikacji już isnieje",
+    "Can't create app folder. Please fix permissions. %s" : "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s",
+    "No source specified when installing app" : "Nie określono źródła  podczas instalacji aplikacji",
+    "No href specified when installing app from http" : "Nie określono linku skąd aplikacja ma być zainstalowana",
+    "No path specified when installing app from local file" : "Nie określono lokalnego pliku z którego miała być instalowana aplikacja",
+    "Archives of type %s are not supported" : "Typ archiwum %s nie jest obsługiwany",
+    "Failed to open archive when installing app" : "Nie udało się otworzyć archiwum podczas instalacji aplikacji",
+    "App does not provide an info.xml file" : "Aplikacja nie posiada pliku info.xml",
+    "App can't be installed because of not allowed code in the App" : "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store",
+    "Application is not enabled" : "Aplikacja nie jest włączona",
+    "Authentication error" : "Błąd uwierzytelniania",
+    "Token expired. Please reload page." : "Token wygasł. Proszę ponownie załadować stronę.",
+    "Unknown user" : "Nieznany użytkownik",
+    "%s enter the database username." : "%s wpisz nazwę użytkownika do  bazy",
+    "%s enter the database name." : "%s wpisz nazwę bazy.",
+    "%s you may not use dots in the database name" : "%s nie można używać kropki w nazwie bazy danych",
+    "MS SQL username and/or password not valid: %s" : "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
+    "You need to enter either an existing account or the administrator." : "Należy wprowadzić istniejące konto użytkownika lub  administratora.",
+    "MySQL/MariaDB username and/or password not valid" : "Użytkownik i/lub hasło do MySQL/MariaDB są niepoprawne",
+    "DB Error: \"%s\"" : "Błąd DB: \"%s\"",
+    "Offending command was: \"%s\"" : "Niepoprawna komenda: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Użytkownik '%s'@'localhost' MySQL/MariaDB już istnieje.",
+    "Drop this user from MySQL/MariaDB" : "Usuń tego użytkownika z MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Użytkownik  '%s'@'%%' MySQL/MariaDB już istnieje.",
+    "Drop this user from MySQL/MariaDB." : "Usuń tego użytkownika z MySQL/MariaDB",
+    "Oracle connection could not be established" : "Nie można ustanowić połączenia z bazą Oracle",
+    "Oracle username and/or password not valid" : "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
+    "Set an admin username." : "Ustaw nazwę administratora.",
+    "Set an admin password." : "Ustaw hasło administratora.",
+    "%s shared »%s« with you" : "%s Współdzielone »%s« z tobą",
+    "Sharing %s failed, because the file does not exist" : "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
+    "You are not allowed to share %s" : "Nie masz uprawnień aby udostępnić %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest właścicielem elementu",
+    "Sharing %s failed, because the user %s does not exist" : "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie istnieje",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie jest członkiem żadnej grupy której członkiem jest %s",
+    "Sharing %s failed, because this item is already shared with %s" : "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s",
+    "Sharing %s failed, because the group %s does not exist" : "Współdzielenie %s nie powiodło się, ponieważ grupa %s nie istnieje",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Współdzielenie %s nie powiodło się, ponieważ %s nie jest członkiem grupy %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Musisz zapewnić hasło aby utworzyć link publiczny, dozwolone są tylko linki chronione",
+    "Sharing %s failed, because sharing with links is not allowed" : "Współdzielenie %s nie powiodło się, ponieważ współdzielenie z linkami nie jest dozwolone",
+    "Share type %s is not valid for %s" : "Typ udziału %s nie jest właściwy dla %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s",
+    "Setting permissions for %s failed, because the item was not found" : "Ustawienie uprawnień dla %s nie powiodło się, ponieważ element nie został znaleziony",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Nie można ustawić daty wygaśnięcia. Udziały nie mogą wygasać później niż %s od momentu udostępnienia",
+    "Cannot set expiration date. Expiration date is in the past" : "Nie można ustawić daty wygaśnięcia. Data wygaśnięcia jest w przeszłości.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Zaplecze do współdzielenia %s musi implementować interfejs OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Zaplecze %s do współdzielenia nie zostało znalezione",
+    "Sharing backend for %s not found" : "Zaplecze do współdzielenia %s nie zostało znalezione",
+    "Sharing %s failed, because the user %s is the original sharer" : "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest udostępniającym",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Współdzielenie %s nie powiodło się, ponieważ uprawnienia przekraczają te udzielone %s",
+    "Sharing %s failed, because resharing is not allowed" : "Współdzielenie %s nie powiodło się, ponieważ ponowne współdzielenie nie jest dozwolone",
+    "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\"",
+    "seconds ago" : "sekund temu",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minute temu","%n minut temu","%n minut temu"],
+    "_%n hour ago_::_%n hours ago_" : ["%n godzinę temu","%n godzin temu","%n godzin temu"],
+    "today" : "dziś",
+    "yesterday" : "wczoraj",
+    "_%n day go_::_%n days ago_" : ["%n dzień temu","%n dni temu","%n dni temu"],
+    "last month" : "w zeszłym miesiącu",
+    "_%n month ago_::_%n months ago_" : ["%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"],
+    "last year" : "w zeszłym roku",
+    "years ago" : "lat temu",
+    "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",
+    "The username is already being used" : "Ta nazwa użytkownika jest już używana",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Brak sterowników bazy danych (sqlite, mysql or postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Problemy z uprawnieniami można zwykle naprawić  przez %sdodanie serwerowi www uprawnień zapisu do katalogu głównego%s.",
+    "Cannot write into \"config\" directory" : "Nie można zapisać do katalogu \"config\"",
+    "Cannot write into \"apps\" directory" : "Nie można zapisać do katalogu \"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." : "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu apps%s lub wyłączenie appstore w pliku konfiguracyjnym.",
+    "Cannot create \"data\" directory (%s)" : "Nie można utworzyć katalogu \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Można to zwykle rozwiązać przez <a href=\"%s\" target=\"_blank\">dodanie serwerowi www uprawnień zapisu do katalogu głównego</a>.",
+    "Setting locale to %s failed" : "Nie udało się zmienić języka na %s",
+    "Please install one of these locales on your system and restart your webserver." : "Proszę zainstalować jedno z poniższych locale w Twoim systemie i uruchomić ponownie serwer www.",
+    "Please ask your server administrator to install the module." : "Proszę poproś administratora serwera aby zainstalował ten moduł.",
+    "PHP module %s not installed." : "Moduł PHP %s nie jest zainstalowany.",
+    "PHP %s or higher is required." : "PHP %s lub wyższe jest wymagane.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Proszę poproś administratora serwera aby zaktualizował PHP do najnowszej wersji. Twoja wersja PHP nie jest już dłużej wspierana przez ownCloud i społeczność PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Bezpieczny tryb PHP jest aktywny. ownCloud do poprawnej pracy wymaga aby był on wyłączony.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Bezpieczny tryb PHP jest przestarzały i w większości bezużyteczny i powinien być wyłączony. Proszę poproś administratora serwera aby wyłączył go w php.ini lub w pliku konfiguracyjnym serwera www.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes są włączone. Do poprawnego działania ownCloud wymagane jest ich wyłączenie.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes to przestarzałe i zasadniczo bezużyteczne ustawienie, które powinno być wyłączone. Poproś administratora serwera, by wyłączył je w php.ini albo w konfiguracji serwera www.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Moduły PHP zostały zainstalowane, ale nadal brakuje ich na liście?",
+    "Please ask your server administrator to restart the web server." : "Poproś administratora serwera o restart serwera www.",
+    "PostgreSQL >= 9 required" : "Wymagany PostgreSQL >= 9",
+    "Please upgrade your database version" : "Uaktualnij wersję bazy danych",
+    "Error occurred while checking PostgreSQL version" : "Wystąpił błąd podczas sprawdzania wersji PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Upewnij się, że PostgreSQL jest w wersji co najmniej 9 lub sprawdź log by uzyskać więcej informacji na temat błędu",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Zmień uprawnienia na 0770, żeby ukryć zawartość katalogu przed innymi użytkownikami.",
+    "Data directory (%s) is readable by other users" : "Katalog danych (%s) jest możliwy do odczytania przez innych użytkowników",
+    "Data directory (%s) is invalid" : "Katalog danych (%s) jest nieprawidłowy",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Sprawdź, czy katalog danych zawiera plik \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Nie można uzyskać blokady typu %d na \"%s\"."
+},"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/lib/l10n/pl.php b/lib/l10n/pl.php
deleted file mode 100644
index 81c844f6d5f..00000000000
--- a/lib/l10n/pl.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Nie można zapisać do katalogu \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Można to zwykle rozwiązać przez dodanie serwerowi www uprawnień zapisu do katalogu config.",
-"See %s" => "Zobacz %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu config%s.",
-"Sample configuration detected" => "Wykryto przykładową konfigurację",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Wykryto skopiowanie przykładowej konfiguracji. To może popsuć Twoją instalację i nie jest wspierane. Proszę przeczytać dokumentację przed dokonywaniem zmian w config.php",
-"Help" => "Pomoc",
-"Personal" => "Osobiste",
-"Settings" => "Ustawienia",
-"Users" => "Użytkownicy",
-"Admin" => "Administrator",
-"Recommended" => "Polecane",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikacja  \\\"%s\\\" nie może zostać zainstalowana ponieważ nie jest kompatybilna z tą wersją ownCloud.",
-"No app name specified" => "Nie określono nazwy aplikacji",
-"Unknown filetype" => "Nieznany typ pliku",
-"Invalid image" => "Błędne zdjęcie",
-"web services under your control" => "Kontrolowane serwisy",
-"App directory already exists" => "Katalog aplikacji już isnieje",
-"Can't create app folder. Please fix permissions. %s" => "Nie mogę utworzyć katalogu aplikacji. Proszę popraw uprawnienia. %s",
-"No source specified when installing app" => "Nie określono źródła  podczas instalacji aplikacji",
-"No href specified when installing app from http" => "Nie określono linku skąd aplikacja ma być zainstalowana",
-"No path specified when installing app from local file" => "Nie określono lokalnego pliku z którego miała być instalowana aplikacja",
-"Archives of type %s are not supported" => "Typ archiwum %s nie jest obsługiwany",
-"Failed to open archive when installing app" => "Nie udało się otworzyć archiwum podczas instalacji aplikacji",
-"App does not provide an info.xml file" => "Aplikacja nie posiada pliku info.xml",
-"App can't be installed because of not allowed code in the App" => "Aplikacja nie może być zainstalowany ponieważ nie dopuszcza kod w aplikacji",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikacja nie może zostać zainstalowana ponieważ jest niekompatybilna z tą wersja ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikacja nie może być zainstalowana ponieważ true tag nie jest <shipped>true</shipped> , co nie jest dozwolone dla aplikacji nie wysłanych",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Nie można zainstalować aplikacji, ponieważ w wersji info.xml/version nie jest taka sama, jak wersja z app store",
-"Application is not enabled" => "Aplikacja nie jest włączona",
-"Authentication error" => "Błąd uwierzytelniania",
-"Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.",
-"Unknown user" => "Nieznany użytkownik",
-"%s enter the database username." => "%s wpisz nazwę użytkownika do  bazy",
-"%s enter the database name." => "%s wpisz nazwę bazy.",
-"%s you may not use dots in the database name" => "%s nie można używać kropki w nazwie bazy danych",
-"MS SQL username and/or password not valid: %s" => "Nazwa i/lub hasło serwera MS SQL jest niepoprawne: %s.",
-"You need to enter either an existing account or the administrator." => "Należy wprowadzić istniejące konto użytkownika lub  administratora.",
-"MySQL/MariaDB username and/or password not valid" => "Użytkownik i/lub hasło do MySQL/MariaDB są niepoprawne",
-"DB Error: \"%s\"" => "Błąd DB: \"%s\"",
-"Offending command was: \"%s\"" => "Niepoprawna komenda: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "Użytkownik '%s'@'localhost' MySQL/MariaDB już istnieje.",
-"Drop this user from MySQL/MariaDB" => "Usuń tego użytkownika z MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Użytkownik  '%s'@'%%' MySQL/MariaDB już istnieje.",
-"Drop this user from MySQL/MariaDB." => "Usuń tego użytkownika z MySQL/MariaDB",
-"Oracle connection could not be established" => "Nie można ustanowić połączenia z bazą Oracle",
-"Oracle username and/or password not valid" => "Oracle: Nazwa użytkownika i/lub hasło jest niepoprawne",
-"Offending command was: \"%s\", name: %s, password: %s" => "Niepoprawne polecania:  \"%s\", nazwa: %s, hasło: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
-"Set an admin username." => "Ustaw nazwę administratora.",
-"Set an admin password." => "Ustaw hasło administratora.",
-"Can't create or write into the data directory %s" => "Nie można tworzyć ani zapisywać w katalogu %s",
-"%s shared »%s« with you" => "%s Współdzielone »%s« z tobą",
-"Sharing %s failed, because the file does not exist" => "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
-"You are not allowed to share %s" => "Nie masz uprawnień aby udostępnić %s",
-"Sharing %s failed, because the user %s is the item owner" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest właścicielem elementu",
-"Sharing %s failed, because the user %s does not exist" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie istnieje",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s nie jest członkiem żadnej grupy której członkiem jest %s",
-"Sharing %s failed, because this item is already shared with %s" => "Współdzielenie %s nie powiodło się, ponieważ element jest już współdzielony z %s",
-"Sharing %s failed, because the group %s does not exist" => "Współdzielenie %s nie powiodło się, ponieważ grupa %s nie istnieje",
-"Sharing %s failed, because %s is not a member of the group %s" => "Współdzielenie %s nie powiodło się, ponieważ %s nie jest członkiem grupy %s",
-"You need to provide a password to create a public link, only protected links are allowed" => "Musisz zapewnić hasło aby utworzyć link publiczny, dozwolone są tylko linki chronione",
-"Sharing %s failed, because sharing with links is not allowed" => "Współdzielenie %s nie powiodło się, ponieważ współdzielenie z linkami nie jest dozwolone",
-"Share type %s is not valid for %s" => "Typ udziału %s nie jest właściwy dla %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Ustawienie uprawnień dla %s nie powiodło się, ponieważ uprawnienia wykraczają poza przydzielone %s",
-"Setting permissions for %s failed, because the item was not found" => "Ustawienie uprawnień dla %s nie powiodło się, ponieważ element nie został znaleziony",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Nie można ustawić daty wygaśnięcia. Udziały nie mogą wygasać później niż %s od momentu udostępnienia",
-"Cannot set expiration date. Expiration date is in the past" => "Nie można ustawić daty wygaśnięcia. Data wygaśnięcia jest w przeszłości.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Zaplecze do współdzielenia %s musi implementować interfejs OCP\\Share_Backend",
-"Sharing backend %s not found" => "Zaplecze %s do współdzielenia nie zostało znalezione",
-"Sharing backend for %s not found" => "Zaplecze do współdzielenia %s nie zostało znalezione",
-"Sharing %s failed, because the user %s is the original sharer" => "Współdzielenie %s nie powiodło się, ponieważ użytkownik %s jest udostępniającym",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Współdzielenie %s nie powiodło się, ponieważ uprawnienia przekraczają te udzielone %s",
-"Sharing %s failed, because resharing is not allowed" => "Współdzielenie %s nie powiodło się, ponieważ ponowne współdzielenie nie jest dozwolone",
-"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\"",
-"seconds ago" => "sekund temu",
-"_%n minute ago_::_%n minutes ago_" => array("%n minute temu","%n minut temu","%n minut temu"),
-"_%n hour ago_::_%n hours ago_" => array("%n godzinę temu","%n godzin temu","%n godzin temu"),
-"today" => "dziś",
-"yesterday" => "wczoraj",
-"_%n day go_::_%n days ago_" => array("%n dzień temu","%n dni temu","%n dni temu"),
-"last month" => "w zeszłym miesiącu",
-"_%n month ago_::_%n months ago_" => array("%n miesiąc temu","%n miesięcy temu","%n miesięcy temu"),
-"last year" => "w zeszłym roku",
-"years ago" => "lat temu",
-"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",
-"The username is already being used" => "Ta nazwa użytkownika jest już używana",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Brak sterowników bazy danych (sqlite, mysql or postgresql).",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Problemy z uprawnieniami można zwykle naprawić  przez %sdodanie serwerowi www uprawnień zapisu do katalogu głównego%s.",
-"Cannot write into \"config\" directory" => "Nie można zapisać do katalogu \"config\"",
-"Cannot write into \"apps\" directory" => "Nie można zapisać do katalogu \"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." => "Można to zwykle rozwiązać przez %sdodanie serwerowi www uprawnień zapisu do katalogu apps%s lub wyłączenie appstore w pliku konfiguracyjnym.",
-"Cannot create \"data\" directory (%s)" => "Nie można utworzyć katalogu \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Można to zwykle rozwiązać przez <a href=\"%s\" target=\"_blank\">dodanie serwerowi www uprawnień zapisu do katalogu głównego</a>.",
-"Setting locale to %s failed" => "Nie udało się zmienić języka na %s",
-"Please install one of these locales on your system and restart your webserver." => "Proszę zainstalować jedno z poniższych locale w Twoim systemie i uruchomić ponownie serwer www.",
-"Please ask your server administrator to install the module." => "Proszę poproś administratora serwera aby zainstalował ten moduł.",
-"PHP module %s not installed." => "Moduł PHP %s nie jest zainstalowany.",
-"PHP %s or higher is required." => "PHP %s lub wyższe jest wymagane.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Proszę poproś administratora serwera aby zaktualizował PHP do najnowszej wersji. Twoja wersja PHP nie jest już dłużej wspierana przez ownCloud i społeczność PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Bezpieczny tryb PHP jest aktywny. ownCloud do poprawnej pracy wymaga aby był on wyłączony.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Bezpieczny tryb PHP jest przestarzały i w większości bezużyteczny i powinien być wyłączony. Proszę poproś administratora serwera aby wyłączył go w php.ini lub w pliku konfiguracyjnym serwera www.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes są włączone. Do poprawnego działania ownCloud wymagane jest ich wyłączenie.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes to przestarzałe i zasadniczo bezużyteczne ustawienie, które powinno być wyłączone. Poproś administratora serwera, by wyłączył je w php.ini albo w konfiguracji serwera www.",
-"PHP modules have been installed, but they are still listed as missing?" => "Moduły PHP zostały zainstalowane, ale nadal brakuje ich na liście?",
-"Please ask your server administrator to restart the web server." => "Poproś administratora serwera o restart serwera www.",
-"PostgreSQL >= 9 required" => "Wymagany PostgreSQL >= 9",
-"Please upgrade your database version" => "Uaktualnij wersję bazy danych",
-"Error occurred while checking PostgreSQL version" => "Wystąpił błąd podczas sprawdzania wersji PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Upewnij się, że PostgreSQL jest w wersji co najmniej 9 lub sprawdź log by uzyskać więcej informacji na temat błędu",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Zmień uprawnienia na 0770, żeby ukryć zawartość katalogu przed innymi użytkownikami.",
-"Data directory (%s) is readable by other users" => "Katalog danych (%s) jest możliwy do odczytania przez innych użytkowników",
-"Data directory (%s) is invalid" => "Katalog danych (%s) jest nieprawidłowy",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Sprawdź, czy katalog danych zawiera plik \".ocdata\".",
-"Could not obtain lock type %d on \"%s\"." => "Nie można uzyskać blokady typu %d na \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
new file mode 100644
index 00000000000..8537b31d543
--- /dev/null
+++ b/lib/l10n/pt_BR.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Não é possível gravar no diretório \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Isso geralmente pode ser corrigido dando o acesso de gravação ao webserver para o diretório de configuração",
+    "See %s" : "Ver %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Isso geralmente pode ser corrigido dando permissão de gravação %sgiving ao webserver para o directory%s de configuração.",
+    "Sample configuration detected" : "Exemplo de configuração detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração exemplo foi copiada. Isso pode desestabilizar sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
+    "Help" : "Ajuda",
+    "Personal" : "Pessoal",
+    "Settings" : "Configurações",
+    "Users" : "Usuários",
+    "Admin" : "Admin",
+    "Recommended" : "Recomendado",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do ownCloud.",
+    "No app name specified" : "O nome do aplicativo não foi especificado.",
+    "Unknown filetype" : "Tipo de arquivo desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "web services under your control" : "serviços web sob seu controle",
+    "App directory already exists" : "Diretório App  já existe",
+    "Can't create app folder. Please fix permissions. %s" : "Não é possível criar pasta app. Corrija as permissões. %s",
+    "No source specified when installing app" : "Nenhuma fonte foi especificada enquanto instalava o aplicativo",
+    "No href specified when installing app from http" : "Nenhuma href foi especificada enquanto instalava o aplicativo de http",
+    "No path specified when installing app from local file" : "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local",
+    "Archives of type %s are not supported" : "Arquivos do tipo %s não são suportados",
+    "Failed to open archive when installing app" : "Falha para abrir o arquivo enquanto instalava o aplicativo",
+    "App does not provide an info.xml file" : "O aplicativo não fornece um arquivo info.xml",
+    "App can't be installed because of not allowed code in the App" : "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "O aplicativo não pode ser instalado porque a versão em info.xml/versão não é a mesma que a versão relatada na App Store",
+    "Application is not enabled" : "Aplicação não está habilitada",
+    "Authentication error" : "Erro de autenticação",
+    "Token expired. Please reload page." : "Token expirou. Por favor recarregue a página.",
+    "Unknown user" : "Usuário desconhecido",
+    "%s enter the database username." : "%s insira o nome de usuário do banco de dados.",
+    "%s enter the database name." : "%s insira o nome do banco de dados.",
+    "%s you may not use dots in the database name" : "%s você não pode usar pontos no nome do banco de dados",
+    "MS SQL username and/or password not valid: %s" : "Nome de usuário e/ou senha MS SQL inválido(s): %s",
+    "You need to enter either an existing account or the administrator." : "Você precisa inserir uma conta existente ou a do administrador.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB nome de usuário e/ou senha não é válida",
+    "DB Error: \"%s\"" : "Erro no BD: \"%s\"",
+    "Offending command was: \"%s\"" : "Comando ofensivo era: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB usuário '%s'@'localhost' já existe.",
+    "Drop this user from MySQL/MariaDB" : "Eliminar esse usuário de MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB usuário '%s'@'%%' já existe",
+    "Drop this user from MySQL/MariaDB." : "Eliminar esse usuário de MySQL/MariaDB",
+    "Oracle connection could not be established" : "Conexão Oracle não pode ser estabelecida",
+    "Oracle username and/or password not valid" : "Nome de usuário e/ou senha Oracle inválido(s)",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
+    "PostgreSQL username and/or password not valid" : "Nome de usuário e/ou senha PostgreSQL inválido(s)",
+    "Set an admin username." : "Defina um nome do usuário administrador.",
+    "Set an admin password." : "Defina uma senha de administrador.",
+    "Can't create or write into the data directory %s" : "Não é possível criar ou gravar no diretório de dados %s",
+    "%s shared »%s« with you" : "%s compartilhou »%s« com você",
+    "Sharing %s failed, because the file does not exist" : "Compartilhamento %s falhou, porque o arquivo não existe",
+    "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Compartilhamento %s falhou, porque o usuário %s é o proprietário do item",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Compartilhamento %s falhou, porque compartilhamento com links não é permitido",
+    "Share type %s is not valid for %s" : "Tipo de compartilhamento %s não é válido para %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Definir permissões para %s falhou, porque o item não foi encontrado",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Não é possível definir a data de expiração. Compartilhamentos não podem expirar mais tarde que %s depois de terem sido compartilhados",
+    "Cannot set expiration date. Expiration date is in the past" : "Não é possível definir a data de validade. Data de expiração está no passado",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Compartilhando backend %s deve implementar a interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Compartilhamento backend %s não encontrado",
+    "Sharing backend for %s not found" : "Compartilhamento backend para %s não encontrado",
+    "Sharing %s failed, because the user %s is the original sharer" : "Compartilhando %s falhou, porque o usuário %s é o compartilhador original",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Compartilhamento %s falhou, porque as permissões excedem as permissões concedidas a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Compartilhamento %s falhou, porque recompartilhamentos não são permitidos",
+    "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\"",
+    "seconds ago" : "segundos atrás",
+    "_%n minute ago_::_%n minutes ago_" : ["","ha %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["","ha %n horas"],
+    "today" : "hoje",
+    "yesterday" : "ontem",
+    "_%n day go_::_%n days ago_" : ["","ha %n dias"],
+    "last month" : "último mês",
+    "_%n month ago_::_%n months ago_" : ["","ha %n meses"],
+    "last year" : "último ano",
+    "years ago" : "anos atrás",
+    "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",
+    "The username is already being used" : "Este nome de usuário já está sendo usado",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhum driver  de banco de dados (sqlite, mysql, or postgresql) instalado.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s",
+    "Cannot write into \"config\" directory" : "Não é possível gravar no diretório \"config\"",
+    "Cannot write into \"apps\" directory" : "Não é possível gravar no diretório \"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." : "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.",
+    "Cannot create \"data\" directory (%s)" : "Não pode ser criado \"dados\" no diretório (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Isto pode ser corrigido por <a href=\"%s\" target=\"_blank\">dando ao webserver permissão de escrita ao diretório raiz</a>.",
+    "Setting locale to %s failed" : "Falha ao configurar localidade para %s",
+    "Please install one of these locales on your system and restart your webserver." : "Por favor, defina uma dessas localizações em seu sistema e reinicie o seu servidor web.",
+    "Please ask your server administrator to install the module." : "Por favor, peça ao seu administrador do servidor para instalar o módulo.",
+    "PHP module %s not installed." : "Módulo PHP %s não instalado.",
+    "PHP %s or higher is required." : "É requerido PHP %s ou superior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor, peça ao seu administrador do servidor para atualizar o PHP para a versão mais recente. A sua versão do PHP não é mais suportado pelo ownCloud e a comunidade PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode está habilitado. ownCloud exige que ele esteja desativado para funcionar corretamente.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode é um cenário obsoleto e praticamente inútil que deve ser desativado. Por favor, peça ao seu administrador do servidor para desativá-lo no php.ini ou na sua configuração webserver.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes está habilitado. ownCloud exige que ele esteja desativado para funcionar corretamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes é um cenário obsoleto e praticamente inútil que deve ser desativado. Por favor, peça ao seu administrador do servidor para desativá-lo no php.ini ou na sua configuração webserver.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Módulos do PHP foram instalados, mas eles ainda estão listados como desaparecidos?",
+    "Please ask your server administrator to restart the web server." : "Por favor, peça ao seu administrador do servidor para reiniciar o servidor web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 requirido",
+    "Please upgrade your database version" : "Por favor, atualize sua versão do banco de dados",
+    "Error occurred while checking PostgreSQL version" : "Erro ao verificar a versão do PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Por favor, verifique se você tem PostgreSQL> = 9 ou verificar os logs para obter mais informações sobre o erro",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor, altere as permissões para 0770 para que o diretório não possa ser listado por outros usuários.",
+    "Data directory (%s) is readable by other users" : "Diretório de dados (%s) pode ser lido por outros usuários",
+    "Data directory (%s) is invalid" : "Diretório de dados (%s) é inválido",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Por favor, verifique se o diretório de dados contém um arquivo \".ocdata\" em sua raiz.",
+    "Could not obtain lock type %d on \"%s\"." : "Não foi possível obter tipo de bloqueio %d em \"%s\"."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
new file mode 100644
index 00000000000..a9e272afc18
--- /dev/null
+++ b/lib/l10n/pt_BR.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Não é possível gravar no diretório \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Isso geralmente pode ser corrigido dando o acesso de gravação ao webserver para o diretório de configuração",
+    "See %s" : "Ver %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Isso geralmente pode ser corrigido dando permissão de gravação %sgiving ao webserver para o directory%s de configuração.",
+    "Sample configuration detected" : "Exemplo de configuração detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração exemplo foi copiada. Isso pode desestabilizar sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
+    "Help" : "Ajuda",
+    "Personal" : "Pessoal",
+    "Settings" : "Configurações",
+    "Users" : "Usuários",
+    "Admin" : "Admin",
+    "Recommended" : "Recomendado",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do ownCloud.",
+    "No app name specified" : "O nome do aplicativo não foi especificado.",
+    "Unknown filetype" : "Tipo de arquivo desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "web services under your control" : "serviços web sob seu controle",
+    "App directory already exists" : "Diretório App  já existe",
+    "Can't create app folder. Please fix permissions. %s" : "Não é possível criar pasta app. Corrija as permissões. %s",
+    "No source specified when installing app" : "Nenhuma fonte foi especificada enquanto instalava o aplicativo",
+    "No href specified when installing app from http" : "Nenhuma href foi especificada enquanto instalava o aplicativo de http",
+    "No path specified when installing app from local file" : "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local",
+    "Archives of type %s are not supported" : "Arquivos do tipo %s não são suportados",
+    "Failed to open archive when installing app" : "Falha para abrir o arquivo enquanto instalava o aplicativo",
+    "App does not provide an info.xml file" : "O aplicativo não fornece um arquivo info.xml",
+    "App can't be installed because of not allowed code in the App" : "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "O aplicativo não pode ser instalado porque a versão em info.xml/versão não é a mesma que a versão relatada na App Store",
+    "Application is not enabled" : "Aplicação não está habilitada",
+    "Authentication error" : "Erro de autenticação",
+    "Token expired. Please reload page." : "Token expirou. Por favor recarregue a página.",
+    "Unknown user" : "Usuário desconhecido",
+    "%s enter the database username." : "%s insira o nome de usuário do banco de dados.",
+    "%s enter the database name." : "%s insira o nome do banco de dados.",
+    "%s you may not use dots in the database name" : "%s você não pode usar pontos no nome do banco de dados",
+    "MS SQL username and/or password not valid: %s" : "Nome de usuário e/ou senha MS SQL inválido(s): %s",
+    "You need to enter either an existing account or the administrator." : "Você precisa inserir uma conta existente ou a do administrador.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB nome de usuário e/ou senha não é válida",
+    "DB Error: \"%s\"" : "Erro no BD: \"%s\"",
+    "Offending command was: \"%s\"" : "Comando ofensivo era: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB usuário '%s'@'localhost' já existe.",
+    "Drop this user from MySQL/MariaDB" : "Eliminar esse usuário de MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB usuário '%s'@'%%' já existe",
+    "Drop this user from MySQL/MariaDB." : "Eliminar esse usuário de MySQL/MariaDB",
+    "Oracle connection could not be established" : "Conexão Oracle não pode ser estabelecida",
+    "Oracle username and/or password not valid" : "Nome de usuário e/ou senha Oracle inválido(s)",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
+    "PostgreSQL username and/or password not valid" : "Nome de usuário e/ou senha PostgreSQL inválido(s)",
+    "Set an admin username." : "Defina um nome do usuário administrador.",
+    "Set an admin password." : "Defina uma senha de administrador.",
+    "Can't create or write into the data directory %s" : "Não é possível criar ou gravar no diretório de dados %s",
+    "%s shared »%s« with you" : "%s compartilhou »%s« com você",
+    "Sharing %s failed, because the file does not exist" : "Compartilhamento %s falhou, porque o arquivo não existe",
+    "You are not allowed to share %s" : "Você não tem permissão para compartilhar %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Compartilhamento %s falhou, porque o usuário %s é o proprietário do item",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Compartilhamento %s falhou, porque compartilhamento com links não é permitido",
+    "Share type %s is not valid for %s" : "Tipo de compartilhamento %s não é válido para %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Definir permissões para %s falhou, porque o item não foi encontrado",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Não é possível definir a data de expiração. Compartilhamentos não podem expirar mais tarde que %s depois de terem sido compartilhados",
+    "Cannot set expiration date. Expiration date is in the past" : "Não é possível definir a data de validade. Data de expiração está no passado",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Compartilhando backend %s deve implementar a interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Compartilhamento backend %s não encontrado",
+    "Sharing backend for %s not found" : "Compartilhamento backend para %s não encontrado",
+    "Sharing %s failed, because the user %s is the original sharer" : "Compartilhando %s falhou, porque o usuário %s é o compartilhador original",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Compartilhamento %s falhou, porque as permissões excedem as permissões concedidas a %s",
+    "Sharing %s failed, because resharing is not allowed" : "Compartilhamento %s falhou, porque recompartilhamentos não são permitidos",
+    "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\"",
+    "seconds ago" : "segundos atrás",
+    "_%n minute ago_::_%n minutes ago_" : ["","ha %n minutos"],
+    "_%n hour ago_::_%n hours ago_" : ["","ha %n horas"],
+    "today" : "hoje",
+    "yesterday" : "ontem",
+    "_%n day go_::_%n days ago_" : ["","ha %n dias"],
+    "last month" : "último mês",
+    "_%n month ago_::_%n months ago_" : ["","ha %n meses"],
+    "last year" : "último ano",
+    "years ago" : "anos atrás",
+    "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",
+    "The username is already being used" : "Este nome de usuário já está sendo usado",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhum driver  de banco de dados (sqlite, mysql, or postgresql) instalado.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s",
+    "Cannot write into \"config\" directory" : "Não é possível gravar no diretório \"config\"",
+    "Cannot write into \"apps\" directory" : "Não é possível gravar no diretório \"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." : "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.",
+    "Cannot create \"data\" directory (%s)" : "Não pode ser criado \"dados\" no diretório (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Isto pode ser corrigido por <a href=\"%s\" target=\"_blank\">dando ao webserver permissão de escrita ao diretório raiz</a>.",
+    "Setting locale to %s failed" : "Falha ao configurar localidade para %s",
+    "Please install one of these locales on your system and restart your webserver." : "Por favor, defina uma dessas localizações em seu sistema e reinicie o seu servidor web.",
+    "Please ask your server administrator to install the module." : "Por favor, peça ao seu administrador do servidor para instalar o módulo.",
+    "PHP module %s not installed." : "Módulo PHP %s não instalado.",
+    "PHP %s or higher is required." : "É requerido PHP %s ou superior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor, peça ao seu administrador do servidor para atualizar o PHP para a versão mais recente. A sua versão do PHP não é mais suportado pelo ownCloud e a comunidade PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode está habilitado. ownCloud exige que ele esteja desativado para funcionar corretamente.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode é um cenário obsoleto e praticamente inútil que deve ser desativado. Por favor, peça ao seu administrador do servidor para desativá-lo no php.ini ou na sua configuração webserver.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes está habilitado. ownCloud exige que ele esteja desativado para funcionar corretamente.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes é um cenário obsoleto e praticamente inútil que deve ser desativado. Por favor, peça ao seu administrador do servidor para desativá-lo no php.ini ou na sua configuração webserver.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Módulos do PHP foram instalados, mas eles ainda estão listados como desaparecidos?",
+    "Please ask your server administrator to restart the web server." : "Por favor, peça ao seu administrador do servidor para reiniciar o servidor web.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 requirido",
+    "Please upgrade your database version" : "Por favor, atualize sua versão do banco de dados",
+    "Error occurred while checking PostgreSQL version" : "Erro ao verificar a versão do PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Por favor, verifique se você tem PostgreSQL> = 9 ou verificar os logs para obter mais informações sobre o erro",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor, altere as permissões para 0770 para que o diretório não possa ser listado por outros usuários.",
+    "Data directory (%s) is readable by other users" : "Diretório de dados (%s) pode ser lido por outros usuários",
+    "Data directory (%s) is invalid" : "Diretório de dados (%s) é inválido",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Por favor, verifique se o diretório de dados contém um arquivo \".ocdata\" em sua raiz.",
+    "Could not obtain lock type %d on \"%s\"." : "Não foi possível obter tipo de bloqueio %d em \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
deleted file mode 100644
index d0dc9078128..00000000000
--- a/lib/l10n/pt_BR.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Não é possível gravar no diretório \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Isso geralmente pode ser corrigido dando o acesso de gravação ao webserver para o diretório de configuração",
-"See %s" => "Ver %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Isso geralmente pode ser corrigido dando permissão de gravação %sgiving ao webserver para o directory%s de configuração.",
-"Sample configuration detected" => "Exemplo de configuração detectada",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Foi detectado que a configuração exemplo foi copiada. Isso pode desestabilizar sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
-"Help" => "Ajuda",
-"Personal" => "Pessoal",
-"Settings" => "Configurações",
-"Users" => "Usuários",
-"Admin" => "Admin",
-"Recommended" => "Recomendado",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do ownCloud.",
-"No app name specified" => "O nome do aplicativo não foi especificado.",
-"Unknown filetype" => "Tipo de arquivo desconhecido",
-"Invalid image" => "Imagem inválida",
-"web services under your control" => "serviços web sob seu controle",
-"App directory already exists" => "Diretório App  já existe",
-"Can't create app folder. Please fix permissions. %s" => "Não é possível criar pasta app. Corrija as permissões. %s",
-"No source specified when installing app" => "Nenhuma fonte foi especificada enquanto instalava o aplicativo",
-"No href specified when installing app from http" => "Nenhuma href foi especificada enquanto instalava o aplicativo de http",
-"No path specified when installing app from local file" => "Nenhum caminho foi especificado enquanto instalava o aplicativo do arquivo local",
-"Archives of type %s are not supported" => "Arquivos do tipo %s não são suportados",
-"Failed to open archive when installing app" => "Falha para abrir o arquivo enquanto instalava o aplicativo",
-"App does not provide an info.xml file" => "O aplicativo não fornece um arquivo info.xml",
-"App can't be installed because of not allowed code in the App" => "O aplicativo não pode ser instalado por causa do código não permitido no Aplivativo",
-"App can't be installed because it is not compatible with this version of ownCloud" => "O aplicativo não pode ser instalado porque não é compatível com esta versão do ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "O aplicativo não pode ser instalado porque ele contém a marca <shipped>verdadeiro</shipped> que não é permitido para aplicações não embarcadas",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "O aplicativo não pode ser instalado porque a versão em info.xml/versão não é a mesma que a versão relatada na App Store",
-"Application is not enabled" => "Aplicação não está habilitada",
-"Authentication error" => "Erro de autenticação",
-"Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.",
-"Unknown user" => "Usuário desconhecido",
-"%s enter the database username." => "%s insira o nome de usuário do banco de dados.",
-"%s enter the database name." => "%s insira o nome do banco de dados.",
-"%s you may not use dots in the database name" => "%s você não pode usar pontos no nome do banco de dados",
-"MS SQL username and/or password not valid: %s" => "Nome de usuário e/ou senha MS SQL inválido(s): %s",
-"You need to enter either an existing account or the administrator." => "Você precisa inserir uma conta existente ou a do administrador.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB nome de usuário e/ou senha não é válida",
-"DB Error: \"%s\"" => "Erro no BD: \"%s\"",
-"Offending command was: \"%s\"" => "Comando ofensivo era: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB usuário '%s'@'localhost' já existe.",
-"Drop this user from MySQL/MariaDB" => "Eliminar esse usuário de MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB usuário '%s'@'%%' já existe",
-"Drop this user from MySQL/MariaDB." => "Eliminar esse usuário de MySQL/MariaDB",
-"Oracle connection could not be established" => "Conexão Oracle não pode ser estabelecida",
-"Oracle username and/or password not valid" => "Nome de usuário e/ou senha Oracle inválido(s)",
-"Offending command was: \"%s\", name: %s, password: %s" => "Comando ofensivo era: \"%s\", nome: %s, senha: %s",
-"PostgreSQL username and/or password not valid" => "Nome de usuário e/ou senha PostgreSQL inválido(s)",
-"Set an admin username." => "Defina um nome do usuário administrador.",
-"Set an admin password." => "Defina uma senha de administrador.",
-"Can't create or write into the data directory %s" => "Não é possível criar ou gravar no diretório de dados %s",
-"%s shared »%s« with you" => "%s compartilhou »%s« com você",
-"Sharing %s failed, because the file does not exist" => "Compartilhamento %s falhou, porque o arquivo não existe",
-"You are not allowed to share %s" => "Você não tem permissão para compartilhar %s",
-"Sharing %s failed, because the user %s is the item owner" => "Compartilhamento %s falhou, porque o usuário %s é o proprietário do item",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "Compartilhamento %s falhou, porque compartilhamento com links não é permitido",
-"Share type %s is not valid for %s" => "Tipo de compartilhamento %s não é válido para %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
-"Setting permissions for %s failed, because the item was not found" => "Definir permissões para %s falhou, porque o item não foi encontrado",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Não é possível definir a data de expiração. Compartilhamentos não podem expirar mais tarde que %s depois de terem sido compartilhados",
-"Cannot set expiration date. Expiration date is in the past" => "Não é possível definir a data de validade. Data de expiração está no passado",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Compartilhando backend %s deve implementar a interface OCP\\Share_Backend",
-"Sharing backend %s not found" => "Compartilhamento backend %s não encontrado",
-"Sharing backend for %s not found" => "Compartilhamento backend para %s não encontrado",
-"Sharing %s failed, because the user %s is the original sharer" => "Compartilhando %s falhou, porque o usuário %s é o compartilhador original",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Compartilhamento %s falhou, porque as permissões excedem as permissões concedidas a %s",
-"Sharing %s failed, because resharing is not allowed" => "Compartilhamento %s falhou, porque recompartilhamentos não são permitidos",
-"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\"",
-"seconds ago" => "segundos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("","ha %n minutos"),
-"_%n hour ago_::_%n hours ago_" => array("","ha %n horas"),
-"today" => "hoje",
-"yesterday" => "ontem",
-"_%n day go_::_%n days ago_" => array("","ha %n dias"),
-"last month" => "último mês",
-"_%n month ago_::_%n months ago_" => array("","ha %n meses"),
-"last year" => "último ano",
-"years ago" => "anos atrás",
-"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",
-"The username is already being used" => "Este nome de usuário já está sendo usado",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Nenhum driver  de banco de dados (sqlite, mysql, or postgresql) instalado.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Permissões podem ser corrigidas dando permissão de escita %sgiving ao webserver para o diretório raiz directory%s",
-"Cannot write into \"config\" directory" => "Não é possível gravar no diretório \"config\"",
-"Cannot write into \"apps\" directory" => "Não é possível gravar no diretório \"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." => "Isto pode ser corrigido dando ao webserver permissão de escrita %sgiving para o diretório apps directory%s ou desabilitando o appstore no arquivo de configuração.",
-"Cannot create \"data\" directory (%s)" => "Não pode ser criado \"dados\" no diretório (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Isto pode ser corrigido por <a href=\"%s\" target=\"_blank\">dando ao webserver permissão de escrita ao diretório raiz</a>.",
-"Setting locale to %s failed" => "Falha ao configurar localidade para %s",
-"Please install one of these locales on your system and restart your webserver." => "Por favor, defina uma dessas localizações em seu sistema e reinicie o seu servidor web.",
-"Please ask your server administrator to install the module." => "Por favor, peça ao seu administrador do servidor para instalar o módulo.",
-"PHP module %s not installed." => "Módulo PHP %s não instalado.",
-"PHP %s or higher is required." => "É requerido PHP %s ou superior.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Por favor, peça ao seu administrador do servidor para atualizar o PHP para a versão mais recente. A sua versão do PHP não é mais suportado pelo ownCloud e a comunidade PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode está habilitado. ownCloud exige que ele esteja desativado para funcionar corretamente.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode é um cenário obsoleto e praticamente inútil que deve ser desativado. Por favor, peça ao seu administrador do servidor para desativá-lo no php.ini ou na sua configuração webserver.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes está habilitado. ownCloud exige que ele esteja desativado para funcionar corretamente.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes é um cenário obsoleto e praticamente inútil que deve ser desativado. Por favor, peça ao seu administrador do servidor para desativá-lo no php.ini ou na sua configuração webserver.",
-"PHP modules have been installed, but they are still listed as missing?" => "Módulos do PHP foram instalados, mas eles ainda estão listados como desaparecidos?",
-"Please ask your server administrator to restart the web server." => "Por favor, peça ao seu administrador do servidor para reiniciar o servidor web.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 requirido",
-"Please upgrade your database version" => "Por favor, atualize sua versão do banco de dados",
-"Error occurred while checking PostgreSQL version" => "Erro ao verificar a versão do PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Por favor, verifique se você tem PostgreSQL> = 9 ou verificar os logs para obter mais informações sobre o erro",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Por favor, altere as permissões para 0770 para que o diretório não possa ser listado por outros usuários.",
-"Data directory (%s) is readable by other users" => "Diretório de dados (%s) pode ser lido por outros usuários",
-"Data directory (%s) is invalid" => "Diretório de dados (%s) é inválido",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Por favor, verifique se o diretório de dados contém um arquivo \".ocdata\" em sua raiz.",
-"Could not obtain lock type %d on \"%s\"." => "Não foi possível obter tipo de bloqueio %d em \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
new file mode 100644
index 00000000000..c70e373a11c
--- /dev/null
+++ b/lib/l10n/pt_PT.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Não é possível gravar na  directoria \"configurar\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Isto pode ser resolvido normalmente dando ao servidor web direitos de escrita ao directório de configuração",
+    "See %s" : "Ver %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Isto pode ser resolvido normalmente %sdando ao servidor web direitos de escrita no directório de configuração%s.",
+    "Sample configuration detected" : "Exemplo de configuração detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração de amostra foi copiada. Isso pode danificar a sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
+    "Help" : "Ajuda",
+    "Personal" : "Pessoal",
+    "Settings" : "Configurações",
+    "Users" : "Utilizadores",
+    "Admin" : "Admin",
+    "Recommended" : "Recomendado",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "A Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do owncloud.",
+    "No app name specified" : "O nome da aplicação não foi especificado",
+    "Unknown filetype" : "Ficheiro desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "web services under your control" : "serviços web sob o seu controlo",
+    "App directory already exists" : "A directoria da aplicação já existe",
+    "Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
+    "No source specified when installing app" : "Não foi especificada uma fonte de instalação desta aplicação",
+    "No href specified when installing app from http" : "Não foi especificada uma href http para instalar esta aplicação",
+    "No path specified when installing app from local file" : "Não foi especificado o caminho de instalação desta aplicação",
+    "Archives of type %s are not supported" : "Arquivos do tipo %s não são suportados",
+    "Failed to open archive when installing app" : "Ocorreu um erro ao abrir o ficheiro de instalação desta aplicação",
+    "App does not provide an info.xml file" : "A aplicação não disponibiliza um ficheiro info.xml",
+    "App can't be installed because of not allowed code in the App" : "A aplicação não pode ser instalado devido a código não permitido dentro da aplicação",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "A aplicação não pode ser instalada por não ser compatível com esta versão do ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Esta aplicação não pode ser instalada por que contém o tag <shipped>true</shipped> que só é permitido para aplicações nativas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Esta aplicação não pode ser instalada porque a versão no info.xml/version não coincide com a reportada na loja de aplicações",
+    "Application is not enabled" : "A aplicação não está activada",
+    "Authentication error" : "Erro na autenticação",
+    "Token expired. Please reload page." : "O token expirou. Por favor recarregue a página.",
+    "Unknown user" : "Utilizador desconhecido",
+    "%s enter the database username." : "%s introduza o nome de utilizador da base de dados",
+    "%s enter the database name." : "%s introduza o nome da base de dados",
+    "%s you may not use dots in the database name" : "%s não é permitido utilizar pontos (.) no nome da base de dados",
+    "MS SQL username and/or password not valid: %s" : "Nome de utilizador/password do MySQL é inválido: %s",
+    "You need to enter either an existing account or the administrator." : "Precisa de introduzir uma conta existente ou de administrador",
+    "MySQL/MariaDB username and/or password not valid" : "Nome de utilizador/password do MySQL/Maria DB inválida",
+    "DB Error: \"%s\"" : "Erro na BD: \"%s\"",
+    "Offending command was: \"%s\"" : "O comando gerador de erro foi: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "O utilizador '%s'@'localhost' do MySQL/MariaDB já existe.",
+    "Drop this user from MySQL/MariaDB" : "Eliminar este utilizador do MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "O utilizador '%s'@'%%' do MySQL/MariaDB já existe",
+    "Drop this user from MySQL/MariaDB." : "Eliminar este utilizador do MySQL/MariaDB",
+    "Oracle connection could not be established" : "Não foi possível estabelecer a ligação Oracle",
+    "Oracle username and/or password not valid" : "Nome de utilizador/password do Oracle inválida",
+    "Offending command was: \"%s\", name: %s, password: %s" : "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "Nome de utilizador/password do PostgreSQL inválido",
+    "Set an admin username." : "Definir um nome de utilizador de administrador",
+    "Set an admin password." : "Definiar uma password de administrador",
+    "Can't create or write into the data directory %s" : "Não é possível criar ou escrever a directoria data %s",
+    "%s shared »%s« with you" : "%s partilhado »%s« consigo",
+    "Sharing %s failed, because the file does not exist" : "A partilha de %s falhou, porque o ficheiro não existe",
+    "You are not allowed to share %s" : "Não está autorizado a partilhar %s",
+    "Sharing %s failed, because the user %s is the item owner" : "A partilha %s falhou, porque o utilizador %s é o proprietário",
+    "Sharing %s failed, because the user %s does not exist" : "A partilha %s falhou, porque o utilizador %s nao existe",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "A partilha %s falhou, porque o utilizador %s não pertence a nenhum dos grupos que %s é membro de",
+    "Sharing %s failed, because this item is already shared with %s" : "A partilha %s falhou, porque o item já está a ser partilhado com %s",
+    "Sharing %s failed, because the group %s does not exist" : "A partilha %s falhou, porque o grupo %s não existe",
+    "Sharing %s failed, because %s is not a member of the group %s" : "A partilha %s falhou, porque o utilizador %s não é membro do grupo %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Necessita de fornecer a senha para criar um link publico, só são permitidos links protegidos",
+    "Sharing %s failed, because sharing with links is not allowed" : "A partilha de %s falhou, porque partilhar com links não é permitido",
+    "Share type %s is not valid for %s" : "O tipo de partilha %s não é válido para %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Definir permissões para %s falhou, porque o item não foi encontrado",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Não é possível definir data de expiração. As partilhas não podem expirar mais de %s depois de terem sido partilhadas",
+    "Cannot set expiration date. Expiration date is in the past" : "Não é possivel definir data de expiração. A data de expiração está no passado",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Partilhar backend %s tem de implementar o interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Partilha backend %s não foi encontrado",
+    "Sharing backend for %s not found" : "Partilha backend para %s não foi encontrado",
+    "Sharing %s failed, because the user %s is the original sharer" : "A partilha %s falhou, porque o utilizador %s é o proprietário original",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
+    "Sharing %s failed, because resharing is not allowed" : "A partilha %s falhou, porque repartilhar não é permitido",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "A partilha %s falhou, devido a partilha em segundo plano para %s não conseguir 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\"",
+    "seconds ago" : "Minutos atrás",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minutos atrás"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n horas atrás"],
+    "today" : "hoje",
+    "yesterday" : "ontem",
+    "_%n day go_::_%n days ago_" : ["","%n dias atrás"],
+    "last month" : "ultímo mês",
+    "_%n month ago_::_%n months ago_" : ["","%n meses atrás"],
+    "last year" : "ano passado",
+    "years ago" : "anos atrás",
+    "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",
+    "The username is already being used" : "O nome de utilizador já está a ser usado",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhuma base de dados de drivers (sqlite, mysql, or postgresql) instaladas.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "As autorizações podem ser resolvidas normalmente %sdando ao servidor web direito de escrita para o directório root%s.",
+    "Cannot write into \"config\" directory" : "Não é possível escrever na directoria \"configurar\"",
+    "Cannot write into \"apps\" directory" : "Não é possivel escrever na directoria \"aplicações\"",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser normalmente resolvido %sdando ao servidor web direito de escrita para o directório de aplicação%s ou desactivando a loja de aplicações no ficheiro de configuração.",
+    "Cannot create \"data\" directory (%s)" : "Não é possivel criar a directoria \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Isto pode ser normalmente resolvido <a href=\"%s\" target=\"_blank\">dando ao servidor web direito de escrita para o directório do root</a>.",
+    "Setting locale to %s failed" : "Definindo local para %s falhado",
+    "Please install one of these locales on your system and restart your webserver." : "Por favor instale um destes locais no seu sistema e reinicie o seu servidor web.",
+    "Please ask your server administrator to install the module." : "Por favor pergunte ao seu administrador do servidor para instalar o modulo.",
+    "PHP module %s not installed." : "O modulo %s PHP não está instalado.",
+    "PHP %s or higher is required." : "Necessário PHP %s ou maior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor pessa ao seu administrador de servidor para actualizar o PHP para a ultima versão. A sua versão de PHP não é mais suportada pelo owncloud e a comunidade PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "O modo seguro de PHP está activo. O ownCloud requer que isto esteja desactivado para funcionar em condições.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "O modo seguro PHP está obsoleto e a maior parte das definições inúteis devem ser desactivadas. Por favor pessa ao seu administrador de servidor para desactivar isto em php.ini ou no seu config do servidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Aspas mágicas estão activadas. O ownCloud requere que isto esteja desactivado para trabalhar em condições.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "As aspas mágicas é uma definição obsoleta e inútil que deve ser desactivada. Por favor pessa ao seu administrador do servidor para desactivar isto em php.ini ou no config do seu servidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Os módulos PHP foram instalados,   mas eles ainda estão listados como desaparecidos?",
+    "Please ask your server administrator to restart the web server." : "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.",
+    "PostgreSQL >= 9 required" : "Necessita PostgreSQL >= 9",
+    "Please upgrade your database version" : "Por favor actualize a sua versão da base de dados",
+    "Error occurred while checking PostgreSQL version" : "Ocorreu um erro enquanto pesquisava a versão do PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Por favor confirme que tem o PostgreSQL >= 9 ou verifique os registos para mais informação sobre o erro",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor altere as permissões para 0770 para que esse directório não possa ser listado por outros utilizadores.",
+    "Data directory (%s) is readable by other users" : "O directório de dados (%s) é legível para outros utilizadores",
+    "Data directory (%s) is invalid" : "Directoria data (%s) é invalida",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Por favor verifique que a directoria data contem um ficheiro \".ocdata\" na sua raiz.",
+    "Could not obtain lock type %d on \"%s\"." : "Não foi possível obter o tipo de bloqueio %d em \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
new file mode 100644
index 00000000000..85461b0fae6
--- /dev/null
+++ b/lib/l10n/pt_PT.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Não é possível gravar na  directoria \"configurar\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Isto pode ser resolvido normalmente dando ao servidor web direitos de escrita ao directório de configuração",
+    "See %s" : "Ver %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Isto pode ser resolvido normalmente %sdando ao servidor web direitos de escrita no directório de configuração%s.",
+    "Sample configuration detected" : "Exemplo de configuração detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Foi detectado que a configuração de amostra foi copiada. Isso pode danificar a sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
+    "Help" : "Ajuda",
+    "Personal" : "Pessoal",
+    "Settings" : "Configurações",
+    "Users" : "Utilizadores",
+    "Admin" : "Admin",
+    "Recommended" : "Recomendado",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "A Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do owncloud.",
+    "No app name specified" : "O nome da aplicação não foi especificado",
+    "Unknown filetype" : "Ficheiro desconhecido",
+    "Invalid image" : "Imagem inválida",
+    "web services under your control" : "serviços web sob o seu controlo",
+    "App directory already exists" : "A directoria da aplicação já existe",
+    "Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
+    "No source specified when installing app" : "Não foi especificada uma fonte de instalação desta aplicação",
+    "No href specified when installing app from http" : "Não foi especificada uma href http para instalar esta aplicação",
+    "No path specified when installing app from local file" : "Não foi especificado o caminho de instalação desta aplicação",
+    "Archives of type %s are not supported" : "Arquivos do tipo %s não são suportados",
+    "Failed to open archive when installing app" : "Ocorreu um erro ao abrir o ficheiro de instalação desta aplicação",
+    "App does not provide an info.xml file" : "A aplicação não disponibiliza um ficheiro info.xml",
+    "App can't be installed because of not allowed code in the App" : "A aplicação não pode ser instalado devido a código não permitido dentro da aplicação",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "A aplicação não pode ser instalada por não ser compatível com esta versão do ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Esta aplicação não pode ser instalada por que contém o tag <shipped>true</shipped> que só é permitido para aplicações nativas",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Esta aplicação não pode ser instalada porque a versão no info.xml/version não coincide com a reportada na loja de aplicações",
+    "Application is not enabled" : "A aplicação não está activada",
+    "Authentication error" : "Erro na autenticação",
+    "Token expired. Please reload page." : "O token expirou. Por favor recarregue a página.",
+    "Unknown user" : "Utilizador desconhecido",
+    "%s enter the database username." : "%s introduza o nome de utilizador da base de dados",
+    "%s enter the database name." : "%s introduza o nome da base de dados",
+    "%s you may not use dots in the database name" : "%s não é permitido utilizar pontos (.) no nome da base de dados",
+    "MS SQL username and/or password not valid: %s" : "Nome de utilizador/password do MySQL é inválido: %s",
+    "You need to enter either an existing account or the administrator." : "Precisa de introduzir uma conta existente ou de administrador",
+    "MySQL/MariaDB username and/or password not valid" : "Nome de utilizador/password do MySQL/Maria DB inválida",
+    "DB Error: \"%s\"" : "Erro na BD: \"%s\"",
+    "Offending command was: \"%s\"" : "O comando gerador de erro foi: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "O utilizador '%s'@'localhost' do MySQL/MariaDB já existe.",
+    "Drop this user from MySQL/MariaDB" : "Eliminar este utilizador do MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "O utilizador '%s'@'%%' do MySQL/MariaDB já existe",
+    "Drop this user from MySQL/MariaDB." : "Eliminar este utilizador do MySQL/MariaDB",
+    "Oracle connection could not be established" : "Não foi possível estabelecer a ligação Oracle",
+    "Oracle username and/or password not valid" : "Nome de utilizador/password do Oracle inválida",
+    "Offending command was: \"%s\", name: %s, password: %s" : "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "Nome de utilizador/password do PostgreSQL inválido",
+    "Set an admin username." : "Definir um nome de utilizador de administrador",
+    "Set an admin password." : "Definiar uma password de administrador",
+    "Can't create or write into the data directory %s" : "Não é possível criar ou escrever a directoria data %s",
+    "%s shared »%s« with you" : "%s partilhado »%s« consigo",
+    "Sharing %s failed, because the file does not exist" : "A partilha de %s falhou, porque o ficheiro não existe",
+    "You are not allowed to share %s" : "Não está autorizado a partilhar %s",
+    "Sharing %s failed, because the user %s is the item owner" : "A partilha %s falhou, porque o utilizador %s é o proprietário",
+    "Sharing %s failed, because the user %s does not exist" : "A partilha %s falhou, porque o utilizador %s nao existe",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "A partilha %s falhou, porque o utilizador %s não pertence a nenhum dos grupos que %s é membro de",
+    "Sharing %s failed, because this item is already shared with %s" : "A partilha %s falhou, porque o item já está a ser partilhado com %s",
+    "Sharing %s failed, because the group %s does not exist" : "A partilha %s falhou, porque o grupo %s não existe",
+    "Sharing %s failed, because %s is not a member of the group %s" : "A partilha %s falhou, porque o utilizador %s não é membro do grupo %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Necessita de fornecer a senha para criar um link publico, só são permitidos links protegidos",
+    "Sharing %s failed, because sharing with links is not allowed" : "A partilha de %s falhou, porque partilhar com links não é permitido",
+    "Share type %s is not valid for %s" : "O tipo de partilha %s não é válido para %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
+    "Setting permissions for %s failed, because the item was not found" : "Definir permissões para %s falhou, porque o item não foi encontrado",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Não é possível definir data de expiração. As partilhas não podem expirar mais de %s depois de terem sido partilhadas",
+    "Cannot set expiration date. Expiration date is in the past" : "Não é possivel definir data de expiração. A data de expiração está no passado",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Partilhar backend %s tem de implementar o interface OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Partilha backend %s não foi encontrado",
+    "Sharing backend for %s not found" : "Partilha backend para %s não foi encontrado",
+    "Sharing %s failed, because the user %s is the original sharer" : "A partilha %s falhou, porque o utilizador %s é o proprietário original",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
+    "Sharing %s failed, because resharing is not allowed" : "A partilha %s falhou, porque repartilhar não é permitido",
+    "Sharing %s failed, because the sharing backend for %s could not find its source" : "A partilha %s falhou, devido a partilha em segundo plano para %s não conseguir 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\"",
+    "seconds ago" : "Minutos atrás",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minutos atrás"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n horas atrás"],
+    "today" : "hoje",
+    "yesterday" : "ontem",
+    "_%n day go_::_%n days ago_" : ["","%n dias atrás"],
+    "last month" : "ultímo mês",
+    "_%n month ago_::_%n months ago_" : ["","%n meses atrás"],
+    "last year" : "ano passado",
+    "years ago" : "anos atrás",
+    "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",
+    "The username is already being used" : "O nome de utilizador já está a ser usado",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Nenhuma base de dados de drivers (sqlite, mysql, or postgresql) instaladas.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "As autorizações podem ser resolvidas normalmente %sdando ao servidor web direito de escrita para o directório root%s.",
+    "Cannot write into \"config\" directory" : "Não é possível escrever na directoria \"configurar\"",
+    "Cannot write into \"apps\" directory" : "Não é possivel escrever na directoria \"aplicações\"",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Isto pode ser normalmente resolvido %sdando ao servidor web direito de escrita para o directório de aplicação%s ou desactivando a loja de aplicações no ficheiro de configuração.",
+    "Cannot create \"data\" directory (%s)" : "Não é possivel criar a directoria \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Isto pode ser normalmente resolvido <a href=\"%s\" target=\"_blank\">dando ao servidor web direito de escrita para o directório do root</a>.",
+    "Setting locale to %s failed" : "Definindo local para %s falhado",
+    "Please install one of these locales on your system and restart your webserver." : "Por favor instale um destes locais no seu sistema e reinicie o seu servidor web.",
+    "Please ask your server administrator to install the module." : "Por favor pergunte ao seu administrador do servidor para instalar o modulo.",
+    "PHP module %s not installed." : "O modulo %s PHP não está instalado.",
+    "PHP %s or higher is required." : "Necessário PHP %s ou maior.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Por favor pessa ao seu administrador de servidor para actualizar o PHP para a ultima versão. A sua versão de PHP não é mais suportada pelo owncloud e a comunidade PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "O modo seguro de PHP está activo. O ownCloud requer que isto esteja desactivado para funcionar em condições.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "O modo seguro PHP está obsoleto e a maior parte das definições inúteis devem ser desactivadas. Por favor pessa ao seu administrador de servidor para desactivar isto em php.ini ou no seu config do servidor web.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Aspas mágicas estão activadas. O ownCloud requere que isto esteja desactivado para trabalhar em condições.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "As aspas mágicas é uma definição obsoleta e inútil que deve ser desactivada. Por favor pessa ao seu administrador do servidor para desactivar isto em php.ini ou no config do seu servidor web.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Os módulos PHP foram instalados,   mas eles ainda estão listados como desaparecidos?",
+    "Please ask your server administrator to restart the web server." : "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.",
+    "PostgreSQL >= 9 required" : "Necessita PostgreSQL >= 9",
+    "Please upgrade your database version" : "Por favor actualize a sua versão da base de dados",
+    "Error occurred while checking PostgreSQL version" : "Ocorreu um erro enquanto pesquisava a versão do PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Por favor confirme que tem o PostgreSQL >= 9 ou verifique os registos para mais informação sobre o erro",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Por favor altere as permissões para 0770 para que esse directório não possa ser listado por outros utilizadores.",
+    "Data directory (%s) is readable by other users" : "O directório de dados (%s) é legível para outros utilizadores",
+    "Data directory (%s) is invalid" : "Directoria data (%s) é invalida",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Por favor verifique que a directoria data contem um ficheiro \".ocdata\" na sua raiz.",
+    "Could not obtain lock type %d on \"%s\"." : "Não foi possível obter o tipo de bloqueio %d em \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
deleted file mode 100644
index f475fe934a6..00000000000
--- a/lib/l10n/pt_PT.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Não é possível gravar na  directoria \"configurar\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Isto pode ser resolvido normalmente dando ao servidor web direitos de escrita ao directório de configuração",
-"See %s" => "Ver %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Isto pode ser resolvido normalmente %sdando ao servidor web direitos de escrita no directório de configuração%s.",
-"Sample configuration detected" => "Exemplo de configuração detectada",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Foi detectado que a configuração de amostra foi copiada. Isso pode danificar a sua instalação e não é suportado. Por favor, leia a documentação antes de realizar mudanças no config.php",
-"Help" => "Ajuda",
-"Personal" => "Pessoal",
-"Settings" => "Configurações",
-"Users" => "Utilizadores",
-"Admin" => "Admin",
-"Recommended" => "Recomendado",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "A Aplicação \\\"%s\\\" não pode ser instalada porque não é compatível com esta versão do owncloud.",
-"No app name specified" => "O nome da aplicação não foi especificado",
-"Unknown filetype" => "Ficheiro desconhecido",
-"Invalid image" => "Imagem inválida",
-"web services under your control" => "serviços web sob o seu controlo",
-"App directory already exists" => "A directoria da aplicação já existe",
-"Can't create app folder. Please fix permissions. %s" => "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
-"No source specified when installing app" => "Não foi especificada uma fonte de instalação desta aplicação",
-"No href specified when installing app from http" => "Não foi especificada uma href http para instalar esta aplicação",
-"No path specified when installing app from local file" => "Não foi especificado o caminho de instalação desta aplicação",
-"Archives of type %s are not supported" => "Arquivos do tipo %s não são suportados",
-"Failed to open archive when installing app" => "Ocorreu um erro ao abrir o ficheiro de instalação desta aplicação",
-"App does not provide an info.xml file" => "A aplicação não disponibiliza um ficheiro info.xml",
-"App can't be installed because of not allowed code in the App" => "A aplicação não pode ser instalado devido a código não permitido dentro da aplicação",
-"App can't be installed because it is not compatible with this version of ownCloud" => "A aplicação não pode ser instalada por não ser compatível com esta versão do ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Esta aplicação não pode ser instalada por que contém o tag <shipped>true</shipped> que só é permitido para aplicações nativas",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Esta aplicação não pode ser instalada porque a versão no info.xml/version não coincide com a reportada na loja de aplicações",
-"Application is not enabled" => "A aplicação não está activada",
-"Authentication error" => "Erro na autenticação",
-"Token expired. Please reload page." => "O token expirou. Por favor recarregue a página.",
-"Unknown user" => "Utilizador desconhecido",
-"%s enter the database username." => "%s introduza o nome de utilizador da base de dados",
-"%s enter the database name." => "%s introduza o nome da base de dados",
-"%s you may not use dots in the database name" => "%s não é permitido utilizar pontos (.) no nome da base de dados",
-"MS SQL username and/or password not valid: %s" => "Nome de utilizador/password do MySQL é inválido: %s",
-"You need to enter either an existing account or the administrator." => "Precisa de introduzir uma conta existente ou de administrador",
-"MySQL/MariaDB username and/or password not valid" => "Nome de utilizador/password do MySQL/Maria DB inválida",
-"DB Error: \"%s\"" => "Erro na BD: \"%s\"",
-"Offending command was: \"%s\"" => "O comando gerador de erro foi: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "O utilizador '%s'@'localhost' do MySQL/MariaDB já existe.",
-"Drop this user from MySQL/MariaDB" => "Eliminar este utilizador do MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "O utilizador '%s'@'%%' do MySQL/MariaDB já existe",
-"Drop this user from MySQL/MariaDB." => "Eliminar este utilizador do MySQL/MariaDB",
-"Oracle connection could not be established" => "Não foi possível estabelecer a ligação Oracle",
-"Oracle username and/or password not valid" => "Nome de utilizador/password do Oracle inválida",
-"Offending command was: \"%s\", name: %s, password: %s" => "O comando gerador de erro foi: \"%s\", nome: %s, password: %s",
-"PostgreSQL username and/or password not valid" => "Nome de utilizador/password do PostgreSQL inválido",
-"Set an admin username." => "Definir um nome de utilizador de administrador",
-"Set an admin password." => "Definiar uma password de administrador",
-"Can't create or write into the data directory %s" => "Não é possível criar ou escrever a directoria data %s",
-"%s shared »%s« with you" => "%s partilhado »%s« consigo",
-"Sharing %s failed, because the file does not exist" => "A partilha de %s falhou, porque o ficheiro não existe",
-"You are not allowed to share %s" => "Não está autorizado a partilhar %s",
-"Sharing %s failed, because the user %s is the item owner" => "A partilha %s falhou, porque o utilizador %s é o proprietário",
-"Sharing %s failed, because the user %s does not exist" => "A partilha %s falhou, porque o utilizador %s nao existe",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "A partilha %s falhou, porque o utilizador %s não pertence a nenhum dos grupos que %s é membro de",
-"Sharing %s failed, because this item is already shared with %s" => "A partilha %s falhou, porque o item já está a ser partilhado com %s",
-"Sharing %s failed, because the group %s does not exist" => "A partilha %s falhou, porque o grupo %s não existe",
-"Sharing %s failed, because %s is not a member of the group %s" => "A partilha %s falhou, porque o utilizador %s não é membro do grupo %s",
-"You need to provide a password to create a public link, only protected links are allowed" => "Necessita de fornecer a senha para criar um link publico, só são permitidos links protegidos",
-"Sharing %s failed, because sharing with links is not allowed" => "A partilha de %s falhou, porque partilhar com links não é permitido",
-"Share type %s is not valid for %s" => "O tipo de partilha %s não é válido para %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
-"Setting permissions for %s failed, because the item was not found" => "Definir permissões para %s falhou, porque o item não foi encontrado",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Não é possível definir data de expiração. As partilhas não podem expirar mais de %s depois de terem sido partilhadas",
-"Cannot set expiration date. Expiration date is in the past" => "Não é possivel definir data de expiração. A data de expiração está no passado",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Partilhar backend %s tem de implementar o interface OCP\\Share_Backend",
-"Sharing backend %s not found" => "Partilha backend %s não foi encontrado",
-"Sharing backend for %s not found" => "Partilha backend para %s não foi encontrado",
-"Sharing %s failed, because the user %s is the original sharer" => "A partilha %s falhou, porque o utilizador %s é o proprietário original",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Definir permissões para %s falhou, porque as permissões excedem as permissões concedidas a %s",
-"Sharing %s failed, because resharing is not allowed" => "A partilha %s falhou, porque repartilhar não é permitido",
-"Sharing %s failed, because the sharing backend for %s could not find its source" => "A partilha %s falhou, devido a partilha em segundo plano para %s não conseguir 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\"",
-"seconds ago" => "Minutos atrás",
-"_%n minute ago_::_%n minutes ago_" => array("","%n minutos atrás"),
-"_%n hour ago_::_%n hours ago_" => array("","%n horas atrás"),
-"today" => "hoje",
-"yesterday" => "ontem",
-"_%n day go_::_%n days ago_" => array("","%n dias atrás"),
-"last month" => "ultímo mês",
-"_%n month ago_::_%n months ago_" => array("","%n meses atrás"),
-"last year" => "ano passado",
-"years ago" => "anos atrás",
-"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",
-"The username is already being used" => "O nome de utilizador já está a ser usado",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Nenhuma base de dados de drivers (sqlite, mysql, or postgresql) instaladas.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "As autorizações podem ser resolvidas normalmente %sdando ao servidor web direito de escrita para o directório root%s.",
-"Cannot write into \"config\" directory" => "Não é possível escrever na directoria \"configurar\"",
-"Cannot write into \"apps\" directory" => "Não é possivel escrever na directoria \"aplicações\"",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Isto pode ser normalmente resolvido %sdando ao servidor web direito de escrita para o directório de aplicação%s ou desactivando a loja de aplicações no ficheiro de configuração.",
-"Cannot create \"data\" directory (%s)" => "Não é possivel criar a directoria \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Isto pode ser normalmente resolvido <a href=\"%s\" target=\"_blank\">dando ao servidor web direito de escrita para o directório do root</a>.",
-"Setting locale to %s failed" => "Definindo local para %s falhado",
-"Please install one of these locales on your system and restart your webserver." => "Por favor instale um destes locais no seu sistema e reinicie o seu servidor web.",
-"Please ask your server administrator to install the module." => "Por favor pergunte ao seu administrador do servidor para instalar o modulo.",
-"PHP module %s not installed." => "O modulo %s PHP não está instalado.",
-"PHP %s or higher is required." => "Necessário PHP %s ou maior.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Por favor pessa ao seu administrador de servidor para actualizar o PHP para a ultima versão. A sua versão de PHP não é mais suportada pelo owncloud e a comunidade PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "O modo seguro de PHP está activo. O ownCloud requer que isto esteja desactivado para funcionar em condições.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "O modo seguro PHP está obsoleto e a maior parte das definições inúteis devem ser desactivadas. Por favor pessa ao seu administrador de servidor para desactivar isto em php.ini ou no seu config do servidor web.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Aspas mágicas estão activadas. O ownCloud requere que isto esteja desactivado para trabalhar em condições.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "As aspas mágicas é uma definição obsoleta e inútil que deve ser desactivada. Por favor pessa ao seu administrador do servidor para desactivar isto em php.ini ou no config do seu servidor web.",
-"PHP modules have been installed, but they are still listed as missing?" => "Os módulos PHP foram instalados,   mas eles ainda estão listados como desaparecidos?",
-"Please ask your server administrator to restart the web server." => "Pro favor pergunte ao seu administrador do servidor para reiniciar o servidor da internet.",
-"PostgreSQL >= 9 required" => "Necessita PostgreSQL >= 9",
-"Please upgrade your database version" => "Por favor actualize a sua versão da base de dados",
-"Error occurred while checking PostgreSQL version" => "Ocorreu um erro enquanto pesquisava a versão do PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Por favor confirme que tem o PostgreSQL >= 9 ou verifique os registos para mais informação sobre o erro",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Por favor altere as permissões para 0770 para que esse directório não possa ser listado por outros utilizadores.",
-"Data directory (%s) is readable by other users" => "O directório de dados (%s) é legível para outros utilizadores",
-"Data directory (%s) is invalid" => "Directoria data (%s) é invalida",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Por favor verifique que a directoria data contem um ficheiro \".ocdata\" na sua raiz.",
-"Could not obtain lock type %d on \"%s\"." => "Não foi possível obter o tipo de bloqueio %d em \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
new file mode 100644
index 00000000000..334da8299d4
--- /dev/null
+++ b/lib/l10n/ro.js
@@ -0,0 +1,52 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Nu se poate scrie în folderul \"config\"!",
+    "See %s" : "Vezi %s",
+    "Help" : "Ajutor",
+    "Personal" : "Personal",
+    "Settings" : "Setări",
+    "Users" : "Utilizatori",
+    "Admin" : "Admin",
+    "Recommended" : "Recomandat",
+    "No app name specified" : "Niciun nume de aplicație specificat",
+    "Unknown filetype" : "Tip fișier necunoscut",
+    "Invalid image" : "Imagine invalidă",
+    "web services under your control" : "servicii web controlate de tine",
+    "Application is not enabled" : "Aplicația nu este activată",
+    "Authentication error" : "Eroare la autentificare",
+    "Token expired. Please reload page." : "Token expirat. Te rugăm să reîncarci pagina.",
+    "Unknown user" : "Utilizator necunoscut",
+    "%s enter the database name." : "%s introduceți numele bazei de date",
+    "MS SQL username and/or password not valid: %s" : "Nume utilizator și/sau parolă MS SQL greșită: %s",
+    "MySQL/MariaDB username and/or password not valid" : "Nume utilizator și/sau parolă MySQL/MariaDB greșită",
+    "DB Error: \"%s\"" : "Eroare Bază de Date: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Utilizatorul MySQL/MariaDB '%s'@'localhost' deja există.",
+    "Drop this user from MySQL/MariaDB" : "Șterge acest utilizator din MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Utilizatorul MySQL/MariaDB '%s'@'%%' deja există.",
+    "Drop this user from MySQL/MariaDB." : "Șterge acest utilizator din MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Conexiunea Oracle nu a putut fi stabilită",
+    "PostgreSQL username and/or password not valid" : "Nume utilizator și/sau parolă PostgreSQL greșită",
+    "Set an admin username." : "Setează un nume de administrator.",
+    "Set an admin password." : "Setează o parolă de administrator.",
+    "%s shared »%s« with you" : "%s Partajat »%s« cu tine de",
+    "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\"",
+    "seconds ago" : "secunde în urmă",
+    "_%n minute ago_::_%n minutes ago_" : ["","","acum %n minute"],
+    "_%n hour ago_::_%n hours ago_" : ["","","acum %n ore"],
+    "today" : "astăzi",
+    "yesterday" : "ieri",
+    "_%n day go_::_%n days ago_" : ["","","acum %n zile"],
+    "last month" : "ultima lună",
+    "_%n month ago_::_%n months ago_" : ["%n lună în urmă","%n luni în urmă","%n luni în urmă"],
+    "last year" : "ultimul an",
+    "years ago" : "ani în urmă",
+    "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",
+    "Cannot write into \"config\" directory" : "Nu se poate scrie în folderul \"config\"",
+    "Cannot write into \"apps\" directory" : "Nu se poate scrie în folderul \"apps\""
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
new file mode 100644
index 00000000000..760f66e8ba6
--- /dev/null
+++ b/lib/l10n/ro.json
@@ -0,0 +1,50 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Nu se poate scrie în folderul \"config\"!",
+    "See %s" : "Vezi %s",
+    "Help" : "Ajutor",
+    "Personal" : "Personal",
+    "Settings" : "Setări",
+    "Users" : "Utilizatori",
+    "Admin" : "Admin",
+    "Recommended" : "Recomandat",
+    "No app name specified" : "Niciun nume de aplicație specificat",
+    "Unknown filetype" : "Tip fișier necunoscut",
+    "Invalid image" : "Imagine invalidă",
+    "web services under your control" : "servicii web controlate de tine",
+    "Application is not enabled" : "Aplicația nu este activată",
+    "Authentication error" : "Eroare la autentificare",
+    "Token expired. Please reload page." : "Token expirat. Te rugăm să reîncarci pagina.",
+    "Unknown user" : "Utilizator necunoscut",
+    "%s enter the database name." : "%s introduceți numele bazei de date",
+    "MS SQL username and/or password not valid: %s" : "Nume utilizator și/sau parolă MS SQL greșită: %s",
+    "MySQL/MariaDB username and/or password not valid" : "Nume utilizator și/sau parolă MySQL/MariaDB greșită",
+    "DB Error: \"%s\"" : "Eroare Bază de Date: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Utilizatorul MySQL/MariaDB '%s'@'localhost' deja există.",
+    "Drop this user from MySQL/MariaDB" : "Șterge acest utilizator din MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Utilizatorul MySQL/MariaDB '%s'@'%%' deja există.",
+    "Drop this user from MySQL/MariaDB." : "Șterge acest utilizator din MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Conexiunea Oracle nu a putut fi stabilită",
+    "PostgreSQL username and/or password not valid" : "Nume utilizator și/sau parolă PostgreSQL greșită",
+    "Set an admin username." : "Setează un nume de administrator.",
+    "Set an admin password." : "Setează o parolă de administrator.",
+    "%s shared »%s« with you" : "%s Partajat »%s« cu tine de",
+    "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\"",
+    "seconds ago" : "secunde în urmă",
+    "_%n minute ago_::_%n minutes ago_" : ["","","acum %n minute"],
+    "_%n hour ago_::_%n hours ago_" : ["","","acum %n ore"],
+    "today" : "astăzi",
+    "yesterday" : "ieri",
+    "_%n day go_::_%n days ago_" : ["","","acum %n zile"],
+    "last month" : "ultima lună",
+    "_%n month ago_::_%n months ago_" : ["%n lună în urmă","%n luni în urmă","%n luni în urmă"],
+    "last year" : "ultimul an",
+    "years ago" : "ani în urmă",
+    "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",
+    "Cannot write into \"config\" directory" : "Nu se poate scrie în folderul \"config\"",
+    "Cannot write into \"apps\" directory" : "Nu se poate scrie în folderul \"apps\""
+},"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/lib/l10n/ro.php b/lib/l10n/ro.php
deleted file mode 100644
index 20817232f8e..00000000000
--- a/lib/l10n/ro.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Nu se poate scrie în folderul \"config\"!",
-"See %s" => "Vezi %s",
-"Help" => "Ajutor",
-"Personal" => "Personal",
-"Settings" => "Setări",
-"Users" => "Utilizatori",
-"Admin" => "Admin",
-"Recommended" => "Recomandat",
-"No app name specified" => "Niciun nume de aplicație specificat",
-"Unknown filetype" => "Tip fișier necunoscut",
-"Invalid image" => "Imagine invalidă",
-"web services under your control" => "servicii web controlate de tine",
-"Application is not enabled" => "Aplicația nu este activată",
-"Authentication error" => "Eroare la autentificare",
-"Token expired. Please reload page." => "Token expirat. Te rugăm să reîncarci pagina.",
-"Unknown user" => "Utilizator necunoscut",
-"%s enter the database name." => "%s introduceți numele bazei de date",
-"MS SQL username and/or password not valid: %s" => "Nume utilizator și/sau parolă MS SQL greșită: %s",
-"MySQL/MariaDB username and/or password not valid" => "Nume utilizator și/sau parolă MySQL/MariaDB greșită",
-"DB Error: \"%s\"" => "Eroare Bază de Date: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "Utilizatorul MySQL/MariaDB '%s'@'localhost' deja există.",
-"Drop this user from MySQL/MariaDB" => "Șterge acest utilizator din MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Utilizatorul MySQL/MariaDB '%s'@'%%' deja există.",
-"Drop this user from MySQL/MariaDB." => "Șterge acest utilizator din MySQL/MariaDB.",
-"Oracle connection could not be established" => "Conexiunea Oracle nu a putut fi stabilită",
-"PostgreSQL username and/or password not valid" => "Nume utilizator și/sau parolă PostgreSQL greșită",
-"Set an admin username." => "Setează un nume de administrator.",
-"Set an admin password." => "Setează o parolă de administrator.",
-"%s shared »%s« with you" => "%s Partajat »%s« cu tine de",
-"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\"",
-"seconds ago" => "secunde în urmă",
-"_%n minute ago_::_%n minutes ago_" => array("","","acum %n minute"),
-"_%n hour ago_::_%n hours ago_" => array("","","acum %n ore"),
-"today" => "astăzi",
-"yesterday" => "ieri",
-"_%n day go_::_%n days ago_" => array("","","acum %n zile"),
-"last month" => "ultima lună",
-"_%n month ago_::_%n months ago_" => array("%n lună în urmă","%n luni în urmă","%n luni în urmă"),
-"last year" => "ultimul an",
-"years ago" => "ani în urmă",
-"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",
-"Cannot write into \"config\" directory" => "Nu se poate scrie în folderul \"config\"",
-"Cannot write into \"apps\" directory" => "Nu se poate scrie în folderul \"apps\""
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
new file mode 100644
index 00000000000..d5da14afd97
--- /dev/null
+++ b/lib/l10n/ru.js
@@ -0,0 +1,123 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Запись в каталог \"config\" невозможна",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Обычно это можно исправить, предоставив веб-серверу права на запись в папке конфигурации",
+    "See %s" : "Просмотр %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в папке конфигурации%s.",
+    "Sample configuration detected" : "Обнаружена конфигурация из примера",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Это может повредить вашей системе и это не поддерживается. Пожалуйста прочтите доументацию перед внесением изменений в файл config.php",
+    "Help" : "Помощь",
+    "Personal" : "Личное",
+    "Settings" : "Настройки",
+    "Users" : "Пользователи",
+    "Admin" : "Администрирование",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Невозможно установить приложение \\\"%s\\\", т.к. оно несовместимо с этой версией ownCloud.",
+    "No app name specified" : "Не указано имя приложения",
+    "Unknown filetype" : "Неизвестный тип файла",
+    "Invalid image" : "Изображение повреждено",
+    "web services under your control" : "веб-сервисы под вашим управлением",
+    "App directory already exists" : "Папка приложения уже существует",
+    "Can't create app folder. Please fix permissions. %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" : "Не указан путь при установке приложения из локального файла",
+    "Archives of type %s are not supported" : "Архивы %s не поддерживаются",
+    "Failed to open archive when installing app" : "Не возможно открыть архив при установке приложения",
+    "App does not provide an info.xml file" : "Приложение не имеет файла info.xml",
+    "App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Приложение невозможно установить. Версия в info.xml/version не совпадает с версией заявленной в магазине приложений",
+    "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 Вы не можете использовать точки в имени базы данных",
+    "MS SQL username and/or password not valid: %s" : "Неверное имя пользователя и/или пароль MS SQL: %s",
+    "You need to enter either an existing account or the administrator." : "Вы должны войти или в существующий аккаунт или под администратором.",
+    "MySQL/MariaDB username and/or password not valid" : "Неверное имя пользователя и/или пароль MySQL/MariaDB",
+    "DB Error: \"%s\"" : "Ошибка БД: \"%s\"",
+    "Offending command was: \"%s\"" : "Вызываемая команда была: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Пользователь MySQL '%s'@'localhost' уже существует.",
+    "Drop this user from MySQL/MariaDB" : "Удалить данного участника из MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Пользователь MySQL '%s'@'%%' уже существует.",
+    "Drop this user from MySQL/MariaDB." : "Удалить данного участника из MySQL/MariaDB.",
+    "Oracle connection could not be established" : "соединение с Oracle не может быть установлено",
+    "Oracle username and/or password not valid" : "Неверное имя пользователя и/или пароль Oracle",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
+    "PostgreSQL username and/or password not valid" : "Неверное имя пользователя и/или пароль PostgreSQL",
+    "Set an admin username." : "Задать имя пользователя для admin.",
+    "Set an admin password." : "Задать пароль для admin.",
+    "Can't create or write into the data directory %s" : "Невозможно создать или записать в каталог данных %s",
+    "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "Не удалось установить общий доступ для %s, пользователь %s уже  является владельцем",
+    "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 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" : "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки",
+    "Sharing %s failed, because sharing with links is not allowed" : "Не удалось установить общий доступ для %s, потому что обмен со ссылками не допускается",
+    "Share type %s is not valid for %s" : "Такой тип общего доступа как %s не допустим для %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Настройка прав доступа для %s невозможна, поскольку права доступа превышают предоставленные права доступа %s",
+    "Setting permissions for %s failed, because the item was not found" : "Не удалось произвести настройку прав доступа для %s , элемент не был найден.",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Невозможно установить дату устаревания. Разделяемые ресурсы не могут устареть позже, чем %s с момента их публикации.",
+    "Cannot set expiration date. Expiration date is in the past" : "Невозможно установить дату окончания. Дата окончания в прошлом.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Бэкенд для опубликования %s должен реализовывать интерфейс OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Бэкэнд для общего доступа %s не найден",
+    "Sharing backend for %s not found" : "Бэкэнд для общего доступа к %s не найден",
+    "Sharing %s failed, because the user %s is the original sharer" : "Публикация %s неудачна, т.к. пользователь %s - публикатор оригинала файла",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Не удалось опубликовать %s, т.к. права %s превышают предоставленные права доступа ",
+    "Sharing %s failed, because resharing is not allowed" : "Публикация %s неудачна, т.к републикация запрещена",
+    "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\"  не найдена",
+    "seconds ago" : "несколько секунд назад",
+    "_%n minute ago_::_%n minutes ago_" : ["%n минута назад","%n минуты назад","%n минут назад"],
+    "_%n hour ago_::_%n hours ago_" : ["%n час назад","%n часа назад","%n часов назад"],
+    "today" : "сегодня",
+    "yesterday" : "вчера",
+    "_%n day go_::_%n days ago_" : ["%n день назад","%n дня назад","%n дней назад"],
+    "last month" : "в прошлом месяце",
+    "_%n month ago_::_%n months ago_" : ["%n месяц назад","%n месяца назад","%n месяцев назад"],
+    "last year" : "в прошлом году",
+    "years ago" : "несколько лет назад",
+    "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" : "Укажите валидный пароль",
+    "The username is already being used" : "Имя пользователя уже используется",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Не установлены драйвера баз данных (sqlite, mysql или postgresql)",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой папке%s.",
+    "Cannot write into \"config\" directory" : "Запись в каталог \"config\" невозможна",
+    "Cannot write into \"apps\" directory" : "Запись в каталог \"app\" невозможна",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в папку приложений%s или отключив appstore в файле конфигурации.",
+    "Cannot create \"data\" directory (%s)" : "Невозможно создать каталог \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Обычно это можно исправить, <a href=\"%s\" target=\"_blank\">предоставив веб-серверу права на запись в корневой папке.",
+    "Setting locale to %s failed" : "Установка локали в %s не удалась",
+    "Please install one of these locales on your system and restart your webserver." : "Установите одну из этих локалей на вашей системе и перезапустите веб-сервер.",
+    "Please ask your server administrator to install the module." : "Пожалуйста, попростите администратора сервера установить модуль.",
+    "PHP module %s not installed." : "Не установлен PHP-модуль %s.",
+    "PHP %s or higher is required." : "Требуется PHP %s или выше",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Пожалуйста, обратитесь к администратору сервера, чтобы обновить PHP до последней версии. Ваша версия PHP больше не поддерживается ownCloud и сообществом PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Включен безопасный режим PHP. ownCloud требует, чтобы он был выключен для корректной работы.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Безопасный режим PHP не поддерживается и его следует выключить как практически бесполезную настройку. Пожалуйста, попросите администратора сервера выключить его в php.ini либо в вашей конфигурации веб-сервера.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Включен режим Magic Quotes. ownCloud требует, чтобы он был выключен для корректной работы.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes не поддерживается и его следует выключить как практически бесполезную настройку. Пожалуйста, попросите администратора сервера выключить его в php.ini либо в вашей конфигурации веб-сервера.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Модули PHP был установлены, но все еще в списке как недостающие?",
+    "Please ask your server administrator to restart the web server." : "Пожалуйста, попросите администратора вашего сервера перезапустить веб-сервер.",
+    "PostgreSQL >= 9 required" : "Требуется PostgreSQL >= 9",
+    "Please upgrade your database version" : "Пожалуйста, обновите вашу версию базы данных",
+    "Error occurred while checking PostgreSQL version" : "Произошла ошибка при проверке версии PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Пожалуйста, обедитесь что версия PostgreSQL >= 9 или проверьте логи за дополнительной информацией об ошибке",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Пожалуйста, измениите флаги разрешений на 0770 чтобы другие пользователи не могли получить списка файлов этой папки.",
+    "Data directory (%s) is readable by other users" : "Папка данных (%s) доступна для чтения другим пользователям",
+    "Data directory (%s) is invalid" : "Папка данных (%s) не верна",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Пожалуйста, убедитесь, что папка данных содержит в корне файл \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d на \"%s\""
+},
+"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/ru.json b/lib/l10n/ru.json
new file mode 100644
index 00000000000..60c0d7ecfa0
--- /dev/null
+++ b/lib/l10n/ru.json
@@ -0,0 +1,121 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Запись в каталог \"config\" невозможна",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Обычно это можно исправить, предоставив веб-серверу права на запись в папке конфигурации",
+    "See %s" : "Просмотр %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в папке конфигурации%s.",
+    "Sample configuration detected" : "Обнаружена конфигурация из примера",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Была обнаружена конфигурация из примера. Это может повредить вашей системе и это не поддерживается. Пожалуйста прочтите доументацию перед внесением изменений в файл config.php",
+    "Help" : "Помощь",
+    "Personal" : "Личное",
+    "Settings" : "Настройки",
+    "Users" : "Пользователи",
+    "Admin" : "Администрирование",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Невозможно установить приложение \\\"%s\\\", т.к. оно несовместимо с этой версией ownCloud.",
+    "No app name specified" : "Не указано имя приложения",
+    "Unknown filetype" : "Неизвестный тип файла",
+    "Invalid image" : "Изображение повреждено",
+    "web services under your control" : "веб-сервисы под вашим управлением",
+    "App directory already exists" : "Папка приложения уже существует",
+    "Can't create app folder. Please fix permissions. %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" : "Не указан путь при установке приложения из локального файла",
+    "Archives of type %s are not supported" : "Архивы %s не поддерживаются",
+    "Failed to open archive when installing app" : "Не возможно открыть архив при установке приложения",
+    "App does not provide an info.xml file" : "Приложение не имеет файла info.xml",
+    "App can't be installed because of not allowed code in the App" : "Приложение невозможно установить. В нем содержится запрещенный код.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Приложение невозможно установить. Версия в info.xml/version не совпадает с версией заявленной в магазине приложений",
+    "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 Вы не можете использовать точки в имени базы данных",
+    "MS SQL username and/or password not valid: %s" : "Неверное имя пользователя и/или пароль MS SQL: %s",
+    "You need to enter either an existing account or the administrator." : "Вы должны войти или в существующий аккаунт или под администратором.",
+    "MySQL/MariaDB username and/or password not valid" : "Неверное имя пользователя и/или пароль MySQL/MariaDB",
+    "DB Error: \"%s\"" : "Ошибка БД: \"%s\"",
+    "Offending command was: \"%s\"" : "Вызываемая команда была: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Пользователь MySQL '%s'@'localhost' уже существует.",
+    "Drop this user from MySQL/MariaDB" : "Удалить данного участника из MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Пользователь MySQL '%s'@'%%' уже существует.",
+    "Drop this user from MySQL/MariaDB." : "Удалить данного участника из MySQL/MariaDB.",
+    "Oracle connection could not be established" : "соединение с Oracle не может быть установлено",
+    "Oracle username and/or password not valid" : "Неверное имя пользователя и/или пароль Oracle",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
+    "PostgreSQL username and/or password not valid" : "Неверное имя пользователя и/или пароль PostgreSQL",
+    "Set an admin username." : "Задать имя пользователя для admin.",
+    "Set an admin password." : "Задать пароль для admin.",
+    "Can't create or write into the data directory %s" : "Невозможно создать или записать в каталог данных %s",
+    "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "Не удалось установить общий доступ для %s, пользователь %s уже  является владельцем",
+    "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 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" : "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки",
+    "Sharing %s failed, because sharing with links is not allowed" : "Не удалось установить общий доступ для %s, потому что обмен со ссылками не допускается",
+    "Share type %s is not valid for %s" : "Такой тип общего доступа как %s не допустим для %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Настройка прав доступа для %s невозможна, поскольку права доступа превышают предоставленные права доступа %s",
+    "Setting permissions for %s failed, because the item was not found" : "Не удалось произвести настройку прав доступа для %s , элемент не был найден.",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Невозможно установить дату устаревания. Разделяемые ресурсы не могут устареть позже, чем %s с момента их публикации.",
+    "Cannot set expiration date. Expiration date is in the past" : "Невозможно установить дату окончания. Дата окончания в прошлом.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Бэкенд для опубликования %s должен реализовывать интерфейс OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Бэкэнд для общего доступа %s не найден",
+    "Sharing backend for %s not found" : "Бэкэнд для общего доступа к %s не найден",
+    "Sharing %s failed, because the user %s is the original sharer" : "Публикация %s неудачна, т.к. пользователь %s - публикатор оригинала файла",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Не удалось опубликовать %s, т.к. права %s превышают предоставленные права доступа ",
+    "Sharing %s failed, because resharing is not allowed" : "Публикация %s неудачна, т.к републикация запрещена",
+    "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\"  не найдена",
+    "seconds ago" : "несколько секунд назад",
+    "_%n minute ago_::_%n minutes ago_" : ["%n минута назад","%n минуты назад","%n минут назад"],
+    "_%n hour ago_::_%n hours ago_" : ["%n час назад","%n часа назад","%n часов назад"],
+    "today" : "сегодня",
+    "yesterday" : "вчера",
+    "_%n day go_::_%n days ago_" : ["%n день назад","%n дня назад","%n дней назад"],
+    "last month" : "в прошлом месяце",
+    "_%n month ago_::_%n months ago_" : ["%n месяц назад","%n месяца назад","%n месяцев назад"],
+    "last year" : "в прошлом году",
+    "years ago" : "несколько лет назад",
+    "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" : "Укажите валидный пароль",
+    "The username is already being used" : "Имя пользователя уже используется",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Не установлены драйвера баз данных (sqlite, mysql или postgresql)",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой папке%s.",
+    "Cannot write into \"config\" directory" : "Запись в каталог \"config\" невозможна",
+    "Cannot write into \"apps\" directory" : "Запись в каталог \"app\" невозможна",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в папку приложений%s или отключив appstore в файле конфигурации.",
+    "Cannot create \"data\" directory (%s)" : "Невозможно создать каталог \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Обычно это можно исправить, <a href=\"%s\" target=\"_blank\">предоставив веб-серверу права на запись в корневой папке.",
+    "Setting locale to %s failed" : "Установка локали в %s не удалась",
+    "Please install one of these locales on your system and restart your webserver." : "Установите одну из этих локалей на вашей системе и перезапустите веб-сервер.",
+    "Please ask your server administrator to install the module." : "Пожалуйста, попростите администратора сервера установить модуль.",
+    "PHP module %s not installed." : "Не установлен PHP-модуль %s.",
+    "PHP %s or higher is required." : "Требуется PHP %s или выше",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Пожалуйста, обратитесь к администратору сервера, чтобы обновить PHP до последней версии. Ваша версия PHP больше не поддерживается ownCloud и сообществом PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Включен безопасный режим PHP. ownCloud требует, чтобы он был выключен для корректной работы.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Безопасный режим PHP не поддерживается и его следует выключить как практически бесполезную настройку. Пожалуйста, попросите администратора сервера выключить его в php.ini либо в вашей конфигурации веб-сервера.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Включен режим Magic Quotes. ownCloud требует, чтобы он был выключен для корректной работы.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes не поддерживается и его следует выключить как практически бесполезную настройку. Пожалуйста, попросите администратора сервера выключить его в php.ini либо в вашей конфигурации веб-сервера.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Модули PHP был установлены, но все еще в списке как недостающие?",
+    "Please ask your server administrator to restart the web server." : "Пожалуйста, попросите администратора вашего сервера перезапустить веб-сервер.",
+    "PostgreSQL >= 9 required" : "Требуется PostgreSQL >= 9",
+    "Please upgrade your database version" : "Пожалуйста, обновите вашу версию базы данных",
+    "Error occurred while checking PostgreSQL version" : "Произошла ошибка при проверке версии PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Пожалуйста, обедитесь что версия PostgreSQL >= 9 или проверьте логи за дополнительной информацией об ошибке",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Пожалуйста, измениите флаги разрешений на 0770 чтобы другие пользователи не могли получить списка файлов этой папки.",
+    "Data directory (%s) is readable by other users" : "Папка данных (%s) доступна для чтения другим пользователям",
+    "Data directory (%s) is invalid" : "Папка данных (%s) не верна",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Пожалуйста, убедитесь, что папка данных содержит в корне файл \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Не удалось получить блокировку типа %d на \"%s\""
+},"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/ru.php b/lib/l10n/ru.php
deleted file mode 100644
index 40cfc1d2b53..00000000000
--- a/lib/l10n/ru.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Запись в каталог \"config\" невозможна",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Обычно это можно исправить, предоставив веб-серверу права на запись в папке конфигурации",
-"See %s" => "Просмотр %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в папке конфигурации%s.",
-"Sample configuration detected" => "Обнаружена конфигурация из примера",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Была обнаружена конфигурация из примера. Это может повредить вашей системе и это не поддерживается. Пожалуйста прочтите доументацию перед внесением изменений в файл config.php",
-"Help" => "Помощь",
-"Personal" => "Личное",
-"Settings" => "Настройки",
-"Users" => "Пользователи",
-"Admin" => "Администрирование",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Невозможно установить приложение \\\"%s\\\", т.к. оно несовместимо с этой версией ownCloud.",
-"No app name specified" => "Не указано имя приложения",
-"Unknown filetype" => "Неизвестный тип файла",
-"Invalid image" => "Изображение повреждено",
-"web services under your control" => "веб-сервисы под вашим управлением",
-"App directory already exists" => "Папка приложения уже существует",
-"Can't create app folder. Please fix permissions. %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" => "Не указан путь при установке приложения из локального файла",
-"Archives of type %s are not supported" => "Архивы %s не поддерживаются",
-"Failed to open archive when installing app" => "Не возможно открыть архив при установке приложения",
-"App does not provide an info.xml file" => "Приложение не имеет файла info.xml",
-"App can't be installed because of not allowed code in the App" => "Приложение невозможно установить. В нем содержится запрещенный код.",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Приложение невозможно установить. Не совместимо с текущей версией ownCloud.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Приложение невозможно установить. Оно содержит параметр <shipped>true</shipped> который не допустим для приложений, не входящих в поставку.",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Приложение невозможно установить. Версия в info.xml/version не совпадает с версией заявленной в магазине приложений",
-"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 Вы не можете использовать точки в имени базы данных",
-"MS SQL username and/or password not valid: %s" => "Неверное имя пользователя и/или пароль MS SQL: %s",
-"You need to enter either an existing account or the administrator." => "Вы должны войти или в существующий аккаунт или под администратором.",
-"MySQL/MariaDB username and/or password not valid" => "Неверное имя пользователя и/или пароль MySQL/MariaDB",
-"DB Error: \"%s\"" => "Ошибка БД: \"%s\"",
-"Offending command was: \"%s\"" => "Вызываемая команда была: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "Пользователь MySQL '%s'@'localhost' уже существует.",
-"Drop this user from MySQL/MariaDB" => "Удалить данного участника из MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Пользователь MySQL '%s'@'%%' уже существует.",
-"Drop this user from MySQL/MariaDB." => "Удалить данного участника из MySQL/MariaDB.",
-"Oracle connection could not be established" => "соединение с Oracle не может быть установлено",
-"Oracle username and/or password not valid" => "Неверное имя пользователя и/или пароль Oracle",
-"Offending command was: \"%s\", name: %s, password: %s" => "Вызываемая команда была: \"%s\", имя: %s, пароль: %s",
-"PostgreSQL username and/or password not valid" => "Неверное имя пользователя и/или пароль PostgreSQL",
-"Set an admin username." => "Задать имя пользователя для admin.",
-"Set an admin password." => "Задать пароль для admin.",
-"Can't create or write into the data directory %s" => "Невозможно создать или записать в каталог данных %s",
-"%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",
-"Sharing %s failed, because the user %s is the item owner" => "Не удалось установить общий доступ для %s, пользователь %s уже  является владельцем",
-"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 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" => "Вам нужно задать пароль для создания публичной ссылки. Разрешены только защищённые ссылки",
-"Sharing %s failed, because sharing with links is not allowed" => "Не удалось установить общий доступ для %s, потому что обмен со ссылками не допускается",
-"Share type %s is not valid for %s" => "Такой тип общего доступа как %s не допустим для %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Настройка прав доступа для %s невозможна, поскольку права доступа превышают предоставленные права доступа %s",
-"Setting permissions for %s failed, because the item was not found" => "Не удалось произвести настройку прав доступа для %s , элемент не был найден.",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Невозможно установить дату устаревания. Разделяемые ресурсы не могут устареть позже, чем %s с момента их публикации.",
-"Cannot set expiration date. Expiration date is in the past" => "Невозможно установить дату окончания. Дата окончания в прошлом.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Бэкенд для опубликования %s должен реализовывать интерфейс OCP\\Share_Backend",
-"Sharing backend %s not found" => "Бэкэнд для общего доступа %s не найден",
-"Sharing backend for %s not found" => "Бэкэнд для общего доступа к %s не найден",
-"Sharing %s failed, because the user %s is the original sharer" => "Публикация %s неудачна, т.к. пользователь %s - публикатор оригинала файла",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Не удалось опубликовать %s, т.к. права %s превышают предоставленные права доступа ",
-"Sharing %s failed, because resharing is not allowed" => "Публикация %s неудачна, т.к републикация запрещена",
-"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\"  не найдена",
-"seconds ago" => "несколько секунд назад",
-"_%n minute ago_::_%n minutes ago_" => array("%n минута назад","%n минуты назад","%n минут назад"),
-"_%n hour ago_::_%n hours ago_" => array("%n час назад","%n часа назад","%n часов назад"),
-"today" => "сегодня",
-"yesterday" => "вчера",
-"_%n day go_::_%n days ago_" => array("%n день назад","%n дня назад","%n дней назад"),
-"last month" => "в прошлом месяце",
-"_%n month ago_::_%n months ago_" => array("%n месяц назад","%n месяца назад","%n месяцев назад"),
-"last year" => "в прошлом году",
-"years ago" => "несколько лет назад",
-"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" => "Укажите валидный пароль",
-"The username is already being used" => "Имя пользователя уже используется",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Не установлены драйвера баз данных (sqlite, mysql или postgresql)",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в корневой папке%s.",
-"Cannot write into \"config\" directory" => "Запись в каталог \"config\" невозможна",
-"Cannot write into \"apps\" directory" => "Запись в каталог \"app\" невозможна",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Обычно это можно исправить, %sпредоставив веб-серверу права на запись в папку приложений%s или отключив appstore в файле конфигурации.",
-"Cannot create \"data\" directory (%s)" => "Невозможно создать каталог \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Обычно это можно исправить, <a href=\"%s\" target=\"_blank\">предоставив веб-серверу права на запись в корневой папке.",
-"Setting locale to %s failed" => "Установка локали в %s не удалась",
-"Please install one of these locales on your system and restart your webserver." => "Установите одну из этих локалей на вашей системе и перезапустите веб-сервер.",
-"Please ask your server administrator to install the module." => "Пожалуйста, попростите администратора сервера установить модуль.",
-"PHP module %s not installed." => "Не установлен PHP-модуль %s.",
-"PHP %s or higher is required." => "Требуется PHP %s или выше",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Пожалуйста, обратитесь к администратору сервера, чтобы обновить PHP до последней версии. Ваша версия PHP больше не поддерживается ownCloud и сообществом PHP.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Включен безопасный режим PHP. ownCloud требует, чтобы он был выключен для корректной работы.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Безопасный режим PHP не поддерживается и его следует выключить как практически бесполезную настройку. Пожалуйста, попросите администратора сервера выключить его в php.ini либо в вашей конфигурации веб-сервера.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Включен режим Magic Quotes. ownCloud требует, чтобы он был выключен для корректной работы.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes не поддерживается и его следует выключить как практически бесполезную настройку. Пожалуйста, попросите администратора сервера выключить его в php.ini либо в вашей конфигурации веб-сервера.",
-"PHP modules have been installed, but they are still listed as missing?" => "Модули PHP был установлены, но все еще в списке как недостающие?",
-"Please ask your server administrator to restart the web server." => "Пожалуйста, попросите администратора вашего сервера перезапустить веб-сервер.",
-"PostgreSQL >= 9 required" => "Требуется PostgreSQL >= 9",
-"Please upgrade your database version" => "Пожалуйста, обновите вашу версию базы данных",
-"Error occurred while checking PostgreSQL version" => "Произошла ошибка при проверке версии PostgreSQL",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Пожалуйста, обедитесь что версия PostgreSQL >= 9 или проверьте логи за дополнительной информацией об ошибке",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Пожалуйста, измениите флаги разрешений на 0770 чтобы другие пользователи не могли получить списка файлов этой папки.",
-"Data directory (%s) is readable by other users" => "Папка данных (%s) доступна для чтения другим пользователям",
-"Data directory (%s) is invalid" => "Папка данных (%s) не верна",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Пожалуйста, убедитесь, что папка данных содержит в корне файл \".ocdata\".",
-"Could not obtain lock type %d on \"%s\"." => "Не удалось получить блокировку типа %d на \"%s\""
-);
-$PLURAL_FORMS = "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/si_LK.js b/lib/l10n/si_LK.js
new file mode 100644
index 00000000000..76ad1716ce2
--- /dev/null
+++ b/lib/l10n/si_LK.js
@@ -0,0 +1,24 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "උදව්",
+    "Personal" : "පෞද්ගලික",
+    "Settings" : "සිටුවම්",
+    "Users" : "පරිශීලකයන්",
+    "Admin" : "පරිපාලක",
+    "web services under your control" : "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
+    "Application is not enabled" : "යෙදුම සක්‍රිය කර නොමැත",
+    "Authentication error" : "සත්‍යාපන දෝෂයක්",
+    "Token expired. Please reload page." : "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න",
+    "seconds ago" : "තත්පරයන්ට පෙර",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "අද",
+    "yesterday" : "ඊයේ",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "පෙර මාසයේ",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "පෙර අවුරුද්දේ",
+    "years ago" : "අවුරුදු කීපයකට පෙර"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/si_LK.json b/lib/l10n/si_LK.json
new file mode 100644
index 00000000000..0bfa32a0754
--- /dev/null
+++ b/lib/l10n/si_LK.json
@@ -0,0 +1,22 @@
+{ "translations": {
+    "Help" : "උදව්",
+    "Personal" : "පෞද්ගලික",
+    "Settings" : "සිටුවම්",
+    "Users" : "පරිශීලකයන්",
+    "Admin" : "පරිපාලක",
+    "web services under your control" : "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
+    "Application is not enabled" : "යෙදුම සක්‍රිය කර නොමැත",
+    "Authentication error" : "සත්‍යාපන දෝෂයක්",
+    "Token expired. Please reload page." : "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න",
+    "seconds ago" : "තත්පරයන්ට පෙර",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "අද",
+    "yesterday" : "ඊයේ",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "පෙර මාසයේ",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "පෙර අවුරුද්දේ",
+    "years ago" : "අවුරුදු කීපයකට පෙර"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
deleted file mode 100644
index 8ba19238a59..00000000000
--- a/lib/l10n/si_LK.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "උදව්",
-"Personal" => "පෞද්ගලික",
-"Settings" => "සිටුවම්",
-"Users" => "පරිශීලකයන්",
-"Admin" => "පරිපාලක",
-"web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
-"Application is not enabled" => "යෙදුම සක්‍රිය කර නොමැත",
-"Authentication error" => "සත්‍යාපන දෝෂයක්",
-"Token expired. Please reload page." => "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න",
-"seconds ago" => "තත්පරයන්ට පෙර",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "අද",
-"yesterday" => "ඊයේ",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "පෙර මාසයේ",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "පෙර අවුරුද්දේ",
-"years ago" => "අවුරුදු කීපයකට පෙර"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js
new file mode 100644
index 00000000000..97ace297cf6
--- /dev/null
+++ b/lib/l10n/sk_SK.js
@@ -0,0 +1,122 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Nie je možné zapisovat do priečinka \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "To je zvyčajne možné opraviť tým, že udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou.",
+    "See %s" : "Pozri %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
+    "Sample configuration detected" : "Detekovaná bola vzorová konfigurácia",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zistilo sa, že konfigurácia bola skopírovaná zo vzorových súborov. Takáto konfigurácia nie je podporovaná a môže poškodiť vašu inštaláciu. Prečítajte si dokumentáciu pred vykonaním zmien v config.php",
+    "Help" : "Pomoc",
+    "Personal" : "Osobné",
+    "Settings" : "Nastavenia",
+    "Users" : "Používatelia",
+    "Admin" : "Administrátor",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie je kompatibilná s touto verziou systému ownCloud.",
+    "No app name specified" : "Nešpecifikované meno aplikácie",
+    "Unknown filetype" : "Neznámy typ súboru",
+    "Invalid image" : "Chybný obrázok",
+    "web services under your control" : "webové služby pod Vašou kontrolou",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Tento typ archívu %s nie je podporovaný",
+    "Failed to open archive when installing app" : "Zlyhanie pri otváraní archívu počas inštalácie aplikácie",
+    "App does not provide an info.xml file" : "Aplikácia neposkytuje súbor info.xml",
+    "App can't be installed because of not allowed code in the App" : "Aplikácia nemôže byť nainštalovaná pre nepovolený kód v aplikácii",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikácia nemôže byť nainštalovaná pre nekompatibilitu z touto verziou ownCloudu",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikácia nemôže byť nainštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikácia nemôže byť nainštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v obchode s aplikáciami",
+    "Application is not enabled" : "Aplikácia nie je zapnutá",
+    "Authentication error" : "Chyba autentifikácie",
+    "Token expired. Please reload page." : "Token vypršal. Obnovte, prosím, stránku.",
+    "Unknown user" : "Neznámy používateľ",
+    "%s enter the database username." : "Zadajte používateľské meno %s databázy.",
+    "%s enter the database name." : "Zadajte názov databázy pre %s databázy.",
+    "%s you may not use dots in the database name" : "V názve databázy %s nemôžete používať bodky",
+    "MS SQL username and/or password not valid: %s" : "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
+    "You need to enter either an existing account or the administrator." : "Musíte zadať jestvujúci účet alebo administrátora.",
+    "MySQL/MariaDB username and/or password not valid" : "Používateľské meno a/alebo heslo pre MySQL/MariaDB databázu je neplatné",
+    "DB Error: \"%s\"" : "Chyba DB: \"%s\"",
+    "Offending command was: \"%s\"" : "Podozrivý príkaz bol: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Používateľ '%s'@'localhost' už v MySQL/MariaDB existuje.",
+    "Drop this user from MySQL/MariaDB" : "Zahodiť používateľa z MySQL/MariaDB.",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Používateľ '%s'@'%%' už v MySQL/MariaDB existuje",
+    "Drop this user from MySQL/MariaDB." : "Zahodiť používateľa z MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Nie je možné pripojiť sa k Oracle",
+    "Oracle username and/or password not valid" : "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s",
+    "PostgreSQL username and/or password not valid" : "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
+    "Set an admin username." : "Zadajte používateľské meno administrátora.",
+    "Set an admin password." : "Zadajte heslo administrátora.",
+    "%s shared »%s« with you" : "%s s vami zdieľa »%s«",
+    "Sharing %s failed, because the file does not exist" : "Zdieľanie %s zlyhalo, pretože súbor neexistuje",
+    "You are not allowed to share %s" : "Nemôžete zdieľať %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Zdieľanie %s zlyhalo, pretože používateľ %s je vlastníkom položky",
+    "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 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é",
+    "Sharing %s failed, because sharing with links is not allowed" : "Zdieľanie %s zlyhalo, pretože zdieľanie odkazom nie je povolené",
+    "Share type %s is not valid for %s" : "Typ zdieľania %s nie je platný pre %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavenie povolení pre %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s",
+    "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.",
+    "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ý",
+    "Sharing %s failed, because the user %s is the original sharer" : "Zdieľanie %s zlyhalo, pretože používateľ %s je pôvodcom zdieľania",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Zdieľanie %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s",
+    "Sharing %s failed, because resharing is not allowed" : "Zdieľanie %s zlyhalo, pretože zdieľanie ďalším nie je povolené",
+    "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\"",
+    "seconds ago" : "pred sekundami",
+    "_%n minute ago_::_%n minutes ago_" : ["pred %n minútou","pred %n minútami","pred %n minútami"],
+    "_%n hour ago_::_%n hours ago_" : ["pred %n hodinou","pred %n hodinami","pred %n hodinami"],
+    "today" : "dnes",
+    "yesterday" : "včera",
+    "_%n day go_::_%n days ago_" : ["pred %n dňom","pred %n dňami","pred %n dňami"],
+    "last month" : "minulý mesiac",
+    "_%n month ago_::_%n months ago_" : ["pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"],
+    "last year" : "minulý rok",
+    "years ago" : "pred rokmi",
+    "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, or postgresql) nie sú nainštalované.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového adresára%s.",
+    "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 %sudelíte webovému serveru oprávnenie na zápis do adresára aplikácií%s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
+    "Cannot create \"data\" directory (%s)" : "Nie je možné vytvoriť priečinok \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Toto je zvyčajne možné opraviť tým, že <a href=\"%s\" target=\"_blank\">udelíte webovému serveru oprávnenie na zápis do koreňového adresára</a>.",
+    "Setting locale to %s failed" : "Nastavenie locale na %s zlyhalo",
+    "Please install one of these locales on your system and restart your webserver." : "Prosím, nainštalujte si aspoň jeden z týchto jazykov so svojho systému a reštartujte webserver.",
+    "Please ask your server administrator to install the module." : "Prosím, požiadajte administrátora vášho servera o inštaláciu modulu.",
+    "PHP module %s not installed." : "PHP modul %s nie je nainštalovaný.",
+    "PHP %s or higher is required." : "Požadovaná verzia PHP %s alebo vyššia.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Prosím, požiadajte administrátora vášho servera o aktualizáciu PHP na najnovšiu verziu. Vaša verzia PHP už nie je podporovaná ownCloud-om a PHP komunitou.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode je zapnutý. ownCloud pre správnu funkčnosť vyžaduje, aby bol vypnutý.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode je zastarané a väčšinou zbytočné nastavenie, ktoré by malo byť vypnuté. Prosím, požiadajte administrátora vášho serveru o jeho vypnutie v php.ini alebo v nastaveniach webového servera.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes sú povolené. ownCloud pre správnu funkčnosť vyžaduje, aby boli vypnuté.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zavrhovanou a zbytočnou voľbou, ktorú by ste mali ponechať vypnutú. Prosím, požiadajte správcu svojho servera, aby ju vypol v php.ini alebo v konfigurácii vášho webového servera.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sú uvedené ako chýbajúce?",
+    "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.",
+    "PostgreSQL >= 9 required" : "Vyžadované PostgreSQL >= 9",
+    "Please upgrade your database version" : "Prosím, aktualizujte verziu svojej databázy",
+    "Error occurred while checking PostgreSQL version" : "Nastala chyba pri overovaní verzie PostgreSQL",
+    "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 adresár nemohli ostatní používatelia vypísať.",
+    "Data directory (%s) is readable by other users" : "Adresár dát (%s) je prístupný na čítanie ostatným používateľom",
+    "Data directory (%s) is invalid" : "Adresár dát (%s) je neplatný",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Prosím, skontrolujte, či adresár dát obsahuje súbor „.ocdata“.",
+    "Could not obtain lock type %d on \"%s\"." : "Nepodarilo sa získať zámok typu %d na „%s“."
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json
new file mode 100644
index 00000000000..6867222d329
--- /dev/null
+++ b/lib/l10n/sk_SK.json
@@ -0,0 +1,120 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Nie je možné zapisovat do priečinka \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "To je zvyčajne možné opraviť tým, že udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou.",
+    "See %s" : "Pozri %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "To je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
+    "Sample configuration detected" : "Detekovaná bola vzorová konfigurácia",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zistilo sa, že konfigurácia bola skopírovaná zo vzorových súborov. Takáto konfigurácia nie je podporovaná a môže poškodiť vašu inštaláciu. Prečítajte si dokumentáciu pred vykonaním zmien v config.php",
+    "Help" : "Pomoc",
+    "Personal" : "Osobné",
+    "Settings" : "Nastavenia",
+    "Users" : "Používatelia",
+    "Admin" : "Administrátor",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie je kompatibilná s touto verziou systému ownCloud.",
+    "No app name specified" : "Nešpecifikované meno aplikácie",
+    "Unknown filetype" : "Neznámy typ súboru",
+    "Invalid image" : "Chybný obrázok",
+    "web services under your control" : "webové služby pod Vašou kontrolou",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "Tento typ archívu %s nie je podporovaný",
+    "Failed to open archive when installing app" : "Zlyhanie pri otváraní archívu počas inštalácie aplikácie",
+    "App does not provide an info.xml file" : "Aplikácia neposkytuje súbor info.xml",
+    "App can't be installed because of not allowed code in the App" : "Aplikácia nemôže byť nainštalovaná pre nepovolený kód v aplikácii",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Aplikácia nemôže byť nainštalovaná pre nekompatibilitu z touto verziou ownCloudu",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Aplikácia nemôže byť nainštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Aplikácia nemôže byť nainštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v obchode s aplikáciami",
+    "Application is not enabled" : "Aplikácia nie je zapnutá",
+    "Authentication error" : "Chyba autentifikácie",
+    "Token expired. Please reload page." : "Token vypršal. Obnovte, prosím, stránku.",
+    "Unknown user" : "Neznámy používateľ",
+    "%s enter the database username." : "Zadajte používateľské meno %s databázy.",
+    "%s enter the database name." : "Zadajte názov databázy pre %s databázy.",
+    "%s you may not use dots in the database name" : "V názve databázy %s nemôžete používať bodky",
+    "MS SQL username and/or password not valid: %s" : "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
+    "You need to enter either an existing account or the administrator." : "Musíte zadať jestvujúci účet alebo administrátora.",
+    "MySQL/MariaDB username and/or password not valid" : "Používateľské meno a/alebo heslo pre MySQL/MariaDB databázu je neplatné",
+    "DB Error: \"%s\"" : "Chyba DB: \"%s\"",
+    "Offending command was: \"%s\"" : "Podozrivý príkaz bol: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Používateľ '%s'@'localhost' už v MySQL/MariaDB existuje.",
+    "Drop this user from MySQL/MariaDB" : "Zahodiť používateľa z MySQL/MariaDB.",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Používateľ '%s'@'%%' už v MySQL/MariaDB existuje",
+    "Drop this user from MySQL/MariaDB." : "Zahodiť používateľa z MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Nie je možné pripojiť sa k Oracle",
+    "Oracle username and/or password not valid" : "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s",
+    "PostgreSQL username and/or password not valid" : "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
+    "Set an admin username." : "Zadajte používateľské meno administrátora.",
+    "Set an admin password." : "Zadajte heslo administrátora.",
+    "%s shared »%s« with you" : "%s s vami zdieľa »%s«",
+    "Sharing %s failed, because the file does not exist" : "Zdieľanie %s zlyhalo, pretože súbor neexistuje",
+    "You are not allowed to share %s" : "Nemôžete zdieľať %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Zdieľanie %s zlyhalo, pretože používateľ %s je vlastníkom položky",
+    "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 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é",
+    "Sharing %s failed, because sharing with links is not allowed" : "Zdieľanie %s zlyhalo, pretože zdieľanie odkazom nie je povolené",
+    "Share type %s is not valid for %s" : "Typ zdieľania %s nie je platný pre %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavenie povolení pre %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s",
+    "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.",
+    "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ý",
+    "Sharing %s failed, because the user %s is the original sharer" : "Zdieľanie %s zlyhalo, pretože používateľ %s je pôvodcom zdieľania",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Zdieľanie %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s",
+    "Sharing %s failed, because resharing is not allowed" : "Zdieľanie %s zlyhalo, pretože zdieľanie ďalším nie je povolené",
+    "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\"",
+    "seconds ago" : "pred sekundami",
+    "_%n minute ago_::_%n minutes ago_" : ["pred %n minútou","pred %n minútami","pred %n minútami"],
+    "_%n hour ago_::_%n hours ago_" : ["pred %n hodinou","pred %n hodinami","pred %n hodinami"],
+    "today" : "dnes",
+    "yesterday" : "včera",
+    "_%n day go_::_%n days ago_" : ["pred %n dňom","pred %n dňami","pred %n dňami"],
+    "last month" : "minulý mesiac",
+    "_%n month ago_::_%n months ago_" : ["pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"],
+    "last year" : "minulý rok",
+    "years ago" : "pred rokmi",
+    "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, or postgresql) nie sú nainštalované.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového adresára%s.",
+    "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 %sudelíte webovému serveru oprávnenie na zápis do adresára aplikácií%s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
+    "Cannot create \"data\" directory (%s)" : "Nie je možné vytvoriť priečinok \"data\" (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Toto je zvyčajne možné opraviť tým, že <a href=\"%s\" target=\"_blank\">udelíte webovému serveru oprávnenie na zápis do koreňového adresára</a>.",
+    "Setting locale to %s failed" : "Nastavenie locale na %s zlyhalo",
+    "Please install one of these locales on your system and restart your webserver." : "Prosím, nainštalujte si aspoň jeden z týchto jazykov so svojho systému a reštartujte webserver.",
+    "Please ask your server administrator to install the module." : "Prosím, požiadajte administrátora vášho servera o inštaláciu modulu.",
+    "PHP module %s not installed." : "PHP modul %s nie je nainštalovaný.",
+    "PHP %s or higher is required." : "Požadovaná verzia PHP %s alebo vyššia.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Prosím, požiadajte administrátora vášho servera o aktualizáciu PHP na najnovšiu verziu. Vaša verzia PHP už nie je podporovaná ownCloud-om a PHP komunitou.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode je zapnutý. ownCloud pre správnu funkčnosť vyžaduje, aby bol vypnutý.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode je zastarané a väčšinou zbytočné nastavenie, ktoré by malo byť vypnuté. Prosím, požiadajte administrátora vášho serveru o jeho vypnutie v php.ini alebo v nastaveniach webového servera.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes sú povolené. ownCloud pre správnu funkčnosť vyžaduje, aby boli vypnuté.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zavrhovanou a zbytočnou voľbou, ktorú by ste mali ponechať vypnutú. Prosím, požiadajte správcu svojho servera, aby ju vypol v php.ini alebo v konfigurácii vášho webového servera.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly boli nainštalované, ale stále sú uvedené ako chýbajúce?",
+    "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.",
+    "PostgreSQL >= 9 required" : "Vyžadované PostgreSQL >= 9",
+    "Please upgrade your database version" : "Prosím, aktualizujte verziu svojej databázy",
+    "Error occurred while checking PostgreSQL version" : "Nastala chyba pri overovaní verzie PostgreSQL",
+    "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 adresár nemohli ostatní používatelia vypísať.",
+    "Data directory (%s) is readable by other users" : "Adresár dát (%s) je prístupný na čítanie ostatným používateľom",
+    "Data directory (%s) is invalid" : "Adresár dát (%s) je neplatný",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Prosím, skontrolujte, či adresár dát obsahuje súbor „.ocdata“.",
+    "Could not obtain lock type %d on \"%s\"." : "Nepodarilo sa získať zámok typu %d na „%s“."
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
deleted file mode 100644
index 6015885a39a..00000000000
--- a/lib/l10n/sk_SK.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Nie je možné zapisovat do priečinka \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "To je zvyčajne možné opraviť tým, že udelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou.",
-"See %s" => "Pozri %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "To je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis k adresáru s konfiguráciou%s.",
-"Sample configuration detected" => "Detekovaná bola vzorová konfigurácia",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Zistilo sa, že konfigurácia bola skopírovaná zo vzorových súborov. Takáto konfigurácia nie je podporovaná a môže poškodiť vašu inštaláciu. Prečítajte si dokumentáciu pred vykonaním zmien v config.php",
-"Help" => "Pomoc",
-"Personal" => "Osobné",
-"Settings" => "Nastavenia",
-"Users" => "Používatelia",
-"Admin" => "Administrátor",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie je kompatibilná s touto verziou systému ownCloud.",
-"No app name specified" => "Nešpecifikované meno aplikácie",
-"Unknown filetype" => "Neznámy typ súboru",
-"Invalid image" => "Chybný obrázok",
-"web services under your control" => "webové služby pod Vašou kontrolou",
-"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",
-"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",
-"Archives of type %s are not supported" => "Tento typ archívu %s nie je podporovaný",
-"Failed to open archive when installing app" => "Zlyhanie pri otváraní archívu počas inštalácie aplikácie",
-"App does not provide an info.xml file" => "Aplikácia neposkytuje súbor info.xml",
-"App can't be installed because of not allowed code in the App" => "Aplikácia nemôže byť nainštalovaná pre nepovolený kód v aplikácii",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Aplikácia nemôže byť nainštalovaná pre nekompatibilitu z touto verziou ownCloudu",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Aplikácia nemôže byť nainštalovaná pretože obsahuje <shipped>pravý</shipped> štítok, ktorý nie je povolený pre zaslané \"shipped\" aplikácie",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Aplikácia nemôže byť nainštalovaná pretože verzia v info.xml/version nezodpovedá verzii špecifikovanej v obchode s aplikáciami",
-"Application is not enabled" => "Aplikácia nie je zapnutá",
-"Authentication error" => "Chyba autentifikácie",
-"Token expired. Please reload page." => "Token vypršal. Obnovte, prosím, stránku.",
-"Unknown user" => "Neznámy používateľ",
-"%s enter the database username." => "Zadajte používateľské meno %s databázy.",
-"%s enter the database name." => "Zadajte názov databázy pre %s databázy.",
-"%s you may not use dots in the database name" => "V názve databázy %s nemôžete používať bodky",
-"MS SQL username and/or password not valid: %s" => "Používateľské meno, alebo heslo MS SQL nie je platné: %s",
-"You need to enter either an existing account or the administrator." => "Musíte zadať jestvujúci účet alebo administrátora.",
-"MySQL/MariaDB username and/or password not valid" => "Používateľské meno a/alebo heslo pre MySQL/MariaDB databázu je neplatné",
-"DB Error: \"%s\"" => "Chyba DB: \"%s\"",
-"Offending command was: \"%s\"" => "Podozrivý príkaz bol: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "Používateľ '%s'@'localhost' už v MySQL/MariaDB existuje.",
-"Drop this user from MySQL/MariaDB" => "Zahodiť používateľa z MySQL/MariaDB.",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Používateľ '%s'@'%%' už v MySQL/MariaDB existuje",
-"Drop this user from MySQL/MariaDB." => "Zahodiť používateľa z MySQL/MariaDB.",
-"Oracle connection could not be established" => "Nie je možné pripojiť sa k Oracle",
-"Oracle username and/or password not valid" => "Používateľské meno a/alebo heslo pre Oracle databázu je neplatné",
-"Offending command was: \"%s\", name: %s, password: %s" => "Podozrivý príkaz bol: \"%s\", meno: %s, heslo: %s",
-"PostgreSQL username and/or password not valid" => "Používateľské meno a/alebo heslo pre PostgreSQL databázu je neplatné",
-"Set an admin username." => "Zadajte používateľské meno administrátora.",
-"Set an admin password." => "Zadajte heslo administrátora.",
-"%s shared »%s« with you" => "%s s vami zdieľa »%s«",
-"Sharing %s failed, because the file does not exist" => "Zdieľanie %s zlyhalo, pretože súbor neexistuje",
-"You are not allowed to share %s" => "Nemôžete zdieľať %s",
-"Sharing %s failed, because the user %s is the item owner" => "Zdieľanie %s zlyhalo, pretože používateľ %s je vlastníkom položky",
-"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 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é",
-"Sharing %s failed, because sharing with links is not allowed" => "Zdieľanie %s zlyhalo, pretože zdieľanie odkazom nie je povolené",
-"Share type %s is not valid for %s" => "Typ zdieľania %s nie je platný pre %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Nastavenie povolení pre %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s",
-"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.",
-"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ý",
-"Sharing %s failed, because the user %s is the original sharer" => "Zdieľanie %s zlyhalo, pretože používateľ %s je pôvodcom zdieľania",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Zdieľanie %s zlyhalo, pretože povolenia prekračujú povolenia udelené %s",
-"Sharing %s failed, because resharing is not allowed" => "Zdieľanie %s zlyhalo, pretože zdieľanie ďalším nie je povolené",
-"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\"",
-"seconds ago" => "pred sekundami",
-"_%n minute ago_::_%n minutes ago_" => array("pred %n minútou","pred %n minútami","pred %n minútami"),
-"_%n hour ago_::_%n hours ago_" => array("pred %n hodinou","pred %n hodinami","pred %n hodinami"),
-"today" => "dnes",
-"yesterday" => "včera",
-"_%n day go_::_%n days ago_" => array("pred %n dňom","pred %n dňami","pred %n dňami"),
-"last month" => "minulý mesiac",
-"_%n month ago_::_%n months ago_" => array("pred %n mesiacom","pred %n mesiacmi","pred %n mesiacmi"),
-"last year" => "minulý rok",
-"years ago" => "pred rokmi",
-"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, or postgresql) nie sú nainštalované.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Oprávnenia je zvyčajne možné opraviť tým, že %sudelíte webovému serveru oprávnenie na zápis do koreňového adresára%s.",
-"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 %sudelíte webovému serveru oprávnenie na zápis do adresára aplikácií%s alebo vypnete obchod s aplikáciami v konfiguračnom súbore.",
-"Cannot create \"data\" directory (%s)" => "Nie je možné vytvoriť priečinok \"data\" (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Toto je zvyčajne možné opraviť tým, že <a href=\"%s\" target=\"_blank\">udelíte webovému serveru oprávnenie na zápis do koreňového adresára</a>.",
-"Setting locale to %s failed" => "Nastavenie locale na %s zlyhalo",
-"Please install one of these locales on your system and restart your webserver." => "Prosím, nainštalujte si aspoň jeden z týchto jazykov so svojho systému a reštartujte webserver.",
-"Please ask your server administrator to install the module." => "Prosím, požiadajte administrátora vášho servera o inštaláciu modulu.",
-"PHP module %s not installed." => "PHP modul %s nie je nainštalovaný.",
-"PHP %s or higher is required." => "Požadovaná verzia PHP %s alebo vyššia.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Prosím, požiadajte administrátora vášho servera o aktualizáciu PHP na najnovšiu verziu. Vaša verzia PHP už nie je podporovaná ownCloud-om a PHP komunitou.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode je zapnutý. ownCloud pre správnu funkčnosť vyžaduje, aby bol vypnutý.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode je zastarané a väčšinou zbytočné nastavenie, ktoré by malo byť vypnuté. Prosím, požiadajte administrátora vášho serveru o jeho vypnutie v php.ini alebo v nastaveniach webového servera.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes sú povolené. ownCloud pre správnu funkčnosť vyžaduje, aby boli vypnuté.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes je zavrhovanou a zbytočnou voľbou, ktorú by ste mali ponechať vypnutú. Prosím, požiadajte správcu svojho servera, aby ju vypol v php.ini alebo v konfigurácii vášho webového servera.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP moduly boli nainštalované, ale stále sú uvedené ako chýbajúce?",
-"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.",
-"PostgreSQL >= 9 required" => "Vyžadované PostgreSQL >= 9",
-"Please upgrade your database version" => "Prosím, aktualizujte verziu svojej databázy",
-"Error occurred while checking PostgreSQL version" => "Nastala chyba pri overovaní verzie PostgreSQL",
-"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 adresár nemohli ostatní používatelia vypísať.",
-"Data directory (%s) is readable by other users" => "Adresár dát (%s) je prístupný na čítanie ostatným používateľom",
-"Data directory (%s) is invalid" => "Adresár dát (%s) je neplatný",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Prosím, skontrolujte, či adresár dát obsahuje súbor „.ocdata“.",
-"Could not obtain lock type %d on \"%s\"." => "Nepodarilo sa získať zámok typu %d na „%s“."
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
new file mode 100644
index 00000000000..dba09956e44
--- /dev/null
+++ b/lib/l10n/sl.js
@@ -0,0 +1,103 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Mapa 'config' nima določenih ustreznih dovoljenj za pisanje!",
+    "See %s" : "Oglejte si %s",
+    "Sample configuration detected" : "Zaznana je neustrezna preizkusna nastavitev",
+    "Help" : "Pomoč",
+    "Personal" : "Osebno",
+    "Settings" : "Nastavitve",
+    "Users" : "Uporabniki",
+    "Admin" : "Skrbništvo",
+    "No app name specified" : "Ni podanega imena programa",
+    "Unknown filetype" : "Neznana vrsta datoteke",
+    "Invalid image" : "Neveljavna slika",
+    "web services under your control" : "spletne storitve pod vašim nadzorom",
+    "App directory already exists" : "Programska mapa že obstaja",
+    "Can't create app folder. Please fix permissions. %s" : "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s",
+    "No source specified when installing app" : "Ni podanega vira med nameščenjem programa",
+    "No href specified when installing app from http" : "Ni podanega podatka naslova HREF med nameščenjem programa preko protokola HTTP.",
+    "No path specified when installing app from local file" : "Ni podane poti med nameščenjem programa iz krajevne datoteke",
+    "Archives of type %s are not supported" : "Arhivi vrste %s niso podprti",
+    "Failed to open archive when installing app" : "Odpiranje arhiva je med nameščanjem spodletelo",
+    "App does not provide an info.xml file" : "Program je brez datoteke info.xml",
+    "App can't be installed because of not allowed code in the App" : "Programa ni mogoče namestiti zaradi nedovoljene programske kode.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Programa ni mogoče namestiti, ker ni skladen z trenutno nameščeno različico oblaka ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa ni mogoče namestiti, ker vsebuje oznako <shipped>potrditve</shipped>, ki pa ni dovoljena za javne programe.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Program ni mogoče namestiti zaradi neustrezne različice datoteke info.xml. Ta ni enaka različici programa.",
+    "Application is not enabled" : "Program ni omogočen",
+    "Authentication error" : "Napaka overjanja",
+    "Token expired. Please reload page." : "Žeton je potekel. Stran je treba ponovno naložiti.",
+    "Unknown user" : "Neznan uporabnik",
+    "%s enter the database username." : "%s - vnos uporabniškega imena podatkovne zbirke.",
+    "%s enter the database name." : "%s - vnos imena podatkovne zbirke.",
+    "%s you may not use dots in the database name" : "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik.",
+    "MS SQL username and/or password not valid: %s" : "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
+    "You need to enter either an existing account or the administrator." : "Prijaviti se je treba v obstoječi ali pa skrbniški račun.",
+    "MySQL/MariaDB username and/or password not valid" : "Uporabniško ime ali geslo za MySQL/MariaDB ni veljavno",
+    "DB Error: \"%s\"" : "Napaka podatkovne zbirke: \"%s\"",
+    "Offending command was: \"%s\"" : "Napačni ukaz je: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'localhost' že obstaja.",
+    "Drop this user from MySQL/MariaDB" : "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'%%' že obstaja.",
+    "Drop this user from MySQL/MariaDB." : "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Povezave s sistemom Oracle ni mogoče vzpostaviti.",
+    "Oracle username and/or password not valid" : "Uporabniško ime ali geslo Oracle ni veljavno",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Napačni ukaz je: \"%s\", ime: %s, geslo: %s",
+    "PostgreSQL username and/or password not valid" : "Uporabniško ime ali geslo PostgreSQL ni veljavno",
+    "Set an admin username." : "Nastavi uporabniško ime skrbnika.",
+    "Set an admin password." : "Nastavi geslo skrbnika.",
+    "%s shared »%s« with you" : "%s je omogočil souporabo »%s«",
+    "Sharing %s failed, because the file does not exist" : "Souporaba %s je spodletela, ker ta datoteka ne obstaja",
+    "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
+    "Sharing %s failed, because the user %s is the item owner" : "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s lastnik predmeta.",
+    "Sharing %s failed, because the user %s does not exist" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ne obstaja.",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član nobene skupine, v kateri je tudi uporabnik %s.",
+    "Sharing %s failed, because this item is already shared with %s" : "Nastavljanje souporabe %s je spodletela, ker je ima uporabnik %s predmet že v souporabi.",
+    "Sharing %s failed, because the group %s does not exist" : "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja.",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena.",
+    "Share type %s is not valid for %s" : "Vrsta souporabe %s za %s ni veljavna.",
+    "Cannot set expiration date. Expiration date is in the past" : "Ni mogoče nastaviti datuma preteka. Ta datum je že preteklost.",
+    "Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti",
+    "Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti",
+    "Sharing %s failed, because the user %s is the original sharer" : "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s omogočil souporabo predmeta.",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Nastavljanje souporabe %s je spodletelo, ker zahteve presegajo dodeljena dovoljenja za %s.",
+    "Sharing %s failed, because resharing is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker nadaljnje omogočanje souporabe ni dovoljeno.",
+    "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.",
+    "seconds ago" : "pred nekaj sekundami",
+    "_%n minute ago_::_%n minutes ago_" : ["pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"],
+    "_%n hour ago_::_%n hours ago_" : ["pred %n uro","pred %n urama","pred %n urami","pred %n urami"],
+    "today" : "danes",
+    "yesterday" : "včeraj",
+    "_%n day go_::_%n days ago_" : ["pred %n dnevom","pred %n dnevoma","pred %n dnevi","pred %n dnevi"],
+    "last month" : "zadnji mesec",
+    "_%n month ago_::_%n months ago_" : ["pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"],
+    "last year" : "lansko leto",
+    "years ago" : "let nazaj",
+    "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",
+    "The username is already being used" : "Vpisano uporabniško ime je že v uporabi",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).",
+    "Cannot write into \"config\" directory" : "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!",
+    "Cannot write into \"apps\" directory" : "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!",
+    "Setting locale to %s failed" : "Nastavljanje jezikovnih določil na %s je spodletelo.",
+    "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
+    "PHP module %s not installed." : "Modul PHP %s ni nameščen.",
+    "PHP %s or higher is required." : "Zahtevana je različica PHP %s ali višja.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Obvestite skrbnika strežnika, da je treba posodobiti okolje PHP na najnovejšo različico. Trenutno nameščene različice skupnost PHP in ownCloud ne podpira več.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
+    "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
+    "PostgreSQL >= 9 required" : "Zahtevana je različica PostgreSQL >= 9.",
+    "Please upgrade your database version" : "Posodobite različico podatkovne zbirke.",
+    "Error occurred while checking PostgreSQL version" : "Prišlo je do napake med preverjanjem različice PostgreSQL.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Spremenite dovoljenja mape na 0770 in s tem onemogočite branje vsebine drugim uporabnikom.",
+    "Data directory (%s) is readable by other users" : "Podatkovna mapa (%s) ima določena dovoljenja za branje skupine.",
+    "Data directory (%s) is invalid" : "Podatkovna mapa (%s) ni veljavna.",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Preverite, ali je v korenu podatkovne mape datoteka \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Ni mogoče pridobiti zaklepa %d na \"%s\"."
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
new file mode 100644
index 00000000000..ac86bd82766
--- /dev/null
+++ b/lib/l10n/sl.json
@@ -0,0 +1,101 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Mapa 'config' nima določenih ustreznih dovoljenj za pisanje!",
+    "See %s" : "Oglejte si %s",
+    "Sample configuration detected" : "Zaznana je neustrezna preizkusna nastavitev",
+    "Help" : "Pomoč",
+    "Personal" : "Osebno",
+    "Settings" : "Nastavitve",
+    "Users" : "Uporabniki",
+    "Admin" : "Skrbništvo",
+    "No app name specified" : "Ni podanega imena programa",
+    "Unknown filetype" : "Neznana vrsta datoteke",
+    "Invalid image" : "Neveljavna slika",
+    "web services under your control" : "spletne storitve pod vašim nadzorom",
+    "App directory already exists" : "Programska mapa že obstaja",
+    "Can't create app folder. Please fix permissions. %s" : "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s",
+    "No source specified when installing app" : "Ni podanega vira med nameščenjem programa",
+    "No href specified when installing app from http" : "Ni podanega podatka naslova HREF med nameščenjem programa preko protokola HTTP.",
+    "No path specified when installing app from local file" : "Ni podane poti med nameščenjem programa iz krajevne datoteke",
+    "Archives of type %s are not supported" : "Arhivi vrste %s niso podprti",
+    "Failed to open archive when installing app" : "Odpiranje arhiva je med nameščanjem spodletelo",
+    "App does not provide an info.xml file" : "Program je brez datoteke info.xml",
+    "App can't be installed because of not allowed code in the App" : "Programa ni mogoče namestiti zaradi nedovoljene programske kode.",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Programa ni mogoče namestiti, ker ni skladen z trenutno nameščeno različico oblaka ownCloud.",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Programa ni mogoče namestiti, ker vsebuje oznako <shipped>potrditve</shipped>, ki pa ni dovoljena za javne programe.",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Program ni mogoče namestiti zaradi neustrezne različice datoteke info.xml. Ta ni enaka različici programa.",
+    "Application is not enabled" : "Program ni omogočen",
+    "Authentication error" : "Napaka overjanja",
+    "Token expired. Please reload page." : "Žeton je potekel. Stran je treba ponovno naložiti.",
+    "Unknown user" : "Neznan uporabnik",
+    "%s enter the database username." : "%s - vnos uporabniškega imena podatkovne zbirke.",
+    "%s enter the database name." : "%s - vnos imena podatkovne zbirke.",
+    "%s you may not use dots in the database name" : "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik.",
+    "MS SQL username and/or password not valid: %s" : "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
+    "You need to enter either an existing account or the administrator." : "Prijaviti se je treba v obstoječi ali pa skrbniški račun.",
+    "MySQL/MariaDB username and/or password not valid" : "Uporabniško ime ali geslo za MySQL/MariaDB ni veljavno",
+    "DB Error: \"%s\"" : "Napaka podatkovne zbirke: \"%s\"",
+    "Offending command was: \"%s\"" : "Napačni ukaz je: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'localhost' že obstaja.",
+    "Drop this user from MySQL/MariaDB" : "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'%%' že obstaja.",
+    "Drop this user from MySQL/MariaDB." : "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Povezave s sistemom Oracle ni mogoče vzpostaviti.",
+    "Oracle username and/or password not valid" : "Uporabniško ime ali geslo Oracle ni veljavno",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Napačni ukaz je: \"%s\", ime: %s, geslo: %s",
+    "PostgreSQL username and/or password not valid" : "Uporabniško ime ali geslo PostgreSQL ni veljavno",
+    "Set an admin username." : "Nastavi uporabniško ime skrbnika.",
+    "Set an admin password." : "Nastavi geslo skrbnika.",
+    "%s shared »%s« with you" : "%s je omogočil souporabo »%s«",
+    "Sharing %s failed, because the file does not exist" : "Souporaba %s je spodletela, ker ta datoteka ne obstaja",
+    "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
+    "Sharing %s failed, because the user %s is the item owner" : "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s lastnik predmeta.",
+    "Sharing %s failed, because the user %s does not exist" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ne obstaja.",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član nobene skupine, v kateri je tudi uporabnik %s.",
+    "Sharing %s failed, because this item is already shared with %s" : "Nastavljanje souporabe %s je spodletela, ker je ima uporabnik %s predmet že v souporabi.",
+    "Sharing %s failed, because the group %s does not exist" : "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja.",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s.",
+    "Sharing %s failed, because sharing with links is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena.",
+    "Share type %s is not valid for %s" : "Vrsta souporabe %s za %s ni veljavna.",
+    "Cannot set expiration date. Expiration date is in the past" : "Ni mogoče nastaviti datuma preteka. Ta datum je že preteklost.",
+    "Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti",
+    "Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti",
+    "Sharing %s failed, because the user %s is the original sharer" : "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s omogočil souporabo predmeta.",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Nastavljanje souporabe %s je spodletelo, ker zahteve presegajo dodeljena dovoljenja za %s.",
+    "Sharing %s failed, because resharing is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker nadaljnje omogočanje souporabe ni dovoljeno.",
+    "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.",
+    "seconds ago" : "pred nekaj sekundami",
+    "_%n minute ago_::_%n minutes ago_" : ["pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"],
+    "_%n hour ago_::_%n hours ago_" : ["pred %n uro","pred %n urama","pred %n urami","pred %n urami"],
+    "today" : "danes",
+    "yesterday" : "včeraj",
+    "_%n day go_::_%n days ago_" : ["pred %n dnevom","pred %n dnevoma","pred %n dnevi","pred %n dnevi"],
+    "last month" : "zadnji mesec",
+    "_%n month ago_::_%n months ago_" : ["pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"],
+    "last year" : "lansko leto",
+    "years ago" : "let nazaj",
+    "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",
+    "The username is already being used" : "Vpisano uporabniško ime je že v uporabi",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).",
+    "Cannot write into \"config\" directory" : "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!",
+    "Cannot write into \"apps\" directory" : "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!",
+    "Setting locale to %s failed" : "Nastavljanje jezikovnih določil na %s je spodletelo.",
+    "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
+    "PHP module %s not installed." : "Modul PHP %s ni nameščen.",
+    "PHP %s or higher is required." : "Zahtevana je različica PHP %s ali višja.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Obvestite skrbnika strežnika, da je treba posodobiti okolje PHP na najnovejšo različico. Trenutno nameščene različice skupnost PHP in ownCloud ne podpira več.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
+    "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
+    "PostgreSQL >= 9 required" : "Zahtevana je različica PostgreSQL >= 9.",
+    "Please upgrade your database version" : "Posodobite različico podatkovne zbirke.",
+    "Error occurred while checking PostgreSQL version" : "Prišlo je do napake med preverjanjem različice PostgreSQL.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Spremenite dovoljenja mape na 0770 in s tem onemogočite branje vsebine drugim uporabnikom.",
+    "Data directory (%s) is readable by other users" : "Podatkovna mapa (%s) ima določena dovoljenja za branje skupine.",
+    "Data directory (%s) is invalid" : "Podatkovna mapa (%s) ni veljavna.",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Preverite, ali je v korenu podatkovne mape datoteka \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Ni mogoče pridobiti zaklepa %d na \"%s\"."
+},"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/lib/l10n/sl.php b/lib/l10n/sl.php
deleted file mode 100644
index c004483c0eb..00000000000
--- a/lib/l10n/sl.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Mapa 'config' nima določenih ustreznih dovoljenj za pisanje!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo.",
-"See %s" => "Oglejte si %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Napako je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo%s.",
-"Sample configuration detected" => "Zaznana je neustrezna preizkusna nastavitev",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Zaznano je, da je bila v sistem kopirana datoteka z enostavno nastavitvijo. To lahko vpliva na namestitev in zato možnost ni podprta. Pred spremembami datoteke config.php si natančno preberite dokumentacijo.",
-"Help" => "Pomoč",
-"Personal" => "Osebno",
-"Settings" => "Nastavitve",
-"Users" => "Uporabniki",
-"Admin" => "Skrbništvo",
-"Recommended" => "Priporočljivo",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Programnika \\\"%s\\\" ni mogoče namestiti, ker različica programa ni skladna z različico okolja ownCloud.",
-"No app name specified" => "Ni podanega imena programa",
-"Unknown filetype" => "Neznana vrsta datoteke",
-"Invalid image" => "Neveljavna slika",
-"web services under your control" => "spletne storitve pod vašim nadzorom",
-"App directory already exists" => "Programska mapa že obstaja",
-"Can't create app folder. Please fix permissions. %s" => "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s",
-"No source specified when installing app" => "Ni podanega vira med nameščenjem programa",
-"No href specified when installing app from http" => "Ni podanega podatka naslova HREF med nameščenjem programa preko protokola HTTP.",
-"No path specified when installing app from local file" => "Ni podane poti med nameščenjem programa iz krajevne datoteke",
-"Archives of type %s are not supported" => "Arhivi vrste %s niso podprti",
-"Failed to open archive when installing app" => "Odpiranje arhiva je med nameščanjem spodletelo",
-"App does not provide an info.xml file" => "Program je brez datoteke info.xml",
-"App can't be installed because of not allowed code in the App" => "Programa ni mogoče namestiti zaradi nedovoljene programske kode.",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Programa ni mogoče namestiti, ker ni skladen z trenutno nameščeno različico oblaka ownCloud.",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Programa ni mogoče namestiti, ker vsebuje oznako <shipped>potrditve</shipped>, ki pa ni dovoljena za javne programe.",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Program ni mogoče namestiti zaradi neustrezne različice datoteke info.xml. Ta ni enaka različici programa.",
-"Application is not enabled" => "Program ni omogočen",
-"Authentication error" => "Napaka overjanja",
-"Token expired. Please reload page." => "Žeton je potekel. Stran je treba ponovno naložiti.",
-"Unknown user" => "Neznan uporabnik",
-"%s enter the database username." => "%s - vnos uporabniškega imena podatkovne zbirke.",
-"%s enter the database name." => "%s - vnos imena podatkovne zbirke.",
-"%s you may not use dots in the database name" => "%s - v imenu podatkovne zbirke ni dovoljeno uporabljati pik.",
-"MS SQL username and/or password not valid: %s" => "Uporabniško ime ali geslo MS SQL ni veljavno: %s",
-"You need to enter either an existing account or the administrator." => "Prijaviti se je treba v obstoječi ali pa skrbniški račun.",
-"MySQL/MariaDB username and/or password not valid" => "Uporabniško ime ali geslo za MySQL/MariaDB ni veljavno",
-"DB Error: \"%s\"" => "Napaka podatkovne zbirke: \"%s\"",
-"Offending command was: \"%s\"" => "Napačni ukaz je: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'localhost' že obstaja.",
-"Drop this user from MySQL/MariaDB" => "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Uporabnik podatkovne zbirke MySQL/MariaDB '%s'@'%%' že obstaja.",
-"Drop this user from MySQL/MariaDB." => "Odstrani uporabnika iz podatkovne zbirke MySQL/MariaDB.",
-"Oracle connection could not be established" => "Povezave s sistemom Oracle ni mogoče vzpostaviti.",
-"Oracle username and/or password not valid" => "Uporabniško ime ali geslo Oracle ni veljavno",
-"Offending command was: \"%s\", name: %s, password: %s" => "Napačni ukaz je: \"%s\", ime: %s, geslo: %s",
-"PostgreSQL username and/or password not valid" => "Uporabniško ime ali geslo PostgreSQL ni veljavno",
-"Set an admin username." => "Nastavi uporabniško ime skrbnika.",
-"Set an admin password." => "Nastavi geslo skrbnika.",
-"Can't create or write into the data directory %s" => "Ni mogoče zapisati podatkov v podatkovno mapo %s",
-"%s shared »%s« with you" => "%s je omogočil souporabo »%s«",
-"Sharing %s failed, because the file does not exist" => "Souporaba %s je spodletela, ker ta datoteka ne obstaja",
-"You are not allowed to share %s" => "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
-"Sharing %s failed, because the user %s is the item owner" => "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s lastnik predmeta.",
-"Sharing %s failed, because the user %s does not exist" => "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ne obstaja.",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član nobene skupine, v kateri je tudi uporabnik %s.",
-"Sharing %s failed, because this item is already shared with %s" => "Nastavljanje souporabe %s je spodletela, ker je ima uporabnik %s predmet že v souporabi.",
-"Sharing %s failed, because the group %s does not exist" => "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja.",
-"Sharing %s failed, because %s is not a member of the group %s" => "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s.",
-"You need to provide a password to create a public link, only protected links are allowed" => "Navesti je treba geslo za ustvarjanje javne povezave, saj so dovoljene le zaščitene.",
-"Sharing %s failed, because sharing with links is not allowed" => "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena.",
-"Share type %s is not valid for %s" => "Vrsta souporabe %s za %s ni veljavna.",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Nastavljanje dovoljenj za %s je spodletelo, saj ta presegajo dovoljenja dodeljena uporabniku %s.",
-"Setting permissions for %s failed, because the item was not found" => "Nastavljanje dovoljenj za %s je spodletelo, ker predmeta ni mogoče najti.",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Ni mogoče določiti datuma preteka. Ni dovoljeno, da so mape ali datoteke, dodeljene v souporabo, v souporabi po %s.",
-"Cannot set expiration date. Expiration date is in the past" => "Ni mogoče nastaviti datuma preteka. Ta datum je že preteklost.",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend",
-"Sharing backend %s not found" => "Ozadnjega programa %s za souporabo ni mogoče najti",
-"Sharing backend for %s not found" => "Ozadnjega programa za souporabo za %s ni mogoče najti",
-"Sharing %s failed, because the user %s is the original sharer" => "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s omogočil souporabo predmeta.",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Nastavljanje souporabe %s je spodletelo, ker zahteve presegajo dodeljena dovoljenja za %s.",
-"Sharing %s failed, because resharing is not allowed" => "Nastavljanje souporabe %s je spodletelo, ker nadaljnje omogočanje souporabe ni dovoljeno.",
-"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.",
-"seconds ago" => "pred nekaj sekundami",
-"_%n minute ago_::_%n minutes ago_" => array("pred %n minuto","pred %n minutama","pred %n minutami","pred %n minutami"),
-"_%n hour ago_::_%n hours ago_" => array("pred %n uro","pred %n urama","pred %n urami","pred %n urami"),
-"today" => "danes",
-"yesterday" => "včeraj",
-"_%n day go_::_%n days ago_" => array("pred %n dnevom","pred %n dnevoma","pred %n dnevi","pred %n dnevi"),
-"last month" => "zadnji mesec",
-"_%n month ago_::_%n months ago_" => array("pred %n mesecem","pred %n mesecema","pred %n meseci","pred %n meseci"),
-"last year" => "lansko leto",
-"years ago" => "let nazaj",
-"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",
-"The username is already being used" => "Vpisano uporabniško ime je že v uporabi",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "Dovoljenja je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje korensko mapo%s.",
-"Cannot write into \"config\" directory" => "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!",
-"Cannot write into \"apps\" directory" => "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku %s za pisanje v mapo programov %s, ali pa z onemogočanjem nameščanja programov v nastavitveni datoteki.",
-"Cannot create \"data\" directory (%s)" => "Ni mogoče ustvariti\"podatkovne\" mape (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Napako je mogoče odpraviti z  <a href=\"%s\" target=\"_blank\">dodelitvijo dovoljenja spletnemu strežniku za pisanje v korensko mapo</a>.",
-"Setting locale to %s failed" => "Nastavljanje jezikovnih določil na %s je spodletelo.",
-"Please install one of these locales on your system and restart your webserver." => "Namestiti je treba podporo za vsaj eno od navedenih jezikovnih določil v sistemu in nato ponovno zagnati spletni strežnik.",
-"Please ask your server administrator to install the module." => "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
-"PHP module %s not installed." => "Modul PHP %s ni nameščen.",
-"PHP %s or higher is required." => "Zahtevana je različica PHP %s ali višja.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Obvestite skrbnika strežnika, da je treba posodobiti okolje PHP na najnovejšo različico. Trenutno nameščene različice skupnost PHP in ownCloud ne podpira več.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "Omogočen je varni način PHP. Za pravilno delovanje system ownCloud je treba možnost onemogočiti.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Možnost varnega načina PHP je opuščena in jo je priporočljivo onemogočiti. Stopite v stik s skrbnikom sistema oziroma onemogočite možnost v datoteki php.ini ali med nastavitvami spletnega strežnika.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Omogočena je možnost Magic Quotes. Za pravilno delovanje sistema ownCloud je treba možnost onemogočiti.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Možnost Magic Quotes je opuščena in jo je priporočljivo onemogočiti. Stopite v stik s skrbnikom sistema oziroma onemogočite možnost v datoteki php.ini ali med nastavitvami spletnega strežnika.",
-"PHP modules have been installed, but they are still listed as missing?" => "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
-"Please ask your server administrator to restart the web server." => "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
-"PostgreSQL >= 9 required" => "Zahtevana je različica PostgreSQL >= 9.",
-"Please upgrade your database version" => "Posodobite različico podatkovne zbirke.",
-"Error occurred while checking PostgreSQL version" => "Prišlo je do napake med preverjanjem različice PostgreSQL.",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Prepričajte se, da je nameščena različica PostgreSQL >= 9 in preverite dnevniški zapis za več podrobnosti o napaki.",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Spremenite dovoljenja mape na 0770 in s tem onemogočite branje vsebine drugim uporabnikom.",
-"Data directory (%s) is readable by other users" => "Podatkovna mapa (%s) ima določena dovoljenja za branje skupine.",
-"Data directory (%s) is invalid" => "Podatkovna mapa (%s) ni veljavna.",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Preverite, ali je v korenu podatkovne mape datoteka \".ocdata\".",
-"Could not obtain lock type %d on \"%s\"." => "Ni mogoče pridobiti zaklepa %d na \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js
new file mode 100644
index 00000000000..6328972ac8a
--- /dev/null
+++ b/lib/l10n/sq.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Ndihmë",
+    "Personal" : "Personale",
+    "Settings" : "Parametra",
+    "Users" : "Përdoruesit",
+    "Admin" : "Admin",
+    "web services under your control" : "shërbime web nën kontrollin tënd",
+    "Application is not enabled" : "Programi nuk është i aktivizuar.",
+    "Authentication error" : "Veprim i gabuar gjatë vërtetimit të identitetit",
+    "Token expired. Please reload page." : "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen.",
+    "%s enter the database username." : "% shkruani përdoruesin e database-it.",
+    "%s enter the database name." : "%s shkruani emrin e database-it.",
+    "%s you may not use dots in the database name" : "%s nuk mund të përdorni pikat tek emri i database-it",
+    "MS SQL username and/or password not valid: %s" : "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
+    "You need to enter either an existing account or the administrator." : "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit.",
+    "DB Error: \"%s\"" : "Veprim i gabuar i DB-it: \"%s\"",
+    "Offending command was: \"%s\"" : "Komanda e gabuar ishte: \"%s\"",
+    "Oracle username and/or password not valid" : "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s",
+    "PostgreSQL username and/or password not valid" : "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
+    "Set an admin username." : "Cakto emrin e administratorit.",
+    "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",
+    "seconds ago" : "sekonda më parë",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minuta më parë"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n orë më parë"],
+    "today" : "sot",
+    "yesterday" : "dje",
+    "_%n day go_::_%n days ago_" : ["","%n ditë më parë"],
+    "last month" : "muajin e shkuar",
+    "_%n month ago_::_%n months ago_" : ["","%n muaj më parë"],
+    "last year" : "vitin e shkuar",
+    "years ago" : "vite më parë",
+    "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"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json
new file mode 100644
index 00000000000..7df63e8ff84
--- /dev/null
+++ b/lib/l10n/sq.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Help" : "Ndihmë",
+    "Personal" : "Personale",
+    "Settings" : "Parametra",
+    "Users" : "Përdoruesit",
+    "Admin" : "Admin",
+    "web services under your control" : "shërbime web nën kontrollin tënd",
+    "Application is not enabled" : "Programi nuk është i aktivizuar.",
+    "Authentication error" : "Veprim i gabuar gjatë vërtetimit të identitetit",
+    "Token expired. Please reload page." : "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen.",
+    "%s enter the database username." : "% shkruani përdoruesin e database-it.",
+    "%s enter the database name." : "%s shkruani emrin e database-it.",
+    "%s you may not use dots in the database name" : "%s nuk mund të përdorni pikat tek emri i database-it",
+    "MS SQL username and/or password not valid: %s" : "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
+    "You need to enter either an existing account or the administrator." : "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit.",
+    "DB Error: \"%s\"" : "Veprim i gabuar i DB-it: \"%s\"",
+    "Offending command was: \"%s\"" : "Komanda e gabuar ishte: \"%s\"",
+    "Oracle username and/or password not valid" : "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s",
+    "PostgreSQL username and/or password not valid" : "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
+    "Set an admin username." : "Cakto emrin e administratorit.",
+    "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",
+    "seconds ago" : "sekonda më parë",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n minuta më parë"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n orë më parë"],
+    "today" : "sot",
+    "yesterday" : "dje",
+    "_%n day go_::_%n days ago_" : ["","%n ditë më parë"],
+    "last month" : "muajin e shkuar",
+    "_%n month ago_::_%n months ago_" : ["","%n muaj më parë"],
+    "last year" : "vitin e shkuar",
+    "years ago" : "vite më parë",
+    "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);"
+}
\ No newline at end of file
diff --git a/lib/l10n/sq.php b/lib/l10n/sq.php
deleted file mode 100644
index d68dbd2804b..00000000000
--- a/lib/l10n/sq.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Ndihmë",
-"Personal" => "Personale",
-"Settings" => "Parametra",
-"Users" => "Përdoruesit",
-"Admin" => "Admin",
-"web services under your control" => "shërbime web nën kontrollin tënd",
-"Application is not enabled" => "Programi nuk është i aktivizuar.",
-"Authentication error" => "Veprim i gabuar gjatë vërtetimit të identitetit",
-"Token expired. Please reload page." => "Përmbajtja ka skaduar. Ju lutemi ringarkoni faqen.",
-"%s enter the database username." => "% shkruani përdoruesin e database-it.",
-"%s enter the database name." => "%s shkruani emrin e database-it.",
-"%s you may not use dots in the database name" => "%s nuk mund të përdorni pikat tek emri i database-it",
-"MS SQL username and/or password not valid: %s" => "Përdoruesi dhe/apo kodi i MS SQL i pavlefshëm: %s",
-"You need to enter either an existing account or the administrator." => "Duhet të përdorni një llogari ekzistuese ose llogarinë e administratorit.",
-"DB Error: \"%s\"" => "Veprim i gabuar i DB-it: \"%s\"",
-"Offending command was: \"%s\"" => "Komanda e gabuar ishte: \"%s\"",
-"Oracle username and/or password not valid" => "Përdoruesi dhe/apo kodi i Oracle-it i pavlefshëm",
-"Offending command was: \"%s\", name: %s, password: %s" => "Komanda e gabuar ishte: \"%s\", përdoruesi: %s, kodi: %s",
-"PostgreSQL username and/or password not valid" => "Përdoruesi dhe/apo kodi i PostgreSQL i pavlefshëm",
-"Set an admin username." => "Cakto emrin e administratorit.",
-"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",
-"seconds ago" => "sekonda më parë",
-"_%n minute ago_::_%n minutes ago_" => array("","%n minuta më parë"),
-"_%n hour ago_::_%n hours ago_" => array("","%n orë më parë"),
-"today" => "sot",
-"yesterday" => "dje",
-"_%n day go_::_%n days ago_" => array("","%n ditë më parë"),
-"last month" => "muajin e shkuar",
-"_%n month ago_::_%n months ago_" => array("","%n muaj më parë"),
-"last year" => "vitin e shkuar",
-"years ago" => "vite më parë",
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sr.js b/lib/l10n/sr.js
new file mode 100644
index 00000000000..94cb2dfce47
--- /dev/null
+++ b/lib/l10n/sr.js
@@ -0,0 +1,27 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Помоћ",
+    "Personal" : "Лично",
+    "Settings" : "Поставке",
+    "Users" : "Корисници",
+    "Admin" : "Администратор",
+    "web services under your control" : "веб сервиси под контролом",
+    "Application is not enabled" : "Апликација није омогућена",
+    "Authentication error" : "Грешка при провери идентитета",
+    "Token expired. Please reload page." : "Жетон је истекао. Поново учитајте страницу.",
+    "Could not find category \"%s\"" : "Не могу да пронађем категорију „%s“.",
+    "seconds ago" : "пре неколико секунди",
+    "_%n minute ago_::_%n minutes ago_" : ["","",""],
+    "_%n hour ago_::_%n hours ago_" : ["","",""],
+    "today" : "данас",
+    "yesterday" : "јуче",
+    "_%n day go_::_%n days ago_" : ["","",""],
+    "last month" : "прошлог месеца",
+    "_%n month ago_::_%n months ago_" : ["","",""],
+    "last year" : "прошле године",
+    "years ago" : "година раније",
+    "A valid username must be provided" : "Морате унети исправно корисничко име",
+    "A valid password must be provided" : "Морате унети исправну лозинку"
+},
+"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.json b/lib/l10n/sr.json
new file mode 100644
index 00000000000..6fd8fa308a6
--- /dev/null
+++ b/lib/l10n/sr.json
@@ -0,0 +1,25 @@
+{ "translations": {
+    "Help" : "Помоћ",
+    "Personal" : "Лично",
+    "Settings" : "Поставке",
+    "Users" : "Корисници",
+    "Admin" : "Администратор",
+    "web services under your control" : "веб сервиси под контролом",
+    "Application is not enabled" : "Апликација није омогућена",
+    "Authentication error" : "Грешка при провери идентитета",
+    "Token expired. Please reload page." : "Жетон је истекао. Поново учитајте страницу.",
+    "Could not find category \"%s\"" : "Не могу да пронађем категорију „%s“.",
+    "seconds ago" : "пре неколико секунди",
+    "_%n minute ago_::_%n minutes ago_" : ["","",""],
+    "_%n hour ago_::_%n hours ago_" : ["","",""],
+    "today" : "данас",
+    "yesterday" : "јуче",
+    "_%n day go_::_%n days ago_" : ["","",""],
+    "last month" : "прошлог месеца",
+    "_%n month ago_::_%n months ago_" : ["","",""],
+    "last year" : "прошле године",
+    "years ago" : "година раније",
+    "A valid username must be provided" : "Морате унети исправно корисничко име",
+    "A valid password must be provided" : "Морате унети исправну лозинку"
+},"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/sr.php b/lib/l10n/sr.php
deleted file mode 100644
index f072542c9fe..00000000000
--- a/lib/l10n/sr.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Помоћ",
-"Personal" => "Лично",
-"Settings" => "Поставке",
-"Users" => "Корисници",
-"Admin" => "Администратор",
-"web services under your control" => "веб сервиси под контролом",
-"Application is not enabled" => "Апликација није омогућена",
-"Authentication error" => "Грешка при провери идентитета",
-"Token expired. Please reload page." => "Жетон је истекао. Поново учитајте страницу.",
-"Could not find category \"%s\"" => "Не могу да пронађем категорију „%s“.",
-"seconds ago" => "пре неколико секунди",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
-"today" => "данас",
-"yesterday" => "јуче",
-"_%n day go_::_%n days ago_" => array("","",""),
-"last month" => "прошлог месеца",
-"_%n month ago_::_%n months ago_" => array("","",""),
-"last year" => "прошле године",
-"years ago" => "година раније",
-"A valid username must be provided" => "Морате унети исправно корисничко име",
-"A valid password must be provided" => "Морате унети исправну лозинку"
-);
-$PLURAL_FORMS = "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.js b/lib/l10n/sr@latin.js
new file mode 100644
index 00000000000..11a536224d1
--- /dev/null
+++ b/lib/l10n/sr@latin.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Pomoć",
+    "Personal" : "Lično",
+    "Settings" : "Podešavanja",
+    "Users" : "Korisnici",
+    "Admin" : "Adninistracija",
+    "Authentication error" : "Greška pri autentifikaciji",
+    "seconds ago" : "Pre par sekundi",
+    "_%n minute ago_::_%n minutes ago_" : ["","","pre %n minuta"],
+    "_%n hour ago_::_%n hours ago_" : ["","","pre %n sati"],
+    "today" : "Danas",
+    "yesterday" : "juče",
+    "_%n day go_::_%n days ago_" : ["","","Prije %n dana."],
+    "last month" : "prošlog meseca",
+    "_%n month ago_::_%n months ago_" : ["","",""],
+    "last year" : "prošle godine",
+    "years ago" : "pre nekoliko godina"
+},
+"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
new file mode 100644
index 00000000000..ce429467aee
--- /dev/null
+++ b/lib/l10n/sr@latin.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Help" : "Pomoć",
+    "Personal" : "Lično",
+    "Settings" : "Podešavanja",
+    "Users" : "Korisnici",
+    "Admin" : "Adninistracija",
+    "Authentication error" : "Greška pri autentifikaciji",
+    "seconds ago" : "Pre par sekundi",
+    "_%n minute ago_::_%n minutes ago_" : ["","","pre %n minuta"],
+    "_%n hour ago_::_%n hours ago_" : ["","","pre %n sati"],
+    "today" : "Danas",
+    "yesterday" : "juče",
+    "_%n day go_::_%n days ago_" : ["","","Prije %n dana."],
+    "last month" : "prošlog meseca",
+    "_%n month ago_::_%n months ago_" : ["","",""],
+    "last year" : "prošle godine",
+    "years ago" : "pre nekoliko godina"
+},"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/sr@latin.php b/lib/l10n/sr@latin.php
deleted file mode 100644
index f142f176451..00000000000
--- a/lib/l10n/sr@latin.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Pomoć",
-"Personal" => "Lično",
-"Settings" => "Podešavanja",
-"Users" => "Korisnici",
-"Admin" => "Adninistracija",
-"Authentication error" => "Greška pri autentifikaciji",
-"seconds ago" => "Pre par sekundi",
-"_%n minute ago_::_%n minutes ago_" => array("","","pre %n minuta"),
-"_%n hour ago_::_%n hours ago_" => array("","","pre %n sati"),
-"today" => "Danas",
-"yesterday" => "juče",
-"_%n day go_::_%n days ago_" => array("","","Prije %n dana."),
-"last month" => "prošlog meseca",
-"_%n month ago_::_%n months ago_" => array("","",""),
-"last year" => "prošle godine",
-"years ago" => "pre nekoliko godina"
-);
-$PLURAL_FORMS = "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/su.js b/lib/l10n/su.js
new file mode 100644
index 00000000000..0f4a002019e
--- /dev/null
+++ b/lib/l10n/su.js
@@ -0,0 +1,9 @@
+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=1; plural=0;");
diff --git a/lib/l10n/su.json b/lib/l10n/su.json
new file mode 100644
index 00000000000..4a03cf5047e
--- /dev/null
+++ b/lib/l10n/su.json
@@ -0,0 +1,7 @@
+{ "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=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/su.php b/lib/l10n/su.php
deleted file mode 100644
index e7b09649a24..00000000000
--- a/lib/l10n/su.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"_%n day go_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/sv.js b/lib/l10n/sv.js
new file mode 100644
index 00000000000..9bfaa59074c
--- /dev/null
+++ b/lib/l10n/sv.js
@@ -0,0 +1,111 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Kan inte skriva till \"config\" katalogen!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Detta kan vanligtvis åtgärdas genom att ge skrivrättigheter till config katalgogen",
+    "See %s" : "Se %s",
+    "Help" : "Hjälp",
+    "Personal" : "Personligt",
+    "Settings" : "Inställningar",
+    "Users" : "Användare",
+    "Admin" : "Admin",
+    "Recommended" : "Rekomenderad",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Applikationen  \\\"%s\\\" kan inte installeras då en inte är kompatibel med denna version utav ownCloud.",
+    "No app name specified" : "Inget appnamn angivet",
+    "Unknown filetype" : "Okänd filtyp",
+    "Invalid image" : "Ogiltig bild",
+    "web services under your control" : "webbtjänster under din kontroll",
+    "App directory already exists" : "Appens mapp finns redan",
+    "Can't create app folder. Please fix permissions. %s" : "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s",
+    "No source specified when installing app" : "Ingen källa angiven vid installation av app ",
+    "No href specified when installing app from http" : "Ingen href angiven vid installation av app från http",
+    "No path specified when installing app from local file" : "Ingen sökväg angiven vid installation av app från lokal fil",
+    "Archives of type %s are not supported" : "Arkiv av typen %s stöds ej",
+    "Failed to open archive when installing app" : "Kunde inte öppna arkivet när appen skulle installeras",
+    "App does not provide an info.xml file" : "Appen har ingen info.xml fil",
+    "App can't be installed because of not allowed code in the App" : "Appen kan inte installeras eftersom att den innehåller otillåten kod",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store",
+    "Application is not enabled" : "Applikationen är inte aktiverad",
+    "Authentication error" : "Fel vid autentisering",
+    "Token expired. Please reload page." : "Ogiltig token. Ladda om sidan.",
+    "Unknown user" : "Okänd användare",
+    "%s enter the database username." : "%s ange databasanvändare.",
+    "%s enter the database name." : "%s ange databasnamn",
+    "%s you may not use dots in the database name" : "%s du får inte använda punkter i databasnamnet",
+    "MS SQL username and/or password not valid: %s" : "MS SQL-användaren och/eller lösenordet var inte giltigt: %s",
+    "You need to enter either an existing account or the administrator." : "Du måste antingen ange ett befintligt konto eller administratör.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB användarnamn och/eller lösenord är felaktigt",
+    "DB Error: \"%s\"" : "DB error: \"%s\"",
+    "Offending command was: \"%s\"" : "Det felaktiga kommandot var: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB användare '%s'@'localhost' existerar redan.",
+    "Drop this user from MySQL/MariaDB" : "Radera denna användare från MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB användare '%s'@'%%' existerar redan",
+    "Drop this user from MySQL/MariaDB." : "Radera denna användare från MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Oracle-anslutning kunde inte etableras",
+    "Oracle username and/or password not valid" : "Oracle-användarnamnet och/eller lösenordet är felaktigt",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Det felande kommandot var: \"%s\", name: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
+    "Set an admin username." : "Ange ett användarnamn för administratören.",
+    "Set an admin password." : "Ange ett administratörslösenord.",
+    "%s shared »%s« with you" : "%s delade »%s« med dig",
+    "Sharing %s failed, because the file does not exist" : "Delning av %s misslyckades på grund av att filen inte existerar",
+    "You are not allowed to share %s" : "Du har inte rätt att dela %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Delning %s misslyckades därför att användaren %s är den som äger objektet",
+    "Sharing %s failed, because the user %s does not exist" : "Delning %s misslyckades därför att användaren %s inte existerar",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Delning %s misslyckades därför att användaren %s inte är medlem i någon utav de grupper som %s är medlem i",
+    "Sharing %s failed, because this item is already shared with %s" : "Delning %s misslyckades därför att objektet redan är delat med %s",
+    "Sharing %s failed, because the group %s does not exist" : "Delning %s misslyckades därför att gruppen %s inte existerar",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Delning %s misslyckades därför att %s inte ingår i gruppen %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna",
+    "Sharing %s failed, because sharing with links is not allowed" : "Delning %s misslyckades därför att delning utav länkar inte är tillåtet",
+    "Share type %s is not valid for %s" : "Delningstyp %s är inte giltig för %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s",
+    "Setting permissions for %s failed, because the item was not found" : "Att sätta rättigheterna för %s misslyckades därför att objektet inte hittades",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delningsgränssnittet %s måste implementera gränssnittet OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Delningsgränssnittet %s hittades inte",
+    "Sharing backend for %s not found" : "Delningsgränssnittet för %s hittades inte",
+    "Sharing %s failed, because the user %s is the original sharer" : "Delning %s misslyckades därför att användaren %s är den som delade objektet först",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Delning %s misslyckades därför att rättigheterna överskrider de rättigheter som är tillåtna för %s",
+    "Sharing %s failed, because resharing is not allowed" : "Delning %s misslyckades därför att vidaredelning inte är tillåten",
+    "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\"",
+    "seconds ago" : "sekunder sedan",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minut sedan","%n minuter sedan"],
+    "_%n hour ago_::_%n hours ago_" : ["%n timme sedan","%n timmar sedan"],
+    "today" : "i dag",
+    "yesterday" : "i går",
+    "_%n day go_::_%n days ago_" : ["%n dag sedan","%n dagar sedan"],
+    "last month" : "förra månaden",
+    "_%n month ago_::_%n months ago_" : ["%n månad sedan","%n månader sedan"],
+    "last year" : "förra året",
+    "years ago" : "år sedan",
+    "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",
+    "The username is already being used" : "Användarnamnet används redan",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Inga databasdrivrutiner (sqlite, mysql, eller postgresql) installerade.",
+    "Cannot write into \"config\" directory" : "Kan inte skriva till \"config\" katalogen",
+    "Cannot write into \"apps\" directory" : "Kan inte skriva till \"apps\" katalogen!",
+    "Cannot create \"data\" directory (%s)" : "Kan inte skapa \"data\" katalog (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Detta kan vanligtvis åtgärdas genom att ge <a href=\"%s\" target=\"_blank\">webservern skrivrättigheter till rootkatalogen</a>.",
+    "Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.",
+    "PHP module %s not installed." : "PHP modulen %s är inte installerad.",
+    "PHP %s or higher is required." : "PHP %s eller högre krävs.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Vänligen be serveradministratören uppdatera PHP till den senaste versionen. Din PHP-version stöds inte längre av ownCloud.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode är aktiverat. ownCloud kräver att det är deaktiverat för att fungera korrekt.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes är aktiverat. ownCloud kräver att det är deaktiverat för att fungera korrekt.",
+    "Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webservern.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 krävs",
+    "Please upgrade your database version" : "Vänligen uppgradera din databas-version",
+    "Error occurred while checking PostgreSQL version" : "Ett fel inträffade vid kontroll utav PostgreSQL-version",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Vänligen säkerställ att du har PostgreSQL >= 9 eller kolla loggarna för mer information om felet",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Vänligen ändra rättigheterna till 0770 så att katalogen inte kan listas utav andra användare.",
+    "Data directory (%s) is readable by other users" : "Datakatalogen (%s) kan läsas av andra användare",
+    "Data directory (%s) is invalid" : "Datakatlogen (%s) är ogiltig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Vänligen kontrollera att datakatalogen innehåller filen \".ocdata\" i rooten.",
+    "Could not obtain lock type %d on \"%s\"." : "Kan inte hämta låstyp %d på \"%s\"."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/sv.json b/lib/l10n/sv.json
new file mode 100644
index 00000000000..299911142a3
--- /dev/null
+++ b/lib/l10n/sv.json
@@ -0,0 +1,109 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Kan inte skriva till \"config\" katalogen!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Detta kan vanligtvis åtgärdas genom att ge skrivrättigheter till config katalgogen",
+    "See %s" : "Se %s",
+    "Help" : "Hjälp",
+    "Personal" : "Personligt",
+    "Settings" : "Inställningar",
+    "Users" : "Användare",
+    "Admin" : "Admin",
+    "Recommended" : "Rekomenderad",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Applikationen  \\\"%s\\\" kan inte installeras då en inte är kompatibel med denna version utav ownCloud.",
+    "No app name specified" : "Inget appnamn angivet",
+    "Unknown filetype" : "Okänd filtyp",
+    "Invalid image" : "Ogiltig bild",
+    "web services under your control" : "webbtjänster under din kontroll",
+    "App directory already exists" : "Appens mapp finns redan",
+    "Can't create app folder. Please fix permissions. %s" : "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s",
+    "No source specified when installing app" : "Ingen källa angiven vid installation av app ",
+    "No href specified when installing app from http" : "Ingen href angiven vid installation av app från http",
+    "No path specified when installing app from local file" : "Ingen sökväg angiven vid installation av app från lokal fil",
+    "Archives of type %s are not supported" : "Arkiv av typen %s stöds ej",
+    "Failed to open archive when installing app" : "Kunde inte öppna arkivet när appen skulle installeras",
+    "App does not provide an info.xml file" : "Appen har ingen info.xml fil",
+    "App can't be installed because of not allowed code in the App" : "Appen kan inte installeras eftersom att den innehåller otillåten kod",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store",
+    "Application is not enabled" : "Applikationen är inte aktiverad",
+    "Authentication error" : "Fel vid autentisering",
+    "Token expired. Please reload page." : "Ogiltig token. Ladda om sidan.",
+    "Unknown user" : "Okänd användare",
+    "%s enter the database username." : "%s ange databasanvändare.",
+    "%s enter the database name." : "%s ange databasnamn",
+    "%s you may not use dots in the database name" : "%s du får inte använda punkter i databasnamnet",
+    "MS SQL username and/or password not valid: %s" : "MS SQL-användaren och/eller lösenordet var inte giltigt: %s",
+    "You need to enter either an existing account or the administrator." : "Du måste antingen ange ett befintligt konto eller administratör.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB användarnamn och/eller lösenord är felaktigt",
+    "DB Error: \"%s\"" : "DB error: \"%s\"",
+    "Offending command was: \"%s\"" : "Det felaktiga kommandot var: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB användare '%s'@'localhost' existerar redan.",
+    "Drop this user from MySQL/MariaDB" : "Radera denna användare från MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB användare '%s'@'%%' existerar redan",
+    "Drop this user from MySQL/MariaDB." : "Radera denna användare från MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Oracle-anslutning kunde inte etableras",
+    "Oracle username and/or password not valid" : "Oracle-användarnamnet och/eller lösenordet är felaktigt",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Det felande kommandot var: \"%s\", name: %s, password: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
+    "Set an admin username." : "Ange ett användarnamn för administratören.",
+    "Set an admin password." : "Ange ett administratörslösenord.",
+    "%s shared »%s« with you" : "%s delade »%s« med dig",
+    "Sharing %s failed, because the file does not exist" : "Delning av %s misslyckades på grund av att filen inte existerar",
+    "You are not allowed to share %s" : "Du har inte rätt att dela %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Delning %s misslyckades därför att användaren %s är den som äger objektet",
+    "Sharing %s failed, because the user %s does not exist" : "Delning %s misslyckades därför att användaren %s inte existerar",
+    "Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" : "Delning %s misslyckades därför att användaren %s inte är medlem i någon utav de grupper som %s är medlem i",
+    "Sharing %s failed, because this item is already shared with %s" : "Delning %s misslyckades därför att objektet redan är delat med %s",
+    "Sharing %s failed, because the group %s does not exist" : "Delning %s misslyckades därför att gruppen %s inte existerar",
+    "Sharing %s failed, because %s is not a member of the group %s" : "Delning %s misslyckades därför att %s inte ingår i gruppen %s",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna",
+    "Sharing %s failed, because sharing with links is not allowed" : "Delning %s misslyckades därför att delning utav länkar inte är tillåtet",
+    "Share type %s is not valid for %s" : "Delningstyp %s är inte giltig för %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s",
+    "Setting permissions for %s failed, because the item was not found" : "Att sätta rättigheterna för %s misslyckades därför att objektet inte hittades",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Delningsgränssnittet %s måste implementera gränssnittet OCP\\Share_Backend",
+    "Sharing backend %s not found" : "Delningsgränssnittet %s hittades inte",
+    "Sharing backend for %s not found" : "Delningsgränssnittet för %s hittades inte",
+    "Sharing %s failed, because the user %s is the original sharer" : "Delning %s misslyckades därför att användaren %s är den som delade objektet först",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Delning %s misslyckades därför att rättigheterna överskrider de rättigheter som är tillåtna för %s",
+    "Sharing %s failed, because resharing is not allowed" : "Delning %s misslyckades därför att vidaredelning inte är tillåten",
+    "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\"",
+    "seconds ago" : "sekunder sedan",
+    "_%n minute ago_::_%n minutes ago_" : ["%n minut sedan","%n minuter sedan"],
+    "_%n hour ago_::_%n hours ago_" : ["%n timme sedan","%n timmar sedan"],
+    "today" : "i dag",
+    "yesterday" : "i går",
+    "_%n day go_::_%n days ago_" : ["%n dag sedan","%n dagar sedan"],
+    "last month" : "förra månaden",
+    "_%n month ago_::_%n months ago_" : ["%n månad sedan","%n månader sedan"],
+    "last year" : "förra året",
+    "years ago" : "år sedan",
+    "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",
+    "The username is already being used" : "Användarnamnet används redan",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Inga databasdrivrutiner (sqlite, mysql, eller postgresql) installerade.",
+    "Cannot write into \"config\" directory" : "Kan inte skriva till \"config\" katalogen",
+    "Cannot write into \"apps\" directory" : "Kan inte skriva till \"apps\" katalogen!",
+    "Cannot create \"data\" directory (%s)" : "Kan inte skapa \"data\" katalog (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Detta kan vanligtvis åtgärdas genom att ge <a href=\"%s\" target=\"_blank\">webservern skrivrättigheter till rootkatalogen</a>.",
+    "Please ask your server administrator to install the module." : "Vänligen be din administratör att installera modulen.",
+    "PHP module %s not installed." : "PHP modulen %s är inte installerad.",
+    "PHP %s or higher is required." : "PHP %s eller högre krävs.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Vänligen be serveradministratören uppdatera PHP till den senaste versionen. Din PHP-version stöds inte längre av ownCloud.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode är aktiverat. ownCloud kräver att det är deaktiverat för att fungera korrekt.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes är aktiverat. ownCloud kräver att det är deaktiverat för att fungera korrekt.",
+    "Please ask your server administrator to restart the web server." : "Vänligen be din serveradministratör att starta om webservern.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 krävs",
+    "Please upgrade your database version" : "Vänligen uppgradera din databas-version",
+    "Error occurred while checking PostgreSQL version" : "Ett fel inträffade vid kontroll utav PostgreSQL-version",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Vänligen säkerställ att du har PostgreSQL >= 9 eller kolla loggarna för mer information om felet",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Vänligen ändra rättigheterna till 0770 så att katalogen inte kan listas utav andra användare.",
+    "Data directory (%s) is readable by other users" : "Datakatalogen (%s) kan läsas av andra användare",
+    "Data directory (%s) is invalid" : "Datakatlogen (%s) är ogiltig",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Vänligen kontrollera att datakatalogen innehåller filen \".ocdata\" i rooten.",
+    "Could not obtain lock type %d on \"%s\"." : "Kan inte hämta låstyp %d på \"%s\"."
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
deleted file mode 100644
index c042b6af6cb..00000000000
--- a/lib/l10n/sv.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Kan inte skriva till \"config\" katalogen!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Detta kan vanligtvis åtgärdas genom att ge skrivrättigheter till config katalgogen",
-"See %s" => "Se %s",
-"Help" => "Hjälp",
-"Personal" => "Personligt",
-"Settings" => "Inställningar",
-"Users" => "Användare",
-"Admin" => "Admin",
-"Recommended" => "Rekomenderad",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Applikationen  \\\"%s\\\" kan inte installeras då en inte är kompatibel med denna version utav ownCloud.",
-"No app name specified" => "Inget appnamn angivet",
-"Unknown filetype" => "Okänd filtyp",
-"Invalid image" => "Ogiltig bild",
-"web services under your control" => "webbtjänster under din kontroll",
-"App directory already exists" => "Appens mapp finns redan",
-"Can't create app folder. Please fix permissions. %s" => "Kan inte skapa appens mapp. Var god åtgärda rättigheterna. %s",
-"No source specified when installing app" => "Ingen källa angiven vid installation av app ",
-"No href specified when installing app from http" => "Ingen href angiven vid installation av app från http",
-"No path specified when installing app from local file" => "Ingen sökväg angiven vid installation av app från lokal fil",
-"Archives of type %s are not supported" => "Arkiv av typen %s stöds ej",
-"Failed to open archive when installing app" => "Kunde inte öppna arkivet när appen skulle installeras",
-"App does not provide an info.xml file" => "Appen har ingen info.xml fil",
-"App can't be installed because of not allowed code in the App" => "Appen kan inte installeras eftersom att den innehåller otillåten kod",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Appen kan inte installeras eftersom att den inte är kompatibel med denna version av ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Appen kan inte installeras eftersom att den innehåller etiketten <shipped>true</shipped> vilket inte är tillåtet för icke inkluderade appar",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Appen kan inte installeras eftersom versionen i info.xml inte är samma som rapporteras från app store",
-"Application is not enabled" => "Applikationen är inte aktiverad",
-"Authentication error" => "Fel vid autentisering",
-"Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
-"Unknown user" => "Okänd användare",
-"%s enter the database username." => "%s ange databasanvändare.",
-"%s enter the database name." => "%s ange databasnamn",
-"%s you may not use dots in the database name" => "%s du får inte använda punkter i databasnamnet",
-"MS SQL username and/or password not valid: %s" => "MS SQL-användaren och/eller lösenordet var inte giltigt: %s",
-"You need to enter either an existing account or the administrator." => "Du måste antingen ange ett befintligt konto eller administratör.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB användarnamn och/eller lösenord är felaktigt",
-"DB Error: \"%s\"" => "DB error: \"%s\"",
-"Offending command was: \"%s\"" => "Det felaktiga kommandot var: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB användare '%s'@'localhost' existerar redan.",
-"Drop this user from MySQL/MariaDB" => "Radera denna användare från MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB användare '%s'@'%%' existerar redan",
-"Drop this user from MySQL/MariaDB." => "Radera denna användare från MySQL/MariaDB.",
-"Oracle connection could not be established" => "Oracle-anslutning kunde inte etableras",
-"Oracle username and/or password not valid" => "Oracle-användarnamnet och/eller lösenordet är felaktigt",
-"Offending command was: \"%s\", name: %s, password: %s" => "Det felande kommandot var: \"%s\", name: %s, password: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL-användarnamnet och/eller lösenordet är felaktigt",
-"Set an admin username." => "Ange ett användarnamn för administratören.",
-"Set an admin password." => "Ange ett administratörslösenord.",
-"%s shared »%s« with you" => "%s delade »%s« med dig",
-"Sharing %s failed, because the file does not exist" => "Delning av %s misslyckades på grund av att filen inte existerar",
-"You are not allowed to share %s" => "Du har inte rätt att dela %s",
-"Sharing %s failed, because the user %s is the item owner" => "Delning %s misslyckades därför att användaren %s är den som äger objektet",
-"Sharing %s failed, because the user %s does not exist" => "Delning %s misslyckades därför att användaren %s inte existerar",
-"Sharing %s failed, because the user %s is not a member of any groups that %s is a member of" => "Delning %s misslyckades därför att användaren %s inte är medlem i någon utav de grupper som %s är medlem i",
-"Sharing %s failed, because this item is already shared with %s" => "Delning %s misslyckades därför att objektet redan är delat med %s",
-"Sharing %s failed, because the group %s does not exist" => "Delning %s misslyckades därför att gruppen %s inte existerar",
-"Sharing %s failed, because %s is not a member of the group %s" => "Delning %s misslyckades därför att %s inte ingår i gruppen %s",
-"You need to provide a password to create a public link, only protected links are allowed" => "Du måste ange ett lösenord för att skapa en offentlig länk, endast skyddade länkar är tillåtna",
-"Sharing %s failed, because sharing with links is not allowed" => "Delning %s misslyckades därför att delning utav länkar inte är tillåtet",
-"Share type %s is not valid for %s" => "Delningstyp %s är inte giltig för %s",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "Misslyckades att sätta rättigheter för %s därför att rättigheterna överskrider de som är tillåtna för %s",
-"Setting permissions for %s failed, because the item was not found" => "Att sätta rättigheterna för %s misslyckades därför att objektet inte hittades",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Delningsgränssnittet %s måste implementera gränssnittet OCP\\Share_Backend",
-"Sharing backend %s not found" => "Delningsgränssnittet %s hittades inte",
-"Sharing backend for %s not found" => "Delningsgränssnittet för %s hittades inte",
-"Sharing %s failed, because the user %s is the original sharer" => "Delning %s misslyckades därför att användaren %s är den som delade objektet först",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "Delning %s misslyckades därför att rättigheterna överskrider de rättigheter som är tillåtna för %s",
-"Sharing %s failed, because resharing is not allowed" => "Delning %s misslyckades därför att vidaredelning inte är tillåten",
-"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\"",
-"seconds ago" => "sekunder sedan",
-"_%n minute ago_::_%n minutes ago_" => array("%n minut sedan","%n minuter sedan"),
-"_%n hour ago_::_%n hours ago_" => array("%n timme sedan","%n timmar sedan"),
-"today" => "i dag",
-"yesterday" => "i går",
-"_%n day go_::_%n days ago_" => array("%n dag sedan","%n dagar sedan"),
-"last month" => "förra månaden",
-"_%n month ago_::_%n months ago_" => array("%n månad sedan","%n månader sedan"),
-"last year" => "förra året",
-"years ago" => "år sedan",
-"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",
-"The username is already being used" => "Användarnamnet används redan",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Inga databasdrivrutiner (sqlite, mysql, eller postgresql) installerade.",
-"Cannot write into \"config\" directory" => "Kan inte skriva till \"config\" katalogen",
-"Cannot write into \"apps\" directory" => "Kan inte skriva till \"apps\" katalogen!",
-"Cannot create \"data\" directory (%s)" => "Kan inte skapa \"data\" katalog (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "Detta kan vanligtvis åtgärdas genom att ge <a href=\"%s\" target=\"_blank\">webservern skrivrättigheter till rootkatalogen</a>.",
-"Please ask your server administrator to install the module." => "Vänligen be din administratör att installera modulen.",
-"PHP module %s not installed." => "PHP modulen %s är inte installerad.",
-"PHP %s or higher is required." => "PHP %s eller högre krävs.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Vänligen be serveradministratören uppdatera PHP till den senaste versionen. Din PHP-version stöds inte längre av ownCloud.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode är aktiverat. ownCloud kräver att det är deaktiverat för att fungera korrekt.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes är aktiverat. ownCloud kräver att det är deaktiverat för att fungera korrekt.",
-"Please ask your server administrator to restart the web server." => "Vänligen be din serveradministratör att starta om webservern.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 krävs",
-"Please upgrade your database version" => "Vänligen uppgradera din databas-version",
-"Error occurred while checking PostgreSQL version" => "Ett fel inträffade vid kontroll utav PostgreSQL-version",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "Vänligen säkerställ att du har PostgreSQL >= 9 eller kolla loggarna för mer information om felet",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Vänligen ändra rättigheterna till 0770 så att katalogen inte kan listas utav andra användare.",
-"Data directory (%s) is readable by other users" => "Datakatalogen (%s) kan läsas av andra användare",
-"Data directory (%s) is invalid" => "Datakatlogen (%s) är ogiltig",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Vänligen kontrollera att datakatalogen innehåller filen \".ocdata\" i rooten.",
-"Could not obtain lock type %d on \"%s\"." => "Kan inte hämta låstyp %d på \"%s\"."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sw_KE.js b/lib/l10n/sw_KE.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/sw_KE.js
@@ -0,0 +1,9 @@
+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/sw_KE.json b/lib/l10n/sw_KE.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/sw_KE.json
@@ -0,0 +1,7 @@
+{ "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/sw_KE.php b/lib/l10n/sw_KE.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/sw_KE.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ta_IN.js b/lib/l10n/ta_IN.js
new file mode 100644
index 00000000000..e026954a573
--- /dev/null
+++ b/lib/l10n/ta_IN.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Settings" : "அமைப்புகள்",
+    "_%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/ta_IN.json b/lib/l10n/ta_IN.json
new file mode 100644
index 00000000000..3f9f5882968
--- /dev/null
+++ b/lib/l10n/ta_IN.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Settings" : "அமைப்புகள்",
+    "_%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/ta_IN.php b/lib/l10n/ta_IN.php
deleted file mode 100644
index 5907e09695d..00000000000
--- a/lib/l10n/ta_IN.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Settings" => "அமைப்புகள்",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/ta_LK.js b/lib/l10n/ta_LK.js
new file mode 100644
index 00000000000..5f2d310c40b
--- /dev/null
+++ b/lib/l10n/ta_LK.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "உதவி",
+    "Personal" : "தனிப்பட்ட",
+    "Settings" : "அமைப்புகள்",
+    "Users" : "பயனாளர்",
+    "Admin" : "நிர்வாகம்",
+    "web services under your control" : "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
+    "Application is not enabled" : "செயலி இயலுமைப்படுத்தப்படவில்லை",
+    "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு",
+    "Token expired. Please reload page." : "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.",
+    "Could not find category \"%s\"" : "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை",
+    "seconds ago" : "செக்கன்களுக்கு முன்",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "இன்று",
+    "yesterday" : "நேற்று",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "கடந்த மாதம்",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "கடந்த வருடம்",
+    "years ago" : "வருடங்களுக்கு முன்"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ta_LK.json b/lib/l10n/ta_LK.json
new file mode 100644
index 00000000000..e5191020433
--- /dev/null
+++ b/lib/l10n/ta_LK.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Help" : "உதவி",
+    "Personal" : "தனிப்பட்ட",
+    "Settings" : "அமைப்புகள்",
+    "Users" : "பயனாளர்",
+    "Admin" : "நிர்வாகம்",
+    "web services under your control" : "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
+    "Application is not enabled" : "செயலி இயலுமைப்படுத்தப்படவில்லை",
+    "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு",
+    "Token expired. Please reload page." : "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.",
+    "Could not find category \"%s\"" : "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை",
+    "seconds ago" : "செக்கன்களுக்கு முன்",
+    "_%n minute ago_::_%n minutes ago_" : ["",""],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "இன்று",
+    "yesterday" : "நேற்று",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "கடந்த மாதம்",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "கடந்த வருடம்",
+    "years ago" : "வருடங்களுக்கு முன்"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php
deleted file mode 100644
index 3bcdb7d30d4..00000000000
--- a/lib/l10n/ta_LK.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "உதவி",
-"Personal" => "தனிப்பட்ட",
-"Settings" => "அமைப்புகள்",
-"Users" => "பயனாளர்",
-"Admin" => "நிர்வாகம்",
-"web services under your control" => "வலைய சேவைகள் உங்களுடைய கட்டுப்பாட்டின் கீழ் உள்ளது",
-"Application is not enabled" => "செயலி இயலுமைப்படுத்தப்படவில்லை",
-"Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
-"Token expired. Please reload page." => "அடையாளவில்லை காலாவதியாகிவிட்டது. தயவுசெய்து பக்கத்தை மீள் ஏற்றுக.",
-"Could not find category \"%s\"" => "பிரிவு \"%s\" ஐ கண்டுப்பிடிக்க முடியவில்லை",
-"seconds ago" => "செக்கன்களுக்கு முன்",
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "இன்று",
-"yesterday" => "நேற்று",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "கடந்த மாதம்",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "கடந்த வருடம்",
-"years ago" => "வருடங்களுக்கு முன்"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/te.js b/lib/l10n/te.js
new file mode 100644
index 00000000000..e1a3602f617
--- /dev/null
+++ b/lib/l10n/te.js
@@ -0,0 +1,19 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "సహాయం",
+    "Personal" : "వ్యక్తిగతం",
+    "Settings" : "అమరికలు",
+    "Users" : "వాడుకరులు",
+    "seconds ago" : "క్షణాల క్రితం",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n నిమిషాల క్రితం"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n గంటల క్రితం"],
+    "today" : "ఈరోజు",
+    "yesterday" : "నిన్న",
+    "_%n day go_::_%n days ago_" : ["","%n రోజుల క్రితం"],
+    "last month" : "పోయిన నెల",
+    "_%n month ago_::_%n months ago_" : ["","%n నెలల క్రితం"],
+    "last year" : "పోయిన సంవత్సరం",
+    "years ago" : "సంవత్సరాల క్రితం"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/te.json b/lib/l10n/te.json
new file mode 100644
index 00000000000..1e9669c12b3
--- /dev/null
+++ b/lib/l10n/te.json
@@ -0,0 +1,17 @@
+{ "translations": {
+    "Help" : "సహాయం",
+    "Personal" : "వ్యక్తిగతం",
+    "Settings" : "అమరికలు",
+    "Users" : "వాడుకరులు",
+    "seconds ago" : "క్షణాల క్రితం",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n నిమిషాల క్రితం"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n గంటల క్రితం"],
+    "today" : "ఈరోజు",
+    "yesterday" : "నిన్న",
+    "_%n day go_::_%n days ago_" : ["","%n రోజుల క్రితం"],
+    "last month" : "పోయిన నెల",
+    "_%n month ago_::_%n months ago_" : ["","%n నెలల క్రితం"],
+    "last year" : "పోయిన సంవత్సరం",
+    "years ago" : "సంవత్సరాల క్రితం"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/te.php b/lib/l10n/te.php
deleted file mode 100644
index 12ae9240191..00000000000
--- a/lib/l10n/te.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "సహాయం",
-"Personal" => "వ్యక్తిగతం",
-"Settings" => "అమరికలు",
-"Users" => "వాడుకరులు",
-"seconds ago" => "క్షణాల క్రితం",
-"_%n minute ago_::_%n minutes ago_" => array("","%n నిమిషాల క్రితం"),
-"_%n hour ago_::_%n hours ago_" => array("","%n గంటల క్రితం"),
-"today" => "ఈరోజు",
-"yesterday" => "నిన్న",
-"_%n day go_::_%n days ago_" => array("","%n రోజుల క్రితం"),
-"last month" => "పోయిన నెల",
-"_%n month ago_::_%n months ago_" => array("","%n నెలల క్రితం"),
-"last year" => "పోయిన సంవత్సరం",
-"years ago" => "సంవత్సరాల క్రితం"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/tg_TJ.js b/lib/l10n/tg_TJ.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/tg_TJ.js
@@ -0,0 +1,9 @@
+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/tg_TJ.json b/lib/l10n/tg_TJ.json
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/tg_TJ.json
@@ -0,0 +1,7 @@
+{ "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/tg_TJ.php b/lib/l10n/tg_TJ.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/tg_TJ.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/th_TH.js b/lib/l10n/th_TH.js
new file mode 100644
index 00000000000..8a58554c53b
--- /dev/null
+++ b/lib/l10n/th_TH.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "ช่วยเหลือ",
+    "Personal" : "ส่วนตัว",
+    "Settings" : "ตั้งค่า",
+    "Users" : "ผู้ใช้งาน",
+    "Admin" : "ผู้ดูแล",
+    "web services under your control" : "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
+    "Application is not enabled" : "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
+    "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
+    "Token expired. Please reload page." : "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
+    "Could not find category \"%s\"" : "ไม่พบหมวดหมู่ \"%s\"",
+    "seconds ago" : "วินาที ก่อนหน้านี้",
+    "_%n minute ago_::_%n minutes ago_" : [""],
+    "_%n hour ago_::_%n hours ago_" : [""],
+    "today" : "วันนี้",
+    "yesterday" : "เมื่อวานนี้",
+    "_%n day go_::_%n days ago_" : [""],
+    "last month" : "เดือนที่แล้ว",
+    "_%n month ago_::_%n months ago_" : [""],
+    "last year" : "ปีที่แล้ว",
+    "years ago" : "ปี ที่ผ่านมา"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/th_TH.json b/lib/l10n/th_TH.json
new file mode 100644
index 00000000000..dde903b4a3f
--- /dev/null
+++ b/lib/l10n/th_TH.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Help" : "ช่วยเหลือ",
+    "Personal" : "ส่วนตัว",
+    "Settings" : "ตั้งค่า",
+    "Users" : "ผู้ใช้งาน",
+    "Admin" : "ผู้ดูแล",
+    "web services under your control" : "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
+    "Application is not enabled" : "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
+    "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
+    "Token expired. Please reload page." : "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
+    "Could not find category \"%s\"" : "ไม่พบหมวดหมู่ \"%s\"",
+    "seconds ago" : "วินาที ก่อนหน้านี้",
+    "_%n minute ago_::_%n minutes ago_" : [""],
+    "_%n hour ago_::_%n hours ago_" : [""],
+    "today" : "วันนี้",
+    "yesterday" : "เมื่อวานนี้",
+    "_%n day go_::_%n days ago_" : [""],
+    "last month" : "เดือนที่แล้ว",
+    "_%n month ago_::_%n months ago_" : [""],
+    "last year" : "ปีที่แล้ว",
+    "years ago" : "ปี ที่ผ่านมา"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
deleted file mode 100644
index 6b36c12fa9d..00000000000
--- a/lib/l10n/th_TH.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "ช่วยเหลือ",
-"Personal" => "ส่วนตัว",
-"Settings" => "ตั้งค่า",
-"Users" => "ผู้ใช้งาน",
-"Admin" => "ผู้ดูแล",
-"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้",
-"Application is not enabled" => "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
-"Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
-"Token expired. Please reload page." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
-"Could not find category \"%s\"" => "ไม่พบหมวดหมู่ \"%s\"",
-"seconds ago" => "วินาที ก่อนหน้านี้",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"today" => "วันนี้",
-"yesterday" => "เมื่อวานนี้",
-"_%n day go_::_%n days ago_" => array(""),
-"last month" => "เดือนที่แล้ว",
-"_%n month ago_::_%n months ago_" => array(""),
-"last year" => "ปีที่แล้ว",
-"years ago" => "ปี ที่ผ่านมา"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/tl_PH.js b/lib/l10n/tl_PH.js
new file mode 100644
index 00000000000..9ac3e05d6c6
--- /dev/null
+++ b/lib/l10n/tl_PH.js
@@ -0,0 +1,9 @@
+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/tl_PH.json b/lib/l10n/tl_PH.json
new file mode 100644
index 00000000000..82a8a99d300
--- /dev/null
+++ b/lib/l10n/tl_PH.json
@@ -0,0 +1,7 @@
+{ "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/tl_PH.php b/lib/l10n/tl_PH.php
deleted file mode 100644
index 406ff5f5a26..00000000000
--- a/lib/l10n/tl_PH.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
new file mode 100644
index 00000000000..b3e60202a77
--- /dev/null
+++ b/lib/l10n/tr.js
@@ -0,0 +1,124 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "\"config\" dizinine yazılamıyor!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Bu genellikle, web sunucusuna config dizinine yazma erişimi verilerek çözülebilir",
+    "See %s" : "Bakınız: %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Bu genellikle, %sweb sunucusuna config dizinine yazma erişimi verilerek%s çözülebilir",
+    "Sample configuration detected" : "Örnek yapılandırma tespit edildi",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Örnek yapılandırmanın kopyalanmış olabileceği tespit edildi. Bu kurulumunuzu bozabilir ve desteklenmemektedir. Lütfen config.php dosyasında değişiklik yapmadan önce belgelendirmeyi okuyun",
+    "Help" : "Yardım",
+    "Personal" : "Kişisel",
+    "Settings" : "Ayarlar",
+    "Users" : "Kullanıcılar",
+    "Admin" : "Yönetici",
+    "Recommended" : "Önerilen",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "ownCloud yazılımının bu sürümü ile uyumlu  olmadığı için \\\"%s\\\" uygulaması kurulamaz.",
+    "No app name specified" : "Uygulama adı belirtilmedi",
+    "Unknown filetype" : "Bilinmeyen dosya türü",
+    "Invalid image" : "Geçersiz resim",
+    "web services under your control" : "denetiminizdeki web hizmetleri",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "%s arşiv türü desteklenmiyor",
+    "Failed to open archive when installing app" : "Uygulama kurulurken arşiv dosyası açılamadı",
+    "App does not provide an info.xml file" : "Uygulama info.xml dosyası sağlamıyor",
+    "App can't be installed because of not allowed code in the App" : "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor",
+    "Application is not enabled" : "Uygulama etkin değil",
+    "Authentication error" : "Kimlik doğrulama hatası",
+    "Token expired. Please reload page." : "Belirteç süresi geçti. Lütfen sayfayı yenileyin.",
+    "Unknown user" : "Bilinmeyen kullanıcı",
+    "%s enter the database username." : "%s veritabanı kullanıcı adını girin.",
+    "%s enter the database name." : "%s veritabanı adını girin.",
+    "%s you may not use dots in the database name" : "%s veritabanı adında nokta kullanamayabilirsiniz",
+    "MS SQL username and/or password not valid: %s" : "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
+    "You need to enter either an existing account or the administrator." : "Mevcut bit hesap ya da yönetici hesabını girmelisiniz.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB kullanıcı adı ve/veya parolası geçersiz",
+    "DB Error: \"%s\"" : "VT Hatası: \"%s\"",
+    "Offending command was: \"%s\"" : "Saldırgan komut: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB kullanıcı '%s'@'localhost' zaten mevcut.",
+    "Drop this user from MySQL/MariaDB" : "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB kullanıcısı '%s'@'%%' zaten mevcut",
+    "Drop this user from MySQL/MariaDB." : "Bu kullanıcıyı MySQL/MariaDB'dan at (drop).",
+    "Oracle connection could not be established" : "Oracle bağlantısı kurulamadı",
+    "Oracle username and/or password not valid" : "Oracle kullanıcı adı ve/veya parolası geçerli değil",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Hatalı komut: \"%s\", ad: %s, parola: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL  kullanıcı adı ve/veya parolası geçerli değil",
+    "Set an admin username." : "Bir yönetici kullanıcı adı ayarlayın.",
+    "Set an admin password." : "Bir yönetici kullanıcı parolası ayarlayın.",
+    "Can't create or write into the data directory %s" : "Veri dizini %s oluşturulamıyor veya yazılamıyor",
+    "%s shared »%s« with you" : "%s sizinle »%s« paylaşımında bulundu",
+    "Sharing %s failed, because the file does not exist" : "%s paylaşımı, dosya mevcut olmadığından başarısız oldu",
+    "You are not allowed to share %s" : "%s paylaşımını yapma izniniz yok",
+    "Sharing %s failed, because the user %s is the item owner" : "%s paylaşımı, %s öge sahibi olduğundan başarısız oldu",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu",
+    "Share type %s is not valid for %s" : "%s paylaşım türü %s için geçerli değil",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı",
+    "Setting permissions for %s failed, because the item was not found" : "%s için izinler öge bulunamadığından ayarlanamadı",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Son kullanma tarihi ayarlanamıyor. Paylaşımlar, paylaşıldıkları süreden %s sonra dolamaz.",
+    "Cannot set expiration date. Expiration date is in the past" : "Son kullanma tarihi ayarlanamıyor. Son kullanma tarihi geçmişte",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Paylaşma arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli",
+    "Sharing backend %s not found" : "Paylaşım arka ucu %s bulunamadı",
+    "Sharing backend for %s not found" : "%s için paylaşım arka ucu bulunamadı",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s paylaşımı, %s kullanıcısı özgün paylaşan kişi olduğundan başarısız oldu",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s paylaşımı, izinler %s için verilen izinleri aştığından dolayı başarısız oldu",
+    "Sharing %s failed, because resharing is not allowed" : "%s paylaşımı, tekrar paylaşımın izin verilmemesinden dolayı başarısız oldu",
+    "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ı",
+    "seconds ago" : "saniyeler önce",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n dakika önce"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n saat önce"],
+    "today" : "bugün",
+    "yesterday" : "dün",
+    "_%n day go_::_%n days ago_" : ["","%n gün önce"],
+    "last month" : "geçen ay",
+    "_%n month ago_::_%n months ago_" : ["","%n ay önce"],
+    "last year" : "geçen yıl",
+    "years ago" : "yıllar önce",
+    "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ı",
+    "The username is already being used" : "Bu kullanıcı adı zaten kullanımda",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir",
+    "Cannot write into \"config\" directory" : "\"config\" dizinine yazılamıyor",
+    "Cannot write into \"apps\" directory" : "\"apps\" dizinine yazılamıyor",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.",
+    "Cannot create \"data\" directory (%s)" : "\"Veri\" dizini oluşturulamıyor (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "İzinler genellikle, <a href=\"%s\" target=\"_blank\">web sunucusuna kök dizinine yazma erişimi verilerek</a> çözülebilir.",
+    "Setting locale to %s failed" : "Dili %s olarak ayarlama başarısız",
+    "Please install one of these locales on your system and restart your webserver." : "Lütfen bu yerellerden birini sisteminize yükleyin ve web sunucunuzu yeniden başlatın.",
+    "Please ask your server administrator to install the module." : "Lütfen modülün kurulması için sunucu yöneticinize danışın.",
+    "PHP module %s not installed." : "PHP modülü %s yüklü değil.",
+    "PHP %s or higher is required." : "PHP %s veya daha üst sürümü gerekli.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Lütfen PHP'yi en son sürüme güncellemesi için sunucu yönetinize danışın. PHP sürümünüz ownCloud ve PHP topluluğu tarafından artık desteklenmemektedir.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Güvenli Kip (Safe Mode) etkin. ownCloud düzgün çalışabilmesi için bunun devre dışı olmasını gerektirir.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Güvenli Kip (Safe Mode), eskimiş ve devre dışı bırakılması gereken en kullanışsız ayardır. Lütfen php.ini veya web sunucu yapılandırması içerisinde devre dışı bırakması için sunucu yöneticinize danışın.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Sihirli Tırnaklar (Magic Quotes) etkin. ownCloud çalışabilmesi için bunun devre dışı bırakılması gerekli.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Sihirli Tırnaklar (Magic Quotes), eskimiş ve devre dışı bırakılması gereken en kullanışsız ayardır. Lütfen php.ini veya web sunucu yapılandırması içerisinde devre dışı bırakması için sunucu yöneticinize danışın.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?",
+    "Please ask your server administrator to restart the web server." : "Lütfen web sunucusunu yeniden başlatması için sunucu yöneticinize danışın.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 gerekli",
+    "Please upgrade your database version" : "Lütfen veritabanı sürümünüzü yükseltin",
+    "Error occurred while checking PostgreSQL version" : "PostgreSQL sürümü denetlenirken hata oluştu",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "PostgreSQL >= 9 sürümüne sahip olduğunuzu doğrulayın veya hata hakkında daha fazla bilgi için günlükleri denetleyin",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Lütfen izinleri 0770 ayarlayarak dizinin diğer kullanıcılar tarafından görülememesini sağlayın.",
+    "Data directory (%s) is readable by other users" : "Veri dizini (%s) diğer kullanıcılar tarafından okunabilir",
+    "Data directory (%s) is invalid" : "Veri dizini (%s) geçersiz",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Lütfen veri dizininin kökünde \".ocdata\" adlı bir dosyanın bulunduğunu denetleyin.",
+    "Could not obtain lock type %d on \"%s\"." : "\"%s\" üzerinde %d kilit türü alınamadı."
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
new file mode 100644
index 00000000000..688f3f52fa1
--- /dev/null
+++ b/lib/l10n/tr.json
@@ -0,0 +1,122 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "\"config\" dizinine yazılamıyor!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Bu genellikle, web sunucusuna config dizinine yazma erişimi verilerek çözülebilir",
+    "See %s" : "Bakınız: %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Bu genellikle, %sweb sunucusuna config dizinine yazma erişimi verilerek%s çözülebilir",
+    "Sample configuration detected" : "Örnek yapılandırma tespit edildi",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Örnek yapılandırmanın kopyalanmış olabileceği tespit edildi. Bu kurulumunuzu bozabilir ve desteklenmemektedir. Lütfen config.php dosyasında değişiklik yapmadan önce belgelendirmeyi okuyun",
+    "Help" : "Yardım",
+    "Personal" : "Kişisel",
+    "Settings" : "Ayarlar",
+    "Users" : "Kullanıcılar",
+    "Admin" : "Yönetici",
+    "Recommended" : "Önerilen",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "ownCloud yazılımının bu sürümü ile uyumlu  olmadığı için \\\"%s\\\" uygulaması kurulamaz.",
+    "No app name specified" : "Uygulama adı belirtilmedi",
+    "Unknown filetype" : "Bilinmeyen dosya türü",
+    "Invalid image" : "Geçersiz resim",
+    "web services under your control" : "denetiminizdeki web hizmetleri",
+    "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",
+    "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",
+    "Archives of type %s are not supported" : "%s arşiv türü desteklenmiyor",
+    "Failed to open archive when installing app" : "Uygulama kurulurken arşiv dosyası açılamadı",
+    "App does not provide an info.xml file" : "Uygulama info.xml dosyası sağlamıyor",
+    "App can't be installed because of not allowed code in the App" : "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor",
+    "Application is not enabled" : "Uygulama etkin değil",
+    "Authentication error" : "Kimlik doğrulama hatası",
+    "Token expired. Please reload page." : "Belirteç süresi geçti. Lütfen sayfayı yenileyin.",
+    "Unknown user" : "Bilinmeyen kullanıcı",
+    "%s enter the database username." : "%s veritabanı kullanıcı adını girin.",
+    "%s enter the database name." : "%s veritabanı adını girin.",
+    "%s you may not use dots in the database name" : "%s veritabanı adında nokta kullanamayabilirsiniz",
+    "MS SQL username and/or password not valid: %s" : "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
+    "You need to enter either an existing account or the administrator." : "Mevcut bit hesap ya da yönetici hesabını girmelisiniz.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB kullanıcı adı ve/veya parolası geçersiz",
+    "DB Error: \"%s\"" : "VT Hatası: \"%s\"",
+    "Offending command was: \"%s\"" : "Saldırgan komut: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB kullanıcı '%s'@'localhost' zaten mevcut.",
+    "Drop this user from MySQL/MariaDB" : "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB kullanıcısı '%s'@'%%' zaten mevcut",
+    "Drop this user from MySQL/MariaDB." : "Bu kullanıcıyı MySQL/MariaDB'dan at (drop).",
+    "Oracle connection could not be established" : "Oracle bağlantısı kurulamadı",
+    "Oracle username and/or password not valid" : "Oracle kullanıcı adı ve/veya parolası geçerli değil",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Hatalı komut: \"%s\", ad: %s, parola: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL  kullanıcı adı ve/veya parolası geçerli değil",
+    "Set an admin username." : "Bir yönetici kullanıcı adı ayarlayın.",
+    "Set an admin password." : "Bir yönetici kullanıcı parolası ayarlayın.",
+    "Can't create or write into the data directory %s" : "Veri dizini %s oluşturulamıyor veya yazılamıyor",
+    "%s shared »%s« with you" : "%s sizinle »%s« paylaşımında bulundu",
+    "Sharing %s failed, because the file does not exist" : "%s paylaşımı, dosya mevcut olmadığından başarısız oldu",
+    "You are not allowed to share %s" : "%s paylaşımını yapma izniniz yok",
+    "Sharing %s failed, because the user %s is the item owner" : "%s paylaşımı, %s öge sahibi olduğundan başarısız oldu",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu",
+    "Share type %s is not valid for %s" : "%s paylaşım türü %s için geçerli değil",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı",
+    "Setting permissions for %s failed, because the item was not found" : "%s için izinler öge bulunamadığından ayarlanamadı",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Son kullanma tarihi ayarlanamıyor. Paylaşımlar, paylaşıldıkları süreden %s sonra dolamaz.",
+    "Cannot set expiration date. Expiration date is in the past" : "Son kullanma tarihi ayarlanamıyor. Son kullanma tarihi geçmişte",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Paylaşma arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli",
+    "Sharing backend %s not found" : "Paylaşım arka ucu %s bulunamadı",
+    "Sharing backend for %s not found" : "%s için paylaşım arka ucu bulunamadı",
+    "Sharing %s failed, because the user %s is the original sharer" : "%s paylaşımı, %s kullanıcısı özgün paylaşan kişi olduğundan başarısız oldu",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "%s paylaşımı, izinler %s için verilen izinleri aştığından dolayı başarısız oldu",
+    "Sharing %s failed, because resharing is not allowed" : "%s paylaşımı, tekrar paylaşımın izin verilmemesinden dolayı başarısız oldu",
+    "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ı",
+    "seconds ago" : "saniyeler önce",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n dakika önce"],
+    "_%n hour ago_::_%n hours ago_" : ["","%n saat önce"],
+    "today" : "bugün",
+    "yesterday" : "dün",
+    "_%n day go_::_%n days ago_" : ["","%n gün önce"],
+    "last month" : "geçen ay",
+    "_%n month ago_::_%n months ago_" : ["","%n ay önce"],
+    "last year" : "geçen yıl",
+    "years ago" : "yıllar önce",
+    "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ı",
+    "The username is already being used" : "Bu kullanıcı adı zaten kullanımda",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir",
+    "Cannot write into \"config\" directory" : "\"config\" dizinine yazılamıyor",
+    "Cannot write into \"apps\" directory" : "\"apps\" dizinine yazılamıyor",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.",
+    "Cannot create \"data\" directory (%s)" : "\"Veri\" dizini oluşturulamıyor (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "İzinler genellikle, <a href=\"%s\" target=\"_blank\">web sunucusuna kök dizinine yazma erişimi verilerek</a> çözülebilir.",
+    "Setting locale to %s failed" : "Dili %s olarak ayarlama başarısız",
+    "Please install one of these locales on your system and restart your webserver." : "Lütfen bu yerellerden birini sisteminize yükleyin ve web sunucunuzu yeniden başlatın.",
+    "Please ask your server administrator to install the module." : "Lütfen modülün kurulması için sunucu yöneticinize danışın.",
+    "PHP module %s not installed." : "PHP modülü %s yüklü değil.",
+    "PHP %s or higher is required." : "PHP %s veya daha üst sürümü gerekli.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Lütfen PHP'yi en son sürüme güncellemesi için sunucu yönetinize danışın. PHP sürümünüz ownCloud ve PHP topluluğu tarafından artık desteklenmemektedir.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Güvenli Kip (Safe Mode) etkin. ownCloud düzgün çalışabilmesi için bunun devre dışı olmasını gerektirir.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Güvenli Kip (Safe Mode), eskimiş ve devre dışı bırakılması gereken en kullanışsız ayardır. Lütfen php.ini veya web sunucu yapılandırması içerisinde devre dışı bırakması için sunucu yöneticinize danışın.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Sihirli Tırnaklar (Magic Quotes) etkin. ownCloud çalışabilmesi için bunun devre dışı bırakılması gerekli.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Sihirli Tırnaklar (Magic Quotes), eskimiş ve devre dışı bırakılması gereken en kullanışsız ayardır. Lütfen php.ini veya web sunucu yapılandırması içerisinde devre dışı bırakması için sunucu yöneticinize danışın.",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?",
+    "Please ask your server administrator to restart the web server." : "Lütfen web sunucusunu yeniden başlatması için sunucu yöneticinize danışın.",
+    "PostgreSQL >= 9 required" : "PostgreSQL >= 9 gerekli",
+    "Please upgrade your database version" : "Lütfen veritabanı sürümünüzü yükseltin",
+    "Error occurred while checking PostgreSQL version" : "PostgreSQL sürümü denetlenirken hata oluştu",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "PostgreSQL >= 9 sürümüne sahip olduğunuzu doğrulayın veya hata hakkında daha fazla bilgi için günlükleri denetleyin",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Lütfen izinleri 0770 ayarlayarak dizinin diğer kullanıcılar tarafından görülememesini sağlayın.",
+    "Data directory (%s) is readable by other users" : "Veri dizini (%s) diğer kullanıcılar tarafından okunabilir",
+    "Data directory (%s) is invalid" : "Veri dizini (%s) geçersiz",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Lütfen veri dizininin kökünde \".ocdata\" adlı bir dosyanın bulunduğunu denetleyin.",
+    "Could not obtain lock type %d on \"%s\"." : "\"%s\" üzerinde %d kilit türü alınamadı."
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
deleted file mode 100644
index 4477efd07cc..00000000000
--- a/lib/l10n/tr.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "\"config\" dizinine yazılamıyor!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Bu genellikle, web sunucusuna config dizinine yazma erişimi verilerek çözülebilir",
-"See %s" => "Bakınız: %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Bu genellikle, %sweb sunucusuna config dizinine yazma erişimi verilerek%s çözülebilir",
-"Sample configuration detected" => "Örnek yapılandırma tespit edildi",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Örnek yapılandırmanın kopyalanmış olabileceği tespit edildi. Bu kurulumunuzu bozabilir ve desteklenmemektedir. Lütfen config.php dosyasında değişiklik yapmadan önce belgelendirmeyi okuyun",
-"Help" => "Yardım",
-"Personal" => "Kişisel",
-"Settings" => "Ayarlar",
-"Users" => "Kullanıcılar",
-"Admin" => "Yönetici",
-"Recommended" => "Önerilen",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "ownCloud yazılımının bu sürümü ile uyumlu  olmadığı için \\\"%s\\\" uygulaması kurulamaz.",
-"No app name specified" => "Uygulama adı belirtilmedi",
-"Unknown filetype" => "Bilinmeyen dosya türü",
-"Invalid image" => "Geçersiz resim",
-"web services under your control" => "denetiminizdeki web hizmetleri",
-"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",
-"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",
-"Archives of type %s are not supported" => "%s arşiv türü desteklenmiyor",
-"Failed to open archive when installing app" => "Uygulama kurulurken arşiv dosyası açılamadı",
-"App does not provide an info.xml file" => "Uygulama info.xml dosyası sağlamıyor",
-"App can't be installed because of not allowed code in the App" => "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor",
-"App can't be installed because it is not compatible with this version of ownCloud" => "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Uygulama, birlikte gelmeyen uygulama olmasına rağmen <shipped>true</shipped> etiketi içerdiği için kurulamıyor",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Uygulama info.xml/version ile uygulama marketinde belirtilen sürüm aynı olmadığından kurulamıyor",
-"Application is not enabled" => "Uygulama etkin değil",
-"Authentication error" => "Kimlik doğrulama hatası",
-"Token expired. Please reload page." => "Belirteç süresi geçti. Lütfen sayfayı yenileyin.",
-"Unknown user" => "Bilinmeyen kullanıcı",
-"%s enter the database username." => "%s veritabanı kullanıcı adını girin.",
-"%s enter the database name." => "%s veritabanı adını girin.",
-"%s you may not use dots in the database name" => "%s veritabanı adında nokta kullanamayabilirsiniz",
-"MS SQL username and/or password not valid: %s" => "MS SQL kullanıcı adı ve/veya parolası geçersiz: %s",
-"You need to enter either an existing account or the administrator." => "Mevcut bit hesap ya da yönetici hesabını girmelisiniz.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB kullanıcı adı ve/veya parolası geçersiz",
-"DB Error: \"%s\"" => "VT Hatası: \"%s\"",
-"Offending command was: \"%s\"" => "Saldırgan komut: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB kullanıcı '%s'@'localhost' zaten mevcut.",
-"Drop this user from MySQL/MariaDB" => "Bu kullanıcıyı MySQL/MariaDB'dan at (drop)",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB kullanıcısı '%s'@'%%' zaten mevcut",
-"Drop this user from MySQL/MariaDB." => "Bu kullanıcıyı MySQL/MariaDB'dan at (drop).",
-"Oracle connection could not be established" => "Oracle bağlantısı kurulamadı",
-"Oracle username and/or password not valid" => "Oracle kullanıcı adı ve/veya parolası geçerli değil",
-"Offending command was: \"%s\", name: %s, password: %s" => "Hatalı komut: \"%s\", ad: %s, parola: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL  kullanıcı adı ve/veya parolası geçerli değil",
-"Set an admin username." => "Bir yönetici kullanıcı adı ayarlayın.",
-"Set an admin password." => "Bir yönetici kullanıcı parolası ayarlayın.",
-"Can't create or write into the data directory %s" => "Veri dizini %s oluşturulamıyor veya yazılamıyor",
-"%s shared »%s« with you" => "%s sizinle »%s« paylaşımında bulundu",
-"Sharing %s failed, because the file does not exist" => "%s paylaşımı, dosya mevcut olmadığından başarısız oldu",
-"You are not allowed to share %s" => "%s paylaşımını yapma izniniz yok",
-"Sharing %s failed, because the user %s is the item owner" => "%s paylaşımı, %s öge sahibi olduğundan başarısız oldu",
-"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 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",
-"Sharing %s failed, because sharing with links is not allowed" => "%s paylaşımı, bağlantılar ile paylaşım izin verilmediğinden başarısız oldu",
-"Share type %s is not valid for %s" => "%s paylaşım türü %s için geçerli değil",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "%s için izinler, izinler %s için verilen izinleri aştığından dolayı ayarlanamadı",
-"Setting permissions for %s failed, because the item was not found" => "%s için izinler öge bulunamadığından ayarlanamadı",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "Son kullanma tarihi ayarlanamıyor. Paylaşımlar, paylaşıldıkları süreden %s sonra dolamaz.",
-"Cannot set expiration date. Expiration date is in the past" => "Son kullanma tarihi ayarlanamıyor. Son kullanma tarihi geçmişte",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "Paylaşma arka ucu %s OCP\\Share_Backend arayüzünü desteklemeli",
-"Sharing backend %s not found" => "Paylaşım arka ucu %s bulunamadı",
-"Sharing backend for %s not found" => "%s için paylaşım arka ucu bulunamadı",
-"Sharing %s failed, because the user %s is the original sharer" => "%s paylaşımı, %s kullanıcısı özgün paylaşan kişi olduğundan başarısız oldu",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "%s paylaşımı, izinler %s için verilen izinleri aştığından dolayı başarısız oldu",
-"Sharing %s failed, because resharing is not allowed" => "%s paylaşımı, tekrar paylaşımın izin verilmemesinden dolayı başarısız oldu",
-"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ı",
-"seconds ago" => "saniyeler önce",
-"_%n minute ago_::_%n minutes ago_" => array("","%n dakika önce"),
-"_%n hour ago_::_%n hours ago_" => array("","%n saat önce"),
-"today" => "bugün",
-"yesterday" => "dün",
-"_%n day go_::_%n days ago_" => array("","%n gün önce"),
-"last month" => "geçen ay",
-"_%n month ago_::_%n months ago_" => array("","%n ay önce"),
-"last year" => "geçen yıl",
-"years ago" => "yıllar önce",
-"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ı",
-"The username is already being used" => "Bu kullanıcı adı zaten kullanımda",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "Yüklü veritabanı sürücüsü (sqlite, mysql veya postgresql) yok.",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "İzinler genellikle, %sweb sunucusuna kök dizinine yazma erişimi verilerek%s çözülebilir",
-"Cannot write into \"config\" directory" => "\"config\" dizinine yazılamıyor",
-"Cannot write into \"apps\" directory" => "\"apps\" dizinine yazılamıyor",
-"This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." => "Bu genellikle, %sweb sunucusuna apps dizinine yazma erişimi verilerek%s veya yapılandırma dosyasında appstore (uygulama mağazası) devre dışı bırakılarak çözülebilir.",
-"Cannot create \"data\" directory (%s)" => "\"Veri\" dizini oluşturulamıyor (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "İzinler genellikle, <a href=\"%s\" target=\"_blank\">web sunucusuna kök dizinine yazma erişimi verilerek</a> çözülebilir.",
-"Setting locale to %s failed" => "Dili %s olarak ayarlama başarısız",
-"Please install one of these locales on your system and restart your webserver." => "Lütfen bu yerellerden birini sisteminize yükleyin ve web sunucunuzu yeniden başlatın.",
-"Please ask your server administrator to install the module." => "Lütfen modülün kurulması için sunucu yöneticinize danışın.",
-"PHP module %s not installed." => "PHP modülü %s yüklü değil.",
-"PHP %s or higher is required." => "PHP %s veya daha üst sürümü gerekli.",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "Lütfen PHP'yi en son sürüme güncellemesi için sunucu yönetinize danışın. PHP sürümünüz ownCloud ve PHP topluluğu tarafından artık desteklenmemektedir.",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Güvenli Kip (Safe Mode) etkin. ownCloud düzgün çalışabilmesi için bunun devre dışı olmasını gerektirir.",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Güvenli Kip (Safe Mode), eskimiş ve devre dışı bırakılması gereken en kullanışsız ayardır. Lütfen php.ini veya web sunucu yapılandırması içerisinde devre dışı bırakması için sunucu yöneticinize danışın.",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Sihirli Tırnaklar (Magic Quotes) etkin. ownCloud çalışabilmesi için bunun devre dışı bırakılması gerekli.",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Sihirli Tırnaklar (Magic Quotes), eskimiş ve devre dışı bırakılması gereken en kullanışsız ayardır. Lütfen php.ini veya web sunucu yapılandırması içerisinde devre dışı bırakması için sunucu yöneticinize danışın.",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP modülleri yüklü, ancak hala eksik olarak mı görünüyorlar?",
-"Please ask your server administrator to restart the web server." => "Lütfen web sunucusunu yeniden başlatması için sunucu yöneticinize danışın.",
-"PostgreSQL >= 9 required" => "PostgreSQL >= 9 gerekli",
-"Please upgrade your database version" => "Lütfen veritabanı sürümünüzü yükseltin",
-"Error occurred while checking PostgreSQL version" => "PostgreSQL sürümü denetlenirken hata oluştu",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "PostgreSQL >= 9 sürümüne sahip olduğunuzu doğrulayın veya hata hakkında daha fazla bilgi için günlükleri denetleyin",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "Lütfen izinleri 0770 ayarlayarak dizinin diğer kullanıcılar tarafından görülememesini sağlayın.",
-"Data directory (%s) is readable by other users" => "Veri dizini (%s) diğer kullanıcılar tarafından okunabilir",
-"Data directory (%s) is invalid" => "Veri dizini (%s) geçersiz",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "Lütfen veri dizininin kökünde \".ocdata\" adlı bir dosyanın bulunduğunu denetleyin.",
-"Could not obtain lock type %d on \"%s\"." => "\"%s\" üzerinde %d kilit türü alınamadı."
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/lib/l10n/tzm.js b/lib/l10n/tzm.js
new file mode 100644
index 00000000000..d0485468f71
--- /dev/null
+++ b/lib/l10n/tzm.js
@@ -0,0 +1,9 @@
+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 == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;");
diff --git a/lib/l10n/tzm.json b/lib/l10n/tzm.json
new file mode 100644
index 00000000000..73b35cf4dfa
--- /dev/null
+++ b/lib/l10n/tzm.json
@@ -0,0 +1,7 @@
+{ "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 == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/lib/l10n/tzm.php b/lib/l10n/tzm.php
deleted file mode 100644
index 3120c509265..00000000000
--- a/lib/l10n/tzm.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;";
diff --git a/lib/l10n/ug.js b/lib/l10n/ug.js
new file mode 100644
index 00000000000..977cdcab5d8
--- /dev/null
+++ b/lib/l10n/ug.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "ياردەم",
+    "Personal" : "شەخسىي",
+    "Settings" : "تەڭشەكلەر",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Authentication error" : "سالاھىيەت دەلىللەش خاتالىقى",
+    "_%n minute ago_::_%n minutes ago_" : [""],
+    "_%n hour ago_::_%n hours ago_" : [""],
+    "today" : "بۈگۈن",
+    "yesterday" : "تۈنۈگۈن",
+    "_%n day go_::_%n days ago_" : [""],
+    "_%n month ago_::_%n months ago_" : [""],
+    "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+    "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/ug.json b/lib/l10n/ug.json
new file mode 100644
index 00000000000..89719afc30a
--- /dev/null
+++ b/lib/l10n/ug.json
@@ -0,0 +1,16 @@
+{ "translations": {
+    "Help" : "ياردەم",
+    "Personal" : "شەخسىي",
+    "Settings" : "تەڭشەكلەر",
+    "Users" : "ئىشلەتكۈچىلەر",
+    "Authentication error" : "سالاھىيەت دەلىللەش خاتالىقى",
+    "_%n minute ago_::_%n minutes ago_" : [""],
+    "_%n hour ago_::_%n hours ago_" : [""],
+    "today" : "بۈگۈن",
+    "yesterday" : "تۈنۈگۈن",
+    "_%n day go_::_%n days ago_" : [""],
+    "_%n month ago_::_%n months ago_" : [""],
+    "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+    "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/ug.php b/lib/l10n/ug.php
deleted file mode 100644
index fbe24f74a15..00000000000
--- a/lib/l10n/ug.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "ياردەم",
-"Personal" => "شەخسىي",
-"Settings" => "تەڭشەكلەر",
-"Users" => "ئىشلەتكۈچىلەر",
-"Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"today" => "بۈگۈن",
-"yesterday" => "تۈنۈگۈن",
-"_%n day go_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array(""),
-"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
-"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
new file mode 100644
index 00000000000..6bc32b7f74a
--- /dev/null
+++ b/lib/l10n/uk.js
@@ -0,0 +1,54 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "Не можу писати у каталог \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Зазвичай це можна виправити, надавши веб-серверу права на запис в теці конфігурації",
+    "See %s" : "Перегляд %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Зазвичай це можна виправити, %sнадавши веб-серверу права на запис в теці конфігурації%s.",
+    "Sample configuration detected" : "Виявлено приклад конфігурації",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Була виявлена конфігурація з прикладу. Це може нашкодити вашій системі та не підтримується. Будь ласка, зверніться до документації перед внесенням змін в файл config.php",
+    "Help" : "Допомога",
+    "Personal" : "Особисте",
+    "Settings" : "Налаштування",
+    "Users" : "Користувачі",
+    "Admin" : "Адмін",
+    "Recommended" : "Рекомендуємо",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Додаток \\\"%s\\\" не встановлено через несумісність з даною версією  ownCloud.",
+    "No app name specified" : "Не вказано ім'я додатку",
+    "Unknown filetype" : "Невідомий тип файлу",
+    "Invalid image" : "Невірне зображення",
+    "web services under your control" : "підконтрольні Вам веб-сервіси",
+    "App directory already exists" : "Тека додатку вже існує",
+    "Can't create app folder. Please fix permissions. %s" : "Неможливо створити теку додатку. Будь ласка, виправте права доступу. %s",
+    "No source specified when installing app" : "Не вказано джерело при встановлені додатку",
+    "Application is not enabled" : "Додаток не увімкнений",
+    "Authentication error" : "Помилка автентифікації",
+    "Token expired. Please reload page." : "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.",
+    "%s enter the database username." : "%s введіть ім'я користувача бази даних.",
+    "%s enter the database name." : "%s введіть назву бази даних.",
+    "%s you may not use dots in the database name" : "%s не можна використовувати крапки в назві бази даних",
+    "MS SQL username and/or password not valid: %s" : "MS SQL ім'я користувача та/або пароль не дійсні: %s",
+    "You need to enter either an existing account or the administrator." : "Вам потрібно ввести або існуючий обліковий запис або administrator.",
+    "DB Error: \"%s\"" : "Помилка БД: \"%s\"",
+    "Offending command was: \"%s\"" : "Команда, що викликала проблему: \"%s\"",
+    "Oracle username and/or password not valid" : "Oracle ім'я користувача та/або пароль не дійсні",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL ім'я користувача та/або пароль не дійсні",
+    "Set an admin username." : "Встановіть ім'я адміністратора.",
+    "Set an admin password." : "Встановіть пароль адміністратора.",
+    "%s shared »%s« with you" : "%s розподілено »%s« з тобою",
+    "Could not find category \"%s\"" : "Не вдалося знайти категорію \"%s\"",
+    "seconds ago" : "секунди тому",
+    "_%n minute ago_::_%n minutes ago_" : ["","","%n хвилин тому"],
+    "_%n hour ago_::_%n hours ago_" : ["","","%n годин тому"],
+    "today" : "сьогодні",
+    "yesterday" : "вчора",
+    "_%n day go_::_%n days ago_" : ["","","%n днів тому"],
+    "last month" : "минулого місяця",
+    "_%n month ago_::_%n months ago_" : ["","","%n місяців тому"],
+    "last year" : "минулого року",
+    "years ago" : "роки тому",
+    "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
+    "A valid password must be provided" : "Потрібно задати вірний пароль"
+},
+"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/uk.json b/lib/l10n/uk.json
new file mode 100644
index 00000000000..b2f1abd486b
--- /dev/null
+++ b/lib/l10n/uk.json
@@ -0,0 +1,52 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "Не можу писати у каталог \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Зазвичай це можна виправити, надавши веб-серверу права на запис в теці конфігурації",
+    "See %s" : "Перегляд %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Зазвичай це можна виправити, %sнадавши веб-серверу права на запис в теці конфігурації%s.",
+    "Sample configuration detected" : "Виявлено приклад конфігурації",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Була виявлена конфігурація з прикладу. Це може нашкодити вашій системі та не підтримується. Будь ласка, зверніться до документації перед внесенням змін в файл config.php",
+    "Help" : "Допомога",
+    "Personal" : "Особисте",
+    "Settings" : "Налаштування",
+    "Users" : "Користувачі",
+    "Admin" : "Адмін",
+    "Recommended" : "Рекомендуємо",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Додаток \\\"%s\\\" не встановлено через несумісність з даною версією  ownCloud.",
+    "No app name specified" : "Не вказано ім'я додатку",
+    "Unknown filetype" : "Невідомий тип файлу",
+    "Invalid image" : "Невірне зображення",
+    "web services under your control" : "підконтрольні Вам веб-сервіси",
+    "App directory already exists" : "Тека додатку вже існує",
+    "Can't create app folder. Please fix permissions. %s" : "Неможливо створити теку додатку. Будь ласка, виправте права доступу. %s",
+    "No source specified when installing app" : "Не вказано джерело при встановлені додатку",
+    "Application is not enabled" : "Додаток не увімкнений",
+    "Authentication error" : "Помилка автентифікації",
+    "Token expired. Please reload page." : "Строк дії токена скінчився. Будь ласка, перезавантажте сторінку.",
+    "%s enter the database username." : "%s введіть ім'я користувача бази даних.",
+    "%s enter the database name." : "%s введіть назву бази даних.",
+    "%s you may not use dots in the database name" : "%s не можна використовувати крапки в назві бази даних",
+    "MS SQL username and/or password not valid: %s" : "MS SQL ім'я користувача та/або пароль не дійсні: %s",
+    "You need to enter either an existing account or the administrator." : "Вам потрібно ввести або існуючий обліковий запис або administrator.",
+    "DB Error: \"%s\"" : "Помилка БД: \"%s\"",
+    "Offending command was: \"%s\"" : "Команда, що викликала проблему: \"%s\"",
+    "Oracle username and/or password not valid" : "Oracle ім'я користувача та/або пароль не дійсні",
+    "Offending command was: \"%s\", name: %s, password: %s" : "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL ім'я користувача та/або пароль не дійсні",
+    "Set an admin username." : "Встановіть ім'я адміністратора.",
+    "Set an admin password." : "Встановіть пароль адміністратора.",
+    "%s shared »%s« with you" : "%s розподілено »%s« з тобою",
+    "Could not find category \"%s\"" : "Не вдалося знайти категорію \"%s\"",
+    "seconds ago" : "секунди тому",
+    "_%n minute ago_::_%n minutes ago_" : ["","","%n хвилин тому"],
+    "_%n hour ago_::_%n hours ago_" : ["","","%n годин тому"],
+    "today" : "сьогодні",
+    "yesterday" : "вчора",
+    "_%n day go_::_%n days ago_" : ["","","%n днів тому"],
+    "last month" : "минулого місяця",
+    "_%n month ago_::_%n months ago_" : ["","","%n місяців тому"],
+    "last year" : "минулого року",
+    "years ago" : "роки тому",
+    "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
+    "A valid password must be provided" : "Потрібно задати вірний пароль"
+},"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/uk.php b/lib/l10n/uk.php
deleted file mode 100644
index cf8678c40c5..00000000000
--- a/lib/l10n/uk.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "Не можу писати у каталог \"config\"!",
-"This can usually be fixed by giving the webserver write access to the config directory" => "Зазвичай це можна виправити, надавши веб-серверу права на запис в теці конфігурації",
-"See %s" => "Перегляд %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "Зазвичай це можна виправити, %sнадавши веб-серверу права на запис в теці конфігурації%s.",
-"Sample configuration detected" => "Виявлено приклад конфігурації",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "Була виявлена конфігурація з прикладу. Це може нашкодити вашій системі та не підтримується. Будь ласка, зверніться до документації перед внесенням змін в файл config.php",
-"Help" => "Допомога",
-"Personal" => "Особисте",
-"Settings" => "Налаштування",
-"Users" => "Користувачі",
-"Admin" => "Адмін",
-"Recommended" => "Рекомендуємо",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "Додаток \\\"%s\\\" не встановлено через несумісність з даною версією  ownCloud.",
-"No app name specified" => "Не вказано ім'я додатку",
-"Unknown filetype" => "Невідомий тип файлу",
-"Invalid image" => "Невірне зображення",
-"web services under your control" => "підконтрольні Вам веб-сервіси",
-"App directory already exists" => "Тека додатку вже існує",
-"Can't create app folder. Please fix permissions. %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" => "Не вказано шлях при встановлені додатку з локального файлу",
-"Archives of type %s are not supported" => "Архіви %s не підтримуються",
-"Failed to open archive when installing app" => "Неможливо відкрити архів при встановлені додатку",
-"App does not provide an info.xml file" => "Додаток не має файл info.xml",
-"App can't be installed because of not allowed code in the App" => "Неможливо встановити додаток. Він містить заборонений код",
-"App can't be installed because it is not compatible with this version of ownCloud" => "Неможливо встановити додаток, він є несумісним з даною версією ownCloud",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "Неможливо встановити додаток, оскільки він містить параметр <shipped>true</shipped> заборонений додаткам, що не входять в поставку ",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "Неможливо встановити додаток. Версія в файлі info.xml/version не співпадає з заявленою в магазині додатків",
-"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 не можна використовувати крапки в назві бази даних",
-"MS SQL username and/or password not valid: %s" => "MS SQL ім'я користувача та/або пароль не дійсні: %s",
-"You need to enter either an existing account or the administrator." => "Вам потрібно ввести або існуючий обліковий запис або administrator.",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB ім'я користувача та/або пароль не дійсні",
-"DB Error: \"%s\"" => "Помилка БД: \"%s\"",
-"Offending command was: \"%s\"" => "Команда, що викликала проблему: \"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "Користувач MySQL/MariaDB '%s'@'localhost' вже існує.",
-"Drop this user from MySQL/MariaDB" => "Видалити цього користувача з MySQL/MariaDB",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "Користувач MySQL/MariaDB '%s'@'%%' вже існує",
-"Drop this user from MySQL/MariaDB." => "Видалити цього користувача з MySQL/MariaDB.",
-"Oracle connection could not be established" => "Не можемо з'єднатися з Oracle ",
-"Oracle username and/or password not valid" => "Oracle ім'я користувача та/або пароль не дійсні",
-"Offending command was: \"%s\", name: %s, password: %s" => "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL ім'я користувача та/або пароль не дійсні",
-"Set an admin username." => "Встановіть ім'я адміністратора.",
-"Set an admin password." => "Встановіть пароль адміністратора.",
-"Can't create or write into the data directory %s" => "Неможливо створити або записати каталог даних %s",
-"%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",
-"Sharing %s failed, because the user %s is the item owner" => "Не вдалося поділитися з %s, оскільки %s вже є володарем",
-"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 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" => "Вам необхідно задати пароль для створення публічного посилання. Дозволені лише захищені посилання",
-"Sharing %s failed, because sharing with links is not allowed" => "Не вдалося поділитися %s, оскільки публічний доступ через посилання заборонений",
-"Could not find category \"%s\"" => "Не вдалося знайти категорію \"%s\"",
-"seconds ago" => "секунди тому",
-"_%n minute ago_::_%n minutes ago_" => array("","","%n хвилин тому"),
-"_%n hour ago_::_%n hours ago_" => array("","","%n годин тому"),
-"today" => "сьогодні",
-"yesterday" => "вчора",
-"_%n day go_::_%n days ago_" => array("","","%n днів тому"),
-"last month" => "минулого місяця",
-"_%n month ago_::_%n months ago_" => array("","","%n місяців тому"),
-"last year" => "минулого року",
-"years ago" => "роки тому",
-"A valid username must be provided" => "Потрібно задати вірне ім'я користувача",
-"A valid password must be provided" => "Потрібно задати вірний пароль"
-);
-$PLURAL_FORMS = "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/ur_PK.js b/lib/l10n/ur_PK.js
new file mode 100644
index 00000000000..266e0b11135
--- /dev/null
+++ b/lib/l10n/ur_PK.js
@@ -0,0 +1,23 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "مدد",
+    "Personal" : "ذاتی",
+    "Settings" : "سیٹینگز",
+    "Users" : "یوزرز",
+    "Admin" : "ایڈمن",
+    "Unknown filetype" : "غیر معرروف قسم کی فائل",
+    "Invalid image" : "غلط تصویر",
+    "web services under your control" : "آپ کے اختیار میں ویب سروسیز",
+    "seconds ago" : "سیکنڈز پہلے",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n منٹس پہلے"],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "آج",
+    "yesterday" : "کل",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "پچھلے مہنیے",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "پچھلے سال",
+    "years ago" : "سالوں پہلے"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/lib/l10n/ur_PK.json b/lib/l10n/ur_PK.json
new file mode 100644
index 00000000000..f00429f3432
--- /dev/null
+++ b/lib/l10n/ur_PK.json
@@ -0,0 +1,21 @@
+{ "translations": {
+    "Help" : "مدد",
+    "Personal" : "ذاتی",
+    "Settings" : "سیٹینگز",
+    "Users" : "یوزرز",
+    "Admin" : "ایڈمن",
+    "Unknown filetype" : "غیر معرروف قسم کی فائل",
+    "Invalid image" : "غلط تصویر",
+    "web services under your control" : "آپ کے اختیار میں ویب سروسیز",
+    "seconds ago" : "سیکنڈز پہلے",
+    "_%n minute ago_::_%n minutes ago_" : ["","%n منٹس پہلے"],
+    "_%n hour ago_::_%n hours ago_" : ["",""],
+    "today" : "آج",
+    "yesterday" : "کل",
+    "_%n day go_::_%n days ago_" : ["",""],
+    "last month" : "پچھلے مہنیے",
+    "_%n month ago_::_%n months ago_" : ["",""],
+    "last year" : "پچھلے سال",
+    "years ago" : "سالوں پہلے"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/lib/l10n/ur_PK.php b/lib/l10n/ur_PK.php
deleted file mode 100644
index 458414e9da2..00000000000
--- a/lib/l10n/ur_PK.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "مدد",
-"Personal" => "ذاتی",
-"Settings" => "سیٹینگز",
-"Users" => "یوزرز",
-"Admin" => "ایڈمن",
-"Unknown filetype" => "غیر معرروف قسم کی فائل",
-"Invalid image" => "غلط تصویر",
-"web services under your control" => "آپ کے اختیار میں ویب سروسیز",
-"seconds ago" => "سیکنڈز پہلے",
-"_%n minute ago_::_%n minutes ago_" => array("","%n منٹس پہلے"),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"today" => "آج",
-"yesterday" => "کل",
-"_%n day go_::_%n days ago_" => array("",""),
-"last month" => "پچھلے مہنیے",
-"_%n month ago_::_%n months ago_" => array("",""),
-"last year" => "پچھلے سال",
-"years ago" => "سالوں پہلے"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/uz.js b/lib/l10n/uz.js
new file mode 100644
index 00000000000..0f4a002019e
--- /dev/null
+++ b/lib/l10n/uz.js
@@ -0,0 +1,9 @@
+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=1; plural=0;");
diff --git a/lib/l10n/uz.json b/lib/l10n/uz.json
new file mode 100644
index 00000000000..4a03cf5047e
--- /dev/null
+++ b/lib/l10n/uz.json
@@ -0,0 +1,7 @@
+{ "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=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/uz.php b/lib/l10n/uz.php
deleted file mode 100644
index e7b09649a24..00000000000
--- a/lib/l10n/uz.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array(""),
-"_%n hour ago_::_%n hours ago_" => array(""),
-"_%n day go_::_%n days ago_" => array(""),
-"_%n month ago_::_%n months ago_" => array("")
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/vi.js b/lib/l10n/vi.js
new file mode 100644
index 00000000000..7cb2deb0629
--- /dev/null
+++ b/lib/l10n/vi.js
@@ -0,0 +1,28 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "Giúp đỡ",
+    "Personal" : "Cá nhân",
+    "Settings" : "Cài đặt",
+    "Users" : "Người dùng",
+    "Admin" : "Quản trị",
+    "Unknown filetype" : "Không biết kiểu tập tin",
+    "Invalid image" : "Hình ảnh không hợp lệ",
+    "web services under your control" : "dịch vụ web dưới sự kiểm soát của bạn",
+    "Application is not enabled" : "Ứng dụng không được BẬT",
+    "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\"",
+    "seconds ago" : "vài giây trước",
+    "_%n minute ago_::_%n minutes ago_" : ["%n phút trước"],
+    "_%n hour ago_::_%n hours ago_" : ["%n giờ trước"],
+    "today" : "hôm nay",
+    "yesterday" : "hôm qua",
+    "_%n day go_::_%n days ago_" : ["%n ngày trước"],
+    "last month" : "tháng trước",
+    "_%n month ago_::_%n months ago_" : ["%n tháng trước"],
+    "last year" : "năm trước",
+    "years ago" : "năm trước"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/vi.json b/lib/l10n/vi.json
new file mode 100644
index 00000000000..434c1b8a67b
--- /dev/null
+++ b/lib/l10n/vi.json
@@ -0,0 +1,26 @@
+{ "translations": {
+    "Help" : "Giúp đỡ",
+    "Personal" : "Cá nhân",
+    "Settings" : "Cài đặt",
+    "Users" : "Người dùng",
+    "Admin" : "Quản trị",
+    "Unknown filetype" : "Không biết kiểu tập tin",
+    "Invalid image" : "Hình ảnh không hợp lệ",
+    "web services under your control" : "dịch vụ web dưới sự kiểm soát của bạn",
+    "Application is not enabled" : "Ứng dụng không được BẬT",
+    "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\"",
+    "seconds ago" : "vài giây trước",
+    "_%n minute ago_::_%n minutes ago_" : ["%n phút trước"],
+    "_%n hour ago_::_%n hours ago_" : ["%n giờ trước"],
+    "today" : "hôm nay",
+    "yesterday" : "hôm qua",
+    "_%n day go_::_%n days ago_" : ["%n ngày trước"],
+    "last month" : "tháng trước",
+    "_%n month ago_::_%n months ago_" : ["%n tháng trước"],
+    "last year" : "năm trước",
+    "years ago" : "năm trước"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
deleted file mode 100644
index 0d460a41ed3..00000000000
--- a/lib/l10n/vi.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "Giúp đỡ",
-"Personal" => "Cá nhân",
-"Settings" => "Cài đặt",
-"Users" => "Người dùng",
-"Admin" => "Quản trị",
-"Unknown filetype" => "Không biết kiểu tập tin",
-"Invalid image" => "Hình ảnh không hợp lệ",
-"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn",
-"Application is not enabled" => "Ứng dụng không được BẬT",
-"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\"",
-"seconds ago" => "vài giây trước",
-"_%n minute ago_::_%n minutes ago_" => array("%n phút trước"),
-"_%n hour ago_::_%n hours ago_" => array("%n giờ trước"),
-"today" => "hôm nay",
-"yesterday" => "hôm qua",
-"_%n day go_::_%n days ago_" => array("%n ngày trước"),
-"last month" => "tháng trước",
-"_%n month ago_::_%n months ago_" => array("%n tháng trước"),
-"last year" => "năm trước",
-"years ago" => "năm trước"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_CN.js b/lib/l10n/zh_CN.js
new file mode 100644
index 00000000000..54d9afc315b
--- /dev/null
+++ b/lib/l10n/zh_CN.js
@@ -0,0 +1,108 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "无法写入“config”目录！",
+    "See %s" : "查看 %s",
+    "Help" : "帮助",
+    "Personal" : "个人",
+    "Settings" : "设置",
+    "Users" : "用户",
+    "Admin" : "管理",
+    "No app name specified" : "没有指定的 App 名称",
+    "Unknown filetype" : "未知的文件类型",
+    "Invalid image" : "无效的图像",
+    "web services under your control" : "您控制的网络服务",
+    "App directory already exists" : "应用程序目录已存在",
+    "Can't create app folder. Please fix permissions. %s" : "无法创建应用程序文件夹。请修正权限。%s",
+    "No source specified when installing app" : "安装 App 时未指定来源",
+    "No href specified when installing app from http" : "从 http 安装 App 时未指定链接",
+    "No path specified when installing app from local file" : "从本地文件安装 App 时未指定路径",
+    "Archives of type %s are not supported" : "不支持 %s 的压缩格式",
+    "Failed to open archive when installing app" : "安装 App 是打开归档失败",
+    "App does not provide an info.xml file" : "应用未提供 info.xml 文件",
+    "App can't be installed because of not allowed code in the App" : "App 无法安装，因为 App 中有非法代码 ",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "App 无法安装，因为和当前 ownCloud 版本不兼容",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App 无法安装，因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同",
+    "Application is not enabled" : "应用程序未启用",
+    "Authentication error" : "认证出错",
+    "Token expired. Please reload page." : "Token 过期，请刷新页面。",
+    "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 您不能在数据库名称中使用英文句号。",
+    "MS SQL username and/or password not valid: %s" : "MS SQL 用户名和/或密码无效：%s",
+    "You need to enter either an existing account or the administrator." : "你需要输入一个数据库中已有的账户或管理员账户。",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB 数据库用户名和/或密码无效",
+    "DB Error: \"%s\"" : "数据库错误：\"%s\"",
+    "Offending command was: \"%s\"" : "冲突命令为：\"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB 用户 '%s'@'localhost' 已存在。",
+    "Drop this user from MySQL/MariaDB" : "建议从 MySQL/MariaDB 数据库中删除此用户",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB 用户 '%s'@'%%' 已存在",
+    "Drop this user from MySQL/MariaDB." : "建议从 MySQL/MariaDB 数据库中删除此用户。",
+    "Oracle connection could not be established" : "不能建立甲骨文连接",
+    "Oracle username and/or password not valid" : "Oracle 数据库用户名和/或密码无效",
+    "Offending command was: \"%s\", name: %s, password: %s" : "冲突命令为：\"%s\"，名称：%s，密码：%s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL 数据库用户名和/或密码无效",
+    "Set an admin username." : "请设置一个管理员用户名。",
+    "Set an admin password." : "请设置一个管理员密码。",
+    "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "共享 %s 失败，因为用户 %s 是对象的拥有者",
+    "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 the group %s does not exist" : "共享 %s 失败，因为 %s 组不存在",
+    "Sharing %s failed, because %s is not a member of the group %s" : "共享 %s 失败，因为 %s 不是 %s 组的成员",
+    "Sharing %s failed, because sharing with links is not allowed" : "共享 %s 失败，因为不允许用链接共享",
+    "Share type %s is not valid for %s" : "%s 不是 %s 的合法共享类型",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "设置 %s 权限失败，因为权限超出了 %s 已有权限。",
+    "Setting permissions for %s failed, because the item was not found" : "设置 %s 的权限失败，因为未找到到对应项",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "共享后端 %s 必须实现 OCP\\Share_Backend 接口",
+    "Sharing backend %s not found" : "未找到共享后端 %s",
+    "Sharing backend for %s not found" : "%s 的共享后端未找到",
+    "Sharing %s failed, because the user %s is the original sharer" : "共享 %s 失败，因为用户 %s 不是原始共享者",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "共享 %s 失败，因为权限超过了 %s 已有权限",
+    "Sharing %s failed, because resharing is not allowed" : "共享 %s 失败，因为不允许二次共享",
+    "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\"",
+    "seconds ago" : "秒前",
+    "_%n minute ago_::_%n minutes ago_" : ["%n 分钟前"],
+    "_%n hour ago_::_%n hours ago_" : ["%n 小时前"],
+    "today" : "今天",
+    "yesterday" : "昨天",
+    "_%n day go_::_%n days ago_" : ["%n 天前"],
+    "last month" : "上月",
+    "_%n month ago_::_%n months ago_" : ["%n 月前"],
+    "last year" : "去年",
+    "years ago" : "年前",
+    "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" : "必须提供合法的密码",
+    "The username is already being used" : "用户名已被使用",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "没有安装数据库驱动 (SQLite、MySQL 或 PostgreSQL)。",
+    "Cannot write into \"config\" directory" : "无法写入“config”目录",
+    "Cannot write into \"apps\" directory" : "无法写入“apps”目录",
+    "Cannot create \"data\" directory (%s)" : "无法创建“apps”目录 (%s)",
+    "Setting locale to %s failed" : "设置语言为 %s 失败",
+    "Please ask your server administrator to install the module." : "请联系服务器管理员安装模块。",
+    "PHP module %s not installed." : "PHP %s 模块未安装。",
+    "PHP %s or higher is required." : "要求 PHP 版本 %s 或者更高。",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "请联系服务器管理员升级 PHP 到最新的版本。ownCloud 和 PHP 社区已经不再支持此版本的 PHP。",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode 已经启用，ownCloud 需要 Safe Mode 停用以正常工作。",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Safe Mode。",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes 已经启用，ownCloud 需要 Magic Quotes 停用以正常工作。",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Magic Quotes。",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP 模块已经安装，但仍然显示未安装？",
+    "Please ask your server administrator to restart the web server." : "请联系服务器管理员重启网页服务器。",
+    "PostgreSQL >= 9 required" : "要求 PostgreSQL >= 9",
+    "Please upgrade your database version" : "请升级您的数据库版本",
+    "Error occurred while checking PostgreSQL version" : "检查 PostgreSQL 版本时发生了一个错误",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "请更改权限为 0770 以避免其他用户查看目录。",
+    "Data directory (%s) is readable by other users" : "文件目录 (%s) 可以被其他用户读取",
+    "Data directory (%s) is invalid" : "文件目录 (%s) 无效",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "请确保文件根目录下包含有一个名为“.ocdata”的文件。"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/zh_CN.json b/lib/l10n/zh_CN.json
new file mode 100644
index 00000000000..3168f94af58
--- /dev/null
+++ b/lib/l10n/zh_CN.json
@@ -0,0 +1,106 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "无法写入“config”目录！",
+    "See %s" : "查看 %s",
+    "Help" : "帮助",
+    "Personal" : "个人",
+    "Settings" : "设置",
+    "Users" : "用户",
+    "Admin" : "管理",
+    "No app name specified" : "没有指定的 App 名称",
+    "Unknown filetype" : "未知的文件类型",
+    "Invalid image" : "无效的图像",
+    "web services under your control" : "您控制的网络服务",
+    "App directory already exists" : "应用程序目录已存在",
+    "Can't create app folder. Please fix permissions. %s" : "无法创建应用程序文件夹。请修正权限。%s",
+    "No source specified when installing app" : "安装 App 时未指定来源",
+    "No href specified when installing app from http" : "从 http 安装 App 时未指定链接",
+    "No path specified when installing app from local file" : "从本地文件安装 App 时未指定路径",
+    "Archives of type %s are not supported" : "不支持 %s 的压缩格式",
+    "Failed to open archive when installing app" : "安装 App 是打开归档失败",
+    "App does not provide an info.xml file" : "应用未提供 info.xml 文件",
+    "App can't be installed because of not allowed code in the App" : "App 无法安装，因为 App 中有非法代码 ",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "App 无法安装，因为和当前 ownCloud 版本不兼容",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "App 无法安装，因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同",
+    "Application is not enabled" : "应用程序未启用",
+    "Authentication error" : "认证出错",
+    "Token expired. Please reload page." : "Token 过期，请刷新页面。",
+    "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 您不能在数据库名称中使用英文句号。",
+    "MS SQL username and/or password not valid: %s" : "MS SQL 用户名和/或密码无效：%s",
+    "You need to enter either an existing account or the administrator." : "你需要输入一个数据库中已有的账户或管理员账户。",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB 数据库用户名和/或密码无效",
+    "DB Error: \"%s\"" : "数据库错误：\"%s\"",
+    "Offending command was: \"%s\"" : "冲突命令为：\"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB 用户 '%s'@'localhost' 已存在。",
+    "Drop this user from MySQL/MariaDB" : "建议从 MySQL/MariaDB 数据库中删除此用户",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB 用户 '%s'@'%%' 已存在",
+    "Drop this user from MySQL/MariaDB." : "建议从 MySQL/MariaDB 数据库中删除此用户。",
+    "Oracle connection could not be established" : "不能建立甲骨文连接",
+    "Oracle username and/or password not valid" : "Oracle 数据库用户名和/或密码无效",
+    "Offending command was: \"%s\", name: %s, password: %s" : "冲突命令为：\"%s\"，名称：%s，密码：%s",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL 数据库用户名和/或密码无效",
+    "Set an admin username." : "请设置一个管理员用户名。",
+    "Set an admin password." : "请设置一个管理员密码。",
+    "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "共享 %s 失败，因为用户 %s 是对象的拥有者",
+    "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 the group %s does not exist" : "共享 %s 失败，因为 %s 组不存在",
+    "Sharing %s failed, because %s is not a member of the group %s" : "共享 %s 失败，因为 %s 不是 %s 组的成员",
+    "Sharing %s failed, because sharing with links is not allowed" : "共享 %s 失败，因为不允许用链接共享",
+    "Share type %s is not valid for %s" : "%s 不是 %s 的合法共享类型",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "设置 %s 权限失败，因为权限超出了 %s 已有权限。",
+    "Setting permissions for %s failed, because the item was not found" : "设置 %s 的权限失败，因为未找到到对应项",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "共享后端 %s 必须实现 OCP\\Share_Backend 接口",
+    "Sharing backend %s not found" : "未找到共享后端 %s",
+    "Sharing backend for %s not found" : "%s 的共享后端未找到",
+    "Sharing %s failed, because the user %s is the original sharer" : "共享 %s 失败，因为用户 %s 不是原始共享者",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "共享 %s 失败，因为权限超过了 %s 已有权限",
+    "Sharing %s failed, because resharing is not allowed" : "共享 %s 失败，因为不允许二次共享",
+    "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\"",
+    "seconds ago" : "秒前",
+    "_%n minute ago_::_%n minutes ago_" : ["%n 分钟前"],
+    "_%n hour ago_::_%n hours ago_" : ["%n 小时前"],
+    "today" : "今天",
+    "yesterday" : "昨天",
+    "_%n day go_::_%n days ago_" : ["%n 天前"],
+    "last month" : "上月",
+    "_%n month ago_::_%n months ago_" : ["%n 月前"],
+    "last year" : "去年",
+    "years ago" : "年前",
+    "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" : "必须提供合法的密码",
+    "The username is already being used" : "用户名已被使用",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "没有安装数据库驱动 (SQLite、MySQL 或 PostgreSQL)。",
+    "Cannot write into \"config\" directory" : "无法写入“config”目录",
+    "Cannot write into \"apps\" directory" : "无法写入“apps”目录",
+    "Cannot create \"data\" directory (%s)" : "无法创建“apps”目录 (%s)",
+    "Setting locale to %s failed" : "设置语言为 %s 失败",
+    "Please ask your server administrator to install the module." : "请联系服务器管理员安装模块。",
+    "PHP module %s not installed." : "PHP %s 模块未安装。",
+    "PHP %s or higher is required." : "要求 PHP 版本 %s 或者更高。",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "请联系服务器管理员升级 PHP 到最新的版本。ownCloud 和 PHP 社区已经不再支持此版本的 PHP。",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode 已经启用，ownCloud 需要 Safe Mode 停用以正常工作。",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Safe Mode。",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes 已经启用，ownCloud 需要 Magic Quotes 停用以正常工作。",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Magic Quotes。",
+    "PHP modules have been installed, but they are still listed as missing?" : "PHP 模块已经安装，但仍然显示未安装？",
+    "Please ask your server administrator to restart the web server." : "请联系服务器管理员重启网页服务器。",
+    "PostgreSQL >= 9 required" : "要求 PostgreSQL >= 9",
+    "Please upgrade your database version" : "请升级您的数据库版本",
+    "Error occurred while checking PostgreSQL version" : "检查 PostgreSQL 版本时发生了一个错误",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "请更改权限为 0770 以避免其他用户查看目录。",
+    "Data directory (%s) is readable by other users" : "文件目录 (%s) 可以被其他用户读取",
+    "Data directory (%s) is invalid" : "文件目录 (%s) 无效",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "请确保文件根目录下包含有一个名为“.ocdata”的文件。"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
deleted file mode 100644
index ce6fdf5ac1a..00000000000
--- a/lib/l10n/zh_CN.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "无法写入“config”目录！",
-"See %s" => "查看 %s",
-"Help" => "帮助",
-"Personal" => "个人",
-"Settings" => "设置",
-"Users" => "用户",
-"Admin" => "管理",
-"No app name specified" => "没有指定的 App 名称",
-"Unknown filetype" => "未知的文件类型",
-"Invalid image" => "无效的图像",
-"web services under your control" => "您控制的网络服务",
-"App directory already exists" => "应用程序目录已存在",
-"Can't create app folder. Please fix permissions. %s" => "无法创建应用程序文件夹。请修正权限。%s",
-"No source specified when installing app" => "安装 App 时未指定来源",
-"No href specified when installing app from http" => "从 http 安装 App 时未指定链接",
-"No path specified when installing app from local file" => "从本地文件安装 App 时未指定路径",
-"Archives of type %s are not supported" => "不支持 %s 的压缩格式",
-"Failed to open archive when installing app" => "安装 App 是打开归档失败",
-"App does not provide an info.xml file" => "应用未提供 info.xml 文件",
-"App can't be installed because of not allowed code in the App" => "App 无法安装，因为 App 中有非法代码 ",
-"App can't be installed because it is not compatible with this version of ownCloud" => "App 无法安装，因为和当前 ownCloud 版本不兼容",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "App 无法安装，因为 App 包含不允许在非内置 App 中使用的 <shipped>true</shipped> 标签",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "App 无法安装因为 info.xml/version 中的版本和 App 商店版本不同",
-"Application is not enabled" => "应用程序未启用",
-"Authentication error" => "认证出错",
-"Token expired. Please reload page." => "Token 过期，请刷新页面。",
-"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 您不能在数据库名称中使用英文句号。",
-"MS SQL username and/or password not valid: %s" => "MS SQL 用户名和/或密码无效：%s",
-"You need to enter either an existing account or the administrator." => "你需要输入一个数据库中已有的账户或管理员账户。",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB 数据库用户名和/或密码无效",
-"DB Error: \"%s\"" => "数据库错误：\"%s\"",
-"Offending command was: \"%s\"" => "冲突命令为：\"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB 用户 '%s'@'localhost' 已存在。",
-"Drop this user from MySQL/MariaDB" => "建议从 MySQL/MariaDB 数据库中删除此用户",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB 用户 '%s'@'%%' 已存在",
-"Drop this user from MySQL/MariaDB." => "建议从 MySQL/MariaDB 数据库中删除此用户。",
-"Oracle connection could not be established" => "不能建立甲骨文连接",
-"Oracle username and/or password not valid" => "Oracle 数据库用户名和/或密码无效",
-"Offending command was: \"%s\", name: %s, password: %s" => "冲突命令为：\"%s\"，名称：%s，密码：%s",
-"PostgreSQL username and/or password not valid" => "PostgreSQL 数据库用户名和/或密码无效",
-"Set an admin username." => "请设置一个管理员用户名。",
-"Set an admin password." => "请设置一个管理员密码。",
-"%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",
-"Sharing %s failed, because the user %s is the item owner" => "共享 %s 失败，因为用户 %s 是对象的拥有者",
-"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 the group %s does not exist" => "共享 %s 失败，因为 %s 组不存在",
-"Sharing %s failed, because %s is not a member of the group %s" => "共享 %s 失败，因为 %s 不是 %s 组的成员",
-"Sharing %s failed, because sharing with links is not allowed" => "共享 %s 失败，因为不允许用链接共享",
-"Share type %s is not valid for %s" => "%s 不是 %s 的合法共享类型",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "设置 %s 权限失败，因为权限超出了 %s 已有权限。",
-"Setting permissions for %s failed, because the item was not found" => "设置 %s 的权限失败，因为未找到到对应项",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "共享后端 %s 必须实现 OCP\\Share_Backend 接口",
-"Sharing backend %s not found" => "未找到共享后端 %s",
-"Sharing backend for %s not found" => "%s 的共享后端未找到",
-"Sharing %s failed, because the user %s is the original sharer" => "共享 %s 失败，因为用户 %s 不是原始共享者",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "共享 %s 失败，因为权限超过了 %s 已有权限",
-"Sharing %s failed, because resharing is not allowed" => "共享 %s 失败，因为不允许二次共享",
-"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\"",
-"seconds ago" => "秒前",
-"_%n minute ago_::_%n minutes ago_" => array("%n 分钟前"),
-"_%n hour ago_::_%n hours ago_" => array("%n 小时前"),
-"today" => "今天",
-"yesterday" => "昨天",
-"_%n day go_::_%n days ago_" => array("%n 天前"),
-"last month" => "上月",
-"_%n month ago_::_%n months ago_" => array("%n 月前"),
-"last year" => "去年",
-"years ago" => "年前",
-"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" => "必须提供合法的密码",
-"The username is already being used" => "用户名已被使用",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "没有安装数据库驱动 (SQLite、MySQL 或 PostgreSQL)。",
-"Cannot write into \"config\" directory" => "无法写入“config”目录",
-"Cannot write into \"apps\" directory" => "无法写入“apps”目录",
-"Cannot create \"data\" directory (%s)" => "无法创建“apps”目录 (%s)",
-"Setting locale to %s failed" => "设置语言为 %s 失败",
-"Please ask your server administrator to install the module." => "请联系服务器管理员安装模块。",
-"PHP module %s not installed." => "PHP %s 模块未安装。",
-"PHP %s or higher is required." => "要求 PHP 版本 %s 或者更高。",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "请联系服务器管理员升级 PHP 到最新的版本。ownCloud 和 PHP 社区已经不再支持此版本的 PHP。",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP Safe Mode 已经启用，ownCloud 需要 Safe Mode 停用以正常工作。",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP Safe Mode 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Safe Mode。",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes 已经启用，ownCloud 需要 Magic Quotes 停用以正常工作。",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes 已经被废弃并且应当被停用。请联系服务器管理员在 php.ini 或您的服务器设置中停用 Magic Quotes。",
-"PHP modules have been installed, but they are still listed as missing?" => "PHP 模块已经安装，但仍然显示未安装？",
-"Please ask your server administrator to restart the web server." => "请联系服务器管理员重启网页服务器。",
-"PostgreSQL >= 9 required" => "要求 PostgreSQL >= 9",
-"Please upgrade your database version" => "请升级您的数据库版本",
-"Error occurred while checking PostgreSQL version" => "检查 PostgreSQL 版本时发生了一个错误",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "请更改权限为 0770 以避免其他用户查看目录。",
-"Data directory (%s) is readable by other users" => "文件目录 (%s) 可以被其他用户读取",
-"Data directory (%s) is invalid" => "文件目录 (%s) 无效",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "请确保文件根目录下包含有一个名为“.ocdata”的文件。"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_HK.js b/lib/l10n/zh_HK.js
new file mode 100644
index 00000000000..7cef6525bc2
--- /dev/null
+++ b/lib/l10n/zh_HK.js
@@ -0,0 +1,20 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Help" : "幫助",
+    "Personal" : "個人",
+    "Settings" : "設定",
+    "Users" : "用戶",
+    "Admin" : "管理",
+    "seconds ago" : "秒前",
+    "_%n minute ago_::_%n minutes ago_" : ["%n 分鐘前"],
+    "_%n hour ago_::_%n hours ago_" : ["%n 小時前"],
+    "today" : "今日",
+    "yesterday" : "昨日",
+    "_%n day go_::_%n days ago_" : ["%n 日前"],
+    "last month" : "前一月",
+    "_%n month ago_::_%n months ago_" : ["%n 月前"],
+    "last year" : "上年",
+    "years ago" : "年前"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/zh_HK.json b/lib/l10n/zh_HK.json
new file mode 100644
index 00000000000..856b288a6b9
--- /dev/null
+++ b/lib/l10n/zh_HK.json
@@ -0,0 +1,18 @@
+{ "translations": {
+    "Help" : "幫助",
+    "Personal" : "個人",
+    "Settings" : "設定",
+    "Users" : "用戶",
+    "Admin" : "管理",
+    "seconds ago" : "秒前",
+    "_%n minute ago_::_%n minutes ago_" : ["%n 分鐘前"],
+    "_%n hour ago_::_%n hours ago_" : ["%n 小時前"],
+    "today" : "今日",
+    "yesterday" : "昨日",
+    "_%n day go_::_%n days ago_" : ["%n 日前"],
+    "last month" : "前一月",
+    "_%n month ago_::_%n months ago_" : ["%n 月前"],
+    "last year" : "上年",
+    "years ago" : "年前"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/zh_HK.php b/lib/l10n/zh_HK.php
deleted file mode 100644
index 75085e02ae3..00000000000
--- a/lib/l10n/zh_HK.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Help" => "幫助",
-"Personal" => "個人",
-"Settings" => "設定",
-"Users" => "用戶",
-"Admin" => "管理",
-"seconds ago" => "秒前",
-"_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"),
-"_%n hour ago_::_%n hours ago_" => array("%n 小時前"),
-"today" => "今日",
-"yesterday" => "昨日",
-"_%n day go_::_%n days ago_" => array("%n 日前"),
-"last month" => "前一月",
-"_%n month ago_::_%n months ago_" => array("%n 月前"),
-"last year" => "上年",
-"years ago" => "年前"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/lib/l10n/zh_TW.js b/lib/l10n/zh_TW.js
new file mode 100644
index 00000000000..ffb82213e7d
--- /dev/null
+++ b/lib/l10n/zh_TW.js
@@ -0,0 +1,123 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Cannot write into \"config\" directory!" : "無法寫入 config 目錄！",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "允許網頁伺服器寫入設定目錄通常可以解決這個問題",
+    "See %s" : "見 %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "%s允許網頁伺服器寫入設定目錄%s通常可以解決這個問題",
+    "Sample configuration detected" : "偵測到範本設定",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "看來您直接複製了範本設定來使用，這可能會毀掉你的安裝，請閱讀說明文件後對 config.php 進行適當的修改",
+    "Help" : "說明",
+    "Personal" : "個人",
+    "Settings" : "設定",
+    "Users" : "使用者",
+    "Admin" : "管理",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。",
+    "No app name specified" : "沒有指定應用程式名稱",
+    "Unknown filetype" : "未知的檔案類型",
+    "Invalid image" : "無效的圖片",
+    "web services under your control" : "由您控制的網路服務",
+    "App directory already exists" : "應用程式目錄已經存在",
+    "Can't create app folder. Please fix permissions. %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" : "從本地檔案安裝應用程式時沒有指定路徑",
+    "Archives of type %s are not supported" : "不支援 %s 格式的壓縮檔",
+    "Failed to open archive when installing app" : "安裝應用程式時無法開啓壓縮檔",
+    "App does not provide an info.xml file" : "應用程式沒有提供 info.xml 檔案",
+    "App can't be installed because of not allowed code in the App" : "無法安裝應用程式因為在當中找到危險的代碼",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "無法安裝應用程式因為它和此版本的 ownCloud 不相容。",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "無法安裝應用程式，因為它包含了 <shipped>true</shipped> 標籤，在未發行的應用程式當中這是不允許的",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "無法安裝應用程式，因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同",
+    "Application is not enabled" : "應用程式未啟用",
+    "Authentication error" : "認證錯誤",
+    "Token expired. Please reload page." : "Token 過期，請重新整理頁面。",
+    "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 資料庫名稱不能包含小數點",
+    "MS SQL username and/or password not valid: %s" : "MS SQL 使用者和/或密碼無效：%s",
+    "You need to enter either an existing account or the administrator." : "您必須輸入一個現有的帳號或管理員帳號。",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB 使用者或密碼不正確",
+    "DB Error: \"%s\"" : "資料庫錯誤：\"%s\"",
+    "Offending command was: \"%s\"" : "有問題的指令是：\"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB 使用者 '%s'@'localhost' 已經存在",
+    "Drop this user from MySQL/MariaDB" : "自 MySQL/MariaDB 刪除這個使用者",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB 使用者 '%s'@'%%' 已經存在",
+    "Drop this user from MySQL/MariaDB." : "自 MySQL/MariaDB 刪除這個使用者",
+    "Oracle connection could not be established" : "無法建立 Oracle 資料庫連線",
+    "Oracle username and/or password not valid" : "Oracle 用戶名和/或密碼無效",
+    "Offending command was: \"%s\", name: %s, password: %s" : "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL 用戶名和/或密碼無效",
+    "Set an admin username." : "設定管理員帳號。",
+    "Set an admin password." : "設定管理員密碼。",
+    "Can't create or write into the data directory %s" : "無法建立或寫入資料目錄 %s",
+    "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "分享 %s 失敗，因為 %s 才是此項目的擁有者",
+    "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 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" : "您必須為公開連結設定一組密碼，我們只允許受密碼保護的連結",
+    "Sharing %s failed, because sharing with links is not allowed" : "分享 %s 失敗，因為目前不允許使用連結分享",
+    "Share type %s is not valid for %s" : "分享類型 %s 對於 %s 來說無效",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "為 %s 設定權限失敗，因為欲設定的權限超出開放給 %s 的範圍",
+    "Setting permissions for %s failed, because the item was not found" : "為 %s 設定權限失敗，因為找不到該項目",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "無法設定到期日，在分享之後，到期日不能設定為 %s 之後",
+    "Cannot set expiration date. Expiration date is in the past" : "無法設定過去的日期為到期日",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "分享後端 %s 必須實作 OCP\\Share_Backend interface",
+    "Sharing backend %s not found" : "找不到分享後端 %s",
+    "Sharing backend for %s not found" : "找不到 %s 的分享後端",
+    "Sharing %s failed, because the user %s is the original sharer" : "分享 %s 失敗，因為使用者 %s 即是原本的分享者",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "分享 %s 失敗，因為權限設定超出了授權給 %s 的範圍",
+    "Sharing %s failed, because resharing is not allowed" : "分享 %s 失敗，不允許重複分享",
+    "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\"",
+    "seconds ago" : "幾秒前",
+    "_%n minute ago_::_%n minutes ago_" : ["%n 分鐘前"],
+    "_%n hour ago_::_%n hours ago_" : ["%n 小時前"],
+    "today" : "今天",
+    "yesterday" : "昨天",
+    "_%n day go_::_%n days ago_" : ["%n 天前"],
+    "last month" : "上個月",
+    "_%n month ago_::_%n months ago_" : ["%n 個月前"],
+    "last year" : "去年",
+    "years ago" : "幾年前",
+    "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" : "一定要提供一個有效的密碼",
+    "The username is already being used" : "這個使用者名稱已經有人使用了",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "通常藉由%s開放網頁伺服器對根目錄的權限%s就可以修正權限問題",
+    "Cannot write into \"config\" directory" : "無法寫入 config 目錄",
+    "Cannot write into \"apps\" directory" : "無法寫入 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." : "通常藉由%s開放網頁伺服器對 apps 目錄的權限%s或是在設定檔中關閉 appstore 就可以修正這個問題",
+    "Cannot create \"data\" directory (%s)" : "無法建立 data 目錄 (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "通常藉由<a href=\"%s\" target=\"_blank\">開放網頁伺服器對根目錄的權限</a>就可以修正權限問題",
+    "Setting locale to %s failed" : "設定語系為 %s 失敗",
+    "Please install one of these locales on your system and restart your webserver." : "請在系統中安裝這些語系的其中一個，然後重啓網頁伺服器",
+    "Please ask your server administrator to install the module." : "請詢問系統管理員來安裝這些模組",
+    "PHP module %s not installed." : "未安裝 PHP 模組 %s",
+    "PHP %s or higher is required." : "需要 PHP %s 或更高版本",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "請詢問系統管理員將 PHP 升級至最新版，目前的 PHP 版本已經不再被 ownCloud 和 PHP 社群支援",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP 安全模式已經啟動，ownCloud 需要您將它關閉才能正常運作",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP 安全模式已經被棄用，並且在大多數狀況下無助於提升安全性，它應該被關閉。請詢問系統管理員將其在 php.ini 或網頁伺服器當中關閉。",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes 已經被啟用，ownCloud 需要您將其關閉以正常運作",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes 功能在大多數狀況下不會使用到，已經被上游棄用，因此它應該被停用。請詢問系統管理員將其在 php.ini 或網頁伺服器當中停用。",
+    "PHP modules have been installed, but they are still listed as missing?" : "你已經安裝了指定的 PHP 模組，可是還是顯示為找不到嗎？",
+    "Please ask your server administrator to restart the web server." : "請聯絡您的系統管理員重新啟動網頁伺服器",
+    "PostgreSQL >= 9 required" : "需要 PostgreSQL 版本 >= 9",
+    "Please upgrade your database version" : "請升級您的資料庫版本",
+    "Error occurred while checking PostgreSQL version" : "檢查 PostgreSQL 版本時發生錯誤",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "請確定您的 PostgreSQL 版本 >= 9，或是看看記錄檔是否有更詳細的訊息",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ，以免其他使用者讀取",
+    "Data directory (%s) is readable by other users" : "資料目錄 (%s) 可以被其他使用者讀取",
+    "Data directory (%s) is invalid" : "資料目錄 (%s) 無效",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "請確保資料目錄當中包含一個 .ocdata 的檔案",
+    "Could not obtain lock type %d on \"%s\"." : "無法取得鎖定：類型 %d ，檔案 %s"
+},
+"nplurals=1; plural=0;");
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
new file mode 100644
index 00000000000..6c6b572dd50
--- /dev/null
+++ b/lib/l10n/zh_TW.json
@@ -0,0 +1,121 @@
+{ "translations": {
+    "Cannot write into \"config\" directory!" : "無法寫入 config 目錄！",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "允許網頁伺服器寫入設定目錄通常可以解決這個問題",
+    "See %s" : "見 %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "%s允許網頁伺服器寫入設定目錄%s通常可以解決這個問題",
+    "Sample configuration detected" : "偵測到範本設定",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "看來您直接複製了範本設定來使用，這可能會毀掉你的安裝，請閱讀說明文件後對 config.php 進行適當的修改",
+    "Help" : "說明",
+    "Personal" : "個人",
+    "Settings" : "設定",
+    "Users" : "使用者",
+    "Admin" : "管理",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。",
+    "No app name specified" : "沒有指定應用程式名稱",
+    "Unknown filetype" : "未知的檔案類型",
+    "Invalid image" : "無效的圖片",
+    "web services under your control" : "由您控制的網路服務",
+    "App directory already exists" : "應用程式目錄已經存在",
+    "Can't create app folder. Please fix permissions. %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" : "從本地檔案安裝應用程式時沒有指定路徑",
+    "Archives of type %s are not supported" : "不支援 %s 格式的壓縮檔",
+    "Failed to open archive when installing app" : "安裝應用程式時無法開啓壓縮檔",
+    "App does not provide an info.xml file" : "應用程式沒有提供 info.xml 檔案",
+    "App can't be installed because of not allowed code in the App" : "無法安裝應用程式因為在當中找到危險的代碼",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "無法安裝應用程式因為它和此版本的 ownCloud 不相容。",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "無法安裝應用程式，因為它包含了 <shipped>true</shipped> 標籤，在未發行的應用程式當中這是不允許的",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "無法安裝應用程式，因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同",
+    "Application is not enabled" : "應用程式未啟用",
+    "Authentication error" : "認證錯誤",
+    "Token expired. Please reload page." : "Token 過期，請重新整理頁面。",
+    "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 資料庫名稱不能包含小數點",
+    "MS SQL username and/or password not valid: %s" : "MS SQL 使用者和/或密碼無效：%s",
+    "You need to enter either an existing account or the administrator." : "您必須輸入一個現有的帳號或管理員帳號。",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB 使用者或密碼不正確",
+    "DB Error: \"%s\"" : "資料庫錯誤：\"%s\"",
+    "Offending command was: \"%s\"" : "有問題的指令是：\"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "MySQL/MariaDB 使用者 '%s'@'localhost' 已經存在",
+    "Drop this user from MySQL/MariaDB" : "自 MySQL/MariaDB 刪除這個使用者",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "MySQL/MariaDB 使用者 '%s'@'%%' 已經存在",
+    "Drop this user from MySQL/MariaDB." : "自 MySQL/MariaDB 刪除這個使用者",
+    "Oracle connection could not be established" : "無法建立 Oracle 資料庫連線",
+    "Oracle username and/or password not valid" : "Oracle 用戶名和/或密碼無效",
+    "Offending command was: \"%s\", name: %s, password: %s" : "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
+    "PostgreSQL username and/or password not valid" : "PostgreSQL 用戶名和/或密碼無效",
+    "Set an admin username." : "設定管理員帳號。",
+    "Set an admin password." : "設定管理員密碼。",
+    "Can't create or write into the data directory %s" : "無法建立或寫入資料目錄 %s",
+    "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "分享 %s 失敗，因為 %s 才是此項目的擁有者",
+    "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 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" : "您必須為公開連結設定一組密碼，我們只允許受密碼保護的連結",
+    "Sharing %s failed, because sharing with links is not allowed" : "分享 %s 失敗，因為目前不允許使用連結分享",
+    "Share type %s is not valid for %s" : "分享類型 %s 對於 %s 來說無效",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "為 %s 設定權限失敗，因為欲設定的權限超出開放給 %s 的範圍",
+    "Setting permissions for %s failed, because the item was not found" : "為 %s 設定權限失敗，因為找不到該項目",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "無法設定到期日，在分享之後，到期日不能設定為 %s 之後",
+    "Cannot set expiration date. Expiration date is in the past" : "無法設定過去的日期為到期日",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "分享後端 %s 必須實作 OCP\\Share_Backend interface",
+    "Sharing backend %s not found" : "找不到分享後端 %s",
+    "Sharing backend for %s not found" : "找不到 %s 的分享後端",
+    "Sharing %s failed, because the user %s is the original sharer" : "分享 %s 失敗，因為使用者 %s 即是原本的分享者",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "分享 %s 失敗，因為權限設定超出了授權給 %s 的範圍",
+    "Sharing %s failed, because resharing is not allowed" : "分享 %s 失敗，不允許重複分享",
+    "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\"",
+    "seconds ago" : "幾秒前",
+    "_%n minute ago_::_%n minutes ago_" : ["%n 分鐘前"],
+    "_%n hour ago_::_%n hours ago_" : ["%n 小時前"],
+    "today" : "今天",
+    "yesterday" : "昨天",
+    "_%n day go_::_%n days ago_" : ["%n 天前"],
+    "last month" : "上個月",
+    "_%n month ago_::_%n months ago_" : ["%n 個月前"],
+    "last year" : "去年",
+    "years ago" : "幾年前",
+    "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" : "一定要提供一個有效的密碼",
+    "The username is already being used" : "這個使用者名稱已經有人使用了",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "通常藉由%s開放網頁伺服器對根目錄的權限%s就可以修正權限問題",
+    "Cannot write into \"config\" directory" : "無法寫入 config 目錄",
+    "Cannot write into \"apps\" directory" : "無法寫入 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." : "通常藉由%s開放網頁伺服器對 apps 目錄的權限%s或是在設定檔中關閉 appstore 就可以修正這個問題",
+    "Cannot create \"data\" directory (%s)" : "無法建立 data 目錄 (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "通常藉由<a href=\"%s\" target=\"_blank\">開放網頁伺服器對根目錄的權限</a>就可以修正權限問題",
+    "Setting locale to %s failed" : "設定語系為 %s 失敗",
+    "Please install one of these locales on your system and restart your webserver." : "請在系統中安裝這些語系的其中一個，然後重啓網頁伺服器",
+    "Please ask your server administrator to install the module." : "請詢問系統管理員來安裝這些模組",
+    "PHP module %s not installed." : "未安裝 PHP 模組 %s",
+    "PHP %s or higher is required." : "需要 PHP %s 或更高版本",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "請詢問系統管理員將 PHP 升級至最新版，目前的 PHP 版本已經不再被 ownCloud 和 PHP 社群支援",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP 安全模式已經啟動，ownCloud 需要您將它關閉才能正常運作",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP 安全模式已經被棄用，並且在大多數狀況下無助於提升安全性，它應該被關閉。請詢問系統管理員將其在 php.ini 或網頁伺服器當中關閉。",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes 已經被啟用，ownCloud 需要您將其關閉以正常運作",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes 功能在大多數狀況下不會使用到，已經被上游棄用，因此它應該被停用。請詢問系統管理員將其在 php.ini 或網頁伺服器當中停用。",
+    "PHP modules have been installed, but they are still listed as missing?" : "你已經安裝了指定的 PHP 模組，可是還是顯示為找不到嗎？",
+    "Please ask your server administrator to restart the web server." : "請聯絡您的系統管理員重新啟動網頁伺服器",
+    "PostgreSQL >= 9 required" : "需要 PostgreSQL 版本 >= 9",
+    "Please upgrade your database version" : "請升級您的資料庫版本",
+    "Error occurred while checking PostgreSQL version" : "檢查 PostgreSQL 版本時發生錯誤",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "請確定您的 PostgreSQL 版本 >= 9，或是看看記錄檔是否有更詳細的訊息",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "請將該目錄權限設定為 0770 ，以免其他使用者讀取",
+    "Data directory (%s) is readable by other users" : "資料目錄 (%s) 可以被其他使用者讀取",
+    "Data directory (%s) is invalid" : "資料目錄 (%s) 無效",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "請確保資料目錄當中包含一個 .ocdata 的檔案",
+    "Could not obtain lock type %d on \"%s\"." : "無法取得鎖定：類型 %d ，檔案 %s"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
deleted file mode 100644
index 84cb621ce24..00000000000
--- a/lib/l10n/zh_TW.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cannot write into \"config\" directory!" => "無法寫入 config 目錄！",
-"This can usually be fixed by giving the webserver write access to the config directory" => "允許網頁伺服器寫入設定目錄通常可以解決這個問題",
-"See %s" => "見 %s",
-"This can usually be fixed by %sgiving the webserver write access to the config directory%s." => "%s允許網頁伺服器寫入設定目錄%s通常可以解決這個問題",
-"Sample configuration detected" => "偵測到範本設定",
-"It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" => "看來您直接複製了範本設定來使用，這可能會毀掉你的安裝，請閱讀說明文件後對 config.php 進行適當的修改",
-"Help" => "說明",
-"Personal" => "個人",
-"Settings" => "設定",
-"Users" => "使用者",
-"Admin" => "管理",
-"App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." => "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。",
-"No app name specified" => "沒有指定應用程式名稱",
-"Unknown filetype" => "未知的檔案類型",
-"Invalid image" => "無效的圖片",
-"web services under your control" => "由您控制的網路服務",
-"App directory already exists" => "應用程式目錄已經存在",
-"Can't create app folder. Please fix permissions. %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" => "從本地檔案安裝應用程式時沒有指定路徑",
-"Archives of type %s are not supported" => "不支援 %s 格式的壓縮檔",
-"Failed to open archive when installing app" => "安裝應用程式時無法開啓壓縮檔",
-"App does not provide an info.xml file" => "應用程式沒有提供 info.xml 檔案",
-"App can't be installed because of not allowed code in the App" => "無法安裝應用程式因為在當中找到危險的代碼",
-"App can't be installed because it is not compatible with this version of ownCloud" => "無法安裝應用程式因為它和此版本的 ownCloud 不相容。",
-"App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" => "無法安裝應用程式，因為它包含了 <shipped>true</shipped> 標籤，在未發行的應用程式當中這是不允許的",
-"App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" => "無法安裝應用程式，因為它在 info.xml/version 宣告的版本與 app store 當中記載的版本不同",
-"Application is not enabled" => "應用程式未啟用",
-"Authentication error" => "認證錯誤",
-"Token expired. Please reload page." => "Token 過期，請重新整理頁面。",
-"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 資料庫名稱不能包含小數點",
-"MS SQL username and/or password not valid: %s" => "MS SQL 使用者和/或密碼無效：%s",
-"You need to enter either an existing account or the administrator." => "您必須輸入一個現有的帳號或管理員帳號。",
-"MySQL/MariaDB username and/or password not valid" => "MySQL/MariaDB 使用者或密碼不正確",
-"DB Error: \"%s\"" => "資料庫錯誤：\"%s\"",
-"Offending command was: \"%s\"" => "有問題的指令是：\"%s\"",
-"MySQL/MariaDB user '%s'@'localhost' exists already." => "MySQL/MariaDB 使用者 '%s'@'localhost' 已經存在",
-"Drop this user from MySQL/MariaDB" => "自 MySQL/MariaDB 刪除這個使用者",
-"MySQL/MariaDB user '%s'@'%%' already exists" => "MySQL/MariaDB 使用者 '%s'@'%%' 已經存在",
-"Drop this user from MySQL/MariaDB." => "自 MySQL/MariaDB 刪除這個使用者",
-"Oracle connection could not be established" => "無法建立 Oracle 資料庫連線",
-"Oracle username and/or password not valid" => "Oracle 用戶名和/或密碼無效",
-"Offending command was: \"%s\", name: %s, password: %s" => "有問題的指令是：\"%s\" ，使用者：\"%s\"，密碼：\"%s\"",
-"PostgreSQL username and/or password not valid" => "PostgreSQL 用戶名和/或密碼無效",
-"Set an admin username." => "設定管理員帳號。",
-"Set an admin password." => "設定管理員密碼。",
-"Can't create or write into the data directory %s" => "無法建立或寫入資料目錄 %s",
-"%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",
-"Sharing %s failed, because the user %s is the item owner" => "分享 %s 失敗，因為 %s 才是此項目的擁有者",
-"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 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" => "您必須為公開連結設定一組密碼，我們只允許受密碼保護的連結",
-"Sharing %s failed, because sharing with links is not allowed" => "分享 %s 失敗，因為目前不允許使用連結分享",
-"Share type %s is not valid for %s" => "分享類型 %s 對於 %s 來說無效",
-"Setting permissions for %s failed, because the permissions exceed permissions granted to %s" => "為 %s 設定權限失敗，因為欲設定的權限超出開放給 %s 的範圍",
-"Setting permissions for %s failed, because the item was not found" => "為 %s 設定權限失敗，因為找不到該項目",
-"Cannot set expiration date. Shares cannot expire later than %s after they have been shared" => "無法設定到期日，在分享之後，到期日不能設定為 %s 之後",
-"Cannot set expiration date. Expiration date is in the past" => "無法設定過去的日期為到期日",
-"Sharing backend %s must implement the interface OCP\\Share_Backend" => "分享後端 %s 必須實作 OCP\\Share_Backend interface",
-"Sharing backend %s not found" => "找不到分享後端 %s",
-"Sharing backend for %s not found" => "找不到 %s 的分享後端",
-"Sharing %s failed, because the user %s is the original sharer" => "分享 %s 失敗，因為使用者 %s 即是原本的分享者",
-"Sharing %s failed, because the permissions exceed permissions granted to %s" => "分享 %s 失敗，因為權限設定超出了授權給 %s 的範圍",
-"Sharing %s failed, because resharing is not allowed" => "分享 %s 失敗，不允許重複分享",
-"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\"",
-"seconds ago" => "幾秒前",
-"_%n minute ago_::_%n minutes ago_" => array("%n 分鐘前"),
-"_%n hour ago_::_%n hours ago_" => array("%n 小時前"),
-"today" => "今天",
-"yesterday" => "昨天",
-"_%n day go_::_%n days ago_" => array("%n 天前"),
-"last month" => "上個月",
-"_%n month ago_::_%n months ago_" => array("%n 個月前"),
-"last year" => "去年",
-"years ago" => "幾年前",
-"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" => "一定要提供一個有效的密碼",
-"The username is already being used" => "這個使用者名稱已經有人使用了",
-"No database drivers (sqlite, mysql, or postgresql) installed." => "沒有安裝資料庫驅動程式 (sqlite, mysql, 或 postgresql)",
-"Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." => "通常藉由%s開放網頁伺服器對根目錄的權限%s就可以修正權限問題",
-"Cannot write into \"config\" directory" => "無法寫入 config 目錄",
-"Cannot write into \"apps\" directory" => "無法寫入 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." => "通常藉由%s開放網頁伺服器對 apps 目錄的權限%s或是在設定檔中關閉 appstore 就可以修正這個問題",
-"Cannot create \"data\" directory (%s)" => "無法建立 data 目錄 (%s)",
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." => "通常藉由<a href=\"%s\" target=\"_blank\">開放網頁伺服器對根目錄的權限</a>就可以修正權限問題",
-"Setting locale to %s failed" => "設定語系為 %s 失敗",
-"Please install one of these locales on your system and restart your webserver." => "請在系統中安裝這些語系的其中一個，然後重啓網頁伺服器",
-"Please ask your server administrator to install the module." => "請詢問系統管理員來安裝這些模組",
-"PHP module %s not installed." => "未安裝 PHP 模組 %s",
-"PHP %s or higher is required." => "需要 PHP %s 或更高版本",
-"Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." => "請詢問系統管理員將 PHP 升級至最新版，目前的 PHP 版本已經不再被 ownCloud 和 PHP 社群支援",
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." => "PHP 安全模式已經啟動，ownCloud 需要您將它關閉才能正常運作",
-"PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "PHP 安全模式已經被棄用，並且在大多數狀況下無助於提升安全性，它應該被關閉。請詢問系統管理員將其在 php.ini 或網頁伺服器當中關閉。",
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." => "Magic Quotes 已經被啟用，ownCloud 需要您將其關閉以正常運作",
-"Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." => "Magic Quotes 功能在大多數狀況下不會使用到，已經被上游棄用，因此它應該被停用。請詢問系統管理員將其在 php.ini 或網頁伺服器當中停用。",
-"PHP modules have been installed, but they are still listed as missing?" => "你已經安裝了指定的 PHP 模組，可是還是顯示為找不到嗎？",
-"Please ask your server administrator to restart the web server." => "請聯絡您的系統管理員重新啟動網頁伺服器",
-"PostgreSQL >= 9 required" => "需要 PostgreSQL 版本 >= 9",
-"Please upgrade your database version" => "請升級您的資料庫版本",
-"Error occurred while checking PostgreSQL version" => "檢查 PostgreSQL 版本時發生錯誤",
-"Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" => "請確定您的 PostgreSQL 版本 >= 9，或是看看記錄檔是否有更詳細的訊息",
-"Please change the permissions to 0770 so that the directory cannot be listed by other users." => "請將該目錄權限設定為 0770 ，以免其他使用者讀取",
-"Data directory (%s) is readable by other users" => "資料目錄 (%s) 可以被其他使用者讀取",
-"Data directory (%s) is invalid" => "資料目錄 (%s) 無效",
-"Please check that the data directory contains a file \".ocdata\" in its root." => "請確保資料目錄當中包含一個 .ocdata 的檔案",
-"Could not obtain lock type %d on \"%s\"." => "無法取得鎖定：類型 %d ，檔案 %s"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/af_ZA.js b/settings/l10n/af_ZA.js
new file mode 100644
index 00000000000..ccc813a5590
--- /dev/null
+++ b/settings/l10n/af_ZA.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "settings",
+    {
+    "So-so password" : "So-so wagwoord",
+    "Security Warning" : "Sekuriteits waarskuwing",
+    "Password" : "Wagwoord",
+    "New password" : "Nuwe wagwoord",
+    "Cancel" : "Kanseleer",
+    "Username" : "Gebruikersnaam"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/af_ZA.json b/settings/l10n/af_ZA.json
new file mode 100644
index 00000000000..73a78678732
--- /dev/null
+++ b/settings/l10n/af_ZA.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "So-so password" : "So-so wagwoord",
+    "Security Warning" : "Sekuriteits waarskuwing",
+    "Password" : "Wagwoord",
+    "New password" : "Nuwe wagwoord",
+    "Cancel" : "Kanseleer",
+    "Username" : "Gebruikersnaam"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/af_ZA.php b/settings/l10n/af_ZA.php
deleted file mode 100644
index 90094e7855d..00000000000
--- a/settings/l10n/af_ZA.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"So-so password" => "So-so wagwoord",
-"Security Warning" => "Sekuriteits waarskuwing",
-"Password" => "Wagwoord",
-"New password" => "Nuwe wagwoord",
-"Cancel" => "Kanseleer",
-"Username" => "Gebruikersnaam"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js
new file mode 100644
index 00000000000..f47285f6cdd
--- /dev/null
+++ b/settings/l10n/ar.js
@@ -0,0 +1,158 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "مفعلة",
+    "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
+    "Your full name has been changed." : "اسمك الكامل تم تغييره.",
+    "Unable to change full name" : "لم يتم التمكن من تغيير اسمك الكامل",
+    "Group already exists" : "المجموعة موجودة مسبقاً",
+    "Unable to add group" : "فشل إضافة المجموعة",
+    "Email saved" : "تم حفظ البريد الإلكتروني",
+    "Invalid email" : "البريد الإلكتروني غير صالح",
+    "Unable to delete group" : "فشل إزالة المجموعة",
+    "Unable to delete user" : "فشل إزالة المستخدم",
+    "Backups restored successfully" : "تم إسترجاع النسخة الإحتياطية بنجاح",
+    "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." : "تعذر تحديث التطبيق.",
+    "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." : "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
+    "Unable to change password" : "لا يمكن تغيير كلمة المرور",
+    "Saved" : "حفظ",
+    "test email settings" : "إعدادات البريد التجريبي",
+    "If you received this email, the settings seem to be correct." : "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
+    "Sending..." : "جاري الارسال ...",
+    "All" : "الكل",
+    "Please wait...." : "الرجاء الانتظار ...",
+    "Error while disabling app" : "خطا عند تعطيل البرنامج",
+    "Disable" : "إيقاف",
+    "Enable" : "تفعيل",
+    "Error while enabling app" : "خطا عند تفعيل البرنامج ",
+    "Updating...." : "جاري التحديث ...",
+    "Error while updating app" : "حصل خطأ أثناء تحديث التطبيق",
+    "Updated" : "تم التحديث بنجاح",
+    "Uninstalling ...." : "جاري إلغاء التثبيت ...",
+    "Uninstall" : "ألغاء التثبيت",
+    "Select a profile picture" : "اختر صورة الملف الشخصي ",
+    "Very weak password" : "كلمة السر ضعيفة جدا",
+    "Weak password" : "كلمة السر ضعيفة",
+    "Good password" : "كلمة السر جيدة",
+    "Strong password" : "كلمة السر قوية",
+    "Delete" : "إلغاء",
+    "Decrypting files... Please wait, this can take some time." : "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
+    "Groups" : "مجموعات",
+    "undo" : "تراجع",
+    "never" : "بتاتا",
+    "add group" : "اضافة مجموعة",
+    "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
+    "Error creating user" : "حصل خطأ اثناء انشاء مستخدم",
+    "A valid password must be provided" : "يجب ادخال كلمة مرور صحيحة",
+    "Warning: Home directory for user \"{user}\" already exists" : "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "التشفير",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)",
+    "Info, warnings, errors and fatal issues" : "معلومات , تحذيرات , اخطاء , مشاكل فادحة ",
+    "Warnings, errors and fatal issues" : "تحذيرات , اخطاء , مشاكل فادحة ",
+    "Errors and fatal issues" : "اخطاء ومشاكل فادحة ",
+    "Fatal issues only" : "مشاكل فادحة فقط ",
+    "None" : "لا شيء",
+    "Login" : "تسجيل الدخول",
+    "Security Warning" : "تحذير أمان",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "انت تستخدم %s عن طريق HTTP . نحن نقترح باصرار ان تهيء الخادم ليتمكن من الوصول عن طريق HTTPS.",
+    "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." : "مجلد data و ملفاتك يمكن الوصول لها عن طريق الانترنت. ملف .htaccess لا يمكن تشغيلة. نحن نقترح باصرار ان تعيد اعداد خادمك لمنع الدخول الى بياناتك عن طريق الانترنت او بالامكان ان تنقل مجلد data خارج document root بشكل مؤقت. ",
+    "Setup Warning" : "تحذير في التنصيب",
+    "Module 'fileinfo' missing" : "الموديل 'fileinfo' مفقود",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "موديل  'fileinfo' الخاص بالـPHP  مفقود . نوصي بتفعيل هذا الموديل للحصول على أفضل النتائج مع خاصية التحقق ",
+    "Your PHP version is outdated" : "اصدار PHP الخاص بك قديم",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "اصدار PHP الخاص بك قديم. نحن نقترح لك باصرار ان يتم ترقية الاصدار الى  5.3.8 او احدث بسبب ان الاصدارات القديمة معروفة انها مهمشة. من الممكن ان التنزيل قد لا يتم بصورة صحيحة.",
+    "Locale not working" : "اللغه لا تعمل",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
+    "Please double check the <a href='%s'>installation guides</a>." : "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
+    "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  لاستدعاء الملف cron.php كل  15 دقيقه",
+    "Sharing" : "مشاركة",
+    "Allow apps to use the Share API" : "السماح للتطبيقات بالمشاركة عن طريق الAPI",
+    "Allow users to share via link" : "السماح للمستخدم بمشاركة الملف عن طريق رابط",
+    "Allow public uploads" : "السماح بالرفع للعامة ",
+    "Expire after " : "ينتهي بعد",
+    "days" : "أيام",
+    "Allow resharing" : "السماح بإعادة المشاركة ",
+    "Security" : "الأمان",
+    "Enforce HTTPS" : "فرض HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
+    "Email Server" : "خادم البريد الالكتروني",
+    "Send mode" : "وضعية الإرسال",
+    "Authentication method" : "أسلوب التطابق",
+    "Server address" : "عنوان الخادم",
+    "Port" : "المنفذ",
+    "Log" : "سجل",
+    "Log level" : "مستوى السجل",
+    "More" : "المزيد",
+    "Less" : "أقل",
+    "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>." : "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
+    "by" : "من قبل",
+    "Documentation:" : "التوثيق",
+    "User Documentation" : "كتاب توثيق المستخدم",
+    "Uninstall App" : "أزالة تطبيق",
+    "Administrator Documentation" : "كتاب توثيق المدير",
+    "Online Documentation" : "توثيق متوفر على الشبكة",
+    "Forum" : "منتدى",
+    "Bugtracker" : "تعقب علة",
+    "Commercial Support" : "دعم تجاري",
+    "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك",
+    "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
+    "Password" : "كلمة المرور",
+    "Your password was changed" : "لقد تم تغيير كلمة السر",
+    "Unable to change your password" : "لم يتم تعديل كلمة السر بنجاح",
+    "Current password" : "كلمات السر الحالية",
+    "New password" : "كلمات سر جديدة",
+    "Change password" : "عدل كلمة السر",
+    "Full Name" : "اسمك الكامل",
+    "Email" : "البريد الإلكترونى",
+    "Your email address" : "عنوانك البريدي",
+    "Profile picture" : "صورة الملف الشخصي",
+    "Upload new" : "رفع الان",
+    "Select new from Files" : "اختر جديد من الملفات ",
+    "Remove image" : "إزالة الصورة",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "سواء png او jpg. بامكانك قص الصورة ",
+    "Your avatar is provided by your original account." : "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي.",
+    "Cancel" : "الغاء",
+    "Choose as profile image" : "اختر صورة الملف الشخصي",
+    "Language" : "اللغة",
+    "Help translate" : "ساعد في الترجمه",
+    "Valid until" : "صالح حتى",
+    "The encryption app is no longer enabled, please decrypt all your files" : "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
+    "Log-in password" : "كلمه سر الدخول",
+    "Decrypt all Files" : "فك تشفير جميع الملفات ",
+    "Login Name" : "اسم الدخول",
+    "Create" : "انشئ",
+    "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول",
+    "Enter the recovery password in order to recover the users files during password change" : "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
+    "Group" : "مجموعة",
+    "Everyone" : "الجميع",
+    "Default Quota" : "الحصة النسبية الإفتراضية",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
+    "Unlimited" : "غير محدود",
+    "Other" : "شيء آخر",
+    "Username" : "إسم المستخدم",
+    "Quota" : "حصه",
+    "Last Login" : "آخر تسجيل دخول",
+    "change full name" : "تغيير اسمك الكامل",
+    "set new password" : "اعداد كلمة مرور جديدة",
+    "Default" : "افتراضي"
+},
+"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/settings/l10n/ar.json b/settings/l10n/ar.json
new file mode 100644
index 00000000000..3b5ea8da2b0
--- /dev/null
+++ b/settings/l10n/ar.json
@@ -0,0 +1,156 @@
+{ "translations": {
+    "Enabled" : "مفعلة",
+    "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
+    "Your full name has been changed." : "اسمك الكامل تم تغييره.",
+    "Unable to change full name" : "لم يتم التمكن من تغيير اسمك الكامل",
+    "Group already exists" : "المجموعة موجودة مسبقاً",
+    "Unable to add group" : "فشل إضافة المجموعة",
+    "Email saved" : "تم حفظ البريد الإلكتروني",
+    "Invalid email" : "البريد الإلكتروني غير صالح",
+    "Unable to delete group" : "فشل إزالة المجموعة",
+    "Unable to delete user" : "فشل إزالة المستخدم",
+    "Backups restored successfully" : "تم إسترجاع النسخة الإحتياطية بنجاح",
+    "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." : "تعذر تحديث التطبيق.",
+    "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." : "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
+    "Unable to change password" : "لا يمكن تغيير كلمة المرور",
+    "Saved" : "حفظ",
+    "test email settings" : "إعدادات البريد التجريبي",
+    "If you received this email, the settings seem to be correct." : "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
+    "Email sent" : "تم ارسال البريد الالكتروني",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
+    "Sending..." : "جاري الارسال ...",
+    "All" : "الكل",
+    "Please wait...." : "الرجاء الانتظار ...",
+    "Error while disabling app" : "خطا عند تعطيل البرنامج",
+    "Disable" : "إيقاف",
+    "Enable" : "تفعيل",
+    "Error while enabling app" : "خطا عند تفعيل البرنامج ",
+    "Updating...." : "جاري التحديث ...",
+    "Error while updating app" : "حصل خطأ أثناء تحديث التطبيق",
+    "Updated" : "تم التحديث بنجاح",
+    "Uninstalling ...." : "جاري إلغاء التثبيت ...",
+    "Uninstall" : "ألغاء التثبيت",
+    "Select a profile picture" : "اختر صورة الملف الشخصي ",
+    "Very weak password" : "كلمة السر ضعيفة جدا",
+    "Weak password" : "كلمة السر ضعيفة",
+    "Good password" : "كلمة السر جيدة",
+    "Strong password" : "كلمة السر قوية",
+    "Delete" : "إلغاء",
+    "Decrypting files... Please wait, this can take some time." : "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
+    "Groups" : "مجموعات",
+    "undo" : "تراجع",
+    "never" : "بتاتا",
+    "add group" : "اضافة مجموعة",
+    "A valid username must be provided" : "يجب ادخال اسم مستخدم صحيح",
+    "Error creating user" : "حصل خطأ اثناء انشاء مستخدم",
+    "A valid password must be provided" : "يجب ادخال كلمة مرور صحيحة",
+    "Warning: Home directory for user \"{user}\" already exists" : "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "التشفير",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)",
+    "Info, warnings, errors and fatal issues" : "معلومات , تحذيرات , اخطاء , مشاكل فادحة ",
+    "Warnings, errors and fatal issues" : "تحذيرات , اخطاء , مشاكل فادحة ",
+    "Errors and fatal issues" : "اخطاء ومشاكل فادحة ",
+    "Fatal issues only" : "مشاكل فادحة فقط ",
+    "None" : "لا شيء",
+    "Login" : "تسجيل الدخول",
+    "Security Warning" : "تحذير أمان",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "انت تستخدم %s عن طريق HTTP . نحن نقترح باصرار ان تهيء الخادم ليتمكن من الوصول عن طريق HTTPS.",
+    "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." : "مجلد data و ملفاتك يمكن الوصول لها عن طريق الانترنت. ملف .htaccess لا يمكن تشغيلة. نحن نقترح باصرار ان تعيد اعداد خادمك لمنع الدخول الى بياناتك عن طريق الانترنت او بالامكان ان تنقل مجلد data خارج document root بشكل مؤقت. ",
+    "Setup Warning" : "تحذير في التنصيب",
+    "Module 'fileinfo' missing" : "الموديل 'fileinfo' مفقود",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "موديل  'fileinfo' الخاص بالـPHP  مفقود . نوصي بتفعيل هذا الموديل للحصول على أفضل النتائج مع خاصية التحقق ",
+    "Your PHP version is outdated" : "اصدار PHP الخاص بك قديم",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "اصدار PHP الخاص بك قديم. نحن نقترح لك باصرار ان يتم ترقية الاصدار الى  5.3.8 او احدث بسبب ان الاصدارات القديمة معروفة انها مهمشة. من الممكن ان التنزيل قد لا يتم بصورة صحيحة.",
+    "Locale not working" : "اللغه لا تعمل",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
+    "Please double check the <a href='%s'>installation guides</a>." : "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
+    "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  لاستدعاء الملف cron.php كل  15 دقيقه",
+    "Sharing" : "مشاركة",
+    "Allow apps to use the Share API" : "السماح للتطبيقات بالمشاركة عن طريق الAPI",
+    "Allow users to share via link" : "السماح للمستخدم بمشاركة الملف عن طريق رابط",
+    "Allow public uploads" : "السماح بالرفع للعامة ",
+    "Expire after " : "ينتهي بعد",
+    "days" : "أيام",
+    "Allow resharing" : "السماح بإعادة المشاركة ",
+    "Security" : "الأمان",
+    "Enforce HTTPS" : "فرض HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
+    "Email Server" : "خادم البريد الالكتروني",
+    "Send mode" : "وضعية الإرسال",
+    "Authentication method" : "أسلوب التطابق",
+    "Server address" : "عنوان الخادم",
+    "Port" : "المنفذ",
+    "Log" : "سجل",
+    "Log level" : "مستوى السجل",
+    "More" : "المزيد",
+    "Less" : "أقل",
+    "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>." : "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
+    "by" : "من قبل",
+    "Documentation:" : "التوثيق",
+    "User Documentation" : "كتاب توثيق المستخدم",
+    "Uninstall App" : "أزالة تطبيق",
+    "Administrator Documentation" : "كتاب توثيق المدير",
+    "Online Documentation" : "توثيق متوفر على الشبكة",
+    "Forum" : "منتدى",
+    "Bugtracker" : "تعقب علة",
+    "Commercial Support" : "دعم تجاري",
+    "Get the apps to sync your files" : "احصل على التطبيقات لمزامنة ملفاتك",
+    "Show First Run Wizard again" : "ابدأ خطوات بداية التشغيل من جديد",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
+    "Password" : "كلمة المرور",
+    "Your password was changed" : "لقد تم تغيير كلمة السر",
+    "Unable to change your password" : "لم يتم تعديل كلمة السر بنجاح",
+    "Current password" : "كلمات السر الحالية",
+    "New password" : "كلمات سر جديدة",
+    "Change password" : "عدل كلمة السر",
+    "Full Name" : "اسمك الكامل",
+    "Email" : "البريد الإلكترونى",
+    "Your email address" : "عنوانك البريدي",
+    "Profile picture" : "صورة الملف الشخصي",
+    "Upload new" : "رفع الان",
+    "Select new from Files" : "اختر جديد من الملفات ",
+    "Remove image" : "إزالة الصورة",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "سواء png او jpg. بامكانك قص الصورة ",
+    "Your avatar is provided by your original account." : "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي.",
+    "Cancel" : "الغاء",
+    "Choose as profile image" : "اختر صورة الملف الشخصي",
+    "Language" : "اللغة",
+    "Help translate" : "ساعد في الترجمه",
+    "Valid until" : "صالح حتى",
+    "The encryption app is no longer enabled, please decrypt all your files" : "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
+    "Log-in password" : "كلمه سر الدخول",
+    "Decrypt all Files" : "فك تشفير جميع الملفات ",
+    "Login Name" : "اسم الدخول",
+    "Create" : "انشئ",
+    "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول",
+    "Enter the recovery password in order to recover the users files during password change" : "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
+    "Group" : "مجموعة",
+    "Everyone" : "الجميع",
+    "Default Quota" : "الحصة النسبية الإفتراضية",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
+    "Unlimited" : "غير محدود",
+    "Other" : "شيء آخر",
+    "Username" : "إسم المستخدم",
+    "Quota" : "حصه",
+    "Last Login" : "آخر تسجيل دخول",
+    "change full name" : "تغيير اسمك الكامل",
+    "set new password" : "اعداد كلمة مرور جديدة",
+    "Default" : "افتراضي"
+},"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/settings/l10n/ar.php b/settings/l10n/ar.php
deleted file mode 100644
index bd62f1f1165..00000000000
--- a/settings/l10n/ar.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "مفعلة",
-"Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
-"Your full name has been changed." => "اسمك الكامل تم تغييره.",
-"Unable to change full name" => "لم يتم التمكن من تغيير اسمك الكامل",
-"Group already exists" => "المجموعة موجودة مسبقاً",
-"Unable to add group" => "فشل إضافة المجموعة",
-"Email saved" => "تم حفظ البريد الإلكتروني",
-"Invalid email" => "البريد الإلكتروني غير صالح",
-"Unable to delete group" => "فشل إزالة المجموعة",
-"Unable to delete user" => "فشل إزالة المستخدم",
-"Backups restored successfully" => "تم إسترجاع النسخة الإحتياطية بنجاح",
-"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." => "تعذر تحديث التطبيق.",
-"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." => "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
-"Unable to change password" => "لا يمكن تغيير كلمة المرور",
-"Saved" => "حفظ",
-"test email settings" => "إعدادات البريد التجريبي",
-"If you received this email, the settings seem to be correct." => "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
-"Email sent" => "تم ارسال البريد الالكتروني",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "هل أنت متأكد انك تريد إضافة \"{domain}\" كنطاق موثوق فيه.",
-"Sending..." => "جاري الارسال ...",
-"All" => "الكل",
-"Please wait...." => "الرجاء الانتظار ...",
-"Error while disabling app" => "خطا عند تعطيل البرنامج",
-"Disable" => "إيقاف",
-"Enable" => "تفعيل",
-"Error while enabling app" => "خطا عند تفعيل البرنامج ",
-"Updating...." => "جاري التحديث ...",
-"Error while updating app" => "حصل خطأ أثناء تحديث التطبيق",
-"Updated" => "تم التحديث بنجاح",
-"Uninstalling ...." => "جاري إلغاء التثبيت ...",
-"Uninstall" => "ألغاء التثبيت",
-"Select a profile picture" => "اختر صورة الملف الشخصي ",
-"Very weak password" => "كلمة السر ضعيفة جدا",
-"Weak password" => "كلمة السر ضعيفة",
-"Good password" => "كلمة السر جيدة",
-"Strong password" => "كلمة السر قوية",
-"Delete" => "إلغاء",
-"Decrypting files... Please wait, this can take some time." => "فك تشفير الملفات... يرجى الانتظار, من الممكن ان ياخذ بعض الوقت.",
-"Groups" => "مجموعات",
-"undo" => "تراجع",
-"never" => "بتاتا",
-"add group" => "اضافة مجموعة",
-"A valid username must be provided" => "يجب ادخال اسم مستخدم صحيح",
-"Error creating user" => "حصل خطأ اثناء انشاء مستخدم",
-"A valid password must be provided" => "يجب ادخال كلمة مرور صحيحة",
-"Warning: Home directory for user \"{user}\" already exists" => "تحذير: المجلد الرئيسي لـ المستخدم \"{user}\" موجود مسبقا",
-"__language_name__" => "__language_name__",
-"Encryption" => "التشفير",
-"Everything (fatal issues, errors, warnings, info, debug)" => "كل شيء (مشاكل فادحة, اخطاء , تحذيرات , معلومات , تصحيح الاخطاء)",
-"Info, warnings, errors and fatal issues" => "معلومات , تحذيرات , اخطاء , مشاكل فادحة ",
-"Warnings, errors and fatal issues" => "تحذيرات , اخطاء , مشاكل فادحة ",
-"Errors and fatal issues" => "اخطاء ومشاكل فادحة ",
-"Fatal issues only" => "مشاكل فادحة فقط ",
-"None" => "لا شيء",
-"Login" => "تسجيل الدخول",
-"Security Warning" => "تحذير أمان",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "انت تستخدم %s عن طريق HTTP . نحن نقترح باصرار ان تهيء الخادم ليتمكن من الوصول عن طريق HTTPS.",
-"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." => "مجلد data و ملفاتك يمكن الوصول لها عن طريق الانترنت. ملف .htaccess لا يمكن تشغيلة. نحن نقترح باصرار ان تعيد اعداد خادمك لمنع الدخول الى بياناتك عن طريق الانترنت او بالامكان ان تنقل مجلد data خارج document root بشكل مؤقت. ",
-"Setup Warning" => "تحذير في التنصيب",
-"Module 'fileinfo' missing" => "الموديل 'fileinfo' مفقود",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "موديل  'fileinfo' الخاص بالـPHP  مفقود . نوصي بتفعيل هذا الموديل للحصول على أفضل النتائج مع خاصية التحقق ",
-"Your PHP version is outdated" => "اصدار PHP الخاص بك قديم",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "اصدار PHP الخاص بك قديم. نحن نقترح لك باصرار ان يتم ترقية الاصدار الى  5.3.8 او احدث بسبب ان الاصدارات القديمة معروفة انها مهمشة. من الممكن ان التنزيل قد لا يتم بصورة صحيحة.",
-"Locale not working" => "اللغه لا تعمل",
-"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 to install the required packages on your system to support one of the following locales: %s." => "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
-"Please double check the <a href='%s'>installation guides</a>." => "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
-"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  لاستدعاء الملف cron.php كل  15 دقيقه",
-"Sharing" => "مشاركة",
-"Allow apps to use the Share API" => "السماح للتطبيقات بالمشاركة عن طريق الAPI",
-"Allow users to share via link" => "السماح للمستخدم بمشاركة الملف عن طريق رابط",
-"Allow public uploads" => "السماح بالرفع للعامة ",
-"Expire after " => "ينتهي بعد",
-"days" => "أيام",
-"Allow resharing" => "السماح بإعادة المشاركة ",
-"Security" => "الأمان",
-"Enforce HTTPS" => "فرض HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
-"Email Server" => "خادم البريد الالكتروني",
-"Send mode" => "وضعية الإرسال",
-"Authentication method" => "أسلوب التطابق",
-"Server address" => "عنوان الخادم",
-"Port" => "المنفذ",
-"Log" => "سجل",
-"Log level" => "مستوى السجل",
-"More" => "المزيد",
-"Less" => "أقل",
-"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>." => "طوّر من قبل <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud مجتمع</a>, الـ <a href=\"https://github.com/owncloud\" target=\"_blank\">النص المصدري</a> مرخص بموجب <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">رخصة أفيرو العمومية</abbr></a>.",
-"by" => "من قبل",
-"Documentation:" => "التوثيق",
-"User Documentation" => "كتاب توثيق المستخدم",
-"Uninstall App" => "أزالة تطبيق",
-"Administrator Documentation" => "كتاب توثيق المدير",
-"Online Documentation" => "توثيق متوفر على الشبكة",
-"Forum" => "منتدى",
-"Bugtracker" => "تعقب علة",
-"Commercial Support" => "دعم تجاري",
-"Get the apps to sync your files" => "احصل على التطبيقات لمزامنة ملفاتك",
-"Show First Run Wizard again" => "ابدأ خطوات بداية التشغيل من جديد",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "تم إستهلاك <strong>%s</strong> من المتوفر <strong>%s</strong>",
-"Password" => "كلمة المرور",
-"Your password was changed" => "لقد تم تغيير كلمة السر",
-"Unable to change your password" => "لم يتم تعديل كلمة السر بنجاح",
-"Current password" => "كلمات السر الحالية",
-"New password" => "كلمات سر جديدة",
-"Change password" => "عدل كلمة السر",
-"Full Name" => "اسمك الكامل",
-"Email" => "البريد الإلكترونى",
-"Your email address" => "عنوانك البريدي",
-"Profile picture" => "صورة الملف الشخصي",
-"Upload new" => "رفع الان",
-"Select new from Files" => "اختر جديد من الملفات ",
-"Remove image" => "إزالة الصورة",
-"Either png or jpg. Ideally square but you will be able to crop it." => "سواء png او jpg. بامكانك قص الصورة ",
-"Your avatar is provided by your original account." => "صورتك الرمزية يتم توفيرها عن طريق حسابك الاصلي.",
-"Cancel" => "الغاء",
-"Choose as profile image" => "اختر صورة الملف الشخصي",
-"Language" => "اللغة",
-"Help translate" => "ساعد في الترجمه",
-"Valid until" => "صالح حتى",
-"The encryption app is no longer enabled, please decrypt all your files" => "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
-"Log-in password" => "كلمه سر الدخول",
-"Decrypt all Files" => "فك تشفير جميع الملفات ",
-"Login Name" => "اسم الدخول",
-"Create" => "انشئ",
-"Admin Recovery Password" => "استعادة كلمة المرور للمسؤول",
-"Enter the recovery password in order to recover the users files during password change" => "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
-"Group" => "مجموعة",
-"Everyone" => "الجميع",
-"Default Quota" => "الحصة النسبية الإفتراضية",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
-"Unlimited" => "غير محدود",
-"Other" => "شيء آخر",
-"Username" => "إسم المستخدم",
-"Quota" => "حصه",
-"Last Login" => "آخر تسجيل دخول",
-"change full name" => "تغيير اسمك الكامل",
-"set new password" => "اعداد كلمة مرور جديدة",
-"Default" => "افتراضي"
-);
-$PLURAL_FORMS = "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/settings/l10n/ast.js b/settings/l10n/ast.js
new file mode 100644
index 00000000000..e7a8cac47b8
--- /dev/null
+++ b/settings/l10n/ast.js
@@ -0,0 +1,214 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitar",
+    "Authentication error" : "Fallu d'autenticación",
+    "Your full name has been changed." : "Camudóse'l nome completu.",
+    "Unable to change full name" : "Nun pue camudase'l nome completu",
+    "Group already exists" : "El grupu yá esiste",
+    "Unable to add group" : "Nun pudo amestase'l grupu",
+    "Files decrypted successfully" : "Descifráronse los ficheros",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
+    "Couldn't decrypt your files, check your password and try again" : "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
+    "Encryption keys deleted permanently" : "Desaniciaes dafechu les claves de cifráu",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+    "Couldn't remove app." : "Nun pudo desaniciase l'aplicación.",
+    "Email saved" : "Corréu-e guardáu",
+    "Invalid email" : "Corréu electrónicu non válidu",
+    "Unable to delete group" : "Nun pudo desaniciase'l grupu",
+    "Unable to delete user" : "Nun pudo desaniciase l'usuariu",
+    "Backups restored successfully" : "Copia de seguridá restaurada",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron restaurase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+    "Language changed" : "Camudóse la llingua",
+    "Invalid request" : "Solicitú inválida",
+    "Admins can't remove themself from the admin group" : "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
+    "Unable to add user to group %s" : "Nun pudo amestase l'usuariu al grupu %s",
+    "Unable to remove user from group %s" : "Nun pudo desaniciase al usuariu del grupu %s",
+    "Couldn't update app." : "Nun pudo anovase l'aplicación.",
+    "Wrong password" : "Contraseña incorreuta",
+    "No user supplied" : "Nun s'especificó un usuariu",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu",
+    "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
+    "Unable to change password" : "Nun pudo camudase la contraseña",
+    "Saved" : "Guardáu",
+    "test email settings" : "probar configuración de corréu",
+    "If you received this email, the settings seem to be correct." : "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
+    "Email sent" : "Corréu-e unviáu",
+    "You need to set your user email before being able to send test emails." : "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
+    "Sending..." : "Unviando...",
+    "All" : "Toos",
+    "Please wait...." : "Espera, por favor....",
+    "Error while disabling app" : "Fallu mientres se desactivaba l'aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Fallu mientres s'activaba l'aplicación",
+    "Updating...." : "Anovando....",
+    "Error while updating app" : "Fallu mientres s'anovaba l'aplicación",
+    "Updated" : "Anováu",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Fallu mientres se desinstalaba l'aplicación",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Esbillar una imaxe de perfil",
+    "Very weak password" : "Contraseña mui feble",
+    "Weak password" : "Contraseña feble",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña bona",
+    "Strong password" : "Contraseña mui bona",
+    "Delete" : "Desaniciar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
+    "Delete encryption keys permanently." : "Desaniciar dafechu les claves de cifráu.",
+    "Restore encryption keys." : "Restaurar claves de cifráu.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Nun pue desaniciase {objName}",
+    "Error creating group" : "Fallu creando grupu",
+    "A valid group name must be provided" : "Hai d'escribir un nome de grupu válidu",
+    "deleted {groupName}" : "desaniciáu {groupName}",
+    "undo" : "desfacer",
+    "never" : "enxamás",
+    "deleted {userName}" : "desaniciáu {userName}",
+    "add group" : "amestar Grupu",
+    "A valid username must be provided" : "Tien d'apurrise un nome d'usuariu válidu",
+    "Error creating user" : "Fallu al crear usuariu",
+    "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
+    "__language_name__" : "Asturianu",
+    "SSL root certificates" : "Certificaos raíz SSL",
+    "Encryption" : "Cifráu",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Fallos y problemes fatales",
+    "Warnings, errors and fatal issues" : "Avisos, fallos y problemes fatales",
+    "Errors and fatal issues" : "Fallos y problemes fatales",
+    "Fatal issues only" : "Namái problemes fatales",
+    "None" : "Dengún",
+    "Login" : "Entamar sesión",
+    "Plain" : "Planu",
+    "NT LAN Manager" : "Xestor de NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avisu de seguridá",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Tas ingresando a %s vía HTTP. Encamentámoste que configures el sirvidor pa solicitar HTTPS.",
+    "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." : "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
+    "Setup Warning" : "Avisu de configuración",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Información de rindimientu de la base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ta usándose SQLite como base de datos. Pa instalaciones más grandes, recomendamos cambiar esto. Pa migrar a otra base de datos, usa la ferramienta de llinia de comandos: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Nun s'atopó'l módulu \"fileinfo\"",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
+    "Your PHP version is outdated" : "La versión de PHP nun ta anovada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La versión de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
+    "Locale not working" : "La configuración rexonal nun ta funcionando",
+    "System locale can not be set to a one which supports UTF-8." : "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron executóse per cabera vegada a les %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
+    "Cron was not executed yet!" : "¡Cron entá nun s'executó!",
+    "Execute one task with each page loaded" : "Executar una xera con cada páxina cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a les aplicaciones usar la API de Compartición",
+    "Allow users to share via link" : "Permitir a los usuarios compartir vía enllaz",
+    "Enforce password protection" : "Ameyora la proteición por contraseña.",
+    "Allow public uploads" : "Permitir xubes públiques",
+    "Set default expiration date" : "Afitar la data d'espiración predeterminada",
+    "Expire after " : "Caduca dempués de",
+    "days" : "díes",
+    "Enforce expiration date" : "Facer cumplir la data de caducidá",
+    "Allow resharing" : "Permitir re-compartición",
+    "Restrict users to only share with users in their groups" : "Restrinxir a los usuarios a compartir namái con otros usuarios nos sos grupos",
+    "Allow users to send mail notification for shared files" : "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
+    "Exclude groups from sharing" : "Esclúi grupos de compartir",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos",
+    "Security" : "Seguridá",
+    "Enforce HTTPS" : "Forciar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
+    "Email Server" : "Sirvidor de corréu-e",
+    "This is used for sending out notifications." : "Esto úsase pa unviar notificaciones.",
+    "Send mode" : "Mou d'unviu",
+    "From address" : "Dende la direición",
+    "mail" : "corréu",
+    "Authentication method" : "Métodu d'autenticación",
+    "Authentication required" : "Necesítase autenticación",
+    "Server address" : "Direición del sirvidor",
+    "Port" : "Puertu",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nome d'usuariu SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Test email settings" : "Probar configuración de corréu electrónicu",
+    "Send email" : "Unviar mensaxe",
+    "Log" : "Rexistru",
+    "Log level" : "Nivel de rexistru",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación d'usuariu",
+    "Admin Documentation" : "Documentación p'alministradores",
+    "Enable only for specific groups" : "Habilitar namái pa grupos específicos",
+    "Uninstall App" : "Desinstalar aplicación",
+    "Administrator Documentation" : "Documentación d'alministrador",
+    "Online Documentation" : "Documentación en llinia",
+    "Forum" : "Foru",
+    "Bugtracker" : "Rastrexador de fallos",
+    "Commercial Support" : "Sofitu comercial",
+    "Get the apps to sync your files" : "Obtener les aplicaciones pa sincronizar ficheros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si quies sofitar el proyeutu\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">xúnite al desendolcu</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">¡espardi la pallabra!</a>!",
+    "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Camudóse la contraseña",
+    "Unable to change your password" : "Nun pudo camudase la contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Contraseña nueva",
+    "Change password" : "Camudar contraseña",
+    "Full Name" : "Nome completu",
+    "Email" : "Corréu-e",
+    "Your email address" : "Direición de corréu-e",
+    "Fill in an email address to enable password recovery and receive notifications" : "Introducir una direición de corréu-e p'activar la recuperación de contraseñes y recibir notificaciones",
+    "Profile picture" : "Semeya de perfil",
+    "Upload new" : "Xubir otra",
+    "Select new from Files" : "Esbillar otra dende Ficheros",
+    "Remove image" : "Desaniciar imaxe",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ficheru PNG o JPG. Preferiblemente cuadráu, pero vas poder retayalu.",
+    "Your avatar is provided by your original account." : "L'avatar ta proporcionáu pola to cuenta orixinal.",
+    "Cancel" : "Encaboxar",
+    "Choose as profile image" : "Esbillar como imaxe de perfil",
+    "Language" : "Llingua",
+    "Help translate" : "Ayúdanos nes traducciones",
+    "Import Root Certificate" : "Importar certificáu raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
+    "Log-in password" : "Contraseña d'accesu",
+    "Decrypt all Files" : "Descifrar ficheros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
+    "Restore Encryption Keys" : "Restaurar claves de cifráu.",
+    "Delete Encryption Keys" : "Desaniciar claves de cifráu",
+    "Login Name" : "Nome d'usuariu",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
+    "Search Users and Groups" : "Guetar Usuarios y Grupos",
+    "Add Group" : "Amestar grupu",
+    "Group" : "Grupu",
+    "Everyone" : "Toos",
+    "Admins" : "Almins",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Non llendáu",
+    "Other" : "Otru",
+    "Username" : "Nome d'usuariu",
+    "Quota" : "Cuota",
+    "Storage Location" : "Llocalización d'almacenamientu",
+    "Last Login" : "Caberu aniciu de sesión",
+    "change full name" : "camudar el nome completu",
+    "set new password" : "afitar nueva contraseña",
+    "Default" : "Predetermináu"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
new file mode 100644
index 00000000000..5524c431b0d
--- /dev/null
+++ b/settings/l10n/ast.json
@@ -0,0 +1,212 @@
+{ "translations": {
+    "Enabled" : "Habilitar",
+    "Authentication error" : "Fallu d'autenticación",
+    "Your full name has been changed." : "Camudóse'l nome completu.",
+    "Unable to change full name" : "Nun pue camudase'l nome completu",
+    "Group already exists" : "El grupu yá esiste",
+    "Unable to add group" : "Nun pudo amestase'l grupu",
+    "Files decrypted successfully" : "Descifráronse los ficheros",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
+    "Couldn't decrypt your files, check your password and try again" : "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
+    "Encryption keys deleted permanently" : "Desaniciaes dafechu les claves de cifráu",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+    "Couldn't remove app." : "Nun pudo desaniciase l'aplicación.",
+    "Email saved" : "Corréu-e guardáu",
+    "Invalid email" : "Corréu electrónicu non válidu",
+    "Unable to delete group" : "Nun pudo desaniciase'l grupu",
+    "Unable to delete user" : "Nun pudo desaniciase l'usuariu",
+    "Backups restored successfully" : "Copia de seguridá restaurada",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nun pudieron restaurase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
+    "Language changed" : "Camudóse la llingua",
+    "Invalid request" : "Solicitú inválida",
+    "Admins can't remove themself from the admin group" : "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
+    "Unable to add user to group %s" : "Nun pudo amestase l'usuariu al grupu %s",
+    "Unable to remove user from group %s" : "Nun pudo desaniciase al usuariu del grupu %s",
+    "Couldn't update app." : "Nun pudo anovase l'aplicación.",
+    "Wrong password" : "Contraseña incorreuta",
+    "No user supplied" : "Nun s'especificó un usuariu",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu",
+    "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
+    "Unable to change password" : "Nun pudo camudase la contraseña",
+    "Saved" : "Guardáu",
+    "test email settings" : "probar configuración de corréu",
+    "If you received this email, the settings seem to be correct." : "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
+    "Email sent" : "Corréu-e unviáu",
+    "You need to set your user email before being able to send test emails." : "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
+    "Sending..." : "Unviando...",
+    "All" : "Toos",
+    "Please wait...." : "Espera, por favor....",
+    "Error while disabling app" : "Fallu mientres se desactivaba l'aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Fallu mientres s'activaba l'aplicación",
+    "Updating...." : "Anovando....",
+    "Error while updating app" : "Fallu mientres s'anovaba l'aplicación",
+    "Updated" : "Anováu",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Fallu mientres se desinstalaba l'aplicación",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Esbillar una imaxe de perfil",
+    "Very weak password" : "Contraseña mui feble",
+    "Weak password" : "Contraseña feble",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña bona",
+    "Strong password" : "Contraseña mui bona",
+    "Delete" : "Desaniciar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
+    "Delete encryption keys permanently." : "Desaniciar dafechu les claves de cifráu.",
+    "Restore encryption keys." : "Restaurar claves de cifráu.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Nun pue desaniciase {objName}",
+    "Error creating group" : "Fallu creando grupu",
+    "A valid group name must be provided" : "Hai d'escribir un nome de grupu válidu",
+    "deleted {groupName}" : "desaniciáu {groupName}",
+    "undo" : "desfacer",
+    "never" : "enxamás",
+    "deleted {userName}" : "desaniciáu {userName}",
+    "add group" : "amestar Grupu",
+    "A valid username must be provided" : "Tien d'apurrise un nome d'usuariu válidu",
+    "Error creating user" : "Fallu al crear usuariu",
+    "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
+    "__language_name__" : "Asturianu",
+    "SSL root certificates" : "Certificaos raíz SSL",
+    "Encryption" : "Cifráu",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Fallos y problemes fatales",
+    "Warnings, errors and fatal issues" : "Avisos, fallos y problemes fatales",
+    "Errors and fatal issues" : "Fallos y problemes fatales",
+    "Fatal issues only" : "Namái problemes fatales",
+    "None" : "Dengún",
+    "Login" : "Entamar sesión",
+    "Plain" : "Planu",
+    "NT LAN Manager" : "Xestor de NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avisu de seguridá",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Tas ingresando a %s vía HTTP. Encamentámoste que configures el sirvidor pa solicitar HTTPS.",
+    "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." : "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
+    "Setup Warning" : "Avisu de configuración",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Información de rindimientu de la base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ta usándose SQLite como base de datos. Pa instalaciones más grandes, recomendamos cambiar esto. Pa migrar a otra base de datos, usa la ferramienta de llinia de comandos: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Nun s'atopó'l módulu \"fileinfo\"",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
+    "Your PHP version is outdated" : "La versión de PHP nun ta anovada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La versión de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
+    "Locale not working" : "La configuración rexonal nun ta funcionando",
+    "System locale can not be set to a one which supports UTF-8." : "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron executóse per cabera vegada a les %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
+    "Cron was not executed yet!" : "¡Cron entá nun s'executó!",
+    "Execute one task with each page loaded" : "Executar una xera con cada páxina cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a les aplicaciones usar la API de Compartición",
+    "Allow users to share via link" : "Permitir a los usuarios compartir vía enllaz",
+    "Enforce password protection" : "Ameyora la proteición por contraseña.",
+    "Allow public uploads" : "Permitir xubes públiques",
+    "Set default expiration date" : "Afitar la data d'espiración predeterminada",
+    "Expire after " : "Caduca dempués de",
+    "days" : "díes",
+    "Enforce expiration date" : "Facer cumplir la data de caducidá",
+    "Allow resharing" : "Permitir re-compartición",
+    "Restrict users to only share with users in their groups" : "Restrinxir a los usuarios a compartir namái con otros usuarios nos sos grupos",
+    "Allow users to send mail notification for shared files" : "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
+    "Exclude groups from sharing" : "Esclúi grupos de compartir",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos",
+    "Security" : "Seguridá",
+    "Enforce HTTPS" : "Forciar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
+    "Email Server" : "Sirvidor de corréu-e",
+    "This is used for sending out notifications." : "Esto úsase pa unviar notificaciones.",
+    "Send mode" : "Mou d'unviu",
+    "From address" : "Dende la direición",
+    "mail" : "corréu",
+    "Authentication method" : "Métodu d'autenticación",
+    "Authentication required" : "Necesítase autenticación",
+    "Server address" : "Direición del sirvidor",
+    "Port" : "Puertu",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nome d'usuariu SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Test email settings" : "Probar configuración de corréu electrónicu",
+    "Send email" : "Unviar mensaxe",
+    "Log" : "Rexistru",
+    "Log level" : "Nivel de rexistru",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación d'usuariu",
+    "Admin Documentation" : "Documentación p'alministradores",
+    "Enable only for specific groups" : "Habilitar namái pa grupos específicos",
+    "Uninstall App" : "Desinstalar aplicación",
+    "Administrator Documentation" : "Documentación d'alministrador",
+    "Online Documentation" : "Documentación en llinia",
+    "Forum" : "Foru",
+    "Bugtracker" : "Rastrexador de fallos",
+    "Commercial Support" : "Sofitu comercial",
+    "Get the apps to sync your files" : "Obtener les aplicaciones pa sincronizar ficheros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si quies sofitar el proyeutu\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">xúnite al desendolcu</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">¡espardi la pallabra!</a>!",
+    "Show First Run Wizard again" : "Amosar nuevamente l'Encontu d'execución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Camudóse la contraseña",
+    "Unable to change your password" : "Nun pudo camudase la contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Contraseña nueva",
+    "Change password" : "Camudar contraseña",
+    "Full Name" : "Nome completu",
+    "Email" : "Corréu-e",
+    "Your email address" : "Direición de corréu-e",
+    "Fill in an email address to enable password recovery and receive notifications" : "Introducir una direición de corréu-e p'activar la recuperación de contraseñes y recibir notificaciones",
+    "Profile picture" : "Semeya de perfil",
+    "Upload new" : "Xubir otra",
+    "Select new from Files" : "Esbillar otra dende Ficheros",
+    "Remove image" : "Desaniciar imaxe",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ficheru PNG o JPG. Preferiblemente cuadráu, pero vas poder retayalu.",
+    "Your avatar is provided by your original account." : "L'avatar ta proporcionáu pola to cuenta orixinal.",
+    "Cancel" : "Encaboxar",
+    "Choose as profile image" : "Esbillar como imaxe de perfil",
+    "Language" : "Llingua",
+    "Help translate" : "Ayúdanos nes traducciones",
+    "Import Root Certificate" : "Importar certificáu raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
+    "Log-in password" : "Contraseña d'accesu",
+    "Decrypt all Files" : "Descifrar ficheros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
+    "Restore Encryption Keys" : "Restaurar claves de cifráu.",
+    "Delete Encryption Keys" : "Desaniciar claves de cifráu",
+    "Login Name" : "Nome d'usuariu",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
+    "Search Users and Groups" : "Guetar Usuarios y Grupos",
+    "Add Group" : "Amestar grupu",
+    "Group" : "Grupu",
+    "Everyone" : "Toos",
+    "Admins" : "Almins",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Non llendáu",
+    "Other" : "Otru",
+    "Username" : "Nome d'usuariu",
+    "Quota" : "Cuota",
+    "Storage Location" : "Llocalización d'almacenamientu",
+    "Last Login" : "Caberu aniciu de sesión",
+    "change full name" : "camudar el nome completu",
+    "set new password" : "afitar nueva contraseña",
+    "Default" : "Predetermináu"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ast.php b/settings/l10n/ast.php
deleted file mode 100644
index d6a56328ff9..00000000000
--- a/settings/l10n/ast.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitar",
-"Authentication error" => "Fallu d'autenticación",
-"Your full name has been changed." => "Camudóse'l nome completu.",
-"Unable to change full name" => "Nun pue camudase'l nome completu",
-"Group already exists" => "El grupu yá esiste",
-"Unable to add group" => "Nun pudo amestase'l grupu",
-"Files decrypted successfully" => "Descifráronse los ficheros",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nun pudieron descifrase sus ficheros. Revisa'l owncloud.log o consulta col alministrador",
-"Couldn't decrypt your files, check your password and try again" => "Nun pudieron descifrase los ficheros. Revisa la contraseña ya inténtalo dempués",
-"Encryption keys deleted permanently" => "Desaniciaes dafechu les claves de cifráu",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron desaniciase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
-"Couldn't remove app." => "Nun pudo desaniciase l'aplicación.",
-"Email saved" => "Corréu-e guardáu",
-"Invalid email" => "Corréu electrónicu non válidu",
-"Unable to delete group" => "Nun pudo desaniciase'l grupu",
-"Unable to delete user" => "Nun pudo desaniciase l'usuariu",
-"Backups restored successfully" => "Copia de seguridá restaurada",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nun pudieron restaurase dafechu les tos claves de cifráu, por favor comprueba'l to owncloud.log o entruga a un alministrador",
-"Language changed" => "Camudóse la llingua",
-"Invalid request" => "Solicitú inválida",
-"Admins can't remove themself from the admin group" => "Los alministradores nun puen desaniciase a ellos mesmos del grupu d'alministrador",
-"Unable to add user to group %s" => "Nun pudo amestase l'usuariu al grupu %s",
-"Unable to remove user from group %s" => "Nun pudo desaniciase al usuariu del grupu %s",
-"Couldn't update app." => "Nun pudo anovase l'aplicación.",
-"Wrong password" => "Contraseña incorreuta",
-"No user supplied" => "Nun s'especificó un usuariu",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Facilita una contraseña de recuperación d'alministrador, sinón podríen perdese tolos datos d'usuariu",
-"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
-"Unable to change password" => "Nun pudo camudase la contraseña",
-"Saved" => "Guardáu",
-"test email settings" => "probar configuración de corréu",
-"If you received this email, the settings seem to be correct." => "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
-"Email sent" => "Corréu-e unviáu",
-"You need to set your user email before being able to send test emails." => "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
-"Sending..." => "Unviando...",
-"All" => "Toos",
-"Please wait...." => "Espera, por favor....",
-"Error while disabling app" => "Fallu mientres se desactivaba l'aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Fallu mientres s'activaba l'aplicación",
-"Updating...." => "Anovando....",
-"Error while updating app" => "Fallu mientres s'anovaba l'aplicación",
-"Updated" => "Anováu",
-"Uninstalling ...." => "Desinstalando ...",
-"Error while uninstalling app" => "Fallu mientres se desinstalaba l'aplicación",
-"Uninstall" => "Desinstalar",
-"Select a profile picture" => "Esbillar una imaxe de perfil",
-"Very weak password" => "Contraseña mui feble",
-"Weak password" => "Contraseña feble",
-"So-so password" => "Contraseña pasable",
-"Good password" => "Contraseña bona",
-"Strong password" => "Contraseña mui bona",
-"Delete" => "Desaniciar",
-"Decrypting files... Please wait, this can take some time." => "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
-"Delete encryption keys permanently." => "Desaniciar dafechu les claves de cifráu.",
-"Restore encryption keys." => "Restaurar claves de cifráu.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "Nun pue desaniciase {objName}",
-"Error creating group" => "Fallu creando grupu",
-"A valid group name must be provided" => "Hai d'escribir un nome de grupu válidu",
-"deleted {groupName}" => "desaniciáu {groupName}",
-"undo" => "desfacer",
-"never" => "enxamás",
-"deleted {userName}" => "desaniciáu {userName}",
-"add group" => "amestar Grupu",
-"A valid username must be provided" => "Tien d'apurrise un nome d'usuariu válidu",
-"Error creating user" => "Fallu al crear usuariu",
-"A valid password must be provided" => "Tien d'apurrise una contraseña válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
-"__language_name__" => "Asturianu",
-"SSL root certificates" => "Certificaos raíz SSL",
-"Encryption" => "Cifráu",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Too (Información, Avisos, Fallos, debug y problemes fatales)",
-"Info, warnings, errors and fatal issues" => "Información, Avisos, Fallos y problemes fatales",
-"Warnings, errors and fatal issues" => "Avisos, fallos y problemes fatales",
-"Errors and fatal issues" => "Fallos y problemes fatales",
-"Fatal issues only" => "Namái problemes fatales",
-"None" => "Dengún",
-"Login" => "Entamar sesión",
-"Plain" => "Planu",
-"NT LAN Manager" => "Xestor de NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Avisu de seguridá",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Tas ingresando a %s vía HTTP. Encamentámoste que configures el sirvidor pa solicitar HTTPS.",
-"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." => "El direutoriu de datos y ficheros ye dablemente accesible dende Internet, darréu que'l ficheru .htaccess nun ta funcionando. Suxerímoste que configures el sirvidor web de mou que'l direutoriu de datos nun seya accesible o que muevas talu direutoriu fuera del raigañu de documentos del sirvidor web.",
-"Setup Warning" => "Avisu de configuración",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP ta aparentemente configuráu pa desaniciar bloques de documentos en llinia. Esto va facer que delles aplicaciones principales nun tean accesibles.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dablemente esto seya culpa d'un caché o acelerador, como por exemplu Zend OPcache o eAccelerator.",
-"Database Performance Info" => "Información de rindimientu de la base de datos",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Ta usándose SQLite como base de datos. Pa instalaciones más grandes, recomendamos cambiar esto. Pa migrar a otra base de datos, usa la ferramienta de llinia de comandos: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Nun s'atopó'l módulu \"fileinfo\"",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
-"Your PHP version is outdated" => "La versión de PHP nun ta anovada",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "La versión de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
-"Locale not working" => "La configuración rexonal nun ta funcionando",
-"System locale can not be set to a one which supports UTF-8." => "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Cron executóse per cabera vegada a les %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
-"Cron was not executed yet!" => "¡Cron entá nun s'executó!",
-"Execute one task with each page loaded" => "Executar una xera con cada páxina cargada",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
-"Sharing" => "Compartiendo",
-"Allow apps to use the Share API" => "Permitir a les aplicaciones usar la API de Compartición",
-"Allow users to share via link" => "Permitir a los usuarios compartir vía enllaz",
-"Enforce password protection" => "Ameyora la proteición por contraseña.",
-"Allow public uploads" => "Permitir xubes públiques",
-"Set default expiration date" => "Afitar la data d'espiración predeterminada",
-"Expire after " => "Caduca dempués de",
-"days" => "díes",
-"Enforce expiration date" => "Facer cumplir la data de caducidá",
-"Allow resharing" => "Permitir re-compartición",
-"Restrict users to only share with users in their groups" => "Restrinxir a los usuarios a compartir namái con otros usuarios nos sos grupos",
-"Allow users to send mail notification for shared files" => "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
-"Exclude groups from sharing" => "Esclúi grupos de compartir",
-"These groups will still be able to receive shares, but not to initiate them." => "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos",
-"Security" => "Seguridá",
-"Enforce HTTPS" => "Forciar HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
-"Email Server" => "Sirvidor de corréu-e",
-"This is used for sending out notifications." => "Esto úsase pa unviar notificaciones.",
-"Send mode" => "Mou d'unviu",
-"From address" => "Dende la direición",
-"mail" => "corréu",
-"Authentication method" => "Métodu d'autenticación",
-"Authentication required" => "Necesítase autenticación",
-"Server address" => "Direición del sirvidor",
-"Port" => "Puertu",
-"Credentials" => "Credenciales",
-"SMTP Username" => "Nome d'usuariu SMTP",
-"SMTP Password" => "Contraseña SMTP",
-"Test email settings" => "Probar configuración de corréu electrónicu",
-"Send email" => "Unviar mensaxe",
-"Log" => "Rexistru",
-"Log level" => "Nivel de rexistru",
-"More" => "Más",
-"Less" => "Menos",
-"Version" => "Versión",
-"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>." => "Desendolcáu pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">códigu fonte</a> ta baxo llicencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "por",
-"Documentation:" => "Documentación:",
-"User Documentation" => "Documentación d'usuariu",
-"Admin Documentation" => "Documentación p'alministradores",
-"Enable only for specific groups" => "Habilitar namái pa grupos específicos",
-"Uninstall App" => "Desinstalar aplicación",
-"Administrator Documentation" => "Documentación d'alministrador",
-"Online Documentation" => "Documentación en llinia",
-"Forum" => "Foru",
-"Bugtracker" => "Rastrexador de fallos",
-"Commercial Support" => "Sofitu comercial",
-"Get the apps to sync your files" => "Obtener les aplicaciones pa sincronizar ficheros",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Si quies sofitar el proyeutu\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">xúnite al desendolcu</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">¡espardi la pallabra!</a>!",
-"Show First Run Wizard again" => "Amosar nuevamente l'Encontu d'execución inicial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usasti <strong>%s</strong> de los <strong>%s</strong> disponibles",
-"Password" => "Contraseña",
-"Your password was changed" => "Camudóse la contraseña",
-"Unable to change your password" => "Nun pudo camudase la contraseña",
-"Current password" => "Contraseña actual",
-"New password" => "Contraseña nueva",
-"Change password" => "Camudar contraseña",
-"Full Name" => "Nome completu",
-"Email" => "Corréu-e",
-"Your email address" => "Direición de corréu-e",
-"Fill in an email address to enable password recovery and receive notifications" => "Introducir una direición de corréu-e p'activar la recuperación de contraseñes y recibir notificaciones",
-"Profile picture" => "Semeya de perfil",
-"Upload new" => "Xubir otra",
-"Select new from Files" => "Esbillar otra dende Ficheros",
-"Remove image" => "Desaniciar imaxe",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Ficheru PNG o JPG. Preferiblemente cuadráu, pero vas poder retayalu.",
-"Your avatar is provided by your original account." => "L'avatar ta proporcionáu pola to cuenta orixinal.",
-"Cancel" => "Encaboxar",
-"Choose as profile image" => "Esbillar como imaxe de perfil",
-"Language" => "Llingua",
-"Help translate" => "Ayúdanos nes traducciones",
-"Import Root Certificate" => "Importar certificáu raíz",
-"The encryption app is no longer enabled, please decrypt all your files" => "L'aplicación de cifráu yá nun ta activada, descifra tolos ficheros",
-"Log-in password" => "Contraseña d'accesu",
-"Decrypt all Files" => "Descifrar ficheros",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
-"Restore Encryption Keys" => "Restaurar claves de cifráu.",
-"Delete Encryption Keys" => "Desaniciar claves de cifráu",
-"Login Name" => "Nome d'usuariu",
-"Create" => "Crear",
-"Admin Recovery Password" => "Recuperación de la contraseña d'alministración",
-"Enter the recovery password in order to recover the users files during password change" => "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
-"Search Users and Groups" => "Guetar Usuarios y Grupos",
-"Add Group" => "Amestar grupu",
-"Group" => "Grupu",
-"Everyone" => "Toos",
-"Admins" => "Almins",
-"Default Quota" => "Cuota predeterminada",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Non llendáu",
-"Other" => "Otru",
-"Username" => "Nome d'usuariu",
-"Quota" => "Cuota",
-"Storage Location" => "Llocalización d'almacenamientu",
-"Last Login" => "Caberu aniciu de sesión",
-"change full name" => "camudar el nome completu",
-"set new password" => "afitar nueva contraseña",
-"Default" => "Predetermináu"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/az.js b/settings/l10n/az.js
new file mode 100644
index 00000000000..1150aecda59
--- /dev/null
+++ b/settings/l10n/az.js
@@ -0,0 +1,107 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Təyinat metodikası",
+    "Your full name has been changed." : "Sizin tam adınız dəyişdirildi.",
+    "Unable to change full name" : "Tam adı dəyişmək olmur",
+    "Group already exists" : "Qrup artıq mövcuddur",
+    "Unable to add group" : "Qrupu əlavə etmək olmur",
+    "Files decrypted successfully" : "Fayllar uğurla deşifrə edildi",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
+    "Couldn't decrypt your files, check your password and try again" : "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
+    "Encryption keys deleted permanently" : "Şifrələmə açarları həmişəlik silindi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+    "Couldn't remove app." : "Proqram təminatını silmək mümkün olmadı.",
+    "Email saved" : "Məktub yadda saxlanıldı",
+    "Invalid email" : "Yalnış məktub",
+    "Unable to delete group" : "Qrupu silmək olmur",
+    "Unable to delete user" : "İstifadəçini silmək olmur",
+    "Backups restored successfully" : "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+    "Language changed" : "Dil dəyişdirildi",
+    "Invalid request" : "Səhv müraciət",
+    "Admins can't remove themself from the admin group" : "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
+    "Unable to add user to group %s" : "İstifadəçini %s qrupuna əlavə etmək mümkün olmadı",
+    "Unable to remove user from group %s" : "İstifadəçini %s qrupundan silmək mümkün olmadı",
+    "Couldn't update app." : "Proqram təminatını yeniləmək mümkün deyil.",
+    "Wrong password" : "Yalnış şifrə",
+    "No user supplied" : "Heç bir istifadəçiyə mənimsədilmir",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.",
+    "Wrong admin recovery password. Please check the password and try again." : "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.",
+    "Unable to change password" : "Şifrəni dəyişmək olmur",
+    "Saved" : "Saxlanıldı",
+    "test email settings" : "sınaq məktubu quraşdırmaları",
+    "If you received this email, the settings seem to be correct." : "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
+    "Email sent" : "Məktub göndərildi",
+    "You need to set your user email before being able to send test emails." : "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
+    "Add trusted domain" : "İnamlı domainlərə əlavə et",
+    "Sending..." : "Göndərilir...",
+    "Please wait...." : "Xahiş olunur gözləyəsiniz.",
+    "Error while disabling app" : "Proqram təminatını dayandırdıqda səhv baş verdi",
+    "Disable" : "Dayandır",
+    "Enable" : "İşə sal",
+    "Error while enabling app" : "Proqram təminatını işə saldıqda səhv baş verdi",
+    "Updating...." : "Yenilənir...",
+    "Error while updating app" : "Proqram təminatı yeniləndikdə səhv baş verdi",
+    "Updated" : "Yeniləndi",
+    "Uninstalling ...." : "Silinir...",
+    "Error while uninstalling app" : "Proqram təminatını sildikdə səhv baş verdi",
+    "Uninstall" : "Sil",
+    "Select a profile picture" : "Profil üçün şəkli seç",
+    "Very weak password" : "Çox asan şifrə",
+    "Weak password" : "Asan şifrə",
+    "So-so password" : "Elə-belə şifrə",
+    "Good password" : "Yaxşı şifrə",
+    "Strong password" : "Çətin şifrə",
+    "Delete" : "Sil",
+    "Decrypting files... Please wait, this can take some time." : "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
+    "Delete encryption keys permanently." : "Şifrələnmə açarlarını həmişəlik sil.",
+    "Restore encryption keys." : "Şifrələnmə açarlarını geri qaytar",
+    "Groups" : "Qruplar",
+    "Unable to delete {objName}" : "{objName} silmək olmur",
+    "Error creating group" : "Qrup yaranmasında səhv baş verdi",
+    "A valid group name must be provided" : "Düzgün qrup adı təyin edilməlidir",
+    "deleted {groupName}" : "{groupName} silindi",
+    "undo" : "geriyə",
+    "never" : "heç vaxt",
+    "deleted {userName}" : "{userName} silindi",
+    "add group" : "qrupu əlavə et",
+    "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir",
+    "Error creating user" : "İstifadəçi yaratdıqda səhv baş verdi",
+    "A valid password must be provided" : "Düzgün şifrə daxil edilməlidir",
+    "Warning: Home directory for user \"{user}\" already exists" : "Xəbərdarlıq: \"{user}\" istfadəçisi üçün ev qovluğu artıq mövcuddur.",
+    "__language_name__" : "__AZ_Azerbaijan__",
+    "Encryption" : "Şifrələnmə",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
+    "Info, warnings, errors and fatal issues" : "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+    "Warnings, errors and fatal issues" : "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+    "Errors and fatal issues" : "Səhvlər və ən pis hadisələr",
+    "Fatal issues only" : "Yalnız ən pis hadisələr",
+    "None" : "Heç bir",
+    "Login" : "Giriş",
+    "Plain" : "Adi",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Setup Warning" : "Quruluş xəbərdarlığı",
+    "Database Performance Info" : "Verilənlər  bazasının davamiyyəti məlumatı",
+    "Module 'fileinfo' missing" : "'fileinfo' modulu çatışmır",
+    "Your PHP version is outdated" : "Sizin PHP versiyası köhnəlib",
+    "PHP charset is not set to UTF-8" : "PHP simvol tipi UTF-8 deyil",
+    "Send mode" : "Göndərmə rejimi",
+    "Authentication method" : "Qeydiyyat metodikası",
+    "More" : "Yenə",
+    "by" : "onunla",
+    "User Documentation" : "İstifadəçi sənədləri",
+    "Admin Documentation" : "İnzibatçı sənədləri",
+    "Uninstall App" : "Proqram təminatını sil",
+    "Get the apps to sync your files" : "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
+    "Password" : "Şifrə",
+    "Change password" : "Şifrəni dəyiş",
+    "Cancel" : "Dayandır",
+    "Username" : "İstifadəçi adı"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/az.json b/settings/l10n/az.json
new file mode 100644
index 00000000000..6325a20b196
--- /dev/null
+++ b/settings/l10n/az.json
@@ -0,0 +1,105 @@
+{ "translations": {
+    "Authentication error" : "Təyinat metodikası",
+    "Your full name has been changed." : "Sizin tam adınız dəyişdirildi.",
+    "Unable to change full name" : "Tam adı dəyişmək olmur",
+    "Group already exists" : "Qrup artıq mövcuddur",
+    "Unable to add group" : "Qrupu əlavə etmək olmur",
+    "Files decrypted successfully" : "Fayllar uğurla deşifrə edildi",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
+    "Couldn't decrypt your files, check your password and try again" : "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
+    "Encryption keys deleted permanently" : "Şifrələmə açarları həmişəlik silindi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+    "Couldn't remove app." : "Proqram təminatını silmək mümkün olmadı.",
+    "Email saved" : "Məktub yadda saxlanıldı",
+    "Invalid email" : "Yalnış məktub",
+    "Unable to delete group" : "Qrupu silmək olmur",
+    "Unable to delete user" : "İstifadəçini silmək olmur",
+    "Backups restored successfully" : "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
+    "Language changed" : "Dil dəyişdirildi",
+    "Invalid request" : "Səhv müraciət",
+    "Admins can't remove themself from the admin group" : "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
+    "Unable to add user to group %s" : "İstifadəçini %s qrupuna əlavə etmək mümkün olmadı",
+    "Unable to remove user from group %s" : "İstifadəçini %s qrupundan silmək mümkün olmadı",
+    "Couldn't update app." : "Proqram təminatını yeniləmək mümkün deyil.",
+    "Wrong password" : "Yalnış şifrə",
+    "No user supplied" : "Heç bir istifadəçiyə mənimsədilmir",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.",
+    "Wrong admin recovery password. Please check the password and try again." : "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.",
+    "Unable to change password" : "Şifrəni dəyişmək olmur",
+    "Saved" : "Saxlanıldı",
+    "test email settings" : "sınaq məktubu quraşdırmaları",
+    "If you received this email, the settings seem to be correct." : "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
+    "Email sent" : "Məktub göndərildi",
+    "You need to set your user email before being able to send test emails." : "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
+    "Add trusted domain" : "İnamlı domainlərə əlavə et",
+    "Sending..." : "Göndərilir...",
+    "Please wait...." : "Xahiş olunur gözləyəsiniz.",
+    "Error while disabling app" : "Proqram təminatını dayandırdıqda səhv baş verdi",
+    "Disable" : "Dayandır",
+    "Enable" : "İşə sal",
+    "Error while enabling app" : "Proqram təminatını işə saldıqda səhv baş verdi",
+    "Updating...." : "Yenilənir...",
+    "Error while updating app" : "Proqram təminatı yeniləndikdə səhv baş verdi",
+    "Updated" : "Yeniləndi",
+    "Uninstalling ...." : "Silinir...",
+    "Error while uninstalling app" : "Proqram təminatını sildikdə səhv baş verdi",
+    "Uninstall" : "Sil",
+    "Select a profile picture" : "Profil üçün şəkli seç",
+    "Very weak password" : "Çox asan şifrə",
+    "Weak password" : "Asan şifrə",
+    "So-so password" : "Elə-belə şifrə",
+    "Good password" : "Yaxşı şifrə",
+    "Strong password" : "Çətin şifrə",
+    "Delete" : "Sil",
+    "Decrypting files... Please wait, this can take some time." : "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
+    "Delete encryption keys permanently." : "Şifrələnmə açarlarını həmişəlik sil.",
+    "Restore encryption keys." : "Şifrələnmə açarlarını geri qaytar",
+    "Groups" : "Qruplar",
+    "Unable to delete {objName}" : "{objName} silmək olmur",
+    "Error creating group" : "Qrup yaranmasında səhv baş verdi",
+    "A valid group name must be provided" : "Düzgün qrup adı təyin edilməlidir",
+    "deleted {groupName}" : "{groupName} silindi",
+    "undo" : "geriyə",
+    "never" : "heç vaxt",
+    "deleted {userName}" : "{userName} silindi",
+    "add group" : "qrupu əlavə et",
+    "A valid username must be provided" : "Düzgün istifadəçi adı daxil edilməlidir",
+    "Error creating user" : "İstifadəçi yaratdıqda səhv baş verdi",
+    "A valid password must be provided" : "Düzgün şifrə daxil edilməlidir",
+    "Warning: Home directory for user \"{user}\" already exists" : "Xəbərdarlıq: \"{user}\" istfadəçisi üçün ev qovluğu artıq mövcuddur.",
+    "__language_name__" : "__AZ_Azerbaijan__",
+    "Encryption" : "Şifrələnmə",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
+    "Info, warnings, errors and fatal issues" : "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+    "Warnings, errors and fatal issues" : "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
+    "Errors and fatal issues" : "Səhvlər və ən pis hadisələr",
+    "Fatal issues only" : "Yalnız ən pis hadisələr",
+    "None" : "Heç bir",
+    "Login" : "Giriş",
+    "Plain" : "Adi",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Setup Warning" : "Quruluş xəbərdarlığı",
+    "Database Performance Info" : "Verilənlər  bazasının davamiyyəti məlumatı",
+    "Module 'fileinfo' missing" : "'fileinfo' modulu çatışmır",
+    "Your PHP version is outdated" : "Sizin PHP versiyası köhnəlib",
+    "PHP charset is not set to UTF-8" : "PHP simvol tipi UTF-8 deyil",
+    "Send mode" : "Göndərmə rejimi",
+    "Authentication method" : "Qeydiyyat metodikası",
+    "More" : "Yenə",
+    "by" : "onunla",
+    "User Documentation" : "İstifadəçi sənədləri",
+    "Admin Documentation" : "İnzibatçı sənədləri",
+    "Uninstall App" : "Proqram təminatını sil",
+    "Get the apps to sync your files" : "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
+    "Password" : "Şifrə",
+    "Change password" : "Şifrəni dəyiş",
+    "Cancel" : "Dayandır",
+    "Username" : "İstifadəçi adı"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/az.php b/settings/l10n/az.php
deleted file mode 100644
index 24c06054c7b..00000000000
--- a/settings/l10n/az.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Təyinat metodikası",
-"Your full name has been changed." => "Sizin tam adınız dəyişdirildi.",
-"Unable to change full name" => "Tam adı dəyişmək olmur",
-"Group already exists" => "Qrup artıq mövcuddur",
-"Unable to add group" => "Qrupu əlavə etmək olmur",
-"Files decrypted successfully" => "Fayllar uğurla deşifrə edildi",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Sizin faylları deşifrə etmək olmur, xahiş olunur owncloud.log faylını yoxlaya vəya inzibatçıya müraciət edəsiniz.",
-"Couldn't decrypt your files, check your password and try again" => "Sizin faylları deşifrə etmək olmur, xahiş olunur şifrəni yoxlaya və yenidən təkrar edəsiniz.",
-"Encryption keys deleted permanently" => "Şifrələmə açarları həmişəlik silindi",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Sizin şifrələnmə açarlarınızı həmişəlik silmək mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
-"Couldn't remove app." => "Proqram təminatını silmək mümkün olmadı.",
-"Email saved" => "Məktub yadda saxlanıldı",
-"Invalid email" => "Yalnış məktub",
-"Unable to delete group" => "Qrupu silmək olmur",
-"Unable to delete user" => "İstifadəçini silmək olmur",
-"Backups restored successfully" => "Ehtiyyat nüsxələr uğurla geri qaytarıldı",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Sizin şifrələnmə açarlarınızı geri qaytarmaq mümkün olmadı, xahış olunur owncloud.log faylını yoxlaya və ya inzibatçıya müraciət edəsiniz.",
-"Language changed" => "Dil dəyişdirildi",
-"Invalid request" => "Səhv müraciət",
-"Admins can't remove themself from the admin group" => "İnzibatçılar özlərini inzibatçı qrupundan silə bilməz",
-"Unable to add user to group %s" => "İstifadəçini %s qrupuna əlavə etmək mümkün olmadı",
-"Unable to remove user from group %s" => "İstifadəçini %s qrupundan silmək mümkün olmadı",
-"Couldn't update app." => "Proqram təminatını yeniləmək mümkün deyil.",
-"Wrong password" => "Yalnış şifrə",
-"No user supplied" => "Heç bir istifadəçiyə mənimsədilmir",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Xahış olunur inzibatçı geriyə qayıdış şifrəsini təqdim edəsiniz, əks halda bütün istfadəçi datası itəcək.",
-"Wrong admin recovery password. Please check the password and try again." => "İnzibatçı geriyə qayıdış şifrəsi yalnışdır. Xahiş olunur şifrəni yoxlayıb yenidən təkrar edəsiniz.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "İnzibatçı mərkəzi şifrə dəyişilməsini dəstəkləmir ancaq, istifadəçi şifrələnmə açarı uğurla yeniləndi.",
-"Unable to change password" => "Şifrəni dəyişmək olmur",
-"Saved" => "Saxlanıldı",
-"test email settings" => "sınaq məktubu quraşdırmaları",
-"If you received this email, the settings seem to be correct." => "Əgər siz bu məktubu aldınızsa, demək quraşdırmalar düzgündür.",
-"Email sent" => "Məktub göndərildi",
-"You need to set your user email before being able to send test emails." => "Test məktubu göndərməzdən öncə, siz öz istifadəçi poçtunuzu təyiin etməlisiniz.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" adını inamlı domainlər siyahısına əlavə etməyinizdən əminsinizmi?",
-"Add trusted domain" => "İnamlı domainlərə əlavə et",
-"Sending..." => "Göndərilir...",
-"Please wait...." => "Xahiş olunur gözləyəsiniz.",
-"Error while disabling app" => "Proqram təminatını dayandırdıqda səhv baş verdi",
-"Disable" => "Dayandır",
-"Enable" => "İşə sal",
-"Error while enabling app" => "Proqram təminatını işə saldıqda səhv baş verdi",
-"Updating...." => "Yenilənir...",
-"Error while updating app" => "Proqram təminatı yeniləndikdə səhv baş verdi",
-"Updated" => "Yeniləndi",
-"Uninstalling ...." => "Silinir...",
-"Error while uninstalling app" => "Proqram təminatını sildikdə səhv baş verdi",
-"Uninstall" => "Sil",
-"Select a profile picture" => "Profil üçün şəkli seç",
-"Very weak password" => "Çox asan şifrə",
-"Weak password" => "Asan şifrə",
-"So-so password" => "Elə-belə şifrə",
-"Good password" => "Yaxşı şifrə",
-"Strong password" => "Çətin şifrə",
-"Delete" => "Sil",
-"Decrypting files... Please wait, this can take some time." => "Fayllar deşifrə edilir... Xahiş olunur gözləyəsiniz, bu biraz vaxt alacaq.",
-"Delete encryption keys permanently." => "Şifrələnmə açarlarını həmişəlik sil.",
-"Restore encryption keys." => "Şifrələnmə açarlarını geri qaytar",
-"Groups" => "Qruplar",
-"Unable to delete {objName}" => "{objName} silmək olmur",
-"Error creating group" => "Qrup yaranmasında səhv baş verdi",
-"A valid group name must be provided" => "Düzgün qrup adı təyin edilməlidir",
-"deleted {groupName}" => "{groupName} silindi",
-"undo" => "geriyə",
-"never" => "heç vaxt",
-"deleted {userName}" => "{userName} silindi",
-"add group" => "qrupu əlavə et",
-"A valid username must be provided" => "Düzgün istifadəçi adı daxil edilməlidir",
-"Error creating user" => "İstifadəçi yaratdıqda səhv baş verdi",
-"A valid password must be provided" => "Düzgün şifrə daxil edilməlidir",
-"Warning: Home directory for user \"{user}\" already exists" => "Xəbərdarlıq: \"{user}\" istfadəçisi üçün ev qovluğu artıq mövcuddur.",
-"__language_name__" => "__AZ_Azerbaijan__",
-"Encryption" => "Şifrələnmə",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Hər şey(ən pis hadisələr, səhvlər, xəbərdarlıqlar, məlmat, araşdırma səhvləri)",
-"Info, warnings, errors and fatal issues" => "Məlmat, xəbərdarlıqlar, səhvlər və ən pis hadisələr",
-"Warnings, errors and fatal issues" => "Xəbərdarlıqlar, səhvlər və ən pis hadisələr",
-"Errors and fatal issues" => "Səhvlər və ən pis hadisələr",
-"Fatal issues only" => "Yalnız ən pis hadisələr",
-"None" => "Heç bir",
-"Login" => "Giriş",
-"Plain" => "Adi",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Təhlükəsizlik xəbərdarlığı",
-"Setup Warning" => "Quruluş xəbərdarlığı",
-"Database Performance Info" => "Verilənlər  bazasının davamiyyəti məlumatı",
-"Module 'fileinfo' missing" => "'fileinfo' modulu çatışmır",
-"Your PHP version is outdated" => "Sizin PHP versiyası köhnəlib",
-"PHP charset is not set to UTF-8" => "PHP simvol tipi UTF-8 deyil",
-"Send mode" => "Göndərmə rejimi",
-"Authentication method" => "Qeydiyyat metodikası",
-"More" => "Yenə",
-"by" => "onunla",
-"User Documentation" => "İstifadəçi sənədləri",
-"Admin Documentation" => "İnzibatçı sənədləri",
-"Uninstall App" => "Proqram təminatını sil",
-"Get the apps to sync your files" => "Fayllarınızın sinxronizasiyası üçün proqramları götürün",
-"Password" => "Şifrə",
-"Change password" => "Şifrəni dəyiş",
-"Cancel" => "Dayandır",
-"Username" => "İstifadəçi adı"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/be.php b/settings/l10n/be.php
deleted file mode 100644
index 6a34f1fe246..00000000000
--- a/settings/l10n/be.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "Памылка"
-);
-$PLURAL_FORMS = "nplurals=4; 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/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
new file mode 100644
index 00000000000..b6ef50d19a0
--- /dev/null
+++ b/settings/l10n/bg_BG.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Включено",
+    "Not enabled" : "Изключено",
+    "Recommended" : "Препоръчано",
+    "Authentication error" : "Възникна проблем с идентификацията",
+    "Your full name has been changed." : "Пълното ти име е променено.",
+    "Unable to change full name" : "Неуспешна промяна на пълното име.",
+    "Group already exists" : "Групата вече съществува",
+    "Unable to add group" : "Неуспешно добавяне на група",
+    "Files decrypted successfully" : "Успешно разшифроването на файловете.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Неуспешно разшифроване на файловете ти, моля провери owncloud.log или попитай администратора.",
+    "Couldn't decrypt your files, check your password and try again" : "Неуспешно разшифроване на файловете ти, провери паролата си и опитай отново.",
+    "Encryption keys deleted permanently" : "Ключовете за криптиране са безвъзвратно изтрити",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно безвъзвратно изтриване на криптиращите ключове, моля провери своя owncloud.log или се свържи с админстратора.",
+    "Couldn't remove app." : "Неуспешно премахване на приложението.",
+    "Email saved" : "Имейла запазен",
+    "Invalid email" : "Невалиден имейл",
+    "Unable to delete group" : "Неуспешно изтриване на група",
+    "Unable to delete user" : "Неуспешно изтриване на потребител",
+    "Backups restored successfully" : "Резервното копие е успешно възстановено.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно възстановяване на криптиращите ти ключове, моля провери owncloud.log или попитай администратора.",
+    "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." : "Неуспешно обновяване на приложението.",
+    "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." : "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
+    "Unable to change password" : "Неуспешна смяна на паролата.",
+    "Saved" : "Запис",
+    "test email settings" : "провери имейл настройките",
+    "If you received this email, the settings seem to be correct." : "Ако си получил този имейл, настройките са правилни.",
+    "A problem occurred while sending the email. Please revise your settings." : "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
+    "Email sent" : "Имейлът е изпратен",
+    "You need to set your user email before being able to send test emails." : "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
+    "Add trusted domain" : "Добави сигурен домейн",
+    "Sending..." : "Изпращане...",
+    "All" : "Всички",
+    "Please wait...." : "Моля изчакайте....",
+    "Error while disabling app" : "Грешка при изключването на приложението",
+    "Disable" : "Изключено",
+    "Enable" : "Включено",
+    "Error while enabling app" : "Грешка при включване на приложението",
+    "Updating...." : "Обновява се...",
+    "Error while updating app" : "Грешка при обновяване на приложението.",
+    "Updated" : "Обновено",
+    "Uninstalling ...." : "Премахване ...",
+    "Error while uninstalling app" : "Грешка при премахването на приложението.",
+    "Uninstall" : "Премахване",
+    "Select a profile picture" : "Избери аватар",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "So-so password" : "Не особено добра парола",
+    "Good password" : "Добра парола",
+    "Strong password" : "Сигурна парола",
+    "Valid until {date}" : "Валиден до {date}",
+    "Delete" : "Изтрий",
+    "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
+    "Delete encryption keys permanently." : "Изтрий криптиращите ключове безвъзвратно.",
+    "Restore encryption keys." : "Възстанови криптиращите ключове.",
+    "Groups" : "Групи",
+    "Unable to delete {objName}" : "Неуспешно изтриване на {objName}.",
+    "Error creating group" : "Грешка при създаване на група.",
+    "A valid group name must be provided" : "Очаква се валидно име на група",
+    "deleted {groupName}" : "{groupName} изтрит",
+    "undo" : "възтановяване",
+    "never" : "никога",
+    "deleted {userName}" : "{userName} изтрит",
+    "add group" : "нова група",
+    "A valid username must be provided" : "Валидно потребителско име трябва да бъде зададено.",
+    "Error creating user" : "Грешка при създаване на потребител.",
+    "A valid password must be provided" : "Валидна парола трябва да бъде зададена.",
+    "Warning: Home directory for user \"{user}\" already exists" : "Предупреждение: Личната директория на потребителя \"{user}\" вече съществува.",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root сертификати",
+    "Encryption" : "Криптиране",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
+    "Info, warnings, errors and fatal issues" : "Информация, предупреждения, грешки и фатални проблеми",
+    "Warnings, errors and fatal issues" : "Предупреждения, грешки и фатални проблеми",
+    "Errors and fatal issues" : "Грешки и фатални проблеми",
+    "Fatal issues only" : "Само фатални проблеми",
+    "None" : "Няма",
+    "Login" : "Вход",
+    "Plain" : "Не защитен",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Предупреждение за Сигурноста",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "В момента използваш HTTP, за да посетиш %s. Силно препоръчваме да настроиш съвръра си да използва HTTPS.",
+    "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." : "Твоята директория за данни и файлове вероятно са достъпни от интернет. .htaccess файла не функционира. Силно препоръчваме да настроиш уебсъръра по такъв начин, че директорията за данни да не бъде достъпна или да я преместиш извън директорията корен на сървъра.",
+    "Setup Warning" : "Предупреждение за Настройките",
+    "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/accelerator като Zend OPache или eAccelerator.",
+    "Database Performance Info" : "Информацията за Прозиводителност на Базата Данни",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Настоящата база данни е SQLite. За по-големи инсталации препоръчваме да я смениш. За да преминеш към друга база данни използвай следната команда от командния ред: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Модулът 'fileinfo' липсва",
+    "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 откриването.",
+    "Your PHP version is outdated" : "PHP версията е остаряла.",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHP версията е остаряла. Силно препоръчваме да я обновиш на 5.3.8 или по-нова, защото по-старите версии създават проблеми. Възможно е тази инсталация да не работи правилно.",
+    "PHP charset is not set to UTF-8" : "PHP таблицата от символи не е настроена за UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP таблицата от символи не е настроена за UTF-8. Това може да предизвика големи проблеми с не ASCII символи в имена на файлове. Силно перпоръчваме да промените стойноста на 'defaul_charset' в php.ini до 'UTF-8'.",
+    "Locale not working" : "Местоположението не работи",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
+    "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
+    "Connectivity checks" : "Проверка за свързаност",
+    "No problems found" : "Не са открити проблеми",
+    "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
+    "Cron" : "Крон",
+    "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
+    "Cron was not executed yet!" : "Cron oще не е изпълнен!",
+    "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 да се свързва с cron.php всеки 15 минути по http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
+    "Sharing" : "Споделяне",
+    "Allow apps to use the Share API" : "Разреши приложенията да използват Share API.",
+    "Allow users to share via link" : "Разреши потребителите да споделят с връзка",
+    "Enforce password protection" : "Изискай защита с парола.",
+    "Allow public uploads" : "Разреши общодостъпно качване",
+    "Set default expiration date" : "Заложи дата на изтичане по подразбиране",
+    "Expire after " : "Изтечи след",
+    "days" : "дена",
+    "Enforce expiration date" : "Изисквай дата на изтичане",
+    "Allow resharing" : "Разреши пресподеляне.",
+    "Restrict users to only share with users in their groups" : "Ограничи потребителите, така че да могат да споделят само с други потребители в своите групи.",
+    "Allow users to send mail notification for shared files" : "Разреши потребителите да изпращат имейл уведомления за споделени файлове.",
+    "Exclude groups from sharing" : "Забрани групи да споделят",
+    "These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
+    "Security" : "Сигурност",
+    "Enforce HTTPS" : "Изисквай HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Задължава клиента да се свързва с %s през криптирана връзка.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Моля свържи се с твоя %s през HTTPS, за да включиш или изключиш SSL задължаването.",
+    "Email Server" : "Имейл Сървър",
+    "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
+    "Send mode" : "Режим на изпращане",
+    "From address" : "От адрес",
+    "mail" : "поща",
+    "Authentication method" : "Метод за отризиране",
+    "Authentication required" : "Нужна е идентификация",
+    "Server address" : "Адрес на сървъра",
+    "Port" : "Порт",
+    "Credentials" : "Потр. име и парола",
+    "SMTP Username" : "SMTP Потребителско Име",
+    "SMTP Password" : "SMTP Парола",
+    "Store credentials" : "Запазвай креденциите",
+    "Test email settings" : "Настройки на проверяващия имейл",
+    "Send email" : "Изпрати имейл",
+    "Log" : "Доклад",
+    "Log level" : "Детайли на доклада",
+    "More" : "Още",
+    "Less" : "По-малко",
+    "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>." : "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Още приложения",
+    "Add your app" : "Добавете Ваше приложение",
+    "by" : "от",
+    "licensed" : "лицензирано",
+    "Documentation:" : "Документация:",
+    "User Documentation" : "Потребителска Документация",
+    "Admin Documentation" : "Админ Документация",
+    "Update to %s" : "Обнови до %s",
+    "Enable only for specific groups" : "Включи само за определени групи",
+    "Uninstall App" : "Премахни Приложението",
+    "Administrator Documentation" : "Административна Документация",
+    "Online Documentation" : "Документация в Интернет",
+    "Forum" : "Форум",
+    "Bugtracker" : "Докладвани грешки",
+    "Commercial Support" : "Платена Поддръжка",
+    "Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">разпространи мълвата</a>!",
+    "Show First Run Wizard again" : "Покажи Настройките за Първоначално Зареждане отново",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Използвал си <strong>%s</strong> от наличните <strong>%s</strong>.",
+    "Password" : "Парола",
+    "Your password was changed" : "Паролата ти е промена.",
+    "Unable to change your password" : "Неуспешна промяна на паролата.",
+    "Current password" : "Текуща парола",
+    "New password" : "Нова парола",
+    "Change password" : "Промяна на паролата",
+    "Full Name" : "Пълно Име",
+    "Email" : "Имейл",
+    "Your email address" : "Твоят имейл адрес",
+    "Fill in an email address to enable password recovery and receive notifications" : "Въведи имейл, за да включиш функцията за възстановяване на паролата и уведомления.",
+    "Profile picture" : "Аватар",
+    "Upload new" : "Качи нов",
+    "Select new from Files" : "Избери нов от Файловете",
+    "Remove image" : "Премахни изображението",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Png или jpg. Най-добре в квадратни размери, но ще имаш възможност да го изрежеш.",
+    "Your avatar is provided by your original account." : "Твоят аватар е взет от оригиналния ти профил.",
+    "Cancel" : "Отказ",
+    "Choose as profile image" : "Избери като аватар",
+    "Language" : "Език",
+    "Help translate" : "Помогни с превода",
+    "Common Name" : "Познато Име",
+    "Valid until" : "Валиден до",
+    "Issued By" : "Издаден От",
+    "Valid until %s" : "Валиден до %s",
+    "Import Root Certificate" : "Внасяне на Root Сертификат",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
+    "Log-in password" : "Парола за вписване",
+    "Decrypt all Files" : "Разшифровай всички Файлове",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
+    "Restore Encryption Keys" : "Възстанови Криптиращи Ключове",
+    "Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
+    "Show storage location" : "Покажи място за запис",
+    "Show last log in" : "Покажи последно вписване",
+    "Login Name" : "Потребителско Име",
+    "Create" : "Създаване",
+    "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
+    "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
+    "Search Users and Groups" : "Търси Потребители и Групи",
+    "Add Group" : "Добави Група",
+    "Group" : "Група",
+    "Everyone" : "Всички",
+    "Admins" : "Администратори",
+    "Default Quota" : "Квота по подразбиране",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Моля, въведи квота за заделено място (пр. \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограничено",
+    "Other" : "Друга...",
+    "Username" : "Потребителско Име",
+    "Quota" : "Квота",
+    "Storage Location" : "Място за Запис",
+    "Last Login" : "Последно Вписване",
+    "change full name" : "промени пълното име",
+    "set new password" : "сложи нова парола",
+    "Default" : "По подразбиране"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
new file mode 100644
index 00000000000..363cbe9b374
--- /dev/null
+++ b/settings/l10n/bg_BG.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Включено",
+    "Not enabled" : "Изключено",
+    "Recommended" : "Препоръчано",
+    "Authentication error" : "Възникна проблем с идентификацията",
+    "Your full name has been changed." : "Пълното ти име е променено.",
+    "Unable to change full name" : "Неуспешна промяна на пълното име.",
+    "Group already exists" : "Групата вече съществува",
+    "Unable to add group" : "Неуспешно добавяне на група",
+    "Files decrypted successfully" : "Успешно разшифроването на файловете.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Неуспешно разшифроване на файловете ти, моля провери owncloud.log или попитай администратора.",
+    "Couldn't decrypt your files, check your password and try again" : "Неуспешно разшифроване на файловете ти, провери паролата си и опитай отново.",
+    "Encryption keys deleted permanently" : "Ключовете за криптиране са безвъзвратно изтрити",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно безвъзвратно изтриване на криптиращите ключове, моля провери своя owncloud.log или се свържи с админстратора.",
+    "Couldn't remove app." : "Неуспешно премахване на приложението.",
+    "Email saved" : "Имейла запазен",
+    "Invalid email" : "Невалиден имейл",
+    "Unable to delete group" : "Неуспешно изтриване на група",
+    "Unable to delete user" : "Неуспешно изтриване на потребител",
+    "Backups restored successfully" : "Резервното копие е успешно възстановено.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неуспешно възстановяване на криптиращите ти ключове, моля провери owncloud.log или попитай администратора.",
+    "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." : "Неуспешно обновяване на приложението.",
+    "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." : "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
+    "Unable to change password" : "Неуспешна смяна на паролата.",
+    "Saved" : "Запис",
+    "test email settings" : "провери имейл настройките",
+    "If you received this email, the settings seem to be correct." : "Ако си получил този имейл, настройките са правилни.",
+    "A problem occurred while sending the email. Please revise your settings." : "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
+    "Email sent" : "Имейлът е изпратен",
+    "You need to set your user email before being able to send test emails." : "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
+    "Add trusted domain" : "Добави сигурен домейн",
+    "Sending..." : "Изпращане...",
+    "All" : "Всички",
+    "Please wait...." : "Моля изчакайте....",
+    "Error while disabling app" : "Грешка при изключването на приложението",
+    "Disable" : "Изключено",
+    "Enable" : "Включено",
+    "Error while enabling app" : "Грешка при включване на приложението",
+    "Updating...." : "Обновява се...",
+    "Error while updating app" : "Грешка при обновяване на приложението.",
+    "Updated" : "Обновено",
+    "Uninstalling ...." : "Премахване ...",
+    "Error while uninstalling app" : "Грешка при премахването на приложението.",
+    "Uninstall" : "Премахване",
+    "Select a profile picture" : "Избери аватар",
+    "Very weak password" : "Много слаба парола",
+    "Weak password" : "Слаба парола",
+    "So-so password" : "Не особено добра парола",
+    "Good password" : "Добра парола",
+    "Strong password" : "Сигурна парола",
+    "Valid until {date}" : "Валиден до {date}",
+    "Delete" : "Изтрий",
+    "Decrypting files... Please wait, this can take some time." : "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
+    "Delete encryption keys permanently." : "Изтрий криптиращите ключове безвъзвратно.",
+    "Restore encryption keys." : "Възстанови криптиращите ключове.",
+    "Groups" : "Групи",
+    "Unable to delete {objName}" : "Неуспешно изтриване на {objName}.",
+    "Error creating group" : "Грешка при създаване на група.",
+    "A valid group name must be provided" : "Очаква се валидно име на група",
+    "deleted {groupName}" : "{groupName} изтрит",
+    "undo" : "възтановяване",
+    "never" : "никога",
+    "deleted {userName}" : "{userName} изтрит",
+    "add group" : "нова група",
+    "A valid username must be provided" : "Валидно потребителско име трябва да бъде зададено.",
+    "Error creating user" : "Грешка при създаване на потребител.",
+    "A valid password must be provided" : "Валидна парола трябва да бъде зададена.",
+    "Warning: Home directory for user \"{user}\" already exists" : "Предупреждение: Личната директория на потребителя \"{user}\" вече съществува.",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root сертификати",
+    "Encryption" : "Криптиране",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
+    "Info, warnings, errors and fatal issues" : "Информация, предупреждения, грешки и фатални проблеми",
+    "Warnings, errors and fatal issues" : "Предупреждения, грешки и фатални проблеми",
+    "Errors and fatal issues" : "Грешки и фатални проблеми",
+    "Fatal issues only" : "Само фатални проблеми",
+    "None" : "Няма",
+    "Login" : "Вход",
+    "Plain" : "Не защитен",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Предупреждение за Сигурноста",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "В момента използваш HTTP, за да посетиш %s. Силно препоръчваме да настроиш съвръра си да използва HTTPS.",
+    "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." : "Твоята директория за данни и файлове вероятно са достъпни от интернет. .htaccess файла не функционира. Силно препоръчваме да настроиш уебсъръра по такъв начин, че директорията за данни да не бъде достъпна или да я преместиш извън директорията корен на сървъра.",
+    "Setup Warning" : "Предупреждение за Настройките",
+    "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/accelerator като Zend OPache или eAccelerator.",
+    "Database Performance Info" : "Информацията за Прозиводителност на Базата Данни",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Настоящата база данни е SQLite. За по-големи инсталации препоръчваме да я смениш. За да преминеш към друга база данни използвай следната команда от командния ред: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Модулът 'fileinfo' липсва",
+    "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 откриването.",
+    "Your PHP version is outdated" : "PHP версията е остаряла.",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHP версията е остаряла. Силно препоръчваме да я обновиш на 5.3.8 или по-нова, защото по-старите версии създават проблеми. Възможно е тази инсталация да не работи правилно.",
+    "PHP charset is not set to UTF-8" : "PHP таблицата от символи не е настроена за UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP таблицата от символи не е настроена за UTF-8. Това може да предизвика големи проблеми с не ASCII символи в имена на файлове. Силно перпоръчваме да промените стойноста на 'defaul_charset' в php.ini до 'UTF-8'.",
+    "Locale not working" : "Местоположението не работи",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
+    "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
+    "Connectivity checks" : "Проверка за свързаност",
+    "No problems found" : "Не са открити проблеми",
+    "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
+    "Cron" : "Крон",
+    "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
+    "Cron was not executed yet!" : "Cron oще не е изпълнен!",
+    "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 да се свързва с cron.php всеки 15 минути по http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
+    "Sharing" : "Споделяне",
+    "Allow apps to use the Share API" : "Разреши приложенията да използват Share API.",
+    "Allow users to share via link" : "Разреши потребителите да споделят с връзка",
+    "Enforce password protection" : "Изискай защита с парола.",
+    "Allow public uploads" : "Разреши общодостъпно качване",
+    "Set default expiration date" : "Заложи дата на изтичане по подразбиране",
+    "Expire after " : "Изтечи след",
+    "days" : "дена",
+    "Enforce expiration date" : "Изисквай дата на изтичане",
+    "Allow resharing" : "Разреши пресподеляне.",
+    "Restrict users to only share with users in their groups" : "Ограничи потребителите, така че да могат да споделят само с други потребители в своите групи.",
+    "Allow users to send mail notification for shared files" : "Разреши потребителите да изпращат имейл уведомления за споделени файлове.",
+    "Exclude groups from sharing" : "Забрани групи да споделят",
+    "These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
+    "Security" : "Сигурност",
+    "Enforce HTTPS" : "Изисквай HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Задължава клиента да се свързва с %s през криптирана връзка.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Моля свържи се с твоя %s през HTTPS, за да включиш или изключиш SSL задължаването.",
+    "Email Server" : "Имейл Сървър",
+    "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
+    "Send mode" : "Режим на изпращане",
+    "From address" : "От адрес",
+    "mail" : "поща",
+    "Authentication method" : "Метод за отризиране",
+    "Authentication required" : "Нужна е идентификация",
+    "Server address" : "Адрес на сървъра",
+    "Port" : "Порт",
+    "Credentials" : "Потр. име и парола",
+    "SMTP Username" : "SMTP Потребителско Име",
+    "SMTP Password" : "SMTP Парола",
+    "Store credentials" : "Запазвай креденциите",
+    "Test email settings" : "Настройки на проверяващия имейл",
+    "Send email" : "Изпрати имейл",
+    "Log" : "Доклад",
+    "Log level" : "Детайли на доклада",
+    "More" : "Още",
+    "Less" : "По-малко",
+    "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>." : "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Още приложения",
+    "Add your app" : "Добавете Ваше приложение",
+    "by" : "от",
+    "licensed" : "лицензирано",
+    "Documentation:" : "Документация:",
+    "User Documentation" : "Потребителска Документация",
+    "Admin Documentation" : "Админ Документация",
+    "Update to %s" : "Обнови до %s",
+    "Enable only for specific groups" : "Включи само за определени групи",
+    "Uninstall App" : "Премахни Приложението",
+    "Administrator Documentation" : "Административна Документация",
+    "Online Documentation" : "Документация в Интернет",
+    "Forum" : "Форум",
+    "Bugtracker" : "Докладвани грешки",
+    "Commercial Support" : "Платена Поддръжка",
+    "Get the apps to sync your files" : "Изтегли програми за синхронизиране на файловете ти",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">разпространи мълвата</a>!",
+    "Show First Run Wizard again" : "Покажи Настройките за Първоначално Зареждане отново",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Използвал си <strong>%s</strong> от наличните <strong>%s</strong>.",
+    "Password" : "Парола",
+    "Your password was changed" : "Паролата ти е промена.",
+    "Unable to change your password" : "Неуспешна промяна на паролата.",
+    "Current password" : "Текуща парола",
+    "New password" : "Нова парола",
+    "Change password" : "Промяна на паролата",
+    "Full Name" : "Пълно Име",
+    "Email" : "Имейл",
+    "Your email address" : "Твоят имейл адрес",
+    "Fill in an email address to enable password recovery and receive notifications" : "Въведи имейл, за да включиш функцията за възстановяване на паролата и уведомления.",
+    "Profile picture" : "Аватар",
+    "Upload new" : "Качи нов",
+    "Select new from Files" : "Избери нов от Файловете",
+    "Remove image" : "Премахни изображението",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Png или jpg. Най-добре в квадратни размери, но ще имаш възможност да го изрежеш.",
+    "Your avatar is provided by your original account." : "Твоят аватар е взет от оригиналния ти профил.",
+    "Cancel" : "Отказ",
+    "Choose as profile image" : "Избери като аватар",
+    "Language" : "Език",
+    "Help translate" : "Помогни с превода",
+    "Common Name" : "Познато Име",
+    "Valid until" : "Валиден до",
+    "Issued By" : "Издаден От",
+    "Valid until %s" : "Валиден до %s",
+    "Import Root Certificate" : "Внасяне на Root Сертификат",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
+    "Log-in password" : "Парола за вписване",
+    "Decrypt all Files" : "Разшифровай всички Файлове",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
+    "Restore Encryption Keys" : "Възстанови Криптиращи Ключове",
+    "Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
+    "Show storage location" : "Покажи място за запис",
+    "Show last log in" : "Покажи последно вписване",
+    "Login Name" : "Потребителско Име",
+    "Create" : "Създаване",
+    "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
+    "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
+    "Search Users and Groups" : "Търси Потребители и Групи",
+    "Add Group" : "Добави Група",
+    "Group" : "Група",
+    "Everyone" : "Всички",
+    "Admins" : "Администратори",
+    "Default Quota" : "Квота по подразбиране",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Моля, въведи квота за заделено място (пр. \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограничено",
+    "Other" : "Друга...",
+    "Username" : "Потребителско Име",
+    "Quota" : "Квота",
+    "Storage Location" : "Място за Запис",
+    "Last Login" : "Последно Вписване",
+    "change full name" : "промени пълното име",
+    "set new password" : "сложи нова парола",
+    "Default" : "По подразбиране"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
deleted file mode 100644
index 786ad676868..00000000000
--- a/settings/l10n/bg_BG.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Включено",
-"Not enabled" => "Изключено",
-"Recommended" => "Препоръчано",
-"Authentication error" => "Възникна проблем с идентификацията",
-"Your full name has been changed." => "Пълното ти име е променено.",
-"Unable to change full name" => "Неуспешна промяна на пълното име.",
-"Group already exists" => "Групата вече съществува",
-"Unable to add group" => "Неуспешно добавяне на група",
-"Files decrypted successfully" => "Успешно разшифроването на файловете.",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Неуспешно разшифроване на файловете ти, моля провери owncloud.log или попитай администратора.",
-"Couldn't decrypt your files, check your password and try again" => "Неуспешно разшифроване на файловете ти, провери паролата си и опитай отново.",
-"Encryption keys deleted permanently" => "Ключовете за криптиране са безвъзвратно изтрити",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Неуспешно безвъзвратно изтриване на криптиращите ключове, моля провери своя owncloud.log или се свържи с админстратора.",
-"Couldn't remove app." => "Неуспешно премахване на приложението.",
-"Email saved" => "Имейла запазен",
-"Invalid email" => "Невалиден имейл",
-"Unable to delete group" => "Неуспешно изтриване на група",
-"Unable to delete user" => "Неуспешно изтриване на потребител",
-"Backups restored successfully" => "Резервното копие е успешно възстановено.",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Неуспешно възстановяване на криптиращите ти ключове, моля провери owncloud.log или попитай администратора.",
-"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." => "Неуспешно обновяване на приложението.",
-"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." => "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
-"Unable to change password" => "Неуспешна смяна на паролата.",
-"Saved" => "Запис",
-"test email settings" => "провери имейл настройките",
-"If you received this email, the settings seem to be correct." => "Ако си получил този имейл, настройките са правилни.",
-"A problem occurred while sending the email. Please revise your settings." => "Настъпи проблем при изпращането на имейла. Моля, провери настройките.",
-"Email sent" => "Имейлът е изпратен",
-"You need to set your user email before being able to send test emails." => "Трябва да зададеш своя имейл преди да можеш да изпратиш проверяващи имейли.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Сигурен ли си, че искащ да добавиш \"{domain}\" сигурен домейн?",
-"Add trusted domain" => "Добави сигурен домейн",
-"Sending..." => "Изпращане...",
-"All" => "Всички",
-"Please wait...." => "Моля изчакайте....",
-"Error while disabling app" => "Грешка при изключването на приложението",
-"Disable" => "Изключено",
-"Enable" => "Включено",
-"Error while enabling app" => "Грешка при включване на приложението",
-"Updating...." => "Обновява се...",
-"Error while updating app" => "Грешка при обновяване на приложението.",
-"Updated" => "Обновено",
-"Uninstalling ...." => "Премахване ...",
-"Error while uninstalling app" => "Грешка при премахването на приложението.",
-"Uninstall" => "Премахване",
-"Select a profile picture" => "Избери аватар",
-"Very weak password" => "Много слаба парола",
-"Weak password" => "Слаба парола",
-"So-so password" => "Не особено добра парола",
-"Good password" => "Добра парола",
-"Strong password" => "Сигурна парола",
-"Valid until {date}" => "Валиден до {date}",
-"Delete" => "Изтрий",
-"Decrypting files... Please wait, this can take some time." => "Разшифроване на файловете... Моля, изчакай, това може да отнеме време...",
-"Delete encryption keys permanently." => "Изтрий криптиращите ключове безвъзвратно.",
-"Restore encryption keys." => "Възстанови криптиращите ключове.",
-"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" => "нова група",
-"A valid username must be provided" => "Валидно потребителско име трябва да бъде зададено.",
-"Error creating user" => "Грешка при създаване на потребител.",
-"A valid password must be provided" => "Валидна парола трябва да бъде зададена.",
-"Warning: Home directory for user \"{user}\" already exists" => "Предупреждение: Личната директория на потребителя \"{user}\" вече съществува.",
-"__language_name__" => "__language_name__",
-"Personal Info" => "Лична Информация",
-"SSL root certificates" => "SSL root сертификати",
-"Encryption" => "Криптиране",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
-"Info, warnings, errors and fatal issues" => "Информация, предупреждения, грешки и фатални проблеми",
-"Warnings, errors and fatal issues" => "Предупреждения, грешки и фатални проблеми",
-"Errors and fatal issues" => "Грешки и фатални проблеми",
-"Fatal issues only" => "Само фатални проблеми",
-"None" => "Няма",
-"Login" => "Вход",
-"Plain" => "Не защитен",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Предупреждение за Сигурноста",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "В момента използваш HTTP, за да посетиш %s. Силно препоръчваме да настроиш съвръра си да използва HTTPS.",
-"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." => "Твоята директория за данни и файлове вероятно са достъпни от интернет. .htaccess файла не функционира. Силно препоръчваме да настроиш уебсъръра по такъв начин, че директорията за данни да не бъде достъпна или да я преместиш извън директорията корен на сървъра.",
-"Setup Warning" => "Предупреждение за Настройките",
-"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/accelerator като Zend OPache или eAccelerator.",
-"Database Performance Info" => "Информацията за Прозиводителност на Базата Данни",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Настоящата база данни е SQLite. За по-големи инсталации препоръчваме да я смениш. За да преминеш към друга база данни използвай следната команда от командния ред: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Модулът 'fileinfo' липсва",
-"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 откриването.",
-"Your PHP version is outdated" => "PHP версията е остаряла.",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP версията е остаряла. Силно препоръчваме да я обновиш на 5.3.8 или по-нова, защото по-старите версии създават проблеми. Възможно е тази инсталация да не работи правилно.",
-"PHP charset is not set to UTF-8" => "PHP таблицата от символи не е настроена за UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP таблицата от символи не е настроена за UTF-8. Това може да предизвика големи проблеми с не ASCII символи в имена на файлове. Силно перпоръчваме да промените стойноста на 'defaul_charset' в php.ini до 'UTF-8'.",
-"Locale not working" => "Местоположението не работи",
-"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 to install the required packages on your system to support one of the following locales: %s." => "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
-"URL generation in notification emails" => "Генериране на URL в имейлите за известяване",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
-"Connectivity checks" => "Проверка за свързаност",
-"No problems found" => "Не са открити проблеми",
-"Please double check the <a href='%s'>installation guides</a>." => "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
-"Cron" => "Крон",
-"Last cron was executed at %s." => "Последният cron се изпълни в %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
-"Cron was not executed yet!" => "Cron oще не е изпълнен!",
-"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 да се свързва с cron.php всеки 15 минути по http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
-"Sharing" => "Споделяне",
-"Allow apps to use the Share API" => "Разреши приложенията да използват Share API.",
-"Allow users to share via link" => "Разреши потребителите да споделят с връзка",
-"Enforce password protection" => "Изискай защита с парола.",
-"Allow public uploads" => "Разреши общодостъпно качване",
-"Set default expiration date" => "Заложи дата на изтичане по подразбиране",
-"Expire after " => "Изтечи след",
-"days" => "дена",
-"Enforce expiration date" => "Изисквай дата на изтичане",
-"Allow resharing" => "Разреши пресподеляне.",
-"Restrict users to only share with users in their groups" => "Ограничи потребителите, така че да могат да споделят само с други потребители в своите групи.",
-"Allow users to send mail notification for shared files" => "Разреши потребителите да изпращат имейл уведомления за споделени файлове.",
-"Exclude groups from sharing" => "Забрани групи да споделят",
-"These groups will still be able to receive shares, but not to initiate them." => "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
-"Security" => "Сигурност",
-"Enforce HTTPS" => "Изисквай HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Задължава клиента да се свързва с %s през криптирана връзка.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Моля свържи се с твоя %s през HTTPS, за да включиш или изключиш SSL задължаването.",
-"Email Server" => "Имейл Сървър",
-"This is used for sending out notifications." => "Това се използва за изпращане на уведомления.",
-"Send mode" => "Режим на изпращане",
-"From address" => "От адрес",
-"mail" => "поща",
-"Authentication method" => "Метод за отризиране",
-"Authentication required" => "Нужна е идентификация",
-"Server address" => "Адрес на сървъра",
-"Port" => "Порт",
-"Credentials" => "Потр. име и парола",
-"SMTP Username" => "SMTP Потребителско Име",
-"SMTP Password" => "SMTP Парола",
-"Store credentials" => "Запазвай креденциите",
-"Test email settings" => "Настройки на проверяващия имейл",
-"Send email" => "Изпрати имейл",
-"Log" => "Доклад",
-"Log level" => "Детайли на доклада",
-"More" => "Още",
-"Less" => "По-малко",
-"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>." => "Разработен от <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud обществото</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">кодът</a> е лицензиран под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Още приложения",
-"Add your app" => "Добавете Ваше приложение",
-"by" => "от",
-"licensed" => "лицензирано",
-"Documentation:" => "Документация:",
-"User Documentation" => "Потребителска Документация",
-"Admin Documentation" => "Админ Документация",
-"Update to %s" => "Обнови до %s",
-"Enable only for specific groups" => "Включи само за определени групи",
-"Uninstall App" => "Премахни Приложението",
-"Administrator Documentation" => "Административна Документация",
-"Online Documentation" => "Документация в Интернет",
-"Forum" => "Форум",
-"Bugtracker" => "Докладвани грешки",
-"Commercial Support" => "Платена Поддръжка",
-"Get the apps to sync your files" => "Изтегли програми за синхронизиране на файловете ти",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ако искаш да помогнеш на проекта:\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присъедини се и пиши код</a>\n\t\tили\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">разпространи мълвата</a>!",
-"Show First Run Wizard again" => "Покажи Настройките за Първоначално Зареждане отново",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Използвал си <strong>%s</strong> от наличните <strong>%s</strong>.",
-"Password" => "Парола",
-"Your password was changed" => "Паролата ти е промена.",
-"Unable to change your password" => "Неуспешна промяна на паролата.",
-"Current password" => "Текуща парола",
-"New password" => "Нова парола",
-"Change password" => "Промяна на паролата",
-"Full Name" => "Пълно Име",
-"Email" => "Имейл",
-"Your email address" => "Твоят имейл адрес",
-"Fill in an email address to enable password recovery and receive notifications" => "Въведи имейл, за да включиш функцията за възстановяване на паролата и уведомления.",
-"Profile picture" => "Аватар",
-"Upload new" => "Качи нов",
-"Select new from Files" => "Избери нов от Файловете",
-"Remove image" => "Премахни изображението",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Png или jpg. Най-добре в квадратни размери, но ще имаш възможност да го изрежеш.",
-"Your avatar is provided by your original account." => "Твоят аватар е взет от оригиналния ти профил.",
-"Cancel" => "Отказ",
-"Choose as profile image" => "Избери като аватар",
-"Language" => "Език",
-"Help translate" => "Помогни с превода",
-"Common Name" => "Познато Име",
-"Valid until" => "Валиден до",
-"Issued By" => "Издаден От",
-"Valid until %s" => "Валиден до %s",
-"Import Root Certificate" => "Внасяне на Root Сертификат",
-"The encryption app is no longer enabled, please decrypt all your files" => "Приложението за криптиране вече не е включено, моля разшифрирай всичките си файлове.",
-"Log-in password" => "Парола за вписване",
-"Decrypt all Files" => "Разшифровай всички Файлове",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Криптиращите ти ключове са преместени на резервно място. Ако нещо се случи ще можеш да възстановиш ключовете. Изтрий ги единствено ако си сигурен, че всички файлове са успешно разшифровани.",
-"Restore Encryption Keys" => "Възстанови Криптиращи Ключове",
-"Delete Encryption Keys" => "Изтрий Криптиращи Ключове",
-"Show storage location" => "Покажи място за запис",
-"Show last log in" => "Покажи последно вписване",
-"Login Name" => "Потребителско Име",
-"Create" => "Създаване",
-"Admin Recovery Password" => "Възстановяване на Администраторска Парола",
-"Enter the recovery password in order to recover the users files during password change" => "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
-"Search Users and Groups" => "Търси Потребители и Групи",
-"Add Group" => "Добави Група",
-"Group" => "Група",
-"Everyone" => "Всички",
-"Admins" => "Администратори",
-"Default Quota" => "Квота по подразбиране",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Моля, въведи квота за заделено място (пр. \"512 MB\" или \"12 GB\")",
-"Unlimited" => "Неограничено",
-"Other" => "Друга...",
-"Username" => "Потребителско Име",
-"Group Admin for" => "Групов администратор за",
-"Quota" => "Квота",
-"Storage Location" => "Място за Запис",
-"Last Login" => "Последно Вписване",
-"change full name" => "промени пълното име",
-"set new password" => "сложи нова парола",
-"Default" => "По подразбиране"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js
new file mode 100644
index 00000000000..ea607b32c8a
--- /dev/null
+++ b/settings/l10n/bn_BD.js
@@ -0,0 +1,107 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "কার্যকর",
+    "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
+    "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
+    "Group already exists" : "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
+    "Unable to add group" : "গোষ্ঠী যোগ করা সম্ভব হলো না",
+    "Files decrypted successfully" : "সার্থকভাবে ফাইল ডিক্রিপ্ট করা হয়েছে",
+    "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
+    "Email saved" : "ই-মেইল সংরক্ষন করা হয়েছে",
+    "Invalid email" : "ই-মেইলটি সঠিক নয়",
+    "Unable to delete group" : "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
+    "Unable to delete user" : "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
+    "Backups restored successfully" : "ব্যাকআপ পূণঃস্থাপন সুসম্পন্ন",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "িআপনার এনক্রিপসন কি পূনর্বাসন করা গেলনা, আপনার owncloud.log পিরীক্ষা করুন বা প্রশাসককে জিজ্ঞাসা করুন",
+    "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." : "অ্যাপ নবায়ন করা গেলনা।",
+    "Wrong password" : "ভুল কুটশব্দ",
+    "No user supplied" : "ব্যবহারকারী দেয়া হয়নি",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "test email settings" : "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
+    "If you received this email, the settings seem to be correct." : "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "All" : "সবাই",
+    "Error while disabling app" : "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
+    "Disable" : "নিষ্ক্রিয়",
+    "Enable" : "সক্রিয় ",
+    "Error while enabling app" : "অ্যাপ কার্যকর করতে সমস্যা দেখা দিয়েছে  ",
+    "Updating...." : "নবায়ন করা হচ্ছে....",
+    "Error while updating app" : "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে  ",
+    "Updated" : "নবায়নকৃত",
+    "Strong password" : "শক্তিশালী কুটশব্দ",
+    "Valid until {date}" : "বৈধতা বলবৎ আছে {তারিখ} অবধি ",
+    "Delete" : "মুছে",
+    "Groups" : "গোষ্ঠীসমূহ",
+    "undo" : "ক্রিয়া প্রত্যাহার",
+    "never" : "কখনোই নয়",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL  রুট সনদপত্র",
+    "Encryption" : "সংকেতায়ন",
+    "None" : "কোনটিই নয়",
+    "Login" : "প্রবেশ",
+    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
+    "Module 'fileinfo' missing" : "'fileinfo' মডিউল নেই",
+    "No problems found" : "কোন সমস্যা পাওয়া গেল না",
+    "Please double check the <a href='%s'>installation guides</a>." : "দয়া করে <a href='%s'>installation guides</a> দ্বিতীয়বার দেখুন।",
+    "Sharing" : "ভাগাভাগিরত",
+    "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও",
+    "days" : "দিনগুলি",
+    "Enforce expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
+    "Security" : "নিরাপত্তা",
+    "Email Server" : "ইমেইল সার্ভার",
+    "Send mode" : "পাঠানো মোড",
+    "From address" : "হইতে ঠিকানা",
+    "mail" : "মেইল",
+    "Server address" : "সার্ভার ঠিকানা",
+    "Port" : "পোর্ট",
+    "Send email" : "ইমেইল পাঠান ",
+    "More" : "বেশী",
+    "Less" : "কম",
+    "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>." : "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
+    "by" : "কর্তৃক",
+    "User Documentation" : "ব্যবহারকারী সহায়িকা",
+    "Administrator Documentation" : "প্রশাসক সহায়িকা",
+    "Online Documentation" : "অনলাইন সহায়িকা",
+    "Forum" : "ফোরাম",
+    "Bugtracker" : "বাগট্র্যাকার",
+    "Commercial Support" : "বাণিজ্যিক সাপোর্ট",
+    "Get the apps to sync your files" : "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন",
+    "Show First Run Wizard again" : "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
+    "Password" : "কূটশব্দ",
+    "Your password was changed" : "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে ",
+    "Unable to change your password" : "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়",
+    "Current password" : "বর্তমান কূটশব্দ",
+    "New password" : "নতুন কূটশব্দ",
+    "Change password" : "কূটশব্দ পরিবর্তন করুন",
+    "Email" : "ইমেইল",
+    "Your email address" : "আপনার ই-মেইল ঠিকানা",
+    "Cancel" : "বাতির",
+    "Language" : "ভাষা",
+    "Help translate" : "অনুবাদ করতে সহায়তা করুন",
+    "Import Root Certificate" : "রুট সনদপত্রটি আমদানি করুন",
+    "Login Name" : "প্রবেশ",
+    "Create" : "তৈরী কর",
+    "Admin Recovery Password" : "প্রশাসক পূণরূদ্ধার কুটশব্দ",
+    "Add Group" : "গ্রুপ যোগ কর",
+    "Group" : "গোষ্ঠীসমূহ",
+    "Everyone" : "সকলে",
+    "Admins" : "প্রশাসন",
+    "Unlimited" : "অসীম",
+    "Other" : "অন্যান্য",
+    "Username" : "ব্যবহারকারী",
+    "Quota" : "কোটা",
+    "Storage Location" : "সংরক্ষণাগার এর অবস্থান",
+    "Last Login" : "শেষ লগইন",
+    "change full name" : "পুরোনাম পরিবর্তন করুন",
+    "set new password" : "নতুন কূটশব্দ নির্ধারণ করুন",
+    "Default" : "পূর্বনির্ধারিত"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json
new file mode 100644
index 00000000000..337df4cb4bc
--- /dev/null
+++ b/settings/l10n/bn_BD.json
@@ -0,0 +1,105 @@
+{ "translations": {
+    "Enabled" : "কার্যকর",
+    "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
+    "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
+    "Group already exists" : "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
+    "Unable to add group" : "গোষ্ঠী যোগ করা সম্ভব হলো না",
+    "Files decrypted successfully" : "সার্থকভাবে ফাইল ডিক্রিপ্ট করা হয়েছে",
+    "Couldn't remove app." : "অ্যাপ অপসারণ করা গেলনা",
+    "Email saved" : "ই-মেইল সংরক্ষন করা হয়েছে",
+    "Invalid email" : "ই-মেইলটি সঠিক নয়",
+    "Unable to delete group" : "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
+    "Unable to delete user" : "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
+    "Backups restored successfully" : "ব্যাকআপ পূণঃস্থাপন সুসম্পন্ন",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "িআপনার এনক্রিপসন কি পূনর্বাসন করা গেলনা, আপনার owncloud.log পিরীক্ষা করুন বা প্রশাসককে জিজ্ঞাসা করুন",
+    "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." : "অ্যাপ নবায়ন করা গেলনা।",
+    "Wrong password" : "ভুল কুটশব্দ",
+    "No user supplied" : "ব্যবহারকারী দেয়া হয়নি",
+    "Saved" : "সংরক্ষণ করা হলো",
+    "test email settings" : "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
+    "If you received this email, the settings seem to be correct." : "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
+    "Email sent" : "ই-মেইল পাঠানো হয়েছে",
+    "All" : "সবাই",
+    "Error while disabling app" : "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
+    "Disable" : "নিষ্ক্রিয়",
+    "Enable" : "সক্রিয় ",
+    "Error while enabling app" : "অ্যাপ কার্যকর করতে সমস্যা দেখা দিয়েছে  ",
+    "Updating...." : "নবায়ন করা হচ্ছে....",
+    "Error while updating app" : "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে  ",
+    "Updated" : "নবায়নকৃত",
+    "Strong password" : "শক্তিশালী কুটশব্দ",
+    "Valid until {date}" : "বৈধতা বলবৎ আছে {তারিখ} অবধি ",
+    "Delete" : "মুছে",
+    "Groups" : "গোষ্ঠীসমূহ",
+    "undo" : "ক্রিয়া প্রত্যাহার",
+    "never" : "কখনোই নয়",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL  রুট সনদপত্র",
+    "Encryption" : "সংকেতায়ন",
+    "None" : "কোনটিই নয়",
+    "Login" : "প্রবেশ",
+    "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
+    "Module 'fileinfo' missing" : "'fileinfo' মডিউল নেই",
+    "No problems found" : "কোন সমস্যা পাওয়া গেল না",
+    "Please double check the <a href='%s'>installation guides</a>." : "দয়া করে <a href='%s'>installation guides</a> দ্বিতীয়বার দেখুন।",
+    "Sharing" : "ভাগাভাগিরত",
+    "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও",
+    "days" : "দিনগুলি",
+    "Enforce expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
+    "Security" : "নিরাপত্তা",
+    "Email Server" : "ইমেইল সার্ভার",
+    "Send mode" : "পাঠানো মোড",
+    "From address" : "হইতে ঠিকানা",
+    "mail" : "মেইল",
+    "Server address" : "সার্ভার ঠিকানা",
+    "Port" : "পোর্ট",
+    "Send email" : "ইমেইল পাঠান ",
+    "More" : "বেশী",
+    "Less" : "কম",
+    "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>." : "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
+    "by" : "কর্তৃক",
+    "User Documentation" : "ব্যবহারকারী সহায়িকা",
+    "Administrator Documentation" : "প্রশাসক সহায়িকা",
+    "Online Documentation" : "অনলাইন সহায়িকা",
+    "Forum" : "ফোরাম",
+    "Bugtracker" : "বাগট্র্যাকার",
+    "Commercial Support" : "বাণিজ্যিক সাপোর্ট",
+    "Get the apps to sync your files" : "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন",
+    "Show First Run Wizard again" : "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
+    "Password" : "কূটশব্দ",
+    "Your password was changed" : "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে ",
+    "Unable to change your password" : "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়",
+    "Current password" : "বর্তমান কূটশব্দ",
+    "New password" : "নতুন কূটশব্দ",
+    "Change password" : "কূটশব্দ পরিবর্তন করুন",
+    "Email" : "ইমেইল",
+    "Your email address" : "আপনার ই-মেইল ঠিকানা",
+    "Cancel" : "বাতির",
+    "Language" : "ভাষা",
+    "Help translate" : "অনুবাদ করতে সহায়তা করুন",
+    "Import Root Certificate" : "রুট সনদপত্রটি আমদানি করুন",
+    "Login Name" : "প্রবেশ",
+    "Create" : "তৈরী কর",
+    "Admin Recovery Password" : "প্রশাসক পূণরূদ্ধার কুটশব্দ",
+    "Add Group" : "গ্রুপ যোগ কর",
+    "Group" : "গোষ্ঠীসমূহ",
+    "Everyone" : "সকলে",
+    "Admins" : "প্রশাসন",
+    "Unlimited" : "অসীম",
+    "Other" : "অন্যান্য",
+    "Username" : "ব্যবহারকারী",
+    "Quota" : "কোটা",
+    "Storage Location" : "সংরক্ষণাগার এর অবস্থান",
+    "Last Login" : "শেষ লগইন",
+    "change full name" : "পুরোনাম পরিবর্তন করুন",
+    "set new password" : "নতুন কূটশব্দ নির্ধারণ করুন",
+    "Default" : "পূর্বনির্ধারিত"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/bn_BD.php b/settings/l10n/bn_BD.php
deleted file mode 100644
index 58839489eab..00000000000
--- a/settings/l10n/bn_BD.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "কার্যকর",
-"Authentication error" => "অনুমোদন ঘটিত সমস্যা",
-"Your full name has been changed." => "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
-"Group already exists" => "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
-"Unable to add group" => "গোষ্ঠী যোগ করা সম্ভব হলো না",
-"Files decrypted successfully" => "সার্থকভাবে ফাইল ডিক্রিপ্ট করা হয়েছে",
-"Couldn't remove app." => "অ্যাপ অপসারণ করা গেলনা",
-"Email saved" => "ই-মেইল সংরক্ষন করা হয়েছে",
-"Invalid email" => "ই-মেইলটি সঠিক নয়",
-"Unable to delete group" => "গোষ্ঠী মুছে ফেলা সম্ভব হলো না ",
-"Unable to delete user" => "ব্যবহারকারী মুছে ফেলা সম্ভব হলো না ",
-"Backups restored successfully" => "ব্যাকআপ পূণঃস্থাপন সুসম্পন্ন",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "িআপনার এনক্রিপসন কি পূনর্বাসন করা গেলনা, আপনার owncloud.log পিরীক্ষা করুন বা প্রশাসককে জিজ্ঞাসা করুন",
-"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." => "অ্যাপ নবায়ন করা গেলনা।",
-"Wrong password" => "ভুল কুটশব্দ",
-"No user supplied" => "ব্যবহারকারী দেয়া হয়নি",
-"Saved" => "সংরক্ষণ করা হলো",
-"test email settings" => "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
-"If you received this email, the settings seem to be correct." => "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
-"Email sent" => "ই-মেইল পাঠানো হয়েছে",
-"All" => "সবাই",
-"Error while disabling app" => "অ্যাপ অকার্যকর করতে সমস্যা দেখা দিয়েছে  ",
-"Disable" => "নিষ্ক্রিয়",
-"Enable" => "সক্রিয় ",
-"Error while enabling app" => "অ্যাপ কার্যকর করতে সমস্যা দেখা দিয়েছে  ",
-"Updating...." => "নবায়ন করা হচ্ছে....",
-"Error while updating app" => "অ্যাপ নবায়ন করতে সমস্যা দেখা দিয়েছে  ",
-"Updated" => "নবায়নকৃত",
-"Strong password" => "শক্তিশালী কুটশব্দ",
-"Valid until {date}" => "বৈধতা বলবৎ আছে {তারিখ} অবধি ",
-"Delete" => "মুছে",
-"Groups" => "গোষ্ঠীসমূহ",
-"undo" => "ক্রিয়া প্রত্যাহার",
-"never" => "কখনোই নয়",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL  রুট সনদপত্র",
-"Encryption" => "সংকেতায়ন",
-"None" => "কোনটিই নয়",
-"Login" => "প্রবেশ",
-"Security Warning" => "নিরাপত্তাজনিত সতর্কতা",
-"Module 'fileinfo' missing" => "'fileinfo' মডিউল নেই",
-"No problems found" => "কোন সমস্যা পাওয়া গেল না",
-"Please double check the <a href='%s'>installation guides</a>." => "দয়া করে <a href='%s'>installation guides</a> দ্বিতীয়বার দেখুন।",
-"Sharing" => "ভাগাভাগিরত",
-"Expire after " => "এরপর মেয়াদোত্তীর্ণ হও",
-"days" => "দিনগুলি",
-"Enforce expiration date" => "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
-"Security" => "নিরাপত্তা",
-"Email Server" => "ইমেইল সার্ভার",
-"Send mode" => "পাঠানো মোড",
-"From address" => "হইতে ঠিকানা",
-"mail" => "মেইল",
-"Server address" => "সার্ভার ঠিকানা",
-"Port" => "পোর্ট",
-"Send email" => "ইমেইল পাঠান ",
-"More" => "বেশী",
-"Less" => "কম",
-"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>." => "তৈলী করেছেন <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud সম্প্রদায়</a>, যার <a href=\"https://github.com/owncloud\" target=\"_blank\"> উৎস কোডটি <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> এর অধীনে লাইসেন্সকৃত।",
-"by" => "কর্তৃক",
-"User Documentation" => "ব্যবহারকারী সহায়িকা",
-"Administrator Documentation" => "প্রশাসক সহায়িকা",
-"Online Documentation" => "অনলাইন সহায়িকা",
-"Forum" => "ফোরাম",
-"Bugtracker" => "বাগট্র্যাকার",
-"Commercial Support" => "বাণিজ্যিক সাপোর্ট",
-"Get the apps to sync your files" => "আপনার ফাইলসমূহ সিংক করতে অ্যাপস নিন",
-"Show First Run Wizard again" => "প্রথমবার চালানোর যাদুকর পূনরায় প্রদর্শন কর",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "আপনি ব্যবহার করছেন  <strong>%s</strong>, সুলভ  <strong>%s</strong> এর মধ্যে।",
-"Password" => "কূটশব্দ",
-"Your password was changed" => "আপনার কূটশব্দটি পরিবর্তন করা হয়েছে ",
-"Unable to change your password" => "আপনার কূটশব্দটি পরিবর্তন করতে সক্ষম নয়",
-"Current password" => "বর্তমান কূটশব্দ",
-"New password" => "নতুন কূটশব্দ",
-"Change password" => "কূটশব্দ পরিবর্তন করুন",
-"Email" => "ইমেইল",
-"Your email address" => "আপনার ই-মেইল ঠিকানা",
-"Cancel" => "বাতির",
-"Language" => "ভাষা",
-"Help translate" => "অনুবাদ করতে সহায়তা করুন",
-"Import Root Certificate" => "রুট সনদপত্রটি আমদানি করুন",
-"Login Name" => "প্রবেশ",
-"Create" => "তৈরী কর",
-"Admin Recovery Password" => "প্রশাসক পূণরূদ্ধার কুটশব্দ",
-"Add Group" => "গ্রুপ যোগ কর",
-"Group" => "গোষ্ঠীসমূহ",
-"Everyone" => "সকলে",
-"Admins" => "প্রশাসন",
-"Unlimited" => "অসীম",
-"Other" => "অন্যান্য",
-"Username" => "ব্যবহারকারী",
-"Quota" => "কোটা",
-"Storage Location" => "সংরক্ষণাগার এর অবস্থান",
-"Last Login" => "শেষ লগইন",
-"change full name" => "পুরোনাম পরিবর্তন করুন",
-"set new password" => "নতুন কূটশব্দ নির্ধারণ করুন",
-"Default" => "পূর্বনির্ধারিত"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bn_IN.js b/settings/l10n/bn_IN.js
new file mode 100644
index 00000000000..7552436f21f
--- /dev/null
+++ b/settings/l10n/bn_IN.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Saved" : "সংরক্ষিত",
+    "Delete" : "মুছে ফেলা",
+    "by" : "দ্বারা",
+    "Get the apps to sync your files" : "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
+    "Cancel" : "বাতিল করা",
+    "Username" : "ইউজারনেম"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/bn_IN.json b/settings/l10n/bn_IN.json
new file mode 100644
index 00000000000..7ec4ea67aa4
--- /dev/null
+++ b/settings/l10n/bn_IN.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Saved" : "সংরক্ষিত",
+    "Delete" : "মুছে ফেলা",
+    "by" : "দ্বারা",
+    "Get the apps to sync your files" : "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
+    "Cancel" : "বাতিল করা",
+    "Username" : "ইউজারনেম"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/bn_IN.php b/settings/l10n/bn_IN.php
deleted file mode 100644
index 160df13779d..00000000000
--- a/settings/l10n/bn_IN.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Saved" => "সংরক্ষিত",
-"Delete" => "মুছে ফেলা",
-"by" => "দ্বারা",
-"Get the apps to sync your files" => "আপনার ফাইল সিঙ্ক করার অ্যাপ পান",
-"Cancel" => "বাতিল করা",
-"Username" => "ইউজারনেম"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/bs.php b/settings/l10n/bs.php
deleted file mode 100644
index 708e045adeb..00000000000
--- a/settings/l10n/bs.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Saving..." => "Spašavam..."
-);
-$PLURAL_FORMS = "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/settings/l10n/ca.js b/settings/l10n/ca.js
new file mode 100644
index 00000000000..a234364aeb9
--- /dev/null
+++ b/settings/l10n/ca.js
@@ -0,0 +1,214 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Activat",
+    "Authentication error" : "Error d'autenticació",
+    "Your full name has been changed." : "El vostre nom complet ha canviat.",
+    "Unable to change full name" : "No s'ha pogut canviar el nom complet",
+    "Group already exists" : "El grup ja existeix",
+    "Unable to add group" : "No es pot afegir el grup",
+    "Files decrypted successfully" : "Els fitxers s'han desencriptat amb èxit",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Couldn't decrypt your files, check your password and try again" : "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou",
+    "Encryption keys deleted permanently" : "Les claus d'encriptació s'han esborrat permanentment",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden esborrar les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Couldn't remove app." : "No s'ha pogut eliminar l'aplicació",
+    "Email saved" : "S'ha desat el correu electrònic",
+    "Invalid email" : "El correu electrònic no és vàlid",
+    "Unable to delete group" : "No es pot eliminar el grup",
+    "Unable to delete user" : "No es pot eliminar l'usuari",
+    "Backups restored successfully" : "Les còpies de seguretat s'han restablert correctament",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden restablir les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Language changed" : "S'ha canviat l'idioma",
+    "Invalid request" : "Sol·licitud no vàlida",
+    "Admins can't remove themself from the admin group" : "Els administradors no es poden eliminar del grup admin",
+    "Unable to add user to group %s" : "No es pot afegir l'usuari al grup %s",
+    "Unable to remove user from group %s" : "No es pot eliminar l'usuari del grup %s",
+    "Couldn't update app." : "No s'ha pogut actualitzar l'aplicació.",
+    "Wrong password" : "Contrasenya incorrecta",
+    "No user supplied" : "No heu proporcionat cap usuari",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
+    "Wrong admin recovery password. Please check the password and try again." : "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
+    "Unable to change password" : "No es pot canviar la contrasenya",
+    "Saved" : "Desat",
+    "test email settings" : "prova l'arranjament del correu",
+    "If you received this email, the settings seem to be correct." : "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
+    "Email sent" : "El correu electrónic s'ha enviat",
+    "You need to set your user email before being able to send test emails." : "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
+    "Sending..." : "Enviant...",
+    "All" : "Tots",
+    "Please wait...." : "Espereu...",
+    "Error while disabling app" : "Error en desactivar l'aplicació",
+    "Disable" : "Desactiva",
+    "Enable" : "Habilita",
+    "Error while enabling app" : "Error en activar l'aplicació",
+    "Updating...." : "Actualitzant...",
+    "Error while updating app" : "Error en actualitzar l'aplicació",
+    "Updated" : "Actualitzada",
+    "Uninstalling ...." : "Desintal·lant ...",
+    "Error while uninstalling app" : "Error en desinstal·lar l'aplicació",
+    "Uninstall" : "Desinstal·la",
+    "Select a profile picture" : "Seleccioneu una imatge de perfil",
+    "Very weak password" : "Contrasenya massa feble",
+    "Weak password" : "Contrasenya feble",
+    "So-so password" : "Contrasenya passable",
+    "Good password" : "Contrasenya bona",
+    "Strong password" : "Contrasenya forta",
+    "Delete" : "Esborra",
+    "Decrypting files... Please wait, this can take some time." : "Desencriptant fitxers... Espereu, això pot trigar una estona.",
+    "Delete encryption keys permanently." : "Esborra les claus d'encriptació permanentment.",
+    "Restore encryption keys." : "Esborra les claus d'encripació.",
+    "Groups" : "Grups",
+    "Unable to delete {objName}" : "No es pot eliminar {objName}",
+    "Error creating group" : "Error en crear el grup",
+    "A valid group name must be provided" : "Heu de facilitar un nom de grup vàlid",
+    "deleted {groupName}" : "eliminat {groupName}",
+    "undo" : "desfés",
+    "never" : "mai",
+    "deleted {userName}" : "eliminat {userName}",
+    "add group" : "afegeix grup",
+    "A valid username must be provided" : "Heu de facilitar un nom d'usuari vàlid",
+    "Error creating user" : "Error en crear l'usuari",
+    "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
+    "__language_name__" : "Català",
+    "SSL root certificates" : "Certificats SSL root",
+    "Encryption" : "Xifrat",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)",
+    "Info, warnings, errors and fatal issues" : "Informació, avisos, errors i problemes fatals",
+    "Warnings, errors and fatal issues" : "Avisos, errors i problemes fatals",
+    "Errors and fatal issues" : "Errors i problemes fatals",
+    "Fatal issues only" : "Només problemes fatals",
+    "None" : "Cap",
+    "Login" : "Inici de sessió",
+    "Plain" : "Pla",
+    "NT LAN Manager" : "Gestor NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avís de seguretat",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Esteu accedint %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
+    "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." : "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La 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.",
+    "Setup Warning" : "Avís de configuració",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Informació del rendiment de la base de dades",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "S'utilitza SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu. Per migrar a una altra base de dades useu l'eina d'intèrpret d'ordres 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "No s'ha trobat el mòdul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
+    "Your PHP version is outdated" : "La versió de PHP és obsoleta",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament.",
+    "Locale not working" : "Locale no funciona",
+    "System locale can not be set to a one which supports UTF-8." : "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
+    "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
+    "Cron was not executed yet!" : "El cron encara no s'ha executat!",
+    "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
+    "Sharing" : "Compartir",
+    "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
+    "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
+    "Enforce password protection" : "Reforça la protecció amb contrasenya",
+    "Allow public uploads" : "Permet pujada pública",
+    "Set default expiration date" : "Estableix la data de venciment",
+    "Expire after " : "Venciment després de",
+    "days" : "dies",
+    "Enforce expiration date" : "Força la data de venciment",
+    "Allow resharing" : "Permet compartir de nou",
+    "Restrict users to only share with users in their groups" : "Permet als usuaris compartir només amb usuaris del seu grup",
+    "Allow users to send mail notification for shared files" : "Permet als usuaris enviar notificacions de fitxers compartits per correu ",
+    "Exclude groups from sharing" : "Exclou grups de compartició",
+    "These groups will still be able to receive shares, but not to initiate them." : "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
+    "Security" : "Seguretat",
+    "Enforce HTTPS" : "Força HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Força la connexió dels clients a %s a través d'una connexió encriptada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
+    "Email Server" : "Servidor de correu",
+    "This is used for sending out notifications." : "S'usa per enviar notificacions.",
+    "Send mode" : "Mode d'enviament",
+    "From address" : "Des de l'adreça",
+    "mail" : "correu electrònic",
+    "Authentication method" : "Mètode d'autenticació",
+    "Authentication required" : "Es requereix autenticació",
+    "Server address" : "Adreça del servidor",
+    "Port" : "Port",
+    "Credentials" : "Credencials",
+    "SMTP Username" : "Nom d'usuari SMTP",
+    "SMTP Password" : "Contrasenya SMTP",
+    "Test email settings" : "Prova l'arranjament del correu",
+    "Send email" : "Envia correu",
+    "Log" : "Registre",
+    "Log level" : "Nivell de registre",
+    "More" : "Més",
+    "Less" : "Menys",
+    "Version" : "Versió",
+    "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>." : "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Més aplicacions",
+    "by" : "per",
+    "Documentation:" : "Documentació:",
+    "User Documentation" : "Documentació d'usuari",
+    "Admin Documentation" : "Documentació d'administrador",
+    "Enable only for specific groups" : "Activa només per grups específics",
+    "Uninstall App" : "Desinstal·la l'aplicació",
+    "Administrator Documentation" : "Documentació d'administrador",
+    "Online Documentation" : "Documentació en línia",
+    "Forum" : "Fòrum",
+    "Bugtracker" : "Seguiment d'errors",
+    "Commercial Support" : "Suport comercial",
+    "Get the apps to sync your files" : "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voleu ajudar al projecte \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">uniu-vos al seu desenvolupament</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">promoveu-lo</a>!",
+    "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
+    "Password" : "Contrasenya",
+    "Your password was changed" : "La seva contrasenya s'ha canviat",
+    "Unable to change your password" : "No s'ha pogut canviar la contrasenya",
+    "Current password" : "Contrasenya actual",
+    "New password" : "Contrasenya nova",
+    "Change password" : "Canvia la contrasenya",
+    "Full Name" : "Nom complet",
+    "Email" : "Correu electrònic",
+    "Your email address" : "Correu electrònic",
+    "Fill in an email address to enable password recovery and receive notifications" : "Ompliu una adreça de correu per poder recuperar la contrasenya i rebre notificacions",
+    "Profile picture" : "Foto de perfil",
+    "Upload new" : "Puja'n una de nova",
+    "Select new from Files" : "Selecciona'n una de nova dels fitxers",
+    "Remove image" : "Elimina imatge",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la.",
+    "Your avatar is provided by your original account." : "El vostre compte original proporciona l'avatar.",
+    "Cancel" : "Cancel·la",
+    "Choose as profile image" : "Selecciona com a imatge de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajudeu-nos amb la traducció",
+    "Import Root Certificate" : "Importa certificat root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
+    "Log-in password" : "Contrasenya d'accés",
+    "Decrypt all Files" : "Desencripta tots els fitxers",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
+    "Restore Encryption Keys" : "Restableix les claus d'encriptació",
+    "Delete Encryption Keys" : "Esborra les claus d'encriptació",
+    "Login Name" : "Nom d'accés",
+    "Create" : "Crea",
+    "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
+    "Search Users and Groups" : "Cerca usuaris i grups",
+    "Add Group" : "Afegeix grup",
+    "Group" : "Grup",
+    "Everyone" : "Tothom",
+    "Admins" : "Administradors",
+    "Default Quota" : "Quota per defecte",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Il·limitat",
+    "Other" : "Un altre",
+    "Username" : "Nom d'usuari",
+    "Quota" : "Quota",
+    "Storage Location" : "Ubicació de l'emmagatzemament",
+    "Last Login" : "Últim accés",
+    "change full name" : "canvia el nom complet",
+    "set new password" : "estableix nova contrasenya",
+    "Default" : "Per defecte"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
new file mode 100644
index 00000000000..47847ab92b1
--- /dev/null
+++ b/settings/l10n/ca.json
@@ -0,0 +1,212 @@
+{ "translations": {
+    "Enabled" : "Activat",
+    "Authentication error" : "Error d'autenticació",
+    "Your full name has been changed." : "El vostre nom complet ha canviat.",
+    "Unable to change full name" : "No s'ha pogut canviar el nom complet",
+    "Group already exists" : "El grup ja existeix",
+    "Unable to add group" : "No es pot afegir el grup",
+    "Files decrypted successfully" : "Els fitxers s'han desencriptat amb èxit",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Couldn't decrypt your files, check your password and try again" : "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou",
+    "Encryption keys deleted permanently" : "Les claus d'encriptació s'han esborrat permanentment",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden esborrar les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Couldn't remove app." : "No s'ha pogut eliminar l'aplicació",
+    "Email saved" : "S'ha desat el correu electrònic",
+    "Invalid email" : "El correu electrònic no és vàlid",
+    "Unable to delete group" : "No es pot eliminar el grup",
+    "Unable to delete user" : "No es pot eliminar l'usuari",
+    "Backups restored successfully" : "Les còpies de seguretat s'han restablert correctament",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No es poden restablir les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
+    "Language changed" : "S'ha canviat l'idioma",
+    "Invalid request" : "Sol·licitud no vàlida",
+    "Admins can't remove themself from the admin group" : "Els administradors no es poden eliminar del grup admin",
+    "Unable to add user to group %s" : "No es pot afegir l'usuari al grup %s",
+    "Unable to remove user from group %s" : "No es pot eliminar l'usuari del grup %s",
+    "Couldn't update app." : "No s'ha pogut actualitzar l'aplicació.",
+    "Wrong password" : "Contrasenya incorrecta",
+    "No user supplied" : "No heu proporcionat cap usuari",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
+    "Wrong admin recovery password. Please check the password and try again." : "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
+    "Unable to change password" : "No es pot canviar la contrasenya",
+    "Saved" : "Desat",
+    "test email settings" : "prova l'arranjament del correu",
+    "If you received this email, the settings seem to be correct." : "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
+    "Email sent" : "El correu electrónic s'ha enviat",
+    "You need to set your user email before being able to send test emails." : "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
+    "Sending..." : "Enviant...",
+    "All" : "Tots",
+    "Please wait...." : "Espereu...",
+    "Error while disabling app" : "Error en desactivar l'aplicació",
+    "Disable" : "Desactiva",
+    "Enable" : "Habilita",
+    "Error while enabling app" : "Error en activar l'aplicació",
+    "Updating...." : "Actualitzant...",
+    "Error while updating app" : "Error en actualitzar l'aplicació",
+    "Updated" : "Actualitzada",
+    "Uninstalling ...." : "Desintal·lant ...",
+    "Error while uninstalling app" : "Error en desinstal·lar l'aplicació",
+    "Uninstall" : "Desinstal·la",
+    "Select a profile picture" : "Seleccioneu una imatge de perfil",
+    "Very weak password" : "Contrasenya massa feble",
+    "Weak password" : "Contrasenya feble",
+    "So-so password" : "Contrasenya passable",
+    "Good password" : "Contrasenya bona",
+    "Strong password" : "Contrasenya forta",
+    "Delete" : "Esborra",
+    "Decrypting files... Please wait, this can take some time." : "Desencriptant fitxers... Espereu, això pot trigar una estona.",
+    "Delete encryption keys permanently." : "Esborra les claus d'encriptació permanentment.",
+    "Restore encryption keys." : "Esborra les claus d'encripació.",
+    "Groups" : "Grups",
+    "Unable to delete {objName}" : "No es pot eliminar {objName}",
+    "Error creating group" : "Error en crear el grup",
+    "A valid group name must be provided" : "Heu de facilitar un nom de grup vàlid",
+    "deleted {groupName}" : "eliminat {groupName}",
+    "undo" : "desfés",
+    "never" : "mai",
+    "deleted {userName}" : "eliminat {userName}",
+    "add group" : "afegeix grup",
+    "A valid username must be provided" : "Heu de facilitar un nom d'usuari vàlid",
+    "Error creating user" : "Error en crear l'usuari",
+    "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
+    "__language_name__" : "Català",
+    "SSL root certificates" : "Certificats SSL root",
+    "Encryption" : "Xifrat",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)",
+    "Info, warnings, errors and fatal issues" : "Informació, avisos, errors i problemes fatals",
+    "Warnings, errors and fatal issues" : "Avisos, errors i problemes fatals",
+    "Errors and fatal issues" : "Errors i problemes fatals",
+    "Fatal issues only" : "Només problemes fatals",
+    "None" : "Cap",
+    "Login" : "Inici de sessió",
+    "Plain" : "Pla",
+    "NT LAN Manager" : "Gestor NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avís de seguretat",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Esteu accedint %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
+    "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." : "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La 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.",
+    "Setup Warning" : "Avís de configuració",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Informació del rendiment de la base de dades",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "S'utilitza SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu. Per migrar a una altra base de dades useu l'eina d'intèrpret d'ordres 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "No s'ha trobat el mòdul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
+    "Your PHP version is outdated" : "La versió de PHP és obsoleta",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament.",
+    "Locale not working" : "Locale no funciona",
+    "System locale can not be set to a one which supports UTF-8." : "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
+    "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
+    "Cron was not executed yet!" : "El cron encara no s'ha executat!",
+    "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
+    "Sharing" : "Compartir",
+    "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
+    "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
+    "Enforce password protection" : "Reforça la protecció amb contrasenya",
+    "Allow public uploads" : "Permet pujada pública",
+    "Set default expiration date" : "Estableix la data de venciment",
+    "Expire after " : "Venciment després de",
+    "days" : "dies",
+    "Enforce expiration date" : "Força la data de venciment",
+    "Allow resharing" : "Permet compartir de nou",
+    "Restrict users to only share with users in their groups" : "Permet als usuaris compartir només amb usuaris del seu grup",
+    "Allow users to send mail notification for shared files" : "Permet als usuaris enviar notificacions de fitxers compartits per correu ",
+    "Exclude groups from sharing" : "Exclou grups de compartició",
+    "These groups will still be able to receive shares, but not to initiate them." : "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
+    "Security" : "Seguretat",
+    "Enforce HTTPS" : "Força HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Força la connexió dels clients a %s a través d'una connexió encriptada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
+    "Email Server" : "Servidor de correu",
+    "This is used for sending out notifications." : "S'usa per enviar notificacions.",
+    "Send mode" : "Mode d'enviament",
+    "From address" : "Des de l'adreça",
+    "mail" : "correu electrònic",
+    "Authentication method" : "Mètode d'autenticació",
+    "Authentication required" : "Es requereix autenticació",
+    "Server address" : "Adreça del servidor",
+    "Port" : "Port",
+    "Credentials" : "Credencials",
+    "SMTP Username" : "Nom d'usuari SMTP",
+    "SMTP Password" : "Contrasenya SMTP",
+    "Test email settings" : "Prova l'arranjament del correu",
+    "Send email" : "Envia correu",
+    "Log" : "Registre",
+    "Log level" : "Nivell de registre",
+    "More" : "Més",
+    "Less" : "Menys",
+    "Version" : "Versió",
+    "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>." : "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Més aplicacions",
+    "by" : "per",
+    "Documentation:" : "Documentació:",
+    "User Documentation" : "Documentació d'usuari",
+    "Admin Documentation" : "Documentació d'administrador",
+    "Enable only for specific groups" : "Activa només per grups específics",
+    "Uninstall App" : "Desinstal·la l'aplicació",
+    "Administrator Documentation" : "Documentació d'administrador",
+    "Online Documentation" : "Documentació en línia",
+    "Forum" : "Fòrum",
+    "Bugtracker" : "Seguiment d'errors",
+    "Commercial Support" : "Suport comercial",
+    "Get the apps to sync your files" : "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voleu ajudar al projecte \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">uniu-vos al seu desenvolupament</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">promoveu-lo</a>!",
+    "Show First Run Wizard again" : "Torna a mostrar l'assistent de primera execució",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
+    "Password" : "Contrasenya",
+    "Your password was changed" : "La seva contrasenya s'ha canviat",
+    "Unable to change your password" : "No s'ha pogut canviar la contrasenya",
+    "Current password" : "Contrasenya actual",
+    "New password" : "Contrasenya nova",
+    "Change password" : "Canvia la contrasenya",
+    "Full Name" : "Nom complet",
+    "Email" : "Correu electrònic",
+    "Your email address" : "Correu electrònic",
+    "Fill in an email address to enable password recovery and receive notifications" : "Ompliu una adreça de correu per poder recuperar la contrasenya i rebre notificacions",
+    "Profile picture" : "Foto de perfil",
+    "Upload new" : "Puja'n una de nova",
+    "Select new from Files" : "Selecciona'n una de nova dels fitxers",
+    "Remove image" : "Elimina imatge",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la.",
+    "Your avatar is provided by your original account." : "El vostre compte original proporciona l'avatar.",
+    "Cancel" : "Cancel·la",
+    "Choose as profile image" : "Selecciona com a imatge de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajudeu-nos amb la traducció",
+    "Import Root Certificate" : "Importa certificat root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
+    "Log-in password" : "Contrasenya d'accés",
+    "Decrypt all Files" : "Desencripta tots els fitxers",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
+    "Restore Encryption Keys" : "Restableix les claus d'encriptació",
+    "Delete Encryption Keys" : "Esborra les claus d'encriptació",
+    "Login Name" : "Nom d'accés",
+    "Create" : "Crea",
+    "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
+    "Search Users and Groups" : "Cerca usuaris i grups",
+    "Add Group" : "Afegeix grup",
+    "Group" : "Grup",
+    "Everyone" : "Tothom",
+    "Admins" : "Administradors",
+    "Default Quota" : "Quota per defecte",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Il·limitat",
+    "Other" : "Un altre",
+    "Username" : "Nom d'usuari",
+    "Quota" : "Quota",
+    "Storage Location" : "Ubicació de l'emmagatzemament",
+    "Last Login" : "Últim accés",
+    "change full name" : "canvia el nom complet",
+    "set new password" : "estableix nova contrasenya",
+    "Default" : "Per defecte"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
deleted file mode 100644
index 19fb76d29a2..00000000000
--- a/settings/l10n/ca.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Activat",
-"Authentication error" => "Error d'autenticació",
-"Your full name has been changed." => "El vostre nom complet ha canviat.",
-"Unable to change full name" => "No s'ha pogut canviar el nom complet",
-"Group already exists" => "El grup ja existeix",
-"Unable to add group" => "No es pot afegir el grup",
-"Files decrypted successfully" => "Els fitxers s'han desencriptat amb èxit",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "No es poden desencriptar els fitxers. Comproveu owncloud.log o demaneu-ho a l'administrador.",
-"Couldn't decrypt your files, check your password and try again" => "No s'han pogut desencriptar els fitxers, comproveu la contrasenya i proveu-ho de nou",
-"Encryption keys deleted permanently" => "Les claus d'encriptació s'han esborrat permanentment",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "No es poden esborrar les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
-"Couldn't remove app." => "No s'ha pogut eliminar l'aplicació",
-"Email saved" => "S'ha desat el correu electrònic",
-"Invalid email" => "El correu electrònic no és vàlid",
-"Unable to delete group" => "No es pot eliminar el grup",
-"Unable to delete user" => "No es pot eliminar l'usuari",
-"Backups restored successfully" => "Les còpies de seguretat s'han restablert correctament",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "No es poden restablir les claus d'encriptació. Comproveu owncloud.log o demaneu-ho a l'administrador.",
-"Language changed" => "S'ha canviat l'idioma",
-"Invalid request" => "Sol·licitud no vàlida",
-"Admins can't remove themself from the admin group" => "Els administradors no es poden eliminar del grup admin",
-"Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
-"Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
-"Couldn't update app." => "No s'ha pogut actualitzar l'aplicació.",
-"Wrong password" => "Contrasenya incorrecta",
-"No user supplied" => "No heu proporcionat cap usuari",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Sisplau, proporcioneu una contrasenya de recuperació d'administrador, altrament totes les dades d'usuari es perdran",
-"Wrong admin recovery password. Please check the password and try again." => "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
-"Unable to change password" => "No es pot canviar la contrasenya",
-"Saved" => "Desat",
-"test email settings" => "prova l'arranjament del correu",
-"If you received this email, the settings seem to be correct." => "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
-"Email sent" => "El correu electrónic s'ha enviat",
-"You need to set your user email before being able to send test emails." => "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
-"Sending..." => "Enviant...",
-"All" => "Tots",
-"Please wait...." => "Espereu...",
-"Error while disabling app" => "Error en desactivar l'aplicació",
-"Disable" => "Desactiva",
-"Enable" => "Habilita",
-"Error while enabling app" => "Error en activar l'aplicació",
-"Updating...." => "Actualitzant...",
-"Error while updating app" => "Error en actualitzar l'aplicació",
-"Updated" => "Actualitzada",
-"Uninstalling ...." => "Desintal·lant ...",
-"Error while uninstalling app" => "Error en desinstal·lar l'aplicació",
-"Uninstall" => "Desinstal·la",
-"Select a profile picture" => "Seleccioneu una imatge de perfil",
-"Very weak password" => "Contrasenya massa feble",
-"Weak password" => "Contrasenya feble",
-"So-so password" => "Contrasenya passable",
-"Good password" => "Contrasenya bona",
-"Strong password" => "Contrasenya forta",
-"Delete" => "Esborra",
-"Decrypting files... Please wait, this can take some time." => "Desencriptant fitxers... Espereu, això pot trigar una estona.",
-"Delete encryption keys permanently." => "Esborra les claus d'encriptació permanentment.",
-"Restore encryption keys." => "Esborra les claus d'encripació.",
-"Groups" => "Grups",
-"Unable to delete {objName}" => "No es pot eliminar {objName}",
-"Error creating group" => "Error en crear el grup",
-"A valid group name must be provided" => "Heu de facilitar un nom de grup vàlid",
-"deleted {groupName}" => "eliminat {groupName}",
-"undo" => "desfés",
-"never" => "mai",
-"deleted {userName}" => "eliminat {userName}",
-"add group" => "afegeix grup",
-"A valid username must be provided" => "Heu de facilitar un nom d'usuari vàlid",
-"Error creating user" => "Error en crear l'usuari",
-"A valid password must be provided" => "Heu de facilitar una contrasenya vàlida",
-"Warning: Home directory for user \"{user}\" already exists" => "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
-"__language_name__" => "Català",
-"SSL root certificates" => "Certificats SSL root",
-"Encryption" => "Xifrat",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tot (problemes fatals, errors, avisos, informació, depuració)",
-"Info, warnings, errors and fatal issues" => "Informació, avisos, errors i problemes fatals",
-"Warnings, errors and fatal issues" => "Avisos, errors i problemes fatals",
-"Errors and fatal issues" => "Errors i problemes fatals",
-"Fatal issues only" => "Només problemes fatals",
-"None" => "Cap",
-"Login" => "Inici de sessió",
-"Plain" => "Pla",
-"NT LAN Manager" => "Gestor NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Avís de seguretat",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Esteu accedint %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
-"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." => "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La 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.",
-"Setup Warning" => "Avís de configuració",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Això probablement està provocat per una cau/accelerador com Zend OPcache o eAccelerator.",
-"Database Performance Info" => "Informació del rendiment de la base de dades",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "S'utilitza SQLite com a base de dades. Per instal·lacions grans recomanem que la canvieu. Per migrar a una altra base de dades useu l'eina d'intèrpret d'ordres 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "No s'ha trobat el mòdul 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
-"Your PHP version is outdated" => "La versió de PHP és obsoleta",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament.",
-"Locale not working" => "Locale no funciona",
-"System locale can not be set to a one which supports UTF-8." => "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
-"Please double check the <a href='%s'>installation guides</a>." => "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "L'últim cron s'ha executat el %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
-"Cron was not executed yet!" => "El cron encara no s'ha executat!",
-"Execute one task with each page loaded" => "Executa una tasca per cada paquet carregat",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
-"Sharing" => "Compartir",
-"Allow apps to use the Share API" => "Permet que les aplicacions utilitzin l'API de compartir",
-"Allow users to share via link" => "Permet als usuaris compartir a través d'enllaços",
-"Enforce password protection" => "Reforça la protecció amb contrasenya",
-"Allow public uploads" => "Permet pujada pública",
-"Set default expiration date" => "Estableix la data de venciment",
-"Expire after " => "Venciment després de",
-"days" => "dies",
-"Enforce expiration date" => "Força la data de venciment",
-"Allow resharing" => "Permet compartir de nou",
-"Restrict users to only share with users in their groups" => "Permet als usuaris compartir només amb usuaris del seu grup",
-"Allow users to send mail notification for shared files" => "Permet als usuaris enviar notificacions de fitxers compartits per correu ",
-"Exclude groups from sharing" => "Exclou grups de compartició",
-"These groups will still be able to receive shares, but not to initiate them." => "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
-"Security" => "Seguretat",
-"Enforce HTTPS" => "Força HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Força la connexió dels clients a %s a través d'una connexió encriptada.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
-"Email Server" => "Servidor de correu",
-"This is used for sending out notifications." => "S'usa per enviar notificacions.",
-"Send mode" => "Mode d'enviament",
-"From address" => "Des de l'adreça",
-"mail" => "correu electrònic",
-"Authentication method" => "Mètode d'autenticació",
-"Authentication required" => "Es requereix autenticació",
-"Server address" => "Adreça del servidor",
-"Port" => "Port",
-"Credentials" => "Credencials",
-"SMTP Username" => "Nom d'usuari SMTP",
-"SMTP Password" => "Contrasenya SMTP",
-"Test email settings" => "Prova l'arranjament del correu",
-"Send email" => "Envia correu",
-"Log" => "Registre",
-"Log level" => "Nivell de registre",
-"More" => "Més",
-"Less" => "Menys",
-"Version" => "Versió",
-"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>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Més aplicacions",
-"by" => "per",
-"Documentation:" => "Documentació:",
-"User Documentation" => "Documentació d'usuari",
-"Admin Documentation" => "Documentació d'administrador",
-"Enable only for specific groups" => "Activa només per grups específics",
-"Uninstall App" => "Desinstal·la l'aplicació",
-"Administrator Documentation" => "Documentació d'administrador",
-"Online Documentation" => "Documentació en línia",
-"Forum" => "Fòrum",
-"Bugtracker" => "Seguiment d'errors",
-"Commercial Support" => "Suport comercial",
-"Get the apps to sync your files" => "Obtingueu les aplicacions per sincronitzar els vostres fitxers",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Si voleu ajudar al projecte \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">uniu-vos al seu desenvolupament</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">promoveu-lo</a>!",
-"Show First Run Wizard again" => "Torna a mostrar l'assistent de primera execució",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Heu utilitzat <strong>%s</strong> d'un total disponible de <strong>%s</strong>",
-"Password" => "Contrasenya",
-"Your password was changed" => "La seva contrasenya s'ha canviat",
-"Unable to change your password" => "No s'ha pogut canviar la contrasenya",
-"Current password" => "Contrasenya actual",
-"New password" => "Contrasenya nova",
-"Change password" => "Canvia la contrasenya",
-"Full Name" => "Nom complet",
-"Email" => "Correu electrònic",
-"Your email address" => "Correu electrònic",
-"Fill in an email address to enable password recovery and receive notifications" => "Ompliu una adreça de correu per poder recuperar la contrasenya i rebre notificacions",
-"Profile picture" => "Foto de perfil",
-"Upload new" => "Puja'n una de nova",
-"Select new from Files" => "Selecciona'n una de nova dels fitxers",
-"Remove image" => "Elimina imatge",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Pot ser png o jpg. Idealment quadrada, però podreu retallar-la.",
-"Your avatar is provided by your original account." => "El vostre compte original proporciona l'avatar.",
-"Cancel" => "Cancel·la",
-"Choose as profile image" => "Selecciona com a imatge de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ajudeu-nos amb la traducció",
-"Import Root Certificate" => "Importa certificat root",
-"The encryption app is no longer enabled, please decrypt all your files" => "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
-"Log-in password" => "Contrasenya d'accés",
-"Decrypt all Files" => "Desencripta tots els fitxers",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
-"Restore Encryption Keys" => "Restableix les claus d'encriptació",
-"Delete Encryption Keys" => "Esborra les claus d'encriptació",
-"Login Name" => "Nom d'accés",
-"Create" => "Crea",
-"Admin Recovery Password" => "Recuperació de contrasenya d'administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
-"Search Users and Groups" => "Cerca usuaris i grups",
-"Add Group" => "Afegeix grup",
-"Group" => "Grup",
-"Everyone" => "Tothom",
-"Admins" => "Administradors",
-"Default Quota" => "Quota per defecte",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Il·limitat",
-"Other" => "Un altre",
-"Username" => "Nom d'usuari",
-"Quota" => "Quota",
-"Storage Location" => "Ubicació de l'emmagatzemament",
-"Last Login" => "Últim accés",
-"change full name" => "canvia el nom complet",
-"set new password" => "estableix nova contrasenya",
-"Default" => "Per defecte"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
new file mode 100644
index 00000000000..df2c43b6b8d
--- /dev/null
+++ b/settings/l10n/cs_CZ.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Povoleno",
+    "Not enabled" : "Vypnuto",
+    "Recommended" : "Doporučeno",
+    "Authentication error" : "Chyba přihlášení",
+    "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
+    "Unable to change full name" : "Nelze změnit celé jméno",
+    "Group already exists" : "Skupina již existuje",
+    "Unable to add group" : "Nelze přidat skupinu",
+    "Files decrypted successfully" : "Soubory úspěšně dešifrovány",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't decrypt your files, check your password and try again" : "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
+    "Encryption keys deleted permanently" : "Šifrovací klíče trvale smazány",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
+    "Email saved" : "E-mail uložen",
+    "Invalid email" : "Neplatný e-mail",
+    "Unable to delete group" : "Nelze smazat skupinu",
+    "Unable to delete user" : "Nelze smazat uživatele",
+    "Backups restored successfully" : "Zálohy úspěšně obnoveny",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Language changed" : "Jazyk byl změněn",
+    "Invalid request" : "Neplatný požadavek",
+    "Admins can't remove themself from the admin group" : "Správci se nemohou odebrat sami ze skupiny správců",
+    "Unable to add user to group %s" : "Nelze přidat uživatele do skupiny %s",
+    "Unable to remove user from group %s" : "Nelze odebrat uživatele ze skupiny %s",
+    "Couldn't update app." : "Nelze aktualizovat aplikaci.",
+    "Wrong password" : "Nesprávné heslo",
+    "No user supplied" : "Nebyl uveden uživatel",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena",
+    "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
+    "Unable to change password" : "Změna hesla se nezdařila",
+    "Saved" : "Uloženo",
+    "test email settings" : "otestovat nastavení e-mailu",
+    "If you received this email, the settings seem to be correct." : "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
+    "A problem occurred while sending the email. Please revise your settings." : "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.",
+    "Email sent" : "E-mail odeslán",
+    "You need to set your user email before being able to send test emails." : "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
+    "Add trusted domain" : "Přidat důvěryhodnou doménu",
+    "Sending..." : "Odesílání...",
+    "All" : "Vše",
+    "Please wait...." : "Čekejte prosím...",
+    "Error while disabling app" : "Chyba při zakazování aplikace",
+    "Disable" : "Zakázat",
+    "Enable" : "Povolit",
+    "Error while enabling app" : "Chyba při povolování aplikace",
+    "Updating...." : "Aktualizuji...",
+    "Error while updating app" : "Chyba při aktualizaci aplikace",
+    "Updated" : "Aktualizováno",
+    "Uninstalling ...." : "Probíhá odinstalace ...",
+    "Error while uninstalling app" : "Chyba při odinstalaci aplikace",
+    "Uninstall" : "Odinstalovat",
+    "Select a profile picture" : "Vyberte profilový obrázek",
+    "Very weak password" : "Velmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Středně silné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Valid until {date}" : "Platný do {date}",
+    "Delete" : "Smazat",
+    "Decrypting files... Please wait, this can take some time." : "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
+    "Delete encryption keys permanently." : "Trvale smazat šifrovací klíče.",
+    "Restore encryption keys." : "Obnovit šifrovací klíče.",
+    "Groups" : "Skupiny",
+    "Unable to delete {objName}" : "Nelze smazat {objName}",
+    "Error creating group" : "Chyba při vytváření skupiny",
+    "A valid group name must be provided" : "Musíte zadat platný název skupiny",
+    "deleted {groupName}" : "smazána {groupName}",
+    "undo" : "vrátit zpět",
+    "no group" : "není ve skupině",
+    "never" : "nikdy",
+    "deleted {userName}" : "smazán {userName}",
+    "add group" : "přidat skupinu",
+    "A valid username must be provided" : "Musíte zadat platné uživatelské jméno",
+    "Error creating user" : "Chyba při vytváření užiatele",
+    "A valid password must be provided" : "Musíte zadat platné heslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varování: Osobní složka uživatele \"{user}\" již existuje.",
+    "__language_name__" : "Česky",
+    "Personal Info" : "Osobní informace",
+    "SSL root certificates" : "Kořenové certifikáty SSL",
+    "Encryption" : "Šifrování",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
+    "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
+    "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy",
+    "Errors and fatal issues" : "Chyby a fatální problémy",
+    "Fatal issues only" : "Pouze fatální problémy",
+    "None" : "Žádné",
+    "Login" : "Přihlásit",
+    "Plain" : "Čistý text",
+    "NT LAN Manager" : "Správce NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Bezpečnostní upozornění",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Přistupujete na %s protokolem HTTP. Důrazně doporučujeme nakonfigurovat server pro použití HTTPS.",
+    "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." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
+    "Setup Warning" : "Upozornění nastavení",
+    "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.",
+    "Database Performance Info" : "Informace o výkonu databáze",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Schází modul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.",
+    "Your PHP version is outdated" : "Vaše verze PHP je zastaralá",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Vámi používaná verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze obsahují chyby. Je možné, že tato instalace nebude fungovat správně.",
+    "PHP charset is not set to UTF-8" : "Znaková sada PHP není nastavena na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Znaková sada PHP není nastavena na UTF-8. To může způsobit závažné problémy se jmény souborů se znaky neobsaženými v ASCII. Důrazně doporučujeme změnit hodnotu 'default_charset' v php.ini na 'UTF-8'.",
+    "Locale not working" : "Lokalizace nefunguje",
+    "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
+    "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
+    "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Connectivity checks" : "Ověřování připojení",
+    "No problems found" : "Nebyly nalezeny žádné problémy",
+    "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
+    "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
+    "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
+    "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.",
+    "Sharing" : "Sdílení",
+    "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ů",
+    "Enforce password protection" : "Vynutit ochranu heslem",
+    "Allow public uploads" : "Povolit veřejné nahrávání souborů",
+    "Set default expiration date" : "Nastavit výchozí datum vypršení platnosti",
+    "Expire after " : "Vyprší po",
+    "days" : "dnech",
+    "Enforce expiration date" : "Vynutit datum vypršení",
+    "Allow resharing" : "Povolit znovu-sdílení",
+    "Restrict users to only share with users in their groups" : "Povolit sdílení pouze mezi uživateli v rámci skupiny",
+    "Allow users to send mail notification for shared files" : "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
+    "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.",
+    "Security" : "Zabezpečení",
+    "Enforce HTTPS" : "Vynutit HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Vynutí připojování klientů k %s šifrovaným spojením.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
+    "Email Server" : "E-mailový server",
+    "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
+    "Send mode" : "Mód odesílání",
+    "From address" : "Adresa odesílatele",
+    "mail" : "e-mail",
+    "Authentication method" : "Metoda ověření",
+    "Authentication required" : "Vyžadováno ověření",
+    "Server address" : "Adresa serveru",
+    "Port" : "Port",
+    "Credentials" : "Přihlašovací údaje",
+    "SMTP Username" : "SMTP uživatelské jméno ",
+    "SMTP Password" : "SMTP heslo",
+    "Store credentials" : "Ukládat přihlašovací údaje",
+    "Test email settings" : "Otestovat nastavení e-mailu",
+    "Send email" : "Odeslat e-mail",
+    "Log" : "Záznam",
+    "Log level" : "Úroveň zaznamenávání",
+    "More" : "Více",
+    "Less" : "Méně",
+    "Version" : "Verze",
+    "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>." : "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Více aplikací",
+    "Add your app" : "Přidat vlastní aplikaci",
+    "by" : "sdílí",
+    "licensed" : "licencováno",
+    "Documentation:" : "Dokumentace:",
+    "User Documentation" : "Uživatelská dokumentace",
+    "Admin Documentation" : "Dokumentace pro administrátory",
+    "Update to %s" : "Aktualizovat na %s",
+    "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny",
+    "Uninstall App" : "Odinstalovat aplikaci",
+    "Administrator Documentation" : "Dokumentace správce",
+    "Online Documentation" : "Online dokumentace",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Placená podpora",
+    "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">přidejte se k vývoji</a>\n⇥⇥nebo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">šiřte osvětu</a>!",
+    "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
+    "Password" : "Heslo",
+    "Your password was changed" : "Vaše heslo bylo změněno",
+    "Unable to change your password" : "Změna vašeho hesla se nezdařila",
+    "Current password" : "Současné heslo",
+    "New password" : "Nové heslo",
+    "Change password" : "Změnit heslo",
+    "Full Name" : "Celé jméno",
+    "Email" : "E-mail",
+    "Your email address" : "Vaše e-mailová adresa",
+    "Fill in an email address to enable password recovery and receive notifications" : "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění",
+    "Profile picture" : "Profilový obrázek",
+    "Upload new" : "Nahrát nový",
+    "Select new from Files" : "Vyberte nový ze souborů",
+    "Remove image" : "Odebrat obrázek",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout.",
+    "Your avatar is provided by your original account." : "Váš avatar je poskytován Vaším původním účtem.",
+    "Cancel" : "Zrušit",
+    "Choose as profile image" : "Vybrat jako profilový obrázek",
+    "Language" : "Jazyk",
+    "Help translate" : "Pomoci s překladem",
+    "Common Name" : "Common Name",
+    "Valid until" : "Platný do",
+    "Issued By" : "Vydal",
+    "Valid until %s" : "Platný do %s",
+    "Import Root Certificate" : "Import kořenového certifikátu",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
+    "Log-in password" : "Přihlašovací heslo",
+    "Decrypt all Files" : "Odšifrovat všechny soubory",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
+    "Restore Encryption Keys" : "Obnovit šifrovací klíče",
+    "Delete Encryption Keys" : "Smazat šifrovací klíče",
+    "Show storage location" : "Zobrazit umístění úložiště",
+    "Show last log in" : "Zobrazit poslední přihlášení",
+    "Login Name" : "Přihlašovací jméno",
+    "Create" : "Vytvořit",
+    "Admin Recovery Password" : "Heslo obnovy správce",
+    "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
+    "Search Users and Groups" : "Prohledat uživatele a skupiny",
+    "Add Group" : "Přidat skupinu",
+    "Group" : "Skupina",
+    "Everyone" : "Všichni",
+    "Admins" : "Administrátoři",
+    "Default Quota" : "Výchozí kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
+    "Unlimited" : "Neomezeně",
+    "Other" : "Jiný",
+    "Username" : "Uživatelské jméno",
+    "Group Admin for" : "Administrátor skupiny ",
+    "Quota" : "Kvóta",
+    "Storage Location" : "Umístění úložiště",
+    "Last Login" : "Poslední přihlášení",
+    "change full name" : "změnit celé jméno",
+    "set new password" : "nastavit nové heslo",
+    "Default" : "Výchozí"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
new file mode 100644
index 00000000000..cb124e02c6a
--- /dev/null
+++ b/settings/l10n/cs_CZ.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Povoleno",
+    "Not enabled" : "Vypnuto",
+    "Recommended" : "Doporučeno",
+    "Authentication error" : "Chyba přihlášení",
+    "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
+    "Unable to change full name" : "Nelze změnit celé jméno",
+    "Group already exists" : "Skupina již existuje",
+    "Unable to add group" : "Nelze přidat skupinu",
+    "Files decrypted successfully" : "Soubory úspěšně dešifrovány",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't decrypt your files, check your password and try again" : "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
+    "Encryption keys deleted permanently" : "Šifrovací klíče trvale smazány",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
+    "Email saved" : "E-mail uložen",
+    "Invalid email" : "Neplatný e-mail",
+    "Unable to delete group" : "Nelze smazat skupinu",
+    "Unable to delete user" : "Nelze smazat uživatele",
+    "Backups restored successfully" : "Zálohy úspěšně obnoveny",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Language changed" : "Jazyk byl změněn",
+    "Invalid request" : "Neplatný požadavek",
+    "Admins can't remove themself from the admin group" : "Správci se nemohou odebrat sami ze skupiny správců",
+    "Unable to add user to group %s" : "Nelze přidat uživatele do skupiny %s",
+    "Unable to remove user from group %s" : "Nelze odebrat uživatele ze skupiny %s",
+    "Couldn't update app." : "Nelze aktualizovat aplikaci.",
+    "Wrong password" : "Nesprávné heslo",
+    "No user supplied" : "Nebyl uveden uživatel",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena",
+    "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
+    "Unable to change password" : "Změna hesla se nezdařila",
+    "Saved" : "Uloženo",
+    "test email settings" : "otestovat nastavení e-mailu",
+    "If you received this email, the settings seem to be correct." : "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
+    "A problem occurred while sending the email. Please revise your settings." : "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.",
+    "Email sent" : "E-mail odeslán",
+    "You need to set your user email before being able to send test emails." : "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
+    "Add trusted domain" : "Přidat důvěryhodnou doménu",
+    "Sending..." : "Odesílání...",
+    "All" : "Vše",
+    "Please wait...." : "Čekejte prosím...",
+    "Error while disabling app" : "Chyba při zakazování aplikace",
+    "Disable" : "Zakázat",
+    "Enable" : "Povolit",
+    "Error while enabling app" : "Chyba při povolování aplikace",
+    "Updating...." : "Aktualizuji...",
+    "Error while updating app" : "Chyba při aktualizaci aplikace",
+    "Updated" : "Aktualizováno",
+    "Uninstalling ...." : "Probíhá odinstalace ...",
+    "Error while uninstalling app" : "Chyba při odinstalaci aplikace",
+    "Uninstall" : "Odinstalovat",
+    "Select a profile picture" : "Vyberte profilový obrázek",
+    "Very weak password" : "Velmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Středně silné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Valid until {date}" : "Platný do {date}",
+    "Delete" : "Smazat",
+    "Decrypting files... Please wait, this can take some time." : "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
+    "Delete encryption keys permanently." : "Trvale smazat šifrovací klíče.",
+    "Restore encryption keys." : "Obnovit šifrovací klíče.",
+    "Groups" : "Skupiny",
+    "Unable to delete {objName}" : "Nelze smazat {objName}",
+    "Error creating group" : "Chyba při vytváření skupiny",
+    "A valid group name must be provided" : "Musíte zadat platný název skupiny",
+    "deleted {groupName}" : "smazána {groupName}",
+    "undo" : "vrátit zpět",
+    "no group" : "není ve skupině",
+    "never" : "nikdy",
+    "deleted {userName}" : "smazán {userName}",
+    "add group" : "přidat skupinu",
+    "A valid username must be provided" : "Musíte zadat platné uživatelské jméno",
+    "Error creating user" : "Chyba při vytváření užiatele",
+    "A valid password must be provided" : "Musíte zadat platné heslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varování: Osobní složka uživatele \"{user}\" již existuje.",
+    "__language_name__" : "Česky",
+    "Personal Info" : "Osobní informace",
+    "SSL root certificates" : "Kořenové certifikáty SSL",
+    "Encryption" : "Šifrování",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vše (fatální problémy, chyby, varování, informační, ladící)",
+    "Info, warnings, errors and fatal issues" : "Informace, varování, chyby a fatální problémy",
+    "Warnings, errors and fatal issues" : "Varování, chyby a fatální problémy",
+    "Errors and fatal issues" : "Chyby a fatální problémy",
+    "Fatal issues only" : "Pouze fatální problémy",
+    "None" : "Žádné",
+    "Login" : "Přihlásit",
+    "Plain" : "Čistý text",
+    "NT LAN Manager" : "Správce NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Bezpečnostní upozornění",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Přistupujete na %s protokolem HTTP. Důrazně doporučujeme nakonfigurovat server pro použití HTTPS.",
+    "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." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
+    "Setup Warning" : "Upozornění nastavení",
+    "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.",
+    "Database Performance Info" : "Informace o výkonu databáze",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Schází modul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.",
+    "Your PHP version is outdated" : "Vaše verze PHP je zastaralá",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Vámi používaná verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze obsahují chyby. Je možné, že tato instalace nebude fungovat správně.",
+    "PHP charset is not set to UTF-8" : "Znaková sada PHP není nastavena na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Znaková sada PHP není nastavena na UTF-8. To může způsobit závažné problémy se jmény souborů se znaky neobsaženými v ASCII. Důrazně doporučujeme změnit hodnotu 'default_charset' v php.ini na 'UTF-8'.",
+    "Locale not working" : "Lokalizace nefunguje",
+    "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
+    "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
+    "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Connectivity checks" : "Ověřování připojení",
+    "No problems found" : "Nebyly nalezeny žádné problémy",
+    "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
+    "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
+    "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
+    "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.",
+    "Sharing" : "Sdílení",
+    "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ů",
+    "Enforce password protection" : "Vynutit ochranu heslem",
+    "Allow public uploads" : "Povolit veřejné nahrávání souborů",
+    "Set default expiration date" : "Nastavit výchozí datum vypršení platnosti",
+    "Expire after " : "Vyprší po",
+    "days" : "dnech",
+    "Enforce expiration date" : "Vynutit datum vypršení",
+    "Allow resharing" : "Povolit znovu-sdílení",
+    "Restrict users to only share with users in their groups" : "Povolit sdílení pouze mezi uživateli v rámci skupiny",
+    "Allow users to send mail notification for shared files" : "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
+    "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.",
+    "Security" : "Zabezpečení",
+    "Enforce HTTPS" : "Vynutit HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Vynutí připojování klientů k %s šifrovaným spojením.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
+    "Email Server" : "E-mailový server",
+    "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
+    "Send mode" : "Mód odesílání",
+    "From address" : "Adresa odesílatele",
+    "mail" : "e-mail",
+    "Authentication method" : "Metoda ověření",
+    "Authentication required" : "Vyžadováno ověření",
+    "Server address" : "Adresa serveru",
+    "Port" : "Port",
+    "Credentials" : "Přihlašovací údaje",
+    "SMTP Username" : "SMTP uživatelské jméno ",
+    "SMTP Password" : "SMTP heslo",
+    "Store credentials" : "Ukládat přihlašovací údaje",
+    "Test email settings" : "Otestovat nastavení e-mailu",
+    "Send email" : "Odeslat e-mail",
+    "Log" : "Záznam",
+    "Log level" : "Úroveň zaznamenávání",
+    "More" : "Více",
+    "Less" : "Méně",
+    "Version" : "Verze",
+    "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>." : "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Více aplikací",
+    "Add your app" : "Přidat vlastní aplikaci",
+    "by" : "sdílí",
+    "licensed" : "licencováno",
+    "Documentation:" : "Dokumentace:",
+    "User Documentation" : "Uživatelská dokumentace",
+    "Admin Documentation" : "Dokumentace pro administrátory",
+    "Update to %s" : "Aktualizovat na %s",
+    "Enable only for specific groups" : "Povolit pouze pro vybrané skupiny",
+    "Uninstall App" : "Odinstalovat aplikaci",
+    "Administrator Documentation" : "Dokumentace správce",
+    "Online Documentation" : "Online dokumentace",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Placená podpora",
+    "Get the apps to sync your files" : "Získat aplikace pro synchronizaci vašich souborů",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Chcete-li podpořit tento projekt\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">přidejte se k vývoji</a>\n⇥⇥nebo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">šiřte osvětu</a>!",
+    "Show First Run Wizard again" : "Znovu zobrazit průvodce prvním spuštěním",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
+    "Password" : "Heslo",
+    "Your password was changed" : "Vaše heslo bylo změněno",
+    "Unable to change your password" : "Změna vašeho hesla se nezdařila",
+    "Current password" : "Současné heslo",
+    "New password" : "Nové heslo",
+    "Change password" : "Změnit heslo",
+    "Full Name" : "Celé jméno",
+    "Email" : "E-mail",
+    "Your email address" : "Vaše e-mailová adresa",
+    "Fill in an email address to enable password recovery and receive notifications" : "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění",
+    "Profile picture" : "Profilový obrázek",
+    "Upload new" : "Nahrát nový",
+    "Select new from Files" : "Vyberte nový ze souborů",
+    "Remove image" : "Odebrat obrázek",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout.",
+    "Your avatar is provided by your original account." : "Váš avatar je poskytován Vaším původním účtem.",
+    "Cancel" : "Zrušit",
+    "Choose as profile image" : "Vybrat jako profilový obrázek",
+    "Language" : "Jazyk",
+    "Help translate" : "Pomoci s překladem",
+    "Common Name" : "Common Name",
+    "Valid until" : "Platný do",
+    "Issued By" : "Vydal",
+    "Valid until %s" : "Platný do %s",
+    "Import Root Certificate" : "Import kořenového certifikátu",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
+    "Log-in password" : "Přihlašovací heslo",
+    "Decrypt all Files" : "Odšifrovat všechny soubory",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
+    "Restore Encryption Keys" : "Obnovit šifrovací klíče",
+    "Delete Encryption Keys" : "Smazat šifrovací klíče",
+    "Show storage location" : "Zobrazit umístění úložiště",
+    "Show last log in" : "Zobrazit poslední přihlášení",
+    "Login Name" : "Přihlašovací jméno",
+    "Create" : "Vytvořit",
+    "Admin Recovery Password" : "Heslo obnovy správce",
+    "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
+    "Search Users and Groups" : "Prohledat uživatele a skupiny",
+    "Add Group" : "Přidat skupinu",
+    "Group" : "Skupina",
+    "Everyone" : "Všichni",
+    "Admins" : "Administrátoři",
+    "Default Quota" : "Výchozí kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
+    "Unlimited" : "Neomezeně",
+    "Other" : "Jiný",
+    "Username" : "Uživatelské jméno",
+    "Group Admin for" : "Administrátor skupiny ",
+    "Quota" : "Kvóta",
+    "Storage Location" : "Umístění úložiště",
+    "Last Login" : "Poslední přihlášení",
+    "change full name" : "změnit celé jméno",
+    "set new password" : "nastavit nové heslo",
+    "Default" : "Výchozí"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
deleted file mode 100644
index 0b003082c50..00000000000
--- a/settings/l10n/cs_CZ.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Povoleno",
-"Not enabled" => "Vypnuto",
-"Recommended" => "Doporučeno",
-"Authentication error" => "Chyba přihlášení",
-"Your full name has been changed." => "Vaše celé jméno bylo změněno.",
-"Unable to change full name" => "Nelze změnit celé jméno",
-"Group already exists" => "Skupina již existuje",
-"Unable to add group" => "Nelze přidat skupinu",
-"Files decrypted successfully" => "Soubory úspěšně dešifrovány",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
-"Couldn't decrypt your files, check your password and try again" => "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
-"Encryption keys deleted permanently" => "Šifrovací klíče trvale smazány",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
-"Couldn't remove app." => "Nepodařilo se odebrat aplikaci.",
-"Email saved" => "E-mail uložen",
-"Invalid email" => "Neplatný e-mail",
-"Unable to delete group" => "Nelze smazat skupinu",
-"Unable to delete user" => "Nelze smazat uživatele",
-"Backups restored successfully" => "Zálohy úspěšně obnoveny",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
-"Language changed" => "Jazyk byl změněn",
-"Invalid request" => "Neplatný požadavek",
-"Admins can't remove themself from the admin group" => "Správci se nemohou odebrat sami ze skupiny správců",
-"Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s",
-"Unable to remove user from group %s" => "Nelze odebrat uživatele ze skupiny %s",
-"Couldn't update app." => "Nelze aktualizovat aplikaci.",
-"Wrong password" => "Nesprávné heslo",
-"No user supplied" => "Nebyl uveden uživatel",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Zadejte prosím administrátorské heslo pro obnovu, jinak budou všechna data ztracena",
-"Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
-"Unable to change password" => "Změna hesla se nezdařila",
-"Saved" => "Uloženo",
-"test email settings" => "otestovat nastavení e-mailu",
-"If you received this email, the settings seem to be correct." => "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
-"A problem occurred while sending the email. Please revise your settings." => "Při odesílání e-mailu nastala chyba. Překontrolujte prosím svá nastavení.",
-"Email sent" => "E-mail odeslán",
-"You need to set your user email before being able to send test emails." => "Pro možnost odeslání zkušebních e-mailů musíte nejprve nastavit svou e-mailovou adresu.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Jste si jisti, že chcete přidat \"{domain}\" mezi důvěryhodné domény?",
-"Add trusted domain" => "Přidat důvěryhodnou doménu",
-"Sending..." => "Odesílání...",
-"All" => "Vše",
-"Please wait...." => "Čekejte prosím...",
-"Error while disabling app" => "Chyba při zakazování aplikace",
-"Disable" => "Zakázat",
-"Enable" => "Povolit",
-"Error while enabling app" => "Chyba při povolování aplikace",
-"Updating...." => "Aktualizuji...",
-"Error while updating app" => "Chyba při aktualizaci aplikace",
-"Updated" => "Aktualizováno",
-"Uninstalling ...." => "Probíhá odinstalace ...",
-"Error while uninstalling app" => "Chyba při odinstalaci aplikace",
-"Uninstall" => "Odinstalovat",
-"Select a profile picture" => "Vyberte profilový obrázek",
-"Very weak password" => "Velmi slabé heslo",
-"Weak password" => "Slabé heslo",
-"So-so password" => "Středně silné heslo",
-"Good password" => "Dobré heslo",
-"Strong password" => "Silné heslo",
-"Valid until {date}" => "Platný do {date}",
-"Delete" => "Smazat",
-"Decrypting files... Please wait, this can take some time." => "Probíhá dešifrování souborů... Čekejte prosím, tato operace může trvat nějakou dobu.",
-"Delete encryption keys permanently." => "Trvale smazat šifrovací klíče.",
-"Restore encryption keys." => "Obnovit šifrovací klíče.",
-"Groups" => "Skupiny",
-"Unable to delete {objName}" => "Nelze smazat {objName}",
-"Error creating group" => "Chyba při vytváření skupiny",
-"A valid group name must be provided" => "Musíte zadat platný název skupiny",
-"deleted {groupName}" => "smazána {groupName}",
-"undo" => "vrátit zpět",
-"no group" => "není ve skupině",
-"never" => "nikdy",
-"deleted {userName}" => "smazán {userName}",
-"add group" => "přidat skupinu",
-"A valid username must be provided" => "Musíte zadat platné uživatelské jméno",
-"Error creating user" => "Chyba při vytváření užiatele",
-"A valid password must be provided" => "Musíte zadat platné heslo",
-"Warning: Home directory for user \"{user}\" already exists" => "Varování: Osobní složka uživatele \"{user}\" již existuje.",
-"__language_name__" => "Česky",
-"Personal Info" => "Osobní informace",
-"SSL root certificates" => "Kořenové certifikáty SSL",
-"Encryption" => "Šifrování",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Vše (fatální problémy, chyby, varování, informační, ladící)",
-"Info, warnings, errors and fatal issues" => "Informace, varování, chyby a fatální problémy",
-"Warnings, errors and fatal issues" => "Varování, chyby a fatální problémy",
-"Errors and fatal issues" => "Chyby a fatální problémy",
-"Fatal issues only" => "Pouze fatální problémy",
-"None" => "Žádné",
-"Login" => "Přihlásit",
-"Plain" => "Čistý text",
-"NT LAN Manager" => "Správce NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Bezpečnostní upozornění",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Přistupujete na %s protokolem HTTP. Důrazně doporučujeme nakonfigurovat server pro použití HTTPS.",
-"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." => "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
-"Setup Warning" => "Upozornění nastavení",
-"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.",
-"Database Performance Info" => "Informace o výkonu databáze",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Je použita databáze SQLite. Pro větší instalace doporučujeme toto změnit. Pro migraci na jiný typ databáze lze použít nástroj pro příkazový řádek: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Schází modul 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Schází PHP modul 'fileinfo'. Doporučujeme jej povolit pro nejlepší výsledky detekce typů MIME.",
-"Your PHP version is outdated" => "Vaše verze PHP je zastaralá",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Vámi používaná verze PHP je zastaralá. Důrazně doporučujeme aktualizovat na verzi 5.3.8 nebo novější, protože starší verze obsahují chyby. Je možné, že tato instalace nebude fungovat správně.",
-"PHP charset is not set to UTF-8" => "Znaková sada PHP není nastavena na UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Znaková sada PHP není nastavena na UTF-8. To může způsobit závažné problémy se jmény souborů se znaky neobsaženými v ASCII. Důrazně doporučujeme změnit hodnotu 'default_charset' v php.ini na 'UTF-8'.",
-"Locale not working" => "Lokalizace nefunguje",
-"System locale can not be set to a one which supports UTF-8." => "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
-"This means that there might be problems with certain characters in file names." => "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
-"URL generation in notification emails" => "Generování adresy URL v oznamovacích e-mailech",
-"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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
-"Connectivity checks" => "Ověřování připojení",
-"No problems found" => "Nebyly nalezeny žádné problémy",
-"Please double check the <a href='%s'>installation guides</a>." => "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Poslední cron byl spuštěn v %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
-"Cron was not executed yet!" => "Cron ještě nebyl spuštěn!",
-"Execute one task with each page loaded" => "Spustit jednu úlohu s každým načtením stránky",
-"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.",
-"Sharing" => "Sdílení",
-"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ů",
-"Enforce password protection" => "Vynutit ochranu heslem",
-"Allow public uploads" => "Povolit veřejné nahrávání souborů",
-"Set default expiration date" => "Nastavit výchozí datum vypršení platnosti",
-"Expire after " => "Vyprší po",
-"days" => "dnech",
-"Enforce expiration date" => "Vynutit datum vypršení",
-"Allow resharing" => "Povolit znovu-sdílení",
-"Restrict users to only share with users in their groups" => "Povolit sdílení pouze mezi uživateli v rámci skupiny",
-"Allow users to send mail notification for shared files" => "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
-"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.",
-"Security" => "Zabezpečení",
-"Enforce HTTPS" => "Vynutit HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Vynutí připojování klientů k %s šifrovaným spojením.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
-"Email Server" => "E-mailový server",
-"This is used for sending out notifications." => "Toto se používá pro odesílání upozornění.",
-"Send mode" => "Mód odesílání",
-"From address" => "Adresa odesílatele",
-"mail" => "e-mail",
-"Authentication method" => "Metoda ověření",
-"Authentication required" => "Vyžadováno ověření",
-"Server address" => "Adresa serveru",
-"Port" => "Port",
-"Credentials" => "Přihlašovací údaje",
-"SMTP Username" => "SMTP uživatelské jméno ",
-"SMTP Password" => "SMTP heslo",
-"Store credentials" => "Ukládat přihlašovací údaje",
-"Test email settings" => "Otestovat nastavení e-mailu",
-"Send email" => "Odeslat e-mail",
-"Log" => "Záznam",
-"Log level" => "Úroveň zaznamenávání",
-"More" => "Více",
-"Less" => "Méně",
-"Version" => "Verze",
-"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>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Více aplikací",
-"Add your app" => "Přidat vlastní aplikaci",
-"by" => "sdílí",
-"licensed" => "licencováno",
-"Documentation:" => "Dokumentace:",
-"User Documentation" => "Uživatelská dokumentace",
-"Admin Documentation" => "Dokumentace pro administrátory",
-"Update to %s" => "Aktualizovat na %s",
-"Enable only for specific groups" => "Povolit pouze pro vybrané skupiny",
-"Uninstall App" => "Odinstalovat aplikaci",
-"Administrator Documentation" => "Dokumentace správce",
-"Online Documentation" => "Online dokumentace",
-"Forum" => "Fórum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Placená podpora",
-"Get the apps to sync your files" => "Získat aplikace pro synchronizaci vašich souborů",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Chcete-li podpořit tento projekt\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">přidejte se k vývoji</a>\n⇥⇥nebo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">šiřte osvětu</a>!",
-"Show First Run Wizard again" => "Znovu zobrazit průvodce prvním spuštěním",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Používáte <strong>%s</strong> z <strong>%s</strong> dostupných",
-"Password" => "Heslo",
-"Your password was changed" => "Vaše heslo bylo změněno",
-"Unable to change your password" => "Změna vašeho hesla se nezdařila",
-"Current password" => "Současné heslo",
-"New password" => "Nové heslo",
-"Change password" => "Změnit heslo",
-"Full Name" => "Celé jméno",
-"Email" => "E-mail",
-"Your email address" => "Vaše e-mailová adresa",
-"Fill in an email address to enable password recovery and receive notifications" => "Zadejte e-mailovou adresu pro umožnění obnovy zapomenutého hesla a pro přijímání upozornění",
-"Profile picture" => "Profilový obrázek",
-"Upload new" => "Nahrát nový",
-"Select new from Files" => "Vyberte nový ze souborů",
-"Remove image" => "Odebrat obrázek",
-"Either png or jpg. Ideally square but you will be able to crop it." => "png nebo jpg, nejlépe čtvercový, ale budete mít možnost jej oříznout.",
-"Your avatar is provided by your original account." => "Váš avatar je poskytován Vaším původním účtem.",
-"Cancel" => "Zrušit",
-"Choose as profile image" => "Vybrat jako profilový obrázek",
-"Language" => "Jazyk",
-"Help translate" => "Pomoci s překladem",
-"Common Name" => "Common Name",
-"Valid until" => "Platný do",
-"Issued By" => "Vydal",
-"Valid until %s" => "Platný do %s",
-"Import Root Certificate" => "Import kořenového certifikátu",
-"The encryption app is no longer enabled, please decrypt all your files" => "Šifrovací aplikace již není spuštěna, dešifrujte prosím všechny své soubory",
-"Log-in password" => "Přihlašovací heslo",
-"Decrypt all Files" => "Odšifrovat všechny soubory",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovací klíče byly zálohovány. Pokud se něco pokazí, můžete je obnovit. Smažte je trvale pouze pokud jste jisti, že jsou všechny vaše soubory bezchybně dešifrovány.",
-"Restore Encryption Keys" => "Obnovit šifrovací klíče",
-"Delete Encryption Keys" => "Smazat šifrovací klíče",
-"Show storage location" => "Zobrazit umístění úložiště",
-"Show last log in" => "Zobrazit poslední přihlášení",
-"Login Name" => "Přihlašovací jméno",
-"Create" => "Vytvořit",
-"Admin Recovery Password" => "Heslo obnovy správce",
-"Enter the recovery password in order to recover the users files during password change" => "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-"Search Users and Groups" => "Prohledat uživatele a skupiny",
-"Add Group" => "Přidat skupinu",
-"Group" => "Skupina",
-"Everyone" => "Všichni",
-"Admins" => "Administrátoři",
-"Default Quota" => "Výchozí kvóta",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
-"Unlimited" => "Neomezeně",
-"Other" => "Jiný",
-"Username" => "Uživatelské jméno",
-"Group Admin for" => "Administrátor skupiny ",
-"Quota" => "Kvóta",
-"Storage Location" => "Umístění úložiště",
-"Last Login" => "Poslední přihlášení",
-"change full name" => "změnit celé jméno",
-"set new password" => "nastavit nové heslo",
-"Default" => "Výchozí"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/cy_GB.js b/settings/l10n/cy_GB.js
new file mode 100644
index 00000000000..b51574b8130
--- /dev/null
+++ b/settings/l10n/cy_GB.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Gwall dilysu",
+    "Invalid request" : "Cais annilys",
+    "Email sent" : "Anfonwyd yr e-bost",
+    "Delete" : "Dileu",
+    "Groups" : "Grwpiau",
+    "undo" : "dadwneud",
+    "never" : "byth",
+    "Encryption" : "Amgryptiad",
+    "None" : "Dim",
+    "Login" : "Mewngofnodi",
+    "Security Warning" : "Rhybudd Diogelwch",
+    "Please double check the <a href='%s'>installation guides</a>." : "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
+    "by" : "gan",
+    "Password" : "Cyfrinair",
+    "New password" : "Cyfrinair newydd",
+    "Email" : "E-bost",
+    "Cancel" : "Diddymu",
+    "Login Name" : "Mewngofnodi",
+    "Other" : "Arall",
+    "Username" : "Enw defnyddiwr"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/settings/l10n/cy_GB.json b/settings/l10n/cy_GB.json
new file mode 100644
index 00000000000..67709cc704d
--- /dev/null
+++ b/settings/l10n/cy_GB.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Authentication error" : "Gwall dilysu",
+    "Invalid request" : "Cais annilys",
+    "Email sent" : "Anfonwyd yr e-bost",
+    "Delete" : "Dileu",
+    "Groups" : "Grwpiau",
+    "undo" : "dadwneud",
+    "never" : "byth",
+    "Encryption" : "Amgryptiad",
+    "None" : "Dim",
+    "Login" : "Mewngofnodi",
+    "Security Warning" : "Rhybudd Diogelwch",
+    "Please double check the <a href='%s'>installation guides</a>." : "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
+    "by" : "gan",
+    "Password" : "Cyfrinair",
+    "New password" : "Cyfrinair newydd",
+    "Email" : "E-bost",
+    "Cancel" : "Diddymu",
+    "Login Name" : "Mewngofnodi",
+    "Other" : "Arall",
+    "Username" : "Enw defnyddiwr"
+},"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/settings/l10n/cy_GB.php b/settings/l10n/cy_GB.php
deleted file mode 100644
index 22f740c86b7..00000000000
--- a/settings/l10n/cy_GB.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Gwall dilysu",
-"Invalid request" => "Cais annilys",
-"Email sent" => "Anfonwyd yr e-bost",
-"Delete" => "Dileu",
-"Groups" => "Grwpiau",
-"undo" => "dadwneud",
-"never" => "byth",
-"Encryption" => "Amgryptiad",
-"None" => "Dim",
-"Login" => "Mewngofnodi",
-"Security Warning" => "Rhybudd Diogelwch",
-"Please double check the <a href='%s'>installation guides</a>." => "Gwiriwch y <a href='%s'>canllawiau gosod</a> eto.",
-"by" => "gan",
-"Password" => "Cyfrinair",
-"New password" => "Cyfrinair newydd",
-"Email" => "E-bost",
-"Cancel" => "Diddymu",
-"Login Name" => "Mewngofnodi",
-"Other" => "Arall",
-"Username" => "Enw defnyddiwr"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;";
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
new file mode 100644
index 00000000000..a0c4b88e131
--- /dev/null
+++ b/settings/l10n/da.js
@@ -0,0 +1,238 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiveret",
+    "Not enabled" : "Slået fra",
+    "Recommended" : "Anbefalet",
+    "Authentication error" : "Adgangsfejl",
+    "Your full name has been changed." : "Dit fulde navn er blevet ændret.",
+    "Unable to change full name" : "Ikke i stand til at ændre dit fulde navn",
+    "Group already exists" : "Gruppen findes allerede",
+    "Unable to add group" : "Gruppen kan ikke oprettes",
+    "Files decrypted successfully" : "Filer dekrypteret med succes",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen",
+    "Encryption keys deleted permanently" : "Krypteringsnøgle slettet permanent",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette dine nøgler til kryptering permanent, tjek venligst din owncloud.log eller spørg din administrator",
+    "Couldn't remove app." : "Kunne ikke fjerne app'en.",
+    "Email saved" : "E-mailadressen er gemt",
+    "Invalid email" : "Ugyldig e-mailadresse",
+    "Unable to delete group" : "Gruppen kan ikke slettes",
+    "Unable to delete user" : "Bruger kan ikke slettes",
+    "Backups restored successfully" : "Genskabelsen af sikkerhedskopierne blev gennemført",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
+    "Language changed" : "Sprog ændret",
+    "Invalid request" : "Ugyldig forespørgsel",
+    "Admins can't remove themself from the admin group" : "Administratorer kan ikke fjerne dem selv fra admin gruppen",
+    "Unable to add user to group %s" : "Brugeren kan ikke tilføjes til gruppen %s",
+    "Unable to remove user from group %s" : "Brugeren kan ikke fjernes fra gruppen %s",
+    "Couldn't update app." : "Kunne ikke opdatere app'en.",
+    "Wrong password" : "Forkert kodeord",
+    "No user supplied" : "Intet brugernavn givet",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
+    "Wrong admin recovery password. Please check the password and try again." : "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
+    "Unable to change password" : "Kunne ikke ændre kodeord",
+    "Saved" : "Gemt",
+    "test email settings" : "test e-mailindstillinger",
+    "If you received this email, the settings seem to be correct." : "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
+    "A problem occurred while sending the email. Please revise your settings." : "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.",
+    "Email sent" : "E-mail afsendt",
+    "You need to set your user email before being able to send test emails." : "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
+    "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",
+    "Sending..." : "Sender...",
+    "All" : "Alle",
+    "Please wait...." : "Vent venligst...",
+    "Error while disabling app" : "Kunne ikke deaktivere app",
+    "Disable" : "Deaktiver",
+    "Enable" : "Aktiver",
+    "Error while enabling app" : "Kunne ikke aktivere app",
+    "Updating...." : "Opdaterer....",
+    "Error while updating app" : "Der opstod en fejl under app opgraderingen",
+    "Updated" : "Opdateret",
+    "Uninstalling ...." : "Afinstallerer...",
+    "Error while uninstalling app" : "Fejl under afinstallering af app",
+    "Uninstall" : "Afinstallér",
+    "Select a profile picture" : "Vælg et profilbillede",
+    "Very weak password" : "Meget svagt kodeord",
+    "Weak password" : "Svagt kodeord",
+    "So-so password" : "Jævnt kodeord",
+    "Good password" : "Godt kodeord",
+    "Strong password" : "Stærkt kodeord",
+    "Valid until {date}" : "Gyldig indtil {date}",
+    "Delete" : "Slet",
+    "Decrypting files... Please wait, this can take some time." : "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
+    "Delete encryption keys permanently." : "Slet krypteringsnøgler permanent.",
+    "Restore encryption keys." : "Genopret krypteringsnøgler.",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kunne ikke slette {objName}",
+    "Error creating group" : "Fejl ved oprettelse af gruppe",
+    "A valid group name must be provided" : "Et gyldigt gruppenavn skal angives ",
+    "deleted {groupName}" : "slettede {groupName}",
+    "undo" : "fortryd",
+    "never" : "aldrig",
+    "deleted {userName}" : "slettede {userName}",
+    "add group" : "Tilføj gruppe",
+    "A valid username must be provided" : "Et gyldigt brugernavn skal angives",
+    "Error creating user" : "Fejl ved oprettelse af bruger",
+    "A valid password must be provided" : "En gyldig adgangskode skal angives",
+    "Warning: Home directory for user \"{user}\" already exists" : "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede",
+    "__language_name__" : "Dansk",
+    "Personal Info" : "Personlige oplysninger",
+    "SSL root certificates" : "SSL-rodcertifikater",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advarsler, fejl og alvorlige fejl",
+    "Warnings, errors and fatal issues" : "Advarsler, fejl og alvorlige fejl",
+    "Errors and fatal issues" : "Fejl og alvorlige fejl",
+    "Fatal issues only" : "Kun alvorlige fejl",
+    "None" : "Ingen",
+    "Login" : "Login",
+    "Plain" : "Klartekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sikkerhedsadvarsel",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS.",
+    "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." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
+    "Setup Warning" : "Opsætnings Advarsel",
+    "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",
+    "Database Performance Info" : "Database Performance Oplysninger",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite er benyttet som database. Ved store installationer anbefaler vi at ændre dette. For at migrere til en anden database benyt 'occ db:convert-type' værktøjet i et kommandovindue.",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' mangler",
+    "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.",
+    "Your PHP version is outdated" : "Din PHP-version er forældet",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt.",
+    "PHP charset is not set to UTF-8" : "PHP-tegnsættet er ikke angivet til UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
+    "Locale not working" : "Landestandard fungerer ikke",
+    "System locale can not be set to a one which supports UTF-8." : "Systemets locale 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 to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
+    "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
+    "Connectivity checks" : "Tjek for forbindelsen",
+    "No problems found" : "Der blev ikke fundet problemer",
+    "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
+    "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
+    "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæst",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
+    "Sharing" : "Deling",
+    "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",
+    "Enforce password protection" : "tving kodeords beskyttelse",
+    "Allow public uploads" : "Tillad offentlig upload",
+    "Set default expiration date" : "Vælg standard udløbsdato",
+    "Expire after " : "Udløber efter",
+    "days" : "dage",
+    "Enforce expiration date" : "Påtving udløbsdato",
+    "Allow resharing" : "Tillad videredeling",
+    "Restrict users to only share with users in their groups" : "Begræns brugere til deling med brugere i deres gruppe",
+    "Allow users to send mail notification for shared files" : "Tillad brugere at sende mail underretninger for delte filer",
+    "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, dog ikke skabe dem.",
+    "Security" : "Sikkerhed",
+    "Enforce HTTPS" : "Gennemtving HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
+    "Email Server" : "E-mailserver",
+    "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
+    "Send mode" : "Tilstand for afsendelse",
+    "From address" : "Fra adresse",
+    "mail" : "mail",
+    "Authentication method" : "Godkendelsesmetode",
+    "Authentication required" : "Godkendelse påkrævet",
+    "Server address" : "Serveradresse",
+    "Port" : "Port",
+    "Credentials" : "Brugeroplysninger",
+    "SMTP Username" : "SMTP Brugernavn",
+    "SMTP Password" : "SMTP Kodeord",
+    "Store credentials" : "Gem brugeroplysninger",
+    "Test email settings" : "Test e-mail-indstillinger",
+    "Send email" : "Send e-mail",
+    "Log" : "Log",
+    "Log level" : "Log niveau",
+    "More" : "Mere",
+    "Less" : "Mindre",
+    "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>." : "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Flere programmer",
+    "Add your app" : "Tilføj din app",
+    "by" : "af",
+    "licensed" : "licenseret",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Brugerdokumentation",
+    "Admin Documentation" : "Administrator Dokumentation",
+    "Update to %s" : "Opdatér til %s",
+    "Enable only for specific groups" : "Aktivér kun for udvalgte grupper",
+    "Uninstall App" : "Afinstallér app",
+    "Administrator Documentation" : "Administrator Dokumentation",
+    "Online Documentation" : "Online dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerciel support",
+    "Get the apps to sync your files" : "Hent applikationerne for at synkronisere dine filer",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Hvis du vil støtte projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spred budskabet</a>!",
+    "Show First Run Wizard again" : "Vis guiden for første kørsel igen.",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
+    "Password" : "Kodeord",
+    "Your password was changed" : "Din adgangskode blev ændret",
+    "Unable to change your password" : "Ude af stand til at ændre dit kodeord",
+    "Current password" : "Nuværende adgangskode",
+    "New password" : "Nyt kodeord",
+    "Change password" : "Skift kodeord",
+    "Full Name" : "Fulde navn",
+    "Email" : "E-mail",
+    "Your email address" : "Din e-mailadresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Angiv en e-mailadresse for at aktivere gendannelse af adgangskode og modtage notifikationer",
+    "Profile picture" : "Profilbillede",
+    "Upload new" : "Upload nyt",
+    "Select new from Files" : "Vælg nyt fra Filer",
+    "Remove image" : "Fjern billede",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ",
+    "Your avatar is provided by your original account." : "Din avatar kommer fra din oprindelige konto.",
+    "Cancel" : "Annuller",
+    "Choose as profile image" : "Vælg som profilbillede",
+    "Language" : "Sprog",
+    "Help translate" : "Hjælp med oversættelsen",
+    "Common Name" : "Almindeligt navn",
+    "Valid until" : "Gyldig indtil",
+    "Issued By" : "Udstedt af",
+    "Valid until %s" : "Gyldig indtil %s",
+    "Import Root Certificate" : "Importer rodcertifikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
+    "Log-in password" : "Log-in kodeord",
+    "Decrypt all Files" : "Dekrypter alle Filer ",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
+    "Restore Encryption Keys" : "Genopret Krypteringsnøgler",
+    "Delete Encryption Keys" : "Slet Krypteringsnøgler",
+    "Show storage location" : "Vis placering af lageret",
+    "Show last log in" : "Vis seneste login",
+    "Login Name" : "Loginnavn",
+    "Create" : "Ny",
+    "Admin Recovery Password" : "Administrator gendannelse kodeord",
+    "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
+    "Search Users and Groups" : "Søg efter brugere og grupper",
+    "Add Group" : "Tilføj Gruppe",
+    "Group" : "Gruppe",
+    "Everyone" : "Alle",
+    "Admins" : "Administratore",
+    "Default Quota" : "Standard kvote",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
+    "Unlimited" : "Ubegrænset",
+    "Other" : "Andet",
+    "Username" : "Brugernavn",
+    "Quota" : "Kvote",
+    "Storage Location" : "Placering af lageret",
+    "Last Login" : "Seneste login",
+    "change full name" : "ændre fulde navn",
+    "set new password" : "skift kodeord",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
new file mode 100644
index 00000000000..328acf78808
--- /dev/null
+++ b/settings/l10n/da.json
@@ -0,0 +1,236 @@
+{ "translations": {
+    "Enabled" : "Aktiveret",
+    "Not enabled" : "Slået fra",
+    "Recommended" : "Anbefalet",
+    "Authentication error" : "Adgangsfejl",
+    "Your full name has been changed." : "Dit fulde navn er blevet ændret.",
+    "Unable to change full name" : "Ikke i stand til at ændre dit fulde navn",
+    "Group already exists" : "Gruppen findes allerede",
+    "Unable to add group" : "Gruppen kan ikke oprettes",
+    "Files decrypted successfully" : "Filer dekrypteret med succes",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen",
+    "Encryption keys deleted permanently" : "Krypteringsnøgle slettet permanent",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette dine nøgler til kryptering permanent, tjek venligst din owncloud.log eller spørg din administrator",
+    "Couldn't remove app." : "Kunne ikke fjerne app'en.",
+    "Email saved" : "E-mailadressen er gemt",
+    "Invalid email" : "Ugyldig e-mailadresse",
+    "Unable to delete group" : "Gruppen kan ikke slettes",
+    "Unable to delete user" : "Bruger kan ikke slettes",
+    "Backups restored successfully" : "Genskabelsen af sikkerhedskopierne blev gennemført",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
+    "Language changed" : "Sprog ændret",
+    "Invalid request" : "Ugyldig forespørgsel",
+    "Admins can't remove themself from the admin group" : "Administratorer kan ikke fjerne dem selv fra admin gruppen",
+    "Unable to add user to group %s" : "Brugeren kan ikke tilføjes til gruppen %s",
+    "Unable to remove user from group %s" : "Brugeren kan ikke fjernes fra gruppen %s",
+    "Couldn't update app." : "Kunne ikke opdatere app'en.",
+    "Wrong password" : "Forkert kodeord",
+    "No user supplied" : "Intet brugernavn givet",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
+    "Wrong admin recovery password. Please check the password and try again." : "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
+    "Unable to change password" : "Kunne ikke ændre kodeord",
+    "Saved" : "Gemt",
+    "test email settings" : "test e-mailindstillinger",
+    "If you received this email, the settings seem to be correct." : "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
+    "A problem occurred while sending the email. Please revise your settings." : "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.",
+    "Email sent" : "E-mail afsendt",
+    "You need to set your user email before being able to send test emails." : "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
+    "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",
+    "Sending..." : "Sender...",
+    "All" : "Alle",
+    "Please wait...." : "Vent venligst...",
+    "Error while disabling app" : "Kunne ikke deaktivere app",
+    "Disable" : "Deaktiver",
+    "Enable" : "Aktiver",
+    "Error while enabling app" : "Kunne ikke aktivere app",
+    "Updating...." : "Opdaterer....",
+    "Error while updating app" : "Der opstod en fejl under app opgraderingen",
+    "Updated" : "Opdateret",
+    "Uninstalling ...." : "Afinstallerer...",
+    "Error while uninstalling app" : "Fejl under afinstallering af app",
+    "Uninstall" : "Afinstallér",
+    "Select a profile picture" : "Vælg et profilbillede",
+    "Very weak password" : "Meget svagt kodeord",
+    "Weak password" : "Svagt kodeord",
+    "So-so password" : "Jævnt kodeord",
+    "Good password" : "Godt kodeord",
+    "Strong password" : "Stærkt kodeord",
+    "Valid until {date}" : "Gyldig indtil {date}",
+    "Delete" : "Slet",
+    "Decrypting files... Please wait, this can take some time." : "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
+    "Delete encryption keys permanently." : "Slet krypteringsnøgler permanent.",
+    "Restore encryption keys." : "Genopret krypteringsnøgler.",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kunne ikke slette {objName}",
+    "Error creating group" : "Fejl ved oprettelse af gruppe",
+    "A valid group name must be provided" : "Et gyldigt gruppenavn skal angives ",
+    "deleted {groupName}" : "slettede {groupName}",
+    "undo" : "fortryd",
+    "never" : "aldrig",
+    "deleted {userName}" : "slettede {userName}",
+    "add group" : "Tilføj gruppe",
+    "A valid username must be provided" : "Et gyldigt brugernavn skal angives",
+    "Error creating user" : "Fejl ved oprettelse af bruger",
+    "A valid password must be provided" : "En gyldig adgangskode skal angives",
+    "Warning: Home directory for user \"{user}\" already exists" : "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede",
+    "__language_name__" : "Dansk",
+    "Personal Info" : "Personlige oplysninger",
+    "SSL root certificates" : "SSL-rodcertifikater",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advarsler, fejl og alvorlige fejl",
+    "Warnings, errors and fatal issues" : "Advarsler, fejl og alvorlige fejl",
+    "Errors and fatal issues" : "Fejl og alvorlige fejl",
+    "Fatal issues only" : "Kun alvorlige fejl",
+    "None" : "Ingen",
+    "Login" : "Login",
+    "Plain" : "Klartekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sikkerhedsadvarsel",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS.",
+    "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." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
+    "Setup Warning" : "Opsætnings Advarsel",
+    "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",
+    "Database Performance Info" : "Database Performance Oplysninger",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite er benyttet som database. Ved store installationer anbefaler vi at ændre dette. For at migrere til en anden database benyt 'occ db:convert-type' værktøjet i et kommandovindue.",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' mangler",
+    "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.",
+    "Your PHP version is outdated" : "Din PHP-version er forældet",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt.",
+    "PHP charset is not set to UTF-8" : "PHP-tegnsættet er ikke angivet til UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
+    "Locale not working" : "Landestandard fungerer ikke",
+    "System locale can not be set to a one which supports UTF-8." : "Systemets locale 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 to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
+    "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
+    "Connectivity checks" : "Tjek for forbindelsen",
+    "No problems found" : "Der blev ikke fundet problemer",
+    "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
+    "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
+    "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæst",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
+    "Sharing" : "Deling",
+    "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",
+    "Enforce password protection" : "tving kodeords beskyttelse",
+    "Allow public uploads" : "Tillad offentlig upload",
+    "Set default expiration date" : "Vælg standard udløbsdato",
+    "Expire after " : "Udløber efter",
+    "days" : "dage",
+    "Enforce expiration date" : "Påtving udløbsdato",
+    "Allow resharing" : "Tillad videredeling",
+    "Restrict users to only share with users in their groups" : "Begræns brugere til deling med brugere i deres gruppe",
+    "Allow users to send mail notification for shared files" : "Tillad brugere at sende mail underretninger for delte filer",
+    "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, dog ikke skabe dem.",
+    "Security" : "Sikkerhed",
+    "Enforce HTTPS" : "Gennemtving HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
+    "Email Server" : "E-mailserver",
+    "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
+    "Send mode" : "Tilstand for afsendelse",
+    "From address" : "Fra adresse",
+    "mail" : "mail",
+    "Authentication method" : "Godkendelsesmetode",
+    "Authentication required" : "Godkendelse påkrævet",
+    "Server address" : "Serveradresse",
+    "Port" : "Port",
+    "Credentials" : "Brugeroplysninger",
+    "SMTP Username" : "SMTP Brugernavn",
+    "SMTP Password" : "SMTP Kodeord",
+    "Store credentials" : "Gem brugeroplysninger",
+    "Test email settings" : "Test e-mail-indstillinger",
+    "Send email" : "Send e-mail",
+    "Log" : "Log",
+    "Log level" : "Log niveau",
+    "More" : "Mere",
+    "Less" : "Mindre",
+    "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>." : "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Flere programmer",
+    "Add your app" : "Tilføj din app",
+    "by" : "af",
+    "licensed" : "licenseret",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Brugerdokumentation",
+    "Admin Documentation" : "Administrator Dokumentation",
+    "Update to %s" : "Opdatér til %s",
+    "Enable only for specific groups" : "Aktivér kun for udvalgte grupper",
+    "Uninstall App" : "Afinstallér app",
+    "Administrator Documentation" : "Administrator Dokumentation",
+    "Online Documentation" : "Online dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerciel support",
+    "Get the apps to sync your files" : "Hent applikationerne for at synkronisere dine filer",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Hvis du vil støtte projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spred budskabet</a>!",
+    "Show First Run Wizard again" : "Vis guiden for første kørsel igen.",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
+    "Password" : "Kodeord",
+    "Your password was changed" : "Din adgangskode blev ændret",
+    "Unable to change your password" : "Ude af stand til at ændre dit kodeord",
+    "Current password" : "Nuværende adgangskode",
+    "New password" : "Nyt kodeord",
+    "Change password" : "Skift kodeord",
+    "Full Name" : "Fulde navn",
+    "Email" : "E-mail",
+    "Your email address" : "Din e-mailadresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Angiv en e-mailadresse for at aktivere gendannelse af adgangskode og modtage notifikationer",
+    "Profile picture" : "Profilbillede",
+    "Upload new" : "Upload nyt",
+    "Select new from Files" : "Vælg nyt fra Filer",
+    "Remove image" : "Fjern billede",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ",
+    "Your avatar is provided by your original account." : "Din avatar kommer fra din oprindelige konto.",
+    "Cancel" : "Annuller",
+    "Choose as profile image" : "Vælg som profilbillede",
+    "Language" : "Sprog",
+    "Help translate" : "Hjælp med oversættelsen",
+    "Common Name" : "Almindeligt navn",
+    "Valid until" : "Gyldig indtil",
+    "Issued By" : "Udstedt af",
+    "Valid until %s" : "Gyldig indtil %s",
+    "Import Root Certificate" : "Importer rodcertifikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
+    "Log-in password" : "Log-in kodeord",
+    "Decrypt all Files" : "Dekrypter alle Filer ",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
+    "Restore Encryption Keys" : "Genopret Krypteringsnøgler",
+    "Delete Encryption Keys" : "Slet Krypteringsnøgler",
+    "Show storage location" : "Vis placering af lageret",
+    "Show last log in" : "Vis seneste login",
+    "Login Name" : "Loginnavn",
+    "Create" : "Ny",
+    "Admin Recovery Password" : "Administrator gendannelse kodeord",
+    "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
+    "Search Users and Groups" : "Søg efter brugere og grupper",
+    "Add Group" : "Tilføj Gruppe",
+    "Group" : "Gruppe",
+    "Everyone" : "Alle",
+    "Admins" : "Administratore",
+    "Default Quota" : "Standard kvote",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
+    "Unlimited" : "Ubegrænset",
+    "Other" : "Andet",
+    "Username" : "Brugernavn",
+    "Quota" : "Kvote",
+    "Storage Location" : "Placering af lageret",
+    "Last Login" : "Seneste login",
+    "change full name" : "ændre fulde navn",
+    "set new password" : "skift kodeord",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
deleted file mode 100644
index 814f809e10e..00000000000
--- a/settings/l10n/da.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiveret",
-"Not enabled" => "Slået fra",
-"Recommended" => "Anbefalet",
-"Authentication error" => "Adgangsfejl",
-"Your full name has been changed." => "Dit fulde navn er blevet ændret.",
-"Unable to change full name" => "Ikke i stand til at ændre dit fulde navn",
-"Group already exists" => "Gruppen findes allerede",
-"Unable to add group" => "Gruppen kan ikke oprettes",
-"Files decrypted successfully" => "Filer dekrypteret med succes",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dine filer kunne ikke dekrypteres. Gennemse din owncloud log eller spørg din administrator",
-"Couldn't decrypt your files, check your password and try again" => "Dine filer kunne ikke dekrypteres. Check din adgangskode og forsøg igen",
-"Encryption keys deleted permanently" => "Krypteringsnøgle slettet permanent",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke slette dine nøgler til kryptering permanent, tjek venligst din owncloud.log eller spørg din administrator",
-"Couldn't remove app." => "Kunne ikke fjerne app'en.",
-"Email saved" => "E-mailadressen er gemt",
-"Invalid email" => "Ugyldig e-mailadresse",
-"Unable to delete group" => "Gruppen kan ikke slettes",
-"Unable to delete user" => "Bruger kan ikke slettes",
-"Backups restored successfully" => "Genskabelsen af sikkerhedskopierne blev gennemført",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke genskabe din krypyterings nøgle, se logfilen owncloud.log eller spørg en administrator",
-"Language changed" => "Sprog ændret",
-"Invalid request" => "Ugyldig forespørgsel",
-"Admins can't remove themself from the admin group" => "Administratorer kan ikke fjerne dem selv fra admin gruppen",
-"Unable to add user to group %s" => "Brugeren kan ikke tilføjes til gruppen %s",
-"Unable to remove user from group %s" => "Brugeren kan ikke fjernes fra gruppen %s",
-"Couldn't update app." => "Kunne ikke opdatere app'en.",
-"Wrong password" => "Forkert kodeord",
-"No user supplied" => "Intet brugernavn givet",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Angiv venligst en admininstrator gendannelseskode, ellers vil alt brugerdata gå tabt",
-"Wrong admin recovery password. Please check the password and try again." => "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
-"Unable to change password" => "Kunne ikke ændre kodeord",
-"Saved" => "Gemt",
-"test email settings" => "test e-mailindstillinger",
-"If you received this email, the settings seem to be correct." => "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
-"A problem occurred while sending the email. Please revise your settings." => "Der opstod en fejl under afsendelse af e-mailen. Gennemse venligst dine indstillinger.",
-"Email sent" => "E-mail afsendt",
-"You need to set your user email before being able to send test emails." => "Du skal angive din bruger-e-mail før der kan sendes test-e-mail.",
-"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",
-"Sending..." => "Sender...",
-"All" => "Alle",
-"Please wait...." => "Vent venligst...",
-"Error while disabling app" => "Kunne ikke deaktivere app",
-"Disable" => "Deaktiver",
-"Enable" => "Aktiver",
-"Error while enabling app" => "Kunne ikke aktivere app",
-"Updating...." => "Opdaterer....",
-"Error while updating app" => "Der opstod en fejl under app opgraderingen",
-"Updated" => "Opdateret",
-"Uninstalling ...." => "Afinstallerer...",
-"Error while uninstalling app" => "Fejl under afinstallering af app",
-"Uninstall" => "Afinstallér",
-"Select a profile picture" => "Vælg et profilbillede",
-"Very weak password" => "Meget svagt kodeord",
-"Weak password" => "Svagt kodeord",
-"So-so password" => "Jævnt kodeord",
-"Good password" => "Godt kodeord",
-"Strong password" => "Stærkt kodeord",
-"Valid until {date}" => "Gyldig indtil {date}",
-"Delete" => "Slet",
-"Decrypting files... Please wait, this can take some time." => "Dekryptere filer... Vent venligst, dette kan tage lang tid. ",
-"Delete encryption keys permanently." => "Slet krypteringsnøgler permanent.",
-"Restore encryption keys." => "Genopret krypteringsnøgler.",
-"Groups" => "Grupper",
-"Unable to delete {objName}" => "Kunne ikke slette {objName}",
-"Error creating group" => "Fejl ved oprettelse af gruppe",
-"A valid group name must be provided" => "Et gyldigt gruppenavn skal angives ",
-"deleted {groupName}" => "slettede {groupName}",
-"undo" => "fortryd",
-"no group" => "ingen gruppe",
-"never" => "aldrig",
-"deleted {userName}" => "slettede {userName}",
-"add group" => "Tilføj gruppe",
-"A valid username must be provided" => "Et gyldigt brugernavn skal angives",
-"Error creating user" => "Fejl ved oprettelse af bruger",
-"A valid password must be provided" => "En gyldig adgangskode skal angives",
-"Warning: Home directory for user \"{user}\" already exists" => "Advarsel: Hjemmemappen for bruger \"{user}\" findes allerede",
-"__language_name__" => "Dansk",
-"Personal Info" => "Personlige oplysninger",
-"SSL root certificates" => "SSL-rodcertifikater",
-"Encryption" => "Kryptering",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alt (alvorlige fejl, fejl, advarsler, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, advarsler, fejl og alvorlige fejl",
-"Warnings, errors and fatal issues" => "Advarsler, fejl og alvorlige fejl",
-"Errors and fatal issues" => "Fejl og alvorlige fejl",
-"Fatal issues only" => "Kun alvorlige fejl",
-"None" => "Ingen",
-"Login" => "Login",
-"Plain" => "Klartekst",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Sikkerhedsadvarsel",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS.",
-"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." => "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
-"Setup Warning" => "Opsætnings Advarsel",
-"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",
-"Database Performance Info" => "Database Performance Oplysninger",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite er benyttet som database. Ved store installationer anbefaler vi at ændre dette. For at migrere til en anden database benyt 'occ db:convert-type' værktøjet i et kommandovindue.",
-"Module 'fileinfo' missing" => "Module 'fileinfo' mangler",
-"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.",
-"Your PHP version is outdated" => "Din PHP-version er forældet",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Din PHP-version er forældet. Vi anbefaler at du opgraderer til 5.3.8 eller nyere, fordi ældre versioner har kendte fejl. Det er derfor muligt at installationen ikke fungerer korrekt.",
-"PHP charset is not set to UTF-8" => "PHP-tegnsættet er ikke angivet til UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-tegnsættet er ikke angivet til UTF-8. Denne kan føre til store problemer med tegn som ikke er af typen ASCII i filnavne. Vi anbefaler kraftigt at ændre værdien for 'default_charset' i php.ini til 'UTF-8'.",
-"Locale not working" => "Landestandard fungerer ikke",
-"System locale can not be set to a one which supports UTF-8." => "Systemets locale 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 to install the required packages on your system to support one of the following locales: %s." => "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
-"URL generation in notification emails" => "URL-oprettelse i e-mailnotifikationer.",
-"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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
-"Connectivity checks" => "Tjek for forbindelsen",
-"No problems found" => "Der blev ikke fundet problemer",
-"Please double check the <a href='%s'>installation guides</a>." => "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Seneste 'cron' blev kørt %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
-"Cron was not executed yet!" => "Cron har ikke kørt endnu!",
-"Execute one task with each page loaded" => "Udføre en opgave med hver side indlæst",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Brug systemets cron service til at kalde cron.php hver 15. minut",
-"Sharing" => "Deling",
-"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",
-"Enforce password protection" => "tving kodeords beskyttelse",
-"Allow public uploads" => "Tillad offentlig upload",
-"Set default expiration date" => "Vælg standard udløbsdato",
-"Expire after " => "Udløber efter",
-"days" => "dage",
-"Enforce expiration date" => "Påtving udløbsdato",
-"Allow resharing" => "Tillad videredeling",
-"Restrict users to only share with users in their groups" => "Begræns brugere til deling med brugere i deres gruppe",
-"Allow users to send mail notification for shared files" => "Tillad brugere at sende mail underretninger for delte filer",
-"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, dog ikke skabe dem.",
-"Security" => "Sikkerhed",
-"Enforce HTTPS" => "Gennemtving HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
-"Email Server" => "E-mailserver",
-"This is used for sending out notifications." => "Dette anvendes til udsendelse af notifikationer.",
-"Send mode" => "Tilstand for afsendelse",
-"From address" => "Fra adresse",
-"mail" => "mail",
-"Authentication method" => "Godkendelsesmetode",
-"Authentication required" => "Godkendelse påkrævet",
-"Server address" => "Serveradresse",
-"Port" => "Port",
-"Credentials" => "Brugeroplysninger",
-"SMTP Username" => "SMTP Brugernavn",
-"SMTP Password" => "SMTP Kodeord",
-"Store credentials" => "Gem brugeroplysninger",
-"Test email settings" => "Test e-mail-indstillinger",
-"Send email" => "Send e-mail",
-"Log" => "Log",
-"Log level" => "Log niveau",
-"More" => "Mere",
-"Less" => "Mindre",
-"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>." => "Udviklet af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownClouds community</a>, og <a href=\"https://github.com/owncloud\" target=\"_blank\">kildekoden</a> er underlagt licensen <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Flere programmer",
-"Add your app" => "Tilføj din app",
-"by" => "af",
-"licensed" => "licenseret",
-"Documentation:" => "Dokumentation:",
-"User Documentation" => "Brugerdokumentation",
-"Admin Documentation" => "Administrator Dokumentation",
-"Update to %s" => "Opdatér til %s",
-"Enable only for specific groups" => "Aktivér kun for udvalgte grupper",
-"Uninstall App" => "Afinstallér app",
-"Administrator Documentation" => "Administrator Dokumentation",
-"Online Documentation" => "Online dokumentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Kommerciel support",
-"Get the apps to sync your files" => "Hent applikationerne for at synkronisere dine filer",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Hvis du vil støtte projektet\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">deltag i udviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spred budskabet</a>!",
-"Show First Run Wizard again" => "Vis guiden for første kørsel igen.",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brugt <strong>%s</strong> af den tilgængelige <strong>%s</strong>",
-"Password" => "Kodeord",
-"Your password was changed" => "Din adgangskode blev ændret",
-"Unable to change your password" => "Ude af stand til at ændre dit kodeord",
-"Current password" => "Nuværende adgangskode",
-"New password" => "Nyt kodeord",
-"Change password" => "Skift kodeord",
-"Full Name" => "Fulde navn",
-"Email" => "E-mail",
-"Your email address" => "Din e-mailadresse",
-"Fill in an email address to enable password recovery and receive notifications" => "Angiv en e-mailadresse for at aktivere gendannelse af adgangskode og modtage notifikationer",
-"Profile picture" => "Profilbillede",
-"Upload new" => "Upload nyt",
-"Select new from Files" => "Vælg nyt fra Filer",
-"Remove image" => "Fjern billede",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Enten png eller jpg. Ideelt firkantet men du har mulighed for at beskære det. ",
-"Your avatar is provided by your original account." => "Din avatar kommer fra din oprindelige konto.",
-"Cancel" => "Annuller",
-"Choose as profile image" => "Vælg som profilbillede",
-"Language" => "Sprog",
-"Help translate" => "Hjælp med oversættelsen",
-"Common Name" => "Almindeligt navn",
-"Valid until" => "Gyldig indtil",
-"Issued By" => "Udstedt af",
-"Valid until %s" => "Gyldig indtil %s",
-"Import Root Certificate" => "Importer rodcertifikat",
-"The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsprogrammet er ikke længere aktiveret. Dekrypter venligst alle dine filer",
-"Log-in password" => "Log-in kodeord",
-"Decrypt all Files" => "Dekrypter alle Filer ",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Din krypteringsmøgler er flyttet til et sted med sikkerhedskopier. Hvis noget gik galt kan du genskabe nøglerne. Slet kun nøgler permanent, hvis du er sikker på at alle filer er blevet dekrypteret korrekt.",
-"Restore Encryption Keys" => "Genopret Krypteringsnøgler",
-"Delete Encryption Keys" => "Slet Krypteringsnøgler",
-"Show storage location" => "Vis placering af lageret",
-"Show last log in" => "Vis seneste login",
-"Login Name" => "Loginnavn",
-"Create" => "Ny",
-"Admin Recovery Password" => "Administrator gendannelse kodeord",
-"Enter the recovery password in order to recover the users files during password change" => "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
-"Search Users and Groups" => "Søg efter brugere og grupper",
-"Add Group" => "Tilføj Gruppe",
-"Group" => "Gruppe",
-"Everyone" => "Alle",
-"Admins" => "Administratore",
-"Default Quota" => "Standard kvote",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
-"Unlimited" => "Ubegrænset",
-"Other" => "Andet",
-"Username" => "Brugernavn",
-"Group Admin for" => "Gruppeadministrator for",
-"Quota" => "Kvote",
-"Storage Location" => "Placering af lageret",
-"Last Login" => "Seneste login",
-"change full name" => "ændre fulde navn",
-"set new password" => "skift kodeord",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
new file mode 100644
index 00000000000..9c686e7f2b7
--- /dev/null
+++ b/settings/l10n/de.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
+    "Authentication error" : "Fehler bei der Anmeldung",
+    "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
+    "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
+    "Group already exists" : "Gruppe existiert bereits",
+    "Unable to add group" : "Gruppe konnte nicht angelegt werden",
+    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
+    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
+    "Email saved" : "E-Mail Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail Adresse",
+    "Unable to delete group" : "Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Benutzer konnte nicht gelöscht werden",
+    "Backups restored successfully" : "Backups erfolgreich wiederhergestellt",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Fehlerhafte Anfrage",
+    "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.",
+    "Wrong password" : "Falsches Passwort",
+    "No user supplied" : "Keinen Benutzer übermittelt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
+    "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
+    "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "Saved" : "Gespeichert",
+    "test email settings" : "E-Mail-Einstellungen testen",
+    "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen.",
+    "Email sent" : "E-Mail wurde verschickt",
+    "You need to set your user email before being able to send test emails." : "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
+    "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Sending..." : "Sende...",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten...",
+    "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
+    "Updating...." : "Aktualisierung...",
+    "Error while updating app" : "Fehler beim Aktualisieren der App",
+    "Updated" : "Aktualisiert",
+    "Uninstalling ...." : "Deinstalliere ....",
+    "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
+    "Uninstall" : "Deinstallieren",
+    "Select a profile picture" : "Wähle ein Profilbild",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Durchschnittliches Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Valid until {date}" : "Gültig bis {date}",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
+    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
+    "Groups" : "Gruppen",
+    "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
+    "Error creating group" : "Fehler beim Erstellen der Gruppe",
+    "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden",
+    "deleted {groupName}" : "{groupName} gelöscht",
+    "undo" : "rückgängig machen",
+    "no group" : "Keine Gruppe",
+    "never" : "niemals",
+    "deleted {userName}" : "{userName} gelöscht",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "Error creating user" : "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
+    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
+    "__language_name__" : "Deutsch (Persönlich)",
+    "Personal Info" : "Persönliche Informationen",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
+    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
+    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
+    "Errors and fatal issues" : "Fehler und fatale Probleme",
+    "Fatal issues only" : "Nur fatale Probleme",
+    "None" : "Nichts",
+    "Login" : "Anmelden",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sicherheitswarnung",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
+    "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." : "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
+    "Setup Warning" : "Einrichtungswarnung",
+    "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 z.B. OPcache oder eAccelerator verursacht.",
+    "Database Performance Info" : "Info zur Datenbankperformance",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
+    "Module 'fileinfo' missing" : "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 dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
+    "Your PHP version is outdated" : "Deine PHP-Version ist veraltet",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+    "PHP charset is not set to UTF-8" : "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt. Dies kann Fehler mit Nicht-ASCII Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von 'default_charset' in der php.ini auf 'UTF-8' zu ändern.",
+    "Locale not working" : "Ländereinstellung funktioniert nicht",
+    "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
+    "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
+    "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
+    "Connectivity checks" : "Verbindungsüberprüfungen",
+    "No problems found" : "Keine Probleme gefunden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API",
+    "Allow users to share via link" : "Erlaube Nutzern, mithilfe von Links zu teilen",
+    "Enforce password protection" : "Passwortschutz erzwingen",
+    "Allow public uploads" : "Öffentliches Hochladen erlauben",
+    "Set default expiration date" : "Setze  Ablaufdatum",
+    "Expire after " : "Ablauf nach ",
+    "days" : "Tagen",
+    "Enforce expiration date" : "Ablaufdatum erzwingen",
+    "Allow resharing" : "Erlaubt erneutes Teilen",
+    "Restrict users to only share with users in their groups" : "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
+    "Allow users to send mail notification for shared files" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+    "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "Erzwinge HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+    "Email Server" : "E-Mail-Server",
+    "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
+    "Send mode" : "Sende-Modus",
+    "From address" : "Absender-Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Authentifizierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "Teste E-Mail-Einstellungen",
+    "Send email" : "Sende E-Mail",
+    "Log" : "Log",
+    "Log level" : "Loglevel",
+    "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",
+    "Add your app" : "Fügen Sie Ihre App hinzu",
+    "by" : "von",
+    "licensed" : "Lizenziert",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Admin Documentation" : "Admin-Dokumentation",
+    "Update to %s" : "Aktualisierung auf %s",
+    "Enable only for specific groups" : "Nur für spezifizierte Gruppen aktivieren",
+    "Uninstall App" : "App deinstallieren",
+    "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" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">nimm an der Entwicklung teil</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">erreiche die Welt</a>!",
+    "Show First Run Wizard again" : "Erstinstallation erneut durchführen",
+    "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",
+    "Your password was changed" : "Dein Passwort wurde geändert.",
+    "Unable to change your password" : "Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Full Name" : "Vollständiger Name",
+    "Email" : "E-Mail",
+    "Your email address" : "Deine E-Mail-Adresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Gib eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
+    "Profile picture" : "Profilbild",
+    "Upload new" : "Neues hochladen",
+    "Select new from Files" : "Neues aus den Dateien wählen",
+    "Remove image" : "Bild entfernen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.",
+    "Your avatar is provided by your original account." : "Dein Avatar wird von Deinem ursprünglichenKonto verwendet.",
+    "Cancel" : "Abbrechen",
+    "Choose as profile image" : "Als Profilbild wählen",
+    "Language" : "Sprache",
+    "Help translate" : "Hilf bei der Übersetzung",
+    "Common Name" : "Zuname",
+    "Valid until" : "Gültig bis",
+    "Issued By" : "Ausgestellt von:",
+    "Valid until %s" : "Gültig bis %s",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
+    "Log-in password" : "Login-Passwort",
+    "Decrypt all Files" : "Alle Dateien entschlüsseln",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
+    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
+    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
+    "Show storage location" : "Speicherort anzeigen",
+    "Show last log in" : "Letzte Anmeldung anzeigen",
+    "Login Name" : "Loginname",
+    "Create" : "Anlegen",
+    "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
+    "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users and Groups" : "Nutzer und Gruppen suchen",
+    "Add Group" : "Gruppe hinzufügen",
+    "Group" : "Gruppe",
+    "Everyone" : "Jeder",
+    "Admins" : "Administratoren",
+    "Default Quota" : "Standard-Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Quota" : "Quota",
+    "Storage Location" : "Speicherort",
+    "Last Login" : "Letzte Anmeldung",
+    "change full name" : "Vollständigen Namen ändern",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
new file mode 100644
index 00000000000..1d290029d11
--- /dev/null
+++ b/settings/l10n/de.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
+    "Authentication error" : "Fehler bei der Anmeldung",
+    "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
+    "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
+    "Group already exists" : "Gruppe existiert bereits",
+    "Unable to add group" : "Gruppe konnte nicht angelegt werden",
+    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
+    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Couldn't remove app." : "Die App konnte nicht entfernt werden.",
+    "Email saved" : "E-Mail Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail Adresse",
+    "Unable to delete group" : "Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Benutzer konnte nicht gelöscht werden",
+    "Backups restored successfully" : "Backups erfolgreich wiederhergestellt",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Fehlerhafte Anfrage",
+    "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.",
+    "Wrong password" : "Falsches Passwort",
+    "No user supplied" : "Keinen Benutzer übermittelt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
+    "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
+    "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "Saved" : "Gespeichert",
+    "test email settings" : "E-Mail-Einstellungen testen",
+    "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen.",
+    "Email sent" : "E-Mail wurde verschickt",
+    "You need to set your user email before being able to send test emails." : "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
+    "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Sending..." : "Sende...",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten...",
+    "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
+    "Updating...." : "Aktualisierung...",
+    "Error while updating app" : "Fehler beim Aktualisieren der App",
+    "Updated" : "Aktualisiert",
+    "Uninstalling ...." : "Deinstalliere ....",
+    "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
+    "Uninstall" : "Deinstallieren",
+    "Select a profile picture" : "Wähle ein Profilbild",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Durchschnittliches Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Valid until {date}" : "Gültig bis {date}",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
+    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
+    "Groups" : "Gruppen",
+    "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
+    "Error creating group" : "Fehler beim Erstellen der Gruppe",
+    "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden",
+    "deleted {groupName}" : "{groupName} gelöscht",
+    "undo" : "rückgängig machen",
+    "no group" : "Keine Gruppe",
+    "never" : "niemals",
+    "deleted {userName}" : "{userName} gelöscht",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "Error creating user" : "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
+    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
+    "__language_name__" : "Deutsch (Persönlich)",
+    "Personal Info" : "Persönliche Informationen",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
+    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
+    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
+    "Errors and fatal issues" : "Fehler und fatale Probleme",
+    "Fatal issues only" : "Nur fatale Probleme",
+    "None" : "Nichts",
+    "Login" : "Anmelden",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sicherheitswarnung",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
+    "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." : "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
+    "Setup Warning" : "Einrichtungswarnung",
+    "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 z.B. OPcache oder eAccelerator verursacht.",
+    "Database Performance Info" : "Info zur Datenbankperformance",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
+    "Module 'fileinfo' missing" : "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 dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
+    "Your PHP version is outdated" : "Deine PHP-Version ist veraltet",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+    "PHP charset is not set to UTF-8" : "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt. Dies kann Fehler mit Nicht-ASCII Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von 'default_charset' in der php.ini auf 'UTF-8' zu ändern.",
+    "Locale not working" : "Ländereinstellung funktioniert nicht",
+    "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
+    "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
+    "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
+    "Connectivity checks" : "Verbindungsüberprüfungen",
+    "No problems found" : "Keine Probleme gefunden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API",
+    "Allow users to share via link" : "Erlaube Nutzern, mithilfe von Links zu teilen",
+    "Enforce password protection" : "Passwortschutz erzwingen",
+    "Allow public uploads" : "Öffentliches Hochladen erlauben",
+    "Set default expiration date" : "Setze  Ablaufdatum",
+    "Expire after " : "Ablauf nach ",
+    "days" : "Tagen",
+    "Enforce expiration date" : "Ablaufdatum erzwingen",
+    "Allow resharing" : "Erlaubt erneutes Teilen",
+    "Restrict users to only share with users in their groups" : "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
+    "Allow users to send mail notification for shared files" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+    "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "Erzwinge HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+    "Email Server" : "E-Mail-Server",
+    "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
+    "Send mode" : "Sende-Modus",
+    "From address" : "Absender-Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Authentifizierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "Teste E-Mail-Einstellungen",
+    "Send email" : "Sende E-Mail",
+    "Log" : "Log",
+    "Log level" : "Loglevel",
+    "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",
+    "Add your app" : "Fügen Sie Ihre App hinzu",
+    "by" : "von",
+    "licensed" : "Lizenziert",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Admin Documentation" : "Admin-Dokumentation",
+    "Update to %s" : "Aktualisierung auf %s",
+    "Enable only for specific groups" : "Nur für spezifizierte Gruppen aktivieren",
+    "Uninstall App" : "App deinstallieren",
+    "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" : "Lade die Apps zur Synchronisierung Deiner Daten herunter",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Du das Projekt unterstützen möchtest\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">nimm an der Entwicklung teil</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">erreiche die Welt</a>!",
+    "Show First Run Wizard again" : "Erstinstallation erneut durchführen",
+    "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",
+    "Your password was changed" : "Dein Passwort wurde geändert.",
+    "Unable to change your password" : "Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Full Name" : "Vollständiger Name",
+    "Email" : "E-Mail",
+    "Your email address" : "Deine E-Mail-Adresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Gib eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
+    "Profile picture" : "Profilbild",
+    "Upload new" : "Neues hochladen",
+    "Select new from Files" : "Neues aus den Dateien wählen",
+    "Remove image" : "Bild entfernen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.",
+    "Your avatar is provided by your original account." : "Dein Avatar wird von Deinem ursprünglichenKonto verwendet.",
+    "Cancel" : "Abbrechen",
+    "Choose as profile image" : "Als Profilbild wählen",
+    "Language" : "Sprache",
+    "Help translate" : "Hilf bei der Übersetzung",
+    "Common Name" : "Zuname",
+    "Valid until" : "Gültig bis",
+    "Issued By" : "Ausgestellt von:",
+    "Valid until %s" : "Gültig bis %s",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
+    "Log-in password" : "Login-Passwort",
+    "Decrypt all Files" : "Alle Dateien entschlüsseln",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
+    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
+    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
+    "Show storage location" : "Speicherort anzeigen",
+    "Show last log in" : "Letzte Anmeldung anzeigen",
+    "Login Name" : "Loginname",
+    "Create" : "Anlegen",
+    "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
+    "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users and Groups" : "Nutzer und Gruppen suchen",
+    "Add Group" : "Gruppe hinzufügen",
+    "Group" : "Gruppe",
+    "Everyone" : "Jeder",
+    "Admins" : "Administratoren",
+    "Default Quota" : "Standard-Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Quota" : "Quota",
+    "Storage Location" : "Speicherort",
+    "Last Login" : "Letzte Anmeldung",
+    "change full name" : "Vollständigen Namen ändern",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
deleted file mode 100644
index 19d18f82061..00000000000
--- a/settings/l10n/de.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiviert",
-"Not enabled" => "Nicht aktiviert",
-"Recommended" => "Empfohlen",
-"Authentication error" => "Fehler bei der Anmeldung",
-"Your full name has been changed." => "Dein vollständiger Name ist geändert worden.",
-"Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
-"Group already exists" => "Gruppe existiert bereits",
-"Unable to add group" => "Gruppe konnte nicht angelegt werden",
-"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
-"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfe Dein Passwort und versuche es erneut.",
-"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
-"Couldn't remove app." => "Die App konnte nicht entfernt werden.",
-"Email saved" => "E-Mail Adresse gespeichert",
-"Invalid email" => "Ungültige E-Mail Adresse",
-"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
-"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
-"Backups restored successfully" => "Backups erfolgreich wiederhergestellt",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfe bitte Dein owncloud.log oder frage Deinen Administrator",
-"Language changed" => "Sprache geändert",
-"Invalid request" => "Fehlerhafte Anfrage",
-"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.",
-"Wrong password" => "Falsches Passwort",
-"No user supplied" => "Keinen Benutzer übermittelt",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte gib ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzer Daten verloren gehen können",
-"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
-"Unable to change password" => "Passwort konnte nicht geändert werden",
-"Saved" => "Gespeichert",
-"test email settings" => "E-Mail-Einstellungen testen",
-"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
-"A problem occurred while sending the email. Please revise your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfe deine Einstellungen.",
-"Email sent" => "E-Mail wurde verschickt",
-"You need to set your user email before being able to send test emails." => "Du musst zunächst deine Benutzer-E-Mail-Adresse setzen, bevor du Test-E-Mail verschicken kannst.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Bist Du dir wirklich sicher, dass Du \"{domain}\" als vertrauenswürdige Domain hinzufügen möchtest?",
-"Add trusted domain" => "Vertrauenswürdige Domain hinzufügen",
-"Sending..." => "Sende...",
-"All" => "Alle",
-"Please wait...." => "Bitte warten...",
-"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
-"Disable" => "Deaktivieren",
-"Enable" => "Aktivieren",
-"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
-"Updating...." => "Aktualisierung...",
-"Error while updating app" => "Fehler beim Aktualisieren der App",
-"Updated" => "Aktualisiert",
-"Uninstalling ...." => "Deinstalliere ....",
-"Error while uninstalling app" => "Fehler beim Deinstallieren der App",
-"Uninstall" => "Deinstallieren",
-"Select a profile picture" => "Wähle ein Profilbild",
-"Very weak password" => "Sehr schwaches Passwort",
-"Weak password" => "Schwaches Passwort",
-"So-so password" => "Durchschnittliches Passwort",
-"Good password" => "Gutes Passwort",
-"Strong password" => "Starkes Passwort",
-"Valid until {date}" => "Gültig bis {date}",
-"Delete" => "Löschen",
-"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
-"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
-"Groups" => "Gruppen",
-"Unable to delete {objName}" => "Löschen von {objName} nicht möglich",
-"Error creating group" => "Fehler beim Erstellen der Gruppe",
-"A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
-"deleted {groupName}" => "{groupName} gelöscht",
-"undo" => "rückgängig machen",
-"no group" => "Keine Gruppe",
-"never" => "niemals",
-"deleted {userName}" => "{userName} gelöscht",
-"add group" => "Gruppe hinzufügen",
-"A valid username must be provided" => "Es muss ein gültiger Benutzername angegeben werden",
-"Error creating user" => "Beim Anlegen des Benutzers ist ein Fehler aufgetreten",
-"A valid password must be provided" => "Es muss ein gültiges Passwort angegeben werden",
-"Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
-"__language_name__" => "Deutsch (Persönlich)",
-"Personal Info" => "Persönliche Informationen",
-"SSL root certificates" => "SSL-Root-Zertifikate",
-"Encryption" => "Verschlüsselung",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Debug-Meldungen)",
-"Info, warnings, errors and fatal issues" => "Infos, Warnungen, Fehler und fatale Probleme",
-"Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
-"Errors and fatal issues" => "Fehler und fatale Probleme",
-"Fatal issues only" => "Nur fatale Probleme",
-"None" => "Nichts",
-"Login" => "Anmelden",
-"Plain" => "Plain",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Sicherheitswarnung",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
-"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." => "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
-"Setup Warning" => "Einrichtungswarnung",
-"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 z.B. OPcache oder eAccelerator verursacht.",
-"Database Performance Info" => "Info zur Datenbankperformance",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss dies geändert werden. Zur Migration in eine andere Datenbank muss der Komandozeilenbefehl: 'occ db:convert-type' verwendet werden.",
-"Module 'fileinfo' missing" => "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 dieses Modul zu aktivieren um die besten Resultate bei der Erkennung der Dateitypen zu erreichen.",
-"Your PHP version is outdated" => "Deine PHP-Version ist veraltet",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Deine PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
-"PHP charset is not set to UTF-8" => "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-Zeichensatz ist nicht auf UTF-8 gesetzt. Dies kann Fehler mit Nicht-ASCII Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von 'default_charset' in der php.ini auf 'UTF-8' zu ändern.",
-"Locale not working" => "Ländereinstellung funktioniert nicht",
-"System locale can not be set to a one which supports UTF-8." => "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
-"This means that there might be problems with certain characters in file names." => "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
-"URL generation in notification emails" => "URL-Generierung in Mail-Benachrichtungen",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
-"Connectivity checks" => "Verbindungsüberprüfungen",
-"No problems found" => "Keine Probleme gefunden",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
-"Cron was not executed yet!" => "Cron wurde bis jetzt noch nicht ausgeführt!",
-"Execute one task with each page loaded" => "Führe eine Aufgabe mit jeder geladenen Seite aus",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
-"Sharing" => "Teilen",
-"Allow apps to use the Share API" => "Erlaubt Apps die Nutzung der Share-API",
-"Allow users to share via link" => "Erlaube Nutzern, mithilfe von Links zu teilen",
-"Enforce password protection" => "Passwortschutz erzwingen",
-"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Set default expiration date" => "Setze  Ablaufdatum",
-"Expire after " => "Ablauf nach ",
-"days" => "Tagen",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Allow resharing" => "Erlaubt erneutes Teilen",
-"Restrict users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
-"Allow users to send mail notification for shared files" => "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
-"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
-"Security" => "Sicherheit",
-"Enforce HTTPS" => "Erzwinge HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
-"Email Server" => "E-Mail-Server",
-"This is used for sending out notifications." => "Dies wird zum Senden von Benachrichtigungen verwendet.",
-"Send mode" => "Sende-Modus",
-"From address" => "Absender-Adresse",
-"mail" => "Mail",
-"Authentication method" => "Authentifizierungsmethode",
-"Authentication required" => "Authentifizierung benötigt",
-"Server address" => "Adresse des Servers",
-"Port" => "Port",
-"Credentials" => "Zugangsdaten",
-"SMTP Username" => "SMTP Benutzername",
-"SMTP Password" => "SMTP Passwort",
-"Store credentials" => "Anmeldeinformationen speichern",
-"Test email settings" => "Teste E-Mail-Einstellungen",
-"Send email" => "Sende E-Mail",
-"Log" => "Log",
-"Log level" => "Loglevel",
-"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",
-"Add your app" => "Fügen Sie Ihre App hinzu",
-"by" => "von",
-"licensed" => "Lizenziert",
-"Documentation:" => "Dokumentation:",
-"User Documentation" => "Dokumentation für Benutzer",
-"Admin Documentation" => "Admin-Dokumentation",
-"Update to %s" => "Aktualisierung auf %s",
-"Enable only for specific groups" => "Nur für spezifizierte Gruppen aktivieren",
-"Uninstall App" => "App deinstallieren",
-"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" => "Lade die Apps zur Synchronisierung Deiner Daten herunter",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Wenn Du das Projekt unterstützen möchtest\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">nimm an der Entwicklung teil</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">erreiche die Welt</a>!",
-"Show First Run Wizard again" => "Erstinstallation erneut durchführen",
-"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",
-"Your password was changed" => "Dein Passwort wurde geändert.",
-"Unable to change your password" => "Passwort konnte nicht geändert werden",
-"Current password" => "Aktuelles Passwort",
-"New password" => "Neues Passwort",
-"Change password" => "Passwort ändern",
-"Full Name" => "Vollständiger Name",
-"Email" => "E-Mail",
-"Your email address" => "Deine E-Mail-Adresse",
-"Fill in an email address to enable password recovery and receive notifications" => "Gib eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
-"Profile picture" => "Profilbild",
-"Upload new" => "Neues hochladen",
-"Select new from Files" => "Neues aus den Dateien wählen",
-"Remove image" => "Bild entfernen",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber du kannst es zuschneiden.",
-"Your avatar is provided by your original account." => "Dein Avatar wird von Deinem ursprünglichenKonto verwendet.",
-"Cancel" => "Abbrechen",
-"Choose as profile image" => "Als Profilbild wählen",
-"Language" => "Sprache",
-"Help translate" => "Hilf bei der Übersetzung",
-"Common Name" => "Zuname",
-"Valid until" => "Gültig bis",
-"Issued By" => "Ausgestellt von:",
-"Valid until %s" => "Gültig bis %s",
-"Import Root Certificate" => "Root-Zertifikate importieren",
-"The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiviert, bitte entschlüsseln Sie alle ihre Daten.",
-"Log-in password" => "Login-Passwort",
-"Decrypt all Files" => "Alle Dateien entschlüsseln",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Deine Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Lösche diese nur dann dauerhaft, wenn Du dir sicher bist, dass alle Dateien korrekt entschlüsselt wurden.",
-"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
-"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
-"Show storage location" => "Speicherort anzeigen",
-"Show last log in" => "Letzte Anmeldung anzeigen",
-"Login Name" => "Loginname",
-"Create" => "Anlegen",
-"Admin Recovery Password" => "Admin-Wiederherstellungspasswort",
-"Enter the recovery password in order to recover the users files during password change" => "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-"Search Users and Groups" => "Nutzer und Gruppen suchen",
-"Add Group" => "Gruppe hinzufügen",
-"Group" => "Gruppe",
-"Everyone" => "Jeder",
-"Admins" => "Administratoren",
-"Default Quota" => "Standard-Quota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
-"Unlimited" => "Unbegrenzt",
-"Other" => "Andere",
-"Username" => "Benutzername",
-"Group Admin for" => "Gruppenadministrator für",
-"Quota" => "Quota",
-"Storage Location" => "Speicherort",
-"Last Login" => "Letzte Anmeldung",
-"change full name" => "Vollständigen Namen ändern",
-"set new password" => "Neues Passwort setzen",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_AT.js b/settings/l10n/de_AT.js
new file mode 100644
index 00000000000..cbec5214387
--- /dev/null
+++ b/settings/l10n/de_AT.js
@@ -0,0 +1,17 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "Fehlerhafte Anfrage",
+    "Delete" : "Löschen",
+    "never" : "niemals",
+    "__language_name__" : "Deutsch (Österreich)",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "More apps" : "Mehr Apps",
+    "by" : "von",
+    "Password" : "Passwort",
+    "Email" : "E-Mail",
+    "Cancel" : "Abbrechen",
+    "Other" : "Anderes"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_AT.json b/settings/l10n/de_AT.json
new file mode 100644
index 00000000000..c47cd69e340
--- /dev/null
+++ b/settings/l10n/de_AT.json
@@ -0,0 +1,15 @@
+{ "translations": {
+    "Invalid request" : "Fehlerhafte Anfrage",
+    "Delete" : "Löschen",
+    "never" : "niemals",
+    "__language_name__" : "Deutsch (Österreich)",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "More apps" : "Mehr Apps",
+    "by" : "von",
+    "Password" : "Passwort",
+    "Email" : "E-Mail",
+    "Cancel" : "Abbrechen",
+    "Other" : "Anderes"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de_AT.php b/settings/l10n/de_AT.php
deleted file mode 100644
index f82d87ef739..00000000000
--- a/settings/l10n/de_AT.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "Fehlerhafte Anfrage",
-"Delete" => "Löschen",
-"never" => "niemals",
-"__language_name__" => "Deutsch (Österreich)",
-"Server address" => "Adresse des Servers",
-"Port" => "Port",
-"More apps" => "Mehr Apps",
-"by" => "von",
-"Password" => "Passwort",
-"Email" => "E-Mail",
-"Cancel" => "Abbrechen",
-"Other" => "Anderes"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_CH.js b/settings/l10n/de_CH.js
new file mode 100644
index 00000000000..af913b8d81e
--- /dev/null
+++ b/settings/l10n/de_CH.js
@@ -0,0 +1,102 @@
+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
new file mode 100644
index 00000000000..ad7338d33b1
--- /dev/null
+++ b/settings/l10n/de_CH.json
@@ -0,0 +1,100 @@
+{ "translations": {
+    "Enabled" : "Aktiviert",
+    "Authentication error" : "Authentifizierungs-Fehler",
+    "Group already exists" : "Die Gruppe existiert bereits",
+    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
+    "Email saved" : "E-Mail-Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail-Adresse",
+    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Ungültige Anforderung",
+    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
+    "Unable to add user to group %s" : "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
+    "Unable to remove user from group %s" : "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
+    "Couldn't update app." : "Die App konnte nicht aktualisiert werden.",
+    "Saved" : "Gespeichert",
+    "Email sent" : "Email gesendet",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten....",
+    "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Fehler während der Aktivierung der Anwendung",
+    "Updating...." : "Update...",
+    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
+    "Updated" : "Aktualisiert",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Groups" : "Gruppen",
+    "undo" : "rückgängig machen",
+    "never" : "niemals",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
+    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
+    "__language_name__" : "Deutsch (Schweiz)",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Login" : "Anmelden",
+    "Security Warning" : "Sicherheitshinweis",
+    "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
+    "Setup Warning" : "Einrichtungswarnung",
+    "Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
+    "Locale not working" : "Die Lokalisierung funktioniert nicht",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
+    "Allow public uploads" : "Erlaube öffentliches hochladen",
+    "Allow resharing" : "Erlaube Weiterverteilen",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "HTTPS erzwingen",
+    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Log" : "Log",
+    "Log level" : "Log-Level",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+    "More apps" : "Mehr Apps",
+    "by" : "von",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Administrator Documentation" : "Dokumentation für Administratoren",
+    "Online Documentation" : "Online-Dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerzieller Support",
+    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+    "Password" : "Passwort",
+    "Your password was changed" : "Ihr Passwort wurde geändert.",
+    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Email" : "E-Mail",
+    "Your email address" : "Ihre E-Mail-Adresse",
+    "Cancel" : "Abbrechen",
+    "Language" : "Sprache",
+    "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "Log-in password" : "Login-Passwort",
+    "Decrypt all Files" : "Alle Dateien entschlüsseln",
+    "Login Name" : "Loginname",
+    "Create" : "Erstellen",
+    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
+    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de_CH.php b/settings/l10n/de_CH.php
deleted file mode 100644
index 08ff1847dd8..00000000000
--- a/settings/l10n/de_CH.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
new file mode 100644
index 00000000000..45b35b0abd1
--- /dev/null
+++ b/settings/l10n/de_DE.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
+    "Authentication error" : "Authentifizierungs-Fehler",
+    "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
+    "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
+    "Group already exists" : "Die Gruppe existiert bereits",
+    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
+    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
+    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
+    "Couldn't remove app." : "Die App konnte nicht entfernt 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",
+    "Backups restored successfully" : "Sicherungen erfolgreich wiederhergestellt",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
+    "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.",
+    "Wrong password" : "Falsches Passwort",
+    "No user supplied" : "Keinen Benutzer angegeben",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzerdaten verloren gehen können",
+    "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
+    "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "Saved" : "Gespeichert",
+    "test email settings" : "E-Mail-Einstellungen testen",
+    "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, scheinen die Einstellungen richtig zu sein.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
+    "Email sent" : "E-Mail gesendet",
+    "You need to set your user email before being able to send test emails." : "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
+    "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Sending..." : "Wird gesendet …",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten....",
+    "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
+    "Updating...." : "Update...",
+    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
+    "Updated" : "Aktualisiert",
+    "Uninstalling ...." : "Wird deinstalliert …",
+    "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
+    "Uninstall" : "Deinstallieren",
+    "Select a profile picture" : "Wählen Sie ein Profilbild",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Passables Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Valid until {date}" : "Gültig bis {date}",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
+    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
+    "Groups" : "Gruppen",
+    "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
+    "Error creating group" : "Fehler beim Erstellen der Gruppe",
+    "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden",
+    "deleted {groupName}" : "{groupName} gelöscht",
+    "undo" : "rückgängig machen",
+    "no group" : "Keine Gruppe",
+    "never" : "niemals",
+    "deleted {userName}" : "{userName} gelöscht",
+    "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",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
+    "__language_name__" : "Deutsch (Förmlich: Sie)",
+    "Personal Info" : "Persönliche Informationen",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
+    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
+    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
+    "Errors and fatal issues" : "Fehler und fatale Probleme",
+    "Fatal issues only" : "Nur kritische Fehler",
+    "None" : "Keine",
+    "Login" : "Anmelden",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sicherheitshinweis",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
+    "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öglicherweise 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 außerhalb des Wurzelverzeichnisses des Webservers.",
+    "Setup Warning" : "Einrichtungswarnung",
+    "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 z.B. OPcache oder eAccelerator verursacht.",
+    "Database Performance Info" : "Info zur Datenbankleistung",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wird als Datenbank verwendet. Für größere Installationen muss das geändert werden. Zur Migration in eine andere Datenbank muss in der Befehlszeile »occ db:convert-type« verwendet werden.",
+    "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.",
+    "Your PHP version is outdated" : "Ihre PHP-Version ist veraltet",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+    "PHP charset is not set to UTF-8" : "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt. Das kann Fehler mit Nicht-ASCII-Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von »default_charset« in der php.ini auf »UTF-8« zu ändern.",
+    "Locale not working" : "Die Lokalisierung funktioniert nicht",
+    "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
+    "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
+    "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
+    "Connectivity checks" : "Verbindungsüberprüfungen",
+    "No problems found" : "Keine Probleme gefunden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
+    "Allow users to share via link" : "Benutzern erlauben, über Links Inhalte freizugeben",
+    "Enforce password protection" : "Passwortschutz erzwingen",
+    "Allow public uploads" : "Öffentliches Hochladen erlauben",
+    "Set default expiration date" : "Standardablaufdatum einstellen",
+    "Expire after " : "Ablauf nach ",
+    "days" : "Tagen",
+    "Enforce expiration date" : "Ablaufdatum erzwingen",
+    "Allow resharing" : "Erlaube Weiterverteilen",
+    "Restrict users to only share with users in their groups" : "Nutzer nur auf das Teilen in ihren Gruppen beschränken",
+    "Allow users to send mail notification for shared files" : "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+    "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "HTTPS erzwingen",
+    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
+    "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.",
+    "Email Server" : "E-Mail-Server",
+    "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
+    "Send mode" : "Sendemodus",
+    "From address" : "Absender-Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Legitimierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "E-Mail-Einstellungen testen",
+    "Send email" : "E-Mail senden",
+    "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",
+    "Add your app" : "Füge Deine App hinzu",
+    "by" : "von",
+    "licensed" : "Lizenziert",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Admin Documentation" : "Dokumentation für Administratoren",
+    "Update to %s" : "Aktualisierung auf %s",
+    "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
+    "Uninstall App" : "App deinstallieren",
+    "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",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">können Sie an der Entwicklung teilnehmen</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">anderen von diesem Projekt berichten</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",
+    "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",
+    "Full Name" : "Vollständiger Name",
+    "Email" : "E-Mail",
+    "Your email address" : "Ihre E-Mail-Adresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
+    "Profile picture" : "Profilbild",
+    "Upload new" : "Neues hochladen",
+    "Select new from Files" : "Neues aus Dateien wählen",
+    "Remove image" : "Bild entfernen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden.",
+    "Your avatar is provided by your original account." : "Ihr Avatar wird von Ihrem Ursprungskonto verwendet.",
+    "Cancel" : "Abbrechen",
+    "Choose as profile image" : "Als Profilbild wählen",
+    "Language" : "Sprache",
+    "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Common Name" : "Zuname",
+    "Valid until" : "Gültig bis",
+    "Issued By" : "Ausgestellt von:",
+    "Valid until %s" : "Gültig bis %s",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
+    "Log-in password" : "Login-Passwort",
+    "Decrypt all Files" : "Alle Dateien entschlüsseln",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
+    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
+    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
+    "Show storage location" : "Speicherort anzeigen",
+    "Show last log in" : "Letzte Anmeldung anzeigen",
+    "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",
+    "Search Users and Groups" : "Benutzer und Gruppen suchen",
+    "Add Group" : "Gruppe hinzufügen",
+    "Group" : "Gruppe",
+    "Everyone" : "Jeder",
+    "Admins" : "Administratoren",
+    "Default Quota" : "Standardkontingent",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Quota" : "Kontingent",
+    "Storage Location" : "Speicherort",
+    "Last Login" : "Letzte Anmeldung",
+    "change full name" : "Vollständigen Namen ändern",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
new file mode 100644
index 00000000000..346e8790f30
--- /dev/null
+++ b/settings/l10n/de_DE.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
+    "Authentication error" : "Authentifizierungs-Fehler",
+    "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
+    "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
+    "Group already exists" : "Die Gruppe existiert bereits",
+    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
+    "Files decrypted successfully" : "Dateien erfolgreich entschlüsselt",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
+    "Encryption keys deleted permanently" : "Verschlüsselungsschlüssel dauerhaft gelöscht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
+    "Couldn't remove app." : "Die App konnte nicht entfernt 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",
+    "Backups restored successfully" : "Sicherungen erfolgreich wiederhergestellt",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
+    "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.",
+    "Wrong password" : "Falsches Passwort",
+    "No user supplied" : "Keinen Benutzer angegeben",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzerdaten verloren gehen können",
+    "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
+    "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "Saved" : "Gespeichert",
+    "test email settings" : "E-Mail-Einstellungen testen",
+    "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, scheinen die Einstellungen richtig zu sein.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
+    "Email sent" : "E-Mail gesendet",
+    "You need to set your user email before being able to send test emails." : "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
+    "Add trusted domain" : "Vertrauenswürdige Domain hinzufügen",
+    "Sending..." : "Wird gesendet …",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten....",
+    "Error while disabling app" : "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
+    "Updating...." : "Update...",
+    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
+    "Updated" : "Aktualisiert",
+    "Uninstalling ...." : "Wird deinstalliert …",
+    "Error while uninstalling app" : "Fehler beim Deinstallieren der App",
+    "Uninstall" : "Deinstallieren",
+    "Select a profile picture" : "Wählen Sie ein Profilbild",
+    "Very weak password" : "Sehr schwaches Passwort",
+    "Weak password" : "Schwaches Passwort",
+    "So-so password" : "Passables Passwort",
+    "Good password" : "Gutes Passwort",
+    "Strong password" : "Starkes Passwort",
+    "Valid until {date}" : "Gültig bis {date}",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Delete encryption keys permanently." : "Verschlüsselungsschlüssel dauerhaft löschen.",
+    "Restore encryption keys." : "Verschlüsselungsschlüssel wiederherstellen.",
+    "Groups" : "Gruppen",
+    "Unable to delete {objName}" : "Löschen von {objName} nicht möglich",
+    "Error creating group" : "Fehler beim Erstellen der Gruppe",
+    "A valid group name must be provided" : "Ein gültiger Gruppenname muss angegeben werden",
+    "deleted {groupName}" : "{groupName} gelöscht",
+    "undo" : "rückgängig machen",
+    "no group" : "Keine Gruppe",
+    "never" : "niemals",
+    "deleted {userName}" : "{userName} gelöscht",
+    "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",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
+    "__language_name__" : "Deutsch (Förmlich: Sie)",
+    "Personal Info" : "Persönliche Informationen",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
+    "Info, warnings, errors and fatal issues" : "Infos, Warnungen, Fehler und fatale Probleme",
+    "Warnings, errors and fatal issues" : "Warnungen, Fehler und fatale Probleme",
+    "Errors and fatal issues" : "Fehler und fatale Probleme",
+    "Fatal issues only" : "Nur kritische Fehler",
+    "None" : "Keine",
+    "Login" : "Anmelden",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sicherheitshinweis",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
+    "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öglicherweise 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 außerhalb des Wurzelverzeichnisses des Webservers.",
+    "Setup Warning" : "Einrichtungswarnung",
+    "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 z.B. OPcache oder eAccelerator verursacht.",
+    "Database Performance Info" : "Info zur Datenbankleistung",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wird als Datenbank verwendet. Für größere Installationen muss das geändert werden. Zur Migration in eine andere Datenbank muss in der Befehlszeile »occ db:convert-type« verwendet werden.",
+    "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.",
+    "Your PHP version is outdated" : "Ihre PHP-Version ist veraltet",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
+    "PHP charset is not set to UTF-8" : "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt. Das kann Fehler mit Nicht-ASCII-Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von »default_charset« in der php.ini auf »UTF-8« zu ändern.",
+    "Locale not working" : "Die Lokalisierung funktioniert nicht",
+    "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
+    "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
+    "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
+    "Connectivity checks" : "Verbindungsüberprüfungen",
+    "No problems found" : "Keine Probleme gefunden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
+    "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
+    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
+    "Allow users to share via link" : "Benutzern erlauben, über Links Inhalte freizugeben",
+    "Enforce password protection" : "Passwortschutz erzwingen",
+    "Allow public uploads" : "Öffentliches Hochladen erlauben",
+    "Set default expiration date" : "Standardablaufdatum einstellen",
+    "Expire after " : "Ablauf nach ",
+    "days" : "Tagen",
+    "Enforce expiration date" : "Ablaufdatum erzwingen",
+    "Allow resharing" : "Erlaube Weiterverteilen",
+    "Restrict users to only share with users in their groups" : "Nutzer nur auf das Teilen in ihren Gruppen beschränken",
+    "Allow users to send mail notification for shared files" : "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden",
+    "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
+    "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "HTTPS erzwingen",
+    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
+    "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.",
+    "Email Server" : "E-Mail-Server",
+    "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
+    "Send mode" : "Sendemodus",
+    "From address" : "Absender-Adresse",
+    "mail" : "Mail",
+    "Authentication method" : "Legitimierungsmethode",
+    "Authentication required" : "Authentifizierung benötigt",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Credentials" : "Zugangsdaten",
+    "SMTP Username" : "SMTP Benutzername",
+    "SMTP Password" : "SMTP Passwort",
+    "Store credentials" : "Anmeldeinformationen speichern",
+    "Test email settings" : "E-Mail-Einstellungen testen",
+    "Send email" : "E-Mail senden",
+    "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",
+    "Add your app" : "Füge Deine App hinzu",
+    "by" : "von",
+    "licensed" : "Lizenziert",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Admin Documentation" : "Dokumentation für Administratoren",
+    "Update to %s" : "Aktualisierung auf %s",
+    "Enable only for specific groups" : "Nur für bestimmte Gruppen aktivieren",
+    "Uninstall App" : "App deinstallieren",
+    "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",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">können Sie an der Entwicklung teilnehmen</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">anderen von diesem Projekt berichten</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",
+    "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",
+    "Full Name" : "Vollständiger Name",
+    "Email" : "E-Mail",
+    "Your email address" : "Ihre E-Mail-Adresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
+    "Profile picture" : "Profilbild",
+    "Upload new" : "Neues hochladen",
+    "Select new from Files" : "Neues aus Dateien wählen",
+    "Remove image" : "Bild entfernen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden.",
+    "Your avatar is provided by your original account." : "Ihr Avatar wird von Ihrem Ursprungskonto verwendet.",
+    "Cancel" : "Abbrechen",
+    "Choose as profile image" : "Als Profilbild wählen",
+    "Language" : "Sprache",
+    "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Common Name" : "Zuname",
+    "Valid until" : "Gültig bis",
+    "Issued By" : "Ausgestellt von:",
+    "Valid until %s" : "Gültig bis %s",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
+    "Log-in password" : "Login-Passwort",
+    "Decrypt all Files" : "Alle Dateien entschlüsseln",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
+    "Restore Encryption Keys" : "Verschlüsselungsschlüssel wiederherstellen",
+    "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
+    "Show storage location" : "Speicherort anzeigen",
+    "Show last log in" : "Letzte Anmeldung anzeigen",
+    "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",
+    "Search Users and Groups" : "Benutzer und Gruppen suchen",
+    "Add Group" : "Gruppe hinzufügen",
+    "Group" : "Gruppe",
+    "Everyone" : "Jeder",
+    "Admins" : "Administratoren",
+    "Default Quota" : "Standardkontingent",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "Group Admin for" : "Gruppenadministrator für",
+    "Quota" : "Kontingent",
+    "Storage Location" : "Speicherort",
+    "Last Login" : "Letzte Anmeldung",
+    "change full name" : "Vollständigen Namen ändern",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de_DE.php b/settings/l10n/de_DE.php
deleted file mode 100644
index 25328f377e3..00000000000
--- a/settings/l10n/de_DE.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiviert",
-"Not enabled" => "Nicht aktiviert",
-"Recommended" => "Empfohlen",
-"Authentication error" => "Authentifizierungs-Fehler",
-"Your full name has been changed." => "Ihr vollständiger Name ist geändert worden.",
-"Unable to change full name" => "Der vollständige Name konnte nicht geändert werden",
-"Group already exists" => "Die Gruppe existiert bereits",
-"Unable to add group" => "Die Gruppe konnte nicht angelegt werden",
-"Files decrypted successfully" => "Dateien erfolgreich entschlüsselt",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dateien konnten nicht entschlüsselt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
-"Couldn't decrypt your files, check your password and try again" => "Dateien konnten nicht entschlüsselt werden, bitte prüfen Sie Ihr Passwort und versuchen Sie es erneut.",
-"Encryption keys deleted permanently" => "Verschlüsselungsschlüssel dauerhaft gelöscht",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht dauerhaft gelöscht werden, prüfen Sie bitte Ihre owncloud.log oder frage Deinen Administrator",
-"Couldn't remove app." => "Die App konnte nicht entfernt 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",
-"Backups restored successfully" => "Sicherungen erfolgreich wiederhergestellt",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Verschlüsselungsschlüssel konnten nicht wiederhergestellt werden, prüfen Sie bitte Ihre owncloud.log oder fragen Sie Ihren Administrator",
-"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.",
-"Wrong password" => "Falsches Passwort",
-"No user supplied" => "Keinen Benutzer angegeben",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Bitte geben Sie ein Wiederherstellungspasswort für das Admin-Konto an, da sonst alle Benutzerdaten verloren gehen können",
-"Wrong admin recovery password. Please check the password and try again." => "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Das Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
-"Unable to change password" => "Passwort konnte nicht geändert werden",
-"Saved" => "Gespeichert",
-"test email settings" => "E-Mail-Einstellungen testen",
-"If you received this email, the settings seem to be correct." => "Wenn Sie diese E-Mail erhalten haben, scheinen die Einstellungen richtig zu sein.",
-"A problem occurred while sending the email. Please revise your settings." => "Ein Problem ist beim Senden der E-Mail aufgetreten. Bitte überprüfen Sie Ihre Einstellungen.",
-"Email sent" => "E-Mail gesendet",
-"You need to set your user email before being able to send test emails." => "Sie müssen Ihre Benutzer-E-Mail-Adresse einstellen, bevor Sie Test-E-Mails versenden können.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Sind Sie sich wirklich sicher, dass Sie »{domain}« als vertrauenswürdige Domain hinzufügen möchten?",
-"Add trusted domain" => "Vertrauenswürdige Domain hinzufügen",
-"Sending..." => "Wird gesendet …",
-"All" => "Alle",
-"Please wait...." => "Bitte warten....",
-"Error while disabling app" => "Beim Deaktivieren der Applikation ist ein Fehler aufgetreten",
-"Disable" => "Deaktivieren",
-"Enable" => "Aktivieren",
-"Error while enabling app" => "Beim Aktivieren der Applikation ist ein Fehler aufgetreten",
-"Updating...." => "Update...",
-"Error while updating app" => "Es ist ein Fehler während des Updates aufgetreten",
-"Updated" => "Aktualisiert",
-"Uninstalling ...." => "Wird deinstalliert …",
-"Error while uninstalling app" => "Fehler beim Deinstallieren der App",
-"Uninstall" => "Deinstallieren",
-"Select a profile picture" => "Wählen Sie ein Profilbild",
-"Very weak password" => "Sehr schwaches Passwort",
-"Weak password" => "Schwaches Passwort",
-"So-so password" => "Passables Passwort",
-"Good password" => "Gutes Passwort",
-"Strong password" => "Starkes Passwort",
-"Valid until {date}" => "Gültig bis {date}",
-"Delete" => "Löschen",
-"Decrypting files... Please wait, this can take some time." => "Entschlüssle Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
-"Delete encryption keys permanently." => "Verschlüsselungsschlüssel dauerhaft löschen.",
-"Restore encryption keys." => "Verschlüsselungsschlüssel wiederherstellen.",
-"Groups" => "Gruppen",
-"Unable to delete {objName}" => "Löschen von {objName} nicht möglich",
-"Error creating group" => "Fehler beim Erstellen der Gruppe",
-"A valid group name must be provided" => "Ein gültiger Gruppenname muss angegeben werden",
-"deleted {groupName}" => "{groupName} gelöscht",
-"undo" => "rückgängig machen",
-"no group" => "Keine Gruppe",
-"never" => "niemals",
-"deleted {userName}" => "{userName} gelöscht",
-"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",
-"Warning: Home directory for user \"{user}\" already exists" => "Warnung: Das Benutzerverzeichnis für den Benutzer  \"{user}\" existiert bereits",
-"__language_name__" => "Deutsch (Förmlich: Sie)",
-"Personal Info" => "Persönliche Informationen",
-"SSL root certificates" => "SSL-Root-Zertifikate",
-"Encryption" => "Verschlüsselung",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale Probleme, Fehler, Warnungen, Infos, Fehlerdiagnose)",
-"Info, warnings, errors and fatal issues" => "Infos, Warnungen, Fehler und fatale Probleme",
-"Warnings, errors and fatal issues" => "Warnungen, Fehler und fatale Probleme",
-"Errors and fatal issues" => "Fehler und fatale Probleme",
-"Fatal issues only" => "Nur kritische Fehler",
-"None" => "Keine",
-"Login" => "Anmelden",
-"Plain" => "Plain",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Sicherheitshinweis",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
-"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öglicherweise 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 außerhalb des Wurzelverzeichnisses des Webservers.",
-"Setup Warning" => "Einrichtungswarnung",
-"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 z.B. OPcache oder eAccelerator verursacht.",
-"Database Performance Info" => "Info zur Datenbankleistung",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wird als Datenbank verwendet. Für größere Installationen muss das geändert werden. Zur Migration in eine andere Datenbank muss in der Befehlszeile »occ db:convert-type« verwendet werden.",
-"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.",
-"Your PHP version is outdated" => "Ihre PHP-Version ist veraltet",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Ihre PHP-Version ist veraltet. Wir empfehlen dringend auf die Version 5.3.8 oder neuer zu aktualisieren, da ältere Versionen kompromittiert werden können. Es ist möglich, dass diese Installation nicht richtig funktioniert.",
-"PHP charset is not set to UTF-8" => "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-Zeichensatz ist nicht auf UTF-8 eingestellt. Das kann Fehler mit Nicht-ASCII-Zeichen in Dateinamen verursachen. Wir empfehlen daher den Wert von »default_charset« in der php.ini auf »UTF-8« zu ändern.",
-"Locale not working" => "Die Lokalisierung funktioniert nicht",
-"System locale can not be set to a one which supports UTF-8." => "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
-"This means that there might be problems with certain characters in file names." => "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
-"URL generation in notification emails" => "Adresserstellung in E-Mail-Benachrichtungen",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
-"Connectivity checks" => "Verbindungsüberprüfungen",
-"No problems found" => "Keine Probleme gefunden",
-"Please double check the <a href='%s'>installation guides</a>." => "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Letzter Cron wurde um %s ausgeführt.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
-"Cron was not executed yet!" => "Cron wurde bis jetzt noch nicht ausgeführt!",
-"Execute one task with each page loaded" => "Eine Aufgabe bei jedem Laden der Seite ausführen",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
-"Sharing" => "Teilen",
-"Allow apps to use the Share API" => "Anwendungen erlauben, die Share-API zu benutzen",
-"Allow users to share via link" => "Benutzern erlauben, über Links Inhalte freizugeben",
-"Enforce password protection" => "Passwortschutz erzwingen",
-"Allow public uploads" => "Öffentliches Hochladen erlauben",
-"Set default expiration date" => "Standardablaufdatum einstellen",
-"Expire after " => "Ablauf nach ",
-"days" => "Tagen",
-"Enforce expiration date" => "Ablaufdatum erzwingen",
-"Allow resharing" => "Erlaube Weiterverteilen",
-"Restrict users to only share with users in their groups" => "Nutzer nur auf das Teilen in ihren Gruppen beschränken",
-"Allow users to send mail notification for shared files" => "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden",
-"Exclude groups from sharing" => "Gruppen von Freigaben ausschließen",
-"These groups will still be able to receive shares, but not to initiate them." => "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
-"Security" => "Sicherheit",
-"Enforce HTTPS" => "HTTPS erzwingen",
-"Forces the clients to connect to %s via an encrypted connection." => "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
-"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.",
-"Email Server" => "E-Mail-Server",
-"This is used for sending out notifications." => "Dies wird für das Senden von Benachrichtigungen verwendet.",
-"Send mode" => "Sendemodus",
-"From address" => "Absender-Adresse",
-"mail" => "Mail",
-"Authentication method" => "Legitimierungsmethode",
-"Authentication required" => "Authentifizierung benötigt",
-"Server address" => "Adresse des Servers",
-"Port" => "Port",
-"Credentials" => "Zugangsdaten",
-"SMTP Username" => "SMTP Benutzername",
-"SMTP Password" => "SMTP Passwort",
-"Store credentials" => "Anmeldeinformationen speichern",
-"Test email settings" => "E-Mail-Einstellungen testen",
-"Send email" => "E-Mail senden",
-"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",
-"Add your app" => "Füge Deine App hinzu",
-"by" => "von",
-"licensed" => "Lizenziert",
-"Documentation:" => "Dokumentation:",
-"User Documentation" => "Dokumentation für Benutzer",
-"Admin Documentation" => "Dokumentation für Administratoren",
-"Update to %s" => "Aktualisierung auf %s",
-"Enable only for specific groups" => "Nur für bestimmte Gruppen aktivieren",
-"Uninstall App" => "App deinstallieren",
-"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",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Wenn Sie das Projekt unterstützen wollen,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">können Sie an der Entwicklung teilnehmen</a>\n\t\toder\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">anderen von diesem Projekt berichten</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",
-"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",
-"Full Name" => "Vollständiger Name",
-"Email" => "E-Mail",
-"Your email address" => "Ihre E-Mail-Adresse",
-"Fill in an email address to enable password recovery and receive notifications" => "Geben Sie eine E-Mail-Adresse an, um eine Wiederherstellung des Passworts zu ermöglichen und Benachrichtigungen zu empfangen",
-"Profile picture" => "Profilbild",
-"Upload new" => "Neues hochladen",
-"Select new from Files" => "Neues aus Dateien wählen",
-"Remove image" => "Bild entfernen",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Entweder PNG oder JPG. Im Idealfall quadratisch, aber Sie können es zuschneiden.",
-"Your avatar is provided by your original account." => "Ihr Avatar wird von Ihrem Ursprungskonto verwendet.",
-"Cancel" => "Abbrechen",
-"Choose as profile image" => "Als Profilbild wählen",
-"Language" => "Sprache",
-"Help translate" => "Helfen Sie bei der Übersetzung",
-"Common Name" => "Zuname",
-"Valid until" => "Gültig bis",
-"Issued By" => "Ausgestellt von:",
-"Valid until %s" => "Gültig bis %s",
-"Import Root Certificate" => "Root-Zertifikate importieren",
-"The encryption app is no longer enabled, please decrypt all your files" => "Die Verschlüsselungsanwendung ist nicht länger aktiv, bitte entschlüsseln Sie alle ihre Daten",
-"Log-in password" => "Login-Passwort",
-"Decrypt all Files" => "Alle Dateien entschlüsseln",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ihre Verschlüsselungsschlüssel wiederherstellen wurden zu einem Backup-Speicherort verschoben. Wenn irgendetwas schief läuft können die Schlüssel wiederhergestellt werden. Löschen Sie diese nur dann dauerhaft, wenn Sie sich sicher sind, dass alle Dateien korrekt entschlüsselt wurden.",
-"Restore Encryption Keys" => "Verschlüsselungsschlüssel wiederherstellen",
-"Delete Encryption Keys" => "Verschlüsselungsschlüssel löschen",
-"Show storage location" => "Speicherort anzeigen",
-"Show last log in" => "Letzte Anmeldung anzeigen",
-"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",
-"Search Users and Groups" => "Benutzer und Gruppen suchen",
-"Add Group" => "Gruppe hinzufügen",
-"Group" => "Gruppe",
-"Everyone" => "Jeder",
-"Admins" => "Administratoren",
-"Default Quota" => "Standardkontingent",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
-"Unlimited" => "Unbegrenzt",
-"Other" => "Andere",
-"Username" => "Benutzername",
-"Group Admin for" => "Gruppenadministrator für",
-"Quota" => "Kontingent",
-"Storage Location" => "Speicherort",
-"Last Login" => "Letzte Anmeldung",
-"change full name" => "Vollständigen Namen ändern",
-"set new password" => "Neues Passwort setzen",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
new file mode 100644
index 00000000000..d4c75399fa4
--- /dev/null
+++ b/settings/l10n/el.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Ενεργοποιημένο",
+    "Not enabled" : "Μη ενεργοποιημένο",
+    "Recommended" : "Προτείνεται",
+    "Authentication error" : "Σφάλμα πιστοποίησης",
+    "Your full name has been changed." : "Το πλήρες όνομά σας άλλαξε.",
+    "Unable to change full name" : "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
+    "Group already exists" : "Η ομάδα υπάρχει ήδη",
+    "Unable to add group" : "Αδυναμία προσθήκης ομάδας",
+    "Files decrypted successfully" : "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
+    "Couldn't decrypt your files, check your password and try again" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
+    "Encryption keys deleted permanently" : "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+    "Couldn't remove app." : "Αδυναμία αφαίρεσης εφαρμογής.",
+    "Email saved" : "Το email αποθηκεύτηκε ",
+    "Invalid email" : "Μη έγκυρο email",
+    "Unable to delete group" : "Αδυναμία διαγραφής ομάδας",
+    "Unable to delete user" : "Αδυναμία διαγραφής χρήστη",
+    "Backups restored successfully" : "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+    "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." : "Αδυναμία ενημέρωσης εφαρμογής",
+    "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." : "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
+    "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
+    "Saved" : "Αποθηκεύτηκαν",
+    "test email settings" : "δοκιμή ρυθμίσεων email",
+    "If you received this email, the settings seem to be correct." : "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
+    "A problem occurred while sending the email. Please revise your settings." : "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του email. Παρακαλώ αναθεωρήστε τις ρυθμίσεις σας.",
+    "Email sent" : "Το Email απεστάλη ",
+    "You need to set your user email before being able to send test emails." : "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
+    "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
+    "Sending..." : "Αποστέλεται...",
+    "All" : "Όλες",
+    "Please wait...." : "Παρακαλώ περιμένετε...",
+    "Error while disabling app" : "Σφάλμα κατά την απενεργοποίηση εισόδου",
+    "Disable" : "Απενεργοποίηση",
+    "Enable" : "Ενεργοποίηση",
+    "Error while enabling app" : "Σφάλμα κατά την ενεργοποίηση της εφαρμογής",
+    "Updating...." : "Ενημέρωση...",
+    "Error while updating app" : "Σφάλμα κατά την ενημέρωση της εφαρμογής",
+    "Updated" : "Ενημερώθηκε",
+    "Uninstalling ...." : "Απεγκατάσταση ....",
+    "Error while uninstalling app" : "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
+    "Uninstall" : "Απεγκατάσταση",
+    "Select a profile picture" : "Επιλογή εικόνας προφίλ",
+    "Very weak password" : "Πολύ αδύναμο συνθηματικό",
+    "Weak password" : "Αδύναμο συνθηματικό",
+    "So-so password" : "Μέτριο συνθηματικό",
+    "Good password" : "Καλό συνθηματικό",
+    "Strong password" : "Δυνατό συνθηματικό",
+    "Valid until {date}" : "Έγκυρο έως {date}",
+    "Delete" : "Διαγραφή",
+    "Decrypting files... Please wait, this can take some time." : "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
+    "Delete encryption keys permanently." : "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
+    "Restore encryption keys." : "Επαναφορά των κλειδιών κρυπτογράφησης.",
+    "Groups" : "Ομάδες",
+    "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}",
+    "Error creating group" : "Σφάλμα δημιουργίας ομάδας",
+    "A valid group name must be provided" : "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
+    "deleted {groupName}" : "διαγραφή {groupName}",
+    "undo" : "αναίρεση",
+    "never" : "ποτέ",
+    "deleted {userName}" : "διαγραφή {userName}",
+    "add group" : "προσθήκη ομάδας",
+    "A valid username must be provided" : "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
+    "Error creating user" : "Σφάλμα δημιουργίας χρήστη",
+    "A valid password must be provided" : "Πρέπει να δοθεί έγκυρο συνθηματικό",
+    "Warning: Home directory for user \"{user}\" already exists" : "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη",
+    "__language_name__" : "__όνομα_γλώσσας__",
+    "Personal Info" : "Προσωπικές Πληροφορίες",
+    "SSL root certificates" : "Πιστοποιητικά SSL root",
+    "Encryption" : "Κρυπτογράφηση",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)",
+    "Info, warnings, errors and fatal issues" : "Πληροφορίες, προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
+    "Warnings, errors and fatal issues" : "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
+    "Errors and fatal issues" : "Σφάλματα και καίρια ζητήματα",
+    "Fatal issues only" : "Καίρια ζητήματα μόνο",
+    "None" : "Τίποτα",
+    "Login" : "Σύνδεση",
+    "Plain" : "Απλό",
+    "NT LAN Manager" : "Διαχειριστης NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Προειδοποίηση Ασφαλείας",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Έχετε πρόσβαση στο %s μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί χρήση HTTPS αντ' αυτού.",
+    "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." : "Ο κατάλογος δεδομένων και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή.",
+    "Setup Warning" : "Ρύθμιση Προειδοποίησης",
+    "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.",
+    "Database Performance Info" : "Πληροφορίες Επίδοσης Βάσης Δεδομένων",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να την αλλάξετε. Για να μετακινηθείτε σε μια άλλη βάση δεδομένων χρησιμοποιείστε το εργαλείο γραμμής εντολών: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Η ενοτητα 'fileinfo' λειπει",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ",
+    "Your PHP version is outdated" : "Η έκδοση PHP είναι απαρχαιωμένη",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Η έκδοση PHP είναι απαρχαιωμένη. Συνιστούμε ανεπιφύλακτα να ενημερώσετε στην 5.3.8 ή νεώτερη καθώς παλαιότερες εκδόσεις είναι γνωστό πως περιέχουν σφάλματα. Είναι πιθανόν ότι αυτή η εγκατάσταση δεν λειτουργεί σωστά.",
+    "PHP charset is not set to UTF-8" : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8. Αυτό μπορεί να προκαλέσει τεράστια ζητήματα με χωρίς-ASCII χαρακτήρες στα ονόματα των αρχείων. Συνιστούμε ανεπιφύλακτα να αλλάξετε την αξία του 'default_charset' php.ini στο 'UTF-8'.",
+    "Locale not working" : "Η μετάφραση δεν δουλεύει",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Συνιστούμε σοβαρά να εγκαταστήσετε τα απαιτούμενα πακέτα στο σύστημά σας ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
+    "URL generation in notification emails" : "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
+    "Connectivity checks" : "Έλεγχοι συνδεσιμότητας",
+    "No problems found" : "Δεν βρέθηκαν προβλήματα",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Η τελευταία εκτέλεση του cron ήταν στις %s",
+    "Last cron was executed at %s. This is more than an hour ago, 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 ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
+    "Sharing" : "Διαμοιρασμός",
+    "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
+    "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
+    "Enforce password protection" : "Επιβολή προστασίας με κωδικό",
+    "Allow public uploads" : "Επιτρέπεται το κοινόχρηστο ανέβασμα",
+    "Set default expiration date" : "Ορισμός ερήμην ημερομηνίας λήξης",
+    "Expire after " : "Λήξη μετά από",
+    "days" : "ημέρες",
+    "Enforce expiration date" : "Επιβολή της ημερομηνίας λήξης",
+    "Allow resharing" : "Επιτρέπεται ο επαναδιαμοιρασμός",
+    "Restrict users to only share with users in their groups" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μόνο με χρήστες που ανήκουν στις ομάδες τους",
+    "Allow users to send mail notification for shared files" : "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
+    "Exclude groups from sharing" : "Εξαίρεση ομάδων από τον διαμοιρασμό",
+    "These groups will still be able to receive shares, but not to initiate them." : "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
+    "Security" : "Ασφάλεια",
+    "Enforce HTTPS" : "Επιβολή χρήσης HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.",
+    "Email Server" : "Διακομιστής Email",
+    "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
+    "Send mode" : "Κατάσταση αποστολής",
+    "From address" : "Από τη διεύθυνση",
+    "mail" : "ταχυδρομείο",
+    "Authentication method" : "Μέθοδος πιστοποίησης",
+    "Authentication required" : "Απαιτείται πιστοποίηση",
+    "Server address" : "Διεύθυνση διακομιστή",
+    "Port" : "Θύρα",
+    "Credentials" : "Πιστοποιητικά",
+    "SMTP Username" : "Όνομα χρήστη SMTP",
+    "SMTP Password" : "Συνθηματικό SMTP",
+    "Store credentials" : "Διαπιστευτήρια αποθήκευσης",
+    "Test email settings" : "Δοκιμή ρυθμίσεων email",
+    "Send email" : "Αποστολή email",
+    "Log" : "Καταγραφές",
+    "Log level" : "Επίπεδο καταγραφής",
+    "More" : "Περισσότερα",
+    "Less" : "Λιγότερα",
+    "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>." : "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Περισσότερες εφαρμογές",
+    "Add your app" : "Προσθέστε την Εφαρμογή σας ",
+    "by" : "από",
+    "Documentation:" : "Τεκμηρίωση:",
+    "User Documentation" : "Τεκμηρίωση Χρήστη",
+    "Admin Documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Update to %s" : "Ενημέρωση σε %s",
+    "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
+    "Uninstall App" : "Απεγκατάσταση Εφαρμογής",
+    "Administrator Documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Online Documentation" : "Τεκμηρίωση στο Διαδίκτυο",
+    "Forum" : "Φόρουμ",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Εμπορική Υποστήριξη",
+    "Get the apps to sync your files" : "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Αν θέλετε να στηρίξετε το έργο\n\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n\n⇥⇥⇥target=\"_blank\">συνησφέρετε στην ανάπτυξη</a>\n\n⇥⇥ή\n\n⇥⇥<a href=\"https://owncloud.org/promote\"\n\n⇥⇥⇥target=\"_blank\">διαδώστε το</a>!",
+    "Show First Run Wizard again" : "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Χρησιμοποιήσατε <strong>%s</strong> από τα <strong>%s</strong> διαθέσιμα",
+    "Password" : "Συνθηματικό",
+    "Your password was changed" : "Το συνθηματικό σας έχει αλλάξει",
+    "Unable to change your password" : "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
+    "Current password" : "Τρέχων συνθηματικό",
+    "New password" : "Νέο συνθηματικό",
+    "Change password" : "Αλλαγή συνθηματικού",
+    "Full Name" : "Πλήρες όνομα",
+    "Email" : "Ηλεκτρονικό ταχυδρομείο",
+    "Your email address" : "Η διεύθυνση ηλ. ταχυδρομείου σας",
+    "Fill in an email address to enable password recovery and receive notifications" : "Συμπληρώστε μια διεύθυνση email για να ενεργοποιήσετε την επαναφορά συνθηματικού και να λαμβάνετε ειδοποιήσεις",
+    "Profile picture" : "Φωτογραφία προφίλ",
+    "Upload new" : "Μεταφόρτωση νέου",
+    "Select new from Files" : "Επιλογή νέου από τα Αρχεία",
+    "Remove image" : "Αφαίρεση εικόνας",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε.",
+    "Your avatar is provided by your original account." : "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
+    "Cancel" : "Άκυρο",
+    "Choose as profile image" : "Επιλογή εικόνας προφίλ",
+    "Language" : "Γλώσσα",
+    "Help translate" : "Βοηθήστε στη μετάφραση",
+    "Common Name" : "Κοινό Όνομα",
+    "Valid until" : "Έγκυρο έως",
+    "Issued By" : "Έκδόθηκε από",
+    "Valid until %s" : "Έγκυρο έως %s",
+    "Import Root Certificate" : "Εισαγωγή Πιστοποιητικού Root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
+    "Log-in password" : "Συνθηματικό εισόδου",
+    "Decrypt all Files" : "Αποκρυπτογράφηση όλων των Αρχείων",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
+    "Restore Encryption Keys" : "Επαναφορά κλειδιών κρυπτογράφησης",
+    "Delete Encryption Keys" : "Διαγραφή κλειδιών κρυπτογράφησης",
+    "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
+    "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
+    "Login Name" : "Όνομα Σύνδεσης",
+    "Create" : "Δημιουργία",
+    "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
+    "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
+    "Search Users and Groups" : "Αναζήτηση Χρηστών και Ομάδων",
+    "Add Group" : "Προσθήκη Ομάδας",
+    "Group" : "Ομάδα",
+    "Everyone" : "Όλοι",
+    "Admins" : "Διαχειριστές",
+    "Default Quota" : "Προεπιλεγμένο Όριο",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
+    "Unlimited" : "Απεριόριστο",
+    "Other" : "Άλλο",
+    "Username" : "Όνομα χρήστη",
+    "Quota" : "Σύνολο Χώρου",
+    "Storage Location" : "Τοποθεσία αποθηκευτικού χώρου",
+    "Last Login" : "Τελευταία Σύνδεση",
+    "change full name" : "αλλαγή πλήρους ονόματος",
+    "set new password" : "επιλογή νέου κωδικού",
+    "Default" : "Προκαθορισμένο"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
new file mode 100644
index 00000000000..c2c202a3206
--- /dev/null
+++ b/settings/l10n/el.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Ενεργοποιημένο",
+    "Not enabled" : "Μη ενεργοποιημένο",
+    "Recommended" : "Προτείνεται",
+    "Authentication error" : "Σφάλμα πιστοποίησης",
+    "Your full name has been changed." : "Το πλήρες όνομά σας άλλαξε.",
+    "Unable to change full name" : "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
+    "Group already exists" : "Η ομάδα υπάρχει ήδη",
+    "Unable to add group" : "Αδυναμία προσθήκης ομάδας",
+    "Files decrypted successfully" : "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
+    "Couldn't decrypt your files, check your password and try again" : "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
+    "Encryption keys deleted permanently" : "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+    "Couldn't remove app." : "Αδυναμία αφαίρεσης εφαρμογής.",
+    "Email saved" : "Το email αποθηκεύτηκε ",
+    "Invalid email" : "Μη έγκυρο email",
+    "Unable to delete group" : "Αδυναμία διαγραφής ομάδας",
+    "Unable to delete user" : "Αδυναμία διαγραφής χρήστη",
+    "Backups restored successfully" : "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
+    "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." : "Αδυναμία ενημέρωσης εφαρμογής",
+    "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." : "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
+    "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
+    "Saved" : "Αποθηκεύτηκαν",
+    "test email settings" : "δοκιμή ρυθμίσεων email",
+    "If you received this email, the settings seem to be correct." : "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
+    "A problem occurred while sending the email. Please revise your settings." : "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του email. Παρακαλώ αναθεωρήστε τις ρυθμίσεις σας.",
+    "Email sent" : "Το Email απεστάλη ",
+    "You need to set your user email before being able to send test emails." : "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
+    "Add trusted domain" : "Προσθέστε αξιόπιστη περιοχή",
+    "Sending..." : "Αποστέλεται...",
+    "All" : "Όλες",
+    "Please wait...." : "Παρακαλώ περιμένετε...",
+    "Error while disabling app" : "Σφάλμα κατά την απενεργοποίηση εισόδου",
+    "Disable" : "Απενεργοποίηση",
+    "Enable" : "Ενεργοποίηση",
+    "Error while enabling app" : "Σφάλμα κατά την ενεργοποίηση της εφαρμογής",
+    "Updating...." : "Ενημέρωση...",
+    "Error while updating app" : "Σφάλμα κατά την ενημέρωση της εφαρμογής",
+    "Updated" : "Ενημερώθηκε",
+    "Uninstalling ...." : "Απεγκατάσταση ....",
+    "Error while uninstalling app" : "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
+    "Uninstall" : "Απεγκατάσταση",
+    "Select a profile picture" : "Επιλογή εικόνας προφίλ",
+    "Very weak password" : "Πολύ αδύναμο συνθηματικό",
+    "Weak password" : "Αδύναμο συνθηματικό",
+    "So-so password" : "Μέτριο συνθηματικό",
+    "Good password" : "Καλό συνθηματικό",
+    "Strong password" : "Δυνατό συνθηματικό",
+    "Valid until {date}" : "Έγκυρο έως {date}",
+    "Delete" : "Διαγραφή",
+    "Decrypting files... Please wait, this can take some time." : "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
+    "Delete encryption keys permanently." : "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
+    "Restore encryption keys." : "Επαναφορά των κλειδιών κρυπτογράφησης.",
+    "Groups" : "Ομάδες",
+    "Unable to delete {objName}" : "Αδυναμία διαγραφής του {objName}",
+    "Error creating group" : "Σφάλμα δημιουργίας ομάδας",
+    "A valid group name must be provided" : "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
+    "deleted {groupName}" : "διαγραφή {groupName}",
+    "undo" : "αναίρεση",
+    "never" : "ποτέ",
+    "deleted {userName}" : "διαγραφή {userName}",
+    "add group" : "προσθήκη ομάδας",
+    "A valid username must be provided" : "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
+    "Error creating user" : "Σφάλμα δημιουργίας χρήστη",
+    "A valid password must be provided" : "Πρέπει να δοθεί έγκυρο συνθηματικό",
+    "Warning: Home directory for user \"{user}\" already exists" : "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη",
+    "__language_name__" : "__όνομα_γλώσσας__",
+    "Personal Info" : "Προσωπικές Πληροφορίες",
+    "SSL root certificates" : "Πιστοποιητικά SSL root",
+    "Encryption" : "Κρυπτογράφηση",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)",
+    "Info, warnings, errors and fatal issues" : "Πληροφορίες, προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
+    "Warnings, errors and fatal issues" : "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
+    "Errors and fatal issues" : "Σφάλματα και καίρια ζητήματα",
+    "Fatal issues only" : "Καίρια ζητήματα μόνο",
+    "None" : "Τίποτα",
+    "Login" : "Σύνδεση",
+    "Plain" : "Απλό",
+    "NT LAN Manager" : "Διαχειριστης NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Προειδοποίηση Ασφαλείας",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Έχετε πρόσβαση στο %s μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί χρήση HTTPS αντ' αυτού.",
+    "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." : "Ο κατάλογος δεδομένων και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή.",
+    "Setup Warning" : "Ρύθμιση Προειδοποίησης",
+    "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.",
+    "Database Performance Info" : "Πληροφορίες Επίδοσης Βάσης Δεδομένων",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να την αλλάξετε. Για να μετακινηθείτε σε μια άλλη βάση δεδομένων χρησιμοποιείστε το εργαλείο γραμμής εντολών: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Η ενοτητα 'fileinfo' λειπει",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ",
+    "Your PHP version is outdated" : "Η έκδοση PHP είναι απαρχαιωμένη",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Η έκδοση PHP είναι απαρχαιωμένη. Συνιστούμε ανεπιφύλακτα να ενημερώσετε στην 5.3.8 ή νεώτερη καθώς παλαιότερες εκδόσεις είναι γνωστό πως περιέχουν σφάλματα. Είναι πιθανόν ότι αυτή η εγκατάσταση δεν λειτουργεί σωστά.",
+    "PHP charset is not set to UTF-8" : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8. Αυτό μπορεί να προκαλέσει τεράστια ζητήματα με χωρίς-ASCII χαρακτήρες στα ονόματα των αρχείων. Συνιστούμε ανεπιφύλακτα να αλλάξετε την αξία του 'default_charset' php.ini στο 'UTF-8'.",
+    "Locale not working" : "Η μετάφραση δεν δουλεύει",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Συνιστούμε σοβαρά να εγκαταστήσετε τα απαιτούμενα πακέτα στο σύστημά σας ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
+    "URL generation in notification emails" : "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
+    "Connectivity checks" : "Έλεγχοι συνδεσιμότητας",
+    "No problems found" : "Δεν βρέθηκαν προβλήματα",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Η τελευταία εκτέλεση του cron ήταν στις %s",
+    "Last cron was executed at %s. This is more than an hour ago, 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 ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
+    "Sharing" : "Διαμοιρασμός",
+    "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
+    "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
+    "Enforce password protection" : "Επιβολή προστασίας με κωδικό",
+    "Allow public uploads" : "Επιτρέπεται το κοινόχρηστο ανέβασμα",
+    "Set default expiration date" : "Ορισμός ερήμην ημερομηνίας λήξης",
+    "Expire after " : "Λήξη μετά από",
+    "days" : "ημέρες",
+    "Enforce expiration date" : "Επιβολή της ημερομηνίας λήξης",
+    "Allow resharing" : "Επιτρέπεται ο επαναδιαμοιρασμός",
+    "Restrict users to only share with users in their groups" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μόνο με χρήστες που ανήκουν στις ομάδες τους",
+    "Allow users to send mail notification for shared files" : "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
+    "Exclude groups from sharing" : "Εξαίρεση ομάδων από τον διαμοιρασμό",
+    "These groups will still be able to receive shares, but not to initiate them." : "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
+    "Security" : "Ασφάλεια",
+    "Enforce HTTPS" : "Επιβολή χρήσης HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.",
+    "Email Server" : "Διακομιστής Email",
+    "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
+    "Send mode" : "Κατάσταση αποστολής",
+    "From address" : "Από τη διεύθυνση",
+    "mail" : "ταχυδρομείο",
+    "Authentication method" : "Μέθοδος πιστοποίησης",
+    "Authentication required" : "Απαιτείται πιστοποίηση",
+    "Server address" : "Διεύθυνση διακομιστή",
+    "Port" : "Θύρα",
+    "Credentials" : "Πιστοποιητικά",
+    "SMTP Username" : "Όνομα χρήστη SMTP",
+    "SMTP Password" : "Συνθηματικό SMTP",
+    "Store credentials" : "Διαπιστευτήρια αποθήκευσης",
+    "Test email settings" : "Δοκιμή ρυθμίσεων email",
+    "Send email" : "Αποστολή email",
+    "Log" : "Καταγραφές",
+    "Log level" : "Επίπεδο καταγραφής",
+    "More" : "Περισσότερα",
+    "Less" : "Λιγότερα",
+    "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>." : "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Περισσότερες εφαρμογές",
+    "Add your app" : "Προσθέστε την Εφαρμογή σας ",
+    "by" : "από",
+    "Documentation:" : "Τεκμηρίωση:",
+    "User Documentation" : "Τεκμηρίωση Χρήστη",
+    "Admin Documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Update to %s" : "Ενημέρωση σε %s",
+    "Enable only for specific groups" : "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
+    "Uninstall App" : "Απεγκατάσταση Εφαρμογής",
+    "Administrator Documentation" : "Τεκμηρίωση Διαχειριστή",
+    "Online Documentation" : "Τεκμηρίωση στο Διαδίκτυο",
+    "Forum" : "Φόρουμ",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Εμπορική Υποστήριξη",
+    "Get the apps to sync your files" : "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Αν θέλετε να στηρίξετε το έργο\n\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n\n⇥⇥⇥target=\"_blank\">συνησφέρετε στην ανάπτυξη</a>\n\n⇥⇥ή\n\n⇥⇥<a href=\"https://owncloud.org/promote\"\n\n⇥⇥⇥target=\"_blank\">διαδώστε το</a>!",
+    "Show First Run Wizard again" : "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Χρησιμοποιήσατε <strong>%s</strong> από τα <strong>%s</strong> διαθέσιμα",
+    "Password" : "Συνθηματικό",
+    "Your password was changed" : "Το συνθηματικό σας έχει αλλάξει",
+    "Unable to change your password" : "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
+    "Current password" : "Τρέχων συνθηματικό",
+    "New password" : "Νέο συνθηματικό",
+    "Change password" : "Αλλαγή συνθηματικού",
+    "Full Name" : "Πλήρες όνομα",
+    "Email" : "Ηλεκτρονικό ταχυδρομείο",
+    "Your email address" : "Η διεύθυνση ηλ. ταχυδρομείου σας",
+    "Fill in an email address to enable password recovery and receive notifications" : "Συμπληρώστε μια διεύθυνση email για να ενεργοποιήσετε την επαναφορά συνθηματικού και να λαμβάνετε ειδοποιήσεις",
+    "Profile picture" : "Φωτογραφία προφίλ",
+    "Upload new" : "Μεταφόρτωση νέου",
+    "Select new from Files" : "Επιλογή νέου από τα Αρχεία",
+    "Remove image" : "Αφαίρεση εικόνας",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε.",
+    "Your avatar is provided by your original account." : "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
+    "Cancel" : "Άκυρο",
+    "Choose as profile image" : "Επιλογή εικόνας προφίλ",
+    "Language" : "Γλώσσα",
+    "Help translate" : "Βοηθήστε στη μετάφραση",
+    "Common Name" : "Κοινό Όνομα",
+    "Valid until" : "Έγκυρο έως",
+    "Issued By" : "Έκδόθηκε από",
+    "Valid until %s" : "Έγκυρο έως %s",
+    "Import Root Certificate" : "Εισαγωγή Πιστοποιητικού Root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
+    "Log-in password" : "Συνθηματικό εισόδου",
+    "Decrypt all Files" : "Αποκρυπτογράφηση όλων των Αρχείων",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
+    "Restore Encryption Keys" : "Επαναφορά κλειδιών κρυπτογράφησης",
+    "Delete Encryption Keys" : "Διαγραφή κλειδιών κρυπτογράφησης",
+    "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
+    "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
+    "Login Name" : "Όνομα Σύνδεσης",
+    "Create" : "Δημιουργία",
+    "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
+    "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
+    "Search Users and Groups" : "Αναζήτηση Χρηστών και Ομάδων",
+    "Add Group" : "Προσθήκη Ομάδας",
+    "Group" : "Ομάδα",
+    "Everyone" : "Όλοι",
+    "Admins" : "Διαχειριστές",
+    "Default Quota" : "Προεπιλεγμένο Όριο",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
+    "Unlimited" : "Απεριόριστο",
+    "Other" : "Άλλο",
+    "Username" : "Όνομα χρήστη",
+    "Quota" : "Σύνολο Χώρου",
+    "Storage Location" : "Τοποθεσία αποθηκευτικού χώρου",
+    "Last Login" : "Τελευταία Σύνδεση",
+    "change full name" : "αλλαγή πλήρους ονόματος",
+    "set new password" : "επιλογή νέου κωδικού",
+    "Default" : "Προκαθορισμένο"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
deleted file mode 100644
index 82fefc35c61..00000000000
--- a/settings/l10n/el.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Ενεργοποιημένο",
-"Not enabled" => "Μη ενεργοποιημένο",
-"Recommended" => "Προτείνεται",
-"Authentication error" => "Σφάλμα πιστοποίησης",
-"Your full name has been changed." => "Το πλήρες όνομά σας άλλαξε.",
-"Unable to change full name" => "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
-"Group already exists" => "Η ομάδα υπάρχει ήδη",
-"Unable to add group" => "Αδυναμία προσθήκης ομάδας",
-"Files decrypted successfully" => "Τα αρχεία αποκρυπτογραφήθηκαν με επιτυχία",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων, παρακαλώ ελέγξτε το owncloud.log ή ενημερωθείτε από τον διαχειριστή συστημάτων σας",
-"Couldn't decrypt your files, check your password and try again" => "Δεν ήταν δυνατή η αποκρυπτογράφηση των αρχείων σας, ελέγξτε τον κωδικό πρόσβασής σας και δοκιμάστε πάλι",
-"Encryption keys deleted permanently" => "Τα κλειδιά κρυπτογράφησης αφαιρέθηκαν οριστικά",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η οριστική διαγραφή των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
-"Couldn't remove app." => "Αδυναμία αφαίρεσης εφαρμογής.",
-"Email saved" => "Το email αποθηκεύτηκε ",
-"Invalid email" => "Μη έγκυρο email",
-"Unable to delete group" => "Αδυναμία διαγραφής ομάδας",
-"Unable to delete user" => "Αδυναμία διαγραφής χρήστη",
-"Backups restored successfully" => "Η επαναφορά αντιγράφων ασφαλείας έγινε με επιτυχία",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Δεν ήταν δυνατή η επαναφορά των κλειδιών κρυπτογράφησής σας, παρακαλώ ελέγξτε το owncloud.log ή επικοινωνήστε με τον διαχειριστή σας",
-"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." => "Αδυναμία ενημέρωσης εφαρμογής",
-"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." => "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
-"Unable to change password" => "Αδυναμία αλλαγής συνθηματικού",
-"Saved" => "Αποθηκεύτηκαν",
-"test email settings" => "δοκιμή ρυθμίσεων email",
-"If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
-"A problem occurred while sending the email. Please revise your settings." => "Παρουσιάστηκε ένα σφάλμα κατά την αποστολή του email. Παρακαλώ αναθεωρήστε τις ρυθμίσεις σας.",
-"Email sent" => "Το Email απεστάλη ",
-"You need to set your user email before being able to send test emails." => "Πρέπει να ορίσετε το email του χρήστη πριν να είστε σε θέση να στείλετε δοκιμαστικά emails.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Είστε πραγματικά σίγουροι ότι θέλετε να προσθέσετε το \"{domain}\" σαν αξιόπιστη περιοχή;",
-"Add trusted domain" => "Προσθέστε αξιόπιστη περιοχή",
-"Sending..." => "Αποστέλεται...",
-"All" => "Όλες",
-"Please wait...." => "Παρακαλώ περιμένετε...",
-"Error while disabling app" => "Σφάλμα κατά την απενεργοποίηση εισόδου",
-"Disable" => "Απενεργοποίηση",
-"Enable" => "Ενεργοποίηση",
-"Error while enabling app" => "Σφάλμα κατά την ενεργοποίηση της εφαρμογής",
-"Updating...." => "Ενημέρωση...",
-"Error while updating app" => "Σφάλμα κατά την ενημέρωση της εφαρμογής",
-"Updated" => "Ενημερώθηκε",
-"Uninstalling ...." => "Απεγκατάσταση ....",
-"Error while uninstalling app" => "Σφάλμα κατά την απεγκατάσταση της εφαρμογής",
-"Uninstall" => "Απεγκατάσταση",
-"Select a profile picture" => "Επιλογή εικόνας προφίλ",
-"Very weak password" => "Πολύ αδύναμο συνθηματικό",
-"Weak password" => "Αδύναμο συνθηματικό",
-"So-so password" => "Μέτριο συνθηματικό",
-"Good password" => "Καλό συνθηματικό",
-"Strong password" => "Δυνατό συνθηματικό",
-"Valid until {date}" => "Έγκυρο έως {date}",
-"Delete" => "Διαγραφή",
-"Decrypting files... Please wait, this can take some time." => "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.",
-"Delete encryption keys permanently." => "Οριστική διαγραφή των κλειδιων κρυπτογράφησης.",
-"Restore encryption keys." => "Επαναφορά των κλειδιών κρυπτογράφησης.",
-"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" => "προσθήκη ομάδας",
-"A valid username must be provided" => "Πρέπει να δοθεί έγκυρο όνομα χρήστη",
-"Error creating user" => "Σφάλμα δημιουργίας χρήστη",
-"A valid password must be provided" => "Πρέπει να δοθεί έγκυρο συνθηματικό",
-"Warning: Home directory for user \"{user}\" already exists" => "Προειδοποίηση: Ο μητρικός κατάλογος του χρήστη \"{user}\" υπάρχει ήδη",
-"__language_name__" => "__όνομα_γλώσσας__",
-"Personal Info" => "Προσωπικές Πληροφορίες",
-"SSL root certificates" => "Πιστοποιητικά SSL root",
-"Encryption" => "Κρυπτογράφηση",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Όλα (καίρια ζητήματα, σφάλματα, προειδοποιήσεις, πληροφορίες, αποσφαλμάτωση)",
-"Info, warnings, errors and fatal issues" => "Πληροφορίες, προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
-"Warnings, errors and fatal issues" => "Προειδοποιήσεις, σφάλματα και καίρια ζητήματα",
-"Errors and fatal issues" => "Σφάλματα και καίρια ζητήματα",
-"Fatal issues only" => "Καίρια ζητήματα μόνο",
-"None" => "Τίποτα",
-"Login" => "Σύνδεση",
-"Plain" => "Απλό",
-"NT LAN Manager" => "Διαχειριστης NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Προειδοποίηση Ασφαλείας",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Έχετε πρόσβαση στο %s μέσω HTTP. Προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας ώστε να απαιτεί χρήση HTTPS αντ' αυτού.",
-"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." => "Ο κατάλογος δεδομένων και τα αρχεία σας πιθανόν να είναι διαθέσιμα στο διαδίκτυο. Το αρχείο .htaccess δεν δουλεύει. Σας προτείνουμε ανεπιφύλακτα να ρυθμίσετε το διακομιστή σας με τέτοιο τρόπο ώστε ο κατάλογος δεδομένων να μην είναι πλέον προσβάσιμος ή να μετακινήσετε τον κατάλογο δεδομένων έξω από τη ρίζα του καταλόγου του διακομιστή.",
-"Setup Warning" => "Ρύθμιση Προειδοποίησης",
-"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.",
-"Database Performance Info" => "Πληροφορίες Επίδοσης Βάσης Δεδομένων",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Ως βάση δεδομένων χρησιμοποιείται η SQLite. Για μεγαλύτερες εγκαταστάσεις συνιστούμε να την αλλάξετε. Για να μετακινηθείτε σε μια άλλη βάση δεδομένων χρησιμοποιείστε το εργαλείο γραμμής εντολών: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Η ενοτητα 'fileinfo' λειπει",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Η PHP ενοτητα 'fileinfo' λειπει. Σας συνιστούμε να ενεργοποιήσετε αυτή την ενότητα για να έχετε καλύτερα αποτελέσματα με τον εντοπισμό τύπου MIME. ",
-"Your PHP version is outdated" => "Η έκδοση PHP είναι απαρχαιωμένη",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Η έκδοση PHP είναι απαρχαιωμένη. Συνιστούμε ανεπιφύλακτα να ενημερώσετε στην 5.3.8 ή νεώτερη καθώς παλαιότερες εκδόσεις είναι γνωστό πως περιέχουν σφάλματα. Είναι πιθανόν ότι αυτή η εγκατάσταση δεν λειτουργεί σωστά.",
-"PHP charset is not set to UTF-8" => "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Το σύνολο χαρακτήρων PHP δεν έχει οριστεί στο UTF-8. Αυτό μπορεί να προκαλέσει τεράστια ζητήματα με χωρίς-ASCII χαρακτήρες στα ονόματα των αρχείων. Συνιστούμε ανεπιφύλακτα να αλλάξετε την αξία του 'default_charset' php.ini στο 'UTF-8'.",
-"Locale not working" => "Η μετάφραση δεν δουλεύει",
-"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 to install the required packages on your system to support one of the following locales: %s." => "Συνιστούμε σοβαρά να εγκαταστήσετε τα απαιτούμενα πακέτα στο σύστημά σας ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
-"URL generation in notification emails" => "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
-"Connectivity checks" => "Έλεγχοι συνδεσιμότητας",
-"No problems found" => "Δεν βρέθηκαν προβλήματα",
-"Please double check the <a href='%s'>installation guides</a>." => "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Η τελευταία εκτέλεση του cron ήταν στις %s",
-"Last cron was executed at %s. This is more than an hour ago, 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 ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-"Sharing" => "Διαμοιρασμός",
-"Allow apps to use the Share API" => "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
-"Allow users to share via link" => "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
-"Enforce password protection" => "Επιβολή προστασίας με κωδικό",
-"Allow public uploads" => "Επιτρέπεται το κοινόχρηστο ανέβασμα",
-"Set default expiration date" => "Ορισμός ερήμην ημερομηνίας λήξης",
-"Expire after " => "Λήξη μετά από",
-"days" => "ημέρες",
-"Enforce expiration date" => "Επιβολή της ημερομηνίας λήξης",
-"Allow resharing" => "Επιτρέπεται ο επαναδιαμοιρασμός",
-"Restrict users to only share with users in their groups" => "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μόνο με χρήστες που ανήκουν στις ομάδες τους",
-"Allow users to send mail notification for shared files" => "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
-"Exclude groups from sharing" => "Εξαίρεση ομάδων από τον διαμοιρασμό",
-"These groups will still be able to receive shares, but not to initiate them." => "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
-"Security" => "Ασφάλεια",
-"Enforce HTTPS" => "Επιβολή χρήσης HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.",
-"Email Server" => "Διακομιστής Email",
-"This is used for sending out notifications." => "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
-"Send mode" => "Κατάσταση αποστολής",
-"From address" => "Από τη διεύθυνση",
-"mail" => "ταχυδρομείο",
-"Authentication method" => "Μέθοδος πιστοποίησης",
-"Authentication required" => "Απαιτείται πιστοποίηση",
-"Server address" => "Διεύθυνση διακομιστή",
-"Port" => "Θύρα",
-"Credentials" => "Πιστοποιητικά",
-"SMTP Username" => "Όνομα χρήστη SMTP",
-"SMTP Password" => "Συνθηματικό SMTP",
-"Store credentials" => "Διαπιστευτήρια αποθήκευσης",
-"Test email settings" => "Δοκιμή ρυθμίσεων email",
-"Send email" => "Αποστολή email",
-"Log" => "Καταγραφές",
-"Log level" => "Επίπεδο καταγραφής",
-"More" => "Περισσότερα",
-"Less" => "Λιγότερα",
-"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>." => "Αναπτύχθηκε από την <a href=\"http://ownCloud.org/contact\" target=\"_blank\">κοινότητα ownCloud</a>. Ο <a href=\"https://github.com/owncloud\" target=\"_blank\">πηγαίος κώδικας</a> είναι υπό άδεια χρήσης <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Περισσότερες εφαρμογές",
-"Add your app" => "Προσθέστε την Εφαρμογή σας ",
-"by" => "από",
-"Documentation:" => "Τεκμηρίωση:",
-"User Documentation" => "Τεκμηρίωση Χρήστη",
-"Admin Documentation" => "Τεκμηρίωση Διαχειριστή",
-"Update to %s" => "Ενημέρωση σε %s",
-"Enable only for specific groups" => "Ενεργοποίηση μόνο για καθορισμένες ομάδες",
-"Uninstall App" => "Απεγκατάσταση Εφαρμογής",
-"Administrator Documentation" => "Τεκμηρίωση Διαχειριστή",
-"Online Documentation" => "Τεκμηρίωση στο Διαδίκτυο",
-"Forum" => "Φόρουμ",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Εμπορική Υποστήριξη",
-"Get the apps to sync your files" => "Λήψη της εφαρμογής για συγχρονισμό των αρχείων σας",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Αν θέλετε να στηρίξετε το έργο\n\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n\n⇥⇥⇥target=\"_blank\">συνησφέρετε στην ανάπτυξη</a>\n\n⇥⇥ή\n\n⇥⇥<a href=\"https://owncloud.org/promote\"\n\n⇥⇥⇥target=\"_blank\">διαδώστε το</a>!",
-"Show First Run Wizard again" => "Προβολή Οδηγού Πρώτης Εκτέλεσης ξανά",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Χρησιμοποιήσατε <strong>%s</strong> από τα <strong>%s</strong> διαθέσιμα",
-"Password" => "Συνθηματικό",
-"Your password was changed" => "Το συνθηματικό σας έχει αλλάξει",
-"Unable to change your password" => "Δεν ήταν δυνατή η αλλαγή του κωδικού πρόσβασης",
-"Current password" => "Τρέχων συνθηματικό",
-"New password" => "Νέο συνθηματικό",
-"Change password" => "Αλλαγή συνθηματικού",
-"Full Name" => "Πλήρες όνομα",
-"Email" => "Ηλεκτρονικό ταχυδρομείο",
-"Your email address" => "Η διεύθυνση ηλ. ταχυδρομείου σας",
-"Fill in an email address to enable password recovery and receive notifications" => "Συμπληρώστε μια διεύθυνση email για να ενεργοποιήσετε την επαναφορά συνθηματικού και να λαμβάνετε ειδοποιήσεις",
-"Profile picture" => "Φωτογραφία προφίλ",
-"Upload new" => "Μεταφόρτωση νέου",
-"Select new from Files" => "Επιλογή νέου από τα Αρχεία",
-"Remove image" => "Αφαίρεση εικόνας",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Είτε png ή jpg. Ιδανικά τετράγωνη αλλά θα είστε σε θέση να την περικόψετε.",
-"Your avatar is provided by your original account." => "Το άβατάρ σας παρέχεται από τον αρχικό σας λογαριασμό.",
-"Cancel" => "Άκυρο",
-"Choose as profile image" => "Επιλογή εικόνας προφίλ",
-"Language" => "Γλώσσα",
-"Help translate" => "Βοηθήστε στη μετάφραση",
-"Common Name" => "Κοινό Όνομα",
-"Valid until" => "Έγκυρο έως",
-"Issued By" => "Έκδόθηκε από",
-"Valid until %s" => "Έγκυρο έως %s",
-"Import Root Certificate" => "Εισαγωγή Πιστοποιητικού Root",
-"The encryption app is no longer enabled, please decrypt all your files" => "Η εφαρμογή κρυπτογράφησης δεν είναι πλέον ενεργοποιημένη, παρακαλώ αποκρυπτογραφήστε όλα τα αρχεία σας",
-"Log-in password" => "Συνθηματικό εισόδου",
-"Decrypt all Files" => "Αποκρυπτογράφηση όλων των Αρχείων",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Τα κλειδιά κρυπτογράφησής σας μεταφέρονται σε θέση αντιγράφου ασφαλείας. Αν κάτι πάει στραβά, μπορείτε να τα επαναφέρετε. Διαγράψτε τα οριστικά μόνο αν είστε βέβαιοι ότι όλα τα αρχεία αποκρυπτογραφήθηκαν σωστά.",
-"Restore Encryption Keys" => "Επαναφορά κλειδιών κρυπτογράφησης",
-"Delete Encryption Keys" => "Διαγραφή κλειδιών κρυπτογράφησης",
-"Show storage location" => "Εμφάνιση τοποθεσίας αποθήκευσης",
-"Show last log in" => "Εμφάνιση τελευταίας εισόδου",
-"Login Name" => "Όνομα Σύνδεσης",
-"Create" => "Δημιουργία",
-"Admin Recovery Password" => "Κωδικός Επαναφοράς Διαχειριστή ",
-"Enter the recovery password in order to recover the users files during password change" => "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
-"Search Users and Groups" => "Αναζήτηση Χρηστών και Ομάδων",
-"Add Group" => "Προσθήκη Ομάδας",
-"Group" => "Ομάδα",
-"Everyone" => "Όλοι",
-"Admins" => "Διαχειριστές",
-"Default Quota" => "Προεπιλεγμένο Όριο",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
-"Unlimited" => "Απεριόριστο",
-"Other" => "Άλλο",
-"Username" => "Όνομα χρήστη",
-"Quota" => "Σύνολο Χώρου",
-"Storage Location" => "Τοποθεσία αποθηκευτικού χώρου",
-"Last Login" => "Τελευταία Σύνδεση",
-"change full name" => "αλλαγή πλήρους ονόματος",
-"set new password" => "επιλογή νέου κωδικού",
-"Default" => "Προκαθορισμένο"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/en@pirate.js b/settings/l10n/en@pirate.js
new file mode 100644
index 00000000000..f9293f8094c
--- /dev/null
+++ b/settings/l10n/en@pirate.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Password" : "Passcode"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/en@pirate.json b/settings/l10n/en@pirate.json
new file mode 100644
index 00000000000..6f74658eb82
--- /dev/null
+++ b/settings/l10n/en@pirate.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Password" : "Passcode"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/en@pirate.php b/settings/l10n/en@pirate.php
deleted file mode 100644
index e269c57c3d0..00000000000
--- a/settings/l10n/en@pirate.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Password" => "Passcode"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
new file mode 100644
index 00000000000..b35062e2824
--- /dev/null
+++ b/settings/l10n/en_GB.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Enabled",
+    "Not enabled" : "Not enabled",
+    "Recommended" : "Recommended",
+    "Authentication error" : "Authentication error",
+    "Your full name has been changed." : "Your full name has been changed.",
+    "Unable to change full name" : "Unable to change full name",
+    "Group already exists" : "Group already exists",
+    "Unable to add group" : "Unable to add group",
+    "Files decrypted successfully" : "Files decrypted successfully",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Couldn't decrypt your files, check your password and try again",
+    "Encryption keys deleted permanently" : "Encryption keys deleted permanently",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
+    "Couldn't remove app." : "Couldn't remove app.",
+    "Email saved" : "Email saved",
+    "Invalid email" : "Invalid email",
+    "Unable to delete group" : "Unable to delete group",
+    "Unable to delete user" : "Unable to delete user",
+    "Backups restored successfully" : "Backups restored successfully",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
+    "Language changed" : "Language changed",
+    "Invalid request" : "Invalid request",
+    "Admins can't remove themself from the admin group" : "Admins can't remove themselves from the admin group",
+    "Unable to add user to group %s" : "Unable to add user to group %s",
+    "Unable to remove user from group %s" : "Unable to remove user from group %s",
+    "Couldn't update app." : "Couldn't update app.",
+    "Wrong password" : "Incorrect password",
+    "No user supplied" : "No user supplied",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Please provide an admin recovery password, otherwise all user data will be lost",
+    "Wrong admin recovery password. Please check the password and try again." : "Incorrect admin recovery password. Please check the password and try again.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
+    "Unable to change password" : "Unable to change password",
+    "Saved" : "Saved",
+    "test email settings" : "test email settings",
+    "If you received this email, the settings seem to be correct." : "If you received this email, the settings seem to be correct.",
+    "A problem occurred while sending the email. Please revise your settings." : "A problem occurred whilst sending the email. Please revise your settings.",
+    "Email sent" : "Email sent",
+    "You need to set your user email before being able to send test emails." : "You need to set your user email before being able to send test emails.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Are you really sure you want add \"{domain}\" as a trusted domain?",
+    "Add trusted domain" : "Add trusted domain",
+    "Sending..." : "Sending...",
+    "All" : "All",
+    "Please wait...." : "Please wait....",
+    "Error while disabling app" : "Error whilst disabling app",
+    "Disable" : "Disable",
+    "Enable" : "Enable",
+    "Error while enabling app" : "Error whilst enabling app",
+    "Updating...." : "Updating....",
+    "Error while updating app" : "Error whilst updating app",
+    "Updated" : "Updated",
+    "Uninstalling ...." : "Uninstalling...",
+    "Error while uninstalling app" : "Error whilst uninstalling app",
+    "Uninstall" : "Uninstall",
+    "Select a profile picture" : "Select a profile picture",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
+    "Valid until {date}" : "Valid until {date}",
+    "Delete" : "Delete",
+    "Decrypting files... Please wait, this can take some time." : "Decrypting files... Please wait, this can take some time.",
+    "Delete encryption keys permanently." : "Delete encryption keys permanently.",
+    "Restore encryption keys." : "Restore encryption keys.",
+    "Groups" : "Groups",
+    "Unable to delete {objName}" : "Unable to delete {objName}",
+    "Error creating group" : "Error creating group",
+    "A valid group name must be provided" : "A valid group name must be provided",
+    "deleted {groupName}" : "deleted {groupName}",
+    "undo" : "undo",
+    "no group" : "no group",
+    "never" : "never",
+    "deleted {userName}" : "deleted {userName}",
+    "add group" : "add group",
+    "A valid username must be provided" : "A valid username must be provided",
+    "Error creating user" : "Error creating user",
+    "A valid password must be provided" : "A valid password must be provided",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warning: Home directory for user \"{user}\" already exists",
+    "__language_name__" : "English (British English)",
+    "Personal Info" : "Personal Info",
+    "SSL root certificates" : "SSL root certificates",
+    "Encryption" : "Encryption",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
+    "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues",
+    "Errors and fatal issues" : "Errors and fatal issues",
+    "Fatal issues only" : "Fatal issues only",
+    "None" : "None",
+    "Login" : "Login",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Security Warning",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.",
+    "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." : "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.",
+    "Setup Warning" : "Setup Warning",
+    "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.",
+    "Database Performance Info" : "Database Performance Info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite is used as database. For larger installations we recommend changing this. To migrate to another database use the command line tool: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' missing",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
+    "Your PHP version is outdated" : "Your PHP version is outdated",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.",
+    "PHP charset is not set to UTF-8" : "PHP charset is not set to UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.",
+    "Locale not working" : "Locale not working",
+    "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "This means that there might be problems with certain characters in file names.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
+    "URL generation in notification emails" : "URL generation in notification emails",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
+    "Connectivity checks" : "Connectivity checks",
+    "No problems found" : "No problems found",
+    "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Last cron was executed at %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
+    "Cron was not executed yet!" : "Cron was not executed yet!",
+    "Execute one task with each page loaded" : "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 is registered at a webcron service to call cron.php every 15 minutes over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
+    "Sharing" : "Sharing",
+    "Allow apps to use the Share API" : "Allow apps to use the Share API",
+    "Allow users to share via link" : "Allow users to share via link",
+    "Enforce password protection" : "Enforce password protection",
+    "Allow public uploads" : "Allow public uploads",
+    "Set default expiration date" : "Set default expiry date",
+    "Expire after " : "Expire after ",
+    "days" : "days",
+    "Enforce expiration date" : "Enforce expiry date",
+    "Allow resharing" : "Allow resharing",
+    "Restrict users to only share with users in their groups" : "Restrict users to only share with users in their groups",
+    "Allow users to send mail notification for shared files" : "Allow users to send mail notification for shared files",
+    "Exclude groups from sharing" : "Exclude groups from sharing",
+    "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
+    "Security" : "Security",
+    "Enforce HTTPS" : "Enforce HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forces the clients to connect to %s via an encrypted connection.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
+    "Email Server" : "Email Server",
+    "This is used for sending out notifications." : "This is used for sending out notifications.",
+    "Send mode" : "Send mode",
+    "From address" : "From address",
+    "mail" : "mail",
+    "Authentication method" : "Authentication method",
+    "Authentication required" : "Authentication required",
+    "Server address" : "Server address",
+    "Port" : "Port",
+    "Credentials" : "Credentials",
+    "SMTP Username" : "SMTP Username",
+    "SMTP Password" : "SMTP Password",
+    "Store credentials" : "Store credentials",
+    "Test email settings" : "Test email settings",
+    "Send email" : "Send email",
+    "Log" : "Log",
+    "Log level" : "Log level",
+    "More" : "More",
+    "Less" : "Less",
+    "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>." : "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 Licence\">AGPL</abbr></a>.",
+    "More apps" : "More apps",
+    "Add your app" : "Add your app",
+    "by" : "by",
+    "licensed" : "licensed",
+    "Documentation:" : "Documentation:",
+    "User Documentation" : "User Documentation",
+    "Admin Documentation" : "Admin Documentation",
+    "Update to %s" : "Update to %s",
+    "Enable only for specific groups" : "Enable only for specific groups",
+    "Uninstall App" : "Uninstall App",
+    "Administrator Documentation" : "Administrator Documentation",
+    "Online Documentation" : "Online Documentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Commercial Support",
+    "Get the apps to sync your files" : "Get the apps to sync your files",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
+    "Show First Run Wizard again" : "Show First Run Wizard again",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "You have used <strong>%s</strong> of the available <strong>%s</strong>",
+    "Password" : "Password",
+    "Your password was changed" : "Your password was changed",
+    "Unable to change your password" : "Unable to change your password",
+    "Current password" : "Current password",
+    "New password" : "New password",
+    "Change password" : "Change password",
+    "Full Name" : "Full Name",
+    "Email" : "Email",
+    "Your email address" : "Your email address",
+    "Fill in an email address to enable password recovery and receive notifications" : "Fill in an email address to enable password recovery and receive notifications",
+    "Profile picture" : "Profile picture",
+    "Upload new" : "Upload new",
+    "Select new from Files" : "Select new from Files",
+    "Remove image" : "Remove image",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Either png or jpg. Ideally square but you will be able to crop it.",
+    "Your avatar is provided by your original account." : "Your avatar is provided by your original account.",
+    "Cancel" : "Cancel",
+    "Choose as profile image" : "Choose as profile image",
+    "Language" : "Language",
+    "Help translate" : "Help translate",
+    "Common Name" : "Common Name",
+    "Valid until" : "Valid until",
+    "Issued By" : "Issued By",
+    "Valid until %s" : "Valid until %s",
+    "Import Root Certificate" : "Import Root Certificate",
+    "The encryption app is no longer enabled, please decrypt all your files" : "The encryption app is no longer enabled, please decrypt all your files",
+    "Log-in password" : "Log-in password",
+    "Decrypt all Files" : "Decrypt all Files",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
+    "Restore Encryption Keys" : "Restore Encryption Keys",
+    "Delete Encryption Keys" : "Delete Encryption Keys",
+    "Show storage location" : "Show storage location",
+    "Show last log in" : "Show last log in",
+    "Login Name" : "Login Name",
+    "Create" : "Create",
+    "Admin Recovery Password" : "Admin Recovery Password",
+    "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
+    "Search Users and Groups" : "Search Users and Groups",
+    "Add Group" : "Add Group",
+    "Group" : "Group",
+    "Everyone" : "Everyone",
+    "Admins" : "Admins",
+    "Default Quota" : "Default Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "Unlimited",
+    "Other" : "Other",
+    "Username" : "Username",
+    "Group Admin for" : "Group Admin for",
+    "Quota" : "Quota",
+    "Storage Location" : "Storage Location",
+    "Last Login" : "Last Login",
+    "change full name" : "change full name",
+    "set new password" : "set new password",
+    "Default" : "Default"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
new file mode 100644
index 00000000000..c5ae9fff869
--- /dev/null
+++ b/settings/l10n/en_GB.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Enabled",
+    "Not enabled" : "Not enabled",
+    "Recommended" : "Recommended",
+    "Authentication error" : "Authentication error",
+    "Your full name has been changed." : "Your full name has been changed.",
+    "Unable to change full name" : "Unable to change full name",
+    "Group already exists" : "Group already exists",
+    "Unable to add group" : "Unable to add group",
+    "Files decrypted successfully" : "Files decrypted successfully",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
+    "Couldn't decrypt your files, check your password and try again" : "Couldn't decrypt your files, check your password and try again",
+    "Encryption keys deleted permanently" : "Encryption keys deleted permanently",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
+    "Couldn't remove app." : "Couldn't remove app.",
+    "Email saved" : "Email saved",
+    "Invalid email" : "Invalid email",
+    "Unable to delete group" : "Unable to delete group",
+    "Unable to delete user" : "Unable to delete user",
+    "Backups restored successfully" : "Backups restored successfully",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
+    "Language changed" : "Language changed",
+    "Invalid request" : "Invalid request",
+    "Admins can't remove themself from the admin group" : "Admins can't remove themselves from the admin group",
+    "Unable to add user to group %s" : "Unable to add user to group %s",
+    "Unable to remove user from group %s" : "Unable to remove user from group %s",
+    "Couldn't update app." : "Couldn't update app.",
+    "Wrong password" : "Incorrect password",
+    "No user supplied" : "No user supplied",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Please provide an admin recovery password, otherwise all user data will be lost",
+    "Wrong admin recovery password. Please check the password and try again." : "Incorrect admin recovery password. Please check the password and try again.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
+    "Unable to change password" : "Unable to change password",
+    "Saved" : "Saved",
+    "test email settings" : "test email settings",
+    "If you received this email, the settings seem to be correct." : "If you received this email, the settings seem to be correct.",
+    "A problem occurred while sending the email. Please revise your settings." : "A problem occurred whilst sending the email. Please revise your settings.",
+    "Email sent" : "Email sent",
+    "You need to set your user email before being able to send test emails." : "You need to set your user email before being able to send test emails.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Are you really sure you want add \"{domain}\" as a trusted domain?",
+    "Add trusted domain" : "Add trusted domain",
+    "Sending..." : "Sending...",
+    "All" : "All",
+    "Please wait...." : "Please wait....",
+    "Error while disabling app" : "Error whilst disabling app",
+    "Disable" : "Disable",
+    "Enable" : "Enable",
+    "Error while enabling app" : "Error whilst enabling app",
+    "Updating...." : "Updating....",
+    "Error while updating app" : "Error whilst updating app",
+    "Updated" : "Updated",
+    "Uninstalling ...." : "Uninstalling...",
+    "Error while uninstalling app" : "Error whilst uninstalling app",
+    "Uninstall" : "Uninstall",
+    "Select a profile picture" : "Select a profile picture",
+    "Very weak password" : "Very weak password",
+    "Weak password" : "Weak password",
+    "So-so password" : "So-so password",
+    "Good password" : "Good password",
+    "Strong password" : "Strong password",
+    "Valid until {date}" : "Valid until {date}",
+    "Delete" : "Delete",
+    "Decrypting files... Please wait, this can take some time." : "Decrypting files... Please wait, this can take some time.",
+    "Delete encryption keys permanently." : "Delete encryption keys permanently.",
+    "Restore encryption keys." : "Restore encryption keys.",
+    "Groups" : "Groups",
+    "Unable to delete {objName}" : "Unable to delete {objName}",
+    "Error creating group" : "Error creating group",
+    "A valid group name must be provided" : "A valid group name must be provided",
+    "deleted {groupName}" : "deleted {groupName}",
+    "undo" : "undo",
+    "no group" : "no group",
+    "never" : "never",
+    "deleted {userName}" : "deleted {userName}",
+    "add group" : "add group",
+    "A valid username must be provided" : "A valid username must be provided",
+    "Error creating user" : "Error creating user",
+    "A valid password must be provided" : "A valid password must be provided",
+    "Warning: Home directory for user \"{user}\" already exists" : "Warning: Home directory for user \"{user}\" already exists",
+    "__language_name__" : "English (British English)",
+    "Personal Info" : "Personal Info",
+    "SSL root certificates" : "SSL root certificates",
+    "Encryption" : "Encryption",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Everything (fatal issues, errors, warnings, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, warnings, errors and fatal issues",
+    "Warnings, errors and fatal issues" : "Warnings, errors and fatal issues",
+    "Errors and fatal issues" : "Errors and fatal issues",
+    "Fatal issues only" : "Fatal issues only",
+    "None" : "None",
+    "Login" : "Login",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Security Warning",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.",
+    "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." : "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.",
+    "Setup Warning" : "Setup Warning",
+    "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.",
+    "Database Performance Info" : "Database Performance Info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite is used as database. For larger installations we recommend changing this. To migrate to another database use the command line tool: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' missing",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
+    "Your PHP version is outdated" : "Your PHP version is outdated",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.",
+    "PHP charset is not set to UTF-8" : "PHP charset is not set to UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.",
+    "Locale not working" : "Locale not working",
+    "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "This means that there might be problems with certain characters in file names.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
+    "URL generation in notification emails" : "URL generation in notification emails",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
+    "Connectivity checks" : "Connectivity checks",
+    "No problems found" : "No problems found",
+    "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Last cron was executed at %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
+    "Cron was not executed yet!" : "Cron was not executed yet!",
+    "Execute one task with each page loaded" : "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 is registered at a webcron service to call cron.php every 15 minutes over http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
+    "Sharing" : "Sharing",
+    "Allow apps to use the Share API" : "Allow apps to use the Share API",
+    "Allow users to share via link" : "Allow users to share via link",
+    "Enforce password protection" : "Enforce password protection",
+    "Allow public uploads" : "Allow public uploads",
+    "Set default expiration date" : "Set default expiry date",
+    "Expire after " : "Expire after ",
+    "days" : "days",
+    "Enforce expiration date" : "Enforce expiry date",
+    "Allow resharing" : "Allow resharing",
+    "Restrict users to only share with users in their groups" : "Restrict users to only share with users in their groups",
+    "Allow users to send mail notification for shared files" : "Allow users to send mail notification for shared files",
+    "Exclude groups from sharing" : "Exclude groups from sharing",
+    "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
+    "Security" : "Security",
+    "Enforce HTTPS" : "Enforce HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forces the clients to connect to %s via an encrypted connection.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
+    "Email Server" : "Email Server",
+    "This is used for sending out notifications." : "This is used for sending out notifications.",
+    "Send mode" : "Send mode",
+    "From address" : "From address",
+    "mail" : "mail",
+    "Authentication method" : "Authentication method",
+    "Authentication required" : "Authentication required",
+    "Server address" : "Server address",
+    "Port" : "Port",
+    "Credentials" : "Credentials",
+    "SMTP Username" : "SMTP Username",
+    "SMTP Password" : "SMTP Password",
+    "Store credentials" : "Store credentials",
+    "Test email settings" : "Test email settings",
+    "Send email" : "Send email",
+    "Log" : "Log",
+    "Log level" : "Log level",
+    "More" : "More",
+    "Less" : "Less",
+    "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>." : "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 Licence\">AGPL</abbr></a>.",
+    "More apps" : "More apps",
+    "Add your app" : "Add your app",
+    "by" : "by",
+    "licensed" : "licensed",
+    "Documentation:" : "Documentation:",
+    "User Documentation" : "User Documentation",
+    "Admin Documentation" : "Admin Documentation",
+    "Update to %s" : "Update to %s",
+    "Enable only for specific groups" : "Enable only for specific groups",
+    "Uninstall App" : "Uninstall App",
+    "Administrator Documentation" : "Administrator Documentation",
+    "Online Documentation" : "Online Documentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Commercial Support",
+    "Get the apps to sync your files" : "Get the apps to sync your files",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
+    "Show First Run Wizard again" : "Show First Run Wizard again",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "You have used <strong>%s</strong> of the available <strong>%s</strong>",
+    "Password" : "Password",
+    "Your password was changed" : "Your password was changed",
+    "Unable to change your password" : "Unable to change your password",
+    "Current password" : "Current password",
+    "New password" : "New password",
+    "Change password" : "Change password",
+    "Full Name" : "Full Name",
+    "Email" : "Email",
+    "Your email address" : "Your email address",
+    "Fill in an email address to enable password recovery and receive notifications" : "Fill in an email address to enable password recovery and receive notifications",
+    "Profile picture" : "Profile picture",
+    "Upload new" : "Upload new",
+    "Select new from Files" : "Select new from Files",
+    "Remove image" : "Remove image",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Either png or jpg. Ideally square but you will be able to crop it.",
+    "Your avatar is provided by your original account." : "Your avatar is provided by your original account.",
+    "Cancel" : "Cancel",
+    "Choose as profile image" : "Choose as profile image",
+    "Language" : "Language",
+    "Help translate" : "Help translate",
+    "Common Name" : "Common Name",
+    "Valid until" : "Valid until",
+    "Issued By" : "Issued By",
+    "Valid until %s" : "Valid until %s",
+    "Import Root Certificate" : "Import Root Certificate",
+    "The encryption app is no longer enabled, please decrypt all your files" : "The encryption app is no longer enabled, please decrypt all your files",
+    "Log-in password" : "Log-in password",
+    "Decrypt all Files" : "Decrypt all Files",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
+    "Restore Encryption Keys" : "Restore Encryption Keys",
+    "Delete Encryption Keys" : "Delete Encryption Keys",
+    "Show storage location" : "Show storage location",
+    "Show last log in" : "Show last log in",
+    "Login Name" : "Login Name",
+    "Create" : "Create",
+    "Admin Recovery Password" : "Admin Recovery Password",
+    "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
+    "Search Users and Groups" : "Search Users and Groups",
+    "Add Group" : "Add Group",
+    "Group" : "Group",
+    "Everyone" : "Everyone",
+    "Admins" : "Admins",
+    "Default Quota" : "Default Quota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "Unlimited",
+    "Other" : "Other",
+    "Username" : "Username",
+    "Group Admin for" : "Group Admin for",
+    "Quota" : "Quota",
+    "Storage Location" : "Storage Location",
+    "Last Login" : "Last Login",
+    "change full name" : "change full name",
+    "set new password" : "set new password",
+    "Default" : "Default"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/en_GB.php b/settings/l10n/en_GB.php
deleted file mode 100644
index 86101c029c0..00000000000
--- a/settings/l10n/en_GB.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Enabled",
-"Not enabled" => "Not enabled",
-"Recommended" => "Recommended",
-"Authentication error" => "Authentication error",
-"Your full name has been changed." => "Your full name has been changed.",
-"Unable to change full name" => "Unable to change full name",
-"Group already exists" => "Group already exists",
-"Unable to add group" => "Unable to add group",
-"Files decrypted successfully" => "Files decrypted successfully",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Couldn't decrypt your files, please check your owncloud.log or ask your administrator",
-"Couldn't decrypt your files, check your password and try again" => "Couldn't decrypt your files, check your password and try again",
-"Encryption keys deleted permanently" => "Encryption keys deleted permanently",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator",
-"Couldn't remove app." => "Couldn't remove app.",
-"Email saved" => "Email saved",
-"Invalid email" => "Invalid email",
-"Unable to delete group" => "Unable to delete group",
-"Unable to delete user" => "Unable to delete user",
-"Backups restored successfully" => "Backups restored successfully",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator",
-"Language changed" => "Language changed",
-"Invalid request" => "Invalid request",
-"Admins can't remove themself from the admin group" => "Admins can't remove themselves from the admin group",
-"Unable to add user to group %s" => "Unable to add user to group %s",
-"Unable to remove user from group %s" => "Unable to remove user from group %s",
-"Couldn't update app." => "Couldn't update app.",
-"Wrong password" => "Incorrect password",
-"No user supplied" => "No user supplied",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Please provide an admin recovery password, otherwise all user data will be lost",
-"Wrong admin recovery password. Please check the password and try again." => "Incorrect admin recovery password. Please check the password and try again.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
-"Unable to change password" => "Unable to change password",
-"Saved" => "Saved",
-"test email settings" => "test email settings",
-"If you received this email, the settings seem to be correct." => "If you received this email, the settings seem to be correct.",
-"A problem occurred while sending the email. Please revise your settings." => "A problem occurred whilst sending the email. Please revise your settings.",
-"Email sent" => "Email sent",
-"You need to set your user email before being able to send test emails." => "You need to set your user email before being able to send test emails.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Are you really sure you want add \"{domain}\" as a trusted domain?",
-"Add trusted domain" => "Add trusted domain",
-"Sending..." => "Sending...",
-"All" => "All",
-"Please wait...." => "Please wait....",
-"Error while disabling app" => "Error whilst disabling app",
-"Disable" => "Disable",
-"Enable" => "Enable",
-"Error while enabling app" => "Error whilst enabling app",
-"Updating...." => "Updating....",
-"Error while updating app" => "Error whilst updating app",
-"Updated" => "Updated",
-"Uninstalling ...." => "Uninstalling...",
-"Error while uninstalling app" => "Error whilst uninstalling app",
-"Uninstall" => "Uninstall",
-"Select a profile picture" => "Select a profile picture",
-"Very weak password" => "Very weak password",
-"Weak password" => "Weak password",
-"So-so password" => "So-so password",
-"Good password" => "Good password",
-"Strong password" => "Strong password",
-"Valid until {date}" => "Valid until {date}",
-"Delete" => "Delete",
-"Decrypting files... Please wait, this can take some time." => "Decrypting files... Please wait, this can take some time.",
-"Delete encryption keys permanently." => "Delete encryption keys permanently.",
-"Restore encryption keys." => "Restore encryption keys.",
-"Groups" => "Groups",
-"Unable to delete {objName}" => "Unable to delete {objName}",
-"Error creating group" => "Error creating group",
-"A valid group name must be provided" => "A valid group name must be provided",
-"deleted {groupName}" => "deleted {groupName}",
-"undo" => "undo",
-"no group" => "no group",
-"never" => "never",
-"deleted {userName}" => "deleted {userName}",
-"add group" => "add group",
-"A valid username must be provided" => "A valid username must be provided",
-"Error creating user" => "Error creating user",
-"A valid password must be provided" => "A valid password must be provided",
-"Warning: Home directory for user \"{user}\" already exists" => "Warning: Home directory for user \"{user}\" already exists",
-"__language_name__" => "English (British English)",
-"Personal Info" => "Personal Info",
-"SSL root certificates" => "SSL root certificates",
-"Encryption" => "Encryption",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Everything (fatal issues, errors, warnings, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, warnings, errors and fatal issues",
-"Warnings, errors and fatal issues" => "Warnings, errors and fatal issues",
-"Errors and fatal issues" => "Errors and fatal issues",
-"Fatal issues only" => "Fatal issues only",
-"None" => "None",
-"Login" => "Login",
-"Plain" => "Plain",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Security Warning",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.",
-"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." => "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.",
-"Setup Warning" => "Setup Warning",
-"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.",
-"Database Performance Info" => "Database Performance Info",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite is used as database. For larger installations we recommend changing this. To migrate to another database use the command line tool: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Module 'fileinfo' missing",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "The PHP module 'fileinfo' is missing. We strongly recommend enabling this module to get best results with mime-type detection.",
-"Your PHP version is outdated" => "Your PHP version is outdated",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.",
-"PHP charset is not set to UTF-8" => "PHP charset is not set to UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'.",
-"Locale not working" => "Locale not working",
-"System locale can not be set to a one which supports UTF-8." => "System locale can not be set to a one which supports UTF-8.",
-"This means that there might be problems with certain characters in file names." => "This means that there might be problems with certain characters in file names.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
-"URL generation in notification emails" => "URL generation in notification emails",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
-"Connectivity checks" => "Connectivity checks",
-"No problems found" => "No problems found",
-"Please double check the <a href='%s'>installation guides</a>." => "Please double check the <a href='%s'>installation guides</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Last cron was executed at %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
-"Cron was not executed yet!" => "Cron was not executed yet!",
-"Execute one task with each page loaded" => "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 is registered at a webcron service to call cron.php every 15 minutes over http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Use system's cron service to call the cron.php file every 15 minutes.",
-"Sharing" => "Sharing",
-"Allow apps to use the Share API" => "Allow apps to use the Share API",
-"Allow users to share via link" => "Allow users to share via link",
-"Enforce password protection" => "Enforce password protection",
-"Allow public uploads" => "Allow public uploads",
-"Set default expiration date" => "Set default expiry date",
-"Expire after " => "Expire after ",
-"days" => "days",
-"Enforce expiration date" => "Enforce expiry date",
-"Allow resharing" => "Allow resharing",
-"Restrict users to only share with users in their groups" => "Restrict users to only share with users in their groups",
-"Allow users to send mail notification for shared files" => "Allow users to send mail notification for shared files",
-"Exclude groups from sharing" => "Exclude groups from sharing",
-"These groups will still be able to receive shares, but not to initiate them." => "These groups will still be able to receive shares, but not to initiate them.",
-"Security" => "Security",
-"Enforce HTTPS" => "Enforce HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forces the clients to connect to %s via an encrypted connection.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
-"Email Server" => "Email Server",
-"This is used for sending out notifications." => "This is used for sending out notifications.",
-"Send mode" => "Send mode",
-"From address" => "From address",
-"mail" => "mail",
-"Authentication method" => "Authentication method",
-"Authentication required" => "Authentication required",
-"Server address" => "Server address",
-"Port" => "Port",
-"Credentials" => "Credentials",
-"SMTP Username" => "SMTP Username",
-"SMTP Password" => "SMTP Password",
-"Store credentials" => "Store credentials",
-"Test email settings" => "Test email settings",
-"Send email" => "Send email",
-"Log" => "Log",
-"Log level" => "Log level",
-"More" => "More",
-"Less" => "Less",
-"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>." => "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 Licence\">AGPL</abbr></a>.",
-"More apps" => "More apps",
-"Add your app" => "Add your app",
-"by" => "by",
-"licensed" => "licensed",
-"Documentation:" => "Documentation:",
-"User Documentation" => "User Documentation",
-"Admin Documentation" => "Admin Documentation",
-"Update to %s" => "Update to %s",
-"Enable only for specific groups" => "Enable only for specific groups",
-"Uninstall App" => "Uninstall App",
-"Administrator Documentation" => "Administrator Documentation",
-"Online Documentation" => "Online Documentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Commercial Support",
-"Get the apps to sync your files" => "Get the apps to sync your files",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
-"Show First Run Wizard again" => "Show First Run Wizard again",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "You have used <strong>%s</strong> of the available <strong>%s</strong>",
-"Password" => "Password",
-"Your password was changed" => "Your password was changed",
-"Unable to change your password" => "Unable to change your password",
-"Current password" => "Current password",
-"New password" => "New password",
-"Change password" => "Change password",
-"Full Name" => "Full Name",
-"Email" => "Email",
-"Your email address" => "Your email address",
-"Fill in an email address to enable password recovery and receive notifications" => "Fill in an email address to enable password recovery and receive notifications",
-"Profile picture" => "Profile picture",
-"Upload new" => "Upload new",
-"Select new from Files" => "Select new from Files",
-"Remove image" => "Remove image",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Either png or jpg. Ideally square but you will be able to crop it.",
-"Your avatar is provided by your original account." => "Your avatar is provided by your original account.",
-"Cancel" => "Cancel",
-"Choose as profile image" => "Choose as profile image",
-"Language" => "Language",
-"Help translate" => "Help translate",
-"Common Name" => "Common Name",
-"Valid until" => "Valid until",
-"Issued By" => "Issued By",
-"Valid until %s" => "Valid until %s",
-"Import Root Certificate" => "Import Root Certificate",
-"The encryption app is no longer enabled, please decrypt all your files" => "The encryption app is no longer enabled, please decrypt all your files",
-"Log-in password" => "Log-in password",
-"Decrypt all Files" => "Decrypt all Files",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly.",
-"Restore Encryption Keys" => "Restore Encryption Keys",
-"Delete Encryption Keys" => "Delete Encryption Keys",
-"Show storage location" => "Show storage location",
-"Show last log in" => "Show last log in",
-"Login Name" => "Login Name",
-"Create" => "Create",
-"Admin Recovery Password" => "Admin Recovery Password",
-"Enter the recovery password in order to recover the users files during password change" => "Enter the recovery password in order to recover the user's files during password change",
-"Search Users and Groups" => "Search Users and Groups",
-"Add Group" => "Add Group",
-"Group" => "Group",
-"Everyone" => "Everyone",
-"Admins" => "Admins",
-"Default Quota" => "Default Quota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
-"Unlimited" => "Unlimited",
-"Other" => "Other",
-"Username" => "Username",
-"Group Admin for" => "Group Admin for",
-"Quota" => "Quota",
-"Storage Location" => "Storage Location",
-"Last Login" => "Last Login",
-"change full name" => "change full name",
-"set new password" => "set new password",
-"Default" => "Default"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
new file mode 100644
index 00000000000..5d76674dca9
--- /dev/null
+++ b/settings/l10n/eo.js
@@ -0,0 +1,155 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Kapabligita",
+    "Authentication error" : "Aŭtentiga eraro",
+    "Your full name has been changed." : "Via plena nomo ŝanĝitas.",
+    "Unable to change full name" : "Ne eblis ŝanĝi la plenan nomon",
+    "Group already exists" : "La grupo jam ekzistas",
+    "Unable to add group" : "Ne eblis aldoni la grupon",
+    "Files decrypted successfully" : "La dosieroj malĉifriĝis sukcese",
+    "Encryption keys deleted permanently" : "La ĉifroklavojn foriĝis por ĉiam.",
+    "Email saved" : "La retpoŝtadreso konserviĝis",
+    "Invalid email" : "Nevalida retpoŝtadreso",
+    "Unable to delete group" : "Ne eblis forigi la grupon",
+    "Unable to delete user" : "Ne eblis forigi la uzanton",
+    "Backups restored successfully" : "La savokopioj restaŭriĝis sukcese",
+    "Language changed" : "La lingvo estas ŝanĝita",
+    "Invalid request" : "Nevalida peto",
+    "Admins can't remove themself from the admin group" : "Administrantoj ne povas forigi sin mem el la administra grupo.",
+    "Unable to add user to group %s" : "Ne eblis aldoni la uzanton al la grupo %s",
+    "Unable to remove user from group %s" : "Ne eblis forigi la uzantan el la grupo %s",
+    "Couldn't update app." : "Ne eblis ĝisdatigi la aplikaĵon.",
+    "Wrong password" : "Malĝusta pasvorto",
+    "Unable to change password" : "Ne eblis ŝanĝi la pasvorton",
+    "Saved" : "Konservita",
+    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "Sending..." : "Sendante...",
+    "All" : "Ĉio",
+    "Please wait...." : "Bonvolu atendi...",
+    "Error while disabling app" : "Eraris malkapabligo de aplikaĵo",
+    "Disable" : "Malkapabligi",
+    "Enable" : "Kapabligi",
+    "Error while enabling app" : "Eraris kapabligo de aplikaĵo",
+    "Updating...." : "Ĝisdatigata...",
+    "Error while updating app" : "Eraris ĝisdatigo de la aplikaĵo",
+    "Updated" : "Ĝisdatigita",
+    "Uninstalling ...." : "Malinstalante...",
+    "Error while uninstalling app" : "Eraris malinstalo de aplikaĵo",
+    "Uninstall" : "Malinstali",
+    "Select a profile picture" : "Elekti profilan bildon",
+    "Very weak password" : "Tre malforta pasvorto",
+    "Weak password" : "Malforta pasvorto",
+    "So-so password" : "Mezaĉa pasvorto",
+    "Good password" : "Bona pasvorto",
+    "Strong password" : "Forta pasvorto",
+    "Delete" : "Forigi",
+    "Delete encryption keys permanently." : "Forigi ĉifroklavojn por ĉiam.",
+    "Restore encryption keys." : "Restaŭri ĉifroklavojn.",
+    "Groups" : "Grupoj",
+    "deleted {groupName}" : "{groupName} foriĝis",
+    "undo" : "malfari",
+    "never" : "neniam",
+    "deleted {userName}" : "{userName} foriĝis",
+    "add group" : "aldoni grupon",
+    "A valid username must be provided" : "Valida uzantonomo devas proviziĝi",
+    "Error creating user" : "Eraris kreo de uzanto",
+    "A valid password must be provided" : "Valida pasvorto devas proviziĝi",
+    "Warning: Home directory for user \"{user}\" already exists" : "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
+    "__language_name__" : "Esperanto",
+    "SSL root certificates" : "Radikaj SSL-atestoj",
+    "Encryption" : "Ĉifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
+    "Info, warnings, errors and fatal issues" : "Informoj, avertoj, eraroj kaj fatalaĵoj",
+    "Warnings, errors and fatal issues" : "Avertoj, eraroj kaj fatalaĵoj",
+    "Errors and fatal issues" : "Eraroj kaj fatalaĵoj",
+    "Fatal issues only" : "Fatalaĵoj nur",
+    "None" : "Nenio",
+    "Login" : "Ensaluti",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sekureca averto",
+    "Module 'fileinfo' missing" : "La modulo «fileinfo» mankas",
+    "Locale not working" : "La lokaĵaro ne funkcias",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
+    "Cron" : "Cron",
+    "Sharing" : "Kunhavigo",
+    "Allow apps to use the Share API" : "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
+    "Allow public uploads" : "Permesi publikajn alŝutojn",
+    "Expire after " : "Eksvalidigi post",
+    "days" : "tagoj",
+    "Allow resharing" : "Kapabligi rekunhavigon",
+    "Security" : "Sekuro",
+    "Email Server" : "Retpoŝtoservilo",
+    "Send mode" : "Sendi pli",
+    "From address" : "El adreso",
+    "mail" : "retpoŝto",
+    "Authentication method" : "Aŭtentiga metodo",
+    "Authentication required" : "Aŭtentiĝo nepras",
+    "Server address" : "Servila adreso",
+    "Port" : "Pordo",
+    "Credentials" : "Aŭtentigiloj",
+    "SMTP Username" : "SMTP-uzantonomo",
+    "SMTP Password" : "SMTP-pasvorto",
+    "Send email" : "Sendi retpoŝton",
+    "Log" : "Protokolo",
+    "Log level" : "Registronivelo",
+    "More" : "Pli",
+    "Less" : "Malpli",
+    "Version" : "Eldono",
+    "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>." : "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "de",
+    "Documentation:" : "Dokumentaro:",
+    "User Documentation" : "Dokumentaro por uzantoj",
+    "Admin Documentation" : "Administra dokumentaro",
+    "Enable only for specific groups" : "Kapabligi nur por specifajn grupojn",
+    "Uninstall App" : "Malinstali aplikaĵon",
+    "Administrator Documentation" : "Dokumentaro por administrantoj",
+    "Online Documentation" : "Reta dokumentaro",
+    "Forum" : "Forumo",
+    "Bugtracker" : "Cimoraportejo",
+    "Commercial Support" : "Komerca subteno",
+    "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
+    "Password" : "Pasvorto",
+    "Your password was changed" : "Via pasvorto ŝanĝiĝis",
+    "Unable to change your password" : "Ne eblis ŝanĝi vian pasvorton",
+    "Current password" : "Nuna pasvorto",
+    "New password" : "Nova pasvorto",
+    "Change password" : "Ŝanĝi la pasvorton",
+    "Full Name" : "Plena nomo",
+    "Email" : "Retpoŝto",
+    "Your email address" : "Via retpoŝta adreso",
+    "Profile picture" : "Profila bildo",
+    "Upload new" : "Alŝuti novan",
+    "Select new from Files" : "Elekti novan el dosieroj",
+    "Remove image" : "Forigi bildon",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin.",
+    "Cancel" : "Nuligi",
+    "Choose as profile image" : "Elekti kiel profilan bildon",
+    "Language" : "Lingvo",
+    "Help translate" : "Helpu traduki",
+    "Import Root Certificate" : "Enporti radikan ateston",
+    "Log-in password" : "Ensaluta pasvorto",
+    "Decrypt all Files" : "Malĉifri ĉiujn dosierojn",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
+    "Restore Encryption Keys" : "Restaŭri ĉifroklavojn",
+    "Delete Encryption Keys" : "Forigi ĉifroklavojn",
+    "Login Name" : "Ensaluti",
+    "Create" : "Krei",
+    "Search Users and Groups" : "Serĉi uzantojn kaj grupojn",
+    "Add Group" : "Aldoni grupon",
+    "Group" : "Grupo",
+    "Everyone" : "Ĉiuj",
+    "Admins" : "Administrantoj",
+    "Default Quota" : "Defaŭlta kvoto",
+    "Unlimited" : "Senlima",
+    "Other" : "Alia",
+    "Username" : "Uzantonomo",
+    "Quota" : "Kvoto",
+    "Last Login" : "Lasta ensaluto",
+    "change full name" : "ŝanĝi plenan nomon",
+    "set new password" : "agordi novan pasvorton",
+    "Default" : "Defaŭlta"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
new file mode 100644
index 00000000000..1fc5186184f
--- /dev/null
+++ b/settings/l10n/eo.json
@@ -0,0 +1,153 @@
+{ "translations": {
+    "Enabled" : "Kapabligita",
+    "Authentication error" : "Aŭtentiga eraro",
+    "Your full name has been changed." : "Via plena nomo ŝanĝitas.",
+    "Unable to change full name" : "Ne eblis ŝanĝi la plenan nomon",
+    "Group already exists" : "La grupo jam ekzistas",
+    "Unable to add group" : "Ne eblis aldoni la grupon",
+    "Files decrypted successfully" : "La dosieroj malĉifriĝis sukcese",
+    "Encryption keys deleted permanently" : "La ĉifroklavojn foriĝis por ĉiam.",
+    "Email saved" : "La retpoŝtadreso konserviĝis",
+    "Invalid email" : "Nevalida retpoŝtadreso",
+    "Unable to delete group" : "Ne eblis forigi la grupon",
+    "Unable to delete user" : "Ne eblis forigi la uzanton",
+    "Backups restored successfully" : "La savokopioj restaŭriĝis sukcese",
+    "Language changed" : "La lingvo estas ŝanĝita",
+    "Invalid request" : "Nevalida peto",
+    "Admins can't remove themself from the admin group" : "Administrantoj ne povas forigi sin mem el la administra grupo.",
+    "Unable to add user to group %s" : "Ne eblis aldoni la uzanton al la grupo %s",
+    "Unable to remove user from group %s" : "Ne eblis forigi la uzantan el la grupo %s",
+    "Couldn't update app." : "Ne eblis ĝisdatigi la aplikaĵon.",
+    "Wrong password" : "Malĝusta pasvorto",
+    "Unable to change password" : "Ne eblis ŝanĝi la pasvorton",
+    "Saved" : "Konservita",
+    "Email sent" : "La retpoŝtaĵo sendiĝis",
+    "Sending..." : "Sendante...",
+    "All" : "Ĉio",
+    "Please wait...." : "Bonvolu atendi...",
+    "Error while disabling app" : "Eraris malkapabligo de aplikaĵo",
+    "Disable" : "Malkapabligi",
+    "Enable" : "Kapabligi",
+    "Error while enabling app" : "Eraris kapabligo de aplikaĵo",
+    "Updating...." : "Ĝisdatigata...",
+    "Error while updating app" : "Eraris ĝisdatigo de la aplikaĵo",
+    "Updated" : "Ĝisdatigita",
+    "Uninstalling ...." : "Malinstalante...",
+    "Error while uninstalling app" : "Eraris malinstalo de aplikaĵo",
+    "Uninstall" : "Malinstali",
+    "Select a profile picture" : "Elekti profilan bildon",
+    "Very weak password" : "Tre malforta pasvorto",
+    "Weak password" : "Malforta pasvorto",
+    "So-so password" : "Mezaĉa pasvorto",
+    "Good password" : "Bona pasvorto",
+    "Strong password" : "Forta pasvorto",
+    "Delete" : "Forigi",
+    "Delete encryption keys permanently." : "Forigi ĉifroklavojn por ĉiam.",
+    "Restore encryption keys." : "Restaŭri ĉifroklavojn.",
+    "Groups" : "Grupoj",
+    "deleted {groupName}" : "{groupName} foriĝis",
+    "undo" : "malfari",
+    "never" : "neniam",
+    "deleted {userName}" : "{userName} foriĝis",
+    "add group" : "aldoni grupon",
+    "A valid username must be provided" : "Valida uzantonomo devas proviziĝi",
+    "Error creating user" : "Eraris kreo de uzanto",
+    "A valid password must be provided" : "Valida pasvorto devas proviziĝi",
+    "Warning: Home directory for user \"{user}\" already exists" : "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
+    "__language_name__" : "Esperanto",
+    "SSL root certificates" : "Radikaj SSL-atestoj",
+    "Encryption" : "Ĉifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
+    "Info, warnings, errors and fatal issues" : "Informoj, avertoj, eraroj kaj fatalaĵoj",
+    "Warnings, errors and fatal issues" : "Avertoj, eraroj kaj fatalaĵoj",
+    "Errors and fatal issues" : "Eraroj kaj fatalaĵoj",
+    "Fatal issues only" : "Fatalaĵoj nur",
+    "None" : "Nenio",
+    "Login" : "Ensaluti",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sekureca averto",
+    "Module 'fileinfo' missing" : "La modulo «fileinfo» mankas",
+    "Locale not working" : "La lokaĵaro ne funkcias",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
+    "Cron" : "Cron",
+    "Sharing" : "Kunhavigo",
+    "Allow apps to use the Share API" : "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
+    "Allow public uploads" : "Permesi publikajn alŝutojn",
+    "Expire after " : "Eksvalidigi post",
+    "days" : "tagoj",
+    "Allow resharing" : "Kapabligi rekunhavigon",
+    "Security" : "Sekuro",
+    "Email Server" : "Retpoŝtoservilo",
+    "Send mode" : "Sendi pli",
+    "From address" : "El adreso",
+    "mail" : "retpoŝto",
+    "Authentication method" : "Aŭtentiga metodo",
+    "Authentication required" : "Aŭtentiĝo nepras",
+    "Server address" : "Servila adreso",
+    "Port" : "Pordo",
+    "Credentials" : "Aŭtentigiloj",
+    "SMTP Username" : "SMTP-uzantonomo",
+    "SMTP Password" : "SMTP-pasvorto",
+    "Send email" : "Sendi retpoŝton",
+    "Log" : "Protokolo",
+    "Log level" : "Registronivelo",
+    "More" : "Pli",
+    "Less" : "Malpli",
+    "Version" : "Eldono",
+    "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>." : "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "de",
+    "Documentation:" : "Dokumentaro:",
+    "User Documentation" : "Dokumentaro por uzantoj",
+    "Admin Documentation" : "Administra dokumentaro",
+    "Enable only for specific groups" : "Kapabligi nur por specifajn grupojn",
+    "Uninstall App" : "Malinstali aplikaĵon",
+    "Administrator Documentation" : "Dokumentaro por administrantoj",
+    "Online Documentation" : "Reta dokumentaro",
+    "Forum" : "Forumo",
+    "Bugtracker" : "Cimoraportejo",
+    "Commercial Support" : "Komerca subteno",
+    "Get the apps to sync your files" : "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
+    "Password" : "Pasvorto",
+    "Your password was changed" : "Via pasvorto ŝanĝiĝis",
+    "Unable to change your password" : "Ne eblis ŝanĝi vian pasvorton",
+    "Current password" : "Nuna pasvorto",
+    "New password" : "Nova pasvorto",
+    "Change password" : "Ŝanĝi la pasvorton",
+    "Full Name" : "Plena nomo",
+    "Email" : "Retpoŝto",
+    "Your email address" : "Via retpoŝta adreso",
+    "Profile picture" : "Profila bildo",
+    "Upload new" : "Alŝuti novan",
+    "Select new from Files" : "Elekti novan el dosieroj",
+    "Remove image" : "Forigi bildon",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin.",
+    "Cancel" : "Nuligi",
+    "Choose as profile image" : "Elekti kiel profilan bildon",
+    "Language" : "Lingvo",
+    "Help translate" : "Helpu traduki",
+    "Import Root Certificate" : "Enporti radikan ateston",
+    "Log-in password" : "Ensaluta pasvorto",
+    "Decrypt all Files" : "Malĉifri ĉiujn dosierojn",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
+    "Restore Encryption Keys" : "Restaŭri ĉifroklavojn",
+    "Delete Encryption Keys" : "Forigi ĉifroklavojn",
+    "Login Name" : "Ensaluti",
+    "Create" : "Krei",
+    "Search Users and Groups" : "Serĉi uzantojn kaj grupojn",
+    "Add Group" : "Aldoni grupon",
+    "Group" : "Grupo",
+    "Everyone" : "Ĉiuj",
+    "Admins" : "Administrantoj",
+    "Default Quota" : "Defaŭlta kvoto",
+    "Unlimited" : "Senlima",
+    "Other" : "Alia",
+    "Username" : "Uzantonomo",
+    "Quota" : "Kvoto",
+    "Last Login" : "Lasta ensaluto",
+    "change full name" : "ŝanĝi plenan nomon",
+    "set new password" : "agordi novan pasvorton",
+    "Default" : "Defaŭlta"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
deleted file mode 100644
index 44506ad4e3c..00000000000
--- a/settings/l10n/eo.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Kapabligita",
-"Authentication error" => "Aŭtentiga eraro",
-"Your full name has been changed." => "Via plena nomo ŝanĝitas.",
-"Unable to change full name" => "Ne eblis ŝanĝi la plenan nomon",
-"Group already exists" => "La grupo jam ekzistas",
-"Unable to add group" => "Ne eblis aldoni la grupon",
-"Files decrypted successfully" => "La dosieroj malĉifriĝis sukcese",
-"Encryption keys deleted permanently" => "La ĉifroklavojn foriĝis por ĉiam.",
-"Email saved" => "La retpoŝtadreso konserviĝis",
-"Invalid email" => "Nevalida retpoŝtadreso",
-"Unable to delete group" => "Ne eblis forigi la grupon",
-"Unable to delete user" => "Ne eblis forigi la uzanton",
-"Backups restored successfully" => "La savokopioj restaŭriĝis sukcese",
-"Language changed" => "La lingvo estas ŝanĝita",
-"Invalid request" => "Nevalida peto",
-"Admins can't remove themself from the admin group" => "Administrantoj ne povas forigi sin mem el la administra grupo.",
-"Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
-"Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
-"Couldn't update app." => "Ne eblis ĝisdatigi la aplikaĵon.",
-"Wrong password" => "Malĝusta pasvorto",
-"Unable to change password" => "Ne eblis ŝanĝi la pasvorton",
-"Saved" => "Konservita",
-"Email sent" => "La retpoŝtaĵo sendiĝis",
-"Sending..." => "Sendante...",
-"All" => "Ĉio",
-"Please wait...." => "Bonvolu atendi...",
-"Error while disabling app" => "Eraris malkapabligo de aplikaĵo",
-"Disable" => "Malkapabligi",
-"Enable" => "Kapabligi",
-"Error while enabling app" => "Eraris kapabligo de aplikaĵo",
-"Updating...." => "Ĝisdatigata...",
-"Error while updating app" => "Eraris ĝisdatigo de la aplikaĵo",
-"Updated" => "Ĝisdatigita",
-"Uninstalling ...." => "Malinstalante...",
-"Error while uninstalling app" => "Eraris malinstalo de aplikaĵo",
-"Uninstall" => "Malinstali",
-"Select a profile picture" => "Elekti profilan bildon",
-"Very weak password" => "Tre malforta pasvorto",
-"Weak password" => "Malforta pasvorto",
-"So-so password" => "Mezaĉa pasvorto",
-"Good password" => "Bona pasvorto",
-"Strong password" => "Forta pasvorto",
-"Delete" => "Forigi",
-"Delete encryption keys permanently." => "Forigi ĉifroklavojn por ĉiam.",
-"Restore encryption keys." => "Restaŭri ĉifroklavojn.",
-"Groups" => "Grupoj",
-"deleted {groupName}" => "{groupName} foriĝis",
-"undo" => "malfari",
-"never" => "neniam",
-"deleted {userName}" => "{userName} foriĝis",
-"add group" => "aldoni grupon",
-"A valid username must be provided" => "Valida uzantonomo devas proviziĝi",
-"Error creating user" => "Eraris kreo de uzanto",
-"A valid password must be provided" => "Valida pasvorto devas proviziĝi",
-"Warning: Home directory for user \"{user}\" already exists" => "Averto: hejmdosierujo por la uzanto “{user”} jam ekzistas",
-"__language_name__" => "Esperanto",
-"SSL root certificates" => "Radikaj SSL-atestoj",
-"Encryption" => "Ĉifrado",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Ĉio (fatalaĵoj, eraroj, avertoj, informoj, sencimigaj mesaĝoj)",
-"Info, warnings, errors and fatal issues" => "Informoj, avertoj, eraroj kaj fatalaĵoj",
-"Warnings, errors and fatal issues" => "Avertoj, eraroj kaj fatalaĵoj",
-"Errors and fatal issues" => "Eraroj kaj fatalaĵoj",
-"Fatal issues only" => "Fatalaĵoj nur",
-"None" => "Nenio",
-"Login" => "Ensaluti",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Sekureca averto",
-"Module 'fileinfo' missing" => "La modulo «fileinfo» mankas",
-"Locale not working" => "La lokaĵaro ne funkcias",
-"Please double check the <a href='%s'>installation guides</a>." => "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
-"Cron" => "Cron",
-"Sharing" => "Kunhavigo",
-"Allow apps to use the Share API" => "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
-"Allow public uploads" => "Permesi publikajn alŝutojn",
-"Expire after " => "Eksvalidigi post",
-"days" => "tagoj",
-"Allow resharing" => "Kapabligi rekunhavigon",
-"Security" => "Sekuro",
-"Email Server" => "Retpoŝtoservilo",
-"Send mode" => "Sendi pli",
-"From address" => "El adreso",
-"mail" => "retpoŝto",
-"Authentication method" => "Aŭtentiga metodo",
-"Authentication required" => "Aŭtentiĝo nepras",
-"Server address" => "Servila adreso",
-"Port" => "Pordo",
-"Credentials" => "Aŭtentigiloj",
-"SMTP Username" => "SMTP-uzantonomo",
-"SMTP Password" => "SMTP-pasvorto",
-"Send email" => "Sendi retpoŝton",
-"Log" => "Protokolo",
-"Log level" => "Registronivelo",
-"More" => "Pli",
-"Less" => "Malpli",
-"Version" => "Eldono",
-"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>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "de",
-"Documentation:" => "Dokumentaro:",
-"User Documentation" => "Dokumentaro por uzantoj",
-"Admin Documentation" => "Administra dokumentaro",
-"Enable only for specific groups" => "Kapabligi nur por specifajn grupojn",
-"Uninstall App" => "Malinstali aplikaĵon",
-"Administrator Documentation" => "Dokumentaro por administrantoj",
-"Online Documentation" => "Reta dokumentaro",
-"Forum" => "Forumo",
-"Bugtracker" => "Cimoraportejo",
-"Commercial Support" => "Komerca subteno",
-"Get the apps to sync your files" => "Ekhavu la aplikaĵojn por sinkronigi viajn dosierojn",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la disponeblaj <strong>%s</strong>",
-"Password" => "Pasvorto",
-"Your password was changed" => "Via pasvorto ŝanĝiĝis",
-"Unable to change your password" => "Ne eblis ŝanĝi vian pasvorton",
-"Current password" => "Nuna pasvorto",
-"New password" => "Nova pasvorto",
-"Change password" => "Ŝanĝi la pasvorton",
-"Full Name" => "Plena nomo",
-"Email" => "Retpoŝto",
-"Your email address" => "Via retpoŝta adreso",
-"Profile picture" => "Profila bildo",
-"Upload new" => "Alŝuti novan",
-"Select new from Files" => "Elekti novan el dosieroj",
-"Remove image" => "Forigi bildon",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Aŭ PNG aŭ JPG. Prefere ĝi kvadratu, sed vi povos stuci ĝin.",
-"Cancel" => "Nuligi",
-"Choose as profile image" => "Elekti kiel profilan bildon",
-"Language" => "Lingvo",
-"Help translate" => "Helpu traduki",
-"Import Root Certificate" => "Enporti radikan ateston",
-"Log-in password" => "Ensaluta pasvorto",
-"Decrypt all Files" => "Malĉifri ĉiujn dosierojn",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
-"Restore Encryption Keys" => "Restaŭri ĉifroklavojn",
-"Delete Encryption Keys" => "Forigi ĉifroklavojn",
-"Login Name" => "Ensaluti",
-"Create" => "Krei",
-"Search Users and Groups" => "Serĉi uzantojn kaj grupojn",
-"Add Group" => "Aldoni grupon",
-"Group" => "Grupo",
-"Everyone" => "Ĉiuj",
-"Admins" => "Administrantoj",
-"Default Quota" => "Defaŭlta kvoto",
-"Unlimited" => "Senlima",
-"Other" => "Alia",
-"Username" => "Uzantonomo",
-"Quota" => "Kvoto",
-"Last Login" => "Lasta ensaluto",
-"change full name" => "ŝanĝi plenan nomon",
-"set new password" => "agordi novan pasvorton",
-"Default" => "Defaŭlta"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
new file mode 100644
index 00000000000..510f4c14c78
--- /dev/null
+++ b/settings/l10n/es.js
@@ -0,0 +1,238 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitado",
+    "Not enabled" : "No habilitado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Error de autenticación",
+    "Your full name has been changed." : "Se ha cambiado su nombre completo.",
+    "Unable to change full name" : "No se puede cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No se pudo añadir el grupo",
+    "Files decrypted successfully" : "Los archivos fueron descifrados",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
+    "Couldn't decrypt your files, check your password and try again" : "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
+    "Encryption keys deleted permanently" : "Claves de cifrado eliminadas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
+    "Couldn't remove app." : "No se pudo eliminar la aplicación.",
+    "Email saved" : "Correo electrónico guardado",
+    "Invalid email" : "Correo electrónico no válido",
+    "Unable to delete group" : "No se pudo eliminar el grupo",
+    "Unable to delete user" : "No se pudo eliminar el usuario",
+    "Backups restored successfully" : "Copia de seguridad restaurada",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Petición no válida",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
+    "Unable to add user to group %s" : "No se pudo añadir el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No se pudo eliminar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la aplicación.",
+    "Wrong password" : "Contraseña incorrecta",
+    "No user supplied" : "No se especificó un usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
+    "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.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
+    "Unable to change password" : "No se ha podido cambiar la contraseña",
+    "Saved" : "Guardado",
+    "test email settings" : "probar configuración de correo electrónico",
+    "If you received this email, the settings seem to be correct." : "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ocurrió un problema al mandar el mensaje. Revise la configuración.",
+    "Email sent" : "Correo electrónico enviado",
+    "You need to set your user email before being able to send test emails." : "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
+    "Add trusted domain" : "Agregar dominio de confianza",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Espere, por favor....",
+    "Error while disabling app" : "Error mientras se desactivaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Error mientras se activaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error mientras se actualizaba la aplicación",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando...",
+    "Error while uninstalling app" : "Error al desinstalar la aplicación",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Seleccionar una imagen de perfil",
+    "Very weak password" : "Contraseña muy débil",
+    "Weak password" : "Contraseña débil",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña buena",
+    "Strong password" : "Contraseña muy buena",
+    "Valid until {date}" : "Válido hasta {date}",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+    "Delete encryption keys permanently." : "Eliminar claves de cifrado permanentemente.",
+    "Restore encryption keys." : "Restaurar claves de cifrado.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "No es posible eliminar {objName}",
+    "Error creating group" : "Error al crear un grupo",
+    "A valid group name must be provided" : "Se debe dar un nombre válido para el grupo ",
+    "deleted {groupName}" : "borrado {groupName}",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "deleted {userName}" : "borrado {userName}",
+    "add group" : "añadir Grupo",
+    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
+    "Error creating user" : "Error al crear usuario",
+    "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
+    "__language_name__" : "Castellano",
+    "Personal Info" : "Información personal",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "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",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Gestor de NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Advertencia de seguridad",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
+    "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." : "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
+    "Setup Warning" : "Advertencia de configuració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 del principales no estén accesibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Información de rendimiento de la base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Se está usando SQLite como base de datos. Para instalaciones más grandes, recomendamos cambiar esto. Para migrar a otra base de datos, use la herramienta de línea de comandos: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "No se ha encontrado el módulo \"fileinfo\"",
+    "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.",
+    "Your PHP version is outdated" : "Su versión de PHP no está actualizada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
+    "PHP charset is not set to UTF-8" : "El conjunto de caracteres de PHP no está establecido en UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "El set de caracteres usado por PHP no es UTF-8. Esto puede causar grandes problemas con nombres de archivos que contengan caracteres que no sean ASCII. Recomendamos encarecidamente cambiar el valor de 'default_charset' en php.ini a 'UTF-8'.",
+    "Locale not working" : "La configuración regional no está funcionando",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
+    "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
+    "Connectivity checks" : "Probar la conectividad",
+    "No problems found" : "No se han encontrado problemas",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
+    "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
+    "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.",
+    "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.",
+    "Sharing" : "Compartiendo",
+    "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",
+    "Enforce password protection" : "Forzar la protección por contraseña.",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Set default expiration date" : "Establecer fecha de caducidad predeterminada",
+    "Expire after " : "Caduca luego de",
+    "days" : "días",
+    "Enforce expiration date" : "Imponer fecha de caducidad",
+    "Allow resharing" : "Permitir re-compartición",
+    "Restrict users to only share with users in their groups" : "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos",
+    "Allow users to send mail notification for shared files" : "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
+    "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.",
+    "Security" : "Seguridad",
+    "Enforce HTTPS" : "Forzar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+    "Email Server" : "Servidor de correo electrónico",
+    "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
+    "Send mode" : "Modo de envío",
+    "From address" : "Desde la dirección",
+    "mail" : "correo electrónico",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Se necesita autenticación",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nombre de usuario SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Store credentials" : "Almacenar credenciales",
+    "Test email settings" : "Probar configuración de correo electrónico",
+    "Send email" : "Enviar mensaje",
+    "Log" : "Registro",
+    "Log level" : "Nivel de registro",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Más aplicaciones",
+    "Add your app" : "Agregue su aplicación",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación de usuario",
+    "Admin Documentation" : "Documentación para administradores",
+    "Update to %s" : "Actualizado a %s",
+    "Enable only for specific groups" : "Activar solamente para grupos específicos",
+    "Uninstall App" : "Desinstalar aplicación",
+    "Administrator Documentation" : "Documentación de administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Rastreador de fallos",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si desea contribuir al proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">únase al desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">corra la voz</a>!",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Su contraseña ha sido cambiada",
+    "Unable to change your password" : "No se ha podido cambiar su contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña",
+    "Change password" : "Cambiar contraseña",
+    "Full Name" : "Nombre completo",
+    "Email" : "Correo electrónico",
+    "Your email address" : "Su dirección de correo",
+    "Fill in an email address to enable password recovery and receive notifications" : "Introducir una dirección de correo electrónico  para activar la recuperación de contraseñas y recibir notificaciones",
+    "Profile picture" : "Foto de perfil",
+    "Upload new" : "Subir otra",
+    "Select new from Files" : "Seleccionar otra desde Archivos",
+    "Remove image" : "Borrar imagen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
+    "Your avatar is provided by your original account." : "Su avatar es proporcionado por su cuenta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Seleccionar como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayúdanos a traducir",
+    "Common Name" : "Nombre común",
+    "Valid until" : "Válido hasta",
+    "Issued By" : "Emitido por",
+    "Valid until %s" : "Válido hasta %s",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
+    "Log-in password" : "Contraseña de acceso",
+    "Decrypt all Files" : "Descifrar archivos",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
+    "Restore Encryption Keys" : "Restaurar claves de cifrado",
+    "Delete Encryption Keys" : "Eliminar claves de cifrado",
+    "Show storage location" : "Mostrar la ubicación del almacenamiento",
+    "Show last log in" : "Mostrar el último inicio de sesión",
+    "Login Name" : "Nombre de usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña de administración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Search Users and Groups" : "Buscar usuarios y grupos",
+    "Add Group" : "Agregar grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otro",
+    "Username" : "Nombre de usuario",
+    "Quota" : "Cuota",
+    "Storage Location" : "Ubicación de almacenamiento",
+    "Last Login" : "Último inicio de sesión",
+    "change full name" : "cambiar el nombre completo",
+    "set new password" : "establecer nueva contraseña",
+    "Default" : "Predeterminado"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
new file mode 100644
index 00000000000..15113b4ff2d
--- /dev/null
+++ b/settings/l10n/es.json
@@ -0,0 +1,236 @@
+{ "translations": {
+    "Enabled" : "Habilitado",
+    "Not enabled" : "No habilitado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Error de autenticación",
+    "Your full name has been changed." : "Se ha cambiado su nombre completo.",
+    "Unable to change full name" : "No se puede cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No se pudo añadir el grupo",
+    "Files decrypted successfully" : "Los archivos fueron descifrados",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
+    "Couldn't decrypt your files, check your password and try again" : "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
+    "Encryption keys deleted permanently" : "Claves de cifrado eliminadas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
+    "Couldn't remove app." : "No se pudo eliminar la aplicación.",
+    "Email saved" : "Correo electrónico guardado",
+    "Invalid email" : "Correo electrónico no válido",
+    "Unable to delete group" : "No se pudo eliminar el grupo",
+    "Unable to delete user" : "No se pudo eliminar el usuario",
+    "Backups restored successfully" : "Copia de seguridad restaurada",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Petición no válida",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
+    "Unable to add user to group %s" : "No se pudo añadir el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No se pudo eliminar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la aplicación.",
+    "Wrong password" : "Contraseña incorrecta",
+    "No user supplied" : "No se especificó un usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
+    "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.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
+    "Unable to change password" : "No se ha podido cambiar la contraseña",
+    "Saved" : "Guardado",
+    "test email settings" : "probar configuración de correo electrónico",
+    "If you received this email, the settings seem to be correct." : "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ocurrió un problema al mandar el mensaje. Revise la configuración.",
+    "Email sent" : "Correo electrónico enviado",
+    "You need to set your user email before being able to send test emails." : "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
+    "Add trusted domain" : "Agregar dominio de confianza",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Espere, por favor....",
+    "Error while disabling app" : "Error mientras se desactivaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Error mientras se activaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error mientras se actualizaba la aplicación",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando...",
+    "Error while uninstalling app" : "Error al desinstalar la aplicación",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Seleccionar una imagen de perfil",
+    "Very weak password" : "Contraseña muy débil",
+    "Weak password" : "Contraseña débil",
+    "So-so password" : "Contraseña pasable",
+    "Good password" : "Contraseña buena",
+    "Strong password" : "Contraseña muy buena",
+    "Valid until {date}" : "Válido hasta {date}",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+    "Delete encryption keys permanently." : "Eliminar claves de cifrado permanentemente.",
+    "Restore encryption keys." : "Restaurar claves de cifrado.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "No es posible eliminar {objName}",
+    "Error creating group" : "Error al crear un grupo",
+    "A valid group name must be provided" : "Se debe dar un nombre válido para el grupo ",
+    "deleted {groupName}" : "borrado {groupName}",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "deleted {userName}" : "borrado {userName}",
+    "add group" : "añadir Grupo",
+    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
+    "Error creating user" : "Error al crear usuario",
+    "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
+    "__language_name__" : "Castellano",
+    "Personal Info" : "Información personal",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "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",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Gestor de NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Advertencia de seguridad",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
+    "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." : "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
+    "Setup Warning" : "Advertencia de configuració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 del principales no estén accesibles.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
+    "Database Performance Info" : "Información de rendimiento de la base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Se está usando SQLite como base de datos. Para instalaciones más grandes, recomendamos cambiar esto. Para migrar a otra base de datos, use la herramienta de línea de comandos: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "No se ha encontrado el módulo \"fileinfo\"",
+    "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.",
+    "Your PHP version is outdated" : "Su versión de PHP no está actualizada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
+    "PHP charset is not set to UTF-8" : "El conjunto de caracteres de PHP no está establecido en UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "El set de caracteres usado por PHP no es UTF-8. Esto puede causar grandes problemas con nombres de archivos que contengan caracteres que no sean ASCII. Recomendamos encarecidamente cambiar el valor de 'default_charset' en php.ini a 'UTF-8'.",
+    "Locale not working" : "La configuración regional no está funcionando",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
+    "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
+    "Connectivity checks" : "Probar la conectividad",
+    "No problems found" : "No se han encontrado problemas",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
+    "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
+    "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.",
+    "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.",
+    "Sharing" : "Compartiendo",
+    "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",
+    "Enforce password protection" : "Forzar la protección por contraseña.",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Set default expiration date" : "Establecer fecha de caducidad predeterminada",
+    "Expire after " : "Caduca luego de",
+    "days" : "días",
+    "Enforce expiration date" : "Imponer fecha de caducidad",
+    "Allow resharing" : "Permitir re-compartición",
+    "Restrict users to only share with users in their groups" : "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos",
+    "Allow users to send mail notification for shared files" : "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
+    "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.",
+    "Security" : "Seguridad",
+    "Enforce HTTPS" : "Forzar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+    "Email Server" : "Servidor de correo electrónico",
+    "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
+    "Send mode" : "Modo de envío",
+    "From address" : "Desde la dirección",
+    "mail" : "correo electrónico",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Se necesita autenticación",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nombre de usuario SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Store credentials" : "Almacenar credenciales",
+    "Test email settings" : "Probar configuración de correo electrónico",
+    "Send email" : "Enviar mensaje",
+    "Log" : "Registro",
+    "Log level" : "Nivel de registro",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Más aplicaciones",
+    "Add your app" : "Agregue su aplicación",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación de usuario",
+    "Admin Documentation" : "Documentación para administradores",
+    "Update to %s" : "Actualizado a %s",
+    "Enable only for specific groups" : "Activar solamente para grupos específicos",
+    "Uninstall App" : "Desinstalar aplicación",
+    "Administrator Documentation" : "Documentación de administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Rastreador de fallos",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si desea contribuir al proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">únase al desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">corra la voz</a>!",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Su contraseña ha sido cambiada",
+    "Unable to change your password" : "No se ha podido cambiar su contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña",
+    "Change password" : "Cambiar contraseña",
+    "Full Name" : "Nombre completo",
+    "Email" : "Correo electrónico",
+    "Your email address" : "Su dirección de correo",
+    "Fill in an email address to enable password recovery and receive notifications" : "Introducir una dirección de correo electrónico  para activar la recuperación de contraseñas y recibir notificaciones",
+    "Profile picture" : "Foto de perfil",
+    "Upload new" : "Subir otra",
+    "Select new from Files" : "Seleccionar otra desde Archivos",
+    "Remove image" : "Borrar imagen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
+    "Your avatar is provided by your original account." : "Su avatar es proporcionado por su cuenta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Seleccionar como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayúdanos a traducir",
+    "Common Name" : "Nombre común",
+    "Valid until" : "Válido hasta",
+    "Issued By" : "Emitido por",
+    "Valid until %s" : "Válido hasta %s",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
+    "Log-in password" : "Contraseña de acceso",
+    "Decrypt all Files" : "Descifrar archivos",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
+    "Restore Encryption Keys" : "Restaurar claves de cifrado",
+    "Delete Encryption Keys" : "Eliminar claves de cifrado",
+    "Show storage location" : "Mostrar la ubicación del almacenamiento",
+    "Show last log in" : "Mostrar el último inicio de sesión",
+    "Login Name" : "Nombre de usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña de administración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Search Users and Groups" : "Buscar usuarios y grupos",
+    "Add Group" : "Agregar grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otro",
+    "Username" : "Nombre de usuario",
+    "Quota" : "Cuota",
+    "Storage Location" : "Ubicación de almacenamiento",
+    "Last Login" : "Último inicio de sesión",
+    "change full name" : "cambiar el nombre completo",
+    "set new password" : "establecer nueva contraseña",
+    "Default" : "Predeterminado"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
deleted file mode 100644
index 91fdbe2f3e1..00000000000
--- a/settings/l10n/es.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitado",
-"Not enabled" => "No habilitado",
-"Recommended" => "Recomendado",
-"Authentication error" => "Error de autenticación",
-"Your full name has been changed." => "Se ha cambiado su nombre completo.",
-"Unable to change full name" => "No se puede cambiar el nombre completo",
-"Group already exists" => "El grupo ya existe",
-"Unable to add group" => "No se pudo añadir el grupo",
-"Files decrypted successfully" => "Los archivos fueron descifrados",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "No se pudo descifrar sus archivos. Revise el owncloud.log o consulte con su administrador",
-"Couldn't decrypt your files, check your password and try again" => "No se pudo descifrar sus archivos. Revise su contraseña e inténtelo de nuevo",
-"Encryption keys deleted permanently" => "Claves de cifrado eliminadas permanentemente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron eliminar permanentemente sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
-"Couldn't remove app." => "No se pudo eliminar la aplicación.",
-"Email saved" => "Correo electrónico guardado",
-"Invalid email" => "Correo electrónico no válido",
-"Unable to delete group" => "No se pudo eliminar el grupo",
-"Unable to delete user" => "No se pudo eliminar el usuario",
-"Backups restored successfully" => "Copia de seguridad restaurada",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "No se pudieron restarurar sus claves de cifrado. Revise owncloud.log o consulte con su administrador.",
-"Language changed" => "Idioma cambiado",
-"Invalid request" => "Petición no válida",
-"Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
-"Unable to add user to group %s" => "No se pudo añadir el usuario al grupo %s",
-"Unable to remove user from group %s" => "No se pudo eliminar al usuario del grupo %s",
-"Couldn't update app." => "No se pudo actualizar la aplicación.",
-"Wrong password" => "Contraseña incorrecta",
-"No user supplied" => "No se especificó un usuario",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
-"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.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
-"Unable to change password" => "No se ha podido cambiar la contraseña",
-"Saved" => "Guardado",
-"test email settings" => "probar configuración de correo electrónico",
-"If you received this email, the settings seem to be correct." => "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
-"A problem occurred while sending the email. Please revise your settings." => "Ocurrió un problema al mandar el mensaje. Revise la configuración.",
-"Email sent" => "Correo electrónico enviado",
-"You need to set your user email before being able to send test emails." => "Tiene que configurar su dirección de correo electrónico antes de poder enviar mensajes de prueba.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "¿Está seguro de querer agregar \"{domain}\" como un dominio de confianza?",
-"Add trusted domain" => "Agregar dominio de confianza",
-"Sending..." => "Enviando...",
-"All" => "Todos",
-"Please wait...." => "Espere, por favor....",
-"Error while disabling app" => "Error mientras se desactivaba la aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Error mientras se activaba la aplicación",
-"Updating...." => "Actualizando....",
-"Error while updating app" => "Error mientras se actualizaba la aplicación",
-"Updated" => "Actualizado",
-"Uninstalling ...." => "Desinstalando...",
-"Error while uninstalling app" => "Error al desinstalar la aplicación",
-"Uninstall" => "Desinstalar",
-"Select a profile picture" => "Seleccionar una imagen de perfil",
-"Very weak password" => "Contraseña muy débil",
-"Weak password" => "Contraseña débil",
-"So-so password" => "Contraseña pasable",
-"Good password" => "Contraseña buena",
-"Strong password" => "Contraseña muy buena",
-"Valid until {date}" => "Válido hasta {date}",
-"Delete" => "Eliminar",
-"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-"Delete encryption keys permanently." => "Eliminar claves de cifrado permanentemente.",
-"Restore encryption keys." => "Restaurar claves de cifrado.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "No es posible eliminar {objName}",
-"Error creating group" => "Error al crear un grupo",
-"A valid group name must be provided" => "Se debe dar un nombre válido para el grupo ",
-"deleted {groupName}" => "borrado {groupName}",
-"undo" => "deshacer",
-"no group" => "sin grupo",
-"never" => "nunca",
-"deleted {userName}" => "borrado {userName}",
-"add group" => "añadir Grupo",
-"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
-"Error creating user" => "Error al crear usuario",
-"A valid password must be provided" => "Se debe proporcionar una contraseña válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
-"__language_name__" => "Castellano",
-"Personal Info" => "Información personal",
-"SSL root certificates" => "Certificados raíz SSL",
-"Encryption" => "Cifrado",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (Información, Avisos, Errores, debug y problemas fatales)",
-"Info, warnings, errors and fatal issues" => "Información, Avisos, Errores y problemas fatales",
-"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",
-"Plain" => "Plano",
-"NT LAN Manager" => "Gestor de NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Advertencia de seguridad",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
-"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." => "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
-"Setup Warning" => "Advertencia de configuració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 del principales no estén accesibles.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
-"Database Performance Info" => "Información de rendimiento de la base de datos",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Se está usando SQLite como base de datos. Para instalaciones más grandes, recomendamos cambiar esto. Para migrar a otra base de datos, use la herramienta de línea de comandos: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"",
-"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.",
-"Your PHP version is outdated" => "Su versión de PHP no está actualizada",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
-"PHP charset is not set to UTF-8" => "El conjunto de caracteres de PHP no está establecido en UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "El set de caracteres usado por PHP no es UTF-8. Esto puede causar grandes problemas con nombres de archivos que contengan caracteres que no sean ASCII. Recomendamos encarecidamente cambiar el valor de 'default_charset' en php.ini a 'UTF-8'.",
-"Locale not working" => "La configuración regional no está funcionando",
-"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.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
-"URL generation in notification emails" => "Generación de URL en mensajes de notificación",
-"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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
-"Connectivity checks" => "Probar la conectividad",
-"No problems found" => "No se han encontrado problemas",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Cron fue ejecutado por última vez a las %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
-"Cron was not executed yet!" => "¡Cron aún no ha sido ejecutado!",
-"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.",
-"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.",
-"Sharing" => "Compartiendo",
-"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",
-"Enforce password protection" => "Forzar la protección por contraseña.",
-"Allow public uploads" => "Permitir subidas públicas",
-"Set default expiration date" => "Establecer fecha de caducidad predeterminada",
-"Expire after " => "Caduca luego de",
-"days" => "días",
-"Enforce expiration date" => "Imponer fecha de caducidad",
-"Allow resharing" => "Permitir re-compartición",
-"Restrict users to only share with users in their groups" => "Restringe a los usuarios a compartir solo con otros usuarios en sus grupos",
-"Allow users to send mail notification for shared files" => "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
-"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.",
-"Security" => "Seguridad",
-"Enforce HTTPS" => "Forzar HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
-"Email Server" => "Servidor de correo electrónico",
-"This is used for sending out notifications." => "Esto se usa para enviar notificaciones.",
-"Send mode" => "Modo de envío",
-"From address" => "Desde la dirección",
-"mail" => "correo electrónico",
-"Authentication method" => "Método de autenticación",
-"Authentication required" => "Se necesita autenticación",
-"Server address" => "Dirección del servidor",
-"Port" => "Puerto",
-"Credentials" => "Credenciales",
-"SMTP Username" => "Nombre de usuario SMTP",
-"SMTP Password" => "Contraseña SMTP",
-"Store credentials" => "Almacenar credenciales",
-"Test email settings" => "Probar configuración de correo electrónico",
-"Send email" => "Enviar mensaje",
-"Log" => "Registro",
-"Log level" => "Nivel de registro",
-"More" => "Más",
-"Less" => "Menos",
-"Version" => "Versión",
-"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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Más aplicaciones",
-"Add your app" => "Agregue su aplicación",
-"by" => "por",
-"licensed" => "licenciado",
-"Documentation:" => "Documentación:",
-"User Documentation" => "Documentación de usuario",
-"Admin Documentation" => "Documentación para administradores",
-"Update to %s" => "Actualizado a %s",
-"Enable only for specific groups" => "Activar solamente para grupos específicos",
-"Uninstall App" => "Desinstalar aplicación",
-"Administrator Documentation" => "Documentación de administrador",
-"Online Documentation" => "Documentación en línea",
-"Forum" => "Foro",
-"Bugtracker" => "Rastreador de fallos",
-"Commercial Support" => "Soporte comercial",
-"Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Si desea contribuir al proyecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">únase al desarrollo</a>\n\t\to\n\t\t¡<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">corra la voz</a>!",
-"Show First Run Wizard again" => "Mostrar nuevamente el Asistente de ejecución inicial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
-"Password" => "Contraseña",
-"Your password was changed" => "Su contraseña ha sido cambiada",
-"Unable to change your password" => "No se ha podido cambiar su contraseña",
-"Current password" => "Contraseña actual",
-"New password" => "Nueva contraseña",
-"Change password" => "Cambiar contraseña",
-"Full Name" => "Nombre completo",
-"Email" => "Correo electrónico",
-"Your email address" => "Su dirección de correo",
-"Fill in an email address to enable password recovery and receive notifications" => "Introducir una dirección de correo electrónico  para activar la recuperación de contraseñas y recibir notificaciones",
-"Profile picture" => "Foto de perfil",
-"Upload new" => "Subir otra",
-"Select new from Files" => "Seleccionar otra desde Archivos",
-"Remove image" => "Borrar imagen",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
-"Your avatar is provided by your original account." => "Su avatar es proporcionado por su cuenta original.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Seleccionar como imagen de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ayúdanos a traducir",
-"Common Name" => "Nombre común",
-"Valid until" => "Válido hasta",
-"Issued By" => "Emitido por",
-"Valid until %s" => "Válido hasta %s",
-"Import Root Certificate" => "Importar certificado raíz",
-"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
-"Log-in password" => "Contraseña de acceso",
-"Decrypt all Files" => "Descifrar archivos",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sus claves de cifrado se archivarán en una localización segura. Así en caso de que algo fuese mal podrá recuperan sus claves. Borre sus claves de cifrado permanentemente solamente si esta seguro de que sus archivos han sido descifrados correctamente.",
-"Restore Encryption Keys" => "Restaurar claves de cifrado",
-"Delete Encryption Keys" => "Eliminar claves de cifrado",
-"Show storage location" => "Mostrar la ubicación del almacenamiento",
-"Show last log in" => "Mostrar el último inicio de sesión",
-"Login Name" => "Nombre de usuario",
-"Create" => "Crear",
-"Admin Recovery Password" => "Recuperación de la contraseña de administración",
-"Enter the recovery password in order to recover the users files during password change" => "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-"Search Users and Groups" => "Buscar usuarios y grupos",
-"Add Group" => "Agregar grupo",
-"Group" => "Grupo",
-"Everyone" => "Todos",
-"Admins" => "Administradores",
-"Default Quota" => "Cuota predeterminada",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Otro",
-"Username" => "Nombre de usuario",
-"Group Admin for" => "Grupo administrador para",
-"Quota" => "Cuota",
-"Storage Location" => "Ubicación de almacenamiento",
-"Last Login" => "Último inicio de sesión",
-"change full name" => "cambiar el nombre completo",
-"set new password" => "establecer nueva contraseña",
-"Default" => "Predeterminado"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
new file mode 100644
index 00000000000..278fdc3f353
--- /dev/null
+++ b/settings/l10n/es_AR.js
@@ -0,0 +1,167 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitado",
+    "Authentication error" : "Error al autenticar",
+    "Your full name has been changed." : "Su nombre completo ha sido cambiado.",
+    "Unable to change full name" : "Imposible cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No fue posible añadir el grupo",
+    "Files decrypted successfully" : "Archivos des-encriptados correctamente",
+    "Email saved" : "e-mail guardado",
+    "Invalid email" : "El e-mail no es válido ",
+    "Unable to delete group" : "No fue posible borrar el grupo",
+    "Unable to delete user" : "No fue posible borrar el usuario",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Pedido inválido",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
+    "Unable to add user to group %s" : "No fue posible agregar el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No es posible borrar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la App.",
+    "Wrong password" : "Clave incorrecta",
+    "No user supplied" : "No se ha indicado el usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario",
+    "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.",
+    "Unable to change password" : "Imposible cambiar la contraseña",
+    "Saved" : "Guardado",
+    "test email settings" : "Configuración de correo de prueba.",
+    "If you received this email, the settings seem to be correct." : "Si recibió este correo, la configuración parece estar correcta.",
+    "Email sent" : "e-mail mandado",
+    "You need to set your user email before being able to send test emails." : "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor, esperá....",
+    "Error while disabling app" : "Se ha producido un error mientras se deshabilitaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Se ha producido un error mientras se habilitaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error al actualizar App",
+    "Updated" : "Actualizado",
+    "Select a profile picture" : "Seleccionar una imágen de perfil",
+    "Very weak password" : "Contraseña muy débil.",
+    "Weak password" : "Contraseña débil.",
+    "So-so password" : "Contraseña de nivel medio. ",
+    "Good password" : "Buena contraseña. ",
+    "Strong password" : "Contraseña fuerte.",
+    "Delete" : "Borrar",
+    "Decrypting files... Please wait, this can take some time." : "Desencriptando archivos... Por favor espere, esto puede tardar.",
+    "Groups" : "Grupos",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "add group" : "agregar grupo",
+    "A valid username must be provided" : "Debe ingresar un nombre de usuario válido",
+    "Error creating user" : "Error creando usuario",
+    "A valid password must be provided" : "Debe ingresar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Advertencia: El directorio Home del usuario \"{user}\" ya existe",
+    "__language_name__" : "Castellano (Argentina)",
+    "SSL root certificates" : "certificados SSL raíz",
+    "Encryption" : "Encriptación",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (notificaciones fatales, errores, advertencias, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advertencias, errores y notificaciones fatales",
+    "Warnings, errors and fatal issues" : "Advertencias, errores y notificaciones fatales",
+    "Errors and fatal issues" : "Errores y notificaciones fatales",
+    "Fatal issues only" : "Notificaciones fatales solamente",
+    "None" : "Ninguno",
+    "Login" : "Ingresar",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Administrador NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Advertencia de seguridad",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está accediendo %s vía HTTP. Se sugiere fuertemente que configure su servidor para requerir el uso de HTTPS en vez del otro.",
+    "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." : "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
+    "Setup Warning" : "Alerta de Configuración",
+    "Module 'fileinfo' missing" : "El módulo 'fileinfo' no existe",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
+    "Your PHP version is outdated" : "Su versión de PHP está fuera de término",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Su versión de PHP está fuera de término. Recomendamos fuertemente actualizar a 5.3.8 o a una más nueva porque se sabe que versiones anteriores están falladas. Es posible que esta instalación no funcione adecuadamente.",
+    "Locale not working" : "\"Locale\" no está funcionando",
+    "System locale can not be set to a one which supports UTF-8." : "La localización del sistema no puede cambiarse a una que soporta 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 archivos.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Ejecutá una tarea con cada pagina cargada.",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones usar la Share API",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Allow resharing" : "Permitir Re-Compartir",
+    "Allow users to send mail notification for shared files" : "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos",
+    "Security" : "Seguridad",
+    "Enforce HTTPS" : "Forzar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
+    "Email Server" : "Servidor de correo electrónico",
+    "This is used for sending out notifications." : "Esto es usado para enviar notificaciones.",
+    "Send mode" : "Modo de envio",
+    "From address" : "Dirección remitente",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Autentificación requerida",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nombre de usuario SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Test email settings" : "Configuracion de correo de prueba.",
+    "Send email" : "Enviar correo",
+    "Log" : "Log",
+    "Log level" : "Nivel de Log",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación de Usuario",
+    "Admin Documentation" : "Documentación de Administrador.",
+    "Administrator Documentation" : "Documentación de Administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Informar errores",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
+    "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",
+    "Your password was changed" : "Tu contraseña fue cambiada",
+    "Unable to change your password" : "No fue posible cambiar tu contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña:",
+    "Change password" : "Cambiar contraseña",
+    "Full Name" : "Nombre completo",
+    "Email" : "e-mail",
+    "Your email address" : "Tu dirección de e-mail",
+    "Fill in an email address to enable password recovery and receive notifications" : "Rellene una direccion de correo para habilitar la recuperacion de contraseña y recibir notificaciones. ",
+    "Profile picture" : "Imágen de perfil",
+    "Upload new" : "Subir nuevo",
+    "Select new from Files" : "Seleccionar nuevo desde archivos",
+    "Remove image" : "Remover imagen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Sólo png o jpg. Lo ideal que sea cuadrada sino luego podrás recortarlo.",
+    "Your avatar is provided by your original account." : "Su avatar es proveído por su cuenta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Elegir como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayudanos a traducir",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
+    "Log-in password" : "Clave de acceso",
+    "Decrypt all Files" : "Desencriptar todos los archivos",
+    "Login Name" : "Nombre de Usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de contraseña de administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
+    "Group" : "Grupo",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otros",
+    "Username" : "Nombre de usuario",
+    "Quota" : "Cuota",
+    "change full name" : "Cambiar nombre completo",
+    "set new password" : "Configurar nueva contraseña",
+    "Default" : "Predeterminado"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
new file mode 100644
index 00000000000..0614fb56d37
--- /dev/null
+++ b/settings/l10n/es_AR.json
@@ -0,0 +1,165 @@
+{ "translations": {
+    "Enabled" : "Habilitado",
+    "Authentication error" : "Error al autenticar",
+    "Your full name has been changed." : "Su nombre completo ha sido cambiado.",
+    "Unable to change full name" : "Imposible cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No fue posible añadir el grupo",
+    "Files decrypted successfully" : "Archivos des-encriptados correctamente",
+    "Email saved" : "e-mail guardado",
+    "Invalid email" : "El e-mail no es válido ",
+    "Unable to delete group" : "No fue posible borrar el grupo",
+    "Unable to delete user" : "No fue posible borrar el usuario",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Pedido inválido",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
+    "Unable to add user to group %s" : "No fue posible agregar el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No es posible borrar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la App.",
+    "Wrong password" : "Clave incorrecta",
+    "No user supplied" : "No se ha indicado el usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario",
+    "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.",
+    "Unable to change password" : "Imposible cambiar la contraseña",
+    "Saved" : "Guardado",
+    "test email settings" : "Configuración de correo de prueba.",
+    "If you received this email, the settings seem to be correct." : "Si recibió este correo, la configuración parece estar correcta.",
+    "Email sent" : "e-mail mandado",
+    "You need to set your user email before being able to send test emails." : "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor, esperá....",
+    "Error while disabling app" : "Se ha producido un error mientras se deshabilitaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Se ha producido un error mientras se habilitaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error al actualizar App",
+    "Updated" : "Actualizado",
+    "Select a profile picture" : "Seleccionar una imágen de perfil",
+    "Very weak password" : "Contraseña muy débil.",
+    "Weak password" : "Contraseña débil.",
+    "So-so password" : "Contraseña de nivel medio. ",
+    "Good password" : "Buena contraseña. ",
+    "Strong password" : "Contraseña fuerte.",
+    "Delete" : "Borrar",
+    "Decrypting files... Please wait, this can take some time." : "Desencriptando archivos... Por favor espere, esto puede tardar.",
+    "Groups" : "Grupos",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "add group" : "agregar grupo",
+    "A valid username must be provided" : "Debe ingresar un nombre de usuario válido",
+    "Error creating user" : "Error creando usuario",
+    "A valid password must be provided" : "Debe ingresar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Advertencia: El directorio Home del usuario \"{user}\" ya existe",
+    "__language_name__" : "Castellano (Argentina)",
+    "SSL root certificates" : "certificados SSL raíz",
+    "Encryption" : "Encriptación",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (notificaciones fatales, errores, advertencias, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advertencias, errores y notificaciones fatales",
+    "Warnings, errors and fatal issues" : "Advertencias, errores y notificaciones fatales",
+    "Errors and fatal issues" : "Errores y notificaciones fatales",
+    "Fatal issues only" : "Notificaciones fatales solamente",
+    "None" : "Ninguno",
+    "Login" : "Ingresar",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Administrador NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Advertencia de seguridad",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está accediendo %s vía HTTP. Se sugiere fuertemente que configure su servidor para requerir el uso de HTTPS en vez del otro.",
+    "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." : "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
+    "Setup Warning" : "Alerta de Configuración",
+    "Module 'fileinfo' missing" : "El módulo 'fileinfo' no existe",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
+    "Your PHP version is outdated" : "Su versión de PHP está fuera de término",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Su versión de PHP está fuera de término. Recomendamos fuertemente actualizar a 5.3.8 o a una más nueva porque se sabe que versiones anteriores están falladas. Es posible que esta instalación no funcione adecuadamente.",
+    "Locale not working" : "\"Locale\" no está funcionando",
+    "System locale can not be set to a one which supports UTF-8." : "La localización del sistema no puede cambiarse a una que soporta 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 archivos.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Ejecutá una tarea con cada pagina cargada.",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones usar la Share API",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Allow resharing" : "Permitir Re-Compartir",
+    "Allow users to send mail notification for shared files" : "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos",
+    "Security" : "Seguridad",
+    "Enforce HTTPS" : "Forzar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
+    "Email Server" : "Servidor de correo electrónico",
+    "This is used for sending out notifications." : "Esto es usado para enviar notificaciones.",
+    "Send mode" : "Modo de envio",
+    "From address" : "Dirección remitente",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Autentificación requerida",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Credentials" : "Credenciales",
+    "SMTP Username" : "Nombre de usuario SMTP",
+    "SMTP Password" : "Contraseña SMTP",
+    "Test email settings" : "Configuracion de correo de prueba.",
+    "Send email" : "Enviar correo",
+    "Log" : "Log",
+    "Log level" : "Nivel de Log",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación de Usuario",
+    "Admin Documentation" : "Documentación de Administrador.",
+    "Administrator Documentation" : "Documentación de Administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Informar errores",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtené Apps para sincronizar tus archivos",
+    "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",
+    "Your password was changed" : "Tu contraseña fue cambiada",
+    "Unable to change your password" : "No fue posible cambiar tu contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña:",
+    "Change password" : "Cambiar contraseña",
+    "Full Name" : "Nombre completo",
+    "Email" : "e-mail",
+    "Your email address" : "Tu dirección de e-mail",
+    "Fill in an email address to enable password recovery and receive notifications" : "Rellene una direccion de correo para habilitar la recuperacion de contraseña y recibir notificaciones. ",
+    "Profile picture" : "Imágen de perfil",
+    "Upload new" : "Subir nuevo",
+    "Select new from Files" : "Seleccionar nuevo desde archivos",
+    "Remove image" : "Remover imagen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Sólo png o jpg. Lo ideal que sea cuadrada sino luego podrás recortarlo.",
+    "Your avatar is provided by your original account." : "Su avatar es proveído por su cuenta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Elegir como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayudanos a traducir",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
+    "Log-in password" : "Clave de acceso",
+    "Decrypt all Files" : "Desencriptar todos los archivos",
+    "Login Name" : "Nombre de Usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de contraseña de administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
+    "Group" : "Grupo",
+    "Default Quota" : "Cuota predeterminada",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otros",
+    "Username" : "Nombre de usuario",
+    "Quota" : "Cuota",
+    "change full name" : "Cambiar nombre completo",
+    "set new password" : "Configurar nueva contraseña",
+    "Default" : "Predeterminado"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/es_AR.php b/settings/l10n/es_AR.php
deleted file mode 100644
index 1b27515d77d..00000000000
--- a/settings/l10n/es_AR.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitado",
-"Authentication error" => "Error al autenticar",
-"Your full name has been changed." => "Su nombre completo ha sido cambiado.",
-"Unable to change full name" => "Imposible cambiar el nombre completo",
-"Group already exists" => "El grupo ya existe",
-"Unable to add group" => "No fue posible añadir el grupo",
-"Files decrypted successfully" => "Archivos des-encriptados correctamente",
-"Email saved" => "e-mail guardado",
-"Invalid email" => "El e-mail no es válido ",
-"Unable to delete group" => "No fue posible borrar el grupo",
-"Unable to delete user" => "No fue posible borrar el usuario",
-"Language changed" => "Idioma cambiado",
-"Invalid request" => "Pedido inválido",
-"Admins can't remove themself from the admin group" => "Los administradores no se pueden quitar a si mismos del grupo administrador. ",
-"Unable to add user to group %s" => "No fue posible agregar el usuario al grupo %s",
-"Unable to remove user from group %s" => "No es posible borrar al usuario del grupo %s",
-"Couldn't update app." => "No se pudo actualizar la App.",
-"Wrong password" => "Clave incorrecta",
-"No user supplied" => "No se ha indicado el usuario",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor provea de una contraseña de recuperación administrativa, sino se perderá todos los datos del usuario",
-"Wrong admin recovery password. Please check the password and try again." => "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.",
-"Unable to change password" => "Imposible cambiar la contraseña",
-"Saved" => "Guardado",
-"test email settings" => "Configuración de correo de prueba.",
-"If you received this email, the settings seem to be correct." => "Si recibió este correo, la configuración parece estar correcta.",
-"Email sent" => "e-mail mandado",
-"You need to set your user email before being able to send test emails." => "Necesita especificar el usuario de correo electrónico antes de poder enviar correos electrónicos de prueba.",
-"Sending..." => "Enviando...",
-"All" => "Todos",
-"Please wait...." => "Por favor, esperá....",
-"Error while disabling app" => "Se ha producido un error mientras se deshabilitaba la aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Se ha producido un error mientras se habilitaba la aplicación",
-"Updating...." => "Actualizando....",
-"Error while updating app" => "Error al actualizar App",
-"Updated" => "Actualizado",
-"Select a profile picture" => "Seleccionar una imágen de perfil",
-"Very weak password" => "Contraseña muy débil.",
-"Weak password" => "Contraseña débil.",
-"So-so password" => "Contraseña de nivel medio. ",
-"Good password" => "Buena contraseña. ",
-"Strong password" => "Contraseña fuerte.",
-"Delete" => "Borrar",
-"Decrypting files... Please wait, this can take some time." => "Desencriptando archivos... Por favor espere, esto puede tardar.",
-"Groups" => "Grupos",
-"undo" => "deshacer",
-"never" => "nunca",
-"add group" => "agregar grupo",
-"A valid username must be provided" => "Debe ingresar un nombre de usuario válido",
-"Error creating user" => "Error creando usuario",
-"A valid password must be provided" => "Debe ingresar una contraseña válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Advertencia: El directorio Home del usuario \"{user}\" ya existe",
-"__language_name__" => "Castellano (Argentina)",
-"SSL root certificates" => "certificados SSL raíz",
-"Encryption" => "Encriptación",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (notificaciones fatales, errores, advertencias, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, advertencias, errores y notificaciones fatales",
-"Warnings, errors and fatal issues" => "Advertencias, errores y notificaciones fatales",
-"Errors and fatal issues" => "Errores y notificaciones fatales",
-"Fatal issues only" => "Notificaciones fatales solamente",
-"None" => "Ninguno",
-"Login" => "Ingresar",
-"Plain" => "Plano",
-"NT LAN Manager" => "Administrador NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Advertencia de seguridad",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está accediendo %s vía HTTP. Se sugiere fuertemente que configure su servidor para requerir el uso de HTTPS en vez del otro.",
-"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." => "El directorio de datos y tus archivos probablemente sean accesibles desde Internet. El archivo .htaccess no funciona. Sugerimos fuertemente que configures tu servidor web de forma tal que el archivo de directorios no sea accesible o muevas el mismo fuera de la raíz de los documentos del servidor web.",
-"Setup Warning" => "Alerta de Configuración",
-"Module 'fileinfo' missing" => "El módulo 'fileinfo' no existe",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "El módulo PHP 'fileinfo' no existe. Es recomendable que actives este módulo para obtener mejores resultados con la detección mime-type",
-"Your PHP version is outdated" => "Su versión de PHP está fuera de término",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Su versión de PHP está fuera de término. Recomendamos fuertemente actualizar a 5.3.8 o a una más nueva porque se sabe que versiones anteriores están falladas. Es posible que esta instalación no funcione adecuadamente.",
-"Locale not working" => "\"Locale\" no está funcionando",
-"System locale can not be set to a one which supports UTF-8." => "La localización del sistema no puede cambiarse a una que soporta 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 archivos.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Ejecutá una tarea con cada pagina cargada.",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
-"Sharing" => "Compartiendo",
-"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la Share API",
-"Allow public uploads" => "Permitir subidas públicas",
-"Allow resharing" => "Permitir Re-Compartir",
-"Allow users to send mail notification for shared files" => "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos",
-"Security" => "Seguridad",
-"Enforce HTTPS" => "Forzar HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
-"Email Server" => "Servidor de correo electrónico",
-"This is used for sending out notifications." => "Esto es usado para enviar notificaciones.",
-"Send mode" => "Modo de envio",
-"From address" => "Dirección remitente",
-"Authentication method" => "Método de autenticación",
-"Authentication required" => "Autentificación requerida",
-"Server address" => "Dirección del servidor",
-"Port" => "Puerto",
-"Credentials" => "Credenciales",
-"SMTP Username" => "Nombre de usuario SMTP",
-"SMTP Password" => "Contraseña SMTP",
-"Test email settings" => "Configuracion de correo de prueba.",
-"Send email" => "Enviar correo",
-"Log" => "Log",
-"Log level" => "Nivel de Log",
-"More" => "Más",
-"Less" => "Menos",
-"Version" => "Versión",
-"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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "por",
-"Documentation:" => "Documentación:",
-"User Documentation" => "Documentación de Usuario",
-"Admin Documentation" => "Documentación de Administrador.",
-"Administrator Documentation" => "Documentación de Administrador",
-"Online Documentation" => "Documentación en línea",
-"Forum" => "Foro",
-"Bugtracker" => "Informar errores",
-"Commercial Support" => "Soporte comercial",
-"Get the apps to sync your files" => "Obtené Apps para sincronizar tus archivos",
-"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",
-"Your password was changed" => "Tu contraseña fue cambiada",
-"Unable to change your password" => "No fue posible cambiar tu contraseña",
-"Current password" => "Contraseña actual",
-"New password" => "Nueva contraseña:",
-"Change password" => "Cambiar contraseña",
-"Full Name" => "Nombre completo",
-"Email" => "e-mail",
-"Your email address" => "Tu dirección de e-mail",
-"Fill in an email address to enable password recovery and receive notifications" => "Rellene una direccion de correo para habilitar la recuperacion de contraseña y recibir notificaciones. ",
-"Profile picture" => "Imágen de perfil",
-"Upload new" => "Subir nuevo",
-"Select new from Files" => "Seleccionar nuevo desde archivos",
-"Remove image" => "Remover imagen",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Sólo png o jpg. Lo ideal que sea cuadrada sino luego podrás recortarlo.",
-"Your avatar is provided by your original account." => "Su avatar es proveído por su cuenta original.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Elegir como imagen de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ayudanos a traducir",
-"Import Root Certificate" => "Importar certificado raíz",
-"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
-"Log-in password" => "Clave de acceso",
-"Decrypt all Files" => "Desencriptar todos los archivos",
-"Login Name" => "Nombre de Usuario",
-"Create" => "Crear",
-"Admin Recovery Password" => "Recuperación de contraseña de administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
-"Group" => "Grupo",
-"Default Quota" => "Cuota predeterminada",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Otros",
-"Username" => "Nombre de usuario",
-"Quota" => "Cuota",
-"change full name" => "Cambiar nombre completo",
-"set new password" => "Configurar nueva contraseña",
-"Default" => "Predeterminado"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_CL.js b/settings/l10n/es_CL.js
new file mode 100644
index 00000000000..b51f930e83a
--- /dev/null
+++ b/settings/l10n/es_CL.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Password" : "Clave",
+    "Cancel" : "Cancelar",
+    "Username" : "Usuario"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es_CL.json b/settings/l10n/es_CL.json
new file mode 100644
index 00000000000..981c7eeb897
--- /dev/null
+++ b/settings/l10n/es_CL.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Password" : "Clave",
+    "Cancel" : "Cancelar",
+    "Username" : "Usuario"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/es_CL.php b/settings/l10n/es_CL.php
deleted file mode 100644
index fc5e328f3bc..00000000000
--- a/settings/l10n/es_CL.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Password" => "Clave",
-"Cancel" => "Cancelar",
-"Username" => "Usuario"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
new file mode 100644
index 00000000000..1c48d5b19ed
--- /dev/null
+++ b/settings/l10n/es_MX.js
@@ -0,0 +1,133 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitar",
+    "Authentication error" : "Error de autenticación",
+    "Your full name has been changed." : "Se ha cambiado su nombre completo.",
+    "Unable to change full name" : "No se puede cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No se pudo añadir el grupo",
+    "Email saved" : "Correo electrónico guardado",
+    "Invalid email" : "Correo electrónico no válido",
+    "Unable to delete group" : "No se pudo eliminar el grupo",
+    "Unable to delete user" : "No se pudo eliminar el usuario",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Petición no válida",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
+    "Unable to add user to group %s" : "No se pudo añadir el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No se pudo eliminar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la aplicación.",
+    "Wrong password" : "Contraseña incorrecta",
+    "No user supplied" : "No se especificó un usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
+    "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.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
+    "Unable to change password" : "No se ha podido cambiar la contraseña",
+    "Email sent" : "Correo electrónico enviado",
+    "All" : "Todos",
+    "Please wait...." : "Espere, por favor....",
+    "Error while disabling app" : "Error mientras se desactivaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Error mientras se activaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error mientras se actualizaba la aplicación",
+    "Updated" : "Actualizado",
+    "Select a profile picture" : "Seleccionar una imagen de perfil",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+    "Groups" : "Grupos",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "add group" : "añadir Grupo",
+    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
+    "Error creating user" : "Error al crear usuario",
+    "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
+    "__language_name__" : "Español (México)",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
+    "Errors and fatal issues" : "Errores y problemas fatales",
+    "Fatal issues only" : "Problemas fatales solamente",
+    "Login" : "Iniciar sesión",
+    "Security Warning" : "Advertencia de seguridad",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
+    "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." : "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
+    "Setup Warning" : "Advertencia de configuración",
+    "Module 'fileinfo' missing" : "No se ha encontrado el módulo \"fileinfo\"",
+    "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.",
+    "Your PHP version is outdated" : "Su versión de PHP ha caducado",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
+    "Locale not working" : "La configuración regional no está funcionando",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+    "Cron" : "Cron",
+    "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.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Allow resharing" : "Permitir re-compartición",
+    "Security" : "Seguridad",
+    "Enforce HTTPS" : "Forzar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Log" : "Registro",
+    "Log level" : "Nivel de registro",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "User Documentation" : "Documentación de usuario",
+    "Administrator Documentation" : "Documentación de administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Rastreador de fallos",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Su contraseña ha sido cambiada",
+    "Unable to change your password" : "No se ha podido cambiar su contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña",
+    "Change password" : "Cambiar contraseña",
+    "Full Name" : "Nombre completo",
+    "Email" : "Correo electrónico",
+    "Your email address" : "Su dirección de correo",
+    "Profile picture" : "Foto de perfil",
+    "Upload new" : "Subir otra",
+    "Select new from Files" : "Seleccionar otra desde Archivos",
+    "Remove image" : "Borrar imagen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
+    "Your avatar is provided by your original account." : "Su avatar es proporcionado por su cuenta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Seleccionar como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayúdanos a traducir",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
+    "Log-in password" : "Contraseña de acceso",
+    "Decrypt all Files" : "Descifrar archivos",
+    "Login Name" : "Nombre de usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña de administración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otro",
+    "Username" : "Nombre de usuario",
+    "change full name" : "cambiar el nombre completo",
+    "set new password" : "establecer nueva contraseña",
+    "Default" : "Predeterminado"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json
new file mode 100644
index 00000000000..7dccd57fbf7
--- /dev/null
+++ b/settings/l10n/es_MX.json
@@ -0,0 +1,131 @@
+{ "translations": {
+    "Enabled" : "Habilitar",
+    "Authentication error" : "Error de autenticación",
+    "Your full name has been changed." : "Se ha cambiado su nombre completo.",
+    "Unable to change full name" : "No se puede cambiar el nombre completo",
+    "Group already exists" : "El grupo ya existe",
+    "Unable to add group" : "No se pudo añadir el grupo",
+    "Email saved" : "Correo electrónico guardado",
+    "Invalid email" : "Correo electrónico no válido",
+    "Unable to delete group" : "No se pudo eliminar el grupo",
+    "Unable to delete user" : "No se pudo eliminar el usuario",
+    "Language changed" : "Idioma cambiado",
+    "Invalid request" : "Petición no válida",
+    "Admins can't remove themself from the admin group" : "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
+    "Unable to add user to group %s" : "No se pudo añadir el usuario al grupo %s",
+    "Unable to remove user from group %s" : "No se pudo eliminar al usuario del grupo %s",
+    "Couldn't update app." : "No se pudo actualizar la aplicación.",
+    "Wrong password" : "Contraseña incorrecta",
+    "No user supplied" : "No se especificó un usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
+    "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.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
+    "Unable to change password" : "No se ha podido cambiar la contraseña",
+    "Email sent" : "Correo electrónico enviado",
+    "All" : "Todos",
+    "Please wait...." : "Espere, por favor....",
+    "Error while disabling app" : "Error mientras se desactivaba la aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Error mientras se activaba la aplicación",
+    "Updating...." : "Actualizando....",
+    "Error while updating app" : "Error mientras se actualizaba la aplicación",
+    "Updated" : "Actualizado",
+    "Select a profile picture" : "Seleccionar una imagen de perfil",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
+    "Groups" : "Grupos",
+    "undo" : "deshacer",
+    "never" : "nunca",
+    "add group" : "añadir Grupo",
+    "A valid username must be provided" : "Se debe proporcionar un nombre de usuario válido",
+    "Error creating user" : "Error al crear usuario",
+    "A valid password must be provided" : "Se debe proporcionar una contraseña válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
+    "__language_name__" : "Español (México)",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (Información, Avisos, Errores, debug y problemas fatales)",
+    "Info, warnings, errors and fatal issues" : "Información, Avisos, Errores y problemas fatales",
+    "Warnings, errors and fatal issues" : "Advertencias, errores y problemas fatales",
+    "Errors and fatal issues" : "Errores y problemas fatales",
+    "Fatal issues only" : "Problemas fatales solamente",
+    "Login" : "Iniciar sesión",
+    "Security Warning" : "Advertencia de seguridad",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
+    "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." : "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
+    "Setup Warning" : "Advertencia de configuración",
+    "Module 'fileinfo' missing" : "No se ha encontrado el módulo \"fileinfo\"",
+    "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.",
+    "Your PHP version is outdated" : "Su versión de PHP ha caducado",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
+    "Locale not working" : "La configuración regional no está funcionando",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
+    "Cron" : "Cron",
+    "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.",
+    "Sharing" : "Compartiendo",
+    "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
+    "Allow public uploads" : "Permitir subidas públicas",
+    "Allow resharing" : "Permitir re-compartición",
+    "Security" : "Seguridad",
+    "Enforce HTTPS" : "Forzar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
+    "Server address" : "Dirección del servidor",
+    "Port" : "Puerto",
+    "Log" : "Registro",
+    "Log level" : "Nivel de registro",
+    "More" : "Más",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "por",
+    "User Documentation" : "Documentación de usuario",
+    "Administrator Documentation" : "Documentación de administrador",
+    "Online Documentation" : "Documentación en línea",
+    "Forum" : "Foro",
+    "Bugtracker" : "Rastreador de fallos",
+    "Commercial Support" : "Soporte comercial",
+    "Get the apps to sync your files" : "Obtener las aplicaciones para sincronizar sus archivos",
+    "Show First Run Wizard again" : "Mostrar nuevamente el Asistente de ejecución inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
+    "Password" : "Contraseña",
+    "Your password was changed" : "Su contraseña ha sido cambiada",
+    "Unable to change your password" : "No se ha podido cambiar su contraseña",
+    "Current password" : "Contraseña actual",
+    "New password" : "Nueva contraseña",
+    "Change password" : "Cambiar contraseña",
+    "Full Name" : "Nombre completo",
+    "Email" : "Correo electrónico",
+    "Your email address" : "Su dirección de correo",
+    "Profile picture" : "Foto de perfil",
+    "Upload new" : "Subir otra",
+    "Select new from Files" : "Seleccionar otra desde Archivos",
+    "Remove image" : "Borrar imagen",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
+    "Your avatar is provided by your original account." : "Su avatar es proporcionado por su cuenta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Seleccionar como imagen de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ayúdanos a traducir",
+    "Import Root Certificate" : "Importar certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
+    "Log-in password" : "Contraseña de acceso",
+    "Decrypt all Files" : "Descifrar archivos",
+    "Login Name" : "Nombre de usuario",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Recuperación de la contraseña de administración",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Otro",
+    "Username" : "Nombre de usuario",
+    "change full name" : "cambiar el nombre completo",
+    "set new password" : "establecer nueva contraseña",
+    "Default" : "Predeterminado"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/es_MX.php b/settings/l10n/es_MX.php
deleted file mode 100644
index 4db87b4e68b..00000000000
--- a/settings/l10n/es_MX.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitar",
-"Authentication error" => "Error de autenticación",
-"Your full name has been changed." => "Se ha cambiado su nombre completo.",
-"Unable to change full name" => "No se puede cambiar el nombre completo",
-"Group already exists" => "El grupo ya existe",
-"Unable to add group" => "No se pudo añadir el grupo",
-"Email saved" => "Correo electrónico guardado",
-"Invalid email" => "Correo electrónico no válido",
-"Unable to delete group" => "No se pudo eliminar el grupo",
-"Unable to delete user" => "No se pudo eliminar el usuario",
-"Language changed" => "Idioma cambiado",
-"Invalid request" => "Petición no válida",
-"Admins can't remove themself from the admin group" => "Los administradores no se pueden eliminar a ellos mismos del grupo de administrador",
-"Unable to add user to group %s" => "No se pudo añadir el usuario al grupo %s",
-"Unable to remove user from group %s" => "No se pudo eliminar al usuario del grupo %s",
-"Couldn't update app." => "No se pudo actualizar la aplicación.",
-"Wrong password" => "Contraseña incorrecta",
-"No user supplied" => "No se especificó un usuario",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor facilite una contraseña de recuperación de administrador, sino podrían perderse todos los datos de usuario",
-"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.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
-"Unable to change password" => "No se ha podido cambiar la contraseña",
-"Email sent" => "Correo electrónico enviado",
-"All" => "Todos",
-"Please wait...." => "Espere, por favor....",
-"Error while disabling app" => "Error mientras se desactivaba la aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Error mientras se activaba la aplicación",
-"Updating...." => "Actualizando....",
-"Error while updating app" => "Error mientras se actualizaba la aplicación",
-"Updated" => "Actualizado",
-"Select a profile picture" => "Seleccionar una imagen de perfil",
-"Delete" => "Eliminar",
-"Decrypting files... Please wait, this can take some time." => "Descifrando archivos... Espere por favor, esto puede llevar algo de tiempo.",
-"Groups" => "Grupos",
-"undo" => "deshacer",
-"never" => "nunca",
-"add group" => "añadir Grupo",
-"A valid username must be provided" => "Se debe proporcionar un nombre de usuario válido",
-"Error creating user" => "Error al crear usuario",
-"A valid password must be provided" => "Se debe proporcionar una contraseña válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Atención: el directorio de inicio para el usuario \"{user}\" ya existe.",
-"__language_name__" => "Español (México)",
-"SSL root certificates" => "Certificados raíz SSL",
-"Encryption" => "Cifrado",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (Información, Avisos, Errores, debug y problemas fatales)",
-"Info, warnings, errors and fatal issues" => "Información, Avisos, Errores y problemas fatales",
-"Warnings, errors and fatal issues" => "Advertencias, errores y problemas fatales",
-"Errors and fatal issues" => "Errores y problemas fatales",
-"Fatal issues only" => "Problemas fatales solamente",
-"Login" => "Iniciar sesión",
-"Security Warning" => "Advertencia de seguridad",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
-"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." => "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
-"Setup Warning" => "Advertencia de configuración",
-"Module 'fileinfo' missing" => "No se ha encontrado el módulo \"fileinfo\"",
-"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.",
-"Your PHP version is outdated" => "Su versión de PHP ha caducado",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Su versión de PHP ha caducado. Le sugerimos encarecidamente que la actualize a 5.3.8 o a una más nueva porque normalmente las versiones antiguas no funcionan bien. Puede ser que esta instalación no esté funcionando bien por ello.",
-"Locale not working" => "La configuración regional no está funcionando",
-"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.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-"Cron" => "Cron",
-"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.",
-"Sharing" => "Compartiendo",
-"Allow apps to use the Share API" => "Permitir a las aplicaciones utilizar la API de Compartición",
-"Allow public uploads" => "Permitir subidas públicas",
-"Allow resharing" => "Permitir re-compartición",
-"Security" => "Seguridad",
-"Enforce HTTPS" => "Forzar HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
-"Server address" => "Dirección del servidor",
-"Port" => "Puerto",
-"Log" => "Registro",
-"Log level" => "Nivel de registro",
-"More" => "Más",
-"Less" => "Menos",
-"Version" => "Versión",
-"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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "por",
-"User Documentation" => "Documentación de usuario",
-"Administrator Documentation" => "Documentación de administrador",
-"Online Documentation" => "Documentación en línea",
-"Forum" => "Foro",
-"Bugtracker" => "Rastreador de fallos",
-"Commercial Support" => "Soporte comercial",
-"Get the apps to sync your files" => "Obtener las aplicaciones para sincronizar sus archivos",
-"Show First Run Wizard again" => "Mostrar nuevamente el Asistente de ejecución inicial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ha usado <strong>%s</strong> de los <strong>%s</strong> disponibles",
-"Password" => "Contraseña",
-"Your password was changed" => "Su contraseña ha sido cambiada",
-"Unable to change your password" => "No se ha podido cambiar su contraseña",
-"Current password" => "Contraseña actual",
-"New password" => "Nueva contraseña",
-"Change password" => "Cambiar contraseña",
-"Full Name" => "Nombre completo",
-"Email" => "Correo electrónico",
-"Your email address" => "Su dirección de correo",
-"Profile picture" => "Foto de perfil",
-"Upload new" => "Subir otra",
-"Select new from Files" => "Seleccionar otra desde Archivos",
-"Remove image" => "Borrar imagen",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Archivo PNG o JPG. Preferiblemente cuadrado, pero tendrás la posibilidad de recortarlo.",
-"Your avatar is provided by your original account." => "Su avatar es proporcionado por su cuenta original.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Seleccionar como imagen de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ayúdanos a traducir",
-"Import Root Certificate" => "Importar certificado raíz",
-"The encryption app is no longer enabled, please decrypt all your files" => "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
-"Log-in password" => "Contraseña de acceso",
-"Decrypt all Files" => "Descifrar archivos",
-"Login Name" => "Nombre de usuario",
-"Create" => "Crear",
-"Admin Recovery Password" => "Recuperación de la contraseña de administración",
-"Enter the recovery password in order to recover the users files during password change" => "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Otro",
-"Username" => "Nombre de usuario",
-"change full name" => "cambiar el nombre completo",
-"set new password" => "establecer nueva contraseña",
-"Default" => "Predeterminado"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
new file mode 100644
index 00000000000..27e936aedbc
--- /dev/null
+++ b/settings/l10n/et_EE.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Sisse lülitatud",
+    "Not enabled" : "Pole sisse lülitatud",
+    "Recommended" : "Soovitatud",
+    "Authentication error" : "Autentimise viga",
+    "Your full name has been changed." : "Sinu täispikk nimi on muudetud.",
+    "Unable to change full name" : "Täispika nime muutmine ebaõnnestus",
+    "Group already exists" : "Grupp on juba olemas",
+    "Unable to add group" : "Keela grupi lisamine",
+    "Files decrypted successfully" : "Failide krüpteerimine õnnestus",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
+    "Couldn't decrypt your files, check your password and try again" : "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
+    "Encryption keys deleted permanently" : "Krüpteerimisvõtmed kustutatud lõplikult",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
+    "Couldn't remove app." : "Ei suutnud rakendit eemaldada.",
+    "Email saved" : "Kiri on salvestatud",
+    "Invalid email" : "Vigane e-post",
+    "Unable to delete group" : "Grupi kustutamine ebaõnnestus",
+    "Unable to delete user" : "Kasutaja kustutamine ebaõnnestus",
+    "Backups restored successfully" : "Varukoopiad taastatud edukalt.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või  pöördu oma süsteemihalduri poole.",
+    "Language changed" : "Keel on muudetud",
+    "Invalid request" : "Vigane päring",
+    "Admins can't remove themself from the admin group" : "Administraatorid ei saa ise end admin grupist eemaldada",
+    "Unable to add user to group %s" : "Kasutajat ei saa lisada gruppi %s",
+    "Unable to remove user from group %s" : "Kasutajat ei saa eemaldada grupist %s",
+    "Couldn't update app." : "Rakenduse uuendamine ebaõnnestus.",
+    "Wrong password" : "Vale parool",
+    "No user supplied" : "Kasutajat ei sisestatud",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed",
+    "Wrong admin recovery password. Please check the password and try again." : "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
+    "Unable to change password" : "Ei suuda parooli muuta",
+    "Saved" : "Salvestatud",
+    "test email settings" : "testi e-posti seadeid",
+    "If you received this email, the settings seem to be correct." : "Kui said selle kirja, siis on seadistus korrektne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
+    "Email sent" : "E-kiri on saadetud",
+    "You need to set your user email before being able to send test emails." : "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
+    "Add trusted domain" : "Lis ausaldusväärne domeen",
+    "Sending..." : "Saadan...",
+    "All" : "Kõik",
+    "Please wait...." : "Palun oota...",
+    "Error while disabling app" : "Viga rakenduse keelamisel",
+    "Disable" : "Lülita välja",
+    "Enable" : "Lülita sisse",
+    "Error while enabling app" : "Viga rakenduse lubamisel",
+    "Updating...." : "Uuendamine...",
+    "Error while updating app" : "Viga rakenduse uuendamisel",
+    "Updated" : "Uuendatud",
+    "Uninstalling ...." : "Eemaldan...",
+    "Error while uninstalling app" : "Viga rakendi eemaldamisel",
+    "Uninstall" : "Eemalda",
+    "Select a profile picture" : "Vali profiili pilt",
+    "Very weak password" : "Väga nõrk parool",
+    "Weak password" : "Nõrk parool",
+    "So-so password" : "Enam-vähem sobiv parool",
+    "Good password" : "Hea parool",
+    "Strong password" : "Väga hea parool",
+    "Valid until {date}" : "Kehtib kuni {date}",
+    "Delete" : "Kustuta",
+    "Decrypting files... Please wait, this can take some time." : "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
+    "Delete encryption keys permanently." : "Kustuta krüpteerimisvõtmed lõplikult",
+    "Restore encryption keys." : "Taasta krüpteerimisvõtmed.",
+    "Groups" : "Grupid",
+    "Unable to delete {objName}" : "Ei suuda kustutada {objName}",
+    "Error creating group" : "Viga grupi loomisel",
+    "A valid group name must be provided" : "Sisesta nõuetele vastav grupi nimi",
+    "deleted {groupName}" : "kustutatud {groupName}",
+    "undo" : "tagasi",
+    "never" : "mitte kunagi",
+    "deleted {userName}" : "kustutatud {userName}",
+    "add group" : "lisa grupp",
+    "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
+    "Error creating user" : "Viga kasutaja loomisel",
+    "A valid password must be provided" : "Sisesta nõuetele vastav parool",
+    "Warning: Home directory for user \"{user}\" already exists" : "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
+    "__language_name__" : "Eesti",
+    "SSL root certificates" : "SSL root sertifikaadid",
+    "Encryption" : "Krüpteerimine",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
+    "Info, warnings, errors and fatal issues" : "Info, hoiatused, veateted ja tõsised probleemid",
+    "Warnings, errors and fatal issues" : "Hoiatused, veateated ja tõsised probleemid",
+    "Errors and fatal issues" : "Veateated ja tõsised probleemid",
+    "Fatal issues only" : "Ainult tõsised probleemid",
+    "None" : "Pole",
+    "Login" : "Logi sisse",
+    "Plain" : "Tavatekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Turvahoiatus",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sa kasutad %s ligipääsuks HTTP protokolli. Soovitame tungivalt seadistada oma server selle asemel kasutama HTTPS-i.",
+    "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." : "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale.",
+    "Setup Warning" : "Paigalduse hoiatus",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.",
+    "Database Performance Info" : "Andmebaasi toimimise info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta. Migreerimaks teisele andmebaasile kasuta seda käsurea vahendit: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Moodul 'fileinfo' puudub",
+    "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.",
+    "Your PHP version is outdated" : "PHP versioon on aegunud",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt.",
+    "PHP charset is not set to UTF-8" : "PHP märgistik pole UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP märgistikuks pole määratud UTF-8. See võib tekitada failinimedes mitte-ASCII märkidega suuri probleeme. Me soovitame tungivalt panna failis php.ini sätte 'default_charset' väärtuseks 'UTF-8'.",
+    "Locale not working" : "Lokalisatsioon ei toimi",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
+    "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
+    "Connectivity checks" : "Ühenduse kontrollimine",
+    "No problems found" : "Ühtegi probleemi ei leitud",
+    "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron käivitati viimati %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
+    "Cron was not executed yet!" : "Cron pole kordagi käivitatud!",
+    "Execute one task with each page loaded" : "Käivita toiming igal lehe laadimisel",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
+    "Sharing" : "Jagamine",
+    "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
+    "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
+    "Enforce password protection" : "Sunni parooliga kaitsmist",
+    "Allow public uploads" : "Luba avalikud üleslaadimised",
+    "Set default expiration date" : "Määra vaikimisi aegumise kuupäev",
+    "Expire after " : "Aegu pärast",
+    "days" : "päeva",
+    "Enforce expiration date" : "Sunnitud aegumise kuupäev",
+    "Allow resharing" : "Luba edasijagamine",
+    "Restrict users to only share with users in their groups" : "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
+    "Allow users to send mail notification for shared files" : "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
+    "Exclude groups from sharing" : "Eemalda grupid jagamisest",
+    "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
+    "Security" : "Turvalisus",
+    "Enforce HTTPS" : "Sunni peale HTTPS-i kasutamine",
+    "Forces the clients to connect to %s via an encrypted connection." : "Sunnib kliente %s ühenduma krüpteeritult.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
+    "Email Server" : "Postiserver",
+    "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
+    "Send mode" : "Saatmise viis",
+    "From address" : "Saatja aadress",
+    "mail" : "e-mail",
+    "Authentication method" : "Autentimise meetod",
+    "Authentication required" : "Autentimine on vajalik",
+    "Server address" : "Serveri aadress",
+    "Port" : "Port",
+    "Credentials" : "Kasutajatunnused",
+    "SMTP Username" : "SMTP kasutajatunnus",
+    "SMTP Password" : "SMTP parool",
+    "Store credentials" : "Säilita kasutajaandmed",
+    "Test email settings" : "Testi e-posti seadeid",
+    "Send email" : "Saada kiri",
+    "Log" : "Logi",
+    "Log level" : "Logi tase",
+    "More" : "Rohkem",
+    "Less" : "Vähem",
+    "Version" : "Versioon",
+    "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>." : "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
+    "More apps" : "Rohkem rakendusi",
+    "Add your app" : "Lisa oma rakendus",
+    "by" : "lisas",
+    "licensed" : "litsenseeritud",
+    "Documentation:" : "Dokumentatsioon:",
+    "User Documentation" : "Kasutaja dokumentatsioon",
+    "Admin Documentation" : "Admin dokumentatsioon",
+    "Update to %s" : "Uuenda versioonile %s",
+    "Enable only for specific groups" : "Luba ainult kindlad grupid",
+    "Uninstall App" : "Eemada rakend",
+    "Administrator Documentation" : "Administraatori dokumentatsioon",
+    "Online Documentation" : "Online dokumentatsioon",
+    "Forum" : "Foorum",
+    "Bugtracker" : "Vigade nimekiri",
+    "Commercial Support" : "Tasuline kasutajatugi",
+    "Get the apps to sync your files" : "Hangi rakendusi failide sünkroniseerimiseks",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Kui tahad projekti toetada\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">liitu arendusega</a>\n\t\tvõi\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levita sõna</a>!",
+    "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
+    "Password" : "Parool",
+    "Your password was changed" : "Sinu parooli on muudetud",
+    "Unable to change your password" : "Sa ei saa oma parooli muuta",
+    "Current password" : "Praegune parool",
+    "New password" : "Uus parool",
+    "Change password" : "Muuda parooli",
+    "Full Name" : "Täispikk nimi",
+    "Email" : "E-post",
+    "Your email address" : "Sinu e-posti aadress",
+    "Fill in an email address to enable password recovery and receive notifications" : "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist.",
+    "Profile picture" : "Profiili pilt",
+    "Upload new" : "Laadi uus üles",
+    "Select new from Files" : "Vali failidest uus",
+    "Remove image" : "Eemalda pilt",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata.",
+    "Your avatar is provided by your original account." : "Sinu avatari pakub sinu algne konto.",
+    "Cancel" : "Loobu",
+    "Choose as profile image" : "Vali profiilipildiks",
+    "Language" : "Keel",
+    "Help translate" : "Aita tõlkida",
+    "Common Name" : "Üldnimetus",
+    "Valid until" : "Kehtib kuni",
+    "Issued By" : "isas",
+    "Valid until %s" : "Kehtib kuni %s",
+    "Import Root Certificate" : "Impordi root sertifikaadid",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
+    "Log-in password" : "Sisselogimise parool",
+    "Decrypt all Files" : "Dekrüpteeri kõik failid",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
+    "Restore Encryption Keys" : "Taasta krüpteerimisvõtmed",
+    "Delete Encryption Keys" : "Kustuta krüpteerimisvõtmed",
+    "Show storage location" : "Näita salvestusruumi asukohta",
+    "Show last log in" : "Viimane sisselogimine",
+    "Login Name" : "Kasutajanimi",
+    "Create" : "Lisa",
+    "Admin Recovery Password" : "Admini parooli taastamine",
+    "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
+    "Search Users and Groups" : "Otsi kasutajaid ja gruppe",
+    "Add Group" : "Lisa grupp",
+    "Group" : "Grupp",
+    "Everyone" : "Igaüks",
+    "Admins" : "Haldurid",
+    "Default Quota" : "Vaikimisi kvoot",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
+    "Unlimited" : "Piiramatult",
+    "Other" : "Muu",
+    "Username" : "Kasutajanimi",
+    "Quota" : "Mahupiir",
+    "Storage Location" : "Mahu asukoht",
+    "Last Login" : "Viimane sisselogimine",
+    "change full name" : "Muuda täispikka nime",
+    "set new password" : "määra uus parool",
+    "Default" : "Vaikeväärtus"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
new file mode 100644
index 00000000000..52549e1e640
--- /dev/null
+++ b/settings/l10n/et_EE.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Sisse lülitatud",
+    "Not enabled" : "Pole sisse lülitatud",
+    "Recommended" : "Soovitatud",
+    "Authentication error" : "Autentimise viga",
+    "Your full name has been changed." : "Sinu täispikk nimi on muudetud.",
+    "Unable to change full name" : "Täispika nime muutmine ebaõnnestus",
+    "Group already exists" : "Grupp on juba olemas",
+    "Unable to add group" : "Keela grupi lisamine",
+    "Files decrypted successfully" : "Failide krüpteerimine õnnestus",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
+    "Couldn't decrypt your files, check your password and try again" : "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
+    "Encryption keys deleted permanently" : "Krüpteerimisvõtmed kustutatud lõplikult",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
+    "Couldn't remove app." : "Ei suutnud rakendit eemaldada.",
+    "Email saved" : "Kiri on salvestatud",
+    "Invalid email" : "Vigane e-post",
+    "Unable to delete group" : "Grupi kustutamine ebaõnnestus",
+    "Unable to delete user" : "Kasutaja kustutamine ebaõnnestus",
+    "Backups restored successfully" : "Varukoopiad taastatud edukalt.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või  pöördu oma süsteemihalduri poole.",
+    "Language changed" : "Keel on muudetud",
+    "Invalid request" : "Vigane päring",
+    "Admins can't remove themself from the admin group" : "Administraatorid ei saa ise end admin grupist eemaldada",
+    "Unable to add user to group %s" : "Kasutajat ei saa lisada gruppi %s",
+    "Unable to remove user from group %s" : "Kasutajat ei saa eemaldada grupist %s",
+    "Couldn't update app." : "Rakenduse uuendamine ebaõnnestus.",
+    "Wrong password" : "Vale parool",
+    "No user supplied" : "Kasutajat ei sisestatud",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed",
+    "Wrong admin recovery password. Please check the password and try again." : "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
+    "Unable to change password" : "Ei suuda parooli muuta",
+    "Saved" : "Salvestatud",
+    "test email settings" : "testi e-posti seadeid",
+    "If you received this email, the settings seem to be correct." : "Kui said selle kirja, siis on seadistus korrektne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
+    "Email sent" : "E-kiri on saadetud",
+    "You need to set your user email before being able to send test emails." : "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
+    "Add trusted domain" : "Lis ausaldusväärne domeen",
+    "Sending..." : "Saadan...",
+    "All" : "Kõik",
+    "Please wait...." : "Palun oota...",
+    "Error while disabling app" : "Viga rakenduse keelamisel",
+    "Disable" : "Lülita välja",
+    "Enable" : "Lülita sisse",
+    "Error while enabling app" : "Viga rakenduse lubamisel",
+    "Updating...." : "Uuendamine...",
+    "Error while updating app" : "Viga rakenduse uuendamisel",
+    "Updated" : "Uuendatud",
+    "Uninstalling ...." : "Eemaldan...",
+    "Error while uninstalling app" : "Viga rakendi eemaldamisel",
+    "Uninstall" : "Eemalda",
+    "Select a profile picture" : "Vali profiili pilt",
+    "Very weak password" : "Väga nõrk parool",
+    "Weak password" : "Nõrk parool",
+    "So-so password" : "Enam-vähem sobiv parool",
+    "Good password" : "Hea parool",
+    "Strong password" : "Väga hea parool",
+    "Valid until {date}" : "Kehtib kuni {date}",
+    "Delete" : "Kustuta",
+    "Decrypting files... Please wait, this can take some time." : "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
+    "Delete encryption keys permanently." : "Kustuta krüpteerimisvõtmed lõplikult",
+    "Restore encryption keys." : "Taasta krüpteerimisvõtmed.",
+    "Groups" : "Grupid",
+    "Unable to delete {objName}" : "Ei suuda kustutada {objName}",
+    "Error creating group" : "Viga grupi loomisel",
+    "A valid group name must be provided" : "Sisesta nõuetele vastav grupi nimi",
+    "deleted {groupName}" : "kustutatud {groupName}",
+    "undo" : "tagasi",
+    "never" : "mitte kunagi",
+    "deleted {userName}" : "kustutatud {userName}",
+    "add group" : "lisa grupp",
+    "A valid username must be provided" : "Sisesta nõuetele vastav kasutajatunnus",
+    "Error creating user" : "Viga kasutaja loomisel",
+    "A valid password must be provided" : "Sisesta nõuetele vastav parool",
+    "Warning: Home directory for user \"{user}\" already exists" : "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
+    "__language_name__" : "Eesti",
+    "SSL root certificates" : "SSL root sertifikaadid",
+    "Encryption" : "Krüpteerimine",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
+    "Info, warnings, errors and fatal issues" : "Info, hoiatused, veateted ja tõsised probleemid",
+    "Warnings, errors and fatal issues" : "Hoiatused, veateated ja tõsised probleemid",
+    "Errors and fatal issues" : "Veateated ja tõsised probleemid",
+    "Fatal issues only" : "Ainult tõsised probleemid",
+    "None" : "Pole",
+    "Login" : "Logi sisse",
+    "Plain" : "Tavatekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Turvahoiatus",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sa kasutad %s ligipääsuks HTTP protokolli. Soovitame tungivalt seadistada oma server selle asemel kasutama HTTPS-i.",
+    "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." : "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale.",
+    "Setup Warning" : "Paigalduse hoiatus",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.",
+    "Database Performance Info" : "Andmebaasi toimimise info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta. Migreerimaks teisele andmebaasile kasuta seda käsurea vahendit: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Moodul 'fileinfo' puudub",
+    "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.",
+    "Your PHP version is outdated" : "PHP versioon on aegunud",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt.",
+    "PHP charset is not set to UTF-8" : "PHP märgistik pole UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP märgistikuks pole määratud UTF-8. See võib tekitada failinimedes mitte-ASCII märkidega suuri probleeme. Me soovitame tungivalt panna failis php.ini sätte 'default_charset' väärtuseks 'UTF-8'.",
+    "Locale not working" : "Lokalisatsioon ei toimi",
+    "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.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
+    "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
+    "Connectivity checks" : "Ühenduse kontrollimine",
+    "No problems found" : "Ühtegi probleemi ei leitud",
+    "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron käivitati viimati %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
+    "Cron was not executed yet!" : "Cron pole kordagi käivitatud!",
+    "Execute one task with each page loaded" : "Käivita toiming igal lehe laadimisel",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
+    "Sharing" : "Jagamine",
+    "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
+    "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
+    "Enforce password protection" : "Sunni parooliga kaitsmist",
+    "Allow public uploads" : "Luba avalikud üleslaadimised",
+    "Set default expiration date" : "Määra vaikimisi aegumise kuupäev",
+    "Expire after " : "Aegu pärast",
+    "days" : "päeva",
+    "Enforce expiration date" : "Sunnitud aegumise kuupäev",
+    "Allow resharing" : "Luba edasijagamine",
+    "Restrict users to only share with users in their groups" : "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
+    "Allow users to send mail notification for shared files" : "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
+    "Exclude groups from sharing" : "Eemalda grupid jagamisest",
+    "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
+    "Security" : "Turvalisus",
+    "Enforce HTTPS" : "Sunni peale HTTPS-i kasutamine",
+    "Forces the clients to connect to %s via an encrypted connection." : "Sunnib kliente %s ühenduma krüpteeritult.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
+    "Email Server" : "Postiserver",
+    "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
+    "Send mode" : "Saatmise viis",
+    "From address" : "Saatja aadress",
+    "mail" : "e-mail",
+    "Authentication method" : "Autentimise meetod",
+    "Authentication required" : "Autentimine on vajalik",
+    "Server address" : "Serveri aadress",
+    "Port" : "Port",
+    "Credentials" : "Kasutajatunnused",
+    "SMTP Username" : "SMTP kasutajatunnus",
+    "SMTP Password" : "SMTP parool",
+    "Store credentials" : "Säilita kasutajaandmed",
+    "Test email settings" : "Testi e-posti seadeid",
+    "Send email" : "Saada kiri",
+    "Log" : "Logi",
+    "Log level" : "Logi tase",
+    "More" : "Rohkem",
+    "Less" : "Vähem",
+    "Version" : "Versioon",
+    "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>." : "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
+    "More apps" : "Rohkem rakendusi",
+    "Add your app" : "Lisa oma rakendus",
+    "by" : "lisas",
+    "licensed" : "litsenseeritud",
+    "Documentation:" : "Dokumentatsioon:",
+    "User Documentation" : "Kasutaja dokumentatsioon",
+    "Admin Documentation" : "Admin dokumentatsioon",
+    "Update to %s" : "Uuenda versioonile %s",
+    "Enable only for specific groups" : "Luba ainult kindlad grupid",
+    "Uninstall App" : "Eemada rakend",
+    "Administrator Documentation" : "Administraatori dokumentatsioon",
+    "Online Documentation" : "Online dokumentatsioon",
+    "Forum" : "Foorum",
+    "Bugtracker" : "Vigade nimekiri",
+    "Commercial Support" : "Tasuline kasutajatugi",
+    "Get the apps to sync your files" : "Hangi rakendusi failide sünkroniseerimiseks",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Kui tahad projekti toetada\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">liitu arendusega</a>\n\t\tvõi\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levita sõna</a>!",
+    "Show First Run Wizard again" : "Näita veelkord Esmase Käivituse Juhendajat",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
+    "Password" : "Parool",
+    "Your password was changed" : "Sinu parooli on muudetud",
+    "Unable to change your password" : "Sa ei saa oma parooli muuta",
+    "Current password" : "Praegune parool",
+    "New password" : "Uus parool",
+    "Change password" : "Muuda parooli",
+    "Full Name" : "Täispikk nimi",
+    "Email" : "E-post",
+    "Your email address" : "Sinu e-posti aadress",
+    "Fill in an email address to enable password recovery and receive notifications" : "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist.",
+    "Profile picture" : "Profiili pilt",
+    "Upload new" : "Laadi uus üles",
+    "Select new from Files" : "Vali failidest uus",
+    "Remove image" : "Eemalda pilt",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata.",
+    "Your avatar is provided by your original account." : "Sinu avatari pakub sinu algne konto.",
+    "Cancel" : "Loobu",
+    "Choose as profile image" : "Vali profiilipildiks",
+    "Language" : "Keel",
+    "Help translate" : "Aita tõlkida",
+    "Common Name" : "Üldnimetus",
+    "Valid until" : "Kehtib kuni",
+    "Issued By" : "isas",
+    "Valid until %s" : "Kehtib kuni %s",
+    "Import Root Certificate" : "Impordi root sertifikaadid",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
+    "Log-in password" : "Sisselogimise parool",
+    "Decrypt all Files" : "Dekrüpteeri kõik failid",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
+    "Restore Encryption Keys" : "Taasta krüpteerimisvõtmed",
+    "Delete Encryption Keys" : "Kustuta krüpteerimisvõtmed",
+    "Show storage location" : "Näita salvestusruumi asukohta",
+    "Show last log in" : "Viimane sisselogimine",
+    "Login Name" : "Kasutajanimi",
+    "Create" : "Lisa",
+    "Admin Recovery Password" : "Admini parooli taastamine",
+    "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
+    "Search Users and Groups" : "Otsi kasutajaid ja gruppe",
+    "Add Group" : "Lisa grupp",
+    "Group" : "Grupp",
+    "Everyone" : "Igaüks",
+    "Admins" : "Haldurid",
+    "Default Quota" : "Vaikimisi kvoot",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
+    "Unlimited" : "Piiramatult",
+    "Other" : "Muu",
+    "Username" : "Kasutajanimi",
+    "Quota" : "Mahupiir",
+    "Storage Location" : "Mahu asukoht",
+    "Last Login" : "Viimane sisselogimine",
+    "change full name" : "Muuda täispikka nime",
+    "set new password" : "määra uus parool",
+    "Default" : "Vaikeväärtus"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
deleted file mode 100644
index e38cb7ff242..00000000000
--- a/settings/l10n/et_EE.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Sisse lülitatud",
-"Not enabled" => "Pole sisse lülitatud",
-"Recommended" => "Soovitatud",
-"Authentication error" => "Autentimise viga",
-"Your full name has been changed." => "Sinu täispikk nimi on muudetud.",
-"Unable to change full name" => "Täispika nime muutmine ebaõnnestus",
-"Group already exists" => "Grupp on juba olemas",
-"Unable to add group" => "Keela grupi lisamine",
-"Files decrypted successfully" => "Failide krüpteerimine õnnestus",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ei suutnud faile dekrüpteerida, palun kontrolli oma owncloud.log-i või küsi nõu administraatorilt",
-"Couldn't decrypt your files, check your password and try again" => "Ei suutnud failde dekrüpteerida, kontrolli parooli ja proovi uuesti",
-"Encryption keys deleted permanently" => "Krüpteerimisvõtmed kustutatud lõplikult",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ei suutnud lõplikult kustutada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või pöördu oma süsteemihalduri poole.",
-"Couldn't remove app." => "Ei suutnud rakendit eemaldada.",
-"Email saved" => "Kiri on salvestatud",
-"Invalid email" => "Vigane e-post",
-"Unable to delete group" => "Grupi kustutamine ebaõnnestus",
-"Unable to delete user" => "Kasutaja kustutamine ebaõnnestus",
-"Backups restored successfully" => "Varukoopiad taastatud edukalt.",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Ei suutnud taastada sinu krüpteerimisvõtmeid, palun vaata owncloud.log-i või  pöördu oma süsteemihalduri poole.",
-"Language changed" => "Keel on muudetud",
-"Invalid request" => "Vigane päring",
-"Admins can't remove themself from the admin group" => "Administraatorid ei saa ise end admin grupist eemaldada",
-"Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
-"Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
-"Couldn't update app." => "Rakenduse uuendamine ebaõnnestus.",
-"Wrong password" => "Vale parool",
-"No user supplied" => "Kasutajat ei sisestatud",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Palun sisesta administraatori taasteparool, muidu kaotad kõik kasutajate andmed",
-"Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
-"Unable to change password" => "Ei suuda parooli muuta",
-"Saved" => "Salvestatud",
-"test email settings" => "testi e-posti seadeid",
-"If you received this email, the settings seem to be correct." => "Kui said selle kirja, siis on seadistus korrektne.",
-"A problem occurred while sending the email. Please revise your settings." => "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.",
-"Email sent" => "E-kiri on saadetud",
-"You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Oled sa kindel, et soovid lisada domeeni \"{domain}\" usaldusväärseks domeeniks?",
-"Add trusted domain" => "Lis ausaldusväärne domeen",
-"Sending..." => "Saadan...",
-"All" => "Kõik",
-"Please wait...." => "Palun oota...",
-"Error while disabling app" => "Viga rakenduse keelamisel",
-"Disable" => "Lülita välja",
-"Enable" => "Lülita sisse",
-"Error while enabling app" => "Viga rakenduse lubamisel",
-"Updating...." => "Uuendamine...",
-"Error while updating app" => "Viga rakenduse uuendamisel",
-"Updated" => "Uuendatud",
-"Uninstalling ...." => "Eemaldan...",
-"Error while uninstalling app" => "Viga rakendi eemaldamisel",
-"Uninstall" => "Eemalda",
-"Select a profile picture" => "Vali profiili pilt",
-"Very weak password" => "Väga nõrk parool",
-"Weak password" => "Nõrk parool",
-"So-so password" => "Enam-vähem sobiv parool",
-"Good password" => "Hea parool",
-"Strong password" => "Väga hea parool",
-"Valid until {date}" => "Kehtib kuni {date}",
-"Delete" => "Kustuta",
-"Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.",
-"Delete encryption keys permanently." => "Kustuta krüpteerimisvõtmed lõplikult",
-"Restore encryption keys." => "Taasta krüpteerimisvõtmed.",
-"Groups" => "Grupid",
-"Unable to delete {objName}" => "Ei suuda kustutada {objName}",
-"Error creating group" => "Viga grupi loomisel",
-"A valid group name must be provided" => "Sisesta nõuetele vastav grupi nimi",
-"deleted {groupName}" => "kustutatud {groupName}",
-"undo" => "tagasi",
-"never" => "mitte kunagi",
-"deleted {userName}" => "kustutatud {userName}",
-"add group" => "lisa grupp",
-"A valid username must be provided" => "Sisesta nõuetele vastav kasutajatunnus",
-"Error creating user" => "Viga kasutaja loomisel",
-"A valid password must be provided" => "Sisesta nõuetele vastav parool",
-"Warning: Home directory for user \"{user}\" already exists" => "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
-"__language_name__" => "Eesti",
-"SSL root certificates" => "SSL root sertifikaadid",
-"Encryption" => "Krüpteerimine",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
-"Info, warnings, errors and fatal issues" => "Info, hoiatused, veateted ja tõsised probleemid",
-"Warnings, errors and fatal issues" => "Hoiatused, veateated ja tõsised probleemid",
-"Errors and fatal issues" => "Veateated ja tõsised probleemid",
-"Fatal issues only" => "Ainult tõsised probleemid",
-"None" => "Pole",
-"Login" => "Logi sisse",
-"Plain" => "Tavatekst",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Turvahoiatus",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sa kasutad %s ligipääsuks HTTP protokolli. Soovitame tungivalt seadistada oma server selle asemel kasutama HTTPS-i.",
-"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." => "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale.",
-"Setup Warning" => "Paigalduse hoiatus",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP on seadistatud eemaldama \"inline\" dokumendi blokke. See muudab mõned rakendid kasutamatuteks.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "See on tõenäoliselt põhjustatud puhver/kiirendist nagu Zend OPcache või eAccelerator.",
-"Database Performance Info" => "Andmebaasi toimimise info",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Andmebaasina kasutatakse SQLite-t. Suuremate paigalduste puhul me soovitame seda muuta. Migreerimaks teisele andmebaasile kasuta seda käsurea vahendit: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Moodul 'fileinfo' puudub",
-"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.",
-"Your PHP version is outdated" => "PHP versioon on aegunud",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Sinu PHP versioon on aegunud. Soovitame tungivalt uuenda versioonile 5.3.8 või uuemale, kuna varasemad versioonid on teadaolevalt vigased. On võimalik, et see käesolev paigaldus ei toimi korrektselt.",
-"PHP charset is not set to UTF-8" => "PHP märgistik pole UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP märgistikuks pole määratud UTF-8. See võib tekitada failinimedes mitte-ASCII märkidega suuri probleeme. Me soovitame tungivalt panna failis php.ini sätte 'default_charset' väärtuseks 'UTF-8'.",
-"Locale not working" => "Lokalisatsioon ei toimi",
-"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.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
-"URL generation in notification emails" => "URL-ide loomine teavituskirjades",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
-"Connectivity checks" => "Ühenduse kontrollimine",
-"No problems found" => "Ühtegi probleemi ei leitud",
-"Please double check the <a href='%s'>installation guides</a>." => "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Cron käivitati viimati %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
-"Cron was not executed yet!" => "Cron pole kordagi käivitatud!",
-"Execute one task with each page loaded" => "Käivita toiming igal lehe laadimisel",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
-"Sharing" => "Jagamine",
-"Allow apps to use the Share API" => "Luba rakendustel kasutada Share API-t",
-"Allow users to share via link" => "Luba kasutajatel lingiga jagamist ",
-"Enforce password protection" => "Sunni parooliga kaitsmist",
-"Allow public uploads" => "Luba avalikud üleslaadimised",
-"Set default expiration date" => "Määra vaikimisi aegumise kuupäev",
-"Expire after " => "Aegu pärast",
-"days" => "päeva",
-"Enforce expiration date" => "Sunnitud aegumise kuupäev",
-"Allow resharing" => "Luba edasijagamine",
-"Restrict users to only share with users in their groups" => "Luba kasutajatel jagada kasutajatega ainult oma grupi piires",
-"Allow users to send mail notification for shared files" => "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
-"Exclude groups from sharing" => "Eemalda grupid jagamisest",
-"These groups will still be able to receive shares, but not to initiate them." => "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
-"Security" => "Turvalisus",
-"Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine",
-"Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s ühenduma krüpteeritult.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
-"Email Server" => "Postiserver",
-"This is used for sending out notifications." => "Seda kasutatakse teadete välja saatmiseks.",
-"Send mode" => "Saatmise viis",
-"From address" => "Saatja aadress",
-"mail" => "e-mail",
-"Authentication method" => "Autentimise meetod",
-"Authentication required" => "Autentimine on vajalik",
-"Server address" => "Serveri aadress",
-"Port" => "Port",
-"Credentials" => "Kasutajatunnused",
-"SMTP Username" => "SMTP kasutajatunnus",
-"SMTP Password" => "SMTP parool",
-"Store credentials" => "Säilita kasutajaandmed",
-"Test email settings" => "Testi e-posti seadeid",
-"Send email" => "Saada kiri",
-"Log" => "Logi",
-"Log level" => "Logi tase",
-"More" => "Rohkem",
-"Less" => "Vähem",
-"Version" => "Versioon",
-"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>." => "Arendatud <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kogukonna</a> poolt. <a href=\"https://github.com/owncloud\" target=\"_blank\">Lähtekood</a> on avaldatud ja kaetud <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> litsentsiga.",
-"More apps" => "Rohkem rakendusi",
-"Add your app" => "Lisa oma rakendus",
-"by" => "lisas",
-"licensed" => "litsenseeritud",
-"Documentation:" => "Dokumentatsioon:",
-"User Documentation" => "Kasutaja dokumentatsioon",
-"Admin Documentation" => "Admin dokumentatsioon",
-"Update to %s" => "Uuenda versioonile %s",
-"Enable only for specific groups" => "Luba ainult kindlad grupid",
-"Uninstall App" => "Eemada rakend",
-"Administrator Documentation" => "Administraatori dokumentatsioon",
-"Online Documentation" => "Online dokumentatsioon",
-"Forum" => "Foorum",
-"Bugtracker" => "Vigade nimekiri",
-"Commercial Support" => "Tasuline kasutajatugi",
-"Get the apps to sync your files" => "Hangi rakendusi failide sünkroniseerimiseks",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Kui tahad projekti toetada\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">liitu arendusega</a>\n\t\tvõi\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levita sõna</a>!",
-"Show First Run Wizard again" => "Näita veelkord Esmase Käivituse Juhendajat",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kasutad <strong>%s</strong> saadavalolevast <strong>%s</strong>",
-"Password" => "Parool",
-"Your password was changed" => "Sinu parooli on muudetud",
-"Unable to change your password" => "Sa ei saa oma parooli muuta",
-"Current password" => "Praegune parool",
-"New password" => "Uus parool",
-"Change password" => "Muuda parooli",
-"Full Name" => "Täispikk nimi",
-"Email" => "E-post",
-"Your email address" => "Sinu e-posti aadress",
-"Fill in an email address to enable password recovery and receive notifications" => "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist.",
-"Profile picture" => "Profiili pilt",
-"Upload new" => "Laadi uus üles",
-"Select new from Files" => "Vali failidest uus",
-"Remove image" => "Eemalda pilt",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Kas png või jpg. Võimalikult ruudukujuline, kuid sul on võimalus seda veel lõigata.",
-"Your avatar is provided by your original account." => "Sinu avatari pakub sinu algne konto.",
-"Cancel" => "Loobu",
-"Choose as profile image" => "Vali profiilipildiks",
-"Language" => "Keel",
-"Help translate" => "Aita tõlkida",
-"Common Name" => "Üldnimetus",
-"Valid until" => "Kehtib kuni",
-"Issued By" => "isas",
-"Valid until %s" => "Kehtib kuni %s",
-"Import Root Certificate" => "Impordi root sertifikaadid",
-"The encryption app is no longer enabled, please decrypt all your files" => "Küpteeringu rakend pole lubatud, dekrüpteeri kõik oma failid",
-"Log-in password" => "Sisselogimise parool",
-"Decrypt all Files" => "Dekrüpteeri kõik failid",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Sinu krüpteerimisvõtmed on tõstetud varukoopiasse. Kui midagi läheb valesti, siis saad võtmed taastada. Kustuta lõplikult ainult juhul kui oled kindel, et failid on dekrüteeritud korrektselt.",
-"Restore Encryption Keys" => "Taasta krüpteerimisvõtmed",
-"Delete Encryption Keys" => "Kustuta krüpteerimisvõtmed",
-"Show storage location" => "Näita salvestusruumi asukohta",
-"Show last log in" => "Viimane sisselogimine",
-"Login Name" => "Kasutajanimi",
-"Create" => "Lisa",
-"Admin Recovery Password" => "Admini parooli taastamine",
-"Enter the recovery password in order to recover the users files during password change" => "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
-"Search Users and Groups" => "Otsi kasutajaid ja gruppe",
-"Add Group" => "Lisa grupp",
-"Group" => "Grupp",
-"Everyone" => "Igaüks",
-"Admins" => "Haldurid",
-"Default Quota" => "Vaikimisi kvoot",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
-"Unlimited" => "Piiramatult",
-"Other" => "Muu",
-"Username" => "Kasutajanimi",
-"Quota" => "Mahupiir",
-"Storage Location" => "Mahu asukoht",
-"Last Login" => "Viimane sisselogimine",
-"change full name" => "Muuda täispikka nime",
-"set new password" => "määra uus parool",
-"Default" => "Vaikeväärtus"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
new file mode 100644
index 00000000000..d64a74f86bf
--- /dev/null
+++ b/settings/l10n/eu.js
@@ -0,0 +1,221 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Gaitua",
+    "Authentication error" : "Autentifikazio errorea",
+    "Your full name has been changed." : "Zure izena aldatu egin da.",
+    "Unable to change full name" : "Ezin izan da izena aldatu",
+    "Group already exists" : "Taldea dagoeneko existitzenda",
+    "Unable to add group" : "Ezin izan da taldea gehitu",
+    "Files decrypted successfully" : "Fitxategiak ongi deskodetu dira.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure fitxategiak deskodetu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Couldn't decrypt your files, check your password and try again" : "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
+    "Encryption keys deleted permanently" : "Enkriptatze gakoak behin betiko ezabatuak",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Couldn't remove app." : "Ezin izan da aplikazioa ezabatu..",
+    "Email saved" : "Eposta gorde da",
+    "Invalid email" : "Baliogabeko eposta",
+    "Unable to delete group" : "Ezin izan da taldea ezabatu",
+    "Unable to delete user" : "Ezin izan da erabiltzailea ezabatu",
+    "Backups restored successfully" : "Babeskopiak ongi leheneratu dira",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak leheneratu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Language changed" : "Hizkuntza aldatuta",
+    "Invalid request" : "Baliogabeko eskaera",
+    "Admins can't remove themself from the admin group" : "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
+    "Unable to add user to group %s" : "Ezin izan da erabiltzailea %s taldera gehitu",
+    "Unable to remove user from group %s" : "Ezin izan da erabiltzailea %s taldetik ezabatu",
+    "Couldn't update app." : "Ezin izan da aplikazioa eguneratu.",
+    "Wrong password" : "Pasahitz okerra",
+    "No user supplied" : "Ez da erabiltzailerik zehaztu",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Mesedez eman berreskuratzeko administrazio  pasahitza, bestela erabiltzaile datu guztiak galduko dira",
+    "Wrong admin recovery password. Please check the password and try again." : "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
+    "Unable to change password" : "Ezin izan da pasahitza aldatu",
+    "Saved" : "Gordeta",
+    "test email settings" : "probatu eposta ezarpenak",
+    "If you received this email, the settings seem to be correct." : "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
+    "Email sent" : "Eposta bidalia",
+    "You need to set your user email before being able to send test emails." : "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
+    "Add trusted domain" : "Gehitu domeinu fidagarria",
+    "Sending..." : "Bidaltzen...",
+    "All" : "Denak",
+    "Please wait...." : "Itxoin mesedez...",
+    "Error while disabling app" : "Erroea izan da aplikazioa desgaitzerakoan",
+    "Disable" : "Ez-gaitu",
+    "Enable" : "Gaitu",
+    "Error while enabling app" : "Erroea izan da aplikazioa gaitzerakoan",
+    "Updating...." : "Eguneratzen...",
+    "Error while updating app" : "Errorea aplikazioa eguneratzen zen bitartean",
+    "Updated" : "Eguneratuta",
+    "Uninstalling ...." : "Desinstalatzen ...",
+    "Error while uninstalling app" : "Erroea izan da aplikazioa desinstalatzerakoan",
+    "Uninstall" : "Desinstalatu",
+    "Select a profile picture" : "Profilaren irudia aukeratu",
+    "Very weak password" : "Pasahitz oso ahula",
+    "Weak password" : "Pasahitz ahula",
+    "So-so password" : "Halamoduzko pasahitza",
+    "Good password" : "Pasahitz ona",
+    "Strong password" : "Pasahitz sendoa",
+    "Delete" : "Ezabatu",
+    "Decrypting files... Please wait, this can take some time." : "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
+    "Delete encryption keys permanently." : "Ezabatu enkriptatze gakoak behin betiko",
+    "Restore encryption keys." : "Leheneratu enkriptatze gakoak",
+    "Groups" : "Taldeak",
+    "Unable to delete {objName}" : "Ezin izan da {objName} ezabatu",
+    "Error creating group" : "Errore bat izan da taldea sortzean",
+    "A valid group name must be provided" : "Baliozko talde izena eman behar da",
+    "deleted {groupName}" : "{groupName} ezbatuta",
+    "undo" : "desegin",
+    "never" : "inoiz",
+    "deleted {userName}" : "{userName} ezabatuta",
+    "add group" : "gehitu taldea",
+    "A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
+    "Error creating user" : "Errore bat egon da erabiltzailea sortzean",
+    "A valid password must be provided" : "Baliozko pasahitza eman behar da",
+    "Warning: Home directory for user \"{user}\" already exists" : "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
+    "__language_name__" : "Euskara",
+    "SSL root certificates" : "SSL erro ziurtagiriak",
+    "Encryption" : "Enkriptazioa",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
+    "Info, warnings, errors and fatal issues" : "Informazioa, abisuak, erroreak eta arazo larriak.",
+    "Warnings, errors and fatal issues" : "Abisuak, erroreak eta arazo larriak",
+    "Errors and fatal issues" : "Erroreak eta arazo larriak",
+    "Fatal issues only" : "Bakarrik arazo larriak",
+    "None" : "Ezer",
+    "Login" : "Saio hasiera",
+    "Plain" : "Arrunta",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Segurtasun abisua",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "%s HTTP bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan.",
+    "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." : "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke.  .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
+    "Setup Warning" : "Konfiguratu abisuak",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
+    "Database Performance Info" : "Database Performance informazioa",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite erabili da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea. Beste datu base batera migratzeko erabili komando-lerro tresna hau:  'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "'fileinfo' modulua falta da",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
+    "Your PHP version is outdated" : "Zure PHP bertsioa zaharkituta dago",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi.",
+    "PHP charset is not set to UTF-8" : "PHP charset ez da UTF-8 gisa ezartzen",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset ez da UTF-8 gisa ezartzen. Honek arazo larriak sor ditzake fitxategien izenetan ascii ez diren karaktereekin. Gomendatzen dizugu php.ini-ko 'default_charset'-en ordez 'UTF-8' ezartzea.",
+    "Locale not working" : "Lokala ez dabil",
+    "System locale can not be set to a one which supports UTF-8." : "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
+    "This means that there might be problems with certain characters in file names." : "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
+    "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
+    "Cron was not executed yet!" : "Cron-a oraindik ez da exekutatu!",
+    "Execute one task with each page loaded" : "Exekutatu zeregin bat orri karga bakoitzean",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
+    "Sharing" : "Partekatzea",
+    "Allow apps to use the Share API" : "Baimendu aplikazioak partekatzeko APIa erabiltzeko",
+    "Allow users to share via link" : "Baimendu erabiltzaileak esteken bidez partekatzea",
+    "Enforce password protection" : "Betearazi pasahitzaren babesa",
+    "Allow public uploads" : "Baimendu igoera publikoak",
+    "Set default expiration date" : "Ezarri muga data lehenetsia",
+    "Expire after " : "Iraungia honen ondoren",
+    "days" : "egun",
+    "Enforce expiration date" : "Muga data betearazi",
+    "Allow resharing" : "Baimendu birpartekatzea",
+    "Restrict users to only share with users in their groups" : "Mugatu partekatzeak taldeko erabiltzaileetara",
+    "Allow users to send mail notification for shared files" : "Baimendu erabiltzaileak epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
+    "Exclude groups from sharing" : "Baztertu taldeak partekatzean",
+    "These groups will still be able to receive shares, but not to initiate them." : "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
+    "Security" : "Segurtasuna",
+    "Enforce HTTPS" : "Behartu HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
+    "Email Server" : "Eposta zerbitzaria",
+    "This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
+    "Send mode" : "Bidaltzeko modua",
+    "From address" : "Helbidetik",
+    "mail" : "posta",
+    "Authentication method" : "Autentifikazio metodoa",
+    "Authentication required" : "Autentikazioa beharrezkoa",
+    "Server address" : "Zerbitzariaren helbidea",
+    "Port" : "Portua",
+    "Credentials" : "Kredentzialak",
+    "SMTP Username" : "SMTP erabiltzaile-izena",
+    "SMTP Password" : "SMTP pasahitza",
+    "Test email settings" : "Probatu eposta ezarpenak",
+    "Send email" : "Bidali eposta",
+    "Log" : "Log",
+    "Log level" : "Erregistro maila",
+    "More" : "Gehiago",
+    "Less" : "Gutxiago",
+    "Version" : "Bertsioa",
+    "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
+    "More apps" : "App gehiago",
+    "by" : " Egilea:",
+    "Documentation:" : "Dokumentazioa:",
+    "User Documentation" : "Erabiltzaile dokumentazioa",
+    "Admin Documentation" : "Administrazio dokumentazioa",
+    "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako",
+    "Uninstall App" : "Desinstalatu aplikazioa",
+    "Administrator Documentation" : "Administratzaile dokumentazioa",
+    "Online Documentation" : "Online dokumentazioa",
+    "Forum" : "Foroa",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Babes komertziala",
+    "Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Proiektua lagundu nahi baduzu\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">join development</a>\n⇥⇥edo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">zabaldu hitza</a>!",
+    "Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
+    "Password" : "Pasahitza",
+    "Your password was changed" : "Zure pasahitza aldatu da",
+    "Unable to change your password" : "Ezin izan da zure pasahitza aldatu",
+    "Current password" : "Uneko pasahitza",
+    "New password" : "Pasahitz berria",
+    "Change password" : "Aldatu pasahitza",
+    "Full Name" : "Izena",
+    "Email" : "E-posta",
+    "Your email address" : "Zure e-posta",
+    "Fill in an email address to enable password recovery and receive notifications" : "Bete ezazu eposta helbide bat pasahitza berreskuratzeko eta jakinarazpenak jasotzeko",
+    "Profile picture" : "Profilaren irudia",
+    "Upload new" : "Igo berria",
+    "Select new from Files" : "Hautatu berria Fitxategietatik",
+    "Remove image" : "Irudia ezabatu",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "png edo jpg. Hobe karratua baina mozteko aukera izango duzu.",
+    "Your avatar is provided by your original account." : "Zure jatorrizko kontuak ezarri du zure avatar.",
+    "Cancel" : "Ezeztatu",
+    "Choose as profile image" : "Profil irudi bezala aukeratu",
+    "Language" : "Hizkuntza",
+    "Help translate" : "Lagundu itzultzen",
+    "Import Root Certificate" : "Inportatu erro ziurtagiria",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
+    "Log-in password" : "Saioa hasteko pasahitza",
+    "Decrypt all Files" : "Desenkripattu fitxategi guztiak",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
+    "Restore Encryption Keys" : "Lehenera itzazu enkriptatze gakoak.",
+    "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
+    "Login Name" : "Sarrera Izena",
+    "Create" : "Sortu",
+    "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
+    "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
+    "Search Users and Groups" : "Bilatu erabiltzaileak eta taldeak",
+    "Add Group" : "Gehitu taldea",
+    "Group" : "Taldea",
+    "Everyone" : "Edonor",
+    "Admins" : "Administratzaileak",
+    "Default Quota" : "Kuota lehentsia",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
+    "Unlimited" : "Mugarik gabe",
+    "Other" : "Bestelakoa",
+    "Username" : "Erabiltzaile izena",
+    "Quota" : "Kuota",
+    "Storage Location" : "Biltegiaren kokapena",
+    "Last Login" : "Azken saio hasiera",
+    "change full name" : "aldatu izena",
+    "set new password" : "ezarri pasahitz berria",
+    "Default" : "Lehenetsia"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
new file mode 100644
index 00000000000..c2ad4ccc5bc
--- /dev/null
+++ b/settings/l10n/eu.json
@@ -0,0 +1,219 @@
+{ "translations": {
+    "Enabled" : "Gaitua",
+    "Authentication error" : "Autentifikazio errorea",
+    "Your full name has been changed." : "Zure izena aldatu egin da.",
+    "Unable to change full name" : "Ezin izan da izena aldatu",
+    "Group already exists" : "Taldea dagoeneko existitzenda",
+    "Unable to add group" : "Ezin izan da taldea gehitu",
+    "Files decrypted successfully" : "Fitxategiak ongi deskodetu dira.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure fitxategiak deskodetu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Couldn't decrypt your files, check your password and try again" : "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
+    "Encryption keys deleted permanently" : "Enkriptatze gakoak behin betiko ezabatuak",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Couldn't remove app." : "Ezin izan da aplikazioa ezabatu..",
+    "Email saved" : "Eposta gorde da",
+    "Invalid email" : "Baliogabeko eposta",
+    "Unable to delete group" : "Ezin izan da taldea ezabatu",
+    "Unable to delete user" : "Ezin izan da erabiltzailea ezabatu",
+    "Backups restored successfully" : "Babeskopiak ongi leheneratu dira",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ezin izan dira zure enkriptatze gakoak leheneratu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
+    "Language changed" : "Hizkuntza aldatuta",
+    "Invalid request" : "Baliogabeko eskaera",
+    "Admins can't remove themself from the admin group" : "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
+    "Unable to add user to group %s" : "Ezin izan da erabiltzailea %s taldera gehitu",
+    "Unable to remove user from group %s" : "Ezin izan da erabiltzailea %s taldetik ezabatu",
+    "Couldn't update app." : "Ezin izan da aplikazioa eguneratu.",
+    "Wrong password" : "Pasahitz okerra",
+    "No user supplied" : "Ez da erabiltzailerik zehaztu",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Mesedez eman berreskuratzeko administrazio  pasahitza, bestela erabiltzaile datu guztiak galduko dira",
+    "Wrong admin recovery password. Please check the password and try again." : "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
+    "Unable to change password" : "Ezin izan da pasahitza aldatu",
+    "Saved" : "Gordeta",
+    "test email settings" : "probatu eposta ezarpenak",
+    "If you received this email, the settings seem to be correct." : "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
+    "Email sent" : "Eposta bidalia",
+    "You need to set your user email before being able to send test emails." : "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
+    "Add trusted domain" : "Gehitu domeinu fidagarria",
+    "Sending..." : "Bidaltzen...",
+    "All" : "Denak",
+    "Please wait...." : "Itxoin mesedez...",
+    "Error while disabling app" : "Erroea izan da aplikazioa desgaitzerakoan",
+    "Disable" : "Ez-gaitu",
+    "Enable" : "Gaitu",
+    "Error while enabling app" : "Erroea izan da aplikazioa gaitzerakoan",
+    "Updating...." : "Eguneratzen...",
+    "Error while updating app" : "Errorea aplikazioa eguneratzen zen bitartean",
+    "Updated" : "Eguneratuta",
+    "Uninstalling ...." : "Desinstalatzen ...",
+    "Error while uninstalling app" : "Erroea izan da aplikazioa desinstalatzerakoan",
+    "Uninstall" : "Desinstalatu",
+    "Select a profile picture" : "Profilaren irudia aukeratu",
+    "Very weak password" : "Pasahitz oso ahula",
+    "Weak password" : "Pasahitz ahula",
+    "So-so password" : "Halamoduzko pasahitza",
+    "Good password" : "Pasahitz ona",
+    "Strong password" : "Pasahitz sendoa",
+    "Delete" : "Ezabatu",
+    "Decrypting files... Please wait, this can take some time." : "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
+    "Delete encryption keys permanently." : "Ezabatu enkriptatze gakoak behin betiko",
+    "Restore encryption keys." : "Leheneratu enkriptatze gakoak",
+    "Groups" : "Taldeak",
+    "Unable to delete {objName}" : "Ezin izan da {objName} ezabatu",
+    "Error creating group" : "Errore bat izan da taldea sortzean",
+    "A valid group name must be provided" : "Baliozko talde izena eman behar da",
+    "deleted {groupName}" : "{groupName} ezbatuta",
+    "undo" : "desegin",
+    "never" : "inoiz",
+    "deleted {userName}" : "{userName} ezabatuta",
+    "add group" : "gehitu taldea",
+    "A valid username must be provided" : "Baliozko erabiltzaile izena eman behar da",
+    "Error creating user" : "Errore bat egon da erabiltzailea sortzean",
+    "A valid password must be provided" : "Baliozko pasahitza eman behar da",
+    "Warning: Home directory for user \"{user}\" already exists" : "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
+    "__language_name__" : "Euskara",
+    "SSL root certificates" : "SSL erro ziurtagiriak",
+    "Encryption" : "Enkriptazioa",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
+    "Info, warnings, errors and fatal issues" : "Informazioa, abisuak, erroreak eta arazo larriak.",
+    "Warnings, errors and fatal issues" : "Abisuak, erroreak eta arazo larriak",
+    "Errors and fatal issues" : "Erroreak eta arazo larriak",
+    "Fatal issues only" : "Bakarrik arazo larriak",
+    "None" : "Ezer",
+    "Login" : "Saio hasiera",
+    "Plain" : "Arrunta",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Segurtasun abisua",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "%s HTTP bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan.",
+    "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." : "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke.  .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
+    "Setup Warning" : "Konfiguratu abisuak",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
+    "Database Performance Info" : "Database Performance informazioa",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite erabili da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea. Beste datu base batera migratzeko erabili komando-lerro tresna hau:  'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "'fileinfo' modulua falta da",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
+    "Your PHP version is outdated" : "Zure PHP bertsioa zaharkituta dago",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi.",
+    "PHP charset is not set to UTF-8" : "PHP charset ez da UTF-8 gisa ezartzen",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset ez da UTF-8 gisa ezartzen. Honek arazo larriak sor ditzake fitxategien izenetan ascii ez diren karaktereekin. Gomendatzen dizugu php.ini-ko 'default_charset'-en ordez 'UTF-8' ezartzea.",
+    "Locale not working" : "Lokala ez dabil",
+    "System locale can not be set to a one which supports UTF-8." : "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
+    "This means that there might be problems with certain characters in file names." : "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
+    "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
+    "Cron was not executed yet!" : "Cron-a oraindik ez da exekutatu!",
+    "Execute one task with each page loaded" : "Exekutatu zeregin bat orri karga bakoitzean",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
+    "Sharing" : "Partekatzea",
+    "Allow apps to use the Share API" : "Baimendu aplikazioak partekatzeko APIa erabiltzeko",
+    "Allow users to share via link" : "Baimendu erabiltzaileak esteken bidez partekatzea",
+    "Enforce password protection" : "Betearazi pasahitzaren babesa",
+    "Allow public uploads" : "Baimendu igoera publikoak",
+    "Set default expiration date" : "Ezarri muga data lehenetsia",
+    "Expire after " : "Iraungia honen ondoren",
+    "days" : "egun",
+    "Enforce expiration date" : "Muga data betearazi",
+    "Allow resharing" : "Baimendu birpartekatzea",
+    "Restrict users to only share with users in their groups" : "Mugatu partekatzeak taldeko erabiltzaileetara",
+    "Allow users to send mail notification for shared files" : "Baimendu erabiltzaileak epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
+    "Exclude groups from sharing" : "Baztertu taldeak partekatzean",
+    "These groups will still be able to receive shares, but not to initiate them." : "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
+    "Security" : "Segurtasuna",
+    "Enforce HTTPS" : "Behartu HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
+    "Email Server" : "Eposta zerbitzaria",
+    "This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
+    "Send mode" : "Bidaltzeko modua",
+    "From address" : "Helbidetik",
+    "mail" : "posta",
+    "Authentication method" : "Autentifikazio metodoa",
+    "Authentication required" : "Autentikazioa beharrezkoa",
+    "Server address" : "Zerbitzariaren helbidea",
+    "Port" : "Portua",
+    "Credentials" : "Kredentzialak",
+    "SMTP Username" : "SMTP erabiltzaile-izena",
+    "SMTP Password" : "SMTP pasahitza",
+    "Test email settings" : "Probatu eposta ezarpenak",
+    "Send email" : "Bidali eposta",
+    "Log" : "Log",
+    "Log level" : "Erregistro maila",
+    "More" : "Gehiago",
+    "Less" : "Gutxiago",
+    "Version" : "Bertsioa",
+    "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
+    "More apps" : "App gehiago",
+    "by" : " Egilea:",
+    "Documentation:" : "Dokumentazioa:",
+    "User Documentation" : "Erabiltzaile dokumentazioa",
+    "Admin Documentation" : "Administrazio dokumentazioa",
+    "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako",
+    "Uninstall App" : "Desinstalatu aplikazioa",
+    "Administrator Documentation" : "Administratzaile dokumentazioa",
+    "Online Documentation" : "Online dokumentazioa",
+    "Forum" : "Foroa",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Babes komertziala",
+    "Get the apps to sync your files" : "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Proiektua lagundu nahi baduzu\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">join development</a>\n⇥⇥edo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">zabaldu hitza</a>!",
+    "Show First Run Wizard again" : "Erakutsi berriz Lehenengo Aldiko Morroia",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
+    "Password" : "Pasahitza",
+    "Your password was changed" : "Zure pasahitza aldatu da",
+    "Unable to change your password" : "Ezin izan da zure pasahitza aldatu",
+    "Current password" : "Uneko pasahitza",
+    "New password" : "Pasahitz berria",
+    "Change password" : "Aldatu pasahitza",
+    "Full Name" : "Izena",
+    "Email" : "E-posta",
+    "Your email address" : "Zure e-posta",
+    "Fill in an email address to enable password recovery and receive notifications" : "Bete ezazu eposta helbide bat pasahitza berreskuratzeko eta jakinarazpenak jasotzeko",
+    "Profile picture" : "Profilaren irudia",
+    "Upload new" : "Igo berria",
+    "Select new from Files" : "Hautatu berria Fitxategietatik",
+    "Remove image" : "Irudia ezabatu",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "png edo jpg. Hobe karratua baina mozteko aukera izango duzu.",
+    "Your avatar is provided by your original account." : "Zure jatorrizko kontuak ezarri du zure avatar.",
+    "Cancel" : "Ezeztatu",
+    "Choose as profile image" : "Profil irudi bezala aukeratu",
+    "Language" : "Hizkuntza",
+    "Help translate" : "Lagundu itzultzen",
+    "Import Root Certificate" : "Inportatu erro ziurtagiria",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
+    "Log-in password" : "Saioa hasteko pasahitza",
+    "Decrypt all Files" : "Desenkripattu fitxategi guztiak",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
+    "Restore Encryption Keys" : "Lehenera itzazu enkriptatze gakoak.",
+    "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
+    "Login Name" : "Sarrera Izena",
+    "Create" : "Sortu",
+    "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
+    "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
+    "Search Users and Groups" : "Bilatu erabiltzaileak eta taldeak",
+    "Add Group" : "Gehitu taldea",
+    "Group" : "Taldea",
+    "Everyone" : "Edonor",
+    "Admins" : "Administratzaileak",
+    "Default Quota" : "Kuota lehentsia",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
+    "Unlimited" : "Mugarik gabe",
+    "Other" : "Bestelakoa",
+    "Username" : "Erabiltzaile izena",
+    "Quota" : "Kuota",
+    "Storage Location" : "Biltegiaren kokapena",
+    "Last Login" : "Azken saio hasiera",
+    "change full name" : "aldatu izena",
+    "set new password" : "ezarri pasahitz berria",
+    "Default" : "Lehenetsia"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
deleted file mode 100644
index 2818e94db4e..00000000000
--- a/settings/l10n/eu.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Autentifikazio errorea",
-"Your full name has been changed." => "Zure izena aldatu egin da.",
-"Unable to change full name" => "Ezin izan da izena aldatu",
-"Group already exists" => "Taldea dagoeneko existitzenda",
-"Unable to add group" => "Ezin izan da taldea gehitu",
-"Files decrypted successfully" => "Fitxategiak ongi deskodetu dira.",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ezin izan dira zure fitxategiak deskodetu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
-"Couldn't decrypt your files, check your password and try again" => "Ezin izan dira deskodetu zure fitxategiak, egiaztatu zure pasahitza eta saiatu berriz",
-"Encryption keys deleted permanently" => "Enkriptatze gakoak behin betiko ezabatuak",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ezin izan dira zure enkriptatze gakoak behin betiko ezabatu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
-"Couldn't remove app." => "Ezin izan da aplikazioa ezabatu..",
-"Email saved" => "Eposta gorde da",
-"Invalid email" => "Baliogabeko eposta",
-"Unable to delete group" => "Ezin izan da taldea ezabatu",
-"Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
-"Backups restored successfully" => "Babeskopiak ongi leheneratu dira",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Ezin izan dira zure enkriptatze gakoak leheneratu, egiaztatu zure owncloud.log edo galdetu administratzaileari",
-"Language changed" => "Hizkuntza aldatuta",
-"Invalid request" => "Baliogabeko eskaera",
-"Admins can't remove themself from the admin group" => "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
-"Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
-"Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
-"Couldn't update app." => "Ezin izan da aplikazioa eguneratu.",
-"Wrong password" => "Pasahitz okerra",
-"No user supplied" => "Ez da erabiltzailerik zehaztu",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Mesedez eman berreskuratzeko administrazio  pasahitza, bestela erabiltzaile datu guztiak galduko dira",
-"Wrong admin recovery password. Please check the password and try again." => "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
-"Unable to change password" => "Ezin izan da pasahitza aldatu",
-"Enabled" => "Gaitua",
-"Recommended" => "Aholkatuta",
-"Saved" => "Gordeta",
-"test email settings" => "probatu eposta ezarpenak",
-"If you received this email, the settings seem to be correct." => "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
-"A problem occurred while sending the email. Please revise your settings." => "Arazo bat gertatu da eposta bidaltzean. Berrikusi zure ezarpenak.",
-"Email sent" => "Eposta bidalia",
-"You need to set your user email before being able to send test emails." => "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
-"Add trusted domain" => "Gehitu domeinu fidagarria",
-"Sending..." => "Bidaltzen...",
-"All" => "Denak",
-"Please wait...." => "Itxoin mesedez...",
-"Error while disabling app" => "Erroea izan da aplikazioa desgaitzerakoan",
-"Disable" => "Ez-gaitu",
-"Enable" => "Gaitu",
-"Error while enabling app" => "Erroea izan da aplikazioa gaitzerakoan",
-"Updating...." => "Eguneratzen...",
-"Error while updating app" => "Errorea aplikazioa eguneratzen zen bitartean",
-"Updated" => "Eguneratuta",
-"Uninstalling ...." => "Desinstalatzen ...",
-"Error while uninstalling app" => "Erroea izan da aplikazioa desinstalatzerakoan",
-"Uninstall" => "Desinstalatu",
-"Select a profile picture" => "Profilaren irudia aukeratu",
-"Very weak password" => "Pasahitz oso ahula",
-"Weak password" => "Pasahitz ahula",
-"So-so password" => "Halamoduzko pasahitza",
-"Good password" => "Pasahitz ona",
-"Strong password" => "Pasahitz sendoa",
-"Valid until {date}" => "{date} arte baliogarria",
-"Delete" => "Ezabatu",
-"Decrypting files... Please wait, this can take some time." => "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
-"Delete encryption keys permanently." => "Ezabatu enkriptatze gakoak behin betiko",
-"Restore encryption keys." => "Leheneratu enkriptatze gakoak",
-"Groups" => "Taldeak",
-"Unable to delete {objName}" => "Ezin izan da {objName} ezabatu",
-"Error creating group" => "Errore bat izan da taldea sortzean",
-"A valid group name must be provided" => "Baliozko talde izena eman behar da",
-"deleted {groupName}" => "{groupName} ezbatuta",
-"undo" => "desegin",
-"no group" => "talderik ez",
-"never" => "inoiz",
-"deleted {userName}" => "{userName} ezabatuta",
-"add group" => "gehitu taldea",
-"A valid username must be provided" => "Baliozko erabiltzaile izena eman behar da",
-"Error creating user" => "Errore bat egon da erabiltzailea sortzean",
-"A valid password must be provided" => "Baliozko pasahitza eman behar da",
-"Warning: Home directory for user \"{user}\" already exists" => "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
-"__language_name__" => "Euskara",
-"Personal Info" => "Informazio Pertsonala",
-"SSL root certificates" => "SSL erro ziurtagiriak",
-"Encryption" => "Enkriptazioa",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
-"Info, warnings, errors and fatal issues" => "Informazioa, abisuak, erroreak eta arazo larriak.",
-"Warnings, errors and fatal issues" => "Abisuak, erroreak eta arazo larriak",
-"Errors and fatal issues" => "Erroreak eta arazo larriak",
-"Fatal issues only" => "Bakarrik arazo larriak",
-"None" => "Ezer",
-"Login" => "Saio hasiera",
-"Plain" => "Arrunta",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Segurtasun abisua",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s HTTP bidez erabiltzen ari zara. Aholkatzen dizugu zure zerbitzaria HTTPS erabil dezan.",
-"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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke.  .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
-"Setup Warning" => "Konfiguratu abisuak",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Badirudi PHP konfiguratuta dagoela lineako dokumentu blokeak aldatzeko. Honek zenbait oinarrizko aplikazio eskuraezin bihurtuko ditu.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Hau ziur aski cache/accelerator batek eragin du, hala nola Zend OPcache edo eAccelerator.",
-"Database Performance Info" => "Database Performance informazioa",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite erabili da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea. Beste datu base batera migratzeko erabili komando-lerro tresna hau:  'occ db:convert-type'",
-"Module 'fileinfo' missing" => "'fileinfo' modulua falta da",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 'fileinfo' modulua falta da. Modulu hau gaitzea aholkatzen dizugu mime-type ezberdinak hobe detektatzeko.",
-"Your PHP version is outdated" => "Zure PHP bertsioa zaharkituta dago",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Zure PHP bertsioa zaharkituta dago. Gure aholkua 5.3.8 edo bertsio berriago batera eguneratzea da, bertsio zaharragoak arazoak ematen baitituzte. Posible da instalazio honek ez funtzionatzea ongi.",
-"PHP charset is not set to UTF-8" => "PHP charset ez da UTF-8 gisa ezartzen",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset ez da UTF-8 gisa ezartzen. Honek arazo larriak sor ditzake fitxategien izenetan ascii ez diren karaktereekin. Gomendatzen dizugu php.ini-ko 'default_charset'-en ordez 'UTF-8' ezartzea.",
-"Locale not working" => "Lokala ez dabil",
-"System locale can not be set to a one which supports UTF-8." => "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
-"This means that there might be problems with certain characters in file names." => "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
-"URL generation in notification emails" => "URL sorrera jakinarazpen mezuetan",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
-"Connectivity checks" => "Konexio egiaztapenak",
-"No problems found" => "Ez da problemarik aurkitu",
-"Please double check the <a href='%s'>installation guides</a>." => "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Azken cron-a  %s-etan exekutatu da",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
-"Cron was not executed yet!" => "Cron-a oraindik ez da exekutatu!",
-"Execute one task with each page loaded" => "Exekutatu zeregin bat orri karga bakoitzean",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
-"Sharing" => "Partekatzea",
-"Allow apps to use the Share API" => "Baimendu aplikazioak partekatzeko APIa erabiltzeko",
-"Allow users to share via link" => "Baimendu erabiltzaileak esteken bidez partekatzea",
-"Enforce password protection" => "Betearazi pasahitzaren babesa",
-"Allow public uploads" => "Baimendu igoera publikoak",
-"Set default expiration date" => "Ezarri muga data lehenetsia",
-"Expire after " => "Iraungia honen ondoren",
-"days" => "egun",
-"Enforce expiration date" => "Muga data betearazi",
-"Allow resharing" => "Baimendu birpartekatzea",
-"Restrict users to only share with users in their groups" => "Mugatu partekatzeak taldeko erabiltzaileetara",
-"Allow users to send mail notification for shared files" => "Baimendu erabiltzaileak epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
-"Exclude groups from sharing" => "Baztertu taldeak partekatzean",
-"These groups will still be able to receive shares, but not to initiate them." => "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
-"Security" => "Segurtasuna",
-"Enforce HTTPS" => "Behartu HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
-"Email Server" => "Eposta zerbitzaria",
-"This is used for sending out notifications." => "Hau jakinarazpenak bidaltzeko erabiltzen da.",
-"Send mode" => "Bidaltzeko modua",
-"From address" => "Helbidetik",
-"mail" => "posta",
-"Authentication method" => "Autentifikazio metodoa",
-"Authentication required" => "Autentikazioa beharrezkoa",
-"Server address" => "Zerbitzariaren helbidea",
-"Port" => "Portua",
-"Credentials" => "Kredentzialak",
-"SMTP Username" => "SMTP erabiltzaile-izena",
-"SMTP Password" => "SMTP pasahitza",
-"Store credentials" => "Gorde kredentzialak",
-"Test email settings" => "Probatu eposta ezarpenak",
-"Send email" => "Bidali eposta",
-"Log" => "Log",
-"Log level" => "Erregistro maila",
-"More" => "Gehiago",
-"Less" => "Gutxiago",
-"Version" => "Bertsioa",
-"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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
-"More apps" => "App gehiago",
-"Add your app" => "Gehitu zure aplikazioa",
-"by" => " Egilea:",
-"Documentation:" => "Dokumentazioa:",
-"User Documentation" => "Erabiltzaile dokumentazioa",
-"Admin Documentation" => "Administrazio dokumentazioa",
-"Update to %s" => "Eguneratu %sra",
-"Enable only for specific groups" => "Baimendu bakarri talde espezifikoetarako",
-"Uninstall App" => "Desinstalatu aplikazioa",
-"Administrator Documentation" => "Administratzaile dokumentazioa",
-"Online Documentation" => "Online dokumentazioa",
-"Forum" => "Foroa",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Babes komertziala",
-"Get the apps to sync your files" => "Lortu aplikazioak zure fitxategiak sinkronizatzeko",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Proiektua lagundu nahi baduzu\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">join development</a>\n⇥⇥edo\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">zabaldu hitza</a>!",
-"Show First Run Wizard again" => "Erakutsi berriz Lehenengo Aldiko Morroia",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Dagoeneko <strong>%s</strong> erabili duzu eskuragarri duzun <strong>%s</strong>etatik",
-"Password" => "Pasahitza",
-"Your password was changed" => "Zure pasahitza aldatu da",
-"Unable to change your password" => "Ezin izan da zure pasahitza aldatu",
-"Current password" => "Uneko pasahitza",
-"New password" => "Pasahitz berria",
-"Change password" => "Aldatu pasahitza",
-"Full Name" => "Izena",
-"Email" => "E-posta",
-"Your email address" => "Zure e-posta",
-"Fill in an email address to enable password recovery and receive notifications" => "Bete ezazu eposta helbide bat pasahitza berreskuratzeko eta jakinarazpenak jasotzeko",
-"Profile picture" => "Profilaren irudia",
-"Upload new" => "Igo berria",
-"Select new from Files" => "Hautatu berria Fitxategietatik",
-"Remove image" => "Irudia ezabatu",
-"Either png or jpg. Ideally square but you will be able to crop it." => "png edo jpg. Hobe karratua baina mozteko aukera izango duzu.",
-"Your avatar is provided by your original account." => "Zure jatorrizko kontuak ezarri du zure avatar.",
-"Cancel" => "Ezeztatu",
-"Choose as profile image" => "Profil irudi bezala aukeratu",
-"Language" => "Hizkuntza",
-"Help translate" => "Lagundu itzultzen",
-"Issued By" => "Honek bidalita",
-"Import Root Certificate" => "Inportatu erro ziurtagiria",
-"The encryption app is no longer enabled, please decrypt all your files" => "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
-"Log-in password" => "Saioa hasteko pasahitza",
-"Decrypt all Files" => "Desenkripattu fitxategi guztiak",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
-"Restore Encryption Keys" => "Lehenera itzazu enkriptatze gakoak.",
-"Delete Encryption Keys" => "Ezabatu enkriptatze gakoak",
-"Show storage location" => "Erakutsi biltegiaren kokapena",
-"Show last log in" => "Erakutsi azkeneko saio hasiera",
-"Login Name" => "Sarrera Izena",
-"Create" => "Sortu",
-"Admin Recovery Password" => "Administratzailearen pasahitza berreskuratzea",
-"Enter the recovery password in order to recover the users files during password change" => "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
-"Search Users and Groups" => "Bilatu erabiltzaileak eta taldeak",
-"Add Group" => "Gehitu taldea",
-"Group" => "Taldea",
-"Everyone" => "Edonor",
-"Admins" => "Administratzaileak",
-"Default Quota" => "Kuota lehentsia",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
-"Unlimited" => "Mugarik gabe",
-"Other" => "Bestelakoa",
-"Username" => "Erabiltzaile izena",
-"Quota" => "Kuota",
-"Storage Location" => "Biltegiaren kokapena",
-"Last Login" => "Azken saio hasiera",
-"change full name" => "aldatu izena",
-"set new password" => "ezarri pasahitz berria",
-"Default" => "Lehenetsia"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/eu_ES.js b/settings/l10n/eu_ES.js
new file mode 100644
index 00000000000..b5685139534
--- /dev/null
+++ b/settings/l10n/eu_ES.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..062f410b0e9
--- /dev/null
+++ b/settings/l10n/eu_ES.json
@@ -0,0 +1,7 @@
+{ "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/eu_ES.php b/settings/l10n/eu_ES.php
deleted file mode 100644
index 280c7f05c0c..00000000000
--- a/settings/l10n/eu_ES.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "Eskakizun baliogabea",
-"Delete" => "Ezabatu",
-"Cancel" => "Ezeztatu",
-"Other" => "Bestea"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
new file mode 100644
index 00000000000..47b3e0e5307
--- /dev/null
+++ b/settings/l10n/fa.js
@@ -0,0 +1,190 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "فعال شده",
+    "Authentication error" : "خطا در اعتبار سنجی",
+    "Your full name has been changed." : "نام کامل شما تغییر یافت",
+    "Unable to change full name" : "امکان تغییر نام کامل وجود ندارد",
+    "Group already exists" : "این گروه در حال حاضر موجود است",
+    "Unable to add group" : "افزودن گروه امکان پذیر نیست",
+    "Files decrypted successfully" : "فایل ها با موفقیت رمزگشایی شدند.",
+    "Encryption keys deleted permanently" : "کلیدهای رمزگذاری به طور کامل حذف شدند",
+    "Couldn't remove app." : "امکان حذف برنامه وجود ندارد.",
+    "Email saved" : "ایمیل ذخیره شد",
+    "Invalid email" : "ایمیل غیر قابل قبول",
+    "Unable to delete group" : "حذف گروه امکان پذیر نیست",
+    "Unable to delete user" : "حذف کاربر امکان پذیر نیست",
+    "Backups restored successfully" : "پشتیبان ها با موفقیت بازیابی شدند",
+    "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." : "برنامه را نمی توان به هنگام ساخت.",
+    "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." : "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.",
+    "Unable to change password" : "نمی‌توان رمز را تغییر داد",
+    "Saved" : "ذخیره شد",
+    "test email settings" : "تنظیمات ایمیل آزمایشی",
+    "Email sent" : "ایمیل ارسال شد",
+    "Sending..." : "در حال ارسال...",
+    "All" : "همه",
+    "Please wait...." : "لطفا صبر کنید ...",
+    "Error while disabling app" : "خطا در هنگام غیر فعال سازی برنامه",
+    "Disable" : "غیرفعال",
+    "Enable" : "فعال",
+    "Error while enabling app" : "خطا در هنگام فعال سازی برنامه",
+    "Updating...." : "در حال بروز رسانی...",
+    "Error while updating app" : "خطا در هنگام بهنگام سازی برنامه",
+    "Updated" : "بروز رسانی انجام شد",
+    "Uninstalling ...." : "در حال حذف...",
+    "Error while uninstalling app" : "خطا در هنگام حذف برنامه....",
+    "Uninstall" : "حذف",
+    "Select a profile picture" : "انتخاب تصویر پروفایل",
+    "Very weak password" : "رمز عبور بسیار ضعیف",
+    "Weak password" : "رمز عبور ضعیف",
+    "So-so password" : "رمز عبور متوسط",
+    "Good password" : "رمز عبور خوب",
+    "Strong password" : "رمز عبور قوی",
+    "Delete" : "حذف",
+    "Decrypting files... Please wait, this can take some time." : "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
+    "Delete encryption keys permanently." : "کلید های رمزگذاری به طوز کامل حذف شوند.",
+    "Restore encryption keys." : "بازیابی کلیدهای  رمزگذاری.",
+    "Groups" : "گروه ها",
+    "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد",
+    "Error creating group" : "خطا در هنگام ایجاد کروه",
+    "A valid group name must be provided" : "نام کاربری معتبر می بایست وارد شود",
+    "deleted {groupName}" : "گروه {groupName} حذف شد",
+    "undo" : "بازگشت",
+    "never" : "هرگز",
+    "deleted {userName}" : "کاربر {userName} حذف شد",
+    "add group" : "افزودن گروه",
+    "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
+    "Error creating user" : "خطا در ایجاد کاربر",
+    "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
+    "Warning: Home directory for user \"{user}\" already exists" : "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "گواهی های اصلی SSL ",
+    "Encryption" : "رمزگذاری",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)",
+    "Info, warnings, errors and fatal issues" : "اطلاعات، اخطارها، خطاها، مشکلات اساسی",
+    "Warnings, errors and fatal issues" : "اخطارها، خطاها، مشکلات مهلک",
+    "Errors and fatal issues" : "خطاها و مشکلات اساسی",
+    "Fatal issues only" : "فقط مشکلات اساسی",
+    "None" : "هیچ‌کدام",
+    "Login" : "ورود",
+    "Plain" : "ساده",
+    "NT LAN Manager" : "مدیر NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "اخطار امنیتی",
+    "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." : "به احتمال زیاد پوشه‌ی data و فایل‌های شما از طریق اینترنت قابل دسترسی هستند. فایل .htaccess برنامه کار نمی‌کند. ما شدیداً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که پوشه‌ی data شما غیر قابل دسترسی باشد یا اینکه پوشه‌‎ی data را به خارج از ریشه‌ی اصلی وب سرور انتقال دهید.",
+    "Setup Warning" : "هشدار راه اندازی",
+    "Database Performance Info" : "اطلاعات کارایی پایگاه داده",
+    "Module 'fileinfo' missing" : "ماژول 'fileinfo' از کار افتاده",
+    "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 دریافت کنید.",
+    "Your PHP version is outdated" : "نسخه PHP شما قدیمی است",
+    "Locale not working" : "زبان محلی کار نمی کند.",
+    "Please double check the <a href='%s'>installation guides</a>." : "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
+    "Cron" : "زمانبند",
+    "Last cron was executed at %s." : "کران قبلی در %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 ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
+    "Sharing" : "اشتراک گذاری",
+    "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
+    "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
+    "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
+    "Allow public uploads" : "اجازه بارگذاری عمومی",
+    "Set default expiration date" : "اعمال تاریخ اتمام پیش فرض",
+    "Expire after " : "اتمام اعتبار بعد از",
+    "days" : "روز",
+    "Enforce expiration date" : "اعمال تاریخ اتمام اشتراک گذاری",
+    "Allow resharing" : "مجوز اشتراک گذاری مجدد",
+    "Exclude groups from sharing" : "مستثنی شدن گروه ها از اشتراک گذاری",
+    "Security" : "امنیت",
+    "Enforce HTTPS" : "وادار کردن HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید.",
+    "Email Server" : "سرور ایمیل",
+    "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
+    "Send mode" : "حالت ارسال",
+    "From address" : "آدرس فرستنده",
+    "mail" : "ایمیل",
+    "Authentication method" : "روش احراز هویت",
+    "Authentication required" : "احراز هویت مورد نیاز است",
+    "Server address" : "آدرس سرور",
+    "Port" : "درگاه",
+    "Credentials" : "اعتبارهای",
+    "SMTP Username" : "نام کاربری SMTP",
+    "SMTP Password" : "رمز عبور SMTP",
+    "Test email settings" : "تنظیمات ایمیل آزمایشی",
+    "Send email" : "ارسال ایمیل",
+    "Log" : "کارنامه",
+    "Log level" : "سطح ورود",
+    "More" : "بیش‌تر",
+    "Less" : "کم‌تر",
+    "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>." : "توسعه یافته به وسیله ی  <a href=\"http://ownCloud.org/contact\" target=\"_blank\">انجمن ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">کد اصلی</a> مجاز زیر گواهی <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "با",
+    "Documentation:" : "مستند سازی:",
+    "User Documentation" : "مستندات کاربر",
+    "Admin Documentation" : "مستند سازی مدیر",
+    "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
+    "Uninstall App" : "حذف برنامه",
+    "Administrator Documentation" : "مستندات مدیر",
+    "Online Documentation" : "مستندات آنلاین",
+    "Forum" : "انجمن",
+    "Bugtracker" : "ردیاب باگ ",
+    "Commercial Support" : "پشتیبانی تجاری",
+    "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
+    "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
+    "Password" : "گذرواژه",
+    "Your password was changed" : "رمز عبور شما تغییر یافت",
+    "Unable to change your password" : "ناتوان در تغییر گذرواژه",
+    "Current password" : "گذرواژه کنونی",
+    "New password" : "گذرواژه جدید",
+    "Change password" : "تغییر گذر واژه",
+    "Full Name" : "نام کامل",
+    "Email" : "ایمیل",
+    "Your email address" : "پست الکترونیکی شما",
+    "Profile picture" : "تصویر پروفایل",
+    "Upload new" : "بارگذاری جدید",
+    "Select new from Files" : "انتخاب جدید از میان فایل ها",
+    "Remove image" : "تصویر پاک شود",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "هردوی jpg و png ها مربع گونه می‌باشند. با این حال شما می‌توانید آنها را برش بزنید.",
+    "Cancel" : "منصرف شدن",
+    "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
+    "Language" : "زبان",
+    "Help translate" : "به ترجمه آن کمک کنید",
+    "Import Root Certificate" : "وارد کردن گواهی اصلی",
+    "Log-in password" : "رمز ورود",
+    "Decrypt all Files" : "تمام فایلها رمزگشایی شود",
+    "Restore Encryption Keys" : "بازیابی کلید های رمزگذاری",
+    "Delete Encryption Keys" : "حذف کلید های رمزگذاری",
+    "Login Name" : "نام کاربری",
+    "Create" : "ایجاد کردن",
+    "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
+    "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
+    "Search Users and Groups" : "جستجوی کاربران و گروه ها",
+    "Add Group" : "افزودن گروه",
+    "Group" : "گروه",
+    "Everyone" : "همه",
+    "Admins" : "مدیران",
+    "Default Quota" : "سهم پیش فرض",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "لطفا سهمیه ذخیره سازی را وارد کنید (به عنوان مثال: \" 512MB\" یا \"12GB\")",
+    "Unlimited" : "نامحدود",
+    "Other" : "دیگر",
+    "Username" : "نام کاربری",
+    "Quota" : "سهم",
+    "Storage Location" : "محل فضای ذخیره سازی",
+    "Last Login" : "اخرین ورود",
+    "change full name" : "تغییر نام کامل",
+    "set new password" : "تنظیم کلمه عبور جدید",
+    "Default" : "پیش فرض"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
new file mode 100644
index 00000000000..8d6c98b7c01
--- /dev/null
+++ b/settings/l10n/fa.json
@@ -0,0 +1,188 @@
+{ "translations": {
+    "Enabled" : "فعال شده",
+    "Authentication error" : "خطا در اعتبار سنجی",
+    "Your full name has been changed." : "نام کامل شما تغییر یافت",
+    "Unable to change full name" : "امکان تغییر نام کامل وجود ندارد",
+    "Group already exists" : "این گروه در حال حاضر موجود است",
+    "Unable to add group" : "افزودن گروه امکان پذیر نیست",
+    "Files decrypted successfully" : "فایل ها با موفقیت رمزگشایی شدند.",
+    "Encryption keys deleted permanently" : "کلیدهای رمزگذاری به طور کامل حذف شدند",
+    "Couldn't remove app." : "امکان حذف برنامه وجود ندارد.",
+    "Email saved" : "ایمیل ذخیره شد",
+    "Invalid email" : "ایمیل غیر قابل قبول",
+    "Unable to delete group" : "حذف گروه امکان پذیر نیست",
+    "Unable to delete user" : "حذف کاربر امکان پذیر نیست",
+    "Backups restored successfully" : "پشتیبان ها با موفقیت بازیابی شدند",
+    "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." : "برنامه را نمی توان به هنگام ساخت.",
+    "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." : "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.",
+    "Unable to change password" : "نمی‌توان رمز را تغییر داد",
+    "Saved" : "ذخیره شد",
+    "test email settings" : "تنظیمات ایمیل آزمایشی",
+    "Email sent" : "ایمیل ارسال شد",
+    "Sending..." : "در حال ارسال...",
+    "All" : "همه",
+    "Please wait...." : "لطفا صبر کنید ...",
+    "Error while disabling app" : "خطا در هنگام غیر فعال سازی برنامه",
+    "Disable" : "غیرفعال",
+    "Enable" : "فعال",
+    "Error while enabling app" : "خطا در هنگام فعال سازی برنامه",
+    "Updating...." : "در حال بروز رسانی...",
+    "Error while updating app" : "خطا در هنگام بهنگام سازی برنامه",
+    "Updated" : "بروز رسانی انجام شد",
+    "Uninstalling ...." : "در حال حذف...",
+    "Error while uninstalling app" : "خطا در هنگام حذف برنامه....",
+    "Uninstall" : "حذف",
+    "Select a profile picture" : "انتخاب تصویر پروفایل",
+    "Very weak password" : "رمز عبور بسیار ضعیف",
+    "Weak password" : "رمز عبور ضعیف",
+    "So-so password" : "رمز عبور متوسط",
+    "Good password" : "رمز عبور خوب",
+    "Strong password" : "رمز عبور قوی",
+    "Delete" : "حذف",
+    "Decrypting files... Please wait, this can take some time." : "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
+    "Delete encryption keys permanently." : "کلید های رمزگذاری به طوز کامل حذف شوند.",
+    "Restore encryption keys." : "بازیابی کلیدهای  رمزگذاری.",
+    "Groups" : "گروه ها",
+    "Unable to delete {objName}" : "امکان حذف {objName} وجود ندارد",
+    "Error creating group" : "خطا در هنگام ایجاد کروه",
+    "A valid group name must be provided" : "نام کاربری معتبر می بایست وارد شود",
+    "deleted {groupName}" : "گروه {groupName} حذف شد",
+    "undo" : "بازگشت",
+    "never" : "هرگز",
+    "deleted {userName}" : "کاربر {userName} حذف شد",
+    "add group" : "افزودن گروه",
+    "A valid username must be provided" : "نام کاربری صحیح باید وارد شود",
+    "Error creating user" : "خطا در ایجاد کاربر",
+    "A valid password must be provided" : "رمز عبور صحیح باید وارد شود",
+    "Warning: Home directory for user \"{user}\" already exists" : "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "گواهی های اصلی SSL ",
+    "Encryption" : "رمزگذاری",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)",
+    "Info, warnings, errors and fatal issues" : "اطلاعات، اخطارها، خطاها، مشکلات اساسی",
+    "Warnings, errors and fatal issues" : "اخطارها، خطاها، مشکلات مهلک",
+    "Errors and fatal issues" : "خطاها و مشکلات اساسی",
+    "Fatal issues only" : "فقط مشکلات اساسی",
+    "None" : "هیچ‌کدام",
+    "Login" : "ورود",
+    "Plain" : "ساده",
+    "NT LAN Manager" : "مدیر NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "اخطار امنیتی",
+    "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." : "به احتمال زیاد پوشه‌ی data و فایل‌های شما از طریق اینترنت قابل دسترسی هستند. فایل .htaccess برنامه کار نمی‌کند. ما شدیداً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که پوشه‌ی data شما غیر قابل دسترسی باشد یا اینکه پوشه‌‎ی data را به خارج از ریشه‌ی اصلی وب سرور انتقال دهید.",
+    "Setup Warning" : "هشدار راه اندازی",
+    "Database Performance Info" : "اطلاعات کارایی پایگاه داده",
+    "Module 'fileinfo' missing" : "ماژول 'fileinfo' از کار افتاده",
+    "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 دریافت کنید.",
+    "Your PHP version is outdated" : "نسخه PHP شما قدیمی است",
+    "Locale not working" : "زبان محلی کار نمی کند.",
+    "Please double check the <a href='%s'>installation guides</a>." : "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
+    "Cron" : "زمانبند",
+    "Last cron was executed at %s." : "کران قبلی در %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 ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
+    "Sharing" : "اشتراک گذاری",
+    "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
+    "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
+    "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
+    "Allow public uploads" : "اجازه بارگذاری عمومی",
+    "Set default expiration date" : "اعمال تاریخ اتمام پیش فرض",
+    "Expire after " : "اتمام اعتبار بعد از",
+    "days" : "روز",
+    "Enforce expiration date" : "اعمال تاریخ اتمام اشتراک گذاری",
+    "Allow resharing" : "مجوز اشتراک گذاری مجدد",
+    "Exclude groups from sharing" : "مستثنی شدن گروه ها از اشتراک گذاری",
+    "Security" : "امنیت",
+    "Enforce HTTPS" : "وادار کردن HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید.",
+    "Email Server" : "سرور ایمیل",
+    "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
+    "Send mode" : "حالت ارسال",
+    "From address" : "آدرس فرستنده",
+    "mail" : "ایمیل",
+    "Authentication method" : "روش احراز هویت",
+    "Authentication required" : "احراز هویت مورد نیاز است",
+    "Server address" : "آدرس سرور",
+    "Port" : "درگاه",
+    "Credentials" : "اعتبارهای",
+    "SMTP Username" : "نام کاربری SMTP",
+    "SMTP Password" : "رمز عبور SMTP",
+    "Test email settings" : "تنظیمات ایمیل آزمایشی",
+    "Send email" : "ارسال ایمیل",
+    "Log" : "کارنامه",
+    "Log level" : "سطح ورود",
+    "More" : "بیش‌تر",
+    "Less" : "کم‌تر",
+    "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>." : "توسعه یافته به وسیله ی  <a href=\"http://ownCloud.org/contact\" target=\"_blank\">انجمن ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">کد اصلی</a> مجاز زیر گواهی <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "با",
+    "Documentation:" : "مستند سازی:",
+    "User Documentation" : "مستندات کاربر",
+    "Admin Documentation" : "مستند سازی مدیر",
+    "Enable only for specific groups" : "فعال سازی تنها برای گروه های خاص",
+    "Uninstall App" : "حذف برنامه",
+    "Administrator Documentation" : "مستندات مدیر",
+    "Online Documentation" : "مستندات آنلاین",
+    "Forum" : "انجمن",
+    "Bugtracker" : "ردیاب باگ ",
+    "Commercial Support" : "پشتیبانی تجاری",
+    "Get the apps to sync your files" : "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
+    "Show First Run Wizard again" : "راهبری کمکی اجرای اول را دوباره نمایش بده",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
+    "Password" : "گذرواژه",
+    "Your password was changed" : "رمز عبور شما تغییر یافت",
+    "Unable to change your password" : "ناتوان در تغییر گذرواژه",
+    "Current password" : "گذرواژه کنونی",
+    "New password" : "گذرواژه جدید",
+    "Change password" : "تغییر گذر واژه",
+    "Full Name" : "نام کامل",
+    "Email" : "ایمیل",
+    "Your email address" : "پست الکترونیکی شما",
+    "Profile picture" : "تصویر پروفایل",
+    "Upload new" : "بارگذاری جدید",
+    "Select new from Files" : "انتخاب جدید از میان فایل ها",
+    "Remove image" : "تصویر پاک شود",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "هردوی jpg و png ها مربع گونه می‌باشند. با این حال شما می‌توانید آنها را برش بزنید.",
+    "Cancel" : "منصرف شدن",
+    "Choose as profile image" : "یک تصویر پروفایل انتخاب کنید",
+    "Language" : "زبان",
+    "Help translate" : "به ترجمه آن کمک کنید",
+    "Import Root Certificate" : "وارد کردن گواهی اصلی",
+    "Log-in password" : "رمز ورود",
+    "Decrypt all Files" : "تمام فایلها رمزگشایی شود",
+    "Restore Encryption Keys" : "بازیابی کلید های رمزگذاری",
+    "Delete Encryption Keys" : "حذف کلید های رمزگذاری",
+    "Login Name" : "نام کاربری",
+    "Create" : "ایجاد کردن",
+    "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
+    "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
+    "Search Users and Groups" : "جستجوی کاربران و گروه ها",
+    "Add Group" : "افزودن گروه",
+    "Group" : "گروه",
+    "Everyone" : "همه",
+    "Admins" : "مدیران",
+    "Default Quota" : "سهم پیش فرض",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "لطفا سهمیه ذخیره سازی را وارد کنید (به عنوان مثال: \" 512MB\" یا \"12GB\")",
+    "Unlimited" : "نامحدود",
+    "Other" : "دیگر",
+    "Username" : "نام کاربری",
+    "Quota" : "سهم",
+    "Storage Location" : "محل فضای ذخیره سازی",
+    "Last Login" : "اخرین ورود",
+    "change full name" : "تغییر نام کامل",
+    "set new password" : "تنظیم کلمه عبور جدید",
+    "Default" : "پیش فرض"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
deleted file mode 100644
index ef65cc8b78c..00000000000
--- a/settings/l10n/fa.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "فعال شده",
-"Authentication error" => "خطا در اعتبار سنجی",
-"Your full name has been changed." => "نام کامل شما تغییر یافت",
-"Unable to change full name" => "امکان تغییر نام کامل وجود ندارد",
-"Group already exists" => "این گروه در حال حاضر موجود است",
-"Unable to add group" => "افزودن گروه امکان پذیر نیست",
-"Files decrypted successfully" => "فایل ها با موفقیت رمزگشایی شدند.",
-"Encryption keys deleted permanently" => "کلیدهای رمزگذاری به طور کامل حذف شدند",
-"Couldn't remove app." => "امکان حذف برنامه وجود ندارد.",
-"Email saved" => "ایمیل ذخیره شد",
-"Invalid email" => "ایمیل غیر قابل قبول",
-"Unable to delete group" => "حذف گروه امکان پذیر نیست",
-"Unable to delete user" => "حذف کاربر امکان پذیر نیست",
-"Backups restored successfully" => "پشتیبان ها با موفقیت بازیابی شدند",
-"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." => "برنامه را نمی توان به هنگام ساخت.",
-"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." => "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.",
-"Unable to change password" => "نمی‌توان رمز را تغییر داد",
-"Saved" => "ذخیره شد",
-"test email settings" => "تنظیمات ایمیل آزمایشی",
-"Email sent" => "ایمیل ارسال شد",
-"Sending..." => "در حال ارسال...",
-"All" => "همه",
-"Please wait...." => "لطفا صبر کنید ...",
-"Error while disabling app" => "خطا در هنگام غیر فعال سازی برنامه",
-"Disable" => "غیرفعال",
-"Enable" => "فعال",
-"Error while enabling app" => "خطا در هنگام فعال سازی برنامه",
-"Updating...." => "در حال بروز رسانی...",
-"Error while updating app" => "خطا در هنگام بهنگام سازی برنامه",
-"Updated" => "بروز رسانی انجام شد",
-"Uninstalling ...." => "در حال حذف...",
-"Error while uninstalling app" => "خطا در هنگام حذف برنامه....",
-"Uninstall" => "حذف",
-"Select a profile picture" => "انتخاب تصویر پروفایل",
-"Very weak password" => "رمز عبور بسیار ضعیف",
-"Weak password" => "رمز عبور ضعیف",
-"So-so password" => "رمز عبور متوسط",
-"Good password" => "رمز عبور خوب",
-"Strong password" => "رمز عبور قوی",
-"Delete" => "حذف",
-"Decrypting files... Please wait, this can take some time." => "در حال بازگشایی رمز فایل‌ها... لطفاً صبر نمایید. این امر ممکن است مدتی زمان ببرد.",
-"Delete encryption keys permanently." => "کلید های رمزگذاری به طوز کامل حذف شوند.",
-"Restore encryption keys." => "بازیابی کلیدهای  رمزگذاری.",
-"Groups" => "گروه ها",
-"Unable to delete {objName}" => "امکان حذف {objName} وجود ندارد",
-"Error creating group" => "خطا در هنگام ایجاد کروه",
-"A valid group name must be provided" => "نام کاربری معتبر می بایست وارد شود",
-"deleted {groupName}" => "گروه {groupName} حذف شد",
-"undo" => "بازگشت",
-"never" => "هرگز",
-"deleted {userName}" => "کاربر {userName} حذف شد",
-"add group" => "افزودن گروه",
-"A valid username must be provided" => "نام کاربری صحیح باید وارد شود",
-"Error creating user" => "خطا در ایجاد کاربر",
-"A valid password must be provided" => "رمز عبور صحیح باید وارد شود",
-"Warning: Home directory for user \"{user}\" already exists" => "اخطار: پوشه‌ی خانه برای کاربر \"{user}\" در حال حاضر وجود دارد",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "گواهی های اصلی SSL ",
-"Encryption" => "رمزگذاری",
-"Everything (fatal issues, errors, warnings, info, debug)" => "همه موارد (مشکلات مهلک، خطاها، اخطارها، اطلاعات، خطایابی)",
-"Info, warnings, errors and fatal issues" => "اطلاعات، اخطارها، خطاها، مشکلات اساسی",
-"Warnings, errors and fatal issues" => "اخطارها، خطاها، مشکلات مهلک",
-"Errors and fatal issues" => "خطاها و مشکلات اساسی",
-"Fatal issues only" => "فقط مشکلات اساسی",
-"None" => "هیچ‌کدام",
-"Login" => "ورود",
-"Plain" => "ساده",
-"NT LAN Manager" => "مدیر NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "اخطار امنیتی",
-"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." => "به احتمال زیاد پوشه‌ی data و فایل‌های شما از طریق اینترنت قابل دسترسی هستند. فایل .htaccess برنامه کار نمی‌کند. ما شدیداً توصیه می کنیم که شما وب سرور خودتان را طوری تنظیم کنید که پوشه‌ی data شما غیر قابل دسترسی باشد یا اینکه پوشه‌‎ی data را به خارج از ریشه‌ی اصلی وب سرور انتقال دهید.",
-"Setup Warning" => "هشدار راه اندازی",
-"Database Performance Info" => "اطلاعات کارایی پایگاه داده",
-"Module 'fileinfo' missing" => "ماژول 'fileinfo' از کار افتاده",
-"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 دریافت کنید.",
-"Your PHP version is outdated" => "نسخه PHP شما قدیمی است",
-"Locale not working" => "زبان محلی کار نمی کند.",
-"Please double check the <a href='%s'>installation guides</a>." => "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
-"Cron" => "زمانبند",
-"Last cron was executed at %s." => "کران قبلی در %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 ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
-"Sharing" => "اشتراک گذاری",
-"Allow apps to use the Share API" => "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
-"Allow users to share via link" => "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
-"Enforce password protection" => "اجبار برای محافظت توسط رمز عبور",
-"Allow public uploads" => "اجازه بارگذاری عمومی",
-"Set default expiration date" => "اعمال تاریخ اتمام پیش فرض",
-"Expire after " => "اتمام اعتبار بعد از",
-"days" => "روز",
-"Enforce expiration date" => "اعمال تاریخ اتمام اشتراک گذاری",
-"Allow resharing" => "مجوز اشتراک گذاری مجدد",
-"Exclude groups from sharing" => "مستثنی شدن گروه ها از اشتراک گذاری",
-"Security" => "امنیت",
-"Enforce HTTPS" => "وادار کردن HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید.",
-"Email Server" => "سرور ایمیل",
-"This is used for sending out notifications." => "این برای ارسال هشدار ها استفاده می شود",
-"Send mode" => "حالت ارسال",
-"From address" => "آدرس فرستنده",
-"mail" => "ایمیل",
-"Authentication method" => "روش احراز هویت",
-"Authentication required" => "احراز هویت مورد نیاز است",
-"Server address" => "آدرس سرور",
-"Port" => "درگاه",
-"Credentials" => "اعتبارهای",
-"SMTP Username" => "نام کاربری SMTP",
-"SMTP Password" => "رمز عبور SMTP",
-"Test email settings" => "تنظیمات ایمیل آزمایشی",
-"Send email" => "ارسال ایمیل",
-"Log" => "کارنامه",
-"Log level" => "سطح ورود",
-"More" => "بیش‌تر",
-"Less" => "کم‌تر",
-"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>." => "توسعه یافته به وسیله ی  <a href=\"http://ownCloud.org/contact\" target=\"_blank\">انجمن ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">کد اصلی</a> مجاز زیر گواهی <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "با",
-"Documentation:" => "مستند سازی:",
-"User Documentation" => "مستندات کاربر",
-"Admin Documentation" => "مستند سازی مدیر",
-"Enable only for specific groups" => "فعال سازی تنها برای گروه های خاص",
-"Uninstall App" => "حذف برنامه",
-"Administrator Documentation" => "مستندات مدیر",
-"Online Documentation" => "مستندات آنلاین",
-"Forum" => "انجمن",
-"Bugtracker" => "ردیاب باگ ",
-"Commercial Support" => "پشتیبانی تجاری",
-"Get the apps to sync your files" => "برنامه ها را دریافت کنید تا فایل هایتان را همگام سازید",
-"Show First Run Wizard again" => "راهبری کمکی اجرای اول را دوباره نمایش بده",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "شما استفاده کردید از <strong>%s</strong> از میزان در دسترس <strong>%s</strong>",
-"Password" => "گذرواژه",
-"Your password was changed" => "رمز عبور شما تغییر یافت",
-"Unable to change your password" => "ناتوان در تغییر گذرواژه",
-"Current password" => "گذرواژه کنونی",
-"New password" => "گذرواژه جدید",
-"Change password" => "تغییر گذر واژه",
-"Full Name" => "نام کامل",
-"Email" => "ایمیل",
-"Your email address" => "پست الکترونیکی شما",
-"Profile picture" => "تصویر پروفایل",
-"Upload new" => "بارگذاری جدید",
-"Select new from Files" => "انتخاب جدید از میان فایل ها",
-"Remove image" => "تصویر پاک شود",
-"Either png or jpg. Ideally square but you will be able to crop it." => "هردوی jpg و png ها مربع گونه می‌باشند. با این حال شما می‌توانید آنها را برش بزنید.",
-"Cancel" => "منصرف شدن",
-"Choose as profile image" => "یک تصویر پروفایل انتخاب کنید",
-"Language" => "زبان",
-"Help translate" => "به ترجمه آن کمک کنید",
-"Import Root Certificate" => "وارد کردن گواهی اصلی",
-"Log-in password" => "رمز ورود",
-"Decrypt all Files" => "تمام فایلها رمزگشایی شود",
-"Restore Encryption Keys" => "بازیابی کلید های رمزگذاری",
-"Delete Encryption Keys" => "حذف کلید های رمزگذاری",
-"Login Name" => "نام کاربری",
-"Create" => "ایجاد کردن",
-"Admin Recovery Password" => "مدیریت بازیابی رمز عبور",
-"Enter the recovery password in order to recover the users files during password change" => "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
-"Search Users and Groups" => "جستجوی کاربران و گروه ها",
-"Add Group" => "افزودن گروه",
-"Group" => "گروه",
-"Everyone" => "همه",
-"Admins" => "مدیران",
-"Default Quota" => "سهم پیش فرض",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "لطفا سهمیه ذخیره سازی را وارد کنید (به عنوان مثال: \" 512MB\" یا \"12GB\")",
-"Unlimited" => "نامحدود",
-"Other" => "دیگر",
-"Username" => "نام کاربری",
-"Quota" => "سهم",
-"Storage Location" => "محل فضای ذخیره سازی",
-"Last Login" => "اخرین ورود",
-"change full name" => "تغییر نام کامل",
-"set new password" => "تنظیم کلمه عبور جدید",
-"Default" => "پیش فرض"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
new file mode 100644
index 00000000000..ab2505062aa
--- /dev/null
+++ b/settings/l10n/fi_FI.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Käytössä",
+    "Not enabled" : "Ei käytössä",
+    "Recommended" : "Suositeltu",
+    "Authentication error" : "Tunnistautumisvirhe",
+    "Your full name has been changed." : "Koko nimesi on muutettu.",
+    "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
+    "Group already exists" : "Ryhmä on jo olemassa",
+    "Unable to add group" : "Ryhmän lisäys epäonnistui",
+    "Files decrypted successfully" : "Tiedostojen salaus purettiin onnistuneesti",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
+    "Couldn't decrypt your files, check your password and try again" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
+    "Encryption keys deleted permanently" : "Salausavaimet poistettiin pysyvästi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi poistaminen pysyvästi ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
+    "Couldn't remove app." : "Sovelluksen poistaminen epäonnistui.",
+    "Email saved" : "Sähköposti tallennettu",
+    "Invalid email" : "Virheellinen sähköposti",
+    "Unable to delete group" : "Ryhmän poisto epäonnistui",
+    "Unable to delete user" : "Käyttäjän poisto epäonnistui",
+    "Backups restored successfully" : "Varmuuskopiot palautettiin onnistuneesti",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi palauttaminen ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
+    "Language changed" : "Kieli on vaihdettu",
+    "Invalid request" : "Virheellinen pyyntö",
+    "Admins can't remove themself from the admin group" : "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
+    "Unable to add user to group %s" : "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
+    "Unable to remove user from group %s" : "Käyttäjän poistaminen ryhmästä %s ei onnistu",
+    "Couldn't update app." : "Sovelluksen päivitys epäonnistui.",
+    "Wrong password" : "Väärä salasana",
+    "No user supplied" : "Käyttäjää ei määritetty",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään",
+    "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
+    "Unable to change password" : "Salasanan vaihto ei onnistunut",
+    "Saved" : "Tallennettu",
+    "test email settings" : "testaa sähköpostiasetukset",
+    "If you received this email, the settings seem to be correct." : "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
+    "A problem occurred while sending the email. Please revise your settings." : "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.",
+    "Email sent" : "Sähköposti lähetetty",
+    "You need to set your user email before being able to send test emails." : "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
+    "Add trusted domain" : "Lisää luotettu toimialue",
+    "Sending..." : "Lähetetään...",
+    "All" : "Kaikki",
+    "Please wait...." : "Odota hetki...",
+    "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä",
+    "Disable" : "Poista käytöstä",
+    "Enable" : "Käytä",
+    "Error while enabling app" : "Virhe ottaessa sovellusta käyttöön",
+    "Updating...." : "Päivitetään...",
+    "Error while updating app" : "Virhe sovellusta päivittäessä",
+    "Updated" : "Päivitetty",
+    "Uninstalling ...." : "Poistetaan asennusta....",
+    "Error while uninstalling app" : "Virhe sovellusta poistaessa",
+    "Uninstall" : "Poista asennus",
+    "Select a profile picture" : "Valitse profiilikuva",
+    "Very weak password" : "Erittäin heikko salasana",
+    "Weak password" : "Heikko salasana",
+    "So-so password" : "Kohtalainen salasana",
+    "Good password" : "Hyvä salasana",
+    "Strong password" : "Vahva salasana",
+    "Valid until {date}" : "Kelvollinen {date} asti",
+    "Delete" : "Poista",
+    "Decrypting files... Please wait, this can take some time." : "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
+    "Delete encryption keys permanently." : "Poista salausavaimet pysyvästi.",
+    "Restore encryption keys." : "Palauta salausavaimet.",
+    "Groups" : "Ryhmät",
+    "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui",
+    "Error creating group" : "Virhe ryhmää luotaessa",
+    "A valid group name must be provided" : "Anna kelvollinen ryhmän nimi",
+    "deleted {groupName}" : "poistettu {groupName}",
+    "undo" : "kumoa",
+    "no group" : "ei ryhmää",
+    "never" : "ei koskaan",
+    "deleted {userName}" : "poistettu {userName}",
+    "add group" : "lisää ryhmä",
+    "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
+    "Error creating user" : "Virhe käyttäjää luotaessa",
+    "A valid password must be provided" : "Anna kelvollinen salasana",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio",
+    "__language_name__" : "_kielen_nimi_",
+    "Personal Info" : "Henkilökohtaiset tiedot",
+    "SSL root certificates" : "SSL-juurivarmenteet",
+    "Encryption" : "Salaus",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
+    "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
+    "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat",
+    "Errors and fatal issues" : "Virheet ja vakavat ongelmat",
+    "Fatal issues only" : "Vain vakavat ongelmat",
+    "None" : "Ei mitään",
+    "Login" : "Kirjaudu",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Turvallisuusvaroitus",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Käytät %sia HTTP-yhteydellä. Suosittelemme määrittämään palvelimen vaatimaan salattua HTTPS-yhteyttä.",
+    "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." : "Datahakemistosi ja kaikki tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi tällä hetkellä. Määritä verkkopalvelimen asetukset siten, ettei datahakemistosi ole suoraan käytettävissä tai siirrä kyseinen hakemisto pois verkkopalvelimen dokumenttijuuresta.",
+    "Setup Warning" : "Asetusvaroitus",
+    "Database Performance Info" : "Tietokannan suorituskyvyn tiedot",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
+    "Module 'fileinfo' missing" : "Moduuli 'fileinfo' puuttuu",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
+    "Your PHP version is outdated" : "Käytössä oleva PHP-versio on vanhentunut",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla.",
+    "PHP charset is not set to UTF-8" : "PHP:n merkistöä ei ole asetettu UTF-8:ksi",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP:n merkistöä ei ole asetettu UTF-8:ksi. Tämä saattaa aiheuttaa suuria ongelmia sellaisten tiedostojen kanssa, joiden nimi koostuu muista kuin ASCII-merkeistä. Suosittelemme asettamaan php.ini-tiedoston kohdan 'default_charset' arvoon 'UTF-8'.",
+    "Locale not working" : "Maa-asetus ei toimi",
+    "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
+    "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
+    "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
+    "No problems found" : "Ongelmia ei löytynyt",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Viimeisin cron suoritettiin %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
+    "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
+    "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
+    "Sharing" : "Jakaminen",
+    "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
+    "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
+    "Allow public uploads" : "Salli julkiset lähetykset",
+    "Set default expiration date" : "Aseta oletusvanhenemispäivä",
+    "Expire after " : "Vanhenna",
+    "days" : "päivän jälkeen",
+    "Enforce expiration date" : "Pakota vanhenemispäivä",
+    "Allow resharing" : "Salli uudelleenjakaminen",
+    "Restrict users to only share with users in their groups" : "Salli käyttäjien jakaa vain omassa ryhmässä olevien henkilöiden kesken",
+    "Allow users to send mail notification for shared files" : "Salli käyttäjien lähettää sähköposti-ilmoituksia 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.",
+    "Security" : "Tietoturva",
+    "Enforce HTTPS" : "Pakota HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
+    "Email Server" : "Sähköpostipalvelin",
+    "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
+    "Send mode" : "Lähetystila",
+    "From address" : "Lähettäjän osoite",
+    "Authentication method" : "Tunnistautumistapa",
+    "Authentication required" : "Tunnistautuminen vaaditaan",
+    "Server address" : "Palvelimen osoite",
+    "Port" : "Portti",
+    "Credentials" : "Tilitiedot",
+    "SMTP Username" : "SMTP-käyttäjätunnus",
+    "SMTP Password" : "SMTP-salasana",
+    "Store credentials" : "Säilytä tilitiedot",
+    "Test email settings" : "Testaa sähköpostiasetukset",
+    "Send email" : "Lähetä sähköpostiviesti",
+    "Log" : "Loki",
+    "Log level" : "Lokitaso",
+    "More" : "Enemmän",
+    "Less" : "Vähemmän",
+    "Version" : "Versio",
+    "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>." : "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
+    "More apps" : "Lisää sovelluksia",
+    "Add your app" : "Lisää sovelluksesi",
+    "by" : " Kirjoittaja:",
+    "licensed" : "lisensoitu",
+    "Documentation:" : "Ohjeistus:",
+    "User Documentation" : "Käyttäjäohjeistus",
+    "Admin Documentation" : "Ylläpitäjän ohjeistus",
+    "Update to %s" : "Päivitä versioon %s",
+    "Enable only for specific groups" : "Salli vain tietyille ryhmille",
+    "Uninstall App" : "Poista sovelluksen asennus",
+    "Administrator Documentation" : "Ylläpito-ohjeistus",
+    "Online Documentation" : "Verkko-ohjeistus",
+    "Forum" : "Keskustelupalsta",
+    "Bugtracker" : "Ohjelmistovirheiden jäljitys",
+    "Commercial Support" : "Kaupallinen tuki",
+    "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jos haluat tukea projektia,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">osallistu kehitykseen</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levitä sanaa</a>!",
+    "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
+    "Password" : "Salasana",
+    "Your password was changed" : "Salasanasi vaihdettiin",
+    "Unable to change your password" : "Salasanaasi ei voitu vaihtaa",
+    "Current password" : "Nykyinen salasana",
+    "New password" : "Uusi salasana",
+    "Change password" : "Vaihda salasana",
+    "Full Name" : "Koko nimi",
+    "Email" : "Sähköpostiosoite",
+    "Your email address" : "Sähköpostiosoitteesi",
+    "Fill in an email address to enable password recovery and receive notifications" : "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia",
+    "Profile picture" : "Profiilikuva",
+    "Upload new" : "Lähetä uusi",
+    "Select new from Files" : "Valitse uusi tiedostoista",
+    "Remove image" : "Poista kuva",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Joko png- tai jpg-kuva. Mieluiten neliö, voit kuitenkin rajata kuvaa.",
+    "Your avatar is provided by your original account." : "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.",
+    "Cancel" : "Peru",
+    "Choose as profile image" : "Valitse profiilikuvaksi",
+    "Language" : "Kieli",
+    "Help translate" : "Auta kääntämisessä",
+    "Valid until" : "Kelvollinen",
+    "Issued By" : " Myöntänyt",
+    "Valid until %s" : "Kelvollinen %s asti",
+    "Import Root Certificate" : "Tuo juurivarmenne",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
+    "Log-in password" : "Kirjautumissalasana",
+    "Decrypt all Files" : "Pura kaikkien tiedostojen salaus",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
+    "Restore Encryption Keys" : "Palauta salausavaimet",
+    "Delete Encryption Keys" : "Poista salausavaimet",
+    "Show storage location" : "Näytä tallennustilan sijainti",
+    "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
+    "Login Name" : "Kirjautumisnimi",
+    "Create" : "Luo",
+    "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
+    "Search Users and Groups" : "Etsi käyttäjiä ja ryhmiä",
+    "Add Group" : "Lisää ryhmä",
+    "Group" : "Ryhmä",
+    "Everyone" : "Kaikki",
+    "Admins" : "Ylläpitäjät",
+    "Default Quota" : "Oletuskiintiö",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
+    "Unlimited" : "Rajoittamaton",
+    "Other" : "Muu",
+    "Username" : "Käyttäjätunnus",
+    "Group Admin for" : "Ryhmäylläpitäjä kohteille",
+    "Quota" : "Kiintiö",
+    "Storage Location" : "Tallennustilan sijainti",
+    "Last Login" : "Viimeisin kirjautuminen",
+    "change full name" : "muuta koko nimi",
+    "set new password" : "aseta uusi salasana",
+    "Default" : "Oletus"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
new file mode 100644
index 00000000000..971bebaed81
--- /dev/null
+++ b/settings/l10n/fi_FI.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "Käytössä",
+    "Not enabled" : "Ei käytössä",
+    "Recommended" : "Suositeltu",
+    "Authentication error" : "Tunnistautumisvirhe",
+    "Your full name has been changed." : "Koko nimesi on muutettu.",
+    "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
+    "Group already exists" : "Ryhmä on jo olemassa",
+    "Unable to add group" : "Ryhmän lisäys epäonnistui",
+    "Files decrypted successfully" : "Tiedostojen salaus purettiin onnistuneesti",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
+    "Couldn't decrypt your files, check your password and try again" : "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
+    "Encryption keys deleted permanently" : "Salausavaimet poistettiin pysyvästi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi poistaminen pysyvästi ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
+    "Couldn't remove app." : "Sovelluksen poistaminen epäonnistui.",
+    "Email saved" : "Sähköposti tallennettu",
+    "Invalid email" : "Virheellinen sähköposti",
+    "Unable to delete group" : "Ryhmän poisto epäonnistui",
+    "Unable to delete user" : "Käyttäjän poisto epäonnistui",
+    "Backups restored successfully" : "Varmuuskopiot palautettiin onnistuneesti",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Salausavaintesi palauttaminen ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
+    "Language changed" : "Kieli on vaihdettu",
+    "Invalid request" : "Virheellinen pyyntö",
+    "Admins can't remove themself from the admin group" : "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
+    "Unable to add user to group %s" : "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
+    "Unable to remove user from group %s" : "Käyttäjän poistaminen ryhmästä %s ei onnistu",
+    "Couldn't update app." : "Sovelluksen päivitys epäonnistui.",
+    "Wrong password" : "Väärä salasana",
+    "No user supplied" : "Käyttäjää ei määritetty",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään",
+    "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
+    "Unable to change password" : "Salasanan vaihto ei onnistunut",
+    "Saved" : "Tallennettu",
+    "test email settings" : "testaa sähköpostiasetukset",
+    "If you received this email, the settings seem to be correct." : "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
+    "A problem occurred while sending the email. Please revise your settings." : "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.",
+    "Email sent" : "Sähköposti lähetetty",
+    "You need to set your user email before being able to send test emails." : "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
+    "Add trusted domain" : "Lisää luotettu toimialue",
+    "Sending..." : "Lähetetään...",
+    "All" : "Kaikki",
+    "Please wait...." : "Odota hetki...",
+    "Error while disabling app" : "Virhe poistaessa sovellusta käytöstä",
+    "Disable" : "Poista käytöstä",
+    "Enable" : "Käytä",
+    "Error while enabling app" : "Virhe ottaessa sovellusta käyttöön",
+    "Updating...." : "Päivitetään...",
+    "Error while updating app" : "Virhe sovellusta päivittäessä",
+    "Updated" : "Päivitetty",
+    "Uninstalling ...." : "Poistetaan asennusta....",
+    "Error while uninstalling app" : "Virhe sovellusta poistaessa",
+    "Uninstall" : "Poista asennus",
+    "Select a profile picture" : "Valitse profiilikuva",
+    "Very weak password" : "Erittäin heikko salasana",
+    "Weak password" : "Heikko salasana",
+    "So-so password" : "Kohtalainen salasana",
+    "Good password" : "Hyvä salasana",
+    "Strong password" : "Vahva salasana",
+    "Valid until {date}" : "Kelvollinen {date} asti",
+    "Delete" : "Poista",
+    "Decrypting files... Please wait, this can take some time." : "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
+    "Delete encryption keys permanently." : "Poista salausavaimet pysyvästi.",
+    "Restore encryption keys." : "Palauta salausavaimet.",
+    "Groups" : "Ryhmät",
+    "Unable to delete {objName}" : "Kohteen {objName} poistaminen epäonnistui",
+    "Error creating group" : "Virhe ryhmää luotaessa",
+    "A valid group name must be provided" : "Anna kelvollinen ryhmän nimi",
+    "deleted {groupName}" : "poistettu {groupName}",
+    "undo" : "kumoa",
+    "no group" : "ei ryhmää",
+    "never" : "ei koskaan",
+    "deleted {userName}" : "poistettu {userName}",
+    "add group" : "lisää ryhmä",
+    "A valid username must be provided" : "Anna kelvollinen käyttäjätunnus",
+    "Error creating user" : "Virhe käyttäjää luotaessa",
+    "A valid password must be provided" : "Anna kelvollinen salasana",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio",
+    "__language_name__" : "_kielen_nimi_",
+    "Personal Info" : "Henkilökohtaiset tiedot",
+    "SSL root certificates" : "SSL-juurivarmenteet",
+    "Encryption" : "Salaus",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
+    "Info, warnings, errors and fatal issues" : "Tiedot, varoitukset, virheet ja vakavat ongelmat",
+    "Warnings, errors and fatal issues" : "Varoitukset, virheet ja vakavat ongelmat",
+    "Errors and fatal issues" : "Virheet ja vakavat ongelmat",
+    "Fatal issues only" : "Vain vakavat ongelmat",
+    "None" : "Ei mitään",
+    "Login" : "Kirjaudu",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Turvallisuusvaroitus",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Käytät %sia HTTP-yhteydellä. Suosittelemme määrittämään palvelimen vaatimaan salattua HTTPS-yhteyttä.",
+    "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." : "Datahakemistosi ja kaikki tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi tällä hetkellä. Määritä verkkopalvelimen asetukset siten, ettei datahakemistosi ole suoraan käytettävissä tai siirrä kyseinen hakemisto pois verkkopalvelimen dokumenttijuuresta.",
+    "Setup Warning" : "Asetusvaroitus",
+    "Database Performance Info" : "Tietokannan suorituskyvyn tiedot",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
+    "Module 'fileinfo' missing" : "Moduuli 'fileinfo' puuttuu",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
+    "Your PHP version is outdated" : "Käytössä oleva PHP-versio on vanhentunut",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla.",
+    "PHP charset is not set to UTF-8" : "PHP:n merkistöä ei ole asetettu UTF-8:ksi",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP:n merkistöä ei ole asetettu UTF-8:ksi. Tämä saattaa aiheuttaa suuria ongelmia sellaisten tiedostojen kanssa, joiden nimi koostuu muista kuin ASCII-merkeistä. Suosittelemme asettamaan php.ini-tiedoston kohdan 'default_charset' arvoon 'UTF-8'.",
+    "Locale not working" : "Maa-asetus ei toimi",
+    "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
+    "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
+    "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
+    "No problems found" : "Ongelmia ei löytynyt",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Viimeisin cron suoritettiin %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
+    "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
+    "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
+    "Sharing" : "Jakaminen",
+    "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
+    "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
+    "Allow public uploads" : "Salli julkiset lähetykset",
+    "Set default expiration date" : "Aseta oletusvanhenemispäivä",
+    "Expire after " : "Vanhenna",
+    "days" : "päivän jälkeen",
+    "Enforce expiration date" : "Pakota vanhenemispäivä",
+    "Allow resharing" : "Salli uudelleenjakaminen",
+    "Restrict users to only share with users in their groups" : "Salli käyttäjien jakaa vain omassa ryhmässä olevien henkilöiden kesken",
+    "Allow users to send mail notification for shared files" : "Salli käyttäjien lähettää sähköposti-ilmoituksia 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.",
+    "Security" : "Tietoturva",
+    "Enforce HTTPS" : "Pakota HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
+    "Email Server" : "Sähköpostipalvelin",
+    "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
+    "Send mode" : "Lähetystila",
+    "From address" : "Lähettäjän osoite",
+    "Authentication method" : "Tunnistautumistapa",
+    "Authentication required" : "Tunnistautuminen vaaditaan",
+    "Server address" : "Palvelimen osoite",
+    "Port" : "Portti",
+    "Credentials" : "Tilitiedot",
+    "SMTP Username" : "SMTP-käyttäjätunnus",
+    "SMTP Password" : "SMTP-salasana",
+    "Store credentials" : "Säilytä tilitiedot",
+    "Test email settings" : "Testaa sähköpostiasetukset",
+    "Send email" : "Lähetä sähköpostiviesti",
+    "Log" : "Loki",
+    "Log level" : "Lokitaso",
+    "More" : "Enemmän",
+    "Less" : "Vähemmän",
+    "Version" : "Versio",
+    "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>." : "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
+    "More apps" : "Lisää sovelluksia",
+    "Add your app" : "Lisää sovelluksesi",
+    "by" : " Kirjoittaja:",
+    "licensed" : "lisensoitu",
+    "Documentation:" : "Ohjeistus:",
+    "User Documentation" : "Käyttäjäohjeistus",
+    "Admin Documentation" : "Ylläpitäjän ohjeistus",
+    "Update to %s" : "Päivitä versioon %s",
+    "Enable only for specific groups" : "Salli vain tietyille ryhmille",
+    "Uninstall App" : "Poista sovelluksen asennus",
+    "Administrator Documentation" : "Ylläpito-ohjeistus",
+    "Online Documentation" : "Verkko-ohjeistus",
+    "Forum" : "Keskustelupalsta",
+    "Bugtracker" : "Ohjelmistovirheiden jäljitys",
+    "Commercial Support" : "Kaupallinen tuki",
+    "Get the apps to sync your files" : "Aseta sovellukset synkronoimaan tiedostosi",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jos haluat tukea projektia,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">osallistu kehitykseen</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levitä sanaa</a>!",
+    "Show First Run Wizard again" : "Näytä ensimmäisen käyttökerran avustaja uudelleen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
+    "Password" : "Salasana",
+    "Your password was changed" : "Salasanasi vaihdettiin",
+    "Unable to change your password" : "Salasanaasi ei voitu vaihtaa",
+    "Current password" : "Nykyinen salasana",
+    "New password" : "Uusi salasana",
+    "Change password" : "Vaihda salasana",
+    "Full Name" : "Koko nimi",
+    "Email" : "Sähköpostiosoite",
+    "Your email address" : "Sähköpostiosoitteesi",
+    "Fill in an email address to enable password recovery and receive notifications" : "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia",
+    "Profile picture" : "Profiilikuva",
+    "Upload new" : "Lähetä uusi",
+    "Select new from Files" : "Valitse uusi tiedostoista",
+    "Remove image" : "Poista kuva",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Joko png- tai jpg-kuva. Mieluiten neliö, voit kuitenkin rajata kuvaa.",
+    "Your avatar is provided by your original account." : "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.",
+    "Cancel" : "Peru",
+    "Choose as profile image" : "Valitse profiilikuvaksi",
+    "Language" : "Kieli",
+    "Help translate" : "Auta kääntämisessä",
+    "Valid until" : "Kelvollinen",
+    "Issued By" : " Myöntänyt",
+    "Valid until %s" : "Kelvollinen %s asti",
+    "Import Root Certificate" : "Tuo juurivarmenne",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
+    "Log-in password" : "Kirjautumissalasana",
+    "Decrypt all Files" : "Pura kaikkien tiedostojen salaus",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
+    "Restore Encryption Keys" : "Palauta salausavaimet",
+    "Delete Encryption Keys" : "Poista salausavaimet",
+    "Show storage location" : "Näytä tallennustilan sijainti",
+    "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
+    "Login Name" : "Kirjautumisnimi",
+    "Create" : "Luo",
+    "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
+    "Search Users and Groups" : "Etsi käyttäjiä ja ryhmiä",
+    "Add Group" : "Lisää ryhmä",
+    "Group" : "Ryhmä",
+    "Everyone" : "Kaikki",
+    "Admins" : "Ylläpitäjät",
+    "Default Quota" : "Oletuskiintiö",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
+    "Unlimited" : "Rajoittamaton",
+    "Other" : "Muu",
+    "Username" : "Käyttäjätunnus",
+    "Group Admin for" : "Ryhmäylläpitäjä kohteille",
+    "Quota" : "Kiintiö",
+    "Storage Location" : "Tallennustilan sijainti",
+    "Last Login" : "Viimeisin kirjautuminen",
+    "change full name" : "muuta koko nimi",
+    "set new password" : "aseta uusi salasana",
+    "Default" : "Oletus"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
deleted file mode 100644
index e09c2d019c5..00000000000
--- a/settings/l10n/fi_FI.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Käytössä",
-"Not enabled" => "Ei käytössä",
-"Recommended" => "Suositeltu",
-"Authentication error" => "Tunnistautumisvirhe",
-"Your full name has been changed." => "Koko nimesi on muutettu.",
-"Unable to change full name" => "Koko nimen muuttaminen epäonnistui",
-"Group already exists" => "Ryhmä on jo olemassa",
-"Unable to add group" => "Ryhmän lisäys epäonnistui",
-"Files decrypted successfully" => "Tiedostojen salaus purettiin onnistuneesti",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista owncloud.log-tiedosto tai ota yhteys ylläpitäjään",
-"Couldn't decrypt your files, check your password and try again" => "Tiedostojen salauksen purkaminen epäonnistui. Tarkista salasanasi ja yritä uudelleen",
-"Encryption keys deleted permanently" => "Salausavaimet poistettiin pysyvästi",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Salausavaintesi poistaminen pysyvästi ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
-"Couldn't remove app." => "Sovelluksen poistaminen epäonnistui.",
-"Email saved" => "Sähköposti tallennettu",
-"Invalid email" => "Virheellinen sähköposti",
-"Unable to delete group" => "Ryhmän poisto epäonnistui",
-"Unable to delete user" => "Käyttäjän poisto epäonnistui",
-"Backups restored successfully" => "Varmuuskopiot palautettiin onnistuneesti",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Salausavaintesi palauttaminen ei onnistunut, tarkista owncloud.log tai ole yhteydessä ylläpitäjään",
-"Language changed" => "Kieli on vaihdettu",
-"Invalid request" => "Virheellinen pyyntö",
-"Admins can't remove themself from the admin group" => "Ylläpitäjät eivät poistaa omia tunnuksiaan ylläpitäjien ryhmästä",
-"Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
-"Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu",
-"Couldn't update app." => "Sovelluksen päivitys epäonnistui.",
-"Wrong password" => "Väärä salasana",
-"No user supplied" => "Käyttäjää ei määritetty",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Anna ylläpitäjän palautussalasana, muuten kaikki käyttäjien data menetetään",
-"Wrong admin recovery password. Please check the password and try again." => "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
-"Unable to change password" => "Salasanan vaihto ei onnistunut",
-"Saved" => "Tallennettu",
-"test email settings" => "testaa sähköpostiasetukset",
-"If you received this email, the settings seem to be correct." => "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
-"A problem occurred while sending the email. Please revise your settings." => "Sähköpostia lähettäessä tapahtui virhe. Tarkista asetukset.",
-"Email sent" => "Sähköposti lähetetty",
-"You need to set your user email before being able to send test emails." => "Aseta sähköpostiosoite, jotta voit testata sähköpostin toimivuutta.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Haluatko varmasti liittää kohteen \"{domain}\" luotetuksi toimialueeksi?",
-"Add trusted domain" => "Lisää luotettu toimialue",
-"Sending..." => "Lähetetään...",
-"All" => "Kaikki",
-"Please wait...." => "Odota hetki...",
-"Error while disabling app" => "Virhe poistaessa sovellusta käytöstä",
-"Disable" => "Poista käytöstä",
-"Enable" => "Käytä",
-"Error while enabling app" => "Virhe ottaessa sovellusta käyttöön",
-"Updating...." => "Päivitetään...",
-"Error while updating app" => "Virhe sovellusta päivittäessä",
-"Updated" => "Päivitetty",
-"Uninstalling ...." => "Poistetaan asennusta....",
-"Error while uninstalling app" => "Virhe sovellusta poistaessa",
-"Uninstall" => "Poista asennus",
-"Select a profile picture" => "Valitse profiilikuva",
-"Very weak password" => "Erittäin heikko salasana",
-"Weak password" => "Heikko salasana",
-"So-so password" => "Kohtalainen salasana",
-"Good password" => "Hyvä salasana",
-"Strong password" => "Vahva salasana",
-"Valid until {date}" => "Kelvollinen {date} asti",
-"Delete" => "Poista",
-"Decrypting files... Please wait, this can take some time." => "Puretaan tiedostojen salausta... Odota, tämä voi kestää jonkin aikaa.",
-"Delete encryption keys permanently." => "Poista salausavaimet pysyvästi.",
-"Restore encryption keys." => "Palauta salausavaimet.",
-"Groups" => "Ryhmät",
-"Unable to delete {objName}" => "Kohteen {objName} poistaminen epäonnistui",
-"Error creating group" => "Virhe ryhmää luotaessa",
-"A valid group name must be provided" => "Anna kelvollinen ryhmän nimi",
-"deleted {groupName}" => "poistettu {groupName}",
-"undo" => "kumoa",
-"no group" => "ei ryhmää",
-"never" => "ei koskaan",
-"deleted {userName}" => "poistettu {userName}",
-"add group" => "lisää ryhmä",
-"A valid username must be provided" => "Anna kelvollinen käyttäjätunnus",
-"Error creating user" => "Virhe käyttäjää luotaessa",
-"A valid password must be provided" => "Anna kelvollinen salasana",
-"Warning: Home directory for user \"{user}\" already exists" => "Varoitus: käyttäjällä \"{user}\" on jo olemassa kotikansio",
-"__language_name__" => "_kielen_nimi_",
-"Personal Info" => "Henkilökohtaiset tiedot",
-"SSL root certificates" => "SSL-juurivarmenteet",
-"Encryption" => "Salaus",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Kaikki (vakavat ongelmat, virheet, varoitukset, tiedot, vianjäljitys)",
-"Info, warnings, errors and fatal issues" => "Tiedot, varoitukset, virheet ja vakavat ongelmat",
-"Warnings, errors and fatal issues" => "Varoitukset, virheet ja vakavat ongelmat",
-"Errors and fatal issues" => "Virheet ja vakavat ongelmat",
-"Fatal issues only" => "Vain vakavat ongelmat",
-"None" => "Ei mitään",
-"Login" => "Kirjaudu",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Turvallisuusvaroitus",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Käytät %sia HTTP-yhteydellä. Suosittelemme määrittämään palvelimen vaatimaan salattua HTTPS-yhteyttä.",
-"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." => "Datahakemistosi ja kaikki tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi tällä hetkellä. Määritä verkkopalvelimen asetukset siten, ettei datahakemistosi ole suoraan käytettävissä tai siirrä kyseinen hakemisto pois verkkopalvelimen dokumenttijuuresta.",
-"Setup Warning" => "Asetusvaroitus",
-"Database Performance Info" => "Tietokannan suorituskyvyn tiedot",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
-"Module 'fileinfo' missing" => "Moduuli 'fileinfo' puuttuu",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-moduuli \"fileinfo\" puuttuu. Sen käyttö on erittäin suositeltavaa, jotta MIME-tyypin havaitseminen onnistuu parhaalla mahdollisella tavalla.",
-"Your PHP version is outdated" => "Käytössä oleva PHP-versio on vanhentunut",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Käytössä oleva PHP on vanhentunut. Päivitä versioon 5.3.8 tai uudempaan, koska aiemmat versiot eivät ole toimivia. On mahdollista, että tämä ownCloud-asennus ei toimi kunnolla.",
-"PHP charset is not set to UTF-8" => "PHP:n merkistöä ei ole asetettu UTF-8:ksi",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP:n merkistöä ei ole asetettu UTF-8:ksi. Tämä saattaa aiheuttaa suuria ongelmia sellaisten tiedostojen kanssa, joiden nimi koostuu muista kuin ASCII-merkeistä. Suosittelemme asettamaan php.ini-tiedoston kohdan 'default_charset' arvoon 'UTF-8'.",
-"Locale not working" => "Maa-asetus ei toimi",
-"System locale can not be set to a one which supports UTF-8." => "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
-"This means that there might be problems with certain characters in file names." => "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
-"URL generation in notification emails" => "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
-"No problems found" => "Ongelmia ei löytynyt",
-"Please double check the <a href='%s'>installation guides</a>." => "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Viimeisin cron suoritettiin %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
-"Cron was not executed yet!" => "Cronia ei suoritettu vielä!",
-"Execute one task with each page loaded" => "Suorita yksi tehtävä jokaista ladattua sivua kohden",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-"Sharing" => "Jakaminen",
-"Allow apps to use the Share API" => "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
-"Allow users to share via link" => "Salli käyttäjien jakaa linkkien kautta",
-"Allow public uploads" => "Salli julkiset lähetykset",
-"Set default expiration date" => "Aseta oletusvanhenemispäivä",
-"Expire after " => "Vanhenna",
-"days" => "päivän jälkeen",
-"Enforce expiration date" => "Pakota vanhenemispäivä",
-"Allow resharing" => "Salli uudelleenjakaminen",
-"Restrict users to only share with users in their groups" => "Salli käyttäjien jakaa vain omassa ryhmässä olevien henkilöiden kesken",
-"Allow users to send mail notification for shared files" => "Salli käyttäjien lähettää sähköposti-ilmoituksia 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.",
-"Security" => "Tietoturva",
-"Enforce HTTPS" => "Pakota HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
-"Email Server" => "Sähköpostipalvelin",
-"This is used for sending out notifications." => "Tätä käytetään ilmoitusten lähettämiseen.",
-"Send mode" => "Lähetystila",
-"From address" => "Lähettäjän osoite",
-"Authentication method" => "Tunnistautumistapa",
-"Authentication required" => "Tunnistautuminen vaaditaan",
-"Server address" => "Palvelimen osoite",
-"Port" => "Portti",
-"Credentials" => "Tilitiedot",
-"SMTP Username" => "SMTP-käyttäjätunnus",
-"SMTP Password" => "SMTP-salasana",
-"Store credentials" => "Säilytä tilitiedot",
-"Test email settings" => "Testaa sähköpostiasetukset",
-"Send email" => "Lähetä sähköpostiviesti",
-"Log" => "Loki",
-"Log level" => "Lokitaso",
-"More" => "Enemmän",
-"Less" => "Vähemmän",
-"Version" => "Versio",
-"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>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
-"More apps" => "Lisää sovelluksia",
-"Add your app" => "Lisää sovelluksesi",
-"by" => " Kirjoittaja:",
-"licensed" => "lisensoitu",
-"Documentation:" => "Ohjeistus:",
-"User Documentation" => "Käyttäjäohjeistus",
-"Admin Documentation" => "Ylläpitäjän ohjeistus",
-"Update to %s" => "Päivitä versioon %s",
-"Enable only for specific groups" => "Salli vain tietyille ryhmille",
-"Uninstall App" => "Poista sovelluksen asennus",
-"Administrator Documentation" => "Ylläpito-ohjeistus",
-"Online Documentation" => "Verkko-ohjeistus",
-"Forum" => "Keskustelupalsta",
-"Bugtracker" => "Ohjelmistovirheiden jäljitys",
-"Commercial Support" => "Kaupallinen tuki",
-"Get the apps to sync your files" => "Aseta sovellukset synkronoimaan tiedostosi",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Jos haluat tukea projektia,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">osallistu kehitykseen</a>\n\t\ttai\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">levitä sanaa</a>!",
-"Show First Run Wizard again" => "Näytä ensimmäisen käyttökerran avustaja uudelleen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Käytössäsi on <strong>%s</strong>/<strong>%s</strong>",
-"Password" => "Salasana",
-"Your password was changed" => "Salasanasi vaihdettiin",
-"Unable to change your password" => "Salasanaasi ei voitu vaihtaa",
-"Current password" => "Nykyinen salasana",
-"New password" => "Uusi salasana",
-"Change password" => "Vaihda salasana",
-"Full Name" => "Koko nimi",
-"Email" => "Sähköpostiosoite",
-"Your email address" => "Sähköpostiosoitteesi",
-"Fill in an email address to enable password recovery and receive notifications" => "Anna sähköpostiosoitteesi, jotta unohdettu salasana on mahdollista palauttaa ja voit vastaanottaa ilmoituksia",
-"Profile picture" => "Profiilikuva",
-"Upload new" => "Lähetä uusi",
-"Select new from Files" => "Valitse uusi tiedostoista",
-"Remove image" => "Poista kuva",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Joko png- tai jpg-kuva. Mieluiten neliö, voit kuitenkin rajata kuvaa.",
-"Your avatar is provided by your original account." => "Avatar-kuvasi pohjautuu alkuperäiseen tiliisi.",
-"Cancel" => "Peru",
-"Choose as profile image" => "Valitse profiilikuvaksi",
-"Language" => "Kieli",
-"Help translate" => "Auta kääntämisessä",
-"Valid until" => "Kelvollinen",
-"Issued By" => " Myöntänyt",
-"Valid until %s" => "Kelvollinen %s asti",
-"Import Root Certificate" => "Tuo juurivarmenne",
-"The encryption app is no longer enabled, please decrypt all your files" => "Salaussovellus ei ole enää käytössä, joten pura kaikkien tiedostojesi salaus",
-"Log-in password" => "Kirjautumissalasana",
-"Decrypt all Files" => "Pura kaikkien tiedostojen salaus",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Salausavaimesi siirretään varmuuskopiosijaintiin. Jos jokin menee pieleen, voit palauttaa avaimet. Poista avaimet pysyvästi vain, jos olet varma, että tiedostojen salaus on purettu onnistuneesti.",
-"Restore Encryption Keys" => "Palauta salausavaimet",
-"Delete Encryption Keys" => "Poista salausavaimet",
-"Show storage location" => "Näytä tallennustilan sijainti",
-"Show last log in" => "Näytä viimeisin sisäänkirjautuminen",
-"Login Name" => "Kirjautumisnimi",
-"Create" => "Luo",
-"Admin Recovery Password" => "Ylläpitäjän palautussalasana",
-"Search Users and Groups" => "Etsi käyttäjiä ja ryhmiä",
-"Add Group" => "Lisää ryhmä",
-"Group" => "Ryhmä",
-"Everyone" => "Kaikki",
-"Admins" => "Ylläpitäjät",
-"Default Quota" => "Oletuskiintiö",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
-"Unlimited" => "Rajoittamaton",
-"Other" => "Muu",
-"Username" => "Käyttäjätunnus",
-"Group Admin for" => "Ryhmäylläpitäjä kohteille",
-"Quota" => "Kiintiö",
-"Storage Location" => "Tallennustilan sijainti",
-"Last Login" => "Viimeisin kirjautuminen",
-"change full name" => "muuta koko nimi",
-"set new password" => "aseta uusi salasana",
-"Default" => "Oletus"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
new file mode 100644
index 00000000000..84da0f59d4b
--- /dev/null
+++ b/settings/l10n/fr.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Activée",
+    "Not enabled" : "Désactivée",
+    "Recommended" : "Recommandée",
+    "Authentication error" : "Erreur d'authentification",
+    "Your full name has been changed." : "Votre nom complet a été modifié.",
+    "Unable to change full name" : "Impossible de changer le nom complet",
+    "Group already exists" : "Ce groupe existe déjà",
+    "Unable to add group" : "Impossible d'ajouter le groupe",
+    "Files decrypted successfully" : "Fichiers décryptés avec succès",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur",
+    "Couldn't decrypt your files, check your password and try again" : "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
+    "Encryption keys deleted permanently" : "Clés de chiffrement définitivement supprimées.",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+    "Couldn't remove app." : "Impossible de supprimer l'application.",
+    "Email saved" : "E-mail sauvegardé",
+    "Invalid email" : "E-mail invalide",
+    "Unable to delete group" : "Impossible de supprimer le groupe",
+    "Unable to delete user" : "Impossible de supprimer l'utilisateur",
+    "Backups restored successfully" : "La sauvegarde a été restaurée avec succès",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+    "Language changed" : "Langue changée",
+    "Invalid request" : "Requête invalide",
+    "Admins can't remove themself from the admin group" : "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
+    "Unable to add user to group %s" : "Impossible d'ajouter l'utilisateur au groupe %s",
+    "Unable to remove user from group %s" : "Impossible de supprimer l'utilisateur du groupe %s",
+    "Couldn't update app." : "Impossible de mettre à jour l'application",
+    "Wrong password" : "Mot de passe incorrect",
+    "No user supplied" : "Aucun utilisateur fourni",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
+    "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
+    "Unable to change password" : "Impossible de modifier le mot de passe",
+    "Saved" : "Sauvegardé",
+    "test email settings" : "tester les paramètres d'e-mail",
+    "If you received this email, the settings seem to be correct." : "Si vous recevez cet email, c'est que les paramètres sont corrects",
+    "A problem occurred while sending the email. Please revise your settings." : "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres.",
+    "Email sent" : "Email envoyé",
+    "You need to set your user email before being able to send test emails." : "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
+    "Add trusted domain" : "Ajouter un domaine de confiance",
+    "Sending..." : "Envoi en cours...",
+    "All" : "Tous",
+    "Please wait...." : "Veuillez patienter…",
+    "Error while disabling app" : "Erreur lors de la désactivation de l'application",
+    "Disable" : "Désactiver",
+    "Enable" : "Activer",
+    "Error while enabling app" : "Erreur lors de l'activation de l'application",
+    "Updating...." : "Mise à jour...",
+    "Error while updating app" : "Erreur lors de la mise à jour de l'application",
+    "Updated" : "Mise à jour effectuée avec succès",
+    "Uninstalling ...." : "Désintallation...",
+    "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
+    "Uninstall" : "Désinstaller",
+    "Select a profile picture" : "Selectionner une photo de profil ",
+    "Very weak password" : "Mot de passe de très faible sécurité",
+    "Weak password" : "Mot de passe de faible sécurité",
+    "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é",
+    "Valid until {date}" : "Valide jusqu'au {date}",
+    "Delete" : "Supprimer",
+    "Decrypting files... Please wait, this can take some time." : "Déchiffrement en cours... Cela peut prendre un certain temps.",
+    "Delete encryption keys permanently." : "Supprimer définitivement les clés de chiffrement",
+    "Restore encryption keys." : "Restaurer les clés de chiffrement",
+    "Groups" : "Groupes",
+    "Unable to delete {objName}" : "Impossible de supprimer {objName}",
+    "Error creating group" : "Erreur lors de la création du groupe",
+    "A valid group name must be provided" : "Vous devez spécifier un nom de groupe valide",
+    "deleted {groupName}" : "{groupName} supprimé",
+    "undo" : "annuler",
+    "never" : "jamais",
+    "deleted {userName}" : "{userName} supprimé",
+    "add group" : "ajouter un groupe",
+    "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi",
+    "Error creating user" : "Erreur lors de la création de l'utilisateur",
+    "A valid password must be provided" : "Un mot de passe valide doit être saisi",
+    "Warning: Home directory for user \"{user}\" already exists" : "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
+    "__language_name__" : "Français",
+    "SSL root certificates" : "Certificats racine SSL",
+    "Encryption" : "Chiffrement",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
+    "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
+    "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales",
+    "Errors and fatal issues" : "Erreurs et erreurs fatales",
+    "Fatal issues only" : "Erreurs fatales uniquement",
+    "None" : "Aucun",
+    "Login" : "Connexion",
+    "Plain" : "En clair",
+    "NT LAN Manager" : "Gestionnaire du réseau NT",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avertissement de sécurité",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Vous accédez à %s via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS à la place.",
+    "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." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
+    "Setup Warning" : "Avertissement, problème de configuration",
+    "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.",
+    "Database Performance Info" : "Performances de la base de données",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite est utilisée comme base de donnée. Pour des installations plus volumineuse, nous vous conseillons de changer ce réglage. Pour migrer vers une autre base de donnée, utilisez la commande : \"occ db:convert-type\"",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' manquant",
+    "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 pour la détection des types de fichiers.",
+    "Your PHP version is outdated" : "Votre version de PHP est trop ancienne",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement.",
+    "PHP charset is not set to UTF-8" : "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
+    "Locale not working" : "Localisation non fonctionnelle",
+    "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte 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 to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
+    "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
+    "Connectivity checks" : "Vérification de la connectivité",
+    "No problems found" : "Aucun problème trouvé",
+    "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
+    "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
+    "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via 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.",
+    "Sharing" : "Partage",
+    "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",
+    "Enforce password protection" : "Obliger la protection par mot de passe",
+    "Allow public uploads" : "Autoriser les téléversements publics",
+    "Set default expiration date" : "Spécifier la date d'expiration par défaut",
+    "Expire after " : "Expiration après ",
+    "days" : "jours",
+    "Enforce expiration date" : "Imposer la date d'expiration",
+    "Allow resharing" : "Autoriser le repartage",
+    "Restrict users to only share with users in their groups" : "N'autoriser les partages qu'entre membres de même groupes",
+    "Allow users to send mail notification for shared files" : "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
+    "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. ",
+    "Security" : "Sécurité",
+    "Enforce HTTPS" : "Forcer HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forcer les clients à se connecter à %s via une connexion chiffrée.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
+    "Email Server" : "Serveur mail",
+    "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
+    "Send mode" : "Mode d'envoi",
+    "From address" : "Adresse source",
+    "mail" : "courriel",
+    "Authentication method" : "Méthode d'authentification",
+    "Authentication required" : "Authentification requise",
+    "Server address" : "Adresse du serveur",
+    "Port" : "Port",
+    "Credentials" : "Informations d'identification",
+    "SMTP Username" : "Nom d'utilisateur SMTP",
+    "SMTP Password" : "Mot de passe SMTP",
+    "Store credentials" : "Enregistrer les identifiants",
+    "Test email settings" : "Tester les paramètres e-mail",
+    "Send email" : "Envoyer un e-mail",
+    "Log" : "Log",
+    "Log level" : "Niveau de log",
+    "More" : "Plus",
+    "Less" : "Moins",
+    "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>." : "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Plus d'applications",
+    "Add your app" : "Ajouter votre application",
+    "by" : "par",
+    "licensed" : "Sous licence",
+    "Documentation:" : "Documentation :",
+    "User Documentation" : "Documentation utilisateur",
+    "Admin Documentation" : "Documentation administrateur",
+    "Update to %s" : "Mettre à niveau vers la version %s",
+    "Enable only for specific groups" : "Activer uniquement pour certains groupes",
+    "Uninstall App" : "Désinstaller l'application",
+    "Administrator Documentation" : "Documentation administrateur",
+    "Online Documentation" : "Documentation en ligne",
+    "Forum" : "Forum",
+    "Bugtracker" : "Suivi de bugs",
+    "Commercial Support" : "Support commercial",
+    "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voulez soutenir le projet,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez en</a> !",
+    "Show First Run Wizard again" : "Revoir le premier lancement de l'installeur",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
+    "Password" : "Mot de passe",
+    "Your password was changed" : "Votre mot de passe a été changé",
+    "Unable to change your password" : "Impossible de changer votre mot de passe",
+    "Current password" : "Mot de passe actuel",
+    "New password" : "Nouveau mot de passe",
+    "Change password" : "Changer de mot de passe",
+    "Full Name" : "Nom complet",
+    "Email" : "Adresse mail",
+    "Your email address" : "Votre adresse e-mail",
+    "Fill in an email address to enable password recovery and receive notifications" : "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
+    "Profile picture" : "Photo de profil",
+    "Upload new" : "Nouvelle depuis votre ordinateur",
+    "Select new from Files" : "Nouvelle depuis les Fichiers",
+    "Remove image" : "Supprimer l'image",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
+    "Your avatar is provided by your original account." : "Votre avatar est fourni par votre compte original.",
+    "Cancel" : "Annuler",
+    "Choose as profile image" : "Choisir en tant que photo de profil ",
+    "Language" : "Langue",
+    "Help translate" : "Aidez à traduire",
+    "Common Name" : "Nom d'usage",
+    "Valid until" : "Valide jusqu'à",
+    "Issued By" : "Délivré par",
+    "Valid until %s" : "Valide jusqu'à %s",
+    "Import Root Certificate" : "Importer un certificat racine",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
+    "Log-in password" : "Mot de passe de connexion",
+    "Decrypt all Files" : "Déchiffrer tous les fichiers",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
+    "Restore Encryption Keys" : "Restaurer les clés de chiffrement",
+    "Delete Encryption Keys" : "Supprimer les clés de chiffrement",
+    "Show storage location" : "Afficher l'emplacement du stockage",
+    "Show last log in" : "Montrer la dernière identification",
+    "Login Name" : "Nom d'utilisateur",
+    "Create" : "Créer",
+    "Admin Recovery Password" : "Récupération du mot de passe administrateur",
+    "Enter the recovery password in order to recover the users files during password change" : "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
+    "Search Users and Groups" : "Chercher parmi les utilisateurs et groupes",
+    "Add Group" : "Ajouter un groupe",
+    "Group" : "Groupe",
+    "Everyone" : "Tout le monde",
+    "Admins" : "Administrateurs",
+    "Default Quota" : "Quota par défaut",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
+    "Unlimited" : "Illimité",
+    "Other" : "Autre",
+    "Username" : "Nom d'utilisateur",
+    "Quota" : "Quota",
+    "Storage Location" : "Emplacement du Stockage",
+    "Last Login" : "Dernière Connexion",
+    "change full name" : "Modifier le nom complet",
+    "set new password" : "Changer le mot de passe",
+    "Default" : "Défaut"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
new file mode 100644
index 00000000000..21f2424729e
--- /dev/null
+++ b/settings/l10n/fr.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Activée",
+    "Not enabled" : "Désactivée",
+    "Recommended" : "Recommandée",
+    "Authentication error" : "Erreur d'authentification",
+    "Your full name has been changed." : "Votre nom complet a été modifié.",
+    "Unable to change full name" : "Impossible de changer le nom complet",
+    "Group already exists" : "Ce groupe existe déjà",
+    "Unable to add group" : "Impossible d'ajouter le groupe",
+    "Files decrypted successfully" : "Fichiers décryptés avec succès",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur",
+    "Couldn't decrypt your files, check your password and try again" : "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
+    "Encryption keys deleted permanently" : "Clés de chiffrement définitivement supprimées.",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+    "Couldn't remove app." : "Impossible de supprimer l'application.",
+    "Email saved" : "E-mail sauvegardé",
+    "Invalid email" : "E-mail invalide",
+    "Unable to delete group" : "Impossible de supprimer le groupe",
+    "Unable to delete user" : "Impossible de supprimer l'utilisateur",
+    "Backups restored successfully" : "La sauvegarde a été restaurée avec succès",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
+    "Language changed" : "Langue changée",
+    "Invalid request" : "Requête invalide",
+    "Admins can't remove themself from the admin group" : "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
+    "Unable to add user to group %s" : "Impossible d'ajouter l'utilisateur au groupe %s",
+    "Unable to remove user from group %s" : "Impossible de supprimer l'utilisateur du groupe %s",
+    "Couldn't update app." : "Impossible de mettre à jour l'application",
+    "Wrong password" : "Mot de passe incorrect",
+    "No user supplied" : "Aucun utilisateur fourni",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
+    "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
+    "Unable to change password" : "Impossible de modifier le mot de passe",
+    "Saved" : "Sauvegardé",
+    "test email settings" : "tester les paramètres d'e-mail",
+    "If you received this email, the settings seem to be correct." : "Si vous recevez cet email, c'est que les paramètres sont corrects",
+    "A problem occurred while sending the email. Please revise your settings." : "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres.",
+    "Email sent" : "Email envoyé",
+    "You need to set your user email before being able to send test emails." : "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
+    "Add trusted domain" : "Ajouter un domaine de confiance",
+    "Sending..." : "Envoi en cours...",
+    "All" : "Tous",
+    "Please wait...." : "Veuillez patienter…",
+    "Error while disabling app" : "Erreur lors de la désactivation de l'application",
+    "Disable" : "Désactiver",
+    "Enable" : "Activer",
+    "Error while enabling app" : "Erreur lors de l'activation de l'application",
+    "Updating...." : "Mise à jour...",
+    "Error while updating app" : "Erreur lors de la mise à jour de l'application",
+    "Updated" : "Mise à jour effectuée avec succès",
+    "Uninstalling ...." : "Désintallation...",
+    "Error while uninstalling app" : "Erreur lors de la désinstallation de l'application",
+    "Uninstall" : "Désinstaller",
+    "Select a profile picture" : "Selectionner une photo de profil ",
+    "Very weak password" : "Mot de passe de très faible sécurité",
+    "Weak password" : "Mot de passe de faible sécurité",
+    "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é",
+    "Valid until {date}" : "Valide jusqu'au {date}",
+    "Delete" : "Supprimer",
+    "Decrypting files... Please wait, this can take some time." : "Déchiffrement en cours... Cela peut prendre un certain temps.",
+    "Delete encryption keys permanently." : "Supprimer définitivement les clés de chiffrement",
+    "Restore encryption keys." : "Restaurer les clés de chiffrement",
+    "Groups" : "Groupes",
+    "Unable to delete {objName}" : "Impossible de supprimer {objName}",
+    "Error creating group" : "Erreur lors de la création du groupe",
+    "A valid group name must be provided" : "Vous devez spécifier un nom de groupe valide",
+    "deleted {groupName}" : "{groupName} supprimé",
+    "undo" : "annuler",
+    "never" : "jamais",
+    "deleted {userName}" : "{userName} supprimé",
+    "add group" : "ajouter un groupe",
+    "A valid username must be provided" : "Un nom d'utilisateur valide doit être saisi",
+    "Error creating user" : "Erreur lors de la création de l'utilisateur",
+    "A valid password must be provided" : "Un mot de passe valide doit être saisi",
+    "Warning: Home directory for user \"{user}\" already exists" : "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
+    "__language_name__" : "Français",
+    "SSL root certificates" : "Certificats racine SSL",
+    "Encryption" : "Chiffrement",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
+    "Info, warnings, errors and fatal issues" : "Informations, avertissements, erreurs et erreurs fatales",
+    "Warnings, errors and fatal issues" : "Avertissements, erreurs et erreurs fatales",
+    "Errors and fatal issues" : "Erreurs et erreurs fatales",
+    "Fatal issues only" : "Erreurs fatales uniquement",
+    "None" : "Aucun",
+    "Login" : "Connexion",
+    "Plain" : "En clair",
+    "NT LAN Manager" : "Gestionnaire du réseau NT",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avertissement de sécurité",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Vous accédez à %s via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS à la place.",
+    "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." : "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
+    "Setup Warning" : "Avertissement, problème de configuration",
+    "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.",
+    "Database Performance Info" : "Performances de la base de données",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite est utilisée comme base de donnée. Pour des installations plus volumineuse, nous vous conseillons de changer ce réglage. Pour migrer vers une autre base de donnée, utilisez la commande : \"occ db:convert-type\"",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' manquant",
+    "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 pour la détection des types de fichiers.",
+    "Your PHP version is outdated" : "Votre version de PHP est trop ancienne",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement.",
+    "PHP charset is not set to UTF-8" : "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
+    "Locale not working" : "Localisation non fonctionnelle",
+    "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte 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 to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
+    "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
+    "Connectivity checks" : "Vérification de la connectivité",
+    "No problems found" : "Aucun problème trouvé",
+    "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
+    "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
+    "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via 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.",
+    "Sharing" : "Partage",
+    "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",
+    "Enforce password protection" : "Obliger la protection par mot de passe",
+    "Allow public uploads" : "Autoriser les téléversements publics",
+    "Set default expiration date" : "Spécifier la date d'expiration par défaut",
+    "Expire after " : "Expiration après ",
+    "days" : "jours",
+    "Enforce expiration date" : "Imposer la date d'expiration",
+    "Allow resharing" : "Autoriser le repartage",
+    "Restrict users to only share with users in their groups" : "N'autoriser les partages qu'entre membres de même groupes",
+    "Allow users to send mail notification for shared files" : "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
+    "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. ",
+    "Security" : "Sécurité",
+    "Enforce HTTPS" : "Forcer HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forcer les clients à se connecter à %s via une connexion chiffrée.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
+    "Email Server" : "Serveur mail",
+    "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
+    "Send mode" : "Mode d'envoi",
+    "From address" : "Adresse source",
+    "mail" : "courriel",
+    "Authentication method" : "Méthode d'authentification",
+    "Authentication required" : "Authentification requise",
+    "Server address" : "Adresse du serveur",
+    "Port" : "Port",
+    "Credentials" : "Informations d'identification",
+    "SMTP Username" : "Nom d'utilisateur SMTP",
+    "SMTP Password" : "Mot de passe SMTP",
+    "Store credentials" : "Enregistrer les identifiants",
+    "Test email settings" : "Tester les paramètres e-mail",
+    "Send email" : "Envoyer un e-mail",
+    "Log" : "Log",
+    "Log level" : "Niveau de log",
+    "More" : "Plus",
+    "Less" : "Moins",
+    "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>." : "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Plus d'applications",
+    "Add your app" : "Ajouter votre application",
+    "by" : "par",
+    "licensed" : "Sous licence",
+    "Documentation:" : "Documentation :",
+    "User Documentation" : "Documentation utilisateur",
+    "Admin Documentation" : "Documentation administrateur",
+    "Update to %s" : "Mettre à niveau vers la version %s",
+    "Enable only for specific groups" : "Activer uniquement pour certains groupes",
+    "Uninstall App" : "Désinstaller l'application",
+    "Administrator Documentation" : "Documentation administrateur",
+    "Online Documentation" : "Documentation en ligne",
+    "Forum" : "Forum",
+    "Bugtracker" : "Suivi de bugs",
+    "Commercial Support" : "Support commercial",
+    "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voulez soutenir le projet,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez en</a> !",
+    "Show First Run Wizard again" : "Revoir le premier lancement de l'installeur",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
+    "Password" : "Mot de passe",
+    "Your password was changed" : "Votre mot de passe a été changé",
+    "Unable to change your password" : "Impossible de changer votre mot de passe",
+    "Current password" : "Mot de passe actuel",
+    "New password" : "Nouveau mot de passe",
+    "Change password" : "Changer de mot de passe",
+    "Full Name" : "Nom complet",
+    "Email" : "Adresse mail",
+    "Your email address" : "Votre adresse e-mail",
+    "Fill in an email address to enable password recovery and receive notifications" : "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
+    "Profile picture" : "Photo de profil",
+    "Upload new" : "Nouvelle depuis votre ordinateur",
+    "Select new from Files" : "Nouvelle depuis les Fichiers",
+    "Remove image" : "Supprimer l'image",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
+    "Your avatar is provided by your original account." : "Votre avatar est fourni par votre compte original.",
+    "Cancel" : "Annuler",
+    "Choose as profile image" : "Choisir en tant que photo de profil ",
+    "Language" : "Langue",
+    "Help translate" : "Aidez à traduire",
+    "Common Name" : "Nom d'usage",
+    "Valid until" : "Valide jusqu'à",
+    "Issued By" : "Délivré par",
+    "Valid until %s" : "Valide jusqu'à %s",
+    "Import Root Certificate" : "Importer un certificat racine",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
+    "Log-in password" : "Mot de passe de connexion",
+    "Decrypt all Files" : "Déchiffrer tous les fichiers",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
+    "Restore Encryption Keys" : "Restaurer les clés de chiffrement",
+    "Delete Encryption Keys" : "Supprimer les clés de chiffrement",
+    "Show storage location" : "Afficher l'emplacement du stockage",
+    "Show last log in" : "Montrer la dernière identification",
+    "Login Name" : "Nom d'utilisateur",
+    "Create" : "Créer",
+    "Admin Recovery Password" : "Récupération du mot de passe administrateur",
+    "Enter the recovery password in order to recover the users files during password change" : "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
+    "Search Users and Groups" : "Chercher parmi les utilisateurs et groupes",
+    "Add Group" : "Ajouter un groupe",
+    "Group" : "Groupe",
+    "Everyone" : "Tout le monde",
+    "Admins" : "Administrateurs",
+    "Default Quota" : "Quota par défaut",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
+    "Unlimited" : "Illimité",
+    "Other" : "Autre",
+    "Username" : "Nom d'utilisateur",
+    "Quota" : "Quota",
+    "Storage Location" : "Emplacement du Stockage",
+    "Last Login" : "Dernière Connexion",
+    "change full name" : "Modifier le nom complet",
+    "set new password" : "Changer le mot de passe",
+    "Default" : "Défaut"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
deleted file mode 100644
index 56c89bc412d..00000000000
--- a/settings/l10n/fr.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Activées",
-"Not enabled" => "Désactivées",
-"Recommended" => "Recommandées",
-"Authentication error" => "Erreur d'authentification",
-"Your full name has been changed." => "Votre nom complet a été modifié.",
-"Unable to change full name" => "Impossible de changer le nom complet",
-"Group already exists" => "Ce groupe existe déjà",
-"Unable to add group" => "Impossible d'ajouter le groupe",
-"Files decrypted successfully" => "Fichiers décryptés avec succès",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossible de décrypter vos fichiers, veuillez vérifier votre owncloud.log ou demander à votre administrateur",
-"Couldn't decrypt your files, check your password and try again" => "Impossible de décrypter vos fichiers, vérifiez votre mot de passe et essayez à nouveau",
-"Encryption keys deleted permanently" => "Clés de chiffrement définitivement supprimées.",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de supprimer définitivement vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
-"Couldn't remove app." => "Impossible de supprimer l'application.",
-"Email saved" => "E-mail sauvegardé",
-"Invalid email" => "E-mail invalide",
-"Unable to delete group" => "Impossible de supprimer le groupe",
-"Unable to delete user" => "Impossible de supprimer l'utilisateur",
-"Backups restored successfully" => "La sauvegarde a été restaurée avec succès",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossible de restaurer vos clés de chiffrement, merci de regarder journal owncloud.log ou de demander à votre administrateur",
-"Language changed" => "Langue changée",
-"Invalid request" => "Requête invalide",
-"Admins can't remove themself from the admin group" => "Les administrateurs ne peuvent pas se retirer eux-mêmes du groupe admin",
-"Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
-"Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s",
-"Couldn't update app." => "Impossible de mettre à jour l'application",
-"Wrong password" => "Mot de passe incorrect",
-"No user supplied" => "Aucun utilisateur fourni",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
-"Wrong admin recovery password. Please check the password and try again." => "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
-"Unable to change password" => "Impossible de modifier le mot de passe",
-"Saved" => "Sauvegardé",
-"test email settings" => "tester les paramètres d'e-mail",
-"If you received this email, the settings seem to be correct." => "Si vous recevez cet email, c'est que les paramètres sont corrects",
-"A problem occurred while sending the email. Please revise your settings." => "Une erreur est survenue lors de l'envoi de l'e-mail. Veuillez vérifier vos paramètres.",
-"Email sent" => "Email envoyé",
-"You need to set your user email before being able to send test emails." => "Vous devez configurer votre e-mail d'utilisateur avant de pouvoir envoyer des e-mails de test.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Êtes-vous vraiment sûr de vouloir ajouter \"{domain}\" comme domaine de confiance ?",
-"Add trusted domain" => "Ajouter un domaine de confiance",
-"Sending..." => "Envoi en cours...",
-"All" => "Tous",
-"Please wait...." => "Veuillez patienter…",
-"Error while disabling app" => "Erreur lors de la désactivation de l'application",
-"Disable" => "Désactiver",
-"Enable" => "Activer",
-"Error while enabling app" => "Erreur lors de l'activation de l'application",
-"Updating...." => "Mise à jour...",
-"Error while updating app" => "Erreur lors de la mise à jour de l'application",
-"Updated" => "Mise à jour effectuée avec succès",
-"Uninstalling ...." => "Désintallation...",
-"Error while uninstalling app" => "Erreur lors de la désinstallation de l'application",
-"Uninstall" => "Désinstaller",
-"Select a profile picture" => "Selectionner une photo de profil ",
-"Very weak password" => "Mot de passe de très faible sécurité",
-"Weak password" => "Mot de passe de faible sécurité",
-"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é",
-"Valid until {date}" => "Valide jusqu'au {date}",
-"Delete" => "Supprimer",
-"Decrypting files... Please wait, this can take some time." => "Déchiffrement en cours... Cela peut prendre un certain temps.",
-"Delete encryption keys permanently." => "Supprimer définitivement les clés de chiffrement",
-"Restore encryption keys." => "Restaurer les clés de chiffrement",
-"Groups" => "Groupes",
-"Unable to delete {objName}" => "Impossible de supprimer {objName}",
-"Error creating group" => "Erreur lors de la création du groupe",
-"A valid group name must be provided" => "Vous devez spécifier un nom de groupe valide",
-"deleted {groupName}" => "{groupName} supprimé",
-"undo" => "annuler",
-"no group" => "Aucun groupe",
-"never" => "jamais",
-"deleted {userName}" => "{userName} supprimé",
-"add group" => "ajouter un groupe",
-"A valid username must be provided" => "Un nom d'utilisateur valide doit être saisi",
-"Error creating user" => "Erreur lors de la création de l'utilisateur",
-"A valid password must be provided" => "Un mot de passe valide doit être saisi",
-"Warning: Home directory for user \"{user}\" already exists" => "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
-"__language_name__" => "Français",
-"Personal Info" => "Informations personnelles",
-"SSL root certificates" => "Certificats racine SSL",
-"Encryption" => "Chiffrement",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
-"Info, warnings, errors and fatal issues" => "Informations, avertissements, erreurs et erreurs fatales",
-"Warnings, errors and fatal issues" => "Avertissements, erreurs et erreurs fatales",
-"Errors and fatal issues" => "Erreurs et erreurs fatales",
-"Fatal issues only" => "Erreurs fatales uniquement",
-"None" => "Aucun",
-"Login" => "Connexion",
-"Plain" => "En clair",
-"NT LAN Manager" => "Gestionnaire du réseau NT",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Avertissement de sécurité",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Vous accédez à %s via HTTP. Nous vous recommandons fortement de configurer votre serveur pour forcer l'utilisation de HTTPS à la place.",
-"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." => "Votre dossier de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce dossier de données ne soit plus accessible, ou bien de le déplacer à l'extérieur de la racine du serveur web.",
-"Setup Warning" => "Avertissement, problème de configuration",
-"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.",
-"Database Performance Info" => "Performances de la base de données",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite est utilisée comme base de donnée. Pour des installations plus volumineuse, nous vous conseillons de changer ce réglage. Pour migrer vers une autre base de donnée, utilisez la commande : \"occ db:convert-type\"",
-"Module 'fileinfo' missing" => "Module 'fileinfo' manquant",
-"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 pour la détection des types de fichiers.",
-"Your PHP version is outdated" => "Votre version de PHP est trop ancienne",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Votre version de PHP est trop ancienne. Nous vous recommandons fortement de migrer vers une version 5.3.8 ou plus récente encore, car les versions antérieures sont réputées problématiques. Il est possible que cette installation ne fonctionne pas correctement.",
-"PHP charset is not set to UTF-8" => "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
-"Locale not working" => "Localisation non fonctionnelle",
-"System locale can not be set to a one which supports UTF-8." => "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte 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 to install the required packages on your system to support one of the following locales: %s." => "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
-"URL generation in notification emails" => "Génération d'URL dans les mails de notification",
-"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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
-"Connectivity checks" => "Vérification de la connectivité",
-"No problems found" => "Aucun problème trouvé",
-"Please double check the <a href='%s'>installation guides</a>." => "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Le dernier cron s'est exécuté à %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
-"Cron was not executed yet!" => "Le cron n'a pas encore été exécuté !",
-"Execute one task with each page loaded" => "Exécute une tâche à chaque chargement de page",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via 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.",
-"Sharing" => "Partage",
-"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",
-"Enforce password protection" => "Obliger la protection par mot de passe",
-"Allow public uploads" => "Autoriser les téléversements publics",
-"Set default expiration date" => "Spécifier la date d'expiration par défaut",
-"Expire after " => "Expiration après ",
-"days" => "jours",
-"Enforce expiration date" => "Imposer la date d'expiration",
-"Allow resharing" => "Autoriser le repartage",
-"Restrict users to only share with users in their groups" => "N'autoriser les partages qu'entre membres de même groupes",
-"Allow users to send mail notification for shared files" => "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
-"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. ",
-"Security" => "Sécurité",
-"Enforce HTTPS" => "Forcer HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forcer les clients à se connecter à %s via une connexion chiffrée.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
-"Email Server" => "Serveur mail",
-"This is used for sending out notifications." => "Ceci est utilisé pour l'envoi des notifications.",
-"Send mode" => "Mode d'envoi",
-"From address" => "Adresse source",
-"mail" => "courriel",
-"Authentication method" => "Méthode d'authentification",
-"Authentication required" => "Authentification requise",
-"Server address" => "Adresse du serveur",
-"Port" => "Port",
-"Credentials" => "Informations d'identification",
-"SMTP Username" => "Nom d'utilisateur SMTP",
-"SMTP Password" => "Mot de passe SMTP",
-"Store credentials" => "Enregistrer les identifiants",
-"Test email settings" => "Tester les paramètres e-mail",
-"Send email" => "Envoyer un e-mail",
-"Log" => "Log",
-"Log level" => "Niveau de log",
-"More" => "Plus",
-"Less" => "Moins",
-"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>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Plus d'applications",
-"Add your app" => "Ajouter votre application",
-"by" => "par",
-"licensed" => "Sous licence",
-"Documentation:" => "Documentation :",
-"User Documentation" => "Documentation utilisateur",
-"Admin Documentation" => "Documentation administrateur",
-"Update to %s" => "Mettre à niveau vers la version %s",
-"Enable only for specific groups" => "Activer uniquement pour certains groupes",
-"Uninstall App" => "Désinstaller l'application",
-"Administrator Documentation" => "Documentation administrateur",
-"Online Documentation" => "Documentation en ligne",
-"Forum" => "Forum",
-"Bugtracker" => "Suivi de bugs",
-"Commercial Support" => "Support commercial",
-"Get the apps to sync your files" => "Obtenez les applications de synchronisation de vos fichiers",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Si voulez soutenir le projet,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez en</a> !",
-"Show First Run Wizard again" => "Revoir le premier lancement de l'installeur",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
-"Password" => "Mot de passe",
-"Your password was changed" => "Votre mot de passe a été changé",
-"Unable to change your password" => "Impossible de changer votre mot de passe",
-"Current password" => "Mot de passe actuel",
-"New password" => "Nouveau mot de passe",
-"Change password" => "Changer de mot de passe",
-"Full Name" => "Nom complet",
-"Email" => "Adresse mail",
-"Your email address" => "Votre adresse e-mail",
-"Fill in an email address to enable password recovery and receive notifications" => "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
-"Profile picture" => "Photo de profil",
-"Upload new" => "Nouvelle depuis votre ordinateur",
-"Select new from Files" => "Nouvelle depuis les Fichiers",
-"Remove image" => "Supprimer l'image",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
-"Your avatar is provided by your original account." => "Votre avatar est fourni par votre compte original.",
-"Cancel" => "Annuler",
-"Choose as profile image" => "Choisir en tant que photo de profil ",
-"Language" => "Langue",
-"Help translate" => "Aidez à traduire",
-"Common Name" => "Nom d'usage",
-"Valid until" => "Valide jusqu'à",
-"Issued By" => "Délivré par",
-"Valid until %s" => "Valide jusqu'à %s",
-"Import Root Certificate" => "Importer un certificat racine",
-"The encryption app is no longer enabled, please decrypt all your files" => "L'app de chiffrement n’est plus activée, veuillez déchiffrer tous vos fichiers",
-"Log-in password" => "Mot de passe de connexion",
-"Decrypt all Files" => "Déchiffrer tous les fichiers",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vos clés de chiffrement ont été déplacées dans l'emplacement de backup. Si quelque chose devait mal se passer, vous pouvez restaurer les clés. Choisissez la suppression permanente seulement si vous êtes sûr que tous les fichiers ont été déchiffrés correctement.",
-"Restore Encryption Keys" => "Restaurer les clés de chiffrement",
-"Delete Encryption Keys" => "Supprimer les clés de chiffrement",
-"Show storage location" => "Afficher l'emplacement du stockage",
-"Show last log in" => "Montrer la dernière identification",
-"Login Name" => "Nom d'utilisateur",
-"Create" => "Créer",
-"Admin Recovery Password" => "Récupération du mot de passe administrateur",
-"Enter the recovery password in order to recover the users files during password change" => "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
-"Search Users and Groups" => "Chercher parmi les utilisateurs et groupes",
-"Add Group" => "Ajouter un groupe",
-"Group" => "Groupe",
-"Everyone" => "Tout le monde",
-"Admins" => "Administrateurs",
-"Default Quota" => "Quota par défaut",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
-"Unlimited" => "Illimité",
-"Other" => "Autre",
-"Username" => "Nom d'utilisateur",
-"Group Admin for" => "Administrateur de groupe pour",
-"Quota" => "Quota",
-"Storage Location" => "Emplacement du Stockage",
-"Last Login" => "Dernière Connexion",
-"change full name" => "Modifier le nom complet",
-"set new password" => "Changer le mot de passe",
-"Default" => "Défaut"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
new file mode 100644
index 00000000000..6a9f27f524f
--- /dev/null
+++ b/settings/l10n/gl.js
@@ -0,0 +1,219 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Activado",
+    "Authentication error" : "Produciuse un erro de autenticación",
+    "Your full name has been changed." : "O seu nome completo foi cambiado",
+    "Unable to change full name" : "Non é posíbel cambiar o nome completo",
+    "Group already exists" : "O grupo xa existe",
+    "Unable to add group" : "Non é posíbel engadir o grupo",
+    "Files decrypted successfully" : "Ficheiros descifrados satisfactoriamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
+    "Encryption keys deleted permanently" : "As chaves de cifrado foron eliminadas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Couldn't remove app." : "Non foi posíbel retirar a aplicación.",
+    "Email saved" : "Correo gardado",
+    "Invalid email" : "Correo incorrecto",
+    "Unable to delete group" : "Non é posíbel eliminar o grupo.",
+    "Unable to delete user" : "Non é posíbel eliminar o usuario",
+    "Backups restored successfully" : "As copias de seguranza foron restauradas satisfactoriamente",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Language changed" : "O idioma cambiou",
+    "Invalid request" : "Petición incorrecta",
+    "Admins can't remove themself from the admin group" : "Os administradores non poden eliminarse a si mesmos do grupo admin",
+    "Unable to add user to group %s" : "Non é posíbel engadir o usuario ao grupo %s",
+    "Unable to remove user from group %s" : "Non é posíbel eliminar o usuario do grupo %s",
+    "Couldn't update app." : "Non foi posíbel actualizar a aplicación.",
+    "Wrong password" : "Contrasinal incorrecto",
+    "No user supplied" : "Non subministrado polo usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
+    "Wrong admin recovery password. Please check the password and try again." : "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
+    "Unable to change password" : "Non é posíbel cambiar o contrasinal",
+    "Saved" : "Gardado",
+    "test email settings" : "correo de proba dos axustes",
+    "If you received this email, the settings seem to be correct." : "Se recibiu este correo, semella que a configuración é correcta.",
+    "Email sent" : "Correo enviado",
+    "You need to set your user email before being able to send test emails." : "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
+    "Sending..." : "Enviando...",
+    "All" : "Todo",
+    "Please wait...." : "Agarde...",
+    "Error while disabling app" : "Produciuse un erro ao desactivar a aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Produciuse un erro ao activar a aplicación",
+    "Updating...." : "Actualizando...",
+    "Error while updating app" : "Produciuse un erro mentres actualizaba a aplicación",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Produciuse un erro ao desinstalar o aplicatvo",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Seleccione unha imaxe para o perfil",
+    "Very weak password" : "Contrasinal moi feble",
+    "Weak password" : "Contrasinal feble",
+    "So-so password" : "Contrasinal non moi aló",
+    "Good password" : "Bo contrasinal",
+    "Strong password" : "Contrasinal forte",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
+    "Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
+    "Restore encryption keys." : "Restaurar as chaves de cifrado.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Non é posíbel eliminar {objName}",
+    "Error creating group" : "Produciuse un erro ao crear o grupo",
+    "A valid group name must be provided" : "Debe fornecer un nome de grupo",
+    "deleted {groupName}" : "{groupName} foi eliminado",
+    "undo" : "desfacer",
+    "never" : "nunca",
+    "deleted {userName}" : "{userName} foi eliminado",
+    "add group" : "engadir un grupo",
+    "A valid username must be provided" : "Debe fornecer un nome de usuario",
+    "Error creating user" : "Produciuse un erro ao crear o usuario",
+    "A valid password must be provided" : "Debe fornecer un contrasinal",
+    "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O directorio persoal para o usuario «{user}» xa existe",
+    "__language_name__" : "Galego",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (problemas críticos, erros, avisos, información, depuración)",
+    "Info, warnings, errors and fatal issues" : "Información, avisos, erros e problemas críticos",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas críticos",
+    "Errors and fatal issues" : "Erros e problemas críticos",
+    "Fatal issues only" : "Só problemas críticos",
+    "None" : "Ningún",
+    "Login" : "Acceso",
+    "Plain" : "Simple",
+    "NT LAN Manager" : "Xestor NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Aviso de seguranza",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está accedendo a %s a través de HTTP. Suxerímoslle que configure o seu servidor para requirir, no seu canto, o uso de HTTPS.",
+    "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." : "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través de internet. O ficheiro .htaccess non está a traballar. Suxerímoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesíbel ou que mova o o directorio de datos fóra da raíz de documentos do servidor web.",
+    "Setup Warning" : "Configurar os avisos",
+    "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.",
+    "Database Performance Info" : "Información do rendemento da base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
+    "Module 'fileinfo' missing" : "Non se atopou o módulo «fileinfo»",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
+    "Your PHP version is outdated" : "A versión de PHP está desactualizada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente.",
+    "PHP charset is not set to UTF-8" : "O xogo de caracteres de PHP non está estabelecido a UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "O xogo de caracteres de PHP non está estabelecido a UTF-8. Isto pode causar problemas importantes con caracteres non-ASCII nos nomes de ficheiro. Recomendámoslle que cambie o valor de php.ini «default_charset» a «UTF-8».",
+    "Locale not working" : "A configuración rexional non funciona",
+    "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
+    "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
+    "Please double check the <a href='%s'>installation guides</a>." : "Volva comprobar as <a href='%s'>guías de instalación</a>",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "O último «cron» executouse ás %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
+    "Cron was not executed yet!" : "«Cron» aínda non foi executado!",
+    "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
+    "Sharing" : "Compartindo",
+    "Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
+    "Allow users to share via link" : "Permitir que os usuarios compartan a través de ligazóns",
+    "Enforce password protection" : "Forzar a protección por contrasinal",
+    "Allow public uploads" : "Permitir os envíos públicos",
+    "Set default expiration date" : "Definir a data predeterminada de caducidade",
+    "Expire after " : "Caduca após",
+    "days" : "días",
+    "Enforce expiration date" : "Obrigar a data de caducidade",
+    "Allow resharing" : "Permitir compartir",
+    "Restrict users to only share with users in their groups" : "Restrinxir aos usuarios a compartir só cos usuarios dos seus grupos",
+    "Allow users to send mail notification for shared files" : "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
+    "Exclude groups from sharing" : "Excluír grupos da compartición",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderán recibir comparticións, mais non inicialas.",
+    "Security" : "Seguranza",
+    "Enforce HTTPS" : "Forzar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
+    "Email Server" : "Servidor de correo",
+    "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
+    "Send mode" : "Modo de envío",
+    "From address" : "Desde o enderezo",
+    "mail" : "correo",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Requírese autenticación",
+    "Server address" : "Enderezo do servidor",
+    "Port" : "Porto",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome de usuario SMTP",
+    "SMTP Password" : "Contrasinal SMTP",
+    "Test email settings" : "Correo de proba dos axustes",
+    "Send email" : "Enviar o correo",
+    "Log" : "Rexistro",
+    "Log level" : "Nivel de rexistro",
+    "More" : "Máis",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Máis aplicativos",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación do usuario",
+    "Admin Documentation" : "Documentación do administrador",
+    "Enable only for specific groups" : "Activar só para grupos específicos",
+    "Uninstall App" : "Desinstalar unha aplicación",
+    "Administrator Documentation" : "Documentación do administrador",
+    "Online Documentation" : "Documentación na Rede",
+    "Forum" : "Foro",
+    "Bugtracker" : "Seguemento de fallos",
+    "Commercial Support" : "Asistencia comercial",
+    "Get the apps to sync your files" : "Obteña as aplicacións para sincronizar os seus ficheiros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!",
+    "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
+    "Password" : "Contrasinal",
+    "Your password was changed" : "O seu contrasinal foi cambiado",
+    "Unable to change your password" : "Non é posíbel cambiar o seu contrasinal",
+    "Current password" : "Contrasinal actual",
+    "New password" : "Novo contrasinal",
+    "Change password" : "Cambiar o contrasinal",
+    "Full Name" : "Nome completo",
+    "Email" : "Correo",
+    "Your email address" : "O seu enderezo de correo",
+    "Fill in an email address to enable password recovery and receive notifications" : "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións",
+    "Profile picture" : "Imaxe do perfil",
+    "Upload new" : "Novo envío",
+    "Select new from Files" : "Seleccione unha nova de ficheiros",
+    "Remove image" : "Retirar a imaxe",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala.",
+    "Your avatar is provided by your original account." : "O seu avatar é fornecido pola súa conta orixinal.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolla unha imaxe para o perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Axude na tradución",
+    "Import Root Certificate" : "Importar o certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros",
+    "Log-in password" : "Contrasinal de acceso",
+    "Decrypt all Files" : "Descifrar todos os ficheiros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
+    "Restore Encryption Keys" : "Restaurar as chaves de cifrado",
+    "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
+    "Login Name" : "Nome de acceso",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
+    "Search Users and Groups" : "Buscar usuarios e grupos",
+    "Add Group" : "Engadir un grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Cota por omisión",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
+    "Unlimited" : "Sen límites",
+    "Other" : "Outro",
+    "Username" : "Nome de usuario",
+    "Quota" : "Cota",
+    "Storage Location" : "Localización do almacenamento",
+    "Last Login" : "Último acceso",
+    "change full name" : "Cambiar o nome completo",
+    "set new password" : "estabelecer un novo contrasinal",
+    "Default" : "Predeterminado"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
new file mode 100644
index 00000000000..96cf3364244
--- /dev/null
+++ b/settings/l10n/gl.json
@@ -0,0 +1,217 @@
+{ "translations": {
+    "Enabled" : "Activado",
+    "Authentication error" : "Produciuse un erro de autenticación",
+    "Your full name has been changed." : "O seu nome completo foi cambiado",
+    "Unable to change full name" : "Non é posíbel cambiar o nome completo",
+    "Group already exists" : "O grupo xa existe",
+    "Unable to add group" : "Non é posíbel engadir o grupo",
+    "Files decrypted successfully" : "Ficheiros descifrados satisfactoriamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
+    "Encryption keys deleted permanently" : "As chaves de cifrado foron eliminadas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Couldn't remove app." : "Non foi posíbel retirar a aplicación.",
+    "Email saved" : "Correo gardado",
+    "Invalid email" : "Correo incorrecto",
+    "Unable to delete group" : "Non é posíbel eliminar o grupo.",
+    "Unable to delete user" : "Non é posíbel eliminar o usuario",
+    "Backups restored successfully" : "As copias de seguranza foron restauradas satisfactoriamente",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
+    "Language changed" : "O idioma cambiou",
+    "Invalid request" : "Petición incorrecta",
+    "Admins can't remove themself from the admin group" : "Os administradores non poden eliminarse a si mesmos do grupo admin",
+    "Unable to add user to group %s" : "Non é posíbel engadir o usuario ao grupo %s",
+    "Unable to remove user from group %s" : "Non é posíbel eliminar o usuario do grupo %s",
+    "Couldn't update app." : "Non foi posíbel actualizar a aplicación.",
+    "Wrong password" : "Contrasinal incorrecto",
+    "No user supplied" : "Non subministrado polo usuario",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
+    "Wrong admin recovery password. Please check the password and try again." : "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
+    "Unable to change password" : "Non é posíbel cambiar o contrasinal",
+    "Saved" : "Gardado",
+    "test email settings" : "correo de proba dos axustes",
+    "If you received this email, the settings seem to be correct." : "Se recibiu este correo, semella que a configuración é correcta.",
+    "Email sent" : "Correo enviado",
+    "You need to set your user email before being able to send test emails." : "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
+    "Sending..." : "Enviando...",
+    "All" : "Todo",
+    "Please wait...." : "Agarde...",
+    "Error while disabling app" : "Produciuse un erro ao desactivar a aplicación",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Produciuse un erro ao activar a aplicación",
+    "Updating...." : "Actualizando...",
+    "Error while updating app" : "Produciuse un erro mentres actualizaba a aplicación",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Produciuse un erro ao desinstalar o aplicatvo",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Seleccione unha imaxe para o perfil",
+    "Very weak password" : "Contrasinal moi feble",
+    "Weak password" : "Contrasinal feble",
+    "So-so password" : "Contrasinal non moi aló",
+    "Good password" : "Bo contrasinal",
+    "Strong password" : "Contrasinal forte",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
+    "Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
+    "Restore encryption keys." : "Restaurar as chaves de cifrado.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Non é posíbel eliminar {objName}",
+    "Error creating group" : "Produciuse un erro ao crear o grupo",
+    "A valid group name must be provided" : "Debe fornecer un nome de grupo",
+    "deleted {groupName}" : "{groupName} foi eliminado",
+    "undo" : "desfacer",
+    "never" : "nunca",
+    "deleted {userName}" : "{userName} foi eliminado",
+    "add group" : "engadir un grupo",
+    "A valid username must be provided" : "Debe fornecer un nome de usuario",
+    "Error creating user" : "Produciuse un erro ao crear o usuario",
+    "A valid password must be provided" : "Debe fornecer un contrasinal",
+    "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O directorio persoal para o usuario «{user}» xa existe",
+    "__language_name__" : "Galego",
+    "SSL root certificates" : "Certificados raíz SSL",
+    "Encryption" : "Cifrado",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (problemas críticos, erros, avisos, información, depuración)",
+    "Info, warnings, errors and fatal issues" : "Información, avisos, erros e problemas críticos",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas críticos",
+    "Errors and fatal issues" : "Erros e problemas críticos",
+    "Fatal issues only" : "Só problemas críticos",
+    "None" : "Ningún",
+    "Login" : "Acceso",
+    "Plain" : "Simple",
+    "NT LAN Manager" : "Xestor NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Aviso de seguranza",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está accedendo a %s a través de HTTP. Suxerímoslle que configure o seu servidor para requirir, no seu canto, o uso de HTTPS.",
+    "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." : "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través de internet. O ficheiro .htaccess non está a traballar. Suxerímoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesíbel ou que mova o o directorio de datos fóra da raíz de documentos do servidor web.",
+    "Setup Warning" : "Configurar os avisos",
+    "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.",
+    "Database Performance Info" : "Información do rendemento da base de datos",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
+    "Module 'fileinfo' missing" : "Non se atopou o módulo «fileinfo»",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
+    "Your PHP version is outdated" : "A versión de PHP está desactualizada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente.",
+    "PHP charset is not set to UTF-8" : "O xogo de caracteres de PHP non está estabelecido a UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "O xogo de caracteres de PHP non está estabelecido a UTF-8. Isto pode causar problemas importantes con caracteres non-ASCII nos nomes de ficheiro. Recomendámoslle que cambie o valor de php.ini «default_charset» a «UTF-8».",
+    "Locale not working" : "A configuración rexional non funciona",
+    "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
+    "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
+    "Please double check the <a href='%s'>installation guides</a>." : "Volva comprobar as <a href='%s'>guías de instalación</a>",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "O último «cron» executouse ás %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
+    "Cron was not executed yet!" : "«Cron» aínda non foi executado!",
+    "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
+    "Sharing" : "Compartindo",
+    "Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
+    "Allow users to share via link" : "Permitir que os usuarios compartan a través de ligazóns",
+    "Enforce password protection" : "Forzar a protección por contrasinal",
+    "Allow public uploads" : "Permitir os envíos públicos",
+    "Set default expiration date" : "Definir a data predeterminada de caducidade",
+    "Expire after " : "Caduca após",
+    "days" : "días",
+    "Enforce expiration date" : "Obrigar a data de caducidade",
+    "Allow resharing" : "Permitir compartir",
+    "Restrict users to only share with users in their groups" : "Restrinxir aos usuarios a compartir só cos usuarios dos seus grupos",
+    "Allow users to send mail notification for shared files" : "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
+    "Exclude groups from sharing" : "Excluír grupos da compartición",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderán recibir comparticións, mais non inicialas.",
+    "Security" : "Seguranza",
+    "Enforce HTTPS" : "Forzar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
+    "Email Server" : "Servidor de correo",
+    "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
+    "Send mode" : "Modo de envío",
+    "From address" : "Desde o enderezo",
+    "mail" : "correo",
+    "Authentication method" : "Método de autenticación",
+    "Authentication required" : "Requírese autenticación",
+    "Server address" : "Enderezo do servidor",
+    "Port" : "Porto",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome de usuario SMTP",
+    "SMTP Password" : "Contrasinal SMTP",
+    "Test email settings" : "Correo de proba dos axustes",
+    "Send email" : "Enviar o correo",
+    "Log" : "Rexistro",
+    "Log level" : "Nivel de rexistro",
+    "More" : "Máis",
+    "Less" : "Menos",
+    "Version" : "Versión",
+    "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>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Máis aplicativos",
+    "by" : "por",
+    "Documentation:" : "Documentación:",
+    "User Documentation" : "Documentación do usuario",
+    "Admin Documentation" : "Documentación do administrador",
+    "Enable only for specific groups" : "Activar só para grupos específicos",
+    "Uninstall App" : "Desinstalar unha aplicación",
+    "Administrator Documentation" : "Documentación do administrador",
+    "Online Documentation" : "Documentación na Rede",
+    "Forum" : "Foro",
+    "Bugtracker" : "Seguemento de fallos",
+    "Commercial Support" : "Asistencia comercial",
+    "Get the apps to sync your files" : "Obteña as aplicacións para sincronizar os seus ficheiros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!",
+    "Show First Run Wizard again" : "Amosar o axudante da primeira execución outra vez",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
+    "Password" : "Contrasinal",
+    "Your password was changed" : "O seu contrasinal foi cambiado",
+    "Unable to change your password" : "Non é posíbel cambiar o seu contrasinal",
+    "Current password" : "Contrasinal actual",
+    "New password" : "Novo contrasinal",
+    "Change password" : "Cambiar o contrasinal",
+    "Full Name" : "Nome completo",
+    "Email" : "Correo",
+    "Your email address" : "O seu enderezo de correo",
+    "Fill in an email address to enable password recovery and receive notifications" : "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións",
+    "Profile picture" : "Imaxe do perfil",
+    "Upload new" : "Novo envío",
+    "Select new from Files" : "Seleccione unha nova de ficheiros",
+    "Remove image" : "Retirar a imaxe",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala.",
+    "Your avatar is provided by your original account." : "O seu avatar é fornecido pola súa conta orixinal.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolla unha imaxe para o perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Axude na tradución",
+    "Import Root Certificate" : "Importar o certificado raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros",
+    "Log-in password" : "Contrasinal de acceso",
+    "Decrypt all Files" : "Descifrar todos os ficheiros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
+    "Restore Encryption Keys" : "Restaurar as chaves de cifrado",
+    "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
+    "Login Name" : "Nome de acceso",
+    "Create" : "Crear",
+    "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
+    "Search Users and Groups" : "Buscar usuarios e grupos",
+    "Add Group" : "Engadir un grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Cota por omisión",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
+    "Unlimited" : "Sen límites",
+    "Other" : "Outro",
+    "Username" : "Nome de usuario",
+    "Quota" : "Cota",
+    "Storage Location" : "Localización do almacenamento",
+    "Last Login" : "Último acceso",
+    "change full name" : "Cambiar o nome completo",
+    "set new password" : "estabelecer un novo contrasinal",
+    "Default" : "Predeterminado"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
deleted file mode 100644
index 1399257d9c5..00000000000
--- a/settings/l10n/gl.php
+++ /dev/null
@@ -1,218 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Activado",
-"Authentication error" => "Produciuse un erro de autenticación",
-"Your full name has been changed." => "O seu nome completo foi cambiado",
-"Unable to change full name" => "Non é posíbel cambiar o nome completo",
-"Group already exists" => "O grupo xa existe",
-"Unable to add group" => "Non é posíbel engadir o grupo",
-"Files decrypted successfully" => "Ficheiros descifrados satisfactoriamente",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Non foi posíbel descifrar os seus ficheiros. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-"Couldn't decrypt your files, check your password and try again" => "Non foi posíbel descifrar os seus ficheiros. revise o seu contrasinal e ténteo de novo",
-"Encryption keys deleted permanently" => "As chaves de cifrado foron eliminadas permanentemente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel eliminar permanentemente as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-"Couldn't remove app." => "Non foi posíbel retirar a aplicación.",
-"Email saved" => "Correo gardado",
-"Invalid email" => "Correo incorrecto",
-"Unable to delete group" => "Non é posíbel eliminar o grupo.",
-"Unable to delete user" => "Non é posíbel eliminar o usuario",
-"Backups restored successfully" => "As copias de seguranza foron restauradas satisfactoriamente",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Non foi posíbel restaurar as chaves de cifrado. revise o ficheiro de rexistro owncloud.log, ou pregúntelle ao administrador",
-"Language changed" => "O idioma cambiou",
-"Invalid request" => "Petición incorrecta",
-"Admins can't remove themself from the admin group" => "Os administradores non poden eliminarse a si mesmos do grupo admin",
-"Unable to add user to group %s" => "Non é posíbel engadir o usuario ao grupo %s",
-"Unable to remove user from group %s" => "Non é posíbel eliminar o usuario do grupo %s",
-"Couldn't update app." => "Non foi posíbel actualizar a aplicación.",
-"Wrong password" => "Contrasinal incorrecto",
-"No user supplied" => "Non subministrado polo usuario",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Forneza un contrasinal de recuperación do administrador de recuperación, senón perderanse todos os datos do usuario",
-"Wrong admin recovery password. Please check the password and try again." => "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
-"Unable to change password" => "Non é posíbel cambiar o contrasinal",
-"Saved" => "Gardado",
-"test email settings" => "correo de proba dos axustes",
-"If you received this email, the settings seem to be correct." => "Se recibiu este correo, semella que a configuración é correcta.",
-"Email sent" => "Correo enviado",
-"You need to set your user email before being able to send test emails." => "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
-"Sending..." => "Enviando...",
-"All" => "Todo",
-"Please wait...." => "Agarde...",
-"Error while disabling app" => "Produciuse un erro ao desactivar a aplicación",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Produciuse un erro ao activar a aplicación",
-"Updating...." => "Actualizando...",
-"Error while updating app" => "Produciuse un erro mentres actualizaba a aplicación",
-"Updated" => "Actualizado",
-"Uninstalling ...." => "Desinstalando ...",
-"Error while uninstalling app" => "Produciuse un erro ao desinstalar o aplicatvo",
-"Uninstall" => "Desinstalar",
-"Select a profile picture" => "Seleccione unha imaxe para o perfil",
-"Very weak password" => "Contrasinal moi feble",
-"Weak password" => "Contrasinal feble",
-"So-so password" => "Contrasinal non moi aló",
-"Good password" => "Bo contrasinal",
-"Strong password" => "Contrasinal forte",
-"Delete" => "Eliminar",
-"Decrypting files... Please wait, this can take some time." => "Descifrando ficheiros... isto pode levar un anaco.",
-"Delete encryption keys permanently." => "Eliminar permanentemente as chaves de cifrado.",
-"Restore encryption keys." => "Restaurar as chaves de cifrado.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "Non é posíbel eliminar {objName}",
-"Error creating group" => "Produciuse un erro ao crear o grupo",
-"A valid group name must be provided" => "Debe fornecer un nome de grupo",
-"deleted {groupName}" => "{groupName} foi eliminado",
-"undo" => "desfacer",
-"never" => "nunca",
-"deleted {userName}" => "{userName} foi eliminado",
-"add group" => "engadir un grupo",
-"A valid username must be provided" => "Debe fornecer un nome de usuario",
-"Error creating user" => "Produciuse un erro ao crear o usuario",
-"A valid password must be provided" => "Debe fornecer un contrasinal",
-"Warning: Home directory for user \"{user}\" already exists" => "Aviso: O directorio persoal para o usuario «{user}» xa existe",
-"__language_name__" => "Galego",
-"SSL root certificates" => "Certificados raíz SSL",
-"Encryption" => "Cifrado",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Todo (problemas críticos, erros, avisos, información, depuración)",
-"Info, warnings, errors and fatal issues" => "Información, avisos, erros e problemas críticos",
-"Warnings, errors and fatal issues" => "Avisos, erros e problemas críticos",
-"Errors and fatal issues" => "Erros e problemas críticos",
-"Fatal issues only" => "Só problemas críticos",
-"None" => "Ningún",
-"Login" => "Acceso",
-"Plain" => "Simple",
-"NT LAN Manager" => "Xestor NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Aviso de seguranza",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está accedendo a %s a través de HTTP. Suxerímoslle que configure o seu servidor para requirir, no seu canto, o uso de HTTPS.",
-"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." => "O seu cartafol de datos e os seus ficheiros probabelmente sexan accesíbeis a través de internet. O ficheiro .htaccess non está a traballar. Suxerímoslle que configure o seu servidor web de tal maneira que o cartafol de datos non estea accesíbel ou que mova o o directorio de datos fóra da raíz de documentos do servidor web.",
-"Setup Warning" => "Configurar os avisos",
-"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.",
-"Database Performance Info" => "Información do rendemento da base de datos",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto. Para migrar a outra base de datos use a ferramenta en liña de ordes: «occ db:convert-type»",
-"Module 'fileinfo' missing" => "Non se atopou o módulo «fileinfo»",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Non se atopou o módulo de PHP «fileinfo». É recomendábel activar este módulo para obter os mellores resultados coa detección do tipo MIME.",
-"Your PHP version is outdated" => "A versión de PHP está desactualizada",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A versión de PHP está desactualizada. Recomendámoslle que a actualice á versión 5.3.8 ou posterior xa que as versións anteriores son coñecidas por estragarse. É probábel que esta instalación no estea a funcionar correctamente.",
-"PHP charset is not set to UTF-8" => "O xogo de caracteres de PHP non está estabelecido a UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "O xogo de caracteres de PHP non está estabelecido a UTF-8. Isto pode causar problemas importantes con caracteres non-ASCII nos nomes de ficheiro. Recomendámoslle que cambie o valor de php.ini «default_charset» a «UTF-8».",
-"Locale not working" => "A configuración rexional non funciona",
-"System locale can not be set to a one which supports UTF-8." => "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
-"URL generation in notification emails" => "Xeración dos URL nos correos de notificación",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
-"Please double check the <a href='%s'>installation guides</a>." => "Volva comprobar as <a href='%s'>guías de instalación</a>",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "O último «cron» executouse ás %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
-"Cron was not executed yet!" => "«Cron» aínda non foi executado!",
-"Execute one task with each page loaded" => "Executar unha tarefa con cada páxina cargada",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
-"Sharing" => "Compartindo",
-"Allow apps to use the Share API" => "Permitir que as aplicacións empreguen o API para compartir",
-"Allow users to share via link" => "Permitir que os usuarios compartan a través de ligazóns",
-"Enforce password protection" => "Forzar a protección por contrasinal",
-"Allow public uploads" => "Permitir os envíos públicos",
-"Set default expiration date" => "Definir a data predeterminada de caducidade",
-"Expire after " => "Caduca após",
-"days" => "días",
-"Enforce expiration date" => "Obrigar a data de caducidade",
-"Allow resharing" => "Permitir compartir",
-"Restrict users to only share with users in their groups" => "Restrinxir aos usuarios a compartir só cos usuarios dos seus grupos",
-"Allow users to send mail notification for shared files" => "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
-"Exclude groups from sharing" => "Excluír grupos da compartición",
-"These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderán recibir comparticións, mais non inicialas.",
-"Security" => "Seguranza",
-"Enforce HTTPS" => "Forzar HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
-"Email Server" => "Servidor de correo",
-"This is used for sending out notifications." => "Isto utilizase para o envío de notificacións.",
-"Send mode" => "Modo de envío",
-"From address" => "Desde o enderezo",
-"mail" => "correo",
-"Authentication method" => "Método de autenticación",
-"Authentication required" => "Requírese autenticación",
-"Server address" => "Enderezo do servidor",
-"Port" => "Porto",
-"Credentials" => "Credenciais",
-"SMTP Username" => "Nome de usuario SMTP",
-"SMTP Password" => "Contrasinal SMTP",
-"Test email settings" => "Correo de proba dos axustes",
-"Send email" => "Enviar o correo",
-"Log" => "Rexistro",
-"Log level" => "Nivel de rexistro",
-"More" => "Máis",
-"Less" => "Menos",
-"Version" => "Versión",
-"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>." => "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Máis aplicativos",
-"by" => "por",
-"Documentation:" => "Documentación:",
-"User Documentation" => "Documentación do usuario",
-"Admin Documentation" => "Documentación do administrador",
-"Enable only for specific groups" => "Activar só para grupos específicos",
-"Uninstall App" => "Desinstalar unha aplicación",
-"Administrator Documentation" => "Documentación do administrador",
-"Online Documentation" => "Documentación na Rede",
-"Forum" => "Foro",
-"Bugtracker" => "Seguemento de fallos",
-"Commercial Support" => "Asistencia comercial",
-"Get the apps to sync your files" => "Obteña as aplicacións para sincronizar os seus ficheiros",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se quere colaborar co proxecto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">participar no desenvolvemento</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">axudar a difundilo</a>!",
-"Show First Run Wizard again" => "Amosar o axudante da primeira execución outra vez",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ten en uso <strong>%s</strong> do total dispoñíbel de <strong>%s</strong>",
-"Password" => "Contrasinal",
-"Your password was changed" => "O seu contrasinal foi cambiado",
-"Unable to change your password" => "Non é posíbel cambiar o seu contrasinal",
-"Current password" => "Contrasinal actual",
-"New password" => "Novo contrasinal",
-"Change password" => "Cambiar o contrasinal",
-"Full Name" => "Nome completo",
-"Email" => "Correo",
-"Your email address" => "O seu enderezo de correo",
-"Fill in an email address to enable password recovery and receive notifications" => "Escriba un enderezo de correo para permitir a recuperación de contrasinais e recibir notificacións",
-"Profile picture" => "Imaxe do perfil",
-"Upload new" => "Novo envío",
-"Select new from Files" => "Seleccione unha nova de ficheiros",
-"Remove image" => "Retirar a imaxe",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Calquera png ou jpg. É preferíbel que sexa cadrada, mais poderá recortala.",
-"Your avatar is provided by your original account." => "O seu avatar é fornecido pola súa conta orixinal.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Escolla unha imaxe para o perfil",
-"Language" => "Idioma",
-"Help translate" => "Axude na tradución",
-"Import Root Certificate" => "Importar o certificado raíz",
-"The encryption app is no longer enabled, please decrypt all your files" => "A aplicación de cifrado non está activada, descifre todos os ficheiros",
-"Log-in password" => "Contrasinal de acceso",
-"Decrypt all Files" => "Descifrar todos os ficheiros",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
-"Restore Encryption Keys" => "Restaurar as chaves de cifrado",
-"Delete Encryption Keys" => "Eliminar as chaves de cifrado",
-"Login Name" => "Nome de acceso",
-"Create" => "Crear",
-"Admin Recovery Password" => "Contrasinal de recuperación do administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
-"Search Users and Groups" => "Buscar usuarios e grupos",
-"Add Group" => "Engadir un grupo",
-"Group" => "Grupo",
-"Everyone" => "Todos",
-"Admins" => "Administradores",
-"Default Quota" => "Cota por omisión",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
-"Unlimited" => "Sen límites",
-"Other" => "Outro",
-"Username" => "Nome de usuario",
-"Quota" => "Cota",
-"Storage Location" => "Localización do almacenamento",
-"Last Login" => "Último acceso",
-"change full name" => "Cambiar o nome completo",
-"set new password" => "estabelecer un novo contrasinal",
-"Default" => "Predeterminado"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
new file mode 100644
index 00000000000..de7df02ef12
--- /dev/null
+++ b/settings/l10n/he.js
@@ -0,0 +1,95 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "שגיאת הזדהות",
+    "Group already exists" : "הקבוצה כבר קיימת",
+    "Unable to add group" : "לא ניתן להוסיף קבוצה",
+    "Email saved" : "הדוא״ל נשמר",
+    "Invalid email" : "דוא״ל לא חוקי",
+    "Unable to delete group" : "לא ניתן למחוק את הקבוצה",
+    "Unable to delete user" : "לא ניתן למחוק את המשתמש",
+    "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." : "לא ניתן לעדכן את היישום.",
+    "Saved" : "נשמר",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "All" : "הכל",
+    "Please wait...." : "נא להמתין…",
+    "Disable" : "בטל",
+    "Enable" : "הפעלה",
+    "Updating...." : "מתבצע עדכון…",
+    "Error while updating app" : "אירעה שגיאה בעת עדכון היישום",
+    "Updated" : "מעודכן",
+    "Delete" : "מחיקה",
+    "Groups" : "קבוצות",
+    "undo" : "ביטול",
+    "never" : "לעולם לא",
+    "add group" : "הוספת קבוצה",
+    "A valid username must be provided" : "יש לספק שם משתמש תקני",
+    "Error creating user" : "יצירת המשתמש נכשלה",
+    "A valid password must be provided" : "יש לספק ססמה תקנית",
+    "__language_name__" : "עברית",
+    "SSL root certificates" : "שורש אישורי אבטחת SSL ",
+    "Encryption" : "הצפנה",
+    "None" : "כלום",
+    "Login" : "התחברות",
+    "Security Warning" : "אזהרת אבטחה",
+    "Setup Warning" : "שגיאת הגדרה",
+    "Module 'fileinfo' missing" : "המודול „fileinfo“ חסר",
+    "Please double check the <a href='%s'>installation guides</a>." : "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
+    "Sharing" : "שיתוף",
+    "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
+    "Allow resharing" : "לאפשר שיתוף מחדש",
+    "Security" : "אבטחה",
+    "Enforce HTTPS" : "לאלץ HTTPS",
+    "Server address" : "כתובת שרת",
+    "Port" : "פורט",
+    "Credentials" : "פרטי גישה",
+    "Log" : "יומן",
+    "Log level" : "רמת הדיווח",
+    "More" : "יותר",
+    "Less" : "פחות",
+    "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>." : "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "יישומים נוספים",
+    "by" : "על ידי",
+    "User Documentation" : "תיעוד משתמש",
+    "Administrator Documentation" : "תיעוד מנהלים",
+    "Online Documentation" : "תיעוד מקוון",
+    "Forum" : "פורום",
+    "Bugtracker" : "עוקב תקלות",
+    "Commercial Support" : "תמיכה בתשלום",
+    "Get the apps to sync your files" : "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
+    "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
+    "Password" : "סיסמא",
+    "Your password was changed" : "הססמה שלך הוחלפה",
+    "Unable to change your password" : "לא ניתן לשנות את הססמה שלך",
+    "Current password" : "ססמה נוכחית",
+    "New password" : "ססמה חדשה",
+    "Change password" : "שינוי ססמה",
+    "Email" : "דואר אלקטרוני",
+    "Your email address" : "כתובת הדוא״ל שלך",
+    "Profile picture" : "תמונת פרופיל",
+    "Cancel" : "ביטול",
+    "Language" : "פה",
+    "Help translate" : "עזרה בתרגום",
+    "Import Root Certificate" : "ייבוא אישור אבטחת שורש",
+    "Login Name" : "שם כניסה",
+    "Create" : "יצירה",
+    "Admin Recovery Password" : "ססמת השחזור של המנהל",
+    "Group" : "קבוצה",
+    "Default Quota" : "מכסת בררת המחדל",
+    "Unlimited" : "ללא הגבלה",
+    "Other" : "אחר",
+    "Username" : "שם משתמש",
+    "Quota" : "מכסה",
+    "set new password" : "הגדרת ססמה חדשה",
+    "Default" : "בררת מחדל"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
new file mode 100644
index 00000000000..904531fd5da
--- /dev/null
+++ b/settings/l10n/he.json
@@ -0,0 +1,93 @@
+{ "translations": {
+    "Authentication error" : "שגיאת הזדהות",
+    "Group already exists" : "הקבוצה כבר קיימת",
+    "Unable to add group" : "לא ניתן להוסיף קבוצה",
+    "Email saved" : "הדוא״ל נשמר",
+    "Invalid email" : "דוא״ל לא חוקי",
+    "Unable to delete group" : "לא ניתן למחוק את הקבוצה",
+    "Unable to delete user" : "לא ניתן למחוק את המשתמש",
+    "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." : "לא ניתן לעדכן את היישום.",
+    "Saved" : "נשמר",
+    "Email sent" : "הודעת הדוא״ל נשלחה",
+    "All" : "הכל",
+    "Please wait...." : "נא להמתין…",
+    "Disable" : "בטל",
+    "Enable" : "הפעלה",
+    "Updating...." : "מתבצע עדכון…",
+    "Error while updating app" : "אירעה שגיאה בעת עדכון היישום",
+    "Updated" : "מעודכן",
+    "Delete" : "מחיקה",
+    "Groups" : "קבוצות",
+    "undo" : "ביטול",
+    "never" : "לעולם לא",
+    "add group" : "הוספת קבוצה",
+    "A valid username must be provided" : "יש לספק שם משתמש תקני",
+    "Error creating user" : "יצירת המשתמש נכשלה",
+    "A valid password must be provided" : "יש לספק ססמה תקנית",
+    "__language_name__" : "עברית",
+    "SSL root certificates" : "שורש אישורי אבטחת SSL ",
+    "Encryption" : "הצפנה",
+    "None" : "כלום",
+    "Login" : "התחברות",
+    "Security Warning" : "אזהרת אבטחה",
+    "Setup Warning" : "שגיאת הגדרה",
+    "Module 'fileinfo' missing" : "המודול „fileinfo“ חסר",
+    "Please double check the <a href='%s'>installation guides</a>." : "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
+    "Sharing" : "שיתוף",
+    "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
+    "Allow resharing" : "לאפשר שיתוף מחדש",
+    "Security" : "אבטחה",
+    "Enforce HTTPS" : "לאלץ HTTPS",
+    "Server address" : "כתובת שרת",
+    "Port" : "פורט",
+    "Credentials" : "פרטי גישה",
+    "Log" : "יומן",
+    "Log level" : "רמת הדיווח",
+    "More" : "יותר",
+    "Less" : "פחות",
+    "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>." : "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "יישומים נוספים",
+    "by" : "על ידי",
+    "User Documentation" : "תיעוד משתמש",
+    "Administrator Documentation" : "תיעוד מנהלים",
+    "Online Documentation" : "תיעוד מקוון",
+    "Forum" : "פורום",
+    "Bugtracker" : "עוקב תקלות",
+    "Commercial Support" : "תמיכה בתשלום",
+    "Get the apps to sync your files" : "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
+    "Show First Run Wizard again" : "הצגת אשף ההפעלה הראשונית שוב",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
+    "Password" : "סיסמא",
+    "Your password was changed" : "הססמה שלך הוחלפה",
+    "Unable to change your password" : "לא ניתן לשנות את הססמה שלך",
+    "Current password" : "ססמה נוכחית",
+    "New password" : "ססמה חדשה",
+    "Change password" : "שינוי ססמה",
+    "Email" : "דואר אלקטרוני",
+    "Your email address" : "כתובת הדוא״ל שלך",
+    "Profile picture" : "תמונת פרופיל",
+    "Cancel" : "ביטול",
+    "Language" : "פה",
+    "Help translate" : "עזרה בתרגום",
+    "Import Root Certificate" : "ייבוא אישור אבטחת שורש",
+    "Login Name" : "שם כניסה",
+    "Create" : "יצירה",
+    "Admin Recovery Password" : "ססמת השחזור של המנהל",
+    "Group" : "קבוצה",
+    "Default Quota" : "מכסת בררת המחדל",
+    "Unlimited" : "ללא הגבלה",
+    "Other" : "אחר",
+    "Username" : "שם משתמש",
+    "Quota" : "מכסה",
+    "set new password" : "הגדרת ססמה חדשה",
+    "Default" : "בררת מחדל"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
deleted file mode 100644
index 0e626c9059a..00000000000
--- a/settings/l10n/he.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "שגיאת הזדהות",
-"Group already exists" => "הקבוצה כבר קיימת",
-"Unable to add group" => "לא ניתן להוסיף קבוצה",
-"Email saved" => "הדוא״ל נשמר",
-"Invalid email" => "דוא״ל לא חוקי",
-"Unable to delete group" => "לא ניתן למחוק את הקבוצה",
-"Unable to delete user" => "לא ניתן למחוק את המשתמש",
-"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." => "לא ניתן לעדכן את היישום.",
-"Saved" => "נשמר",
-"Email sent" => "הודעת הדוא״ל נשלחה",
-"All" => "הכל",
-"Please wait...." => "נא להמתין…",
-"Disable" => "בטל",
-"Enable" => "הפעלה",
-"Updating...." => "מתבצע עדכון…",
-"Error while updating app" => "אירעה שגיאה בעת עדכון היישום",
-"Updated" => "מעודכן",
-"Delete" => "מחיקה",
-"Groups" => "קבוצות",
-"undo" => "ביטול",
-"never" => "לעולם לא",
-"add group" => "הוספת קבוצה",
-"A valid username must be provided" => "יש לספק שם משתמש תקני",
-"Error creating user" => "יצירת המשתמש נכשלה",
-"A valid password must be provided" => "יש לספק ססמה תקנית",
-"__language_name__" => "עברית",
-"SSL root certificates" => "שורש אישורי אבטחת SSL ",
-"Encryption" => "הצפנה",
-"None" => "כלום",
-"Login" => "התחברות",
-"Security Warning" => "אזהרת אבטחה",
-"Setup Warning" => "שגיאת הגדרה",
-"Module 'fileinfo' missing" => "המודול „fileinfo“ חסר",
-"Please double check the <a href='%s'>installation guides</a>." => "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "יש להפעיל משימה אחת עם כל עמוד שנטען",
-"Sharing" => "שיתוף",
-"Allow apps to use the Share API" => "לאפשר ליישום להשתמש ב־API השיתוף",
-"Allow resharing" => "לאפשר שיתוף מחדש",
-"Security" => "אבטחה",
-"Enforce HTTPS" => "לאלץ HTTPS",
-"Server address" => "כתובת שרת",
-"Port" => "פורט",
-"Credentials" => "פרטי גישה",
-"Log" => "יומן",
-"Log level" => "רמת הדיווח",
-"More" => "יותר",
-"Less" => "פחות",
-"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>." => "פותח על די <a href=\"http://ownCloud.org/contact\" target=\"_blank\">קהילתownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">קוד המקור</a> מוגן ברישיון <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "יישומים נוספים",
-"by" => "על ידי",
-"User Documentation" => "תיעוד משתמש",
-"Administrator Documentation" => "תיעוד מנהלים",
-"Online Documentation" => "תיעוד מקוון",
-"Forum" => "פורום",
-"Bugtracker" => "עוקב תקלות",
-"Commercial Support" => "תמיכה בתשלום",
-"Get the apps to sync your files" => "השג את האפליקציות על מנת לסנכרן את הקבצים שלך",
-"Show First Run Wizard again" => "הצגת אשף ההפעלה הראשונית שוב",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "השתמשת ב־<strong>%s</strong> מתוך <strong>%s</strong> הזמינים לך",
-"Password" => "סיסמא",
-"Your password was changed" => "הססמה שלך הוחלפה",
-"Unable to change your password" => "לא ניתן לשנות את הססמה שלך",
-"Current password" => "ססמה נוכחית",
-"New password" => "ססמה חדשה",
-"Change password" => "שינוי ססמה",
-"Email" => "דואר אלקטרוני",
-"Your email address" => "כתובת הדוא״ל שלך",
-"Profile picture" => "תמונת פרופיל",
-"Cancel" => "ביטול",
-"Language" => "פה",
-"Help translate" => "עזרה בתרגום",
-"Import Root Certificate" => "ייבוא אישור אבטחת שורש",
-"Login Name" => "שם כניסה",
-"Create" => "יצירה",
-"Admin Recovery Password" => "ססמת השחזור של המנהל",
-"Group" => "קבוצה",
-"Default Quota" => "מכסת בררת המחדל",
-"Unlimited" => "ללא הגבלה",
-"Other" => "אחר",
-"Username" => "שם משתמש",
-"Quota" => "מכסה",
-"set new password" => "הגדרת ססמה חדשה",
-"Default" => "בררת מחדל"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hi.js b/settings/l10n/hi.js
new file mode 100644
index 00000000000..8a4b37ea206
--- /dev/null
+++ b/settings/l10n/hi.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Email sent" : "ईमेल भेज दिया गया है ",
+    "Security Warning" : "सुरक्षा चेतावनी ",
+    "More" : "और अधिक",
+    "Password" : "पासवर्ड",
+    "New password" : "नया पासवर्ड",
+    "Cancel" : "रद्द करें ",
+    "Username" : "प्रयोक्ता का नाम"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hi.json b/settings/l10n/hi.json
new file mode 100644
index 00000000000..30207c79fe0
--- /dev/null
+++ b/settings/l10n/hi.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Email sent" : "ईमेल भेज दिया गया है ",
+    "Security Warning" : "सुरक्षा चेतावनी ",
+    "More" : "और अधिक",
+    "Password" : "पासवर्ड",
+    "New password" : "नया पासवर्ड",
+    "Cancel" : "रद्द करें ",
+    "Username" : "प्रयोक्ता का नाम"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
deleted file mode 100644
index a328b3700aa..00000000000
--- a/settings/l10n/hi.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Email sent" => "ईमेल भेज दिया गया है ",
-"Security Warning" => "सुरक्षा चेतावनी ",
-"More" => "और अधिक",
-"Password" => "पासवर्ड",
-"New password" => "नया पासवर्ड",
-"Cancel" => "रद्द करें ",
-"Username" => "प्रयोक्ता का नाम"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
new file mode 100644
index 00000000000..8a39d4f4bd5
--- /dev/null
+++ b/settings/l10n/hr.js
@@ -0,0 +1,227 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktivirano",
+    "Authentication error" : "Pogrešna autentikacija",
+    "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
+    "Unable to change full name" : "Puno ime nije moguće promijeniti.",
+    "Group already exists" : "Grupa već postoji",
+    "Unable to add group" : "Grupu nije moguće dodati",
+    "Files decrypted successfully" : "Datoteke uspješno dešifrirane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Couldn't decrypt your files, check your password and try again" : "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
+    "Encryption keys deleted permanently" : "Ključevi za šifriranje trajno izbrisani",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Couldn't remove app." : "Nije moguće ukloniti app.",
+    "Email saved" : "E-pošta spremljena",
+    "Invalid email" : "E-pošta neispravna",
+    "Unable to delete group" : "Grupu nije moguće izbrisati",
+    "Unable to delete user" : "Korisnika nije moguće izbrisati",
+    "Backups restored successfully" : "Sigurnosne kopije uspješno obnovljene",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Language changed" : "Promjena jezika",
+    "Invalid request" : "Zahtjev neispravan",
+    "Admins can't remove themself from the admin group" : "Administratori ne mogu sami sebe ukloniti iz admin grupe",
+    "Unable to add user to group %s" : "Dodavanje korisnika grupi %s nije moguće",
+    "Unable to remove user from group %s" : "Uklanjanje korisnika iz grupe %s nije moguće",
+    "Couldn't update app." : "Ažuriranje aplikacija nije moguće",
+    "Wrong password" : "Pogrešna lozinka",
+    "No user supplied" : "Nijedan korisnik nije dostavljen",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.",
+    "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
+    "Unable to change password" : "Promjena lozinke nije moguća",
+    "Saved" : "Spremljeno",
+    "test email settings" : "Postavke za testiranje e-pošte",
+    "If you received this email, the settings seem to be correct." : "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
+    "Email sent" : "E-pošta je poslana",
+    "You need to set your user email before being able to send test emails." : "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
+    "Add trusted domain" : "Dodajte pouzdanu domenu",
+    "Sending..." : "Slanje...",
+    "All" : "Sve",
+    "Please wait...." : "Molimo pričekajte...",
+    "Error while disabling app" : "Pogreška pri onemogućavanju app",
+    "Disable" : "Onemogućite",
+    "Enable" : "Omogućite",
+    "Error while enabling app" : "Pogreška pri omogućavanju app",
+    "Updating...." : "Ažuriranje...",
+    "Error while updating app" : "Pogreška pri ažuriranju app",
+    "Updated" : "Ažurirano",
+    "Uninstalling ...." : "Deinstaliranje....",
+    "Error while uninstalling app" : "Pogreška pri deinstaliranju app",
+    "Uninstall" : "Deinstalirajte",
+    "Select a profile picture" : "Odaberite sliku profila",
+    "Very weak password" : "Lozinka vrlo slaba",
+    "Weak password" : "Lozinka slaba",
+    "So-so password" : "Lozinka tako-tako",
+    "Good password" : "Lozinka dobra",
+    "Strong password" : "Lozinka snažna",
+    "Valid until {date}" : "Valid until {date}",
+    "Delete" : "Izbrišite",
+    "Decrypting files... Please wait, this can take some time." : "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
+    "Delete encryption keys permanently." : "Trajno izbrišite ključeve za šifriranje",
+    "Restore encryption keys." : "Obnovite ključeve za šifriranje",
+    "Groups" : "Grupe",
+    "Unable to delete {objName}" : "Nije moguće izbrisati {objName}",
+    "Error creating group" : "Pogrešno kreiranje grupe",
+    "A valid group name must be provided" : "Nužno je navesti valjani naziv grupe",
+    "deleted {groupName}" : "izbrisana {groupName}",
+    "undo" : "poništite",
+    "never" : "nikad",
+    "deleted {userName}" : "izbrisano {userName}",
+    "add group" : "dodajte grupu",
+    "A valid username must be provided" : "Nužno je navesti valjano korisničko ime",
+    "Error creating user" : "Pogrešno kreiranje korisnika",
+    "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
+    "Warning: Home directory for user \"{user}\" already exists" : "Upozorenje: Osnovni direktorij za korisnika \"{user}\" već postoji",
+    "__language_name__" : "__jezik_naziv___",
+    "SSL root certificates" : "SSL Root certifikati",
+    "Encryption" : "Šifriranje",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
+    "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, pogreške i kobni problemi",
+    "Warnings, errors and fatal issues" : "Upozorenja, pogreške i kobni problemi",
+    "Errors and fatal issues" : "Pogreške i kobni problemi",
+    "Fatal issues only" : "Samo kobni problemi",
+    "None" : "Ništa",
+    "Login" : "Prijava",
+    "Plain" : "Čisti tekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sigurnosno upozorenje",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Vi %s pristupate putem HTTP. Toplo vam preporučujemo da svoj poslužitelj konfigurirate takoda umjesto HTTP zahtijeva korištenje HTTPS.",
+    "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." : "Vašem podatkovnom direktoriju i vašim datotekama pristup je vjerojatno moguć s interneta.Datoteka .htaccess ne radi. Toplo vam preporučujemo da svoj web poslužitelj konfigurirate tako daje pristup podatkovnom direktoriju nemoguć ili pak podatkovni direktorij premjestite izvan korijena dokumentaweb poslužitelja.",
+    "Setup Warning" : "Upozorenje programa za postavljanje",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
+    "Database Performance Info" : "Info o performansi baze podataka",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
+    "Module 'fileinfo' missing" : "Nedostaje modul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
+    "Your PHP version is outdated" : "Vaša verzija PHP je zastarjela",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Vaša verzija PHP je zastarjela. Tolo vam preporučujemo da je ažurirate na 5.3.8.ili još novije jer je poznato da su starije verzije neispravne. Moguće je da ovainstalacija ne radi ispravno.",
+    "PHP charset is not set to UTF-8" : "PHP Charset nije postavljen na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset nije postavljen na UTF-8. To može prouzročiti ozbiljne probleme s non-ASCII znakovimau nazivima datoteka. Toplo vam preporučujemo da vrijednost 'default_charset' php.ini promijeniteu 'UTF-8'.",
+    "Locale not working" : "Regionalna shema ne radi",
+    "System locale can not be set to a one which supports UTF-8." : "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
+    "URL generation in notification emails" : "Generiranje URL-a u notifikacijskoj e-pošti",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
+    "Please double check the <a href='%s'>installation guides</a>." : "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Zadnji cron je izvršen na %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
+    "Cron was not executed yet!" : "Cron još nije izvršen!",
+    "Execute one task with each page loaded" : "Izvršite jedan zadatak sa svakom učitanom stranicom",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
+    "Sharing" : "Dijeljenje zajedničkih resursa",
+    "Allow apps to use the Share API" : "Dopustite apps korištenje Share API",
+    "Allow users to share via link" : "Dopustite korisnicia dijeljenje putem veze",
+    "Enforce password protection" : "Nametnite zaštitu lozinki",
+    "Allow public uploads" : "Dopustite javno učitavanje sadržaja",
+    "Set default expiration date" : "Postavite zadani datum isteka",
+    "Expire after " : "Istek nakon",
+    "days" : "dana",
+    "Enforce expiration date" : "Nametnite datum isteka",
+    "Allow resharing" : "Dopustite ponovno dijeljenje zajedničkih resursa",
+    "Restrict users to only share with users in their groups" : "Ograničite korisnike na meusobno dijeljenje resursa samo s korisnicima unutar svoje grupe",
+    "Allow users to send mail notification for shared files" : "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
+    "Exclude groups from sharing" : "Isključite grupe iz dijeljenja zajedničkih resursa",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
+    "Security" : "Sigurnost",
+    "Enforce HTTPS" : "Nametnite HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
+    "Email Server" : "Poslužitelj e-pošte",
+    "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
+    "Send mode" : "Način rada za slanje",
+    "From address" : "S adrese",
+    "mail" : "pošta",
+    "Authentication method" : "Postupak autentikacije",
+    "Authentication required" : "Potrebna autentikacija",
+    "Server address" : "Adresa poslužitelja",
+    "Port" : "Priključak",
+    "Credentials" : "Vjerodajnice",
+    "SMTP Username" : "Korisničko ime SMTP",
+    "SMTP Password" : "Lozinka SMPT",
+    "Test email settings" : "Postavke za testnu e-poštu",
+    "Send email" : "Pošaljite e-poštu",
+    "Log" : "Zapisnik",
+    "Log level" : "Razina zapisnika",
+    "More" : "Više",
+    "Less" : "Manje",
+    "Version" : "Verzija",
+    "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>." : "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
+    "by" : "od strane",
+    "Documentation:" : "Dokumentacija:",
+    "User Documentation" : "Korisnička dokumentacija",
+    "Admin Documentation" : "Admin dokumentacija",
+    "Enable only for specific groups" : "Omogućite samo za specifične grupe",
+    "Uninstall App" : "Deinstalirajte app",
+    "Administrator Documentation" : "Dokumentacija administratora",
+    "Online Documentation" : "Online dokumentacija",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Komercijalna podrška",
+    "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ako želite podržati projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridružite se razvoju</a>\n\t\tili\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">proširite vijest</a>!",
+    "Show First Run Wizard again" : "Opet pokažite First Run Wizard",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
+    "Password" : "Lozinka",
+    "Your password was changed" : "Vaša je lozinka promijenjena",
+    "Unable to change your password" : "Vašu lozinku nije moguće promijeniti",
+    "Current password" : "Trenutna lozinka",
+    "New password" : "Nova lozinka",
+    "Change password" : "Promijenite lozinku",
+    "Full Name" : "Puno ime",
+    "Email" : "E-pošta",
+    "Your email address" : "Vaša adresa e-pošte",
+    "Fill in an email address to enable password recovery and receive notifications" : "Unesite adresu e-pošte da biste omogućili oporavak lozinke i primili notifikacije",
+    "Profile picture" : "Slika profila",
+    "Upload new" : "Učitajte novu",
+    "Select new from Files" : "Odaberite novu iz datoteka",
+    "Remove image" : "Uklonite sliku",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ili png ili jpg. Idealno bi bilo da je kvadratna, ali moći ćete je obrezati",
+    "Your avatar is provided by your original account." : "Vaš avatar je isporučen od strane vašeg izvornog računa",
+    "Cancel" : "Odustanite",
+    "Choose as profile image" : "Odaberite kao sliku profila",
+    "Language" : "Jezik",
+    "Help translate" : "Pomozite prevesti",
+    "Common Name" : "Common Name",
+    "Valid until" : "Valid until",
+    "Issued By" : "Issued By",
+    "Valid until %s" : "Valid until %s",
+    "Import Root Certificate" : "Uvoz Root certifikata",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
+    "Log-in password" : "Lozinka za prijavu",
+    "Decrypt all Files" : "Dešifrirajte sve datoteke",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
+    "Restore Encryption Keys" : "Obnovite ključeve za šifriranje",
+    "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
+    "Show storage location" : "Prikaži mjesto pohrane",
+    "Show last log in" : "Prikaži zadnje spajanje",
+    "Login Name" : "Ime za prijavu",
+    "Create" : "Kreirajte",
+    "Admin Recovery Password" : "Admin lozinka za oporavak",
+    "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
+    "Search Users and Groups" : "Pretražite korisnike i grupe",
+    "Add Group" : "Dodajte grupu",
+    "Group" : "Grupa",
+    "Everyone" : "Svi",
+    "Admins" : "Admins",
+    "Default Quota" : "Zadana kvota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
+    "Unlimited" : "Neograničeno",
+    "Other" : "Ostalo",
+    "Username" : "Korisničko ime",
+    "Quota" : "Kvota",
+    "Storage Location" : "Mjesto za spremanje",
+    "Last Login" : "Zadnja prijava",
+    "change full name" : "promijenite puno ime",
+    "set new password" : "postavite novu lozinku",
+    "Default" : "Zadano"
+},
+"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/settings/l10n/hr.json b/settings/l10n/hr.json
new file mode 100644
index 00000000000..187f7a90c0f
--- /dev/null
+++ b/settings/l10n/hr.json
@@ -0,0 +1,225 @@
+{ "translations": {
+    "Enabled" : "Aktivirano",
+    "Authentication error" : "Pogrešna autentikacija",
+    "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
+    "Unable to change full name" : "Puno ime nije moguće promijeniti.",
+    "Group already exists" : "Grupa već postoji",
+    "Unable to add group" : "Grupu nije moguće dodati",
+    "Files decrypted successfully" : "Datoteke uspješno dešifrirane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Couldn't decrypt your files, check your password and try again" : "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
+    "Encryption keys deleted permanently" : "Ključevi za šifriranje trajno izbrisani",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Couldn't remove app." : "Nije moguće ukloniti app.",
+    "Email saved" : "E-pošta spremljena",
+    "Invalid email" : "E-pošta neispravna",
+    "Unable to delete group" : "Grupu nije moguće izbrisati",
+    "Unable to delete user" : "Korisnika nije moguće izbrisati",
+    "Backups restored successfully" : "Sigurnosne kopije uspješno obnovljene",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
+    "Language changed" : "Promjena jezika",
+    "Invalid request" : "Zahtjev neispravan",
+    "Admins can't remove themself from the admin group" : "Administratori ne mogu sami sebe ukloniti iz admin grupe",
+    "Unable to add user to group %s" : "Dodavanje korisnika grupi %s nije moguće",
+    "Unable to remove user from group %s" : "Uklanjanje korisnika iz grupe %s nije moguće",
+    "Couldn't update app." : "Ažuriranje aplikacija nije moguće",
+    "Wrong password" : "Pogrešna lozinka",
+    "No user supplied" : "Nijedan korisnik nije dostavljen",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.",
+    "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
+    "Unable to change password" : "Promjena lozinke nije moguća",
+    "Saved" : "Spremljeno",
+    "test email settings" : "Postavke za testiranje e-pošte",
+    "If you received this email, the settings seem to be correct." : "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
+    "Email sent" : "E-pošta je poslana",
+    "You need to set your user email before being able to send test emails." : "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
+    "Add trusted domain" : "Dodajte pouzdanu domenu",
+    "Sending..." : "Slanje...",
+    "All" : "Sve",
+    "Please wait...." : "Molimo pričekajte...",
+    "Error while disabling app" : "Pogreška pri onemogućavanju app",
+    "Disable" : "Onemogućite",
+    "Enable" : "Omogućite",
+    "Error while enabling app" : "Pogreška pri omogućavanju app",
+    "Updating...." : "Ažuriranje...",
+    "Error while updating app" : "Pogreška pri ažuriranju app",
+    "Updated" : "Ažurirano",
+    "Uninstalling ...." : "Deinstaliranje....",
+    "Error while uninstalling app" : "Pogreška pri deinstaliranju app",
+    "Uninstall" : "Deinstalirajte",
+    "Select a profile picture" : "Odaberite sliku profila",
+    "Very weak password" : "Lozinka vrlo slaba",
+    "Weak password" : "Lozinka slaba",
+    "So-so password" : "Lozinka tako-tako",
+    "Good password" : "Lozinka dobra",
+    "Strong password" : "Lozinka snažna",
+    "Valid until {date}" : "Valid until {date}",
+    "Delete" : "Izbrišite",
+    "Decrypting files... Please wait, this can take some time." : "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
+    "Delete encryption keys permanently." : "Trajno izbrišite ključeve za šifriranje",
+    "Restore encryption keys." : "Obnovite ključeve za šifriranje",
+    "Groups" : "Grupe",
+    "Unable to delete {objName}" : "Nije moguće izbrisati {objName}",
+    "Error creating group" : "Pogrešno kreiranje grupe",
+    "A valid group name must be provided" : "Nužno je navesti valjani naziv grupe",
+    "deleted {groupName}" : "izbrisana {groupName}",
+    "undo" : "poništite",
+    "never" : "nikad",
+    "deleted {userName}" : "izbrisano {userName}",
+    "add group" : "dodajte grupu",
+    "A valid username must be provided" : "Nužno je navesti valjano korisničko ime",
+    "Error creating user" : "Pogrešno kreiranje korisnika",
+    "A valid password must be provided" : "Nužno je navesti valjanu lozinku",
+    "Warning: Home directory for user \"{user}\" already exists" : "Upozorenje: Osnovni direktorij za korisnika \"{user}\" već postoji",
+    "__language_name__" : "__jezik_naziv___",
+    "SSL root certificates" : "SSL Root certifikati",
+    "Encryption" : "Šifriranje",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
+    "Info, warnings, errors and fatal issues" : "Informacije, upozorenja, pogreške i kobni problemi",
+    "Warnings, errors and fatal issues" : "Upozorenja, pogreške i kobni problemi",
+    "Errors and fatal issues" : "Pogreške i kobni problemi",
+    "Fatal issues only" : "Samo kobni problemi",
+    "None" : "Ništa",
+    "Login" : "Prijava",
+    "Plain" : "Čisti tekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sigurnosno upozorenje",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Vi %s pristupate putem HTTP. Toplo vam preporučujemo da svoj poslužitelj konfigurirate takoda umjesto HTTP zahtijeva korištenje HTTPS.",
+    "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." : "Vašem podatkovnom direktoriju i vašim datotekama pristup je vjerojatno moguć s interneta.Datoteka .htaccess ne radi. Toplo vam preporučujemo da svoj web poslužitelj konfigurirate tako daje pristup podatkovnom direktoriju nemoguć ili pak podatkovni direktorij premjestite izvan korijena dokumentaweb poslužitelja.",
+    "Setup Warning" : "Upozorenje programa za postavljanje",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
+    "Database Performance Info" : "Info o performansi baze podataka",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
+    "Module 'fileinfo' missing" : "Nedostaje modul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
+    "Your PHP version is outdated" : "Vaša verzija PHP je zastarjela",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Vaša verzija PHP je zastarjela. Tolo vam preporučujemo da je ažurirate na 5.3.8.ili još novije jer je poznato da su starije verzije neispravne. Moguće je da ovainstalacija ne radi ispravno.",
+    "PHP charset is not set to UTF-8" : "PHP Charset nije postavljen na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset nije postavljen na UTF-8. To može prouzročiti ozbiljne probleme s non-ASCII znakovimau nazivima datoteka. Toplo vam preporučujemo da vrijednost 'default_charset' php.ini promijeniteu 'UTF-8'.",
+    "Locale not working" : "Regionalna shema ne radi",
+    "System locale can not be set to a one which supports UTF-8." : "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
+    "URL generation in notification emails" : "Generiranje URL-a u notifikacijskoj e-pošti",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
+    "Please double check the <a href='%s'>installation guides</a>." : "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Zadnji cron je izvršen na %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
+    "Cron was not executed yet!" : "Cron još nije izvršen!",
+    "Execute one task with each page loaded" : "Izvršite jedan zadatak sa svakom učitanom stranicom",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
+    "Sharing" : "Dijeljenje zajedničkih resursa",
+    "Allow apps to use the Share API" : "Dopustite apps korištenje Share API",
+    "Allow users to share via link" : "Dopustite korisnicia dijeljenje putem veze",
+    "Enforce password protection" : "Nametnite zaštitu lozinki",
+    "Allow public uploads" : "Dopustite javno učitavanje sadržaja",
+    "Set default expiration date" : "Postavite zadani datum isteka",
+    "Expire after " : "Istek nakon",
+    "days" : "dana",
+    "Enforce expiration date" : "Nametnite datum isteka",
+    "Allow resharing" : "Dopustite ponovno dijeljenje zajedničkih resursa",
+    "Restrict users to only share with users in their groups" : "Ograničite korisnike na meusobno dijeljenje resursa samo s korisnicima unutar svoje grupe",
+    "Allow users to send mail notification for shared files" : "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
+    "Exclude groups from sharing" : "Isključite grupe iz dijeljenja zajedničkih resursa",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
+    "Security" : "Sigurnost",
+    "Enforce HTTPS" : "Nametnite HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
+    "Email Server" : "Poslužitelj e-pošte",
+    "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
+    "Send mode" : "Način rada za slanje",
+    "From address" : "S adrese",
+    "mail" : "pošta",
+    "Authentication method" : "Postupak autentikacije",
+    "Authentication required" : "Potrebna autentikacija",
+    "Server address" : "Adresa poslužitelja",
+    "Port" : "Priključak",
+    "Credentials" : "Vjerodajnice",
+    "SMTP Username" : "Korisničko ime SMTP",
+    "SMTP Password" : "Lozinka SMPT",
+    "Test email settings" : "Postavke za testnu e-poštu",
+    "Send email" : "Pošaljite e-poštu",
+    "Log" : "Zapisnik",
+    "Log level" : "Razina zapisnika",
+    "More" : "Više",
+    "Less" : "Manje",
+    "Version" : "Verzija",
+    "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>." : "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
+    "by" : "od strane",
+    "Documentation:" : "Dokumentacija:",
+    "User Documentation" : "Korisnička dokumentacija",
+    "Admin Documentation" : "Admin dokumentacija",
+    "Enable only for specific groups" : "Omogućite samo za specifične grupe",
+    "Uninstall App" : "Deinstalirajte app",
+    "Administrator Documentation" : "Dokumentacija administratora",
+    "Online Documentation" : "Online dokumentacija",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Komercijalna podrška",
+    "Get the apps to sync your files" : "Koristite aplikacije za sinkronizaciju svojih datoteka",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ako želite podržati projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridružite se razvoju</a>\n\t\tili\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">proširite vijest</a>!",
+    "Show First Run Wizard again" : "Opet pokažite First Run Wizard",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
+    "Password" : "Lozinka",
+    "Your password was changed" : "Vaša je lozinka promijenjena",
+    "Unable to change your password" : "Vašu lozinku nije moguće promijeniti",
+    "Current password" : "Trenutna lozinka",
+    "New password" : "Nova lozinka",
+    "Change password" : "Promijenite lozinku",
+    "Full Name" : "Puno ime",
+    "Email" : "E-pošta",
+    "Your email address" : "Vaša adresa e-pošte",
+    "Fill in an email address to enable password recovery and receive notifications" : "Unesite adresu e-pošte da biste omogućili oporavak lozinke i primili notifikacije",
+    "Profile picture" : "Slika profila",
+    "Upload new" : "Učitajte novu",
+    "Select new from Files" : "Odaberite novu iz datoteka",
+    "Remove image" : "Uklonite sliku",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ili png ili jpg. Idealno bi bilo da je kvadratna, ali moći ćete je obrezati",
+    "Your avatar is provided by your original account." : "Vaš avatar je isporučen od strane vašeg izvornog računa",
+    "Cancel" : "Odustanite",
+    "Choose as profile image" : "Odaberite kao sliku profila",
+    "Language" : "Jezik",
+    "Help translate" : "Pomozite prevesti",
+    "Common Name" : "Common Name",
+    "Valid until" : "Valid until",
+    "Issued By" : "Issued By",
+    "Valid until %s" : "Valid until %s",
+    "Import Root Certificate" : "Uvoz Root certifikata",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
+    "Log-in password" : "Lozinka za prijavu",
+    "Decrypt all Files" : "Dešifrirajte sve datoteke",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
+    "Restore Encryption Keys" : "Obnovite ključeve za šifriranje",
+    "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
+    "Show storage location" : "Prikaži mjesto pohrane",
+    "Show last log in" : "Prikaži zadnje spajanje",
+    "Login Name" : "Ime za prijavu",
+    "Create" : "Kreirajte",
+    "Admin Recovery Password" : "Admin lozinka za oporavak",
+    "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
+    "Search Users and Groups" : "Pretražite korisnike i grupe",
+    "Add Group" : "Dodajte grupu",
+    "Group" : "Grupa",
+    "Everyone" : "Svi",
+    "Admins" : "Admins",
+    "Default Quota" : "Zadana kvota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
+    "Unlimited" : "Neograničeno",
+    "Other" : "Ostalo",
+    "Username" : "Korisničko ime",
+    "Quota" : "Kvota",
+    "Storage Location" : "Mjesto za spremanje",
+    "Last Login" : "Zadnja prijava",
+    "change full name" : "promijenite puno ime",
+    "set new password" : "postavite novu lozinku",
+    "Default" : "Zadano"
+},"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/settings/l10n/hr.php b/settings/l10n/hr.php
deleted file mode 100644
index 1c6e178abdd..00000000000
--- a/settings/l10n/hr.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktivirano",
-"Authentication error" => "Pogrešna autentikacija",
-"Your full name has been changed." => "Vaše puno ime je promijenjeno.",
-"Unable to change full name" => "Puno ime nije moguće promijeniti.",
-"Group already exists" => "Grupa već postoji",
-"Unable to add group" => "Grupu nije moguće dodati",
-"Files decrypted successfully" => "Datoteke uspješno dešifrirane",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Vaše datoteke nije moguće dešifrirati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
-"Couldn't decrypt your files, check your password and try again" => "Vaše datoteke nije moguće dešifrirati, provjerite svoju lozinku i pokušajte ponovno.",
-"Encryption keys deleted permanently" => "Ključevi za šifriranje trajno izbrisani",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Vaše ključeve za šifriranje nije moguće trajno izbrisati, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
-"Couldn't remove app." => "Nije moguće ukloniti app.",
-"Email saved" => "E-pošta spremljena",
-"Invalid email" => "E-pošta neispravna",
-"Unable to delete group" => "Grupu nije moguće izbrisati",
-"Unable to delete user" => "Korisnika nije moguće izbrisati",
-"Backups restored successfully" => "Sigurnosne kopije uspješno obnovljene",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Vaše ključeve za šifriranje nije moguće obnoviti, molimo provjerite svoj owncloud.logili kontaktirajte svog administratora.",
-"Language changed" => "Promjena jezika",
-"Invalid request" => "Zahtjev neispravan",
-"Admins can't remove themself from the admin group" => "Administratori ne mogu sami sebe ukloniti iz admin grupe",
-"Unable to add user to group %s" => "Dodavanje korisnika grupi %s nije moguće",
-"Unable to remove user from group %s" => "Uklanjanje korisnika iz grupe %s nije moguće",
-"Couldn't update app." => "Ažuriranje aplikacija nije moguće",
-"Wrong password" => "Pogrešna lozinka",
-"No user supplied" => "Nijedan korisnik nije dostavljen",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Molimo navedite admin lozinku za oporavak, u protivnom će svi korisnički podaci biti izgubljeni.",
-"Wrong admin recovery password. Please check the password and try again." => "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
-"Unable to change password" => "Promjena lozinke nije moguća",
-"Saved" => "Spremljeno",
-"test email settings" => "Postavke za testiranje e-pošte",
-"If you received this email, the settings seem to be correct." => "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
-"Email sent" => "E-pošta je poslana",
-"You need to set your user email before being able to send test emails." => "Prije nego li ste u mogućnosti slati testnu e-poštu trebate postaviti svoj korisnički email.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Jeste li doista sigurni da želite dodati \"{domain}\" kao pouzdanu domenu?",
-"Add trusted domain" => "Dodajte pouzdanu domenu",
-"Sending..." => "Slanje...",
-"All" => "Sve",
-"Please wait...." => "Molimo pričekajte...",
-"Error while disabling app" => "Pogreška pri onemogućavanju app",
-"Disable" => "Onemogućite",
-"Enable" => "Omogućite",
-"Error while enabling app" => "Pogreška pri omogućavanju app",
-"Updating...." => "Ažuriranje...",
-"Error while updating app" => "Pogreška pri ažuriranju app",
-"Updated" => "Ažurirano",
-"Uninstalling ...." => "Deinstaliranje....",
-"Error while uninstalling app" => "Pogreška pri deinstaliranju app",
-"Uninstall" => "Deinstalirajte",
-"Select a profile picture" => "Odaberite sliku profila",
-"Very weak password" => "Lozinka vrlo slaba",
-"Weak password" => "Lozinka slaba",
-"So-so password" => "Lozinka tako-tako",
-"Good password" => "Lozinka dobra",
-"Strong password" => "Lozinka snažna",
-"Valid until {date}" => "Valid until {date}",
-"Delete" => "Izbrišite",
-"Decrypting files... Please wait, this can take some time." => "Dešifriranje datoteka... Molimo pričekajte, to može potrajati neko vrijeme.",
-"Delete encryption keys permanently." => "Trajno izbrišite ključeve za šifriranje",
-"Restore encryption keys." => "Obnovite ključeve za šifriranje",
-"Groups" => "Grupe",
-"Unable to delete {objName}" => "Nije moguće izbrisati {objName}",
-"Error creating group" => "Pogrešno kreiranje grupe",
-"A valid group name must be provided" => "Nužno je navesti valjani naziv grupe",
-"deleted {groupName}" => "izbrisana {groupName}",
-"undo" => "poništite",
-"never" => "nikad",
-"deleted {userName}" => "izbrisano {userName}",
-"add group" => "dodajte grupu",
-"A valid username must be provided" => "Nužno je navesti valjano korisničko ime",
-"Error creating user" => "Pogrešno kreiranje korisnika",
-"A valid password must be provided" => "Nužno je navesti valjanu lozinku",
-"Warning: Home directory for user \"{user}\" already exists" => "Upozorenje: Osnovni direktorij za korisnika \"{user}\" već postoji",
-"__language_name__" => "__jezik_naziv___",
-"SSL root certificates" => "SSL Root certifikati",
-"Encryption" => "Šifriranje",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Sve (kobni problemi, pogreške, upozorenja, ispravljanje pogrešaka)",
-"Info, warnings, errors and fatal issues" => "Informacije, upozorenja, pogreške i kobni problemi",
-"Warnings, errors and fatal issues" => "Upozorenja, pogreške i kobni problemi",
-"Errors and fatal issues" => "Pogreške i kobni problemi",
-"Fatal issues only" => "Samo kobni problemi",
-"None" => "Ništa",
-"Login" => "Prijava",
-"Plain" => "Čisti tekst",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Sigurnosno upozorenje",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Vi %s pristupate putem HTTP. Toplo vam preporučujemo da svoj poslužitelj konfigurirate takoda umjesto HTTP zahtijeva korištenje HTTPS.",
-"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." => "Vašem podatkovnom direktoriju i vašim datotekama pristup je vjerojatno moguć s interneta.Datoteka .htaccess ne radi. Toplo vam preporučujemo da svoj web poslužitelj konfigurirate tako daje pristup podatkovnom direktoriju nemoguć ili pak podatkovni direktorij premjestite izvan korijena dokumentaweb poslužitelja.",
-"Setup Warning" => "Upozorenje programa za postavljanje",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP je očigledno postavljen na strip inline doc blocks. To će nekoliko osnovnih aplikacija učiniti nedostupnima.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Uzrok tome je vjerojatno neki ubrzivač predmemoriranja kao što je Zend OPcache ilieAccelerator.",
-"Database Performance Info" => "Info o performansi baze podataka",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite se koristi kao baza podataka. Za veće instalacije preporučujemo da se to promijeni.Za migraciju na neku drugu bazu podataka koristite naredbeni redak: 'occ db: convert-type'",
-"Module 'fileinfo' missing" => "Nedostaje modul 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modul 'fileinfo' nedostaje. Tolo vam preporučjemo da taj modul omogućitekako biste dobili najbolje rezultate u detekciji mime vrste.",
-"Your PHP version is outdated" => "Vaša verzija PHP je zastarjela",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Vaša verzija PHP je zastarjela. Tolo vam preporučujemo da je ažurirate na 5.3.8.ili još novije jer je poznato da su starije verzije neispravne. Moguće je da ovainstalacija ne radi ispravno.",
-"PHP charset is not set to UTF-8" => "PHP Charset nije postavljen na UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset nije postavljen na UTF-8. To može prouzročiti ozbiljne probleme s non-ASCII znakovimau nazivima datoteka. Toplo vam preporučujemo da vrijednost 'default_charset' php.ini promijeniteu 'UTF-8'.",
-"Locale not working" => "Regionalna shema ne radi",
-"System locale can not be set to a one which supports UTF-8." => "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
-"This means that there might be problems with certain characters in file names." => "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
-"URL generation in notification emails" => "Generiranje URL-a u notifikacijskoj e-pošti",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
-"Please double check the <a href='%s'>installation guides</a>." => "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Zadnji cron je izvršen na %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
-"Cron was not executed yet!" => "Cron još nije izvršen!",
-"Execute one task with each page loaded" => "Izvršite jedan zadatak sa svakom učitanom stranicom",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
-"Sharing" => "Dijeljenje zajedničkih resursa",
-"Allow apps to use the Share API" => "Dopustite apps korištenje Share API",
-"Allow users to share via link" => "Dopustite korisnicia dijeljenje putem veze",
-"Enforce password protection" => "Nametnite zaštitu lozinki",
-"Allow public uploads" => "Dopustite javno učitavanje sadržaja",
-"Set default expiration date" => "Postavite zadani datum isteka",
-"Expire after " => "Istek nakon",
-"days" => "dana",
-"Enforce expiration date" => "Nametnite datum isteka",
-"Allow resharing" => "Dopustite ponovno dijeljenje zajedničkih resursa",
-"Restrict users to only share with users in their groups" => "Ograničite korisnike na meusobno dijeljenje resursa samo s korisnicima unutar svoje grupe",
-"Allow users to send mail notification for shared files" => "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
-"Exclude groups from sharing" => "Isključite grupe iz dijeljenja zajedničkih resursa",
-"These groups will still be able to receive shares, but not to initiate them." => "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
-"Security" => "Sigurnost",
-"Enforce HTTPS" => "Nametnite HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
-"Email Server" => "Poslužitelj e-pošte",
-"This is used for sending out notifications." => "Ovo se koristi za slanje notifikacija.",
-"Send mode" => "Način rada za slanje",
-"From address" => "S adrese",
-"mail" => "pošta",
-"Authentication method" => "Postupak autentikacije",
-"Authentication required" => "Potrebna autentikacija",
-"Server address" => "Adresa poslužitelja",
-"Port" => "Priključak",
-"Credentials" => "Vjerodajnice",
-"SMTP Username" => "Korisničko ime SMTP",
-"SMTP Password" => "Lozinka SMPT",
-"Test email settings" => "Postavke za testnu e-poštu",
-"Send email" => "Pošaljite e-poštu",
-"Log" => "Zapisnik",
-"Log level" => "Razina zapisnika",
-"More" => "Više",
-"Less" => "Manje",
-"Version" => "Verzija",
-"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>." => "Razvila <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud zajednica</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">izvorni kod</a> je licenciran <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> licencom.",
-"by" => "od strane",
-"Documentation:" => "Dokumentacija:",
-"User Documentation" => "Korisnička dokumentacija",
-"Admin Documentation" => "Admin dokumentacija",
-"Enable only for specific groups" => "Omogućite samo za specifične grupe",
-"Uninstall App" => "Deinstalirajte app",
-"Administrator Documentation" => "Dokumentacija administratora",
-"Online Documentation" => "Online dokumentacija",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Komercijalna podrška",
-"Get the apps to sync your files" => "Koristite aplikacije za sinkronizaciju svojih datoteka",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ako želite podržati projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridružite se razvoju</a>\n\t\tili\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">proširite vijest</a>!",
-"Show First Run Wizard again" => "Opet pokažite First Run Wizard",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Iskoristili ste <strong>%s</strong> od raspoloživog <strong>%s</strong>",
-"Password" => "Lozinka",
-"Your password was changed" => "Vaša je lozinka promijenjena",
-"Unable to change your password" => "Vašu lozinku nije moguće promijeniti",
-"Current password" => "Trenutna lozinka",
-"New password" => "Nova lozinka",
-"Change password" => "Promijenite lozinku",
-"Full Name" => "Puno ime",
-"Email" => "E-pošta",
-"Your email address" => "Vaša adresa e-pošte",
-"Fill in an email address to enable password recovery and receive notifications" => "Unesite adresu e-pošte da biste omogućili oporavak lozinke i primili notifikacije",
-"Profile picture" => "Slika profila",
-"Upload new" => "Učitajte novu",
-"Select new from Files" => "Odaberite novu iz datoteka",
-"Remove image" => "Uklonite sliku",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Ili png ili jpg. Idealno bi bilo da je kvadratna, ali moći ćete je obrezati",
-"Your avatar is provided by your original account." => "Vaš avatar je isporučen od strane vašeg izvornog računa",
-"Cancel" => "Odustanite",
-"Choose as profile image" => "Odaberite kao sliku profila",
-"Language" => "Jezik",
-"Help translate" => "Pomozite prevesti",
-"Common Name" => "Common Name",
-"Valid until" => "Valid until",
-"Issued By" => "Issued By",
-"Valid until %s" => "Valid until %s",
-"Import Root Certificate" => "Uvoz Root certifikata",
-"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacija šifriranja više nije omogćena,molimo dešifrirajte sve svoje datoteke",
-"Log-in password" => "Lozinka za prijavu",
-"Decrypt all Files" => "Dešifrirajte sve datoteke",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaši ključevi za šifriranje premješteni su na mjesto sigurnosne kopije. Ako neštokrene loše, ključeve možete obnoviti. Iizbrišite ih trajno samo ako ste sigurni da susve datoteke ispravno dešifrirane.",
-"Restore Encryption Keys" => "Obnovite ključeve za šifriranje",
-"Delete Encryption Keys" => "Izbrišite ključeve za šifriranje",
-"Show storage location" => "Prikaži mjesto pohrane",
-"Show last log in" => "Prikaži zadnje spajanje",
-"Login Name" => "Ime za prijavu",
-"Create" => "Kreirajte",
-"Admin Recovery Password" => "Admin lozinka za oporavak",
-"Enter the recovery password in order to recover the users files during password change" => "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
-"Search Users and Groups" => "Pretražite korisnike i grupe",
-"Add Group" => "Dodajte grupu",
-"Group" => "Grupa",
-"Everyone" => "Svi",
-"Admins" => "Admins",
-"Default Quota" => "Zadana kvota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
-"Unlimited" => "Neograničeno",
-"Other" => "Ostalo",
-"Username" => "Korisničko ime",
-"Quota" => "Kvota",
-"Storage Location" => "Mjesto za spremanje",
-"Last Login" => "Zadnja prijava",
-"change full name" => "promijenite puno ime",
-"set new password" => "postavite novu lozinku",
-"Default" => "Zadano"
-);
-$PLURAL_FORMS = "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/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
new file mode 100644
index 00000000000..bc8aa694060
--- /dev/null
+++ b/settings/l10n/hu_HU.js
@@ -0,0 +1,221 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Bekapcsolva",
+    "Recommended" : "Ajánlott",
+    "Authentication error" : "Azonosítási hiba",
+    "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
+    "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
+    "Group already exists" : "A csoport már létezik",
+    "Unable to add group" : "A csoport nem hozható létre",
+    "Files decrypted successfully" : "A fájlok titkosítását sikeresen megszüntettük.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
+    "Couldn't decrypt your files, check your password and try again" : "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
+    "Encryption keys deleted permanently" : "A titkosítási kulcsait véglegesen töröltük.",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
+    "Couldn't remove app." : "Az alkalmazást nem sikerült eltávolítani.",
+    "Email saved" : "Elmentettük az e-mail címet",
+    "Invalid email" : "Hibás e-mail",
+    "Unable to delete group" : "A csoport nem törölhető",
+    "Unable to delete user" : "A felhasználó nem törölhető",
+    "Backups restored successfully" : "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
+    "Language changed" : "A nyelv megváltozott",
+    "Invalid request" : "Érvénytelen kérés",
+    "Admins can't remove themself from the admin group" : "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
+    "Unable to add user to group %s" : "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
+    "Unable to remove user from group %s" : "A felhasználó nem távolítható el ebből a csoportból: %s",
+    "Couldn't update app." : "A program frissítése nem sikerült.",
+    "Wrong password" : "Hibás jelszó",
+    "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!",
+    "Back-end doesn't support password change, but the users 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",
+    "Saved" : "Elmentve",
+    "test email settings" : "e-mail beállítások ellenőrzése",
+    "If you received this email, the settings seem to be correct." : "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
+    "Email sent" : "Az e-mailt elküldtük",
+    "You need to set your user email before being able to send test emails." : "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
+    "Add trusted domain" : "Megbízható tartomány hozzáadása",
+    "Sending..." : "Küldés...",
+    "All" : "Mind",
+    "Please wait...." : "Kérem várjon...",
+    "Error while disabling app" : "Hiba az alkalmazás letiltása közben",
+    "Disable" : "Letiltás",
+    "Enable" : "Engedélyezés",
+    "Error while enabling app" : "Hiba az alkalmazás engedélyezése közben",
+    "Updating...." : "Frissítés folyamatban...",
+    "Error while updating app" : "Hiba történt az alkalmazás frissítése közben",
+    "Updated" : "Frissítve",
+    "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",
+    "Select a profile picture" : "Válasszon profilképet!",
+    "Very weak password" : "Nagyon gyenge jelszó",
+    "Weak password" : "Gyenge jelszó",
+    "So-so password" : "Nem túl jó jelszó",
+    "Good password" : "Jó jelszó",
+    "Strong password" : "Erős jelszó",
+    "Delete" : "Törlés",
+    "Decrypting files... Please wait, this can take some time." : "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
+    "Delete encryption keys permanently." : "A tikosítási kulcsok végleges törlése.",
+    "Restore encryption keys." : "A titkosítási kulcsok visszaállítása.",
+    "Groups" : "Csoportok",
+    "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}",
+    "Error creating group" : "Hiba történt a csoport létrehozása közben",
+    "A valid group name must be provided" : "Érvényes csoportnevet kell megadni",
+    "deleted {groupName}" : "törölve: {groupName}",
+    "undo" : "visszavonás",
+    "never" : "soha",
+    "deleted {userName}" : "törölve: {userName}",
+    "add group" : "csoport hozzáadása",
+    "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
+    "Error creating user" : "A felhasználó nem hozható létre",
+    "A valid password must be provided" : "Érvényes jelszót kell megadnia",
+    "Warning: Home directory for user \"{user}\" already exists" : "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára  már létezik",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL tanúsítványok",
+    "Encryption" : "Titkosítás",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
+    "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
+    "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák",
+    "Errors and fatal issues" : "Hibák és végzetes hibák",
+    "Fatal issues only" : "Csak a végzetes hibák",
+    "None" : "Egyik sem",
+    "Login" : "Login",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Biztonsági figyelmeztetés",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "A %s szolgáltatás elérése jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálót úgy állítsa be, hogy az elérés HTTPS-en keresztül történjék.",
+    "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." : "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon erősen ajánlott, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
+    "Setup Warning" : "A beállítással kapcsolatos figyelmeztetés",
+    "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.",
+    "Database Performance Info" : "Információ az adatbázis teljesítményéről",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt:  'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "A 'fileinfo' modul hiányzik",
+    "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.",
+    "Your PHP version is outdated" : "A PHP verzió túl régi",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehetséges, hogy ez a telepítés majd nem működik megfelelően.",
+    "PHP charset is not set to UTF-8" : "A PHP-karakterkészlet nem UTF-8-ra van állítva",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "A PHP-karakterkészlet nem UTF-8-ra van állítva. Ez komoly problémákat okozhat, ha valaki olyan fájlnevet használ, amiben nem csupán ASCII karakterek fordulnak elő. Feltétlenül javasoljuk, hogy a php.ini-ben a 'default_charset' paramétert állítsa 'UTF-8'-ra!",
+    "Locale not working" : "A nyelvi lokalizáció nem működik",
+    "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 to install 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",
+    "URL generation in notification emails" : "URL-képzés az értesítő e-mailekben",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
+    "Cron" : "Ütemezett feladatok",
+    "Last cron was executed at %s." : "Az utolsó cron feladat ekkor futott le: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
+    "Cron was not executed yet!" : "A cron feladat még nem futott le!",
+    "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
+    "Sharing" : "Megosztás",
+    "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",
+    "Enforce password protection" : "Legyen kötelező a linkek jelszóval való védelme",
+    "Allow public uploads" : "Nyilvános feltöltés engedélyezése",
+    "Set default expiration date" : "Alapértelmezett lejárati idő beállítása",
+    "Expire after " : "A lejárat legyen",
+    "days" : "nap",
+    "Enforce expiration date" : "A beállított lejárati idő legyen kötelezően érvényes",
+    "Allow resharing" : "A megosztás továbbadásának engedélyezése",
+    "Restrict users to only share with users in their groups" : "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
+    "Allow users to send mail notification for shared files" : "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttérő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.",
+    "Security" : "Biztonság",
+    "Enforce HTTPS" : "Kötelező HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Kérjük, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
+    "Email Server" : "E-mail kiszolgáló",
+    "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
+    "Send mode" : "Küldési mód",
+    "From address" : "A feladó címe",
+    "mail" : "mail",
+    "Authentication method" : "A felhasználóazonosítás módszere",
+    "Authentication required" : "Felhasználóazonosítás szükséges",
+    "Server address" : "A kiszolgáló címe",
+    "Port" : "Port",
+    "Credentials" : "Azonosítók",
+    "SMTP Username" : "SMTP felhasználónév",
+    "SMTP Password" : "SMTP jelszó",
+    "Test email settings" : "Az e-mail beállítások ellenőrzése",
+    "Send email" : "E-mail küldése",
+    "Log" : "Naplózás",
+    "Log level" : "Naplózási szint",
+    "More" : "Több",
+    "Less" : "Kevesebb",
+    "Version" : "Verzió",
+    "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>." : "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
+    "by" : "közreadta:",
+    "Documentation:" : "Leírások:",
+    "User Documentation" : "Felhasználói leírás",
+    "Admin Documentation" : "Adminisztrátori leírás",
+    "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
+    "Uninstall App" : "Az alkalmazás eltávolítása",
+    "Administrator Documentation" : "Üzemeltetői leírás",
+    "Online Documentation" : "Online leírás",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Hibabejelentések",
+    "Commercial Support" : "Megvásárolható támogatás",
+    "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ha támogatni kívánja a projektet\n  <a href=\"https://owncloud.org/contribute\"\n  target=\"_blank\">csatlakozzon a fejlesztőkhöz</a>\n  vagy\n  <a href=\"https://owncloud.org/promote\"\n   target=\"_blank\">terjessze a program hírét</a>!",
+    "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
+    "Password" : "Jelszó",
+    "Your password was changed" : "A jelszava megváltozott",
+    "Unable to change your password" : "A jelszó nem változtatható meg",
+    "Current password" : "A jelenlegi jelszó",
+    "New password" : "Az új jelszó",
+    "Change password" : "A jelszó megváltoztatása",
+    "Full Name" : "Teljes név",
+    "Email" : "E-mail",
+    "Your email address" : "Az Ön e-mail címe",
+    "Fill in an email address to enable password recovery and receive notifications" : "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
+    "Profile picture" : "Profilkép",
+    "Upload new" : "Új feltöltése",
+    "Select new from Files" : "Új kiválasztása a Fájlokból",
+    "Remove image" : "A kép eltávolítása",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "A kép png vagy jpg formátumban legyen. Legjobb, ha négyzet alakú, de később még átszabható.",
+    "Your avatar is provided by your original account." : "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
+    "Cancel" : "Mégsem",
+    "Choose as profile image" : "Válasszuk ki profilképnek",
+    "Language" : "Nyelv",
+    "Help translate" : "Segítsen a fordításban!",
+    "Import Root Certificate" : "SSL tanúsítványok importálása",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
+    "Log-in password" : "Bejelentkezési jelszó",
+    "Decrypt all Files" : "Mentesíti a titkosítástól az összes fájlt",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
+    "Restore Encryption Keys" : "A titkosító kulcsok visszaállítása",
+    "Delete Encryption Keys" : "A titkosító kulcsok törlése",
+    "Login Name" : "Bejelentkezési név",
+    "Create" : "Létrehozás",
+    "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
+    "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
+    "Search Users and Groups" : "Keresés a felhasználók és a csoportok között",
+    "Add Group" : "Csoport létrehozása",
+    "Group" : "Csoport",
+    "Everyone" : "Mindenki",
+    "Admins" : "Adminok",
+    "Default Quota" : "Alapértelmezett kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
+    "Unlimited" : "Korlátlan",
+    "Other" : "Más",
+    "Username" : "Felhasználónév",
+    "Quota" : "Kvóta",
+    "Storage Location" : "A háttértár helye",
+    "Last Login" : "Utolsó bejelentkezés",
+    "change full name" : "a teljes név megváltoztatása",
+    "set new password" : "új jelszó beállítása",
+    "Default" : "Alapértelmezett"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
new file mode 100644
index 00000000000..83e38d98f5a
--- /dev/null
+++ b/settings/l10n/hu_HU.json
@@ -0,0 +1,219 @@
+{ "translations": {
+    "Enabled" : "Bekapcsolva",
+    "Recommended" : "Ajánlott",
+    "Authentication error" : "Azonosítási hiba",
+    "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
+    "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
+    "Group already exists" : "A csoport már létezik",
+    "Unable to add group" : "A csoport nem hozható létre",
+    "Files decrypted successfully" : "A fájlok titkosítását sikeresen megszüntettük.",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
+    "Couldn't decrypt your files, check your password and try again" : "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
+    "Encryption keys deleted permanently" : "A titkosítási kulcsait véglegesen töröltük.",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
+    "Couldn't remove app." : "Az alkalmazást nem sikerült eltávolítani.",
+    "Email saved" : "Elmentettük az e-mail címet",
+    "Invalid email" : "Hibás e-mail",
+    "Unable to delete group" : "A csoport nem törölhető",
+    "Unable to delete user" : "A felhasználó nem törölhető",
+    "Backups restored successfully" : "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
+    "Language changed" : "A nyelv megváltozott",
+    "Invalid request" : "Érvénytelen kérés",
+    "Admins can't remove themself from the admin group" : "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
+    "Unable to add user to group %s" : "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
+    "Unable to remove user from group %s" : "A felhasználó nem távolítható el ebből a csoportból: %s",
+    "Couldn't update app." : "A program frissítése nem sikerült.",
+    "Wrong password" : "Hibás jelszó",
+    "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!",
+    "Back-end doesn't support password change, but the users 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",
+    "Saved" : "Elmentve",
+    "test email settings" : "e-mail beállítások ellenőrzése",
+    "If you received this email, the settings seem to be correct." : "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
+    "Email sent" : "Az e-mailt elküldtük",
+    "You need to set your user email before being able to send test emails." : "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
+    "Add trusted domain" : "Megbízható tartomány hozzáadása",
+    "Sending..." : "Küldés...",
+    "All" : "Mind",
+    "Please wait...." : "Kérem várjon...",
+    "Error while disabling app" : "Hiba az alkalmazás letiltása közben",
+    "Disable" : "Letiltás",
+    "Enable" : "Engedélyezés",
+    "Error while enabling app" : "Hiba az alkalmazás engedélyezése közben",
+    "Updating...." : "Frissítés folyamatban...",
+    "Error while updating app" : "Hiba történt az alkalmazás frissítése közben",
+    "Updated" : "Frissítve",
+    "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",
+    "Select a profile picture" : "Válasszon profilképet!",
+    "Very weak password" : "Nagyon gyenge jelszó",
+    "Weak password" : "Gyenge jelszó",
+    "So-so password" : "Nem túl jó jelszó",
+    "Good password" : "Jó jelszó",
+    "Strong password" : "Erős jelszó",
+    "Delete" : "Törlés",
+    "Decrypting files... Please wait, this can take some time." : "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
+    "Delete encryption keys permanently." : "A tikosítási kulcsok végleges törlése.",
+    "Restore encryption keys." : "A titkosítási kulcsok visszaállítása.",
+    "Groups" : "Csoportok",
+    "Unable to delete {objName}" : "Ezt nem sikerült törölni: {objName}",
+    "Error creating group" : "Hiba történt a csoport létrehozása közben",
+    "A valid group name must be provided" : "Érvényes csoportnevet kell megadni",
+    "deleted {groupName}" : "törölve: {groupName}",
+    "undo" : "visszavonás",
+    "never" : "soha",
+    "deleted {userName}" : "törölve: {userName}",
+    "add group" : "csoport hozzáadása",
+    "A valid username must be provided" : "Érvényes felhasználónevet kell megadnia",
+    "Error creating user" : "A felhasználó nem hozható létre",
+    "A valid password must be provided" : "Érvényes jelszót kell megadnia",
+    "Warning: Home directory for user \"{user}\" already exists" : "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára  már létezik",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL tanúsítványok",
+    "Encryption" : "Titkosítás",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
+    "Info, warnings, errors and fatal issues" : "Információk, figyelmeztetések, hibák és végzetes hibák",
+    "Warnings, errors and fatal issues" : "Figyelmeztetések, hibák és végzetes hibák",
+    "Errors and fatal issues" : "Hibák és végzetes hibák",
+    "Fatal issues only" : "Csak a végzetes hibák",
+    "None" : "Egyik sem",
+    "Login" : "Login",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Biztonsági figyelmeztetés",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "A %s szolgáltatás elérése jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálót úgy állítsa be, hogy az elérés HTTPS-en keresztül történjék.",
+    "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." : "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon erősen ajánlott, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
+    "Setup Warning" : "A beállítással kapcsolatos figyelmeztetés",
+    "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.",
+    "Database Performance Info" : "Információ az adatbázis teljesítményéről",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt:  'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "A 'fileinfo' modul hiányzik",
+    "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.",
+    "Your PHP version is outdated" : "A PHP verzió túl régi",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehetséges, hogy ez a telepítés majd nem működik megfelelően.",
+    "PHP charset is not set to UTF-8" : "A PHP-karakterkészlet nem UTF-8-ra van állítva",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "A PHP-karakterkészlet nem UTF-8-ra van állítva. Ez komoly problémákat okozhat, ha valaki olyan fájlnevet használ, amiben nem csupán ASCII karakterek fordulnak elő. Feltétlenül javasoljuk, hogy a php.ini-ben a 'default_charset' paramétert állítsa 'UTF-8'-ra!",
+    "Locale not working" : "A nyelvi lokalizáció nem működik",
+    "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 to install 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",
+    "URL generation in notification emails" : "URL-képzés az értesítő e-mailekben",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
+    "Cron" : "Ütemezett feladatok",
+    "Last cron was executed at %s." : "Az utolsó cron feladat ekkor futott le: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
+    "Cron was not executed yet!" : "A cron feladat még nem futott le!",
+    "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
+    "Sharing" : "Megosztás",
+    "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",
+    "Enforce password protection" : "Legyen kötelező a linkek jelszóval való védelme",
+    "Allow public uploads" : "Nyilvános feltöltés engedélyezése",
+    "Set default expiration date" : "Alapértelmezett lejárati idő beállítása",
+    "Expire after " : "A lejárat legyen",
+    "days" : "nap",
+    "Enforce expiration date" : "A beállított lejárati idő legyen kötelezően érvényes",
+    "Allow resharing" : "A megosztás továbbadásának engedélyezése",
+    "Restrict users to only share with users in their groups" : "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
+    "Allow users to send mail notification for shared files" : "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttérő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.",
+    "Security" : "Biztonság",
+    "Enforce HTTPS" : "Kötelező HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Kérjük, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
+    "Email Server" : "E-mail kiszolgáló",
+    "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
+    "Send mode" : "Küldési mód",
+    "From address" : "A feladó címe",
+    "mail" : "mail",
+    "Authentication method" : "A felhasználóazonosítás módszere",
+    "Authentication required" : "Felhasználóazonosítás szükséges",
+    "Server address" : "A kiszolgáló címe",
+    "Port" : "Port",
+    "Credentials" : "Azonosítók",
+    "SMTP Username" : "SMTP felhasználónév",
+    "SMTP Password" : "SMTP jelszó",
+    "Test email settings" : "Az e-mail beállítások ellenőrzése",
+    "Send email" : "E-mail küldése",
+    "Log" : "Naplózás",
+    "Log level" : "Naplózási szint",
+    "More" : "Több",
+    "Less" : "Kevesebb",
+    "Version" : "Verzió",
+    "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>." : "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
+    "by" : "közreadta:",
+    "Documentation:" : "Leírások:",
+    "User Documentation" : "Felhasználói leírás",
+    "Admin Documentation" : "Adminisztrátori leírás",
+    "Enable only for specific groups" : "Csak bizonyos csoportok számára tegyük elérhetővé",
+    "Uninstall App" : "Az alkalmazás eltávolítása",
+    "Administrator Documentation" : "Üzemeltetői leírás",
+    "Online Documentation" : "Online leírás",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Hibabejelentések",
+    "Commercial Support" : "Megvásárolható támogatás",
+    "Get the apps to sync your files" : "Töltse le az állományok szinkronizációjához szükséges programokat!",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ha támogatni kívánja a projektet\n  <a href=\"https://owncloud.org/contribute\"\n  target=\"_blank\">csatlakozzon a fejlesztőkhöz</a>\n  vagy\n  <a href=\"https://owncloud.org/promote\"\n   target=\"_blank\">terjessze a program hírét</a>!",
+    "Show First Run Wizard again" : "Nézzük meg újra az első bejelentkezéskori segítséget!",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
+    "Password" : "Jelszó",
+    "Your password was changed" : "A jelszava megváltozott",
+    "Unable to change your password" : "A jelszó nem változtatható meg",
+    "Current password" : "A jelenlegi jelszó",
+    "New password" : "Az új jelszó",
+    "Change password" : "A jelszó megváltoztatása",
+    "Full Name" : "Teljes név",
+    "Email" : "E-mail",
+    "Your email address" : "Az Ön e-mail címe",
+    "Fill in an email address to enable password recovery and receive notifications" : "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
+    "Profile picture" : "Profilkép",
+    "Upload new" : "Új feltöltése",
+    "Select new from Files" : "Új kiválasztása a Fájlokból",
+    "Remove image" : "A kép eltávolítása",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "A kép png vagy jpg formátumban legyen. Legjobb, ha négyzet alakú, de később még átszabható.",
+    "Your avatar is provided by your original account." : "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
+    "Cancel" : "Mégsem",
+    "Choose as profile image" : "Válasszuk ki profilképnek",
+    "Language" : "Nyelv",
+    "Help translate" : "Segítsen a fordításban!",
+    "Import Root Certificate" : "SSL tanúsítványok importálása",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
+    "Log-in password" : "Bejelentkezési jelszó",
+    "Decrypt all Files" : "Mentesíti a titkosítástól az összes fájlt",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
+    "Restore Encryption Keys" : "A titkosító kulcsok visszaállítása",
+    "Delete Encryption Keys" : "A titkosító kulcsok törlése",
+    "Login Name" : "Bejelentkezési név",
+    "Create" : "Létrehozás",
+    "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
+    "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
+    "Search Users and Groups" : "Keresés a felhasználók és a csoportok között",
+    "Add Group" : "Csoport létrehozása",
+    "Group" : "Csoport",
+    "Everyone" : "Mindenki",
+    "Admins" : "Adminok",
+    "Default Quota" : "Alapértelmezett kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
+    "Unlimited" : "Korlátlan",
+    "Other" : "Más",
+    "Username" : "Felhasználónév",
+    "Quota" : "Kvóta",
+    "Storage Location" : "A háttértár helye",
+    "Last Login" : "Utolsó bejelentkezés",
+    "change full name" : "a teljes név megváltoztatása",
+    "set new password" : "új jelszó beállítása",
+    "Default" : "Alapértelmezett"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
deleted file mode 100644
index 9049326a12a..00000000000
--- a/settings/l10n/hu_HU.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Bekapcsolva",
-"Recommended" => "Ajánlott",
-"Authentication error" => "Azonosítási hiba",
-"Your full name has been changed." => "Az Ön teljes nevét módosítottuk.",
-"Unable to change full name" => "Nem sikerült megváltoztatni a teljes nevét",
-"Group already exists" => "A csoport már létezik",
-"Unable to add group" => "A csoport nem hozható létre",
-"Files decrypted successfully" => "A fájlok titkosítását sikeresen megszüntettük.",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Fájljainak titkosítását nem sikerült megszüntetni, kérjük forduljon a rendszergazdához!",
-"Couldn't decrypt your files, check your password and try again" => "Fájljainak titkosítását nem sikerült megszüntetni, ellenőrizze a jelszavát, és próbálja újra!",
-"Encryption keys deleted permanently" => "A titkosítási kulcsait véglegesen töröltük.",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "A titkosítási kulcsait nem sikerült véglegesen törölni, kérjük ellenőrizze az owncloud.log naplófájlt, vagy forduljon a rendszergazdához!",
-"Couldn't remove app." => "Az alkalmazást nem sikerült eltávolítani.",
-"Email saved" => "Elmentettük az e-mail címet",
-"Invalid email" => "Hibás e-mail",
-"Unable to delete group" => "A csoport nem törölhető",
-"Unable to delete user" => "A felhasználó nem törölhető",
-"Backups restored successfully" => "A kulcsokat sikereresen visszaállítottuk a mentésekből.",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "A titkosítási kulcsok visszaállítása nem sikerült. Kérjük ellenőrizze az owncloud.log naplófájlt vagy forduljon a rendszergazdához!",
-"Language changed" => "A nyelv megváltozott",
-"Invalid request" => "Érvénytelen kérés",
-"Admins can't remove themself from the admin group" => "Adminisztrátorok nem távolíthatják el magukat az admin csoportból.",
-"Unable to add user to group %s" => "A felhasználó nem adható hozzá ehhez a csoporthoz: %s",
-"Unable to remove user from group %s" => "A felhasználó nem távolítható el ebből a csoportból: %s",
-"Couldn't update app." => "A program frissítése nem sikerült.",
-"Wrong password" => "Hibás jelszó",
-"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!",
-"Back-end doesn't support password change, but the users 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",
-"Saved" => "Elmentve",
-"test email settings" => "e-mail beállítások ellenőrzése",
-"If you received this email, the settings seem to be correct." => "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
-"Email sent" => "Az e-mailt elküldtük",
-"You need to set your user email before being able to send test emails." => "Előbb meg kell adnia az e-mail címét, mielőtt tesztelni tudná az e-mail küldést.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Biztos abban, hogy hozzá akarja adni \"{domain}\"-t a megbízható tartományokhoz?",
-"Add trusted domain" => "Megbízható tartomány hozzáadása",
-"Sending..." => "Küldés...",
-"All" => "Mind",
-"Please wait...." => "Kérem várjon...",
-"Error while disabling app" => "Hiba az alkalmazás letiltása közben",
-"Disable" => "Letiltás",
-"Enable" => "Engedélyezés",
-"Error while enabling app" => "Hiba az alkalmazás engedélyezése közben",
-"Updating...." => "Frissítés folyamatban...",
-"Error while updating app" => "Hiba történt az alkalmazás frissítése közben",
-"Updated" => "Frissítve",
-"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",
-"Select a profile picture" => "Válasszon profilképet!",
-"Very weak password" => "Nagyon gyenge jelszó",
-"Weak password" => "Gyenge jelszó",
-"So-so password" => "Nem túl jó jelszó",
-"Good password" => "Jó jelszó",
-"Strong password" => "Erős jelszó",
-"Delete" => "Törlés",
-"Decrypting files... Please wait, this can take some time." => "A fájlok titkosításának megszüntetése folyamatban. van... Kérem várjon, ez hosszabb ideig is eltarthat ...",
-"Delete encryption keys permanently." => "A tikosítási kulcsok végleges törlése.",
-"Restore encryption keys." => "A titkosítási kulcsok visszaállítása.",
-"Groups" => "Csoportok",
-"Unable to delete {objName}" => "Ezt nem sikerült törölni: {objName}",
-"Error creating group" => "Hiba történt a csoport létrehozása közben",
-"A valid group name must be provided" => "Érvényes csoportnevet kell megadni",
-"deleted {groupName}" => "törölve: {groupName}",
-"undo" => "visszavonás",
-"never" => "soha",
-"deleted {userName}" => "törölve: {userName}",
-"add group" => "csoport hozzáadása",
-"A valid username must be provided" => "Érvényes felhasználónevet kell megadnia",
-"Error creating user" => "A felhasználó nem hozható létre",
-"A valid password must be provided" => "Érvényes jelszót kell megadnia",
-"Warning: Home directory for user \"{user}\" already exists" => "Figyelmeztetés: A felhasználó \"{user}\" kezdő könyvtára  már létezik",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL tanúsítványok",
-"Encryption" => "Titkosítás",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Minden (végzetes hibák, hibák, figyelmeztetések, információk, hibakeresési üzenetek)",
-"Info, warnings, errors and fatal issues" => "Információk, figyelmeztetések, hibák és végzetes hibák",
-"Warnings, errors and fatal issues" => "Figyelmeztetések, hibák és végzetes hibák",
-"Errors and fatal issues" => "Hibák és végzetes hibák",
-"Fatal issues only" => "Csak a végzetes hibák",
-"None" => "Egyik sem",
-"Login" => "Login",
-"Plain" => "Plain",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Biztonsági figyelmeztetés",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "A %s szolgáltatás elérése jelenleg HTTP-n keresztül történik. Nagyon ajánlott, hogy a kiszolgálót úgy állítsa be, hogy az elérés HTTPS-en keresztül történjék.",
-"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." => "Az adatkönytára és az itt levő fájlok valószínűleg elérhetők az internetről. Az ownCloud által beillesztett .htaccess fájl nem működik. Nagyon erősen ajánlott, hogy a webszervert úgy konfigurálja, hogy az adatkönyvtár ne legyen közvetlenül kívülről elérhető, vagy az adatkönyvtárt tegye a webszerver dokumentumfáján kívülre.",
-"Setup Warning" => "A beállítással kapcsolatos figyelmeztetés",
-"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.",
-"Database Performance Info" => "Információ az adatbázis teljesítményéről",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "A kiválasztott adatbázis az SQLite. Nagyobb telepítések esetén ezt érdemes megváltoztatni. Másik adatbázisra való áttéréshez használja a következő parancssori eszközt:  'occ db:convert-type'",
-"Module 'fileinfo' missing" => "A 'fileinfo' modul hiányzik",
-"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.",
-"Your PHP version is outdated" => "A PHP verzió túl régi",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A PHP verzió túl régi. Nagyon ajánlott legalább az 5.3.8-as vagy újabb verzióra frissíteni, mert a régebbi verziónál léteznek ismert hibák. Ezért lehetséges, hogy ez a telepítés majd nem működik megfelelően.",
-"PHP charset is not set to UTF-8" => "A PHP-karakterkészlet nem UTF-8-ra van állítva",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "A PHP-karakterkészlet nem UTF-8-ra van állítva. Ez komoly problémákat okozhat, ha valaki olyan fájlnevet használ, amiben nem csupán ASCII karakterek fordulnak elő. Feltétlenül javasoljuk, hogy a php.ini-ben a 'default_charset' paramétert állítsa 'UTF-8'-ra!",
-"Locale not working" => "A nyelvi lokalizáció nem működik",
-"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 to install 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",
-"URL generation in notification emails" => "URL-képzés az értesítő e-mailekben",
-"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 \"overwritewebroot\" 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 \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
-"Please double check the <a href='%s'>installation guides</a>." => "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
-"Cron" => "Ütemezett feladatok",
-"Last cron was executed at %s." => "Az utolsó cron feladat ekkor futott le: %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
-"Cron was not executed yet!" => "A cron feladat még nem futott le!",
-"Execute one task with each page loaded" => "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
-"Sharing" => "Megosztás",
-"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",
-"Enforce password protection" => "Legyen kötelező a linkek jelszóval való védelme",
-"Allow public uploads" => "Nyilvános feltöltés engedélyezése",
-"Set default expiration date" => "Alapértelmezett lejárati idő beállítása",
-"Expire after " => "A lejárat legyen",
-"days" => "nap",
-"Enforce expiration date" => "A beállított lejárati idő legyen kötelezően érvényes",
-"Allow resharing" => "A megosztás továbbadásának engedélyezése",
-"Restrict users to only share with users in their groups" => "A csoporttagok csak a saját csoportjukon belül oszthassanak meg anyagokat",
-"Allow users to send mail notification for shared files" => "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttérő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.",
-"Security" => "Biztonság",
-"Enforce HTTPS" => "Kötelező HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Kérjük, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
-"Email Server" => "E-mail kiszolgáló",
-"This is used for sending out notifications." => "Ezt használjuk a jelentések kiküldésére.",
-"Send mode" => "Küldési mód",
-"From address" => "A feladó címe",
-"mail" => "mail",
-"Authentication method" => "A felhasználóazonosítás módszere",
-"Authentication required" => "Felhasználóazonosítás szükséges",
-"Server address" => "A kiszolgáló címe",
-"Port" => "Port",
-"Credentials" => "Azonosítók",
-"SMTP Username" => "SMTP felhasználónév",
-"SMTP Password" => "SMTP jelszó",
-"Test email settings" => "Az e-mail beállítások ellenőrzése",
-"Send email" => "E-mail küldése",
-"Log" => "Naplózás",
-"Log level" => "Naplózási szint",
-"More" => "Több",
-"Less" => "Kevesebb",
-"Version" => "Verzió",
-"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>." => "A programot az <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud közösség</a> fejleszti. A <a href=\"https://github.com/owncloud\" target=\"_blank\">forráskód</a> az <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> feltételei mellett használható föl.",
-"by" => "közreadta:",
-"Documentation:" => "Leírások:",
-"User Documentation" => "Felhasználói leírás",
-"Admin Documentation" => "Adminisztrátori leírás",
-"Enable only for specific groups" => "Csak bizonyos csoportok számára tegyük elérhetővé",
-"Uninstall App" => "Az alkalmazás eltávolítása",
-"Administrator Documentation" => "Üzemeltetői leírás",
-"Online Documentation" => "Online leírás",
-"Forum" => "Fórum",
-"Bugtracker" => "Hibabejelentések",
-"Commercial Support" => "Megvásárolható támogatás",
-"Get the apps to sync your files" => "Töltse le az állományok szinkronizációjához szükséges programokat!",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ha támogatni kívánja a projektet\n  <a href=\"https://owncloud.org/contribute\"\n  target=\"_blank\">csatlakozzon a fejlesztőkhöz</a>\n  vagy\n  <a href=\"https://owncloud.org/promote\"\n   target=\"_blank\">terjessze a program hírét</a>!",
-"Show First Run Wizard again" => "Nézzük meg újra az első bejelentkezéskori segítséget!",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Az Ön tárterület-felhasználása jelenleg: <strong>%s</strong>. Maximálisan ennyi áll rendelkezésére: <strong>%s</strong>",
-"Password" => "Jelszó",
-"Your password was changed" => "A jelszava megváltozott",
-"Unable to change your password" => "A jelszó nem változtatható meg",
-"Current password" => "A jelenlegi jelszó",
-"New password" => "Az új jelszó",
-"Change password" => "A jelszó megváltoztatása",
-"Full Name" => "Teljes név",
-"Email" => "E-mail",
-"Your email address" => "Az Ön e-mail címe",
-"Fill in an email address to enable password recovery and receive notifications" => "Adja meg az e-mail címét, hogy vissza tudja állítani a jelszavát, illetve, hogy rendszeres jelentéseket kaphasson!",
-"Profile picture" => "Profilkép",
-"Upload new" => "Új feltöltése",
-"Select new from Files" => "Új kiválasztása a Fájlokból",
-"Remove image" => "A kép eltávolítása",
-"Either png or jpg. Ideally square but you will be able to crop it." => "A kép png vagy jpg formátumban legyen. Legjobb, ha négyzet alakú, de később még átszabható.",
-"Your avatar is provided by your original account." => "A kép az eredeti bejelentkezési adatai alapján lett beállítva.",
-"Cancel" => "Mégsem",
-"Choose as profile image" => "Válasszuk ki profilképnek",
-"Language" => "Nyelv",
-"Help translate" => "Segítsen a fordításban!",
-"Import Root Certificate" => "SSL tanúsítványok importálása",
-"The encryption app is no longer enabled, please decrypt all your files" => "A titkosító alkalmazás a továbbiakban nincs engedélyezve, kérem állítsa vissza az állományait titkostásmentes állapotba!",
-"Log-in password" => "Bejelentkezési jelszó",
-"Decrypt all Files" => "Mentesíti a titkosítástól az összes fájlt",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
-"Restore Encryption Keys" => "A titkosító kulcsok visszaállítása",
-"Delete Encryption Keys" => "A titkosító kulcsok törlése",
-"Login Name" => "Bejelentkezési név",
-"Create" => "Létrehozás",
-"Admin Recovery Password" => "Adminisztrátori jelszó az állományok visszanyerésére",
-"Enter the recovery password in order to recover the users files during password change" => "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
-"Search Users and Groups" => "Keresés a felhasználók és a csoportok között",
-"Add Group" => "Csoport létrehozása",
-"Group" => "Csoport",
-"Everyone" => "Mindenki",
-"Admins" => "Adminok",
-"Default Quota" => "Alapértelmezett kvóta",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
-"Unlimited" => "Korlátlan",
-"Other" => "Más",
-"Username" => "Felhasználónév",
-"Quota" => "Kvóta",
-"Storage Location" => "A háttértár helye",
-"Last Login" => "Utolsó bejelentkezés",
-"change full name" => "a teljes név megváltoztatása",
-"set new password" => "új jelszó beállítása",
-"Default" => "Alapértelmezett"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/hy.js b/settings/l10n/hy.js
new file mode 100644
index 00000000000..e73644e2e08
--- /dev/null
+++ b/settings/l10n/hy.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Delete" : "Ջնջել",
+    "Other" : "Այլ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/hy.json b/settings/l10n/hy.json
new file mode 100644
index 00000000000..e3706d9554d
--- /dev/null
+++ b/settings/l10n/hy.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Delete" : "Ջնջել",
+    "Other" : "Այլ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/hy.php b/settings/l10n/hy.php
deleted file mode 100644
index d73cb37a765..00000000000
--- a/settings/l10n/hy.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Ջնջել",
-"Other" => "Այլ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ia.js b/settings/l10n/ia.js
new file mode 100644
index 00000000000..ffc7220a423
--- /dev/null
+++ b/settings/l10n/ia.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Language changed" : "Linguage cambiate",
+    "Invalid request" : "Requesta invalide",
+    "Saved" : "Salveguardate",
+    "Email sent" : "Message de e-posta inviate",
+    "Very weak password" : "Contrasigno multo debile",
+    "Weak password" : "Contrasigno debile",
+    "So-so password" : "Contrasigno passabile",
+    "Good password" : "Contrasigno bon",
+    "Strong password" : "Contrasigno forte",
+    "Delete" : "Deler",
+    "Groups" : "Gruppos",
+    "never" : "nunquam",
+    "__language_name__" : "Interlingua",
+    "Security Warning" : "Aviso de securitate",
+    "Log" : "Registro",
+    "More" : "Plus",
+    "by" : "per",
+    "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
+    "Password" : "Contrasigno",
+    "Unable to change your password" : "Non pote cambiar tu contrasigno",
+    "Current password" : "Contrasigno currente",
+    "New password" : "Nove contrasigno",
+    "Change password" : "Cambiar contrasigno",
+    "Email" : "E-posta",
+    "Your email address" : "Tu adresse de e-posta",
+    "Profile picture" : "Imagine de profilo",
+    "Cancel" : "Cancellar",
+    "Language" : "Linguage",
+    "Help translate" : "Adjuta a traducer",
+    "Create" : "Crear",
+    "Group" : "Gruppo",
+    "Default Quota" : "Quota predeterminate",
+    "Other" : "Altere",
+    "Username" : "Nomine de usator",
+    "Quota" : "Quota"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ia.json b/settings/l10n/ia.json
new file mode 100644
index 00000000000..b231ba1664e
--- /dev/null
+++ b/settings/l10n/ia.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Language changed" : "Linguage cambiate",
+    "Invalid request" : "Requesta invalide",
+    "Saved" : "Salveguardate",
+    "Email sent" : "Message de e-posta inviate",
+    "Very weak password" : "Contrasigno multo debile",
+    "Weak password" : "Contrasigno debile",
+    "So-so password" : "Contrasigno passabile",
+    "Good password" : "Contrasigno bon",
+    "Strong password" : "Contrasigno forte",
+    "Delete" : "Deler",
+    "Groups" : "Gruppos",
+    "never" : "nunquam",
+    "__language_name__" : "Interlingua",
+    "Security Warning" : "Aviso de securitate",
+    "Log" : "Registro",
+    "More" : "Plus",
+    "by" : "per",
+    "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
+    "Password" : "Contrasigno",
+    "Unable to change your password" : "Non pote cambiar tu contrasigno",
+    "Current password" : "Contrasigno currente",
+    "New password" : "Nove contrasigno",
+    "Change password" : "Cambiar contrasigno",
+    "Email" : "E-posta",
+    "Your email address" : "Tu adresse de e-posta",
+    "Profile picture" : "Imagine de profilo",
+    "Cancel" : "Cancellar",
+    "Language" : "Linguage",
+    "Help translate" : "Adjuta a traducer",
+    "Create" : "Crear",
+    "Group" : "Gruppo",
+    "Default Quota" : "Quota predeterminate",
+    "Other" : "Altere",
+    "Username" : "Nomine de usator",
+    "Quota" : "Quota"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
deleted file mode 100644
index f348af78212..00000000000
--- a/settings/l10n/ia.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Language changed" => "Linguage cambiate",
-"Invalid request" => "Requesta invalide",
-"Saved" => "Salveguardate",
-"Email sent" => "Message de e-posta inviate",
-"Very weak password" => "Contrasigno multo debile",
-"Weak password" => "Contrasigno debile",
-"So-so password" => "Contrasigno passabile",
-"Good password" => "Contrasigno bon",
-"Strong password" => "Contrasigno forte",
-"Delete" => "Deler",
-"Groups" => "Gruppos",
-"never" => "nunquam",
-"__language_name__" => "Interlingua",
-"Security Warning" => "Aviso de securitate",
-"Log" => "Registro",
-"More" => "Plus",
-"by" => "per",
-"Get the apps to sync your files" => "Obtene le apps (applicationes) pro synchronizar tu files",
-"Password" => "Contrasigno",
-"Unable to change your password" => "Non pote cambiar tu contrasigno",
-"Current password" => "Contrasigno currente",
-"New password" => "Nove contrasigno",
-"Change password" => "Cambiar contrasigno",
-"Email" => "E-posta",
-"Your email address" => "Tu adresse de e-posta",
-"Profile picture" => "Imagine de profilo",
-"Cancel" => "Cancellar",
-"Language" => "Linguage",
-"Help translate" => "Adjuta a traducer",
-"Create" => "Crear",
-"Group" => "Gruppo",
-"Default Quota" => "Quota predeterminate",
-"Other" => "Altere",
-"Username" => "Nomine de usator",
-"Quota" => "Quota"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
new file mode 100644
index 00000000000..7a27913daf0
--- /dev/null
+++ b/settings/l10n/id.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Diaktifkan",
+    "Not enabled" : "Tidak diaktifkan",
+    "Recommended" : "Direkomendasikan",
+    "Authentication error" : "Terjadi kesalahan saat otentikasi",
+    "Your full name has been changed." : "Nama lengkap Anda telah diubah",
+    "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
+    "Group already exists" : "Grup sudah ada",
+    "Unable to add group" : "Tidak dapat menambah grup",
+    "Files decrypted successfully" : "Berkas berhasil dideskripsi",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
+    "Couldn't decrypt your files, check your password and try again" : "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
+    "Encryption keys deleted permanently" : "Kunci enkripsi dihapus secara permanen",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
+    "Couldn't remove app." : "Tidak dapat menghapus aplikasi.",
+    "Email saved" : "Email disimpan",
+    "Invalid email" : "Email tidak valid",
+    "Unable to delete group" : "Tidak dapat menghapus grup",
+    "Unable to delete user" : "Tidak dapat menghapus pengguna",
+    "Backups restored successfully" : "Cadangan berhasil dipulihkan",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
+    "Language changed" : "Bahasa telah diubah",
+    "Invalid request" : "Permintaan tidak valid",
+    "Admins can't remove themself from the admin group" : "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
+    "Unable to add user to group %s" : "Tidak dapat menambahkan pengguna ke grup %s",
+    "Unable to remove user from group %s" : "Tidak dapat menghapus pengguna dari grup %s",
+    "Couldn't update app." : "Tidak dapat memperbarui aplikasi.",
+    "Wrong password" : "Sandi salah",
+    "No user supplied" : "Tidak ada pengguna yang diberikan",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
+    "Wrong admin recovery password. Please check the password and try again." : "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
+    "Unable to change password" : "Tidak dapat mengubah sandi",
+    "Saved" : "Disimpan",
+    "test email settings" : "pengaturan email percobaan",
+    "If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
+    "A problem occurred while sending the email. Please revise your settings." : "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
+    "Email sent" : "Email terkirim",
+    "You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
+    "Add trusted domain" : "Tambah domain terpercaya",
+    "Sending..." : "Mengirim",
+    "All" : "Semua",
+    "Please wait...." : "Mohon tunggu....",
+    "Error while disabling app" : "Terjadi kesalahan saat menonaktifkan aplikasi",
+    "Disable" : "Nonaktifkan",
+    "Enable" : "Aktifkan",
+    "Error while enabling app" : "Terjadi kesalahan saat mengakifkan aplikasi",
+    "Updating...." : "Memperbarui....",
+    "Error while updating app" : "Terjadi kesalahan saat memperbarui aplikasi",
+    "Updated" : "Diperbarui",
+    "Uninstalling ...." : "Mencopot ...",
+    "Error while uninstalling app" : "Terjadi kesalahan saat mencopot aplikasi",
+    "Uninstall" : "Copot",
+    "Select a profile picture" : "Pilih foto profil",
+    "Very weak password" : "Sandi sangat lemah",
+    "Weak password" : "Sandi lemah",
+    "So-so password" : "Sandi lumayan",
+    "Good password" : "Sandi baik",
+    "Strong password" : "Sandi kuat",
+    "Valid until {date}" : "Berlaku sampai {date}",
+    "Delete" : "Hapus",
+    "Decrypting files... Please wait, this can take some time." : "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
+    "Delete encryption keys permanently." : "Hapus kunci enkripsi secara permanen.",
+    "Restore encryption keys." : "memulihkan kunci enkripsi.",
+    "Groups" : "Grup",
+    "Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
+    "Error creating group" : "Terjadi kesalahan saat membuat grup",
+    "A valid group name must be provided" : "Harus memberikan nama grup yang benar.",
+    "deleted {groupName}" : "menghapus {groupName}",
+    "undo" : "urungkan",
+    "no group" : "tanpa grup",
+    "never" : "tidak pernah",
+    "deleted {userName}" : "menghapus {userName}",
+    "add group" : "tambah grup",
+    "A valid username must be provided" : "Harus memberikan nama pengguna yang benar",
+    "Error creating user" : "Terjadi kesalahan saat membuat pengguna",
+    "A valid password must be provided" : "Harus memberikan sandi yang benar",
+    "Warning: Home directory for user \"{user}\" already exists" : "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Info Pribadi",
+    "SSL root certificates" : "Sertifikat root SSL",
+    "Encryption" : "Enkripsi",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, peringatan, galat dan masalah fatal",
+    "Warnings, errors and fatal issues" : "Peringatan, galat dan masalah fatal",
+    "Errors and fatal issues" : "Galat dan masalah fatal",
+    "Fatal issues only" : "Hanya masalah fatal",
+    "None" : "Tidak ada",
+    "Login" : "Masuk",
+    "Plain" : "Biasa",
+    "NT LAN Manager" : "Manajer NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Peringatan Keamanan",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya.",
+    "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." : "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver.",
+    "Setup Warning" : "Peringatan Pengaturan",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP 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.",
+    "Database Performance Info" : "Info Performa Basis Data",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modul 'fileinfo' tidak ada",
+    "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.",
+    "Your PHP version is outdated" : "Versi PHP telah usang",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar.",
+    "PHP charset is not set to UTF-8" : "Charset PHP tidak disetel ke UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Charset PHP tidak disetel ke UTF-8. Hal ini dapat menyebabkan masalah besar dengan karakter non-ASCII di nama berkas. Kami sangat merekomendasikan untuk mengubah nilai 'default_charset' php.ini ke 'UTF-8'.",
+    "Locale not working" : "Kode pelokalan tidak berfungsi",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
+    "URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+    "Connectivity checks" : "Pemeriksaan konektivitas",
+    "No problems found" : "Masalah tidak ditemukan",
+    "Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
+    "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
+    "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
+    "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.",
+    "Sharing" : "Berbagi",
+    "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",
+    "Enforce password protection" : "Berlakukan perlindungan sandi",
+    "Allow public uploads" : "Izinkan unggahan publik",
+    "Set default expiration date" : "Atur tanggal kadaluarsa default",
+    "Expire after " : "Kadaluarsa setelah",
+    "days" : "hari",
+    "Enforce expiration date" : "Berlakukan tanggal kadaluarsa",
+    "Allow resharing" : "Izinkan pembagian ulang",
+    "Restrict users to only share with users in their groups" : "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
+    "Allow users to send mail notification for shared files" : "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
+    "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.",
+    "Security" : "Keamanan",
+    "Enforce HTTPS" : "Selalu Gunakan HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
+    "Email Server" : "Server Email",
+    "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
+    "Send mode" : "Modus kirim",
+    "From address" : "Dari alamat",
+    "mail" : "email",
+    "Authentication method" : "Metode otentikasi",
+    "Authentication required" : "Diperlukan otentikasi",
+    "Server address" : "Alamat server",
+    "Port" : "port",
+    "Credentials" : "Kredensial",
+    "SMTP Username" : "Nama pengguna SMTP",
+    "SMTP Password" : "Sandi SMTP",
+    "Store credentials" : "Simpan kredensial",
+    "Test email settings" : "Pengaturan email percobaan",
+    "Send email" : "Kirim email",
+    "Log" : "Log",
+    "Log level" : "Level log",
+    "More" : "Lainnya",
+    "Less" : "Ciutkan",
+    "Version" : "Versi",
+    "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>." : "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Lebih banyak aplikasi",
+    "Add your app" : "Tambah aplikasi Anda",
+    "by" : "oleh",
+    "licensed" : "dilisensikan",
+    "Documentation:" : "Dokumentasi:",
+    "User Documentation" : "Dokumentasi Pengguna",
+    "Admin Documentation" : "Dokumentasi Admin",
+    "Update to %s" : "Perbarui ke %s",
+    "Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu",
+    "Uninstall App" : "Copot aplikasi",
+    "Administrator Documentation" : "Dokumentasi Administrator",
+    "Online Documentation" : "Dokumentasi Online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Dukungan Komersial",
+    "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
+    "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
+    "Password" : "Sandi",
+    "Your password was changed" : "Sandi Anda telah diubah",
+    "Unable to change your password" : "Gagal mengubah sandi Anda",
+    "Current password" : "Sandi saat ini",
+    "New password" : "Sandi baru",
+    "Change password" : "Ubah sandi",
+    "Full Name" : "Nama Lengkap",
+    "Email" : "Email",
+    "Your email address" : "Alamat email Anda",
+    "Fill in an email address to enable password recovery and receive notifications" : "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
+    "Profile picture" : "Foto profil",
+    "Upload new" : "Unggah baru",
+    "Select new from Files" : "Pilih baru dari Berkas",
+    "Remove image" : "Hapus gambar",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Boleh png atau jpg. Idealnya berbentuk persegi tetapi jika tidak, Anda bisa memotongnya nanti.",
+    "Your avatar is provided by your original account." : "Avatar disediakan oleh akun asli Anda.",
+    "Cancel" : "Batal",
+    "Choose as profile image" : "Pilih sebagai gambar profil",
+    "Language" : "Bahasa",
+    "Help translate" : "Bantu menerjemahkan",
+    "Common Name" : "Nama umum",
+    "Valid until" : "Berlaku sampai",
+    "Issued By" : "Diterbitkan oleh",
+    "Valid until %s" : "Berlaku sampai %s",
+    "Import Root Certificate" : "Impor Sertifikat Root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
+    "Log-in password" : "Sandi masuk",
+    "Decrypt all Files" : "Deskripsi semua Berkas",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
+    "Restore Encryption Keys" : "Pulihkan Kunci Enkripsi",
+    "Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
+    "Show storage location" : "Tampilkan kolasi penyimpanan",
+    "Show last log in" : "Tampilkan masuk terakhir",
+    "Login Name" : "Nama Masuk",
+    "Create" : "Buat",
+    "Admin Recovery Password" : "Sandi pemulihan Admin",
+    "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
+    "Search Users and Groups" : "Telusuri Pengguna dan Grup",
+    "Add Group" : "Tambah Grup",
+    "Group" : "Grup",
+    "Everyone" : "Semua orang",
+    "Admins" : "Admin",
+    "Default Quota" : "Kuota default",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
+    "Unlimited" : "Tak terbatas",
+    "Other" : "Lainnya",
+    "Username" : "Nama pengguna",
+    "Group Admin for" : "Grup Admin untuk",
+    "Quota" : "Quota",
+    "Storage Location" : "Lokasi Penyimpanan",
+    "Last Login" : "Masuk Terakhir",
+    "change full name" : "ubah nama lengkap",
+    "set new password" : "setel sandi baru",
+    "Default" : "Default"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
new file mode 100644
index 00000000000..cbfecf00f2a
--- /dev/null
+++ b/settings/l10n/id.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Diaktifkan",
+    "Not enabled" : "Tidak diaktifkan",
+    "Recommended" : "Direkomendasikan",
+    "Authentication error" : "Terjadi kesalahan saat otentikasi",
+    "Your full name has been changed." : "Nama lengkap Anda telah diubah",
+    "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
+    "Group already exists" : "Grup sudah ada",
+    "Unable to add group" : "Tidak dapat menambah grup",
+    "Files decrypted successfully" : "Berkas berhasil dideskripsi",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
+    "Couldn't decrypt your files, check your password and try again" : "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
+    "Encryption keys deleted permanently" : "Kunci enkripsi dihapus secara permanen",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
+    "Couldn't remove app." : "Tidak dapat menghapus aplikasi.",
+    "Email saved" : "Email disimpan",
+    "Invalid email" : "Email tidak valid",
+    "Unable to delete group" : "Tidak dapat menghapus grup",
+    "Unable to delete user" : "Tidak dapat menghapus pengguna",
+    "Backups restored successfully" : "Cadangan berhasil dipulihkan",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
+    "Language changed" : "Bahasa telah diubah",
+    "Invalid request" : "Permintaan tidak valid",
+    "Admins can't remove themself from the admin group" : "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
+    "Unable to add user to group %s" : "Tidak dapat menambahkan pengguna ke grup %s",
+    "Unable to remove user from group %s" : "Tidak dapat menghapus pengguna dari grup %s",
+    "Couldn't update app." : "Tidak dapat memperbarui aplikasi.",
+    "Wrong password" : "Sandi salah",
+    "No user supplied" : "Tidak ada pengguna yang diberikan",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
+    "Wrong admin recovery password. Please check the password and try again." : "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
+    "Unable to change password" : "Tidak dapat mengubah sandi",
+    "Saved" : "Disimpan",
+    "test email settings" : "pengaturan email percobaan",
+    "If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
+    "A problem occurred while sending the email. Please revise your settings." : "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
+    "Email sent" : "Email terkirim",
+    "You need to set your user email before being able to send test emails." : "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
+    "Add trusted domain" : "Tambah domain terpercaya",
+    "Sending..." : "Mengirim",
+    "All" : "Semua",
+    "Please wait...." : "Mohon tunggu....",
+    "Error while disabling app" : "Terjadi kesalahan saat menonaktifkan aplikasi",
+    "Disable" : "Nonaktifkan",
+    "Enable" : "Aktifkan",
+    "Error while enabling app" : "Terjadi kesalahan saat mengakifkan aplikasi",
+    "Updating...." : "Memperbarui....",
+    "Error while updating app" : "Terjadi kesalahan saat memperbarui aplikasi",
+    "Updated" : "Diperbarui",
+    "Uninstalling ...." : "Mencopot ...",
+    "Error while uninstalling app" : "Terjadi kesalahan saat mencopot aplikasi",
+    "Uninstall" : "Copot",
+    "Select a profile picture" : "Pilih foto profil",
+    "Very weak password" : "Sandi sangat lemah",
+    "Weak password" : "Sandi lemah",
+    "So-so password" : "Sandi lumayan",
+    "Good password" : "Sandi baik",
+    "Strong password" : "Sandi kuat",
+    "Valid until {date}" : "Berlaku sampai {date}",
+    "Delete" : "Hapus",
+    "Decrypting files... Please wait, this can take some time." : "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
+    "Delete encryption keys permanently." : "Hapus kunci enkripsi secara permanen.",
+    "Restore encryption keys." : "memulihkan kunci enkripsi.",
+    "Groups" : "Grup",
+    "Unable to delete {objName}" : "Tidak dapat menghapus {objName}",
+    "Error creating group" : "Terjadi kesalahan saat membuat grup",
+    "A valid group name must be provided" : "Harus memberikan nama grup yang benar.",
+    "deleted {groupName}" : "menghapus {groupName}",
+    "undo" : "urungkan",
+    "no group" : "tanpa grup",
+    "never" : "tidak pernah",
+    "deleted {userName}" : "menghapus {userName}",
+    "add group" : "tambah grup",
+    "A valid username must be provided" : "Harus memberikan nama pengguna yang benar",
+    "Error creating user" : "Terjadi kesalahan saat membuat pengguna",
+    "A valid password must be provided" : "Harus memberikan sandi yang benar",
+    "Warning: Home directory for user \"{user}\" already exists" : "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Info Pribadi",
+    "SSL root certificates" : "Sertifikat root SSL",
+    "Encryption" : "Enkripsi",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, peringatan, galat dan masalah fatal",
+    "Warnings, errors and fatal issues" : "Peringatan, galat dan masalah fatal",
+    "Errors and fatal issues" : "Galat dan masalah fatal",
+    "Fatal issues only" : "Hanya masalah fatal",
+    "None" : "Tidak ada",
+    "Login" : "Masuk",
+    "Plain" : "Biasa",
+    "NT LAN Manager" : "Manajer NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Peringatan Keamanan",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya.",
+    "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." : "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver.",
+    "Setup Warning" : "Peringatan Pengaturan",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Tampaknya pengaturan PHP 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.",
+    "Database Performance Info" : "Info Performa Basis Data",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modul 'fileinfo' tidak ada",
+    "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.",
+    "Your PHP version is outdated" : "Versi PHP telah usang",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar.",
+    "PHP charset is not set to UTF-8" : "Charset PHP tidak disetel ke UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Charset PHP tidak disetel ke UTF-8. Hal ini dapat menyebabkan masalah besar dengan karakter non-ASCII di nama berkas. Kami sangat merekomendasikan untuk mengubah nilai 'default_charset' php.ini ke 'UTF-8'.",
+    "Locale not working" : "Kode pelokalan tidak berfungsi",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
+    "URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
+    "Connectivity checks" : "Pemeriksaan konektivitas",
+    "No problems found" : "Masalah tidak ditemukan",
+    "Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
+    "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
+    "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
+    "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.",
+    "Sharing" : "Berbagi",
+    "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",
+    "Enforce password protection" : "Berlakukan perlindungan sandi",
+    "Allow public uploads" : "Izinkan unggahan publik",
+    "Set default expiration date" : "Atur tanggal kadaluarsa default",
+    "Expire after " : "Kadaluarsa setelah",
+    "days" : "hari",
+    "Enforce expiration date" : "Berlakukan tanggal kadaluarsa",
+    "Allow resharing" : "Izinkan pembagian ulang",
+    "Restrict users to only share with users in their groups" : "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
+    "Allow users to send mail notification for shared files" : "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
+    "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.",
+    "Security" : "Keamanan",
+    "Enforce HTTPS" : "Selalu Gunakan HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
+    "Email Server" : "Server Email",
+    "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
+    "Send mode" : "Modus kirim",
+    "From address" : "Dari alamat",
+    "mail" : "email",
+    "Authentication method" : "Metode otentikasi",
+    "Authentication required" : "Diperlukan otentikasi",
+    "Server address" : "Alamat server",
+    "Port" : "port",
+    "Credentials" : "Kredensial",
+    "SMTP Username" : "Nama pengguna SMTP",
+    "SMTP Password" : "Sandi SMTP",
+    "Store credentials" : "Simpan kredensial",
+    "Test email settings" : "Pengaturan email percobaan",
+    "Send email" : "Kirim email",
+    "Log" : "Log",
+    "Log level" : "Level log",
+    "More" : "Lainnya",
+    "Less" : "Ciutkan",
+    "Version" : "Versi",
+    "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>." : "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Lebih banyak aplikasi",
+    "Add your app" : "Tambah aplikasi Anda",
+    "by" : "oleh",
+    "licensed" : "dilisensikan",
+    "Documentation:" : "Dokumentasi:",
+    "User Documentation" : "Dokumentasi Pengguna",
+    "Admin Documentation" : "Dokumentasi Admin",
+    "Update to %s" : "Perbarui ke %s",
+    "Enable only for specific groups" : "Aktifkan hanya untuk grup tertentu",
+    "Uninstall App" : "Copot aplikasi",
+    "Administrator Documentation" : "Dokumentasi Administrator",
+    "Online Documentation" : "Dokumentasi Online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Dukungan Komersial",
+    "Get the apps to sync your files" : "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
+    "Show First Run Wizard again" : "Tampilkan Penuntun Konfigurasi Awal",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
+    "Password" : "Sandi",
+    "Your password was changed" : "Sandi Anda telah diubah",
+    "Unable to change your password" : "Gagal mengubah sandi Anda",
+    "Current password" : "Sandi saat ini",
+    "New password" : "Sandi baru",
+    "Change password" : "Ubah sandi",
+    "Full Name" : "Nama Lengkap",
+    "Email" : "Email",
+    "Your email address" : "Alamat email Anda",
+    "Fill in an email address to enable password recovery and receive notifications" : "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
+    "Profile picture" : "Foto profil",
+    "Upload new" : "Unggah baru",
+    "Select new from Files" : "Pilih baru dari Berkas",
+    "Remove image" : "Hapus gambar",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Boleh png atau jpg. Idealnya berbentuk persegi tetapi jika tidak, Anda bisa memotongnya nanti.",
+    "Your avatar is provided by your original account." : "Avatar disediakan oleh akun asli Anda.",
+    "Cancel" : "Batal",
+    "Choose as profile image" : "Pilih sebagai gambar profil",
+    "Language" : "Bahasa",
+    "Help translate" : "Bantu menerjemahkan",
+    "Common Name" : "Nama umum",
+    "Valid until" : "Berlaku sampai",
+    "Issued By" : "Diterbitkan oleh",
+    "Valid until %s" : "Berlaku sampai %s",
+    "Import Root Certificate" : "Impor Sertifikat Root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
+    "Log-in password" : "Sandi masuk",
+    "Decrypt all Files" : "Deskripsi semua Berkas",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
+    "Restore Encryption Keys" : "Pulihkan Kunci Enkripsi",
+    "Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
+    "Show storage location" : "Tampilkan kolasi penyimpanan",
+    "Show last log in" : "Tampilkan masuk terakhir",
+    "Login Name" : "Nama Masuk",
+    "Create" : "Buat",
+    "Admin Recovery Password" : "Sandi pemulihan Admin",
+    "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
+    "Search Users and Groups" : "Telusuri Pengguna dan Grup",
+    "Add Group" : "Tambah Grup",
+    "Group" : "Grup",
+    "Everyone" : "Semua orang",
+    "Admins" : "Admin",
+    "Default Quota" : "Kuota default",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
+    "Unlimited" : "Tak terbatas",
+    "Other" : "Lainnya",
+    "Username" : "Nama pengguna",
+    "Group Admin for" : "Grup Admin untuk",
+    "Quota" : "Quota",
+    "Storage Location" : "Lokasi Penyimpanan",
+    "Last Login" : "Masuk Terakhir",
+    "change full name" : "ubah nama lengkap",
+    "set new password" : "setel sandi baru",
+    "Default" : "Default"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
deleted file mode 100644
index 639d62b7114..00000000000
--- a/settings/l10n/id.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Diaktifkan",
-"Not enabled" => "Tidak diaktifkan",
-"Recommended" => "Direkomendasikan",
-"Authentication error" => "Terjadi kesalahan saat otentikasi",
-"Your full name has been changed." => "Nama lengkap Anda telah diubah",
-"Unable to change full name" => "Tidak dapat mengubah nama lengkap",
-"Group already exists" => "Grup sudah ada",
-"Unable to add group" => "Tidak dapat menambah grup",
-"Files decrypted successfully" => "Berkas berhasil dideskripsi",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Tidak dapat mendeskripsi berkas Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda",
-"Couldn't decrypt your files, check your password and try again" => "Tidak dapat mendeskripsi berkas Anda, periksa sandi Anda dan coba lagi",
-"Encryption keys deleted permanently" => "Kunci enkripsi dihapus secara permanen",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Tidak dapat menghapus kunci enkripsi anda secara permanen, mohon periksa owncloud.log atau tanyakan pada administrator Anda",
-"Couldn't remove app." => "Tidak dapat menghapus aplikasi.",
-"Email saved" => "Email disimpan",
-"Invalid email" => "Email tidak valid",
-"Unable to delete group" => "Tidak dapat menghapus grup",
-"Unable to delete user" => "Tidak dapat menghapus pengguna",
-"Backups restored successfully" => "Cadangan berhasil dipulihkan",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Tidak dapat memulihkan kunci enkripsi Anda, mohon periksa owncloud.log Anda atau tanyakan pada administrator Anda.",
-"Language changed" => "Bahasa telah diubah",
-"Invalid request" => "Permintaan tidak valid",
-"Admins can't remove themself from the admin group" => "Admin tidak dapat menghapus dirinya sendiri dari grup admin",
-"Unable to add user to group %s" => "Tidak dapat menambahkan pengguna ke grup %s",
-"Unable to remove user from group %s" => "Tidak dapat menghapus pengguna dari grup %s",
-"Couldn't update app." => "Tidak dapat memperbarui aplikasi.",
-"Wrong password" => "Sandi salah",
-"No user supplied" => "Tidak ada pengguna yang diberikan",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Mohon sediakan sandi pemulihan admin, jika tidak semua data pengguna akan terhapus",
-"Wrong admin recovery password. Please check the password and try again." => "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
-"Unable to change password" => "Tidak dapat mengubah sandi",
-"Saved" => "Disimpan",
-"test email settings" => "pengaturan email percobaan",
-"If you received this email, the settings seem to be correct." => "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
-"A problem occurred while sending the email. Please revise your settings." => "Muncul masalah tidak terduga saat mengirim email. Mohon merevisi pengaturan Anda.",
-"Email sent" => "Email terkirim",
-"You need to set your user email before being able to send test emails." => "Anda perlu menetapkan email pengguna Anda sebelum dapat mengirim email percobaan.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Apakah And yakin ingin menambahkan \"{domain}\" sebagai domain terpercaya?",
-"Add trusted domain" => "Tambah domain terpercaya",
-"Sending..." => "Mengirim",
-"All" => "Semua",
-"Please wait...." => "Mohon tunggu....",
-"Error while disabling app" => "Terjadi kesalahan saat menonaktifkan aplikasi",
-"Disable" => "Nonaktifkan",
-"Enable" => "Aktifkan",
-"Error while enabling app" => "Terjadi kesalahan saat mengakifkan aplikasi",
-"Updating...." => "Memperbarui....",
-"Error while updating app" => "Terjadi kesalahan saat memperbarui aplikasi",
-"Updated" => "Diperbarui",
-"Uninstalling ...." => "Mencopot ...",
-"Error while uninstalling app" => "Terjadi kesalahan saat mencopot aplikasi",
-"Uninstall" => "Copot",
-"Select a profile picture" => "Pilih foto profil",
-"Very weak password" => "Sandi sangat lemah",
-"Weak password" => "Sandi lemah",
-"So-so password" => "Sandi lumayan",
-"Good password" => "Sandi baik",
-"Strong password" => "Sandi kuat",
-"Valid until {date}" => "Berlaku sampai {date}",
-"Delete" => "Hapus",
-"Decrypting files... Please wait, this can take some time." => "Mendeskripsi berkas... Mohon tunggu, ini memerlukan beberapa saat.",
-"Delete encryption keys permanently." => "Hapus kunci enkripsi secara permanen.",
-"Restore encryption keys." => "memulihkan kunci enkripsi.",
-"Groups" => "Grup",
-"Unable to delete {objName}" => "Tidak dapat menghapus {objName}",
-"Error creating group" => "Terjadi kesalahan saat membuat grup",
-"A valid group name must be provided" => "Harus memberikan nama grup yang benar.",
-"deleted {groupName}" => "menghapus {groupName}",
-"undo" => "urungkan",
-"no group" => "tanpa grup",
-"never" => "tidak pernah",
-"deleted {userName}" => "menghapus {userName}",
-"add group" => "tambah grup",
-"A valid username must be provided" => "Harus memberikan nama pengguna yang benar",
-"Error creating user" => "Terjadi kesalahan saat membuat pengguna",
-"A valid password must be provided" => "Harus memberikan sandi yang benar",
-"Warning: Home directory for user \"{user}\" already exists" => "Peringatan: Direktori home untuk pengguna \"{user}\"  sudah ada",
-"__language_name__" => "__language_name__",
-"Personal Info" => "Info Pribadi",
-"SSL root certificates" => "Sertifikat root SSL",
-"Encryption" => "Enkripsi",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Semuanya (Masalah fatal, galat, peringatan, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, peringatan, galat dan masalah fatal",
-"Warnings, errors and fatal issues" => "Peringatan, galat dan masalah fatal",
-"Errors and fatal issues" => "Galat dan masalah fatal",
-"Fatal issues only" => "Hanya masalah fatal",
-"None" => "Tidak ada",
-"Login" => "Masuk",
-"Plain" => "Biasa",
-"NT LAN Manager" => "Manajer NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Peringatan Keamanan",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Anda mengakses %s melalui HTTP. Kami sangat menyarankan Anda untuk mengkonfigurasi server dengan menggunakan HTTPS sebagai gantinya.",
-"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." => "Direktori data dan berkas Anda mungkin dapat diakses dari internet. Berkas .htaccess tidak bekerja. Kami sangat menyarankan untuk mengkonfigurasi server web Anda agar direktori data tidak lagi dapat diakses atau Anda dapat memindahkan direktori data di luar dokumen root webserver.",
-"Setup Warning" => "Peringatan Pengaturan",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Tampaknya pengaturan PHP 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.",
-"Database Performance Info" => "Info Performa Basis Data",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite akan digunakan sebagai basis data. Untuk instalasi besar, kami merekomendasikan untuk mengubahnya. Untuk berpindah ke basis data lainnya, gunakan alat baris perintah: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modul 'fileinfo' tidak ada",
-"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.",
-"Your PHP version is outdated" => "Versi PHP telah usang",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Versi PHP telah usang. Kami sangat menyarankan untuk diperbarui ke versi 5.3.8 atau yang lebih baru karena versi lama diketahui rusak. Ada kemungkinan bahwa instalasi ini tidak bekerja dengan benar.",
-"PHP charset is not set to UTF-8" => "Charset PHP tidak disetel ke UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Charset PHP tidak disetel ke UTF-8. Hal ini dapat menyebabkan masalah besar dengan karakter non-ASCII di nama berkas. Kami sangat merekomendasikan untuk mengubah nilai 'default_charset' php.ini ke 'UTF-8'.",
-"Locale not working" => "Kode pelokalan tidak berfungsi",
-"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 to install the required packages on your system to support one of the following locales: %s." => "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
-"URL generation in notification emails" => "URL dibuat dalam email pemberitahuan",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
-"Connectivity checks" => "Pemeriksaan konektivitas",
-"No problems found" => "Masalah tidak ditemukan",
-"Please double check the <a href='%s'>installation guides</a>." => "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Cron terakhir dieksekusi pada %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
-"Cron was not executed yet!" => "Cron masih belum dieksekusi!",
-"Execute one task with each page loaded" => "Jalankan tugas setiap kali halaman dimuat",
-"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.",
-"Sharing" => "Berbagi",
-"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",
-"Enforce password protection" => "Berlakukan perlindungan sandi",
-"Allow public uploads" => "Izinkan unggahan publik",
-"Set default expiration date" => "Atur tanggal kadaluarsa default",
-"Expire after " => "Kadaluarsa setelah",
-"days" => "hari",
-"Enforce expiration date" => "Berlakukan tanggal kadaluarsa",
-"Allow resharing" => "Izinkan pembagian ulang",
-"Restrict users to only share with users in their groups" => "Batasi pengguna untuk hanya membagikan dengan pengguna didalam grup mereka",
-"Allow users to send mail notification for shared files" => "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
-"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.",
-"Security" => "Keamanan",
-"Enforce HTTPS" => "Selalu Gunakan HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
-"Email Server" => "Server Email",
-"This is used for sending out notifications." => "Ini digunakan untuk mengirim notifikasi keluar.",
-"Send mode" => "Modus kirim",
-"From address" => "Dari alamat",
-"mail" => "email",
-"Authentication method" => "Metode otentikasi",
-"Authentication required" => "Diperlukan otentikasi",
-"Server address" => "Alamat server",
-"Port" => "port",
-"Credentials" => "Kredensial",
-"SMTP Username" => "Nama pengguna SMTP",
-"SMTP Password" => "Sandi SMTP",
-"Store credentials" => "Simpan kredensial",
-"Test email settings" => "Pengaturan email percobaan",
-"Send email" => "Kirim email",
-"Log" => "Log",
-"Log level" => "Level log",
-"More" => "Lainnya",
-"Less" => "Ciutkan",
-"Version" => "Versi",
-"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>." => "Dikembangkan oleh <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitas ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kode sumber</a> dilisensikan di bawah <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Lebih banyak aplikasi",
-"Add your app" => "Tambah aplikasi Anda",
-"by" => "oleh",
-"licensed" => "dilisensikan",
-"Documentation:" => "Dokumentasi:",
-"User Documentation" => "Dokumentasi Pengguna",
-"Admin Documentation" => "Dokumentasi Admin",
-"Update to %s" => "Perbarui ke %s",
-"Enable only for specific groups" => "Aktifkan hanya untuk grup tertentu",
-"Uninstall App" => "Copot aplikasi",
-"Administrator Documentation" => "Dokumentasi Administrator",
-"Online Documentation" => "Dokumentasi Online",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Dukungan Komersial",
-"Get the apps to sync your files" => "Dapatkan aplikasi untuk sinkronisasi berkas Anda",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Jika Anda ingin mendukung proyek ini\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">bergabung dengan pembagunan</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sebarkan promosi</a>!",
-"Show First Run Wizard again" => "Tampilkan Penuntun Konfigurasi Awal",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Anda telah menggunakan <strong>%s</strong> dari total <strong>%s</strong>",
-"Password" => "Sandi",
-"Your password was changed" => "Sandi Anda telah diubah",
-"Unable to change your password" => "Gagal mengubah sandi Anda",
-"Current password" => "Sandi saat ini",
-"New password" => "Sandi baru",
-"Change password" => "Ubah sandi",
-"Full Name" => "Nama Lengkap",
-"Email" => "Email",
-"Your email address" => "Alamat email Anda",
-"Fill in an email address to enable password recovery and receive notifications" => "Isikan alamat email untuk mengaktifkan pemulihan sandi dan menerima notifikasi",
-"Profile picture" => "Foto profil",
-"Upload new" => "Unggah baru",
-"Select new from Files" => "Pilih baru dari Berkas",
-"Remove image" => "Hapus gambar",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Boleh png atau jpg. Idealnya berbentuk persegi tetapi jika tidak, Anda bisa memotongnya nanti.",
-"Your avatar is provided by your original account." => "Avatar disediakan oleh akun asli Anda.",
-"Cancel" => "Batal",
-"Choose as profile image" => "Pilih sebagai gambar profil",
-"Language" => "Bahasa",
-"Help translate" => "Bantu menerjemahkan",
-"Common Name" => "Nama umum",
-"Valid until" => "Berlaku sampai",
-"Issued By" => "Diterbitkan oleh",
-"Valid until %s" => "Berlaku sampai %s",
-"Import Root Certificate" => "Impor Sertifikat Root",
-"The encryption app is no longer enabled, please decrypt all your files" => "Aplikasi enkripsi tidak lagi diaktifkan, silahkan mendekripsi semua file Anda",
-"Log-in password" => "Sandi masuk",
-"Decrypt all Files" => "Deskripsi semua Berkas",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Kunci enkripsi Anda dipindahkan ke lokasi cadangan. Jika terjadi sesuatu yang tidak beres, Anda dapat memulihkan kunci. Hanya menghapusnya secara permanen jika Anda yakin bahwa semua berkas telah didekripsi dengan benar.",
-"Restore Encryption Keys" => "Pulihkan Kunci Enkripsi",
-"Delete Encryption Keys" => "Hapus Kuncu Enkripsi",
-"Show storage location" => "Tampilkan kolasi penyimpanan",
-"Show last log in" => "Tampilkan masuk terakhir",
-"Login Name" => "Nama Masuk",
-"Create" => "Buat",
-"Admin Recovery Password" => "Sandi pemulihan Admin",
-"Enter the recovery password in order to recover the users files during password change" => "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
-"Search Users and Groups" => "Telusuri Pengguna dan Grup",
-"Add Group" => "Tambah Grup",
-"Group" => "Grup",
-"Everyone" => "Semua orang",
-"Admins" => "Admin",
-"Default Quota" => "Kuota default",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
-"Unlimited" => "Tak terbatas",
-"Other" => "Lainnya",
-"Username" => "Nama pengguna",
-"Group Admin for" => "Grup Admin untuk",
-"Quota" => "Quota",
-"Storage Location" => "Lokasi Penyimpanan",
-"Last Login" => "Masuk Terakhir",
-"change full name" => "ubah nama lengkap",
-"set new password" => "setel sandi baru",
-"Default" => "Default"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
new file mode 100644
index 00000000000..b73009b405f
--- /dev/null
+++ b/settings/l10n/is.js
@@ -0,0 +1,62 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Villa við auðkenningu",
+    "Group already exists" : "Hópur er þegar til",
+    "Unable to add group" : "Ekki tókst að bæta við hóp",
+    "Email saved" : "Netfang vistað",
+    "Invalid email" : "Ógilt netfang",
+    "Unable to delete group" : "Ekki tókst að eyða hóp",
+    "Unable to delete user" : "Ekki tókst að eyða notenda",
+    "Language changed" : "Tungumáli breytt",
+    "Invalid request" : "Ógild fyrirspurn",
+    "Admins can't remove themself from the admin group" : "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
+    "Unable to add user to group %s" : "Ekki tókst að bæta notenda við hópinn %s",
+    "Unable to remove user from group %s" : "Ekki tókst að fjarlægja notanda úr hópnum %s",
+    "Email sent" : "Tölvupóstur sendur",
+    "Please wait...." : "Andartak....",
+    "Disable" : "Gera óvirkt",
+    "Enable" : "Virkja",
+    "Updating...." : "Uppfæri...",
+    "Updated" : "Uppfært",
+    "Delete" : "Eyða",
+    "Groups" : "Hópar",
+    "undo" : "afturkalla",
+    "never" : "aldrei",
+    "__language_name__" : "__nafn_tungumáls__",
+    "SSL root certificates" : "SSL rótar skilríki",
+    "Encryption" : "Dulkóðun",
+    "None" : "Ekkert",
+    "Security Warning" : "Öryggis aðvörun",
+    "Server address" : "Host nafn netþjóns",
+    "More" : "Meira",
+    "Less" : "Minna",
+    "Version" : "Útgáfa",
+    "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>." : "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "af",
+    "User Documentation" : "Notenda handbók",
+    "Administrator Documentation" : "Stjórnenda handbók",
+    "Online Documentation" : "Handbók á netinu",
+    "Forum" : "Vefspjall",
+    "Bugtracker" : "Villubókhald",
+    "Commercial Support" : "Borgaður stuðningur",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
+    "Password" : "Lykilorð",
+    "Your password was changed" : "Lykilorði þínu hefur verið breytt",
+    "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu",
+    "Current password" : "Núverandi lykilorð",
+    "New password" : "Nýtt lykilorð",
+    "Change password" : "Breyta lykilorði",
+    "Email" : "Netfang",
+    "Your email address" : "Netfangið þitt",
+    "Cancel" : "Hætta við",
+    "Language" : "Tungumál",
+    "Help translate" : "Hjálpa við þýðingu",
+    "Import Root Certificate" : "Flytja inn rótar skilríki",
+    "Create" : "Búa til",
+    "Unlimited" : "Ótakmarkað",
+    "Other" : "Annað",
+    "Username" : "Notendanafn",
+    "Default" : "Sjálfgefið"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
new file mode 100644
index 00000000000..5a70c190216
--- /dev/null
+++ b/settings/l10n/is.json
@@ -0,0 +1,60 @@
+{ "translations": {
+    "Authentication error" : "Villa við auðkenningu",
+    "Group already exists" : "Hópur er þegar til",
+    "Unable to add group" : "Ekki tókst að bæta við hóp",
+    "Email saved" : "Netfang vistað",
+    "Invalid email" : "Ógilt netfang",
+    "Unable to delete group" : "Ekki tókst að eyða hóp",
+    "Unable to delete user" : "Ekki tókst að eyða notenda",
+    "Language changed" : "Tungumáli breytt",
+    "Invalid request" : "Ógild fyrirspurn",
+    "Admins can't remove themself from the admin group" : "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
+    "Unable to add user to group %s" : "Ekki tókst að bæta notenda við hópinn %s",
+    "Unable to remove user from group %s" : "Ekki tókst að fjarlægja notanda úr hópnum %s",
+    "Email sent" : "Tölvupóstur sendur",
+    "Please wait...." : "Andartak....",
+    "Disable" : "Gera óvirkt",
+    "Enable" : "Virkja",
+    "Updating...." : "Uppfæri...",
+    "Updated" : "Uppfært",
+    "Delete" : "Eyða",
+    "Groups" : "Hópar",
+    "undo" : "afturkalla",
+    "never" : "aldrei",
+    "__language_name__" : "__nafn_tungumáls__",
+    "SSL root certificates" : "SSL rótar skilríki",
+    "Encryption" : "Dulkóðun",
+    "None" : "Ekkert",
+    "Security Warning" : "Öryggis aðvörun",
+    "Server address" : "Host nafn netþjóns",
+    "More" : "Meira",
+    "Less" : "Minna",
+    "Version" : "Útgáfa",
+    "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>." : "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "af",
+    "User Documentation" : "Notenda handbók",
+    "Administrator Documentation" : "Stjórnenda handbók",
+    "Online Documentation" : "Handbók á netinu",
+    "Forum" : "Vefspjall",
+    "Bugtracker" : "Villubókhald",
+    "Commercial Support" : "Borgaður stuðningur",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
+    "Password" : "Lykilorð",
+    "Your password was changed" : "Lykilorði þínu hefur verið breytt",
+    "Unable to change your password" : "Ekki tókst að breyta lykilorðinu þínu",
+    "Current password" : "Núverandi lykilorð",
+    "New password" : "Nýtt lykilorð",
+    "Change password" : "Breyta lykilorði",
+    "Email" : "Netfang",
+    "Your email address" : "Netfangið þitt",
+    "Cancel" : "Hætta við",
+    "Language" : "Tungumál",
+    "Help translate" : "Hjálpa við þýðingu",
+    "Import Root Certificate" : "Flytja inn rótar skilríki",
+    "Create" : "Búa til",
+    "Unlimited" : "Ótakmarkað",
+    "Other" : "Annað",
+    "Username" : "Notendanafn",
+    "Default" : "Sjálfgefið"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/is.php b/settings/l10n/is.php
deleted file mode 100644
index 45f15f8dab3..00000000000
--- a/settings/l10n/is.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Villa við auðkenningu",
-"Group already exists" => "Hópur er þegar til",
-"Unable to add group" => "Ekki tókst að bæta við hóp",
-"Email saved" => "Netfang vistað",
-"Invalid email" => "Ógilt netfang",
-"Unable to delete group" => "Ekki tókst að eyða hóp",
-"Unable to delete user" => "Ekki tókst að eyða notenda",
-"Language changed" => "Tungumáli breytt",
-"Invalid request" => "Ógild fyrirspurn",
-"Admins can't remove themself from the admin group" => "Stjórnendur geta ekki fjarlægt sjálfa sig úr stjórnendahóp",
-"Unable to add user to group %s" => "Ekki tókst að bæta notenda við hópinn %s",
-"Unable to remove user from group %s" => "Ekki tókst að fjarlægja notanda úr hópnum %s",
-"Email sent" => "Tölvupóstur sendur",
-"Please wait...." => "Andartak....",
-"Disable" => "Gera óvirkt",
-"Enable" => "Virkja",
-"Updating...." => "Uppfæri...",
-"Updated" => "Uppfært",
-"Delete" => "Eyða",
-"Groups" => "Hópar",
-"undo" => "afturkalla",
-"never" => "aldrei",
-"__language_name__" => "__nafn_tungumáls__",
-"SSL root certificates" => "SSL rótar skilríki",
-"Encryption" => "Dulkóðun",
-"None" => "Ekkert",
-"Security Warning" => "Öryggis aðvörun",
-"Server address" => "Host nafn netþjóns",
-"More" => "Meira",
-"Less" => "Minna",
-"Version" => "Útgáfa",
-"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>." => "Þróað af <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud samfélaginu</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">forrita kóðinn</a> er skráðu með <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "af",
-"User Documentation" => "Notenda handbók",
-"Administrator Documentation" => "Stjórnenda handbók",
-"Online Documentation" => "Handbók á netinu",
-"Forum" => "Vefspjall",
-"Bugtracker" => "Villubókhald",
-"Commercial Support" => "Borgaður stuðningur",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Þú hefur notað <strong>%s</strong> af tiltæku <strong>%s</strong>",
-"Password" => "Lykilorð",
-"Your password was changed" => "Lykilorði þínu hefur verið breytt",
-"Unable to change your password" => "Ekki tókst að breyta lykilorðinu þínu",
-"Current password" => "Núverandi lykilorð",
-"New password" => "Nýtt lykilorð",
-"Change password" => "Breyta lykilorði",
-"Email" => "Netfang",
-"Your email address" => "Netfangið þitt",
-"Cancel" => "Hætta við",
-"Language" => "Tungumál",
-"Help translate" => "Hjálpa við þýðingu",
-"Import Root Certificate" => "Flytja inn rótar skilríki",
-"Create" => "Búa til",
-"Unlimited" => "Ótakmarkað",
-"Other" => "Annað",
-"Username" => "Notendanafn",
-"Default" => "Sjálfgefið"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
new file mode 100644
index 00000000000..0e873936417
--- /dev/null
+++ b/settings/l10n/it.js
@@ -0,0 +1,238 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Abilitata",
+    "Not enabled" : "Non abilitata",
+    "Recommended" : "Consigliata",
+    "Authentication error" : "Errore di autenticazione",
+    "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
+    "Unable to change full name" : "Impossibile cambiare il nome completo",
+    "Group already exists" : "Il gruppo esiste già",
+    "Unable to add group" : "Impossibile aggiungere il gruppo",
+    "Files decrypted successfully" : "File decifrato correttamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Couldn't decrypt your files, check your password and try again" : "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
+    "Encryption keys deleted permanently" : "Chiavi di cifratura eliminate definitivamente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Couldn't remove app." : "Impossibile rimuovere l'applicazione.",
+    "Email saved" : "Email salvata",
+    "Invalid email" : "Email non valida",
+    "Unable to delete group" : "Impossibile eliminare il gruppo",
+    "Unable to delete user" : "Impossibile eliminare l'utente",
+    "Backups restored successfully" : "Copie di sicurezza ripristinate correttamente",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Language changed" : "Lingua modificata",
+    "Invalid request" : "Richiesta non valida",
+    "Admins can't remove themself from the admin group" : "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
+    "Unable to add user to group %s" : "Impossibile aggiungere l'utente al gruppo %s",
+    "Unable to remove user from group %s" : "Impossibile rimuovere l'utente dal gruppo %s",
+    "Couldn't update app." : "Impossibile aggiornate l'applicazione.",
+    "Wrong password" : "Password errata",
+    "No user supplied" : "Non è stato fornito alcun utente",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
+    "Wrong admin recovery password. Please check the password and try again." : "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
+    "Unable to change password" : "Impossibile cambiare la password",
+    "Saved" : "Salvato",
+    "test email settings" : "prova impostazioni email",
+    "If you received this email, the settings seem to be correct." : "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
+    "A problem occurred while sending the email. Please revise your settings." : "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.",
+    "Email sent" : "Email inviata",
+    "You need to set your user email before being able to send test emails." : "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
+    "Add trusted domain" : "Aggiungi dominio attendibile",
+    "Sending..." : "Invio in corso...",
+    "All" : "Tutti",
+    "Please wait...." : "Attendere...",
+    "Error while disabling app" : "Errore durante la disattivazione",
+    "Disable" : "Disabilita",
+    "Enable" : "Abilita",
+    "Error while enabling app" : "Errore durante l'attivazione",
+    "Updating...." : "Aggiornamento in corso...",
+    "Error while updating app" : "Errore durante l'aggiornamento",
+    "Updated" : "Aggiornato",
+    "Uninstalling ...." : "Disinstallazione...",
+    "Error while uninstalling app" : "Errore durante la disinstallazione dell'applicazione",
+    "Uninstall" : "Disinstalla",
+    "Select a profile picture" : "Seleziona un'immagine del profilo",
+    "Very weak password" : "Password molto debole",
+    "Weak password" : "Password debole",
+    "So-so password" : "Password così-così",
+    "Good password" : "Password buona",
+    "Strong password" : "Password forte",
+    "Valid until {date}" : "Valido fino al {date}",
+    "Delete" : "Elimina",
+    "Decrypting files... Please wait, this can take some time." : "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
+    "Delete encryption keys permanently." : "Elimina definitivamente le chiavi di cifratura.",
+    "Restore encryption keys." : "Ripristina le chiavi di cifratura.",
+    "Groups" : "Gruppi",
+    "Unable to delete {objName}" : "Impossibile eliminare {objName}",
+    "Error creating group" : "Errore durante la creazione del gruppo",
+    "A valid group name must be provided" : "Deve essere fornito un nome valido per il gruppo",
+    "deleted {groupName}" : "{groupName} eliminato",
+    "undo" : "annulla",
+    "never" : "mai",
+    "deleted {userName}" : "{userName} eliminato",
+    "add group" : "aggiungi gruppo",
+    "A valid username must be provided" : "Deve essere fornito un nome utente valido",
+    "Error creating user" : "Errore durante la creazione dell'utente",
+    "A valid password must be provided" : "Deve essere fornita una password valida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avviso: la cartella home dell'utente \"{user}\" esiste già",
+    "__language_name__" : "Italiano",
+    "Personal Info" : "Informazioni personali",
+    "SSL root certificates" : "Certificati SSL radice",
+    "Encryption" : "Cifratura",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
+    "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
+    "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi",
+    "Errors and fatal issues" : "Errori e problemi gravi",
+    "Fatal issues only" : "Solo problemi gravi",
+    "None" : "Nessuno",
+    "Login" : "Accesso",
+    "Plain" : "Semplice",
+    "NT LAN Manager" : "Gestore NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avviso di sicurezza",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sei connesso a %s tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere l'utilizzo del protocollo HTTPS al posto di HTTP.",
+    "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." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web.",
+    "Setup Warning" : "Avviso di configurazione",
+    "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.",
+    "Database Performance Info" : "Informazioni prestazioni del database",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulo 'fileinfo' mancante",
+    "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.",
+    "Your PHP version is outdated" : "La tua versione di PHP è obsoleta",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente.",
+    "PHP charset is not set to UTF-8" : "Il set di caratteri di PHP non è impostato a UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Il set di caratteri di PHP non è impostato a UTF-8. Ciò può essere causa di problemi con i caratteri non ASCII nei nomi dei file. Consigliamo vivamente di cambiare il valore di 'default_charset' nel file php.ini a 'UTF-8'.",
+    "Locale not working" : "Locale non funzionante",
+    "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 to install 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\nlocalizzazioni seguenti: %s.",
+    "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
+    "Connectivity checks" : "Controlli di connettività",
+    "No problems found" : "Nessun problema trovato",
+    "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
+    "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
+    "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
+    "Sharing" : "Condivisione",
+    "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",
+    "Enforce password protection" : "Imponi la protezione con password",
+    "Allow public uploads" : "Consenti caricamenti pubblici",
+    "Set default expiration date" : "Imposta data di scadenza predefinita",
+    "Expire after " : "Scadenza dopo",
+    "days" : "giorni",
+    "Enforce expiration date" : "Forza la data di scadenza",
+    "Allow resharing" : "Consenti la ri-condivisione",
+    "Restrict users to only share with users in their groups" : "Limita gli utenti a condividere solo con gli utenti nei loro gruppi",
+    "Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
+    "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.",
+    "Security" : "Protezione",
+    "Enforce HTTPS" : "Forza HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forza i client a connettersi a %s tramite una connessione cifrata.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
+    "Email Server" : "Server di posta",
+    "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
+    "Send mode" : "Modalità di invio",
+    "From address" : "Indirizzo mittente",
+    "mail" : "posta",
+    "Authentication method" : "Metodo di autenticazione",
+    "Authentication required" : "Autenticazione richiesta",
+    "Server address" : "Indirizzo del server",
+    "Port" : "Porta",
+    "Credentials" : "Credenziali",
+    "SMTP Username" : "Nome utente SMTP",
+    "SMTP Password" : "Password SMTP",
+    "Store credentials" : "Memorizza le credenziali",
+    "Test email settings" : "Prova impostazioni email",
+    "Send email" : "Invia email",
+    "Log" : "Log",
+    "Log level" : "Livello di log",
+    "More" : "Altro",
+    "Less" : "Meno",
+    "Version" : "Versione",
+    "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>." : "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Altre applicazioni",
+    "Add your app" : "Aggiungi la tua applicazione",
+    "by" : "di",
+    "licensed" : "sotto licenza",
+    "Documentation:" : "Documentazione:",
+    "User Documentation" : "Documentazione utente",
+    "Admin Documentation" : "Documentazione di amministrazione",
+    "Update to %s" : "Aggiornato a %s",
+    "Enable only for specific groups" : "Abilita solo per gruppi specifici",
+    "Uninstall App" : "Disinstalla applicazione",
+    "Administrator Documentation" : "Documentazione amministratore",
+    "Online Documentation" : "Documentazione in linea",
+    "Forum" : "Forum",
+    "Bugtracker" : "Sistema di tracciamento bug",
+    "Commercial Support" : "Supporto commerciale",
+    "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">diffondi il verbo</a>!",
+    "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
+    "Password" : "Password",
+    "Your password was changed" : "La tua password è cambiata",
+    "Unable to change your password" : "Modifica password non riuscita",
+    "Current password" : "Password attuale",
+    "New password" : "Nuova password",
+    "Change password" : "Modifica password",
+    "Full Name" : "Nome completo",
+    "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",
+    "Profile picture" : "Immagine del profilo",
+    "Upload new" : "Carica nuova",
+    "Select new from Files" : "Seleziona nuova da file",
+    "Remove image" : "Rimuovi immagine",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla.",
+    "Your avatar is provided by your original account." : "Il tuo avatar è ottenuto dal tuo account originale.",
+    "Cancel" : "Annulla",
+    "Choose as profile image" : "Scegli come immagine del profilo",
+    "Language" : "Lingua",
+    "Help translate" : "Migliora la traduzione",
+    "Common Name" : "Nome comune",
+    "Valid until" : "Valido fino al",
+    "Issued By" : "Emesso da",
+    "Valid until %s" : "Valido fino al %s",
+    "Import Root Certificate" : "Importa certificato radice",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
+    "Log-in password" : "Password di accesso",
+    "Decrypt all Files" : "Decifra tutti i file",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
+    "Restore Encryption Keys" : "Ripristina chiavi di cifratura",
+    "Delete Encryption Keys" : "Elimina chiavi di cifratura",
+    "Show storage location" : "Mostra posizione di archiviazione",
+    "Show last log in" : "Mostra ultimo accesso",
+    "Login Name" : "Nome utente",
+    "Create" : "Crea",
+    "Admin Recovery Password" : "Password di ripristino amministrativa",
+    "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
+    "Search Users and Groups" : "Cerca utenti e gruppi",
+    "Add Group" : "Aggiungi gruppo",
+    "Group" : "Gruppo",
+    "Everyone" : "Chiunque",
+    "Admins" : "Amministratori",
+    "Default Quota" : "Quota predefinita",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "Illimitata",
+    "Other" : "Altro",
+    "Username" : "Nome utente",
+    "Quota" : "Quote",
+    "Storage Location" : "Posizione di archiviazione",
+    "Last Login" : "Ultimo accesso",
+    "change full name" : "modica nome completo",
+    "set new password" : "imposta una nuova password",
+    "Default" : "Predefinito"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
new file mode 100644
index 00000000000..f8766d05fff
--- /dev/null
+++ b/settings/l10n/it.json
@@ -0,0 +1,236 @@
+{ "translations": {
+    "Enabled" : "Abilitata",
+    "Not enabled" : "Non abilitata",
+    "Recommended" : "Consigliata",
+    "Authentication error" : "Errore di autenticazione",
+    "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
+    "Unable to change full name" : "Impossibile cambiare il nome completo",
+    "Group already exists" : "Il gruppo esiste già",
+    "Unable to add group" : "Impossibile aggiungere il gruppo",
+    "Files decrypted successfully" : "File decifrato correttamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Couldn't decrypt your files, check your password and try again" : "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
+    "Encryption keys deleted permanently" : "Chiavi di cifratura eliminate definitivamente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Couldn't remove app." : "Impossibile rimuovere l'applicazione.",
+    "Email saved" : "Email salvata",
+    "Invalid email" : "Email non valida",
+    "Unable to delete group" : "Impossibile eliminare il gruppo",
+    "Unable to delete user" : "Impossibile eliminare l'utente",
+    "Backups restored successfully" : "Copie di sicurezza ripristinate correttamente",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
+    "Language changed" : "Lingua modificata",
+    "Invalid request" : "Richiesta non valida",
+    "Admins can't remove themself from the admin group" : "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
+    "Unable to add user to group %s" : "Impossibile aggiungere l'utente al gruppo %s",
+    "Unable to remove user from group %s" : "Impossibile rimuovere l'utente dal gruppo %s",
+    "Couldn't update app." : "Impossibile aggiornate l'applicazione.",
+    "Wrong password" : "Password errata",
+    "No user supplied" : "Non è stato fornito alcun utente",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
+    "Wrong admin recovery password. Please check the password and try again." : "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
+    "Unable to change password" : "Impossibile cambiare la password",
+    "Saved" : "Salvato",
+    "test email settings" : "prova impostazioni email",
+    "If you received this email, the settings seem to be correct." : "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
+    "A problem occurred while sending the email. Please revise your settings." : "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.",
+    "Email sent" : "Email inviata",
+    "You need to set your user email before being able to send test emails." : "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
+    "Add trusted domain" : "Aggiungi dominio attendibile",
+    "Sending..." : "Invio in corso...",
+    "All" : "Tutti",
+    "Please wait...." : "Attendere...",
+    "Error while disabling app" : "Errore durante la disattivazione",
+    "Disable" : "Disabilita",
+    "Enable" : "Abilita",
+    "Error while enabling app" : "Errore durante l'attivazione",
+    "Updating...." : "Aggiornamento in corso...",
+    "Error while updating app" : "Errore durante l'aggiornamento",
+    "Updated" : "Aggiornato",
+    "Uninstalling ...." : "Disinstallazione...",
+    "Error while uninstalling app" : "Errore durante la disinstallazione dell'applicazione",
+    "Uninstall" : "Disinstalla",
+    "Select a profile picture" : "Seleziona un'immagine del profilo",
+    "Very weak password" : "Password molto debole",
+    "Weak password" : "Password debole",
+    "So-so password" : "Password così-così",
+    "Good password" : "Password buona",
+    "Strong password" : "Password forte",
+    "Valid until {date}" : "Valido fino al {date}",
+    "Delete" : "Elimina",
+    "Decrypting files... Please wait, this can take some time." : "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
+    "Delete encryption keys permanently." : "Elimina definitivamente le chiavi di cifratura.",
+    "Restore encryption keys." : "Ripristina le chiavi di cifratura.",
+    "Groups" : "Gruppi",
+    "Unable to delete {objName}" : "Impossibile eliminare {objName}",
+    "Error creating group" : "Errore durante la creazione del gruppo",
+    "A valid group name must be provided" : "Deve essere fornito un nome valido per il gruppo",
+    "deleted {groupName}" : "{groupName} eliminato",
+    "undo" : "annulla",
+    "never" : "mai",
+    "deleted {userName}" : "{userName} eliminato",
+    "add group" : "aggiungi gruppo",
+    "A valid username must be provided" : "Deve essere fornito un nome utente valido",
+    "Error creating user" : "Errore durante la creazione dell'utente",
+    "A valid password must be provided" : "Deve essere fornita una password valida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avviso: la cartella home dell'utente \"{user}\" esiste già",
+    "__language_name__" : "Italiano",
+    "Personal Info" : "Informazioni personali",
+    "SSL root certificates" : "Certificati SSL radice",
+    "Encryption" : "Cifratura",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
+    "Info, warnings, errors and fatal issues" : "Informazioni, avvisi, errori e problemi gravi",
+    "Warnings, errors and fatal issues" : "Avvisi, errori e problemi gravi",
+    "Errors and fatal issues" : "Errori e problemi gravi",
+    "Fatal issues only" : "Solo problemi gravi",
+    "None" : "Nessuno",
+    "Login" : "Accesso",
+    "Plain" : "Semplice",
+    "NT LAN Manager" : "Gestore NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avviso di sicurezza",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sei connesso a %s tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere l'utilizzo del protocollo HTTPS al posto di HTTP.",
+    "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." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web.",
+    "Setup Warning" : "Avviso di configurazione",
+    "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.",
+    "Database Performance Info" : "Informazioni prestazioni del database",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulo 'fileinfo' mancante",
+    "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.",
+    "Your PHP version is outdated" : "La tua versione di PHP è obsoleta",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente.",
+    "PHP charset is not set to UTF-8" : "Il set di caratteri di PHP non è impostato a UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Il set di caratteri di PHP non è impostato a UTF-8. Ciò può essere causa di problemi con i caratteri non ASCII nei nomi dei file. Consigliamo vivamente di cambiare il valore di 'default_charset' nel file php.ini a 'UTF-8'.",
+    "Locale not working" : "Locale non funzionante",
+    "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 to install 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\nlocalizzazioni seguenti: %s.",
+    "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
+    "Connectivity checks" : "Controlli di connettività",
+    "No problems found" : "Nessun problema trovato",
+    "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
+    "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
+    "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
+    "Sharing" : "Condivisione",
+    "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",
+    "Enforce password protection" : "Imponi la protezione con password",
+    "Allow public uploads" : "Consenti caricamenti pubblici",
+    "Set default expiration date" : "Imposta data di scadenza predefinita",
+    "Expire after " : "Scadenza dopo",
+    "days" : "giorni",
+    "Enforce expiration date" : "Forza la data di scadenza",
+    "Allow resharing" : "Consenti la ri-condivisione",
+    "Restrict users to only share with users in their groups" : "Limita gli utenti a condividere solo con gli utenti nei loro gruppi",
+    "Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
+    "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.",
+    "Security" : "Protezione",
+    "Enforce HTTPS" : "Forza HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forza i client a connettersi a %s tramite una connessione cifrata.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
+    "Email Server" : "Server di posta",
+    "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
+    "Send mode" : "Modalità di invio",
+    "From address" : "Indirizzo mittente",
+    "mail" : "posta",
+    "Authentication method" : "Metodo di autenticazione",
+    "Authentication required" : "Autenticazione richiesta",
+    "Server address" : "Indirizzo del server",
+    "Port" : "Porta",
+    "Credentials" : "Credenziali",
+    "SMTP Username" : "Nome utente SMTP",
+    "SMTP Password" : "Password SMTP",
+    "Store credentials" : "Memorizza le credenziali",
+    "Test email settings" : "Prova impostazioni email",
+    "Send email" : "Invia email",
+    "Log" : "Log",
+    "Log level" : "Livello di log",
+    "More" : "Altro",
+    "Less" : "Meno",
+    "Version" : "Versione",
+    "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>." : "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Altre applicazioni",
+    "Add your app" : "Aggiungi la tua applicazione",
+    "by" : "di",
+    "licensed" : "sotto licenza",
+    "Documentation:" : "Documentazione:",
+    "User Documentation" : "Documentazione utente",
+    "Admin Documentation" : "Documentazione di amministrazione",
+    "Update to %s" : "Aggiornato a %s",
+    "Enable only for specific groups" : "Abilita solo per gruppi specifici",
+    "Uninstall App" : "Disinstalla applicazione",
+    "Administrator Documentation" : "Documentazione amministratore",
+    "Online Documentation" : "Documentazione in linea",
+    "Forum" : "Forum",
+    "Bugtracker" : "Sistema di tracciamento bug",
+    "Commercial Support" : "Supporto commerciale",
+    "Get the apps to sync your files" : "Scarica le applicazioni per sincronizzare i tuoi file",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">diffondi il verbo</a>!",
+    "Show First Run Wizard again" : "Mostra nuovamente la procedura di primo avvio",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
+    "Password" : "Password",
+    "Your password was changed" : "La tua password è cambiata",
+    "Unable to change your password" : "Modifica password non riuscita",
+    "Current password" : "Password attuale",
+    "New password" : "Nuova password",
+    "Change password" : "Modifica password",
+    "Full Name" : "Nome completo",
+    "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",
+    "Profile picture" : "Immagine del profilo",
+    "Upload new" : "Carica nuova",
+    "Select new from Files" : "Seleziona nuova da file",
+    "Remove image" : "Rimuovi immagine",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla.",
+    "Your avatar is provided by your original account." : "Il tuo avatar è ottenuto dal tuo account originale.",
+    "Cancel" : "Annulla",
+    "Choose as profile image" : "Scegli come immagine del profilo",
+    "Language" : "Lingua",
+    "Help translate" : "Migliora la traduzione",
+    "Common Name" : "Nome comune",
+    "Valid until" : "Valido fino al",
+    "Issued By" : "Emesso da",
+    "Valid until %s" : "Valido fino al %s",
+    "Import Root Certificate" : "Importa certificato radice",
+    "The encryption app is no longer enabled, please decrypt all your files" : "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
+    "Log-in password" : "Password di accesso",
+    "Decrypt all Files" : "Decifra tutti i file",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
+    "Restore Encryption Keys" : "Ripristina chiavi di cifratura",
+    "Delete Encryption Keys" : "Elimina chiavi di cifratura",
+    "Show storage location" : "Mostra posizione di archiviazione",
+    "Show last log in" : "Mostra ultimo accesso",
+    "Login Name" : "Nome utente",
+    "Create" : "Crea",
+    "Admin Recovery Password" : "Password di ripristino amministrativa",
+    "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
+    "Search Users and Groups" : "Cerca utenti e gruppi",
+    "Add Group" : "Aggiungi gruppo",
+    "Group" : "Gruppo",
+    "Everyone" : "Chiunque",
+    "Admins" : "Amministratori",
+    "Default Quota" : "Quota predefinita",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "Illimitata",
+    "Other" : "Altro",
+    "Username" : "Nome utente",
+    "Quota" : "Quote",
+    "Storage Location" : "Posizione di archiviazione",
+    "Last Login" : "Ultimo accesso",
+    "change full name" : "modica nome completo",
+    "set new password" : "imposta una nuova password",
+    "Default" : "Predefinito"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
deleted file mode 100644
index 727017740ae..00000000000
--- a/settings/l10n/it.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Abilitata",
-"Not enabled" => "Non abilitata",
-"Recommended" => "Consigliata",
-"Authentication error" => "Errore di autenticazione",
-"Your full name has been changed." => "Il tuo nome completo è stato cambiato.",
-"Unable to change full name" => "Impossibile cambiare il nome completo",
-"Group already exists" => "Il gruppo esiste già",
-"Unable to add group" => "Impossibile aggiungere il gruppo",
-"Files decrypted successfully" => "File decifrato correttamente",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Impossibile decifrare i tuoi file, controlla il file owncloud.log o chiedi al tuo amministratore",
-"Couldn't decrypt your files, check your password and try again" => "Impossibile decifrare i tuoi file, controlla la password e prova ancora",
-"Encryption keys deleted permanently" => "Chiavi di cifratura eliminate definitivamente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile eliminare definitivamente le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
-"Couldn't remove app." => "Impossibile rimuovere l'applicazione.",
-"Email saved" => "Email salvata",
-"Invalid email" => "Email non valida",
-"Unable to delete group" => "Impossibile eliminare il gruppo",
-"Unable to delete user" => "Impossibile eliminare l'utente",
-"Backups restored successfully" => "Copie di sicurezza ripristinate correttamente",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Impossibile ripristinare le chiavi di cifratura, controlla il file owncloud.log o chiedi al tuo amministratore",
-"Language changed" => "Lingua modificata",
-"Invalid request" => "Richiesta non valida",
-"Admins can't remove themself from the admin group" => "Gli amministratori non possono rimuovere se stessi dal gruppo di amministrazione",
-"Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s",
-"Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s",
-"Couldn't update app." => "Impossibile aggiornate l'applicazione.",
-"Wrong password" => "Password errata",
-"No user supplied" => "Non è stato fornito alcun utente",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Fornisci una password amministrativa di ripristino altrimenti tutti i dati degli utenti saranno persi.",
-"Wrong admin recovery password. Please check the password and try again." => "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
-"Unable to change password" => "Impossibile cambiare la password",
-"Saved" => "Salvato",
-"test email settings" => "prova impostazioni email",
-"If you received this email, the settings seem to be correct." => "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
-"A problem occurred while sending the email. Please revise your settings." => "Si è verificato un problema durante l'invio dell'email. Controlla le tue impostazioni.",
-"Email sent" => "Email inviata",
-"You need to set your user email before being able to send test emails." => "Devi impostare l'indirizzo del tuo utente prima di poter provare l'invio delle email.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Sei sicuro di voler aggiungere \"{domain}\"  come dominio attendibile?",
-"Add trusted domain" => "Aggiungi dominio attendibile",
-"Sending..." => "Invio in corso...",
-"All" => "Tutti",
-"Please wait...." => "Attendere...",
-"Error while disabling app" => "Errore durante la disattivazione",
-"Disable" => "Disabilita",
-"Enable" => "Abilita",
-"Error while enabling app" => "Errore durante l'attivazione",
-"Updating...." => "Aggiornamento in corso...",
-"Error while updating app" => "Errore durante l'aggiornamento",
-"Updated" => "Aggiornato",
-"Uninstalling ...." => "Disinstallazione...",
-"Error while uninstalling app" => "Errore durante la disinstallazione dell'applicazione",
-"Uninstall" => "Disinstalla",
-"Select a profile picture" => "Seleziona un'immagine del profilo",
-"Very weak password" => "Password molto debole",
-"Weak password" => "Password debole",
-"So-so password" => "Password così-così",
-"Good password" => "Password buona",
-"Strong password" => "Password forte",
-"Valid until {date}" => "Valido fino al {date}",
-"Delete" => "Elimina",
-"Decrypting files... Please wait, this can take some time." => "Decifratura dei file in corso... Attendi, potrebbe richiedere del tempo.",
-"Delete encryption keys permanently." => "Elimina definitivamente le chiavi di cifratura.",
-"Restore encryption keys." => "Ripristina le chiavi di cifratura.",
-"Groups" => "Gruppi",
-"Unable to delete {objName}" => "Impossibile eliminare {objName}",
-"Error creating group" => "Errore durante la creazione del gruppo",
-"A valid group name must be provided" => "Deve essere fornito un nome valido per il gruppo",
-"deleted {groupName}" => "{groupName} eliminato",
-"undo" => "annulla",
-"no group" => "nessun gruppo",
-"never" => "mai",
-"deleted {userName}" => "{userName} eliminato",
-"add group" => "aggiungi gruppo",
-"A valid username must be provided" => "Deve essere fornito un nome utente valido",
-"Error creating user" => "Errore durante la creazione dell'utente",
-"A valid password must be provided" => "Deve essere fornita una password valida",
-"Warning: Home directory for user \"{user}\" already exists" => "Avviso: la cartella home dell'utente \"{user}\" esiste già",
-"__language_name__" => "Italiano",
-"Personal Info" => "Informazioni personali",
-"SSL root certificates" => "Certificati SSL radice",
-"Encryption" => "Cifratura",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tutto (problemi gravi, errori, avvisi, informazioni, debug)",
-"Info, warnings, errors and fatal issues" => "Informazioni, avvisi, errori e problemi gravi",
-"Warnings, errors and fatal issues" => "Avvisi, errori e problemi gravi",
-"Errors and fatal issues" => "Errori e problemi gravi",
-"Fatal issues only" => "Solo problemi gravi",
-"None" => "Nessuno",
-"Login" => "Accesso",
-"Plain" => "Semplice",
-"NT LAN Manager" => "Gestore NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Avviso di sicurezza",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sei connesso a %s tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere l'utilizzo del protocollo HTTPS al posto di HTTP.",
-"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." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web.",
-"Setup Warning" => "Avviso di configurazione",
-"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.",
-"Database Performance Info" => "Informazioni prestazioni del database",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite è utilizzato come database. Per installazioni grandi, consigliamo di cambiarlo. Per migrare a un altro database, utilizzare lo strumento da riga di comando: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modulo 'fileinfo' mancante",
-"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.",
-"Your PHP version is outdated" => "La tua versione di PHP è obsoleta",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "La tua versione di PHP è obsoleta. Ti consigliamo vivamente di aggiornare alla versione 5.3.8 o successiva poiché sono noti problemi con le vecchie versioni. L'installazione attuale potrebbe non funzionare correttamente.",
-"PHP charset is not set to UTF-8" => "Il set di caratteri di PHP non è impostato a UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Il set di caratteri di PHP non è impostato a UTF-8. Ciò può essere causa di problemi con i caratteri non ASCII nei nomi dei file. Consigliamo vivamente di cambiare il valore di 'default_charset' nel file php.ini a 'UTF-8'.",
-"Locale not working" => "Locale non funzionante",
-"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 to install 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\nlocalizzazioni seguenti: %s.",
-"URL generation in notification emails" => "Generazione di URL nelle email di notifica",
-"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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
-"Connectivity checks" => "Controlli di connettività",
-"No problems found" => "Nessun problema trovato",
-"Please double check the <a href='%s'>installation guides</a>." => "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "L'ultimo cron è stato eseguito alle %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
-"Cron was not executed yet!" => "Cron non è stato ancora eseguito!",
-"Execute one task with each page loaded" => "Esegui un'operazione con ogni pagina caricata",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-"Sharing" => "Condivisione",
-"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",
-"Enforce password protection" => "Imponi la protezione con password",
-"Allow public uploads" => "Consenti caricamenti pubblici",
-"Set default expiration date" => "Imposta data di scadenza predefinita",
-"Expire after " => "Scadenza dopo",
-"days" => "giorni",
-"Enforce expiration date" => "Forza la data di scadenza",
-"Allow resharing" => "Consenti la ri-condivisione",
-"Restrict users to only share with users in their groups" => "Limita gli utenti a condividere solo con gli utenti nei loro gruppi",
-"Allow users to send mail notification for shared files" => "Consenti agli utenti di inviare email di notifica per i file condivisi",
-"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.",
-"Security" => "Protezione",
-"Enforce HTTPS" => "Forza HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forza i client a connettersi a %s tramite una connessione cifrata.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
-"Email Server" => "Server di posta",
-"This is used for sending out notifications." => "Viene utilizzato per inviare le notifiche.",
-"Send mode" => "Modalità di invio",
-"From address" => "Indirizzo mittente",
-"mail" => "posta",
-"Authentication method" => "Metodo di autenticazione",
-"Authentication required" => "Autenticazione richiesta",
-"Server address" => "Indirizzo del server",
-"Port" => "Porta",
-"Credentials" => "Credenziali",
-"SMTP Username" => "Nome utente SMTP",
-"SMTP Password" => "Password SMTP",
-"Store credentials" => "Memorizza le credenziali",
-"Test email settings" => "Prova impostazioni email",
-"Send email" => "Invia email",
-"Log" => "Log",
-"Log level" => "Livello di log",
-"More" => "Altro",
-"Less" => "Meno",
-"Version" => "Versione",
-"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>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è rilasciato nei termini della licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Altre applicazioni",
-"Add your app" => "Aggiungi la tua applicazione",
-"by" => "di",
-"licensed" => "sotto licenza",
-"Documentation:" => "Documentazione:",
-"User Documentation" => "Documentazione utente",
-"Admin Documentation" => "Documentazione di amministrazione",
-"Update to %s" => "Aggiornato a %s",
-"Enable only for specific groups" => "Abilita solo per gruppi specifici",
-"Uninstall App" => "Disinstalla applicazione",
-"Administrator Documentation" => "Documentazione amministratore",
-"Online Documentation" => "Documentazione in linea",
-"Forum" => "Forum",
-"Bugtracker" => "Sistema di tracciamento bug",
-"Commercial Support" => "Supporto commerciale",
-"Get the apps to sync your files" => "Scarica le applicazioni per sincronizzare i tuoi file",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se vuoi supportare il progetto\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">diventa uno sviluppatore</a>\n\t\to\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">diffondi il verbo</a>!",
-"Show First Run Wizard again" => "Mostra nuovamente la procedura di primo avvio",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Hai utilizzato <strong>%s</strong> dei <strong>%s</strong> disponibili",
-"Password" => "Password",
-"Your password was changed" => "La tua password è cambiata",
-"Unable to change your password" => "Modifica password non riuscita",
-"Current password" => "Password attuale",
-"New password" => "Nuova password",
-"Change password" => "Modifica password",
-"Full Name" => "Nome completo",
-"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",
-"Profile picture" => "Immagine del profilo",
-"Upload new" => "Carica nuova",
-"Select new from Files" => "Seleziona nuova da file",
-"Remove image" => "Rimuovi immagine",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Sia png che jpg. Preferibilmente quadrata, ma potrai ritagliarla.",
-"Your avatar is provided by your original account." => "Il tuo avatar è ottenuto dal tuo account originale.",
-"Cancel" => "Annulla",
-"Choose as profile image" => "Scegli come immagine del profilo",
-"Language" => "Lingua",
-"Help translate" => "Migliora la traduzione",
-"Common Name" => "Nome comune",
-"Valid until" => "Valido fino al",
-"Issued By" => "Emesso da",
-"Valid until %s" => "Valido fino al %s",
-"Import Root Certificate" => "Importa certificato radice",
-"The encryption app is no longer enabled, please decrypt all your files" => "L'applicazione di cifratura non è più abilitata, decifra tutti i tuoi file",
-"Log-in password" => "Password di accesso",
-"Decrypt all Files" => "Decifra tutti i file",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Le tue chiavi di cifratura sono state spostate in una posizione sicura. Se qualcosa non dovesse funzionare, potrai ripristinare le chiavi. Eliminale definitivamente solo se sei sicuro che tutti i file siano stati decifrati.",
-"Restore Encryption Keys" => "Ripristina chiavi di cifratura",
-"Delete Encryption Keys" => "Elimina chiavi di cifratura",
-"Show storage location" => "Mostra posizione di archiviazione",
-"Show last log in" => "Mostra ultimo accesso",
-"Login Name" => "Nome utente",
-"Create" => "Crea",
-"Admin Recovery Password" => "Password di ripristino amministrativa",
-"Enter the recovery password in order to recover the users files during password change" => "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
-"Search Users and Groups" => "Cerca utenti e gruppi",
-"Add Group" => "Aggiungi gruppo",
-"Group" => "Gruppo",
-"Everyone" => "Chiunque",
-"Admins" => "Amministratori",
-"Default Quota" => "Quota predefinita",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
-"Unlimited" => "Illimitata",
-"Other" => "Altro",
-"Username" => "Nome utente",
-"Group Admin for" => "Gruppo di amministrazione per",
-"Quota" => "Quote",
-"Storage Location" => "Posizione di archiviazione",
-"Last Login" => "Ultimo accesso",
-"change full name" => "modica nome completo",
-"set new password" => "imposta una nuova password",
-"Default" => "Predefinito"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
new file mode 100644
index 00000000000..169f0521444
--- /dev/null
+++ b/settings/l10n/ja.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "有効",
+    "Authentication error" : "認証エラー",
+    "Your full name has been changed." : "名前を変更しました。",
+    "Unable to change full name" : "名前を変更できません",
+    "Group already exists" : "グループはすでに存在します",
+    "Unable to add group" : "グループを追加できません",
+    "Files decrypted successfully" : "ファイルの復号化に成功しました",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
+    "Couldn't decrypt your files, check your password and try again" : "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
+    "Encryption keys deleted permanently" : "暗号化キーは完全に削除されます",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+    "Couldn't remove app." : "アプリが削除できませんでした。",
+    "Email saved" : "メールアドレスを保存しました",
+    "Invalid email" : "無効なメールアドレス",
+    "Unable to delete group" : "グループを削除できません",
+    "Unable to delete user" : "ユーザーを削除できません",
+    "Backups restored successfully" : "バックアップの復元に成功しました",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+    "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." : "アプリをアップデートできませんでした。",
+    "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." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
+    "Unable to change password" : "パスワードを変更できません",
+    "Saved" : "保存されました",
+    "test email settings" : "メール設定をテスト",
+    "If you received this email, the settings seem to be correct." : "このメールを受け取ったら、設定は正しいはずです。",
+    "Email sent" : "メールを送信しました",
+    "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
+    "Add trusted domain" : "信頼するドメイン名に追加",
+    "Sending..." : "送信中…",
+    "All" : "すべて",
+    "Please wait...." : "しばらくお待ちください。",
+    "Error while disabling app" : "アプリ無効化中にエラーが発生",
+    "Disable" : "無効",
+    "Enable" : "有効にする",
+    "Error while enabling app" : "アプリを有効にする際にエラーが発生",
+    "Updating...." : "更新中....",
+    "Error while updating app" : "アプリの更新中にエラーが発生",
+    "Updated" : "アップデート済み",
+    "Uninstalling ...." : "アンインストール中 ....",
+    "Error while uninstalling app" : "アプリをアンインストール中にエラーが発生",
+    "Uninstall" : "アンインストール",
+    "Select a profile picture" : "プロファイル画像を選択",
+    "Very weak password" : "非常に弱いパスワード",
+    "Weak password" : "弱いパスワード",
+    "So-so password" : "まずまずのパスワード",
+    "Good password" : "良好なパスワード",
+    "Strong password" : "強いパスワード",
+    "Valid until {date}" : "{date} まで有効",
+    "Delete" : "削除",
+    "Decrypting files... Please wait, this can take some time." : "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
+    "Delete encryption keys permanently." : "暗号化キーを永久に削除する。",
+    "Restore encryption keys." : "暗号化キーを復元する。",
+    "Groups" : "グループ",
+    "Unable to delete {objName}" : "{objName} を削除できません",
+    "Error creating group" : "グループの作成エラー",
+    "A valid group name must be provided" : "有効なグループ名を指定する必要があります",
+    "deleted {groupName}" : "{groupName} を削除しました",
+    "undo" : "元に戻す",
+    "never" : "なし",
+    "deleted {userName}" : "{userName} を削除しました",
+    "add group" : "グループを追加",
+    "A valid username must be provided" : "有効なユーザー名を指定する必要があります",
+    "Error creating user" : "ユーザー作成エラー",
+    "A valid password must be provided" : "有効なパスワードを指定する必要があります",
+    "Warning: Home directory for user \"{user}\" already exists" : "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
+    "__language_name__" : "Japanese (日本語)",
+    "SSL root certificates" : "SSLルート証明書",
+    "Encryption" : "暗号化",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
+    "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
+    "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題",
+    "Errors and fatal issues" : "エラー、致命的な問題",
+    "Fatal issues only" : "致命的な問題のみ",
+    "None" : "なし",
+    "Login" : "ログイン",
+    "Plain" : "平文",
+    "NT LAN Manager" : "NT LAN マネージャー",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "セキュリティ警告",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "HTTP経由で %s にアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
+    "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." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリにアクセスできないようWebサーバーを設定するか、データディレクトリをWebサーバーのドキュメントルートから移動するよう強く提案します。",
+    "Setup Warning" : "セットアップ警告",
+    "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 等のキャッシュ/アクセラレータが原因かもしれません。",
+    "Database Performance Info" : "データベースパフォーマンス情報",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
+    "Module 'fileinfo' missing" : "モジュール 'fileinfo' が見つかりません",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
+    "Your PHP version is outdated" : "PHPバーションが古くなっています。",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
+    "PHP charset is not set to UTF-8" : "PHP の文字コードは UTF-8 に設定されていません",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP の文字コードは UTF-8 に設定されていません。ファイル名に非アスキー文字が含まれる場合は、大きな問題となる可能性があります。php.ini の 'default_charset' の値を 'UTF-8' に変更することを強くお勧めします。",
+    "Locale not working" : "ロケールが動作していません",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
+    "URL generation in notification emails" : "通知メールにURLを生成",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
+    "Connectivity checks" : "接続を確認",
+    "No problems found" : "問題は見つかりませんでした",
+    "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
+    "Cron was not executed yet!" : "cron は未だ実行されていません！",
+    "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行する",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "システムの cron サービスを利用して、15分間隔で cron.php ファイルを実行する。",
+    "Sharing" : "共有",
+    "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
+    "Allow users to share via link" : "URLリンクで共有を許可する",
+    "Enforce password protection" : "常にパスワード保護を有効にする",
+    "Allow public uploads" : "パブリックなアップロードを許可する",
+    "Set default expiration date" : "有効期限のデフォルト値を設定",
+    "Expire after " : "無効になるまで",
+    "days" : "日",
+    "Enforce expiration date" : "有効期限を反映させる",
+    "Allow resharing" : "再共有を許可する",
+    "Restrict users to only share with users in their groups" : "グループ内のユーザーでのみ共有するように制限する",
+    "Allow users to send mail notification for shared files" : "共有ファイルに関するメール通知の送信をユーザーに許可する",
+    "Exclude groups from sharing" : "共有可能なグループから除外",
+    "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
+    "Security" : "セキュリティ",
+    "Enforce HTTPS" : "常にHTTPSを使用する",
+    "Forces the clients to connect to %s via an encrypted connection." : "クライアントから %sへの接続を常に暗号化します。",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
+    "Email Server" : "メールサーバー",
+    "This is used for sending out notifications." : "これは通知の送信に使われます。",
+    "Send mode" : "送信モード",
+    "From address" : "送信元アドレス",
+    "mail" : "メール",
+    "Authentication method" : "認証方法",
+    "Authentication required" : "認証を必要とする",
+    "Server address" : "サーバーアドレス",
+    "Port" : "ポート",
+    "Credentials" : "資格情報",
+    "SMTP Username" : "SMTP ユーザー名",
+    "SMTP Password" : "SMTP パスワード",
+    "Test email settings" : "メール設定をテスト",
+    "Send email" : "メールを送信",
+    "Log" : "ログ",
+    "Log level" : "ログレベル",
+    "More" : "もっと見る",
+    "Less" : "閉じる",
+    "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
+    "More apps" : "他のアプリ",
+    "by" : "により",
+    "Documentation:" : "ドキュメント:",
+    "User Documentation" : "ユーザードキュメント",
+    "Admin Documentation" : "管理者ドキュメント",
+    "Enable only for specific groups" : "特定のグループのみ有効に",
+    "Uninstall App" : "アプリをアンインストール",
+    "Administrator Documentation" : "管理者ドキュメント",
+    "Online Documentation" : "オンラインドキュメント",
+    "Forum" : "フォーラム",
+    "Bugtracker" : "バグトラッカー",
+    "Commercial Support" : "商用サポート",
+    "Get the apps to sync your files" : "ファイルを同期するためのアプリを取得",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
+    "Show First Run Wizard again" : "初回ウィザードを再表示する",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を利用しています",
+    "Password" : "パスワード",
+    "Your password was changed" : "パスワードを変更しました",
+    "Unable to change your password" : "パスワードを変更することができません",
+    "Current password" : "現在のパスワード",
+    "New password" : "新しいパスワード",
+    "Change password" : "パスワードを変更",
+    "Full Name" : "名前",
+    "Email" : "メール",
+    "Your email address" : "あなたのメールアドレス",
+    "Fill in an email address to enable password recovery and receive notifications" : "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
+    "Profile picture" : "プロフィール写真",
+    "Upload new" : "新たにアップロード",
+    "Select new from Files" : "新しいファイルを選択",
+    "Remove image" : "画像を削除",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "pngまたはjpg形式。正方形が理想ですが、切り取って加工することもできます。",
+    "Your avatar is provided by your original account." : "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
+    "Cancel" : "キャンセル",
+    "Choose as profile image" : "プロファイル画像として選択",
+    "Language" : "言語",
+    "Help translate" : "翻訳に協力する",
+    "Common Name" : "コモンネーム",
+    "Valid until" : "有効期限",
+    "Issued By" : "発行元",
+    "Valid until %s" : "%s まで有効",
+    "Import Root Certificate" : "ルート証明書をインポート",
+    "The encryption app is no longer enabled, please decrypt all your files" : "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
+    "Log-in password" : "ログインパスワード",
+    "Decrypt all Files" : "すべてのファイルを複合する",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
+    "Restore Encryption Keys" : "暗号化キーを復元する",
+    "Delete Encryption Keys" : "暗号化キーを削除する",
+    "Show storage location" : "データの保存場所を表示",
+    "Show last log in" : "最終ログインを表示",
+    "Login Name" : "ログイン名",
+    "Create" : "作成",
+    "Admin Recovery Password" : "管理者リカバリパスワード",
+    "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
+    "Search Users and Groups" : "ユーザーとグループを検索",
+    "Add Group" : "グループを追加",
+    "Group" : "グループ",
+    "Everyone" : "すべてのユーザー",
+    "Admins" : "管理者",
+    "Default Quota" : "デフォルトのクォータサイズ",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
+    "Unlimited" : "無制限",
+    "Other" : "その他",
+    "Username" : "ユーザーID",
+    "Quota" : "クオータ",
+    "Storage Location" : "データの保存場所",
+    "Last Login" : "最終ログイン",
+    "change full name" : "名前を変更",
+    "set new password" : "新しいパスワードを設定",
+    "Default" : "デフォルト"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
new file mode 100644
index 00000000000..67f62aa68a9
--- /dev/null
+++ b/settings/l10n/ja.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "有効",
+    "Authentication error" : "認証エラー",
+    "Your full name has been changed." : "名前を変更しました。",
+    "Unable to change full name" : "名前を変更できません",
+    "Group already exists" : "グループはすでに存在します",
+    "Unable to add group" : "グループを追加できません",
+    "Files decrypted successfully" : "ファイルの復号化に成功しました",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
+    "Couldn't decrypt your files, check your password and try again" : "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
+    "Encryption keys deleted permanently" : "暗号化キーは完全に削除されます",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+    "Couldn't remove app." : "アプリが削除できませんでした。",
+    "Email saved" : "メールアドレスを保存しました",
+    "Invalid email" : "無効なメールアドレス",
+    "Unable to delete group" : "グループを削除できません",
+    "Unable to delete user" : "ユーザーを削除できません",
+    "Backups restored successfully" : "バックアップの復元に成功しました",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
+    "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." : "アプリをアップデートできませんでした。",
+    "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." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
+    "Unable to change password" : "パスワードを変更できません",
+    "Saved" : "保存されました",
+    "test email settings" : "メール設定をテスト",
+    "If you received this email, the settings seem to be correct." : "このメールを受け取ったら、設定は正しいはずです。",
+    "Email sent" : "メールを送信しました",
+    "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
+    "Add trusted domain" : "信頼するドメイン名に追加",
+    "Sending..." : "送信中…",
+    "All" : "すべて",
+    "Please wait...." : "しばらくお待ちください。",
+    "Error while disabling app" : "アプリ無効化中にエラーが発生",
+    "Disable" : "無効",
+    "Enable" : "有効にする",
+    "Error while enabling app" : "アプリを有効にする際にエラーが発生",
+    "Updating...." : "更新中....",
+    "Error while updating app" : "アプリの更新中にエラーが発生",
+    "Updated" : "アップデート済み",
+    "Uninstalling ...." : "アンインストール中 ....",
+    "Error while uninstalling app" : "アプリをアンインストール中にエラーが発生",
+    "Uninstall" : "アンインストール",
+    "Select a profile picture" : "プロファイル画像を選択",
+    "Very weak password" : "非常に弱いパスワード",
+    "Weak password" : "弱いパスワード",
+    "So-so password" : "まずまずのパスワード",
+    "Good password" : "良好なパスワード",
+    "Strong password" : "強いパスワード",
+    "Valid until {date}" : "{date} まで有効",
+    "Delete" : "削除",
+    "Decrypting files... Please wait, this can take some time." : "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
+    "Delete encryption keys permanently." : "暗号化キーを永久に削除する。",
+    "Restore encryption keys." : "暗号化キーを復元する。",
+    "Groups" : "グループ",
+    "Unable to delete {objName}" : "{objName} を削除できません",
+    "Error creating group" : "グループの作成エラー",
+    "A valid group name must be provided" : "有効なグループ名を指定する必要があります",
+    "deleted {groupName}" : "{groupName} を削除しました",
+    "undo" : "元に戻す",
+    "never" : "なし",
+    "deleted {userName}" : "{userName} を削除しました",
+    "add group" : "グループを追加",
+    "A valid username must be provided" : "有効なユーザー名を指定する必要があります",
+    "Error creating user" : "ユーザー作成エラー",
+    "A valid password must be provided" : "有効なパスワードを指定する必要があります",
+    "Warning: Home directory for user \"{user}\" already exists" : "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
+    "__language_name__" : "Japanese (日本語)",
+    "SSL root certificates" : "SSLルート証明書",
+    "Encryption" : "暗号化",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
+    "Info, warnings, errors and fatal issues" : "情報、警告、エラー、致命的な問題",
+    "Warnings, errors and fatal issues" : "警告、エラー、致命的な問題",
+    "Errors and fatal issues" : "エラー、致命的な問題",
+    "Fatal issues only" : "致命的な問題のみ",
+    "None" : "なし",
+    "Login" : "ログイン",
+    "Plain" : "平文",
+    "NT LAN Manager" : "NT LAN マネージャー",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "セキュリティ警告",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "HTTP経由で %s にアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
+    "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." : "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリにアクセスできないようWebサーバーを設定するか、データディレクトリをWebサーバーのドキュメントルートから移動するよう強く提案します。",
+    "Setup Warning" : "セットアップ警告",
+    "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 等のキャッシュ/アクセラレータが原因かもしれません。",
+    "Database Performance Info" : "データベースパフォーマンス情報",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
+    "Module 'fileinfo' missing" : "モジュール 'fileinfo' が見つかりません",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
+    "Your PHP version is outdated" : "PHPバーションが古くなっています。",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
+    "PHP charset is not set to UTF-8" : "PHP の文字コードは UTF-8 に設定されていません",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP の文字コードは UTF-8 に設定されていません。ファイル名に非アスキー文字が含まれる場合は、大きな問題となる可能性があります。php.ini の 'default_charset' の値を 'UTF-8' に変更することを強くお勧めします。",
+    "Locale not working" : "ロケールが動作していません",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
+    "URL generation in notification emails" : "通知メールにURLを生成",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
+    "Connectivity checks" : "接続を確認",
+    "No problems found" : "問題は見つかりませんでした",
+    "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
+    "Cron was not executed yet!" : "cron は未だ実行されていません！",
+    "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行する",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "システムの cron サービスを利用して、15分間隔で cron.php ファイルを実行する。",
+    "Sharing" : "共有",
+    "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
+    "Allow users to share via link" : "URLリンクで共有を許可する",
+    "Enforce password protection" : "常にパスワード保護を有効にする",
+    "Allow public uploads" : "パブリックなアップロードを許可する",
+    "Set default expiration date" : "有効期限のデフォルト値を設定",
+    "Expire after " : "無効になるまで",
+    "days" : "日",
+    "Enforce expiration date" : "有効期限を反映させる",
+    "Allow resharing" : "再共有を許可する",
+    "Restrict users to only share with users in their groups" : "グループ内のユーザーでのみ共有するように制限する",
+    "Allow users to send mail notification for shared files" : "共有ファイルに関するメール通知の送信をユーザーに許可する",
+    "Exclude groups from sharing" : "共有可能なグループから除外",
+    "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
+    "Security" : "セキュリティ",
+    "Enforce HTTPS" : "常にHTTPSを使用する",
+    "Forces the clients to connect to %s via an encrypted connection." : "クライアントから %sへの接続を常に暗号化します。",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
+    "Email Server" : "メールサーバー",
+    "This is used for sending out notifications." : "これは通知の送信に使われます。",
+    "Send mode" : "送信モード",
+    "From address" : "送信元アドレス",
+    "mail" : "メール",
+    "Authentication method" : "認証方法",
+    "Authentication required" : "認証を必要とする",
+    "Server address" : "サーバーアドレス",
+    "Port" : "ポート",
+    "Credentials" : "資格情報",
+    "SMTP Username" : "SMTP ユーザー名",
+    "SMTP Password" : "SMTP パスワード",
+    "Test email settings" : "メール設定をテスト",
+    "Send email" : "メールを送信",
+    "Log" : "ログ",
+    "Log level" : "ログレベル",
+    "More" : "もっと見る",
+    "Less" : "閉じる",
+    "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
+    "More apps" : "他のアプリ",
+    "by" : "により",
+    "Documentation:" : "ドキュメント:",
+    "User Documentation" : "ユーザードキュメント",
+    "Admin Documentation" : "管理者ドキュメント",
+    "Enable only for specific groups" : "特定のグループのみ有効に",
+    "Uninstall App" : "アプリをアンインストール",
+    "Administrator Documentation" : "管理者ドキュメント",
+    "Online Documentation" : "オンラインドキュメント",
+    "Forum" : "フォーラム",
+    "Bugtracker" : "バグトラッカー",
+    "Commercial Support" : "商用サポート",
+    "Get the apps to sync your files" : "ファイルを同期するためのアプリを取得",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
+    "Show First Run Wizard again" : "初回ウィザードを再表示する",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "現在 <strong>%s</strong> / <strong>%s</strong> を利用しています",
+    "Password" : "パスワード",
+    "Your password was changed" : "パスワードを変更しました",
+    "Unable to change your password" : "パスワードを変更することができません",
+    "Current password" : "現在のパスワード",
+    "New password" : "新しいパスワード",
+    "Change password" : "パスワードを変更",
+    "Full Name" : "名前",
+    "Email" : "メール",
+    "Your email address" : "あなたのメールアドレス",
+    "Fill in an email address to enable password recovery and receive notifications" : "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
+    "Profile picture" : "プロフィール写真",
+    "Upload new" : "新たにアップロード",
+    "Select new from Files" : "新しいファイルを選択",
+    "Remove image" : "画像を削除",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "pngまたはjpg形式。正方形が理想ですが、切り取って加工することもできます。",
+    "Your avatar is provided by your original account." : "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
+    "Cancel" : "キャンセル",
+    "Choose as profile image" : "プロファイル画像として選択",
+    "Language" : "言語",
+    "Help translate" : "翻訳に協力する",
+    "Common Name" : "コモンネーム",
+    "Valid until" : "有効期限",
+    "Issued By" : "発行元",
+    "Valid until %s" : "%s まで有効",
+    "Import Root Certificate" : "ルート証明書をインポート",
+    "The encryption app is no longer enabled, please decrypt all your files" : "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
+    "Log-in password" : "ログインパスワード",
+    "Decrypt all Files" : "すべてのファイルを複合する",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
+    "Restore Encryption Keys" : "暗号化キーを復元する",
+    "Delete Encryption Keys" : "暗号化キーを削除する",
+    "Show storage location" : "データの保存場所を表示",
+    "Show last log in" : "最終ログインを表示",
+    "Login Name" : "ログイン名",
+    "Create" : "作成",
+    "Admin Recovery Password" : "管理者リカバリパスワード",
+    "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
+    "Search Users and Groups" : "ユーザーとグループを検索",
+    "Add Group" : "グループを追加",
+    "Group" : "グループ",
+    "Everyone" : "すべてのユーザー",
+    "Admins" : "管理者",
+    "Default Quota" : "デフォルトのクォータサイズ",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
+    "Unlimited" : "無制限",
+    "Other" : "その他",
+    "Username" : "ユーザーID",
+    "Quota" : "クオータ",
+    "Storage Location" : "データの保存場所",
+    "Last Login" : "最終ログイン",
+    "change full name" : "名前を変更",
+    "set new password" : "新しいパスワードを設定",
+    "Default" : "デフォルト"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ja.php b/settings/l10n/ja.php
deleted file mode 100644
index 8d0770a1745..00000000000
--- a/settings/l10n/ja.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "有効",
-"Recommended" => "推奨",
-"Authentication error" => "認証エラー",
-"Your full name has been changed." => "名前を変更しました。",
-"Unable to change full name" => "名前を変更できません",
-"Group already exists" => "グループはすでに存在します",
-"Unable to add group" => "グループを追加できません",
-"Files decrypted successfully" => "ファイルの復号化に成功しました",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "ファイルを復号化することができませんでした。owncloud.logを調査するか、管理者に連絡してください。",
-"Couldn't decrypt your files, check your password and try again" => "ファイルを復号化することができませんでした。パスワードを確認のうえ再試行してください。",
-"Encryption keys deleted permanently" => "暗号化キーは完全に削除されます",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを完全に削除できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
-"Couldn't remove app." => "アプリが削除できませんでした。",
-"Email saved" => "メールアドレスを保存しました",
-"Invalid email" => "無効なメールアドレス",
-"Unable to delete group" => "グループを削除できません",
-"Unable to delete user" => "ユーザーを削除できません",
-"Backups restored successfully" => "バックアップの復元に成功しました",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "暗号化キーを復元できませんでした。owncloud.logを確認するか、管理者に問い合わせてください。",
-"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." => "アプリをアップデートできませんでした。",
-"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." => "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
-"Unable to change password" => "パスワードを変更できません",
-"Saved" => "保存されました",
-"test email settings" => "メール設定のテスト",
-"If you received this email, the settings seem to be correct." => "このメールを受け取ったら、設定は正しいはずです。",
-"Email sent" => "メールを送信しました",
-"You need to set your user email before being able to send test emails." => "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
-"Add trusted domain" => "信頼するドメイン名に追加",
-"Sending..." => "送信中…",
-"All" => "すべて",
-"Please wait...." => "しばらくお待ちください。",
-"Error while disabling app" => "アプリ無効化中にエラーが発生",
-"Disable" => "無効",
-"Enable" => "有効にする",
-"Error while enabling app" => "アプリを有効にする際にエラーが発生",
-"Updating...." => "更新中....",
-"Error while updating app" => "アプリの更新中にエラーが発生",
-"Updated" => "アップデート済み",
-"Uninstalling ...." => "アンインストール中 ....",
-"Error while uninstalling app" => "アプリをアンインストール中にエラーが発生",
-"Uninstall" => "アンインストール",
-"Select a profile picture" => "プロファイル画像を選択",
-"Very weak password" => "非常に弱いパスワード",
-"Weak password" => "弱いパスワード",
-"So-so password" => "まずまずのパスワード",
-"Good password" => "良好なパスワード",
-"Strong password" => "強いパスワード",
-"Valid until {date}" => "{date} まで有効",
-"Delete" => "削除",
-"Decrypting files... Please wait, this can take some time." => "ファイルを複合中... しばらくお待ちください、この処理には少し時間がかかるかもしれません。",
-"Delete encryption keys permanently." => "暗号化キーを永久に削除する。",
-"Restore encryption keys." => "暗号化キーを復元する。",
-"Groups" => "グループ",
-"Unable to delete {objName}" => "{objName} を削除できません",
-"Error creating group" => "グループの作成エラー",
-"A valid group name must be provided" => "有効なグループ名を指定する必要があります",
-"deleted {groupName}" => "{groupName} を削除しました",
-"undo" => "元に戻す",
-"never" => "なし",
-"deleted {userName}" => "{userName} を削除しました",
-"add group" => "グループを追加",
-"A valid username must be provided" => "有効なユーザー名を指定する必要があります",
-"Error creating user" => "ユーザー作成エラー",
-"A valid password must be provided" => "有効なパスワードを指定する必要があります",
-"Warning: Home directory for user \"{user}\" already exists" => "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
-"__language_name__" => "Japanese (日本語)",
-"SSL root certificates" => "SSLルート証明書",
-"Encryption" => "暗号化",
-"Everything (fatal issues, errors, warnings, info, debug)" => "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
-"Info, warnings, errors and fatal issues" => "情報、警告、エラー、致命的な問題",
-"Warnings, errors and fatal issues" => "警告、エラー、致命的な問題",
-"Errors and fatal issues" => "エラー、致命的な問題",
-"Fatal issues only" => "致命的な問題のみ",
-"None" => "なし",
-"Login" => "ログイン",
-"Plain" => "平文",
-"NT LAN Manager" => "NT LAN マネージャー",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "セキュリティ警告",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "HTTP経由で %s にアクセスしています。HTTPSを使用するようサーバーを設定することを強くおすすめします。",
-"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." => "データディレクトリとファイルがインターネットからアクセス可能になっている可能性があります。.htaccessファイルが機能していません。データディレクトリにアクセスできないようWebサーバーを設定するか、データディレクトリをWebサーバーのドキュメントルートから移動するよう強く提案します。",
-"Setup Warning" => "セットアップ警告",
-"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 等のキャッシュ/アクセラレータが原因かもしれません。",
-"Database Performance Info" => "データベースパフォーマンス情報",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite をデータベースとして利用しています。大規模な運用では、利用しないことをお勧めします。別のデータベースへ移行する場合は、コマンドラインツール: 'occ db:convert-type'を使ってください。",
-"Module 'fileinfo' missing" => "モジュール 'fileinfo' が見つかりません",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP のモジュール 'fileinfo' が見つかりません。mimeタイプの検出を精度良く行うために、このモジュールを有効にすることを強くお勧めします。",
-"Your PHP version is outdated" => "PHPバーションが古くなっています。",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHPバーションが古くなっています。古いバージョンには既知の問題があるため、5.3.8以降のバージョンにアップデートすることを強く推奨します。このインストール状態では正常に動作しない可能性があります。",
-"PHP charset is not set to UTF-8" => "PHP の文字コードは UTF-8 に設定されていません",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP の文字コードは UTF-8 に設定されていません。ファイル名に非アスキー文字が含まれる場合は、大きな問題となる可能性があります。php.ini の 'default_charset' の値を 'UTF-8' に変更することを強くお勧めします。",
-"Locale not working" => "ロケールが動作していません",
-"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 to install the required packages on your system to support one of the following locales: %s." => "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
-"URL generation in notification emails" => "通知メールにURLを生成",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
-"Connectivity checks" => "接続を確認",
-"No problems found" => "問題は見つかりませんでした",
-"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>インストールガイド</a>をよく確認してください。",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "直近では%sにcronが実行されました。",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
-"Cron was not executed yet!" => "cron は未だ実行されていません！",
-"Execute one task with each page loaded" => "各ページの読み込み時にタスクを実行する",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
-"Use system's cron service to call the cron.php file every 15 minutes." => "システムの cron サービスを利用して、15分間隔で cron.php ファイルを実行する。",
-"Sharing" => "共有",
-"Allow apps to use the Share API" => "アプリからの共有APIの利用を許可する",
-"Allow users to share via link" => "URLリンクで共有を許可する",
-"Enforce password protection" => "常にパスワード保護を有効にする",
-"Allow public uploads" => "パブリックなアップロードを許可する",
-"Set default expiration date" => "有効期限のデフォルト値を設定",
-"Expire after " => "無効になるまで",
-"days" => "日",
-"Enforce expiration date" => "有効期限を反映させる",
-"Allow resharing" => "再共有を許可する",
-"Restrict users to only share with users in their groups" => "グループ内のユーザーでのみ共有するように制限する",
-"Allow users to send mail notification for shared files" => "共有ファイルに関するメール通知の送信をユーザーに許可する",
-"Exclude groups from sharing" => "共有可能なグループから除外",
-"These groups will still be able to receive shares, but not to initiate them." => "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
-"Security" => "セキュリティ",
-"Enforce HTTPS" => "常にHTTPSを使用する",
-"Forces the clients to connect to %s via an encrypted connection." => "クライアントから %sへの接続を常に暗号化します。",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
-"Email Server" => "メールサーバー",
-"This is used for sending out notifications." => "通知を送信する際に使用します。",
-"Send mode" => "送信モード",
-"From address" => "送信元アドレス",
-"mail" => "メール",
-"Authentication method" => "認証方法",
-"Authentication required" => "認証を必要とする",
-"Server address" => "サーバーアドレス",
-"Port" => "ポート",
-"Credentials" => "資格情報",
-"SMTP Username" => "SMTP ユーザー名",
-"SMTP Password" => "SMTP パスワード",
-"Test email settings" => "メール設定のテスト",
-"Send email" => "メールを送信",
-"Log" => "ログ",
-"Log level" => "ログレベル",
-"More" => "もっと見る",
-"Less" => "閉じる",
-"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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
-"More apps" => "他のアプリ",
-"by" => "により",
-"Documentation:" => "ドキュメント:",
-"User Documentation" => "ユーザードキュメント",
-"Admin Documentation" => "管理者ドキュメント",
-"Enable only for specific groups" => "特定のグループのみ有効に",
-"Uninstall App" => "アプリをアンインストール",
-"Administrator Documentation" => "管理者ドキュメント",
-"Online Documentation" => "オンラインドキュメント",
-"Forum" => "フォーラム",
-"Bugtracker" => "バグトラッカー",
-"Commercial Support" => "商用サポート",
-"Get the apps to sync your files" => "ファイルを同期するためのアプリを取得",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "もしプロジェクトをサポートしていただけるなら、\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">開発に参加する</a>\n\t\t、もしくは\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">プロジェクトを広く伝えてください</a>！",
-"Show First Run Wizard again" => "初回ウィザードを再表示する",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "現在 <strong>%s</strong> / <strong>%s</strong> を利用しています",
-"Password" => "パスワード",
-"Your password was changed" => "パスワードを変更しました",
-"Unable to change your password" => "パスワードを変更することができません",
-"Current password" => "現在のパスワード",
-"New password" => "新しいパスワード",
-"Change password" => "パスワードを変更",
-"Full Name" => "名前",
-"Email" => "メール",
-"Your email address" => "あなたのメールアドレス",
-"Fill in an email address to enable password recovery and receive notifications" => "パスワードの回復を有効にし、通知を受け取るにはメールアドレスを入力してください",
-"Profile picture" => "プロフィール写真",
-"Upload new" => "新たにアップロード",
-"Select new from Files" => "新しいファイルを選択",
-"Remove image" => "画像を削除",
-"Either png or jpg. Ideally square but you will be able to crop it." => "pngまたはjpg形式。正方形が理想ですが、切り取って加工することもできます。",
-"Your avatar is provided by your original account." => "あなたのアバターは、あなたのオリジナルのアカウントで提供されています。",
-"Cancel" => "キャンセル",
-"Choose as profile image" => "プロファイル画像として選択",
-"Language" => "言語",
-"Help translate" => "翻訳に協力する",
-"Common Name" => "コモンネーム",
-"Valid until" => "有効期限",
-"Issued By" => "発行元",
-"Valid until %s" => "%s まで有効",
-"Import Root Certificate" => "ルート証明書をインポート",
-"The encryption app is no longer enabled, please decrypt all your files" => "暗号化アプリはもはや有効ではありません、すべてのファイルを複合してください",
-"Log-in password" => "ログインパスワード",
-"Decrypt all Files" => "すべてのファイルを複合する",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "暗号化キーはバックアップ場所に移動されました。何か問題があった場合は、キーを復元することができます。すべてのファイルが正しく復号化されたことが確信できる場合にのみ、キーを完全に削除してください。",
-"Restore Encryption Keys" => "暗号化キーを復元する",
-"Delete Encryption Keys" => "暗号化キーを削除する",
-"Show storage location" => "データの保存場所を表示",
-"Show last log in" => "最終ログインを表示",
-"Login Name" => "ログイン名",
-"Create" => "作成",
-"Admin Recovery Password" => "管理者リカバリパスワード",
-"Enter the recovery password in order to recover the users files during password change" => "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
-"Search Users and Groups" => "ユーザーとグループを検索",
-"Add Group" => "グループを追加",
-"Group" => "グループ",
-"Everyone" => "すべてのユーザー",
-"Admins" => "管理者",
-"Default Quota" => "デフォルトのクォータサイズ",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
-"Unlimited" => "無制限",
-"Other" => "その他",
-"Username" => "ユーザーID",
-"Quota" => "クオータ",
-"Storage Location" => "データの保存場所",
-"Last Login" => "最終ログイン",
-"change full name" => "名前を変更",
-"set new password" => "新しいパスワードを設定",
-"Default" => "デフォルト"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/jv.js b/settings/l10n/jv.js
new file mode 100644
index 00000000000..ac03f3c3a7e
--- /dev/null
+++ b/settings/l10n/jv.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "Panjalukan salah"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/jv.json b/settings/l10n/jv.json
new file mode 100644
index 00000000000..ff13946849b
--- /dev/null
+++ b/settings/l10n/jv.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Invalid request" : "Panjalukan salah"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/jv.php b/settings/l10n/jv.php
deleted file mode 100644
index 60f6d245940..00000000000
--- a/settings/l10n/jv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "Panjalukan salah"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ka_GE.js b/settings/l10n/ka_GE.js
new file mode 100644
index 00000000000..dd9652686b5
--- /dev/null
+++ b/settings/l10n/ka_GE.js
@@ -0,0 +1,92 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "ავთენტიფიკაციის შეცდომა",
+    "Group already exists" : "ჯგუფი უკვე არსებობს",
+    "Unable to add group" : "ჯგუფის დამატება ვერ მოხერხდა",
+    "Email saved" : "იმეილი შენახულია",
+    "Invalid email" : "არასწორი იმეილი",
+    "Unable to delete group" : "ჯგუფის წაშლა ვერ მოხერხდა",
+    "Unable to delete user" : "მომხმარებლის წაშლა ვერ მოხერხდა",
+    "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." : "ვერ მოხერხდა აპლიკაციის განახლება.",
+    "Email sent" : "იმეილი გაიგზავნა",
+    "All" : "ყველა",
+    "Please wait...." : "დაიცადეთ....",
+    "Disable" : "გამორთვა",
+    "Enable" : "ჩართვა",
+    "Updating...." : "მიმდინარეობს განახლება....",
+    "Error while updating app" : "შეცდომა აპლიკაციის განახლების დროს",
+    "Updated" : "განახლებულია",
+    "Delete" : "წაშლა",
+    "Groups" : "ჯგუფები",
+    "undo" : "დაბრუნება",
+    "never" : "არასდროს",
+    "add group" : "ჯგუფის დამატება",
+    "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
+    "Error creating user" : "შეცდომა მომხმარებლის შექმნისას",
+    "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root სერთიფიკატები",
+    "Encryption" : "ენკრიპცია",
+    "None" : "არა",
+    "Login" : "ლოგინი",
+    "Security Warning" : "უსაფრთხოების გაფრთხილება",
+    "Setup Warning" : "გაფრთხილება დაყენებისას",
+    "Module 'fileinfo' missing" : "მოდული 'fileinfo'  არ არსებობს",
+    "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–ს აღმოჩენისას.",
+    "Locale not working" : "ლოკალიზაცია არ მუშაობს",
+    "Please double check the <a href='%s'>installation guides</a>." : "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
+    "Cron" : "Cron–ი",
+    "Execute one task with each page loaded" : "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
+    "Sharing" : "გაზიარება",
+    "Allow apps to use the Share API" : "დაუშვი აპლიკაციების უფლება  Share API –ზე",
+    "Allow resharing" : "გადაზიარების დაშვება",
+    "Security" : "უსაფრთხოება",
+    "Enforce HTTPS" : "HTTPS–ის ჩართვა",
+    "Server address" : "სერვერის მისამართი",
+    "Port" : "პორტი",
+    "Credentials" : "იუზერ/პაროლი",
+    "Log" : "ლოგი",
+    "Log level" : "ლოგირების დონე",
+    "More" : "უფრო მეტი",
+    "Less" : "უფრო ნაკლები",
+    "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>." : "წარმოებულია <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.",
+    "by" : "მიერ",
+    "User Documentation" : "მომხმარებლის დოკუმენტაცია",
+    "Administrator Documentation" : "ადმინისტრატორის დოკუმენტაცია",
+    "Online Documentation" : "ონლაინ დოკუმენტაცია",
+    "Forum" : "ფორუმი",
+    "Bugtracker" : "ბაგთრექერი",
+    "Commercial Support" : "კომერციული მხარდაჭერა",
+    "Get the apps to sync your files" : "აპლიკაცია ფაილების სინქრონიზაციისთვის",
+    "Show First Run Wizard again" : "მაჩვენე თავიდან გაშვებული ვიზარდი",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
+    "Password" : "პაროლი",
+    "Your password was changed" : "თქვენი პაროლი შეიცვალა",
+    "Unable to change your password" : "თქვენი პაროლი არ შეიცვალა",
+    "Current password" : "მიმდინარე პაროლი",
+    "New password" : "ახალი პაროლი",
+    "Change password" : "პაროლის შეცვლა",
+    "Email" : "იმეილი",
+    "Your email address" : "თქვენი იმეილ მისამართი",
+    "Cancel" : "უარყოფა",
+    "Language" : "ენა",
+    "Help translate" : "თარგმნის დახმარება",
+    "Import Root Certificate" : "Root სერთიფიკატის იმპორტირება",
+    "Login Name" : "მომხმარებლის სახელი",
+    "Create" : "შექმნა",
+    "Default Quota" : "საწყისი ქვოტა",
+    "Unlimited" : "ულიმიტო",
+    "Other" : "სხვა",
+    "Username" : "მომხმარებლის სახელი",
+    "Quota" : "ქვოტა",
+    "set new password" : "დააყენეთ ახალი პაროლი",
+    "Default" : "საწყისი პარამეტრები"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ka_GE.json b/settings/l10n/ka_GE.json
new file mode 100644
index 00000000000..c2933f83849
--- /dev/null
+++ b/settings/l10n/ka_GE.json
@@ -0,0 +1,90 @@
+{ "translations": {
+    "Authentication error" : "ავთენტიფიკაციის შეცდომა",
+    "Group already exists" : "ჯგუფი უკვე არსებობს",
+    "Unable to add group" : "ჯგუფის დამატება ვერ მოხერხდა",
+    "Email saved" : "იმეილი შენახულია",
+    "Invalid email" : "არასწორი იმეილი",
+    "Unable to delete group" : "ჯგუფის წაშლა ვერ მოხერხდა",
+    "Unable to delete user" : "მომხმარებლის წაშლა ვერ მოხერხდა",
+    "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." : "ვერ მოხერხდა აპლიკაციის განახლება.",
+    "Email sent" : "იმეილი გაიგზავნა",
+    "All" : "ყველა",
+    "Please wait...." : "დაიცადეთ....",
+    "Disable" : "გამორთვა",
+    "Enable" : "ჩართვა",
+    "Updating...." : "მიმდინარეობს განახლება....",
+    "Error while updating app" : "შეცდომა აპლიკაციის განახლების დროს",
+    "Updated" : "განახლებულია",
+    "Delete" : "წაშლა",
+    "Groups" : "ჯგუფები",
+    "undo" : "დაბრუნება",
+    "never" : "არასდროს",
+    "add group" : "ჯგუფის დამატება",
+    "A valid username must be provided" : "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
+    "Error creating user" : "შეცდომა მომხმარებლის შექმნისას",
+    "A valid password must be provided" : "უნდა მიუთითოთ არსებული პაროლი",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root სერთიფიკატები",
+    "Encryption" : "ენკრიპცია",
+    "None" : "არა",
+    "Login" : "ლოგინი",
+    "Security Warning" : "უსაფრთხოების გაფრთხილება",
+    "Setup Warning" : "გაფრთხილება დაყენებისას",
+    "Module 'fileinfo' missing" : "მოდული 'fileinfo'  არ არსებობს",
+    "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–ს აღმოჩენისას.",
+    "Locale not working" : "ლოკალიზაცია არ მუშაობს",
+    "Please double check the <a href='%s'>installation guides</a>." : "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
+    "Cron" : "Cron–ი",
+    "Execute one task with each page loaded" : "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
+    "Sharing" : "გაზიარება",
+    "Allow apps to use the Share API" : "დაუშვი აპლიკაციების უფლება  Share API –ზე",
+    "Allow resharing" : "გადაზიარების დაშვება",
+    "Security" : "უსაფრთხოება",
+    "Enforce HTTPS" : "HTTPS–ის ჩართვა",
+    "Server address" : "სერვერის მისამართი",
+    "Port" : "პორტი",
+    "Credentials" : "იუზერ/პაროლი",
+    "Log" : "ლოგი",
+    "Log level" : "ლოგირების დონე",
+    "More" : "უფრო მეტი",
+    "Less" : "უფრო ნაკლები",
+    "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>." : "წარმოებულია <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.",
+    "by" : "მიერ",
+    "User Documentation" : "მომხმარებლის დოკუმენტაცია",
+    "Administrator Documentation" : "ადმინისტრატორის დოკუმენტაცია",
+    "Online Documentation" : "ონლაინ დოკუმენტაცია",
+    "Forum" : "ფორუმი",
+    "Bugtracker" : "ბაგთრექერი",
+    "Commercial Support" : "კომერციული მხარდაჭერა",
+    "Get the apps to sync your files" : "აპლიკაცია ფაილების სინქრონიზაციისთვის",
+    "Show First Run Wizard again" : "მაჩვენე თავიდან გაშვებული ვიზარდი",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
+    "Password" : "პაროლი",
+    "Your password was changed" : "თქვენი პაროლი შეიცვალა",
+    "Unable to change your password" : "თქვენი პაროლი არ შეიცვალა",
+    "Current password" : "მიმდინარე პაროლი",
+    "New password" : "ახალი პაროლი",
+    "Change password" : "პაროლის შეცვლა",
+    "Email" : "იმეილი",
+    "Your email address" : "თქვენი იმეილ მისამართი",
+    "Cancel" : "უარყოფა",
+    "Language" : "ენა",
+    "Help translate" : "თარგმნის დახმარება",
+    "Import Root Certificate" : "Root სერთიფიკატის იმპორტირება",
+    "Login Name" : "მომხმარებლის სახელი",
+    "Create" : "შექმნა",
+    "Default Quota" : "საწყისი ქვოტა",
+    "Unlimited" : "ულიმიტო",
+    "Other" : "სხვა",
+    "Username" : "მომხმარებლის სახელი",
+    "Quota" : "ქვოტა",
+    "set new password" : "დააყენეთ ახალი პაროლი",
+    "Default" : "საწყისი პარამეტრები"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
deleted file mode 100644
index 3e2a50a6fdf..00000000000
--- a/settings/l10n/ka_GE.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "ავთენტიფიკაციის შეცდომა",
-"Group already exists" => "ჯგუფი უკვე არსებობს",
-"Unable to add group" => "ჯგუფის დამატება ვერ მოხერხდა",
-"Email saved" => "იმეილი შენახულია",
-"Invalid email" => "არასწორი იმეილი",
-"Unable to delete group" => "ჯგუფის წაშლა ვერ მოხერხდა",
-"Unable to delete user" => "მომხმარებლის წაშლა ვერ მოხერხდა",
-"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." => "ვერ მოხერხდა აპლიკაციის განახლება.",
-"Email sent" => "იმეილი გაიგზავნა",
-"All" => "ყველა",
-"Please wait...." => "დაიცადეთ....",
-"Disable" => "გამორთვა",
-"Enable" => "ჩართვა",
-"Updating...." => "მიმდინარეობს განახლება....",
-"Error while updating app" => "შეცდომა აპლიკაციის განახლების დროს",
-"Updated" => "განახლებულია",
-"Delete" => "წაშლა",
-"Groups" => "ჯგუფები",
-"undo" => "დაბრუნება",
-"never" => "არასდროს",
-"add group" => "ჯგუფის დამატება",
-"A valid username must be provided" => "უნდა მიუთითოთ არსებული მომხმარებლის სახელი",
-"Error creating user" => "შეცდომა მომხმარებლის შექმნისას",
-"A valid password must be provided" => "უნდა მიუთითოთ არსებული პაროლი",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL root სერთიფიკატები",
-"Encryption" => "ენკრიპცია",
-"None" => "არა",
-"Login" => "ლოგინი",
-"Security Warning" => "უსაფრთხოების გაფრთხილება",
-"Setup Warning" => "გაფრთხილება დაყენებისას",
-"Module 'fileinfo' missing" => "მოდული 'fileinfo'  არ არსებობს",
-"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–ს აღმოჩენისას.",
-"Locale not working" => "ლოკალიზაცია არ მუშაობს",
-"Please double check the <a href='%s'>installation guides</a>." => "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
-"Cron" => "Cron–ი",
-"Execute one task with each page loaded" => "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
-"Sharing" => "გაზიარება",
-"Allow apps to use the Share API" => "დაუშვი აპლიკაციების უფლება  Share API –ზე",
-"Allow resharing" => "გადაზიარების დაშვება",
-"Security" => "უსაფრთხოება",
-"Enforce HTTPS" => "HTTPS–ის ჩართვა",
-"Server address" => "სერვერის მისამართი",
-"Port" => "პორტი",
-"Credentials" => "იუზერ/პაროლი",
-"Log" => "ლოგი",
-"Log level" => "ლოგირების დონე",
-"More" => "უფრო მეტი",
-"Less" => "უფრო ნაკლები",
-"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>." => "წარმოებულია <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>–ის მიერ. <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a>  ვრცელდება <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ლიცენზიის ფარგლებში.",
-"by" => "მიერ",
-"User Documentation" => "მომხმარებლის დოკუმენტაცია",
-"Administrator Documentation" => "ადმინისტრატორის დოკუმენტაცია",
-"Online Documentation" => "ონლაინ დოკუმენტაცია",
-"Forum" => "ფორუმი",
-"Bugtracker" => "ბაგთრექერი",
-"Commercial Support" => "კომერციული მხარდაჭერა",
-"Get the apps to sync your files" => "აპლიკაცია ფაილების სინქრონიზაციისთვის",
-"Show First Run Wizard again" => "მაჩვენე თავიდან გაშვებული ვიზარდი",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
-"Password" => "პაროლი",
-"Your password was changed" => "თქვენი პაროლი შეიცვალა",
-"Unable to change your password" => "თქვენი პაროლი არ შეიცვალა",
-"Current password" => "მიმდინარე პაროლი",
-"New password" => "ახალი პაროლი",
-"Change password" => "პაროლის შეცვლა",
-"Email" => "იმეილი",
-"Your email address" => "თქვენი იმეილ მისამართი",
-"Cancel" => "უარყოფა",
-"Language" => "ენა",
-"Help translate" => "თარგმნის დახმარება",
-"Import Root Certificate" => "Root სერთიფიკატის იმპორტირება",
-"Login Name" => "მომხმარებლის სახელი",
-"Create" => "შექმნა",
-"Default Quota" => "საწყისი ქვოტა",
-"Unlimited" => "ულიმიტო",
-"Other" => "სხვა",
-"Username" => "მომხმარებლის სახელი",
-"Quota" => "ქვოტა",
-"set new password" => "დააყენეთ ახალი პაროლი",
-"Default" => "საწყისი პარამეტრები"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/km.js b/settings/l10n/km.js
new file mode 100644
index 00000000000..a7eeed4bd69
--- /dev/null
+++ b/settings/l10n/km.js
@@ -0,0 +1,113 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "បាន​បើក",
+    "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
+    "Group already exists" : "មាន​ក្រុម​នេះ​រួច​ហើយ",
+    "Unable to add group" : "មិន​អាច​បន្ថែម​ក្រុម",
+    "Email saved" : "បាន​រក្សា​ទុក​អ៊ីមែល",
+    "Invalid email" : "អ៊ីមែល​មិន​ត្រឹម​ត្រូវ",
+    "Unable to delete group" : "មិន​អាច​លុប​ក្រុម​បាន",
+    "Unable to delete user" : "មិន​អាច​លុប​អ្នក​ប្រើ​បាន",
+    "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." : "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
+    "Wrong password" : "ខុស​ពាក្យ​សម្ងាត់",
+    "Saved" : "បាន​រក្សាទុក",
+    "test email settings" : "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
+    "If you received this email, the settings seem to be correct." : "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "You need to set your user email before being able to send test emails." : "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
+    "Sending..." : "កំពុង​ផ្ញើ...",
+    "Please wait...." : "សូម​រង់​ចាំ....",
+    "Error while disabling app" : "មាន​កំហុស​ពេល​កំពុង​បិទកម្មវិធី",
+    "Disable" : "បិទ",
+    "Enable" : "បើក",
+    "Updating...." : "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
+    "Error while updating app" : "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
+    "Updated" : "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
+    "Select a profile picture" : "ជ្រើស​រូបភាព​ប្រវត្តិរូប",
+    "Very weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+    "Weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ",
+    "So-so password" : "ពាក្យ​សម្ងាត់​ធម្មតា",
+    "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
+    "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
+    "Delete" : "លុប",
+    "Decrypting files... Please wait, this can take some time." : "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
+    "Groups" : "ក្រុ",
+    "undo" : "មិន​ធ្វើ​វិញ",
+    "never" : "មិនដែរ",
+    "add group" : "បន្ថែម​ក្រុម",
+    "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "Error creating user" : "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
+    "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "កូដនីយកម្ម",
+    "None" : "គ្មាន",
+    "Login" : "ចូល",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "បម្រាម​សុវត្ថិភាព",
+    "Setup Warning" : "បម្រាម​ការ​ដំឡើង",
+    "Module 'fileinfo' missing" : "ខ្វះ​ម៉ូឌុល 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។",
+    "Locale not working" : "Locale មិន​ដំណើរការ",
+    "Cron" : "Cron",
+    "Sharing" : "ការ​ចែក​រំលែក",
+    "Allow apps to use the Share API" : "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
+    "Allow public uploads" : "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
+    "Allow resharing" : "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
+    "Security" : "សុវត្ថិភាព",
+    "Enforce HTTPS" : "បង្ខំ HTTPS",
+    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+    "From address" : "ពី​អាសយដ្ឋាន",
+    "Server address" : "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
+    "Port" : "ច្រក",
+    "Send email" : "ផ្ញើ​អ៊ីមែល",
+    "Log" : "Log",
+    "Log level" : "កម្រិត Log",
+    "More" : "ច្រើន​ទៀត",
+    "Less" : "តិច",
+    "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>." : "សរសេរ​កម្មវិធី​ដោយ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">សហគមន៍ ownCloud</a> ហើយ <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> គឺ​ស្ថិត​ក្នុង​អាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។",
+    "by" : "ដោយ",
+    "User Documentation" : "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+    "Admin Documentation" : "កម្រង​ឯកសារ​អភិបាល",
+    "Administrator Documentation" : "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
+    "Online Documentation" : "ឯកសារ Online",
+    "Forum" : "វេទិកាពិភាក្សា",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "ការគាំទ្រលក្ខណៈពាណិជ្ជកម្ម",
+    "Get the apps to sync your files" : "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
+    "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តង​ទៀត",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "អ្នក​បាន​ប្រើ <strong>%s</strong> ក្នុង​ចំណោម​ចំនួន​មាន <strong>%s</strong>",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Your password was changed" : "ពាក្យ​សម្ងាត់​របស់​អ្នក​ត្រូវ​បាន​ប្ដូរ",
+    "Unable to change your password" : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​របស់​អ្នក​បាន​ទេ",
+    "Current password" : "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
+    "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Change password" : "ប្តូរ​ពាក្យសម្ងាត់",
+    "Email" : "អ៊ីមែល",
+    "Your email address" : "អ៊ីម៉ែល​របស់​អ្នក",
+    "Profile picture" : "រូបភាព​ប្រវត្តិរូប",
+    "Upload new" : "ផ្ទុកឡើង​ថ្មី",
+    "Select new from Files" : "ជ្រើស​ថ្មី​ពី​ឯកសារ",
+    "Remove image" : "ដក​រូបភាព​ចេញ",
+    "Cancel" : "លើកលែង",
+    "Language" : "ភាសា",
+    "Help translate" : "ជួយ​បក​ប្រែ",
+    "Log-in password" : "ពាក្យ​សម្ងាត់​ចូល​គណនី",
+    "Decrypt all Files" : "Decrypt ឯកសារ​ទាំង​អស់",
+    "Login Name" : "ចូល",
+    "Create" : "បង្កើត",
+    "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
+    "Unlimited" : "មិន​កំណត់",
+    "Other" : "ផ្សេងៗ",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "set new password" : "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
+    "Default" : "លំនាំ​ដើម"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/km.json b/settings/l10n/km.json
new file mode 100644
index 00000000000..3dbfa6dc037
--- /dev/null
+++ b/settings/l10n/km.json
@@ -0,0 +1,111 @@
+{ "translations": {
+    "Enabled" : "បាន​បើក",
+    "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
+    "Group already exists" : "មាន​ក្រុម​នេះ​រួច​ហើយ",
+    "Unable to add group" : "មិន​អាច​បន្ថែម​ក្រុម",
+    "Email saved" : "បាន​រក្សា​ទុក​អ៊ីមែល",
+    "Invalid email" : "អ៊ីមែល​មិន​ត្រឹម​ត្រូវ",
+    "Unable to delete group" : "មិន​អាច​លុប​ក្រុម​បាន",
+    "Unable to delete user" : "មិន​អាច​លុប​អ្នក​ប្រើ​បាន",
+    "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." : "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
+    "Wrong password" : "ខុស​ពាក្យ​សម្ងាត់",
+    "Saved" : "បាន​រក្សាទុក",
+    "test email settings" : "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
+    "If you received this email, the settings seem to be correct." : "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
+    "Email sent" : "បាន​ផ្ញើ​អ៊ីមែល",
+    "You need to set your user email before being able to send test emails." : "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
+    "Sending..." : "កំពុង​ផ្ញើ...",
+    "Please wait...." : "សូម​រង់​ចាំ....",
+    "Error while disabling app" : "មាន​កំហុស​ពេល​កំពុង​បិទកម្មវិធី",
+    "Disable" : "បិទ",
+    "Enable" : "បើក",
+    "Updating...." : "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
+    "Error while updating app" : "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
+    "Updated" : "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
+    "Select a profile picture" : "ជ្រើស​រូបភាព​ប្រវត្តិរូប",
+    "Very weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
+    "Weak password" : "ពាក្យ​សម្ងាត់​ខ្សោយ",
+    "So-so password" : "ពាក្យ​សម្ងាត់​ធម្មតា",
+    "Good password" : "ពាក្យ​សម្ងាត់​ល្អ",
+    "Strong password" : "ពាក្យ​សម្ងាត់​ខ្លាំង",
+    "Delete" : "លុប",
+    "Decrypting files... Please wait, this can take some time." : "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
+    "Groups" : "ក្រុ",
+    "undo" : "មិន​ធ្វើ​វិញ",
+    "never" : "មិនដែរ",
+    "add group" : "បន្ថែម​ក្រុម",
+    "A valid username must be provided" : "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "Error creating user" : "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
+    "A valid password must be provided" : "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "កូដនីយកម្ម",
+    "None" : "គ្មាន",
+    "Login" : "ចូល",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "បម្រាម​សុវត្ថិភាព",
+    "Setup Warning" : "បម្រាម​ការ​ដំឡើង",
+    "Module 'fileinfo' missing" : "ខ្វះ​ម៉ូឌុល 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។",
+    "Locale not working" : "Locale មិន​ដំណើរការ",
+    "Cron" : "Cron",
+    "Sharing" : "ការ​ចែក​រំលែក",
+    "Allow apps to use the Share API" : "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
+    "Allow public uploads" : "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
+    "Allow resharing" : "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
+    "Security" : "សុវត្ថិភាព",
+    "Enforce HTTPS" : "បង្ខំ HTTPS",
+    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+    "From address" : "ពី​អាសយដ្ឋាន",
+    "Server address" : "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
+    "Port" : "ច្រក",
+    "Send email" : "ផ្ញើ​អ៊ីមែល",
+    "Log" : "Log",
+    "Log level" : "កម្រិត Log",
+    "More" : "ច្រើន​ទៀត",
+    "Less" : "តិច",
+    "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>." : "សរសេរ​កម្មវិធី​ដោយ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">សហគមន៍ ownCloud</a> ហើយ <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> គឺ​ស្ថិត​ក្នុង​អាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។",
+    "by" : "ដោយ",
+    "User Documentation" : "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
+    "Admin Documentation" : "កម្រង​ឯកសារ​អភិបាល",
+    "Administrator Documentation" : "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
+    "Online Documentation" : "ឯកសារ Online",
+    "Forum" : "វេទិកាពិភាក្សា",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "ការគាំទ្រលក្ខណៈពាណិជ្ជកម្ម",
+    "Get the apps to sync your files" : "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
+    "Show First Run Wizard again" : "បង្ហាញ First Run Wizard ម្តង​ទៀត",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "អ្នក​បាន​ប្រើ <strong>%s</strong> ក្នុង​ចំណោម​ចំនួន​មាន <strong>%s</strong>",
+    "Password" : "ពាក្យសម្ងាត់",
+    "Your password was changed" : "ពាក្យ​សម្ងាត់​របស់​អ្នក​ត្រូវ​បាន​ប្ដូរ",
+    "Unable to change your password" : "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​របស់​អ្នក​បាន​ទេ",
+    "Current password" : "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
+    "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Change password" : "ប្តូរ​ពាក្យសម្ងាត់",
+    "Email" : "អ៊ីមែល",
+    "Your email address" : "អ៊ីម៉ែល​របស់​អ្នក",
+    "Profile picture" : "រូបភាព​ប្រវត្តិរូប",
+    "Upload new" : "ផ្ទុកឡើង​ថ្មី",
+    "Select new from Files" : "ជ្រើស​ថ្មី​ពី​ឯកសារ",
+    "Remove image" : "ដក​រូបភាព​ចេញ",
+    "Cancel" : "លើកលែង",
+    "Language" : "ភាសា",
+    "Help translate" : "ជួយ​បក​ប្រែ",
+    "Log-in password" : "ពាក្យ​សម្ងាត់​ចូល​គណនី",
+    "Decrypt all Files" : "Decrypt ឯកសារ​ទាំង​អស់",
+    "Login Name" : "ចូល",
+    "Create" : "បង្កើត",
+    "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
+    "Unlimited" : "មិន​កំណត់",
+    "Other" : "ផ្សេងៗ",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
+    "set new password" : "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
+    "Default" : "លំនាំ​ដើម"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/km.php b/settings/l10n/km.php
deleted file mode 100644
index 3e7522dcf9e..00000000000
--- a/settings/l10n/km.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "បាន​បើក",
-"Authentication error" => "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
-"Group already exists" => "មាន​ក្រុម​នេះ​រួច​ហើយ",
-"Unable to add group" => "មិន​អាច​បន្ថែម​ក្រុម",
-"Email saved" => "បាន​រក្សា​ទុក​អ៊ីមែល",
-"Invalid email" => "អ៊ីមែល​មិន​ត្រឹម​ត្រូវ",
-"Unable to delete group" => "មិន​អាច​លុប​ក្រុម​បាន",
-"Unable to delete user" => "មិន​អាច​លុប​អ្នក​ប្រើ​បាន",
-"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." => "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
-"Wrong password" => "ខុស​ពាក្យ​សម្ងាត់",
-"Saved" => "បាន​រក្សាទុក",
-"test email settings" => "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
-"If you received this email, the settings seem to be correct." => "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
-"Email sent" => "បាន​ផ្ញើ​អ៊ីមែល",
-"You need to set your user email before being able to send test emails." => "អ្នក​ត្រូវ​តែ​កំណត់​អ៊ីមែល​របស់​អ្នក​មុន​នឹង​អាច​ផ្ញើ​អ៊ីមែល​សាកល្បង​បាន។",
-"Sending..." => "កំពុង​ផ្ញើ...",
-"Please wait...." => "សូម​រង់​ចាំ....",
-"Error while disabling app" => "មាន​កំហុស​ពេល​កំពុង​បិទកម្មវិធី",
-"Disable" => "បិទ",
-"Enable" => "បើក",
-"Updating...." => "កំពុង​ធ្វើ​បច្ចុប្បន្នភាព....",
-"Error while updating app" => "មាន​កំហុស​ពេល​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី",
-"Updated" => "បាន​ធ្វើ​បច្ចុប្បន្នភាព",
-"Select a profile picture" => "ជ្រើស​រូបភាព​ប្រវត្តិរូប",
-"Very weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ​ណាស់",
-"Weak password" => "ពាក្យ​សម្ងាត់​ខ្សោយ",
-"So-so password" => "ពាក្យ​សម្ងាត់​ធម្មតា",
-"Good password" => "ពាក្យ​សម្ងាត់​ល្អ",
-"Strong password" => "ពាក្យ​សម្ងាត់​ខ្លាំង",
-"Delete" => "លុប",
-"Decrypting files... Please wait, this can take some time." => "កំពុង Decrypt​ ឯកសារ... សូម​រង​ចាំ វា​អាច​ត្រូវការ​ពេល​មួយ​ចំនួន។",
-"Groups" => "ក្រុ",
-"undo" => "មិន​ធ្វើ​វិញ",
-"never" => "មិនដែរ",
-"add group" => "បន្ថែម​ក្រុម",
-"A valid username must be provided" => "ត្រូវ​ផ្ដល់​ឈ្មោះ​អ្នក​ប្រើ​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
-"Error creating user" => "មាន​កំហុស​ក្នុង​ការ​បង្កើត​អ្នក​ប្រើ",
-"A valid password must be provided" => "ត្រូវ​ផ្ដល់​ពាក្យ​សម្ងាត់​ឲ្យ​បាន​ត្រឹម​ត្រូវ",
-"__language_name__" => "__language_name__",
-"Encryption" => "កូដនីយកម្ម",
-"None" => "គ្មាន",
-"Login" => "ចូល",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "បម្រាម​សុវត្ថិភាព",
-"Setup Warning" => "បម្រាម​ការ​ដំឡើង",
-"Module 'fileinfo' missing" => "ខ្វះ​ម៉ូឌុល 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។",
-"Locale not working" => "Locale មិន​ដំណើរការ",
-"Cron" => "Cron",
-"Sharing" => "ការ​ចែក​រំលែក",
-"Allow apps to use the Share API" => "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
-"Allow public uploads" => "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
-"Allow resharing" => "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
-"Security" => "សុវត្ថិភាព",
-"Enforce HTTPS" => "បង្ខំ HTTPS",
-"Email Server" => "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
-"From address" => "ពី​អាសយដ្ឋាន",
-"Server address" => "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
-"Port" => "ច្រក",
-"Send email" => "ផ្ញើ​អ៊ីមែល",
-"Log" => "Log",
-"Log level" => "កម្រិត Log",
-"More" => "ច្រើន​ទៀត",
-"Less" => "តិច",
-"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>." => "សរសេរ​កម្មវិធី​ដោយ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">សហគមន៍ ownCloud</a> ហើយ <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> គឺ​ស្ថិត​ក្នុង​អាជ្ញាប័ណ្ណ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>។",
-"by" => "ដោយ",
-"User Documentation" => "ឯកសារ​សម្រាប់​អ្នក​ប្រើប្រាស់",
-"Admin Documentation" => "កម្រង​ឯកសារ​អភិបាល",
-"Administrator Documentation" => "ឯកសារ​សម្រាប់​​អ្នក​​គ្រប់​គ្រង​ប្រព័ន្ធ",
-"Online Documentation" => "ឯកសារ Online",
-"Forum" => "វេទិកាពិភាក្សា",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "ការគាំទ្រលក្ខណៈពាណិជ្ជកម្ម",
-"Get the apps to sync your files" => "ដាក់​អោយកម្មវិធីផ្សេងៗ ​ធ្វើសមកាលកម្ម​ឯកសារ​អ្នក",
-"Show First Run Wizard again" => "បង្ហាញ First Run Wizard ម្តង​ទៀត",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "អ្នក​បាន​ប្រើ <strong>%s</strong> ក្នុង​ចំណោម​ចំនួន​មាន <strong>%s</strong>",
-"Password" => "ពាក្យសម្ងាត់",
-"Your password was changed" => "ពាក្យ​សម្ងាត់​របស់​អ្នក​ត្រូវ​បាន​ប្ដូរ",
-"Unable to change your password" => "មិន​អាច​ប្ដូរ​ពាក្យ​សម្ងាត់​របស់​អ្នក​បាន​ទេ",
-"Current password" => "ពាក្យសម្ងាត់​បច្ចុប្បន្ន",
-"New password" => "ពាក្យ​សម្ងាត់​ថ្មី",
-"Change password" => "ប្តូរ​ពាក្យសម្ងាត់",
-"Email" => "អ៊ីមែល",
-"Your email address" => "អ៊ីម៉ែល​របស់​អ្នក",
-"Profile picture" => "រូបភាព​ប្រវត្តិរូប",
-"Upload new" => "ផ្ទុកឡើង​ថ្មី",
-"Select new from Files" => "ជ្រើស​ថ្មី​ពី​ឯកសារ",
-"Remove image" => "ដក​រូបភាព​ចេញ",
-"Cancel" => "លើកលែង",
-"Language" => "ភាសា",
-"Help translate" => "ជួយ​បក​ប្រែ",
-"Log-in password" => "ពាក្យ​សម្ងាត់​ចូល​គណនី",
-"Decrypt all Files" => "Decrypt ឯកសារ​ទាំង​អស់",
-"Login Name" => "ចូល",
-"Create" => "បង្កើត",
-"Admin Recovery Password" => "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
-"Unlimited" => "មិន​កំណត់",
-"Other" => "ផ្សេងៗ",
-"Username" => "ឈ្មោះ​អ្នកប្រើ",
-"set new password" => "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
-"Default" => "លំនាំ​ដើម"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
new file mode 100644
index 00000000000..9b0ad8a96ea
--- /dev/null
+++ b/settings/l10n/ko.js
@@ -0,0 +1,175 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "활성화",
+    "Authentication error" : "인증 오류",
+    "Your full name has been changed." : "전체 이름이 변경되었습니다.",
+    "Unable to change full name" : "전체 이름을 변경할 수 없음",
+    "Group already exists" : "그룹이 이미 존재함",
+    "Unable to add group" : "그룹을 추가할 수 없음",
+    "Couldn't remove app." : "앱을 제거할수 없습니다.",
+    "Email saved" : "이메일 저장됨",
+    "Invalid email" : "잘못된 이메일 주소",
+    "Unable to delete group" : "그룹을 삭제할 수 없음",
+    "Unable to delete user" : "사용자를 삭제할 수 없음.",
+    "Backups restored successfully" : "성공적으로 백업을 복원했습니다",
+    "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." : "앱을 업데이트할 수 없습니다.",
+    "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." : "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.",
+    "Unable to change password" : "암호를 변경할 수 없음",
+    "Saved" : "저장됨",
+    "Email sent" : "이메일 발송됨",
+    "Sending..." : "보내는 중...",
+    "All" : "모두",
+    "Please wait...." : "기다려 주십시오....",
+    "Error while disabling app" : "앱을 비활성화하는 중 오류 발생",
+    "Disable" : "사용 안함",
+    "Enable" : "사용함",
+    "Error while enabling app" : "앱을 활성화하는 중 오류 발생",
+    "Updating...." : "업데이트 중....",
+    "Error while updating app" : "앱을 업데이트하는 중 오류 발생",
+    "Updated" : "업데이트됨",
+    "Uninstalling ...." : "제거 하는 중 ....",
+    "Error while uninstalling app" : "앱을 제거하는 중 오류 발생",
+    "Uninstall" : "제거",
+    "Select a profile picture" : "프로필 사진 선택",
+    "Very weak password" : "매우 약한 암호",
+    "Weak password" : "약한 암호",
+    "So-so password" : "그저 그런 암호",
+    "Good password" : "좋은 암호",
+    "Strong password" : "강력한 암호",
+    "Delete" : "삭제",
+    "Decrypting files... Please wait, this can take some time." : "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
+    "Groups" : "그룹",
+    "Error creating group" : "그룹을 생성하던 중 오류가 발생하였습니다",
+    "deleted {groupName}" : "{groupName} 삭제됨",
+    "undo" : "실행 취소",
+    "never" : "없음",
+    "deleted {userName}" : "{userName} 삭제됨",
+    "add group" : "그룹 추가",
+    "A valid username must be provided" : "올바른 사용자 이름을 입력해야 함",
+    "Error creating user" : "사용자 생성 오류",
+    "A valid password must be provided" : "올바른 암호를 입력해야 함",
+    "Warning: Home directory for user \"{user}\" already exists" : "경고: 사용자 \"{user}\"의 홈 디렉터리가 이미 존재합니다",
+    "__language_name__" : "한국어",
+    "SSL root certificates" : "SSL 루트 인증서",
+    "Encryption" : "암호화",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
+    "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제",
+    "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제",
+    "Errors and fatal issues" : "오류, 치명적 문제",
+    "Fatal issues only" : "치명적 문제만",
+    "None" : "없음",
+    "Login" : "로그인",
+    "NT LAN Manager" : "NT LAN 관리자",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "보안 경고",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "%s에 HTTP로 접근하고 있습니다. 서버에서 HTTPS를 사용하도록 설정하는 것을 추천합니다.",
+    "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." : "데이터 디렉터리와 파일을 인터넷에서 접근할 수도 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오.",
+    "Setup Warning" : "설정 경고",
+    "Database Performance Info" : "데이터베이스 성능 정보",
+    "Module 'fileinfo' missing" : "모듈 'fileinfo'가 없음",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
+    "Your PHP version is outdated" : "PHP 버전이 오래됨",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHP 버전이 오래되었습니다. 오래된 버전은 작동하지 않을 수도 있기 때문에 PHP 5.3.8 이상을 사용하는 것을 추천합니다.",
+    "Locale not working" : "로캘이 작동하지 않음",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "다음 로캘을 지원하도록 시스템 설정을 변경하는 것을 추천합니다: %s",
+    "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
+    "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 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
+    "Sharing" : "공유",
+    "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
+    "Allow public uploads" : "공개 업로드 허용",
+    "Allow resharing" : "재공유 허용",
+    "Security" : "보안",
+    "Enforce HTTPS" : "HTTPS 강제 사용",
+    "Forces the clients to connect to %s via an encrypted connection." : "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
+    "Email Server" : "전자우편 서버",
+    "From address" : "보낸 이 주소",
+    "Authentication method" : "인증 방법",
+    "Authentication required" : "인증 필요함",
+    "Server address" : "서버 주소",
+    "Port" : "포트",
+    "Credentials" : "자격 정보",
+    "SMTP Username" : "SMTP 사용자명",
+    "SMTP Password" : "SMTP 암호",
+    "Test email settings" : "시험용 전자우편 설정",
+    "Send email" : "전자우편 보내기",
+    "Log" : "로그",
+    "Log level" : "로그 단계",
+    "More" : "더 중요함",
+    "Less" : "덜 중요함",
+    "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
+    "by" : "작성:",
+    "Documentation:" : "문서",
+    "User Documentation" : "사용자 문서",
+    "Admin Documentation" : "운영자 문서",
+    "Enable only for specific groups" : "특정 그룹에만 허용",
+    "Uninstall App" : "앱 제거",
+    "Administrator Documentation" : "관리자 문서",
+    "Online Documentation" : "온라인 문서",
+    "Forum" : "포럼",
+    "Bugtracker" : "버그 트래커",
+    "Commercial Support" : "상업용 지원",
+    "Get the apps to sync your files" : "파일 동기화 앱 가져오기",
+    "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
+    "Password" : "암호",
+    "Your password was changed" : "암호가 변경되었습니다",
+    "Unable to change your password" : "암호를 변경할 수 없음",
+    "Current password" : "현재 암호",
+    "New password" : "새 암호",
+    "Change password" : "암호 변경",
+    "Full Name" : "전체 이름",
+    "Email" : "이메일",
+    "Your email address" : "이메일 주소",
+    "Profile picture" : "프로필 사진",
+    "Upload new" : "새로 업로드",
+    "Select new from Files" : "파일에서 선택",
+    "Remove image" : "그림 삭제",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "png나 jpg를 사용하십시오. 정사각형 형태가 가장 좋지만 잘라낼 수 있습니다.",
+    "Your avatar is provided by your original account." : "원본 계정의 아바타를 사용합니다.",
+    "Cancel" : "취소",
+    "Choose as profile image" : "프로필 이미지로 사용",
+    "Language" : "언어",
+    "Help translate" : "번역 돕기",
+    "Import Root Certificate" : "루트 인증서 가져오기",
+    "The encryption app is no longer enabled, please decrypt all your files" : "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
+    "Log-in password" : "로그인 암호",
+    "Decrypt all Files" : "모든 파일 복호화",
+    "Restore Encryption Keys" : "암호화 키 복원",
+    "Delete Encryption Keys" : "암호화 키 삭제",
+    "Login Name" : "로그인 이름",
+    "Create" : "만들기",
+    "Admin Recovery Password" : "관리자 복구 암호",
+    "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
+    "Search Users and Groups" : "사용자와 그룹 검색",
+    "Add Group" : "그룹 추가",
+    "Group" : "그룹",
+    "Admins" : "관리자",
+    "Default Quota" : "기본 할당량",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
+    "Unlimited" : "무제한",
+    "Other" : "기타",
+    "Username" : "사용자 이름",
+    "Quota" : "할당량",
+    "Last Login" : "마지막 로그인",
+    "change full name" : "전체 이름 변경",
+    "set new password" : "새 암호 설정",
+    "Default" : "기본값"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
new file mode 100644
index 00000000000..860946e7b91
--- /dev/null
+++ b/settings/l10n/ko.json
@@ -0,0 +1,173 @@
+{ "translations": {
+    "Enabled" : "활성화",
+    "Authentication error" : "인증 오류",
+    "Your full name has been changed." : "전체 이름이 변경되었습니다.",
+    "Unable to change full name" : "전체 이름을 변경할 수 없음",
+    "Group already exists" : "그룹이 이미 존재함",
+    "Unable to add group" : "그룹을 추가할 수 없음",
+    "Couldn't remove app." : "앱을 제거할수 없습니다.",
+    "Email saved" : "이메일 저장됨",
+    "Invalid email" : "잘못된 이메일 주소",
+    "Unable to delete group" : "그룹을 삭제할 수 없음",
+    "Unable to delete user" : "사용자를 삭제할 수 없음.",
+    "Backups restored successfully" : "성공적으로 백업을 복원했습니다",
+    "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." : "앱을 업데이트할 수 없습니다.",
+    "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." : "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.",
+    "Unable to change password" : "암호를 변경할 수 없음",
+    "Saved" : "저장됨",
+    "Email sent" : "이메일 발송됨",
+    "Sending..." : "보내는 중...",
+    "All" : "모두",
+    "Please wait...." : "기다려 주십시오....",
+    "Error while disabling app" : "앱을 비활성화하는 중 오류 발생",
+    "Disable" : "사용 안함",
+    "Enable" : "사용함",
+    "Error while enabling app" : "앱을 활성화하는 중 오류 발생",
+    "Updating...." : "업데이트 중....",
+    "Error while updating app" : "앱을 업데이트하는 중 오류 발생",
+    "Updated" : "업데이트됨",
+    "Uninstalling ...." : "제거 하는 중 ....",
+    "Error while uninstalling app" : "앱을 제거하는 중 오류 발생",
+    "Uninstall" : "제거",
+    "Select a profile picture" : "프로필 사진 선택",
+    "Very weak password" : "매우 약한 암호",
+    "Weak password" : "약한 암호",
+    "So-so password" : "그저 그런 암호",
+    "Good password" : "좋은 암호",
+    "Strong password" : "강력한 암호",
+    "Delete" : "삭제",
+    "Decrypting files... Please wait, this can take some time." : "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
+    "Groups" : "그룹",
+    "Error creating group" : "그룹을 생성하던 중 오류가 발생하였습니다",
+    "deleted {groupName}" : "{groupName} 삭제됨",
+    "undo" : "실행 취소",
+    "never" : "없음",
+    "deleted {userName}" : "{userName} 삭제됨",
+    "add group" : "그룹 추가",
+    "A valid username must be provided" : "올바른 사용자 이름을 입력해야 함",
+    "Error creating user" : "사용자 생성 오류",
+    "A valid password must be provided" : "올바른 암호를 입력해야 함",
+    "Warning: Home directory for user \"{user}\" already exists" : "경고: 사용자 \"{user}\"의 홈 디렉터리가 이미 존재합니다",
+    "__language_name__" : "한국어",
+    "SSL root certificates" : "SSL 루트 인증서",
+    "Encryption" : "암호화",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
+    "Info, warnings, errors and fatal issues" : "정보, 경고, 오류, 치명적 문제",
+    "Warnings, errors and fatal issues" : "경고, 오류, 치명적 문제",
+    "Errors and fatal issues" : "오류, 치명적 문제",
+    "Fatal issues only" : "치명적 문제만",
+    "None" : "없음",
+    "Login" : "로그인",
+    "NT LAN Manager" : "NT LAN 관리자",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "보안 경고",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "%s에 HTTP로 접근하고 있습니다. 서버에서 HTTPS를 사용하도록 설정하는 것을 추천합니다.",
+    "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." : "데이터 디렉터리와 파일을 인터넷에서 접근할 수도 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오.",
+    "Setup Warning" : "설정 경고",
+    "Database Performance Info" : "데이터베이스 성능 정보",
+    "Module 'fileinfo' missing" : "모듈 'fileinfo'가 없음",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
+    "Your PHP version is outdated" : "PHP 버전이 오래됨",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHP 버전이 오래되었습니다. 오래된 버전은 작동하지 않을 수도 있기 때문에 PHP 5.3.8 이상을 사용하는 것을 추천합니다.",
+    "Locale not working" : "로캘이 작동하지 않음",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "다음 로캘을 지원하도록 시스템 설정을 변경하는 것을 추천합니다: %s",
+    "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
+    "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 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
+    "Sharing" : "공유",
+    "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
+    "Allow public uploads" : "공개 업로드 허용",
+    "Allow resharing" : "재공유 허용",
+    "Security" : "보안",
+    "Enforce HTTPS" : "HTTPS 강제 사용",
+    "Forces the clients to connect to %s via an encrypted connection." : "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
+    "Email Server" : "전자우편 서버",
+    "From address" : "보낸 이 주소",
+    "Authentication method" : "인증 방법",
+    "Authentication required" : "인증 필요함",
+    "Server address" : "서버 주소",
+    "Port" : "포트",
+    "Credentials" : "자격 정보",
+    "SMTP Username" : "SMTP 사용자명",
+    "SMTP Password" : "SMTP 암호",
+    "Test email settings" : "시험용 전자우편 설정",
+    "Send email" : "전자우편 보내기",
+    "Log" : "로그",
+    "Log level" : "로그 단계",
+    "More" : "더 중요함",
+    "Less" : "덜 중요함",
+    "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
+    "by" : "작성:",
+    "Documentation:" : "문서",
+    "User Documentation" : "사용자 문서",
+    "Admin Documentation" : "운영자 문서",
+    "Enable only for specific groups" : "특정 그룹에만 허용",
+    "Uninstall App" : "앱 제거",
+    "Administrator Documentation" : "관리자 문서",
+    "Online Documentation" : "온라인 문서",
+    "Forum" : "포럼",
+    "Bugtracker" : "버그 트래커",
+    "Commercial Support" : "상업용 지원",
+    "Get the apps to sync your files" : "파일 동기화 앱 가져오기",
+    "Show First Run Wizard again" : "첫 실행 마법사 다시 보이기",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
+    "Password" : "암호",
+    "Your password was changed" : "암호가 변경되었습니다",
+    "Unable to change your password" : "암호를 변경할 수 없음",
+    "Current password" : "현재 암호",
+    "New password" : "새 암호",
+    "Change password" : "암호 변경",
+    "Full Name" : "전체 이름",
+    "Email" : "이메일",
+    "Your email address" : "이메일 주소",
+    "Profile picture" : "프로필 사진",
+    "Upload new" : "새로 업로드",
+    "Select new from Files" : "파일에서 선택",
+    "Remove image" : "그림 삭제",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "png나 jpg를 사용하십시오. 정사각형 형태가 가장 좋지만 잘라낼 수 있습니다.",
+    "Your avatar is provided by your original account." : "원본 계정의 아바타를 사용합니다.",
+    "Cancel" : "취소",
+    "Choose as profile image" : "프로필 이미지로 사용",
+    "Language" : "언어",
+    "Help translate" : "번역 돕기",
+    "Import Root Certificate" : "루트 인증서 가져오기",
+    "The encryption app is no longer enabled, please decrypt all your files" : "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
+    "Log-in password" : "로그인 암호",
+    "Decrypt all Files" : "모든 파일 복호화",
+    "Restore Encryption Keys" : "암호화 키 복원",
+    "Delete Encryption Keys" : "암호화 키 삭제",
+    "Login Name" : "로그인 이름",
+    "Create" : "만들기",
+    "Admin Recovery Password" : "관리자 복구 암호",
+    "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
+    "Search Users and Groups" : "사용자와 그룹 검색",
+    "Add Group" : "그룹 추가",
+    "Group" : "그룹",
+    "Admins" : "관리자",
+    "Default Quota" : "기본 할당량",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
+    "Unlimited" : "무제한",
+    "Other" : "기타",
+    "Username" : "사용자 이름",
+    "Quota" : "할당량",
+    "Last Login" : "마지막 로그인",
+    "change full name" : "전체 이름 변경",
+    "set new password" : "새 암호 설정",
+    "Default" : "기본값"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
deleted file mode 100644
index 247460cf82c..00000000000
--- a/settings/l10n/ko.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "활성화",
-"Authentication error" => "인증 오류",
-"Your full name has been changed." => "전체 이름이 변경되었습니다.",
-"Unable to change full name" => "전체 이름을 변경할 수 없음",
-"Group already exists" => "그룹이 이미 존재함",
-"Unable to add group" => "그룹을 추가할 수 없음",
-"Couldn't remove app." => "앱을 제거할수 없습니다.",
-"Email saved" => "이메일 저장됨",
-"Invalid email" => "잘못된 이메일 주소",
-"Unable to delete group" => "그룹을 삭제할 수 없음",
-"Unable to delete user" => "사용자를 삭제할 수 없음.",
-"Backups restored successfully" => "성공적으로 백업을 복원했습니다",
-"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." => "앱을 업데이트할 수 없습니다.",
-"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." => "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.",
-"Unable to change password" => "암호를 변경할 수 없음",
-"Saved" => "저장됨",
-"Email sent" => "이메일 발송됨",
-"Sending..." => "보내는 중...",
-"All" => "모두",
-"Please wait...." => "기다려 주십시오....",
-"Error while disabling app" => "앱을 비활성화하는 중 오류 발생",
-"Disable" => "사용 안함",
-"Enable" => "사용함",
-"Error while enabling app" => "앱을 활성화하는 중 오류 발생",
-"Updating...." => "업데이트 중....",
-"Error while updating app" => "앱을 업데이트하는 중 오류 발생",
-"Updated" => "업데이트됨",
-"Uninstalling ...." => "제거 하는 중 ....",
-"Error while uninstalling app" => "앱을 제거하는 중 오류 발생",
-"Uninstall" => "제거",
-"Select a profile picture" => "프로필 사진 선택",
-"Very weak password" => "매우 약한 암호",
-"Weak password" => "약한 암호",
-"So-so password" => "그저 그런 암호",
-"Good password" => "좋은 암호",
-"Strong password" => "강력한 암호",
-"Delete" => "삭제",
-"Decrypting files... Please wait, this can take some time." => "파일 복호화 중... 시간이 걸릴 수도 있으니 기다려 주십시오.",
-"Groups" => "그룹",
-"Error creating group" => "그룹을 생성하던 중 오류가 발생하였습니다",
-"deleted {groupName}" => "{groupName} 삭제됨",
-"undo" => "실행 취소",
-"never" => "없음",
-"deleted {userName}" => "{userName} 삭제됨",
-"add group" => "그룹 추가",
-"A valid username must be provided" => "올바른 사용자 이름을 입력해야 함",
-"Error creating user" => "사용자 생성 오류",
-"A valid password must be provided" => "올바른 암호를 입력해야 함",
-"Warning: Home directory for user \"{user}\" already exists" => "경고: 사용자 \"{user}\"의 홈 디렉터리가 이미 존재합니다",
-"__language_name__" => "한국어",
-"SSL root certificates" => "SSL 루트 인증서",
-"Encryption" => "암호화",
-"Everything (fatal issues, errors, warnings, info, debug)" => "모두 (치명적 문제, 오류, 경고, 정보, 디버그)",
-"Info, warnings, errors and fatal issues" => "정보, 경고, 오류, 치명적 문제",
-"Warnings, errors and fatal issues" => "경고, 오류, 치명적 문제",
-"Errors and fatal issues" => "오류, 치명적 문제",
-"Fatal issues only" => "치명적 문제만",
-"None" => "없음",
-"Login" => "로그인",
-"NT LAN Manager" => "NT LAN 관리자",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "보안 경고",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s에 HTTP로 접근하고 있습니다. 서버에서 HTTPS를 사용하도록 설정하는 것을 추천합니다.",
-"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." => "데이터 디렉터리와 파일을 인터넷에서 접근할 수도 있습니다. .htaccess 파일이 작동하지 않습니다. 웹 서버 설정을 변경하여 데이터 디렉터리에 접근할 수 없도록 하거나, 웹 서버 문서 경로 외부로 데이터 디렉터리를 옮기십시오.",
-"Setup Warning" => "설정 경고",
-"Database Performance Info" => "데이터베이스 성능 정보",
-"Module 'fileinfo' missing" => "모듈 'fileinfo'가 없음",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP 모듈 'fileinfo'가 존재하지 않습니다. MIME 형식 감지 결과를 향상시키기 위하여 이 모듈을 활성화하는 것을 추천합니다.",
-"Your PHP version is outdated" => "PHP 버전이 오래됨",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP 버전이 오래되었습니다. 오래된 버전은 작동하지 않을 수도 있기 때문에 PHP 5.3.8 이상을 사용하는 것을 추천합니다.",
-"Locale not working" => "로캘이 작동하지 않음",
-"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 to install the required packages on your system to support one of the following locales: %s." => "다음 로캘을 지원하도록 시스템 설정을 변경하는 것을 추천합니다: %s",
-"Please double check the <a href='%s'>installation guides</a>." => "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
-"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 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
-"Sharing" => "공유",
-"Allow apps to use the Share API" => "앱에서 공유 API를 사용할 수 있도록 허용",
-"Allow public uploads" => "공개 업로드 허용",
-"Allow resharing" => "재공유 허용",
-"Security" => "보안",
-"Enforce HTTPS" => "HTTPS 강제 사용",
-"Forces the clients to connect to %s via an encrypted connection." => "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
-"Email Server" => "전자우편 서버",
-"From address" => "보낸 이 주소",
-"Authentication method" => "인증 방법",
-"Authentication required" => "인증 필요함",
-"Server address" => "서버 주소",
-"Port" => "포트",
-"Credentials" => "자격 정보",
-"SMTP Username" => "SMTP 사용자명",
-"SMTP Password" => "SMTP 암호",
-"Test email settings" => "시험용 전자우편 설정",
-"Send email" => "전자우편 보내기",
-"Log" => "로그",
-"Log level" => "로그 단계",
-"More" => "더 중요함",
-"Less" => "덜 중요함",
-"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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 커뮤니티</a>에 의해서 개발되었습니다. <a href=\"https://github.com/owncloud\" target=\"_blank\">원본 코드</a>는 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>에 따라 사용이 허가됩니다.",
-"by" => "작성:",
-"Documentation:" => "문서",
-"User Documentation" => "사용자 문서",
-"Admin Documentation" => "운영자 문서",
-"Enable only for specific groups" => "특정 그룹에만 허용",
-"Uninstall App" => "앱 제거",
-"Administrator Documentation" => "관리자 문서",
-"Online Documentation" => "온라인 문서",
-"Forum" => "포럼",
-"Bugtracker" => "버그 트래커",
-"Commercial Support" => "상업용 지원",
-"Get the apps to sync your files" => "파일 동기화 앱 가져오기",
-"Show First Run Wizard again" => "첫 실행 마법사 다시 보이기",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "현재 공간 중 <strong>%s</strong>/<strong>%s</strong>을(를) 사용 중입니다",
-"Password" => "암호",
-"Your password was changed" => "암호가 변경되었습니다",
-"Unable to change your password" => "암호를 변경할 수 없음",
-"Current password" => "현재 암호",
-"New password" => "새 암호",
-"Change password" => "암호 변경",
-"Full Name" => "전체 이름",
-"Email" => "이메일",
-"Your email address" => "이메일 주소",
-"Profile picture" => "프로필 사진",
-"Upload new" => "새로 업로드",
-"Select new from Files" => "파일에서 선택",
-"Remove image" => "그림 삭제",
-"Either png or jpg. Ideally square but you will be able to crop it." => "png나 jpg를 사용하십시오. 정사각형 형태가 가장 좋지만 잘라낼 수 있습니다.",
-"Your avatar is provided by your original account." => "원본 계정의 아바타를 사용합니다.",
-"Cancel" => "취소",
-"Choose as profile image" => "프로필 이미지로 사용",
-"Language" => "언어",
-"Help translate" => "번역 돕기",
-"Import Root Certificate" => "루트 인증서 가져오기",
-"The encryption app is no longer enabled, please decrypt all your files" => "암호화 앱이 비활성화되었습니다. 모든 파일을 복호화해야 합니다.",
-"Log-in password" => "로그인 암호",
-"Decrypt all Files" => "모든 파일 복호화",
-"Restore Encryption Keys" => "암호화 키 복원",
-"Delete Encryption Keys" => "암호화 키 삭제",
-"Login Name" => "로그인 이름",
-"Create" => "만들기",
-"Admin Recovery Password" => "관리자 복구 암호",
-"Enter the recovery password in order to recover the users files during password change" => "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
-"Search Users and Groups" => "사용자와 그룹 검색",
-"Add Group" => "그룹 추가",
-"Group" => "그룹",
-"Admins" => "관리자",
-"Default Quota" => "기본 할당량",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
-"Unlimited" => "무제한",
-"Other" => "기타",
-"Username" => "사용자 이름",
-"Quota" => "할당량",
-"Last Login" => "마지막 로그인",
-"change full name" => "전체 이름 변경",
-"set new password" => "새 암호 설정",
-"Default" => "기본값"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/ku_IQ.js b/settings/l10n/ku_IQ.js
new file mode 100644
index 00000000000..15cd8c68225
--- /dev/null
+++ b/settings/l10n/ku_IQ.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "داواکارى نادروستە",
+    "Enable" : "چالاککردن",
+    "Encryption" : "نهێنیکردن",
+    "None" : "هیچ",
+    "Login" : "چوونەژوورەوە",
+    "Server address" : "ناونیشانی ڕاژه",
+    "by" : "له‌لایه‌ن",
+    "Password" : "وشەی تێپەربو",
+    "New password" : "وشەی نهێنی نوێ",
+    "Email" : "ئیمه‌یل",
+    "Cancel" : "لابردن",
+    "Login Name" : "چوونەژوورەوە",
+    "Username" : "ناوی به‌کارهێنه‌ر"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ku_IQ.json b/settings/l10n/ku_IQ.json
new file mode 100644
index 00000000000..1e6fe7a51e9
--- /dev/null
+++ b/settings/l10n/ku_IQ.json
@@ -0,0 +1,16 @@
+{ "translations": {
+    "Invalid request" : "داواکارى نادروستە",
+    "Enable" : "چالاککردن",
+    "Encryption" : "نهێنیکردن",
+    "None" : "هیچ",
+    "Login" : "چوونەژوورەوە",
+    "Server address" : "ناونیشانی ڕاژه",
+    "by" : "له‌لایه‌ن",
+    "Password" : "وشەی تێپەربو",
+    "New password" : "وشەی نهێنی نوێ",
+    "Email" : "ئیمه‌یل",
+    "Cancel" : "لابردن",
+    "Login Name" : "چوونەژوورەوە",
+    "Username" : "ناوی به‌کارهێنه‌ر"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ku_IQ.php b/settings/l10n/ku_IQ.php
deleted file mode 100644
index 2a0ca54def8..00000000000
--- a/settings/l10n/ku_IQ.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "داواکارى نادروستە",
-"Enable" => "چالاککردن",
-"Encryption" => "نهێنیکردن",
-"None" => "هیچ",
-"Login" => "چوونەژوورەوە",
-"Server address" => "ناونیشانی ڕاژه",
-"by" => "له‌لایه‌ن",
-"Password" => "وشەی تێپەربو",
-"New password" => "وشەی نهێنی نوێ",
-"Email" => "ئیمه‌یل",
-"Cancel" => "لابردن",
-"Login Name" => "چوونەژوورەوە",
-"Username" => "ناوی به‌کارهێنه‌ر"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lb.js b/settings/l10n/lb.js
new file mode 100644
index 00000000000..d376876593e
--- /dev/null
+++ b/settings/l10n/lb.js
@@ -0,0 +1,52 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Authentifikatioun's Fehler",
+    "Group already exists" : "Group existeiert schon.",
+    "Unable to add group" : "Onmeiglech Grupp beizefügen.",
+    "Email saved" : "E-mail gespäichert",
+    "Invalid email" : "Ongülteg e-mail",
+    "Unable to delete group" : "Onmeiglech d'Grup ze läschen.",
+    "Unable to delete user" : "Onmeiglech User zu läschen.",
+    "Language changed" : "Sprooch huet geännert",
+    "Invalid request" : "Ongülteg Requête",
+    "Admins can't remove themself from the admin group" : "Admins kennen sech selwer net aus enger Admin Group läschen.",
+    "Unable to add user to group %s" : "Onmeiglech User an Grupp ze sätzen %s",
+    "Email sent" : "Email geschéckt",
+    "All" : "All",
+    "Disable" : "Ofschalten",
+    "Enable" : "Aschalten",
+    "Delete" : "Läschen",
+    "Groups" : "Gruppen",
+    "undo" : "réckgängeg man",
+    "never" : "ni",
+    "__language_name__" : "__language_name__",
+    "Login" : "Login",
+    "Security Warning" : "Sécherheets Warnung",
+    "Cron" : "Cron",
+    "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen",
+    "Allow resharing" : "Resharing erlaben",
+    "Server address" : "Server Adress",
+    "Log" : "Log",
+    "More" : "Méi",
+    "Less" : "Manner",
+    "by" : "vun",
+    "Password" : "Passwuert",
+    "Unable to change your password" : "Konnt däin Passwuert net änneren",
+    "Current password" : "Momentan 't Passwuert",
+    "New password" : "Neit Passwuert",
+    "Change password" : "Passwuert änneren",
+    "Email" : "Email",
+    "Your email address" : "Deng Email Adress",
+    "Cancel" : "Ofbriechen",
+    "Language" : "Sprooch",
+    "Help translate" : "Hëllef iwwersetzen",
+    "Login Name" : "Login",
+    "Create" : "Erstellen",
+    "Group" : "Grupp",
+    "Default Quota" : "Standard Quota",
+    "Other" : "Aner",
+    "Username" : "Benotzernumm",
+    "Quota" : "Quota"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/lb.json b/settings/l10n/lb.json
new file mode 100644
index 00000000000..c3124daf851
--- /dev/null
+++ b/settings/l10n/lb.json
@@ -0,0 +1,50 @@
+{ "translations": {
+    "Authentication error" : "Authentifikatioun's Fehler",
+    "Group already exists" : "Group existeiert schon.",
+    "Unable to add group" : "Onmeiglech Grupp beizefügen.",
+    "Email saved" : "E-mail gespäichert",
+    "Invalid email" : "Ongülteg e-mail",
+    "Unable to delete group" : "Onmeiglech d'Grup ze läschen.",
+    "Unable to delete user" : "Onmeiglech User zu läschen.",
+    "Language changed" : "Sprooch huet geännert",
+    "Invalid request" : "Ongülteg Requête",
+    "Admins can't remove themself from the admin group" : "Admins kennen sech selwer net aus enger Admin Group läschen.",
+    "Unable to add user to group %s" : "Onmeiglech User an Grupp ze sätzen %s",
+    "Email sent" : "Email geschéckt",
+    "All" : "All",
+    "Disable" : "Ofschalten",
+    "Enable" : "Aschalten",
+    "Delete" : "Läschen",
+    "Groups" : "Gruppen",
+    "undo" : "réckgängeg man",
+    "never" : "ni",
+    "__language_name__" : "__language_name__",
+    "Login" : "Login",
+    "Security Warning" : "Sécherheets Warnung",
+    "Cron" : "Cron",
+    "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen",
+    "Allow resharing" : "Resharing erlaben",
+    "Server address" : "Server Adress",
+    "Log" : "Log",
+    "More" : "Méi",
+    "Less" : "Manner",
+    "by" : "vun",
+    "Password" : "Passwuert",
+    "Unable to change your password" : "Konnt däin Passwuert net änneren",
+    "Current password" : "Momentan 't Passwuert",
+    "New password" : "Neit Passwuert",
+    "Change password" : "Passwuert änneren",
+    "Email" : "Email",
+    "Your email address" : "Deng Email Adress",
+    "Cancel" : "Ofbriechen",
+    "Language" : "Sprooch",
+    "Help translate" : "Hëllef iwwersetzen",
+    "Login Name" : "Login",
+    "Create" : "Erstellen",
+    "Group" : "Grupp",
+    "Default Quota" : "Standard Quota",
+    "Other" : "Aner",
+    "Username" : "Benotzernumm",
+    "Quota" : "Quota"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
deleted file mode 100644
index 25cd41b29f5..00000000000
--- a/settings/l10n/lb.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Authentifikatioun's Fehler",
-"Group already exists" => "Group existeiert schon.",
-"Unable to add group" => "Onmeiglech Grupp beizefügen.",
-"Email saved" => "E-mail gespäichert",
-"Invalid email" => "Ongülteg e-mail",
-"Unable to delete group" => "Onmeiglech d'Grup ze läschen.",
-"Unable to delete user" => "Onmeiglech User zu läschen.",
-"Language changed" => "Sprooch huet geännert",
-"Invalid request" => "Ongülteg Requête",
-"Admins can't remove themself from the admin group" => "Admins kennen sech selwer net aus enger Admin Group läschen.",
-"Unable to add user to group %s" => "Onmeiglech User an Grupp ze sätzen %s",
-"Email sent" => "Email geschéckt",
-"All" => "All",
-"Disable" => "Ofschalten",
-"Enable" => "Aschalten",
-"Delete" => "Läschen",
-"Groups" => "Gruppen",
-"undo" => "réckgängeg man",
-"never" => "ni",
-"__language_name__" => "__language_name__",
-"Login" => "Login",
-"Security Warning" => "Sécherheets Warnung",
-"Cron" => "Cron",
-"Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
-"Allow resharing" => "Resharing erlaben",
-"Server address" => "Server Adress",
-"Log" => "Log",
-"More" => "Méi",
-"Less" => "Manner",
-"by" => "vun",
-"Password" => "Passwuert",
-"Unable to change your password" => "Konnt däin Passwuert net änneren",
-"Current password" => "Momentan 't Passwuert",
-"New password" => "Neit Passwuert",
-"Change password" => "Passwuert änneren",
-"Email" => "Email",
-"Your email address" => "Deng Email Adress",
-"Cancel" => "Ofbriechen",
-"Language" => "Sprooch",
-"Help translate" => "Hëllef iwwersetzen",
-"Login Name" => "Login",
-"Create" => "Erstellen",
-"Group" => "Grupp",
-"Default Quota" => "Standard Quota",
-"Other" => "Aner",
-"Username" => "Benotzernumm",
-"Quota" => "Quota"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js
new file mode 100644
index 00000000000..977499f0c3f
--- /dev/null
+++ b/settings/l10n/lt_LT.js
@@ -0,0 +1,123 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Įjungta",
+    "Authentication error" : "Autentikacijos klaida",
+    "Group already exists" : "Grupė jau egzistuoja",
+    "Unable to add group" : "Nepavyko pridėti grupės",
+    "Email saved" : "El. paštas išsaugotas",
+    "Invalid email" : "Netinkamas el. paštas",
+    "Unable to delete group" : "Nepavyko ištrinti grupės",
+    "Unable to delete user" : "Nepavyko ištrinti vartotojo",
+    "Language changed" : "Kalba pakeista",
+    "Invalid request" : "Klaidinga užklausa",
+    "Admins can't remove themself from the admin group" : "Administratoriai negali pašalinti savęs iš administratorių grupės",
+    "Unable to add user to group %s" : "Nepavyko pridėti vartotojo prie grupės %s",
+    "Unable to remove user from group %s" : "Nepavyko ištrinti vartotojo iš grupės %s",
+    "Couldn't update app." : "Nepavyko atnaujinti programos.",
+    "Wrong password" : "Neteisingas slaptažodis",
+    "No user supplied" : "Nepateiktas naudotojas",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti",
+    "Wrong admin recovery password. Please check the password and try again." : "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
+    "Unable to change password" : "Nepavyksta pakeisti slaptažodžio",
+    "Email sent" : "Laiškas išsiųstas",
+    "All" : "Viskas",
+    "Please wait...." : "Prašome palaukti...",
+    "Error while disabling app" : "Klaida išjungiant programą",
+    "Disable" : "Išjungti",
+    "Enable" : "Įjungti",
+    "Error while enabling app" : "Klaida įjungiant programą",
+    "Updating...." : "Atnaujinama...",
+    "Error while updating app" : "Įvyko klaida atnaujinant programą",
+    "Updated" : "Atnaujinta",
+    "Select a profile picture" : "Pažymėkite profilio paveikslėlį",
+    "Delete" : "Ištrinti",
+    "Decrypting files... Please wait, this can take some time." : "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
+    "Groups" : "Grupės",
+    "undo" : "anuliuoti",
+    "never" : "niekada",
+    "add group" : "pridėti grupę",
+    "A valid username must be provided" : "Vartotojo vardas turi būti tinkamas",
+    "Error creating user" : "Klaida kuriant vartotoją",
+    "A valid password must be provided" : "Slaptažodis turi būti tinkamas",
+    "Warning: Home directory for user \"{user}\" already exists" : "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja",
+    "__language_name__" : "Lietuvių",
+    "SSL root certificates" : "SSL sertifikatas",
+    "Encryption" : "Šifravimas",
+    "Fatal issues only" : "Tik kritinės problemos",
+    "None" : "Nieko",
+    "Login" : "Prisijungti",
+    "Security Warning" : "Saugumo pranešimas",
+    "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." : "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.",
+    "Setup Warning" : "Nustatyti perspėjimą",
+    "Module 'fileinfo' missing" : "Trūksta 'fileinfo' modulio",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
+    "Locale not working" : "Lokalė neveikia",
+    "Please double check the <a href='%s'>installation guides</a>." : "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
+    "Cron" : "Cron",
+    "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.",
+    "Sharing" : "Dalijimasis",
+    "Allow apps to use the Share API" : "Leidžia programoms naudoti Share API",
+    "Allow public uploads" : "Leisti viešus įkėlimus",
+    "Allow resharing" : "Leisti dalintis",
+    "Security" : "Saugumas",
+    "Enforce HTTPS" : "Reikalauti HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Verčia klientus jungtis prie %s per šifruotą ryšį.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
+    "Server address" : "Serverio adresas",
+    "Port" : "Prievadas",
+    "Log" : "Žurnalas",
+    "Log level" : "Žurnalo išsamumas",
+    "More" : "Daugiau",
+    "Less" : "Mažiau",
+    "Version" : "Versija",
+    "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>." : "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Daugiau programų",
+    "by" : " ",
+    "User Documentation" : "Naudotojo dokumentacija",
+    "Administrator Documentation" : "Administratoriaus dokumentacija",
+    "Online Documentation" : "Dokumentacija tinkle",
+    "Forum" : "Forumas",
+    "Bugtracker" : "Klaidų sekimas",
+    "Commercial Support" : "Komercinis palaikymas",
+    "Get the apps to sync your files" : "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
+    "Show First Run Wizard again" : "Rodyti pirmo karto vedlį dar kartą",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
+    "Password" : "Slaptažodis",
+    "Your password was changed" : "Jūsų slaptažodis buvo pakeistas",
+    "Unable to change your password" : "Neįmanoma pakeisti slaptažodžio",
+    "Current password" : "Dabartinis slaptažodis",
+    "New password" : "Naujas slaptažodis",
+    "Change password" : "Pakeisti slaptažodį",
+    "Full Name" : "Pilnas vardas",
+    "Email" : "El. Paštas",
+    "Your email address" : "Jūsų el. pašto adresas",
+    "Profile picture" : "Profilio paveikslėlis",
+    "Upload new" : "Įkelti naują",
+    "Select new from Files" : "Pasirinkti naują iš failų",
+    "Remove image" : "Pašalinti paveikslėlį",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti.",
+    "Cancel" : "Atšaukti",
+    "Choose as profile image" : "Pasirinkite profilio paveiksliuką",
+    "Language" : "Kalba",
+    "Help translate" : "Padėkite išversti",
+    "Import Root Certificate" : "Įkelti pagrindinį sertifikatą",
+    "Log-in password" : "Prisijungimo slaptažodis",
+    "Decrypt all Files" : "Iššifruoti visus failus",
+    "Login Name" : "Vartotojo vardas",
+    "Create" : "Sukurti",
+    "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
+    "Enter the recovery password in order to recover the users files during password change" : "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
+    "Group" : "Grupė",
+    "Default Quota" : "Numatytoji kvota",
+    "Unlimited" : "Neribota",
+    "Other" : "Kita",
+    "Username" : "Prisijungimo vardas",
+    "Quota" : "Limitas",
+    "change full name" : "keisti pilną vardą",
+    "set new password" : "nustatyti naują slaptažodį",
+    "Default" : "Numatytasis"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
new file mode 100644
index 00000000000..8c8c3856843
--- /dev/null
+++ b/settings/l10n/lt_LT.json
@@ -0,0 +1,121 @@
+{ "translations": {
+    "Enabled" : "Įjungta",
+    "Authentication error" : "Autentikacijos klaida",
+    "Group already exists" : "Grupė jau egzistuoja",
+    "Unable to add group" : "Nepavyko pridėti grupės",
+    "Email saved" : "El. paštas išsaugotas",
+    "Invalid email" : "Netinkamas el. paštas",
+    "Unable to delete group" : "Nepavyko ištrinti grupės",
+    "Unable to delete user" : "Nepavyko ištrinti vartotojo",
+    "Language changed" : "Kalba pakeista",
+    "Invalid request" : "Klaidinga užklausa",
+    "Admins can't remove themself from the admin group" : "Administratoriai negali pašalinti savęs iš administratorių grupės",
+    "Unable to add user to group %s" : "Nepavyko pridėti vartotojo prie grupės %s",
+    "Unable to remove user from group %s" : "Nepavyko ištrinti vartotojo iš grupės %s",
+    "Couldn't update app." : "Nepavyko atnaujinti programos.",
+    "Wrong password" : "Neteisingas slaptažodis",
+    "No user supplied" : "Nepateiktas naudotojas",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti",
+    "Wrong admin recovery password. Please check the password and try again." : "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
+    "Unable to change password" : "Nepavyksta pakeisti slaptažodžio",
+    "Email sent" : "Laiškas išsiųstas",
+    "All" : "Viskas",
+    "Please wait...." : "Prašome palaukti...",
+    "Error while disabling app" : "Klaida išjungiant programą",
+    "Disable" : "Išjungti",
+    "Enable" : "Įjungti",
+    "Error while enabling app" : "Klaida įjungiant programą",
+    "Updating...." : "Atnaujinama...",
+    "Error while updating app" : "Įvyko klaida atnaujinant programą",
+    "Updated" : "Atnaujinta",
+    "Select a profile picture" : "Pažymėkite profilio paveikslėlį",
+    "Delete" : "Ištrinti",
+    "Decrypting files... Please wait, this can take some time." : "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
+    "Groups" : "Grupės",
+    "undo" : "anuliuoti",
+    "never" : "niekada",
+    "add group" : "pridėti grupę",
+    "A valid username must be provided" : "Vartotojo vardas turi būti tinkamas",
+    "Error creating user" : "Klaida kuriant vartotoją",
+    "A valid password must be provided" : "Slaptažodis turi būti tinkamas",
+    "Warning: Home directory for user \"{user}\" already exists" : "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja",
+    "__language_name__" : "Lietuvių",
+    "SSL root certificates" : "SSL sertifikatas",
+    "Encryption" : "Šifravimas",
+    "Fatal issues only" : "Tik kritinės problemos",
+    "None" : "Nieko",
+    "Login" : "Prisijungti",
+    "Security Warning" : "Saugumo pranešimas",
+    "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." : "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.",
+    "Setup Warning" : "Nustatyti perspėjimą",
+    "Module 'fileinfo' missing" : "Trūksta 'fileinfo' modulio",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
+    "Locale not working" : "Lokalė neveikia",
+    "Please double check the <a href='%s'>installation guides</a>." : "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
+    "Cron" : "Cron",
+    "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.",
+    "Sharing" : "Dalijimasis",
+    "Allow apps to use the Share API" : "Leidžia programoms naudoti Share API",
+    "Allow public uploads" : "Leisti viešus įkėlimus",
+    "Allow resharing" : "Leisti dalintis",
+    "Security" : "Saugumas",
+    "Enforce HTTPS" : "Reikalauti HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Verčia klientus jungtis prie %s per šifruotą ryšį.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
+    "Server address" : "Serverio adresas",
+    "Port" : "Prievadas",
+    "Log" : "Žurnalas",
+    "Log level" : "Žurnalo išsamumas",
+    "More" : "Daugiau",
+    "Less" : "Mažiau",
+    "Version" : "Versija",
+    "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>." : "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Daugiau programų",
+    "by" : " ",
+    "User Documentation" : "Naudotojo dokumentacija",
+    "Administrator Documentation" : "Administratoriaus dokumentacija",
+    "Online Documentation" : "Dokumentacija tinkle",
+    "Forum" : "Forumas",
+    "Bugtracker" : "Klaidų sekimas",
+    "Commercial Support" : "Komercinis palaikymas",
+    "Get the apps to sync your files" : "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
+    "Show First Run Wizard again" : "Rodyti pirmo karto vedlį dar kartą",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
+    "Password" : "Slaptažodis",
+    "Your password was changed" : "Jūsų slaptažodis buvo pakeistas",
+    "Unable to change your password" : "Neįmanoma pakeisti slaptažodžio",
+    "Current password" : "Dabartinis slaptažodis",
+    "New password" : "Naujas slaptažodis",
+    "Change password" : "Pakeisti slaptažodį",
+    "Full Name" : "Pilnas vardas",
+    "Email" : "El. Paštas",
+    "Your email address" : "Jūsų el. pašto adresas",
+    "Profile picture" : "Profilio paveikslėlis",
+    "Upload new" : "Įkelti naują",
+    "Select new from Files" : "Pasirinkti naują iš failų",
+    "Remove image" : "Pašalinti paveikslėlį",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti.",
+    "Cancel" : "Atšaukti",
+    "Choose as profile image" : "Pasirinkite profilio paveiksliuką",
+    "Language" : "Kalba",
+    "Help translate" : "Padėkite išversti",
+    "Import Root Certificate" : "Įkelti pagrindinį sertifikatą",
+    "Log-in password" : "Prisijungimo slaptažodis",
+    "Decrypt all Files" : "Iššifruoti visus failus",
+    "Login Name" : "Vartotojo vardas",
+    "Create" : "Sukurti",
+    "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
+    "Enter the recovery password in order to recover the users files during password change" : "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
+    "Group" : "Grupė",
+    "Default Quota" : "Numatytoji kvota",
+    "Unlimited" : "Neribota",
+    "Other" : "Kita",
+    "Username" : "Prisijungimo vardas",
+    "Quota" : "Limitas",
+    "change full name" : "keisti pilną vardą",
+    "set new password" : "nustatyti naują slaptažodį",
+    "Default" : "Numatytasis"
+},"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/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
deleted file mode 100644
index 9a08ccb55a4..00000000000
--- a/settings/l10n/lt_LT.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Įjungta",
-"Authentication error" => "Autentikacijos klaida",
-"Group already exists" => "Grupė jau egzistuoja",
-"Unable to add group" => "Nepavyko pridėti grupės",
-"Email saved" => "El. paštas išsaugotas",
-"Invalid email" => "Netinkamas el. paštas",
-"Unable to delete group" => "Nepavyko ištrinti grupės",
-"Unable to delete user" => "Nepavyko ištrinti vartotojo",
-"Language changed" => "Kalba pakeista",
-"Invalid request" => "Klaidinga užklausa",
-"Admins can't remove themself from the admin group" => "Administratoriai negali pašalinti savęs iš administratorių grupės",
-"Unable to add user to group %s" => "Nepavyko pridėti vartotojo prie grupės %s",
-"Unable to remove user from group %s" => "Nepavyko ištrinti vartotojo iš grupės %s",
-"Couldn't update app." => "Nepavyko atnaujinti programos.",
-"Wrong password" => "Neteisingas slaptažodis",
-"No user supplied" => "Nepateiktas naudotojas",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Prašome įvesti administratoriaus atkūrimo slaptažodį, kitaip visi naudotojo suomenys bus prarasti",
-"Wrong admin recovery password. Please check the password and try again." => "Netinkamas administratoriau atkūrimo slaptažodis. Prašome pasitikrinti ir bandyti vėl.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
-"Unable to change password" => "Nepavyksta pakeisti slaptažodžio",
-"Email sent" => "Laiškas išsiųstas",
-"All" => "Viskas",
-"Please wait...." => "Prašome palaukti...",
-"Error while disabling app" => "Klaida išjungiant programą",
-"Disable" => "Išjungti",
-"Enable" => "Įjungti",
-"Error while enabling app" => "Klaida įjungiant programą",
-"Updating...." => "Atnaujinama...",
-"Error while updating app" => "Įvyko klaida atnaujinant programą",
-"Updated" => "Atnaujinta",
-"Select a profile picture" => "Pažymėkite profilio paveikslėlį",
-"Delete" => "Ištrinti",
-"Decrypting files... Please wait, this can take some time." => "Iššifruojami failai... Prašome palaukti, tai gali užtrukti.",
-"Groups" => "Grupės",
-"undo" => "anuliuoti",
-"never" => "niekada",
-"add group" => "pridėti grupę",
-"A valid username must be provided" => "Vartotojo vardas turi būti tinkamas",
-"Error creating user" => "Klaida kuriant vartotoją",
-"A valid password must be provided" => "Slaptažodis turi būti tinkamas",
-"Warning: Home directory for user \"{user}\" already exists" => "Įspėjimas: Vartotojo \"{user}\" namų aplankas jau egzistuoja",
-"__language_name__" => "Lietuvių",
-"SSL root certificates" => "SSL sertifikatas",
-"Encryption" => "Šifravimas",
-"Fatal issues only" => "Tik kritinės problemos",
-"None" => "Nieko",
-"Login" => "Prisijungti",
-"Security Warning" => "Saugumo pranešimas",
-"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." => "Jūsų duomenų katalogas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess neveikia. Mes labai rekomenduojame sukonfigūruoti serverį taip, kad katalogas nebūtų daugiau pasiekiamas, arba iškelkite duomenis kitur iš webserverio šakninio aplanko.",
-"Setup Warning" => "Nustatyti perspėjimą",
-"Module 'fileinfo' missing" => "Trūksta 'fileinfo' modulio",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
-"Locale not working" => "Lokalė neveikia",
-"Please double check the <a href='%s'>installation guides</a>." => "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
-"Cron" => "Cron",
-"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.",
-"Sharing" => "Dalijimasis",
-"Allow apps to use the Share API" => "Leidžia programoms naudoti Share API",
-"Allow public uploads" => "Leisti viešus įkėlimus",
-"Allow resharing" => "Leisti dalintis",
-"Security" => "Saugumas",
-"Enforce HTTPS" => "Reikalauti HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Verčia klientus jungtis prie %s per šifruotą ryšį.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
-"Server address" => "Serverio adresas",
-"Port" => "Prievadas",
-"Log" => "Žurnalas",
-"Log level" => "Žurnalo išsamumas",
-"More" => "Daugiau",
-"Less" => "Mažiau",
-"Version" => "Versija",
-"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>." => "Sukurta <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud bendruomenės</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">pirminis kodas</a> platinamas pagal <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Daugiau programų",
-"by" => " ",
-"User Documentation" => "Naudotojo dokumentacija",
-"Administrator Documentation" => "Administratoriaus dokumentacija",
-"Online Documentation" => "Dokumentacija tinkle",
-"Forum" => "Forumas",
-"Bugtracker" => "Klaidų sekimas",
-"Commercial Support" => "Komercinis palaikymas",
-"Get the apps to sync your files" => "Atsisiųskite programėlių, kad sinchronizuotumėte savo failus",
-"Show First Run Wizard again" => "Rodyti pirmo karto vedlį dar kartą",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs naudojate <strong>%s</strong> iš galimų <strong>%s</strong>",
-"Password" => "Slaptažodis",
-"Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
-"Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
-"Current password" => "Dabartinis slaptažodis",
-"New password" => "Naujas slaptažodis",
-"Change password" => "Pakeisti slaptažodį",
-"Full Name" => "Pilnas vardas",
-"Email" => "El. Paštas",
-"Your email address" => "Jūsų el. pašto adresas",
-"Profile picture" => "Profilio paveikslėlis",
-"Upload new" => "Įkelti naują",
-"Select new from Files" => "Pasirinkti naują iš failų",
-"Remove image" => "Pašalinti paveikslėlį",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Arba png arba jpg. Geriausia kvadratinį, bet galėsite jį apkarpyti.",
-"Cancel" => "Atšaukti",
-"Choose as profile image" => "Pasirinkite profilio paveiksliuką",
-"Language" => "Kalba",
-"Help translate" => "Padėkite išversti",
-"Import Root Certificate" => "Įkelti pagrindinį sertifikatą",
-"Log-in password" => "Prisijungimo slaptažodis",
-"Decrypt all Files" => "Iššifruoti visus failus",
-"Login Name" => "Vartotojo vardas",
-"Create" => "Sukurti",
-"Admin Recovery Password" => "Administracinis atkūrimo slaptažodis",
-"Enter the recovery password in order to recover the users files during password change" => "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
-"Group" => "Grupė",
-"Default Quota" => "Numatytoji kvota",
-"Unlimited" => "Neribota",
-"Other" => "Kita",
-"Username" => "Prisijungimo vardas",
-"Quota" => "Limitas",
-"change full name" => "keisti pilną vardą",
-"set new password" => "nustatyti naują slaptažodį",
-"Default" => "Numatytasis"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
new file mode 100644
index 00000000000..2b385446757
--- /dev/null
+++ b/settings/l10n/lv.js
@@ -0,0 +1,103 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Autentifikācijas kļūda",
+    "Group already exists" : "Grupa jau eksistē",
+    "Unable to add group" : "Nevar pievienot grupu",
+    "Email saved" : "E-pasts tika saglabāts",
+    "Invalid email" : "Nederīgs epasts",
+    "Unable to delete group" : "Nevar izdzēst grupu",
+    "Unable to delete user" : "Nevar izdzēst lietotāju",
+    "Language changed" : "Valoda tika nomainīta",
+    "Invalid request" : "Nederīgs vaicājums",
+    "Admins can't remove themself from the admin group" : "Administratori nevar izņemt paši sevi no administratoru grupas",
+    "Unable to add user to group %s" : "Nevar pievienot lietotāju grupai %s",
+    "Unable to remove user from group %s" : "Nevar izņemt lietotāju no grupas %s",
+    "Couldn't update app." : "Nevarēja atjaunināt lietotni.",
+    "Email sent" : "Vēstule nosūtīta",
+    "All" : "Visi",
+    "Please wait...." : "Lūdzu, uzgaidiet....",
+    "Disable" : "Deaktivēt",
+    "Enable" : "Aktivēt",
+    "Updating...." : "Atjaunina....",
+    "Error while updating app" : "Kļūda, atjauninot lietotni",
+    "Updated" : "Atjaunināta",
+    "Delete" : "Dzēst",
+    "Decrypting files... Please wait, this can take some time." : "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
+    "Groups" : "Grupas",
+    "undo" : "atsaukt",
+    "never" : "nekad",
+    "add group" : "pievienot grupu",
+    "A valid username must be provided" : "Jānorāda derīgs lietotājvārds",
+    "Error creating user" : "Kļūda, veidojot lietotāju",
+    "A valid password must be provided" : "Jānorāda derīga parole",
+    "__language_name__" : "__valodas_nosaukums__",
+    "SSL root certificates" : "SSL saknes sertifikāti",
+    "Encryption" : "Šifrēšana",
+    "None" : "Nav",
+    "Login" : "Ierakstīties",
+    "Security Warning" : "Brīdinājums par drošību",
+    "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." : "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes.",
+    "Setup Warning" : "Iestatīšanas brīdinājums",
+    "Module 'fileinfo' missing" : "Trūkst modulis “fileinfo”",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
+    "Locale not working" : "Lokāle nestrādā",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+    "Sharing" : "Dalīšanās",
+    "Allow apps to use the Share API" : "Ļauj lietotnēm izmantot koplietošanas API",
+    "Allow public uploads" : "Atļaut publisko augšupielādi",
+    "Allow resharing" : "Atļaut atkārtotu koplietošanu",
+    "Security" : "Drošība",
+    "Enforce HTTPS" : "Uzspiest HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
+    "Server address" : "Servera adrese",
+    "Port" : "Ports",
+    "Credentials" : "Akreditācijas dati",
+    "Log" : "Žurnāls",
+    "Log level" : "Žurnāla līmenis",
+    "More" : "Vairāk",
+    "Less" : "Mazāk",
+    "Version" : "Versija",
+    "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>." : "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Vairāk programmu",
+    "by" : "līdz",
+    "User Documentation" : "Lietotāja dokumentācija",
+    "Administrator Documentation" : "Administratora dokumentācija",
+    "Online Documentation" : "Tiešsaistes dokumentācija",
+    "Forum" : "Forums",
+    "Bugtracker" : "Kļūdu sekotājs",
+    "Commercial Support" : "Komerciālais atbalsts",
+    "Get the apps to sync your files" : "Saņem lietotnes, lai sinhronizētu savas datnes",
+    "Show First Run Wizard again" : "Vēlreiz rādīt pirmās palaišanas vedni",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
+    "Password" : "Parole",
+    "Your password was changed" : "Jūru parole tika nomainīta",
+    "Unable to change your password" : "Nevar nomainīt jūsu paroli",
+    "Current password" : "Pašreizējā parole",
+    "New password" : "Jauna parole",
+    "Change password" : "Mainīt paroli",
+    "Email" : "E-pasts",
+    "Your email address" : "Jūsu e-pasta adrese",
+    "Cancel" : "Atcelt",
+    "Language" : "Valoda",
+    "Help translate" : "Palīdzi tulkot",
+    "Import Root Certificate" : "Importēt saknes sertifikātus",
+    "Log-in password" : "Pieslēgšanās parole",
+    "Decrypt all Files" : "Atšifrēt visus failus",
+    "Login Name" : "Ierakstīšanās vārds",
+    "Create" : "Izveidot",
+    "Admin Recovery Password" : "Administratora atgūšanas parole",
+    "Enter the recovery password in order to recover the users files during password change" : "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
+    "Group" : "Grupa",
+    "Default Quota" : "Apjoms pēc noklusējuma",
+    "Unlimited" : "Neierobežota",
+    "Other" : "Cits",
+    "Username" : "Lietotājvārds",
+    "Quota" : "Apjoms",
+    "set new password" : "iestatīt jaunu paroli",
+    "Default" : "Noklusējuma"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
new file mode 100644
index 00000000000..ae176475a4f
--- /dev/null
+++ b/settings/l10n/lv.json
@@ -0,0 +1,101 @@
+{ "translations": {
+    "Authentication error" : "Autentifikācijas kļūda",
+    "Group already exists" : "Grupa jau eksistē",
+    "Unable to add group" : "Nevar pievienot grupu",
+    "Email saved" : "E-pasts tika saglabāts",
+    "Invalid email" : "Nederīgs epasts",
+    "Unable to delete group" : "Nevar izdzēst grupu",
+    "Unable to delete user" : "Nevar izdzēst lietotāju",
+    "Language changed" : "Valoda tika nomainīta",
+    "Invalid request" : "Nederīgs vaicājums",
+    "Admins can't remove themself from the admin group" : "Administratori nevar izņemt paši sevi no administratoru grupas",
+    "Unable to add user to group %s" : "Nevar pievienot lietotāju grupai %s",
+    "Unable to remove user from group %s" : "Nevar izņemt lietotāju no grupas %s",
+    "Couldn't update app." : "Nevarēja atjaunināt lietotni.",
+    "Email sent" : "Vēstule nosūtīta",
+    "All" : "Visi",
+    "Please wait...." : "Lūdzu, uzgaidiet....",
+    "Disable" : "Deaktivēt",
+    "Enable" : "Aktivēt",
+    "Updating...." : "Atjaunina....",
+    "Error while updating app" : "Kļūda, atjauninot lietotni",
+    "Updated" : "Atjaunināta",
+    "Delete" : "Dzēst",
+    "Decrypting files... Please wait, this can take some time." : "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
+    "Groups" : "Grupas",
+    "undo" : "atsaukt",
+    "never" : "nekad",
+    "add group" : "pievienot grupu",
+    "A valid username must be provided" : "Jānorāda derīgs lietotājvārds",
+    "Error creating user" : "Kļūda, veidojot lietotāju",
+    "A valid password must be provided" : "Jānorāda derīga parole",
+    "__language_name__" : "__valodas_nosaukums__",
+    "SSL root certificates" : "SSL saknes sertifikāti",
+    "Encryption" : "Šifrēšana",
+    "None" : "Nav",
+    "Login" : "Ierakstīties",
+    "Security Warning" : "Brīdinājums par drošību",
+    "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." : "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes.",
+    "Setup Warning" : "Iestatīšanas brīdinājums",
+    "Module 'fileinfo' missing" : "Trūkst modulis “fileinfo”",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
+    "Locale not working" : "Lokāle nestrādā",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
+    "Sharing" : "Dalīšanās",
+    "Allow apps to use the Share API" : "Ļauj lietotnēm izmantot koplietošanas API",
+    "Allow public uploads" : "Atļaut publisko augšupielādi",
+    "Allow resharing" : "Atļaut atkārtotu koplietošanu",
+    "Security" : "Drošība",
+    "Enforce HTTPS" : "Uzspiest HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
+    "Server address" : "Servera adrese",
+    "Port" : "Ports",
+    "Credentials" : "Akreditācijas dati",
+    "Log" : "Žurnāls",
+    "Log level" : "Žurnāla līmenis",
+    "More" : "Vairāk",
+    "Less" : "Mazāk",
+    "Version" : "Versija",
+    "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>." : "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Vairāk programmu",
+    "by" : "līdz",
+    "User Documentation" : "Lietotāja dokumentācija",
+    "Administrator Documentation" : "Administratora dokumentācija",
+    "Online Documentation" : "Tiešsaistes dokumentācija",
+    "Forum" : "Forums",
+    "Bugtracker" : "Kļūdu sekotājs",
+    "Commercial Support" : "Komerciālais atbalsts",
+    "Get the apps to sync your files" : "Saņem lietotnes, lai sinhronizētu savas datnes",
+    "Show First Run Wizard again" : "Vēlreiz rādīt pirmās palaišanas vedni",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
+    "Password" : "Parole",
+    "Your password was changed" : "Jūru parole tika nomainīta",
+    "Unable to change your password" : "Nevar nomainīt jūsu paroli",
+    "Current password" : "Pašreizējā parole",
+    "New password" : "Jauna parole",
+    "Change password" : "Mainīt paroli",
+    "Email" : "E-pasts",
+    "Your email address" : "Jūsu e-pasta adrese",
+    "Cancel" : "Atcelt",
+    "Language" : "Valoda",
+    "Help translate" : "Palīdzi tulkot",
+    "Import Root Certificate" : "Importēt saknes sertifikātus",
+    "Log-in password" : "Pieslēgšanās parole",
+    "Decrypt all Files" : "Atšifrēt visus failus",
+    "Login Name" : "Ierakstīšanās vārds",
+    "Create" : "Izveidot",
+    "Admin Recovery Password" : "Administratora atgūšanas parole",
+    "Enter the recovery password in order to recover the users files during password change" : "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
+    "Group" : "Grupa",
+    "Default Quota" : "Apjoms pēc noklusējuma",
+    "Unlimited" : "Neierobežota",
+    "Other" : "Cits",
+    "Username" : "Lietotājvārds",
+    "Quota" : "Apjoms",
+    "set new password" : "iestatīt jaunu paroli",
+    "Default" : "Noklusējuma"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
deleted file mode 100644
index f1c38f60e19..00000000000
--- a/settings/l10n/lv.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Autentifikācijas kļūda",
-"Group already exists" => "Grupa jau eksistē",
-"Unable to add group" => "Nevar pievienot grupu",
-"Email saved" => "E-pasts tika saglabāts",
-"Invalid email" => "Nederīgs epasts",
-"Unable to delete group" => "Nevar izdzēst grupu",
-"Unable to delete user" => "Nevar izdzēst lietotāju",
-"Language changed" => "Valoda tika nomainīta",
-"Invalid request" => "Nederīgs vaicājums",
-"Admins can't remove themself from the admin group" => "Administratori nevar izņemt paši sevi no administratoru grupas",
-"Unable to add user to group %s" => "Nevar pievienot lietotāju grupai %s",
-"Unable to remove user from group %s" => "Nevar izņemt lietotāju no grupas %s",
-"Couldn't update app." => "Nevarēja atjaunināt lietotni.",
-"Email sent" => "Vēstule nosūtīta",
-"All" => "Visi",
-"Please wait...." => "Lūdzu, uzgaidiet....",
-"Disable" => "Deaktivēt",
-"Enable" => "Aktivēt",
-"Updating...." => "Atjaunina....",
-"Error while updating app" => "Kļūda, atjauninot lietotni",
-"Updated" => "Atjaunināta",
-"Delete" => "Dzēst",
-"Decrypting files... Please wait, this can take some time." => "Atšifrēju failus... Uzgaidiet tas var ilgt kādu laiku.",
-"Groups" => "Grupas",
-"undo" => "atsaukt",
-"never" => "nekad",
-"add group" => "pievienot grupu",
-"A valid username must be provided" => "Jānorāda derīgs lietotājvārds",
-"Error creating user" => "Kļūda, veidojot lietotāju",
-"A valid password must be provided" => "Jānorāda derīga parole",
-"__language_name__" => "__valodas_nosaukums__",
-"SSL root certificates" => "SSL saknes sertifikāti",
-"Encryption" => "Šifrēšana",
-"None" => "Nav",
-"Login" => "Ierakstīties",
-"Security Warning" => "Brīdinājums par drošību",
-"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." => "Jūsu datu direktorija un faili visticamāk ir pieejami no interneta. .htaccess fails nedarbojas. Ir rekomendēts konfigurēt serveri tā lai jūsu datu direktorija nav lasāma vai pārvietot to ārpus tīmekļa servera dokumentu mapes.",
-"Setup Warning" => "Iestatīšanas brīdinājums",
-"Module 'fileinfo' missing" => "Trūkst modulis “fileinfo”",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
-"Locale not working" => "Lokāle nestrādā",
-"Please double check the <a href='%s'>installation guides</a>." => "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
-"Sharing" => "Dalīšanās",
-"Allow apps to use the Share API" => "Ļauj lietotnēm izmantot koplietošanas API",
-"Allow public uploads" => "Atļaut publisko augšupielādi",
-"Allow resharing" => "Atļaut atkārtotu koplietošanu",
-"Security" => "Drošība",
-"Enforce HTTPS" => "Uzspiest HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
-"Server address" => "Servera adrese",
-"Port" => "Ports",
-"Credentials" => "Akreditācijas dati",
-"Log" => "Žurnāls",
-"Log level" => "Žurnāla līmenis",
-"More" => "Vairāk",
-"Less" => "Mazāk",
-"Version" => "Versija",
-"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>." => "Izstrādājusi<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kopiena</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">pirmkodu</a>kurš ir licencēts zem <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Vairāk programmu",
-"by" => "līdz",
-"User Documentation" => "Lietotāja dokumentācija",
-"Administrator Documentation" => "Administratora dokumentācija",
-"Online Documentation" => "Tiešsaistes dokumentācija",
-"Forum" => "Forums",
-"Bugtracker" => "Kļūdu sekotājs",
-"Commercial Support" => "Komerciālais atbalsts",
-"Get the apps to sync your files" => "Saņem lietotnes, lai sinhronizētu savas datnes",
-"Show First Run Wizard again" => "Vēlreiz rādīt pirmās palaišanas vedni",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Jūs lietojat <strong>%s</strong> no pieejamajiem <strong>%s</strong>",
-"Password" => "Parole",
-"Your password was changed" => "Jūru parole tika nomainīta",
-"Unable to change your password" => "Nevar nomainīt jūsu paroli",
-"Current password" => "Pašreizējā parole",
-"New password" => "Jauna parole",
-"Change password" => "Mainīt paroli",
-"Email" => "E-pasts",
-"Your email address" => "Jūsu e-pasta adrese",
-"Cancel" => "Atcelt",
-"Language" => "Valoda",
-"Help translate" => "Palīdzi tulkot",
-"Import Root Certificate" => "Importēt saknes sertifikātus",
-"Log-in password" => "Pieslēgšanās parole",
-"Decrypt all Files" => "Atšifrēt visus failus",
-"Login Name" => "Ierakstīšanās vārds",
-"Create" => "Izveidot",
-"Admin Recovery Password" => "Administratora atgūšanas parole",
-"Enter the recovery password in order to recover the users files during password change" => "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
-"Group" => "Grupa",
-"Default Quota" => "Apjoms pēc noklusējuma",
-"Unlimited" => "Neierobežota",
-"Other" => "Cits",
-"Username" => "Lietotājvārds",
-"Quota" => "Apjoms",
-"set new password" => "iestatīt jaunu paroli",
-"Default" => "Noklusējuma"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);";
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
new file mode 100644
index 00000000000..f8417ce6714
--- /dev/null
+++ b/settings/l10n/mk.js
@@ -0,0 +1,168 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Овозможен",
+    "Authentication error" : "Грешка во автентикација",
+    "Your full name has been changed." : "Вашето целосно име е променето.",
+    "Unable to change full name" : "Не можам да го променам целото име",
+    "Group already exists" : "Групата веќе постои",
+    "Unable to add group" : "Неможе да додадам група",
+    "Files decrypted successfully" : "Датотектие се успешно декриптирани",
+    "Encryption keys deleted permanently" : "Енкрипциските клучеви се трајно избришани",
+    "Email saved" : "Електронската пошта е снимена",
+    "Invalid email" : "Неисправна електронска пошта",
+    "Unable to delete group" : "Неможе да избришам група",
+    "Unable to delete user" : "Неможам да избришам корисник",
+    "Backups restored successfully" : "Бекапите се успешно реставрирани",
+    "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." : "Не можам да ја надградам апликацијата.",
+    "Wrong password" : "Погрешна лозинка",
+    "No user supplied" : "Нема корисничко име",
+    "Unable to change password" : "Вашата лозинка неможе да се смени",
+    "Saved" : "Снимено",
+    "test email settings" : "провери ги нагодувањата за електронска пошта",
+    "Email sent" : "Е-порака пратена",
+    "Sending..." : "Испраќам...",
+    "All" : "Сите",
+    "Please wait...." : "Ве молам почекајте ...",
+    "Error while disabling app" : "Грешка при исклучувањето на апликацијата",
+    "Disable" : "Оневозможи",
+    "Enable" : "Овозможи",
+    "Error while enabling app" : "Грешка при вклучувањето на апликацијата",
+    "Updating...." : "Надградувам ...",
+    "Error while updating app" : "Грешка додека ја надградувам апликацијата",
+    "Updated" : "Надграден",
+    "Select a profile picture" : "Одбери фотографија за профилот",
+    "Very weak password" : "Многу слаба лозинка",
+    "Weak password" : "Слаба лозинка",
+    "So-so password" : "Така така лозинка",
+    "Good password" : "Добра лозинка",
+    "Strong password" : "Јака лозинка",
+    "Delete" : "Избриши",
+    "Delete encryption keys permanently." : "Трајно бришење на енкрипциските клучеви.",
+    "Restore encryption keys." : "Поврати ги енкрипцисиките клучеви.",
+    "Groups" : "Групи",
+    "Error creating group" : "Грешка при креирање на група",
+    "A valid group name must be provided" : "Мора да се обезбеди валидно име на група",
+    "undo" : "врати",
+    "never" : "никогаш",
+    "add group" : "додади група",
+    "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ",
+    "Error creating user" : "Грешка при креирање на корисникот",
+    "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root сертификати",
+    "Encryption" : "Енкрипција",
+    "Info, warnings, errors and fatal issues" : "Информации, предупредувања, грешки и фатални работи",
+    "Warnings, errors and fatal issues" : "Предупредувања, грешки и фатални работи",
+    "Errors and fatal issues" : "Грешки и фатални работи",
+    "Fatal issues only" : "Само фатални работи",
+    "None" : "Ништо",
+    "Login" : "Најава",
+    "Plain" : "Чиста",
+    "NT LAN Manager" : "NT LAN Менаџер",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Безбедносно предупредување",
+    "Setup Warning" : "Предупредување при подесување",
+    "Database Performance Info" : "Информација за перформансите на базата на податоци",
+    "Your PHP version is outdated" : "Вашаа верзија на PHP е застарена",
+    "Locale not working" : "Локалето не функционира",
+    "Cron" : "Крон",
+    "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница",
+    "Sharing" : "Споделување",
+    "Allow apps to use the Share API" : "Дозволете апликациите да го користат API-то за споделување",
+    "Allow users to share via link" : "Допушти корисниците да споделуваат со линкови",
+    "Enforce password protection" : "Наметни заштита на лозинка",
+    "Allow public uploads" : "Дозволи јавен аплоуд",
+    "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" : "Исклучи групи од споделување",
+    "Security" : "Безбедност",
+    "Enforce HTTPS" : "Наметни HTTPS",
+    "Email Server" : "Сервер за електронска пошта",
+    "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.",
+    "Send mode" : "Мод на испраќање",
+    "From address" : "Од адреса",
+    "mail" : "Електронска пошта",
+    "Authentication method" : "Метод на автентификација",
+    "Authentication required" : "Потребна е автентификација",
+    "Server address" : "Адреса на сервер",
+    "Port" : "Порта",
+    "Credentials" : "Акредитиви",
+    "SMTP Username" : "SMTP корисничко име",
+    "SMTP Password" : "SMTP лозинка",
+    "Test email settings" : "Провери ги нагодувањаа за електронска пошта",
+    "Send email" : "Испрати пошта",
+    "Log" : "Записник",
+    "Log level" : "Ниво на логирање",
+    "More" : "Повеќе",
+    "Less" : "Помалку",
+    "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>." : "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "од",
+    "Documentation:" : "Документација:",
+    "User Documentation" : "Корисничка документација",
+    "Admin Documentation" : "Админстраторска документација",
+    "Enable only for specific groups" : "Овозможи само на специфицирани групи",
+    "Administrator Documentation" : "Администраторска документација",
+    "Online Documentation" : "Документација на интернет",
+    "Forum" : "Форум",
+    "Bugtracker" : "Тракер на грешки",
+    "Commercial Support" : "Комерцијална подршка",
+    "Get the apps to sync your files" : "Преземете апликации за синхронизирање на вашите датотеки",
+    "Show First Run Wizard again" : "Прикажи го повторно волшебникот при првото стартување",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>",
+    "Password" : "Лозинка",
+    "Your password was changed" : "Вашата лозинка беше променета.",
+    "Unable to change your password" : "Вашата лозинка неможе да се смени",
+    "Current password" : "Моментална лозинка",
+    "New password" : "Нова лозинка",
+    "Change password" : "Смени лозинка",
+    "Full Name" : "Цело име",
+    "Email" : "Е-пошта",
+    "Your email address" : "Вашата адреса за е-пошта",
+    "Profile picture" : "Фотографија за профил",
+    "Upload new" : "Префрли нова",
+    "Select new from Files" : "Одбери нова од датотеките",
+    "Remove image" : "Отстрани ја фотографијата",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Мора де биде png или jpg. Идеално квадрат, но ќе бидете во можност да ја исечете.",
+    "Your avatar is provided by your original account." : "Вашиот аватар е креиран со вашата оригинална сметка",
+    "Cancel" : "Откажи",
+    "Choose as profile image" : "Одбери фотографија за профилот",
+    "Language" : "Јазик",
+    "Help translate" : "Помогни во преводот",
+    "Import Root Certificate" : "Увези",
+    "Log-in password" : "Лозинка за најавување",
+    "Decrypt all Files" : "Дешифрирај ги сите датотеки",
+    "Restore Encryption Keys" : "Обнови ги енкрипциските клучеви",
+    "Delete Encryption Keys" : "Избриши ги енкрипцисиките клучеви",
+    "Login Name" : "Име за најава",
+    "Create" : "Создај",
+    "Admin Recovery Password" : "Обновување на Admin лозинката",
+    "Search Users and Groups" : "Барај корисници и групи",
+    "Add Group" : "Додади група",
+    "Group" : "Група",
+    "Everyone" : "Секој",
+    "Admins" : "Администратори",
+    "Default Quota" : "Предефинирана квота",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Ве молам внесете квота за просторот (нпр: \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограничено",
+    "Other" : "Останато",
+    "Username" : "Корисничко име",
+    "Quota" : "Квота",
+    "Storage Location" : "Локација на сториџот",
+    "Last Login" : "Последна најава",
+    "change full name" : "промена на целото име",
+    "set new password" : "постави нова лозинка",
+    "Default" : "Предефиниран"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
new file mode 100644
index 00000000000..625f584305d
--- /dev/null
+++ b/settings/l10n/mk.json
@@ -0,0 +1,166 @@
+{ "translations": {
+    "Enabled" : "Овозможен",
+    "Authentication error" : "Грешка во автентикација",
+    "Your full name has been changed." : "Вашето целосно име е променето.",
+    "Unable to change full name" : "Не можам да го променам целото име",
+    "Group already exists" : "Групата веќе постои",
+    "Unable to add group" : "Неможе да додадам група",
+    "Files decrypted successfully" : "Датотектие се успешно декриптирани",
+    "Encryption keys deleted permanently" : "Енкрипциските клучеви се трајно избришани",
+    "Email saved" : "Електронската пошта е снимена",
+    "Invalid email" : "Неисправна електронска пошта",
+    "Unable to delete group" : "Неможе да избришам група",
+    "Unable to delete user" : "Неможам да избришам корисник",
+    "Backups restored successfully" : "Бекапите се успешно реставрирани",
+    "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." : "Не можам да ја надградам апликацијата.",
+    "Wrong password" : "Погрешна лозинка",
+    "No user supplied" : "Нема корисничко име",
+    "Unable to change password" : "Вашата лозинка неможе да се смени",
+    "Saved" : "Снимено",
+    "test email settings" : "провери ги нагодувањата за електронска пошта",
+    "Email sent" : "Е-порака пратена",
+    "Sending..." : "Испраќам...",
+    "All" : "Сите",
+    "Please wait...." : "Ве молам почекајте ...",
+    "Error while disabling app" : "Грешка при исклучувањето на апликацијата",
+    "Disable" : "Оневозможи",
+    "Enable" : "Овозможи",
+    "Error while enabling app" : "Грешка при вклучувањето на апликацијата",
+    "Updating...." : "Надградувам ...",
+    "Error while updating app" : "Грешка додека ја надградувам апликацијата",
+    "Updated" : "Надграден",
+    "Select a profile picture" : "Одбери фотографија за профилот",
+    "Very weak password" : "Многу слаба лозинка",
+    "Weak password" : "Слаба лозинка",
+    "So-so password" : "Така така лозинка",
+    "Good password" : "Добра лозинка",
+    "Strong password" : "Јака лозинка",
+    "Delete" : "Избриши",
+    "Delete encryption keys permanently." : "Трајно бришење на енкрипциските клучеви.",
+    "Restore encryption keys." : "Поврати ги енкрипцисиките клучеви.",
+    "Groups" : "Групи",
+    "Error creating group" : "Грешка при креирање на група",
+    "A valid group name must be provided" : "Мора да се обезбеди валидно име на група",
+    "undo" : "врати",
+    "never" : "никогаш",
+    "add group" : "додади група",
+    "A valid username must be provided" : "Мора да се обезбеди валидно корисничко име ",
+    "Error creating user" : "Грешка при креирање на корисникот",
+    "A valid password must be provided" : "Мора да се обезбеди валидна лозинка",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL root сертификати",
+    "Encryption" : "Енкрипција",
+    "Info, warnings, errors and fatal issues" : "Информации, предупредувања, грешки и фатални работи",
+    "Warnings, errors and fatal issues" : "Предупредувања, грешки и фатални работи",
+    "Errors and fatal issues" : "Грешки и фатални работи",
+    "Fatal issues only" : "Само фатални работи",
+    "None" : "Ништо",
+    "Login" : "Најава",
+    "Plain" : "Чиста",
+    "NT LAN Manager" : "NT LAN Менаџер",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Безбедносно предупредување",
+    "Setup Warning" : "Предупредување при подесување",
+    "Database Performance Info" : "Информација за перформансите на базата на податоци",
+    "Your PHP version is outdated" : "Вашаа верзија на PHP е застарена",
+    "Locale not working" : "Локалето не функционира",
+    "Cron" : "Крон",
+    "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница",
+    "Sharing" : "Споделување",
+    "Allow apps to use the Share API" : "Дозволете апликациите да го користат API-то за споделување",
+    "Allow users to share via link" : "Допушти корисниците да споделуваат со линкови",
+    "Enforce password protection" : "Наметни заштита на лозинка",
+    "Allow public uploads" : "Дозволи јавен аплоуд",
+    "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" : "Исклучи групи од споделување",
+    "Security" : "Безбедност",
+    "Enforce HTTPS" : "Наметни HTTPS",
+    "Email Server" : "Сервер за електронска пошта",
+    "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.",
+    "Send mode" : "Мод на испраќање",
+    "From address" : "Од адреса",
+    "mail" : "Електронска пошта",
+    "Authentication method" : "Метод на автентификација",
+    "Authentication required" : "Потребна е автентификација",
+    "Server address" : "Адреса на сервер",
+    "Port" : "Порта",
+    "Credentials" : "Акредитиви",
+    "SMTP Username" : "SMTP корисничко име",
+    "SMTP Password" : "SMTP лозинка",
+    "Test email settings" : "Провери ги нагодувањаа за електронска пошта",
+    "Send email" : "Испрати пошта",
+    "Log" : "Записник",
+    "Log level" : "Ниво на логирање",
+    "More" : "Повеќе",
+    "Less" : "Помалку",
+    "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>." : "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "од",
+    "Documentation:" : "Документација:",
+    "User Documentation" : "Корисничка документација",
+    "Admin Documentation" : "Админстраторска документација",
+    "Enable only for specific groups" : "Овозможи само на специфицирани групи",
+    "Administrator Documentation" : "Администраторска документација",
+    "Online Documentation" : "Документација на интернет",
+    "Forum" : "Форум",
+    "Bugtracker" : "Тракер на грешки",
+    "Commercial Support" : "Комерцијална подршка",
+    "Get the apps to sync your files" : "Преземете апликации за синхронизирање на вашите датотеки",
+    "Show First Run Wizard again" : "Прикажи го повторно волшебникот при првото стартување",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>",
+    "Password" : "Лозинка",
+    "Your password was changed" : "Вашата лозинка беше променета.",
+    "Unable to change your password" : "Вашата лозинка неможе да се смени",
+    "Current password" : "Моментална лозинка",
+    "New password" : "Нова лозинка",
+    "Change password" : "Смени лозинка",
+    "Full Name" : "Цело име",
+    "Email" : "Е-пошта",
+    "Your email address" : "Вашата адреса за е-пошта",
+    "Profile picture" : "Фотографија за профил",
+    "Upload new" : "Префрли нова",
+    "Select new from Files" : "Одбери нова од датотеките",
+    "Remove image" : "Отстрани ја фотографијата",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Мора де биде png или jpg. Идеално квадрат, но ќе бидете во можност да ја исечете.",
+    "Your avatar is provided by your original account." : "Вашиот аватар е креиран со вашата оригинална сметка",
+    "Cancel" : "Откажи",
+    "Choose as profile image" : "Одбери фотографија за профилот",
+    "Language" : "Јазик",
+    "Help translate" : "Помогни во преводот",
+    "Import Root Certificate" : "Увези",
+    "Log-in password" : "Лозинка за најавување",
+    "Decrypt all Files" : "Дешифрирај ги сите датотеки",
+    "Restore Encryption Keys" : "Обнови ги енкрипциските клучеви",
+    "Delete Encryption Keys" : "Избриши ги енкрипцисиките клучеви",
+    "Login Name" : "Име за најава",
+    "Create" : "Создај",
+    "Admin Recovery Password" : "Обновување на Admin лозинката",
+    "Search Users and Groups" : "Барај корисници и групи",
+    "Add Group" : "Додади група",
+    "Group" : "Група",
+    "Everyone" : "Секој",
+    "Admins" : "Администратори",
+    "Default Quota" : "Предефинирана квота",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Ве молам внесете квота за просторот (нпр: \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограничено",
+    "Other" : "Останато",
+    "Username" : "Корисничко име",
+    "Quota" : "Квота",
+    "Storage Location" : "Локација на сториџот",
+    "Last Login" : "Последна најава",
+    "change full name" : "промена на целото име",
+    "set new password" : "постави нова лозинка",
+    "Default" : "Предефиниран"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
deleted file mode 100644
index f24fbd6e06d..00000000000
--- a/settings/l10n/mk.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Овозможен",
-"Authentication error" => "Грешка во автентикација",
-"Your full name has been changed." => "Вашето целосно име е променето.",
-"Unable to change full name" => "Не можам да го променам целото име",
-"Group already exists" => "Групата веќе постои",
-"Unable to add group" => "Неможе да додадам група",
-"Files decrypted successfully" => "Датотектие се успешно декриптирани",
-"Encryption keys deleted permanently" => "Енкрипциските клучеви се трајно избришани",
-"Email saved" => "Електронската пошта е снимена",
-"Invalid email" => "Неисправна електронска пошта",
-"Unable to delete group" => "Неможе да избришам група",
-"Unable to delete user" => "Неможам да избришам корисник",
-"Backups restored successfully" => "Бекапите се успешно реставрирани",
-"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." => "Не можам да ја надградам апликацијата.",
-"Wrong password" => "Погрешна лозинка",
-"No user supplied" => "Нема корисничко име",
-"Unable to change password" => "Вашата лозинка неможе да се смени",
-"Saved" => "Снимено",
-"test email settings" => "провери ги нагодувањата за електронска пошта",
-"Email sent" => "Е-порака пратена",
-"Sending..." => "Испраќам...",
-"All" => "Сите",
-"Please wait...." => "Ве молам почекајте ...",
-"Error while disabling app" => "Грешка при исклучувањето на апликацијата",
-"Disable" => "Оневозможи",
-"Enable" => "Овозможи",
-"Error while enabling app" => "Грешка при вклучувањето на апликацијата",
-"Updating...." => "Надградувам ...",
-"Error while updating app" => "Грешка додека ја надградувам апликацијата",
-"Updated" => "Надграден",
-"Select a profile picture" => "Одбери фотографија за профилот",
-"Very weak password" => "Многу слаба лозинка",
-"Weak password" => "Слаба лозинка",
-"So-so password" => "Така така лозинка",
-"Good password" => "Добра лозинка",
-"Strong password" => "Јака лозинка",
-"Delete" => "Избриши",
-"Delete encryption keys permanently." => "Трајно бришење на енкрипциските клучеви.",
-"Restore encryption keys." => "Поврати ги енкрипцисиките клучеви.",
-"Groups" => "Групи",
-"Error creating group" => "Грешка при креирање на група",
-"A valid group name must be provided" => "Мора да се обезбеди валидно име на група",
-"undo" => "врати",
-"never" => "никогаш",
-"add group" => "додади група",
-"A valid username must be provided" => "Мора да се обезбеди валидно корисничко име ",
-"Error creating user" => "Грешка при креирање на корисникот",
-"A valid password must be provided" => "Мора да се обезбеди валидна лозинка",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL root сертификати",
-"Encryption" => "Енкрипција",
-"Info, warnings, errors and fatal issues" => "Информации, предупредувања, грешки и фатални работи",
-"Warnings, errors and fatal issues" => "Предупредувања, грешки и фатални работи",
-"Errors and fatal issues" => "Грешки и фатални работи",
-"Fatal issues only" => "Само фатални работи",
-"None" => "Ништо",
-"Login" => "Најава",
-"Plain" => "Чиста",
-"NT LAN Manager" => "NT LAN Менаџер",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Безбедносно предупредување",
-"Setup Warning" => "Предупредување при подесување",
-"Database Performance Info" => "Информација за перформансите на базата на податоци",
-"Your PHP version is outdated" => "Вашаа верзија на PHP е застарена",
-"Locale not working" => "Локалето не функционира",
-"Cron" => "Крон",
-"Execute one task with each page loaded" => "Изврши по една задача со секоја вчитана страница",
-"Sharing" => "Споделување",
-"Allow apps to use the Share API" => "Дозволете апликациите да го користат API-то за споделување",
-"Allow users to share via link" => "Допушти корисниците да споделуваат со линкови",
-"Enforce password protection" => "Наметни заштита на лозинка",
-"Allow public uploads" => "Дозволи јавен аплоуд",
-"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" => "Исклучи групи од споделување",
-"Security" => "Безбедност",
-"Enforce HTTPS" => "Наметни HTTPS",
-"Email Server" => "Сервер за електронска пошта",
-"This is used for sending out notifications." => "Ова се користи за испраќање на известувања.",
-"Send mode" => "Мод на испраќање",
-"From address" => "Од адреса",
-"mail" => "Електронска пошта",
-"Authentication method" => "Метод на автентификација",
-"Authentication required" => "Потребна е автентификација",
-"Server address" => "Адреса на сервер",
-"Port" => "Порта",
-"Credentials" => "Акредитиви",
-"SMTP Username" => "SMTP корисничко име",
-"SMTP Password" => "SMTP лозинка",
-"Test email settings" => "Провери ги нагодувањаа за електронска пошта",
-"Send email" => "Испрати пошта",
-"Log" => "Записник",
-"Log level" => "Ниво на логирање",
-"More" => "Повеќе",
-"Less" => "Помалку",
-"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>." => "Развој од <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud заедницата</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворниот код</a> е лиценциран со<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "од",
-"Documentation:" => "Документација:",
-"User Documentation" => "Корисничка документација",
-"Admin Documentation" => "Админстраторска документација",
-"Enable only for specific groups" => "Овозможи само на специфицирани групи",
-"Administrator Documentation" => "Администраторска документација",
-"Online Documentation" => "Документација на интернет",
-"Forum" => "Форум",
-"Bugtracker" => "Тракер на грешки",
-"Commercial Support" => "Комерцијална подршка",
-"Get the apps to sync your files" => "Преземете апликации за синхронизирање на вашите датотеки",
-"Show First Run Wizard again" => "Прикажи го повторно волшебникот при првото стартување",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Имате искористено <strong>%s</strong> од достапните <strong>%s</strong>",
-"Password" => "Лозинка",
-"Your password was changed" => "Вашата лозинка беше променета.",
-"Unable to change your password" => "Вашата лозинка неможе да се смени",
-"Current password" => "Моментална лозинка",
-"New password" => "Нова лозинка",
-"Change password" => "Смени лозинка",
-"Full Name" => "Цело име",
-"Email" => "Е-пошта",
-"Your email address" => "Вашата адреса за е-пошта",
-"Profile picture" => "Фотографија за профил",
-"Upload new" => "Префрли нова",
-"Select new from Files" => "Одбери нова од датотеките",
-"Remove image" => "Отстрани ја фотографијата",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Мора де биде png или jpg. Идеално квадрат, но ќе бидете во можност да ја исечете.",
-"Your avatar is provided by your original account." => "Вашиот аватар е креиран со вашата оригинална сметка",
-"Cancel" => "Откажи",
-"Choose as profile image" => "Одбери фотографија за профилот",
-"Language" => "Јазик",
-"Help translate" => "Помогни во преводот",
-"Import Root Certificate" => "Увези",
-"Log-in password" => "Лозинка за најавување",
-"Decrypt all Files" => "Дешифрирај ги сите датотеки",
-"Restore Encryption Keys" => "Обнови ги енкрипциските клучеви",
-"Delete Encryption Keys" => "Избриши ги енкрипцисиките клучеви",
-"Login Name" => "Име за најава",
-"Create" => "Создај",
-"Admin Recovery Password" => "Обновување на Admin лозинката",
-"Search Users and Groups" => "Барај корисници и групи",
-"Add Group" => "Додади група",
-"Group" => "Група",
-"Everyone" => "Секој",
-"Admins" => "Администратори",
-"Default Quota" => "Предефинирана квота",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Ве молам внесете квота за просторот (нпр: \"512 MB\" или \"12 GB\")",
-"Unlimited" => "Неограничено",
-"Other" => "Останато",
-"Username" => "Корисничко име",
-"Quota" => "Квота",
-"Storage Location" => "Локација на сториџот",
-"Last Login" => "Последна најава",
-"change full name" => "промена на целото име",
-"set new password" => "постави нова лозинка",
-"Default" => "Предефиниран"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;";
diff --git a/settings/l10n/ms_MY.js b/settings/l10n/ms_MY.js
new file mode 100644
index 00000000000..e36bc5336e6
--- /dev/null
+++ b/settings/l10n/ms_MY.js
@@ -0,0 +1,40 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Ralat pengesahan",
+    "Email saved" : "Emel disimpan",
+    "Invalid email" : "Emel tidak sah",
+    "Language changed" : "Bahasa diubah",
+    "Invalid request" : "Permintaan tidak sah",
+    "Disable" : "Nyahaktif",
+    "Enable" : "Aktif",
+    "Delete" : "Padam",
+    "Groups" : "Kumpulan",
+    "never" : "jangan",
+    "__language_name__" : "_nama_bahasa_",
+    "Login" : "Log masuk",
+    "Security Warning" : "Amaran keselamatan",
+    "Server address" : "Alamat pelayan",
+    "Log" : "Log",
+    "Log level" : "Tahap Log",
+    "More" : "Lanjutan",
+    "by" : "oleh",
+    "Password" : "Kata laluan",
+    "Unable to change your password" : "Gagal mengubah kata laluan anda ",
+    "Current password" : "Kata laluan semasa",
+    "New password" : "Kata laluan baru",
+    "Change password" : "Ubah kata laluan",
+    "Email" : "Email",
+    "Your email address" : "Alamat emel anda",
+    "Profile picture" : "Gambar profil",
+    "Cancel" : "Batal",
+    "Language" : "Bahasa",
+    "Help translate" : "Bantu terjemah",
+    "Login Name" : "Log masuk",
+    "Create" : "Buat",
+    "Default Quota" : "Kuota Lalai",
+    "Other" : "Lain",
+    "Username" : "Nama pengguna",
+    "Quota" : "Kuota"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ms_MY.json b/settings/l10n/ms_MY.json
new file mode 100644
index 00000000000..142db2bc620
--- /dev/null
+++ b/settings/l10n/ms_MY.json
@@ -0,0 +1,38 @@
+{ "translations": {
+    "Authentication error" : "Ralat pengesahan",
+    "Email saved" : "Emel disimpan",
+    "Invalid email" : "Emel tidak sah",
+    "Language changed" : "Bahasa diubah",
+    "Invalid request" : "Permintaan tidak sah",
+    "Disable" : "Nyahaktif",
+    "Enable" : "Aktif",
+    "Delete" : "Padam",
+    "Groups" : "Kumpulan",
+    "never" : "jangan",
+    "__language_name__" : "_nama_bahasa_",
+    "Login" : "Log masuk",
+    "Security Warning" : "Amaran keselamatan",
+    "Server address" : "Alamat pelayan",
+    "Log" : "Log",
+    "Log level" : "Tahap Log",
+    "More" : "Lanjutan",
+    "by" : "oleh",
+    "Password" : "Kata laluan",
+    "Unable to change your password" : "Gagal mengubah kata laluan anda ",
+    "Current password" : "Kata laluan semasa",
+    "New password" : "Kata laluan baru",
+    "Change password" : "Ubah kata laluan",
+    "Email" : "Email",
+    "Your email address" : "Alamat emel anda",
+    "Profile picture" : "Gambar profil",
+    "Cancel" : "Batal",
+    "Language" : "Bahasa",
+    "Help translate" : "Bantu terjemah",
+    "Login Name" : "Log masuk",
+    "Create" : "Buat",
+    "Default Quota" : "Kuota Lalai",
+    "Other" : "Lain",
+    "Username" : "Nama pengguna",
+    "Quota" : "Kuota"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
deleted file mode 100644
index c20dcae9ea0..00000000000
--- a/settings/l10n/ms_MY.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Ralat pengesahan",
-"Email saved" => "Emel disimpan",
-"Invalid email" => "Emel tidak sah",
-"Language changed" => "Bahasa diubah",
-"Invalid request" => "Permintaan tidak sah",
-"Disable" => "Nyahaktif",
-"Enable" => "Aktif",
-"Delete" => "Padam",
-"Groups" => "Kumpulan",
-"never" => "jangan",
-"__language_name__" => "_nama_bahasa_",
-"Login" => "Log masuk",
-"Security Warning" => "Amaran keselamatan",
-"Server address" => "Alamat pelayan",
-"Log" => "Log",
-"Log level" => "Tahap Log",
-"More" => "Lanjutan",
-"by" => "oleh",
-"Password" => "Kata laluan",
-"Unable to change your password" => "Gagal mengubah kata laluan anda ",
-"Current password" => "Kata laluan semasa",
-"New password" => "Kata laluan baru",
-"Change password" => "Ubah kata laluan",
-"Email" => "Email",
-"Your email address" => "Alamat emel anda",
-"Profile picture" => "Gambar profil",
-"Cancel" => "Batal",
-"Language" => "Bahasa",
-"Help translate" => "Bantu terjemah",
-"Login Name" => "Log masuk",
-"Create" => "Buat",
-"Default Quota" => "Kuota Lalai",
-"Other" => "Lain",
-"Username" => "Nama pengguna",
-"Quota" => "Kuota"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/my_MM.js b/settings/l10n/my_MM.js
new file mode 100644
index 00000000000..f0a5641383f
--- /dev/null
+++ b/settings/l10n/my_MM.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "ခွင့်ပြုချက်မအောင်မြင်",
+    "Invalid request" : "တောင်းဆိုချက်မမှန်ကန်ပါ",
+    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
+    "Password" : "စကားဝှက်",
+    "New password" : "စကားဝှက်အသစ်",
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Username" : "သုံးစွဲသူအမည်"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/my_MM.json b/settings/l10n/my_MM.json
new file mode 100644
index 00000000000..49ea1e9baf0
--- /dev/null
+++ b/settings/l10n/my_MM.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Authentication error" : "ခွင့်ပြုချက်မအောင်မြင်",
+    "Invalid request" : "တောင်းဆိုချက်မမှန်ကန်ပါ",
+    "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
+    "Password" : "စကားဝှက်",
+    "New password" : "စကားဝှက်အသစ်",
+    "Cancel" : "ပယ်ဖျက်မည်",
+    "Username" : "သုံးစွဲသူအမည်"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/my_MM.php b/settings/l10n/my_MM.php
deleted file mode 100644
index 070e4dd73bc..00000000000
--- a/settings/l10n/my_MM.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "ခွင့်ပြုချက်မအောင်မြင်",
-"Invalid request" => "တောင်းဆိုချက်မမှန်ကန်ပါ",
-"Security Warning" => "လုံခြုံရေးသတိပေးချက်",
-"Password" => "စကားဝှက်",
-"New password" => "စကားဝှက်အသစ်",
-"Cancel" => "ပယ်ဖျက်မည်",
-"Username" => "သုံးစွဲသူအမည်"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
new file mode 100644
index 00000000000..1fc843d3445
--- /dev/null
+++ b/settings/l10n/nb_NO.js
@@ -0,0 +1,229 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiv",
+    "Authentication error" : "Autentiseringsfeil",
+    "Your full name has been changed." : "Ditt fulle navn er blitt endret.",
+    "Unable to change full name" : "Klarte ikke å endre fullt navn",
+    "Group already exists" : "Gruppen finnes allerede",
+    "Unable to add group" : "Kan ikke legge til gruppe",
+    "Files decrypted successfully" : "Dekryptering av filer vellykket",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
+    "Couldn't decrypt your files, check your password and try again" : "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
+    "Encryption keys deleted permanently" : "Krypteringsnøkler permanent slettet",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
+    "Couldn't remove app." : "Klarte ikke å fjerne app.",
+    "Email saved" : "Epost lagret",
+    "Invalid email" : "Ugyldig epost",
+    "Unable to delete group" : "Kan ikke slette gruppe",
+    "Unable to delete user" : "Kan ikke slette bruker",
+    "Backups restored successfully" : "Vellykket gjenoppretting fra sikkerhetskopier",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
+    "Language changed" : "Språk endret",
+    "Invalid request" : "Ugyldig forespørsel",
+    "Admins can't remove themself from the admin group" : "Admin kan ikke flytte seg selv fra admingruppen",
+    "Unable to add user to group %s" : "Kan ikke legge bruker til gruppen %s",
+    "Unable to remove user from group %s" : "Kan ikke slette bruker fra gruppen %s",
+    "Couldn't update app." : "Kunne ikke oppdatere app.",
+    "Wrong password" : "Feil passord",
+    "No user supplied" : "Ingen bruker angitt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt",
+    "Wrong admin recovery password. Please check the password and try again." : "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
+    "Unable to change password" : "Kunne ikke endre passord",
+    "Saved" : "Lagret",
+    "test email settings" : "Test av innstillinger for e-post",
+    "If you received this email, the settings seem to be correct." : "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
+    "Email sent" : "E-post sendt",
+    "You need to set your user email before being able to send test emails." : "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
+    "Add trusted domain" : "Legg til et tiltrodd domene",
+    "Sending..." : "Sender...",
+    "All" : "Alle",
+    "Please wait...." : "Vennligst vent...",
+    "Error while disabling app" : "Deaktivering av app feilet",
+    "Disable" : "Deaktiver ",
+    "Enable" : "Aktiver",
+    "Error while enabling app" : "Aktivering av app feilet",
+    "Updating...." : "Oppdaterer...",
+    "Error while updating app" : "Feil ved oppdatering av app",
+    "Updated" : "Oppdatert",
+    "Uninstalling ...." : "Avinstallerer ....",
+    "Error while uninstalling app" : "Feil ved avinstallering av app",
+    "Uninstall" : "Avinstaller",
+    "Select a profile picture" : "Velg et profilbilde",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "So-so password" : "So-so-passord",
+    "Good password" : "Bra passord",
+    "Strong password" : "Sterkt passord",
+    "Valid until {date}" : "Gyldig til {date}",
+    "Delete" : "Slett",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
+    "Delete encryption keys permanently." : "Slett krypteringsnøkler permanent.",
+    "Restore encryption keys." : "Gjenopprett krypteringsnøkler.",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kan ikke slette {objName}",
+    "Error creating group" : "Feil ved oppretting av gruppe",
+    "A valid group name must be provided" : "Et gyldig gruppenavn må oppgis",
+    "deleted {groupName}" : "slettet {groupName}",
+    "undo" : "angre",
+    "never" : "aldri",
+    "deleted {userName}" : "slettet {userName}",
+    "add group" : "legg til gruppe",
+    "A valid username must be provided" : "Oppgi et gyldig brukernavn",
+    "Error creating user" : "Feil ved oppretting av bruker",
+    "A valid password must be provided" : "Oppgi et gyldig passord",
+    "Warning: Home directory for user \"{user}\" already exists" : "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL rotsertifikater",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer",
+    "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer",
+    "Errors and fatal issues" : "Feil og fatale problemer",
+    "Fatal issues only" : "Kun fatale problemer",
+    "None" : "Ingen",
+    "Login" : "Logg inn",
+    "Plain" : "Enkel",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sikkerhetsadvarsel",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du aksesserer %s via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve bruk av HTTPS i stedet.",
+    "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." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer. Vi anbefaler på det sterkeste at du konfigurerer web-serveren din slik at datamappen ikke lenger er tilgjengelig eller at du flytter datamappen ut av web-serverens dokument-rotmappe.",
+    "Setup Warning" : "Installasjonsadvarsel",
+    "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.",
+    "Database Performance Info" : "Info om database-ytelse",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite brukes som database. For større installasjoner anbefaler vi å endre dette. For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulen 'fileinfo' mangler",
+    "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.",
+    "Your PHP version is outdated" : "Din PHP-versjon er udatert",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt.",
+    "PHP charset is not set to UTF-8" : "PHP-tegnsett er ikke satt til UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsett er ikke satt til UTF-8. Dette kan forårsake store problemer med tegn som ikke er ASCII i filnavn. Vi anbefaler på det sterkeste å endre verdien av 'default_charset' i php.ini til 'UTF-8'.",
+    "Locale not working" : "Nasjonale innstillinger virker ikke",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
+    "URL generation in notification emails" : "URL-generering i varsel-eposter",
+    "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 \"overwritewebroot\" 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 system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
+    "Connectivity checks" : "Sjekk av tilkobling",
+    "No problems found" : "Ingen problemer funnet",
+    "Please double check the <a href='%s'>installation guides</a>." : "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Siste cron ble utført %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
+    "Cron was not executed yet!" : "Cron er ikke utført ennå!",
+    "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
+    "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.",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
+    "Allow users to share via link" : "Tillat brukere å dele via lenke",
+    "Enforce password protection" : "Tving passordbeskyttelse",
+    "Allow public uploads" : "Tillat offentlig opplasting",
+    "Set default expiration date" : "Sett standard utløpsdato",
+    "Expire after " : "Utløper etter",
+    "days" : "dager",
+    "Enforce expiration date" : "Tving utløpsdato",
+    "Allow resharing" : "TIllat videre deling",
+    "Restrict users to only share with users in their groups" : "Begrens brukere til kun å dele med brukere i deres grupper",
+    "Allow users to send mail notification for shared files" : "Tlllat at brukere sender e-postvarsler for delte filer",
+    "Exclude groups from sharing" : "Utelukk grupper fra deling",
+    "These groups will still be able to receive shares, but not to initiate them." : "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
+    "Security" : "Sikkerhet",
+    "Enforce HTTPS" : "Tving HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Tvinger klientene til å koble til %s via en kryptert forbindelse.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
+    "Email Server" : "E-postserver",
+    "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
+    "Send mode" : "Sendemåte",
+    "From address" : "Fra adresse",
+    "mail" : "e-post",
+    "Authentication method" : "Autentiseringsmetode",
+    "Authentication required" : "Autentisering kreves",
+    "Server address" : "Server-adresse",
+    "Port" : "Port",
+    "Credentials" : "Påloggingsdetaljer",
+    "SMTP Username" : "SMTP-brukernavn",
+    "SMTP Password" : "SMTP-passord",
+    "Test email settings" : "Test innstillinger for e-post",
+    "Send email" : "Send e-post",
+    "Log" : "Logg",
+    "Log level" : "Loggnivå",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "Version" : "Versjon",
+    "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>." : "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "av",
+    "Documentation:" : "Dokumentasjon:",
+    "User Documentation" : "Brukerdokumentasjon",
+    "Admin Documentation" : "Admin-dokumentasjon",
+    "Enable only for specific groups" : "Aktiver kun for visse grupper",
+    "Uninstall App" : "Avinstaller app",
+    "Administrator Documentation" : "Dokumentasjon for administratorer",
+    "Online Documentation" : "Online dokumentasjon",
+    "Forum" : "Forum",
+    "Bugtracker" : "Innmelding og sporing av feil",
+    "Commercial Support" : "Forretningsstøtte",
+    "Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spre budskapet</a>!",
+    "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
+    "Password" : "Passord",
+    "Your password was changed" : "Passord har blitt endret",
+    "Unable to change your password" : "Kunne ikke endre passordet ditt",
+    "Current password" : "Nåværende passord",
+    "New password" : "Nytt passord",
+    "Change password" : "Endre passord",
+    "Full Name" : "Fullt navn",
+    "Email" : "Epost",
+    "Your email address" : "Din e-postadresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Legg inn en e-postadresse for å aktivere passordgjenfinning og motta varsler",
+    "Profile picture" : "Profilbilde",
+    "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." : "Enten png eller jpg. Helst kvadratisk men du kan beskjære det.",
+    "Your avatar is provided by your original account." : "Avataren din kommer fra din opprinnelige konto.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Velg som profilbilde",
+    "Language" : "Språk",
+    "Help translate" : "Bidra til oversettelsen",
+    "Common Name" : "Vanlig navn",
+    "Valid until" : "Gyldig til",
+    "Issued By" : "Utstedt av",
+    "Valid until %s" : "Gyldig til %s",
+    "Import Root Certificate" : "Importer rotsertifikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
+    "Log-in password" : "Innloggingspassord",
+    "Decrypt all Files" : "Dekrypter alle filer",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
+    "Restore Encryption Keys" : "Gjenopprett krypteringsnøkler",
+    "Delete Encryption Keys" : "Slett krypteringsnøkler",
+    "Show storage location" : "Vis lagringssted",
+    "Show last log in" : "Vis site innlogging",
+    "Login Name" : "Brukernavn",
+    "Create" : "Opprett",
+    "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
+    "Enter the recovery password in order to recover the users files during password change" : "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
+    "Search Users and Groups" : "Søk i brukere og grupper",
+    "Add Group" : "Legg til gruppe",
+    "Group" : "Gruppe",
+    "Everyone" : "Alle",
+    "Admins" : "Administratorer",
+    "Default Quota" : "Standard kvote",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
+    "Unlimited" : "Ubegrenset",
+    "Other" : "Annet",
+    "Username" : "Brukernavn",
+    "Quota" : "Kvote",
+    "Storage Location" : "Lagringsplassering",
+    "Last Login" : "Siste innlogging",
+    "change full name" : "endre fullt navn",
+    "set new password" : "sett nytt passord",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
new file mode 100644
index 00000000000..c86056e7462
--- /dev/null
+++ b/settings/l10n/nb_NO.json
@@ -0,0 +1,227 @@
+{ "translations": {
+    "Enabled" : "Aktiv",
+    "Authentication error" : "Autentiseringsfeil",
+    "Your full name has been changed." : "Ditt fulle navn er blitt endret.",
+    "Unable to change full name" : "Klarte ikke å endre fullt navn",
+    "Group already exists" : "Gruppen finnes allerede",
+    "Unable to add group" : "Kan ikke legge til gruppe",
+    "Files decrypted successfully" : "Dekryptering av filer vellykket",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
+    "Couldn't decrypt your files, check your password and try again" : "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
+    "Encryption keys deleted permanently" : "Krypteringsnøkler permanent slettet",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
+    "Couldn't remove app." : "Klarte ikke å fjerne app.",
+    "Email saved" : "Epost lagret",
+    "Invalid email" : "Ugyldig epost",
+    "Unable to delete group" : "Kan ikke slette gruppe",
+    "Unable to delete user" : "Kan ikke slette bruker",
+    "Backups restored successfully" : "Vellykket gjenoppretting fra sikkerhetskopier",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
+    "Language changed" : "Språk endret",
+    "Invalid request" : "Ugyldig forespørsel",
+    "Admins can't remove themself from the admin group" : "Admin kan ikke flytte seg selv fra admingruppen",
+    "Unable to add user to group %s" : "Kan ikke legge bruker til gruppen %s",
+    "Unable to remove user from group %s" : "Kan ikke slette bruker fra gruppen %s",
+    "Couldn't update app." : "Kunne ikke oppdatere app.",
+    "Wrong password" : "Feil passord",
+    "No user supplied" : "Ingen bruker angitt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt",
+    "Wrong admin recovery password. Please check the password and try again." : "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
+    "Unable to change password" : "Kunne ikke endre passord",
+    "Saved" : "Lagret",
+    "test email settings" : "Test av innstillinger for e-post",
+    "If you received this email, the settings seem to be correct." : "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
+    "Email sent" : "E-post sendt",
+    "You need to set your user email before being able to send test emails." : "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
+    "Add trusted domain" : "Legg til et tiltrodd domene",
+    "Sending..." : "Sender...",
+    "All" : "Alle",
+    "Please wait...." : "Vennligst vent...",
+    "Error while disabling app" : "Deaktivering av app feilet",
+    "Disable" : "Deaktiver ",
+    "Enable" : "Aktiver",
+    "Error while enabling app" : "Aktivering av app feilet",
+    "Updating...." : "Oppdaterer...",
+    "Error while updating app" : "Feil ved oppdatering av app",
+    "Updated" : "Oppdatert",
+    "Uninstalling ...." : "Avinstallerer ....",
+    "Error while uninstalling app" : "Feil ved avinstallering av app",
+    "Uninstall" : "Avinstaller",
+    "Select a profile picture" : "Velg et profilbilde",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "So-so password" : "So-so-passord",
+    "Good password" : "Bra passord",
+    "Strong password" : "Sterkt passord",
+    "Valid until {date}" : "Gyldig til {date}",
+    "Delete" : "Slett",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
+    "Delete encryption keys permanently." : "Slett krypteringsnøkler permanent.",
+    "Restore encryption keys." : "Gjenopprett krypteringsnøkler.",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kan ikke slette {objName}",
+    "Error creating group" : "Feil ved oppretting av gruppe",
+    "A valid group name must be provided" : "Et gyldig gruppenavn må oppgis",
+    "deleted {groupName}" : "slettet {groupName}",
+    "undo" : "angre",
+    "never" : "aldri",
+    "deleted {userName}" : "slettet {userName}",
+    "add group" : "legg til gruppe",
+    "A valid username must be provided" : "Oppgi et gyldig brukernavn",
+    "Error creating user" : "Feil ved oppretting av bruker",
+    "A valid password must be provided" : "Oppgi et gyldig passord",
+    "Warning: Home directory for user \"{user}\" already exists" : "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL rotsertifikater",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alt (fatale problemer, feil, advarsler, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, advarsler, feil og fatale problemer",
+    "Warnings, errors and fatal issues" : "Advarsler, feil og fatale problemer",
+    "Errors and fatal issues" : "Feil og fatale problemer",
+    "Fatal issues only" : "Kun fatale problemer",
+    "None" : "Ingen",
+    "Login" : "Logg inn",
+    "Plain" : "Enkel",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Sikkerhetsadvarsel",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du aksesserer %s via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve bruk av HTTPS i stedet.",
+    "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." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer. Vi anbefaler på det sterkeste at du konfigurerer web-serveren din slik at datamappen ikke lenger er tilgjengelig eller at du flytter datamappen ut av web-serverens dokument-rotmappe.",
+    "Setup Warning" : "Installasjonsadvarsel",
+    "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.",
+    "Database Performance Info" : "Info om database-ytelse",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite brukes som database. For større installasjoner anbefaler vi å endre dette. For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulen 'fileinfo' mangler",
+    "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.",
+    "Your PHP version is outdated" : "Din PHP-versjon er udatert",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt.",
+    "PHP charset is not set to UTF-8" : "PHP-tegnsett er ikke satt til UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP-tegnsett er ikke satt til UTF-8. Dette kan forårsake store problemer med tegn som ikke er ASCII i filnavn. Vi anbefaler på det sterkeste å endre verdien av 'default_charset' i php.ini til 'UTF-8'.",
+    "Locale not working" : "Nasjonale innstillinger virker ikke",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
+    "URL generation in notification emails" : "URL-generering i varsel-eposter",
+    "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 \"overwritewebroot\" 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 system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
+    "Connectivity checks" : "Sjekk av tilkobling",
+    "No problems found" : "Ingen problemer funnet",
+    "Please double check the <a href='%s'>installation guides</a>." : "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Siste cron ble utført %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
+    "Cron was not executed yet!" : "Cron er ikke utført ennå!",
+    "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
+    "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.",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
+    "Allow users to share via link" : "Tillat brukere å dele via lenke",
+    "Enforce password protection" : "Tving passordbeskyttelse",
+    "Allow public uploads" : "Tillat offentlig opplasting",
+    "Set default expiration date" : "Sett standard utløpsdato",
+    "Expire after " : "Utløper etter",
+    "days" : "dager",
+    "Enforce expiration date" : "Tving utløpsdato",
+    "Allow resharing" : "TIllat videre deling",
+    "Restrict users to only share with users in their groups" : "Begrens brukere til kun å dele med brukere i deres grupper",
+    "Allow users to send mail notification for shared files" : "Tlllat at brukere sender e-postvarsler for delte filer",
+    "Exclude groups from sharing" : "Utelukk grupper fra deling",
+    "These groups will still be able to receive shares, but not to initiate them." : "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
+    "Security" : "Sikkerhet",
+    "Enforce HTTPS" : "Tving HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Tvinger klientene til å koble til %s via en kryptert forbindelse.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
+    "Email Server" : "E-postserver",
+    "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
+    "Send mode" : "Sendemåte",
+    "From address" : "Fra adresse",
+    "mail" : "e-post",
+    "Authentication method" : "Autentiseringsmetode",
+    "Authentication required" : "Autentisering kreves",
+    "Server address" : "Server-adresse",
+    "Port" : "Port",
+    "Credentials" : "Påloggingsdetaljer",
+    "SMTP Username" : "SMTP-brukernavn",
+    "SMTP Password" : "SMTP-passord",
+    "Test email settings" : "Test innstillinger for e-post",
+    "Send email" : "Send e-post",
+    "Log" : "Logg",
+    "Log level" : "Loggnivå",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "Version" : "Versjon",
+    "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>." : "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "av",
+    "Documentation:" : "Dokumentasjon:",
+    "User Documentation" : "Brukerdokumentasjon",
+    "Admin Documentation" : "Admin-dokumentasjon",
+    "Enable only for specific groups" : "Aktiver kun for visse grupper",
+    "Uninstall App" : "Avinstaller app",
+    "Administrator Documentation" : "Dokumentasjon for administratorer",
+    "Online Documentation" : "Online dokumentasjon",
+    "Forum" : "Forum",
+    "Bugtracker" : "Innmelding og sporing av feil",
+    "Commercial Support" : "Forretningsstøtte",
+    "Get the apps to sync your files" : "Hent apper som synkroniserer filene dine",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spre budskapet</a>!",
+    "Show First Run Wizard again" : "Vis \"Førstegangs veiviser\" på nytt",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
+    "Password" : "Passord",
+    "Your password was changed" : "Passord har blitt endret",
+    "Unable to change your password" : "Kunne ikke endre passordet ditt",
+    "Current password" : "Nåværende passord",
+    "New password" : "Nytt passord",
+    "Change password" : "Endre passord",
+    "Full Name" : "Fullt navn",
+    "Email" : "Epost",
+    "Your email address" : "Din e-postadresse",
+    "Fill in an email address to enable password recovery and receive notifications" : "Legg inn en e-postadresse for å aktivere passordgjenfinning og motta varsler",
+    "Profile picture" : "Profilbilde",
+    "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." : "Enten png eller jpg. Helst kvadratisk men du kan beskjære det.",
+    "Your avatar is provided by your original account." : "Avataren din kommer fra din opprinnelige konto.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Velg som profilbilde",
+    "Language" : "Språk",
+    "Help translate" : "Bidra til oversettelsen",
+    "Common Name" : "Vanlig navn",
+    "Valid until" : "Gyldig til",
+    "Issued By" : "Utstedt av",
+    "Valid until %s" : "Gyldig til %s",
+    "Import Root Certificate" : "Importer rotsertifikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
+    "Log-in password" : "Innloggingspassord",
+    "Decrypt all Files" : "Dekrypter alle filer",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
+    "Restore Encryption Keys" : "Gjenopprett krypteringsnøkler",
+    "Delete Encryption Keys" : "Slett krypteringsnøkler",
+    "Show storage location" : "Vis lagringssted",
+    "Show last log in" : "Vis site innlogging",
+    "Login Name" : "Brukernavn",
+    "Create" : "Opprett",
+    "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
+    "Enter the recovery password in order to recover the users files during password change" : "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
+    "Search Users and Groups" : "Søk i brukere og grupper",
+    "Add Group" : "Legg til gruppe",
+    "Group" : "Gruppe",
+    "Everyone" : "Alle",
+    "Admins" : "Administratorer",
+    "Default Quota" : "Standard kvote",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
+    "Unlimited" : "Ubegrenset",
+    "Other" : "Annet",
+    "Username" : "Brukernavn",
+    "Quota" : "Kvote",
+    "Storage Location" : "Lagringsplassering",
+    "Last Login" : "Siste innlogging",
+    "change full name" : "endre fullt navn",
+    "set new password" : "sett nytt passord",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
deleted file mode 100644
index 08e1a3dbc60..00000000000
--- a/settings/l10n/nb_NO.php
+++ /dev/null
@@ -1,228 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiv",
-"Authentication error" => "Autentiseringsfeil",
-"Your full name has been changed." => "Ditt fulle navn er blitt endret.",
-"Unable to change full name" => "Klarte ikke å endre fullt navn",
-"Group already exists" => "Gruppen finnes allerede",
-"Unable to add group" => "Kan ikke legge til gruppe",
-"Files decrypted successfully" => "Dekryptering av filer vellykket",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kunne ikke dekryptere filene dine. Sjekk owncloud.log eller spør administratoren",
-"Couldn't decrypt your files, check your password and try again" => "Kunne ikke dekryptere filene dine. Sjekk passordet ditt og prøv igjen",
-"Encryption keys deleted permanently" => "Krypteringsnøkler permanent slettet",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke slette krypteringsnøklene dine permanent. Sjekk owncloud.log eller spør administratoren",
-"Couldn't remove app." => "Klarte ikke å fjerne app.",
-"Email saved" => "Epost lagret",
-"Invalid email" => "Ugyldig epost",
-"Unable to delete group" => "Kan ikke slette gruppe",
-"Unable to delete user" => "Kan ikke slette bruker",
-"Backups restored successfully" => "Vellykket gjenoppretting fra sikkerhetskopier",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kunne ikke gjenopprette krypteringsnøklene dine. Sjekk owncloud.log eller spør administratoren",
-"Language changed" => "Språk endret",
-"Invalid request" => "Ugyldig forespørsel",
-"Admins can't remove themself from the admin group" => "Admin kan ikke flytte seg selv fra admingruppen",
-"Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
-"Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
-"Couldn't update app." => "Kunne ikke oppdatere app.",
-"Wrong password" => "Feil passord",
-"No user supplied" => "Ingen bruker angitt",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Vennligst oppgi et administrativt gjenopprettingspassord. Ellers vil alle brukerdata gå tapt",
-"Wrong admin recovery password. Please check the password and try again." => "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
-"Unable to change password" => "Kunne ikke endre passord",
-"Saved" => "Lagret",
-"test email settings" => "Test av innstillinger for e-post",
-"If you received this email, the settings seem to be correct." => "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
-"Email sent" => "E-post sendt",
-"You need to set your user email before being able to send test emails." => "Du må sette e-postadressen for brukeren din før du kan teste sending av e-post.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ønsker du virkelig å legge til \"{domain}\" som tiltrodd domene?",
-"Add trusted domain" => "Legg til et tiltrodd domene",
-"Sending..." => "Sender...",
-"All" => "Alle",
-"Please wait...." => "Vennligst vent...",
-"Error while disabling app" => "Deaktivering av app feilet",
-"Disable" => "Deaktiver ",
-"Enable" => "Aktiver",
-"Error while enabling app" => "Aktivering av app feilet",
-"Updating...." => "Oppdaterer...",
-"Error while updating app" => "Feil ved oppdatering av app",
-"Updated" => "Oppdatert",
-"Uninstalling ...." => "Avinstallerer ....",
-"Error while uninstalling app" => "Feil ved avinstallering av app",
-"Uninstall" => "Avinstaller",
-"Select a profile picture" => "Velg et profilbilde",
-"Very weak password" => "Veldig svakt passord",
-"Weak password" => "Svakt passord",
-"So-so password" => "So-so-passord",
-"Good password" => "Bra passord",
-"Strong password" => "Sterkt passord",
-"Valid until {date}" => "Gyldig til {date}",
-"Delete" => "Slett",
-"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer... Vennligst vent, dette kan ta litt tid.",
-"Delete encryption keys permanently." => "Slett krypteringsnøkler permanent.",
-"Restore encryption keys." => "Gjenopprett krypteringsnøkler.",
-"Groups" => "Grupper",
-"Unable to delete {objName}" => "Kan ikke slette {objName}",
-"Error creating group" => "Feil ved oppretting av gruppe",
-"A valid group name must be provided" => "Et gyldig gruppenavn må oppgis",
-"deleted {groupName}" => "slettet {groupName}",
-"undo" => "angre",
-"never" => "aldri",
-"deleted {userName}" => "slettet {userName}",
-"add group" => "legg til gruppe",
-"A valid username must be provided" => "Oppgi et gyldig brukernavn",
-"Error creating user" => "Feil ved oppretting av bruker",
-"A valid password must be provided" => "Oppgi et gyldig passord",
-"Warning: Home directory for user \"{user}\" already exists" => "Advarsel: Hjemmemappe for bruker \"{user}\" eksisterer allerede",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL rotsertifikater",
-"Encryption" => "Kryptering",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alt (fatale problemer, feil, advarsler, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, advarsler, feil og fatale problemer",
-"Warnings, errors and fatal issues" => "Advarsler, feil og fatale problemer",
-"Errors and fatal issues" => "Feil og fatale problemer",
-"Fatal issues only" => "Kun fatale problemer",
-"None" => "Ingen",
-"Login" => "Logg inn",
-"Plain" => "Enkel",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Sikkerhetsadvarsel",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du aksesserer %s via HTTP. Vi anbefaler på det sterkeste at du konfigurerer serveren til å kreve bruk av HTTPS i stedet.",
-"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." => "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer. Vi anbefaler på det sterkeste at du konfigurerer web-serveren din slik at datamappen ikke lenger er tilgjengelig eller at du flytter datamappen ut av web-serverens dokument-rotmappe.",
-"Setup Warning" => "Installasjonsadvarsel",
-"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.",
-"Database Performance Info" => "Info om database-ytelse",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite brukes som database. For større installasjoner anbefaler vi å endre dette. For å migrere til en annen database, bruk kommandolinjeverktøyet: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modulen 'fileinfo' mangler",
-"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.",
-"Your PHP version is outdated" => "Din PHP-versjon er udatert",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP-versjonen din er utdatert. Vi anbefaler på det sterkeste at du oppdaterer til 5.3.8 eller nyere fordi eldre versjoner ikke vil virke. Det er mulig at denne installasjoner ikke fungerer korrekt.",
-"PHP charset is not set to UTF-8" => "PHP-tegnsett er ikke satt til UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP-tegnsett er ikke satt til UTF-8. Dette kan forårsake store problemer med tegn som ikke er ASCII i filnavn. Vi anbefaler på det sterkeste å endre verdien av 'default_charset' i php.ini til 'UTF-8'.",
-"Locale not working" => "Nasjonale innstillinger virker ikke",
-"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 to install the required packages on your system to support one of the following locales: %s." => "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
-"URL generation in notification emails" => "URL-generering i varsel-eposter",
-"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 \"overwritewebroot\" 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 system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
-"Connectivity checks" => "Sjekk av tilkobling",
-"No problems found" => "Ingen problemer funnet",
-"Please double check the <a href='%s'>installation guides</a>." => "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Siste cron ble utført %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
-"Cron was not executed yet!" => "Cron er ikke utført ennå!",
-"Execute one task with each page loaded" => "Utfør en oppgave med hver side som blir lastet",
-"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.",
-"Sharing" => "Deling",
-"Allow apps to use the Share API" => "Tillat apper å bruke API for Deling",
-"Allow users to share via link" => "Tillat brukere å dele via lenke",
-"Enforce password protection" => "Tving passordbeskyttelse",
-"Allow public uploads" => "Tillat offentlig opplasting",
-"Set default expiration date" => "Sett standard utløpsdato",
-"Expire after " => "Utløper etter",
-"days" => "dager",
-"Enforce expiration date" => "Tving utløpsdato",
-"Allow resharing" => "TIllat videre deling",
-"Restrict users to only share with users in their groups" => "Begrens brukere til kun å dele med brukere i deres grupper",
-"Allow users to send mail notification for shared files" => "Tlllat at brukere sender e-postvarsler for delte filer",
-"Exclude groups from sharing" => "Utelukk grupper fra deling",
-"These groups will still be able to receive shares, but not to initiate them." => "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
-"Security" => "Sikkerhet",
-"Enforce HTTPS" => "Tving HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Tvinger klientene til å koble til %s via en kryptert forbindelse.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
-"Email Server" => "E-postserver",
-"This is used for sending out notifications." => "Dette brukes for utsending av varsler.",
-"Send mode" => "Sendemåte",
-"From address" => "Fra adresse",
-"mail" => "e-post",
-"Authentication method" => "Autentiseringsmetode",
-"Authentication required" => "Autentisering kreves",
-"Server address" => "Server-adresse",
-"Port" => "Port",
-"Credentials" => "Påloggingsdetaljer",
-"SMTP Username" => "SMTP-brukernavn",
-"SMTP Password" => "SMTP-passord",
-"Test email settings" => "Test innstillinger for e-post",
-"Send email" => "Send e-post",
-"Log" => "Logg",
-"Log level" => "Loggnivå",
-"More" => "Mer",
-"Less" => "Mindre",
-"Version" => "Versjon",
-"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>." => "Utviklet av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Kildekoden</a> er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "av",
-"Documentation:" => "Dokumentasjon:",
-"User Documentation" => "Brukerdokumentasjon",
-"Admin Documentation" => "Admin-dokumentasjon",
-"Enable only for specific groups" => "Aktiver kun for visse grupper",
-"Uninstall App" => "Avinstaller app",
-"Administrator Documentation" => "Dokumentasjon for administratorer",
-"Online Documentation" => "Online dokumentasjon",
-"Forum" => "Forum",
-"Bugtracker" => "Innmelding og sporing av feil",
-"Commercial Support" => "Forretningsstøtte",
-"Get the apps to sync your files" => "Hent apper som synkroniserer filene dine",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Hvis du vil støtte prosjektet kan du\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">delta i utviklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spre budskapet</a>!",
-"Show First Run Wizard again" => "Vis \"Førstegangs veiviser\" på nytt",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
-"Password" => "Passord",
-"Your password was changed" => "Passord har blitt endret",
-"Unable to change your password" => "Kunne ikke endre passordet ditt",
-"Current password" => "Nåværende passord",
-"New password" => "Nytt passord",
-"Change password" => "Endre passord",
-"Full Name" => "Fullt navn",
-"Email" => "Epost",
-"Your email address" => "Din e-postadresse",
-"Fill in an email address to enable password recovery and receive notifications" => "Legg inn en e-postadresse for å aktivere passordgjenfinning og motta varsler",
-"Profile picture" => "Profilbilde",
-"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." => "Enten png eller jpg. Helst kvadratisk men du kan beskjære det.",
-"Your avatar is provided by your original account." => "Avataren din kommer fra din opprinnelige konto.",
-"Cancel" => "Avbryt",
-"Choose as profile image" => "Velg som profilbilde",
-"Language" => "Språk",
-"Help translate" => "Bidra til oversettelsen",
-"Common Name" => "Vanlig navn",
-"Valid until" => "Gyldig til",
-"Issued By" => "Utstedt av",
-"Valid until %s" => "Gyldig til %s",
-"Import Root Certificate" => "Importer rotsertifikat",
-"The encryption app is no longer enabled, please decrypt all your files" => "Krypterings-appen er ikke aktiv lenger. Vennligst dekrypter alle filene dine",
-"Log-in password" => "Innloggingspassord",
-"Decrypt all Files" => "Dekrypter alle filer",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Krypteringsnøklene dine er flyttet til en plass for sikkerhetskopier. Hvis noe gikk galt kan du gjenopprette nøklene. Ikke slett dem permanent før du er ikker på at alle filer er dekryptert korrekt.",
-"Restore Encryption Keys" => "Gjenopprett krypteringsnøkler",
-"Delete Encryption Keys" => "Slett krypteringsnøkler",
-"Show storage location" => "Vis lagringssted",
-"Show last log in" => "Vis site innlogging",
-"Login Name" => "Brukernavn",
-"Create" => "Opprett",
-"Admin Recovery Password" => "Administrativt gjenopprettingspassord",
-"Enter the recovery password in order to recover the users files during password change" => "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
-"Search Users and Groups" => "Søk i brukere og grupper",
-"Add Group" => "Legg til gruppe",
-"Group" => "Gruppe",
-"Everyone" => "Alle",
-"Admins" => "Administratorer",
-"Default Quota" => "Standard kvote",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
-"Unlimited" => "Ubegrenset",
-"Other" => "Annet",
-"Username" => "Brukernavn",
-"Quota" => "Kvote",
-"Storage Location" => "Lagringsplassering",
-"Last Login" => "Siste innlogging",
-"change full name" => "endre fullt navn",
-"set new password" => "sett nytt passord",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
new file mode 100644
index 00000000000..1b160c2bbe9
--- /dev/null
+++ b/settings/l10n/nl.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Geactiveerd",
+    "Not enabled" : "Niet ingeschakeld",
+    "Recommended" : "Aanbevolen",
+    "Authentication error" : "Authenticatie fout",
+    "Your full name has been changed." : "Uw volledige naam is gewijzigd.",
+    "Unable to change full name" : "Kan de volledige naam niet wijzigen",
+    "Group already exists" : "Groep bestaat al",
+    "Unable to add group" : "Niet in staat om groep toe te voegen",
+    "Files decrypted successfully" : "Bestanden succesvol ontsleuteld",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
+    "Couldn't decrypt your files, check your password and try again" : "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
+    "Encryption keys deleted permanently" : "Cryptosleutels permanent verwijderd",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
+    "Couldn't remove app." : "Kon app niet verwijderen.",
+    "Email saved" : "E-mail bewaard",
+    "Invalid email" : "Ongeldige e-mail",
+    "Unable to delete group" : "Niet in staat om groep te verwijderen",
+    "Unable to delete user" : "Niet in staat om gebruiker te verwijderen",
+    "Backups restored successfully" : "Backup succesvol terggezet",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
+    "Language changed" : "Taal aangepast",
+    "Invalid request" : "Ongeldige aanvraag",
+    "Admins can't remove themself from the admin group" : "Admins kunnen zichzelf niet uit de admin groep verwijderen",
+    "Unable to add user to group %s" : "Niet in staat om gebruiker toe te voegen aan groep %s",
+    "Unable to remove user from group %s" : "Niet in staat om gebruiker te verwijderen uit groep %s",
+    "Couldn't update app." : "Kon de app niet bijwerken.",
+    "Wrong password" : "Onjuist wachtwoord",
+    "No user supplied" : "Geen gebruiker opgegeven",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
+    "Wrong admin recovery password. Please check the password and try again." : "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
+    "Unable to change password" : "Kan wachtwoord niet wijzigen",
+    "Saved" : "Bewaard",
+    "test email settings" : "test e-mailinstellingen",
+    "If you received this email, the settings seem to be correct." : "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
+    "A problem occurred while sending the email. Please revise your settings." : "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
+    "Email sent" : "E-mail verzonden",
+    "You need to set your user email before being able to send test emails." : "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
+    "Add trusted domain" : "Vertrouwd domein toevoegen",
+    "Sending..." : "Versturen...",
+    "All" : "Alle",
+    "Please wait...." : "Even geduld aub....",
+    "Error while disabling app" : "Fout tijdens het uitzetten van het programma",
+    "Disable" : "Uitschakelen",
+    "Enable" : "Activeer",
+    "Error while enabling app" : "Fout tijdens het aanzetten van het programma",
+    "Updating...." : "Bijwerken....",
+    "Error while updating app" : "Fout bij bijwerken app",
+    "Updated" : "Bijgewerkt",
+    "Uninstalling ...." : "De-installeren ...",
+    "Error while uninstalling app" : "Fout bij de-installeren app",
+    "Uninstall" : "De-installeren",
+    "Select a profile picture" : "Kies een profielafbeelding",
+    "Very weak password" : "Zeer zwak wachtwoord",
+    "Weak password" : "Zwak wachtwoord",
+    "So-so password" : "Matig wachtwoord",
+    "Good password" : "Goed wachtwoord",
+    "Strong password" : "Sterk wachtwoord",
+    "Valid until {date}" : "Geldig tot {date}",
+    "Delete" : "Verwijder",
+    "Decrypting files... Please wait, this can take some time." : "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
+    "Delete encryption keys permanently." : "Verwijder de encryptiesleutels permanent",
+    "Restore encryption keys." : "Herstel de encryptiesleutels",
+    "Groups" : "Groepen",
+    "Unable to delete {objName}" : "Kan {objName} niet verwijderen",
+    "Error creating group" : "Fout bij aanmaken groep",
+    "A valid group name must be provided" : "Er moet een geldige groepsnaam worden opgegeven",
+    "deleted {groupName}" : "verwijderd {groupName}",
+    "undo" : "ongedaan maken",
+    "no group" : "geen groep",
+    "never" : "geen",
+    "deleted {userName}" : "verwijderd {userName}",
+    "add group" : "toevoegen groep",
+    "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
+    "Error creating user" : "Fout bij aanmaken gebruiker",
+    "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
+    "Warning: Home directory for user \"{user}\" already exists" : "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al",
+    "__language_name__" : "Nederlands",
+    "Personal Info" : "Persoonlijke info",
+    "SSL root certificates" : "SSL root certificaten",
+    "Encryption" : "Versleuteling",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen",
+    "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen",
+    "Errors and fatal issues" : "Fouten en fatale problemen",
+    "Fatal issues only" : "Alleen fatale problemen",
+    "None" : "Geen",
+    "Login" : "Login",
+    "Plain" : "Gewoon",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Beveiligingswaarschuwing",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "U bent met %s verbonden over HTTP. We adviseren met klem uw server zo te configureren dat alleen HTTPS kan worden gebruikt.",
+    "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." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
+    "Setup Warning" : "Instellingswaarschuwing",
+    "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.",
+    "Database Performance Info" : "Database Performance Info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit aan te passen. Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' ontbreekt",
+    "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.",
+    "Your PHP version is outdated" : "Uw PHP versie is verouderd",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt.",
+    "PHP charset is not set to UTF-8" : "PHP characterset is niet ingesteld op UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP characterset is niet ingesteld op UTF-8. Dit kan flinke problemen opleveren met niet-ASCII tekens in bestandsnamen. We adviseren om de waarde van 'default_charset' in php.ini te wijzigen in 'UTF-8'.",
+    "Locale not working" : "Taalbestand werkt niet",
+    "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 to install 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.",
+    "URL generation in notification emails" : "URL genereren in notificatie e-mails",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
+    "Connectivity checks" : "Verbindingscontroles",
+    "No problems found" : "Geen problemen gevonden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
+    "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
+    "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
+    "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.",
+    "Sharing" : "Delen",
+    "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",
+    "Enforce password protection" : "Dwing wachtwoordbeveiliging af",
+    "Allow public uploads" : "Sta publieke uploads toe",
+    "Set default expiration date" : "Stel standaard vervaldatum in",
+    "Expire after " : "Vervalt na",
+    "days" : "dagen",
+    "Enforce expiration date" : "Verplicht de vervaldatum",
+    "Allow resharing" : "Toestaan opnieuw delen",
+    "Restrict users to only share with users in their groups" : "Laat gebruikers alleen delen met andere gebruikers in hun groepen",
+    "Allow users to send mail notification for shared files" : "Sta gebruikers toe om e-mailnotificaties  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.",
+    "Security" : "Beveiliging",
+    "Enforce HTTPS" : "Afdwingen HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Dwingt de clients om een versleutelde verbinding te maken met %s",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
+    "Email Server" : "E-mailserver",
+    "This is used for sending out notifications." : "Dit wordt gestuurd voor het verzenden van meldingen.",
+    "Send mode" : "Verstuurmodus",
+    "From address" : "Afzenderadres",
+    "mail" : "e-mail",
+    "Authentication method" : "Authenticatiemethode",
+    "Authentication required" : "Authenticatie vereist",
+    "Server address" : "Server adres",
+    "Port" : "Poort",
+    "Credentials" : "Inloggegevens",
+    "SMTP Username" : "SMTP gebruikersnaam",
+    "SMTP Password" : "SMTP wachtwoord",
+    "Store credentials" : "Opslaan inloggegevens",
+    "Test email settings" : "Test e-mailinstellingen",
+    "Send email" : "Versturen e-mail",
+    "Log" : "Log",
+    "Log level" : "Log niveau",
+    "More" : "Meer",
+    "Less" : "Minder",
+    "Version" : "Versie",
+    "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>." : "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Meer applicaties",
+    "Add your app" : "Voeg uw app toe",
+    "by" : "door",
+    "licensed" : "gelicenseerd",
+    "Documentation:" : "Documentatie:",
+    "User Documentation" : "Gebruikersdocumentatie",
+    "Admin Documentation" : "Beheerdocumentatie",
+    "Update to %s" : "Bijgewerkt naar %s",
+    "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren",
+    "Uninstall App" : "De-installeren app",
+    "Administrator Documentation" : "Beheerdersdocumentatie",
+    "Online Documentation" : "Online documentatie",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Commerciële ondersteuning",
+    "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">verkondig het nieuws</a>!",
+    "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>",
+    "Password" : "Wachtwoord",
+    "Your password was changed" : "Je wachtwoord is veranderd",
+    "Unable to change your password" : "Niet in staat om uw wachtwoord te wijzigen",
+    "Current password" : "Huidig wachtwoord",
+    "New password" : "Nieuw",
+    "Change password" : "Wijzig wachtwoord",
+    "Full Name" : "Volledige naam",
+    "Email" : "E-mailadres",
+    "Your email address" : "Uw e-mailadres",
+    "Fill in an email address to enable password recovery and receive notifications" : "Vul een e-mailadres in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
+    "Profile picture" : "Profielafbeelding",
+    "Upload new" : "Upload een nieuwe",
+    "Select new from Files" : "Selecteer een nieuwe vanuit bestanden",
+    "Remove image" : "Verwijder afbeelding",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Of png, of jpg. Bij voorkeur vierkant, maar u kunt de afbeelding bijsnijden.",
+    "Your avatar is provided by your original account." : "Uw avatar is verstrekt door uw originele account.",
+    "Cancel" : "Annuleer",
+    "Choose as profile image" : "Kies als profielafbeelding",
+    "Language" : "Taal",
+    "Help translate" : "Help met vertalen",
+    "Common Name" : "Common Name",
+    "Valid until" : "Geldig tot",
+    "Issued By" : "Uitgegeven door",
+    "Valid until %s" : "Geldig tot %s",
+    "Import Root Certificate" : "Importeer root certificaat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
+    "Log-in password" : "Inlog-wachtwoord",
+    "Decrypt all Files" : "Decodeer alle bestanden",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
+    "Restore Encryption Keys" : "Herstel cryptosleutels",
+    "Delete Encryption Keys" : "Verwijder cryptosleutels",
+    "Show storage location" : "Toon opslaglocatie",
+    "Show last log in" : "Toon laatste inlog",
+    "Login Name" : "Inlognaam",
+    "Create" : "Aanmaken",
+    "Admin Recovery Password" : "Beheer herstel wachtwoord",
+    "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
+    "Search Users and Groups" : "Zoeken naar gebruikers en groepen",
+    "Add Group" : "Toevoegen groep",
+    "Group" : "Groep",
+    "Everyone" : "Iedereen",
+    "Admins" : "Beheerders",
+    "Default Quota" : "Standaard limiet",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
+    "Unlimited" : "Ongelimiteerd",
+    "Other" : "Anders",
+    "Username" : "Gebruikersnaam",
+    "Group Admin for" : "Groepsbeheerder voor",
+    "Quota" : "Limieten",
+    "Storage Location" : "Opslaglocatie",
+    "Last Login" : "Laatste inlog",
+    "change full name" : "wijzigen volledige naam",
+    "set new password" : "Instellen nieuw wachtwoord",
+    "Default" : "Standaard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
new file mode 100644
index 00000000000..9a94c74f420
--- /dev/null
+++ b/settings/l10n/nl.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Geactiveerd",
+    "Not enabled" : "Niet ingeschakeld",
+    "Recommended" : "Aanbevolen",
+    "Authentication error" : "Authenticatie fout",
+    "Your full name has been changed." : "Uw volledige naam is gewijzigd.",
+    "Unable to change full name" : "Kan de volledige naam niet wijzigen",
+    "Group already exists" : "Groep bestaat al",
+    "Unable to add group" : "Niet in staat om groep toe te voegen",
+    "Files decrypted successfully" : "Bestanden succesvol ontsleuteld",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
+    "Couldn't decrypt your files, check your password and try again" : "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
+    "Encryption keys deleted permanently" : "Cryptosleutels permanent verwijderd",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
+    "Couldn't remove app." : "Kon app niet verwijderen.",
+    "Email saved" : "E-mail bewaard",
+    "Invalid email" : "Ongeldige e-mail",
+    "Unable to delete group" : "Niet in staat om groep te verwijderen",
+    "Unable to delete user" : "Niet in staat om gebruiker te verwijderen",
+    "Backups restored successfully" : "Backup succesvol terggezet",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
+    "Language changed" : "Taal aangepast",
+    "Invalid request" : "Ongeldige aanvraag",
+    "Admins can't remove themself from the admin group" : "Admins kunnen zichzelf niet uit de admin groep verwijderen",
+    "Unable to add user to group %s" : "Niet in staat om gebruiker toe te voegen aan groep %s",
+    "Unable to remove user from group %s" : "Niet in staat om gebruiker te verwijderen uit groep %s",
+    "Couldn't update app." : "Kon de app niet bijwerken.",
+    "Wrong password" : "Onjuist wachtwoord",
+    "No user supplied" : "Geen gebruiker opgegeven",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
+    "Wrong admin recovery password. Please check the password and try again." : "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
+    "Unable to change password" : "Kan wachtwoord niet wijzigen",
+    "Saved" : "Bewaard",
+    "test email settings" : "test e-mailinstellingen",
+    "If you received this email, the settings seem to be correct." : "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
+    "A problem occurred while sending the email. Please revise your settings." : "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
+    "Email sent" : "E-mail verzonden",
+    "You need to set your user email before being able to send test emails." : "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
+    "Add trusted domain" : "Vertrouwd domein toevoegen",
+    "Sending..." : "Versturen...",
+    "All" : "Alle",
+    "Please wait...." : "Even geduld aub....",
+    "Error while disabling app" : "Fout tijdens het uitzetten van het programma",
+    "Disable" : "Uitschakelen",
+    "Enable" : "Activeer",
+    "Error while enabling app" : "Fout tijdens het aanzetten van het programma",
+    "Updating...." : "Bijwerken....",
+    "Error while updating app" : "Fout bij bijwerken app",
+    "Updated" : "Bijgewerkt",
+    "Uninstalling ...." : "De-installeren ...",
+    "Error while uninstalling app" : "Fout bij de-installeren app",
+    "Uninstall" : "De-installeren",
+    "Select a profile picture" : "Kies een profielafbeelding",
+    "Very weak password" : "Zeer zwak wachtwoord",
+    "Weak password" : "Zwak wachtwoord",
+    "So-so password" : "Matig wachtwoord",
+    "Good password" : "Goed wachtwoord",
+    "Strong password" : "Sterk wachtwoord",
+    "Valid until {date}" : "Geldig tot {date}",
+    "Delete" : "Verwijder",
+    "Decrypting files... Please wait, this can take some time." : "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
+    "Delete encryption keys permanently." : "Verwijder de encryptiesleutels permanent",
+    "Restore encryption keys." : "Herstel de encryptiesleutels",
+    "Groups" : "Groepen",
+    "Unable to delete {objName}" : "Kan {objName} niet verwijderen",
+    "Error creating group" : "Fout bij aanmaken groep",
+    "A valid group name must be provided" : "Er moet een geldige groepsnaam worden opgegeven",
+    "deleted {groupName}" : "verwijderd {groupName}",
+    "undo" : "ongedaan maken",
+    "no group" : "geen groep",
+    "never" : "geen",
+    "deleted {userName}" : "verwijderd {userName}",
+    "add group" : "toevoegen groep",
+    "A valid username must be provided" : "Er moet een geldige gebruikersnaam worden opgegeven",
+    "Error creating user" : "Fout bij aanmaken gebruiker",
+    "A valid password must be provided" : "Er moet een geldig wachtwoord worden opgegeven",
+    "Warning: Home directory for user \"{user}\" already exists" : "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al",
+    "__language_name__" : "Nederlands",
+    "Personal Info" : "Persoonlijke info",
+    "SSL root certificates" : "SSL root certificaten",
+    "Encryption" : "Versleuteling",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, waarschuwingen, fouten en fatale problemen",
+    "Warnings, errors and fatal issues" : "Waarschuwingen, fouten en fatale problemen",
+    "Errors and fatal issues" : "Fouten en fatale problemen",
+    "Fatal issues only" : "Alleen fatale problemen",
+    "None" : "Geen",
+    "Login" : "Login",
+    "Plain" : "Gewoon",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Beveiligingswaarschuwing",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "U bent met %s verbonden over HTTP. We adviseren met klem uw server zo te configureren dat alleen HTTPS kan worden gebruikt.",
+    "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." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
+    "Setup Warning" : "Instellingswaarschuwing",
+    "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.",
+    "Database Performance Info" : "Database Performance Info",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit aan te passen. Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Module 'fileinfo' ontbreekt",
+    "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.",
+    "Your PHP version is outdated" : "Uw PHP versie is verouderd",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt.",
+    "PHP charset is not set to UTF-8" : "PHP characterset is niet ingesteld op UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP characterset is niet ingesteld op UTF-8. Dit kan flinke problemen opleveren met niet-ASCII tekens in bestandsnamen. We adviseren om de waarde van 'default_charset' in php.ini te wijzigen in 'UTF-8'.",
+    "Locale not working" : "Taalbestand werkt niet",
+    "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 to install 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.",
+    "URL generation in notification emails" : "URL genereren in notificatie e-mails",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
+    "Connectivity checks" : "Verbindingscontroles",
+    "No problems found" : "Geen problemen gevonden",
+    "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
+    "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
+    "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
+    "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.",
+    "Sharing" : "Delen",
+    "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",
+    "Enforce password protection" : "Dwing wachtwoordbeveiliging af",
+    "Allow public uploads" : "Sta publieke uploads toe",
+    "Set default expiration date" : "Stel standaard vervaldatum in",
+    "Expire after " : "Vervalt na",
+    "days" : "dagen",
+    "Enforce expiration date" : "Verplicht de vervaldatum",
+    "Allow resharing" : "Toestaan opnieuw delen",
+    "Restrict users to only share with users in their groups" : "Laat gebruikers alleen delen met andere gebruikers in hun groepen",
+    "Allow users to send mail notification for shared files" : "Sta gebruikers toe om e-mailnotificaties  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.",
+    "Security" : "Beveiliging",
+    "Enforce HTTPS" : "Afdwingen HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Dwingt de clients om een versleutelde verbinding te maken met %s",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
+    "Email Server" : "E-mailserver",
+    "This is used for sending out notifications." : "Dit wordt gestuurd voor het verzenden van meldingen.",
+    "Send mode" : "Verstuurmodus",
+    "From address" : "Afzenderadres",
+    "mail" : "e-mail",
+    "Authentication method" : "Authenticatiemethode",
+    "Authentication required" : "Authenticatie vereist",
+    "Server address" : "Server adres",
+    "Port" : "Poort",
+    "Credentials" : "Inloggegevens",
+    "SMTP Username" : "SMTP gebruikersnaam",
+    "SMTP Password" : "SMTP wachtwoord",
+    "Store credentials" : "Opslaan inloggegevens",
+    "Test email settings" : "Test e-mailinstellingen",
+    "Send email" : "Versturen e-mail",
+    "Log" : "Log",
+    "Log level" : "Log niveau",
+    "More" : "Meer",
+    "Less" : "Minder",
+    "Version" : "Versie",
+    "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>." : "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Meer applicaties",
+    "Add your app" : "Voeg uw app toe",
+    "by" : "door",
+    "licensed" : "gelicenseerd",
+    "Documentation:" : "Documentatie:",
+    "User Documentation" : "Gebruikersdocumentatie",
+    "Admin Documentation" : "Beheerdocumentatie",
+    "Update to %s" : "Bijgewerkt naar %s",
+    "Enable only for specific groups" : "Alleen voor bepaalde groepen activeren",
+    "Uninstall App" : "De-installeren app",
+    "Administrator Documentation" : "Beheerdersdocumentatie",
+    "Online Documentation" : "Online documentatie",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Commerciële ondersteuning",
+    "Get the apps to sync your files" : "Download de apps om bestanden te synchroniseren",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">verkondig het nieuws</a>!",
+    "Show First Run Wizard again" : "Toon de Eerste start Wizard opnieuw",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>",
+    "Password" : "Wachtwoord",
+    "Your password was changed" : "Je wachtwoord is veranderd",
+    "Unable to change your password" : "Niet in staat om uw wachtwoord te wijzigen",
+    "Current password" : "Huidig wachtwoord",
+    "New password" : "Nieuw",
+    "Change password" : "Wijzig wachtwoord",
+    "Full Name" : "Volledige naam",
+    "Email" : "E-mailadres",
+    "Your email address" : "Uw e-mailadres",
+    "Fill in an email address to enable password recovery and receive notifications" : "Vul een e-mailadres in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
+    "Profile picture" : "Profielafbeelding",
+    "Upload new" : "Upload een nieuwe",
+    "Select new from Files" : "Selecteer een nieuwe vanuit bestanden",
+    "Remove image" : "Verwijder afbeelding",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Of png, of jpg. Bij voorkeur vierkant, maar u kunt de afbeelding bijsnijden.",
+    "Your avatar is provided by your original account." : "Uw avatar is verstrekt door uw originele account.",
+    "Cancel" : "Annuleer",
+    "Choose as profile image" : "Kies als profielafbeelding",
+    "Language" : "Taal",
+    "Help translate" : "Help met vertalen",
+    "Common Name" : "Common Name",
+    "Valid until" : "Geldig tot",
+    "Issued By" : "Uitgegeven door",
+    "Valid until %s" : "Geldig tot %s",
+    "Import Root Certificate" : "Importeer root certificaat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
+    "Log-in password" : "Inlog-wachtwoord",
+    "Decrypt all Files" : "Decodeer alle bestanden",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
+    "Restore Encryption Keys" : "Herstel cryptosleutels",
+    "Delete Encryption Keys" : "Verwijder cryptosleutels",
+    "Show storage location" : "Toon opslaglocatie",
+    "Show last log in" : "Toon laatste inlog",
+    "Login Name" : "Inlognaam",
+    "Create" : "Aanmaken",
+    "Admin Recovery Password" : "Beheer herstel wachtwoord",
+    "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
+    "Search Users and Groups" : "Zoeken naar gebruikers en groepen",
+    "Add Group" : "Toevoegen groep",
+    "Group" : "Groep",
+    "Everyone" : "Iedereen",
+    "Admins" : "Beheerders",
+    "Default Quota" : "Standaard limiet",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
+    "Unlimited" : "Ongelimiteerd",
+    "Other" : "Anders",
+    "Username" : "Gebruikersnaam",
+    "Group Admin for" : "Groepsbeheerder voor",
+    "Quota" : "Limieten",
+    "Storage Location" : "Opslaglocatie",
+    "Last Login" : "Laatste inlog",
+    "change full name" : "wijzigen volledige naam",
+    "set new password" : "Instellen nieuw wachtwoord",
+    "Default" : "Standaard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
deleted file mode 100644
index 081dc50c80e..00000000000
--- a/settings/l10n/nl.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Geactiveerd",
-"Not enabled" => "Niet ingeschakeld",
-"Recommended" => "Aanbevolen",
-"Authentication error" => "Authenticatie fout",
-"Your full name has been changed." => "Uw volledige naam is gewijzigd.",
-"Unable to change full name" => "Kan de volledige naam niet wijzigen",
-"Group already exists" => "Groep bestaat al",
-"Unable to add group" => "Niet in staat om groep toe te voegen",
-"Files decrypted successfully" => "Bestanden succesvol ontsleuteld",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Kon uw bestanden niet ontsleutelem. Controleer uw owncloud logs of vraag het uw beheerder",
-"Couldn't decrypt your files, check your password and try again" => "Kon uw bestanden niet ontsleutelen. Controleer uw wachtwoord en probeer het opnieuw",
-"Encryption keys deleted permanently" => "Cryptosleutels permanent verwijderd",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Kom uw cryptosleutels niet permanent verwijderen. Controleer uw owncloud.log, of neem contact op met uw beheerder.",
-"Couldn't remove app." => "Kon app niet verwijderen.",
-"Email saved" => "E-mail bewaard",
-"Invalid email" => "Ongeldige e-mail",
-"Unable to delete group" => "Niet in staat om groep te verwijderen",
-"Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
-"Backups restored successfully" => "Backup succesvol terggezet",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kon uw cryptosleutels niet herstellen. Controleer uw owncloud.log of neem contact op met uw beheerder",
-"Language changed" => "Taal aangepast",
-"Invalid request" => "Ongeldige aanvraag",
-"Admins can't remove themself from the admin group" => "Admins kunnen zichzelf niet uit de admin groep verwijderen",
-"Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
-"Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
-"Couldn't update app." => "Kon de app niet bijwerken.",
-"Wrong password" => "Onjuist wachtwoord",
-"No user supplied" => "Geen gebruiker opgegeven",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Voer een beheerdersherstelwachtwoord in, anders zullen alle gebruikersgegevens verloren gaan",
-"Wrong admin recovery password. Please check the password and try again." => "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
-"Unable to change password" => "Kan wachtwoord niet wijzigen",
-"Saved" => "Bewaard",
-"test email settings" => "test e-mailinstellingen",
-"If you received this email, the settings seem to be correct." => "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
-"A problem occurred while sending the email. Please revise your settings." => "Er ontstond een probleem bij het versturen van de e-mail. Controleer uw instellingen.",
-"Email sent" => "E-mail verzonden",
-"You need to set your user email before being able to send test emails." => "U moet uw e-mailadres invoeren voordat u testberichten kunt versturen.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Weet u zeker dat u \"{domain}\" als een vertrouwd domein wilt toevoegen?",
-"Add trusted domain" => "Vertrouwd domein toevoegen",
-"Sending..." => "Versturen...",
-"All" => "Alle",
-"Please wait...." => "Even geduld aub....",
-"Error while disabling app" => "Fout tijdens het uitzetten van het programma",
-"Disable" => "Uitschakelen",
-"Enable" => "Activeer",
-"Error while enabling app" => "Fout tijdens het aanzetten van het programma",
-"Updating...." => "Bijwerken....",
-"Error while updating app" => "Fout bij bijwerken app",
-"Updated" => "Bijgewerkt",
-"Uninstalling ...." => "De-installeren ...",
-"Error while uninstalling app" => "Fout bij de-installeren app",
-"Uninstall" => "De-installeren",
-"Select a profile picture" => "Kies een profielafbeelding",
-"Very weak password" => "Zeer zwak wachtwoord",
-"Weak password" => "Zwak wachtwoord",
-"So-so password" => "Matig wachtwoord",
-"Good password" => "Goed wachtwoord",
-"Strong password" => "Sterk wachtwoord",
-"Valid until {date}" => "Geldig tot {date}",
-"Delete" => "Verwijder",
-"Decrypting files... Please wait, this can take some time." => "Bestanden worden gedecodeerd... Even geduld alstublieft, dit kan even duren.",
-"Delete encryption keys permanently." => "Verwijder de encryptiesleutels permanent",
-"Restore encryption keys." => "Herstel de encryptiesleutels",
-"Groups" => "Groepen",
-"Unable to delete {objName}" => "Kan {objName} niet verwijderen",
-"Error creating group" => "Fout bij aanmaken groep",
-"A valid group name must be provided" => "Er moet een geldige groepsnaam worden opgegeven",
-"deleted {groupName}" => "verwijderd {groupName}",
-"undo" => "ongedaan maken",
-"no group" => "geen groep",
-"never" => "geen",
-"deleted {userName}" => "verwijderd {userName}",
-"add group" => "toevoegen groep",
-"A valid username must be provided" => "Er moet een geldige gebruikersnaam worden opgegeven",
-"Error creating user" => "Fout bij aanmaken gebruiker",
-"A valid password must be provided" => "Er moet een geldig wachtwoord worden opgegeven",
-"Warning: Home directory for user \"{user}\" already exists" => "Waarschuwing: Home directory voor gebruiker \"{user}\" bestaat al",
-"__language_name__" => "Nederlands",
-"Personal Info" => "Persoonlijke info",
-"SSL root certificates" => "SSL root certificaten",
-"Encryption" => "Versleuteling",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Alles (fatale problemen, fouten, waarschuwingen, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, waarschuwingen, fouten en fatale problemen",
-"Warnings, errors and fatal issues" => "Waarschuwingen, fouten en fatale problemen",
-"Errors and fatal issues" => "Fouten en fatale problemen",
-"Fatal issues only" => "Alleen fatale problemen",
-"None" => "Geen",
-"Login" => "Login",
-"Plain" => "Gewoon",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Beveiligingswaarschuwing",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "U bent met %s verbonden over HTTP. We adviseren met klem uw server zo te configureren dat alleen HTTPS kan worden gebruikt.",
-"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." => "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
-"Setup Warning" => "Instellingswaarschuwing",
-"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.",
-"Database Performance Info" => "Database Performance Info",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite wordt gebruikt als database. Voor grotere installaties adviseren we dit aan te passen. Om te migreren naar een andere database moet u deze commandoregel tool gebruiken: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Module 'fileinfo' ontbreekt",
-"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.",
-"Your PHP version is outdated" => "Uw PHP versie is verouderd",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Uw PHP versie is verouderd. We adviseren met klem om bij te werken naar versie 5.3.8 of later, omdat oudere versies corrupt kunnen zijn. Het is mogelijk dat deze installatie niet goed werkt.",
-"PHP charset is not set to UTF-8" => "PHP characterset is niet ingesteld op UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP characterset is niet ingesteld op UTF-8. Dit kan flinke problemen opleveren met niet-ASCII tekens in bestandsnamen. We adviseren om de waarde van 'default_charset' in php.ini te wijzigen in 'UTF-8'.",
-"Locale not working" => "Taalbestand werkt niet",
-"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 to install 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.",
-"URL generation in notification emails" => "URL genereren in notificatie e-mails",
-"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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
-"Connectivity checks" => "Verbindingscontroles",
-"No problems found" => "Geen problemen gevonden",
-"Please double check the <a href='%s'>installation guides</a>." => "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Laatst uitgevoerde cron op %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
-"Cron was not executed yet!" => "Cron is nog niet uitgevoerd!",
-"Execute one task with each page loaded" => "Bij laden van elke pagina één taak uitvoeren",
-"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.",
-"Sharing" => "Delen",
-"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",
-"Enforce password protection" => "Dwing wachtwoordbeveiliging af",
-"Allow public uploads" => "Sta publieke uploads toe",
-"Set default expiration date" => "Stel standaard vervaldatum in",
-"Expire after " => "Vervalt na",
-"days" => "dagen",
-"Enforce expiration date" => "Verplicht de vervaldatum",
-"Allow resharing" => "Toestaan opnieuw delen",
-"Restrict users to only share with users in their groups" => "Laat gebruikers alleen delen met andere gebruikers in hun groepen",
-"Allow users to send mail notification for shared files" => "Sta gebruikers toe om e-mailnotificaties  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.",
-"Security" => "Beveiliging",
-"Enforce HTTPS" => "Afdwingen HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Dwingt de clients om een versleutelde verbinding te maken met %s",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
-"Email Server" => "E-mailserver",
-"This is used for sending out notifications." => "Dit wordt gestuurd voor het verzenden van meldingen.",
-"Send mode" => "Verstuurmodus",
-"From address" => "Afzenderadres",
-"mail" => "e-mail",
-"Authentication method" => "Authenticatiemethode",
-"Authentication required" => "Authenticatie vereist",
-"Server address" => "Server adres",
-"Port" => "Poort",
-"Credentials" => "Inloggegevens",
-"SMTP Username" => "SMTP gebruikersnaam",
-"SMTP Password" => "SMTP wachtwoord",
-"Store credentials" => "Opslaan inloggegevens",
-"Test email settings" => "Test e-mailinstellingen",
-"Send email" => "Versturen e-mail",
-"Log" => "Log",
-"Log level" => "Log niveau",
-"More" => "Meer",
-"Less" => "Minder",
-"Version" => "Versie",
-"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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">broncode</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Meer applicaties",
-"Add your app" => "Voeg uw app toe",
-"by" => "door",
-"licensed" => "gelicenseerd",
-"Documentation:" => "Documentatie:",
-"User Documentation" => "Gebruikersdocumentatie",
-"Admin Documentation" => "Beheerdocumentatie",
-"Update to %s" => "Bijgewerkt naar %s",
-"Enable only for specific groups" => "Alleen voor bepaalde groepen activeren",
-"Uninstall App" => "De-installeren app",
-"Administrator Documentation" => "Beheerdersdocumentatie",
-"Online Documentation" => "Online documentatie",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Commerciële ondersteuning",
-"Get the apps to sync your files" => "Download de apps om bestanden te synchroniseren",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Als u het project wilt ondersteunen\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">ontwikkel mee</a>\n\t\tof\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">verkondig het nieuws</a>!",
-"Show First Run Wizard again" => "Toon de Eerste start Wizard opnieuw",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "U heeft <strong>%s</strong> gebruikt van de beschikbare <strong>%s</strong>",
-"Password" => "Wachtwoord",
-"Your password was changed" => "Je wachtwoord is veranderd",
-"Unable to change your password" => "Niet in staat om uw wachtwoord te wijzigen",
-"Current password" => "Huidig wachtwoord",
-"New password" => "Nieuw",
-"Change password" => "Wijzig wachtwoord",
-"Full Name" => "Volledige naam",
-"Email" => "E-mailadres",
-"Your email address" => "Uw e-mailadres",
-"Fill in an email address to enable password recovery and receive notifications" => "Vul een e-mailadres in om wachtwoordherstel mogelijk te maken en meldingen te ontvangen",
-"Profile picture" => "Profielafbeelding",
-"Upload new" => "Upload een nieuwe",
-"Select new from Files" => "Selecteer een nieuwe vanuit bestanden",
-"Remove image" => "Verwijder afbeelding",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Of png, of jpg. Bij voorkeur vierkant, maar u kunt de afbeelding bijsnijden.",
-"Your avatar is provided by your original account." => "Uw avatar is verstrekt door uw originele account.",
-"Cancel" => "Annuleer",
-"Choose as profile image" => "Kies als profielafbeelding",
-"Language" => "Taal",
-"Help translate" => "Help met vertalen",
-"Common Name" => "Common Name",
-"Valid until" => "Geldig tot",
-"Issued By" => "Uitgegeven door",
-"Valid until %s" => "Geldig tot %s",
-"Import Root Certificate" => "Importeer root certificaat",
-"The encryption app is no longer enabled, please decrypt all your files" => "De crypto app is niet langer geactiveerd, u moet alle bestanden decrypten.",
-"Log-in password" => "Inlog-wachtwoord",
-"Decrypt all Files" => "Decodeer alle bestanden",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Uw cryptosleutels zijn verplaatst naar een backup locatie. Als iets iets verkeerd ging, kunt u de sleutels herstellen. Verwijder ze alleen permanent als u zeker weet dat de bestanden goed zijn versleuteld.",
-"Restore Encryption Keys" => "Herstel cryptosleutels",
-"Delete Encryption Keys" => "Verwijder cryptosleutels",
-"Show storage location" => "Toon opslaglocatie",
-"Show last log in" => "Toon laatste inlog",
-"Login Name" => "Inlognaam",
-"Create" => "Aanmaken",
-"Admin Recovery Password" => "Beheer herstel wachtwoord",
-"Enter the recovery password in order to recover the users files during password change" => "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
-"Search Users and Groups" => "Zoeken naar gebruikers en groepen",
-"Add Group" => "Toevoegen groep",
-"Group" => "Groep",
-"Everyone" => "Iedereen",
-"Admins" => "Beheerders",
-"Default Quota" => "Standaard limiet",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
-"Unlimited" => "Ongelimiteerd",
-"Other" => "Anders",
-"Username" => "Gebruikersnaam",
-"Group Admin for" => "Groepsbeheerder voor",
-"Quota" => "Limieten",
-"Storage Location" => "Opslaglocatie",
-"Last Login" => "Laatste inlog",
-"change full name" => "wijzigen volledige naam",
-"set new password" => "Instellen nieuw wachtwoord",
-"Default" => "Standaard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js
new file mode 100644
index 00000000000..477b81d6b48
--- /dev/null
+++ b/settings/l10n/nn_NO.js
@@ -0,0 +1,113 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Autentiseringsfeil",
+    "Group already exists" : "Gruppa finst allereie",
+    "Unable to add group" : "Klarte ikkje leggja til gruppa",
+    "Email saved" : "E-postadresse lagra",
+    "Invalid email" : "Ugyldig e-postadresse",
+    "Unable to delete group" : "Klarte ikkje å sletta gruppa",
+    "Unable to delete user" : "Klarte ikkje sletta brukaren",
+    "Language changed" : "Språk endra",
+    "Invalid request" : "Ugyldig førespurnad",
+    "Admins can't remove themself from the admin group" : "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
+    "Unable to add user to group %s" : "Klarte ikkje leggja til brukaren til gruppa %s",
+    "Unable to remove user from group %s" : "Klarte ikkje fjerna brukaren frå gruppa %s",
+    "Couldn't update app." : "Klarte ikkje oppdatera programmet.",
+    "Wrong password" : "Feil passord",
+    "No user supplied" : "Ingen brukar gitt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
+    "Wrong admin recovery password. Please check the password and try again." : "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
+    "Unable to change password" : "Klarte ikkje å endra passordet",
+    "Email sent" : "E-post sendt",
+    "All" : "Alle",
+    "Please wait...." : "Ver venleg og vent …",
+    "Error while disabling app" : "Klarte ikkje å skru av programmet",
+    "Disable" : "Slå av",
+    "Enable" : "Slå på",
+    "Error while enabling app" : "Klarte ikkje å skru på programmet",
+    "Updating...." : "Oppdaterer …",
+    "Error while updating app" : "Feil ved oppdatering av app",
+    "Updated" : "Oppdatert",
+    "Select a profile picture" : "Vel eit profilbilete",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "Delete" : "Slett",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
+    "Groups" : "Grupper",
+    "undo" : "angra",
+    "never" : "aldri",
+    "add group" : "legg til gruppe",
+    "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
+    "Error creating user" : "Feil ved oppretting av brukar",
+    "A valid password must be provided" : "Du må oppgje eit gyldig passord",
+    "__language_name__" : "Nynorsk",
+    "Encryption" : "Kryptering",
+    "Login" : "Logg inn",
+    "Security Warning" : "Tryggleiksåtvaring",
+    "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." : "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
+    "Setup Warning" : "Oppsettsåtvaring",
+    "Module 'fileinfo' missing" : "Modulen «fileinfo» manglar",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
+    "Locale not working" : "Regionaldata fungerer ikkje",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Utfør éi oppgåve for kvar sidelasting",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "La app-ar bruka API-et til deling",
+    "Allow public uploads" : "Tillat offentlege opplastingar",
+    "Allow resharing" : "Tillat vidaredeling",
+    "Security" : "Tryggleik",
+    "Enforce HTTPS" : "Krev HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
+    "Server address" : "Tenaradresse",
+    "Log" : "Logg",
+    "Log level" : "Log nivå",
+    "More" : "Meir",
+    "Less" : "Mindre",
+    "Version" : "Utgåve",
+    "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>." : "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "av",
+    "User Documentation" : "Brukardokumentasjon",
+    "Administrator Documentation" : "Administratordokumentasjon",
+    "Online Documentation" : "Dokumentasjon på nett",
+    "Forum" : "Forum",
+    "Bugtracker" : "Feilsporar",
+    "Commercial Support" : "Betalt brukarstøtte",
+    "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine",
+    "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
+    "Password" : "Passord",
+    "Your password was changed" : "Passordet ditt er endra",
+    "Unable to change your password" : "Klarte ikkje endra passordet",
+    "Current password" : "Passord",
+    "New password" : "Nytt passord",
+    "Change password" : "Endra passord",
+    "Email" : "E-post",
+    "Your email address" : "Di epost-adresse",
+    "Profile picture" : "Profilbilete",
+    "Upload new" : "Last opp ny",
+    "Select new from Files" : "Vel ny frå Filer",
+    "Remove image" : "Fjern bilete",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Vel som profilbilete",
+    "Language" : "Språk",
+    "Help translate" : "Hjelp oss å omsetja",
+    "Log-in password" : "Innloggingspassord",
+    "Decrypt all Files" : "Dekrypter alle filene",
+    "Login Name" : "Innloggingsnamn",
+    "Create" : "Lag",
+    "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
+    "Enter the recovery password in order to recover the users files during password change" : "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
+    "Group" : "Gruppe",
+    "Unlimited" : "Ubegrensa",
+    "Other" : "Anna",
+    "Username" : "Brukarnamn",
+    "Quota" : "Kvote",
+    "set new password" : "lag nytt passord",
+    "Default" : "Standard"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json
new file mode 100644
index 00000000000..8971c913a4a
--- /dev/null
+++ b/settings/l10n/nn_NO.json
@@ -0,0 +1,111 @@
+{ "translations": {
+    "Authentication error" : "Autentiseringsfeil",
+    "Group already exists" : "Gruppa finst allereie",
+    "Unable to add group" : "Klarte ikkje leggja til gruppa",
+    "Email saved" : "E-postadresse lagra",
+    "Invalid email" : "Ugyldig e-postadresse",
+    "Unable to delete group" : "Klarte ikkje å sletta gruppa",
+    "Unable to delete user" : "Klarte ikkje sletta brukaren",
+    "Language changed" : "Språk endra",
+    "Invalid request" : "Ugyldig førespurnad",
+    "Admins can't remove themself from the admin group" : "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
+    "Unable to add user to group %s" : "Klarte ikkje leggja til brukaren til gruppa %s",
+    "Unable to remove user from group %s" : "Klarte ikkje fjerna brukaren frå gruppa %s",
+    "Couldn't update app." : "Klarte ikkje oppdatera programmet.",
+    "Wrong password" : "Feil passord",
+    "No user supplied" : "Ingen brukar gitt",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
+    "Wrong admin recovery password. Please check the password and try again." : "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
+    "Unable to change password" : "Klarte ikkje å endra passordet",
+    "Email sent" : "E-post sendt",
+    "All" : "Alle",
+    "Please wait...." : "Ver venleg og vent …",
+    "Error while disabling app" : "Klarte ikkje å skru av programmet",
+    "Disable" : "Slå av",
+    "Enable" : "Slå på",
+    "Error while enabling app" : "Klarte ikkje å skru på programmet",
+    "Updating...." : "Oppdaterer …",
+    "Error while updating app" : "Feil ved oppdatering av app",
+    "Updated" : "Oppdatert",
+    "Select a profile picture" : "Vel eit profilbilete",
+    "Very weak password" : "Veldig svakt passord",
+    "Weak password" : "Svakt passord",
+    "Delete" : "Slett",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
+    "Groups" : "Grupper",
+    "undo" : "angra",
+    "never" : "aldri",
+    "add group" : "legg til gruppe",
+    "A valid username must be provided" : "Du må oppgje eit gyldig brukarnamn",
+    "Error creating user" : "Feil ved oppretting av brukar",
+    "A valid password must be provided" : "Du må oppgje eit gyldig passord",
+    "__language_name__" : "Nynorsk",
+    "Encryption" : "Kryptering",
+    "Login" : "Logg inn",
+    "Security Warning" : "Tryggleiksåtvaring",
+    "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." : "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
+    "Setup Warning" : "Oppsettsåtvaring",
+    "Module 'fileinfo' missing" : "Modulen «fileinfo» manglar",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
+    "Locale not working" : "Regionaldata fungerer ikkje",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Utfør éi oppgåve for kvar sidelasting",
+    "Sharing" : "Deling",
+    "Allow apps to use the Share API" : "La app-ar bruka API-et til deling",
+    "Allow public uploads" : "Tillat offentlege opplastingar",
+    "Allow resharing" : "Tillat vidaredeling",
+    "Security" : "Tryggleik",
+    "Enforce HTTPS" : "Krev HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
+    "Server address" : "Tenaradresse",
+    "Log" : "Logg",
+    "Log level" : "Log nivå",
+    "More" : "Meir",
+    "Less" : "Mindre",
+    "Version" : "Utgåve",
+    "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>." : "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "av",
+    "User Documentation" : "Brukardokumentasjon",
+    "Administrator Documentation" : "Administratordokumentasjon",
+    "Online Documentation" : "Dokumentasjon på nett",
+    "Forum" : "Forum",
+    "Bugtracker" : "Feilsporar",
+    "Commercial Support" : "Betalt brukarstøtte",
+    "Get the apps to sync your files" : "Få app-ar som kan synkronisera filene dine",
+    "Show First Run Wizard again" : "Vis Oppstartvegvisaren igjen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
+    "Password" : "Passord",
+    "Your password was changed" : "Passordet ditt er endra",
+    "Unable to change your password" : "Klarte ikkje endra passordet",
+    "Current password" : "Passord",
+    "New password" : "Nytt passord",
+    "Change password" : "Endra passord",
+    "Email" : "E-post",
+    "Your email address" : "Di epost-adresse",
+    "Profile picture" : "Profilbilete",
+    "Upload new" : "Last opp ny",
+    "Select new from Files" : "Vel ny frå Filer",
+    "Remove image" : "Fjern bilete",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Vel som profilbilete",
+    "Language" : "Språk",
+    "Help translate" : "Hjelp oss å omsetja",
+    "Log-in password" : "Innloggingspassord",
+    "Decrypt all Files" : "Dekrypter alle filene",
+    "Login Name" : "Innloggingsnamn",
+    "Create" : "Lag",
+    "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
+    "Enter the recovery password in order to recover the users files during password change" : "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
+    "Group" : "Gruppe",
+    "Unlimited" : "Ubegrensa",
+    "Other" : "Anna",
+    "Username" : "Brukarnamn",
+    "Quota" : "Kvote",
+    "set new password" : "lag nytt passord",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
deleted file mode 100644
index 7fd2eb96d8e..00000000000
--- a/settings/l10n/nn_NO.php
+++ /dev/null
@@ -1,112 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Autentiseringsfeil",
-"Group already exists" => "Gruppa finst allereie",
-"Unable to add group" => "Klarte ikkje leggja til gruppa",
-"Email saved" => "E-postadresse lagra",
-"Invalid email" => "Ugyldig e-postadresse",
-"Unable to delete group" => "Klarte ikkje å sletta gruppa",
-"Unable to delete user" => "Klarte ikkje sletta brukaren",
-"Language changed" => "Språk endra",
-"Invalid request" => "Ugyldig førespurnad",
-"Admins can't remove themself from the admin group" => "Administratorar kan ikkje fjerna seg sjølve frå admin-gruppa",
-"Unable to add user to group %s" => "Klarte ikkje leggja til brukaren til gruppa %s",
-"Unable to remove user from group %s" => "Klarte ikkje fjerna brukaren frå gruppa %s",
-"Couldn't update app." => "Klarte ikkje oppdatera programmet.",
-"Wrong password" => "Feil passord",
-"No user supplied" => "Ingen brukar gitt",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
-"Wrong admin recovery password. Please check the password and try again." => "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
-"Unable to change password" => "Klarte ikkje å endra passordet",
-"Email sent" => "E-post sendt",
-"All" => "Alle",
-"Please wait...." => "Ver venleg og vent …",
-"Error while disabling app" => "Klarte ikkje å skru av programmet",
-"Disable" => "Slå av",
-"Enable" => "Slå på",
-"Error while enabling app" => "Klarte ikkje å skru på programmet",
-"Updating...." => "Oppdaterer …",
-"Error while updating app" => "Feil ved oppdatering av app",
-"Updated" => "Oppdatert",
-"Select a profile picture" => "Vel eit profilbilete",
-"Very weak password" => "Veldig svakt passord",
-"Weak password" => "Svakt passord",
-"Delete" => "Slett",
-"Decrypting files... Please wait, this can take some time." => "Dekrypterer filer … Ver venleg og vent, dette kan ta ei stund.",
-"Groups" => "Grupper",
-"undo" => "angra",
-"never" => "aldri",
-"add group" => "legg til gruppe",
-"A valid username must be provided" => "Du må oppgje eit gyldig brukarnamn",
-"Error creating user" => "Feil ved oppretting av brukar",
-"A valid password must be provided" => "Du må oppgje eit gyldig passord",
-"__language_name__" => "Nynorsk",
-"Encryption" => "Kryptering",
-"Login" => "Logg inn",
-"Security Warning" => "Tryggleiksåtvaring",
-"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." => "Datamappa og filene dine er sannsynlegvis leselege frå nettet. Fila .htaccess fungerer ikkje. Me rår deg sterkt til å konfigurera vevtenaren din sånn at datamappa di ikkje lenger er tilgjengeleg; alternativt kan du flytta datamappa ut av dokumentrot til vevtenaren.",
-"Setup Warning" => "Oppsettsåtvaring",
-"Module 'fileinfo' missing" => "Modulen «fileinfo» manglar",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
-"Locale not working" => "Regionaldata fungerer ikkje",
-"Please double check the <a href='%s'>installation guides</a>." => "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Utfør éi oppgåve for kvar sidelasting",
-"Sharing" => "Deling",
-"Allow apps to use the Share API" => "La app-ar bruka API-et til deling",
-"Allow public uploads" => "Tillat offentlege opplastingar",
-"Allow resharing" => "Tillat vidaredeling",
-"Security" => "Tryggleik",
-"Enforce HTTPS" => "Krev HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
-"Server address" => "Tenaradresse",
-"Log" => "Logg",
-"Log level" => "Log nivå",
-"More" => "Meir",
-"Less" => "Mindre",
-"Version" => "Utgåve",
-"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>." => "<a href=\"https://github.com/owncloud\" target=\"_blank\">Kjeldekoden</a>, utvikla av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-fellesskapet</a>, er lisensiert under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "av",
-"User Documentation" => "Brukardokumentasjon",
-"Administrator Documentation" => "Administratordokumentasjon",
-"Online Documentation" => "Dokumentasjon på nett",
-"Forum" => "Forum",
-"Bugtracker" => "Feilsporar",
-"Commercial Support" => "Betalt brukarstøtte",
-"Get the apps to sync your files" => "Få app-ar som kan synkronisera filene dine",
-"Show First Run Wizard again" => "Vis Oppstartvegvisaren igjen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har brukt <strong>%s</strong> av dine tilgjengelege <strong>%s</strong>",
-"Password" => "Passord",
-"Your password was changed" => "Passordet ditt er endra",
-"Unable to change your password" => "Klarte ikkje endra passordet",
-"Current password" => "Passord",
-"New password" => "Nytt passord",
-"Change password" => "Endra passord",
-"Email" => "E-post",
-"Your email address" => "Di epost-adresse",
-"Profile picture" => "Profilbilete",
-"Upload new" => "Last opp ny",
-"Select new from Files" => "Vel ny frå Filer",
-"Remove image" => "Fjern bilete",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Anten PNG eller JPG. Helst kvadratisk, men du får moglegheita til å beskjera det.",
-"Cancel" => "Avbryt",
-"Choose as profile image" => "Vel som profilbilete",
-"Language" => "Språk",
-"Help translate" => "Hjelp oss å omsetja",
-"Log-in password" => "Innloggingspassord",
-"Decrypt all Files" => "Dekrypter alle filene",
-"Login Name" => "Innloggingsnamn",
-"Create" => "Lag",
-"Admin Recovery Password" => "Gjenopprettingspassord for administrator",
-"Enter the recovery password in order to recover the users files during password change" => "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
-"Group" => "Gruppe",
-"Unlimited" => "Ubegrensa",
-"Other" => "Anna",
-"Username" => "Brukarnamn",
-"Quota" => "Kvote",
-"set new password" => "lag nytt passord",
-"Default" => "Standard"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
new file mode 100644
index 00000000000..ffc80bd4ec4
--- /dev/null
+++ b/settings/l10n/oc.js
@@ -0,0 +1,48 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Error d'autentificacion",
+    "Group already exists" : "Lo grop existís ja",
+    "Unable to add group" : "Pas capable d'apondre  un grop",
+    "Email saved" : "Corrièl enregistrat",
+    "Invalid email" : "Corrièl incorrècte",
+    "Unable to delete group" : "Pas capable d'escafar un grop",
+    "Unable to delete user" : "Pas capable d'escafar un usancièr",
+    "Language changed" : "Lengas cambiadas",
+    "Invalid request" : "Demanda invalida",
+    "Unable to add user to group %s" : "Pas capable d'apondre un usancièr al grop %s",
+    "Unable to remove user from group %s" : "Pas capable de tira un usancièr del grop %s",
+    "Disable" : "Desactiva",
+    "Enable" : "Activa",
+    "Delete" : "Escafa",
+    "Groups" : "Grops",
+    "undo" : "defar",
+    "never" : "jamai",
+    "__language_name__" : "__language_name__",
+    "Login" : "Login",
+    "Security Warning" : "Avertiment de securitat",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Executa un prètfach amb cada pagina cargada",
+    "Sharing" : "Al partejar",
+    "Log" : "Jornal",
+    "More" : "Mai d'aquò",
+    "by" : "per",
+    "Password" : "Senhal",
+    "Your password was changed" : "Ton senhal a cambiat",
+    "Unable to change your password" : "Pas possible de cambiar ton senhal",
+    "Current password" : "Senhal en cors",
+    "New password" : "Senhal novèl",
+    "Change password" : "Cambia lo senhal",
+    "Email" : "Corrièl",
+    "Your email address" : "Ton adreiça de corrièl",
+    "Cancel" : "Annula",
+    "Language" : "Lenga",
+    "Help translate" : "Ajuda a la revirada",
+    "Login Name" : "Login",
+    "Create" : "Crea",
+    "Default Quota" : "Quota per defaut",
+    "Other" : "Autres",
+    "Username" : "Non d'usancièr",
+    "Quota" : "Quota"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
new file mode 100644
index 00000000000..edd8e90404d
--- /dev/null
+++ b/settings/l10n/oc.json
@@ -0,0 +1,46 @@
+{ "translations": {
+    "Authentication error" : "Error d'autentificacion",
+    "Group already exists" : "Lo grop existís ja",
+    "Unable to add group" : "Pas capable d'apondre  un grop",
+    "Email saved" : "Corrièl enregistrat",
+    "Invalid email" : "Corrièl incorrècte",
+    "Unable to delete group" : "Pas capable d'escafar un grop",
+    "Unable to delete user" : "Pas capable d'escafar un usancièr",
+    "Language changed" : "Lengas cambiadas",
+    "Invalid request" : "Demanda invalida",
+    "Unable to add user to group %s" : "Pas capable d'apondre un usancièr al grop %s",
+    "Unable to remove user from group %s" : "Pas capable de tira un usancièr del grop %s",
+    "Disable" : "Desactiva",
+    "Enable" : "Activa",
+    "Delete" : "Escafa",
+    "Groups" : "Grops",
+    "undo" : "defar",
+    "never" : "jamai",
+    "__language_name__" : "__language_name__",
+    "Login" : "Login",
+    "Security Warning" : "Avertiment de securitat",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Executa un prètfach amb cada pagina cargada",
+    "Sharing" : "Al partejar",
+    "Log" : "Jornal",
+    "More" : "Mai d'aquò",
+    "by" : "per",
+    "Password" : "Senhal",
+    "Your password was changed" : "Ton senhal a cambiat",
+    "Unable to change your password" : "Pas possible de cambiar ton senhal",
+    "Current password" : "Senhal en cors",
+    "New password" : "Senhal novèl",
+    "Change password" : "Cambia lo senhal",
+    "Email" : "Corrièl",
+    "Your email address" : "Ton adreiça de corrièl",
+    "Cancel" : "Annula",
+    "Language" : "Lenga",
+    "Help translate" : "Ajuda a la revirada",
+    "Login Name" : "Login",
+    "Create" : "Crea",
+    "Default Quota" : "Quota per defaut",
+    "Other" : "Autres",
+    "Username" : "Non d'usancièr",
+    "Quota" : "Quota"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/oc.php b/settings/l10n/oc.php
deleted file mode 100644
index 6c41061bbe7..00000000000
--- a/settings/l10n/oc.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Error d'autentificacion",
-"Group already exists" => "Lo grop existís ja",
-"Unable to add group" => "Pas capable d'apondre  un grop",
-"Email saved" => "Corrièl enregistrat",
-"Invalid email" => "Corrièl incorrècte",
-"Unable to delete group" => "Pas capable d'escafar un grop",
-"Unable to delete user" => "Pas capable d'escafar un usancièr",
-"Language changed" => "Lengas cambiadas",
-"Invalid request" => "Demanda invalida",
-"Unable to add user to group %s" => "Pas capable d'apondre un usancièr al grop %s",
-"Unable to remove user from group %s" => "Pas capable de tira un usancièr del grop %s",
-"Disable" => "Desactiva",
-"Enable" => "Activa",
-"Delete" => "Escafa",
-"Groups" => "Grops",
-"undo" => "defar",
-"never" => "jamai",
-"__language_name__" => "__language_name__",
-"Login" => "Login",
-"Security Warning" => "Avertiment de securitat",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Executa un prètfach amb cada pagina cargada",
-"Sharing" => "Al partejar",
-"Log" => "Jornal",
-"More" => "Mai d'aquò",
-"by" => "per",
-"Password" => "Senhal",
-"Your password was changed" => "Ton senhal a cambiat",
-"Unable to change your password" => "Pas possible de cambiar ton senhal",
-"Current password" => "Senhal en cors",
-"New password" => "Senhal novèl",
-"Change password" => "Cambia lo senhal",
-"Email" => "Corrièl",
-"Your email address" => "Ton adreiça de corrièl",
-"Cancel" => "Annula",
-"Language" => "Lenga",
-"Help translate" => "Ajuda a la revirada",
-"Login Name" => "Login",
-"Create" => "Crea",
-"Default Quota" => "Quota per defaut",
-"Other" => "Autres",
-"Username" => "Non d'usancièr",
-"Quota" => "Quota"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pa.js b/settings/l10n/pa.js
new file mode 100644
index 00000000000..ef0c5083b06
--- /dev/null
+++ b/settings/l10n/pa.js
@@ -0,0 +1,25 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Language changed" : "ਭਾਸ਼ਾ ਬਦਲੀ",
+    "Please wait...." : "...ਉਡੀਕੋ ਜੀ",
+    "Disable" : "ਬੰਦ",
+    "Enable" : "ਚਾਲੂ",
+    "Updating...." : "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+    "Updated" : "ਅੱਪਡੇਟ ਕੀਤਾ",
+    "Delete" : "ਹਟਾਓ",
+    "Groups" : "ਗਰੁੱਪ",
+    "undo" : "ਵਾਪਸ",
+    "add group" : "ਗਰੁੱਪ ਸ਼ਾਮਲ",
+    "__language_name__" : "__ਭਾਸ਼ਾ_ਨਾਂ__",
+    "Login" : "ਲਾਗਇਨ",
+    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Setup Warning" : "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ",
+    "Server address" : "ਸਰਵਰ ਐਡਰੈਸ",
+    "Password" : "ਪਾਸਵਰ",
+    "Change password" : "ਪਾਸਵਰਡ ਬਦਲੋ",
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Login Name" : "ਲਾਗਇਨ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/pa.json b/settings/l10n/pa.json
new file mode 100644
index 00000000000..4f836b1b384
--- /dev/null
+++ b/settings/l10n/pa.json
@@ -0,0 +1,23 @@
+{ "translations": {
+    "Language changed" : "ਭਾਸ਼ਾ ਬਦਲੀ",
+    "Please wait...." : "...ਉਡੀਕੋ ਜੀ",
+    "Disable" : "ਬੰਦ",
+    "Enable" : "ਚਾਲੂ",
+    "Updating...." : "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
+    "Updated" : "ਅੱਪਡੇਟ ਕੀਤਾ",
+    "Delete" : "ਹਟਾਓ",
+    "Groups" : "ਗਰੁੱਪ",
+    "undo" : "ਵਾਪਸ",
+    "add group" : "ਗਰੁੱਪ ਸ਼ਾਮਲ",
+    "__language_name__" : "__ਭਾਸ਼ਾ_ਨਾਂ__",
+    "Login" : "ਲਾਗਇਨ",
+    "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Setup Warning" : "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ",
+    "Server address" : "ਸਰਵਰ ਐਡਰੈਸ",
+    "Password" : "ਪਾਸਵਰ",
+    "Change password" : "ਪਾਸਵਰਡ ਬਦਲੋ",
+    "Cancel" : "ਰੱਦ ਕਰੋ",
+    "Login Name" : "ਲਾਗਇਨ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/pa.php b/settings/l10n/pa.php
deleted file mode 100644
index 2bfd1e44999..00000000000
--- a/settings/l10n/pa.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Language changed" => "ਭਾਸ਼ਾ ਬਦਲੀ",
-"Please wait...." => "...ਉਡੀਕੋ ਜੀ",
-"Disable" => "ਬੰਦ",
-"Enable" => "ਚਾਲੂ",
-"Updating...." => "...ਅੱਪਡੇਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ",
-"Updated" => "ਅੱਪਡੇਟ ਕੀਤਾ",
-"Delete" => "ਹਟਾਓ",
-"Groups" => "ਗਰੁੱਪ",
-"undo" => "ਵਾਪਸ",
-"add group" => "ਗਰੁੱਪ ਸ਼ਾਮਲ",
-"__language_name__" => "__ਭਾਸ਼ਾ_ਨਾਂ__",
-"Login" => "ਲਾਗਇਨ",
-"Security Warning" => "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
-"Setup Warning" => "ਸੈਟਅੱਪ ਚੇਤਾਵਨੀ",
-"Server address" => "ਸਰਵਰ ਐਡਰੈਸ",
-"Password" => "ਪਾਸਵਰ",
-"Change password" => "ਪਾਸਵਰਡ ਬਦਲੋ",
-"Cancel" => "ਰੱਦ ਕਰੋ",
-"Login Name" => "ਲਾਗਇਨ",
-"Username" => "ਯੂਜ਼ਰ-ਨਾਂ"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
new file mode 100644
index 00000000000..b1b88da2661
--- /dev/null
+++ b/settings/l10n/pl.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Włączone",
+    "Authentication error" : "Błąd uwierzytelniania",
+    "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
+    "Unable to change full name" : "Nie można zmienić pełnej nazwy",
+    "Group already exists" : "Grupa już istnieje",
+    "Unable to add group" : "Nie można dodać grupy",
+    "Files decrypted successfully" : "Pliki zostały poprawnie zdeszyfrowane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
+    "Couldn't decrypt your files, check your password and try again" : "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
+    "Encryption keys deleted permanently" : "Klucze szyfrujące zostały trwale usunięte",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
+    "Couldn't remove app." : "Nie można usunąć aplikacji.",
+    "Email saved" : "E-mail zapisany",
+    "Invalid email" : "Nieprawidłowy e-mail",
+    "Unable to delete group" : "Nie można usunąć grupy",
+    "Unable to delete user" : "Nie można usunąć użytkownika",
+    "Backups restored successfully" : "Archiwum zostało prawidłowo przywrócone",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
+    "Language changed" : "Zmieniono język",
+    "Invalid request" : "Nieprawidłowe żądanie",
+    "Admins can't remove themself from the admin group" : "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
+    "Unable to add user to group %s" : "Nie można dodać użytkownika do grupy %s",
+    "Unable to remove user from group %s" : "Nie można usunąć użytkownika z grupy %s",
+    "Couldn't update app." : "Nie można uaktualnić aplikacji.",
+    "Wrong password" : "Złe hasło",
+    "No user supplied" : "Niedostarczony użytkownik",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone",
+    "Wrong admin recovery password. Please check the password and try again." : "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
+    "Unable to change password" : "Nie można zmienić hasła",
+    "Saved" : "Zapisano",
+    "test email settings" : "przetestuj ustawienia email",
+    "If you received this email, the settings seem to be correct." : "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
+    "Email sent" : "E-mail wysłany",
+    "You need to set your user email before being able to send test emails." : "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
+    "Add trusted domain" : "Dodaj zaufaną domenę",
+    "Sending..." : "Wysyłam...",
+    "All" : "Wszystkie",
+    "Please wait...." : "Proszę czekać...",
+    "Error while disabling app" : "Błąd podczas wyłączania aplikacji",
+    "Disable" : "Wyłącz",
+    "Enable" : "Włącz",
+    "Error while enabling app" : "Błąd podczas włączania aplikacji",
+    "Updating...." : "Aktualizacja w toku...",
+    "Error while updating app" : "Błąd podczas aktualizacji aplikacji",
+    "Updated" : "Zaktualizowano",
+    "Uninstalling ...." : "Odinstalowywanie....",
+    "Error while uninstalling app" : "Błąd przy odinstalowywaniu aplikacji",
+    "Uninstall" : "Odinstaluj",
+    "Select a profile picture" : "Wybierz zdjęcie profilu",
+    "Very weak password" : "Bardzo słabe hasło",
+    "Weak password" : "Słabe hasło",
+    "So-so password" : "Mało skomplikowane hasło",
+    "Good password" : "Dobre hasło",
+    "Strong password" : "Mocne hasło",
+    "Valid until {date}" : "Ważny do {date}",
+    "Delete" : "Usuń",
+    "Decrypting files... Please wait, this can take some time." : "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
+    "Delete encryption keys permanently." : "Usuń trwale klucze szyfrujące.",
+    "Restore encryption keys." : "Przywróć klucze szyfrujące.",
+    "Groups" : "Grupy",
+    "Unable to delete {objName}" : "Nie można usunąć {objName}",
+    "Error creating group" : "Błąd podczas tworzenia grupy",
+    "A valid group name must be provided" : "Należy podać prawidłową nazwę grupy",
+    "deleted {groupName}" : "usunięto {groupName}",
+    "undo" : "cofnij",
+    "never" : "nigdy",
+    "deleted {userName}" : "usunięto {userName}",
+    "add group" : "dodaj grupę",
+    "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
+    "Error creating user" : "Błąd podczas tworzenia użytkownika",
+    "A valid password must be provided" : "Należy podać prawidłowe hasło",
+    "Warning: Home directory for user \"{user}\" already exists" : "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
+    "__language_name__" : "polski",
+    "SSL root certificates" : "Główny certyfikat SSL",
+    "Encryption" : "Szyfrowanie",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
+    "Info, warnings, errors and fatal issues" : "Informacje, ostrzeżenia, błędy i poważne problemy",
+    "Warnings, errors and fatal issues" : "Ostrzeżenia, błędy i poważne problemy",
+    "Errors and fatal issues" : "Błędy i poważne problemy",
+    "Fatal issues only" : "Tylko poważne problemy",
+    "None" : "Nic",
+    "Login" : "Login",
+    "Plain" : "Czysty tekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Ostrzeżenie o zabezpieczeniach",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Uzyskujesz dostęp do %s za pomocą protokołu HTTP. Zalecamy skonfigurować swój serwer z użyciem protokołu HTTPS.",
+    "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." : "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
+    "Setup Warning" : "Ostrzeżenia konfiguracji",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
+    "Database Performance Info" : "Informacja o wydajności bazy danych",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Jako baza danych został użyty SQLite. Dla większych instalacji doradzamy zmianę na inną. Aby zmigrować do innej bazy danych, użyj narzędzia linii poleceń: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Brak modułu „fileinfo”",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
+    "Your PHP version is outdated" : "Twoja wersja PHP jest za stara",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Twoja wersja PHP jest za stara. Rekomendujemy przynajmniej wersje 5.3.8. Jeśli masz starsza wersję ownCloud może nie działać poprawnie.",
+    "PHP charset is not set to UTF-8" : "Kodowanie PHP nie jest ustawione na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Zestaw znaków PHP nie jest ustawiony na UTF-8. Może to spowodować poważne problemy ze znakami non-ASCII w nazwach plików. Gorąco doradzamy zmianę wartości 'default_charset' w php.ini na 'UTF-8'.",
+    "Locale not working" : "Lokalizacja nie działa",
+    "System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
+    "URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
+    "Connectivity checks" : "Sprawdzanie łączności",
+    "No problems found" : "Nie ma żadnych problemów",
+    "Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Ostatni cron był uruchomiony %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
+    "Cron was not executed yet!" : "Cron nie został jeszcze uruchomiony!",
+    "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
+    "Sharing" : "Udostępnianie",
+    "Allow apps to use the Share API" : "Zezwalaj aplikacjom na korzystanie z API udostępniania",
+    "Allow users to share via link" : "Pozwól użytkownikom współdzielić przez link",
+    "Enforce password protection" : "Wymuś zabezpieczenie hasłem",
+    "Allow public uploads" : "Pozwól na  publiczne wczytywanie",
+    "Set default expiration date" : "Ustaw domyślną datę wygaśnięcia",
+    "Expire after " : "Wygaś po",
+    "days" : "dniach",
+    "Enforce expiration date" : "Wymuś datę wygaśnięcia",
+    "Allow resharing" : "Zezwalaj na ponowne udostępnianie",
+    "Restrict users to only share with users in their groups" : "Ogranicz użytkowników do współdzielenia wyłącznie pomiędzy użytkownikami swoich grup",
+    "Allow users to send mail notification for shared files" : "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
+    "Exclude groups from sharing" : "Wyklucz grupy z udostępniania",
+    "These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
+    "Security" : "Bezpieczeństwo",
+    "Enforce HTTPS" : "Wymuś HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
+    "Email Server" : "Serwer pocztowy",
+    "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
+    "Send mode" : "Tryb wysyłki",
+    "From address" : "Z adresu",
+    "mail" : "mail",
+    "Authentication method" : "Metoda autentykacji",
+    "Authentication required" : "Wymagana autoryzacja",
+    "Server address" : "Adres Serwera",
+    "Port" : "Port",
+    "Credentials" : "Poświadczenia",
+    "SMTP Username" : "Użytkownik SMTP",
+    "SMTP Password" : "Hasło SMTP",
+    "Test email settings" : "Ustawienia testowej wiadomości",
+    "Send email" : "Wyślij email",
+    "Log" : "Logi",
+    "Log level" : "Poziom logów",
+    "More" : "Więcej",
+    "Less" : "Mniej",
+    "Version" : "Wersja",
+    "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>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Więcej aplikacji",
+    "by" : "przez",
+    "Documentation:" : "Dokumentacja:",
+    "User Documentation" : "Dokumentacja użytkownika",
+    "Admin Documentation" : "Dokumentacja Administratora",
+    "Enable only for specific groups" : "Włącz tylko dla określonych grup",
+    "Uninstall App" : "Odinstaluj aplikację",
+    "Administrator Documentation" : "Dokumentacja administratora",
+    "Online Documentation" : "Dokumentacja online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Zgłaszanie błędów",
+    "Commercial Support" : "Wsparcie komercyjne",
+    "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
+    "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
+    "Password" : "Hasło",
+    "Your password was changed" : "Twoje hasło zostało zmienione",
+    "Unable to change your password" : "Nie można zmienić hasła",
+    "Current password" : "Bieżące hasło",
+    "New password" : "Nowe hasło",
+    "Change password" : "Zmień hasło",
+    "Full Name" : "Pełna nazwa",
+    "Email" : "Email",
+    "Your email address" : "Twój adres e-mail",
+    "Fill in an email address to enable password recovery and receive notifications" : "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia",
+    "Profile picture" : "Zdjęcie profilu",
+    "Upload new" : "Wczytaj nowe",
+    "Select new from Files" : "Wybierz nowe z plików",
+    "Remove image" : "Usuń zdjęcie",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Png lub jpg. Idealnie kwadratowy, ale będzie można je przyciąć.",
+    "Your avatar is provided by your original account." : "Twój awatar jest ustawiony jako domyślny.",
+    "Cancel" : "Anuluj",
+    "Choose as profile image" : "Wybierz zdjęcie profilu",
+    "Language" : "Język",
+    "Help translate" : "Pomóż w tłumaczeniu",
+    "Common Name" : "Nazwa CN",
+    "Valid until" : "Ważny do",
+    "Issued By" : "Wydany przez",
+    "Valid until %s" : "Ważny do %s",
+    "Import Root Certificate" : "Importuj główny certyfikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
+    "Log-in password" : "Hasło logowania",
+    "Decrypt all Files" : "Odszyfruj wszystkie pliki",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
+    "Restore Encryption Keys" : "Przywróć klucze szyfrujące",
+    "Delete Encryption Keys" : "Usuń klucze szyfrujące",
+    "Show storage location" : "Pokaż miejsce przechowywania",
+    "Show last log in" : "Pokaż ostatni login",
+    "Login Name" : "Login",
+    "Create" : "Utwórz",
+    "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
+    "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
+    "Search Users and Groups" : "Przeszukuj użytkowników i grupy",
+    "Add Group" : "Dodaj grupę",
+    "Group" : "Grupa",
+    "Everyone" : "Wszyscy",
+    "Admins" : "Administratorzy",
+    "Default Quota" : "Domyślny udział",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
+    "Unlimited" : "Bez limitu",
+    "Other" : "Inne",
+    "Username" : "Nazwa użytkownika",
+    "Quota" : "Udział",
+    "Storage Location" : "Lokalizacja magazynu",
+    "Last Login" : "Ostatnio zalogowany",
+    "change full name" : "Zmień pełna nazwę",
+    "set new password" : "ustaw nowe hasło",
+    "Default" : "Domyślny"
+},
+"nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
new file mode 100644
index 00000000000..eb34091a7f9
--- /dev/null
+++ b/settings/l10n/pl.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "Włączone",
+    "Authentication error" : "Błąd uwierzytelniania",
+    "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
+    "Unable to change full name" : "Nie można zmienić pełnej nazwy",
+    "Group already exists" : "Grupa już istnieje",
+    "Unable to add group" : "Nie można dodać grupy",
+    "Files decrypted successfully" : "Pliki zostały poprawnie zdeszyfrowane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
+    "Couldn't decrypt your files, check your password and try again" : "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
+    "Encryption keys deleted permanently" : "Klucze szyfrujące zostały trwale usunięte",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
+    "Couldn't remove app." : "Nie można usunąć aplikacji.",
+    "Email saved" : "E-mail zapisany",
+    "Invalid email" : "Nieprawidłowy e-mail",
+    "Unable to delete group" : "Nie można usunąć grupy",
+    "Unable to delete user" : "Nie można usunąć użytkownika",
+    "Backups restored successfully" : "Archiwum zostało prawidłowo przywrócone",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
+    "Language changed" : "Zmieniono język",
+    "Invalid request" : "Nieprawidłowe żądanie",
+    "Admins can't remove themself from the admin group" : "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
+    "Unable to add user to group %s" : "Nie można dodać użytkownika do grupy %s",
+    "Unable to remove user from group %s" : "Nie można usunąć użytkownika z grupy %s",
+    "Couldn't update app." : "Nie można uaktualnić aplikacji.",
+    "Wrong password" : "Złe hasło",
+    "No user supplied" : "Niedostarczony użytkownik",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone",
+    "Wrong admin recovery password. Please check the password and try again." : "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
+    "Unable to change password" : "Nie można zmienić hasła",
+    "Saved" : "Zapisano",
+    "test email settings" : "przetestuj ustawienia email",
+    "If you received this email, the settings seem to be correct." : "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
+    "Email sent" : "E-mail wysłany",
+    "You need to set your user email before being able to send test emails." : "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
+    "Add trusted domain" : "Dodaj zaufaną domenę",
+    "Sending..." : "Wysyłam...",
+    "All" : "Wszystkie",
+    "Please wait...." : "Proszę czekać...",
+    "Error while disabling app" : "Błąd podczas wyłączania aplikacji",
+    "Disable" : "Wyłącz",
+    "Enable" : "Włącz",
+    "Error while enabling app" : "Błąd podczas włączania aplikacji",
+    "Updating...." : "Aktualizacja w toku...",
+    "Error while updating app" : "Błąd podczas aktualizacji aplikacji",
+    "Updated" : "Zaktualizowano",
+    "Uninstalling ...." : "Odinstalowywanie....",
+    "Error while uninstalling app" : "Błąd przy odinstalowywaniu aplikacji",
+    "Uninstall" : "Odinstaluj",
+    "Select a profile picture" : "Wybierz zdjęcie profilu",
+    "Very weak password" : "Bardzo słabe hasło",
+    "Weak password" : "Słabe hasło",
+    "So-so password" : "Mało skomplikowane hasło",
+    "Good password" : "Dobre hasło",
+    "Strong password" : "Mocne hasło",
+    "Valid until {date}" : "Ważny do {date}",
+    "Delete" : "Usuń",
+    "Decrypting files... Please wait, this can take some time." : "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
+    "Delete encryption keys permanently." : "Usuń trwale klucze szyfrujące.",
+    "Restore encryption keys." : "Przywróć klucze szyfrujące.",
+    "Groups" : "Grupy",
+    "Unable to delete {objName}" : "Nie można usunąć {objName}",
+    "Error creating group" : "Błąd podczas tworzenia grupy",
+    "A valid group name must be provided" : "Należy podać prawidłową nazwę grupy",
+    "deleted {groupName}" : "usunięto {groupName}",
+    "undo" : "cofnij",
+    "never" : "nigdy",
+    "deleted {userName}" : "usunięto {userName}",
+    "add group" : "dodaj grupę",
+    "A valid username must be provided" : "Należy podać prawidłową nazwę użytkownika",
+    "Error creating user" : "Błąd podczas tworzenia użytkownika",
+    "A valid password must be provided" : "Należy podać prawidłowe hasło",
+    "Warning: Home directory for user \"{user}\" already exists" : "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
+    "__language_name__" : "polski",
+    "SSL root certificates" : "Główny certyfikat SSL",
+    "Encryption" : "Szyfrowanie",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
+    "Info, warnings, errors and fatal issues" : "Informacje, ostrzeżenia, błędy i poważne problemy",
+    "Warnings, errors and fatal issues" : "Ostrzeżenia, błędy i poważne problemy",
+    "Errors and fatal issues" : "Błędy i poważne problemy",
+    "Fatal issues only" : "Tylko poważne problemy",
+    "None" : "Nic",
+    "Login" : "Login",
+    "Plain" : "Czysty tekst",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Ostrzeżenie o zabezpieczeniach",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Uzyskujesz dostęp do %s za pomocą protokołu HTTP. Zalecamy skonfigurować swój serwer z użyciem protokołu HTTPS.",
+    "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." : "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
+    "Setup Warning" : "Ostrzeżenia konfiguracji",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
+    "Database Performance Info" : "Informacja o wydajności bazy danych",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Jako baza danych został użyty SQLite. Dla większych instalacji doradzamy zmianę na inną. Aby zmigrować do innej bazy danych, użyj narzędzia linii poleceń: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Brak modułu „fileinfo”",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
+    "Your PHP version is outdated" : "Twoja wersja PHP jest za stara",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Twoja wersja PHP jest za stara. Rekomendujemy przynajmniej wersje 5.3.8. Jeśli masz starsza wersję ownCloud może nie działać poprawnie.",
+    "PHP charset is not set to UTF-8" : "Kodowanie PHP nie jest ustawione na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Zestaw znaków PHP nie jest ustawiony na UTF-8. Może to spowodować poważne problemy ze znakami non-ASCII w nazwach plików. Gorąco doradzamy zmianę wartości 'default_charset' w php.ini na 'UTF-8'.",
+    "Locale not working" : "Lokalizacja nie działa",
+    "System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
+    "URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
+    "Connectivity checks" : "Sprawdzanie łączności",
+    "No problems found" : "Nie ma żadnych problemów",
+    "Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Ostatni cron był uruchomiony %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
+    "Cron was not executed yet!" : "Cron nie został jeszcze uruchomiony!",
+    "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
+    "Sharing" : "Udostępnianie",
+    "Allow apps to use the Share API" : "Zezwalaj aplikacjom na korzystanie z API udostępniania",
+    "Allow users to share via link" : "Pozwól użytkownikom współdzielić przez link",
+    "Enforce password protection" : "Wymuś zabezpieczenie hasłem",
+    "Allow public uploads" : "Pozwól na  publiczne wczytywanie",
+    "Set default expiration date" : "Ustaw domyślną datę wygaśnięcia",
+    "Expire after " : "Wygaś po",
+    "days" : "dniach",
+    "Enforce expiration date" : "Wymuś datę wygaśnięcia",
+    "Allow resharing" : "Zezwalaj na ponowne udostępnianie",
+    "Restrict users to only share with users in their groups" : "Ogranicz użytkowników do współdzielenia wyłącznie pomiędzy użytkownikami swoich grup",
+    "Allow users to send mail notification for shared files" : "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
+    "Exclude groups from sharing" : "Wyklucz grupy z udostępniania",
+    "These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
+    "Security" : "Bezpieczeństwo",
+    "Enforce HTTPS" : "Wymuś HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
+    "Email Server" : "Serwer pocztowy",
+    "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
+    "Send mode" : "Tryb wysyłki",
+    "From address" : "Z adresu",
+    "mail" : "mail",
+    "Authentication method" : "Metoda autentykacji",
+    "Authentication required" : "Wymagana autoryzacja",
+    "Server address" : "Adres Serwera",
+    "Port" : "Port",
+    "Credentials" : "Poświadczenia",
+    "SMTP Username" : "Użytkownik SMTP",
+    "SMTP Password" : "Hasło SMTP",
+    "Test email settings" : "Ustawienia testowej wiadomości",
+    "Send email" : "Wyślij email",
+    "Log" : "Logi",
+    "Log level" : "Poziom logów",
+    "More" : "Więcej",
+    "Less" : "Mniej",
+    "Version" : "Wersja",
+    "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>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Więcej aplikacji",
+    "by" : "przez",
+    "Documentation:" : "Dokumentacja:",
+    "User Documentation" : "Dokumentacja użytkownika",
+    "Admin Documentation" : "Dokumentacja Administratora",
+    "Enable only for specific groups" : "Włącz tylko dla określonych grup",
+    "Uninstall App" : "Odinstaluj aplikację",
+    "Administrator Documentation" : "Dokumentacja administratora",
+    "Online Documentation" : "Dokumentacja online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Zgłaszanie błędów",
+    "Commercial Support" : "Wsparcie komercyjne",
+    "Get the apps to sync your files" : "Pobierz aplikacje żeby synchronizować swoje pliki",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
+    "Show First Run Wizard again" : "Uruchom ponownie kreatora pierwszego uruchomienia",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
+    "Password" : "Hasło",
+    "Your password was changed" : "Twoje hasło zostało zmienione",
+    "Unable to change your password" : "Nie można zmienić hasła",
+    "Current password" : "Bieżące hasło",
+    "New password" : "Nowe hasło",
+    "Change password" : "Zmień hasło",
+    "Full Name" : "Pełna nazwa",
+    "Email" : "Email",
+    "Your email address" : "Twój adres e-mail",
+    "Fill in an email address to enable password recovery and receive notifications" : "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia",
+    "Profile picture" : "Zdjęcie profilu",
+    "Upload new" : "Wczytaj nowe",
+    "Select new from Files" : "Wybierz nowe z plików",
+    "Remove image" : "Usuń zdjęcie",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Png lub jpg. Idealnie kwadratowy, ale będzie można je przyciąć.",
+    "Your avatar is provided by your original account." : "Twój awatar jest ustawiony jako domyślny.",
+    "Cancel" : "Anuluj",
+    "Choose as profile image" : "Wybierz zdjęcie profilu",
+    "Language" : "Język",
+    "Help translate" : "Pomóż w tłumaczeniu",
+    "Common Name" : "Nazwa CN",
+    "Valid until" : "Ważny do",
+    "Issued By" : "Wydany przez",
+    "Valid until %s" : "Ważny do %s",
+    "Import Root Certificate" : "Importuj główny certyfikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
+    "Log-in password" : "Hasło logowania",
+    "Decrypt all Files" : "Odszyfruj wszystkie pliki",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
+    "Restore Encryption Keys" : "Przywróć klucze szyfrujące",
+    "Delete Encryption Keys" : "Usuń klucze szyfrujące",
+    "Show storage location" : "Pokaż miejsce przechowywania",
+    "Show last log in" : "Pokaż ostatni login",
+    "Login Name" : "Login",
+    "Create" : "Utwórz",
+    "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
+    "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
+    "Search Users and Groups" : "Przeszukuj użytkowników i grupy",
+    "Add Group" : "Dodaj grupę",
+    "Group" : "Grupa",
+    "Everyone" : "Wszyscy",
+    "Admins" : "Administratorzy",
+    "Default Quota" : "Domyślny udział",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
+    "Unlimited" : "Bez limitu",
+    "Other" : "Inne",
+    "Username" : "Nazwa użytkownika",
+    "Quota" : "Udział",
+    "Storage Location" : "Lokalizacja magazynu",
+    "Last Login" : "Ostatnio zalogowany",
+    "change full name" : "Zmień pełna nazwę",
+    "set new password" : "ustaw nowe hasło",
+    "Default" : "Domyślny"
+},"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/settings/l10n/pl.php b/settings/l10n/pl.php
deleted file mode 100644
index 481fec558b6..00000000000
--- a/settings/l10n/pl.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Włączone",
-"Not enabled" => "Nie włączone",
-"Recommended" => "Polecane",
-"Authentication error" => "Błąd uwierzytelniania",
-"Your full name has been changed." => "Twoja pełna nazwa została zmieniona.",
-"Unable to change full name" => "Nie można zmienić pełnej nazwy",
-"Group already exists" => "Grupa już istnieje",
-"Unable to add group" => "Nie można dodać grupy",
-"Files decrypted successfully" => "Pliki zostały poprawnie zdeszyfrowane",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nie można zdeszyfrować Twoich plików, proszę sprawdzić owncloud.log lub zapytać administratora",
-"Couldn't decrypt your files, check your password and try again" => "Nie można zdeszyfrować Twoich plików, sprawdź swoje hasło i spróbuj ponownie",
-"Encryption keys deleted permanently" => "Klucze szyfrujące zostały trwale usunięte",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można trwale usunąć Twoich kluczy szyfrujących, proszę sprawdź owncloud.log lub zapytaj administratora",
-"Couldn't remove app." => "Nie można usunąć aplikacji.",
-"Email saved" => "E-mail zapisany",
-"Invalid email" => "Nieprawidłowy e-mail",
-"Unable to delete group" => "Nie można usunąć grupy",
-"Unable to delete user" => "Nie można usunąć użytkownika",
-"Backups restored successfully" => "Archiwum zostało prawidłowo przywrócone",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nie można przywrócić kluczy szyfrujących, proszę sprawdzić owncloud.log lub zapytać administratora",
-"Language changed" => "Zmieniono język",
-"Invalid request" => "Nieprawidłowe żądanie",
-"Admins can't remove themself from the admin group" => "Administratorzy nie mogą usunąć siebie samych z grupy administratorów",
-"Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
-"Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
-"Couldn't update app." => "Nie można uaktualnić aplikacji.",
-"Wrong password" => "Złe hasło",
-"No user supplied" => "Niedostarczony użytkownik",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Podaj hasło odzyskiwania administratora, w przeciwnym razie wszystkie dane użytkownika zostaną utracone",
-"Wrong admin recovery password. Please check the password and try again." => "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
-"Unable to change password" => "Nie można zmienić hasła",
-"Saved" => "Zapisano",
-"test email settings" => "przetestuj ustawienia email",
-"If you received this email, the settings seem to be correct." => "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
-"A problem occurred while sending the email. Please revise your settings." => "Pojawił się problem podczas wysyłania email. Proszę sprawdzić ponownie ustawienia",
-"Email sent" => "E-mail wysłany",
-"You need to set your user email before being able to send test emails." => "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
-"Add trusted domain" => "Dodaj zaufaną domenę",
-"Sending..." => "Wysyłam...",
-"All" => "Wszystkie",
-"Please wait...." => "Proszę czekać...",
-"Error while disabling app" => "Błąd podczas wyłączania aplikacji",
-"Disable" => "Wyłącz",
-"Enable" => "Włącz",
-"Error while enabling app" => "Błąd podczas włączania aplikacji",
-"Updating...." => "Aktualizacja w toku...",
-"Error while updating app" => "Błąd podczas aktualizacji aplikacji",
-"Updated" => "Zaktualizowano",
-"Uninstalling ...." => "Odinstalowywanie....",
-"Error while uninstalling app" => "Błąd przy odinstalowywaniu aplikacji",
-"Uninstall" => "Odinstaluj",
-"Select a profile picture" => "Wybierz zdjęcie profilu",
-"Very weak password" => "Bardzo słabe hasło",
-"Weak password" => "Słabe hasło",
-"So-so password" => "Mało skomplikowane hasło",
-"Good password" => "Dobre hasło",
-"Strong password" => "Mocne hasło",
-"Valid until {date}" => "Ważny do {date}",
-"Delete" => "Usuń",
-"Decrypting files... Please wait, this can take some time." => "Odszyfrowuje pliki... Proszę czekać, to może zająć jakiś czas.",
-"Delete encryption keys permanently." => "Usuń trwale klucze szyfrujące.",
-"Restore encryption keys." => "Przywróć klucze szyfrujące.",
-"Groups" => "Grupy",
-"Unable to delete {objName}" => "Nie można usunąć {objName}",
-"Error creating group" => "Błąd podczas tworzenia grupy",
-"A valid group name must be provided" => "Należy podać prawidłową nazwę grupy",
-"deleted {groupName}" => "usunięto {groupName}",
-"undo" => "cofnij",
-"no group" => "brak grupy",
-"never" => "nigdy",
-"deleted {userName}" => "usunięto {userName}",
-"add group" => "dodaj grupę",
-"A valid username must be provided" => "Należy podać prawidłową nazwę użytkownika",
-"Error creating user" => "Błąd podczas tworzenia użytkownika",
-"A valid password must be provided" => "Należy podać prawidłowe hasło",
-"Warning: Home directory for user \"{user}\" already exists" => "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
-"__language_name__" => "polski",
-"Personal Info" => "Informacje osobiste",
-"SSL root certificates" => "Główny certyfikat SSL",
-"Encryption" => "Szyfrowanie",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
-"Info, warnings, errors and fatal issues" => "Informacje, ostrzeżenia, błędy i poważne problemy",
-"Warnings, errors and fatal issues" => "Ostrzeżenia, błędy i poważne problemy",
-"Errors and fatal issues" => "Błędy i poważne problemy",
-"Fatal issues only" => "Tylko poważne problemy",
-"None" => "Nic",
-"Login" => "Login",
-"Plain" => "Czysty tekst",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Ostrzeżenie o zabezpieczeniach",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Uzyskujesz dostęp do %s za pomocą protokołu HTTP. Zalecamy skonfigurować swój serwer z użyciem protokołu HTTPS.",
-"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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
-"Setup Warning" => "Ostrzeżenia konfiguracji",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "Wygląda na to, że ustawienia PHP ucinają bloki wklejonych dokumentów. To sprawi, że niektóre wbudowane aplikacje będą niedostępne.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Dzieje się tak prawdopodobnie przez cache lub akcelerator taki jak Zend OPcache lub eAccelerator.",
-"Database Performance Info" => "Informacja o wydajności bazy danych",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Jako baza danych został użyty SQLite. Dla większych instalacji doradzamy zmianę na inną. Aby zmigrować do innej bazy danych, użyj narzędzia linii poleceń: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Brak modułu „fileinfo”",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Brak modułu PHP „fileinfo”. Zalecamy włączenie tego modułu, aby uzyskać najlepsze wyniki podczas wykrywania typów MIME.",
-"Your PHP version is outdated" => "Twoja wersja PHP jest za stara",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Twoja wersja PHP jest za stara. Rekomendujemy przynajmniej wersje 5.3.8. Jeśli masz starsza wersję ownCloud może nie działać poprawnie.",
-"PHP charset is not set to UTF-8" => "Kodowanie PHP nie jest ustawione na UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Zestaw znaków PHP nie jest ustawiony na UTF-8. Może to spowodować poważne problemy ze znakami non-ASCII w nazwach plików. Gorąco doradzamy zmianę wartości 'default_charset' w php.ini na 'UTF-8'.",
-"Locale not working" => "Lokalizacja nie działa",
-"System locale can not be set to a one which supports UTF-8." => "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
-"URL generation in notification emails" => "Generowanie URL w powiadomieniach email",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
-"Connectivity checks" => "Sprawdzanie łączności",
-"No problems found" => "Nie ma żadnych problemów",
-"Please double check the <a href='%s'>installation guides</a>." => "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Ostatni cron był uruchomiony %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
-"Cron was not executed yet!" => "Cron nie został jeszcze uruchomiony!",
-"Execute one task with each page loaded" => "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
-"Sharing" => "Udostępnianie",
-"Allow apps to use the Share API" => "Zezwalaj aplikacjom na korzystanie z API udostępniania",
-"Allow users to share via link" => "Pozwól użytkownikom współdzielić przez link",
-"Enforce password protection" => "Wymuś zabezpieczenie hasłem",
-"Allow public uploads" => "Pozwól na  publiczne wczytywanie",
-"Set default expiration date" => "Ustaw domyślną datę wygaśnięcia",
-"Expire after " => "Wygaś po",
-"days" => "dniach",
-"Enforce expiration date" => "Wymuś datę wygaśnięcia",
-"Allow resharing" => "Zezwalaj na ponowne udostępnianie",
-"Restrict users to only share with users in their groups" => "Ogranicz użytkowników do współdzielenia wyłącznie pomiędzy użytkownikami swoich grup",
-"Allow users to send mail notification for shared files" => "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
-"Exclude groups from sharing" => "Wyklucz grupy z udostępniania",
-"These groups will still be able to receive shares, but not to initiate them." => "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
-"Security" => "Bezpieczeństwo",
-"Enforce HTTPS" => "Wymuś HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
-"Email Server" => "Serwer pocztowy",
-"This is used for sending out notifications." => "To jest używane do wysyłania powiadomień",
-"Send mode" => "Tryb wysyłki",
-"From address" => "Z adresu",
-"mail" => "mail",
-"Authentication method" => "Metoda autentykacji",
-"Authentication required" => "Wymagana autoryzacja",
-"Server address" => "Adres Serwera",
-"Port" => "Port",
-"Credentials" => "Poświadczenia",
-"SMTP Username" => "Użytkownik SMTP",
-"SMTP Password" => "Hasło SMTP",
-"Test email settings" => "Ustawienia testowej wiadomości",
-"Send email" => "Wyślij email",
-"Log" => "Logi",
-"Log level" => "Poziom logów",
-"More" => "Więcej",
-"Less" => "Mniej",
-"Version" => "Wersja",
-"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>." => "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Więcej aplikacji",
-"Add your app" => "Dodaj twoją aplikację",
-"by" => "przez",
-"licensed" => "Licencja",
-"Documentation:" => "Dokumentacja:",
-"User Documentation" => "Dokumentacja użytkownika",
-"Admin Documentation" => "Dokumentacja Administratora",
-"Update to %s" => "Aktualizuj do %s",
-"Enable only for specific groups" => "Włącz tylko dla określonych grup",
-"Uninstall App" => "Odinstaluj aplikację",
-"Administrator Documentation" => "Dokumentacja administratora",
-"Online Documentation" => "Dokumentacja online",
-"Forum" => "Forum",
-"Bugtracker" => "Zgłaszanie błędów",
-"Commercial Support" => "Wsparcie komercyjne",
-"Get the apps to sync your files" => "Pobierz aplikacje żeby synchronizować swoje pliki",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Jeśli chcesz wesprzeć projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tlub\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!",
-"Show First Run Wizard again" => "Uruchom ponownie kreatora pierwszego uruchomienia",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Wykorzystujesz <strong>%s</strong> z dostępnych <strong>%s</strong>",
-"Password" => "Hasło",
-"Your password was changed" => "Twoje hasło zostało zmienione",
-"Unable to change your password" => "Nie można zmienić hasła",
-"Current password" => "Bieżące hasło",
-"New password" => "Nowe hasło",
-"Change password" => "Zmień hasło",
-"Full Name" => "Pełna nazwa",
-"Email" => "Email",
-"Your email address" => "Twój adres e-mail",
-"Fill in an email address to enable password recovery and receive notifications" => "Wypełnij adres email aby włączyć odzyskiwanie hasła oraz otrzymywać powiadomienia",
-"Profile picture" => "Zdjęcie profilu",
-"Upload new" => "Wczytaj nowe",
-"Select new from Files" => "Wybierz nowe z plików",
-"Remove image" => "Usuń zdjęcie",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Png lub jpg. Idealnie kwadratowy, ale będzie można je przyciąć.",
-"Your avatar is provided by your original account." => "Twój awatar jest ustawiony jako domyślny.",
-"Cancel" => "Anuluj",
-"Choose as profile image" => "Wybierz zdjęcie profilu",
-"Language" => "Język",
-"Help translate" => "Pomóż w tłumaczeniu",
-"Common Name" => "Nazwa CN",
-"Valid until" => "Ważny do",
-"Issued By" => "Wydany przez",
-"Valid until %s" => "Ważny do %s",
-"Import Root Certificate" => "Importuj główny certyfikat",
-"The encryption app is no longer enabled, please decrypt all your files" => "Aplikacja szyfrowanie nie jest włączona, odszyfruj wszystkie plik",
-"Log-in password" => "Hasło logowania",
-"Decrypt all Files" => "Odszyfruj wszystkie pliki",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Twoje klucze szyfrujące zostały przeniesione do lokalizacji archialnej. Jeśli coś poszło nie tak, możesz je przywrócić. Usuń je trwale tylko, gdy jesteś pewien(na), że wszystkie pliki zostały prawidłowo zdeszyfrowane.",
-"Restore Encryption Keys" => "Przywróć klucze szyfrujące",
-"Delete Encryption Keys" => "Usuń klucze szyfrujące",
-"Show storage location" => "Pokaż miejsce przechowywania",
-"Show last log in" => "Pokaż ostatni login",
-"Login Name" => "Login",
-"Create" => "Utwórz",
-"Admin Recovery Password" => "Odzyskiwanie hasła administratora",
-"Enter the recovery password in order to recover the users files during password change" => "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
-"Search Users and Groups" => "Przeszukuj użytkowników i grupy",
-"Add Group" => "Dodaj grupę",
-"Group" => "Grupa",
-"Everyone" => "Wszyscy",
-"Admins" => "Administratorzy",
-"Default Quota" => "Domyślny udział",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
-"Unlimited" => "Bez limitu",
-"Other" => "Inne",
-"Username" => "Nazwa użytkownika",
-"Group Admin for" => "Grupa Admin dla",
-"Quota" => "Udział",
-"Storage Location" => "Lokalizacja magazynu",
-"Last Login" => "Ostatnio zalogowany",
-"change full name" => "Zmień pełna nazwę",
-"set new password" => "ustaw nowe hasło",
-"Default" => "Domyślny"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);";
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
new file mode 100644
index 00000000000..252a3044ced
--- /dev/null
+++ b/settings/l10n/pt_BR.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Habilitado",
+    "Not enabled" : "Desabilitado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Erro de autenticação",
+    "Your full name has been changed." : "Seu nome completo foi alterado.",
+    "Unable to change full name" : "Não é possível alterar o nome completo",
+    "Group already exists" : "O Grupo já existe",
+    "Unable to add group" : "Não foi possível adicionar grupo",
+    "Files decrypted successfully" : "Arquivos descriptografados com sucesso",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
+    "Encryption keys deleted permanently" : "Chaves de criptografia excluídas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
+    "Couldn't remove app." : "Não foi possível remover aplicativos.",
+    "Email saved" : "E-mail salvo",
+    "Invalid email" : "E-mail inválido",
+    "Unable to delete group" : "Não foi possível remover grupo",
+    "Unable to delete user" : "Não foi possível remover usuário",
+    "Backups restored successfully" : "Backup restaurado com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
+    "Language changed" : "Idioma alterado",
+    "Invalid request" : "Pedido inválido",
+    "Admins can't remove themself from the admin group" : "Administradores não pode remover a si mesmos do grupo de administração",
+    "Unable to add user to group %s" : "Não foi possível adicionar usuário ao grupo %s",
+    "Unable to remove user from group %s" : "Não foi possível remover usuário do grupo %s",
+    "Couldn't update app." : "Não foi possível atualizar a app.",
+    "Wrong password" : "Senha errada",
+    "No user supplied" : "Nenhum usuário fornecido",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
+    "Wrong admin recovery password. Please check the password and try again." : "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
+    "Unable to change password" : "Impossível modificar senha",
+    "Saved" : "Salvo",
+    "test email settings" : "testar configurações de email",
+    "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail, as configurações parecem estar corretas.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ocorreu um problema ao enviar o e-mail. Por favor, revise suas configurações.",
+    "Email sent" : "E-mail enviado",
+    "You need to set your user email before being able to send test emails." : "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
+    "Add trusted domain" : "Adicionar domínio confiável",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor, aguarde...",
+    "Error while disabling app" : "Erro enquanto desabilitava o aplicativo",
+    "Disable" : "Desabilitar",
+    "Enable" : "Habilitar",
+    "Error while enabling app" : "Erro enquanto habilitava o aplicativo",
+    "Updating...." : "Atualizando...",
+    "Error while updating app" : "Erro ao atualizar aplicativo",
+    "Updated" : "Atualizado",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Erro enquanto desinstalava aplicativo",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Selecione uma imagem para o perfil",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha mais ou menos",
+    "Good password" : "Boa senha",
+    "Strong password" : "Senha forte",
+    "Valid until {date}" : "Vádido até {date}",
+    "Delete" : "Excluir",
+    "Decrypting files... Please wait, this can take some time." : "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
+    "Delete encryption keys permanently." : "Eliminando a chave de criptografia permanentemente.",
+    "Restore encryption keys." : "Restaurar chave de criptografia.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Não é possível excluir {objName}",
+    "Error creating group" : "Erro ao criar grupo",
+    "A valid group name must be provided" : "Um nome de grupo válido deve ser fornecido",
+    "deleted {groupName}" : "eliminado {groupName}",
+    "undo" : "desfazer",
+    "no group" : "nenhum grupo",
+    "never" : "nunca",
+    "deleted {userName}" : "eliminado {userName}",
+    "add group" : "adicionar grupo",
+    "A valid username must be provided" : "Forneça um nome de usuário válido",
+    "Error creating user" : "Erro ao criar usuário",
+    "A valid password must be provided" : "Forneça uma senha válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O diretório home para o usuário \"{user}\" já existe",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Informação Pessoal",
+    "SSL root certificates" : "Certificados SSL raíz",
+    "Encryption" : "Criptografia",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
+    "Errors and fatal issues" : "Erros e problemas fatais",
+    "Fatal issues only" : "Somente questões fatais",
+    "None" : "Nada",
+    "Login" : "Login",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Gerenciador NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Aviso de Segurança",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Você está acessando %s via HTTP. Sugerimos você configurar o servidor para exigir o uso de HTTPS em seu lugar.",
+    "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." : "Seu diretório de dados e seus arquivos são, provavelmente, acessíveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessível ou mova o diretório de dados para fora do raiz do servidor.",
+    "Setup Warning" : "Aviso de Configuraçã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.",
+    "Database Performance Info" : "Informações de Desempenho do Banco de Dados",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usada como base de dados. Para grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'",
+    "Module 'fileinfo' missing" : "Módulo 'fileinfo' faltando",
+    "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).",
+    "Your PHP version is outdated" : "Sua versão de PHP está desatualizada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possível que esta instalação não esteja funcionando corretamente.",
+    "PHP charset is not set to UTF-8" : "A configuração de caracteres no PHP não está definida para UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "A configuração de caracteres para o PHP não está definida para UTF-8. Isto pode causar problemas com caracteres não-ASCII em nomes de arquivos. Nós fortemente recomendamos a troca da definição de caracteres de 'default_charset' no arquivo de configuração php.ini para 'UTF-8'.",
+    "Locale not working" : "Localização não funcionando",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
+    "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
+    "Connectivity checks" : "Verificação de conectividade",
+    "No problems found" : "Nenhum problema encontrado",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Último cron foi executado em %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
+    "Cron was not executed yet!" : "Cron não foi executado ainda!",
+    "Execute one task with each page loaded" : "Execute 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á registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
+    "Sharing" : "Compartilhamento",
+    "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
+    "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
+    "Enforce password protection" : "Reforce a proteção por senha",
+    "Allow public uploads" : "Permitir envio público",
+    "Set default expiration date" : "Configurar a data de expiração",
+    "Expire after " : "Expirar depois de",
+    "days" : "dias",
+    "Enforce expiration date" : "Fazer cumprir a data de expiração",
+    "Allow resharing" : "Permitir recompartilhamento",
+    "Restrict users to only share with users in their groups" : "Restringir os usuários a compartilhar somente com os usuários em seus grupos",
+    "Allow users to send mail notification for shared files" : "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
+    "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.",
+    "Security" : "Segurança",
+    "Enforce HTTPS" : "Forçar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
+    "Email Server" : "Servidor de Email",
+    "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
+    "Send mode" : "Modo enviar",
+    "From address" : "Do Endereço",
+    "mail" : "email",
+    "Authentication method" : "Método de autenticação",
+    "Authentication required" : "Autenticação é requerida",
+    "Server address" : "Endereço do servidor",
+    "Port" : "Porta",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome do Usuário SMTP",
+    "SMTP Password" : "Senha SMTP",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Configurações de e-mail de teste",
+    "Send email" : "Enviar email",
+    "Log" : "Registro",
+    "Log level" : "Nível de registro",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "Version" : "Versão",
+    "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>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Mais aplicativos",
+    "Add your app" : "Adicionar seu aplicativo",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentação:",
+    "User Documentation" : "Documentação de Usuário",
+    "Admin Documentation" : "Documentação de Administrador",
+    "Update to %s" : "Atualizado para %s",
+    "Enable only for specific groups" : "Ativar apenas para grupos específicos",
+    "Uninstall App" : "Desinstalar Aplicativo",
+    "Administrator Documentation" : "Documentação de Administrador",
+    "Online Documentation" : "Documentação Online",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Rastreador de Bugs",
+    "Commercial Support" : "Suporte Comercial",
+    "Get the apps to sync your files" : "Faça com que os apps sincronizem seus arquivos",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se você deseja dar suporte ao projeto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">junte-se ao desenvolvimento</a>\n⇥⇥or\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe pelo mundo</a>!",
+    "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
+    "Password" : "Senha",
+    "Your password was changed" : "Sua senha foi alterada",
+    "Unable to change your password" : "Não é possivel alterar a sua senha",
+    "Current password" : "Senha atual",
+    "New password" : "Nova senha",
+    "Change password" : "Alterar senha",
+    "Full Name" : "Nome Completo",
+    "Email" : "E-mail",
+    "Your email address" : "Seu endereço de e-mail",
+    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um e-mail para permitir a recuperação de senha e receber notificações",
+    "Profile picture" : "Imagem para o perfil",
+    "Upload new" : "Enviar nova foto",
+    "Select new from Files" : "Selecinar uma nova dos Arquivos",
+    "Remove image" : "Remover imagem",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la.",
+    "Your avatar is provided by your original account." : "Seu avatar é fornecido por sua conta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolha como imagem para o perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajude a traduzir",
+    "Common Name" : "Nome",
+    "Valid until" : "Válido até",
+    "Issued By" : "Emitido Por",
+    "Valid until %s" : "Válido até %s",
+    "Import Root Certificate" : "Importar Certificado Raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
+    "Log-in password" : "Senha de login",
+    "Decrypt all Files" : "Descriptografar todos os Arquivos",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
+    "Restore Encryption Keys" : "Restaurar Chaves de Criptografia",
+    "Delete Encryption Keys" : "Eliminar Chaves de Criptografia",
+    "Show storage location" : "Mostrar localização de armazenamento",
+    "Show last log in" : "Mostrar o último acesso",
+    "Login Name" : "Nome de Login",
+    "Create" : "Criar",
+    "Admin Recovery Password" : "Recuperação da Senha do Administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
+    "Search Users and Groups" : "Pesquisar Usuários e Grupos",
+    "Add Group" : "Adicionar Grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Para todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Quota Padrão",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Outro",
+    "Username" : "Nome de Usuário",
+    "Group Admin for" : "Grupo Admin para",
+    "Quota" : "Cota",
+    "Storage Location" : "Local de Armazenamento",
+    "Last Login" : "Último Login",
+    "change full name" : "alterar nome completo",
+    "set new password" : "definir nova senha",
+    "Default" : "Padrão"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
new file mode 100644
index 00000000000..3e6b426930b
--- /dev/null
+++ b/settings/l10n/pt_BR.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Habilitado",
+    "Not enabled" : "Desabilitado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Erro de autenticação",
+    "Your full name has been changed." : "Seu nome completo foi alterado.",
+    "Unable to change full name" : "Não é possível alterar o nome completo",
+    "Group already exists" : "O Grupo já existe",
+    "Unable to add group" : "Não foi possível adicionar grupo",
+    "Files decrypted successfully" : "Arquivos descriptografados com sucesso",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
+    "Encryption keys deleted permanently" : "Chaves de criptografia excluídas permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
+    "Couldn't remove app." : "Não foi possível remover aplicativos.",
+    "Email saved" : "E-mail salvo",
+    "Invalid email" : "E-mail inválido",
+    "Unable to delete group" : "Não foi possível remover grupo",
+    "Unable to delete user" : "Não foi possível remover usuário",
+    "Backups restored successfully" : "Backup restaurado com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
+    "Language changed" : "Idioma alterado",
+    "Invalid request" : "Pedido inválido",
+    "Admins can't remove themself from the admin group" : "Administradores não pode remover a si mesmos do grupo de administração",
+    "Unable to add user to group %s" : "Não foi possível adicionar usuário ao grupo %s",
+    "Unable to remove user from group %s" : "Não foi possível remover usuário do grupo %s",
+    "Couldn't update app." : "Não foi possível atualizar a app.",
+    "Wrong password" : "Senha errada",
+    "No user supplied" : "Nenhum usuário fornecido",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
+    "Wrong admin recovery password. Please check the password and try again." : "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
+    "Unable to change password" : "Impossível modificar senha",
+    "Saved" : "Salvo",
+    "test email settings" : "testar configurações de email",
+    "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail, as configurações parecem estar corretas.",
+    "A problem occurred while sending the email. Please revise your settings." : "Ocorreu um problema ao enviar o e-mail. Por favor, revise suas configurações.",
+    "Email sent" : "E-mail enviado",
+    "You need to set your user email before being able to send test emails." : "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
+    "Add trusted domain" : "Adicionar domínio confiável",
+    "Sending..." : "Enviando...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor, aguarde...",
+    "Error while disabling app" : "Erro enquanto desabilitava o aplicativo",
+    "Disable" : "Desabilitar",
+    "Enable" : "Habilitar",
+    "Error while enabling app" : "Erro enquanto habilitava o aplicativo",
+    "Updating...." : "Atualizando...",
+    "Error while updating app" : "Erro ao atualizar aplicativo",
+    "Updated" : "Atualizado",
+    "Uninstalling ...." : "Desinstalando ...",
+    "Error while uninstalling app" : "Erro enquanto desinstalava aplicativo",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Selecione uma imagem para o perfil",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha mais ou menos",
+    "Good password" : "Boa senha",
+    "Strong password" : "Senha forte",
+    "Valid until {date}" : "Vádido até {date}",
+    "Delete" : "Excluir",
+    "Decrypting files... Please wait, this can take some time." : "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
+    "Delete encryption keys permanently." : "Eliminando a chave de criptografia permanentemente.",
+    "Restore encryption keys." : "Restaurar chave de criptografia.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Não é possível excluir {objName}",
+    "Error creating group" : "Erro ao criar grupo",
+    "A valid group name must be provided" : "Um nome de grupo válido deve ser fornecido",
+    "deleted {groupName}" : "eliminado {groupName}",
+    "undo" : "desfazer",
+    "no group" : "nenhum grupo",
+    "never" : "nunca",
+    "deleted {userName}" : "eliminado {userName}",
+    "add group" : "adicionar grupo",
+    "A valid username must be provided" : "Forneça um nome de usuário válido",
+    "Error creating user" : "Erro ao criar usuário",
+    "A valid password must be provided" : "Forneça uma senha válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O diretório home para o usuário \"{user}\" já existe",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Informação Pessoal",
+    "SSL root certificates" : "Certificados SSL raíz",
+    "Encryption" : "Criptografia",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (questões fatais, erros, avisos, informações, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informações, avisos, erros e problemas fatais",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
+    "Errors and fatal issues" : "Erros e problemas fatais",
+    "Fatal issues only" : "Somente questões fatais",
+    "None" : "Nada",
+    "Login" : "Login",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Gerenciador NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Aviso de Segurança",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Você está acessando %s via HTTP. Sugerimos você configurar o servidor para exigir o uso de HTTPS em seu lugar.",
+    "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." : "Seu diretório de dados e seus arquivos são, provavelmente, acessíveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessível ou mova o diretório de dados para fora do raiz do servidor.",
+    "Setup Warning" : "Aviso de Configuraçã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.",
+    "Database Performance Info" : "Informações de Desempenho do Banco de Dados",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usada como base de dados. Para grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'",
+    "Module 'fileinfo' missing" : "Módulo 'fileinfo' faltando",
+    "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).",
+    "Your PHP version is outdated" : "Sua versão de PHP está desatualizada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possível que esta instalação não esteja funcionando corretamente.",
+    "PHP charset is not set to UTF-8" : "A configuração de caracteres no PHP não está definida para UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "A configuração de caracteres para o PHP não está definida para UTF-8. Isto pode causar problemas com caracteres não-ASCII em nomes de arquivos. Nós fortemente recomendamos a troca da definição de caracteres de 'default_charset' no arquivo de configuração php.ini para 'UTF-8'.",
+    "Locale not working" : "Localização não funcionando",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
+    "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
+    "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
+    "Connectivity checks" : "Verificação de conectividade",
+    "No problems found" : "Nenhum problema encontrado",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Último cron foi executado em %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
+    "Cron was not executed yet!" : "Cron não foi executado ainda!",
+    "Execute one task with each page loaded" : "Execute 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á registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
+    "Sharing" : "Compartilhamento",
+    "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
+    "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
+    "Enforce password protection" : "Reforce a proteção por senha",
+    "Allow public uploads" : "Permitir envio público",
+    "Set default expiration date" : "Configurar a data de expiração",
+    "Expire after " : "Expirar depois de",
+    "days" : "dias",
+    "Enforce expiration date" : "Fazer cumprir a data de expiração",
+    "Allow resharing" : "Permitir recompartilhamento",
+    "Restrict users to only share with users in their groups" : "Restringir os usuários a compartilhar somente com os usuários em seus grupos",
+    "Allow users to send mail notification for shared files" : "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
+    "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.",
+    "Security" : "Segurança",
+    "Enforce HTTPS" : "Forçar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
+    "Email Server" : "Servidor de Email",
+    "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
+    "Send mode" : "Modo enviar",
+    "From address" : "Do Endereço",
+    "mail" : "email",
+    "Authentication method" : "Método de autenticação",
+    "Authentication required" : "Autenticação é requerida",
+    "Server address" : "Endereço do servidor",
+    "Port" : "Porta",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome do Usuário SMTP",
+    "SMTP Password" : "Senha SMTP",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Configurações de e-mail de teste",
+    "Send email" : "Enviar email",
+    "Log" : "Registro",
+    "Log level" : "Nível de registro",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "Version" : "Versão",
+    "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>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Mais aplicativos",
+    "Add your app" : "Adicionar seu aplicativo",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentação:",
+    "User Documentation" : "Documentação de Usuário",
+    "Admin Documentation" : "Documentação de Administrador",
+    "Update to %s" : "Atualizado para %s",
+    "Enable only for specific groups" : "Ativar apenas para grupos específicos",
+    "Uninstall App" : "Desinstalar Aplicativo",
+    "Administrator Documentation" : "Documentação de Administrador",
+    "Online Documentation" : "Documentação Online",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Rastreador de Bugs",
+    "Commercial Support" : "Suporte Comercial",
+    "Get the apps to sync your files" : "Faça com que os apps sincronizem seus arquivos",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se você deseja dar suporte ao projeto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">junte-se ao desenvolvimento</a>\n⇥⇥or\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe pelo mundo</a>!",
+    "Show First Run Wizard again" : "Mostrar Assistente de Primeira Execução novamente",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
+    "Password" : "Senha",
+    "Your password was changed" : "Sua senha foi alterada",
+    "Unable to change your password" : "Não é possivel alterar a sua senha",
+    "Current password" : "Senha atual",
+    "New password" : "Nova senha",
+    "Change password" : "Alterar senha",
+    "Full Name" : "Nome Completo",
+    "Email" : "E-mail",
+    "Your email address" : "Seu endereço de e-mail",
+    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um e-mail para permitir a recuperação de senha e receber notificações",
+    "Profile picture" : "Imagem para o perfil",
+    "Upload new" : "Enviar nova foto",
+    "Select new from Files" : "Selecinar uma nova dos Arquivos",
+    "Remove image" : "Remover imagem",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la.",
+    "Your avatar is provided by your original account." : "Seu avatar é fornecido por sua conta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolha como imagem para o perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajude a traduzir",
+    "Common Name" : "Nome",
+    "Valid until" : "Válido até",
+    "Issued By" : "Emitido Por",
+    "Valid until %s" : "Válido até %s",
+    "Import Root Certificate" : "Importar Certificado Raíz",
+    "The encryption app is no longer enabled, please decrypt all your files" : "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
+    "Log-in password" : "Senha de login",
+    "Decrypt all Files" : "Descriptografar todos os Arquivos",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
+    "Restore Encryption Keys" : "Restaurar Chaves de Criptografia",
+    "Delete Encryption Keys" : "Eliminar Chaves de Criptografia",
+    "Show storage location" : "Mostrar localização de armazenamento",
+    "Show last log in" : "Mostrar o último acesso",
+    "Login Name" : "Nome de Login",
+    "Create" : "Criar",
+    "Admin Recovery Password" : "Recuperação da Senha do Administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
+    "Search Users and Groups" : "Pesquisar Usuários e Grupos",
+    "Add Group" : "Adicionar Grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Para todos",
+    "Admins" : "Administradores",
+    "Default Quota" : "Quota Padrão",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Outro",
+    "Username" : "Nome de Usuário",
+    "Group Admin for" : "Grupo Admin para",
+    "Quota" : "Cota",
+    "Storage Location" : "Local de Armazenamento",
+    "Last Login" : "Último Login",
+    "change full name" : "alterar nome completo",
+    "set new password" : "definir nova senha",
+    "Default" : "Padrão"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
deleted file mode 100644
index 4b7cfb6ed76..00000000000
--- a/settings/l10n/pt_BR.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Habilitado",
-"Not enabled" => "Desabilitado",
-"Recommended" => "Recomendado",
-"Authentication error" => "Erro de autenticação",
-"Your full name has been changed." => "Seu nome completo foi alterado.",
-"Unable to change full name" => "Não é possível alterar o nome completo",
-"Group already exists" => "O Grupo já existe",
-"Unable to add group" => "Não foi possível adicionar grupo",
-"Files decrypted successfully" => "Arquivos descriptografados com sucesso",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível descriptografar os arquivos, verifique a sua owncloud.log ou pergunte ao seu administrador",
-"Couldn't decrypt your files, check your password and try again" => "Não foi possível descriptografar os arquivos, verifique sua senha e tente novamente",
-"Encryption keys deleted permanently" => "Chaves de criptografia excluídas permanentemente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível excluir permanentemente suas chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
-"Couldn't remove app." => "Não foi possível remover aplicativos.",
-"Email saved" => "E-mail salvo",
-"Invalid email" => "E-mail inválido",
-"Unable to delete group" => "Não foi possível remover grupo",
-"Unable to delete user" => "Não foi possível remover usuário",
-"Backups restored successfully" => "Backup restaurado com sucesso",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível salvar as chaves de criptografia, por favor, verifique o seu owncloud.log ou pergunte ao seu administrador",
-"Language changed" => "Idioma alterado",
-"Invalid request" => "Pedido inválido",
-"Admins can't remove themself from the admin group" => "Administradores não pode remover a si mesmos do grupo de administração",
-"Unable to add user to group %s" => "Não foi possível adicionar usuário ao grupo %s",
-"Unable to remove user from group %s" => "Não foi possível remover usuário do grupo %s",
-"Couldn't update app." => "Não foi possível atualizar a app.",
-"Wrong password" => "Senha errada",
-"No user supplied" => "Nenhum usuário fornecido",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor, forneça uma senha de recuperação admin, caso contrário todos os dados do usuário serão perdidos",
-"Wrong admin recovery password. Please check the password and try again." => "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
-"Unable to change password" => "Impossível modificar senha",
-"Saved" => "Salvo",
-"test email settings" => "testar configurações de email",
-"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail, as configurações parecem estar corretas.",
-"A problem occurred while sending the email. Please revise your settings." => "Ocorreu um problema ao enviar o e-mail. Por favor, revise suas configurações.",
-"Email sent" => "E-mail enviado",
-"You need to set your user email before being able to send test emails." => "Você precisa configurar seu e-mail de usuário antes de ser capaz de enviar e-mails de teste.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que você quer adicionar \"{domain}\" como domínio confiável?",
-"Add trusted domain" => "Adicionar domínio confiável",
-"Sending..." => "Enviando...",
-"All" => "Todos",
-"Please wait...." => "Por favor, aguarde...",
-"Error while disabling app" => "Erro enquanto desabilitava o aplicativo",
-"Disable" => "Desabilitar",
-"Enable" => "Habilitar",
-"Error while enabling app" => "Erro enquanto habilitava o aplicativo",
-"Updating...." => "Atualizando...",
-"Error while updating app" => "Erro ao atualizar aplicativo",
-"Updated" => "Atualizado",
-"Uninstalling ...." => "Desinstalando ...",
-"Error while uninstalling app" => "Erro enquanto desinstalava aplicativo",
-"Uninstall" => "Desinstalar",
-"Select a profile picture" => "Selecione uma imagem para o perfil",
-"Very weak password" => "Senha muito fraca",
-"Weak password" => "Senha fraca",
-"So-so password" => "Senha mais ou menos",
-"Good password" => "Boa senha",
-"Strong password" => "Senha forte",
-"Valid until {date}" => "Vádido até {date}",
-"Delete" => "Excluir",
-"Decrypting files... Please wait, this can take some time." => "Decriptando arquivos... Por favor aguarde, isso pode levar algum tempo.",
-"Delete encryption keys permanently." => "Eliminando a chave de criptografia permanentemente.",
-"Restore encryption keys." => "Restaurar chave de criptografia.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "Não é possível excluir {objName}",
-"Error creating group" => "Erro ao criar grupo",
-"A valid group name must be provided" => "Um nome de grupo válido deve ser fornecido",
-"deleted {groupName}" => "eliminado {groupName}",
-"undo" => "desfazer",
-"no group" => "nenhum grupo",
-"never" => "nunca",
-"deleted {userName}" => "eliminado {userName}",
-"add group" => "adicionar grupo",
-"A valid username must be provided" => "Forneça um nome de usuário válido",
-"Error creating user" => "Erro ao criar usuário",
-"A valid password must be provided" => "Forneça uma senha válida",
-"Warning: Home directory for user \"{user}\" already exists" => "Aviso: O diretório home para o usuário \"{user}\" já existe",
-"__language_name__" => "__language_name__",
-"Personal Info" => "Informação Pessoal",
-"SSL root certificates" => "Certificados SSL raíz",
-"Encryption" => "Criptografia",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (questões fatais, erros, avisos, informações, depuração)",
-"Info, warnings, errors and fatal issues" => "Informações, avisos, erros e problemas fatais",
-"Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
-"Errors and fatal issues" => "Erros e problemas fatais",
-"Fatal issues only" => "Somente questões fatais",
-"None" => "Nada",
-"Login" => "Login",
-"Plain" => "Plano",
-"NT LAN Manager" => "Gerenciador NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Aviso de Segurança",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Você está acessando %s via HTTP. Sugerimos você configurar o servidor para exigir o uso de HTTPS em seu lugar.",
-"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." => "Seu diretório de dados e seus arquivos são, provavelmente, acessíveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessível ou mova o diretório de dados para fora do raiz do servidor.",
-"Setup Warning" => "Aviso de Configuraçã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.",
-"Database Performance Info" => "Informações de Desempenho do Banco de Dados",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite é usada como base de dados. Para grandes instalações recomendamos mudar isso. Para migrar para outro banco de dados usar a ferramenta de linha de comando: 'occ db: converter-type'",
-"Module 'fileinfo' missing" => "Módulo 'fileinfo' faltando",
-"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).",
-"Your PHP version is outdated" => "Sua versão de PHP está desatualizada",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A sua versão do PHP está desatualizada. Recomendamos a atualização para 5.3.8 ou mais recente, pois as versões mais antigas são conhecidas por serem quebradas. É possível que esta instalação não esteja funcionando corretamente.",
-"PHP charset is not set to UTF-8" => "A configuração de caracteres no PHP não está definida para UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "A configuração de caracteres para o PHP não está definida para UTF-8. Isto pode causar problemas com caracteres não-ASCII em nomes de arquivos. Nós fortemente recomendamos a troca da definição de caracteres de 'default_charset' no arquivo de configuração php.ini para 'UTF-8'.",
-"Locale not working" => "Localização não funcionando",
-"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 to install the required packages on your system to support one of the following locales: %s." => "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
-"URL generation in notification emails" => "Geração de URL em e-mails de notificação",
-"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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
-"Connectivity checks" => "Verificação de conectividade",
-"No problems found" => "Nenhum problema encontrado",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor, confira o <a href='%s'>guia de instalação</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Último cron foi executado em %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
-"Cron was not executed yet!" => "Cron não foi executado ainda!",
-"Execute one task with each page loaded" => "Execute 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á registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-"Sharing" => "Compartilhamento",
-"Allow apps to use the Share API" => "Permitir que aplicativos usem a API de Compartilhamento",
-"Allow users to share via link" => "Permitir que os usuários compartilhem por link",
-"Enforce password protection" => "Reforce a proteção por senha",
-"Allow public uploads" => "Permitir envio público",
-"Set default expiration date" => "Configurar a data de expiração",
-"Expire after " => "Expirar depois de",
-"days" => "dias",
-"Enforce expiration date" => "Fazer cumprir a data de expiração",
-"Allow resharing" => "Permitir recompartilhamento",
-"Restrict users to only share with users in their groups" => "Restringir os usuários a compartilhar somente com os usuários em seus grupos",
-"Allow users to send mail notification for shared files" => "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
-"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.",
-"Security" => "Segurança",
-"Enforce HTTPS" => "Forçar HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
-"Email Server" => "Servidor de Email",
-"This is used for sending out notifications." => "Isto é usado para o envio de notificações.",
-"Send mode" => "Modo enviar",
-"From address" => "Do Endereço",
-"mail" => "email",
-"Authentication method" => "Método de autenticação",
-"Authentication required" => "Autenticação é requerida",
-"Server address" => "Endereço do servidor",
-"Port" => "Porta",
-"Credentials" => "Credenciais",
-"SMTP Username" => "Nome do Usuário SMTP",
-"SMTP Password" => "Senha SMTP",
-"Store credentials" => "Armazenar credenciais",
-"Test email settings" => "Configurações de e-mail de teste",
-"Send email" => "Enviar email",
-"Log" => "Registro",
-"Log level" => "Nível de registro",
-"More" => "Mais",
-"Less" => "Menos",
-"Version" => "Versão",
-"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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Mais aplicativos",
-"Add your app" => "Adicionar seu aplicativo",
-"by" => "por",
-"licensed" => "licenciado",
-"Documentation:" => "Documentação:",
-"User Documentation" => "Documentação de Usuário",
-"Admin Documentation" => "Documentação de Administrador",
-"Update to %s" => "Atualizado para %s",
-"Enable only for specific groups" => "Ativar apenas para grupos específicos",
-"Uninstall App" => "Desinstalar Aplicativo",
-"Administrator Documentation" => "Documentação de Administrador",
-"Online Documentation" => "Documentação Online",
-"Forum" => "Fórum",
-"Bugtracker" => "Rastreador de Bugs",
-"Commercial Support" => "Suporte Comercial",
-"Get the apps to sync your files" => "Faça com que os apps sincronizem seus arquivos",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se você deseja dar suporte ao projeto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">junte-se ao desenvolvimento</a>\n⇥⇥or\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe pelo mundo</a>!",
-"Show First Run Wizard again" => "Mostrar Assistente de Primeira Execução novamente",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Você usou <strong>%s</strong> do seu espaço de <strong>%s</strong>",
-"Password" => "Senha",
-"Your password was changed" => "Sua senha foi alterada",
-"Unable to change your password" => "Não é possivel alterar a sua senha",
-"Current password" => "Senha atual",
-"New password" => "Nova senha",
-"Change password" => "Alterar senha",
-"Full Name" => "Nome Completo",
-"Email" => "E-mail",
-"Your email address" => "Seu endereço de e-mail",
-"Fill in an email address to enable password recovery and receive notifications" => "Preencha com um e-mail para permitir a recuperação de senha e receber notificações",
-"Profile picture" => "Imagem para o perfil",
-"Upload new" => "Enviar nova foto",
-"Select new from Files" => "Selecinar uma nova dos Arquivos",
-"Remove image" => "Remover imagem",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Ou png ou jpg. O ideal é quadrado, mas você vai ser capaz de cortá-la.",
-"Your avatar is provided by your original account." => "Seu avatar é fornecido por sua conta original.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Escolha como imagem para o perfil",
-"Language" => "Idioma",
-"Help translate" => "Ajude a traduzir",
-"Common Name" => "Nome",
-"Valid until" => "Válido até",
-"Issued By" => "Emitido Por",
-"Valid until %s" => "Válido até %s",
-"Import Root Certificate" => "Importar Certificado Raíz",
-"The encryption app is no longer enabled, please decrypt all your files" => "O aplicativo de criptografia não está habilitado, por favor descriptar todos os seus arquivos",
-"Log-in password" => "Senha de login",
-"Decrypt all Files" => "Descriptografar todos os Arquivos",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Suas chaves de criptografia forão movidas para o local de backup. Se alguma coisa deu errado, você pode salvar as chaves. Só excluí-las permanentemente se você tiver certeza de que  todos os arquivos forão descriptografados corretamente.",
-"Restore Encryption Keys" => "Restaurar Chaves de Criptografia",
-"Delete Encryption Keys" => "Eliminar Chaves de Criptografia",
-"Show storage location" => "Mostrar localização de armazenamento",
-"Show last log in" => "Mostrar o último acesso",
-"Login Name" => "Nome de Login",
-"Create" => "Criar",
-"Admin Recovery Password" => "Recuperação da Senha do Administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
-"Search Users and Groups" => "Pesquisar Usuários e Grupos",
-"Add Group" => "Adicionar Grupo",
-"Group" => "Grupo",
-"Everyone" => "Para todos",
-"Admins" => "Administradores",
-"Default Quota" => "Quota Padrão",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Outro",
-"Username" => "Nome de Usuário",
-"Group Admin for" => "Grupo Admin para",
-"Quota" => "Cota",
-"Storage Location" => "Local de Armazenamento",
-"Last Login" => "Último Login",
-"change full name" => "alterar nome completo",
-"set new password" => "definir nova senha",
-"Default" => "Padrão"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
new file mode 100644
index 00000000000..0c5ea85be5c
--- /dev/null
+++ b/settings/l10n/pt_PT.js
@@ -0,0 +1,240 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Ativada",
+    "Not enabled" : "Desactivado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Erro na autenticação",
+    "Your full name has been changed." : "O seu nome completo foi alterado.",
+    "Unable to change full name" : "Não foi possível alterar o seu nome completo",
+    "Group already exists" : "O grupo já existe",
+    "Unable to add group" : "Impossível acrescentar o grupo",
+    "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
+    "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't remove app." : "Impossível remover aplicação.",
+    "Email saved" : "Email guardado",
+    "Invalid email" : "Email inválido",
+    "Unable to delete group" : "Impossível apagar grupo",
+    "Unable to delete user" : "Impossível apagar utilizador",
+    "Backups restored successfully" : "Cópias de segurança foram restauradas com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Language changed" : "Idioma alterado",
+    "Invalid request" : "Pedido Inválido",
+    "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles mesmos do grupo admin.",
+    "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
+    "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
+    "Couldn't update app." : "Não foi possível actualizar a aplicação.",
+    "Wrong password" : "Password errada",
+    "No user supplied" : "Nenhum utilizador especificado.",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
+    "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
+    "Unable to change password" : "Não foi possível alterar a sua password",
+    "Saved" : "Guardado",
+    "test email settings" : "testar configurações de email",
+    "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail as configurações parecem estar correctas",
+    "A problem occurred while sending the email. Please revise your settings." : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
+    "Email sent" : "E-mail enviado",
+    "You need to set your user email before being able to send test emails." : "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
+    "Add trusted domain" : "Adicionar domínio confiável ",
+    "Sending..." : "A enviar...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor aguarde...",
+    "Error while disabling app" : "Erro enquanto desactivava a aplicação",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Erro enquanto activava a aplicação",
+    "Updating...." : "A Actualizar...",
+    "Error while updating app" : "Erro enquanto actualizava a aplicação",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando ....",
+    "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Seleccione uma fotografia de perfil",
+    "Very weak password" : "Password muito fraca",
+    "Weak password" : "Password fraca",
+    "So-so password" : "Password aceitável",
+    "Good password" : "Password Forte",
+    "Strong password" : "Password muito forte",
+    "Valid until {date}" : "Válido até {date}",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
+    "Delete encryption keys permanently." : "Excluir as chaves encriptadas de forma permanente.",
+    "Restore encryption keys." : "Restaurar chaves encriptadas.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Impossível apagar {objNome}",
+    "Error creating group" : "Erro ao criar grupo",
+    "A valid group name must be provided" : "Um nome válido do grupo tem de ser fornecido",
+    "deleted {groupName}" : "apagar {Nome do grupo}",
+    "undo" : "desfazer",
+    "no group" : "sem grupo",
+    "never" : "nunca",
+    "deleted {userName}" : "apagar{utilizador}",
+    "add group" : "Adicionar grupo",
+    "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
+    "Error creating user" : "Erro a criar utilizador",
+    "A valid password must be provided" : "Uma password válida deve ser fornecida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Informação Pessoal",
+    "SSL root certificates" : "Certificados SSL de raiz",
+    "Encryption" : "Encriptação",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
+    "Errors and fatal issues" : "Erros e problemas fatais",
+    "Fatal issues only" : "Apenas problemas fatais",
+    "None" : "Nenhum",
+    "Login" : "Login",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Gestor de NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Aviso de Segurança",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está a aceder %s via HTTP. Recomendamos vivamente que configure o servidor para forçar o uso de HTTPS.",
+    "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." : "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.",
+    "Setup Warning" : "Aviso de setup",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
+    "Database Performance Info" : "Informação sobre desempenho da Base de Dados",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Falta o módulo 'fileinfo'",
+    "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' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
+    "Your PHP version is outdated" : "A sua versão do PHP está ultrapassada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
+    "PHP charset is not set to UTF-8" : "PHP charset não está definido para UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
+    "Locale not working" : "Internacionalização não está a funcionar",
+    "System locale can not be set to a one which supports UTF-8." : "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
+    "URL generation in notification emails" : "Geração URL em e-mails de notificação",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
+    "Connectivity checks" : "Verificações de conectividade",
+    "No problems found" : "Nenhum problema encontrado",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
+    "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "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.",
+    "Sharing" : "Partilha",
+    "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
+    "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
+    "Enforce password protection" : "Forçar protecção da palavra passe",
+    "Allow public uploads" : "Permitir Envios Públicos",
+    "Set default expiration date" : "Especificar a data padrão de expiração",
+    "Expire after " : "Expira após",
+    "days" : "dias",
+    "Enforce expiration date" : "Forçar a data de expiração",
+    "Allow resharing" : "Permitir repartilha",
+    "Restrict users to only share with users in their groups" : "Restringe os utilizadores só a partilhar com utilizadores do seu grupo",
+    "Allow users to send mail notification for shared files" : "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
+    "Exclude groups from sharing" : "Excluir grupos das partilhas",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
+    "Security" : "Segurança",
+    "Enforce HTTPS" : "Forçar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forçar os clientes a ligar a %s através de uma ligação encriptada",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
+    "Email Server" : "Servidor de email",
+    "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
+    "Send mode" : "Modo de envio",
+    "From address" : "Do endereço",
+    "mail" : "Correio",
+    "Authentication method" : "Método de autenticação",
+    "Authentication required" : "Autenticação necessária",
+    "Server address" : "Endereço do servidor",
+    "Port" : "Porto",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome de utilizador SMTP",
+    "SMTP Password" : "Password SMTP",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Testar configurações de email",
+    "Send email" : "Enviar email",
+    "Log" : "Registo",
+    "Log level" : "Nível do registo",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "Version" : "Versão",
+    "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>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Mais aplicações",
+    "Add your app" : "Adicione a sua aplicação",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentação:",
+    "User Documentation" : "Documentação de Utilizador",
+    "Admin Documentation" : "Documentação de administrador.",
+    "Update to %s" : "Actualizar para %s",
+    "Enable only for specific groups" : "Activar só para grupos específicos",
+    "Uninstall App" : "Desinstalar aplicação",
+    "Administrator Documentation" : "Documentação de administrador.",
+    "Online Documentation" : "Documentação Online",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Suporte Comercial",
+    "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
+    "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
+    "Password" : "Password",
+    "Your password was changed" : "A sua palavra-passe foi alterada",
+    "Unable to change your password" : "Não foi possivel alterar a sua palavra-chave",
+    "Current password" : "Palavra-chave actual",
+    "New password" : "Nova palavra-chave",
+    "Change password" : "Alterar palavra-chave",
+    "Full Name" : "Nome completo",
+    "Email" : "Email",
+    "Your email address" : "O seu endereço de email",
+    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
+    "Profile picture" : "Foto do perfil",
+    "Upload new" : "Carregar novo",
+    "Select new from Files" : "Seleccionar novo a partir dos ficheiros",
+    "Remove image" : "Remover imagem",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois.",
+    "Your avatar is provided by your original account." : "O seu avatar é fornecido pela sua conta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolha uma fotografia de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajude a traduzir",
+    "Common Name" : "Nome Comum",
+    "Valid until" : "Válido até",
+    "Issued By" : "Emitido Por",
+    "Valid until %s" : "Válido até %s",
+    "Import Root Certificate" : "Importar Certificado Root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
+    "Log-in password" : "Password de entrada",
+    "Decrypt all Files" : "Desencriptar todos os ficheiros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
+    "Restore Encryption Keys" : "Restaurar as chaves de encriptação",
+    "Delete Encryption Keys" : "Apagar as chaves de encriptação",
+    "Show storage location" : "Mostrar a localização do armazenamento",
+    "Show last log in" : "Mostrar ultimo acesso de entrada",
+    "Login Name" : "Nome de utilizador",
+    "Create" : "Criar",
+    "Admin Recovery Password" : "Recuperar password de administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
+    "Search Users and Groups" : "Pesquisa Utilizadores e Grupos",
+    "Add Group" : "Adicionar grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Para todos",
+    "Admins" : "Administrador",
+    "Default Quota" : "Quota por padrão",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Outro",
+    "Username" : "Nome de utilizador",
+    "Group Admin for" : "Administrador de Grupo para",
+    "Quota" : "Quota",
+    "Storage Location" : "Localização do Armazenamento",
+    "Last Login" : "Ultimo acesso",
+    "change full name" : "alterar nome completo",
+    "set new password" : "definir nova palavra-passe",
+    "Default" : "Padrão"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
new file mode 100644
index 00000000000..e8b20792b3f
--- /dev/null
+++ b/settings/l10n/pt_PT.json
@@ -0,0 +1,238 @@
+{ "translations": {
+    "Enabled" : "Ativada",
+    "Not enabled" : "Desactivado",
+    "Recommended" : "Recomendado",
+    "Authentication error" : "Erro na autenticação",
+    "Your full name has been changed." : "O seu nome completo foi alterado.",
+    "Unable to change full name" : "Não foi possível alterar o seu nome completo",
+    "Group already exists" : "O grupo já existe",
+    "Unable to add group" : "Impossível acrescentar o grupo",
+    "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
+    "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't remove app." : "Impossível remover aplicação.",
+    "Email saved" : "Email guardado",
+    "Invalid email" : "Email inválido",
+    "Unable to delete group" : "Impossível apagar grupo",
+    "Unable to delete user" : "Impossível apagar utilizador",
+    "Backups restored successfully" : "Cópias de segurança foram restauradas com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Language changed" : "Idioma alterado",
+    "Invalid request" : "Pedido Inválido",
+    "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles mesmos do grupo admin.",
+    "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
+    "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
+    "Couldn't update app." : "Não foi possível actualizar a aplicação.",
+    "Wrong password" : "Password errada",
+    "No user supplied" : "Nenhum utilizador especificado.",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
+    "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
+    "Unable to change password" : "Não foi possível alterar a sua password",
+    "Saved" : "Guardado",
+    "test email settings" : "testar configurações de email",
+    "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail as configurações parecem estar correctas",
+    "A problem occurred while sending the email. Please revise your settings." : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
+    "Email sent" : "E-mail enviado",
+    "You need to set your user email before being able to send test emails." : "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
+    "Add trusted domain" : "Adicionar domínio confiável ",
+    "Sending..." : "A enviar...",
+    "All" : "Todos",
+    "Please wait...." : "Por favor aguarde...",
+    "Error while disabling app" : "Erro enquanto desactivava a aplicação",
+    "Disable" : "Desactivar",
+    "Enable" : "Activar",
+    "Error while enabling app" : "Erro enquanto activava a aplicação",
+    "Updating...." : "A Actualizar...",
+    "Error while updating app" : "Erro enquanto actualizava a aplicação",
+    "Updated" : "Actualizado",
+    "Uninstalling ...." : "Desinstalando ....",
+    "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
+    "Uninstall" : "Desinstalar",
+    "Select a profile picture" : "Seleccione uma fotografia de perfil",
+    "Very weak password" : "Password muito fraca",
+    "Weak password" : "Password fraca",
+    "So-so password" : "Password aceitável",
+    "Good password" : "Password Forte",
+    "Strong password" : "Password muito forte",
+    "Valid until {date}" : "Válido até {date}",
+    "Delete" : "Eliminar",
+    "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
+    "Delete encryption keys permanently." : "Excluir as chaves encriptadas de forma permanente.",
+    "Restore encryption keys." : "Restaurar chaves encriptadas.",
+    "Groups" : "Grupos",
+    "Unable to delete {objName}" : "Impossível apagar {objNome}",
+    "Error creating group" : "Erro ao criar grupo",
+    "A valid group name must be provided" : "Um nome válido do grupo tem de ser fornecido",
+    "deleted {groupName}" : "apagar {Nome do grupo}",
+    "undo" : "desfazer",
+    "no group" : "sem grupo",
+    "never" : "nunca",
+    "deleted {userName}" : "apagar{utilizador}",
+    "add group" : "Adicionar grupo",
+    "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
+    "Error creating user" : "Erro a criar utilizador",
+    "A valid password must be provided" : "Uma password válida deve ser fornecida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
+    "__language_name__" : "__language_name__",
+    "Personal Info" : "Informação Pessoal",
+    "SSL root certificates" : "Certificados SSL de raiz",
+    "Encryption" : "Encriptação",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
+    "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
+    "Warnings, errors and fatal issues" : "Avisos, erros e problemas fatais",
+    "Errors and fatal issues" : "Erros e problemas fatais",
+    "Fatal issues only" : "Apenas problemas fatais",
+    "None" : "Nenhum",
+    "Login" : "Login",
+    "Plain" : "Plano",
+    "NT LAN Manager" : "Gestor de NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Aviso de Segurança",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está a aceder %s via HTTP. Recomendamos vivamente que configure o servidor para forçar o uso de HTTPS.",
+    "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." : "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.",
+    "Setup Warning" : "Aviso de setup",
+    "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
+    "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
+    "Database Performance Info" : "Informação sobre desempenho da Base de Dados",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Falta o módulo 'fileinfo'",
+    "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' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
+    "Your PHP version is outdated" : "A sua versão do PHP está ultrapassada",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
+    "PHP charset is not set to UTF-8" : "PHP charset não está definido para UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
+    "Locale not working" : "Internacionalização não está a funcionar",
+    "System locale can not be set to a one which supports UTF-8." : "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
+    "URL generation in notification emails" : "Geração URL em e-mails de notificação",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
+    "Connectivity checks" : "Verificações de conectividade",
+    "No problems found" : "Nenhum problema encontrado",
+    "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
+    "Cron was not executed yet!" : "Cron ainda não foi executado!",
+    "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.",
+    "Sharing" : "Partilha",
+    "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
+    "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
+    "Enforce password protection" : "Forçar protecção da palavra passe",
+    "Allow public uploads" : "Permitir Envios Públicos",
+    "Set default expiration date" : "Especificar a data padrão de expiração",
+    "Expire after " : "Expira após",
+    "days" : "dias",
+    "Enforce expiration date" : "Forçar a data de expiração",
+    "Allow resharing" : "Permitir repartilha",
+    "Restrict users to only share with users in their groups" : "Restringe os utilizadores só a partilhar com utilizadores do seu grupo",
+    "Allow users to send mail notification for shared files" : "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
+    "Exclude groups from sharing" : "Excluir grupos das partilhas",
+    "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
+    "Security" : "Segurança",
+    "Enforce HTTPS" : "Forçar HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forçar os clientes a ligar a %s através de uma ligação encriptada",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
+    "Email Server" : "Servidor de email",
+    "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
+    "Send mode" : "Modo de envio",
+    "From address" : "Do endereço",
+    "mail" : "Correio",
+    "Authentication method" : "Método de autenticação",
+    "Authentication required" : "Autenticação necessária",
+    "Server address" : "Endereço do servidor",
+    "Port" : "Porto",
+    "Credentials" : "Credenciais",
+    "SMTP Username" : "Nome de utilizador SMTP",
+    "SMTP Password" : "Password SMTP",
+    "Store credentials" : "Armazenar credenciais",
+    "Test email settings" : "Testar configurações de email",
+    "Send email" : "Enviar email",
+    "Log" : "Registo",
+    "Log level" : "Nível do registo",
+    "More" : "Mais",
+    "Less" : "Menos",
+    "Version" : "Versão",
+    "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>." : "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Mais aplicações",
+    "Add your app" : "Adicione a sua aplicação",
+    "by" : "por",
+    "licensed" : "licenciado",
+    "Documentation:" : "Documentação:",
+    "User Documentation" : "Documentação de Utilizador",
+    "Admin Documentation" : "Documentação de administrador.",
+    "Update to %s" : "Actualizar para %s",
+    "Enable only for specific groups" : "Activar só para grupos específicos",
+    "Uninstall App" : "Desinstalar aplicação",
+    "Administrator Documentation" : "Documentação de administrador.",
+    "Online Documentation" : "Documentação Online",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Suporte Comercial",
+    "Get the apps to sync your files" : "Obtenha as aplicações para sincronizar os seus ficheiros",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
+    "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
+    "Password" : "Password",
+    "Your password was changed" : "A sua palavra-passe foi alterada",
+    "Unable to change your password" : "Não foi possivel alterar a sua palavra-chave",
+    "Current password" : "Palavra-chave actual",
+    "New password" : "Nova palavra-chave",
+    "Change password" : "Alterar palavra-chave",
+    "Full Name" : "Nome completo",
+    "Email" : "Email",
+    "Your email address" : "O seu endereço de email",
+    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
+    "Profile picture" : "Foto do perfil",
+    "Upload new" : "Carregar novo",
+    "Select new from Files" : "Seleccionar novo a partir dos ficheiros",
+    "Remove image" : "Remover imagem",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois.",
+    "Your avatar is provided by your original account." : "O seu avatar é fornecido pela sua conta original.",
+    "Cancel" : "Cancelar",
+    "Choose as profile image" : "Escolha uma fotografia de perfil",
+    "Language" : "Idioma",
+    "Help translate" : "Ajude a traduzir",
+    "Common Name" : "Nome Comum",
+    "Valid until" : "Válido até",
+    "Issued By" : "Emitido Por",
+    "Valid until %s" : "Válido até %s",
+    "Import Root Certificate" : "Importar Certificado Root",
+    "The encryption app is no longer enabled, please decrypt all your files" : "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
+    "Log-in password" : "Password de entrada",
+    "Decrypt all Files" : "Desencriptar todos os ficheiros",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
+    "Restore Encryption Keys" : "Restaurar as chaves de encriptação",
+    "Delete Encryption Keys" : "Apagar as chaves de encriptação",
+    "Show storage location" : "Mostrar a localização do armazenamento",
+    "Show last log in" : "Mostrar ultimo acesso de entrada",
+    "Login Name" : "Nome de utilizador",
+    "Create" : "Criar",
+    "Admin Recovery Password" : "Recuperar password de administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
+    "Search Users and Groups" : "Pesquisa Utilizadores e Grupos",
+    "Add Group" : "Adicionar grupo",
+    "Group" : "Grupo",
+    "Everyone" : "Para todos",
+    "Admins" : "Administrador",
+    "Default Quota" : "Quota por padrão",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
+    "Unlimited" : "Ilimitado",
+    "Other" : "Outro",
+    "Username" : "Nome de utilizador",
+    "Group Admin for" : "Administrador de Grupo para",
+    "Quota" : "Quota",
+    "Storage Location" : "Localização do Armazenamento",
+    "Last Login" : "Ultimo acesso",
+    "change full name" : "alterar nome completo",
+    "set new password" : "definir nova palavra-passe",
+    "Default" : "Padrão"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
deleted file mode 100644
index 363cf1959f7..00000000000
--- a/settings/l10n/pt_PT.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Ativada",
-"Not enabled" => "Desactivado",
-"Recommended" => "Recomendado",
-"Authentication error" => "Erro na autenticação",
-"Your full name has been changed." => "O seu nome completo foi alterado.",
-"Unable to change full name" => "Não foi possível alterar o seu nome completo",
-"Group already exists" => "O grupo já existe",
-"Unable to add group" => "Impossível acrescentar o grupo",
-"Files decrypted successfully" => "Ficheiros desencriptados com sucesso",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-"Couldn't decrypt your files, check your password and try again" => "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
-"Encryption keys deleted permanently" => "A chave de encriptação foi eliminada permanentemente",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-"Couldn't remove app." => "Impossível remover aplicação.",
-"Email saved" => "Email guardado",
-"Invalid email" => "Email inválido",
-"Unable to delete group" => "Impossível apagar grupo",
-"Unable to delete user" => "Impossível apagar utilizador",
-"Backups restored successfully" => "Cópias de segurança foram restauradas com sucesso",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-"Language changed" => "Idioma alterado",
-"Invalid request" => "Pedido Inválido",
-"Admins can't remove themself from the admin group" => "Os administradores não se podem remover a eles mesmos do grupo admin.",
-"Unable to add user to group %s" => "Impossível acrescentar utilizador ao grupo %s",
-"Unable to remove user from group %s" => "Impossível apagar utilizador do grupo %s",
-"Couldn't update app." => "Não foi possível actualizar a aplicação.",
-"Wrong password" => "Password errada",
-"No user supplied" => "Nenhum utilizador especificado.",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
-"Wrong admin recovery password. Please check the password and try again." => "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
-"Unable to change password" => "Não foi possível alterar a sua password",
-"Saved" => "Guardado",
-"test email settings" => "testar configurações de email",
-"If you received this email, the settings seem to be correct." => "Se você recebeu este e-mail as configurações parecem estar correctas",
-"A problem occurred while sending the email. Please revise your settings." => "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
-"Email sent" => "E-mail enviado",
-"You need to set your user email before being able to send test emails." => "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
-"Add trusted domain" => "Adicionar domínio confiável ",
-"Sending..." => "A enviar...",
-"All" => "Todos",
-"Please wait...." => "Por favor aguarde...",
-"Error while disabling app" => "Erro enquanto desactivava a aplicação",
-"Disable" => "Desactivar",
-"Enable" => "Activar",
-"Error while enabling app" => "Erro enquanto activava a aplicação",
-"Updating...." => "A Actualizar...",
-"Error while updating app" => "Erro enquanto actualizava a aplicação",
-"Updated" => "Actualizado",
-"Uninstalling ...." => "Desinstalando ....",
-"Error while uninstalling app" => "Erro durante a desinstalação da aplicação",
-"Uninstall" => "Desinstalar",
-"Select a profile picture" => "Seleccione uma fotografia de perfil",
-"Very weak password" => "Password muito fraca",
-"Weak password" => "Password fraca",
-"So-so password" => "Password aceitável",
-"Good password" => "Password Forte",
-"Strong password" => "Password muito forte",
-"Valid until {date}" => "Válido até {date}",
-"Delete" => "Eliminar",
-"Decrypting files... Please wait, this can take some time." => "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
-"Delete encryption keys permanently." => "Excluir as chaves encriptadas de forma permanente.",
-"Restore encryption keys." => "Restaurar chaves encriptadas.",
-"Groups" => "Grupos",
-"Unable to delete {objName}" => "Impossível apagar {objNome}",
-"Error creating group" => "Erro ao criar grupo",
-"A valid group name must be provided" => "Um nome válido do grupo tem de ser fornecido",
-"deleted {groupName}" => "apagar {Nome do grupo}",
-"undo" => "desfazer",
-"no group" => "sem grupo",
-"never" => "nunca",
-"deleted {userName}" => "apagar{utilizador}",
-"add group" => "Adicionar grupo",
-"A valid username must be provided" => "Um nome de utilizador válido deve ser fornecido",
-"Error creating user" => "Erro a criar utilizador",
-"A valid password must be provided" => "Uma password válida deve ser fornecida",
-"Warning: Home directory for user \"{user}\" already exists" => "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
-"__language_name__" => "__language_name__",
-"Personal Info" => "Informação Pessoal",
-"SSL root certificates" => "Certificados SSL de raiz",
-"Encryption" => "Encriptação",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Tudo (problemas fatais, erros, avisos, informação, depuração)",
-"Info, warnings, errors and fatal issues" => "Informação, avisos, erros e problemas fatais",
-"Warnings, errors and fatal issues" => "Avisos, erros e problemas fatais",
-"Errors and fatal issues" => "Erros e problemas fatais",
-"Fatal issues only" => "Apenas problemas fatais",
-"None" => "Nenhum",
-"Login" => "Login",
-"Plain" => "Plano",
-"NT LAN Manager" => "Gestor de NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Aviso de Segurança",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Está a aceder %s via HTTP. Recomendamos vivamente que configure o servidor para forçar o uso de HTTPS.",
-"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." => "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.",
-"Setup Warning" => "Aviso de setup",
-"PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." => "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
-"This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." => "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
-"Database Performance Info" => "Informação sobre desempenho da Base de Dados",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Falta o módulo 'fileinfo'",
-"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' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
-"Your PHP version is outdated" => "A sua versão do PHP está ultrapassada",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
-"PHP charset is not set to UTF-8" => "PHP charset não está definido para UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
-"Locale not working" => "Internacionalização não está a funcionar",
-"System locale can not be set to a one which supports UTF-8." => "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
-"URL generation in notification emails" => "Geração URL em e-mails de notificação",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
-"Connectivity checks" => "Verificações de conectividade",
-"No problems found" => "Nenhum problema encontrado",
-"Please double check the <a href='%s'>installation guides</a>." => "Por favor verifique <a href='%s'>installation guides</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "O ultimo cron foi executado em %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
-"Cron was not executed yet!" => "Cron ainda não foi executado!",
-"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.",
-"Sharing" => "Partilha",
-"Allow apps to use the Share API" => "Permitir que os utilizadores usem a API de partilha",
-"Allow users to share via link" => "Permitir que os utilizadores partilhem através do link",
-"Enforce password protection" => "Forçar protecção da palavra passe",
-"Allow public uploads" => "Permitir Envios Públicos",
-"Set default expiration date" => "Especificar a data padrão de expiração",
-"Expire after " => "Expira após",
-"days" => "dias",
-"Enforce expiration date" => "Forçar a data de expiração",
-"Allow resharing" => "Permitir repartilha",
-"Restrict users to only share with users in their groups" => "Restringe os utilizadores só a partilhar com utilizadores do seu grupo",
-"Allow users to send mail notification for shared files" => "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
-"Exclude groups from sharing" => "Excluir grupos das partilhas",
-"These groups will still be able to receive shares, but not to initiate them." => "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
-"Security" => "Segurança",
-"Enforce HTTPS" => "Forçar HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Forçar os clientes a ligar a %s através de uma ligação encriptada",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
-"Email Server" => "Servidor de email",
-"This is used for sending out notifications." => "Isto é utilizado para enviar notificações",
-"Send mode" => "Modo de envio",
-"From address" => "Do endereço",
-"mail" => "Correio",
-"Authentication method" => "Método de autenticação",
-"Authentication required" => "Autenticação necessária",
-"Server address" => "Endereço do servidor",
-"Port" => "Porto",
-"Credentials" => "Credenciais",
-"SMTP Username" => "Nome de utilizador SMTP",
-"SMTP Password" => "Password SMTP",
-"Store credentials" => "Armazenar credenciais",
-"Test email settings" => "Testar configurações de email",
-"Send email" => "Enviar email",
-"Log" => "Registo",
-"Log level" => "Nível do registo",
-"More" => "Mais",
-"Less" => "Menos",
-"Version" => "Versão",
-"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>." => "Desenvolvido pela <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o<a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está licenciado sob a <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Mais aplicações",
-"Add your app" => "Adicione a sua aplicação",
-"by" => "por",
-"licensed" => "licenciado",
-"Documentation:" => "Documentação:",
-"User Documentation" => "Documentação de Utilizador",
-"Admin Documentation" => "Documentação de administrador.",
-"Update to %s" => "Actualizar para %s",
-"Enable only for specific groups" => "Activar só para grupos específicos",
-"Uninstall App" => "Desinstalar aplicação",
-"Administrator Documentation" => "Documentação de administrador.",
-"Online Documentation" => "Documentação Online",
-"Forum" => "Fórum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Suporte Comercial",
-"Get the apps to sync your files" => "Obtenha as aplicações para sincronizar os seus ficheiros",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
-"Show First Run Wizard again" => "Mostrar novamente Wizard de Arranque Inicial",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
-"Password" => "Password",
-"Your password was changed" => "A sua palavra-passe foi alterada",
-"Unable to change your password" => "Não foi possivel alterar a sua palavra-chave",
-"Current password" => "Palavra-chave actual",
-"New password" => "Nova palavra-chave",
-"Change password" => "Alterar palavra-chave",
-"Full Name" => "Nome completo",
-"Email" => "Email",
-"Your email address" => "O seu endereço de email",
-"Fill in an email address to enable password recovery and receive notifications" => "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
-"Profile picture" => "Foto do perfil",
-"Upload new" => "Carregar novo",
-"Select new from Files" => "Seleccionar novo a partir dos ficheiros",
-"Remove image" => "Remover imagem",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Apenas png ou jpg. Idealmente quadrada, mas poderá corta-la depois.",
-"Your avatar is provided by your original account." => "O seu avatar é fornecido pela sua conta original.",
-"Cancel" => "Cancelar",
-"Choose as profile image" => "Escolha uma fotografia de perfil",
-"Language" => "Idioma",
-"Help translate" => "Ajude a traduzir",
-"Common Name" => "Nome Comum",
-"Valid until" => "Válido até",
-"Issued By" => "Emitido Por",
-"Valid until %s" => "Válido até %s",
-"Import Root Certificate" => "Importar Certificado Root",
-"The encryption app is no longer enabled, please decrypt all your files" => "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
-"Log-in password" => "Password de entrada",
-"Decrypt all Files" => "Desencriptar todos os ficheiros",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
-"Restore Encryption Keys" => "Restaurar as chaves de encriptação",
-"Delete Encryption Keys" => "Apagar as chaves de encriptação",
-"Show storage location" => "Mostrar a localização do armazenamento",
-"Show last log in" => "Mostrar ultimo acesso de entrada",
-"Login Name" => "Nome de utilizador",
-"Create" => "Criar",
-"Admin Recovery Password" => "Recuperar password de administrador",
-"Enter the recovery password in order to recover the users files during password change" => "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
-"Search Users and Groups" => "Pesquisa Utilizadores e Grupos",
-"Add Group" => "Adicionar grupo",
-"Group" => "Grupo",
-"Everyone" => "Para todos",
-"Admins" => "Administrador",
-"Default Quota" => "Quota por padrão",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
-"Unlimited" => "Ilimitado",
-"Other" => "Outro",
-"Username" => "Nome de utilizador",
-"Group Admin for" => "Administrador de Grupo para",
-"Quota" => "Quota",
-"Storage Location" => "Localização do Armazenamento",
-"Last Login" => "Ultimo acesso",
-"change full name" => "alterar nome completo",
-"set new password" => "definir nova palavra-passe",
-"Default" => "Padrão"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js
new file mode 100644
index 00000000000..64e3d811832
--- /dev/null
+++ b/settings/l10n/ro.js
@@ -0,0 +1,137 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Activat",
+    "Recommended" : "Recomandat",
+    "Authentication error" : "Eroare la autentificare",
+    "Your full name has been changed." : "Numele tău complet a fost schimbat.",
+    "Unable to change full name" : "Nu s-a puput schimba numele complet",
+    "Group already exists" : "Grupul există deja",
+    "Unable to add group" : "Nu s-a putut adăuga grupul",
+    "Files decrypted successfully" : "Fișierele au fost decriptate cu succes",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau întreabă administratorul",
+    "Couldn't decrypt your files, check your password and try again" : "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou",
+    "Email saved" : "E-mail salvat",
+    "Invalid email" : "E-mail invalid",
+    "Unable to delete group" : "Nu s-a putut șterge grupul",
+    "Unable to delete user" : "Nu s-a putut șterge utilizatorul",
+    "Language changed" : "Limba a fost schimbată",
+    "Invalid request" : "Cerere eronată",
+    "Admins can't remove themself from the admin group" : "Administratorii nu se pot șterge singuri din grupul admin",
+    "Unable to add user to group %s" : "Nu s-a putut adăuga utilizatorul la grupul %s",
+    "Unable to remove user from group %s" : "Nu s-a putut elimina utilizatorul din grupul %s",
+    "Couldn't update app." : "Aplicaţia nu s-a putut actualiza.",
+    "Wrong password" : "Parolă greșită",
+    "No user supplied" : "Nici un utilizator furnizat",
+    "Unable to change password" : "Imposibil de schimbat parola",
+    "Saved" : "Salvat",
+    "test email settings" : "verifică setările de e-mail",
+    "If you received this email, the settings seem to be correct." : "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
+    "Email sent" : "Mesajul a fost expediat",
+    "Sending..." : "Se expediază...",
+    "All" : "Toate ",
+    "Please wait...." : "Aşteptaţi vă rog....",
+    "Error while disabling app" : "Eroare în timpul dezactivării aplicației",
+    "Disable" : "Dezactivați",
+    "Enable" : "Activare",
+    "Error while enabling app" : "Eroare în timpul activării applicației",
+    "Updating...." : "Actualizare în curs....",
+    "Error while updating app" : "Eroare în timpul actualizării aplicaţiei",
+    "Updated" : "Actualizat",
+    "Select a profile picture" : "Selectează o imagine de profil",
+    "Very weak password" : "Parolă foarte slabă",
+    "Weak password" : "Parolă slabă",
+    "Good password" : "Parolă bună",
+    "Strong password" : "Parolă puternică",
+    "Delete" : "Șterge",
+    "Decrypting files... Please wait, this can take some time." : "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
+    "Groups" : "Grupuri",
+    "undo" : "Anulează ultima acțiune",
+    "never" : "niciodată",
+    "add group" : "adăugaţi grupul",
+    "A valid username must be provided" : "Trebuie să furnizaţi un nume de utilizator valid",
+    "Error creating user" : "Eroare la crearea utilizatorului",
+    "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există",
+    "__language_name__" : "_language_name_",
+    "SSL root certificates" : "Certificate SSL root",
+    "Encryption" : "Încriptare",
+    "None" : "Niciuna",
+    "Login" : "Autentificare",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avertisment de securitate",
+    "Setup Warning" : "Atenţie la implementare",
+    "Module 'fileinfo' missing" : "Modulul \"Fileinfo\" lipsește",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type.",
+    "Your PHP version is outdated" : "Versiunea PHP folosită este învechită",
+    "Locale not working" : "Localizarea nu funcționează",
+    "Please double check the <a href='%s'>installation guides</a>." : "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
+    "Sharing" : "Partajare",
+    "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
+    "Allow public uploads" : "Permite încărcări publice",
+    "Allow resharing" : "Permite repartajarea",
+    "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
+    "Security" : "Securitate",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
+    "Send mode" : "Modul de expediere",
+    "Authentication method" : "Modul de autentificare",
+    "Server address" : "Adresa server-ului",
+    "Port" : "Portul",
+    "SMTP Username" : "Nume utilizator SMTP",
+    "SMTP Password" : "Parolă SMTP",
+    "Test email settings" : "Verifică setările de e-mail",
+    "Send email" : "Expediază mesajul",
+    "Log" : "Jurnal de activitate",
+    "Log level" : "Nivel jurnal",
+    "More" : "Mai mult",
+    "Less" : "Mai puțin",
+    "Version" : "Versiunea",
+    "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>." : "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "după",
+    "User Documentation" : "Documentație utilizator",
+    "Administrator Documentation" : "Documentație administrator",
+    "Online Documentation" : "Documentație online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Urmărire bug-uri",
+    "Commercial Support" : "Suport comercial",
+    "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
+    "Password" : "Parolă",
+    "Your password was changed" : "Parola a fost modificată",
+    "Unable to change your password" : "Imposibil de-ați schimbat parola",
+    "Current password" : "Parola curentă",
+    "New password" : "Noua parolă",
+    "Change password" : "Schimbă parola",
+    "Full Name" : "Nume complet",
+    "Email" : "Email",
+    "Your email address" : "Adresa ta de email",
+    "Profile picture" : "Imagine de profil",
+    "Upload new" : "Încarcă una nouă",
+    "Select new from Files" : "Selectează una din Fișiere",
+    "Remove image" : "Înlătură imagine",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Doar png sau jpg de formă pătrată. ",
+    "Cancel" : "Anulare",
+    "Choose as profile image" : "Alege drept imagine de profil",
+    "Language" : "Limba",
+    "Help translate" : "Ajută la traducere",
+    "Import Root Certificate" : "Importă certificat root",
+    "Log-in password" : "Parolă",
+    "Decrypt all Files" : "Decriptează toate fișierele",
+    "Login Name" : "Autentificare",
+    "Create" : "Crează",
+    "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
+    "Enter the recovery password in order to recover the users files during password change" : "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
+    "Group" : "Grup",
+    "Default Quota" : "Cotă implicită",
+    "Unlimited" : "Nelimitată",
+    "Other" : "Altele",
+    "Username" : "Nume utilizator",
+    "Quota" : "Cotă",
+    "change full name" : "schimbă numele complet",
+    "set new password" : "setează parolă nouă",
+    "Default" : "Implicită"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json
new file mode 100644
index 00000000000..c4c756e9367
--- /dev/null
+++ b/settings/l10n/ro.json
@@ -0,0 +1,135 @@
+{ "translations": {
+    "Enabled" : "Activat",
+    "Recommended" : "Recomandat",
+    "Authentication error" : "Eroare la autentificare",
+    "Your full name has been changed." : "Numele tău complet a fost schimbat.",
+    "Unable to change full name" : "Nu s-a puput schimba numele complet",
+    "Group already exists" : "Grupul există deja",
+    "Unable to add group" : "Nu s-a putut adăuga grupul",
+    "Files decrypted successfully" : "Fișierele au fost decriptate cu succes",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau întreabă administratorul",
+    "Couldn't decrypt your files, check your password and try again" : "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou",
+    "Email saved" : "E-mail salvat",
+    "Invalid email" : "E-mail invalid",
+    "Unable to delete group" : "Nu s-a putut șterge grupul",
+    "Unable to delete user" : "Nu s-a putut șterge utilizatorul",
+    "Language changed" : "Limba a fost schimbată",
+    "Invalid request" : "Cerere eronată",
+    "Admins can't remove themself from the admin group" : "Administratorii nu se pot șterge singuri din grupul admin",
+    "Unable to add user to group %s" : "Nu s-a putut adăuga utilizatorul la grupul %s",
+    "Unable to remove user from group %s" : "Nu s-a putut elimina utilizatorul din grupul %s",
+    "Couldn't update app." : "Aplicaţia nu s-a putut actualiza.",
+    "Wrong password" : "Parolă greșită",
+    "No user supplied" : "Nici un utilizator furnizat",
+    "Unable to change password" : "Imposibil de schimbat parola",
+    "Saved" : "Salvat",
+    "test email settings" : "verifică setările de e-mail",
+    "If you received this email, the settings seem to be correct." : "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
+    "Email sent" : "Mesajul a fost expediat",
+    "Sending..." : "Se expediază...",
+    "All" : "Toate ",
+    "Please wait...." : "Aşteptaţi vă rog....",
+    "Error while disabling app" : "Eroare în timpul dezactivării aplicației",
+    "Disable" : "Dezactivați",
+    "Enable" : "Activare",
+    "Error while enabling app" : "Eroare în timpul activării applicației",
+    "Updating...." : "Actualizare în curs....",
+    "Error while updating app" : "Eroare în timpul actualizării aplicaţiei",
+    "Updated" : "Actualizat",
+    "Select a profile picture" : "Selectează o imagine de profil",
+    "Very weak password" : "Parolă foarte slabă",
+    "Weak password" : "Parolă slabă",
+    "Good password" : "Parolă bună",
+    "Strong password" : "Parolă puternică",
+    "Delete" : "Șterge",
+    "Decrypting files... Please wait, this can take some time." : "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
+    "Groups" : "Grupuri",
+    "undo" : "Anulează ultima acțiune",
+    "never" : "niciodată",
+    "add group" : "adăugaţi grupul",
+    "A valid username must be provided" : "Trebuie să furnizaţi un nume de utilizator valid",
+    "Error creating user" : "Eroare la crearea utilizatorului",
+    "A valid password must be provided" : "Trebuie să furnizaţi o parolă validă",
+    "Warning: Home directory for user \"{user}\" already exists" : "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există",
+    "__language_name__" : "_language_name_",
+    "SSL root certificates" : "Certificate SSL root",
+    "Encryption" : "Încriptare",
+    "None" : "Niciuna",
+    "Login" : "Autentificare",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Avertisment de securitate",
+    "Setup Warning" : "Atenţie la implementare",
+    "Module 'fileinfo' missing" : "Modulul \"Fileinfo\" lipsește",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type.",
+    "Your PHP version is outdated" : "Versiunea PHP folosită este învechită",
+    "Locale not working" : "Localizarea nu funcționează",
+    "Please double check the <a href='%s'>installation guides</a>." : "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
+    "Sharing" : "Partajare",
+    "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
+    "Allow public uploads" : "Permite încărcări publice",
+    "Allow resharing" : "Permite repartajarea",
+    "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
+    "Security" : "Securitate",
+    "Forces the clients to connect to %s via an encrypted connection." : "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
+    "Send mode" : "Modul de expediere",
+    "Authentication method" : "Modul de autentificare",
+    "Server address" : "Adresa server-ului",
+    "Port" : "Portul",
+    "SMTP Username" : "Nume utilizator SMTP",
+    "SMTP Password" : "Parolă SMTP",
+    "Test email settings" : "Verifică setările de e-mail",
+    "Send email" : "Expediază mesajul",
+    "Log" : "Jurnal de activitate",
+    "Log level" : "Nivel jurnal",
+    "More" : "Mai mult",
+    "Less" : "Mai puțin",
+    "Version" : "Versiunea",
+    "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>." : "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "după",
+    "User Documentation" : "Documentație utilizator",
+    "Administrator Documentation" : "Documentație administrator",
+    "Online Documentation" : "Documentație online",
+    "Forum" : "Forum",
+    "Bugtracker" : "Urmărire bug-uri",
+    "Commercial Support" : "Suport comercial",
+    "Get the apps to sync your files" : "Ia acum aplicatia pentru sincronizarea fisierelor ",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
+    "Password" : "Parolă",
+    "Your password was changed" : "Parola a fost modificată",
+    "Unable to change your password" : "Imposibil de-ați schimbat parola",
+    "Current password" : "Parola curentă",
+    "New password" : "Noua parolă",
+    "Change password" : "Schimbă parola",
+    "Full Name" : "Nume complet",
+    "Email" : "Email",
+    "Your email address" : "Adresa ta de email",
+    "Profile picture" : "Imagine de profil",
+    "Upload new" : "Încarcă una nouă",
+    "Select new from Files" : "Selectează una din Fișiere",
+    "Remove image" : "Înlătură imagine",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Doar png sau jpg de formă pătrată. ",
+    "Cancel" : "Anulare",
+    "Choose as profile image" : "Alege drept imagine de profil",
+    "Language" : "Limba",
+    "Help translate" : "Ajută la traducere",
+    "Import Root Certificate" : "Importă certificat root",
+    "Log-in password" : "Parolă",
+    "Decrypt all Files" : "Decriptează toate fișierele",
+    "Login Name" : "Autentificare",
+    "Create" : "Crează",
+    "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
+    "Enter the recovery password in order to recover the users files during password change" : "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
+    "Group" : "Grup",
+    "Default Quota" : "Cotă implicită",
+    "Unlimited" : "Nelimitată",
+    "Other" : "Altele",
+    "Username" : "Nume utilizator",
+    "Quota" : "Cotă",
+    "change full name" : "schimbă numele complet",
+    "set new password" : "setează parolă nouă",
+    "Default" : "Implicită"
+},"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/settings/l10n/ro.php b/settings/l10n/ro.php
deleted file mode 100644
index a0cf5139e52..00000000000
--- a/settings/l10n/ro.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Activat",
-"Recommended" => "Recomandat",
-"Authentication error" => "Eroare la autentificare",
-"Your full name has been changed." => "Numele tău complet a fost schimbat.",
-"Unable to change full name" => "Nu s-a puput schimba numele complet",
-"Group already exists" => "Grupul există deja",
-"Unable to add group" => "Nu s-a putut adăuga grupul",
-"Files decrypted successfully" => "Fișierele au fost decriptate cu succes",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nu s-a puput decripta fișierele tale, verifică owncloud.log sau întreabă administratorul",
-"Couldn't decrypt your files, check your password and try again" => "Nu s-a puput decripta fișierele tale, verifică parola și  încearcă din nou",
-"Email saved" => "E-mail salvat",
-"Invalid email" => "E-mail invalid",
-"Unable to delete group" => "Nu s-a putut șterge grupul",
-"Unable to delete user" => "Nu s-a putut șterge utilizatorul",
-"Language changed" => "Limba a fost schimbată",
-"Invalid request" => "Cerere eronată",
-"Admins can't remove themself from the admin group" => "Administratorii nu se pot șterge singuri din grupul admin",
-"Unable to add user to group %s" => "Nu s-a putut adăuga utilizatorul la grupul %s",
-"Unable to remove user from group %s" => "Nu s-a putut elimina utilizatorul din grupul %s",
-"Couldn't update app." => "Aplicaţia nu s-a putut actualiza.",
-"Wrong password" => "Parolă greșită",
-"No user supplied" => "Nici un utilizator furnizat",
-"Unable to change password" => "Imposibil de schimbat parola",
-"Saved" => "Salvat",
-"test email settings" => "verifică setările de e-mail",
-"If you received this email, the settings seem to be correct." => "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
-"Email sent" => "Mesajul a fost expediat",
-"Sending..." => "Se expediază...",
-"All" => "Toate ",
-"Please wait...." => "Aşteptaţi vă rog....",
-"Error while disabling app" => "Eroare în timpul dezactivării aplicației",
-"Disable" => "Dezactivați",
-"Enable" => "Activare",
-"Error while enabling app" => "Eroare în timpul activării applicației",
-"Updating...." => "Actualizare în curs....",
-"Error while updating app" => "Eroare în timpul actualizării aplicaţiei",
-"Updated" => "Actualizat",
-"Select a profile picture" => "Selectează o imagine de profil",
-"Very weak password" => "Parolă foarte slabă",
-"Weak password" => "Parolă slabă",
-"Good password" => "Parolă bună",
-"Strong password" => "Parolă puternică",
-"Delete" => "Șterge",
-"Decrypting files... Please wait, this can take some time." => "Decriptare fișiere... Te rog așteaptă, poate dura ceva timp.",
-"Groups" => "Grupuri",
-"undo" => "Anulează ultima acțiune",
-"never" => "niciodată",
-"add group" => "adăugaţi grupul",
-"A valid username must be provided" => "Trebuie să furnizaţi un nume de utilizator valid",
-"Error creating user" => "Eroare la crearea utilizatorului",
-"A valid password must be provided" => "Trebuie să furnizaţi o parolă validă",
-"Warning: Home directory for user \"{user}\" already exists" => "Avertizare: Dosarul Acasă pentru utilizatorul \"{user}\" deja există",
-"__language_name__" => "_language_name_",
-"SSL root certificates" => "Certificate SSL root",
-"Encryption" => "Încriptare",
-"None" => "Niciuna",
-"Login" => "Autentificare",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Avertisment de securitate",
-"Setup Warning" => "Atenţie la implementare",
-"Module 'fileinfo' missing" => "Modulul \"Fileinfo\" lipsește",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Modulul PHP \"Fileinfo\" lipsește. Va recomandam sa activaţi acest modul pentru a obține cele mai bune rezultate cu detectarea mime-type.",
-"Your PHP version is outdated" => "Versiunea PHP folosită este învechită",
-"Locale not working" => "Localizarea nu funcționează",
-"Please double check the <a href='%s'>installation guides</a>." => "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Execută o sarcină la fiecare pagină încărcată",
-"Sharing" => "Partajare",
-"Allow apps to use the Share API" => "Permite aplicațiilor să folosească API-ul de partajare",
-"Allow public uploads" => "Permite încărcări publice",
-"Allow resharing" => "Permite repartajarea",
-"Allow users to send mail notification for shared files" => "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
-"Security" => "Securitate",
-"Forces the clients to connect to %s via an encrypted connection." => "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
-"Send mode" => "Modul de expediere",
-"Authentication method" => "Modul de autentificare",
-"Server address" => "Adresa server-ului",
-"Port" => "Portul",
-"SMTP Username" => "Nume utilizator SMTP",
-"SMTP Password" => "Parolă SMTP",
-"Test email settings" => "Verifică setările de e-mail",
-"Send email" => "Expediază mesajul",
-"Log" => "Jurnal de activitate",
-"Log level" => "Nivel jurnal",
-"More" => "Mai mult",
-"Less" => "Mai puțin",
-"Version" => "Versiunea",
-"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>." => "Dezvoltat de the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitatea ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">codul sursă</a> este licențiat sub <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "după",
-"User Documentation" => "Documentație utilizator",
-"Administrator Documentation" => "Documentație administrator",
-"Online Documentation" => "Documentație online",
-"Forum" => "Forum",
-"Bugtracker" => "Urmărire bug-uri",
-"Commercial Support" => "Suport comercial",
-"Get the apps to sync your files" => "Ia acum aplicatia pentru sincronizarea fisierelor ",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ați utilizat <strong>%s</strong> din <strong>%s</strong> disponibile",
-"Password" => "Parolă",
-"Your password was changed" => "Parola a fost modificată",
-"Unable to change your password" => "Imposibil de-ați schimbat parola",
-"Current password" => "Parola curentă",
-"New password" => "Noua parolă",
-"Change password" => "Schimbă parola",
-"Full Name" => "Nume complet",
-"Email" => "Email",
-"Your email address" => "Adresa ta de email",
-"Profile picture" => "Imagine de profil",
-"Upload new" => "Încarcă una nouă",
-"Select new from Files" => "Selectează una din Fișiere",
-"Remove image" => "Înlătură imagine",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Doar png sau jpg de formă pătrată. ",
-"Cancel" => "Anulare",
-"Choose as profile image" => "Alege drept imagine de profil",
-"Language" => "Limba",
-"Help translate" => "Ajută la traducere",
-"Import Root Certificate" => "Importă certificat root",
-"Log-in password" => "Parolă",
-"Decrypt all Files" => "Decriptează toate fișierele",
-"Login Name" => "Autentificare",
-"Create" => "Crează",
-"Admin Recovery Password" => "Parolă de recuperare a Administratorului",
-"Enter the recovery password in order to recover the users files during password change" => "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
-"Group" => "Grup",
-"Default Quota" => "Cotă implicită",
-"Unlimited" => "Nelimitată",
-"Other" => "Altele",
-"Username" => "Nume utilizator",
-"Quota" => "Cotă",
-"change full name" => "schimbă numele complet",
-"set new password" => "setează parolă nouă",
-"Default" => "Implicită"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));";
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
new file mode 100644
index 00000000000..3932f2a457c
--- /dev/null
+++ b/settings/l10n/ru.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Включено",
+    "Authentication error" : "Ошибка аутентификации",
+    "Your full name has been changed." : "Ваше полное имя было изменено.",
+    "Unable to change full name" : "Невозможно изменить полное имя",
+    "Group already exists" : "Группа уже существует",
+    "Unable to add group" : "Невозможно добавить группу",
+    "Files decrypted successfully" : "Дешифрование файлов прошло успешно",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ошибка при дешифровании файлов. Обратитесь к вашему системному администратору. Доп информация в owncloud.log",
+    "Couldn't decrypt your files, check your password and try again" : "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
+    "Encryption keys deleted permanently" : "Ключи шифрования перманентно удалены",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору",
+    "Couldn't remove app." : "Невозможно удалить приложение.",
+    "Email saved" : "Email сохранен",
+    "Invalid email" : "Неправильный Email",
+    "Unable to delete group" : "Невозможно удалить группу",
+    "Unable to delete user" : "Невозможно удалить пользователя",
+    "Backups restored successfully" : "Резервная копия успешно восстановлена",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору.",
+    "Language changed" : "Язык изменён",
+    "Invalid request" : "Неправильный запрос",
+    "Admins can't remove themself from the admin group" : "Администратор не может удалить сам себя из группы admin",
+    "Unable to add user to group %s" : "Невозможно добавить пользователя в группу %s",
+    "Unable to remove user from group %s" : "Невозможно удалить пользователя из группы %s",
+    "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." : "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
+    "Unable to change password" : "Невозможно изменить пароль",
+    "Saved" : "Сохранено",
+    "test email settings" : "проверить настройки почты",
+    "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
+    "Email sent" : "Письмо отправлено",
+    "You need to set your user email before being able to send test emails." : "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
+    "Add trusted domain" : "Добавить доверенный домен",
+    "Sending..." : "Отправляется ...",
+    "All" : "Все",
+    "Please wait...." : "Подождите...",
+    "Error while disabling app" : "Ошибка отключения приложения",
+    "Disable" : "Выключить",
+    "Enable" : "Включить",
+    "Error while enabling app" : "Ошибка включения приложения",
+    "Updating...." : "Обновление...",
+    "Error while updating app" : "Ошибка при обновлении приложения",
+    "Updated" : "Обновлено",
+    "Uninstalling ...." : "Удаление ...",
+    "Error while uninstalling app" : "Ошибка при удалении приложения.",
+    "Uninstall" : "Удалить",
+    "Select a profile picture" : "Выберите аватар",
+    "Very weak password" : "Очень слабый пароль",
+    "Weak password" : "Слабый пароль",
+    "So-so password" : "Так себе пароль",
+    "Good password" : "Хороший пароль",
+    "Strong password" : "Стойкий пароль",
+    "Valid until {date}" : "Действительно до {дата}",
+    "Delete" : "Удалить",
+    "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
+    "Delete encryption keys permanently." : "Перманентно удалить ключи шифрования. ",
+    "Restore encryption keys." : "Восстановить ключи шифрования.",
+    "Groups" : "Группы",
+    "Unable to delete {objName}" : "Невозможно удалить {objName}",
+    "Error creating group" : "Ошибка создания группы",
+    "A valid group name must be provided" : "Введите правильное имя группы",
+    "deleted {groupName}" : "удалено {groupName}",
+    "undo" : "отмена",
+    "never" : "никогда",
+    "deleted {userName}" : "удалён {userName}",
+    "add group" : "добавить группу",
+    "A valid username must be provided" : "Укажите правильное имя пользователя",
+    "Error creating user" : "Ошибка создания пользователя",
+    "A valid password must be provided" : "Укажите валидный пароль",
+    "Warning: Home directory for user \"{user}\" already exists" : "Предупреждение: домашняя папка пользователя \"{user}\" уже существует",
+    "__language_name__" : "Русский ",
+    "SSL root certificates" : "Корневые сертификаты SSL",
+    "Encryption" : "Шифрование",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
+    "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы",
+    "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы",
+    "Errors and fatal issues" : "Ошибки и критические проблемы",
+    "Fatal issues only" : "Только критические проблемы",
+    "None" : "Отсутствует",
+    "Login" : "Логин",
+    "Plain" : "Простой",
+    "NT LAN Manager" : "Мендеджер NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Предупреждение безопасности",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Вы обращаетесь к %s используя HTTP. Мы настоятельно рекомендуем вам настроить сервер на использование HTTPS.",
+    "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." : "Похоже, что папка с Вашими данными и Ваши файлы доступны из интернета. Файл .htaccess не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера.",
+    "Setup Warning" : "Предупреждение установки",
+    "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.",
+    "Database Performance Info" : "Информация о производительности Базы Данных",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'",
+    "Module 'fileinfo' missing" : "Модуль 'fileinfo' отсутствует",
+    "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) файлов.",
+    "Your PHP version is outdated" : "Ваша версия PHP устарела",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Ваша версия PHP устарела. Мы настоятельно рекомендуем  обновиться до 5.3.8 или новее,  так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом.",
+    "PHP charset is not set to UTF-8" : "Кодировка PHP не совпадает с UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-8.",
+    "Locale not working" : "Локализация не работает",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
+    "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
+    "Connectivity checks" : "Проверка соединения",
+    "No problems found" : "Проблемы не найдены",
+    "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+    "Cron" : "Планировщик задач по расписанию",
+    "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, 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 минут.",
+    "Sharing" : "Общий доступ",
+    "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
+    "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
+    "Enforce password protection" : "Защита паролем обязательна",
+    "Allow public uploads" : "Разрешить открытые загрузки",
+    "Set default expiration date" : "Установить срок действия по-умолчанию",
+    "Expire after " : "Заканчивается через",
+    "days" : "дней",
+    "Enforce expiration date" : "Срок действия обязателен",
+    "Allow resharing" : "Разрешить переоткрытие общего доступа",
+    "Restrict users to only share with users in their groups" : "Разрешить пользователям публикации только внутри их групп",
+    "Allow users to send mail notification for shared files" : "Разрешить пользователю оповещать почтой о расшаренных файлах",
+    "Exclude groups from sharing" : "Исключить группы из общего доступа",
+    "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
+    "Security" : "Безопасность",
+    "Enforce HTTPS" : "HTTPS соединение обязательно",
+    "Forces the clients to connect to %s via an encrypted connection." : "Принудить клиентов подключаться к %s через шифрованное соединение.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить обязательные SSL подключения.",
+    "Email Server" : "Почтовый сервер",
+    "This is used for sending out notifications." : "Используется для отправки уведомлений.",
+    "Send mode" : "Отправить сообщение",
+    "From address" : "Адрес отправителя",
+    "mail" : "почта",
+    "Authentication method" : "Метод проверки подлинности",
+    "Authentication required" : "Требуется аутентификация ",
+    "Server address" : "Адрес сервера",
+    "Port" : "Порт",
+    "Credentials" : "Учётные данные",
+    "SMTP Username" : "Пользователь SMTP",
+    "SMTP Password" : "Пароль SMTP",
+    "Test email settings" : "Проверить настройки почты",
+    "Send email" : "Отправить сообщение",
+    "Log" : "Журнал",
+    "Log level" : "Уровень детализации журнала",
+    "More" : "Больше",
+    "Less" : "Меньше",
+    "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>." : "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Ещё приложения",
+    "by" : ":",
+    "Documentation:" : "Документация:",
+    "User Documentation" : "Пользовательская документация",
+    "Admin Documentation" : "Документация администратора",
+    "Enable only for specific groups" : "Включить только для этих групп",
+    "Uninstall App" : "Удалить приложение",
+    "Administrator Documentation" : "Документация администратора",
+    "Online Documentation" : "Online документация",
+    "Forum" : "Форум",
+    "Bugtracker" : "Багтрекер",
+    "Commercial Support" : "Коммерческая поддержка",
+    "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tиди\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
+    "Show First Run Wizard again" : "Показать помощник настройки",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
+    "Password" : "Пароль",
+    "Your password was changed" : "Ваш пароль изменён",
+    "Unable to change your password" : "Невозможно сменить пароль",
+    "Current password" : "Текущий пароль",
+    "New password" : "Новый пароль",
+    "Change password" : "Сменить пароль",
+    "Full Name" : "Полное имя",
+    "Email" : "E-mail",
+    "Your email address" : "Ваш адрес электронной почты",
+    "Fill in an email address to enable password recovery and receive notifications" : "Введите свой email-адрес для того, чтобы включить возможность восстановления пароля и получения уведомлений",
+    "Profile picture" : "Аватар",
+    "Upload new" : "Загрузить новый",
+    "Select new from Files" : "Выберите новый из файлов",
+    "Remove image" : "Удалить аватар",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Допустимые форматы: png и jpg. Если изображение не квадратное, то вам будет предложено обрезать его.",
+    "Your avatar is provided by your original account." : "Будет использован аватар вашей оригинальной учетной записи.",
+    "Cancel" : "Отменить",
+    "Choose as profile image" : "Установить как аватар",
+    "Language" : "Язык",
+    "Help translate" : "Помочь с переводом",
+    "Common Name" : "Общее Имя",
+    "Valid until" : "Действительно до",
+    "Issued By" : "Выдан",
+    "Valid until %s" : "Действительно до %s",
+    "Import Root Certificate" : "Импортировать корневые сертификаты",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
+    "Log-in password" : "Пароль входа",
+    "Decrypt all Files" : "Снять шифрование со всех файлов",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
+    "Restore Encryption Keys" : "Восстановить Ключи Шифрования",
+    "Delete Encryption Keys" : "Удалить Ключи Шифрования",
+    "Show storage location" : "Показать местонахождение хранилища",
+    "Show last log in" : "Показать последний вход в систему",
+    "Login Name" : "Имя пользователя",
+    "Create" : "Создать",
+    "Admin Recovery Password" : "Восстановление пароля администратора",
+    "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+    "Search Users and Groups" : "Искать пользователей и групп",
+    "Add Group" : "Добавить группу",
+    "Group" : "Группа",
+    "Everyone" : "Все",
+    "Admins" : "Администраторы",
+    "Default Quota" : "Квота по умолчанию",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограниченно",
+    "Other" : "Другое",
+    "Username" : "Имя пользователя",
+    "Quota" : "Квота",
+    "Storage Location" : "Место хранилища",
+    "Last Login" : "Последний вход",
+    "change full name" : "изменить полное имя",
+    "set new password" : "установить новый пароль",
+    "Default" : "По умолчанию"
+},
+"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/settings/l10n/ru.json b/settings/l10n/ru.json
new file mode 100644
index 00000000000..74500a356a3
--- /dev/null
+++ b/settings/l10n/ru.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "Включено",
+    "Authentication error" : "Ошибка аутентификации",
+    "Your full name has been changed." : "Ваше полное имя было изменено.",
+    "Unable to change full name" : "Невозможно изменить полное имя",
+    "Group already exists" : "Группа уже существует",
+    "Unable to add group" : "Невозможно добавить группу",
+    "Files decrypted successfully" : "Дешифрование файлов прошло успешно",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Ошибка при дешифровании файлов. Обратитесь к вашему системному администратору. Доп информация в owncloud.log",
+    "Couldn't decrypt your files, check your password and try again" : "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
+    "Encryption keys deleted permanently" : "Ключи шифрования перманентно удалены",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору",
+    "Couldn't remove app." : "Невозможно удалить приложение.",
+    "Email saved" : "Email сохранен",
+    "Invalid email" : "Неправильный Email",
+    "Unable to delete group" : "Невозможно удалить группу",
+    "Unable to delete user" : "Невозможно удалить пользователя",
+    "Backups restored successfully" : "Резервная копия успешно восстановлена",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору.",
+    "Language changed" : "Язык изменён",
+    "Invalid request" : "Неправильный запрос",
+    "Admins can't remove themself from the admin group" : "Администратор не может удалить сам себя из группы admin",
+    "Unable to add user to group %s" : "Невозможно добавить пользователя в группу %s",
+    "Unable to remove user from group %s" : "Невозможно удалить пользователя из группы %s",
+    "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." : "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
+    "Unable to change password" : "Невозможно изменить пароль",
+    "Saved" : "Сохранено",
+    "test email settings" : "проверить настройки почты",
+    "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
+    "Email sent" : "Письмо отправлено",
+    "You need to set your user email before being able to send test emails." : "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
+    "Add trusted domain" : "Добавить доверенный домен",
+    "Sending..." : "Отправляется ...",
+    "All" : "Все",
+    "Please wait...." : "Подождите...",
+    "Error while disabling app" : "Ошибка отключения приложения",
+    "Disable" : "Выключить",
+    "Enable" : "Включить",
+    "Error while enabling app" : "Ошибка включения приложения",
+    "Updating...." : "Обновление...",
+    "Error while updating app" : "Ошибка при обновлении приложения",
+    "Updated" : "Обновлено",
+    "Uninstalling ...." : "Удаление ...",
+    "Error while uninstalling app" : "Ошибка при удалении приложения.",
+    "Uninstall" : "Удалить",
+    "Select a profile picture" : "Выберите аватар",
+    "Very weak password" : "Очень слабый пароль",
+    "Weak password" : "Слабый пароль",
+    "So-so password" : "Так себе пароль",
+    "Good password" : "Хороший пароль",
+    "Strong password" : "Стойкий пароль",
+    "Valid until {date}" : "Действительно до {дата}",
+    "Delete" : "Удалить",
+    "Decrypting files... Please wait, this can take some time." : "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
+    "Delete encryption keys permanently." : "Перманентно удалить ключи шифрования. ",
+    "Restore encryption keys." : "Восстановить ключи шифрования.",
+    "Groups" : "Группы",
+    "Unable to delete {objName}" : "Невозможно удалить {objName}",
+    "Error creating group" : "Ошибка создания группы",
+    "A valid group name must be provided" : "Введите правильное имя группы",
+    "deleted {groupName}" : "удалено {groupName}",
+    "undo" : "отмена",
+    "never" : "никогда",
+    "deleted {userName}" : "удалён {userName}",
+    "add group" : "добавить группу",
+    "A valid username must be provided" : "Укажите правильное имя пользователя",
+    "Error creating user" : "Ошибка создания пользователя",
+    "A valid password must be provided" : "Укажите валидный пароль",
+    "Warning: Home directory for user \"{user}\" already exists" : "Предупреждение: домашняя папка пользователя \"{user}\" уже существует",
+    "__language_name__" : "Русский ",
+    "SSL root certificates" : "Корневые сертификаты SSL",
+    "Encryption" : "Шифрование",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
+    "Info, warnings, errors and fatal issues" : "Информационные, предупреждения, ошибки и критические проблемы",
+    "Warnings, errors and fatal issues" : "Предупреждения, ошибки и критические проблемы",
+    "Errors and fatal issues" : "Ошибки и критические проблемы",
+    "Fatal issues only" : "Только критические проблемы",
+    "None" : "Отсутствует",
+    "Login" : "Логин",
+    "Plain" : "Простой",
+    "NT LAN Manager" : "Мендеджер NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Предупреждение безопасности",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Вы обращаетесь к %s используя HTTP. Мы настоятельно рекомендуем вам настроить сервер на использование HTTPS.",
+    "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." : "Похоже, что папка с Вашими данными и Ваши файлы доступны из интернета. Файл .htaccess не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера.",
+    "Setup Warning" : "Предупреждение установки",
+    "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.",
+    "Database Performance Info" : "Информация о производительности Базы Данных",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'",
+    "Module 'fileinfo' missing" : "Модуль 'fileinfo' отсутствует",
+    "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) файлов.",
+    "Your PHP version is outdated" : "Ваша версия PHP устарела",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Ваша версия PHP устарела. Мы настоятельно рекомендуем  обновиться до 5.3.8 или новее,  так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом.",
+    "PHP charset is not set to UTF-8" : "Кодировка PHP не совпадает с UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-8.",
+    "Locale not working" : "Локализация не работает",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
+    "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
+    "Connectivity checks" : "Проверка соединения",
+    "No problems found" : "Проблемы не найдены",
+    "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
+    "Cron" : "Планировщик задач по расписанию",
+    "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, 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 минут.",
+    "Sharing" : "Общий доступ",
+    "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
+    "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
+    "Enforce password protection" : "Защита паролем обязательна",
+    "Allow public uploads" : "Разрешить открытые загрузки",
+    "Set default expiration date" : "Установить срок действия по-умолчанию",
+    "Expire after " : "Заканчивается через",
+    "days" : "дней",
+    "Enforce expiration date" : "Срок действия обязателен",
+    "Allow resharing" : "Разрешить переоткрытие общего доступа",
+    "Restrict users to only share with users in their groups" : "Разрешить пользователям публикации только внутри их групп",
+    "Allow users to send mail notification for shared files" : "Разрешить пользователю оповещать почтой о расшаренных файлах",
+    "Exclude groups from sharing" : "Исключить группы из общего доступа",
+    "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
+    "Security" : "Безопасность",
+    "Enforce HTTPS" : "HTTPS соединение обязательно",
+    "Forces the clients to connect to %s via an encrypted connection." : "Принудить клиентов подключаться к %s через шифрованное соединение.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить обязательные SSL подключения.",
+    "Email Server" : "Почтовый сервер",
+    "This is used for sending out notifications." : "Используется для отправки уведомлений.",
+    "Send mode" : "Отправить сообщение",
+    "From address" : "Адрес отправителя",
+    "mail" : "почта",
+    "Authentication method" : "Метод проверки подлинности",
+    "Authentication required" : "Требуется аутентификация ",
+    "Server address" : "Адрес сервера",
+    "Port" : "Порт",
+    "Credentials" : "Учётные данные",
+    "SMTP Username" : "Пользователь SMTP",
+    "SMTP Password" : "Пароль SMTP",
+    "Test email settings" : "Проверить настройки почты",
+    "Send email" : "Отправить сообщение",
+    "Log" : "Журнал",
+    "Log level" : "Уровень детализации журнала",
+    "More" : "Больше",
+    "Less" : "Меньше",
+    "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>." : "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Ещё приложения",
+    "by" : ":",
+    "Documentation:" : "Документация:",
+    "User Documentation" : "Пользовательская документация",
+    "Admin Documentation" : "Документация администратора",
+    "Enable only for specific groups" : "Включить только для этих групп",
+    "Uninstall App" : "Удалить приложение",
+    "Administrator Documentation" : "Документация администратора",
+    "Online Documentation" : "Online документация",
+    "Forum" : "Форум",
+    "Bugtracker" : "Багтрекер",
+    "Commercial Support" : "Коммерческая поддержка",
+    "Get the apps to sync your files" : "Получить приложения для синхронизации ваших файлов",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tиди\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
+    "Show First Run Wizard again" : "Показать помощник настройки",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
+    "Password" : "Пароль",
+    "Your password was changed" : "Ваш пароль изменён",
+    "Unable to change your password" : "Невозможно сменить пароль",
+    "Current password" : "Текущий пароль",
+    "New password" : "Новый пароль",
+    "Change password" : "Сменить пароль",
+    "Full Name" : "Полное имя",
+    "Email" : "E-mail",
+    "Your email address" : "Ваш адрес электронной почты",
+    "Fill in an email address to enable password recovery and receive notifications" : "Введите свой email-адрес для того, чтобы включить возможность восстановления пароля и получения уведомлений",
+    "Profile picture" : "Аватар",
+    "Upload new" : "Загрузить новый",
+    "Select new from Files" : "Выберите новый из файлов",
+    "Remove image" : "Удалить аватар",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Допустимые форматы: png и jpg. Если изображение не квадратное, то вам будет предложено обрезать его.",
+    "Your avatar is provided by your original account." : "Будет использован аватар вашей оригинальной учетной записи.",
+    "Cancel" : "Отменить",
+    "Choose as profile image" : "Установить как аватар",
+    "Language" : "Язык",
+    "Help translate" : "Помочь с переводом",
+    "Common Name" : "Общее Имя",
+    "Valid until" : "Действительно до",
+    "Issued By" : "Выдан",
+    "Valid until %s" : "Действительно до %s",
+    "Import Root Certificate" : "Импортировать корневые сертификаты",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
+    "Log-in password" : "Пароль входа",
+    "Decrypt all Files" : "Снять шифрование со всех файлов",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
+    "Restore Encryption Keys" : "Восстановить Ключи Шифрования",
+    "Delete Encryption Keys" : "Удалить Ключи Шифрования",
+    "Show storage location" : "Показать местонахождение хранилища",
+    "Show last log in" : "Показать последний вход в систему",
+    "Login Name" : "Имя пользователя",
+    "Create" : "Создать",
+    "Admin Recovery Password" : "Восстановление пароля администратора",
+    "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+    "Search Users and Groups" : "Искать пользователей и групп",
+    "Add Group" : "Добавить группу",
+    "Group" : "Группа",
+    "Everyone" : "Все",
+    "Admins" : "Администраторы",
+    "Default Quota" : "Квота по умолчанию",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
+    "Unlimited" : "Неограниченно",
+    "Other" : "Другое",
+    "Username" : "Имя пользователя",
+    "Quota" : "Квота",
+    "Storage Location" : "Место хранилища",
+    "Last Login" : "Последний вход",
+    "change full name" : "изменить полное имя",
+    "set new password" : "установить новый пароль",
+    "Default" : "По умолчанию"
+},"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/settings/l10n/ru.php b/settings/l10n/ru.php
deleted file mode 100644
index 7e3c8368951..00000000000
--- a/settings/l10n/ru.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Включено",
-"Authentication error" => "Ошибка аутентификации",
-"Your full name has been changed." => "Ваше полное имя было изменено.",
-"Unable to change full name" => "Невозможно изменить полное имя",
-"Group already exists" => "Группа уже существует",
-"Unable to add group" => "Невозможно добавить группу",
-"Files decrypted successfully" => "Дешифрование файлов прошло успешно",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Ошибка при дешифровании файлов. Обратитесь к вашему системному администратору. Доп информация в owncloud.log",
-"Couldn't decrypt your files, check your password and try again" => "Ошибка при дешифровании файлов. Проверьте Ваш пароль и повторите попытку",
-"Encryption keys deleted permanently" => "Ключи шифрования перманентно удалены",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Не получается удалить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору",
-"Couldn't remove app." => "Невозможно удалить приложение.",
-"Email saved" => "Email сохранен",
-"Invalid email" => "Неправильный Email",
-"Unable to delete group" => "Невозможно удалить группу",
-"Unable to delete user" => "Невозможно удалить пользователя",
-"Backups restored successfully" => "Резервная копия успешно восстановлена",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Не получается восстановить ваши ключи шифрования, пожалуйста проверьте файл owncloud.log или обратитесь к Администратору.",
-"Language changed" => "Язык изменён",
-"Invalid request" => "Неправильный запрос",
-"Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
-"Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
-"Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
-"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." => "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
-"Unable to change password" => "Невозможно изменить пароль",
-"Saved" => "Сохранено",
-"test email settings" => "проверить настройки почты",
-"If you received this email, the settings seem to be correct." => "Если вы получили это письмо, настройки верны.",
-"Email sent" => "Письмо отправлено",
-"You need to set your user email before being able to send test emails." => "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
-"Add trusted domain" => "Добавить доверенный домен",
-"Sending..." => "Отправляется ...",
-"All" => "Все",
-"Please wait...." => "Подождите...",
-"Error while disabling app" => "Ошибка отключения приложения",
-"Disable" => "Выключить",
-"Enable" => "Включить",
-"Error while enabling app" => "Ошибка включения приложения",
-"Updating...." => "Обновление...",
-"Error while updating app" => "Ошибка при обновлении приложения",
-"Updated" => "Обновлено",
-"Uninstalling ...." => "Удаление ...",
-"Error while uninstalling app" => "Ошибка при удалении приложения.",
-"Uninstall" => "Удалить",
-"Select a profile picture" => "Выберите аватар",
-"Very weak password" => "Очень слабый пароль",
-"Weak password" => "Слабый пароль",
-"So-so password" => "Так себе пароль",
-"Good password" => "Хороший пароль",
-"Strong password" => "Стойкий пароль",
-"Valid until {date}" => "Действительно до {дата}",
-"Delete" => "Удалить",
-"Decrypting files... Please wait, this can take some time." => "Расшифровка файлов... Пожалуйста, подождите, это может занять некоторое время.",
-"Delete encryption keys permanently." => "Перманентно удалить ключи шифрования. ",
-"Restore encryption keys." => "Восстановить ключи шифрования.",
-"Groups" => "Группы",
-"Unable to delete {objName}" => "Невозможно удалить {objName}",
-"Error creating group" => "Ошибка создания группы",
-"A valid group name must be provided" => "Введите правильное имя группы",
-"deleted {groupName}" => "удалено {groupName}",
-"undo" => "отмена",
-"never" => "никогда",
-"deleted {userName}" => "удалён {userName}",
-"add group" => "добавить группу",
-"A valid username must be provided" => "Укажите правильное имя пользователя",
-"Error creating user" => "Ошибка создания пользователя",
-"A valid password must be provided" => "Укажите валидный пароль",
-"Warning: Home directory for user \"{user}\" already exists" => "Предупреждение: домашняя папка пользователя \"{user}\" уже существует",
-"__language_name__" => "Русский ",
-"SSL root certificates" => "Корневые сертификаты SSL",
-"Encryption" => "Шифрование",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
-"Info, warnings, errors and fatal issues" => "Информационные, предупреждения, ошибки и критические проблемы",
-"Warnings, errors and fatal issues" => "Предупреждения, ошибки и критические проблемы",
-"Errors and fatal issues" => "Ошибки и критические проблемы",
-"Fatal issues only" => "Только критические проблемы",
-"None" => "Отсутствует",
-"Login" => "Логин",
-"Plain" => "Простой",
-"NT LAN Manager" => "Мендеджер NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Предупреждение безопасности",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Вы обращаетесь к %s используя HTTP. Мы настоятельно рекомендуем вам настроить сервер на использование HTTPS.",
-"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." => "Похоже, что папка с Вашими данными и Ваши файлы доступны из интернета. Файл .htaccess не работает. Мы настойчиво предлагаем Вам сконфигурировать вебсервер таким образом, чтобы папка с Вашими данными более не была доступна или переместите папку с данными куда-нибудь в другое место вне основной папки документов вебсервера.",
-"Setup Warning" => "Предупреждение установки",
-"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.",
-"Database Performance Info" => "Информация о производительности Базы Данных",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "В качестве Базы Данных используется SQLite. Для больших установок рекомендуется использовать другие типы Баз Данных. Чтобы переехать на другую Базу Данных используйте инструмент командной строки: 'ooc: db:conver-type'",
-"Module 'fileinfo' missing" => "Модуль 'fileinfo' отсутствует",
-"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) файлов.",
-"Your PHP version is outdated" => "Ваша версия PHP устарела",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Ваша версия PHP устарела. Мы настоятельно рекомендуем  обновиться до 5.3.8 или новее,  так как старые версии работают не корректно. Вполне возможно, что эта установка не работает должным образом.",
-"PHP charset is not set to UTF-8" => "Кодировка PHP не совпадает с UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Кодировка PHP не совпадает с UTF-8. Это может вызвать трудности с именами файлов, содержащими нелатинские символы. Мы настоятельно рекомендуем сменить значение переменной default_charset в файле php.ini на UTF-8.",
-"Locale not working" => "Локализация не работает",
-"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 to install the required packages on your system to support one of the following locales: %s." => "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
-"URL generation in notification emails" => "Генерирование URL в уведомляющих электронных письмах",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
-"Connectivity checks" => "Проверка соединения",
-"No problems found" => "Проблемы не найдены",
-"Please double check the <a href='%s'>installation guides</a>." => "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
-"Cron" => "Планировщик задач по расписанию",
-"Last cron was executed at %s." => "Последняя cron-задача была запущена: %s.",
-"Last cron was executed at %s. This is more than an hour ago, 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 минут.",
-"Sharing" => "Общий доступ",
-"Allow apps to use the Share API" => "Позволить приложениям использовать API общего доступа",
-"Allow users to share via link" => "Разрешить пользователям публикации через ссылки",
-"Enforce password protection" => "Защита паролем обязательна",
-"Allow public uploads" => "Разрешить открытые загрузки",
-"Set default expiration date" => "Установить срок действия по-умолчанию",
-"Expire after " => "Заканчивается через",
-"days" => "дней",
-"Enforce expiration date" => "Срок действия обязателен",
-"Allow resharing" => "Разрешить переоткрытие общего доступа",
-"Restrict users to only share with users in their groups" => "Разрешить пользователям публикации только внутри их групп",
-"Allow users to send mail notification for shared files" => "Разрешить пользователю оповещать почтой о расшаренных файлах",
-"Exclude groups from sharing" => "Исключить группы из общего доступа",
-"These groups will still be able to receive shares, but not to initiate them." => "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
-"Security" => "Безопасность",
-"Enforce HTTPS" => "HTTPS соединение обязательно",
-"Forces the clients to connect to %s via an encrypted connection." => "Принудить клиентов подключаться к %s через шифрованное соединение.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить обязательные SSL подключения.",
-"Email Server" => "Почтовый сервер",
-"This is used for sending out notifications." => "Используется для отправки уведомлений.",
-"Send mode" => "Отправить сообщение",
-"From address" => "Адрес отправителя",
-"mail" => "почта",
-"Authentication method" => "Метод проверки подлинности",
-"Authentication required" => "Требуется аутентификация ",
-"Server address" => "Адрес сервера",
-"Port" => "Порт",
-"Credentials" => "Учётные данные",
-"SMTP Username" => "Пользователь SMTP",
-"SMTP Password" => "Пароль SMTP",
-"Test email settings" => "Проверить настройки почты",
-"Send email" => "Отправить сообщение",
-"Log" => "Журнал",
-"Log level" => "Уровень детализации журнала",
-"More" => "Больше",
-"Less" => "Меньше",
-"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>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Ещё приложения",
-"by" => ":",
-"Documentation:" => "Документация:",
-"User Documentation" => "Пользовательская документация",
-"Admin Documentation" => "Документация администратора",
-"Enable only for specific groups" => "Включить только для этих групп",
-"Uninstall App" => "Удалить приложение",
-"Administrator Documentation" => "Документация администратора",
-"Online Documentation" => "Online документация",
-"Forum" => "Форум",
-"Bugtracker" => "Багтрекер",
-"Commercial Support" => "Коммерческая поддержка",
-"Get the apps to sync your files" => "Получить приложения для синхронизации ваших файлов",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Если вы хотите поддержать проект,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">присоединяйтесь к разработке</a>\n\t\tиди\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">содействуйте распространению</a>!",
-"Show First Run Wizard again" => "Показать помощник настройки",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Вы использовали <strong>%s</strong> из доступных <strong>%s</strong>",
-"Password" => "Пароль",
-"Your password was changed" => "Ваш пароль изменён",
-"Unable to change your password" => "Невозможно сменить пароль",
-"Current password" => "Текущий пароль",
-"New password" => "Новый пароль",
-"Change password" => "Сменить пароль",
-"Full Name" => "Полное имя",
-"Email" => "E-mail",
-"Your email address" => "Ваш адрес электронной почты",
-"Fill in an email address to enable password recovery and receive notifications" => "Введите свой email-адрес для того, чтобы включить возможность восстановления пароля и получения уведомлений",
-"Profile picture" => "Аватар",
-"Upload new" => "Загрузить новый",
-"Select new from Files" => "Выберите новый из файлов",
-"Remove image" => "Удалить аватар",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Допустимые форматы: png и jpg. Если изображение не квадратное, то вам будет предложено обрезать его.",
-"Your avatar is provided by your original account." => "Будет использован аватар вашей оригинальной учетной записи.",
-"Cancel" => "Отменить",
-"Choose as profile image" => "Установить как аватар",
-"Language" => "Язык",
-"Help translate" => "Помочь с переводом",
-"Common Name" => "Общее Имя",
-"Valid until" => "Действительно до",
-"Issued By" => "Выдан",
-"Valid until %s" => "Действительно до %s",
-"Import Root Certificate" => "Импортировать корневые сертификаты",
-"The encryption app is no longer enabled, please decrypt all your files" => "Приложение для шифрования выключено, пожалуйста, расшифруйте ваши файлы",
-"Log-in password" => "Пароль входа",
-"Decrypt all Files" => "Снять шифрование со всех файлов",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ваши ключи шифрования были архивированы. Если что-то пойдёт не так, вы сможете восстановить ключи. Удаляйте ключи из архива только тогда, когда вы будете уверены, что все файлы были успешно расшифрованы.",
-"Restore Encryption Keys" => "Восстановить Ключи Шифрования",
-"Delete Encryption Keys" => "Удалить Ключи Шифрования",
-"Show storage location" => "Показать местонахождение хранилища",
-"Show last log in" => "Показать последний вход в систему",
-"Login Name" => "Имя пользователя",
-"Create" => "Создать",
-"Admin Recovery Password" => "Восстановление пароля администратора",
-"Enter the recovery password in order to recover the users files during password change" => "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
-"Search Users and Groups" => "Искать пользователей и групп",
-"Add Group" => "Добавить группу",
-"Group" => "Группа",
-"Everyone" => "Все",
-"Admins" => "Администраторы",
-"Default Quota" => "Квота по умолчанию",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
-"Unlimited" => "Неограниченно",
-"Other" => "Другое",
-"Username" => "Имя пользователя",
-"Quota" => "Квота",
-"Storage Location" => "Место хранилища",
-"Last Login" => "Последний вход",
-"change full name" => "изменить полное имя",
-"set new password" => "установить новый пароль",
-"Default" => "По умолчанию"
-);
-$PLURAL_FORMS = "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/settings/l10n/si_LK.js b/settings/l10n/si_LK.js
new file mode 100644
index 00000000000..bc894fb031b
--- /dev/null
+++ b/settings/l10n/si_LK.js
@@ -0,0 +1,54 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "සත්‍යාපන දෝෂයක්",
+    "Group already exists" : "කණ්ඩායම දැනටමත් තිබේ",
+    "Unable to add group" : "කාණඩයක් එක් කළ නොහැකි විය",
+    "Email saved" : "වි-තැපෑල සුරකින ලදී",
+    "Invalid email" : "අවලංගු වි-තැපෑල",
+    "Unable to delete group" : "කණ්ඩායම මැකීමට නොහැක",
+    "Unable to delete user" : "පරිශීලකයා මැකීමට නොහැක",
+    "Language changed" : "භාෂාව ාවනස් කිරීම",
+    "Invalid request" : "අවලංගු අයැදුමක්",
+    "Unable to add user to group %s" : "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
+    "Unable to remove user from group %s" : "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
+    "Disable" : "අක්‍රිය කරන්න",
+    "Enable" : "සක්‍රිය කරන්න",
+    "Delete" : "මකා දමන්න",
+    "Groups" : "කණ්ඩායම්",
+    "undo" : "නිෂ්ප්‍රභ කරන්න",
+    "never" : "කවදාවත්",
+    "SSL root certificates" : "SSL මූල සහතිකයන්",
+    "Encryption" : "ගුප්ත කේතනය",
+    "None" : "කිසිවක් නැත",
+    "Login" : "ප්‍රවිශ්ටය",
+    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Sharing" : "හුවමාරු කිරීම",
+    "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි",
+    "Server address" : "සේවාදායකයේ ලිපිනය",
+    "Port" : "තොට",
+    "Log" : "ලඝුව",
+    "More" : "වැඩි",
+    "Less" : "අඩු",
+    "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>." : "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
+    "by" : "විසින්",
+    "Password" : "මුර පදය",
+    "Your password was changed" : "ඔබගේ මුර පදය වෙනස් කෙරුණි",
+    "Unable to change your password" : "මුර පදය වෙනස් කළ නොහැකි විය",
+    "Current password" : "වත්මන් මුරපදය",
+    "New password" : "නව මුරපදය",
+    "Change password" : "මුරපදය වෙනස් කිරීම",
+    "Email" : "විද්‍යුත් තැපෑල",
+    "Your email address" : "ඔබගේ විද්‍යුත් තැපෑල",
+    "Cancel" : "එපා",
+    "Language" : "භාෂාව",
+    "Help translate" : "පරිවර්ථන සහය",
+    "Import Root Certificate" : "මූල සහතිකය ආයාත කරන්න",
+    "Login Name" : "ප්‍රවිශ්ටය",
+    "Create" : "තනන්න",
+    "Default Quota" : "සාමාන්‍ය සලාකය",
+    "Other" : "වෙනත්",
+    "Username" : "පරිශීලක නම",
+    "Quota" : "සලාකය"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/si_LK.json b/settings/l10n/si_LK.json
new file mode 100644
index 00000000000..9d1c5ef4a62
--- /dev/null
+++ b/settings/l10n/si_LK.json
@@ -0,0 +1,52 @@
+{ "translations": {
+    "Authentication error" : "සත්‍යාපන දෝෂයක්",
+    "Group already exists" : "කණ්ඩායම දැනටමත් තිබේ",
+    "Unable to add group" : "කාණඩයක් එක් කළ නොහැකි විය",
+    "Email saved" : "වි-තැපෑල සුරකින ලදී",
+    "Invalid email" : "අවලංගු වි-තැපෑල",
+    "Unable to delete group" : "කණ්ඩායම මැකීමට නොහැක",
+    "Unable to delete user" : "පරිශීලකයා මැකීමට නොහැක",
+    "Language changed" : "භාෂාව ාවනස් කිරීම",
+    "Invalid request" : "අවලංගු අයැදුමක්",
+    "Unable to add user to group %s" : "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
+    "Unable to remove user from group %s" : "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
+    "Disable" : "අක්‍රිය කරන්න",
+    "Enable" : "සක්‍රිය කරන්න",
+    "Delete" : "මකා දමන්න",
+    "Groups" : "කණ්ඩායම්",
+    "undo" : "නිෂ්ප්‍රභ කරන්න",
+    "never" : "කවදාවත්",
+    "SSL root certificates" : "SSL මූල සහතිකයන්",
+    "Encryption" : "ගුප්ත කේතනය",
+    "None" : "කිසිවක් නැත",
+    "Login" : "ප්‍රවිශ්ටය",
+    "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Sharing" : "හුවමාරු කිරීම",
+    "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි",
+    "Server address" : "සේවාදායකයේ ලිපිනය",
+    "Port" : "තොට",
+    "Log" : "ලඝුව",
+    "More" : "වැඩි",
+    "Less" : "අඩු",
+    "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>." : "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
+    "by" : "විසින්",
+    "Password" : "මුර පදය",
+    "Your password was changed" : "ඔබගේ මුර පදය වෙනස් කෙරුණි",
+    "Unable to change your password" : "මුර පදය වෙනස් කළ නොහැකි විය",
+    "Current password" : "වත්මන් මුරපදය",
+    "New password" : "නව මුරපදය",
+    "Change password" : "මුරපදය වෙනස් කිරීම",
+    "Email" : "විද්‍යුත් තැපෑල",
+    "Your email address" : "ඔබගේ විද්‍යුත් තැපෑල",
+    "Cancel" : "එපා",
+    "Language" : "භාෂාව",
+    "Help translate" : "පරිවර්ථන සහය",
+    "Import Root Certificate" : "මූල සහතිකය ආයාත කරන්න",
+    "Login Name" : "ප්‍රවිශ්ටය",
+    "Create" : "තනන්න",
+    "Default Quota" : "සාමාන්‍ය සලාකය",
+    "Other" : "වෙනත්",
+    "Username" : "පරිශීලක නම",
+    "Quota" : "සලාකය"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
deleted file mode 100644
index e254e447640..00000000000
--- a/settings/l10n/si_LK.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "සත්‍යාපන දෝෂයක්",
-"Group already exists" => "කණ්ඩායම දැනටමත් තිබේ",
-"Unable to add group" => "කාණඩයක් එක් කළ නොහැකි විය",
-"Email saved" => "වි-තැපෑල සුරකින ලදී",
-"Invalid email" => "අවලංගු වි-තැපෑල",
-"Unable to delete group" => "කණ්ඩායම මැකීමට නොහැක",
-"Unable to delete user" => "පරිශීලකයා මැකීමට නොහැක",
-"Language changed" => "භාෂාව ාවනස් කිරීම",
-"Invalid request" => "අවලංගු අයැදුමක්",
-"Unable to add user to group %s" => "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක",
-"Unable to remove user from group %s" => "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක",
-"Disable" => "අක්‍රිය කරන්න",
-"Enable" => "සක්‍රිය කරන්න",
-"Delete" => "මකා දමන්න",
-"Groups" => "කණ්ඩායම්",
-"undo" => "නිෂ්ප්‍රභ කරන්න",
-"never" => "කවදාවත්",
-"SSL root certificates" => "SSL මූල සහතිකයන්",
-"Encryption" => "ගුප්ත කේතනය",
-"None" => "කිසිවක් නැත",
-"Login" => "ප්‍රවිශ්ටය",
-"Security Warning" => "ආරක්ෂක නිවේදනයක්",
-"Sharing" => "හුවමාරු කිරීම",
-"Allow resharing" => "යළි යළිත් හුවමාරුවට අවසර දෙමි",
-"Server address" => "සේවාදායකයේ ලිපිනය",
-"Port" => "තොට",
-"Log" => "ලඝුව",
-"More" => "වැඩි",
-"Less" => "අඩු",
-"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>." => "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
-"by" => "විසින්",
-"Password" => "මුර පදය",
-"Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
-"Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
-"Current password" => "වත්මන් මුරපදය",
-"New password" => "නව මුරපදය",
-"Change password" => "මුරපදය වෙනස් කිරීම",
-"Email" => "විද්‍යුත් තැපෑල",
-"Your email address" => "ඔබගේ විද්‍යුත් තැපෑල",
-"Cancel" => "එපා",
-"Language" => "භාෂාව",
-"Help translate" => "පරිවර්ථන සහය",
-"Import Root Certificate" => "මූල සහතිකය ආයාත කරන්න",
-"Login Name" => "ප්‍රවිශ්ටය",
-"Create" => "තනන්න",
-"Default Quota" => "සාමාන්‍ය සලාකය",
-"Other" => "වෙනත්",
-"Username" => "පරිශීලක නම",
-"Quota" => "සලාකය"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sk.php b/settings/l10n/sk.php
deleted file mode 100644
index 4a9a13d6d84..00000000000
--- a/settings/l10n/sk.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Odstrániť",
-"never" => "nikdy",
-"Cancel" => "Zrušiť",
-"Other" => "Ostatné"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
new file mode 100644
index 00000000000..773b87f5e20
--- /dev/null
+++ b/settings/l10n/sk_SK.js
@@ -0,0 +1,228 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Povolené",
+    "Authentication error" : "Chyba autentifikácie",
+    "Your full name has been changed." : "Vaše meno a priezvisko bolo zmenené.",
+    "Unable to change full name" : "Nemožno zmeniť meno a priezvisko",
+    "Group already exists" : "Skupina už existuje",
+    "Unable to add group" : "Nie je možné pridať skupinu",
+    "Files decrypted successfully" : "Súbory sú úspešne dešifrované",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log alebo požiadajte o pomoc adminstrátora",
+    "Couldn't decrypt your files, check your password and try again" : "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
+    "Encryption keys deleted permanently" : "Šifrovacie kľúče sú trvale vymazané",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+    "Couldn't remove app." : "Nemožno odstrániť aplikáciu.",
+    "Email saved" : "Email uložený",
+    "Invalid email" : "Neplatný email",
+    "Unable to delete group" : "Nie je možné odstrániť skupinu",
+    "Unable to delete user" : "Nie je možné odstrániť používateľa",
+    "Backups restored successfully" : "Zálohy boli úspešne obnovené",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné obnoviť vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+    "Language changed" : "Jazyk zmenený",
+    "Invalid request" : "Neplatná požiadavka",
+    "Admins can't remove themself from the admin group" : "Administrátori nesmú odstrániť sami seba zo skupiny admin",
+    "Unable to add user to group %s" : "Nie je možné pridať používateľa do skupiny %s",
+    "Unable to remove user from group %s" : "Nie je možné odstrániť používateľa zo skupiny %s",
+    "Couldn't update app." : "Nemožno aktualizovať aplikáciu.",
+    "Wrong password" : "Nesprávne heslo",
+    "No user supplied" : "Nebol uvedený používateľ",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené",
+    "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
+    "Unable to change password" : "Zmena hesla sa nepodarila",
+    "Saved" : "Uložené",
+    "test email settings" : "nastavenia testovacieho emailu",
+    "If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
+    "Email sent" : "Email odoslaný",
+    "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
+    "Add trusted domain" : "Pridať dôveryhodnú doménu",
+    "Sending..." : "Odosielam...",
+    "All" : "Všetky",
+    "Please wait...." : "Čakajte prosím...",
+    "Error while disabling app" : "Chyba pri zakázaní aplikácie",
+    "Disable" : "Zakázať",
+    "Enable" : "Zapnúť",
+    "Error while enabling app" : "Chyba pri povoľovaní aplikácie",
+    "Updating...." : "Aktualizujem...",
+    "Error while updating app" : "chyba pri aktualizácii aplikácie",
+    "Updated" : "Aktualizované",
+    "Uninstalling ...." : "Prebieha odinštalovanie...",
+    "Error while uninstalling app" : "Chyba pri odinštalovaní aplikácie",
+    "Uninstall" : "Odinštalácia",
+    "Select a profile picture" : "Vybrať avatara",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Valid until {date}" : "Platný do {date}",
+    "Delete" : "Zmazať",
+    "Decrypting files... Please wait, this can take some time." : "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
+    "Delete encryption keys permanently." : "Natrvalo vymazať šifrovacie kľúče.",
+    "Restore encryption keys." : "Obnoviť šifrovacie kľúče.",
+    "Groups" : "Skupiny",
+    "Unable to delete {objName}" : "Nemožno vymazať {objName}",
+    "Error creating group" : "Chyba pri vytváraní skupiny",
+    "A valid group name must be provided" : "Musíte zadať platný názov skupiny",
+    "deleted {groupName}" : "vymazaná {groupName}",
+    "undo" : "vrátiť",
+    "never" : "nikdy",
+    "deleted {userName}" : "vymazané {userName}",
+    "add group" : "pridať skupinu",
+    "A valid username must be provided" : "Musíte zadať platné používateľské meno",
+    "Error creating user" : "Chyba pri vytváraní používateľa",
+    "A valid password must be provided" : "Musíte zadať platné heslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
+    "__language_name__" : "Slovensky",
+    "SSL root certificates" : "Koreňové SSL certifikáty",
+    "Encryption" : "Šifrovanie",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, upozornenia, chyby a fatálne problémy",
+    "Warnings, errors and fatal issues" : "Upozornenia, chyby a fatálne problémy",
+    "Errors and fatal issues" : "Chyby a fatálne problémy",
+    "Fatal issues only" : "Len fatálne problémy",
+    "None" : "Žiadny",
+    "Login" : "Prihlásenie",
+    "Plain" : "Neformátovaný",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Bezpečnostné upozornenie",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie HTTPS.",
+    "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." : "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom.",
+    "Setup Warning" : "Nastavenia oznámení a upozornení",
+    "PHP is apparently setup 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.",
+    "Database Performance Info" : "Informácie o výkone databázy",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
+    "Module 'fileinfo' missing" : "Chýba modul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
+    "Your PHP version is outdated" : "Vaša PHP verzia je zastaraná",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto inštalácia nebude fungovať správne.",
+    "PHP charset is not set to UTF-8" : "Znaková sada PHP nie je nastavená na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Predvolená znaková sada PHP nie je nastavená na UTF-8. To môže spôsobiť veľké problémy v prípade ne-ASCII znakov v názvoch súborov. Dôrazne odporúčame zmeniť hodnotu \"default_charset\" v php.ini  na \"UTF-8\".",
+    "Locale not working" : "Lokalizácia nefunguje",
+    "System locale can not be set to a one which supports UTF-8." : "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
+    "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Posledný cron bol spustený %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
+    "Cron was not executed yet!" : "Cron sa ešte nespustil!",
+    "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
+    "Sharing" : "Zdieľanie",
+    "Allow apps to use the Share API" : "Povoliť aplikáciám používať API na zdieľanie",
+    "Allow users to share via link" : "Povoliť používateľom zdieľanie pomocou odkazov",
+    "Enforce password protection" : "Vynútiť ochranu heslom",
+    "Allow public uploads" : "Povoliť verejné nahrávanie súborov",
+    "Set default expiration date" : "Nastaviť predvolený dátum expirácie",
+    "Expire after " : "Platnosť do",
+    "days" : "dni",
+    "Enforce expiration date" : "Vynútiť dátum expirácie",
+    "Allow resharing" : "Povoliť zdieľanie ďalej",
+    "Restrict users to only share with users in their groups" : "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny",
+    "Allow users to send mail notification for shared files" : "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
+    "Exclude groups from sharing" : "Vybrať skupiny zo zdieľania",
+    "These groups will still be able to receive shares, but not to initiate them." : "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
+    "Security" : "Zabezpečenie",
+    "Enforce HTTPS" : "Vynútiť HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
+    "Email Server" : "Email server",
+    "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
+    "Send mode" : "Mód odosielania",
+    "From address" : "Z adresy",
+    "mail" : "email",
+    "Authentication method" : "Autentifikačná metóda",
+    "Authentication required" : "Vyžaduje sa overenie",
+    "Server address" : "Adresa servera",
+    "Port" : "Port",
+    "Credentials" : "Prihlasovanie údaje",
+    "SMTP Username" : "SMTP používateľské meno",
+    "SMTP Password" : "SMTP heslo",
+    "Test email settings" : "Nastavenia testovacieho emailu",
+    "Send email" : "Odoslať email",
+    "Log" : "Záznam",
+    "Log level" : "Úroveň záznamu",
+    "More" : "Viac",
+    "Less" : "Menej",
+    "Version" : "Verzia",
+    "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>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Viac aplikácií",
+    "by" : "od",
+    "Documentation:" : "Dokumentácia:",
+    "User Documentation" : "Príručka používateľa",
+    "Admin Documentation" : "Príručka administrátora",
+    "Enable only for specific groups" : "Povoliť len pre vybrané skupiny",
+    "Uninstall App" : "Odinštalovanie aplikácie",
+    "Administrator Documentation" : "Príručka administrátora",
+    "Online Documentation" : "Online príručka",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Komerčná podpora",
+    "Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
+    "Show First Run Wizard again" : "Znovu zobraziť sprievodcu prvým spustením",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
+    "Password" : "Heslo",
+    "Your password was changed" : "Vaše heslo bolo zmenené",
+    "Unable to change your password" : "Nie je možné zmeniť vaše heslo",
+    "Current password" : "Aktuálne heslo",
+    "New password" : "Nové heslo",
+    "Change password" : "Zmeniť heslo",
+    "Full Name" : "Meno a priezvisko",
+    "Email" : "Email",
+    "Your email address" : "Vaša emailová adresa",
+    "Fill in an email address to enable password recovery and receive notifications" : "Zadajte emailovú adresu pre umožnenie obnovy zabudnutého hesla a pre prijímanie upozornení a oznámení",
+    "Profile picture" : "Avatar",
+    "Upload new" : "Nahrať nový",
+    "Select new from Files" : "Vyberte nový zo súborov",
+    "Remove image" : "Zmazať obrázok",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Formát súboru png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať.",
+    "Your avatar is provided by your original account." : "Váš avatar je použitý z pôvodného účtu.",
+    "Cancel" : "Zrušiť",
+    "Choose as profile image" : "Vybrať ako avatara",
+    "Language" : "Jazyk",
+    "Help translate" : "Pomôcť s prekladom",
+    "Common Name" : "Bežný názov",
+    "Valid until" : "Platný do",
+    "Issued By" : "Vydal",
+    "Valid until %s" : "Platný do %s",
+    "Import Root Certificate" : "Importovať koreňový certifikát",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
+    "Log-in password" : "Prihlasovacie heslo",
+    "Decrypt all Files" : "Dešifrovať všetky súbory",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovacie kľúče boli zazálohované. Ak by sa niečo nepodarilo, dajú sa znovu obnoviť. Natrvalo ich vymažte len ak ste si istí, že sú všetky súbory bezchybne dešifrované.",
+    "Restore Encryption Keys" : "Obnoviť šifrovacie kľúče",
+    "Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
+    "Show storage location" : "Zobraziť umiestnenie úložiska",
+    "Show last log in" : "Zobraziť posledné prihlásenie",
+    "Login Name" : "Prihlasovacie meno",
+    "Create" : "Vytvoriť",
+    "Admin Recovery Password" : "Obnovenie hesla administrátora",
+    "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
+    "Search Users and Groups" : "Prehľadať používateľov a skupiny",
+    "Add Group" : "Pridať skupinu",
+    "Group" : "Skupina",
+    "Everyone" : "Všetci",
+    "Admins" : "Administrátori",
+    "Default Quota" : "Predvolená kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")",
+    "Unlimited" : "Nelimitované",
+    "Other" : "Iné",
+    "Username" : "Používateľské meno",
+    "Quota" : "Kvóta",
+    "Storage Location" : "Umiestnenie úložiska",
+    "Last Login" : "Posledné prihlásenie",
+    "change full name" : "zmeniť meno a priezvisko",
+    "set new password" : "nastaviť nové heslo",
+    "Default" : "Predvolené"
+},
+"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
new file mode 100644
index 00000000000..44b87fc746d
--- /dev/null
+++ b/settings/l10n/sk_SK.json
@@ -0,0 +1,226 @@
+{ "translations": {
+    "Enabled" : "Povolené",
+    "Authentication error" : "Chyba autentifikácie",
+    "Your full name has been changed." : "Vaše meno a priezvisko bolo zmenené.",
+    "Unable to change full name" : "Nemožno zmeniť meno a priezvisko",
+    "Group already exists" : "Skupina už existuje",
+    "Unable to add group" : "Nie je možné pridať skupinu",
+    "Files decrypted successfully" : "Súbory sú úspešne dešifrované",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log alebo požiadajte o pomoc adminstrátora",
+    "Couldn't decrypt your files, check your password and try again" : "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
+    "Encryption keys deleted permanently" : "Šifrovacie kľúče sú trvale vymazané",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+    "Couldn't remove app." : "Nemožno odstrániť aplikáciu.",
+    "Email saved" : "Email uložený",
+    "Invalid email" : "Neplatný email",
+    "Unable to delete group" : "Nie je možné odstrániť skupinu",
+    "Unable to delete user" : "Nie je možné odstrániť používateľa",
+    "Backups restored successfully" : "Zálohy boli úspešne obnovené",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebolo možné obnoviť vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
+    "Language changed" : "Jazyk zmenený",
+    "Invalid request" : "Neplatná požiadavka",
+    "Admins can't remove themself from the admin group" : "Administrátori nesmú odstrániť sami seba zo skupiny admin",
+    "Unable to add user to group %s" : "Nie je možné pridať používateľa do skupiny %s",
+    "Unable to remove user from group %s" : "Nie je možné odstrániť používateľa zo skupiny %s",
+    "Couldn't update app." : "Nemožno aktualizovať aplikáciu.",
+    "Wrong password" : "Nesprávne heslo",
+    "No user supplied" : "Nebol uvedený používateľ",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené",
+    "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
+    "Unable to change password" : "Zmena hesla sa nepodarila",
+    "Saved" : "Uložené",
+    "test email settings" : "nastavenia testovacieho emailu",
+    "If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
+    "Email sent" : "Email odoslaný",
+    "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
+    "Add trusted domain" : "Pridať dôveryhodnú doménu",
+    "Sending..." : "Odosielam...",
+    "All" : "Všetky",
+    "Please wait...." : "Čakajte prosím...",
+    "Error while disabling app" : "Chyba pri zakázaní aplikácie",
+    "Disable" : "Zakázať",
+    "Enable" : "Zapnúť",
+    "Error while enabling app" : "Chyba pri povoľovaní aplikácie",
+    "Updating...." : "Aktualizujem...",
+    "Error while updating app" : "chyba pri aktualizácii aplikácie",
+    "Updated" : "Aktualizované",
+    "Uninstalling ...." : "Prebieha odinštalovanie...",
+    "Error while uninstalling app" : "Chyba pri odinštalovaní aplikácie",
+    "Uninstall" : "Odinštalácia",
+    "Select a profile picture" : "Vybrať avatara",
+    "Very weak password" : "Veľmi slabé heslo",
+    "Weak password" : "Slabé heslo",
+    "So-so password" : "Priemerné heslo",
+    "Good password" : "Dobré heslo",
+    "Strong password" : "Silné heslo",
+    "Valid until {date}" : "Platný do {date}",
+    "Delete" : "Zmazať",
+    "Decrypting files... Please wait, this can take some time." : "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
+    "Delete encryption keys permanently." : "Natrvalo vymazať šifrovacie kľúče.",
+    "Restore encryption keys." : "Obnoviť šifrovacie kľúče.",
+    "Groups" : "Skupiny",
+    "Unable to delete {objName}" : "Nemožno vymazať {objName}",
+    "Error creating group" : "Chyba pri vytváraní skupiny",
+    "A valid group name must be provided" : "Musíte zadať platný názov skupiny",
+    "deleted {groupName}" : "vymazaná {groupName}",
+    "undo" : "vrátiť",
+    "never" : "nikdy",
+    "deleted {userName}" : "vymazané {userName}",
+    "add group" : "pridať skupinu",
+    "A valid username must be provided" : "Musíte zadať platné používateľské meno",
+    "Error creating user" : "Chyba pri vytváraní používateľa",
+    "A valid password must be provided" : "Musíte zadať platné heslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
+    "__language_name__" : "Slovensky",
+    "SSL root certificates" : "Koreňové SSL certifikáty",
+    "Encryption" : "Šifrovanie",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, upozornenia, chyby a fatálne problémy",
+    "Warnings, errors and fatal issues" : "Upozornenia, chyby a fatálne problémy",
+    "Errors and fatal issues" : "Chyby a fatálne problémy",
+    "Fatal issues only" : "Len fatálne problémy",
+    "None" : "Žiadny",
+    "Login" : "Prihlásenie",
+    "Plain" : "Neformátovaný",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Bezpečnostné upozornenie",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie HTTPS.",
+    "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." : "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom.",
+    "Setup Warning" : "Nastavenia oznámení a upozornení",
+    "PHP is apparently setup 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.",
+    "Database Performance Info" : "Informácie o výkone databázy",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
+    "Module 'fileinfo' missing" : "Chýba modul 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
+    "Your PHP version is outdated" : "Vaša PHP verzia je zastaraná",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto inštalácia nebude fungovať správne.",
+    "PHP charset is not set to UTF-8" : "Znaková sada PHP nie je nastavená na UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Predvolená znaková sada PHP nie je nastavená na UTF-8. To môže spôsobiť veľké problémy v prípade ne-ASCII znakov v názvoch súborov. Dôrazne odporúčame zmeniť hodnotu \"default_charset\" v php.ini  na \"UTF-8\".",
+    "Locale not working" : "Lokalizácia nefunguje",
+    "System locale can not be set to a one which supports UTF-8." : "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
+    "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Posledný cron bol spustený %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
+    "Cron was not executed yet!" : "Cron sa ešte nespustil!",
+    "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
+    "Sharing" : "Zdieľanie",
+    "Allow apps to use the Share API" : "Povoliť aplikáciám používať API na zdieľanie",
+    "Allow users to share via link" : "Povoliť používateľom zdieľanie pomocou odkazov",
+    "Enforce password protection" : "Vynútiť ochranu heslom",
+    "Allow public uploads" : "Povoliť verejné nahrávanie súborov",
+    "Set default expiration date" : "Nastaviť predvolený dátum expirácie",
+    "Expire after " : "Platnosť do",
+    "days" : "dni",
+    "Enforce expiration date" : "Vynútiť dátum expirácie",
+    "Allow resharing" : "Povoliť zdieľanie ďalej",
+    "Restrict users to only share with users in their groups" : "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny",
+    "Allow users to send mail notification for shared files" : "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
+    "Exclude groups from sharing" : "Vybrať skupiny zo zdieľania",
+    "These groups will still be able to receive shares, but not to initiate them." : "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
+    "Security" : "Zabezpečenie",
+    "Enforce HTTPS" : "Vynútiť HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
+    "Email Server" : "Email server",
+    "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
+    "Send mode" : "Mód odosielania",
+    "From address" : "Z adresy",
+    "mail" : "email",
+    "Authentication method" : "Autentifikačná metóda",
+    "Authentication required" : "Vyžaduje sa overenie",
+    "Server address" : "Adresa servera",
+    "Port" : "Port",
+    "Credentials" : "Prihlasovanie údaje",
+    "SMTP Username" : "SMTP používateľské meno",
+    "SMTP Password" : "SMTP heslo",
+    "Test email settings" : "Nastavenia testovacieho emailu",
+    "Send email" : "Odoslať email",
+    "Log" : "Záznam",
+    "Log level" : "Úroveň záznamu",
+    "More" : "Viac",
+    "Less" : "Menej",
+    "Version" : "Verzia",
+    "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>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Viac aplikácií",
+    "by" : "od",
+    "Documentation:" : "Dokumentácia:",
+    "User Documentation" : "Príručka používateľa",
+    "Admin Documentation" : "Príručka administrátora",
+    "Enable only for specific groups" : "Povoliť len pre vybrané skupiny",
+    "Uninstall App" : "Odinštalovanie aplikácie",
+    "Administrator Documentation" : "Príručka administrátora",
+    "Online Documentation" : "Online príručka",
+    "Forum" : "Fórum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Komerčná podpora",
+    "Get the apps to sync your files" : "Získať aplikácie na synchronizáciu vašich súborov",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
+    "Show First Run Wizard again" : "Znovu zobraziť sprievodcu prvým spustením",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
+    "Password" : "Heslo",
+    "Your password was changed" : "Vaše heslo bolo zmenené",
+    "Unable to change your password" : "Nie je možné zmeniť vaše heslo",
+    "Current password" : "Aktuálne heslo",
+    "New password" : "Nové heslo",
+    "Change password" : "Zmeniť heslo",
+    "Full Name" : "Meno a priezvisko",
+    "Email" : "Email",
+    "Your email address" : "Vaša emailová adresa",
+    "Fill in an email address to enable password recovery and receive notifications" : "Zadajte emailovú adresu pre umožnenie obnovy zabudnutého hesla a pre prijímanie upozornení a oznámení",
+    "Profile picture" : "Avatar",
+    "Upload new" : "Nahrať nový",
+    "Select new from Files" : "Vyberte nový zo súborov",
+    "Remove image" : "Zmazať obrázok",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Formát súboru png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať.",
+    "Your avatar is provided by your original account." : "Váš avatar je použitý z pôvodného účtu.",
+    "Cancel" : "Zrušiť",
+    "Choose as profile image" : "Vybrať ako avatara",
+    "Language" : "Jazyk",
+    "Help translate" : "Pomôcť s prekladom",
+    "Common Name" : "Bežný názov",
+    "Valid until" : "Platný do",
+    "Issued By" : "Vydal",
+    "Valid until %s" : "Platný do %s",
+    "Import Root Certificate" : "Importovať koreňový certifikát",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
+    "Log-in password" : "Prihlasovacie heslo",
+    "Decrypt all Files" : "Dešifrovať všetky súbory",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Vaše šifrovacie kľúče boli zazálohované. Ak by sa niečo nepodarilo, dajú sa znovu obnoviť. Natrvalo ich vymažte len ak ste si istí, že sú všetky súbory bezchybne dešifrované.",
+    "Restore Encryption Keys" : "Obnoviť šifrovacie kľúče",
+    "Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
+    "Show storage location" : "Zobraziť umiestnenie úložiska",
+    "Show last log in" : "Zobraziť posledné prihlásenie",
+    "Login Name" : "Prihlasovacie meno",
+    "Create" : "Vytvoriť",
+    "Admin Recovery Password" : "Obnovenie hesla administrátora",
+    "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
+    "Search Users and Groups" : "Prehľadať používateľov a skupiny",
+    "Add Group" : "Pridať skupinu",
+    "Group" : "Skupina",
+    "Everyone" : "Všetci",
+    "Admins" : "Administrátori",
+    "Default Quota" : "Predvolená kvóta",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")",
+    "Unlimited" : "Nelimitované",
+    "Other" : "Iné",
+    "Username" : "Používateľské meno",
+    "Quota" : "Kvóta",
+    "Storage Location" : "Umiestnenie úložiska",
+    "Last Login" : "Posledné prihlásenie",
+    "change full name" : "zmeniť meno a priezvisko",
+    "set new password" : "nastaviť nové heslo",
+    "Default" : "Predvolené"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
deleted file mode 100644
index 5dcfdf6c9dc..00000000000
--- a/settings/l10n/sk_SK.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Povolené",
-"Authentication error" => "Chyba autentifikácie",
-"Your full name has been changed." => "Vaše meno a priezvisko bolo zmenené.",
-"Unable to change full name" => "Nemožno zmeniť meno a priezvisko",
-"Group already exists" => "Skupina už existuje",
-"Unable to add group" => "Nie je možné pridať skupinu",
-"Files decrypted successfully" => "Súbory sú úspešne dešifrované",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Nemožno dešifrovať vaše súbory, skontrolujte svoj owncloud.log alebo požiadajte o pomoc adminstrátora",
-"Couldn't decrypt your files, check your password and try again" => "Nemožno dešifrovať vaše súbory, skontrolujte svoje heslo a skúste to znova",
-"Encryption keys deleted permanently" => "Šifrovacie kľúče sú trvale vymazané",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Nebolo možné natrvalo vymazať vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
-"Couldn't remove app." => "Nemožno odstrániť aplikáciu.",
-"Email saved" => "Email uložený",
-"Invalid email" => "Neplatný email",
-"Unable to delete group" => "Nie je možné odstrániť skupinu",
-"Unable to delete user" => "Nie je možné odstrániť používateľa",
-"Backups restored successfully" => "Zálohy boli úspešne obnovené",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Nebolo možné obnoviť vaše šifrovacie kľúče, skontrolujte si prosím owncloud.log alebo kontaktujte svojho správcu",
-"Language changed" => "Jazyk zmenený",
-"Invalid request" => "Neplatná požiadavka",
-"Admins can't remove themself from the admin group" => "Administrátori nesmú odstrániť sami seba zo skupiny admin",
-"Unable to add user to group %s" => "Nie je možné pridať používateľa do skupiny %s",
-"Unable to remove user from group %s" => "Nie je možné odstrániť používateľa zo skupiny %s",
-"Couldn't update app." => "Nemožno aktualizovať aplikáciu.",
-"Wrong password" => "Nesprávne heslo",
-"No user supplied" => "Nebol uvedený používateľ",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Zadajte administrátorské heslo pre obnovu, inak budú všetky dáta stratené",
-"Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
-"Unable to change password" => "Zmena hesla sa nepodarila",
-"Saved" => "Uložené",
-"test email settings" => "nastavenia testovacieho emailu",
-"If you received this email, the settings seem to be correct." => "Ak ste dostali tento email, nastavenie je správne.",
-"Email sent" => "Email odoslaný",
-"You need to set your user email before being able to send test emails." => "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
-"Add trusted domain" => "Pridať dôveryhodnú doménu",
-"Sending..." => "Odosielam...",
-"All" => "Všetky",
-"Please wait...." => "Čakajte prosím...",
-"Error while disabling app" => "Chyba pri zakázaní aplikácie",
-"Disable" => "Zakázať",
-"Enable" => "Zapnúť",
-"Error while enabling app" => "Chyba pri povoľovaní aplikácie",
-"Updating...." => "Aktualizujem...",
-"Error while updating app" => "chyba pri aktualizácii aplikácie",
-"Updated" => "Aktualizované",
-"Uninstalling ...." => "Prebieha odinštalovanie...",
-"Error while uninstalling app" => "Chyba pri odinštalovaní aplikácie",
-"Uninstall" => "Odinštalácia",
-"Select a profile picture" => "Vybrať avatara",
-"Very weak password" => "Veľmi slabé heslo",
-"Weak password" => "Slabé heslo",
-"So-so password" => "Priemerné heslo",
-"Good password" => "Dobré heslo",
-"Strong password" => "Silné heslo",
-"Valid until {date}" => "Platný do {date}",
-"Delete" => "Zmazať",
-"Decrypting files... Please wait, this can take some time." => "Dešifrujem súbory ... Počkajte prosím, môže to chvíľu trvať.",
-"Delete encryption keys permanently." => "Natrvalo vymazať šifrovacie kľúče.",
-"Restore encryption keys." => "Obnoviť šifrovacie kľúče.",
-"Groups" => "Skupiny",
-"Unable to delete {objName}" => "Nemožno vymazať {objName}",
-"Error creating group" => "Chyba pri vytváraní skupiny",
-"A valid group name must be provided" => "Musíte zadať platný názov skupiny",
-"deleted {groupName}" => "vymazaná {groupName}",
-"undo" => "vrátiť",
-"never" => "nikdy",
-"deleted {userName}" => "vymazané {userName}",
-"add group" => "pridať skupinu",
-"A valid username must be provided" => "Musíte zadať platné používateľské meno",
-"Error creating user" => "Chyba pri vytváraní používateľa",
-"A valid password must be provided" => "Musíte zadať platné heslo",
-"Warning: Home directory for user \"{user}\" already exists" => "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
-"__language_name__" => "Slovensky",
-"SSL root certificates" => "Koreňové SSL certifikáty",
-"Encryption" => "Šifrovanie",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, upozornenia, chyby a fatálne problémy",
-"Warnings, errors and fatal issues" => "Upozornenia, chyby a fatálne problémy",
-"Errors and fatal issues" => "Chyby a fatálne problémy",
-"Fatal issues only" => "Len fatálne problémy",
-"None" => "Žiadny",
-"Login" => "Prihlásenie",
-"Plain" => "Neformátovaný",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Bezpečnostné upozornenie",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie HTTPS.",
-"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." => "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom.",
-"Setup Warning" => "Nastavenia oznámení a upozornení",
-"PHP is apparently setup 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.",
-"Database Performance Info" => "Informácie o výkone databázy",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Ako databáza je použitá SQLite. Pre väčšie inštalácie vám to odporúčame zmeniť. Na prenos do inej databázy použite nástroj príkazového riadka: \"occ db:convert-typ\"",
-"Module 'fileinfo' missing" => "Chýba modul 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Chýba modul 'fileinfo'. Dôrazne doporučujeme ho povoliť pre dosiahnutie najlepších výsledkov zisťovania mime-typu.",
-"Your PHP version is outdated" => "Vaša PHP verzia je zastaraná",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Táto verzia PHP je zastaraná. Dôrazne vám odporúčame aktualizovať na verziu 5.3.8 alebo novšiu, lebo staršie verzie sú chybné. Je možné, že táto inštalácia nebude fungovať správne.",
-"PHP charset is not set to UTF-8" => "Znaková sada PHP nie je nastavená na UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Predvolená znaková sada PHP nie je nastavená na UTF-8. To môže spôsobiť veľké problémy v prípade ne-ASCII znakov v názvoch súborov. Dôrazne odporúčame zmeniť hodnotu \"default_charset\" v php.ini  na \"UTF-8\".",
-"Locale not working" => "Lokalizácia nefunguje",
-"System locale can not be set to a one which supports UTF-8." => "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
-"This means that there might be problems with certain characters in file names." => "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
-"URL generation in notification emails" => "Generovanie adresy URL v oznamovacích emailoch",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
-"Please double check the <a href='%s'>installation guides</a>." => "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Posledný cron bol spustený %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
-"Cron was not executed yet!" => "Cron sa ešte nespustil!",
-"Execute one task with each page loaded" => "Vykonať jednu úlohu s každým načítaní stránky",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
-"Sharing" => "Zdieľanie",
-"Allow apps to use the Share API" => "Povoliť aplikáciám používať API na zdieľanie",
-"Allow users to share via link" => "Povoliť používateľom zdieľanie pomocou odkazov",
-"Enforce password protection" => "Vynútiť ochranu heslom",
-"Allow public uploads" => "Povoliť verejné nahrávanie súborov",
-"Set default expiration date" => "Nastaviť predvolený dátum expirácie",
-"Expire after " => "Platnosť do",
-"days" => "dni",
-"Enforce expiration date" => "Vynútiť dátum expirácie",
-"Allow resharing" => "Povoliť zdieľanie ďalej",
-"Restrict users to only share with users in their groups" => "Povoliť používateľom zdieľanie len medzi nimi v rámci skupiny",
-"Allow users to send mail notification for shared files" => "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
-"Exclude groups from sharing" => "Vybrať skupiny zo zdieľania",
-"These groups will still be able to receive shares, but not to initiate them." => "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
-"Security" => "Zabezpečenie",
-"Enforce HTTPS" => "Vynútiť HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
-"Email Server" => "Email server",
-"This is used for sending out notifications." => "Používa sa na odosielanie upozornení.",
-"Send mode" => "Mód odosielania",
-"From address" => "Z adresy",
-"mail" => "email",
-"Authentication method" => "Autentifikačná metóda",
-"Authentication required" => "Vyžaduje sa overenie",
-"Server address" => "Adresa servera",
-"Port" => "Port",
-"Credentials" => "Prihlasovanie údaje",
-"SMTP Username" => "SMTP používateľské meno",
-"SMTP Password" => "SMTP heslo",
-"Test email settings" => "Nastavenia testovacieho emailu",
-"Send email" => "Odoslať email",
-"Log" => "Záznam",
-"Log level" => "Úroveň záznamu",
-"More" => "Viac",
-"Less" => "Menej",
-"Version" => "Verzia",
-"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>." => "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Viac aplikácií",
-"by" => "od",
-"Documentation:" => "Dokumentácia:",
-"User Documentation" => "Príručka používateľa",
-"Admin Documentation" => "Príručka administrátora",
-"Enable only for specific groups" => "Povoliť len pre vybrané skupiny",
-"Uninstall App" => "Odinštalovanie aplikácie",
-"Administrator Documentation" => "Príručka administrátora",
-"Online Documentation" => "Online príručka",
-"Forum" => "Fórum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Komerčná podpora",
-"Get the apps to sync your files" => "Získať aplikácie na synchronizáciu vašich súborov",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Ak chcete podporiť projekt\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">pridajte sa do vývoja</a>\n\t\talebo\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">pomáhajte šíriť povedomie</a>!",
-"Show First Run Wizard again" => "Znovu zobraziť sprievodcu prvým spustením",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Použili ste <strong>%s</strong> z <strong>%s</strong> dostupných ",
-"Password" => "Heslo",
-"Your password was changed" => "Vaše heslo bolo zmenené",
-"Unable to change your password" => "Nie je možné zmeniť vaše heslo",
-"Current password" => "Aktuálne heslo",
-"New password" => "Nové heslo",
-"Change password" => "Zmeniť heslo",
-"Full Name" => "Meno a priezvisko",
-"Email" => "Email",
-"Your email address" => "Vaša emailová adresa",
-"Fill in an email address to enable password recovery and receive notifications" => "Zadajte emailovú adresu pre umožnenie obnovy zabudnutého hesla a pre prijímanie upozornení a oznámení",
-"Profile picture" => "Avatar",
-"Upload new" => "Nahrať nový",
-"Select new from Files" => "Vyberte nový zo súborov",
-"Remove image" => "Zmazať obrázok",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Formát súboru png alebo jpg. V ideálnom prípade štvorec, ale budete mať možnosť ho orezať.",
-"Your avatar is provided by your original account." => "Váš avatar je použitý z pôvodného účtu.",
-"Cancel" => "Zrušiť",
-"Choose as profile image" => "Vybrať ako avatara",
-"Language" => "Jazyk",
-"Help translate" => "Pomôcť s prekladom",
-"Common Name" => "Bežný názov",
-"Valid until" => "Platný do",
-"Issued By" => "Vydal",
-"Valid until %s" => "Platný do %s",
-"Import Root Certificate" => "Importovať koreňový certifikát",
-"The encryption app is no longer enabled, please decrypt all your files" => "Šifrovacia aplikácia už nie je spustená, dešifrujte všetky svoje súbory.",
-"Log-in password" => "Prihlasovacie heslo",
-"Decrypt all Files" => "Dešifrovať všetky súbory",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Vaše šifrovacie kľúče boli zazálohované. Ak by sa niečo nepodarilo, dajú sa znovu obnoviť. Natrvalo ich vymažte len ak ste si istí, že sú všetky súbory bezchybne dešifrované.",
-"Restore Encryption Keys" => "Obnoviť šifrovacie kľúče",
-"Delete Encryption Keys" => "Vymazať šifrovacie kľúče",
-"Show storage location" => "Zobraziť umiestnenie úložiska",
-"Show last log in" => "Zobraziť posledné prihlásenie",
-"Login Name" => "Prihlasovacie meno",
-"Create" => "Vytvoriť",
-"Admin Recovery Password" => "Obnovenie hesla administrátora",
-"Enter the recovery password in order to recover the users files during password change" => "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
-"Search Users and Groups" => "Prehľadať používateľov a skupiny",
-"Add Group" => "Pridať skupinu",
-"Group" => "Skupina",
-"Everyone" => "Všetci",
-"Admins" => "Administrátori",
-"Default Quota" => "Predvolená kvóta",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")",
-"Unlimited" => "Nelimitované",
-"Other" => "Iné",
-"Username" => "Používateľské meno",
-"Quota" => "Kvóta",
-"Storage Location" => "Umiestnenie úložiska",
-"Last Login" => "Posledné prihlásenie",
-"change full name" => "zmeniť meno a priezvisko",
-"set new password" => "nastaviť nové heslo",
-"Default" => "Predvolené"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
new file mode 100644
index 00000000000..4ff4202cf72
--- /dev/null
+++ b/settings/l10n/sl.js
@@ -0,0 +1,199 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Omogočeno",
+    "Authentication error" : "Napaka med overjanjem",
+    "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
+    "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
+    "Group already exists" : "Skupina že obstaja",
+    "Unable to add group" : "Skupine ni mogoče dodati",
+    "Files decrypted successfully" : "Datoteke so uspešno odšifrirane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
+    "Couldn't decrypt your files, check your password and try again" : "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
+    "Couldn't remove app." : "Ni mogoče odstraniti programa.",
+    "Email saved" : "Elektronski naslov je shranjen",
+    "Invalid email" : "Neveljaven elektronski naslov",
+    "Unable to delete group" : "Skupine ni mogoče izbrisati",
+    "Unable to delete user" : "Uporabnika ni mogoče izbrisati",
+    "Backups restored successfully" : "Varnostne kopije so uspešno obnovljene.",
+    "Language changed" : "Jezik je spremenjen",
+    "Invalid request" : "Neveljavna zahteva",
+    "Admins can't remove themself from the admin group" : "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
+    "Unable to add user to group %s" : "Uporabnika ni mogoče dodati k skupini %s",
+    "Unable to remove user from group %s" : "Uporabnika ni mogoče odstraniti iz skupine %s",
+    "Couldn't update app." : "Programa ni mogoče posodobiti.",
+    "Wrong password" : "Napačno geslo",
+    "No user supplied" : "Ni navedenega uporabnika",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.",
+    "Wrong admin recovery password. Please check the password and try again." : "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
+    "Unable to change password" : "Ni mogoče spremeniti gesla",
+    "Saved" : "Shranjeno",
+    "test email settings" : "preizkusi nastavitve elektronske pošte",
+    "If you received this email, the settings seem to be correct." : "Če ste prejeli to sporočilo, so nastavitve pravilne.",
+    "Email sent" : "Elektronska pošta je poslana",
+    "You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
+    "Add trusted domain" : "Dodaj varno domeno",
+    "Sending..." : "Poteka pošiljanje ...",
+    "All" : "Vsi",
+    "Please wait...." : "Počakajte ...",
+    "Error while disabling app" : "Napaka onemogočanja programa",
+    "Disable" : "Onemogoči",
+    "Enable" : "Omogoči",
+    "Error while enabling app" : "Napaka omogočanja programa",
+    "Updating...." : "Poteka posodabljanje ...",
+    "Error while updating app" : "Prišlo je do napake med posodabljanjem programa.",
+    "Updated" : "Posodobljeno",
+    "Uninstalling ...." : "Odstranjevanje namestitve ...",
+    "Error while uninstalling app" : "Prišlo je do napake med odstranjevanjem programa.",
+    "Uninstall" : "Odstrani namestitev",
+    "Select a profile picture" : "Izbor slike profila",
+    "Very weak password" : "Zelo šibko geslo",
+    "Weak password" : "Šibko geslo",
+    "So-so password" : "Slabo geslo",
+    "Good password" : "Dobro geslo",
+    "Strong password" : "Odlično geslo",
+    "Valid until {date}" : "Veljavno do {date}",
+    "Delete" : "Izbriši",
+    "Decrypting files... Please wait, this can take some time." : "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
+    "Delete encryption keys permanently." : "Trajno izbriše šifrirne ključe",
+    "Restore encryption keys." : "Obnovi šifrirne ključe.",
+    "Groups" : "Skupine",
+    "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}",
+    "Error creating group" : "Napaka ustvarjanja skupine",
+    "undo" : "razveljavi",
+    "never" : "nikoli",
+    "add group" : "dodaj skupino",
+    "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
+    "Error creating user" : "Napaka ustvarjanja uporabnika",
+    "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
+    "__language_name__" : "Slovenščina",
+    "SSL root certificates" : "Korenska potrdila SSL",
+    "Encryption" : "Šifriranje",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
+    "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
+    "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke",
+    "Errors and fatal issues" : "Napake in usodne dogodke",
+    "Fatal issues only" : "Le usodne dogodke",
+    "None" : "Brez",
+    "Login" : "Prijava",
+    "Plain" : "Besedilno",
+    "NT LAN Manager" : "Upravljalnik NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Varnostno opozorilo",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola HTTPS.",
+    "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." : "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo .",
+    "Setup Warning" : "Opozorilo nastavitve",
+    "Module 'fileinfo' missing" : "Manjka modul 'fileinfo'.",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
+    "Your PHP version is outdated" : "Nameščena različica PHP je zastarela",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
+    "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
+    "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
+    "Connectivity checks" : "Preverjanje povezav",
+    "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
+    "Cron" : "Periodično opravilo",
+    "Last cron was executed at %s." : "Zadnje opravilo cron je bilo izvedeno ob %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
+    "Cron was not executed yet!" : "Opravilo Cron še ni zagnano!",
+    "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+    "Sharing" : "Souporaba",
+    "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
+    "Enforce password protection" : "Vsili zaščito z geslom",
+    "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
+    "Set default expiration date" : "Nastavitev privzetega datuma poteka",
+    "Expire after " : "Preteče po",
+    "days" : "dneh",
+    "Enforce expiration date" : "Vsili datum preteka",
+    "Allow resharing" : "Dovoli nadaljnjo souporabo",
+    "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
+    "Exclude groups from sharing" : "Izloči skupine iz souporabe",
+    "Security" : "Varnost",
+    "Enforce HTTPS" : "Zahtevaj uporabo HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
+    "Email Server" : "Poštni strežnik",
+    "Send mode" : "Način pošiljanja",
+    "Authentication method" : "Način overitve",
+    "Authentication required" : "Zahtevana je overitev",
+    "Server address" : "Naslov strežnika",
+    "Port" : "Vrata",
+    "Credentials" : "Poverila",
+    "SMTP Username" : "Uporabniško ime SMTP",
+    "SMTP Password" : "Geslo SMTP",
+    "Test email settings" : "Preizkus nastavitev elektronske pošte",
+    "Send email" : "Pošlji elektronsko sporočilo",
+    "Log" : "Dnevnik",
+    "Log level" : "Raven beleženja",
+    "More" : "Več",
+    "Less" : "Manj",
+    "Version" : "Različica",
+    "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>." : "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
+    "by" : "od",
+    "Documentation:" : "Dokumentacija:",
+    "User Documentation" : "Uporabniška dokumentacija",
+    "Admin Documentation" : "Skrbniška dokumentacija",
+    "Enable only for specific groups" : "Omogoči le za posamezne skupine",
+    "Uninstall App" : "Odstrani program",
+    "Administrator Documentation" : "Skrbniška dokumentacija",
+    "Online Documentation" : "Spletna dokumentacija",
+    "Forum" : "Forum",
+    "Bugtracker" : "Sledilnik hroščev",
+    "Commercial Support" : "Podpora strankam",
+    "Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Če želite podpreti projekt,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">prispevajte k razvoju</a>\n\t\tali pa\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">seznanite druge o zmožnostih oblaka.</a>!",
+    "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
+    "Password" : "Geslo",
+    "Your password was changed" : "Geslo je spremenjeno",
+    "Unable to change your password" : "Gesla ni mogoče spremeniti.",
+    "Current password" : "Trenutno geslo",
+    "New password" : "Novo geslo",
+    "Change password" : "Spremeni geslo",
+    "Full Name" : "Polno ime",
+    "Email" : "Elektronski naslov",
+    "Your email address" : "Osebni elektronski naslov",
+    "Profile picture" : "Slika profila",
+    "Upload new" : "Pošlji novo",
+    "Select new from Files" : "Izberi novo iz menija datotek",
+    "Remove image" : "Odstrani sliko",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Slika je lahko png ali jpg. Slika naj bo kvadratna, ni pa to pogoj, saj  jo bo mogoče obrezati.",
+    "Your avatar is provided by your original account." : "Podoba je podana v izvornem računu.",
+    "Cancel" : "Prekliči",
+    "Choose as profile image" : "Izberi kot sliko profila",
+    "Language" : "Jezik",
+    "Help translate" : "Sodelujte pri prevajanju",
+    "Common Name" : "Splošno ime",
+    "Valid until" : "Veljavno do",
+    "Import Root Certificate" : "Uvozi korensko potrdilo",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
+    "Log-in password" : "Prijavno geslo",
+    "Decrypt all Files" : "Odšifriraj vse datoteke",
+    "Restore Encryption Keys" : "Obnovi šifrirne ključe",
+    "Delete Encryption Keys" : "Izbriši šifrirne ključe",
+    "Login Name" : "Prijavno ime",
+    "Create" : "Ustvari",
+    "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
+    "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+    "Search Users and Groups" : "Iskanje uporabnikov in skupin",
+    "Add Group" : "Dodaj skupino",
+    "Group" : "Skupina",
+    "Everyone" : "Vsi",
+    "Admins" : "Skrbniki",
+    "Default Quota" : "Privzeta količinska omejitev",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
+    "Unlimited" : "Neomejeno",
+    "Other" : "Drugo",
+    "Username" : "Uporabniško ime",
+    "Quota" : "Količinska omejitev",
+    "Last Login" : "Zadnja prijava",
+    "change full name" : "Spremeni polno ime",
+    "set new password" : "nastavi novo geslo",
+    "Default" : "Privzeto"
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
new file mode 100644
index 00000000000..0fad1072785
--- /dev/null
+++ b/settings/l10n/sl.json
@@ -0,0 +1,197 @@
+{ "translations": {
+    "Enabled" : "Omogočeno",
+    "Authentication error" : "Napaka med overjanjem",
+    "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
+    "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
+    "Group already exists" : "Skupina že obstaja",
+    "Unable to add group" : "Skupine ni mogoče dodati",
+    "Files decrypted successfully" : "Datoteke so uspešno odšifrirane",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
+    "Couldn't decrypt your files, check your password and try again" : "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
+    "Couldn't remove app." : "Ni mogoče odstraniti programa.",
+    "Email saved" : "Elektronski naslov je shranjen",
+    "Invalid email" : "Neveljaven elektronski naslov",
+    "Unable to delete group" : "Skupine ni mogoče izbrisati",
+    "Unable to delete user" : "Uporabnika ni mogoče izbrisati",
+    "Backups restored successfully" : "Varnostne kopije so uspešno obnovljene.",
+    "Language changed" : "Jezik je spremenjen",
+    "Invalid request" : "Neveljavna zahteva",
+    "Admins can't remove themself from the admin group" : "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
+    "Unable to add user to group %s" : "Uporabnika ni mogoče dodati k skupini %s",
+    "Unable to remove user from group %s" : "Uporabnika ni mogoče odstraniti iz skupine %s",
+    "Couldn't update app." : "Programa ni mogoče posodobiti.",
+    "Wrong password" : "Napačno geslo",
+    "No user supplied" : "Ni navedenega uporabnika",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.",
+    "Wrong admin recovery password. Please check the password and try again." : "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
+    "Unable to change password" : "Ni mogoče spremeniti gesla",
+    "Saved" : "Shranjeno",
+    "test email settings" : "preizkusi nastavitve elektronske pošte",
+    "If you received this email, the settings seem to be correct." : "Če ste prejeli to sporočilo, so nastavitve pravilne.",
+    "Email sent" : "Elektronska pošta je poslana",
+    "You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
+    "Add trusted domain" : "Dodaj varno domeno",
+    "Sending..." : "Poteka pošiljanje ...",
+    "All" : "Vsi",
+    "Please wait...." : "Počakajte ...",
+    "Error while disabling app" : "Napaka onemogočanja programa",
+    "Disable" : "Onemogoči",
+    "Enable" : "Omogoči",
+    "Error while enabling app" : "Napaka omogočanja programa",
+    "Updating...." : "Poteka posodabljanje ...",
+    "Error while updating app" : "Prišlo je do napake med posodabljanjem programa.",
+    "Updated" : "Posodobljeno",
+    "Uninstalling ...." : "Odstranjevanje namestitve ...",
+    "Error while uninstalling app" : "Prišlo je do napake med odstranjevanjem programa.",
+    "Uninstall" : "Odstrani namestitev",
+    "Select a profile picture" : "Izbor slike profila",
+    "Very weak password" : "Zelo šibko geslo",
+    "Weak password" : "Šibko geslo",
+    "So-so password" : "Slabo geslo",
+    "Good password" : "Dobro geslo",
+    "Strong password" : "Odlično geslo",
+    "Valid until {date}" : "Veljavno do {date}",
+    "Delete" : "Izbriši",
+    "Decrypting files... Please wait, this can take some time." : "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
+    "Delete encryption keys permanently." : "Trajno izbriše šifrirne ključe",
+    "Restore encryption keys." : "Obnovi šifrirne ključe.",
+    "Groups" : "Skupine",
+    "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}",
+    "Error creating group" : "Napaka ustvarjanja skupine",
+    "undo" : "razveljavi",
+    "never" : "nikoli",
+    "add group" : "dodaj skupino",
+    "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
+    "Error creating user" : "Napaka ustvarjanja uporabnika",
+    "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
+    "Warning: Home directory for user \"{user}\" already exists" : "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
+    "__language_name__" : "Slovenščina",
+    "SSL root certificates" : "Korenska potrdila SSL",
+    "Encryption" : "Šifriranje",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
+    "Info, warnings, errors and fatal issues" : "Podrobnosti, opozorila, napake in usodne dogodke",
+    "Warnings, errors and fatal issues" : "Opozorila, napake in usodne dogodke",
+    "Errors and fatal issues" : "Napake in usodne dogodke",
+    "Fatal issues only" : "Le usodne dogodke",
+    "None" : "Brez",
+    "Login" : "Prijava",
+    "Plain" : "Besedilno",
+    "NT LAN Manager" : "Upravljalnik NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Varnostno opozorilo",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola HTTPS.",
+    "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." : "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo .",
+    "Setup Warning" : "Opozorilo nastavitve",
+    "Module 'fileinfo' missing" : "Manjka modul 'fileinfo'.",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
+    "Your PHP version is outdated" : "Nameščena različica PHP je zastarela",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
+    "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
+    "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
+    "Connectivity checks" : "Preverjanje povezav",
+    "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
+    "Cron" : "Periodično opravilo",
+    "Last cron was executed at %s." : "Zadnje opravilo cron je bilo izvedeno ob %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
+    "Cron was not executed yet!" : "Opravilo Cron še ni zagnano!",
+    "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+    "Sharing" : "Souporaba",
+    "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
+    "Enforce password protection" : "Vsili zaščito z geslom",
+    "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
+    "Set default expiration date" : "Nastavitev privzetega datuma poteka",
+    "Expire after " : "Preteče po",
+    "days" : "dneh",
+    "Enforce expiration date" : "Vsili datum preteka",
+    "Allow resharing" : "Dovoli nadaljnjo souporabo",
+    "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
+    "Exclude groups from sharing" : "Izloči skupine iz souporabe",
+    "Security" : "Varnost",
+    "Enforce HTTPS" : "Zahtevaj uporabo HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
+    "Email Server" : "Poštni strežnik",
+    "Send mode" : "Način pošiljanja",
+    "Authentication method" : "Način overitve",
+    "Authentication required" : "Zahtevana je overitev",
+    "Server address" : "Naslov strežnika",
+    "Port" : "Vrata",
+    "Credentials" : "Poverila",
+    "SMTP Username" : "Uporabniško ime SMTP",
+    "SMTP Password" : "Geslo SMTP",
+    "Test email settings" : "Preizkus nastavitev elektronske pošte",
+    "Send email" : "Pošlji elektronsko sporočilo",
+    "Log" : "Dnevnik",
+    "Log level" : "Raven beleženja",
+    "More" : "Več",
+    "Less" : "Manj",
+    "Version" : "Različica",
+    "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>." : "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
+    "by" : "od",
+    "Documentation:" : "Dokumentacija:",
+    "User Documentation" : "Uporabniška dokumentacija",
+    "Admin Documentation" : "Skrbniška dokumentacija",
+    "Enable only for specific groups" : "Omogoči le za posamezne skupine",
+    "Uninstall App" : "Odstrani program",
+    "Administrator Documentation" : "Skrbniška dokumentacija",
+    "Online Documentation" : "Spletna dokumentacija",
+    "Forum" : "Forum",
+    "Bugtracker" : "Sledilnik hroščev",
+    "Commercial Support" : "Podpora strankam",
+    "Get the apps to sync your files" : "Pridobi programe za usklajevanje datotek",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Če želite podpreti projekt,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">prispevajte k razvoju</a>\n\t\tali pa\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">seznanite druge o zmožnostih oblaka.</a>!",
+    "Show First Run Wizard again" : "Zaženi čarovnika prvega zagona",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
+    "Password" : "Geslo",
+    "Your password was changed" : "Geslo je spremenjeno",
+    "Unable to change your password" : "Gesla ni mogoče spremeniti.",
+    "Current password" : "Trenutno geslo",
+    "New password" : "Novo geslo",
+    "Change password" : "Spremeni geslo",
+    "Full Name" : "Polno ime",
+    "Email" : "Elektronski naslov",
+    "Your email address" : "Osebni elektronski naslov",
+    "Profile picture" : "Slika profila",
+    "Upload new" : "Pošlji novo",
+    "Select new from Files" : "Izberi novo iz menija datotek",
+    "Remove image" : "Odstrani sliko",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Slika je lahko png ali jpg. Slika naj bo kvadratna, ni pa to pogoj, saj  jo bo mogoče obrezati.",
+    "Your avatar is provided by your original account." : "Podoba je podana v izvornem računu.",
+    "Cancel" : "Prekliči",
+    "Choose as profile image" : "Izberi kot sliko profila",
+    "Language" : "Jezik",
+    "Help translate" : "Sodelujte pri prevajanju",
+    "Common Name" : "Splošno ime",
+    "Valid until" : "Veljavno do",
+    "Import Root Certificate" : "Uvozi korensko potrdilo",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
+    "Log-in password" : "Prijavno geslo",
+    "Decrypt all Files" : "Odšifriraj vse datoteke",
+    "Restore Encryption Keys" : "Obnovi šifrirne ključe",
+    "Delete Encryption Keys" : "Izbriši šifrirne ključe",
+    "Login Name" : "Prijavno ime",
+    "Create" : "Ustvari",
+    "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
+    "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+    "Search Users and Groups" : "Iskanje uporabnikov in skupin",
+    "Add Group" : "Dodaj skupino",
+    "Group" : "Skupina",
+    "Everyone" : "Vsi",
+    "Admins" : "Skrbniki",
+    "Default Quota" : "Privzeta količinska omejitev",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
+    "Unlimited" : "Neomejeno",
+    "Other" : "Drugo",
+    "Username" : "Uporabniško ime",
+    "Quota" : "Količinska omejitev",
+    "Last Login" : "Zadnja prijava",
+    "change full name" : "Spremeni polno ime",
+    "set new password" : "nastavi novo geslo",
+    "Default" : "Privzeto"
+},"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/settings/l10n/sl.php b/settings/l10n/sl.php
deleted file mode 100644
index 9866e44afa0..00000000000
--- a/settings/l10n/sl.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Omogočeno",
-"Not enabled" => "Ni omogočeno",
-"Recommended" => "Priporočljivo",
-"Authentication error" => "Napaka med overjanjem",
-"Your full name has been changed." => "Vaše polno ime je spremenjeno.",
-"Unable to change full name" => "Ni mogoče spremeniti polnega imena",
-"Group already exists" => "Skupina že obstaja",
-"Unable to add group" => "Skupine ni mogoče dodati",
-"Files decrypted successfully" => "Datoteke so uspešno odšifrirane",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
-"Couldn't decrypt your files, check your password and try again" => "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
-"Encryption keys deleted permanently" => "Šifrirni ključi so trajno izbrisani",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Ni mogoče trajno izbrisati šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
-"Couldn't remove app." => "Ni mogoče odstraniti programa.",
-"Email saved" => "Elektronski naslov je shranjen",
-"Invalid email" => "Neveljaven elektronski naslov",
-"Unable to delete group" => "Skupine ni mogoče izbrisati",
-"Unable to delete user" => "Uporabnika ni mogoče izbrisati",
-"Backups restored successfully" => "Varnostne kopije so uspešno obnovljene.",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Ni mogoče obnoviti šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
-"Language changed" => "Jezik je spremenjen",
-"Invalid request" => "Neveljavna zahteva",
-"Admins can't remove themself from the admin group" => "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
-"Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s",
-"Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s",
-"Couldn't update app." => "Programa ni mogoče posodobiti.",
-"Wrong password" => "Napačno geslo",
-"No user supplied" => "Ni navedenega uporabnika",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Podati je treba skrbniško obnovitveno geslo, sicer bodo vsi uporabniški podatki izgubljeni.",
-"Wrong admin recovery password. Please check the password and try again." => "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
-"Unable to change password" => "Ni mogoče spremeniti gesla",
-"Saved" => "Shranjeno",
-"test email settings" => "preizkusi nastavitve elektronske pošte",
-"If you received this email, the settings seem to be correct." => "Če ste prejeli to sporočilo, so nastavitve pravilne.",
-"A problem occurred while sending the email. Please revise your settings." => "Prišlo je do napake med pošiljanjem sporočila na elektronski naslov. Spremeniti je treba nastavitve.",
-"Email sent" => "Elektronska pošta je poslana",
-"You need to set your user email before being able to send test emails." => "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?",
-"Add trusted domain" => "Dodaj varno domeno",
-"Sending..." => "Poteka pošiljanje ...",
-"All" => "Vsi",
-"Please wait...." => "Počakajte ...",
-"Error while disabling app" => "Napaka onemogočanja programa",
-"Disable" => "Onemogoči",
-"Enable" => "Omogoči",
-"Error while enabling app" => "Napaka omogočanja programa",
-"Updating...." => "Poteka posodabljanje ...",
-"Error while updating app" => "Prišlo je do napake med posodabljanjem programa.",
-"Updated" => "Posodobljeno",
-"Uninstalling ...." => "Odstranjevanje namestitve ...",
-"Error while uninstalling app" => "Prišlo je do napake med odstranjevanjem programa.",
-"Uninstall" => "Odstrani namestitev",
-"Select a profile picture" => "Izbor slike profila",
-"Very weak password" => "Zelo šibko geslo",
-"Weak password" => "Šibko geslo",
-"So-so password" => "Slabo geslo",
-"Good password" => "Dobro geslo",
-"Strong password" => "Odlično geslo",
-"Valid until {date}" => "Veljavno do {date}",
-"Delete" => "Izbriši",
-"Decrypting files... Please wait, this can take some time." => "Poteka odšifriranje datotek ... Opravilo je lahko dolgotrajno.",
-"Delete encryption keys permanently." => "Trajno izbriše šifrirne ključe",
-"Restore encryption keys." => "Obnovi šifrirne ključe.",
-"Groups" => "Skupine",
-"Unable to delete {objName}" => "Ni mogoče izbrisati {objName}",
-"Error creating group" => "Napaka ustvarjanja skupine",
-"A valid group name must be provided" => "Navedeno mora biti veljavno ime skupine",
-"deleted {groupName}" => "izbrisano {groupName}",
-"undo" => "razveljavi",
-"no group" => "ni skupine",
-"never" => "nikoli",
-"deleted {userName}" => "izbrisano {userName}",
-"add group" => "dodaj skupino",
-"A valid username must be provided" => "Navedeno mora biti veljavno uporabniško ime",
-"Error creating user" => "Napaka ustvarjanja uporabnika",
-"A valid password must be provided" => "Navedeno mora biti veljavno geslo",
-"Warning: Home directory for user \"{user}\" already exists" => "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
-"__language_name__" => "Slovenščina",
-"Personal Info" => "Osebni podatki",
-"SSL root certificates" => "Korenska potrdila SSL",
-"Encryption" => "Šifriranje",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
-"Info, warnings, errors and fatal issues" => "Podrobnosti, opozorila, napake in usodne dogodke",
-"Warnings, errors and fatal issues" => "Opozorila, napake in usodne dogodke",
-"Errors and fatal issues" => "Napake in usodne dogodke",
-"Fatal issues only" => "Le usodne dogodke",
-"None" => "Brez",
-"Login" => "Prijava",
-"Plain" => "Besedilno",
-"NT LAN Manager" => "Upravljalnik NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Varnostno opozorilo",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola HTTPS.",
-"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." => "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo .",
-"Setup Warning" => "Opozorilo nastavitve",
-"Database Performance Info" => "Podrobnosti delovanja podatkovne zbirke",
-"Module 'fileinfo' missing" => "Manjka modul 'fileinfo'.",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
-"Your PHP version is outdated" => "Nameščena različica PHP je zastarela",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
-"PHP charset is not set to UTF-8" => "Jezikovni znakovni nabor PHP ni določen kot UTF-8",
-"Locale not working" => "Jezikovne prilagoditve ne delujejo.",
-"System locale can not be set to a one which supports UTF-8." => "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
-"This means that there might be problems with certain characters in file names." => "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
-"Connectivity checks" => "Preverjanje povezav",
-"No problems found" => "Ni zaznanih težav",
-"Please double check the <a href='%s'>installation guides</a>." => "Preverite <a href='%s'>navodila namestitve</a>.",
-"Cron" => "Periodično opravilo",
-"Last cron was executed at %s." => "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Zadnje periodično opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
-"Cron was not executed yet!" => "Periodično opravilo cron še ni zagnano!",
-"Execute one task with each page loaded" => "Izvedi eno nalogo z vsako naloženo stranjo.",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
-"Use system's cron service to call the cron.php file every 15 minutes." => "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
-"Sharing" => "Souporaba",
-"Allow apps to use the Share API" => "Dovoli programom uporabo vmesnika API souporabe",
-"Allow users to share via link" => "Uporabnikom dovoli omogočanje souporabe s povezavami",
-"Enforce password protection" => "Vsili zaščito z geslom",
-"Allow public uploads" => "Dovoli javno pošiljanje datotek v oblak",
-"Set default expiration date" => "Nastavitev privzetega datuma poteka",
-"Expire after " => "Preteče po",
-"days" => "dneh",
-"Enforce expiration date" => "Vsili datum preteka",
-"Allow resharing" => "Dovoli nadaljnjo souporabo",
-"Restrict users to only share with users in their groups" => "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
-"Allow users to send mail notification for shared files" => "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
-"Exclude groups from sharing" => "Izloči skupine iz souporabe",
-"These groups will still be able to receive shares, but not to initiate them." => "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
-"Security" => "Varnost",
-"Enforce HTTPS" => "Zahtevaj uporabo HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
-"Email Server" => "Poštni strežnik",
-"This is used for sending out notifications." => "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
-"Send mode" => "Način pošiljanja",
-"From address" => "Naslov pošiljatelja",
-"Authentication method" => "Način overitve",
-"Authentication required" => "Zahtevana je overitev",
-"Server address" => "Naslov strežnika",
-"Port" => "Vrata",
-"Credentials" => "Poverila",
-"SMTP Username" => "Uporabniško ime SMTP",
-"SMTP Password" => "Geslo SMTP",
-"Store credentials" => "Shrani poverila",
-"Test email settings" => "Preizkus nastavitev elektronske pošte",
-"Send email" => "Pošlji elektronsko sporočilo",
-"Log" => "Dnevnik",
-"Log level" => "Raven beleženja",
-"More" => "Več",
-"Less" => "Manj",
-"Version" => "Različica",
-"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>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
-"More apps" => "Več programov",
-"Add your app" => "Dodajte program",
-"by" => "od",
-"Documentation:" => "Dokumentacija:",
-"User Documentation" => "Uporabniška dokumentacija",
-"Admin Documentation" => "Skrbniška dokumentacija",
-"Update to %s" => "Posodobi na %s",
-"Enable only for specific groups" => "Omogoči le za posamezne skupine",
-"Uninstall App" => "Odstrani program",
-"Administrator Documentation" => "Skrbniška dokumentacija",
-"Online Documentation" => "Spletna dokumentacija",
-"Forum" => "Forum",
-"Bugtracker" => "Sledilnik hroščev",
-"Commercial Support" => "Podpora strankam",
-"Get the apps to sync your files" => "Pridobi programe za usklajevanje datotek",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Če želite podpreti projekt,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">prispevajte k razvoju</a>\n\t\tali pa\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">seznanite druge o zmožnostih oblaka.</a>!",
-"Show First Run Wizard again" => "Zaženi čarovnika prvega zagona",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Uporabljenega je <strong>%s</strong> od razpoložljivih <strong>%s</strong> prostora.",
-"Password" => "Geslo",
-"Your password was changed" => "Geslo je spremenjeno",
-"Unable to change your password" => "Gesla ni mogoče spremeniti.",
-"Current password" => "Trenutno geslo",
-"New password" => "Novo geslo",
-"Change password" => "Spremeni geslo",
-"Full Name" => "Polno ime",
-"Email" => "Elektronski naslov",
-"Your email address" => "Osebni elektronski naslov",
-"Profile picture" => "Slika profila",
-"Upload new" => "Pošlji novo",
-"Select new from Files" => "Izberi novo iz menija datotek",
-"Remove image" => "Odstrani sliko",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Slika je lahko png ali jpg. Slika naj bo kvadratna, ni pa to pogoj, saj  jo bo mogoče obrezati.",
-"Your avatar is provided by your original account." => "Podoba je podana v izvornem računu.",
-"Cancel" => "Prekliči",
-"Choose as profile image" => "Izberi kot sliko profila",
-"Language" => "Jezik",
-"Help translate" => "Sodelujte pri prevajanju",
-"Common Name" => "Splošno ime",
-"Valid until" => "Veljavno do",
-"Issued By" => "Izdajatelj",
-"Valid until %s" => "Veljavno do %s",
-"Import Root Certificate" => "Uvozi korensko potrdilo",
-"The encryption app is no longer enabled, please decrypt all your files" => "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
-"Log-in password" => "Prijavno geslo",
-"Decrypt all Files" => "Odšifriraj vse datoteke",
-"Restore Encryption Keys" => "Obnovi šifrirne ključe",
-"Delete Encryption Keys" => "Izbriši šifrirne ključe",
-"Show storage location" => "Pokaži mesto shrambe",
-"Show last log in" => "Pokaži podatke zadnje prijave",
-"Login Name" => "Prijavno ime",
-"Create" => "Ustvari",
-"Admin Recovery Password" => "Obnovitev skrbniškega gesla",
-"Enter the recovery password in order to recover the users files during password change" => "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
-"Search Users and Groups" => "Iskanje uporabnikov in skupin",
-"Add Group" => "Dodaj skupino",
-"Group" => "Skupina",
-"Everyone" => "Vsi",
-"Admins" => "Skrbniki",
-"Default Quota" => "Privzeta količinska omejitev",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
-"Unlimited" => "Neomejeno",
-"Other" => "Drugo",
-"Username" => "Uporabniško ime",
-"Group Admin for" => "Skrbnik skupine za",
-"Quota" => "Količinska omejitev",
-"Storage Location" => "Mesto shrambe",
-"Last Login" => "Zadnja prijava",
-"change full name" => "Spremeni polno ime",
-"set new password" => "nastavi novo geslo",
-"Default" => "Privzeto"
-);
-$PLURAL_FORMS = "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);";
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
new file mode 100644
index 00000000000..6a00beb0e2f
--- /dev/null
+++ b/settings/l10n/sq.js
@@ -0,0 +1,116 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Gabim autentifikimi",
+    "Group already exists" : "Grupi ekziston",
+    "Unable to add group" : "E pamundur të shtohet grupi",
+    "Email saved" : "Email u ruajt",
+    "Invalid email" : "Email jo i vlefshëm",
+    "Unable to delete group" : "E pamundur të fshihet grupi",
+    "Unable to delete user" : "E pamundur të fshihet përdoruesi",
+    "Language changed" : "Gjuha u ndryshua",
+    "Invalid request" : "Kërkesë e pavlefshme",
+    "Admins can't remove themself from the admin group" : "Administratorët nuk mund të heqin vehten prej grupit admin",
+    "Unable to add user to group %s" : "E pamundur t'i shtohet përdoruesi grupit %s",
+    "Unable to remove user from group %s" : "E pamundur të hiqet përdoruesi nga grupi %s",
+    "Couldn't update app." : "E pamundur të përditësohet app.",
+    "Wrong password" : "Fjalëkalim i gabuar",
+    "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet",
+    "Saved" : "U ruajt",
+    "Email sent" : "Email-i u dërgua",
+    "Sending..." : "Duke dërguar",
+    "All" : "Të gjitha",
+    "Please wait...." : "Ju lutem prisni...",
+    "Disable" : "Çaktivizo",
+    "Enable" : "Aktivizo",
+    "Updating...." : "Duke përditësuar...",
+    "Error while updating app" : "Gabim gjatë përditësimit të app",
+    "Updated" : "I përditësuar",
+    "Select a profile picture" : "Zgjidh një foto profili",
+    "Delete" : "Fshi",
+    "Groups" : "Grupet",
+    "deleted {groupName}" : "u fshi {groupName}",
+    "undo" : "anullo veprimin",
+    "never" : "asnjëherë",
+    "deleted {userName}" : "u fshi {userName}",
+    "add group" : "shto grup",
+    "A valid username must be provided" : "Duhet të jepni një emër të vlefshëm përdoruesi",
+    "Error creating user" : "Gabim gjatë krijimit të përdoruesit",
+    "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm",
+    "__language_name__" : "Shqip",
+    "Encryption" : "Kodifikimi",
+    "None" : "Asgjë",
+    "Login" : "Hyr",
+    "Security Warning" : "Njoftim për sigurinë",
+    "Setup Warning" : "Lajmërim konfigurimi",
+    "Module 'fileinfo' missing" : "Mungon moduli 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
+    "Locale not working" : "Locale nuk është funksional",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
+    "Sharing" : "Ndarje",
+    "Allow apps to use the Share API" : "Lejoni aplikacionet të përdorin share API",
+    "Allow public uploads" : "Lejo ngarkimin publik",
+    "Expire after " : "Skadon pas",
+    "days" : "diitë",
+    "Allow resharing" : "Lejo ri-ndarjen",
+    "Security" : "Siguria",
+    "Enforce HTTPS" : "Detyro HTTPS",
+    "Send mode" : "Mënyra e dërgimit",
+    "From address" : "Nga adresa",
+    "mail" : "postë",
+    "Server address" : "Adresa e serverit",
+    "Port" : "Porta",
+    "Credentials" : "Kredencialet",
+    "Send email" : "Dërgo email",
+    "Log" : "Historik aktiviteti",
+    "Log level" : "Niveli i Historikut",
+    "More" : "Më tepër",
+    "Less" : "M'pak",
+    "Version" : "Versioni",
+    "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>." : "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "nga",
+    "Documentation:" : "Dokumentacioni:",
+    "User Documentation" : "Dokumentacion përdoruesi",
+    "Administrator Documentation" : "Dokumentacion administratori",
+    "Online Documentation" : "Dokumentacion online",
+    "Forum" : "Forumi",
+    "Bugtracker" : "Bugtracker - ndjekja e problemeve",
+    "Commercial Support" : "Suport komercial",
+    "Get the apps to sync your files" : "Bëni që aplikacionet të sinkronizojnë skedarët tuaj",
+    "Show First Run Wizard again" : "Rishfaq përsëri fazat për hapjen e herës së parë",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme ",
+    "Password" : "Fjalëkalim",
+    "Your password was changed" : "fjalëkalimi juaj u ndryshua",
+    "Unable to change your password" : "Nuk është e mundur të ndryshohet fjalëkalimi",
+    "Current password" : "Fjalëkalimi aktual",
+    "New password" : "Fjalëkalimi i ri",
+    "Change password" : "Ndrysho fjalëkalimin",
+    "Full Name" : "Emri i plotë",
+    "Email" : "Email",
+    "Your email address" : "Adresa juaj email",
+    "Profile picture" : "Foto Profili",
+    "Remove image" : "Fshi imazh",
+    "Cancel" : "Anullo",
+    "Choose as profile image" : "Vendos si foto profili",
+    "Language" : "Gjuha",
+    "Help translate" : "Ndihmoni në përkthim",
+    "Log-in password" : "Fjalëkalimi i hyrjes",
+    "Login Name" : "Emri i Përdoruesit",
+    "Create" : "Krijo",
+    "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
+    "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
+    "Search Users and Groups" : "Kërko Përdorues apo Grupe",
+    "Add Group" : "Shto Grup",
+    "Group" : "Grup",
+    "Everyone" : "Të gjithë",
+    "Unlimited" : "E pakufizuar",
+    "Other" : "Tjetër",
+    "Username" : "Përdoruesi",
+    "Last Login" : "Hyrja e fundit",
+    "change full name" : "ndrysho emrin e plotë",
+    "set new password" : "vendos fjalëkalim të ri",
+    "Default" : "Paracaktuar"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
new file mode 100644
index 00000000000..944d21022d6
--- /dev/null
+++ b/settings/l10n/sq.json
@@ -0,0 +1,114 @@
+{ "translations": {
+    "Authentication error" : "Gabim autentifikimi",
+    "Group already exists" : "Grupi ekziston",
+    "Unable to add group" : "E pamundur të shtohet grupi",
+    "Email saved" : "Email u ruajt",
+    "Invalid email" : "Email jo i vlefshëm",
+    "Unable to delete group" : "E pamundur të fshihet grupi",
+    "Unable to delete user" : "E pamundur të fshihet përdoruesi",
+    "Language changed" : "Gjuha u ndryshua",
+    "Invalid request" : "Kërkesë e pavlefshme",
+    "Admins can't remove themself from the admin group" : "Administratorët nuk mund të heqin vehten prej grupit admin",
+    "Unable to add user to group %s" : "E pamundur t'i shtohet përdoruesi grupit %s",
+    "Unable to remove user from group %s" : "E pamundur të hiqet përdoruesi nga grupi %s",
+    "Couldn't update app." : "E pamundur të përditësohet app.",
+    "Wrong password" : "Fjalëkalim i gabuar",
+    "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet",
+    "Saved" : "U ruajt",
+    "Email sent" : "Email-i u dërgua",
+    "Sending..." : "Duke dërguar",
+    "All" : "Të gjitha",
+    "Please wait...." : "Ju lutem prisni...",
+    "Disable" : "Çaktivizo",
+    "Enable" : "Aktivizo",
+    "Updating...." : "Duke përditësuar...",
+    "Error while updating app" : "Gabim gjatë përditësimit të app",
+    "Updated" : "I përditësuar",
+    "Select a profile picture" : "Zgjidh një foto profili",
+    "Delete" : "Fshi",
+    "Groups" : "Grupet",
+    "deleted {groupName}" : "u fshi {groupName}",
+    "undo" : "anullo veprimin",
+    "never" : "asnjëherë",
+    "deleted {userName}" : "u fshi {userName}",
+    "add group" : "shto grup",
+    "A valid username must be provided" : "Duhet të jepni një emër të vlefshëm përdoruesi",
+    "Error creating user" : "Gabim gjatë krijimit të përdoruesit",
+    "A valid password must be provided" : "Duhet të jepni një fjalëkalim te vlefshëm",
+    "__language_name__" : "Shqip",
+    "Encryption" : "Kodifikimi",
+    "None" : "Asgjë",
+    "Login" : "Hyr",
+    "Security Warning" : "Njoftim për sigurinë",
+    "Setup Warning" : "Lajmërim konfigurimi",
+    "Module 'fileinfo' missing" : "Mungon moduli 'fileinfo'",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
+    "Locale not working" : "Locale nuk është funksional",
+    "Please double check the <a href='%s'>installation guides</a>." : "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
+    "Sharing" : "Ndarje",
+    "Allow apps to use the Share API" : "Lejoni aplikacionet të përdorin share API",
+    "Allow public uploads" : "Lejo ngarkimin publik",
+    "Expire after " : "Skadon pas",
+    "days" : "diitë",
+    "Allow resharing" : "Lejo ri-ndarjen",
+    "Security" : "Siguria",
+    "Enforce HTTPS" : "Detyro HTTPS",
+    "Send mode" : "Mënyra e dërgimit",
+    "From address" : "Nga adresa",
+    "mail" : "postë",
+    "Server address" : "Adresa e serverit",
+    "Port" : "Porta",
+    "Credentials" : "Kredencialet",
+    "Send email" : "Dërgo email",
+    "Log" : "Historik aktiviteti",
+    "Log level" : "Niveli i Historikut",
+    "More" : "Më tepër",
+    "Less" : "M'pak",
+    "Version" : "Versioni",
+    "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>." : "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "nga",
+    "Documentation:" : "Dokumentacioni:",
+    "User Documentation" : "Dokumentacion përdoruesi",
+    "Administrator Documentation" : "Dokumentacion administratori",
+    "Online Documentation" : "Dokumentacion online",
+    "Forum" : "Forumi",
+    "Bugtracker" : "Bugtracker - ndjekja e problemeve",
+    "Commercial Support" : "Suport komercial",
+    "Get the apps to sync your files" : "Bëni që aplikacionet të sinkronizojnë skedarët tuaj",
+    "Show First Run Wizard again" : "Rishfaq përsëri fazat për hapjen e herës së parë",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme ",
+    "Password" : "Fjalëkalim",
+    "Your password was changed" : "fjalëkalimi juaj u ndryshua",
+    "Unable to change your password" : "Nuk është e mundur të ndryshohet fjalëkalimi",
+    "Current password" : "Fjalëkalimi aktual",
+    "New password" : "Fjalëkalimi i ri",
+    "Change password" : "Ndrysho fjalëkalimin",
+    "Full Name" : "Emri i plotë",
+    "Email" : "Email",
+    "Your email address" : "Adresa juaj email",
+    "Profile picture" : "Foto Profili",
+    "Remove image" : "Fshi imazh",
+    "Cancel" : "Anullo",
+    "Choose as profile image" : "Vendos si foto profili",
+    "Language" : "Gjuha",
+    "Help translate" : "Ndihmoni në përkthim",
+    "Log-in password" : "Fjalëkalimi i hyrjes",
+    "Login Name" : "Emri i Përdoruesit",
+    "Create" : "Krijo",
+    "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
+    "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
+    "Search Users and Groups" : "Kërko Përdorues apo Grupe",
+    "Add Group" : "Shto Grup",
+    "Group" : "Grup",
+    "Everyone" : "Të gjithë",
+    "Unlimited" : "E pakufizuar",
+    "Other" : "Tjetër",
+    "Username" : "Përdoruesi",
+    "Last Login" : "Hyrja e fundit",
+    "change full name" : "ndrysho emrin e plotë",
+    "set new password" : "vendos fjalëkalim të ri",
+    "Default" : "Paracaktuar"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/sq.php b/settings/l10n/sq.php
deleted file mode 100644
index e09d1ed128b..00000000000
--- a/settings/l10n/sq.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Gabim autentifikimi",
-"Group already exists" => "Grupi ekziston",
-"Unable to add group" => "E pamundur të shtohet grupi",
-"Email saved" => "Email u ruajt",
-"Invalid email" => "Email jo i vlefshëm",
-"Unable to delete group" => "E pamundur të fshihet grupi",
-"Unable to delete user" => "E pamundur të fshihet përdoruesi",
-"Language changed" => "Gjuha u ndryshua",
-"Invalid request" => "Kërkesë e pavlefshme",
-"Admins can't remove themself from the admin group" => "Administratorët nuk mund të heqin vehten prej grupit admin",
-"Unable to add user to group %s" => "E pamundur t'i shtohet përdoruesi grupit %s",
-"Unable to remove user from group %s" => "E pamundur të hiqet përdoruesi nga grupi %s",
-"Couldn't update app." => "E pamundur të përditësohet app.",
-"Wrong password" => "Fjalëkalim i gabuar",
-"Unable to change password" => "Fjalëkalimi nuk mund të ndryshohet",
-"Saved" => "U ruajt",
-"Email sent" => "Email-i u dërgua",
-"Sending..." => "Duke dërguar",
-"All" => "Të gjitha",
-"Please wait...." => "Ju lutem prisni...",
-"Disable" => "Çaktivizo",
-"Enable" => "Aktivizo",
-"Updating...." => "Duke përditësuar...",
-"Error while updating app" => "Gabim gjatë përditësimit të app",
-"Updated" => "I përditësuar",
-"Select a profile picture" => "Zgjidh një foto profili",
-"Delete" => "Fshi",
-"Groups" => "Grupet",
-"deleted {groupName}" => "u fshi {groupName}",
-"undo" => "anullo veprimin",
-"never" => "asnjëherë",
-"deleted {userName}" => "u fshi {userName}",
-"add group" => "shto grup",
-"A valid username must be provided" => "Duhet të jepni një emër të vlefshëm përdoruesi",
-"Error creating user" => "Gabim gjatë krijimit të përdoruesit",
-"A valid password must be provided" => "Duhet të jepni një fjalëkalim te vlefshëm",
-"__language_name__" => "Shqip",
-"Encryption" => "Kodifikimi",
-"None" => "Asgjë",
-"Login" => "Hyr",
-"Security Warning" => "Njoftim për sigurinë",
-"Setup Warning" => "Lajmërim konfigurimi",
-"Module 'fileinfo' missing" => "Mungon moduli 'fileinfo'",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
-"Locale not working" => "Locale nuk është funksional",
-"Please double check the <a href='%s'>installation guides</a>." => "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
-"Sharing" => "Ndarje",
-"Allow apps to use the Share API" => "Lejoni aplikacionet të përdorin share API",
-"Allow public uploads" => "Lejo ngarkimin publik",
-"Expire after " => "Skadon pas",
-"days" => "diitë",
-"Allow resharing" => "Lejo ri-ndarjen",
-"Security" => "Siguria",
-"Enforce HTTPS" => "Detyro HTTPS",
-"Send mode" => "Mënyra e dërgimit",
-"From address" => "Nga adresa",
-"mail" => "postë",
-"Server address" => "Adresa e serverit",
-"Port" => "Porta",
-"Credentials" => "Kredencialet",
-"Send email" => "Dërgo email",
-"Log" => "Historik aktiviteti",
-"Log level" => "Niveli i Historikut",
-"More" => "Më tepër",
-"Less" => "M'pak",
-"Version" => "Versioni",
-"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>." => "Zhvilluar nga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Komuniteti OwnCloud</a>, gjithashtu <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> është licensuar me anë të <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "nga",
-"Documentation:" => "Dokumentacioni:",
-"User Documentation" => "Dokumentacion përdoruesi",
-"Administrator Documentation" => "Dokumentacion administratori",
-"Online Documentation" => "Dokumentacion online",
-"Forum" => "Forumi",
-"Bugtracker" => "Bugtracker - ndjekja e problemeve",
-"Commercial Support" => "Suport komercial",
-"Get the apps to sync your files" => "Bëni që aplikacionet të sinkronizojnë skedarët tuaj",
-"Show First Run Wizard again" => "Rishfaq përsëri fazat për hapjen e herës së parë",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ju keni përdorur <strong>%s</strong> nga <strong>%s</strong> të mundshme ",
-"Password" => "Fjalëkalim",
-"Your password was changed" => "fjalëkalimi juaj u ndryshua",
-"Unable to change your password" => "Nuk është e mundur të ndryshohet fjalëkalimi",
-"Current password" => "Fjalëkalimi aktual",
-"New password" => "Fjalëkalimi i ri",
-"Change password" => "Ndrysho fjalëkalimin",
-"Full Name" => "Emri i plotë",
-"Email" => "Email",
-"Your email address" => "Adresa juaj email",
-"Profile picture" => "Foto Profili",
-"Remove image" => "Fshi imazh",
-"Cancel" => "Anullo",
-"Choose as profile image" => "Vendos si foto profili",
-"Language" => "Gjuha",
-"Help translate" => "Ndihmoni në përkthim",
-"Log-in password" => "Fjalëkalimi i hyrjes",
-"Login Name" => "Emri i Përdoruesit",
-"Create" => "Krijo",
-"Admin Recovery Password" => "Rigjetja e fjalëkalimit të Admin",
-"Enter the recovery password in order to recover the users files during password change" => "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
-"Search Users and Groups" => "Kërko Përdorues apo Grupe",
-"Add Group" => "Shto Grup",
-"Group" => "Grup",
-"Everyone" => "Të gjithë",
-"Unlimited" => "E pakufizuar",
-"Other" => "Tjetër",
-"Username" => "Përdoruesi",
-"Last Login" => "Hyrja e fundit",
-"change full name" => "ndrysho emrin e plotë",
-"set new password" => "vendos fjalëkalim të ri",
-"Default" => "Paracaktuar"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
new file mode 100644
index 00000000000..e978e45a02f
--- /dev/null
+++ b/settings/l10n/sr.js
@@ -0,0 +1,88 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Грешка при провери идентитета",
+    "Group already exists" : "Група већ постоји",
+    "Unable to add group" : "Не могу да додам групу",
+    "Email saved" : "Е-порука сачувана",
+    "Invalid email" : "Неисправна е-адреса",
+    "Unable to delete group" : "Не могу да уклоним групу",
+    "Unable to delete user" : "Не могу да уклоним корисника",
+    "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." : "Не могу да ажурирам апликацију.",
+    "Email sent" : "Порука је послата",
+    "Please wait...." : "Сачекајте…",
+    "Disable" : "Искључи",
+    "Enable" : "Омогући",
+    "Updating...." : "Ажурирам…",
+    "Error while updating app" : "Грешка при ажурирању апликације",
+    "Updated" : "Ажурирано",
+    "Delete" : "Обриши",
+    "Groups" : "Групе",
+    "undo" : "опозови",
+    "never" : "никада",
+    "add group" : "додај групу",
+    "A valid username must be provided" : "Морате унети исправно корисничко име",
+    "Error creating user" : "Грешка при прављењу корисника",
+    "A valid password must be provided" : "Морате унети исправну лозинку",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "Шифровање",
+    "None" : "Ништа",
+    "Login" : "Пријави ме",
+    "Security Warning" : "Сигурносно упозорење",
+    "Setup Warning" : "Упозорење о подешавању",
+    "Module 'fileinfo' missing" : "Недостаје модул „fileinfo“",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста.",
+    "Locale not working" : "Локализација не ради",
+    "Please double check the <a href='%s'>installation guides</a>." : "Погледајте <a href='%s'>водиче за инсталацију</a>.",
+    "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
+    "Sharing" : "Дељење",
+    "Allow apps to use the Share API" : "Дозвољава апликацијама да користе API Share",
+    "Allow resharing" : "Дозволи поновно дељење",
+    "Security" : "Безбедност",
+    "Enforce HTTPS" : "Наметни HTTPS",
+    "Server address" : "Адреса сервера",
+    "Port" : "Порт",
+    "Log" : "Бележење",
+    "Log level" : "Ниво бележења",
+    "More" : "Више",
+    "Less" : "Мање",
+    "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>." : "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>.",
+    "by" : "од",
+    "User Documentation" : "Корисничка документација",
+    "Administrator Documentation" : "Администраторска документација",
+    "Online Documentation" : "Мрежна документација",
+    "Forum" : "Форум",
+    "Bugtracker" : "Праћење грешака",
+    "Commercial Support" : "Комерцијална подршка",
+    "Get the apps to sync your files" : "Преузмите апликације ради синхронизовања датотека",
+    "Show First Run Wizard again" : "Поново прикажи чаробњак за прво покретање",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>",
+    "Password" : "Лозинка",
+    "Your password was changed" : "Лозинка је промењена",
+    "Unable to change your password" : "Не могу да изменим вашу лозинку",
+    "Current password" : "Тренутна лозинка",
+    "New password" : "Нова лозинка",
+    "Change password" : "Измени лозинку",
+    "Email" : "Е-пошта",
+    "Your email address" : "Ваша адреса е-поште",
+    "Cancel" : "Откажи",
+    "Language" : "Језик",
+    "Help translate" : " Помозите у превођењу",
+    "Login Name" : "Корисничко име",
+    "Create" : "Направи",
+    "Group" : "Група",
+    "Default Quota" : "Подразумевано ограничење",
+    "Unlimited" : "Неограничено",
+    "Other" : "Друго",
+    "Username" : "Корисничко име",
+    "Quota" : "Ограничење",
+    "set new password" : "постави нову лозинку",
+    "Default" : "Подразумевано"
+},
+"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/settings/l10n/sr.json b/settings/l10n/sr.json
new file mode 100644
index 00000000000..3d9c23be8ba
--- /dev/null
+++ b/settings/l10n/sr.json
@@ -0,0 +1,86 @@
+{ "translations": {
+    "Authentication error" : "Грешка при провери идентитета",
+    "Group already exists" : "Група већ постоји",
+    "Unable to add group" : "Не могу да додам групу",
+    "Email saved" : "Е-порука сачувана",
+    "Invalid email" : "Неисправна е-адреса",
+    "Unable to delete group" : "Не могу да уклоним групу",
+    "Unable to delete user" : "Не могу да уклоним корисника",
+    "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." : "Не могу да ажурирам апликацију.",
+    "Email sent" : "Порука је послата",
+    "Please wait...." : "Сачекајте…",
+    "Disable" : "Искључи",
+    "Enable" : "Омогући",
+    "Updating...." : "Ажурирам…",
+    "Error while updating app" : "Грешка при ажурирању апликације",
+    "Updated" : "Ажурирано",
+    "Delete" : "Обриши",
+    "Groups" : "Групе",
+    "undo" : "опозови",
+    "never" : "никада",
+    "add group" : "додај групу",
+    "A valid username must be provided" : "Морате унети исправно корисничко име",
+    "Error creating user" : "Грешка при прављењу корисника",
+    "A valid password must be provided" : "Морате унети исправну лозинку",
+    "__language_name__" : "__language_name__",
+    "Encryption" : "Шифровање",
+    "None" : "Ништа",
+    "Login" : "Пријави ме",
+    "Security Warning" : "Сигурносно упозорење",
+    "Setup Warning" : "Упозорење о подешавању",
+    "Module 'fileinfo' missing" : "Недостаје модул „fileinfo“",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста.",
+    "Locale not working" : "Локализација не ради",
+    "Please double check the <a href='%s'>installation guides</a>." : "Погледајте <a href='%s'>водиче за инсталацију</a>.",
+    "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
+    "Sharing" : "Дељење",
+    "Allow apps to use the Share API" : "Дозвољава апликацијама да користе API Share",
+    "Allow resharing" : "Дозволи поновно дељење",
+    "Security" : "Безбедност",
+    "Enforce HTTPS" : "Наметни HTTPS",
+    "Server address" : "Адреса сервера",
+    "Port" : "Порт",
+    "Log" : "Бележење",
+    "Log level" : "Ниво бележења",
+    "More" : "Више",
+    "Less" : "Мање",
+    "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>." : "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>.",
+    "by" : "од",
+    "User Documentation" : "Корисничка документација",
+    "Administrator Documentation" : "Администраторска документација",
+    "Online Documentation" : "Мрежна документација",
+    "Forum" : "Форум",
+    "Bugtracker" : "Праћење грешака",
+    "Commercial Support" : "Комерцијална подршка",
+    "Get the apps to sync your files" : "Преузмите апликације ради синхронизовања датотека",
+    "Show First Run Wizard again" : "Поново прикажи чаробњак за прво покретање",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>",
+    "Password" : "Лозинка",
+    "Your password was changed" : "Лозинка је промењена",
+    "Unable to change your password" : "Не могу да изменим вашу лозинку",
+    "Current password" : "Тренутна лозинка",
+    "New password" : "Нова лозинка",
+    "Change password" : "Измени лозинку",
+    "Email" : "Е-пошта",
+    "Your email address" : "Ваша адреса е-поште",
+    "Cancel" : "Откажи",
+    "Language" : "Језик",
+    "Help translate" : " Помозите у превођењу",
+    "Login Name" : "Корисничко име",
+    "Create" : "Направи",
+    "Group" : "Група",
+    "Default Quota" : "Подразумевано ограничење",
+    "Unlimited" : "Неограничено",
+    "Other" : "Друго",
+    "Username" : "Корисничко име",
+    "Quota" : "Ограничење",
+    "set new password" : "постави нову лозинку",
+    "Default" : "Подразумевано"
+},"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/settings/l10n/sr.php b/settings/l10n/sr.php
deleted file mode 100644
index eced1165e82..00000000000
--- a/settings/l10n/sr.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Грешка при провери идентитета",
-"Group already exists" => "Група већ постоји",
-"Unable to add group" => "Не могу да додам групу",
-"Email saved" => "Е-порука сачувана",
-"Invalid email" => "Неисправна е-адреса",
-"Unable to delete group" => "Не могу да уклоним групу",
-"Unable to delete user" => "Не могу да уклоним корисника",
-"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." => "Не могу да ажурирам апликацију.",
-"Email sent" => "Порука је послата",
-"Please wait...." => "Сачекајте…",
-"Disable" => "Искључи",
-"Enable" => "Омогући",
-"Updating...." => "Ажурирам…",
-"Error while updating app" => "Грешка при ажурирању апликације",
-"Updated" => "Ажурирано",
-"Delete" => "Обриши",
-"Groups" => "Групе",
-"undo" => "опозови",
-"never" => "никада",
-"add group" => "додај групу",
-"A valid username must be provided" => "Морате унети исправно корисничко име",
-"Error creating user" => "Грешка при прављењу корисника",
-"A valid password must be provided" => "Морате унети исправну лозинку",
-"__language_name__" => "__language_name__",
-"Encryption" => "Шифровање",
-"None" => "Ништа",
-"Login" => "Пријави ме",
-"Security Warning" => "Сигурносно упозорење",
-"Setup Warning" => "Упозорење о подешавању",
-"Module 'fileinfo' missing" => "Недостаје модул „fileinfo“",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "Недостаје PHP модул „fileinfo“. Препоручујемо вам да га омогућите да бисте добили најбоље резултате с откривањем MIME врста.",
-"Locale not working" => "Локализација не ради",
-"Please double check the <a href='%s'>installation guides</a>." => "Погледајте <a href='%s'>водиче за инсталацију</a>.",
-"Execute one task with each page loaded" => "Изврши један задатак са сваком учитаном страницом",
-"Sharing" => "Дељење",
-"Allow apps to use the Share API" => "Дозвољава апликацијама да користе API Share",
-"Allow resharing" => "Дозволи поновно дељење",
-"Security" => "Безбедност",
-"Enforce HTTPS" => "Наметни HTTPS",
-"Server address" => "Адреса сервера",
-"Port" => "Порт",
-"Log" => "Бележење",
-"Log level" => "Ниво бележења",
-"More" => "Више",
-"Less" => "Мање",
-"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>." => "Развијају <a href=\"http://ownCloud.org/contact\" target=\"_blank\">Оунклауд (ownCloud) заједница</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">изворни код</a> је издат под <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Аферо Јавном Лиценцом (Affero General Public License)\">АГПЛ лиценцом</abbr></a>.",
-"by" => "од",
-"User Documentation" => "Корисничка документација",
-"Administrator Documentation" => "Администраторска документација",
-"Online Documentation" => "Мрежна документација",
-"Forum" => "Форум",
-"Bugtracker" => "Праћење грешака",
-"Commercial Support" => "Комерцијална подршка",
-"Get the apps to sync your files" => "Преузмите апликације ради синхронизовања датотека",
-"Show First Run Wizard again" => "Поново прикажи чаробњак за прво покретање",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Искористили сте <strong>%s</strong> од дозвољених <strong>%s</strong>",
-"Password" => "Лозинка",
-"Your password was changed" => "Лозинка је промењена",
-"Unable to change your password" => "Не могу да изменим вашу лозинку",
-"Current password" => "Тренутна лозинка",
-"New password" => "Нова лозинка",
-"Change password" => "Измени лозинку",
-"Email" => "Е-пошта",
-"Your email address" => "Ваша адреса е-поште",
-"Cancel" => "Откажи",
-"Language" => "Језик",
-"Help translate" => " Помозите у превођењу",
-"Login Name" => "Корисничко име",
-"Create" => "Направи",
-"Group" => "Група",
-"Default Quota" => "Подразумевано ограничење",
-"Unlimited" => "Неограничено",
-"Other" => "Друго",
-"Username" => "Корисничко име",
-"Quota" => "Ограничење",
-"set new password" => "постави нову лозинку",
-"Default" => "Подразумевано"
-);
-$PLURAL_FORMS = "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/settings/l10n/sr@latin.js b/settings/l10n/sr@latin.js
new file mode 100644
index 00000000000..1a85ab01f37
--- /dev/null
+++ b/settings/l10n/sr@latin.js
@@ -0,0 +1,30 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "Greška pri autentifikaciji",
+    "Language changed" : "Jezik je izmenjen",
+    "Invalid request" : "Neispravan zahtev",
+    "Email sent" : "Email poslat",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Osrednja lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Delete" : "Obriši",
+    "Groups" : "Grupe",
+    "Security Warning" : "Bezbednosno upozorenje",
+    "by" : "od",
+    "Password" : "Lozinka",
+    "Unable to change your password" : "Ne mogu da izmenim vašu lozinku",
+    "Current password" : "Trenutna lozinka",
+    "New password" : "Nova lozinka",
+    "Change password" : "Izmeni lozinku",
+    "Email" : "E-mail",
+    "Cancel" : "Otkaži",
+    "Language" : "Jezik",
+    "Create" : "Napravi",
+    "Group" : "Grupa",
+    "Other" : "Drugo",
+    "Username" : "Korisničko ime"
+},
+"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/settings/l10n/sr@latin.json b/settings/l10n/sr@latin.json
new file mode 100644
index 00000000000..654c8ded122
--- /dev/null
+++ b/settings/l10n/sr@latin.json
@@ -0,0 +1,28 @@
+{ "translations": {
+    "Authentication error" : "Greška pri autentifikaciji",
+    "Language changed" : "Jezik je izmenjen",
+    "Invalid request" : "Neispravan zahtev",
+    "Email sent" : "Email poslat",
+    "Very weak password" : "Veoma slaba lozinka",
+    "Weak password" : "Slaba lozinka",
+    "So-so password" : "Osrednja lozinka",
+    "Good password" : "Dobra lozinka",
+    "Strong password" : "Jaka lozinka",
+    "Delete" : "Obriši",
+    "Groups" : "Grupe",
+    "Security Warning" : "Bezbednosno upozorenje",
+    "by" : "od",
+    "Password" : "Lozinka",
+    "Unable to change your password" : "Ne mogu da izmenim vašu lozinku",
+    "Current password" : "Trenutna lozinka",
+    "New password" : "Nova lozinka",
+    "Change password" : "Izmeni lozinku",
+    "Email" : "E-mail",
+    "Cancel" : "Otkaži",
+    "Language" : "Jezik",
+    "Create" : "Napravi",
+    "Group" : "Grupa",
+    "Other" : "Drugo",
+    "Username" : "Korisničko ime"
+},"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/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
deleted file mode 100644
index 7116283bed3..00000000000
--- a/settings/l10n/sr@latin.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "Greška pri autentifikaciji",
-"Language changed" => "Jezik je izmenjen",
-"Invalid request" => "Neispravan zahtev",
-"Email sent" => "Email poslat",
-"Very weak password" => "Veoma slaba lozinka",
-"Weak password" => "Slaba lozinka",
-"So-so password" => "Osrednja lozinka",
-"Good password" => "Dobra lozinka",
-"Strong password" => "Jaka lozinka",
-"Delete" => "Obriši",
-"Groups" => "Grupe",
-"Security Warning" => "Bezbednosno upozorenje",
-"by" => "od",
-"Password" => "Lozinka",
-"Unable to change your password" => "Ne mogu da izmenim vašu lozinku",
-"Current password" => "Trenutna lozinka",
-"New password" => "Nova lozinka",
-"Change password" => "Izmeni lozinku",
-"Email" => "E-mail",
-"Cancel" => "Otkaži",
-"Language" => "Jezik",
-"Create" => "Napravi",
-"Group" => "Grupa",
-"Other" => "Drugo",
-"Username" => "Korisničko ime"
-);
-$PLURAL_FORMS = "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/settings/l10n/sv.js b/settings/l10n/sv.js
new file mode 100644
index 00000000000..3ca7dd28c9e
--- /dev/null
+++ b/settings/l10n/sv.js
@@ -0,0 +1,218 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Aktiverad",
+    "Not enabled" : "Inte aktiverad",
+    "Recommended" : "Rekomenderad",
+    "Authentication error" : "Fel vid autentisering",
+    "Your full name has been changed." : "Hela ditt namn har ändrats",
+    "Unable to change full name" : "Kunde inte ändra hela namnet",
+    "Group already exists" : "Gruppen finns redan",
+    "Unable to add group" : "Kan inte lägga till grupp",
+    "Files decrypted successfully" : "Filerna dekrypterades utan fel",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
+    "Couldn't decrypt your files, check your password and try again" : "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
+    "Encryption keys deleted permanently" : "Krypteringsnycklar raderades permanent",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
+    "Couldn't remove app." : "Kunde inte ta bort applikationen.",
+    "Email saved" : "E-post sparad",
+    "Invalid email" : "Ogiltig e-post",
+    "Unable to delete group" : "Kan inte radera grupp",
+    "Unable to delete user" : "Kan inte radera användare",
+    "Backups restored successfully" : "Återställning av säkerhetskopior lyckades",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
+    "Language changed" : "Språk ändrades",
+    "Invalid request" : "Ogiltig begäran",
+    "Admins can't remove themself from the admin group" : "Administratörer kan inte ta bort sig själva från admingruppen",
+    "Unable to add user to group %s" : "Kan inte lägga till användare i gruppen %s",
+    "Unable to remove user from group %s" : "Kan inte radera användare från gruppen %s",
+    "Couldn't update app." : "Kunde inte uppdatera appen.",
+    "Wrong password" : "Fel lösenord",
+    "No user supplied" : "Ingen användare angiven",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
+    "Wrong admin recovery password. Please check the password and try again." : "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
+    "Unable to change password" : "Kunde inte ändra lösenord",
+    "Saved" : "Sparad",
+    "test email settings" : "testa e-post inställningar",
+    "If you received this email, the settings seem to be correct." : "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
+    "Email sent" : "E-post skickat",
+    "You need to set your user email before being able to send test emails." : "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
+    "Add trusted domain" : "Lägg till trusted domain",
+    "Sending..." : "Skickar...",
+    "All" : "Alla",
+    "Please wait...." : "Var god vänta...",
+    "Error while disabling app" : "Fel vid inaktivering av app",
+    "Disable" : "Deaktivera",
+    "Enable" : "Aktivera",
+    "Error while enabling app" : "Fel vid aktivering av app",
+    "Updating...." : "Uppdaterar...",
+    "Error while updating app" : "Fel uppstod vid uppdatering av appen",
+    "Updated" : "Uppdaterad",
+    "Uninstalling ...." : "Avinstallerar ....",
+    "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades",
+    "Uninstall" : "Avinstallera",
+    "Select a profile picture" : "Välj en profilbild",
+    "Very weak password" : "Väldigt svagt lösenord",
+    "Weak password" : "Svagt lösenord",
+    "So-so password" : "Okej lösenord",
+    "Good password" : "Bra lösenord",
+    "Strong password" : "Starkt lösenord",
+    "Valid until {date}" : "Giltig t.o.m. {date}",
+    "Delete" : "Radera",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
+    "Delete encryption keys permanently." : "Radera krypteringsnycklar permanent",
+    "Restore encryption keys." : "Återställ krypteringsnycklar",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kunde inte radera {objName}",
+    "Error creating group" : "Fel vid skapande av grupp",
+    "A valid group name must be provided" : "Ett giltigt gruppnamn måste anges",
+    "deleted {groupName}" : "raderade {groupName} ",
+    "undo" : "ångra",
+    "never" : "aldrig",
+    "deleted {userName}" : "raderade {userName}",
+    "add group" : "lägg till grupp",
+    "A valid username must be provided" : "Ett giltigt användarnamn måste anges",
+    "Error creating user" : "Fel vid skapande av användare",
+    "A valid password must be provided" : "Ett giltigt lösenord måste anges",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varning: Hem katalogen för varje användare \"{användare}\" finns redan",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL rotcertifikat",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
+    "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
+    "Errors and fatal issues" : "Fel och allvarliga fel",
+    "Fatal issues only" : "Endast allvarliga fel",
+    "None" : "Ingen",
+    "Login" : "Logga in",
+    "Plain" : "Enkel",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Säkerhetsvarning",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du ansluter till %s via HTTP. Vi rekommenderar starkt att du konfigurerar din server att använda HTTPS istället.",
+    "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." : "Din datakatalog och dina filer är förmodligen åtkomliga från internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver så att datakatalogen inte längre är åtkomlig eller du flyttar datakatalogen utanför webbserverns rotkatalog.",
+    "Setup Warning" : "Installationsvarning",
+    "Database Performance Info" : "Databasprestanda Information",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulen \"fileinfo\" saknas",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
+    "Your PHP version is outdated" : "Din PHP version är föråldrad",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt.",
+    "Locale not working" : "Locale fungerar inte",
+    "System locale can not be set to a one which supports UTF-8." : "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
+    "Please double check the <a href='%s'>installation guides</a>." : "Var god kontrollera <a href='%s'>installationsguiden</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Sista cron kördes vid %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
+    "Cron was not executed yet!" : "Cron kördes inte ännu!",
+    "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
+    "Sharing" : "Dela",
+    "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API",
+    "Allow users to share via link" : "Tillåt användare att dela via länk",
+    "Enforce password protection" : "Tillämpa lösenordskydd",
+    "Allow public uploads" : "Tillåt offentlig uppladdning",
+    "Set default expiration date" : "Ställ in standardutgångsdatum",
+    "Expire after " : "Förfaller efter",
+    "days" : "dagar",
+    "Enforce expiration date" : "Tillämpa förfallodatum",
+    "Allow resharing" : "Tillåt vidaredelning",
+    "Restrict users to only share with users in their groups" : "Begränsa användare till att enbart kunna dela med användare i deras grupper",
+    "Allow users to send mail notification for shared files" : "Tillåt användare att skicka mailnotifieringar för delade filer",
+    "Exclude groups from sharing" : "Exkludera grupp från att dela",
+    "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
+    "Security" : "Säkerhet",
+    "Enforce HTTPS" : "Kräv HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL",
+    "Email Server" : "E-postserver",
+    "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
+    "Send mode" : "Sändningsläge",
+    "From address" : "Från adress",
+    "mail" : "mail",
+    "Authentication method" : "Autentiseringsmetod",
+    "Authentication required" : "Autentisering krävs",
+    "Server address" : "Serveradress",
+    "Port" : "Port",
+    "Credentials" : "Inloggningsuppgifter",
+    "SMTP Username" : "SMTP användarnamn",
+    "SMTP Password" : "SMTP lösenord",
+    "Test email settings" : "Testa e-post inställningar",
+    "Send email" : "Skicka e-post",
+    "Log" : "Logg",
+    "Log level" : "Nivå på loggning",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "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>." : "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Fler appar",
+    "by" : "av",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Användardokumentation",
+    "Admin Documentation" : "Administratörsdokumentation",
+    "Update to %s" : "Uppdatera till %s",
+    "Enable only for specific groups" : "Aktivera endast för specifika grupper",
+    "Uninstall App" : "Avinstallera Applikation",
+    "Administrator Documentation" : "Administratörsdokumentation",
+    "Online Documentation" : "Onlinedokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommersiell support",
+    "Get the apps to sync your files" : "Skaffa apparna för att synkronisera dina filer",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Om du vill stödja projektet\n<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">hjälp till med utvecklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sprid budskapet vidare</a>!",
+    "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
+    "Password" : "Lösenord",
+    "Your password was changed" : "Ditt lösenord har ändrats",
+    "Unable to change your password" : "Kunde inte ändra ditt lösenord",
+    "Current password" : "Nuvarande lösenord",
+    "New password" : "Nytt lösenord",
+    "Change password" : "Ändra lösenord",
+    "Full Name" : "Hela namnet",
+    "Email" : "E-post",
+    "Your email address" : "Din e-postadress",
+    "Fill in an email address to enable password recovery and receive notifications" : "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
+    "Profile picture" : "Profilbild",
+    "Upload new" : "Ladda upp ny",
+    "Select new from Files" : "Välj ny från filer",
+    "Remove image" : "Radera bild",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den.",
+    "Your avatar is provided by your original account." : "Din avatar tillhandahålls av ditt ursprungliga konto.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Välj som profilbild",
+    "Language" : "Språk",
+    "Help translate" : "Hjälp att översätta",
+    "Import Root Certificate" : "Importera rotcertifikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
+    "Log-in password" : "Inloggningslösenord",
+    "Decrypt all Files" : "Dekryptera alla filer",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
+    "Restore Encryption Keys" : "Återställ krypteringsnycklar",
+    "Delete Encryption Keys" : "Radera krypteringsnycklar",
+    "Login Name" : "Inloggningsnamn",
+    "Create" : "Skapa",
+    "Admin Recovery Password" : "Admin återställningslösenord",
+    "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
+    "Search Users and Groups" : "Sök Användare och Grupper",
+    "Add Group" : "Lägg till Grupp",
+    "Group" : "Grupp",
+    "Everyone" : "Alla",
+    "Admins" : "Administratörer",
+    "Default Quota" : "Förvald datakvot",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
+    "Unlimited" : "Obegränsad",
+    "Other" : "Annat",
+    "Username" : "Användarnamn",
+    "Quota" : "Kvot",
+    "Storage Location" : "Lagringsplats",
+    "Last Login" : "Senaste inloggning",
+    "change full name" : "ändra hela namnet",
+    "set new password" : "ange nytt lösenord",
+    "Default" : "Förvald"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
new file mode 100644
index 00000000000..9229d8fb670
--- /dev/null
+++ b/settings/l10n/sv.json
@@ -0,0 +1,216 @@
+{ "translations": {
+    "Enabled" : "Aktiverad",
+    "Not enabled" : "Inte aktiverad",
+    "Recommended" : "Rekomenderad",
+    "Authentication error" : "Fel vid autentisering",
+    "Your full name has been changed." : "Hela ditt namn har ändrats",
+    "Unable to change full name" : "Kunde inte ändra hela namnet",
+    "Group already exists" : "Gruppen finns redan",
+    "Unable to add group" : "Kan inte lägga till grupp",
+    "Files decrypted successfully" : "Filerna dekrypterades utan fel",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
+    "Couldn't decrypt your files, check your password and try again" : "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
+    "Encryption keys deleted permanently" : "Krypteringsnycklar raderades permanent",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
+    "Couldn't remove app." : "Kunde inte ta bort applikationen.",
+    "Email saved" : "E-post sparad",
+    "Invalid email" : "Ogiltig e-post",
+    "Unable to delete group" : "Kan inte radera grupp",
+    "Unable to delete user" : "Kan inte radera användare",
+    "Backups restored successfully" : "Återställning av säkerhetskopior lyckades",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
+    "Language changed" : "Språk ändrades",
+    "Invalid request" : "Ogiltig begäran",
+    "Admins can't remove themself from the admin group" : "Administratörer kan inte ta bort sig själva från admingruppen",
+    "Unable to add user to group %s" : "Kan inte lägga till användare i gruppen %s",
+    "Unable to remove user from group %s" : "Kan inte radera användare från gruppen %s",
+    "Couldn't update app." : "Kunde inte uppdatera appen.",
+    "Wrong password" : "Fel lösenord",
+    "No user supplied" : "Ingen användare angiven",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
+    "Wrong admin recovery password. Please check the password and try again." : "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
+    "Unable to change password" : "Kunde inte ändra lösenord",
+    "Saved" : "Sparad",
+    "test email settings" : "testa e-post inställningar",
+    "If you received this email, the settings seem to be correct." : "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
+    "Email sent" : "E-post skickat",
+    "You need to set your user email before being able to send test emails." : "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
+    "Add trusted domain" : "Lägg till trusted domain",
+    "Sending..." : "Skickar...",
+    "All" : "Alla",
+    "Please wait...." : "Var god vänta...",
+    "Error while disabling app" : "Fel vid inaktivering av app",
+    "Disable" : "Deaktivera",
+    "Enable" : "Aktivera",
+    "Error while enabling app" : "Fel vid aktivering av app",
+    "Updating...." : "Uppdaterar...",
+    "Error while updating app" : "Fel uppstod vid uppdatering av appen",
+    "Updated" : "Uppdaterad",
+    "Uninstalling ...." : "Avinstallerar ....",
+    "Error while uninstalling app" : "Ett fel inträffade när applikatonen avinstallerades",
+    "Uninstall" : "Avinstallera",
+    "Select a profile picture" : "Välj en profilbild",
+    "Very weak password" : "Väldigt svagt lösenord",
+    "Weak password" : "Svagt lösenord",
+    "So-so password" : "Okej lösenord",
+    "Good password" : "Bra lösenord",
+    "Strong password" : "Starkt lösenord",
+    "Valid until {date}" : "Giltig t.o.m. {date}",
+    "Delete" : "Radera",
+    "Decrypting files... Please wait, this can take some time." : "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
+    "Delete encryption keys permanently." : "Radera krypteringsnycklar permanent",
+    "Restore encryption keys." : "Återställ krypteringsnycklar",
+    "Groups" : "Grupper",
+    "Unable to delete {objName}" : "Kunde inte radera {objName}",
+    "Error creating group" : "Fel vid skapande av grupp",
+    "A valid group name must be provided" : "Ett giltigt gruppnamn måste anges",
+    "deleted {groupName}" : "raderade {groupName} ",
+    "undo" : "ångra",
+    "never" : "aldrig",
+    "deleted {userName}" : "raderade {userName}",
+    "add group" : "lägg till grupp",
+    "A valid username must be provided" : "Ett giltigt användarnamn måste anges",
+    "Error creating user" : "Fel vid skapande av användare",
+    "A valid password must be provided" : "Ett giltigt lösenord måste anges",
+    "Warning: Home directory for user \"{user}\" already exists" : "Varning: Hem katalogen för varje användare \"{användare}\" finns redan",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL rotcertifikat",
+    "Encryption" : "Kryptering",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Allting (allvarliga fel, fel, varningar, info, debug)",
+    "Info, warnings, errors and fatal issues" : "Info, varningar och allvarliga fel",
+    "Warnings, errors and fatal issues" : "Varningar, fel och allvarliga fel",
+    "Errors and fatal issues" : "Fel och allvarliga fel",
+    "Fatal issues only" : "Endast allvarliga fel",
+    "None" : "Ingen",
+    "Login" : "Logga in",
+    "Plain" : "Enkel",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Säkerhetsvarning",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du ansluter till %s via HTTP. Vi rekommenderar starkt att du konfigurerar din server att använda HTTPS istället.",
+    "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." : "Din datakatalog och dina filer är förmodligen åtkomliga från internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver så att datakatalogen inte längre är åtkomlig eller du flyttar datakatalogen utanför webbserverns rotkatalog.",
+    "Setup Warning" : "Installationsvarning",
+    "Database Performance Info" : "Databasprestanda Information",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modulen \"fileinfo\" saknas",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
+    "Your PHP version is outdated" : "Din PHP version är föråldrad",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt.",
+    "Locale not working" : "Locale fungerar inte",
+    "System locale can not be set to a one which supports UTF-8." : "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
+    "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
+    "Please double check the <a href='%s'>installation guides</a>." : "Var god kontrollera <a href='%s'>installationsguiden</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Sista cron kördes vid %s",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
+    "Cron was not executed yet!" : "Cron kördes inte ännu!",
+    "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
+    "Sharing" : "Dela",
+    "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API",
+    "Allow users to share via link" : "Tillåt användare att dela via länk",
+    "Enforce password protection" : "Tillämpa lösenordskydd",
+    "Allow public uploads" : "Tillåt offentlig uppladdning",
+    "Set default expiration date" : "Ställ in standardutgångsdatum",
+    "Expire after " : "Förfaller efter",
+    "days" : "dagar",
+    "Enforce expiration date" : "Tillämpa förfallodatum",
+    "Allow resharing" : "Tillåt vidaredelning",
+    "Restrict users to only share with users in their groups" : "Begränsa användare till att enbart kunna dela med användare i deras grupper",
+    "Allow users to send mail notification for shared files" : "Tillåt användare att skicka mailnotifieringar för delade filer",
+    "Exclude groups from sharing" : "Exkludera grupp från att dela",
+    "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
+    "Security" : "Säkerhet",
+    "Enforce HTTPS" : "Kräv HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL",
+    "Email Server" : "E-postserver",
+    "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
+    "Send mode" : "Sändningsläge",
+    "From address" : "Från adress",
+    "mail" : "mail",
+    "Authentication method" : "Autentiseringsmetod",
+    "Authentication required" : "Autentisering krävs",
+    "Server address" : "Serveradress",
+    "Port" : "Port",
+    "Credentials" : "Inloggningsuppgifter",
+    "SMTP Username" : "SMTP användarnamn",
+    "SMTP Password" : "SMTP lösenord",
+    "Test email settings" : "Testa e-post inställningar",
+    "Send email" : "Skicka e-post",
+    "Log" : "Logg",
+    "Log level" : "Nivå på loggning",
+    "More" : "Mer",
+    "Less" : "Mindre",
+    "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>." : "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Fler appar",
+    "by" : "av",
+    "Documentation:" : "Dokumentation:",
+    "User Documentation" : "Användardokumentation",
+    "Admin Documentation" : "Administratörsdokumentation",
+    "Update to %s" : "Uppdatera till %s",
+    "Enable only for specific groups" : "Aktivera endast för specifika grupper",
+    "Uninstall App" : "Avinstallera Applikation",
+    "Administrator Documentation" : "Administratörsdokumentation",
+    "Online Documentation" : "Onlinedokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommersiell support",
+    "Get the apps to sync your files" : "Skaffa apparna för att synkronisera dina filer",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Om du vill stödja projektet\n<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">hjälp till med utvecklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sprid budskapet vidare</a>!",
+    "Show First Run Wizard again" : "Visa Första uppstarts-guiden igen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
+    "Password" : "Lösenord",
+    "Your password was changed" : "Ditt lösenord har ändrats",
+    "Unable to change your password" : "Kunde inte ändra ditt lösenord",
+    "Current password" : "Nuvarande lösenord",
+    "New password" : "Nytt lösenord",
+    "Change password" : "Ändra lösenord",
+    "Full Name" : "Hela namnet",
+    "Email" : "E-post",
+    "Your email address" : "Din e-postadress",
+    "Fill in an email address to enable password recovery and receive notifications" : "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
+    "Profile picture" : "Profilbild",
+    "Upload new" : "Ladda upp ny",
+    "Select new from Files" : "Välj ny från filer",
+    "Remove image" : "Radera bild",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den.",
+    "Your avatar is provided by your original account." : "Din avatar tillhandahålls av ditt ursprungliga konto.",
+    "Cancel" : "Avbryt",
+    "Choose as profile image" : "Välj som profilbild",
+    "Language" : "Språk",
+    "Help translate" : "Hjälp att översätta",
+    "Import Root Certificate" : "Importera rotcertifikat",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
+    "Log-in password" : "Inloggningslösenord",
+    "Decrypt all Files" : "Dekryptera alla filer",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
+    "Restore Encryption Keys" : "Återställ krypteringsnycklar",
+    "Delete Encryption Keys" : "Radera krypteringsnycklar",
+    "Login Name" : "Inloggningsnamn",
+    "Create" : "Skapa",
+    "Admin Recovery Password" : "Admin återställningslösenord",
+    "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
+    "Search Users and Groups" : "Sök Användare och Grupper",
+    "Add Group" : "Lägg till Grupp",
+    "Group" : "Grupp",
+    "Everyone" : "Alla",
+    "Admins" : "Administratörer",
+    "Default Quota" : "Förvald datakvot",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
+    "Unlimited" : "Obegränsad",
+    "Other" : "Annat",
+    "Username" : "Användarnamn",
+    "Quota" : "Kvot",
+    "Storage Location" : "Lagringsplats",
+    "Last Login" : "Senaste inloggning",
+    "change full name" : "ändra hela namnet",
+    "set new password" : "ange nytt lösenord",
+    "Default" : "Förvald"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
deleted file mode 100644
index 60ca3488e04..00000000000
--- a/settings/l10n/sv.php
+++ /dev/null
@@ -1,217 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Aktiverad",
-"Not enabled" => "Inte aktiverad",
-"Recommended" => "Rekomenderad",
-"Authentication error" => "Fel vid autentisering",
-"Your full name has been changed." => "Hela ditt namn har ändrats",
-"Unable to change full name" => "Kunde inte ändra hela namnet",
-"Group already exists" => "Gruppen finns redan",
-"Unable to add group" => "Kan inte lägga till grupp",
-"Files decrypted successfully" => "Filerna dekrypterades utan fel",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Det gick inte att dekryptera dina filer, kontrollera din owncloud.log eller fråga administratören",
-"Couldn't decrypt your files, check your password and try again" => "Det gick inte att dekryptera filerna, kontrollera ditt lösenord och försök igen",
-"Encryption keys deleted permanently" => "Krypteringsnycklar raderades permanent",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Det gick inte att permanent ta bort dina krypteringsnycklar, kontrollera din owncloud.log eller fråga din administratör",
-"Couldn't remove app." => "Kunde inte ta bort applikationen.",
-"Email saved" => "E-post sparad",
-"Invalid email" => "Ogiltig e-post",
-"Unable to delete group" => "Kan inte radera grupp",
-"Unable to delete user" => "Kan inte radera användare",
-"Backups restored successfully" => "Återställning av säkerhetskopior lyckades",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Kan inte återställa dina krypteringsnycklar, vänligen kontrollera din owncloud.log eller fråga din administratör.",
-"Language changed" => "Språk ändrades",
-"Invalid request" => "Ogiltig begäran",
-"Admins can't remove themself from the admin group" => "Administratörer kan inte ta bort sig själva från admingruppen",
-"Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
-"Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
-"Couldn't update app." => "Kunde inte uppdatera appen.",
-"Wrong password" => "Fel lösenord",
-"No user supplied" => "Ingen användare angiven",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Ange ett återställningslösenord för administratören. Annars kommer all användardata förloras",
-"Wrong admin recovery password. Please check the password and try again." => "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
-"Unable to change password" => "Kunde inte ändra lösenord",
-"Saved" => "Sparad",
-"test email settings" => "testa e-post inställningar",
-"If you received this email, the settings seem to be correct." => "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
-"Email sent" => "E-post skickat",
-"You need to set your user email before being able to send test emails." => "Du behöver ställa in din användares e-postadress före du kan skicka test e-post.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Är du verkligen säker på att du vill lägga till \"{domain}\" som en trusted domian?",
-"Add trusted domain" => "Lägg till trusted domain",
-"Sending..." => "Skickar...",
-"All" => "Alla",
-"Please wait...." => "Var god vänta...",
-"Error while disabling app" => "Fel vid inaktivering av app",
-"Disable" => "Deaktivera",
-"Enable" => "Aktivera",
-"Error while enabling app" => "Fel vid aktivering av app",
-"Updating...." => "Uppdaterar...",
-"Error while updating app" => "Fel uppstod vid uppdatering av appen",
-"Updated" => "Uppdaterad",
-"Uninstalling ...." => "Avinstallerar ....",
-"Error while uninstalling app" => "Ett fel inträffade när applikatonen avinstallerades",
-"Uninstall" => "Avinstallera",
-"Select a profile picture" => "Välj en profilbild",
-"Very weak password" => "Väldigt svagt lösenord",
-"Weak password" => "Svagt lösenord",
-"So-so password" => "Okej lösenord",
-"Good password" => "Bra lösenord",
-"Strong password" => "Starkt lösenord",
-"Valid until {date}" => "Giltig t.o.m. {date}",
-"Delete" => "Radera",
-"Decrypting files... Please wait, this can take some time." => "Dekrypterar filer... Vänligen vänta, detta kan ta en stund.",
-"Delete encryption keys permanently." => "Radera krypteringsnycklar permanent",
-"Restore encryption keys." => "Återställ krypteringsnycklar",
-"Groups" => "Grupper",
-"Unable to delete {objName}" => "Kunde inte radera {objName}",
-"Error creating group" => "Fel vid skapande av grupp",
-"A valid group name must be provided" => "Ett giltigt gruppnamn måste anges",
-"deleted {groupName}" => "raderade {groupName} ",
-"undo" => "ångra",
-"never" => "aldrig",
-"deleted {userName}" => "raderade {userName}",
-"add group" => "lägg till grupp",
-"A valid username must be provided" => "Ett giltigt användarnamn måste anges",
-"Error creating user" => "Fel vid skapande av användare",
-"A valid password must be provided" => "Ett giltigt lösenord måste anges",
-"Warning: Home directory for user \"{user}\" already exists" => "Varning: Hem katalogen för varje användare \"{användare}\" finns redan",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL rotcertifikat",
-"Encryption" => "Kryptering",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Allting (allvarliga fel, fel, varningar, info, debug)",
-"Info, warnings, errors and fatal issues" => "Info, varningar och allvarliga fel",
-"Warnings, errors and fatal issues" => "Varningar, fel och allvarliga fel",
-"Errors and fatal issues" => "Fel och allvarliga fel",
-"Fatal issues only" => "Endast allvarliga fel",
-"None" => "Ingen",
-"Login" => "Logga in",
-"Plain" => "Enkel",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Säkerhetsvarning",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Du ansluter till %s via HTTP. Vi rekommenderar starkt att du konfigurerar din server att använda HTTPS istället.",
-"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." => "Din datakatalog och dina filer är förmodligen åtkomliga från internet. Filen .htaccess fungerar inte. Vi rekommenderar starkt att du konfigurerar din webbserver så att datakatalogen inte längre är åtkomlig eller du flyttar datakatalogen utanför webbserverns rotkatalog.",
-"Setup Warning" => "Installationsvarning",
-"Database Performance Info" => "Databasprestanda Information",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite används som databas. För större installationer rekommenderar vi att ändra på detta. För att migrera till en annan databas, använd kommandoverktyget: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modulen \"fileinfo\" saknas",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP-modulen 'fileinfo' saknas. Vi rekommenderar starkt att aktivera den här modulen för att kunna upptäcka korrekt mime-typ.",
-"Your PHP version is outdated" => "Din PHP version är föråldrad",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Din PHP version är föråldrad. Vi rekommenderar starkt att uppdatera till 5.3.8 eller nyare eftersom äldre versioner är obrukbara. Det är möjligt att denna installation inte fungerar korrekt.",
-"Locale not working" => "Locale fungerar inte",
-"System locale can not be set to a one which supports UTF-8." => "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
-"This means that there might be problems with certain characters in file names." => "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
-"We strongly suggest to install the required packages on your system to support one of the following locales: %s." => "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
-"Please double check the <a href='%s'>installation guides</a>." => "Var god kontrollera <a href='%s'>installationsguiden</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Sista cron kördes vid %s",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
-"Cron was not executed yet!" => "Cron kördes inte ännu!",
-"Execute one task with each page loaded" => "Exekvera en uppgift vid varje sidladdning",
-"cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
-"Sharing" => "Dela",
-"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
-"Allow users to share via link" => "Tillåt användare att dela via länk",
-"Enforce password protection" => "Tillämpa lösenordskydd",
-"Allow public uploads" => "Tillåt offentlig uppladdning",
-"Set default expiration date" => "Ställ in standardutgångsdatum",
-"Expire after " => "Förfaller efter",
-"days" => "dagar",
-"Enforce expiration date" => "Tillämpa förfallodatum",
-"Allow resharing" => "Tillåt vidaredelning",
-"Restrict users to only share with users in their groups" => "Begränsa användare till att enbart kunna dela med användare i deras grupper",
-"Allow users to send mail notification for shared files" => "Tillåt användare att skicka mailnotifieringar för delade filer",
-"Exclude groups from sharing" => "Exkludera grupp från att dela",
-"These groups will still be able to receive shares, but not to initiate them." => "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
-"Security" => "Säkerhet",
-"Enforce HTTPS" => "Kräv HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL",
-"Email Server" => "E-postserver",
-"This is used for sending out notifications." => "Detta används för att skicka ut notifieringar.",
-"Send mode" => "Sändningsläge",
-"From address" => "Från adress",
-"mail" => "mail",
-"Authentication method" => "Autentiseringsmetod",
-"Authentication required" => "Autentisering krävs",
-"Server address" => "Serveradress",
-"Port" => "Port",
-"Credentials" => "Inloggningsuppgifter",
-"SMTP Username" => "SMTP användarnamn",
-"SMTP Password" => "SMTP lösenord",
-"Test email settings" => "Testa e-post inställningar",
-"Send email" => "Skicka e-post",
-"Log" => "Logg",
-"Log level" => "Nivå på loggning",
-"More" => "Mer",
-"Less" => "Mindre",
-"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>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud Community</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Fler appar",
-"by" => "av",
-"Documentation:" => "Dokumentation:",
-"User Documentation" => "Användardokumentation",
-"Admin Documentation" => "Administratörsdokumentation",
-"Update to %s" => "Uppdatera till %s",
-"Enable only for specific groups" => "Aktivera endast för specifika grupper",
-"Uninstall App" => "Avinstallera Applikation",
-"Administrator Documentation" => "Administratörsdokumentation",
-"Online Documentation" => "Onlinedokumentation",
-"Forum" => "Forum",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "Kommersiell support",
-"Get the apps to sync your files" => "Skaffa apparna för att synkronisera dina filer",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Om du vill stödja projektet\n<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">hjälp till med utvecklingen</a>\n\t\teller\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">sprid budskapet vidare</a>!",
-"Show First Run Wizard again" => "Visa Första uppstarts-guiden igen",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Du har använt <strong>%s</strong> av tillgängliga <strong>%s</strong>",
-"Password" => "Lösenord",
-"Your password was changed" => "Ditt lösenord har ändrats",
-"Unable to change your password" => "Kunde inte ändra ditt lösenord",
-"Current password" => "Nuvarande lösenord",
-"New password" => "Nytt lösenord",
-"Change password" => "Ändra lösenord",
-"Full Name" => "Hela namnet",
-"Email" => "E-post",
-"Your email address" => "Din e-postadress",
-"Fill in an email address to enable password recovery and receive notifications" => "Fyll i en e-postadress för att aktivera återställning av lösenord och mottagande av notifieringar",
-"Profile picture" => "Profilbild",
-"Upload new" => "Ladda upp ny",
-"Select new from Files" => "Välj ny från filer",
-"Remove image" => "Radera bild",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Antingen png eller jpg. Helst fyrkantig, men du kommer att kunna beskära den.",
-"Your avatar is provided by your original account." => "Din avatar tillhandahålls av ditt ursprungliga konto.",
-"Cancel" => "Avbryt",
-"Choose as profile image" => "Välj som profilbild",
-"Language" => "Språk",
-"Help translate" => "Hjälp att översätta",
-"Import Root Certificate" => "Importera rotcertifikat",
-"The encryption app is no longer enabled, please decrypt all your files" => "Krypteringsapplikationen är inte längre aktiverad, vänligen dekryptera alla dina filer",
-"Log-in password" => "Inloggningslösenord",
-"Decrypt all Files" => "Dekryptera alla filer",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
-"Restore Encryption Keys" => "Återställ krypteringsnycklar",
-"Delete Encryption Keys" => "Radera krypteringsnycklar",
-"Login Name" => "Inloggningsnamn",
-"Create" => "Skapa",
-"Admin Recovery Password" => "Admin återställningslösenord",
-"Enter the recovery password in order to recover the users files during password change" => "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
-"Search Users and Groups" => "Sök Användare och Grupper",
-"Add Group" => "Lägg till Grupp",
-"Group" => "Grupp",
-"Everyone" => "Alla",
-"Admins" => "Administratörer",
-"Default Quota" => "Förvald datakvot",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
-"Unlimited" => "Obegränsad",
-"Other" => "Annat",
-"Username" => "Användarnamn",
-"Quota" => "Kvot",
-"Storage Location" => "Lagringsplats",
-"Last Login" => "Senaste inloggning",
-"change full name" => "ändra hela namnet",
-"set new password" => "ange nytt lösenord",
-"Default" => "Förvald"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ta_IN.js b/settings/l10n/ta_IN.js
new file mode 100644
index 00000000000..83e55977512
--- /dev/null
+++ b/settings/l10n/ta_IN.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+    "More" : "மேலும்"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ta_IN.json b/settings/l10n/ta_IN.json
new file mode 100644
index 00000000000..6c79fe76a8f
--- /dev/null
+++ b/settings/l10n/ta_IN.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "More" : "மேலும்"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ta_IN.php b/settings/l10n/ta_IN.php
deleted file mode 100644
index 87afecee84d..00000000000
--- a/settings/l10n/ta_IN.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"More" => "மேலும்"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ta_LK.js b/settings/l10n/ta_LK.js
new file mode 100644
index 00000000000..45c3b753b45
--- /dev/null
+++ b/settings/l10n/ta_LK.js
@@ -0,0 +1,55 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு",
+    "Group already exists" : "குழு ஏற்கனவே உள்ளது",
+    "Unable to add group" : "குழுவை சேர்க்க முடியாது",
+    "Email saved" : "மின்னஞ்சல் சேமிக்கப்பட்டது",
+    "Invalid email" : "செல்லுபடியற்ற மின்னஞ்சல்",
+    "Unable to delete group" : "குழுவை நீக்க முடியாது",
+    "Unable to delete user" : "பயனாளரை நீக்க முடியாது",
+    "Language changed" : "மொழி மாற்றப்பட்டது",
+    "Invalid request" : "செல்லுபடியற்ற வேண்டுகோள்",
+    "Unable to add user to group %s" : "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
+    "Unable to remove user from group %s" : "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
+    "All" : "எல்லாம்",
+    "Disable" : "இயலுமைப்ப",
+    "Enable" : "இயலுமைப்படுத்துக",
+    "Delete" : "நீக்குக",
+    "Groups" : "குழுக்கள்",
+    "undo" : "முன் செயல் நீக்கம் ",
+    "never" : "ஒருபோதும்",
+    "__language_name__" : "_மொழி_பெயர்_",
+    "SSL root certificates" : "SSL வேர் சான்றிதழ்கள்",
+    "Encryption" : "மறைக்குறியீடு",
+    "None" : "ஒன்றுமில்லை",
+    "Login" : "புகுபதிகை",
+    "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
+    "Server address" : "சேவையக முகவரி",
+    "Port" : "துறை ",
+    "Credentials" : "சான்று ஆவணங்கள்",
+    "More" : "மேலதிக",
+    "Less" : "குறைவான",
+    "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>." : "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>.",
+    "by" : "மூலம்",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
+    "Password" : "கடவுச்சொல்",
+    "Your password was changed" : "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
+    "Unable to change your password" : "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது",
+    "Current password" : "தற்போதைய கடவுச்சொல்",
+    "New password" : "புதிய கடவுச்சொல்",
+    "Change password" : "கடவுச்சொல்லை மாற்றுக",
+    "Email" : "மின்னஞ்சல்",
+    "Your email address" : "உங்களுடைய மின்னஞ்சல் முகவரி",
+    "Cancel" : "இரத்து செய்க",
+    "Language" : "மொழி",
+    "Help translate" : "மொழிபெயர்க்க உதவி",
+    "Import Root Certificate" : "வேர் சான்றிதழை இறக்குமதி செய்க",
+    "Login Name" : "புகுபதிகை",
+    "Create" : "உருவாக்குக",
+    "Default Quota" : "பொது இருப்பு பங்கு",
+    "Other" : "மற்றவை",
+    "Username" : "பயனாளர் பெயர்",
+    "Quota" : "பங்கு"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ta_LK.json b/settings/l10n/ta_LK.json
new file mode 100644
index 00000000000..ab306822e2c
--- /dev/null
+++ b/settings/l10n/ta_LK.json
@@ -0,0 +1,53 @@
+{ "translations": {
+    "Authentication error" : "அத்தாட்சிப்படுத்தலில் வழு",
+    "Group already exists" : "குழு ஏற்கனவே உள்ளது",
+    "Unable to add group" : "குழுவை சேர்க்க முடியாது",
+    "Email saved" : "மின்னஞ்சல் சேமிக்கப்பட்டது",
+    "Invalid email" : "செல்லுபடியற்ற மின்னஞ்சல்",
+    "Unable to delete group" : "குழுவை நீக்க முடியாது",
+    "Unable to delete user" : "பயனாளரை நீக்க முடியாது",
+    "Language changed" : "மொழி மாற்றப்பட்டது",
+    "Invalid request" : "செல்லுபடியற்ற வேண்டுகோள்",
+    "Unable to add user to group %s" : "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
+    "Unable to remove user from group %s" : "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
+    "All" : "எல்லாம்",
+    "Disable" : "இயலுமைப்ப",
+    "Enable" : "இயலுமைப்படுத்துக",
+    "Delete" : "நீக்குக",
+    "Groups" : "குழுக்கள்",
+    "undo" : "முன் செயல் நீக்கம் ",
+    "never" : "ஒருபோதும்",
+    "__language_name__" : "_மொழி_பெயர்_",
+    "SSL root certificates" : "SSL வேர் சான்றிதழ்கள்",
+    "Encryption" : "மறைக்குறியீடு",
+    "None" : "ஒன்றுமில்லை",
+    "Login" : "புகுபதிகை",
+    "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
+    "Server address" : "சேவையக முகவரி",
+    "Port" : "துறை ",
+    "Credentials" : "சான்று ஆவணங்கள்",
+    "More" : "மேலதிக",
+    "Less" : "குறைவான",
+    "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>." : "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>.",
+    "by" : "மூலம்",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
+    "Password" : "கடவுச்சொல்",
+    "Your password was changed" : "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
+    "Unable to change your password" : "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது",
+    "Current password" : "தற்போதைய கடவுச்சொல்",
+    "New password" : "புதிய கடவுச்சொல்",
+    "Change password" : "கடவுச்சொல்லை மாற்றுக",
+    "Email" : "மின்னஞ்சல்",
+    "Your email address" : "உங்களுடைய மின்னஞ்சல் முகவரி",
+    "Cancel" : "இரத்து செய்க",
+    "Language" : "மொழி",
+    "Help translate" : "மொழிபெயர்க்க உதவி",
+    "Import Root Certificate" : "வேர் சான்றிதழை இறக்குமதி செய்க",
+    "Login Name" : "புகுபதிகை",
+    "Create" : "உருவாக்குக",
+    "Default Quota" : "பொது இருப்பு பங்கு",
+    "Other" : "மற்றவை",
+    "Username" : "பயனாளர் பெயர்",
+    "Quota" : "பங்கு"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ta_LK.php b/settings/l10n/ta_LK.php
deleted file mode 100644
index 7d7df14e9d3..00000000000
--- a/settings/l10n/ta_LK.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "அத்தாட்சிப்படுத்தலில் வழு",
-"Group already exists" => "குழு ஏற்கனவே உள்ளது",
-"Unable to add group" => "குழுவை சேர்க்க முடியாது",
-"Email saved" => "மின்னஞ்சல் சேமிக்கப்பட்டது",
-"Invalid email" => "செல்லுபடியற்ற மின்னஞ்சல்",
-"Unable to delete group" => "குழுவை நீக்க முடியாது",
-"Unable to delete user" => "பயனாளரை நீக்க முடியாது",
-"Language changed" => "மொழி மாற்றப்பட்டது",
-"Invalid request" => "செல்லுபடியற்ற வேண்டுகோள்",
-"Unable to add user to group %s" => "குழு %s இல் பயனாளரை சேர்க்க முடியாது",
-"Unable to remove user from group %s" => "குழு %s இலிருந்து பயனாளரை நீக்கமுடியாது",
-"All" => "எல்லாம்",
-"Disable" => "இயலுமைப்ப",
-"Enable" => "இயலுமைப்படுத்துக",
-"Delete" => "நீக்குக",
-"Groups" => "குழுக்கள்",
-"undo" => "முன் செயல் நீக்கம் ",
-"never" => "ஒருபோதும்",
-"__language_name__" => "_மொழி_பெயர்_",
-"SSL root certificates" => "SSL வேர் சான்றிதழ்கள்",
-"Encryption" => "மறைக்குறியீடு",
-"None" => "ஒன்றுமில்லை",
-"Login" => "புகுபதிகை",
-"Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
-"Server address" => "சேவையக முகவரி",
-"Port" => "துறை ",
-"Credentials" => "சான்று ஆவணங்கள்",
-"More" => "மேலதிக",
-"Less" => "குறைவான",
-"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>." => "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>.",
-"by" => "மூலம்",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "நீங்கள் <strong>%s</strong> இலுள்ள <strong>%s</strong>பயன்படுத்தியுள்ளீர்கள்",
-"Password" => "கடவுச்சொல்",
-"Your password was changed" => "உங்களுடைய கடவுச்சொல் மாற்றப்பட்டுள்ளது",
-"Unable to change your password" => "உங்களுடைய கடவுச்சொல்லை மாற்றமுடியாது",
-"Current password" => "தற்போதைய கடவுச்சொல்",
-"New password" => "புதிய கடவுச்சொல்",
-"Change password" => "கடவுச்சொல்லை மாற்றுக",
-"Email" => "மின்னஞ்சல்",
-"Your email address" => "உங்களுடைய மின்னஞ்சல் முகவரி",
-"Cancel" => "இரத்து செய்க",
-"Language" => "மொழி",
-"Help translate" => "மொழிபெயர்க்க உதவி",
-"Import Root Certificate" => "வேர் சான்றிதழை இறக்குமதி செய்க",
-"Login Name" => "புகுபதிகை",
-"Create" => "உருவாக்குக",
-"Default Quota" => "பொது இருப்பு பங்கு",
-"Other" => "மற்றவை",
-"Username" => "பயனாளர் பெயர்",
-"Quota" => "பங்கு"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/te.js b/settings/l10n/te.js
new file mode 100644
index 00000000000..f09acb41060
--- /dev/null
+++ b/settings/l10n/te.js
@@ -0,0 +1,15 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Delete" : "తొలగించు",
+    "Server address" : "సేవకి చిరునామా",
+    "More" : "మరిన్ని",
+    "Password" : "సంకేతపదం",
+    "New password" : "కొత్త సంకేతపదం",
+    "Email" : "ఈమెయిలు",
+    "Your email address" : "మీ ఈమెయిలు చిరునామా",
+    "Cancel" : "రద్దుచేయి",
+    "Language" : "భాష",
+    "Username" : "వాడుకరి పేరు"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/te.json b/settings/l10n/te.json
new file mode 100644
index 00000000000..031f99d1498
--- /dev/null
+++ b/settings/l10n/te.json
@@ -0,0 +1,13 @@
+{ "translations": {
+    "Delete" : "తొలగించు",
+    "Server address" : "సేవకి చిరునామా",
+    "More" : "మరిన్ని",
+    "Password" : "సంకేతపదం",
+    "New password" : "కొత్త సంకేతపదం",
+    "Email" : "ఈమెయిలు",
+    "Your email address" : "మీ ఈమెయిలు చిరునామా",
+    "Cancel" : "రద్దుచేయి",
+    "Language" : "భాష",
+    "Username" : "వాడుకరి పేరు"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/te.php b/settings/l10n/te.php
deleted file mode 100644
index d5f2c6c8d16..00000000000
--- a/settings/l10n/te.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "తొలగించు",
-"Server address" => "సేవకి చిరునామా",
-"More" => "మరిన్ని",
-"Password" => "సంకేతపదం",
-"New password" => "కొత్త సంకేతపదం",
-"Email" => "ఈమెయిలు",
-"Your email address" => "మీ ఈమెయిలు చిరునామా",
-"Cancel" => "రద్దుచేయి",
-"Language" => "భాష",
-"Username" => "వాడుకరి పేరు"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
new file mode 100644
index 00000000000..010303a5872
--- /dev/null
+++ b/settings/l10n/th_TH.js
@@ -0,0 +1,81 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
+    "Group already exists" : "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
+    "Unable to add group" : "ไม่สามารถเพิ่มกลุ่มได้",
+    "Email saved" : "อีเมลถูกบันทึกแล้ว",
+    "Invalid email" : "อีเมลไม่ถูกต้อง",
+    "Unable to delete group" : "ไม่สามารถลบกลุ่มได้",
+    "Unable to delete user" : "ไม่สามารถลบผู้ใช้งานได้",
+    "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." : "ไม่สามารถอัพเดทแอปฯ",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "All" : "ทั้งหมด",
+    "Please wait...." : "กรุณารอสักครู่...",
+    "Disable" : "ปิดใช้งาน",
+    "Enable" : "เปิดใช้งาน",
+    "Updating...." : "กำลังอัพเดทข้อมูล...",
+    "Error while updating app" : "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
+    "Updated" : "อัพเดทแล้ว",
+    "Delete" : "ลบ",
+    "Groups" : "กลุ่ม",
+    "undo" : "เลิกทำ",
+    "never" : "ไม่ต้องเลย",
+    "__language_name__" : "ภาษาไทย",
+    "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+    "Encryption" : "การเข้ารหัส",
+    "None" : "ไม่มี",
+    "Login" : "เข้าสู่ระบบ",
+    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+    "Sharing" : "การแชร์ข้อมูล",
+    "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
+    "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
+    "Server address" : "ที่อยู่เซิร์ฟเวอร์",
+    "Port" : "พอร์ต",
+    "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
+    "Log" : "บันทึกการเปลี่ยนแปลง",
+    "Log level" : "ระดับการเก็บบันทึก log",
+    "More" : "มาก",
+    "Less" : "น้อย",
+    "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>." : "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "โดย",
+    "User Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
+    "Administrator Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
+    "Online Documentation" : "เอกสารคู่มือการใช้งานออนไลน์",
+    "Forum" : "กระดานสนทนา",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "บริการลูกค้าแบบเสียค่าใช้จ่าย",
+    "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
+    "Password" : "รหัสผ่าน",
+    "Your password was changed" : "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
+    "Unable to change your password" : "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
+    "Current password" : "รหัสผ่านปัจจุบัน",
+    "New password" : "รหัสผ่านใหม่",
+    "Change password" : "เปลี่ยนรหัสผ่าน",
+    "Email" : "อีเมล",
+    "Your email address" : "ที่อยู่อีเมล์ของคุณ",
+    "Profile picture" : "รูปภาพโปรไฟล์",
+    "Cancel" : "ยกเลิก",
+    "Language" : "ภาษา",
+    "Help translate" : "ช่วยกันแปล",
+    "Import Root Certificate" : "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
+    "Login Name" : "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
+    "Create" : "สร้าง",
+    "Default Quota" : "โควต้าที่กำหนดไว้เริ่มต้น",
+    "Unlimited" : "ไม่จำกัดจำนวน",
+    "Other" : "อื่นๆ",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Quota" : "พื้นที่",
+    "set new password" : "ตั้งค่ารหัสผ่านใหม่",
+    "Default" : "ค่าเริ่มต้น"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
new file mode 100644
index 00000000000..28a346aab65
--- /dev/null
+++ b/settings/l10n/th_TH.json
@@ -0,0 +1,79 @@
+{ "translations": {
+    "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
+    "Group already exists" : "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
+    "Unable to add group" : "ไม่สามารถเพิ่มกลุ่มได้",
+    "Email saved" : "อีเมลถูกบันทึกแล้ว",
+    "Invalid email" : "อีเมลไม่ถูกต้อง",
+    "Unable to delete group" : "ไม่สามารถลบกลุ่มได้",
+    "Unable to delete user" : "ไม่สามารถลบผู้ใช้งานได้",
+    "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." : "ไม่สามารถอัพเดทแอปฯ",
+    "Email sent" : "ส่งอีเมล์แล้ว",
+    "All" : "ทั้งหมด",
+    "Please wait...." : "กรุณารอสักครู่...",
+    "Disable" : "ปิดใช้งาน",
+    "Enable" : "เปิดใช้งาน",
+    "Updating...." : "กำลังอัพเดทข้อมูล...",
+    "Error while updating app" : "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
+    "Updated" : "อัพเดทแล้ว",
+    "Delete" : "ลบ",
+    "Groups" : "กลุ่ม",
+    "undo" : "เลิกทำ",
+    "never" : "ไม่ต้องเลย",
+    "__language_name__" : "ภาษาไทย",
+    "SSL root certificates" : "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
+    "Encryption" : "การเข้ารหัส",
+    "None" : "ไม่มี",
+    "Login" : "เข้าสู่ระบบ",
+    "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
+    "Sharing" : "การแชร์ข้อมูล",
+    "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
+    "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
+    "Server address" : "ที่อยู่เซิร์ฟเวอร์",
+    "Port" : "พอร์ต",
+    "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
+    "Log" : "บันทึกการเปลี่ยนแปลง",
+    "Log level" : "ระดับการเก็บบันทึก log",
+    "More" : "มาก",
+    "Less" : "น้อย",
+    "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>." : "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "โดย",
+    "User Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
+    "Administrator Documentation" : "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
+    "Online Documentation" : "เอกสารคู่มือการใช้งานออนไลน์",
+    "Forum" : "กระดานสนทนา",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "บริการลูกค้าแบบเสียค่าใช้จ่าย",
+    "Show First Run Wizard again" : "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
+    "Password" : "รหัสผ่าน",
+    "Your password was changed" : "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
+    "Unable to change your password" : "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
+    "Current password" : "รหัสผ่านปัจจุบัน",
+    "New password" : "รหัสผ่านใหม่",
+    "Change password" : "เปลี่ยนรหัสผ่าน",
+    "Email" : "อีเมล",
+    "Your email address" : "ที่อยู่อีเมล์ของคุณ",
+    "Profile picture" : "รูปภาพโปรไฟล์",
+    "Cancel" : "ยกเลิก",
+    "Language" : "ภาษา",
+    "Help translate" : "ช่วยกันแปล",
+    "Import Root Certificate" : "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
+    "Login Name" : "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
+    "Create" : "สร้าง",
+    "Default Quota" : "โควต้าที่กำหนดไว้เริ่มต้น",
+    "Unlimited" : "ไม่จำกัดจำนวน",
+    "Other" : "อื่นๆ",
+    "Username" : "ชื่อผู้ใช้งาน",
+    "Quota" : "พื้นที่",
+    "set new password" : "ตั้งค่ารหัสผ่านใหม่",
+    "Default" : "ค่าเริ่มต้น"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
deleted file mode 100644
index 5abacd4f4b1..00000000000
--- a/settings/l10n/th_TH.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
-"Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
-"Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
-"Email saved" => "อีเมลถูกบันทึกแล้ว",
-"Invalid email" => "อีเมลไม่ถูกต้อง",
-"Unable to delete group" => "ไม่สามารถลบกลุ่มได้",
-"Unable to delete user" => "ไม่สามารถลบผู้ใช้งานได้",
-"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." => "ไม่สามารถอัพเดทแอปฯ",
-"Email sent" => "ส่งอีเมล์แล้ว",
-"All" => "ทั้งหมด",
-"Please wait...." => "กรุณารอสักครู่...",
-"Disable" => "ปิดใช้งาน",
-"Enable" => "เปิดใช้งาน",
-"Updating...." => "กำลังอัพเดทข้อมูล...",
-"Error while updating app" => "เกิดข้อผิดพลาดในระหว่างการอัพเดทแอปฯ",
-"Updated" => "อัพเดทแล้ว",
-"Delete" => "ลบ",
-"Groups" => "กลุ่ม",
-"undo" => "เลิกทำ",
-"never" => "ไม่ต้องเลย",
-"__language_name__" => "ภาษาไทย",
-"SSL root certificates" => "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root",
-"Encryption" => "การเข้ารหัส",
-"None" => "ไม่มี",
-"Login" => "เข้าสู่ระบบ",
-"Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
-"Sharing" => "การแชร์ข้อมูล",
-"Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
-"Allow resharing" => "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
-"Server address" => "ที่อยู่เซิร์ฟเวอร์",
-"Port" => "พอร์ต",
-"Credentials" => "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
-"Log" => "บันทึกการเปลี่ยนแปลง",
-"Log level" => "ระดับการเก็บบันทึก log",
-"More" => "มาก",
-"Less" => "น้อย",
-"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>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "โดย",
-"User Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ใช้งาน",
-"Administrator Documentation" => "เอกสารคู่มือการใช้งานสำหรับผู้ดูแลระบบ",
-"Online Documentation" => "เอกสารคู่มือการใช้งานออนไลน์",
-"Forum" => "กระดานสนทนา",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "บริการลูกค้าแบบเสียค่าใช้จ่าย",
-"Show First Run Wizard again" => "แสดงหน้าจอวิซาร์ดนำทางครั้งแรกอีกครั้ง",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "คุณได้ใช้งานไปแล้ว <strong>%s</strong> จากจำนวนที่สามารถใช้ได้ <strong>%s</strong>",
-"Password" => "รหัสผ่าน",
-"Your password was changed" => "รหัสผ่านของคุณถูกเปลี่ยนแล้ว",
-"Unable to change your password" => "ไม่สามารถเปลี่ยนรหัสผ่านของคุณได้",
-"Current password" => "รหัสผ่านปัจจุบัน",
-"New password" => "รหัสผ่านใหม่",
-"Change password" => "เปลี่ยนรหัสผ่าน",
-"Email" => "อีเมล",
-"Your email address" => "ที่อยู่อีเมล์ของคุณ",
-"Profile picture" => "รูปภาพโปรไฟล์",
-"Cancel" => "ยกเลิก",
-"Language" => "ภาษา",
-"Help translate" => "ช่วยกันแปล",
-"Import Root Certificate" => "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
-"Login Name" => "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
-"Create" => "สร้าง",
-"Default Quota" => "โควต้าที่กำหนดไว้เริ่มต้น",
-"Unlimited" => "ไม่จำกัดจำนวน",
-"Other" => "อื่นๆ",
-"Username" => "ชื่อผู้ใช้งาน",
-"Quota" => "พื้นที่",
-"set new password" => "ตั้งค่ารหัสผ่านใหม่",
-"Default" => "ค่าเริ่มต้น"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
new file mode 100644
index 00000000000..dd4519d02d0
--- /dev/null
+++ b/settings/l10n/tr.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Etkin",
+    "Not enabled" : "Etkin değil",
+    "Recommended" : "Önerilen",
+    "Authentication error" : "Kimlik doğrulama hatası",
+    "Your full name has been changed." : "Tam adınız değiştirildi.",
+    "Unable to change full name" : "Tam adınız değiştirilirken hata",
+    "Group already exists" : "Grup zaten mevcut",
+    "Unable to add group" : "Grup eklenemiyor",
+    "Files decrypted successfully" : "Dosyaların şifrelemesi başarıyla kaldırıldı",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
+    "Couldn't decrypt your files, check your password and try again" : "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
+    "Encryption keys deleted permanently" : "Şifreleme anahtarları kalıcı olarak silindi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
+    "Couldn't remove app." : "Uygulama kaldırılamadı.",
+    "Email saved" : "E-posta kaydedildi",
+    "Invalid email" : "Geçersiz e-posta",
+    "Unable to delete group" : "Grup silinemiyor",
+    "Unable to delete user" : "Kullanıcı silinemiyor",
+    "Backups restored successfully" : "Yedekler başarıyla geri yüklendi",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
+    "Language changed" : "Dil değiştirildi",
+    "Invalid request" : "Geçersiz istek",
+    "Admins can't remove themself from the admin group" : "Yöneticiler kendilerini admin grubundan kaldıramaz",
+    "Unable to add user to group %s" : "Kullanıcı %s grubuna eklenemiyor",
+    "Unable to remove user from group %s" : "%s grubundan kullanıcı kaldırılamıyor",
+    "Couldn't update app." : "Uygulama güncellenemedi.",
+    "Wrong password" : "Hatalı parola",
+    "No user supplied" : "Kullanıcı girilmedi",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
+    "Wrong admin recovery password. Please check the password and try again." : "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
+    "Unable to change password" : "Parola değiştirilemiyor",
+    "Saved" : "Kaydedildi",
+    "test email settings" : "e-posta ayarlarını sına",
+    "If you received this email, the settings seem to be correct." : "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
+    "A problem occurred while sending the email. Please revise your settings." : "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.",
+    "Email sent" : "E-posta gönderildi",
+    "You need to set your user email before being able to send test emails." : "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
+    "Add trusted domain" : "Güvenilir alan adı ekle",
+    "Sending..." : "Gönderiliyor...",
+    "All" : "Tümü",
+    "Please wait...." : "Lütfen bekleyin....",
+    "Error while disabling app" : "Uygulama devre dışı bırakılırken hata",
+    "Disable" : "Devre Dışı Bırak",
+    "Enable" : "Etkinleştir",
+    "Error while enabling app" : "Uygulama etkinleştirilirken hata",
+    "Updating...." : "Güncelleniyor....",
+    "Error while updating app" : "Uygulama güncellenirken hata",
+    "Updated" : "Güncellendi",
+    "Uninstalling ...." : "Kaldırılıyor ....",
+    "Error while uninstalling app" : "Uygulama kaldırılırken hata",
+    "Uninstall" : "Kaldır",
+    "Select a profile picture" : "Bir profil fotoğrafı seçin",
+    "Very weak password" : "Çok güçsüz parola",
+    "Weak password" : "Güçsüz parola",
+    "So-so password" : "Normal parola",
+    "Good password" : "İyi parola",
+    "Strong password" : "Güçlü parola",
+    "Valid until {date}" : "{date} tarihine kadar geçerli",
+    "Delete" : "Sil",
+    "Decrypting files... Please wait, this can take some time." : "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+    "Delete encryption keys permanently." : "Şifreleme anahtarlarını kalıcı olarak sil.",
+    "Restore encryption keys." : "Şifreleme anahtarlarını geri yükle.",
+    "Groups" : "Gruplar",
+    "Unable to delete {objName}" : "{objName} silinemiyor",
+    "Error creating group" : "Grup oluşturulurken hata",
+    "A valid group name must be provided" : "Geçerli bir grup adı mutlaka sağlanmalı",
+    "deleted {groupName}" : "{groupName} silindi",
+    "undo" : "geri al",
+    "never" : "hiçbir zaman",
+    "deleted {userName}" : "{userName} silindi",
+    "add group" : "grup ekle",
+    "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
+    "Error creating user" : "Kullanıcı oluşturulurken hata",
+    "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
+    "Warning: Home directory for user \"{user}\" already exists" : "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
+    "__language_name__" : "Türkçe",
+    "SSL root certificates" : "SSL kök sertifikaları",
+    "Encryption" : "Şifreleme",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
+    "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
+    "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
+    "Errors and fatal issues" : "Hatalar ve ciddi sorunlar",
+    "Fatal issues only" : "Sadece ciddi sorunlar",
+    "None" : "Hiçbiri",
+    "Login" : "Oturum Aç",
+    "Plain" : "Düz",
+    "NT LAN Manager" : "NT Ağ Yöneticisi",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Güvenlik Uyarısı",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "%s erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.",
+    "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." : "Veri dizininiz ve dosyalarınız muhtemelen İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak veri dizinine erişimi kapatmanızı veya veri dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
+    "Setup Warning" : "Kurulum Uyarısı",
+    "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.",
+    "Database Performance Info" : "Veritabanı Başarım Bilgisi",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modül 'fileinfo' kayıp",
+    "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.",
+    "Your PHP version is outdated" : "PHP sürümünüz eski",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHP sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
+    "PHP charset is not set to UTF-8" : "PHP karakter kümesi UTF-8 olarak ayarlı değil",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP karakter kümesi UTF-8 olarak ayarlı değil. Bu, dosya isimlerindeki ASCII olmayan karakterler için büyük sorunlara yol açabilir. php.ini içerisindeki 'default_charset' ayarını 'UTF-8' olarak ayarlamanızı şiddetle tavsiye ediyoruz.",
+    "Locale not working" : "Yerel çalışmıyor",
+    "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 to install 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.",
+    "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
+    "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
+    "Connectivity checks" : "Bağlanabilirlik kontrolleri",
+    "No problems found" : "Sorun bulunamadı",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
+    "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
+    "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
+    "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.",
+    "Sharing" : "Paylaşım",
+    "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",
+    "Enforce password protection" : "Parola korumasını zorla",
+    "Allow public uploads" : "Herkes tarafından yüklemeye izin ver",
+    "Set default expiration date" : "Öntanımlı son kullanma tarihini ayarla",
+    "Expire after " : "Süre",
+    "days" : "gün sonra dolsun",
+    "Enforce expiration date" : "Son kullanma tarihini zorla",
+    "Allow resharing" : "Yeniden paylaşıma izin ver",
+    "Restrict users to only share with users in their groups" : "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına sınırla",
+    "Allow users to send mail notification for shared files" : "Paylaşılmış dosyalar için kullanıcıların 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.",
+    "Security" : "Güvenlik",
+    "Enforce HTTPS" : "HTTPS bağlantısına zorla",
+    "Forces the clients to connect to %s via an encrypted connection." : "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.",
+    "Email Server" : "E-Posta Sunucusu",
+    "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
+    "Send mode" : "Gönderme kipi",
+    "From address" : "Kimden adresi",
+    "mail" : "posta",
+    "Authentication method" : "Kimlik doğrulama yöntemi",
+    "Authentication required" : "Kimlik doğrulama gerekli",
+    "Server address" : "Sunucu adresi",
+    "Port" : "Port",
+    "Credentials" : "Kimlik Bilgileri",
+    "SMTP Username" : "SMTP Kullanıcı Adı",
+    "SMTP Password" : "SMTP Parolası",
+    "Store credentials" : "Kimlik bilgilerini depola",
+    "Test email settings" : "E-posta ayarlarını sına",
+    "Send email" : "E-posta gönder",
+    "Log" : "Günlük",
+    "Log level" : "Günlük seviyesi",
+    "More" : "Daha fazla",
+    "Less" : "Daha az",
+    "Version" : "Sürüm",
+    "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
+    "More apps" : "Daha fazla Uygulama",
+    "Add your app" : "Uygulamanızı ekleyin",
+    "by" : "oluşturan",
+    "licensed" : "lisanslı",
+    "Documentation:" : "Belgelendirme:",
+    "User Documentation" : "Kullanıcı Belgelendirmesi",
+    "Admin Documentation" : "Yönetici Belgelendirmesi",
+    "Update to %s" : "%s sürümüne güncelle",
+    "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir",
+    "Uninstall App" : "Uygulamayı Kaldır",
+    "Administrator Documentation" : "Yönetici Belgelendirmesi",
+    "Online Documentation" : "Çevrimiçi Belgelendirme",
+    "Forum" : "Forum",
+    "Bugtracker" : "Hata Takip Sistemi",
+    "Commercial Support" : "Ticari Destek",
+    "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">bizi duyurun</a>!",
+    "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
+    "Password" : "Parola",
+    "Your password was changed" : "Parolanız değiştirildi",
+    "Unable to change your password" : "Parolanız değiştirilemiyor",
+    "Current password" : "Mevcut parola",
+    "New password" : "Yeni parola",
+    "Change password" : "Parola değiştir",
+    "Full Name" : "Tam Adı",
+    "Email" : "E-posta",
+    "Your email address" : "E-posta adresiniz",
+    "Fill in an email address to enable password recovery and receive notifications" : "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin",
+    "Profile picture" : "Profil resmi",
+    "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." : "PNG veya JPG. Genellikle karedir ancak kesebileceksiniz.",
+    "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ç",
+    "Language" : "Dil",
+    "Help translate" : "Çevirilere yardım edin",
+    "Common Name" : "Ortak Ad",
+    "Valid until" : "Geçerlilik",
+    "Issued By" : "Veren",
+    "Valid until %s" : "%s tarihine kadar geçerli",
+    "Import Root Certificate" : "Kök Sertifikalarını İçe Aktar",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
+    "Log-in password" : "Oturum açma parolası",
+    "Decrypt all Files" : "Tüm Dosyaların Şifrelemesini Kaldır",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
+    "Restore Encryption Keys" : "Şifreleme Anahtarlarını Geri Yükle",
+    "Delete Encryption Keys" : "Şifreleme Anahtarlarını Sil",
+    "Show storage location" : "Depolama konumunu göster",
+    "Show last log in" : "Son oturum açılma zamanını göster",
+    "Login Name" : "Giriş Adı",
+    "Create" : "Oluştur",
+    "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
+    "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
+    "Search Users and Groups" : "Kullanıcı ve Grupları Ara",
+    "Add Group" : "Grup Ekle",
+    "Group" : "Grup",
+    "Everyone" : "Herkes",
+    "Admins" : "Yöneticiler",
+    "Default Quota" : "Öntanımlı Kota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
+    "Unlimited" : "Sınırsız",
+    "Other" : "Diğer",
+    "Username" : "Kullanıcı Adı",
+    "Quota" : "Kota",
+    "Storage Location" : "Depolama Konumu",
+    "Last Login" : "Son Giriş",
+    "change full name" : "tam adı değiştir",
+    "set new password" : "yeni parola belirle",
+    "Default" : "Öntanımlı"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
new file mode 100644
index 00000000000..bba74d9e117
--- /dev/null
+++ b/settings/l10n/tr.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Etkin",
+    "Not enabled" : "Etkin değil",
+    "Recommended" : "Önerilen",
+    "Authentication error" : "Kimlik doğrulama hatası",
+    "Your full name has been changed." : "Tam adınız değiştirildi.",
+    "Unable to change full name" : "Tam adınız değiştirilirken hata",
+    "Group already exists" : "Grup zaten mevcut",
+    "Unable to add group" : "Grup eklenemiyor",
+    "Files decrypted successfully" : "Dosyaların şifrelemesi başarıyla kaldırıldı",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
+    "Couldn't decrypt your files, check your password and try again" : "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
+    "Encryption keys deleted permanently" : "Şifreleme anahtarları kalıcı olarak silindi",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
+    "Couldn't remove app." : "Uygulama kaldırılamadı.",
+    "Email saved" : "E-posta kaydedildi",
+    "Invalid email" : "Geçersiz e-posta",
+    "Unable to delete group" : "Grup silinemiyor",
+    "Unable to delete user" : "Kullanıcı silinemiyor",
+    "Backups restored successfully" : "Yedekler başarıyla geri yüklendi",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
+    "Language changed" : "Dil değiştirildi",
+    "Invalid request" : "Geçersiz istek",
+    "Admins can't remove themself from the admin group" : "Yöneticiler kendilerini admin grubundan kaldıramaz",
+    "Unable to add user to group %s" : "Kullanıcı %s grubuna eklenemiyor",
+    "Unable to remove user from group %s" : "%s grubundan kullanıcı kaldırılamıyor",
+    "Couldn't update app." : "Uygulama güncellenemedi.",
+    "Wrong password" : "Hatalı parola",
+    "No user supplied" : "Kullanıcı girilmedi",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
+    "Wrong admin recovery password. Please check the password and try again." : "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
+    "Unable to change password" : "Parola değiştirilemiyor",
+    "Saved" : "Kaydedildi",
+    "test email settings" : "e-posta ayarlarını sına",
+    "If you received this email, the settings seem to be correct." : "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
+    "A problem occurred while sending the email. Please revise your settings." : "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.",
+    "Email sent" : "E-posta gönderildi",
+    "You need to set your user email before being able to send test emails." : "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
+    "Add trusted domain" : "Güvenilir alan adı ekle",
+    "Sending..." : "Gönderiliyor...",
+    "All" : "Tümü",
+    "Please wait...." : "Lütfen bekleyin....",
+    "Error while disabling app" : "Uygulama devre dışı bırakılırken hata",
+    "Disable" : "Devre Dışı Bırak",
+    "Enable" : "Etkinleştir",
+    "Error while enabling app" : "Uygulama etkinleştirilirken hata",
+    "Updating...." : "Güncelleniyor....",
+    "Error while updating app" : "Uygulama güncellenirken hata",
+    "Updated" : "Güncellendi",
+    "Uninstalling ...." : "Kaldırılıyor ....",
+    "Error while uninstalling app" : "Uygulama kaldırılırken hata",
+    "Uninstall" : "Kaldır",
+    "Select a profile picture" : "Bir profil fotoğrafı seçin",
+    "Very weak password" : "Çok güçsüz parola",
+    "Weak password" : "Güçsüz parola",
+    "So-so password" : "Normal parola",
+    "Good password" : "İyi parola",
+    "Strong password" : "Güçlü parola",
+    "Valid until {date}" : "{date} tarihine kadar geçerli",
+    "Delete" : "Sil",
+    "Decrypting files... Please wait, this can take some time." : "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
+    "Delete encryption keys permanently." : "Şifreleme anahtarlarını kalıcı olarak sil.",
+    "Restore encryption keys." : "Şifreleme anahtarlarını geri yükle.",
+    "Groups" : "Gruplar",
+    "Unable to delete {objName}" : "{objName} silinemiyor",
+    "Error creating group" : "Grup oluşturulurken hata",
+    "A valid group name must be provided" : "Geçerli bir grup adı mutlaka sağlanmalı",
+    "deleted {groupName}" : "{groupName} silindi",
+    "undo" : "geri al",
+    "never" : "hiçbir zaman",
+    "deleted {userName}" : "{userName} silindi",
+    "add group" : "grup ekle",
+    "A valid username must be provided" : "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
+    "Error creating user" : "Kullanıcı oluşturulurken hata",
+    "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
+    "Warning: Home directory for user \"{user}\" already exists" : "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
+    "__language_name__" : "Türkçe",
+    "SSL root certificates" : "SSL kök sertifikaları",
+    "Encryption" : "Şifreleme",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
+    "Info, warnings, errors and fatal issues" : "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
+    "Warnings, errors and fatal issues" : "Uyarılar, hatalar ve ciddi sorunlar",
+    "Errors and fatal issues" : "Hatalar ve ciddi sorunlar",
+    "Fatal issues only" : "Sadece ciddi sorunlar",
+    "None" : "Hiçbiri",
+    "Login" : "Oturum Aç",
+    "Plain" : "Düz",
+    "NT LAN Manager" : "NT Ağ Yöneticisi",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Güvenlik Uyarısı",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "%s erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.",
+    "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." : "Veri dizininiz ve dosyalarınız muhtemelen İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak veri dizinine erişimi kapatmanızı veya veri dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
+    "Setup Warning" : "Kurulum Uyarısı",
+    "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.",
+    "Database Performance Info" : "Veritabanı Başarım Bilgisi",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Modül 'fileinfo' kayıp",
+    "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.",
+    "Your PHP version is outdated" : "PHP sürümünüz eski",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "PHP sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
+    "PHP charset is not set to UTF-8" : "PHP karakter kümesi UTF-8 olarak ayarlı değil",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP karakter kümesi UTF-8 olarak ayarlı değil. Bu, dosya isimlerindeki ASCII olmayan karakterler için büyük sorunlara yol açabilir. php.ini içerisindeki 'default_charset' ayarını 'UTF-8' olarak ayarlamanızı şiddetle tavsiye ediyoruz.",
+    "Locale not working" : "Yerel çalışmıyor",
+    "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 to install 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.",
+    "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
+    "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
+    "Connectivity checks" : "Bağlanabilirlik kontrolleri",
+    "No problems found" : "Sorun bulunamadı",
+    "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
+    "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
+    "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
+    "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.",
+    "Sharing" : "Paylaşım",
+    "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",
+    "Enforce password protection" : "Parola korumasını zorla",
+    "Allow public uploads" : "Herkes tarafından yüklemeye izin ver",
+    "Set default expiration date" : "Öntanımlı son kullanma tarihini ayarla",
+    "Expire after " : "Süre",
+    "days" : "gün sonra dolsun",
+    "Enforce expiration date" : "Son kullanma tarihini zorla",
+    "Allow resharing" : "Yeniden paylaşıma izin ver",
+    "Restrict users to only share with users in their groups" : "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına sınırla",
+    "Allow users to send mail notification for shared files" : "Paylaşılmış dosyalar için kullanıcıların 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.",
+    "Security" : "Güvenlik",
+    "Enforce HTTPS" : "HTTPS bağlantısına zorla",
+    "Forces the clients to connect to %s via an encrypted connection." : "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.",
+    "Email Server" : "E-Posta Sunucusu",
+    "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
+    "Send mode" : "Gönderme kipi",
+    "From address" : "Kimden adresi",
+    "mail" : "posta",
+    "Authentication method" : "Kimlik doğrulama yöntemi",
+    "Authentication required" : "Kimlik doğrulama gerekli",
+    "Server address" : "Sunucu adresi",
+    "Port" : "Port",
+    "Credentials" : "Kimlik Bilgileri",
+    "SMTP Username" : "SMTP Kullanıcı Adı",
+    "SMTP Password" : "SMTP Parolası",
+    "Store credentials" : "Kimlik bilgilerini depola",
+    "Test email settings" : "E-posta ayarlarını sına",
+    "Send email" : "E-posta gönder",
+    "Log" : "Günlük",
+    "Log level" : "Günlük seviyesi",
+    "More" : "Daha fazla",
+    "Less" : "Daha az",
+    "Version" : "Sürüm",
+    "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
+    "More apps" : "Daha fazla Uygulama",
+    "Add your app" : "Uygulamanızı ekleyin",
+    "by" : "oluşturan",
+    "licensed" : "lisanslı",
+    "Documentation:" : "Belgelendirme:",
+    "User Documentation" : "Kullanıcı Belgelendirmesi",
+    "Admin Documentation" : "Yönetici Belgelendirmesi",
+    "Update to %s" : "%s sürümüne güncelle",
+    "Enable only for specific groups" : "Sadece belirli gruplar için etkinleştir",
+    "Uninstall App" : "Uygulamayı Kaldır",
+    "Administrator Documentation" : "Yönetici Belgelendirmesi",
+    "Online Documentation" : "Çevrimiçi Belgelendirme",
+    "Forum" : "Forum",
+    "Bugtracker" : "Hata Takip Sistemi",
+    "Commercial Support" : "Ticari Destek",
+    "Get the apps to sync your files" : "Dosyalarınızı eşitlemek için uygulamaları indirin",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">bizi duyurun</a>!",
+    "Show First Run Wizard again" : "İlk Çalıştırma Sihirbazı'nı yeniden göster",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
+    "Password" : "Parola",
+    "Your password was changed" : "Parolanız değiştirildi",
+    "Unable to change your password" : "Parolanız değiştirilemiyor",
+    "Current password" : "Mevcut parola",
+    "New password" : "Yeni parola",
+    "Change password" : "Parola değiştir",
+    "Full Name" : "Tam Adı",
+    "Email" : "E-posta",
+    "Your email address" : "E-posta adresiniz",
+    "Fill in an email address to enable password recovery and receive notifications" : "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin",
+    "Profile picture" : "Profil resmi",
+    "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." : "PNG veya JPG. Genellikle karedir ancak kesebileceksiniz.",
+    "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ç",
+    "Language" : "Dil",
+    "Help translate" : "Çevirilere yardım edin",
+    "Common Name" : "Ortak Ad",
+    "Valid until" : "Geçerlilik",
+    "Issued By" : "Veren",
+    "Valid until %s" : "%s tarihine kadar geçerli",
+    "Import Root Certificate" : "Kök Sertifikalarını İçe Aktar",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
+    "Log-in password" : "Oturum açma parolası",
+    "Decrypt all Files" : "Tüm Dosyaların Şifrelemesini Kaldır",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
+    "Restore Encryption Keys" : "Şifreleme Anahtarlarını Geri Yükle",
+    "Delete Encryption Keys" : "Şifreleme Anahtarlarını Sil",
+    "Show storage location" : "Depolama konumunu göster",
+    "Show last log in" : "Son oturum açılma zamanını göster",
+    "Login Name" : "Giriş Adı",
+    "Create" : "Oluştur",
+    "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
+    "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
+    "Search Users and Groups" : "Kullanıcı ve Grupları Ara",
+    "Add Group" : "Grup Ekle",
+    "Group" : "Grup",
+    "Everyone" : "Herkes",
+    "Admins" : "Yöneticiler",
+    "Default Quota" : "Öntanımlı Kota",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
+    "Unlimited" : "Sınırsız",
+    "Other" : "Diğer",
+    "Username" : "Kullanıcı Adı",
+    "Quota" : "Kota",
+    "Storage Location" : "Depolama Konumu",
+    "Last Login" : "Son Giriş",
+    "change full name" : "tam adı değiştir",
+    "set new password" : "yeni parola belirle",
+    "Default" : "Öntanımlı"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
deleted file mode 100644
index 23a0f1dcdd4..00000000000
--- a/settings/l10n/tr.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Etkin",
-"Not enabled" => "Etkin değil",
-"Recommended" => "Önerilen",
-"Authentication error" => "Kimlik doğrulama hatası",
-"Your full name has been changed." => "Tam adınız değiştirildi.",
-"Unable to change full name" => "Tam adınız değiştirilirken hata",
-"Group already exists" => "Grup zaten mevcut",
-"Unable to add group" => "Grup eklenemiyor",
-"Files decrypted successfully" => "Dosyaların şifrelemesi başarıyla kaldırıldı",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Dosyalarınızın şifrelemesi kaldırılamadı, lütfen owncloud.log dosyasına bakın veya yöneticinizle iletişime geçin",
-"Couldn't decrypt your files, check your password and try again" => "Dosyalarınızın şifrelemesi kaldırılamadı, parolanızı denetleyip yeniden deneyin",
-"Encryption keys deleted permanently" => "Şifreleme anahtarları kalıcı olarak silindi",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız kalıcı olarak silinemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
-"Couldn't remove app." => "Uygulama kaldırılamadı.",
-"Email saved" => "E-posta kaydedildi",
-"Invalid email" => "Geçersiz e-posta",
-"Unable to delete group" => "Grup silinemiyor",
-"Unable to delete user" => "Kullanıcı silinemiyor",
-"Backups restored successfully" => "Yedekler başarıyla geri yüklendi",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Şifreleme anahtarlarınız geri yüklenemedi, lütfen owncloud.log dosyasını denetleyin veya yöneticinize danışın",
-"Language changed" => "Dil değiştirildi",
-"Invalid request" => "Geçersiz istek",
-"Admins can't remove themself from the admin group" => "Yöneticiler kendilerini admin grubundan kaldıramaz",
-"Unable to add user to group %s" => "Kullanıcı %s grubuna eklenemiyor",
-"Unable to remove user from group %s" => "%s grubundan kullanıcı kaldırılamıyor",
-"Couldn't update app." => "Uygulama güncellenemedi.",
-"Wrong password" => "Hatalı parola",
-"No user supplied" => "Kullanıcı girilmedi",
-"Please provide an admin recovery password, otherwise all user data will be lost" => "Lütfen yönetici kurtarma parolasını girin, aksi takdirde tüm kullanıcı verisi kaybedilecek",
-"Wrong admin recovery password. Please check the password and try again." => "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
-"Unable to change password" => "Parola değiştirilemiyor",
-"Saved" => "Kaydedildi",
-"test email settings" => "e-posta ayarlarını sına",
-"If you received this email, the settings seem to be correct." => "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
-"A problem occurred while sending the email. Please revise your settings." => "E-posta gönderilirken bir sorun oluştu. Lütfen ayarlarınızı gözden geçirin.",
-"Email sent" => "E-posta gönderildi",
-"You need to set your user email before being able to send test emails." => "Sınama e-postaları göndermeden önce kullanıcı e-postasını ayarlamanız gerekiyor.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "\"{domain}\" alan adını güvenilir alan adı olarak eklemek istediğinizden emin misiniz?",
-"Add trusted domain" => "Güvenilir alan adı ekle",
-"Sending..." => "Gönderiliyor...",
-"All" => "Tümü",
-"Please wait...." => "Lütfen bekleyin....",
-"Error while disabling app" => "Uygulama devre dışı bırakılırken hata",
-"Disable" => "Devre Dışı Bırak",
-"Enable" => "Etkinleştir",
-"Error while enabling app" => "Uygulama etkinleştirilirken hata",
-"Updating...." => "Güncelleniyor....",
-"Error while updating app" => "Uygulama güncellenirken hata",
-"Updated" => "Güncellendi",
-"Uninstalling ...." => "Kaldırılıyor ....",
-"Error while uninstalling app" => "Uygulama kaldırılırken hata",
-"Uninstall" => "Kaldır",
-"Select a profile picture" => "Bir profil fotoğrafı seçin",
-"Very weak password" => "Çok güçsüz parola",
-"Weak password" => "Güçsüz parola",
-"So-so password" => "Normal parola",
-"Good password" => "İyi parola",
-"Strong password" => "Güçlü parola",
-"Valid until {date}" => "{date} tarihine kadar geçerli",
-"Delete" => "Sil",
-"Decrypting files... Please wait, this can take some time." => "Dosyaların şifrelemesi kaldırılıyor... Lütfen bekleyin, bu biraz zaman alabilir.",
-"Delete encryption keys permanently." => "Şifreleme anahtarlarını kalıcı olarak sil.",
-"Restore encryption keys." => "Şifreleme anahtarlarını geri yükle.",
-"Groups" => "Gruplar",
-"Unable to delete {objName}" => "{objName} silinemiyor",
-"Error creating group" => "Grup oluşturulurken hata",
-"A valid group name must be provided" => "Geçerli bir grup adı mutlaka sağlanmalı",
-"deleted {groupName}" => "{groupName} silindi",
-"undo" => "geri al",
-"no group" => "grup yok",
-"never" => "hiçbir zaman",
-"deleted {userName}" => "{userName} silindi",
-"add group" => "grup ekle",
-"A valid username must be provided" => "Geçerli bir kullanıcı adı mutlaka sağlanmalı",
-"Error creating user" => "Kullanıcı oluşturulurken hata",
-"A valid password must be provided" => "Geçerli bir parola mutlaka sağlanmalı",
-"Warning: Home directory for user \"{user}\" already exists" => "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
-"__language_name__" => "Türkçe",
-"Personal Info" => "Kişisel Bilgi",
-"SSL root certificates" => "SSL kök sertifikaları",
-"Encryption" => "Şifreleme",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
-"Info, warnings, errors and fatal issues" => "Bilgi, uyarılar, hatalar ve ciddi sorunlar",
-"Warnings, errors and fatal issues" => "Uyarılar, hatalar ve ciddi sorunlar",
-"Errors and fatal issues" => "Hatalar ve ciddi sorunlar",
-"Fatal issues only" => "Sadece ciddi sorunlar",
-"None" => "Hiçbiri",
-"Login" => "Oturum Aç",
-"Plain" => "Düz",
-"NT LAN Manager" => "NT Ağ Yöneticisi",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Güvenlik Uyarısı",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s erişiminiz HTTP aracılığıyla yapılıyor. Sunucunuzu, HTTPS kullanımını zorlamak üzere yapılandırmanızı şiddetle öneririz.",
-"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." => "Veri dizininiz ve dosyalarınız muhtemelen İnternet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak veri dizinine erişimi kapatmanızı veya veri dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.",
-"Setup Warning" => "Kurulum Uyarısı",
-"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.",
-"Database Performance Info" => "Veritabanı Başarım Bilgisi",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "Veritabanı olarak SQLite kullanılıyor. Daha büyük kurulumlar için bunu değiştirmenizi öneririz. Farklı bir veritabanına geçiş yapmak için komut satırı aracını kullanın: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp",
-"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.",
-"Your PHP version is outdated" => "PHP sürümünüz eski",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "PHP sürümünüz eski. Eski sürümlerde sorun olduğundan 5.3.8 veya daha yeni bir sürüme güncellemenizi şiddetle tavsiye ederiz. Bu kurulumun da doğru çalışmaması da olasıdır.",
-"PHP charset is not set to UTF-8" => "PHP karakter kümesi UTF-8 olarak ayarlı değil",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP karakter kümesi UTF-8 olarak ayarlı değil. Bu, dosya isimlerindeki ASCII olmayan karakterler için büyük sorunlara yol açabilir. php.ini içerisindeki 'default_charset' ayarını 'UTF-8' olarak ayarlamanızı şiddetle tavsiye ediyoruz.",
-"Locale not working" => "Yerel çalışmıyor",
-"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 to install 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.",
-"URL generation in notification emails" => "Bildirim e-postalarında URL oluşturulması",
-"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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
-"Connectivity checks" => "Bağlanabilirlik kontrolleri",
-"No problems found" => "Sorun bulunamadı",
-"Please double check the <a href='%s'>installation guides</a>." => "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Son cron %s zamanında çalıştırıldı.",
-"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
-"Cron was not executed yet!" => "Cron henüz çalıştırılmadı!",
-"Execute one task with each page loaded" => "Yüklenen her sayfa ile bir görev çalıştır",
-"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.",
-"Sharing" => "Paylaşım",
-"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",
-"Enforce password protection" => "Parola korumasını zorla",
-"Allow public uploads" => "Herkes tarafından yüklemeye izin ver",
-"Set default expiration date" => "Öntanımlı son kullanma tarihini ayarla",
-"Expire after " => "Süre",
-"days" => "gün sonra dolsun",
-"Enforce expiration date" => "Son kullanma tarihini zorla",
-"Allow resharing" => "Yeniden paylaşıma izin ver",
-"Restrict users to only share with users in their groups" => "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına sınırla",
-"Allow users to send mail notification for shared files" => "Paylaşılmış dosyalar için kullanıcıların 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.",
-"Security" => "Güvenlik",
-"Enforce HTTPS" => "HTTPS bağlantısına zorla",
-"Forces the clients to connect to %s via an encrypted connection." => "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.",
-"Email Server" => "E-Posta Sunucusu",
-"This is used for sending out notifications." => "Bu, bildirimler gönderilirken kullanılır.",
-"Send mode" => "Gönderme kipi",
-"From address" => "Kimden adresi",
-"mail" => "posta",
-"Authentication method" => "Kimlik doğrulama yöntemi",
-"Authentication required" => "Kimlik doğrulama gerekli",
-"Server address" => "Sunucu adresi",
-"Port" => "Port",
-"Credentials" => "Kimlik Bilgileri",
-"SMTP Username" => "SMTP Kullanıcı Adı",
-"SMTP Password" => "SMTP Parolası",
-"Store credentials" => "Kimlik bilgilerini depola",
-"Test email settings" => "E-posta ayarlarını sına",
-"Send email" => "E-posta gönder",
-"Log" => "Günlük",
-"Log level" => "Günlük seviyesi",
-"More" => "Daha fazla",
-"Less" => "Daha az",
-"Version" => "Sürüm",
-"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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
-"More apps" => "Daha fazla Uygulama",
-"Add your app" => "Uygulamanızı ekleyin",
-"by" => "oluşturan",
-"licensed" => "lisanslı",
-"Documentation:" => "Belgelendirme:",
-"User Documentation" => "Kullanıcı Belgelendirmesi",
-"Admin Documentation" => "Yönetici Belgelendirmesi",
-"Update to %s" => "%s sürümüne güncelle",
-"Enable only for specific groups" => "Sadece belirli gruplar için etkinleştir",
-"Uninstall App" => "Uygulamayı Kaldır",
-"Administrator Documentation" => "Yönetici Belgelendirmesi",
-"Online Documentation" => "Çevrimiçi Belgelendirme",
-"Forum" => "Forum",
-"Bugtracker" => "Hata Takip Sistemi",
-"Commercial Support" => "Ticari Destek",
-"Get the apps to sync your files" => "Dosyalarınızı eşitlemek için uygulamaları indirin",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Projeyi desteklemek istiyorsanız\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">geliştirilmesine katılın</a>\n\t\tveya\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">bizi duyurun</a>!",
-"Show First Run Wizard again" => "İlk Çalıştırma Sihirbazı'nı yeniden göster",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Kullandığınız: <strong>%s</strong>. Kullanılabilir alan: <strong>%s</strong>",
-"Password" => "Parola",
-"Your password was changed" => "Parolanız değiştirildi",
-"Unable to change your password" => "Parolanız değiştirilemiyor",
-"Current password" => "Mevcut parola",
-"New password" => "Yeni parola",
-"Change password" => "Parola değiştir",
-"Full Name" => "Tam Adı",
-"Email" => "E-posta",
-"Your email address" => "E-posta adresiniz",
-"Fill in an email address to enable password recovery and receive notifications" => "Parola kurtarmayı ve bildirim almayı açmak için bir e-posta adresi girin",
-"Profile picture" => "Profil resmi",
-"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." => "PNG veya JPG. Genellikle karedir ancak kesebileceksiniz.",
-"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ç",
-"Language" => "Dil",
-"Help translate" => "Çevirilere yardım edin",
-"Common Name" => "Ortak Ad",
-"Valid until" => "Geçerlilik",
-"Issued By" => "Veren",
-"Valid until %s" => "%s tarihine kadar geçerli",
-"Import Root Certificate" => "Kök Sertifikalarını İçe Aktar",
-"The encryption app is no longer enabled, please decrypt all your files" => "Şifreleme uygulaması artık etkin değil, lütfen tüm dosyalarınızın şifrelemesini kaldırın",
-"Log-in password" => "Oturum açma parolası",
-"Decrypt all Files" => "Tüm Dosyaların Şifrelemesini Kaldır",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Şifreleme anahtarlarınız yedek bir konuma taşındı. Eğer bir şeyler yanlış gittiyse, anahtarlarınızı geri yükleyebilirsiniz. Bu anahtarları, sadece tüm dosyalarınızın şifrelemelerinin düzgün bir şekilde kaldırıldığından eminseniz kalıcı olarak silin.",
-"Restore Encryption Keys" => "Şifreleme Anahtarlarını Geri Yükle",
-"Delete Encryption Keys" => "Şifreleme Anahtarlarını Sil",
-"Show storage location" => "Depolama konumunu göster",
-"Show last log in" => "Son oturum açılma zamanını göster",
-"Login Name" => "Giriş Adı",
-"Create" => "Oluştur",
-"Admin Recovery Password" => "Yönetici Kurtarma Parolası",
-"Enter the recovery password in order to recover the users files during password change" => "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
-"Search Users and Groups" => "Kullanıcı ve Grupları Ara",
-"Add Group" => "Grup Ekle",
-"Group" => "Grup",
-"Everyone" => "Herkes",
-"Admins" => "Yöneticiler",
-"Default Quota" => "Öntanımlı Kota",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
-"Unlimited" => "Sınırsız",
-"Other" => "Diğer",
-"Username" => "Kullanıcı Adı",
-"Group Admin for" => "Grup Yöneticisi",
-"Quota" => "Kota",
-"Storage Location" => "Depolama Konumu",
-"Last Login" => "Son Giriş",
-"change full name" => "tam adı değiştir",
-"set new password" => "yeni parola belirle",
-"Default" => "Öntanımlı"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n > 1);";
diff --git a/settings/l10n/ug.js b/settings/l10n/ug.js
new file mode 100644
index 00000000000..76ee878feea
--- /dev/null
+++ b/settings/l10n/ug.js
@@ -0,0 +1,72 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Authentication error" : "سالاھىيەت دەلىللەش خاتالىقى",
+    "Group already exists" : "گۇرۇپپا مەۋجۇت",
+    "Unable to add group" : "گۇرۇپپا قوشقىلى بولمايدۇ",
+    "Email saved" : "تورخەت ساقلاندى",
+    "Invalid email" : "ئىناۋەتسىز تورخەت",
+    "Unable to delete group" : "گۇرۇپپىنى ئۆچۈرەلمىدى",
+    "Unable to delete user" : "ئىشلەتكۈچىنى ئۆچۈرەلمىدى",
+    "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." : "ئەپنى يېڭىلىيالمايدۇ.",
+    "All" : "ھەممىسى",
+    "Please wait...." : "سەل كۈتۈڭ…",
+    "Disable" : "چەكلە",
+    "Enable" : "قوزغات",
+    "Updating...." : "يېڭىلاۋاتىدۇ…",
+    "Error while updating app" : "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى",
+    "Updated" : "يېڭىلاندى",
+    "Delete" : "ئۆچۈر",
+    "Groups" : "گۇرۇپپا",
+    "undo" : "يېنىۋال",
+    "never" : "ھەرگىز",
+    "add group" : "گۇرۇپپا قوش",
+    "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+    "Error creating user" : "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
+    "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
+    "__language_name__" : "ئۇيغۇرچە",
+    "Encryption" : "شىفىرلاش",
+    "None" : "يوق",
+    "Login" : "تىزىمغا كىرىڭ",
+    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Setup Warning" : "ئاگاھلاندۇرۇش تەڭشەك",
+    "Module 'fileinfo' missing" : "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
+    "Sharing" : "ھەمبەھىر",
+    "Security" : "بىخەتەرلىك",
+    "Server address" : "مۇلازىمېتىر ئادرىسى",
+    "Port" : "ئېغىز",
+    "Log" : "خاتىرە",
+    "Log level" : "خاتىرە دەرىجىسى",
+    "More" : "تېخىمۇ كۆپ",
+    "Less" : "ئاز",
+    "Version" : "نەشرى",
+    "by" : "سەنئەتكار",
+    "User Documentation" : "ئىشلەتكۈچى قوللانمىسى",
+    "Administrator Documentation" : "باشقۇرغۇچى قوللانمىسى",
+    "Online Documentation" : "توردىكى قوللانما",
+    "Forum" : "مۇنبەر",
+    "Password" : "ئىم",
+    "Your password was changed" : "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى",
+    "Unable to change your password" : "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
+    "Current password" : "نۆۋەتتىكى ئىم",
+    "New password" : "يېڭى ئىم",
+    "Change password" : "ئىم ئۆزگەرت",
+    "Email" : "تورخەت",
+    "Your email address" : "تورخەت ئادرېسىڭىز",
+    "Cancel" : "ۋاز كەچ",
+    "Language" : "تىل",
+    "Help translate" : "تەرجىمىگە ياردەم",
+    "Login Name" : "تىزىمغا كىرىش ئاتى",
+    "Create" : "قۇر",
+    "Unlimited" : "چەكسىز",
+    "Other" : "باشقا",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "set new password" : "يېڭى ئىم تەڭشە",
+    "Default" : "كۆڭۈلدىكى"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/ug.json b/settings/l10n/ug.json
new file mode 100644
index 00000000000..babcddc048e
--- /dev/null
+++ b/settings/l10n/ug.json
@@ -0,0 +1,70 @@
+{ "translations": {
+    "Authentication error" : "سالاھىيەت دەلىللەش خاتالىقى",
+    "Group already exists" : "گۇرۇپپا مەۋجۇت",
+    "Unable to add group" : "گۇرۇپپا قوشقىلى بولمايدۇ",
+    "Email saved" : "تورخەت ساقلاندى",
+    "Invalid email" : "ئىناۋەتسىز تورخەت",
+    "Unable to delete group" : "گۇرۇپپىنى ئۆچۈرەلمىدى",
+    "Unable to delete user" : "ئىشلەتكۈچىنى ئۆچۈرەلمىدى",
+    "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." : "ئەپنى يېڭىلىيالمايدۇ.",
+    "All" : "ھەممىسى",
+    "Please wait...." : "سەل كۈتۈڭ…",
+    "Disable" : "چەكلە",
+    "Enable" : "قوزغات",
+    "Updating...." : "يېڭىلاۋاتىدۇ…",
+    "Error while updating app" : "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى",
+    "Updated" : "يېڭىلاندى",
+    "Delete" : "ئۆچۈر",
+    "Groups" : "گۇرۇپپا",
+    "undo" : "يېنىۋال",
+    "never" : "ھەرگىز",
+    "add group" : "گۇرۇپپا قوش",
+    "A valid username must be provided" : "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
+    "Error creating user" : "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
+    "A valid password must be provided" : "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
+    "__language_name__" : "ئۇيغۇرچە",
+    "Encryption" : "شىفىرلاش",
+    "None" : "يوق",
+    "Login" : "تىزىمغا كىرىڭ",
+    "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Setup Warning" : "ئاگاھلاندۇرۇش تەڭشەك",
+    "Module 'fileinfo' missing" : "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
+    "Sharing" : "ھەمبەھىر",
+    "Security" : "بىخەتەرلىك",
+    "Server address" : "مۇلازىمېتىر ئادرىسى",
+    "Port" : "ئېغىز",
+    "Log" : "خاتىرە",
+    "Log level" : "خاتىرە دەرىجىسى",
+    "More" : "تېخىمۇ كۆپ",
+    "Less" : "ئاز",
+    "Version" : "نەشرى",
+    "by" : "سەنئەتكار",
+    "User Documentation" : "ئىشلەتكۈچى قوللانمىسى",
+    "Administrator Documentation" : "باشقۇرغۇچى قوللانمىسى",
+    "Online Documentation" : "توردىكى قوللانما",
+    "Forum" : "مۇنبەر",
+    "Password" : "ئىم",
+    "Your password was changed" : "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى",
+    "Unable to change your password" : "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
+    "Current password" : "نۆۋەتتىكى ئىم",
+    "New password" : "يېڭى ئىم",
+    "Change password" : "ئىم ئۆزگەرت",
+    "Email" : "تورخەت",
+    "Your email address" : "تورخەت ئادرېسىڭىز",
+    "Cancel" : "ۋاز كەچ",
+    "Language" : "تىل",
+    "Help translate" : "تەرجىمىگە ياردەم",
+    "Login Name" : "تىزىمغا كىرىش ئاتى",
+    "Create" : "قۇر",
+    "Unlimited" : "چەكسىز",
+    "Other" : "باشقا",
+    "Username" : "ئىشلەتكۈچى ئاتى",
+    "set new password" : "يېڭى ئىم تەڭشە",
+    "Default" : "كۆڭۈلدىكى"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/ug.php b/settings/l10n/ug.php
deleted file mode 100644
index 0bd29895d96..00000000000
--- a/settings/l10n/ug.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Authentication error" => "سالاھىيەت دەلىللەش خاتالىقى",
-"Group already exists" => "گۇرۇپپا مەۋجۇت",
-"Unable to add group" => "گۇرۇپپا قوشقىلى بولمايدۇ",
-"Email saved" => "تورخەت ساقلاندى",
-"Invalid email" => "ئىناۋەتسىز تورخەت",
-"Unable to delete group" => "گۇرۇپپىنى ئۆچۈرەلمىدى",
-"Unable to delete user" => "ئىشلەتكۈچىنى ئۆچۈرەلمىدى",
-"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." => "ئەپنى يېڭىلىيالمايدۇ.",
-"All" => "ھەممىسى",
-"Please wait...." => "سەل كۈتۈڭ…",
-"Disable" => "چەكلە",
-"Enable" => "قوزغات",
-"Updating...." => "يېڭىلاۋاتىدۇ…",
-"Error while updating app" => "ئەپنى يېڭىلاۋاتقاندا خاتالىق كۆرۈلدى",
-"Updated" => "يېڭىلاندى",
-"Delete" => "ئۆچۈر",
-"Groups" => "گۇرۇپپا",
-"undo" => "يېنىۋال",
-"never" => "ھەرگىز",
-"add group" => "گۇرۇپپا قوش",
-"A valid username must be provided" => "چوقۇم ئىناۋەتلىك ئىشلەتكۈچى ئىسمىدىن بىرنى تەمىنلەش كېرەك",
-"Error creating user" => "ئىشلەتكۈچى قۇرۇۋاتقاندا خاتالىق كۆرۈلدى",
-"A valid password must be provided" => "چوقۇم ئىناۋەتلىك ئىم تەمىنلەش كېرەك",
-"__language_name__" => "ئۇيغۇرچە",
-"Encryption" => "شىفىرلاش",
-"None" => "يوق",
-"Login" => "تىزىمغا كىرىڭ",
-"Security Warning" => "بىخەتەرلىك ئاگاھلاندۇرۇش",
-"Setup Warning" => "ئاگاھلاندۇرۇش تەڭشەك",
-"Module 'fileinfo' missing" => "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
-"Sharing" => "ھەمبەھىر",
-"Security" => "بىخەتەرلىك",
-"Server address" => "مۇلازىمېتىر ئادرىسى",
-"Port" => "ئېغىز",
-"Log" => "خاتىرە",
-"Log level" => "خاتىرە دەرىجىسى",
-"More" => "تېخىمۇ كۆپ",
-"Less" => "ئاز",
-"Version" => "نەشرى",
-"by" => "سەنئەتكار",
-"User Documentation" => "ئىشلەتكۈچى قوللانمىسى",
-"Administrator Documentation" => "باشقۇرغۇچى قوللانمىسى",
-"Online Documentation" => "توردىكى قوللانما",
-"Forum" => "مۇنبەر",
-"Password" => "ئىم",
-"Your password was changed" => "ئىمىڭىز مۇۋەپپەقىيەتلىك ئۆزگەرتىلدى",
-"Unable to change your password" => "ئىمنى ئۆزگەرتكىلى بولمايدۇ.",
-"Current password" => "نۆۋەتتىكى ئىم",
-"New password" => "يېڭى ئىم",
-"Change password" => "ئىم ئۆزگەرت",
-"Email" => "تورخەت",
-"Your email address" => "تورخەت ئادرېسىڭىز",
-"Cancel" => "ۋاز كەچ",
-"Language" => "تىل",
-"Help translate" => "تەرجىمىگە ياردەم",
-"Login Name" => "تىزىمغا كىرىش ئاتى",
-"Create" => "قۇر",
-"Unlimited" => "چەكسىز",
-"Other" => "باشقا",
-"Username" => "ئىشلەتكۈچى ئاتى",
-"set new password" => "يېڭى ئىم تەڭشە",
-"Default" => "كۆڭۈلدىكى"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
new file mode 100644
index 00000000000..fc1798dbbeb
--- /dev/null
+++ b/settings/l10n/uk.js
@@ -0,0 +1,237 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Увімкнено",
+    "Not enabled" : "Вимкнено",
+    "Recommended" : "Рекомендуємо",
+    "Authentication error" : "Помилка автентифікації",
+    "Your full name has been changed." : "Ваше ім'я було змінене",
+    "Unable to change full name" : "Неможливо змінити ім'я",
+    "Group already exists" : "Група вже існує",
+    "Unable to add group" : "Не вдалося додати групу",
+    "Files decrypted successfully" : "Файли розшифровані успішно",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "Couldn't decrypt your files, check your password and try again" : "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
+    "Encryption keys deleted permanently" : "Ключі шифрування видалені назавжди",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "Couldn't remove app." : "Неможливо видалити додаток.",
+    "Email saved" : "Адресу збережено",
+    "Invalid email" : "Невірна адреса",
+    "Unable to delete group" : "Не вдалося видалити групу",
+    "Unable to delete user" : "Не вдалося видалити користувача",
+    "Backups restored successfully" : "Резервна копія успішно відновлена",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "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." : "Не вдалося оновити програму. ",
+    "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." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Система не підтримує зміни пароля, але ключ шифрування користувача успішно оновлено.",
+    "Unable to change password" : "Неможливо змінити пароль",
+    "Saved" : "Збереженно",
+    "test email settings" : "перевірити налаштування електронної пошти",
+    "If you received this email, the settings seem to be correct." : "Якщо ви отримали цього листа, налаштування вірні.",
+    "A problem occurred while sending the email. Please revise your settings." : "Під час надсилання листа виникли проблеми. Будь ласка перевірте налаштування.",
+    "Email sent" : "Ел. пошта надіслана",
+    "You need to set your user email before being able to send test emails." : "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ви дійсно бажаєте додати \"{domain}\" як довірений домен?",
+    "Add trusted domain" : "Додати довірений домен",
+    "Sending..." : "Надсилання...",
+    "All" : "Всі",
+    "Please wait...." : "Зачекайте, будь ласка...",
+    "Error while disabling app" : "Помилка відключення додатка",
+    "Disable" : "Вимкнути",
+    "Enable" : "Включити",
+    "Error while enabling app" : "Помилка підключення додатка",
+    "Updating...." : "Оновлюється...",
+    "Error while updating app" : "Помилка при оновленні програми",
+    "Updated" : "Оновлено",
+    "Uninstalling ...." : "Видалення...",
+    "Error while uninstalling app" : "Помилка видалення додатка",
+    "Uninstall" : "Видалити",
+    "Select a profile picture" : "Обрати зображення облікового запису",
+    "Very weak password" : "Дуже слабкий пароль",
+    "Weak password" : "Слабкий пароль",
+    "So-so password" : "Такий собі пароль",
+    "Good password" : "Добрий пароль",
+    "Strong password" : "Надійний пароль",
+    "Valid until {date}" : "Дійсно до {date}",
+    "Delete" : "Видалити",
+    "Decrypting files... Please wait, this can take some time." : "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
+    "Delete encryption keys permanently." : "Видалити ключі шифрування назавжди.",
+    "Restore encryption keys." : "Відновити ключі шифрування.",
+    "Groups" : "Групи",
+    "Unable to delete {objName}" : "Не вдалося видалити {objName}",
+    "Error creating group" : "Помилка створення групи",
+    "A valid group name must be provided" : "Потрібно задати вірне ім'я групи",
+    "deleted {groupName}" : "видалено {groupName}",
+    "undo" : "відмінити",
+    "never" : "ніколи",
+    "deleted {userName}" : "видалено {userName}",
+    "add group" : "додати групу",
+    "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
+    "Error creating user" : "Помилка при створенні користувача",
+    "A valid password must be provided" : "Потрібно задати вірний пароль",
+    "Warning: Home directory for user \"{user}\" already exists" : "Попередження: домашня тека користувача \"{user}\" вже існує",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL корневі сертифікати",
+    "Encryption" : "Шифрування",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
+    "Info, warnings, errors and fatal issues" : "Інформаційні, попередження, помилки та критичні проблеми",
+    "Warnings, errors and fatal issues" : "Попередження, помилки та критичні проблеми",
+    "Errors and fatal issues" : "Помилки та критичні проблеми",
+    "Fatal issues only" : "Тільки критичні проблеми",
+    "None" : "Жоден",
+    "Login" : "Логін",
+    "Plain" : "Звичайний",
+    "NT LAN Manager" : "Менеджер NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Попередження про небезпеку",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Ви звертаєтесь до %s за допомогою HTTP. Ми наполегливо рекомендуємо вам налаштувати сервер на використання HTTPS.",
+    "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." : "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
+    "Setup Warning" : "Попередження при Налаштуванні",
+    "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.",
+    "Database Performance Info" : "Інформація продуктивності баз даних",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "В якості бази даних використовується SQLite. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Модуль 'fileinfo' відсутній",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.",
+    "Your PHP version is outdated" : "Ваш версія PHP застаріла",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Ваш версія PHP застаріла. Ми наполегливо рекомендуємо оновитися до версії 5.3.8 або новішої, оскільки старі версії працюють не правильно.  ",
+    "PHP charset is not set to UTF-8" : "Кодування PHP не співпадає з UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодування PHP не співпадає з UTF-8. Це може викликати проблеми іменами файлів, які містять нелатинські символи. Ми наполегливо рекомендуємо змінити значення перемінної default_charset у файлі php.ini на UTF-8.",
+    "Locale not working" : "Локалізація не працює",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
+    "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
+    "Connectivity checks" : "Перевірка з'єднання",
+    "No problems found" : "Проблем не виявленно",
+    "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, 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 хвилин.",
+    "Sharing" : "Спільний доступ",
+    "Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
+    "Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
+    "Enforce password protection" : "Захист паролем обов'язковий",
+    "Allow public uploads" : "Дозволити публічне завантаження",
+    "Set default expiration date" : "Встановити термін дії за замовчуванням",
+    "Expire after " : "Скінчиться через",
+    "days" : "днів",
+    "Enforce expiration date" : "Термін дії обов'язково",
+    "Allow resharing" : "Дозволити перевідкривати спільний доступ",
+    "Restrict users to only share with users in their groups" : "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
+    "Allow users to send mail notification for shared files" : "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
+    "Exclude groups from sharing" : "Виключити групи зі спільного доступу",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
+    "Security" : "Безпека",
+    "Enforce HTTPS" : "Примусове застосування HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Зобов'язати клієнтів під'єднуватись до %s через шифроване з'єднання.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Будь ласка, під'єднайтесь до цього %s за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
+    "Email Server" : "Сервер електронної пошти",
+    "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
+    "Send mode" : "Надіслати повідомлення",
+    "From address" : "Адреса відправника",
+    "mail" : "пошта",
+    "Authentication method" : "Метод перевірки автентифікації",
+    "Authentication required" : "Потрібна аутентифікація",
+    "Server address" : "Адреса сервера",
+    "Port" : "Порт",
+    "Credentials" : "Облікові дані",
+    "SMTP Username" : "Ім'я користувача SMTP",
+    "SMTP Password" : "Пароль SMTP",
+    "Store credentials" : "Зберігання облікових даних",
+    "Test email settings" : "Перевірити налаштування електронної пошти",
+    "Send email" : "Надіслати листа",
+    "Log" : "Протокол",
+    "Log level" : "Рівень протоколювання",
+    "More" : "Більше",
+    "Less" : "Менше",
+    "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>." : "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Більше додатків",
+    "Add your app" : "Додати свій додаток",
+    "by" : "по",
+    "licensed" : "Ліцензовано",
+    "Documentation:" : "Документація:",
+    "User Documentation" : "Документація Користувача",
+    "Admin Documentation" : "Документація Адміністратора",
+    "Update to %s" : "Оновити до %s",
+    "Enable only for specific groups" : "Включити тільки для конкретних груп",
+    "Uninstall App" : "Видалити додаток",
+    "Administrator Documentation" : "Документація Адміністратора",
+    "Online Documentation" : "Он-Лайн Документація",
+    "Forum" : "Форум",
+    "Bugtracker" : "БагТрекер",
+    "Commercial Support" : "Комерційна підтримка",
+    "Get the apps to sync your files" : "Отримати додатки для синхронізації ваших файлів",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Якщо ви бажаєте підтримати прект\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥target=\"_blank\">приєднуйтесь до розробки</a>\n⇥⇥або\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥target=\"_blank\">розкажіть про нас</a>!",
+    "Show First Run Wizard again" : "Показувати Майстер Налаштувань знову",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
+    "Password" : "Пароль",
+    "Your password was changed" : "Ваш пароль змінено",
+    "Unable to change your password" : "Не вдалося змінити Ваш пароль",
+    "Current password" : "Поточний пароль",
+    "New password" : "Новий пароль",
+    "Change password" : "Змінити пароль",
+    "Full Name" : "Повне Ім'я",
+    "Email" : "Ел.пошта",
+    "Your email address" : "Ваша адреса електронної пошти",
+    "Fill in an email address to enable password recovery and receive notifications" : "Введіть адресу електронної пошти, щоб ввімкнути відновлення паролю та отримання повідомлень",
+    "Profile picture" : "Зображення облікового запису",
+    "Upload new" : "Завантажити нове",
+    "Select new from Files" : "Обрати із завантажених файлів",
+    "Remove image" : "Видалити зображення",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Допустимі формати: png і jpg. Якщо зображення не квадратне, то ви зможете його обрізати.",
+    "Your avatar is provided by your original account." : "Буде використано аватар вашого оригінального облікового запису.",
+    "Cancel" : "Відмінити",
+    "Choose as profile image" : "Обрати зображенням облікового запису",
+    "Language" : "Мова",
+    "Help translate" : "Допомогти з перекладом",
+    "Common Name" : "Ім'я:",
+    "Valid until" : "Дійсно до",
+    "Issued By" : "Виданий",
+    "Valid until %s" : "Дійсно до %s",
+    "Import Root Certificate" : "Імпортувати корневі сертифікати",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
+    "Log-in password" : "Пароль входу",
+    "Decrypt all Files" : "Розшифрувати всі файли",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
+    "Restore Encryption Keys" : "Відновити ключі шифрування",
+    "Delete Encryption Keys" : "Видалити ключі шифрування",
+    "Show storage location" : "Показати місцезнаходження сховища",
+    "Show last log in" : "Показати останній вхід в систему",
+    "Login Name" : "Ім'я Логіну",
+    "Create" : "Створити",
+    "Admin Recovery Password" : "Пароль адміністратора для відновлення",
+    "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
+    "Search Users and Groups" : "Шукати користувачів та групи",
+    "Add Group" : "Додати групу",
+    "Group" : "Група",
+    "Everyone" : "Всі",
+    "Admins" : "Адміністратори",
+    "Default Quota" : "Квота за замовчуванням",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
+    "Unlimited" : "Необмежено",
+    "Other" : "Інше",
+    "Username" : "Ім'я користувача",
+    "Quota" : "Квота",
+    "Storage Location" : "Місцезнаходження сховища",
+    "Last Login" : "Останній вхід",
+    "change full name" : "змінити ім'я",
+    "set new password" : "встановити новий пароль",
+    "Default" : "За замовчуванням"
+},
+"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/settings/l10n/uk.json b/settings/l10n/uk.json
new file mode 100644
index 00000000000..3a5088ef069
--- /dev/null
+++ b/settings/l10n/uk.json
@@ -0,0 +1,235 @@
+{ "translations": {
+    "Enabled" : "Увімкнено",
+    "Not enabled" : "Вимкнено",
+    "Recommended" : "Рекомендуємо",
+    "Authentication error" : "Помилка автентифікації",
+    "Your full name has been changed." : "Ваше ім'я було змінене",
+    "Unable to change full name" : "Неможливо змінити ім'я",
+    "Group already exists" : "Група вже існує",
+    "Unable to add group" : "Не вдалося додати групу",
+    "Files decrypted successfully" : "Файли розшифровані успішно",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "Couldn't decrypt your files, check your password and try again" : "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
+    "Encryption keys deleted permanently" : "Ключі шифрування видалені назавжди",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "Couldn't remove app." : "Неможливо видалити додаток.",
+    "Email saved" : "Адресу збережено",
+    "Invalid email" : "Невірна адреса",
+    "Unable to delete group" : "Не вдалося видалити групу",
+    "Unable to delete user" : "Не вдалося видалити користувача",
+    "Backups restored successfully" : "Резервна копія успішно відновлена",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
+    "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." : "Не вдалося оновити програму. ",
+    "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." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Система не підтримує зміни пароля, але ключ шифрування користувача успішно оновлено.",
+    "Unable to change password" : "Неможливо змінити пароль",
+    "Saved" : "Збереженно",
+    "test email settings" : "перевірити налаштування електронної пошти",
+    "If you received this email, the settings seem to be correct." : "Якщо ви отримали цього листа, налаштування вірні.",
+    "A problem occurred while sending the email. Please revise your settings." : "Під час надсилання листа виникли проблеми. Будь ласка перевірте налаштування.",
+    "Email sent" : "Ел. пошта надіслана",
+    "You need to set your user email before being able to send test emails." : "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ви дійсно бажаєте додати \"{domain}\" як довірений домен?",
+    "Add trusted domain" : "Додати довірений домен",
+    "Sending..." : "Надсилання...",
+    "All" : "Всі",
+    "Please wait...." : "Зачекайте, будь ласка...",
+    "Error while disabling app" : "Помилка відключення додатка",
+    "Disable" : "Вимкнути",
+    "Enable" : "Включити",
+    "Error while enabling app" : "Помилка підключення додатка",
+    "Updating...." : "Оновлюється...",
+    "Error while updating app" : "Помилка при оновленні програми",
+    "Updated" : "Оновлено",
+    "Uninstalling ...." : "Видалення...",
+    "Error while uninstalling app" : "Помилка видалення додатка",
+    "Uninstall" : "Видалити",
+    "Select a profile picture" : "Обрати зображення облікового запису",
+    "Very weak password" : "Дуже слабкий пароль",
+    "Weak password" : "Слабкий пароль",
+    "So-so password" : "Такий собі пароль",
+    "Good password" : "Добрий пароль",
+    "Strong password" : "Надійний пароль",
+    "Valid until {date}" : "Дійсно до {date}",
+    "Delete" : "Видалити",
+    "Decrypting files... Please wait, this can take some time." : "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
+    "Delete encryption keys permanently." : "Видалити ключі шифрування назавжди.",
+    "Restore encryption keys." : "Відновити ключі шифрування.",
+    "Groups" : "Групи",
+    "Unable to delete {objName}" : "Не вдалося видалити {objName}",
+    "Error creating group" : "Помилка створення групи",
+    "A valid group name must be provided" : "Потрібно задати вірне ім'я групи",
+    "deleted {groupName}" : "видалено {groupName}",
+    "undo" : "відмінити",
+    "never" : "ніколи",
+    "deleted {userName}" : "видалено {userName}",
+    "add group" : "додати групу",
+    "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
+    "Error creating user" : "Помилка при створенні користувача",
+    "A valid password must be provided" : "Потрібно задати вірний пароль",
+    "Warning: Home directory for user \"{user}\" already exists" : "Попередження: домашня тека користувача \"{user}\" вже існує",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL корневі сертифікати",
+    "Encryption" : "Шифрування",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
+    "Info, warnings, errors and fatal issues" : "Інформаційні, попередження, помилки та критичні проблеми",
+    "Warnings, errors and fatal issues" : "Попередження, помилки та критичні проблеми",
+    "Errors and fatal issues" : "Помилки та критичні проблеми",
+    "Fatal issues only" : "Тільки критичні проблеми",
+    "None" : "Жоден",
+    "Login" : "Логін",
+    "Plain" : "Звичайний",
+    "NT LAN Manager" : "Менеджер NT LAN",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "Попередження про небезпеку",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Ви звертаєтесь до %s за допомогою HTTP. Ми наполегливо рекомендуємо вам налаштувати сервер на використання HTTPS.",
+    "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." : "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
+    "Setup Warning" : "Попередження при Налаштуванні",
+    "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.",
+    "Database Performance Info" : "Інформація продуктивності баз даних",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "В якості бази даних використовується SQLite. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-type'",
+    "Module 'fileinfo' missing" : "Модуль 'fileinfo' відсутній",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.",
+    "Your PHP version is outdated" : "Ваш версія PHP застаріла",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Ваш версія PHP застаріла. Ми наполегливо рекомендуємо оновитися до версії 5.3.8 або новішої, оскільки старі версії працюють не правильно.  ",
+    "PHP charset is not set to UTF-8" : "Кодування PHP не співпадає з UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Кодування PHP не співпадає з UTF-8. Це може викликати проблеми іменами файлів, які містять нелатинські символи. Ми наполегливо рекомендуємо змінити значення перемінної default_charset у файлі php.ini на UTF-8.",
+    "Locale not working" : "Локалізація не працює",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
+    "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
+    "Connectivity checks" : "Перевірка з'єднання",
+    "No problems found" : "Проблем не виявленно",
+    "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
+    "Last cron was executed at %s. This is more than an hour ago, 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 хвилин.",
+    "Sharing" : "Спільний доступ",
+    "Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
+    "Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
+    "Enforce password protection" : "Захист паролем обов'язковий",
+    "Allow public uploads" : "Дозволити публічне завантаження",
+    "Set default expiration date" : "Встановити термін дії за замовчуванням",
+    "Expire after " : "Скінчиться через",
+    "days" : "днів",
+    "Enforce expiration date" : "Термін дії обов'язково",
+    "Allow resharing" : "Дозволити перевідкривати спільний доступ",
+    "Restrict users to only share with users in their groups" : "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
+    "Allow users to send mail notification for shared files" : "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
+    "Exclude groups from sharing" : "Виключити групи зі спільного доступу",
+    "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
+    "Security" : "Безпека",
+    "Enforce HTTPS" : "Примусове застосування HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "Зобов'язати клієнтів під'єднуватись до %s через шифроване з'єднання.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Будь ласка, під'єднайтесь до цього %s за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
+    "Email Server" : "Сервер електронної пошти",
+    "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
+    "Send mode" : "Надіслати повідомлення",
+    "From address" : "Адреса відправника",
+    "mail" : "пошта",
+    "Authentication method" : "Метод перевірки автентифікації",
+    "Authentication required" : "Потрібна аутентифікація",
+    "Server address" : "Адреса сервера",
+    "Port" : "Порт",
+    "Credentials" : "Облікові дані",
+    "SMTP Username" : "Ім'я користувача SMTP",
+    "SMTP Password" : "Пароль SMTP",
+    "Store credentials" : "Зберігання облікових даних",
+    "Test email settings" : "Перевірити налаштування електронної пошти",
+    "Send email" : "Надіслати листа",
+    "Log" : "Протокол",
+    "Log level" : "Рівень протоколювання",
+    "More" : "Більше",
+    "Less" : "Менше",
+    "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>." : "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "More apps" : "Більше додатків",
+    "Add your app" : "Додати свій додаток",
+    "by" : "по",
+    "licensed" : "Ліцензовано",
+    "Documentation:" : "Документація:",
+    "User Documentation" : "Документація Користувача",
+    "Admin Documentation" : "Документація Адміністратора",
+    "Update to %s" : "Оновити до %s",
+    "Enable only for specific groups" : "Включити тільки для конкретних груп",
+    "Uninstall App" : "Видалити додаток",
+    "Administrator Documentation" : "Документація Адміністратора",
+    "Online Documentation" : "Он-Лайн Документація",
+    "Forum" : "Форум",
+    "Bugtracker" : "БагТрекер",
+    "Commercial Support" : "Комерційна підтримка",
+    "Get the apps to sync your files" : "Отримати додатки для синхронізації ваших файлів",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Якщо ви бажаєте підтримати прект\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥target=\"_blank\">приєднуйтесь до розробки</a>\n⇥⇥або\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥target=\"_blank\">розкажіть про нас</a>!",
+    "Show First Run Wizard again" : "Показувати Майстер Налаштувань знову",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
+    "Password" : "Пароль",
+    "Your password was changed" : "Ваш пароль змінено",
+    "Unable to change your password" : "Не вдалося змінити Ваш пароль",
+    "Current password" : "Поточний пароль",
+    "New password" : "Новий пароль",
+    "Change password" : "Змінити пароль",
+    "Full Name" : "Повне Ім'я",
+    "Email" : "Ел.пошта",
+    "Your email address" : "Ваша адреса електронної пошти",
+    "Fill in an email address to enable password recovery and receive notifications" : "Введіть адресу електронної пошти, щоб ввімкнути відновлення паролю та отримання повідомлень",
+    "Profile picture" : "Зображення облікового запису",
+    "Upload new" : "Завантажити нове",
+    "Select new from Files" : "Обрати із завантажених файлів",
+    "Remove image" : "Видалити зображення",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Допустимі формати: png і jpg. Якщо зображення не квадратне, то ви зможете його обрізати.",
+    "Your avatar is provided by your original account." : "Буде використано аватар вашого оригінального облікового запису.",
+    "Cancel" : "Відмінити",
+    "Choose as profile image" : "Обрати зображенням облікового запису",
+    "Language" : "Мова",
+    "Help translate" : "Допомогти з перекладом",
+    "Common Name" : "Ім'я:",
+    "Valid until" : "Дійсно до",
+    "Issued By" : "Виданий",
+    "Valid until %s" : "Дійсно до %s",
+    "Import Root Certificate" : "Імпортувати корневі сертифікати",
+    "The encryption app is no longer enabled, please decrypt all your files" : "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
+    "Log-in password" : "Пароль входу",
+    "Decrypt all Files" : "Розшифрувати всі файли",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
+    "Restore Encryption Keys" : "Відновити ключі шифрування",
+    "Delete Encryption Keys" : "Видалити ключі шифрування",
+    "Show storage location" : "Показати місцезнаходження сховища",
+    "Show last log in" : "Показати останній вхід в систему",
+    "Login Name" : "Ім'я Логіну",
+    "Create" : "Створити",
+    "Admin Recovery Password" : "Пароль адміністратора для відновлення",
+    "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
+    "Search Users and Groups" : "Шукати користувачів та групи",
+    "Add Group" : "Додати групу",
+    "Group" : "Група",
+    "Everyone" : "Всі",
+    "Admins" : "Адміністратори",
+    "Default Quota" : "Квота за замовчуванням",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
+    "Unlimited" : "Необмежено",
+    "Other" : "Інше",
+    "Username" : "Ім'я користувача",
+    "Quota" : "Квота",
+    "Storage Location" : "Місцезнаходження сховища",
+    "Last Login" : "Останній вхід",
+    "change full name" : "змінити ім'я",
+    "set new password" : "встановити новий пароль",
+    "Default" : "За замовчуванням"
+},"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/settings/l10n/uk.php b/settings/l10n/uk.php
deleted file mode 100644
index 39cb54a4f1a..00000000000
--- a/settings/l10n/uk.php
+++ /dev/null
@@ -1,239 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Увімкнено",
-"Not enabled" => "Вимкнено",
-"Recommended" => "Рекомендуємо",
-"Authentication error" => "Помилка автентифікації",
-"Your full name has been changed." => "Ваше ім'я було змінене",
-"Unable to change full name" => "Неможливо змінити ім'я",
-"Group already exists" => "Група вже існує",
-"Unable to add group" => "Не вдалося додати групу",
-"Files decrypted successfully" => "Файли розшифровані успішно",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "Помилка розшифровки файлів, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
-"Couldn't decrypt your files, check your password and try again" => "Помилка розшифровки файлів, перевірте пароль та спробуйте ще раз",
-"Encryption keys deleted permanently" => "Ключі шифрування видалені назавжди",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "Неможливо видалити назавжди ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
-"Couldn't remove app." => "Неможливо видалити додаток.",
-"Email saved" => "Адресу збережено",
-"Invalid email" => "Невірна адреса",
-"Unable to delete group" => "Не вдалося видалити групу",
-"Unable to delete user" => "Не вдалося видалити користувача",
-"Backups restored successfully" => "Резервна копія успішно відновлена",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "Неможливо відновити ключі шифрування, зверніться до вашого адміністратора. Додаткова інформація в owncloud.log",
-"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." => "Не вдалося оновити програму. ",
-"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." => "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "Система не підтримує зміни пароля, але ключ шифрування користувача успішно оновлено.",
-"Unable to change password" => "Неможливо змінити пароль",
-"Saved" => "Збереженно",
-"test email settings" => "перевірити налаштування електронної пошти",
-"If you received this email, the settings seem to be correct." => "Якщо ви отримали цього листа, налаштування вірні.",
-"A problem occurred while sending the email. Please revise your settings." => "Під час надсилання листа виникли проблеми. Будь ласка перевірте налаштування.",
-"Email sent" => "Ел. пошта надіслана",
-"You need to set your user email before being able to send test emails." => "Перед надсиланням тестових повідомлень ви повинні вказати свою електронну адресу.",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "Ви дійсно бажаєте додати \"{domain}\" як довірений домен?",
-"Add trusted domain" => "Додати довірений домен",
-"Sending..." => "Надсилання...",
-"All" => "Всі",
-"Please wait...." => "Зачекайте, будь ласка...",
-"Error while disabling app" => "Помилка відключення додатка",
-"Disable" => "Вимкнути",
-"Enable" => "Включити",
-"Error while enabling app" => "Помилка підключення додатка",
-"Updating...." => "Оновлюється...",
-"Error while updating app" => "Помилка при оновленні програми",
-"Updated" => "Оновлено",
-"Uninstalling ...." => "Видалення...",
-"Error while uninstalling app" => "Помилка видалення додатка",
-"Uninstall" => "Видалити",
-"Select a profile picture" => "Обрати зображення облікового запису",
-"Very weak password" => "Дуже слабкий пароль",
-"Weak password" => "Слабкий пароль",
-"So-so password" => "Такий собі пароль",
-"Good password" => "Добрий пароль",
-"Strong password" => "Надійний пароль",
-"Valid until {date}" => "Дійсно до {date}",
-"Delete" => "Видалити",
-"Decrypting files... Please wait, this can take some time." => "Розшифровка файлів... Будь ласка, зачекайте, це може зайняти деякий час.",
-"Delete encryption keys permanently." => "Видалити ключі шифрування назавжди.",
-"Restore encryption keys." => "Відновити ключі шифрування.",
-"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" => "додати групу",
-"A valid username must be provided" => "Потрібно задати вірне ім'я користувача",
-"Error creating user" => "Помилка при створенні користувача",
-"A valid password must be provided" => "Потрібно задати вірний пароль",
-"Warning: Home directory for user \"{user}\" already exists" => "Попередження: домашня тека користувача \"{user}\" вже існує",
-"__language_name__" => "__language_name__",
-"Personal Info" => "Особиста інформація",
-"SSL root certificates" => "SSL корневі сертифікати",
-"Encryption" => "Шифрування",
-"Everything (fatal issues, errors, warnings, info, debug)" => "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
-"Info, warnings, errors and fatal issues" => "Інформаційні, попередження, помилки та критичні проблеми",
-"Warnings, errors and fatal issues" => "Попередження, помилки та критичні проблеми",
-"Errors and fatal issues" => "Помилки та критичні проблеми",
-"Fatal issues only" => "Тільки критичні проблеми",
-"None" => "Жоден",
-"Login" => "Логін",
-"Plain" => "Звичайний",
-"NT LAN Manager" => "Менеджер NT LAN",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "Попередження про небезпеку",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Ви звертаєтесь до %s за допомогою HTTP. Ми наполегливо рекомендуємо вам налаштувати сервер на використання HTTPS.",
-"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." => "Ваш каталог з даними та Ваші файли можливо доступні з Інтернету. Файл .htaccess, наданий з ownCloud, не працює. Ми наполегливо рекомендуємо Вам налаштувати свій веб-сервер таким чином, щоб каталог data більше не був доступний, або перемістити каталог data за межі кореневого каталогу документів веб-сервера.",
-"Setup Warning" => "Попередження при Налаштуванні",
-"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.",
-"Database Performance Info" => "Інформація продуктивності баз даних",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "В якості бази даних використовується SQLite. Для більш навантажених серверів, ми рекомендуємо користуватися іншими типами баз даних. Для зміни типу бази даних використовуйте інструмент командного рядка: 'occ db:convert-type'",
-"Module 'fileinfo' missing" => "Модуль 'fileinfo' відсутній",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP модуль 'fileinfo' відсутній. Ми наполегливо рекомендуємо увімкнути цей модуль, щоб отримати кращі результати при виявленні MIME-типів.",
-"Your PHP version is outdated" => "Ваш версія PHP застаріла",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "Ваш версія PHP застаріла. Ми наполегливо рекомендуємо оновитися до версії 5.3.8 або новішої, оскільки старі версії працюють не правильно.  ",
-"PHP charset is not set to UTF-8" => "Кодування PHP не співпадає з UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "Кодування PHP не співпадає з UTF-8. Це може викликати проблеми іменами файлів, які містять нелатинські символи. Ми наполегливо рекомендуємо змінити значення перемінної default_charset у файлі php.ini на UTF-8.",
-"Locale not working" => "Локалізація не працює",
-"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 to install the required packages on your system to support one of the following locales: %s." => "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
-"URL generation in notification emails" => "Генерування URL для повідомлень в електроних листах",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
-"Connectivity checks" => "Перевірка з'єднання",
-"No problems found" => "Проблем не виявленно",
-"Please double check the <a href='%s'>installation guides</a>." => "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "Останню cron-задачу було запущено: %s.",
-"Last cron was executed at %s. This is more than an hour ago, 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 хвилин.",
-"Sharing" => "Спільний доступ",
-"Allow apps to use the Share API" => "Дозволити програмам використовувати API спільного доступу",
-"Allow users to share via link" => "Дозволити користувачам ділитися через посилання",
-"Enforce password protection" => "Захист паролем обов'язковий",
-"Allow public uploads" => "Дозволити публічне завантаження",
-"Set default expiration date" => "Встановити термін дії за замовчуванням",
-"Expire after " => "Скінчиться через",
-"days" => "днів",
-"Enforce expiration date" => "Термін дії обов'язково",
-"Allow resharing" => "Дозволити перевідкривати спільний доступ",
-"Restrict users to only share with users in their groups" => "Дозволити користувачам відкривати спільний доступ лише для користувачів з їхньої групи",
-"Allow users to send mail notification for shared files" => "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
-"Exclude groups from sharing" => "Виключити групи зі спільного доступу",
-"These groups will still be able to receive shares, but not to initiate them." => "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
-"Security" => "Безпека",
-"Enforce HTTPS" => "Примусове застосування HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "Зобов'язати клієнтів під'єднуватись до %s через шифроване з'єднання.",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Будь ласка, під'єднайтесь до цього %s за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
-"Email Server" => "Сервер електронної пошти",
-"This is used for sending out notifications." => "Використовується для відсилання повідомлень.",
-"Send mode" => "Надіслати повідомлення",
-"From address" => "Адреса відправника",
-"mail" => "пошта",
-"Authentication method" => "Метод перевірки автентифікації",
-"Authentication required" => "Потрібна аутентифікація",
-"Server address" => "Адреса сервера",
-"Port" => "Порт",
-"Credentials" => "Облікові дані",
-"SMTP Username" => "Ім'я користувача SMTP",
-"SMTP Password" => "Пароль SMTP",
-"Store credentials" => "Зберігання облікових даних",
-"Test email settings" => "Перевірити налаштування електронної пошти",
-"Send email" => "Надіслати листа",
-"Log" => "Протокол",
-"Log level" => "Рівень протоколювання",
-"More" => "Більше",
-"Less" => "Менше",
-"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>." => "Розроблено <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud громадою</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">вихідний код</a> має ліцензію <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"More apps" => "Більше додатків",
-"Add your app" => "Додати свій додаток",
-"by" => "по",
-"licensed" => "Ліцензовано",
-"Documentation:" => "Документація:",
-"User Documentation" => "Документація Користувача",
-"Admin Documentation" => "Документація Адміністратора",
-"Update to %s" => "Оновити до %s",
-"Enable only for specific groups" => "Включити тільки для конкретних груп",
-"Uninstall App" => "Видалити додаток",
-"Administrator Documentation" => "Документація Адміністратора",
-"Online Documentation" => "Он-Лайн Документація",
-"Forum" => "Форум",
-"Bugtracker" => "БагТрекер",
-"Commercial Support" => "Комерційна підтримка",
-"Get the apps to sync your files" => "Отримати додатки для синхронізації ваших файлів",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "Якщо ви бажаєте підтримати прект\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥target=\"_blank\">приєднуйтесь до розробки</a>\n⇥⇥або\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥target=\"_blank\">розкажіть про нас</a>!",
-"Show First Run Wizard again" => "Показувати Майстер Налаштувань знову",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Ви використали <strong>%s</strong> із доступних <strong>%s</strong>",
-"Password" => "Пароль",
-"Your password was changed" => "Ваш пароль змінено",
-"Unable to change your password" => "Не вдалося змінити Ваш пароль",
-"Current password" => "Поточний пароль",
-"New password" => "Новий пароль",
-"Change password" => "Змінити пароль",
-"Full Name" => "Повне Ім'я",
-"Email" => "Ел.пошта",
-"Your email address" => "Ваша адреса електронної пошти",
-"Fill in an email address to enable password recovery and receive notifications" => "Введіть адресу електронної пошти, щоб ввімкнути відновлення паролю та отримання повідомлень",
-"Profile picture" => "Зображення облікового запису",
-"Upload new" => "Завантажити нове",
-"Select new from Files" => "Обрати із завантажених файлів",
-"Remove image" => "Видалити зображення",
-"Either png or jpg. Ideally square but you will be able to crop it." => "Допустимі формати: png і jpg. Якщо зображення не квадратне, то ви зможете його обрізати.",
-"Your avatar is provided by your original account." => "Буде використано аватар вашого оригінального облікового запису.",
-"Cancel" => "Відмінити",
-"Choose as profile image" => "Обрати зображенням облікового запису",
-"Language" => "Мова",
-"Help translate" => "Допомогти з перекладом",
-"Common Name" => "Ім'я:",
-"Valid until" => "Дійсно до",
-"Issued By" => "Виданий",
-"Valid until %s" => "Дійсно до %s",
-"Import Root Certificate" => "Імпортувати корневі сертифікати",
-"The encryption app is no longer enabled, please decrypt all your files" => "Додаток для шифрування вимкнено, будь ласка, розшифруйте ваші файли",
-"Log-in password" => "Пароль входу",
-"Decrypt all Files" => "Розшифрувати всі файли",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "Ваші ключі шифрування переміщено до теки резервного копіювання. Якщо щось піде не так, ви зможете відновити їх. Видаляйте ключі лише в тому випадку, коли всі файли розшифровані.",
-"Restore Encryption Keys" => "Відновити ключі шифрування",
-"Delete Encryption Keys" => "Видалити ключі шифрування",
-"Show storage location" => "Показати місцезнаходження сховища",
-"Show last log in" => "Показати останній вхід в систему",
-"Login Name" => "Ім'я Логіну",
-"Create" => "Створити",
-"Admin Recovery Password" => "Пароль адміністратора для відновлення",
-"Enter the recovery password in order to recover the users files during password change" => "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
-"Search Users and Groups" => "Шукати користувачів та групи",
-"Add Group" => "Додати групу",
-"Group" => "Група",
-"Everyone" => "Всі",
-"Admins" => "Адміністратори",
-"Default Quota" => "Квота за замовчуванням",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
-"Unlimited" => "Необмежено",
-"Other" => "Інше",
-"Username" => "Ім'я користувача",
-"Group Admin for" => "Адміністратор групи",
-"Quota" => "Квота",
-"Storage Location" => "Місцезнаходження сховища",
-"Last Login" => "Останній вхід",
-"change full name" => "змінити ім'я",
-"set new password" => "встановити новий пароль",
-"Default" => "За замовчуванням"
-);
-$PLURAL_FORMS = "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/settings/l10n/ur.php b/settings/l10n/ur.php
deleted file mode 100644
index 1b41db1d679..00000000000
--- a/settings/l10n/ur.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "خرابی"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/ur_PK.js b/settings/l10n/ur_PK.js
new file mode 100644
index 00000000000..f9a042bc94f
--- /dev/null
+++ b/settings/l10n/ur_PK.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Invalid request" : "غلط درخواست",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Very weak password" : "بہت کمزور پاسورڈ",
+    "Weak password" : "کمزور پاسورڈ",
+    "So-so password" : "نص نص پاسورڈ",
+    "Good password" : "اچھا پاسورڈ",
+    "Strong password" : "مضبوط پاسورڈ",
+    "Delete" : "حذف کریں",
+    "Security Warning" : "حفاظتی انتباہ",
+    "More" : "مزید",
+    "Less" : "کم",
+    "Password" : "پاسورڈ",
+    "New password" : "نیا پاسورڈ",
+    "Cancel" : "منسوخ کریں",
+    "Other" : "دیگر",
+    "Username" : "یوزر نیم"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ur_PK.json b/settings/l10n/ur_PK.json
new file mode 100644
index 00000000000..99a7bda9ad7
--- /dev/null
+++ b/settings/l10n/ur_PK.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Invalid request" : "غلط درخواست",
+    "Email sent" : "ارسال شدہ ای میل ",
+    "Very weak password" : "بہت کمزور پاسورڈ",
+    "Weak password" : "کمزور پاسورڈ",
+    "So-so password" : "نص نص پاسورڈ",
+    "Good password" : "اچھا پاسورڈ",
+    "Strong password" : "مضبوط پاسورڈ",
+    "Delete" : "حذف کریں",
+    "Security Warning" : "حفاظتی انتباہ",
+    "More" : "مزید",
+    "Less" : "کم",
+    "Password" : "پاسورڈ",
+    "New password" : "نیا پاسورڈ",
+    "Cancel" : "منسوخ کریں",
+    "Other" : "دیگر",
+    "Username" : "یوزر نیم"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/ur_PK.php b/settings/l10n/ur_PK.php
deleted file mode 100644
index 17e7d843f3f..00000000000
--- a/settings/l10n/ur_PK.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Invalid request" => "غلط درخواست",
-"Email sent" => "ارسال شدہ ای میل ",
-"Very weak password" => "بہت کمزور پاسورڈ",
-"Weak password" => "کمزور پاسورڈ",
-"So-so password" => "نص نص پاسورڈ",
-"Good password" => "اچھا پاسورڈ",
-"Strong password" => "مضبوط پاسورڈ",
-"Delete" => "حذف کریں",
-"Security Warning" => "حفاظتی انتباہ",
-"More" => "مزید",
-"Less" => "کم",
-"Password" => "پاسورڈ",
-"New password" => "نیا پاسورڈ",
-"Cancel" => "منسوخ کریں",
-"Other" => "دیگر",
-"Username" => "یوزر نیم"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js
new file mode 100644
index 00000000000..cebe573d07c
--- /dev/null
+++ b/settings/l10n/vi.js
@@ -0,0 +1,90 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "Bật",
+    "Authentication error" : "Lỗi xác thực",
+    "Your full name has been changed." : "Họ và tên đã được thay đổi.",
+    "Unable to change full name" : "Họ và tên không thể đổi ",
+    "Group already exists" : "Nhóm đã tồn tại",
+    "Unable to add group" : "Không thể thêm nhóm",
+    "Email saved" : "Lưu email",
+    "Invalid email" : "Email không hợp lệ",
+    "Unable to delete group" : "Không thể xóa nhóm",
+    "Unable to delete user" : "Không thể xóa người dùng",
+    "Language changed" : "Ngôn ngữ đã được thay đổi",
+    "Invalid request" : "Yêu cầu không hợp lệ",
+    "Admins can't remove themself from the admin group" : "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý",
+    "Unable to add user to group %s" : "Không thể thêm người dùng vào nhóm %s",
+    "Unable to remove user from group %s" : "Không thể xóa người dùng từ nhóm %s",
+    "Couldn't update app." : "Không thể cập nhật ứng dụng",
+    "Email sent" : "Email đã được gửi",
+    "All" : "Tất cả",
+    "Please wait...." : "Xin hãy đợi...",
+    "Disable" : "Tắt",
+    "Enable" : "Bật",
+    "Updating...." : "Đang cập nhật...",
+    "Error while updating app" : "Lỗi khi cập nhật ứng dụng",
+    "Updated" : "Đã cập nhật",
+    "Delete" : "Xóa",
+    "Groups" : "Nhóm",
+    "undo" : "lùi lại",
+    "never" : "không thay đổi",
+    "__language_name__" : "__Ngôn ngữ___",
+    "SSL root certificates" : "Chứng chỉ SSL root",
+    "Encryption" : "Mã hóa",
+    "None" : "Không gì cả",
+    "Login" : "Đăng nhập",
+    "Security Warning" : "Cảnh bảo bảo mật",
+    "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." : "Thư mục và các tập tin của bạn có thể được truy cập từ Internet. Tập tin .htaccess không làm việc. Chúng tôi đề nghị bạn cấu hình ebserver ,phân quyền lại thư mục dữ liệu và cấp quyền truy cập hoặc di chuyển thư mục dữ liệu bên ngoài tài liệu gốc máy chủ web.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Thực thi tác vụ mỗi khi trang được tải",
+    "Sharing" : "Chia sẻ",
+    "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API",
+    "Allow resharing" : "Cho phép chia sẻ lại",
+    "Server address" : "Địa chỉ máy chủ",
+    "Port" : "Cổng",
+    "Credentials" : "Giấy chứng nhận",
+    "Log" : "Log",
+    "More" : "hơn",
+    "Less" : "ít",
+    "Version" : "Phiên bản",
+    "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>." : "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "bởi",
+    "User Documentation" : "Tài liệu người sử dụng",
+    "Administrator Documentation" : "Tài liệu quản trị",
+    "Online Documentation" : "Tài liệu trực tuyến",
+    "Forum" : "Diễn đàn",
+    "Bugtracker" : "Hệ ghi nhận lỗi",
+    "Commercial Support" : "Hỗ trợ có phí",
+    "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn",
+    "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
+    "Password" : "Mật khẩu",
+    "Your password was changed" : "Mật khẩu của bạn đã được thay đổi.",
+    "Unable to change your password" : "Không thể đổi mật khẩu",
+    "Current password" : "Mật khẩu cũ",
+    "New password" : "Mật khẩu mới",
+    "Change password" : "Đổi mật khẩu",
+    "Full Name" : "Họ và tên",
+    "Email" : "Email",
+    "Your email address" : "Email của bạn",
+    "Upload new" : "Tải lên",
+    "Remove image" : "Xóa ",
+    "Cancel" : "Hủy",
+    "Choose as profile image" : "Chọn hình ảnh như hồ sơ cá nhân",
+    "Language" : "Ngôn ngữ",
+    "Help translate" : "Hỗ trợ dịch thuật",
+    "Import Root Certificate" : "Nhập Root Certificate",
+    "Login Name" : "Tên đăng nhập",
+    "Create" : "Tạo",
+    "Group" : "N",
+    "Default Quota" : "Hạn ngạch mặt định",
+    "Unlimited" : "Không giới hạn",
+    "Other" : "Khác",
+    "Username" : "Tên đăng nhập",
+    "Quota" : "Hạn ngạch",
+    "change full name" : "Đổi họ và t",
+    "set new password" : "đặt mật khẩu mới",
+    "Default" : "Mặc định"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json
new file mode 100644
index 00000000000..2a1cbecc235
--- /dev/null
+++ b/settings/l10n/vi.json
@@ -0,0 +1,88 @@
+{ "translations": {
+    "Enabled" : "Bật",
+    "Authentication error" : "Lỗi xác thực",
+    "Your full name has been changed." : "Họ và tên đã được thay đổi.",
+    "Unable to change full name" : "Họ và tên không thể đổi ",
+    "Group already exists" : "Nhóm đã tồn tại",
+    "Unable to add group" : "Không thể thêm nhóm",
+    "Email saved" : "Lưu email",
+    "Invalid email" : "Email không hợp lệ",
+    "Unable to delete group" : "Không thể xóa nhóm",
+    "Unable to delete user" : "Không thể xóa người dùng",
+    "Language changed" : "Ngôn ngữ đã được thay đổi",
+    "Invalid request" : "Yêu cầu không hợp lệ",
+    "Admins can't remove themself from the admin group" : "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý",
+    "Unable to add user to group %s" : "Không thể thêm người dùng vào nhóm %s",
+    "Unable to remove user from group %s" : "Không thể xóa người dùng từ nhóm %s",
+    "Couldn't update app." : "Không thể cập nhật ứng dụng",
+    "Email sent" : "Email đã được gửi",
+    "All" : "Tất cả",
+    "Please wait...." : "Xin hãy đợi...",
+    "Disable" : "Tắt",
+    "Enable" : "Bật",
+    "Updating...." : "Đang cập nhật...",
+    "Error while updating app" : "Lỗi khi cập nhật ứng dụng",
+    "Updated" : "Đã cập nhật",
+    "Delete" : "Xóa",
+    "Groups" : "Nhóm",
+    "undo" : "lùi lại",
+    "never" : "không thay đổi",
+    "__language_name__" : "__Ngôn ngữ___",
+    "SSL root certificates" : "Chứng chỉ SSL root",
+    "Encryption" : "Mã hóa",
+    "None" : "Không gì cả",
+    "Login" : "Đăng nhập",
+    "Security Warning" : "Cảnh bảo bảo mật",
+    "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." : "Thư mục và các tập tin của bạn có thể được truy cập từ Internet. Tập tin .htaccess không làm việc. Chúng tôi đề nghị bạn cấu hình ebserver ,phân quyền lại thư mục dữ liệu và cấp quyền truy cập hoặc di chuyển thư mục dữ liệu bên ngoài tài liệu gốc máy chủ web.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Thực thi tác vụ mỗi khi trang được tải",
+    "Sharing" : "Chia sẻ",
+    "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API",
+    "Allow resharing" : "Cho phép chia sẻ lại",
+    "Server address" : "Địa chỉ máy chủ",
+    "Port" : "Cổng",
+    "Credentials" : "Giấy chứng nhận",
+    "Log" : "Log",
+    "More" : "hơn",
+    "Less" : "ít",
+    "Version" : "Phiên bản",
+    "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>." : "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+    "by" : "bởi",
+    "User Documentation" : "Tài liệu người sử dụng",
+    "Administrator Documentation" : "Tài liệu quản trị",
+    "Online Documentation" : "Tài liệu trực tuyến",
+    "Forum" : "Diễn đàn",
+    "Bugtracker" : "Hệ ghi nhận lỗi",
+    "Commercial Support" : "Hỗ trợ có phí",
+    "Get the apps to sync your files" : "Nhận ứng dụng để đồng bộ file của bạn",
+    "Show First Run Wizard again" : "Hiện lại việc chạy đồ thuật khởi đầu",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
+    "Password" : "Mật khẩu",
+    "Your password was changed" : "Mật khẩu của bạn đã được thay đổi.",
+    "Unable to change your password" : "Không thể đổi mật khẩu",
+    "Current password" : "Mật khẩu cũ",
+    "New password" : "Mật khẩu mới",
+    "Change password" : "Đổi mật khẩu",
+    "Full Name" : "Họ và tên",
+    "Email" : "Email",
+    "Your email address" : "Email của bạn",
+    "Upload new" : "Tải lên",
+    "Remove image" : "Xóa ",
+    "Cancel" : "Hủy",
+    "Choose as profile image" : "Chọn hình ảnh như hồ sơ cá nhân",
+    "Language" : "Ngôn ngữ",
+    "Help translate" : "Hỗ trợ dịch thuật",
+    "Import Root Certificate" : "Nhập Root Certificate",
+    "Login Name" : "Tên đăng nhập",
+    "Create" : "Tạo",
+    "Group" : "N",
+    "Default Quota" : "Hạn ngạch mặt định",
+    "Unlimited" : "Không giới hạn",
+    "Other" : "Khác",
+    "Username" : "Tên đăng nhập",
+    "Quota" : "Hạn ngạch",
+    "change full name" : "Đổi họ và t",
+    "set new password" : "đặt mật khẩu mới",
+    "Default" : "Mặc định"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
deleted file mode 100644
index 5abff6a4e6b..00000000000
--- a/settings/l10n/vi.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "Bật",
-"Authentication error" => "Lỗi xác thực",
-"Your full name has been changed." => "Họ và tên đã được thay đổi.",
-"Unable to change full name" => "Họ và tên không thể đổi ",
-"Group already exists" => "Nhóm đã tồn tại",
-"Unable to add group" => "Không thể thêm nhóm",
-"Email saved" => "Lưu email",
-"Invalid email" => "Email không hợp lệ",
-"Unable to delete group" => "Không thể xóa nhóm",
-"Unable to delete user" => "Không thể xóa người dùng",
-"Language changed" => "Ngôn ngữ đã được thay đổi",
-"Invalid request" => "Yêu cầu không hợp lệ",
-"Admins can't remove themself from the admin group" => "Quản trị viên không thể loại bỏ chính họ khỏi nhóm quản lý",
-"Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
-"Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
-"Couldn't update app." => "Không thể cập nhật ứng dụng",
-"Email sent" => "Email đã được gửi",
-"All" => "Tất cả",
-"Please wait...." => "Xin hãy đợi...",
-"Disable" => "Tắt",
-"Enable" => "Bật",
-"Updating...." => "Đang cập nhật...",
-"Error while updating app" => "Lỗi khi cập nhật ứng dụng",
-"Updated" => "Đã cập nhật",
-"Delete" => "Xóa",
-"Groups" => "Nhóm",
-"undo" => "lùi lại",
-"never" => "không thay đổi",
-"__language_name__" => "__Ngôn ngữ___",
-"SSL root certificates" => "Chứng chỉ SSL root",
-"Encryption" => "Mã hóa",
-"None" => "Không gì cả",
-"Login" => "Đăng nhập",
-"Security Warning" => "Cảnh bảo bảo mật",
-"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." => "Thư mục và các tập tin của bạn có thể được truy cập từ Internet. Tập tin .htaccess không làm việc. Chúng tôi đề nghị bạn cấu hình ebserver ,phân quyền lại thư mục dữ liệu và cấp quyền truy cập hoặc di chuyển thư mục dữ liệu bên ngoài tài liệu gốc máy chủ web.",
-"Cron" => "Cron",
-"Execute one task with each page loaded" => "Thực thi tác vụ mỗi khi trang được tải",
-"Sharing" => "Chia sẻ",
-"Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
-"Allow resharing" => "Cho phép chia sẻ lại",
-"Server address" => "Địa chỉ máy chủ",
-"Port" => "Cổng",
-"Credentials" => "Giấy chứng nhận",
-"Log" => "Log",
-"More" => "hơn",
-"Less" => "ít",
-"Version" => "Phiên bản",
-"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>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"by" => "bởi",
-"User Documentation" => "Tài liệu người sử dụng",
-"Administrator Documentation" => "Tài liệu quản trị",
-"Online Documentation" => "Tài liệu trực tuyến",
-"Forum" => "Diễn đàn",
-"Bugtracker" => "Hệ ghi nhận lỗi",
-"Commercial Support" => "Hỗ trợ có phí",
-"Get the apps to sync your files" => "Nhận ứng dụng để đồng bộ file của bạn",
-"Show First Run Wizard again" => "Hiện lại việc chạy đồ thuật khởi đầu",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Bạn đã sử dụng <strong>%s </ strong> có sẵn <strong> %s </ strong>",
-"Password" => "Mật khẩu",
-"Your password was changed" => "Mật khẩu của bạn đã được thay đổi.",
-"Unable to change your password" => "Không thể đổi mật khẩu",
-"Current password" => "Mật khẩu cũ",
-"New password" => "Mật khẩu mới",
-"Change password" => "Đổi mật khẩu",
-"Full Name" => "Họ và tên",
-"Email" => "Email",
-"Your email address" => "Email của bạn",
-"Upload new" => "Tải lên",
-"Remove image" => "Xóa ",
-"Cancel" => "Hủy",
-"Choose as profile image" => "Chọn hình ảnh như hồ sơ cá nhân",
-"Language" => "Ngôn ngữ",
-"Help translate" => "Hỗ trợ dịch thuật",
-"Import Root Certificate" => "Nhập Root Certificate",
-"Login Name" => "Tên đăng nhập",
-"Create" => "Tạo",
-"Group" => "N",
-"Default Quota" => "Hạn ngạch mặt định",
-"Unlimited" => "Không giới hạn",
-"Other" => "Khác",
-"Username" => "Tên đăng nhập",
-"Quota" => "Hạn ngạch",
-"change full name" => "Đổi họ và t",
-"set new password" => "đặt mật khẩu mới",
-"Default" => "Mặc định"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
new file mode 100644
index 00000000000..77e0a3e9451
--- /dev/null
+++ b/settings/l10n/zh_CN.js
@@ -0,0 +1,230 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "开启",
+    "Authentication error" : "认证错误",
+    "Your full name has been changed." : "您的全名已修改。",
+    "Unable to change full name" : "无法修改全名",
+    "Group already exists" : "已存在该组",
+    "Unable to add group" : "无法增加组",
+    "Files decrypted successfully" : "文件解密成功",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
+    "Couldn't decrypt your files, check your password and try again" : "无法解密您的文件，请检查密码并重试。",
+    "Encryption keys deleted permanently" : "加密密钥已经永久删除",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员",
+    "Couldn't remove app." : "无法删除应用。",
+    "Email saved" : "电子邮件已保存",
+    "Invalid email" : "无效的电子邮件",
+    "Unable to delete group" : "无法删除组",
+    "Unable to delete user" : "无法删除用户",
+    "Backups restored successfully" : "恢复备份成功",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "无法恢复加密密钥，请检查 owncloud.log 或联系管理员",
+    "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." : "无法更新 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." : "错误的管理员恢复密码。请检查密码并重试。",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "后端不支持修改密码，但是用户的加密密码已成功更新。",
+    "Unable to change password" : "不能更改密码",
+    "Saved" : "已保存",
+    "test email settings" : "测试电子邮件设置",
+    "If you received this email, the settings seem to be correct." : "如果您收到了这封邮件，看起来设置没有问题。",
+    "Email sent" : "邮件已发送",
+    "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的用户电子邮件。",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "你真的希望添加 \"{domain}\" 为信任域？",
+    "Add trusted domain" : "添加信任域",
+    "Sending..." : "正在发送...",
+    "All" : "全部",
+    "Please wait...." : "请稍等....",
+    "Error while disabling app" : "禁用 app 时出错",
+    "Disable" : "禁用",
+    "Enable" : "开启",
+    "Error while enabling app" : "启用 app 时出错",
+    "Updating...." : "正在更新....",
+    "Error while updating app" : "更新 app 时出错",
+    "Updated" : "已更新",
+    "Uninstalling ...." : "卸载中....",
+    "Error while uninstalling app" : "卸载应用时发生了一个错误",
+    "Uninstall" : "卸载",
+    "Select a profile picture" : "选择头像",
+    "Very weak password" : "非常弱的密码",
+    "Weak password" : "弱密码",
+    "So-so password" : "一般强度的密码",
+    "Good password" : "较强的密码",
+    "Strong password" : "强密码",
+    "Valid until {date}" : "有效期至 {date}",
+    "Delete" : "删除",
+    "Decrypting files... Please wait, this can take some time." : "正在解密文件... 请稍等，可能需要一些时间。",
+    "Delete encryption keys permanently." : "永久删除加密密钥。",
+    "Restore encryption keys." : "恢复加密密钥。",
+    "Groups" : "组",
+    "Unable to delete {objName}" : "无法删除 {objName}",
+    "Error creating group" : "创建组时出错",
+    "A valid group name must be provided" : "请提供一个有效的组名称",
+    "deleted {groupName}" : "已删除 {groupName}",
+    "undo" : "撤销",
+    "never" : "从不",
+    "deleted {userName}" : "已删除 {userName}",
+    "add group" : "增加组",
+    "A valid username must be provided" : "必须提供合法的用户名",
+    "Error creating user" : "创建用户出错",
+    "A valid password must be provided" : "必须提供合法的密码",
+    "Warning: Home directory for user \"{user}\" already exists" : "警告：用户 \"{user}\" 的家目录已存在",
+    "__language_name__" : "简体中文",
+    "SSL root certificates" : "SSL根证书",
+    "Encryption" : "加密",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
+    "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题",
+    "Warnings, errors and fatal issues" : "警告，错误和灾难性问题",
+    "Errors and fatal issues" : "错误和灾难性问题",
+    "Fatal issues only" : "仅灾难性问题",
+    "None" : "无",
+    "Login" : "登录",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN 管理器",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "安全警告",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "您正通过 HTTP 访问 %s。我们强烈建议您配置你的服务器来要求使用 HTTPS。",
+    "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." : "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
+    "Setup Warning" : "设置警告",
+    "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。",
+    "Database Performance Info" : "数据库性能信息",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具：“occ db:convert-type”迁移数据库",
+    "Module 'fileinfo' missing" : "模块'文件信息'丢失",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
+    "Your PHP version is outdated" : "您的 PHP 版本不是最新版",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "您的 PHP 版本已过期。强烈建议更新至 5.3.8 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。",
+    "PHP charset is not set to UTF-8" : "PHP字符集没有设置为UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP字符集没有设置为UTF-8。这会导致非ASC||字符的文件名出现乱码。我们强烈建议修改php.ini文件中的'default_charset' 的值为 'UTF-8'",
+    "Locale not working" : "本地化无法工作",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
+    "URL generation in notification emails" : "在通知邮件里生成URL",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
+    "Connectivity checks" : "网络连接检查",
+    "No problems found" : "未发现问题",
+    "Please double check the <a href='%s'>installation guides</a>." : "请认真检查<a href='%s'>安装指南</a>.",
+    "Cron" : "计划任务",
+    "Last cron was executed at %s." : "上次定时任务执行于 %s。",
+    "Last cron was executed at %s. This is more than an hour ago, 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 文件。",
+    "Sharing" : "共享",
+    "Allow apps to use the Share API" : "允许应用软件使用共享API",
+    "Allow users to share via link" : "允许用户通过链接分享文件",
+    "Enforce password protection" : "强制密码保护",
+    "Allow public uploads" : "允许公开上传",
+    "Set default expiration date" : "设置默认过期日期",
+    "Expire after " : "过期于",
+    "days" : "天",
+    "Enforce expiration date" : "强制过期日期",
+    "Allow resharing" : "允许再次共享",
+    "Restrict users to only share with users in their groups" : "限制仅与组内用户分享",
+    "Allow users to send mail notification for shared files" : "允许用户发送共享文件的邮件通知",
+    "Exclude groups from sharing" : "在分享中排除组",
+    "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
+    "Security" : "安全",
+    "Enforce HTTPS" : "强制使用 HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "强制客户端通过加密连接连接到%s。",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
+    "Email Server" : "电子邮件服务器",
+    "This is used for sending out notifications." : "这被用于发送通知。",
+    "Send mode" : "发送模式",
+    "From address" : "来自地址",
+    "mail" : "邮件",
+    "Authentication method" : "认证方法",
+    "Authentication required" : "需要认证",
+    "Server address" : "服务器地址",
+    "Port" : "端口",
+    "Credentials" : "凭证",
+    "SMTP Username" : "SMTP 用户名",
+    "SMTP Password" : "SMTP 密码",
+    "Test email settings" : "测试电子邮件设置",
+    "Send email" : "发送邮件",
+    "Log" : "日志",
+    "Log level" : "日志级别",
+    "More" : "更多",
+    "Less" : "更少",
+    "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>." : "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
+    "More apps" : "更多应用",
+    "by" : "被",
+    "Documentation:" : "文档：",
+    "User Documentation" : "用户文档",
+    "Admin Documentation" : "管理员文档",
+    "Enable only for specific groups" : "仅对特定的组开放",
+    "Uninstall App" : "下载应用",
+    "Administrator Documentation" : "管理员文档",
+    "Online Documentation" : "在线文档",
+    "Forum" : "论坛",
+    "Bugtracker" : "问题跟踪器",
+    "Commercial Support" : "商业支持",
+    "Get the apps to sync your files" : "安装应用进行文件同步",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "<a href=\"https://owncloud.org/contribute\"\n\ttarget=\"_blank\">加入开发</a>\n或\n<a href=\"https://owncloud.org/promote\"\n\ttarget=\"_blank\">帮助推广</a>以支持本项目！",
+    "Show First Run Wizard again" : "再次显示首次运行向导",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
+    "Password" : "密码",
+    "Your password was changed" : "密码已修改",
+    "Unable to change your password" : "无法修改密码",
+    "Current password" : "当前密码",
+    "New password" : "新密码",
+    "Change password" : "修改密码",
+    "Full Name" : "全名",
+    "Email" : "电子邮件",
+    "Your email address" : "您的电子邮件",
+    "Fill in an email address to enable password recovery and receive notifications" : "填入电子邮件地址从而启用密码恢复和接收通知",
+    "Profile picture" : "联系人图片",
+    "Upload new" : "上传新的",
+    "Select new from Files" : "从文件中选择一个新的",
+    "Remove image" : "移除图片",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。",
+    "Your avatar is provided by your original account." : "您的头像由您的原始账户所提供。",
+    "Cancel" : "取消",
+    "Choose as profile image" : "用作头像",
+    "Language" : "语言",
+    "Help translate" : "帮助翻译",
+    "Common Name" : "通用名称",
+    "Valid until" : "有效期至",
+    "Issued By" : "授权由",
+    "Valid until %s" : "有效期至 %s",
+    "Import Root Certificate" : "导入根证书",
+    "The encryption app is no longer enabled, please decrypt all your files" : "加密 app 不再被启用，请解密您所有的文件",
+    "Log-in password" : "登录密码",
+    "Decrypt all Files" : "解密所有文件",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
+    "Restore Encryption Keys" : "恢复加密密钥",
+    "Delete Encryption Keys" : "删除加密密钥",
+    "Show storage location" : "显示存储位置",
+    "Show last log in" : "显示最后登录",
+    "Login Name" : "登录名称",
+    "Create" : "创建",
+    "Admin Recovery Password" : "管理恢复密码",
+    "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
+    "Search Users and Groups" : "搜索用户和组",
+    "Add Group" : "增加组",
+    "Group" : "分组",
+    "Everyone" : "所有人",
+    "Admins" : "管理员",
+    "Default Quota" : "默认配额",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "无限",
+    "Other" : "其它",
+    "Username" : "用户名",
+    "Quota" : "配额",
+    "Storage Location" : "存储空间位置",
+    "Last Login" : "最后登录",
+    "change full name" : "更改全名",
+    "set new password" : "设置新密码",
+    "Default" : "默认"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
new file mode 100644
index 00000000000..ddfc5cab5ad
--- /dev/null
+++ b/settings/l10n/zh_CN.json
@@ -0,0 +1,228 @@
+{ "translations": {
+    "Enabled" : "开启",
+    "Authentication error" : "认证错误",
+    "Your full name has been changed." : "您的全名已修改。",
+    "Unable to change full name" : "无法修改全名",
+    "Group already exists" : "已存在该组",
+    "Unable to add group" : "无法增加组",
+    "Files decrypted successfully" : "文件解密成功",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
+    "Couldn't decrypt your files, check your password and try again" : "无法解密您的文件，请检查密码并重试。",
+    "Encryption keys deleted permanently" : "加密密钥已经永久删除",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员",
+    "Couldn't remove app." : "无法删除应用。",
+    "Email saved" : "电子邮件已保存",
+    "Invalid email" : "无效的电子邮件",
+    "Unable to delete group" : "无法删除组",
+    "Unable to delete user" : "无法删除用户",
+    "Backups restored successfully" : "恢复备份成功",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "无法恢复加密密钥，请检查 owncloud.log 或联系管理员",
+    "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." : "无法更新 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." : "错误的管理员恢复密码。请检查密码并重试。",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "后端不支持修改密码，但是用户的加密密码已成功更新。",
+    "Unable to change password" : "不能更改密码",
+    "Saved" : "已保存",
+    "test email settings" : "测试电子邮件设置",
+    "If you received this email, the settings seem to be correct." : "如果您收到了这封邮件，看起来设置没有问题。",
+    "Email sent" : "邮件已发送",
+    "You need to set your user email before being able to send test emails." : "在发送测试邮件前您需要设置您的用户电子邮件。",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "你真的希望添加 \"{domain}\" 为信任域？",
+    "Add trusted domain" : "添加信任域",
+    "Sending..." : "正在发送...",
+    "All" : "全部",
+    "Please wait...." : "请稍等....",
+    "Error while disabling app" : "禁用 app 时出错",
+    "Disable" : "禁用",
+    "Enable" : "开启",
+    "Error while enabling app" : "启用 app 时出错",
+    "Updating...." : "正在更新....",
+    "Error while updating app" : "更新 app 时出错",
+    "Updated" : "已更新",
+    "Uninstalling ...." : "卸载中....",
+    "Error while uninstalling app" : "卸载应用时发生了一个错误",
+    "Uninstall" : "卸载",
+    "Select a profile picture" : "选择头像",
+    "Very weak password" : "非常弱的密码",
+    "Weak password" : "弱密码",
+    "So-so password" : "一般强度的密码",
+    "Good password" : "较强的密码",
+    "Strong password" : "强密码",
+    "Valid until {date}" : "有效期至 {date}",
+    "Delete" : "删除",
+    "Decrypting files... Please wait, this can take some time." : "正在解密文件... 请稍等，可能需要一些时间。",
+    "Delete encryption keys permanently." : "永久删除加密密钥。",
+    "Restore encryption keys." : "恢复加密密钥。",
+    "Groups" : "组",
+    "Unable to delete {objName}" : "无法删除 {objName}",
+    "Error creating group" : "创建组时出错",
+    "A valid group name must be provided" : "请提供一个有效的组名称",
+    "deleted {groupName}" : "已删除 {groupName}",
+    "undo" : "撤销",
+    "never" : "从不",
+    "deleted {userName}" : "已删除 {userName}",
+    "add group" : "增加组",
+    "A valid username must be provided" : "必须提供合法的用户名",
+    "Error creating user" : "创建用户出错",
+    "A valid password must be provided" : "必须提供合法的密码",
+    "Warning: Home directory for user \"{user}\" already exists" : "警告：用户 \"{user}\" 的家目录已存在",
+    "__language_name__" : "简体中文",
+    "SSL root certificates" : "SSL根证书",
+    "Encryption" : "加密",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "所有（灾难性问题，错误，警告，信息，调试）",
+    "Info, warnings, errors and fatal issues" : "信息，警告，错误和灾难性问题",
+    "Warnings, errors and fatal issues" : "警告，错误和灾难性问题",
+    "Errors and fatal issues" : "错误和灾难性问题",
+    "Fatal issues only" : "仅灾难性问题",
+    "None" : "无",
+    "Login" : "登录",
+    "Plain" : "Plain",
+    "NT LAN Manager" : "NT LAN 管理器",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "安全警告",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "您正通过 HTTP 访问 %s。我们强烈建议您配置你的服务器来要求使用 HTTPS。",
+    "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." : "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
+    "Setup Warning" : "设置警告",
+    "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。",
+    "Database Performance Info" : "数据库性能信息",
+    "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具：“occ db:convert-type”迁移数据库",
+    "Module 'fileinfo' missing" : "模块'文件信息'丢失",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
+    "Your PHP version is outdated" : "您的 PHP 版本不是最新版",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "您的 PHP 版本已过期。强烈建议更新至 5.3.8 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。",
+    "PHP charset is not set to UTF-8" : "PHP字符集没有设置为UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP字符集没有设置为UTF-8。这会导致非ASC||字符的文件名出现乱码。我们强烈建议修改php.ini文件中的'default_charset' 的值为 'UTF-8'",
+    "Locale not working" : "本地化无法工作",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
+    "URL generation in notification emails" : "在通知邮件里生成URL",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
+    "Connectivity checks" : "网络连接检查",
+    "No problems found" : "未发现问题",
+    "Please double check the <a href='%s'>installation guides</a>." : "请认真检查<a href='%s'>安装指南</a>.",
+    "Cron" : "计划任务",
+    "Last cron was executed at %s." : "上次定时任务执行于 %s。",
+    "Last cron was executed at %s. This is more than an hour ago, 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 文件。",
+    "Sharing" : "共享",
+    "Allow apps to use the Share API" : "允许应用软件使用共享API",
+    "Allow users to share via link" : "允许用户通过链接分享文件",
+    "Enforce password protection" : "强制密码保护",
+    "Allow public uploads" : "允许公开上传",
+    "Set default expiration date" : "设置默认过期日期",
+    "Expire after " : "过期于",
+    "days" : "天",
+    "Enforce expiration date" : "强制过期日期",
+    "Allow resharing" : "允许再次共享",
+    "Restrict users to only share with users in their groups" : "限制仅与组内用户分享",
+    "Allow users to send mail notification for shared files" : "允许用户发送共享文件的邮件通知",
+    "Exclude groups from sharing" : "在分享中排除组",
+    "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
+    "Security" : "安全",
+    "Enforce HTTPS" : "强制使用 HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "强制客户端通过加密连接连接到%s。",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
+    "Email Server" : "电子邮件服务器",
+    "This is used for sending out notifications." : "这被用于发送通知。",
+    "Send mode" : "发送模式",
+    "From address" : "来自地址",
+    "mail" : "邮件",
+    "Authentication method" : "认证方法",
+    "Authentication required" : "需要认证",
+    "Server address" : "服务器地址",
+    "Port" : "端口",
+    "Credentials" : "凭证",
+    "SMTP Username" : "SMTP 用户名",
+    "SMTP Password" : "SMTP 密码",
+    "Test email settings" : "测试电子邮件设置",
+    "Send email" : "发送邮件",
+    "Log" : "日志",
+    "Log level" : "日志级别",
+    "More" : "更多",
+    "Less" : "更少",
+    "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>." : "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
+    "More apps" : "更多应用",
+    "by" : "被",
+    "Documentation:" : "文档：",
+    "User Documentation" : "用户文档",
+    "Admin Documentation" : "管理员文档",
+    "Enable only for specific groups" : "仅对特定的组开放",
+    "Uninstall App" : "下载应用",
+    "Administrator Documentation" : "管理员文档",
+    "Online Documentation" : "在线文档",
+    "Forum" : "论坛",
+    "Bugtracker" : "问题跟踪器",
+    "Commercial Support" : "商业支持",
+    "Get the apps to sync your files" : "安装应用进行文件同步",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "<a href=\"https://owncloud.org/contribute\"\n\ttarget=\"_blank\">加入开发</a>\n或\n<a href=\"https://owncloud.org/promote\"\n\ttarget=\"_blank\">帮助推广</a>以支持本项目！",
+    "Show First Run Wizard again" : "再次显示首次运行向导",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
+    "Password" : "密码",
+    "Your password was changed" : "密码已修改",
+    "Unable to change your password" : "无法修改密码",
+    "Current password" : "当前密码",
+    "New password" : "新密码",
+    "Change password" : "修改密码",
+    "Full Name" : "全名",
+    "Email" : "电子邮件",
+    "Your email address" : "您的电子邮件",
+    "Fill in an email address to enable password recovery and receive notifications" : "填入电子邮件地址从而启用密码恢复和接收通知",
+    "Profile picture" : "联系人图片",
+    "Upload new" : "上传新的",
+    "Select new from Files" : "从文件中选择一个新的",
+    "Remove image" : "移除图片",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。",
+    "Your avatar is provided by your original account." : "您的头像由您的原始账户所提供。",
+    "Cancel" : "取消",
+    "Choose as profile image" : "用作头像",
+    "Language" : "语言",
+    "Help translate" : "帮助翻译",
+    "Common Name" : "通用名称",
+    "Valid until" : "有效期至",
+    "Issued By" : "授权由",
+    "Valid until %s" : "有效期至 %s",
+    "Import Root Certificate" : "导入根证书",
+    "The encryption app is no longer enabled, please decrypt all your files" : "加密 app 不再被启用，请解密您所有的文件",
+    "Log-in password" : "登录密码",
+    "Decrypt all Files" : "解密所有文件",
+    "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
+    "Restore Encryption Keys" : "恢复加密密钥",
+    "Delete Encryption Keys" : "删除加密密钥",
+    "Show storage location" : "显示存储位置",
+    "Show last log in" : "显示最后登录",
+    "Login Name" : "登录名称",
+    "Create" : "创建",
+    "Admin Recovery Password" : "管理恢复密码",
+    "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
+    "Search Users and Groups" : "搜索用户和组",
+    "Add Group" : "增加组",
+    "Group" : "分组",
+    "Everyone" : "所有人",
+    "Admins" : "管理员",
+    "Default Quota" : "默认配额",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
+    "Unlimited" : "无限",
+    "Other" : "其它",
+    "Username" : "用户名",
+    "Quota" : "配额",
+    "Storage Location" : "存储空间位置",
+    "Last Login" : "最后登录",
+    "change full name" : "更改全名",
+    "set new password" : "设置新密码",
+    "Default" : "默认"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
deleted file mode 100644
index 49c8021e2a5..00000000000
--- a/settings/l10n/zh_CN.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "开启",
-"Authentication error" => "认证错误",
-"Your full name has been changed." => "您的全名已修改。",
-"Unable to change full name" => "无法修改全名",
-"Group already exists" => "已存在该组",
-"Unable to add group" => "无法增加组",
-"Files decrypted successfully" => "文件解密成功",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "无法解密您的文件，请检查您的 owncloud.log 或询问管理员",
-"Couldn't decrypt your files, check your password and try again" => "无法解密您的文件，请检查密码并重试。",
-"Encryption keys deleted permanently" => "加密密钥已经永久删除",
-"Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" => "无法永久删除您的加密密钥，请检查 owncloud.log 或联系管理员",
-"Couldn't remove app." => "无法删除应用。",
-"Email saved" => "电子邮件已保存",
-"Invalid email" => "无效的电子邮件",
-"Unable to delete group" => "无法删除组",
-"Unable to delete user" => "无法删除用户",
-"Backups restored successfully" => "恢复备份成功",
-"Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" => "无法恢复加密密钥，请检查 owncloud.log 或联系管理员",
-"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." => "无法更新 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." => "错误的管理员恢复密码。请检查密码并重试。",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "后端不支持修改密码，但是用户的加密密码已成功更新。",
-"Unable to change password" => "不能更改密码",
-"Saved" => "已保存",
-"test email settings" => "测试电子邮件设置",
-"If you received this email, the settings seem to be correct." => "如果您收到了这封邮件，看起来设置没有问题。",
-"Email sent" => "邮件已发送",
-"You need to set your user email before being able to send test emails." => "在发送测试邮件前您需要设置您的用户电子邮件。",
-"Are you really sure you want add \"{domain}\" as trusted domain?" => "你真的希望添加 \"{domain}\" 为信任域？",
-"Add trusted domain" => "添加信任域",
-"Sending..." => "正在发送...",
-"All" => "全部",
-"Please wait...." => "请稍等....",
-"Error while disabling app" => "禁用 app 时出错",
-"Disable" => "禁用",
-"Enable" => "开启",
-"Error while enabling app" => "启用 app 时出错",
-"Updating...." => "正在更新....",
-"Error while updating app" => "更新 app 时出错",
-"Updated" => "已更新",
-"Uninstalling ...." => "卸载中....",
-"Error while uninstalling app" => "卸载应用时发生了一个错误",
-"Uninstall" => "卸载",
-"Select a profile picture" => "选择头像",
-"Very weak password" => "非常弱的密码",
-"Weak password" => "弱密码",
-"So-so password" => "一般强度的密码",
-"Good password" => "较强的密码",
-"Strong password" => "强密码",
-"Valid until {date}" => "有效期至 {date}",
-"Delete" => "删除",
-"Decrypting files... Please wait, this can take some time." => "正在解密文件... 请稍等，可能需要一些时间。",
-"Delete encryption keys permanently." => "永久删除加密密钥。",
-"Restore encryption keys." => "恢复加密密钥。",
-"Groups" => "组",
-"Unable to delete {objName}" => "无法删除 {objName}",
-"Error creating group" => "创建组时出错",
-"A valid group name must be provided" => "请提供一个有效的组名称",
-"deleted {groupName}" => "已删除 {groupName}",
-"undo" => "撤销",
-"never" => "从不",
-"deleted {userName}" => "已删除 {userName}",
-"add group" => "增加组",
-"A valid username must be provided" => "必须提供合法的用户名",
-"Error creating user" => "创建用户出错",
-"A valid password must be provided" => "必须提供合法的密码",
-"Warning: Home directory for user \"{user}\" already exists" => "警告：用户 \"{user}\" 的家目录已存在",
-"__language_name__" => "简体中文",
-"SSL root certificates" => "SSL根证书",
-"Encryption" => "加密",
-"Everything (fatal issues, errors, warnings, info, debug)" => "所有（灾难性问题，错误，警告，信息，调试）",
-"Info, warnings, errors and fatal issues" => "信息，警告，错误和灾难性问题",
-"Warnings, errors and fatal issues" => "警告，错误和灾难性问题",
-"Errors and fatal issues" => "错误和灾难性问题",
-"Fatal issues only" => "仅灾难性问题",
-"None" => "无",
-"Login" => "登录",
-"Plain" => "Plain",
-"NT LAN Manager" => "NT LAN 管理器",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "安全警告",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "您正通过 HTTP 访问 %s。我们强烈建议您配置你的服务器来要求使用 HTTPS。",
-"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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
-"Setup Warning" => "设置警告",
-"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。",
-"Database Performance Info" => "数据库性能信息",
-"SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" => "SQLite 正在使用。我们建议大型网站切换到其他数据库。请使用命令行工具：“occ db:convert-type”迁移数据库",
-"Module 'fileinfo' missing" => "模块'文件信息'丢失",
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP模块'文件信息'丢失. 我们强烈建议启用此模块以便mime类型检测取得最佳结果.",
-"Your PHP version is outdated" => "您的 PHP 版本不是最新版",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "您的 PHP 版本已过期。强烈建议更新至 5.3.8 或者更新版本因为老版本存在已知问题。本次安装可能并未正常工作。",
-"PHP charset is not set to UTF-8" => "PHP字符集没有设置为UTF-8",
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." => "PHP字符集没有设置为UTF-8。这会导致非ASC||字符的文件名出现乱码。我们强烈建议修改php.ini文件中的'default_charset' 的值为 'UTF-8'",
-"Locale not working" => "本地化无法工作",
-"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 to install the required packages on your system to support one of the following locales: %s." => "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
-"URL generation in notification emails" => "在通知邮件里生成URL",
-"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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" => "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
-"Connectivity checks" => "网络连接检查",
-"No problems found" => "未发现问题",
-"Please double check the <a href='%s'>installation guides</a>." => "请认真检查<a href='%s'>安装指南</a>.",
-"Cron" => "计划任务",
-"Last cron was executed at %s." => "上次定时任务执行于 %s。",
-"Last cron was executed at %s. This is more than an hour ago, 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 文件。",
-"Sharing" => "共享",
-"Allow apps to use the Share API" => "允许应用软件使用共享API",
-"Allow users to share via link" => "允许用户通过链接分享文件",
-"Enforce password protection" => "强制密码保护",
-"Allow public uploads" => "允许公开上传",
-"Set default expiration date" => "设置默认过期日期",
-"Expire after " => "过期于",
-"days" => "天",
-"Enforce expiration date" => "强制过期日期",
-"Allow resharing" => "允许再次共享",
-"Restrict users to only share with users in their groups" => "限制仅与组内用户分享",
-"Allow users to send mail notification for shared files" => "允许用户发送共享文件的邮件通知",
-"Exclude groups from sharing" => "在分享中排除组",
-"These groups will still be able to receive shares, but not to initiate them." => "这些组将仍可以获取分享，但无法向他人分享。",
-"Security" => "安全",
-"Enforce HTTPS" => "强制使用 HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "强制客户端通过加密连接连接到%s。",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
-"Email Server" => "电子邮件服务器",
-"This is used for sending out notifications." => "这被用于发送通知。",
-"Send mode" => "发送模式",
-"From address" => "来自地址",
-"mail" => "邮件",
-"Authentication method" => "认证方法",
-"Authentication required" => "需要认证",
-"Server address" => "服务器地址",
-"Port" => "端口",
-"Credentials" => "凭证",
-"SMTP Username" => "SMTP 用户名",
-"SMTP Password" => "SMTP 密码",
-"Test email settings" => "测试电子邮件设置",
-"Send email" => "发送邮件",
-"Log" => "日志",
-"Log level" => "日志级别",
-"More" => "更多",
-"Less" => "更少",
-"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>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
-"More apps" => "更多应用",
-"by" => "被",
-"Documentation:" => "文档：",
-"User Documentation" => "用户文档",
-"Admin Documentation" => "管理员文档",
-"Enable only for specific groups" => "仅对特定的组开放",
-"Uninstall App" => "下载应用",
-"Administrator Documentation" => "管理员文档",
-"Online Documentation" => "在线文档",
-"Forum" => "论坛",
-"Bugtracker" => "问题跟踪器",
-"Commercial Support" => "商业支持",
-"Get the apps to sync your files" => "安装应用进行文件同步",
-"If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" => "<a href=\"https://owncloud.org/contribute\"\n\ttarget=\"_blank\">加入开发</a>\n或\n<a href=\"https://owncloud.org/promote\"\n\ttarget=\"_blank\">帮助推广</a>以支持本项目！",
-"Show First Run Wizard again" => "再次显示首次运行向导",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "你已使用 <strong>%s</strong>，有效空间 <strong>%s</strong>",
-"Password" => "密码",
-"Your password was changed" => "密码已修改",
-"Unable to change your password" => "无法修改密码",
-"Current password" => "当前密码",
-"New password" => "新密码",
-"Change password" => "修改密码",
-"Full Name" => "全名",
-"Email" => "电子邮件",
-"Your email address" => "您的电子邮件",
-"Fill in an email address to enable password recovery and receive notifications" => "填入电子邮件地址从而启用密码恢复和接收通知",
-"Profile picture" => "联系人图片",
-"Upload new" => "上传新的",
-"Select new from Files" => "从文件中选择一个新的",
-"Remove image" => "移除图片",
-"Either png or jpg. Ideally square but you will be able to crop it." => "png 或 jpg。正方形比较理想但你也可以之后对其进行裁剪。",
-"Your avatar is provided by your original account." => "您的头像由您的原始账户所提供。",
-"Cancel" => "取消",
-"Choose as profile image" => "用作头像",
-"Language" => "语言",
-"Help translate" => "帮助翻译",
-"Common Name" => "通用名称",
-"Valid until" => "有效期至",
-"Issued By" => "授权由",
-"Valid until %s" => "有效期至 %s",
-"Import Root Certificate" => "导入根证书",
-"The encryption app is no longer enabled, please decrypt all your files" => "加密 app 不再被启用，请解密您所有的文件",
-"Log-in password" => "登录密码",
-"Decrypt all Files" => "解密所有文件",
-"Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." => "您的加密密钥已经移动到一个备份位置。如果发生了错误您可以恢复密钥，当确认所有文件已经正确解密时才可永久删除密钥。",
-"Restore Encryption Keys" => "恢复加密密钥",
-"Delete Encryption Keys" => "删除加密密钥",
-"Show storage location" => "显示存储位置",
-"Show last log in" => "显示最后登录",
-"Login Name" => "登录名称",
-"Create" => "创建",
-"Admin Recovery Password" => "管理恢复密码",
-"Enter the recovery password in order to recover the users files during password change" => "输入恢复密码来在更改密码的时候恢复用户文件",
-"Search Users and Groups" => "搜索用户和组",
-"Add Group" => "增加组",
-"Group" => "分组",
-"Everyone" => "所有人",
-"Admins" => "管理员",
-"Default Quota" => "默认配额",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
-"Unlimited" => "无限",
-"Other" => "其它",
-"Username" => "用户名",
-"Quota" => "配额",
-"Storage Location" => "存储空间位置",
-"Last Login" => "最后登录",
-"change full name" => "更改全名",
-"set new password" => "设置新密码",
-"Default" => "默认"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
new file mode 100644
index 00000000000..135c31cfb7a
--- /dev/null
+++ b/settings/l10n/zh_HK.js
@@ -0,0 +1,30 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "啟用",
+    "Wrong password" : "密碼錯誤",
+    "Saved" : "已儲存",
+    "Email sent" : "郵件已傳",
+    "Sending..." : "發送中...",
+    "Disable" : "停用",
+    "Enable" : "啟用",
+    "Updating...." : "更新中....",
+    "Updated" : "已更新",
+    "Delete" : "刪除",
+    "Groups" : "群組",
+    "Encryption" : "加密",
+    "None" : "空",
+    "Login" : "登入",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Port" : "連接埠",
+    "More" : "更多",
+    "Password" : "密碼",
+    "New password" : "新密碼",
+    "Change password" : "更改密碼",
+    "Email" : "電郵",
+    "Cancel" : "取消",
+    "Create" : "新增",
+    "Username" : "用戶名稱"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
new file mode 100644
index 00000000000..648713d6835
--- /dev/null
+++ b/settings/l10n/zh_HK.json
@@ -0,0 +1,28 @@
+{ "translations": {
+    "Enabled" : "啟用",
+    "Wrong password" : "密碼錯誤",
+    "Saved" : "已儲存",
+    "Email sent" : "郵件已傳",
+    "Sending..." : "發送中...",
+    "Disable" : "停用",
+    "Enable" : "啟用",
+    "Updating...." : "更新中....",
+    "Updated" : "已更新",
+    "Delete" : "刪除",
+    "Groups" : "群組",
+    "Encryption" : "加密",
+    "None" : "空",
+    "Login" : "登入",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Port" : "連接埠",
+    "More" : "更多",
+    "Password" : "密碼",
+    "New password" : "新密碼",
+    "Change password" : "更改密碼",
+    "Email" : "電郵",
+    "Cancel" : "取消",
+    "Create" : "新增",
+    "Username" : "用戶名稱"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/zh_HK.php b/settings/l10n/zh_HK.php
deleted file mode 100644
index c969e884037..00000000000
--- a/settings/l10n/zh_HK.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "啟用",
-"Wrong password" => "密碼錯誤",
-"Saved" => "已儲存",
-"Email sent" => "郵件已傳",
-"Sending..." => "發送中...",
-"Disable" => "停用",
-"Enable" => "啟用",
-"Updating...." => "更新中....",
-"Updated" => "已更新",
-"Delete" => "刪除",
-"Groups" => "群組",
-"Encryption" => "加密",
-"None" => "空",
-"Login" => "登入",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Port" => "連接埠",
-"More" => "更多",
-"Password" => "密碼",
-"New password" => "新密碼",
-"Change password" => "更改密碼",
-"Email" => "電郵",
-"Cancel" => "取消",
-"Create" => "新增",
-"Username" => "用戶名稱"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
new file mode 100644
index 00000000000..7085ec1b685
--- /dev/null
+++ b/settings/l10n/zh_TW.js
@@ -0,0 +1,173 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Enabled" : "已啓用",
+    "Authentication error" : "認證錯誤",
+    "Your full name has been changed." : "您的全名已變更。",
+    "Unable to change full name" : "無法變更全名",
+    "Group already exists" : "群組已存在",
+    "Unable to add group" : "群組增加失敗",
+    "Files decrypted successfully" : "檔案解密成功",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您的管理者",
+    "Couldn't decrypt your files, check your password and try again" : "無法解密您的檔案，確認您的密碼並再重試一次",
+    "Email saved" : "Email已儲存",
+    "Invalid email" : "無效的email",
+    "Unable to delete group" : "群組刪除錯誤",
+    "Unable to delete user" : "使用者刪除錯誤",
+    "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." : "無法更新應用程式",
+    "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." : "錯誤的管理者還原密碼",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "後端不支援變更密碼，但成功更新使用者的加密金鑰",
+    "Unable to change password" : "無法修改密碼",
+    "Saved" : "已儲存",
+    "test email settings" : "測試郵件設定",
+    "If you received this email, the settings seem to be correct." : "假如您收到這個郵件，此設定看起來是正確的。",
+    "Email sent" : "Email 已寄出",
+    "You need to set your user email before being able to send test emails." : "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
+    "Sending..." : "寄送中...",
+    "All" : "所有",
+    "Please wait...." : "請稍候...",
+    "Error while disabling app" : "停用應用程式錯誤",
+    "Disable" : "停用",
+    "Enable" : "啟用",
+    "Error while enabling app" : "啓用應用程式錯誤",
+    "Updating...." : "更新中...",
+    "Error while updating app" : "更新應用程式錯誤",
+    "Updated" : "已更新",
+    "Select a profile picture" : "選擇大頭貼",
+    "Very weak password" : "非常弱的密碼",
+    "Weak password" : "弱的密碼",
+    "So-so password" : "普通的密碼",
+    "Good password" : "好的密碼",
+    "Strong password" : "很強的密碼",
+    "Delete" : "刪除",
+    "Decrypting files... Please wait, this can take some time." : "檔案解密中，請稍候。",
+    "Groups" : "群組",
+    "undo" : "復原",
+    "never" : "永不",
+    "add group" : "新增群組",
+    "A valid username must be provided" : "必須提供一個有效的用戶名",
+    "Error creating user" : "建立用戶時出現錯誤",
+    "A valid password must be provided" : "一定要提供一個有效的密碼",
+    "Warning: Home directory for user \"{user}\" already exists" : "警告：使用者 {user} 的家目錄已經存在",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL 根憑證",
+    "Encryption" : "加密",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "全部(嚴重問題,錯誤,警告,資訊,除錯)",
+    "Info, warnings, errors and fatal issues" : "資訊,警告,錯誤和嚴重問題",
+    "Warnings, errors and fatal issues" : "警告,錯誤和嚴重問題",
+    "Errors and fatal issues" : "錯誤和嚴重問題",
+    "Fatal issues only" : "只有嚴重問題",
+    "None" : "無",
+    "Login" : "登入",
+    "Plain" : "文字",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "安全性警告",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "您正透過未加密網頁存取 %s。我們強烈建議您設定您的主機必須使用加密網頁。",
+    "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." : "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
+    "Setup Warning" : "設定警告",
+    "Module 'fileinfo' missing" : "遺失 'fileinfo' 模組",
+    "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 支援。",
+    "Your PHP version is outdated" : "您的 PHP 版本已過期",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "您的 PHP 版本已過期。我們強烈建議更新到 5.3.8 或更新的版本，因為舊的版本已知會毀損。這個可能會在安裝後無法使用。",
+    "Locale not working" : "語系無法運作",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系: %s",
+    "Please double check the <a href='%s'>installation guides</a>." : "請參考<a href='%s'>安裝指南</a>。",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "最後的排程已執行於 %s。",
+    "Last cron was executed at %s. This is more than an hour ago, 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." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
+    "Sharing" : "分享",
+    "Allow apps to use the Share API" : "允許 apps 使用分享 API",
+    "Allow public uploads" : "允許任何人上傳",
+    "Allow resharing" : "允許轉貼分享",
+    "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
+    "Security" : "安全性",
+    "Enforce HTTPS" : "強制啟用 HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "強迫用戶端使用加密連線連接到 %s",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。",
+    "Email Server" : "郵件伺服器",
+    "This is used for sending out notifications." : "這是使用於寄送通知。",
+    "Send mode" : "寄送模式",
+    "From address" : "寄件地址",
+    "Authentication method" : "驗證方式",
+    "Authentication required" : "必須驗證",
+    "Server address" : "伺服器位址",
+    "Port" : "連接埠",
+    "Credentials" : "認證",
+    "SMTP Username" : "SMTP 帳號",
+    "SMTP Password" : "SMTP 密碼",
+    "Test email settings" : "測試郵件設定",
+    "Send email" : "寄送郵件",
+    "Log" : "紀錄",
+    "Log level" : "紀錄層級",
+    "More" : "更多",
+    "Less" : "更少",
+    "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>." : "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。",
+    "More apps" : "更多 Apps",
+    "by" : "由",
+    "Documentation:" : "文件:",
+    "User Documentation" : "用戶說明文件",
+    "Admin Documentation" : "管理者文件",
+    "Administrator Documentation" : "管理者說明文件",
+    "Online Documentation" : "線上說明文件",
+    "Forum" : "論壇",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "商用支援",
+    "Get the apps to sync your files" : "下載應用程式來同步您的檔案",
+    "Show First Run Wizard again" : "再次顯示首次使用精靈",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
+    "Password" : "密碼",
+    "Your password was changed" : "你的密碼已更改",
+    "Unable to change your password" : "無法變更您的密碼",
+    "Current password" : "目前密碼",
+    "New password" : "新密碼",
+    "Change password" : "變更密碼",
+    "Full Name" : "全名",
+    "Email" : "信箱",
+    "Your email address" : "您的電子郵件信箱",
+    "Fill in an email address to enable password recovery and receive notifications" : "填入電子郵件地址來啟用忘記密碼和接收通知的功能",
+    "Profile picture" : "個人資料照片",
+    "Upload new" : "上傳新的",
+    "Select new from Files" : "從已上傳的檔案中選一個",
+    "Remove image" : "移除圖片",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它",
+    "Your avatar is provided by your original account." : "您的圖像是由您原來的帳號所提供的。",
+    "Cancel" : "取消",
+    "Choose as profile image" : "設定為大頭貼",
+    "Language" : "語言",
+    "Help translate" : "幫助翻譯",
+    "Import Root Certificate" : "匯入根憑證",
+    "The encryption app is no longer enabled, please decrypt all your files" : "加密的軟體不能長時間啟用，請解密所有您的檔案",
+    "Log-in password" : "登入密碼",
+    "Decrypt all Files" : "解密所有檔案",
+    "Login Name" : "登入名稱",
+    "Create" : "建立",
+    "Admin Recovery Password" : "管理者復原密碼",
+    "Enter the recovery password in order to recover the users files during password change" : "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
+    "Group" : "群組",
+    "Default Quota" : "預設容量限制",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
+    "Unlimited" : "無限制",
+    "Other" : "其他",
+    "Username" : "使用者名稱",
+    "Quota" : "容量限制",
+    "change full name" : "變更全名",
+    "set new password" : "設定新密碼",
+    "Default" : "預設"
+},
+"nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
new file mode 100644
index 00000000000..178778efeed
--- /dev/null
+++ b/settings/l10n/zh_TW.json
@@ -0,0 +1,171 @@
+{ "translations": {
+    "Enabled" : "已啓用",
+    "Authentication error" : "認證錯誤",
+    "Your full name has been changed." : "您的全名已變更。",
+    "Unable to change full name" : "無法變更全名",
+    "Group already exists" : "群組已存在",
+    "Unable to add group" : "群組增加失敗",
+    "Files decrypted successfully" : "檔案解密成功",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您的管理者",
+    "Couldn't decrypt your files, check your password and try again" : "無法解密您的檔案，確認您的密碼並再重試一次",
+    "Email saved" : "Email已儲存",
+    "Invalid email" : "無效的email",
+    "Unable to delete group" : "群組刪除錯誤",
+    "Unable to delete user" : "使用者刪除錯誤",
+    "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." : "無法更新應用程式",
+    "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." : "錯誤的管理者還原密碼",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "後端不支援變更密碼，但成功更新使用者的加密金鑰",
+    "Unable to change password" : "無法修改密碼",
+    "Saved" : "已儲存",
+    "test email settings" : "測試郵件設定",
+    "If you received this email, the settings seem to be correct." : "假如您收到這個郵件，此設定看起來是正確的。",
+    "Email sent" : "Email 已寄出",
+    "You need to set your user email before being able to send test emails." : "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
+    "Sending..." : "寄送中...",
+    "All" : "所有",
+    "Please wait...." : "請稍候...",
+    "Error while disabling app" : "停用應用程式錯誤",
+    "Disable" : "停用",
+    "Enable" : "啟用",
+    "Error while enabling app" : "啓用應用程式錯誤",
+    "Updating...." : "更新中...",
+    "Error while updating app" : "更新應用程式錯誤",
+    "Updated" : "已更新",
+    "Select a profile picture" : "選擇大頭貼",
+    "Very weak password" : "非常弱的密碼",
+    "Weak password" : "弱的密碼",
+    "So-so password" : "普通的密碼",
+    "Good password" : "好的密碼",
+    "Strong password" : "很強的密碼",
+    "Delete" : "刪除",
+    "Decrypting files... Please wait, this can take some time." : "檔案解密中，請稍候。",
+    "Groups" : "群組",
+    "undo" : "復原",
+    "never" : "永不",
+    "add group" : "新增群組",
+    "A valid username must be provided" : "必須提供一個有效的用戶名",
+    "Error creating user" : "建立用戶時出現錯誤",
+    "A valid password must be provided" : "一定要提供一個有效的密碼",
+    "Warning: Home directory for user \"{user}\" already exists" : "警告：使用者 {user} 的家目錄已經存在",
+    "__language_name__" : "__language_name__",
+    "SSL root certificates" : "SSL 根憑證",
+    "Encryption" : "加密",
+    "Everything (fatal issues, errors, warnings, info, debug)" : "全部(嚴重問題,錯誤,警告,資訊,除錯)",
+    "Info, warnings, errors and fatal issues" : "資訊,警告,錯誤和嚴重問題",
+    "Warnings, errors and fatal issues" : "警告,錯誤和嚴重問題",
+    "Errors and fatal issues" : "錯誤和嚴重問題",
+    "Fatal issues only" : "只有嚴重問題",
+    "None" : "無",
+    "Login" : "登入",
+    "Plain" : "文字",
+    "NT LAN Manager" : "NT LAN Manager",
+    "SSL" : "SSL",
+    "TLS" : "TLS",
+    "Security Warning" : "安全性警告",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "您正透過未加密網頁存取 %s。我們強烈建議您設定您的主機必須使用加密網頁。",
+    "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." : "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
+    "Setup Warning" : "設定警告",
+    "Module 'fileinfo' missing" : "遺失 'fileinfo' 模組",
+    "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 支援。",
+    "Your PHP version is outdated" : "您的 PHP 版本已過期",
+    "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "您的 PHP 版本已過期。我們強烈建議更新到 5.3.8 或更新的版本，因為舊的版本已知會毀損。這個可能會在安裝後無法使用。",
+    "Locale not working" : "語系無法運作",
+    "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 to install the required packages on your system to support one of the following locales: %s." : "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系: %s",
+    "Please double check the <a href='%s'>installation guides</a>." : "請參考<a href='%s'>安裝指南</a>。",
+    "Cron" : "Cron",
+    "Last cron was executed at %s." : "最後的排程已執行於 %s。",
+    "Last cron was executed at %s. This is more than an hour ago, 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." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
+    "Sharing" : "分享",
+    "Allow apps to use the Share API" : "允許 apps 使用分享 API",
+    "Allow public uploads" : "允許任何人上傳",
+    "Allow resharing" : "允許轉貼分享",
+    "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
+    "Security" : "安全性",
+    "Enforce HTTPS" : "強制啟用 HTTPS",
+    "Forces the clients to connect to %s via an encrypted connection." : "強迫用戶端使用加密連線連接到 %s",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。",
+    "Email Server" : "郵件伺服器",
+    "This is used for sending out notifications." : "這是使用於寄送通知。",
+    "Send mode" : "寄送模式",
+    "From address" : "寄件地址",
+    "Authentication method" : "驗證方式",
+    "Authentication required" : "必須驗證",
+    "Server address" : "伺服器位址",
+    "Port" : "連接埠",
+    "Credentials" : "認證",
+    "SMTP Username" : "SMTP 帳號",
+    "SMTP Password" : "SMTP 密碼",
+    "Test email settings" : "測試郵件設定",
+    "Send email" : "寄送郵件",
+    "Log" : "紀錄",
+    "Log level" : "紀錄層級",
+    "More" : "更多",
+    "Less" : "更少",
+    "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>." : "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。",
+    "More apps" : "更多 Apps",
+    "by" : "由",
+    "Documentation:" : "文件:",
+    "User Documentation" : "用戶說明文件",
+    "Admin Documentation" : "管理者文件",
+    "Administrator Documentation" : "管理者說明文件",
+    "Online Documentation" : "線上說明文件",
+    "Forum" : "論壇",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "商用支援",
+    "Get the apps to sync your files" : "下載應用程式來同步您的檔案",
+    "Show First Run Wizard again" : "再次顯示首次使用精靈",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
+    "Password" : "密碼",
+    "Your password was changed" : "你的密碼已更改",
+    "Unable to change your password" : "無法變更您的密碼",
+    "Current password" : "目前密碼",
+    "New password" : "新密碼",
+    "Change password" : "變更密碼",
+    "Full Name" : "全名",
+    "Email" : "信箱",
+    "Your email address" : "您的電子郵件信箱",
+    "Fill in an email address to enable password recovery and receive notifications" : "填入電子郵件地址來啟用忘記密碼和接收通知的功能",
+    "Profile picture" : "個人資料照片",
+    "Upload new" : "上傳新的",
+    "Select new from Files" : "從已上傳的檔案中選一個",
+    "Remove image" : "移除圖片",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它",
+    "Your avatar is provided by your original account." : "您的圖像是由您原來的帳號所提供的。",
+    "Cancel" : "取消",
+    "Choose as profile image" : "設定為大頭貼",
+    "Language" : "語言",
+    "Help translate" : "幫助翻譯",
+    "Import Root Certificate" : "匯入根憑證",
+    "The encryption app is no longer enabled, please decrypt all your files" : "加密的軟體不能長時間啟用，請解密所有您的檔案",
+    "Log-in password" : "登入密碼",
+    "Decrypt all Files" : "解密所有檔案",
+    "Login Name" : "登入名稱",
+    "Create" : "建立",
+    "Admin Recovery Password" : "管理者復原密碼",
+    "Enter the recovery password in order to recover the users files during password change" : "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
+    "Group" : "群組",
+    "Default Quota" : "預設容量限制",
+    "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
+    "Unlimited" : "無限制",
+    "Other" : "其他",
+    "Username" : "使用者名稱",
+    "Quota" : "容量限制",
+    "change full name" : "變更全名",
+    "set new password" : "設定新密碼",
+    "Default" : "預設"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
deleted file mode 100644
index 20a10a926ac..00000000000
--- a/settings/l10n/zh_TW.php
+++ /dev/null
@@ -1,172 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Enabled" => "已啓用",
-"Authentication error" => "認證錯誤",
-"Your full name has been changed." => "您的全名已變更。",
-"Unable to change full name" => "無法變更全名",
-"Group already exists" => "群組已存在",
-"Unable to add group" => "群組增加失敗",
-"Files decrypted successfully" => "檔案解密成功",
-"Couldn't decrypt your files, please check your owncloud.log or ask your administrator" => "無法解密您的檔案，請檢查您的 owncloud.log 或是詢問您的管理者",
-"Couldn't decrypt your files, check your password and try again" => "無法解密您的檔案，確認您的密碼並再重試一次",
-"Email saved" => "Email已儲存",
-"Invalid email" => "無效的email",
-"Unable to delete group" => "群組刪除錯誤",
-"Unable to delete user" => "使用者刪除錯誤",
-"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." => "無法更新應用程式",
-"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." => "錯誤的管理者還原密碼",
-"Back-end doesn't support password change, but the users encryption key was successfully updated." => "後端不支援變更密碼，但成功更新使用者的加密金鑰",
-"Unable to change password" => "無法修改密碼",
-"Saved" => "已儲存",
-"test email settings" => "測試郵件設定",
-"If you received this email, the settings seem to be correct." => "假如您收到這個郵件，此設定看起來是正確的。",
-"Email sent" => "Email 已寄出",
-"You need to set your user email before being able to send test emails." => "在準備要寄出測試郵件時您需要設定您的使用者郵件。",
-"Sending..." => "寄送中...",
-"All" => "所有",
-"Please wait...." => "請稍候...",
-"Error while disabling app" => "停用應用程式錯誤",
-"Disable" => "停用",
-"Enable" => "啟用",
-"Error while enabling app" => "啓用應用程式錯誤",
-"Updating...." => "更新中...",
-"Error while updating app" => "更新應用程式錯誤",
-"Updated" => "已更新",
-"Select a profile picture" => "選擇大頭貼",
-"Very weak password" => "非常弱的密碼",
-"Weak password" => "弱的密碼",
-"So-so password" => "普通的密碼",
-"Good password" => "好的密碼",
-"Strong password" => "很強的密碼",
-"Delete" => "刪除",
-"Decrypting files... Please wait, this can take some time." => "檔案解密中，請稍候。",
-"Groups" => "群組",
-"undo" => "復原",
-"never" => "永不",
-"add group" => "新增群組",
-"A valid username must be provided" => "必須提供一個有效的用戶名",
-"Error creating user" => "建立用戶時出現錯誤",
-"A valid password must be provided" => "一定要提供一個有效的密碼",
-"Warning: Home directory for user \"{user}\" already exists" => "警告：使用者 {user} 的家目錄已經存在",
-"__language_name__" => "__language_name__",
-"SSL root certificates" => "SSL 根憑證",
-"Encryption" => "加密",
-"Everything (fatal issues, errors, warnings, info, debug)" => "全部(嚴重問題,錯誤,警告,資訊,除錯)",
-"Info, warnings, errors and fatal issues" => "資訊,警告,錯誤和嚴重問題",
-"Warnings, errors and fatal issues" => "警告,錯誤和嚴重問題",
-"Errors and fatal issues" => "錯誤和嚴重問題",
-"Fatal issues only" => "只有嚴重問題",
-"None" => "無",
-"Login" => "登入",
-"Plain" => "文字",
-"NT LAN Manager" => "NT LAN Manager",
-"SSL" => "SSL",
-"TLS" => "TLS",
-"Security Warning" => "安全性警告",
-"You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "您正透過未加密網頁存取 %s。我們強烈建議您設定您的主機必須使用加密網頁。",
-"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." => "您的資料目錄 (Data Directory) 和檔案可能可以由網際網路上面公開存取。Owncloud 所提供的 .htaccess 設定檔並未生效，我們強烈建議您設定您的網頁伺服器以防止資料目錄被公開存取，或將您的資料目錄移出網頁伺服器的 document root 。",
-"Setup Warning" => "設定警告",
-"Module 'fileinfo' missing" => "遺失 'fileinfo' 模組",
-"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 支援。",
-"Your PHP version is outdated" => "您的 PHP 版本已過期",
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." => "您的 PHP 版本已過期。我們強烈建議更新到 5.3.8 或更新的版本，因為舊的版本已知會毀損。這個可能會在安裝後無法使用。",
-"Locale not working" => "語系無法運作",
-"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 to install the required packages on your system to support one of the following locales: %s." => "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系: %s",
-"Please double check the <a href='%s'>installation guides</a>." => "請參考<a href='%s'>安裝指南</a>。",
-"Cron" => "Cron",
-"Last cron was executed at %s." => "最後的排程已執行於 %s。",
-"Last cron was executed at %s. This is more than an hour ago, 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." => "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
-"Sharing" => "分享",
-"Allow apps to use the Share API" => "允許 apps 使用分享 API",
-"Allow public uploads" => "允許任何人上傳",
-"Allow resharing" => "允許轉貼分享",
-"Allow users to send mail notification for shared files" => "允許使用者寄送有關分享檔案的郵件通知",
-"Security" => "安全性",
-"Enforce HTTPS" => "強制啟用 HTTPS",
-"Forces the clients to connect to %s via an encrypted connection." => "強迫用戶端使用加密連線連接到 %s",
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。",
-"Email Server" => "郵件伺服器",
-"This is used for sending out notifications." => "這是使用於寄送通知。",
-"Send mode" => "寄送模式",
-"From address" => "寄件地址",
-"Authentication method" => "驗證方式",
-"Authentication required" => "必須驗證",
-"Server address" => "伺服器位址",
-"Port" => "連接埠",
-"Credentials" => "認證",
-"SMTP Username" => "SMTP 帳號",
-"SMTP Password" => "SMTP 密碼",
-"Test email settings" => "測試郵件設定",
-"Send email" => "寄送郵件",
-"Log" => "紀錄",
-"Log level" => "紀錄層級",
-"More" => "更多",
-"Less" => "更少",
-"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>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社群</a>開發，<a href=\"https://github.com/owncloud\" target=\"_blank\">原始碼</a>在 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 授權許可下發布。",
-"More apps" => "更多 Apps",
-"by" => "由",
-"Documentation:" => "文件:",
-"User Documentation" => "用戶說明文件",
-"Admin Documentation" => "管理者文件",
-"Administrator Documentation" => "管理者說明文件",
-"Online Documentation" => "線上說明文件",
-"Forum" => "論壇",
-"Bugtracker" => "Bugtracker",
-"Commercial Support" => "商用支援",
-"Get the apps to sync your files" => "下載應用程式來同步您的檔案",
-"Show First Run Wizard again" => "再次顯示首次使用精靈",
-"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "您已經使用了 <strong>%s</strong> ，目前可用空間為 <strong>%s</strong>",
-"Password" => "密碼",
-"Your password was changed" => "你的密碼已更改",
-"Unable to change your password" => "無法變更您的密碼",
-"Current password" => "目前密碼",
-"New password" => "新密碼",
-"Change password" => "變更密碼",
-"Full Name" => "全名",
-"Email" => "信箱",
-"Your email address" => "您的電子郵件信箱",
-"Fill in an email address to enable password recovery and receive notifications" => "填入電子郵件地址來啟用忘記密碼和接收通知的功能",
-"Profile picture" => "個人資料照片",
-"Upload new" => "上傳新的",
-"Select new from Files" => "從已上傳的檔案中選一個",
-"Remove image" => "移除圖片",
-"Either png or jpg. Ideally square but you will be able to crop it." => "可以使用 png 或 jpg 格式，最好是方形的，但是您之後也可以裁剪它",
-"Your avatar is provided by your original account." => "您的圖像是由您原來的帳號所提供的。",
-"Cancel" => "取消",
-"Choose as profile image" => "設定為大頭貼",
-"Language" => "語言",
-"Help translate" => "幫助翻譯",
-"Import Root Certificate" => "匯入根憑證",
-"The encryption app is no longer enabled, please decrypt all your files" => "加密的軟體不能長時間啟用，請解密所有您的檔案",
-"Log-in password" => "登入密碼",
-"Decrypt all Files" => "解密所有檔案",
-"Login Name" => "登入名稱",
-"Create" => "建立",
-"Admin Recovery Password" => "管理者復原密碼",
-"Enter the recovery password in order to recover the users files during password change" => "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
-"Group" => "群組",
-"Default Quota" => "預設容量限制",
-"Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" => "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
-"Unlimited" => "無限制",
-"Other" => "其他",
-"Username" => "使用者名稱",
-"Quota" => "容量限制",
-"change full name" => "變更全名",
-"set new password" => "設定新密碼",
-"Default" => "預設"
-);
-$PLURAL_FORMS = "nplurals=1; plural=0;";
-- 
GitLab


From c682b1f0c17df0f59a1c18b8948547cd1d70bb48 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 28 Oct 2014 13:19:51 +0100
Subject: [PATCH 253/616] Fix language file detection

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

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index ab94d017a25..6ec4e967c7f 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -501,7 +501,7 @@ class OC_L10N implements \OCP\IL10N {
 		}
 		$dir = self::findI18nDir($app);
 		if(is_dir($dir)) {
-			return file_exists($dir.'/'.$lang.'.php');
+			return file_exists($dir.'/'.$lang.'.json');
 		}
 		return false;
 	}
-- 
GitLab


From 1052243285825c60dc031fb3bd1541afce7efb65 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 29 Oct 2014 10:28:09 +0100
Subject: [PATCH 254/616] Close session for search

Make search non-blocking.
---
 search/ajax/search.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/search/ajax/search.php b/search/ajax/search.php
index 546fccc644f..84a5a760cad 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -23,6 +23,7 @@
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
+\OC::$server->getSession()->close();
 
 $query=(isset($_GET['query']))?$_GET['query']:'';
 if($query) {
-- 
GitLab


From ff84384513cef50fb80dc82b2b3426a1ca608a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 29 Oct 2014 10:57:46 +0100
Subject: [PATCH 255/616] Adding translations for settings

---
 settings/templates/users/main.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/settings/templates/users/main.php b/settings/templates/users/main.php
index 59284eaabd3..d2b7652f142 100644
--- a/settings/templates/users/main.php
+++ b/settings/templates/users/main.php
@@ -17,6 +17,8 @@ $userlistParams['allGroups'] = json_encode($allGroups);
 $items = array_flip($userlistParams['subadmingroups']);
 unset($items['admin']);
 $userlistParams['subadmingroups'] = array_flip($items);
+
+translation('settings');
 ?>
 
 <div id="app-navigation">
@@ -45,4 +47,4 @@ $userlistParams['subadmingroups'] = array_flip($items);
 <div id="app-content">
 	<?php print_unescaped($this->inc('users/part.createuser')); ?>
 	<?php print_unescaped($this->inc('users/part.userlist', $userlistParams)); ?>
-</div>
\ No newline at end of file
+</div>
-- 
GitLab


From fb4f9933363a83d98db81afd796043e48cff5a4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 29 Oct 2014 10:58:10 +0100
Subject: [PATCH 256/616] Fix implementation of translation short cut

---
 lib/private/template/functions.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index 8c94b7cf345..dede604c01d 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -58,17 +58,10 @@ function style($app, $file) {
 /**
  * Shortcut for adding translations to a page
  * @param string $app the appname
- * @param string|string[] $file the filename,
  * if an array is given it will add all styles
  */
-function translation($app, $file) {
-	if(is_array($file)) {
-		foreach($file as $f) {
-			OC_Util::addStyle($app, $f);
-		}
-	} else {
-		OC_Util::addStyle($app, $file);
-	}
+function translation($app) {
+	OC_Util::addTranslations($app);
 }
 
 /**
-- 
GitLab


From b920f888ae6efab4febfd5138684e91621ea8dd8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 29 Oct 2014 12:22:50 +0100
Subject: [PATCH 257/616] Fix moving share keys as non-owner to subdir

This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.

After the move/copy operation the keys are moved/copied to the target
dir.

Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
---
 apps/files_encryption/hooks/hooks.php | 58 ++++++++++++---------------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e004d4a1d63..3a0a37c0a59 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -409,34 +409,18 @@ class Hooks {
 	 * @param array $params with the old path and the new path
 	 */
 	public static function preRename($params) {
-		$user = \OCP\User::getUser();
-		$view = new \OC\Files\View('/');
-		$util = new Util($view, $user);
-		list($ownerOld, $pathOld) = $util->getUidAndFilename($params['oldpath']);
-
-		// we only need to rename the keys if the rename happens on the same mountpoint
-		// otherwise we perform a stream copy, so we get a new set of keys
-		$mp1 = $view->getMountPoint('/' . $user . '/files/' . $params['oldpath']);
-		$mp2 = $view->getMountPoint('/' . $user . '/files/' . $params['newpath']);
-
-		$type = $view->is_dir('/' . $user . '/files/' . $params['oldpath']) ? 'folder' : 'file';
-
-		if ($mp1 === $mp2) {
-			self::$renamedFiles[$params['oldpath']] = array(
-				'uid' => $ownerOld,
-				'path' => $pathOld,
-				'type' => $type,
-				'operation' => 'rename',
-				);
-
-		}
+		self::preRenameOrCopy($params, 'rename');
 	}
 
 	/**
-	 * mark file as renamed so that we know the original source after the file was renamed
+	 * mark file as copied so that we know the original source after the file was copied
 	 * @param array $params with the old path and the new path
 	 */
 	public static function preCopy($params) {
+		self::preRenameOrCopy($params, 'copy');
+	}
+
+	private static function preRenameOrCopy($params, $operation) {
 		$user = \OCP\User::getUser();
 		$view = new \OC\Files\View('/');
 		$util = new Util($view, $user);
@@ -450,11 +434,27 @@ class Hooks {
 		$type = $view->is_dir('/' . $user . '/files/' . $params['oldpath']) ? 'folder' : 'file';
 
 		if ($mp1 === $mp2) {
+			if ($util->isSystemWideMountPoint($pathOld)) {
+				$oldShareKeyPath = 'files_encryption/share-keys/' . $pathOld;
+			} else {
+				$oldShareKeyPath = $ownerOld . '/' . 'files_encryption/share-keys/' . $pathOld;
+			}
+			// gather share keys here because in postRename() the file will be moved already
+			$oldShareKeys = Helper::findShareKeys($pathOld, $oldShareKeyPath, $view);
+			if (count($oldShareKeys) === 0) {
+				\OC_Log::write(
+					'Encryption library', 'No share keys found for "' . $pathOld . '"',
+					\OC_Log::WARN
+				);
+			}
 			self::$renamedFiles[$params['oldpath']] = array(
 				'uid' => $ownerOld,
 				'path' => $pathOld,
 				'type' => $type,
-				'operation' => 'copy');
+				'operation' => $operation,
+				'sharekeys' => $oldShareKeys
+				);
+
 		}
 	}
 
@@ -476,6 +476,7 @@ class Hooks {
 		$view = new \OC\Files\View('/');
 		$userId = \OCP\User::getUser();
 		$util = new Util($view, $userId);
+		$oldShareKeys = null;
 
 		if (isset(self::$renamedFiles[$params['oldpath']]['uid']) &&
 				isset(self::$renamedFiles[$params['oldpath']]['path'])) {
@@ -483,6 +484,7 @@ class Hooks {
 			$pathOld = self::$renamedFiles[$params['oldpath']]['path'];
 			$type =  self::$renamedFiles[$params['oldpath']]['type'];
 			$operation = self::$renamedFiles[$params['oldpath']]['operation'];
+			$oldShareKeys = self::$renamedFiles[$params['oldpath']]['sharekeys'];
 			unset(self::$renamedFiles[$params['oldpath']]);
 		} else {
 			\OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::DEBUG);
@@ -522,15 +524,7 @@ class Hooks {
 			$oldKeyfilePath .= '.key';
 			$newKeyfilePath .= '.key';
 
-			// handle share-keys
-			$matches = Helper::findShareKeys($pathOld, $oldShareKeyPath, $view);
-			if (count($matches) === 0) {
-				\OC_Log::write(
-					'Encryption library', 'No share keys found for "' . $pathOld . '"',
-					\OC_Log::WARN
-				);
-			}
-			foreach ($matches as $src) {
+			foreach ($oldShareKeys as $src) {
 				$dst = \OC\Files\Filesystem::normalizePath(str_replace($pathOld, $pathNew, $src));
 				$view->$operation($src, $dst);
 			}
-- 
GitLab


From f44e617dfdf79cedba4700bfb8e21ac9c51bb624 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 29 Oct 2014 12:56:49 +0100
Subject: [PATCH 258/616] Fix warning with unset extension check

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

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index a2b485a2ca1..5ce15d9a012 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -300,7 +300,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 			$pathinfo = pathinfo($relPath1);
 			// for part files we need to ask for the owner and path from the parent directory because
 			// the file cache doesn't return any results for part files
-			if ($pathinfo['extension'] === 'part') {
+			if (isset($pathinfo['extension']) && $pathinfo['extension'] === 'part') {
 				list($user1, $path1) = \OCA\Files_Sharing\Helper::getUidAndFilename($pathinfo['dirname']);
 				$path1 = $path1 . '/' . $pathinfo['basename'];
 			} else {
-- 
GitLab


From e8f9b929bd04c4228299118a5cca72148d64fed2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 29 Oct 2014 12:57:12 +0100
Subject: [PATCH 259/616] Added encryption test when moving file as non-owner

---
 apps/files_encryption/tests/share.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index f4ce94b7ee9..4a0f10b13fb 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -1074,8 +1074,19 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OC\Files\Filesystem::unlink('/newfolder');
 	}
 
-	function testMoveFileToFolder() {
+	function usersProvider() {
+		return array(
+			// test as owner
+			array(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1),
+			// test as share receiver
+			array(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2),
+		);
+	}
 
+	/**
+	 * @dataProvider usersProvider
+	 */
+	function testMoveFileToFolder($userId) {
 		$view = new \OC\Files\View('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		$filename = '/tmp-' . uniqid();
@@ -1108,8 +1119,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
-		// move the file into the subfolder
+		// move the file into the subfolder as the test user
+		\Test_Encryption_Util::loginHelper($userId);
 		\OC\Files\Filesystem::rename($folder . $filename, $subFolder . $filename);
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// Get file decrypted contents
 		$newDecrypt = \OC\Files\Filesystem::file_get_contents($subFolder . $filename);
-- 
GitLab


From 6c4b7db09b1ea79a873144fb8cedc0203ad0e838 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 29 Oct 2014 14:10:38 +0100
Subject: [PATCH 260/616] just add merge commit of 3rdparty repo

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index e726a92d4af..9bd66bb6b4b 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit e726a92d4af699fcb1085d7219dcfbbbb953da83
+Subproject commit 9bd66bb6b4baa077bfc9d8b55a00185f37d55086
-- 
GitLab


From 8a48b088ed22f23f961da3c0eb9591989f8cc98a Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Oct 2014 18:52:55 +0100
Subject: [PATCH 261/616] on xp'ed mode and switching configurations: save raw
 mode instead of toggling filter mode in tabs since their status is unknown
 and dealt with by the Wizard. Fixes #11848

---
 apps/user_ldap/js/experiencedAdmin.js | 14 +++-----------
 apps/user_ldap/js/settings.js         | 10 +++++++---
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/apps/user_ldap/js/experiencedAdmin.js b/apps/user_ldap/js/experiencedAdmin.js
index fac8dd6470f..8d138eecc41 100644
--- a/apps/user_ldap/js/experiencedAdmin.js
+++ b/apps/user_ldap/js/experiencedAdmin.js
@@ -50,17 +50,9 @@ ExperiencedAdmin.prototype.isExperienced = function() {
  * switches all LDAP filters from Assisted to Raw mode.
  */
 ExperiencedAdmin.prototype.enableRawMode = function() {
-	var containers = {
-		'toggleRawGroupFilter': '#rawGroupFilterContainer',
-		'toggleRawLoginFilter': '#rawLoginFilterContainer',
-		'toggleRawUserFilter' : '#rawUserFilterContainer'
-	};
-
-	for(var method in containers) {
-		if($(containers[method]).hasClass('invisible')) {
-			this.wizard[method]();
-		}
-	}
+	LdapWizard._save({id: 'ldapGroupFilterMode'}, LdapWizard.filterModeRaw);
+	LdapWizard._save({id: 'ldapUserFilterMode' }, LdapWizard.filterModeRaw);
+	LdapWizard._save({id: 'ldapLoginFilterMode'}, LdapWizard.filterModeRaw);
 };
 
 ExperiencedAdmin.prototype.updateUserTab = function(mode) {
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 1627528200f..fa40aba73b4 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -838,9 +838,10 @@ var LdapWizard = {
 		}
 	},
 
-	onToggleRawFilterConfirmation: function(currentMode, callback) {
-		if(!LdapWizard.admin.isExperienced()
-			|| currentMode === LdapWizard.filterModeAssisted
+	onToggleRawFilterConfirmation: function(currentMode, isRawVisible, callback) {
+		if(   !LdapWizard.admin.isExperienced()
+		   || currentMode === LdapWizard.filterModeAssisted
+		   || (LdapWizard.admin.isExperienced() && !isRawVisible)
 		) {
 			return callback(true);
 		}
@@ -855,6 +856,7 @@ var LdapWizard = {
 	toggleRawGroupFilter: function() {
 		LdapWizard.onToggleRawFilterConfirmation(
 			LdapWizard.groupFilter.getMode(),
+			!$('#rawGroupFilterContainer').hasClass('invisible'),
 			function(confirmed) {
 				if(confirmed !== true) {
 					return;
@@ -875,6 +877,7 @@ var LdapWizard = {
 	toggleRawLoginFilter: function() {
 		LdapWizard.onToggleRawFilterConfirmation(
 			LdapWizard.loginFilter.getMode(),
+			!$('#rawLoginFilterContainer').hasClass('invisible'),
 			function(confirmed) {
 				if(confirmed !== true) {
 					return;
@@ -909,6 +912,7 @@ var LdapWizard = {
 	toggleRawUserFilter: function() {
 		LdapWizard.onToggleRawFilterConfirmation(
 			LdapWizard.userFilter.getMode(),
+			!$('#rawUserFilterContainer').hasClass('invisible'),
 			function(confirmed) {
 				if(confirmed === true) {
 					LdapWizard.blacklistRemove('ldap_userlist_filter');
-- 
GitLab


From e8703f648d70bbe4d5232b9a14e2a1d45bbf2314 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 29 Oct 2014 20:38:46 +0100
Subject: [PATCH 262/616] fix style of generated documentation

---
 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 09b59fcb5b4..d3fa7508ce2 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -808,7 +808,8 @@ $CONFIG = array(
 ),
 
 /**
- * Database types that are supported for installation
+ * Database types that are supported for installation.
+ *
  * Available:
  * 	- sqlite (SQLite3)
  * 	- mysql (MySQL)
-- 
GitLab


From 2cd35e94b4cd36f8f3e1691bc7da56583daca672 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 29 Oct 2014 22:53:59 +0100
Subject: [PATCH 263/616] Close session for files_trashbin

When restoring huge folders the interface will be unresponsive otherwise
---
 apps/files_trashbin/ajax/delete.php   | 2 ++
 apps/files_trashbin/ajax/isEmpty.php  | 1 +
 apps/files_trashbin/ajax/list.php     | 1 +
 apps/files_trashbin/ajax/preview.php  | 1 +
 apps/files_trashbin/ajax/undelete.php | 1 +
 5 files changed, 6 insertions(+)

diff --git a/apps/files_trashbin/ajax/delete.php b/apps/files_trashbin/ajax/delete.php
index a2302802649..72553fa0ee0 100644
--- a/apps/files_trashbin/ajax/delete.php
+++ b/apps/files_trashbin/ajax/delete.php
@@ -2,6 +2,8 @@
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+\OC::$server->getSession()->close();
+
 $folder = isset($_POST['dir']) ? $_POST['dir'] : '/';
 
 // "empty trash" command
diff --git a/apps/files_trashbin/ajax/isEmpty.php b/apps/files_trashbin/ajax/isEmpty.php
index 2e54c7e77b9..897ee262895 100644
--- a/apps/files_trashbin/ajax/isEmpty.php
+++ b/apps/files_trashbin/ajax/isEmpty.php
@@ -6,6 +6,7 @@
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+\OC::$server->getSession()->close();
 
 $trashStatus = OCA\Files_Trashbin\Trashbin::isEmpty(OCP\User::getUser());
 
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index 6cad101d34a..e25301a26cb 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -1,6 +1,7 @@
 <?php
 
 OCP\JSON::checkLoggedIn();
+\OC::$server->getSession()->close();
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
diff --git a/apps/files_trashbin/ajax/preview.php b/apps/files_trashbin/ajax/preview.php
index 32905b2a71c..1401e3b7a7d 100644
--- a/apps/files_trashbin/ajax/preview.php
+++ b/apps/files_trashbin/ajax/preview.php
@@ -6,6 +6,7 @@
  * See the COPYING-README file.
  */
 \OC_Util::checkLoggedIn();
+\OC::$server->getSession()->close();
 
 if(!\OC_App::isEnabled('files_trashbin')){
 	exit;
diff --git a/apps/files_trashbin/ajax/undelete.php b/apps/files_trashbin/ajax/undelete.php
index 02d651925ca..ab7d57f5a7f 100644
--- a/apps/files_trashbin/ajax/undelete.php
+++ b/apps/files_trashbin/ajax/undelete.php
@@ -2,6 +2,7 @@
 
 OCP\JSON::checkLoggedIn();
 OCP\JSON::callCheck();
+\OC::$server->getSession()->close();
 
 $files = $_POST['files'];
 $dir = '/';
-- 
GitLab


From b3f881748d968779120aa702142ed47eb66251ba Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 30 Oct 2014 00:00:40 +0100
Subject: [PATCH 264/616] Allow any outgoing XHR connections

Quickfix for https://github.com/owncloud/core/issues/11064
---
 config/config.sample.php | 2 +-
 lib/private/response.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index d3fa7508ce2..a53521485e6 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -831,7 +831,7 @@ $CONFIG = array(
 'custom_csp_policy' =>
 	"default-src 'self'; script-src 'self' 'unsafe-eval'; ".
 	"style-src 'self' 'unsafe-inline'; frame-src *; img-src *; ".
-	"font-src 'self' data:; media-src *",
+	"font-src 'self' data:; media-src *; connect-src *",
 
 
 /**
diff --git a/lib/private/response.php b/lib/private/response.php
index caa382af776..cf18115111a 100644
--- a/lib/private/response.php
+++ b/lib/private/response.php
@@ -212,7 +212,8 @@ class OC_Response {
 			. 'frame-src *; '
 			. 'img-src *; '
 			. 'font-src \'self\' data:; '
-			. 'media-src *');
+			. 'media-src *; ' 
+			. 'connect-src *');
 		header('Content-Security-Policy:' . $policy);
 
 		// https://developers.google.com/webmasters/control-crawl-index/docs/robots_meta_tag
-- 
GitLab


From ea55848fa11eee7469c9ccee7b2c544ab976d3a1 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 30 Oct 2014 01:55:14 -0400
Subject: [PATCH 265/616] [tx-robot] updated from transifex

---
 apps/files/l10n/ast.js              |  2 +
 apps/files/l10n/ast.json            |  2 +
 apps/files/l10n/eu.js               |  1 +
 apps/files/l10n/eu.json             |  1 +
 apps/files/l10n/hi_IN.js            |  6 +-
 apps/files/l10n/hi_IN.json          |  7 ++-
 apps/files/l10n/sk.js               |  6 +-
 apps/files/l10n/sk.json             | 11 +++-
 apps/files/l10n/ur.js               |  6 +-
 apps/files/l10n/ur.json             |  8 ++-
 apps/files_encryption/l10n/eu.js    |  6 ++
 apps/files_encryption/l10n/eu.json  |  6 ++
 apps/files_encryption/l10n/id.js    | 20 ++++++-
 apps/files_encryption/l10n/id.json  | 20 ++++++-
 apps/files_encryption/l10n/pl.js    |  1 +
 apps/files_encryption/l10n/pl.json  |  1 +
 apps/files_external/l10n/ast.js     |  2 +
 apps/files_external/l10n/ast.json   |  2 +
 apps/files_external/l10n/eu.js      |  4 ++
 apps/files_external/l10n/eu.json    |  4 ++
 apps/files_external/l10n/fr.js      |  2 +-
 apps/files_external/l10n/fr.json    |  2 +-
 apps/files_external/l10n/ja.js      |  2 +-
 apps/files_external/l10n/ja.json    |  2 +-
 apps/files_external/l10n/sk.js      |  9 +++
 apps/files_external/l10n/sk.json    |  7 +++
 apps/files_sharing/l10n/ast.js      |  1 +
 apps/files_sharing/l10n/ast.json    |  1 +
 apps/files_sharing/l10n/eu.js       |  2 +
 apps/files_sharing/l10n/eu.json     |  2 +
 apps/files_sharing/l10n/id.js       | 14 ++++-
 apps/files_sharing/l10n/id.json     | 14 ++++-
 apps/files_sharing/l10n/sk.js       |  7 +++
 apps/files_sharing/l10n/sk.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/user_ldap/l10n/ar.js           | 26 ++++++++-
 apps/user_ldap/l10n/ar.json         | 26 ++++++++-
 apps/user_ldap/l10n/ast.js          |  4 ++
 apps/user_ldap/l10n/ast.json        |  4 ++
 apps/user_ldap/l10n/eu.js           |  1 +
 apps/user_ldap/l10n/eu.json         |  1 +
 apps/user_ldap/l10n/hi_IN.js        |  7 +++
 apps/user_ldap/l10n/hi_IN.json      |  5 ++
 apps/user_ldap/l10n/id.js           | 65 ++++++++++++++++-----
 apps/user_ldap/l10n/id.json         | 65 ++++++++++++++++-----
 apps/user_ldap/l10n/ja.js           |  2 +-
 apps/user_ldap/l10n/ja.json         |  2 +-
 apps/user_ldap/l10n/sk.js           |  9 +++
 apps/user_ldap/l10n/sk.json         |  7 +++
 apps/user_ldap/l10n/sl.js           |  4 ++
 apps/user_ldap/l10n/sl.json         |  4 ++
 apps/user_ldap/l10n/ur.js           |  8 +++
 apps/user_ldap/l10n/ur.json         |  6 ++
 apps/user_webdavauth/l10n/sk.js     |  6 ++
 apps/user_webdavauth/l10n/sk.json   |  4 ++
 core/l10n/ach.js                    |  3 +-
 core/l10n/ach.json                  |  3 +-
 core/l10n/ady.js                    |  3 +-
 core/l10n/ady.json                  |  3 +-
 core/l10n/af_ZA.js                  |  5 +-
 core/l10n/af_ZA.json                |  5 +-
 core/l10n/ak.js                     |  3 +-
 core/l10n/ak.json                   |  3 +-
 core/l10n/am_ET.js                  |  3 +-
 core/l10n/am_ET.json                |  3 +-
 core/l10n/ar.js                     |  3 +-
 core/l10n/ar.json                   |  3 +-
 core/l10n/ast.js                    |  5 +-
 core/l10n/ast.json                  |  5 +-
 core/l10n/az.js                     |  2 +-
 core/l10n/az.json                   |  2 +-
 core/l10n/be.js                     |  1 +
 core/l10n/be.json                   |  1 +
 core/l10n/bg_BG.js                  |  5 +-
 core/l10n/bg_BG.json                |  5 +-
 core/l10n/bn_BD.js                  |  5 +-
 core/l10n/bn_BD.json                |  5 +-
 core/l10n/bn_IN.js                  |  2 +-
 core/l10n/bn_IN.json                |  2 +-
 core/l10n/bs.js                     |  4 +-
 core/l10n/bs.json                   |  4 +-
 core/l10n/ca.js                     |  5 +-
 core/l10n/ca.json                   |  5 +-
 core/l10n/ca@valencia.js            |  3 +-
 core/l10n/ca@valencia.json          |  3 +-
 core/l10n/cs_CZ.js                  |  5 +-
 core/l10n/cs_CZ.json                |  5 +-
 core/l10n/cy_GB.js                  |  2 +-
 core/l10n/cy_GB.json                |  2 +-
 core/l10n/da.js                     |  5 +-
 core/l10n/da.json                   |  5 +-
 core/l10n/de.js                     |  5 +-
 core/l10n/de.json                   |  5 +-
 core/l10n/de_AT.js                  |  1 +
 core/l10n/de_AT.json                |  1 +
 core/l10n/de_CH.js                  |  3 +-
 core/l10n/de_CH.json                |  3 +-
 core/l10n/de_DE.js                  |  5 +-
 core/l10n/de_DE.json                |  5 +-
 core/l10n/el.js                     |  5 +-
 core/l10n/el.json                   |  5 +-
 core/l10n/en@pirate.js              |  1 +
 core/l10n/en@pirate.json            |  1 +
 core/l10n/en_GB.js                  |  5 +-
 core/l10n/en_GB.json                |  5 +-
 core/l10n/en_NZ.js                  |  3 +-
 core/l10n/en_NZ.json                |  3 +-
 core/l10n/eo.js                     |  4 +-
 core/l10n/eo.json                   |  4 +-
 core/l10n/es.js                     |  5 +-
 core/l10n/es.json                   |  5 +-
 core/l10n/es_AR.js                  |  4 +-
 core/l10n/es_AR.json                |  4 +-
 core/l10n/es_BO.js                  |  3 +-
 core/l10n/es_BO.json                |  3 +-
 core/l10n/es_CL.js                  |  1 +
 core/l10n/es_CL.json                |  1 +
 core/l10n/es_CO.js                  |  3 +-
 core/l10n/es_CO.json                |  3 +-
 core/l10n/es_CR.js                  |  3 +-
 core/l10n/es_CR.json                |  3 +-
 core/l10n/es_EC.js                  |  3 +-
 core/l10n/es_EC.json                |  3 +-
 core/l10n/es_MX.js                  |  3 +-
 core/l10n/es_MX.json                |  3 +-
 core/l10n/es_PE.js                  |  3 +-
 core/l10n/es_PE.json                |  3 +-
 core/l10n/es_PY.js                  |  3 +-
 core/l10n/es_PY.json                |  3 +-
 core/l10n/es_US.js                  |  3 +-
 core/l10n/es_US.json                |  3 +-
 core/l10n/es_UY.js                  |  3 +-
 core/l10n/es_UY.json                |  3 +-
 core/l10n/et_EE.js                  |  5 +-
 core/l10n/et_EE.json                |  5 +-
 core/l10n/eu.js                     | 27 +++++++--
 core/l10n/eu.json                   | 27 +++++++--
 core/l10n/eu_ES.js                  |  1 +
 core/l10n/eu_ES.json                |  1 +
 core/l10n/fa.js                     |  5 +-
 core/l10n/fa.json                   |  5 +-
 core/l10n/fi_FI.js                  |  5 +-
 core/l10n/fi_FI.json                |  5 +-
 core/l10n/fil.js                    |  3 +-
 core/l10n/fil.json                  |  3 +-
 core/l10n/fr.js                     |  5 +-
 core/l10n/fr.json                   |  5 +-
 core/l10n/fr_CA.js                  |  3 +-
 core/l10n/fr_CA.json                |  3 +-
 core/l10n/fy_NL.js                  |  3 +-
 core/l10n/fy_NL.json                |  3 +-
 core/l10n/gl.js                     |  5 +-
 core/l10n/gl.json                   |  5 +-
 core/l10n/gu.js                     |  3 +-
 core/l10n/gu.json                   |  3 +-
 core/l10n/he.js                     |  2 +-
 core/l10n/he.json                   |  2 +-
 core/l10n/hi.js                     |  1 +
 core/l10n/hi.json                   |  1 +
 core/l10n/hi_IN.js                  |  6 ++
 core/l10n/hi_IN.json                |  4 ++
 core/l10n/hr.js                     |  5 +-
 core/l10n/hr.json                   |  5 +-
 core/l10n/hu_HU.js                  |  5 +-
 core/l10n/hu_HU.json                |  5 +-
 core/l10n/hy.js                     |  3 +-
 core/l10n/hy.json                   |  3 +-
 core/l10n/ia.js                     |  5 +-
 core/l10n/ia.json                   |  5 +-
 core/l10n/id.js                     |  5 +-
 core/l10n/id.json                   |  5 +-
 core/l10n/io.js                     |  3 +-
 core/l10n/io.json                   |  3 +-
 core/l10n/is.js                     |  2 +-
 core/l10n/is.json                   |  2 +-
 core/l10n/it.js                     |  5 +-
 core/l10n/it.json                   |  5 +-
 core/l10n/ja.js                     | 12 ++--
 core/l10n/ja.json                   | 12 ++--
 core/l10n/jv.js                     |  3 +-
 core/l10n/jv.json                   |  3 +-
 core/l10n/ka_GE.js                  |  3 +-
 core/l10n/ka_GE.json                |  3 +-
 core/l10n/km.js                     |  2 +-
 core/l10n/km.json                   |  2 +-
 core/l10n/kn.js                     |  3 +-
 core/l10n/kn.json                   |  3 +-
 core/l10n/ko.js                     |  4 +-
 core/l10n/ko.json                   |  4 +-
 core/l10n/ku_IQ.js                  |  2 +-
 core/l10n/ku_IQ.json                |  2 +-
 core/l10n/lb.js                     |  3 +-
 core/l10n/lb.json                   |  3 +-
 core/l10n/lt_LT.js                  |  3 +-
 core/l10n/lt_LT.json                |  3 +-
 core/l10n/lv.js                     |  2 +-
 core/l10n/lv.json                   |  2 +-
 core/l10n/mg.js                     |  3 +-
 core/l10n/mg.json                   |  3 +-
 core/l10n/mk.js                     |  2 +-
 core/l10n/mk.json                   |  2 +-
 core/l10n/ml.js                     |  3 +-
 core/l10n/ml.json                   |  3 +-
 core/l10n/ml_IN.js                  |  3 +-
 core/l10n/ml_IN.json                |  3 +-
 core/l10n/mn.js                     |  3 +-
 core/l10n/mn.json                   |  3 +-
 core/l10n/ms_MY.js                  |  2 +-
 core/l10n/ms_MY.json                |  2 +-
 core/l10n/mt_MT.js                  |  3 +-
 core/l10n/mt_MT.json                |  3 +-
 core/l10n/my_MM.js                  |  1 +
 core/l10n/my_MM.json                |  1 +
 core/l10n/nb_NO.js                  |  5 +-
 core/l10n/nb_NO.json                |  5 +-
 core/l10n/nds.js                    |  3 +-
 core/l10n/nds.json                  |  3 +-
 core/l10n/ne.js                     |  3 +-
 core/l10n/ne.json                   |  3 +-
 core/l10n/nl.js                     |  5 +-
 core/l10n/nl.json                   |  5 +-
 core/l10n/nn_NO.js                  |  6 +-
 core/l10n/nn_NO.json                |  6 +-
 core/l10n/nqo.js                    |  3 +-
 core/l10n/nqo.json                  |  3 +-
 core/l10n/oc.js                     |  2 +-
 core/l10n/oc.json                   |  2 +-
 core/l10n/or_IN.js                  |  3 +-
 core/l10n/or_IN.json                |  3 +-
 core/l10n/pa.js                     |  1 +
 core/l10n/pa.json                   |  1 +
 core/l10n/pl.js                     |  5 +-
 core/l10n/pl.json                   |  5 +-
 core/l10n/pt_BR.js                  |  5 +-
 core/l10n/pt_BR.json                |  5 +-
 core/l10n/pt_PT.js                  |  5 +-
 core/l10n/pt_PT.json                |  5 +-
 core/l10n/ro.js                     |  5 +-
 core/l10n/ro.json                   |  5 +-
 core/l10n/ru.js                     |  6 +-
 core/l10n/ru.json                   |  6 +-
 core/l10n/si_LK.js                  |  3 +-
 core/l10n/si_LK.json                |  3 +-
 core/l10n/sk.js                     | 31 ++++++++++
 core/l10n/sk.json                   | 29 ++++++++++
 core/l10n/sk_SK.js                  |  5 +-
 core/l10n/sk_SK.json                |  5 +-
 core/l10n/sl.js                     |  5 +-
 core/l10n/sl.json                   |  5 +-
 core/l10n/sq.js                     |  2 +-
 core/l10n/sq.json                   |  2 +-
 core/l10n/sr.js                     |  2 +-
 core/l10n/sr.json                   |  2 +-
 core/l10n/sr@latin.js               |  4 +-
 core/l10n/sr@latin.json             |  4 +-
 core/l10n/su.js                     |  3 +-
 core/l10n/su.json                   |  3 +-
 core/l10n/sv.js                     |  5 +-
 core/l10n/sv.json                   |  5 +-
 core/l10n/sw_KE.js                  |  3 +-
 core/l10n/sw_KE.json                |  3 +-
 core/l10n/ta_IN.js                  |  3 +-
 core/l10n/ta_IN.json                |  3 +-
 core/l10n/ta_LK.js                  |  2 +-
 core/l10n/ta_LK.json                |  2 +-
 core/l10n/te.js                     |  2 +-
 core/l10n/te.json                   |  2 +-
 core/l10n/tg_TJ.js                  |  3 +-
 core/l10n/tg_TJ.json                |  3 +-
 core/l10n/th_TH.js                  |  3 +-
 core/l10n/th_TH.json                |  3 +-
 core/l10n/tl_PH.js                  |  3 +-
 core/l10n/tl_PH.json                |  3 +-
 core/l10n/tr.js                     |  5 +-
 core/l10n/tr.json                   |  5 +-
 core/l10n/tzm.js                    |  3 +-
 core/l10n/tzm.json                  |  3 +-
 core/l10n/ug.js                     |  2 +-
 core/l10n/ug.json                   |  2 +-
 core/l10n/uk.js                     |  5 +-
 core/l10n/uk.json                   |  5 +-
 core/l10n/ur.js                     |  7 +++
 core/l10n/ur.json                   |  5 ++
 core/l10n/ur_PK.js                  |  1 +
 core/l10n/ur_PK.json                |  1 +
 core/l10n/uz.js                     |  3 +-
 core/l10n/uz.json                   |  3 +-
 core/l10n/vi.js                     |  2 +-
 core/l10n/vi.json                   |  2 +-
 core/l10n/zh_CN.js                  |  5 +-
 core/l10n/zh_CN.json                |  5 +-
 core/l10n/zh_HK.js                  |  5 +-
 core/l10n/zh_HK.json                |  5 +-
 core/l10n/zh_TW.js                  |  5 +-
 core/l10n/zh_TW.json                |  5 +-
 l10n/templates/core.pot             | 49 +++++++++-------
 l10n/templates/files.pot            |  4 +-
 l10n/templates/files_encryption.pot |  4 +-
 l10n/templates/files_external.pot   | 88 ++++++++++++++---------------
 l10n/templates/files_sharing.pot    | 10 ++--
 l10n/templates/files_trashbin.pot   |  6 +-
 l10n/templates/files_versions.pot   |  4 +-
 l10n/templates/lib.pot              | 80 +++++++++++++-------------
 l10n/templates/private.pot          | 80 +++++++++++++-------------
 l10n/templates/settings.pot         |  8 +--
 l10n/templates/user_ldap.pot        |  4 +-
 l10n/templates/user_webdavauth.pot  |  4 +-
 lib/l10n/ast.js                     |  5 ++
 lib/l10n/ast.json                   |  5 ++
 lib/l10n/eu.js                      |  2 +
 lib/l10n/eu.json                    |  2 +
 lib/l10n/hi_IN.js                   |  9 +++
 lib/l10n/hi_IN.json                 |  7 +++
 lib/l10n/id.js                      | 68 ++++++++++++++++++++--
 lib/l10n/id.json                    | 68 ++++++++++++++++++++--
 lib/l10n/ja.js                      |  3 +-
 lib/l10n/ja.json                    |  3 +-
 lib/l10n/pl.js                      |  2 +
 lib/l10n/pl.json                    |  2 +
 lib/l10n/sk.js                      | 11 ++++
 lib/l10n/sk.json                    |  9 +++
 lib/l10n/sl.js                      | 21 +++++++
 lib/l10n/sl.json                    | 21 +++++++
 lib/l10n/uk.js                      | 27 +++++++++
 lib/l10n/uk.json                    | 27 +++++++++
 lib/l10n/ur.js                      |  9 +++
 lib/l10n/ur.json                    |  7 +++
 settings/l10n/ast.js                |  3 +-
 settings/l10n/ast.json              |  3 +-
 settings/l10n/bg_BG.js              |  3 +
 settings/l10n/bg_BG.json            |  3 +
 settings/l10n/da.js                 |  2 +
 settings/l10n/da.json               |  2 +
 settings/l10n/de.js                 |  8 +--
 settings/l10n/de.json               |  8 +--
 settings/l10n/de_DE.js              |  8 +--
 settings/l10n/de_DE.json            |  8 +--
 settings/l10n/el.js                 |  1 +
 settings/l10n/el.json               |  1 +
 settings/l10n/es.js                 |  2 +
 settings/l10n/es.json               |  2 +
 settings/l10n/eu.js                 | 15 ++++-
 settings/l10n/eu.json               | 15 ++++-
 settings/l10n/fr.js                 | 15 +++--
 settings/l10n/fr.json               | 15 +++--
 settings/l10n/it.js                 |  2 +
 settings/l10n/it.json               |  2 +
 settings/l10n/ja.js                 | 12 ++--
 settings/l10n/ja.json               | 12 ++--
 settings/l10n/nn_NO.js              |  4 +-
 settings/l10n/nn_NO.json            |  4 +-
 settings/l10n/pl.js                 |  9 +++
 settings/l10n/pl.json               |  9 +++
 settings/l10n/sk.js                 |  9 +++
 settings/l10n/sk.json               |  7 +++
 settings/l10n/sl.js                 | 39 +++++++++++--
 settings/l10n/sl.json               | 39 +++++++++++--
 settings/l10n/tr.js                 |  3 +
 settings/l10n/tr.json               |  3 +
 settings/l10n/uk.js                 |  3 +
 settings/l10n/uk.json               |  3 +
 settings/l10n/ur.js                 |  6 ++
 settings/l10n/ur.json               |  4 ++
 366 files changed, 1561 insertions(+), 780 deletions(-)
 create mode 100644 apps/files_external/l10n/sk.js
 create mode 100644 apps/files_external/l10n/sk.json
 create mode 100644 apps/files_sharing/l10n/sk.js
 create mode 100644 apps/files_sharing/l10n/sk.json
 create mode 100644 apps/files_trashbin/l10n/sk.js
 create mode 100644 apps/files_trashbin/l10n/sk.json
 create mode 100644 apps/files_trashbin/l10n/ur.js
 create mode 100644 apps/files_trashbin/l10n/ur.json
 create mode 100644 apps/user_ldap/l10n/hi_IN.js
 create mode 100644 apps/user_ldap/l10n/hi_IN.json
 create mode 100644 apps/user_ldap/l10n/sk.js
 create mode 100644 apps/user_ldap/l10n/sk.json
 create mode 100644 apps/user_ldap/l10n/ur.js
 create mode 100644 apps/user_ldap/l10n/ur.json
 create mode 100644 apps/user_webdavauth/l10n/sk.js
 create mode 100644 apps/user_webdavauth/l10n/sk.json
 create mode 100644 core/l10n/hi_IN.js
 create mode 100644 core/l10n/hi_IN.json
 create mode 100644 core/l10n/sk.js
 create mode 100644 core/l10n/sk.json
 create mode 100644 core/l10n/ur.js
 create mode 100644 core/l10n/ur.json
 create mode 100644 lib/l10n/hi_IN.js
 create mode 100644 lib/l10n/hi_IN.json
 create mode 100644 lib/l10n/sk.js
 create mode 100644 lib/l10n/sk.json
 create mode 100644 lib/l10n/ur.js
 create mode 100644 lib/l10n/ur.json
 create mode 100644 settings/l10n/sk.js
 create mode 100644 settings/l10n/sk.json
 create mode 100644 settings/l10n/ur.js
 create mode 100644 settings/l10n/ur.json

diff --git a/apps/files/l10n/ast.js b/apps/files/l10n/ast.js
index dd53313b613..ae0b0731572 100644
--- a/apps/files/l10n/ast.js
+++ b/apps/files/l10n/ast.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Unknown error" : "Fallu desconocíu",
     "Could not move %s - File with this name already exists" : "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
     "Could not move %s" : "Nun pudo movese %s",
+    "Permission denied" : "Permisu denegáu",
     "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
     "\"%s\" is an invalid file name." : "\"%s\" ye un nome de ficheru inválidu.",
     "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos.",
@@ -71,6 +72,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." : "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Deshabilitose'l cifráu pero los tos ficheros tovía tán cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
     "{dirs} and {files}" : "{dirs} y {files}",
+    "%s could not be renamed as it has been deleted" : "%s nun pue renomase dempués de desaniciase",
     "%s could not be renamed" : "Nun se puede renomar %s ",
     "Upload (max. %s)" : "Xuba (máx. %s)",
     "File handling" : "Alministración de ficheros",
diff --git a/apps/files/l10n/ast.json b/apps/files/l10n/ast.json
index 33649aeae39..81d20a51c36 100644
--- a/apps/files/l10n/ast.json
+++ b/apps/files/l10n/ast.json
@@ -4,6 +4,7 @@
     "Unknown error" : "Fallu desconocíu",
     "Could not move %s - File with this name already exists" : "Nun pudo movese %s - Yá existe un ficheru con esi nome.",
     "Could not move %s" : "Nun pudo movese %s",
+    "Permission denied" : "Permisu denegáu",
     "File name cannot be empty." : "El nome de ficheru nun pue quedar baleru.",
     "\"%s\" is an invalid file name." : "\"%s\" ye un nome de ficheru inválidu.",
     "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Nome inválidu, los caráuteres \"\\\", \"/\", \"<\", \">\", \":\", \"\", \"|\" \"?\" y \"*\" nun tán permitíos.",
@@ -69,6 +70,7 @@
     "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 was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Deshabilitose'l cifráu pero los tos ficheros tovía tán cifraos.  Por favor, vete a los axustes personales pa descrifrar los tos ficheros.",
     "{dirs} and {files}" : "{dirs} y {files}",
+    "%s could not be renamed as it has been deleted" : "%s nun pue renomase dempués de desaniciase",
     "%s could not be renamed" : "Nun se puede renomar %s ",
     "Upload (max. %s)" : "Xuba (máx. %s)",
     "File handling" : "Alministración de ficheros",
diff --git a/apps/files/l10n/eu.js b/apps/files/l10n/eu.js
index c4da5e6cfa6..5fb2ac32f7c 100644
--- a/apps/files/l10n/eu.js
+++ b/apps/files/l10n/eu.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Unknown error" : "Errore ezezaguna",
     "Could not move %s - File with this name already exists" : "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
     "Could not move %s" : "Ezin dira fitxategiak mugitu %s",
+    "Permission denied" : "Baimena Ukatua",
     "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
     "\"%s\" is an invalid file name." : "\"%s\" ez da fitxategi izen baliogarria.",
     "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
diff --git a/apps/files/l10n/eu.json b/apps/files/l10n/eu.json
index 300bbc8917c..fadc0218477 100644
--- a/apps/files/l10n/eu.json
+++ b/apps/files/l10n/eu.json
@@ -4,6 +4,7 @@
     "Unknown error" : "Errore ezezaguna",
     "Could not move %s - File with this name already exists" : "Ezin da %s mugitu - Izen hau duen fitxategia dagoeneko existitzen da",
     "Could not move %s" : "Ezin dira fitxategiak mugitu %s",
+    "Permission denied" : "Baimena Ukatua",
     "File name cannot be empty." : "Fitxategi izena ezin da hutsa izan.",
     "\"%s\" is an invalid file name." : "\"%s\" ez da fitxategi izen baliogarria.",
     "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta.",
diff --git a/apps/files/l10n/hi_IN.js b/apps/files/l10n/hi_IN.js
index 5bdf101699a..329844854f1 100644
--- a/apps/files/l10n/hi_IN.js
+++ b/apps/files/l10n/hi_IN.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "files",
     {
-    "_%n folder_::_%n folders_" : "[ ,]",
-    "_%n file_::_%n files_" : "[ ,]",
-    "_Uploading %n file_::_Uploading %n 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
index 26e5833738b..37156658a86 100644
--- a/apps/files/l10n/hi_IN.json
+++ b/apps/files/l10n/hi_IN.json
@@ -1 +1,6 @@
-{"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
+{ "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
index f2a2f49398a..13c12b94967 100644
--- a/apps/files/l10n/sk.js
+++ b/apps/files/l10n/sk.js
@@ -3,9 +3,9 @@ OC.L10N.register(
     {
     "Share" : "Zdieľať",
     "Delete" : "Odstrániť",
-    "_%n folder_::_%n folders_" : "[ ,,]",
-    "_%n file_::_%n files_" : "[ ,,]",
-    "_Uploading %n file_::_Uploading %n files_" : "[ ,,]",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
     "Save" : "Uložiť",
     "Download" : "Stiahnuť"
 },
diff --git a/apps/files/l10n/sk.json b/apps/files/l10n/sk.json
index 1ff4b9ce34b..982ae3759b2 100644
--- a/apps/files/l10n/sk.json
+++ b/apps/files/l10n/sk.json
@@ -1 +1,10 @@
-{"translations":{"Share":"Zdie\u013ea\u0165","Delete":"Odstr\u00e1ni\u0165","_%n folder_::_%n folders_":["","",""],"_%n file_::_%n files_":["","",""],"_Uploading %n file_::_Uploading %n files_":["","",""],"Save":"Ulo\u017ei\u0165","Download":"Stiahnu\u0165"},"pluralForm":"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"}
\ No newline at end of file
+{ "translations": {
+    "Share" : "Zdieľať",
+    "Delete" : "Odstrániť",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "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
index f04bfd7a6f3..0700689b60d 100644
--- a/apps/files/l10n/ur.js
+++ b/apps/files/l10n/ur.js
@@ -2,8 +2,8 @@ OC.L10N.register(
     "files",
     {
     "Error" : "خرابی",
-    "_%n folder_::_%n folders_" : "[ ,]",
-    "_%n file_::_%n files_" : "[ ,]",
-    "_Uploading %n file_::_Uploading %n 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/ur.json b/apps/files/l10n/ur.json
index cb374c0b15b..c5fe11055db 100644
--- a/apps/files/l10n/ur.json
+++ b/apps/files/l10n/ur.json
@@ -1 +1,7 @@
-{"translations":{"Error":"\u062e\u0631\u0627\u0628\u06cc","_%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
+{ "translations": {
+    "Error" : "خرابی",
+    "_%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_encryption/l10n/eu.js b/apps/files_encryption/l10n/eu.js
index 72c78ec31c3..84d446313a1 100644
--- a/apps/files_encryption/l10n/eu.js
+++ b/apps/files_encryption/l10n/eu.js
@@ -2,9 +2,15 @@ OC.L10N.register(
     "files_encryption",
     {
     "Unknown error" : "Errore ezezaguna",
+    "Missing recovery key password" : "Berreskurapen gakoaren pasahitza falta da",
+    "Please repeat the recovery key password" : "Mesedez errepikatu berreskuratze gakoaren pasahitza",
+    "Repeated recovery key password does not match the provided recovery key password" : "Errepikatutako berreskuratze gakoaren pasahitza ez dator bat berreskuratze gakoaren pasahitzarekin",
     "Recovery key successfully enabled" : "Berreskuratze gakoa behar bezala gaitua",
     "Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
     "Recovery key successfully disabled" : "Berreskuratze gakoa behar bezala desgaitu da",
+    "Please provide the old recovery password" : "Mesedez sartu berreskuratze pasahitz zaharra",
+    "Please provide a new recovery password" : "Mesedez sartu berreskuratze pasahitz berria",
+    "Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
     "Password successfully changed." : "Pasahitza behar bezala aldatu da.",
     "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
     "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
diff --git a/apps/files_encryption/l10n/eu.json b/apps/files_encryption/l10n/eu.json
index 16480dc93c3..c18cebad99d 100644
--- a/apps/files_encryption/l10n/eu.json
+++ b/apps/files_encryption/l10n/eu.json
@@ -1,8 +1,14 @@
 { "translations": {
     "Unknown error" : "Errore ezezaguna",
+    "Missing recovery key password" : "Berreskurapen gakoaren pasahitza falta da",
+    "Please repeat the recovery key password" : "Mesedez errepikatu berreskuratze gakoaren pasahitza",
+    "Repeated recovery key password does not match the provided recovery key password" : "Errepikatutako berreskuratze gakoaren pasahitza ez dator bat berreskuratze gakoaren pasahitzarekin",
     "Recovery key successfully enabled" : "Berreskuratze gakoa behar bezala gaitua",
     "Could not disable recovery key. Please check your recovery key password!" : "Ezin da berreskuratze gako desgaitu. Egiaztatu berreskuratze gako pasahitza!",
     "Recovery key successfully disabled" : "Berreskuratze gakoa behar bezala desgaitu da",
+    "Please provide the old recovery password" : "Mesedez sartu berreskuratze pasahitz zaharra",
+    "Please provide a new recovery password" : "Mesedez sartu berreskuratze pasahitz berria",
+    "Please repeat the new recovery password" : "Mesedez errepikatu berreskuratze pasahitz berria",
     "Password successfully changed." : "Pasahitza behar bezala aldatu da.",
     "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
     "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
diff --git a/apps/files_encryption/l10n/id.js b/apps/files_encryption/l10n/id.js
index fcb3ffb9d30..7137d13cb9f 100644
--- a/apps/files_encryption/l10n/id.js
+++ b/apps/files_encryption/l10n/id.js
@@ -1,20 +1,32 @@
 OC.L10N.register(
     "files_encryption",
     {
-    "Unknown error" : "Galat tidak diketahui",
+    "Unknown error" : "Kesalahan tidak diketahui",
+    "Missing recovery key password" : "Sandi kunci pemuliahan hilang",
+    "Please repeat the recovery key password" : "Silakan ulangi sandi kunci pemulihan",
+    "Repeated recovery key password does not match the provided recovery key password" : "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
     "Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
     "Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
     "Recovery key successfully disabled" : "Kunci pemulihan berhasil dinonaktifkan",
+    "Please provide the old recovery password" : "Mohon berikan sandi pemulihan lama",
+    "Please provide a new recovery password" : "Mohon berikan sandi pemulihan baru",
+    "Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru",
     "Password successfully changed." : "Sandi berhasil diubah",
     "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
     "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
     "Could not update the private key password. Maybe the old password was not correct." : "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
     "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
     "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.",
     "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.",
-    "Missing requirements." : "Persyaratan yang hilang.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator",
+    "Missing requirements." : "Persyaratan tidak terpenuhi.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Pastikan bahwa PHP 5.3.3 atau yang lebih baru telah diinstal dan OpenSSL bersama ekstensi PHP telah diaktifkan dan dikonfigurasi dengan benar. Untuk saat ini, aplikasi enkripsi akan dinonaktifkan.",
     "Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:",
-    "Initial encryption started... This can take some time. Please wait." : "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+    "Initial encryption started... This can take some time. Please wait." : "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+    "Initial encryption running... Please try again later." : "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
+    "Go directly to your %spersonal settings%s." : "Langsung ke %spengaturan pribadi%s Anda.",
     "Encryption" : "Enkripsi",
     "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",
     "Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
@@ -27,6 +39,8 @@ OC.L10N.register(
     "New Recovery key password" : "Sandi kunci Pemulihan Baru",
     "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
     "Change Password" : "Ubah sandi",
+    "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
+    "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
     "Old log-in password" : "Sandi masuk yang lama",
     "Current log-in password" : "Sandi masuk saat ini",
diff --git a/apps/files_encryption/l10n/id.json b/apps/files_encryption/l10n/id.json
index c0e5b434964..eb5361d4b66 100644
--- a/apps/files_encryption/l10n/id.json
+++ b/apps/files_encryption/l10n/id.json
@@ -1,18 +1,30 @@
 { "translations": {
-    "Unknown error" : "Galat tidak diketahui",
+    "Unknown error" : "Kesalahan tidak diketahui",
+    "Missing recovery key password" : "Sandi kunci pemuliahan hilang",
+    "Please repeat the recovery key password" : "Silakan ulangi sandi kunci pemulihan",
+    "Repeated recovery key password does not match the provided recovery key password" : "Sandi kunci pemulihan yang diulangi tidak cocok dengan sandi kunci pemulihan yang diberikan",
     "Recovery key successfully enabled" : "Kunci pemulihan berhasil diaktifkan",
     "Could not disable recovery key. Please check your recovery key password!" : "Tidak dapat menonaktifkan kunci pemulihan. Silakan periksa sandi kunci pemulihan Anda!",
     "Recovery key successfully disabled" : "Kunci pemulihan berhasil dinonaktifkan",
+    "Please provide the old recovery password" : "Mohon berikan sandi pemulihan lama",
+    "Please provide a new recovery password" : "Mohon berikan sandi pemulihan baru",
+    "Please repeat the new recovery password" : "Silakan ulangi sandi pemulihan baru",
     "Password successfully changed." : "Sandi berhasil diubah",
     "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
     "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
     "Could not update the private key password. Maybe the old password was not correct." : "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
     "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
     "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
+    "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Kunci private Anda tidak sah! Nampaknya sandi Anda telah diubah diluar %s (misal direktori perusahaan Anda). Anda dapat memperbarui sandi kunci private untuk memulihakan akses ke berkas terenkripsi Anda.",
     "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.",
-    "Missing requirements." : "Persyaratan yang hilang.",
+    "Unknown error. Please check your system settings or contact your administrator" : "Kesalahan tidak diketahui. Silakan periksa pengaturan sistem Anda atau hubungi administrator",
+    "Missing requirements." : "Persyaratan tidak terpenuhi.",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Pastikan bahwa PHP 5.3.3 atau yang lebih baru telah diinstal dan OpenSSL bersama ekstensi PHP telah diaktifkan dan dikonfigurasi dengan benar. Untuk saat ini, aplikasi enkripsi akan dinonaktifkan.",
     "Following users are not set up for encryption:" : "Pengguna berikut belum diatur untuk enkripsi:",
-    "Initial encryption started... This can take some time. Please wait." : "Inisial enskripsi dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+    "Initial encryption started... This can take some time. Please wait." : "Enskripsi awal dijalankan... Ini dapat memakan waktu. Silakan tunggu.",
+    "Initial encryption running... Please try again later." : "Enkripsi awal sedang berjalan... Sialakn coba lagi nanti.",
+    "Go directly to your %spersonal settings%s." : "Langsung ke %spengaturan pribadi%s Anda.",
     "Encryption" : "Enkripsi",
     "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",
     "Enable recovery key (allow to recover users files in case of password loss):" : "Aktifkan kunci pemulihan (memungkinkan pengguna untuk memulihkan berkas dalam kasus kehilangan sandi):",
@@ -25,6 +37,8 @@
     "New Recovery key password" : "Sandi kunci Pemulihan Baru",
     "Repeat New Recovery key password" : "Ulangi sandi kunci Pemulihan baru",
     "Change Password" : "Ubah sandi",
+    "Your private key password no longer matches your log-in password." : "Sandi kunci private Anda tidak lagi cocok dengan sandi masuk Anda.",
+    "Set your old private key password to your current log-in password:" : "Setel sandi kunci private Anda untuk sandi masuk Anda saat ini:",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Jika Anda tidak ingat sandi lama, Anda dapat meminta administrator Anda untuk memulihkan berkas.",
     "Old log-in password" : "Sandi masuk yang lama",
     "Current log-in password" : "Sandi masuk saat ini",
diff --git a/apps/files_encryption/l10n/pl.js b/apps/files_encryption/l10n/pl.js
index 027e933008c..a0bccc8c9f2 100644
--- a/apps/files_encryption/l10n/pl.js
+++ b/apps/files_encryption/l10n/pl.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "files_encryption",
     {
     "Unknown error" : "Nieznany błąd",
+    "Please repeat the recovery key password" : "Proszę powtórz nowe hasło klucza odzyskiwania",
     "Recovery key successfully enabled" : "Klucz odzyskiwania włączony",
     "Could not disable recovery key. Please check your recovery key password!" : "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
     "Recovery key successfully disabled" : "Klucz odzyskiwania wyłączony",
diff --git a/apps/files_encryption/l10n/pl.json b/apps/files_encryption/l10n/pl.json
index 25e38425235..dd817a40542 100644
--- a/apps/files_encryption/l10n/pl.json
+++ b/apps/files_encryption/l10n/pl.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Unknown error" : "Nieznany błąd",
+    "Please repeat the recovery key password" : "Proszę powtórz nowe hasło klucza odzyskiwania",
     "Recovery key successfully enabled" : "Klucz odzyskiwania włączony",
     "Could not disable recovery key. Please check your recovery key password!" : "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
     "Recovery key successfully disabled" : "Klucz odzyskiwania wyłączony",
diff --git a/apps/files_external/l10n/ast.js b/apps/files_external/l10n/ast.js
index ec5ff68ac65..d1d9f05b498 100644
--- a/apps/files_external/l10n/ast.js
+++ b/apps/files_external/l10n/ast.js
@@ -37,6 +37,7 @@ OC.L10N.register(
     "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
     "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tiempu d'espera de peticiones HTTP en segundos",
     "Share" : "Compartir",
     "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
     "Username as share" : "Nome d'usuariu como Compartición",
@@ -49,6 +50,7 @@ OC.L10N.register(
     "Error configuring Google Drive storage" : "Fallu configurando l'almacenamientu de Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
     "(group)" : "(grupu)",
     "Saved" : "Guardáu",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/ast.json b/apps/files_external/l10n/ast.json
index 21777896973..eeca7714b31 100644
--- a/apps/files_external/l10n/ast.json
+++ b/apps/files_external/l10n/ast.json
@@ -35,6 +35,7 @@
     "Password (required for OpenStack Object Storage)" : "Contraseña (necesaria pa OpenStack Object Storage)",
     "Service Name (required for OpenStack Object Storage)" : "Nome de Serviciu (necesariu pa OpenStack Object Storage)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "URL d'identidá de puntu final (necesariu pa OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Tiempu d'espera de peticiones HTTP en segundos",
     "Share" : "Compartir",
     "SMB / CIFS using OC login" : "SMB / CIFS usando accesu OC",
     "Username as share" : "Nome d'usuariu como Compartición",
@@ -47,6 +48,7 @@
     "Error configuring Google Drive storage" : "Fallu configurando l'almacenamientu de Google Drive",
     "Personal" : "Personal",
     "System" : "Sistema",
+    "All users. Type to select user or group." : "Tolos usuarios. Escribe pa seleccionar usuariu o grupu.",
     "(group)" : "(grupu)",
     "Saved" : "Guardáu",
     "<b>Note:</b> " : "<b>Nota:</b> ",
diff --git a/apps/files_external/l10n/eu.js b/apps/files_external/l10n/eu.js
index 4c8ce97c6ff..db535359491 100644
--- a/apps/files_external/l10n/eu.js
+++ b/apps/files_external/l10n/eu.js
@@ -15,6 +15,7 @@ OC.L10N.register(
     "Amazon S3 and compliant" : "Amazon S3 eta baliokideak",
     "Access Key" : "Sarbide gakoa",
     "Secret Key" : "Giltza Sekretua",
+    "Hostname" : "Ostalari izena",
     "Port" : "Portua",
     "Region" : "Eskualdea",
     "Enable SSL" : "Gaitu SSL",
@@ -35,6 +36,7 @@ OC.L10N.register(
     "Password (required for OpenStack Object Storage)" : "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
     "Service Name (required for OpenStack Object Storage)" : "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+    "Timeout of HTTP requests in seconds" : "HTTP eskarien gehienezko denbora segundutan",
     "Share" : "Partekatu",
     "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
     "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
@@ -47,6 +49,8 @@ OC.L10N.register(
     "Error configuring Google Drive storage" : "Errore bat egon da Google Drive konfiguratzean",
     "Personal" : "Pertsonala",
     "System" : "Sistema",
+    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
+    "(group)" : "(taldea)",
     "Saved" : "Gordeta",
     "<b>Note:</b> " : "<b>Oharra:</b>",
     " and " : "eta",
diff --git a/apps/files_external/l10n/eu.json b/apps/files_external/l10n/eu.json
index b74d207cc2b..a5c642bd772 100644
--- a/apps/files_external/l10n/eu.json
+++ b/apps/files_external/l10n/eu.json
@@ -13,6 +13,7 @@
     "Amazon S3 and compliant" : "Amazon S3 eta baliokideak",
     "Access Key" : "Sarbide gakoa",
     "Secret Key" : "Giltza Sekretua",
+    "Hostname" : "Ostalari izena",
     "Port" : "Portua",
     "Region" : "Eskualdea",
     "Enable SSL" : "Gaitu SSL",
@@ -33,6 +34,7 @@
     "Password (required for OpenStack Object Storage)" : "Pasahitza (beharrezkoa OpenStack Objektu Biltegiratzerako)",
     "Service Name (required for OpenStack Object Storage)" : "Zerbitzuaren Izena (beharrezkoa OpenStack Objektu Biltegiratzerako)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "Nortasun amaierako puntuaren URLa (beharrezkoa OpenStack Objektu Biltegiratzerako)",
+    "Timeout of HTTP requests in seconds" : "HTTP eskarien gehienezko denbora segundutan",
     "Share" : "Partekatu",
     "SMB / CIFS using OC login" : "SMB / CIFS saioa hasteko OC erabiliz",
     "Username as share" : "Erabiltzaile izena elkarbanaketa bezala",
@@ -45,6 +47,8 @@
     "Error configuring Google Drive storage" : "Errore bat egon da Google Drive konfiguratzean",
     "Personal" : "Pertsonala",
     "System" : "Sistema",
+    "All users. Type to select user or group." : "Erabiltzaile guztiak. Idatzi erabiltzaile edo taldea hautatzeko.",
+    "(group)" : "(taldea)",
     "Saved" : "Gordeta",
     "<b>Note:</b> " : "<b>Oharra:</b>",
     " and " : "eta",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 8f4b0bc11bf..65ca0ac02d6 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "files_external",
     {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clef Dropbox ainsi que le mot de passe.",
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
     "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
     "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur: %s",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index b4b614e3775..02abcba6dde 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clef Dropbox ainsi que le mot de passe.",
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
     "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
     "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
     "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur: %s",
diff --git a/apps/files_external/l10n/ja.js b/apps/files_external/l10n/ja.js
index 3edb2c44d8d..d4ef6347664 100644
--- a/apps/files_external/l10n/ja.js
+++ b/apps/files_external/l10n/ja.js
@@ -50,7 +50,7 @@ OC.L10N.register(
     "Error configuring Google Drive storage" : "Googleドライブストレージの設定エラー",
     "Personal" : "個人",
     "System" : "システム",
-    "All users. Type to select user or group." : "全てのユーザー．ユーザー、グループを追加",
+    "All users. Type to select user or group." : "すべてのユーザー．ユーザー、グループを追加",
     "(group)" : "(グループ)",
     "Saved" : "保存されました",
     "<b>Note:</b> " : "<b>注意:</b> ",
diff --git a/apps/files_external/l10n/ja.json b/apps/files_external/l10n/ja.json
index ee531405d7e..d630e19904d 100644
--- a/apps/files_external/l10n/ja.json
+++ b/apps/files_external/l10n/ja.json
@@ -48,7 +48,7 @@
     "Error configuring Google Drive storage" : "Googleドライブストレージの設定エラー",
     "Personal" : "個人",
     "System" : "システム",
-    "All users. Type to select user or group." : "全てのユーザー．ユーザー、グループを追加",
+    "All users. Type to select user or group." : "すべてのユーザー．ユーザー、グループを追加",
     "(group)" : "(グループ)",
     "Saved" : "保存されました",
     "<b>Note:</b> " : "<b>注意:</b> ",
diff --git a/apps/files_external/l10n/sk.js b/apps/files_external/l10n/sk.js
new file mode 100644
index 00000000000..edae863703d
--- /dev/null
+++ b/apps/files_external/l10n/sk.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..4d6a95caf3c
--- /dev/null
+++ b/apps/files_external/l10n/sk.json
@@ -0,0 +1,7 @@
+{ "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/ast.js b/apps/files_sharing/l10n/ast.js
index c3df4e46fb1..bd4aa1faf9c 100644
--- a/apps/files_sharing/l10n/ast.js
+++ b/apps/files_sharing/l10n/ast.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "files_sharing",
     {
     "Server to server sharing is not enabled on this server" : "La compartición sirvidor a sirvidor nun ta habilitada nesti sirvidor",
+    "The mountpoint name contains invalid characters." : "El puntu de montax contien caracteres non válidos",
     "Invalid or untrusted SSL certificate" : "Certificáu SSL inválidu o ensín validar",
     "Couldn't add remote share" : "Nun pudo amestase una compartición remota",
     "Shared with you" : "Compartíos contigo",
diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json
index 04fb75b450b..c86d16aa90d 100644
--- a/apps/files_sharing/l10n/ast.json
+++ b/apps/files_sharing/l10n/ast.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Server to server sharing is not enabled on this server" : "La compartición sirvidor a sirvidor nun ta habilitada nesti sirvidor",
+    "The mountpoint name contains invalid characters." : "El puntu de montax contien caracteres non válidos",
     "Invalid or untrusted SSL certificate" : "Certificáu SSL inválidu o ensín validar",
     "Couldn't add remote share" : "Nun pudo amestase una compartición remota",
     "Shared with you" : "Compartíos contigo",
diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js
index e9b08e31668..753ca778ef1 100644
--- a/apps/files_sharing/l10n/eu.js
+++ b/apps/files_sharing/l10n/eu.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "files_sharing",
     {
     "Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
+    "The mountpoint name contains invalid characters." : "Montatze puntuaren izenak baliogabeko karaktereak ditu.",
+    "Invalid or untrusted SSL certificate" : "SSL ziurtagiri baliogabea edo fidagaitza",
     "Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu",
     "Shared with you" : "Zurekin elkarbanatuta",
     "Shared with others" : "Beste batzuekin elkarbanatuta",
diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json
index f991273372a..7b12f0c4303 100644
--- a/apps/files_sharing/l10n/eu.json
+++ b/apps/files_sharing/l10n/eu.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Server to server sharing is not enabled on this server" : "Zerbitzaritik zerbitzarirako elkarbanaketa ez dago gaituta zerbitzari honetan",
+    "The mountpoint name contains invalid characters." : "Montatze puntuaren izenak baliogabeko karaktereak ditu.",
+    "Invalid or untrusted SSL certificate" : "SSL ziurtagiri baliogabea edo fidagaitza",
     "Couldn't add remote share" : "Ezin izan da hurruneko elkarbanaketa gehitu",
     "Shared with you" : "Zurekin elkarbanatuta",
     "Shared with others" : "Beste batzuekin elkarbanatuta",
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index a86cf96bf74..0f8d5a1a3eb 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -1,14 +1,21 @@
 OC.L10N.register(
     "files_sharing",
     {
-    "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidaj diaktifkan pada server ini",
+    "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
+    "The mountpoint name contains invalid characters." : "Nama titik kait berisi karakter yang tidak sah.",
+    "Invalid or untrusted SSL certificate" : "Sertifikast SSL tidak sah atau tidak terpercaya",
+    "Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
     "Shared with you" : "Dibagikan dengan Anda",
     "Shared with others" : "Dibagikan dengan lainnya",
     "Shared by link" : "Dibagikan dengan tautan",
     "No files have been shared with you yet." : "Tidak ada berkas yang dibagikan kepada Anda.",
     "You haven't shared any files yet." : "Anda belum berbagi berkas apapun.",
     "You haven't shared any files by link yet." : "Anda belum berbagi berkas dengan tautan satupun.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
+    "Remote share" : "Berbagi remote",
+    "Remote share password" : "Sandi berbagi remote",
     "Cancel" : "Batal",
+    "Add remote share" : "Tambah berbagi remote",
     "No ownCloud installation found at {remote}" : "Tidak ada instalasi ownCloud yang ditemukan di {remote}",
     "Invalid ownCloud url" : "URL ownCloud tidak sah",
     "Shared by" : "Dibagikan oleh",
@@ -18,14 +25,17 @@ OC.L10N.register(
     "Name" : "Nama",
     "Share time" : "Bagikan waktu",
     "Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
-    "Reasons might be:" : "Alasan mungkin:",
+    "Reasons might be:" : "Alasan yang mungkin:",
     "the item was removed" : "item telah dihapus",
     "the link expired" : "tautan telah kadaluarsa",
     "sharing is disabled" : "berbagi dinonaktifkan",
     "For more info, please ask the person who sent this link." : "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
+    "Add to your ownCloud" : "Tambahkan ke ownCloud Anda",
     "Download" : "Unduh",
     "Download %s" : "Unduh %s",
     "Direct link" : "Tautan langsung",
+    "Remote Shares" : "Berbagi Remote",
+    "Allow other instances to mount public links shared from this server" : "Izinkan instansi lain untuk mengaitkan tautan publik untuk dibagikan dari server ini",
     "Allow users to mount public link shares" : "Izinkan pengguna untuk mengaitkan tautan berbagi publik"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index de4a8b7f924..beb4f4f34f9 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -1,12 +1,19 @@
 { "translations": {
-    "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidaj diaktifkan pada server ini",
+    "Server to server sharing is not enabled on this server" : "Berbagi server ke server tidak diaktifkan pada server ini",
+    "The mountpoint name contains invalid characters." : "Nama titik kait berisi karakter yang tidak sah.",
+    "Invalid or untrusted SSL certificate" : "Sertifikast SSL tidak sah atau tidak terpercaya",
+    "Couldn't add remote share" : "Tidak dapat menambahkan berbagi remote",
     "Shared with you" : "Dibagikan dengan Anda",
     "Shared with others" : "Dibagikan dengan lainnya",
     "Shared by link" : "Dibagikan dengan tautan",
     "No files have been shared with you yet." : "Tidak ada berkas yang dibagikan kepada Anda.",
     "You haven't shared any files yet." : "Anda belum berbagi berkas apapun.",
     "You haven't shared any files by link yet." : "Anda belum berbagi berkas dengan tautan satupun.",
+    "Do you want to add the remote share {name} from {owner}@{remote}?" : "Apakah Anda ingin menambahkan berbagi remote {name} dari {owner}@{remote}?",
+    "Remote share" : "Berbagi remote",
+    "Remote share password" : "Sandi berbagi remote",
     "Cancel" : "Batal",
+    "Add remote share" : "Tambah berbagi remote",
     "No ownCloud installation found at {remote}" : "Tidak ada instalasi ownCloud yang ditemukan di {remote}",
     "Invalid ownCloud url" : "URL ownCloud tidak sah",
     "Shared by" : "Dibagikan oleh",
@@ -16,14 +23,17 @@
     "Name" : "Nama",
     "Share time" : "Bagikan waktu",
     "Sorry, this link doesn’t seem to work anymore." : "Maaf, tautan ini tampaknya tidak berfungsi lagi.",
-    "Reasons might be:" : "Alasan mungkin:",
+    "Reasons might be:" : "Alasan yang mungkin:",
     "the item was removed" : "item telah dihapus",
     "the link expired" : "tautan telah kadaluarsa",
     "sharing is disabled" : "berbagi dinonaktifkan",
     "For more info, please ask the person who sent this link." : "Untuk info lebih lanjut, silakan tanyakan orang yang mengirim tautan ini.",
+    "Add to your ownCloud" : "Tambahkan ke ownCloud Anda",
     "Download" : "Unduh",
     "Download %s" : "Unduh %s",
     "Direct link" : "Tautan langsung",
+    "Remote Shares" : "Berbagi Remote",
+    "Allow other instances to mount public links shared from this server" : "Izinkan instansi lain untuk mengaitkan tautan publik untuk dibagikan dari server ini",
     "Allow users to mount public link shares" : "Izinkan pengguna untuk mengaitkan tautan berbagi publik"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sk.js b/apps/files_sharing/l10n/sk.js
new file mode 100644
index 00000000000..aa385851497
--- /dev/null
+++ b/apps/files_sharing/l10n/sk.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..65bbffa4191
--- /dev/null
+++ b/apps/files_sharing/l10n/sk.json
@@ -0,0 +1,5 @@
+{ "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/sk.js b/apps/files_trashbin/l10n/sk.js
new file mode 100644
index 00000000000..1b73b5f3afa
--- /dev/null
+++ b/apps/files_trashbin/l10n/sk.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..418f8874a6f
--- /dev/null
+++ b/apps/files_trashbin/l10n/sk.json
@@ -0,0 +1,4 @@
+{ "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
new file mode 100644
index 00000000000..cfdfd802748
--- /dev/null
+++ b/apps/files_trashbin/l10n/ur.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..1c1fc3d16c1
--- /dev/null
+++ b/apps/files_trashbin/l10n/ur.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Error" : "خرابی"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/ar.js b/apps/user_ldap/l10n/ar.js
index 11472f292d4..c28875d7cdd 100644
--- a/apps/user_ldap/l10n/ar.js
+++ b/apps/user_ldap/l10n/ar.js
@@ -1,13 +1,37 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Failed to clear the mappings." : "فشل مسح الارتباطات (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." : "الإعدادات صحيحة، لكن لم ينجح الارتباط. يرجى التأكد من إعدادات الخادم وبيانات التحقق من الدخول.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "الإعدادات غير صحيحة. يرجى الاطلاع على سجلات المتابعة للمزيد من التفاصيل.",
+    "No action specified" : "لم يتم تحديد الإجراء",
+    "No configuration specified" : "لم يتم تحديد الإعدادات.",
+    "No data specified" : "لم يتم تحديد البيانات.",
+    " Could not set configuration %s" : "تعذر تنفيذ الإعداد %s",
     "Deletion failed" : "فشل الحذف",
+    "Take over settings from recent server configuration?" : "الحصول على الخصائص من آخر إعدادات في الخادم؟",
+    "Keep settings?" : "الاحتفاظ بالخصائص والإعدادات؟",
+    "{nthServer}. Server" : "الخادم {nthServer}.",
+    "Cannot add server configuration" : "تعذر إضافة الإعدادات للخادم.",
+    "mappings cleared" : "تم مسح الارتباطات (mappings)",
     "Success" : "نجاح",
     "Error" : "خطأ",
+    "Please specify a Base DN" : "يرجى تحديد اسم نطاق أساسي Base DN",
+    "Could not determine Base DN" : "تعذر التحقق من اسم النطاق الأساسي Base DN",
+    "Please specify the port" : "يرجى تحديد المنفذ",
+    "Configuration OK" : "الإعدادات صحيحة",
+    "Configuration incorrect" : "الإعدادات غير صحيحة",
+    "Configuration incomplete" : "الإعدادات غير مكتملة",
     "Select groups" : "إختر مجموعة",
-    "_%s group found_::_%s groups found_" : ["","","","","",""],
+    "Select object classes" : "اختر أصناف المكونات",
+    "Select attributes" : "اختر الخصائص",
+    "Connection test succeeded" : "تم اختبار الاتصال بنجاح",
+    "Connection test failed" : "فشل اختبار الاتصال",
+    "Do you really want to delete the current Server Configuration?" : "هل ترغب فعلاً في حذف إعدادات الخادم الحالي؟",
+    "Confirm Deletion" : "تأكيد الحذف",
+    "_%s group found_::_%s groups found_" : ["لا توجد مجموعات: %s","تم إيجاد %s مجموعة واحدة","تم إيجاد %s مجموعتين","تم إيجاد %s مجموعات","تم إيجاد %s مجموعة","تم إيجاد %s مجموعة/مجموعات"],
     "_%s user found_::_%s users found_" : ["","","","","",""],
     "Save" : "حفظ",
     "Help" : "المساعدة",
diff --git a/apps/user_ldap/l10n/ar.json b/apps/user_ldap/l10n/ar.json
index 1a3cfe03b4a..b546eb3a5dc 100644
--- a/apps/user_ldap/l10n/ar.json
+++ b/apps/user_ldap/l10n/ar.json
@@ -1,11 +1,35 @@
 { "translations": {
+    "Failed to clear the mappings." : "فشل مسح الارتباطات (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." : "الإعدادات صحيحة، لكن لم ينجح الارتباط. يرجى التأكد من إعدادات الخادم وبيانات التحقق من الدخول.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "الإعدادات غير صحيحة. يرجى الاطلاع على سجلات المتابعة للمزيد من التفاصيل.",
+    "No action specified" : "لم يتم تحديد الإجراء",
+    "No configuration specified" : "لم يتم تحديد الإعدادات.",
+    "No data specified" : "لم يتم تحديد البيانات.",
+    " Could not set configuration %s" : "تعذر تنفيذ الإعداد %s",
     "Deletion failed" : "فشل الحذف",
+    "Take over settings from recent server configuration?" : "الحصول على الخصائص من آخر إعدادات في الخادم؟",
+    "Keep settings?" : "الاحتفاظ بالخصائص والإعدادات؟",
+    "{nthServer}. Server" : "الخادم {nthServer}.",
+    "Cannot add server configuration" : "تعذر إضافة الإعدادات للخادم.",
+    "mappings cleared" : "تم مسح الارتباطات (mappings)",
     "Success" : "نجاح",
     "Error" : "خطأ",
+    "Please specify a Base DN" : "يرجى تحديد اسم نطاق أساسي Base DN",
+    "Could not determine Base DN" : "تعذر التحقق من اسم النطاق الأساسي Base DN",
+    "Please specify the port" : "يرجى تحديد المنفذ",
+    "Configuration OK" : "الإعدادات صحيحة",
+    "Configuration incorrect" : "الإعدادات غير صحيحة",
+    "Configuration incomplete" : "الإعدادات غير مكتملة",
     "Select groups" : "إختر مجموعة",
-    "_%s group found_::_%s groups found_" : ["","","","","",""],
+    "Select object classes" : "اختر أصناف المكونات",
+    "Select attributes" : "اختر الخصائص",
+    "Connection test succeeded" : "تم اختبار الاتصال بنجاح",
+    "Connection test failed" : "فشل اختبار الاتصال",
+    "Do you really want to delete the current Server Configuration?" : "هل ترغب فعلاً في حذف إعدادات الخادم الحالي؟",
+    "Confirm Deletion" : "تأكيد الحذف",
+    "_%s group found_::_%s groups found_" : ["لا توجد مجموعات: %s","تم إيجاد %s مجموعة واحدة","تم إيجاد %s مجموعتين","تم إيجاد %s مجموعات","تم إيجاد %s مجموعة","تم إيجاد %s مجموعة/مجموعات"],
     "_%s user found_::_%s users found_" : ["","","","","",""],
     "Save" : "حفظ",
     "Help" : "المساعدة",
diff --git a/apps/user_ldap/l10n/ast.js b/apps/user_ldap/l10n/ast.js
index 9a1c765979a..13fe91c4e32 100644
--- a/apps/user_ldap/l10n/ast.js
+++ b/apps/user_ldap/l10n/ast.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Edit raw filter instead" : "Editar el filtru en brutu en so llugar",
     "Raw LDAP filter" : "Filtru LDAP en brutu",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtru especifica qué grupos LDAP van tener accesu a %s.",
+    "Test Filter" : "Filtru de preba",
     "groups found" : "grupos alcontraos",
     "Users login with this attribute:" : "Aniciu de sesión d'usuarios con esti atributu:",
     "LDAP Username:" : "Nome d'usuariu LDAP",
@@ -67,9 +68,12 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
     "One Base DN per line" : "Un DN Base por llinia",
     "You can specify Base DN for users and groups in the Advanced tab" : "Pues especificar el DN base pa usuarios y grupos na llingüeta Avanzáu",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automátiques de LDAP. Meyor pa grandes configuraciones, pero rique mayor conocimientu de LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Inxerta manualmente los filtros de LDAP (recomendáu pa direutorios llargos)",
     "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
     "users found" : "usuarios alcontraos",
+    "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
     "Expert" : "Espertu",
diff --git a/apps/user_ldap/l10n/ast.json b/apps/user_ldap/l10n/ast.json
index eb53ddad6db..a2f09ec00ba 100644
--- a/apps/user_ldap/l10n/ast.json
+++ b/apps/user_ldap/l10n/ast.json
@@ -46,6 +46,7 @@
     "Edit raw filter instead" : "Editar el filtru en brutu en so llugar",
     "Raw LDAP filter" : "Filtru LDAP en brutu",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "El filtru especifica qué grupos LDAP van tener accesu a %s.",
+    "Test Filter" : "Filtru de preba",
     "groups found" : "grupos alcontraos",
     "Users login with this attribute:" : "Aniciu de sesión d'usuarios con esti atributu:",
     "LDAP Username:" : "Nome d'usuariu LDAP",
@@ -65,9 +66,12 @@
     "For anonymous access, leave DN and Password empty." : "Pa un accesu anónimu, dexar el DN y la contraseña baleros.",
     "One Base DN per line" : "Un DN Base por llinia",
     "You can specify Base DN for users and groups in the Advanced tab" : "Pues especificar el DN base pa usuarios y grupos na llingüeta Avanzáu",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Evita peticiones automátiques de LDAP. Meyor pa grandes configuraciones, pero rique mayor conocimientu de LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Inxerta manualmente los filtros de LDAP (recomendáu pa direutorios llargos)",
     "Limit %s access to users meeting these criteria:" : "Llendar l'accesu a %s a los usuarios que cumplan estos criterios:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "El filtru especifica qué usuarios LDAP puen tener accesu a %s.",
     "users found" : "usuarios alcontraos",
+    "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
     "Expert" : "Espertu",
diff --git a/apps/user_ldap/l10n/eu.js b/apps/user_ldap/l10n/eu.js
index 8c220d24bbe..520c47a839e 100644
--- a/apps/user_ldap/l10n/eu.js
+++ b/apps/user_ldap/l10n/eu.js
@@ -69,6 +69,7 @@ OC.L10N.register(
     "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
     "users found" : "erabiltzaile aurkituta",
+    "Saving" : "Gordetzen",
     "Back" : "Atzera",
     "Continue" : "Jarraitu",
     "Expert" : "Aditua",
diff --git a/apps/user_ldap/l10n/eu.json b/apps/user_ldap/l10n/eu.json
index ac0ba941005..67c82070861 100644
--- a/apps/user_ldap/l10n/eu.json
+++ b/apps/user_ldap/l10n/eu.json
@@ -67,6 +67,7 @@
     "Limit %s access to users meeting these criteria:" : "Mugatu %s sarbidea baldintza horiek betetzen dituzten erabiltzaileei.",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Iragazkiak zehazten du  ze LDAP erabiltzailek izango duten sarrera %s instantziara:",
     "users found" : "erabiltzaile aurkituta",
+    "Saving" : "Gordetzen",
     "Back" : "Atzera",
     "Continue" : "Jarraitu",
     "Expert" : "Aditua",
diff --git a/apps/user_ldap/l10n/hi_IN.js b/apps/user_ldap/l10n/hi_IN.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/hi_IN.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/hi_IN.json
@@ -0,0 +1,5 @@
+{ "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/id.js b/apps/user_ldap/l10n/id.js
index f6297a6f31c..cf5f37c5efb 100644
--- a/apps/user_ldap/l10n/id.js
+++ b/apps/user_ldap/l10n/id.js
@@ -1,39 +1,78 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Failed to clear the mappings." : "Gagal membersihkan pemetaan.",
     "Failed to delete the server configuration" : "Gagal menghapus konfigurasi server",
     "The configuration is valid and the connection could be established!" : "Konfigurasi valid dan koneksi dapat dilakukan!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurasi valid, tetapi Bind gagal. Silakan periksa pengaturan server dan kredensial.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurasi tidak sah. Silakan lihat log untuk rincian lebh lanjut.",
+    "No action specified" : "Tidak ada tindakan yang ditetapkan",
+    "No configuration specified" : "Tidak ada konfigurasi yang ditetapkan",
+    "No data specified" : "Tidak ada data yang ditetapkan",
+    " Could not set configuration %s" : "Tidak dapat menyetel konfigurasi %s",
     "Deletion failed" : "Penghapusan gagal",
-    "Take over settings from recent server configuration?" : "Ambil alih pengaturan dari konfigurasi server saat ini?",
+    "Take over settings from recent server configuration?" : "Mengambil alih pengaturan dari konfigurasi server saat ini?",
     "Keep settings?" : "Biarkan pengaturan?",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Cannot add server configuration" : "Gagal menambah konfigurasi server",
-    "Success" : "Sukses",
-    "Error" : "Galat",
+    "mappings cleared" : "pemetaan dibersihkan",
+    "Success" : "Berhasil",
+    "Error" : "Kesalahan",
+    "Please specify a Base DN" : "Sialakan menetapkan Base DN",
+    "Could not determine Base DN" : "Tidak dapat menetakan Base DN",
+    "Please specify the port" : "Silakan tetapkan port",
+    "Configuration OK" : "Konfigurasi Oke",
+    "Configuration incorrect" : "Konfigurasi salah",
+    "Configuration incomplete" : "Konfigurasi tidak lengkap",
     "Select groups" : "Pilih grup",
-    "Connection test succeeded" : "Tes koneksi sukses",
-    "Connection test failed" : "Tes koneksi gagal",
-    "Do you really want to delete the current Server Configuration?" : "Anda ingin menghapus Konfigurasi Server saat ini?",
+    "Select object classes" : "Pilik kelas obyek",
+    "Select attributes" : "Pilih atribut",
+    "Connection test succeeded" : "Pemeriksaan koneksi berhasil",
+    "Connection test failed" : "Pemeriksaan koneksi gagal",
+    "Do you really want to delete the current Server Configuration?" : "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
     "Confirm Deletion" : "Konfirmasi Penghapusan",
-    "_%s group found_::_%s groups found_" : [""],
-    "_%s user found_::_%s users found_" : [""],
+    "_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
+    "_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
+    "Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
+    "Invalid Host" : "Host tidak sah",
     "Server" : "Server",
-    "Group Filter" : "saringan grup",
+    "User Filter" : "Penyaring Pengguna",
+    "Login Filter" : "Penyaring Masuk",
+    "Group Filter" : "Penyaring grup",
     "Save" : "Simpan",
     "Test Configuration" : "Uji Konfigurasi",
     "Help" : "Bantuan",
+    "Groups meeting these criteria are available in %s:" : "Grup memenuhi kriteria ini tersedia di %s:",
+    "only those object classes:" : "hanya kelas objek:",
+    "only from those groups:" : "hanya dari kelompok:",
+    "Edit raw filter instead" : "Sunting penyaring raw",
+    "Raw LDAP filter" : "Penyaring LDAP raw",
+    "Test Filter" : "Uji Penyaring",
+    "groups found" : "grup ditemukan",
+    "Users login with this attribute:" : "Login pengguna dengan atribut ini:",
+    "LDAP Username:" : "Nama pengguna LDAP:",
+    "LDAP Email Address:" : "Alamat Email LDAP:",
+    "Other Attributes:" : "Atribut Lain:",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
     "Add Server Configuration" : "Tambah Konfigurasi Server",
+    "Delete Configuration" : "Hapus Konfigurasi",
     "Host" : "Host",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://",
-    "Port" : "port",
-    "User DN" : "User DN",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
+    "Port" : "Port",
+    "User DN" : "Pengguna 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." : "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
     "Password" : "Sandi",
     "For anonymous access, leave DN and Password empty." : "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
     "One Base DN per line" : "Satu Base DN per baris",
     "You can specify Base DN for users and groups in the Advanced tab" : "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
+    "Manually enter LDAP filters (recommended for large directories)" : "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)",
+    "Limit %s access to users meeting these criteria:" : "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:",
+    "users found" : "pengguna ditemukan",
+    "Saving" : "Menyimpan",
     "Back" : "Kembali",
     "Continue" : "Lanjutkan",
+    "Expert" : "Lanjutan",
     "Advanced" : "Lanjutan",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
     "Connection Settings" : "Pengaturan Koneksi",
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
index 0fff37b80a4..2395e7f2a55 100644
--- a/apps/user_ldap/l10n/id.json
+++ b/apps/user_ldap/l10n/id.json
@@ -1,37 +1,76 @@
 { "translations": {
+    "Failed to clear the mappings." : "Gagal membersihkan pemetaan.",
     "Failed to delete the server configuration" : "Gagal menghapus konfigurasi server",
     "The configuration is valid and the connection could be established!" : "Konfigurasi valid dan koneksi dapat dilakukan!",
-    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurasi valid, tetapi Bind gagal. Silakan cek pengaturan server dan keamanan.",
+    "The configuration is valid, but the Bind failed. Please check the server settings and credentials." : "Konfigurasi valid, tetapi Bind gagal. Silakan periksa pengaturan server dan kredensial.",
+    "The configuration is invalid. Please have a look at the logs for further details." : "Konfigurasi tidak sah. Silakan lihat log untuk rincian lebh lanjut.",
+    "No action specified" : "Tidak ada tindakan yang ditetapkan",
+    "No configuration specified" : "Tidak ada konfigurasi yang ditetapkan",
+    "No data specified" : "Tidak ada data yang ditetapkan",
+    " Could not set configuration %s" : "Tidak dapat menyetel konfigurasi %s",
     "Deletion failed" : "Penghapusan gagal",
-    "Take over settings from recent server configuration?" : "Ambil alih pengaturan dari konfigurasi server saat ini?",
+    "Take over settings from recent server configuration?" : "Mengambil alih pengaturan dari konfigurasi server saat ini?",
     "Keep settings?" : "Biarkan pengaturan?",
+    "{nthServer}. Server" : "{nthServer}. Server",
     "Cannot add server configuration" : "Gagal menambah konfigurasi server",
-    "Success" : "Sukses",
-    "Error" : "Galat",
+    "mappings cleared" : "pemetaan dibersihkan",
+    "Success" : "Berhasil",
+    "Error" : "Kesalahan",
+    "Please specify a Base DN" : "Sialakan menetapkan Base DN",
+    "Could not determine Base DN" : "Tidak dapat menetakan Base DN",
+    "Please specify the port" : "Silakan tetapkan port",
+    "Configuration OK" : "Konfigurasi Oke",
+    "Configuration incorrect" : "Konfigurasi salah",
+    "Configuration incomplete" : "Konfigurasi tidak lengkap",
     "Select groups" : "Pilih grup",
-    "Connection test succeeded" : "Tes koneksi sukses",
-    "Connection test failed" : "Tes koneksi gagal",
-    "Do you really want to delete the current Server Configuration?" : "Anda ingin menghapus Konfigurasi Server saat ini?",
+    "Select object classes" : "Pilik kelas obyek",
+    "Select attributes" : "Pilih atribut",
+    "Connection test succeeded" : "Pemeriksaan koneksi berhasil",
+    "Connection test failed" : "Pemeriksaan koneksi gagal",
+    "Do you really want to delete the current Server Configuration?" : "Apakan Anda ingin menghapus Konfigurasi Server saat ini?",
     "Confirm Deletion" : "Konfirmasi Penghapusan",
-    "_%s group found_::_%s groups found_" : [""],
-    "_%s user found_::_%s users found_" : [""],
+    "_%s group found_::_%s groups found_" : ["%s grup ditemukan"],
+    "_%s user found_::_%s users found_" : ["%s pengguna ditemukan"],
+    "Could not find the desired feature" : "Tidak dapat menemukan fitur yang diinginkan",
+    "Invalid Host" : "Host tidak sah",
     "Server" : "Server",
-    "Group Filter" : "saringan grup",
+    "User Filter" : "Penyaring Pengguna",
+    "Login Filter" : "Penyaring Masuk",
+    "Group Filter" : "Penyaring grup",
     "Save" : "Simpan",
     "Test Configuration" : "Uji Konfigurasi",
     "Help" : "Bantuan",
+    "Groups meeting these criteria are available in %s:" : "Grup memenuhi kriteria ini tersedia di %s:",
+    "only those object classes:" : "hanya kelas objek:",
+    "only from those groups:" : "hanya dari kelompok:",
+    "Edit raw filter instead" : "Sunting penyaring raw",
+    "Raw LDAP filter" : "Penyaring LDAP raw",
+    "Test Filter" : "Uji Penyaring",
+    "groups found" : "grup ditemukan",
+    "Users login with this attribute:" : "Login pengguna dengan atribut ini:",
+    "LDAP Username:" : "Nama pengguna LDAP:",
+    "LDAP Email Address:" : "Alamat Email LDAP:",
+    "Other Attributes:" : "Atribut Lain:",
+    "1. Server" : "1. Server",
+    "%s. Server:" : "%s. Server:",
     "Add Server Configuration" : "Tambah Konfigurasi Server",
+    "Delete Configuration" : "Hapus Konfigurasi",
     "Host" : "Host",
-    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali anda menggunakan SSL. Lalu jalankan dengan ldaps://",
-    "Port" : "port",
-    "User DN" : "User DN",
+    "You can omit the protocol, except you require SSL. Then start with ldaps://" : "Protokol dapat tidak ditulis, kecuali Anda menggunakan SSL. Lalu jalankan dengan ldaps://",
+    "Port" : "Port",
+    "User DN" : "Pengguna 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." : "DN dari klien pengguna yang dengannya tautan akan diterapkan, mis. uid=agen,dc=contoh,dc=com. Untuk akses anonim, biarkan DN dan kata sandi kosong.",
     "Password" : "Sandi",
     "For anonymous access, leave DN and Password empty." : "Untuk akses anonim, biarkan DN dan Kata sandi kosong.",
     "One Base DN per line" : "Satu Base DN per baris",
     "You can specify Base DN for users and groups in the Advanced tab" : "Anda dapat menetapkan Base DN untuk pengguna dan grup dalam tab Lanjutan",
+    "Manually enter LDAP filters (recommended for large directories)" : "Masukkan penyaring LDAP secara manual (direkomendasikan untuk direktori yang besar)",
+    "Limit %s access to users meeting these criteria:" : "Batasi akses %s untuk pengguna yang sesuai dengan kriteria berikut:",
+    "users found" : "pengguna ditemukan",
+    "Saving" : "Menyimpan",
     "Back" : "Kembali",
     "Continue" : "Lanjutkan",
+    "Expert" : "Lanjutan",
     "Advanced" : "Lanjutan",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
     "Connection Settings" : "Pengaturan Koneksi",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index 53769711a4f..e48417ca85c 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -121,7 +121,7 @@ OC.L10N.register(
     "UUID Attribute for Users:" : "ユーザーのUUID属性:",
     "UUID Attribute for Groups:" : "グループの UUID 属性:",
     "Username-LDAP User Mapping" : "ユーザー名とLDAPユーザのマッピング",
-    "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." : "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+    "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." : "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、すべてのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
     "Clear Username-LDAP User Mapping" : "ユーザー名とLDAPユーザーのマッピングをクリアする",
     "Clear Groupname-LDAP Group Mapping" : "グループ名とLDAPグループのマッピングをクリアする"
 },
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index 687301902f2..0f8538d333f 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -119,7 +119,7 @@
     "UUID Attribute for Users:" : "ユーザーのUUID属性:",
     "UUID Attribute for Groups:" : "グループの UUID 属性:",
     "Username-LDAP User Mapping" : "ユーザー名とLDAPユーザのマッピング",
-    "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." : "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、全てのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
+    "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." : "ユーザー名は（メタ）データの保存と割り当てに使用されます。ユーザーを正確に識別して認識するために、個々のLDAPユーザは内部ユーザ名を持っています。これは、ユーザー名からLDAPユーザーへのマッピングが必要であることを意味しています。この生成されたユーザ名は、LDAPユーザのUUIDにマッピングされます。加えて、DNがLDAPとのインタラクションを削減するためにキャッシュされますが、識別には利用されません。DNが変わった場合は、変更が検出されます。内部ユーザ名は全体に亘って利用されます。マッピングをクリアすると、いたるところに使われないままの物が残るでしょう。マッピングのクリアは設定に敏感ではありませんが、すべてのLDAPの設定に影響を与えます！本番の環境では決してマッピングをクリアしないでください。テストもしくは実験の段階でのみマッピングのクリアを行なってください。",
     "Clear Username-LDAP User Mapping" : "ユーザー名とLDAPユーザーのマッピングをクリアする",
     "Clear Groupname-LDAP Group Mapping" : "グループ名とLDAPグループのマッピングをクリアする"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/apps/user_ldap/l10n/sk.js b/apps/user_ldap/l10n/sk.js
new file mode 100644
index 00000000000..5060d7d4168
--- /dev/null
+++ b/apps/user_ldap/l10n/sk.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "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
new file mode 100644
index 00000000000..4b98da63fc2
--- /dev/null
+++ b/apps/user_ldap/l10n/sk.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "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/sl.js b/apps/user_ldap/l10n/sl.js
index 89b46edd439..f7fd2772fe8 100644
--- a/apps/user_ldap/l10n/sl.js
+++ b/apps/user_ldap/l10n/sl.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Edit raw filter instead" : "Uredi surov filter",
     "Raw LDAP filter" : "Surovi filter LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
+    "Test Filter" : "Preizkusi filter",
     "groups found" : "najdenih skupin",
     "Users login with this attribute:" : "Uporabniki se prijavijo z atributom:",
     "LDAP Username:" : "Uporabniško ime LDAP:",
@@ -67,9 +68,12 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "Za brezimni dostop naj bosta polji imena in gesla prazni.",
     "One Base DN per line" : "Eno osnovno enolično ime na vrstico",
     "You can specify Base DN for users and groups in the Advanced tab" : "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Preusmeri samodejne zahteve LDAP. Nastavitev je priporočljiva za obsežnejše namestitve, vendar zahteva nekaj znanja o delu z LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).",
     "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
     "users found" : "najdenih uporabnikov",
+    "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
     "Expert" : "Napredno",
diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json
index 7d12c2c919d..aa1c9444651 100644
--- a/apps/user_ldap/l10n/sl.json
+++ b/apps/user_ldap/l10n/sl.json
@@ -46,6 +46,7 @@
     "Edit raw filter instead" : "Uredi surov filter",
     "Raw LDAP filter" : "Surovi filter LDAP",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Filter določa, katere skupine LDAP bodo imele dostop do %s.",
+    "Test Filter" : "Preizkusi filter",
     "groups found" : "najdenih skupin",
     "Users login with this attribute:" : "Uporabniki se prijavijo z atributom:",
     "LDAP Username:" : "Uporabniško ime LDAP:",
@@ -65,9 +66,12 @@
     "For anonymous access, leave DN and Password empty." : "Za brezimni dostop naj bosta polji imena in gesla prazni.",
     "One Base DN per line" : "Eno osnovno enolično ime na vrstico",
     "You can specify Base DN for users and groups in the Advanced tab" : "Osnovno enolično ime za uporabnike in skupine lahko določite v zavihku naprednih možnosti.",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Preusmeri samodejne zahteve LDAP. Nastavitev je priporočljiva za obsežnejše namestitve, vendar zahteva nekaj znanja o delu z LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ročno vstavi filtre za LDAP (priporočljivo za obsežnejše mape).",
     "Limit %s access to users meeting these criteria:" : "Omeji dostop do %s za uporabnike, ki zadostijo kriterijem:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filter določa, kateri uporabniki LDAP bodo imeli dostop do %s.",
     "users found" : "najdenih uporabnikov",
+    "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
     "Expert" : "Napredno",
diff --git a/apps/user_ldap/l10n/ur.js b/apps/user_ldap/l10n/ur.js
new file mode 100644
index 00000000000..60c3f87f855
--- /dev/null
+++ b/apps/user_ldap/l10n/ur.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "خرابی",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ur.json b/apps/user_ldap/l10n/ur.json
new file mode 100644
index 00000000000..8e1b732acc9
--- /dev/null
+++ b/apps/user_ldap/l10n/ur.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "خرابی",
+    "_%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_webdavauth/l10n/sk.js b/apps/user_webdavauth/l10n/sk.js
new file mode 100644
index 00000000000..299b57be670
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sk.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..48cd128194e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sk.json
@@ -0,0 +1,4 @@
+{ "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/ach.js b/core/l10n/ach.js
index bc4e6c6bc64..7aa65e3a52e 100644
--- a/core/l10n/ach.js
+++ b/core/l10n/ach.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/ach.json b/core/l10n/ach.json
index 4ebc0d2d45d..207d7753769 100644
--- a/core/l10n/ach.json
+++ b/core/l10n/ach.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ady.js b/core/l10n/ady.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/ady.js
+++ b/core/l10n/ady.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ady.json b/core/l10n/ady.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/ady.json
+++ b/core/l10n/ady.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index c74d7112e61..bb9b876ae73 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Desember",
     "Settings" : "Instellings",
-    "File" : "Lêer",
-    "Folder" : "Omslag",
-    "Image" : "Prent",
-    "Audio" : "Audio",
     "Saving..." : "Stoor...",
     "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.",
@@ -90,6 +86,7 @@ OC.L10N.register(
     "Warning" : "Waarskuwing",
     "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
     "Add" : "Voeg by",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
     "%s password reset" : "%s wagwoord herstel",
     "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index 2065555d7d3..373d3dff8b4 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "Desember",
     "Settings" : "Instellings",
-    "File" : "Lêer",
-    "Folder" : "Omslag",
-    "Image" : "Prent",
-    "Audio" : "Audio",
     "Saving..." : "Stoor...",
     "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.",
@@ -88,6 +84,7 @@
     "Warning" : "Waarskuwing",
     "The object type is not specified." : "Hierdie objek tipe is nie gespesifiseer nie.",
     "Add" : "Voeg by",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
     "%s password reset" : "%s wagwoord herstel",
     "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
diff --git a/core/l10n/ak.js b/core/l10n/ak.js
index 8d5d3325583..80daeefc00b 100644
--- a/core/l10n/ak.js
+++ b/core/l10n/ak.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=n > 1;");
diff --git a/core/l10n/ak.json b/core/l10n/ak.json
index eda7891f2e2..548e1edd1cf 100644
--- a/core/l10n/ak.json
+++ b/core/l10n/ak.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=n > 1;"
 }
\ No newline at end of file
diff --git a/core/l10n/am_ET.js b/core/l10n/am_ET.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/am_ET.js
+++ b/core/l10n/am_ET.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/am_ET.json b/core/l10n/am_ET.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/am_ET.json
+++ b/core/l10n/am_ET.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index e7a2a1df351..2d7bcda9398 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -24,8 +24,6 @@ OC.L10N.register(
     "November" : "تشرين الثاني",
     "December" : "كانون الاول",
     "Settings" : "إعدادات",
-    "File" : "ملف",
-    "Folder" : "مجلد",
     "Saving..." : "جاري الحفظ...",
     "Reset password" : "تعديل كلمة السر",
     "No" : "لا",
@@ -74,6 +72,7 @@ OC.L10N.register(
     "The object type is not specified." : "نوع العنصر غير محدد.",
     "Delete" : "إلغاء",
     "Add" : "اضف",
+    "_download %n file_::_download %n files_" : ["","","","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
     "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
     "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index 7a26a719cec..fd5c1275e41 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -22,8 +22,6 @@
     "November" : "تشرين الثاني",
     "December" : "كانون الاول",
     "Settings" : "إعدادات",
-    "File" : "ملف",
-    "Folder" : "مجلد",
     "Saving..." : "جاري الحفظ...",
     "Reset password" : "تعديل كلمة السر",
     "No" : "لا",
@@ -72,6 +70,7 @@
     "The object type is not specified." : "نوع العنصر غير محدد.",
     "Delete" : "إلغاء",
     "Add" : "اضف",
+    "_download %n file_::_download %n files_" : ["","","","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
     "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
     "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index 54be6e32d84..fbb0ba765b0 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -33,10 +33,6 @@ OC.L10N.register(
     "November" : "Payares",
     "December" : "Avientu",
     "Settings" : "Axustes",
-    "File" : "Ficheru",
-    "Folder" : "Carpeta",
-    "Image" : "Imaxe",
-    "Audio" : "Audiu",
     "Saving..." : "Guardando...",
     "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",
@@ -111,6 +107,7 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetes",
     "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
     "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
     "Please reload the page." : "Por favor, recarga la páxina",
     "The update was unsuccessful." : "L'anovamientu nun foi esitosu.",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index f8e69885e07..e255cad1774 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -31,10 +31,6 @@
     "November" : "Payares",
     "December" : "Avientu",
     "Settings" : "Axustes",
-    "File" : "Ficheru",
-    "Folder" : "Carpeta",
-    "Image" : "Imaxe",
-    "Audio" : "Audiu",
     "Saving..." : "Guardando...",
     "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",
@@ -109,6 +105,7 @@
     "Edit tags" : "Editar etiquetes",
     "Error loading dialog template: {error}" : "Fallu cargando plantía de diálogu: {error}",
     "No tags selected for deletion." : "Nun s'esbillaron etiquetes pa desaniciar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Anovando {productName} a la versión {version}, esto pue llevar un tiempu.",
     "Please reload the page." : "Por favor, recarga la páxina",
     "The update was unsuccessful." : "L'anovamientu nun foi esitosu.",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index c6221df7f2f..f3a5b138641 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -12,7 +12,6 @@ OC.L10N.register(
     "Sunday" : "Bazar",
     "Monday" : "Bazar ertəsi",
     "Settings" : "Quraşdırmalar",
-    "Folder" : "Qovluq",
     "Saving..." : "Saxlama...",
     "No" : "Xeyir",
     "Yes" : "Bəli",
@@ -35,6 +34,7 @@ OC.L10N.register(
     "Warning" : "Xəbərdarlıq",
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "İstifadəçi adı",
     "Reset" : "Sıfırla",
     "Personal" : "Şəxsi",
diff --git a/core/l10n/az.json b/core/l10n/az.json
index 927cf0ec0b9..7f4f7d8bb95 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -10,7 +10,6 @@
     "Sunday" : "Bazar",
     "Monday" : "Bazar ertəsi",
     "Settings" : "Quraşdırmalar",
-    "Folder" : "Qovluq",
     "Saving..." : "Saxlama...",
     "No" : "Xeyir",
     "Yes" : "Bəli",
@@ -33,6 +32,7 @@
     "Warning" : "Xəbərdarlıq",
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "İstifadəçi adı",
     "Reset" : "Sıfırla",
     "Personal" : "Şəxsi",
diff --git a/core/l10n/be.js b/core/l10n/be.js
index 4f00b1f6d71..414fff0603c 100644
--- a/core/l10n/be.js
+++ b/core/l10n/be.js
@@ -28,6 +28,7 @@ OC.L10N.register(
     "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
     "Error" : "Памылка",
     "The object type is not specified." : "Тып аб'екта не ўдакладняецца.",
+    "_download %n file_::_download %n files_" : ["","","",""],
     "Finish setup" : "Завяршыць ўстаноўку."
 },
 "nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/be.json b/core/l10n/be.json
index b055f53ad2b..29618235aa1 100644
--- a/core/l10n/be.json
+++ b/core/l10n/be.json
@@ -26,6 +26,7 @@
     "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
     "Error" : "Памылка",
     "The object type is not specified." : "Тып аб'екта не ўдакладняецца.",
+    "_download %n file_::_download %n files_" : ["","","",""],
     "Finish setup" : "Завяршыць ўстаноўку."
 },"pluralForm" :"nplurals=4; 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/bg_BG.js b/core/l10n/bg_BG.js
index e99c1be0532..fc93aad24da 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Ноември",
     "December" : "Декември",
     "Settings" : "Настройки",
-    "File" : "Файл",
-    "Folder" : "Папка",
-    "Image" : "Изображение",
-    "Audio" : "Аудио",
     "Saving..." : "Записване...",
     "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>Ако не е там се свържи с администратора.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Промяна на етикетите",
     "Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
     "No tags selected for deletion." : "Не са избрани етикети за изтриване.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Обновява се {productName} на версия {version}, това може да отнеме време.",
     "Please reload the page." : "Моля, презареди страницата.",
     "The update was unsuccessful." : "Обновяването неуспешно.",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index c918fe20618..7a74dfd6a2c 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -32,10 +32,6 @@
     "November" : "Ноември",
     "December" : "Декември",
     "Settings" : "Настройки",
-    "File" : "Файл",
-    "Folder" : "Папка",
-    "Image" : "Изображение",
-    "Audio" : "Аудио",
     "Saving..." : "Записване...",
     "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>Ако не е там се свържи с администратора.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Промяна на етикетите",
     "Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
     "No tags selected for deletion." : "Не са избрани етикети за изтриване.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Обновява се {productName} на версия {version}, това може да отнеме време.",
     "Please reload the page." : "Моля, презареди страницата.",
     "The update was unsuccessful." : "Обновяването неуспешно.",
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index 04d9864b5ed..ac4ba299468 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -28,10 +28,6 @@ OC.L10N.register(
     "November" : "নভেম্বর",
     "December" : "ডিসেম্বর",
     "Settings" : "নিয়ামকসমূহ",
-    "File" : "ফাইল",
-    "Folder" : "ফোল্ডার",
-    "Image" : "চিত্র",
-    "Audio" : "অডিও",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
     "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "No" : "না",
@@ -81,6 +77,7 @@ OC.L10N.register(
     "Delete" : "মুছে",
     "Add" : "যোগ কর",
     "Edit tags" : "ট্যাগ সম্পাদনা",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
     "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
     "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index 95d0ce6fe8b..9eee32ba3c2 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -26,10 +26,6 @@
     "November" : "নভেম্বর",
     "December" : "ডিসেম্বর",
     "Settings" : "নিয়ামকসমূহ",
-    "File" : "ফাইল",
-    "Folder" : "ফোল্ডার",
-    "Image" : "চিত্র",
-    "Audio" : "অডিও",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
     "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "No" : "না",
@@ -79,6 +75,7 @@
     "Delete" : "মুছে",
     "Add" : "যোগ কর",
     "Edit tags" : "ট্যাগ সম্পাদনা",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
     "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
     "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
diff --git a/core/l10n/bn_IN.js b/core/l10n/bn_IN.js
index 675fbacc07a..a72a91078ae 100644
--- a/core/l10n/bn_IN.js
+++ b/core/l10n/bn_IN.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "core",
     {
     "Settings" : "সেটিংস",
-    "Folder" : "ফোল্ডার",
     "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "বাতিল করা",
@@ -11,6 +10,7 @@ OC.L10N.register(
     "Warning" : "সতর্কীকরণ",
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "ইউজারনেম",
     "Reset" : "রিসেট করুন"
 },
diff --git a/core/l10n/bn_IN.json b/core/l10n/bn_IN.json
index e0234ccca68..4e29d0774f6 100644
--- a/core/l10n/bn_IN.json
+++ b/core/l10n/bn_IN.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Settings" : "সেটিংস",
-    "Folder" : "ফোল্ডার",
     "Saving..." : "সংরক্ষণ করা হচ্ছে ...",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "বাতিল করা",
@@ -9,6 +8,7 @@
     "Warning" : "সতর্কীকরণ",
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "ইউজারনেম",
     "Reset" : "রিসেট করুন"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/bs.js b/core/l10n/bs.js
index 18766a747f9..9a7f5526fdd 100644
--- a/core/l10n/bs.js
+++ b/core/l10n/bs.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "core",
     {
-    "Folder" : "Fasikla",
     "Saving..." : "Spašavam...",
     "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
     "Share" : "Podijeli",
-    "Add" : "Dodaj"
+    "Add" : "Dodaj",
+    "_download %n file_::_download %n files_" : ["","",""]
 },
 "nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/core/l10n/bs.json b/core/l10n/bs.json
index a79d18e6baa..470d259820d 100644
--- a/core/l10n/bs.json
+++ b/core/l10n/bs.json
@@ -1,8 +1,8 @@
 { "translations": {
-    "Folder" : "Fasikla",
     "Saving..." : "Spašavam...",
     "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
     "Share" : "Podijeli",
-    "Add" : "Dodaj"
+    "Add" : "Dodaj",
+    "_download %n file_::_download %n files_" : ["","",""]
 },"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/ca.js b/core/l10n/ca.js
index 6702145e121..afa434d3570 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Novembre",
     "December" : "Desembre",
     "Settings" : "Configuració",
-    "File" : "Fitxer",
-    "Folder" : "Carpeta",
-    "Image" : "Imatge",
-    "Audio" : "Audio",
     "Saving..." : "Desant...",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Edita etiquetes",
     "Error loading dialog template: {error}" : "Error en carregar la plantilla de diàleg: {error}",
     "No tags selected for deletion." : "No heu seleccionat les etiquetes a eliminar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
     "Please reload the page." : "Carregueu la pàgina de nou.",
     "The update was unsuccessful." : "L'actualització no ha tingut èxit.",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index fdebffb0805..c1ea86b4223 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -32,10 +32,6 @@
     "November" : "Novembre",
     "December" : "Desembre",
     "Settings" : "Configuració",
-    "File" : "Fitxer",
-    "Folder" : "Carpeta",
-    "Image" : "Imatge",
-    "Audio" : "Audio",
     "Saving..." : "Desant...",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Edita etiquetes",
     "Error loading dialog template: {error}" : "Error en carregar la plantilla de diàleg: {error}",
     "No tags selected for deletion." : "No heu seleccionat les etiquetes a eliminar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Actualitzant {productName} a la versió {version}. Pot trigar una estona.",
     "Please reload the page." : "Carregueu la pàgina de nou.",
     "The update was unsuccessful." : "L'actualització no ha tingut èxit.",
diff --git a/core/l10n/ca@valencia.js b/core/l10n/ca@valencia.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/ca@valencia.js
+++ b/core/l10n/ca@valencia.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ca@valencia.json b/core/l10n/ca@valencia.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/ca@valencia.json
+++ b/core/l10n/ca@valencia.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 3ec5192562f..2bc7040604a 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Listopad",
     "December" : "Prosinec",
     "Settings" : "Nastavení",
-    "File" : "Soubor",
-    "Folder" : "Složka",
-    "Image" : "Obrázek",
-    "Audio" : "Audio",
     "Saving..." : "Ukládám...",
     "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho 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 obnovení hesla byl odeslán na vaši e-mailovou 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 administrátora.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Editovat štítky",
     "Error loading dialog template: {error}" : "Chyba při načítání šablony dialogu: {error}",
     "No tags selected for deletion." : "Žádné štítky nebyly vybrány ke smazání.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
     "Please reload the page." : "Načtěte stránku znovu, prosím.",
     "The update was unsuccessful." : "Aktualizace nebyla úspěšná.",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 2102050a976..12f0f52bcd7 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -32,10 +32,6 @@
     "November" : "Listopad",
     "December" : "Prosinec",
     "Settings" : "Nastavení",
-    "File" : "Soubor",
-    "Folder" : "Složka",
-    "Image" : "Obrázek",
-    "Audio" : "Audio",
     "Saving..." : "Ukládám...",
     "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho 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 obnovení hesla byl odeslán na vaši e-mailovou 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 administrátora.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Editovat štítky",
     "Error loading dialog template: {error}" : "Chyba při načítání šablony dialogu: {error}",
     "No tags selected for deletion." : "Žádné štítky nebyly vybrány ke smazání.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
     "Please reload the page." : "Načtěte stránku znovu, prosím.",
     "The update was unsuccessful." : "Aktualizace nebyla úspěšná.",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index 62231977115..b5fbab1efb6 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "Tachwedd",
     "December" : "Rhagfyr",
     "Settings" : "Gosodiadau",
-    "Folder" : "Plygell",
     "Saving..." : "Yn cadw...",
     "Reset password" : "Ailosod cyfrinair",
     "No" : "Na",
@@ -62,6 +61,7 @@ OC.L10N.register(
     "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
     "Delete" : "Dileu",
     "Add" : "Ychwanegu",
+    "_download %n file_::_download %n files_" : ["","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
     "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
     "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index fc9664a8236..c3749e52468 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -19,7 +19,6 @@
     "November" : "Tachwedd",
     "December" : "Rhagfyr",
     "Settings" : "Gosodiadau",
-    "Folder" : "Plygell",
     "Saving..." : "Yn cadw...",
     "Reset password" : "Ailosod cyfrinair",
     "No" : "Na",
@@ -60,6 +59,7 @@
     "The object type is not specified." : "Nid yw'r math o wrthrych wedi cael ei nodi.",
     "Delete" : "Dileu",
     "Add" : "Ychwanegu",
+    "_download %n file_::_download %n files_" : ["","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
     "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
     "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index c75c3d0dace..33b76eaefe9 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "December",
     "Settings" : "Indstillinger",
-    "File" : "Fil",
-    "Folder" : "Mappe",
-    "Image" : "Billede",
-    "Audio" : "Lyd",
     "Saving..." : "Gemmer...",
     "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Rediger tags",
     "Error loading dialog template: {error}" : "Fejl ved indlæsning dialog skabelon: {error}",
     "No tags selected for deletion." : "Ingen tags markeret til sletning.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
     "Please reload the page." : "Genindlæs venligst siden",
     "The update was unsuccessful." : "Opdateringen mislykkedes.",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 01d09334568..2e84cd5e4f5 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "December",
     "Settings" : "Indstillinger",
-    "File" : "Fil",
-    "Folder" : "Mappe",
-    "Image" : "Billede",
-    "Audio" : "Lyd",
     "Saving..." : "Gemmer...",
     "Couldn't send reset email. Please contact your administrator." : "Der opstod et problem under afsending af e-mailen til nulstilling. Kontakt venligst systemadministratoren.",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Rediger tags",
     "Error loading dialog template: {error}" : "Fejl ved indlæsning dialog skabelon: {error}",
     "No tags selected for deletion." : "Ingen tags markeret til sletning.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
     "Please reload the page." : "Genindlæs venligst siden",
     "The update was unsuccessful." : "Opdateringen mislykkedes.",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 1fda0e1deae..96f55d1e992 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Einstellungen",
-    "File" : "Datei",
-    "Folder" : "Ordner",
-    "Image" : "Bild",
-    "Audio" : "Audio",
     "Saving..." : "Speichern...",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
     "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 Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Schlagwörter bearbeiten",
     "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
     "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
     "Please reload the page." : "Bitte lade diese Seite neu.",
     "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 42f74fe126f..78a4c79f5ee 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Einstellungen",
-    "File" : "Datei",
-    "Folder" : "Ordner",
-    "Image" : "Bild",
-    "Audio" : "Audio",
     "Saving..." : "Speichern...",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
     "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 Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage Deinen lokalen Administrator.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Schlagwörter bearbeiten",
     "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
     "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
     "Please reload the page." : "Bitte lade diese Seite neu.",
     "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
diff --git a/core/l10n/de_AT.js b/core/l10n/de_AT.js
index 98fb44e5d60..7ffe692029e 100644
--- a/core/l10n/de_AT.js
+++ b/core/l10n/de_AT.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "can share" : "Kann teilen",
     "can edit" : "kann bearbeiten",
     "Delete" : "Löschen",
+    "_download %n file_::_download %n files_" : ["",""],
     "Personal" : "Persönlich",
     "Help" : "Hilfe",
     "Password" : "Passwort"
diff --git a/core/l10n/de_AT.json b/core/l10n/de_AT.json
index 2f44aaea3da..f82fc259f5a 100644
--- a/core/l10n/de_AT.json
+++ b/core/l10n/de_AT.json
@@ -29,6 +29,7 @@
     "can share" : "Kann teilen",
     "can edit" : "kann bearbeiten",
     "Delete" : "Löschen",
+    "_download %n file_::_download %n files_" : ["",""],
     "Personal" : "Persönlich",
     "Help" : "Hilfe",
     "Password" : "Passwort"
diff --git a/core/l10n/de_CH.js b/core/l10n/de_CH.js
index 514e2d6c196..5a383c104cb 100644
--- a/core/l10n/de_CH.js
+++ b/core/l10n/de_CH.js
@@ -24,8 +24,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Einstellungen",
-    "File" : "Datei",
-    "Folder" : "Ordner",
     "Saving..." : "Speichern...",
     "Reset password" : "Passwort zurücksetzen",
     "No" : "Nein",
@@ -69,6 +67,7 @@ OC.L10N.register(
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Delete" : "Löschen",
     "Add" : "Hinzufügen",
+    "_download %n file_::_download %n files_" : ["",""],
     "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}",
diff --git a/core/l10n/de_CH.json b/core/l10n/de_CH.json
index b549592ed06..aa69c7355e0 100644
--- a/core/l10n/de_CH.json
+++ b/core/l10n/de_CH.json
@@ -22,8 +22,6 @@
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Einstellungen",
-    "File" : "Datei",
-    "Folder" : "Ordner",
     "Saving..." : "Speichern...",
     "Reset password" : "Passwort zurücksetzen",
     "No" : "Nein",
@@ -67,6 +65,7 @@
     "The object type is not specified." : "Der Objekttyp ist nicht angegeben.",
     "Delete" : "Löschen",
     "Add" : "Hinzufügen",
+    "_download %n file_::_download %n files_" : ["",""],
     "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}",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 7de8818152a..fa804c9573f 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Einstellungen",
-    "File" : "Datei",
-    "Folder" : "Ordner",
-    "Image" : "Bild",
-    "Audio" : "Audio",
     "Saving..." : "Speichervorgang …",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
     "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 Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Schlagwörter bearbeiten",
     "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
     "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
     "Please reload the page." : "Bitte laden Sie diese Seite neu.",
     "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index db643f834f5..72d88ab96b2 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Einstellungen",
-    "File" : "Datei",
-    "Folder" : "Ordner",
-    "Image" : "Bild",
-    "Audio" : "Audio",
     "Saving..." : "Speichervorgang …",
     "Couldn't send reset email. Please contact your administrator." : "Die E-Mail zum Zurücksetzen konnte nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
     "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 Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Schlagwörter bearbeiten",
     "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
     "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
     "Please reload the page." : "Bitte laden Sie diese Seite neu.",
     "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 33bd00826b8..9d54904faa6 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Νοέμβριος",
     "December" : "Δεκέμβριος",
     "Settings" : "Ρυθμίσεις",
-    "File" : "Αρχείο",
-    "Folder" : "Φάκελος",
-    "Image" : "Εικόνα",
-    "Audio" : "Ήχος",
     "Saving..." : "Γίνεται αποθήκευση...",
     "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>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Επεξεργασία ετικετών",
     "Error loading dialog template: {error}" : "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
     "No tags selected for deletion." : "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
     "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
     "The update was unsuccessful." : "Η ενημέρωση δεν ήταν επιτυχής.",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 5a35c89dfc3..259ad682028 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -32,10 +32,6 @@
     "November" : "Νοέμβριος",
     "December" : "Δεκέμβριος",
     "Settings" : "Ρυθμίσεις",
-    "File" : "Αρχείο",
-    "Folder" : "Φάκελος",
-    "Image" : "Εικόνα",
-    "Audio" : "Ήχος",
     "Saving..." : "Γίνεται αποθήκευση...",
     "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>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Επεξεργασία ετικετών",
     "Error loading dialog template: {error}" : "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
     "No tags selected for deletion." : "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
     "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
     "The update was unsuccessful." : "Η ενημέρωση δεν ήταν επιτυχής.",
diff --git a/core/l10n/en@pirate.js b/core/l10n/en@pirate.js
index 0869bb9f0a3..9db5e2cd3ef 100644
--- a/core/l10n/en@pirate.js
+++ b/core/l10n/en@pirate.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "core",
     {
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""],
     "Password" : "Passcode"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en@pirate.json b/core/l10n/en@pirate.json
index 6a15bfb20b5..63c33c612f3 100644
--- a/core/l10n/en@pirate.json
+++ b/core/l10n/en@pirate.json
@@ -1,5 +1,6 @@
 { "translations": {
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""],
     "Password" : "Passcode"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index 9dc918f12eb..b32e5768b2d 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "December",
     "Settings" : "Settings",
-    "File" : "File",
-    "Folder" : "Folder",
-    "Image" : "Image",
-    "Audio" : "Audio",
     "Saving..." : "Saving...",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Edit tags",
     "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
     "No tags selected for deletion." : "No tags selected for deletion.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
     "Please reload the page." : "Please reload the page.",
     "The update was unsuccessful." : "The update was unsuccessful.",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index a1768bcf0bd..b902ec5886b 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "December",
     "Settings" : "Settings",
-    "File" : "File",
-    "Folder" : "Folder",
-    "Image" : "Image",
-    "Audio" : "Audio",
     "Saving..." : "Saving...",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Edit tags",
     "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
     "No tags selected for deletion." : "No tags selected for deletion.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
     "Please reload the page." : "Please reload the page.",
     "The update was unsuccessful." : "The update was unsuccessful.",
diff --git a/core/l10n/en_NZ.js b/core/l10n/en_NZ.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/en_NZ.js
+++ b/core/l10n/en_NZ.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/en_NZ.json b/core/l10n/en_NZ.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/en_NZ.json
+++ b/core/l10n/en_NZ.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index 736d82c9f30..cc814c41e35 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -24,9 +24,6 @@ OC.L10N.register(
     "November" : "Novembro",
     "December" : "Decembro",
     "Settings" : "Agordo",
-    "File" : "Dosiero",
-    "Folder" : "Dosierujo",
-    "Image" : "Bildo",
     "Saving..." : "Konservante...",
     "Reset password" : "Rekomenci la pasvorton",
     "No" : "Ne",
@@ -85,6 +82,7 @@ OC.L10N.register(
     "Add" : "Aldoni",
     "Edit tags" : "Redakti etikedojn",
     "No tags selected for deletion." : "Neniu etikedo elektitas por forigo.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Bonvolu reŝargi la paĝon.",
     "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
     "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index 5520e2beb95..dc4d9d6eefc 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -22,9 +22,6 @@
     "November" : "Novembro",
     "December" : "Decembro",
     "Settings" : "Agordo",
-    "File" : "Dosiero",
-    "Folder" : "Dosierujo",
-    "Image" : "Bildo",
     "Saving..." : "Konservante...",
     "Reset password" : "Rekomenci la pasvorton",
     "No" : "Ne",
@@ -83,6 +80,7 @@
     "Add" : "Aldoni",
     "Edit tags" : "Redakti etikedojn",
     "No tags selected for deletion." : "Neniu etikedo elektitas por forigo.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Bonvolu reŝargi la paĝon.",
     "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
     "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 683e03cb708..4bd33bdd27a 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Noviembre",
     "December" : "Diciembre",
     "Settings" : "Ajustes",
-    "File" : "Archivo",
-    "Folder" : "Carpeta",
-    "Image" : "Imagen",
-    "Audio" : "Audio",
     "Saving..." : "Guardando...",
     "Couldn't send reset email. Please contact your administrator." : "La reiniciación de este  correo electrónico no pudo ser enviada. Por favor, contacte a 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." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
     "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "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." : "Falló la actualización",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 3eaedab0621..d479364834c 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -32,10 +32,6 @@
     "November" : "Noviembre",
     "December" : "Diciembre",
     "Settings" : "Ajustes",
-    "File" : "Archivo",
-    "Folder" : "Carpeta",
-    "Image" : "Imagen",
-    "Audio" : "Audio",
     "Saving..." : "Guardando...",
     "Couldn't send reset email. Please contact your administrator." : "La reiniciación de este  correo electrónico no pudo ser enviada. Por favor, contacte a 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." : "Un enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte a su administrador local.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
     "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "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." : "Falló la actualización",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index f9b54cc8d81..f37377f465c 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -30,9 +30,6 @@ OC.L10N.register(
     "November" : "noviembre",
     "December" : "diciembre",
     "Settings" : "Configuración",
-    "File" : "Archivo",
-    "Folder" : "Carpeta",
-    "Image" : "Imagen",
     "Saving..." : "Guardando...",
     "Reset password" : "Restablecer contraseña",
     "No" : "No",
@@ -98,6 +95,7 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando la plantilla de dialogo: {error}",
     "No tags selected for deletion." : "No se han seleccionado etiquetas para eliminar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Por favor, recargue la página.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
     "%s password reset" : "%s restablecer contraseña",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 621626a366b..219139245a3 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -28,9 +28,6 @@
     "November" : "noviembre",
     "December" : "diciembre",
     "Settings" : "Configuración",
-    "File" : "Archivo",
-    "Folder" : "Carpeta",
-    "Image" : "Imagen",
     "Saving..." : "Guardando...",
     "Reset password" : "Restablecer contraseña",
     "No" : "No",
@@ -96,6 +93,7 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando la plantilla de dialogo: {error}",
     "No tags selected for deletion." : "No se han seleccionado etiquetas para eliminar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Por favor, recargue la página.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
     "%s password reset" : "%s restablecer contraseña",
diff --git a/core/l10n/es_BO.js b/core/l10n/es_BO.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/es_BO.js
+++ b/core/l10n/es_BO.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_BO.json b/core/l10n/es_BO.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/es_BO.json
+++ b/core/l10n/es_BO.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
index 64a8ed0c706..3808c2cb7c4 100644
--- a/core/l10n/es_CL.js
+++ b/core/l10n/es_CL.js
@@ -36,6 +36,7 @@ OC.L10N.register(
     "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "Usuario",
     "Personal" : "Personal",
     "Users" : "Usuarios",
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
index 22bab061129..1760e39c6c6 100644
--- a/core/l10n/es_CL.json
+++ b/core/l10n/es_CL.json
@@ -34,6 +34,7 @@
     "Error while unsharing" : "Ocurrió un error mientras dejaba de compartir",
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "Usuario",
     "Personal" : "Personal",
     "Users" : "Usuarios",
diff --git a/core/l10n/es_CO.js b/core/l10n/es_CO.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/es_CO.js
+++ b/core/l10n/es_CO.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CO.json b/core/l10n/es_CO.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/es_CO.json
+++ b/core/l10n/es_CO.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"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
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/es_CR.js
+++ b/core/l10n/es_CR.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_CR.json b/core/l10n/es_CR.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/es_CR.json
+++ b/core/l10n/es_CR.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"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
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/es_EC.js
+++ b/core/l10n/es_EC.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_EC.json b/core/l10n/es_EC.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/es_EC.json
+++ b/core/l10n/es_EC.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index 0134945fa45..d830538bed3 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -30,8 +30,6 @@ OC.L10N.register(
     "November" : "Noviembre",
     "December" : "Diciembre",
     "Settings" : "Ajustes",
-    "File" : "Archivo",
-    "Folder" : "Carpeta",
     "Saving..." : "Guardando...",
     "Reset password" : "Restablecer contraseña",
     "No" : "No",
@@ -91,6 +89,7 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
     "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Vuelva a cargar la página.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "%s password reset" : "%s restablecer contraseña",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index a620c6ca020..99da53b91fe 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -28,8 +28,6 @@
     "November" : "Noviembre",
     "December" : "Diciembre",
     "Settings" : "Ajustes",
-    "File" : "Archivo",
-    "Folder" : "Carpeta",
     "Saving..." : "Guardando...",
     "Reset password" : "Restablecer contraseña",
     "No" : "No",
@@ -89,6 +87,7 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
     "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Vuelva a cargar la página.",
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "%s password reset" : "%s restablecer contraseña",
diff --git a/core/l10n/es_PE.js b/core/l10n/es_PE.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/es_PE.js
+++ b/core/l10n/es_PE.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PE.json b/core/l10n/es_PE.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/es_PE.json
+++ b/core/l10n/es_PE.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"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
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/es_PY.js
+++ b/core/l10n/es_PY.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_PY.json b/core/l10n/es_PY.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/es_PY.json
+++ b/core/l10n/es_PY.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"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
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/es_US.js
+++ b/core/l10n/es_US.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_US.json b/core/l10n/es_US.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/es_US.json
+++ b/core/l10n/es_US.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"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
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/es_UY.js
+++ b/core/l10n/es_UY.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/es_UY.json b/core/l10n/es_UY.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/es_UY.json
+++ b/core/l10n/es_UY.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 5b2e2511005..c43a2b68d6c 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Detsember",
     "Settings" : "Seaded",
-    "File" : "Fail",
-    "Folder" : "Kaust",
-    "Image" : "Pilt",
-    "Audio" : "Helid",
     "Saving..." : "Salvestamine...",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Muuda silte",
     "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
     "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
     "Please reload the page." : "Palun laadi see uuesti.",
     "The update was unsuccessful." : "Uuendus ebaõnnestus.",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index ba3f3b8e8f2..0dc6854ec93 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "Detsember",
     "Settings" : "Seaded",
-    "File" : "Fail",
-    "Folder" : "Kaust",
-    "Image" : "Pilt",
-    "Audio" : "Helid",
     "Saving..." : "Salvestamine...",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Muuda silte",
     "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
     "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
     "Please reload the page." : "Palun laadi see uuesti.",
     "The update was unsuccessful." : "Uuendus ebaõnnestus.",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index 7f03d568dc9..e90e458a193 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Azaroa",
     "December" : "Abendua",
     "Settings" : "Ezarpenak",
-    "File" : "Fitxategia",
-    "Folder" : "Karpeta",
-    "Image" : "Irudia",
-    "Audio" : "Audio",
     "Saving..." : "Gordetzen...",
     "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.",
@@ -69,6 +65,7 @@ OC.L10N.register(
     "Strong password" : "Pasahitz sendoa",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
     "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." : "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+    "Error occurred while checking server setup" : "Errore bat gertatu da zerbitzariaren konfigurazioa egiaztatzerakoan.",
     "Shared" : "Elkarbanatuta",
     "Shared with {recipients}" : "{recipients}-rekin partekatua.",
     "Share" : "Elkarbanatu",
@@ -88,6 +85,7 @@ OC.L10N.register(
     "Send" : "Bidali",
     "Set expiration date" : "Ezarri muga data",
     "Expiration date" : "Muga data",
+    "Adding user..." : "Erabiltzailea gehitzen...",
     "group" : "taldea",
     "Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
     "Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
@@ -112,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Editatu etiketak",
     "Error loading dialog template: {error}" : "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
     "No tags selected for deletion." : "Ez dira ezabatzeko etiketak hautatu.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
     "Please reload the page." : "Mesedez birkargatu orria.",
     "The update was unsuccessful." : "Eguneraketak ez du arrakasta izan.",
@@ -143,9 +142,24 @@ OC.L10N.register(
     "Error favoriting" : "Errorea gogokoetara gehitzerakoan",
     "Error unfavoriting" : "Errorea gogokoetatik kentzerakoan",
     "Access forbidden" : "Sarrera debekatuta",
+    "File not found" : "Ez da fitxategia aurkitu",
+    "The specified document has not been found on the server." : "Zehaztutako dokumentua ez da zerbitzarian aurkitu.",
+    "You can click here to return to %s." : "Hemen klika dezakezu %sra itzultzeko.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
     "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
     "Cheers!" : "Ongi izan!",
+    "Internal Server Error" : "Zerbitzariaren Barne Errorea",
+    "The server encountered an internal error and was unable to complete your request." : "Zerbitzariak barne errore bat izan du eta ez da gai izan zure eskaria osatzeko.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Mesedez harremanetan jarri zerbitzariaren kudeatzailearekin errore hau aldi askotan agertzekotan, mesedez gehitu beheko zehaztapen teknikoak zure txostenean.",
+    "More details can be found in the server log." : "Zehaztapen gehiago zerbitzariaren egunerokoan aurki daitezke.",
+    "Technical details" : "Arazo teknikoak",
+    "Remote Address: %s" : "Urruneko Helbidea: %s",
+    "Request ID: %s" : "Eskariaren IDa: %s",
+    "Code: %s" : "Kodea: %s",
+    "Message: %s" : "Mezua: %s",
+    "File: %s" : "Fitxategia: %s",
+    "Line: %s" : "Lerroa: %s",
+    "Trace" : "Arrastoa",
     "Security Warning" : "Segurtasun abisua",
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
     "Please update your PHP installation to use %s securely." : "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
@@ -165,6 +179,7 @@ OC.L10N.register(
     "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
     "Finish setup" : "Bukatu konfigurazioa",
     "Finishing …" : "Bukatzen...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikazio honek ongi funtzionatzeko JavaScript behar du. Mesedez  <a href=\"http://enable-javascript.com/\" target=\"_blank\">gaitu JavaScript</a> eta birkargatu orri hau.",
     "%s is available. Get more information on how to update." : "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
     "Log out" : "Saioa bukatu",
     "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
@@ -187,6 +202,8 @@ OC.L10N.register(
     "The theme %s has been disabled." : "%s gaia desgaitu da.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
     "Start update" : "Hasi eguneraketa",
-    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:"
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:",
+    "This %s instance is currently being updated, which may take a while." : "%s instantzia hau eguneratzen ari da, honek denbora har dezake.",
+    "This page will refresh itself when the %s instance is available again." : "Orri honek bere burua eguneratuko du %s instantzia berriz prest dagoenean."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index 5bd339cd793..d851c6e942d 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -32,10 +32,6 @@
     "November" : "Azaroa",
     "December" : "Abendua",
     "Settings" : "Ezarpenak",
-    "File" : "Fitxategia",
-    "Folder" : "Karpeta",
-    "Image" : "Irudia",
-    "Audio" : "Audio",
     "Saving..." : "Gordetzen...",
     "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.",
@@ -67,6 +63,7 @@
     "Strong password" : "Pasahitz sendoa",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Zure web zerbitzaria ez dago oraindik ongi konfiguratuta fitxategien sinkronizazioa egiteko, WebDAV interfazea ongi ez dagoela dirudi.",
     "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." : "Zerbitzari honen interneteko konexioa ez dabil. Honek esan nahi du kanpoko biltegiratze zerbitzuak, eguneraketen informazioa edo bestelako aplikazioen instalazioa bezalako programek ez dutela funtzionatuko. Urrunetik fitxategiak eskuratzea eta e-postak bidaltzea ere ezinezkoa izan daiteke. onwCloud-en aukera guztiak erabili ahal izateko zerbitzari honetan interneteko konexioa gaitzea aholkatzen dizugu.",
+    "Error occurred while checking server setup" : "Errore bat gertatu da zerbitzariaren konfigurazioa egiaztatzerakoan.",
     "Shared" : "Elkarbanatuta",
     "Shared with {recipients}" : "{recipients}-rekin partekatua.",
     "Share" : "Elkarbanatu",
@@ -86,6 +83,7 @@
     "Send" : "Bidali",
     "Set expiration date" : "Ezarri muga data",
     "Expiration date" : "Muga data",
+    "Adding user..." : "Erabiltzailea gehitzen...",
     "group" : "taldea",
     "Resharing is not allowed" : "Berriz elkarbanatzea ez dago baimendua",
     "Shared in {item} with {user}" : "{user}ekin {item}-n elkarbanatuta",
@@ -110,6 +108,7 @@
     "Edit tags" : "Editatu etiketak",
     "Error loading dialog template: {error}" : "Errorea elkarrizketa txantiloia kargatzean: {errorea}",
     "No tags selected for deletion." : "Ez dira ezabatzeko etiketak hautatu.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Eguneratu  {productName} {version} bertsiora, bere denbora behar du.",
     "Please reload the page." : "Mesedez birkargatu orria.",
     "The update was unsuccessful." : "Eguneraketak ez du arrakasta izan.",
@@ -141,9 +140,24 @@
     "Error favoriting" : "Errorea gogokoetara gehitzerakoan",
     "Error unfavoriting" : "Errorea gogokoetatik kentzerakoan",
     "Access forbidden" : "Sarrera debekatuta",
+    "File not found" : "Ez da fitxategia aurkitu",
+    "The specified document has not been found on the server." : "Zehaztutako dokumentua ez da zerbitzarian aurkitu.",
+    "You can click here to return to %s." : "Hemen klika dezakezu %sra itzultzeko.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Kaixo\n\n%s-ek %s zurekin partekatu duela jakin dezazun.\nIkusi ezazu: %s\n\n",
     "The share will expire on %s." : "Elkarbanaketa %s-n iraungiko da.",
     "Cheers!" : "Ongi izan!",
+    "Internal Server Error" : "Zerbitzariaren Barne Errorea",
+    "The server encountered an internal error and was unable to complete your request." : "Zerbitzariak barne errore bat izan du eta ez da gai izan zure eskaria osatzeko.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Mesedez harremanetan jarri zerbitzariaren kudeatzailearekin errore hau aldi askotan agertzekotan, mesedez gehitu beheko zehaztapen teknikoak zure txostenean.",
+    "More details can be found in the server log." : "Zehaztapen gehiago zerbitzariaren egunerokoan aurki daitezke.",
+    "Technical details" : "Arazo teknikoak",
+    "Remote Address: %s" : "Urruneko Helbidea: %s",
+    "Request ID: %s" : "Eskariaren IDa: %s",
+    "Code: %s" : "Kodea: %s",
+    "Message: %s" : "Mezua: %s",
+    "File: %s" : "Fitxategia: %s",
+    "Line: %s" : "Lerroa: %s",
+    "Trace" : "Arrastoa",
     "Security Warning" : "Segurtasun abisua",
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Zure PHP bertsioa NULL Byte erasoak (CVE-2006-7243) mendera dezake.",
     "Please update your PHP installation to use %s securely." : "Mesedez eguneratu zure PHP instalazioa %s seguru erabiltzeko",
@@ -163,6 +177,7 @@
     "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite erabiliko da datu-base gisa. Instalazio handiagoetarako gomendatzen dugu aldatzea.",
     "Finish setup" : "Bukatu konfigurazioa",
     "Finishing …" : "Bukatzen...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Aplikazio honek ongi funtzionatzeko JavaScript behar du. Mesedez  <a href=\"http://enable-javascript.com/\" target=\"_blank\">gaitu JavaScript</a> eta birkargatu orri hau.",
     "%s is available. Get more information on how to update." : "%s erabilgarri dago. Eguneratzeaz argibide gehiago eskuratu.",
     "Log out" : "Saioa bukatu",
     "Server side authentication failed!" : "Zerbitzari aldeko autentifikazioak huts egin du!",
@@ -185,6 +200,8 @@
     "The theme %s has been disabled." : "%s gaia desgaitu da.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ekin aurretik egiazta ezazu datu basearen, ezarpenen karpetaren eta datuen karpetaren babeskopia duzula.",
     "Start update" : "Hasi eguneraketa",
-    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:"
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Instalazio handien itxarote-denbora saihesteko, ondoko komandoa exekuta dezakezu instalazio direktoriotik:",
+    "This %s instance is currently being updated, which may take a while." : "%s instantzia hau eguneratzen ari da, honek denbora har dezake.",
+    "This page will refresh itself when the %s instance is available again." : "Orri honek bere burua eguneratuko du %s instantzia berriz prest dagoenean."
 },"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
index 5f64fb906bd..e1895b17f86 100644
--- a/core/l10n/eu_ES.js
+++ b/core/l10n/eu_ES.js
@@ -4,6 +4,7 @@ OC.L10N.register(
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Ezeztatu",
     "Delete" : "Ezabatu",
+    "_download %n file_::_download %n files_" : ["",""],
     "Personal" : "Pertsonala"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/eu_ES.json b/core/l10n/eu_ES.json
index 083ff038d8d..7f28faebc14 100644
--- a/core/l10n/eu_ES.json
+++ b/core/l10n/eu_ES.json
@@ -2,6 +2,7 @@
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
     "Cancel" : "Ezeztatu",
     "Delete" : "Ezabatu",
+    "_download %n file_::_download %n files_" : ["",""],
     "Personal" : "Pertsonala"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index e6951221983..e280bae0f58 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -30,10 +30,6 @@ OC.L10N.register(
     "November" : "نوامبر",
     "December" : "دسامبر",
     "Settings" : "تنظیمات",
-    "File" : "فایل",
-    "Folder" : "پوشه",
-    "Image" : "تصویر",
-    "Audio" : "صدا",
     "Saving..." : "در حال ذخیره سازی...",
     "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>در صورت نبودن از مدیر خود بپرسید.",
@@ -102,6 +98,7 @@ OC.L10N.register(
     "Delete" : "حذف",
     "Add" : "افزودن",
     "Edit tags" : "ویرایش تگ ها",
+    "_download %n file_::_download %n files_" : [""],
     "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index 80b130bdcde..e7687a02b4c 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -28,10 +28,6 @@
     "November" : "نوامبر",
     "December" : "دسامبر",
     "Settings" : "تنظیمات",
-    "File" : "فایل",
-    "Folder" : "پوشه",
-    "Image" : "تصویر",
-    "Audio" : "صدا",
     "Saving..." : "در حال ذخیره سازی...",
     "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>در صورت نبودن از مدیر خود بپرسید.",
@@ -100,6 +96,7 @@
     "Delete" : "حذف",
     "Add" : "افزودن",
     "Edit tags" : "ویرایش تگ ها",
+    "_download %n file_::_download %n files_" : [""],
     "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index b7924c1710c..bfbfc9206ac 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -33,10 +33,6 @@ OC.L10N.register(
     "November" : "marraskuu",
     "December" : "joulukuu",
     "Settings" : "Asetukset",
-    "File" : "Tiedosto",
-    "Folder" : "Kansio",
-    "Image" : "Kuva",
-    "Audio" : "Ääni",
     "Saving..." : "Tallennetaan...",
     "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "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.",
@@ -113,6 +109,7 @@ OC.L10N.register(
     "Edit tags" : "Muokkaa tunnisteita",
     "Error loading dialog template: {error}" : "Virhe ladatessa keskustelupohja: {error}",
     "No tags selected for deletion." : "Tunnisteita ei valittu poistettavaksi.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
     "Please reload the page." : "Päivitä sivu.",
     "The update was unsuccessful." : "Päivitys epäonnistui.",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 0b5c5dcb4fc..fcddf216a5d 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -31,10 +31,6 @@
     "November" : "marraskuu",
     "December" : "joulukuu",
     "Settings" : "Asetukset",
-    "File" : "Tiedosto",
-    "Folder" : "Kansio",
-    "Image" : "Kuva",
-    "Audio" : "Ääni",
     "Saving..." : "Tallennetaan...",
     "Couldn't send reset email. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "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.",
@@ -111,6 +107,7 @@
     "Edit tags" : "Muokkaa tunnisteita",
     "Error loading dialog template: {error}" : "Virhe ladatessa keskustelupohja: {error}",
     "No tags selected for deletion." : "Tunnisteita ei valittu poistettavaksi.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
     "Please reload the page." : "Päivitä sivu.",
     "The update was unsuccessful." : "Päivitys epäonnistui.",
diff --git a/core/l10n/fil.js b/core/l10n/fil.js
index bc4e6c6bc64..7aa65e3a52e 100644
--- a/core/l10n/fil.js
+++ b/core/l10n/fil.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fil.json b/core/l10n/fil.json
index 4ebc0d2d45d..207d7753769 100644
--- a/core/l10n/fil.json
+++ b/core/l10n/fil.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index ba430852edc..0cc2d575f5e 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "novembre",
     "December" : "décembre",
     "Settings" : "Paramètres",
-    "File" : "Fichier",
-    "Folder" : "Dossier",
-    "Image" : "Image",
-    "Audio" : "Audio",
     "Saving..." : "Enregistrement…",
     "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." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Modifier les marqueurs",
     "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
     "No tags selected for deletion." : "Aucun marqueur sélectionné pour la suppression.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
     "Please reload the page." : "Veuillez recharger la page.",
     "The update was unsuccessful." : "La mise à jour a échoué.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index b123afbb0d8..0f3c0112049 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -32,10 +32,6 @@
     "November" : "novembre",
     "December" : "décembre",
     "Settings" : "Paramètres",
-    "File" : "Fichier",
-    "Folder" : "Dossier",
-    "Image" : "Image",
-    "Audio" : "Audio",
     "Saving..." : "Enregistrement…",
     "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." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Modifier les marqueurs",
     "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
     "No tags selected for deletion." : "Aucun marqueur sélectionné pour la suppression.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
     "Please reload the page." : "Veuillez recharger la page.",
     "The update was unsuccessful." : "La mise à jour a échoué.",
diff --git a/core/l10n/fr_CA.js b/core/l10n/fr_CA.js
index bc4e6c6bc64..7aa65e3a52e 100644
--- a/core/l10n/fr_CA.js
+++ b/core/l10n/fr_CA.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/fr_CA.json b/core/l10n/fr_CA.json
index 4ebc0d2d45d..207d7753769 100644
--- a/core/l10n/fr_CA.json
+++ b/core/l10n/fr_CA.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/fy_NL.js b/core/l10n/fy_NL.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/fy_NL.js
+++ b/core/l10n/fy_NL.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/fy_NL.json b/core/l10n/fy_NL.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/fy_NL.json
+++ b/core/l10n/fy_NL.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index 21092fce15b..a1721cc4124 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -32,10 +32,6 @@ OC.L10N.register(
     "November" : "novembro",
     "December" : "decembro",
     "Settings" : "Axustes",
-    "File" : "Ficheiro",
-    "Folder" : "Cartafol",
-    "Image" : "Imaxe",
-    "Audio" : "Son",
     "Saving..." : "Gardando...",
     "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. 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.",
@@ -110,6 +106,7 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}",
     "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
     "Please reload the page." : "Volva cargar a páxina.",
     "The update was unsuccessful." : "A actualización foi satisfactoria.",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 5817851838c..1fbd26d2333 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -30,10 +30,6 @@
     "November" : "novembro",
     "December" : "decembro",
     "Settings" : "Axustes",
-    "File" : "Ficheiro",
-    "Folder" : "Cartafol",
-    "Image" : "Imaxe",
-    "Audio" : "Son",
     "Saving..." : "Gardando...",
     "Couldn't send reset email. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. 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.",
@@ -108,6 +104,7 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}",
     "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
     "Please reload the page." : "Volva cargar a páxina.",
     "The update was unsuccessful." : "A actualización foi satisfactoria.",
diff --git a/core/l10n/gu.js b/core/l10n/gu.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/gu.js
+++ b/core/l10n/gu.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/gu.json b/core/l10n/gu.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/gu.json
+++ b/core/l10n/gu.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/he.js b/core/l10n/he.js
index fc09eb2b03b..206e0c0de01 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "נובמבר",
     "December" : "דצמבר",
     "Settings" : "הגדרות",
-    "Folder" : "תיקייה",
     "Saving..." : "שמירה…",
     "Reset password" : "איפוס ססמה",
     "No" : "לא",
@@ -65,6 +64,7 @@ OC.L10N.register(
     "The object type is not specified." : "סוג הפריט לא צוין.",
     "Delete" : "מחיקה",
     "Add" : "הוספה",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
     "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
     "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
diff --git a/core/l10n/he.json b/core/l10n/he.json
index ea7f1e5e058..437098c104f 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -19,7 +19,6 @@
     "November" : "נובמבר",
     "December" : "דצמבר",
     "Settings" : "הגדרות",
-    "Folder" : "תיקייה",
     "Saving..." : "שמירה…",
     "Reset password" : "איפוס ססמה",
     "No" : "לא",
@@ -63,6 +62,7 @@
     "The object type is not specified." : "סוג הפריט לא צוין.",
     "Delete" : "מחיקה",
     "Add" : "הוספה",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
     "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
     "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
index a58e175149a..bd74076a739 100644
--- a/core/l10n/hi.js
+++ b/core/l10n/hi.js
@@ -30,6 +30,7 @@ OC.L10N.register(
     "Email sent" : "ईमेल भेज दिया गया है ",
     "Warning" : "चेतावनी ",
     "Add" : "डाले",
+    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
     "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
     "Username" : "प्रयोक्ता का नाम",
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
index c1041efafb9..82f27644e93 100644
--- a/core/l10n/hi.json
+++ b/core/l10n/hi.json
@@ -28,6 +28,7 @@
     "Email sent" : "ईमेल भेज दिया गया है ",
     "Warning" : "चेतावनी ",
     "Add" : "डाले",
+    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
     "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
     "Username" : "प्रयोक्ता का नाम",
diff --git a/core/l10n/hi_IN.js b/core/l10n/hi_IN.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/hi_IN.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/hi_IN.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index 019b5a5f6a4..38de4e13cd3 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Studeni",
     "December" : "Prosinac",
     "Settings" : "Postavke",
-    "File" : "Datoteka",
-    "Folder" : "Mapa",
-    "Image" : "Slika",
-    "Audio" : "Audio",
     "Saving..." : "Spremanje...",
     "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.",
@@ -112,6 +108,7 @@ OC.L10N.register(
     "Edit tags" : "Uredite oznake",
     "Error loading dialog template: {error}" : "Pogrešno učitavanje predloška dijaloga: {error}",
     "No tags selected for deletion." : "Nijedna oznaka nije odabrana za brisanje.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
     "Please reload the page." : "Molimo, ponovno učitajte stranicu",
     "The update was unsuccessful." : "Ažuriranje nije uspjelo",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index 17985b11abc..fbcc57054e3 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -32,10 +32,6 @@
     "November" : "Studeni",
     "December" : "Prosinac",
     "Settings" : "Postavke",
-    "File" : "Datoteka",
-    "Folder" : "Mapa",
-    "Image" : "Slika",
-    "Audio" : "Audio",
     "Saving..." : "Spremanje...",
     "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.",
@@ -110,6 +106,7 @@
     "Edit tags" : "Uredite oznake",
     "Error loading dialog template: {error}" : "Pogrešno učitavanje predloška dijaloga: {error}",
     "No tags selected for deletion." : "Nijedna oznaka nije odabrana za brisanje.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Uređivanje {productName} u verziiju {version}, to može potrajati neko vrijeme.",
     "Please reload the page." : "Molimo, ponovno učitajte stranicu",
     "The update was unsuccessful." : "Ažuriranje nije uspjelo",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 1220cf05713..867d47cda68 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "november",
     "December" : "december",
     "Settings" : "Beállítások",
-    "File" : "Fájl",
-    "Folder" : "Mappa",
-    "Image" : "Kép",
-    "Audio" : "Hang",
     "Saving..." : "Mentés...",
     "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Címkék szerkesztése",
     "Error loading dialog template: {error}" : "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
     "No tags selected for deletion." : "Nincs törlésre kijelölt címke.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
     "Please reload the page." : "Kérjük frissítse az oldalt!",
     "The update was unsuccessful." : "A frissítés nem sikerült.",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 28b3ecb3c45..3ab7d5d2e97 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -32,10 +32,6 @@
     "November" : "november",
     "December" : "december",
     "Settings" : "Beállítások",
-    "File" : "Fájl",
-    "Folder" : "Mappa",
-    "Image" : "Kép",
-    "Audio" : "Hang",
     "Saving..." : "Mentés...",
     "Couldn't send reset email. Please contact your administrator." : "Visszaállítási e-mail nem küldhető. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Címkék szerkesztése",
     "Error loading dialog template: {error}" : "Hiba a párbeszédpanel-sablon betöltésekor: {error}",
     "No tags selected for deletion." : "Nincs törlésre kijelölt címke.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : " {productName} frissítése zajlik erre a verzióra: {version}. Ez eltarthat egy darabig.",
     "Please reload the page." : "Kérjük frissítse az oldalt!",
     "The update was unsuccessful." : "A frissítés nem sikerült.",
diff --git a/core/l10n/hy.js b/core/l10n/hy.js
index 7f69d32fa34..23c56d34916 100644
--- a/core/l10n/hy.js
+++ b/core/l10n/hy.js
@@ -21,6 +21,7 @@ OC.L10N.register(
     "November" : "Նոյեմբեր",
     "December" : "Դեկտեմբեր",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Delete" : "Ջնջել"
+    "Delete" : "Ջնջել",
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/hy.json b/core/l10n/hy.json
index d650d6ee92b..f9a85d3ea05 100644
--- a/core/l10n/hy.json
+++ b/core/l10n/hy.json
@@ -19,6 +19,7 @@
     "November" : "Նոյեմբեր",
     "December" : "Դեկտեմբեր",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Delete" : "Ջնջել"
+    "Delete" : "Ջնջել",
+    "_download %n file_::_download %n files_" : ["",""]
 },"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 515d612244d..8bac55ebfab 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -33,10 +33,6 @@ OC.L10N.register(
     "November" : "Novembre",
     "December" : "Decembre",
     "Settings" : "Configurationes",
-    "File" : "File",
-    "Folder" : "Dossier",
-    "Image" : "Imagine",
-    "Audio" : "Audio",
     "Saving..." : "Salveguardante...",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
     "I know what I'm doing" : "Io sape lo que io es facente",
@@ -101,6 +97,7 @@ OC.L10N.register(
     "Delete" : "Deler",
     "Add" : "Adder",
     "Edit tags" : "Modifica etiquettas",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Pro favor recarga le pagina.",
     "The update was unsuccessful." : "Le actualisation esseva successose.",
     "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index 9814ab98abe..60ece2f9425 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -31,10 +31,6 @@
     "November" : "Novembre",
     "December" : "Decembre",
     "Settings" : "Configurationes",
-    "File" : "File",
-    "Folder" : "Dossier",
-    "Image" : "Imagine",
-    "Audio" : "Audio",
     "Saving..." : "Salveguardante...",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
     "I know what I'm doing" : "Io sape lo que io es facente",
@@ -99,6 +95,7 @@
     "Delete" : "Deler",
     "Add" : "Adder",
     "Edit tags" : "Modifica etiquettas",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "Pro favor recarga le pagina.",
     "The update was unsuccessful." : "Le actualisation esseva successose.",
     "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 171d4141a2c..7182162297e 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Desember",
     "Settings" : "Pengaturan",
-    "File" : "Berkas",
-    "Folder" : "Folder",
-    "Image" : "gambar",
-    "Audio" : "Audio",
     "Saving..." : "Menyimpan...",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Sunting label",
     "Error loading dialog template: {error}" : "Galat memuat templat dialog: {error}",
     "No tags selected for deletion." : "Tidak ada label yang dipilih untuk dihapus.",
+    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
     "Please reload the page." : "Silakan muat ulang halaman.",
     "The update was unsuccessful." : "Pembaruan tidak berhasil",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index de9ef83abd5..79e90900d0f 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "Desember",
     "Settings" : "Pengaturan",
-    "File" : "Berkas",
-    "Folder" : "Folder",
-    "Image" : "gambar",
-    "Audio" : "Audio",
     "Saving..." : "Menyimpan...",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Sunting label",
     "Error loading dialog template: {error}" : "Galat memuat templat dialog: {error}",
     "No tags selected for deletion." : "Tidak ada label yang dipilih untuk dihapus.",
+    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "Memperbarui {productName} ke versi {version}, ini memerlukan waktu.",
     "Please reload the page." : "Silakan muat ulang halaman.",
     "The update was unsuccessful." : "Pembaruan tidak berhasil",
diff --git a/core/l10n/io.js b/core/l10n/io.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/io.js
+++ b/core/l10n/io.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/io.json b/core/l10n/io.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/io.json
+++ b/core/l10n/io.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 6fe19ee9db9..8f1f7d09eec 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "Nóvember",
     "December" : "Desember",
     "Settings" : "Stillingar",
-    "Folder" : "Mappa",
     "Saving..." : "Er að vista ...",
     "Reset password" : "Endursetja lykilorð",
     "No" : "Nei",
@@ -60,6 +59,7 @@ OC.L10N.register(
     "The object type is not specified." : "Tegund ekki tilgreind",
     "Delete" : "Eyða",
     "Add" : "Bæta við",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
     "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index 5f24eae33ac..ff69c133fa6 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -19,7 +19,6 @@
     "November" : "Nóvember",
     "December" : "Desember",
     "Settings" : "Stillingar",
-    "Folder" : "Mappa",
     "Saving..." : "Er að vista ...",
     "Reset password" : "Endursetja lykilorð",
     "No" : "Nei",
@@ -58,6 +57,7 @@
     "The object type is not specified." : "Tegund ekki tilgreind",
     "Delete" : "Eyða",
     "Add" : "Bæta við",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
     "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index d444a0a9fb7..6c5b2947022 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Novembre",
     "December" : "Dicembre",
     "Settings" : "Impostazioni",
-    "File" : "File",
-    "Folder" : "Cartella",
-    "Image" : "Immagine",
-    "Audio" : "Audio",
     "Saving..." : "Salvataggio in corso...",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Modifica etichette",
     "Error loading dialog template: {error}" : "Errore durante il caricamento del modello di finestra: {error}",
     "No tags selected for deletion." : "Nessuna etichetta selezionata per l'eliminazione.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
     "Please reload the page." : "Ricarica la pagina.",
     "The update was unsuccessful." : "L'aggiornamento non è riuscito.",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 2be5d0fcd44..8358bd13a78 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -32,10 +32,6 @@
     "November" : "Novembre",
     "December" : "Dicembre",
     "Settings" : "Impostazioni",
-    "File" : "File",
-    "Folder" : "Cartella",
-    "Image" : "Immagine",
-    "Audio" : "Audio",
     "Saving..." : "Salvataggio in corso...",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Modifica etichette",
     "Error loading dialog template: {error}" : "Errore durante il caricamento del modello di finestra: {error}",
     "No tags selected for deletion." : "Nessuna etichetta selezionata per l'eliminazione.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
     "Please reload the page." : "Ricarica la pagina.",
     "The update was unsuccessful." : "L'aggiornamento non è riuscito.",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index b84b14ef20c..3773e43227b 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "11月",
     "December" : "12月",
     "Settings" : "設定",
-    "File" : "ファイル",
-    "Folder" : "フォルダー",
-    "Image" : "画像",
-    "Audio" : "オーディオ",
     "Saving..." : "保存中...",
     "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>それでも見つからなかった場合は、管理者に問合せてください。",
@@ -67,8 +63,8 @@ OC.L10N.register(
     "So-so password" : "まずまずのパスワード",
     "Good password" : "良好なパスワード",
     "Strong password" : "強いパスワード",
-    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
-    "This server has no working internet connection. This means that some of the features like mounting 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." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースに問題があると思われるため、Webサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+    "This server has no working internet connection. This means that some of the features like mounting 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." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。すべての機能を利用したい場合は、このサーバーがインターネット接続できるようにすることをお勧めします。",
     "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
     "Shared" : "共有中",
     "Shared with {recipients}" : "{recipients} と共有",
@@ -89,7 +85,7 @@ OC.L10N.register(
     "Send" : "送信",
     "Set expiration date" : "有効期限を設定",
     "Expiration date" : "有効期限",
-    "Adding user..." : "ユーザー追加中...",
+    "Adding user..." : "ユーザーを追加しています...",
     "group" : "グループ",
     "Resharing is not allowed" : "再共有は許可されていません",
     "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "タグを編集",
     "Error loading dialog template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
     "No tags selected for deletion." : "削除するタグが選択されていません。",
+    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
     "Please reload the page." : "ページをリロードしてください。",
     "The update was unsuccessful." : "アップデートに失敗しました。",
@@ -151,6 +148,7 @@ OC.L10N.register(
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n",
     "The share will expire on %s." : "共有は %s で有効期限が切れます。",
     "Cheers!" : "それでは！",
+    "Internal Server Error" : "内部サーバエラー",
     "The server encountered an internal error and was unable to complete your request." : "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
     "More details can be found in the server log." : "詳しい情報は、サーバーのログを確認してください。",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index d5112b77df9..a1d9be4e721 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -32,10 +32,6 @@
     "November" : "11月",
     "December" : "12月",
     "Settings" : "設定",
-    "File" : "ファイル",
-    "Folder" : "フォルダー",
-    "Image" : "画像",
-    "Audio" : "オーディオ",
     "Saving..." : "保存中...",
     "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>それでも見つからなかった場合は、管理者に問合せてください。",
@@ -65,8 +61,8 @@
     "So-so password" : "まずまずのパスワード",
     "Good password" : "良好なパスワード",
     "Strong password" : "強いパスワード",
-    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースに問題があると思われるため、WEBサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
-    "This server has no working internet connection. This means that some of the features like mounting 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." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。全ての機能を利用したいのであれば、このサーバーからインターネットに接続できるようにすることをお勧めします。",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "WebDAVインターフェースに問題があると思われるため、Webサーバーはまだファイルの同期を許可するよう適切に設定されていません。",
+    "This server has no working internet connection. This means that some of the features like mounting 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." : "このサーバーはインターネットに接続していません。この場合、外部ストレージのマウント、更新の通知やサードパーティアプリといったいくつかの機能が使えません。また、リモート接続でのファイルアクセス、通知メールの送信と言った機能も利用できないかもしれません。すべての機能を利用したい場合は、このサーバーがインターネット接続できるようにすることをお勧めします。",
     "Error occurred while checking server setup" : "サーバー設定のチェック中にエラーが発生しました",
     "Shared" : "共有中",
     "Shared with {recipients}" : "{recipients} と共有",
@@ -87,7 +83,7 @@
     "Send" : "送信",
     "Set expiration date" : "有効期限を設定",
     "Expiration date" : "有効期限",
-    "Adding user..." : "ユーザー追加中...",
+    "Adding user..." : "ユーザーを追加しています...",
     "group" : "グループ",
     "Resharing is not allowed" : "再共有は許可されていません",
     "Shared in {item} with {user}" : "{item} 内で {user} と共有中",
@@ -112,6 +108,7 @@
     "Edit tags" : "タグを編集",
     "Error loading dialog template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
     "No tags selected for deletion." : "削除するタグが選択されていません。",
+    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
     "Please reload the page." : "ページをリロードしてください。",
     "The update was unsuccessful." : "アップデートに失敗しました。",
@@ -149,6 +146,7 @@
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "こんにちは、\n\n%s があなたと %s を共有したことをお知らせします。\nそれを表示: %s\n",
     "The share will expire on %s." : "共有は %s で有効期限が切れます。",
     "Cheers!" : "それでは！",
+    "Internal Server Error" : "内部サーバエラー",
     "The server encountered an internal error and was unable to complete your request." : "サーバー内でエラーが発生したため、リクエストを完了できませんでした。",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "このエラーが繰り返し表示されるようであれば、以下の技術情報を添付してサーバー管理者に報告してください。",
     "More details can be found in the server log." : "詳しい情報は、サーバーのログを確認してください。",
diff --git a/core/l10n/jv.js b/core/l10n/jv.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/jv.js
+++ b/core/l10n/jv.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/jv.json b/core/l10n/jv.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/jv.json
+++ b/core/l10n/jv.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index 98843464fd5..699065f6c50 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -21,8 +21,6 @@ OC.L10N.register(
     "November" : "ნოემბერი",
     "December" : "დეკემბერი",
     "Settings" : "პარამეტრები",
-    "Folder" : "საქაღალდე",
-    "Image" : "სურათი",
     "Saving..." : "შენახვა...",
     "Reset password" : "პაროლის შეცვლა",
     "No" : "არა",
@@ -64,6 +62,7 @@ OC.L10N.register(
     "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
     "Delete" : "წაშლა",
     "Add" : "დამატება",
+    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
     "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
     "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index ca45ac7076a..c7d8d774620 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -19,8 +19,6 @@
     "November" : "ნოემბერი",
     "December" : "დეკემბერი",
     "Settings" : "პარამეტრები",
-    "Folder" : "საქაღალდე",
-    "Image" : "სურათი",
     "Saving..." : "შენახვა...",
     "Reset password" : "პაროლის შეცვლა",
     "No" : "არა",
@@ -62,6 +60,7 @@
     "The object type is not specified." : "ობიექტის ტიპი არ არის მითითებული.",
     "Delete" : "წაშლა",
     "Add" : "დამატება",
+    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
     "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
     "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
diff --git a/core/l10n/km.js b/core/l10n/km.js
index 9a5f98d62ec..80b25cbe34c 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -23,7 +23,6 @@ OC.L10N.register(
     "November" : "ខែវិច្ឆិកា",
     "December" : "ខែធ្នូ",
     "Settings" : "ការកំណត់",
-    "Folder" : "ថត",
     "Saving..." : "កំពុង​រក្សាទុក",
     "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "No" : "ទេ",
@@ -73,6 +72,7 @@ OC.L10N.register(
     "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
     "Delete" : "លុប",
     "Add" : "បញ្ចូល",
+    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
diff --git a/core/l10n/km.json b/core/l10n/km.json
index 0dc4d605b23..50f693d3620 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -21,7 +21,6 @@
     "November" : "ខែវិច្ឆិកា",
     "December" : "ខែធ្នូ",
     "Settings" : "ការកំណត់",
-    "Folder" : "ថត",
     "Saving..." : "កំពុង​រក្សាទុក",
     "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "No" : "ទេ",
@@ -71,6 +70,7 @@
     "The object type is not specified." : "មិន​បាន​កំណត់​ប្រភេទ​វត្ថុ។",
     "Delete" : "លុប",
     "Add" : "បញ្ចូល",
+    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
     "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
diff --git a/core/l10n/kn.js b/core/l10n/kn.js
index 87077ecad97..49247f7174c 100644
--- a/core/l10n/kn.js
+++ b/core/l10n/kn.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : [""]
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "_download %n file_::_download %n files_" : [""]
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/kn.json b/core/l10n/kn.json
index c499f696550..1d746175292 100644
--- a/core/l10n/kn.json
+++ b/core/l10n/kn.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : [""]
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "_download %n file_::_download %n files_" : [""]
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index d727727cf9f..a4c637cec83 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -30,9 +30,6 @@ OC.L10N.register(
     "November" : "11월",
     "December" : "12월",
     "Settings" : "설정",
-    "File" : "파일",
-    "Folder" : "폴더",
-    "Image" : "그림",
     "Saving..." : "저장 중...",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
     "Reset password" : "암호 재설정",
@@ -101,6 +98,7 @@ OC.L10N.register(
     "Edit tags" : "태그 편집",
     "Error loading dialog template: {error}" : "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
     "No tags selected for deletion." : "삭제할 태그를 선택하지 않았습니다.",
+    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "페이지를 새로 고치십시오.",
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "%s password reset" : "%s 암호 재설정",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index 2ddffff685b..b068150f590 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -28,9 +28,6 @@
     "November" : "11월",
     "December" : "12월",
     "Settings" : "설정",
-    "File" : "파일",
-    "Folder" : "폴더",
-    "Image" : "그림",
     "Saving..." : "저장 중...",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
     "Reset password" : "암호 재설정",
@@ -99,6 +96,7 @@
     "Edit tags" : "태그 편집",
     "Error loading dialog template: {error}" : "대화 상자 템플릿을 불러오는 중 오류 발생: {error}",
     "No tags selected for deletion." : "삭제할 태그를 선택하지 않았습니다.",
+    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "페이지를 새로 고치십시오.",
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "%s password reset" : "%s 암호 재설정",
diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js
index 7e41b5614a9..7f249580986 100644
--- a/core/l10n/ku_IQ.js
+++ b/core/l10n/ku_IQ.js
@@ -2,7 +2,6 @@ OC.L10N.register(
     "core",
     {
     "Settings" : "ده‌ستكاری",
-    "Folder" : "بوخچه",
     "Saving..." : "پاشکه‌وتده‌کات...",
     "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "No" : "نەخێر",
@@ -13,6 +12,7 @@ OC.L10N.register(
     "Error" : "هه‌ڵه",
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "ناوی به‌کارهێنه‌ر",
     "New password" : "وشەی نهێنی نوێ",
     "Users" : "به‌كارهێنه‌ر",
diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json
index aa06ff50be6..2772a2895a2 100644
--- a/core/l10n/ku_IQ.json
+++ b/core/l10n/ku_IQ.json
@@ -1,6 +1,5 @@
 { "translations": {
     "Settings" : "ده‌ستكاری",
-    "Folder" : "بوخچه",
     "Saving..." : "پاشکه‌وتده‌کات...",
     "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "No" : "نەخێر",
@@ -11,6 +10,7 @@
     "Error" : "هه‌ڵه",
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "ناوی به‌کارهێنه‌ر",
     "New password" : "وشەی نهێنی نوێ",
     "Users" : "به‌كارهێنه‌ر",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index c5e76d21f53..90ceb4cd8b8 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -27,8 +27,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Astellungen",
-    "File" : "Fichier",
-    "Folder" : "Dossier",
     "Saving..." : "Speicheren...",
     "Reset password" : "Passwuert zréck setzen",
     "No" : "Nee",
@@ -78,6 +76,7 @@ OC.L10N.register(
     "Delete" : "Läschen",
     "Add" : "Dobäisetzen",
     "Edit tags" : "Tags editéieren",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
     "%s password reset" : "%s Passwuert ass nei gesat",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 58f01166dfd..9a1be1e4dd9 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -25,8 +25,6 @@
     "November" : "November",
     "December" : "Dezember",
     "Settings" : "Astellungen",
-    "File" : "Fichier",
-    "Folder" : "Dossier",
     "Saving..." : "Speicheren...",
     "Reset password" : "Passwuert zréck setzen",
     "No" : "Nee",
@@ -76,6 +74,7 @@
     "Delete" : "Läschen",
     "Add" : "Dobäisetzen",
     "Edit tags" : "Tags editéieren",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
     "%s password reset" : "%s Passwuert ass nei gesat",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index e407dcafa21..e3796940fbe 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -30,8 +30,6 @@ OC.L10N.register(
     "November" : "Lapkritis",
     "December" : "Gruodis",
     "Settings" : "Nustatymai",
-    "File" : "Failas",
-    "Folder" : "Katalogas",
     "Saving..." : "Saugoma...",
     "Reset password" : "Atkurti slaptažodį",
     "No" : "Ne",
@@ -91,6 +89,7 @@ OC.L10N.register(
     "Edit tags" : "Redaguoti žymes",
     "Error loading dialog template: {error}" : "Klaida įkeliant dialogo ruošinį: {error}",
     "No tags selected for deletion." : "Trynimui nepasirinkta jokia žymė.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Please reload the page." : "Prašome perkrauti puslapį.",
     "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
     "%s password reset" : "%s slaptažodžio atnaujinimas",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index 97dafb6fa00..a70b966aae2 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -28,8 +28,6 @@
     "November" : "Lapkritis",
     "December" : "Gruodis",
     "Settings" : "Nustatymai",
-    "File" : "Failas",
-    "Folder" : "Katalogas",
     "Saving..." : "Saugoma...",
     "Reset password" : "Atkurti slaptažodį",
     "No" : "Ne",
@@ -89,6 +87,7 @@
     "Edit tags" : "Redaguoti žymes",
     "Error loading dialog template: {error}" : "Klaida įkeliant dialogo ruošinį: {error}",
     "No tags selected for deletion." : "Trynimui nepasirinkta jokia žymė.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Please reload the page." : "Prašome perkrauti puslapį.",
     "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
     "%s password reset" : "%s slaptažodžio atnaujinimas",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index b075199d180..16bb3007e4c 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "Novembris",
     "December" : "Decembris",
     "Settings" : "Iestatījumi",
-    "Folder" : "Mape",
     "Saving..." : "Saglabā...",
     "Reset password" : "Mainīt paroli",
     "No" : "Nē",
@@ -65,6 +64,7 @@ OC.L10N.register(
     "The object type is not specified." : "Nav norādīts objekta tips.",
     "Delete" : "Dzēst",
     "Add" : "Pievienot",
+    "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
     "%s password reset" : "%s paroles maiņa",
     "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index a9eabfb9289..afeb3f82a17 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -19,7 +19,6 @@
     "November" : "Novembris",
     "December" : "Decembris",
     "Settings" : "Iestatījumi",
-    "Folder" : "Mape",
     "Saving..." : "Saglabā...",
     "Reset password" : "Mainīt paroli",
     "No" : "Nē",
@@ -63,6 +62,7 @@
     "The object type is not specified." : "Nav norādīts objekta tips.",
     "Delete" : "Dzēst",
     "Add" : "Pievienot",
+    "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
     "%s password reset" : "%s paroles maiņa",
     "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
diff --git a/core/l10n/mg.js b/core/l10n/mg.js
index bc4e6c6bc64..7aa65e3a52e 100644
--- a/core/l10n/mg.js
+++ b/core/l10n/mg.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/mg.json b/core/l10n/mg.json
index 4ebc0d2d45d..207d7753769 100644
--- a/core/l10n/mg.json
+++ b/core/l10n/mg.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index 1104f50f255..0b1e993a8f4 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -27,7 +27,6 @@ OC.L10N.register(
     "November" : "Ноември",
     "December" : "Декември",
     "Settings" : "Подесувања",
-    "Folder" : "Папка",
     "Saving..." : "Снимам...",
     "Reset password" : "Ресетирај лозинка",
     "No" : "Не",
@@ -83,6 +82,7 @@ OC.L10N.register(
     "Add" : "Додади",
     "Edit tags" : "Уреди ги таговите",
     "No tags selected for deletion." : "Не се селектирани тагови за бришење.",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
     "%s password reset" : "%s ресетирање на лозинката",
     "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 1301731bf95..2da6b74e601 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -25,7 +25,6 @@
     "November" : "Ноември",
     "December" : "Декември",
     "Settings" : "Подесувања",
-    "Folder" : "Папка",
     "Saving..." : "Снимам...",
     "Reset password" : "Ресетирај лозинка",
     "No" : "Не",
@@ -81,6 +80,7 @@
     "Add" : "Додади",
     "Edit tags" : "Уреди ги таговите",
     "No tags selected for deletion." : "Не се селектирани тагови за бришење.",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
     "%s password reset" : "%s ресетирање на лозинката",
     "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
diff --git a/core/l10n/ml.js b/core/l10n/ml.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/ml.js
+++ b/core/l10n/ml.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ml.json b/core/l10n/ml.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/ml.json
+++ b/core/l10n/ml.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ml_IN.js b/core/l10n/ml_IN.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/ml_IN.js
+++ b/core/l10n/ml_IN.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ml_IN.json b/core/l10n/ml_IN.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/ml_IN.json
+++ b/core/l10n/ml_IN.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/mn.js b/core/l10n/mn.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/mn.js
+++ b/core/l10n/mn.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/mn.json b/core/l10n/mn.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/mn.json
+++ b/core/l10n/mn.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"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 e59d7eafff5..612641fe748 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Disember",
     "Settings" : "Tetapan",
-    "Folder" : "Folder",
     "Saving..." : "Simpan...",
     "Reset password" : "Penetapan semula kata laluan",
     "No" : "Tidak",
@@ -37,6 +36,7 @@ OC.L10N.register(
     "Warning" : "Amaran",
     "Delete" : "Padam",
     "Add" : "Tambah",
+    "_download %n file_::_download %n files_" : [""],
     "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
     "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
     "Username" : "Nama pengguna",
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index 5a18fca03d4..c1323607c8c 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -19,7 +19,6 @@
     "November" : "November",
     "December" : "Disember",
     "Settings" : "Tetapan",
-    "Folder" : "Folder",
     "Saving..." : "Simpan...",
     "Reset password" : "Penetapan semula kata laluan",
     "No" : "Tidak",
@@ -35,6 +34,7 @@
     "Warning" : "Amaran",
     "Delete" : "Padam",
     "Add" : "Tambah",
+    "_download %n file_::_download %n files_" : [""],
     "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
     "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
     "Username" : "Nama pengguna",
diff --git a/core/l10n/mt_MT.js b/core/l10n/mt_MT.js
index 67c2c3e89fc..221423de6a8 100644
--- a/core/l10n/mt_MT.js
+++ b/core/l10n/mt_MT.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "_download %n file_::_download %n files_" : ["","","",""]
 },
 "nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);");
diff --git a/core/l10n/mt_MT.json b/core/l10n/mt_MT.json
index 3a66955ce40..a1e10262d15 100644
--- a/core/l10n/mt_MT.json
+++ b/core/l10n/mt_MT.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["","","",""],
+    "_download %n file_::_download %n files_" : ["","","",""]
 },"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);"
 }
\ No newline at end of file
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index 22634059032..ff87f52a5e2 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -27,6 +27,7 @@ OC.L10N.register(
     "delete" : "ဖျက်မည်",
     "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
+    "_download %n file_::_download %n files_" : [""],
     "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
     "Username" : "သုံးစွဲသူအမည်",
     "New password" : "စကားဝှက်အသစ်",
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index f1cf06aa7bf..086e14cdad0 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -25,6 +25,7 @@
     "delete" : "ဖျက်မည်",
     "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
+    "_download %n file_::_download %n files_" : [""],
     "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
     "Username" : "သုံးစွဲသူအမည်",
     "New password" : "စကားဝှက်အသစ်",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index b9002240d49..a033c38aa77 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Desember",
     "Settings" : "Innstillinger",
-    "File" : "Fil",
-    "Folder" : "Mappe",
-    "Image" : "Bilde",
-    "Audio" : "Audio",
     "Saving..." : "Lagrer...",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Rediger merkelapper",
     "Error loading dialog template: {error}" : "Feil ved lasting av dialogmal: {error}",
     "No tags selected for deletion." : "Ingen merkelapper valgt for sletting.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
     "Please reload the page." : "Vennligst last siden på nytt.",
     "The update was unsuccessful." : "Oppdateringen var vellykket.",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index efc4c5babb4..9ad2c468000 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "Desember",
     "Settings" : "Innstillinger",
-    "File" : "Fil",
-    "Folder" : "Mappe",
-    "Image" : "Bilde",
-    "Audio" : "Audio",
     "Saving..." : "Lagrer...",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Rediger merkelapper",
     "Error loading dialog template: {error}" : "Feil ved lasting av dialogmal: {error}",
     "No tags selected for deletion." : "Ingen merkelapper valgt for sletting.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Oppdaterer {productName} til versjon {version}. Dette kan ta litt tid.",
     "Please reload the page." : "Vennligst last siden på nytt.",
     "The update was unsuccessful." : "Oppdateringen var vellykket.",
diff --git a/core/l10n/nds.js b/core/l10n/nds.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/nds.js
+++ b/core/l10n/nds.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/nds.json b/core/l10n/nds.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/nds.json
+++ b/core/l10n/nds.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ne.js b/core/l10n/ne.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/ne.js
+++ b/core/l10n/ne.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ne.json b/core/l10n/ne.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/ne.json
+++ b/core/l10n/ne.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index df638124f77..79d957c939b 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "november",
     "December" : "december",
     "Settings" : "Instellingen",
-    "File" : "Bestand",
-    "Folder" : "Map",
-    "Image" : "Afbeelding",
-    "Audio" : "Audio",
     "Saving..." : "Opslaan",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Bewerken tags",
     "Error loading dialog template: {error}" : "Fout bij laden dialoog sjabloon: {error}",
     "No tags selected for deletion." : "Geen tags geselecteerd voor verwijdering.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
     "Please reload the page." : "Herlaad deze pagina.",
     "The update was unsuccessful." : "De update is niet geslaagd.",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index a25e8c5d50e..f4aff498a2d 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -32,10 +32,6 @@
     "November" : "november",
     "December" : "december",
     "Settings" : "Instellingen",
-    "File" : "Bestand",
-    "Folder" : "Map",
-    "Image" : "Afbeelding",
-    "Audio" : "Audio",
     "Saving..." : "Opslaan",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Bewerken tags",
     "Error loading dialog template: {error}" : "Fout bij laden dialoog sjabloon: {error}",
     "No tags selected for deletion." : "Geen tags geselecteerd voor verwijdering.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
     "Please reload the page." : "Herlaad deze pagina.",
     "The update was unsuccessful." : "De update is niet geslaagd.",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index ed4f66d57df..d6ba6612f0e 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -5,11 +5,11 @@ OC.L10N.register(
     "Turned on maintenance mode" : "Skrudde på vedlikehaldsmodus",
     "Turned off maintenance mode" : "Skrudde av vedlikehaldsmodus",
     "Updated database" : "Database oppdatert",
-    "No image or file provided" : "Inga bilete eller fil gitt",
+    "No image or file provided" : "Inga bilete eller fil gjeve",
     "Unknown filetype" : "Ukjend filtype",
     "Invalid image" : "Ugyldig bilete",
     "No temporary profile picture available, try again" : "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
-    "No crop data provided" : "Ingen beskjeringsdata gitt",
+    "No crop data provided" : "Ingen beskjeringsdata gjeve",
     "Sunday" : "Søndag",
     "Monday" : "Måndag",
     "Tuesday" : "Tysdag",
@@ -30,7 +30,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "Desember",
     "Settings" : "Innstillingar",
-    "Folder" : "Mappe",
     "Saving..." : "Lagrar …",
     "I know what I'm doing" : "Eg veit kva eg gjer",
     "Reset password" : "Nullstill passord",
@@ -88,6 +87,7 @@ OC.L10N.register(
     "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
     "Delete" : "Slett",
     "Add" : "Legg til",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
     "%s password reset" : "%s passordnullstilling",
     "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index a4be2d9acee..7c1bbc858f4 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -3,11 +3,11 @@
     "Turned on maintenance mode" : "Skrudde på vedlikehaldsmodus",
     "Turned off maintenance mode" : "Skrudde av vedlikehaldsmodus",
     "Updated database" : "Database oppdatert",
-    "No image or file provided" : "Inga bilete eller fil gitt",
+    "No image or file provided" : "Inga bilete eller fil gjeve",
     "Unknown filetype" : "Ukjend filtype",
     "Invalid image" : "Ugyldig bilete",
     "No temporary profile picture available, try again" : "Inga midlertidig profilbilete tilgjengeleg, prøv igjen",
-    "No crop data provided" : "Ingen beskjeringsdata gitt",
+    "No crop data provided" : "Ingen beskjeringsdata gjeve",
     "Sunday" : "Søndag",
     "Monday" : "Måndag",
     "Tuesday" : "Tysdag",
@@ -28,7 +28,6 @@
     "November" : "November",
     "December" : "Desember",
     "Settings" : "Innstillingar",
-    "Folder" : "Mappe",
     "Saving..." : "Lagrar …",
     "I know what I'm doing" : "Eg veit kva eg gjer",
     "Reset password" : "Nullstill passord",
@@ -86,6 +85,7 @@
     "The object type is not specified." : "Objekttypen er ikkje spesifisert.",
     "Delete" : "Slett",
     "Add" : "Legg til",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
     "%s password reset" : "%s passordnullstilling",
     "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
diff --git a/core/l10n/nqo.js b/core/l10n/nqo.js
index 87077ecad97..49247f7174c 100644
--- a/core/l10n/nqo.js
+++ b/core/l10n/nqo.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : [""]
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "_download %n file_::_download %n files_" : [""]
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/nqo.json b/core/l10n/nqo.json
index c499f696550..1d746175292 100644
--- a/core/l10n/nqo.json
+++ b/core/l10n/nqo.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : [""]
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "_download %n file_::_download %n files_" : [""]
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index 42d1151455d..43fee792602 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "Novembre",
     "December" : "Decembre",
     "Settings" : "Configuracion",
-    "Folder" : "Dorsièr",
     "Saving..." : "Enregistra...",
     "Reset password" : "Senhal tornat botar",
     "No" : "Non",
@@ -51,6 +50,7 @@ OC.L10N.register(
     "Error setting expiration date" : "Error setting expiration date",
     "Delete" : "Escafa",
     "Add" : "Ajusta",
+    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
     "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
     "Username" : "Non d'usancièr",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index 4faa8cd0be1..c2068151419 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -19,7 +19,6 @@
     "November" : "Novembre",
     "December" : "Decembre",
     "Settings" : "Configuracion",
-    "Folder" : "Dorsièr",
     "Saving..." : "Enregistra...",
     "Reset password" : "Senhal tornat botar",
     "No" : "Non",
@@ -49,6 +48,7 @@
     "Error setting expiration date" : "Error setting expiration date",
     "Delete" : "Escafa",
     "Add" : "Ajusta",
+    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
     "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
     "Username" : "Non d'usancièr",
diff --git a/core/l10n/or_IN.js b/core/l10n/or_IN.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/or_IN.js
+++ b/core/l10n/or_IN.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/or_IN.json b/core/l10n/or_IN.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/or_IN.json
+++ b/core/l10n/or_IN.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
index 8be57366967..63933496c0c 100644
--- a/core/l10n/pa.js
+++ b/core/l10n/pa.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Send" : "ਭੇਜੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
     "Password" : "ਪਾਸਵਰ"
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
index d801809d018..6b1259ba9cc 100644
--- a/core/l10n/pa.json
+++ b/core/l10n/pa.json
@@ -31,6 +31,7 @@
     "Send" : "ਭੇਜੋ",
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
     "Password" : "ਪਾਸਵਰ"
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index c330e002863..57b18d457c3 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Listopad",
     "December" : "Grudzień",
     "Settings" : "Ustawienia",
-    "File" : "Plik",
-    "Folder" : "Folder",
-    "Image" : "Obraz",
-    "Audio" : "Dźwięk",
     "Saving..." : "Zapisywanie...",
     "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.",
@@ -113,6 +109,7 @@ OC.L10N.register(
     "Edit tags" : "Edytuj tagi",
     "Error loading dialog template: {error}" : "Błąd podczas ładowania szablonu dialogu: {error}",
     "No tags selected for deletion." : "Nie zaznaczono tagów do usunięcia.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
     "Please reload the page." : "Proszę przeładować stronę",
     "The update was unsuccessful." : "Aktualizacja nie powiodła się.",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index ccfa0685c2a..f6c0615fc4e 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -32,10 +32,6 @@
     "November" : "Listopad",
     "December" : "Grudzień",
     "Settings" : "Ustawienia",
-    "File" : "Plik",
-    "Folder" : "Folder",
-    "Image" : "Obraz",
-    "Audio" : "Dźwięk",
     "Saving..." : "Zapisywanie...",
     "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.",
@@ -111,6 +107,7 @@
     "Edit tags" : "Edytuj tagi",
     "Error loading dialog template: {error}" : "Błąd podczas ładowania szablonu dialogu: {error}",
     "No tags selected for deletion." : "Nie zaznaczono tagów do usunięcia.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuję {productName} do wersji {version}, to może chwilę potrwać.",
     "Please reload the page." : "Proszę przeładować stronę",
     "The update was unsuccessful." : "Aktualizacja nie powiodła się.",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 0ec3aa08f20..fd71e84344c 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Novembro",
     "December" : "Dezembro",
     "Settings" : "Configurações",
-    "File" : "Arquivo",
-    "Folder" : "Pasta",
-    "Image" : "Imagem",
-    "Audio" : "Audio",
     "Saving..." : "Salvando...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Editar etiqueta",
     "Error loading dialog template: {error}" : "Erro carregando diálogo de formatação: {error}",
     "No tags selected for deletion." : "Nenhuma etiqueta selecionada para deleção.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
     "Please reload the page." : "Por favor recarregue a página",
     "The update was unsuccessful." : "A atualização não foi bem sucedida.",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index f3a23935723..5d0b17181d1 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -32,10 +32,6 @@
     "November" : "Novembro",
     "December" : "Dezembro",
     "Settings" : "Configurações",
-    "File" : "Arquivo",
-    "Folder" : "Pasta",
-    "Image" : "Imagem",
-    "Audio" : "Audio",
     "Saving..." : "Salvando...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição. Por favor, contate o administrador.",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Editar etiqueta",
     "Error loading dialog template: {error}" : "Erro carregando diálogo de formatação: {error}",
     "No tags selected for deletion." : "Nenhuma etiqueta selecionada para deleção.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
     "Please reload the page." : "Por favor recarregue a página",
     "The update was unsuccessful." : "A atualização não foi bem sucedida.",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 416a593cdcd..58ec068e69e 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Novembro",
     "December" : "Dezembro",
     "Settings" : "Configurações",
-    "File" : "Ficheiro",
-    "Folder" : "Pasta",
-    "Image" : "Imagem",
-    "Audio" : "Audio",
     "Saving..." : "A guardar...",
     "Couldn't send reset email. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Erro ao carregar modelo de diálogo: {error}",
     "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 5d2de169e32..694c9a4fa26 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -32,10 +32,6 @@
     "November" : "Novembro",
     "December" : "Dezembro",
     "Settings" : "Configurações",
-    "File" : "Ficheiro",
-    "Folder" : "Pasta",
-    "Image" : "Imagem",
-    "Audio" : "Audio",
     "Saving..." : "A guardar...",
     "Couldn't send reset email. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Erro ao carregar modelo de diálogo: {error}",
     "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index bf1eb72942f..8c48c440460 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -29,10 +29,6 @@ OC.L10N.register(
     "November" : "Noiembrie",
     "December" : "Decembrie",
     "Settings" : "Setări",
-    "File" : "Fişier ",
-    "Folder" : "Dosar",
-    "Image" : "Imagine",
-    "Audio" : "Audio",
     "Saving..." : "Se salvează...",
     "I know what I'm doing" : "Eu știu ce fac",
     "Reset password" : "Resetează parola",
@@ -91,6 +87,7 @@ OC.L10N.register(
     "Enter new" : "Introducere nou",
     "Delete" : "Șterge",
     "Add" : "Adaugă",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
     "Please reload the page." : "Te rugăm să reîncarci pagina.",
     "The update was unsuccessful." : "Actualizare eșuată.",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index c8089bd5baf..137a0bc7a52 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -27,10 +27,6 @@
     "November" : "Noiembrie",
     "December" : "Decembrie",
     "Settings" : "Setări",
-    "File" : "Fişier ",
-    "Folder" : "Dosar",
-    "Image" : "Imagine",
-    "Audio" : "Audio",
     "Saving..." : "Se salvează...",
     "I know what I'm doing" : "Eu știu ce fac",
     "Reset password" : "Resetează parola",
@@ -89,6 +85,7 @@
     "Enter new" : "Introducere nou",
     "Delete" : "Șterge",
     "Add" : "Adaugă",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Se actualizează {productName} la versiunea {version}, poate dura câteva momente.",
     "Please reload the page." : "Te rugăm să reîncarci pagina.",
     "The update was unsuccessful." : "Actualizare eșuată.",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 2e3c566bf43..139ab56b28d 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Ноябрь",
     "December" : "Декабрь",
     "Settings" : "Настройки",
-    "File" : "Файл",
-    "Folder" : "Каталог",
-    "Image" : "Изображение",
-    "Audio" : "Аудио",
     "Saving..." : "Сохранение...",
     "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>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Изменить метки",
     "Error loading dialog template: {error}" : "Ошибка загрузки шаблона диалога: {error}",
     "No tags selected for deletion." : "Не выбраны метки для удаления.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Обновление {productName} до версии {version}, пожалуйста, подождите.",
     "Please reload the page." : "Пожалуйста, перезагрузите страницу.",
     "The update was unsuccessful." : "Обновление не удалось.",
@@ -151,6 +148,7 @@ OC.L10N.register(
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здравствуйте,\n\n%s предоставил Вам доступ к %s.\nПосмотреть: %s\n\n",
     "The share will expire on %s." : "Доступ будет закрыт %s",
     "Cheers!" : "Удачи!",
+    "Internal Server Error" : "Внутренняя ошибка сервера",
     "The server encountered an internal error and was unable to complete your request." : "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
     "More details can be found in the server log." : "Больше деталей может быть найдено в журнале сервера.",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 719a0cc1027..6f953759740 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -32,10 +32,6 @@
     "November" : "Ноябрь",
     "December" : "Декабрь",
     "Settings" : "Настройки",
-    "File" : "Файл",
-    "Folder" : "Каталог",
-    "Image" : "Изображение",
-    "Audio" : "Аудио",
     "Saving..." : "Сохранение...",
     "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>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Изменить метки",
     "Error loading dialog template: {error}" : "Ошибка загрузки шаблона диалога: {error}",
     "No tags selected for deletion." : "Не выбраны метки для удаления.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Обновление {productName} до версии {version}, пожалуйста, подождите.",
     "Please reload the page." : "Пожалуйста, перезагрузите страницу.",
     "The update was unsuccessful." : "Обновление не удалось.",
@@ -149,6 +146,7 @@
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Здравствуйте,\n\n%s предоставил Вам доступ к %s.\nПосмотреть: %s\n\n",
     "The share will expire on %s." : "Доступ будет закрыт %s",
     "Cheers!" : "Удачи!",
+    "Internal Server Error" : "Внутренняя ошибка сервера",
     "The server encountered an internal error and was unable to complete your request." : "Сервер столкнулся с внутренней ошибкой и не смог закончить Ваш запрос.",
     "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Пожалуйста, свяжитесь с администратором сервера, если эта ошибка будет снова появляться, пожалуйста, прикрепите технические детали к своему сообщению.",
     "More details can be found in the server log." : "Больше деталей может быть найдено в журнале сервера.",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index 63edcfb6065..3a9978aea85 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -21,8 +21,6 @@ OC.L10N.register(
     "November" : "නොවැම්බර්",
     "December" : "දෙසැම්බර්",
     "Settings" : "සිටුවම්",
-    "Folder" : "ෆෝල්ඩරය",
-    "Image" : "පින්තූරය",
     "Saving..." : "සුරැකෙමින් පවතී...",
     "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "No" : "එපා",
@@ -49,6 +47,7 @@ OC.L10N.register(
     "Warning" : "අවවාදය",
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
+    "_download %n file_::_download %n files_" : ["",""],
     "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
     "Username" : "පරිශීලක නම",
     "New password" : "නව මුරපදය",
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index f04c86b9898..112e6eb5014 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -19,8 +19,6 @@
     "November" : "නොවැම්බර්",
     "December" : "දෙසැම්බර්",
     "Settings" : "සිටුවම්",
-    "Folder" : "ෆෝල්ඩරය",
-    "Image" : "පින්තූරය",
     "Saving..." : "සුරැකෙමින් පවතී...",
     "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "No" : "එපා",
@@ -47,6 +45,7 @@
     "Warning" : "අවවාදය",
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
+    "_download %n file_::_download %n files_" : ["",""],
     "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
     "Username" : "පරිශීලක නම",
     "New password" : "නව මුරපදය",
diff --git a/core/l10n/sk.js b/core/l10n/sk.js
new file mode 100644
index 00000000000..6a57266201e
--- /dev/null
+++ b/core/l10n/sk.js
@@ -0,0 +1,31 @@
+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",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "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
new file mode 100644
index 00000000000..3eb33e886af
--- /dev/null
+++ b/core/l10n/sk.json
@@ -0,0 +1,29 @@
+{ "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",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "Cancel" : "Zrušiť",
+    "Share" : "Zdieľať",
+    "group" : "skupina",
+    "Delete" : "Odstrániť",
+    "Personal" : "Osobné"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 10da03f7667..e4648f78151 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "December",
     "Settings" : "Nastavenia",
-    "File" : "Súbor",
-    "Folder" : "Priečinok",
-    "Image" : "Obrázok",
-    "Audio" : "Zvuk",
     "Saving..." : "Ukladám...",
     "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
     "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.",
@@ -112,6 +108,7 @@ OC.L10N.register(
     "Edit tags" : "Upraviť štítky",
     "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
     "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
     "Please reload the page." : "Obnovte prosím stránku.",
     "The update was unsuccessful." : "Aktualizácia zlyhala.",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index 0a964f375e4..a5c883a0bb3 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -32,10 +32,6 @@
     "November" : "November",
     "December" : "December",
     "Settings" : "Nastavenia",
-    "File" : "Súbor",
-    "Folder" : "Priečinok",
-    "Image" : "Obrázok",
-    "Audio" : "Zvuk",
     "Saving..." : "Ukladám...",
     "Couldn't send reset email. Please contact your administrator." : "Nemožno poslať email pre obnovu. Kontaktujte prosím vášho administrátora.",
     "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.",
@@ -110,6 +106,7 @@
     "Edit tags" : "Upraviť štítky",
     "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
     "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
     "Please reload the page." : "Obnovte prosím stránku.",
     "The update was unsuccessful." : "Aktualizácia zlyhala.",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index d790db499fb..b60e8952b71 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "november",
     "December" : "december",
     "Settings" : "Nastavitve",
-    "File" : "Datoteka",
-    "Folder" : "Mapa",
-    "Image" : "Slika",
-    "Audio" : "Zvok",
     "Saving..." : "Poteka shranjevanje ...",
     "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Uredi oznake",
     "Error loading dialog template: {error}" : "Napaka nalaganja predloge pogovornega okna: {error}",
     "No tags selected for deletion." : "Ni izbranih oznak za izbris.",
+    "_download %n file_::_download %n files_" : ["","","",""],
     "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
     "Please reload the page." : "Stran je treba ponovno naložiti",
     "The update was unsuccessful." : "Posodobitev je spodletela",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index 17f5216d872..5636d2794ec 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -32,10 +32,6 @@
     "November" : "november",
     "December" : "december",
     "Settings" : "Nastavitve",
-    "File" : "Datoteka",
-    "Folder" : "Mapa",
-    "Image" : "Slika",
-    "Audio" : "Zvok",
     "Saving..." : "Poteka shranjevanje ...",
     "Couldn't send reset email. Please contact your administrator." : "Ni mogoče nastaviti elektronskega naslova za ponastavitev. Stopite v stik s skrbnikom sistema.",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Uredi oznake",
     "Error loading dialog template: {error}" : "Napaka nalaganja predloge pogovornega okna: {error}",
     "No tags selected for deletion." : "Ni izbranih oznak za izbris.",
+    "_download %n file_::_download %n files_" : ["","","",""],
     "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
     "Please reload the page." : "Stran je treba ponovno naložiti",
     "The update was unsuccessful." : "Posodobitev je spodletela",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index 525359304ed..9dd27342905 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -24,7 +24,6 @@ OC.L10N.register(
     "November" : "Nëntor",
     "December" : "Dhjetor",
     "Settings" : "Parametra",
-    "Folder" : "Dosje",
     "Saving..." : "Duke ruajtur...",
     "Reset password" : "Rivendos kodin",
     "No" : "Jo",
@@ -66,6 +65,7 @@ OC.L10N.register(
     "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
     "Delete" : "Elimino",
     "Add" : "Shto",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
     "%s password reset" : "Kodi i %s -it u rivendos",
     "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index d9850c8ab5a..72230681a4e 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -22,7 +22,6 @@
     "November" : "Nëntor",
     "December" : "Dhjetor",
     "Settings" : "Parametra",
-    "Folder" : "Dosje",
     "Saving..." : "Duke ruajtur...",
     "Reset password" : "Rivendos kodin",
     "No" : "Jo",
@@ -64,6 +63,7 @@
     "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
     "Delete" : "Elimino",
     "Add" : "Shto",
+    "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
     "%s password reset" : "Kodi i %s -it u rivendos",
     "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index f8576df9d50..5e2c8354261 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "Новембар",
     "December" : "Децембар",
     "Settings" : "Поставке",
-    "Folder" : "фасцикла",
     "Saving..." : "Чување у току...",
     "Reset password" : "Ресетуј лозинку",
     "No" : "Не",
@@ -60,6 +59,7 @@ OC.L10N.register(
     "The object type is not specified." : "Врста објекта није подешена.",
     "Delete" : "Обриши",
     "Add" : "Додај",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
     "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
     "Username" : "Корисничко име",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index 998deee1988..bfd13040906 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -19,7 +19,6 @@
     "November" : "Новембар",
     "December" : "Децембар",
     "Settings" : "Поставке",
-    "Folder" : "фасцикла",
     "Saving..." : "Чување у току...",
     "Reset password" : "Ресетуј лозинку",
     "No" : "Не",
@@ -58,6 +57,7 @@
     "The object type is not specified." : "Врста објекта није подешена.",
     "Delete" : "Обриши",
     "Add" : "Додај",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
     "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
     "Username" : "Корисничко име",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 9ea14c5db68..11c3d2e40a7 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -21,9 +21,6 @@ OC.L10N.register(
     "November" : "Novembar",
     "December" : "Decembar",
     "Settings" : "Podešavanja",
-    "File" : "Fajl",
-    "Folder" : "Direktorijum",
-    "Image" : "Slika",
     "I know what I'm doing" : "Znam šta radim",
     "Reset password" : "Resetuj lozinku",
     "No" : "Ne",
@@ -69,6 +66,7 @@ OC.L10N.register(
     "The object type is not specified." : "Tip objekta nije zadan.",
     "Delete" : "Obriši",
     "Add" : "Dodaj",
+    "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
     "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
     "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index aea1e83a2ed..a358f57d028 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -19,9 +19,6 @@
     "November" : "Novembar",
     "December" : "Decembar",
     "Settings" : "Podešavanja",
-    "File" : "Fajl",
-    "Folder" : "Direktorijum",
-    "Image" : "Slika",
     "I know what I'm doing" : "Znam šta radim",
     "Reset password" : "Resetuj lozinku",
     "No" : "Ne",
@@ -67,6 +64,7 @@
     "The object type is not specified." : "Tip objekta nije zadan.",
     "Delete" : "Obriši",
     "Add" : "Dodaj",
+    "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
     "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
     "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
diff --git a/core/l10n/su.js b/core/l10n/su.js
index 87077ecad97..49247f7174c 100644
--- a/core/l10n/su.js
+++ b/core/l10n/su.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : [""]
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "_download %n file_::_download %n files_" : [""]
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/su.json b/core/l10n/su.json
index c499f696550..1d746175292 100644
--- a/core/l10n/su.json
+++ b/core/l10n/su.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : [""]
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "_download %n file_::_download %n files_" : [""]
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index 634e9c6bc22..c0066471dc0 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -32,10 +32,6 @@ OC.L10N.register(
     "November" : "November",
     "December" : "December",
     "Settings" : "Inställningar",
-    "File" : "Fil",
-    "Folder" : "Mapp",
-    "Image" : "Bild",
-    "Audio" : "Ljud",
     "Saving..." : "Sparar...",
     "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.",
@@ -112,6 +108,7 @@ OC.L10N.register(
     "Edit tags" : "Editera taggar",
     "Error loading dialog template: {error}" : "Fel under laddning utav dialog mall: {fel}",
     "No tags selected for deletion." : "Inga taggar valda för borttagning.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
     "Please reload the page." : "Vänligen ladda om sidan.",
     "The update was unsuccessful." : "Uppdateringen misslyckades.",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index a7108b44fcd..82a228565e3 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -30,10 +30,6 @@
     "November" : "November",
     "December" : "December",
     "Settings" : "Inställningar",
-    "File" : "Fil",
-    "Folder" : "Mapp",
-    "Image" : "Bild",
-    "Audio" : "Ljud",
     "Saving..." : "Sparar...",
     "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.",
@@ -110,6 +106,7 @@
     "Edit tags" : "Editera taggar",
     "Error loading dialog template: {error}" : "Fel under laddning utav dialog mall: {fel}",
     "No tags selected for deletion." : "Inga taggar valda för borttagning.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Uppdaterar {productName} till version {version}, detta kan ta en stund.",
     "Please reload the page." : "Vänligen ladda om sidan.",
     "The update was unsuccessful." : "Uppdateringen misslyckades.",
diff --git a/core/l10n/sw_KE.js b/core/l10n/sw_KE.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/sw_KE.js
+++ b/core/l10n/sw_KE.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sw_KE.json b/core/l10n/sw_KE.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/sw_KE.json
+++ b/core/l10n/sw_KE.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ta_IN.js b/core/l10n/ta_IN.js
index eaa7584de0e..53edc3b48be 100644
--- a/core/l10n/ta_IN.js
+++ b/core/l10n/ta_IN.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Settings" : "அமைப்புகள்",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Send" : "அனுப்பவும்"
+    "Send" : "அனுப்பவும்",
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ta_IN.json b/core/l10n/ta_IN.json
index 0bfa5f4eed1..97d32e4c189 100644
--- a/core/l10n/ta_IN.json
+++ b/core/l10n/ta_IN.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Settings" : "அமைப்புகள்",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Send" : "அனுப்பவும்"
+    "Send" : "அனுப்பவும்",
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index af71be68cfa..520feac8871 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "கார்த்திகை",
     "December" : "மார்கழி",
     "Settings" : "அமைப்புகள்",
-    "Folder" : "கோப்புறை",
     "Saving..." : "சேமிக்கப்படுகிறது...",
     "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "No" : "இல்லை",
@@ -56,6 +55,7 @@ OC.L10N.register(
     "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
     "Delete" : "நீக்குக",
     "Add" : "சேர்க்க",
+    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
     "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
     "Username" : "பயனாளர் பெயர்",
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 079bdb64147..41cdfe8281a 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -19,7 +19,6 @@
     "November" : "கார்த்திகை",
     "December" : "மார்கழி",
     "Settings" : "அமைப்புகள்",
-    "Folder" : "கோப்புறை",
     "Saving..." : "சேமிக்கப்படுகிறது...",
     "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "No" : "இல்லை",
@@ -54,6 +53,7 @@
     "The object type is not specified." : "பொருள் வகை குறிப்பிடப்படவில்லை.",
     "Delete" : "நீக்குக",
     "Add" : "சேர்க்க",
+    "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
     "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
     "Username" : "பயனாளர் பெயர்",
diff --git a/core/l10n/te.js b/core/l10n/te.js
index e6490dc40f7..37dfe005efe 100644
--- a/core/l10n/te.js
+++ b/core/l10n/te.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "నవంబర్",
     "December" : "డిసెంబర్",
     "Settings" : "అమరికలు",
-    "Folder" : "సంచయం",
     "No" : "కాదు",
     "Yes" : "అవును",
     "Ok" : "సరే",
@@ -35,6 +34,7 @@ OC.L10N.register(
     "Warning" : "హెచ్చరిక",
     "Delete" : "తొలగించు",
     "Add" : "చేర్చు",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "వాడుకరి పేరు",
     "New password" : "కొత్త సంకేతపదం",
     "Personal" : "వ్యక్తిగతం",
diff --git a/core/l10n/te.json b/core/l10n/te.json
index e3bd9a50496..d8224f5ffa1 100644
--- a/core/l10n/te.json
+++ b/core/l10n/te.json
@@ -19,7 +19,6 @@
     "November" : "నవంబర్",
     "December" : "డిసెంబర్",
     "Settings" : "అమరికలు",
-    "Folder" : "సంచయం",
     "No" : "కాదు",
     "Yes" : "అవును",
     "Ok" : "సరే",
@@ -33,6 +32,7 @@
     "Warning" : "హెచ్చరిక",
     "Delete" : "తొలగించు",
     "Add" : "చేర్చు",
+    "_download %n file_::_download %n files_" : ["",""],
     "Username" : "వాడుకరి పేరు",
     "New password" : "కొత్త సంకేతపదం",
     "Personal" : "వ్యక్తిగతం",
diff --git a/core/l10n/tg_TJ.js b/core/l10n/tg_TJ.js
index c483b4ab65d..5b92c594ac0 100644
--- a/core/l10n/tg_TJ.js
+++ b/core/l10n/tg_TJ.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/tg_TJ.json b/core/l10n/tg_TJ.json
index 52ecaf565a9..d2c1f43f96e 100644
--- a/core/l10n/tg_TJ.json
+++ b/core/l10n/tg_TJ.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"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 25203866731..7b65977d950 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -21,8 +21,6 @@ OC.L10N.register(
     "November" : "พฤศจิกายน",
     "December" : "ธันวาคม",
     "Settings" : "ตั้งค่า",
-    "Folder" : "แฟ้มเอกสาร",
-    "Image" : "รูปภาพ",
     "Saving..." : "กำลังบันทึกข้อมูล...",
     "Reset password" : "เปลี่ยนรหัสผ่าน",
     "No" : "ไม่ตกลง",
@@ -64,6 +62,7 @@ OC.L10N.register(
     "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
     "Delete" : "ลบ",
     "Add" : "เพิ่ม",
+    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
     "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index 94c2c6f0c62..12457e67752 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -19,8 +19,6 @@
     "November" : "พฤศจิกายน",
     "December" : "ธันวาคม",
     "Settings" : "ตั้งค่า",
-    "Folder" : "แฟ้มเอกสาร",
-    "Image" : "รูปภาพ",
     "Saving..." : "กำลังบันทึกข้อมูล...",
     "Reset password" : "เปลี่ยนรหัสผ่าน",
     "No" : "ไม่ตกลง",
@@ -62,6 +60,7 @@
     "The object type is not specified." : "ชนิดของวัตถุยังไม่ได้รับการระบุ",
     "Delete" : "ลบ",
     "Add" : "เพิ่ม",
+    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
     "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
diff --git a/core/l10n/tl_PH.js b/core/l10n/tl_PH.js
index bc4e6c6bc64..7aa65e3a52e 100644
--- a/core/l10n/tl_PH.js
+++ b/core/l10n/tl_PH.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/core/l10n/tl_PH.json b/core/l10n/tl_PH.json
index 4ebc0d2d45d..207d7753769 100644
--- a/core/l10n/tl_PH.json
+++ b/core/l10n/tl_PH.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index 607d766c3fa..aa49a4a0fb5 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Kasım",
     "December" : "Aralık",
     "Settings" : "Ayarlar",
-    "File" : "Dosya",
-    "Folder" : "Klasör",
-    "Image" : "Resim",
-    "Audio" : "Ses",
     "Saving..." : "Kaydediliyor...",
     "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "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.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Etiketleri düzenle",
     "Error loading dialog template: {error}" : "İletişim şablonu yüklenirken hata: {error}",
     "No tags selected for deletion." : "Silmek için bir etiket seçilmedi.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
     "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
     "The update was unsuccessful." : "Güncelleme başarısız oldu.",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 51e08e3c722..24affb2ef36 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -32,10 +32,6 @@
     "November" : "Kasım",
     "December" : "Aralık",
     "Settings" : "Ayarlar",
-    "File" : "Dosya",
-    "Folder" : "Klasör",
-    "Image" : "Resim",
-    "Audio" : "Ses",
     "Saving..." : "Kaydediliyor...",
     "Couldn't send reset email. Please contact your administrator." : "Sıfırlama e-postası gönderilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "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.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Etiketleri düzenle",
     "Error loading dialog template: {error}" : "İletişim şablonu yüklenirken hata: {error}",
     "No tags selected for deletion." : "Silmek için bir etiket seçilmedi.",
+    "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
     "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
     "The update was unsuccessful." : "Güncelleme başarısız oldu.",
diff --git a/core/l10n/tzm.js b/core/l10n/tzm.js
index e7a57a1ef8a..7cac02a385b 100644
--- a/core/l10n/tzm.js
+++ b/core/l10n/tzm.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },
 "nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;");
diff --git a/core/l10n/tzm.json b/core/l10n/tzm.json
index 653f556ff14..0de6b3684bf 100644
--- a/core/l10n/tzm.json
+++ b/core/l10n/tzm.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "_download %n file_::_download %n files_" : ["",""]
 },"pluralForm" :"nplurals=2; plural=(n == 0 || n == 1 || (n > 10 && n < 100) ? 0 : 1;"
 }
\ No newline at end of file
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
index 5895d94b3e5..d6a74751c7a 100644
--- a/core/l10n/ug.js
+++ b/core/l10n/ug.js
@@ -21,7 +21,6 @@ OC.L10N.register(
     "November" : "ئوغلاق",
     "December" : "كۆنەك",
     "Settings" : "تەڭشەكلەر",
-    "Folder" : "قىسقۇچ",
     "Saving..." : "ساقلاۋاتىدۇ…",
     "No" : "ياق",
     "Yes" : "ھەئە",
@@ -38,6 +37,7 @@ OC.L10N.register(
     "Warning" : "ئاگاھلاندۇرۇش",
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
+    "_download %n file_::_download %n files_" : [""],
     "Username" : "ئىشلەتكۈچى ئاتى",
     "New password" : "يېڭى ئىم",
     "Personal" : "شەخسىي",
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
index e253d465ab7..bd061a85025 100644
--- a/core/l10n/ug.json
+++ b/core/l10n/ug.json
@@ -19,7 +19,6 @@
     "November" : "ئوغلاق",
     "December" : "كۆنەك",
     "Settings" : "تەڭشەكلەر",
-    "Folder" : "قىسقۇچ",
     "Saving..." : "ساقلاۋاتىدۇ…",
     "No" : "ياق",
     "Yes" : "ھەئە",
@@ -36,6 +35,7 @@
     "Warning" : "ئاگاھلاندۇرۇش",
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
+    "_download %n file_::_download %n files_" : [""],
     "Username" : "ئىشلەتكۈچى ئاتى",
     "New password" : "يېڭى ئىم",
     "Personal" : "شەخسىي",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 4f3e9c2cba5..a4ce73653df 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "Листопад",
     "December" : "Грудень",
     "Settings" : "Налаштування",
-    "File" : "Файл",
-    "Folder" : "Тека",
-    "Image" : "Зображення",
-    "Audio" : "Аудіо",
     "Saving..." : "Зберігаю...",
     "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>Якщо і там немає, спитайте вашого місцевого адміністратора.",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "Редагувати теги",
     "Error loading dialog template: {error}" : "Помилка при завантаженні шаблону діалогу: {error}",
     "No tags selected for deletion." : "Жодних тегів не обрано для видалення.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
     "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
     "The update was unsuccessful." : "Оновлення завершилось невдачею.",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index d6b2b9dbc24..885a797ee36 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -32,10 +32,6 @@
     "November" : "Листопад",
     "December" : "Грудень",
     "Settings" : "Налаштування",
-    "File" : "Файл",
-    "Folder" : "Тека",
-    "Image" : "Зображення",
-    "Audio" : "Аудіо",
     "Saving..." : "Зберігаю...",
     "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>Якщо і там немає, спитайте вашого місцевого адміністратора.",
@@ -112,6 +108,7 @@
     "Edit tags" : "Редагувати теги",
     "Error loading dialog template: {error}" : "Помилка при завантаженні шаблону діалогу: {error}",
     "No tags selected for deletion." : "Жодних тегів не обрано для видалення.",
+    "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
     "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
     "The update was unsuccessful." : "Оновлення завершилось невдачею.",
diff --git a/core/l10n/ur.js b/core/l10n/ur.js
new file mode 100644
index 00000000000..6f4050f5fd6
--- /dev/null
+++ b/core/l10n/ur.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Error" : "خرابی"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ur.json b/core/l10n/ur.json
new file mode 100644
index 00000000000..a99dca571f3
--- /dev/null
+++ b/core/l10n/ur.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Error" : "خرابی"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index bd8a3bba292..ce5c57e5fdf 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -86,6 +86,7 @@ OC.L10N.register(
     "Delete" : "حذف کریں",
     "Add" : "شامل کریں",
     "Edit tags" : "ترمیم ٹیگز",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
     "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
     "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index d4477e742ec..6f3a5993a9f 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -84,6 +84,7 @@
     "Delete" : "حذف کریں",
     "Add" : "شامل کریں",
     "Edit tags" : "ترمیم ٹیگز",
+    "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
     "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
     "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
diff --git a/core/l10n/uz.js b/core/l10n/uz.js
index 87077ecad97..49247f7174c 100644
--- a/core/l10n/uz.js
+++ b/core/l10n/uz.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "_{count} file conflict_::_{count} file conflicts_" : [""]
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "_download %n file_::_download %n files_" : [""]
 },
 "nplurals=1; plural=0;");
diff --git a/core/l10n/uz.json b/core/l10n/uz.json
index c499f696550..1d746175292 100644
--- a/core/l10n/uz.json
+++ b/core/l10n/uz.json
@@ -1,4 +1,5 @@
 { "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : [""]
+    "_{count} file conflict_::_{count} file conflicts_" : [""],
+    "_download %n file_::_download %n files_" : [""]
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index 76ad5232fd6..5e48c7802d9 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -30,7 +30,6 @@ OC.L10N.register(
     "November" : "Tháng 11",
     "December" : "Tháng 12",
     "Settings" : "Cài đặt",
-    "Folder" : "Thư mục",
     "Saving..." : "Đang lưu...",
     "Reset password" : "Khôi phục mật khẩu",
     "No" : "Không",
@@ -89,6 +88,7 @@ OC.L10N.register(
     "Edit tags" : "Sửa thẻ",
     "Error loading dialog template: {error}" : "Lỗi khi tải mẫu hội thoại: {error}",
     "No tags selected for deletion." : "Không có thẻ nào được chọn để xóa",
+    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "Vui lòng tải lại trang.",
     "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
     "%s password reset" : "%s thiết lập lại mật khẩu",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index befec743e03..7567c0a65bb 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -28,7 +28,6 @@
     "November" : "Tháng 11",
     "December" : "Tháng 12",
     "Settings" : "Cài đặt",
-    "Folder" : "Thư mục",
     "Saving..." : "Đang lưu...",
     "Reset password" : "Khôi phục mật khẩu",
     "No" : "Không",
@@ -87,6 +86,7 @@
     "Edit tags" : "Sửa thẻ",
     "Error loading dialog template: {error}" : "Lỗi khi tải mẫu hội thoại: {error}",
     "No tags selected for deletion." : "Không có thẻ nào được chọn để xóa",
+    "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "Vui lòng tải lại trang.",
     "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
     "%s password reset" : "%s thiết lập lại mật khẩu",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index 6037208c8a8..da5521925ea 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "十一月",
     "December" : "十二月",
     "Settings" : "设置",
-    "File" : "文件",
-    "Folder" : "文件夹",
-    "Image" : "图像",
-    "Audio" : "声音",
     "Saving..." : "保存中",
     "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>如果未能收到邮件请联系管理员。",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "编辑标签",
     "Error loading dialog template: {error}" : "加载对话框模板出错: {error}",
     "No tags selected for deletion." : "请选择要删除的标签。",
+    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。",
     "Please reload the page." : "请重新加载页面。",
     "The update was unsuccessful." : "更新未成功。",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index ec286eae039..ff67feacad0 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -32,10 +32,6 @@
     "November" : "十一月",
     "December" : "十二月",
     "Settings" : "设置",
-    "File" : "文件",
-    "Folder" : "文件夹",
-    "Image" : "图像",
-    "Audio" : "声音",
     "Saving..." : "保存中",
     "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>如果未能收到邮件请联系管理员。",
@@ -112,6 +108,7 @@
     "Edit tags" : "编辑标签",
     "Error loading dialog template: {error}" : "加载对话框模板出错: {error}",
     "No tags selected for deletion." : "请选择要删除的标签。",
+    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "更新 {productName} 到版本 {version}，这可能需要一些时间。",
     "Please reload the page." : "请重新加载页面。",
     "The update was unsuccessful." : "更新未成功。",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index 5caaa4a2f36..c36746e12fc 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -21,10 +21,6 @@ OC.L10N.register(
     "November" : "十一月",
     "December" : "十二月",
     "Settings" : "設定",
-    "File" : "文件",
-    "Folder" : "資料夾",
-    "Image" : "圖片",
-    "Audio" : "聲音",
     "Saving..." : "儲存中...",
     "Reset password" : "重設密碼",
     "No" : "否",
@@ -55,6 +51,7 @@ OC.L10N.register(
     "Warning" : "警告",
     "Delete" : "刪除",
     "Add" : "加入",
+    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
     "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
     "You will receive a link to reset your password via Email." : "你將收到一封電郵",
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 4d3bbaa8aea..294bdce33b6 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -19,10 +19,6 @@
     "November" : "十一月",
     "December" : "十二月",
     "Settings" : "設定",
-    "File" : "文件",
-    "Folder" : "資料夾",
-    "Image" : "圖片",
-    "Audio" : "聲音",
     "Saving..." : "儲存中...",
     "Reset password" : "重設密碼",
     "No" : "否",
@@ -53,6 +49,7 @@
     "Warning" : "警告",
     "Delete" : "刪除",
     "Add" : "加入",
+    "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
     "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
     "You will receive a link to reset your password via Email." : "你將收到一封電郵",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index a112af12d07..47a9f738ed0 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -34,10 +34,6 @@ OC.L10N.register(
     "November" : "十一月",
     "December" : "十二月",
     "Settings" : "設定",
-    "File" : "檔案",
-    "Folder" : "資料夾",
-    "Image" : "圖片",
-    "Audio" : "音訊",
     "Saving..." : "儲存中...",
     "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 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
@@ -114,6 +110,7 @@ OC.L10N.register(
     "Edit tags" : "編輯標籤",
     "Error loading dialog template: {error}" : "載入對話樣板出錯：{error}",
     "No tags selected for deletion." : "沒有選擇要刪除的標籤",
+    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
     "Please reload the page." : "請重新整理頁面",
     "The update was unsuccessful." : "更新失敗",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index 0f09ca62862..875b5b5af4a 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -32,10 +32,6 @@
     "November" : "十一月",
     "December" : "十二月",
     "Settings" : "設定",
-    "File" : "檔案",
-    "Folder" : "資料夾",
-    "Image" : "圖片",
-    "Audio" : "音訊",
     "Saving..." : "儲存中...",
     "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 至你的信箱，如果你在一段時間內沒收到，請檢查垃圾郵件資料夾，如果還是找不到，請聯絡系統管理員。",
@@ -112,6 +108,7 @@
     "Edit tags" : "編輯標籤",
     "Error loading dialog template: {error}" : "載入對話樣板出錯：{error}",
     "No tags selected for deletion." : "沒有選擇要刪除的標籤",
+    "_download %n file_::_download %n files_" : [""],
     "Updating {productName} to version {version}, this may take a while." : "正在更新 {productName} 到版本 {version} ，請稍候",
     "Please reload the page." : "請重新整理頁面",
     "The update was unsuccessful." : "更新失敗",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 19da0eb1bc2..1bad346442d 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -149,27 +149,11 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: js/js.js:499
+#: js/js.js:384
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:588
-msgid "File"
-msgstr ""
-
-#: js/js.js:589
-msgid "Folder"
-msgstr ""
-
-#: js/js.js:590
-msgid "Image"
-msgstr ""
-
-#: js/js.js:591
-msgid "Audio"
-msgstr ""
-
-#: js/js.js:605
+#: js/js.js:483
 msgid "Saving..."
 msgstr ""
 
@@ -493,6 +477,31 @@ msgstr ""
 msgid "No tags selected for deletion."
 msgstr ""
 
+#: js/tests/specs/l10nSpec.js:28 js/tests/specs/l10nSpec.js:31
+msgid "unknown text"
+msgstr ""
+
+#: js/tests/specs/l10nSpec.js:34
+msgid "Hello world!"
+msgstr ""
+
+#: js/tests/specs/l10nSpec.js:38
+msgid "sunny"
+msgstr ""
+
+#: js/tests/specs/l10nSpec.js:38
+msgid "Hello {name}, the weather is {weather}"
+msgstr ""
+
+#: js/tests/specs/l10nSpec.js:45 js/tests/specs/l10nSpec.js:48
+#: js/tests/specs/l10nSpec.js:51 js/tests/specs/l10nSpec.js:54
+#: js/tests/specs/l10nSpec.js:62 js/tests/specs/l10nSpec.js:65
+#: js/tests/specs/l10nSpec.js:68 js/tests/specs/l10nSpec.js:71
+msgid "download %n file"
+msgid_plural "download %n files"
+msgstr[0] ""
+msgstr[1] ""
+
 #: js/update.js:30
 msgid "Updating {productName} to version {version}, this may take a while."
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 5c3ce3328c9..763d62dd0cd 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index c2190c33129..c6a7dd5f023 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 0e58511397c..b822a8caba2 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -43,159 +43,159 @@ msgstr ""
 msgid "Step 2 failed. Exception: %s"
 msgstr ""
 
-#: appinfo/app.php:35 js/app.js:32 templates/settings.php:9
+#: appinfo/app.php:37 js/app.js:32 templates/settings.php:9
 msgid "External storage"
 msgstr ""
 
-#: appinfo/app.php:44
+#: appinfo/app.php:46
 msgid "Local"
 msgstr ""
 
-#: appinfo/app.php:47
+#: appinfo/app.php:49
 msgid "Location"
 msgstr ""
 
-#: appinfo/app.php:50
+#: appinfo/app.php:52
 msgid "Amazon S3"
 msgstr ""
 
-#: appinfo/app.php:53
+#: appinfo/app.php:55
 msgid "Key"
 msgstr ""
 
-#: appinfo/app.php:54
+#: appinfo/app.php:56
 msgid "Secret"
 msgstr ""
 
-#: appinfo/app.php:55 appinfo/app.php:64 appinfo/app.php:112
+#: appinfo/app.php:57 appinfo/app.php:66 appinfo/app.php:114
 msgid "Bucket"
 msgstr ""
 
-#: appinfo/app.php:59
+#: appinfo/app.php:61
 msgid "Amazon S3 and compliant"
 msgstr ""
 
-#: appinfo/app.php:62
+#: appinfo/app.php:64
 msgid "Access Key"
 msgstr ""
 
-#: appinfo/app.php:63
+#: appinfo/app.php:65
 msgid "Secret Key"
 msgstr ""
 
-#: appinfo/app.php:65
+#: appinfo/app.php:67
 msgid "Hostname"
 msgstr ""
 
-#: appinfo/app.php:66
+#: appinfo/app.php:68
 msgid "Port"
 msgstr ""
 
-#: appinfo/app.php:67
+#: appinfo/app.php:69
 msgid "Region"
 msgstr ""
 
-#: appinfo/app.php:68
+#: appinfo/app.php:70
 msgid "Enable SSL"
 msgstr ""
 
-#: appinfo/app.php:69
+#: appinfo/app.php:71
 msgid "Enable Path Style"
 msgstr ""
 
-#: appinfo/app.php:77
+#: appinfo/app.php:79
 msgid "App key"
 msgstr ""
 
-#: appinfo/app.php:78
+#: appinfo/app.php:80
 msgid "App secret"
 msgstr ""
 
-#: appinfo/app.php:88 appinfo/app.php:129 appinfo/app.php:140
-#: appinfo/app.php:173
+#: appinfo/app.php:90 appinfo/app.php:131 appinfo/app.php:142
+#: appinfo/app.php:175
 msgid "Host"
 msgstr ""
 
-#: appinfo/app.php:89 appinfo/app.php:111 appinfo/app.php:130
-#: appinfo/app.php:152 appinfo/app.php:163 appinfo/app.php:174
+#: appinfo/app.php:91 appinfo/app.php:113 appinfo/app.php:132
+#: appinfo/app.php:154 appinfo/app.php:165 appinfo/app.php:176
 msgid "Username"
 msgstr ""
 
-#: appinfo/app.php:90 appinfo/app.php:131 appinfo/app.php:153
-#: appinfo/app.php:164 appinfo/app.php:175
+#: appinfo/app.php:92 appinfo/app.php:133 appinfo/app.php:155
+#: appinfo/app.php:166 appinfo/app.php:177
 msgid "Password"
 msgstr ""
 
-#: appinfo/app.php:91 appinfo/app.php:133 appinfo/app.php:143
-#: appinfo/app.php:154 appinfo/app.php:176
+#: appinfo/app.php:93 appinfo/app.php:135 appinfo/app.php:145
+#: appinfo/app.php:156 appinfo/app.php:178
 msgid "Root"
 msgstr ""
 
-#: appinfo/app.php:92
+#: appinfo/app.php:94
 msgid "Secure ftps://"
 msgstr ""
 
-#: appinfo/app.php:100
+#: appinfo/app.php:102
 msgid "Client ID"
 msgstr ""
 
-#: appinfo/app.php:101
+#: appinfo/app.php:103
 msgid "Client secret"
 msgstr ""
 
-#: appinfo/app.php:108
+#: appinfo/app.php:110
 msgid "OpenStack Object Storage"
 msgstr ""
 
-#: appinfo/app.php:113
+#: appinfo/app.php:115
 msgid "Region (optional for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:114
+#: appinfo/app.php:116
 msgid "API Key (required for Rackspace Cloud Files)"
 msgstr ""
 
-#: appinfo/app.php:115
+#: appinfo/app.php:117
 msgid "Tenantname (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:116
+#: appinfo/app.php:118
 msgid "Password (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:117
+#: appinfo/app.php:119
 msgid "Service Name (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:118
+#: appinfo/app.php:120
 msgid "URL of identity endpoint (required for OpenStack Object Storage)"
 msgstr ""
 
-#: appinfo/app.php:119
+#: appinfo/app.php:121
 msgid "Timeout of HTTP requests in seconds"
 msgstr ""
 
-#: appinfo/app.php:132 appinfo/app.php:142
+#: appinfo/app.php:134 appinfo/app.php:144
 msgid "Share"
 msgstr ""
 
-#: appinfo/app.php:137
+#: appinfo/app.php:139
 msgid "SMB / CIFS using OC login"
 msgstr ""
 
-#: appinfo/app.php:141
+#: appinfo/app.php:143
 msgid "Username as share"
 msgstr ""
 
-#: appinfo/app.php:151 appinfo/app.php:162
+#: appinfo/app.php:153 appinfo/app.php:164
 msgid "URL"
 msgstr ""
 
-#: appinfo/app.php:155 appinfo/app.php:166
+#: appinfo/app.php:157 appinfo/app.php:168
 msgid "Secure https://"
 msgstr ""
 
-#: appinfo/app.php:165
+#: appinfo/app.php:167
 msgid "Remote subfolder"
 msgstr ""
 
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index c6cd18c7da6..231090e3e57 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,15 +33,15 @@ msgstr ""
 msgid "Couldn't add remote share"
 msgstr ""
 
-#: appinfo/app.php:39 js/app.js:34
+#: appinfo/app.php:40 js/app.js:34
 msgid "Shared with you"
 msgstr ""
 
-#: appinfo/app.php:51 js/app.js:53
+#: appinfo/app.php:52 js/app.js:53
 msgid "Shared with others"
 msgstr ""
 
-#: appinfo/app.php:60 js/app.js:72
+#: appinfo/app.php:61 js/app.js:72
 msgid "Shared by link"
 msgstr ""
 
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 0cbf30da9be..71302fbc7ab 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
 msgid "Couldn't restore %s"
 msgstr ""
 
-#: appinfo/app.php:15 js/filelist.js:34
+#: appinfo/app.php:17 js/filelist.js:34
 msgid "Deleted files"
 msgstr ""
 
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index c7bd658b6ab..19817303dc8 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 21a4b38ba7d..b89cd0d8e80 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "See %s"
 msgstr ""
 
-#: base.php:209 private/util.php:458
+#: base.php:209 private/util.php:476
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
@@ -407,51 +407,51 @@ msgstr ""
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:184
+#: private/template/functions.php:193
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:185
+#: private/template/functions.php:194
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:186
+#: private/template/functions.php:195
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:187
+#: private/template/functions.php:196
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:188
+#: private/template/functions.php:197
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:190
+#: private/template/functions.php:199
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:192
+#: private/template/functions.php:201
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:193
+#: private/template/functions.php:202
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:195
+#: private/template/functions.php:204
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:196
+#: private/template/functions.php:205
 msgid "years ago"
 msgstr ""
 
@@ -473,144 +473,144 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: private/util.php:443
+#: private/util.php:461
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: private/util.php:450
+#: private/util.php:468
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: private/util.php:457
+#: private/util.php:475
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: private/util.php:471
+#: private/util.php:489
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: private/util.php:472
+#: private/util.php:490
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: private/util.php:487
+#: private/util.php:505
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: private/util.php:488
+#: private/util.php:506
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: private/util.php:505
+#: private/util.php:523
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: private/util.php:508
+#: private/util.php:526
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: private/util.php:537
+#: private/util.php:555
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: private/util.php:557
+#: private/util.php:575
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: private/util.php:565
+#: private/util.php:583
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: private/util.php:566
+#: private/util.php:584
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: private/util.php:577
+#: private/util.php:595
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:578
+#: private/util.php:596
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:585
+#: private/util.php:603
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:586
+#: private/util.php:604
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:600
+#: private/util.php:618
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: private/util.php:601
+#: private/util.php:619
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: private/util.php:631
+#: private/util.php:649
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: private/util.php:632
+#: private/util.php:650
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: private/util.php:639
+#: private/util.php:657
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: private/util.php:640
+#: private/util.php:658
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: private/util.php:705
+#: private/util.php:723
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: private/util.php:714
+#: private/util.php:732
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: private/util.php:735
+#: private/util.php:753
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: private/util.php:736
+#: private/util.php:754
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index d91728a8629..71ad7750197 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -366,51 +366,51 @@ msgstr ""
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: template/functions.php:184
+#: template/functions.php:193
 msgid "seconds ago"
 msgstr ""
 
-#: template/functions.php:185
+#: template/functions.php:194
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:186
+#: template/functions.php:195
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:187
+#: template/functions.php:196
 msgid "today"
 msgstr ""
 
-#: template/functions.php:188
+#: template/functions.php:197
 msgid "yesterday"
 msgstr ""
 
-#: template/functions.php:190
+#: template/functions.php:199
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:192
+#: template/functions.php:201
 msgid "last month"
 msgstr ""
 
-#: template/functions.php:193
+#: template/functions.php:202
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:195
+#: template/functions.php:204
 msgid "last year"
 msgstr ""
 
-#: template/functions.php:196
+#: template/functions.php:205
 msgid "years ago"
 msgstr ""
 
@@ -432,151 +432,151 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: util.php:443
+#: util.php:461
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: util.php:450
+#: util.php:468
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: util.php:457
+#: util.php:475
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: util.php:458
+#: util.php:476
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
 "config directory%s."
 msgstr ""
 
-#: util.php:471
+#: util.php:489
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: util.php:472
+#: util.php:490
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: util.php:487
+#: util.php:505
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: util.php:488
+#: util.php:506
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: util.php:505
+#: util.php:523
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: util.php:508
+#: util.php:526
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: util.php:537
+#: util.php:555
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: util.php:557
+#: util.php:575
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: util.php:565
+#: util.php:583
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: util.php:566
+#: util.php:584
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: util.php:577
+#: util.php:595
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:578
+#: util.php:596
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:585
+#: util.php:603
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:586
+#: util.php:604
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:600
+#: util.php:618
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: util.php:601
+#: util.php:619
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: util.php:631
+#: util.php:649
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: util.php:632
+#: util.php:650
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: util.php:639
+#: util.php:657
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: util.php:640
+#: util.php:658
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: util.php:705
+#: util.php:723
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: util.php:714
+#: util.php:732
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: util.php:735
+#: util.php:753
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: util.php:736
+#: util.php:754
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 0e40aa992ef..3aecf464d65 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -948,11 +948,11 @@ msgstr ""
 msgid "Delete Encryption Keys"
 msgstr ""
 
-#: templates/users/main.php:34
+#: templates/users/main.php:36
 msgid "Show storage location"
 msgstr ""
 
-#: templates/users/main.php:38
+#: templates/users/main.php:40
 msgid "Show last log in"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 46767a0ecb9..9cf7115d8d4 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 544f02631db..e6dfe8e591d 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: ownCloud Core 6.0.0\n"
+"Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-29 01:54-0400\n"
+"POT-Creation-Date: 2014-10-30 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/ast.js b/lib/l10n/ast.js
index 89fbe3b173d..7c1dd6ed304 100644
--- a/lib/l10n/ast.js
+++ b/lib/l10n/ast.js
@@ -5,11 +5,14 @@ OC.L10N.register(
     "This can usually be fixed by giving the webserver write access to the config directory" : "Davezu esto pue iguase dándo-y al sirvidor web accesu d'escritura al direutoriu de configuración",
     "See %s" : "Mira %s",
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Davezu esto pue iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu de configuración%s.",
+    "Sample configuration detected" : "Configuración d'amuesa detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detectose que la configuración d'amuesa copiose. Esto pue encaboxar la instalación y dexala ensín soporte. Llee la documentación enantes de facer cambéos en config.php",
     "Help" : "Ayuda",
     "Personal" : "Personal",
     "Settings" : "Axustes",
     "Users" : "Usuarios",
     "Admin" : "Almin",
+    "Recommended" : "Recomendáu",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'aplicación \\\"%s\\\" nun pue instalase porque nun ye compatible con esta versión d'ownCloud",
     "No app name specified" : "Nun s'especificó nome de l'aplicación",
     "Unknown filetype" : "Triba de ficheru desconocida",
@@ -49,6 +52,7 @@ OC.L10N.register(
     "PostgreSQL username and/or password not valid" : "Nome d'usuariu o contraseña PostgreSQL non válidos",
     "Set an admin username." : "Afitar nome d'usuariu p'almin",
     "Set an admin password." : "Afitar contraseña p'almin",
+    "Can't create or write into the data directory %s" : "Nun pue crease o escribir dientro los datos del direutoriu %s",
     "%s shared »%s« with you" : "%s compartió »%s« contigo",
     "Sharing %s failed, because the file does not exist" : "Compartir %s falló, porque'l ficheru nun esiste",
     "You are not allowed to share %s" : "Nun tienes permisu pa compartir %s",
@@ -96,6 +100,7 @@ OC.L10N.register(
     "Cannot create \"data\" directory (%s)" : "Nun pue crease'l direutoriu \"data\" (%s)",
     "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto pue iguase davezu <a href=\"%s\" target=\"_blank\">dándo-y accesu d'escritura al direutoriu raigañu</a>.",
     "Setting locale to %s failed" : "Falló l'activación del idioma %s",
+    "Please install one of these locales on your system and restart your webserver." : "Instala ún d'estos locales nel to sistema y reanicia'l sirvidor web",
     "Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.",
     "PHP module %s not installed." : "Nun ta instaláu'l módulu PHP %s",
     "PHP %s or higher is required." : "Necesítase PHP %s o superior",
diff --git a/lib/l10n/ast.json b/lib/l10n/ast.json
index c069b132a30..8585975ac12 100644
--- a/lib/l10n/ast.json
+++ b/lib/l10n/ast.json
@@ -3,11 +3,14 @@
     "This can usually be fixed by giving the webserver write access to the config directory" : "Davezu esto pue iguase dándo-y al sirvidor web accesu d'escritura al direutoriu de configuración",
     "See %s" : "Mira %s",
     "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Davezu esto pue iguase %sdándo-y al sirvidor web accesu d'escritura al direutoriu de configuración%s.",
+    "Sample configuration detected" : "Configuración d'amuesa detectada",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Detectose que la configuración d'amuesa copiose. Esto pue encaboxar la instalación y dexala ensín soporte. Llee la documentación enantes de facer cambéos en config.php",
     "Help" : "Ayuda",
     "Personal" : "Personal",
     "Settings" : "Axustes",
     "Users" : "Usuarios",
     "Admin" : "Almin",
+    "Recommended" : "Recomendáu",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'aplicación \\\"%s\\\" nun pue instalase porque nun ye compatible con esta versión d'ownCloud",
     "No app name specified" : "Nun s'especificó nome de l'aplicación",
     "Unknown filetype" : "Triba de ficheru desconocida",
@@ -47,6 +50,7 @@
     "PostgreSQL username and/or password not valid" : "Nome d'usuariu o contraseña PostgreSQL non válidos",
     "Set an admin username." : "Afitar nome d'usuariu p'almin",
     "Set an admin password." : "Afitar contraseña p'almin",
+    "Can't create or write into the data directory %s" : "Nun pue crease o escribir dientro los datos del direutoriu %s",
     "%s shared »%s« with you" : "%s compartió »%s« contigo",
     "Sharing %s failed, because the file does not exist" : "Compartir %s falló, porque'l ficheru nun esiste",
     "You are not allowed to share %s" : "Nun tienes permisu pa compartir %s",
@@ -94,6 +98,7 @@
     "Cannot create \"data\" directory (%s)" : "Nun pue crease'l direutoriu \"data\" (%s)",
     "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Esto pue iguase davezu <a href=\"%s\" target=\"_blank\">dándo-y accesu d'escritura al direutoriu raigañu</a>.",
     "Setting locale to %s failed" : "Falló l'activación del idioma %s",
+    "Please install one of these locales on your system and restart your webserver." : "Instala ún d'estos locales nel to sistema y reanicia'l sirvidor web",
     "Please ask your server administrator to install the module." : "Por favor, entrúga-y al to alministrador del sirvidor pa instalar el módulu.",
     "PHP module %s not installed." : "Nun ta instaláu'l módulu PHP %s",
     "PHP %s or higher is required." : "Necesítase PHP %s o superior",
diff --git a/lib/l10n/eu.js b/lib/l10n/eu.js
index 0c281671303..b5b6b7d364b 100644
--- a/lib/l10n/eu.js
+++ b/lib/l10n/eu.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Settings" : "Ezarpenak",
     "Users" : "Erabiltzaileak",
     "Admin" : "Admin",
+    "Recommended" : "Aholkatuta",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "\\\"%s\\\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako.",
     "No app name specified" : "Ez da aplikazioaren izena zehaztu",
     "Unknown filetype" : "Fitxategi mota ezezaguna",
@@ -51,6 +52,7 @@ OC.L10N.register(
     "PostgreSQL username and/or password not valid" : "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
     "Set an admin username." : "Ezarri administraziorako erabiltzaile izena.",
     "Set an admin password." : "Ezarri administraziorako pasahitza.",
+    "Can't create or write into the data directory %s" : "Ezin da %s datu karpeta sortu edo bertan idatzi ",
     "%s shared »%s« with you" : "%s-ek »%s« zurekin partekatu du",
     "Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
     "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
diff --git a/lib/l10n/eu.json b/lib/l10n/eu.json
index a8213f297e3..77a7f6f095e 100644
--- a/lib/l10n/eu.json
+++ b/lib/l10n/eu.json
@@ -10,6 +10,7 @@
     "Settings" : "Ezarpenak",
     "Users" : "Erabiltzaileak",
     "Admin" : "Admin",
+    "Recommended" : "Aholkatuta",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "\\\"%s\\\" Aplikazioa ezin da instalatu ownCloud bertsio honekin bateragarria ez delako.",
     "No app name specified" : "Ez da aplikazioaren izena zehaztu",
     "Unknown filetype" : "Fitxategi mota ezezaguna",
@@ -49,6 +50,7 @@
     "PostgreSQL username and/or password not valid" : "PostgreSQL erabiltzaile edota pasahitza ez dira egokiak.",
     "Set an admin username." : "Ezarri administraziorako erabiltzaile izena.",
     "Set an admin password." : "Ezarri administraziorako pasahitza.",
+    "Can't create or write into the data directory %s" : "Ezin da %s datu karpeta sortu edo bertan idatzi ",
     "%s shared »%s« with you" : "%s-ek »%s« zurekin partekatu du",
     "Sharing %s failed, because the file does not exist" : "%s elkarbanatzeak huts egin du, fitxategia ez delako existitzen",
     "You are not allowed to share %s" : "Ez zadue %s elkarbanatzeko baimendua",
diff --git a/lib/l10n/hi_IN.js b/lib/l10n/hi_IN.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/hi_IN.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/hi_IN.json
@@ -0,0 +1,7 @@
+{ "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/id.js b/lib/l10n/id.js
index 42de487f655..368cb6b7921 100644
--- a/lib/l10n/id.js
+++ b/lib/l10n/id.js
@@ -1,12 +1,19 @@
 OC.L10N.register(
     "lib",
     {
+    "Cannot write into \"config\" directory!" : "Tidak dapat menulis kedalam direktori \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Hal ini biasanya dapat diperbaiki dengan memberikan akses tulis bagi situs web ke direktori config",
+    "See %s" : "Lihat %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori config.",
+    "Sample configuration detected" : "Konfigurasi sampel ditemukan",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php",
     "Help" : "Bantuan",
     "Personal" : "Pribadi",
     "Settings" : "Pengaturan",
     "Users" : "Pengguna",
     "Admin" : "Admin",
     "Recommended" : "Direkomendasikan",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikasi \\\"%s\\\" tidak dapat diinstal karena tidak kompatibel denga versi ownCloud ini.",
     "No app name specified" : "Tidak ada nama apl yang ditentukan",
     "Unknown filetype" : "Tipe berkas tak dikenal",
     "Invalid image" : "Gambar tidak sah",
@@ -26,20 +33,46 @@ OC.L10N.register(
     "Application is not enabled" : "Aplikasi tidak diaktifkan",
     "Authentication error" : "Galat saat otentikasi",
     "Token expired. Please reload page." : "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
+    "Unknown user" : "Pengguna tidak dikenal",
     "%s enter the database username." : "%s masukkan nama pengguna basis data.",
     "%s enter the database name." : "%s masukkan nama basis data.",
     "%s you may not use dots in the database name" : "%s anda tidak boleh menggunakan karakter titik pada nama basis data",
     "MS SQL username and/or password not valid: %s" : "Nama pengguna dan/atau sandi MySQL tidak sah: %s",
     "You need to enter either an existing account or the administrator." : "Anda harus memasukkan akun yang sudah ada atau administrator.",
-    "DB Error: \"%s\"" : "Galat Basis Data: \"%s\"",
+    "MySQL/MariaDB username and/or password not valid" : "Nama pengguna dan/atau sandi MySQL/MariaDB tidak sah",
+    "DB Error: \"%s\"" : "Kesalahan Basis Data: \"%s\"",
     "Offending command was: \"%s\"" : "Perintah yang bermasalah: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "'%s'@'localhost' pengguna MySQL/MariaDB sudah ada.",
+    "Drop this user from MySQL/MariaDB" : "Drop pengguna ini dari MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "'%s'@'%%' pengguna MySQL/MariaDB sudah ada.",
+    "Drop this user from MySQL/MariaDB." : "Drop pengguna ini dari MySQL/MariaDB.",
     "Oracle connection could not be established" : "Koneksi Oracle tidak dapat dibuat",
     "Oracle username and/or password not valid" : "Nama pengguna dan/atau sandi Oracle tidak sah",
     "Offending command was: \"%s\", name: %s, password: %s" : "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
     "PostgreSQL username and/or password not valid" : "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
-    "Set an admin username." : "Atur nama pengguna admin.",
-    "Set an admin password." : "Atur sandi admin.",
+    "Set an admin username." : "Tetapkan nama pengguna admin.",
+    "Set an admin password." : "Tetapkan sandi admin.",
+    "Can't create or write into the data directory %s" : "Tidak dapat membuat atau menulis kedalam direktori data %s",
     "%s shared »%s« with you" : "%s membagikan »%s« dengan anda",
+    "Sharing %s failed, because the file does not exist" : "Gagal membagikan %s, karena berkas tidak ada",
+    "You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Gagal membagikan %s, karena pengguna %s adalah pemilik item",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Gagal membagikan %s, karena berbag dengan tautan tidak diizinkan",
+    "Share type %s is not valid for %s" : "Barbagi tipe %s tidak sah untuk %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Pengaturan perizinan untuk %s gagal, karena karena izin melebihi izin yang diberikan untuk %s",
+    "Setting permissions for %s failed, because the item was not found" : "Pengaturan perizinan untuk %s gagal, karena item tidak ditemukan",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Tidak dapat menyetel tanggal kadaluarsa. Pembagian tidak dapat kadaluarsa lebih lambat dari %s setelah mereka dibagikan.",
+    "Cannot set expiration date. Expiration date is in the past" : "Tidak dapat menyetel tanggal kadaluarsa. Tanggal kadaluarsa dimasa lalu",
+    "Sharing %s failed, because the user %s is the original sharer" : "Gagal berbagi %s. karena pengguna %s adalah yang membagikan pertama",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Gagal membagikan %s, karena izin melebihi izin yang diberikan untuk %s",
+    "Sharing %s failed, because resharing is not allowed" : "Gagal berbagi %s, karena membagikan ulang tidak diizinkan",
+    "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\"",
     "seconds ago" : "beberapa detik yang lalu",
     "_%n minute ago_::_%n minutes ago_" : ["%n menit yang lalu"],
@@ -51,7 +84,34 @@ OC.L10N.register(
     "_%n month ago_::_%n months ago_" : ["%n bulan yang lalu"],
     "last year" : "tahun kemarin",
     "years ago" : "beberapa tahun lalu",
+    "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"
+    "A valid password must be provided" : "Tuliskan sandi yang valid",
+    "The username is already being used" : "Nama pengguna ini telah digunakan",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Tidak ada driver (sqlite, mysql, or postgresql) yang terinstal.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Perizinan biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori root.",
+    "Cannot write into \"config\" directory" : "Tidak dapat menulis kedalam direktori \"config\"",
+    "Cannot write into \"apps\" directory" : "Tidak dapat menulis kedalam direktori \"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." : "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori apps atau menonaktifkan toko aplikasi didalam berkas config.",
+    "Cannot create \"data\" directory (%s)" : "Tidak dapat membuat direktori (%s) \"data\"",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Hal ini biasanya dapat diperbaiki dengan <a href=\"%s\" target=\"_blank\">memberikan akses tulis bagi situs web ke direktori root</a>.",
+    "Setting locale to %s failed" : "Pengaturan lokal ke %s gagal",
+    "Please install one of these locales on your system and restart your webserver." : "Mohon instal paling tidak satu lokal pada sistem Anda dan jalankan ulang server web.",
+    "Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal module.",
+    "PHP module %s not installed." : "Module PHP %s tidak terinstal.",
+    "PHP %s or higher is required." : "Diperlukan PHP %s atau yang lebih tinggi.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Mohon tanyakan administrator Anda untuk memperbarui PHP ke versi terkini. Versi PHP Anda tidak lagi didukung oleh ownCloud dan komunitas PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode diaktifkan. ownCloud memerlukan ini untuk dinonaktifkan untuk dapat bekerja dengan banar.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Modul PHP telah terinstal, tetapi mereka terlihat tidak ada?",
+    "Please ask your server administrator to restart the web server." : "Mohon minta administrator Anda untuk menjalankan ulang server web.",
+    "PostgreSQL >= 9 required" : "Diperlukan PostgreSQL >= 9",
+    "Please upgrade your database version" : "Mohon perbarui versi basis data Anda",
+    "Error occurred while checking PostgreSQL version" : "Terjadi kesalahan saat memeriksa versi PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Pastikan bahwa Anda memiliki PostgreSQL >= 9 atau periksa log untuk informasi lebih lanjut tentang kesalahan",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Mohon ubah perizinan menjadi 0770 sehingga direktori tersebut tidak dapat dilihat oleh pengguna lain.",
+    "Data directory (%s) is readable by other users" : "Direktori data (%s) dapat dibaca oleh pengguna lain",
+    "Data directory (%s) is invalid" : "Direktori data (%s) tidak sah",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Mohon periksa apakah direktori data berisi sebuah berkas \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Tidak bisa memperoleh jenis kunci %d pada \"%s\"."
 },
 "nplurals=1; plural=0;");
diff --git a/lib/l10n/id.json b/lib/l10n/id.json
index 6bc8f736223..e2b1712e1c5 100644
--- a/lib/l10n/id.json
+++ b/lib/l10n/id.json
@@ -1,10 +1,17 @@
 { "translations": {
+    "Cannot write into \"config\" directory!" : "Tidak dapat menulis kedalam direktori \"config\"!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Hal ini biasanya dapat diperbaiki dengan memberikan akses tulis bagi situs web ke direktori config",
+    "See %s" : "Lihat %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori config.",
+    "Sample configuration detected" : "Konfigurasi sampel ditemukan",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Ditemukan bahwa konfigurasi sampel telah disalin. Hal ini dapat merusak instalasi Anda dan tidak didukung. Silahkan baca dokumentasi sebelum melakukan perubahan pada config.php",
     "Help" : "Bantuan",
     "Personal" : "Pribadi",
     "Settings" : "Pengaturan",
     "Users" : "Pengguna",
     "Admin" : "Admin",
     "Recommended" : "Direkomendasikan",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikasi \\\"%s\\\" tidak dapat diinstal karena tidak kompatibel denga versi ownCloud ini.",
     "No app name specified" : "Tidak ada nama apl yang ditentukan",
     "Unknown filetype" : "Tipe berkas tak dikenal",
     "Invalid image" : "Gambar tidak sah",
@@ -24,20 +31,46 @@
     "Application is not enabled" : "Aplikasi tidak diaktifkan",
     "Authentication error" : "Galat saat otentikasi",
     "Token expired. Please reload page." : "Token sudah kedaluwarsa. Silakan muat ulang halaman.",
+    "Unknown user" : "Pengguna tidak dikenal",
     "%s enter the database username." : "%s masukkan nama pengguna basis data.",
     "%s enter the database name." : "%s masukkan nama basis data.",
     "%s you may not use dots in the database name" : "%s anda tidak boleh menggunakan karakter titik pada nama basis data",
     "MS SQL username and/or password not valid: %s" : "Nama pengguna dan/atau sandi MySQL tidak sah: %s",
     "You need to enter either an existing account or the administrator." : "Anda harus memasukkan akun yang sudah ada atau administrator.",
-    "DB Error: \"%s\"" : "Galat Basis Data: \"%s\"",
+    "MySQL/MariaDB username and/or password not valid" : "Nama pengguna dan/atau sandi MySQL/MariaDB tidak sah",
+    "DB Error: \"%s\"" : "Kesalahan Basis Data: \"%s\"",
     "Offending command was: \"%s\"" : "Perintah yang bermasalah: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "'%s'@'localhost' pengguna MySQL/MariaDB sudah ada.",
+    "Drop this user from MySQL/MariaDB" : "Drop pengguna ini dari MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "'%s'@'%%' pengguna MySQL/MariaDB sudah ada.",
+    "Drop this user from MySQL/MariaDB." : "Drop pengguna ini dari MySQL/MariaDB.",
     "Oracle connection could not be established" : "Koneksi Oracle tidak dapat dibuat",
     "Oracle username and/or password not valid" : "Nama pengguna dan/atau sandi Oracle tidak sah",
     "Offending command was: \"%s\", name: %s, password: %s" : "Perintah yang bermasalah: \"%s\", nama pengguna: %s, sandi: %s",
     "PostgreSQL username and/or password not valid" : "Nama pengguna dan/atau sandi PostgreSQL tidak valid",
-    "Set an admin username." : "Atur nama pengguna admin.",
-    "Set an admin password." : "Atur sandi admin.",
+    "Set an admin username." : "Tetapkan nama pengguna admin.",
+    "Set an admin password." : "Tetapkan sandi admin.",
+    "Can't create or write into the data directory %s" : "Tidak dapat membuat atau menulis kedalam direktori data %s",
     "%s shared »%s« with you" : "%s membagikan »%s« dengan anda",
+    "Sharing %s failed, because the file does not exist" : "Gagal membagikan %s, karena berkas tidak ada",
+    "You are not allowed to share %s" : "Anda tidak diizinkan untuk membagikan %s",
+    "Sharing %s failed, because the user %s is the item owner" : "Gagal membagikan %s, karena pengguna %s adalah pemilik item",
+    "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 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",
+    "Sharing %s failed, because sharing with links is not allowed" : "Gagal membagikan %s, karena berbag dengan tautan tidak diizinkan",
+    "Share type %s is not valid for %s" : "Barbagi tipe %s tidak sah untuk %s",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Pengaturan perizinan untuk %s gagal, karena karena izin melebihi izin yang diberikan untuk %s",
+    "Setting permissions for %s failed, because the item was not found" : "Pengaturan perizinan untuk %s gagal, karena item tidak ditemukan",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Tidak dapat menyetel tanggal kadaluarsa. Pembagian tidak dapat kadaluarsa lebih lambat dari %s setelah mereka dibagikan.",
+    "Cannot set expiration date. Expiration date is in the past" : "Tidak dapat menyetel tanggal kadaluarsa. Tanggal kadaluarsa dimasa lalu",
+    "Sharing %s failed, because the user %s is the original sharer" : "Gagal berbagi %s. karena pengguna %s adalah yang membagikan pertama",
+    "Sharing %s failed, because the permissions exceed permissions granted to %s" : "Gagal membagikan %s, karena izin melebihi izin yang diberikan untuk %s",
+    "Sharing %s failed, because resharing is not allowed" : "Gagal berbagi %s, karena membagikan ulang tidak diizinkan",
+    "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\"",
     "seconds ago" : "beberapa detik yang lalu",
     "_%n minute ago_::_%n minutes ago_" : ["%n menit yang lalu"],
@@ -49,7 +82,34 @@
     "_%n month ago_::_%n months ago_" : ["%n bulan yang lalu"],
     "last year" : "tahun kemarin",
     "years ago" : "beberapa tahun lalu",
+    "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"
+    "A valid password must be provided" : "Tuliskan sandi yang valid",
+    "The username is already being used" : "Nama pengguna ini telah digunakan",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Tidak ada driver (sqlite, mysql, or postgresql) yang terinstal.",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Perizinan biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori root.",
+    "Cannot write into \"config\" directory" : "Tidak dapat menulis kedalam direktori \"config\"",
+    "Cannot write into \"apps\" directory" : "Tidak dapat menulis kedalam direktori \"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." : "Hal ini biasanya dapat diperbaiki dengan %s memberikan akses tulis bagi situs web ke %s direktori apps atau menonaktifkan toko aplikasi didalam berkas config.",
+    "Cannot create \"data\" directory (%s)" : "Tidak dapat membuat direktori (%s) \"data\"",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Hal ini biasanya dapat diperbaiki dengan <a href=\"%s\" target=\"_blank\">memberikan akses tulis bagi situs web ke direktori root</a>.",
+    "Setting locale to %s failed" : "Pengaturan lokal ke %s gagal",
+    "Please install one of these locales on your system and restart your webserver." : "Mohon instal paling tidak satu lokal pada sistem Anda dan jalankan ulang server web.",
+    "Please ask your server administrator to install the module." : "Mohon tanyakan administrator Anda untuk menginstal module.",
+    "PHP module %s not installed." : "Module PHP %s tidak terinstal.",
+    "PHP %s or higher is required." : "Diperlukan PHP %s atau yang lebih tinggi.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Mohon tanyakan administrator Anda untuk memperbarui PHP ke versi terkini. Versi PHP Anda tidak lagi didukung oleh ownCloud dan komunitas PHP.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode diaktifkan. ownCloud memerlukan ini untuk dinonaktifkan untuk dapat bekerja dengan banar.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Modul PHP telah terinstal, tetapi mereka terlihat tidak ada?",
+    "Please ask your server administrator to restart the web server." : "Mohon minta administrator Anda untuk menjalankan ulang server web.",
+    "PostgreSQL >= 9 required" : "Diperlukan PostgreSQL >= 9",
+    "Please upgrade your database version" : "Mohon perbarui versi basis data Anda",
+    "Error occurred while checking PostgreSQL version" : "Terjadi kesalahan saat memeriksa versi PostgreSQL",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Pastikan bahwa Anda memiliki PostgreSQL >= 9 atau periksa log untuk informasi lebih lanjut tentang kesalahan",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Mohon ubah perizinan menjadi 0770 sehingga direktori tersebut tidak dapat dilihat oleh pengguna lain.",
+    "Data directory (%s) is readable by other users" : "Direktori data (%s) dapat dibaca oleh pengguna lain",
+    "Data directory (%s) is invalid" : "Direktori data (%s) tidak sah",
+    "Please check that the data directory contains a file \".ocdata\" in its root." : "Mohon periksa apakah direktori data berisi sebuah berkas \".ocdata\".",
+    "Could not obtain lock type %d on \"%s\"." : "Tidak bisa memperoleh jenis kunci %d pada \"%s\"."
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 87411743f1e..38aa3de36d6 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Settings" : "設定",
     "Users" : "ユーザー",
     "Admin" : "管理",
+    "Recommended" : "推奨",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "アプリ \\\"%s\\\" をインストールできません。現在のownCloudのバージョンと互換性がありません。",
     "No app name specified" : "アプリ名が未指定",
     "Unknown filetype" : "不明なファイルタイプ",
@@ -109,7 +110,7 @@ OC.L10N.register(
     "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "マジッククォートは有効です。ownCloudを適切に動作させるには無効にする必要があります。",
     "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "マジッククォートは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
     "PHP modules have been installed, but they are still listed as missing?" : "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？",
-    "Please ask your server administrator to restart the web server." : "サーバー管理者にWEBサーバーを再起動するよう依頼してください。",
+    "Please ask your server administrator to restart the web server." : "サーバー管理者にWebサーバーを再起動するよう依頼してください。",
     "PostgreSQL >= 9 required" : "PostgreSQL >= 9 が必要です",
     "Please upgrade your database version" : "新しいバージョンのデータベースにアップグレードしてください",
     "Error occurred while checking PostgreSQL version" : "PostgreSQL のバージョンチェック中にエラーが発生しました",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index dee2589dac3..8a0db934683 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -10,6 +10,7 @@
     "Settings" : "設定",
     "Users" : "ユーザー",
     "Admin" : "管理",
+    "Recommended" : "推奨",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "アプリ \\\"%s\\\" をインストールできません。現在のownCloudのバージョンと互換性がありません。",
     "No app name specified" : "アプリ名が未指定",
     "Unknown filetype" : "不明なファイルタイプ",
@@ -107,7 +108,7 @@
     "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "マジッククォートは有効です。ownCloudを適切に動作させるには無効にする必要があります。",
     "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "マジッククォートは推奨されておらず、ほとんど役に立たない設定のため、無効化すべきです。サーバー管理者に、php.iniもしくはWebサーバー設定で無効化するよう依頼してください。",
     "PHP modules have been installed, but they are still listed as missing?" : "PHP モジュールはインストールされていますが、まだ一覧に表示されていますか？",
-    "Please ask your server administrator to restart the web server." : "サーバー管理者にWEBサーバーを再起動するよう依頼してください。",
+    "Please ask your server administrator to restart the web server." : "サーバー管理者にWebサーバーを再起動するよう依頼してください。",
     "PostgreSQL >= 9 required" : "PostgreSQL >= 9 が必要です",
     "Please upgrade your database version" : "新しいバージョンのデータベースにアップグレードしてください",
     "Error occurred while checking PostgreSQL version" : "PostgreSQL のバージョンチェック中にエラーが発生しました",
diff --git a/lib/l10n/pl.js b/lib/l10n/pl.js
index 318c9c44345..a766151eab2 100644
--- a/lib/l10n/pl.js
+++ b/lib/l10n/pl.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Settings" : "Ustawienia",
     "Users" : "Użytkownicy",
     "Admin" : "Administrator",
+    "Recommended" : "Polecane",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikacja  \\\"%s\\\" nie może zostać zainstalowana ponieważ nie jest kompatybilna z tą wersją ownCloud.",
     "No app name specified" : "Nie określono nazwy aplikacji",
     "Unknown filetype" : "Nieznany typ pliku",
@@ -51,6 +52,7 @@ OC.L10N.register(
     "PostgreSQL username and/or password not valid" : "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
     "Set an admin username." : "Ustaw nazwę administratora.",
     "Set an admin password." : "Ustaw hasło administratora.",
+    "Can't create or write into the data directory %s" : "Nie można tworzyć ani zapisywać w katalogu %s",
     "%s shared »%s« with you" : "%s Współdzielone »%s« z tobą",
     "Sharing %s failed, because the file does not exist" : "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
     "You are not allowed to share %s" : "Nie masz uprawnień aby udostępnić %s",
diff --git a/lib/l10n/pl.json b/lib/l10n/pl.json
index 354dfb065b4..c546a115f5e 100644
--- a/lib/l10n/pl.json
+++ b/lib/l10n/pl.json
@@ -10,6 +10,7 @@
     "Settings" : "Ustawienia",
     "Users" : "Użytkownicy",
     "Admin" : "Administrator",
+    "Recommended" : "Polecane",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikacja  \\\"%s\\\" nie może zostać zainstalowana ponieważ nie jest kompatybilna z tą wersją ownCloud.",
     "No app name specified" : "Nie określono nazwy aplikacji",
     "Unknown filetype" : "Nieznany typ pliku",
@@ -49,6 +50,7 @@
     "PostgreSQL username and/or password not valid" : "PostgreSQL: Nazwa użytkownika i/lub hasło jest niepoprawne",
     "Set an admin username." : "Ustaw nazwę administratora.",
     "Set an admin password." : "Ustaw hasło administratora.",
+    "Can't create or write into the data directory %s" : "Nie można tworzyć ani zapisywać w katalogu %s",
     "%s shared »%s« with you" : "%s Współdzielone »%s« z tobą",
     "Sharing %s failed, because the file does not exist" : "Wspóldzielenie %s nie powiodło się. ponieważ plik nie istnieje",
     "You are not allowed to share %s" : "Nie masz uprawnień aby udostępnić %s",
diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js
new file mode 100644
index 00000000000..55da1e782f6
--- /dev/null
+++ b/lib/l10n/sk.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Personal" : "Osobné",
+    "Settings" : "Nastavenia",
+    "_%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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/lib/l10n/sk.json b/lib/l10n/sk.json
new file mode 100644
index 00000000000..6c4da5395ec
--- /dev/null
+++ b/lib/l10n/sk.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Personal" : "Osobné",
+    "Settings" : "Nastavenia",
+    "_%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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index dba09956e44..aa783fbd69e 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -2,13 +2,18 @@ OC.L10N.register(
     "lib",
     {
     "Cannot write into \"config\" directory!" : "Mapa 'config' nima določenih ustreznih dovoljenj za pisanje!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo.",
     "See %s" : "Oglejte si %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Napako je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo%s.",
     "Sample configuration detected" : "Zaznana je neustrezna preizkusna nastavitev",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zaznano je, da je bila v sistem kopirana datoteka z enostavno nastavitvijo. To lahko vpliva na namestitev in zato možnost ni podprta. Pred spremembami datoteke config.php si natančno preberite dokumentacijo.",
     "Help" : "Pomoč",
     "Personal" : "Osebno",
     "Settings" : "Nastavitve",
     "Users" : "Uporabniki",
     "Admin" : "Skrbništvo",
+    "Recommended" : "Priporočljivo",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Programnika \\\"%s\\\" ni mogoče namestiti, ker različica programa ni skladna z različico okolja ownCloud.",
     "No app name specified" : "Ni podanega imena programa",
     "Unknown filetype" : "Neznana vrsta datoteke",
     "Invalid image" : "Neveljavna slika",
@@ -47,6 +52,7 @@ OC.L10N.register(
     "PostgreSQL username and/or password not valid" : "Uporabniško ime ali geslo PostgreSQL ni veljavno",
     "Set an admin username." : "Nastavi uporabniško ime skrbnika.",
     "Set an admin password." : "Nastavi geslo skrbnika.",
+    "Can't create or write into the data directory %s" : "Ni mogoče zapisati podatkov v podatkovno mapo %s",
     "%s shared »%s« with you" : "%s je omogočil souporabo »%s«",
     "Sharing %s failed, because the file does not exist" : "Souporaba %s je spodletela, ker ta datoteka ne obstaja",
     "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
@@ -56,9 +62,14 @@ OC.L10N.register(
     "Sharing %s failed, because this item is already shared with %s" : "Nastavljanje souporabe %s je spodletela, ker je ima uporabnik %s predmet že v souporabi.",
     "Sharing %s failed, because the group %s does not exist" : "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja.",
     "Sharing %s failed, because %s is not a member of the group %s" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s.",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Navesti je treba geslo za ustvarjanje javne povezave, saj so dovoljene le zaščitene.",
     "Sharing %s failed, because sharing with links is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena.",
     "Share type %s is not valid for %s" : "Vrsta souporabe %s za %s ni veljavna.",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavljanje dovoljenj za %s je spodletelo, saj ta presegajo dovoljenja dodeljena uporabniku %s.",
+    "Setting permissions for %s failed, because the item was not found" : "Nastavljanje dovoljenj za %s je spodletelo, ker predmeta ni mogoče najti.",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ni mogoče določiti datuma preteka. Ni dovoljeno, da so mape ali datoteke, dodeljene v souporabo, v souporabi po %s.",
     "Cannot set expiration date. Expiration date is in the past" : "Ni mogoče nastaviti datuma preteka. Ta datum je že preteklost.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend",
     "Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti",
     "Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti",
     "Sharing %s failed, because the user %s is the original sharer" : "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s omogočil souporabo predmeta.",
@@ -82,18 +93,28 @@ OC.L10N.register(
     "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
     "The username is already being used" : "Vpisano uporabniško ime je že v uporabi",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dovoljenja je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje korensko mapo%s.",
     "Cannot write into \"config\" directory" : "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!",
     "Cannot write into \"apps\" directory" : "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku %s za pisanje v mapo programov %s, ali pa z onemogočanjem nameščanja programov v nastavitveni datoteki.",
+    "Cannot create \"data\" directory (%s)" : "Ni mogoče ustvariti\"podatkovne\" mape (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Napako je mogoče odpraviti z  <a href=\"%s\" target=\"_blank\">dodelitvijo dovoljenja spletnemu strežniku za pisanje v korensko mapo</a>.",
     "Setting locale to %s failed" : "Nastavljanje jezikovnih določil na %s je spodletelo.",
+    "Please install one of these locales on your system and restart your webserver." : "Namestiti je treba podporo za vsaj eno od navedenih jezikovnih določil v sistemu in nato ponovno zagnati spletni strežnik.",
     "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
     "PHP module %s not installed." : "Modul PHP %s ni nameščen.",
     "PHP %s or higher is required." : "Zahtevana je različica PHP %s ali višja.",
     "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Obvestite skrbnika strežnika, da je treba posodobiti okolje PHP na najnovejšo različico. Trenutno nameščene različice skupnost PHP in ownCloud ne podpira več.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Omogočen je varni način PHP. Za pravilno delovanje system ownCloud je treba možnost onemogočiti.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Možnost varnega načina PHP je opuščena in jo je priporočljivo onemogočiti. Stopite v stik s skrbnikom sistema oziroma onemogočite možnost v datoteki php.ini ali med nastavitvami spletnega strežnika.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Omogočena je možnost Magic Quotes. Za pravilno delovanje sistema ownCloud je treba možnost onemogočiti.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Možnost Magic Quotes je opuščena in jo je priporočljivo onemogočiti. Stopite v stik s skrbnikom sistema oziroma onemogočite možnost v datoteki php.ini ali med nastavitvami spletnega strežnika.",
     "PHP modules have been installed, but they are still listed as missing?" : "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
     "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
     "PostgreSQL >= 9 required" : "Zahtevana je različica PostgreSQL >= 9.",
     "Please upgrade your database version" : "Posodobite različico podatkovne zbirke.",
     "Error occurred while checking PostgreSQL version" : "Prišlo je do napake med preverjanjem različice PostgreSQL.",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Prepričajte se, da je nameščena različica PostgreSQL >= 9 in preverite dnevniški zapis za več podrobnosti o napaki.",
     "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Spremenite dovoljenja mape na 0770 in s tem onemogočite branje vsebine drugim uporabnikom.",
     "Data directory (%s) is readable by other users" : "Podatkovna mapa (%s) ima določena dovoljenja za branje skupine.",
     "Data directory (%s) is invalid" : "Podatkovna mapa (%s) ni veljavna.",
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index ac86bd82766..c0cbf41f719 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -1,12 +1,17 @@
 { "translations": {
     "Cannot write into \"config\" directory!" : "Mapa 'config' nima določenih ustreznih dovoljenj za pisanje!",
+    "This can usually be fixed by giving the webserver write access to the config directory" : "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo.",
     "See %s" : "Oglejte si %s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Napako je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje v nastavitveno mapo%s.",
     "Sample configuration detected" : "Zaznana je neustrezna preizkusna nastavitev",
+    "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Zaznano je, da je bila v sistem kopirana datoteka z enostavno nastavitvijo. To lahko vpliva na namestitev in zato možnost ni podprta. Pred spremembami datoteke config.php si natančno preberite dokumentacijo.",
     "Help" : "Pomoč",
     "Personal" : "Osebno",
     "Settings" : "Nastavitve",
     "Users" : "Uporabniki",
     "Admin" : "Skrbništvo",
+    "Recommended" : "Priporočljivo",
+    "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Programnika \\\"%s\\\" ni mogoče namestiti, ker različica programa ni skladna z različico okolja ownCloud.",
     "No app name specified" : "Ni podanega imena programa",
     "Unknown filetype" : "Neznana vrsta datoteke",
     "Invalid image" : "Neveljavna slika",
@@ -45,6 +50,7 @@
     "PostgreSQL username and/or password not valid" : "Uporabniško ime ali geslo PostgreSQL ni veljavno",
     "Set an admin username." : "Nastavi uporabniško ime skrbnika.",
     "Set an admin password." : "Nastavi geslo skrbnika.",
+    "Can't create or write into the data directory %s" : "Ni mogoče zapisati podatkov v podatkovno mapo %s",
     "%s shared »%s« with you" : "%s je omogočil souporabo »%s«",
     "Sharing %s failed, because the file does not exist" : "Souporaba %s je spodletela, ker ta datoteka ne obstaja",
     "You are not allowed to share %s" : "Omogočanje souporabe %s brez ustreznih dovoljenj ni mogoče.",
@@ -54,9 +60,14 @@
     "Sharing %s failed, because this item is already shared with %s" : "Nastavljanje souporabe %s je spodletela, ker je ima uporabnik %s predmet že v souporabi.",
     "Sharing %s failed, because the group %s does not exist" : "Nastavljanje souporabe %s je spodletelo, ker je skupina %s ne obstaja.",
     "Sharing %s failed, because %s is not a member of the group %s" : "Nastavljanje souporabe %s je spodletelo, ker uporabnik %s ni član skupine %s.",
+    "You need to provide a password to create a public link, only protected links are allowed" : "Navesti je treba geslo za ustvarjanje javne povezave, saj so dovoljene le zaščitene.",
     "Sharing %s failed, because sharing with links is not allowed" : "Nastavljanje souporabe %s je spodletelo, ker souporaba preko povezave ni dovoljena.",
     "Share type %s is not valid for %s" : "Vrsta souporabe %s za %s ni veljavna.",
+    "Setting permissions for %s failed, because the permissions exceed permissions granted to %s" : "Nastavljanje dovoljenj za %s je spodletelo, saj ta presegajo dovoljenja dodeljena uporabniku %s.",
+    "Setting permissions for %s failed, because the item was not found" : "Nastavljanje dovoljenj za %s je spodletelo, ker predmeta ni mogoče najti.",
+    "Cannot set expiration date. Shares cannot expire later than %s after they have been shared" : "Ni mogoče določiti datuma preteka. Ni dovoljeno, da so mape ali datoteke, dodeljene v souporabo, v souporabi po %s.",
     "Cannot set expiration date. Expiration date is in the past" : "Ni mogoče nastaviti datuma preteka. Ta datum je že preteklost.",
+    "Sharing backend %s must implement the interface OCP\\Share_Backend" : "Souporaba ozadnjega programa %s mora vsebovati tudi vmesnik OCP\\Share_Backend",
     "Sharing backend %s not found" : "Ozadnjega programa %s za souporabo ni mogoče najti",
     "Sharing backend for %s not found" : "Ozadnjega programa za souporabo za %s ni mogoče najti",
     "Sharing %s failed, because the user %s is the original sharer" : "Nastavljanje souporabe %s je spodletelo, ker je uporabnik %s omogočil souporabo predmeta.",
@@ -80,18 +91,28 @@
     "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
     "The username is already being used" : "Vpisano uporabniško ime je že v uporabi",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Ni nameščenih programnikov podatkovnih zbirk (sqlite, mysql, ali postgresql).",
+    "Permissions can usually be fixed by %sgiving the webserver write access to the root directory%s." : "Dovoljenja je mogoče odpraviti z %sdodelitvijo dovoljenja spletnemu strežniku za pisanje korensko mapo%s.",
     "Cannot write into \"config\" directory" : "Mapa 'config' nima nastavljenih ustreznih dovoljenj za pisanje!",
     "Cannot write into \"apps\" directory" : "Mapa \"apps\" nima nastavljenih ustreznih dovoljenj za pisanje!",
+    "This can usually be fixed by %sgiving the webserver write access to the apps directory%s or disabling the appstore in the config file." : "Napako je mogoče odpraviti z dodelitvijo dovoljenja spletnemu strežniku %s za pisanje v mapo programov %s, ali pa z onemogočanjem nameščanja programov v nastavitveni datoteki.",
+    "Cannot create \"data\" directory (%s)" : "Ni mogoče ustvariti\"podatkovne\" mape (%s)",
+    "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Napako je mogoče odpraviti z  <a href=\"%s\" target=\"_blank\">dodelitvijo dovoljenja spletnemu strežniku za pisanje v korensko mapo</a>.",
     "Setting locale to %s failed" : "Nastavljanje jezikovnih določil na %s je spodletelo.",
+    "Please install one of these locales on your system and restart your webserver." : "Namestiti je treba podporo za vsaj eno od navedenih jezikovnih določil v sistemu in nato ponovno zagnati spletni strežnik.",
     "Please ask your server administrator to install the module." : "Obvestite skrbnika strežnika, da je treba namestiti manjkajoč modul.",
     "PHP module %s not installed." : "Modul PHP %s ni nameščen.",
     "PHP %s or higher is required." : "Zahtevana je različica PHP %s ali višja.",
     "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Obvestite skrbnika strežnika, da je treba posodobiti okolje PHP na najnovejšo različico. Trenutno nameščene različice skupnost PHP in ownCloud ne podpira več.",
+    "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Omogočen je varni način PHP. Za pravilno delovanje system ownCloud je treba možnost onemogočiti.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Možnost varnega načina PHP je opuščena in jo je priporočljivo onemogočiti. Stopite v stik s skrbnikom sistema oziroma onemogočite možnost v datoteki php.ini ali med nastavitvami spletnega strežnika.",
+    "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Omogočena je možnost Magic Quotes. Za pravilno delovanje sistema ownCloud je treba možnost onemogočiti.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Možnost Magic Quotes je opuščena in jo je priporočljivo onemogočiti. Stopite v stik s skrbnikom sistema oziroma onemogočite možnost v datoteki php.ini ali med nastavitvami spletnega strežnika.",
     "PHP modules have been installed, but they are still listed as missing?" : "Ali so bili moduli PHP nameščeni, pa so še vedno označeni kot manjkajoči?",
     "Please ask your server administrator to restart the web server." : "Obvestite skrbnika strežnika, da je treba ponovno zagnati spletni strežnik.",
     "PostgreSQL >= 9 required" : "Zahtevana je različica PostgreSQL >= 9.",
     "Please upgrade your database version" : "Posodobite različico podatkovne zbirke.",
     "Error occurred while checking PostgreSQL version" : "Prišlo je do napake med preverjanjem različice PostgreSQL.",
+    "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "Prepričajte se, da je nameščena različica PostgreSQL >= 9 in preverite dnevniški zapis za več podrobnosti o napaki.",
     "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Spremenite dovoljenja mape na 0770 in s tem onemogočite branje vsebine drugim uporabnikom.",
     "Data directory (%s) is readable by other users" : "Podatkovna mapa (%s) ima določena dovoljenja za branje skupine.",
     "Data directory (%s) is invalid" : "Podatkovna mapa (%s) ni veljavna.",
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index 6bc32b7f74a..6e742fc0b98 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -21,22 +21,49 @@ OC.L10N.register(
     "App directory already exists" : "Тека додатку вже існує",
     "Can't create app folder. Please fix permissions. %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" : "Не вказано шлях при встановлені додатку з локального файлу",
+    "Archives of type %s are not supported" : "Архіви %s не підтримуються",
+    "Failed to open archive when installing app" : "Неможливо відкрити архів при встановлені додатку",
+    "App does not provide an info.xml file" : "Додаток не має файл info.xml",
+    "App can't be installed because of not allowed code in the App" : "Неможливо встановити додаток. Він містить заборонений код",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Неможливо встановити додаток, він є несумісним з даною версією ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Неможливо встановити додаток, оскільки він містить параметр <shipped>true</shipped> заборонений додаткам, що не входять в поставку ",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Неможливо встановити додаток. Версія в файлі info.xml/version не співпадає з заявленою в магазині додатків",
     "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 не можна використовувати крапки в назві бази даних",
     "MS SQL username and/or password not valid: %s" : "MS SQL ім'я користувача та/або пароль не дійсні: %s",
     "You need to enter either an existing account or the administrator." : "Вам потрібно ввести або існуючий обліковий запис або administrator.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB ім'я користувача та/або пароль не дійсні",
     "DB Error: \"%s\"" : "Помилка БД: \"%s\"",
     "Offending command was: \"%s\"" : "Команда, що викликала проблему: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Користувач MySQL/MariaDB '%s'@'localhost' вже існує.",
+    "Drop this user from MySQL/MariaDB" : "Видалити цього користувача з MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Користувач MySQL/MariaDB '%s'@'%%' вже існує",
+    "Drop this user from MySQL/MariaDB." : "Видалити цього користувача з MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Не можемо з'єднатися з Oracle ",
     "Oracle username and/or password not valid" : "Oracle ім'я користувача та/або пароль не дійсні",
     "Offending command was: \"%s\", name: %s, password: %s" : "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
     "PostgreSQL username and/or password not valid" : "PostgreSQL ім'я користувача та/або пароль не дійсні",
     "Set an admin username." : "Встановіть ім'я адміністратора.",
     "Set an admin password." : "Встановіть пароль адміністратора.",
+    "Can't create or write into the data directory %s" : "Неможливо створити або записати каталог даних %s",
     "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "Не вдалося поділитися з %s, оскільки %s вже є володарем",
+    "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 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" : "Вам необхідно задати пароль для створення публічного посилання. Дозволені лише захищені посилання",
+    "Sharing %s failed, because sharing with links is not allowed" : "Не вдалося поділитися %s, оскільки публічний доступ через посилання заборонений",
     "Could not find category \"%s\"" : "Не вдалося знайти категорію \"%s\"",
     "seconds ago" : "секунди тому",
     "_%n minute ago_::_%n minutes ago_" : ["","","%n хвилин тому"],
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index b2f1abd486b..a08191e745a 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -19,22 +19,49 @@
     "App directory already exists" : "Тека додатку вже існує",
     "Can't create app folder. Please fix permissions. %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" : "Не вказано шлях при встановлені додатку з локального файлу",
+    "Archives of type %s are not supported" : "Архіви %s не підтримуються",
+    "Failed to open archive when installing app" : "Неможливо відкрити архів при встановлені додатку",
+    "App does not provide an info.xml file" : "Додаток не має файл info.xml",
+    "App can't be installed because of not allowed code in the App" : "Неможливо встановити додаток. Він містить заборонений код",
+    "App can't be installed because it is not compatible with this version of ownCloud" : "Неможливо встановити додаток, він є несумісним з даною версією ownCloud",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Неможливо встановити додаток, оскільки він містить параметр <shipped>true</shipped> заборонений додаткам, що не входять в поставку ",
+    "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "Неможливо встановити додаток. Версія в файлі info.xml/version не співпадає з заявленою в магазині додатків",
     "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 не можна використовувати крапки в назві бази даних",
     "MS SQL username and/or password not valid: %s" : "MS SQL ім'я користувача та/або пароль не дійсні: %s",
     "You need to enter either an existing account or the administrator." : "Вам потрібно ввести або існуючий обліковий запис або administrator.",
+    "MySQL/MariaDB username and/or password not valid" : "MySQL/MariaDB ім'я користувача та/або пароль не дійсні",
     "DB Error: \"%s\"" : "Помилка БД: \"%s\"",
     "Offending command was: \"%s\"" : "Команда, що викликала проблему: \"%s\"",
+    "MySQL/MariaDB user '%s'@'localhost' exists already." : "Користувач MySQL/MariaDB '%s'@'localhost' вже існує.",
+    "Drop this user from MySQL/MariaDB" : "Видалити цього користувача з MySQL/MariaDB",
+    "MySQL/MariaDB user '%s'@'%%' already exists" : "Користувач MySQL/MariaDB '%s'@'%%' вже існує",
+    "Drop this user from MySQL/MariaDB." : "Видалити цього користувача з MySQL/MariaDB.",
+    "Oracle connection could not be established" : "Не можемо з'єднатися з Oracle ",
     "Oracle username and/or password not valid" : "Oracle ім'я користувача та/або пароль не дійсні",
     "Offending command was: \"%s\", name: %s, password: %s" : "Команда, що викликала проблему: \"%s\", ім'я: %s, пароль: %s",
     "PostgreSQL username and/or password not valid" : "PostgreSQL ім'я користувача та/або пароль не дійсні",
     "Set an admin username." : "Встановіть ім'я адміністратора.",
     "Set an admin password." : "Встановіть пароль адміністратора.",
+    "Can't create or write into the data directory %s" : "Неможливо створити або записати каталог даних %s",
     "%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",
+    "Sharing %s failed, because the user %s is the item owner" : "Не вдалося поділитися з %s, оскільки %s вже є володарем",
+    "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 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" : "Вам необхідно задати пароль для створення публічного посилання. Дозволені лише захищені посилання",
+    "Sharing %s failed, because sharing with links is not allowed" : "Не вдалося поділитися %s, оскільки публічний доступ через посилання заборонений",
     "Could not find category \"%s\"" : "Не вдалося знайти категорію \"%s\"",
     "seconds ago" : "секунди тому",
     "_%n minute ago_::_%n minutes ago_" : ["","","%n хвилин тому"],
diff --git a/lib/l10n/ur.js b/lib/l10n/ur.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/ur.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/ur.json
@@ -0,0 +1,7 @@
+{ "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/ast.js b/settings/l10n/ast.js
index e7a8cac47b8..1a101e07c62 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -1,7 +1,6 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Habilitar",
     "Authentication error" : "Fallu d'autenticación",
     "Your full name has been changed." : "Camudóse'l nome completu.",
     "Unable to change full name" : "Nun pue camudase'l nome completu",
@@ -31,6 +30,8 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
     "Unable to change password" : "Nun pudo camudase la contraseña",
+    "Enabled" : "Habilitar",
+    "Recommended" : "Recomendáu",
     "Saved" : "Guardáu",
     "test email settings" : "probar configuración de corréu",
     "If you received this email, the settings seem to be correct." : "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index 5524c431b0d..4078bf842eb 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -1,5 +1,4 @@
 { "translations": {
-    "Enabled" : "Habilitar",
     "Authentication error" : "Fallu d'autenticación",
     "Your full name has been changed." : "Camudóse'l nome completu.",
     "Unable to change full name" : "Nun pue camudase'l nome completu",
@@ -29,6 +28,8 @@
     "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación d'alministrador incorreuta. Comprueba la contraseña ya inténtalo dempués.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
     "Unable to change password" : "Nun pudo camudase la contraseña",
+    "Enabled" : "Habilitar",
+    "Recommended" : "Recomendáu",
     "Saved" : "Guardáu",
     "test email settings" : "probar configuración de corréu",
     "If you received this email, the settings seem to be correct." : "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index b6ef50d19a0..1e7ccea70a3 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Очаква се валидно име на група",
     "deleted {groupName}" : "{groupName} изтрит",
     "undo" : "възтановяване",
+    "no group" : "няма група",
     "never" : "никога",
     "deleted {userName}" : "{userName} изтрит",
     "add group" : "нова група",
@@ -79,6 +80,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Валидна парола трябва да бъде зададена.",
     "Warning: Home directory for user \"{user}\" already exists" : "Предупреждение: Личната директория на потребителя \"{user}\" вече съществува.",
     "__language_name__" : "__language_name__",
+    "Personal Info" : "Лична Информация",
     "SSL root certificates" : "SSL root сертификати",
     "Encryption" : "Криптиране",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
@@ -227,6 +229,7 @@ OC.L10N.register(
     "Unlimited" : "Неограничено",
     "Other" : "Друга...",
     "Username" : "Потребителско Име",
+    "Group Admin for" : "Групов администратор за",
     "Quota" : "Квота",
     "Storage Location" : "Място за Запис",
     "Last Login" : "Последно Вписване",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index 363cbe9b374..87e52dd3a8e 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -69,6 +69,7 @@
     "A valid group name must be provided" : "Очаква се валидно име на група",
     "deleted {groupName}" : "{groupName} изтрит",
     "undo" : "възтановяване",
+    "no group" : "няма група",
     "never" : "никога",
     "deleted {userName}" : "{userName} изтрит",
     "add group" : "нова група",
@@ -77,6 +78,7 @@
     "A valid password must be provided" : "Валидна парола трябва да бъде зададена.",
     "Warning: Home directory for user \"{user}\" already exists" : "Предупреждение: Личната директория на потребителя \"{user}\" вече съществува.",
     "__language_name__" : "__language_name__",
+    "Personal Info" : "Лична Информация",
     "SSL root certificates" : "SSL root сертификати",
     "Encryption" : "Криптиране",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Всичко (фатални проблеми, грешки, предупреждения, информация, дебъгване)",
@@ -225,6 +227,7 @@
     "Unlimited" : "Неограничено",
     "Other" : "Друга...",
     "Username" : "Потребителско Име",
+    "Group Admin for" : "Групов администратор за",
     "Quota" : "Квота",
     "Storage Location" : "Място за Запис",
     "Last Login" : "Последно Вписване",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index a0c4b88e131..9b90a77a8b5 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Et gyldigt gruppenavn skal angives ",
     "deleted {groupName}" : "slettede {groupName}",
     "undo" : "fortryd",
+    "no group" : "ingen gruppe",
     "never" : "aldrig",
     "deleted {userName}" : "slettede {userName}",
     "add group" : "Tilføj gruppe",
@@ -228,6 +229,7 @@ OC.L10N.register(
     "Unlimited" : "Ubegrænset",
     "Other" : "Andet",
     "Username" : "Brugernavn",
+    "Group Admin for" : "Gruppeadministrator for",
     "Quota" : "Kvote",
     "Storage Location" : "Placering af lageret",
     "Last Login" : "Seneste login",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 328acf78808..10f163c422e 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -69,6 +69,7 @@
     "A valid group name must be provided" : "Et gyldigt gruppenavn skal angives ",
     "deleted {groupName}" : "slettede {groupName}",
     "undo" : "fortryd",
+    "no group" : "ingen gruppe",
     "never" : "aldrig",
     "deleted {userName}" : "slettede {userName}",
     "add group" : "Tilføj gruppe",
@@ -226,6 +227,7 @@
     "Unlimited" : "Ubegrænset",
     "Other" : "Andet",
     "Username" : "Brugernavn",
+    "Group Admin for" : "Gruppeadministrator for",
     "Quota" : "Kvote",
     "Storage Location" : "Placering af lageret",
     "Last Login" : "Seneste login",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 9c686e7f2b7..2628486428f 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -1,9 +1,6 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Aktiviert",
-    "Not enabled" : "Nicht aktiviert",
-    "Recommended" : "Empfohlen",
     "Authentication error" : "Fehler bei der Anmeldung",
     "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
@@ -33,6 +30,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
     "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
     "Saved" : "Gespeichert",
     "test email settings" : "E-Mail-Einstellungen testen",
     "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
@@ -164,7 +164,7 @@ OC.L10N.register(
     "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",
-    "Add your app" : "Fügen Sie Ihre App hinzu",
+    "Add your app" : "Deine App hinzufügen",
     "by" : "von",
     "licensed" : "Lizenziert",
     "Documentation:" : "Dokumentation:",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 1d290029d11..ed665e8c5cc 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -1,7 +1,4 @@
 { "translations": {
-    "Enabled" : "Aktiviert",
-    "Not enabled" : "Nicht aktiviert",
-    "Recommended" : "Empfohlen",
     "Authentication error" : "Fehler bei der Anmeldung",
     "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
@@ -31,6 +28,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfe das Passwort und versuche es erneut.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Back-End unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
     "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
     "Saved" : "Gespeichert",
     "test email settings" : "E-Mail-Einstellungen testen",
     "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, sind die Einstellungen korrekt.",
@@ -162,7 +162,7 @@
     "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",
-    "Add your app" : "Fügen Sie Ihre App hinzu",
+    "Add your app" : "Deine App hinzufügen",
     "by" : "von",
     "licensed" : "Lizenziert",
     "Documentation:" : "Dokumentation:",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 45b35b0abd1..0a31f94a05b 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -1,9 +1,6 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Aktiviert",
-    "Not enabled" : "Nicht aktiviert",
-    "Recommended" : "Empfohlen",
     "Authentication error" : "Authentifizierungs-Fehler",
     "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
@@ -33,6 +30,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
     "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
     "Saved" : "Gespeichert",
     "test email settings" : "E-Mail-Einstellungen testen",
     "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, scheinen die Einstellungen richtig zu sein.",
@@ -164,7 +164,7 @@ OC.L10N.register(
     "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",
-    "Add your app" : "Füge Deine App hinzu",
+    "Add your app" : "Ihre App hinzufügen",
     "by" : "von",
     "licensed" : "Lizenziert",
     "Documentation:" : "Dokumentation:",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 346e8790f30..589dceaa53d 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -1,7 +1,4 @@
 { "translations": {
-    "Enabled" : "Aktiviert",
-    "Not enabled" : "Nicht aktiviert",
-    "Recommended" : "Empfohlen",
     "Authentication error" : "Authentifizierungs-Fehler",
     "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
@@ -31,6 +28,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Falsches Wiederherstellungspasswort für das Admin-Konto. Bitte überprüfen Sie das Passwort und versuchen Sie es erneut.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Das Hintergrundprogramm unterstützt die Passwortänderung nicht, aber der Benutzerschlüssel wurde erfolgreich aktualisiert.",
     "Unable to change password" : "Passwort konnte nicht geändert werden",
+    "Enabled" : "Aktiviert",
+    "Not enabled" : "Nicht aktiviert",
+    "Recommended" : "Empfohlen",
     "Saved" : "Gespeichert",
     "test email settings" : "E-Mail-Einstellungen testen",
     "If you received this email, the settings seem to be correct." : "Wenn Sie diese E-Mail erhalten haben, scheinen die Einstellungen richtig zu sein.",
@@ -162,7 +162,7 @@
     "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",
-    "Add your app" : "Füge Deine App hinzu",
+    "Add your app" : "Ihre App hinzufügen",
     "by" : "von",
     "licensed" : "Lizenziert",
     "Documentation:" : "Dokumentation:",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index d4c75399fa4..7d9d0f4c4f6 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
     "deleted {groupName}" : "διαγραφή {groupName}",
     "undo" : "αναίρεση",
+    "no group" : "καμια ομάδα",
     "never" : "ποτέ",
     "deleted {userName}" : "διαγραφή {userName}",
     "add group" : "προσθήκη ομάδας",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index c2c202a3206..f6a0aa3ef75 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -69,6 +69,7 @@
     "A valid group name must be provided" : "Πρέπει να δοθεί ένα έγκυρο όνομα ομάδας",
     "deleted {groupName}" : "διαγραφή {groupName}",
     "undo" : "αναίρεση",
+    "no group" : "καμια ομάδα",
     "never" : "ποτέ",
     "deleted {userName}" : "διαγραφή {userName}",
     "add group" : "προσθήκη ομάδας",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 510f4c14c78..16c250d1716 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Se debe dar un nombre válido para el grupo ",
     "deleted {groupName}" : "borrado {groupName}",
     "undo" : "deshacer",
+    "no group" : "sin grupo",
     "never" : "nunca",
     "deleted {userName}" : "borrado {userName}",
     "add group" : "añadir Grupo",
@@ -228,6 +229,7 @@ OC.L10N.register(
     "Unlimited" : "Ilimitado",
     "Other" : "Otro",
     "Username" : "Nombre de usuario",
+    "Group Admin for" : "Grupo administrador para",
     "Quota" : "Cuota",
     "Storage Location" : "Ubicación de almacenamiento",
     "Last Login" : "Último inicio de sesión",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 15113b4ff2d..dcb17e3bfb6 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -69,6 +69,7 @@
     "A valid group name must be provided" : "Se debe dar un nombre válido para el grupo ",
     "deleted {groupName}" : "borrado {groupName}",
     "undo" : "deshacer",
+    "no group" : "sin grupo",
     "never" : "nunca",
     "deleted {userName}" : "borrado {userName}",
     "add group" : "añadir Grupo",
@@ -226,6 +227,7 @@
     "Unlimited" : "Ilimitado",
     "Other" : "Otro",
     "Username" : "Nombre de usuario",
+    "Group Admin for" : "Grupo administrador para",
     "Quota" : "Cuota",
     "Storage Location" : "Ubicación de almacenamiento",
     "Last Login" : "Último inicio de sesión",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index d64a74f86bf..94324f5b23c 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -1,7 +1,6 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Gaitua",
     "Authentication error" : "Autentifikazio errorea",
     "Your full name has been changed." : "Zure izena aldatu egin da.",
     "Unable to change full name" : "Ezin izan da izena aldatu",
@@ -31,9 +30,12 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
     "Unable to change password" : "Ezin izan da pasahitza aldatu",
+    "Enabled" : "Gaitua",
+    "Recommended" : "Aholkatuta",
     "Saved" : "Gordeta",
     "test email settings" : "probatu eposta ezarpenak",
     "If you received this email, the settings seem to be correct." : "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
+    "A problem occurred while sending the email. Please revise your settings." : "Arazo bat gertatu da eposta bidaltzean. Berrikusi zure ezarpenak.",
     "Email sent" : "Eposta bidalia",
     "You need to set your user email before being able to send test emails." : "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
@@ -57,6 +59,7 @@ OC.L10N.register(
     "So-so password" : "Halamoduzko pasahitza",
     "Good password" : "Pasahitz ona",
     "Strong password" : "Pasahitz sendoa",
+    "Valid until {date}" : "{date} arte baliogarria",
     "Delete" : "Ezabatu",
     "Decrypting files... Please wait, this can take some time." : "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
     "Delete encryption keys permanently." : "Ezabatu enkriptatze gakoak behin betiko",
@@ -67,6 +70,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Baliozko talde izena eman behar da",
     "deleted {groupName}" : "{groupName} ezbatuta",
     "undo" : "desegin",
+    "no group" : "talderik ez",
     "never" : "inoiz",
     "deleted {userName}" : "{userName} ezabatuta",
     "add group" : "gehitu taldea",
@@ -75,6 +79,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Baliozko pasahitza eman behar da",
     "Warning: Home directory for user \"{user}\" already exists" : "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
     "__language_name__" : "Euskara",
+    "Personal Info" : "Informazio Pertsonala",
     "SSL root certificates" : "SSL erro ziurtagiriak",
     "Encryption" : "Enkriptazioa",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
@@ -108,6 +113,8 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
     "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+    "Connectivity checks" : "Konexio egiaztapenak",
+    "No problems found" : "Ez da problemarik aurkitu",
     "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
     "Cron" : "Cron",
     "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
@@ -146,6 +153,7 @@ OC.L10N.register(
     "Credentials" : "Kredentzialak",
     "SMTP Username" : "SMTP erabiltzaile-izena",
     "SMTP Password" : "SMTP pasahitza",
+    "Store credentials" : "Gorde kredentzialak",
     "Test email settings" : "Probatu eposta ezarpenak",
     "Send email" : "Bidali eposta",
     "Log" : "Log",
@@ -155,10 +163,12 @@ OC.L10N.register(
     "Version" : "Bertsioa",
     "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
     "More apps" : "App gehiago",
+    "Add your app" : "Gehitu zure aplikazioa",
     "by" : " Egilea:",
     "Documentation:" : "Dokumentazioa:",
     "User Documentation" : "Erabiltzaile dokumentazioa",
     "Admin Documentation" : "Administrazio dokumentazioa",
+    "Update to %s" : "Eguneratu %sra",
     "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako",
     "Uninstall App" : "Desinstalatu aplikazioa",
     "Administrator Documentation" : "Administratzaile dokumentazioa",
@@ -190,6 +200,7 @@ OC.L10N.register(
     "Choose as profile image" : "Profil irudi bezala aukeratu",
     "Language" : "Hizkuntza",
     "Help translate" : "Lagundu itzultzen",
+    "Issued By" : "Honek bidalita",
     "Import Root Certificate" : "Inportatu erro ziurtagiria",
     "The encryption app is no longer enabled, please decrypt all your files" : "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
     "Log-in password" : "Saioa hasteko pasahitza",
@@ -197,6 +208,8 @@ OC.L10N.register(
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
     "Restore Encryption Keys" : "Lehenera itzazu enkriptatze gakoak.",
     "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
+    "Show storage location" : "Erakutsi biltegiaren kokapena",
+    "Show last log in" : "Erakutsi azkeneko saio hasiera",
     "Login Name" : "Sarrera Izena",
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index c2ad4ccc5bc..704c4373d0c 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -1,5 +1,4 @@
 { "translations": {
-    "Enabled" : "Gaitua",
     "Authentication error" : "Autentifikazio errorea",
     "Your full name has been changed." : "Zure izena aldatu egin da.",
     "Unable to change full name" : "Ezin izan da izena aldatu",
@@ -29,9 +28,12 @@
     "Wrong admin recovery password. Please check the password and try again." : "Administratzailearen berreskuratze pasahitza ez egokia. Mesedez egiaztatu pasahitza eta saiatu berriz.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Atzeko prozesuak ez du pasahitz aldaketa onartzen, baina erabiltzailearen enkriptatze gakoa ongi eguneratu da.",
     "Unable to change password" : "Ezin izan da pasahitza aldatu",
+    "Enabled" : "Gaitua",
+    "Recommended" : "Aholkatuta",
     "Saved" : "Gordeta",
     "test email settings" : "probatu eposta ezarpenak",
     "If you received this email, the settings seem to be correct." : "Eposta hau jaso baduzu, zure ezarpenak egokiak direnaren seinale",
+    "A problem occurred while sending the email. Please revise your settings." : "Arazo bat gertatu da eposta bidaltzean. Berrikusi zure ezarpenak.",
     "Email sent" : "Eposta bidalia",
     "You need to set your user email before being able to send test emails." : "Epostaren erabiltzailea zehaztu behar duzu probako eposta bidali aurretik.",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ziur zaude gehitu nahi duzula  \"{domain}\" domeinu fidagarri gisa?",
@@ -55,6 +57,7 @@
     "So-so password" : "Halamoduzko pasahitza",
     "Good password" : "Pasahitz ona",
     "Strong password" : "Pasahitz sendoa",
+    "Valid until {date}" : "{date} arte baliogarria",
     "Delete" : "Ezabatu",
     "Decrypting files... Please wait, this can take some time." : "Fitxategiak deskodetzen... Itxaron, bere denbora eskatzen du.",
     "Delete encryption keys permanently." : "Ezabatu enkriptatze gakoak behin betiko",
@@ -65,6 +68,7 @@
     "A valid group name must be provided" : "Baliozko talde izena eman behar da",
     "deleted {groupName}" : "{groupName} ezbatuta",
     "undo" : "desegin",
+    "no group" : "talderik ez",
     "never" : "inoiz",
     "deleted {userName}" : "{userName} ezabatuta",
     "add group" : "gehitu taldea",
@@ -73,6 +77,7 @@
     "A valid password must be provided" : "Baliozko pasahitza eman behar da",
     "Warning: Home directory for user \"{user}\" already exists" : "Abisua: \"{user}\" erabiltzailearen Home karpeta dagoeneko exisititzen da",
     "__language_name__" : "Euskara",
+    "Personal Info" : "Informazio Pertsonala",
     "SSL root certificates" : "SSL erro ziurtagiriak",
     "Encryption" : "Enkriptazioa",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Dena (arazo larriak, erroreak, abisuak, informazioa, arazketa)",
@@ -106,6 +111,8 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
     "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
+    "Connectivity checks" : "Konexio egiaztapenak",
+    "No problems found" : "Ez da problemarik aurkitu",
     "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
     "Cron" : "Cron",
     "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
@@ -144,6 +151,7 @@
     "Credentials" : "Kredentzialak",
     "SMTP Username" : "SMTP erabiltzaile-izena",
     "SMTP Password" : "SMTP pasahitza",
+    "Store credentials" : "Gorde kredentzialak",
     "Test email settings" : "Probatu eposta ezarpenak",
     "Send email" : "Bidali eposta",
     "Log" : "Log",
@@ -153,10 +161,12 @@
     "Version" : "Bertsioa",
     "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
     "More apps" : "App gehiago",
+    "Add your app" : "Gehitu zure aplikazioa",
     "by" : " Egilea:",
     "Documentation:" : "Dokumentazioa:",
     "User Documentation" : "Erabiltzaile dokumentazioa",
     "Admin Documentation" : "Administrazio dokumentazioa",
+    "Update to %s" : "Eguneratu %sra",
     "Enable only for specific groups" : "Baimendu bakarri talde espezifikoetarako",
     "Uninstall App" : "Desinstalatu aplikazioa",
     "Administrator Documentation" : "Administratzaile dokumentazioa",
@@ -188,6 +198,7 @@
     "Choose as profile image" : "Profil irudi bezala aukeratu",
     "Language" : "Hizkuntza",
     "Help translate" : "Lagundu itzultzen",
+    "Issued By" : "Honek bidalita",
     "Import Root Certificate" : "Inportatu erro ziurtagiria",
     "The encryption app is no longer enabled, please decrypt all your files" : "Enkriptazio aplikazioa ez dago jada gaiturik, mesedez desenkriptatu zure fitxategi guztiak.",
     "Log-in password" : "Saioa hasteko pasahitza",
@@ -195,6 +206,8 @@
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Zure enkriptatze gakoak babeskopiara eraman dira. Zerbait gaizki ateratzen bada berreskura ditzakezu giltzak. Behin betirako ezabatu bakarrik ziur bazaude fitxategi guztiak ongi deskodetu badira.",
     "Restore Encryption Keys" : "Lehenera itzazu enkriptatze gakoak.",
     "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
+    "Show storage location" : "Erakutsi biltegiaren kokapena",
+    "Show last log in" : "Erakutsi azkeneko saio hasiera",
     "Login Name" : "Sarrera Izena",
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 84da0f59d4b..05c2ca65bc6 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -1,9 +1,6 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Activée",
-    "Not enabled" : "Désactivée",
-    "Recommended" : "Recommandée",
     "Authentication error" : "Erreur d'authentification",
     "Your full name has been changed." : "Votre nom complet a été modifié.",
     "Unable to change full name" : "Impossible de changer le nom complet",
@@ -33,6 +30,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
     "Unable to change password" : "Impossible de modifier le mot de passe",
+    "Enabled" : "Activées",
+    "Not enabled" : "Désactivées",
+    "Recommended" : "Recommandées",
     "Saved" : "Sauvegardé",
     "test email settings" : "tester les paramètres d'e-mail",
     "If you received this email, the settings seem to be correct." : "Si vous recevez cet email, c'est que les paramètres sont corrects",
@@ -71,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Vous devez spécifier un nom de groupe valide",
     "deleted {groupName}" : "{groupName} supprimé",
     "undo" : "annuler",
+    "no group" : "Aucun groupe",
     "never" : "jamais",
     "deleted {userName}" : "{userName} supprimé",
     "add group" : "ajouter un groupe",
@@ -79,6 +80,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Un mot de passe valide doit être saisi",
     "Warning: Home directory for user \"{user}\" already exists" : "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
     "__language_name__" : "Français",
+    "Personal Info" : "Informations personnelles",
     "SSL root certificates" : "Certificats racine SSL",
     "Encryption" : "Chiffrement",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
@@ -177,7 +179,7 @@ OC.L10N.register(
     "Bugtracker" : "Suivi de bugs",
     "Commercial Support" : "Support commercial",
     "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voulez soutenir le projet,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez en</a> !",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voulez soutenir le projet, \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou \n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez-en</a> !",
     "Show First Run Wizard again" : "Revoir le premier lancement de l'installeur",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
     "Password" : "Mot de passe",
@@ -189,12 +191,12 @@ OC.L10N.register(
     "Full Name" : "Nom complet",
     "Email" : "Adresse mail",
     "Your email address" : "Votre adresse e-mail",
-    "Fill in an email address to enable password recovery and receive notifications" : "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
+    "Fill in an email address to enable password recovery and receive notifications" : "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
     "Profile picture" : "Photo de profil",
     "Upload new" : "Nouvelle depuis votre ordinateur",
     "Select new from Files" : "Nouvelle depuis les Fichiers",
     "Remove image" : "Supprimer l'image",
-    "Either png or jpg. Ideally square but you will be able to crop it." : "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Format png ou jpg. Idéalement carrée, mais vous pourrez la recadrer.",
     "Your avatar is provided by your original account." : "Votre avatar est fourni par votre compte original.",
     "Cancel" : "Annuler",
     "Choose as profile image" : "Choisir en tant que photo de profil ",
@@ -227,6 +229,7 @@ OC.L10N.register(
     "Unlimited" : "Illimité",
     "Other" : "Autre",
     "Username" : "Nom d'utilisateur",
+    "Group Admin for" : "Administrateur de groupe pour",
     "Quota" : "Quota",
     "Storage Location" : "Emplacement du Stockage",
     "Last Login" : "Dernière Connexion",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 21f2424729e..635b1840ba1 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -1,7 +1,4 @@
 { "translations": {
-    "Enabled" : "Activée",
-    "Not enabled" : "Désactivée",
-    "Recommended" : "Recommandée",
     "Authentication error" : "Erreur d'authentification",
     "Your full name has been changed." : "Votre nom complet a été modifié.",
     "Unable to change full name" : "Impossible de changer le nom complet",
@@ -31,6 +28,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
     "Unable to change password" : "Impossible de modifier le mot de passe",
+    "Enabled" : "Activées",
+    "Not enabled" : "Désactivées",
+    "Recommended" : "Recommandées",
     "Saved" : "Sauvegardé",
     "test email settings" : "tester les paramètres d'e-mail",
     "If you received this email, the settings seem to be correct." : "Si vous recevez cet email, c'est que les paramètres sont corrects",
@@ -69,6 +69,7 @@
     "A valid group name must be provided" : "Vous devez spécifier un nom de groupe valide",
     "deleted {groupName}" : "{groupName} supprimé",
     "undo" : "annuler",
+    "no group" : "Aucun groupe",
     "never" : "jamais",
     "deleted {userName}" : "{userName} supprimé",
     "add group" : "ajouter un groupe",
@@ -77,6 +78,7 @@
     "A valid password must be provided" : "Un mot de passe valide doit être saisi",
     "Warning: Home directory for user \"{user}\" already exists" : "Attention : Le dossier Home pour l'utilisateur \"{user}\" existe déjà",
     "__language_name__" : "Français",
+    "Personal Info" : "Informations personnelles",
     "SSL root certificates" : "Certificats racine SSL",
     "Encryption" : "Chiffrement",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tout (erreurs fatales, erreurs, avertissements, informations, debogage)",
@@ -175,7 +177,7 @@
     "Bugtracker" : "Suivi de bugs",
     "Commercial Support" : "Support commercial",
     "Get the apps to sync your files" : "Obtenez les applications de synchronisation de vos fichiers",
-    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voulez soutenir le projet,\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez en</a> !",
+    "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Si voulez soutenir le projet, \n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">rejoignez le développement</a>\n\t\tou \n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">parlez-en</a> !",
     "Show First Run Wizard again" : "Revoir le premier lancement de l'installeur",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Vous avez utilisé <strong>%s</strong> des <strong>%s<strong> disponibles",
     "Password" : "Mot de passe",
@@ -187,12 +189,12 @@
     "Full Name" : "Nom complet",
     "Email" : "Adresse mail",
     "Your email address" : "Votre adresse e-mail",
-    "Fill in an email address to enable password recovery and receive notifications" : "Saisir une adresse e-mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
+    "Fill in an email address to enable password recovery and receive notifications" : "Saisissez votre adresse mail pour permettre la réinitialisation du mot de passe et la réception des notifications",
     "Profile picture" : "Photo de profil",
     "Upload new" : "Nouvelle depuis votre ordinateur",
     "Select new from Files" : "Nouvelle depuis les Fichiers",
     "Remove image" : "Supprimer l'image",
-    "Either png or jpg. Ideally square but you will be able to crop it." : "Soit png ou jpg. Idéalement carrée mais vous pourrez la recadrer.",
+    "Either png or jpg. Ideally square but you will be able to crop it." : "Format png ou jpg. Idéalement carrée, mais vous pourrez la recadrer.",
     "Your avatar is provided by your original account." : "Votre avatar est fourni par votre compte original.",
     "Cancel" : "Annuler",
     "Choose as profile image" : "Choisir en tant que photo de profil ",
@@ -225,6 +227,7 @@
     "Unlimited" : "Illimité",
     "Other" : "Autre",
     "Username" : "Nom d'utilisateur",
+    "Group Admin for" : "Administrateur de groupe pour",
     "Quota" : "Quota",
     "Storage Location" : "Emplacement du Stockage",
     "Last Login" : "Dernière Connexion",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 0e873936417..1f0f9e4b824 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Deve essere fornito un nome valido per il gruppo",
     "deleted {groupName}" : "{groupName} eliminato",
     "undo" : "annulla",
+    "no group" : "nessun gruppo",
     "never" : "mai",
     "deleted {userName}" : "{userName} eliminato",
     "add group" : "aggiungi gruppo",
@@ -228,6 +229,7 @@ OC.L10N.register(
     "Unlimited" : "Illimitata",
     "Other" : "Altro",
     "Username" : "Nome utente",
+    "Group Admin for" : "Gruppo di amministrazione per",
     "Quota" : "Quote",
     "Storage Location" : "Posizione di archiviazione",
     "Last Login" : "Ultimo accesso",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index f8766d05fff..56868a21c96 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -69,6 +69,7 @@
     "A valid group name must be provided" : "Deve essere fornito un nome valido per il gruppo",
     "deleted {groupName}" : "{groupName} eliminato",
     "undo" : "annulla",
+    "no group" : "nessun gruppo",
     "never" : "mai",
     "deleted {userName}" : "{userName} eliminato",
     "add group" : "aggiungi gruppo",
@@ -226,6 +227,7 @@
     "Unlimited" : "Illimitata",
     "Other" : "Altro",
     "Username" : "Nome utente",
+    "Group Admin for" : "Gruppo di amministrazione per",
     "Quota" : "Quote",
     "Storage Location" : "Posizione di archiviazione",
     "Last Login" : "Ultimo accesso",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 169f0521444..bab26197c9e 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -1,7 +1,6 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "有効",
     "Authentication error" : "認証エラー",
     "Your full name has been changed." : "名前を変更しました。",
     "Unable to change full name" : "名前を変更できません",
@@ -31,9 +30,13 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
     "Unable to change password" : "パスワードを変更できません",
+    "Enabled" : "有効",
+    "Not enabled" : "無効",
+    "Recommended" : "推奨",
     "Saved" : "保存されました",
-    "test email settings" : "メール設定をテスト",
+    "test email settings" : "メール設定のテスト",
     "If you received this email, the settings seem to be correct." : "このメールを受け取ったら、設定は正しいはずです。",
+    "A problem occurred while sending the email. Please revise your settings." : "メールの送信中に問題が発生しました。設定を確認してください。",
     "Email sent" : "メールを送信しました",
     "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
@@ -68,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "有効なグループ名を指定する必要があります",
     "deleted {groupName}" : "{groupName} を削除しました",
     "undo" : "元に戻す",
+    "no group" : "未グループ",
     "never" : "なし",
     "deleted {userName}" : "{userName} を削除しました",
     "add group" : "グループを追加",
@@ -138,7 +142,7 @@ OC.L10N.register(
     "Forces the clients to connect to %s via an encrypted connection." : "クライアントから %sへの接続を常に暗号化します。",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
     "Email Server" : "メールサーバー",
-    "This is used for sending out notifications." : "これは通知の送信に使われます。",
+    "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
     "From address" : "送信元アドレス",
     "mail" : "メール",
@@ -149,7 +153,7 @@ OC.L10N.register(
     "Credentials" : "資格情報",
     "SMTP Username" : "SMTP ユーザー名",
     "SMTP Password" : "SMTP パスワード",
-    "Test email settings" : "メール設定をテスト",
+    "Test email settings" : "メール設定のテスト",
     "Send email" : "メールを送信",
     "Log" : "ログ",
     "Log level" : "ログレベル",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 67f62aa68a9..681ff0ddebc 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -1,5 +1,4 @@
 { "translations": {
-    "Enabled" : "有効",
     "Authentication error" : "認証エラー",
     "Your full name has been changed." : "名前を変更しました。",
     "Unable to change full name" : "名前を変更できません",
@@ -29,9 +28,13 @@
     "Wrong admin recovery password. Please check the password and try again." : "リカバリ用の管理者パスワードが間違っています。パスワードを確認して再度実行してください。",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "バックエンドはパスワード変更をサポートしていませんが、ユーザーの暗号化キーは正常に更新されました。",
     "Unable to change password" : "パスワードを変更できません",
+    "Enabled" : "有効",
+    "Not enabled" : "無効",
+    "Recommended" : "推奨",
     "Saved" : "保存されました",
-    "test email settings" : "メール設定をテスト",
+    "test email settings" : "メール設定のテスト",
     "If you received this email, the settings seem to be correct." : "このメールを受け取ったら、設定は正しいはずです。",
+    "A problem occurred while sending the email. Please revise your settings." : "メールの送信中に問題が発生しました。設定を確認してください。",
     "Email sent" : "メールを送信しました",
     "You need to set your user email before being able to send test emails." : "ユーザーメールを設定して初めて、テストメールを送信することができるようになります。",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "\"{domain}\" を信頼するドメインに追加してもよろしいでしょうか？",
@@ -66,6 +69,7 @@
     "A valid group name must be provided" : "有効なグループ名を指定する必要があります",
     "deleted {groupName}" : "{groupName} を削除しました",
     "undo" : "元に戻す",
+    "no group" : "未グループ",
     "never" : "なし",
     "deleted {userName}" : "{userName} を削除しました",
     "add group" : "グループを追加",
@@ -136,7 +140,7 @@
     "Forces the clients to connect to %s via an encrypted connection." : "クライアントから %sへの接続を常に暗号化します。",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
     "Email Server" : "メールサーバー",
-    "This is used for sending out notifications." : "これは通知の送信に使われます。",
+    "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
     "From address" : "送信元アドレス",
     "mail" : "メール",
@@ -147,7 +151,7 @@
     "Credentials" : "資格情報",
     "SMTP Username" : "SMTP ユーザー名",
     "SMTP Password" : "SMTP パスワード",
-    "Test email settings" : "メール設定をテスト",
+    "Test email settings" : "メール設定のテスト",
     "Send email" : "メールを送信",
     "Log" : "ログ",
     "Log level" : "ログレベル",
diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js
index 477b81d6b48..a838823210b 100644
--- a/settings/l10n/nn_NO.js
+++ b/settings/l10n/nn_NO.js
@@ -15,8 +15,8 @@ OC.L10N.register(
     "Unable to remove user from group %s" : "Klarte ikkje fjerna brukaren frå gruppa %s",
     "Couldn't update app." : "Klarte ikkje oppdatera programmet.",
     "Wrong password" : "Feil passord",
-    "No user supplied" : "Ingen brukar gitt",
-    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
+    "No user supplied" : "Ingen brukar gjeve",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gje eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
     "Wrong admin recovery password. Please check the password and try again." : "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
     "Unable to change password" : "Klarte ikkje å endra passordet",
diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json
index 8971c913a4a..2383ba4be76 100644
--- a/settings/l10n/nn_NO.json
+++ b/settings/l10n/nn_NO.json
@@ -13,8 +13,8 @@
     "Unable to remove user from group %s" : "Klarte ikkje fjerna brukaren frå gruppa %s",
     "Couldn't update app." : "Klarte ikkje oppdatera programmet.",
     "Wrong password" : "Feil passord",
-    "No user supplied" : "Ingen brukar gitt",
-    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gi eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
+    "No user supplied" : "Ingen brukar gjeve",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ver venleg og gje eit admingjenopprettingspassord, elles vil all brukardata gå tapt.",
     "Wrong admin recovery password. Please check the password and try again." : "Feil admingjenopprettingspassord. Ver venleg og sjekk passordet og prøv igjen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Bakstykket støttar ikkje passordendring, men krypteringsnøkkelen til brukaren blei oppdatert.",
     "Unable to change password" : "Klarte ikkje å endra passordet",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index b1b88da2661..3036f76d513 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "settings",
     {
     "Enabled" : "Włączone",
+    "Not enabled" : "Nie włączone",
+    "Recommended" : "Polecane",
     "Authentication error" : "Błąd uwierzytelniania",
     "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
     "Unable to change full name" : "Nie można zmienić pełnej nazwy",
@@ -34,6 +36,7 @@ OC.L10N.register(
     "Saved" : "Zapisano",
     "test email settings" : "przetestuj ustawienia email",
     "If you received this email, the settings seem to be correct." : "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Pojawił się problem podczas wysyłania email. Proszę sprawdzić ponownie ustawienia",
     "Email sent" : "E-mail wysłany",
     "You need to set your user email before being able to send test emails." : "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
@@ -68,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Należy podać prawidłową nazwę grupy",
     "deleted {groupName}" : "usunięto {groupName}",
     "undo" : "cofnij",
+    "no group" : "brak grupy",
     "never" : "nigdy",
     "deleted {userName}" : "usunięto {userName}",
     "add group" : "dodaj grupę",
@@ -76,6 +80,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Należy podać prawidłowe hasło",
     "Warning: Home directory for user \"{user}\" already exists" : "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
     "__language_name__" : "polski",
+    "Personal Info" : "Informacje osobiste",
     "SSL root certificates" : "Główny certyfikat SSL",
     "Encryption" : "Szyfrowanie",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
@@ -158,10 +163,13 @@ OC.L10N.register(
     "Version" : "Wersja",
     "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>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Więcej aplikacji",
+    "Add your app" : "Dodaj twoją aplikację",
     "by" : "przez",
+    "licensed" : "Licencja",
     "Documentation:" : "Dokumentacja:",
     "User Documentation" : "Dokumentacja użytkownika",
     "Admin Documentation" : "Dokumentacja Administratora",
+    "Update to %s" : "Aktualizuj do %s",
     "Enable only for specific groups" : "Włącz tylko dla określonych grup",
     "Uninstall App" : "Odinstaluj aplikację",
     "Administrator Documentation" : "Dokumentacja administratora",
@@ -220,6 +228,7 @@ OC.L10N.register(
     "Unlimited" : "Bez limitu",
     "Other" : "Inne",
     "Username" : "Nazwa użytkownika",
+    "Group Admin for" : "Grupa Admin dla",
     "Quota" : "Udział",
     "Storage Location" : "Lokalizacja magazynu",
     "Last Login" : "Ostatnio zalogowany",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index eb34091a7f9..042495d6dc5 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Enabled" : "Włączone",
+    "Not enabled" : "Nie włączone",
+    "Recommended" : "Polecane",
     "Authentication error" : "Błąd uwierzytelniania",
     "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
     "Unable to change full name" : "Nie można zmienić pełnej nazwy",
@@ -32,6 +34,7 @@
     "Saved" : "Zapisano",
     "test email settings" : "przetestuj ustawienia email",
     "If you received this email, the settings seem to be correct." : "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Pojawił się problem podczas wysyłania email. Proszę sprawdzić ponownie ustawienia",
     "Email sent" : "E-mail wysłany",
     "You need to set your user email before being able to send test emails." : "Musisz najpierw ustawić użytkownika e-mail, aby móc wysyłać wiadomości testowe.",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Czy jesteś pewien/pewna że chcesz dodać \"{domain}\" jako zaufaną domenę?",
@@ -66,6 +69,7 @@
     "A valid group name must be provided" : "Należy podać prawidłową nazwę grupy",
     "deleted {groupName}" : "usunięto {groupName}",
     "undo" : "cofnij",
+    "no group" : "brak grupy",
     "never" : "nigdy",
     "deleted {userName}" : "usunięto {userName}",
     "add group" : "dodaj grupę",
@@ -74,6 +78,7 @@
     "A valid password must be provided" : "Należy podać prawidłowe hasło",
     "Warning: Home directory for user \"{user}\" already exists" : "Ostrzeżenie: Katalog domowy dla użytkownika \"{user}\" już istnieje",
     "__language_name__" : "polski",
+    "Personal Info" : "Informacje osobiste",
     "SSL root certificates" : "Główny certyfikat SSL",
     "Encryption" : "Szyfrowanie",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Wszystko  (Informacje, ostrzeżenia, błędy i poważne problemy, debug)",
@@ -156,10 +161,13 @@
     "Version" : "Wersja",
     "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>." : "Stworzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\">społeczność ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Więcej aplikacji",
+    "Add your app" : "Dodaj twoją aplikację",
     "by" : "przez",
+    "licensed" : "Licencja",
     "Documentation:" : "Dokumentacja:",
     "User Documentation" : "Dokumentacja użytkownika",
     "Admin Documentation" : "Dokumentacja Administratora",
+    "Update to %s" : "Aktualizuj do %s",
     "Enable only for specific groups" : "Włącz tylko dla określonych grup",
     "Uninstall App" : "Odinstaluj aplikację",
     "Administrator Documentation" : "Dokumentacja administratora",
@@ -218,6 +226,7 @@
     "Unlimited" : "Bez limitu",
     "Other" : "Inne",
     "Username" : "Nazwa użytkownika",
+    "Group Admin for" : "Grupa Admin dla",
     "Quota" : "Udział",
     "Storage Location" : "Lokalizacja magazynu",
     "Last Login" : "Ostatnio zalogowany",
diff --git a/settings/l10n/sk.js b/settings/l10n/sk.js
new file mode 100644
index 00000000000..e48cc9d9ed9
--- /dev/null
+++ b/settings/l10n/sk.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..609a62d21fd
--- /dev/null
+++ b/settings/l10n/sk.json
@@ -0,0 +1,7 @@
+{ "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/sl.js b/settings/l10n/sl.js
index 4ff4202cf72..962de6b8961 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -2,6 +2,8 @@ OC.L10N.register(
     "settings",
     {
     "Enabled" : "Omogočeno",
+    "Not enabled" : "Ni omogočeno",
+    "Recommended" : "Priporočljivo",
     "Authentication error" : "Napaka med overjanjem",
     "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
     "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
@@ -10,12 +12,15 @@ OC.L10N.register(
     "Files decrypted successfully" : "Datoteke so uspešno odšifrirane",
     "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
     "Couldn't decrypt your files, check your password and try again" : "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
+    "Encryption keys deleted permanently" : "Šifrirni ključi so trajno izbrisani",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ni mogoče trajno izbrisati šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
     "Couldn't remove app." : "Ni mogoče odstraniti programa.",
     "Email saved" : "Elektronski naslov je shranjen",
     "Invalid email" : "Neveljaven elektronski naslov",
     "Unable to delete group" : "Skupine ni mogoče izbrisati",
     "Unable to delete user" : "Uporabnika ni mogoče izbrisati",
     "Backups restored successfully" : "Varnostne kopije so uspešno obnovljene.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ni mogoče obnoviti šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
     "Language changed" : "Jezik je spremenjen",
     "Invalid request" : "Neveljavna zahteva",
     "Admins can't remove themself from the admin group" : "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
@@ -31,8 +36,10 @@ OC.L10N.register(
     "Saved" : "Shranjeno",
     "test email settings" : "preizkusi nastavitve elektronske pošte",
     "If you received this email, the settings seem to be correct." : "Če ste prejeli to sporočilo, so nastavitve pravilne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Prišlo je do napake med pošiljanjem sporočila na elektronski naslov. Spremeniti je treba nastavitve.",
     "Email sent" : "Elektronska pošta je poslana",
     "You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?",
     "Add trusted domain" : "Dodaj varno domeno",
     "Sending..." : "Poteka pošiljanje ...",
     "All" : "Vsi",
@@ -61,14 +68,19 @@ OC.L10N.register(
     "Groups" : "Skupine",
     "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}",
     "Error creating group" : "Napaka ustvarjanja skupine",
+    "A valid group name must be provided" : "Navedeno mora biti veljavno ime skupine",
+    "deleted {groupName}" : "izbrisano {groupName}",
     "undo" : "razveljavi",
+    "no group" : "ni skupine",
     "never" : "nikoli",
+    "deleted {userName}" : "izbrisano {userName}",
     "add group" : "dodaj skupino",
     "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
     "Error creating user" : "Napaka ustvarjanja uporabnika",
     "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
     "Warning: Home directory for user \"{user}\" already exists" : "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
     "__language_name__" : "Slovenščina",
+    "Personal Info" : "Osebni podatki",
     "SSL root certificates" : "Korenska potrdila SSL",
     "Encryption" : "Šifriranje",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
@@ -86,24 +98,29 @@ OC.L10N.register(
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola HTTPS.",
     "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." : "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo .",
     "Setup Warning" : "Opozorilo nastavitve",
+    "Database Performance Info" : "Podrobnosti delovanja podatkovne zbirke",
     "Module 'fileinfo' missing" : "Manjka modul 'fileinfo'.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
     "Your PHP version is outdated" : "Nameščena različica PHP je zastarela",
     "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
+    "PHP charset is not set to UTF-8" : "Jezikovni znakovni nabor PHP ni določen kot UTF-8",
     "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
     "Connectivity checks" : "Preverjanje povezav",
+    "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
     "Cron" : "Periodično opravilo",
-    "Last cron was executed at %s." : "Zadnje opravilo cron je bilo izvedeno ob %s.",
-    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
-    "Cron was not executed yet!" : "Opravilo Cron še ni zagnano!",
+    "Last cron was executed at %s." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
+    "Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
     "Sharing" : "Souporaba",
     "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
+    "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
     "Enforce password protection" : "Vsili zaščito z geslom",
     "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
     "Set default expiration date" : "Nastavitev privzetega datuma poteka",
@@ -111,14 +128,18 @@ OC.L10N.register(
     "days" : "dneh",
     "Enforce expiration date" : "Vsili datum preteka",
     "Allow resharing" : "Dovoli nadaljnjo souporabo",
+    "Restrict users to only share with users in their groups" : "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
     "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
     "Exclude groups from sharing" : "Izloči skupine iz souporabe",
+    "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
     "Security" : "Varnost",
     "Enforce HTTPS" : "Zahtevaj uporabo HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
     "Email Server" : "Poštni strežnik",
+    "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
+    "From address" : "Naslov pošiljatelja",
     "Authentication method" : "Način overitve",
     "Authentication required" : "Zahtevana je overitev",
     "Server address" : "Naslov strežnika",
@@ -126,6 +147,7 @@ OC.L10N.register(
     "Credentials" : "Poverila",
     "SMTP Username" : "Uporabniško ime SMTP",
     "SMTP Password" : "Geslo SMTP",
+    "Store credentials" : "Shrani poverila",
     "Test email settings" : "Preizkus nastavitev elektronske pošte",
     "Send email" : "Pošlji elektronsko sporočilo",
     "Log" : "Dnevnik",
@@ -134,10 +156,13 @@ OC.L10N.register(
     "Less" : "Manj",
     "Version" : "Različica",
     "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>." : "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
+    "More apps" : "Več programov",
+    "Add your app" : "Dodajte program",
     "by" : "od",
     "Documentation:" : "Dokumentacija:",
     "User Documentation" : "Uporabniška dokumentacija",
     "Admin Documentation" : "Skrbniška dokumentacija",
+    "Update to %s" : "Posodobi na %s",
     "Enable only for specific groups" : "Omogoči le za posamezne skupine",
     "Uninstall App" : "Odstrani program",
     "Administrator Documentation" : "Skrbniška dokumentacija",
@@ -170,12 +195,16 @@ OC.L10N.register(
     "Help translate" : "Sodelujte pri prevajanju",
     "Common Name" : "Splošno ime",
     "Valid until" : "Veljavno do",
+    "Issued By" : "Izdajatelj",
+    "Valid until %s" : "Veljavno do %s",
     "Import Root Certificate" : "Uvozi korensko potrdilo",
     "The encryption app is no longer enabled, please decrypt all your files" : "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
     "Log-in password" : "Prijavno geslo",
     "Decrypt all Files" : "Odšifriraj vse datoteke",
     "Restore Encryption Keys" : "Obnovi šifrirne ključe",
     "Delete Encryption Keys" : "Izbriši šifrirne ključe",
+    "Show storage location" : "Pokaži mesto shrambe",
+    "Show last log in" : "Pokaži podatke zadnje prijave",
     "Login Name" : "Prijavno ime",
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
@@ -190,7 +219,9 @@ OC.L10N.register(
     "Unlimited" : "Neomejeno",
     "Other" : "Drugo",
     "Username" : "Uporabniško ime",
+    "Group Admin for" : "Skrbnik skupine za",
     "Quota" : "Količinska omejitev",
+    "Storage Location" : "Mesto shrambe",
     "Last Login" : "Zadnja prijava",
     "change full name" : "Spremeni polno ime",
     "set new password" : "nastavi novo geslo",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 0fad1072785..e030c886113 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -1,5 +1,7 @@
 { "translations": {
     "Enabled" : "Omogočeno",
+    "Not enabled" : "Ni omogočeno",
+    "Recommended" : "Priporočljivo",
     "Authentication error" : "Napaka med overjanjem",
     "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
     "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
@@ -8,12 +10,15 @@
     "Files decrypted successfully" : "Datoteke so uspešno odšifrirane",
     "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Datotek ni mogoče odšifrirati. Preverite dnevnik owncloud.log ali pa se posvetujte s skrbnikom.",
     "Couldn't decrypt your files, check your password and try again" : "Datotek ni mogoče odšifrirati. Preverite geslo in poskusite znova.",
+    "Encryption keys deleted permanently" : "Šifrirni ključi so trajno izbrisani",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Ni mogoče trajno izbrisati šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
     "Couldn't remove app." : "Ni mogoče odstraniti programa.",
     "Email saved" : "Elektronski naslov je shranjen",
     "Invalid email" : "Neveljaven elektronski naslov",
     "Unable to delete group" : "Skupine ni mogoče izbrisati",
     "Unable to delete user" : "Uporabnika ni mogoče izbrisati",
     "Backups restored successfully" : "Varnostne kopije so uspešno obnovljene.",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Ni mogoče obnoviti šifrirnih ključev. Preverite dnevnik owncloud.log ali pa stopite v stik s skrbnikom sistema.",
     "Language changed" : "Jezik je spremenjen",
     "Invalid request" : "Neveljavna zahteva",
     "Admins can't remove themself from the admin group" : "Skrbnikov ni mogoče odstraniti iz skupine skrbnikov (admin)",
@@ -29,8 +34,10 @@
     "Saved" : "Shranjeno",
     "test email settings" : "preizkusi nastavitve elektronske pošte",
     "If you received this email, the settings seem to be correct." : "Če ste prejeli to sporočilo, so nastavitve pravilne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Prišlo je do napake med pošiljanjem sporočila na elektronski naslov. Spremeniti je treba nastavitve.",
     "Email sent" : "Elektronska pošta je poslana",
     "You need to set your user email before being able to send test emails." : "Pred preizkusnim pošiljanjem sporočil je treba nastaviti elektronski naslov uporabnika.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ali ste prepričani, da želite dodati \"{domain}\" kot varno domeno?",
     "Add trusted domain" : "Dodaj varno domeno",
     "Sending..." : "Poteka pošiljanje ...",
     "All" : "Vsi",
@@ -59,14 +66,19 @@
     "Groups" : "Skupine",
     "Unable to delete {objName}" : "Ni mogoče izbrisati {objName}",
     "Error creating group" : "Napaka ustvarjanja skupine",
+    "A valid group name must be provided" : "Navedeno mora biti veljavno ime skupine",
+    "deleted {groupName}" : "izbrisano {groupName}",
     "undo" : "razveljavi",
+    "no group" : "ni skupine",
     "never" : "nikoli",
+    "deleted {userName}" : "izbrisano {userName}",
     "add group" : "dodaj skupino",
     "A valid username must be provided" : "Navedeno mora biti veljavno uporabniško ime",
     "Error creating user" : "Napaka ustvarjanja uporabnika",
     "A valid password must be provided" : "Navedeno mora biti veljavno geslo",
     "Warning: Home directory for user \"{user}\" already exists" : "Opozorilo: osebna mapa uporabnika \"{user}\" že obstaja",
     "__language_name__" : "Slovenščina",
+    "Personal Info" : "Osebni podatki",
     "SSL root certificates" : "Korenska potrdila SSL",
     "Encryption" : "Šifriranje",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Vse (podrobnosti, opozorila, hrošče, napake in usodne dogodke)",
@@ -84,24 +96,29 @@
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Dostop do %s poteka preko HTTP. Priporočljivo je nastaviti strežnik na privzeto uporabo varne povezave preko protokola HTTPS.",
     "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." : "Vaša podatkovna mapa in datoteke so najverjetneje dosegljive preko interneta. Datoteka .htaccess ni ustrezno nastavljena. Priporočljivo je nastaviti spletni strežnik tako, da podatkovna mapa ni prosto dostopna. To je mogoče zagotoviti tudi tako, da je mapa premaknjena iz neustrezne korenske v podrejeno mapo .",
     "Setup Warning" : "Opozorilo nastavitve",
+    "Database Performance Info" : "Podrobnosti delovanja podatkovne zbirke",
     "Module 'fileinfo' missing" : "Manjka modul 'fileinfo'.",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Manjka modul PHP 'fileinfo'. Priporočljivo je omogočiti ta modul za popolno zaznavanje vrst MIME.",
     "Your PHP version is outdated" : "Nameščena različica PHP je zastarela",
     "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "Nameščena različica PHP je zastarela. Priporočljivo je posodobiti namestitev na različico 5.3.8 ali novejše, saj starejše različice ne podpirajo vseh zmožnosti. Mogoče je, da namestitev ne deluje pravilno.",
+    "PHP charset is not set to UTF-8" : "Jezikovni znakovni nabor PHP ni določen kot UTF-8",
     "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
     "Connectivity checks" : "Preverjanje povezav",
+    "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
     "Cron" : "Periodično opravilo",
-    "Last cron was executed at %s." : "Zadnje opravilo cron je bilo izvedeno ob %s.",
-    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
-    "Cron was not executed yet!" : "Opravilo Cron še ni zagnano!",
+    "Last cron was executed at %s." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
+    "Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
-    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana v storitvi webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+    "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
     "Sharing" : "Souporaba",
     "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
+    "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
     "Enforce password protection" : "Vsili zaščito z geslom",
     "Allow public uploads" : "Dovoli javno pošiljanje datotek v oblak",
     "Set default expiration date" : "Nastavitev privzetega datuma poteka",
@@ -109,14 +126,18 @@
     "days" : "dneh",
     "Enforce expiration date" : "Vsili datum preteka",
     "Allow resharing" : "Dovoli nadaljnjo souporabo",
+    "Restrict users to only share with users in their groups" : "Uporabnikom dovoli omogočanje souporabe le znotraj njihove skupine",
     "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
     "Exclude groups from sharing" : "Izloči skupine iz souporabe",
+    "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
     "Security" : "Varnost",
     "Enforce HTTPS" : "Zahtevaj uporabo HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
     "Email Server" : "Poštni strežnik",
+    "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
+    "From address" : "Naslov pošiljatelja",
     "Authentication method" : "Način overitve",
     "Authentication required" : "Zahtevana je overitev",
     "Server address" : "Naslov strežnika",
@@ -124,6 +145,7 @@
     "Credentials" : "Poverila",
     "SMTP Username" : "Uporabniško ime SMTP",
     "SMTP Password" : "Geslo SMTP",
+    "Store credentials" : "Shrani poverila",
     "Test email settings" : "Preizkus nastavitev elektronske pošte",
     "Send email" : "Pošlji elektronsko sporočilo",
     "Log" : "Dnevnik",
@@ -132,10 +154,13 @@
     "Less" : "Manj",
     "Version" : "Različica",
     "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>." : "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošnega javnega dovoljenja Affero\">AGPL</abbr></a>.",
+    "More apps" : "Več programov",
+    "Add your app" : "Dodajte program",
     "by" : "od",
     "Documentation:" : "Dokumentacija:",
     "User Documentation" : "Uporabniška dokumentacija",
     "Admin Documentation" : "Skrbniška dokumentacija",
+    "Update to %s" : "Posodobi na %s",
     "Enable only for specific groups" : "Omogoči le za posamezne skupine",
     "Uninstall App" : "Odstrani program",
     "Administrator Documentation" : "Skrbniška dokumentacija",
@@ -168,12 +193,16 @@
     "Help translate" : "Sodelujte pri prevajanju",
     "Common Name" : "Splošno ime",
     "Valid until" : "Veljavno do",
+    "Issued By" : "Izdajatelj",
+    "Valid until %s" : "Veljavno do %s",
     "Import Root Certificate" : "Uvozi korensko potrdilo",
     "The encryption app is no longer enabled, please decrypt all your files" : "Program za šifriranje ni več omogočen. Odšifrirati je treba vse datoteke.",
     "Log-in password" : "Prijavno geslo",
     "Decrypt all Files" : "Odšifriraj vse datoteke",
     "Restore Encryption Keys" : "Obnovi šifrirne ključe",
     "Delete Encryption Keys" : "Izbriši šifrirne ključe",
+    "Show storage location" : "Pokaži mesto shrambe",
+    "Show last log in" : "Pokaži podatke zadnje prijave",
     "Login Name" : "Prijavno ime",
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
@@ -188,7 +217,9 @@
     "Unlimited" : "Neomejeno",
     "Other" : "Drugo",
     "Username" : "Uporabniško ime",
+    "Group Admin for" : "Skrbnik skupine za",
     "Quota" : "Količinska omejitev",
+    "Storage Location" : "Mesto shrambe",
     "Last Login" : "Zadnja prijava",
     "change full name" : "Spremeni polno ime",
     "set new password" : "nastavi novo geslo",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index dd4519d02d0..1bd3f25cbca 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Geçerli bir grup adı mutlaka sağlanmalı",
     "deleted {groupName}" : "{groupName} silindi",
     "undo" : "geri al",
+    "no group" : "grup yok",
     "never" : "hiçbir zaman",
     "deleted {userName}" : "{userName} silindi",
     "add group" : "grup ekle",
@@ -79,6 +80,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
     "Warning: Home directory for user \"{user}\" already exists" : "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
     "__language_name__" : "Türkçe",
+    "Personal Info" : "Kişisel Bilgi",
     "SSL root certificates" : "SSL kök sertifikaları",
     "Encryption" : "Şifreleme",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
@@ -227,6 +229,7 @@ OC.L10N.register(
     "Unlimited" : "Sınırsız",
     "Other" : "Diğer",
     "Username" : "Kullanıcı Adı",
+    "Group Admin for" : "Grup Yöneticisi",
     "Quota" : "Kota",
     "Storage Location" : "Depolama Konumu",
     "Last Login" : "Son Giriş",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index bba74d9e117..02851383df8 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -69,6 +69,7 @@
     "A valid group name must be provided" : "Geçerli bir grup adı mutlaka sağlanmalı",
     "deleted {groupName}" : "{groupName} silindi",
     "undo" : "geri al",
+    "no group" : "grup yok",
     "never" : "hiçbir zaman",
     "deleted {userName}" : "{userName} silindi",
     "add group" : "grup ekle",
@@ -77,6 +78,7 @@
     "A valid password must be provided" : "Geçerli bir parola mutlaka sağlanmalı",
     "Warning: Home directory for user \"{user}\" already exists" : "Uyarı: \"{user}\" kullanıcısı için zaten bir Ev dizini mevcut",
     "__language_name__" : "Türkçe",
+    "Personal Info" : "Kişisel Bilgi",
     "SSL root certificates" : "SSL kök sertifikaları",
     "Encryption" : "Şifreleme",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Her şey (Ciddi sorunlar, hatalar, uyarılar, bilgi, hata ayıklama)",
@@ -225,6 +227,7 @@
     "Unlimited" : "Sınırsız",
     "Other" : "Diğer",
     "Username" : "Kullanıcı Adı",
+    "Group Admin for" : "Grup Yöneticisi",
     "Quota" : "Kota",
     "Storage Location" : "Depolama Konumu",
     "Last Login" : "Son Giriş",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index fc1798dbbeb..56080da73a3 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -71,6 +71,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Потрібно задати вірне ім'я групи",
     "deleted {groupName}" : "видалено {groupName}",
     "undo" : "відмінити",
+    "no group" : "без групи",
     "never" : "ніколи",
     "deleted {userName}" : "видалено {userName}",
     "add group" : "додати групу",
@@ -79,6 +80,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Потрібно задати вірний пароль",
     "Warning: Home directory for user \"{user}\" already exists" : "Попередження: домашня тека користувача \"{user}\" вже існує",
     "__language_name__" : "__language_name__",
+    "Personal Info" : "Особиста інформація",
     "SSL root certificates" : "SSL корневі сертифікати",
     "Encryption" : "Шифрування",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
@@ -227,6 +229,7 @@ OC.L10N.register(
     "Unlimited" : "Необмежено",
     "Other" : "Інше",
     "Username" : "Ім'я користувача",
+    "Group Admin for" : "Адміністратор групи",
     "Quota" : "Квота",
     "Storage Location" : "Місцезнаходження сховища",
     "Last Login" : "Останній вхід",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 3a5088ef069..f978ee4541a 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -69,6 +69,7 @@
     "A valid group name must be provided" : "Потрібно задати вірне ім'я групи",
     "deleted {groupName}" : "видалено {groupName}",
     "undo" : "відмінити",
+    "no group" : "без групи",
     "never" : "ніколи",
     "deleted {userName}" : "видалено {userName}",
     "add group" : "додати групу",
@@ -77,6 +78,7 @@
     "A valid password must be provided" : "Потрібно задати вірний пароль",
     "Warning: Home directory for user \"{user}\" already exists" : "Попередження: домашня тека користувача \"{user}\" вже існує",
     "__language_name__" : "__language_name__",
+    "Personal Info" : "Особиста інформація",
     "SSL root certificates" : "SSL корневі сертифікати",
     "Encryption" : "Шифрування",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Усі (критичні проблеми, помилки, попередження, інформаційні, налагодження)",
@@ -225,6 +227,7 @@
     "Unlimited" : "Необмежено",
     "Other" : "Інше",
     "Username" : "Ім'я користувача",
+    "Group Admin for" : "Адміністратор групи",
     "Quota" : "Квота",
     "Storage Location" : "Місцезнаходження сховища",
     "Last Login" : "Останній вхід",
diff --git a/settings/l10n/ur.js b/settings/l10n/ur.js
new file mode 100644
index 00000000000..78fcf358b75
--- /dev/null
+++ b/settings/l10n/ur.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Error" : "خرابی"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ur.json b/settings/l10n/ur.json
new file mode 100644
index 00000000000..1c1fc3d16c1
--- /dev/null
+++ b/settings/l10n/ur.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Error" : "خرابی"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
-- 
GitLab


From e219d72619583e5cc617d1389c5e46c5fc7edee1 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 30 Oct 2014 10:37:59 +0100
Subject: [PATCH 266/616] Fix stupid copy paste fail

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

diff --git a/lib/private/setup.php b/lib/private/setup.php
index b82e0be72e8..1125933c8e9 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -76,7 +76,7 @@ class OC_Setup {
 			),
 			'pgsql' => array(
 				'type' => 'function',
-				'call' => 'oci_connect',
+				'call' => 'pg_connect',
 				'name' => 'PostgreSQL'
 			),
 			'oci' => array(
-- 
GitLab


From 5536f6edd0f539b9fe1acae597777801250a712e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 30 Oct 2014 12:05:15 +0100
Subject: [PATCH 267/616] Properly register sharing hooks and proxies

This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.

Added login for user1 in setUp().
---
 apps/files_encryption/tests/share.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 4a0f10b13fb..e640b8c1a6a 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -64,8 +64,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 		// clear share hooks
 		\OC_Hook::clear('OCP\\Share');
+
+		// register share hooks
 		\OC::registerShareHooks();
-		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+		\OCA\Files_Sharing\Helper::registerHooks();
 
 		// Sharing related hooks
 		\OCA\Encryption\Helper::registerShareHooks();
@@ -75,6 +77,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 		// clear and register hooks
 		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Files\Share\Proxy());
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create users
@@ -104,6 +107,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 		// we don't want to tests with app files_trashbin enabled
 		\OC_App::disable('files_trashbin');
+
+		// login as first user
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 	}
 
 	function tearDown() {
-- 
GitLab


From 770c62c5d8030e54b4091f116dfa0e97d7df8691 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 30 Oct 2014 12:10:39 +0100
Subject: [PATCH 268/616] Clear session after logout

Fixes https://github.com/owncloud/core/issues/8420
---
 lib/private/user/session.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index b9c341b4ae9..ca0265dfb23 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -253,6 +253,7 @@ class Session implements IUserSession, Emitter {
 		$this->setUser(null);
 		$this->setLoginName(null);
 		$this->unsetMagicInCookie();
+		$this->session->clear();
 	}
 
 	/**
-- 
GitLab


From ea1ee5ba89eecd30c165c8beb1d644d79e023b32 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 30 Oct 2014 13:34:29 +0100
Subject: [PATCH 269/616] update 3rdparty to match it's master branch

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 9bd66bb6b4b..24a1c130881 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 9bd66bb6b4baa077bfc9d8b55a00185f37d55086
+Subproject commit 24a1c13088119fd070a3233b47457b60426418fa
-- 
GitLab


From d9db791c67cfb309b0e3ec49ea03fffeb0d71d02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 30 Oct 2014 13:44:40 +0100
Subject: [PATCH 270/616] introduce sidebar for admin page

---
 settings/admin.php           | 162 ++++++++++++++++++++---------------
 settings/templates/admin.php |  40 +++++++--
 2 files changed, 128 insertions(+), 74 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index f77145e0340..292bf2b0ff5 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -6,89 +6,117 @@
  */
 
 OC_Util::checkAdminUser();
+OC_App::setActiveNavigationEntry("admin");
 
-OCP\Util::addStyle('settings', 'settings');
-OCP\Util::addScript('settings', 'settings');
-OCP\Util::addScript( "settings", "admin" );
-OCP\Util::addScript( "settings", "log" );
-OCP\Util::addScript( 'core', 'multiselect' );
-OCP\Util::addScript('core', 'select2/select2');
-OCP\Util::addStyle('core', 'select2/select2');
-OCP\Util::addScript('core', 'setupchecks');
-OC_App::setActiveNavigationEntry( "admin" );
-
-$tmpl = new OC_Template( 'settings', 'admin', 'user');
-$forms=OC_App::getForms('admin');
-$htaccessworking=OC_Util::isHtaccessWorking();
-
-$entries=OC_Log_Owncloud::getEntries(3);
-$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3;
+$template = new OC_Template('settings', 'admin', 'user');
+$htAccessWorking = OC_Util::isHtaccessWorking();
+
+$entries = OC_Log_Owncloud::getEntries(3);
+$entriesRemaining = count(OC_Log_Owncloud::getEntries(4)) > 3;
 $config = \OC::$server->getConfig();
+$appConfig = \OC::$server->getAppConfig();
 
 // Should we display sendmail as an option?
-$tmpl->assign('sendmail_is_available', (bool) findBinaryPath('sendmail'));
-
-$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assign('mail_domain', OC_Config::getValue( "mail_domain", '' ));
-$tmpl->assign('mail_from_address', OC_Config::getValue( "mail_from_address", '' ));
-$tmpl->assign('mail_smtpmode', OC_Config::getValue( "mail_smtpmode", '' ));
-$tmpl->assign('mail_smtpsecure', OC_Config::getValue( "mail_smtpsecure", '' ));
-$tmpl->assign('mail_smtphost', OC_Config::getValue( "mail_smtphost", '' ));
-$tmpl->assign('mail_smtpport', OC_Config::getValue( "mail_smtpport", '' ));
-$tmpl->assign('mail_smtpauthtype', OC_Config::getValue( "mail_smtpauthtype", '' ));
-$tmpl->assign('mail_smtpauth', OC_Config::getValue( "mail_smtpauth", false ));
-$tmpl->assign('mail_smtpname', OC_Config::getValue( "mail_smtpname", '' ));
-$tmpl->assign('mail_smtppassword', OC_Config::getValue( "mail_smtppassword", '' ));
-$tmpl->assign('entries', $entries);
-$tmpl->assign('entriesremain', $entriesremain);
-$tmpl->assign('htaccessworking', $htaccessworking);
-$tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
-$tmpl->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8());
-$tmpl->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
-$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded());
-$tmpl->assign('old_php', OC_Util::isPHPoutdated());
-$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
-$tmpl->assign('cron_log', OC_Config::getValue('cron_log', true));
-$tmpl->assign('lastcron', OC_Appconfig::getValue('core', 'lastcron', false));
-$tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
-$tmpl->assign('shareDefaultExpireDateSet', OC_Appconfig::getValue('core', 'shareapi_default_expire_date', 'no'));
-$tmpl->assign('shareExpireAfterNDays', OC_Appconfig::getValue('core', 'shareapi_expire_after_n_days', '7'));
-$tmpl->assign('shareEnforceExpireDate', OC_Appconfig::getValue('core', 'shareapi_enforce_expire_date', 'no'));
-$excludeGroups = OC_Appconfig::getValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false;
-$tmpl->assign('shareExcludeGroups', $excludeGroups);
-$excludedGroupsList = OC_Appconfig::getValue('core', 'shareapi_exclude_groups_list', '');
+$template->assign('sendmail_is_available', (bool)findBinaryPath('sendmail'));
+
+$template->assign('loglevel', $config->getSystemValue("loglevel", 2));
+$template->assign('mail_domain', $config->getSystemValue("mail_domain", ''));
+$template->assign('mail_from_address', $config->getSystemValue("mail_from_address", ''));
+$template->assign('mail_smtpmode', $config->getSystemValue("mail_smtpmode", ''));
+$template->assign('mail_smtpsecure', $config->getSystemValue("mail_smtpsecure", ''));
+$template->assign('mail_smtphost', $config->getSystemValue("mail_smtphost", ''));
+$template->assign('mail_smtpport', $config->getSystemValue("mail_smtpport", ''));
+$template->assign('mail_smtpauthtype', $config->getSystemValue("mail_smtpauthtype", ''));
+$template->assign('mail_smtpauth', $config->getSystemValue("mail_smtpauth", false));
+$template->assign('mail_smtpname', $config->getSystemValue("mail_smtpname", ''));
+$template->assign('mail_smtppassword', $config->getSystemValue("mail_smtppassword", ''));
+$template->assign('entries', $entries);
+$template->assign('entriesremain', $entriesRemaining);
+$template->assign('htaccessworking', $htAccessWorking);
+$template->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
+$template->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8());
+$template->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
+$template->assign('has_fileinfo', OC_Util::fileInfoLoaded());
+$template->assign('old_php', OC_Util::isPHPoutdated());
+$template->assign('backgroundjobs_mode', $appConfig->getValue('core', 'backgroundjobs_mode', 'ajax'));
+$template->assign('cron_log', $config->getSystemValue('cron_log', true));
+$template->assign('lastcron', $appConfig->getValue('core', 'lastcron', false));
+$template->assign('shareAPIEnabled', $appConfig->getValue('core', 'shareapi_enabled', 'yes'));
+$template->assign('shareDefaultExpireDateSet', $appConfig->getValue('core', 'shareapi_default_expire_date', 'no'));
+$template->assign('shareExpireAfterNDays', $appConfig->getValue('core', 'shareapi_expire_after_n_days', '7'));
+$template->assign('shareEnforceExpireDate', $appConfig->getValue('core', 'shareapi_enforce_expire_date', 'no'));
+$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!
-$tmpl->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList));
+$template->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList));
 
 // Check if connected using HTTPS
-$tmpl->assign('isConnectedViaHTTPS', OC_Request::serverProtocol() === 'https');
-$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false));
+$template->assign('isConnectedViaHTTPS', OC_Request::serverProtocol() === 'https');
+$template->assign('enforceHTTPSEnabled', $config->getSystemValue("forcessl", false));
 
-// If the current webroot is non-empty but the webroot from the config is,
+// If the current web root is non-empty but the web root from the config is,
 // and system cron is used, the URL generator fails to build valid URLs.
-$shouldSuggestOverwriteWebroot = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' &&
+$shouldSuggestOverwriteWebRoot = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' &&
 	\OC::$WEBROOT && \OC::$WEBROOT !== '/' &&
 	!$config->getSystemValue('overwritewebroot', '');
-$tmpl->assign('suggestedOverwriteWebroot', ($shouldSuggestOverwriteWebroot) ? \OC::$WEBROOT : '');
-
-$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
-$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
-$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes'));
-$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
-$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'no'));
-$tmpl->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly());
-$tmpl->assign('forms', array());
-foreach($forms as $form) {
-	$tmpl->append('forms', $form);
-}
+$suggestedOverwriteWebRoot = ($shouldSuggestOverwriteWebRoot) ? \OC::$WEBROOT : '';
+$template->assign('suggestedOverwriteWebroot', $suggestedOverwriteWebRoot);
 
+$template->assign('allowLinks', $appConfig->getValue('core', 'shareapi_allow_links', 'yes'));
+$template->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired());
+$template->assign('allowPublicUpload', $appConfig->getValue('core', 'shareapi_allow_public_upload', 'yes'));
+$template->assign('allowResharing', $appConfig->getValue('core', 'shareapi_allow_resharing', 'yes'));
+$template->assign('allowMailNotification', $appConfig->getValue('core', 'shareapi_allow_mail_notification', 'no'));
+$template->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly());
 $databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false);
-$tmpl->assign('databaseOverload', $databaseOverload);
+$template->assign('databaseOverload', $databaseOverload);
+
+
+// add hardcoded forms from the template
+$forms = OC_App::getForms('admin');
+$l = OC_L10N::get('settings');
+$formsAndMore = array();
+if (OC_Request::serverProtocol() !== 'https' || !$htAccessWorking || !OC_Util::isAnnotationsWorking() ||
+	$suggestedOverwriteWebRoot || !OC_Util::isSetLocaleWorking() || !OC_Util::isPhpCharSetUtf8() ||
+	OC_Util::isPHPoutdated() || !OC_Util::fileInfoLoaded() || $databaseOverload
+) {
+	$formsAndMore[] = array('anchor' => 'security-warning', 'section-name' => $l->t('Security & Setup Warnings'));
+}
+
+$formsMap = array_map(function ($form) {
+	if (preg_match('%(<h2[^>]*>.*?</h2>)%i', $form, $regs)) {
+		$sectionName = str_replace('<h2>', '', $regs[0]);
+		$sectionName = str_replace('</h2>', '', $sectionName);
+		$anchor = strtolower($sectionName);
+		$anchor = str_replace(' ', '-', $anchor);
+
+		return array(
+			'anchor' => $anchor,
+			'section-name' => $sectionName,
+			'form' => $form
+		);
+	}
+	return array(
+		'form' => $form
+	);
+}, $forms);
+
+$formsAndMore = array_merge($formsAndMore, $formsMap);
+
+// add bottom hardcoded forms from the template
+$formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron'));
+$formsAndMore[] = array('anchor' => 'shareAPI', 'section-name' => $l->t('Sharing'));
+$formsAndMore[] = array('anchor' => 'security', 'section-name' => $l->t('Security'));
+$formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server'));
+$formsAndMore[] = array('anchor' => 'log', 'section-name' => $l->t('Log'));
+
+$template->assign('forms', $formsAndMore);
 
-$tmpl->printPage();
+$template->printPage();
 
 /**
- * Try to find a programm
+ * Try to find a program
  *
  * @param string $program
  * @return null|string
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 2ea5d824909..4f37a15875c 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -8,6 +8,16 @@
  * @var array $_
  * @var \OCP\IL10N $l
  */
+
+style('settings', 'settings');
+script('settings', 'settings');
+script( "settings", "admin" );
+script( "settings", "log" );
+script( 'core', 'multiselect' );
+script('core', 'select2/select2');
+style('core', 'select2/select2');
+script('core', 'setupchecks');
+
 $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
 $levelLabels = array(
 	$l->t( 'Everything (fatal issues, errors, warnings, info, debug)' ),
@@ -40,9 +50,23 @@ if ($_['sendmail_is_available']) {
 if ($_['mail_smtpmode'] == 'qmail') {
 	$mail_smtpmode[] = 'qmail';
 }
-
 ?>
 
+<div id="app-navigation">
+	<ul>
+		<?php foreach($_['forms'] as $form) {
+			if (isset($form['anchor'])) {
+				$anchor = '#' . $form['anchor'];
+				$sectionName = $form['section-name'];
+				print_unescaped(sprintf("<li><a href='%s'>%s</a></li>", OC_Util::sanitizeHTML($anchor), OC_Util::sanitizeHTML($sectionName)));
+			}
+		}?>
+	</ul>
+</div>
+
+<div id="app-content">
+
+<div id="security-warning">
 <?php
 
 // is ssl working ?
@@ -72,7 +96,6 @@ if (!$_['htaccessworking']) {
 </div>
 <?php
 }
-
 // Are doc blocks accessible?
 if (!$_['isAnnotationsWorking']) {
 	?>
@@ -193,10 +216,12 @@ if ($_['suggestedOverwriteWebroot']) {
 		?></span>
 	</div>
 </div>
-<?php foreach ($_['forms'] as $form) {
-	print_unescaped($form);
-}
-;?>
+</div>
+<?php foreach($_['forms'] as $form) {
+	if (isset($form['form'])) {?>
+		<div id="<?php isset($form['anchor']) ? p($form['anchor']) : p('');?>"><?php print_unescaped($form['form']);?></div>
+	<?php }
+};?>
 
 <div class="section" id="backgroundjobs">
 	<h2 class="inlineblock"><?php p($l->t('Cron'));?></h2>
@@ -419,7 +444,7 @@ if ($_['suggestedOverwriteWebroot']) {
 	<span id="sendtestmail_msg" class="msg"></span>
 </div>
 
-<div class="section">
+<div class="section" id="log">
 	<h2><?php p($l->t('Log'));?></h2>
 	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
 <?php for ($i = 0; $i < 5; $i++):
@@ -472,3 +497,4 @@ if ($_['suggestedOverwriteWebroot']) {
 <div class="section credits-footer">
 	<p><?php print_unescaped($theme->getShortFooter()); ?></p>
 </div>
+</div>
-- 
GitLab


From 24feb7463836bd60935e1a45641f251451bfa785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 30 Oct 2014 13:55:33 +0100
Subject: [PATCH 271/616] fixing ldap listing in admin sidebar - needs styling
 review

---
 apps/user_ldap/templates/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 6a02b795258..4e09d7e0739 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -1,5 +1,6 @@
-<form id="ldap" action="#" method="post">
-	<div id="ldapSettings" class="section">
+<div id="ldapSettings" class="section">
+	<h2><?php p($l->t('LDAP')); ?></h2>
+	<form id="ldap" action="#" method="post">
 	<ul>
 		<?php foreach($_['toc'] as $id => $title) { ?>
 			<li id="<?php p($id); ?>"><a href="<?php p($id); ?>"><?php p($title); ?></a></li>
-- 
GitLab


From 1076a7784027ed3af2e118bcf4366a81badb2d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 30 Oct 2014 14:59:13 +0100
Subject: [PATCH 272/616] fix loading of more log entries

---
 settings/admin.php           |  2 +-
 settings/js/admin.js         | 10 +++---
 settings/js/log.js           | 62 +++++++++++++++++++-----------------
 settings/templates/admin.php |  2 +-
 4 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/settings/admin.php b/settings/admin.php
index 292bf2b0ff5..d58b9a597b9 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -109,7 +109,7 @@ $formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('C
 $formsAndMore[] = array('anchor' => 'shareAPI', 'section-name' => $l->t('Sharing'));
 $formsAndMore[] = array('anchor' => 'security', 'section-name' => $l->t('Security'));
 $formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server'));
-$formsAndMore[] = array('anchor' => 'log', 'section-name' => $l->t('Log'));
+$formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log'));
 
 $template->assign('forms', $formsAndMore);
 
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 09e8a1d6916..e3a092f71b0 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -3,7 +3,8 @@ $(document).ready(function(){
 
 	// Hack to add a trusted domain
 	if (params.trustDomain) {
-		OC.dialogs.confirm(t('core', 'Are you really sure you want add "{domain}" as trusted domain?', {domain: params.trustDomain}),
+		OC.dialogs.confirm(t('core', 'Are you really sure you want add "{domain}" as trusted domain?',
+				{domain: params.trustDomain}),
 			t('core', 'Add trusted domain'), function(answer) {
 				if(answer) {
 					$.ajax({
@@ -52,14 +53,13 @@ $(document).ready(function(){
 	});
 
 	$('#shareAPI input:not(#excludedGroups)').change(function() {
+		var value = $(this).val();
 		if ($(this).attr('type') === 'checkbox') {
 			if (this.checked) {
-				var value = 'yes';
+				value = 'yes';
 			} else {
-				var value = 'no';
+				value = 'no';
 			}
-		} else {
-			var value = $(this).val();
 		}
 		OC.AppConfig.setValue('core', $(this).attr('name'), value);
 	});
diff --git a/settings/js/log.js b/settings/js/log.js
index 197fef907a0..46d1bfefd5f 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -5,75 +5,77 @@
  * See the COPYING-README file.
  */
 
-OC.Log={
-	reload:function(count){
-		if(!count){
-			count=OC.Log.loaded;
+/* global formatDate */
+
+OC.Log = {
+	reload: function (count) {
+		if (!count) {
+			count = OC.Log.loaded;
 		}
-		OC.Log.loaded=0;
+		OC.Log.loaded = 0;
 		$('#log tbody').empty();
 		OC.Log.getMore(count);
 	},
-	levels:['Debug','Info','Warning','Error','Fatal'],
-	loaded:3,//are initially loaded
-	getMore:function(count){
+	levels: ['Debug', 'Info', 'Warning', 'Error', 'Fatal'],
+	loaded: 3,//are initially loaded
+	getMore: function (count) {
 		count = count || 10;
-		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
-			if(result.status === 'success'){
+		$.get(OC.filePath('settings', 'ajax', 'getlog.php'), {offset: OC.Log.loaded, count: count}, function (result) {
+			if (result.status === 'success') {
 				OC.Log.addEntries(result.data);
-				if(!result.remain){
+				if (!result.remain) {
 					$('#moreLog').hide();
 				}
 				$('#lessLog').show();
 			}
 		});
 	},
-	showLess:function(count){
+	showLess: function (count) {
 		count = count || 10;
 		//calculate remaining items - at least 3
-		OC.Log.loaded = Math.max(3,OC.Log.loaded-count);
+		OC.Log.loaded = Math.max(3, OC.Log.loaded - count);
 		$('#moreLog').show();
 		// remove all non-remaining items
 		$('#log tr').slice(OC.Log.loaded).remove();
-		if(OC.Log.loaded <= 3) {
+		if (OC.Log.loaded <= 3) {
 			$('#lessLog').hide();
 		}
 	},
-	addEntries:function(entries){
-		for(var i=0;i<entries.length;i++){
-			var entry=entries[i];
-			var row=$('<tr/>');
-			var levelTd=$('<td/>');
+	addEntries: function (entries) {
+		for (var i = 0; i < entries.length; i++) {
+			var entry = entries[i];
+			var row = $('<tr/>');
+			var levelTd = $('<td/>');
 			levelTd.text(OC.Log.levels[entry.level]);
 			row.append(levelTd);
 
-			var appTd=$('<td/>');
+			var appTd = $('<td/>');
 			appTd.text(entry.app);
 			row.append(appTd);
 
-			var messageTd=$('<td/>');
+			var messageTd = $('<td/>');
 			messageTd.text(entry.message);
 			row.append(messageTd);
 
-			var timeTd=$('<td/>');
+			var timeTd = $('<td/>');
 			timeTd.addClass('date');
-			if(isNaN(entry.time)){
+			if (isNaN(entry.time)) {
 				timeTd.text(entry.time);
 			} else {
-				timeTd.text(formatDate(entry.time*1000));
+				timeTd.text(formatDate(entry.time * 1000));
 			}
 			row.append(timeTd);
 			$('#log').append(row);
 		}
 		OC.Log.loaded += entries.length;
 	}
-}
+};
 
-$(document).ready(function(){
-	$('#moreLog').click(function(){
+$(document).ready(function () {
+	$('#moreLog').click(function () {
 		OC.Log.getMore();
-	})
-	$('#lessLog').click(function(){
+	});
+	$('#lessLog').click(function () {
 		OC.Log.showLess();
-	})
+	});
 });
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 4f37a15875c..f02dedbbc80 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -444,7 +444,7 @@ if ($_['suggestedOverwriteWebroot']) {
 	<span id="sendtestmail_msg" class="msg"></span>
 </div>
 
-<div class="section" id="log">
+<div class="section" id="log-section">
 	<h2><?php p($l->t('Log'));?></h2>
 	<?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'>
 <?php for ($i = 0; $i < 5; $i++):
-- 
GitLab


From 1dfabfb4918e356e7971db00e10325f5e1579daa Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 30 Oct 2014 16:04:26 +0100
Subject: [PATCH 273/616] admin settings: fix LDAP settings header layout

---
 apps/user_ldap/templates/settings.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 4e09d7e0739..811deada944 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -1,6 +1,7 @@
-<div id="ldapSettings" class="section">
+<form id="ldap" class="section" action="#" method="post">
 	<h2><?php p($l->t('LDAP')); ?></h2>
-	<form id="ldap" action="#" method="post">
+
+	<div id="ldapSettings">
 	<ul>
 		<?php foreach($_['toc'] as $id => $title) { ?>
 			<li id="<?php p($id); ?>"><a href="<?php p($id); ?>"><?php p($title); ?></a></li>
-- 
GitLab


From 08b46ccc17655d731c5b225f53838afd0cf3ff75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 23 Oct 2014 15:51:01 +0200
Subject: [PATCH 274/616] Update pear/archive_tar to 1.3.13

---
 3rdparty                    | 2 +-
 lib/private/archive/tar.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/3rdparty b/3rdparty
index 24a1c130881..7534a6a2b75 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 24a1c13088119fd070a3233b47457b60426418fa
+Subproject commit 7534a6a2b7549cc5db0a7f32749d962bfe9b2d3d
diff --git a/lib/private/archive/tar.php b/lib/private/archive/tar.php
index 31715c4778b..61b37c2542a 100644
--- a/lib/private/archive/tar.php
+++ b/lib/private/archive/tar.php
@@ -6,8 +6,6 @@
  * See the COPYING-README file.
  */
 
-require_once OC::$THIRDPARTYROOT . '/3rdparty/Archive/Tar.php';
-
 class OC_Archive_TAR extends OC_Archive {
 	const PLAIN = 0;
 	const GZIP = 1;
-- 
GitLab


From 33186957c8e20aa8fd7ac6aa75e7f8ef98b4df9a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Tue, 26 Aug 2014 12:41:03 +0200
Subject: [PATCH 275/616] delete all children's previews when deleting a folder

add phpdoc
---
 lib/private/preview.php | 110 ++++++++++++++++++++++++++++++++++------
 1 file changed, 94 insertions(+), 16 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index f8b19f11cb0..2017076a378 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -48,6 +48,7 @@ class Preview {
 	//filemapper used for deleting previews
 	// index is path, value is fileinfo
 	static public $deleteFileMapper = array();
+	static public $deleteChildrenMapper = array();
 
 	/**
 	 * preview images object
@@ -189,6 +190,21 @@ class Preview {
 		return $this->info;
 	}
 
+
+	/**
+	 * @return array|null
+	 */
+	private function getChildren() {
+		$absPath = $this->fileView->getAbsolutePath($this->file);
+		$absPath = Files\Filesystem::normalizePath($absPath);
+
+		if (array_key_exists($absPath, self::$deleteChildrenMapper)) {
+			return self::$deleteChildrenMapper[$absPath];
+		}
+
+		return null;
+	}
+
 	/**
 	 * set the path of the file you want a thumbnail from
 	 * @param string $file
@@ -269,6 +285,10 @@ class Preview {
 		return $this;
 	}
 
+	/**
+	 * @param bool $keepAspect
+	 * @return $this
+	 */
 	public function setKeepAspect($keepAspect) {
 		$this->keepAspect = $keepAspect;
 		return $this;
@@ -312,20 +332,25 @@ class Preview {
 
 	/**
 	 * deletes all previews of a file
-	 * @return bool
 	 */
 	public function deleteAllPreviews() {
 		$file = $this->getFile();
 
 		$fileInfo = $this->getFileInfo($file);
-		if($fileInfo !== null && $fileInfo !== false) {
-			$fileId = $fileInfo->getId();
 
-			$previewPath = $this->getPreviewPath($fileId);
-			$this->userView->deleteAll($previewPath);
-			return $this->userView->rmdir($previewPath);
+		$toDelete = $this->getChildren();
+		$toDelete[] = $fileInfo;
+
+		foreach ($toDelete as $delete) {
+			if ($delete !== null && $delete !== false) {
+				/** @var \OCP\Files\FileInfo $delete */
+				$fileId = $delete->getId();
+
+				$previewPath = $this->getPreviewPath($fileId);
+				$this->userView->deleteAll($previewPath);
+				$this->userView->rmdir($previewPath);
+			}
 		}
-		return false;
 	}
 
 	/**
@@ -667,8 +692,8 @@ class Preview {
 	}
 
 	/**
-	 * Register a new preview provider to be used
-	 * @param $class
+	 * register a new preview provider to be used
+	 * @param string $class
 	 * @param array $options
 	 */
 	public static function registerProvider($class, $options = array()) {
@@ -737,14 +762,24 @@ class Preview {
 
 	}
 
+	/**
+	 * @param array $args
+	 */
 	public static function post_write($args) {
 		self::post_delete($args, 'files/');
 	}
 
+	/**
+	 * @param array $args
+	 */
 	public static function prepare_delete_files($args) {
 		self::prepare_delete($args, 'files/');
 	}
 
+	/**
+	 * @param array $args
+	 * @param string $prefix
+	 */
 	public static function prepare_delete($args, $prefix='') {
 		$path = $args['path'];
 		if (substr($path, 0, 1) === '/') {
@@ -752,20 +787,63 @@ class Preview {
 		}
 
 		$view = new \OC\Files\View('/' . \OC_User::getUser() . '/' . $prefix);
-		$info = $view->getFileInfo($path);
 
-		\OC\Preview::$deleteFileMapper = array_merge(
-			\OC\Preview::$deleteFileMapper,
-			array(
-				Files\Filesystem::normalizePath($view->getAbsolutePath($path)) => $info,
-			)
-		);
+		$absPath = Files\Filesystem::normalizePath($view->getAbsolutePath($path));
+		self::addPathToDeleteFileMapper($absPath, $view->getFileInfo($path));
+		if ($view->is_dir($path)) {
+			$children = self::getAllChildren($view, $path);
+			self::$deleteChildrenMapper[$absPath] = $children;
+		}
+	}
+
+	/**
+	 * @param string $absolutePath
+	 * @param \OCP\Files\FileInfo $info
+	 */
+	private static function addPathToDeleteFileMapper($absolutePath, $info) {
+		self::$deleteFileMapper[$absolutePath] = $info;
+	}
+
+	/**
+	 * @param \OC\Files\View $view
+	 * @param string $path
+	 * @return array
+	 */
+	private static function getAllChildren($view, $path) {
+		$children = $view->getDirectoryContent($path);
+		$childrensFiles = array();
+
+		$fakeRootLength = strlen($view->getRoot());
+
+		for ($i = 0; $i < count($children); $i++) {
+			$child = $children[$i];
+
+			$childsPath = substr($child->getPath(), $fakeRootLength);
+
+			if ($view->is_dir($childsPath)) {
+				$children = array_merge(
+					$children,
+					$view->getDirectoryContent($childsPath)
+				);
+			} else {
+				$childrensFiles[] = $child;
+			}
+		}
+
+		return $childrensFiles;
 	}
 
+	/**
+	 * @param array $args
+	 */
 	public static function post_delete_files($args) {
 		self::post_delete($args, 'files/');
 	}
 
+	/**
+	 * @param array $args
+	 * @param string $prefix
+	 */
 	public static function post_delete($args, $prefix='') {
 		$path = Files\Filesystem::normalizePath($args['path']);
 
-- 
GitLab


From f776bcd4a0e58a8803ae4bf922bb278f6a5c5203 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 30 Oct 2014 17:20:40 +0100
Subject: [PATCH 276/616] remove unnecessary require calls - the ownCloud class
 loader is supposed to take care of this

---
 apps/files/tests/helper.php                   |  2 --
 apps/files_encryption/tests/crypt.php         | 10 --------
 apps/files_encryption/tests/helper.php        |  2 --
 apps/files_encryption/tests/hooks.php         |  6 -----
 apps/files_encryption/tests/keymanager.php    |  8 -------
 apps/files_encryption/tests/proxy.php         |  7 ------
 apps/files_encryption/tests/share.php         |  8 -------
 apps/files_encryption/tests/stream.php        |  7 ------
 apps/files_encryption/tests/trashbin.php      |  8 -------
 apps/files_encryption/tests/util.php          |  8 -------
 apps/files_encryption/tests/webdav.php        |  7 ------
 apps/files_sharing/tests/api.php              |  5 ++--
 apps/files_sharing/tests/backend.php          |  5 ++--
 apps/files_sharing/tests/cache.php            |  5 ++--
 apps/files_sharing/tests/externalstorage.php  |  2 --
 apps/files_sharing/tests/helper.php           |  5 ++--
 apps/files_sharing/tests/permissions.php      |  3 +--
 apps/files_sharing/tests/proxy.php            |  3 +--
 apps/files_sharing/tests/share.php            |  4 +---
 apps/files_sharing/tests/sharedmount.php      |  4 +---
 apps/files_sharing/tests/sharedstorage.php    |  4 +---
 .../tests/{base.php => testcase.php}          |  6 ++---
 apps/files_sharing/tests/update.php           |  3 +--
 apps/files_sharing/tests/updater.php          |  3 +--
 apps/files_sharing/tests/watcher.php          | 23 +++++++++++++++++--
 apps/files_trashbin/tests/trashbin.php        |  2 --
 apps/files_versions/tests/versions.php        |  5 +++-
 .../http/DownloadResponseTest.php             |  8 ++++---
 tests/lib/appframework/http/HttpTest.php      |  7 +++---
 .../appframework/http/JSONResponseTest.php    |  4 ----
 .../http/RedirectResponseTest.php             |  7 +++---
 tests/lib/archive/tar.php                     |  2 --
 tests/lib/archive/zip.php                     |  2 --
 33 files changed, 57 insertions(+), 128 deletions(-)
 rename apps/files_sharing/tests/{base.php => testcase.php} (96%)

diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php
index f269cc70ed5..17be1770c33 100644
--- a/apps/files/tests/helper.php
+++ b/apps/files/tests/helper.php
@@ -6,8 +6,6 @@
  * See the COPYING-README file.
  */
 
-require_once __DIR__ . '/../lib/helper.php';
-
 use OCA\Files;
 
 /**
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index a89754d4a14..1b8291fea28 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -7,16 +7,6 @@
  * See the COPYING-README file.
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../lib/helper.php';
-require_once __DIR__ . '/../appinfo/app.php';
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
index df7ff8cdb11..ed543bf89f6 100644
--- a/apps/files_encryption/tests/helper.php
+++ b/apps/files_encryption/tests/helper.php
@@ -6,8 +6,6 @@
  * See the COPYING-README file.
  */
 
-
-require_once __DIR__ . '/../lib/helper.php';
 require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index c7353deee22..c2434c0f5f6 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -20,12 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
 require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index ad7d2cfcd45..e2486ee93eb 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -6,14 +6,6 @@
  * See the COPYING-README file.
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../lib/helper.php';
-require_once __DIR__ . '/../appinfo/app.php';
 require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 56d6cd2f736..d3e568f8914 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -20,13 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
 require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index e640b8c1a6a..d7efe21a8fd 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -20,14 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../lib/helper.php';
-require_once __DIR__ . '/../appinfo/app.php';
 require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index b8c18fbe049..2b57f11c680 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -20,13 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
 require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 5890292cd7b..d795240399c 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -20,14 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
-require_once __DIR__ . '/../../files_trashbin/appinfo/app.php';
 require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index d5bfb86a2e4..210ffcc5410 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -6,14 +6,6 @@
  * See the COPYING-README file.
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
-
 use OCA\Encryption;
 
 /**
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index cc0cff9aa5c..c838ddd29d1 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -20,13 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-require_once __DIR__ . '/../lib/crypt.php';
-require_once __DIR__ . '/../lib/keymanager.php';
-require_once __DIR__ . '/../lib/proxy.php';
-require_once __DIR__ . '/../lib/stream.php';
-require_once __DIR__ . '/../lib/util.php';
-require_once __DIR__ . '/../appinfo/app.php';
 require_once __DIR__ . '/util.php';
 
 use OCA\Encryption;
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 035aa1b6a5b..88acbd8e775 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -20,14 +20,13 @@
  *
  */
 
-require_once __DIR__ . '/base.php';
-
 use OCA\Files\Share;
+use OCA\Files_sharing\Tests\TestCase;
 
 /**
  * Class Test_Files_Sharing_Api
  */
-class Test_Files_Sharing_Api extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Api extends TestCase {
 
 	const TEST_FOLDER_NAME = '/folder_share_api_test';
 
diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php
index 9653713a9f9..e113c940678 100644
--- a/apps/files_sharing/tests/backend.php
+++ b/apps/files_sharing/tests/backend.php
@@ -20,14 +20,13 @@
  *
  */
 
-require_once __DIR__ . '/base.php';
-
 use OCA\Files\Share;
+use OCA\Files_sharing\Tests\TestCase;
 
 /**
  * Class Test_Files_Sharing
  */
-class Test_Files_Sharing_Backend extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Backend extends TestCase {
 
 	const TEST_FOLDER_NAME = '/folder_share_api_test';
 
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 1b0fe6fdc6d..2c9790ce66d 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -1,4 +1,6 @@
 <?php
+use OCA\Files_sharing\Tests\TestCase;
+
 /**
  * ownCloud
  *
@@ -20,9 +22,8 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-require_once __DIR__ . '/base.php';
 
-class Test_Files_Sharing_Cache extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Cache extends TestCase {
 
 	/**
 	 * @var OC\Files\View
diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php
index 2e93afa1987..0c741bb8199 100644
--- a/apps/files_sharing/tests/externalstorage.php
+++ b/apps/files_sharing/tests/externalstorage.php
@@ -20,8 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/base.php';
-
 /**
  * Tests for the external Storage class for remote shares.
  */
diff --git a/apps/files_sharing/tests/helper.php b/apps/files_sharing/tests/helper.php
index 6169a9f5094..1a27739ec34 100644
--- a/apps/files_sharing/tests/helper.php
+++ b/apps/files_sharing/tests/helper.php
@@ -1,4 +1,6 @@
 <?php
+use OCA\Files_sharing\Tests\TestCase;
+
 /**
  * ownCloud
  *
@@ -19,9 +21,8 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-require_once __DIR__ . '/base.php';
 
-class Test_Files_Sharing_Helper extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Helper extends TestCase {
 
 	/**
 	 * test set and get share folder
diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php
index 299e471a3fd..639ebfb5936 100644
--- a/apps/files_sharing/tests/permissions.php
+++ b/apps/files_sharing/tests/permissions.php
@@ -23,9 +23,8 @@ use OC\Files\Cache\Cache;
 use OC\Files\Storage\Storage;
 use OC\Files\View;
 
-require_once __DIR__ . '/base.php';
 
-class Test_Files_Sharing_Permissions extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase {
 
 	/**
 	 * @var Storage
diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php
index b6599a1b646..68cd81f963a 100644
--- a/apps/files_sharing/tests/proxy.php
+++ b/apps/files_sharing/tests/proxy.php
@@ -20,14 +20,13 @@
  *
  */
 
-require_once __DIR__ . '/base.php';
 
 use OCA\Files\Share;
 
 /**
  * Class Test_Files_Sharing_Proxy
  */
-class Test_Files_Sharing_Proxy extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase {
 
 	const TEST_FOLDER_NAME = '/folder_share_api_test';
 
diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php
index fe80cfca781..2b5978f8e57 100644
--- a/apps/files_sharing/tests/share.php
+++ b/apps/files_sharing/tests/share.php
@@ -20,14 +20,12 @@
  *
  */
 
-require_once __DIR__ . '/base.php';
-
 use OCA\Files\Share;
 
 /**
  * Class Test_Files_Sharing
  */
-class Test_Files_Sharing extends Test_Files_Sharing_Base {
+class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 
 	const TEST_FOLDER_NAME = '/folder_share_api_test';
 
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index ac910944f9f..e991d381e14 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -20,12 +20,10 @@
  *
  */
 
-require_once __DIR__ . '/base.php';
-
 /**
  * Class Test_Files_Sharing_Api
  */
-class Test_Files_Sharing_Mount extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
 
 	function setUp() {
 		parent::setUp();
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index 972f9257e25..b106add1300 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -20,14 +20,12 @@
  *
  */
 
-require_once __DIR__ . '/base.php';
-
 use OCA\Files\Share;
 
 /**
  * Class Test_Files_Sharing_Api
  */
-class Test_Files_Sharing_Storage extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
 
 	function setUp() {
 		parent::setUp();
diff --git a/apps/files_sharing/tests/base.php b/apps/files_sharing/tests/testcase.php
similarity index 96%
rename from apps/files_sharing/tests/base.php
rename to apps/files_sharing/tests/testcase.php
index 6bc02ec2008..a098feb550d 100644
--- a/apps/files_sharing/tests/base.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
+namespace OCA\Files_Sharing\Tests;
 
 use OCA\Files\Share;
 
@@ -29,7 +29,7 @@ use OCA\Files\Share;
  *
  * Base class for sharing tests.
  */
-abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
+abstract class TestCase extends \PHPUnit_Framework_TestCase {
 
 	const TEST_FILES_SHARING_API_USER1 = "test-share-user1";
 	const TEST_FILES_SHARING_API_USER2 = "test-share-user2";
@@ -41,7 +41,7 @@ abstract class Test_Files_Sharing_Base extends \PHPUnit_Framework_TestCase {
 	public $filename;
 	public $data;
 	/**
-	 * @var OC\Files\View
+	 * @var \OC\Files\View
 	 */
 	public $view;
 	public $folder;
diff --git a/apps/files_sharing/tests/update.php b/apps/files_sharing/tests/update.php
index be29c38acc3..583f607d9cb 100644
--- a/apps/files_sharing/tests/update.php
+++ b/apps/files_sharing/tests/update.php
@@ -22,12 +22,11 @@
  */
 
 require_once __DIR__ . '/../appinfo/update.php';
-require_once __DIR__ . '/base.php';
 
 /**
  * Class Test_Files_Sharing_Update
  */
-class Test_Files_Sharing_Update_Routine extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Update_Routine extends OCA\Files_Sharing\Tests\TestCase {
 
 	const TEST_FOLDER_NAME = '/folder_share_api_test';
 
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 1f51b9a315c..07349c1334d 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -21,12 +21,11 @@
  */
 
 require_once __DIR__ . '/../appinfo/update.php';
-require_once __DIR__ . '/base.php';
 
 /**
  * Class Test_Files_Sharing_Updater
  */
-class Test_Files_Sharing_Updater extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase {
 
 	const TEST_FOLDER_NAME = '/folder_share_updater_test';
 
diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php
index bce93c80a6c..67f55394ae8 100644
--- a/apps/files_sharing/tests/watcher.php
+++ b/apps/files_sharing/tests/watcher.php
@@ -19,9 +19,28 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-require_once __DIR__ . '/base.php';
 
-class Test_Files_Sharing_Watcher extends Test_Files_Sharing_Base {
+class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase {
+
+	/**
+	 * @var \OC\Files\Storage\Storage
+	 */
+	private $ownerStorage;
+
+	/**
+	 * @var \OC\Files\Cache\Cache
+	 */
+	private $ownerCache;
+
+	/**
+	 * @var \OC\Files\Storage\Storage
+	 */
+	private $sharedStorage;
+
+	/**
+	 * @var \OC\Files\Cache\Cache
+	 */
+	private $sharedCache;
 
 	function setUp() {
 		parent::setUp();
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 6a8955f5d1d..6fdb53f7271 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -20,8 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../../../lib/base.php';
-
 use OCA\Files_Trashbin;
 
 /**
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 558c8dfcb8a..4909d0606b1 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -32,6 +32,9 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 	const TEST_VERSIONS_USER = 'test-versions-user';
 	const USERS_VERSIONS_ROOT = '/test-versions-user/files_versions';
 
+	/**
+	 * @var \OC\Files\View
+	 */
 	private $rootView;
 
 	public static function setUpBeforeClass() {
@@ -63,7 +66,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 	 */
 	function testGetExpireList($versions, $sizeOfAllDeletedFiles) {
 
-		// last interval enda at 2592000
+		// last interval end at 2592000
 		$startTime = 5000000;
 
 		$testClass = new VersionStorageToTest();
diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php
index 5be16ce3c49..ab381e5c298 100644
--- a/tests/lib/appframework/http/DownloadResponseTest.php
+++ b/tests/lib/appframework/http/DownloadResponseTest.php
@@ -25,14 +25,16 @@
 namespace OCP\AppFramework\Http;
 
 
-//require_once(__DIR__ . "/../classloader.php");
+class ChildDownloadResponse extends DownloadResponse {
 
-
-class ChildDownloadResponse extends DownloadResponse {};
+};
 
 
 class DownloadResponseTest extends \PHPUnit_Framework_TestCase {
 
+	/**
+	 * @var ChildDownloadResponse
+	 */
 	protected $response;
 
 	protected function setUp(){
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index c62fa43863a..a7a189c98e5 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -26,13 +26,14 @@ namespace OC\AppFramework\Http;
 
 use OC\AppFramework\Http;
 
-//require_once(__DIR__ . "/../classloader.php");
-
-
 
 class HttpTest extends \PHPUnit_Framework_TestCase {
 
 	private $server;
+
+	/**
+	 * @var Http
+	 */
 	private $http;
 
 	protected function setUp(){
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index c0c58ebf761..f7c89a9d2e1 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -30,10 +30,6 @@ namespace OC\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http;
 
-//require_once(__DIR__ . "/../classloader.php");
-
-
-
 class JSONResponseTest extends \PHPUnit_Framework_TestCase {
 
 	/**
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
index dfd0d7ee7dc..e5d452f7f91 100644
--- a/tests/lib/appframework/http/RedirectResponseTest.php
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -26,13 +26,12 @@ namespace OCP\AppFramework\Http;
 
 use OCP\AppFramework\Http;
 
-//require_once(__DIR__ . "/../classloader.php");
-
-
 
 class RedirectResponseTest extends \PHPUnit_Framework_TestCase {
 
-
+	/**
+	 * @var RedirectResponse
+	 */
 	protected $response;
 
 	protected function setUp(){
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index db98bb4e9c2..5b9089b32e1 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -6,8 +6,6 @@
  * See the COPYING-README file.
  */
 
-require_once 'archive.php';
-
 class Test_Archive_TAR extends Test_Archive {
 	public function setUp() {
 		if (OC_Util::runningOnWindows()) {
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index 195e3450f3f..90958baf380 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -6,8 +6,6 @@
  * See the COPYING-README file.
  */
 
-require_once 'archive.php';
-
 if (!OC_Util::runningOnWindows()) {
 class Test_Archive_ZIP extends Test_Archive {
 	protected function getExisting() {
-- 
GitLab


From 99921489cf2a35d19803e63be67a312ea30f51ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Thu, 30 Oct 2014 17:24:25 +0100
Subject: [PATCH 277/616] prevent PHP notice

---
 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 8fcffbad950..73576088d15 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -990,7 +990,7 @@ class OC_App {
 	public static function shouldUpgrade($app) {
 		$versions = self::getAppVersions();
 		$currentVersion = OC_App::getAppVersion($app);
-		if ($currentVersion) {
+		if ($currentVersion && isset($versions[$app])) {
 			$installedVersion = $versions[$app];
 			if (version_compare($currentVersion, $installedVersion, '>')) {
 				return true;
-- 
GitLab


From e00f25e5b06e6bc119a91f36a0bf232109cf964f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 31 Oct 2014 01:55:39 -0400
Subject: [PATCH 278/616] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/ro.js       |   3 +-
 apps/files_sharing/l10n/ro.json     |   3 +-
 core/l10n/cs_CZ.js                  |   6 +-
 core/l10n/cs_CZ.json                |   6 +-
 core/l10n/da.js                     |   6 +-
 core/l10n/da.json                   |   6 +-
 core/l10n/de.js                     |   6 +-
 core/l10n/de.json                   |   6 +-
 core/l10n/de_DE.js                  |   6 +-
 core/l10n/de_DE.json                |   6 +-
 core/l10n/en_GB.js                  |   6 +-
 core/l10n/en_GB.json                |   6 +-
 core/l10n/et_EE.js                  |   2 +
 core/l10n/et_EE.json                |   2 +
 core/l10n/fi_FI.js                  |   6 +-
 core/l10n/fi_FI.json                |   6 +-
 core/l10n/fr.js                     |   6 +-
 core/l10n/fr.json                   |   6 +-
 core/l10n/it.js                     |   6 +-
 core/l10n/it.json                   |   6 +-
 core/l10n/nl.js                     |   6 +-
 core/l10n/nl.json                   |   6 +-
 core/l10n/pt_BR.js                  |   4 +
 core/l10n/pt_BR.json                |   4 +
 core/l10n/tr.js                     |   6 +-
 core/l10n/tr.json                   |   6 +-
 l10n/templates/core.pot             |  12 +-
 l10n/templates/files.pot            |   2 +-
 l10n/templates/files_encryption.pot |   2 +-
 l10n/templates/files_external.pot   |   2 +-
 l10n/templates/files_sharing.pot    |   2 +-
 l10n/templates/files_trashbin.pot   |   2 +-
 l10n/templates/files_versions.pot   |   2 +-
 l10n/templates/lib.pot              |   2 +-
 l10n/templates/private.pot          |   2 +-
 l10n/templates/settings.pot         | 200 ++++++++++++++--------------
 l10n/templates/user_ldap.pot        | 110 +++++++--------
 l10n/templates/user_webdavauth.pot  |   2 +-
 lib/l10n/ro.js                      |   8 +-
 lib/l10n/ro.json                    |   8 +-
 settings/l10n/ar.js                 |  12 +-
 settings/l10n/ar.json               |  12 +-
 settings/l10n/ast.js                |  21 ++-
 settings/l10n/ast.json              |  21 ++-
 settings/l10n/bg_BG.js              |  16 +--
 settings/l10n/bg_BG.json            |  16 +--
 settings/l10n/bn_BD.js              |   8 +-
 settings/l10n/bn_BD.json            |   8 +-
 settings/l10n/ca.js                 |  12 +-
 settings/l10n/ca.json               |  12 +-
 settings/l10n/cs_CZ.js              |  16 +--
 settings/l10n/cs_CZ.json            |  16 +--
 settings/l10n/da.js                 |  16 +--
 settings/l10n/da.json               |  16 +--
 settings/l10n/de.js                 |  10 +-
 settings/l10n/de.json               |  10 +-
 settings/l10n/de_DE.js              |  10 +-
 settings/l10n/de_DE.json            |  10 +-
 settings/l10n/el.js                 |  16 +--
 settings/l10n/el.json               |  16 +--
 settings/l10n/en_GB.js              |  16 +--
 settings/l10n/en_GB.json            |  16 +--
 settings/l10n/eo.js                 |  12 +-
 settings/l10n/eo.json               |  12 +-
 settings/l10n/es.js                 |  16 +--
 settings/l10n/es.json               |  16 +--
 settings/l10n/es_AR.js              |  12 +-
 settings/l10n/es_AR.json            |  12 +-
 settings/l10n/es_MX.js              |  10 +-
 settings/l10n/es_MX.json            |  10 +-
 settings/l10n/et_EE.js              |  18 +--
 settings/l10n/et_EE.json            |  18 +--
 settings/l10n/eu.js                 |  10 +-
 settings/l10n/eu.json               |  10 +-
 settings/l10n/fa.js                 |  12 +-
 settings/l10n/fa.json               |  12 +-
 settings/l10n/fi_FI.js              |  16 +--
 settings/l10n/fi_FI.json            |  16 +--
 settings/l10n/fr.js                 |  10 +-
 settings/l10n/fr.json               |  10 +-
 settings/l10n/gl.js                 |  12 +-
 settings/l10n/gl.json               |  12 +-
 settings/l10n/he.js                 |   8 +-
 settings/l10n/he.json               |   8 +-
 settings/l10n/hr.js                 |  12 +-
 settings/l10n/hr.json               |  12 +-
 settings/l10n/hu_HU.js              |  14 +-
 settings/l10n/hu_HU.json            |  14 +-
 settings/l10n/ia.js                 |   2 +-
 settings/l10n/ia.json               |   2 +-
 settings/l10n/id.js                 |  16 +--
 settings/l10n/id.json               |  16 +--
 settings/l10n/it.js                 |  16 +--
 settings/l10n/it.json               |  16 +--
 settings/l10n/ja.js                 |  10 +-
 settings/l10n/ja.json               |  10 +-
 settings/l10n/ka_GE.js              |   8 +-
 settings/l10n/ka_GE.json            |   8 +-
 settings/l10n/km.js                 |  12 +-
 settings/l10n/km.json               |  12 +-
 settings/l10n/ko.js                 |  12 +-
 settings/l10n/ko.json               |  12 +-
 settings/l10n/lb.js                 |   4 +-
 settings/l10n/lb.json               |   4 +-
 settings/l10n/lt_LT.js              |  10 +-
 settings/l10n/lt_LT.json            |  10 +-
 settings/l10n/lv.js                 |   8 +-
 settings/l10n/lv.json               |   8 +-
 settings/l10n/mk.js                 |  12 +-
 settings/l10n/mk.json               |  12 +-
 settings/l10n/ms_MY.js              |   2 +-
 settings/l10n/ms_MY.json            |   2 +-
 settings/l10n/nb_NO.js              |  12 +-
 settings/l10n/nb_NO.json            |  12 +-
 settings/l10n/nl.js                 |  16 +--
 settings/l10n/nl.json               |  16 +--
 settings/l10n/nn_NO.js              |   8 +-
 settings/l10n/nn_NO.json            |   8 +-
 settings/l10n/oc.js                 |   6 +-
 settings/l10n/oc.json               |   6 +-
 settings/l10n/pl.js                 |  16 +--
 settings/l10n/pl.json               |  16 +--
 settings/l10n/pt_BR.js              |  16 +--
 settings/l10n/pt_BR.json            |  16 +--
 settings/l10n/pt_PT.js              |  16 +--
 settings/l10n/pt_PT.json            |  16 +--
 settings/l10n/ro.js                 |  13 +-
 settings/l10n/ro.json               |  13 +-
 settings/l10n/ru.js                 |  12 +-
 settings/l10n/ru.json               |  12 +-
 settings/l10n/si_LK.js              |   4 +-
 settings/l10n/si_LK.json            |   4 +-
 settings/l10n/sk_SK.js              |  12 +-
 settings/l10n/sk_SK.json            |  12 +-
 settings/l10n/sl.js                 |  16 +--
 settings/l10n/sl.json               |  16 +--
 settings/l10n/sq.js                 |   8 +-
 settings/l10n/sq.json               |   8 +-
 settings/l10n/sr.js                 |   6 +-
 settings/l10n/sr.json               |   6 +-
 settings/l10n/sv.js                 |  16 +--
 settings/l10n/sv.json               |  16 +--
 settings/l10n/th_TH.js              |   6 +-
 settings/l10n/th_TH.json            |   6 +-
 settings/l10n/tr.js                 |  16 +--
 settings/l10n/tr.json               |  16 +--
 settings/l10n/ug.js                 |   6 +-
 settings/l10n/ug.json               |   6 +-
 settings/l10n/uk.js                 |  16 +--
 settings/l10n/uk.json               |  16 +--
 settings/l10n/vi.js                 |   8 +-
 settings/l10n/vi.json               |   8 +-
 settings/l10n/zh_CN.js              |  12 +-
 settings/l10n/zh_CN.json            |  12 +-
 settings/l10n/zh_HK.js              |   2 +-
 settings/l10n/zh_HK.json            |   2 +-
 settings/l10n/zh_TW.js              |  12 +-
 settings/l10n/zh_TW.json            |  12 +-
 158 files changed, 1000 insertions(+), 858 deletions(-)

diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js
index 37780d3ec23..a359e6f284c 100644
--- a/apps/files_sharing/l10n/ro.js
+++ b/apps/files_sharing/l10n/ro.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "files_sharing",
     {
-    "Server to server sharing is not enabled on this server" : "Partajare server-server nu este activată pe acest server",
+    "Server to server sharing is not enabled on this server" : "Partajarea server-server nu este activată pe acest server",
     "Shared with you" : "Partajat cu tine",
     "Shared with others" : "Partajat cu alții",
     "No files have been shared with you yet." : "Nu sunt încă fișiere partajate cu tine.",
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Password" : "Parolă",
     "Name" : "Nume",
     "Reasons might be:" : "Motive posibile ar fi:",
+    "the item was removed" : "acest articol a fost șters",
     "sharing is disabled" : "Partajare este oprită",
     "Add to your ownCloud" : "Adaugă propriul tău ownCloud",
     "Download" : "Descarcă",
diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json
index 04936017e6e..31b883d8193 100644
--- a/apps/files_sharing/l10n/ro.json
+++ b/apps/files_sharing/l10n/ro.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Server to server sharing is not enabled on this server" : "Partajare server-server nu este activată pe acest server",
+    "Server to server sharing is not enabled on this server" : "Partajarea server-server nu este activată pe acest server",
     "Shared with you" : "Partajat cu tine",
     "Shared with others" : "Partajat cu alții",
     "No files have been shared with you yet." : "Nu sunt încă fișiere partajate cu tine.",
@@ -11,6 +11,7 @@
     "Password" : "Parolă",
     "Name" : "Nume",
     "Reasons might be:" : "Motive posibile ar fi:",
+    "the item was removed" : "acest articol a fost șters",
     "sharing is disabled" : "Partajare este oprită",
     "Add to your ownCloud" : "Adaugă propriul tău ownCloud",
     "Download" : "Descarcă",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 2bc7040604a..c9aed4a7c45 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Editovat štítky",
     "Error loading dialog template: {error}" : "Chyba při načítání šablony dialogu: {error}",
     "No tags selected for deletion." : "Žádné štítky nebyly vybrány ke smazání.",
-    "_download %n file_::_download %n files_" : ["","",""],
+    "unknown text" : "neznámý text",
+    "Hello world!" : "Zdravím, světe!",
+    "sunny" : "slunečno",
+    "Hello {name}, the weather is {weather}" : "Ahoj {name}, je {weather}",
+    "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
     "Please reload the page." : "Načtěte stránku znovu, prosím.",
     "The update was unsuccessful." : "Aktualizace nebyla úspěšná.",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 12f0f52bcd7..67250ae52e7 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Editovat štítky",
     "Error loading dialog template: {error}" : "Chyba při načítání šablony dialogu: {error}",
     "No tags selected for deletion." : "Žádné štítky nebyly vybrány ke smazání.",
-    "_download %n file_::_download %n files_" : ["","",""],
+    "unknown text" : "neznámý text",
+    "Hello world!" : "Zdravím, světe!",
+    "sunny" : "slunečno",
+    "Hello {name}, the weather is {weather}" : "Ahoj {name}, je {weather}",
+    "_download %n file_::_download %n files_" : ["stáhnout %n soubor","stáhnout %n soubory","stáhnout %n souborů"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizuji {productName} na verzi {version}, může to chvíli trvat.",
     "Please reload the page." : "Načtěte stránku znovu, prosím.",
     "The update was unsuccessful." : "Aktualizace nebyla úspěšná.",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 33b76eaefe9..64bd64582a7 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Rediger tags",
     "Error loading dialog template: {error}" : "Fejl ved indlæsning dialog skabelon: {error}",
     "No tags selected for deletion." : "Ingen tags markeret til sletning.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "ukendt tekst",
+    "Hello world!" : "Hej verden!",
+    "sunny" : "solrigt",
+    "Hello {name}, the weather is {weather}" : "Hej {name}, vejret er {weather}",
+    "_download %n file_::_download %n files_" : ["hent %n fil","hent %n filer"],
     "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
     "Please reload the page." : "Genindlæs venligst siden",
     "The update was unsuccessful." : "Opdateringen mislykkedes.",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 2e84cd5e4f5..ed40172a698 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Rediger tags",
     "Error loading dialog template: {error}" : "Fejl ved indlæsning dialog skabelon: {error}",
     "No tags selected for deletion." : "Ingen tags markeret til sletning.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "ukendt tekst",
+    "Hello world!" : "Hej verden!",
+    "sunny" : "solrigt",
+    "Hello {name}, the weather is {weather}" : "Hej {name}, vejret er {weather}",
+    "_download %n file_::_download %n files_" : ["hent %n fil","hent %n filer"],
     "Updating {productName} to version {version}, this may take a while." : "Opdaterer {productName} til version {version}, det kan tage et stykke tid.",
     "Please reload the page." : "Genindlæs venligst siden",
     "The update was unsuccessful." : "Opdateringen mislykkedes.",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 96f55d1e992..fe6009e1632 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Schlagwörter bearbeiten",
     "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
     "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "Unbekannter Text",
+    "Hello world!" : "Hallo Welt!",
+    "sunny" : "Sonnig",
+    "Hello {name}, the weather is {weather}" : "Hallo {name}, das Wetter ist {weather}",
+    "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
     "Please reload the page." : "Bitte lade diese Seite neu.",
     "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 78a4c79f5ee..942f34cd3ca 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Schlagwörter bearbeiten",
     "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
     "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "Unbekannter Text",
+    "Hello world!" : "Hallo Welt!",
+    "sunny" : "Sonnig",
+    "Hello {name}, the weather is {weather}" : "Hallo {name}, das Wetter ist {weather}",
+    "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualisiere {productName} auf Version {version}. Dies könnte eine Weile dauern.",
     "Please reload the page." : "Bitte lade diese Seite neu.",
     "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index fa804c9573f..017ecd1c4fa 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Schlagwörter bearbeiten",
     "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
     "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "Unbekannter Text",
+    "Hello world!" : "Hallo Welt!",
+    "sunny" : "Sonnig",
+    "Hello {name}, the weather is {weather}" : "Hallo {name}, das Wetter ist {weather}",
+    "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
     "Please reload the page." : "Bitte laden Sie diese Seite neu.",
     "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index 72d88ab96b2..d6d0c73a777 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Schlagwörter bearbeiten",
     "Error loading dialog template: {error}" : "Fehler beim Laden der Dialogvorlage: {error}",
     "No tags selected for deletion." : "Es wurden keine Schlagwörter zum Löschen ausgewählt.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "Unbekannter Text",
+    "Hello world!" : "Hallo Welt!",
+    "sunny" : "Sonnig",
+    "Hello {name}, the weather is {weather}" : "Hallo {name}, das Wetter ist {weather}",
+    "_download %n file_::_download %n files_" : ["Lade %n Datei herunter","Lade %n Dateien herunter"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} wird auf Version {version} aktualisiert. Das könnte eine Weile dauern.",
     "Please reload the page." : "Bitte laden Sie diese Seite neu.",
     "The update was unsuccessful." : "Die Aktualisierung war erfolgreich.",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index b32e5768b2d..dd27b6c114d 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Edit tags",
     "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
     "No tags selected for deletion." : "No tags selected for deletion.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "unknown text",
+    "Hello world!" : "Hello world!",
+    "sunny" : "sunny",
+    "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}",
+    "_download %n file_::_download %n files_" : ["download %n file","download %n files"],
     "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
     "Please reload the page." : "Please reload the page.",
     "The update was unsuccessful." : "The update was unsuccessful.",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index b902ec5886b..b1f6556f900 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Edit tags",
     "Error loading dialog template: {error}" : "Error loading dialog template: {error}",
     "No tags selected for deletion." : "No tags selected for deletion.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "unknown text",
+    "Hello world!" : "Hello world!",
+    "sunny" : "sunny",
+    "Hello {name}, the weather is {weather}" : "Hello {name}, the weather is {weather}",
+    "_download %n file_::_download %n files_" : ["download %n file","download %n files"],
     "Updating {productName} to version {version}, this may take a while." : "Updating {productName} to version {version}, this may take a while.",
     "Please reload the page." : "Please reload the page.",
     "The update was unsuccessful." : "The update was unsuccessful.",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index c43a2b68d6c..79303820ad8 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -110,6 +110,8 @@ OC.L10N.register(
     "Edit tags" : "Muuda silte",
     "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
     "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "sunny" : "päikeseline",
+    "Hello {name}, the weather is {weather}" : "Tere {name}, ilm on {weather}",
     "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
     "Please reload the page." : "Palun laadi see uuesti.",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 0dc6854ec93..3a438678aee 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -108,6 +108,8 @@
     "Edit tags" : "Muuda silte",
     "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
     "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "sunny" : "päikeseline",
+    "Hello {name}, the weather is {weather}" : "Tere {name}, ilm on {weather}",
     "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
     "Please reload the page." : "Palun laadi see uuesti.",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index bfbfc9206ac..cc9fad66f8b 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -109,7 +109,11 @@ OC.L10N.register(
     "Edit tags" : "Muokkaa tunnisteita",
     "Error loading dialog template: {error}" : "Virhe ladatessa keskustelupohja: {error}",
     "No tags selected for deletion." : "Tunnisteita ei valittu poistettavaksi.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "tuntematon teksti",
+    "Hello world!" : "Hei maailma!",
+    "sunny" : "aurinkoinen",
+    "Hello {name}, the weather is {weather}" : "Hei {name}, sää on {weather}",
+    "_download %n file_::_download %n files_" : ["lataa %n tiedosto","lataa %n tiedostoa"],
     "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
     "Please reload the page." : "Päivitä sivu.",
     "The update was unsuccessful." : "Päivitys epäonnistui.",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index fcddf216a5d..32ad46587e2 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -107,7 +107,11 @@
     "Edit tags" : "Muokkaa tunnisteita",
     "Error loading dialog template: {error}" : "Virhe ladatessa keskustelupohja: {error}",
     "No tags selected for deletion." : "Tunnisteita ei valittu poistettavaksi.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "tuntematon teksti",
+    "Hello world!" : "Hei maailma!",
+    "sunny" : "aurinkoinen",
+    "Hello {name}, the weather is {weather}" : "Hei {name}, sää on {weather}",
+    "_download %n file_::_download %n files_" : ["lataa %n tiedosto","lataa %n tiedostoa"],
     "Updating {productName} to version {version}, this may take a while." : "Päivitetään {productName} versioon {version}, tämä saattaa kestää hetken.",
     "Please reload the page." : "Päivitä sivu.",
     "The update was unsuccessful." : "Päivitys epäonnistui.",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 0cc2d575f5e..bf0c26e1e0e 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Modifier les marqueurs",
     "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
     "No tags selected for deletion." : "Aucun marqueur sélectionné pour la suppression.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "texte inconnu",
+    "Hello world!" : "Hello world!",
+    "sunny" : "ensoleillé",
+    "Hello {name}, the weather is {weather}" : "Bonjour {name}, le temps est {weather}",
+    "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"],
     "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
     "Please reload the page." : "Veuillez recharger la page.",
     "The update was unsuccessful." : "La mise à jour a échoué.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 0f3c0112049..75f11a37b12 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Modifier les marqueurs",
     "Error loading dialog template: {error}" : "Erreur lors du chargement du modèle de dialogue : {error}",
     "No tags selected for deletion." : "Aucun marqueur sélectionné pour la suppression.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "texte inconnu",
+    "Hello world!" : "Hello world!",
+    "sunny" : "ensoleillé",
+    "Hello {name}, the weather is {weather}" : "Bonjour {name}, le temps est {weather}",
+    "_download %n file_::_download %n files_" : ["Télécharger %n fichier","Télécharger %n fichiers"],
     "Updating {productName} to version {version}, this may take a while." : "La mise à jour de {productName} vers la version {version} est en cours. Cela peut prendre un certain temps.",
     "Please reload the page." : "Veuillez recharger la page.",
     "The update was unsuccessful." : "La mise à jour a échoué.",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index 6c5b2947022..dcc221bf885 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Modifica etichette",
     "Error loading dialog template: {error}" : "Errore durante il caricamento del modello di finestra: {error}",
     "No tags selected for deletion." : "Nessuna etichetta selezionata per l'eliminazione.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "testo sconosciuto",
+    "Hello world!" : "Ciao mondo!",
+    "sunny" : "soleggiato",
+    "Hello {name}, the weather is {weather}" : "Ciao {name}, il tempo è {weather}",
+    "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"],
     "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
     "Please reload the page." : "Ricarica la pagina.",
     "The update was unsuccessful." : "L'aggiornamento non è riuscito.",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 8358bd13a78..599c613828b 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Modifica etichette",
     "Error loading dialog template: {error}" : "Errore durante il caricamento del modello di finestra: {error}",
     "No tags selected for deletion." : "Nessuna etichetta selezionata per l'eliminazione.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "testo sconosciuto",
+    "Hello world!" : "Ciao mondo!",
+    "sunny" : "soleggiato",
+    "Hello {name}, the weather is {weather}" : "Ciao {name}, il tempo è {weather}",
+    "_download %n file_::_download %n files_" : ["scarica %n file","scarica %s file"],
     "Updating {productName} to version {version}, this may take a while." : "Aggiornamento di {productName} alla versione {version}, potrebbe richiedere del tempo.",
     "Please reload the page." : "Ricarica la pagina.",
     "The update was unsuccessful." : "L'aggiornamento non è riuscito.",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 79d957c939b..011b04fd790 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Bewerken tags",
     "Error loading dialog template: {error}" : "Fout bij laden dialoog sjabloon: {error}",
     "No tags selected for deletion." : "Geen tags geselecteerd voor verwijdering.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "onbekende tekst",
+    "Hello world!" : "Hallo wereld!",
+    "sunny" : "zonnig",
+    "Hello {name}, the weather is {weather}" : "Hallo {name}, het is hier {weather}",
+    "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"],
     "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
     "Please reload the page." : "Herlaad deze pagina.",
     "The update was unsuccessful." : "De update is niet geslaagd.",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index f4aff498a2d..b59c04e73ff 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Bewerken tags",
     "Error loading dialog template: {error}" : "Fout bij laden dialoog sjabloon: {error}",
     "No tags selected for deletion." : "Geen tags geselecteerd voor verwijdering.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "onbekende tekst",
+    "Hello world!" : "Hallo wereld!",
+    "sunny" : "zonnig",
+    "Hello {name}, the weather is {weather}" : "Hallo {name}, het is hier {weather}",
+    "_download %n file_::_download %n files_" : ["download %n bestand","download %n bestanden"],
     "Updating {productName} to version {version}, this may take a while." : "Bijwerken {productName} naar versie {version}, dit kan even duren.",
     "Please reload the page." : "Herlaad deze pagina.",
     "The update was unsuccessful." : "De update is niet geslaagd.",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index fd71e84344c..041159ce172 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -110,6 +110,10 @@ OC.L10N.register(
     "Edit tags" : "Editar etiqueta",
     "Error loading dialog template: {error}" : "Erro carregando diálogo de formatação: {error}",
     "No tags selected for deletion." : "Nenhuma etiqueta selecionada para deleção.",
+    "unknown text" : "texto desconhecido",
+    "Hello world!" : "Alô mundo!",
+    "sunny" : "ensolarado",
+    "Hello {name}, the weather is {weather}" : "Olá {name}, o clima está {weather}",
     "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
     "Please reload the page." : "Por favor recarregue a página",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 5d0b17181d1..05be1f4cb1c 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -108,6 +108,10 @@
     "Edit tags" : "Editar etiqueta",
     "Error loading dialog template: {error}" : "Erro carregando diálogo de formatação: {error}",
     "No tags selected for deletion." : "Nenhuma etiqueta selecionada para deleção.",
+    "unknown text" : "texto desconhecido",
+    "Hello world!" : "Alô mundo!",
+    "sunny" : "ensolarado",
+    "Hello {name}, the weather is {weather}" : "Olá {name}, o clima está {weather}",
     "_download %n file_::_download %n files_" : ["",""],
     "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
     "Please reload the page." : "Por favor recarregue a página",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index aa49a4a0fb5..32144b5441c 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Etiketleri düzenle",
     "Error loading dialog template: {error}" : "İletişim şablonu yüklenirken hata: {error}",
     "No tags selected for deletion." : "Silmek için bir etiket seçilmedi.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "bilinmeyen metin",
+    "Hello world!" : "Merhaba dünya!",
+    "sunny" : "güneşli",
+    "Hello {name}, the weather is {weather}" : "Merhaba {name}, hava durumu {weather}",
+    "_download %n file_::_download %n files_" : ["%n dosya indir","%n dosya indir"],
     "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
     "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
     "The update was unsuccessful." : "Güncelleme başarısız oldu.",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index 24affb2ef36..c22d47c9e37 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Etiketleri düzenle",
     "Error loading dialog template: {error}" : "İletişim şablonu yüklenirken hata: {error}",
     "No tags selected for deletion." : "Silmek için bir etiket seçilmedi.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "bilinmeyen metin",
+    "Hello world!" : "Merhaba dünya!",
+    "sunny" : "güneşli",
+    "Hello {name}, the weather is {weather}" : "Merhaba {name}, hava durumu {weather}",
+    "_download %n file_::_download %n files_" : ["%n dosya indir","%n dosya indir"],
     "Updating {productName} to version {version}, this may take a while." : "{productName}, {version} sürümüne güncelleniyor, bu biraz zaman alabilir.",
     "Please reload the page." : "Lütfen sayfayı yeniden yükleyin.",
     "The update was unsuccessful." : "Güncelleme başarısız oldu.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 1bad346442d..822bc740bea 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -594,7 +594,7 @@ msgstr ""
 msgid "Users"
 msgstr ""
 
-#: strings.php:7 templates/layout.user.php:58 templates/layout.user.php:131
+#: strings.php:7 templates/layout.user.php:50 templates/layout.user.php:123
 msgid "Apps"
 msgstr ""
 
@@ -815,20 +815,20 @@ msgstr ""
 msgid "Finishing …"
 msgstr ""
 
-#: templates/layout.base.php:35 templates/layout.guest.php:37
-#: templates/layout.user.php:43
+#: templates/layout.base.php:27 templates/layout.guest.php:28
+#: templates/layout.user.php:35
 msgid ""
 "This application requires JavaScript for correct operation. Please <a href="
 "\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> "
 "and reload the page."
 msgstr ""
 
-#: templates/layout.user.php:47
+#: templates/layout.user.php:39
 #, php-format
 msgid "%s is available. Get more information on how to update."
 msgstr ""
 
-#: templates/layout.user.php:93 templates/singleuser.user.php:8
+#: templates/layout.user.php:85 templates/singleuser.user.php:8
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 763d62dd0cd..d72b21a1263 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index c6a7dd5f023..1616c958e36 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index b822a8caba2..8a1bd6f2827 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 231090e3e57..7912e20fba0 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 71302fbc7ab..6ab19bc764c 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 19817303dc8..c2d4454a050 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index b89cd0d8e80..e973ada8bb7 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 71ad7750197..1308e58c743 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 3aecf464d65..c6f673ae6c1 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,6 +17,30 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: admin.php:84
+msgid "Security & Setup Warnings"
+msgstr ""
+
+#: admin.php:108 templates/admin.php:227
+msgid "Cron"
+msgstr ""
+
+#: admin.php:109 templates/admin.php:272
+msgid "Sharing"
+msgstr ""
+
+#: admin.php:110 templates/admin.php:334
+msgid "Security"
+msgstr ""
+
+#: admin.php:111 templates/admin.php:364
+msgid "Email Server"
+msgstr ""
+
+#: admin.php:112 templates/admin.php:448
+msgid "Log"
+msgstr ""
+
 #: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
 #: ajax/togglegroups.php:20 changepassword/controller.php:49
 msgid "Authentication error"
@@ -188,7 +212,7 @@ msgstr ""
 msgid "Are you really sure you want add \"{domain}\" as trusted domain?"
 msgstr ""
 
-#: js/admin.js:7
+#: js/admin.js:8
 msgid "Add trusted domain"
 msgstr ""
 
@@ -360,66 +384,66 @@ msgstr ""
 msgid "SSL root certificates"
 msgstr ""
 
-#: personal.php:134 templates/admin.php:357 templates/personal.php:214
+#: personal.php:134 templates/admin.php:382 templates/personal.php:214
 msgid "Encryption"
 msgstr ""
 
-#: templates/admin.php:13
+#: templates/admin.php:23
 msgid "Everything (fatal issues, errors, warnings, info, debug)"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:24
 msgid "Info, warnings, errors and fatal issues"
 msgstr ""
 
-#: templates/admin.php:15
+#: templates/admin.php:25
 msgid "Warnings, errors and fatal issues"
 msgstr ""
 
-#: templates/admin.php:16
+#: templates/admin.php:26
 msgid "Errors and fatal issues"
 msgstr ""
 
-#: templates/admin.php:17
+#: templates/admin.php:27
 msgid "Fatal issues only"
 msgstr ""
 
-#: templates/admin.php:21 templates/admin.php:28
+#: templates/admin.php:31 templates/admin.php:38
 msgid "None"
 msgstr ""
 
-#: templates/admin.php:22
+#: templates/admin.php:32
 msgid "Login"
 msgstr ""
 
-#: templates/admin.php:23
+#: templates/admin.php:33
 msgid "Plain"
 msgstr ""
 
-#: templates/admin.php:24
+#: templates/admin.php:34
 msgid "NT LAN Manager"
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:39
 msgid "SSL"
 msgstr ""
 
-#: templates/admin.php:30
+#: templates/admin.php:40
 msgid "TLS"
 msgstr ""
 
-#: templates/admin.php:52 templates/admin.php:66
+#: templates/admin.php:76 templates/admin.php:90
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:79
 #, php-format
 msgid ""
 "You are accessing %s via HTTP. We strongly suggest you configure your server "
 "to require using HTTPS instead."
 msgstr ""
 
-#: templates/admin.php:69
+#: templates/admin.php:93
 msgid ""
 "Your data directory and your files are probably accessible from the "
 "internet. The .htaccess file is not working. We strongly suggest that you "
@@ -428,91 +452,91 @@ msgid ""
 "root."
 msgstr ""
 
-#: templates/admin.php:80
+#: templates/admin.php:103
 msgid "Setup Warning"
 msgstr ""
 
-#: templates/admin.php:83
+#: templates/admin.php:106
 msgid ""
 "PHP is apparently setup to strip inline doc blocks. This will make several "
 "core apps inaccessible."
 msgstr ""
 
-#: templates/admin.php:84
+#: templates/admin.php:107
 msgid ""
 "This is probably caused by a cache/accelerator such as Zend OPcache or "
 "eAccelerator."
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:118
 msgid "Database Performance Info"
 msgstr ""
 
-#: templates/admin.php:98
+#: templates/admin.php:121
 msgid ""
 "SQLite is used as database. For larger installations we recommend to change "
 "this. To migrate to another database use the command line tool: 'occ db:"
 "convert-type'"
 msgstr ""
 
-#: templates/admin.php:109
+#: templates/admin.php:132
 msgid "Module 'fileinfo' missing"
 msgstr ""
 
-#: templates/admin.php:112
+#: templates/admin.php:135
 msgid ""
 "The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
 "module to get best results with mime-type detection."
 msgstr ""
 
-#: templates/admin.php:123
+#: templates/admin.php:146
 msgid "Your PHP version is outdated"
 msgstr ""
 
-#: templates/admin.php:126
+#: templates/admin.php:149
 msgid ""
 "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
 "newer because older versions are known to be broken. It is possible that "
 "this installation is not working correctly."
 msgstr ""
 
-#: templates/admin.php:137
+#: templates/admin.php:160
 msgid "PHP charset is not set to UTF-8"
 msgstr ""
 
-#: templates/admin.php:140
+#: templates/admin.php:163
 msgid ""
 "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII "
 "characters in file names. We highly recommend to change the value of "
 "'default_charset' php.ini to 'UTF-8'."
 msgstr ""
 
-#: templates/admin.php:151
+#: templates/admin.php:174
 msgid "Locale not working"
 msgstr ""
 
-#: templates/admin.php:156
+#: templates/admin.php:179
 msgid "System locale can not be set to a one which supports UTF-8."
 msgstr ""
 
-#: templates/admin.php:160
+#: templates/admin.php:183
 msgid ""
 "This means that there might be problems with certain characters in file "
 "names."
 msgstr ""
 
-#: templates/admin.php:164
+#: templates/admin.php:187
 #, php-format
 msgid ""
 "We strongly suggest to install the required packages on your system to "
 "support one of the following locales: %s."
 msgstr ""
 
-#: templates/admin.php:175
+#: templates/admin.php:198
 msgid "URL generation in notification emails"
 msgstr ""
 
-#: templates/admin.php:178
+#: templates/admin.php:201
 #, php-format
 msgid ""
 "If your installation is not installed in the root of the domain and uses "
@@ -521,210 +545,190 @@ msgid ""
 "to the webroot path of your installation (Suggested: \"%s\")"
 msgstr ""
 
-#: templates/admin.php:186
+#: templates/admin.php:209
 msgid "Connectivity checks"
 msgstr ""
 
-#: templates/admin.php:188
+#: templates/admin.php:211
 msgid "No problems found"
 msgstr ""
 
-#: templates/admin.php:192
+#: templates/admin.php:215
 #, php-format
 msgid "Please double check the <a href='%s'>installation guides</a>."
 msgstr ""
 
-#: templates/admin.php:202
-msgid "Cron"
-msgstr ""
-
-#: templates/admin.php:209
+#: templates/admin.php:234
 #, php-format
 msgid "Last cron was executed at %s."
 msgstr ""
 
-#: templates/admin.php:212
+#: templates/admin.php:237
 #, php-format
 msgid ""
 "Last cron was executed at %s. This is more than an hour ago, something seems "
 "wrong."
 msgstr ""
 
-#: templates/admin.php:216
+#: templates/admin.php:241
 msgid "Cron was not executed yet!"
 msgstr ""
 
-#: templates/admin.php:226
+#: templates/admin.php:251
 msgid "Execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:234
+#: templates/admin.php:259
 msgid ""
 "cron.php is registered at a webcron service to call cron.php every 15 "
 "minutes over http."
 msgstr ""
 
-#: templates/admin.php:242
+#: templates/admin.php:267
 msgid "Use system's cron service to call the cron.php file every 15 minutes."
 msgstr ""
 
-#: templates/admin.php:247
-msgid "Sharing"
-msgstr ""
-
-#: templates/admin.php:251
+#: templates/admin.php:276
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:256
+#: templates/admin.php:281
 msgid "Allow users to share via link"
 msgstr ""
 
-#: templates/admin.php:262
+#: templates/admin.php:287
 msgid "Enforce password protection"
 msgstr ""
 
-#: templates/admin.php:265
+#: templates/admin.php:290
 msgid "Allow public uploads"
 msgstr ""
 
-#: templates/admin.php:269
+#: templates/admin.php:294
 msgid "Set default expiration date"
 msgstr ""
 
-#: templates/admin.php:273
+#: templates/admin.php:298
 msgid "Expire after "
 msgstr ""
 
-#: templates/admin.php:276
+#: templates/admin.php:301
 msgid "days"
 msgstr ""
 
-#: templates/admin.php:279
+#: templates/admin.php:304
 msgid "Enforce expiration date"
 msgstr ""
 
-#: templates/admin.php:284
+#: templates/admin.php:309
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:289
+#: templates/admin.php:314
 msgid "Restrict users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:294
+#: templates/admin.php:319
 msgid "Allow users to send mail notification for shared files"
 msgstr ""
 
-#: templates/admin.php:299
+#: templates/admin.php:324
 msgid "Exclude groups from sharing"
 msgstr ""
 
-#: templates/admin.php:304
+#: templates/admin.php:329
 msgid ""
 "These groups will still be able to receive shares, but not to initiate them."
 msgstr ""
 
-#: templates/admin.php:309
-msgid "Security"
-msgstr ""
-
-#: templates/admin.php:320
+#: templates/admin.php:345
 msgid "Enforce HTTPS"
 msgstr ""
 
-#: templates/admin.php:322
+#: templates/admin.php:347
 #, php-format
 msgid "Forces the clients to connect to %s via an encrypted connection."
 msgstr ""
 
-#: templates/admin.php:328
+#: templates/admin.php:353
 #, php-format
 msgid ""
 "Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
 msgstr ""
 
-#: templates/admin.php:339
-msgid "Email Server"
-msgstr ""
-
-#: templates/admin.php:341
+#: templates/admin.php:366
 msgid "This is used for sending out notifications."
 msgstr ""
 
-#: templates/admin.php:344
+#: templates/admin.php:369
 msgid "Send mode"
 msgstr ""
 
-#: templates/admin.php:372
+#: templates/admin.php:397
 msgid "From address"
 msgstr ""
 
-#: templates/admin.php:373
+#: templates/admin.php:398
 msgid "mail"
 msgstr ""
 
-#: templates/admin.php:380
+#: templates/admin.php:405
 msgid "Authentication method"
 msgstr ""
 
-#: templates/admin.php:393
+#: templates/admin.php:418
 msgid "Authentication required"
 msgstr ""
 
-#: templates/admin.php:397
+#: templates/admin.php:422
 msgid "Server address"
 msgstr ""
 
-#: templates/admin.php:401
+#: templates/admin.php:426
 msgid "Port"
 msgstr ""
 
-#: templates/admin.php:407
+#: templates/admin.php:432
 msgid "Credentials"
 msgstr ""
 
-#: templates/admin.php:408
+#: templates/admin.php:433
 msgid "SMTP Username"
 msgstr ""
 
-#: templates/admin.php:411
+#: templates/admin.php:436
 msgid "SMTP Password"
 msgstr ""
 
-#: templates/admin.php:412
+#: templates/admin.php:437
 msgid "Store credentials"
 msgstr ""
 
-#: templates/admin.php:417
+#: templates/admin.php:442
 msgid "Test email settings"
 msgstr ""
 
-#: templates/admin.php:418
+#: templates/admin.php:443
 msgid "Send email"
 msgstr ""
 
-#: templates/admin.php:423
-msgid "Log"
-msgstr ""
-
-#: templates/admin.php:424
+#: templates/admin.php:449
 msgid "Log level"
 msgstr ""
 
-#: templates/admin.php:456
+#: templates/admin.php:481
 msgid "More"
 msgstr ""
 
-#: templates/admin.php:457
+#: templates/admin.php:482
 msgid "Less"
 msgstr ""
 
-#: templates/admin.php:463 templates/personal.php:263
+#: templates/admin.php:488 templates/personal.php:263
 msgid "Version"
 msgstr ""
 
-#: templates/admin.php:467 templates/personal.php:266
+#: templates/admin.php:492 templates/personal.php:266
 msgid ""
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
 "\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" "
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 9cf7115d8d4..231395da82d 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -351,191 +351,195 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: templates/settings.php:7
+#: templates/settings.php:2
+msgid "LDAP"
+msgstr ""
+
+#: templates/settings.php:9
 msgid "Expert"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:10
 msgid "Advanced"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:13
 msgid ""
 "<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."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:16
 msgid ""
 "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
 "work. Please ask your system administrator to install it."
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:22
 msgid "Connection Settings"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:24
 msgid "Configuration Active"
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:24
 msgid "When unchecked, this configuration will be skipped."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:25
 msgid "Backup (Replica) Host"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:25
 msgid ""
 "Give an optional backup host. It must be a replica of the main LDAP/AD "
 "server."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:26
 msgid "Backup (Replica) Port"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:27
 msgid "Disable Main Server"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:27
 msgid "Only connect to the replica server."
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:28
 msgid "Case insensitive LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:29
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:29
 #, php-format
 msgid ""
 "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."
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:30
 msgid "Cache Time-To-Live"
 msgstr ""
 
-#: templates/settings.php:28
+#: templates/settings.php:30
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:32
 msgid "Directory Settings"
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:34
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:34
 msgid "The LDAP attribute to use to generate the user's display name."
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:35
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:33
+#: templates/settings.php:35
 msgid "One User Base DN per line"
 msgstr ""
 
-#: templates/settings.php:34
+#: templates/settings.php:36
 msgid "User Search Attributes"
 msgstr ""
 
-#: templates/settings.php:34 templates/settings.php:37
+#: templates/settings.php:36 templates/settings.php:39
 msgid "Optional; one attribute per line"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:37
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:35
+#: templates/settings.php:37
 msgid "The LDAP attribute to use to generate the groups's display name."
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:38
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:36
+#: templates/settings.php:38
 msgid "One Group Base DN per line"
 msgstr ""
 
-#: templates/settings.php:37
+#: templates/settings.php:39
 msgid "Group Search Attributes"
 msgstr ""
 
-#: templates/settings.php:38
+#: templates/settings.php:40
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:41
 msgid "Nested Groups"
 msgstr ""
 
-#: templates/settings.php:39
+#: templates/settings.php:41
 msgid ""
 "When switched on, groups that contain groups are supported. (Only works if "
 "the group member attribute contains DNs.)"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:42
 msgid "Paging chunksize"
 msgstr ""
 
-#: templates/settings.php:40
+#: templates/settings.php:42
 msgid ""
 "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.)"
 msgstr ""
 
-#: templates/settings.php:42
+#: templates/settings.php:44
 msgid "Special Attributes"
 msgstr ""
 
-#: templates/settings.php:44
+#: templates/settings.php:46
 msgid "Quota Field"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:47
 msgid "Quota Default"
 msgstr ""
 
-#: templates/settings.php:45
+#: templates/settings.php:47
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:46
+#: templates/settings.php:48
 msgid "Email Field"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:49
 msgid "User Home Folder Naming Rule"
 msgstr ""
 
-#: templates/settings.php:47
+#: templates/settings.php:49
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:53
+#: templates/settings.php:55
 msgid "Internal Username"
 msgstr ""
 
-#: templates/settings.php:54
+#: templates/settings.php:56
 msgid ""
 "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 "
@@ -551,15 +555,15 @@ msgid ""
 "effect only on newly mapped (added) LDAP users."
 msgstr ""
 
-#: templates/settings.php:55
+#: templates/settings.php:57
 msgid "Internal Username Attribute:"
 msgstr ""
 
-#: templates/settings.php:56
+#: templates/settings.php:58
 msgid "Override UUID detection"
 msgstr ""
 
-#: templates/settings.php:57
+#: templates/settings.php:59
 msgid ""
 "By default, the UUID attribute is automatically detected. The UUID attribute "
 "is used to doubtlessly identify LDAP users and groups. Also, the internal "
@@ -570,19 +574,19 @@ msgid ""
 "Changes will have effect only on newly mapped (added) LDAP users and groups."
 msgstr ""
 
-#: templates/settings.php:58
+#: templates/settings.php:60
 msgid "UUID Attribute for Users:"
 msgstr ""
 
-#: templates/settings.php:59
+#: templates/settings.php:61
 msgid "UUID Attribute for Groups:"
 msgstr ""
 
-#: templates/settings.php:60
+#: templates/settings.php:62
 msgid "Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:61
+#: templates/settings.php:63
 msgid ""
 "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. "
@@ -596,10 +600,10 @@ msgid ""
 "experimental stage."
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:64
 msgid "Clear Username-LDAP User Mapping"
 msgstr ""
 
-#: templates/settings.php:62
+#: templates/settings.php:64
 msgid "Clear Groupname-LDAP Group Mapping"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index e6dfe8e591d..5ec1d432a30 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-30 01:54-0400\n"
+"POT-Creation-Date: 2014-10-31 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/ro.js b/lib/l10n/ro.js
index 334da8299d4..baedf6b6f51 100644
--- a/lib/l10n/ro.js
+++ b/lib/l10n/ro.js
@@ -47,6 +47,12 @@ OC.L10N.register(
     "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",
     "Cannot write into \"config\" directory" : "Nu se poate scrie în folderul \"config\"",
-    "Cannot write into \"apps\" directory" : "Nu se poate scrie în folderul \"apps\""
+    "Cannot write into \"apps\" directory" : "Nu se poate scrie în folderul \"apps\"",
+    "PHP module %s not installed." : "Modulul PHP %s nu este instalat.",
+    "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Modulele PHP au fost instalate, dar apar ca lipsind?",
+    "PostgreSQL >= 9 required" : "Este necesară versiunea 9 sau mai mare a PostgreSQL",
+    "Please upgrade your database version" : "Actualizați baza de date la o versiune mai nouă",
+    "Error occurred while checking PostgreSQL version" : "A apărut o eroare la verificarea versiunii PostgreSQL"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/lib/l10n/ro.json b/lib/l10n/ro.json
index 760f66e8ba6..ba971437442 100644
--- a/lib/l10n/ro.json
+++ b/lib/l10n/ro.json
@@ -45,6 +45,12 @@
     "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",
     "Cannot write into \"config\" directory" : "Nu se poate scrie în folderul \"config\"",
-    "Cannot write into \"apps\" directory" : "Nu se poate scrie în folderul \"apps\""
+    "Cannot write into \"apps\" directory" : "Nu se poate scrie în folderul \"apps\"",
+    "PHP module %s not installed." : "Modulul PHP %s nu este instalat.",
+    "PHP %s or higher is required." : "Versiunea PHP %s sau mai mare este necesară.",
+    "PHP modules have been installed, but they are still listed as missing?" : "Modulele PHP au fost instalate, dar apar ca lipsind?",
+    "PostgreSQL >= 9 required" : "Este necesară versiunea 9 sau mai mare a PostgreSQL",
+    "Please upgrade your database version" : "Actualizați baza de date la o versiune mai nouă",
+    "Error occurred while checking PostgreSQL version" : "A apărut o eroare la verificarea versiunii PostgreSQL"
 },"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/settings/l10n/ar.js b/settings/l10n/ar.js
index f47285f6cdd..80d19fa2635 100644
--- a/settings/l10n/ar.js
+++ b/settings/l10n/ar.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "مفعلة",
+    "Cron" : "مجدول",
+    "Sharing" : "مشاركة",
+    "Security" : "الأمان",
+    "Email Server" : "خادم البريد الالكتروني",
+    "Log" : "سجل",
     "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
     "Your full name has been changed." : "اسمك الكامل تم تغييره.",
     "Unable to change full name" : "لم يتم التمكن من تغيير اسمك الكامل",
@@ -24,6 +28,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
     "Unable to change password" : "لا يمكن تغيير كلمة المرور",
+    "Enabled" : "مفعلة",
     "Saved" : "حفظ",
     "test email settings" : "إعدادات البريد التجريبي",
     "If you received this email, the settings seem to be correct." : "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
@@ -78,26 +83,21 @@ OC.L10N.register(
     "This means that there might be problems with certain characters in file names." : "هذا يعني انه من الممكن ان يكون هناك مشكلة في بعض الاحرف في اسم الملف.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
-    "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  لاستدعاء الملف cron.php كل  15 دقيقه",
-    "Sharing" : "مشاركة",
     "Allow apps to use the Share API" : "السماح للتطبيقات بالمشاركة عن طريق الAPI",
     "Allow users to share via link" : "السماح للمستخدم بمشاركة الملف عن طريق رابط",
     "Allow public uploads" : "السماح بالرفع للعامة ",
     "Expire after " : "ينتهي بعد",
     "days" : "أيام",
     "Allow resharing" : "السماح بإعادة المشاركة ",
-    "Security" : "الأمان",
     "Enforce HTTPS" : "فرض HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
-    "Email Server" : "خادم البريد الالكتروني",
     "Send mode" : "وضعية الإرسال",
     "Authentication method" : "أسلوب التطابق",
     "Server address" : "عنوان الخادم",
     "Port" : "المنفذ",
-    "Log" : "سجل",
     "Log level" : "مستوى السجل",
     "More" : "المزيد",
     "Less" : "أقل",
diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json
index 3b5ea8da2b0..fe6a18d6857 100644
--- a/settings/l10n/ar.json
+++ b/settings/l10n/ar.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "مفعلة",
+    "Cron" : "مجدول",
+    "Sharing" : "مشاركة",
+    "Security" : "الأمان",
+    "Email Server" : "خادم البريد الالكتروني",
+    "Log" : "سجل",
     "Authentication error" : "لم يتم التأكد من الشخصية بنجاح",
     "Your full name has been changed." : "اسمك الكامل تم تغييره.",
     "Unable to change full name" : "لم يتم التمكن من تغيير اسمك الكامل",
@@ -22,6 +26,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "خطا في كلمة مرور المسؤول المستردة, يرجى التاكد من كلمة المرور والمحاولة مرة اخرى.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end لا يدعم تغيير كلمة المرور, لاكن مفتاح تشفير المستخدمين تم تحديثة بنجاح.",
     "Unable to change password" : "لا يمكن تغيير كلمة المرور",
+    "Enabled" : "مفعلة",
     "Saved" : "حفظ",
     "test email settings" : "إعدادات البريد التجريبي",
     "If you received this email, the settings seem to be correct." : "تبدوا الاعدادت صحيحة اذا تلقيت هذا البريد الالكتروني",
@@ -76,26 +81,21 @@
     "This means that there might be problems with certain characters in file names." : "هذا يعني انه من الممكن ان يكون هناك مشكلة في بعض الاحرف في اسم الملف.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
-    "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  لاستدعاء الملف cron.php كل  15 دقيقه",
-    "Sharing" : "مشاركة",
     "Allow apps to use the Share API" : "السماح للتطبيقات بالمشاركة عن طريق الAPI",
     "Allow users to share via link" : "السماح للمستخدم بمشاركة الملف عن طريق رابط",
     "Allow public uploads" : "السماح بالرفع للعامة ",
     "Expire after " : "ينتهي بعد",
     "days" : "أيام",
     "Allow resharing" : "السماح بإعادة المشاركة ",
-    "Security" : "الأمان",
     "Enforce HTTPS" : "فرض HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "اجبار العميل للاتصال بـ %s عن طريق اتصال مشفر",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "يرجى الاتصال بـ %s عن طريق HTTPS لتفعيل او تعطيل SSL enforcement.",
-    "Email Server" : "خادم البريد الالكتروني",
     "Send mode" : "وضعية الإرسال",
     "Authentication method" : "أسلوب التطابق",
     "Server address" : "عنوان الخادم",
     "Port" : "المنفذ",
-    "Log" : "سجل",
     "Log level" : "مستوى السجل",
     "More" : "المزيد",
     "Less" : "أقل",
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index 1a101e07c62..1689e49d203 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -1,6 +1,11 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Compartiendo",
+    "Security" : "Seguridá",
+    "Email Server" : "Sirvidor de corréu-e",
+    "Log" : "Rexistru",
     "Authentication error" : "Fallu d'autenticación",
     "Your full name has been changed." : "Camudóse'l nome completu.",
     "Unable to change full name" : "Nun pue camudase'l nome completu",
@@ -31,12 +36,16 @@ OC.L10N.register(
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
     "Unable to change password" : "Nun pudo camudase la contraseña",
     "Enabled" : "Habilitar",
+    "Not enabled" : "Desactiváu",
     "Recommended" : "Recomendáu",
     "Saved" : "Guardáu",
     "test email settings" : "probar configuración de corréu",
     "If you received this email, the settings seem to be correct." : "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
+    "A problem occurred while sending the email. Please revise your settings." : "Hebo un problema al unviar el mensaxe. Revisa la configuración.",
     "Email sent" : "Corréu-e unviáu",
     "You need to set your user email before being able to send test emails." : "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "¿De xuru que quies amestar \"{domain}\" como dominiu de confianza?",
+    "Add trusted domain" : "Amestar dominiu de confianza",
     "Sending..." : "Unviando...",
     "All" : "Toos",
     "Please wait...." : "Espera, por favor....",
@@ -56,6 +65,7 @@ OC.L10N.register(
     "So-so password" : "Contraseña pasable",
     "Good password" : "Contraseña bona",
     "Strong password" : "Contraseña mui bona",
+    "Valid until {date}" : "Válidu fasta {date}",
     "Delete" : "Desaniciar",
     "Decrypting files... Please wait, this can take some time." : "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
     "Delete encryption keys permanently." : "Desaniciar dafechu les claves de cifráu.",
@@ -66,6 +76,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Hai d'escribir un nome de grupu válidu",
     "deleted {groupName}" : "desaniciáu {groupName}",
     "undo" : "desfacer",
+    "no group" : "Ensín grupu",
     "never" : "enxamás",
     "deleted {userName}" : "desaniciáu {userName}",
     "add group" : "amestar Grupu",
@@ -74,6 +85,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
     "Warning: Home directory for user \"{user}\" already exists" : "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
     "__language_name__" : "Asturianu",
+    "Personal Info" : "Información personal",
     "SSL root certificates" : "Certificaos raíz SSL",
     "Encryption" : "Cifráu",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)",
@@ -99,19 +111,21 @@ OC.L10N.register(
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
     "Your PHP version is outdated" : "La versión de PHP nun ta anovada",
     "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La versión de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
+    "PHP charset is not set to UTF-8" : "El xuegu de caracteres de PHP nun ta afitáu pa UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "El xuegu de caracteres de PHP nun ta afitáu pa UTF-8. Esto pue causar problemes graves con nomes d'archivos que nun contengan caracteres ASCII. Encamentamos camudar el valor de 'default_charset' a 'UTF-8'.",
     "Locale not working" : "La configuración rexonal nun ta funcionando",
     "System locale can not be set to a one which supports UTF-8." : "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
+    "URL generation in notification emails" : "Xeneración d'URL en mensaxes de notificación",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si la so instalación nun ta asitiada nel raigañu del dominiu y uses el cron del sistema, pues atopar problemas cola xeneración d'URL. Pa evitar estos problemes, afita la opción \"overwritewebroot\" nel tu ficheru config.php pa qu'use'l camín del raigañu la so instalación  (Suxerencia: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Cron executóse per cabera vegada a les %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
     "Cron was not executed yet!" : "¡Cron entá nun s'executó!",
     "Execute one task with each page loaded" : "Executar una xera con cada páxina cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
-    "Sharing" : "Compartiendo",
     "Allow apps to use the Share API" : "Permitir a les aplicaciones usar la API de Compartición",
     "Allow users to share via link" : "Permitir a los usuarios compartir vía enllaz",
     "Enforce password protection" : "Ameyora la proteición por contraseña.",
@@ -125,11 +139,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
     "Exclude groups from sharing" : "Esclúi grupos de compartir",
     "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos",
-    "Security" : "Seguridá",
     "Enforce HTTPS" : "Forciar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
-    "Email Server" : "Sirvidor de corréu-e",
     "This is used for sending out notifications." : "Esto úsase pa unviar notificaciones.",
     "Send mode" : "Mou d'unviu",
     "From address" : "Dende la direición",
@@ -143,7 +155,6 @@ OC.L10N.register(
     "SMTP Password" : "Contraseña SMTP",
     "Test email settings" : "Probar configuración de corréu electrónicu",
     "Send email" : "Unviar mensaxe",
-    "Log" : "Rexistru",
     "Log level" : "Nivel de rexistru",
     "More" : "Más",
     "Less" : "Menos",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index 4078bf842eb..643ef9cc6ee 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -1,4 +1,9 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Compartiendo",
+    "Security" : "Seguridá",
+    "Email Server" : "Sirvidor de corréu-e",
+    "Log" : "Rexistru",
     "Authentication error" : "Fallu d'autenticación",
     "Your full name has been changed." : "Camudóse'l nome completu.",
     "Unable to change full name" : "Nun pue camudase'l nome completu",
@@ -29,12 +34,16 @@
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end nun sofita cambeos de contraseña, pero la contraseña de cifráu del usuariu anovóse afechiscamente.",
     "Unable to change password" : "Nun pudo camudase la contraseña",
     "Enabled" : "Habilitar",
+    "Not enabled" : "Desactiváu",
     "Recommended" : "Recomendáu",
     "Saved" : "Guardáu",
     "test email settings" : "probar configuración de corréu",
     "If you received this email, the settings seem to be correct." : "Si recibisti esti mensaxe de corréu-e, la to configuración ta correuta.",
+    "A problem occurred while sending the email. Please revise your settings." : "Hebo un problema al unviar el mensaxe. Revisa la configuración.",
     "Email sent" : "Corréu-e unviáu",
     "You need to set your user email before being able to send test emails." : "Tienes de configurar la direición de corréu-e enantes de poder unviar mensaxes de prueba.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "¿De xuru que quies amestar \"{domain}\" como dominiu de confianza?",
+    "Add trusted domain" : "Amestar dominiu de confianza",
     "Sending..." : "Unviando...",
     "All" : "Toos",
     "Please wait...." : "Espera, por favor....",
@@ -54,6 +63,7 @@
     "So-so password" : "Contraseña pasable",
     "Good password" : "Contraseña bona",
     "Strong password" : "Contraseña mui bona",
+    "Valid until {date}" : "Válidu fasta {date}",
     "Delete" : "Desaniciar",
     "Decrypting files... Please wait, this can take some time." : "Descifrando ficheros... Espera por favor, esto pue llevar daqué de tiempu.",
     "Delete encryption keys permanently." : "Desaniciar dafechu les claves de cifráu.",
@@ -64,6 +74,7 @@
     "A valid group name must be provided" : "Hai d'escribir un nome de grupu válidu",
     "deleted {groupName}" : "desaniciáu {groupName}",
     "undo" : "desfacer",
+    "no group" : "Ensín grupu",
     "never" : "enxamás",
     "deleted {userName}" : "desaniciáu {userName}",
     "add group" : "amestar Grupu",
@@ -72,6 +83,7 @@
     "A valid password must be provided" : "Tien d'apurrise una contraseña válida",
     "Warning: Home directory for user \"{user}\" already exists" : "Avisu: el direutoriu d'aniciu pal usuariu \"{user}\" yá esiste.",
     "__language_name__" : "Asturianu",
+    "Personal Info" : "Información personal",
     "SSL root certificates" : "Certificaos raíz SSL",
     "Encryption" : "Cifráu",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Too (Información, Avisos, Fallos, debug y problemes fatales)",
@@ -97,19 +109,21 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Nun s'atopó'l módulu PHP 'fileinfo'. Encamentámoste qu'habilites esti módulu pa obtener meyores resultaos cola deteición de tribes MIME.",
     "Your PHP version is outdated" : "La versión de PHP nun ta anovada",
     "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La versión de PHP caducó. Suxerímose que l'anueves a 5.3.8 o a una más nueva porque davezu, les versiones vieyes nun funcionen bien. Puede ser qu'esta instalación nun tea funcionando bien.",
+    "PHP charset is not set to UTF-8" : "El xuegu de caracteres de PHP nun ta afitáu pa UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "El xuegu de caracteres de PHP nun ta afitáu pa UTF-8. Esto pue causar problemes graves con nomes d'archivos que nun contengan caracteres ASCII. Encamentamos camudar el valor de 'default_charset' a 'UTF-8'.",
     "Locale not working" : "La configuración rexonal nun ta funcionando",
     "System locale can not be set to a one which supports UTF-8." : "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
+    "URL generation in notification emails" : "Xeneración d'URL en mensaxes de notificación",
+    "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si la so instalación nun ta asitiada nel raigañu del dominiu y uses el cron del sistema, pues atopar problemas cola xeneración d'URL. Pa evitar estos problemes, afita la opción \"overwritewebroot\" nel tu ficheru config.php pa qu'use'l camín del raigañu la so instalación  (Suxerencia: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Cron executóse per cabera vegada a les %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron executóse per cabera vegada a les %s. Esto foi hai más d'una hora, daqué anda mal.",
     "Cron was not executed yet!" : "¡Cron entá nun s'executó!",
     "Execute one task with each page loaded" : "Executar una xera con cada páxina cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php rexístrase nun serviciu webcron pa llamar a cron.php cada 15 minutos al traviés de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar el serviciu cron del sistema pa llamar al ficheru cron.php cada 15 mins.",
-    "Sharing" : "Compartiendo",
     "Allow apps to use the Share API" : "Permitir a les aplicaciones usar la API de Compartición",
     "Allow users to share via link" : "Permitir a los usuarios compartir vía enllaz",
     "Enforce password protection" : "Ameyora la proteición por contraseña.",
@@ -123,11 +137,9 @@
     "Allow users to send mail notification for shared files" : "Permitir a los usuarios unviar mensaxes de notificación pa ficheros compartíos",
     "Exclude groups from sharing" : "Esclúi grupos de compartir",
     "These groups will still be able to receive shares, but not to initiate them." : "Estos grupos van poder siguir recibiendo conteníos compartíos, pero nun van poder anicialos",
-    "Security" : "Seguridá",
     "Enforce HTTPS" : "Forciar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forciar a los veceros a coneutase a %s per duana d'una conexón cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéutate a %s al traviés de HTTPS p'habilitar o deshabilitar l'aplicación de SSL.",
-    "Email Server" : "Sirvidor de corréu-e",
     "This is used for sending out notifications." : "Esto úsase pa unviar notificaciones.",
     "Send mode" : "Mou d'unviu",
     "From address" : "Dende la direición",
@@ -141,7 +153,6 @@
     "SMTP Password" : "Contraseña SMTP",
     "Test email settings" : "Probar configuración de corréu electrónicu",
     "Send email" : "Unviar mensaxe",
-    "Log" : "Rexistru",
     "Log level" : "Nivel de rexistru",
     "More" : "Más",
     "Less" : "Menos",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 1e7ccea70a3..6a8357e1206 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Включено",
-    "Not enabled" : "Изключено",
-    "Recommended" : "Препоръчано",
+    "Cron" : "Крон",
+    "Sharing" : "Споделяне",
+    "Security" : "Сигурност",
+    "Email Server" : "Имейл Сървър",
+    "Log" : "Доклад",
     "Authentication error" : "Възникна проблем с идентификацията",
     "Your full name has been changed." : "Пълното ти име е променено.",
     "Unable to change full name" : "Неуспешна промяна на пълното име.",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
     "Unable to change password" : "Неуспешна смяна на паролата.",
+    "Enabled" : "Включено",
+    "Not enabled" : "Изключено",
+    "Recommended" : "Препоръчано",
     "Saved" : "Запис",
     "test email settings" : "провери имейл настройките",
     "If you received this email, the settings seem to be correct." : "Ако си получил този имейл, настройките са правилни.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Проверка за свързаност",
     "No problems found" : "Не са открити проблеми",
     "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
-    "Cron" : "Крон",
     "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
     "Cron was not executed yet!" : "Cron oще не е изпълнен!",
     "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 да се свързва с cron.php всеки 15 минути по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
-    "Sharing" : "Споделяне",
     "Allow apps to use the Share API" : "Разреши приложенията да използват Share API.",
     "Allow users to share via link" : "Разреши потребителите да споделят с връзка",
     "Enforce password protection" : "Изискай защита с парола.",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Разреши потребителите да изпращат имейл уведомления за споделени файлове.",
     "Exclude groups from sharing" : "Забрани групи да споделят",
     "These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
-    "Security" : "Сигурност",
     "Enforce HTTPS" : "Изисквай HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Задължава клиента да се свързва с %s през криптирана връзка.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Моля свържи се с твоя %s през HTTPS, за да включиш или изключиш SSL задължаването.",
-    "Email Server" : "Имейл Сървър",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
     "From address" : "От адрес",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Запазвай креденциите",
     "Test email settings" : "Настройки на проверяващия имейл",
     "Send email" : "Изпрати имейл",
-    "Log" : "Доклад",
     "Log level" : "Детайли на доклада",
     "More" : "Още",
     "Less" : "По-малко",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index 87e52dd3a8e..dde8e3dbfd0 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Включено",
-    "Not enabled" : "Изключено",
-    "Recommended" : "Препоръчано",
+    "Cron" : "Крон",
+    "Sharing" : "Споделяне",
+    "Security" : "Сигурност",
+    "Email Server" : "Имейл Сървър",
+    "Log" : "Доклад",
     "Authentication error" : "Възникна проблем с идентификацията",
     "Your full name has been changed." : "Пълното ти име е променено.",
     "Unable to change full name" : "Неуспешна промяна на пълното име.",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Грешна администраторска парола за възстановяване. Моля, провери паролата и опитай отново.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Сървърът не позволява смяна на паролата, но ключът за криптиране беше успешно обновен.",
     "Unable to change password" : "Неуспешна смяна на паролата.",
+    "Enabled" : "Включено",
+    "Not enabled" : "Изключено",
+    "Recommended" : "Препоръчано",
     "Saved" : "Запис",
     "test email settings" : "провери имейл настройките",
     "If you received this email, the settings seem to be correct." : "Ако си получил този имейл, настройките са правилни.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Проверка за свързаност",
     "No problems found" : "Не са открити проблеми",
     "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
-    "Cron" : "Крон",
     "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Последният cron се изпълни в %s. Това е преди повече от час, нещо не както трябва.",
     "Cron was not executed yet!" : "Cron oще не е изпълнен!",
     "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 да се свързва с cron.php всеки 15 минути по http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Изполвай системната cron service, за връзка с cron.php файла всеки 15 минути.",
-    "Sharing" : "Споделяне",
     "Allow apps to use the Share API" : "Разреши приложенията да използват Share API.",
     "Allow users to share via link" : "Разреши потребителите да споделят с връзка",
     "Enforce password protection" : "Изискай защита с парола.",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Разреши потребителите да изпращат имейл уведомления за споделени файлове.",
     "Exclude groups from sharing" : "Забрани групи да споделят",
     "These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
-    "Security" : "Сигурност",
     "Enforce HTTPS" : "Изисквай HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Задължава клиента да се свързва с %s през криптирана връзка.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Моля свържи се с твоя %s през HTTPS, за да включиш или изключиш SSL задължаването.",
-    "Email Server" : "Имейл Сървър",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
     "From address" : "От адрес",
@@ -155,7 +156,6 @@
     "Store credentials" : "Запазвай креденциите",
     "Test email settings" : "Настройки на проверяващия имейл",
     "Send email" : "Изпрати имейл",
-    "Log" : "Доклад",
     "Log level" : "Детайли на доклада",
     "More" : "Още",
     "Less" : "По-малко",
diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js
index ea607b32c8a..57136a41b48 100644
--- a/settings/l10n/bn_BD.js
+++ b/settings/l10n/bn_BD.js
@@ -1,7 +1,9 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "কার্যকর",
+    "Sharing" : "ভাগাভাগিরত",
+    "Security" : "নিরাপত্তা",
+    "Email Server" : "ইমেইল সার্ভার",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
     "Group already exists" : "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
@@ -22,6 +24,7 @@ OC.L10N.register(
     "Couldn't update app." : "অ্যাপ নবায়ন করা গেলনা।",
     "Wrong password" : "ভুল কুটশব্দ",
     "No user supplied" : "ব্যবহারকারী দেয়া হয়নি",
+    "Enabled" : "কার্যকর",
     "Saved" : "সংরক্ষণ করা হলো",
     "test email settings" : "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
     "If you received this email, the settings seem to be correct." : "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
@@ -49,12 +52,9 @@ OC.L10N.register(
     "Module 'fileinfo' missing" : "'fileinfo' মডিউল নেই",
     "No problems found" : "কোন সমস্যা পাওয়া গেল না",
     "Please double check the <a href='%s'>installation guides</a>." : "দয়া করে <a href='%s'>installation guides</a> দ্বিতীয়বার দেখুন।",
-    "Sharing" : "ভাগাভাগিরত",
     "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও",
     "days" : "দিনগুলি",
     "Enforce expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
-    "Security" : "নিরাপত্তা",
-    "Email Server" : "ইমেইল সার্ভার",
     "Send mode" : "পাঠানো মোড",
     "From address" : "হইতে ঠিকানা",
     "mail" : "মেইল",
diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json
index 337df4cb4bc..fbced11ab41 100644
--- a/settings/l10n/bn_BD.json
+++ b/settings/l10n/bn_BD.json
@@ -1,5 +1,7 @@
 { "translations": {
-    "Enabled" : "কার্যকর",
+    "Sharing" : "ভাগাভাগিরত",
+    "Security" : "নিরাপত্তা",
+    "Email Server" : "ইমেইল সার্ভার",
     "Authentication error" : "অনুমোদন ঘটিত সমস্যা",
     "Your full name has been changed." : "আপনার পূর্ণ নাম পরিবর্তন করা হয়েছে।",
     "Group already exists" : "গোষ্ঠীটি পূর্ব থেকেই বিদ্যমান",
@@ -20,6 +22,7 @@
     "Couldn't update app." : "অ্যাপ নবায়ন করা গেলনা।",
     "Wrong password" : "ভুল কুটশব্দ",
     "No user supplied" : "ব্যবহারকারী দেয়া হয়নি",
+    "Enabled" : "কার্যকর",
     "Saved" : "সংরক্ষণ করা হলো",
     "test email settings" : "ইমেইল নিয়ামকসমূহ পরীক্ষা করুন",
     "If you received this email, the settings seem to be correct." : "এই ইমেইলের অর্থ নিয়ামকসমূহ সঠিক।",
@@ -47,12 +50,9 @@
     "Module 'fileinfo' missing" : "'fileinfo' মডিউল নেই",
     "No problems found" : "কোন সমস্যা পাওয়া গেল না",
     "Please double check the <a href='%s'>installation guides</a>." : "দয়া করে <a href='%s'>installation guides</a> দ্বিতীয়বার দেখুন।",
-    "Sharing" : "ভাগাভাগিরত",
     "Expire after " : "এরপর মেয়াদোত্তীর্ণ হও",
     "days" : "দিনগুলি",
     "Enforce expiration date" : "মেয়াদোত্তীর্ণ হওয়ার তারিখ কার্যকর করুন",
-    "Security" : "নিরাপত্তা",
-    "Email Server" : "ইমেইল সার্ভার",
     "Send mode" : "পাঠানো মোড",
     "From address" : "হইতে ঠিকানা",
     "mail" : "মেইল",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index a234364aeb9..1c1e5616252 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Activat",
+    "Cron" : "Cron",
+    "Sharing" : "Compartir",
+    "Security" : "Seguretat",
+    "Email Server" : "Servidor de correu",
+    "Log" : "Registre",
     "Authentication error" : "Error d'autenticació",
     "Your full name has been changed." : "El vostre nom complet ha canviat.",
     "Unable to change full name" : "No s'ha pogut canviar el nom complet",
@@ -31,6 +35,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
     "Unable to change password" : "No es pot canviar la contrasenya",
+    "Enabled" : "Activat",
     "Saved" : "Desat",
     "test email settings" : "prova l'arranjament del correu",
     "If you received this email, the settings seem to be correct." : "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
@@ -103,13 +108,11 @@ OC.L10N.register(
     "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
     "Cron was not executed yet!" : "El cron encara no s'ha executat!",
     "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
-    "Sharing" : "Compartir",
     "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
     "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
     "Enforce password protection" : "Reforça la protecció amb contrasenya",
@@ -123,11 +126,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Permet als usuaris enviar notificacions de fitxers compartits per correu ",
     "Exclude groups from sharing" : "Exclou grups de compartició",
     "These groups will still be able to receive shares, but not to initiate them." : "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
-    "Security" : "Seguretat",
     "Enforce HTTPS" : "Força HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Força la connexió dels clients a %s a través d'una connexió encriptada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
-    "Email Server" : "Servidor de correu",
     "This is used for sending out notifications." : "S'usa per enviar notificacions.",
     "Send mode" : "Mode d'enviament",
     "From address" : "Des de l'adreça",
@@ -141,7 +142,6 @@ OC.L10N.register(
     "SMTP Password" : "Contrasenya SMTP",
     "Test email settings" : "Prova l'arranjament del correu",
     "Send email" : "Envia correu",
-    "Log" : "Registre",
     "Log level" : "Nivell de registre",
     "More" : "Més",
     "Less" : "Menys",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 47847ab92b1..d6928e1259a 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Activat",
+    "Cron" : "Cron",
+    "Sharing" : "Compartir",
+    "Security" : "Seguretat",
+    "Email Server" : "Servidor de correu",
+    "Log" : "Registre",
     "Authentication error" : "Error d'autenticació",
     "Your full name has been changed." : "El vostre nom complet ha canviat.",
     "Unable to change full name" : "No s'ha pogut canviar el nom complet",
@@ -29,6 +33,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "La contrasenya de recuperació d'administrador és incorrecta. Comproveu-la i torneu-ho a intentar.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
     "Unable to change password" : "No es pot canviar la contrasenya",
+    "Enabled" : "Activat",
     "Saved" : "Desat",
     "test email settings" : "prova l'arranjament del correu",
     "If you received this email, the settings seem to be correct." : "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
@@ -101,13 +106,11 @@
     "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
     "Cron was not executed yet!" : "El cron encara no s'ha executat!",
     "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
-    "Sharing" : "Compartir",
     "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
     "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
     "Enforce password protection" : "Reforça la protecció amb contrasenya",
@@ -121,11 +124,9 @@
     "Allow users to send mail notification for shared files" : "Permet als usuaris enviar notificacions de fitxers compartits per correu ",
     "Exclude groups from sharing" : "Exclou grups de compartició",
     "These groups will still be able to receive shares, but not to initiate them." : "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
-    "Security" : "Seguretat",
     "Enforce HTTPS" : "Força HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Força la connexió dels clients a %s a través d'una connexió encriptada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
-    "Email Server" : "Servidor de correu",
     "This is used for sending out notifications." : "S'usa per enviar notificacions.",
     "Send mode" : "Mode d'enviament",
     "From address" : "Des de l'adreça",
@@ -139,7 +140,6 @@
     "SMTP Password" : "Contrasenya SMTP",
     "Test email settings" : "Prova l'arranjament del correu",
     "Send email" : "Envia correu",
-    "Log" : "Registre",
     "Log level" : "Nivell de registre",
     "More" : "Més",
     "Less" : "Menys",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index df2c43b6b8d..b5df8a082a1 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Povoleno",
-    "Not enabled" : "Vypnuto",
-    "Recommended" : "Doporučeno",
+    "Cron" : "Cron",
+    "Sharing" : "Sdílení",
+    "Security" : "Zabezpečení",
+    "Email Server" : "E-mailový server",
+    "Log" : "Záznam",
     "Authentication error" : "Chyba přihlášení",
     "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
     "Unable to change full name" : "Nelze změnit celé jméno",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
     "Unable to change password" : "Změna hesla se nezdařila",
+    "Enabled" : "Povoleno",
+    "Not enabled" : "Vypnuto",
+    "Recommended" : "Doporučeno",
     "Saved" : "Uloženo",
     "test email settings" : "otestovat nastavení e-mailu",
     "If you received this email, the settings seem to be correct." : "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Ověřování připojení",
     "No problems found" : "Nebyly nalezeny žádné problémy",
     "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
     "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
     "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
     "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.",
-    "Sharing" : "Sdílení",
     "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ů",
     "Enforce password protection" : "Vynutit ochranu heslem",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
     "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.",
-    "Security" : "Zabezpečení",
     "Enforce HTTPS" : "Vynutit HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vynutí připojování klientů k %s šifrovaným spojením.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
-    "Email Server" : "E-mailový server",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
     "From address" : "Adresa odesílatele",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Ukládat přihlašovací údaje",
     "Test email settings" : "Otestovat nastavení e-mailu",
     "Send email" : "Odeslat e-mail",
-    "Log" : "Záznam",
     "Log level" : "Úroveň zaznamenávání",
     "More" : "Více",
     "Less" : "Méně",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index cb124e02c6a..301fc064ea7 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Povoleno",
-    "Not enabled" : "Vypnuto",
-    "Recommended" : "Doporučeno",
+    "Cron" : "Cron",
+    "Sharing" : "Sdílení",
+    "Security" : "Zabezpečení",
+    "Email Server" : "E-mailový server",
+    "Log" : "Záznam",
     "Authentication error" : "Chyba přihlášení",
     "Your full name has been changed." : "Vaše celé jméno bylo změněno.",
     "Unable to change full name" : "Nelze změnit celé jméno",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pro obnovu. Překontrolujte správnost hesla a zkuste to znovu.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložiště nepodporuje změnu hesla, ale šifrovací klíč uživatelů byl úspěšně změněn.",
     "Unable to change password" : "Změna hesla se nezdařila",
+    "Enabled" : "Povoleno",
+    "Not enabled" : "Vypnuto",
+    "Recommended" : "Doporučeno",
     "Saved" : "Uloženo",
     "test email settings" : "otestovat nastavení e-mailu",
     "If you received this email, the settings seem to be correct." : "Pokud jste obdrželi tento e-mail, nastavení se zdají být v pořádku.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Ověřování připojení",
     "No problems found" : "Nebyly nalezeny žádné problémy",
     "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Poslední cron byl spuštěn v %s. To je více než před hodinou. Vypadá to, že není něco v pořádku.",
     "Cron was not executed yet!" : "Cron ještě nebyl spuštěn!",
     "Execute one task with each page loaded" : "Spustit jednu úlohu s každým načtením stránky",
     "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.",
-    "Sharing" : "Sdílení",
     "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ů",
     "Enforce password protection" : "Vynutit ochranu heslem",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Povolit uživatelům odesílat e-mailová upozornění pro sdílené soubory",
     "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.",
-    "Security" : "Zabezpečení",
     "Enforce HTTPS" : "Vynutit HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vynutí připojování klientů k %s šifrovaným spojením.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
-    "Email Server" : "E-mailový server",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
     "From address" : "Adresa odesílatele",
@@ -155,7 +156,6 @@
     "Store credentials" : "Ukládat přihlašovací údaje",
     "Test email settings" : "Otestovat nastavení e-mailu",
     "Send email" : "Odeslat e-mail",
-    "Log" : "Záznam",
     "Log level" : "Úroveň zaznamenávání",
     "More" : "Více",
     "Less" : "Méně",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 9b90a77a8b5..5678039552e 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Aktiveret",
-    "Not enabled" : "Slået fra",
-    "Recommended" : "Anbefalet",
+    "Cron" : "Cron",
+    "Sharing" : "Deling",
+    "Security" : "Sikkerhed",
+    "Email Server" : "E-mailserver",
+    "Log" : "Log",
     "Authentication error" : "Adgangsfejl",
     "Your full name has been changed." : "Dit fulde navn er blevet ændret.",
     "Unable to change full name" : "Ikke i stand til at ændre dit fulde navn",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
     "Unable to change password" : "Kunne ikke ændre kodeord",
+    "Enabled" : "Aktiveret",
+    "Not enabled" : "Slået fra",
+    "Recommended" : "Anbefalet",
     "Saved" : "Gemt",
     "test email settings" : "test e-mailindstillinger",
     "If you received this email, the settings seem to be correct." : "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Tjek for forbindelsen",
     "No problems found" : "Der blev ikke fundet problemer",
     "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
     "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
     "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæst",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
-    "Sharing" : "Deling",
     "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",
     "Enforce password protection" : "tving kodeords beskyttelse",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Tillad brugere at sende mail underretninger for delte filer",
     "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, dog ikke skabe dem.",
-    "Security" : "Sikkerhed",
     "Enforce HTTPS" : "Gennemtving HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
-    "Email Server" : "E-mailserver",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
     "From address" : "Fra adresse",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Gem brugeroplysninger",
     "Test email settings" : "Test e-mail-indstillinger",
     "Send email" : "Send e-mail",
-    "Log" : "Log",
     "Log level" : "Log niveau",
     "More" : "Mere",
     "Less" : "Mindre",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 10f163c422e..d249e8db756 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Aktiveret",
-    "Not enabled" : "Slået fra",
-    "Recommended" : "Anbefalet",
+    "Cron" : "Cron",
+    "Sharing" : "Deling",
+    "Security" : "Sikkerhed",
+    "Email Server" : "E-mailserver",
+    "Log" : "Log",
     "Authentication error" : "Adgangsfejl",
     "Your full name has been changed." : "Dit fulde navn er blevet ændret.",
     "Unable to change full name" : "Ikke i stand til at ændre dit fulde navn",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Forkert admin gendannelseskode. Se venligst koden efter og prøv igen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren understøtter ikke kodeordsskifte, men brugernes krypteringsnøgle blev opdateret.",
     "Unable to change password" : "Kunne ikke ændre kodeord",
+    "Enabled" : "Aktiveret",
+    "Not enabled" : "Slået fra",
+    "Recommended" : "Anbefalet",
     "Saved" : "Gemt",
     "test email settings" : "test e-mailindstillinger",
     "If you received this email, the settings seem to be correct." : "Hvis du har modtaget denne e-mail, så lader indstillinger til at være korrekte.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Tjek for forbindelsen",
     "No problems found" : "Der blev ikke fundet problemer",
     "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Seneste 'cron' blev kørt %s. Dette er over en time siden - noget må være galt.",
     "Cron was not executed yet!" : "Cron har ikke kørt endnu!",
     "Execute one task with each page loaded" : "Udføre en opgave med hver side indlæst",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php er registreret til at en webcron service skal kalde cron.php hvert 15 minut over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Brug systemets cron service til at kalde cron.php hver 15. minut",
-    "Sharing" : "Deling",
     "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",
     "Enforce password protection" : "tving kodeords beskyttelse",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Tillad brugere at sende mail underretninger for delte filer",
     "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, dog ikke skabe dem.",
-    "Security" : "Sikkerhed",
     "Enforce HTTPS" : "Gennemtving HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
-    "Email Server" : "E-mailserver",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
     "From address" : "Fra adresse",
@@ -155,7 +156,6 @@
     "Store credentials" : "Gem brugeroplysninger",
     "Test email settings" : "Test e-mail-indstillinger",
     "Send email" : "Send e-mail",
-    "Log" : "Log",
     "Log level" : "Log niveau",
     "More" : "Mere",
     "Less" : "Mindre",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 2628486428f..2126e3dc544 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -1,6 +1,11 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Teilen",
+    "Security" : "Sicherheit",
+    "Email Server" : "E-Mail-Server",
+    "Log" : "Log",
     "Authentication error" : "Fehler bei der Anmeldung",
     "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
     "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
     "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Sharing" : "Teilen",
     "Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API",
     "Allow users to share via link" : "Erlaube Nutzern, mithilfe von Links zu teilen",
     "Enforce password protection" : "Passwortschutz erzwingen",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
-    "Security" : "Sicherheit",
     "Enforce HTTPS" : "Erzwinge HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
-    "Email Server" : "E-Mail-Server",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sende-Modus",
     "From address" : "Absender-Adresse",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Anmeldeinformationen speichern",
     "Test email settings" : "Teste E-Mail-Einstellungen",
     "Send email" : "Sende E-Mail",
-    "Log" : "Log",
     "Log level" : "Loglevel",
     "More" : "Mehr",
     "Less" : "Weniger",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index ed665e8c5cc..094b20e6172 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -1,4 +1,9 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Teilen",
+    "Security" : "Sicherheit",
+    "Email Server" : "E-Mail-Server",
+    "Log" : "Log",
     "Authentication error" : "Fehler bei der Anmeldung",
     "Your full name has been changed." : "Dein vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
     "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
     "Execute one task with each page loaded" : "Führe eine Aufgabe mit jeder geladenen Seite aus",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Sharing" : "Teilen",
     "Allow apps to use the Share API" : "Erlaubt Apps die Nutzung der Share-API",
     "Allow users to share via link" : "Erlaube Nutzern, mithilfe von Links zu teilen",
     "Enforce password protection" : "Passwortschutz erzwingen",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Benutzern erlauben Mail-Benachrichtigungen für freigegebene Dateien zu senden",
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
-    "Security" : "Sicherheit",
     "Enforce HTTPS" : "Erzwinge HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
-    "Email Server" : "E-Mail-Server",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sende-Modus",
     "From address" : "Absender-Adresse",
@@ -155,7 +156,6 @@
     "Store credentials" : "Anmeldeinformationen speichern",
     "Test email settings" : "Teste E-Mail-Einstellungen",
     "Send email" : "Sende E-Mail",
-    "Log" : "Log",
     "Log level" : "Loglevel",
     "More" : "Mehr",
     "Less" : "Weniger",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 0a31f94a05b..d4c4031427d 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -1,6 +1,11 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Teilen",
+    "Security" : "Sicherheit",
+    "Email Server" : "E-Mail-Server",
+    "Log" : "Log",
     "Authentication error" : "Authentifizierungs-Fehler",
     "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
     "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
     "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Sharing" : "Teilen",
     "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
     "Allow users to share via link" : "Benutzern erlauben, über Links Inhalte freizugeben",
     "Enforce password protection" : "Passwortschutz erzwingen",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden",
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
-    "Security" : "Sicherheit",
     "Enforce HTTPS" : "HTTPS erzwingen",
     "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
     "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.",
-    "Email Server" : "E-Mail-Server",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "From address" : "Absender-Adresse",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Anmeldeinformationen speichern",
     "Test email settings" : "E-Mail-Einstellungen testen",
     "Send email" : "E-Mail senden",
-    "Log" : "Log",
     "Log level" : "Log-Level",
     "More" : "Mehr",
     "Less" : "Weniger",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 589dceaa53d..f5a0d145a35 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -1,4 +1,9 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Teilen",
+    "Security" : "Sicherheit",
+    "Email Server" : "E-Mail-Server",
+    "Log" : "Log",
     "Authentication error" : "Authentifizierungs-Fehler",
     "Your full name has been changed." : "Ihr vollständiger Name ist geändert worden.",
     "Unable to change full name" : "Der vollständige Name konnte nicht geändert werden",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Letzter Cron wurde um %s ausgeführt. Dies ist mehr als eine Stunde her, möglicherweise liegt ein Fehler vor.",
     "Cron was not executed yet!" : "Cron wurde bis jetzt noch nicht ausgeführt!",
     "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php ist als Webcron-Dienst registriert, der die cron.php alle 15 Minuten per HTTP aufruft.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Benutzen Sie den System-Crondienst, um die cron.php alle 15 Minuten aufzurufen.",
-    "Sharing" : "Teilen",
     "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
     "Allow users to share via link" : "Benutzern erlauben, über Links Inhalte freizugeben",
     "Enforce password protection" : "Passwortschutz erzwingen",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Benutzern erlauben E-Mail-Benachrichtigungen für freigegebene Dateien zu senden",
     "Exclude groups from sharing" : "Gruppen von Freigaben ausschließen",
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
-    "Security" : "Sicherheit",
     "Enforce HTTPS" : "HTTPS erzwingen",
     "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
     "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.",
-    "Email Server" : "E-Mail-Server",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
     "From address" : "Absender-Adresse",
@@ -155,7 +156,6 @@
     "Store credentials" : "Anmeldeinformationen speichern",
     "Test email settings" : "E-Mail-Einstellungen testen",
     "Send email" : "E-Mail senden",
-    "Log" : "Log",
     "Log level" : "Log-Level",
     "More" : "Mehr",
     "Less" : "Weniger",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 7d9d0f4c4f6..46e46cb2879 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Ενεργοποιημένο",
-    "Not enabled" : "Μη ενεργοποιημένο",
-    "Recommended" : "Προτείνεται",
+    "Cron" : "Cron",
+    "Sharing" : "Διαμοιρασμός",
+    "Security" : "Ασφάλεια",
+    "Email Server" : "Διακομιστής Email",
+    "Log" : "Καταγραφές",
     "Authentication error" : "Σφάλμα πιστοποίησης",
     "Your full name has been changed." : "Το πλήρες όνομά σας άλλαξε.",
     "Unable to change full name" : "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
+    "Enabled" : "Ενεργοποιημένο",
+    "Not enabled" : "Μη ενεργοποιημένο",
+    "Recommended" : "Προτείνεται",
     "Saved" : "Αποθηκεύτηκαν",
     "test email settings" : "δοκιμή ρυθμίσεων email",
     "If you received this email, the settings seem to be correct." : "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Έλεγχοι συνδεσιμότητας",
     "No problems found" : "Δεν βρέθηκαν προβλήματα",
     "Please double check the <a href='%s'>installation guides</a>." : "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Η τελευταία εκτέλεση του cron ήταν στις %s",
     "Last cron was executed at %s. This is more than an hour ago, 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 ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-    "Sharing" : "Διαμοιρασμός",
     "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
     "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
     "Enforce password protection" : "Επιβολή προστασίας με κωδικό",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
     "Exclude groups from sharing" : "Εξαίρεση ομάδων από τον διαμοιρασμό",
     "These groups will still be able to receive shares, but not to initiate them." : "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
-    "Security" : "Ασφάλεια",
     "Enforce HTTPS" : "Επιβολή χρήσης HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.",
-    "Email Server" : "Διακομιστής Email",
     "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
     "Send mode" : "Κατάσταση αποστολής",
     "From address" : "Από τη διεύθυνση",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Διαπιστευτήρια αποθήκευσης",
     "Test email settings" : "Δοκιμή ρυθμίσεων email",
     "Send email" : "Αποστολή email",
-    "Log" : "Καταγραφές",
     "Log level" : "Επίπεδο καταγραφής",
     "More" : "Περισσότερα",
     "Less" : "Λιγότερα",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index f6a0aa3ef75..56aebe5ae53 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Ενεργοποιημένο",
-    "Not enabled" : "Μη ενεργοποιημένο",
-    "Recommended" : "Προτείνεται",
+    "Cron" : "Cron",
+    "Sharing" : "Διαμοιρασμός",
+    "Security" : "Ασφάλεια",
+    "Email Server" : "Διακομιστής Email",
+    "Log" : "Καταγραφές",
     "Authentication error" : "Σφάλμα πιστοποίησης",
     "Your full name has been changed." : "Το πλήρες όνομά σας άλλαξε.",
     "Unable to change full name" : "Δεν ήταν δυνατή η αλλαγή του πλήρους ονόματός σας",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Λάθος κωδικός ανάκτησης διαχειριστή. Παρακαλώ ελέγξτε τον κωδικό και δοκιμάστε ξανά.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Το βασικό πλαίσιο δεν υποστηρίζει αλλαγή κωδικού, αλλά το κλειδί κρυπτογράφησης των χρηστών ενημερώθηκε επιτυχώς.",
     "Unable to change password" : "Αδυναμία αλλαγής συνθηματικού",
+    "Enabled" : "Ενεργοποιημένο",
+    "Not enabled" : "Μη ενεργοποιημένο",
+    "Recommended" : "Προτείνεται",
     "Saved" : "Αποθηκεύτηκαν",
     "test email settings" : "δοκιμή ρυθμίσεων email",
     "If you received this email, the settings seem to be correct." : "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Έλεγχοι συνδεσιμότητας",
     "No problems found" : "Δεν βρέθηκαν προβλήματα",
     "Please double check the <a href='%s'>installation guides</a>." : "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Η τελευταία εκτέλεση του cron ήταν στις %s",
     "Last cron was executed at %s. This is more than an hour ago, 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 ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Χρησιμοποιήστε την cron υπηρεσία του συτήματος για να καλέσετε το cron.php αρχείο κάθε 15 λεπτά.",
-    "Sharing" : "Διαμοιρασμός",
     "Allow apps to use the Share API" : "Επιτρέπει την χρήση του API διαμοιρασμού σε εφαρμογές ",
     "Allow users to share via link" : "Να επιτρέπεται σε χρήστες ο διαμοιρασμός μέσω συνδέσμου",
     "Enforce password protection" : "Επιβολή προστασίας με κωδικό",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Επιτρέψτε στους χρήστες να στέλνουν ειδοποιήσεις μέσω ηλεκτρονικού ταχυδρομείου για κοινόχρηστα αρχεία",
     "Exclude groups from sharing" : "Εξαίρεση ομάδων από τον διαμοιρασμό",
     "These groups will still be able to receive shares, but not to initiate them." : "Αυτές οι ομάδες θα συνεχίσουν να λαμβάνουν διαμοιρασμούς, αλλά δεν θα είναι δυνατό να τους δημιουργήσουν.",
-    "Security" : "Ασφάλεια",
     "Enforce HTTPS" : "Επιβολή χρήσης HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Επιβάλλει τους πελάτες να συνδέονται στο %s μέσω κρυπτογραφημένης σύνδεσης.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Παρακαλώ συνδεθείτε στο %s σας μέσω HTTPS για να ενεργοποιήσετε ή να απενεργοποιήσετε την επιβολή του SSL.",
-    "Email Server" : "Διακομιστής Email",
     "This is used for sending out notifications." : "Χρησιμοποιείται για αποστολή ειδοποιήσεων.",
     "Send mode" : "Κατάσταση αποστολής",
     "From address" : "Από τη διεύθυνση",
@@ -155,7 +156,6 @@
     "Store credentials" : "Διαπιστευτήρια αποθήκευσης",
     "Test email settings" : "Δοκιμή ρυθμίσεων email",
     "Send email" : "Αποστολή email",
-    "Log" : "Καταγραφές",
     "Log level" : "Επίπεδο καταγραφής",
     "More" : "Περισσότερα",
     "Less" : "Λιγότερα",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index b35062e2824..ba8ac429ea6 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Enabled",
-    "Not enabled" : "Not enabled",
-    "Recommended" : "Recommended",
+    "Cron" : "Cron",
+    "Sharing" : "Sharing",
+    "Security" : "Security",
+    "Email Server" : "Email Server",
+    "Log" : "Log",
     "Authentication error" : "Authentication error",
     "Your full name has been changed." : "Your full name has been changed.",
     "Unable to change full name" : "Unable to change full name",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Incorrect admin recovery password. Please check the password and try again.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
     "Unable to change password" : "Unable to change password",
+    "Enabled" : "Enabled",
+    "Not enabled" : "Not enabled",
+    "Recommended" : "Recommended",
     "Saved" : "Saved",
     "test email settings" : "test email settings",
     "If you received this email, the settings seem to be correct." : "If you received this email, the settings seem to be correct.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Connectivity checks",
     "No problems found" : "No problems found",
     "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Last cron was executed at %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
     "Cron was not executed yet!" : "Cron was not executed yet!",
     "Execute one task with each page loaded" : "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 is registered at a webcron service to call cron.php every 15 minutes over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
-    "Sharing" : "Sharing",
     "Allow apps to use the Share API" : "Allow apps to use the Share API",
     "Allow users to share via link" : "Allow users to share via link",
     "Enforce password protection" : "Enforce password protection",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Allow users to send mail notification for shared files",
     "Exclude groups from sharing" : "Exclude groups from sharing",
     "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
-    "Security" : "Security",
     "Enforce HTTPS" : "Enforce HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forces the clients to connect to %s via an encrypted connection.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
-    "Email Server" : "Email Server",
     "This is used for sending out notifications." : "This is used for sending out notifications.",
     "Send mode" : "Send mode",
     "From address" : "From address",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Store credentials",
     "Test email settings" : "Test email settings",
     "Send email" : "Send email",
-    "Log" : "Log",
     "Log level" : "Log level",
     "More" : "More",
     "Less" : "Less",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index c5ae9fff869..a9069f2bca3 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Enabled",
-    "Not enabled" : "Not enabled",
-    "Recommended" : "Recommended",
+    "Cron" : "Cron",
+    "Sharing" : "Sharing",
+    "Security" : "Security",
+    "Email Server" : "Email Server",
+    "Log" : "Log",
     "Authentication error" : "Authentication error",
     "Your full name has been changed." : "Your full name has been changed.",
     "Unable to change full name" : "Unable to change full name",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Incorrect admin recovery password. Please check the password and try again.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end doesn't support password change, but the user's encryption key was successfully updated.",
     "Unable to change password" : "Unable to change password",
+    "Enabled" : "Enabled",
+    "Not enabled" : "Not enabled",
+    "Recommended" : "Recommended",
     "Saved" : "Saved",
     "test email settings" : "test email settings",
     "If you received this email, the settings seem to be correct." : "If you received this email, the settings seem to be correct.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Connectivity checks",
     "No problems found" : "No problems found",
     "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Last cron was executed at %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Last cron was executed at %s. This is more than an hour ago, something seems wrong.",
     "Cron was not executed yet!" : "Cron was not executed yet!",
     "Execute one task with each page loaded" : "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 is registered at a webcron service to call cron.php every 15 minutes over http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use system's cron service to call the cron.php file every 15 minutes.",
-    "Sharing" : "Sharing",
     "Allow apps to use the Share API" : "Allow apps to use the Share API",
     "Allow users to share via link" : "Allow users to share via link",
     "Enforce password protection" : "Enforce password protection",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Allow users to send mail notification for shared files",
     "Exclude groups from sharing" : "Exclude groups from sharing",
     "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
-    "Security" : "Security",
     "Enforce HTTPS" : "Enforce HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forces the clients to connect to %s via an encrypted connection.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
-    "Email Server" : "Email Server",
     "This is used for sending out notifications." : "This is used for sending out notifications.",
     "Send mode" : "Send mode",
     "From address" : "From address",
@@ -155,7 +156,6 @@
     "Store credentials" : "Store credentials",
     "Test email settings" : "Test email settings",
     "Send email" : "Send email",
-    "Log" : "Log",
     "Log level" : "Log level",
     "More" : "More",
     "Less" : "Less",
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
index 5d76674dca9..5e6f2168e22 100644
--- a/settings/l10n/eo.js
+++ b/settings/l10n/eo.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Kapabligita",
+    "Cron" : "Cron",
+    "Sharing" : "Kunhavigo",
+    "Security" : "Sekuro",
+    "Email Server" : "Retpoŝtoservilo",
+    "Log" : "Protokolo",
     "Authentication error" : "Aŭtentiga eraro",
     "Your full name has been changed." : "Via plena nomo ŝanĝitas.",
     "Unable to change full name" : "Ne eblis ŝanĝi la plenan nomon",
@@ -22,6 +26,7 @@ OC.L10N.register(
     "Couldn't update app." : "Ne eblis ĝisdatigi la aplikaĵon.",
     "Wrong password" : "Malĝusta pasvorto",
     "Unable to change password" : "Ne eblis ŝanĝi la pasvorton",
+    "Enabled" : "Kapabligita",
     "Saved" : "Konservita",
     "Email sent" : "La retpoŝtaĵo sendiĝis",
     "Sending..." : "Sendante...",
@@ -72,15 +77,11 @@ OC.L10N.register(
     "Module 'fileinfo' missing" : "La modulo «fileinfo» mankas",
     "Locale not working" : "La lokaĵaro ne funkcias",
     "Please double check the <a href='%s'>installation guides</a>." : "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
-    "Cron" : "Cron",
-    "Sharing" : "Kunhavigo",
     "Allow apps to use the Share API" : "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
     "Allow public uploads" : "Permesi publikajn alŝutojn",
     "Expire after " : "Eksvalidigi post",
     "days" : "tagoj",
     "Allow resharing" : "Kapabligi rekunhavigon",
-    "Security" : "Sekuro",
-    "Email Server" : "Retpoŝtoservilo",
     "Send mode" : "Sendi pli",
     "From address" : "El adreso",
     "mail" : "retpoŝto",
@@ -92,7 +93,6 @@ OC.L10N.register(
     "SMTP Username" : "SMTP-uzantonomo",
     "SMTP Password" : "SMTP-pasvorto",
     "Send email" : "Sendi retpoŝton",
-    "Log" : "Protokolo",
     "Log level" : "Registronivelo",
     "More" : "Pli",
     "Less" : "Malpli",
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
index 1fc5186184f..06872e6d1d0 100644
--- a/settings/l10n/eo.json
+++ b/settings/l10n/eo.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Kapabligita",
+    "Cron" : "Cron",
+    "Sharing" : "Kunhavigo",
+    "Security" : "Sekuro",
+    "Email Server" : "Retpoŝtoservilo",
+    "Log" : "Protokolo",
     "Authentication error" : "Aŭtentiga eraro",
     "Your full name has been changed." : "Via plena nomo ŝanĝitas.",
     "Unable to change full name" : "Ne eblis ŝanĝi la plenan nomon",
@@ -20,6 +24,7 @@
     "Couldn't update app." : "Ne eblis ĝisdatigi la aplikaĵon.",
     "Wrong password" : "Malĝusta pasvorto",
     "Unable to change password" : "Ne eblis ŝanĝi la pasvorton",
+    "Enabled" : "Kapabligita",
     "Saved" : "Konservita",
     "Email sent" : "La retpoŝtaĵo sendiĝis",
     "Sending..." : "Sendante...",
@@ -70,15 +75,11 @@
     "Module 'fileinfo' missing" : "La modulo «fileinfo» mankas",
     "Locale not working" : "La lokaĵaro ne funkcias",
     "Please double check the <a href='%s'>installation guides</a>." : "Bonvolu duoble kontroli la <a href='%s'>gvidilon por instalo</a>.",
-    "Cron" : "Cron",
-    "Sharing" : "Kunhavigo",
     "Allow apps to use the Share API" : "Kapabligi aplikaĵojn uzi la API-on pri Kunhavigo",
     "Allow public uploads" : "Permesi publikajn alŝutojn",
     "Expire after " : "Eksvalidigi post",
     "days" : "tagoj",
     "Allow resharing" : "Kapabligi rekunhavigon",
-    "Security" : "Sekuro",
-    "Email Server" : "Retpoŝtoservilo",
     "Send mode" : "Sendi pli",
     "From address" : "El adreso",
     "mail" : "retpoŝto",
@@ -90,7 +91,6 @@
     "SMTP Username" : "SMTP-uzantonomo",
     "SMTP Password" : "SMTP-pasvorto",
     "Send email" : "Sendi retpoŝton",
-    "Log" : "Protokolo",
     "Log level" : "Registronivelo",
     "More" : "Pli",
     "Less" : "Malpli",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 16c250d1716..e3e91095806 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Habilitado",
-    "Not enabled" : "No habilitado",
-    "Recommended" : "Recomendado",
+    "Cron" : "Cron",
+    "Sharing" : "Compartiendo",
+    "Security" : "Seguridad",
+    "Email Server" : "Servidor de correo electrónico",
+    "Log" : "Registro",
     "Authentication error" : "Error de autenticación",
     "Your full name has been changed." : "Se ha cambiado su nombre completo.",
     "Unable to change full name" : "No se puede cambiar el nombre completo",
@@ -33,6 +35,9 @@ 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.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
     "Unable to change password" : "No se ha podido cambiar la contraseña",
+    "Enabled" : "Habilitado",
+    "Not enabled" : "No habilitado",
+    "Recommended" : "Recomendado",
     "Saved" : "Guardado",
     "test email settings" : "probar configuración de correo electrónico",
     "If you received this email, the settings seem to be correct." : "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Probar la conectividad",
     "No problems found" : "No se han encontrado problemas",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
     "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
     "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.",
     "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.",
-    "Sharing" : "Compartiendo",
     "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",
     "Enforce password protection" : "Forzar la protección por contraseña.",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
     "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.",
-    "Security" : "Seguridad",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
-    "Email Server" : "Servidor de correo electrónico",
     "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
     "Send mode" : "Modo de envío",
     "From address" : "Desde la dirección",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Almacenar credenciales",
     "Test email settings" : "Probar configuración de correo electrónico",
     "Send email" : "Enviar mensaje",
-    "Log" : "Registro",
     "Log level" : "Nivel de registro",
     "More" : "Más",
     "Less" : "Menos",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index dcb17e3bfb6..03d28e481f8 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Habilitado",
-    "Not enabled" : "No habilitado",
-    "Recommended" : "Recomendado",
+    "Cron" : "Cron",
+    "Sharing" : "Compartiendo",
+    "Security" : "Seguridad",
+    "Email Server" : "Servidor de correo electrónico",
+    "Log" : "Registro",
     "Authentication error" : "Error de autenticación",
     "Your full name has been changed." : "Se ha cambiado su nombre completo.",
     "Unable to change full name" : "No se puede cambiar el nombre completo",
@@ -31,6 +33,9 @@
     "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.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
     "Unable to change password" : "No se ha podido cambiar la contraseña",
+    "Enabled" : "Habilitado",
+    "Not enabled" : "No habilitado",
+    "Recommended" : "Recomendado",
     "Saved" : "Guardado",
     "test email settings" : "probar configuración de correo electrónico",
     "If you received this email, the settings seem to be correct." : "Si recibió este mensaje de correo electrónico, su configuración debe estar correcta.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Probar la conectividad",
     "No problems found" : "No se han encontrado problemas",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron fue ejecutado por última vez a las %s. Esto fue hace más de una hora, algo anda mal.",
     "Cron was not executed yet!" : "¡Cron aún no ha sido ejecutado!",
     "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.",
     "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.",
-    "Sharing" : "Compartiendo",
     "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",
     "Enforce password protection" : "Forzar la protección por contraseña.",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Permitir a los usuarios enviar mensajes de notificación para ficheros compartidos",
     "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.",
-    "Security" : "Seguridad",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
-    "Email Server" : "Servidor de correo electrónico",
     "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
     "Send mode" : "Modo de envío",
     "From address" : "Desde la dirección",
@@ -155,7 +156,6 @@
     "Store credentials" : "Almacenar credenciales",
     "Test email settings" : "Probar configuración de correo electrónico",
     "Send email" : "Enviar mensaje",
-    "Log" : "Registro",
     "Log level" : "Nivel de registro",
     "More" : "Más",
     "Less" : "Menos",
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
index 278fdc3f353..40b019f5c64 100644
--- a/settings/l10n/es_AR.js
+++ b/settings/l10n/es_AR.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Habilitado",
+    "Cron" : "Cron",
+    "Sharing" : "Compartiendo",
+    "Security" : "Seguridad",
+    "Email Server" : "Servidor de correo electrónico",
+    "Log" : "Log",
     "Authentication error" : "Error al autenticar",
     "Your full name has been changed." : "Su nombre completo ha sido cambiado.",
     "Unable to change full name" : "Imposible cambiar el nombre completo",
@@ -24,6 +28,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.",
     "Unable to change password" : "Imposible cambiar la contraseña",
+    "Enabled" : "Habilitado",
     "Saved" : "Guardado",
     "test email settings" : "Configuración de correo de prueba.",
     "If you received this email, the settings seem to be correct." : "Si recibió este correo, la configuración parece estar correcta.",
@@ -82,19 +87,15 @@ OC.L10N.register(
     "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 archivos.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Ejecutá una tarea con cada pagina cargada.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
-    "Sharing" : "Compartiendo",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones usar la Share API",
     "Allow public uploads" : "Permitir subidas públicas",
     "Allow resharing" : "Permitir Re-Compartir",
     "Allow users to send mail notification for shared files" : "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos",
-    "Security" : "Seguridad",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
-    "Email Server" : "Servidor de correo electrónico",
     "This is used for sending out notifications." : "Esto es usado para enviar notificaciones.",
     "Send mode" : "Modo de envio",
     "From address" : "Dirección remitente",
@@ -107,7 +108,6 @@ OC.L10N.register(
     "SMTP Password" : "Contraseña SMTP",
     "Test email settings" : "Configuracion de correo de prueba.",
     "Send email" : "Enviar correo",
-    "Log" : "Log",
     "Log level" : "Nivel de Log",
     "More" : "Más",
     "Less" : "Menos",
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
index 0614fb56d37..a175d140958 100644
--- a/settings/l10n/es_AR.json
+++ b/settings/l10n/es_AR.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Habilitado",
+    "Cron" : "Cron",
+    "Sharing" : "Compartiendo",
+    "Security" : "Seguridad",
+    "Email Server" : "Servidor de correo electrónico",
+    "Log" : "Log",
     "Authentication error" : "Error al autenticar",
     "Your full name has been changed." : "Su nombre completo ha sido cambiado.",
     "Unable to change full name" : "Imposible cambiar el nombre completo",
@@ -22,6 +26,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "Contraseña de recuperación administrativa incorrecta. Por favor, chequee la clave e intente de nuevo",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero las claves de encriptación fueron subidas exitosamente.",
     "Unable to change password" : "Imposible cambiar la contraseña",
+    "Enabled" : "Habilitado",
     "Saved" : "Guardado",
     "test email settings" : "Configuración de correo de prueba.",
     "If you received this email, the settings seem to be correct." : "Si recibió este correo, la configuración parece estar correcta.",
@@ -80,19 +85,15 @@
     "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 archivos.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Ejecutá una tarea con cada pagina cargada.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
-    "Sharing" : "Compartiendo",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones usar la Share API",
     "Allow public uploads" : "Permitir subidas públicas",
     "Allow resharing" : "Permitir Re-Compartir",
     "Allow users to send mail notification for shared files" : "Habilitar a los usuarios para enviar notificaciones por correo para archivos compartidos",
-    "Security" : "Seguridad",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Fuerza al cliente a conectarse a %s por medio de una conexión encriptada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor conéctese a su %s por medio de HTTPS para habilitar o deshabilitar la característica SSL",
-    "Email Server" : "Servidor de correo electrónico",
     "This is used for sending out notifications." : "Esto es usado para enviar notificaciones.",
     "Send mode" : "Modo de envio",
     "From address" : "Dirección remitente",
@@ -105,7 +106,6 @@
     "SMTP Password" : "Contraseña SMTP",
     "Test email settings" : "Configuracion de correo de prueba.",
     "Send email" : "Enviar correo",
-    "Log" : "Log",
     "Log level" : "Nivel de Log",
     "More" : "Más",
     "Less" : "Menos",
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
index 1c48d5b19ed..3d117c76eef 100644
--- a/settings/l10n/es_MX.js
+++ b/settings/l10n/es_MX.js
@@ -1,7 +1,10 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Habilitar",
+    "Cron" : "Cron",
+    "Sharing" : "Compartiendo",
+    "Security" : "Seguridad",
+    "Log" : "Registro",
     "Authentication error" : "Error de autenticación",
     "Your full name has been changed." : "Se ha cambiado su nombre completo.",
     "Unable to change full name" : "No se puede cambiar el nombre completo",
@@ -23,6 +26,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.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
     "Unable to change password" : "No se ha podido cambiar la contraseña",
+    "Enabled" : "Habilitar",
     "Email sent" : "Correo electrónico enviado",
     "All" : "Todos",
     "Please wait...." : "Espere, por favor....",
@@ -66,20 +70,16 @@ OC.L10N.register(
     "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.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-    "Cron" : "Cron",
     "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.",
-    "Sharing" : "Compartiendo",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow public uploads" : "Permitir subidas públicas",
     "Allow resharing" : "Permitir re-compartición",
-    "Security" : "Seguridad",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
     "Server address" : "Dirección del servidor",
     "Port" : "Puerto",
-    "Log" : "Registro",
     "Log level" : "Nivel de registro",
     "More" : "Más",
     "Less" : "Menos",
diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json
index 7dccd57fbf7..6f8de71f433 100644
--- a/settings/l10n/es_MX.json
+++ b/settings/l10n/es_MX.json
@@ -1,5 +1,8 @@
 { "translations": {
-    "Enabled" : "Habilitar",
+    "Cron" : "Cron",
+    "Sharing" : "Compartiendo",
+    "Security" : "Seguridad",
+    "Log" : "Registro",
     "Authentication error" : "Error de autenticación",
     "Your full name has been changed." : "Se ha cambiado su nombre completo.",
     "Unable to change full name" : "No se puede cambiar el nombre completo",
@@ -21,6 +24,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.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El back-end no soporta cambios de contraseña, pero la clave de cifrado del usuario ha sido actualizada satisfactoriamente.",
     "Unable to change password" : "No se ha podido cambiar la contraseña",
+    "Enabled" : "Habilitar",
     "Email sent" : "Correo electrónico enviado",
     "All" : "Todos",
     "Please wait...." : "Espere, por favor....",
@@ -64,20 +68,16 @@
     "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.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
-    "Cron" : "Cron",
     "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.",
-    "Sharing" : "Compartiendo",
     "Allow apps to use the Share API" : "Permitir a las aplicaciones utilizar la API de Compartición",
     "Allow public uploads" : "Permitir subidas públicas",
     "Allow resharing" : "Permitir re-compartición",
-    "Security" : "Seguridad",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
     "Server address" : "Dirección del servidor",
     "Port" : "Puerto",
-    "Log" : "Registro",
     "Log level" : "Nivel de registro",
     "More" : "Más",
     "Less" : "Menos",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 27e936aedbc..d4876814904 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Sisse lülitatud",
-    "Not enabled" : "Pole sisse lülitatud",
-    "Recommended" : "Soovitatud",
+    "Cron" : "Cron",
+    "Sharing" : "Jagamine",
+    "Security" : "Turvalisus",
+    "Email Server" : "Postiserver",
+    "Log" : "Logi",
     "Authentication error" : "Autentimise viga",
     "Your full name has been changed." : "Sinu täispikk nimi on muudetud.",
     "Unable to change full name" : "Täispika nime muutmine ebaõnnestus",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
     "Unable to change password" : "Ei suuda parooli muuta",
+    "Enabled" : "Sisse lülitatud",
+    "Not enabled" : "Pole sisse lülitatud",
+    "Recommended" : "Soovitatud",
     "Saved" : "Salvestatud",
     "test email settings" : "testi e-posti seadeid",
     "If you received this email, the settings seem to be correct." : "Kui said selle kirja, siis on seadistus korrektne.",
@@ -71,6 +76,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Sisesta nõuetele vastav grupi nimi",
     "deleted {groupName}" : "kustutatud {groupName}",
     "undo" : "tagasi",
+    "no group" : "grupp puudub",
     "never" : "mitte kunagi",
     "deleted {userName}" : "kustutatud {userName}",
     "add group" : "lisa grupp",
@@ -79,6 +85,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Sisesta nõuetele vastav parool",
     "Warning: Home directory for user \"{user}\" already exists" : "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
     "__language_name__" : "Eesti",
+    "Personal Info" : "Isiklik info",
     "SSL root certificates" : "SSL root sertifikaadid",
     "Encryption" : "Krüpteerimine",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
@@ -115,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Ühenduse kontrollimine",
     "No problems found" : "Ühtegi probleemi ei leitud",
     "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Cron käivitati viimati %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
     "Cron was not executed yet!" : "Cron pole kordagi käivitatud!",
     "Execute one task with each page loaded" : "Käivita toiming igal lehe laadimisel",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
-    "Sharing" : "Jagamine",
     "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
     "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
     "Enforce password protection" : "Sunni parooliga kaitsmist",
@@ -136,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
     "Exclude groups from sharing" : "Eemalda grupid jagamisest",
     "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
-    "Security" : "Turvalisus",
     "Enforce HTTPS" : "Sunni peale HTTPS-i kasutamine",
     "Forces the clients to connect to %s via an encrypted connection." : "Sunnib kliente %s ühenduma krüpteeritult.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
-    "Email Server" : "Postiserver",
     "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
     "Send mode" : "Saatmise viis",
     "From address" : "Saatja aadress",
@@ -155,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Säilita kasutajaandmed",
     "Test email settings" : "Testi e-posti seadeid",
     "Send email" : "Saada kiri",
-    "Log" : "Logi",
     "Log level" : "Logi tase",
     "More" : "Rohkem",
     "Less" : "Vähem",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 52549e1e640..916a105eeda 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Sisse lülitatud",
-    "Not enabled" : "Pole sisse lülitatud",
-    "Recommended" : "Soovitatud",
+    "Cron" : "Cron",
+    "Sharing" : "Jagamine",
+    "Security" : "Turvalisus",
+    "Email Server" : "Postiserver",
+    "Log" : "Logi",
     "Authentication error" : "Autentimise viga",
     "Your full name has been changed." : "Sinu täispikk nimi on muudetud.",
     "Unable to change full name" : "Täispika nime muutmine ebaõnnestus",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.",
     "Unable to change password" : "Ei suuda parooli muuta",
+    "Enabled" : "Sisse lülitatud",
+    "Not enabled" : "Pole sisse lülitatud",
+    "Recommended" : "Soovitatud",
     "Saved" : "Salvestatud",
     "test email settings" : "testi e-posti seadeid",
     "If you received this email, the settings seem to be correct." : "Kui said selle kirja, siis on seadistus korrektne.",
@@ -69,6 +74,7 @@
     "A valid group name must be provided" : "Sisesta nõuetele vastav grupi nimi",
     "deleted {groupName}" : "kustutatud {groupName}",
     "undo" : "tagasi",
+    "no group" : "grupp puudub",
     "never" : "mitte kunagi",
     "deleted {userName}" : "kustutatud {userName}",
     "add group" : "lisa grupp",
@@ -77,6 +83,7 @@
     "A valid password must be provided" : "Sisesta nõuetele vastav parool",
     "Warning: Home directory for user \"{user}\" already exists" : "Hoiatus: kasutaja \"{user}\" kodukataloog on juba olemas",
     "__language_name__" : "Eesti",
+    "Personal Info" : "Isiklik info",
     "SSL root certificates" : "SSL root sertifikaadid",
     "Encryption" : "Krüpteerimine",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Kõik (tõsised probleemid, veateated, hoiatused, info, veatuvastus)",
@@ -113,14 +120,12 @@
     "Connectivity checks" : "Ühenduse kontrollimine",
     "No problems found" : "Ühtegi probleemi ei leitud",
     "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Cron käivitati viimati %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.",
     "Cron was not executed yet!" : "Cron pole kordagi käivitatud!",
     "Execute one task with each page loaded" : "Käivita toiming igal lehe laadimisel",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti järel.",
-    "Sharing" : "Jagamine",
     "Allow apps to use the Share API" : "Luba rakendustel kasutada Share API-t",
     "Allow users to share via link" : "Luba kasutajatel lingiga jagamist ",
     "Enforce password protection" : "Sunni parooliga kaitsmist",
@@ -134,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Luba kasutajatel saata e-posti teavitusi jagatud failide kohta",
     "Exclude groups from sharing" : "Eemalda grupid jagamisest",
     "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
-    "Security" : "Turvalisus",
     "Enforce HTTPS" : "Sunni peale HTTPS-i kasutamine",
     "Forces the clients to connect to %s via an encrypted connection." : "Sunnib kliente %s ühenduma krüpteeritult.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
-    "Email Server" : "Postiserver",
     "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
     "Send mode" : "Saatmise viis",
     "From address" : "Saatja aadress",
@@ -153,7 +156,6 @@
     "Store credentials" : "Säilita kasutajaandmed",
     "Test email settings" : "Testi e-posti seadeid",
     "Send email" : "Saada kiri",
-    "Log" : "Logi",
     "Log level" : "Logi tase",
     "More" : "Rohkem",
     "Less" : "Vähem",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index 94324f5b23c..6fda5892117 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -1,6 +1,11 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Partekatzea",
+    "Security" : "Segurtasuna",
+    "Email Server" : "Eposta zerbitzaria",
+    "Log" : "Log",
     "Authentication error" : "Autentifikazio errorea",
     "Your full name has been changed." : "Zure izena aldatu egin da.",
     "Unable to change full name" : "Ezin izan da izena aldatu",
@@ -116,14 +121,12 @@ OC.L10N.register(
     "Connectivity checks" : "Konexio egiaztapenak",
     "No problems found" : "Ez da problemarik aurkitu",
     "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
     "Cron was not executed yet!" : "Cron-a oraindik ez da exekutatu!",
     "Execute one task with each page loaded" : "Exekutatu zeregin bat orri karga bakoitzean",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
-    "Sharing" : "Partekatzea",
     "Allow apps to use the Share API" : "Baimendu aplikazioak partekatzeko APIa erabiltzeko",
     "Allow users to share via link" : "Baimendu erabiltzaileak esteken bidez partekatzea",
     "Enforce password protection" : "Betearazi pasahitzaren babesa",
@@ -137,11 +140,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Baimendu erabiltzaileak epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
     "Exclude groups from sharing" : "Baztertu taldeak partekatzean",
     "These groups will still be able to receive shares, but not to initiate them." : "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
-    "Security" : "Segurtasuna",
     "Enforce HTTPS" : "Behartu HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
-    "Email Server" : "Eposta zerbitzaria",
     "This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
     "Send mode" : "Bidaltzeko modua",
     "From address" : "Helbidetik",
@@ -156,7 +157,6 @@ OC.L10N.register(
     "Store credentials" : "Gorde kredentzialak",
     "Test email settings" : "Probatu eposta ezarpenak",
     "Send email" : "Bidali eposta",
-    "Log" : "Log",
     "Log level" : "Erregistro maila",
     "More" : "Gehiago",
     "Less" : "Gutxiago",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index 704c4373d0c..e1ebcf6330c 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -1,4 +1,9 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Partekatzea",
+    "Security" : "Segurtasuna",
+    "Email Server" : "Eposta zerbitzaria",
+    "Log" : "Log",
     "Authentication error" : "Autentifikazio errorea",
     "Your full name has been changed." : "Zure izena aldatu egin da.",
     "Unable to change full name" : "Ezin izan da izena aldatu",
@@ -114,14 +119,12 @@
     "Connectivity checks" : "Konexio egiaztapenak",
     "No problems found" : "Ez da problemarik aurkitu",
     "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Azken cron-a %s-etan exekutatu da. Ordu bat baino gehiago pasa da, zerbait gaizki dabilela dirudi.",
     "Cron was not executed yet!" : "Cron-a oraindik ez da exekutatu!",
     "Execute one task with each page loaded" : "Exekutatu zeregin bat orri karga bakoitzean",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php webcron zerbitzu batean erregistratua dago cron.php  15 minuturo http bidez deitzeko.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Erabili sistemaren cron zerbitzua deitzeko cron.php fitxategia 15 minutuan behin.",
-    "Sharing" : "Partekatzea",
     "Allow apps to use the Share API" : "Baimendu aplikazioak partekatzeko APIa erabiltzeko",
     "Allow users to share via link" : "Baimendu erabiltzaileak esteken bidez partekatzea",
     "Enforce password protection" : "Betearazi pasahitzaren babesa",
@@ -135,11 +138,9 @@
     "Allow users to send mail notification for shared files" : "Baimendu erabiltzaileak epostako jakinarazpenak bidaltzen partekatutako fitxategientzat",
     "Exclude groups from sharing" : "Baztertu taldeak partekatzean",
     "These groups will still be able to receive shares, but not to initiate them." : "Talde hauek oraindik jaso ahal izango dute partekatzeak, baina ezingo dute partekatu",
-    "Security" : "Segurtasuna",
     "Enforce HTTPS" : "Behartu HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Bezeroak %s-ra konexio enkriptatu baten bidez konektatzera behartzen ditu.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mesedez konektatu zure %s-ra HTTPS bidez SSL zehaztapenak aldatzeko.",
-    "Email Server" : "Eposta zerbitzaria",
     "This is used for sending out notifications." : "Hau jakinarazpenak bidaltzeko erabiltzen da.",
     "Send mode" : "Bidaltzeko modua",
     "From address" : "Helbidetik",
@@ -154,7 +155,6 @@
     "Store credentials" : "Gorde kredentzialak",
     "Test email settings" : "Probatu eposta ezarpenak",
     "Send email" : "Bidali eposta",
-    "Log" : "Log",
     "Log level" : "Erregistro maila",
     "More" : "Gehiago",
     "Less" : "Gutxiago",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index 47b3e0e5307..b74bb77e221 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "فعال شده",
+    "Cron" : "زمانبند",
+    "Sharing" : "اشتراک گذاری",
+    "Security" : "امنیت",
+    "Email Server" : "سرور ایمیل",
+    "Log" : "کارنامه",
     "Authentication error" : "خطا در اعتبار سنجی",
     "Your full name has been changed." : "نام کامل شما تغییر یافت",
     "Unable to change full name" : "امکان تغییر نام کامل وجود ندارد",
@@ -27,6 +31,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.",
     "Unable to change password" : "نمی‌توان رمز را تغییر داد",
+    "Enabled" : "فعال شده",
     "Saved" : "ذخیره شد",
     "test email settings" : "تنظیمات ایمیل آزمایشی",
     "Email sent" : "ایمیل ارسال شد",
@@ -89,12 +94,10 @@ OC.L10N.register(
     "Your PHP version is outdated" : "نسخه PHP شما قدیمی است",
     "Locale not working" : "زبان محلی کار نمی کند.",
     "Please double check the <a href='%s'>installation guides</a>." : "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
-    "Cron" : "زمانبند",
     "Last cron was executed at %s." : "کران قبلی در %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 ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
-    "Sharing" : "اشتراک گذاری",
     "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
     "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
     "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
@@ -105,11 +108,9 @@ OC.L10N.register(
     "Enforce expiration date" : "اعمال تاریخ اتمام اشتراک گذاری",
     "Allow resharing" : "مجوز اشتراک گذاری مجدد",
     "Exclude groups from sharing" : "مستثنی شدن گروه ها از اشتراک گذاری",
-    "Security" : "امنیت",
     "Enforce HTTPS" : "وادار کردن HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید.",
-    "Email Server" : "سرور ایمیل",
     "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
     "Send mode" : "حالت ارسال",
     "From address" : "آدرس فرستنده",
@@ -123,7 +124,6 @@ OC.L10N.register(
     "SMTP Password" : "رمز عبور SMTP",
     "Test email settings" : "تنظیمات ایمیل آزمایشی",
     "Send email" : "ارسال ایمیل",
-    "Log" : "کارنامه",
     "Log level" : "سطح ورود",
     "More" : "بیش‌تر",
     "Less" : "کم‌تر",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index 8d6c98b7c01..134d72baaf7 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "فعال شده",
+    "Cron" : "زمانبند",
+    "Sharing" : "اشتراک گذاری",
+    "Security" : "امنیت",
+    "Email Server" : "سرور ایمیل",
+    "Log" : "کارنامه",
     "Authentication error" : "خطا در اعتبار سنجی",
     "Your full name has been changed." : "نام کامل شما تغییر یافت",
     "Unable to change full name" : "امکان تغییر نام کامل وجود ندارد",
@@ -25,6 +29,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "رمز مدیریتی بازیابی غلط است. لطفاً رمز را کنترل کرده و دوباره امتحان نمایید.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "سیستم مدیریتی امکان تغییر رمز را پشتیبانی نمی‌کند. ولی کلید رمزنگاری کاربران با موفقیت به روز شد.",
     "Unable to change password" : "نمی‌توان رمز را تغییر داد",
+    "Enabled" : "فعال شده",
     "Saved" : "ذخیره شد",
     "test email settings" : "تنظیمات ایمیل آزمایشی",
     "Email sent" : "ایمیل ارسال شد",
@@ -87,12 +92,10 @@
     "Your PHP version is outdated" : "نسخه PHP شما قدیمی است",
     "Locale not working" : "زبان محلی کار نمی کند.",
     "Please double check the <a href='%s'>installation guides</a>." : "لطفاً دوباره <a href='%s'>راهنمای نصب</a>را بررسی کنید.",
-    "Cron" : "زمانبند",
     "Last cron was executed at %s." : "کران قبلی در %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 ثبت شده است که هر 15 دقیقه یک بار بر روی بستر http فراخوانی شود.",
-    "Sharing" : "اشتراک گذاری",
     "Allow apps to use the Share API" : "اجازه ی برنامه ها برای استفاده از API اشتراک گذاری",
     "Allow users to share via link" : "اجازه دادن به کاربران برای اشتراک گذاری توسط پیوند",
     "Enforce password protection" : "اجبار برای محافظت توسط رمز عبور",
@@ -103,11 +106,9 @@
     "Enforce expiration date" : "اعمال تاریخ اتمام اشتراک گذاری",
     "Allow resharing" : "مجوز اشتراک گذاری مجدد",
     "Exclude groups from sharing" : "مستثنی شدن گروه ها از اشتراک گذاری",
-    "Security" : "امنیت",
     "Enforce HTTPS" : "وادار کردن HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "کلاینت‌ها را مجبور کن که از یک ارتباط رمزنگاری شده برای اتصال به %s استفاده کنند.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "برای فعال سازی یا عدم فعال سازی اجبار استفاده از SSL، لطفاً از طریق HTTPS به %s وصل شوید.",
-    "Email Server" : "سرور ایمیل",
     "This is used for sending out notifications." : "این برای ارسال هشدار ها استفاده می شود",
     "Send mode" : "حالت ارسال",
     "From address" : "آدرس فرستنده",
@@ -121,7 +122,6 @@
     "SMTP Password" : "رمز عبور SMTP",
     "Test email settings" : "تنظیمات ایمیل آزمایشی",
     "Send email" : "ارسال ایمیل",
-    "Log" : "کارنامه",
     "Log level" : "سطح ورود",
     "More" : "بیش‌تر",
     "Less" : "کم‌تر",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index ab2505062aa..56a7038f581 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Käytössä",
-    "Not enabled" : "Ei käytössä",
-    "Recommended" : "Suositeltu",
+    "Cron" : "Cron",
+    "Sharing" : "Jakaminen",
+    "Security" : "Tietoturva",
+    "Email Server" : "Sähköpostipalvelin",
+    "Log" : "Loki",
     "Authentication error" : "Tunnistautumisvirhe",
     "Your full name has been changed." : "Koko nimesi on muutettu.",
     "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
     "Unable to change password" : "Salasanan vaihto ei onnistunut",
+    "Enabled" : "Käytössä",
+    "Not enabled" : "Ei käytössä",
+    "Recommended" : "Suositeltu",
     "Saved" : "Tallennettu",
     "test email settings" : "testaa sähköpostiasetukset",
     "If you received this email, the settings seem to be correct." : "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
@@ -111,14 +116,12 @@ OC.L10N.register(
     "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
     "No problems found" : "Ongelmia ei löytynyt",
     "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Viimeisin cron suoritettiin %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
     "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
     "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-    "Sharing" : "Jakaminen",
     "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
     "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
     "Allow public uploads" : "Salli julkiset lähetykset",
@@ -131,11 +134,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Salli käyttäjien lähettää sähköposti-ilmoituksia 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.",
-    "Security" : "Tietoturva",
     "Enforce HTTPS" : "Pakota HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
-    "Email Server" : "Sähköpostipalvelin",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
     "From address" : "Lähettäjän osoite",
@@ -149,7 +150,6 @@ OC.L10N.register(
     "Store credentials" : "Säilytä tilitiedot",
     "Test email settings" : "Testaa sähköpostiasetukset",
     "Send email" : "Lähetä sähköpostiviesti",
-    "Log" : "Loki",
     "Log level" : "Lokitaso",
     "More" : "Enemmän",
     "Less" : "Vähemmän",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 971bebaed81..0d585195659 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Käytössä",
-    "Not enabled" : "Ei käytössä",
-    "Recommended" : "Suositeltu",
+    "Cron" : "Cron",
+    "Sharing" : "Jakaminen",
+    "Security" : "Tietoturva",
+    "Email Server" : "Sähköpostipalvelin",
+    "Log" : "Loki",
     "Authentication error" : "Tunnistautumisvirhe",
     "Your full name has been changed." : "Koko nimesi on muutettu.",
     "Unable to change full name" : "Koko nimen muuttaminen epäonnistui",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Väärä ylläpitäjän salasana. Tarkista salasana ja yritä uudelleen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Taustaosa ei tue salasanan vaihtamista, mutta käyttäjän salausavain päivitettiin onnistuneesti.",
     "Unable to change password" : "Salasanan vaihto ei onnistunut",
+    "Enabled" : "Käytössä",
+    "Not enabled" : "Ei käytössä",
+    "Recommended" : "Suositeltu",
     "Saved" : "Tallennettu",
     "test email settings" : "testaa sähköpostiasetukset",
     "If you received this email, the settings seem to be correct." : "Jos sait tämän sähköpostin, kaikki asetukset vaikuttavat olevan kunnossa.",
@@ -109,14 +114,12 @@
     "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
     "No problems found" : "Ongelmia ei löytynyt",
     "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Viimeisin cron suoritettiin %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Viimeisin cron suoritettiin %s. Siitä on yli tunti aikaa, joten jokin näyttää olevan pielessä.",
     "Cron was not executed yet!" : "Cronia ei suoritettu vielä!",
     "Execute one task with each page loaded" : "Suorita yksi tehtävä jokaista ladattua sivua kohden",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php kutsuu webcron-palvelun kautta cron.php:ta  15 minuutin välein http:tä käyttäen.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Käytä järjestelmän cron-palvelua cron.php-tiedoston kutsumista varten 15 minuutin välein.",
-    "Sharing" : "Jakaminen",
     "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
     "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
     "Allow public uploads" : "Salli julkiset lähetykset",
@@ -129,11 +132,9 @@
     "Allow users to send mail notification for shared files" : "Salli käyttäjien lähettää sähköposti-ilmoituksia 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.",
-    "Security" : "Tietoturva",
     "Enforce HTTPS" : "Pakota HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
-    "Email Server" : "Sähköpostipalvelin",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
     "From address" : "Lähettäjän osoite",
@@ -147,7 +148,6 @@
     "Store credentials" : "Säilytä tilitiedot",
     "Test email settings" : "Testaa sähköpostiasetukset",
     "Send email" : "Lähetä sähköpostiviesti",
-    "Log" : "Loki",
     "Log level" : "Lokitaso",
     "More" : "Enemmän",
     "Less" : "Vähemmän",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 05c2ca65bc6..07fecc6e3bd 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -1,6 +1,11 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Partage",
+    "Security" : "Sécurité",
+    "Email Server" : "Serveur mail",
+    "Log" : "Log",
     "Authentication error" : "Erreur d'authentification",
     "Your full name has been changed." : "Votre nom complet a été modifié.",
     "Unable to change full name" : "Impossible de changer le nom complet",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Vérification de la connectivité",
     "No problems found" : "Aucun problème trouvé",
     "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
     "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via 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.",
-    "Sharing" : "Partage",
     "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",
     "Enforce password protection" : "Obliger la protection par mot de passe",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
     "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. ",
-    "Security" : "Sécurité",
     "Enforce HTTPS" : "Forcer HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forcer les clients à se connecter à %s via une connexion chiffrée.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
-    "Email Server" : "Serveur mail",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
     "From address" : "Adresse source",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Enregistrer les identifiants",
     "Test email settings" : "Tester les paramètres e-mail",
     "Send email" : "Envoyer un e-mail",
-    "Log" : "Log",
     "Log level" : "Niveau de log",
     "More" : "Plus",
     "Less" : "Moins",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 635b1840ba1..f473adc4f1b 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -1,4 +1,9 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Partage",
+    "Security" : "Sécurité",
+    "Email Server" : "Serveur mail",
+    "Log" : "Log",
     "Authentication error" : "Erreur d'authentification",
     "Your full name has been changed." : "Votre nom complet a été modifié.",
     "Unable to change full name" : "Impossible de changer le nom complet",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Vérification de la connectivité",
     "No problems found" : "Aucun problème trouvé",
     "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
     "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via 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.",
-    "Sharing" : "Partage",
     "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",
     "Enforce password protection" : "Obliger la protection par mot de passe",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Autoriser les utilisateurs à envoyer des notifications par courriel concernant les partages",
     "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. ",
-    "Security" : "Sécurité",
     "Enforce HTTPS" : "Forcer HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forcer les clients à se connecter à %s via une connexion chiffrée.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
-    "Email Server" : "Serveur mail",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
     "From address" : "Adresse source",
@@ -155,7 +156,6 @@
     "Store credentials" : "Enregistrer les identifiants",
     "Test email settings" : "Tester les paramètres e-mail",
     "Send email" : "Envoyer un e-mail",
-    "Log" : "Log",
     "Log level" : "Niveau de log",
     "More" : "Plus",
     "Less" : "Moins",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 6a9f27f524f..6baea02501f 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Activado",
+    "Cron" : "Cron",
+    "Sharing" : "Compartindo",
+    "Security" : "Seguranza",
+    "Email Server" : "Servidor de correo",
+    "Log" : "Rexistro",
     "Authentication error" : "Produciuse un erro de autenticación",
     "Your full name has been changed." : "O seu nome completo foi cambiado",
     "Unable to change full name" : "Non é posíbel cambiar o nome completo",
@@ -31,6 +35,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
+    "Enabled" : "Activado",
     "Saved" : "Gardado",
     "test email settings" : "correo de proba dos axustes",
     "If you received this email, the settings seem to be correct." : "Se recibiu este correo, semella que a configuración é correcta.",
@@ -107,14 +112,12 @@ OC.L10N.register(
     "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
     "Please double check the <a href='%s'>installation guides</a>." : "Volva comprobar as <a href='%s'>guías de instalación</a>",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "O último «cron» executouse ás %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
     "Cron was not executed yet!" : "«Cron» aínda non foi executado!",
     "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
-    "Sharing" : "Compartindo",
     "Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
     "Allow users to share via link" : "Permitir que os usuarios compartan a través de ligazóns",
     "Enforce password protection" : "Forzar a protección por contrasinal",
@@ -128,11 +131,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
     "Exclude groups from sharing" : "Excluír grupos da compartición",
     "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderán recibir comparticións, mais non inicialas.",
-    "Security" : "Seguranza",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
-    "Email Server" : "Servidor de correo",
     "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
     "Send mode" : "Modo de envío",
     "From address" : "Desde o enderezo",
@@ -146,7 +147,6 @@ OC.L10N.register(
     "SMTP Password" : "Contrasinal SMTP",
     "Test email settings" : "Correo de proba dos axustes",
     "Send email" : "Enviar o correo",
-    "Log" : "Rexistro",
     "Log level" : "Nivel de rexistro",
     "More" : "Máis",
     "Less" : "Menos",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 96cf3364244..dfc7c123dce 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Activado",
+    "Cron" : "Cron",
+    "Sharing" : "Compartindo",
+    "Security" : "Seguranza",
+    "Email Server" : "Servidor de correo",
+    "Log" : "Rexistro",
     "Authentication error" : "Produciuse un erro de autenticación",
     "Your full name has been changed." : "O seu nome completo foi cambiado",
     "Unable to change full name" : "Non é posíbel cambiar o nome completo",
@@ -29,6 +33,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "Contrasinal de recuperación do administrador incorrecto. Comprobe o contrasinal e tenteo de novo.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
+    "Enabled" : "Activado",
     "Saved" : "Gardado",
     "test email settings" : "correo de proba dos axustes",
     "If you received this email, the settings seem to be correct." : "Se recibiu este correo, semella que a configuración é correcta.",
@@ -105,14 +110,12 @@
     "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
     "Please double check the <a href='%s'>installation guides</a>." : "Volva comprobar as <a href='%s'>guías de instalación</a>",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "O último «cron» executouse ás %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
     "Cron was not executed yet!" : "«Cron» aínda non foi executado!",
     "Execute one task with each page loaded" : "Executar unha tarefa con cada páxina cargada",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está rexistrado nun servizo de WebCron para chamar a cron.php cada 15 minutos a través de HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Use o servizo «cron» do sistema para chamar ao ficheiro cron.php cada 15 minutos.",
-    "Sharing" : "Compartindo",
     "Allow apps to use the Share API" : "Permitir que as aplicacións empreguen o API para compartir",
     "Allow users to share via link" : "Permitir que os usuarios compartan a través de ligazóns",
     "Enforce password protection" : "Forzar a protección por contrasinal",
@@ -126,11 +129,9 @@
     "Allow users to send mail notification for shared files" : "Permitirlle aos usuarios enviar notificacións por correo para os ficheiros compartidos",
     "Exclude groups from sharing" : "Excluír grupos da compartición",
     "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderán recibir comparticións, mais non inicialas.",
-    "Security" : "Seguranza",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forzar que os clientes se conecten a %s empregando unha conexión cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Conéctese a %s empregando HTTPS para activar ou desactivar o forzado de SSL.",
-    "Email Server" : "Servidor de correo",
     "This is used for sending out notifications." : "Isto utilizase para o envío de notificacións.",
     "Send mode" : "Modo de envío",
     "From address" : "Desde o enderezo",
@@ -144,7 +145,6 @@
     "SMTP Password" : "Contrasinal SMTP",
     "Test email settings" : "Correo de proba dos axustes",
     "Send email" : "Enviar o correo",
-    "Log" : "Rexistro",
     "Log level" : "Nivel de rexistro",
     "More" : "Máis",
     "Less" : "Menos",
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
index de7df02ef12..23c2d6f9d15 100644
--- a/settings/l10n/he.js
+++ b/settings/l10n/he.js
@@ -1,6 +1,10 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "שיתוף",
+    "Security" : "אבטחה",
+    "Log" : "יומן",
     "Authentication error" : "שגיאת הזדהות",
     "Group already exists" : "הקבוצה כבר קיימת",
     "Unable to add group" : "לא ניתן להוסיף קבוצה",
@@ -40,17 +44,13 @@ OC.L10N.register(
     "Setup Warning" : "שגיאת הגדרה",
     "Module 'fileinfo' missing" : "המודול „fileinfo“ חסר",
     "Please double check the <a href='%s'>installation guides</a>." : "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
-    "Sharing" : "שיתוף",
     "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
     "Allow resharing" : "לאפשר שיתוף מחדש",
-    "Security" : "אבטחה",
     "Enforce HTTPS" : "לאלץ HTTPS",
     "Server address" : "כתובת שרת",
     "Port" : "פורט",
     "Credentials" : "פרטי גישה",
-    "Log" : "יומן",
     "Log level" : "רמת הדיווח",
     "More" : "יותר",
     "Less" : "פחות",
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
index 904531fd5da..3acf0e04f67 100644
--- a/settings/l10n/he.json
+++ b/settings/l10n/he.json
@@ -1,4 +1,8 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "שיתוף",
+    "Security" : "אבטחה",
+    "Log" : "יומן",
     "Authentication error" : "שגיאת הזדהות",
     "Group already exists" : "הקבוצה כבר קיימת",
     "Unable to add group" : "לא ניתן להוסיף קבוצה",
@@ -38,17 +42,13 @@
     "Setup Warning" : "שגיאת הגדרה",
     "Module 'fileinfo' missing" : "המודול „fileinfo“ חסר",
     "Please double check the <a href='%s'>installation guides</a>." : "נא לעיין שוב ב<a href='%s'>מדריכי ההתקנה</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "יש להפעיל משימה אחת עם כל עמוד שנטען",
-    "Sharing" : "שיתוף",
     "Allow apps to use the Share API" : "לאפשר ליישום להשתמש ב־API השיתוף",
     "Allow resharing" : "לאפשר שיתוף מחדש",
-    "Security" : "אבטחה",
     "Enforce HTTPS" : "לאלץ HTTPS",
     "Server address" : "כתובת שרת",
     "Port" : "פורט",
     "Credentials" : "פרטי גישה",
-    "Log" : "יומן",
     "Log level" : "רמת הדיווח",
     "More" : "יותר",
     "Less" : "פחות",
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index 8a39d4f4bd5..6ccc12a97c0 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Aktivirano",
+    "Cron" : "Cron",
+    "Sharing" : "Dijeljenje zajedničkih resursa",
+    "Security" : "Sigurnost",
+    "Email Server" : "Poslužitelj e-pošte",
+    "Log" : "Zapisnik",
     "Authentication error" : "Pogrešna autentikacija",
     "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
     "Unable to change full name" : "Puno ime nije moguće promijeniti.",
@@ -31,6 +35,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
     "Unable to change password" : "Promjena lozinke nije moguća",
+    "Enabled" : "Aktivirano",
     "Saved" : "Spremljeno",
     "test email settings" : "Postavke za testiranje e-pošte",
     "If you received this email, the settings seem to be correct." : "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
@@ -110,14 +115,12 @@ OC.L10N.register(
     "URL generation in notification emails" : "Generiranje URL-a u notifikacijskoj e-pošti",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
     "Please double check the <a href='%s'>installation guides</a>." : "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Zadnji cron je izvršen na %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
     "Cron was not executed yet!" : "Cron još nije izvršen!",
     "Execute one task with each page loaded" : "Izvršite jedan zadatak sa svakom učitanom stranicom",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
-    "Sharing" : "Dijeljenje zajedničkih resursa",
     "Allow apps to use the Share API" : "Dopustite apps korištenje Share API",
     "Allow users to share via link" : "Dopustite korisnicia dijeljenje putem veze",
     "Enforce password protection" : "Nametnite zaštitu lozinki",
@@ -131,11 +134,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
     "Exclude groups from sharing" : "Isključite grupe iz dijeljenja zajedničkih resursa",
     "These groups will still be able to receive shares, but not to initiate them." : "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
-    "Security" : "Sigurnost",
     "Enforce HTTPS" : "Nametnite HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
-    "Email Server" : "Poslužitelj e-pošte",
     "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
     "Send mode" : "Način rada za slanje",
     "From address" : "S adrese",
@@ -149,7 +150,6 @@ OC.L10N.register(
     "SMTP Password" : "Lozinka SMPT",
     "Test email settings" : "Postavke za testnu e-poštu",
     "Send email" : "Pošaljite e-poštu",
-    "Log" : "Zapisnik",
     "Log level" : "Razina zapisnika",
     "More" : "Više",
     "Less" : "Manje",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index 187f7a90c0f..57075ab7984 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Aktivirano",
+    "Cron" : "Cron",
+    "Sharing" : "Dijeljenje zajedničkih resursa",
+    "Security" : "Sigurnost",
+    "Email Server" : "Poslužitelj e-pošte",
+    "Log" : "Zapisnik",
     "Authentication error" : "Pogrešna autentikacija",
     "Your full name has been changed." : "Vaše puno ime je promijenjeno.",
     "Unable to change full name" : "Puno ime nije moguće promijeniti.",
@@ -29,6 +33,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "Pogrešna admin lozinka za oporavak. Molimo provjerite lozinku i pokušajte ponovno.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Pozadina ne podržava promjenu lozinke, ali korisnički ključ za šifriranje je uspješno ažuriran.",
     "Unable to change password" : "Promjena lozinke nije moguća",
+    "Enabled" : "Aktivirano",
     "Saved" : "Spremljeno",
     "test email settings" : "Postavke za testiranje e-pošte",
     "If you received this email, the settings seem to be correct." : "Ako ste ovu e-poštu primili,čini se da su postavke ispravne.",
@@ -108,14 +113,12 @@
     "URL generation in notification emails" : "Generiranje URL-a u notifikacijskoj e-pošti",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
     "Please double check the <a href='%s'>installation guides</a>." : "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Zadnji cron je izvršen na %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnji cron izvršen je na %s. Bilo je to prije više od jednog sata, čini se da nešto nije u redu.",
     "Cron was not executed yet!" : "Cron još nije izvršen!",
     "Execute one task with each page loaded" : "Izvršite jedan zadatak sa svakom učitanom stranicom",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je registriran na webcron usluzi da poziva cron.php svakih 15 minuta preko http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Koristite cron uslugu sustava za pozivanje cron.php datoteke svakih 15 minuta.",
-    "Sharing" : "Dijeljenje zajedničkih resursa",
     "Allow apps to use the Share API" : "Dopustite apps korištenje Share API",
     "Allow users to share via link" : "Dopustite korisnicia dijeljenje putem veze",
     "Enforce password protection" : "Nametnite zaštitu lozinki",
@@ -129,11 +132,9 @@
     "Allow users to send mail notification for shared files" : "Dopustite korisnicima slanje notifikacijske e-pošte za podijeljene datoteke",
     "Exclude groups from sharing" : "Isključite grupe iz dijeljenja zajedničkih resursa",
     "These groups will still be able to receive shares, but not to initiate them." : "Ove će grupe još uvijek moći primati dijeljene resurse, ali ne i inicirati ih",
-    "Security" : "Sigurnost",
     "Enforce HTTPS" : "Nametnite HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Prisiljava klijente da se priključe na %s putem šifrirane konekcije.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Molimo,priključite se na svoj %s putem HTTPS da biste omogućili ili onemogućili SSL",
-    "Email Server" : "Poslužitelj e-pošte",
     "This is used for sending out notifications." : "Ovo se koristi za slanje notifikacija.",
     "Send mode" : "Način rada za slanje",
     "From address" : "S adrese",
@@ -147,7 +148,6 @@
     "SMTP Password" : "Lozinka SMPT",
     "Test email settings" : "Postavke za testnu e-poštu",
     "Send email" : "Pošaljite e-poštu",
-    "Log" : "Zapisnik",
     "Log level" : "Razina zapisnika",
     "More" : "Više",
     "Less" : "Manje",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index bc8aa694060..d347ac8846a 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -1,8 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Bekapcsolva",
-    "Recommended" : "Ajánlott",
+    "Cron" : "Ütemezett feladatok",
+    "Sharing" : "Megosztás",
+    "Security" : "Biztonság",
+    "Email Server" : "E-mail kiszolgáló",
+    "Log" : "Naplózás",
     "Authentication error" : "Azonosítási hiba",
     "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
     "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
@@ -32,6 +35,8 @@ OC.L10N.register(
     "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!",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
+    "Enabled" : "Bekapcsolva",
+    "Recommended" : "Ajánlott",
     "Saved" : "Elmentve",
     "test email settings" : "e-mail beállítások ellenőrzése",
     "If you received this email, the settings seem to be correct." : "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
@@ -110,14 +115,12 @@ OC.L10N.register(
     "URL generation in notification emails" : "URL-képzés az értesítő e-mailekben",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
-    "Cron" : "Ütemezett feladatok",
     "Last cron was executed at %s." : "Az utolsó cron feladat ekkor futott le: %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
     "Cron was not executed yet!" : "A cron feladat még nem futott le!",
     "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
-    "Sharing" : "Megosztás",
     "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",
     "Enforce password protection" : "Legyen kötelező a linkek jelszóval való védelme",
@@ -131,11 +134,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttérő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.",
-    "Security" : "Biztonság",
     "Enforce HTTPS" : "Kötelező HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Kérjük, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
-    "Email Server" : "E-mail kiszolgáló",
     "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
     "Send mode" : "Küldési mód",
     "From address" : "A feladó címe",
@@ -149,7 +150,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP jelszó",
     "Test email settings" : "Az e-mail beállítások ellenőrzése",
     "Send email" : "E-mail küldése",
-    "Log" : "Naplózás",
     "Log level" : "Naplózási szint",
     "More" : "Több",
     "Less" : "Kevesebb",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 83e38d98f5a..0c8cffbd89a 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -1,6 +1,9 @@
 { "translations": {
-    "Enabled" : "Bekapcsolva",
-    "Recommended" : "Ajánlott",
+    "Cron" : "Ütemezett feladatok",
+    "Sharing" : "Megosztás",
+    "Security" : "Biztonság",
+    "Email Server" : "E-mail kiszolgáló",
+    "Log" : "Naplózás",
     "Authentication error" : "Azonosítási hiba",
     "Your full name has been changed." : "Az Ön teljes nevét módosítottuk.",
     "Unable to change full name" : "Nem sikerült megváltoztatni a teljes nevét",
@@ -30,6 +33,8 @@
     "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!",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A háttér-alrendszer nem támogatja a jelszómódosítást, de felhasználó titkosítási kulcsát sikeresen frissítettük.",
     "Unable to change password" : "Nem sikerült megváltoztatni a jelszót",
+    "Enabled" : "Bekapcsolva",
+    "Recommended" : "Ajánlott",
     "Saved" : "Elmentve",
     "test email settings" : "e-mail beállítások ellenőrzése",
     "If you received this email, the settings seem to be correct." : "Amennyiben megérkezett ez az e-mail akkor a beállítások megfelelők.",
@@ -108,14 +113,12 @@
     "URL generation in notification emails" : "URL-képzés az értesítő e-mailekben",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
-    "Cron" : "Ütemezett feladatok",
     "Last cron was executed at %s." : "Az utolsó cron feladat ekkor futott le: %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Az utolsó cron feladat ekkor futott le: %s. Ez több, mint 1 órája történt, valami nincs rendben.",
     "Cron was not executed yet!" : "A cron feladat még nem futott le!",
     "Execute one task with each page loaded" : "Egy-egy feladat végrehajtása minden alkalommal, amikor egy weboldalt letöltenek",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "A cron.php webcron szolgáltatásként van regisztrálva, hogy 15 percenként egyszer lefuttassa a cron.php-t.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "A rendszer cron szolgáltatását használjuk, mely a cron.php állományt futtatja le 15 percenként.",
-    "Sharing" : "Megosztás",
     "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",
     "Enforce password protection" : "Legyen kötelező a linkek jelszóval való védelme",
@@ -129,11 +132,9 @@
     "Allow users to send mail notification for shared files" : "A felhasználók küldhessenek e-mail értesítést a megosztás létrejöttérő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.",
-    "Security" : "Biztonság",
     "Enforce HTTPS" : "Kötelező HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Kötelezővé teszi, hogy a böngészőprogramok titkosított csatornán kapcsolódjanak a %s szolgáltatáshoz.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Kérjük, hogy HTTPS protokollon keresztül kapcsolódjon a %s rendszerhez, ha be- vagy ki akarja kapcsolni a kötelező SSL-beállítást!",
-    "Email Server" : "E-mail kiszolgáló",
     "This is used for sending out notifications." : "Ezt használjuk a jelentések kiküldésére.",
     "Send mode" : "Küldési mód",
     "From address" : "A feladó címe",
@@ -147,7 +148,6 @@
     "SMTP Password" : "SMTP jelszó",
     "Test email settings" : "Az e-mail beállítások ellenőrzése",
     "Send email" : "E-mail küldése",
-    "Log" : "Naplózás",
     "Log level" : "Naplózási szint",
     "More" : "Több",
     "Less" : "Kevesebb",
diff --git a/settings/l10n/ia.js b/settings/l10n/ia.js
index ffc7220a423..e48d44c9335 100644
--- a/settings/l10n/ia.js
+++ b/settings/l10n/ia.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Log" : "Registro",
     "Language changed" : "Linguage cambiate",
     "Invalid request" : "Requesta invalide",
     "Saved" : "Salveguardate",
@@ -15,7 +16,6 @@ OC.L10N.register(
     "never" : "nunquam",
     "__language_name__" : "Interlingua",
     "Security Warning" : "Aviso de securitate",
-    "Log" : "Registro",
     "More" : "Plus",
     "by" : "per",
     "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
diff --git a/settings/l10n/ia.json b/settings/l10n/ia.json
index b231ba1664e..c1acf295b4a 100644
--- a/settings/l10n/ia.json
+++ b/settings/l10n/ia.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Log" : "Registro",
     "Language changed" : "Linguage cambiate",
     "Invalid request" : "Requesta invalide",
     "Saved" : "Salveguardate",
@@ -13,7 +14,6 @@
     "never" : "nunquam",
     "__language_name__" : "Interlingua",
     "Security Warning" : "Aviso de securitate",
-    "Log" : "Registro",
     "More" : "Plus",
     "by" : "per",
     "Get the apps to sync your files" : "Obtene le apps (applicationes) pro synchronizar tu files",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 7a27913daf0..90e42de3453 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Diaktifkan",
-    "Not enabled" : "Tidak diaktifkan",
-    "Recommended" : "Direkomendasikan",
+    "Cron" : "Cron",
+    "Sharing" : "Berbagi",
+    "Security" : "Keamanan",
+    "Email Server" : "Server Email",
+    "Log" : "Log",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
     "Your full name has been changed." : "Nama lengkap Anda telah diubah",
     "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
     "Unable to change password" : "Tidak dapat mengubah sandi",
+    "Enabled" : "Diaktifkan",
+    "Not enabled" : "Tidak diaktifkan",
+    "Recommended" : "Direkomendasikan",
     "Saved" : "Disimpan",
     "test email settings" : "pengaturan email percobaan",
     "If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Pemeriksaan konektivitas",
     "No problems found" : "Masalah tidak ditemukan",
     "Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
     "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
     "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
     "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.",
-    "Sharing" : "Berbagi",
     "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",
     "Enforce password protection" : "Berlakukan perlindungan sandi",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
     "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.",
-    "Security" : "Keamanan",
     "Enforce HTTPS" : "Selalu Gunakan HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
-    "Email Server" : "Server Email",
     "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
     "Send mode" : "Modus kirim",
     "From address" : "Dari alamat",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Simpan kredensial",
     "Test email settings" : "Pengaturan email percobaan",
     "Send email" : "Kirim email",
-    "Log" : "Log",
     "Log level" : "Level log",
     "More" : "Lainnya",
     "Less" : "Ciutkan",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index cbfecf00f2a..31bfbbf6fdd 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Diaktifkan",
-    "Not enabled" : "Tidak diaktifkan",
-    "Recommended" : "Direkomendasikan",
+    "Cron" : "Cron",
+    "Sharing" : "Berbagi",
+    "Security" : "Keamanan",
+    "Email Server" : "Server Email",
+    "Log" : "Log",
     "Authentication error" : "Terjadi kesalahan saat otentikasi",
     "Your full name has been changed." : "Nama lengkap Anda telah diubah",
     "Unable to change full name" : "Tidak dapat mengubah nama lengkap",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Sandi pemulihan admin salah. Periksa sandi dan ulangi kembali.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end tidak mendukung perubahan password, tetapi kunci enkripsi pengguna berhasil diperbarui.",
     "Unable to change password" : "Tidak dapat mengubah sandi",
+    "Enabled" : "Diaktifkan",
+    "Not enabled" : "Tidak diaktifkan",
+    "Recommended" : "Direkomendasikan",
     "Saved" : "Disimpan",
     "test email settings" : "pengaturan email percobaan",
     "If you received this email, the settings seem to be correct." : "Jika Anda menerma email ini, pengaturan tampaknya sudah benar.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Pemeriksaan konektivitas",
     "No problems found" : "Masalah tidak ditemukan",
     "Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Cron terakhir dieksekusi pada %s. Hal ini lebih dari sejam yang lalu, ada sesuatu yang salah.",
     "Cron was not executed yet!" : "Cron masih belum dieksekusi!",
     "Execute one task with each page loaded" : "Jalankan tugas setiap kali halaman dimuat",
     "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.",
-    "Sharing" : "Berbagi",
     "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",
     "Enforce password protection" : "Berlakukan perlindungan sandi",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Izinkan pengguna untuk mengirimkan email pemberitahuan untuk berkas berbagi",
     "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.",
-    "Security" : "Keamanan",
     "Enforce HTTPS" : "Selalu Gunakan HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Memaksa klien untuk menghubungkan ke %s menggunakan sambungan yang dienskripsi.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Mohon sambungkan ke %s menggunakan HTTPS untuk mengaktifkannya atau menonaktifkan penegakan SSL.",
-    "Email Server" : "Server Email",
     "This is used for sending out notifications." : "Ini digunakan untuk mengirim notifikasi keluar.",
     "Send mode" : "Modus kirim",
     "From address" : "Dari alamat",
@@ -155,7 +156,6 @@
     "Store credentials" : "Simpan kredensial",
     "Test email settings" : "Pengaturan email percobaan",
     "Send email" : "Kirim email",
-    "Log" : "Log",
     "Log level" : "Level log",
     "More" : "Lainnya",
     "Less" : "Ciutkan",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 1f0f9e4b824..7504cd3ee83 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Abilitata",
-    "Not enabled" : "Non abilitata",
-    "Recommended" : "Consigliata",
+    "Cron" : "Cron",
+    "Sharing" : "Condivisione",
+    "Security" : "Protezione",
+    "Email Server" : "Server di posta",
+    "Log" : "Log",
     "Authentication error" : "Errore di autenticazione",
     "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
     "Unable to change full name" : "Impossibile cambiare il nome completo",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
     "Unable to change password" : "Impossibile cambiare la password",
+    "Enabled" : "Abilitata",
+    "Not enabled" : "Non abilitata",
+    "Recommended" : "Consigliata",
     "Saved" : "Salvato",
     "test email settings" : "prova impostazioni email",
     "If you received this email, the settings seem to be correct." : "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Controlli di connettività",
     "No problems found" : "Nessun problema trovato",
     "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
     "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
     "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-    "Sharing" : "Condivisione",
     "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",
     "Enforce password protection" : "Imponi la protezione con password",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
     "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.",
-    "Security" : "Protezione",
     "Enforce HTTPS" : "Forza HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forza i client a connettersi a %s tramite una connessione cifrata.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
-    "Email Server" : "Server di posta",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
     "From address" : "Indirizzo mittente",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Memorizza le credenziali",
     "Test email settings" : "Prova impostazioni email",
     "Send email" : "Invia email",
-    "Log" : "Log",
     "Log level" : "Livello di log",
     "More" : "Altro",
     "Less" : "Meno",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 56868a21c96..713a8365149 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Abilitata",
-    "Not enabled" : "Non abilitata",
-    "Recommended" : "Consigliata",
+    "Cron" : "Cron",
+    "Sharing" : "Condivisione",
+    "Security" : "Protezione",
+    "Email Server" : "Server di posta",
+    "Log" : "Log",
     "Authentication error" : "Errore di autenticazione",
     "Your full name has been changed." : "Il tuo nome completo è stato cambiato.",
     "Unable to change full name" : "Impossibile cambiare il nome completo",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Password amministrativa di ripristino errata. Controlla la password e prova ancora.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Il motore non supporta la modifica della password, ma la chiave di cifratura dell'utente è stata aggiornata correttamente.",
     "Unable to change password" : "Impossibile cambiare la password",
+    "Enabled" : "Abilitata",
+    "Not enabled" : "Non abilitata",
+    "Recommended" : "Consigliata",
     "Saved" : "Salvato",
     "test email settings" : "prova impostazioni email",
     "If you received this email, the settings seem to be correct." : "Se hai ricevuto questa email, le impostazioni dovrebbero essere corrette.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Controlli di connettività",
     "No problems found" : "Nessun problema trovato",
     "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'ultimo cron è stato eseguito alle %s. È più di un'ora fa, potrebbe esserci qualche problema.",
     "Cron was not executed yet!" : "Cron non è stato ancora eseguito!",
     "Execute one task with each page loaded" : "Esegui un'operazione con ogni pagina caricata",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php è registrato su un servizio webcron per invocare cron.php ogni 15 minuti su http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usa il servizio cron di sistema per invocare il file cron.php ogni 15 minuti.",
-    "Sharing" : "Condivisione",
     "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",
     "Enforce password protection" : "Imponi la protezione con password",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Consenti agli utenti di inviare email di notifica per i file condivisi",
     "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.",
-    "Security" : "Protezione",
     "Enforce HTTPS" : "Forza HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forza i client a connettersi a %s tramite una connessione cifrata.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
-    "Email Server" : "Server di posta",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
     "From address" : "Indirizzo mittente",
@@ -155,7 +156,6 @@
     "Store credentials" : "Memorizza le credenziali",
     "Test email settings" : "Prova impostazioni email",
     "Send email" : "Invia email",
-    "Log" : "Log",
     "Log level" : "Livello di log",
     "More" : "Altro",
     "Less" : "Meno",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index bab26197c9e..099e037fc36 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -1,6 +1,11 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "共有",
+    "Security" : "セキュリティ",
+    "Email Server" : "メールサーバー",
+    "Log" : "ログ",
     "Authentication error" : "認証エラー",
     "Your full name has been changed." : "名前を変更しました。",
     "Unable to change full name" : "名前を変更できません",
@@ -116,14 +121,12 @@ OC.L10N.register(
     "Connectivity checks" : "接続を確認",
     "No problems found" : "問題は見つかりませんでした",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
     "Cron was not executed yet!" : "cron は未だ実行されていません！",
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行する",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
     "Use system's cron service to call the cron.php file every 15 minutes." : "システムの cron サービスを利用して、15分間隔で cron.php ファイルを実行する。",
-    "Sharing" : "共有",
     "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
     "Allow users to share via link" : "URLリンクで共有を許可する",
     "Enforce password protection" : "常にパスワード保護を有効にする",
@@ -137,11 +140,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "共有ファイルに関するメール通知の送信をユーザーに許可する",
     "Exclude groups from sharing" : "共有可能なグループから除外",
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
-    "Security" : "セキュリティ",
     "Enforce HTTPS" : "常にHTTPSを使用する",
     "Forces the clients to connect to %s via an encrypted connection." : "クライアントから %sへの接続を常に暗号化します。",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
-    "Email Server" : "メールサーバー",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
     "From address" : "送信元アドレス",
@@ -155,7 +156,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP パスワード",
     "Test email settings" : "メール設定のテスト",
     "Send email" : "メールを送信",
-    "Log" : "ログ",
     "Log level" : "ログレベル",
     "More" : "もっと見る",
     "Less" : "閉じる",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 681ff0ddebc..03e9b548f45 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -1,4 +1,9 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "共有",
+    "Security" : "セキュリティ",
+    "Email Server" : "メールサーバー",
+    "Log" : "ログ",
     "Authentication error" : "認証エラー",
     "Your full name has been changed." : "名前を変更しました。",
     "Unable to change full name" : "名前を変更できません",
@@ -114,14 +119,12 @@
     "Connectivity checks" : "接続を確認",
     "No problems found" : "問題は見つかりませんでした",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "直近では%sにcronが実行されました。これは1時間以上前になるので、何かおかしいです。",
     "Cron was not executed yet!" : "cron は未だ実行されていません！",
     "Execute one task with each page loaded" : "各ページの読み込み時にタスクを実行する",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.phpは、HTTP経由で15分ごとにcron.phpを実行するようwebcronサービスに登録されています",
     "Use system's cron service to call the cron.php file every 15 minutes." : "システムの cron サービスを利用して、15分間隔で cron.php ファイルを実行する。",
-    "Sharing" : "共有",
     "Allow apps to use the Share API" : "アプリからの共有APIの利用を許可する",
     "Allow users to share via link" : "URLリンクで共有を許可する",
     "Enforce password protection" : "常にパスワード保護を有効にする",
@@ -135,11 +138,9 @@
     "Allow users to send mail notification for shared files" : "共有ファイルに関するメール通知の送信をユーザーに許可する",
     "Exclude groups from sharing" : "共有可能なグループから除外",
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
-    "Security" : "セキュリティ",
     "Enforce HTTPS" : "常にHTTPSを使用する",
     "Forces the clients to connect to %s via an encrypted connection." : "クライアントから %sへの接続を常に暗号化します。",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
-    "Email Server" : "メールサーバー",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
     "From address" : "送信元アドレス",
@@ -153,7 +154,6 @@
     "SMTP Password" : "SMTP パスワード",
     "Test email settings" : "メール設定のテスト",
     "Send email" : "メールを送信",
-    "Log" : "ログ",
     "Log level" : "ログレベル",
     "More" : "もっと見る",
     "Less" : "閉じる",
diff --git a/settings/l10n/ka_GE.js b/settings/l10n/ka_GE.js
index dd9652686b5..09d8c25290b 100644
--- a/settings/l10n/ka_GE.js
+++ b/settings/l10n/ka_GE.js
@@ -1,6 +1,10 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron–ი",
+    "Sharing" : "გაზიარება",
+    "Security" : "უსაფრთხოება",
+    "Log" : "ლოგი",
     "Authentication error" : "ავთენტიფიკაციის შეცდომა",
     "Group already exists" : "ჯგუფი უკვე არსებობს",
     "Unable to add group" : "ჯგუფის დამატება ვერ მოხერხდა",
@@ -41,17 +45,13 @@ 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 მოდული 'fileinfo' არ არსებობს. ჩვენ გირჩევთ რომ აუცილებლად ჩართოთ ეს მოდული, რომ მიიღოთ კარგი შედეგები mime-type–ს აღმოჩენისას.",
     "Locale not working" : "ლოკალიზაცია არ მუშაობს",
     "Please double check the <a href='%s'>installation guides</a>." : "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
-    "Cron" : "Cron–ი",
     "Execute one task with each page loaded" : "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
-    "Sharing" : "გაზიარება",
     "Allow apps to use the Share API" : "დაუშვი აპლიკაციების უფლება  Share API –ზე",
     "Allow resharing" : "გადაზიარების დაშვება",
-    "Security" : "უსაფრთხოება",
     "Enforce HTTPS" : "HTTPS–ის ჩართვა",
     "Server address" : "სერვერის მისამართი",
     "Port" : "პორტი",
     "Credentials" : "იუზერ/პაროლი",
-    "Log" : "ლოგი",
     "Log level" : "ლოგირების დონე",
     "More" : "უფრო მეტი",
     "Less" : "უფრო ნაკლები",
diff --git a/settings/l10n/ka_GE.json b/settings/l10n/ka_GE.json
index c2933f83849..e3a1f410e67 100644
--- a/settings/l10n/ka_GE.json
+++ b/settings/l10n/ka_GE.json
@@ -1,4 +1,8 @@
 { "translations": {
+    "Cron" : "Cron–ი",
+    "Sharing" : "გაზიარება",
+    "Security" : "უსაფრთხოება",
+    "Log" : "ლოგი",
     "Authentication error" : "ავთენტიფიკაციის შეცდომა",
     "Group already exists" : "ჯგუფი უკვე არსებობს",
     "Unable to add group" : "ჯგუფის დამატება ვერ მოხერხდა",
@@ -39,17 +43,13 @@
     "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–ს აღმოჩენისას.",
     "Locale not working" : "ლოკალიზაცია არ მუშაობს",
     "Please double check the <a href='%s'>installation guides</a>." : "გთხოვთ გადაათვალიეროთ <a href='%s'>ინსტალაციის გზამკვლევი</a>.",
-    "Cron" : "Cron–ი",
     "Execute one task with each page loaded" : "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
-    "Sharing" : "გაზიარება",
     "Allow apps to use the Share API" : "დაუშვი აპლიკაციების უფლება  Share API –ზე",
     "Allow resharing" : "გადაზიარების დაშვება",
-    "Security" : "უსაფრთხოება",
     "Enforce HTTPS" : "HTTPS–ის ჩართვა",
     "Server address" : "სერვერის მისამართი",
     "Port" : "პორტი",
     "Credentials" : "იუზერ/პაროლი",
-    "Log" : "ლოგი",
     "Log level" : "ლოგირების დონე",
     "More" : "უფრო მეტი",
     "Less" : "უფრო ნაკლები",
diff --git a/settings/l10n/km.js b/settings/l10n/km.js
index a7eeed4bd69..9814b26f128 100644
--- a/settings/l10n/km.js
+++ b/settings/l10n/km.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "បាន​បើក",
+    "Cron" : "Cron",
+    "Sharing" : "ការ​ចែក​រំលែក",
+    "Security" : "សុវត្ថិភាព",
+    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+    "Log" : "Log",
     "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
     "Group already exists" : "មាន​ក្រុម​នេះ​រួច​ហើយ",
     "Unable to add group" : "មិន​អាច​បន្ថែម​ក្រុម",
@@ -16,6 +20,7 @@ OC.L10N.register(
     "Unable to remove user from group %s" : "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ​ពី​ក្រុម​ %s",
     "Couldn't update app." : "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
     "Wrong password" : "ខុស​ពាក្យ​សម្ងាត់",
+    "Enabled" : "បាន​បើក",
     "Saved" : "បាន​រក្សាទុក",
     "test email settings" : "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
     "If you received this email, the settings seem to be correct." : "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
@@ -55,19 +60,14 @@ OC.L10N.register(
     "Module 'fileinfo' missing" : "ខ្វះ​ម៉ូឌុល 'fileinfo'",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។",
     "Locale not working" : "Locale មិន​ដំណើរការ",
-    "Cron" : "Cron",
-    "Sharing" : "ការ​ចែក​រំលែក",
     "Allow apps to use the Share API" : "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
     "Allow public uploads" : "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
     "Allow resharing" : "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
-    "Security" : "សុវត្ថិភាព",
     "Enforce HTTPS" : "បង្ខំ HTTPS",
-    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
     "From address" : "ពី​អាសយដ្ឋាន",
     "Server address" : "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
     "Port" : "ច្រក",
     "Send email" : "ផ្ញើ​អ៊ីមែល",
-    "Log" : "Log",
     "Log level" : "កម្រិត Log",
     "More" : "ច្រើន​ទៀត",
     "Less" : "តិច",
diff --git a/settings/l10n/km.json b/settings/l10n/km.json
index 3dbfa6dc037..91e65cac226 100644
--- a/settings/l10n/km.json
+++ b/settings/l10n/km.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "បាន​បើក",
+    "Cron" : "Cron",
+    "Sharing" : "ការ​ចែក​រំលែក",
+    "Security" : "សុវត្ថិភាព",
+    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
+    "Log" : "Log",
     "Authentication error" : "កំហុស​ការ​ផ្ទៀង​ផ្ទាត់​ភាព​ត្រឹម​ត្រូវ",
     "Group already exists" : "មាន​ក្រុម​នេះ​រួច​ហើយ",
     "Unable to add group" : "មិន​អាច​បន្ថែម​ក្រុម",
@@ -14,6 +18,7 @@
     "Unable to remove user from group %s" : "មិន​អាច​ដក​អ្នក​ប្រើ​ចេញ​ពី​ក្រុម​ %s",
     "Couldn't update app." : "មិន​អាច​ធ្វើ​បច្ចុប្បន្នភាព​កម្មវិធី។",
     "Wrong password" : "ខុស​ពាក្យ​សម្ងាត់",
+    "Enabled" : "បាន​បើក",
     "Saved" : "បាន​រក្សាទុក",
     "test email settings" : "សាក​ល្បង​ការ​កំណត់​អ៊ីមែល",
     "If you received this email, the settings seem to be correct." : "ប្រសិន​បើ​អ្នក​ទទួល​បាន​អ៊ីមែល​នេះ មាន​ន័យ​ថា​ការ​កំណត់​គឺ​បាន​ត្រឹមម​ត្រូវ​ហើយ។",
@@ -53,19 +58,14 @@
     "Module 'fileinfo' missing" : "ខ្វះ​ម៉ូឌុល 'fileinfo'",
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "ខ្វះ​ម៉ូឌុល 'fileinfo' ។ យើង​សូម​ណែនាំ​ឲ្យ​បើក​ម៉ូឌុល​នេះ ដើម្បី​ទទួល​បាន​លទ្ធផល​ល្អ​នៃ​ការ​សម្គាល់​ប្រភេទ mime ។",
     "Locale not working" : "Locale មិន​ដំណើរការ",
-    "Cron" : "Cron",
-    "Sharing" : "ការ​ចែក​រំលែក",
     "Allow apps to use the Share API" : "អនុញ្ញាត​ឲ្យ​កម្មវិធី​ប្រើ API ចែក​រំលែក",
     "Allow public uploads" : "អនុញ្ញាត​ការ​ផ្ទុក​ឡើង​ជា​សាធារណៈ",
     "Allow resharing" : "អនុញ្ញាត​ការ​ចែក​រំលែក​ម្ដង​ទៀត",
-    "Security" : "សុវត្ថិភាព",
     "Enforce HTTPS" : "បង្ខំ HTTPS",
-    "Email Server" : "ម៉ាស៊ីន​បម្រើ​អ៊ីមែល",
     "From address" : "ពី​អាសយដ្ឋាន",
     "Server address" : "អាសយដ្ឋាន​ម៉ាស៊ីន​បម្រើ",
     "Port" : "ច្រក",
     "Send email" : "ផ្ញើ​អ៊ីមែល",
-    "Log" : "Log",
     "Log level" : "កម្រិត Log",
     "More" : "ច្រើន​ទៀត",
     "Less" : "តិច",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 9b0ad8a96ea..4d8ccf751e2 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "활성화",
+    "Cron" : "크론",
+    "Sharing" : "공유",
+    "Security" : "보안",
+    "Email Server" : "전자우편 서버",
+    "Log" : "로그",
     "Authentication error" : "인증 오류",
     "Your full name has been changed." : "전체 이름이 변경되었습니다.",
     "Unable to change full name" : "전체 이름을 변경할 수 없음",
@@ -25,6 +29,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.",
     "Unable to change password" : "암호를 변경할 수 없음",
+    "Enabled" : "활성화",
     "Saved" : "저장됨",
     "Email sent" : "이메일 발송됨",
     "Sending..." : "보내는 중...",
@@ -86,18 +91,14 @@ OC.L10N.register(
     "This means that there might be problems with certain characters in file names." : "파일 이름의 일부 문자에 문제가 생길 수도 있습니다.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "다음 로캘을 지원하도록 시스템 설정을 변경하는 것을 추천합니다: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
-    "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 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
-    "Sharing" : "공유",
     "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
     "Allow public uploads" : "공개 업로드 허용",
     "Allow resharing" : "재공유 허용",
-    "Security" : "보안",
     "Enforce HTTPS" : "HTTPS 강제 사용",
     "Forces the clients to connect to %s via an encrypted connection." : "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
-    "Email Server" : "전자우편 서버",
     "From address" : "보낸 이 주소",
     "Authentication method" : "인증 방법",
     "Authentication required" : "인증 필요함",
@@ -108,7 +109,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP 암호",
     "Test email settings" : "시험용 전자우편 설정",
     "Send email" : "전자우편 보내기",
-    "Log" : "로그",
     "Log level" : "로그 단계",
     "More" : "더 중요함",
     "Less" : "덜 중요함",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 860946e7b91..882b9ef8c83 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "활성화",
+    "Cron" : "크론",
+    "Sharing" : "공유",
+    "Security" : "보안",
+    "Email Server" : "전자우편 서버",
+    "Log" : "로그",
     "Authentication error" : "인증 오류",
     "Your full name has been changed." : "전체 이름이 변경되었습니다.",
     "Unable to change full name" : "전체 이름을 변경할 수 없음",
@@ -23,6 +27,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "관리자 복구 암호가 잘못되었습니다. 암호를 다시 확인하십시오.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "백엔드에서 암호 변경을 지원하지 않지만, 사용자의 암호화 키는 갱신되었습니다.",
     "Unable to change password" : "암호를 변경할 수 없음",
+    "Enabled" : "활성화",
     "Saved" : "저장됨",
     "Email sent" : "이메일 발송됨",
     "Sending..." : "보내는 중...",
@@ -84,18 +89,14 @@
     "This means that there might be problems with certain characters in file names." : "파일 이름의 일부 문자에 문제가 생길 수도 있습니다.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "다음 로캘을 지원하도록 시스템 설정을 변경하는 것을 추천합니다: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
-    "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 서비스에 등록되어 HTTP로 15분마다 cron.php에 접근합니다.",
-    "Sharing" : "공유",
     "Allow apps to use the Share API" : "앱에서 공유 API를 사용할 수 있도록 허용",
     "Allow public uploads" : "공개 업로드 허용",
     "Allow resharing" : "재공유 허용",
-    "Security" : "보안",
     "Enforce HTTPS" : "HTTPS 강제 사용",
     "Forces the clients to connect to %s via an encrypted connection." : "클라이언트가 %s에 연결할 때 암호화 연결을 강제로 사용합니다.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL 강제 설정을 변경하려면 %s에 HTTPS로 연결해야 합니다.",
-    "Email Server" : "전자우편 서버",
     "From address" : "보낸 이 주소",
     "Authentication method" : "인증 방법",
     "Authentication required" : "인증 필요함",
@@ -106,7 +107,6 @@
     "SMTP Password" : "SMTP 암호",
     "Test email settings" : "시험용 전자우편 설정",
     "Send email" : "전자우편 보내기",
-    "Log" : "로그",
     "Log level" : "로그 단계",
     "More" : "더 중요함",
     "Less" : "덜 중요함",
diff --git a/settings/l10n/lb.js b/settings/l10n/lb.js
index d376876593e..2a49739460f 100644
--- a/settings/l10n/lb.js
+++ b/settings/l10n/lb.js
@@ -1,6 +1,8 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Log" : "Log",
     "Authentication error" : "Authentifikatioun's Fehler",
     "Group already exists" : "Group existeiert schon.",
     "Unable to add group" : "Onmeiglech Grupp beizefügen.",
@@ -23,11 +25,9 @@ OC.L10N.register(
     "__language_name__" : "__language_name__",
     "Login" : "Login",
     "Security Warning" : "Sécherheets Warnung",
-    "Cron" : "Cron",
     "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen",
     "Allow resharing" : "Resharing erlaben",
     "Server address" : "Server Adress",
-    "Log" : "Log",
     "More" : "Méi",
     "Less" : "Manner",
     "by" : "vun",
diff --git a/settings/l10n/lb.json b/settings/l10n/lb.json
index c3124daf851..6f18a4362e1 100644
--- a/settings/l10n/lb.json
+++ b/settings/l10n/lb.json
@@ -1,4 +1,6 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Log" : "Log",
     "Authentication error" : "Authentifikatioun's Fehler",
     "Group already exists" : "Group existeiert schon.",
     "Unable to add group" : "Onmeiglech Grupp beizefügen.",
@@ -21,11 +23,9 @@
     "__language_name__" : "__language_name__",
     "Login" : "Login",
     "Security Warning" : "Sécherheets Warnung",
-    "Cron" : "Cron",
     "Allow apps to use the Share API" : "Erlab Apps d'Share API ze benotzen",
     "Allow resharing" : "Resharing erlaben",
     "Server address" : "Server Adress",
-    "Log" : "Log",
     "More" : "Méi",
     "Less" : "Manner",
     "by" : "vun",
diff --git a/settings/l10n/lt_LT.js b/settings/l10n/lt_LT.js
index 977499f0c3f..da3c2eb229e 100644
--- a/settings/l10n/lt_LT.js
+++ b/settings/l10n/lt_LT.js
@@ -1,7 +1,10 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Įjungta",
+    "Cron" : "Cron",
+    "Sharing" : "Dalijimasis",
+    "Security" : "Saugumas",
+    "Log" : "Žurnalas",
     "Authentication error" : "Autentikacijos klaida",
     "Group already exists" : "Grupė jau egzistuoja",
     "Unable to add group" : "Nepavyko pridėti grupės",
@@ -21,6 +24,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.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
     "Unable to change password" : "Nepavyksta pakeisti slaptažodžio",
+    "Enabled" : "Įjungta",
     "Email sent" : "Laiškas išsiųstas",
     "All" : "Viskas",
     "Please wait...." : "Prašome palaukti...",
@@ -55,20 +59,16 @@ OC.L10N.register(
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
     "Locale not working" : "Lokalė neveikia",
     "Please double check the <a href='%s'>installation guides</a>." : "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
-    "Cron" : "Cron",
     "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.",
-    "Sharing" : "Dalijimasis",
     "Allow apps to use the Share API" : "Leidžia programoms naudoti Share API",
     "Allow public uploads" : "Leisti viešus įkėlimus",
     "Allow resharing" : "Leisti dalintis",
-    "Security" : "Saugumas",
     "Enforce HTTPS" : "Reikalauti HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Verčia klientus jungtis prie %s per šifruotą ryšį.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
     "Server address" : "Serverio adresas",
     "Port" : "Prievadas",
-    "Log" : "Žurnalas",
     "Log level" : "Žurnalo išsamumas",
     "More" : "Daugiau",
     "Less" : "Mažiau",
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
index 8c8c3856843..0118eede4a5 100644
--- a/settings/l10n/lt_LT.json
+++ b/settings/l10n/lt_LT.json
@@ -1,5 +1,8 @@
 { "translations": {
-    "Enabled" : "Įjungta",
+    "Cron" : "Cron",
+    "Sharing" : "Dalijimasis",
+    "Security" : "Saugumas",
+    "Log" : "Žurnalas",
     "Authentication error" : "Autentikacijos klaida",
     "Group already exists" : "Grupė jau egzistuoja",
     "Unable to add group" : "Nepavyko pridėti grupės",
@@ -19,6 +22,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.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Sistema nepalaiko slaptažodžio keitimo, bet naudotojo šifravimo raktas buvo sėkmingai atnaujintas.",
     "Unable to change password" : "Nepavyksta pakeisti slaptažodžio",
+    "Enabled" : "Įjungta",
     "Email sent" : "Laiškas išsiųstas",
     "All" : "Viskas",
     "Please wait...." : "Prašome palaukti...",
@@ -53,20 +57,16 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūksta PHP modulio „fileinfo“. Labai rekomenduojame įjungti šį modulį, kad gauti geriausius rezultatus nustatant mime-tipą.",
     "Locale not working" : "Lokalė neveikia",
     "Please double check the <a href='%s'>installation guides</a>." : "Prašome pažiūrėkite dar kartą <a href='%s'>diegimo instrukcijas</a>.",
-    "Cron" : "Cron",
     "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.",
-    "Sharing" : "Dalijimasis",
     "Allow apps to use the Share API" : "Leidžia programoms naudoti Share API",
     "Allow public uploads" : "Leisti viešus įkėlimus",
     "Allow resharing" : "Leisti dalintis",
-    "Security" : "Saugumas",
     "Enforce HTTPS" : "Reikalauti HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Verčia klientus jungtis prie %s per šifruotą ryšį.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Prašome prisijungti prie savo %s per HTTPS, kad įjungti ar išjungti SSL reikalavimą.",
     "Server address" : "Serverio adresas",
     "Port" : "Prievadas",
-    "Log" : "Žurnalas",
     "Log level" : "Žurnalo išsamumas",
     "More" : "Daugiau",
     "Less" : "Mažiau",
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
index 2b385446757..899d29a32c9 100644
--- a/settings/l10n/lv.js
+++ b/settings/l10n/lv.js
@@ -1,6 +1,10 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Dalīšanās",
+    "Security" : "Drošība",
+    "Log" : "Žurnāls",
     "Authentication error" : "Autentifikācijas kļūda",
     "Group already exists" : "Grupa jau eksistē",
     "Unable to add group" : "Nevar pievienot grupu",
@@ -43,20 +47,16 @@ OC.L10N.register(
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
     "Locale not working" : "Lokāle nestrādā",
     "Please double check the <a href='%s'>installation guides</a>." : "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
-    "Sharing" : "Dalīšanās",
     "Allow apps to use the Share API" : "Ļauj lietotnēm izmantot koplietošanas API",
     "Allow public uploads" : "Atļaut publisko augšupielādi",
     "Allow resharing" : "Atļaut atkārtotu koplietošanu",
-    "Security" : "Drošība",
     "Enforce HTTPS" : "Uzspiest HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
     "Server address" : "Servera adrese",
     "Port" : "Ports",
     "Credentials" : "Akreditācijas dati",
-    "Log" : "Žurnāls",
     "Log level" : "Žurnāla līmenis",
     "More" : "Vairāk",
     "Less" : "Mazāk",
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
index ae176475a4f..2cc167d78ae 100644
--- a/settings/l10n/lv.json
+++ b/settings/l10n/lv.json
@@ -1,4 +1,8 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Dalīšanās",
+    "Security" : "Drošība",
+    "Log" : "Žurnāls",
     "Authentication error" : "Autentifikācijas kļūda",
     "Group already exists" : "Grupa jau eksistē",
     "Unable to add group" : "Nevar pievienot grupu",
@@ -41,20 +45,16 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Trūkst PHP modulis “fileinfo”. Mēs iesakām to aktivēt, lai pēc iespējas labāk noteiktu mime tipus.",
     "Locale not working" : "Lokāle nestrādā",
     "Please double check the <a href='%s'>installation guides</a>." : "Lūdzu, vēlreiz pārbaudiet <a href='%s'>instalēšanas palīdzību</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Izpildīt vienu uzdevumu ar katru ielādēto lapu",
-    "Sharing" : "Dalīšanās",
     "Allow apps to use the Share API" : "Ļauj lietotnēm izmantot koplietošanas API",
     "Allow public uploads" : "Atļaut publisko augšupielādi",
     "Allow resharing" : "Atļaut atkārtotu koplietošanu",
-    "Security" : "Drošība",
     "Enforce HTTPS" : "Uzspiest HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Uzspiest klientiem pieslēgties pie %s caur šifrētu savienojumu.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Lūdzu slēdzieties pie %s caur HTTPS lai iespējotu vai atspējotu SSL izpildīšanu",
     "Server address" : "Servera adrese",
     "Port" : "Ports",
     "Credentials" : "Akreditācijas dati",
-    "Log" : "Žurnāls",
     "Log level" : "Žurnāla līmenis",
     "More" : "Vairāk",
     "Less" : "Mazāk",
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
index f8417ce6714..32438b0651b 100644
--- a/settings/l10n/mk.js
+++ b/settings/l10n/mk.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Овозможен",
+    "Cron" : "Крон",
+    "Sharing" : "Споделување",
+    "Security" : "Безбедност",
+    "Email Server" : "Сервер за електронска пошта",
+    "Log" : "Записник",
     "Authentication error" : "Грешка во автентикација",
     "Your full name has been changed." : "Вашето целосно име е променето.",
     "Unable to change full name" : "Не можам да го променам целото име",
@@ -23,6 +27,7 @@ OC.L10N.register(
     "Wrong password" : "Погрешна лозинка",
     "No user supplied" : "Нема корисничко име",
     "Unable to change password" : "Вашата лозинка неможе да се смени",
+    "Enabled" : "Овозможен",
     "Saved" : "Снимено",
     "test email settings" : "провери ги нагодувањата за електронска пошта",
     "Email sent" : "Е-порака пратена",
@@ -72,9 +77,7 @@ OC.L10N.register(
     "Database Performance Info" : "Информација за перформансите на базата на податоци",
     "Your PHP version is outdated" : "Вашаа верзија на PHP е застарена",
     "Locale not working" : "Локалето не функционира",
-    "Cron" : "Крон",
     "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница",
-    "Sharing" : "Споделување",
     "Allow apps to use the Share API" : "Дозволете апликациите да го користат API-то за споделување",
     "Allow users to share via link" : "Допушти корисниците да споделуваат со линкови",
     "Enforce password protection" : "Наметни заштита на лозинка",
@@ -86,9 +89,7 @@ OC.L10N.register(
     "Allow resharing" : "Овозможи повторно споделување",
     "Restrict users to only share with users in their groups" : "Ограничи корисниците да споделуваат со корисници во своите групи",
     "Exclude groups from sharing" : "Исклучи групи од споделување",
-    "Security" : "Безбедност",
     "Enforce HTTPS" : "Наметни HTTPS",
-    "Email Server" : "Сервер за електронска пошта",
     "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.",
     "Send mode" : "Мод на испраќање",
     "From address" : "Од адреса",
@@ -102,7 +103,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP лозинка",
     "Test email settings" : "Провери ги нагодувањаа за електронска пошта",
     "Send email" : "Испрати пошта",
-    "Log" : "Записник",
     "Log level" : "Ниво на логирање",
     "More" : "Повеќе",
     "Less" : "Помалку",
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
index 625f584305d..93cbf16b885 100644
--- a/settings/l10n/mk.json
+++ b/settings/l10n/mk.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Овозможен",
+    "Cron" : "Крон",
+    "Sharing" : "Споделување",
+    "Security" : "Безбедност",
+    "Email Server" : "Сервер за електронска пошта",
+    "Log" : "Записник",
     "Authentication error" : "Грешка во автентикација",
     "Your full name has been changed." : "Вашето целосно име е променето.",
     "Unable to change full name" : "Не можам да го променам целото име",
@@ -21,6 +25,7 @@
     "Wrong password" : "Погрешна лозинка",
     "No user supplied" : "Нема корисничко име",
     "Unable to change password" : "Вашата лозинка неможе да се смени",
+    "Enabled" : "Овозможен",
     "Saved" : "Снимено",
     "test email settings" : "провери ги нагодувањата за електронска пошта",
     "Email sent" : "Е-порака пратена",
@@ -70,9 +75,7 @@
     "Database Performance Info" : "Информација за перформансите на базата на податоци",
     "Your PHP version is outdated" : "Вашаа верзија на PHP е застарена",
     "Locale not working" : "Локалето не функционира",
-    "Cron" : "Крон",
     "Execute one task with each page loaded" : "Изврши по една задача со секоја вчитана страница",
-    "Sharing" : "Споделување",
     "Allow apps to use the Share API" : "Дозволете апликациите да го користат API-то за споделување",
     "Allow users to share via link" : "Допушти корисниците да споделуваат со линкови",
     "Enforce password protection" : "Наметни заштита на лозинка",
@@ -84,9 +87,7 @@
     "Allow resharing" : "Овозможи повторно споделување",
     "Restrict users to only share with users in their groups" : "Ограничи корисниците да споделуваат со корисници во своите групи",
     "Exclude groups from sharing" : "Исклучи групи од споделување",
-    "Security" : "Безбедност",
     "Enforce HTTPS" : "Наметни HTTPS",
-    "Email Server" : "Сервер за електронска пошта",
     "This is used for sending out notifications." : "Ова се користи за испраќање на известувања.",
     "Send mode" : "Мод на испраќање",
     "From address" : "Од адреса",
@@ -100,7 +101,6 @@
     "SMTP Password" : "SMTP лозинка",
     "Test email settings" : "Провери ги нагодувањаа за електронска пошта",
     "Send email" : "Испрати пошта",
-    "Log" : "Записник",
     "Log level" : "Ниво на логирање",
     "More" : "Повеќе",
     "Less" : "Помалку",
diff --git a/settings/l10n/ms_MY.js b/settings/l10n/ms_MY.js
index e36bc5336e6..99c41bf6a81 100644
--- a/settings/l10n/ms_MY.js
+++ b/settings/l10n/ms_MY.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Log" : "Log",
     "Authentication error" : "Ralat pengesahan",
     "Email saved" : "Emel disimpan",
     "Invalid email" : "Emel tidak sah",
@@ -15,7 +16,6 @@ OC.L10N.register(
     "Login" : "Log masuk",
     "Security Warning" : "Amaran keselamatan",
     "Server address" : "Alamat pelayan",
-    "Log" : "Log",
     "Log level" : "Tahap Log",
     "More" : "Lanjutan",
     "by" : "oleh",
diff --git a/settings/l10n/ms_MY.json b/settings/l10n/ms_MY.json
index 142db2bc620..506590d06f9 100644
--- a/settings/l10n/ms_MY.json
+++ b/settings/l10n/ms_MY.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Log" : "Log",
     "Authentication error" : "Ralat pengesahan",
     "Email saved" : "Emel disimpan",
     "Invalid email" : "Emel tidak sah",
@@ -13,7 +14,6 @@
     "Login" : "Log masuk",
     "Security Warning" : "Amaran keselamatan",
     "Server address" : "Alamat pelayan",
-    "Log" : "Log",
     "Log level" : "Tahap Log",
     "More" : "Lanjutan",
     "by" : "oleh",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 1fc843d3445..991088c732b 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Aktiv",
+    "Cron" : "Cron",
+    "Sharing" : "Deling",
+    "Security" : "Sikkerhet",
+    "Email Server" : "E-postserver",
+    "Log" : "Logg",
     "Authentication error" : "Autentiseringsfeil",
     "Your full name has been changed." : "Ditt fulle navn er blitt endret.",
     "Unable to change full name" : "Klarte ikke å endre fullt navn",
@@ -31,6 +35,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
     "Unable to change password" : "Kunne ikke endre passord",
+    "Enabled" : "Aktiv",
     "Saved" : "Lagret",
     "test email settings" : "Test av innstillinger for e-post",
     "If you received this email, the settings seem to be correct." : "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
@@ -112,14 +117,12 @@ OC.L10N.register(
     "Connectivity checks" : "Sjekk av tilkobling",
     "No problems found" : "Ingen problemer funnet",
     "Please double check the <a href='%s'>installation guides</a>." : "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Siste cron ble utført %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
     "Cron was not executed yet!" : "Cron er ikke utført ennå!",
     "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
     "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.",
-    "Sharing" : "Deling",
     "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
     "Allow users to share via link" : "Tillat brukere å dele via lenke",
     "Enforce password protection" : "Tving passordbeskyttelse",
@@ -133,11 +136,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Tlllat at brukere sender e-postvarsler for delte filer",
     "Exclude groups from sharing" : "Utelukk grupper fra deling",
     "These groups will still be able to receive shares, but not to initiate them." : "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
-    "Security" : "Sikkerhet",
     "Enforce HTTPS" : "Tving HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tvinger klientene til å koble til %s via en kryptert forbindelse.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
-    "Email Server" : "E-postserver",
     "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
     "Send mode" : "Sendemåte",
     "From address" : "Fra adresse",
@@ -151,7 +152,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP-passord",
     "Test email settings" : "Test innstillinger for e-post",
     "Send email" : "Send e-post",
-    "Log" : "Logg",
     "Log level" : "Loggnivå",
     "More" : "Mer",
     "Less" : "Mindre",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index c86056e7462..144a07d5229 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Aktiv",
+    "Cron" : "Cron",
+    "Sharing" : "Deling",
+    "Security" : "Sikkerhet",
+    "Email Server" : "E-postserver",
+    "Log" : "Logg",
     "Authentication error" : "Autentiseringsfeil",
     "Your full name has been changed." : "Ditt fulle navn er blitt endret.",
     "Unable to change full name" : "Klarte ikke å endre fullt navn",
@@ -29,6 +33,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "Feil administrativt gjenopprettingspassord. Sjekk passordet og prøv igjen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Serveren støtter ikke endring av passord, men oppdatering av brukerens krypteringsnøkkel var vellykket.",
     "Unable to change password" : "Kunne ikke endre passord",
+    "Enabled" : "Aktiv",
     "Saved" : "Lagret",
     "test email settings" : "Test av innstillinger for e-post",
     "If you received this email, the settings seem to be correct." : "Hvis du mottar denne e-posten er innstillingene tydeligvis korrekte.",
@@ -110,14 +115,12 @@
     "Connectivity checks" : "Sjekk av tilkobling",
     "No problems found" : "Ingen problemer funnet",
     "Please double check the <a href='%s'>installation guides</a>." : "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Siste cron ble utført %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Siste cron ble utført %s. Dette er mer enn en time siden. Noe ser ut til å være galt.",
     "Cron was not executed yet!" : "Cron er ikke utført ennå!",
     "Execute one task with each page loaded" : "Utfør en oppgave med hver side som blir lastet",
     "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.",
-    "Sharing" : "Deling",
     "Allow apps to use the Share API" : "Tillat apper å bruke API for Deling",
     "Allow users to share via link" : "Tillat brukere å dele via lenke",
     "Enforce password protection" : "Tving passordbeskyttelse",
@@ -131,11 +134,9 @@
     "Allow users to send mail notification for shared files" : "Tlllat at brukere sender e-postvarsler for delte filer",
     "Exclude groups from sharing" : "Utelukk grupper fra deling",
     "These groups will still be able to receive shares, but not to initiate them." : "Disse gruppene vil fremdeles kunne motta delinger men ikke lage dem.",
-    "Security" : "Sikkerhet",
     "Enforce HTTPS" : "Tving HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tvinger klientene til å koble til %s via en kryptert forbindelse.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Vennligst koble til din %s via HTTPS for å aktivere eller deaktivere tvungen SSL.",
-    "Email Server" : "E-postserver",
     "This is used for sending out notifications." : "Dette brukes for utsending av varsler.",
     "Send mode" : "Sendemåte",
     "From address" : "Fra adresse",
@@ -149,7 +150,6 @@
     "SMTP Password" : "SMTP-passord",
     "Test email settings" : "Test innstillinger for e-post",
     "Send email" : "Send e-post",
-    "Log" : "Logg",
     "Log level" : "Loggnivå",
     "More" : "Mer",
     "Less" : "Mindre",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 1b160c2bbe9..ef4613cb4eb 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Geactiveerd",
-    "Not enabled" : "Niet ingeschakeld",
-    "Recommended" : "Aanbevolen",
+    "Cron" : "Cron",
+    "Sharing" : "Delen",
+    "Security" : "Beveiliging",
+    "Email Server" : "E-mailserver",
+    "Log" : "Log",
     "Authentication error" : "Authenticatie fout",
     "Your full name has been changed." : "Uw volledige naam is gewijzigd.",
     "Unable to change full name" : "Kan de volledige naam niet wijzigen",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
     "Unable to change password" : "Kan wachtwoord niet wijzigen",
+    "Enabled" : "Geactiveerd",
+    "Not enabled" : "Niet ingeschakeld",
+    "Recommended" : "Aanbevolen",
     "Saved" : "Bewaard",
     "test email settings" : "test e-mailinstellingen",
     "If you received this email, the settings seem to be correct." : "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Verbindingscontroles",
     "No problems found" : "Geen problemen gevonden",
     "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
     "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
     "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
     "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.",
-    "Sharing" : "Delen",
     "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",
     "Enforce password protection" : "Dwing wachtwoordbeveiliging af",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Sta gebruikers toe om e-mailnotificaties  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.",
-    "Security" : "Beveiliging",
     "Enforce HTTPS" : "Afdwingen HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Dwingt de clients om een versleutelde verbinding te maken met %s",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
-    "Email Server" : "E-mailserver",
     "This is used for sending out notifications." : "Dit wordt gestuurd voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
     "From address" : "Afzenderadres",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Opslaan inloggegevens",
     "Test email settings" : "Test e-mailinstellingen",
     "Send email" : "Versturen e-mail",
-    "Log" : "Log",
     "Log level" : "Log niveau",
     "More" : "Meer",
     "Less" : "Minder",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 9a94c74f420..fc060810daa 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Geactiveerd",
-    "Not enabled" : "Niet ingeschakeld",
-    "Recommended" : "Aanbevolen",
+    "Cron" : "Cron",
+    "Sharing" : "Delen",
+    "Security" : "Beveiliging",
+    "Email Server" : "E-mailserver",
+    "Log" : "Log",
     "Authentication error" : "Authenticatie fout",
     "Your full name has been changed." : "Uw volledige naam is gewijzigd.",
     "Unable to change full name" : "Kan de volledige naam niet wijzigen",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Onjuist beheerdersherstelwachtwoord. Controleer het wachtwoord en probeer het opnieuw.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "De Back-end ondersteunt geen wachtwoordwijzigingen, maar de cryptosleutel van de gebruiker is succesvol bijgewerkt.",
     "Unable to change password" : "Kan wachtwoord niet wijzigen",
+    "Enabled" : "Geactiveerd",
+    "Not enabled" : "Niet ingeschakeld",
+    "Recommended" : "Aanbevolen",
     "Saved" : "Bewaard",
     "test email settings" : "test e-mailinstellingen",
     "If you received this email, the settings seem to be correct." : "Als u dit e-mailbericht ontvangt, lijken de instellingen juist.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Verbindingscontroles",
     "No problems found" : "Geen problemen gevonden",
     "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Laatst uitgevoerde cron op %s. Dat is langer dan een uur geleden, er is iets fout gegaan.",
     "Cron was not executed yet!" : "Cron is nog niet uitgevoerd!",
     "Execute one task with each page loaded" : "Bij laden van elke pagina één taak uitvoeren",
     "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.",
-    "Sharing" : "Delen",
     "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",
     "Enforce password protection" : "Dwing wachtwoordbeveiliging af",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Sta gebruikers toe om e-mailnotificaties  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.",
-    "Security" : "Beveiliging",
     "Enforce HTTPS" : "Afdwingen HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Dwingt de clients om een versleutelde verbinding te maken met %s",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
-    "Email Server" : "E-mailserver",
     "This is used for sending out notifications." : "Dit wordt gestuurd voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
     "From address" : "Afzenderadres",
@@ -155,7 +156,6 @@
     "Store credentials" : "Opslaan inloggegevens",
     "Test email settings" : "Test e-mailinstellingen",
     "Send email" : "Versturen e-mail",
-    "Log" : "Log",
     "Log level" : "Log niveau",
     "More" : "Meer",
     "Less" : "Minder",
diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js
index a838823210b..ec89452b020 100644
--- a/settings/l10n/nn_NO.js
+++ b/settings/l10n/nn_NO.js
@@ -1,6 +1,10 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Deling",
+    "Security" : "Tryggleik",
+    "Log" : "Logg",
     "Authentication error" : "Autentiseringsfeil",
     "Group already exists" : "Gruppa finst allereie",
     "Unable to add group" : "Klarte ikkje leggja til gruppa",
@@ -52,18 +56,14 @@ 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-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
     "Locale not working" : "Regionaldata fungerer ikkje",
     "Please double check the <a href='%s'>installation guides</a>." : "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Utfør éi oppgåve for kvar sidelasting",
-    "Sharing" : "Deling",
     "Allow apps to use the Share API" : "La app-ar bruka API-et til deling",
     "Allow public uploads" : "Tillat offentlege opplastingar",
     "Allow resharing" : "Tillat vidaredeling",
-    "Security" : "Tryggleik",
     "Enforce HTTPS" : "Krev HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
     "Server address" : "Tenaradresse",
-    "Log" : "Logg",
     "Log level" : "Log nivå",
     "More" : "Meir",
     "Less" : "Mindre",
diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json
index 2383ba4be76..d0ad4d92356 100644
--- a/settings/l10n/nn_NO.json
+++ b/settings/l10n/nn_NO.json
@@ -1,4 +1,8 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Deling",
+    "Security" : "Tryggleik",
+    "Log" : "Logg",
     "Authentication error" : "Autentiseringsfeil",
     "Group already exists" : "Gruppa finst allereie",
     "Unable to add group" : "Klarte ikkje leggja til gruppa",
@@ -50,18 +54,14 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "PHP-modulen «fileinfo» manglar. Me rår sterkt til å slå på denne modulen for å best mogleg oppdaga MIME-typar.",
     "Locale not working" : "Regionaldata fungerer ikkje",
     "Please double check the <a href='%s'>installation guides</a>." : "Ver venleg og dobbeltsjekk <a href='%s'>installasjonsrettleiinga</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Utfør éi oppgåve for kvar sidelasting",
-    "Sharing" : "Deling",
     "Allow apps to use the Share API" : "La app-ar bruka API-et til deling",
     "Allow public uploads" : "Tillat offentlege opplastingar",
     "Allow resharing" : "Tillat vidaredeling",
-    "Security" : "Tryggleik",
     "Enforce HTTPS" : "Krev HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tvingar klientar til å kopla til %s med ei kryptert tilkopling.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Ver venleg å kopla til %s med HTTPS (eller skru av SSL-kravet).",
     "Server address" : "Tenaradresse",
-    "Log" : "Logg",
     "Log level" : "Log nivå",
     "More" : "Meir",
     "Less" : "Mindre",
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index ffc80bd4ec4..1764b2dbf9f 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Al partejar",
+    "Log" : "Jornal",
     "Authentication error" : "Error d'autentificacion",
     "Group already exists" : "Lo grop existís ja",
     "Unable to add group" : "Pas capable d'apondre  un grop",
@@ -21,10 +24,7 @@ OC.L10N.register(
     "__language_name__" : "__language_name__",
     "Login" : "Login",
     "Security Warning" : "Avertiment de securitat",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Executa un prètfach amb cada pagina cargada",
-    "Sharing" : "Al partejar",
-    "Log" : "Jornal",
     "More" : "Mai d'aquò",
     "by" : "per",
     "Password" : "Senhal",
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index edd8e90404d..a01af9dea16 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Al partejar",
+    "Log" : "Jornal",
     "Authentication error" : "Error d'autentificacion",
     "Group already exists" : "Lo grop existís ja",
     "Unable to add group" : "Pas capable d'apondre  un grop",
@@ -19,10 +22,7 @@
     "__language_name__" : "__language_name__",
     "Login" : "Login",
     "Security Warning" : "Avertiment de securitat",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Executa un prètfach amb cada pagina cargada",
-    "Sharing" : "Al partejar",
-    "Log" : "Jornal",
     "More" : "Mai d'aquò",
     "by" : "per",
     "Password" : "Senhal",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index 3036f76d513..48149adc656 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Włączone",
-    "Not enabled" : "Nie włączone",
-    "Recommended" : "Polecane",
+    "Cron" : "Cron",
+    "Sharing" : "Udostępnianie",
+    "Security" : "Bezpieczeństwo",
+    "Email Server" : "Serwer pocztowy",
+    "Log" : "Logi",
     "Authentication error" : "Błąd uwierzytelniania",
     "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
     "Unable to change full name" : "Nie można zmienić pełnej nazwy",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
     "Unable to change password" : "Nie można zmienić hasła",
+    "Enabled" : "Włączone",
+    "Not enabled" : "Nie włączone",
+    "Recommended" : "Polecane",
     "Saved" : "Zapisano",
     "test email settings" : "przetestuj ustawienia email",
     "If you received this email, the settings seem to be correct." : "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Sprawdzanie łączności",
     "No problems found" : "Nie ma żadnych problemów",
     "Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Ostatni cron był uruchomiony %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
     "Cron was not executed yet!" : "Cron nie został jeszcze uruchomiony!",
     "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
-    "Sharing" : "Udostępnianie",
     "Allow apps to use the Share API" : "Zezwalaj aplikacjom na korzystanie z API udostępniania",
     "Allow users to share via link" : "Pozwól użytkownikom współdzielić przez link",
     "Enforce password protection" : "Wymuś zabezpieczenie hasłem",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
     "Exclude groups from sharing" : "Wyklucz grupy z udostępniania",
     "These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
-    "Security" : "Bezpieczeństwo",
     "Enforce HTTPS" : "Wymuś HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
-    "Email Server" : "Serwer pocztowy",
     "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
     "Send mode" : "Tryb wysyłki",
     "From address" : "Z adresu",
@@ -156,7 +157,6 @@ OC.L10N.register(
     "SMTP Password" : "Hasło SMTP",
     "Test email settings" : "Ustawienia testowej wiadomości",
     "Send email" : "Wyślij email",
-    "Log" : "Logi",
     "Log level" : "Poziom logów",
     "More" : "Więcej",
     "Less" : "Mniej",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 042495d6dc5..046ffdf578e 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Włączone",
-    "Not enabled" : "Nie włączone",
-    "Recommended" : "Polecane",
+    "Cron" : "Cron",
+    "Sharing" : "Udostępnianie",
+    "Security" : "Bezpieczeństwo",
+    "Email Server" : "Serwer pocztowy",
+    "Log" : "Logi",
     "Authentication error" : "Błąd uwierzytelniania",
     "Your full name has been changed." : "Twoja pełna nazwa została zmieniona.",
     "Unable to change full name" : "Nie można zmienić pełnej nazwy",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Błędne hasło odzyskiwania. Sprawdź hasło i spróbuj ponownie.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Zaplecze nie obsługuje zmiany hasła, ale klucz szyfrowania użytkownika został pomyślnie zaktualizowany.",
     "Unable to change password" : "Nie można zmienić hasła",
+    "Enabled" : "Włączone",
+    "Not enabled" : "Nie włączone",
+    "Recommended" : "Polecane",
     "Saved" : "Zapisano",
     "test email settings" : "przetestuj ustawienia email",
     "If you received this email, the settings seem to be correct." : "Jeśli otrzymałeś ten email, ustawienia wydają się być poprawne.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Sprawdzanie łączności",
     "No problems found" : "Nie ma żadnych problemów",
     "Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Ostatni cron był uruchomiony %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Ostatni cron był uruchomiony %s. To jest więcej niż godzinę temu, wygląda na to, że coś jest nie tak.",
     "Cron was not executed yet!" : "Cron nie został jeszcze uruchomiony!",
     "Execute one task with each page loaded" : "Wykonuj jedno zadanie wraz z każdą wczytaną stroną",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php jest zarejestrowany w serwisie webcron do uruchamiania cron.php raz na 15 minut przez http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Użyj systemowej usługi cron do wywoływania cron.php co 15 minut.",
-    "Sharing" : "Udostępnianie",
     "Allow apps to use the Share API" : "Zezwalaj aplikacjom na korzystanie z API udostępniania",
     "Allow users to share via link" : "Pozwól użytkownikom współdzielić przez link",
     "Enforce password protection" : "Wymuś zabezpieczenie hasłem",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Zezwól użytkownikom na wysyłanie powiadomień email dla udostępnionych plików",
     "Exclude groups from sharing" : "Wyklucz grupy z udostępniania",
     "These groups will still be able to receive shares, but not to initiate them." : "Grupy te nadal będą mogli otrzymywać udostępnione udziały, ale nie do ich inicjowania.",
-    "Security" : "Bezpieczeństwo",
     "Enforce HTTPS" : "Wymuś HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Wymusza na klientach na łączenie się %s za pośrednictwem połączenia szyfrowanego.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Proszę połącz się do twojego %s za pośrednictwem protokołu HTTPS, aby włączyć lub wyłączyć stosowanie protokołu SSL.",
-    "Email Server" : "Serwer pocztowy",
     "This is used for sending out notifications." : "To jest używane do wysyłania powiadomień",
     "Send mode" : "Tryb wysyłki",
     "From address" : "Z adresu",
@@ -154,7 +155,6 @@
     "SMTP Password" : "Hasło SMTP",
     "Test email settings" : "Ustawienia testowej wiadomości",
     "Send email" : "Wyślij email",
-    "Log" : "Logi",
     "Log level" : "Poziom logów",
     "More" : "Więcej",
     "Less" : "Mniej",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 252a3044ced..6b8266b18a7 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Habilitado",
-    "Not enabled" : "Desabilitado",
-    "Recommended" : "Recomendado",
+    "Cron" : "Cron",
+    "Sharing" : "Compartilhamento",
+    "Security" : "Segurança",
+    "Email Server" : "Servidor de Email",
+    "Log" : "Registro",
     "Authentication error" : "Erro de autenticação",
     "Your full name has been changed." : "Seu nome completo foi alterado.",
     "Unable to change full name" : "Não é possível alterar o nome completo",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
     "Unable to change password" : "Impossível modificar senha",
+    "Enabled" : "Habilitado",
+    "Not enabled" : "Desabilitado",
+    "Recommended" : "Recomendado",
     "Saved" : "Salvo",
     "test email settings" : "testar configurações de email",
     "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail, as configurações parecem estar corretas.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Verificação de conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Último cron foi executado em %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
     "Cron was not executed yet!" : "Cron não foi executado ainda!",
     "Execute one task with each page loaded" : "Execute 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á registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-    "Sharing" : "Compartilhamento",
     "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
     "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
     "Enforce password protection" : "Reforce a proteção por senha",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
     "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.",
-    "Security" : "Segurança",
     "Enforce HTTPS" : "Forçar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
-    "Email Server" : "Servidor de Email",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
     "From address" : "Do Endereço",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Armazenar credenciais",
     "Test email settings" : "Configurações de e-mail de teste",
     "Send email" : "Enviar email",
-    "Log" : "Registro",
     "Log level" : "Nível de registro",
     "More" : "Mais",
     "Less" : "Menos",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 3e6b426930b..7a2a4636179 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Habilitado",
-    "Not enabled" : "Desabilitado",
-    "Recommended" : "Recomendado",
+    "Cron" : "Cron",
+    "Sharing" : "Compartilhamento",
+    "Security" : "Segurança",
+    "Email Server" : "Servidor de Email",
+    "Log" : "Registro",
     "Authentication error" : "Erro de autenticação",
     "Your full name has been changed." : "Seu nome completo foi alterado.",
     "Unable to change full name" : "Não é possível alterar o nome completo",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Senha de recuperação do administrador errada. Por favor verifique a senha e tente novamente.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Back-end não suporta alteração de senha, mas a chave de criptografia de usuários foi atualizado com sucesso....",
     "Unable to change password" : "Impossível modificar senha",
+    "Enabled" : "Habilitado",
+    "Not enabled" : "Desabilitado",
+    "Recommended" : "Recomendado",
     "Saved" : "Salvo",
     "test email settings" : "testar configurações de email",
     "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail, as configurações parecem estar corretas.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Verificação de conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Último cron foi executado em %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Última cron foi executado em %s. Isso é, mais de uma hora atrás, algo parece errado.",
     "Cron was not executed yet!" : "Cron não foi executado ainda!",
     "Execute one task with each page loaded" : "Execute 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á registrado no serviço webcron para chamar cron.php a cada 15 minutos sobre http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Usar o serviço cron do sistema para chamar o arquivo cron.php cada 15 minutos.",
-    "Sharing" : "Compartilhamento",
     "Allow apps to use the Share API" : "Permitir que aplicativos usem a API de Compartilhamento",
     "Allow users to share via link" : "Permitir que os usuários compartilhem por link",
     "Enforce password protection" : "Reforce a proteção por senha",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Permitir aos usuários enviar notificação de email para arquivos compartilhados",
     "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.",
-    "Security" : "Segurança",
     "Enforce HTTPS" : "Forçar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
-    "Email Server" : "Servidor de Email",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
     "From address" : "Do Endereço",
@@ -155,7 +156,6 @@
     "Store credentials" : "Armazenar credenciais",
     "Test email settings" : "Configurações de e-mail de teste",
     "Send email" : "Enviar email",
-    "Log" : "Registro",
     "Log level" : "Nível de registro",
     "More" : "Mais",
     "Less" : "Menos",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 0c5ea85be5c..ce289a2fc4a 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Ativada",
-    "Not enabled" : "Desactivado",
-    "Recommended" : "Recomendado",
+    "Cron" : "Cron",
+    "Sharing" : "Partilha",
+    "Security" : "Segurança",
+    "Email Server" : "Servidor de email",
+    "Log" : "Registo",
     "Authentication error" : "Erro na autenticação",
     "Your full name has been changed." : "O seu nome completo foi alterado.",
     "Unable to change full name" : "Não foi possível alterar o seu nome completo",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
     "Unable to change password" : "Não foi possível alterar a sua password",
+    "Enabled" : "Ativada",
+    "Not enabled" : "Desactivado",
+    "Recommended" : "Recomendado",
     "Saved" : "Guardado",
     "test email settings" : "testar configurações de email",
     "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail as configurações parecem estar correctas",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Verificações de conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
     "Cron was not executed yet!" : "Cron ainda não foi executado!",
     "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.",
-    "Sharing" : "Partilha",
     "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
     "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
     "Enforce password protection" : "Forçar protecção da palavra passe",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
     "Exclude groups from sharing" : "Excluir grupos das partilhas",
     "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
-    "Security" : "Segurança",
     "Enforce HTTPS" : "Forçar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forçar os clientes a ligar a %s através de uma ligação encriptada",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
-    "Email Server" : "Servidor de email",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de envio",
     "From address" : "Do endereço",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Armazenar credenciais",
     "Test email settings" : "Testar configurações de email",
     "Send email" : "Enviar email",
-    "Log" : "Registo",
     "Log level" : "Nível do registo",
     "More" : "Mais",
     "Less" : "Menos",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index e8b20792b3f..d1f5aff6776 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Ativada",
-    "Not enabled" : "Desactivado",
-    "Recommended" : "Recomendado",
+    "Cron" : "Cron",
+    "Sharing" : "Partilha",
+    "Security" : "Segurança",
+    "Email Server" : "Servidor de email",
+    "Log" : "Registo",
     "Authentication error" : "Erro na autenticação",
     "Your full name has been changed." : "O seu nome completo foi alterado.",
     "Unable to change full name" : "Não foi possível alterar o seu nome completo",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
     "Unable to change password" : "Não foi possível alterar a sua password",
+    "Enabled" : "Ativada",
+    "Not enabled" : "Desactivado",
+    "Recommended" : "Recomendado",
     "Saved" : "Guardado",
     "test email settings" : "testar configurações de email",
     "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail as configurações parecem estar correctas",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Verificações de conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O ultima cron foi executado em %s a mais duma hora. Algo não está certo.",
     "Cron was not executed yet!" : "Cron ainda não foi executado!",
     "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.",
-    "Sharing" : "Partilha",
     "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
     "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
     "Enforce password protection" : "Forçar protecção da palavra passe",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Permita que o utilizador envie notificações por correio electrónico para ficheiros partilhados",
     "Exclude groups from sharing" : "Excluir grupos das partilhas",
     "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
-    "Security" : "Segurança",
     "Enforce HTTPS" : "Forçar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forçar os clientes a ligar a %s através de uma ligação encriptada",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
-    "Email Server" : "Servidor de email",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de envio",
     "From address" : "Do endereço",
@@ -155,7 +156,6 @@
     "Store credentials" : "Armazenar credenciais",
     "Test email settings" : "Testar configurações de email",
     "Send email" : "Enviar email",
-    "Log" : "Registo",
     "Log level" : "Nível do registo",
     "More" : "Mais",
     "Less" : "Menos",
diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js
index 64e3d811832..f903cbcda9c 100644
--- a/settings/l10n/ro.js
+++ b/settings/l10n/ro.js
@@ -1,8 +1,10 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Activat",
-    "Recommended" : "Recomandat",
+    "Cron" : "Cron",
+    "Sharing" : "Partajare",
+    "Security" : "Securitate",
+    "Log" : "Jurnal de activitate",
     "Authentication error" : "Eroare la autentificare",
     "Your full name has been changed." : "Numele tău complet a fost schimbat.",
     "Unable to change full name" : "Nu s-a puput schimba numele complet",
@@ -24,6 +26,8 @@ OC.L10N.register(
     "Wrong password" : "Parolă greșită",
     "No user supplied" : "Nici un utilizator furnizat",
     "Unable to change password" : "Imposibil de schimbat parola",
+    "Enabled" : "Activat",
+    "Recommended" : "Recomandat",
     "Saved" : "Salvat",
     "test email settings" : "verifică setările de e-mail",
     "If you received this email, the settings seem to be correct." : "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
@@ -67,24 +71,21 @@ OC.L10N.register(
     "Your PHP version is outdated" : "Versiunea PHP folosită este învechită",
     "Locale not working" : "Localizarea nu funcționează",
     "Please double check the <a href='%s'>installation guides</a>." : "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
-    "Sharing" : "Partajare",
     "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
     "Allow public uploads" : "Permite încărcări publice",
     "Allow resharing" : "Permite repartajarea",
     "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
-    "Security" : "Securitate",
     "Forces the clients to connect to %s via an encrypted connection." : "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
     "Send mode" : "Modul de expediere",
     "Authentication method" : "Modul de autentificare",
+    "Authentication required" : "Autentificare necesară",
     "Server address" : "Adresa server-ului",
     "Port" : "Portul",
     "SMTP Username" : "Nume utilizator SMTP",
     "SMTP Password" : "Parolă SMTP",
     "Test email settings" : "Verifică setările de e-mail",
     "Send email" : "Expediază mesajul",
-    "Log" : "Jurnal de activitate",
     "Log level" : "Nivel jurnal",
     "More" : "Mai mult",
     "Less" : "Mai puțin",
diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json
index c4c756e9367..39abac22679 100644
--- a/settings/l10n/ro.json
+++ b/settings/l10n/ro.json
@@ -1,6 +1,8 @@
 { "translations": {
-    "Enabled" : "Activat",
-    "Recommended" : "Recomandat",
+    "Cron" : "Cron",
+    "Sharing" : "Partajare",
+    "Security" : "Securitate",
+    "Log" : "Jurnal de activitate",
     "Authentication error" : "Eroare la autentificare",
     "Your full name has been changed." : "Numele tău complet a fost schimbat.",
     "Unable to change full name" : "Nu s-a puput schimba numele complet",
@@ -22,6 +24,8 @@
     "Wrong password" : "Parolă greșită",
     "No user supplied" : "Nici un utilizator furnizat",
     "Unable to change password" : "Imposibil de schimbat parola",
+    "Enabled" : "Activat",
+    "Recommended" : "Recomandat",
     "Saved" : "Salvat",
     "test email settings" : "verifică setările de e-mail",
     "If you received this email, the settings seem to be correct." : "Dacă ai primit acest e-mail atunci setările par a fi corecte.",
@@ -65,24 +69,21 @@
     "Your PHP version is outdated" : "Versiunea PHP folosită este învechită",
     "Locale not working" : "Localizarea nu funcționează",
     "Please double check the <a href='%s'>installation guides</a>." : "Vă rugăm să verificați <a href='%s'>ghiduri de instalare</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Execută o sarcină la fiecare pagină încărcată",
-    "Sharing" : "Partajare",
     "Allow apps to use the Share API" : "Permite aplicațiilor să folosească API-ul de partajare",
     "Allow public uploads" : "Permite încărcări publice",
     "Allow resharing" : "Permite repartajarea",
     "Allow users to send mail notification for shared files" : "Permite utilizatorilor sa expedieze notificări prin e-mail pentru dosarele comune",
-    "Security" : "Securitate",
     "Forces the clients to connect to %s via an encrypted connection." : "Forțează clienții să se conecteze la %s folosind o conexiune sigură",
     "Send mode" : "Modul de expediere",
     "Authentication method" : "Modul de autentificare",
+    "Authentication required" : "Autentificare necesară",
     "Server address" : "Adresa server-ului",
     "Port" : "Portul",
     "SMTP Username" : "Nume utilizator SMTP",
     "SMTP Password" : "Parolă SMTP",
     "Test email settings" : "Verifică setările de e-mail",
     "Send email" : "Expediază mesajul",
-    "Log" : "Jurnal de activitate",
     "Log level" : "Nivel jurnal",
     "More" : "Mai mult",
     "Less" : "Mai puțin",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 3932f2a457c..ce621a5ccd9 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Включено",
+    "Cron" : "Планировщик задач по расписанию",
+    "Sharing" : "Общий доступ",
+    "Security" : "Безопасность",
+    "Email Server" : "Почтовый сервер",
+    "Log" : "Журнал",
     "Authentication error" : "Ошибка аутентификации",
     "Your full name has been changed." : "Ваше полное имя было изменено.",
     "Unable to change full name" : "Невозможно изменить полное имя",
@@ -31,6 +35,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
     "Unable to change password" : "Невозможно изменить пароль",
+    "Enabled" : "Включено",
     "Saved" : "Сохранено",
     "test email settings" : "проверить настройки почты",
     "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
@@ -112,14 +117,12 @@ OC.L10N.register(
     "Connectivity checks" : "Проверка соединения",
     "No problems found" : "Проблемы не найдены",
     "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
-    "Cron" : "Планировщик задач по расписанию",
     "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
     "Last cron was executed at %s. This is more than an hour ago, 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 минут.",
-    "Sharing" : "Общий доступ",
     "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
     "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
     "Enforce password protection" : "Защита паролем обязательна",
@@ -133,11 +136,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Разрешить пользователю оповещать почтой о расшаренных файлах",
     "Exclude groups from sharing" : "Исключить группы из общего доступа",
     "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
-    "Security" : "Безопасность",
     "Enforce HTTPS" : "HTTPS соединение обязательно",
     "Forces the clients to connect to %s via an encrypted connection." : "Принудить клиентов подключаться к %s через шифрованное соединение.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить обязательные SSL подключения.",
-    "Email Server" : "Почтовый сервер",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
     "Send mode" : "Отправить сообщение",
     "From address" : "Адрес отправителя",
@@ -151,7 +152,6 @@ OC.L10N.register(
     "SMTP Password" : "Пароль SMTP",
     "Test email settings" : "Проверить настройки почты",
     "Send email" : "Отправить сообщение",
-    "Log" : "Журнал",
     "Log level" : "Уровень детализации журнала",
     "More" : "Больше",
     "Less" : "Меньше",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 74500a356a3..5c541a66ca1 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Включено",
+    "Cron" : "Планировщик задач по расписанию",
+    "Sharing" : "Общий доступ",
+    "Security" : "Безопасность",
+    "Email Server" : "Почтовый сервер",
+    "Log" : "Журнал",
     "Authentication error" : "Ошибка аутентификации",
     "Your full name has been changed." : "Ваше полное имя было изменено.",
     "Unable to change full name" : "Невозможно изменить полное имя",
@@ -29,6 +33,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "Неправильный пароль восстановления. Проверьте пароль и попробуйте еще раз.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
     "Unable to change password" : "Невозможно изменить пароль",
+    "Enabled" : "Включено",
     "Saved" : "Сохранено",
     "test email settings" : "проверить настройки почты",
     "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
@@ -110,14 +115,12 @@
     "Connectivity checks" : "Проверка соединения",
     "No problems found" : "Проблемы не найдены",
     "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
-    "Cron" : "Планировщик задач по расписанию",
     "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
     "Last cron was executed at %s. This is more than an hour ago, 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 минут.",
-    "Sharing" : "Общий доступ",
     "Allow apps to use the Share API" : "Позволить приложениям использовать API общего доступа",
     "Allow users to share via link" : "Разрешить пользователям публикации через ссылки",
     "Enforce password protection" : "Защита паролем обязательна",
@@ -131,11 +134,9 @@
     "Allow users to send mail notification for shared files" : "Разрешить пользователю оповещать почтой о расшаренных файлах",
     "Exclude groups from sharing" : "Исключить группы из общего доступа",
     "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
-    "Security" : "Безопасность",
     "Enforce HTTPS" : "HTTPS соединение обязательно",
     "Forces the clients to connect to %s via an encrypted connection." : "Принудить клиентов подключаться к %s через шифрованное соединение.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить обязательные SSL подключения.",
-    "Email Server" : "Почтовый сервер",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
     "Send mode" : "Отправить сообщение",
     "From address" : "Адрес отправителя",
@@ -149,7 +150,6 @@
     "SMTP Password" : "Пароль SMTP",
     "Test email settings" : "Проверить настройки почты",
     "Send email" : "Отправить сообщение",
-    "Log" : "Журнал",
     "Log level" : "Уровень детализации журнала",
     "More" : "Больше",
     "Less" : "Меньше",
diff --git a/settings/l10n/si_LK.js b/settings/l10n/si_LK.js
index bc894fb031b..55acf32e881 100644
--- a/settings/l10n/si_LK.js
+++ b/settings/l10n/si_LK.js
@@ -1,6 +1,8 @@
 OC.L10N.register(
     "settings",
     {
+    "Sharing" : "හුවමාරු කිරීම",
+    "Log" : "ලඝුව",
     "Authentication error" : "සත්‍යාපන දෝෂයක්",
     "Group already exists" : "කණ්ඩායම දැනටමත් තිබේ",
     "Unable to add group" : "කාණඩයක් එක් කළ නොහැකි විය",
@@ -23,11 +25,9 @@ OC.L10N.register(
     "None" : "කිසිවක් නැත",
     "Login" : "ප්‍රවිශ්ටය",
     "Security Warning" : "ආරක්ෂක නිවේදනයක්",
-    "Sharing" : "හුවමාරු කිරීම",
     "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි",
     "Server address" : "සේවාදායකයේ ලිපිනය",
     "Port" : "තොට",
-    "Log" : "ලඝුව",
     "More" : "වැඩි",
     "Less" : "අඩු",
     "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>." : "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
diff --git a/settings/l10n/si_LK.json b/settings/l10n/si_LK.json
index 9d1c5ef4a62..2b763e6387d 100644
--- a/settings/l10n/si_LK.json
+++ b/settings/l10n/si_LK.json
@@ -1,4 +1,6 @@
 { "translations": {
+    "Sharing" : "හුවමාරු කිරීම",
+    "Log" : "ලඝුව",
     "Authentication error" : "සත්‍යාපන දෝෂයක්",
     "Group already exists" : "කණ්ඩායම දැනටමත් තිබේ",
     "Unable to add group" : "කාණඩයක් එක් කළ නොහැකි විය",
@@ -21,11 +23,9 @@
     "None" : "කිසිවක් නැත",
     "Login" : "ප්‍රවිශ්ටය",
     "Security Warning" : "ආරක්ෂක නිවේදනයක්",
-    "Sharing" : "හුවමාරු කිරීම",
     "Allow resharing" : "යළි යළිත් හුවමාරුවට අවසර දෙමි",
     "Server address" : "සේවාදායකයේ ලිපිනය",
     "Port" : "තොට",
-    "Log" : "ලඝුව",
     "More" : "වැඩි",
     "Less" : "අඩු",
     "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>." : "නිපදන ලද්දේ <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud සමාජයෙන්</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">මුල් කේතය </a>ලයිසන්ස් කර ඇත්තේ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> යටතේ.",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 773b87f5e20..186d3b9ec5e 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Povolené",
+    "Cron" : "Cron",
+    "Sharing" : "Zdieľanie",
+    "Security" : "Zabezpečenie",
+    "Email Server" : "Email server",
+    "Log" : "Záznam",
     "Authentication error" : "Chyba autentifikácie",
     "Your full name has been changed." : "Vaše meno a priezvisko bolo zmenené.",
     "Unable to change full name" : "Nemožno zmeniť meno a priezvisko",
@@ -31,6 +35,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
     "Unable to change password" : "Zmena hesla sa nepodarila",
+    "Enabled" : "Povolené",
     "Saved" : "Uložené",
     "test email settings" : "nastavenia testovacieho emailu",
     "If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
@@ -110,14 +115,12 @@ OC.L10N.register(
     "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Posledný cron bol spustený %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
     "Cron was not executed yet!" : "Cron sa ešte nespustil!",
     "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
-    "Sharing" : "Zdieľanie",
     "Allow apps to use the Share API" : "Povoliť aplikáciám používať API na zdieľanie",
     "Allow users to share via link" : "Povoliť používateľom zdieľanie pomocou odkazov",
     "Enforce password protection" : "Vynútiť ochranu heslom",
@@ -131,11 +134,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
     "Exclude groups from sharing" : "Vybrať skupiny zo zdieľania",
     "These groups will still be able to receive shares, but not to initiate them." : "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
-    "Security" : "Zabezpečenie",
     "Enforce HTTPS" : "Vynútiť HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
-    "Email Server" : "Email server",
     "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
     "Send mode" : "Mód odosielania",
     "From address" : "Z adresy",
@@ -149,7 +150,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP heslo",
     "Test email settings" : "Nastavenia testovacieho emailu",
     "Send email" : "Odoslať email",
-    "Log" : "Záznam",
     "Log level" : "Úroveň záznamu",
     "More" : "Viac",
     "Less" : "Menej",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index 44b87fc746d..4e77bcad1f9 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "Povolené",
+    "Cron" : "Cron",
+    "Sharing" : "Zdieľanie",
+    "Security" : "Zabezpečenie",
+    "Email Server" : "Email server",
+    "Log" : "Záznam",
     "Authentication error" : "Chyba autentifikácie",
     "Your full name has been changed." : "Vaše meno a priezvisko bolo zmenené.",
     "Unable to change full name" : "Nemožno zmeniť meno a priezvisko",
@@ -29,6 +33,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
     "Unable to change password" : "Zmena hesla sa nepodarila",
+    "Enabled" : "Povolené",
     "Saved" : "Uložené",
     "test email settings" : "nastavenia testovacieho emailu",
     "If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
@@ -108,14 +113,12 @@
     "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Posledný cron bol spustený %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
     "Cron was not executed yet!" : "Cron sa ešte nespustil!",
     "Execute one task with each page loaded" : "Vykonať jednu úlohu s každým načítaní stránky",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php je zaregistrovaná v službe WebCron a zavolá cron.php každých 15 minút cez http.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Použiť systémovú službu cron na spúšťanie súboru cron.php každých 15 minút.",
-    "Sharing" : "Zdieľanie",
     "Allow apps to use the Share API" : "Povoliť aplikáciám používať API na zdieľanie",
     "Allow users to share via link" : "Povoliť používateľom zdieľanie pomocou odkazov",
     "Enforce password protection" : "Vynútiť ochranu heslom",
@@ -129,11 +132,9 @@
     "Allow users to send mail notification for shared files" : "Povoliť používateľom zasielať emailom oznámenie o zdieľaní súborov",
     "Exclude groups from sharing" : "Vybrať skupiny zo zdieľania",
     "These groups will still be able to receive shares, but not to initiate them." : "Tieto skupiny budú môcť stále zdieľať, ale sami nemôžu zdieľať ostatným.",
-    "Security" : "Zabezpečenie",
     "Enforce HTTPS" : "Vynútiť HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vynúti pripájanie klientov k %s šifrovaným pripojením.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.",
-    "Email Server" : "Email server",
     "This is used for sending out notifications." : "Používa sa na odosielanie upozornení.",
     "Send mode" : "Mód odosielania",
     "From address" : "Z adresy",
@@ -147,7 +148,6 @@
     "SMTP Password" : "SMTP heslo",
     "Test email settings" : "Nastavenia testovacieho emailu",
     "Send email" : "Odoslať email",
-    "Log" : "Záznam",
     "Log level" : "Úroveň záznamu",
     "More" : "Viac",
     "Less" : "Menej",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index 962de6b8961..ef2431c5648 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Omogočeno",
-    "Not enabled" : "Ni omogočeno",
-    "Recommended" : "Priporočljivo",
+    "Cron" : "Periodično opravilo",
+    "Sharing" : "Souporaba",
+    "Security" : "Varnost",
+    "Email Server" : "Poštni strežnik",
+    "Log" : "Dnevnik",
     "Authentication error" : "Napaka med overjanjem",
     "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
     "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
     "Unable to change password" : "Ni mogoče spremeniti gesla",
+    "Enabled" : "Omogočeno",
+    "Not enabled" : "Ni omogočeno",
+    "Recommended" : "Priporočljivo",
     "Saved" : "Shranjeno",
     "test email settings" : "preizkusi nastavitve elektronske pošte",
     "If you received this email, the settings seem to be correct." : "Če ste prejeli to sporočilo, so nastavitve pravilne.",
@@ -111,14 +116,12 @@ OC.L10N.register(
     "Connectivity checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
-    "Cron" : "Periodično opravilo",
     "Last cron was executed at %s." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
     "Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
-    "Sharing" : "Souporaba",
     "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
     "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
     "Enforce password protection" : "Vsili zaščito z geslom",
@@ -132,11 +135,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
     "Exclude groups from sharing" : "Izloči skupine iz souporabe",
     "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
-    "Security" : "Varnost",
     "Enforce HTTPS" : "Zahtevaj uporabo HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
-    "Email Server" : "Poštni strežnik",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
     "From address" : "Naslov pošiljatelja",
@@ -150,7 +151,6 @@ OC.L10N.register(
     "Store credentials" : "Shrani poverila",
     "Test email settings" : "Preizkus nastavitev elektronske pošte",
     "Send email" : "Pošlji elektronsko sporočilo",
-    "Log" : "Dnevnik",
     "Log level" : "Raven beleženja",
     "More" : "Več",
     "Less" : "Manj",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index e030c886113..d78b0e41038 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Omogočeno",
-    "Not enabled" : "Ni omogočeno",
-    "Recommended" : "Priporočljivo",
+    "Cron" : "Periodično opravilo",
+    "Sharing" : "Souporaba",
+    "Security" : "Varnost",
+    "Email Server" : "Poštni strežnik",
+    "Log" : "Dnevnik",
     "Authentication error" : "Napaka med overjanjem",
     "Your full name has been changed." : "Vaše polno ime je spremenjeno.",
     "Unable to change full name" : "Ni mogoče spremeniti polnega imena",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Napačno navedeno skrbniško obnovitveno geslo. Preverite geslo in poskusite znova.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Hrbtišče programa ne podpira spreminjanja gesla, je pa uspešno posodobljeno uporabniško šifriranje.",
     "Unable to change password" : "Ni mogoče spremeniti gesla",
+    "Enabled" : "Omogočeno",
+    "Not enabled" : "Ni omogočeno",
+    "Recommended" : "Priporočljivo",
     "Saved" : "Shranjeno",
     "test email settings" : "preizkusi nastavitve elektronske pošte",
     "If you received this email, the settings seem to be correct." : "Če ste prejeli to sporočilo, so nastavitve pravilne.",
@@ -109,14 +114,12 @@
     "Connectivity checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
-    "Cron" : "Periodično opravilo",
     "Last cron was executed at %s." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s. To je več kot uro nazaj. Nekaj je očitno narobe.",
     "Cron was not executed yet!" : "Periodično opravilo cron še ni zagnano!",
     "Execute one task with each page loaded" : "Izvedi eno nalogo z vsako naloženo stranjo.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "Datoteka cron.php je vpisana za periodično opravilo webcron za potrditev sklica vsakih 15 minut pri povezavi preko HTTP.",
     "Use system's cron service to call the cron.php file every 15 minutes." : "Uporabi storitev periodičnih opravil za klic datoteke cron.php vsakih 15 minut.",
-    "Sharing" : "Souporaba",
     "Allow apps to use the Share API" : "Dovoli programom uporabo vmesnika API souporabe",
     "Allow users to share via link" : "Uporabnikom dovoli omogočanje souporabe s povezavami",
     "Enforce password protection" : "Vsili zaščito z geslom",
@@ -130,11 +133,9 @@
     "Allow users to send mail notification for shared files" : "Dovoli uporabnikom pošiljati obvestila o souporabi datotek po elektronski pošti.",
     "Exclude groups from sharing" : "Izloči skupine iz souporabe",
     "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
-    "Security" : "Varnost",
     "Enforce HTTPS" : "Zahtevaj uporabo HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
-    "Email Server" : "Poštni strežnik",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
     "From address" : "Naslov pošiljatelja",
@@ -148,7 +149,6 @@
     "Store credentials" : "Shrani poverila",
     "Test email settings" : "Preizkus nastavitev elektronske pošte",
     "Send email" : "Pošlji elektronsko sporočilo",
-    "Log" : "Dnevnik",
     "Log level" : "Raven beleženja",
     "More" : "Več",
     "Less" : "Manj",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index 6a00beb0e2f..60ad553efea 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -1,6 +1,10 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "Ndarje",
+    "Security" : "Siguria",
+    "Log" : "Historik aktiviteti",
     "Authentication error" : "Gabim autentifikimi",
     "Group already exists" : "Grupi ekziston",
     "Unable to add group" : "E pamundur të shtohet grupi",
@@ -47,15 +51,12 @@ OC.L10N.register(
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
     "Locale not working" : "Locale nuk është funksional",
     "Please double check the <a href='%s'>installation guides</a>." : "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
-    "Sharing" : "Ndarje",
     "Allow apps to use the Share API" : "Lejoni aplikacionet të përdorin share API",
     "Allow public uploads" : "Lejo ngarkimin publik",
     "Expire after " : "Skadon pas",
     "days" : "diitë",
     "Allow resharing" : "Lejo ri-ndarjen",
-    "Security" : "Siguria",
     "Enforce HTTPS" : "Detyro HTTPS",
     "Send mode" : "Mënyra e dërgimit",
     "From address" : "Nga adresa",
@@ -64,7 +65,6 @@ OC.L10N.register(
     "Port" : "Porta",
     "Credentials" : "Kredencialet",
     "Send email" : "Dërgo email",
-    "Log" : "Historik aktiviteti",
     "Log level" : "Niveli i Historikut",
     "More" : "Më tepër",
     "Less" : "M'pak",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index 944d21022d6..852ce5f3004 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -1,4 +1,8 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "Ndarje",
+    "Security" : "Siguria",
+    "Log" : "Historik aktiviteti",
     "Authentication error" : "Gabim autentifikimi",
     "Group already exists" : "Grupi ekziston",
     "Unable to add group" : "E pamundur të shtohet grupi",
@@ -45,15 +49,12 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Moduli PHP 'fileinfo' mungon. Ju këshillojmë me këmbngulje të aktivizoni këtë modul për të arritur rezultate më të mirame identifikimin e tipeve te ndryshme MIME.",
     "Locale not working" : "Locale nuk është funksional",
     "Please double check the <a href='%s'>installation guides</a>." : "Ju lutemi kontrolloni mirë <a href='%s'>shoqëruesin e instalimit</a>.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Kryeni vetëm një veprim me secilën prej faqeve të ngarkuara",
-    "Sharing" : "Ndarje",
     "Allow apps to use the Share API" : "Lejoni aplikacionet të përdorin share API",
     "Allow public uploads" : "Lejo ngarkimin publik",
     "Expire after " : "Skadon pas",
     "days" : "diitë",
     "Allow resharing" : "Lejo ri-ndarjen",
-    "Security" : "Siguria",
     "Enforce HTTPS" : "Detyro HTTPS",
     "Send mode" : "Mënyra e dërgimit",
     "From address" : "Nga adresa",
@@ -62,7 +63,6 @@
     "Port" : "Porta",
     "Credentials" : "Kredencialet",
     "Send email" : "Dërgo email",
-    "Log" : "Historik aktiviteti",
     "Log level" : "Niveli i Historikut",
     "More" : "Më tepër",
     "Less" : "M'pak",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index e978e45a02f..a01d9861750 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "settings",
     {
+    "Sharing" : "Дељење",
+    "Security" : "Безбедност",
+    "Log" : "Бележење",
     "Authentication error" : "Грешка при провери идентитета",
     "Group already exists" : "Група већ постоји",
     "Unable to add group" : "Не могу да додам групу",
@@ -40,14 +43,11 @@ OC.L10N.register(
     "Locale not working" : "Локализација не ради",
     "Please double check the <a href='%s'>installation guides</a>." : "Погледајте <a href='%s'>водиче за инсталацију</a>.",
     "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
-    "Sharing" : "Дељење",
     "Allow apps to use the Share API" : "Дозвољава апликацијама да користе API Share",
     "Allow resharing" : "Дозволи поновно дељење",
-    "Security" : "Безбедност",
     "Enforce HTTPS" : "Наметни HTTPS",
     "Server address" : "Адреса сервера",
     "Port" : "Порт",
-    "Log" : "Бележење",
     "Log level" : "Ниво бележења",
     "More" : "Више",
     "Less" : "Мање",
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 3d9c23be8ba..39858457640 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Sharing" : "Дељење",
+    "Security" : "Безбедност",
+    "Log" : "Бележење",
     "Authentication error" : "Грешка при провери идентитета",
     "Group already exists" : "Група већ постоји",
     "Unable to add group" : "Не могу да додам групу",
@@ -38,14 +41,11 @@
     "Locale not working" : "Локализација не ради",
     "Please double check the <a href='%s'>installation guides</a>." : "Погледајте <a href='%s'>водиче за инсталацију</a>.",
     "Execute one task with each page loaded" : "Изврши један задатак са сваком учитаном страницом",
-    "Sharing" : "Дељење",
     "Allow apps to use the Share API" : "Дозвољава апликацијама да користе API Share",
     "Allow resharing" : "Дозволи поновно дељење",
-    "Security" : "Безбедност",
     "Enforce HTTPS" : "Наметни HTTPS",
     "Server address" : "Адреса сервера",
     "Port" : "Порт",
-    "Log" : "Бележење",
     "Log level" : "Ниво бележења",
     "More" : "Више",
     "Less" : "Мање",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 3ca7dd28c9e..c87c180bb6e 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Aktiverad",
-    "Not enabled" : "Inte aktiverad",
-    "Recommended" : "Rekomenderad",
+    "Cron" : "Cron",
+    "Sharing" : "Dela",
+    "Security" : "Säkerhet",
+    "Email Server" : "E-postserver",
+    "Log" : "Logg",
     "Authentication error" : "Fel vid autentisering",
     "Your full name has been changed." : "Hela ditt namn har ändrats",
     "Unable to change full name" : "Kunde inte ändra hela namnet",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
     "Unable to change password" : "Kunde inte ändra lösenord",
+    "Enabled" : "Aktiverad",
+    "Not enabled" : "Inte aktiverad",
+    "Recommended" : "Rekomenderad",
     "Saved" : "Sparad",
     "test email settings" : "testa e-post inställningar",
     "If you received this email, the settings seem to be correct." : "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
@@ -106,13 +111,11 @@ OC.L10N.register(
     "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "Var god kontrollera <a href='%s'>installationsguiden</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Sista cron kördes vid %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
     "Cron was not executed yet!" : "Cron kördes inte ännu!",
     "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
-    "Sharing" : "Dela",
     "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API",
     "Allow users to share via link" : "Tillåt användare att dela via länk",
     "Enforce password protection" : "Tillämpa lösenordskydd",
@@ -126,11 +129,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Tillåt användare att skicka mailnotifieringar för delade filer",
     "Exclude groups from sharing" : "Exkludera grupp från att dela",
     "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
-    "Security" : "Säkerhet",
     "Enforce HTTPS" : "Kräv HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL",
-    "Email Server" : "E-postserver",
     "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
     "Send mode" : "Sändningsläge",
     "From address" : "Från adress",
@@ -144,7 +145,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP lösenord",
     "Test email settings" : "Testa e-post inställningar",
     "Send email" : "Skicka e-post",
-    "Log" : "Logg",
     "Log level" : "Nivå på loggning",
     "More" : "Mer",
     "Less" : "Mindre",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 9229d8fb670..d89f0b53b89 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Aktiverad",
-    "Not enabled" : "Inte aktiverad",
-    "Recommended" : "Rekomenderad",
+    "Cron" : "Cron",
+    "Sharing" : "Dela",
+    "Security" : "Säkerhet",
+    "Email Server" : "E-postserver",
+    "Log" : "Logg",
     "Authentication error" : "Fel vid autentisering",
     "Your full name has been changed." : "Hela ditt namn har ändrats",
     "Unable to change full name" : "Kunde inte ändra hela namnet",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Felaktigt återställningslösenord för administratör. Kolla lösenordet och prova igen.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Gränssnittet stödjer inte byte av lösenord, men användarnas krypteringsnyckel blev uppdaterad.",
     "Unable to change password" : "Kunde inte ändra lösenord",
+    "Enabled" : "Aktiverad",
+    "Not enabled" : "Inte aktiverad",
+    "Recommended" : "Rekomenderad",
     "Saved" : "Sparad",
     "test email settings" : "testa e-post inställningar",
     "If you received this email, the settings seem to be correct." : "Om du mottog detta e-postmeddelande, verkar dina inställningar vara korrekta.",
@@ -104,13 +109,11 @@
     "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "Var god kontrollera <a href='%s'>installationsguiden</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Sista cron kördes vid %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
     "Cron was not executed yet!" : "Cron kördes inte ännu!",
     "Execute one task with each page loaded" : "Exekvera en uppgift vid varje sidladdning",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php är registrerad som en webcron service att ropa på cron.php varje 15 minuter över http.",
-    "Sharing" : "Dela",
     "Allow apps to use the Share API" : "Tillåt applikationer att använda delat API",
     "Allow users to share via link" : "Tillåt användare att dela via länk",
     "Enforce password protection" : "Tillämpa lösenordskydd",
@@ -124,11 +127,9 @@
     "Allow users to send mail notification for shared files" : "Tillåt användare att skicka mailnotifieringar för delade filer",
     "Exclude groups from sharing" : "Exkludera grupp från att dela",
     "These groups will still be able to receive shares, but not to initiate them." : "Dessa grupper kommer fortfarande kunna ta emot delningar, men inte skapa delningar.",
-    "Security" : "Säkerhet",
     "Enforce HTTPS" : "Kräv HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tvingar klienterna att ansluta till %s via en krypterad anslutning.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Anslut till din %s via HTTPS för att aktivera/deaktivera SSL",
-    "Email Server" : "E-postserver",
     "This is used for sending out notifications." : "Detta används för att skicka ut notifieringar.",
     "Send mode" : "Sändningsläge",
     "From address" : "Från adress",
@@ -142,7 +143,6 @@
     "SMTP Password" : "SMTP lösenord",
     "Test email settings" : "Testa e-post inställningar",
     "Send email" : "Skicka e-post",
-    "Log" : "Logg",
     "Log level" : "Nivå på loggning",
     "More" : "Mer",
     "Less" : "Mindre",
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index 010303a5872..c000b4419de 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "settings",
     {
+    "Cron" : "Cron",
+    "Sharing" : "การแชร์ข้อมูล",
+    "Log" : "บันทึกการเปลี่ยนแปลง",
     "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
     "Group already exists" : "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
     "Unable to add group" : "ไม่สามารถเพิ่มกลุ่มได้",
@@ -32,15 +35,12 @@ OC.L10N.register(
     "None" : "ไม่มี",
     "Login" : "เข้าสู่ระบบ",
     "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
-    "Sharing" : "การแชร์ข้อมูล",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
     "Server address" : "ที่อยู่เซิร์ฟเวอร์",
     "Port" : "พอร์ต",
     "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
-    "Log" : "บันทึกการเปลี่ยนแปลง",
     "Log level" : "ระดับการเก็บบันทึก log",
     "More" : "มาก",
     "Less" : "น้อย",
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index 28a346aab65..a66be05967b 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Cron" : "Cron",
+    "Sharing" : "การแชร์ข้อมูล",
+    "Log" : "บันทึกการเปลี่ยนแปลง",
     "Authentication error" : "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
     "Group already exists" : "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
     "Unable to add group" : "ไม่สามารถเพิ่มกลุ่มได้",
@@ -30,15 +33,12 @@
     "None" : "ไม่มี",
     "Login" : "เข้าสู่ระบบ",
     "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "ประมวลคำสั่งหนึ่งงานในแต่ละครั้งที่มีการโหลดหน้าเว็บ",
-    "Sharing" : "การแชร์ข้อมูล",
     "Allow apps to use the Share API" : "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
     "Allow resharing" : "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
     "Server address" : "ที่อยู่เซิร์ฟเวอร์",
     "Port" : "พอร์ต",
     "Credentials" : "ข้อมูลส่วนตัวสำหรับเข้าระบบ",
-    "Log" : "บันทึกการเปลี่ยนแปลง",
     "Log level" : "ระดับการเก็บบันทึก log",
     "More" : "มาก",
     "Less" : "น้อย",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 1bd3f25cbca..45902d338cf 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Etkin",
-    "Not enabled" : "Etkin değil",
-    "Recommended" : "Önerilen",
+    "Cron" : "Cron",
+    "Sharing" : "Paylaşım",
+    "Security" : "Güvenlik",
+    "Email Server" : "E-Posta Sunucusu",
+    "Log" : "Günlük",
     "Authentication error" : "Kimlik doğrulama hatası",
     "Your full name has been changed." : "Tam adınız değiştirildi.",
     "Unable to change full name" : "Tam adınız değiştirilirken hata",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
     "Unable to change password" : "Parola değiştirilemiyor",
+    "Enabled" : "Etkin",
+    "Not enabled" : "Etkin değil",
+    "Recommended" : "Önerilen",
     "Saved" : "Kaydedildi",
     "test email settings" : "e-posta ayarlarını sına",
     "If you received this email, the settings seem to be correct." : "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Bağlanabilirlik kontrolleri",
     "No problems found" : "Sorun bulunamadı",
     "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
     "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
     "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
     "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.",
-    "Sharing" : "Paylaşım",
     "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",
     "Enforce password protection" : "Parola korumasını zorla",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Paylaşılmış dosyalar için kullanıcıların 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.",
-    "Security" : "Güvenlik",
     "Enforce HTTPS" : "HTTPS bağlantısına zorla",
     "Forces the clients to connect to %s via an encrypted connection." : "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.",
-    "Email Server" : "E-Posta Sunucusu",
     "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
     "Send mode" : "Gönderme kipi",
     "From address" : "Kimden adresi",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Kimlik bilgilerini depola",
     "Test email settings" : "E-posta ayarlarını sına",
     "Send email" : "E-posta gönder",
-    "Log" : "Günlük",
     "Log level" : "Günlük seviyesi",
     "More" : "Daha fazla",
     "Less" : "Daha az",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 02851383df8..543c5c8039c 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Etkin",
-    "Not enabled" : "Etkin değil",
-    "Recommended" : "Önerilen",
+    "Cron" : "Cron",
+    "Sharing" : "Paylaşım",
+    "Security" : "Güvenlik",
+    "Email Server" : "E-Posta Sunucusu",
+    "Log" : "Günlük",
     "Authentication error" : "Kimlik doğrulama hatası",
     "Your full name has been changed." : "Tam adınız değiştirildi.",
     "Unable to change full name" : "Tam adınız değiştirilirken hata",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Hatalı yönetici kurtarma parolası. Lütfen parolayı denetleyip yeniden deneyin.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Arka uç parola değişimini desteklemiyor ancak kullanıcı şifreleme anahtarı başarıyla güncellendi.",
     "Unable to change password" : "Parola değiştirilemiyor",
+    "Enabled" : "Etkin",
+    "Not enabled" : "Etkin değil",
+    "Recommended" : "Önerilen",
     "Saved" : "Kaydedildi",
     "test email settings" : "e-posta ayarlarını sına",
     "If you received this email, the settings seem to be correct." : "Eğer bu e-postayı aldıysanız, ayarlar doğru gibi görünüyor.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Bağlanabilirlik kontrolleri",
     "No problems found" : "Sorun bulunamadı",
     "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
     "Cron was not executed yet!" : "Cron henüz çalıştırılmadı!",
     "Execute one task with each page loaded" : "Yüklenen her sayfa ile bir görev çalıştır",
     "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.",
-    "Sharing" : "Paylaşım",
     "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",
     "Enforce password protection" : "Parola korumasını zorla",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Paylaşılmış dosyalar için kullanıcıların 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.",
-    "Security" : "Güvenlik",
     "Enforce HTTPS" : "HTTPS bağlantısına zorla",
     "Forces the clients to connect to %s via an encrypted connection." : "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.",
-    "Email Server" : "E-Posta Sunucusu",
     "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
     "Send mode" : "Gönderme kipi",
     "From address" : "Kimden adresi",
@@ -155,7 +156,6 @@
     "Store credentials" : "Kimlik bilgilerini depola",
     "Test email settings" : "E-posta ayarlarını sına",
     "Send email" : "E-posta gönder",
-    "Log" : "Günlük",
     "Log level" : "Günlük seviyesi",
     "More" : "Daha fazla",
     "Less" : "Daha az",
diff --git a/settings/l10n/ug.js b/settings/l10n/ug.js
index 76ee878feea..c3ce07cae69 100644
--- a/settings/l10n/ug.js
+++ b/settings/l10n/ug.js
@@ -1,6 +1,9 @@
 OC.L10N.register(
     "settings",
     {
+    "Sharing" : "ھەمبەھىر",
+    "Security" : "بىخەتەرلىك",
+    "Log" : "خاتىرە",
     "Authentication error" : "سالاھىيەت دەلىللەش خاتالىقى",
     "Group already exists" : "گۇرۇپپا مەۋجۇت",
     "Unable to add group" : "گۇرۇپپا قوشقىلى بولمايدۇ",
@@ -36,11 +39,8 @@ OC.L10N.register(
     "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
     "Setup Warning" : "ئاگاھلاندۇرۇش تەڭشەك",
     "Module 'fileinfo' missing" : "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
-    "Sharing" : "ھەمبەھىر",
-    "Security" : "بىخەتەرلىك",
     "Server address" : "مۇلازىمېتىر ئادرىسى",
     "Port" : "ئېغىز",
-    "Log" : "خاتىرە",
     "Log level" : "خاتىرە دەرىجىسى",
     "More" : "تېخىمۇ كۆپ",
     "Less" : "ئاز",
diff --git a/settings/l10n/ug.json b/settings/l10n/ug.json
index babcddc048e..fac830441bd 100644
--- a/settings/l10n/ug.json
+++ b/settings/l10n/ug.json
@@ -1,4 +1,7 @@
 { "translations": {
+    "Sharing" : "ھەمبەھىر",
+    "Security" : "بىخەتەرلىك",
+    "Log" : "خاتىرە",
     "Authentication error" : "سالاھىيەت دەلىللەش خاتالىقى",
     "Group already exists" : "گۇرۇپپا مەۋجۇت",
     "Unable to add group" : "گۇرۇپپا قوشقىلى بولمايدۇ",
@@ -34,11 +37,8 @@
     "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
     "Setup Warning" : "ئاگاھلاندۇرۇش تەڭشەك",
     "Module 'fileinfo' missing" : "بۆلەك «ھۆججەت ئۇچۇرى» يوقالغان",
-    "Sharing" : "ھەمبەھىر",
-    "Security" : "بىخەتەرلىك",
     "Server address" : "مۇلازىمېتىر ئادرىسى",
     "Port" : "ئېغىز",
-    "Log" : "خاتىرە",
     "Log level" : "خاتىرە دەرىجىسى",
     "More" : "تېخىمۇ كۆپ",
     "Less" : "ئاز",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 56080da73a3..494e74f96da 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -1,9 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Увімкнено",
-    "Not enabled" : "Вимкнено",
-    "Recommended" : "Рекомендуємо",
+    "Cron" : "Cron",
+    "Sharing" : "Спільний доступ",
+    "Security" : "Безпека",
+    "Email Server" : "Сервер електронної пошти",
+    "Log" : "Протокол",
     "Authentication error" : "Помилка автентифікації",
     "Your full name has been changed." : "Ваше ім'я було змінене",
     "Unable to change full name" : "Неможливо змінити ім'я",
@@ -33,6 +35,9 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Система не підтримує зміни пароля, але ключ шифрування користувача успішно оновлено.",
     "Unable to change password" : "Неможливо змінити пароль",
+    "Enabled" : "Увімкнено",
+    "Not enabled" : "Вимкнено",
+    "Recommended" : "Рекомендуємо",
     "Saved" : "Збереженно",
     "test email settings" : "перевірити налаштування електронної пошти",
     "If you received this email, the settings seem to be correct." : "Якщо ви отримали цього листа, налаштування вірні.",
@@ -117,14 +122,12 @@ OC.L10N.register(
     "Connectivity checks" : "Перевірка з'єднання",
     "No problems found" : "Проблем не виявленно",
     "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
     "Last cron was executed at %s. This is more than an hour ago, 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 хвилин.",
-    "Sharing" : "Спільний доступ",
     "Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
     "Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
     "Enforce password protection" : "Захист паролем обов'язковий",
@@ -138,11 +141,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
     "Exclude groups from sharing" : "Виключити групи зі спільного доступу",
     "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
-    "Security" : "Безпека",
     "Enforce HTTPS" : "Примусове застосування HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Зобов'язати клієнтів під'єднуватись до %s через шифроване з'єднання.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Будь ласка, під'єднайтесь до цього %s за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
-    "Email Server" : "Сервер електронної пошти",
     "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
     "Send mode" : "Надіслати повідомлення",
     "From address" : "Адреса відправника",
@@ -157,7 +158,6 @@ OC.L10N.register(
     "Store credentials" : "Зберігання облікових даних",
     "Test email settings" : "Перевірити налаштування електронної пошти",
     "Send email" : "Надіслати листа",
-    "Log" : "Протокол",
     "Log level" : "Рівень протоколювання",
     "More" : "Більше",
     "Less" : "Менше",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index f978ee4541a..e5cd13396c3 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -1,7 +1,9 @@
 { "translations": {
-    "Enabled" : "Увімкнено",
-    "Not enabled" : "Вимкнено",
-    "Recommended" : "Рекомендуємо",
+    "Cron" : "Cron",
+    "Sharing" : "Спільний доступ",
+    "Security" : "Безпека",
+    "Email Server" : "Сервер електронної пошти",
+    "Log" : "Протокол",
     "Authentication error" : "Помилка автентифікації",
     "Your full name has been changed." : "Ваше ім'я було змінене",
     "Unable to change full name" : "Неможливо змінити ім'я",
@@ -31,6 +33,9 @@
     "Wrong admin recovery password. Please check the password and try again." : "Неправильний пароль адміністратора для відновлення. Перевірте пароль та спробуйте ще раз.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Система не підтримує зміни пароля, але ключ шифрування користувача успішно оновлено.",
     "Unable to change password" : "Неможливо змінити пароль",
+    "Enabled" : "Увімкнено",
+    "Not enabled" : "Вимкнено",
+    "Recommended" : "Рекомендуємо",
     "Saved" : "Збереженно",
     "test email settings" : "перевірити налаштування електронної пошти",
     "If you received this email, the settings seem to be correct." : "Якщо ви отримали цього листа, налаштування вірні.",
@@ -115,14 +120,12 @@
     "Connectivity checks" : "Перевірка з'єднання",
     "No problems found" : "Проблем не виявленно",
     "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
     "Last cron was executed at %s. This is more than an hour ago, 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 хвилин.",
-    "Sharing" : "Спільний доступ",
     "Allow apps to use the Share API" : "Дозволити програмам використовувати API спільного доступу",
     "Allow users to share via link" : "Дозволити користувачам ділитися через посилання",
     "Enforce password protection" : "Захист паролем обов'язковий",
@@ -136,11 +139,9 @@
     "Allow users to send mail notification for shared files" : "Дозволити користувачам сповіщати листами про спільний доступ до файлів",
     "Exclude groups from sharing" : "Виключити групи зі спільного доступу",
     "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
-    "Security" : "Безпека",
     "Enforce HTTPS" : "Примусове застосування HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Зобов'язати клієнтів під'єднуватись до %s через шифроване з'єднання.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Будь ласка, під'єднайтесь до цього %s за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
-    "Email Server" : "Сервер електронної пошти",
     "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
     "Send mode" : "Надіслати повідомлення",
     "From address" : "Адреса відправника",
@@ -155,7 +156,6 @@
     "Store credentials" : "Зберігання облікових даних",
     "Test email settings" : "Перевірити налаштування електронної пошти",
     "Send email" : "Надіслати листа",
-    "Log" : "Протокол",
     "Log level" : "Рівень протоколювання",
     "More" : "Більше",
     "Less" : "Менше",
diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js
index cebe573d07c..ef9221683d1 100644
--- a/settings/l10n/vi.js
+++ b/settings/l10n/vi.js
@@ -1,7 +1,9 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "Bật",
+    "Cron" : "Cron",
+    "Sharing" : "Chia sẻ",
+    "Log" : "Log",
     "Authentication error" : "Lỗi xác thực",
     "Your full name has been changed." : "Họ và tên đã được thay đổi.",
     "Unable to change full name" : "Họ và tên không thể đổi ",
@@ -17,6 +19,7 @@ OC.L10N.register(
     "Unable to add user to group %s" : "Không thể thêm người dùng vào nhóm %s",
     "Unable to remove user from group %s" : "Không thể xóa người dùng từ nhóm %s",
     "Couldn't update app." : "Không thể cập nhật ứng dụng",
+    "Enabled" : "Bật",
     "Email sent" : "Email đã được gửi",
     "All" : "Tất cả",
     "Please wait...." : "Xin hãy đợi...",
@@ -36,15 +39,12 @@ OC.L10N.register(
     "Login" : "Đăng nhập",
     "Security Warning" : "Cảnh bảo bảo mật",
     "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." : "Thư mục và các tập tin của bạn có thể được truy cập từ Internet. Tập tin .htaccess không làm việc. Chúng tôi đề nghị bạn cấu hình ebserver ,phân quyền lại thư mục dữ liệu và cấp quyền truy cập hoặc di chuyển thư mục dữ liệu bên ngoài tài liệu gốc máy chủ web.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Thực thi tác vụ mỗi khi trang được tải",
-    "Sharing" : "Chia sẻ",
     "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API",
     "Allow resharing" : "Cho phép chia sẻ lại",
     "Server address" : "Địa chỉ máy chủ",
     "Port" : "Cổng",
     "Credentials" : "Giấy chứng nhận",
-    "Log" : "Log",
     "More" : "hơn",
     "Less" : "ít",
     "Version" : "Phiên bản",
diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json
index 2a1cbecc235..d927ecf1661 100644
--- a/settings/l10n/vi.json
+++ b/settings/l10n/vi.json
@@ -1,5 +1,7 @@
 { "translations": {
-    "Enabled" : "Bật",
+    "Cron" : "Cron",
+    "Sharing" : "Chia sẻ",
+    "Log" : "Log",
     "Authentication error" : "Lỗi xác thực",
     "Your full name has been changed." : "Họ và tên đã được thay đổi.",
     "Unable to change full name" : "Họ và tên không thể đổi ",
@@ -15,6 +17,7 @@
     "Unable to add user to group %s" : "Không thể thêm người dùng vào nhóm %s",
     "Unable to remove user from group %s" : "Không thể xóa người dùng từ nhóm %s",
     "Couldn't update app." : "Không thể cập nhật ứng dụng",
+    "Enabled" : "Bật",
     "Email sent" : "Email đã được gửi",
     "All" : "Tất cả",
     "Please wait...." : "Xin hãy đợi...",
@@ -34,15 +37,12 @@
     "Login" : "Đăng nhập",
     "Security Warning" : "Cảnh bảo bảo mật",
     "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." : "Thư mục và các tập tin của bạn có thể được truy cập từ Internet. Tập tin .htaccess không làm việc. Chúng tôi đề nghị bạn cấu hình ebserver ,phân quyền lại thư mục dữ liệu và cấp quyền truy cập hoặc di chuyển thư mục dữ liệu bên ngoài tài liệu gốc máy chủ web.",
-    "Cron" : "Cron",
     "Execute one task with each page loaded" : "Thực thi tác vụ mỗi khi trang được tải",
-    "Sharing" : "Chia sẻ",
     "Allow apps to use the Share API" : "Cho phép các ứng dụng sử dụng chia sẻ API",
     "Allow resharing" : "Cho phép chia sẻ lại",
     "Server address" : "Địa chỉ máy chủ",
     "Port" : "Cổng",
     "Credentials" : "Giấy chứng nhận",
-    "Log" : "Log",
     "More" : "hơn",
     "Less" : "ít",
     "Version" : "Phiên bản",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 77e0a3e9451..3e218c7f104 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "开启",
+    "Cron" : "计划任务",
+    "Sharing" : "共享",
+    "Security" : "安全",
+    "Email Server" : "电子邮件服务器",
+    "Log" : "日志",
     "Authentication error" : "认证错误",
     "Your full name has been changed." : "您的全名已修改。",
     "Unable to change full name" : "无法修改全名",
@@ -31,6 +35,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "错误的管理员恢复密码。请检查密码并重试。",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "后端不支持修改密码，但是用户的加密密码已成功更新。",
     "Unable to change password" : "不能更改密码",
+    "Enabled" : "开启",
     "Saved" : "已保存",
     "test email settings" : "测试电子邮件设置",
     "If you received this email, the settings seem to be correct." : "如果您收到了这封邮件，看起来设置没有问题。",
@@ -112,14 +117,12 @@ OC.L10N.register(
     "Connectivity checks" : "网络连接检查",
     "No problems found" : "未发现问题",
     "Please double check the <a href='%s'>installation guides</a>." : "请认真检查<a href='%s'>安装指南</a>.",
-    "Cron" : "计划任务",
     "Last cron was executed at %s." : "上次定时任务执行于 %s。",
     "Last cron was executed at %s. This is more than an hour ago, 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 文件。",
-    "Sharing" : "共享",
     "Allow apps to use the Share API" : "允许应用软件使用共享API",
     "Allow users to share via link" : "允许用户通过链接分享文件",
     "Enforce password protection" : "强制密码保护",
@@ -133,11 +136,9 @@ OC.L10N.register(
     "Allow users to send mail notification for shared files" : "允许用户发送共享文件的邮件通知",
     "Exclude groups from sharing" : "在分享中排除组",
     "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
-    "Security" : "安全",
     "Enforce HTTPS" : "强制使用 HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "强制客户端通过加密连接连接到%s。",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
-    "Email Server" : "电子邮件服务器",
     "This is used for sending out notifications." : "这被用于发送通知。",
     "Send mode" : "发送模式",
     "From address" : "来自地址",
@@ -151,7 +152,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP 密码",
     "Test email settings" : "测试电子邮件设置",
     "Send email" : "发送邮件",
-    "Log" : "日志",
     "Log level" : "日志级别",
     "More" : "更多",
     "Less" : "更少",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index ddfc5cab5ad..c29270b57d4 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "开启",
+    "Cron" : "计划任务",
+    "Sharing" : "共享",
+    "Security" : "安全",
+    "Email Server" : "电子邮件服务器",
+    "Log" : "日志",
     "Authentication error" : "认证错误",
     "Your full name has been changed." : "您的全名已修改。",
     "Unable to change full name" : "无法修改全名",
@@ -29,6 +33,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "错误的管理员恢复密码。请检查密码并重试。",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "后端不支持修改密码，但是用户的加密密码已成功更新。",
     "Unable to change password" : "不能更改密码",
+    "Enabled" : "开启",
     "Saved" : "已保存",
     "test email settings" : "测试电子邮件设置",
     "If you received this email, the settings seem to be correct." : "如果您收到了这封邮件，看起来设置没有问题。",
@@ -110,14 +115,12 @@
     "Connectivity checks" : "网络连接检查",
     "No problems found" : "未发现问题",
     "Please double check the <a href='%s'>installation guides</a>." : "请认真检查<a href='%s'>安装指南</a>.",
-    "Cron" : "计划任务",
     "Last cron was executed at %s." : "上次定时任务执行于 %s。",
     "Last cron was executed at %s. This is more than an hour ago, 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 文件。",
-    "Sharing" : "共享",
     "Allow apps to use the Share API" : "允许应用软件使用共享API",
     "Allow users to share via link" : "允许用户通过链接分享文件",
     "Enforce password protection" : "强制密码保护",
@@ -131,11 +134,9 @@
     "Allow users to send mail notification for shared files" : "允许用户发送共享文件的邮件通知",
     "Exclude groups from sharing" : "在分享中排除组",
     "These groups will still be able to receive shares, but not to initiate them." : "这些组将仍可以获取分享，但无法向他人分享。",
-    "Security" : "安全",
     "Enforce HTTPS" : "强制使用 HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "强制客户端通过加密连接连接到%s。",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "请经由HTTPS连接到这个%s 实例来启用或禁用强制SSL.",
-    "Email Server" : "电子邮件服务器",
     "This is used for sending out notifications." : "这被用于发送通知。",
     "Send mode" : "发送模式",
     "From address" : "来自地址",
@@ -149,7 +150,6 @@
     "SMTP Password" : "SMTP 密码",
     "Test email settings" : "测试电子邮件设置",
     "Send email" : "发送邮件",
-    "Log" : "日志",
     "Log level" : "日志级别",
     "More" : "更多",
     "Less" : "更少",
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
index 135c31cfb7a..652941492ab 100644
--- a/settings/l10n/zh_HK.js
+++ b/settings/l10n/zh_HK.js
@@ -1,8 +1,8 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "啟用",
     "Wrong password" : "密碼錯誤",
+    "Enabled" : "啟用",
     "Saved" : "已儲存",
     "Email sent" : "郵件已傳",
     "Sending..." : "發送中...",
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
index 648713d6835..2d07f517691 100644
--- a/settings/l10n/zh_HK.json
+++ b/settings/l10n/zh_HK.json
@@ -1,6 +1,6 @@
 { "translations": {
-    "Enabled" : "啟用",
     "Wrong password" : "密碼錯誤",
+    "Enabled" : "啟用",
     "Saved" : "已儲存",
     "Email sent" : "郵件已傳",
     "Sending..." : "發送中...",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 7085ec1b685..9a3f4e60ea5 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -1,7 +1,11 @@
 OC.L10N.register(
     "settings",
     {
-    "Enabled" : "已啓用",
+    "Cron" : "Cron",
+    "Sharing" : "分享",
+    "Security" : "安全性",
+    "Email Server" : "郵件伺服器",
+    "Log" : "紀錄",
     "Authentication error" : "認證錯誤",
     "Your full name has been changed." : "您的全名已變更。",
     "Unable to change full name" : "無法變更全名",
@@ -26,6 +30,7 @@ OC.L10N.register(
     "Wrong admin recovery password. Please check the password and try again." : "錯誤的管理者還原密碼",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "後端不支援變更密碼，但成功更新使用者的加密金鑰",
     "Unable to change password" : "無法修改密碼",
+    "Enabled" : "已啓用",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
     "If you received this email, the settings seem to be correct." : "假如您收到這個郵件，此設定看起來是正確的。",
@@ -84,22 +89,18 @@ OC.L10N.register(
     "This means that there might be problems with certain characters in file names." : "這個意思是指在檔名中使用一些字元可能會有問題",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "請參考<a href='%s'>安裝指南</a>。",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "最後的排程已執行於 %s。",
     "Last cron was executed at %s. This is more than an hour ago, 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." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
-    "Sharing" : "分享",
     "Allow apps to use the Share API" : "允許 apps 使用分享 API",
     "Allow public uploads" : "允許任何人上傳",
     "Allow resharing" : "允許轉貼分享",
     "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
-    "Security" : "安全性",
     "Enforce HTTPS" : "強制啟用 HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "強迫用戶端使用加密連線連接到 %s",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。",
-    "Email Server" : "郵件伺服器",
     "This is used for sending out notifications." : "這是使用於寄送通知。",
     "Send mode" : "寄送模式",
     "From address" : "寄件地址",
@@ -112,7 +113,6 @@ OC.L10N.register(
     "SMTP Password" : "SMTP 密碼",
     "Test email settings" : "測試郵件設定",
     "Send email" : "寄送郵件",
-    "Log" : "紀錄",
     "Log level" : "紀錄層級",
     "More" : "更多",
     "Less" : "更少",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index 178778efeed..b7ef00d523c 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -1,5 +1,9 @@
 { "translations": {
-    "Enabled" : "已啓用",
+    "Cron" : "Cron",
+    "Sharing" : "分享",
+    "Security" : "安全性",
+    "Email Server" : "郵件伺服器",
+    "Log" : "紀錄",
     "Authentication error" : "認證錯誤",
     "Your full name has been changed." : "您的全名已變更。",
     "Unable to change full name" : "無法變更全名",
@@ -24,6 +28,7 @@
     "Wrong admin recovery password. Please check the password and try again." : "錯誤的管理者還原密碼",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "後端不支援變更密碼，但成功更新使用者的加密金鑰",
     "Unable to change password" : "無法修改密碼",
+    "Enabled" : "已啓用",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
     "If you received this email, the settings seem to be correct." : "假如您收到這個郵件，此設定看起來是正確的。",
@@ -82,22 +87,18 @@
     "This means that there might be problems with certain characters in file names." : "這個意思是指在檔名中使用一些字元可能會有問題",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "請參考<a href='%s'>安裝指南</a>。",
-    "Cron" : "Cron",
     "Last cron was executed at %s." : "最後的排程已執行於 %s。",
     "Last cron was executed at %s. This is more than an hour ago, 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." : "已經與 webcron 服務註冊好，將會每15分鐘呼叫 cron.php",
-    "Sharing" : "分享",
     "Allow apps to use the Share API" : "允許 apps 使用分享 API",
     "Allow public uploads" : "允許任何人上傳",
     "Allow resharing" : "允許轉貼分享",
     "Allow users to send mail notification for shared files" : "允許使用者寄送有關分享檔案的郵件通知",
-    "Security" : "安全性",
     "Enforce HTTPS" : "強制啟用 HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "強迫用戶端使用加密連線連接到 %s",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "請使用 HTTPS 連線到 %s 以啓用或停用強制 SSL 加密。",
-    "Email Server" : "郵件伺服器",
     "This is used for sending out notifications." : "這是使用於寄送通知。",
     "Send mode" : "寄送模式",
     "From address" : "寄件地址",
@@ -110,7 +111,6 @@
     "SMTP Password" : "SMTP 密碼",
     "Test email settings" : "測試郵件設定",
     "Send email" : "寄送郵件",
-    "Log" : "紀錄",
     "Log level" : "紀錄層級",
     "More" : "更多",
     "Less" : "更少",
-- 
GitLab


From d30fd2354493902524d77438eb0e4195df4883a1 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 31 Oct 2014 11:21:00 +0100
Subject: [PATCH 279/616] Clear session before setup

Fixes https://github.com/owncloud/core/issues/11861
---
 lib/base.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 58695f31849..fb35db1e2c7 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -716,7 +716,8 @@ class OC {
 		OC::loadAppClassPaths();
 
 		// Check if ownCloud is installed or in maintenance (update) mode
-		if (!OC_Config::getValue('installed', false)) {
+		if (!\OC::$server->getConfig()->getSystemValue('installed', false)) {
+			\OC::$server->getSession()->clear();
 			$controller = new OC\Core\Setup\Controller(\OC::$server->getConfig());
 			$controller->run($_POST);
 			exit();
-- 
GitLab


From c7dc656b2bf956758dbf8979ff6b7597d627b884 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 23 Jun 2014 23:57:44 +0200
Subject: [PATCH 280/616] Added script to build the JS documentation

---
 .gitignore     |  1 +
 buildjsdocs.sh | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100755 buildjsdocs.sh

diff --git a/.gitignore b/.gitignore
index a36fd98b79f..c0d44301d57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,6 +89,7 @@ nbproject
 
 # nodejs
 /build/lib/
+/build/jsdocs/
 /npm-debug.log
 
 
diff --git a/buildjsdocs.sh b/buildjsdocs.sh
new file mode 100755
index 00000000000..ef18dc8c9a9
--- /dev/null
+++ b/buildjsdocs.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# ownCloud
+#
+# Run JS tests
+#
+# @author Vincent Petry
+# @copyright 2014 Vincent Petry <pvince81@owncloud.com>
+#
+NPM="$(which npm 2>/dev/null)"
+PREFIX="build"
+OUTPUT_DIR="build/jsdocs"
+
+JS_FILES="core/js/*.js apps/*/js/*.js"
+
+if test -z "$NPM"
+then
+	echo 'Node JS >= 0.8 is required to build the documentation' >&2
+	exit 1
+fi
+
+# update/install test packages
+mkdir -p "$PREFIX" && $NPM install --link --prefix "$PREFIX" jsdoc || exit 3
+
+JSDOC_BIN="$(which jsdoc 2>/dev/null)"
+
+# If not installed globally, try local version
+if test -z "$JSDOC_BIN"
+then
+	JSDOC_BIN="$PREFIX/node_modules/jsdoc/jsdoc.js"
+fi
+
+if test -z "$JSDOC_BIN"
+then
+	echo 'jsdoc executable not found' >&2
+	exit 2
+fi
+
+mkdir -p "$OUTPUT_DIR"
+
+NODE_PATH="$PREFIX/node_modules" $JSDOC_BIN -d "$OUTPUT_DIR" $JS_FILES
+
-- 
GitLab


From 0f3e6cb50af06bf3a64ea7f1abd360c53fa0bf8c Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 23 Jun 2014 23:56:10 +0200
Subject: [PATCH 281/616] Improved Javascript docs for JSDoc

Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
---
 apps/files/js/app.js                     |  25 ++++-
 apps/files/js/breadcrumb.js              |  28 ++++-
 apps/files/js/file-upload.js             |   2 +-
 apps/files/js/fileactions.js             |  41 ++++++-
 apps/files/js/filelist.js                | 133 ++++++++++++++++++-----
 apps/files/js/files.js                   |   5 +-
 apps/files/js/filesummary.js             |   7 +-
 apps/files/js/navigation.js              |  11 ++
 apps/files/js/upload.js                  |   1 -
 apps/files_encryption/js/encryption.js   |   4 +
 apps/files_external/js/app.js            |   6 +
 apps/files_external/js/mountsfilelist.js |  33 +++++-
 apps/files_sharing/js/app.js             |   6 +
 apps/files_sharing/js/public.js          |   8 ++
 apps/files_sharing/js/share.js           |  18 ++-
 apps/files_sharing/js/sharedfilelist.js  |  52 ++++++++-
 apps/files_trashbin/js/app.js            |   6 +
 apps/files_trashbin/js/filelist.js       |  19 +++-
 apps/files_versions/js/versions.js       |   2 +
 core/js/config.js                        |   3 +
 core/js/eventsource.js                   |  21 ++++
 core/js/js.js                            |  42 +++++--
 core/js/oc-dialogs.js                    |   1 +
 23 files changed, 403 insertions(+), 71 deletions(-)

diff --git a/apps/files/js/app.js b/apps/files/js/app.js
index 89098e3a8a3..ee5330485e7 100644
--- a/apps/files/js/app.js
+++ b/apps/files/js/app.js
@@ -15,12 +15,34 @@
 (function() {
 
 	if (!OCA.Files) {
+		/**
+		 * Namespace for the files app
+		 * @namespace OCA.Files
+		 */
 		OCA.Files = {};
 	}
 
-	var App = {
+	/**
+	 * @namespace OCA.Files.App
+	 */
+	OCA.Files.App = {
+		/**
+		 * Navigation control
+		 *
+		 * @member {OCA.Files.Navigation}
+		 */
 		navigation: null,
 
+		/**
+		 * File list for the "All files" section.
+		 *
+		 * @member {OCA.Files.FileList}
+		 */
+		fileList: null,
+
+		/**
+		 * Initializes the files app
+		 */
 		initialize: function() {
 			this.navigation = new OCA.Files.Navigation($('#app-navigation'));
 
@@ -191,7 +213,6 @@
 			OC.Util.History.pushState(params);
 		}
 	};
-	OCA.Files.App = App;
 })();
 
 $(document).ready(function() {
diff --git a/apps/files/js/breadcrumb.js b/apps/files/js/breadcrumb.js
index 8df9b7ee6fe..af4e48c8f8c 100644
--- a/apps/files/js/breadcrumb.js
+++ b/apps/files/js/breadcrumb.js
@@ -19,10 +19,17 @@
 *
 */
 
-/* global OC */
 (function() {
 	/**
-	 * Creates an breadcrumb element in the given container
+	 * @class BreadCrumb
+	 * @memberof OCA.Files
+	 * @classdesc Breadcrumbs that represent the current path.
+	 *
+	 * @param {Object} [options] options
+	 * @param {Function} [options.onClick] click event handler
+	 * @param {Function} [options.onDrop] drop event handler
+	 * @param {Function} [options.getCrumbUrl] callback that returns
+	 * the URL of a given breadcrumb
 	 */
 	var BreadCrumb = function(options){
 		this.$el = $('<div class="breadcrumb"></div>');
@@ -37,12 +44,17 @@
 			this.getCrumbUrl = options.getCrumbUrl;
 		}
 	};
+	/**
+	 * @memberof OCA.Files
+	 */
 	BreadCrumb.prototype = {
 		$el: null,
 		dir: null,
 
 		/**
 		 * Total width of all breadcrumbs
+		 * @type int
+		 * @private
 		 */
 		totalWidth: 0,
 		breadcrumbs: [],
@@ -64,8 +76,9 @@
 
 		/**
 		 * Returns the full URL to the given directory
-		 * @param part crumb data as map
-		 * @param index crumb index
+		 *
+		 * @param {Object.<String, String>} part crumb data as map
+		 * @param {int} index crumb index
 		 * @return full URL
 		 */
 		getCrumbUrl: function(part, index) {
@@ -121,8 +134,9 @@
 
 		/**
 		 * Makes a breadcrumb structure based on the given path
-		 * @param dir path to split into a breadcrumb structure
-		 * @return array of map {dir: path, name: displayName}
+		 *
+		 * @param {String} dir path to split into a breadcrumb structure
+		 * @return {Object.<String, String>} map of {dir: path, name: displayName}
 		 */
 		_makeCrumbs: function(dir) {
 			var crumbs = [];
@@ -166,6 +180,8 @@
 
 		/**
 		 * Show/hide breadcrumbs to fit the given width
+		 * 
+		 * @param {int} availableWidth available width
 		 */
 		setMaxWidth: function (availableWidth) {
 			if (this.availableWidth !== availableWidth) {
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 460c2435642..ab450dc5cac 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -49,7 +49,7 @@ function supportAjaxUploadWithProgress() {
 
 /**
  * keeps track of uploads in progress and implements callbacks for the conflicts dialog
- * @type {OC.Upload}
+ * @namespace
  */
 OC.Upload = {
 	_uploads: [],
diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 8ae0d8f1b2e..f15ad744b71 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -13,11 +13,14 @@
 
 	/**
 	 * Construct a new FileActions instance
+	 * @constructs FileActions
+	 * @memberof OCA.Files
 	 */
 	var FileActions = function() {
 		this.initialize();
-	}
+	};
 	FileActions.prototype = {
+		/** @lends FileActions.prototype */
 		actions: {},
 		defaults: {},
 		icons: {},
@@ -31,9 +34,14 @@
 		/**
 		 * List of handlers to be notified whenever a register() or
 		 * setDefault() was called.
+		 *
+		 * @member {Function[]}
 		 */
 		_updateListeners: {},
 
+		/**
+		 * @private
+		 */
 		initialize: function() {
 			this.clear();
 			// abusing jquery for events until we get a real event lib
@@ -45,7 +53,7 @@
 		 * Adds an event handler
 		 *
 		 * @param {String} eventName event name
-		 * @param Function callback
+		 * @param {Function} callback
 		 */
 		on: function(eventName, callback) {
 			this.$el.on(eventName, callback);
@@ -75,7 +83,7 @@
 		 * Merges the actions from the given fileActions into
 		 * this instance.
 		 *
-		 * @param fileActions instance of OCA.Files.FileActions
+		 * @param {OCA.Files.FileActions} fileActions instance of OCA.Files.FileActions
 		 */
 		merge: function(fileActions) {
 			var self = this;
@@ -113,8 +121,9 @@
 		 * to the name given in action.name
 		 * @param {String} action.mime mime type
 		 * @param {int} action.permissions permissions
-		 * @param {(Function|String)} action.icon icon
-		 * @param {Function} action.actionHandler function that performs the action
+		 * @param {(Function|String)} action.icon icon path to the icon or function
+		 * that returns it
+		 * @param {OCA.Files.FileActions~actionHandler} action.actionHandler action handler function
 		 */
 		registerAction: function (action) {
 			var mime = action.mime;
@@ -130,6 +139,9 @@
 			this.icons[name] = action.icon;
 			this._notifyUpdateListeners('registerAction', {action: action});
 		},
+		/**
+		 * Clears all registered file actions.
+		 */
 		clear: function() {
 			this.actions = {};
 			this.defaults = {};
@@ -137,6 +149,12 @@
 			this.currentFile = null;
 			this._updateListeners = [];
 		},
+		/**
+		 * Sets the default action for a given mime type.
+		 *
+		 * @param {String} mime mime type
+		 * @param {String} name action name
+		 */
 		setDefault: function (mime, name) {
 			this.defaults[mime] = name;
 			this._notifyUpdateListeners('setDefault', {defaultAction: {mime: mime, name: name}});
@@ -370,6 +388,18 @@
 
 	OCA.Files.FileActions = FileActions;
 
+	/**
+	 * Action handler function for file actions
+	 *
+	 * @callback OCA.Files.FileActions~actionHandler
+	 * @param {String} fileName name of the clicked file
+	 * @param context context
+	 * @param {String} context.dir directory of the file
+	 * @param context.$file jQuery element of the file
+	 * @param {OCA.Files.FileList} context.fileList the FileList instance on which the action occurred
+	 * @param {OCA.Files.FileActions} context.fileActions the FileActions instance on which the action occurred
+	 */
+
 	// global file actions to be used by all lists
 	OCA.Files.fileActions = new OCA.Files.FileActions();
 	OCA.Files.legacyFileActions = new OCA.Files.FileActions();
@@ -380,6 +410,7 @@
 	// their actions on. Since legacy apps are very likely to break with other
 	// FileList views than the main one ("All files"), actions registered
 	// through window.FileActions will be limited to the main file list.
+	// @deprecated use OCA.Files.FileActions instead
 	window.FileActions = OCA.Files.legacyFileActions;
 	window.FileActions.register = function (mime, name, permissions, icon, action, displayName) {
 		console.warn('FileActions.register() is deprecated, please use OCA.Files.fileActions.register() instead', arguments);
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index cf1d9780d99..bec0155e90e 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -10,13 +10,26 @@
 
 (function() {
 	/**
+	 * @class OCA.Files.FileList
+	 * @classdesc
+	 *
 	 * The FileList class manages a file list view.
 	 * A file list view consists of a controls bar and
 	 * a file list table.
+	 *
+	 * @param $el container element with existing markup for the #controls
+	 * and a table
+	 * @param [options] map of options, see other parameters
+	 * @param [options.scrollContainer] scrollable container, defaults to $(window)
+	 * @param [options.dragOptions] drag options, disabled by default
+	 * @param [options.folderDropOptions] folder drop options, disabled by default
 	 */
 	var FileList = function($el, options) {
 		this.initialize($el, options);
 	};
+	/**
+	 * @memberof OCA.Files
+	 */
 	FileList.prototype = {
 		SORT_INDICATOR_ASC_CLASS: 'icon-triangle-n',
 		SORT_INDICATOR_DESC_CLASS: 'icon-triangle-s',
@@ -41,15 +54,27 @@
 		 */
 		$fileList: null,
 
+		/**
+		 * @type OCA.Files.BreadCrumb
+		 */
 		breadcrumb: null,
 
 		/**
-		 * Instance of FileSummary
+		 * @type OCA.Files.FileSummary
 		 */
 		fileSummary: null,
+
+		/**
+		 * Whether the file list was initialized already.
+		 * @type boolean
+		 */
 		initialized: false,
 
-		// number of files per page, calculated dynamically
+		/**
+		 * Number of files per page
+		 *
+		 * @return {int} page size
+		 */
 		pageSize: function() {
 			return Math.ceil(this.$container.height() / 50);
 		},
@@ -57,37 +82,44 @@
 		/**
 		 * Array of files in the current folder.
 		 * The entries are of file data.
+		 *
+		 * @type Array.<Object>
 		 */
 		files: [],
 
 		/**
 		 * File actions handler, defaults to OCA.Files.FileActions
+		 * @type OCA.Files.FileActions
 		 */
 		fileActions: null,
 
 		/**
 		 * Map of file id to file data
+		 * @type Object.<int, Object>
 		 */
 		_selectedFiles: {},
 
 		/**
 		 * Summary of selected files.
-		 * Instance of FileSummary.
+		 * @type OCA.Files.FileSummary
 		 */
 		_selectionSummary: null,
 
 		/**
 		 * Sort attribute
+		 * @type String
 		 */
 		_sort: 'name',
 
 		/**
 		 * Sort direction: 'asc' or 'desc'
+		 * @type String
 		 */
 		_sortDirection: 'asc',
 
 		/**
 		 * Sort comparator function for the current sort
+		 * @type Function
 		 */
 		_sortComparator: null,
 
@@ -100,6 +132,7 @@
 
 		/**
 		 * Current directory
+		 * @type String
 		 */
 		_currentDirectory: null,
 
@@ -116,6 +149,7 @@
 		 * @param options.dragOptions drag options, disabled by default
 		 * @param options.folderDropOptions folder drop options, disabled by default
 		 * @param options.scrollTo name of file to scroll to after the first load
+		 * @private
 		 */
 		initialize: function($el, options) {
 			var self = this;
@@ -192,6 +226,11 @@
 			this.fileActions.off('setDefault', this._onFileActionsUpdated);
 		},
 
+		/**
+		 * Initializes the file actions, set up listeners.
+		 *
+		 * @param {OCA.Files.FileActions} fileActions file actions
+		 */
 		_initFileActions: function(fileActions) {
 			this.fileActions = fileActions;
 			if (!this.fileActions) {
@@ -588,8 +627,8 @@
 		},
 		/**
 		 * Creates a new table row element using the given file data.
-		 * @param fileData map of file attributes
-		 * @param options map of attribute "loading" whether the entry is currently loading
+		 * @param {OCA.Files.FileInfo} fileData file info attributes
+		 * @param options map of attributes
 		 * @return new tr element (not appended to the table)
 		 */
 		_createRow: function(fileData, options) {
@@ -728,12 +767,14 @@
 		 * Adds an entry to the files array and also into the DOM
 		 * in a sorted manner.
 		 *
-		 * @param fileData map of file attributes
-		 * @param options map of attributes:
-		 * @param options.updateSummary true to update the summary after adding (default), false otherwise
-		 * @param options.silent true to prevent firing events like "fileActionsReady"
-		 * @param options.animate true to animate preview loading (defaults to true here)
-		 * @param options.scrollTo true to automatically scroll to the file's location
+		 * @param {OCA.Files.FileInfo} fileData map of file attributes
+		 * @param {Object} [options] map of attributes
+		 * @param {boolean} [options.updateSummary] true to update the summary
+		 * after adding (default), false otherwise. Defaults to true.
+		 * @param {boolean} [options.silent] true to prevent firing events like "fileActionsReady",
+		 * defaults to false.
+		 * @param {boolean} [options.animate] true to animate the thumbnail image after load
+		 * defaults to true.
 		 * @return new tr element (not appended to the table)
 		 */
 		add: function(fileData, options) {
@@ -799,11 +840,13 @@
 		 * Creates a new row element based on the given attributes
 		 * and returns it.
 		 *
-		 * @param fileData map of file attributes
-		 * @param options map of attributes:
-		 * - "index" optional index at which to insert the element
-		 * - "updateSummary" true to update the summary after adding (default), false otherwise
-		 * - "animate" true to animate the preview rendering
+		 * @param {OCA.Files.FileInfo} fileData map of file attributes
+		 * @param {Object} [options] map of attributes
+		 * @param {int} [options.index] index at which to insert the element
+		 * @param {boolean} [options.updateSummary] true to update the summary
+		 * after adding (default), false otherwise. Defaults to true.
+		 * @param {boolean} [options.animate] true to animate the thumbnail image after load
+		 * defaults to true.
 		 * @return new tr element (not appended to the table)
 		 */
 		_renderRow: function(fileData, options) {
@@ -870,6 +913,7 @@
 		},
 		/**
 		 * Returns the current directory
+		 * @method getCurrentDirectory
 		 * @return current directory
 		 */
 		getCurrentDirectory: function(){
@@ -1051,7 +1095,10 @@
 
 		/**
 		 * Generates a preview URL based on the URL space.
-		 * @param urlSpec map with {x: width, y: height, file: file path}
+		 * @param urlSpec attributes for the URL
+		 * @param {int} urlSpec.x width
+		 * @param {int} urlSpec.y height
+		 * @param {String} urlSpec.file path to the file
 		 * @return preview URL
 		 */
 		generatePreviewUrl: function(urlSpec) {
@@ -1158,8 +1205,9 @@
 		/**
 		 * Removes a file entry from the list
 		 * @param name name of the file to remove
-		 * @param options optional options as map:
-		 * "updateSummary": true to update the summary (default), false otherwise
+		 * @param {Object} [options] map of attributes
+		 * @param {boolean} [options.updateSummary] true to update the summary
+		 * after removing, false otherwise. Defaults to true.
 		 * @return deleted element
 		 */
 		remove: function(name, options){
@@ -1201,6 +1249,8 @@
 		 * Finds the index of the row before which the given
 		 * fileData should be inserted, considering the current
 		 * sorting
+		 *
+		 * @param {OCA.Files.FileInfo} fileData file info
 		 */
 		_findInsertionIndex: function(fileData) {
 			var index = 0;
@@ -1515,7 +1565,7 @@
 		/**
 		 * Shows the loading mask.
 		 *
-		 * @see #hideMask
+		 * @see OCA.Files.FileList#hideMask
 		 */
 		showMask: function() {
 			// in case one was shown before
@@ -1536,7 +1586,7 @@
 		},
 		/**
 		 * Hide the loading mask.
-		 * @see #showMask
+		 * @see OCA.Files.FileList#showMask
 		 */
 		hideMask: function() {
 			this.$el.find('.mask').remove();
@@ -1961,15 +2011,17 @@
 
 	/**
 	 * Sort comparators.
+	 * @namespace OCA.Files.FileList.Comparators
+	 * @private
 	 */
 	FileList.Comparators = {
 		/**
 		 * Compares two file infos by name, making directories appear
 		 * first.
 		 *
-		 * @param fileInfo1 file info
-		 * @param fileInfo2 file info
-		 * @return -1 if the first file must appear before the second one,
+		 * @param {OCA.Files.FileInfo} fileInfo1 file info
+		 * @param {OCA.Files.FileInfo} fileInfo2 file info
+		 * @return {int} -1 if the first file must appear before the second one,
 		 * 0 if they are identify, 1 otherwise.
 		 */
 		name: function(fileInfo1, fileInfo2) {
@@ -1984,9 +2036,9 @@
 		/**
 		 * Compares two file infos by size.
 		 *
-		 * @param fileInfo1 file info
-		 * @param fileInfo2 file info
-		 * @return -1 if the first file must appear before the second one,
+		 * @param {OCA.Files.FileInfo} fileInfo1 file info
+		 * @param {OCA.Files.FileInfo} fileInfo2 file info
+		 * @return {int} -1 if the first file must appear before the second one,
 		 * 0 if they are identify, 1 otherwise.
 		 */
 		size: function(fileInfo1, fileInfo2) {
@@ -1995,9 +2047,9 @@
 		/**
 		 * Compares two file infos by timestamp.
 		 *
-		 * @param fileInfo1 file info
-		 * @param fileInfo2 file info
-		 * @return -1 if the first file must appear before the second one,
+		 * @param {OCA.Files.FileInfo} fileInfo1 file info
+		 * @param {OCA.Files.FileInfo} fileInfo2 file info
+		 * @return {int} -1 if the first file must appear before the second one,
 		 * 0 if they are identify, 1 otherwise.
 		 */
 		mtime: function(fileInfo1, fileInfo2) {
@@ -2005,6 +2057,27 @@
 		}
 	};
 
+	/**
+	 * File info attributes.
+	 *
+	 * @todo make this a real class in the future
+	 * @typedef {Object} OCA.Files.FileInfo
+	 *
+	 * @property {int} id file id
+	 * @property {String} name file name
+	 * @property {String} [path] file path, defaults to the list's current path
+	 * @property {String} mimetype mime type
+	 * @property {String} type "file" for files or "dir" for directories
+	 * @property {int} permissions file permissions
+	 * @property {int} mtime modification time in milliseconds
+	 * @property {boolean} [isShareMountPoint] whether the file is a share mount
+	 * point
+	 * @property {boolean} [isPreviewAvailable] whether a preview is available
+	 * for the given file type
+	 * @property {String} [icon] path to the mime type icon
+	 * @property {String} etag etag of the file
+	 */
+
 	OCA.Files.FileList = FileList;
 })();
 
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index df268fea6de..b11ef03eab2 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -195,7 +195,10 @@
 
 		/**
 		 * Generates a preview URL based on the URL space.
-		 * @param urlSpec map with {x: width, y: height, file: file path}
+		 * @param urlSpec attributes for the URL
+		 * @param {int} urlSpec.x width
+		 * @param {int} urlSpec.y height
+		 * @param {String} urlSpec.file path to the file
 		 * @return preview URL
 		 * @deprecated used OCA.Files.FileList.generatePreviewUrl instead
 		 */
diff --git a/apps/files/js/filesummary.js b/apps/files/js/filesummary.js
index ca70259335c..f83eb54678b 100644
--- a/apps/files/js/filesummary.js
+++ b/apps/files/js/filesummary.js
@@ -19,14 +19,15 @@
 *
 */
 
-/* global OC, n, t */
-
 (function() {
 	/**
 	 * The FileSummary class encapsulates the file summary values and
 	 * the logic to render it in the given container
+	 *
+	 * @constructs FileSummary
+	 * @memberof OCA.Files
+	 *
 	 * @param $tr table row element
-	 * $param summary optional initial summary value
 	 */
 	var FileSummary = function($tr) {
 		this.$el = $tr;
diff --git a/apps/files/js/navigation.js b/apps/files/js/navigation.js
index b959e016e8c..be385f21f50 100644
--- a/apps/files/js/navigation.js
+++ b/apps/files/js/navigation.js
@@ -13,10 +13,19 @@
 
 (function() {
 
+	/**
+	 * @class OCA.Files.Navigation
+	 * @classdesc Navigation control for the files app sidebar.
+	 *
+	 * @param $el element containing the navigation
+	 */
 	var Navigation = function($el) {
 		this.initialize($el);
 	};
 
+	/**
+	 * @memberof OCA.Files
+	 */
 	Navigation.prototype = {
 
 		/**
@@ -31,6 +40,8 @@
 
 		/**
 		 * Initializes the navigation from the given container
+		 *
+		 * @private
 		 * @param $el element containing the navigation
 		 */
 		initialize: function($el) {
diff --git a/apps/files/js/upload.js b/apps/files/js/upload.js
index 617cf4b1c1d..518608615e0 100644
--- a/apps/files/js/upload.js
+++ b/apps/files/js/upload.js
@@ -8,7 +8,6 @@
  *
  */
 
-/* global OC */
 function Upload(fileSelector) {
 	if ($.support.xhrFileUpload) {
 		return new XHRUpload(fileSelector.target.files);
diff --git a/apps/files_encryption/js/encryption.js b/apps/files_encryption/js/encryption.js
index 65ffabe55e6..d2d1c3a1fc5 100644
--- a/apps/files_encryption/js/encryption.js
+++ b/apps/files_encryption/js/encryption.js
@@ -5,6 +5,10 @@
  * See the COPYING-README file.
  */
 
+/**
+ * @namespace
+ * @memberOf OC
+ */
 OC.Encryption={
 	MIGRATION_OPEN:0,
 	MIGRATION_COMPLETED:1,
diff --git a/apps/files_external/js/app.js b/apps/files_external/js/app.js
index 58ad1a0f6ef..bf853f926dc 100644
--- a/apps/files_external/js/app.js
+++ b/apps/files_external/js/app.js
@@ -9,8 +9,14 @@
  */
 
 if (!OCA.External) {
+	/**
+	 * @namespace
+	 */
 	OCA.External = {};
 }
+/**
+ * @namespace
+ */
 OCA.External.App = {
 
 	fileList: null,
diff --git a/apps/files_external/js/mountsfilelist.js b/apps/files_external/js/mountsfilelist.js
index 20bf0f785db..c45faafd9bf 100644
--- a/apps/files_external/js/mountsfilelist.js
+++ b/apps/files_external/js/mountsfilelist.js
@@ -10,15 +10,29 @@
 (function() {
 
 	/**
-	 * External storage file list
-	 */
+	 * @class OCA.External.FileList
+	 * @augments OCA.Files.FileList
+	 *
+	 * @classdesc External storage file list.
+	 *
+	 * Displays a list of mount points visible
+	 * for the current user.
+	 *
+	 * @param $el container element with existing markup for the #controls
+	 * and a table
+	 * @param [options] map of options, see other parameters
+	 **/
 	var FileList = function($el, options) {
 		this.initialize($el, options);
 	};
 
-	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, {
+	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
+		/** @lends OCA.External.FileList.prototype */ {
 		appName: 'External storage',
 
+		/**
+		 * @private
+		 */
 		initialize: function($el, options) {
 			OCA.Files.FileList.prototype.initialize.apply(this, arguments);
 			if (this.initialized) {
@@ -26,6 +40,9 @@
 			}
 		},
 
+		/**
+		 * @param {OCA.External.MountPointInfo} fileData
+		 */
 		_createRow: function(fileData) {
 			// TODO: hook earlier and render the whole row here
 			var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
@@ -114,5 +131,15 @@
 		}
 	});
 
+	/**
+	 * Mount point info attributes.
+	 *
+	 * @typedef {Object} OCA.External.MountPointInfo
+	 *
+	 * @property {String} name mount point name
+	 * @property {String} scope mount point scope "personal" or "system"
+	 * @property {String} backend external storage backend name
+	 */
+
 	OCA.External.FileList = FileList;
 })();
diff --git a/apps/files_sharing/js/app.js b/apps/files_sharing/js/app.js
index 1a3bfac5b97..1314304c567 100644
--- a/apps/files_sharing/js/app.js
+++ b/apps/files_sharing/js/app.js
@@ -9,8 +9,14 @@
  */
 
 if (!OCA.Sharing) {
+	/**
+	 * @namespace OCA.Sharing
+	 */
 	OCA.Sharing = {};
 }
+/**
+ * @namespace
+ */
 OCA.Sharing.App = {
 
 	_inFileList: null,
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index c4b5508692e..52679a7158d 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -16,9 +16,17 @@ if (!OCA.Sharing) {
 if (!OCA.Files) {
 	OCA.Files = {};
 }
+/**
+ * @namespace
+ */
 OCA.Sharing.PublicApp = {
 	_initialized: false,
 
+	/**
+	 * Initializes the public share app.
+	 *
+	 * @param $el container
+	 */
 	initialize: function ($el) {
 		var self = this;
 		var fileActions;
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index eccd21c9248..36ae878008d 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -12,7 +12,19 @@
 	if (!OCA.Sharing) {
 		OCA.Sharing = {};
 	}
+	/**
+	 * @namespace
+	 */
 	OCA.Sharing.Util = {
+		/**
+		 * Initialize the sharing app overrides of the default
+		 * file list.
+		 *
+		 * Registers the "Share" file action and adds additional
+		 * DOM attributes for the sharing file info.
+		 *
+		 * @param {OCA.Files.FileActions} fileActions file actions to extend
+		 */
 		initialize: function(fileActions) {
 			if (OCA.Files.FileList) {
 				var oldCreateRow = OCA.Files.FileList.prototype._createRow;
@@ -160,9 +172,9 @@
 		 * other ones will be shown as "+x" where "x" is the number of
 		 * remaining recipients.
 		 *
-		 * @param recipients recipients array
-		 * @param count optional total recipients count (in case the array was shortened)
-		 * @return formatted recipients display text
+		 * @param {Array.<String>} recipients recipients array
+		 * @param {int} count optional total recipients count (in case the array was shortened)
+		 * @return {String} formatted recipients display text
 		 */
 		formatRecipients: function(recipients, count) {
 			var maxRecipients = 4;
diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index b99611f9bf0..5869d7f77f7 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -10,15 +10,25 @@
 (function() {
 
 	/**
-	 * Sharing file list
+	 * @class OCA.Sharing.FileList
+	 * @augments OCA.Files.FileList
 	 *
+	 * @classdesc Sharing file list.
 	 * Contains both "shared with others" and "shared with you" modes.
+	 *
+	 * @param $el container element with existing markup for the #controls
+	 * and a table
+	 * @param [options] map of options, see other parameters
+	 * @param {boolean} [options.sharedWithUser] true to return files shared with
+	 * the current user, false to return files that the user shared with others.
+	 * Defaults to false.
+	 * @param {boolean} [options.linksOnly] true to return only link shares
 	 */
 	var FileList = function($el, options) {
 		this.initialize($el, options);
 	};
-
-	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, {
+	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
+		/** @lends OCA.Sharing.FileList.prototype */ {
 		appName: 'Shares',
 
 		/**
@@ -27,9 +37,11 @@
 		 */
 		_sharedWithUser: false,
 		_linksOnly: false,
-
 		_clientSideSort: true,
 
+		/**
+		 * @private
+		 */
 		initialize: function($el, options) {
 			OCA.Files.FileList.prototype.initialize.apply(this, arguments);
 			if (this.initialized) {
@@ -138,8 +150,8 @@
 		/**
 		 * Converts the OCS API share response data to a file info
 		 * list
-		 * @param OCS API share array
-		 * @return array of file info maps
+		 * @param {Array} data OCS API share array
+		 * @return {Array.<OCA.Sharing.SharedFileInfo>} array of shared file info
 		 */
 		_makeFilesFromShares: function(data) {
 			/* jshint camelcase: false */
@@ -259,5 +271,33 @@
 		}
 	});
 
+	/**
+	 * Share info attributes.
+	 *
+	 * @typedef {Object} OCA.Sharing.ShareInfo
+	 *
+	 * @property {int} id share ID
+	 * @property {int} type share type
+	 * @property {String} target share target, either user name or group name
+	 * @property {int} stime share timestamp in milliseconds
+	 * @property {String} [targetDisplayName] display name of the recipient
+	 * (only when shared with others)
+	 *
+	 */
+
+	/**
+	 * Shared file info attributes.
+	 *
+	 * @typedef {OCA.Files.FileInfo} OCA.Sharing.SharedFileInfo
+	 *
+	 * @property {Array.<OCA.Sharing.ShareInfo>} shares array of shares for
+	 * this file
+	 * @property {int} mtime most recent share time (if multiple shares)
+	 * @property {String} shareOwner name of the share owner
+	 * @property {Array.<String>} recipients name of the first 4 recipients
+	 * (this is mostly for display purposes)
+	 * @property {String} recipientsDisplayName display name
+	 */
+
 	OCA.Sharing.FileList = FileList;
 })();
diff --git a/apps/files_trashbin/js/app.js b/apps/files_trashbin/js/app.js
index 376ee7b01ca..a9727542bad 100644
--- a/apps/files_trashbin/js/app.js
+++ b/apps/files_trashbin/js/app.js
@@ -8,7 +8,13 @@
  *
  */
 
+/**
+ * @namespace OCA.Trashbin
+ */
 OCA.Trashbin = {};
+/**
+ * @namespace OCA.Trashbin.App
+ */
 OCA.Trashbin.App = {
 	_initialized: false,
 
diff --git a/apps/files_trashbin/js/filelist.js b/apps/files_trashbin/js/filelist.js
index b8688d89765..a3631a2d0fe 100644
--- a/apps/files_trashbin/js/filelist.js
+++ b/apps/files_trashbin/js/filelist.js
@@ -14,8 +14,8 @@
 	 * Convert a file name in the format filename.d12345 to the real file name.
 	 * This will use basename.
 	 * The name will not be changed if it has no ".d12345" suffix.
-	 * @param name file name
-	 * @return converted file name
+	 * @param {String} name file name
+	 * @return {String} converted file name
 	 */
 	function getDeletedFileName(name) {
 		name = OC.basename(name);
@@ -26,13 +26,26 @@
 		return name;
 	}
 
+	/**
+	 * @class OCA.Trashbin.FileList
+	 * @augments OCA.Files.FileList
+	 * @classdesc List of deleted files
+	 *
+	 * @param $el container element with existing markup for the #controls
+	 * and a table
+	 * @param [options] map of options
+	 */
 	var FileList = function($el, options) {
 		this.initialize($el, options);
 	};
-	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype, {
+	FileList.prototype = _.extend({}, OCA.Files.FileList.prototype,
+		/** @lends OCA.Trashbin.FileList.prototype */ {
 		id: 'trashbin',
 		appName: t('files_trashbin', 'Deleted files'),
 
+		/**
+		 * @private
+		 */
 		initialize: function() {
 			var result = OCA.Files.FileList.prototype.initialize.apply(this, arguments);
 			this.$el.find('.undelete').click('click', _.bind(this._onClickRestoreSelected, this));
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 64e0df76490..1a47c1749f9 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -11,6 +11,8 @@
 /* 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
diff --git a/core/js/config.js b/core/js/config.js
index 52d1c3aee25..b034b7e8cd3 100644
--- a/core/js/config.js
+++ b/core/js/config.js
@@ -4,6 +4,9 @@
  * See the COPYING-README file.
  */
 
+/**
+ * @namespace
+ */
 OC.AppConfig={
 	url:OC.filePath('core','ajax','appconfig.php'),
 	getCall:function(action,data,callback){
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 46bd9f60bb5..6f23cebb685 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -34,6 +34,8 @@
  * Create a new event source
  * @param {string} src
  * @param {object} [data] to be send as GET
+ *
+ * @constructs OC.EventSource
  */
 OC.EventSource=function(src,data){
 	var dataStr='';
@@ -92,6 +94,16 @@ OC.EventSource.prototype={
 	iframe:null,
 	listeners:{},//only for fallback
 	useFallBack:false,
+	/**
+	 * Fallback callback for browsers that don't have the
+	 * native EventSource object.
+	 *
+	 * Calls the registered listeners.
+	 *
+	 * @private
+	 * @param {String} type event type
+	 * @param {Object} data received data
+	 */
 	fallBackCallBack:function(type,data){
 		var i;
 		// ignore messages that might appear after closing
@@ -111,6 +123,12 @@ OC.EventSource.prototype={
 		}
 	},
 	lastLength:0,//for fallback
+	/**
+	 * Listen to a given type of events.
+	 *
+	 * @param {String} type event type
+	 * @param {Function} callback event callback
+	 */
 	listen:function(type,callback){
 		if(callback && callback.call){
 
@@ -134,6 +152,9 @@ OC.EventSource.prototype={
 			}
 		}
 	},
+	/**
+	 * Closes this event source.
+	 */
 	close:function(){
 		this.closed = true;
 		if (typeof this.source !== 'undefined') {
diff --git a/core/js/js.js b/core/js/js.js
index b1a61ddf502..39e382b544b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -5,6 +5,7 @@
  * To the end of config/config.php to enable debug mode.
  * The undefined checks fix the broken ie8 console
  */
+
 var oc_debug;
 var oc_webroot;
 
@@ -57,6 +58,7 @@ function fileDownloadPath(dir, file) {
 	return OC.filePath('files', 'ajax', 'download.php')+'?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir);
 }
 
+/** @namespace */
 var OC={
 	PERMISSION_CREATE:4,
 	PERMISSION_READ:1,
@@ -251,14 +253,22 @@ var OC={
 	},
 
 	/**
-	 * @todo Write the documentation
+	 * Returns the base name of the given path.
+	 * For example for "/abc/somefile.txt" it will return "somefile.txt"
+	 *
+	 * @param {String} path
+	 * @return {String} base name
 	 */
 	basename: function(path) {
 		return path.replace(/\\/g,'/').replace( /.*\//, '' );
 	},
 
 	/**
-	 *  @todo Write the documentation
+	 * Returns the dir name of the given path.
+	 * For example for "/abc/somefile.txt" it will return "/abc"
+	 *
+	 * @param {String} path
+	 * @return {String} dir name
 	 */
 	dirname: function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
@@ -277,12 +287,16 @@ var OC={
 			});
 		}
 	}, 500),
+	/**
+	 * Dialog helper for jquery dialogs.
+	 *
+	 * @namespace OC.dialogs
+	 */
 	dialogs:OCdialogs,
-
 	/**
 	 * Parses a URL query string into a JS map
 	 * @param {string} queryString query string in the format param1=1234&param2=abcde&param3=xyz
-	 * @return map containing key/values matching the URL parameters
+	 * @return {Object.<string, string>} map containing key/values matching the URL parameters
 	 */
 	parseQueryString:function(queryString){
 		var parts,
@@ -334,7 +348,7 @@ var OC={
 
 	/**
 	 * Builds a URL query from a JS map.
-	 * @param params parameter map
+	 * @param {Object.<string, string>} params map containing key/values matching the URL parameters
 	 * @return {string} String containing a URL query (without question) mark
 	 */
 	buildQueryString: function(params) {
@@ -454,7 +468,7 @@ var OC={
 	 *
 	 * This is makes it possible for unit tests to
 	 * stub matchMedia (which doesn't work in PhantomJS)
-	 * @todo Write documentation
+	 * @private
 	 */
 	_matchMedia: function(media) {
 		if (window.matchMedia) {
@@ -464,6 +478,9 @@ var OC={
 	}
 };
 
+/**
+ * @namespace OC.search
+ */
 OC.search.customResults={};
 OC.search.currentResult=-1;
 OC.search.lastQuery='';
@@ -531,6 +548,7 @@ OC.msg={
 
 /**
  * @todo Write documentation
+ * @namespace
  */
 OC.Notification={
 	queuedNotifications: [],
@@ -607,7 +625,12 @@ OC.Notification={
 };
 
 /**
- * @todo Write documentation
+ * Breadcrumb class
+ *
+ * @namespace
+ *
+ * @deprecated will be replaced by the breadcrumb implementation
+ * of the files app in the future
  */
 OC.Breadcrumb={
 	container:null,
@@ -721,6 +744,7 @@ OC.Breadcrumb={
 if(typeof localStorage !=='undefined' && localStorage !== null){
 	/**
 	 * User and instance aware localstorage
+	 * @namespace
 	 */
 	OC.localStorage={
 		namespace:'oc_'+OC.currentUser+'_'+OC.webroot+'_',
@@ -1164,6 +1188,7 @@ function relative_modified_date(timestamp) {
 
 /**
  * Utility functions
+ * @namespace
  */
 OC.Util = {
 	// TODO: remove original functions from global namespace
@@ -1314,6 +1339,8 @@ OC.Util = {
  * Utility class for the history API,
  * includes fallback to using the URL hash when
  * the browser doesn't support the history API.
+ *
+ * @namespace
  */
 OC.Util.History = {
 	_handlers: [],
@@ -1473,6 +1500,7 @@ OC.set=function(name, value) {
 
 /**
  * Namespace for apps
+ * @namespace OCA
  */
 window.OCA = {};
 
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index bd6fd2e5007..9e5afea1a6f 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -23,6 +23,7 @@
 
 /**
  * this class to ease the usage of jquery dialogs
+ * @lends OC.dialogs
  */
 var OCdialogs = {
 	// dialog button types
-- 
GitLab


From 67f1ddf2c85328b7f83a8ae1a9fe33e3fa1bf553 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 31 Oct 2014 13:52:14 +0100
Subject: [PATCH 282/616] Add CodeClimate indicator

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0b13f11e768..6a95e329962 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,9 @@ A personal cloud which runs on your own server.
 ### Build Status on [Jenkins CI](https://ci.owncloud.org/)
 Git master: [![Build Status](https://ci.owncloud.org/job/server-master-linux/badge/icon)](https://ci.owncloud.org/job/server-master-linux/)
 
-Quality: [![Scrutinizer Quality Score](https://scrutinizer-ci.com/g/owncloud/core/badges/quality-score.png?s=ce2f5ded03d4ac628e9ee5c767243fa7412e644f)](https://scrutinizer-ci.com/g/owncloud/core/)
+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)
 
 ### Installation instructions
 http://doc.owncloud.org/server/7.0/developer_manual/app/index.html
-- 
GitLab


From 69a3d8eb1a7b2f98aa2494415e730ad4c8c3128a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 16 Oct 2014 14:50:39 +0200
Subject: [PATCH 283/616] fix files_external storage id migration

---
 apps/files_external/lib/amazons3.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 1869f1b15c2..53adb929e29 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -123,11 +123,28 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	 * @param array $params
 	 */
 	public function updateLegacyId (array $params) {
+		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
+
+		// find by old id or bucket
 		$stmt = \OC::$server->getDatabaseConnection()->prepare(
-			'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
+			'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
 		);
-		$oldId = 'amazon::' . $params['key'] . md5($params['secret']);
-		$stmt->execute(array($this->id, $oldId));
+		$stmt->execute(array($oldId, $this->id));
+		while ($row = $stmt->fetch()) {
+			$storages[$row['id']] = $row['numeric_id'];
+		}
+
+		if (isset($storages[$this->id]) && isset($storages[$oldId])) {
+			// if both ids exist, delete the old storage and corresponding filecache entries
+			\OC\Files\Cache\Storage::remove($oldId);
+		} else if (isset($storages[$oldId])) {
+			// if only the old id exists do an update
+			$stmt = \OC::$server->getDatabaseConnection()->prepare(
+				'UPDATE `*PREFIX*storages` SET `id` = ? WHERE `id` = ?'
+			);
+			$stmt->execute(array($this->id, $oldId));
+		}
+		// only the bucket based id may exist, do nothing
 	}
 
 	/**
-- 
GitLab


From fe9e6be35ca1759eead73bb7bd32dc8ead1f236e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Oct 2014 13:00:31 +0100
Subject: [PATCH 284/616] test files external amazon s3 storage id migration

---
 .../tests/amazons3migration.php               | 117 ++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 apps/files_external/tests/amazons3migration.php

diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php
new file mode 100644
index 00000000000..629cf5cfa3c
--- /dev/null
+++ b/apps/files_external/tests/amazons3migration.php
@@ -0,0 +1,117 @@
+<?php
+
+/**
+ * ownCloud
+ *
+ * @author Jörn Friedrich Dreyer
+ * @copyright 2012 Jörn Friedrich Dreyer jfd@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/>.
+ */
+
+
+namespace Test\Files\Storage;
+
+class AmazonS3Migration extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var \OC\Files\Storage\Storage instance
+	 */
+	protected $instance;
+
+	public function setUp () {
+		$uuid = uniqid();
+
+		$this->params['key'] = 'key'.$uuid;
+		$this->params['secret'] = 'secret'.$uuid;
+		$this->params['bucket'] = 'bucket'.$uuid;
+
+		$this->oldId = 'amazon::' . $this->params['key'] . md5($this->params['secret']);
+		$this->newId = 'amazon::' . $this->params['bucket'];
+	}
+
+	public function tearDown () {
+		$this->deleteStorage($this->oldId);
+		$this->deleteStorage($this->newId);
+	}
+
+	public function testUpdateLegacyOnlyId () {
+		// add storage ids
+		$oldCache = new \OC\Files\Cache\Cache($this->oldId);
+
+		// add file to old cache
+		$fileId = $oldCache->put('/', array('size' => 0, 'mtime' => time(), 'mimetype' => 'httpd/directory'));
+
+		try {
+			$this->instance = new \OC\Files\Storage\AmazonS3($this->params);
+		} catch (\Exception $e) {
+			//ignore
+		}
+		$storages = $this->getStorages();
+
+		$this->assertTrue(isset($storages[$this->newId]));
+		$this->assertFalse(isset($storages[$this->oldId]));
+		$this->assertSame((int)$oldCache->getNumericStorageId(), (int)$storages[$this->newId]);
+
+		list($storageId, $path) = \OC\Files\Cache\Cache::getById($fileId);
+
+		$this->assertSame($this->newId, $storageId);
+		$this->assertSame('/', $path);
+	}
+
+	public function testUpdateLegacyAndNewId () {
+		// add storage ids
+
+		$oldCache = new \OC\Files\Cache\Cache($this->oldId);
+		new \OC\Files\Cache\Cache($this->newId);
+
+		// add file to old cache
+		$fileId = $oldCache->put('/', array('size' => 0, 'mtime' => time(), 'mimetype' => 'httpd/directory'));
+
+		try {
+			$this->instance = new \OC\Files\Storage\AmazonS3($this->params);
+		} catch (\Exception $e) {
+			//ignore
+		}
+		$storages = $this->getStorages();
+
+		$this->assertTrue(isset($storages[$this->newId]));
+		$this->assertFalse(isset($storages[$this->oldId]));
+
+		$this->assertNull(\OC\Files\Cache\Cache::getById($fileId), 'old filecache has not been cleared');
+	}
+
+	/**
+	 * @param $storages
+	 * @return array
+	 */
+	public function getStorages() {
+		$storages = array();
+		$stmt = \OC::$server->getDatabaseConnection()->prepare(
+			'SELECT `numeric_id`, `id` FROM `*PREFIX*storages` WHERE `id` IN (?, ?)'
+		);
+		$stmt->execute(array($this->oldId, $this->newId));
+		while ($row = $stmt->fetch()) {
+			$storages[$row['id']] = $row['numeric_id'];
+		}
+		return $storages;
+	}
+
+	public function deleteStorage($id) {
+		$stmt = \OC::$server->getDatabaseConnection()->prepare(
+			'DELETE FROM `*PREFIX*storages` WHERE `id` = ?'
+		);
+		$stmt->execute(array($id));
+	}
+}
\ No newline at end of file
-- 
GitLab


From 270558807309025a01ff456b94d3350eaab1ac41 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 9 Sep 2014 16:41:49 +0200
Subject: [PATCH 285/616] Dont' use mountpoint permissions as share permissions
 for external storages

---
 apps/files_sharing/js/share.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index eccd21c9248..dd950e9b42b 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -19,6 +19,10 @@
 				OCA.Files.FileList.prototype._createRow = function(fileData) {
 					var tr = oldCreateRow.apply(this, arguments);
 					var sharePermissions = fileData.permissions;
+					if (fileData.mountType && fileData.mountType === "external-root"){
+						// for external storages we cant use the permissions of the mountpoint
+						sharePermissions = OC.PERMISSION_ALL;
+					}
 					if (fileData.type === 'file') {
 						// files can't be shared with delete permissions
 						sharePermissions = sharePermissions & ~OC.PERMISSION_DELETE;
-- 
GitLab


From 307071cfec088c2690c12a686578b49647ba5840 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 16 Sep 2014 20:54:11 +0200
Subject: [PATCH 286/616] Keep the share permissions from mountpoints

---
 apps/files_sharing/js/share.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index dd950e9b42b..853e9f689f6 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -21,7 +21,8 @@
 					var sharePermissions = fileData.permissions;
 					if (fileData.mountType && fileData.mountType === "external-root"){
 						// for external storages we cant use the permissions of the mountpoint
-						sharePermissions = OC.PERMISSION_ALL;
+						// instead we show all permissions and only use the share permissions from the mountpoint to handle resharing
+						sharePermissions = sharePermissions | (OC.PERMISSION_ALL & ~OC.PERMISSION_SHARE);
 					}
 					if (fileData.type === 'file') {
 						// files can't be shared with delete permissions
-- 
GitLab


From 83126ab67596a29200e1624088801312935e4580 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 31 Oct 2014 15:22:08 +0100
Subject: [PATCH 287/616] Add unit tests

---
 .../tests/js/sharedfilelistSpec.js            | 85 +++++++++++++++++++
 1 file changed, 85 insertions(+)

diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index 41c8a1f05d8..812f30d75db 100644
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -551,4 +551,89 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
 		});
 	});
+	describe('setting share permissions for files', function () {
+		beforeEach(function () {
+
+			var $content = $('<div id="content"></div>');
+			$('#testArea').append($content);
+			// dummy file list
+			var $div = $(
+				'<div>' +
+				'<table id="filestable">' +
+				'<thead></thead>' +
+				'<tbody id="fileList"></tbody>' +
+				'</table>' +
+				'</div>');
+			$('#content').append($div);
+
+			fileList = new OCA.Files.FileList(
+				$div, {
+					fileActions: fileActions
+				}
+			);
+		});
+
+		it('external storage root folder', function () {
+			var $tr;
+			OC.Share.statuses = {1: {link: false, path: '/subdir'}};
+			fileList.setFiles([{
+				id: 1,
+				type: 'dir',
+				name: 'One.txt',
+				path: '/subdir',
+				mimetype: 'text/plain',
+				size: 12,
+				permissions: OC.PERMISSION_READ,
+				etag: 'abc',
+				shareOwner: 'User One',
+				recipients: 'User Two',
+				mountType: 'external-root'
+			}]);
+			$tr = fileList.$el.find('tr:first');
+
+			expect(parseInt($tr.attr('data-share-permissions'), 10)).toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE);
+		});
+
+		it('external storage root folder reshare', function () {
+			var $tr;
+			OC.Share.statuses = {1: {link: false, path: '/subdir'}};
+			fileList.setFiles([{
+				id: 1,
+				type: 'dir',
+				name: 'One.txt',
+				path: '/subdir',
+				mimetype: 'text/plain',
+				size: 12,
+				permissions: OC.PERMISSION_READ + OC.PERMISSION_SHARE,
+				etag: 'abc',
+				shareOwner: 'User One',
+				recipients: 'User Two',
+				mountType: 'external-root'
+			}]);
+			$tr = fileList.$el.find('tr:first');
+
+			expect(parseInt($tr.attr('data-share-permissions'), 10)).toEqual(OC.PERMISSION_ALL);
+		});
+
+		it('external storage root folder file', function () {
+			var $tr;
+			OC.Share.statuses = {1: {link: false, path: '/subdir'}};
+			fileList.setFiles([{
+				id: 1,
+				type: 'file',
+				name: 'One.txt',
+				path: '/subdir',
+				mimetype: 'text/plain',
+				size: 12,
+				permissions: OC.PERMISSION_READ,
+				etag: 'abc',
+				shareOwner: 'User One',
+				recipients: 'User Two',
+				mountType: 'external-root'
+			}]);
+			$tr = fileList.$el.find('tr:first');
+
+			expect(parseInt($tr.attr('data-share-permissions'), 10)).toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE - OC.PERMISSION_DELETE);
+		});
+	});
 });
-- 
GitLab


From ebe1d3df0a51f3517ea14ea4d3ba9c770f4f85c1 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 31 Oct 2014 16:42:54 +0100
Subject: [PATCH 288/616] don't move versions if only the mount point was
 renamed

---
 apps/files_versions/lib/hooks.php      | 10 ++++++
 apps/files_versions/tests/versions.php | 43 ++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)

diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 024cb6a3c39..53980463120 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -115,6 +115,16 @@ class Hooks {
 	public static function pre_renameOrCopy_hook($params) {
 		if (\OCP\App::isEnabled('files_versions')) {
 
+			// if we rename a movable mount point, then the versions don't have
+			// to be renamed
+			$absOldPath = \OC\Files\Filesystem::normalizePath('/' . \OCP\User::getUser() . '/files' . $params['oldpath']);
+			$manager = \OC\Files\Filesystem::getMountManager();
+			$mount = $manager->find($absOldPath);
+			$internalPath = $mount->getInternalPath($absOldPath);
+			if ($internalPath === '' and $mount instanceof \OC\Files\Mount\MoveableMount) {
+				return;
+			}
+
 			$view = new \OC\Files\View(\OCP\User::getUser() . '/files');
 			if ($view->file_exists($params['newpath'])) {
 				Storage::store($params['newpath']);
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 6dfba6bcf23..761cc07d9fc 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -288,6 +288,49 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		\OC\Files\Filesystem::unlink('/folder1/folder2/test.txt');
 	}
 
+	function testRenameSharedFile() {
+
+		\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
+
+		$fileInfo = \OC\Files\Filesystem::getFileInfo('test.txt');
+
+		$t1 = time();
+		// second version is two weeks older, this way we make sure that no
+		// version will be expired
+		$t2 = $t1 - 60 * 60 * 24 * 14;
+
+		$this->rootView->mkdir(self::USERS_VERSIONS_ROOT);
+		// create some versions
+		$v1 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t1;
+		$v2 = self::USERS_VERSIONS_ROOT . '/test.txt.v' . $t2;
+		// the renamed versions should not exist! Because we only moved the mount point!
+		$v1Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t1;
+		$v2Renamed = self::USERS_VERSIONS_ROOT . '/test2.txt.v' . $t2;
+
+		$this->rootView->file_put_contents($v1, 'version1');
+		$this->rootView->file_put_contents($v2, 'version2');
+
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_VERSIONS_USER2, OCP\PERMISSION_ALL);
+
+		self::loginHelper(self::TEST_VERSIONS_USER2);
+
+		$this->assertTrue(\OC\Files\Filesystem::file_exists('test.txt'));
+
+		// execute rename hook of versions app
+		\OC\Files\Filesystem::rename('test.txt', 'test2.txt');
+
+		self::loginHelper(self::TEST_VERSIONS_USER);
+
+		$this->assertTrue($this->rootView->file_exists($v1));
+		$this->assertTrue($this->rootView->file_exists($v2));
+
+		$this->assertFalse($this->rootView->file_exists($v1Renamed));
+		$this->assertFalse($this->rootView->file_exists($v2Renamed));
+
+		//cleanup
+		\OC\Files\Filesystem::unlink('/test.txt');
+	}
+
 	function testCopy() {
 
 		\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
-- 
GitLab


From 56cf1d9d2754a0fcfc52dbde5b1bada27341f2b6 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 31 Oct 2014 18:46:47 +0100
Subject: [PATCH 289/616] fix odd behaviour

---
 lib/private/connector/sabre/principal.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/private/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php
index c674e2aa779..fe17fb991ca 100644
--- a/lib/private/connector/sabre/principal.php
+++ b/lib/private/connector/sabre/principal.php
@@ -28,15 +28,17 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
 			foreach(OC_User::getUsers() as $user) {
 
 				$user_uri = 'principals/'.$user;
-				$principals[] = array(
+				$principal = array(
 					'uri' => $user_uri,
 					'{DAV:}displayname' => $user,
 				);
 
 				$email= \OCP\Config::getUserValue($user, 'settings', 'email');
 				if($email) {
-					$principals['{http://sabredav.org/ns}email-address'] = $email;
+					$principal['{http://sabredav.org/ns}email-address'] = $email;
 				}
+
+				$principals[] = $principal;
 			}
 		}
 
@@ -56,15 +58,17 @@ class OC_Connector_Sabre_Principal implements \Sabre\DAVACL\PrincipalBackend\Bac
 
 		if ($prefix == 'principals' && OC_User::userExists($name)) {
 
-			return array(
+			$principal = array(
 				'uri' => 'principals/'.$name,
 				'{DAV:}displayname' => $name,
 			);
 
 			$email= \OCP\Config::getUserValue($user, 'settings', 'email');
 			if($email) {
-				$principals['{http://sabredav.org/ns}email-address'] = $email;
+				$principal['{http://sabredav.org/ns}email-address'] = $email;
 			}
+
+			return $principal;
 		}
 
 		return null;
-- 
GitLab


From d8f7780f4f1571b1b15bc8cc1758c5602a609e41 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 1 Nov 2014 01:54:37 -0400
Subject: [PATCH 290/616] [tx-robot] updated from transifex

---
 apps/files/l10n/cs_CZ.js            |  2 +-
 apps/files/l10n/cs_CZ.json          |  2 +-
 apps/user_ldap/l10n/cs_CZ.js        |  1 +
 apps/user_ldap/l10n/cs_CZ.json      |  1 +
 apps/user_ldap/l10n/da.js           |  1 +
 apps/user_ldap/l10n/da.json         |  1 +
 apps/user_ldap/l10n/de.js           |  1 +
 apps/user_ldap/l10n/de.json         |  1 +
 apps/user_ldap/l10n/de_DE.js        |  1 +
 apps/user_ldap/l10n/de_DE.json      |  1 +
 apps/user_ldap/l10n/en_GB.js        |  1 +
 apps/user_ldap/l10n/en_GB.json      |  1 +
 apps/user_ldap/l10n/es.js           |  1 +
 apps/user_ldap/l10n/es.json         |  1 +
 apps/user_ldap/l10n/fi_FI.js        |  1 +
 apps/user_ldap/l10n/fi_FI.json      |  1 +
 apps/user_ldap/l10n/ja.js           |  1 +
 apps/user_ldap/l10n/ja.json         |  1 +
 apps/user_ldap/l10n/pt_BR.js        |  1 +
 apps/user_ldap/l10n/pt_BR.json      |  1 +
 apps/user_ldap/l10n/pt_PT.js        |  1 +
 apps/user_ldap/l10n/pt_PT.json      |  1 +
 core/l10n/es.js                     |  6 +++++-
 core/l10n/es.json                   |  6 +++++-
 core/l10n/ja.js                     |  6 +++++-
 core/l10n/ja.json                   |  6 +++++-
 core/l10n/pt_PT.js                  |  6 +++++-
 core/l10n/pt_PT.json                |  6 +++++-
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              |  2 +-
 l10n/templates/private.pot          |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        | 22 +++++++++++-----------
 l10n/templates/user_webdavauth.pot  |  2 +-
 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/en_GB.js              |  1 +
 settings/l10n/en_GB.json            |  1 +
 settings/l10n/es.js                 |  1 +
 settings/l10n/es.json               |  1 +
 settings/l10n/fi_FI.js              |  2 ++
 settings/l10n/fi_FI.json            |  2 ++
 settings/l10n/ja.js                 |  7 +++++++
 settings/l10n/ja.json               |  7 +++++++
 settings/l10n/pt_BR.js              |  1 +
 settings/l10n/pt_BR.json            |  1 +
 settings/l10n/pt_PT.js              |  1 +
 settings/l10n/pt_PT.json            |  1 +
 60 files changed, 108 insertions(+), 30 deletions(-)

diff --git a/apps/files/l10n/cs_CZ.js b/apps/files/l10n/cs_CZ.js
index bbf480b4660..58467d9c68f 100644
--- a/apps/files/l10n/cs_CZ.js
+++ b/apps/files/l10n/cs_CZ.js
@@ -63,7 +63,7 @@ OC.L10N.register(
     "Modified" : "Upraveno",
     "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek"],
     "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů"],
-    "You don’t have permission to upload or create files here" : "Nemáte oprávnění zde nahrávat či vytvářet soubory",
+    "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ů"],
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
diff --git a/apps/files/l10n/cs_CZ.json b/apps/files/l10n/cs_CZ.json
index f427a6961e3..98cad1c70f5 100644
--- a/apps/files/l10n/cs_CZ.json
+++ b/apps/files/l10n/cs_CZ.json
@@ -61,7 +61,7 @@
     "Modified" : "Upraveno",
     "_%n folder_::_%n folders_" : ["%n složka","%n složky","%n složek"],
     "_%n file_::_%n files_" : ["%n soubor","%n soubory","%n souborů"],
-    "You don’t have permission to upload or create files here" : "Nemáte oprávnění zde nahrávat či vytvářet soubory",
+    "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ů"],
     "\"{name}\" is an invalid file name." : "\"{name}\" je neplatným názvem souboru.",
     "Your storage is full, files can not be updated or synced anymore!" : "Vaše úložiště je plné, nelze aktualizovat ani synchronizovat soubory.",
diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js
index abfa8433593..793fd61c4b3 100644
--- a/apps/user_ldap/l10n/cs_CZ.js
+++ b/apps/user_ldap/l10n/cs_CZ.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Ukládá se",
     "Back" : "Zpět",
     "Continue" : "Pokračovat",
+    "LDAP" : "LDAP",
     "Expert" : "Expertní",
     "Advanced" : "Pokročilé",
     "<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json
index f8e76205cae..fb906cb7d9c 100644
--- a/apps/user_ldap/l10n/cs_CZ.json
+++ b/apps/user_ldap/l10n/cs_CZ.json
@@ -74,6 +74,7 @@
     "Saving" : "Ukládá se",
     "Back" : "Zpět",
     "Continue" : "Pokračovat",
+    "LDAP" : "LDAP",
     "Expert" : "Expertní",
     "Advanced" : "Pokročilé",
     "<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index 53af1a4fc2b..91bce8c777e 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
+    "LDAP" : "LDAP",
     "Expert" : "Ekspert",
     "Advanced" : "Avanceret",
     "<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>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index c4076aa148c..97d0c0ca403 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -74,6 +74,7 @@
     "Saving" : "Gemmer",
     "Back" : "Tilbage",
     "Continue" : "Videre",
+    "LDAP" : "LDAP",
     "Expert" : "Ekspert",
     "Advanced" : "Avanceret",
     "<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>Advarsel:</b> Apps'ene user_ldap og user_webdavauth er ikke kompatible. Du kan opleve uventet adfærd. Spørg venligst din systemadministrator om at slå én af dem fra.",
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index 6dc30ad80d3..94f388b0df4 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
+    "LDAP" : "LDAP",
     "Expert" : "Experte",
     "Advanced" : "Fortgeschritten",
     "<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. Bitte\ndeinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index 4603f75f6f8..f3524664fc1 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -74,6 +74,7 @@
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
+    "LDAP" : "LDAP",
     "Expert" : "Experte",
     "Advanced" : "Fortgeschritten",
     "<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. Bitte\ndeinen Systemadministator eine der beiden Anwendungen zu deaktivieren.",
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index 3340511770e..3cefc2ec625 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
+    "LDAP" : "LDAP",
     "Expert" : "Experte",
     "Advanced" : "Fortgeschritten",
     "<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.",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index 94be87f17ee..cf823ca29d4 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -74,6 +74,7 @@
     "Saving" : "Speichern",
     "Back" : "Zurück",
     "Continue" : "Fortsetzen",
+    "LDAP" : "LDAP",
     "Expert" : "Experte",
     "Advanced" : "Fortgeschritten",
     "<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.",
diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js
index 851beced763..d87ce836807 100644
--- a/apps/user_ldap/l10n/en_GB.js
+++ b/apps/user_ldap/l10n/en_GB.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Saving",
     "Back" : "Back",
     "Continue" : "Continue",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Advanced",
     "<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>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.",
diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json
index d97bd5aea25..8fd6ed30d4f 100644
--- a/apps/user_ldap/l10n/en_GB.json
+++ b/apps/user_ldap/l10n/en_GB.json
@@ -74,6 +74,7 @@
     "Saving" : "Saving",
     "Back" : "Back",
     "Continue" : "Continue",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Advanced",
     "<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>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.",
diff --git a/apps/user_ldap/l10n/es.js b/apps/user_ldap/l10n/es.js
index a222523d43f..172d32c9092 100644
--- a/apps/user_ldap/l10n/es.js
+++ b/apps/user_ldap/l10n/es.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
+    "LDAP" : "LDAP",
     "Expert" : "Experto",
     "Advanced" : "Avanzado",
     "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
diff --git a/apps/user_ldap/l10n/es.json b/apps/user_ldap/l10n/es.json
index fc418992bd2..b0308c4cbaf 100644
--- a/apps/user_ldap/l10n/es.json
+++ b/apps/user_ldap/l10n/es.json
@@ -74,6 +74,7 @@
     "Saving" : "Guardando",
     "Back" : "Atrás",
     "Continue" : "Continuar",
+    "LDAP" : "LDAP",
     "Expert" : "Experto",
     "Advanced" : "Avanzado",
     "<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>Advertencia:</b> Las apps user_ldap y user_webdavauth son incompatibles. Puede que experimente un comportamiento inesperado. Pregunte al su administrador de sistemas para desactivar uno de ellos.",
diff --git a/apps/user_ldap/l10n/fi_FI.js b/apps/user_ldap/l10n/fi_FI.js
index a77da009fc8..037708dc637 100644
--- a/apps/user_ldap/l10n/fi_FI.js
+++ b/apps/user_ldap/l10n/fi_FI.js
@@ -43,6 +43,7 @@ OC.L10N.register(
     "users found" : "käyttäjää löytynyt",
     "Back" : "Takaisin",
     "Continue" : "Jatka",
+    "LDAP" : "LDAP",
     "Advanced" : "Lisäasetukset",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.",
     "Connection Settings" : "Yhteysasetukset",
diff --git a/apps/user_ldap/l10n/fi_FI.json b/apps/user_ldap/l10n/fi_FI.json
index a8bf945741e..335f13bd093 100644
--- a/apps/user_ldap/l10n/fi_FI.json
+++ b/apps/user_ldap/l10n/fi_FI.json
@@ -41,6 +41,7 @@
     "users found" : "käyttäjää löytynyt",
     "Back" : "Takaisin",
     "Continue" : "Jatka",
+    "LDAP" : "LDAP",
     "Advanced" : "Lisäasetukset",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varoitus:</b> PHP:n LDAP-moduulia ei ole asennettu, taustaosa ei toimi. Pyydä järjestelmän ylläpitäjää asentamaan se.",
     "Connection Settings" : "Yhteysasetukset",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index e48417ca85c..79315a055f1 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "users found" : "ユーザーが見つかりました",
     "Back" : "戻る",
     "Continue" : "続ける",
+    "LDAP" : "LDAP",
     "Expert" : "エキスパート設定",
     "Advanced" : "詳細設定",
     "<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>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index 0f8538d333f..da903e15d17 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -70,6 +70,7 @@
     "users found" : "ユーザーが見つかりました",
     "Back" : "戻る",
     "Continue" : "続ける",
+    "LDAP" : "LDAP",
     "Expert" : "エキスパート設定",
     "Advanced" : "詳細設定",
     "<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>警告:</b> user_ldap と user_webdavauth のアプリには互換性がありません。予期せぬ動作をする可能性があります。システム管理者にどちらかを無効にするよう問い合わせてください。",
diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js
index dfd1981390c..32b7697df3e 100644
--- a/apps/user_ldap/l10n/pt_BR.js
+++ b/apps/user_ldap/l10n/pt_BR.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Salvando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
+    "LDAP" : "LDAP",
     "Expert" : "Especialista",
     "Advanced" : "Avançado",
     "<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json
index 694d350feba..ea59ed7b4d8 100644
--- a/apps/user_ldap/l10n/pt_BR.json
+++ b/apps/user_ldap/l10n/pt_BR.json
@@ -74,6 +74,7 @@
     "Saving" : "Salvando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
+    "LDAP" : "LDAP",
     "Expert" : "Especialista",
     "Advanced" : "Avançado",
     "<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>Aviso:</b> Os aplicativos user_ldap e user_webdavauth são incompatíveis. Você pode experimentar comportamento inesperado. Por favor, peça ao seu administrador do sistema para desabilitar um deles.",
diff --git a/apps/user_ldap/l10n/pt_PT.js b/apps/user_ldap/l10n/pt_PT.js
index 98fe1d16e00..0f4b3d11bed 100644
--- a/apps/user_ldap/l10n/pt_PT.js
+++ b/apps/user_ldap/l10n/pt_PT.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Guardando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
+    "LDAP" : "LDAP",
     "Expert" : "Perito",
     "Advanced" : "Avançado",
     "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
diff --git a/apps/user_ldap/l10n/pt_PT.json b/apps/user_ldap/l10n/pt_PT.json
index 1bcbfe018bf..9c753884160 100644
--- a/apps/user_ldap/l10n/pt_PT.json
+++ b/apps/user_ldap/l10n/pt_PT.json
@@ -74,6 +74,7 @@
     "Saving" : "Guardando",
     "Back" : "Voltar",
     "Continue" : "Continuar",
+    "LDAP" : "LDAP",
     "Expert" : "Perito",
     "Advanced" : "Avançado",
     "<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>Aviso:</b> A aplicação user_ldap e user_webdavauth são incompativeis. A aplicação pode tornar-se instável. Por favor, peça ao seu administrador para desactivar uma das aplicações.",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index 4bd33bdd27a..b963b9d3f01 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
     "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "test desconocido",
+    "Hello world!" : "¡ Hola mundo !",
+    "sunny" : "soleado",
+    "Hello {name}, the weather is {weather}" : "Hola {name}, el día es {weather}",
+    "_download %n file_::_download %n files_" : ["descarga %n ficheros","descarga %n ficheros"],
     "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." : "Falló la actualización",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index d479364834c..008891d5c98 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Error cargando plantilla de diálogo: {error}",
     "No tags selected for deletion." : "No hay etiquetas seleccionadas para borrar.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "test desconocido",
+    "Hello world!" : "¡ Hola mundo !",
+    "sunny" : "soleado",
+    "Hello {name}, the weather is {weather}" : "Hola {name}, el día es {weather}",
+    "_download %n file_::_download %n files_" : ["descarga %n ficheros","descarga %n ficheros"],
     "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." : "Falló la actualización",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index 3773e43227b..bba306dafc6 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "タグを編集",
     "Error loading dialog template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
     "No tags selected for deletion." : "削除するタグが選択されていません。",
-    "_download %n file_::_download %n files_" : [""],
+    "unknown text" : "不明なテキスト",
+    "Hello world!" : "Hello world!",
+    "sunny" : "快晴",
+    "Hello {name}, the weather is {weather}" : "こんにちは､ {name}､ 天気は{weather}です",
+    "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
     "Please reload the page." : "ページをリロードしてください。",
     "The update was unsuccessful." : "アップデートに失敗しました。",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index a1d9be4e721..706d6bcfc29 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -108,7 +108,11 @@
     "Edit tags" : "タグを編集",
     "Error loading dialog template: {error}" : "メッセージテンプレートの読み込みエラー: {error}",
     "No tags selected for deletion." : "削除するタグが選択されていません。",
-    "_download %n file_::_download %n files_" : [""],
+    "unknown text" : "不明なテキスト",
+    "Hello world!" : "Hello world!",
+    "sunny" : "快晴",
+    "Hello {name}, the weather is {weather}" : "こんにちは､ {name}､ 天気は{weather}です",
+    "_download %n file_::_download %n files_" : ["%n個のファイルをダウンロード"],
     "Updating {productName} to version {version}, this may take a while." : "{productName} を バージョン {version} に更新しています。しばらくお待ちください。",
     "Please reload the page." : "ページをリロードしてください。",
     "The update was unsuccessful." : "アップデートに失敗しました。",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index 58ec068e69e..bc84fc7bbd9 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Erro ao carregar modelo de diálogo: {error}",
     "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "texto desconhecido",
+    "Hello world!" : "Olá mundo!",
+    "sunny" : "solarengo",
+    "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}",
+    "_download %n file_::_download %n files_" : ["download %n ficheiro","download %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 694c9a4fa26..f61e3c076d0 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Erro ao carregar modelo de diálogo: {error}",
     "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "texto desconhecido",
+    "Hello world!" : "Olá mundo!",
+    "sunny" : "solarengo",
+    "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}",
+    "_download %n file_::_download %n files_" : ["download %n ficheiro","download %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 822bc740bea..ebe80ad8474 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index d72b21a1263..6ecabf891f3 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 1616c958e36..bf284821772 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 8a1bd6f2827..e31d628a483 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 7912e20fba0..caa1fbec3f8 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 6ab19bc764c..ded0d7847c0 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index c2d4454a050..d43952c5197 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index e973ada8bb7..ddeca8d08a2 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 1308e58c743..f3db3159c5e 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c6f673ae6c1..c90804dcd61 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 231395da82d..49443caa423 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -103,43 +103,43 @@ msgstr ""
 msgid "Please specify the port"
 msgstr ""
 
-#: js/settings.js:933
+#: js/settings.js:937
 msgid "Configuration OK"
 msgstr ""
 
-#: js/settings.js:942
+#: js/settings.js:946
 msgid "Configuration incorrect"
 msgstr ""
 
-#: js/settings.js:951
+#: js/settings.js:955
 msgid "Configuration incomplete"
 msgstr ""
 
-#: js/settings.js:968 js/settings.js:977
+#: js/settings.js:972 js/settings.js:981
 msgid "Select groups"
 msgstr ""
 
-#: js/settings.js:971 js/settings.js:980
+#: js/settings.js:975 js/settings.js:984
 msgid "Select object classes"
 msgstr ""
 
-#: js/settings.js:974
+#: js/settings.js:978
 msgid "Select attributes"
 msgstr ""
 
-#: js/settings.js:1002
+#: js/settings.js:1006
 msgid "Connection test succeeded"
 msgstr ""
 
-#: js/settings.js:1009
+#: js/settings.js:1013
 msgid "Connection test failed"
 msgstr ""
 
-#: js/settings.js:1018
+#: js/settings.js:1022
 msgid "Do you really want to delete the current Server Configuration?"
 msgstr ""
 
-#: js/settings.js:1019
+#: js/settings.js:1023
 msgid "Confirm Deletion"
 msgstr ""
 
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 5ec1d432a30..ee3a6ec2bb4 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-10-31 01:54-0400\n"
+"POT-Creation-Date: 2014-11-01 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index b5df8a082a1..b683e766f44 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Upozornění bezpečnosti a nastavení",
     "Cron" : "Cron",
     "Sharing" : "Sdílení",
     "Security" : "Zabezpečení",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 301fc064ea7..d1532997e6a 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Upozornění bezpečnosti a nastavení",
     "Cron" : "Cron",
     "Sharing" : "Sdílení",
     "Security" : "Zabezpečení",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 5678039552e..4ae61e1bc16 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Advarsler om sikkerhed og opsætning",
     "Cron" : "Cron",
     "Sharing" : "Deling",
     "Security" : "Sikkerhed",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index d249e8db756..e35ec7809a7 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Advarsler om sikkerhed og opsætning",
     "Cron" : "Cron",
     "Sharing" : "Deling",
     "Security" : "Sikkerhed",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 2126e3dc544..0a19da4e50e 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Cron" : "Cron",
     "Sharing" : "Teilen",
     "Security" : "Sicherheit",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 094b20e6172..d42a99cb00c 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Cron" : "Cron",
     "Sharing" : "Teilen",
     "Security" : "Sicherheit",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index d4c4031427d..07868c4674d 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Cron" : "Cron",
     "Sharing" : "Teilen",
     "Security" : "Sicherheit",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index f5a0d145a35..74768df0070 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Sicherheits- & Einrichtungswarnungen",
     "Cron" : "Cron",
     "Sharing" : "Teilen",
     "Security" : "Sicherheit",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index ba8ac429ea6..92bf1aca6a0 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Security & Setup Warnings",
     "Cron" : "Cron",
     "Sharing" : "Sharing",
     "Security" : "Security",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index a9069f2bca3..17e6280ee21 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Security & Setup Warnings",
     "Cron" : "Cron",
     "Sharing" : "Sharing",
     "Security" : "Security",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index e3e91095806..20aa59d3f20 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Advertencias de configuración y seguridad",
     "Cron" : "Cron",
     "Sharing" : "Compartiendo",
     "Security" : "Seguridad",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 03d28e481f8..b06d34e248b 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Advertencias de configuración y seguridad",
     "Cron" : "Cron",
     "Sharing" : "Compartiendo",
     "Security" : "Seguridad",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 56a7038f581..b0cb951265e 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Turvallisuus- ja asetusvaroitukset",
     "Cron" : "Cron",
     "Sharing" : "Jakaminen",
     "Security" : "Tietoturva",
@@ -95,6 +96,7 @@ OC.L10N.register(
     "Fatal issues only" : "Vain vakavat ongelmat",
     "None" : "Ei mitään",
     "Login" : "Kirjaudu",
+    "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
     "Security Warning" : "Turvallisuusvaroitus",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 0d585195659..727e70de42a 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Turvallisuus- ja asetusvaroitukset",
     "Cron" : "Cron",
     "Sharing" : "Jakaminen",
     "Security" : "Tietoturva",
@@ -93,6 +94,7 @@
     "Fatal issues only" : "Vain vakavat ongelmat",
     "None" : "Ei mitään",
     "Login" : "Kirjaudu",
+    "NT LAN Manager" : "NT LAN Manager",
     "SSL" : "SSL",
     "TLS" : "TLS",
     "Security Warning" : "Turvallisuusvaroitus",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 099e037fc36..6a0666774b9 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "セキュリティ＆セットアップ警告",
     "Cron" : "Cron",
     "Sharing" : "共有",
     "Security" : "セキュリティ",
@@ -85,6 +86,7 @@ OC.L10N.register(
     "A valid password must be provided" : "有効なパスワードを指定する必要があります",
     "Warning: Home directory for user \"{user}\" already exists" : "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
     "__language_name__" : "Japanese (日本語)",
+    "Personal Info" : "個人情報",
     "SSL root certificates" : "SSLルート証明書",
     "Encryption" : "暗号化",
     "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
@@ -154,6 +156,7 @@ OC.L10N.register(
     "Credentials" : "資格情報",
     "SMTP Username" : "SMTP ユーザー名",
     "SMTP Password" : "SMTP パスワード",
+    "Store credentials" : "資格情報を保存",
     "Test email settings" : "メール設定のテスト",
     "Send email" : "メールを送信",
     "Log level" : "ログレベル",
@@ -162,10 +165,13 @@ OC.L10N.register(
     "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
     "More apps" : "他のアプリ",
+    "Add your app" : "アプリを追加",
     "by" : "により",
+    "licensed" : "ライセンスされた",
     "Documentation:" : "ドキュメント:",
     "User Documentation" : "ユーザードキュメント",
     "Admin Documentation" : "管理者ドキュメント",
+    "Update to %s" : "%sにアップデート",
     "Enable only for specific groups" : "特定のグループのみ有効に",
     "Uninstall App" : "アプリをアンインストール",
     "Administrator Documentation" : "管理者ドキュメント",
@@ -224,6 +230,7 @@ OC.L10N.register(
     "Unlimited" : "無制限",
     "Other" : "その他",
     "Username" : "ユーザーID",
+    "Group Admin for" : "グループ管理者",
     "Quota" : "クオータ",
     "Storage Location" : "データの保存場所",
     "Last Login" : "最終ログイン",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 03e9b548f45..7a8c2820527 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "セキュリティ＆セットアップ警告",
     "Cron" : "Cron",
     "Sharing" : "共有",
     "Security" : "セキュリティ",
@@ -83,6 +84,7 @@
     "A valid password must be provided" : "有効なパスワードを指定する必要があります",
     "Warning: Home directory for user \"{user}\" already exists" : "警告: ユーザー \"{user}\" のホームディレクトリはすでに存在します",
     "__language_name__" : "Japanese (日本語)",
+    "Personal Info" : "個人情報",
     "SSL root certificates" : "SSLルート証明書",
     "Encryption" : "暗号化",
     "Everything (fatal issues, errors, warnings, info, debug)" : "すべて (致命的な問題、エラー、警告、情報、デバッグ)",
@@ -152,6 +154,7 @@
     "Credentials" : "資格情報",
     "SMTP Username" : "SMTP ユーザー名",
     "SMTP Password" : "SMTP パスワード",
+    "Store credentials" : "資格情報を保存",
     "Test email settings" : "メール設定のテスト",
     "Send email" : "メールを送信",
     "Log level" : "ログレベル",
@@ -160,10 +163,13 @@
     "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud コミュニティ</a>により開発されています。 <a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>は、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスの下で提供されています。",
     "More apps" : "他のアプリ",
+    "Add your app" : "アプリを追加",
     "by" : "により",
+    "licensed" : "ライセンスされた",
     "Documentation:" : "ドキュメント:",
     "User Documentation" : "ユーザードキュメント",
     "Admin Documentation" : "管理者ドキュメント",
+    "Update to %s" : "%sにアップデート",
     "Enable only for specific groups" : "特定のグループのみ有効に",
     "Uninstall App" : "アプリをアンインストール",
     "Administrator Documentation" : "管理者ドキュメント",
@@ -222,6 +228,7 @@
     "Unlimited" : "無制限",
     "Other" : "その他",
     "Username" : "ユーザーID",
+    "Group Admin for" : "グループ管理者",
     "Quota" : "クオータ",
     "Storage Location" : "データの保存場所",
     "Last Login" : "最終ログイン",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 6b8266b18a7..39cc2cd2b9f 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Avisos de Segurança & Configuração",
     "Cron" : "Cron",
     "Sharing" : "Compartilhamento",
     "Security" : "Segurança",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 7a2a4636179..f520b09e3b3 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Avisos de Segurança & Configuração",
     "Cron" : "Cron",
     "Sharing" : "Compartilhamento",
     "Security" : "Segurança",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index ce289a2fc4a..2411c0d4bd8 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Avisos de Segurança e Configuração",
     "Cron" : "Cron",
     "Sharing" : "Partilha",
     "Security" : "Segurança",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index d1f5aff6776..c12f01f52f1 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Avisos de Segurança e Configuração",
     "Cron" : "Cron",
     "Sharing" : "Partilha",
     "Security" : "Segurança",
-- 
GitLab


From 17f54a5fb6e87a70e8a2a89c47005223d81c0be3 Mon Sep 17 00:00:00 2001
From: unclejamal3000 <andreas.pramhaas@posteo.de>
Date: Sun, 2 Nov 2014 00:30:44 +0100
Subject: [PATCH 291/616] Enhance question in DB migration script

---
 core/command/db/converttype.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 39e87853d60..2188b1135bb 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -180,7 +180,7 @@ class ConvertType extends Command {
 			$dialog = $this->getHelperSet()->get('dialog');
 			if (!$dialog->askConfirmation(
 				$output,
-				'<question>Continue with the conversion?</question>',
+				'<question>Continue with the conversion (y/n)? [n] </question>',
 				false
 			)) {
 				return;
-- 
GitLab


From 469b2655d5dc3c6db68f4528e18e2d79519be062 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 2 Nov 2014 01:54:29 -0400
Subject: [PATCH 292/616] [tx-robot] updated from transifex

---
 apps/files_external/l10n/fr.js      | 4 ++--
 apps/files_external/l10n/fr.json    | 4 ++--
 apps/user_ldap/l10n/fr.js           | 1 +
 apps/user_ldap/l10n/fr.json         | 1 +
 apps/user_ldap/l10n/ja.js           | 4 ++++
 apps/user_ldap/l10n/ja.json         | 4 ++++
 apps/user_ldap/l10n/nl.js           | 1 +
 apps/user_ldap/l10n/nl.json         | 1 +
 l10n/templates/core.pot             | 2 +-
 l10n/templates/files.pot            | 2 +-
 l10n/templates/files_encryption.pot | 2 +-
 l10n/templates/files_external.pot   | 2 +-
 l10n/templates/files_sharing.pot    | 2 +-
 l10n/templates/files_trashbin.pot   | 2 +-
 l10n/templates/files_versions.pot   | 2 +-
 l10n/templates/lib.pot              | 2 +-
 l10n/templates/private.pot          | 2 +-
 l10n/templates/settings.pot         | 2 +-
 l10n/templates/user_ldap.pot        | 2 +-
 l10n/templates/user_webdavauth.pot  | 2 +-
 settings/l10n/fr.js                 | 1 +
 settings/l10n/fr.json               | 1 +
 settings/l10n/nl.js                 | 1 +
 settings/l10n/nl.json               | 1 +
 24 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 65ca0ac02d6..bdaf0a19b01 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -39,7 +39,7 @@ OC.L10N.register(
     "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" : "Temps maximal de requête HTTP en seconde",
     "Share" : "Partager",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC",
+    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
     "Username as share" : "Nom d'utilisateur du partage",
     "URL" : "URL",
     "Secure https://" : "Sécurisation https://",
@@ -68,7 +68,7 @@ OC.L10N.register(
     "Available for" : "Disponible pour",
     "Add storage" : "Ajouter un support de stockage",
     "Delete" : "Supprimer",
-    "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs",
+    "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
     "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index 02abcba6dde..e9f1c91b30d 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -37,7 +37,7 @@
     "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" : "Temps maximal de requête HTTP en seconde",
     "Share" : "Partager",
-    "SMB / CIFS using OC login" : "SMB / CIFS utilise le nom d'utilisateur OC",
+    "SMB / CIFS using OC login" : "SMB / CIFS en utilisant les identifiants OC",
     "Username as share" : "Nom d'utilisateur du partage",
     "URL" : "URL",
     "Secure https://" : "Sécurisation https://",
@@ -66,7 +66,7 @@
     "Available for" : "Disponible pour",
     "Add storage" : "Ajouter un support de stockage",
     "Delete" : "Supprimer",
-    "Enable User External Storage" : "Activer le stockage externe pour les utilisateurs",
+    "Enable User External Storage" : "Autoriser les utilisateurs à ajouter des stockages externes",
     "Allow users to mount the following external storage" : "Autorise les utilisateurs à monter les stockage externes suivants"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 2433d051d83..74bc9533eb4 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Avancé",
     "<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 et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 11a4844add6..777376eced0 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -74,6 +74,7 @@
     "Saving" : "Enregistrement...",
     "Back" : "Retour",
     "Continue" : "Poursuivre",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Avancé",
     "<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 et user_webdavauth sont incompatibles. Des dysfonctionnements peuvent survenir. Contactez votre administrateur système pour qu'il désactive l'une d'elles.",
diff --git a/apps/user_ldap/l10n/ja.js b/apps/user_ldap/l10n/ja.js
index 79315a055f1..6494fbb5142 100644
--- a/apps/user_ldap/l10n/ja.js
+++ b/apps/user_ldap/l10n/ja.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Edit raw filter instead" : "フィルタを編集",
     "Raw LDAP filter" : "LDAP フィルタ",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+    "Test Filter" : "フィルターをテスト",
     "groups found" : "グループが見つかりました",
     "Users login with this attribute:" : "この属性でユーザーログイン:",
     "LDAP Username:" : "LDAPユーザー名:",
@@ -67,9 +68,12 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。",
     "One Base DN per line" : "1行に1つのベースDN",
     "You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
+    "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
     "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
     "users found" : "ユーザーが見つかりました",
+    "Saving" : "保存中",
     "Back" : "戻る",
     "Continue" : "続ける",
     "LDAP" : "LDAP",
diff --git a/apps/user_ldap/l10n/ja.json b/apps/user_ldap/l10n/ja.json
index da903e15d17..2e714112f19 100644
--- a/apps/user_ldap/l10n/ja.json
+++ b/apps/user_ldap/l10n/ja.json
@@ -46,6 +46,7 @@
     "Edit raw filter instead" : "フィルタを編集",
     "Raw LDAP filter" : "LDAP フィルタ",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "フィルタは、どの LDAP グループが %s にアクセスするかを指定します。",
+    "Test Filter" : "フィルターをテスト",
     "groups found" : "グループが見つかりました",
     "Users login with this attribute:" : "この属性でユーザーログイン:",
     "LDAP Username:" : "LDAPユーザー名:",
@@ -65,9 +66,12 @@
     "For anonymous access, leave DN and Password empty." : "匿名アクセスの場合は、DNとパスワードを空にしてください。",
     "One Base DN per line" : "1行に1つのベースDN",
     "You can specify Base DN for users and groups in the Advanced tab" : "拡張タブでユーザーとグループのベースDNを指定することができます。",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "自動LDAP問合せを停止。大規模な設定には適していますが、LDAPの知識がいくらか必要になります。",
+    "Manually enter LDAP filters (recommended for large directories)" : "手動でLDAPフィルターを入力(大規模ディレクトリ時のみ推奨)",
     "Limit %s access to users meeting these criteria:" : "この基準を満たすユーザーに対し %s へのアクセスを制限:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "フィルタは、どのLDAPユーザーが %s にアクセスするかを指定します。",
     "users found" : "ユーザーが見つかりました",
+    "Saving" : "保存中",
     "Back" : "戻る",
     "Continue" : "続ける",
     "LDAP" : "LDAP",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index c74584f7512..77646a90a88 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Opslaan",
     "Back" : "Terug",
     "Continue" : "Verder",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Geavanceerd",
     "<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index af6246ba39d..6f0a9ec1c01 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -74,6 +74,7 @@
     "Saving" : "Opslaan",
     "Back" : "Terug",
     "Continue" : "Verder",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Geavanceerd",
     "<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>Waarschuwing:</b> De Apps user_ldap en user_webdavauth zijn incompatible. U kunt onverwacht gedrag ervaren. Vraag uw beheerder om een van beide apps de deactiveren.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ebe80ad8474..72862a21690 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 6ecabf891f3..455bbf0e3d6 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index bf284821772..2e4d031a46d 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index e31d628a483..c4ce2ccdbe3 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index caa1fbec3f8..db6c9a98fe5 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index ded0d7847c0..0b6f1544ca4 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index d43952c5197..d1913eb573a 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index ddeca8d08a2..bcdc7f0f009 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index f3db3159c5e..ae5ba798e19 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index c90804dcd61..75000585a1b 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 49443caa423..c69c23d50ff 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index ee3a6ec2bb4..2f1e2e17426 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-01 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 07fecc6e3bd..f2269b78eae 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Alertes de sécurité ou de configuration",
     "Cron" : "Cron",
     "Sharing" : "Partage",
     "Security" : "Sécurité",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index f473adc4f1b..55fcf7a42e3 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Alertes de sécurité ou de configuration",
     "Cron" : "Cron",
     "Sharing" : "Partage",
     "Security" : "Sécurité",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index ef4613cb4eb..950f8ead76d 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Beveiligings- en instellingswaarschuwingen",
     "Cron" : "Cron",
     "Sharing" : "Delen",
     "Security" : "Beveiliging",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index fc060810daa..d23d84847a3 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Beveiligings- en instellingswaarschuwingen",
     "Cron" : "Cron",
     "Sharing" : "Delen",
     "Security" : "Beveiliging",
-- 
GitLab


From fd480d6c4054c9dd784804dd90646ee9796cd4ff Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 2 Nov 2014 01:54:24 -0500
Subject: [PATCH 293/616] [tx-robot] updated from transifex

---
 apps/user_ldap/l10n/it.js           | 1 +
 apps/user_ldap/l10n/it.json         | 1 +
 l10n/templates/core.pot             | 2 +-
 l10n/templates/files.pot            | 2 +-
 l10n/templates/files_encryption.pot | 2 +-
 l10n/templates/files_external.pot   | 2 +-
 l10n/templates/files_sharing.pot    | 2 +-
 l10n/templates/files_trashbin.pot   | 2 +-
 l10n/templates/files_versions.pot   | 2 +-
 l10n/templates/lib.pot              | 2 +-
 l10n/templates/private.pot          | 2 +-
 l10n/templates/settings.pot         | 2 +-
 l10n/templates/user_ldap.pot        | 2 +-
 l10n/templates/user_webdavauth.pot  | 2 +-
 settings/l10n/it.js                 | 1 +
 settings/l10n/it.json               | 1 +
 16 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js
index 1ec979a1fee..92bab544984 100644
--- a/apps/user_ldap/l10n/it.js
+++ b/apps/user_ldap/l10n/it.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Salvataggio",
     "Back" : "Indietro",
     "Continue" : "Continua",
+    "LDAP" : "LDAP",
     "Expert" : "Esperto",
     "Advanced" : "Avanzate",
     "<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una.",
diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json
index f99c2c86185..31a694a4b1c 100644
--- a/apps/user_ldap/l10n/it.json
+++ b/apps/user_ldap/l10n/it.json
@@ -74,6 +74,7 @@
     "Saving" : "Salvataggio",
     "Back" : "Indietro",
     "Continue" : "Continua",
+    "LDAP" : "LDAP",
     "Expert" : "Esperto",
     "Advanced" : "Avanzate",
     "<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>Avviso:</b> le applicazioni user_ldap e user_webdavauth sono incompatibili. Potresti riscontrare un comportamento inatteso. Chiedi al tuo amministratore di sistema di disabilitarne una.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 72862a21690..4732ed771b3 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 455bbf0e3d6..f879ac5e0fe 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 2e4d031a46d..27715e65574 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index c4ce2ccdbe3..c06d9f60927 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index db6c9a98fe5..f5d6178af40 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 0b6f1544ca4..9d4235a37de 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index d1913eb573a..d9676e7e51f 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index bcdc7f0f009..e4ef381725c 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index ae5ba798e19..90271ed9086 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 75000585a1b..b45cef7219b 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index c69c23d50ff..7ca5291aace 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 2f1e2e17426..a2dbab3f565 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0400\n"
+"POT-Creation-Date: 2014-11-02 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 7504cd3ee83..96bd958a6f5 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Avviso di sicurezza e configurazione",
     "Cron" : "Cron",
     "Sharing" : "Condivisione",
     "Security" : "Protezione",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 713a8365149..dc0209621b4 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Avviso di sicurezza e configurazione",
     "Cron" : "Cron",
     "Sharing" : "Condivisione",
     "Security" : "Protezione",
-- 
GitLab


From 1a5d860be81837e598bbf0eb8039b271504fced0 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 3 Nov 2014 01:54:31 -0500
Subject: [PATCH 294/616] [tx-robot] updated from transifex

---
 l10n/templates/core.pot             | 2 +-
 l10n/templates/files.pot            | 2 +-
 l10n/templates/files_encryption.pot | 2 +-
 l10n/templates/files_external.pot   | 2 +-
 l10n/templates/files_sharing.pot    | 2 +-
 l10n/templates/files_trashbin.pot   | 2 +-
 l10n/templates/files_versions.pot   | 2 +-
 l10n/templates/lib.pot              | 2 +-
 l10n/templates/private.pot          | 2 +-
 l10n/templates/settings.pot         | 2 +-
 l10n/templates/user_ldap.pot        | 2 +-
 l10n/templates/user_webdavauth.pot  | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 4732ed771b3..9d93bef8ef3 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index f879ac5e0fe..56036d019be 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 27715e65574..51d82e2c5b0 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index c06d9f60927..e00bdc759f1 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index f5d6178af40..70655384a8e 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 9d4235a37de..d7e11d059c0 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index d9676e7e51f..8537841c0ed 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index e4ef381725c..7a46a69a8f9 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 90271ed9086..5e2d44606ad 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index b45cef7219b..0c15cfa412c 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 7ca5291aace..211bc68e8d0 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index a2dbab3f565..890678fa86e 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-02 01:54-0500\n"
+"POT-Creation-Date: 2014-11-03 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-- 
GitLab


From d1410b46a9822aefc6547db95add1c1f7fa1f617 Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@owncloud.com>
Date: Fri, 19 Sep 2014 00:01:57 +0200
Subject: [PATCH 295/616] user_ldap: Reimplement convertSID2Str() without
 BCMath dependency.

Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
---
 apps/user_ldap/lib/access.php     |  48 +++++++++++++----------
 apps/user_ldap/tests/access.php   |  63 ++++++++++++++----------------
 apps/user_ldap/tests/data/sid.dat | Bin 24 -> 0 bytes
 3 files changed, 57 insertions(+), 54 deletions(-)
 delete mode 100644 apps/user_ldap/tests/data/sid.dat

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 159b0d73000..8db0a9cfae2 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1316,32 +1316,38 @@ class Access extends LDAPUtility implements user\IUserTools {
 	 * converts a binary SID into a string representation
 	 * @param string $sid
 	 * @return string
-	 * @link http://blogs.freebsdish.org/tmclaugh/2010/07/21/finding-a-users-primary-group-in-ad/#comment-2855
 	 */
 	public function convertSID2Str($sid) {
-		try {
-			if(!function_exists('bcadd')) {
-				\OCP\Util::writeLog('user_ldap',
-					'You need to install bcmath module for PHP to have support ' .
-					'for AD primary groups', \OCP\Util::WARN);
-				throw new \Exception('missing bcmath module');
-			}
-			$srl = ord($sid[0]);
-			$numberSubID = ord($sid[1]);
-			$x = substr($sid, 2, 6);
-			$h = unpack('N', "\x0\x0" . substr($x,0,2));
-			$l = unpack('N', substr($x,2,6));
-			$iav = bcadd(bcmul($h[1], bcpow(2,32)), $l[1]);
-			$subIDs = array();
-			for ($i=0; $i<$numberSubID; $i++) {
-				$subID = unpack('V', substr($sid, 8+4*$i, 4));
-				$subIDs[] = $subID[1];
-			}
-		} catch (\Exception $e) {
+		// The format of a SID binary string is as follows:
+		// 1 byte for the revision level
+		// 1 byte for the number n of variable sub-ids
+		// 6 bytes for identifier authority value
+		// n*4 bytes for n sub-ids
+		//
+		// Example: 010400000000000515000000a681e50e4d6c6c2bca32055f
+		//  Legend: RRNNAAAAAAAAAAAA11111111222222223333333344444444
+		$revision = ord($sid[0]);
+		$numberSubID = ord($sid[1]);
+
+		$subIdStart = 8; // 1 + 1 + 6
+		$subIdLength = 4;
+		if (strlen($sid) !== $subIdStart + $subIdLength * $numberSubID) {
+			// Incorrect number of bytes present.
 			return '';
 		}
 
-		return sprintf('S-%d-%d-%s', $srl, $iav, implode('-', $subIDs));
+		// 6 bytes = 48 bits can be represented using floats without loss of
+		// precision (see https://gist.github.com/bantu/886ac680b0aef5812f71)
+		$iav = number_format(hexdec(bin2hex(substr($sid, 2, 6))), 0, '', '');
+
+		$subIDs = array();
+		for ($i = 0; $i < $numberSubID; $i++) {
+			$subID = unpack('V', substr($sid, $subIdStart + $subIdLength * $i, $subIdLength));
+			$subIDs[] = sprintf('%u', $subID[1]);
+		}
+
+		// Result for example above: S-1-5-21-249921958-728525901-1594176202
+		return sprintf('S-%d-%s-%s', $revision, $iav, implode('-', $subIDs));
 	}
 
 	/**
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index f436784675d..8ff39800808 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -78,55 +78,52 @@ class Test_Access extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($expected === $access->escapeFilterPart($input));
 	}
 
-	public function testConvertSID2StrSuccess() {
+	/** @dataProvider convertSID2StrSuccessData */
+	public function testConvertSID2StrSuccess(array $sidArray, $sidExpected) {
 		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
-		if(!function_exists('\bcadd')) {
-			$this->markTestSkipped('bcmath not available');
-		}
-
-		$sidBinary = file_get_contents(__DIR__ . '/data/sid.dat');
-		$sidExpected = 'S-1-5-21-249921958-728525901-1594176202';
-
+		$sidBinary = implode('', $sidArray);
 		$this->assertSame($sidExpected, $access->convertSID2Str($sidBinary));
 	}
 
+	public function convertSID2StrSuccessData() {
+		return array(
+			array(
+				array(
+					"\x01",
+					"\x04",
+					"\x00\x00\x00\x00\x00\x05",
+					"\x15\x00\x00\x00",
+					"\xa6\x81\xe5\x0e",
+					"\x4d\x6c\x6c\x2b",
+					"\xca\x32\x05\x5f",
+				),
+				'S-1-5-21-249921958-728525901-1594176202',
+			),
+			array(
+				array(
+					"\x01",
+					"\x02",
+					"\xFF\xFF\xFF\xFF\xFF\xFF",
+					"\xFF\xFF\xFF\xFF",
+					"\xFF\xFF\xFF\xFF",
+				),
+				'S-1-281474976710655-4294967295-4294967295',
+			),
+		);
+	}
+
 	public function testConvertSID2StrInputError() {
 		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
 		$access = new Access($con, $lw, $um);
 
-		if(!function_exists('\bcadd')) {
-			$this->markTestSkipped('bcmath not available');
-		}
-
 		$sidIllegal = 'foobar';
 		$sidExpected = '';
 
 		$this->assertSame($sidExpected, $access->convertSID2Str($sidIllegal));
 	}
 
-	public function testConvertSID2StrNoBCMath() {
-		if(function_exists('\bcadd')) {
-			$removed = false;
-			if(function_exists('runkit_function_remove')) {
-				$removed = !runkit_function_remove('\bcadd');
-			}
-			if(!$removed) {
-				$this->markTestSkipped('bcadd could not be removed for ' .
-					'testing without bcmath');
-			}
-		}
-
-		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
-		$access = new Access($con, $lw, $um);
-
-		$sidBinary = file_get_contents(__DIR__ . '/data/sid.dat');
-		$sidExpected = '';
-
-		$this->assertSame($sidExpected, $access->convertSID2Str($sidBinary));
-	}
-
 	public function testGetDomainDNFromDNSuccess() {
 		list($lw, $con, $um) = $this->getConnecterAndLdapMock();
 		$access = new Access($con, $lw, $um);
diff --git a/apps/user_ldap/tests/data/sid.dat b/apps/user_ldap/tests/data/sid.dat
deleted file mode 100644
index 3d500c6a872f3c8904df6fe85af623dbce42b0b2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24
bcmZQ%VE_SEQ6RCb@hP8gPLB2|Bi48TCDsJ$

-- 
GitLab


From a4f0483f56e7e77fe64ce34f56297c32793acad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 3 Nov 2014 13:52:47 +0100
Subject: [PATCH 296/616] Update Symfony/Console to 2.5 & Update
 Symfony/Routing to 2.5

---
 3rdparty     | 2 +-
 lib/base.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/3rdparty b/3rdparty
index 7534a6a2b75..c37dc06ce29 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 7534a6a2b7549cc5db0a7f32749d962bfe9b2d3d
+Subproject commit c37dc06ce2906813dec3296d1a58c1628c206a31
diff --git a/lib/base.php b/lib/base.php
index 58695f31849..d428d45d90a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -459,8 +459,6 @@ class OC {
 		if (file_exists($vendorAutoLoad)) {
 			$loader = require_once $vendorAutoLoad;
 			$loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple');
-			$loader->add('Symfony\\Component\\Routing',OC::$THIRDPARTYROOT . '/3rdparty/symfony/routing');
-			$loader->add('Symfony\\Component\\Console',OC::$THIRDPARTYROOT . '/3rdparty/symfony/console');
 		} else {
 			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
 			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
-- 
GitLab


From 136b0c22c929ebad933c433c1689977b916d1fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 3 Nov 2014 13:53:59 +0100
Subject: [PATCH 297/616] Fix ctor call in OC\Core\Command\Upgrade

---
 core/command/upgrade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index 5b9432d631b..aaeb63a3124 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -34,6 +34,7 @@ class Upgrade extends Command {
 	 * @param IConfig $config
 	 */
 	public function __construct(IConfig $config) {
+		parent::__construct();
 		$this->config = $config;
 	}
 
-- 
GitLab


From 2a454fd04ddf98f1a7dc17e93ce83299b272dc49 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 3 Nov 2014 15:41:40 +0100
Subject: [PATCH 298/616] Capitalize Checks in admin page

---
 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 f02dedbbc80..bcf57e12a89 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -206,7 +206,7 @@ if ($_['suggestedOverwriteWebroot']) {
 }
 ?>
 <div id="postsetupchecks" class="section">
-	<h2><?php p($l->t('Connectivity checks'));?></h2>
+	<h2><?php p($l->t('Connectivity Checks'));?></h2>
 	<div class="loading"></div>
 	<div class="success hidden"><?php p($l->t('No problems found'));?></div>
 	<div class="errors hidden"></div>
-- 
GitLab


From 9790801268e4afee5277870993fb190431c5b706 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 3 Nov 2014 16:37:04 +0100
Subject: [PATCH 299/616] First check whether it is the default config before
 touchign

Potentially fixes https://github.com/owncloud/core/issues/11678
---
 lib/private/config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/config.php b/lib/private/config.php
index 7bf3863e2a6..f0548442ab5 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -138,7 +138,7 @@ class Config {
 
 		// Include file and merge config
 		foreach ($configFiles as $file) {
-			if(!@touch($file) && $file === $this->configFilePath) {
+			if($file === $this->configFilePath && !@touch($file)) {
 				// Writing to the main config might not be possible, e.g. if the wrong
 				// permissions are set (likely on a new installation)
 				continue;
-- 
GitLab


From e73ccbd4cade0622615ee133496a571ac1d6dba7 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 3 Nov 2014 10:55:52 +0100
Subject: [PATCH 300/616] Migrate "setsecurity.php" to the AppFramework

Add switch to enforce SSL for subdomains

Add unit tests

Add test for boolean values

Camel-case

Fix ugly JS
---
 config/config.sample.php                      |   6 +
 lib/base.php                                  |  15 +-
 settings/admin.php                            |   3 +-
 settings/ajax/setsecurity.php                 |  21 ---
 settings/application.php                      |   9 ++
 .../controller/securitysettingscontroller.php |  95 ++++++++++++
 settings/js/admin.js                          |  30 +++-
 settings/routes.php                           |   8 +-
 settings/templates/admin.php                  |  22 ++-
 .../securitysettingscontrollertest.php        | 138 ++++++++++++++++++
 10 files changed, 311 insertions(+), 36 deletions(-)
 delete mode 100644 settings/ajax/setsecurity.php
 create mode 100644 settings/controller/securitysettingscontroller.php
 create mode 100644 tests/settings/controller/securitysettingscontrollertest.php

diff --git a/config/config.sample.php b/config/config.sample.php
index a53521485e6..1f1447e22ee 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -663,6 +663,12 @@ $CONFIG = array(
  */
 'forcessl' => false,
 
+/**
+ * Change this to ``true`` to require HTTPS connections also for all subdomains.
+ * Works only together when `forcessl` is set to true.
+ */
+'forceSSLforSubdomains' => false,
+
 /**
  * Extra SSL options to be used for configuration.
  */
diff --git a/lib/base.php b/lib/base.php
index d428d45d90a..78ab9580b25 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -229,11 +229,18 @@ class OC {
 
 	public static function checkSSL() {
 		// redirect to https site if configured
-		if (OC_Config::getValue("forcessl", false)) {
-			header('Strict-Transport-Security: max-age=31536000');
-			ini_set("session.cookie_secure", "on");
+		if (\OC::$server->getConfig()->getSystemValue('forcessl', false)) {
+			// Default HSTS policy
+			$header = 'Strict-Transport-Security: max-age=31536000';
+
+			// If SSL for subdomains is enabled add "; includeSubDomains" to the header
+			if(\OC::$server->getConfig()->getSystemValue('forceSSLforSubdomains', false)) {
+				$header .= '; includeSubDomains';
+			}
+			header($header);
+			ini_set('session.cookie_secure', 'on');
 			if (OC_Request::serverProtocol() <> 'https' and !OC::$CLI) {
-				$url = "https://" . OC_Request::serverHost() . OC_Request::requestUri();
+				$url = 'https://' . OC_Request::serverHost() . OC_Request::requestUri();
 				header("Location: $url");
 				exit();
 			}
diff --git a/settings/admin.php b/settings/admin.php
index d58b9a597b9..1c1cbd9975f 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -53,7 +53,8 @@ $template->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList));
 
 // Check if connected using HTTPS
 $template->assign('isConnectedViaHTTPS', OC_Request::serverProtocol() === 'https');
-$template->assign('enforceHTTPSEnabled', $config->getSystemValue("forcessl", false));
+$template->assign('enforceHTTPSEnabled', $config->getSystemValue('forcessl', false));
+$template->assign('forceSSLforSubdomainsEnabled', $config->getSystemValue('forceSSLforSubdomains', false));
 
 // If the current web root is non-empty but the web root from the config is,
 // and system cron is used, the URL generator fails to build valid URLs.
diff --git a/settings/ajax/setsecurity.php b/settings/ajax/setsecurity.php
deleted file mode 100644
index f1f737a4943..00000000000
--- a/settings/ajax/setsecurity.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013-2014, Lukas Reschke <lukas@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-OC_Util::checkAdminUser();
-OCP\JSON::callCheck();
-
-if(isset($_POST['enforceHTTPS'])) {
-	 \OC::$server->getConfig()->setSystemValue('forcessl', filter_var($_POST['enforceHTTPS'], FILTER_VALIDATE_BOOLEAN));
-}
-
-if(isset($_POST['trustedDomain'])) {
-	$trustedDomains = \OC::$server->getConfig()->getSystemValue('trusted_domains');
-	$trustedDomains[] = $_POST['trustedDomain'];
-	\OC::$server->getConfig()->setSystemValue('trusted_domains', $trustedDomains);
-}
-
-echo 'true';
diff --git a/settings/application.php b/settings/application.php
index 99d78aff2cc..64aa4671228 100644
--- a/settings/application.php
+++ b/settings/application.php
@@ -13,6 +13,7 @@ namespace OC\Settings;
 use OC\AppFramework\Utility\SimpleContainer;
 use OC\Settings\Controller\AppSettingsController;
 use OC\Settings\Controller\MailSettingsController;
+use OC\Settings\Controller\SecuritySettingsController;
 use \OCP\AppFramework\App;
 use \OCP\Util;
 
@@ -53,6 +54,14 @@ class Application extends App {
 				$c->query('Config')
 			);
 		});
+		$container->registerService('SecuritySettingsController', function(SimpleContainer $c) {
+			return new SecuritySettingsController(
+				$c->query('AppName'),
+				$c->query('Request'),
+				$c->query('Config')
+			);
+		});
+
 		/**
 		 * Core class wrappers
 		 */
diff --git a/settings/controller/securitysettingscontroller.php b/settings/controller/securitysettingscontroller.php
new file mode 100644
index 00000000000..af60df8dc3b
--- /dev/null
+++ b/settings/controller/securitysettingscontroller.php
@@ -0,0 +1,95 @@
+<?php
+/**
+ * @author Lukas Reschke
+ * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Settings\Controller;
+
+use \OCP\AppFramework\Controller;
+use OCP\IRequest;
+use OCP\IConfig;
+
+/**
+ * @package OC\Settings\Controller
+ */
+class SecuritySettingsController extends Controller {
+	/** @var \OCP\IConfig */
+	private $config;
+
+	/**
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param IConfig $config
+	 */
+	public function __construct($appName,
+								IRequest $request,
+								IConfig $config) {
+		parent::__construct($appName, $request);
+		$this->config = $config;
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function returnSuccess() {
+		return array(
+			'status' => 'success'
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function returnError() {
+		return array(
+			'status' => 'error'
+		);
+	}
+
+	/**
+	 * Enforce or disable the enforcement of SSL
+	 * @param boolean $enforceHTTPS Whether SSL should be enforced
+	 * @return array
+	 */
+	public function enforceSSL($enforceHTTPS = false) {
+		if(!is_bool($enforceHTTPS)) {
+			return $this->returnError();
+		}
+		$this->config->setSystemValue('forcessl', $enforceHTTPS);
+
+		return $this->returnSuccess();
+	}
+
+	/**
+	 * Enforce or disable the enforcement for SSL on subdomains
+	 * @param bool $forceSSLforSubdomains Whether SSL on subdomains should be enforced
+	 * @return array
+	 */
+	public function enforceSSLForSubdomains($forceSSLforSubdomains = false) {
+		if(!is_bool($forceSSLforSubdomains)) {
+			return $this->returnError();
+		}
+		$this->config->setSystemValue('forceSSLforSubdomains', $forceSSLforSubdomains);
+
+		return $this->returnSuccess();
+	}
+
+	/**
+	 * Add a new trusted domain
+	 * @param string $newTrustedDomain The newly to add trusted domain
+	 * @return array
+	 */
+	public function trustedDomains($newTrustedDomain) {
+		$trustedDomains = $this->config->getSystemValue('trusted_domains');
+		$trustedDomains[] = $newTrustedDomain;
+		$this->config->setSystemValue('trusted_domains', $trustedDomains);
+
+		return $this->returnSuccess();
+	}
+
+}
diff --git a/settings/js/admin.js b/settings/js/admin.js
index e3a092f71b0..059e48ebabe 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -9,8 +9,8 @@ $(document).ready(function(){
 				if(answer) {
 					$.ajax({
 						type: 'POST',
-						url: OC.generateUrl('settings/ajax/setsecurity.php'),
-						data: { trustedDomain: params.trustDomain }
+						url: OC.generateUrl('settings/admin/security/trustedDomains'),
+						data: { newTrustedDomain: params.trustDomain }
 					}).done(function() {
 						window.location.replace(OC.generateUrl('settings/admin'));
 					});
@@ -73,10 +73,32 @@ $(document).ready(function(){
 		$('#setDefaultExpireDate').toggleClass('hidden', !(this.checked && $('#shareapiDefaultExpireDate')[0].checked));
 	});
 
-	$('#security').change(function(){
-		$.post(OC.filePath('settings','ajax','setsecurity.php'), { enforceHTTPS: $('#forcessl').val() },function(){} );
+	$('#forcessl').change(function(){
+		$(this).val(($(this).val() !== 'true'));
+		var forceSSLForSubdomain = $('#forceSSLforSubdomainsSpan');
+
+		$.post(OC.generateUrl('settings/admin/security/ssl'), {
+			enforceHTTPS: $(this).val()
+		},function(){} );
+
+		if($(this).val() === 'true') {
+			forceSSLForSubdomain.prop('disabled', false);
+			forceSSLForSubdomain.removeClass('hidden');
+		} else {
+			forceSSLForSubdomain.prop('disabled', true);
+			forceSSLForSubdomain.addClass('hidden');
+		}
 	});
 
+	$('#forceSSLforSubdomains').change(function(){
+		$(this).val(($(this).val() !== 'true'));
+
+		$.post(OC.generateUrl('settings/admin/security/ssl/subdomains'), {
+			forceSSLforSubdomains: $(this).val()
+		},function(){} );
+	});
+
+
 	$('#mail_smtpauth').change(function() {
 		if (!this.checked) {
 			$('#mail_credentials').addClass('hidden');
diff --git a/settings/routes.php b/settings/routes.php
index 82167ea6396..7ca33fc2745 100644
--- a/settings/routes.php
+++ b/settings/routes.php
@@ -14,7 +14,11 @@ $application->registerRoutes($this, array('routes' =>array(
 	array('name' => 'MailSettings#storeCredentials', 'url' => '/settings/admin/mailsettings/credentials', 'verb' => 'POST'),
 	array('name' => 'MailSettings#sendTestMail', 'url' => '/settings/admin/mailtest', 'verb' => 'POST'),
 	array('name' => 'AppSettings#listCategories', 'url' => '/settings/apps/categories', 'verb' => 'GET'),
-	array('name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET')
+	array('name' => 'AppSettings#listApps', 'url' => '/settings/apps/list', 'verb' => 'GET'),
+	array('name' => 'SecuritySettings#enforceSSL', 'url' => '/settings/admin/security/ssl', 'verb' => 'POST'),
+	array('name' => 'SecuritySettings#enforceSSLForSubdomains', 'url' => '/settings/admin/security/ssl/subdomains', 'verb' => 'POST'),
+	array('name' => 'SecuritySettings#trustedDomains', 'url' => '/settings/admin/security/trustedDomains', 'verb' => 'POST'),
+
 )));
 
 /** @var $this \OCP\Route\IRouter */
@@ -95,8 +99,6 @@ $this->create('settings_ajax_getlog', '/settings/ajax/getlog.php')
 	->actionInclude('settings/ajax/getlog.php');
 $this->create('settings_ajax_setloglevel', '/settings/ajax/setloglevel.php')
 	->actionInclude('settings/ajax/setloglevel.php');
-$this->create('settings_ajax_setsecurity', '/settings/ajax/setsecurity.php')
-	->actionInclude('settings/ajax/setsecurity.php');
 $this->create('settings_ajax_excludegroups', '/settings/ajax/excludegroups.php')
 	->actionInclude('settings/ajax/excludegroups.php');
 $this->create('settings_ajax_checksetup', '/settings/ajax/checksetup')
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index bcf57e12a89..206d2ada033 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -336,9 +336,9 @@ if ($_['suggestedOverwriteWebroot']) {
 		<input type="checkbox" name="forcessl"  id="forcessl"
 			<?php if ($_['enforceHTTPSEnabled']) {
 				print_unescaped('checked="checked" ');
-				print_unescaped('value="false"');
-			}  else {
 				print_unescaped('value="true"');
+			}  else {
+				print_unescaped('value="false"');
 			}
 			?>
 			<?php if (!$_['isConnectedViaHTTPS']) p('disabled'); ?> />
@@ -346,7 +346,23 @@ if ($_['suggestedOverwriteWebroot']) {
 		<em><?php p($l->t(
 			'Forces the clients to connect to %s via an encrypted connection.',
 			$theme->getName()
-		)); ?></em>
+		)); ?></em><br/>
+		<span id="forceSSLforSubdomainsSpan" <?php if(!$_['enforceHTTPSEnabled']) { print_unescaped('class="hidden"'); } ?>>
+			<input type="checkbox" name="forceSSLforSubdomains"  id="forceSSLforSubdomains"
+				<?php if ($_['forceSSLforSubdomainsEnabled']) {
+					print_unescaped('checked="checked" ');
+					print_unescaped('value="true"');
+				}  else {
+					print_unescaped('value="false"');
+				}
+				?>
+				<?php if (!$_['isConnectedViaHTTPS']) { p('disabled'); } ?> />
+			<label for="forceSSLforSubdomains"><?php p($l->t('Enforce HTTPS for subdomains'));?></label><br/>
+			<em><?php p($l->t(
+					'Forces the clients to connect to %s and subdomains via an encrypted connection.',
+					$theme->getName()
+				)); ?></em>
+		</span>
 		<?php if (!$_['isConnectedViaHTTPS']) {
 			print_unescaped("<br/><em>");
 			p($l->t(
diff --git a/tests/settings/controller/securitysettingscontrollertest.php b/tests/settings/controller/securitysettingscontrollertest.php
new file mode 100644
index 00000000000..d89e4932368
--- /dev/null
+++ b/tests/settings/controller/securitysettingscontrollertest.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * @author Lukas Reschke
+ * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Settings\Controller;
+
+use \OC\Settings\Application;
+
+/**
+ * @package OC\Settings\Controller
+ */
+class SecuritySettingsControllerTest extends \PHPUnit_Framework_TestCase {
+
+	/** @var \OCP\AppFramework\IAppContainer */
+	private $container;
+
+	/** @var SecuritySettingsController */
+	private $securitySettingsController;
+
+	protected function setUp() {
+		$app = new Application();
+		$this->container = $app->getContainer();
+		$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->container['AppName'] = 'settings';
+		$this->securitySettingsController = $this->container['SecuritySettingsController'];
+	}
+
+
+	public function testEnforceSSLEmpty() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('setSystemValue')
+			->with('forcessl', false);
+
+		$response = $this->securitySettingsController->enforceSSL();
+		$expectedResponse = array('status' => 'success');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testEnforceSSL() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('setSystemValue')
+			->with('forcessl', true);
+
+		$response = $this->securitySettingsController->enforceSSL(true);
+		$expectedResponse = array('status' => 'success');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testEnforceSSLInvalid() {
+		$this->container['Config']
+			->expects($this->exactly(0))
+			->method('setSystemValue');
+
+		$response = $this->securitySettingsController->enforceSSL('blah');
+		$expectedResponse = array('status' => 'error');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testEnforceSSLForSubdomainsEmpty() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('setSystemValue')
+			->with('forceSSLforSubdomains', false);
+
+		$response = $this->securitySettingsController->enforceSSLForSubdomains();
+		$expectedResponse = array('status' => 'success');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testEnforceSSLForSubdomains() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('setSystemValue')
+			->with('forceSSLforSubdomains', true);
+
+		$response = $this->securitySettingsController->enforceSSLForSubdomains(true);
+		$expectedResponse = array('status' => 'success');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testEnforceSSLForSubdomainsInvalid() {
+		$this->container['Config']
+			->expects($this->exactly(0))
+			->method('setSystemValue');
+
+		$response = $this->securitySettingsController->enforceSSLForSubdomains('blah');
+		$expectedResponse = array('status' => 'error');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testTrustedDomainsWithExistingValues() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('setSystemValue')
+			->with('trusted_domains', array('owncloud.org', 'owncloud.com', 'newdomain.com'));
+		$this->container['Config']
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('trusted_domains')
+			->will($this->returnValue(array('owncloud.org', 'owncloud.com')));
+
+		$response = $this->securitySettingsController->trustedDomains('newdomain.com');
+		$expectedResponse = array('status' => 'success');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testTrustedDomainsEmpty() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('setSystemValue')
+			->with('trusted_domains', array('newdomain.com'));
+		$this->container['Config']
+			->expects($this->once())
+			->method('getSystemValue')
+			->with('trusted_domains')
+			->will($this->returnValue(''));
+
+		$response = $this->securitySettingsController->trustedDomains('newdomain.com');
+		$expectedResponse = array('status' => 'success');
+
+		$this->assertSame($expectedResponse, $response);
+	}
+}
-- 
GitLab


From 994768d99f0c0ea0e50f30774005a75e7533e105 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 3 Nov 2014 13:10:03 +0100
Subject: [PATCH 301/616] Update Pimple to V3.0

---
 3rdparty                                      |  2 +-
 lib/base.php                                  |  3 +--
 .../dependencyinjection/dicontainer.php       | 20 +++++++++----------
 .../appframework/utility/simplecontainer.php  |  9 ++++++---
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/3rdparty b/3rdparty
index c37dc06ce29..17cdabdae01 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit c37dc06ce2906813dec3296d1a58c1628c206a31
+Subproject commit 17cdabdae0168bd678f859345b0b20a9ae7c9646
diff --git a/lib/base.php b/lib/base.php
index d428d45d90a..7fa53c3a074 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -457,8 +457,7 @@ class OC {
 		// setup 3rdparty autoloader
 		$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
 		if (file_exists($vendorAutoLoad)) {
-			$loader = require_once $vendorAutoLoad;
-			$loader->add('Pimple',OC::$THIRDPARTYROOT . '/3rdparty/Pimple');
+			require_once $vendorAutoLoad;
 		} else {
 			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
 			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
diff --git a/lib/private/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
index f7fee347215..98525ed3202 100644
--- a/lib/private/appframework/dependencyinjection/dicontainer.php
+++ b/lib/private/appframework/dependencyinjection/dicontainer.php
@@ -59,14 +59,14 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 
 		$this->registerParameter('ServerContainer', \OC::$server);
 
-		$this['API'] = $this->share(function($c){
+		$this->registerService('API', function($c){
 			return new API($c['AppName']);
 		});
 
 		/**
 		 * Http
 		 */
-		$this['Request'] = $this->share(function($c) {
+		$this->registerService('Request', function($c) {
 			/** @var $c SimpleContainer */
 			/** @var $server SimpleContainer */
 			$server = $c->query('ServerContainer');
@@ -75,7 +75,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			return $server->getRequest();
 		});
 
-		$this['Protocol'] = $this->share(function($c){
+		$this->registerService('Protocol', function($c){
 			if(isset($_SERVER['SERVER_PROTOCOL'])) {
 				return new Http($_SERVER, $_SERVER['SERVER_PROTOCOL']);
 			} else {
@@ -83,7 +83,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			}
 		});
 
-		$this['Dispatcher'] = $this->share(function($c) {
+		$this->registerService('Dispatcher', function($c) {
 			return new Dispatcher(
 				$c['Protocol'],
 				$c['MiddlewareDispatcher'],
@@ -97,7 +97,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 		 * Middleware
 		 */
 		$app = $this;
-		$this['SecurityMiddleware'] = $this->share(function($c) use ($app){
+		$this->registerService('SecurityMiddleware', function($c) use ($app){
 			return new SecurityMiddleware(
 				$c['Request'],
 				$c['ControllerMethodReflector'],
@@ -110,14 +110,14 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 			);
 		});
 
-		$this['CORSMiddleware'] = $this->share(function($c) {
+		$this->registerService('CORSMiddleware', function($c) {
 			return new CORSMiddleware(
 				$c['Request'],
 				$c['ControllerMethodReflector']
 			);
 		});
 
-		$this['SessionMiddleware'] = $this->share(function($c) use ($app) {
+		$this->registerService('SessionMiddleware', function($c) use ($app) {
 			return new SessionMiddleware(
 				$c['Request'],
 				$c['ControllerMethodReflector'],
@@ -126,7 +126,7 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 		});
 
 		$middleWares = &$this->middleWares;
-		$this['MiddlewareDispatcher'] = $this->share(function($c) use (&$middleWares) {
+		$this->registerService('MiddlewareDispatcher', function($c) use (&$middleWares) {
 			$dispatcher = new MiddlewareDispatcher();
 			$dispatcher->registerMiddleware($c['SecurityMiddleware']);
 			$dispatcher->registerMiddleware($c['CORSMiddleware']);
@@ -143,11 +143,11 @@ class DIContainer extends SimpleContainer implements IAppContainer{
 		/**
 		 * Utilities
 		 */
-		$this['TimeFactory'] = $this->share(function($c){
+		$this->registerService('TimeFactory', function($c){
 			return new TimeFactory();
 		});
 
-		$this['ControllerMethodReflector'] = $this->share(function($c) {
+		$this->registerService('ControllerMethodReflector', function($c) {
 			return new ControllerMethodReflector();
 		});
 
diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index a2d90138dfa..c6effed5b4b 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -7,7 +7,7 @@ namespace OC\AppFramework\Utility;
  *
  * SimpleContainer is a simple implementation of IContainer on basis of \Pimple
  */
-class SimpleContainer extends \Pimple implements \OCP\IContainer {
+class SimpleContainer extends \Pimple\Container implements \OCP\IContainer {
 
 	/**
 	 * @param string $name name of the service to query for
@@ -35,10 +35,13 @@ class SimpleContainer extends \Pimple implements \OCP\IContainer {
 	 * @param bool $shared
 	 */
 	function registerService($name, \Closure $closure, $shared = true) {
+		if (!empty($this[$name]))  {
+			unset($this[$name]);
+		}
 		if ($shared) {
-			$this[$name] = \Pimple::share($closure);
-		} else {
 			$this[$name] = $closure;
+		} else {
+			$this[$name] = parent::factory($closure);
 		}
 	}
 }
-- 
GitLab


From 2b691b9915772e0465e87606369675ee344d5ae4 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 3 Nov 2014 20:30:59 +0100
Subject: [PATCH 302/616] update 3rdparty to master

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 17cdabdae01..43ffb486d5c 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 17cdabdae0168bd678f859345b0b20a9ae7c9646
+Subproject commit 43ffb486d5cc76275c6172832ae253e549b0c060
-- 
GitLab


From d2276215a475062c781f57d80f912f421f4b69fe Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 3 Nov 2014 20:31:53 +0100
Subject: [PATCH 303/616] update 3rdparty to master

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 43ffb486d5c..c23faa08d9c 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 43ffb486d5cc76275c6172832ae253e549b0c060
+Subproject commit c23faa08d9c5937582a298f6af5baf279243cfbf
-- 
GitLab


From d763b320486a3cd475c0e7a1537b0954341287d6 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 3 Nov 2014 11:18:17 +0100
Subject: [PATCH 304/616] ability to add bower resources

* add addVendorScript & addVendorStyle
* refactoring of addScript and addStyle
* add shortcuts vendorScript and vendorStyle
---
 .bowerrc                           |  3 ++
 bower.json                         | 17 +++++++++
 lib/private/template/functions.php | 32 +++++++++++++++++
 lib/private/util.php               | 58 +++++++++++++++++++++---------
 4 files changed, 94 insertions(+), 16 deletions(-)
 create mode 100644 .bowerrc
 create mode 100644 bower.json

diff --git a/.bowerrc b/.bowerrc
new file mode 100644
index 00000000000..107785fb3ee
--- /dev/null
+++ b/.bowerrc
@@ -0,0 +1,3 @@
+{
+	"directory": "core/vendor"
+}
diff --git a/bower.json b/bower.json
new file mode 100644
index 00000000000..3a6d8d73663
--- /dev/null
+++ b/bower.json
@@ -0,0 +1,17 @@
+{
+	"name": "ownCloud",
+	"version": "8.0 pre alpha",
+	"homepage": "http://www.owncloud.org",
+	"license": "AGPL",
+	"private": true,
+	"ignore": [
+		"**/.*",
+		"node_modules",
+		"bower_components",
+		"core/vendor",
+		"test",
+		"tests"
+	],
+	"dependencies": {
+	}
+}
diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index dede604c01d..0e2c5775c46 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -39,6 +39,22 @@ function script($app, $file) {
 	}
 }
 
+/**
+ * Shortcut for adding vendor scripts to a page
+ * @param string $app the appname
+ * @param string|string[] $file the filename,
+ * if an array is given it will add all scripts
+ */
+function vendorScript($app, $file) {
+	if(is_array($file)) {
+		foreach($file as $f) {
+			OC_Util::addVendorScript($app, $f);
+		}
+	} else {
+		OC_Util::addVendorScript($app, $file);
+	}
+}
+
 /**
  * Shortcut for adding styles to a page
  * @param string $app the appname
@@ -55,6 +71,22 @@ function style($app, $file) {
 	}
 }
 
+/**
+ * Shortcut for adding vendor styles to a page
+ * @param string $app the appname
+ * @param string|string[] $file the filename,
+ * if an array is given it will add all styles
+ */
+function vendorStyle($app, $file) {
+	if(is_array($file)) {
+		foreach($file as $f) {
+			OC_Util::addVendorStyle($app, $f);
+		}
+	} else {
+		OC_Util::addVendorStyle($app, $file);
+	}
+}
+
 /**
  * Shortcut for adding translations to a page
  * @param string $app the appname
diff --git a/lib/private/util.php b/lib/private/util.php
index de4bef4cb8a..bee0a579192 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -331,24 +331,47 @@ class OC_Util {
 	}
 
 	/**
-	 * add a javascript file
+	 * generates a path for JS/CSS files. If no application is provided it will create the path for core.
 	 *
-	 * @param string $application application id
-	 * @param string|null $file filename
-	 * @return void
+	 * @param $application application to get the files from
+	 * @param $directory directory withing this application (css, js, vendor, etc)
+	 * @param $file the file inside of the above folder
+	 * @return string the path
 	 */
-	public static function addScript($application, $file = null) {
+	private static function generatePath($application, $directory, $file) {
 		if (is_null($file)) {
 			$file = $application;
 			$application = "";
 		}
 		if (!empty($application)) {
-			self::$scripts[] = "$application/js/$file";
+			return "$application/$directory/$file";
 		} else {
-			self::$scripts[] = "js/$file";
+			return "$directory/$file";
 		}
 	}
 
+	/**
+	 * add a javascript file
+	 *
+	 * @param string $application application id
+	 * @param string|null $file filename
+	 * @return void
+	 */
+	public static function addScript($application, $file = null) {
+		self::$scripts[] = OC_Util::generatePath($application, 'js', $file);
+	}
+
+	/**
+	 * add a javascript file from the vendor sub folder
+	 *
+	 * @param string $application application id
+	 * @param string|null $file filename
+	 * @return void
+	 */
+	public static function addVendorScript($application, $file = null) {
+		self::$scripts[] = OC_Util::generatePath($application, 'vendor', $file);
+	}
+
 	/**
 	 * add a translation JS file
 	 *
@@ -375,15 +398,18 @@ class OC_Util {
 	 * @return void
 	 */
 	public static function addStyle($application, $file = null) {
-		if (is_null($file)) {
-			$file = $application;
-			$application = "";
-		}
-		if (!empty($application)) {
-			self::$styles[] = "$application/css/$file";
-		} else {
-			self::$styles[] = "css/$file";
-		}
+		self::$styles[] = OC_Util::generatePath($application, 'css', $file);
+	}
+
+	/**
+	 * add a css file from the vendor sub folder
+	 *
+	 * @param string $application application id
+	 * @param string|null $file filename
+	 * @return void
+	 */
+	public static function addVendorStyle($application, $file = null) {
+		self::$styles[] = OC_Util::generatePath($application, 'vendor', $file);
 	}
 
 	/**
-- 
GitLab


From 1a405e56f5aa4442c2bdbb41a233fc13b6a101a3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 3 Nov 2014 11:18:52 +0100
Subject: [PATCH 305/616] replace moment.js with bower version

* fix JS unit tests
---
 bower.json                                    |   1 +
 core/js/core.json                             |   6 +-
 core/vendor/.gitignore                        |   8 +
 core/vendor/moment/LICENSE                    |  22 +++
 .../moment/min/moment-with-locales.js}        | 177 +++++++++++++-----
 lib/base.php                                  |   2 +-
 tests/karma.config.js                         |   7 +
 7 files changed, 168 insertions(+), 55 deletions(-)
 create mode 100644 core/vendor/.gitignore
 create mode 100644 core/vendor/moment/LICENSE
 rename core/{js/moment.js => vendor/moment/min/moment-with-locales.js} (98%)

diff --git a/bower.json b/bower.json
index 3a6d8d73663..5476115be1d 100644
--- a/bower.json
+++ b/bower.json
@@ -13,5 +13,6 @@
 		"tests"
 	],
 	"dependencies": {
+		"moment": "~2.8.3"
 	}
 }
diff --git a/core/js/core.json b/core/js/core.json
index e2da1402888..3297b44318d 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -1,4 +1,7 @@
 {
+	"vendor": [
+		"moment/min/moment-with-locales.js"
+	],
 	"libraries": [
 		"jquery-1.10.0.min.js",
 		"jquery-migrate-1.2.1.min.js",
@@ -19,7 +22,6 @@
 		"eventsource.js",
 		"config.js",
 		"multiselect.js",
-		"oc-requesttoken.js",
-		"moment.js"
+		"oc-requesttoken.js"
 	]
 }
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
new file mode 100644
index 00000000000..8d4f4fbe84d
--- /dev/null
+++ b/core/vendor/.gitignore
@@ -0,0 +1,8 @@
+# momentjs - ignore all files except the two listed below
+moment/benchmarks
+moment/locale
+moment/min/**
+moment/*.js*
+moment/*.md
+!moment/LICENSE
+!moment/min/moment-with-locales.js
diff --git a/core/vendor/moment/LICENSE b/core/vendor/moment/LICENSE
new file mode 100644
index 00000000000..bd172467a6b
--- /dev/null
+++ b/core/vendor/moment/LICENSE
@@ -0,0 +1,22 @@
+Copyright (c) 2011-2014 Tim Wood, Iskren Chernev, Moment.js contributors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/js/moment.js b/core/vendor/moment/min/moment-with-locales.js
similarity index 98%
rename from core/js/moment.js
rename to core/vendor/moment/min/moment-with-locales.js
index 6f1dcc5dfab..23d06ef3551 100644
--- a/core/js/moment.js
+++ b/core/vendor/moment/min/moment-with-locales.js
@@ -1,5 +1,5 @@
 //! moment.js
-//! version : 2.8.2
+//! version : 2.8.3
 //! authors : Tim Wood, Iskren Chernev, Moment.js contributors
 //! license : MIT
 //! momentjs.com
@@ -10,7 +10,7 @@
     ************************************/
 
     var moment,
-        VERSION = '2.8.2',
+        VERSION = '2.8.3',
         // the global-scope this is NOT the global object in Node.js
         globalScope = typeof global !== 'undefined' ? global : this,
         oldGlobalMoment,
@@ -1493,6 +1493,9 @@
         for (i = 0; i < config._f.length; i++) {
             currentScore = 0;
             tempConfig = copyConfig({}, config);
+            if (config._useUTC != null) {
+                tempConfig._useUTC = config._useUTC;
+            }
             tempConfig._pf = defaultParsingFlags();
             tempConfig._f = config._f[i];
             makeDateFromStringAndFormat(tempConfig);
@@ -1557,6 +1560,14 @@
         }
     }
 
+    function map(arr, fn) {
+        var res = [], i;
+        for (i = 0; i < arr.length; ++i) {
+            res.push(fn(arr[i], i));
+        }
+        return res;
+    }
+
     function makeDateFromInput(config) {
         var input = config._i, matched;
         if (input === undefined) {
@@ -1568,7 +1579,9 @@
         } else if (typeof input === 'string') {
             makeDateFromString(config);
         } else if (isArray(input)) {
-            config._a = input.slice(0);
+            config._a = map(input.slice(0), function (obj) {
+                return parseInt(obj, 10);
+            });
             dateFromConfig(config);
         } else if (typeof(input) === 'object') {
             dateFromObject(config);
@@ -2123,7 +2136,7 @@
                 this._isUTC = false;
 
                 if (keepLocalTime) {
-                    this.add(this._d.getTimezoneOffset(), 'm');
+                    this.add(this._dateTzOffset(), 'm');
                 }
             }
             return this;
@@ -2141,7 +2154,7 @@
         diff : function (input, units, asFloat) {
             var that = makeAs(input, this),
                 zoneDiff = (this.zone() - that.zone()) * 6e4,
-                diff, output;
+                diff, output, daysAdjust;
 
             units = normalizeUnits(units);
 
@@ -2152,11 +2165,12 @@
                 output = ((this.year() - that.year()) * 12) + (this.month() - that.month());
                 // adjust by taking difference in days, average number of days
                 // and dst in the given months.
-                output += ((this - moment(this).startOf('month')) -
-                        (that - moment(that).startOf('month'))) / diff;
+                daysAdjust = (this - moment(this).startOf('month')) -
+                    (that - moment(that).startOf('month'));
                 // same as above but with zones, to negate all dst
-                output -= ((this.zone() - moment(this).startOf('month').zone()) -
-                        (that.zone() - moment(that).startOf('month').zone())) * 6e4 / diff;
+                daysAdjust -= ((this.zone() - moment(this).startOf('month').zone()) -
+                        (that.zone() - moment(that).startOf('month').zone())) * 6e4;
+                output += daysAdjust / diff;
                 if (units === 'year') {
                     output = output / 12;
                 }
@@ -2265,18 +2279,33 @@
         },
 
         isAfter: function (input, units) {
-            units = typeof units !== 'undefined' ? units : 'millisecond';
-            return +this.clone().startOf(units) > +moment(input).startOf(units);
+            units = normalizeUnits(typeof units !== 'undefined' ? units : 'millisecond');
+            if (units === 'millisecond') {
+                input = moment.isMoment(input) ? input : moment(input);
+                return +this > +input;
+            } else {
+                return +this.clone().startOf(units) > +moment(input).startOf(units);
+            }
         },
 
         isBefore: function (input, units) {
-            units = typeof units !== 'undefined' ? units : 'millisecond';
-            return +this.clone().startOf(units) < +moment(input).startOf(units);
+            units = normalizeUnits(typeof units !== 'undefined' ? units : 'millisecond');
+            if (units === 'millisecond') {
+                input = moment.isMoment(input) ? input : moment(input);
+                return +this < +input;
+            } else {
+                return +this.clone().startOf(units) < +moment(input).startOf(units);
+            }
         },
 
         isSame: function (input, units) {
-            units = units || 'ms';
-            return +this.clone().startOf(units) === +makeAs(input, this).startOf(units);
+            units = normalizeUnits(units || 'millisecond');
+            if (units === 'millisecond') {
+                input = moment.isMoment(input) ? input : moment(input);
+                return +this === +input;
+            } else {
+                return +this.clone().startOf(units) === +makeAs(input, this).startOf(units);
+            }
         },
 
         min: deprecate(
@@ -2316,7 +2345,7 @@
                     input = input * 60;
                 }
                 if (!this._isUTC && keepLocalTime) {
-                    localAdjust = this._d.getTimezoneOffset();
+                    localAdjust = this._dateTzOffset();
                 }
                 this._offset = input;
                 this._isUTC = true;
@@ -2334,7 +2363,7 @@
                     }
                 }
             } else {
-                return this._isUTC ? offset : this._d.getTimezoneOffset();
+                return this._isUTC ? offset : this._dateTzOffset();
             }
             return this;
         },
@@ -2438,10 +2467,15 @@
         // instance.  Otherwise, it will return the locale configuration
         // variables for this instance.
         locale : function (key) {
+            var newLocaleData;
+
             if (key === undefined) {
                 return this._locale._abbr;
             } else {
-                this._locale = moment.localeData(key);
+                newLocaleData = moment.localeData(key);
+                if (newLocaleData != null) {
+                    this._locale = newLocaleData;
+                }
                 return this;
             }
         },
@@ -2452,14 +2486,19 @@
                 if (key === undefined) {
                     return this.localeData();
                 } else {
-                    this._locale = moment.localeData(key);
-                    return this;
+                    return this.locale(key);
                 }
             }
         ),
 
         localeData : function () {
             return this._locale;
+        },
+
+        _dateTzOffset : function () {
+            // On Firefox.24 Date#getTimezoneOffset returns a floating point.
+            // https://github.com/moment/moment/pull/1871
+            return Math.round(this._d.getTimezoneOffset() / 15) * 15;
         }
     });
 
@@ -2657,19 +2696,21 @@
             var days, months;
             units = normalizeUnits(units);
 
-            days = this._days + this._milliseconds / 864e5;
             if (units === 'month' || units === 'year') {
+                days = this._days + this._milliseconds / 864e5;
                 months = this._months + daysToYears(days) * 12;
                 return units === 'month' ? months : months / 12;
             } else {
-                days += yearsToDays(this._months / 12);
+                // handle milliseconds separately because of floating point math errors (issue #1867)
+                days = this._days + yearsToDays(this._months / 12);
                 switch (units) {
-                    case 'week': return days / 7;
-                    case 'day': return days;
-                    case 'hour': return days * 24;
-                    case 'minute': return days * 24 * 60;
-                    case 'second': return days * 24 * 60 * 60;
-                    case 'millisecond': return days * 24 * 60 * 60 * 1000;
+                    case 'week': return days / 7 + this._milliseconds / 6048e5;
+                    case 'day': return days + this._milliseconds / 864e5;
+                    case 'hour': return days * 24 + this._milliseconds / 36e5;
+                    case 'minute': return days * 24 * 60 + this._milliseconds / 6e4;
+                    case 'second': return days * 24 * 60 * 60 + this._milliseconds / 1000;
+                    // Math.floor prevents floating point math errors here
+                    case 'millisecond': return Math.floor(days * 24 * 60 * 60 * 1000) + this._milliseconds;
                     default: throw new Error('Unknown unit ' + units);
                 }
             }
@@ -2973,9 +3014,10 @@
     });
 }));
 // moment.js locale configuration
-// locale : Arabic (ar)
-// author : Abdel Said : https://github.com/abdelsaid
-// changes in months, weekdays : Ahmed Elkhatib
+// Locale: Arabic (ar)
+// Author: Abdel Said: https://github.com/abdelsaid
+// Changes in months, weekdays: Ahmed Elkhatib
+// Native plural forms: forabi https://github.com/forabi
 
 (function (factory) {
     factory(moment);
@@ -3002,11 +3044,42 @@
         '٨': '8',
         '٩': '9',
         '٠': '0'
-    };
+    }, pluralForm = function (n) {
+        return n === 0 ? 0 : n === 1 ? 1 : n === 2 ? 2 : n % 100 >= 3 && n % 100 <= 10 ? 3 : n % 100 >= 11 ? 4 : 5;
+    }, plurals = {
+        s : ['أقل من ثانية', 'ثانية واحدة', ['ثانيتان', 'ثانيتين'], '%d ثوان', '%d ثانية', '%d ثانية'],
+        m : ['أقل من دقيقة', 'دقيقة واحدة', ['دقيقتان', 'دقيقتين'], '%d دقائق', '%d دقيقة', '%d دقيقة'],
+        h : ['أقل من ساعة', 'ساعة واحدة', ['ساعتان', 'ساعتين'], '%d ساعات', '%d ساعة', '%d ساعة'],
+        d : ['أقل من يوم', 'يوم واحد', ['يومان', 'يومين'], '%d أيام', '%d يومًا', '%d يوم'],
+        M : ['أقل من شهر', 'شهر واحد', ['شهران', 'شهرين'], '%d أشهر', '%d شهرا', '%d شهر'],
+        y : ['أقل من عام', 'عام واحد', ['عامان', 'عامين'], '%d أعوام', '%d عامًا', '%d عام']
+    }, pluralize = function (u) {
+        return function (number, withoutSuffix, string, isFuture) {
+            var f = pluralForm(number),
+                str = plurals[u][pluralForm(number)];
+            if (f === 2) {
+                str = str[withoutSuffix ? 0 : 1];
+            }
+            return str.replace(/%d/i, number);
+        };
+    }, months = [
+        'كانون الثاني يناير',
+        'شباط فبراير',
+        'آذار مارس',
+        'نيسان أبريل',
+        'أيار مايو',
+        'حزيران يونيو',
+        'تموز يوليو',
+        'آب أغسطس',
+        'أيلول سبتمبر',
+        'تشرين الأول أكتوبر',
+        'تشرين الثاني نوفمبر',
+        'كانون الأول ديسمبر'
+    ];
 
     return moment.defineLocale('ar', {
-        months : 'يناير/ كانون الثاني_فبراير/ شباط_مارس/ آذار_أبريل/ نيسان_مايو/ أيار_يونيو/ حزيران_يوليو/ تموز_أغسطس/ آب_سبتمبر/ أيلول_أكتوبر/ تشرين الأول_نوفمبر/ تشرين الثاني_ديسمبر/ كانون الأول'.split('_'),
-        monthsShort : 'يناير/ كانون الثاني_فبراير/ شباط_مارس/ آذار_أبريل/ نيسان_مايو/ أيار_يونيو/ حزيران_يوليو/ تموز_أغسطس/ آب_سبتمبر/ أيلول_أكتوبر/ تشرين الأول_نوفمبر/ تشرين الثاني_ديسمبر/ كانون الأول'.split('_'),
+        months : months,
+        monthsShort : months,
         weekdays : 'الأحد_الإثنين_الثلاثاء_الأربعاء_الخميس_الجمعة_السبت'.split('_'),
         weekdaysShort : 'أحد_إثنين_ثلاثاء_أربعاء_خميس_جمعة_سبت'.split('_'),
         weekdaysMin : 'ح_ن_ث_ر_خ_ج_س'.split('_'),
@@ -3025,27 +3098,27 @@
             }
         },
         calendar : {
-            sameDay: '[اليوم على الساعة] LT',
-            nextDay: '[غدا على الساعة] LT',
-            nextWeek: 'dddd [على الساعة] LT',
-            lastDay: '[أمس على الساعة] LT',
-            lastWeek: 'dddd [على الساعة] LT',
+            sameDay: '[اليوم عند الساعة] LT',
+            nextDay: '[غدًا عند الساعة] LT',
+            nextWeek: 'dddd [عند الساعة] LT',
+            lastDay: '[أمس عند الساعة] LT',
+            lastWeek: 'dddd [عند الساعة] LT',
             sameElse: 'L'
         },
         relativeTime : {
-            future : 'في %s',
+            future : 'بعد %s',
             past : 'منذ %s',
-            s : 'ثوان',
-            m : 'دقيقة',
-            mm : '%d دقائق',
-            h : 'ساعة',
-            hh : '%d ساعات',
-            d : 'يوم',
-            dd : '%d أيام',
-            M : 'شهر',
-            MM : '%d أشهر',
-            y : 'سنة',
-            yy : '%d سنوات'
+            s : pluralize('s'),
+            m : pluralize('m'),
+            mm : pluralize('m'),
+            h : pluralize('h'),
+            hh : pluralize('h'),
+            d : pluralize('d'),
+            dd : pluralize('d'),
+            M : pluralize('M'),
+            MM : pluralize('M'),
+            y : pluralize('y'),
+            yy : pluralize('y')
         },
         preparse: function (string) {
             return string.replace(/[۰-۹]/g, function (match) {
@@ -3954,7 +4027,7 @@
         weekdaysShort : 'ne_po_út_st_čt_pá_so'.split('_'),
         weekdaysMin : 'ne_po_út_st_čt_pá_so'.split('_'),
         longDateFormat : {
-            LT: 'H.mm',
+            LT: 'H:mm',
             L : 'DD. MM. YYYY',
             LL : 'D. MMMM YYYY',
             LLL : 'D. MMMM YYYY LT',
diff --git a/lib/base.php b/lib/base.php
index 7fa53c3a074..11c5167786d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -348,7 +348,7 @@ class OC {
 		OC_Util::addScript("oc-requesttoken");
 		OC_Util::addScript("apps");
 		OC_Util::addScript("snap");
-		OC_Util::addScript("moment");
+		OC_Util::addVendorScript('moment/min/moment-with-locales');
 
 		// avatars
 		if (\OC_Config::getValue('enable_avatars', true) === true) {
diff --git a/tests/karma.config.js b/tests/karma.config.js
index 357fcf3f122..f67fa9977c2 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -99,6 +99,7 @@ module.exports = function(config) {
 	// note that the loading order is important that's why they
 	// are specified in a separate file
 	var corePath = 'core/js/';
+	var vendorPath = 'core/vendor/';
 	var coreModule = require('../' + corePath + 'core.json');
 	var testCore = false;
 	var files = [];
@@ -134,6 +135,12 @@ module.exports = function(config) {
 		}
 	}
 
+	// add vendor library files
+	for ( i = 0; i < coreModule.vendor.length; i++ ) {
+		srcFile = vendorPath + coreModule.vendor[i];
+		files.push(srcFile);
+	}
+
 	// TODO: settings pages
 
 	// need to test the core app as well ?
-- 
GitLab


From be5ae6c44f8fae9364c0be65f4f685d7c1afa104 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 3 Nov 2014 21:13:07 +0100
Subject: [PATCH 306/616] Support HTML in logo claim

---
 core/templates/layout.user.php |  2 +-
 lib/private/defaults.php       | 12 ++++++++++++
 lib/public/defaults.php        |  8 ++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9f94344b21b..f7f2b3dc735 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -49,7 +49,7 @@
 						if(OC_Util::getEditionString() === '') {
 							p(!empty($_['application'])?$_['application']: $l->t('Apps'));
 						} else {
-							p($theme->getName());
+							print_unescaped($theme->getHTMLName());
 						}
 					?>
 				</div>
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index cc6c819f03f..c16ebdbe24c 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -156,6 +156,18 @@ class OC_Defaults {
 		}
 	}
 
+	/**
+	 * Returns the short name of the software containing HTML strings
+	 * @return string title
+	 */
+	public function getHTMLName() {
+		if ($this->themeExist('getHTMLName')) {
+			return $this->theme->getHTMLName();
+		} else {
+			return $this->defaultName;
+		}
+	}
+
 	/**
 	 * Returns entity (e.g. company name) - used for footer, copyright
 	 * @return string entity name
diff --git a/lib/public/defaults.php b/lib/public/defaults.php
index 9af31245ff4..662071a29a9 100644
--- a/lib/public/defaults.php
+++ b/lib/public/defaults.php
@@ -97,6 +97,14 @@ class Defaults {
 		return $this->defaults->getName();
 	}
 
+	/**
+	 * name of your ownCloud instance containing HTML styles
+	 * @return string
+	 */
+	public function getHTMLName() {
+		return $this->defaults->getHTMLName();
+	}
+
 	/**
 	 * Entity behind your onwCloud instance
 	 * @return string
-- 
GitLab


From 32de664c03572c0791af357fbecad38af0137aae Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 3 Nov 2014 22:01:32 +0100
Subject: [PATCH 307/616] fixes not centered database chooser on setup page

* fixes #11927
---
 core/js/setup.js | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/core/js/setup.js b/core/js/setup.js
index 253a12d9e6f..80901a94fd0 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -103,4 +103,18 @@ $(document).ready(function() {
 			t('core', 'Strong password')
 		]
 	});
+
+	// centers the database chooser if it is too wide
+	if($('#databaseBackend').width() > 300) {
+		// this somehow needs to wait 250 milliseconds
+		// otherwise it gets overwritten
+		setTimeout(function(){
+			// calculate negative left margin
+			// half of the difference of width and default bix width of 300
+			// add 10 to clear left side padding of button group
+			var leftMargin = (($('#databaseBackend').width() - 300) / 2 + 10 ) * -1;
+
+			$('#databaseBackend').css('margin-left', Math.floor(leftMargin) + 'px');
+		}, 250);
+	}
 });
-- 
GitLab


From 287faf9923cf6b7bb09d95243130791bb5afadca Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 4 Nov 2014 01:55:05 -0500
Subject: [PATCH 308/616] [tx-robot] updated from transifex

---
 apps/user_ldap/l10n/ru.js           | 5 +++++
 apps/user_ldap/l10n/ru.json         | 5 +++++
 apps/user_ldap/l10n/tr.js           | 1 +
 apps/user_ldap/l10n/tr.json         | 1 +
 core/l10n/de.js                     | 2 +-
 core/l10n/de.json                   | 2 +-
 l10n/templates/core.pot             | 2 +-
 l10n/templates/files.pot            | 2 +-
 l10n/templates/files_encryption.pot | 2 +-
 l10n/templates/files_external.pot   | 2 +-
 l10n/templates/files_sharing.pot    | 2 +-
 l10n/templates/files_trashbin.pot   | 2 +-
 l10n/templates/files_versions.pot   | 2 +-
 l10n/templates/lib.pot              | 6 +++---
 l10n/templates/private.pot          | 2 +-
 l10n/templates/settings.pot         | 4 ++--
 l10n/templates/user_ldap.pot        | 2 +-
 l10n/templates/user_webdavauth.pot  | 2 +-
 lib/l10n/tr.js                      | 2 +-
 lib/l10n/tr.json                    | 2 +-
 settings/l10n/bg_BG.js              | 1 -
 settings/l10n/bg_BG.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/et_EE.js              | 1 -
 settings/l10n/et_EE.json            | 1 -
 settings/l10n/eu.js                 | 1 -
 settings/l10n/eu.json               | 1 -
 settings/l10n/fr.js                 | 1 -
 settings/l10n/fr.json               | 1 -
 settings/l10n/id.js                 | 1 -
 settings/l10n/id.json               | 1 -
 settings/l10n/it.js                 | 1 -
 settings/l10n/it.json               | 1 -
 settings/l10n/ja.js                 | 1 -
 settings/l10n/ja.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/pl.js                 | 1 -
 settings/l10n/pl.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/sl.js                 | 1 -
 settings/l10n/sl.json               | 1 -
 settings/l10n/tr.js                 | 2 +-
 settings/l10n/tr.json               | 2 +-
 settings/l10n/uk.js                 | 1 -
 settings/l10n/uk.json               | 1 -
 settings/l10n/zh_CN.js              | 1 -
 settings/l10n/zh_CN.json            | 1 -
 68 files changed, 33 insertions(+), 67 deletions(-)

diff --git a/apps/user_ldap/l10n/ru.js b/apps/user_ldap/l10n/ru.js
index dd60f9c9907..e6a7b32d003 100644
--- a/apps/user_ldap/l10n/ru.js
+++ b/apps/user_ldap/l10n/ru.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Edit raw filter instead" : "Редактировать исходный фильтр",
     "Raw LDAP filter" : "Исходный LDAP фильтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
+    "Test Filter" : "Проверить фильтр",
     "groups found" : "групп найдено",
     "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:",
     "LDAP Username:" : "Имя пользователя LDAP",
@@ -67,11 +68,15 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.",
     "One Base DN per line" : "По одной базе поиска (Base DN) в строке.",
     "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
     "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
     "users found" : "пользователей найдено",
+    "Saving" : "Сохраняется",
     "Back" : "Назад",
     "Continue" : "Продолжить",
+    "LDAP" : "LDAP",
     "Expert" : "Эксперт",
     "Advanced" : "Дополнительно",
     "<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>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
diff --git a/apps/user_ldap/l10n/ru.json b/apps/user_ldap/l10n/ru.json
index 065ea2f2d05..fe160aa035d 100644
--- a/apps/user_ldap/l10n/ru.json
+++ b/apps/user_ldap/l10n/ru.json
@@ -46,6 +46,7 @@
     "Edit raw filter instead" : "Редактировать исходный фильтр",
     "Raw LDAP filter" : "Исходный LDAP фильтр",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Этот фильтр определяет, какие LDAP группы должны иметь доступ к %s.",
+    "Test Filter" : "Проверить фильтр",
     "groups found" : "групп найдено",
     "Users login with this attribute:" : "Пользователи пользуются этим атрибутом для входа:",
     "LDAP Username:" : "Имя пользователя LDAP",
@@ -65,11 +66,15 @@
     "For anonymous access, leave DN and Password empty." : "Для анонимного доступа оставьте DN и пароль пустыми.",
     "One Base DN per line" : "По одной базе поиска (Base DN) в строке.",
     "You can specify Base DN for users and groups in the Advanced tab" : "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\"",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Перестаёт посылать автоматически запросы LDAP. Эта опция хороша для крупных проектов, но требует некоторых знаний LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ввести LDAP фильтры вручную (рекомендуется для больших директорий)",
     "Limit %s access to users meeting these criteria:" : "Ограничить доступ к %s пользователям, удовлетворяющим этому критерию:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Этот фильтр указывает, какие пользователи LDAP должны иметь доступ к %s.",
     "users found" : "пользователей найдено",
+    "Saving" : "Сохраняется",
     "Back" : "Назад",
     "Continue" : "Продолжить",
+    "LDAP" : "LDAP",
     "Expert" : "Эксперт",
     "Advanced" : "Дополнительно",
     "<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>Предупреждение:</b> Приложения user_ldap и user_webdavauth несовместимы. Вы можете наблюдать некорректное поведение. Пожалуйста, попросите вашего системного администратора отключить одно из них.",
diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js
index 8e38ca3cdd8..75f3678fdd9 100644
--- a/apps/user_ldap/l10n/tr.js
+++ b/apps/user_ldap/l10n/tr.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Kaydediliyor",
     "Back" : "Geri",
     "Continue" : "Devam et",
+    "LDAP" : "LDAP",
     "Expert" : "Uzman",
     "Advanced" : "Gelişmiş",
     "<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>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.",
diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json
index 10418f995f6..9b6f3a37ade 100644
--- a/apps/user_ldap/l10n/tr.json
+++ b/apps/user_ldap/l10n/tr.json
@@ -74,6 +74,7 @@
     "Saving" : "Kaydediliyor",
     "Back" : "Geri",
     "Continue" : "Devam et",
+    "LDAP" : "LDAP",
     "Expert" : "Uzman",
     "Advanced" : "Gelişmiş",
     "<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>Uyarı:</b> user_ldap ve user_webdavauth uygulamaları uyumlu değil. Beklenmedik bir davranışla karşılaşabilirsiniz. Lütfen ikisinden birini devre dışı bırakmak için sistem yöneticinizle iletişime geçin.",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index fe6009e1632..1258cf40251 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -174,7 +174,7 @@ OC.L10N.register(
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
     "Configure the database" : "Datenbank einrichten",
-    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Only %s is available." : "Es ist nur %s verfügbar.",
     "Database user" : "Datenbank-Benutzer",
     "Database password" : "Datenbank-Passwort",
     "Database name" : "Datenbank-Name",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 942f34cd3ca..09a77d2ee9a 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -172,7 +172,7 @@
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
     "Configure the database" : "Datenbank einrichten",
-    "Only %s is available." : "Es sind nur %s verfügbar.",
+    "Only %s is available." : "Es ist nur %s verfügbar.",
     "Database user" : "Datenbank-Benutzer",
     "Database password" : "Datenbank-Passwort",
     "Database name" : "Datenbank-Name",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 9d93bef8ef3..119495795e1 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 56036d019be..c4ddf2690ab 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 51d82e2c5b0..b32ceaf9063 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index e00bdc759f1..7e06ab47266 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 70655384a8e..9be5d259176 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index d7e11d059c0..c51f827131c 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 8537841c0ed..d4481c84653 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 7a46a69a8f9..5b23768861f 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,11 +40,11 @@ msgid ""
 "config directory%s."
 msgstr ""
 
-#: base.php:595
+#: base.php:592
 msgid "Sample configuration detected"
 msgstr ""
 
-#: base.php:596
+#: base.php:593
 msgid ""
 "It has been detected that the sample configuration has been copied. This can "
 "break your installation and is unsupported. Please read the documentation "
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 5e2d44606ad..a3efae2b555 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 0c15cfa412c..d92f92e1c07 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -546,7 +546,7 @@ msgid ""
 msgstr ""
 
 #: templates/admin.php:209
-msgid "Connectivity checks"
+msgid "Connectivity Checks"
 msgstr ""
 
 #: templates/admin.php:211
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 211bc68e8d0..a8a9879dd1b 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 890678fa86e..31e740ba75f 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-03 01:54-0500\n"
+"POT-Creation-Date: 2014-11-04 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index b3e60202a77..0f6a40a7ef2 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -115,7 +115,7 @@ OC.L10N.register(
     "Please upgrade your database version" : "Lütfen veritabanı sürümünüzü yükseltin",
     "Error occurred while checking PostgreSQL version" : "PostgreSQL sürümü denetlenirken hata oluştu",
     "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "PostgreSQL >= 9 sürümüne sahip olduğunuzu doğrulayın veya hata hakkında daha fazla bilgi için günlükleri denetleyin",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Lütfen izinleri 0770 ayarlayarak dizinin diğer kullanıcılar tarafından görülememesini sağlayın.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Lütfen izinleri 0770 olarak ayarlayıp dizinin diğer kullanıcılar tarafından görülememesini sağlayın.",
     "Data directory (%s) is readable by other users" : "Veri dizini (%s) diğer kullanıcılar tarafından okunabilir",
     "Data directory (%s) is invalid" : "Veri dizini (%s) geçersiz",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "Lütfen veri dizininin kökünde \".ocdata\" adlı bir dosyanın bulunduğunu denetleyin.",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 688f3f52fa1..52bad09e9cf 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -113,7 +113,7 @@
     "Please upgrade your database version" : "Lütfen veritabanı sürümünüzü yükseltin",
     "Error occurred while checking PostgreSQL version" : "PostgreSQL sürümü denetlenirken hata oluştu",
     "Please make sure you have PostgreSQL >= 9 or check the logs for more information about the error" : "PostgreSQL >= 9 sürümüne sahip olduğunuzu doğrulayın veya hata hakkında daha fazla bilgi için günlükleri denetleyin",
-    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Lütfen izinleri 0770 ayarlayarak dizinin diğer kullanıcılar tarafından görülememesini sağlayın.",
+    "Please change the permissions to 0770 so that the directory cannot be listed by other users." : "Lütfen izinleri 0770 olarak ayarlayıp dizinin diğer kullanıcılar tarafından görülememesini sağlayın.",
     "Data directory (%s) is readable by other users" : "Veri dizini (%s) diğer kullanıcılar tarafından okunabilir",
     "Data directory (%s) is invalid" : "Veri dizini (%s) geçersiz",
     "Please check that the data directory contains a file \".ocdata\" in its root." : "Lütfen veri dizininin kökünde \".ocdata\" adlı bir dosyanın bulunduğunu denetleyin.",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 6a8357e1206..435bf0f43ec 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
     "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
-    "Connectivity checks" : "Проверка за свързаност",
     "No problems found" : "Не са открити проблеми",
     "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
     "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index dde8e3dbfd0..7925a93bebb 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -117,7 +117,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
     "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
-    "Connectivity checks" : "Проверка за свързаност",
     "No problems found" : "Не са открити проблеми",
     "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
     "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index b683e766f44..c582a867b7d 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
     "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
     "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
-    "Connectivity checks" : "Ověřování připojení",
     "No problems found" : "Nebyly nalezeny žádné problémy",
     "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
     "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index d1532997e6a..9f5a0369145 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
     "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
     "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
-    "Connectivity checks" : "Ověřování připojení",
     "No problems found" : "Nebyly nalezeny žádné problémy",
     "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
     "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 4ae61e1bc16..52a83dabc4c 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
     "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
-    "Connectivity checks" : "Tjek for forbindelsen",
     "No problems found" : "Der blev ikke fundet problemer",
     "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
     "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index e35ec7809a7..5441f52a3a7 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
     "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
-    "Connectivity checks" : "Tjek for forbindelsen",
     "No problems found" : "Der blev ikke fundet problemer",
     "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
     "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 0a19da4e50e..94734d22be0 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
-    "Connectivity checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index d42a99cb00c..f8d10f7ba46 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
-    "Connectivity checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 07868c4674d..5c6bbeea6eb 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
-    "Connectivity checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 74768df0070..db2ee248960 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
-    "Connectivity checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 46e46cb2879..77f9c5fda87 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Συνιστούμε σοβαρά να εγκαταστήσετε τα απαιτούμενα πακέτα στο σύστημά σας ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
     "URL generation in notification emails" : "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
-    "Connectivity checks" : "Έλεγχοι συνδεσιμότητας",
     "No problems found" : "Δεν βρέθηκαν προβλήματα",
     "Please double check the <a href='%s'>installation guides</a>." : "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
     "Last cron was executed at %s." : "Η τελευταία εκτέλεση του cron ήταν στις %s",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 56aebe5ae53..ffd24abff2d 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -117,7 +117,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Συνιστούμε σοβαρά να εγκαταστήσετε τα απαιτούμενα πακέτα στο σύστημά σας ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
     "URL generation in notification emails" : "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
-    "Connectivity checks" : "Έλεγχοι συνδεσιμότητας",
     "No problems found" : "Δεν βρέθηκαν προβλήματα",
     "Please double check the <a href='%s'>installation guides</a>." : "Ελέγξτε ξανά τις <a href='%s'>οδηγίες εγκατάστασης</a>.",
     "Last cron was executed at %s." : "Η τελευταία εκτέλεση του cron ήταν στις %s",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 92bf1aca6a0..75ff2687d94 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "URL generation in notification emails" : "URL generation in notification emails",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
-    "Connectivity checks" : "Connectivity checks",
     "No problems found" : "No problems found",
     "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "Last cron was executed at %s.",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 17e6280ee21..92007328784 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "URL generation in notification emails" : "URL generation in notification emails",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
-    "Connectivity checks" : "Connectivity checks",
     "No problems found" : "No problems found",
     "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "Last cron was executed at %s.",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 20aa59d3f20..2a0a03a398d 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
-    "Connectivity checks" : "Probar la conectividad",
     "No problems found" : "No se han encontrado problemas",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
     "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index b06d34e248b..892bb7ab0ba 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
-    "Connectivity checks" : "Probar la conectividad",
     "No problems found" : "No se han encontrado problemas",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
     "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index d4876814904..0b9a2b8615b 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
     "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
-    "Connectivity checks" : "Ühenduse kontrollimine",
     "No problems found" : "Ühtegi probleemi ei leitud",
     "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
     "Last cron was executed at %s." : "Cron käivitati viimati %s.",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 916a105eeda..26524f33270 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -117,7 +117,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
     "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
-    "Connectivity checks" : "Ühenduse kontrollimine",
     "No problems found" : "Ühtegi probleemi ei leitud",
     "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
     "Last cron was executed at %s." : "Cron käivitati viimati %s.",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index 6fda5892117..bbf11f15ac8 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -118,7 +118,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
     "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
-    "Connectivity checks" : "Konexio egiaztapenak",
     "No problems found" : "Ez da problemarik aurkitu",
     "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
     "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index e1ebcf6330c..5728074bbe4 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -116,7 +116,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
     "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
-    "Connectivity checks" : "Konexio egiaztapenak",
     "No problems found" : "Ez da problemarik aurkitu",
     "Please double check the <a href='%s'>installation guides</a>." : "Mesedez begiratu <a href='%s'>instalazio gidak</a>.",
     "Last cron was executed at %s." : "Azken cron-a  %s-etan exekutatu da",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index f2269b78eae..ffaa4c0f946 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
-    "Connectivity checks" : "Vérification de la connectivité",
     "No problems found" : "Aucun problème trouvé",
     "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
     "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 55fcf7a42e3..500dc0e7765 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
-    "Connectivity checks" : "Vérification de la connectivité",
     "No problems found" : "Aucun problème trouvé",
     "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
     "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 90e42de3453..0db6558b0fd 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
     "URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
-    "Connectivity checks" : "Pemeriksaan konektivitas",
     "No problems found" : "Masalah tidak ditemukan",
     "Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
     "Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 31bfbbf6fdd..a5aeb52afd0 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -117,7 +117,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
     "URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
-    "Connectivity checks" : "Pemeriksaan konektivitas",
     "No problems found" : "Masalah tidak ditemukan",
     "Please double check the <a href='%s'>installation guides</a>." : "Silakan periksa ulang <a href='%s'>panduan instalasi</a>.",
     "Last cron was executed at %s." : "Cron terakhir dieksekusi pada %s.",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 96bd958a6f5..713ed4e686f 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install 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\nlocalizzazioni seguenti: %s.",
     "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
-    "Connectivity checks" : "Controlli di connettività",
     "No problems found" : "Nessun problema trovato",
     "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
     "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index dc0209621b4..2e88a90b551 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install 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\nlocalizzazioni seguenti: %s.",
     "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
-    "Connectivity checks" : "Controlli di connettività",
     "No problems found" : "Nessun problema trovato",
     "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
     "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 6a0666774b9..1e8e5b35233 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
     "URL generation in notification emails" : "通知メールにURLを生成",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
-    "Connectivity checks" : "接続を確認",
     "No problems found" : "問題は見つかりませんでした",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
     "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 7a8c2820527..e601e3963d0 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
     "URL generation in notification emails" : "通知メールにURLを生成",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
-    "Connectivity checks" : "接続を確認",
     "No problems found" : "問題は見つかりませんでした",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
     "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 991088c732b..1e68033f940 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -114,7 +114,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
     "URL generation in notification emails" : "URL-generering i varsel-eposter",
     "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 \"overwritewebroot\" 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 system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
-    "Connectivity checks" : "Sjekk av tilkobling",
     "No problems found" : "Ingen problemer funnet",
     "Please double check the <a href='%s'>installation guides</a>." : "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
     "Last cron was executed at %s." : "Siste cron ble utført %s.",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 144a07d5229..c6ec81f064c 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -112,7 +112,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
     "URL generation in notification emails" : "URL-generering i varsel-eposter",
     "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 \"overwritewebroot\" 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 system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
-    "Connectivity checks" : "Sjekk av tilkobling",
     "No problems found" : "Ingen problemer funnet",
     "Please double check the <a href='%s'>installation guides</a>." : "Vennligst dobbelsjekk <a href='%s'>installasjonsguiden</a>.",
     "Last cron was executed at %s." : "Siste cron ble utført %s.",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 950f8ead76d..2132ed9556c 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install 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.",
     "URL generation in notification emails" : "URL genereren in notificatie e-mails",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
-    "Connectivity checks" : "Verbindingscontroles",
     "No problems found" : "Geen problemen gevonden",
     "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
     "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index d23d84847a3..6b007c100cf 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install 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.",
     "URL generation in notification emails" : "URL genereren in notificatie e-mails",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
-    "Connectivity checks" : "Verbindingscontroles",
     "No problems found" : "Geen problemen gevonden",
     "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
     "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index 48149adc656..1e72d2c2239 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
     "URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
-    "Connectivity checks" : "Sprawdzanie łączności",
     "No problems found" : "Nie ma żadnych problemów",
     "Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
     "Last cron was executed at %s." : "Ostatni cron był uruchomiony %s.",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 046ffdf578e..6ea3b9aaddc 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -117,7 +117,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
     "URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
-    "Connectivity checks" : "Sprawdzanie łączności",
     "No problems found" : "Nie ma żadnych problemów",
     "Please double check the <a href='%s'>installation guides</a>." : "Sprawdź podwójnie <a href='%s'>wskazówki instalacji</a>.",
     "Last cron was executed at %s." : "Ostatni cron był uruchomiony %s.",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 39cc2cd2b9f..80c1cbf99e3 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
     "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
-    "Connectivity checks" : "Verificação de conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
     "Last cron was executed at %s." : "Último cron foi executado em %s.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index f520b09e3b3..63decc7422e 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
     "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
-    "Connectivity checks" : "Verificação de conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
     "Last cron was executed at %s." : "Último cron foi executado em %s.",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 2411c0d4bd8..bc1a6e1bca3 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -120,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
-    "Connectivity checks" : "Verificações de conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index c12f01f52f1..64796f4e072 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -118,7 +118,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
-    "Connectivity checks" : "Verificações de conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index ce621a5ccd9..09e6adcdabd 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -114,7 +114,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
     "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
-    "Connectivity checks" : "Проверка соединения",
     "No problems found" : "Проблемы не найдены",
     "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
     "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 5c541a66ca1..fcae19893aa 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -112,7 +112,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
     "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
-    "Connectivity checks" : "Проверка соединения",
     "No problems found" : "Проблемы не найдены",
     "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
     "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index ef2431c5648..a3b39dce1b2 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -113,7 +113,6 @@ OC.L10N.register(
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
-    "Connectivity checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
     "Last cron was executed at %s." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index d78b0e41038..7ec03873132 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -111,7 +111,6 @@
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
-    "Connectivity checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
     "Last cron was executed at %s." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 45902d338cf..05aef6f2889 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Güvelik & Kurulum Uyarıları",
     "Cron" : "Cron",
     "Sharing" : "Paylaşım",
     "Security" : "Güvenlik",
@@ -119,7 +120,6 @@ OC.L10N.register(
     "We strongly suggest to install 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.",
     "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
     "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
-    "Connectivity checks" : "Bağlanabilirlik kontrolleri",
     "No problems found" : "Sorun bulunamadı",
     "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
     "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 543c5c8039c..7a84edb5ac9 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Güvelik & Kurulum Uyarıları",
     "Cron" : "Cron",
     "Sharing" : "Paylaşım",
     "Security" : "Güvenlik",
@@ -117,7 +118,6 @@
     "We strongly suggest to install 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.",
     "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
     "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
-    "Connectivity checks" : "Bağlanabilirlik kontrolleri",
     "No problems found" : "Sorun bulunamadı",
     "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
     "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 494e74f96da..71e5de126cf 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -119,7 +119,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
     "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
-    "Connectivity checks" : "Перевірка з'єднання",
     "No problems found" : "Проблем не виявленно",
     "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
     "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index e5cd13396c3..3a3c79a7253 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -117,7 +117,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
     "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
-    "Connectivity checks" : "Перевірка з'єднання",
     "No problems found" : "Проблем не виявленно",
     "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
     "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index 3e218c7f104..f111d768d95 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -114,7 +114,6 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
     "URL generation in notification emails" : "在通知邮件里生成URL",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
-    "Connectivity checks" : "网络连接检查",
     "No problems found" : "未发现问题",
     "Please double check the <a href='%s'>installation guides</a>." : "请认真检查<a href='%s'>安装指南</a>.",
     "Last cron was executed at %s." : "上次定时任务执行于 %s。",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index c29270b57d4..d110874bb69 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -112,7 +112,6 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
     "URL generation in notification emails" : "在通知邮件里生成URL",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
-    "Connectivity checks" : "网络连接检查",
     "No problems found" : "未发现问题",
     "Please double check the <a href='%s'>installation guides</a>." : "请认真检查<a href='%s'>安装指南</a>.",
     "Last cron was executed at %s." : "上次定时任务执行于 %s。",
-- 
GitLab


From 6f0c8141642bf3d2a1ca4f038ff5f97359b0ab15 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 4 Nov 2014 09:23:38 +0100
Subject: [PATCH 309/616] fix config.sample.php linebreak

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

diff --git a/config/config.sample.php b/config/config.sample.php
index a53521485e6..5d6e3cea273 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -120,7 +120,8 @@ $CONFIG = array(
 'dbtableprefix' => '',
 
 /**
- * Additional driver options for the database connection, eg. to enable SSL encryption in MySQL:
+ * 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',
@@ -350,9 +351,10 @@ $CONFIG = array(
 'overwritecondaddr' => '',
 
 /**
- * Use this configuration parameter to specify the base url for any urls which are
- * generated within ownCloud using any kind of command line tools (cron or occ).
- * The value should contain the full base URL: ``https://www.example.com/owncloud``
+ * Use this configuration parameter to specify the base url for any urls which
+ * are generated within ownCloud using any kind of command line tools (cron or
+ * occ). The value should contain the full base URL:
+ * ``https://www.example.com/owncloud``
  */
 'overwrite.cli.url' => '',
 
@@ -375,8 +377,8 @@ $CONFIG = array(
  */
 
 /**
- * When the trash bin app is enabled (default), this is the number of days a file
- * will be kept in the trash bin. Default is 30 days.
+ * When the trash bin app is enabled (default), this is the number of days a
+ * file will be kept in the trash bin. Default is 30 days.
  */
 'trashbin_retention_obligation' => 30,
 
-- 
GitLab


From 1979ec70a5f8757723ec23d69c4116b93c44c99d Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 4 Nov 2014 10:37:16 +0100
Subject: [PATCH 310/616] JS unit tests fix - use toBeUndefined() instead of
 toEqual(null)

---
 apps/files/tests/js/filelistSpec.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index 83cf1f428b2..a7fa14eb14a 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -219,13 +219,13 @@ describe('OCA.Files.FileList tests', function() {
 
 			expect($tr).toBeDefined();
 			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
-			expect($tr.attr('data-id')).toEqual(null);
+			expect($tr.attr('data-id')).toBeUndefined();
 			expect($tr.attr('data-type')).toEqual('file');
 			expect($tr.attr('data-file')).toEqual('testFile.txt');
-			expect($tr.attr('data-size')).toEqual(null);
-			expect($tr.attr('data-etag')).toEqual(null);
+			expect($tr.attr('data-size')).toBeUndefined();
+			expect($tr.attr('data-etag')).toBeUndefined();
 			expect($tr.attr('data-permissions')).toEqual('31');
-			expect($tr.attr('data-mime')).toEqual(null);
+			expect($tr.attr('data-mime')).toBeUndefined();
 			expect($tr.attr('data-mtime')).toEqual('123456');
 
 			expect($tr.find('.filesize').text()).toEqual('Pending');
@@ -240,11 +240,11 @@ describe('OCA.Files.FileList tests', function() {
 
 			expect($tr).toBeDefined();
 			expect($tr[0].tagName.toLowerCase()).toEqual('tr');
-			expect($tr.attr('data-id')).toEqual(null);
+			expect($tr.attr('data-id')).toBeUndefined();
 			expect($tr.attr('data-type')).toEqual('dir');
 			expect($tr.attr('data-file')).toEqual('testFolder');
-			expect($tr.attr('data-size')).toEqual(null);
-			expect($tr.attr('data-etag')).toEqual(null);
+			expect($tr.attr('data-size')).toBeUndefined();
+			expect($tr.attr('data-etag')).toBeUndefined();
 			expect($tr.attr('data-permissions')).toEqual('31');
 			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
 			expect($tr.attr('data-mtime')).toEqual('123456');
-- 
GitLab


From d94606cfa23d26dd0d7c3697a3be27902198469a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 4 Nov 2014 10:55:18 +0100
Subject: [PATCH 311/616] use https ... everywhere :)

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index 5476115be1d..3a3791e5c6d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
 	"name": "ownCloud",
 	"version": "8.0 pre alpha",
-	"homepage": "http://www.owncloud.org",
+	"homepage": "https://www.owncloud.org",
 	"license": "AGPL",
 	"private": true,
 	"ignore": [
-- 
GitLab


From d5c98add589ce71aed5ac9973e4a000e9d95aab5 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 4 Nov 2014 12:22:15 +0100
Subject: [PATCH 312/616] fix whitespace

---
 bower.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/bower.json b/bower.json
index 3a3791e5c6d..4b7b3d84d0d 100644
--- a/bower.json
+++ b/bower.json
@@ -1,18 +1,18 @@
 {
-	"name": "ownCloud",
-	"version": "8.0 pre alpha",
-	"homepage": "https://www.owncloud.org",
-	"license": "AGPL",
-	"private": true,
-	"ignore": [
-		"**/.*",
-		"node_modules",
-		"bower_components",
-		"core/vendor",
-		"test",
-		"tests"
-	],
-	"dependencies": {
-		"moment": "~2.8.3"
-	}
+  "name": "ownCloud",
+  "version": "8.0 pre alpha",
+  "homepage": "https://www.owncloud.org",
+  "license": "AGPL",
+  "private": true,
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "core/vendor",
+    "test",
+    "tests"
+  ],
+  "dependencies": {
+    "moment": "~2.8.3"
+  }
 }
-- 
GitLab


From 97a51c46eddf4c1e8c691eea96dd762425ce17ca Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 4 Nov 2014 12:29:42 +0100
Subject: [PATCH 313/616] Only rescan trash folder when checking deleted
 versions

This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
---
 apps/files_trashbin/lib/trashbin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 3d90791108e..52d24143902 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -933,7 +933,7 @@ class Trashbin {
 		//force rescan of versions, local storage may not have updated the cache
 		/** @var \OC\Files\Storage\Storage $storage */
 		list($storage, ) = $view->resolvePath('/');
-		$storage->getScanner()->scan('');
+		$storage->getScanner()->scan('files_trashbin');
 
 		if ($timestamp) {
 			// fetch for old versions
-- 
GitLab


From 65cfe4796d09c65cd715002c3e078ed6b054162c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 4 Nov 2014 12:51:54 +0100
Subject: [PATCH 314/616] enable laxbreak option in jshintrc to comply with our
 coding guide lines

---
 .jshintrc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.jshintrc b/.jshintrc
index d5da3e30828..0b055afde3d 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -14,6 +14,7 @@
 	"maxlen": 120,
 	"indent": 4,
 	"browser": true,
+	"laxbreak": true,
 	"globals": {
 		"console": true,
 		"it": true,
-- 
GitLab


From 7f4e447a5ffa04c113c16c7b1b5b8a47f86b3a4e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 4 Nov 2014 13:57:38 +0100
Subject: [PATCH 315/616] fix shortcuts - underline instead of camelCase

---
 lib/private/template/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index 0e2c5775c46..ca0c27a8078 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -45,7 +45,7 @@ function script($app, $file) {
  * @param string|string[] $file the filename,
  * if an array is given it will add all scripts
  */
-function vendorScript($app, $file) {
+function vendor_script($app, $file) {
 	if(is_array($file)) {
 		foreach($file as $f) {
 			OC_Util::addVendorScript($app, $f);
@@ -77,7 +77,7 @@ function style($app, $file) {
  * @param string|string[] $file the filename,
  * if an array is given it will add all styles
  */
-function vendorStyle($app, $file) {
+function vendor_style($app, $file) {
 	if(is_array($file)) {
 		foreach($file as $f) {
 			OC_Util::addVendorStyle($app, $f);
-- 
GitLab


From 74d375d8ea785e304dd679cc677568bdbf4a4caf Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 4 Nov 2014 12:51:29 +0100
Subject: [PATCH 316/616] migrate jQuery to bower

---
 bower.json                                    |   1 +
 core/js/core.json                             |   4 +-
 core/js/jquery-1.10.0.min.js                  |   6 -
 core/js/jquery-migrate-1.2.1.min.js           |   2 -
 core/vendor/.gitignore                        |   8 +
 core/vendor/jquery/MIT-LICENSE.txt            |  21 ++
 .../jquery/jquery-migrate.js}                 |  26 +-
 core/vendor/jquery/jquery-migrate.min.js      |   3 +
 .../jquery/jquery.js}                         | 245 +++++++++---------
 core/vendor/jquery/jquery.min.js              |   6 +
 core/vendor/jquery/jquery.min.map             |   1 +
 lib/base.php                                  |   4 +-
 tests/karma.config.js                         |  12 +-
 13 files changed, 175 insertions(+), 164 deletions(-)
 delete mode 100644 core/js/jquery-1.10.0.min.js
 delete mode 100644 core/js/jquery-migrate-1.2.1.min.js
 create mode 100644 core/vendor/jquery/MIT-LICENSE.txt
 rename core/{js/jquery-migrate-1.2.1.js => vendor/jquery/jquery-migrate.js} (94%)
 create mode 100644 core/vendor/jquery/jquery-migrate.min.js
 rename core/{js/jquery-1.10.0.js => vendor/jquery/jquery.js} (98%)
 create mode 100644 core/vendor/jquery/jquery.min.js
 create mode 100644 core/vendor/jquery/jquery.min.map

diff --git a/bower.json b/bower.json
index 4b7b3d84d0d..ab8340c42e9 100644
--- a/bower.json
+++ b/bower.json
@@ -13,6 +13,7 @@
     "tests"
   ],
   "dependencies": {
+    "jquery": "~1.10.0",
     "moment": "~2.8.3"
   }
 }
diff --git a/core/js/core.json b/core/js/core.json
index 3297b44318d..86db15e5116 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -1,10 +1,10 @@
 {
 	"vendor": [
+		"jquery/jquery.min.js",
+		"jquery/jquery-migrate.min.js",
 		"moment/min/moment-with-locales.js"
 	],
 	"libraries": [
-		"jquery-1.10.0.min.js",
-		"jquery-migrate-1.2.1.min.js",
 		"jquery-ui-1.10.0.custom.js",
 		"jquery-showpassword.js",
 		"jquery.placeholder.js",
diff --git a/core/js/jquery-1.10.0.min.js b/core/js/jquery-1.10.0.min.js
deleted file mode 100644
index 01c688164ad..00000000000
--- a/core/js/jquery-1.10.0.min.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*! jQuery v1.10.0 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
-//@ sourceMappingURL=jquery-1.10.0.min.map
-*/
-(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.0",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=lt(),k=lt(),E=lt(),S=!1,A=function(){return 0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=bt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+xt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return At(e.replace(z,"$1"),t,n,i)}function st(e){return K.test(e+"")}function lt(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function ut(e){return e[b]=!0,e}function ct(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function pt(e,t,n){e=e.split("|");var r,i=e.length,a=n?null:t;while(i--)(r=o.attrHandle[e[i]])&&r!==t||(o.attrHandle[e[i]]=a)}function ft(e,t){var n=e.getAttributeNode(t);return n&&n.specified?n.value:e[t]===!0?t.toLowerCase():null}function dt(e,t){return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}function ht(e){return"input"===e.nodeName.toLowerCase()?e.defaultValue:t}function gt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function mt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function yt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function vt(e){return ut(function(t){return t=+t,ut(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),r.attributes=ct(function(e){return e.innerHTML="<a href='#'></a>",pt("type|href|height|width",dt,"#"===e.firstChild.getAttribute("href")),pt(B,ft,null==e.getAttribute("disabled")),e.className="i",!e.getAttribute("className")}),r.input=ct(function(e){return e.innerHTML="<input>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")}),pt("value",ht,r.attributes&&r.input),r.getElementsByTagName=ct(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ct(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ct(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=st(n.querySelectorAll))&&(ct(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ct(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=st(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ct(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=st(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},r.sortDetached=ct(function(e){return 1&e.compareDocumentPosition(n.createElement("div"))}),A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return gt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?gt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:ut,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=bt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?ut(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:ut(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?ut(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:ut(function(e){return function(t){return at(e,t).length>0}}),contains:ut(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:ut(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:vt(function(){return[0]}),last:vt(function(e,t){return[t-1]}),eq:vt(function(e,t,n){return[0>n?n+t:n]}),even:vt(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:vt(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:vt(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:vt(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}};for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=mt(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=yt(n);function bt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function xt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function wt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function Tt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function Ct(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function Nt(e,t,n,r,i,o){return r&&!r[b]&&(r=Nt(r)),i&&!i[b]&&(i=Nt(i,o)),ut(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||St(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:Ct(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=Ct(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=Ct(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function kt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=wt(function(e){return e===t},s,!0),p=wt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[wt(Tt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return Nt(l>1&&Tt(f),l>1&&xt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&kt(e.slice(l,r)),i>r&&kt(e=e.slice(r)),i>r&&xt(e))}f.push(n)}return Tt(f)}function Et(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=Ct(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?ut(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=bt(e)),n=t.length;while(n--)o=kt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Et(i,r))}return o};function St(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function At(e,t,n,i){var a,s,u,c,p,f=bt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&xt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}o.pseudos.nth=o.pseudos.eq;function jt(){}jt.prototype=o.filters=o.pseudos,o.setFilters=new jt,r.sortStable=b.split("").sort(A).join("")===b,p(),[0,0].sort(A),r.detectDuplicates=S,x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return t=t||[],t=[e,t.slice?t.slice():t],!l||i&&!u||(n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;
-if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),o.cur=i,i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e,r="boolean"==typeof t;return x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var o,a=0,s=x(this),l=t,u=e.match(T)||[];while(o=u[a++])l=r?l:!s.hasClass(o),s[l?"addClass":"removeClass"](o)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})
-}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){var t="boolean"==typeof e;return this.each(function(){(t?e:nn(this))?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(n.unit=o,n.start=+a||+r||0,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);a.finish=function(){t.stop(!0)},(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.cur&&i.cur.finish&&i.cur.finish.call(this),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/core/js/jquery-migrate-1.2.1.min.js b/core/js/jquery-migrate-1.2.1.min.js
deleted file mode 100644
index 8b7ec47a2d6..00000000000
--- a/core/js/jquery-migrate-1.2.1.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery Migrate v1.2.1 | (c) 2005, 2013 jQuery Foundation, Inc. and other contributors | jquery.org/license */
-jQuery.migrateMute===void 0&&(jQuery.migrateMute=!0),function(e,t,n){function r(n){var r=t.console;i[n]||(i[n]=!0,e.migrateWarnings.push(n),r&&r.warn&&!e.migrateMute&&(r.warn("JQMIGRATE: "+n),e.migrateTrace&&r.trace&&r.trace()))}function a(t,a,i,o){if(Object.defineProperty)try{return Object.defineProperty(t,a,{configurable:!0,enumerable:!0,get:function(){return r(o),i},set:function(e){r(o),i=e}}),n}catch(s){}e._definePropertyBroken=!0,t[a]=i}var i={};e.migrateWarnings=[],!e.migrateMute&&t.console&&t.console.log&&t.console.log("JQMIGRATE: Logging is active"),e.migrateTrace===n&&(e.migrateTrace=!0),e.migrateReset=function(){i={},e.migrateWarnings.length=0},"BackCompat"===document.compatMode&&r("jQuery is not compatible with Quirks Mode");var o=e("<input/>",{size:1}).attr("size")&&e.attrFn,s=e.attr,u=e.attrHooks.value&&e.attrHooks.value.get||function(){return null},c=e.attrHooks.value&&e.attrHooks.value.set||function(){return n},l=/^(?:input|button)$/i,d=/^[238]$/,p=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,f=/^(?:checked|selected)$/i;a(e,"attrFn",o||{},"jQuery.attrFn is deprecated"),e.attr=function(t,a,i,u){var c=a.toLowerCase(),g=t&&t.nodeType;return u&&(4>s.length&&r("jQuery.fn.attr( props, pass ) is deprecated"),t&&!d.test(g)&&(o?a in o:e.isFunction(e.fn[a])))?e(t)[a](i):("type"===a&&i!==n&&l.test(t.nodeName)&&t.parentNode&&r("Can't change the 'type' of an input or button in IE 6/7/8"),!e.attrHooks[c]&&p.test(c)&&(e.attrHooks[c]={get:function(t,r){var a,i=e.prop(t,r);return i===!0||"boolean"!=typeof i&&(a=t.getAttributeNode(r))&&a.nodeValue!==!1?r.toLowerCase():n},set:function(t,n,r){var a;return n===!1?e.removeAttr(t,r):(a=e.propFix[r]||r,a in t&&(t[a]=!0),t.setAttribute(r,r.toLowerCase())),r}},f.test(c)&&r("jQuery.fn.attr('"+c+"') may use property instead of attribute")),s.call(e,t,a,i))},e.attrHooks.value={get:function(e,t){var n=(e.nodeName||"").toLowerCase();return"button"===n?u.apply(this,arguments):("input"!==n&&"option"!==n&&r("jQuery.fn.attr('value') no longer gets properties"),t in e?e.value:null)},set:function(e,t){var a=(e.nodeName||"").toLowerCase();return"button"===a?c.apply(this,arguments):("input"!==a&&"option"!==a&&r("jQuery.fn.attr('value', val) no longer sets properties"),e.value=t,n)}};var g,h,v=e.fn.init,m=e.parseJSON,y=/^([^<]*)(<[\w\W]+>)([^>]*)$/;e.fn.init=function(t,n,a){var i;return t&&"string"==typeof t&&!e.isPlainObject(n)&&(i=y.exec(e.trim(t)))&&i[0]&&("<"!==t.charAt(0)&&r("$(html) HTML strings must start with '<' character"),i[3]&&r("$(html) HTML text after last tag is ignored"),"#"===i[0].charAt(0)&&(r("HTML string cannot start with a '#' character"),e.error("JQMIGRATE: Invalid selector string (XSS)")),n&&n.context&&(n=n.context),e.parseHTML)?v.call(this,e.parseHTML(i[2],n,!0),n,a):v.apply(this,arguments)},e.fn.init.prototype=e.fn,e.parseJSON=function(e){return e||null===e?m.apply(this,arguments):(r("jQuery.parseJSON requires a valid JSON string"),null)},e.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||0>e.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e.browser||(g=e.uaMatch(navigator.userAgent),h={},g.browser&&(h[g.browser]=!0,h.version=g.version),h.chrome?h.webkit=!0:h.webkit&&(h.safari=!0),e.browser=h),a(e,"browser",e.browser,"jQuery.browser is deprecated"),e.sub=function(){function t(e,n){return new t.fn.init(e,n)}e.extend(!0,t,this),t.superclass=this,t.fn=t.prototype=this(),t.fn.constructor=t,t.sub=this.sub,t.fn.init=function(r,a){return a&&a instanceof e&&!(a instanceof t)&&(a=t(a)),e.fn.init.call(this,r,a,n)},t.fn.init.prototype=t.fn;var n=t(document);return r("jQuery.sub() is deprecated"),t},e.ajaxSetup({converters:{"text json":e.parseJSON}});var b=e.fn.data;e.fn.data=function(t){var a,i,o=this[0];return!o||"events"!==t||1!==arguments.length||(a=e.data(o,t),i=e._data(o,t),a!==n&&a!==i||i===n)?b.apply(this,arguments):(r("Use of jQuery.fn.data('events') is deprecated"),i)};var j=/\/(java|ecma)script/i,w=e.fn.andSelf||e.fn.addBack;e.fn.andSelf=function(){return r("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),w.apply(this,arguments)},e.clean||(e.clean=function(t,a,i,o){a=a||document,a=!a.nodeType&&a[0]||a,a=a.ownerDocument||a,r("jQuery.clean() is deprecated");var s,u,c,l,d=[];if(e.merge(d,e.buildFragment(t,a).childNodes),i)for(c=function(e){return!e.type||j.test(e.type)?o?o.push(e.parentNode?e.parentNode.removeChild(e):e):i.appendChild(e):n},s=0;null!=(u=d[s]);s++)e.nodeName(u,"script")&&c(u)||(i.appendChild(u),u.getElementsByTagName!==n&&(l=e.grep(e.merge([],u.getElementsByTagName("script")),c),d.splice.apply(d,[s+1,0].concat(l)),s+=l.length));return d});var Q=e.event.add,x=e.event.remove,k=e.event.trigger,N=e.fn.toggle,T=e.fn.live,M=e.fn.die,S="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",C=RegExp("\\b(?:"+S+")\\b"),H=/(?:^|\s)hover(\.\S+|)\b/,A=function(t){return"string"!=typeof t||e.event.special.hover?t:(H.test(t)&&r("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"),t&&t.replace(H,"mouseenter$1 mouseleave$1"))};e.event.props&&"attrChange"!==e.event.props[0]&&e.event.props.unshift("attrChange","attrName","relatedNode","srcElement"),e.event.dispatch&&a(e.event,"handle",e.event.dispatch,"jQuery.event.handle is undocumented and deprecated"),e.event.add=function(e,t,n,a,i){e!==document&&C.test(t)&&r("AJAX events should be attached to document: "+t),Q.call(this,e,A(t||""),n,a,i)},e.event.remove=function(e,t,n,r,a){x.call(this,e,A(t)||"",n,r,a)},e.fn.error=function(){var e=Array.prototype.slice.call(arguments,0);return r("jQuery.fn.error() is deprecated"),e.splice(0,0,"error"),arguments.length?this.bind.apply(this,e):(this.triggerHandler.apply(this,e),this)},e.fn.toggle=function(t,n){if(!e.isFunction(t)||!e.isFunction(n))return N.apply(this,arguments);r("jQuery.fn.toggle(handler, handler...) is deprecated");var a=arguments,i=t.guid||e.guid++,o=0,s=function(n){var r=(e._data(this,"lastToggle"+t.guid)||0)%o;return e._data(this,"lastToggle"+t.guid,r+1),n.preventDefault(),a[r].apply(this,arguments)||!1};for(s.guid=i;a.length>o;)a[o++].guid=i;return this.click(s)},e.fn.live=function(t,n,a){return r("jQuery.fn.live() is deprecated"),T?T.apply(this,arguments):(e(this.context).on(t,this.selector,n,a),this)},e.fn.die=function(t,n){return r("jQuery.fn.die() is deprecated"),M?M.apply(this,arguments):(e(this.context).off(t,this.selector||"**",n),this)},e.event.trigger=function(e,t,n,a){return n||C.test(e)||r("Global events are undocumented and deprecated"),k.call(this,e,t,n||document,a)},e.each(S.split("|"),function(t,n){e.event.special[n]={setup:function(){var t=this;return t!==document&&(e.event.add(document,n+"."+e.guid,function(){e.event.trigger(n,null,t,!0)}),e._data(this,n,e.guid++)),!1},teardown:function(){return this!==document&&e.event.remove(document,n+"."+e._data(this,n)),!1}}})}(jQuery,window);
\ No newline at end of file
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index 8d4f4fbe84d..1c303c1765f 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -1,3 +1,6 @@
+test/
+src/
+
 # momentjs - ignore all files except the two listed below
 moment/benchmarks
 moment/locale
@@ -6,3 +9,8 @@ moment/*.js*
 moment/*.md
 !moment/LICENSE
 !moment/min/moment-with-locales.js
+
+# jquery
+jquery/**
+!jquery/jquery*
+!jquery/MIT-LICENSE.txt
diff --git a/core/vendor/jquery/MIT-LICENSE.txt b/core/vendor/jquery/MIT-LICENSE.txt
new file mode 100644
index 00000000000..957f26d3e3b
--- /dev/null
+++ b/core/vendor/jquery/MIT-LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright 2013 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/js/jquery-migrate-1.2.1.js b/core/vendor/jquery/jquery-migrate.js
similarity index 94%
rename from core/js/jquery-migrate-1.2.1.js
rename to core/vendor/jquery/jquery-migrate.js
index 25b6c813146..942cb8b4d80 100644
--- a/core/js/jquery-migrate-1.2.1.js
+++ b/core/vendor/jquery/jquery-migrate.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery Migrate - v1.2.1 - 2013-05-08
+ * jQuery Migrate - v1.1.1 - 2013-02-16
  * https://github.com/jquery/jquery-migrate
  * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
  */
@@ -17,8 +17,8 @@ jQuery.migrateWarnings = [];
 // jQuery.migrateMute = false;
 
 // Show a message on the console so devs know we're active
-if ( !jQuery.migrateMute && window.console && window.console.log ) {
-	window.console.log("JQMIGRATE: Logging is active");
+if ( !jQuery.migrateMute && window.console && console.log ) {
+	console.log("JQMIGRATE: Logging is active");
 }
 
 // Set to false to disable traces that appear with warnings
@@ -33,11 +33,10 @@ jQuery.migrateReset = function() {
 };
 
 function migrateWarn( msg) {
-	var console = window.console;
 	if ( !warnedAbout[ msg ] ) {
 		warnedAbout[ msg ] = true;
 		jQuery.migrateWarnings.push( msg );
-		if ( console && console.warn && !jQuery.migrateMute ) {
+		if ( window.console && console.warn && !jQuery.migrateMute ) {
 			console.warn( "JQMIGRATE: " + msg );
 			if ( jQuery.migrateTrace && console.trace ) {
 				console.trace();
@@ -190,35 +189,26 @@ jQuery.attrHooks.value = {
 var matched, browser,
 	oldInit = jQuery.fn.init,
 	oldParseJSON = jQuery.parseJSON,
-	// Note: XSS check is done below after string is trimmed
-	rquickExpr = /^([^<]*)(<[\w\W]+>)([^>]*)$/;
+	// Note this does NOT include the #9521 XSS fix from 1.7!
+	rquickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;
 
 // $(html) "looks like html" rule change
 jQuery.fn.init = function( selector, context, rootjQuery ) {
 	var match;
 
 	if ( selector && typeof selector === "string" && !jQuery.isPlainObject( context ) &&
-			(match = rquickExpr.exec( jQuery.trim( selector ) )) && match[ 0 ] ) {
+			(match = rquickExpr.exec( selector )) && match[1] ) {
 		// This is an HTML string according to the "old" rules; is it still?
 		if ( selector.charAt( 0 ) !== "<" ) {
 			migrateWarn("$(html) HTML strings must start with '<' character");
 		}
-		if ( match[ 3 ] ) {
-			migrateWarn("$(html) HTML text after last tag is ignored");
-		}
-		// Consistently reject any HTML-like string starting with a hash (#9521)
-		// Note that this may break jQuery 1.6.x code that otherwise would work.
-		if ( match[ 0 ].charAt( 0 ) === "#" ) {
-			migrateWarn("HTML string cannot start with a '#' character");
-			jQuery.error("JQMIGRATE: Invalid selector string (XSS)");
-		}
 		// Now process using loose rules; let pre-1.8 play too
 		if ( context && context.context ) {
 			// jQuery object as context; parseHTML expects a DOM object
 			context = context.context;
 		}
 		if ( jQuery.parseHTML ) {
-			return oldInit.call( this, jQuery.parseHTML( match[ 2 ], context, true ),
+			return oldInit.call( this, jQuery.parseHTML( jQuery.trim(selector), context, true ),
 					context, rootjQuery );
 		}
 	}
diff --git a/core/vendor/jquery/jquery-migrate.min.js b/core/vendor/jquery/jquery-migrate.min.js
new file mode 100644
index 00000000000..eb3ecb1b3dd
--- /dev/null
+++ b/core/vendor/jquery/jquery-migrate.min.js
@@ -0,0 +1,3 @@
+/*! jQuery Migrate v1.1.1 | (c) 2005, 2013 jQuery Foundation, Inc. and other contributors | jquery.org/license */
+jQuery.migrateMute===void 0&&(jQuery.migrateMute=!0),function(e,t,n){function r(n){o[n]||(o[n]=!0,e.migrateWarnings.push(n),t.console&&console.warn&&!e.migrateMute&&(console.warn("JQMIGRATE: "+n),e.migrateTrace&&console.trace&&console.trace()))}function a(t,a,o,i){if(Object.defineProperty)try{return Object.defineProperty(t,a,{configurable:!0,enumerable:!0,get:function(){return r(i),o},set:function(e){r(i),o=e}}),n}catch(s){}e._definePropertyBroken=!0,t[a]=o}var o={};e.migrateWarnings=[],!e.migrateMute&&t.console&&console.log&&console.log("JQMIGRATE: Logging is active"),e.migrateTrace===n&&(e.migrateTrace=!0),e.migrateReset=function(){o={},e.migrateWarnings.length=0},"BackCompat"===document.compatMode&&r("jQuery is not compatible with Quirks Mode");var i=e("<input/>",{size:1}).attr("size")&&e.attrFn,s=e.attr,u=e.attrHooks.value&&e.attrHooks.value.get||function(){return null},c=e.attrHooks.value&&e.attrHooks.value.set||function(){return n},l=/^(?:input|button)$/i,d=/^[238]$/,p=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,f=/^(?:checked|selected)$/i;a(e,"attrFn",i||{},"jQuery.attrFn is deprecated"),e.attr=function(t,a,o,u){var c=a.toLowerCase(),g=t&&t.nodeType;return u&&(4>s.length&&r("jQuery.fn.attr( props, pass ) is deprecated"),t&&!d.test(g)&&(i?a in i:e.isFunction(e.fn[a])))?e(t)[a](o):("type"===a&&o!==n&&l.test(t.nodeName)&&t.parentNode&&r("Can't change the 'type' of an input or button in IE 6/7/8"),!e.attrHooks[c]&&p.test(c)&&(e.attrHooks[c]={get:function(t,r){var a,o=e.prop(t,r);return o===!0||"boolean"!=typeof o&&(a=t.getAttributeNode(r))&&a.nodeValue!==!1?r.toLowerCase():n},set:function(t,n,r){var a;return n===!1?e.removeAttr(t,r):(a=e.propFix[r]||r,a in t&&(t[a]=!0),t.setAttribute(r,r.toLowerCase())),r}},f.test(c)&&r("jQuery.fn.attr('"+c+"') may use property instead of attribute")),s.call(e,t,a,o))},e.attrHooks.value={get:function(e,t){var n=(e.nodeName||"").toLowerCase();return"button"===n?u.apply(this,arguments):("input"!==n&&"option"!==n&&r("jQuery.fn.attr('value') no longer gets properties"),t in e?e.value:null)},set:function(e,t){var a=(e.nodeName||"").toLowerCase();return"button"===a?c.apply(this,arguments):("input"!==a&&"option"!==a&&r("jQuery.fn.attr('value', val) no longer sets properties"),e.value=t,n)}};var g,h,v=e.fn.init,m=e.parseJSON,y=/^(?:[^<]*(<[\w\W]+>)[^>]*|#([\w\-]*))$/;e.fn.init=function(t,n,a){var o;return t&&"string"==typeof t&&!e.isPlainObject(n)&&(o=y.exec(t))&&o[1]&&("<"!==t.charAt(0)&&r("$(html) HTML strings must start with '<' character"),n&&n.context&&(n=n.context),e.parseHTML)?v.call(this,e.parseHTML(e.trim(t),n,!0),n,a):v.apply(this,arguments)},e.fn.init.prototype=e.fn,e.parseJSON=function(e){return e||null===e?m.apply(this,arguments):(r("jQuery.parseJSON requires a valid JSON string"),null)},e.uaMatch=function(e){e=e.toLowerCase();var t=/(chrome)[ \/]([\w.]+)/.exec(e)||/(webkit)[ \/]([\w.]+)/.exec(e)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(e)||/(msie) ([\w.]+)/.exec(e)||0>e.indexOf("compatible")&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(e)||[];return{browser:t[1]||"",version:t[2]||"0"}},e.browser||(g=e.uaMatch(navigator.userAgent),h={},g.browser&&(h[g.browser]=!0,h.version=g.version),h.chrome?h.webkit=!0:h.webkit&&(h.safari=!0),e.browser=h),a(e,"browser",e.browser,"jQuery.browser is deprecated"),e.sub=function(){function t(e,n){return new t.fn.init(e,n)}e.extend(!0,t,this),t.superclass=this,t.fn=t.prototype=this(),t.fn.constructor=t,t.sub=this.sub,t.fn.init=function(r,a){return a&&a instanceof e&&!(a instanceof t)&&(a=t(a)),e.fn.init.call(this,r,a,n)},t.fn.init.prototype=t.fn;var n=t(document);return r("jQuery.sub() is deprecated"),t},e.ajaxSetup({converters:{"text json":e.parseJSON}});var b=e.fn.data;e.fn.data=function(t){var a,o,i=this[0];return!i||"events"!==t||1!==arguments.length||(a=e.data(i,t),o=e._data(i,t),a!==n&&a!==o||o===n)?b.apply(this,arguments):(r("Use of jQuery.fn.data('events') is deprecated"),o)};var j=/\/(java|ecma)script/i,w=e.fn.andSelf||e.fn.addBack;e.fn.andSelf=function(){return r("jQuery.fn.andSelf() replaced by jQuery.fn.addBack()"),w.apply(this,arguments)},e.clean||(e.clean=function(t,a,o,i){a=a||document,a=!a.nodeType&&a[0]||a,a=a.ownerDocument||a,r("jQuery.clean() is deprecated");var s,u,c,l,d=[];if(e.merge(d,e.buildFragment(t,a).childNodes),o)for(c=function(e){return!e.type||j.test(e.type)?i?i.push(e.parentNode?e.parentNode.removeChild(e):e):o.appendChild(e):n},s=0;null!=(u=d[s]);s++)e.nodeName(u,"script")&&c(u)||(o.appendChild(u),u.getElementsByTagName!==n&&(l=e.grep(e.merge([],u.getElementsByTagName("script")),c),d.splice.apply(d,[s+1,0].concat(l)),s+=l.length));return d});var Q=e.event.add,x=e.event.remove,k=e.event.trigger,N=e.fn.toggle,C=e.fn.live,S=e.fn.die,T="ajaxStart|ajaxStop|ajaxSend|ajaxComplete|ajaxError|ajaxSuccess",M=RegExp("\\b(?:"+T+")\\b"),H=/(?:^|\s)hover(\.\S+|)\b/,A=function(t){return"string"!=typeof t||e.event.special.hover?t:(H.test(t)&&r("'hover' pseudo-event is deprecated, use 'mouseenter mouseleave'"),t&&t.replace(H,"mouseenter$1 mouseleave$1"))};e.event.props&&"attrChange"!==e.event.props[0]&&e.event.props.unshift("attrChange","attrName","relatedNode","srcElement"),e.event.dispatch&&a(e.event,"handle",e.event.dispatch,"jQuery.event.handle is undocumented and deprecated"),e.event.add=function(e,t,n,a,o){e!==document&&M.test(t)&&r("AJAX events should be attached to document: "+t),Q.call(this,e,A(t||""),n,a,o)},e.event.remove=function(e,t,n,r,a){x.call(this,e,A(t)||"",n,r,a)},e.fn.error=function(){var e=Array.prototype.slice.call(arguments,0);return r("jQuery.fn.error() is deprecated"),e.splice(0,0,"error"),arguments.length?this.bind.apply(this,e):(this.triggerHandler.apply(this,e),this)},e.fn.toggle=function(t,n){if(!e.isFunction(t)||!e.isFunction(n))return N.apply(this,arguments);r("jQuery.fn.toggle(handler, handler...) is deprecated");var a=arguments,o=t.guid||e.guid++,i=0,s=function(n){var r=(e._data(this,"lastToggle"+t.guid)||0)%i;return e._data(this,"lastToggle"+t.guid,r+1),n.preventDefault(),a[r].apply(this,arguments)||!1};for(s.guid=o;a.length>i;)a[i++].guid=o;return this.click(s)},e.fn.live=function(t,n,a){return r("jQuery.fn.live() is deprecated"),C?C.apply(this,arguments):(e(this.context).on(t,this.selector,n,a),this)},e.fn.die=function(t,n){return r("jQuery.fn.die() is deprecated"),S?S.apply(this,arguments):(e(this.context).off(t,this.selector||"**",n),this)},e.event.trigger=function(e,t,n,a){return n||M.test(e)||r("Global events are undocumented and deprecated"),k.call(this,e,t,n||document,a)},e.each(T.split("|"),function(t,n){e.event.special[n]={setup:function(){var t=this;return t!==document&&(e.event.add(document,n+"."+e.guid,function(){e.event.trigger(n,null,t,!0)}),e._data(this,n,e.guid++)),!1},teardown:function(){return this!==document&&e.event.remove(document,n+"."+e._data(this,n)),!1}}})}(jQuery,window);
+//@ sourceMappingURL=dist/jquery-migrate.min.map
\ No newline at end of file
diff --git a/core/js/jquery-1.10.0.js b/core/vendor/jquery/jquery.js
similarity index 98%
rename from core/js/jquery-1.10.0.js
rename to core/vendor/jquery/jquery.js
index f38148cf125..c5c648255c1 100644
--- a/core/js/jquery-1.10.0.js
+++ b/core/vendor/jquery/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v1.10.0
+ * jQuery JavaScript Library v1.10.2
  * http://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2013-05-24T18:39Z
+ * Date: 2013-07-03T13:48Z
  */
 (function( window, undefined ) {
 
@@ -46,7 +46,7 @@ var
 	// List of deleted data cache ids, so we can reuse them
 	core_deletedIds = [],
 
-	core_version = "1.10.0",
+	core_version = "1.10.2",
 
 	// Save a reference to some core methods
 	core_concat = core_deletedIds.concat,
@@ -1000,14 +1000,14 @@ function isArraylike( obj ) {
 // All jQuery objects should point back to these
 rootjQuery = jQuery(document);
 /*!
- * Sizzle CSS Selector Engine v1.9.4-pre
+ * Sizzle CSS Selector Engine v1.10.2
  * http://sizzlejs.com/
  *
  * Copyright 2013 jQuery Foundation, Inc. and other contributors
  * Released under the MIT license
  * http://jquery.org/license
  *
- * Date: 2013-05-15
+ * Date: 2013-07-03
  */
 (function( window, undefined ) {
 
@@ -1040,7 +1040,13 @@ var i,
 	tokenCache = createCache(),
 	compilerCache = createCache(),
 	hasDuplicate = false,
-	sortOrder = function() { return 0; },
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+		return 0;
+	},
 
 	// General-purpose constants
 	strundefined = typeof undefined,
@@ -1283,14 +1289,6 @@ function Sizzle( selector, context, results, seed ) {
 	return select( selector.replace( rtrim, "$1" ), context, results, seed );
 }
 
-/**
- * For feature detection
- * @param {Function} fn The function to test for native support
- */
-function isNative( fn ) {
-	return rnative.test( fn + "" );
-}
-
 /**
  * Create key-value caches of limited size
  * @returns {Function(string, Object)} Returns the Object data after storing it on itself with
@@ -1344,58 +1342,14 @@ function assert( fn ) {
 /**
  * Adds the same handler for all of the specified attrs
  * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied if the test fails
- * @param {Boolean} test The result of a test. If true, null will be set as the handler in leiu of the specified handler
+ * @param {Function} handler The method that will be applied
  */
-function addHandle( attrs, handler, test ) {
-	attrs = attrs.split("|");
-	var current,
-		i = attrs.length,
-		setHandle = test ? null : handler;
+function addHandle( attrs, handler ) {
+	var arr = attrs.split("|"),
+		i = attrs.length;
 
 	while ( i-- ) {
-		// Don't override a user's handler
-		if ( !(current = Expr.attrHandle[ attrs[i] ]) || current === handler ) {
-			Expr.attrHandle[ attrs[i] ] = setHandle;
-		}
-	}
-}
-
-/**
- * Fetches boolean attributes by node
- * @param {Element} elem
- * @param {String} name
- */
-function boolHandler( elem, name ) {
-	// XML does not need to be checked as this will not be assigned for XML documents
-	var val = elem.getAttributeNode( name );
-	return val && val.specified ?
-		val.value :
-		elem[ name ] === true ? name.toLowerCase() : null;
-}
-
-/**
- * Fetches attributes without interpolation
- * http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
- * @param {Element} elem
- * @param {String} name
- */
-function interpolationHandler( elem, name ) {
-	// XML does not need to be checked as this will not be assigned for XML documents
-	return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-}
-
-/**
- * Uses defaultValue to retrieve value in IE6/7
- * @param {Element} elem
- * @param {String} name
- */
-function valueHandler( elem ) {
-	// Ignore the value *property* on inputs by using defaultValue
-	// Fallback to Sizzle.attr by returning undefined where appropriate
-	// XML does not need to be checked as this will not be assigned for XML documents
-	if ( elem.nodeName.toLowerCase() === "input" ) {
-		return elem.defaultValue;
+		Expr.attrHandle[ arr[i] ] = handler;
 	}
 }
 
@@ -1403,7 +1357,7 @@ function valueHandler( elem ) {
  * Checks document order of two siblings
  * @param {Element} a
  * @param {Element} b
- * @returns Returns -1 if a precedes b, 1 if a follows b
+ * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
  */
 function siblingCheck( a, b ) {
 	var cur = b && a,
@@ -1492,7 +1446,8 @@ support = Sizzle.support = {};
  * @returns {Object} Returns the current document
  */
 setDocument = Sizzle.setDocument = function( node ) {
-	var doc = node ? node.ownerDocument || node : preferredDoc;
+	var doc = node ? node.ownerDocument || node : preferredDoc,
+		parent = doc.defaultView;
 
 	// If no document and documentElement is available, return
 	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
@@ -1506,38 +1461,26 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Support tests
 	documentIsHTML = !isXML( doc );
 
+	// Support: IE>8
+	// If iframe document is assigned to "document" variable and if iframe has been reloaded,
+	// IE will throw "permission denied" error when accessing "document" variable, see jQuery #13936
+	// IE6-8 do not support the defaultView property so parent will be undefined
+	if ( parent && parent.attachEvent && parent !== parent.top ) {
+		parent.attachEvent( "onbeforeunload", function() {
+			setDocument();
+		});
+	}
+
 	/* Attributes
 	---------------------------------------------------------------------- */
 
 	// Support: IE<8
 	// Verify that getAttribute really returns attributes and not properties (excepting IE8 booleans)
 	support.attributes = assert(function( div ) {
-
-		// Support: IE<8
-		// Prevent attribute/property "interpolation"
-		div.innerHTML = "<a href='#'></a>";
-		addHandle( "type|href|height|width", interpolationHandler, div.firstChild.getAttribute("href") === "#" );
-
-		// Support: IE<9
-		// Use getAttributeNode to fetch booleans when getAttribute lies
-		addHandle( booleans, boolHandler, div.getAttribute("disabled") == null );
-
 		div.className = "i";
 		return !div.getAttribute("className");
 	});
 
-	// Support: IE<9
-	// Retrieving value should defer to defaultValue
-	support.input = assert(function( div ) {
-		div.innerHTML = "<input>";
-		div.firstChild.setAttribute( "value", "" );
-		return div.firstChild.getAttribute( "value" ) === "";
-	});
-
-	// IE6/7 still return empty string for value,
-	// but are actually retrieving the property
-	addHandle( "value", valueHandler, support.attributes && support.input );
-
 	/* getElement(s)By*
 	---------------------------------------------------------------------- */
 
@@ -1646,7 +1589,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// See http://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
-	if ( (support.qsa = isNative(doc.querySelectorAll)) ) {
+	if ( (support.qsa = rnative.test( doc.querySelectorAll )) ) {
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
 		assert(function( div ) {
@@ -1698,7 +1641,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		});
 	}
 
-	if ( (support.matchesSelector = isNative( (matches = docElem.webkitMatchesSelector ||
+	if ( (support.matchesSelector = rnative.test( (matches = docElem.webkitMatchesSelector ||
 		docElem.mozMatchesSelector ||
 		docElem.oMatchesSelector ||
 		docElem.msMatchesSelector) )) ) {
@@ -1724,7 +1667,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Element contains another
 	// Purposefully does not implement inclusive descendent
 	// As in, an element does not contain itself
-	contains = isNative(docElem.contains) || docElem.compareDocumentPosition ?
+	contains = rnative.test( docElem.contains ) || docElem.compareDocumentPosition ?
 		function( a, b ) {
 			var adown = a.nodeType === 9 ? a.documentElement : a,
 				bup = b && b.parentNode;
@@ -1748,13 +1691,6 @@ setDocument = Sizzle.setDocument = function( node ) {
 	/* Sorting
 	---------------------------------------------------------------------- */
 
-	// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-	// Detached nodes confoundingly follow *each other*
-	support.sortDetached = assert(function( div1 ) {
-		// Should return 1, but returns 4 (following)
-		return div1.compareDocumentPosition( doc.createElement("div") ) & 1;
-	});
-
 	// Document order sorting
 	sortOrder = docElem.compareDocumentPosition ?
 	function( a, b ) {
@@ -1897,9 +1833,9 @@ Sizzle.attr = function( elem, name ) {
 
 	var fn = Expr.attrHandle[ name.toLowerCase() ],
 		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = ( fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
+		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
 			fn( elem, name, !documentIsHTML ) :
-			undefined );
+			undefined;
 
 	return val === undefined ?
 		support.attributes || !documentIsHTML ?
@@ -2444,6 +2380,8 @@ Expr = Sizzle.selectors = {
 	}
 };
 
+Expr.pseudos["nth"] = Expr.pseudos["eq"];
+
 // Add button/input type pseudos
 for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
 	Expr.pseudos[ i ] = createInputPseudo( i );
@@ -2452,6 +2390,11 @@ for ( i in { submit: true, reset: true } ) {
 	Expr.pseudos[ i ] = createButtonPseudo( i );
 }
 
+// Easy API for creating new setFilters
+function setFilters() {}
+setFilters.prototype = Expr.filters = Expr.pseudos;
+Expr.setFilters = new setFilters();
+
 function tokenize( selector, parseOnly ) {
 	var matched, match, tokens, type,
 		soFar, groups, preFilters,
@@ -2963,26 +2906,67 @@ function select( selector, context, results, seed ) {
 	return results;
 }
 
-// Deprecated
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
 // One-time assignments
 
 // Sort stability
 support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
 
+// Support: Chrome<14
+// Always assume duplicates if they aren't passed to the comparison function
+support.detectDuplicates = hasDuplicate;
+
 // Initialize against the default document
 setDocument();
 
-// Support: Chrome<<14
-// Always assume duplicates if they aren't passed to the comparison function
-[0, 0].sort( sortOrder );
-support.detectDuplicates = hasDuplicate;
+// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
+// Detached nodes confoundingly follow *each other*
+support.sortDetached = assert(function( div1 ) {
+	// Should return 1, but returns 4 (following)
+	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
+});
+
+// Support: IE<8
+// Prevent attribute/property "interpolation"
+// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
+if ( !assert(function( div ) {
+	div.innerHTML = "<a href='#'></a>";
+	return div.firstChild.getAttribute("href") === "#" ;
+}) ) {
+	addHandle( "type|href|height|width", function( elem, name, isXML ) {
+		if ( !isXML ) {
+			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
+		}
+	});
+}
+
+// Support: IE<9
+// Use defaultValue in place of getAttribute("value")
+if ( !support.attributes || !assert(function( div ) {
+	div.innerHTML = "<input/>";
+	div.firstChild.setAttribute( "value", "" );
+	return div.firstChild.getAttribute( "value" ) === "";
+}) ) {
+	addHandle( "value", function( elem, name, isXML ) {
+		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
+			return elem.defaultValue;
+		}
+	});
+}
+
+// Support: IE<9
+// Use getAttributeNode to fetch booleans when getAttribute lies
+if ( !assert(function( div ) {
+	return div.getAttribute("disabled") == null;
+}) ) {
+	addHandle( booleans, function( elem, name, isXML ) {
+		var val;
+		if ( !isXML ) {
+			return (val = elem.getAttributeNode( name )) && val.specified ?
+				val.value :
+				elem[ name ] === true ? name.toLowerCase() : null;
+		}
+	});
+}
 
 jQuery.find = Sizzle;
 jQuery.expr = Sizzle.selectors;
@@ -3167,9 +3151,9 @@ jQuery.Callbacks = function( options ) {
 			},
 			// Call all callbacks with the given context and arguments
 			fireWith: function( context, args ) {
-				args = args || [];
-				args = [ context, args.slice ? args.slice() : args ];
 				if ( list && ( !fired || stack ) ) {
+					args = args || [];
+					args = [ context, args.slice ? args.slice() : args ];
 					if ( firing ) {
 						stack.push( args );
 					} else {
@@ -3951,7 +3935,6 @@ jQuery.extend({
 			startLength--;
 		}
 
-		hooks.cur = fn;
 		if ( fn ) {
 
 			// Add a progress sentinel to prevent the fx queue from being
@@ -4174,8 +4157,11 @@ jQuery.fn.extend({
 	},
 
 	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
+		var type = typeof value;
+
+		if ( typeof stateVal === "boolean" && type === "string" ) {
+			return stateVal ? this.addClass( value ) : this.removeClass( value );
+		}
 
 		if ( jQuery.isFunction( value ) ) {
 			return this.each(function( i ) {
@@ -4189,13 +4175,15 @@ jQuery.fn.extend({
 				var className,
 					i = 0,
 					self = jQuery( this ),
-					state = stateVal,
 					classNames = value.match( core_rnotwhite ) || [];
 
 				while ( (className = classNames[ i++ ]) ) {
 					// check each className given, space separated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
+					if ( self.hasClass( className ) ) {
+						self.removeClass( className );
+					} else {
+						self.addClass( className );
+					}
 				}
 
 			// Toggle whole class name
@@ -6939,10 +6927,12 @@ jQuery.fn.extend({
 		return showHide( this );
 	},
 	toggle: function( state ) {
-		var bool = typeof state === "boolean";
+		if ( typeof state === "boolean" ) {
+			return state ? this.show() : this.hide();
+		}
 
 		return this.each(function() {
-			if ( bool ? state : isHidden( this ) ) {
+			if ( isHidden( this ) ) {
 				jQuery( this ).show();
 			} else {
 				jQuery( this ).hide();
@@ -6973,6 +6963,7 @@ jQuery.extend({
 		"fontWeight": true,
 		"lineHeight": true,
 		"opacity": true,
+		"order": true,
 		"orphans": true,
 		"widows": true,
 		"zIndex": true,
@@ -8864,8 +8855,8 @@ var fxNow, timerId,
 
 			// Update tween properties
 			if ( parts ) {
+				start = tween.start = +start || +target || 0;
 				tween.unit = unit;
-				tween.start = +start || +target || 0;
 				// If a +=/-= token was provided, we're doing a relative animation
 				tween.end = parts[ 1 ] ?
 					start + ( parts[ 1 ] + 1 ) * parts[ 2 ] :
@@ -9312,9 +9303,7 @@ jQuery.fn.extend({
 			doAnimation = function() {
 				// Operate on a copy of prop so per-property easing won't be lost
 				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-				doAnimation.finish = function() {
-					anim.stop( true );
-				};
+
 				// Empty animations, or finishing resolves immediately
 				if ( empty || jQuery._data( this, "finish" ) ) {
 					anim.stop( true );
@@ -9394,8 +9383,8 @@ jQuery.fn.extend({
 			// empty the queue first
 			jQuery.queue( this, type, [] );
 
-			if ( hooks && hooks.cur && hooks.cur.finish ) {
-				hooks.cur.finish.call( this );
+			if ( hooks && hooks.stop ) {
+				hooks.stop.call( this, true );
 			}
 
 			// look for any active animations, and finish them
@@ -9775,7 +9764,7 @@ jQuery.fn.size = function() {
 jQuery.fn.andSelf = jQuery.fn.addBack;
 
 // })();
-if ( typeof module === "object" && typeof module.exports === "object" ) {
+if ( typeof module === "object" && module && typeof module.exports === "object" ) {
 	// Expose jQuery as module.exports in loaders that implement the Node
 	// module pattern (including browserify). Do not create the global, since
 	// the user will be storing it themselves locally, and globals are frowned
diff --git a/core/vendor/jquery/jquery.min.js b/core/vendor/jquery/jquery.min.js
new file mode 100644
index 00000000000..29b3a2c7b49
--- /dev/null
+++ b/core/vendor/jquery/jquery.min.js
@@ -0,0 +1,6 @@
+/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
+//@ sourceMappingURL=jquery.min.map
+*/
+(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
+}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
+u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
diff --git a/core/vendor/jquery/jquery.min.map b/core/vendor/jquery/jquery.min.map
new file mode 100644
index 00000000000..2dd27a6b413
--- /dev/null
+++ b/core/vendor/jquery/jquery.min.map
@@ -0,0 +1 @@
+{"version":3,"file":"jquery-1.10.2.min.js","sources":["jquery-1.10.2.js"],"names":["window","undefined","readyList","rootjQuery","core_strundefined","location","document","docElem","documentElement","_jQuery","jQuery","_$","$","class2type","core_deletedIds","core_version","core_concat","concat","core_push","push","core_slice","slice","core_indexOf","indexOf","core_toString","toString","core_hasOwn","hasOwnProperty","core_trim","trim","selector","context","fn","init","core_pnum","source","core_rnotwhite","rtrim","rquickExpr","rsingleTag","rvalidchars","rvalidbraces","rvalidescape","rvalidtokens","rmsPrefix","rdashAlpha","fcamelCase","all","letter","toUpperCase","completed","event","addEventListener","type","readyState","detach","ready","removeEventListener","detachEvent","prototype","jquery","constructor","match","elem","this","charAt","length","exec","find","merge","parseHTML","nodeType","ownerDocument","test","isPlainObject","isFunction","attr","getElementById","parentNode","id","makeArray","toArray","call","get","num","pushStack","elems","ret","prevObject","each","callback","args","promise","done","apply","arguments","first","eq","last","i","len","j","map","end","sort","splice","extend","src","copyIsArray","copy","name","options","clone","target","deep","isArray","expando","Math","random","replace","noConflict","isReady","readyWait","holdReady","hold","wait","body","setTimeout","resolveWith","trigger","off","obj","Array","isWindow","isNumeric","isNaN","parseFloat","isFinite","String","key","e","support","ownLast","isEmptyObject","error","msg","Error","data","keepScripts","parsed","scripts","createElement","buildFragment","remove","childNodes","parseJSON","JSON","parse","Function","parseXML","xml","tmp","DOMParser","parseFromString","ActiveXObject","async","loadXML","getElementsByTagName","noop","globalEval","execScript","camelCase","string","nodeName","toLowerCase","value","isArraylike","text","arr","results","Object","inArray","max","second","l","grep","inv","retVal","arg","guid","proxy","access","chainable","emptyGet","raw","bulk","now","Date","getTime","swap","old","style","Deferred","attachEvent","top","frameElement","doScroll","doScrollCheck","split","cachedruns","Expr","getText","isXML","compile","outermostContext","sortInput","setDocument","documentIsHTML","rbuggyQSA","rbuggyMatches","matches","contains","preferredDoc","dirruns","classCache","createCache","tokenCache","compilerCache","hasDuplicate","sortOrder","a","b","strundefined","MAX_NEGATIVE","hasOwn","pop","push_native","booleans","whitespace","characterEncoding","identifier","attributes","pseudos","RegExp","rcomma","rcombinators","rsibling","rattributeQuotes","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rnative","rinputs","rheader","rescape","runescape","funescape","_","escaped","escapedWhitespace","high","fromCharCode","els","Sizzle","seed","m","groups","nid","newContext","newSelector","getElementsByClassName","qsa","tokenize","getAttribute","setAttribute","toSelector","join","querySelectorAll","qsaError","removeAttribute","select","keys","cache","cacheLength","shift","markFunction","assert","div","removeChild","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createPositionalPseudo","argument","matchIndexes","node","doc","parent","defaultView","className","appendChild","createComment","innerHTML","firstChild","getById","getElementsByName","filter","attrId","getAttributeNode","tag","input","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","val","specified","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","nodeValue","selectors","createPseudo","relative",">","dir"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","simple","forward","ofType","outerCache","nodeIndex","start","useCache","lastChild","pseudo","setFilters","idx","matched","not","matcher","unmatched","has","innerText","lang","elemLang","hash","root","focus","activeElement","hasFocus","href","tabIndex","enabled","disabled","checked","selected","selectedIndex","empty","header","button","even","odd","lt","gt","radio","checkbox","file","password","image","submit","reset","filters","parseOnly","tokens","soFar","preFilters","cached","addCombinator","combinator","base","checkNonElements","doneName","dirkey","elementMatcher","matchers","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","multipleContexts","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","matcherFromGroupMatchers","elementMatchers","setMatchers","matcherCachedRuns","bySet","byElement","superMatcher","expandContext","setMatched","matchedCount","outermost","contextBackup","dirrunsUnique","group","contexts","token","div1","defaultValue","unique","isXMLDoc","optionsCache","createOptions","object","flag","Callbacks","firing","memory","fired","firingLength","firingIndex","firingStart","list","stack","once","fire","stopOnFalse","self","disable","add","index","lock","locked","fireWith","func","tuples","state","always","deferred","fail","then","fns","newDefer","tuple","action","returned","resolve","reject","progress","notify","pipe","stateString","when","subordinate","resolveValues","remaining","updateFunc","values","progressValues","notifyWith","progressContexts","resolveContexts","fragment","opt","eventName","isSupported","cssText","getSetAttribute","leadingWhitespace","tbody","htmlSerialize","hrefNormalized","opacity","cssFloat","checkOn","optSelected","enctype","html5Clone","cloneNode","outerHTML","inlineBlockNeedsLayout","shrinkWrapBlocks","pixelPosition","deleteExpando","noCloneEvent","reliableMarginRight","boxSizingReliable","noCloneChecked","optDisabled","radioValue","createDocumentFragment","appendChecked","checkClone","click","change","focusin","backgroundClip","clearCloneStyle","container","marginDiv","tds","divReset","offsetHeight","display","reliableHiddenOffsets","zoom","boxSizing","offsetWidth","getComputedStyle","width","marginRight","rbrace","rmultiDash","internalData","pvt","acceptData","thisCache","internalKey","isNode","toJSON","internalRemoveData","isEmptyDataObject","cleanData","noData","applet","embed","hasData","removeData","_data","_removeData","dataAttr","queue","dequeue","startLength","hooks","_queueHooks","next","stop","setter","delay","time","fx","speeds","timeout","clearTimeout","clearQueue","count","defer","nodeHook","boolHook","rclass","rreturn","rfocusable","rclickable","ruseDefault","getSetInput","removeAttr","prop","removeProp","propFix","addClass","classes","clazz","proceed","removeClass","toggleClass","stateVal","classNames","hasClass","valHooks","set","option","one","optionSet","nType","attrHooks","propName","attrNames","for","class","notxml","propHooks","tabindex","parseInt","getter","setAttributeNode","createAttribute","coords","contenteditable","rformElems","rkeyEvent","rmouseEvent","rfocusMorph","rtypenamespace","returnTrue","returnFalse","safeActiveElement","err","global","types","events","t","handleObjIn","special","eventHandle","handleObj","handlers","namespaces","origType","elemData","handle","triggered","dispatch","delegateType","bindType","namespace","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","onlyHandlers","ontype","bubbleType","eventPath","Event","isTrigger","namespace_re","noBubble","parentWindow","isPropagationStopped","preventDefault","isDefaultPrevented","_default","fix","handlerQueue","delegateTarget","preDispatch","currentTarget","isImmediatePropagationStopped","stopPropagation","postDispatch","sel","originalEvent","fixHook","fixHooks","mouseHooks","keyHooks","props","srcElement","metaKey","original","which","charCode","keyCode","eventDoc","fromElement","pageX","clientX","scrollLeft","clientLeft","pageY","clientY","scrollTop","clientTop","relatedTarget","toElement","load","blur","beforeunload","returnValue","simulate","bubble","isSimulated","defaultPrevented","getPreventDefault","timeStamp","cancelBubble","stopImmediatePropagation","mouseenter","mouseleave","orig","related","submitBubbles","form","_submit_bubble","changeBubbles","propertyName","_just_changed","focusinBubbles","attaches","on","origFn","triggerHandler","isSimple","rparentsprev","rneedsContext","guaranteedUnique","children","contents","prev","targets","winnow","is","closest","pos","prevAll","addBack","sibling","parents","parentsUntil","until","nextAll","nextUntil","prevUntil","siblings","contentDocument","contentWindow","reverse","n","r","qualifier","createSafeFragment","nodeNames","safeFrag","rinlinejQuery","rnoshimcache","rleadingWhitespace","rxhtmlTag","rtagName","rtbody","rhtml","rnoInnerhtml","manipulation_rcheckableType","rchecked","rscriptType","rscriptTypeMasked","rcleanScript","wrapMap","legend","area","param","thead","tr","col","td","safeFragment","fragmentDiv","optgroup","tfoot","colgroup","caption","th","append","createTextNode","domManip","manipulationTarget","prepend","insertBefore","before","after","keepData","getAll","setGlobalEval","dataAndEvents","deepDataAndEvents","html","replaceWith","allowIntersection","hasScripts","iNoClone","disableScript","restoreScript","_evalUrl","content","refElements","cloneCopyEvent","dest","oldData","curData","fixCloneNodeIssues","defaultChecked","defaultSelected","appendTo","prependTo","insertAfter","replaceAll","insert","found","fixDefaultChecked","destElements","srcElements","inPage","selection","wrap","safe","nodes","url","ajax","dataType","throws","wrapAll","wrapInner","unwrap","iframe","getStyles","curCSS","ralpha","ropacity","rposition","rdisplayswap","rmargin","rnumsplit","rnumnonpx","rrelNum","elemdisplay","BODY","cssShow","position","visibility","cssNormalTransform","letterSpacing","fontWeight","cssExpand","cssPrefixes","vendorPropName","capName","origName","isHidden","el","css","showHide","show","hidden","css_defaultDisplay","styles","hide","toggle","cssHooks","computed","cssNumber","columnCount","fillOpacity","lineHeight","order","orphans","widows","zIndex","cssProps","float","extra","_computed","minWidth","maxWidth","getPropertyValue","currentStyle","left","rs","rsLeft","runtimeStyle","pixelLeft","setPositiveNumber","subtract","augmentWidthOrHeight","isBorderBox","getWidthOrHeight","valueIsBorderBox","actualDisplay","write","close","$1","visible","margin","padding","border","prefix","suffix","expand","expanded","parts","r20","rbracket","rCRLF","rsubmitterTypes","rsubmittable","serialize","serializeArray","traditional","s","encodeURIComponent","ajaxSettings","buildParams","v","hover","fnOver","fnOut","bind","unbind","delegate","undelegate","ajaxLocParts","ajaxLocation","ajax_nonce","ajax_rquery","rhash","rts","rheaders","rlocalProtocol","rnoContent","rprotocol","rurl","_load","prefilters","transports","allTypes","addToPrefiltersOrTransports","structure","dataTypeExpression","dataTypes","inspectPrefiltersOrTransports","originalOptions","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","params","response","responseText","complete","status","active","lastModified","etag","isLocal","processData","contentType","accepts","*","json","responseFields","converters","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","cacheURL","responseHeadersString","timeoutTimer","fireGlobals","transport","responseHeaders","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getResponseHeader","getAllResponseHeaders","setRequestHeader","lname","overrideMimeType","mimeType","code","abort","statusText","finalText","success","method","crossDomain","hasContent","ifModified","headers","beforeSend","send","nativeStatusText","responses","isSuccess","modified","ajaxHandleResponses","ajaxConvert","rejectWith","getJSON","getScript","firstDataType","ct","finalDataType","conv2","current","conv","dataFilter","script","text script","head","scriptCharset","charset","onload","onreadystatechange","isAbort","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","xhrCallbacks","xhrSupported","xhrId","xhrOnUnloadAbort","createStandardXHR","XMLHttpRequest","createActiveXHR","xhr","cors","username","open","xhrFields","firefoxAccessException","unload","fxNow","timerId","rfxtypes","rfxnum","rrun","animationPrefilters","defaultPrefilter","tweeners","tween","createTween","unit","scale","maxIterations","createFxNow","animation","collection","Animation","properties","stopped","tick","currentTime","startTime","duration","percent","tweens","run","opts","specialEasing","originalProperties","Tween","easing","gotoEnd","propFilter","timer","anim","tweener","prefilter","oldfire","dataShow","unqueued","overflow","overflowX","overflowY","eased","step","cssFn","speed","animate","genFx","fadeTo","to","optall","doAnimation","finish","stopQueue","timers","includeWidth","height","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","linear","p","swing","cos","PI","interval","setInterval","clearInterval","slow","fast","animated","offset","setOffset","win","box","getBoundingClientRect","getWindow","pageYOffset","pageXOffset","curElem","curOffset","curCSSTop","curCSSLeft","calculatePosition","curPosition","curTop","curLeft","using","offsetParent","parentOffset","scrollTo","Height","Width","defaultExtra","funcName","size","andSelf","module","exports","define","amd"],"mappings":";;;CAaA,SAAWA,EAAQC,GAOnB,GAECC,GAGAC,EAIAC,QAA2BH,GAG3BI,EAAWL,EAAOK,SAClBC,EAAWN,EAAOM,SAClBC,EAAUD,EAASE,gBAGnBC,EAAUT,EAAOU,OAGjBC,EAAKX,EAAOY,EAGZC,KAGAC,KAEAC,EAAe,SAGfC,EAAcF,EAAgBG,OAC9BC,EAAYJ,EAAgBK,KAC5BC,EAAaN,EAAgBO,MAC7BC,EAAeR,EAAgBS,QAC/BC,EAAgBX,EAAWY,SAC3BC,EAAcb,EAAWc,eACzBC,EAAYb,EAAac,KAGzBnB,EAAS,SAAUoB,EAAUC,GAE5B,MAAO,IAAIrB,GAAOsB,GAAGC,KAAMH,EAAUC,EAAS5B,IAI/C+B,EAAY,sCAAsCC,OAGlDC,EAAiB,OAGjBC,EAAQ,qCAKRC,EAAa,sCAGbC,EAAa,6BAGbC,EAAc,gBACdC,EAAe,uBACfC,EAAe,qCACfC,EAAe,kEAGfC,EAAY,QACZC,EAAa,eAGbC,EAAa,SAAUC,EAAKC,GAC3B,MAAOA,GAAOC,eAIfC,EAAY,SAAUC,IAGhB7C,EAAS8C,kBAAmC,SAAfD,EAAME,MAA2C,aAAxB/C,EAASgD,cACnEC,IACA7C,EAAO8C,UAITD,EAAS,WACHjD,EAAS8C,kBACb9C,EAASmD,oBAAqB,mBAAoBP,GAAW,GAC7DlD,EAAOyD,oBAAqB,OAAQP,GAAW,KAG/C5C,EAASoD,YAAa,qBAAsBR,GAC5ClD,EAAO0D,YAAa,SAAUR,IAIjCxC,GAAOsB,GAAKtB,EAAOiD,WAElBC,OAAQ7C,EAER8C,YAAanD,EACbuB,KAAM,SAAUH,EAAUC,EAAS5B,GAClC,GAAI2D,GAAOC,CAGX,KAAMjC,EACL,MAAOkC,KAIR,IAAyB,gBAAblC,GAAwB,CAUnC,GAPCgC,EAF2B,MAAvBhC,EAASmC,OAAO,IAAyD,MAA3CnC,EAASmC,OAAQnC,EAASoC,OAAS,IAAepC,EAASoC,QAAU,GAE7F,KAAMpC,EAAU,MAGlBQ,EAAW6B,KAAMrC,IAIrBgC,IAAUA,EAAM,IAAO/B,EAqDrB,OAAMA,GAAWA,EAAQ6B,QACtB7B,GAAW5B,GAAaiE,KAAMtC,GAKhCkC,KAAKH,YAAa9B,GAAUqC,KAAMtC,EAxDzC,IAAKgC,EAAM,GAAK,CAWf,GAVA/B,EAAUA,YAAmBrB,GAASqB,EAAQ,GAAKA,EAGnDrB,EAAO2D,MAAOL,KAAMtD,EAAO4D,UAC1BR,EAAM,GACN/B,GAAWA,EAAQwC,SAAWxC,EAAQyC,eAAiBzC,EAAUzB,GACjE,IAIIiC,EAAWkC,KAAMX,EAAM,KAAQpD,EAAOgE,cAAe3C,GACzD,IAAM+B,IAAS/B,GAETrB,EAAOiE,WAAYX,KAAMF,IAC7BE,KAAMF,GAAS/B,EAAS+B,IAIxBE,KAAKY,KAAMd,EAAO/B,EAAS+B,GAK9B,OAAOE,MAQP,GAJAD,EAAOzD,EAASuE,eAAgBf,EAAM,IAIjCC,GAAQA,EAAKe,WAAa,CAG9B,GAAKf,EAAKgB,KAAOjB,EAAM,GACtB,MAAO3D,GAAWiE,KAAMtC,EAIzBkC,MAAKE,OAAS,EACdF,KAAK,GAAKD,EAKX,MAFAC,MAAKjC,QAAUzB,EACf0D,KAAKlC,SAAWA,EACTkC,KAcH,MAAKlC,GAASyC,UACpBP,KAAKjC,QAAUiC,KAAK,GAAKlC,EACzBkC,KAAKE,OAAS,EACPF,MAIItD,EAAOiE,WAAY7C,GACvB3B,EAAWqD,MAAO1B,IAGrBA,EAASA,WAAa7B,IAC1B+D,KAAKlC,SAAWA,EAASA,SACzBkC,KAAKjC,QAAUD,EAASC,SAGlBrB,EAAOsE,UAAWlD,EAAUkC,QAIpClC,SAAU,GAGVoC,OAAQ,EAERe,QAAS,WACR,MAAO7D,GAAW8D,KAAMlB,OAKzBmB,IAAK,SAAUC,GACd,MAAc,OAAPA,EAGNpB,KAAKiB,UAGG,EAANG,EAAUpB,KAAMA,KAAKE,OAASkB,GAAQpB,KAAMoB,IAKhDC,UAAW,SAAUC,GAGpB,GAAIC,GAAM7E,EAAO2D,MAAOL,KAAKH,cAAeyB,EAO5C,OAJAC,GAAIC,WAAaxB,KACjBuB,EAAIxD,QAAUiC,KAAKjC,QAGZwD,GAMRE,KAAM,SAAUC,EAAUC,GACzB,MAAOjF,GAAO+E,KAAMzB,KAAM0B,EAAUC,IAGrCnC,MAAO,SAAUxB,GAIhB,MAFAtB,GAAO8C,MAAMoC,UAAUC,KAAM7D,GAEtBgC,MAGR3C,MAAO,WACN,MAAO2C,MAAKqB,UAAWjE,EAAW0E,MAAO9B,KAAM+B,aAGhDC,MAAO,WACN,MAAOhC,MAAKiC,GAAI,IAGjBC,KAAM,WACL,MAAOlC,MAAKiC,GAAI,KAGjBA,GAAI,SAAUE,GACb,GAAIC,GAAMpC,KAAKE,OACdmC,GAAKF,GAAU,EAAJA,EAAQC,EAAM,EAC1B,OAAOpC,MAAKqB,UAAWgB,GAAK,GAASD,EAAJC,GAAYrC,KAAKqC,SAGnDC,IAAK,SAAUZ,GACd,MAAO1B,MAAKqB,UAAW3E,EAAO4F,IAAItC,KAAM,SAAUD,EAAMoC,GACvD,MAAOT,GAASR,KAAMnB,EAAMoC,EAAGpC,OAIjCwC,IAAK,WACJ,MAAOvC,MAAKwB,YAAcxB,KAAKH,YAAY,OAK5C1C,KAAMD,EACNsF,QAASA,KACTC,UAAWA,QAIZ/F,EAAOsB,GAAGC,KAAK0B,UAAYjD,EAAOsB,GAElCtB,EAAOgG,OAAShG,EAAOsB,GAAG0E,OAAS,WAClC,GAAIC,GAAKC,EAAaC,EAAMC,EAAMC,EAASC,EAC1CC,EAASlB,UAAU,OACnBI,EAAI,EACJjC,EAAS6B,UAAU7B,OACnBgD,GAAO,CAqBR,KAlBuB,iBAAXD,KACXC,EAAOD,EACPA,EAASlB,UAAU,OAEnBI,EAAI,GAIkB,gBAAXc,IAAwBvG,EAAOiE,WAAWsC,KACrDA,MAII/C,IAAWiC,IACfc,EAASjD,OACPmC,GAGSjC,EAAJiC,EAAYA,IAEnB,GAAmC,OAA7BY,EAAUhB,UAAWI,IAE1B,IAAMW,IAAQC,GACbJ,EAAMM,EAAQH,GACdD,EAAOE,EAASD,GAGXG,IAAWJ,IAKXK,GAAQL,IAAUnG,EAAOgE,cAAcmC,KAAUD,EAAclG,EAAOyG,QAAQN,MAC7ED,GACJA,GAAc,EACdI,EAAQL,GAAOjG,EAAOyG,QAAQR,GAAOA,MAGrCK,EAAQL,GAAOjG,EAAOgE,cAAciC,GAAOA,KAI5CM,EAAQH,GAASpG,EAAOgG,OAAQQ,EAAMF,EAAOH,IAGlCA,IAAS5G,IACpBgH,EAAQH,GAASD,GAOrB,OAAOI,IAGRvG,EAAOgG,QAGNU,QAAS,UAAarG,EAAesG,KAAKC,UAAWC,QAAS,MAAO,IAErEC,WAAY,SAAUN,GASrB,MARKlH,GAAOY,IAAMF,IACjBV,EAAOY,EAAID,GAGPuG,GAAQlH,EAAOU,SAAWA,IAC9BV,EAAOU,OAASD,GAGVC,GAIR+G,SAAS,EAITC,UAAW,EAGXC,UAAW,SAAUC,GACfA,EACJlH,EAAOgH,YAEPhH,EAAO8C,OAAO,IAKhBA,MAAO,SAAUqE,GAGhB,GAAKA,KAAS,KAASnH,EAAOgH,WAAYhH,EAAO+G,QAAjD,CAKA,IAAMnH,EAASwH,KACd,MAAOC,YAAYrH,EAAO8C,MAI3B9C,GAAO+G,SAAU,EAGZI,KAAS,KAAUnH,EAAOgH,UAAY,IAK3CxH,EAAU8H,YAAa1H,GAAYI,IAG9BA,EAAOsB,GAAGiG,SACdvH,EAAQJ,GAAW2H,QAAQ,SAASC,IAAI,YAO1CvD,WAAY,SAAUwD,GACrB,MAA4B,aAArBzH,EAAO2C,KAAK8E,IAGpBhB,QAASiB,MAAMjB,SAAW,SAAUgB,GACnC,MAA4B,UAArBzH,EAAO2C,KAAK8E,IAGpBE,SAAU,SAAUF,GAEnB,MAAc,OAAPA,GAAeA,GAAOA,EAAInI,QAGlCsI,UAAW,SAAUH,GACpB,OAAQI,MAAOC,WAAWL,KAAUM,SAAUN,IAG/C9E,KAAM,SAAU8E,GACf,MAAY,OAAPA,EACWA,EAARO,GAEc,gBAARP,IAAmC,kBAARA,GACxCtH,EAAYW,EAAc0D,KAAKiD,KAAU,eAClCA,IAGTzD,cAAe,SAAUyD,GACxB,GAAIQ,EAKJ,KAAMR,GAA4B,WAArBzH,EAAO2C,KAAK8E,IAAqBA,EAAI5D,UAAY7D,EAAO2H,SAAUF,GAC9E,OAAO,CAGR,KAEC,GAAKA,EAAItE,cACPnC,EAAYwD,KAAKiD,EAAK,iBACtBzG,EAAYwD,KAAKiD,EAAItE,YAAYF,UAAW,iBAC7C,OAAO,EAEP,MAAQiF,GAET,OAAO,EAKR,GAAKlI,EAAOmI,QAAQC,QACnB,IAAMH,IAAOR,GACZ,MAAOzG,GAAYwD,KAAMiD,EAAKQ,EAMhC,KAAMA,IAAOR,IAEb,MAAOQ,KAAQ1I,GAAayB,EAAYwD,KAAMiD,EAAKQ,IAGpDI,cAAe,SAAUZ,GACxB,GAAIrB,EACJ,KAAMA,IAAQqB,GACb,OAAO,CAER,QAAO,GAGRa,MAAO,SAAUC,GAChB,KAAUC,OAAOD,IAMlB3E,UAAW,SAAU6E,EAAMpH,EAASqH,GACnC,IAAMD,GAAwB,gBAATA,GACpB,MAAO,KAEgB,kBAAZpH,KACXqH,EAAcrH,EACdA,GAAU,GAEXA,EAAUA,GAAWzB,CAErB,IAAI+I,GAAS9G,EAAW4B,KAAMgF,GAC7BG,GAAWF,KAGZ,OAAKC,IACKtH,EAAQwH,cAAeF,EAAO,MAGxCA,EAAS3I,EAAO8I,eAAiBL,GAAQpH,EAASuH,GAC7CA,GACJ5I,EAAQ4I,GAAUG,SAEZ/I,EAAO2D,SAAWgF,EAAOK,cAGjCC,UAAW,SAAUR,GAEpB,MAAKnJ,GAAO4J,MAAQ5J,EAAO4J,KAAKC,MACxB7J,EAAO4J,KAAKC,MAAOV,GAGb,OAATA,EACGA,EAGa,gBAATA,KAGXA,EAAOzI,EAAOmB,KAAMsH,GAEfA,GAGC3G,EAAYiC,KAAM0E,EAAK5B,QAAS7E,EAAc,KACjD6E,QAAS5E,EAAc,KACvB4E,QAAS9E,EAAc,MAEXqH,SAAU,UAAYX,MAKtCzI,EAAOsI,MAAO,iBAAmBG,GAAjCzI,IAIDqJ,SAAU,SAAUZ,GACnB,GAAIa,GAAKC,CACT,KAAMd,GAAwB,gBAATA,GACpB,MAAO,KAER,KACMnJ,EAAOkK,WACXD,EAAM,GAAIC,WACVF,EAAMC,EAAIE,gBAAiBhB,EAAO,cAElCa,EAAM,GAAII,eAAe,oBACzBJ,EAAIK,MAAQ,QACZL,EAAIM,QAASnB,IAEb,MAAOP,GACRoB,EAAM/J,EAKP,MAHM+J,IAAQA,EAAIxJ,kBAAmBwJ,EAAIO,qBAAsB,eAAgBrG,QAC9ExD,EAAOsI,MAAO,gBAAkBG,GAE1Ba,GAGRQ,KAAM,aAKNC,WAAY,SAAUtB,GAChBA,GAAQzI,EAAOmB,KAAMsH,KAIvBnJ,EAAO0K,YAAc,SAAUvB,GAChCnJ,EAAe,KAAEkF,KAAMlF,EAAQmJ,KAC3BA,IAMPwB,UAAW,SAAUC,GACpB,MAAOA,GAAOrD,QAAS3E,EAAW,OAAQ2E,QAAS1E,EAAYC,IAGhE+H,SAAU,SAAU9G,EAAM+C,GACzB,MAAO/C,GAAK8G,UAAY9G,EAAK8G,SAASC,gBAAkBhE,EAAKgE,eAI9DrF,KAAM,SAAU0C,EAAKzC,EAAUC,GAC9B,GAAIoF,GACH5E,EAAI,EACJjC,EAASiE,EAAIjE,OACbiD,EAAU6D,EAAa7C,EAExB,IAAKxC,GACJ,GAAKwB,GACJ,KAAYjD,EAAJiC,EAAYA,IAGnB,GAFA4E,EAAQrF,EAASI,MAAOqC,EAAKhC,GAAKR,GAE7BoF,KAAU,EACd,UAIF,KAAM5E,IAAKgC,GAGV,GAFA4C,EAAQrF,EAASI,MAAOqC,EAAKhC,GAAKR,GAE7BoF,KAAU,EACd,UAOH,IAAK5D,GACJ,KAAYjD,EAAJiC,EAAYA,IAGnB,GAFA4E,EAAQrF,EAASR,KAAMiD,EAAKhC,GAAKA,EAAGgC,EAAKhC,IAEpC4E,KAAU,EACd,UAIF,KAAM5E,IAAKgC,GAGV,GAFA4C,EAAQrF,EAASR,KAAMiD,EAAKhC,GAAKA,EAAGgC,EAAKhC,IAEpC4E,KAAU,EACd,KAMJ,OAAO5C,IAIRtG,KAAMD,IAAcA,EAAUsD,KAAK,gBAClC,SAAU+F,GACT,MAAe,OAARA,EACN,GACArJ,EAAUsD,KAAM+F,IAIlB,SAAUA,GACT,MAAe,OAARA,EACN,IACEA,EAAO,IAAK1D,QAASlF,EAAO,KAIjC2C,UAAW,SAAUkG,EAAKC,GACzB,GAAI5F,GAAM4F,KAaV,OAXY,OAAPD,IACCF,EAAaI,OAAOF,IACxBxK,EAAO2D,MAAOkB,EACE,gBAAR2F,IACLA,GAAQA,GAGXhK,EAAUgE,KAAMK,EAAK2F,IAIhB3F,GAGR8F,QAAS,SAAUtH,EAAMmH,EAAK/E,GAC7B,GAAIC,EAEJ,IAAK8E,EAAM,CACV,GAAK5J,EACJ,MAAOA,GAAa4D,KAAMgG,EAAKnH,EAAMoC,EAMtC,KAHAC,EAAM8E,EAAIhH,OACViC,EAAIA,EAAQ,EAAJA,EAAQkB,KAAKiE,IAAK,EAAGlF,EAAMD,GAAMA,EAAI,EAEjCC,EAAJD,EAASA,IAEhB,GAAKA,IAAK+E,IAAOA,EAAK/E,KAAQpC,EAC7B,MAAOoC,GAKV,MAAO,IAGR9B,MAAO,SAAU2B,EAAOuF,GACvB,GAAIC,GAAID,EAAOrH,OACdiC,EAAIH,EAAM9B,OACVmC,EAAI,CAEL,IAAkB,gBAANmF,GACX,KAAYA,EAAJnF,EAAOA,IACdL,EAAOG,KAAQoF,EAAQlF,OAGxB,OAAQkF,EAAOlF,KAAOpG,EACrB+F,EAAOG,KAAQoF,EAAQlF,IAMzB,OAFAL,GAAM9B,OAASiC,EAERH,GAGRyF,KAAM,SAAUnG,EAAOI,EAAUgG,GAChC,GAAIC,GACHpG,KACAY,EAAI,EACJjC,EAASoB,EAAMpB,MAKhB,KAJAwH,IAAQA,EAIIxH,EAAJiC,EAAYA,IACnBwF,IAAWjG,EAAUJ,EAAOa,GAAKA,GAC5BuF,IAAQC,GACZpG,EAAIpE,KAAMmE,EAAOa,GAInB,OAAOZ,IAIRe,IAAK,SAAUhB,EAAOI,EAAUkG,GAC/B,GAAIb,GACH5E,EAAI,EACJjC,EAASoB,EAAMpB,OACfiD,EAAU6D,EAAa1F,GACvBC,IAGD,IAAK4B,EACJ,KAAYjD,EAAJiC,EAAYA,IACnB4E,EAAQrF,EAAUJ,EAAOa,GAAKA,EAAGyF,GAEnB,MAATb,IACJxF,EAAKA,EAAIrB,QAAW6G,OAMtB,KAAM5E,IAAKb,GACVyF,EAAQrF,EAAUJ,EAAOa,GAAKA,EAAGyF,GAEnB,MAATb,IACJxF,EAAKA,EAAIrB,QAAW6G,EAMvB,OAAO/J,GAAY8E,SAAWP,IAI/BsG,KAAM,EAINC,MAAO,SAAU9J,EAAID,GACpB,GAAI4D,GAAMmG,EAAO7B,CAUjB,OARwB,gBAAZlI,KACXkI,EAAMjI,EAAID,GACVA,EAAUC,EACVA,EAAKiI,GAKAvJ,EAAOiE,WAAY3C,IAKzB2D,EAAOvE,EAAW8D,KAAMa,UAAW,GACnC+F,EAAQ,WACP,MAAO9J,GAAG8D,MAAO/D,GAAWiC,KAAM2B,EAAK1E,OAAQG,EAAW8D,KAAMa,cAIjE+F,EAAMD,KAAO7J,EAAG6J,KAAO7J,EAAG6J,MAAQnL,EAAOmL,OAElCC,GAZC7L,GAiBT8L,OAAQ,SAAUzG,EAAOtD,EAAI2G,EAAKoC,EAAOiB,EAAWC,EAAUC,GAC7D,GAAI/F,GAAI,EACPjC,EAASoB,EAAMpB,OACfiI,EAAc,MAAPxD,CAGR,IAA4B,WAAvBjI,EAAO2C,KAAMsF,GAAqB,CACtCqD,GAAY,CACZ,KAAM7F,IAAKwC,GACVjI,EAAOqL,OAAQzG,EAAOtD,EAAImE,EAAGwC,EAAIxC,IAAI,EAAM8F,EAAUC,OAIhD,IAAKnB,IAAU9K,IACrB+L,GAAY,EAENtL,EAAOiE,WAAYoG,KACxBmB,GAAM,GAGFC,IAECD,GACJlK,EAAGkD,KAAMI,EAAOyF,GAChB/I,EAAK,OAILmK,EAAOnK,EACPA,EAAK,SAAU+B,EAAM4E,EAAKoC,GACzB,MAAOoB,GAAKjH,KAAMxE,EAAQqD,GAAQgH,MAKhC/I,GACJ,KAAYkC,EAAJiC,EAAYA,IACnBnE,EAAIsD,EAAMa,GAAIwC,EAAKuD,EAAMnB,EAAQA,EAAM7F,KAAMI,EAAMa,GAAIA,EAAGnE,EAAIsD,EAAMa,GAAIwC,IAK3E,OAAOqD,GACN1G,EAGA6G,EACCnK,EAAGkD,KAAMI,GACTpB,EAASlC,EAAIsD,EAAM,GAAIqD,GAAQsD,GAGlCG,IAAK,WACJ,OAAO,GAAMC,OAASC,WAMvBC,KAAM,SAAUxI,EAAMgD,EAASrB,EAAUC,GACxC,GAAIJ,GAAKuB,EACR0F,IAGD,KAAM1F,IAAQC,GACbyF,EAAK1F,GAAS/C,EAAK0I,MAAO3F,GAC1B/C,EAAK0I,MAAO3F,GAASC,EAASD,EAG/BvB,GAAMG,EAASI,MAAO/B,EAAM4B,MAG5B,KAAMmB,IAAQC,GACbhD,EAAK0I,MAAO3F,GAAS0F,EAAK1F,EAG3B,OAAOvB,MAIT7E,EAAO8C,MAAMoC,QAAU,SAAUuC,GAChC,IAAMjI,EAOL,GALAA,EAAYQ,EAAOgM,WAKU,aAAxBpM,EAASgD,WAEbyE,WAAYrH,EAAO8C,WAGb,IAAKlD,EAAS8C,iBAEpB9C,EAAS8C,iBAAkB,mBAAoBF,GAAW,GAG1DlD,EAAOoD,iBAAkB,OAAQF,GAAW,OAGtC,CAEN5C,EAASqM,YAAa,qBAAsBzJ,GAG5ClD,EAAO2M,YAAa,SAAUzJ,EAI9B,IAAI0J,IAAM,CAEV,KACCA,EAA6B,MAAvB5M,EAAO6M,cAAwBvM,EAASE,gBAC7C,MAAMoI,IAEHgE,GAAOA,EAAIE,UACf,QAAUC,KACT,IAAMrM,EAAO+G,QAAU,CAEtB,IAGCmF,EAAIE,SAAS,QACZ,MAAMlE,GACP,MAAOb,YAAYgF,EAAe,IAInCxJ,IAGA7C,EAAO8C,YAMZ,MAAOtD,GAAU0F,QAASuC,IAI3BzH,EAAO+E,KAAK,gEAAgEuH,MAAM,KAAM,SAAS7G,EAAGW,GACnGjG,EAAY,WAAaiG,EAAO,KAAQA,EAAKgE,eAG9C,SAASE,GAAa7C,GACrB,GAAIjE,GAASiE,EAAIjE,OAChBb,EAAO3C,EAAO2C,KAAM8E,EAErB,OAAKzH,GAAO2H,SAAUF,IACd,EAGc,IAAjBA,EAAI5D,UAAkBL,GACnB,EAGQ,UAATb,GAA6B,aAATA,IACb,IAAXa,GACgB,gBAAXA,IAAuBA,EAAS,GAAOA,EAAS,IAAOiE,IAIhEhI,EAAaO,EAAOJ,GAWpB,SAAWN,EAAQC,GAEnB,GAAIkG,GACH0C,EACAoE,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EACAlN,EACAC,EACAkN,EACAC,EACAC,EACAC,EACAC,EAGAzG,EAAU,UAAY,GAAKiF,MAC3ByB,EAAe9N,EAAOM,SACtByN,EAAU,EACVlI,EAAO,EACPmI,EAAaC,KACbC,EAAaD,KACbE,EAAgBF,KAChBG,GAAe,EACfC,EAAY,SAAUC,EAAGC,GACxB,MAAKD,KAAMC,GACVH,GAAe,EACR,GAED,GAIRI,QAAsBvO,GACtBwO,EAAe,GAAK,GAGpBC,KAAc/M,eACduJ,KACAyD,EAAMzD,EAAIyD,IACVC,EAAc1D,EAAI/J,KAClBA,EAAO+J,EAAI/J,KACXE,EAAQ6J,EAAI7J,MAEZE,EAAU2J,EAAI3J,SAAW,SAAUwC,GAClC,GAAIoC,GAAI,EACPC,EAAMpC,KAAKE,MACZ,MAAYkC,EAAJD,EAASA,IAChB,GAAKnC,KAAKmC,KAAOpC,EAChB,MAAOoC,EAGT,OAAO,IAGR0I,EAAW,6HAKXC,EAAa,sBAEbC,EAAoB,mCAKpBC,EAAaD,EAAkBxH,QAAS,IAAK,MAG7C0H,EAAa,MAAQH,EAAa,KAAOC,EAAoB,IAAMD,EAClE,mBAAqBA,EAAa,wCAA0CE,EAAa,QAAUF,EAAa,OAQjHI,EAAU,KAAOH,EAAoB,mEAAqEE,EAAW1H,QAAS,EAAG,GAAM,eAGvIlF,EAAY8M,OAAQ,IAAML,EAAa,8BAAgCA,EAAa,KAAM,KAE1FM,EAAaD,OAAQ,IAAML,EAAa,KAAOA,EAAa,KAC5DO,EAAmBF,OAAQ,IAAML,EAAa,WAAaA,EAAa,IAAMA,EAAa,KAE3FQ,EAAeH,OAAQL,EAAa,SACpCS,EAAuBJ,OAAQ,IAAML,EAAa,gBAAkBA,EAAa,OAAQ,KAEzFU,EAAcL,OAAQD,GACtBO,EAAkBN,OAAQ,IAAMH,EAAa,KAE7CU,GACCC,GAAUR,OAAQ,MAAQJ,EAAoB,KAC9Ca,MAAaT,OAAQ,QAAUJ,EAAoB,KACnDc,IAAWV,OAAQ,KAAOJ,EAAkBxH,QAAS,IAAK,MAAS,KACnEuI,KAAYX,OAAQ,IAAMF,GAC1Bc,OAAcZ,OAAQ,IAAMD,GAC5Bc,MAAab,OAAQ,yDAA2DL,EAC/E,+BAAiCA,EAAa,cAAgBA,EAC9D,aAAeA,EAAa,SAAU,KACvCmB,KAAYd,OAAQ,OAASN,EAAW,KAAM,KAG9CqB,aAAoBf,OAAQ,IAAML,EAAa,mDAC9CA,EAAa,mBAAqBA,EAAa,mBAAoB,MAGrEqB,EAAU,yBAGV7N,EAAa,mCAEb8N,GAAU,sCACVC,GAAU,SAEVC,GAAU,QAGVC,GAAgBpB,OAAQ,qBAAuBL,EAAa,MAAQA,EAAa,OAAQ,MACzF0B,GAAY,SAAUC,EAAGC,EAASC,GACjC,GAAIC,GAAO,KAAOF,EAAU,KAI5B,OAAOE,KAASA,GAAQD,EACvBD,EAEO,EAAPE,EACClI,OAAOmI,aAAcD,EAAO,OAE5BlI,OAAOmI,aAA2B,MAAbD,GAAQ,GAA4B,MAAR,KAAPA,GAI9C,KACCzP,EAAK2E,MACHoF,EAAM7J,EAAM6D,KAAM4I,EAAapE,YAChCoE,EAAapE,YAIdwB,EAAK4C,EAAapE,WAAWxF,QAASK,SACrC,MAAQqE,IACTzH,GAAS2E,MAAOoF,EAAIhH,OAGnB,SAAU+C,EAAQ6J,GACjBlC,EAAY9I,MAAOmB,EAAQ5F,EAAM6D,KAAK4L,KAKvC,SAAU7J,EAAQ6J,GACjB,GAAIzK,GAAIY,EAAO/C,OACdiC,EAAI,CAEL,OAASc,EAAOZ,KAAOyK,EAAI3K,MAC3Bc,EAAO/C,OAASmC,EAAI,IAKvB,QAAS0K,IAAQjP,EAAUC,EAASoJ,EAAS6F,GAC5C,GAAIlN,GAAOC,EAAMkN,EAAG1M,EAEnB4B,EAAG+K,EAAQ1E,EAAK2E,EAAKC,EAAYC,CASlC,KAPOtP,EAAUA,EAAQyC,eAAiBzC,EAAU+L,KAAmBxN,GACtEkN,EAAazL,GAGdA,EAAUA,GAAWzB,EACrB6K,EAAUA,OAEJrJ,GAAgC,gBAAbA,GACxB,MAAOqJ,EAGR,IAAuC,KAAjC5G,EAAWxC,EAAQwC,WAAgC,IAAbA,EAC3C,QAGD,IAAKkJ,IAAmBuD,EAAO,CAG9B,GAAMlN,EAAQxB,EAAW6B,KAAMrC,GAE9B,GAAMmP,EAAInN,EAAM,IACf,GAAkB,IAAbS,EAAiB,CAIrB,GAHAR,EAAOhC,EAAQ8C,eAAgBoM,IAG1BlN,IAAQA,EAAKe,WAQjB,MAAOqG,EALP,IAAKpH,EAAKgB,KAAOkM,EAEhB,MADA9F,GAAQhK,KAAM4C,GACPoH,MAOT,IAAKpJ,EAAQyC,gBAAkBT,EAAOhC,EAAQyC,cAAcK,eAAgBoM,KAC3EpD,EAAU9L,EAASgC,IAAUA,EAAKgB,KAAOkM,EAEzC,MADA9F,GAAQhK,KAAM4C,GACPoH,MAKH,CAAA,GAAKrH,EAAM,GAEjB,MADA3C,GAAK2E,MAAOqF,EAASpJ,EAAQwI,qBAAsBzI,IAC5CqJ,CAGD,KAAM8F,EAAInN,EAAM,KAAO+E,EAAQyI,wBAA0BvP,EAAQuP,uBAEvE,MADAnQ,GAAK2E,MAAOqF,EAASpJ,EAAQuP,uBAAwBL,IAC9C9F,EAKT,GAAKtC,EAAQ0I,OAAS7D,IAAcA,EAAUjJ,KAAM3C,IAAc,CASjE,GARAqP,EAAM3E,EAAMpF,EACZgK,EAAarP,EACbsP,EAA2B,IAAb9M,GAAkBzC,EAMd,IAAbyC,GAAqD,WAAnCxC,EAAQ8I,SAASC,cAA6B,CACpEoG,EAASM,GAAU1P,IAEb0K,EAAMzK,EAAQ0P,aAAa,OAChCN,EAAM3E,EAAIjF,QAAS+I,GAAS,QAE5BvO,EAAQ2P,aAAc,KAAMP,GAE7BA,EAAM,QAAUA,EAAM,MAEtBhL,EAAI+K,EAAOhN,MACX,OAAQiC,IACP+K,EAAO/K,GAAKgL,EAAMQ,GAAYT,EAAO/K,GAEtCiL,GAAa9B,EAAS7K,KAAM3C,IAAcC,EAAQ+C,YAAc/C,EAChEsP,EAAcH,EAAOU,KAAK,KAG3B,GAAKP,EACJ,IAIC,MAHAlQ,GAAK2E,MAAOqF,EACXiG,EAAWS,iBAAkBR,IAEvBlG,EACN,MAAM2G,IACN,QACKtF,GACLzK,EAAQgQ,gBAAgB,QAQ7B,MAAOC,IAAQlQ,EAASyF,QAASlF,EAAO,MAAQN,EAASoJ,EAAS6F,GASnE,QAAS/C,MACR,GAAIgE,KAEJ,SAASC,GAAOvJ,EAAKoC,GAMpB,MAJKkH,GAAK9Q,KAAMwH,GAAO,KAAQuE,EAAKiF,mBAE5BD,GAAOD,EAAKG,SAEZF,EAAOvJ,GAAQoC,EAExB,MAAOmH,GAOR,QAASG,IAAcrQ,GAEtB,MADAA,GAAIoF,IAAY,EACTpF,EAOR,QAASsQ,IAAQtQ,GAChB,GAAIuQ,GAAMjS,EAASiJ,cAAc,MAEjC,KACC,QAASvH,EAAIuQ,GACZ,MAAO3J,GACR,OAAO,EACN,QAEI2J,EAAIzN,YACRyN,EAAIzN,WAAW0N,YAAaD,GAG7BA,EAAM,MASR,QAASE,IAAWC,EAAOC,GAC1B,GAAIzH,GAAMwH,EAAM1F,MAAM,KACrB7G,EAAIuM,EAAMxO,MAEX,OAAQiC,IACP+G,EAAK0F,WAAY1H,EAAI/E,IAAOwM,EAU9B,QAASE,IAAcvE,EAAGC,GACzB,GAAIuE,GAAMvE,GAAKD,EACdyE,EAAOD,GAAsB,IAAfxE,EAAE/J,UAAiC,IAAfgK,EAAEhK,YAChCgK,EAAEyE,aAAevE,KACjBH,EAAE0E,aAAevE,EAGtB,IAAKsE,EACJ,MAAOA,EAIR,IAAKD,EACJ,MAASA,EAAMA,EAAIG,YAClB,GAAKH,IAAQvE,EACZ,MAAO,EAKV,OAAOD,GAAI,EAAI,GAOhB,QAAS4E,IAAmB7P,GAC3B,MAAO,UAAUU,GAChB,GAAI+C,GAAO/C,EAAK8G,SAASC,aACzB,OAAgB,UAAThE,GAAoB/C,EAAKV,OAASA,GAQ3C,QAAS8P,IAAoB9P,GAC5B,MAAO,UAAUU,GAChB,GAAI+C,GAAO/C,EAAK8G,SAASC,aACzB,QAAiB,UAAThE,GAA6B,WAATA,IAAsB/C,EAAKV,OAASA,GAQlE,QAAS+P,IAAwBpR,GAChC,MAAOqQ,IAAa,SAAUgB,GAE7B,MADAA,IAAYA,EACLhB,GAAa,SAAUrB,EAAMpD,GACnC,GAAIvH,GACHiN,EAAetR,KAAQgP,EAAK9M,OAAQmP,GACpClN,EAAImN,EAAapP,MAGlB,OAAQiC,IACF6K,EAAO3K,EAAIiN,EAAanN,MAC5B6K,EAAK3K,KAAOuH,EAAQvH,GAAK2K,EAAK3K,SAWnC+G,EAAQ2D,GAAO3D,MAAQ,SAAUrJ,GAGhC,GAAIvD,GAAkBuD,IAASA,EAAKS,eAAiBT,GAAMvD,eAC3D,OAAOA,GAA+C,SAA7BA,EAAgBqK,UAAsB,GAIhEhC,EAAUkI,GAAOlI,WAOjB2E,EAAcuD,GAAOvD,YAAc,SAAU+F,GAC5C,GAAIC,GAAMD,EAAOA,EAAK/O,eAAiB+O,EAAOzF,EAC7C2F,EAASD,EAAIE,WAGd,OAAKF,KAAQlT,GAA6B,IAAjBkT,EAAIjP,UAAmBiP,EAAIhT,iBAKpDF,EAAWkT,EACXjT,EAAUiT,EAAIhT,gBAGdiN,GAAkBL,EAAOoG,GAMpBC,GAAUA,EAAO9G,aAAe8G,IAAWA,EAAO7G,KACtD6G,EAAO9G,YAAa,iBAAkB,WACrCa,MASF3E,EAAQoG,WAAaqD,GAAO,SAAUC,GAErC,MADAA,GAAIoB,UAAY,KACRpB,EAAId,aAAa,eAO1B5I,EAAQ0B,qBAAuB+H,GAAO,SAAUC,GAE/C,MADAA,GAAIqB,YAAaJ,EAAIK,cAAc,MAC3BtB,EAAIhI,qBAAqB,KAAKrG,SAIvC2E,EAAQyI,uBAAyBgB,GAAO,SAAUC,GAQjD,MAPAA,GAAIuB,UAAY,+CAIhBvB,EAAIwB,WAAWJ,UAAY,IAGuB,IAA3CpB,EAAIjB,uBAAuB,KAAKpN,SAOxC2E,EAAQmL,QAAU1B,GAAO,SAAUC,GAElC,MADAhS,GAAQqT,YAAarB,GAAMxN,GAAKqC,GACxBoM,EAAIS,oBAAsBT,EAAIS,kBAAmB7M,GAAUlD,SAI/D2E,EAAQmL,SACZ9G,EAAK9I,KAAS,GAAI,SAAUW,EAAIhD,GAC/B,SAAYA,GAAQ8C,iBAAmB2J,GAAgBf,EAAiB,CACvE,GAAIwD,GAAIlP,EAAQ8C,eAAgBE,EAGhC,OAAOkM,IAAKA,EAAEnM,YAAcmM,QAG9B/D,EAAKgH,OAAW,GAAI,SAAUnP,GAC7B,GAAIoP,GAASpP,EAAGwC,QAASgJ,GAAWC,GACpC,OAAO,UAAUzM,GAChB,MAAOA,GAAK0N,aAAa,QAAU0C,YAM9BjH,GAAK9I,KAAS,GAErB8I,EAAKgH,OAAW,GAAK,SAAUnP,GAC9B,GAAIoP,GAASpP,EAAGwC,QAASgJ,GAAWC,GACpC,OAAO,UAAUzM,GAChB,GAAIwP,SAAcxP,GAAKqQ,mBAAqB5F,GAAgBzK,EAAKqQ,iBAAiB,KAClF,OAAOb,IAAQA,EAAKxI,QAAUoJ,KAMjCjH,EAAK9I,KAAU,IAAIyE,EAAQ0B,qBAC1B,SAAU8J,EAAKtS,GACd,aAAYA,GAAQwI,uBAAyBiE,EACrCzM,EAAQwI,qBAAsB8J,GADtC,GAID,SAAUA,EAAKtS,GACd,GAAIgC,GACHkG,KACA9D,EAAI,EACJgF,EAAUpJ,EAAQwI,qBAAsB8J,EAGzC,IAAa,MAARA,EAAc,CAClB,MAAStQ,EAAOoH,EAAQhF,KACA,IAAlBpC,EAAKQ,UACT0F,EAAI9I,KAAM4C,EAIZ,OAAOkG,GAER,MAAOkB,IAIT+B,EAAK9I,KAAY,MAAIyE,EAAQyI,wBAA0B,SAAUqC,EAAW5R,GAC3E,aAAYA,GAAQuP,yBAA2B9C,GAAgBf,EACvD1L,EAAQuP,uBAAwBqC,GADxC,GAWDhG,KAOAD,MAEM7E,EAAQ0I,IAAMpB,EAAQ1L,KAAM+O,EAAI3B,qBAGrCS,GAAO,SAAUC,GAMhBA,EAAIuB,UAAY,iDAIVvB,EAAIV,iBAAiB,cAAc3N,QACxCwJ,EAAUvM,KAAM,MAAQ2N,EAAa,aAAeD,EAAW,KAM1D0D,EAAIV,iBAAiB,YAAY3N,QACtCwJ,EAAUvM,KAAK,cAIjBmR,GAAO,SAAUC,GAOhB,GAAI+B,GAAQd,EAAIjK,cAAc,QAC9B+K,GAAM5C,aAAc,OAAQ,UAC5Ba,EAAIqB,YAAaU,GAAQ5C,aAAc,IAAK,IAEvCa,EAAIV,iBAAiB,WAAW3N,QACpCwJ,EAAUvM,KAAM,SAAW2N,EAAa,gBAKnCyD,EAAIV,iBAAiB,YAAY3N,QACtCwJ,EAAUvM,KAAM,WAAY,aAI7BoR,EAAIV,iBAAiB,QACrBnE,EAAUvM,KAAK,YAIX0H,EAAQ0L,gBAAkBpE,EAAQ1L,KAAOmJ,EAAUrN,EAAQiU,uBAChEjU,EAAQkU,oBACRlU,EAAQmU,kBACRnU,EAAQoU,qBAERrC,GAAO,SAAUC,GAGhB1J,EAAQ+L,kBAAoBhH,EAAQ1I,KAAMqN,EAAK,OAI/C3E,EAAQ1I,KAAMqN,EAAK,aACnB5E,EAAcxM,KAAM,KAAM+N,KAI5BxB,EAAYA,EAAUxJ,QAAciL,OAAQzB,EAAUkE,KAAK,MAC3DjE,EAAgBA,EAAczJ,QAAciL,OAAQxB,EAAciE,KAAK,MAQvE/D,EAAWsC,EAAQ1L,KAAMlE,EAAQsN,WAActN,EAAQsU,wBACtD,SAAUvG,EAAGC,GACZ,GAAIuG,GAAuB,IAAfxG,EAAE/J,SAAiB+J,EAAE9N,gBAAkB8N,EAClDyG,EAAMxG,GAAKA,EAAEzJ,UACd,OAAOwJ,KAAMyG,MAAWA,GAAwB,IAAjBA,EAAIxQ,YAClCuQ,EAAMjH,SACLiH,EAAMjH,SAAUkH,GAChBzG,EAAEuG,yBAA8D,GAAnCvG,EAAEuG,wBAAyBE,MAG3D,SAAUzG,EAAGC,GACZ,GAAKA,EACJ,MAASA,EAAIA,EAAEzJ,WACd,GAAKyJ,IAAMD,EACV,OAAO,CAIV,QAAO,GAOTD,EAAY9N,EAAQsU,wBACpB,SAAUvG,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,MADAH,IAAe,EACR,CAGR,IAAI4G,GAAUzG,EAAEsG,yBAA2BvG,EAAEuG,yBAA2BvG,EAAEuG,wBAAyBtG,EAEnG,OAAKyG,GAEW,EAAVA,IACFnM,EAAQoM,cAAgB1G,EAAEsG,wBAAyBvG,KAAQ0G,EAGxD1G,IAAMkF,GAAO3F,EAASC,EAAcQ,GACjC,GAEHC,IAAMiF,GAAO3F,EAASC,EAAcS,GACjC,EAIDhB,EACJhM,EAAQ2D,KAAMqI,EAAWe,GAAM/M,EAAQ2D,KAAMqI,EAAWgB,GAC1D,EAGe,EAAVyG,EAAc,GAAK,EAIpB1G,EAAEuG,wBAA0B,GAAK,GAEzC,SAAUvG,EAAGC,GACZ,GAAIuE,GACH3M,EAAI,EACJ+O,EAAM5G,EAAExJ,WACRiQ,EAAMxG,EAAEzJ,WACRqQ,GAAO7G,GACP8G,GAAO7G,EAGR,IAAKD,IAAMC,EAEV,MADAH,IAAe,EACR,CAGD,KAAM8G,IAAQH,EACpB,MAAOzG,KAAMkF,EAAM,GAClBjF,IAAMiF,EAAM,EACZ0B,EAAM,GACNH,EAAM,EACNxH,EACEhM,EAAQ2D,KAAMqI,EAAWe,GAAM/M,EAAQ2D,KAAMqI,EAAWgB,GAC1D,CAGK,IAAK2G,IAAQH,EACnB,MAAOlC,IAAcvE,EAAGC,EAIzBuE,GAAMxE,CACN,OAASwE,EAAMA,EAAIhO,WAClBqQ,EAAGE,QAASvC,EAEbA,GAAMvE,CACN,OAASuE,EAAMA,EAAIhO,WAClBsQ,EAAGC,QAASvC,EAIb,OAAQqC,EAAGhP,KAAOiP,EAAGjP,GACpBA,GAGD,OAAOA,GAEN0M,GAAcsC,EAAGhP,GAAIiP,EAAGjP,IAGxBgP,EAAGhP,KAAO2H,EAAe,GACzBsH,EAAGjP,KAAO2H,EAAe,EACzB,GAGK0F,GA1UClT,GA6UTyQ,GAAOnD,QAAU,SAAU0H,EAAMC,GAChC,MAAOxE,IAAQuE,EAAM,KAAM,KAAMC,IAGlCxE,GAAOwD,gBAAkB,SAAUxQ,EAAMuR,GASxC,IAPOvR,EAAKS,eAAiBT,KAAWzD,GACvCkN,EAAazJ,GAIduR,EAAOA,EAAK/N,QAASgI,EAAkB,aAElC1G,EAAQ0L,kBAAmB9G,GAC5BE,GAAkBA,EAAclJ,KAAM6Q,IACtC5H,GAAkBA,EAAUjJ,KAAM6Q,IAErC,IACC,GAAI/P,GAAMqI,EAAQ1I,KAAMnB,EAAMuR,EAG9B,IAAK/P,GAAOsD,EAAQ+L,mBAGlB7Q,EAAKzD,UAAuC,KAA3ByD,EAAKzD,SAASiE,SAChC,MAAOgB,GAEP,MAAMqD,IAGT,MAAOmI,IAAQuE,EAAMhV,EAAU,MAAOyD,IAAQG,OAAS,GAGxD6M,GAAOlD,SAAW,SAAU9L,EAASgC,GAKpC,OAHOhC,EAAQyC,eAAiBzC,KAAczB,GAC7CkN,EAAazL,GAEP8L,EAAU9L,EAASgC,IAG3BgN,GAAOnM,KAAO,SAAUb,EAAM+C,IAEtB/C,EAAKS,eAAiBT,KAAWzD,GACvCkN,EAAazJ,EAGd,IAAI/B,GAAKkL,EAAK0F,WAAY9L,EAAKgE,eAE9B0K,EAAMxT,GAAM0M,EAAOxJ,KAAMgI,EAAK0F,WAAY9L,EAAKgE,eAC9C9I,EAAI+B,EAAM+C,GAAO2G,GACjBxN,CAEF,OAAOuV,KAAQvV,EACd4I,EAAQoG,aAAexB,EACtB1J,EAAK0N,aAAc3K,IAClB0O,EAAMzR,EAAKqQ,iBAAiBtN,KAAU0O,EAAIC,UAC1CD,EAAIzK,MACJ,KACFyK,GAGFzE,GAAO/H,MAAQ,SAAUC,GACxB,KAAUC,OAAO,0CAA4CD,IAO9D8H,GAAO2E,WAAa,SAAUvK,GAC7B,GAAIpH,GACH4R,KACAtP,EAAI,EACJF,EAAI,CAOL,IAJAiI,GAAgBvF,EAAQ+M,iBACxBrI,GAAa1E,EAAQgN,YAAc1K,EAAQ9J,MAAO,GAClD8J,EAAQ3E,KAAM6H,GAETD,EAAe,CACnB,MAASrK,EAAOoH,EAAQhF,KAClBpC,IAASoH,EAAShF,KACtBE,EAAIsP,EAAWxU,KAAMgF,GAGvB,OAAQE,IACP8E,EAAQ1E,OAAQkP,EAAYtP,GAAK,GAInC,MAAO8E,IAORgC,EAAU4D,GAAO5D,QAAU,SAAUpJ,GACpC,GAAIwP,GACHhO,EAAM,GACNY,EAAI,EACJ5B,EAAWR,EAAKQ,QAEjB,IAAMA,GAMC,GAAkB,IAAbA,GAA+B,IAAbA,GAA+B,KAAbA,EAAkB,CAGjE,GAAiC,gBAArBR,GAAK+R,YAChB,MAAO/R,GAAK+R,WAGZ,KAAM/R,EAAOA,EAAKgQ,WAAYhQ,EAAMA,EAAOA,EAAKkP,YAC/C1N,GAAO4H,EAASpJ,OAGZ,IAAkB,IAAbQ,GAA+B,IAAbA,EAC7B,MAAOR,GAAKgS,cAhBZ,MAASxC,EAAOxP,EAAKoC,GAAKA,IAEzBZ,GAAO4H,EAASoG,EAkBlB,OAAOhO,IAGR2H,EAAO6D,GAAOiF,WAGb7D,YAAa,GAEb8D,aAAc5D,GAEdvO,MAAO4L,EAEPkD,cAEAxO,QAEA8R,UACCC,KAAOC,IAAK,aAAcpQ,OAAO,GACjCqQ,KAAOD,IAAK,cACZE,KAAOF,IAAK,kBAAmBpQ,OAAO,GACtCuQ,KAAOH,IAAK,oBAGbI,WACC1G,KAAQ,SAAUhM,GAUjB,MATAA,GAAM,GAAKA,EAAM,GAAGyD,QAASgJ,GAAWC,IAGxC1M,EAAM,IAAOA,EAAM,IAAMA,EAAM,IAAM,IAAKyD,QAASgJ,GAAWC,IAE5C,OAAb1M,EAAM,KACVA,EAAM,GAAK,IAAMA,EAAM,GAAK,KAGtBA,EAAMzC,MAAO,EAAG,IAGxB2O,MAAS,SAAUlM,GA6BlB,MAlBAA,GAAM,GAAKA,EAAM,GAAGgH,cAEY,QAA3BhH,EAAM,GAAGzC,MAAO,EAAG,IAEjByC,EAAM,IACXiN,GAAO/H,MAAOlF,EAAM,IAKrBA,EAAM,KAAQA,EAAM,GAAKA,EAAM,IAAMA,EAAM,IAAM,GAAK,GAAmB,SAAbA,EAAM,IAA8B,QAAbA,EAAM,KACzFA,EAAM,KAAUA,EAAM,GAAKA,EAAM,IAAqB,QAAbA,EAAM,KAGpCA,EAAM,IACjBiN,GAAO/H,MAAOlF,EAAM,IAGdA,GAGRiM,OAAU,SAAUjM,GACnB,GAAI2S,GACHC,GAAY5S,EAAM,IAAMA,EAAM,EAE/B,OAAK4L,GAAiB,MAAEjL,KAAMX,EAAM,IAC5B,MAIHA,EAAM,IAAMA,EAAM,KAAO7D,EAC7B6D,EAAM,GAAKA,EAAM,GAGN4S,GAAYlH,EAAQ/K,KAAMiS,KAEpCD,EAASjF,GAAUkF,GAAU,MAE7BD,EAASC,EAASnV,QAAS,IAAKmV,EAASxS,OAASuS,GAAWC,EAASxS,UAGvEJ,EAAM,GAAKA,EAAM,GAAGzC,MAAO,EAAGoV,GAC9B3S,EAAM,GAAK4S,EAASrV,MAAO,EAAGoV,IAIxB3S,EAAMzC,MAAO,EAAG,MAIzB6S,QAECrE,IAAO,SAAU8G,GAChB,GAAI9L,GAAW8L,EAAiBpP,QAASgJ,GAAWC,IAAY1F,aAChE,OAA4B,MAArB6L,EACN,WAAa,OAAO,GACpB,SAAU5S,GACT,MAAOA,GAAK8G,UAAY9G,EAAK8G,SAASC,gBAAkBD,IAI3D+E,MAAS,SAAU+D,GAClB,GAAIiD,GAAU5I,EAAY2F,EAAY,IAEtC,OAAOiD,KACLA,EAAczH,OAAQ,MAAQL,EAAa,IAAM6E,EAAY,IAAM7E,EAAa,SACjFd,EAAY2F,EAAW,SAAU5P,GAChC,MAAO6S,GAAQnS,KAAgC,gBAAnBV,GAAK4P,WAA0B5P,EAAK4P,iBAAoB5P,GAAK0N,eAAiBjD,GAAgBzK,EAAK0N,aAAa,UAAY,OAI3J3B,KAAQ,SAAUhJ,EAAM+P,EAAUC,GACjC,MAAO,UAAU/S,GAChB,GAAIgT,GAAShG,GAAOnM,KAAMb,EAAM+C,EAEhC,OAAe,OAAViQ,EACgB,OAAbF,EAEFA,GAINE,GAAU,GAEU,MAAbF,EAAmBE,IAAWD,EACvB,OAAbD,EAAoBE,IAAWD,EAClB,OAAbD,EAAoBC,GAAqC,IAA5BC,EAAOxV,QAASuV,GAChC,OAAbD,EAAoBC,GAASC,EAAOxV,QAASuV,GAAU,GAC1C,OAAbD,EAAoBC,GAASC,EAAO1V,OAAQyV,EAAM5S,UAAa4S,EAClD,OAAbD,GAAsB,IAAME,EAAS,KAAMxV,QAASuV,GAAU,GACjD,OAAbD,EAAoBE,IAAWD,GAASC,EAAO1V,MAAO,EAAGyV,EAAM5S,OAAS,KAAQ4S,EAAQ,KACxF,IAZO,IAgBV9G,MAAS,SAAU3M,EAAM2T,EAAM3D,EAAUrN,EAAOE,GAC/C,GAAI+Q,GAAgC,QAAvB5T,EAAKhC,MAAO,EAAG,GAC3B6V,EAA+B,SAArB7T,EAAKhC,MAAO,IACtB8V,EAAkB,YAATH,CAEV,OAAiB,KAAVhR,GAAwB,IAATE,EAGrB,SAAUnC,GACT,QAASA,EAAKe,YAGf,SAAUf,EAAMhC,EAASiI,GACxB,GAAIkI,GAAOkF,EAAY7D,EAAMR,EAAMsE,EAAWC,EAC7ClB,EAAMa,IAAWC,EAAU,cAAgB,kBAC3CzD,EAAS1P,EAAKe,WACdgC,EAAOqQ,GAAUpT,EAAK8G,SAASC,cAC/ByM,GAAYvN,IAAQmN,CAErB,IAAK1D,EAAS,CAGb,GAAKwD,EAAS,CACb,MAAQb,EAAM,CACb7C,EAAOxP,CACP,OAASwP,EAAOA,EAAM6C,GACrB,GAAKe,EAAS5D,EAAK1I,SAASC,gBAAkBhE,EAAyB,IAAlByM,EAAKhP,SACzD,OAAO,CAIT+S,GAAQlB,EAAe,SAAT/S,IAAoBiU,GAAS,cAE5C,OAAO,EAMR,GAHAA,GAAUJ,EAAUzD,EAAOM,WAAaN,EAAO+D,WAG1CN,GAAWK,EAAW,CAE1BH,EAAa3D,EAAQrM,KAAcqM,EAAQrM,OAC3C8K,EAAQkF,EAAY/T,OACpBgU,EAAYnF,EAAM,KAAOnE,GAAWmE,EAAM,GAC1Ca,EAAOb,EAAM,KAAOnE,GAAWmE,EAAM,GACrCqB,EAAO8D,GAAa5D,EAAO/J,WAAY2N,EAEvC,OAAS9D,IAAS8D,GAAa9D,GAAQA,EAAM6C,KAG3CrD,EAAOsE,EAAY,IAAMC,EAAM3I,MAGhC,GAAuB,IAAlB4E,EAAKhP,YAAoBwO,GAAQQ,IAASxP,EAAO,CACrDqT,EAAY/T,IAAW0K,EAASsJ,EAAWtE,EAC3C,YAKI,IAAKwE,IAAarF,GAASnO,EAAMqD,KAAcrD,EAAMqD,QAAkB/D,KAAW6O,EAAM,KAAOnE,EACrGgF,EAAOb,EAAM,OAKb,OAASqB,IAAS8D,GAAa9D,GAAQA,EAAM6C,KAC3CrD,EAAOsE,EAAY,IAAMC,EAAM3I,MAEhC,IAAOwI,EAAS5D,EAAK1I,SAASC,gBAAkBhE,EAAyB,IAAlByM,EAAKhP,aAAsBwO,IAE5EwE,KACHhE,EAAMnM,KAAcmM,EAAMnM,QAAkB/D,IAAW0K,EAASgF,IAG7DQ,IAASxP,GACb,KAQJ,OADAgP,IAAQ7M,EACD6M,IAAS/M,GAA4B,IAAjB+M,EAAO/M,GAAe+M,EAAO/M,GAAS,KAKrE+J,OAAU,SAAU0H,EAAQpE,GAK3B,GAAI1N,GACH3D,EAAKkL,EAAKgC,QAASuI,IAAYvK,EAAKwK,WAAYD,EAAO3M,gBACtDiG,GAAO/H,MAAO,uBAAyByO,EAKzC,OAAKzV,GAAIoF,GACDpF,EAAIqR,GAIPrR,EAAGkC,OAAS,GAChByB,GAAS8R,EAAQA,EAAQ,GAAIpE,GACtBnG,EAAKwK,WAAW/V,eAAgB8V,EAAO3M,eAC7CuH,GAAa,SAAUrB,EAAMpD,GAC5B,GAAI+J,GACHC,EAAU5V,EAAIgP,EAAMqC,GACpBlN,EAAIyR,EAAQ1T,MACb,OAAQiC,IACPwR,EAAMpW,EAAQ2D,KAAM8L,EAAM4G,EAAQzR,IAClC6K,EAAM2G,KAAW/J,EAAS+J,GAAQC,EAAQzR,MAG5C,SAAUpC,GACT,MAAO/B,GAAI+B,EAAM,EAAG4B,KAIhB3D,IAITkN,SAEC2I,IAAOxF,GAAa,SAAUvQ,GAI7B,GAAIwS,MACHnJ,KACA2M,EAAUzK,EAASvL,EAASyF,QAASlF,EAAO,MAE7C,OAAOyV,GAAS1Q,GACfiL,GAAa,SAAUrB,EAAMpD,EAAS7L,EAASiI,GAC9C,GAAIjG,GACHgU,EAAYD,EAAS9G,EAAM,KAAMhH,MACjC7D,EAAI6K,EAAK9M,MAGV,OAAQiC,KACDpC,EAAOgU,EAAU5R,MACtB6K,EAAK7K,KAAOyH,EAAQzH,GAAKpC,MAI5B,SAAUA,EAAMhC,EAASiI,GAGxB,MAFAsK,GAAM,GAAKvQ,EACX+T,EAASxD,EAAO,KAAMtK,EAAKmB,IACnBA,EAAQwD,SAInBqJ,IAAO3F,GAAa,SAAUvQ,GAC7B,MAAO,UAAUiC,GAChB,MAAOgN,IAAQjP,EAAUiC,GAAOG,OAAS,KAI3C2J,SAAYwE,GAAa,SAAUpH,GAClC,MAAO,UAAUlH,GAChB,OAASA,EAAK+R,aAAe/R,EAAKkU,WAAa9K,EAASpJ,IAASxC,QAAS0J,GAAS,MAWrFiN,KAAQ7F,GAAc,SAAU6F,GAM/B,MAJMzI,GAAYhL,KAAKyT,GAAQ,KAC9BnH,GAAO/H,MAAO,qBAAuBkP,GAEtCA,EAAOA,EAAK3Q,QAASgJ,GAAWC,IAAY1F,cACrC,SAAU/G,GAChB,GAAIoU,EACJ,GACC,IAAMA,EAAW1K,EAChB1J,EAAKmU,KACLnU,EAAK0N,aAAa,aAAe1N,EAAK0N,aAAa,QAGnD,MADA0G,GAAWA,EAASrN,cACbqN,IAAaD,GAA2C,IAAnCC,EAAS5W,QAAS2W,EAAO,YAE5CnU,EAAOA,EAAKe,aAAiC,IAAlBf,EAAKQ,SAC3C,QAAO,KAKT0C,OAAU,SAAUlD,GACnB,GAAIqU,GAAOpY,EAAOK,UAAYL,EAAOK,SAAS+X,IAC9C,OAAOA,IAAQA,EAAK/W,MAAO,KAAQ0C,EAAKgB,IAGzCsT,KAAQ,SAAUtU,GACjB,MAAOA,KAASxD,GAGjB+X,MAAS,SAAUvU,GAClB,MAAOA,KAASzD,EAASiY,iBAAmBjY,EAASkY,UAAYlY,EAASkY,gBAAkBzU,EAAKV,MAAQU,EAAK0U,OAAS1U,EAAK2U,WAI7HC,QAAW,SAAU5U,GACpB,MAAOA,GAAK6U,YAAa,GAG1BA,SAAY,SAAU7U,GACrB,MAAOA,GAAK6U,YAAa,GAG1BC,QAAW,SAAU9U,GAGpB,GAAI8G,GAAW9G,EAAK8G,SAASC,aAC7B,OAAqB,UAAbD,KAA0B9G,EAAK8U,SAA0B,WAAbhO,KAA2B9G,EAAK+U,UAGrFA,SAAY,SAAU/U,GAOrB,MAJKA,GAAKe,YACTf,EAAKe,WAAWiU,cAGVhV,EAAK+U,YAAa,GAI1BE,MAAS,SAAUjV,GAMlB,IAAMA,EAAOA,EAAKgQ,WAAYhQ,EAAMA,EAAOA,EAAKkP,YAC/C,GAAKlP,EAAK8G,SAAW,KAAyB,IAAlB9G,EAAKQ,UAAoC,IAAlBR,EAAKQ,SACvD,OAAO,CAGT,QAAO,GAGRkP,OAAU,SAAU1P,GACnB,OAAQmJ,EAAKgC,QAAe,MAAGnL,IAIhCkV,OAAU,SAAUlV,GACnB,MAAOsM,IAAQ5L,KAAMV,EAAK8G,WAG3ByJ,MAAS,SAAUvQ,GAClB,MAAOqM,IAAQ3L,KAAMV,EAAK8G,WAG3BqO,OAAU,SAAUnV,GACnB,GAAI+C,GAAO/C,EAAK8G,SAASC,aACzB,OAAgB,UAAThE,GAAkC,WAAd/C,EAAKV,MAA8B,WAATyD,GAGtDmE,KAAQ,SAAUlH,GACjB,GAAIa,EAGJ,OAAuC,UAAhCb,EAAK8G,SAASC,eACN,SAAd/G,EAAKV,OACmC,OAArCuB,EAAOb,EAAK0N,aAAa,UAAoB7M,EAAKkG,gBAAkB/G,EAAKV,OAI9E2C,MAASoN,GAAuB,WAC/B,OAAS,KAGVlN,KAAQkN,GAAuB,SAAUE,EAAcpP,GACtD,OAASA,EAAS,KAGnB+B,GAAMmN,GAAuB,SAAUE,EAAcpP,EAAQmP,GAC5D,OAAoB,EAAXA,EAAeA,EAAWnP,EAASmP,KAG7C8F,KAAQ/F,GAAuB,SAAUE,EAAcpP,GACtD,GAAIiC,GAAI,CACR,MAAYjC,EAAJiC,EAAYA,GAAK,EACxBmN,EAAanS,KAAMgF,EAEpB,OAAOmN,KAGR8F,IAAOhG,GAAuB,SAAUE,EAAcpP,GACrD,GAAIiC,GAAI,CACR,MAAYjC,EAAJiC,EAAYA,GAAK,EACxBmN,EAAanS,KAAMgF,EAEpB,OAAOmN,KAGR+F,GAAMjG,GAAuB,SAAUE,EAAcpP,EAAQmP,GAC5D,GAAIlN,GAAe,EAAXkN,EAAeA,EAAWnP,EAASmP,CAC3C,QAAUlN,GAAK,GACdmN,EAAanS,KAAMgF,EAEpB,OAAOmN,KAGRgG,GAAMlG,GAAuB,SAAUE,EAAcpP,EAAQmP,GAC5D,GAAIlN,GAAe,EAAXkN,EAAeA,EAAWnP,EAASmP,CAC3C,MAAcnP,IAAJiC,GACTmN,EAAanS,KAAMgF,EAEpB,OAAOmN,OAKVpG,EAAKgC,QAAa,IAAIhC,EAAKgC,QAAY,EAGvC,KAAM/I,KAAOoT,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5EzM,EAAKgC,QAAS/I,GAAM+M,GAAmB/M,EAExC,KAAMA,KAAOyT,QAAQ,EAAMC,OAAO,GACjC3M,EAAKgC,QAAS/I,GAAMgN,GAAoBhN,EAIzC,SAASuR,OACTA,GAAW/T,UAAYuJ,EAAK4M,QAAU5M,EAAKgC,QAC3ChC,EAAKwK,WAAa,GAAIA,GAEtB,SAASlG,IAAU1P,EAAUiY,GAC5B,GAAInC,GAAS9T,EAAOkW,EAAQ3W,EAC3B4W,EAAO/I,EAAQgJ,EACfC,EAASjM,EAAYpM,EAAW,IAEjC,IAAKqY,EACJ,MAAOJ,GAAY,EAAII,EAAO9Y,MAAO,EAGtC4Y,GAAQnY,EACRoP,KACAgJ,EAAahN,EAAKsJ,SAElB,OAAQyD,EAAQ,GAGTrC,IAAY9T,EAAQsL,EAAOjL,KAAM8V,OACjCnW,IAEJmW,EAAQA,EAAM5Y,MAAOyC,EAAM,GAAGI,SAAY+V,GAE3C/I,EAAO/P,KAAM6Y,OAGdpC,GAAU,GAGJ9T,EAAQuL,EAAalL,KAAM8V,MAChCrC,EAAU9T,EAAMsO,QAChB4H,EAAO7Y,MACN4J,MAAO6M,EAEPvU,KAAMS,EAAM,GAAGyD,QAASlF,EAAO,OAEhC4X,EAAQA,EAAM5Y,MAAOuW,EAAQ1T,QAI9B,KAAMb,IAAQ6J,GAAKgH,SACZpQ,EAAQ4L,EAAWrM,GAAOc,KAAM8V,KAAcC,EAAY7W,MAC9DS,EAAQoW,EAAY7W,GAAQS,MAC7B8T,EAAU9T,EAAMsO,QAChB4H,EAAO7Y,MACN4J,MAAO6M,EACPvU,KAAMA,EACNuK,QAAS9J,IAEVmW,EAAQA,EAAM5Y,MAAOuW,EAAQ1T,QAI/B,KAAM0T,EACL,MAOF,MAAOmC,GACNE,EAAM/V,OACN+V,EACClJ,GAAO/H,MAAOlH,GAEdoM,EAAYpM,EAAUoP,GAAS7P,MAAO,GAGzC,QAASsQ,IAAYqI,GACpB,GAAI7T,GAAI,EACPC,EAAM4T,EAAO9V,OACbpC,EAAW,EACZ,MAAYsE,EAAJD,EAASA,IAChBrE,GAAYkY,EAAO7T,GAAG4E,KAEvB,OAAOjJ,GAGR,QAASsY,IAAetC,EAASuC,EAAYC,GAC5C,GAAIlE,GAAMiE,EAAWjE,IACpBmE,EAAmBD,GAAgB,eAARlE,EAC3BoE,EAAW3U,GAEZ,OAAOwU,GAAWrU,MAEjB,SAAUjC,EAAMhC,EAASiI,GACxB,MAASjG,EAAOA,EAAMqS,GACrB,GAAuB,IAAlBrS,EAAKQ,UAAkBgW,EAC3B,MAAOzC,GAAS/T,EAAMhC,EAASiI,IAMlC,SAAUjG,EAAMhC,EAASiI,GACxB,GAAIb,GAAM+I,EAAOkF,EAChBqD,EAAS1M,EAAU,IAAMyM,CAG1B,IAAKxQ,GACJ,MAASjG,EAAOA,EAAMqS,GACrB,IAAuB,IAAlBrS,EAAKQ,UAAkBgW,IACtBzC,EAAS/T,EAAMhC,EAASiI,GAC5B,OAAO,MAKV,OAASjG,EAAOA,EAAMqS,GACrB,GAAuB,IAAlBrS,EAAKQ,UAAkBgW,EAE3B,GADAnD,EAAarT,EAAMqD,KAAcrD,EAAMqD,QACjC8K,EAAQkF,EAAYhB,KAAUlE,EAAM,KAAOuI,GAChD,IAAMtR,EAAO+I,EAAM,OAAQ,GAAQ/I,IAAS8D,EAC3C,MAAO9D,MAAS,MAKjB,IAFA+I,EAAQkF,EAAYhB,IAAUqE,GAC9BvI,EAAM,GAAK4F,EAAS/T,EAAMhC,EAASiI,IAASiD,EACvCiF,EAAM,MAAO,EACjB,OAAO,GASf,QAASwI,IAAgBC,GACxB,MAAOA,GAASzW,OAAS,EACxB,SAAUH,EAAMhC,EAASiI,GACxB,GAAI7D,GAAIwU,EAASzW,MACjB,OAAQiC,IACP,IAAMwU,EAASxU,GAAIpC,EAAMhC,EAASiI,GACjC,OAAO,CAGT,QAAO,GAER2Q,EAAS,GAGX,QAASC,IAAU7C,EAAWzR,EAAK4N,EAAQnS,EAASiI,GACnD,GAAIjG,GACH8W,KACA1U,EAAI,EACJC,EAAM2R,EAAU7T,OAChB4W,EAAgB,MAAPxU,CAEV,MAAYF,EAAJD,EAASA,KACVpC,EAAOgU,EAAU5R,OAChB+N,GAAUA,EAAQnQ,EAAMhC,EAASiI,MACtC6Q,EAAa1Z,KAAM4C,GACd+W,GACJxU,EAAInF,KAAMgF,GAMd,OAAO0U,GAGR,QAASE,IAAYvE,EAAW1U,EAAUgW,EAASkD,EAAYC,EAAYC,GAO1E,MANKF,KAAeA,EAAY5T,KAC/B4T,EAAaD,GAAYC,IAErBC,IAAeA,EAAY7T,KAC/B6T,EAAaF,GAAYE,EAAYC,IAE/B7I,GAAa,SAAUrB,EAAM7F,EAASpJ,EAASiI,GACrD,GAAImR,GAAMhV,EAAGpC,EACZqX,KACAC,KACAC,EAAcnQ,EAAQjH,OAGtBoB,EAAQ0L,GAAQuK,GAAkBzZ,GAAY,IAAKC,EAAQwC,UAAaxC,GAAYA,MAGpFyZ,GAAYhF,IAAexF,GAASlP,EAEnCwD,EADAsV,GAAUtV,EAAO8V,EAAQ5E,EAAWzU,EAASiI,GAG9CyR,EAAa3D,EAEZmD,IAAgBjK,EAAOwF,EAAY8E,GAAeN,MAMjD7P,EACDqQ,CAQF,IALK1D,GACJA,EAAS0D,EAAWC,EAAY1Z,EAASiI,GAIrCgR,EAAa,CACjBG,EAAOP,GAAUa,EAAYJ,GAC7BL,EAAYG,KAAUpZ,EAASiI,GAG/B7D,EAAIgV,EAAKjX,MACT,OAAQiC,KACDpC,EAAOoX,EAAKhV,MACjBsV,EAAYJ,EAAQlV,MAASqV,EAAWH,EAAQlV,IAAOpC,IAK1D,GAAKiN,GACJ,GAAKiK,GAAczE,EAAY,CAC9B,GAAKyE,EAAa,CAEjBE,KACAhV,EAAIsV,EAAWvX,MACf,OAAQiC,KACDpC,EAAO0X,EAAWtV,KAEvBgV,EAAKha,KAAOqa,EAAUrV,GAAKpC,EAG7BkX,GAAY,KAAOQ,KAAkBN,EAAMnR,GAI5C7D,EAAIsV,EAAWvX,MACf,OAAQiC,KACDpC,EAAO0X,EAAWtV,MACtBgV,EAAOF,EAAa1Z,EAAQ2D,KAAM8L,EAAMjN,GAASqX,EAAOjV,IAAM,KAE/D6K,EAAKmK,KAAUhQ,EAAQgQ,GAAQpX,SAOlC0X,GAAab,GACZa,IAAetQ,EACdsQ,EAAWhV,OAAQ6U,EAAaG,EAAWvX,QAC3CuX,GAEGR,EACJA,EAAY,KAAM9P,EAASsQ,EAAYzR,GAEvC7I,EAAK2E,MAAOqF,EAASsQ,KAMzB,QAASC,IAAmB1B,GAC3B,GAAI2B,GAAc7D,EAASzR,EAC1BD,EAAM4T,EAAO9V,OACb0X,EAAkB1O,EAAKgJ,SAAU8D,EAAO,GAAG3W,MAC3CwY,EAAmBD,GAAmB1O,EAAKgJ,SAAS,KACpD/P,EAAIyV,EAAkB,EAAI,EAG1BE,EAAe1B,GAAe,SAAUrW,GACvC,MAAOA,KAAS4X,GACdE,GAAkB,GACrBE,EAAkB3B,GAAe,SAAUrW,GAC1C,MAAOxC,GAAQ2D,KAAMyW,EAAc5X,GAAS,IAC1C8X,GAAkB,GACrBlB,GAAa,SAAU5W,EAAMhC,EAASiI,GACrC,OAAU4R,IAAqB5R,GAAOjI,IAAYuL,MAChDqO,EAAe5Z,GAASwC,SACxBuX,EAAc/X,EAAMhC,EAASiI,GAC7B+R,EAAiBhY,EAAMhC,EAASiI,KAGpC,MAAY5D,EAAJD,EAASA,IAChB,GAAM2R,EAAU5K,EAAKgJ,SAAU8D,EAAO7T,GAAG9C,MACxCsX,GAAaP,GAAcM,GAAgBC,GAAY7C,QACjD,CAIN,GAHAA,EAAU5K,EAAKgH,OAAQ8F,EAAO7T,GAAG9C,MAAOyC,MAAO,KAAMkU,EAAO7T,GAAGyH,SAG1DkK,EAAS1Q,GAAY,CAGzB,IADAf,IAAMF,EACMC,EAAJC,EAASA,IAChB,GAAK6G,EAAKgJ,SAAU8D,EAAO3T,GAAGhD,MAC7B,KAGF,OAAO0X,IACN5U,EAAI,GAAKuU,GAAgBC,GACzBxU,EAAI,GAAKwL,GAERqI,EAAO3Y,MAAO,EAAG8E,EAAI,GAAIlF,QAAS8J,MAAgC,MAAzBiP,EAAQ7T,EAAI,GAAI9C,KAAe,IAAM,MAC7EkE,QAASlF,EAAO,MAClByV,EACIzR,EAAJF,GAASuV,GAAmB1B,EAAO3Y,MAAO8E,EAAGE,IACzCD,EAAJC,GAAWqV,GAAoB1B,EAASA,EAAO3Y,MAAOgF,IAClDD,EAAJC,GAAWsL,GAAYqI,IAGzBW,EAASxZ,KAAM2W,GAIjB,MAAO4C,IAAgBC,GAGxB,QAASqB,IAA0BC,EAAiBC,GAEnD,GAAIC,GAAoB,EACvBC,EAAQF,EAAYhY,OAAS,EAC7BmY,EAAYJ,EAAgB/X,OAAS,EACrCoY,EAAe,SAAUtL,EAAMjP,EAASiI,EAAKmB,EAASoR,GACrD,GAAIxY,GAAMsC,EAAGyR,EACZ0E,KACAC,EAAe,EACftW,EAAI,IACJ4R,EAAY/G,MACZ0L,EAA6B,MAAjBH,EACZI,EAAgBrP,EAEhBhI,EAAQ0L,GAAQqL,GAAanP,EAAK9I,KAAU,IAAG,IAAKmY,GAAiBxa,EAAQ+C,YAAc/C,GAE3F6a,EAAiB7O,GAA4B,MAAjB4O,EAAwB,EAAItV,KAAKC,UAAY,EAS1E,KAPKoV,IACJpP,EAAmBvL,IAAYzB,GAAYyB,EAC3CkL,EAAakP,GAKe,OAApBpY,EAAOuB,EAAMa,IAAaA,IAAM,CACxC,GAAKkW,GAAatY,EAAO,CACxBsC,EAAI,CACJ,OAASyR,EAAUmE,EAAgB5V,KAClC,GAAKyR,EAAS/T,EAAMhC,EAASiI,GAAQ,CACpCmB,EAAQhK,KAAM4C,EACd,OAGG2Y,IACJ3O,EAAU6O,EACV3P,IAAekP,GAKZC,KAEErY,GAAQ+T,GAAW/T,IACxB0Y,IAIIzL,GACJ+G,EAAU5W,KAAM4C,IAOnB,GADA0Y,GAAgBtW,EACXiW,GAASjW,IAAMsW,EAAe,CAClCpW,EAAI,CACJ,OAASyR,EAAUoE,EAAY7V,KAC9ByR,EAASC,EAAWyE,EAAYza,EAASiI,EAG1C,IAAKgH,EAAO,CAEX,GAAKyL,EAAe,EACnB,MAAQtW,IACA4R,EAAU5R,IAAMqW,EAAWrW,KACjCqW,EAAWrW,GAAKwI,EAAIzJ,KAAMiG,GAM7BqR,GAAa5B,GAAU4B,GAIxBrb,EAAK2E,MAAOqF,EAASqR,GAGhBE,IAAc1L,GAAQwL,EAAWtY,OAAS,GAC5CuY,EAAeP,EAAYhY,OAAW,GAExC6M,GAAO2E,WAAYvK,GAUrB,MALKuR,KACJ3O,EAAU6O,EACVtP,EAAmBqP,GAGb5E,EAGT,OAAOqE,GACN/J,GAAciK,GACdA,EAGFjP,EAAU0D,GAAO1D,QAAU,SAAUvL,EAAU+a,GAC9C,GAAI1W,GACH+V,KACAD,KACA9B,EAAShM,EAAerM,EAAW,IAEpC,KAAMqY,EAAS,CAER0C,IACLA,EAAQrL,GAAU1P,IAEnBqE,EAAI0W,EAAM3Y,MACV,OAAQiC,IACPgU,EAASuB,GAAmBmB,EAAM1W,IAC7BgU,EAAQ/S,GACZ8U,EAAY/a,KAAMgZ,GAElB8B,EAAgB9a,KAAMgZ,EAKxBA,GAAShM,EAAerM,EAAUka,GAA0BC,EAAiBC,IAE9E,MAAO/B,GAGR,SAASoB,IAAkBzZ,EAAUgb,EAAU3R,GAC9C,GAAIhF,GAAI,EACPC,EAAM0W,EAAS5Y,MAChB,MAAYkC,EAAJD,EAASA,IAChB4K,GAAQjP,EAAUgb,EAAS3W,GAAIgF,EAEhC,OAAOA,GAGR,QAAS6G,IAAQlQ,EAAUC,EAASoJ,EAAS6F,GAC5C,GAAI7K,GAAG6T,EAAQ+C,EAAO1Z,EAAMe,EAC3BN,EAAQ0N,GAAU1P,EAEnB,KAAMkP,GAEiB,IAAjBlN,EAAMI,OAAe,CAIzB,GADA8V,EAASlW,EAAM,GAAKA,EAAM,GAAGzC,MAAO,GAC/B2Y,EAAO9V,OAAS,GAAkC,QAA5B6Y,EAAQ/C,EAAO,IAAI3W,MAC5CwF,EAAQmL,SAAgC,IAArBjS,EAAQwC,UAAkBkJ,GAC7CP,EAAKgJ,SAAU8D,EAAO,GAAG3W,MAAS,CAGnC,GADAtB,GAAYmL,EAAK9I,KAAS,GAAG2Y,EAAMnP,QAAQ,GAAGrG,QAAQgJ,GAAWC,IAAYzO,QAAkB,IACzFA,EACL,MAAOoJ,EAERrJ,GAAWA,EAAST,MAAO2Y,EAAO5H,QAAQrH,MAAM7G,QAIjDiC,EAAIuJ,EAAwB,aAAEjL,KAAM3C,GAAa,EAAIkY,EAAO9V,MAC5D,OAAQiC,IAAM,CAIb,GAHA4W,EAAQ/C,EAAO7T,GAGV+G,EAAKgJ,SAAW7S,EAAO0Z,EAAM1Z,MACjC,KAED,KAAMe,EAAO8I,EAAK9I,KAAMf,MAEjB2N,EAAO5M,EACZ2Y,EAAMnP,QAAQ,GAAGrG,QAASgJ,GAAWC,IACrClB,EAAS7K,KAAMuV,EAAO,GAAG3W,OAAUtB,EAAQ+C,YAAc/C,IACrD,CAKJ,GAFAiY,EAAOvT,OAAQN,EAAG,GAClBrE,EAAWkP,EAAK9M,QAAUyN,GAAYqI,IAChClY,EAEL,MADAX,GAAK2E,MAAOqF,EAAS6F,GACd7F,CAGR,SAgBL,MAPAkC,GAASvL,EAAUgC,GAClBkN,EACAjP,GACC0L,EACDtC,EACAmE,EAAS7K,KAAM3C,IAETqJ,EAMRtC,EAAQgN,WAAazO,EAAQ4F,MAAM,IAAIxG,KAAM6H,GAAYuD,KAAK,MAAQxK,EAItEyB,EAAQ+M,iBAAmBxH,EAG3BZ,IAIA3E,EAAQoM,aAAe3C,GAAO,SAAU0K,GAEvC,MAAuE,GAAhEA,EAAKnI,wBAAyBvU,EAASiJ,cAAc,UAMvD+I,GAAO,SAAUC,GAEtB,MADAA,GAAIuB,UAAY,mBAC+B,MAAxCvB,EAAIwB,WAAWtC,aAAa,WAEnCgB,GAAW,yBAA0B,SAAU1O,EAAM+C,EAAMsG,GAC1D,MAAMA,GAAN,EACQrJ,EAAK0N,aAAc3K,EAA6B,SAAvBA,EAAKgE,cAA2B,EAAI,KAOjEjC,EAAQoG,YAAeqD,GAAO,SAAUC,GAG7C,MAFAA,GAAIuB,UAAY,WAChBvB,EAAIwB,WAAWrC,aAAc,QAAS,IACY,KAA3Ca,EAAIwB,WAAWtC,aAAc,YAEpCgB,GAAW,QAAS,SAAU1O,EAAM+C,EAAMsG,GACzC,MAAMA,IAAyC,UAAhCrJ,EAAK8G,SAASC,cAA7B,EACQ/G,EAAKkZ,eAOT3K,GAAO,SAAUC,GACtB,MAAuC,OAAhCA,EAAId,aAAa,eAExBgB,GAAW5D,EAAU,SAAU9K,EAAM+C,EAAMsG,GAC1C,GAAIoI,EACJ,OAAMpI,GAAN,GACSoI,EAAMzR,EAAKqQ,iBAAkBtN,KAAW0O,EAAIC,UACnDD,EAAIzK,MACJhH,EAAM+C,MAAW,EAAOA,EAAKgE,cAAgB,OAKjDpK,EAAO0D,KAAO2M,GACdrQ,EAAO4U,KAAOvE,GAAOiF,UACrBtV,EAAO4U,KAAK,KAAO5U,EAAO4U,KAAKpG,QAC/BxO,EAAOwc,OAASnM,GAAO2E,WACvBhV,EAAOuK,KAAO8F,GAAO5D,QACrBzM,EAAOyc,SAAWpM,GAAO3D,MACzB1M,EAAOmN,SAAWkD,GAAOlD,UAGrB7N,EAEJ,IAAIod,KAGJ,SAASC,GAAetW,GACvB,GAAIuW,GAASF,EAAcrW,KAI3B,OAHArG,GAAO+E,KAAMsB,EAAQjD,MAAO1B,OAAwB,SAAUqO,EAAG8M,GAChED,EAAQC,IAAS,IAEXD,EAyBR5c,EAAO8c,UAAY,SAAUzW,GAI5BA,EAA6B,gBAAZA,GACdqW,EAAcrW,IAAasW,EAAetW,GAC5CrG,EAAOgG,UAAYK,EAEpB,IACC0W,GAEAC,EAEAC,EAEAC,EAEAC,EAEAC,EAEAC,KAEAC,GAASjX,EAAQkX,SAEjBC,EAAO,SAAU/U,GAOhB,IANAuU,EAAS3W,EAAQ2W,QAAUvU,EAC3BwU,GAAQ,EACRE,EAAcC,GAAe,EAC7BA,EAAc,EACdF,EAAeG,EAAK7Z,OACpBuZ,GAAS,EACDM,GAAsBH,EAAdC,EAA4BA,IAC3C,GAAKE,EAAMF,GAAc/X,MAAOqD,EAAM,GAAKA,EAAM,OAAU,GAASpC,EAAQoX,YAAc,CACzFT,GAAS,CACT,OAGFD,GAAS,EACJM,IACCC,EACCA,EAAM9Z,QACVga,EAAMF,EAAM5L,SAEFsL,EACXK,KAEAK,EAAKC,YAKRD,GAECE,IAAK,WACJ,GAAKP,EAAO,CAEX,GAAIzG,GAAQyG,EAAK7Z,QACjB,QAAUoa,GAAK3Y,GACdjF,EAAO+E,KAAME,EAAM,SAAU8K,EAAG7E,GAC/B,GAAIvI,GAAO3C,EAAO2C,KAAMuI,EACV,cAATvI,EACE0D,EAAQmW,QAAWkB,EAAKpG,IAAKpM,IAClCmS,EAAK5c,KAAMyK,GAEDA,GAAOA,EAAI1H,QAAmB,WAATb,GAEhCib,EAAK1S,OAGJ7F,WAGC0X,EACJG,EAAeG,EAAK7Z,OAGTwZ,IACXI,EAAcxG,EACd4G,EAAMR,IAGR,MAAO1Z,OAGRyF,OAAQ,WAkBP,MAjBKsU,IACJrd,EAAO+E,KAAMM,UAAW,SAAU0K,EAAG7E,GACpC,GAAI2S,EACJ,QAASA,EAAQ7d,EAAO2K,QAASO,EAAKmS,EAAMQ,IAAY,GACvDR,EAAKtX,OAAQ8X,EAAO,GAEfd,IACUG,GAATW,GACJX,IAEaC,GAATU,GACJV,OAME7Z,MAIRgU,IAAK,SAAUhW,GACd,MAAOA,GAAKtB,EAAO2K,QAASrJ,EAAI+b,GAAS,MAASA,IAAQA,EAAK7Z,SAGhE8U,MAAO,WAGN,MAFA+E,MACAH,EAAe,EACR5Z,MAGRqa,QAAS,WAER,MADAN,GAAOC,EAAQN,EAASzd,EACjB+D,MAGR4U,SAAU,WACT,OAAQmF,GAGTS,KAAM,WAKL,MAJAR,GAAQ/d,EACFyd,GACLU,EAAKC,UAECra,MAGRya,OAAQ,WACP,OAAQT,GAGTU,SAAU,SAAU3c,EAAS4D,GAU5B,OATKoY,GAAWJ,IAASK,IACxBrY,EAAOA,MACPA,GAAS5D,EAAS4D,EAAKtE,MAAQsE,EAAKtE,QAAUsE,GACzC8X,EACJO,EAAM7c,KAAMwE,GAEZuY,EAAMvY,IAGD3B,MAGRka,KAAM,WAEL,MADAE,GAAKM,SAAU1a,KAAM+B,WACd/B,MAGR2Z,MAAO,WACN,QAASA,GAIZ,OAAOS,IAER1d,EAAOgG,QAENgG,SAAU,SAAUiS,GACnB,GAAIC,KAEA,UAAW,OAAQle,EAAO8c,UAAU,eAAgB,aACpD,SAAU,OAAQ9c,EAAO8c,UAAU,eAAgB,aACnD,SAAU,WAAY9c,EAAO8c,UAAU,YAE1CqB,EAAQ,UACRjZ,GACCiZ,MAAO,WACN,MAAOA,IAERC,OAAQ,WAEP,MADAC,GAASlZ,KAAME,WAAYiZ,KAAMjZ,WAC1B/B,MAERib,KAAM,WACL,GAAIC,GAAMnZ,SACV,OAAOrF,GAAOgM,SAAS,SAAUyS,GAChCze,EAAO+E,KAAMmZ,EAAQ,SAAUzY,EAAGiZ,GACjC,GAAIC,GAASD,EAAO,GACnBpd,EAAKtB,EAAOiE,WAAYua,EAAK/Y,KAAS+Y,EAAK/Y,EAE5C4Y,GAAUK,EAAM,IAAK,WACpB,GAAIE,GAAWtd,GAAMA,EAAG8D,MAAO9B,KAAM+B,UAChCuZ,IAAY5e,EAAOiE,WAAY2a,EAAS1Z,SAC5C0Z,EAAS1Z,UACPC,KAAMsZ,EAASI,SACfP,KAAMG,EAASK,QACfC,SAAUN,EAASO,QAErBP,EAAUE,EAAS,QAAUrb,OAAS4B,EAAUuZ,EAASvZ,UAAY5B,KAAMhC,GAAOsd,GAAavZ,eAIlGmZ,EAAM,OACJtZ,WAIJA,QAAS,SAAUuC,GAClB,MAAc,OAAPA,EAAczH,EAAOgG,OAAQyB,EAAKvC,GAAYA,IAGvDmZ,IAwCD,OArCAnZ,GAAQ+Z,KAAO/Z,EAAQqZ,KAGvBve,EAAO+E,KAAMmZ,EAAQ,SAAUzY,EAAGiZ,GACjC,GAAIrB,GAAOqB,EAAO,GACjBQ,EAAcR,EAAO,EAGtBxZ,GAASwZ,EAAM,IAAOrB,EAAKO,IAGtBsB,GACJ7B,EAAKO,IAAI,WAERO,EAAQe,GAGNhB,EAAY,EAAJzY,GAAS,GAAIkY,QAASO,EAAQ,GAAK,GAAIJ,MAInDO,EAAUK,EAAM,IAAO,WAEtB,MADAL,GAAUK,EAAM,GAAK,QAAUpb,OAAS+a,EAAWnZ,EAAU5B,KAAM+B,WAC5D/B,MAER+a,EAAUK,EAAM,GAAK,QAAWrB,EAAKW,WAItC9Y,EAAQA,QAASmZ,GAGZJ,GACJA,EAAKzZ,KAAM6Z,EAAUA,GAIfA,GAIRc,KAAM,SAAUC,GACf,GAAI3Z,GAAI,EACP4Z,EAAgB3e,EAAW8D,KAAMa,WACjC7B,EAAS6b,EAAc7b,OAGvB8b,EAAuB,IAAX9b,GAAkB4b,GAAepf,EAAOiE,WAAYmb,EAAYla,SAAc1B,EAAS,EAGnG6a,EAAyB,IAAdiB,EAAkBF,EAAcpf,EAAOgM,WAGlDuT,EAAa,SAAU9Z,EAAG2W,EAAUoD,GACnC,MAAO,UAAUnV,GAChB+R,EAAU3W,GAAMnC,KAChBkc,EAAQ/Z,GAAMJ,UAAU7B,OAAS,EAAI9C,EAAW8D,KAAMa,WAAcgF,EAChEmV,IAAWC,EACdpB,EAASqB,WAAYtD,EAAUoD,KACfF,GAChBjB,EAAS/W,YAAa8U,EAAUoD,KAKnCC,EAAgBE,EAAkBC,CAGnC,IAAKpc,EAAS,EAIb,IAHAic,EAAqB/X,MAAOlE,GAC5Bmc,EAAuBjY,MAAOlE,GAC9Boc,EAAsBlY,MAAOlE,GACjBA,EAAJiC,EAAYA,IACd4Z,EAAe5Z,IAAOzF,EAAOiE,WAAYob,EAAe5Z,GAAIP,SAChEma,EAAe5Z,GAAIP,UACjBC,KAAMoa,EAAY9Z,EAAGma,EAAiBP,IACtCf,KAAMD,EAASS,QACfC,SAAUQ,EAAY9Z,EAAGka,EAAkBF,MAE3CH,CAUL,OAJMA,IACLjB,EAAS/W,YAAasY,EAAiBP,GAGjChB,EAASnZ,aAGlBlF,EAAOmI,QAAU,SAAWA,GAE3B,GAAI9F,GAAKuL,EAAGgG,EAAOtC,EAAQuO,EAAUC,EAAKC,EAAWC,EAAava,EACjEoM,EAAMjS,EAASiJ,cAAc,MAS9B,IANAgJ,EAAIb,aAAc,YAAa,KAC/Ba,EAAIuB,UAAY,qEAGhB/Q,EAAMwP,EAAIhI,qBAAqB,SAC/B+D,EAAIiE,EAAIhI,qBAAqB,KAAM,IAC7B+D,IAAMA,EAAE7B,QAAU1J,EAAImB,OAC3B,MAAO2E,EAIRmJ,GAAS1R,EAASiJ,cAAc,UAChCiX,EAAMxO,EAAO4B,YAAatT,EAASiJ,cAAc,WACjD+K,EAAQ/B,EAAIhI,qBAAqB,SAAU,GAE3C+D,EAAE7B,MAAMkU,QAAU,gCAGlB9X,EAAQ+X,gBAAoC,MAAlBrO,EAAIoB,UAG9B9K,EAAQgY,kBAAgD,IAA5BtO,EAAIwB,WAAWxP,SAI3CsE,EAAQiY,OAASvO,EAAIhI,qBAAqB,SAASrG,OAInD2E,EAAQkY,gBAAkBxO,EAAIhI,qBAAqB,QAAQrG,OAI3D2E,EAAQ4D,MAAQ,MAAMhI,KAAM6J,EAAEmD,aAAa,UAI3C5I,EAAQmY,eAA4C,OAA3B1S,EAAEmD,aAAa,QAKxC5I,EAAQoY,QAAU,OAAOxc,KAAM6J,EAAE7B,MAAMwU,SAIvCpY,EAAQqY,WAAa5S,EAAE7B,MAAMyU,SAG7BrY,EAAQsY,UAAY7M,EAAMvJ,MAI1BlC,EAAQuY,YAAcZ,EAAI1H,SAG1BjQ,EAAQwY,UAAY/gB,EAASiJ,cAAc,QAAQ8X,QAInDxY,EAAQyY,WAA2E,kBAA9DhhB,EAASiJ,cAAc,OAAOgY,WAAW,GAAOC,UAGrE3Y,EAAQ4Y,wBAAyB,EACjC5Y,EAAQ6Y,kBAAmB,EAC3B7Y,EAAQ8Y,eAAgB,EACxB9Y,EAAQ+Y,eAAgB,EACxB/Y,EAAQgZ,cAAe,EACvBhZ,EAAQiZ,qBAAsB,EAC9BjZ,EAAQkZ,mBAAoB,EAG5BzN,EAAMuE,SAAU,EAChBhQ,EAAQmZ,eAAiB1N,EAAMiN,WAAW,GAAO1I,QAIjD7G,EAAO4G,UAAW,EAClB/P,EAAQoZ,aAAezB,EAAI5H,QAG3B,WACQrG,GAAI9N,KACV,MAAOmE,GACRC,EAAQ+Y,eAAgB,EAIzBtN,EAAQhU,EAASiJ,cAAc,SAC/B+K,EAAM5C,aAAc,QAAS,IAC7B7I,EAAQyL,MAA0C,KAAlCA,EAAM7C,aAAc,SAGpC6C,EAAMvJ,MAAQ,IACduJ,EAAM5C,aAAc,OAAQ,SAC5B7I,EAAQqZ,WAA6B,MAAhB5N,EAAMvJ,MAG3BuJ,EAAM5C,aAAc,UAAW,KAC/B4C,EAAM5C,aAAc,OAAQ,KAE5B6O,EAAWjgB,EAAS6hB,yBACpB5B,EAAS3M,YAAaU,GAItBzL,EAAQuZ,cAAgB9N,EAAMuE,QAG9BhQ,EAAQwZ,WAAa9B,EAASgB,WAAW,GAAOA,WAAW,GAAO/J,UAAUqB,QAKvEtG,EAAI5F,cACR4F,EAAI5F,YAAa,UAAW,WAC3B9D,EAAQgZ,cAAe,IAGxBtP,EAAIgP,WAAW,GAAOe,QAKvB,KAAMnc,KAAOyT,QAAQ,EAAM2I,QAAQ,EAAMC,SAAS,GACjDjQ,EAAIb,aAAc+O,EAAY,KAAOta,EAAG,KAExC0C,EAAS1C,EAAI,WAAcsa,IAAazgB,IAAUuS,EAAItD,WAAYwR,GAAYrZ,WAAY,CAG3FmL,GAAI9F,MAAMgW,eAAiB,cAC3BlQ,EAAIgP,WAAW,GAAO9U,MAAMgW,eAAiB,GAC7C5Z,EAAQ6Z,gBAA+C,gBAA7BnQ,EAAI9F,MAAMgW,cAIpC,KAAMtc,IAAKzF,GAAQmI,GAClB,KAoGD,OAlGAA,GAAQC,QAAgB,MAAN3C,EAGlBzF,EAAO,WACN,GAAIiiB,GAAWC,EAAWC,EACzBC,EAAW,+HACXhb,EAAOxH,EAASiK,qBAAqB,QAAQ,EAExCzC,KAKN6a,EAAYriB,EAASiJ,cAAc,OACnCoZ,EAAUlW,MAAMkU,QAAU,gFAE1B7Y,EAAK8L,YAAa+O,GAAY/O,YAAarB,GAS3CA,EAAIuB,UAAY,8CAChB+O,EAAMtQ,EAAIhI,qBAAqB,MAC/BsY,EAAK,GAAIpW,MAAMkU,QAAU,2CACzBD,EAA0C,IAA1BmC,EAAK,GAAIE,aAEzBF,EAAK,GAAIpW,MAAMuW,QAAU,GACzBH,EAAK,GAAIpW,MAAMuW,QAAU,OAIzBna,EAAQoa,sBAAwBvC,GAA2C,IAA1BmC,EAAK,GAAIE,aAG1DxQ,EAAIuB,UAAY,GAChBvB,EAAI9F,MAAMkU,QAAU,wKAIpBjgB,EAAO6L,KAAMzE,EAAyB,MAAnBA,EAAK2E,MAAMyW,MAAiBA,KAAM,MAAU,WAC9Dra,EAAQsa,UAAgC,IAApB5Q,EAAI6Q,cAIpBpjB,EAAOqjB,mBACXxa,EAAQ8Y,cAAuE,QAArD3hB,EAAOqjB,iBAAkB9Q,EAAK,WAAe3F,IACvE/D,EAAQkZ,kBAA2F,SAArE/hB,EAAOqjB,iBAAkB9Q,EAAK,QAAY+Q,MAAO,QAAUA,MAMzFV,EAAYrQ,EAAIqB,YAAatT,EAASiJ,cAAc,QACpDqZ,EAAUnW,MAAMkU,QAAUpO,EAAI9F,MAAMkU,QAAUmC,EAC9CF,EAAUnW,MAAM8W,YAAcX,EAAUnW,MAAM6W,MAAQ,IACtD/Q,EAAI9F,MAAM6W,MAAQ,MAElBza,EAAQiZ,qBACNtZ,YAAcxI,EAAOqjB,iBAAkBT,EAAW,WAAeW,oBAGxDhR,GAAI9F,MAAMyW,OAAS9iB,IAK9BmS,EAAIuB,UAAY,GAChBvB,EAAI9F,MAAMkU,QAAUmC,EAAW,8CAC/Bja,EAAQ4Y,uBAA+C,IAApBlP,EAAI6Q,YAIvC7Q,EAAI9F,MAAMuW,QAAU,QACpBzQ,EAAIuB,UAAY,cAChBvB,EAAIwB,WAAWtH,MAAM6W,MAAQ,MAC7Bza,EAAQ6Y,iBAAyC,IAApBnP,EAAI6Q,YAE5Bva,EAAQ4Y,yBAIZ3Z,EAAK2E,MAAMyW,KAAO,IAIpBpb,EAAK0K,YAAamQ,GAGlBA,EAAYpQ,EAAMsQ,EAAMD,EAAY,QAIrC7f,EAAMiP,EAASuO,EAAWC,EAAMlS,EAAIgG,EAAQ,KAErCzL;KAGR,IAAI2a,GAAS,+BACZC,EAAa,UAEd,SAASC,GAAc3f,EAAM+C,EAAMqC,EAAMwa,GACxC,GAAMjjB,EAAOkjB,WAAY7f,GAAzB,CAIA,GAAIwB,GAAKse,EACRC,EAAcpjB,EAAO0G,QAIrB2c,EAAShgB,EAAKQ,SAId2N,EAAQ6R,EAASrjB,EAAOwR,MAAQnO,EAIhCgB,EAAKgf,EAAShgB,EAAM+f,GAAgB/f,EAAM+f,IAAiBA,CAI5D,IAAO/e,GAAOmN,EAAMnN,KAAS4e,GAAQzR,EAAMnN,GAAIoE,OAAUA,IAASlJ,GAA6B,gBAAT6G,GAgEtF,MA5DM/B,KAIJA,EADIgf,EACChgB,EAAM+f,GAAgBhjB,EAAgB6N,OAASjO,EAAOmL,OAEtDiY,GAID5R,EAAOnN,KAGZmN,EAAOnN,GAAOgf,MAAgBC,OAAQtjB,EAAO8J,QAKzB,gBAAT1D,IAAqC,kBAATA,MAClC6c,EACJzR,EAAOnN,GAAOrE,EAAOgG,OAAQwL,EAAOnN,GAAM+B,GAE1CoL,EAAOnN,GAAKoE,KAAOzI,EAAOgG,OAAQwL,EAAOnN,GAAKoE,KAAMrC,IAItD+c,EAAY3R,EAAOnN,GAKb4e,IACCE,EAAU1a,OACf0a,EAAU1a,SAGX0a,EAAYA,EAAU1a,MAGlBA,IAASlJ,IACb4jB,EAAWnjB,EAAOiK,UAAW7D,IAAWqC,GAKpB,gBAATrC,IAGXvB,EAAMse,EAAW/c,GAGL,MAAPvB,IAGJA,EAAMse,EAAWnjB,EAAOiK,UAAW7D,MAGpCvB,EAAMse,EAGAte,GAGR,QAAS0e,GAAoBlgB,EAAM+C,EAAM6c,GACxC,GAAMjjB,EAAOkjB,WAAY7f,GAAzB,CAIA,GAAI8f,GAAW1d,EACd4d,EAAShgB,EAAKQ,SAGd2N,EAAQ6R,EAASrjB,EAAOwR,MAAQnO,EAChCgB,EAAKgf,EAAShgB,EAAMrD,EAAO0G,SAAY1G,EAAO0G,OAI/C,IAAM8K,EAAOnN,GAAb,CAIA,GAAK+B,IAEJ+c,EAAYF,EAAMzR,EAAOnN,GAAOmN,EAAOnN,GAAKoE,MAE3B,CAGVzI,EAAOyG,QAASL,GAsBrBA,EAAOA,EAAK7F,OAAQP,EAAO4F,IAAKQ,EAAMpG,EAAOiK,YAnBxC7D,IAAQ+c,GACZ/c,GAASA,IAITA,EAAOpG,EAAOiK,UAAW7D,GAExBA,EADIA,IAAQ+c,IACH/c,GAEFA,EAAKkG,MAAM,MAarB7G,EAAIW,EAAK5C,MACT,OAAQiC,UACA0d,GAAW/c,EAAKX,GAKxB,IAAKwd,GAAOO,EAAkBL,IAAcnjB,EAAOqI,cAAc8a,GAChE,QAMGF,UACEzR,GAAOnN,GAAKoE,KAIb+a,EAAmBhS,EAAOnN,QAM5Bgf,EACJrjB,EAAOyjB,WAAapgB,IAAQ,GAIjBrD,EAAOmI,QAAQ+Y,eAAiB1P,GAASA,EAAMlS,aAEnDkS,GAAOnN,GAIdmN,EAAOnN,GAAO,QAIhBrE,EAAOgG,QACNwL,SAIAkS,QACCC,QAAU,EACVC,OAAS,EAEThH,OAAU,8CAGXiH,QAAS,SAAUxgB,GAElB,MADAA,GAAOA,EAAKQ,SAAW7D,EAAOwR,MAAOnO,EAAKrD,EAAO0G,UAAarD,EAAMrD,EAAO0G,WAClErD,IAASmgB,EAAmBngB,IAGtCoF,KAAM,SAAUpF,EAAM+C,EAAMqC,GAC3B,MAAOua,GAAc3f,EAAM+C,EAAMqC,IAGlCqb,WAAY,SAAUzgB,EAAM+C,GAC3B,MAAOmd,GAAoBlgB,EAAM+C,IAIlC2d,MAAO,SAAU1gB,EAAM+C,EAAMqC,GAC5B,MAAOua,GAAc3f,EAAM+C,EAAMqC,GAAM,IAGxCub,YAAa,SAAU3gB,EAAM+C,GAC5B,MAAOmd,GAAoBlgB,EAAM+C,GAAM,IAIxC8c,WAAY,SAAU7f,GAErB,GAAKA,EAAKQ,UAA8B,IAAlBR,EAAKQ,UAAoC,IAAlBR,EAAKQ,SACjD,OAAO,CAGR,IAAI6f,GAASrgB,EAAK8G,UAAYnK,EAAO0jB,OAAQrgB,EAAK8G,SAASC,cAG3D,QAAQsZ,GAAUA,KAAW,GAAQrgB,EAAK0N,aAAa,aAAe2S,KAIxE1jB,EAAOsB,GAAG0E,QACTyC,KAAM,SAAUR,EAAKoC,GACpB,GAAI2H,GAAO5L,EACVqC,EAAO,KACPhD,EAAI,EACJpC,EAAOC,KAAK,EAMb,IAAK2E,IAAQ1I,EAAY,CACxB,GAAK+D,KAAKE,SACTiF,EAAOzI,EAAOyI,KAAMpF,GAEG,IAAlBA,EAAKQ,WAAmB7D,EAAO+jB,MAAO1gB,EAAM,gBAAkB,CAElE,IADA2O,EAAQ3O,EAAKkL,WACDyD,EAAMxO,OAAViC,EAAkBA,IACzBW,EAAO4L,EAAMvM,GAAGW,KAEe,IAA1BA,EAAKvF,QAAQ,WACjBuF,EAAOpG,EAAOiK,UAAW7D,EAAKzF,MAAM,IAEpCsjB,EAAU5gB,EAAM+C,EAAMqC,EAAMrC,IAG9BpG,GAAO+jB,MAAO1gB,EAAM,eAAe,GAIrC,MAAOoF,GAIR,MAAoB,gBAARR,GACJ3E,KAAKyB,KAAK,WAChB/E,EAAOyI,KAAMnF,KAAM2E,KAId5C,UAAU7B,OAAS,EAGzBF,KAAKyB,KAAK,WACT/E,EAAOyI,KAAMnF,KAAM2E,EAAKoC,KAKzBhH,EAAO4gB,EAAU5gB,EAAM4E,EAAKjI,EAAOyI,KAAMpF,EAAM4E,IAAU,MAG3D6b,WAAY,SAAU7b,GACrB,MAAO3E,MAAKyB,KAAK,WAChB/E,EAAO8jB,WAAYxgB,KAAM2E,OAK5B,SAASgc,GAAU5gB,EAAM4E,EAAKQ,GAG7B,GAAKA,IAASlJ,GAA+B,IAAlB8D,EAAKQ,SAAiB,CAEhD,GAAIuC,GAAO,QAAU6B,EAAIpB,QAASkc,EAAY,OAAQ3Y,aAItD,IAFA3B,EAAOpF,EAAK0N,aAAc3K,GAEL,gBAATqC,GAAoB,CAC/B,IACCA,EAAgB,SAATA,GAAkB,EACf,UAATA,GAAmB,EACV,SAATA,EAAkB,MAEjBA,EAAO,KAAOA,GAAQA,EACvBqa,EAAO/e,KAAM0E,GAASzI,EAAOiJ,UAAWR,GACvCA,EACD,MAAOP,IAGTlI,EAAOyI,KAAMpF,EAAM4E,EAAKQ,OAGxBA,GAAOlJ,EAIT,MAAOkJ,GAIR,QAAS+a,GAAmB/b,GAC3B,GAAIrB,EACJ,KAAMA,IAAQqB,GAGb,IAAc,SAATrB,IAAmBpG,EAAOqI,cAAeZ,EAAIrB,MAGpC,WAATA,EACJ,OAAO,CAIT,QAAO,EAERpG,EAAOgG,QACNke,MAAO,SAAU7gB,EAAMV,EAAM8F,GAC5B,GAAIyb,EAEJ,OAAK7gB,IACJV,GAASA,GAAQ,MAAS,QAC1BuhB,EAAQlkB,EAAO+jB,MAAO1gB,EAAMV,GAGvB8F,KACEyb,GAASlkB,EAAOyG,QAAQgC,GAC7Byb,EAAQlkB,EAAO+jB,MAAO1gB,EAAMV,EAAM3C,EAAOsE,UAAUmE,IAEnDyb,EAAMzjB,KAAMgI,IAGPyb,OAZR,GAgBDC,QAAS,SAAU9gB,EAAMV,GACxBA,EAAOA,GAAQ,IAEf,IAAIuhB,GAAQlkB,EAAOkkB,MAAO7gB,EAAMV,GAC/ByhB,EAAcF,EAAM1gB,OACpBlC,EAAK4iB,EAAMxS,QACX2S,EAAQrkB,EAAOskB,YAAajhB,EAAMV,GAClC4hB,EAAO,WACNvkB,EAAOmkB,QAAS9gB,EAAMV,GAIZ,gBAAPrB,IACJA,EAAK4iB,EAAMxS,QACX0S,KAGI9iB,IAIU,OAATqB,GACJuhB,EAAMvP,QAAS,oBAIT0P,GAAMG,KACbljB,EAAGkD,KAAMnB,EAAMkhB,EAAMF,KAGhBD,GAAeC,GACpBA,EAAM/L,MAAMkF,QAKd8G,YAAa,SAAUjhB,EAAMV,GAC5B,GAAIsF,GAAMtF,EAAO,YACjB,OAAO3C,GAAO+jB,MAAO1gB,EAAM4E,IAASjI,EAAO+jB,MAAO1gB,EAAM4E,GACvDqQ,MAAOtY,EAAO8c,UAAU,eAAec,IAAI,WAC1C5d,EAAOgkB,YAAa3gB,EAAMV,EAAO,SACjC3C,EAAOgkB,YAAa3gB,EAAM4E,UAM9BjI,EAAOsB,GAAG0E,QACTke,MAAO,SAAUvhB,EAAM8F,GACtB,GAAIgc,GAAS,CAQb,OANqB,gBAAT9hB,KACX8F,EAAO9F,EACPA,EAAO,KACP8hB,KAGuBA,EAAnBpf,UAAU7B,OACPxD,EAAOkkB,MAAO5gB,KAAK,GAAIX,GAGxB8F,IAASlJ,EACf+D,KACAA,KAAKyB,KAAK,WACT,GAAImf,GAAQlkB,EAAOkkB,MAAO5gB,KAAMX,EAAM8F,EAGtCzI,GAAOskB,YAAahhB,KAAMX,GAEZ,OAATA,GAA8B,eAAbuhB,EAAM,IAC3BlkB,EAAOmkB,QAAS7gB,KAAMX,MAI1BwhB,QAAS,SAAUxhB,GAClB,MAAOW,MAAKyB,KAAK,WAChB/E,EAAOmkB,QAAS7gB,KAAMX,MAKxB+hB,MAAO,SAAUC,EAAMhiB,GAItB,MAHAgiB,GAAO3kB,EAAO4kB,GAAK5kB,EAAO4kB,GAAGC,OAAQF,IAAUA,EAAOA,EACtDhiB,EAAOA,GAAQ,KAERW,KAAK4gB,MAAOvhB,EAAM,SAAU4hB,EAAMF,GACxC,GAAIS,GAAUzd,WAAYkd,EAAMI,EAChCN,GAAMG,KAAO,WACZO,aAAcD,OAIjBE,WAAY,SAAUriB,GACrB,MAAOW,MAAK4gB,MAAOvhB,GAAQ,UAI5BuC,QAAS,SAAUvC,EAAM8E,GACxB,GAAI8B,GACH0b,EAAQ,EACRC,EAAQllB,EAAOgM,WACf6I,EAAWvR,KACXmC,EAAInC,KAAKE,OACTqb,EAAU,aACCoG,GACTC,EAAM5d,YAAauN,GAAYA,IAIb,iBAATlS,KACX8E,EAAM9E,EACNA,EAAOpD,GAERoD,EAAOA,GAAQ,IAEf,OAAO8C,IACN8D,EAAMvJ,EAAO+jB,MAAOlP,EAAUpP,GAAK9C,EAAO,cACrC4G,GAAOA,EAAI+O,QACf2M,IACA1b,EAAI+O,MAAMsF,IAAKiB,GAIjB,OADAA,KACOqG,EAAMhgB,QAASuC,KAGxB,IAAI0d,GAAUC,EACbC,EAAS,cACTC,EAAU,MACVC,EAAa,6CACbC,EAAa,gBACbC,EAAc,0BACdvF,EAAkBlgB,EAAOmI,QAAQ+X,gBACjCwF,EAAc1lB,EAAOmI,QAAQyL,KAE9B5T,GAAOsB,GAAG0E,QACT9B,KAAM,SAAUkC,EAAMiE,GACrB,MAAOrK,GAAOqL,OAAQ/H,KAAMtD,EAAOkE,KAAMkC,EAAMiE,EAAOhF,UAAU7B,OAAS,IAG1EmiB,WAAY,SAAUvf,GACrB,MAAO9C,MAAKyB,KAAK,WAChB/E,EAAO2lB,WAAYriB,KAAM8C,MAI3Bwf,KAAM,SAAUxf,EAAMiE,GACrB,MAAOrK,GAAOqL,OAAQ/H,KAAMtD,EAAO4lB,KAAMxf,EAAMiE,EAAOhF,UAAU7B,OAAS,IAG1EqiB,WAAY,SAAUzf,GAErB,MADAA,GAAOpG,EAAO8lB,QAAS1f,IAAUA,EAC1B9C,KAAKyB,KAAK,WAEhB,IACCzB,KAAM8C,GAAS7G,QACR+D,MAAM8C,GACZ,MAAO8B,QAIX6d,SAAU,SAAU1b,GACnB,GAAI2b,GAAS3iB,EAAM+O,EAAK6T,EAAOtgB,EAC9BF,EAAI,EACJC,EAAMpC,KAAKE,OACX0iB,EAA2B,gBAAV7b,IAAsBA,CAExC,IAAKrK,EAAOiE,WAAYoG,GACvB,MAAO/G,MAAKyB,KAAK,SAAUY,GAC1B3F,EAAQsD,MAAOyiB,SAAU1b,EAAM7F,KAAMlB,KAAMqC,EAAGrC,KAAK2P,aAIrD,IAAKiT,EAIJ,IAFAF,GAAY3b,GAAS,IAAKjH,MAAO1B,OAErBgE,EAAJD,EAASA,IAOhB,GANApC,EAAOC,KAAMmC,GACb2M,EAAwB,IAAlB/O,EAAKQ,WAAoBR,EAAK4P,WACjC,IAAM5P,EAAK4P,UAAY,KAAMpM,QAASwe,EAAQ,KAChD,KAGU,CACV1f,EAAI,CACJ,OAASsgB,EAAQD,EAAQrgB,KACgB,EAAnCyM,EAAIvR,QAAS,IAAMolB,EAAQ,OAC/B7T,GAAO6T,EAAQ,IAGjB5iB,GAAK4P,UAAYjT,EAAOmB,KAAMiR,GAMjC,MAAO9O,OAGR6iB,YAAa,SAAU9b,GACtB,GAAI2b,GAAS3iB,EAAM+O,EAAK6T,EAAOtgB,EAC9BF,EAAI,EACJC,EAAMpC,KAAKE,OACX0iB,EAA+B,IAArB7gB,UAAU7B,QAAiC,gBAAV6G,IAAsBA,CAElE,IAAKrK,EAAOiE,WAAYoG,GACvB,MAAO/G,MAAKyB,KAAK,SAAUY,GAC1B3F,EAAQsD,MAAO6iB,YAAa9b,EAAM7F,KAAMlB,KAAMqC,EAAGrC,KAAK2P,aAGxD,IAAKiT,EAGJ,IAFAF,GAAY3b,GAAS,IAAKjH,MAAO1B,OAErBgE,EAAJD,EAASA,IAQhB,GAPApC,EAAOC,KAAMmC,GAEb2M,EAAwB,IAAlB/O,EAAKQ,WAAoBR,EAAK4P,WACjC,IAAM5P,EAAK4P,UAAY,KAAMpM,QAASwe,EAAQ,KAChD,IAGU,CACV1f,EAAI,CACJ,OAASsgB,EAAQD,EAAQrgB,KAExB,MAAQyM,EAAIvR,QAAS,IAAMolB,EAAQ,MAAS,EAC3C7T,EAAMA,EAAIvL,QAAS,IAAMof,EAAQ,IAAK,IAGxC5iB,GAAK4P,UAAY5I,EAAQrK,EAAOmB,KAAMiR,GAAQ,GAKjD,MAAO9O,OAGR8iB,YAAa,SAAU/b,EAAOgc,GAC7B,GAAI1jB,SAAc0H,EAElB,OAAyB,iBAAbgc,IAAmC,WAAT1jB,EAC9B0jB,EAAW/iB,KAAKyiB,SAAU1b,GAAU/G,KAAK6iB,YAAa9b,GAGzDrK,EAAOiE,WAAYoG,GAChB/G,KAAKyB,KAAK,SAAUU,GAC1BzF,EAAQsD,MAAO8iB,YAAa/b,EAAM7F,KAAKlB,KAAMmC,EAAGnC,KAAK2P,UAAWoT,GAAWA,KAItE/iB,KAAKyB,KAAK,WAChB,GAAc,WAATpC,EAAoB,CAExB,GAAIsQ,GACHxN,EAAI,EACJiY,EAAO1d,EAAQsD,MACfgjB,EAAajc,EAAMjH,MAAO1B,MAE3B,OAASuR,EAAYqT,EAAY7gB,KAE3BiY,EAAK6I,SAAUtT,GACnByK,EAAKyI,YAAalT,GAElByK,EAAKqI,SAAU9S,QAKNtQ,IAASjD,GAA8B,YAATiD,KACpCW,KAAK2P,WAETjT,EAAO+jB,MAAOzgB,KAAM,gBAAiBA,KAAK2P,WAO3C3P,KAAK2P,UAAY3P,KAAK2P,WAAa5I,KAAU,EAAQ,GAAKrK,EAAO+jB,MAAOzgB,KAAM,kBAAqB,OAKtGijB,SAAU,SAAUnlB,GACnB,GAAI6R,GAAY,IAAM7R,EAAW,IAChCqE,EAAI,EACJqF,EAAIxH,KAAKE,MACV,MAAYsH,EAAJrF,EAAOA,IACd,GAA0B,IAArBnC,KAAKmC,GAAG5B,WAAmB,IAAMP,KAAKmC,GAAGwN,UAAY,KAAKpM,QAAQwe,EAAQ,KAAKxkB,QAASoS,IAAe,EAC3G,OAAO,CAIT,QAAO,GAGR6B,IAAK,SAAUzK,GACd,GAAIxF,GAAKwf,EAAOpgB,EACfZ,EAAOC,KAAK,EAEb,EAAA,GAAM+B,UAAU7B,OAsBhB,MAFAS,GAAajE,EAAOiE,WAAYoG,GAEzB/G,KAAKyB,KAAK,SAAUU,GAC1B,GAAIqP,EAEmB,KAAlBxR,KAAKO,WAKTiR,EADI7Q,EACEoG,EAAM7F,KAAMlB,KAAMmC,EAAGzF,EAAQsD,MAAOwR,OAEpCzK,EAIK,MAAPyK,EACJA,EAAM,GACoB,gBAARA,GAClBA,GAAO,GACI9U,EAAOyG,QAASqO,KAC3BA,EAAM9U,EAAO4F,IAAIkP,EAAK,SAAWzK,GAChC,MAAgB,OAATA,EAAgB,GAAKA,EAAQ,MAItCga,EAAQrkB,EAAOwmB,SAAUljB,KAAKX,OAAU3C,EAAOwmB,SAAUljB,KAAK6G,SAASC,eAGjEia,GAAW,OAASA,IAAUA,EAAMoC,IAAKnjB,KAAMwR,EAAK,WAAcvV,IACvE+D,KAAK+G,MAAQyK,KAjDd,IAAKzR,EAGJ,MAFAghB,GAAQrkB,EAAOwmB,SAAUnjB,EAAKV,OAAU3C,EAAOwmB,SAAUnjB,EAAK8G,SAASC,eAElEia,GAAS,OAASA,KAAUxf,EAAMwf,EAAM5f,IAAKpB,EAAM,YAAe9D,EAC/DsF,GAGRA,EAAMxB,EAAKgH,MAEW,gBAARxF,GAEbA,EAAIgC,QAAQye,EAAS,IAEd,MAAPzgB,EAAc,GAAKA,OA0CxB7E,EAAOgG,QACNwgB,UACCE,QACCjiB,IAAK,SAAUpB,GAEd,GAAIyR,GAAM9U,EAAO0D,KAAKQ,KAAMb,EAAM,QAClC,OAAc,OAAPyR,EACNA,EACAzR,EAAKkH,OAGR+G,QACC7M,IAAK,SAAUpB,GACd,GAAIgH,GAAOqc,EACVrgB,EAAUhD,EAAKgD,QACfwX,EAAQxa,EAAKgV,cACbsO,EAAoB,eAAdtjB,EAAKV,MAAiC,EAARkb,EACpC2B,EAASmH,EAAM,QACf/b,EAAM+b,EAAM9I,EAAQ,EAAIxX,EAAQ7C,OAChCiC,EAAY,EAARoY,EACHjT,EACA+b,EAAM9I,EAAQ,CAGhB,MAAYjT,EAAJnF,EAASA,IAIhB,GAHAihB,EAASrgB,EAASZ,MAGXihB,EAAOtO,UAAY3S,IAAMoY,IAE5B7d,EAAOmI,QAAQoZ,YAAemF,EAAOxO,SAA+C,OAApCwO,EAAO3V,aAAa,cACnE2V,EAAOtiB,WAAW8T,UAAalY,EAAOmK,SAAUuc,EAAOtiB,WAAY,aAAiB,CAMxF,GAHAiG,EAAQrK,EAAQ0mB,GAAS5R,MAGpB6R,EACJ,MAAOtc,EAIRmV,GAAO/e,KAAM4J,GAIf,MAAOmV,IAGRiH,IAAK,SAAUpjB,EAAMgH,GACpB,GAAIuc,GAAWF,EACdrgB,EAAUhD,EAAKgD,QACfmZ,EAASxf,EAAOsE,UAAW+F,GAC3B5E,EAAIY,EAAQ7C,MAEb,OAAQiC,IACPihB,EAASrgB,EAASZ,IACZihB,EAAOtO,SAAWpY,EAAO2K,QAAS3K,EAAO0mB,GAAQ5R,MAAO0K,IAAY,KACzEoH,GAAY,EAQd,OAHMA,KACLvjB,EAAKgV,cAAgB,IAEfmH,KAKVtb,KAAM,SAAUb,EAAM+C,EAAMiE,GAC3B,GAAIga,GAAOxf,EACVgiB,EAAQxjB,EAAKQ,QAGd,IAAMR,GAAkB,IAAVwjB,GAAyB,IAAVA,GAAyB,IAAVA,EAK5C,aAAYxjB,GAAK0N,eAAiBrR,EAC1BM,EAAO4lB,KAAMviB,EAAM+C,EAAMiE,IAKlB,IAAVwc,GAAgB7mB,EAAOyc,SAAUpZ,KACrC+C,EAAOA,EAAKgE,cACZia,EAAQrkB,EAAO8mB,UAAW1gB,KACvBpG,EAAO4U,KAAKxR,MAAMmM,KAAKxL,KAAMqC,GAASgf,EAAWD,IAGhD9a,IAAU9K,EAaH8kB,GAAS,OAASA,IAA6C,QAAnCxf,EAAMwf,EAAM5f,IAAKpB,EAAM+C,IACvDvB,GAGPA,EAAM7E,EAAO0D,KAAKQ,KAAMb,EAAM+C,GAGhB,MAAPvB,EACNtF,EACAsF,GApBc,OAAVwF,EAGOga,GAAS,OAASA,KAAUxf,EAAMwf,EAAMoC,IAAKpjB,EAAMgH,EAAOjE,MAAY7G,EAC1EsF,GAGPxB,EAAK2N,aAAc5K,EAAMiE,EAAQ,IAC1BA,IAPPrK,EAAO2lB,WAAYtiB,EAAM+C,GAAzBpG,KAuBH2lB,WAAY,SAAUtiB,EAAMgH,GAC3B,GAAIjE,GAAM2gB,EACTthB,EAAI,EACJuhB,EAAY3c,GAASA,EAAMjH,MAAO1B,EAEnC,IAAKslB,GAA+B,IAAlB3jB,EAAKQ,SACtB,MAASuC,EAAO4gB,EAAUvhB,KACzBshB,EAAW/mB,EAAO8lB,QAAS1f,IAAUA,EAGhCpG,EAAO4U,KAAKxR,MAAMmM,KAAKxL,KAAMqC,GAE5Bsf,GAAexF,IAAoBuF,EAAY1hB,KAAMqC,GACzD/C,EAAM0jB,IAAa,EAInB1jB,EAAMrD,EAAOiK,UAAW,WAAa7D,IACpC/C,EAAM0jB,IAAa,EAKrB/mB,EAAOkE,KAAMb,EAAM+C,EAAM,IAG1B/C,EAAKgO,gBAAiB6O,EAAkB9Z,EAAO2gB,IAKlDD,WACCnkB,MACC8jB,IAAK,SAAUpjB,EAAMgH,GACpB,IAAMrK,EAAOmI,QAAQqZ,YAAwB,UAAVnX,GAAqBrK,EAAOmK,SAAS9G,EAAM,SAAW,CAGxF,GAAIyR,GAAMzR,EAAKgH,KAKf,OAJAhH,GAAK2N,aAAc,OAAQ3G,GACtByK,IACJzR,EAAKgH,MAAQyK,GAEPzK,MAMXyb,SACCmB,MAAO,UACPC,QAAS,aAGVtB,KAAM,SAAUviB,EAAM+C,EAAMiE,GAC3B,GAAIxF,GAAKwf,EAAO8C,EACfN,EAAQxjB,EAAKQ,QAGd,IAAMR,GAAkB,IAAVwjB,GAAyB,IAAVA,GAAyB,IAAVA,EAY5C,MARAM,GAAmB,IAAVN,IAAgB7mB,EAAOyc,SAAUpZ,GAErC8jB,IAEJ/gB,EAAOpG,EAAO8lB,QAAS1f,IAAUA,EACjCie,EAAQrkB,EAAOonB,UAAWhhB,IAGtBiE,IAAU9K,EACP8kB,GAAS,OAASA,KAAUxf,EAAMwf,EAAMoC,IAAKpjB,EAAMgH,EAAOjE,MAAY7G,EAC5EsF,EACExB,EAAM+C,GAASiE,EAGXga,GAAS,OAASA,IAA6C,QAAnCxf,EAAMwf,EAAM5f,IAAKpB,EAAM+C,IACzDvB,EACAxB,EAAM+C,IAITghB,WACCpP,UACCvT,IAAK,SAAUpB,GAId,GAAIgkB,GAAWrnB,EAAO0D,KAAKQ,KAAMb,EAAM,WAEvC,OAAOgkB,GACNC,SAAUD,EAAU,IACpB9B,EAAWxhB,KAAMV,EAAK8G,WAAcqb,EAAWzhB,KAAMV,EAAK8G,WAAc9G,EAAK0U,KAC5E,EACA,QAONqN,GACCqB,IAAK,SAAUpjB,EAAMgH,EAAOjE,GAa3B,MAZKiE,MAAU,EAEdrK,EAAO2lB,WAAYtiB,EAAM+C,GACdsf,GAAexF,IAAoBuF,EAAY1hB,KAAMqC,GAEhE/C,EAAK2N,cAAekP,GAAmBlgB,EAAO8lB,QAAS1f,IAAUA,EAAMA,GAIvE/C,EAAMrD,EAAOiK,UAAW,WAAa7D,IAAW/C,EAAM+C,IAAS,EAGzDA,IAGTpG,EAAO+E,KAAM/E,EAAO4U,KAAKxR,MAAMmM,KAAK9N,OAAO2B,MAAO,QAAU,SAAUqC,EAAGW,GACxE,GAAImhB,GAASvnB,EAAO4U,KAAK1C,WAAY9L,IAAUpG,EAAO0D,KAAKQ,IAE3DlE,GAAO4U,KAAK1C,WAAY9L,GAASsf,GAAexF,IAAoBuF,EAAY1hB,KAAMqC,GACrF,SAAU/C,EAAM+C,EAAMsG,GACrB,GAAIpL,GAAKtB,EAAO4U,KAAK1C,WAAY9L,GAChCvB,EAAM6H,EACLnN,GAECS,EAAO4U,KAAK1C,WAAY9L,GAAS7G,IACjCgoB,EAAQlkB,EAAM+C,EAAMsG,GAEpBtG,EAAKgE,cACL,IAEH,OADApK,GAAO4U,KAAK1C,WAAY9L,GAAS9E,EAC1BuD,GAER,SAAUxB,EAAM+C,EAAMsG,GACrB,MAAOA,GACNnN,EACA8D,EAAMrD,EAAOiK,UAAW,WAAa7D,IACpCA,EAAKgE,cACL,QAKCsb,GAAgBxF,IACrBlgB,EAAO8mB,UAAUzc,OAChBoc,IAAK,SAAUpjB,EAAMgH,EAAOjE,GAC3B,MAAKpG,GAAOmK,SAAU9G,EAAM,UAE3BA,EAAKkZ,aAAelS,EAApBhH,GAGO8hB,GAAYA,EAASsB,IAAKpjB,EAAMgH,EAAOjE,MAO5C8Z,IAILiF,GACCsB,IAAK,SAAUpjB,EAAMgH,EAAOjE,GAE3B,GAAIvB,GAAMxB,EAAKqQ,iBAAkBtN,EAUjC,OATMvB,IACLxB,EAAKmkB,iBACH3iB,EAAMxB,EAAKS,cAAc2jB,gBAAiBrhB,IAI7CvB,EAAIwF,MAAQA,GAAS,GAGL,UAATjE,GAAoBiE,IAAUhH,EAAK0N,aAAc3K,GACvDiE,EACA9K,IAGHS,EAAO4U,KAAK1C,WAAW7N,GAAKrE,EAAO4U,KAAK1C,WAAW9L,KAAOpG,EAAO4U,KAAK1C,WAAWwV,OAEhF,SAAUrkB,EAAM+C,EAAMsG,GACrB,GAAI7H,EACJ,OAAO6H,GACNnN,GACCsF,EAAMxB,EAAKqQ,iBAAkBtN,KAAyB,KAAdvB,EAAIwF,MAC5CxF,EAAIwF,MACJ,MAEJrK,EAAOwmB,SAAShO,QACf/T,IAAK,SAAUpB,EAAM+C,GACpB,GAAIvB,GAAMxB,EAAKqQ,iBAAkBtN,EACjC,OAAOvB,IAAOA,EAAIkQ,UACjBlQ,EAAIwF,MACJ9K,GAEFknB,IAAKtB,EAASsB,KAKfzmB,EAAO8mB,UAAUa,iBAChBlB,IAAK,SAAUpjB,EAAMgH,EAAOjE,GAC3B+e,EAASsB,IAAKpjB,EAAgB,KAAVgH,GAAe,EAAQA,EAAOjE,KAMpDpG,EAAO+E,MAAO,QAAS,UAAY,SAAUU,EAAGW,GAC/CpG,EAAO8mB,UAAW1gB,IACjBqgB,IAAK,SAAUpjB,EAAMgH,GACpB,MAAe,KAAVA,GACJhH,EAAK2N,aAAc5K,EAAM,QAClBiE,GAFR,OAYErK,EAAOmI,QAAQmY,gBAEpBtgB,EAAO+E,MAAO,OAAQ,OAAS,SAAUU,EAAGW,GAC3CpG,EAAOonB,UAAWhhB,IACjB3B,IAAK,SAAUpB,GACd,MAAOA,GAAK0N,aAAc3K,EAAM,OAM9BpG,EAAOmI,QAAQ4D,QACpB/L,EAAO8mB,UAAU/a,OAChBtH,IAAK,SAAUpB,GAId,MAAOA,GAAK0I,MAAMkU,SAAW1gB,GAE9BknB,IAAK,SAAUpjB,EAAMgH,GACpB,MAAShH,GAAK0I,MAAMkU,QAAU5V,EAAQ,MAOnCrK,EAAOmI,QAAQuY,cACpB1gB,EAAOonB,UAAUhP,UAChB3T,IAAK,SAAUpB,GACd,GAAI0P,GAAS1P,EAAKe,UAUlB,OARK2O,KACJA,EAAOsF,cAGFtF,EAAO3O,YACX2O,EAAO3O,WAAWiU,eAGb,QAKVrY,EAAO+E,MACN,WACA,WACA,YACA,cACA,cACA,UACA,UACA,SACA,cACA,mBACE,WACF/E,EAAO8lB,QAASxiB,KAAK8G,eAAkB9G,OAIlCtD,EAAOmI,QAAQwY,UACpB3gB,EAAO8lB,QAAQnF,QAAU,YAI1B3gB,EAAO+E,MAAO,QAAS,YAAc,WACpC/E,EAAOwmB,SAAUljB,OAChBmjB,IAAK,SAAUpjB,EAAMgH,GACpB,MAAKrK,GAAOyG,QAAS4D,GACXhH,EAAK8U,QAAUnY,EAAO2K,QAAS3K,EAAOqD,GAAMyR,MAAOzK,IAAW,EADxE,IAKIrK,EAAOmI,QAAQsY,UACpBzgB,EAAOwmB,SAAUljB,MAAOmB,IAAM,SAAUpB,GAGvC,MAAsC,QAA/BA,EAAK0N,aAAa,SAAoB,KAAO1N,EAAKgH,SAI5D,IAAIud,GAAa,+BAChBC,GAAY,OACZC,GAAc,+BACdC,GAAc,kCACdC,GAAiB,sBAElB,SAASC,MACR,OAAO,EAGR,QAASC,MACR,OAAO,EAGR,QAASC,MACR,IACC,MAAOvoB,GAASiY,cACf,MAAQuQ,KAOXpoB,EAAOyC,OAEN4lB,UAEAzK,IAAK,SAAUva,EAAMilB,EAAOrW,EAASxJ,EAAMrH,GAC1C,GAAImI,GAAKgf,EAAQC,EAAGC,EACnBC,EAASC,EAAaC,EACtBC,EAAUlmB,EAAMmmB,EAAYC,EAC5BC,EAAWhpB,EAAO+jB,MAAO1gB,EAG1B,IAAM2lB,EAAN,CAKK/W,EAAQA,UACZwW,EAAcxW,EACdA,EAAUwW,EAAYxW,QACtB7Q,EAAWqnB,EAAYrnB,UAIlB6Q,EAAQ9G,OACb8G,EAAQ9G,KAAOnL,EAAOmL,SAIhBod,EAASS,EAAST,UACxBA,EAASS,EAAST,YAEZI,EAAcK,EAASC,UAC7BN,EAAcK,EAASC,OAAS,SAAU/gB,GAGzC,aAAclI,KAAWN,GAAuBwI,GAAKlI,EAAOyC,MAAMymB,YAAchhB,EAAEvF,KAEjFpD,EADAS,EAAOyC,MAAM0mB,SAAS/jB,MAAOujB,EAAYtlB,KAAMgC,YAIjDsjB,EAAYtlB,KAAOA,GAIpBilB,GAAUA,GAAS,IAAKllB,MAAO1B,KAAqB,IACpD8mB,EAAIF,EAAM9kB,MACV,OAAQglB,IACPjf,EAAMye,GAAevkB,KAAM6kB,EAAME,QACjC7lB,EAAOomB,EAAWxf,EAAI,GACtBuf,GAAevf,EAAI,IAAM,IAAK+C,MAAO,KAAMxG,OAGrCnD,IAKN+lB,EAAU1oB,EAAOyC,MAAMimB,QAAS/lB,OAGhCA,GAASvB,EAAWsnB,EAAQU,aAAeV,EAAQW,WAAc1mB,EAGjE+lB,EAAU1oB,EAAOyC,MAAMimB,QAAS/lB,OAGhCimB,EAAY5oB,EAAOgG,QAClBrD,KAAMA,EACNomB,SAAUA,EACVtgB,KAAMA,EACNwJ,QAASA,EACT9G,KAAM8G,EAAQ9G,KACd/J,SAAUA,EACVoO,aAAcpO,GAAYpB,EAAO4U,KAAKxR,MAAMoM,aAAazL,KAAM3C,GAC/DkoB,UAAWR,EAAW5X,KAAK,MACzBuX,IAGII,EAAWN,EAAQ5lB,MACzBkmB,EAAWN,EAAQ5lB,MACnBkmB,EAASU,cAAgB,EAGnBb,EAAQc,OAASd,EAAQc,MAAMhlB,KAAMnB,EAAMoF,EAAMqgB,EAAYH,MAAkB,IAE/EtlB,EAAKX,iBACTW,EAAKX,iBAAkBC,EAAMgmB,GAAa,GAE/BtlB,EAAK4I,aAChB5I,EAAK4I,YAAa,KAAOtJ,EAAMgmB,KAK7BD,EAAQ9K,MACZ8K,EAAQ9K,IAAIpZ,KAAMnB,EAAMulB,GAElBA,EAAU3W,QAAQ9G,OACvByd,EAAU3W,QAAQ9G,KAAO8G,EAAQ9G,OAK9B/J,EACJynB,EAAS9iB,OAAQ8iB,EAASU,gBAAiB,EAAGX,GAE9CC,EAASpoB,KAAMmoB,GAIhB5oB,EAAOyC,MAAM4lB,OAAQ1lB,IAAS,EAI/BU,GAAO,OAIR0F,OAAQ,SAAU1F,EAAMilB,EAAOrW,EAAS7Q,EAAUqoB,GACjD,GAAI9jB,GAAGijB,EAAWrf,EACjBmgB,EAAWlB,EAAGD,EACdG,EAASG,EAAUlmB,EACnBmmB,EAAYC,EACZC,EAAWhpB,EAAO6jB,QAASxgB,IAAUrD,EAAO+jB,MAAO1gB,EAEpD,IAAM2lB,IAAcT,EAASS,EAAST,QAAtC,CAKAD,GAAUA,GAAS,IAAKllB,MAAO1B,KAAqB,IACpD8mB,EAAIF,EAAM9kB,MACV,OAAQglB,IAMP,GALAjf,EAAMye,GAAevkB,KAAM6kB,EAAME,QACjC7lB,EAAOomB,EAAWxf,EAAI,GACtBuf,GAAevf,EAAI,IAAM,IAAK+C,MAAO,KAAMxG,OAGrCnD,EAAN,CAOA+lB,EAAU1oB,EAAOyC,MAAMimB,QAAS/lB,OAChCA,GAASvB,EAAWsnB,EAAQU,aAAeV,EAAQW,WAAc1mB,EACjEkmB,EAAWN,EAAQ5lB,OACnB4G,EAAMA,EAAI,IAAUkF,OAAQ,UAAYqa,EAAW5X,KAAK,iBAAmB,WAG3EwY,EAAY/jB,EAAIkjB,EAASrlB,MACzB,OAAQmC,IACPijB,EAAYC,EAAUljB,IAEf8jB,GAAeV,IAAaH,EAAUG,UACzC9W,GAAWA,EAAQ9G,OAASyd,EAAUzd,MACtC5B,IAAOA,EAAIxF,KAAM6kB,EAAUU,YAC3BloB,GAAYA,IAAawnB,EAAUxnB,WAAyB,OAAbA,IAAqBwnB,EAAUxnB,YACjFynB,EAAS9iB,OAAQJ,EAAG,GAEfijB,EAAUxnB,UACdynB,EAASU,gBAELb,EAAQ3f,QACZ2f,EAAQ3f,OAAOvE,KAAMnB,EAAMulB,GAOzBc,KAAcb,EAASrlB,SACrBklB,EAAQiB,UAAYjB,EAAQiB,SAASnlB,KAAMnB,EAAMylB,EAAYE,EAASC,WAAa,GACxFjpB,EAAO4pB,YAAavmB,EAAMV,EAAMqmB,EAASC,cAGnCV,GAAQ5lB,QAtCf,KAAMA,IAAQ4lB,GACbvoB,EAAOyC,MAAMsG,OAAQ1F,EAAMV,EAAO2lB,EAAOE,GAAKvW,EAAS7Q,GAAU,EA0C/DpB,GAAOqI,cAAekgB,WACnBS,GAASC,OAIhBjpB,EAAOgkB,YAAa3gB,EAAM,aAI5BkE,QAAS,SAAU9E,EAAOgG,EAAMpF,EAAMwmB,GACrC,GAAIZ,GAAQa,EAAQ1X,EACnB2X,EAAYrB,EAASnf,EAAK9D,EAC1BukB,GAAc3mB,GAAQzD,GACtB+C,EAAO3B,EAAYwD,KAAM/B,EAAO,QAAWA,EAAME,KAAOF,EACxDqmB,EAAa9nB,EAAYwD,KAAM/B,EAAO,aAAgBA,EAAM6mB,UAAUhd,MAAM,OAK7E,IAHA8F,EAAM7I,EAAMlG,EAAOA,GAAQzD,EAGJ,IAAlByD,EAAKQ,UAAoC,IAAlBR,EAAKQ,WAK5BkkB,GAAYhkB,KAAMpB,EAAO3C,EAAOyC,MAAMymB,aAItCvmB,EAAK9B,QAAQ,MAAQ,IAEzBioB,EAAanmB,EAAK2J,MAAM,KACxB3J,EAAOmmB,EAAWpX,QAClBoX,EAAWhjB,QAEZgkB,EAA6B,EAApBnnB,EAAK9B,QAAQ,MAAY,KAAO8B,EAGzCF,EAAQA,EAAOzC,EAAO0G,SACrBjE,EACA,GAAIzC,GAAOiqB,MAAOtnB,EAAuB,gBAAVF,IAAsBA,GAGtDA,EAAMynB,UAAYL,EAAe,EAAI,EACrCpnB,EAAM6mB,UAAYR,EAAW5X,KAAK,KAClCzO,EAAM0nB,aAAe1nB,EAAM6mB,UACtB7a,OAAQ,UAAYqa,EAAW5X,KAAK,iBAAmB,WAC3D,KAGDzO,EAAM4T,OAAS9W,EACTkD,EAAM8D,SACX9D,EAAM8D,OAASlD,GAIhBoF,EAAe,MAARA,GACJhG,GACFzC,EAAOsE,UAAWmE,GAAQhG,IAG3BimB,EAAU1oB,EAAOyC,MAAMimB,QAAS/lB,OAC1BknB,IAAgBnB,EAAQnhB,SAAWmhB,EAAQnhB,QAAQnC,MAAO/B,EAAMoF,MAAW,GAAjF,CAMA,IAAMohB,IAAiBnB,EAAQ0B,WAAapqB,EAAO2H,SAAUtE,GAAS,CAMrE,IAJA0mB,EAAarB,EAAQU,cAAgBzmB,EAC/BolB,GAAYhkB,KAAMgmB,EAAapnB,KACpCyP,EAAMA,EAAIhO,YAEHgO,EAAKA,EAAMA,EAAIhO,WACtB4lB,EAAUvpB,KAAM2R,GAChB7I,EAAM6I,CAIF7I,MAASlG,EAAKS,eAAiBlE,IACnCoqB,EAAUvpB,KAAM8I,EAAIyJ,aAAezJ,EAAI8gB,cAAgB/qB,GAKzDmG,EAAI,CACJ,QAAS2M,EAAM4X,EAAUvkB,QAAUhD,EAAM6nB,uBAExC7nB,EAAME,KAAO8C,EAAI,EAChBskB,EACArB,EAAQW,UAAY1mB,EAGrBsmB,GAAWjpB,EAAO+jB,MAAO3R,EAAK,eAAoB3P,EAAME,OAAU3C,EAAO+jB,MAAO3R,EAAK,UAChF6W,GACJA,EAAO7jB,MAAOgN,EAAK3J,GAIpBwgB,EAASa,GAAU1X,EAAK0X,GACnBb,GAAUjpB,EAAOkjB,WAAY9Q,IAAS6W,EAAO7jB,OAAS6jB,EAAO7jB,MAAOgN,EAAK3J,MAAW,GACxFhG,EAAM8nB,gBAMR,IAHA9nB,EAAME,KAAOA,GAGPknB,IAAiBpnB,EAAM+nB,wBAErB9B,EAAQ+B,UAAY/B,EAAQ+B,SAASrlB,MAAO4kB,EAAU/b,MAAOxF,MAAW,IAC9EzI,EAAOkjB,WAAY7f,IAKdymB,GAAUzmB,EAAMV,KAAW3C,EAAO2H,SAAUtE,GAAS,CAGzDkG,EAAMlG,EAAMymB,GAEPvgB,IACJlG,EAAMymB,GAAW,MAIlB9pB,EAAOyC,MAAMymB,UAAYvmB,CACzB,KACCU,EAAMV,KACL,MAAQuF,IAIVlI,EAAOyC,MAAMymB,UAAY3pB,EAEpBgK,IACJlG,EAAMymB,GAAWvgB,GAMrB,MAAO9G,GAAM4T,SAGd8S,SAAU,SAAU1mB,GAGnBA,EAAQzC,EAAOyC,MAAMioB,IAAKjoB,EAE1B,IAAIgD,GAAGZ,EAAK+jB,EAAW1R,EAASvR,EAC/BglB,KACA1lB,EAAOvE,EAAW8D,KAAMa,WACxBwjB,GAAa7oB,EAAO+jB,MAAOzgB,KAAM,eAAoBb,EAAME,UAC3D+lB,EAAU1oB,EAAOyC,MAAMimB,QAASjmB,EAAME,SAOvC,IAJAsC,EAAK,GAAKxC,EACVA,EAAMmoB,eAAiBtnB,MAGlBolB,EAAQmC,aAAenC,EAAQmC,YAAYrmB,KAAMlB,KAAMb,MAAY,EAAxE,CAKAkoB,EAAe3qB,EAAOyC,MAAMomB,SAASrkB,KAAMlB,KAAMb,EAAOomB,GAGxDpjB,EAAI,CACJ,QAASyR,EAAUyT,EAAcllB,QAAWhD,EAAM6nB,uBAAyB,CAC1E7nB,EAAMqoB,cAAgB5T,EAAQ7T,KAE9BsC,EAAI,CACJ,QAASijB,EAAY1R,EAAQ2R,SAAUljB,QAAWlD,EAAMsoB,kCAIjDtoB,EAAM0nB,cAAgB1nB,EAAM0nB,aAAapmB,KAAM6kB,EAAUU,cAE9D7mB,EAAMmmB,UAAYA,EAClBnmB,EAAMgG,KAAOmgB,EAAUngB,KAEvB5D,IAAS7E,EAAOyC,MAAMimB,QAASE,EAAUG,eAAkBE,QAAUL,EAAU3W,SAC5E7M,MAAO8R,EAAQ7T,KAAM4B,GAEnBJ,IAAQtF,IACNkD,EAAM4T,OAASxR,MAAS,IAC7BpC,EAAM8nB,iBACN9nB,EAAMuoB,oBAYX,MAJKtC,GAAQuC,cACZvC,EAAQuC,aAAazmB,KAAMlB,KAAMb,GAG3BA,EAAM4T,SAGdwS,SAAU,SAAUpmB,EAAOomB,GAC1B,GAAIqC,GAAKtC,EAAW1b,EAASzH,EAC5BklB,KACApB,EAAgBV,EAASU,cACzBnX,EAAM3P,EAAM8D,MAKb,IAAKgjB,GAAiBnX,EAAIvO,YAAcpB,EAAM+V,QAAyB,UAAf/V,EAAME,MAG7D,KAAQyP,GAAO9O,KAAM8O,EAAMA,EAAIhO,YAAcd,KAK5C,GAAsB,IAAjB8O,EAAIvO,WAAmBuO,EAAI8F,YAAa,GAAuB,UAAfzV,EAAME,MAAoB,CAE9E,IADAuK,KACMzH,EAAI,EAAO8jB,EAAJ9jB,EAAmBA,IAC/BmjB,EAAYC,EAAUpjB,GAGtBylB,EAAMtC,EAAUxnB,SAAW,IAEtB8L,EAASge,KAAU3rB,IACvB2N,EAASge,GAAQtC,EAAUpZ,aAC1BxP,EAAQkrB,EAAK5nB,MAAOua,MAAOzL,IAAS,EACpCpS,EAAO0D,KAAMwnB,EAAK5nB,KAAM,MAAQ8O,IAAQ5O,QAErC0J,EAASge,IACbhe,EAAQzM,KAAMmoB,EAGX1b,GAAQ1J,QACZmnB,EAAalqB,MAAO4C,KAAM+O,EAAKyW,SAAU3b,IAW7C,MAJqB2b,GAASrlB,OAAzB+lB,GACJoB,EAAalqB,MAAO4C,KAAMC,KAAMulB,SAAUA,EAASloB,MAAO4oB,KAGpDoB,GAGRD,IAAK,SAAUjoB,GACd,GAAKA,EAAOzC,EAAO0G,SAClB,MAAOjE,EAIR,IAAIgD,GAAGmgB,EAAMzf,EACZxD,EAAOF,EAAME,KACbwoB,EAAgB1oB,EAChB2oB,EAAU9nB,KAAK+nB,SAAU1oB,EAEpByoB,KACL9nB,KAAK+nB,SAAU1oB,GAASyoB,EACvBtD,GAAY/jB,KAAMpB,GAASW,KAAKgoB,WAChCzD,GAAU9jB,KAAMpB,GAASW,KAAKioB,aAGhCplB,EAAOilB,EAAQI,MAAQloB,KAAKkoB,MAAMjrB,OAAQ6qB,EAAQI,OAAUloB,KAAKkoB,MAEjE/oB,EAAQ,GAAIzC,GAAOiqB,MAAOkB,GAE1B1lB,EAAIU,EAAK3C,MACT,OAAQiC,IACPmgB,EAAOzf,EAAMV,GACbhD,EAAOmjB,GAASuF,EAAevF,EAmBhC,OAdMnjB,GAAM8D,SACX9D,EAAM8D,OAAS4kB,EAAcM,YAAc7rB,GAKb,IAA1B6C,EAAM8D,OAAO1C,WACjBpB,EAAM8D,OAAS9D,EAAM8D,OAAOnC,YAK7B3B,EAAMipB,UAAYjpB,EAAMipB,QAEjBN,EAAQ5X,OAAS4X,EAAQ5X,OAAQ/Q,EAAO0oB,GAAkB1oB,GAIlE+oB,MAAO,wHAAwHlf,MAAM,KAErI+e,YAEAE,UACCC,MAAO,4BAA4Blf,MAAM,KACzCkH,OAAQ,SAAU/Q,EAAOkpB,GAOxB,MAJoB,OAAflpB,EAAMmpB,QACVnpB,EAAMmpB,MAA6B,MAArBD,EAASE,SAAmBF,EAASE,SAAWF,EAASG,SAGjErpB,IAIT6oB,YACCE,MAAO,mGAAmGlf,MAAM,KAChHkH,OAAQ,SAAU/Q,EAAOkpB,GACxB,GAAIvkB,GAAM2kB,EAAUjZ,EACnB0F,EAASmT,EAASnT,OAClBwT,EAAcL,EAASK,WAuBxB,OApBoB,OAAfvpB,EAAMwpB,OAAqC,MAApBN,EAASO,UACpCH,EAAWtpB,EAAM8D,OAAOzC,eAAiBlE,EACzCkT,EAAMiZ,EAASjsB,gBACfsH,EAAO2kB,EAAS3kB,KAEhB3E,EAAMwpB,MAAQN,EAASO,SAAYpZ,GAAOA,EAAIqZ,YAAc/kB,GAAQA,EAAK+kB,YAAc,IAAQrZ,GAAOA,EAAIsZ,YAAchlB,GAAQA,EAAKglB,YAAc,GACnJ3pB,EAAM4pB,MAAQV,EAASW,SAAYxZ,GAAOA,EAAIyZ,WAAcnlB,GAAQA,EAAKmlB,WAAc,IAAQzZ,GAAOA,EAAI0Z,WAAcplB,GAAQA,EAAKolB,WAAc,KAI9I/pB,EAAMgqB,eAAiBT,IAC5BvpB,EAAMgqB,cAAgBT,IAAgBvpB,EAAM8D,OAASolB,EAASe,UAAYV,GAKrEvpB,EAAMmpB,OAASpT,IAAWjZ,IAC/BkD,EAAMmpB,MAAmB,EAATpT,EAAa,EAAe,EAATA,EAAa,EAAe,EAATA,EAAa,EAAI,GAGjE/V,IAITimB,SACCiE,MAECvC,UAAU,GAEXxS,OAECrQ,QAAS,WACR,GAAKjE,OAAS6kB,MAAuB7kB,KAAKsU,MACzC,IAEC,MADAtU,MAAKsU,SACE,EACN,MAAQ1P,MAOZkhB,aAAc,WAEfwD,MACCrlB,QAAS,WACR,MAAKjE,QAAS6kB,MAAuB7kB,KAAKspB,MACzCtpB,KAAKspB,QACE,GAFR,GAKDxD,aAAc,YAEfxH,OAECra,QAAS,WACR,MAAKvH,GAAOmK,SAAU7G,KAAM,UAA2B,aAAdA,KAAKX,MAAuBW,KAAKse,OACzEte,KAAKse,SACE,GAFR,GAOD6I,SAAU,SAAUhoB,GACnB,MAAOzC,GAAOmK,SAAU1H,EAAM8D,OAAQ,OAIxCsmB,cACC5B,aAAc,SAAUxoB,GAGlBA,EAAM4T,SAAW9W,IACrBkD,EAAM0oB,cAAc2B,YAAcrqB,EAAM4T,WAM5C0W,SAAU,SAAUpqB,EAAMU,EAAMZ,EAAOuqB,GAItC,GAAI9kB,GAAIlI,EAAOgG,OACd,GAAIhG,GAAOiqB,MACXxnB,GAECE,KAAMA,EACNsqB,aAAa,EACb9B,kBAGG6B,GACJhtB,EAAOyC,MAAM8E,QAASW,EAAG,KAAM7E,GAE/BrD,EAAOyC,MAAM0mB,SAAS3kB,KAAMnB,EAAM6E,GAE9BA,EAAEsiB,sBACN/nB,EAAM8nB,mBAKTvqB,EAAO4pB,YAAchqB,EAASmD,oBAC7B,SAAUM,EAAMV,EAAMsmB,GAChB5lB,EAAKN,qBACTM,EAAKN,oBAAqBJ,EAAMsmB,GAAQ,IAG1C,SAAU5lB,EAAMV,EAAMsmB,GACrB,GAAI7iB,GAAO,KAAOzD,CAEbU,GAAKL,oBAIGK,GAAM+C,KAAW1G,IAC5B2D,EAAM+C,GAAS,MAGhB/C,EAAKL,YAAaoD,EAAM6iB,KAI3BjpB,EAAOiqB,MAAQ,SAAUhkB,EAAKulB,GAE7B,MAAOloB,gBAAgBtD,GAAOiqB,OAKzBhkB,GAAOA,EAAItD,MACfW,KAAK6nB,cAAgBllB,EACrB3C,KAAKX,KAAOsD,EAAItD,KAIhBW,KAAKknB,mBAAuBvkB,EAAIinB,kBAAoBjnB,EAAI6mB,eAAgB,GACvE7mB,EAAIknB,mBAAqBlnB,EAAIknB,oBAAwBlF,GAAaC,IAInE5kB,KAAKX,KAAOsD,EAIRulB,GACJxrB,EAAOgG,OAAQ1C,KAAMkoB,GAItBloB,KAAK8pB,UAAYnnB,GAAOA,EAAImnB,WAAaptB,EAAO0L,MAGhDpI,KAAMtD,EAAO0G,UAAY,EAvBzB,GAJQ,GAAI1G,GAAOiqB,MAAOhkB,EAAKulB,IAgChCxrB,EAAOiqB,MAAMhnB,WACZunB,mBAAoBtC,GACpBoC,qBAAsBpC,GACtB6C,8BAA+B7C,GAE/BqC,eAAgB,WACf,GAAIriB,GAAI5E,KAAK6nB,aAEb7nB,MAAKknB,mBAAqBvC,GACpB/f,IAKDA,EAAEqiB,eACNriB,EAAEqiB,iBAKFriB,EAAE4kB,aAAc,IAGlB9B,gBAAiB,WAChB,GAAI9iB,GAAI5E,KAAK6nB,aAEb7nB,MAAKgnB,qBAAuBrC,GACtB/f,IAIDA,EAAE8iB,iBACN9iB,EAAE8iB,kBAKH9iB,EAAEmlB,cAAe,IAElBC,yBAA0B,WACzBhqB,KAAKynB,8BAAgC9C,GACrC3kB,KAAK0nB,oBAKPhrB,EAAO+E,MACNwoB,WAAY,YACZC,WAAY,YACV,SAAUC,EAAM/C,GAClB1qB,EAAOyC,MAAMimB,QAAS+E,IACrBrE,aAAcsB,EACdrB,SAAUqB,EAEVzB,OAAQ,SAAUxmB,GACjB,GAAIoC,GACH0B,EAASjD,KACToqB,EAAUjrB,EAAMgqB,cAChB7D,EAAYnmB,EAAMmmB,SASnB,SALM8E,GAAYA,IAAYnnB,IAAWvG,EAAOmN,SAAU5G,EAAQmnB,MACjEjrB,EAAME,KAAOimB,EAAUG,SACvBlkB,EAAM+jB,EAAU3W,QAAQ7M,MAAO9B,KAAM+B,WACrC5C,EAAME,KAAO+nB,GAEP7lB,MAMJ7E,EAAOmI,QAAQwlB,gBAEpB3tB,EAAOyC,MAAMimB,QAAQxP,QACpBsQ,MAAO,WAEN,MAAKxpB,GAAOmK,SAAU7G,KAAM,SACpB,GAIRtD,EAAOyC,MAAMmb,IAAKta,KAAM,iCAAkC,SAAU4E,GAEnE,GAAI7E,GAAO6E,EAAE3B,OACZqnB,EAAO5tB,EAAOmK,SAAU9G,EAAM,UAAarD,EAAOmK,SAAU9G,EAAM,UAAaA,EAAKuqB,KAAOruB,CACvFquB,KAAS5tB,EAAO+jB,MAAO6J,EAAM,mBACjC5tB,EAAOyC,MAAMmb,IAAKgQ,EAAM,iBAAkB,SAAUnrB,GACnDA,EAAMorB,gBAAiB,IAExB7tB,EAAO+jB,MAAO6J,EAAM,iBAAiB,MARvC5tB,IAcDirB,aAAc,SAAUxoB,GAElBA,EAAMorB,uBACHprB,GAAMorB,eACRvqB,KAAKc,aAAe3B,EAAMynB,WAC9BlqB,EAAOyC,MAAMsqB,SAAU,SAAUzpB,KAAKc,WAAY3B,GAAO,KAK5DknB,SAAU,WAET,MAAK3pB,GAAOmK,SAAU7G,KAAM,SACpB,GAIRtD,EAAOyC,MAAMsG,OAAQzF,KAAM,YAA3BtD,MAMGA,EAAOmI,QAAQ2lB,gBAEpB9tB,EAAOyC,MAAMimB,QAAQ7G,QAEpB2H,MAAO,WAEN,MAAK5B,GAAW7jB,KAAMT,KAAK6G,YAIP,aAAd7G,KAAKX,MAAqC,UAAdW,KAAKX,QACrC3C,EAAOyC,MAAMmb,IAAKta,KAAM,yBAA0B,SAAUb,GACjB,YAArCA,EAAM0oB,cAAc4C,eACxBzqB,KAAK0qB,eAAgB,KAGvBhuB,EAAOyC,MAAMmb,IAAKta,KAAM,gBAAiB,SAAUb,GAC7Ca,KAAK0qB,gBAAkBvrB,EAAMynB,YACjC5mB,KAAK0qB,eAAgB,GAGtBhuB,EAAOyC,MAAMsqB,SAAU,SAAUzpB,KAAMb,GAAO,OAGzC,IAGRzC,EAAOyC,MAAMmb,IAAKta,KAAM,yBAA0B,SAAU4E,GAC3D,GAAI7E,GAAO6E,EAAE3B,MAERqhB,GAAW7jB,KAAMV,EAAK8G,YAAenK,EAAO+jB,MAAO1gB,EAAM,mBAC7DrD,EAAOyC,MAAMmb,IAAKva,EAAM,iBAAkB,SAAUZ,IAC9Ca,KAAKc,YAAe3B,EAAMwqB,aAAgBxqB,EAAMynB,WACpDlqB,EAAOyC,MAAMsqB,SAAU,SAAUzpB,KAAKc,WAAY3B,GAAO,KAG3DzC,EAAO+jB,MAAO1gB,EAAM,iBAAiB,MATvCrD,IAcDipB,OAAQ,SAAUxmB,GACjB,GAAIY,GAAOZ,EAAM8D,MAGjB,OAAKjD,QAASD,GAAQZ,EAAMwqB,aAAexqB,EAAMynB,WAA4B,UAAd7mB,EAAKV,MAAkC,aAAdU,EAAKV,KACrFF,EAAMmmB,UAAU3W,QAAQ7M,MAAO9B,KAAM+B,WAD7C,GAKDskB,SAAU,WAGT,MAFA3pB,GAAOyC,MAAMsG,OAAQzF,KAAM,aAEnBskB,EAAW7jB,KAAMT,KAAK6G,aAM3BnK,EAAOmI,QAAQ8lB,gBACpBjuB,EAAO+E,MAAO6S,MAAO,UAAWgV,KAAM,YAAc,SAAUa,EAAM/C,GAGnE,GAAIwD,GAAW,EACdjc,EAAU,SAAUxP,GACnBzC,EAAOyC,MAAMsqB,SAAUrC,EAAKjoB,EAAM8D,OAAQvG,EAAOyC,MAAMioB,IAAKjoB,IAAS,GAGvEzC,GAAOyC,MAAMimB,QAASgC,IACrBlB,MAAO,WACc,IAAf0E,KACJtuB,EAAS8C,iBAAkB+qB,EAAMxb,GAAS,IAG5C0X,SAAU,WACW,MAAbuE,GACNtuB,EAASmD,oBAAqB0qB,EAAMxb,GAAS,OAOlDjS,EAAOsB,GAAG0E,QAETmoB,GAAI,SAAU7F,EAAOlnB,EAAUqH,EAAMnH,EAAiBqlB,GACrD,GAAIhkB,GAAMyrB,CAGV,IAAsB,gBAAV9F,GAAqB,CAEP,gBAAblnB,KAEXqH,EAAOA,GAAQrH,EACfA,EAAW7B,EAEZ,KAAMoD,IAAQ2lB,GACbhlB,KAAK6qB,GAAIxrB,EAAMvB,EAAUqH,EAAM6f,EAAO3lB,GAAQgkB,EAE/C,OAAOrjB,MAmBR,GAhBa,MAARmF,GAAsB,MAANnH,GAEpBA,EAAKF,EACLqH,EAAOrH,EAAW7B,GACD,MAAN+B,IACc,gBAAbF,IAEXE,EAAKmH,EACLA,EAAOlJ,IAGP+B,EAAKmH,EACLA,EAAOrH,EACPA,EAAW7B,IAGR+B,KAAO,EACXA,EAAK4mB,OACC,KAAM5mB,EACZ,MAAOgC,KAaR,OAVa,KAARqjB,IACJyH,EAAS9sB,EACTA,EAAK,SAAUmB,GAGd,MADAzC,KAASwH,IAAK/E,GACP2rB,EAAOhpB,MAAO9B,KAAM+B,YAG5B/D,EAAG6J,KAAOijB,EAAOjjB,OAAUijB,EAAOjjB,KAAOnL,EAAOmL,SAE1C7H,KAAKyB,KAAM,WACjB/E,EAAOyC,MAAMmb,IAAKta,KAAMglB,EAAOhnB,EAAImH,EAAMrH,MAG3CulB,IAAK,SAAU2B,EAAOlnB,EAAUqH,EAAMnH,GACrC,MAAOgC,MAAK6qB,GAAI7F,EAAOlnB,EAAUqH,EAAMnH,EAAI,IAE5CkG,IAAK,SAAU8gB,EAAOlnB,EAAUE,GAC/B,GAAIsnB,GAAWjmB,CACf,IAAK2lB,GAASA,EAAMiC,gBAAkBjC,EAAMM,UAQ3C,MANAA,GAAYN,EAAMM,UAClB5oB,EAAQsoB,EAAMsC,gBAAiBpjB,IAC9BohB,EAAUU,UAAYV,EAAUG,SAAW,IAAMH,EAAUU,UAAYV,EAAUG,SACjFH,EAAUxnB,SACVwnB,EAAU3W,SAEJ3O,IAER,IAAsB,gBAAVglB,GAAqB,CAEhC,IAAM3lB,IAAQ2lB,GACbhlB,KAAKkE,IAAK7E,EAAMvB,EAAUknB,EAAO3lB,GAElC,OAAOW,MAUR,OARKlC,KAAa,GAA6B,kBAAbA,MAEjCE,EAAKF,EACLA,EAAW7B,GAEP+B,KAAO,IACXA,EAAK4mB,IAEC5kB,KAAKyB,KAAK,WAChB/E,EAAOyC,MAAMsG,OAAQzF,KAAMglB,EAAOhnB,EAAIF,MAIxCmG,QAAS,SAAU5E,EAAM8F,GACxB,MAAOnF,MAAKyB,KAAK,WAChB/E,EAAOyC,MAAM8E,QAAS5E,EAAM8F,EAAMnF,SAGpC+qB,eAAgB,SAAU1rB,EAAM8F,GAC/B,GAAIpF,GAAOC,KAAK,EAChB,OAAKD,GACGrD,EAAOyC,MAAM8E,QAAS5E,EAAM8F,EAAMpF,GAAM,GADhD,IAKF,IAAIirB,IAAW,iBACdC,GAAe,iCACfC,GAAgBxuB,EAAO4U,KAAKxR,MAAMoM,aAElCif,IACCC,UAAU,EACVC,UAAU,EACVpK,MAAM,EACNqK,MAAM,EAGR5uB,GAAOsB,GAAG0E,QACTtC,KAAM,SAAUtC,GACf,GAAIqE,GACHZ,KACA6Y,EAAOpa,KACPoC,EAAMgY,EAAKla,MAEZ,IAAyB,gBAAbpC,GACX,MAAOkC,MAAKqB,UAAW3E,EAAQoB,GAAWoS,OAAO,WAChD,IAAM/N,EAAI,EAAOC,EAAJD,EAASA,IACrB,GAAKzF,EAAOmN,SAAUuQ,EAAMjY,GAAKnC,MAChC,OAAO,IAMX,KAAMmC,EAAI,EAAOC,EAAJD,EAASA,IACrBzF,EAAO0D,KAAMtC,EAAUsc,EAAMjY,GAAKZ,EAMnC,OAFAA,GAAMvB,KAAKqB,UAAWe,EAAM,EAAI1F,EAAOwc,OAAQ3X,GAAQA,GACvDA,EAAIzD,SAAWkC,KAAKlC,SAAWkC,KAAKlC,SAAW,IAAMA,EAAWA,EACzDyD,GAGRyS,IAAK,SAAU/Q,GACd,GAAId,GACHopB,EAAU7uB,EAAQuG,EAAQjD,MAC1BoC,EAAMmpB,EAAQrrB,MAEf,OAAOF,MAAKkQ,OAAO,WAClB,IAAM/N,EAAI,EAAOC,EAAJD,EAASA,IACrB,GAAKzF,EAAOmN,SAAU7J,KAAMurB,EAAQppB,IACnC,OAAO,KAMX0R,IAAK,SAAU/V,GACd,MAAOkC,MAAKqB,UAAWmqB,GAAOxrB,KAAMlC,OAAgB,KAGrDoS,OAAQ,SAAUpS,GACjB,MAAOkC,MAAKqB,UAAWmqB,GAAOxrB,KAAMlC,OAAgB,KAGrD2tB,GAAI,SAAU3tB,GACb,QAAS0tB,GACRxrB,KAIoB,gBAAblC,IAAyBotB,GAAczqB,KAAM3C,GACnDpB,EAAQoB,GACRA,OACD,GACCoC,QAGHwrB,QAAS,SAAU1Z,EAAWjU,GAC7B,GAAI+Q,GACH3M,EAAI,EACJqF,EAAIxH,KAAKE,OACTqB,KACAoqB,EAAMT,GAAczqB,KAAMuR,IAAoC,gBAAdA,GAC/CtV,EAAQsV,EAAWjU,GAAWiC,KAAKjC,SACnC,CAEF,MAAYyJ,EAAJrF,EAAOA,IACd,IAAM2M,EAAM9O,KAAKmC,GAAI2M,GAAOA,IAAQ/Q,EAAS+Q,EAAMA,EAAIhO,WAEtD,GAAoB,GAAfgO,EAAIvO,WAAkBorB,EAC1BA,EAAIpR,MAAMzL,GAAO,GAGA,IAAjBA,EAAIvO,UACH7D,EAAO0D,KAAKmQ,gBAAgBzB,EAAKkD,IAAc,CAEhDlD,EAAMvN,EAAIpE,KAAM2R,EAChB,OAKH,MAAO9O,MAAKqB,UAAWE,EAAIrB,OAAS,EAAIxD,EAAOwc,OAAQ3X,GAAQA,IAKhEgZ,MAAO,SAAUxa,GAGhB,MAAMA,GAKe,gBAATA,GACJrD,EAAO2K,QAASrH,KAAK,GAAItD,EAAQqD,IAIlCrD,EAAO2K,QAEbtH,EAAKH,OAASG,EAAK,GAAKA,EAAMC,MAXrBA,KAAK,IAAMA,KAAK,GAAGc,WAAed,KAAKgC,QAAQ4pB,UAAU1rB,OAAS,IAc7Eoa,IAAK,SAAUxc,EAAUC,GACxB,GAAIolB,GAA0B,gBAAbrlB,GACfpB,EAAQoB,EAAUC,GAClBrB,EAAOsE,UAAWlD,GAAYA,EAASyC,UAAazC,GAAaA,GAClEiB,EAAMrC,EAAO2D,MAAOL,KAAKmB,MAAOgiB,EAEjC,OAAOnjB,MAAKqB,UAAW3E,EAAOwc,OAAOna,KAGtC8sB,QAAS,SAAU/tB,GAClB,MAAOkC,MAAKsa,IAAiB,MAAZxc,EAChBkC,KAAKwB,WAAaxB,KAAKwB,WAAW0O,OAAOpS,MAK5C,SAASguB,IAAShd,EAAKsD,GACtB,EACCtD,GAAMA,EAAKsD,SACFtD,GAAwB,IAAjBA,EAAIvO,SAErB,OAAOuO,GAGRpS,EAAO+E,MACNgO,OAAQ,SAAU1P,GACjB,GAAI0P,GAAS1P,EAAKe,UAClB,OAAO2O,IAA8B,KAApBA,EAAOlP,SAAkBkP,EAAS,MAEpDsc,QAAS,SAAUhsB,GAClB,MAAOrD,GAAO0V,IAAKrS,EAAM,eAE1BisB,aAAc,SAAUjsB,EAAMoC,EAAG8pB,GAChC,MAAOvvB,GAAO0V,IAAKrS,EAAM,aAAcksB,IAExChL,KAAM,SAAUlhB,GACf,MAAO+rB,IAAS/rB,EAAM,gBAEvBurB,KAAM,SAAUvrB,GACf,MAAO+rB,IAAS/rB,EAAM,oBAEvBmsB,QAAS,SAAUnsB,GAClB,MAAOrD,GAAO0V,IAAKrS,EAAM,gBAE1B6rB,QAAS,SAAU7rB,GAClB,MAAOrD,GAAO0V,IAAKrS,EAAM,oBAE1BosB,UAAW,SAAUpsB,EAAMoC,EAAG8pB,GAC7B,MAAOvvB,GAAO0V,IAAKrS,EAAM,cAAeksB,IAEzCG,UAAW,SAAUrsB,EAAMoC,EAAG8pB,GAC7B,MAAOvvB,GAAO0V,IAAKrS,EAAM,kBAAmBksB,IAE7CI,SAAU,SAAUtsB,GACnB,MAAOrD,GAAOovB,SAAW/rB,EAAKe,gBAAmBiP,WAAYhQ,IAE9DqrB,SAAU,SAAUrrB,GACnB,MAAOrD,GAAOovB,QAAS/rB,EAAKgQ,aAE7Bsb,SAAU,SAAUtrB,GACnB,MAAOrD,GAAOmK,SAAU9G,EAAM,UAC7BA,EAAKusB,iBAAmBvsB,EAAKwsB,cAAcjwB,SAC3CI,EAAO2D,SAAWN,EAAK2F,cAEvB,SAAU5C,EAAM9E,GAClBtB,EAAOsB,GAAI8E,GAAS,SAAUmpB,EAAOnuB,GACpC,GAAIyD,GAAM7E,EAAO4F,IAAKtC,KAAMhC,EAAIiuB,EAsBhC,OApB0B,UAArBnpB,EAAKzF,MAAO,MAChBS,EAAWmuB,GAGPnuB,GAAgC,gBAAbA,KACvByD,EAAM7E,EAAOwT,OAAQpS,EAAUyD,IAG3BvB,KAAKE,OAAS,IAEZirB,GAAkBroB,KACvBvB,EAAM7E,EAAOwc,OAAQ3X,IAIjB0pB,GAAaxqB,KAAMqC,KACvBvB,EAAMA,EAAIirB,YAILxsB,KAAKqB,UAAWE,MAIzB7E,EAAOgG,QACNwN,OAAQ,SAAUoB,EAAMhQ,EAAOuS,GAC9B,GAAI9T,GAAOuB,EAAO,EAMlB,OAJKuS,KACJvC,EAAO,QAAUA,EAAO,KAGD,IAAjBhQ,EAAMpB,QAAkC,IAAlBH,EAAKQ,SACjC7D,EAAO0D,KAAKmQ,gBAAiBxQ,EAAMuR,IAAWvR,MAC9CrD,EAAO0D,KAAKwJ,QAAS0H,EAAM5U,EAAO+K,KAAMnG,EAAO,SAAUvB,GACxD,MAAyB,KAAlBA,EAAKQ,aAIf6R,IAAK,SAAUrS,EAAMqS,EAAK6Z,GACzB,GAAIrY,MACH9E,EAAM/O,EAAMqS,EAEb,OAAQtD,GAAwB,IAAjBA,EAAIvO,WAAmB0rB,IAAUhwB,GAA8B,IAAjB6S,EAAIvO,WAAmB7D,EAAQoS,GAAM2c,GAAIQ,IAC/E,IAAjBnd,EAAIvO,UACRqT,EAAQzW,KAAM2R,GAEfA,EAAMA,EAAIsD,EAEX,OAAOwB,IAGRkY,QAAS,SAAUW,EAAG1sB,GACrB,GAAI2sB,KAEJ,MAAQD,EAAGA,EAAIA,EAAExd,YACI,IAAfwd,EAAElsB,UAAkBksB,IAAM1sB,GAC9B2sB,EAAEvvB,KAAMsvB,EAIV,OAAOC,KAKT,SAASlB,IAAQja,EAAUob,EAAW9Y,GACrC,GAAKnX,EAAOiE,WAAYgsB,GACvB,MAAOjwB,GAAO+K,KAAM8J,EAAU,SAAUxR,EAAMoC,GAE7C,QAASwqB,EAAUzrB,KAAMnB,EAAMoC,EAAGpC,KAAW8T,GAK/C,IAAK8Y,EAAUpsB,SACd,MAAO7D,GAAO+K,KAAM8J,EAAU,SAAUxR,GACvC,MAASA,KAAS4sB,IAAgB9Y,GAKpC,IAA0B,gBAAd8Y,GAAyB,CACpC,GAAK3B,GAASvqB,KAAMksB,GACnB,MAAOjwB,GAAOwT,OAAQyc,EAAWpb,EAAUsC,EAG5C8Y,GAAYjwB,EAAOwT,OAAQyc,EAAWpb,GAGvC,MAAO7U,GAAO+K,KAAM8J,EAAU,SAAUxR,GACvC,MAASrD,GAAO2K,QAAStH,EAAM4sB,IAAe,IAAQ9Y,IAGxD,QAAS+Y,IAAoBtwB,GAC5B,GAAIyd,GAAO8S,GAAU7jB,MAAO,KAC3B8jB,EAAWxwB,EAAS6hB,wBAErB,IAAK2O,EAASvnB,cACb,MAAQwU,EAAK7Z,OACZ4sB,EAASvnB,cACRwU,EAAKpP,MAIR,OAAOmiB,GAGR,GAAID,IAAY,6JAEfE,GAAgB,6BAChBC,GAAmB7hB,OAAO,OAAS0hB,GAAY,WAAY,KAC3DI,GAAqB,OACrBC,GAAY,0EACZC,GAAW,YACXC,GAAS,UACTC,GAAQ,YACRC,GAAe,0BACfC,GAA8B,wBAE9BC,GAAW,oCACXC,GAAc,4BACdC,GAAoB,cACpBC,GAAe,2CAGfC,IACCxK,QAAU,EAAG,+BAAgC,aAC7CyK,QAAU,EAAG,aAAc,eAC3BC,MAAQ,EAAG,QAAS,UACpBC,OAAS,EAAG,WAAY,aACxBC,OAAS,EAAG,UAAW,YACvBC,IAAM,EAAG,iBAAkB,oBAC3BC,KAAO,EAAG,mCAAoC,uBAC9CC,IAAM,EAAG,qBAAsB,yBAI/BhH,SAAUzqB,EAAOmI,QAAQkY,eAAkB,EAAG,GAAI,KAAS,EAAG,SAAU,WAEzEqR,GAAexB,GAAoBtwB,GACnC+xB,GAAcD,GAAaxe,YAAatT,EAASiJ,cAAc,OAEhEqoB,IAAQU,SAAWV,GAAQxK,OAC3BwK,GAAQ9Q,MAAQ8Q,GAAQW,MAAQX,GAAQY,SAAWZ,GAAQa,QAAUb,GAAQI,MAC7EJ,GAAQc,GAAKd,GAAQO,GAErBzxB,EAAOsB,GAAG0E,QACTuE,KAAM,SAAUF,GACf,MAAOrK,GAAOqL,OAAQ/H,KAAM,SAAU+G,GACrC,MAAOA,KAAU9K,EAChBS,EAAOuK,KAAMjH,MACbA,KAAKgV,QAAQ2Z,QAAU3uB,KAAK,IAAMA,KAAK,GAAGQ,eAAiBlE,GAAWsyB,eAAgB7nB,KACrF,KAAMA,EAAOhF,UAAU7B,SAG3ByuB,OAAQ,WACP,MAAO3uB,MAAK6uB,SAAU9sB,UAAW,SAAUhC,GAC1C,GAAuB,IAAlBC,KAAKO,UAAoC,KAAlBP,KAAKO,UAAqC,IAAlBP,KAAKO,SAAiB,CACzE,GAAI0C,GAAS6rB,GAAoB9uB,KAAMD,EACvCkD,GAAO2M,YAAa7P,OAKvBgvB,QAAS,WACR,MAAO/uB,MAAK6uB,SAAU9sB,UAAW,SAAUhC,GAC1C,GAAuB,IAAlBC,KAAKO,UAAoC,KAAlBP,KAAKO,UAAqC,IAAlBP,KAAKO,SAAiB,CACzE,GAAI0C,GAAS6rB,GAAoB9uB,KAAMD,EACvCkD,GAAO+rB,aAAcjvB,EAAMkD,EAAO8M,gBAKrCkf,OAAQ,WACP,MAAOjvB,MAAK6uB,SAAU9sB,UAAW,SAAUhC,GACrCC,KAAKc,YACTd,KAAKc,WAAWkuB,aAAcjvB,EAAMC,SAKvCkvB,MAAO,WACN,MAAOlvB,MAAK6uB,SAAU9sB,UAAW,SAAUhC,GACrCC,KAAKc,YACTd,KAAKc,WAAWkuB,aAAcjvB,EAAMC,KAAKiP,gBAM5CxJ,OAAQ,SAAU3H,EAAUqxB,GAC3B,GAAIpvB,GACHuB,EAAQxD,EAAWpB,EAAOwT,OAAQpS,EAAUkC,MAASA,KACrDmC,EAAI,CAEL,MAA6B,OAApBpC,EAAOuB,EAAMa,IAAaA,IAE5BgtB,GAA8B,IAAlBpvB,EAAKQ,UACtB7D,EAAOyjB,UAAWiP,GAAQrvB,IAGtBA,EAAKe,aACJquB,GAAYzyB,EAAOmN,SAAU9J,EAAKS,cAAeT,IACrDsvB,GAAeD,GAAQrvB,EAAM,WAE9BA,EAAKe,WAAW0N,YAAazO,GAI/B,OAAOC,OAGRgV,MAAO,WACN,GAAIjV,GACHoC,EAAI,CAEL,MAA4B,OAAnBpC,EAAOC,KAAKmC,IAAaA,IAAM,CAEhB,IAAlBpC,EAAKQ,UACT7D,EAAOyjB,UAAWiP,GAAQrvB,GAAM,GAIjC,OAAQA,EAAKgQ,WACZhQ,EAAKyO,YAAazO,EAAKgQ,WAKnBhQ,GAAKgD,SAAWrG,EAAOmK,SAAU9G,EAAM,YAC3CA,EAAKgD,QAAQ7C,OAAS,GAIxB,MAAOF,OAGRgD,MAAO,SAAUssB,EAAeC,GAI/B,MAHAD,GAAiC,MAAjBA,GAAwB,EAAQA,EAChDC,EAAyC,MAArBA,EAA4BD,EAAgBC,EAEzDvvB,KAAKsC,IAAK,WAChB,MAAO5F,GAAOsG,MAAOhD,KAAMsvB,EAAeC,MAI5CC,KAAM,SAAUzoB,GACf,MAAOrK,GAAOqL,OAAQ/H,KAAM,SAAU+G,GACrC,GAAIhH,GAAOC,KAAK,OACfmC,EAAI,EACJqF,EAAIxH,KAAKE,MAEV,IAAK6G,IAAU9K,EACd,MAAyB,KAAlB8D,EAAKQ,SACXR,EAAK+P,UAAUvM,QAASwpB,GAAe,IACvC9wB,CAIF,MAAsB,gBAAV8K,IAAuBumB,GAAa7sB,KAAMsG,KACnDrK,EAAOmI,QAAQkY,eAAkBiQ,GAAavsB,KAAMsG,KACpDrK,EAAOmI,QAAQgY,mBAAsBoQ,GAAmBxsB,KAAMsG,IAC/D6mB,IAAWT,GAAShtB,KAAM4G,KAAY,GAAI,KAAM,GAAGD,gBAAkB,CAEtEC,EAAQA,EAAMxD,QAAS2pB,GAAW,YAElC,KACC,KAAW1lB,EAAJrF,EAAOA,IAEbpC,EAAOC,KAAKmC,OACW,IAAlBpC,EAAKQ,WACT7D,EAAOyjB,UAAWiP,GAAQrvB,GAAM,IAChCA,EAAK+P,UAAY/I,EAInBhH,GAAO,EAGN,MAAM6E,KAGJ7E,GACJC,KAAKgV,QAAQ2Z,OAAQ5nB,IAEpB,KAAMA,EAAOhF,UAAU7B,SAG3BuvB,YAAa,WACZ,GAEC9tB,GAAOjF,EAAO4F,IAAKtC,KAAM,SAAUD,GAClC,OAASA,EAAKkP,YAAalP,EAAKe,cAEjCqB,EAAI,CAmBL,OAhBAnC,MAAK6uB,SAAU9sB,UAAW,SAAUhC,GACnC,GAAIkhB,GAAOtf,EAAMQ,KAChBsN,EAAS9N,EAAMQ,IAEXsN,KAECwR,GAAQA,EAAKngB,aAAe2O,IAChCwR,EAAOjhB,KAAKiP,aAEbvS,EAAQsD,MAAOyF,SACfgK,EAAOuf,aAAcjvB,EAAMkhB,MAG1B,GAGI9e,EAAInC,KAAOA,KAAKyF,UAGxBlG,OAAQ,SAAUzB,GACjB,MAAOkC,MAAKyF,OAAQ3H,GAAU,IAG/B+wB,SAAU,SAAUltB,EAAMD,EAAUguB,GAGnC/tB,EAAO3E,EAAY8E,SAAWH,EAE9B,IAAIK,GAAOuN,EAAMogB,EAChBrqB,EAASkK,EAAK+M,EACdpa,EAAI,EACJqF,EAAIxH,KAAKE,OACTijB,EAAMnjB,KACN4vB,EAAWpoB,EAAI,EACfT,EAAQpF,EAAK,GACbhB,EAAajE,EAAOiE,WAAYoG,EAGjC,IAAKpG,KAAsB,GAAL6G,GAA2B,gBAAVT,IAAsBrK,EAAOmI,QAAQwZ,aAAemP,GAAS/sB,KAAMsG,GACzG,MAAO/G,MAAKyB,KAAK,SAAU8Y,GAC1B,GAAIH,GAAO+I,EAAIlhB,GAAIsY,EACd5Z,KACJgB,EAAK,GAAKoF,EAAM7F,KAAMlB,KAAMua,EAAOH,EAAKoV,SAEzCpV,EAAKyU,SAAUltB,EAAMD,EAAUguB,IAIjC,IAAKloB,IACJ+U,EAAW7f,EAAO8I,cAAe7D,EAAM3B,KAAM,GAAIQ,eAAe,GAAQkvB,GAAqB1vB,MAC7FgC,EAAQua,EAASxM,WAEmB,IAA/BwM,EAAS7W,WAAWxF,SACxBqc,EAAWva,GAGPA,GAAQ,CAMZ,IALAsD,EAAU5I,EAAO4F,IAAK8sB,GAAQ7S,EAAU,UAAYsT,IACpDF,EAAarqB,EAAQpF,OAITsH,EAAJrF,EAAOA,IACdoN,EAAOgN,EAEFpa,IAAMytB,IACVrgB,EAAO7S,EAAOsG,MAAOuM,GAAM,GAAM,GAG5BogB,GACJjzB,EAAO2D,MAAOiF,EAAS8pB,GAAQ7f,EAAM,YAIvC7N,EAASR,KAAMlB,KAAKmC,GAAIoN,EAAMpN,EAG/B,IAAKwtB,EAOJ,IANAngB,EAAMlK,EAASA,EAAQpF,OAAS,GAAIM,cAGpC9D,EAAO4F,IAAKgD,EAASwqB,IAGf3tB,EAAI,EAAOwtB,EAAJxtB,EAAgBA,IAC5BoN,EAAOjK,EAASnD,GACXsrB,GAAYhtB,KAAM8O,EAAKlQ,MAAQ,MAClC3C,EAAO+jB,MAAOlR,EAAM,eAAkB7S,EAAOmN,SAAU2F,EAAKD,KAExDA,EAAK5M,IAETjG,EAAOqzB,SAAUxgB,EAAK5M,KAEtBjG,EAAO+J,YAAc8I,EAAKtI,MAAQsI,EAAKuC,aAAevC,EAAKO,WAAa,IAAKvM,QAASoqB,GAAc,KAOxGpR,GAAWva,EAAQ,KAIrB,MAAOhC,QAMT,SAAS8uB,IAAoB/uB,EAAMiwB,GAClC,MAAOtzB,GAAOmK,SAAU9G,EAAM,UAC7BrD,EAAOmK,SAA+B,IAArBmpB,EAAQzvB,SAAiByvB,EAAUA,EAAQjgB,WAAY,MAExEhQ,EAAKwG,qBAAqB,SAAS,IAClCxG,EAAK6P,YAAa7P,EAAKS,cAAc+E,cAAc,UACpDxF,EAIF,QAAS8vB,IAAe9vB,GAEvB,MADAA,GAAKV,MAA6C,OAArC3C,EAAO0D,KAAKQ,KAAMb,EAAM,SAAqB,IAAMA,EAAKV,KAC9DU,EAER,QAAS+vB,IAAe/vB,GACvB,GAAID,GAAQ4tB,GAAkBvtB,KAAMJ,EAAKV,KAMzC,OALKS,GACJC,EAAKV,KAAOS,EAAM,GAElBC,EAAKgO,gBAAgB,QAEfhO,EAIR,QAASsvB,IAAe/tB,EAAO2uB,GAC9B,GAAIlwB,GACHoC,EAAI,CACL,MAA6B,OAApBpC,EAAOuB,EAAMa,IAAaA,IAClCzF,EAAO+jB,MAAO1gB,EAAM,cAAekwB,GAAevzB,EAAO+jB,MAAOwP,EAAY9tB,GAAI,eAIlF,QAAS+tB,IAAgBvtB,EAAKwtB,GAE7B,GAAuB,IAAlBA,EAAK5vB,UAAmB7D,EAAO6jB,QAAS5d,GAA7C,CAIA,GAAItD,GAAM8C,EAAGqF,EACZ4oB,EAAU1zB,EAAO+jB,MAAO9d,GACxB0tB,EAAU3zB,EAAO+jB,MAAO0P,EAAMC,GAC9BnL,EAASmL,EAAQnL,MAElB,IAAKA,EAAS,OACNoL,GAAQ1K,OACf0K,EAAQpL,SAER,KAAM5lB,IAAQ4lB,GACb,IAAM9iB,EAAI,EAAGqF,EAAIyd,EAAQ5lB,GAAOa,OAAYsH,EAAJrF,EAAOA,IAC9CzF,EAAOyC,MAAMmb,IAAK6V,EAAM9wB,EAAM4lB,EAAQ5lB,GAAQ8C,IAM5CkuB,EAAQlrB,OACZkrB,EAAQlrB,KAAOzI,EAAOgG,UAAY2tB,EAAQlrB,QAI5C,QAASmrB,IAAoB3tB,EAAKwtB,GACjC,GAAItpB,GAAUjC,EAAGO,CAGjB,IAAuB,IAAlBgrB,EAAK5vB,SAAV,CAOA,GAHAsG,EAAWspB,EAAKtpB,SAASC,eAGnBpK,EAAOmI,QAAQgZ,cAAgBsS,EAAMzzB,EAAO0G,SAAY,CAC7D+B,EAAOzI,EAAO+jB,MAAO0P,EAErB,KAAMvrB,IAAKO,GAAK8f,OACfvoB,EAAO4pB,YAAa6J,EAAMvrB,EAAGO,EAAKwgB,OAInCwK,GAAKpiB,gBAAiBrR,EAAO0G,SAIZ,WAAbyD,GAAyBspB,EAAKlpB,OAAStE,EAAIsE,MAC/C4oB,GAAeM,GAAOlpB,KAAOtE,EAAIsE,KACjC6oB,GAAeK,IAIS,WAAbtpB,GACNspB,EAAKrvB,aACTqvB,EAAK3S,UAAY7a,EAAI6a,WAOjB9gB,EAAOmI,QAAQyY,YAAgB3a,EAAImN,YAAcpT,EAAOmB,KAAKsyB,EAAKrgB,aACtEqgB,EAAKrgB,UAAYnN,EAAImN,YAGE,UAAbjJ,GAAwB0mB,GAA4B9sB,KAAMkC,EAAItD,OAKzE8wB,EAAKI,eAAiBJ,EAAKtb,QAAUlS,EAAIkS,QAIpCsb,EAAKppB,QAAUpE,EAAIoE,QACvBopB,EAAKppB,MAAQpE,EAAIoE,QAKM,WAAbF,EACXspB,EAAKK,gBAAkBL,EAAKrb,SAAWnS,EAAI6tB,iBAInB,UAAb3pB,GAAqC,aAAbA,KACnCspB,EAAKlX,aAAetW,EAAIsW,eAI1Bvc,EAAO+E,MACNgvB,SAAU,SACVC,UAAW,UACX1B,aAAc,SACd2B,YAAa,QACbC,WAAY,eACV,SAAU9tB,EAAMulB,GAClB3rB,EAAOsB,GAAI8E,GAAS,SAAUhF,GAC7B,GAAIwD,GACHa,EAAI,EACJZ,KACAsvB,EAASn0B,EAAQoB,GACjBoE,EAAO2uB,EAAO3wB,OAAS,CAExB,MAAagC,GAALC,EAAWA,IAClBb,EAAQa,IAAMD,EAAOlC,KAAOA,KAAKgD,OAAM,GACvCtG,EAAQm0B,EAAO1uB,IAAMkmB,GAAY/mB,GAGjCpE,EAAU4E,MAAOP,EAAKD,EAAMH,MAG7B,OAAOnB,MAAKqB,UAAWE,KAIzB,SAAS6tB,IAAQrxB,EAASsS,GACzB,GAAI/O,GAAOvB,EACVoC,EAAI,EACJ2uB,QAAe/yB,GAAQwI,uBAAyBnK,EAAoB2B,EAAQwI,qBAAsB8J,GAAO,WACjGtS,GAAQ8P,mBAAqBzR,EAAoB2B,EAAQ8P,iBAAkBwC,GAAO,KACzFpU,CAEF,KAAM60B,EACL,IAAMA,KAAYxvB,EAAQvD,EAAQ2H,YAAc3H,EAA8B,OAApBgC,EAAOuB,EAAMa,IAAaA,KAC7EkO,GAAO3T,EAAOmK,SAAU9G,EAAMsQ,GACnCygB,EAAM3zB,KAAM4C,GAEZrD,EAAO2D,MAAOywB,EAAO1B,GAAQrvB,EAAMsQ,GAKtC,OAAOA,KAAQpU,GAAaoU,GAAO3T,EAAOmK,SAAU9I,EAASsS,GAC5D3T,EAAO2D,OAAStC,GAAW+yB,GAC3BA,EAIF,QAASC,IAAmBhxB,GACtBwtB,GAA4B9sB,KAAMV,EAAKV,QAC3CU,EAAKwwB,eAAiBxwB,EAAK8U,SAI7BnY,EAAOgG,QACNM,MAAO,SAAUjD,EAAMuvB,EAAeC,GACrC,GAAIyB,GAAczhB,EAAMvM,EAAOb,EAAG8uB,EACjCC,EAASx0B,EAAOmN,SAAU9J,EAAKS,cAAeT,EAW/C,IATKrD,EAAOmI,QAAQyY,YAAc5gB,EAAOyc,SAASpZ,KAAUitB,GAAavsB,KAAM,IAAMV,EAAK8G,SAAW,KACpG7D,EAAQjD,EAAKwd,WAAW,IAIxB8Q,GAAYve,UAAY/P,EAAKyd,UAC7B6Q,GAAY7f,YAAaxL,EAAQqrB,GAAYte,eAGvCrT,EAAOmI,QAAQgZ,cAAiBnhB,EAAOmI,QAAQmZ,gBACjC,IAAlBje,EAAKQ,UAAoC,KAAlBR,EAAKQ,UAAqB7D,EAAOyc,SAASpZ,IAOnE,IAJAixB,EAAe5B,GAAQpsB,GACvBiuB,EAAc7B,GAAQrvB,GAGhBoC,EAAI,EAA8B,OAA1BoN,EAAO0hB,EAAY9uB,MAAeA,EAE1C6uB,EAAa7uB,IACjBmuB,GAAoB/gB,EAAMyhB,EAAa7uB,GAM1C,IAAKmtB,EACJ,GAAKC,EAIJ,IAHA0B,EAAcA,GAAe7B,GAAQrvB,GACrCixB,EAAeA,GAAgB5B,GAAQpsB,GAEjCb,EAAI,EAA8B,OAA1BoN,EAAO0hB,EAAY9uB,IAAaA,IAC7C+tB,GAAgB3gB,EAAMyhB,EAAa7uB,QAGpC+tB,IAAgBnwB,EAAMiD,EAaxB,OARAguB,GAAe5B,GAAQpsB,EAAO,UACzBguB,EAAa9wB,OAAS,GAC1BmvB,GAAe2B,GAAeE,GAAU9B,GAAQrvB,EAAM,WAGvDixB,EAAeC,EAAc1hB,EAAO,KAG7BvM,GAGRwC,cAAe,SAAUlE,EAAOvD,EAASuH,EAAS6rB,GACjD,GAAI9uB,GAAGtC,EAAM8J,EACZ5D,EAAKoK,EAAKyM,EAAOsU,EACjB5pB,EAAIlG,EAAMpB,OAGVmxB,EAAOzE,GAAoB7uB,GAE3BuzB,KACAnvB,EAAI,CAEL,MAAYqF,EAAJrF,EAAOA,IAGd,GAFApC,EAAOuB,EAAOa,GAETpC,GAAiB,IAATA,EAGZ,GAA6B,WAAxBrD,EAAO2C,KAAMU,GACjBrD,EAAO2D,MAAOixB,EAAOvxB,EAAKQ,UAAaR,GAASA,OAG1C,IAAMstB,GAAM5sB,KAAMV,GAIlB,CACNkG,EAAMA,GAAOorB,EAAKzhB,YAAa7R,EAAQwH,cAAc,QAGrD8K,GAAQ8c,GAAShtB,KAAMJ,KAAW,GAAI,KAAM,GAAG+G,cAC/CsqB,EAAOxD,GAASvd,IAASud,GAAQzG,SAEjClhB,EAAI6J,UAAYshB,EAAK,GAAKrxB,EAAKwD,QAAS2pB,GAAW,aAAgBkE,EAAK,GAGxE/uB,EAAI+uB,EAAK,EACT,OAAQ/uB,IACP4D,EAAMA,EAAIuN,SASX,KALM9W,EAAOmI,QAAQgY,mBAAqBoQ,GAAmBxsB,KAAMV,IAClEuxB,EAAMn0B,KAAMY,EAAQ6wB,eAAgB3B,GAAmB9sB,KAAMJ,GAAO,MAI/DrD,EAAOmI,QAAQiY,MAAQ,CAG5B/c,EAAe,UAARsQ,GAAoB+c,GAAO3sB,KAAMV,GAI3B,YAAZqxB,EAAK,IAAqBhE,GAAO3sB,KAAMV,GAEtC,EADAkG,EAJDA,EAAI8J,WAOL1N,EAAItC,GAAQA,EAAK2F,WAAWxF,MAC5B,OAAQmC,IACF3F,EAAOmK,SAAWiW,EAAQ/c,EAAK2F,WAAWrD,GAAK,WAAcya,EAAMpX,WAAWxF,QAClFH,EAAKyO,YAAasO,GAKrBpgB,EAAO2D,MAAOixB,EAAOrrB,EAAIP,YAGzBO,EAAI6L,YAAc,EAGlB,OAAQ7L,EAAI8J,WACX9J,EAAIuI,YAAavI,EAAI8J,WAItB9J,GAAMorB,EAAK7d,cAtDX8d,GAAMn0B,KAAMY,EAAQ6wB,eAAgB7uB,GA4DlCkG,IACJorB,EAAK7iB,YAAavI,GAKbvJ,EAAOmI,QAAQuZ,eACpB1hB,EAAO+K,KAAM2nB,GAAQkC,EAAO,SAAWP,IAGxC5uB,EAAI,CACJ,OAASpC,EAAOuxB,EAAOnvB,KAItB,KAAKgvB,GAAmD,KAAtCz0B,EAAO2K,QAAStH,EAAMoxB,MAIxCtnB,EAAWnN,EAAOmN,SAAU9J,EAAKS,cAAeT,GAGhDkG,EAAMmpB,GAAQiC,EAAKzhB,YAAa7P,GAAQ,UAGnC8J,GACJwlB,GAAeppB,GAIXX,GAAU,CACdjD,EAAI,CACJ,OAAStC,EAAOkG,EAAK5D,KACforB,GAAYhtB,KAAMV,EAAKV,MAAQ,KACnCiG,EAAQnI,KAAM4C,GAQlB,MAFAkG,GAAM,KAECorB,GAGRlR,UAAW,SAAU7e,EAAsBse,GAC1C,GAAI7f,GAAMV,EAAM0B,EAAIoE,EACnBhD,EAAI,EACJ2d,EAAcpjB,EAAO0G,QACrB8K,EAAQxR,EAAOwR,MACf0P,EAAgBlhB,EAAOmI,QAAQ+Y,cAC/BwH,EAAU1oB,EAAOyC,MAAMimB,OAExB,MAA6B,OAApBrlB,EAAOuB,EAAMa,IAAaA,IAElC,IAAKyd,GAAcljB,EAAOkjB,WAAY7f,MAErCgB,EAAKhB,EAAM+f,GACX3a,EAAOpE,GAAMmN,EAAOnN,IAER,CACX,GAAKoE,EAAK8f,OACT,IAAM5lB,IAAQ8F,GAAK8f,OACbG,EAAS/lB,GACb3C,EAAOyC,MAAMsG,OAAQ1F,EAAMV,GAI3B3C,EAAO4pB,YAAavmB,EAAMV,EAAM8F,EAAKwgB,OAMnCzX;EAAOnN,WAEJmN,GAAOnN,GAKT6c,QACG7d,GAAM+f,SAEK/f,GAAKgO,kBAAoB3R,EAC3C2D,EAAKgO,gBAAiB+R,GAGtB/f,EAAM+f,GAAgB,KAGvBhjB,EAAgBK,KAAM4D,MAO3BgvB,SAAU,SAAUwB,GACnB,MAAO70B,GAAO80B,MACbD,IAAKA,EACLlyB,KAAM,MACNoyB,SAAU,SACVprB,OAAO,EACP0e,QAAQ,EACR2M,UAAU,OAIbh1B,EAAOsB,GAAG0E,QACTivB,QAAS,SAAUnC,GAClB,GAAK9yB,EAAOiE,WAAY6uB,GACvB,MAAOxvB,MAAKyB,KAAK,SAASU,GACzBzF,EAAOsD,MAAM2xB,QAASnC,EAAKtuB,KAAKlB,KAAMmC,KAIxC,IAAKnC,KAAK,GAAK,CAEd,GAAIoxB,GAAO10B,EAAQ8yB,EAAMxvB,KAAK,GAAGQ,eAAgByB,GAAG,GAAGe,OAAM,EAExDhD,MAAK,GAAGc,YACZswB,EAAKpC,aAAchvB,KAAK,IAGzBoxB,EAAK9uB,IAAI,WACR,GAAIvC,GAAOC,IAEX,OAAQD,EAAKgQ,YAA2C,IAA7BhQ,EAAKgQ,WAAWxP,SAC1CR,EAAOA,EAAKgQ,UAGb,OAAOhQ,KACL4uB,OAAQ3uB,MAGZ,MAAOA,OAGR4xB,UAAW,SAAUpC,GACpB,MAAK9yB,GAAOiE,WAAY6uB,GAChBxvB,KAAKyB,KAAK,SAASU,GACzBzF,EAAOsD,MAAM4xB,UAAWpC,EAAKtuB,KAAKlB,KAAMmC,MAInCnC,KAAKyB,KAAK,WAChB,GAAI2Y,GAAO1d,EAAQsD,MAClBqrB,EAAWjR,EAAKiR,UAEZA,GAASnrB,OACbmrB,EAASsG,QAASnC,GAGlBpV,EAAKuU,OAAQa,MAKhB4B,KAAM,SAAU5B,GACf,GAAI7uB,GAAajE,EAAOiE,WAAY6uB,EAEpC,OAAOxvB,MAAKyB,KAAK,SAASU,GACzBzF,EAAQsD,MAAO2xB,QAAShxB,EAAa6uB,EAAKtuB,KAAKlB,KAAMmC,GAAKqtB,MAI5DqC,OAAQ,WACP,MAAO7xB,MAAKyP,SAAShO,KAAK,WACnB/E,EAAOmK,SAAU7G,KAAM,SAC5BtD,EAAQsD,MAAOyvB,YAAazvB,KAAK0F,cAEhCnD,QAGL,IAAIuvB,IAAQC,GAAWC,GACtBC,GAAS,kBACTC,GAAW,wBACXC,GAAY,4BAGZC,GAAe,4BACfC,GAAU,UACVC,GAAgBnnB,OAAQ,KAAOjN,EAAY,SAAU,KACrDq0B,GAAgBpnB,OAAQ,KAAOjN,EAAY,kBAAmB,KAC9Ds0B,GAAcrnB,OAAQ,YAAcjN,EAAY,IAAK,KACrDu0B,IAAgBC,KAAM,SAEtBC,IAAYC,SAAU,WAAYC,WAAY,SAAU7T,QAAS,SACjE8T,IACCC,cAAe,EACfC,WAAY,KAGbC,IAAc,MAAO,QAAS,SAAU,QACxCC,IAAgB,SAAU,IAAK,MAAO,KAGvC,SAASC,IAAgB1qB,EAAO3F,GAG/B,GAAKA,IAAQ2F,GACZ,MAAO3F,EAIR,IAAIswB,GAAUtwB,EAAK7C,OAAO,GAAGhB,cAAgB6D,EAAKzF,MAAM,GACvDg2B,EAAWvwB,EACXX,EAAI+wB,GAAYhzB,MAEjB,OAAQiC,IAEP,GADAW,EAAOowB,GAAa/wB,GAAMixB,EACrBtwB,IAAQ2F,GACZ,MAAO3F,EAIT,OAAOuwB,GAGR,QAASC,IAAUvzB,EAAMwzB,GAIxB,MADAxzB,GAAOwzB,GAAMxzB,EAC4B,SAAlCrD,EAAO82B,IAAKzzB,EAAM,aAA2BrD,EAAOmN,SAAU9J,EAAKS,cAAeT,GAG1F,QAAS0zB,IAAUliB,EAAUmiB,GAC5B,GAAI1U,GAASjf,EAAM4zB,EAClBzX,KACA3B,EAAQ,EACRra,EAASqR,EAASrR,MAEnB,MAAgBA,EAARqa,EAAgBA,IACvBxa,EAAOwR,EAAUgJ,GACXxa,EAAK0I,QAIXyT,EAAQ3B,GAAU7d,EAAO+jB,MAAO1gB,EAAM,cACtCif,EAAUjf,EAAK0I,MAAMuW,QAChB0U,GAGExX,EAAQ3B,IAAuB,SAAZyE,IACxBjf,EAAK0I,MAAMuW,QAAU,IAMM,KAAvBjf,EAAK0I,MAAMuW,SAAkBsU,GAAUvzB,KAC3Cmc,EAAQ3B,GAAU7d,EAAO+jB,MAAO1gB,EAAM,aAAc6zB,GAAmB7zB,EAAK8G,aAIvEqV,EAAQ3B,KACboZ,EAASL,GAAUvzB,IAEdif,GAAuB,SAAZA,IAAuB2U,IACtCj3B,EAAO+jB,MAAO1gB,EAAM,aAAc4zB,EAAS3U,EAAUtiB,EAAO82B,IAAKzzB,EAAM,aAQ3E,KAAMwa,EAAQ,EAAWra,EAARqa,EAAgBA,IAChCxa,EAAOwR,EAAUgJ,GACXxa,EAAK0I,QAGLirB,GAA+B,SAAvB3zB,EAAK0I,MAAMuW,SAA6C,KAAvBjf,EAAK0I,MAAMuW,UACzDjf,EAAK0I,MAAMuW,QAAU0U,EAAOxX,EAAQ3B,IAAW,GAAK,QAItD,OAAOhJ,GAGR7U,EAAOsB,GAAG0E,QACT8wB,IAAK,SAAU1wB,EAAMiE,GACpB,MAAOrK,GAAOqL,OAAQ/H,KAAM,SAAUD,EAAM+C,EAAMiE,GACjD,GAAI3E,GAAKyxB,EACRvxB,KACAH,EAAI,CAEL,IAAKzF,EAAOyG,QAASL,GAAS,CAI7B,IAHA+wB,EAAS9B,GAAWhyB,GACpBqC,EAAMU,EAAK5C,OAECkC,EAAJD,EAASA,IAChBG,EAAKQ,EAAMX,IAAQzF,EAAO82B,IAAKzzB,EAAM+C,EAAMX,IAAK,EAAO0xB,EAGxD,OAAOvxB,GAGR,MAAOyE,KAAU9K,EAChBS,EAAO+L,MAAO1I,EAAM+C,EAAMiE,GAC1BrK,EAAO82B,IAAKzzB,EAAM+C,IACjBA,EAAMiE,EAAOhF,UAAU7B,OAAS,IAEpCwzB,KAAM,WACL,MAAOD,IAAUzzB,MAAM,IAExB8zB,KAAM,WACL,MAAOL,IAAUzzB,OAElB+zB,OAAQ,SAAUlZ,GACjB,MAAsB,iBAAVA,GACJA,EAAQ7a,KAAK0zB,OAAS1zB,KAAK8zB,OAG5B9zB,KAAKyB,KAAK,WACX6xB,GAAUtzB,MACdtD,EAAQsD,MAAO0zB,OAEfh3B,EAAQsD,MAAO8zB,YAMnBp3B,EAAOgG,QAGNsxB,UACC/W,SACC9b,IAAK,SAAUpB,EAAMk0B,GACpB,GAAKA,EAAW,CAEf,GAAI1yB,GAAMywB,GAAQjyB,EAAM,UACxB,OAAe,KAARwB,EAAa,IAAMA,MAO9B2yB,WACCC,aAAe,EACfC,aAAe,EACfpB,YAAc,EACdqB,YAAc,EACdpX,SAAW,EACXqX,OAAS,EACTC,SAAW,EACXC,QAAU,EACVC,QAAU,EACVvV,MAAQ,GAKTwV,UAECC,QAASj4B,EAAOmI,QAAQqY,SAAW,WAAa,cAIjDzU,MAAO,SAAU1I,EAAM+C,EAAMiE,EAAO6tB,GAEnC,GAAM70B,GAA0B,IAAlBA,EAAKQ,UAAoC,IAAlBR,EAAKQ,UAAmBR,EAAK0I,MAAlE,CAKA,GAAIlH,GAAKlC,EAAM0hB,EACdsS,EAAW32B,EAAOiK,UAAW7D,GAC7B2F,EAAQ1I,EAAK0I,KASd,IAPA3F,EAAOpG,EAAOg4B,SAAUrB,KAAgB32B,EAAOg4B,SAAUrB,GAAaF,GAAgB1qB,EAAO4qB,IAI7FtS,EAAQrkB,EAAOs3B,SAAUlxB,IAAUpG,EAAOs3B,SAAUX,GAG/CtsB,IAAU9K,EAsCd,MAAK8kB,IAAS,OAASA,KAAUxf,EAAMwf,EAAM5f,IAAKpB,GAAM,EAAO60B,MAAa34B,EACpEsF,EAIDkH,EAAO3F,EAhCd,IAVAzD,QAAc0H,GAGA,WAAT1H,IAAsBkC,EAAMixB,GAAQryB,KAAM4G,MAC9CA,GAAUxF,EAAI,GAAK,GAAMA,EAAI,GAAKiD,WAAY9H,EAAO82B,IAAKzzB,EAAM+C,IAEhEzD,EAAO,YAIM,MAAT0H,GAA0B,WAAT1H,GAAqBkF,MAAOwC,KAKpC,WAAT1H,GAAsB3C,EAAOw3B,UAAWb,KAC5CtsB,GAAS,MAKJrK,EAAOmI,QAAQ6Z,iBAA6B,KAAV3X,GAA+C,IAA/BjE,EAAKvF,QAAQ,gBACpEkL,EAAO3F,GAAS,WAIXie,GAAW,OAASA,KAAWha,EAAQga,EAAMoC,IAAKpjB,EAAMgH,EAAO6tB,MAAa34B,IAIjF,IACCwM,EAAO3F,GAASiE,EACf,MAAMnC,OAcX4uB,IAAK,SAAUzzB,EAAM+C,EAAM8xB,EAAOf,GACjC,GAAIzyB,GAAKoQ,EAAKuP,EACbsS,EAAW32B,EAAOiK,UAAW7D,EAyB9B,OAtBAA,GAAOpG,EAAOg4B,SAAUrB,KAAgB32B,EAAOg4B,SAAUrB,GAAaF,GAAgBpzB,EAAK0I,MAAO4qB,IAIlGtS,EAAQrkB,EAAOs3B,SAAUlxB,IAAUpG,EAAOs3B,SAAUX,GAG/CtS,GAAS,OAASA,KACtBvP,EAAMuP,EAAM5f,IAAKpB,GAAM,EAAM60B,IAIzBpjB,IAAQvV,IACZuV,EAAMwgB,GAAQjyB,EAAM+C,EAAM+wB,IAId,WAARriB,GAAoB1O,IAAQgwB,MAChCthB,EAAMshB,GAAoBhwB,IAIZ,KAAV8xB,GAAgBA,GACpBxzB,EAAMoD,WAAYgN,GACXojB,KAAU,GAAQl4B,EAAO4H,UAAWlD,GAAQA,GAAO,EAAIoQ,GAExDA,KAMJxV,EAAOqjB,kBACX0S,GAAY,SAAUhyB,GACrB,MAAO/D,GAAOqjB,iBAAkBtf,EAAM,OAGvCiyB,GAAS,SAAUjyB,EAAM+C,EAAM+xB,GAC9B,GAAIvV,GAAOwV,EAAUC,EACpBd,EAAWY,GAAa9C,GAAWhyB,GAGnCwB,EAAM0yB,EAAWA,EAASe,iBAAkBlyB,IAAUmxB,EAAUnxB,GAAS7G,EACzEwM,EAAQ1I,EAAK0I,KA8Bd,OA5BKwrB,KAES,KAAR1yB,GAAe7E,EAAOmN,SAAU9J,EAAKS,cAAeT,KACxDwB,EAAM7E,EAAO+L,MAAO1I,EAAM+C,IAOtByvB,GAAU9xB,KAAMc,IAAS8wB,GAAQ5xB,KAAMqC,KAG3Cwc,EAAQ7W,EAAM6W,MACdwV,EAAWrsB,EAAMqsB,SACjBC,EAAWtsB,EAAMssB,SAGjBtsB,EAAMqsB,SAAWrsB,EAAMssB,SAAWtsB,EAAM6W,MAAQ/d,EAChDA,EAAM0yB,EAAS3U,MAGf7W,EAAM6W,MAAQA,EACd7W,EAAMqsB,SAAWA,EACjBrsB,EAAMssB,SAAWA,IAIZxzB,IAEGjF,EAASE,gBAAgBy4B,eACpClD,GAAY,SAAUhyB,GACrB,MAAOA,GAAKk1B,cAGbjD,GAAS,SAAUjyB,EAAM+C,EAAM+xB,GAC9B,GAAIK,GAAMC,EAAIC,EACbnB,EAAWY,GAAa9C,GAAWhyB,GACnCwB,EAAM0yB,EAAWA,EAAUnxB,GAAS7G,EACpCwM,EAAQ1I,EAAK0I,KAoCd,OAhCY,OAAPlH,GAAekH,GAASA,EAAO3F,KACnCvB,EAAMkH,EAAO3F,IAUTyvB,GAAU9xB,KAAMc,KAAU4wB,GAAU1xB,KAAMqC,KAG9CoyB,EAAOzsB,EAAMysB,KACbC,EAAKp1B,EAAKs1B,aACVD,EAASD,GAAMA,EAAGD,KAGbE,IACJD,EAAGD,KAAOn1B,EAAKk1B,aAAaC,MAE7BzsB,EAAMysB,KAAgB,aAATpyB,EAAsB,MAAQvB,EAC3CA,EAAMkH,EAAM6sB,UAAY,KAGxB7sB,EAAMysB,KAAOA,EACRE,IACJD,EAAGD,KAAOE,IAIG,KAAR7zB,EAAa,OAASA,GAI/B,SAASg0B,IAAmBx1B,EAAMgH,EAAOyuB,GACxC,GAAI5rB,GAAU0oB,GAAUnyB,KAAM4G,EAC9B,OAAO6C,GAENvG,KAAKiE,IAAK,EAAGsC,EAAS,IAAQ4rB,GAAY,KAAU5rB,EAAS,IAAO,MACpE7C,EAGF,QAAS0uB,IAAsB11B,EAAM+C,EAAM8xB,EAAOc,EAAa7B,GAC9D,GAAI1xB,GAAIyyB,KAAYc,EAAc,SAAW,WAE5C,EAES,UAAT5yB,EAAmB,EAAI,EAEvB0O,EAAM,CAEP,MAAY,EAAJrP,EAAOA,GAAK,EAEJ,WAAVyyB,IACJpjB,GAAO9U,EAAO82B,IAAKzzB,EAAM60B,EAAQ3B,GAAW9wB,IAAK,EAAM0xB,IAGnD6B,GAEW,YAAVd,IACJpjB,GAAO9U,EAAO82B,IAAKzzB,EAAM,UAAYkzB,GAAW9wB,IAAK,EAAM0xB,IAI7C,WAAVe,IACJpjB,GAAO9U,EAAO82B,IAAKzzB,EAAM,SAAWkzB,GAAW9wB,GAAM,SAAS,EAAM0xB,MAIrEriB,GAAO9U,EAAO82B,IAAKzzB,EAAM,UAAYkzB,GAAW9wB,IAAK,EAAM0xB,GAG5C,YAAVe,IACJpjB,GAAO9U,EAAO82B,IAAKzzB,EAAM,SAAWkzB,GAAW9wB,GAAM,SAAS,EAAM0xB,IAKvE,OAAOriB,GAGR,QAASmkB,IAAkB51B,EAAM+C,EAAM8xB,GAGtC,GAAIgB,IAAmB,EACtBpkB,EAAe,UAAT1O,EAAmB/C,EAAKqf,YAAcrf,EAAKgf,aACjD8U,EAAS9B,GAAWhyB,GACpB21B,EAAch5B,EAAOmI,QAAQsa,WAAgE,eAAnDziB,EAAO82B,IAAKzzB,EAAM,aAAa,EAAO8zB,EAKjF,IAAY,GAAPriB,GAAmB,MAAPA,EAAc,CAQ9B,GANAA,EAAMwgB,GAAQjyB,EAAM+C,EAAM+wB,IACf,EAANriB,GAAkB,MAAPA,KACfA,EAAMzR,EAAK0I,MAAO3F,IAIdyvB,GAAU9xB,KAAK+Q,GACnB,MAAOA,EAKRokB,GAAmBF,IAAiBh5B,EAAOmI,QAAQkZ,mBAAqBvM,IAAQzR,EAAK0I,MAAO3F,IAG5F0O,EAAMhN,WAAYgN,IAAS,EAI5B,MAASA,GACRikB,GACC11B,EACA+C,EACA8xB,IAAWc,EAAc,SAAW,WACpCE,EACA/B,GAEE,KAIL,QAASD,IAAoB/sB,GAC5B,GAAI2I,GAAMlT,EACT0iB,EAAUyT,GAAa5rB,EA0BxB,OAxBMmY,KACLA,EAAU6W,GAAehvB,EAAU2I,GAGlB,SAAZwP,GAAuBA,IAE3B8S,IAAWA,IACVp1B,EAAO,kDACN82B,IAAK,UAAW,6BAChB/C,SAAUjhB,EAAIhT,iBAGhBgT,GAAQsiB,GAAO,GAAGvF,eAAiBuF,GAAO,GAAGxF,iBAAkBhwB,SAC/DkT,EAAIsmB,MAAM,+BACVtmB,EAAIumB,QAEJ/W,EAAU6W,GAAehvB,EAAU2I,GACnCsiB,GAAOvyB,UAIRkzB,GAAa5rB,GAAamY,GAGpBA,EAIR,QAAS6W,IAAe/yB,EAAM0M,GAC7B,GAAIzP,GAAOrD,EAAQ8S,EAAIjK,cAAezC,IAAS2tB,SAAUjhB,EAAI1L,MAC5Dkb,EAAUtiB,EAAO82B,IAAKzzB,EAAK,GAAI,UAEhC,OADAA,GAAK0F,SACEuZ,EAGRtiB,EAAO+E,MAAO,SAAU,SAAW,SAAUU,EAAGW,GAC/CpG,EAAOs3B,SAAUlxB,IAChB3B,IAAK,SAAUpB,EAAMk0B,EAAUW,GAC9B,MAAKX,GAGwB,IAArBl0B,EAAKqf,aAAqBgT,GAAa3xB,KAAM/D,EAAO82B,IAAKzzB,EAAM,YACrErD,EAAO6L,KAAMxI,EAAM4yB,GAAS,WAC3B,MAAOgD,IAAkB51B,EAAM+C,EAAM8xB,KAEtCe,GAAkB51B,EAAM+C,EAAM8xB,GAPhC,GAWDzR,IAAK,SAAUpjB,EAAMgH,EAAO6tB,GAC3B,GAAIf,GAASe,GAAS7C,GAAWhyB,EACjC,OAAOw1B,IAAmBx1B,EAAMgH,EAAO6tB,EACtCa,GACC11B,EACA+C,EACA8xB,EACAl4B,EAAOmI,QAAQsa,WAAgE,eAAnDziB,EAAO82B,IAAKzzB,EAAM,aAAa,EAAO8zB,GAClEA,GACG,OAMFn3B,EAAOmI,QAAQoY,UACpBvgB,EAAOs3B,SAAS/W,SACf9b,IAAK,SAAUpB,EAAMk0B,GAEpB,MAAO/B,IAASzxB,MAAOwzB,GAAYl0B,EAAKk1B,aAAel1B,EAAKk1B,aAAa/kB,OAASnQ,EAAK0I,MAAMyH,SAAW,IACrG,IAAO1L,WAAY2G,OAAO6qB,IAAS,GACrC/B,EAAW,IAAM,IAGnB9Q,IAAK,SAAUpjB,EAAMgH,GACpB,GAAI0B,GAAQ1I,EAAK0I,MAChBwsB,EAAel1B,EAAKk1B,aACpBhY,EAAUvgB,EAAO4H,UAAWyC,GAAU,iBAA2B,IAARA,EAAc,IAAM,GAC7EmJ,EAAS+kB,GAAgBA,EAAa/kB,QAAUzH,EAAMyH,QAAU,EAIjEzH,GAAMyW,KAAO,GAINnY,GAAS,GAAe,KAAVA,IAC6B,KAAhDrK,EAAOmB,KAAMqS,EAAO3M,QAAS0uB,GAAQ,MACrCxpB,EAAMsF,kBAKPtF,EAAMsF,gBAAiB,UAGR,KAAVhH,GAAgBkuB,IAAiBA,EAAa/kB,UAMpDzH,EAAMyH,OAAS+hB,GAAOxxB,KAAMyP,GAC3BA,EAAO3M,QAAS0uB,GAAQhV,GACxB/M,EAAS,IAAM+M,MAOnBvgB,EAAO,WACAA,EAAOmI,QAAQiZ,sBACpBphB,EAAOs3B,SAASzU,aACfpe,IAAK,SAAUpB,EAAMk0B,GACpB,MAAKA,GAGGv3B,EAAO6L,KAAMxI,GAAQif,QAAW,gBACtCgT,IAAUjyB,EAAM,gBAJlB,MAaGrD,EAAOmI,QAAQ8Y,eAAiBjhB,EAAOsB,GAAG40B,UAC/Cl2B,EAAO+E,MAAQ,MAAO,QAAU,SAAUU,EAAGmgB,GAC5C5lB,EAAOs3B,SAAU1R,IAChBnhB,IAAK,SAAUpB,EAAMk0B,GACpB,MAAKA,IACJA,EAAWjC,GAAQjyB,EAAMuiB,GAElBiQ,GAAU9xB,KAAMwzB,GACtBv3B,EAAQqD,GAAO6yB,WAAYtQ,GAAS,KACpC2R,GALF,QAcAv3B,EAAO4U,MAAQ5U,EAAO4U,KAAKwE,UAC/BpZ,EAAO4U,KAAKwE,QAAQ6d,OAAS,SAAU5zB,GAGtC,MAA2B,IAApBA,EAAKqf,aAAyC,GAArBrf,EAAKgf,eAClCriB,EAAOmI,QAAQoa,uBAAmG,UAAxElf,EAAK0I,OAAS1I,EAAK0I,MAAMuW,SAAYtiB,EAAO82B,IAAKzzB,EAAM,aAGrGrD,EAAO4U,KAAKwE,QAAQmgB,QAAU,SAAUl2B,GACvC,OAAQrD,EAAO4U,KAAKwE,QAAQ6d,OAAQ5zB,KAKtCrD,EAAO+E,MACNy0B,OAAQ,GACRC,QAAS,GACTC,OAAQ,SACN,SAAUC,EAAQC,GACpB55B,EAAOs3B,SAAUqC,EAASC,IACzBC,OAAQ,SAAUxvB,GACjB,GAAI5E,GAAI,EACPq0B,KAGAC,EAAyB,gBAAV1vB,GAAqBA,EAAMiC,MAAM,MAASjC,EAE1D,MAAY,EAAJ5E,EAAOA,IACdq0B,EAAUH,EAASpD,GAAW9wB,GAAMm0B,GACnCG,EAAOt0B,IAAOs0B,EAAOt0B,EAAI,IAAOs0B,EAAO,EAGzC,OAAOD,KAIHnE,GAAQ5xB,KAAM41B,KACnB35B,EAAOs3B,SAAUqC,EAASC,GAASnT,IAAMoS,KAG3C,IAAImB,IAAM,OACTC,GAAW,QACXC,GAAQ,SACRC,GAAkB,wCAClBC,GAAe,oCAEhBp6B,GAAOsB,GAAG0E,QACTq0B,UAAW,WACV,MAAOr6B,GAAOqxB,MAAO/tB,KAAKg3B,mBAE3BA,eAAgB,WACf,MAAOh3B,MAAKsC,IAAI,WAEf,GAAIiP,GAAW7U,EAAO4lB,KAAMtiB,KAAM,WAClC,OAAOuR,GAAW7U,EAAOsE,UAAWuQ,GAAavR,OAEjDkQ,OAAO,WACP,GAAI7Q,GAAOW,KAAKX,IAEhB,OAAOW,MAAK8C,OAASpG,EAAQsD,MAAOyrB,GAAI,cACvCqL,GAAar2B,KAAMT,KAAK6G,YAAegwB,GAAgBp2B,KAAMpB,KAC3DW,KAAK6U,UAAY0Y,GAA4B9sB,KAAMpB,MAEtDiD,IAAI,SAAUH,EAAGpC,GACjB,GAAIyR,GAAM9U,EAAQsD,MAAOwR,KAEzB,OAAc,OAAPA,EACN,KACA9U,EAAOyG,QAASqO,GACf9U,EAAO4F,IAAKkP,EAAK,SAAUA,GAC1B,OAAS1O,KAAM/C,EAAK+C,KAAMiE,MAAOyK,EAAIjO,QAASqzB,GAAO,YAEpD9zB,KAAM/C,EAAK+C,KAAMiE,MAAOyK,EAAIjO,QAASqzB,GAAO,WAC9Cz1B,SAMLzE,EAAOqxB,MAAQ,SAAUzjB,EAAG2sB,GAC3B,GAAIZ,GACHa,KACA5c,EAAM,SAAU3V,EAAKoC,GAEpBA,EAAQrK,EAAOiE,WAAYoG,GAAUA,IAAqB,MAATA,EAAgB,GAAKA,EACtEmwB,EAAGA,EAAEh3B,QAAWi3B,mBAAoBxyB,GAAQ,IAAMwyB,mBAAoBpwB,GASxE,IALKkwB,IAAgBh7B,IACpBg7B,EAAcv6B,EAAO06B,cAAgB16B,EAAO06B,aAAaH,aAIrDv6B,EAAOyG,QAASmH,IAASA,EAAE1K,SAAWlD,EAAOgE,cAAe4J,GAEhE5N,EAAO+E,KAAM6I,EAAG,WACfgQ,EAAKta,KAAK8C,KAAM9C,KAAK+G,aAMtB,KAAMsvB,IAAU/rB,GACf+sB,GAAahB,EAAQ/rB,EAAG+rB,GAAUY,EAAa3c,EAKjD,OAAO4c,GAAEtpB,KAAM,KAAMrK,QAASmzB,GAAK,KAGpC,SAASW,IAAahB,EAAQlyB,EAAK8yB,EAAa3c,GAC/C,GAAIxX,EAEJ,IAAKpG,EAAOyG,QAASgB,GAEpBzH,EAAO+E,KAAM0C,EAAK,SAAUhC,EAAGm1B,GACzBL,GAAeN,GAASl2B,KAAM41B,GAElC/b,EAAK+b,EAAQiB,GAIbD,GAAahB,EAAS,KAAqB,gBAANiB,GAAiBn1B,EAAI,IAAO,IAAKm1B,EAAGL,EAAa3c,SAIlF,IAAM2c,GAAsC,WAAvBv6B,EAAO2C,KAAM8E,GAQxCmW,EAAK+b,EAAQlyB,OANb,KAAMrB,IAAQqB,GACbkzB,GAAahB,EAAS,IAAMvzB,EAAO,IAAKqB,EAAKrB,GAAQm0B,EAAa3c,GAQrE5d,EAAO+E,KAAM,0MAEqDuH,MAAM,KAAM,SAAU7G,EAAGW,GAG1FpG,EAAOsB,GAAI8E,GAAS,SAAUqC,EAAMnH,GACnC,MAAO+D,WAAU7B,OAAS,EACzBF,KAAK6qB,GAAI/nB,EAAM,KAAMqC,EAAMnH,GAC3BgC,KAAKiE,QAASnB,MAIjBpG,EAAOsB,GAAG0E,QACT60B,MAAO,SAAUC,EAAQC,GACxB,MAAOz3B,MAAKiqB,WAAYuN,GAAStN,WAAYuN,GAASD,IAGvDE,KAAM,SAAU1S,EAAO7f,EAAMnH,GAC5B,MAAOgC,MAAK6qB,GAAI7F,EAAO,KAAM7f,EAAMnH,IAEpC25B,OAAQ,SAAU3S,EAAOhnB,GACxB,MAAOgC,MAAKkE,IAAK8gB,EAAO,KAAMhnB,IAG/B45B,SAAU,SAAU95B,EAAUknB,EAAO7f,EAAMnH,GAC1C,MAAOgC,MAAK6qB,GAAI7F,EAAOlnB,EAAUqH,EAAMnH,IAExC65B,WAAY,SAAU/5B,EAAUknB,EAAOhnB,GAEtC,MAA4B,KAArB+D,UAAU7B,OAAeF,KAAKkE,IAAKpG,EAAU,MAASkC,KAAKkE,IAAK8gB,EAAOlnB,GAAY,KAAME,KAGlG,IAEC85B,IACAC,GACAC,GAAat7B,EAAO0L,MAEpB6vB,GAAc,KACdC,GAAQ,OACRC,GAAM,gBACNC,GAAW,gCAEXC,GAAiB,4DACjBC,GAAa,iBACbC,GAAY,QACZC,GAAO,8CAGPC,GAAQ/7B,EAAOsB,GAAGqrB,KAWlBqP,MAOAC,MAGAC,GAAW,KAAK37B,OAAO,IAIxB,KACC86B,GAAe17B,EAASoY,KACvB,MAAO7P,IAGRmzB,GAAez7B,EAASiJ,cAAe,KACvCwyB,GAAatjB,KAAO,GACpBsjB,GAAeA,GAAatjB,KAI7BqjB,GAAeU,GAAKr4B,KAAM43B,GAAajxB,kBAGvC,SAAS+xB,IAA6BC,GAGrC,MAAO,UAAUC,EAAoBpe,GAED,gBAAvBoe,KACXpe,EAAOoe,EACPA,EAAqB,IAGtB,IAAItH,GACHtvB,EAAI,EACJ62B,EAAYD,EAAmBjyB,cAAchH,MAAO1B,MAErD,IAAK1B,EAAOiE,WAAYga,GAEvB,MAAS8W,EAAWuH,EAAU72B,KAER,MAAhBsvB,EAAS,IACbA,EAAWA,EAASp0B,MAAO,IAAO,KACjCy7B,EAAWrH,GAAaqH,EAAWrH,QAAkBpgB,QAASsJ,KAI9Dme,EAAWrH,GAAaqH,EAAWrH,QAAkBt0B,KAAMwd,IAQjE,QAASse,IAA+BH,EAAW/1B,EAASm2B,EAAiBC,GAE5E,GAAIC,MACHC,EAAqBP,IAAcH,EAEpC,SAASW,GAAS7H,GACjB,GAAI3c,EAYJ,OAXAskB,GAAW3H,IAAa,EACxB/0B,EAAO+E,KAAMq3B,EAAWrH,OAAkB,SAAUhlB,EAAG8sB,GACtD,GAAIC,GAAsBD,EAAoBx2B,EAASm2B,EAAiBC,EACxE,OAAmC,gBAAxBK,IAAqCH,GAAqBD,EAAWI,GAIpEH,IACDvkB,EAAW0kB,GADf,GAHNz2B,EAAQi2B,UAAU3nB,QAASmoB,GAC3BF,EAASE,IACF,KAKF1kB,EAGR,MAAOwkB,GAASv2B,EAAQi2B,UAAW,MAAUI,EAAW,MAASE,EAAS,KAM3E,QAASG,IAAYx2B,EAAQN,GAC5B,GAAIO,GAAMyB,EACT+0B,EAAch9B,EAAO06B,aAAasC,eAEnC,KAAM/0B,IAAOhC,GACPA,EAAKgC,KAAU1I,KACjBy9B,EAAa/0B,GAAQ1B,EAAWC,IAASA,OAAgByB,GAAQhC,EAAKgC,GAO1E,OAJKzB,IACJxG,EAAOgG,QAAQ,EAAMO,EAAQC,GAGvBD,EAGRvG,EAAOsB,GAAGqrB,KAAO,SAAUkI,EAAKoI,EAAQj4B,GACvC,GAAoB,gBAAR6vB,IAAoBkH,GAC/B,MAAOA,IAAM32B,MAAO9B,KAAM+B,UAG3B,IAAIjE,GAAU87B,EAAUv6B,EACvB+a,EAAOpa,KACPkE,EAAMqtB,EAAIh0B,QAAQ,IA+CnB,OA7CK2G,IAAO,IACXpG,EAAWyzB,EAAIl0B,MAAO6G,EAAKqtB,EAAIrxB,QAC/BqxB,EAAMA,EAAIl0B,MAAO,EAAG6G,IAIhBxH,EAAOiE,WAAYg5B,IAGvBj4B,EAAWi4B,EACXA,EAAS19B,GAGE09B,GAA4B,gBAAXA,KAC5Bt6B,EAAO,QAIH+a,EAAKla,OAAS,GAClBxD,EAAO80B,MACND,IAAKA,EAGLlyB,KAAMA,EACNoyB,SAAU,OACVtsB,KAAMw0B,IACJ93B,KAAK,SAAUg4B,GAGjBD,EAAW73B,UAEXqY,EAAKoV,KAAM1xB,EAIVpB,EAAO,SAASiyB,OAAQjyB,EAAO4D,UAAWu5B,IAAiBz5B,KAAMtC,GAGjE+7B,KAECC,SAAUp4B,GAAY,SAAUy3B,EAAOY,GACzC3f,EAAK3Y,KAAMC,EAAUk4B,IAAcT,EAAMU,aAAcE,EAAQZ,MAI1Dn5B,MAIRtD,EAAO+E,MAAQ,YAAa,WAAY,eAAgB,YAAa,cAAe,YAAc,SAAUU,EAAG9C,GAC9G3C,EAAOsB,GAAIqB,GAAS,SAAUrB,GAC7B,MAAOgC,MAAK6qB,GAAIxrB,EAAMrB,MAIxBtB,EAAOgG,QAGNs3B,OAAQ,EAGRC,gBACAC,QAEA9C,cACC7F,IAAKwG,GACL14B,KAAM,MACN86B,QAAS9B,GAAe53B,KAAMq3B,GAAc,IAC5C/S,QAAQ,EACRqV,aAAa,EACb/zB,OAAO,EACPg0B,YAAa,mDAabC,SACCC,IAAK3B,GACL3xB,KAAM,aACNuoB,KAAM,YACNxpB,IAAK,4BACLw0B,KAAM,qCAGPnP,UACCrlB,IAAK,MACLwpB,KAAM,OACNgL,KAAM,QAGPC,gBACCz0B,IAAK,cACLiB,KAAM,eACNuzB,KAAM,gBAKPE,YAGCC,SAAUj2B,OAGVk2B,aAAa,EAGbC,YAAan+B,EAAOiJ,UAGpBm1B,WAAYp+B,EAAOqJ,UAOpB2zB,aACCnI,KAAK,EACLxzB,SAAS,IAOXg9B,UAAW,SAAU93B,EAAQ+3B,GAC5B,MAAOA,GAGNvB,GAAYA,GAAYx2B,EAAQvG,EAAO06B,cAAgB4D,GAGvDvB,GAAY/8B,EAAO06B,aAAcn0B,IAGnCg4B,cAAepC,GAA6BH,IAC5CwC,cAAerC,GAA6BF,IAG5CnH,KAAM,SAAUD,EAAKxuB,GAGA,gBAARwuB,KACXxuB,EAAUwuB,EACVA,EAAMt1B,GAIP8G,EAAUA,KAEV,IACC0zB,GAEAt0B,EAEAg5B,EAEAC,EAEAC,EAGAC,EAEAC,EAEAC,EAEAtE,EAAIx6B,EAAOq+B,aAAeh4B,GAE1B04B,EAAkBvE,EAAEn5B,SAAWm5B,EAE/BwE,EAAqBxE,EAAEn5B,UAAa09B,EAAgBl7B,UAAYk7B,EAAgB77B,QAC/ElD,EAAQ++B,GACR/+B,EAAOyC,MAER4b,EAAWre,EAAOgM,WAClBizB,EAAmBj/B,EAAO8c,UAAU,eAEpCoiB,EAAa1E,EAAE0E,eAEfC,KACAC,KAEAjhB,EAAQ,EAERkhB,EAAW,WAEX5C,GACC75B,WAAY,EAGZ08B,kBAAmB,SAAUr3B,GAC5B,GAAI7E,EACJ,IAAe,IAAV+a,EAAc,CAClB,IAAM2gB,EAAkB,CACvBA,IACA,OAAS17B,EAAQs4B,GAASj4B,KAAMi7B,GAC/BI,EAAiB17B,EAAM,GAAGgH,eAAkBhH,EAAO,GAGrDA,EAAQ07B,EAAiB72B,EAAImC,eAE9B,MAAgB,OAAThH,EAAgB,KAAOA,GAI/Bm8B,sBAAuB,WACtB,MAAiB,KAAVphB,EAAcugB,EAAwB,MAI9Cc,iBAAkB,SAAUp5B,EAAMiE,GACjC,GAAIo1B,GAAQr5B,EAAKgE,aAKjB,OAJM+T,KACL/X,EAAOg5B,EAAqBK,GAAUL,EAAqBK,IAAWr5B,EACtE+4B,EAAgB/4B,GAASiE,GAEnB/G,MAIRo8B,iBAAkB,SAAU/8B,GAI3B,MAHMwb,KACLqc,EAAEmF,SAAWh9B,GAEPW,MAIR47B,WAAY,SAAUt5B,GACrB,GAAIg6B,EACJ,IAAKh6B,EACJ,GAAa,EAARuY,EACJ,IAAMyhB,IAAQh6B,GAEbs5B,EAAYU,IAAWV,EAAYU,GAAQh6B,EAAKg6B,QAIjDnD,GAAMre,OAAQxY,EAAK62B,EAAMY,QAG3B,OAAO/5B,OAIRu8B,MAAO,SAAUC,GAChB,GAAIC,GAAYD,GAAcT,CAK9B,OAJKR,IACJA,EAAUgB,MAAOE,GAElB56B,EAAM,EAAG46B,GACFz8B,MAwCV,IAnCA+a,EAASnZ,QAASu3B,GAAQW,SAAW6B,EAAiBrhB,IACtD6e,EAAMuD,QAAUvD,EAAMt3B,KACtBs3B,EAAMn0B,MAAQm0B,EAAMne,KAMpBkc,EAAE3F,MAAUA,GAAO2F,EAAE3F,KAAOwG,IAAiB,IAAKx0B,QAAS20B,GAAO,IAAK30B,QAASg1B,GAAWT,GAAc,GAAM,MAG/GZ,EAAE73B,KAAO0D,EAAQ45B,QAAU55B,EAAQ1D,MAAQ63B,EAAEyF,QAAUzF,EAAE73B,KAGzD63B,EAAE8B,UAAYt8B,EAAOmB,KAAMq5B,EAAEzF,UAAY,KAAM3qB,cAAchH,MAAO1B,KAAqB,IAGnE,MAAjB84B,EAAE0F,cACNnG,EAAQ+B,GAAKr4B,KAAM+2B,EAAE3F,IAAIzqB,eACzBowB,EAAE0F,eAAkBnG,GACjBA,EAAO,KAAQqB,GAAc,IAAOrB,EAAO,KAAQqB,GAAc,KAChErB,EAAO,KAAwB,UAAfA,EAAO,GAAkB,KAAO,WAC/CqB,GAAc,KAA+B,UAAtBA,GAAc,GAAkB,KAAO,UAK/DZ,EAAE/xB,MAAQ+xB,EAAEkD,aAAiC,gBAAXlD,GAAE/xB,OACxC+xB,EAAE/xB,KAAOzI,EAAOqxB,MAAOmJ,EAAE/xB,KAAM+xB,EAAED,cAIlCgC,GAA+BP,GAAYxB,EAAGn0B,EAASo2B,GAGxC,IAAVte,EACJ,MAAOse,EAIRmC,GAAcpE,EAAEnS,OAGXuW,GAAmC,IAApB5+B,EAAOs9B,UAC1Bt9B,EAAOyC,MAAM8E,QAAQ,aAItBizB,EAAE73B,KAAO63B,EAAE73B,KAAKJ,cAGhBi4B,EAAE2F,YAAcvE,GAAW73B,KAAMy2B,EAAE73B,MAInC87B,EAAWjE,EAAE3F,IAGP2F,EAAE2F,aAGF3F,EAAE/xB,OACNg2B,EAAajE,EAAE3F,MAAS0G,GAAYx3B,KAAM06B,GAAa,IAAM,KAAQjE,EAAE/xB,WAEhE+xB,GAAE/xB,MAIL+xB,EAAEhpB,SAAU,IAChBgpB,EAAE3F,IAAM4G,GAAI13B,KAAM06B,GAGjBA,EAAS53B,QAAS40B,GAAK,OAASH,MAGhCmD,GAAalD,GAAYx3B,KAAM06B,GAAa,IAAM,KAAQ,KAAOnD,OAK/Dd,EAAE4F,aACDpgC,EAAOu9B,aAAckB,IACzBhC,EAAM+C,iBAAkB,oBAAqBx/B,EAAOu9B,aAAckB,IAE9Dz+B,EAAOw9B,KAAMiB,IACjBhC,EAAM+C,iBAAkB,gBAAiBx/B,EAAOw9B,KAAMiB,MAKnDjE,EAAE/xB,MAAQ+xB,EAAE2F,YAAc3F,EAAEmD,eAAgB,GAASt3B,EAAQs3B,cACjElB,EAAM+C,iBAAkB,eAAgBhF,EAAEmD,aAI3ClB,EAAM+C,iBACL,SACAhF,EAAE8B,UAAW,IAAO9B,EAAEoD,QAASpD,EAAE8B,UAAU,IAC1C9B,EAAEoD,QAASpD,EAAE8B,UAAU,KAA8B,MAArB9B,EAAE8B,UAAW,GAAc,KAAOJ,GAAW,WAAa,IAC1F1B,EAAEoD,QAAS,KAIb,KAAMn4B,IAAK+0B,GAAE6F,QACZ5D,EAAM+C,iBAAkB/5B,EAAG+0B,EAAE6F,QAAS56B,GAIvC,IAAK+0B,EAAE8F,aAAgB9F,EAAE8F,WAAW97B,KAAMu6B,EAAiBtC,EAAOjC,MAAQ,GAAmB,IAAVrc,GAElF,MAAOse,GAAMoD,OAIdR,GAAW,OAGX,KAAM55B,KAAOu6B,QAAS,EAAG13B,MAAO,EAAG80B,SAAU,GAC5CX,EAAOh3B,GAAK+0B,EAAG/0B,GAOhB,IAHAo5B,EAAYtC,GAA+BN,GAAYzB,EAAGn0B,EAASo2B,GAK5D,CACNA,EAAM75B,WAAa,EAGdg8B,GACJI,EAAmBz3B,QAAS,YAAck1B,EAAOjC,IAG7CA,EAAE7wB,OAAS6wB,EAAE1V,QAAU,IAC3B6Z,EAAet3B,WAAW,WACzBo1B,EAAMoD,MAAM,YACVrF,EAAE1V,SAGN,KACC3G,EAAQ,EACR0gB,EAAU0B,KAAMpB,EAAgBh6B,GAC/B,MAAQ+C,GAET,KAAa,EAARiW,GAIJ,KAAMjW,EAHN/C,GAAM,GAAI+C,QArBZ/C,GAAM,GAAI,eA8BX,SAASA,GAAMk4B,EAAQmD,EAAkBC,EAAWJ,GACnD,GAAIK,GAAWV,EAAS13B,EAAO40B,EAAUyD,EACxCb,EAAaU,CAGC,KAAVriB,IAKLA,EAAQ,EAGHwgB,GACJ5Z,aAAc4Z,GAKfE,EAAYt/B,EAGZm/B,EAAwB2B,GAAW,GAGnC5D,EAAM75B,WAAay6B,EAAS,EAAI,EAAI,EAGpCqD,EAAYrD,GAAU,KAAgB,IAATA,GAA2B,MAAXA,EAGxCoD,IACJvD,EAAW0D,GAAqBpG,EAAGiC,EAAOgE,IAI3CvD,EAAW2D,GAAarG,EAAG0C,EAAUT,EAAOiE,GAGvCA,GAGClG,EAAE4F,aACNO,EAAWlE,EAAM6C,kBAAkB,iBAC9BqB,IACJ3gC,EAAOu9B,aAAckB,GAAakC,GAEnCA,EAAWlE,EAAM6C,kBAAkB,QAC9BqB,IACJ3gC,EAAOw9B,KAAMiB,GAAakC,IAKZ,MAAXtD,GAA6B,SAAX7C,EAAE73B,KACxBm9B,EAAa,YAGS,MAAXzC,EACXyC,EAAa,eAIbA,EAAa5C,EAAS/e,MACtB6hB,EAAU9C,EAASz0B,KACnBH,EAAQ40B,EAAS50B,MACjBo4B,GAAap4B,KAKdA,EAAQw3B,GACHzC,IAAWyC,KACfA,EAAa,QACC,EAATzC,IACJA,EAAS,KAMZZ,EAAMY,OAASA,EACfZ,EAAMqD,YAAeU,GAAoBV,GAAe,GAGnDY,EACJriB,EAAS/W,YAAay3B,GAAmBiB,EAASF,EAAYrD,IAE9Dpe,EAASyiB,WAAY/B,GAAmBtC,EAAOqD,EAAYx3B,IAI5Dm0B,EAAMyC,WAAYA,GAClBA,EAAa3/B,EAERq/B,GACJI,EAAmBz3B,QAASm5B,EAAY,cAAgB,aACrDjE,EAAOjC,EAAGkG,EAAYV,EAAU13B,IAIpC22B,EAAiBjhB,SAAU+gB,GAAmBtC,EAAOqD,IAEhDlB,IACJI,EAAmBz3B,QAAS,gBAAkBk1B,EAAOjC,MAE3Cx6B,EAAOs9B,QAChBt9B,EAAOyC,MAAM8E,QAAQ,cAKxB,MAAOk1B,IAGRsE,QAAS,SAAUlM,EAAKpsB,EAAMzD,GAC7B,MAAOhF,GAAOyE,IAAKowB,EAAKpsB,EAAMzD,EAAU,SAGzCg8B,UAAW,SAAUnM,EAAK7vB,GACzB,MAAOhF,GAAOyE,IAAKowB,EAAKt1B,EAAWyF,EAAU,aAI/ChF,EAAO+E,MAAQ,MAAO,QAAU,SAAUU,EAAGw6B,GAC5CjgC,EAAQigC,GAAW,SAAUpL,EAAKpsB,EAAMzD,EAAUrC,GAQjD,MANK3C,GAAOiE,WAAYwE,KACvB9F,EAAOA,GAAQqC,EACfA,EAAWyD,EACXA,EAAOlJ,GAGDS,EAAO80B,MACbD,IAAKA,EACLlyB,KAAMs9B,EACNlL,SAAUpyB,EACV8F,KAAMA,EACNu3B,QAASh7B,MASZ,SAAS47B,IAAqBpG,EAAGiC,EAAOgE,GACvC,GAAIQ,GAAeC,EAAIC,EAAex+B,EACrCgsB,EAAW6L,EAAE7L,SACb2N,EAAY9B,EAAE8B,SAGf,OAA0B,MAAnBA,EAAW,GACjBA,EAAU5qB,QACLwvB,IAAO3hC,IACX2hC,EAAK1G,EAAEmF,UAAYlD,EAAM6C,kBAAkB,gBAK7C,IAAK4B,EACJ,IAAMv+B,IAAQgsB,GACb,GAAKA,EAAUhsB,IAAUgsB,EAAUhsB,GAAOoB,KAAMm9B,GAAO,CACtD5E,EAAU3nB,QAAShS,EACnB,OAMH,GAAK25B,EAAW,IAAOmE,GACtBU,EAAgB7E,EAAW,OACrB,CAEN,IAAM35B,IAAQ89B,GAAY,CACzB,IAAMnE,EAAW,IAAO9B,EAAEwD,WAAYr7B,EAAO,IAAM25B,EAAU,IAAO,CACnE6E,EAAgBx+B,CAChB,OAEKs+B,IACLA,EAAgBt+B,GAIlBw+B,EAAgBA,GAAiBF,EAMlC,MAAKE,IACCA,IAAkB7E,EAAW,IACjCA,EAAU3nB,QAASwsB,GAEbV,EAAWU,IAJnB,EAWD,QAASN,IAAarG,EAAG0C,EAAUT,EAAOiE,GACzC,GAAIU,GAAOC,EAASC,EAAM/3B,EAAKqlB,EAC9BoP,KAEA1B,EAAY9B,EAAE8B,UAAU37B,OAGzB,IAAK27B,EAAW,GACf,IAAMgF,IAAQ9G,GAAEwD,WACfA,EAAYsD,EAAKl3B,eAAkBowB,EAAEwD,WAAYsD,EAInDD,GAAU/E,EAAU5qB,OAGpB,OAAQ2vB,EAcP,GAZK7G,EAAEuD,eAAgBsD,KACtB5E,EAAOjC,EAAEuD,eAAgBsD,IAAcnE,IAIlCtO,GAAQ8R,GAAalG,EAAE+G,aAC5BrE,EAAW1C,EAAE+G,WAAYrE,EAAU1C,EAAEzF,WAGtCnG,EAAOyS,EACPA,EAAU/E,EAAU5qB,QAKnB,GAAiB,MAAZ2vB,EAEJA,EAAUzS,MAGJ,IAAc,MAATA,GAAgBA,IAASyS,EAAU,CAM9C,GAHAC,EAAOtD,EAAYpP,EAAO,IAAMyS,IAAarD,EAAY,KAAOqD,IAG1DC,EACL,IAAMF,IAASpD,GAId,GADAz0B,EAAM63B,EAAM90B,MAAO,KACd/C,EAAK,KAAQ83B,IAGjBC,EAAOtD,EAAYpP,EAAO,IAAMrlB,EAAK,KACpCy0B,EAAY,KAAOz0B,EAAK,KACb,CAEN+3B,KAAS,EACbA,EAAOtD,EAAYoD,GAGRpD,EAAYoD,MAAY,IACnCC,EAAU93B,EAAK,GACf+yB,EAAU3nB,QAASpL,EAAK,IAEzB,OAOJ,GAAK+3B,KAAS,EAGb,GAAKA,GAAQ9G,EAAG,UACf0C,EAAWoE,EAAMpE,OAEjB,KACCA,EAAWoE,EAAMpE,GAChB,MAAQh1B,GACT,OAASiW,MAAO,cAAe7V,MAAOg5B,EAAOp5B,EAAI,sBAAwB0mB,EAAO,OAASyS,IAQ/F,OAASljB,MAAO,UAAW1V,KAAMy0B,GAGlCl9B,EAAOq+B,WACNT,SACC4D,OAAQ,6FAET7S,UACC6S,OAAQ,uBAETxD,YACCyD,cAAe,SAAUl3B,GAExB,MADAvK,GAAO+J,WAAYQ,GACZA,MAMVvK,EAAOu+B,cAAe,SAAU,SAAU/D,GACpCA,EAAEhpB,QAAUjS,IAChBi7B,EAAEhpB,OAAQ,GAENgpB,EAAE0F,cACN1F,EAAE73B,KAAO,MACT63B,EAAEnS,QAAS,KAKbroB,EAAOw+B,cAAe,SAAU,SAAShE,GAGxC,GAAKA,EAAE0F,YAAc,CAEpB,GAAIsB,GACHE,EAAO9hC,EAAS8hC,MAAQ1hC,EAAO,QAAQ,IAAMJ,EAASE,eAEvD,QAECygC,KAAM,SAAUxwB,EAAG/K,GAElBw8B,EAAS5hC,EAASiJ,cAAc,UAEhC24B,EAAO73B,OAAQ,EAEV6wB,EAAEmH,gBACNH,EAAOI,QAAUpH,EAAEmH,eAGpBH,EAAOv7B,IAAMu0B,EAAE3F,IAGf2M,EAAOK,OAASL,EAAOM,mBAAqB,SAAU/xB,EAAGgyB,IAEnDA,IAAYP,EAAO5+B,YAAc,kBAAkBmB,KAAMy9B,EAAO5+B,eAGpE4+B,EAAOK,OAASL,EAAOM,mBAAqB,KAGvCN,EAAOp9B,YACXo9B,EAAOp9B,WAAW0N,YAAa0vB,GAIhCA,EAAS,KAGHO,GACL/8B,EAAU,IAAK,aAOlB08B,EAAKpP,aAAckP,EAAQE,EAAKruB,aAGjCwsB,MAAO,WACD2B,GACJA,EAAOK,OAAQtiC,GAAW,OAM/B,IAAIyiC,OACHC,GAAS,mBAGVjiC,GAAOq+B,WACN6D,MAAO,WACPC,cAAe,WACd,GAAIn9B,GAAWg9B,GAAa/zB,OAAWjO,EAAO0G,QAAU,IAAQ40B,IAEhE,OADAh4B,MAAM0B,IAAa,EACZA,KAKThF,EAAOu+B,cAAe,aAAc,SAAU/D,EAAG4H,EAAkB3F,GAElE,GAAI4F,GAAcC,EAAaC,EAC9BC,EAAWhI,EAAE0H,SAAU,IAAWD,GAAOl+B,KAAMy2B,EAAE3F,KAChD,MACkB,gBAAX2F,GAAE/xB,QAAwB+xB,EAAEmD,aAAe,IAAK98B,QAAQ,sCAAwCohC,GAAOl+B,KAAMy2B,EAAE/xB,OAAU,OAIlI,OAAK+5B,IAAiC,UAArBhI,EAAE8B,UAAW,IAG7B+F,EAAe7H,EAAE2H,cAAgBniC,EAAOiE,WAAYu2B,EAAE2H,eACrD3H,EAAE2H,gBACF3H,EAAE2H,cAGEK,EACJhI,EAAGgI,GAAahI,EAAGgI,GAAW37B,QAASo7B,GAAQ,KAAOI,GAC3C7H,EAAE0H,SAAU,IACvB1H,EAAE3F,MAAS0G,GAAYx3B,KAAMy2B,EAAE3F,KAAQ,IAAM,KAAQ2F,EAAE0H,MAAQ,IAAMG,GAItE7H,EAAEwD,WAAW,eAAiB,WAI7B,MAHMuE,IACLviC,EAAOsI,MAAO+5B,EAAe,mBAEvBE,EAAmB,IAI3B/H,EAAE8B,UAAW,GAAM,OAGnBgG,EAAchjC,EAAQ+iC,GACtB/iC,EAAQ+iC,GAAiB,WACxBE,EAAoBl9B,WAIrBo3B,EAAMre,OAAO,WAEZ9e,EAAQ+iC,GAAiBC,EAGpB9H,EAAG6H,KAEP7H,EAAE2H,cAAgBC,EAAiBD,cAGnCH,GAAavhC,KAAM4hC,IAIfE,GAAqBviC,EAAOiE,WAAYq+B,IAC5CA,EAAaC,EAAmB,IAGjCA,EAAoBD,EAAc/iC,IAI5B,UAtDR,GAyDD,IAAIkjC,IAAcC,GACjBC,GAAQ,EAERC,GAAmBtjC,EAAOoK,eAAiB,WAE1C,GAAIzB,EACJ,KAAMA,IAAOw6B,IACZA,GAAcx6B,GAAO1I,GAAW,GAKnC,SAASsjC,MACR,IACC,MAAO,IAAIvjC,GAAOwjC,eACjB,MAAO56B,KAGV,QAAS66B,MACR,IACC,MAAO,IAAIzjC,GAAOoK,cAAc,qBAC/B,MAAOxB,KAKVlI,EAAO06B,aAAasI,IAAM1jC,EAAOoK,cAOhC,WACC,OAAQpG,KAAKm6B,SAAWoF,MAAuBE,MAGhDF,GAGDH,GAAe1iC,EAAO06B,aAAasI,MACnChjC,EAAOmI,QAAQ86B,OAASP,IAAkB,mBAAqBA,IAC/DA,GAAe1iC,EAAOmI,QAAQ2sB,OAAS4N,GAGlCA,IAEJ1iC,EAAOw+B,cAAc,SAAUhE,GAE9B,IAAMA,EAAE0F,aAAelgC,EAAOmI,QAAQ86B,KAAO,CAE5C,GAAIj+B,EAEJ,QACCu7B,KAAM,SAAUF,EAASjD,GAGxB,GAAInU,GAAQxjB,EACXu9B,EAAMxI,EAAEwI,KAWT,IAPKxI,EAAE0I,SACNF,EAAIG,KAAM3I,EAAE73B,KAAM63B,EAAE3F,IAAK2F,EAAE7wB,MAAO6wB,EAAE0I,SAAU1I,EAAExhB,UAEhDgqB,EAAIG,KAAM3I,EAAE73B,KAAM63B,EAAE3F,IAAK2F,EAAE7wB,OAIvB6wB,EAAE4I,UACN,IAAM39B,IAAK+0B,GAAE4I,UACZJ,EAAKv9B,GAAM+0B,EAAE4I,UAAW39B,EAKrB+0B,GAAEmF,UAAYqD,EAAItD,kBACtBsD,EAAItD,iBAAkBlF,EAAEmF,UAQnBnF,EAAE0F,aAAgBG,EAAQ,sBAC/BA,EAAQ,oBAAsB,iBAI/B,KACC,IAAM56B,IAAK46B,GACV2C,EAAIxD,iBAAkB/5B,EAAG46B,EAAS56B,IAElC,MAAO2iB,IAKT4a,EAAIzC,KAAQ/F,EAAE2F,YAAc3F,EAAE/xB,MAAU,MAGxCzD,EAAW,SAAU+K,EAAGgyB,GACvB,GAAI1E,GAAQyB,EAAiBgB,EAAYW,CAKzC,KAGC,GAAKz7B,IAAc+8B,GAA8B,IAAnBiB,EAAIpgC,YAcjC,GAXAoC,EAAWzF,EAGN0pB,IACJ+Z,EAAIlB,mBAAqB9hC,EAAO8J,KAC3B84B,UACGH,IAAcxZ,IAKlB8Y,EAEoB,IAAnBiB,EAAIpgC,YACRogC,EAAInD,YAEC,CACNY,KACApD,EAAS2F,EAAI3F,OACbyB,EAAkBkE,EAAIzD,wBAIW,gBAArByD,GAAI7F,eACfsD,EAAUl2B,KAAOy4B,EAAI7F,aAKtB,KACC2C,EAAakD,EAAIlD,WAChB,MAAO53B,GAER43B,EAAa,GAQRzC,IAAU7C,EAAEiD,SAAYjD,EAAE0F,YAGT,OAAX7C,IACXA,EAAS,KAHTA,EAASoD,EAAUl2B,KAAO,IAAM,KAOlC,MAAO84B,GACFtB,GACL3E,EAAU,GAAIiG,GAKX5C,GACJrD,EAAUC,EAAQyC,EAAYW,EAAW3B,IAIrCtE,EAAE7wB,MAGuB,IAAnBq5B,EAAIpgC,WAGfyE,WAAYrC,IAEZikB,IAAW0Z,GACNC,KAGEH,KACLA,MACAziC,EAAQV,GAASgkC,OAAQV,KAG1BH,GAAcxZ,GAAWjkB,GAE1Bg+B,EAAIlB,mBAAqB98B,GAjBzBA,KAqBF66B,MAAO,WACD76B,GACJA,EAAUzF,GAAW,OAO3B,IAAIgkC,IAAOC,GACVC,GAAW,yBACXC,GAAaj1B,OAAQ,iBAAmBjN,EAAY,cAAe,KACnEmiC,GAAO,cACPC,IAAwBC,IACxBC,IACCjG,KAAM,SAAUjY,EAAMvb,GACrB,GAAI05B,GAAQzgC,KAAK0gC,YAAape,EAAMvb,GACnC9D,EAASw9B,EAAM3xB,MACf2nB,EAAQ2J,GAAOjgC,KAAM4G,GACrB45B,EAAOlK,GAASA,EAAO,KAAS/5B,EAAOw3B,UAAW5R,GAAS,GAAK,MAGhEhP,GAAU5W,EAAOw3B,UAAW5R,IAAmB,OAATqe,IAAkB19B,IACvDm9B,GAAOjgC,KAAMzD,EAAO82B,IAAKiN,EAAM1gC,KAAMuiB,IACtCse,EAAQ,EACRC,EAAgB,EAEjB,IAAKvtB,GAASA,EAAO,KAAQqtB,EAAO,CAEnCA,EAAOA,GAAQrtB,EAAO,GAGtBmjB,EAAQA,MAGRnjB,GAASrQ,GAAU,CAEnB,GAGC29B,GAAQA,GAAS,KAGjBttB,GAAgBstB,EAChBlkC,EAAO+L,MAAOg4B,EAAM1gC,KAAMuiB,EAAMhP,EAAQqtB,SAI/BC,KAAWA,EAAQH,EAAM3xB,MAAQ7L,IAAqB,IAAV29B,KAAiBC,GAaxE,MATKpK,KACJnjB,EAAQmtB,EAAMntB,OAASA,IAAUrQ,GAAU,EAC3Cw9B,EAAME,KAAOA,EAEbF,EAAMl+B,IAAMk0B,EAAO,GAClBnjB,GAAUmjB,EAAO,GAAM,GAAMA,EAAO,IACnCA,EAAO,IAGHgK,IAKV,SAASK,MAIR,MAHA/8B,YAAW,WACVk8B,GAAQhkC,IAEAgkC,GAAQvjC,EAAO0L,MAGzB,QAASs4B,IAAa35B,EAAOub,EAAMye,GAClC,GAAIN,GACHO,GAAeR,GAAUle,QAAerlB,OAAQujC,GAAU,MAC1DjmB,EAAQ,EACRra,EAAS8gC,EAAW9gC,MACrB,MAAgBA,EAARqa,EAAgBA,IACvB,GAAMkmB,EAAQO,EAAYzmB,GAAQrZ,KAAM6/B,EAAWze,EAAMvb,GAGxD,MAAO05B,GAKV,QAASQ,IAAWlhC,EAAMmhC,EAAYn+B,GACrC,GAAIgQ,GACHouB,EACA5mB,EAAQ,EACRra,EAASogC,GAAoBpgC,OAC7B6a,EAAWre,EAAOgM,WAAWoS,OAAQ,iBAE7BsmB,GAAKrhC,OAEbqhC,EAAO,WACN,GAAKD,EACJ,OAAO,CAER,IAAIE,GAAcpB,IAASa,KAC1B9kB,EAAY3Y,KAAKiE,IAAK,EAAGy5B,EAAUO,UAAYP,EAAUQ,SAAWF,GAEpElqB,EAAO6E,EAAY+kB,EAAUQ,UAAY,EACzCC,EAAU,EAAIrqB,EACdoD,EAAQ,EACRra,EAAS6gC,EAAUU,OAAOvhC,MAE3B,MAAgBA,EAARqa,EAAiBA,IACxBwmB,EAAUU,OAAQlnB,GAAQmnB,IAAKF,EAKhC,OAFAzmB,GAASqB,WAAYrc,GAAQghC,EAAWS,EAASxlB,IAElC,EAAVwlB,GAAethC,EACZ8b,GAEPjB,EAAS/W,YAAajE,GAAQghC,KACvB,IAGTA,EAAYhmB,EAASnZ,SACpB7B,KAAMA,EACNmoB,MAAOxrB,EAAOgG,UAAYw+B,GAC1BS,KAAMjlC,EAAOgG,QAAQ,GAAQk/B,kBAAqB7+B,GAClD8+B,mBAAoBX,EACpBhI,gBAAiBn2B,EACjBu+B,UAAWrB,IAASa,KACpBS,SAAUx+B,EAAQw+B,SAClBE,UACAf,YAAa,SAAUpe,EAAM/f,GAC5B,GAAIk+B,GAAQ/jC,EAAOolC,MAAO/hC,EAAMghC,EAAUY,KAAMrf,EAAM/f,EACpDw+B,EAAUY,KAAKC,cAAetf,IAAUye,EAAUY,KAAKI,OAEzD,OADAhB,GAAUU,OAAOtkC,KAAMsjC,GAChBA,GAERvf,KAAM,SAAU8gB,GACf,GAAIznB,GAAQ,EAGXra,EAAS8hC,EAAUjB,EAAUU,OAAOvhC,OAAS,CAC9C,IAAKihC,EACJ,MAAOnhC,KAGR,KADAmhC,GAAU,EACMjhC,EAARqa,EAAiBA,IACxBwmB,EAAUU,OAAQlnB,GAAQmnB,IAAK,EAUhC,OALKM,GACJjnB,EAAS/W,YAAajE,GAAQghC,EAAWiB,IAEzCjnB,EAASyiB,WAAYz9B,GAAQghC,EAAWiB,IAElChiC,QAGTkoB,EAAQ6Y,EAAU7Y,KAInB,KAFA+Z,GAAY/Z,EAAO6Y,EAAUY,KAAKC,eAElB1hC,EAARqa,EAAiBA,IAExB,GADAxH,EAASutB,GAAqB/lB,GAAQrZ,KAAM6/B,EAAWhhC,EAAMmoB,EAAO6Y,EAAUY,MAE7E,MAAO5uB,EAmBT,OAfArW,GAAO4F,IAAK4lB,EAAOwY,GAAaK,GAE3BrkC,EAAOiE,WAAYogC,EAAUY,KAAKruB,QACtCytB,EAAUY,KAAKruB,MAAMpS,KAAMnB,EAAMghC,GAGlCrkC,EAAO4kB,GAAG4gB,MACTxlC,EAAOgG,OAAQ0+B,GACdrhC,KAAMA,EACNoiC,KAAMpB,EACNngB,MAAOmgB,EAAUY,KAAK/gB,SAKjBmgB,EAAUtlB,SAAUslB,EAAUY,KAAKlmB,UACxC5Z,KAAMk/B,EAAUY,KAAK9/B,KAAMk/B,EAAUY,KAAK7H,UAC1C9e,KAAM+lB,EAAUY,KAAK3mB,MACrBF,OAAQimB,EAAUY,KAAK7mB,QAG1B,QAASmnB,IAAY/Z,EAAO0Z,GAC3B,GAAIrnB,GAAOzX,EAAMi/B,EAAQh7B,EAAOga,CAGhC,KAAMxG,IAAS2N,GAed,GAdAplB,EAAOpG,EAAOiK,UAAW4T,GACzBwnB,EAASH,EAAe9+B,GACxBiE,EAAQmhB,EAAO3N,GACV7d,EAAOyG,QAAS4D,KACpBg7B,EAASh7B,EAAO,GAChBA,EAAQmhB,EAAO3N,GAAUxT,EAAO,IAG5BwT,IAAUzX,IACdolB,EAAOplB,GAASiE,QACTmhB,GAAO3N,IAGfwG,EAAQrkB,EAAOs3B,SAAUlxB,GACpBie,GAAS,UAAYA,GAAQ,CACjCha,EAAQga,EAAMwV,OAAQxvB,SACfmhB,GAAOplB,EAId,KAAMyX,IAASxT,GACNwT,IAAS2N,KAChBA,EAAO3N,GAAUxT,EAAOwT,GACxBqnB,EAAernB,GAAUwnB,OAI3BH,GAAe9+B,GAASi/B,EAK3BrlC,EAAOukC,UAAYvkC,EAAOgG,OAAQu+B,IAEjCmB,QAAS,SAAUla,EAAOxmB,GACpBhF,EAAOiE,WAAYunB,IACvBxmB,EAAWwmB,EACXA,GAAU,MAEVA,EAAQA,EAAMlf,MAAM,IAGrB,IAAIsZ,GACH/H,EAAQ,EACRra,EAASgoB,EAAMhoB,MAEhB,MAAgBA,EAARqa,EAAiBA,IACxB+H,EAAO4F,EAAO3N,GACdimB,GAAUle,GAASke,GAAUle,OAC7Bke,GAAUle,GAAOjR,QAAS3P,IAI5B2gC,UAAW,SAAU3gC,EAAUqtB,GACzBA,EACJuR,GAAoBjvB,QAAS3P,GAE7B4+B,GAAoBnjC,KAAMuE,KAK7B,SAAS6+B,IAAkBxgC,EAAMmoB,EAAOyZ,GAEvC,GAAIrf,GAAMvb,EAAOgtB,EAAQ0M,EAAO1f,EAAOuhB,EACtCH,EAAOniC,KACPmqB,KACA1hB,EAAQ1I,EAAK0I,MACbkrB,EAAS5zB,EAAKQ,UAAY+yB,GAAUvzB,GACpCwiC,EAAW7lC,EAAO+jB,MAAO1gB,EAAM,SAG1B4hC,GAAK/gB,QACVG,EAAQrkB,EAAOskB,YAAajhB,EAAM,MACX,MAAlBghB,EAAMyhB,WACVzhB,EAAMyhB,SAAW,EACjBF,EAAUvhB,EAAM/L,MAAMkF,KACtB6G,EAAM/L,MAAMkF,KAAO,WACZ6G,EAAMyhB,UACXF,MAIHvhB,EAAMyhB,WAENL,EAAKrnB,OAAO,WAGXqnB,EAAKrnB,OAAO,WACXiG,EAAMyhB,WACA9lC,EAAOkkB,MAAO7gB,EAAM,MAAOG,QAChC6gB,EAAM/L,MAAMkF,YAOO,IAAlBna,EAAKQ,WAAoB,UAAY2nB,IAAS,SAAWA,MAK7DyZ,EAAKc,UAAah6B,EAAMg6B,SAAUh6B,EAAMi6B,UAAWj6B,EAAMk6B,WAIlB,WAAlCjmC,EAAO82B,IAAKzzB,EAAM,YACW,SAAhCrD,EAAO82B,IAAKzzB,EAAM,WAIbrD,EAAOmI,QAAQ4Y,wBAAkE,WAAxCmW,GAAoB7zB,EAAK8G,UAIvE4B,EAAMyW,KAAO,EAHbzW,EAAMuW,QAAU,iBAQd2iB,EAAKc,WACTh6B,EAAMg6B,SAAW,SACX/lC,EAAOmI,QAAQ6Y,kBACpBykB,EAAKrnB,OAAO,WACXrS,EAAMg6B,SAAWd,EAAKc,SAAU,GAChCh6B,EAAMi6B,UAAYf,EAAKc,SAAU,GACjCh6B,EAAMk6B,UAAYhB,EAAKc,SAAU,KAOpC,KAAMngB,IAAQ4F,GAEb,GADAnhB,EAAQmhB,EAAO5F,GACV6d,GAAShgC,KAAM4G,GAAU,CAG7B,SAFOmhB,GAAO5F,GACdyR,EAASA,GAAoB,WAAVhtB,EACdA,KAAY4sB,EAAS,OAAS,QAClC,QAEDxJ,GAAM7H,GAASigB,GAAYA,EAAUjgB,IAAU5lB,EAAO+L,MAAO1I,EAAMuiB,GAIrE,IAAM5lB,EAAOqI,cAAeolB,GAAS,CAC/BoY,EACC,UAAYA,KAChB5O,EAAS4O,EAAS5O,QAGnB4O,EAAW7lC,EAAO+jB,MAAO1gB,EAAM,aAI3Bg0B,IACJwO,EAAS5O,QAAUA,GAEfA,EACJj3B,EAAQqD,GAAO2zB,OAEfyO,EAAKtgC,KAAK,WACTnF,EAAQqD,GAAO+zB,SAGjBqO,EAAKtgC,KAAK,WACT,GAAIygB,EACJ5lB,GAAOgkB,YAAa3gB,EAAM,SAC1B,KAAMuiB,IAAQ6H,GACbztB,EAAO+L,MAAO1I,EAAMuiB,EAAM6H,EAAM7H,KAGlC,KAAMA,IAAQ6H,GACbsW,EAAQC,GAAa/M,EAAS4O,EAAUjgB,GAAS,EAAGA,EAAM6f,GAElD7f,IAAQigB,KACfA,EAAUjgB,GAASme,EAAMntB,MACpBqgB,IACJ8M,EAAMl+B,IAAMk+B,EAAMntB,MAClBmtB,EAAMntB,MAAiB,UAATgP,GAA6B,WAATA,EAAoB,EAAI,KAO/D,QAASwf,IAAO/hC,EAAMgD,EAASuf,EAAM/f,EAAKw/B,GACzC,MAAO,IAAID,IAAMniC,UAAU1B,KAAM8B,EAAMgD,EAASuf,EAAM/f,EAAKw/B,GAE5DrlC,EAAOolC,MAAQA,GAEfA,GAAMniC,WACLE,YAAaiiC,GACb7jC,KAAM,SAAU8B,EAAMgD,EAASuf,EAAM/f,EAAKw/B,EAAQpB,GACjD3gC,KAAKD,KAAOA,EACZC,KAAKsiB,KAAOA,EACZtiB,KAAK+hC,OAASA,GAAU,QACxB/hC,KAAK+C,QAAUA,EACf/C,KAAKsT,MAAQtT,KAAKoI,IAAMpI,KAAK8O,MAC7B9O,KAAKuC,IAAMA,EACXvC,KAAK2gC,KAAOA,IAAUjkC,EAAOw3B,UAAW5R,GAAS,GAAK,OAEvDxT,IAAK,WACJ,GAAIiS,GAAQ+gB,GAAMhe,UAAW9jB,KAAKsiB,KAElC,OAAOvB,IAASA,EAAM5f,IACrB4f,EAAM5f,IAAKnB,MACX8hC,GAAMhe,UAAUqD,SAAShmB,IAAKnB,OAEhC0hC,IAAK,SAAUF,GACd,GAAIoB,GACH7hB,EAAQ+gB,GAAMhe,UAAW9jB,KAAKsiB,KAoB/B,OAjBCtiB,MAAK2rB,IAAMiX,EADP5iC,KAAK+C,QAAQw+B,SACE7kC,EAAOqlC,OAAQ/hC,KAAK+hC,QACtCP,EAASxhC,KAAK+C,QAAQw+B,SAAWC,EAAS,EAAG,EAAGxhC,KAAK+C,QAAQw+B,UAG3CC,EAEpBxhC,KAAKoI,KAAQpI,KAAKuC,IAAMvC,KAAKsT,OAAUsvB,EAAQ5iC,KAAKsT,MAE/CtT,KAAK+C,QAAQ8/B,MACjB7iC,KAAK+C,QAAQ8/B,KAAK3hC,KAAMlB,KAAKD,KAAMC,KAAKoI,IAAKpI,MAGzC+gB,GAASA,EAAMoC,IACnBpC,EAAMoC,IAAKnjB,MAEX8hC,GAAMhe,UAAUqD,SAAShE,IAAKnjB,MAExBA,OAIT8hC,GAAMniC,UAAU1B,KAAK0B,UAAYmiC,GAAMniC,UAEvCmiC,GAAMhe,WACLqD,UACChmB,IAAK,SAAUs/B,GACd,GAAI1tB,EAEJ,OAAiC,OAA5B0tB,EAAM1gC,KAAM0gC,EAAMne,OACpBme,EAAM1gC,KAAK0I,OAA2C,MAAlCg4B,EAAM1gC,KAAK0I,MAAOg4B,EAAMne,OAQ/CvP,EAASrW,EAAO82B,IAAKiN,EAAM1gC,KAAM0gC,EAAMne,KAAM,IAErCvP,GAAqB,SAAXA,EAAwBA,EAAJ,GAT9B0tB,EAAM1gC,KAAM0gC,EAAMne,OAW3Ba,IAAK,SAAUsd,GAGT/jC,EAAO4kB,GAAGuhB,KAAMpC,EAAMne,MAC1B5lB,EAAO4kB,GAAGuhB,KAAMpC,EAAMne,MAAQme,GACnBA,EAAM1gC,KAAK0I,QAAgE,MAArDg4B,EAAM1gC,KAAK0I,MAAO/L,EAAOg4B,SAAU+L,EAAMne,QAAoB5lB,EAAOs3B,SAAUyM,EAAMne,OACrH5lB,EAAO+L,MAAOg4B,EAAM1gC,KAAM0gC,EAAMne,KAAMme,EAAMr4B,IAAMq4B,EAAME,MAExDF,EAAM1gC,KAAM0gC,EAAMne,MAASme,EAAMr4B,OASrC05B,GAAMhe,UAAUmF,UAAY6Y,GAAMhe,UAAU+E,YAC3C1F,IAAK,SAAUsd,GACTA,EAAM1gC,KAAKQ,UAAYkgC,EAAM1gC,KAAKe,aACtC2/B,EAAM1gC,KAAM0gC,EAAMne,MAASme,EAAMr4B,OAKpC1L,EAAO+E,MAAO,SAAU,OAAQ,QAAU,SAAUU,EAAGW,GACtD,GAAIggC,GAAQpmC,EAAOsB,GAAI8E,EACvBpG,GAAOsB,GAAI8E,GAAS,SAAUigC,EAAOhB,EAAQrgC,GAC5C,MAAgB,OAATqhC,GAAkC,iBAAVA,GAC9BD,EAAMhhC,MAAO9B,KAAM+B,WACnB/B,KAAKgjC,QAASC,GAAOngC,GAAM,GAAQigC,EAAOhB,EAAQrgC,MAIrDhF,EAAOsB,GAAG0E,QACTwgC,OAAQ,SAAUH,EAAOI,EAAIpB,EAAQrgC,GAGpC,MAAO1B,MAAKkQ,OAAQojB,IAAWE,IAAK,UAAW,GAAIE,OAGjDnxB,MAAMygC,SAAU/lB,QAASkmB,GAAMJ,EAAOhB,EAAQrgC,IAEjDshC,QAAS,SAAU1gB,EAAMygB,EAAOhB,EAAQrgC,GACvC,GAAIsT,GAAQtY,EAAOqI,cAAeud,GACjC8gB,EAAS1mC,EAAOqmC,MAAOA,EAAOhB,EAAQrgC,GACtC2hC,EAAc,WAEb,GAAIlB,GAAOlB,GAAWjhC,KAAMtD,EAAOgG,UAAY4f,GAAQ8gB,IAGlDpuB,GAAStY,EAAO+jB,MAAOzgB,KAAM,YACjCmiC,EAAKjhB,MAAM,GAKd,OAFCmiB,GAAYC,OAASD,EAEfruB,GAASouB,EAAOxiB,SAAU,EAChC5gB,KAAKyB,KAAM4hC,GACXrjC,KAAK4gB,MAAOwiB,EAAOxiB,MAAOyiB,IAE5BniB,KAAM,SAAU7hB,EAAMqiB,EAAYsgB,GACjC,GAAIuB,GAAY,SAAUxiB,GACzB,GAAIG,GAAOH,EAAMG,WACVH,GAAMG,KACbA,EAAM8gB,GAYP,OATqB,gBAAT3iC,KACX2iC,EAAUtgB,EACVA,EAAariB,EACbA,EAAOpD,GAEHylB,GAAcriB,KAAS,GAC3BW,KAAK4gB,MAAOvhB,GAAQ,SAGdW,KAAKyB,KAAK,WAChB,GAAIof,IAAU,EACbtG,EAAgB,MAARlb,GAAgBA,EAAO,aAC/BmkC,EAAS9mC,EAAO8mC,OAChBr+B,EAAOzI,EAAO+jB,MAAOzgB,KAEtB,IAAKua,EACCpV,EAAMoV,IAAWpV,EAAMoV,GAAQ2G,MACnCqiB,EAAWp+B,EAAMoV,QAGlB,KAAMA,IAASpV,GACTA,EAAMoV,IAAWpV,EAAMoV,GAAQ2G,MAAQmf,GAAK5/B,KAAM8Z,IACtDgpB,EAAWp+B,EAAMoV,GAKpB,KAAMA,EAAQipB,EAAOtjC,OAAQqa,KACvBipB,EAAQjpB,GAAQxa,OAASC,MAAiB,MAARX,GAAgBmkC,EAAQjpB,GAAQqG,QAAUvhB,IAChFmkC,EAAQjpB,GAAQ4nB,KAAKjhB,KAAM8gB,GAC3BnhB,GAAU,EACV2iB,EAAO/gC,OAAQ8X,EAAO,KAOnBsG,IAAYmhB,IAChBtlC,EAAOmkB,QAAS7gB,KAAMX,MAIzBikC,OAAQ,SAAUjkC,GAIjB,MAHKA,MAAS,IACbA,EAAOA,GAAQ,MAETW,KAAKyB,KAAK,WAChB,GAAI8Y,GACHpV,EAAOzI,EAAO+jB,MAAOzgB,MACrB4gB,EAAQzb,EAAM9F,EAAO,SACrB0hB,EAAQ5b,EAAM9F,EAAO,cACrBmkC,EAAS9mC,EAAO8mC,OAChBtjC,EAAS0gB,EAAQA,EAAM1gB,OAAS,CAajC,KAVAiF,EAAKm+B,QAAS,EAGd5mC,EAAOkkB,MAAO5gB,KAAMX,MAEf0hB,GAASA,EAAMG,MACnBH,EAAMG,KAAKhgB,KAAMlB,MAAM,GAIlBua,EAAQipB,EAAOtjC,OAAQqa,KACvBipB,EAAQjpB,GAAQxa,OAASC,MAAQwjC,EAAQjpB,GAAQqG,QAAUvhB,IAC/DmkC,EAAQjpB,GAAQ4nB,KAAKjhB,MAAM,GAC3BsiB,EAAO/gC,OAAQ8X,EAAO,GAKxB,KAAMA,EAAQ,EAAWra,EAARqa,EAAgBA,IAC3BqG,EAAOrG,IAAWqG,EAAOrG,GAAQ+oB,QACrC1iB,EAAOrG,GAAQ+oB,OAAOpiC,KAAMlB,YAKvBmF,GAAKm+B,WAMf,SAASL,IAAO5jC,EAAMokC,GACrB,GAAInb,GACH5Z,GAAUg1B,OAAQrkC,GAClB8C,EAAI,CAKL,KADAshC,EAAeA,EAAc,EAAI,EACtB,EAAJthC,EAAQA,GAAK,EAAIshC,EACvBnb,EAAQ2K,GAAW9wB,GACnBuM,EAAO,SAAW4Z,GAAU5Z,EAAO,UAAY4Z,GAAUjpB,CAO1D,OAJKokC,KACJ/0B,EAAMuO,QAAUvO,EAAM4Q,MAAQjgB,GAGxBqP,EAIRhS,EAAO+E,MACNkiC,UAAWV,GAAM,QACjBW,QAASX,GAAM,QACfY,YAAaZ,GAAM,UACnBa,QAAU7mB,QAAS,QACnB8mB,SAAW9mB,QAAS,QACpB+mB,YAAc/mB,QAAS,WACrB,SAAUna,EAAMolB,GAClBxrB,EAAOsB,GAAI8E,GAAS,SAAUigC,EAAOhB,EAAQrgC,GAC5C,MAAO1B,MAAKgjC,QAAS9a,EAAO6a,EAAOhB,EAAQrgC,MAI7ChF,EAAOqmC,MAAQ,SAAUA,EAAOhB,EAAQ/jC,GACvC,GAAIwe,GAAMumB,GAA0B,gBAAVA,GAAqBrmC,EAAOgG,UAAYqgC,IACjEjJ,SAAU97B,IAAOA,GAAM+jC,GACtBrlC,EAAOiE,WAAYoiC,IAAWA,EAC/BxB,SAAUwB,EACVhB,OAAQ/jC,GAAM+jC,GAAUA,IAAWrlC,EAAOiE,WAAYohC,IAAYA,EAwBnE,OArBAvlB,GAAI+kB,SAAW7kC,EAAO4kB,GAAGpd,IAAM,EAA4B,gBAAjBsY,GAAI+kB,SAAwB/kB,EAAI+kB,SACzE/kB,EAAI+kB,WAAY7kC,GAAO4kB,GAAGC,OAAS7kB,EAAO4kB,GAAGC,OAAQ/E,EAAI+kB,UAAa7kC,EAAO4kB,GAAGC,OAAO4F,UAGtE,MAAb3K,EAAIoE,OAAiBpE,EAAIoE,SAAU,KACvCpE,EAAIoE,MAAQ,MAIbpE,EAAIhU,IAAMgU,EAAIsd,SAEdtd,EAAIsd,SAAW,WACTp9B,EAAOiE,WAAY6b,EAAIhU,MAC3BgU,EAAIhU,IAAItH,KAAMlB,MAGVwc,EAAIoE,OACRlkB,EAAOmkB,QAAS7gB,KAAMwc,EAAIoE,QAIrBpE,GAGR9f,EAAOqlC,QACNkC,OAAQ,SAAUC,GACjB,MAAOA,IAERC,MAAO,SAAUD,GAChB,MAAO,GAAM7gC,KAAK+gC,IAAKF,EAAE7gC,KAAKghC,IAAO,IAIvC3nC,EAAO8mC,UACP9mC,EAAO4kB,GAAKwgB,GAAMniC,UAAU1B,KAC5BvB,EAAO4kB,GAAG8f,KAAO,WAChB,GAAIc,GACHsB,EAAS9mC,EAAO8mC,OAChBrhC,EAAI,CAIL,KAFA89B,GAAQvjC,EAAO0L,MAEHo7B,EAAOtjC,OAAXiC,EAAmBA,IAC1B+/B,EAAQsB,EAAQrhC,GAEV+/B,KAAWsB,EAAQrhC,KAAQ+/B,GAChCsB,EAAO/gC,OAAQN,IAAK,EAIhBqhC,GAAOtjC,QACZxD,EAAO4kB,GAAGJ,OAEX+e,GAAQhkC,GAGTS,EAAO4kB,GAAG4gB,MAAQ,SAAUA,GACtBA,KAAWxlC,EAAO8mC,OAAOrmC,KAAM+kC,IACnCxlC,EAAO4kB,GAAGhO,SAIZ5W,EAAO4kB,GAAGgjB,SAAW,GAErB5nC,EAAO4kB,GAAGhO,MAAQ,WACX4sB,KACLA,GAAUqE,YAAa7nC,EAAO4kB,GAAG8f,KAAM1kC,EAAO4kB,GAAGgjB,YAInD5nC,EAAO4kB,GAAGJ,KAAO,WAChBsjB,cAAetE,IACfA,GAAU,MAGXxjC,EAAO4kB,GAAGC,QACTkjB,KAAM,IACNC,KAAM,IAENvd,SAAU,KAIXzqB,EAAO4kB,GAAGuhB,QAELnmC,EAAO4U,MAAQ5U,EAAO4U,KAAKwE,UAC/BpZ,EAAO4U,KAAKwE,QAAQ6uB,SAAW,SAAU5kC,GACxC,MAAOrD,GAAO+K,KAAK/K,EAAO8mC,OAAQ,SAAUxlC,GAC3C,MAAO+B,KAAS/B,EAAG+B,OACjBG,SAGLxD,EAAOsB,GAAG4mC,OAAS,SAAU7hC,GAC5B,GAAKhB,UAAU7B,OACd,MAAO6C,KAAY9G,EAClB+D,KACAA,KAAKyB,KAAK,SAAUU,GACnBzF,EAAOkoC,OAAOC,UAAW7kC,KAAM+C,EAASZ,IAI3C,IAAI5F,GAASuoC,EACZC,GAAQn8B,IAAK,EAAGssB,KAAM,GACtBn1B,EAAOC,KAAM,GACbwP,EAAMzP,GAAQA,EAAKS,aAEpB,IAAMgP,EAON,MAHAjT,GAAUiT,EAAIhT,gBAGRE,EAAOmN,SAAUtN,EAASwD,UAMpBA,GAAKilC,wBAA0B5oC,IAC1C2oC,EAAMhlC,EAAKilC,yBAEZF,EAAMG,GAAWz1B,IAEhB5G,IAAKm8B,EAAIn8B,KAASk8B,EAAII,aAAe3oC,EAAQ0sB,YAAiB1sB,EAAQ2sB,WAAc,GACpFgM,KAAM6P,EAAI7P,MAAS4P,EAAIK,aAAe5oC,EAAQssB,aAAiBtsB,EAAQusB,YAAc,KAX9Eic,GAeTroC,EAAOkoC,QAENC,UAAW,SAAU9kC,EAAMgD,EAASZ,GACnC,GAAIywB,GAAWl2B,EAAO82B,IAAKzzB,EAAM,WAGf,YAAb6yB,IACJ7yB,EAAK0I,MAAMmqB,SAAW,WAGvB,IAAIwS,GAAU1oC,EAAQqD,GACrBslC,EAAYD,EAAQR,SACpBU,EAAY5oC,EAAO82B,IAAKzzB,EAAM,OAC9BwlC,EAAa7oC,EAAO82B,IAAKzzB,EAAM,QAC/BylC,GAAmC,aAAb5S,GAAwC,UAAbA,IAA0Bl2B,EAAO2K,QAAQ,QAASi+B,EAAWC,IAAe,GAC7Hrd,KAAYud,KAAkBC,EAAQC,CAGlCH,IACJC,EAAcL,EAAQxS,WACtB8S,EAASD,EAAY78B,IACrB+8B,EAAUF,EAAYvQ,OAEtBwQ,EAASlhC,WAAY8gC,IAAe,EACpCK,EAAUnhC,WAAY+gC,IAAgB,GAGlC7oC,EAAOiE,WAAYoC,KACvBA,EAAUA,EAAQ7B,KAAMnB,EAAMoC,EAAGkjC,IAGd,MAAftiC,EAAQ6F,MACZsf,EAAMtf,IAAQ7F,EAAQ6F,IAAMy8B,EAAUz8B,IAAQ88B,GAE1B,MAAhB3iC,EAAQmyB,OACZhN,EAAMgN,KAASnyB,EAAQmyB,KAAOmQ,EAAUnQ,KAASyQ,GAG7C,SAAW5iC,GACfA,EAAQ6iC,MAAM1kC,KAAMnB,EAAMmoB,GAE1Bkd,EAAQ5R,IAAKtL,KAMhBxrB,EAAOsB,GAAG0E,QAETkwB,SAAU,WACT,GAAM5yB,KAAM,GAAZ,CAIA,GAAI6lC,GAAcjB,EACjBkB,GAAiBl9B,IAAK,EAAGssB,KAAM,GAC/Bn1B,EAAOC,KAAM,EAwBd,OArBwC,UAAnCtD,EAAO82B,IAAKzzB,EAAM,YAEtB6kC,EAAS7kC,EAAKilC,yBAGda,EAAe7lC,KAAK6lC,eAGpBjB,EAAS5kC,KAAK4kC,SACRloC,EAAOmK,SAAUg/B,EAAc,GAAK,UACzCC,EAAeD,EAAajB,UAI7BkB,EAAal9B,KAAQlM,EAAO82B,IAAKqS,EAAc,GAAK,kBAAkB,GACtEC,EAAa5Q,MAAQx4B,EAAO82B,IAAKqS,EAAc,GAAK,mBAAmB,KAOvEj9B,IAAMg8B,EAAOh8B,IAAOk9B,EAAal9B,IAAMlM,EAAO82B,IAAKzzB,EAAM,aAAa,GACtEm1B,KAAM0P,EAAO1P,KAAO4Q,EAAa5Q,KAAOx4B,EAAO82B,IAAKzzB,EAAM,cAAc,MAI1E8lC,aAAc,WACb,MAAO7lC,MAAKsC,IAAI,WACf,GAAIujC,GAAe7lC,KAAK6lC,cAAgBtpC,CACxC,OAAQspC,IAAmBnpC,EAAOmK,SAAUg/B,EAAc,SAAsD,WAA1CnpC,EAAO82B,IAAKqS,EAAc,YAC/FA,EAAeA,EAAaA,YAE7B,OAAOA,IAAgBtpC,OAO1BG,EAAO+E,MAAOonB,WAAY,cAAeI,UAAW,eAAgB,SAAU0T,EAAQra,GACrF,GAAI1Z,GAAM,IAAInI,KAAM6hB,EAEpB5lB,GAAOsB,GAAI2+B,GAAW,SAAUnrB,GAC/B,MAAO9U,GAAOqL,OAAQ/H,KAAM,SAAUD,EAAM48B,EAAQnrB,GACnD,GAAIszB,GAAMG,GAAWllC,EAErB,OAAKyR,KAAQvV,EACL6oC,EAAOxiB,IAAQwiB,GAAOA,EAAKxiB,GACjCwiB,EAAIxoC,SAASE,gBAAiBmgC,GAC9B58B,EAAM48B,IAGHmI,EACJA,EAAIiB,SACFn9B,EAAYlM,EAAQooC,GAAMjc,aAApBrX,EACP5I,EAAM4I,EAAM9U,EAAQooC,GAAM7b,aAI3BlpB,EAAM48B,GAAWnrB,EAPlB,IASEmrB,EAAQnrB,EAAKzP,UAAU7B,OAAQ,QAIpC,SAAS+kC,IAAWllC,GACnB,MAAOrD,GAAO2H,SAAUtE,GACvBA,EACkB,IAAlBA,EAAKQ,SACJR,EAAK2P,aAAe3P,EAAKgnB,cACzB,EAGHrqB,EAAO+E,MAAQukC,OAAQ,SAAUC,MAAO,SAAW,SAAUnjC,EAAMzD,GAClE3C,EAAO+E,MAAQ00B,QAAS,QAAUrzB,EAAMktB,QAAS3wB,EAAM,GAAI,QAAUyD,GAAQ,SAAUojC,EAAcC,GAEpGzpC,EAAOsB,GAAImoC,GAAa,SAAUjQ,EAAQnvB,GACzC,GAAIiB,GAAYjG,UAAU7B,SAAYgmC,GAAkC,iBAAXhQ,IAC5DtB,EAAQsR,IAAkBhQ,KAAW,GAAQnvB,KAAU,EAAO,SAAW,SAE1E,OAAOrK,GAAOqL,OAAQ/H,KAAM,SAAUD,EAAMV,EAAM0H,GACjD,GAAIyI,EAEJ,OAAK9S,GAAO2H,SAAUtE,GAIdA,EAAKzD,SAASE,gBAAiB,SAAWsG,GAI3B,IAAlB/C,EAAKQ,UACTiP,EAAMzP,EAAKvD,gBAIJ6G,KAAKiE,IACXvH,EAAK+D,KAAM,SAAWhB,GAAQ0M,EAAK,SAAW1M,GAC9C/C,EAAK+D,KAAM,SAAWhB,GAAQ0M,EAAK,SAAW1M,GAC9C0M,EAAK,SAAW1M,KAIXiE,IAAU9K,EAEhBS,EAAO82B,IAAKzzB,EAAMV,EAAMu1B,GAGxBl4B,EAAO+L,MAAO1I,EAAMV,EAAM0H,EAAO6tB,IAChCv1B,EAAM2I,EAAYkuB,EAASj6B,EAAW+L,EAAW,WAQvDtL,EAAOsB,GAAGooC,KAAO,WAChB,MAAOpmC,MAAKE,QAGbxD,EAAOsB,GAAGqoC,QAAU3pC,EAAOsB,GAAG6tB,QAGP,gBAAXya,SAAuBA,QAAoC,gBAAnBA,QAAOC,QAK1DD,OAAOC,QAAU7pC,GAGjBV,EAAOU,OAASV,EAAOY,EAAIF,EASJ,kBAAX8pC,SAAyBA,OAAOC,KAC3CD,OAAQ,YAAc,WAAc,MAAO9pC,QAIzCV"}
diff --git a/lib/base.php b/lib/base.php
index 11c5167786d..2b4ba7bcb4a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -327,8 +327,8 @@ class OC {
 	public static function initTemplateEngine() {
 		// Add the stuff we need always
 		// TODO: read from core/js/core.json
-		OC_Util::addScript("jquery-1.10.0.min");
-		OC_Util::addScript("jquery-migrate-1.2.1.min");
+		OC_Util::addVendorScript('jquery/jquery.min');
+		OC_Util::addVendorScript('jquery/jquery-migrate.min');
 		OC_Util::addScript("jquery-ui-1.10.0.custom");
 		OC_Util::addScript("jquery-showpassword");
 		OC_Util::addScript("placeholders");
diff --git a/tests/karma.config.js b/tests/karma.config.js
index f67fa9977c2..414f1552584 100644
--- a/tests/karma.config.js
+++ b/tests/karma.config.js
@@ -120,6 +120,12 @@ module.exports = function(config) {
 	files.push(corePath + 'tests/specHelper.js');
 
 	var srcFile, i;
+	// add vendor library files
+	for ( i = 0; i < coreModule.vendor.length; i++ ) {
+		srcFile = vendorPath + coreModule.vendor[i];
+		files.push(srcFile);
+	}
+
 	// add core library files
 	for ( i = 0; i < coreModule.libraries.length; i++ ) {
 		srcFile = corePath + coreModule.libraries[i];
@@ -135,12 +141,6 @@ module.exports = function(config) {
 		}
 	}
 
-	// add vendor library files
-	for ( i = 0; i < coreModule.vendor.length; i++ ) {
-		srcFile = vendorPath + coreModule.vendor[i];
-		files.push(srcFile);
-	}
-
 	// TODO: settings pages
 
 	// need to test the core app as well ?
-- 
GitLab


From 768f3979e048d5661fdf84fe3e8174f6d1147df3 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 4 Nov 2014 16:44:42 +0100
Subject: [PATCH 317/616] Check for cert bundle existence before using it

---
 apps/files_sharing/lib/external/storage.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php
index 92d8f92b380..2da0022028f 100644
--- a/apps/files_sharing/lib/external/storage.php
+++ b/apps/files_sharing/lib/external/storage.php
@@ -198,12 +198,22 @@ class Storage extends DAV implements ISharedStorage {
 
 		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
 		curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
-		curl_setopt($ch, CURLOPT_CAINFO, $this->certificateManager->getCertificateBundle());
+		$path = $this->certificateManager->getCertificateBundle();
+		if (is_readable($path)) {
+			curl_setopt($ch, CURLOPT_CAINFO, $path);
+		}
 
 		$result = curl_exec($ch);
 
 		$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+		$errorMessage = null;
+		if ($status === 0) {
+			$errorMessage = curl_error($ch);
+		}
 		curl_close($ch);
+		if ($errorMessage) {
+			throw new \Exception($errorMessage);
+		}
 
 		switch ($status) {
 			case 401:
-- 
GitLab


From 0580c232d72123ca7e3c675ed73268099d00d185 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 4 Nov 2014 17:16:36 +0100
Subject: [PATCH 318/616] still try to encrypt files, even if the session is
 not initialized. The stream wrapper will throw an error which is better than
 silently continue.

---
 apps/files_encryption/lib/proxy.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 3b9dcbe7767..31723ae7647 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -95,8 +95,7 @@ class Proxy extends \OC_FileProxy {
 
 		// don't call the crypt stream wrapper, if...
 		if (
-				$session->getInitialized() !== Session::INIT_SUCCESSFUL // encryption successful initialized
-				|| Crypt::mode() !== 'server'   // we are not in server-side-encryption mode
+				Crypt::mode() !== 'server'   // we are not in server-side-encryption mode
 				|| $this->isExcludedPath($path, $userId) // if path is excluded from encryption
 				|| substr($path, 0, 8) === 'crypt://' // we are already in crypt mode
 		) {
-- 
GitLab


From 5a6cbea2619badc1c1451be2b448115a7d38be5a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 4 Nov 2014 17:28:35 +0100
Subject: [PATCH 319/616] drop listview.js

* isn't used in core and isn't mentioned in documentation
---
 core/js/listview.js | 71 ---------------------------------------------
 1 file changed, 71 deletions(-)
 delete mode 100644 core/js/listview.js

diff --git a/core/js/listview.js b/core/js/listview.js
deleted file mode 100644
index 71466c90207..00000000000
--- a/core/js/listview.js
+++ /dev/null
@@ -1,71 +0,0 @@
-function ListView(element){
-	this.element=element;
-}
-
-ListView.generateTable=function(collumns){
-	var html='<table>';
-	html+='<thead>';
-	$.each(collumns,function(index,collumn){
-		html+='<th>'+collumn+'</th>';
-	});
-	html+='<thead>';
-	html+='</head>';
-	html+='<tbody>';
-	html+='<tr class="template">';
-	$.each(collumns,function(index,collumn){
-		html+='<th class="'+collumn.toLower()+'"</th>';
-	});
-	html+='</tr>';
-	html+='</tbody>';
-	html='</table>';
-	return $(html);
-};
-
-ListView.prototype={
-	rows:{},
-	hoverElements:{},
-	addRow:function(id,data,extraData){
-		var tr=this.element.find('tr.template').clone();
-		tr.removeClass('template');
-		$.each(data,function(name,value){
-			tr.children('td.'+name).text(value);
-			tr.attr('data-'+name,value);
-		});
-		$.each(extraData,function(name,value){
-			tr.attr('data-'+name,value);
-		});
-		this.rows[id]=data;
-		tr.data('id',id);
-		this.element.children('tbody').append(tr);
-	},
-	removeRow:function(id){
-		this.rows[id].remove();
-		delete this.rows[id];
-	},
-	hoverHandeler:function(tr){
-		$.each(this.hoverElement,function(index,collumn){
-			$.each(collumn,function(index,element){
-				var html='<a href="#" title="'+element.title+'" class="hoverElement"/>';
-				element = $(html);
-				element.append($('<img src="'+element.icon+'"/>'));
-				element.click(element.callback);
-				tr.children('td.'+collumn).append(element);
-			});
-		});
-		if(this.deleteCallback){
-			
-		}
-	},
-	hoverHandelerOut:function(tr){
-		tr.find('*.hoverElement').remove();
-	},
-	addHoverElement:function(column,icon,title,callback){
-		if(!this.hoverElements[column]){
-			this.hoverElements[column] = [];
-		}
-		this.hoverElements[row].push({icon:icon,callback:callback,title:title});
-	},
-	empty:function(){
-		this.element.children('tr:not(.template)').remove();
-	}
-};
-- 
GitLab


From ee6d8c9d589c95a12fab5d1a1bcfdd3c6ad8f4c0 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 4 Nov 2014 17:37:15 +0100
Subject: [PATCH 320/616] Store curl error message directly

---
 apps/files_sharing/lib/external/storage.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/files_sharing/lib/external/storage.php b/apps/files_sharing/lib/external/storage.php
index 2da0022028f..3f1d631a35f 100644
--- a/apps/files_sharing/lib/external/storage.php
+++ b/apps/files_sharing/lib/external/storage.php
@@ -206,12 +206,9 @@ class Storage extends DAV implements ISharedStorage {
 		$result = curl_exec($ch);
 
 		$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		$errorMessage = null;
-		if ($status === 0) {
-			$errorMessage = curl_error($ch);
-		}
+		$errorMessage = curl_error($ch);
 		curl_close($ch);
-		if ($errorMessage) {
+		if (!empty($errorMessage)) {
 			throw new \Exception($errorMessage);
 		}
 
-- 
GitLab


From c8f55e7f87505d0f27df0d2115697d8456c455a1 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 5 Nov 2014 01:54:36 -0500
Subject: [PATCH 321/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/gl.js    |  6 +++
 apps/files_encryption/l10n/gl.json  |  6 +++
 apps/files_external/l10n/gl.js      |  4 ++
 apps/files_external/l10n/gl.json    |  4 ++
 core/l10n/gl.js                     | 32 +++++++++++-
 core/l10n/gl.json                   | 32 +++++++++++-
 core/l10n/ru.js                     |  4 ++
 core/l10n/ru.json                   |  4 ++
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    |  2 +-
 l10n/templates/files_trashbin.pot   |  2 +-
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              | 78 ++++++++++++++---------------
 l10n/templates/private.pot          | 78 ++++++++++++++---------------
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/ru.js                      |  1 +
 lib/l10n/ru.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/en_GB.js              |  1 +
 settings/l10n/en_GB.json            |  1 +
 settings/l10n/fr.js                 |  1 +
 settings/l10n/fr.json               |  1 +
 settings/l10n/nl.js                 |  1 +
 settings/l10n/nl.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                 | 12 +++++
 settings/l10n/ru.json               | 12 +++++
 42 files changed, 220 insertions(+), 92 deletions(-)

diff --git a/apps/files_encryption/l10n/gl.js b/apps/files_encryption/l10n/gl.js
index 72f27a9c5a9..c04a1c1a5ea 100644
--- a/apps/files_encryption/l10n/gl.js
+++ b/apps/files_encryption/l10n/gl.js
@@ -2,9 +2,15 @@ OC.L10N.register(
     "files_encryption",
     {
     "Unknown error" : "Produciuse un erro descoñecido",
+    "Missing recovery key password" : "Falta a chave de recuperación",
+    "Please repeat the recovery key password" : "Por favor repita a chave de recuperación",
+    "Repeated recovery key password does not match the provided recovery key password" : "A repetición da chave de recuperación non coincide coa chave de recuperación establecida",
     "Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación",
     "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
     "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación",
+    "Please provide the old recovery password" : "Por favor introduza a chave de recuperación anterior",
+    "Please provide a new recovery password" : "Por favor introduza a nova chave de recuperación",
+    "Please repeat the new recovery password" : "Por favor repita a nova chave de recuperación",
     "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
     "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
     "Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
diff --git a/apps/files_encryption/l10n/gl.json b/apps/files_encryption/l10n/gl.json
index 05e17509c46..4583f25da1a 100644
--- a/apps/files_encryption/l10n/gl.json
+++ b/apps/files_encryption/l10n/gl.json
@@ -1,8 +1,14 @@
 { "translations": {
     "Unknown error" : "Produciuse un erro descoñecido",
+    "Missing recovery key password" : "Falta a chave de recuperación",
+    "Please repeat the recovery key password" : "Por favor repita a chave de recuperación",
+    "Repeated recovery key password does not match the provided recovery key password" : "A repetición da chave de recuperación non coincide coa chave de recuperación establecida",
     "Recovery key successfully enabled" : "Activada satisfactoriamente a chave de recuperación",
     "Could not disable recovery key. Please check your recovery key password!" : "Non foi posíbel desactivar a chave de recuperación. Comprobe o contrasinal da chave de recuperación!",
     "Recovery key successfully disabled" : "Desactivada satisfactoriamente a chave de recuperación",
+    "Please provide the old recovery password" : "Por favor introduza a chave de recuperación anterior",
+    "Please provide a new recovery password" : "Por favor introduza a nova chave de recuperación",
+    "Please repeat the new recovery password" : "Por favor repita a nova chave de recuperación",
     "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
     "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
     "Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
diff --git a/apps/files_external/l10n/gl.js b/apps/files_external/l10n/gl.js
index 9e2ec2535b6..0ff342e958d 100644
--- a/apps/files_external/l10n/gl.js
+++ b/apps/files_external/l10n/gl.js
@@ -16,6 +16,7 @@ OC.L10N.register(
     "Amazon S3 and compliant" : "Amazon S3 e compatíbeis",
     "Access Key" : "Clave de acceso",
     "Secret Key" : "Clave secreta",
+    "Hostname" : "Nome de máquina",
     "Port" : "Porto",
     "Region" : "Autonomía",
     "Enable SSL" : "Activar SSL",
@@ -36,6 +37,7 @@ OC.L10N.register(
     "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
     "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP",
     "Share" : "Compartir",
     "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
     "Username as share" : "Nome de usuario como compartición",
@@ -48,6 +50,8 @@ OC.L10N.register(
     "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive",
     "Personal" : "Persoal",
     "System" : "Sistema",
+    "All users. Type to select user or group." : "Todos os usuarios. Escriba para selecionar usuario ou grupo.",
+    "(group)" : "(grupo)",
     "Saved" : "Gardado",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     " and " : "e",
diff --git a/apps/files_external/l10n/gl.json b/apps/files_external/l10n/gl.json
index e04afd7f5bd..549de28f928 100644
--- a/apps/files_external/l10n/gl.json
+++ b/apps/files_external/l10n/gl.json
@@ -14,6 +14,7 @@
     "Amazon S3 and compliant" : "Amazon S3 e compatíbeis",
     "Access Key" : "Clave de acceso",
     "Secret Key" : "Clave secreta",
+    "Hostname" : "Nome de máquina",
     "Port" : "Porto",
     "Region" : "Autonomía",
     "Enable SSL" : "Activar SSL",
@@ -34,6 +35,7 @@
     "Password (required for OpenStack Object Storage)" : "Contrasinal (obrigatorio para OpenStack Object Storage)",
     "Service Name (required for OpenStack Object Storage)" : "Nome do servizo (obrigatorio para OpenStack Object Storage)",
     "URL of identity endpoint (required for OpenStack Object Storage)" : "URL do punto final da identidade (obrigatorio para OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Caducidade, en segundos, das peticións HTTP",
     "Share" : "Compartir",
     "SMB / CIFS using OC login" : "SMB / CIFS usando acceso OC",
     "Username as share" : "Nome de usuario como compartición",
@@ -46,6 +48,8 @@
     "Error configuring Google Drive storage" : "Produciuse un erro ao configurar o almacenamento en Google Drive",
     "Personal" : "Persoal",
     "System" : "Sistema",
+    "All users. Type to select user or group." : "Todos os usuarios. Escriba para selecionar usuario ou grupo.",
+    "(group)" : "(grupo)",
     "Saved" : "Gardado",
     "<b>Note:</b> " : "<b>Nota:</b> ",
     " and " : "e",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index a1721cc4124..724775644dc 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -6,6 +6,8 @@ OC.L10N.register(
     "Turned off maintenance mode" : "Modo de mantemento desactivado",
     "Updated database" : "Base de datos actualizada",
     "Checked database schema update" : "Comprobada a actualización do esquema da base de datos",
+    "Checked database schema update for apps" : "Comprobada a base de datos para actualización de aplicativos",
+    "Updated \"%s\" to %s" : "Actualizado \"%s\" a %s",
     "Disabled incompatible apps: %s" : "Aplicacións incompatíbeis desactivadas: %s",
     "No image or file provided" : "Non forneceu ningunha imaxe ou ficheiro",
     "Unknown filetype" : "Tipo de ficheiro descoñecido",
@@ -63,6 +65,7 @@ OC.L10N.register(
     "Strong password" : "Contrasinal forte",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
     "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." : "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
+    "Error occurred while checking server setup" : "Aconteceu un erro mentras se comprobaba a configuración do servidor",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
     "Share" : "Compartir",
@@ -82,6 +85,7 @@ OC.L10N.register(
     "Send" : "Enviar",
     "Set expiration date" : "Definir a data de caducidade",
     "Expiration date" : "Data de caducidade",
+    "Adding user..." : "Engadindo usuario...",
     "group" : "grupo",
     "Resharing is not allowed" : "Non se permite volver compartir",
     "Shared in {item} with {user}" : "Compartido en {item} con {user}",
@@ -106,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}",
     "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "texto descoñecido",
+    "Hello world!" : "Hola mundo!",
+    "sunny" : "soleado",
+    "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo é {weather}",
+    "_download %n file_::_download %n files_" : ["descargar %n ficheiro","descargar %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
     "Please reload the page." : "Volva cargar a páxina.",
     "The update was unsuccessful." : "A actualización foi satisfactoria.",
@@ -138,9 +146,24 @@ OC.L10N.register(
     "Error favoriting" : "Produciuse un erro ao marcar como favorito",
     "Error unfavoriting" : "Produciuse un erro ao desmarcar como favorito",
     "Access forbidden" : "Acceso denegado",
+    "File not found" : "Ficheiro non atopado",
+    "The specified document has not been found on the server." : "Non se atopou no servidor o documento indicado.",
+    "You can click here to return to %s." : "Pode pulsar aquí para voltar a %s.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
     "The share will expire on %s." : "Esta compartición caduca o %s.",
     "Cheers!" : "Saúdos!",
+    "Internal Server Error" : "Erro interno do servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor atopou un erro interno e non foi quen de completar a súa petición.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor contacte co administrador se este erro acontece repetidamente, por favor inclúa os detalles técnicos indicados abaixo no seu informe.",
+    "More details can be found in the server log." : "Atopará máis detalles no rexistro do servidor.",
+    "Technical details" : "Detalles técnicos",
+    "Remote Address: %s" : "Enderezo remoto: %s",
+    "Request ID: %s" : "ID da petición: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensaxe: %s",
+    "File: %s" : "Ficheiro: %s",
+    "Line: %s" : "Liña: %s",
+    "Trace" : "Traza",
     "Security Warning" : "Aviso de seguranza",
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Actualice a instalación de PHP para empregar %s de xeito seguro.",
@@ -160,6 +183,7 @@ OC.L10N.register(
     "SQLite will be used as database. For larger installations we recommend to change this." : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
     "Finish setup" : "Rematar a configuración",
     "Finishing …" : "Rematando ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Este aplicativo precisa JavaScript para funcionar. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recargue a páxina.",
     "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
     "Log out" : "Desconectar",
     "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!",
@@ -175,11 +199,15 @@ OC.L10N.register(
     "Thank you for your patience." : "Grazas pola súa paciencia.",
     "You are accessing the server from an untrusted domain." : "Esta accedendo desde un dominio non fiábel.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da súa configuración, como administrador vostede podería utiizar o botón de abaixo para confiar en este dominio.",
+    "Add \"%s\" as trusted domain" : "Engadir \"%s\" como dominio de confianza",
     "%s will be updated to version %s." : "%s actualizarase á versión %s.",
     "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:",
     "The theme %s has been disabled." : "O tema %s foi desactivado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
     "Start update" : "Iniciar a actualización",
-    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:"
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instancia de %s está sendo actualizada e pode tardar un anaco.",
+    "This page will refresh itself when the %s instance is available again." : "Esta páxina actualizarase automáticamente cando a instancia de %s esté dispoñible de novo."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 1fbd26d2333..7715f3bebbf 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -4,6 +4,8 @@
     "Turned off maintenance mode" : "Modo de mantemento desactivado",
     "Updated database" : "Base de datos actualizada",
     "Checked database schema update" : "Comprobada a actualización do esquema da base de datos",
+    "Checked database schema update for apps" : "Comprobada a base de datos para actualización de aplicativos",
+    "Updated \"%s\" to %s" : "Actualizado \"%s\" a %s",
     "Disabled incompatible apps: %s" : "Aplicacións incompatíbeis desactivadas: %s",
     "No image or file provided" : "Non forneceu ningunha imaxe ou ficheiro",
     "Unknown filetype" : "Tipo de ficheiro descoñecido",
@@ -61,6 +63,7 @@
     "Strong password" : "Contrasinal forte",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web aínda non está configurado axeidamente para permitir a sincronización de ficheiros xa que semella que a interface WebDAV non está a funcionar.",
     "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." : "Este servidor non ten conexión a Internet. Isto significa que algunhas das funcionalidades como a montaxe de almacenamento externo, as notificacións sobre actualizacións ou instalación de aplicacións de terceiros non funcionan. O acceso aos ficheiros de forma remota e o envío de mensaxes de notificación poderían non funcionar. Suxerímoslle que active a conexión a Internet deste servidor se quere dispor de todas as funcionalidades.",
+    "Error occurred while checking server setup" : "Aconteceu un erro mentras se comprobaba a configuración do servidor",
     "Shared" : "Compartido",
     "Shared with {recipients}" : "Compartido con {recipients}",
     "Share" : "Compartir",
@@ -80,6 +83,7 @@
     "Send" : "Enviar",
     "Set expiration date" : "Definir a data de caducidade",
     "Expiration date" : "Data de caducidade",
+    "Adding user..." : "Engadindo usuario...",
     "group" : "grupo",
     "Resharing is not allowed" : "Non se permite volver compartir",
     "Shared in {item} with {user}" : "Compartido en {item} con {user}",
@@ -104,7 +108,11 @@
     "Edit tags" : "Editar etiquetas",
     "Error loading dialog template: {error}" : "Produciuse un erro ao cargar o modelo do dialogo: {error}",
     "No tags selected for deletion." : "Non se seleccionaron etiquetas para borrado.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "texto descoñecido",
+    "Hello world!" : "Hola mundo!",
+    "sunny" : "soleado",
+    "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo é {weather}",
+    "_download %n file_::_download %n files_" : ["descargar %n ficheiro","descargar %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "Actualizando {productName} a versión {version}, isto pode levar un anaco.",
     "Please reload the page." : "Volva cargar a páxina.",
     "The update was unsuccessful." : "A actualización foi satisfactoria.",
@@ -136,9 +144,24 @@
     "Error favoriting" : "Produciuse un erro ao marcar como favorito",
     "Error unfavoriting" : "Produciuse un erro ao desmarcar como favorito",
     "Access forbidden" : "Acceso denegado",
+    "File not found" : "Ficheiro non atopado",
+    "The specified document has not been found on the server." : "Non se atopou no servidor o documento indicado.",
+    "You can click here to return to %s." : "Pode pulsar aquí para voltar a %s.",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Ola,\n\nsó facerlle saber que %s compartiu %s con vostede.\nVéxao en: %s\n\n",
     "The share will expire on %s." : "Esta compartición caduca o %s.",
     "Cheers!" : "Saúdos!",
+    "Internal Server Error" : "Erro interno do servidor",
+    "The server encountered an internal error and was unable to complete your request." : "O servidor atopou un erro interno e non foi quen de completar a súa petición.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Por favor contacte co administrador se este erro acontece repetidamente, por favor inclúa os detalles técnicos indicados abaixo no seu informe.",
+    "More details can be found in the server log." : "Atopará máis detalles no rexistro do servidor.",
+    "Technical details" : "Detalles técnicos",
+    "Remote Address: %s" : "Enderezo remoto: %s",
+    "Request ID: %s" : "ID da petición: %s",
+    "Code: %s" : "Código: %s",
+    "Message: %s" : "Mensaxe: %s",
+    "File: %s" : "Ficheiro: %s",
+    "Line: %s" : "Liña: %s",
+    "Trace" : "Traza",
     "Security Warning" : "Aviso de seguranza",
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "A súa versión de PHP é vulnerábel a un ataque de byte nulo (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Actualice a instalación de PHP para empregar %s de xeito seguro.",
@@ -158,6 +181,7 @@
     "SQLite will be used as database. For larger installations we recommend to change this." : "Empregarase SQLite como base de datos. Para instalacións máis grandes recomendámoslle que cambie isto.",
     "Finish setup" : "Rematar a configuración",
     "Finishing …" : "Rematando ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Este aplicativo precisa JavaScript para funcionar. Por favor <a href=\"http://enable-javascript.com/\" target=\"_blank\">habilite JavaScript</a> e recargue a páxina.",
     "%s is available. Get more information on how to update." : "%s está dispoñíbel. Obteña máis información sobre como actualizar.",
     "Log out" : "Desconectar",
     "Server side authentication failed!" : "A autenticación fracasou do lado do servidor!",
@@ -173,11 +197,15 @@
     "Thank you for your patience." : "Grazas pola súa paciencia.",
     "You are accessing the server from an untrusted domain." : "Esta accedendo desde un dominio non fiábel.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Póñase en contacto co administrador. Se vostede é administrador desta instancia, configure o parámetro «trusted_domain» en config/config.php. Dispón dun exemplo de configuración en config/config.sample.php.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Dependendo da súa configuración, como administrador vostede podería utiizar o botón de abaixo para confiar en este dominio.",
+    "Add \"%s\" as trusted domain" : "Engadir \"%s\" como dominio de confianza",
     "%s will be updated to version %s." : "%s actualizarase á versión %s.",
     "The following apps will be disabled:" : "Van desactivarse as seguintes aplicacións:",
     "The theme %s has been disabled." : "O tema %s foi desactivado.",
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Asegúrese de ter feito unha copia de seguranza da base de datos, do cartafol de configuración e do cartafol de datos, antes de proceder.",
     "Start update" : "Iniciar a actualización",
-    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:"
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Para evitar tempos de espera nas instalacións grandes, no seu lugar pode executar a seguinte orde desde o directorio de instalación:",
+    "This %s instance is currently being updated, which may take a while." : "Esta instancia de %s está sendo actualizada e pode tardar un anaco.",
+    "This page will refresh itself when the %s instance is available again." : "Esta páxina actualizarase automáticamente cando a instancia de %s esté dispoñible de novo."
 },"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 139ab56b28d..066be34d07a 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -110,6 +110,10 @@ OC.L10N.register(
     "Edit tags" : "Изменить метки",
     "Error loading dialog template: {error}" : "Ошибка загрузки шаблона диалога: {error}",
     "No tags selected for deletion." : "Не выбраны метки для удаления.",
+    "unknown text" : "неизвестный текст",
+    "Hello world!" : "Привет мир!",
+    "sunny" : "солнечно",
+    "Hello {name}, the weather is {weather}" : "Здравствуйте {name}, погода {weather}",
     "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Обновление {productName} до версии {version}, пожалуйста, подождите.",
     "Please reload the page." : "Пожалуйста, перезагрузите страницу.",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index 6f953759740..a65f9b502b0 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -108,6 +108,10 @@
     "Edit tags" : "Изменить метки",
     "Error loading dialog template: {error}" : "Ошибка загрузки шаблона диалога: {error}",
     "No tags selected for deletion." : "Не выбраны метки для удаления.",
+    "unknown text" : "неизвестный текст",
+    "Hello world!" : "Привет мир!",
+    "sunny" : "солнечно",
+    "Hello {name}, the weather is {weather}" : "Здравствуйте {name}, погода {weather}",
     "_download %n file_::_download %n files_" : ["","",""],
     "Updating {productName} to version {version}, this may take a while." : "Обновление {productName} до версии {version}, пожалуйста, подождите.",
     "Please reload the page." : "Пожалуйста, перезагрузите страницу.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 119495795e1..0f0209f6666 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index c4ddf2690ab..58995baad8b 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index b32ceaf9063..cb3d40bee8a 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 7e06ab47266..0e81708e464 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 9be5d259176..4a1bfaf9aba 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index c51f827131c..a90207b6f37 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index d4481c84653..ef55e0242f3 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 5b23768861f..88a4a5cb970 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,7 +33,7 @@ msgstr ""
 msgid "See %s"
 msgstr ""
 
-#: base.php:209 private/util.php:476
+#: base.php:209 private/util.php:502
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
@@ -407,51 +407,51 @@ msgstr ""
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: private/template/functions.php:193
+#: private/template/functions.php:225
 msgid "seconds ago"
 msgstr ""
 
-#: private/template/functions.php:194
+#: private/template/functions.php:226
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:195
+#: private/template/functions.php:227
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:196
+#: private/template/functions.php:228
 msgid "today"
 msgstr ""
 
-#: private/template/functions.php:197
+#: private/template/functions.php:229
 msgid "yesterday"
 msgstr ""
 
-#: private/template/functions.php:199
+#: private/template/functions.php:231
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:201
+#: private/template/functions.php:233
 msgid "last month"
 msgstr ""
 
-#: private/template/functions.php:202
+#: private/template/functions.php:234
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: private/template/functions.php:204
+#: private/template/functions.php:236
 msgid "last year"
 msgstr ""
 
-#: private/template/functions.php:205
+#: private/template/functions.php:237
 msgid "years ago"
 msgstr ""
 
@@ -473,144 +473,144 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: private/util.php:461
+#: private/util.php:487
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: private/util.php:468
+#: private/util.php:494
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: private/util.php:475
+#: private/util.php:501
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: private/util.php:489
+#: private/util.php:515
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: private/util.php:490
+#: private/util.php:516
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: private/util.php:505
+#: private/util.php:531
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: private/util.php:506
+#: private/util.php:532
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: private/util.php:523
+#: private/util.php:549
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: private/util.php:526
+#: private/util.php:552
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: private/util.php:555
+#: private/util.php:581
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: private/util.php:575
+#: private/util.php:601
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: private/util.php:583
+#: private/util.php:609
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: private/util.php:584
+#: private/util.php:610
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: private/util.php:595
+#: private/util.php:621
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:596
+#: private/util.php:622
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:603
+#: private/util.php:629
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: private/util.php:604
+#: private/util.php:630
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: private/util.php:618
+#: private/util.php:644
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: private/util.php:619
+#: private/util.php:645
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: private/util.php:649
+#: private/util.php:675
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: private/util.php:650
+#: private/util.php:676
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: private/util.php:657
+#: private/util.php:683
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: private/util.php:658
+#: private/util.php:684
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: private/util.php:723
+#: private/util.php:749
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: private/util.php:732
+#: private/util.php:758
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: private/util.php:753
+#: private/util.php:779
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: private/util.php:754
+#: private/util.php:780
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index a3efae2b555..ac4d63bb437 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -366,51 +366,51 @@ msgstr ""
 msgid "Could not find category \"%s\""
 msgstr ""
 
-#: template/functions.php:193
+#: template/functions.php:225
 msgid "seconds ago"
 msgstr ""
 
-#: template/functions.php:194
+#: template/functions.php:226
 msgid "%n minute ago"
 msgid_plural "%n minutes ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:195
+#: template/functions.php:227
 msgid "%n hour ago"
 msgid_plural "%n hours ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:196
+#: template/functions.php:228
 msgid "today"
 msgstr ""
 
-#: template/functions.php:197
+#: template/functions.php:229
 msgid "yesterday"
 msgstr ""
 
-#: template/functions.php:199
+#: template/functions.php:231
 msgid "%n day go"
 msgid_plural "%n days ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:201
+#: template/functions.php:233
 msgid "last month"
 msgstr ""
 
-#: template/functions.php:202
+#: template/functions.php:234
 msgid "%n month ago"
 msgid_plural "%n months ago"
 msgstr[0] ""
 msgstr[1] ""
 
-#: template/functions.php:204
+#: template/functions.php:236
 msgid "last year"
 msgstr ""
 
-#: template/functions.php:205
+#: template/functions.php:237
 msgid "years ago"
 msgstr ""
 
@@ -432,151 +432,151 @@ msgstr ""
 msgid "The username is already being used"
 msgstr ""
 
-#: util.php:461
+#: util.php:487
 msgid "No database drivers (sqlite, mysql, or postgresql) installed."
 msgstr ""
 
-#: util.php:468
+#: util.php:494
 #, php-format
 msgid ""
 "Permissions can usually be fixed by %sgiving the webserver write access to "
 "the root directory%s."
 msgstr ""
 
-#: util.php:475
+#: util.php:501
 msgid "Cannot write into \"config\" directory"
 msgstr ""
 
-#: util.php:476
+#: util.php:502
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the "
 "config directory%s."
 msgstr ""
 
-#: util.php:489
+#: util.php:515
 msgid "Cannot write into \"apps\" directory"
 msgstr ""
 
-#: util.php:490
+#: util.php:516
 #, php-format
 msgid ""
 "This can usually be fixed by %sgiving the webserver write access to the apps "
 "directory%s or disabling the appstore in the config file."
 msgstr ""
 
-#: util.php:505
+#: util.php:531
 #, php-format
 msgid "Cannot create \"data\" directory (%s)"
 msgstr ""
 
-#: util.php:506
+#: util.php:532
 #, php-format
 msgid ""
 "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
 "webserver write access to the root directory</a>."
 msgstr ""
 
-#: util.php:523
+#: util.php:549
 #, php-format
 msgid "Setting locale to %s failed"
 msgstr ""
 
-#: util.php:526
+#: util.php:552
 msgid ""
 "Please install one of these locales on your system and restart your "
 "webserver."
 msgstr ""
 
-#: util.php:555
+#: util.php:581
 msgid "Please ask your server administrator to install the module."
 msgstr ""
 
-#: util.php:575
+#: util.php:601
 #, php-format
 msgid "PHP module %s not installed."
 msgstr ""
 
-#: util.php:583
+#: util.php:609
 #, php-format
 msgid "PHP %s or higher is required."
 msgstr ""
 
-#: util.php:584
+#: util.php:610
 msgid ""
 "Please ask your server administrator to update PHP to the latest version. "
 "Your PHP version is no longer supported by ownCloud and the PHP community."
 msgstr ""
 
-#: util.php:595
+#: util.php:621
 msgid ""
 "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:596
+#: util.php:622
 msgid ""
 "PHP Safe Mode is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:603
+#: util.php:629
 msgid ""
 "Magic Quotes is enabled. ownCloud requires that it is disabled to work "
 "properly."
 msgstr ""
 
-#: util.php:604
+#: util.php:630
 msgid ""
 "Magic Quotes is a deprecated and mostly useless setting that should be "
 "disabled. Please ask your server administrator to disable it in php.ini or "
 "in your webserver config."
 msgstr ""
 
-#: util.php:618
+#: util.php:644
 msgid "PHP modules have been installed, but they are still listed as missing?"
 msgstr ""
 
-#: util.php:619
+#: util.php:645
 msgid "Please ask your server administrator to restart the web server."
 msgstr ""
 
-#: util.php:649
+#: util.php:675
 msgid "PostgreSQL >= 9 required"
 msgstr ""
 
-#: util.php:650
+#: util.php:676
 msgid "Please upgrade your database version"
 msgstr ""
 
-#: util.php:657
+#: util.php:683
 msgid "Error occurred while checking PostgreSQL version"
 msgstr ""
 
-#: util.php:658
+#: util.php:684
 msgid ""
 "Please make sure you have PostgreSQL >= 9 or check the logs for more "
 "information about the error"
 msgstr ""
 
-#: util.php:723
+#: util.php:749
 msgid ""
 "Please change the permissions to 0770 so that the directory cannot be listed "
 "by other users."
 msgstr ""
 
-#: util.php:732
+#: util.php:758
 #, php-format
 msgid "Data directory (%s) is readable by other users"
 msgstr ""
 
-#: util.php:753
+#: util.php:779
 #, php-format
 msgid "Data directory (%s) is invalid"
 msgstr ""
 
-#: util.php:754
+#: util.php:780
 msgid ""
 "Please check that the data directory contains a file \".ocdata\" in its root."
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index d92f92e1c07..3f5dcc6931b 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index a8a9879dd1b..bba404e5906 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 31e740ba75f..472368c45ab 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-04 01:54-0500\n"
+"POT-Creation-Date: 2014-11-05 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index d5da14afd97..20ed5013853 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Settings" : "Настройки",
     "Users" : "Пользователи",
     "Admin" : "Администрирование",
+    "Recommended" : "Рекомендовано",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Невозможно установить приложение \\\"%s\\\", т.к. оно несовместимо с этой версией ownCloud.",
     "No app name specified" : "Не указано имя приложения",
     "Unknown filetype" : "Неизвестный тип файла",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index 60c0d7ecfa0..a8636cf4c35 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -10,6 +10,7 @@
     "Settings" : "Настройки",
     "Users" : "Пользователи",
     "Admin" : "Администрирование",
+    "Recommended" : "Рекомендовано",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Невозможно установить приложение \\\"%s\\\", т.к. оно несовместимо с этой версией ownCloud.",
     "No app name specified" : "Не указано имя приложения",
     "Unknown filetype" : "Неизвестный тип файла",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index c582a867b7d..90e4bd6ec7b 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
     "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
     "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Connectivity Checks" : "Ověřování připojení",
     "No problems found" : "Nebyly nalezeny žádné problémy",
     "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
     "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 9f5a0369145..b763d0efd3e 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
     "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
     "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Connectivity Checks" : "Ověřování připojení",
     "No problems found" : "Nebyly nalezeny žádné problémy",
     "Please double check the <a href='%s'>installation guides</a>." : "Zkonzultujte, prosím, <a href='%s'>průvodce instalací</a>.",
     "Last cron was executed at %s." : "Poslední cron byl spuštěn v %s",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 52a83dabc4c..efc3da5f9df 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
     "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
+    "Connectivity Checks" : "Forbindelsestjek",
     "No problems found" : "Der blev ikke fundet problemer",
     "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
     "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 5441f52a3a7..1d58d5c083d 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
     "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
+    "Connectivity Checks" : "Forbindelsestjek",
     "No problems found" : "Der blev ikke fundet problemer",
     "Please double check the <a href='%s'>installation guides</a>." : "Dobbelttjek venligst <a href='%s'>installations vejledningerne</a>.",
     "Last cron was executed at %s." : "Seneste 'cron' blev kørt %s.",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 94734d22be0..c990e8fb86a 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
+    "Connectivity Checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index f8d10f7ba46..92f88e307c8 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
+    "Connectivity Checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfe die <a href='%s'>Installationsanleitungen</a>.",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 5c6bbeea6eb..442dae8edce 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
+    "Connectivity Checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index db2ee248960..b9a4eee7804 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
+    "Connectivity Checks" : "Verbindungsüberprüfungen",
     "No problems found" : "Keine Probleme gefunden",
     "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
     "Last cron was executed at %s." : "Letzter Cron wurde um %s ausgeführt.",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 75ff2687d94..a4a9af22b39 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "URL generation in notification emails" : "URL generation in notification emails",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
+    "Connectivity Checks" : "Connectivity Checks",
     "No problems found" : "No problems found",
     "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "Last cron was executed at %s.",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 92007328784..b7dca2c7b0f 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "URL generation in notification emails" : "URL generation in notification emails",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
+    "Connectivity Checks" : "Connectivity Checks",
     "No problems found" : "No problems found",
     "Please double check the <a href='%s'>installation guides</a>." : "Please double check the <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "Last cron was executed at %s.",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index ffaa4c0f946..dee21d78e0f 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
+    "Connectivity Checks" : "Vérification de la connectivité",
     "No problems found" : "Aucun problème trouvé",
     "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
     "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 500dc0e7765..40bc023ea1b 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
+    "Connectivity Checks" : "Vérification de la connectivité",
     "No problems found" : "Aucun problème trouvé",
     "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
     "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 2132ed9556c..c282e31a975 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install 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.",
     "URL generation in notification emails" : "URL genereren in notificatie e-mails",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
+    "Connectivity Checks" : "Verbindingscontroles",
     "No problems found" : "Geen problemen gevonden",
     "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
     "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 6b007c100cf..e4cd7312510 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install 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.",
     "URL generation in notification emails" : "URL genereren in notificatie e-mails",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
+    "Connectivity Checks" : "Verbindingscontroles",
     "No problems found" : "Geen problemen gevonden",
     "Please double check the <a href='%s'>installation guides</a>." : "Controleer de <a href='%s'>installatiehandleiding</a> goed.",
     "Last cron was executed at %s." : "Laatst uitgevoerde cron op %s.",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 80c1cbf99e3..6103cf7deb1 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
     "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
+    "Connectivity Checks" : "Verificações de Conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
     "Last cron was executed at %s." : "Último cron foi executado em %s.",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 63decc7422e..60eb59db740 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
     "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
+    "Connectivity Checks" : "Verificações de Conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, confira o <a href='%s'>guia de instalação</a>.",
     "Last cron was executed at %s." : "Último cron foi executado em %s.",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index bc1a6e1bca3..6847eb46393 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
+    "Connectivity Checks" : "Verificações de Conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 64796f4e072..6af97b64a8a 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
+    "Connectivity Checks" : "Verificações de Conectividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 09e6adcdabd..4e3eea6d1ea 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Предупреждения безопасности и инсталляции",
     "Cron" : "Планировщик задач по расписанию",
     "Sharing" : "Общий доступ",
     "Security" : "Безопасность",
@@ -36,9 +37,12 @@ OC.L10N.register(
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
+    "Not enabled" : "Выключено",
+    "Recommended" : "Рекомендовано",
     "Saved" : "Сохранено",
     "test email settings" : "проверить настройки почты",
     "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
+    "A problem occurred while sending the email. Please revise your settings." : "Возникла проблема при отправке письма. Пожалуйста, проверьте ваши настройки.",
     "Email sent" : "Письмо отправлено",
     "You need to set your user email before being able to send test emails." : "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
@@ -73,6 +77,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Введите правильное имя группы",
     "deleted {groupName}" : "удалено {groupName}",
     "undo" : "отмена",
+    "no group" : "Нет группы",
     "never" : "никогда",
     "deleted {userName}" : "удалён {userName}",
     "add group" : "добавить группу",
@@ -81,6 +86,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Укажите валидный пароль",
     "Warning: Home directory for user \"{user}\" already exists" : "Предупреждение: домашняя папка пользователя \"{user}\" уже существует",
     "__language_name__" : "Русский ",
+    "Personal Info" : "Личная информация",
     "SSL root certificates" : "Корневые сертификаты SSL",
     "Encryption" : "Шифрование",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
@@ -114,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
     "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
+    "Connectivity Checks" : "Проверка соединения",
     "No problems found" : "Проблемы не найдены",
     "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
     "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
@@ -149,6 +156,7 @@ OC.L10N.register(
     "Credentials" : "Учётные данные",
     "SMTP Username" : "Пользователь SMTP",
     "SMTP Password" : "Пароль SMTP",
+    "Store credentials" : "Хранить учётные данные",
     "Test email settings" : "Проверить настройки почты",
     "Send email" : "Отправить сообщение",
     "Log level" : "Уровень детализации журнала",
@@ -157,10 +165,13 @@ OC.L10N.register(
     "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>." : "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Ещё приложения",
+    "Add your app" : "Добавить своё приложение",
     "by" : ":",
+    "licensed" : "Лицензировано",
     "Documentation:" : "Документация:",
     "User Documentation" : "Пользовательская документация",
     "Admin Documentation" : "Документация администратора",
+    "Update to %s" : "Обновить до %s",
     "Enable only for specific groups" : "Включить только для этих групп",
     "Uninstall App" : "Удалить приложение",
     "Administrator Documentation" : "Документация администратора",
@@ -219,6 +230,7 @@ OC.L10N.register(
     "Unlimited" : "Неограниченно",
     "Other" : "Другое",
     "Username" : "Имя пользователя",
+    "Group Admin for" : "Для группы Администраторов",
     "Quota" : "Квота",
     "Storage Location" : "Место хранилища",
     "Last Login" : "Последний вход",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index fcae19893aa..352dde9bf37 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Предупреждения безопасности и инсталляции",
     "Cron" : "Планировщик задач по расписанию",
     "Sharing" : "Общий доступ",
     "Security" : "Безопасность",
@@ -34,9 +35,12 @@
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Используемый механизм не поддерживает смену паролей, но пользовательский ключ шифрования был успешно обновлён",
     "Unable to change password" : "Невозможно изменить пароль",
     "Enabled" : "Включено",
+    "Not enabled" : "Выключено",
+    "Recommended" : "Рекомендовано",
     "Saved" : "Сохранено",
     "test email settings" : "проверить настройки почты",
     "If you received this email, the settings seem to be correct." : "Если вы получили это письмо, настройки верны.",
+    "A problem occurred while sending the email. Please revise your settings." : "Возникла проблема при отправке письма. Пожалуйста, проверьте ваши настройки.",
     "Email sent" : "Письмо отправлено",
     "You need to set your user email before being able to send test emails." : "Вы должны настроить свой e-mail пользователя прежде чем отправлять тестовые сообщения.",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Вы действительно хотите добавить домен \"{domain}\" как доверенный?",
@@ -71,6 +75,7 @@
     "A valid group name must be provided" : "Введите правильное имя группы",
     "deleted {groupName}" : "удалено {groupName}",
     "undo" : "отмена",
+    "no group" : "Нет группы",
     "never" : "никогда",
     "deleted {userName}" : "удалён {userName}",
     "add group" : "добавить группу",
@@ -79,6 +84,7 @@
     "A valid password must be provided" : "Укажите валидный пароль",
     "Warning: Home directory for user \"{user}\" already exists" : "Предупреждение: домашняя папка пользователя \"{user}\" уже существует",
     "__language_name__" : "Русский ",
+    "Personal Info" : "Личная информация",
     "SSL root certificates" : "Корневые сертификаты SSL",
     "Encryption" : "Шифрование",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Все (критические проблемы, ошибки, предупреждения, информационные, отладочные)",
@@ -112,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
     "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
+    "Connectivity Checks" : "Проверка соединения",
     "No problems found" : "Проблемы не найдены",
     "Please double check the <a href='%s'>installation guides</a>." : "Пожалуйста, дважды просмотрите <a href='%s'>инструкции по установке</a>.",
     "Last cron was executed at %s." : "Последняя cron-задача была запущена: %s.",
@@ -147,6 +154,7 @@
     "Credentials" : "Учётные данные",
     "SMTP Username" : "Пользователь SMTP",
     "SMTP Password" : "Пароль SMTP",
+    "Store credentials" : "Хранить учётные данные",
     "Test email settings" : "Проверить настройки почты",
     "Send email" : "Отправить сообщение",
     "Log level" : "Уровень детализации журнала",
@@ -155,10 +163,13 @@
     "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>." : "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Ещё приложения",
+    "Add your app" : "Добавить своё приложение",
     "by" : ":",
+    "licensed" : "Лицензировано",
     "Documentation:" : "Документация:",
     "User Documentation" : "Пользовательская документация",
     "Admin Documentation" : "Документация администратора",
+    "Update to %s" : "Обновить до %s",
     "Enable only for specific groups" : "Включить только для этих групп",
     "Uninstall App" : "Удалить приложение",
     "Administrator Documentation" : "Документация администратора",
@@ -217,6 +228,7 @@
     "Unlimited" : "Неограниченно",
     "Other" : "Другое",
     "Username" : "Имя пользователя",
+    "Group Admin for" : "Для группы Администраторов",
     "Quota" : "Квота",
     "Storage Location" : "Место хранилища",
     "Last Login" : "Последний вход",
-- 
GitLab


From 8116d903dd0d8c321f439d93901450f5ee77f191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 5 Nov 2014 11:08:17 +0100
Subject: [PATCH 322/616] adjust strings - fixed #11930

---
 apps/files_sharing/templates/settings-admin.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/templates/settings-admin.php b/apps/files_sharing/templates/settings-admin.php
index 7c84f770fa6..c71ef31b21c 100644
--- a/apps/files_sharing/templates/settings-admin.php
+++ b/apps/files_sharing/templates/settings-admin.php
@@ -1,13 +1,21 @@
+<?php
+/** @var OC_L10N $l */
+/** @var array $_ */
+?>
 <div class="section" id="fileSharingSettings" >
 
-	<h2><?php p($l->t('Remote Shares'));?></h2>
+	<h2><?php p($l->t('Server-to-Server Sharing'));?></h2>
 
 	<input type="checkbox" name="outgoing_server2server_share_enabled" id="outgoingServer2serverShareEnabled"
 		   value="1" <?php if ($_['outgoingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
-	<label for="outgoingServer2serverShareEnabled"><?php p($l->t('Allow other instances to mount public links shared from this server'));?></label><br/>
+	<label for="outgoingServer2serverShareEnabled">
+		<?php p($l->t('Allow users on this server to send shares to other servers'));?>
+	</label><br/>
 
 	<input type="checkbox" name="incoming_server2server_share_enabled" id="incomingServer2serverShareEnabled"
 		   value="1" <?php if ($_['incomingServer2serverShareEnabled']) print_unescaped('checked="checked"'); ?> />
-	<label for="incomingServer2serverShareEnabled"><?php p($l->t('Allow users to mount public link shares'));?></label><br/>
+	<label for="incomingServer2serverShareEnabled">
+		<?php p($l->t('Allow users on this server to receive shares from other servers'));?>
+	</label><br/>
 
 </div>
-- 
GitLab


From 2c941729eea47529fe687cea391240186b0f83c0 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 11:13:00 +0100
Subject: [PATCH 323/616] ignore core/vendor in scrutinizer

---
 .scrutinizer.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 8ce8822d99f..fc2a86d15a2 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -6,12 +6,9 @@ filter:
         - 'core/l10n/*'
         - 'apps/*/l10n/*'
         - 'lib/l10n/*'
+         - 'core/vendor/*'
         - 'core/js/tests/lib/*.js'
         - 'core/js/tests/specs/*.js'
-        - 'core/js/jquery-1.10.0.js'
-        - 'core/js/jquery-1.10.0.min.js'
-        - 'core/js/jquery-migrate-1.2.1.js'
-        - 'core/js/jquery-migrate-1.2.1.min.js'
         - 'core/js/jquery-showpassword.js'
         - 'core/js/jquery-tipsy.js'
         - 'core/js/jquery-ui-1.10.0.custom.js'
-- 
GitLab


From 91a23bfa9c9b3d7dd5f564910ad99be2316c15e0 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Wed, 5 Nov 2014 12:04:56 +0100
Subject: [PATCH 324/616] fix typo in content type

---
 lib/public/appframework/http/jsonresponse.php    | 2 +-
 tests/lib/appframework/http/JSONResponseTest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/public/appframework/http/jsonresponse.php b/lib/public/appframework/http/jsonresponse.php
index c6360e0a0f5..c9c8696323d 100644
--- a/lib/public/appframework/http/jsonresponse.php
+++ b/lib/public/appframework/http/jsonresponse.php
@@ -49,7 +49,7 @@ class JSONResponse extends Response {
 	public function __construct($data=array(), $statusCode=Http::STATUS_OK) {
 		$this->data = $data;
 		$this->setStatus($statusCode);
-		$this->addHeader('Content-type', 'application/json; charset=utf-8');
+		$this->addHeader('Content-Type', 'application/json; charset=utf-8');
 	}
 
 
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index f7c89a9d2e1..06cd3410a69 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -44,7 +44,7 @@ class JSONResponseTest extends \PHPUnit_Framework_TestCase {
 
 	public function testHeader() {
 		$headers = $this->json->getHeaders();
-		$this->assertEquals('application/json; charset=utf-8', $headers['Content-type']);
+		$this->assertEquals('application/json; charset=utf-8', $headers['Content-Type']);
 	}
 
 
-- 
GitLab


From a857bf1d505cbebf6684cbd0bfdd6e5a87eae3d8 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 12:57:18 +0100
Subject: [PATCH 325/616] drop jquery.inview as it is unused

---
 .scrutinizer.yml              |   1 -
 core/js/LICENSE.jquery.inview |  41 -----------
 core/js/jquery.inview.js      | 134 ----------------------------------
 core/js/jquery.inview.txt     |  15 ----
 settings/users.php            |   1 -
 5 files changed, 192 deletions(-)
 delete mode 100644 core/js/LICENSE.jquery.inview
 delete mode 100644 core/js/jquery.inview.js
 delete mode 100644 core/js/jquery.inview.txt

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 8ce8822d99f..b8f7b6b4ad2 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -15,7 +15,6 @@ filter:
         - 'core/js/jquery-showpassword.js'
         - 'core/js/jquery-tipsy.js'
         - 'core/js/jquery-ui-1.10.0.custom.js'
-        - 'core/js/jquery.inview.js'
         - 'core/js/placeholders.js'
         - 'core/js/underscore.js'
         - 'core/js/jquery.multiselect.js'
diff --git a/core/js/LICENSE.jquery.inview b/core/js/LICENSE.jquery.inview
deleted file mode 100644
index 1ed340edbe5..00000000000
--- a/core/js/LICENSE.jquery.inview
+++ /dev/null
@@ -1,41 +0,0 @@
-Attribution-Non-Commercial-Share Alike 2.0 UK: England & Wales
-
-http://creativecommons.org/licenses/by-nc-sa/2.0/uk/
-
-You are free:
-
-    * to copy, distribute, display, and perform the work
-    * to make derivative works
-
-
-Under the following conditions:
-
-    * Attribution — You must give the original author credit.
-      Attribute this work:
-      Information
-      What does "Attribute this work" mean?
-      The page you came from contained embedded licensing metadata, 
-      including how the creator wishes to be attributed for re-use. 
-      You can use the HTML here to cite the work. Doing so will 
-      also include metadata on your page so that others can find the 
-      original work as well.
-
-    * Non-Commercial — You may not use this work for commercial 
-      purposes.
-    * Share Alike — If you alter, transform, or build upon this 
-      work, you may distribute the resulting work only under a 
-      licence identical to this one.
-
-With the understanding that:
-
-    * Waiver — Any of the above conditions can be waived if you get 
-      permission from the copyright holder.
-    * Other Rights — In no way are any of the following rights 
-      affected by the license:
-          o Your fair dealing or fair use rights;
-          o The author's moral rights;
-          o Rights other persons may have either in the work itself 
-            or in how the work is used, such as publicity or privacy rights.
-    * Notice — For any reuse or distribution, you must make clear to 
-      others the licence terms of this work.
-
diff --git a/core/js/jquery.inview.js b/core/js/jquery.inview.js
deleted file mode 100644
index 511ae95415e..00000000000
--- a/core/js/jquery.inview.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * author Christopher Blum
- *    - based on the idea of Remy Sharp, http://remysharp.com/2009/01/26/element-in-view-event-plugin/
- *    - forked from http://github.com/zuk/jquery.inview/
- */
-(function ($) {
-  var inviewObjects = {}, viewportSize, viewportOffset,
-      d = document, w = window, documentElement = d.documentElement, expando = $.expando, isFiring = false, $elements = {};
-
-  $.event.special.inview = {
-    add: function(data) {
-      var inviewObject = { data: data, $element: $(this) }
-      inviewObjects[data.guid + "-" + this[expando]] = inviewObject;
-      var selector  = inviewObject.data.selector,
-      $element  = inviewObject.$element;
-      var hash = parseInt(getHash( data.guid + this[expando]));
-      $elements[hash] =  selector ? $element.find(selector) : $element;
-    },
-
-    remove: function(data) {
-      try { delete inviewObjects[data.guid + "-" + this[expando]]; } catch(e) {}
-      try {
-        var hash = parseInt(getHash(data.guid + this[expando])); 
-	delete($elements[hash]);
-      } catch (e){}
-    }
-  };
-
-  
-  function getHash(str){
-    str = str+'';
-    var hash = 0;
-    if (str.length == 0) return hash;
-    for (i = 0; i < str.length; i++) {
-        char = str.charCodeAt(i);
-        hash = ((hash<<5)-hash)+char;
-        hash = hash & hash; // Convert to 32bit integer
-    }
-    return Math.abs(hash);
-  }
-  
-  function getViewportSize() {
-    var mode, domObject, size = { height: w.innerHeight, width: w.innerWidth };
-
-    // if this is correct then return it. iPad has compat Mode, so will
-    // go into check clientHeight/clientWidth (which has the wrong value).
-    if (!size.height) {
-      mode = d.compatMode;
-      if (mode || !$.support.boxModel) { // IE, Gecko
-        domObject = mode === 'CSS1Compat' ?
-          documentElement : // Standards
-          d.body; // Quirks
-        size = {
-          height: domObject.clientHeight,
-          width:  domObject.clientWidth
-        };
-      }
-    }
-
-    return size;
-  }
-
-  function getViewportOffset() {
-    return {
-      top:  w.pageYOffset || documentElement.scrollTop   || (d.body?d.body.scrollTop:0),
-      left: w.pageXOffset || documentElement.scrollLeft  || (d.body?d.body.scrollLeft:0)
-    };
-  }
-
-  function checkInView() {
-    if (isFiring){
-      return;
-    }
-    isFiring = true;
-      viewportSize   = viewportSize   || getViewportSize();
-      viewportOffset = viewportOffset || getViewportOffset();
-      
-      for (var i in $elements) {
-        if (isNaN(parseInt(i))) {
-          continue;
-        }
-
-        var $element      = $($elements[i]),
-            elementSize   = { height: $element.height(), width: $element.width() },
-            elementOffset = $element.offset(),
-            inView        = $element.data('inview'),
-            visiblePartX,
-            visiblePartY,
-            visiblePartsMerged;
-
-        // Don't ask me why because I haven't figured out yet:
-        // viewportOffset and viewportSize are sometimes suddenly null in Firefox 5.
-        // Even though it sounds weird:
-        // It seems that the execution of this function is interferred by the onresize/onscroll event
-        // where viewportOffset and viewportSize are unset
-        if (!viewportOffset || !viewportSize) {
-	  isFiring = false;
-          return;
-        }
-        
-        if (elementOffset.top + elementSize.height > viewportOffset.top &&
-            elementOffset.top < viewportOffset.top + viewportSize.height &&
-            elementOffset.left + elementSize.width > viewportOffset.left &&
-            elementOffset.left < viewportOffset.left + viewportSize.width) {
-          visiblePartX = (viewportOffset.left > elementOffset.left ?
-            'right' : (viewportOffset.left + viewportSize.width) < (elementOffset.left + elementSize.width) ?
-            'left' : 'both');
-          visiblePartY = (viewportOffset.top > elementOffset.top ?
-            'bottom' : (viewportOffset.top + viewportSize.height) < (elementOffset.top + elementSize.height) ?
-            'top' : 'both');
-          visiblePartsMerged = visiblePartX + "-" + visiblePartY;
-          if (!inView || inView !== visiblePartsMerged) {
-            $element.data('inview', visiblePartsMerged).trigger('inview', [true, visiblePartX, visiblePartY]);
-          }
-        } else if (inView) {
-          $element.data('inview', false).trigger('inview', [false]);
-        }
-      }
-      isFiring = false;
-  }
-
-  $(w).bind("scroll resize", function() {
-    viewportSize = viewportOffset = null;
-  });
-
-  // Use setInterval in order to also make sure this captures elements within
-  // "overflow:scroll" elements or elements that appeared in the dom tree due to
-  // dom manipulation and reflow
-  // old: $(window).scroll(checkInView);
-  //
-  // By the way, iOS (iPad, iPhone, ...) seems to not execute, or at least delays
-  // intervals while the user scrolls. Therefore the inview event might fire a bit late there
-  setInterval(checkInView, 250);
-})(jQuery);
diff --git a/core/js/jquery.inview.txt b/core/js/jquery.inview.txt
deleted file mode 100644
index c53dbd1d97c..00000000000
--- a/core/js/jquery.inview.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-jQuery.inview is licensed Attribution-Non-Commercial-Share Alike 2.0 but the
-conditions has been waived by the author in the following tweet:
-
-https://twitter.com/#!/ChristopherBlum/status/148382899887013888 
-
-Saying:
-
-Thomas Tanghus @tanghus 18 Dec. 2011
-
-@ChristopherBlum Hi. Is it OK if I use https://github.com/protonet/jquery.inview in ownCloud? Preferably under an AGPL license ;-) owncloud.org
-
-
-Christopher Blum Christopher Blum @ChristopherBlum 18 Dec. 2011
-
-@tanghus Feel free to! :)
diff --git a/settings/users.php b/settings/users.php
index 94dda43c523..85f160a1552 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -14,7 +14,6 @@ OC_Util::addScript( 'settings', 'users/users' );
 OC_Util::addScript( 'settings', 'users/groups' );
 OC_Util::addScript( 'core', 'multiselect' );
 OC_Util::addScript( 'core', 'singleselect' );
-OC_Util::addScript('core', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 
-- 
GitLab


From c2a45c1238c63ad97dbbfd1ef29fb70a45a93d09 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 4 Nov 2014 17:17:29 +0100
Subject: [PATCH 326/616] throw exception if private key is missing

---
 apps/files_encryption/appinfo/app.php    | 1 +
 apps/files_encryption/lib/exceptions.php | 8 ++++++++
 apps/files_encryption/lib/stream.php     | 5 +++++
 lib/private/connector/sabre/file.php     | 8 +++++++-
 4 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index aa709fbac65..4f301f48b39 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -13,6 +13,7 @@ OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
 // Exceptions
 OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyEncryptException'] = 'files_encryption/lib/exceptions.php';
 OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyDecryptException'] = 'files_encryption/lib/exceptions.php';
+OC::$CLASSPATH['OCA\Encryption\Exceptions\EncryptionException'] = 'files_encryption/lib/exceptions.php';
 
 \OCP\Util::addTranslations('files_encryption');
 \OCP\Util::addscript('files_encryption', 'encryption');
diff --git a/apps/files_encryption/lib/exceptions.php b/apps/files_encryption/lib/exceptions.php
index 3ea27faf406..5b92f4afe74 100644
--- a/apps/files_encryption/lib/exceptions.php
+++ b/apps/files_encryption/lib/exceptions.php
@@ -30,8 +30,16 @@ namespace OCA\Encryption\Exceptions;
  * 30 - encryption header to large
  * 40 - unknown cipher
  * 50 - encryption failed
+ * 60 - no private key available
  */
 class EncryptionException extends \Exception {
+	const UNEXPECTED_END_OF_ENCRTYPTION_HEADER = 10;
+	const UNEXPECTED_BLOG_SIZE = 20;
+	const ENCRYPTION_HEADER_TO_LARGE = 30;
+	const UNKNOWN_CIPHER = 40;
+	const ENCRYPTION_FAILED = 50;
+	const NO_PRIVATE_KEY_AVAILABLE = 60;
+
 }
 
 /**
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index f74812a7253..046c38152b8 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -30,6 +30,7 @@
  */
 
 namespace OCA\Encryption;
+use OCA\Encryption\Exceptions\EncryptionException;
 
 /**
  * Provides 'crypt://' stream wrapper protocol.
@@ -106,6 +107,10 @@ class Stream {
 		$this->session = new \OCA\Encryption\Session($this->rootView);
 
 		$this->privateKey = $this->session->getPrivateKey();
+		if ($this->privateKey === false) {
+			throw new EncryptionException('Session does not contain a private key, maybe your login password changed?',
+					EncryptionException::NO_PRIVATE_KEY_AVAILABLE);
+		}
 
 		$normalizedPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
 		if ($originalFile = Helper::getPathFromTmpFile($normalizedPath)) {
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 903c3447b56..dc036c1adca 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -100,6 +100,8 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 		} catch (\OCP\Files\LockNotAcquiredException $e) {
 			// the file is currently being written to by another process
 			throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
+		} catch (\OCA\Encryption\Exceptions\EncryptionException $e) {
+			throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
 		}
 
 		// if content length is sent by client:
@@ -152,7 +154,11 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 		if (\OC_Util::encryptedFiles()) {
 			throw new \Sabre\DAV\Exception\ServiceUnavailable();
 		} else {
-			return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+			try {
+				return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
+			} catch (\OCA\Encryption\Exceptions\EncryptionException $e) {
+				throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
+			}
 		}
 
 	}
-- 
GitLab


From 4fa3a5034b12636360229d1e0c4e0129171eb82b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 13:41:11 +0100
Subject: [PATCH 327/616] drop unused jquery.placeholder

---
 .scrutinizer.yml              |   1 -
 core/js/core.json             |   1 -
 core/js/jquery.placeholder.js | 216 ----------------------------------
 3 files changed, 218 deletions(-)
 delete mode 100644 core/js/jquery.placeholder.js

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index b8f7b6b4ad2..a84d44680b3 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -19,7 +19,6 @@ filter:
         - 'core/js/underscore.js'
         - 'core/js/jquery.multiselect.js'
         - 'core/js/snap.js'
-        - 'core/js/jquery.placeholder.js'
 
 
 imports:
diff --git a/core/js/core.json b/core/js/core.json
index 3297b44318d..2fc821b0416 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -7,7 +7,6 @@
 		"jquery-migrate-1.2.1.min.js",
 		"jquery-ui-1.10.0.custom.js",
 		"jquery-showpassword.js",
-		"jquery.placeholder.js",
 		"jquery-tipsy.js",
 		"underscore.js"
 	],
diff --git a/core/js/jquery.placeholder.js b/core/js/jquery.placeholder.js
deleted file mode 100644
index 689462582b3..00000000000
--- a/core/js/jquery.placeholder.js
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-  jQuery placeholder plugin
-  by Andrey Kuzmin, @unsoundscapes
-
-  Based on existing plugin http://mths.be/placeholder by @mathias
-  and this demo http://robertnyman.com/2011/05/02/ by @robertnyman
-
-  Adopted to toggle placeholder on user input instead of focus
-
-  Released under the MIT license
-*/
-
-(function (factory) {
-  'use strict';
-
-  if (typeof define === 'function' && define.amd) {
-    // AMD. Register as anonymous module.
-    define(['jquery'], factory)
-  } else {
-    // Browser globals.
-    factory(jQuery)
-  }
-}(function ($) {
-  'use strict';
-
-  var isInputSupported = 'placeholder' in document.createElement('input')
-    , isTextareaSupported = 'placeholder' in document.createElement('textarea')
-    , $placeholders = $()
-
-  function getAttributes (element) {
-    // Return an object of element attributes
-    var newAttrs = {}
-      , rinlinejQuery = /^jQuery\d+$/
-
-    $.each(element.attributes, function () {
-      if (this.specified && !rinlinejQuery.test(this.name)) {
-        newAttrs[this.name] = this.value
-      }
-    })
-    return newAttrs
-  }
-
-  function setCaretTo (element, index) {
-    // Set caret to specified @index
-    if (element.createTextRange) {
-      var range = element.createTextRange()
-      range.move('character', index)
-      range.select()
-    } else if (element.selectionStart !== null) {
-      element.focus()
-      element.setSelectionRange(index, index)
-    }
-  }
-
-
-  function Placeholder (element, options) {
-    this.options = options || {}
-    this.$replacement = this.$element = $(element)
-    this.initialize.apply(this, arguments)
-    // Cache all elements with placeholders
-    $placeholders = $placeholders.add(element)
-  }
-
-  Placeholder.prototype = {
-
-    initialize: function () {
-      this.isHidden = true
-      this.placeholderAttr = this.$element.attr('placeholder')
-      // do not mess with default behavior
-      this.$element.removeAttr('placeholder')
-      this.isPassword = this.$element.is('[type=password]')
-      if (this.isPassword) this.makeReplacement()
-      this.$replacement.on({
-        'keydown.placeholder': $.proxy(this.hide, this)
-      , 'focus.placeholder drop.placeholder click.placeholder': $.proxy(this.setCaret, this)
-      })
-      this.$element.on({
-        'blur.placeholder keyup.placeholder': $.proxy(this.show, this)
-      })
-      this.show()
-    }
-
-    // Set or get input value
-    // Setting value toggles placeholder
-  , val: function (value) {
-      if (value === undefined) {
-        return this.isHidden ? this.$element[0].value : '';
-      }
-      if (value === '') {
-        if (this.isHidden) {
-          this.$element[0].value = value
-          this.show()
-        }
-      } else {
-        if (!this.isHidden) this.hide()
-        this.$element[0].value = value
-      }
-      return this
-    }
-
-    // Hide placeholder at user input
-  , hide: function (e) {
-      var isActiveElement = this.$replacement.is(':focus')
-      if (this.isHidden) return;
-      if (!e || !(e.shiftKey && e.keyCode === 16) && e.keyCode !== 9) {
-        this.isHidden = true
-        if (this.isPassword) {
-          this.$replacement.before(this.$element.show()).hide()
-          if (isActiveElement) this.$element.focus()
-        } else {
-          this.$element[0].value = ''
-          this.$element.removeClass(this.options.className)
-        }
-      }
-    }
-
-    // Show placeholder on blur and keyup
-  , show: function (e) {
-      var isActiveElement = this.$element.is(':focus')
-      if (!this.isHidden) return;
-      if (this.$element[0].value === '') {
-        this.isHidden = false
-        if (this.isPassword) {
-          this.$element.before(this.$replacement.show()).hide()
-          if (isActiveElement) this.$replacement.focus()
-        } else {
-          this.$element[0].value = this.placeholderAttr
-          this.$element.addClass(this.options.className)
-          if (isActiveElement) this.setCaret(e)
-        }
-      }
-    }
-
-    // Set caret at the beginning of the input
-  , setCaret: function (e) {
-      if (e && !this.isHidden) {
-        setCaretTo(this.$replacement[0], 0)
-        e.preventDefault()
-      }
-    }
-
-    // Make and return replacement element
-  , makeReplacement: function () {
-      // we can't use $.fn.clone because ie <= 8 doesn't allow type change
-      var replacementAttributes =
-        $.extend(
-          getAttributes(this.$element[0])
-        , { 'type': 'text'
-          , 'value': this.placeholderAttr
-          }
-        )
-
-      // replacement should not have input name
-      delete replacementAttributes.name
-
-      this.$replacement = $('<input>', replacementAttributes)
-        .data('placeholder', this)
-        .addClass(this.options.className)
-
-      return this.$replacement;
-    }
-
-  }
-
-
-  // Override jQuery val and prop hooks
-  $.valHooks.input = $.valHooks.textarea = $.propHooks.value = {
-    get: function (element) {
-      var placeholder = $(element).data('placeholder')
-      return placeholder ? placeholder.val() : element.value;
-    }
-  , set: function (element, value) {
-      var placeholder = $(element).data('placeholder')
-      return placeholder ? placeholder.val(value) : element.value = value;
-    }
-  }
-
-
-  // Plugin definition
-  $.fn.placeholder = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('placeholder')
-        , options = $.extend({}, $.fn.placeholder.defaults, typeof option === 'object' && option)
-
-      if (!data && $this.is('[placeholder]') && (options.force ||
-          !isInputSupported && $this.is('input') ||
-          !isTextareaSupported && $this.is('textarea'))) {
-        $this.data('placeholder', data = new Placeholder(this, options))
-      }
-
-      if (data && typeof option === 'string') data[option]()
-    })
-  }
-  $.fn.placeholder.defaults = {
-    force: false
-  , className: 'placeholder'
-  }
-  $.fn.placeholder.Constructor = Placeholder
-
-
-  // Events
-  $(document).on('submit.placeholder', 'form', function () {
-    // Clear the placeholder values so they don't get submitted
-    $placeholders.placeholder('hide')
-    // And then restore them back
-    setTimeout(function () { $placeholders.placeholder('show') }, 10)
-  })
-  $(window).on('beforeunload.placeholder', function () {
-    // Clear placeholders upon page reload
-    $placeholders.placeholder('hide')
-  })
-
-  return Placeholder
-
-}));
-- 
GitLab


From e869db47b04acb4c30869ef03462a63e7ac82951 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 29 Sep 2014 16:38:37 +0200
Subject: [PATCH 328/616] unbold labels and folders

---
 apps/files/css/files.css | 1 -
 core/css/styles.css      | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 00b1ded9b30..fddfd02caa6 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -236,7 +236,6 @@ table td.filename a.name {
 	line-height: 50px;
 	padding: 0;
 }
-table tr[data-type="dir"] td.filename a.name span.nametext {font-weight:bold; }
 table td.filename input.filename {
 	width: 70%;
 	margin-top: 1px;
diff --git a/core/css/styles.css b/core/css/styles.css
index 56688e01aee..9604cb0fa4a 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -355,8 +355,7 @@ input[type="submit"].enabled {
 }
 
 #body-login .update h2 {
-	font-weight: bold;
-	font-size: 18px;
+	font-size: 20px;
 	margin-bottom: 30px;
 }
 
@@ -390,7 +389,6 @@ input[type="submit"].enabled {
 #body-login form #adminaccount { margin-bottom:15px; }
 #body-login form fieldset legend, #datadirContent label {
 	width: 100%;
-	font-weight: bold;
 }
 #body-login #datadirContent label {
 	display: block;
@@ -575,7 +573,7 @@ label.infield {
 #body-login form #selectDbType { text-align:center; white-space: nowrap; }
 #body-login form #selectDbType label {
 	position:static; margin:0 -3px 5px; padding:.4em;
-	font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer;
+	font-size:12px; background:#f8f8f8; color:#888; cursor:pointer;
 	border: 1px solid #ddd;
 }
 #body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
@@ -730,7 +728,6 @@ label.infield {
 }
 #notification span, #update-notification span {
 	cursor: pointer;
-	font-weight: bold;
 	margin-left: 1em;
 }
 
@@ -866,7 +863,7 @@ span.ui-icon {float: left; margin: 3px 7px 30px 0;}
 .popup.topright { top:7em; right:1em; }
 .popup.bottomleft { bottom:1em; left:33em; }
 .popup .close { position:absolute; top:0.2em; right:0.2em; height:20px; width:20px; background:url('../img/actions/close.svg') no-repeat center; }
-.popup h2 { font-weight:bold; font-size:1.2em; }
+.popup h2 { font-size:20px; }
 .arrow { border-bottom:10px solid white; border-left:10px solid transparent; border-right:10px solid transparent; display:block; height:0; position:absolute; width:0; z-index:201; }
 .arrow.left { left:-13px; bottom:1.2em; -webkit-transform:rotate(270deg); -moz-transform:rotate(270deg); -o-transform:rotate(270deg); -ms-transform:rotate(270deg); transform:rotate(270deg); }
 .arrow.up { top:-8px; right:6px; }
-- 
GitLab


From a857559979a59d7bf91a75f8c53ad56846c2789a Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 29 Sep 2014 16:39:07 +0200
Subject: [PATCH 329/616] explicitly unbold text by default, otherwise might be
 bold

---
 core/css/apps.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/css/apps.css b/core/css/apps.css
index 898259ed9d5..ce2e15595af 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -485,9 +485,11 @@ button.loading {
 .section h2 {
 	font-size: 20px;
 	margin-bottom: 12px;
+	font-weight: normal;
 }
 .section h3 {
 	font-size: 16px;
+	font-weight: normal;
 }
 /* slight position correction of checkboxes and radio buttons */
 .section input[type="checkbox"],
-- 
GitLab


From 1eefc21329e1256989fc50a5fe7597989324e47f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 5 Nov 2014 15:45:58 +0100
Subject: [PATCH 330/616] Remove confusingly names \OC\User\Manager::delete and
 fix the automatic cache cleanup instead

---
 lib/private/user.php         |  3 ---
 lib/private/user/manager.php | 24 +++++-------------------
 tests/lib/app.php            |  7 +------
 tests/lib/user/manager.php   | 13 ++++++++++++-
 4 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/lib/private/user.php b/lib/private/user.php
index 3c23c19b015..2358f4a14e4 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -211,9 +211,6 @@ class OC_User {
 
 				// Delete the users entry in the storage table
 				\OC\Files\Cache\Storage::remove('home::' . $uid);
-
-				// Remove it from the Cache
-				self::getManager()->delete($uid);
 			}
 
 			return true;
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 5c155c27aba..4d1612a35ce 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -46,17 +46,17 @@ class Manager extends PublicEmitter implements IUserManager {
 	 */
 	public function __construct($config = null) {
 		$this->config = $config;
-		$cachedUsers = $this->cachedUsers;
+		$cachedUsers = &$this->cachedUsers;
 		$this->listen('\OC\User', 'postDelete', function ($user) use (&$cachedUsers) {
-			$i = array_search($user, $cachedUsers);
-			if ($i !== false) {
-				unset($cachedUsers[$i]);
-			}
+			/** @var \OC\User\User $user */
+			unset($cachedUsers[$user->getUID()]);
 		});
 		$this->listen('\OC\User', 'postLogin', function ($user) {
+			/** @var \OC\User\User $user */
 			$user->updateLastLoginTimestamp();
 		});
 		$this->listen('\OC\User', 'postRememberedLogin', function ($user) {
+			/** @var \OC\User\User $user */
 			$user->updateLastLoginTimestamp();
 		});
 	}
@@ -134,20 +134,6 @@ class Manager extends PublicEmitter implements IUserManager {
 		return ($user !== null);
 	}
 
-	/**
-	 * remove deleted user from cache
-	 *
-	 * @param string $uid
-	 * @return bool
-	 */
-	public function delete($uid) {
-		if (isset($this->cachedUsers[$uid])) {
-			unset($this->cachedUsers[$uid]);
-			return true;
-		}
-		return false;
-	}
-
 	/**
 	 * Check if the password is valid for the user
 	 *
diff --git a/tests/lib/app.php b/tests/lib/app.php
index e538ebec8a0..5bce3b8c3e6 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -360,10 +360,7 @@ class Test_App extends PHPUnit_Framework_TestCase {
 		$user1->delete();
 		$user2->delete();
 		$user3->delete();
-		// clear user cache...
-		$userManager->delete(self::TEST_USER1);
-		$userManager->delete(self::TEST_USER2);
-		$userManager->delete(self::TEST_USER3);
+
 		$group1->delete();
 		$group2->delete();
 	}
@@ -399,8 +396,6 @@ class Test_App extends PHPUnit_Framework_TestCase {
 		\OC_User::setUserId(null);
 
 		$user1->delete();
-		// clear user cache...
-		$userManager->delete(self::TEST_USER1);
 	}
 
 	/**
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
index fd0931af7e4..15b28e61bd5 100644
--- a/tests/lib/user/manager.php
+++ b/tests/lib/user/manager.php
@@ -416,6 +416,17 @@ class Manager extends \PHPUnit_Framework_TestCase {
 
 		$users = array_shift($result);
 		//users from backends shall be summed up
-		$this->assertEquals(7+16, $users);
+		$this->assertEquals(7 + 16, $users);
+	}
+
+	public function testDeleteUser() {
+		$manager = new \OC\User\Manager();
+		$backend = new \OC_User_Dummy();
+
+		$backend->createUser('foo', 'bar');
+		$manager->registerBackend($backend);
+		$this->assertTrue($manager->userExists('foo'));
+		$manager->get('foo')->delete();
+		$this->assertFalse($manager->userExists('foo'));
 	}
 }
-- 
GitLab


From 02c7fb8445f920a88342c3ac8bc36c4f8385174e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 14:14:23 +0100
Subject: [PATCH 331/616] bower handlebars

---
 bower.json                                                    | 1 +
 core/vendor/.gitignore                                        | 4 ++++
 .../handlebars-v1.3.0.js => vendor/handlebars/handlebars.js}  | 0
 settings/apps.php                                             | 2 +-
 4 files changed, 6 insertions(+), 1 deletion(-)
 rename core/{js/handlebars-v1.3.0.js => vendor/handlebars/handlebars.js} (100%)

diff --git a/bower.json b/bower.json
index ab8340c42e9..7f31f762752 100644
--- a/bower.json
+++ b/bower.json
@@ -13,6 +13,7 @@
     "tests"
   ],
   "dependencies": {
+    "handlebars": "1.3.0",
     "jquery": "~1.10.0",
     "moment": "~2.8.3"
   }
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index 1c303c1765f..ca64a8539ee 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -14,3 +14,7 @@ moment/*.md
 jquery/**
 !jquery/jquery*
 !jquery/MIT-LICENSE.txt
+
+# handlebars
+handlebars/**
+!handlebars/handlebars.js
diff --git a/core/js/handlebars-v1.3.0.js b/core/vendor/handlebars/handlebars.js
similarity index 100%
rename from core/js/handlebars-v1.3.0.js
rename to core/vendor/handlebars/handlebars.js
diff --git a/settings/apps.php b/settings/apps.php
index 2d6f3c4c697..c1e3e51bd79 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -25,7 +25,7 @@ OC_Util::checkAdminUser();
 \OC::$server->getSession()->close();
 
 // Load the files we need
-\OCP\Util::addScript('handlebars-v1.3.0');
+\OC_Util::addVendorScript('handlebars/handlebars');
 \OCP\Util::addScript("settings", "settings");
 \OCP\Util::addStyle("settings", "settings");
 \OCP\Util::addScript('core', 'select2/select2');
-- 
GitLab


From 0af5a8db74edb812d2134461eeecf2c829ade91a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 22:41:33 +0100
Subject: [PATCH 332/616] drop unused library chosen

---
 3rdparty              | 2 +-
 settings/personal.php | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/3rdparty b/3rdparty
index c23faa08d9c..028a137c719 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit c23faa08d9c5937582a298f6af5baf279243cfbf
+Subproject commit 028a137c7199362e6387e37be8f2fddd3c012aeb
diff --git a/settings/personal.php b/settings/personal.php
index ecbec887da8..fdac0390d04 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -15,8 +15,6 @@ OC_Util::addScript( 'settings', 'personal' );
 OC_Util::addStyle( 'settings', 'settings' );
 OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' );
 OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' );
-OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
-OC_Util::addStyle( '3rdparty', 'chosen/chosen' );
 \OC_Util::addScript('files', 'jquery.fileupload');
 if (\OC_Config::getValue('enable_avatars', true) === true) {
 	\OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
-- 
GitLab


From 957dee5af187da7245b10cd8b0fc669efe05cfd6 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 22:05:24 +0100
Subject: [PATCH 333/616] bower underscore

---
 .scrutinizer.yml                             |  1 -
 bower.json                                   |  3 ++-
 core/js/core.json                            |  4 ++--
 core/vendor/.gitignore                       |  5 +++++
 core/vendor/underscore/LICENSE               | 23 ++++++++++++++++++++
 core/{js => vendor/underscore}/underscore.js |  5 ++---
 lib/base.php                                 |  2 +-
 7 files changed, 35 insertions(+), 8 deletions(-)
 create mode 100644 core/vendor/underscore/LICENSE
 rename core/{js => vendor/underscore}/underscore.js (99%)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 33440a37db3..94ed30e18bb 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -13,7 +13,6 @@ filter:
         - 'core/js/jquery-tipsy.js'
         - 'core/js/jquery-ui-1.10.0.custom.js'
         - 'core/js/placeholders.js'
-        - 'core/js/underscore.js'
         - 'core/js/jquery.multiselect.js'
         - 'core/js/snap.js'
 
diff --git a/bower.json b/bower.json
index 7f31f762752..986b88eed47 100644
--- a/bower.json
+++ b/bower.json
@@ -15,6 +15,7 @@
   "dependencies": {
     "handlebars": "1.3.0",
     "jquery": "~1.10.0",
-    "moment": "~2.8.3"
+    "moment": "~2.8.3",
+    "underscore": "1.6.0"
   }
 }
diff --git a/core/js/core.json b/core/js/core.json
index 137e0217a6f..ea79724dcc6 100644
--- a/core/js/core.json
+++ b/core/js/core.json
@@ -2,13 +2,13 @@
 	"vendor": [
 		"jquery/jquery.min.js",
 		"jquery/jquery-migrate.min.js",
+		"underscore/underscore.js",
 		"moment/min/moment-with-locales.js"
 	],
 	"libraries": [
 		"jquery-ui-1.10.0.custom.js",
 		"jquery-showpassword.js",
-		"jquery-tipsy.js",
-		"underscore.js"
+		"jquery-tipsy.js"
 	],
 	"modules": [
 		"compatibility.js",
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index ca64a8539ee..0c14c5a59b7 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -1,6 +1,11 @@
 test/
 src/
 
+# underscore
+underscore/**
+!underscore/underscore.js
+!underscore/LICENSE
+
 # momentjs - ignore all files except the two listed below
 moment/benchmarks
 moment/locale
diff --git a/core/vendor/underscore/LICENSE b/core/vendor/underscore/LICENSE
new file mode 100644
index 00000000000..0d6b8739d95
--- /dev/null
+++ b/core/vendor/underscore/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative
+Reporters & Editors
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/js/underscore.js b/core/vendor/underscore/underscore.js
similarity index 99%
rename from core/js/underscore.js
rename to core/vendor/underscore/underscore.js
index ca61fdc3a4b..9a4cabecf7f 100644
--- a/core/js/underscore.js
+++ b/core/vendor/underscore/underscore.js
@@ -462,11 +462,10 @@
 
   // Split an array into two arrays: one whose elements all satisfy the given
   // predicate, and one whose elements all do not satisfy the predicate.
-  _.partition = function(array, predicate, context) {
-    predicate = lookupIterator(predicate);
+  _.partition = function(array, predicate) {
     var pass = [], fail = [];
     each(array, function(elem) {
-      (predicate.call(context, elem) ? pass : fail).push(elem);
+      (predicate(elem) ? pass : fail).push(elem);
     });
     return [pass, fail];
   };
diff --git a/lib/base.php b/lib/base.php
index 2b4ba7bcb4a..0943286de93 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -334,7 +334,7 @@ class OC {
 		OC_Util::addScript("placeholders");
 		OC_Util::addScript("jquery-tipsy");
 		OC_Util::addScript("compatibility");
-		OC_Util::addScript("underscore");
+		OC_Util::addVendorScript("underscore/underscore");
 		OC_Util::addScript("jquery.ocdialog");
 		OC_Util::addScript("oc-dialogs");
 		OC_Util::addScript("js");
-- 
GitLab


From fa4018d36c3b71df6ac9eddb8ad4cd523458b82f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 6 Nov 2014 01:55:04 -0500
Subject: [PATCH 334/616] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/ast.js      |  5 +----
 apps/files_sharing/l10n/ast.json    |  5 +----
 apps/files_sharing/l10n/bg_BG.js    |  5 +----
 apps/files_sharing/l10n/bg_BG.json  |  5 +----
 apps/files_sharing/l10n/bn_BD.js    |  3 +--
 apps/files_sharing/l10n/bn_BD.json  |  3 +--
 apps/files_sharing/l10n/ca.js       |  5 +----
 apps/files_sharing/l10n/ca.json     |  5 +----
 apps/files_sharing/l10n/cs_CZ.js    |  5 +----
 apps/files_sharing/l10n/cs_CZ.json  |  5 +----
 apps/files_sharing/l10n/da.js       |  5 +----
 apps/files_sharing/l10n/da.json     |  5 +----
 apps/files_sharing/l10n/de.js       |  5 +----
 apps/files_sharing/l10n/de.json     |  5 +----
 apps/files_sharing/l10n/de_DE.js    |  5 +----
 apps/files_sharing/l10n/de_DE.json  |  5 +----
 apps/files_sharing/l10n/el.js       |  5 +----
 apps/files_sharing/l10n/el.json     |  5 +----
 apps/files_sharing/l10n/en_GB.js    |  5 +----
 apps/files_sharing/l10n/en_GB.json  |  5 +----
 apps/files_sharing/l10n/es.js       |  5 +----
 apps/files_sharing/l10n/es.json     |  5 +----
 apps/files_sharing/l10n/et_EE.js    |  5 +----
 apps/files_sharing/l10n/et_EE.json  |  5 +----
 apps/files_sharing/l10n/eu.js       |  5 +----
 apps/files_sharing/l10n/eu.json     |  5 +----
 apps/files_sharing/l10n/fa.js       |  5 +----
 apps/files_sharing/l10n/fa.json     |  5 +----
 apps/files_sharing/l10n/fi_FI.js    |  5 +----
 apps/files_sharing/l10n/fi_FI.json  |  5 +----
 apps/files_sharing/l10n/fr.js       |  5 +----
 apps/files_sharing/l10n/fr.json     |  5 +----
 apps/files_sharing/l10n/gl.js       |  5 +----
 apps/files_sharing/l10n/gl.json     |  5 +----
 apps/files_sharing/l10n/hr.js       |  5 +----
 apps/files_sharing/l10n/hr.json     |  5 +----
 apps/files_sharing/l10n/hu_HU.js    |  5 +----
 apps/files_sharing/l10n/hu_HU.json  |  5 +----
 apps/files_sharing/l10n/id.js       |  5 +----
 apps/files_sharing/l10n/id.json     |  5 +----
 apps/files_sharing/l10n/it.js       |  5 +----
 apps/files_sharing/l10n/it.json     |  5 +----
 apps/files_sharing/l10n/ja.js       |  5 +----
 apps/files_sharing/l10n/ja.json     |  5 +----
 apps/files_sharing/l10n/nb_NO.js    |  5 +----
 apps/files_sharing/l10n/nb_NO.json  |  5 +----
 apps/files_sharing/l10n/nl.js       |  5 +----
 apps/files_sharing/l10n/nl.json     |  5 +----
 apps/files_sharing/l10n/pl.js       |  5 +----
 apps/files_sharing/l10n/pl.json     |  5 +----
 apps/files_sharing/l10n/pt_BR.js    |  5 +----
 apps/files_sharing/l10n/pt_BR.json  |  5 +----
 apps/files_sharing/l10n/pt_PT.js    |  5 +----
 apps/files_sharing/l10n/pt_PT.json  |  5 +----
 apps/files_sharing/l10n/ro.js       |  3 +--
 apps/files_sharing/l10n/ro.json     |  3 +--
 apps/files_sharing/l10n/ru.js       |  5 +----
 apps/files_sharing/l10n/ru.json     |  5 +----
 apps/files_sharing/l10n/sk_SK.js    |  5 +----
 apps/files_sharing/l10n/sk_SK.json  |  5 +----
 apps/files_sharing/l10n/sl.js       |  5 +----
 apps/files_sharing/l10n/sl.json     |  5 +----
 apps/files_sharing/l10n/sv.js       |  5 +----
 apps/files_sharing/l10n/sv.json     |  5 +----
 apps/files_sharing/l10n/tr.js       |  5 +----
 apps/files_sharing/l10n/tr.json     |  5 +----
 apps/files_sharing/l10n/uk.js       |  5 +----
 apps/files_sharing/l10n/uk.json     |  5 +----
 apps/files_sharing/l10n/zh_CN.js    |  5 +----
 apps/files_sharing/l10n/zh_CN.json  |  5 +----
 apps/files_sharing/l10n/zh_TW.js    |  5 +----
 apps/files_sharing/l10n/zh_TW.json  |  5 +----
 apps/user_ldap/l10n/et_EE.js        |  1 +
 apps/user_ldap/l10n/et_EE.json      |  1 +
 apps/user_ldap/l10n/sk_SK.js        |  5 +++++
 apps/user_ldap/l10n/sk_SK.json      |  5 +++++
 apps/user_webdavauth/l10n/hy.js     |  1 +
 apps/user_webdavauth/l10n/hy.json   |  1 +
 core/l10n/et_EE.js                  |  4 +++-
 core/l10n/et_EE.json                |  4 +++-
 core/l10n/sk_SK.js                  | 17 ++++++++++++++++-
 core/l10n/sk_SK.json                | 17 ++++++++++++++++-
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   |  2 +-
 l10n/templates/files_sharing.pot    | 14 +++++++-------
 l10n/templates/files_trashbin.pot   |  6 +++---
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              |  2 +-
 l10n/templates/private.pot          |  2 +-
 l10n/templates/settings.pot         | 10 +++++-----
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/templates/user_webdavauth.pot  |  2 +-
 lib/l10n/sk_SK.js                   |  1 +
 lib/l10n/sk_SK.json                 |  1 +
 settings/l10n/et_EE.js              |  3 +++
 settings/l10n/et_EE.json            |  3 +++
 settings/l10n/sk_SK.js              | 13 +++++++++++++
 settings/l10n/sk_SK.json            | 13 +++++++++++++
 100 files changed, 182 insertions(+), 308 deletions(-)

diff --git a/apps/files_sharing/l10n/ast.js b/apps/files_sharing/l10n/ast.js
index bd4aa1faf9c..7273f0fec5b 100644
--- a/apps/files_sharing/l10n/ast.js
+++ b/apps/files_sharing/l10n/ast.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Amestar al to ownCloud",
     "Download" : "Baxar",
     "Download %s" : "Descargar %s",
-    "Direct link" : "Enllaz direutu",
-    "Remote Shares" : "Comparticiones remotes",
-    "Allow other instances to mount public links shared from this server" : "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor",
-    "Allow users to mount public link shares" : "Permitir a los usuarios montar enllaces compartíos públicos"
+    "Direct link" : "Enllaz direutu"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ast.json b/apps/files_sharing/l10n/ast.json
index c86d16aa90d..fd9d2479cc7 100644
--- a/apps/files_sharing/l10n/ast.json
+++ b/apps/files_sharing/l10n/ast.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Amestar al to ownCloud",
     "Download" : "Baxar",
     "Download %s" : "Descargar %s",
-    "Direct link" : "Enllaz direutu",
-    "Remote Shares" : "Comparticiones remotes",
-    "Allow other instances to mount public links shared from this server" : "Permitir a otres instancies montar enllaces compartíos públicos d'esti sirvidor",
-    "Allow users to mount public link shares" : "Permitir a los usuarios montar enllaces compartíos públicos"
+    "Direct link" : "Enllaz direutu"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js
index fe7c4ecdb9b..15a51e759d7 100644
--- a/apps/files_sharing/l10n/bg_BG.js
+++ b/apps/files_sharing/l10n/bg_BG.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Добави към своя ownCloud",
     "Download" : "Изтегли",
     "Download %s" : "Изтегли %s",
-    "Direct link" : "Директна връзка",
-    "Remote Shares" : "Прикачени Папки",
-    "Allow other instances to mount public links shared from this server" : "Разреши други ownCloud сървъри да прикачват папки, споделени посредством връзки, на този сървър.",
-    "Allow users to mount public link shares" : "Разреши потребители да прикачват папки, споделени посредством връзки."
+    "Direct link" : "Директна връзка"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json
index 7fcea7ddfef..85b2bcecbe1 100644
--- a/apps/files_sharing/l10n/bg_BG.json
+++ b/apps/files_sharing/l10n/bg_BG.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Добави към своя ownCloud",
     "Download" : "Изтегли",
     "Download %s" : "Изтегли %s",
-    "Direct link" : "Директна връзка",
-    "Remote Shares" : "Прикачени Папки",
-    "Allow other instances to mount public links shared from this server" : "Разреши други ownCloud сървъри да прикачват папки, споделени посредством връзки, на този сървър.",
-    "Allow users to mount public link shares" : "Разреши потребители да прикачват папки, споделени посредством връзки."
+    "Direct link" : "Директна връзка"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/bn_BD.js b/apps/files_sharing/l10n/bn_BD.js
index 8df349c3c77..9f345965aee 100644
--- a/apps/files_sharing/l10n/bn_BD.js
+++ b/apps/files_sharing/l10n/bn_BD.js
@@ -24,7 +24,6 @@ OC.L10N.register(
     "For more info, please ask the person who sent this link." : "বিস্তারিত তথ্যের জন্য এই লিঙ্কের প্রেরককে জিজ্ঞাসা করুন।",
     "Download" : "ডাউনলোড",
     "Download %s" : "ডাউনলোড  %s",
-    "Direct link" : "সরাসরি লিঙ্ক",
-    "Remote Shares" : "দুরবর্তী ভাগাভাগি"
+    "Direct link" : "সরাসরি লিঙ্ক"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/bn_BD.json b/apps/files_sharing/l10n/bn_BD.json
index 9eafda60df9..0511dc3d939 100644
--- a/apps/files_sharing/l10n/bn_BD.json
+++ b/apps/files_sharing/l10n/bn_BD.json
@@ -22,7 +22,6 @@
     "For more info, please ask the person who sent this link." : "বিস্তারিত তথ্যের জন্য এই লিঙ্কের প্রেরককে জিজ্ঞাসা করুন।",
     "Download" : "ডাউনলোড",
     "Download %s" : "ডাউনলোড  %s",
-    "Direct link" : "সরাসরি লিঙ্ক",
-    "Remote Shares" : "দুরবর্তী ভাগাভাগি"
+    "Direct link" : "সরাসরি লিঙ্ক"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js
index 3397d85f140..51153252cba 100644
--- a/apps/files_sharing/l10n/ca.js
+++ b/apps/files_sharing/l10n/ca.js
@@ -32,9 +32,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Afegiu a ownCloud",
     "Download" : "Baixa",
     "Download %s" : "Baixa %s",
-    "Direct link" : "Enllaç directe",
-    "Remote Shares" : "Compartició remota",
-    "Allow other instances to mount public links shared from this server" : "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor",
-    "Allow users to mount public link shares" : "Permet que usuaris muntin compartits amb enllaços públics"
+    "Direct link" : "Enllaç directe"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json
index 861dd589bce..88d2fa70811 100644
--- a/apps/files_sharing/l10n/ca.json
+++ b/apps/files_sharing/l10n/ca.json
@@ -30,9 +30,6 @@
     "Add to your ownCloud" : "Afegiu a ownCloud",
     "Download" : "Baixa",
     "Download %s" : "Baixa %s",
-    "Direct link" : "Enllaç directe",
-    "Remote Shares" : "Compartició remota",
-    "Allow other instances to mount public links shared from this server" : "Permet que altres instàncies muntin enllaços públics compartits des d'aqeust servidor",
-    "Allow users to mount public link shares" : "Permet que usuaris muntin compartits amb enllaços públics"
+    "Direct link" : "Enllaç directe"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index dc0d1e92c41..1d65d7032ee 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Přidat do svého ownCloudu",
     "Download" : "Stáhnout",
     "Download %s" : "Stáhnout %s",
-    "Direct link" : "Přímý odkaz",
-    "Remote Shares" : "Vzdálená úložiště",
-    "Allow other instances to mount public links shared from this server" : "Povolit připojování veřejně sdílených odkazů z tohoto serveru",
-    "Allow users to mount public link shares" : "Povolit uživatelům připojovat veřejně sdílené odkazy"
+    "Direct link" : "Přímý odkaz"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index 6b2dffa63fe..a4d4bdf28e2 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Přidat do svého ownCloudu",
     "Download" : "Stáhnout",
     "Download %s" : "Stáhnout %s",
-    "Direct link" : "Přímý odkaz",
-    "Remote Shares" : "Vzdálená úložiště",
-    "Allow other instances to mount public links shared from this server" : "Povolit připojování veřejně sdílených odkazů z tohoto serveru",
-    "Allow users to mount public link shares" : "Povolit uživatelům připojovat veřejně sdílené odkazy"
+    "Direct link" : "Přímý odkaz"
 },"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/da.js b/apps/files_sharing/l10n/da.js
index a706bfbf15f..961252e26c6 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Tilføj til din ownCload",
     "Download" : "Download",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkte link",
-    "Remote Shares" : "Eksterne delinger",
-    "Allow other instances to mount public links shared from this server" : "Tillad andre instanser at montere offentlige links, der er delt fra denne server",
-    "Allow users to mount public link shares" : "Tillad brugere at montere offentlige linkdelinger"
+    "Direct link" : "Direkte link"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index 7046e3eeeed..19291cdd9bf 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Tilføj til din ownCload",
     "Download" : "Download",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkte link",
-    "Remote Shares" : "Eksterne delinger",
-    "Allow other instances to mount public links shared from this server" : "Tillad andre instanser at montere offentlige links, der er delt fra denne server",
-    "Allow users to mount public link shares" : "Tillad brugere at montere offentlige linkdelinger"
+    "Direct link" : "Direkte link"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de.js b/apps/files_sharing/l10n/de.js
index 36858c89095..69635c8ca4c 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen",
     "Download" : "Herunterladen",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkter Link",
-    "Remote Shares" : "Entfernte Freigaben",
-    "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
-    "Allow users to mount public link shares" : "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
+    "Direct link" : "Direkter Link"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index db6ebf3b8a6..f444c486956 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen",
     "Download" : "Herunterladen",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkter Link",
-    "Remote Shares" : "Entfernte Freigaben",
-    "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
-    "Allow users to mount public link shares" : "Erlaube Nutzern das Hinzufügen von freigegebenen öffentlichen Links"
+    "Direct link" : "Direkter Link"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index d028d22413d..23ad9ffb91f 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen",
     "Download" : "Herunterladen",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkte Verlinkung",
-    "Remote Shares" : "Entfernte Freigaben",
-    "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
-    "Allow users to mount public link shares" : "Benutzern das Hinzufügen von freigegebenen öffentlichen Links erlauben"
+    "Direct link" : "Direkte Verlinkung"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index 546add68233..a693524d6c1 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen",
     "Download" : "Herunterladen",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkte Verlinkung",
-    "Remote Shares" : "Entfernte Freigaben",
-    "Allow other instances to mount public links shared from this server" : "Andere Instanzen zum Hinzufügen von öffentlichen Links, die über diesen Server Freigegeben werden, erlauben",
-    "Allow users to mount public link shares" : "Benutzern das Hinzufügen von freigegebenen öffentlichen Links erlauben"
+    "Direct link" : "Direkte Verlinkung"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index 04be4353062..e80d74b376c 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Προσθήκη στο ownCloud σου",
     "Download" : "Λήψη",
     "Download %s" : "Λήψη %s",
-    "Direct link" : "Άμεσος σύνδεσμος",
-    "Remote Shares" : "Απομακρυσμένοι Κοινόχρηστοι Φάκελοι",
-    "Allow other instances to mount public links shared from this server" : "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή",
-    "Allow users to mount public link shares" : "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους από δημόσιους συνδέσμους"
+    "Direct link" : "Άμεσος σύνδεσμος"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index 04a86c27619..affe333420f 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Προσθήκη στο ownCloud σου",
     "Download" : "Λήψη",
     "Download %s" : "Λήψη %s",
-    "Direct link" : "Άμεσος σύνδεσμος",
-    "Remote Shares" : "Απομακρυσμένοι Κοινόχρηστοι Φάκελοι",
-    "Allow other instances to mount public links shared from this server" : "Να επιτρέπεται σε άλλες εγκαταστάσεις να επιθέτουν δημόσιους συνδέσμους που έχουν διαμοιραστεί από αυτόν το διακομιστή",
-    "Allow users to mount public link shares" : "Να επιτρέπεται στους χρήστες να επιθέτουν κοινόχρηστους φακέλους από δημόσιους συνδέσμους"
+    "Direct link" : "Άμεσος σύνδεσμος"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
index 16e0ff1433b..0a86e564210 100644
--- a/apps/files_sharing/l10n/en_GB.js
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Add to your ownCloud",
     "Download" : "Download",
     "Download %s" : "Download %s",
-    "Direct link" : "Direct link",
-    "Remote Shares" : "Remote Shares",
-    "Allow other instances to mount public links shared from this server" : "Allow other instances to mount public links shared from this server",
-    "Allow users to mount public link shares" : "Allow users to mount public link shares"
+    "Direct link" : "Direct link"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
index ddee5ae0535..c5445a407af 100644
--- a/apps/files_sharing/l10n/en_GB.json
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Add to your ownCloud",
     "Download" : "Download",
     "Download %s" : "Download %s",
-    "Direct link" : "Direct link",
-    "Remote Shares" : "Remote Shares",
-    "Allow other instances to mount public links shared from this server" : "Allow other instances to mount public links shared from this server",
-    "Allow users to mount public link shares" : "Allow users to mount public link shares"
+    "Direct link" : "Direct link"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index 2d0ba1b32ec..79e3b6c9811 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Agregue su propio ownCloud",
     "Download" : "Descargar",
     "Download %s" : "Descargar %s",
-    "Direct link" : "Enlace directo",
-    "Remote Shares" : "Almacenamiento compartido remoto",
-    "Allow other instances to mount public links shared from this server" : "Permitir a otros montar enlaces publicos compartidos de este servidor",
-    "Allow users to mount public link shares" : "Permitir a los usuarios montar enlaces publicos compartidos"
+    "Direct link" : "Enlace directo"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index 3821c00cd73..fd552789d63 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Agregue su propio ownCloud",
     "Download" : "Descargar",
     "Download %s" : "Descargar %s",
-    "Direct link" : "Enlace directo",
-    "Remote Shares" : "Almacenamiento compartido remoto",
-    "Allow other instances to mount public links shared from this server" : "Permitir a otros montar enlaces publicos compartidos de este servidor",
-    "Allow users to mount public link shares" : "Permitir a los usuarios montar enlaces publicos compartidos"
+    "Direct link" : "Enlace directo"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index 51389730f0f..93ac6d01000 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Lisa oma ownCloudi",
     "Download" : "Lae alla",
     "Download %s" : "Laadi alla %s",
-    "Direct link" : "Otsene link",
-    "Remote Shares" : "Eemalolevad jagamised",
-    "Allow other instances to mount public links shared from this server" : "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke",
-    "Allow users to mount public link shares" : "Luba kasutajatel ühendada jagatud avalikke linke"
+    "Direct link" : "Otsene link"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index 9b54f73f88d..d5bf52aa59d 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Lisa oma ownCloudi",
     "Download" : "Lae alla",
     "Download %s" : "Laadi alla %s",
-    "Direct link" : "Otsene link",
-    "Remote Shares" : "Eemalolevad jagamised",
-    "Allow other instances to mount public links shared from this server" : "Luba teistel instantsidel ühendada sellest serverist jagatud avalikke linke",
-    "Allow users to mount public link shares" : "Luba kasutajatel ühendada jagatud avalikke linke"
+    "Direct link" : "Otsene link"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/eu.js b/apps/files_sharing/l10n/eu.js
index 753ca778ef1..9e492649eee 100644
--- a/apps/files_sharing/l10n/eu.js
+++ b/apps/files_sharing/l10n/eu.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Gehitu zure ownCloud-era",
     "Download" : "Deskargatu",
     "Download %s" : "Deskargatu %s",
-    "Direct link" : "Lotura zuzena",
-    "Remote Shares" : "Urrutiko parte hartzeak",
-    "Allow other instances to mount public links shared from this server" : "Baimendu beste instantziak zerbitzari honetatik elkarbanatutako lotura publikoak kargatzen",
-    "Allow users to mount public link shares" : "Baimendu erabiltzaileak lotura publiko bidezko elkarbanaketak muntatzen"
+    "Direct link" : "Lotura zuzena"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/eu.json b/apps/files_sharing/l10n/eu.json
index 7b12f0c4303..0d04b0c2f9a 100644
--- a/apps/files_sharing/l10n/eu.json
+++ b/apps/files_sharing/l10n/eu.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Gehitu zure ownCloud-era",
     "Download" : "Deskargatu",
     "Download %s" : "Deskargatu %s",
-    "Direct link" : "Lotura zuzena",
-    "Remote Shares" : "Urrutiko parte hartzeak",
-    "Allow other instances to mount public links shared from this server" : "Baimendu beste instantziak zerbitzari honetatik elkarbanatutako lotura publikoak kargatzen",
-    "Allow users to mount public link shares" : "Baimendu erabiltzaileak lotura publiko bidezko elkarbanaketak muntatzen"
+    "Direct link" : "Lotura zuzena"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fa.js b/apps/files_sharing/l10n/fa.js
index 7bf3b3b6654..3c78846ed44 100644
--- a/apps/files_sharing/l10n/fa.js
+++ b/apps/files_sharing/l10n/fa.js
@@ -32,9 +32,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "افزودن به ownCloud شما",
     "Download" : "دانلود",
     "Download %s" : "دانلود %s",
-    "Direct link" : "پیوند مستقیم",
-    "Remote Shares" : "اشتراک های از راه دور",
-    "Allow other instances to mount public links shared from this server" : "اجازه به نمونه های دیگر برای مانت کردن پیوند های عمومی به اشتراک گذاشته شده از این سرور",
-    "Allow users to mount public link shares" : "اجازه دادن به کاربران برای مانت پیوندهای عمومی موارد به اشتراک گذاری"
+    "Direct link" : "پیوند مستقیم"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/fa.json b/apps/files_sharing/l10n/fa.json
index 8b1cc8a85bb..8e5fd724927 100644
--- a/apps/files_sharing/l10n/fa.json
+++ b/apps/files_sharing/l10n/fa.json
@@ -30,9 +30,6 @@
     "Add to your ownCloud" : "افزودن به ownCloud شما",
     "Download" : "دانلود",
     "Download %s" : "دانلود %s",
-    "Direct link" : "پیوند مستقیم",
-    "Remote Shares" : "اشتراک های از راه دور",
-    "Allow other instances to mount public links shared from this server" : "اجازه به نمونه های دیگر برای مانت کردن پیوند های عمومی به اشتراک گذاشته شده از این سرور",
-    "Allow users to mount public link shares" : "اجازه دادن به کاربران برای مانت پیوندهای عمومی موارد به اشتراک گذاری"
+    "Direct link" : "پیوند مستقیم"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index ffa5e25dd4f..c4713c2be3f 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Lisää ownCloudiisi",
     "Download" : "Lataa",
     "Download %s" : "Lataa %s",
-    "Direct link" : "Suora linkki",
-    "Remote Shares" : "Etäjaot",
-    "Allow other instances to mount public links shared from this server" : "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä",
-    "Allow users to mount public link shares" : "Salli käyttäjien liittää julkisia linkkijakoja"
+    "Direct link" : "Suora linkki"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index eba4df5b7b9..ec29c214b45 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Lisää ownCloudiisi",
     "Download" : "Lataa",
     "Download %s" : "Lataa %s",
-    "Direct link" : "Suora linkki",
-    "Remote Shares" : "Etäjaot",
-    "Allow other instances to mount public links shared from this server" : "Salli muiden instanssien liittää tältä palvelimelta jaettuja julkisia linkkejä",
-    "Allow users to mount public link shares" : "Salli käyttäjien liittää julkisia linkkijakoja"
+    "Direct link" : "Suora linkki"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index bce80d457e0..1db7a59f3d5 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Ajouter à votre ownCloud",
     "Download" : "Télécharger",
     "Download %s" : "Télécharger %s",
-    "Direct link" : "Lien direct",
-    "Remote Shares" : "Partages distants",
-    "Allow other instances to mount public links shared from this server" : "Autoriser d'autres instances à monter les liens publics partagés depuis ce serveur",
-    "Allow users to mount public link shares" : "Autoriser vos utilisateurs à monter les liens publics"
+    "Direct link" : "Lien direct"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 58c5eaab637..6981cd74937 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Ajouter à votre ownCloud",
     "Download" : "Télécharger",
     "Download %s" : "Télécharger %s",
-    "Direct link" : "Lien direct",
-    "Remote Shares" : "Partages distants",
-    "Allow other instances to mount public links shared from this server" : "Autoriser d'autres instances à monter les liens publics partagés depuis ce serveur",
-    "Allow users to mount public link shares" : "Autoriser vos utilisateurs à monter les liens publics"
+    "Direct link" : "Lien direct"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/gl.js b/apps/files_sharing/l10n/gl.js
index 2a5d70aeb87..45d20914ee8 100644
--- a/apps/files_sharing/l10n/gl.js
+++ b/apps/files_sharing/l10n/gl.js
@@ -32,9 +32,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Engadir ao seu ownCloud",
     "Download" : "Descargar",
     "Download %s" : "Descargar %s",
-    "Direct link" : "Ligazón directa",
-    "Remote Shares" : "Comparticións remotas",
-    "Allow other instances to mount public links shared from this server" : "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor",
-    "Allow users to mount public link shares" : "Permitirlle aos usuarios montar ligazóns públicas compartidas"
+    "Direct link" : "Ligazón directa"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/gl.json b/apps/files_sharing/l10n/gl.json
index ff980ea0a61..5ddd5b02155 100644
--- a/apps/files_sharing/l10n/gl.json
+++ b/apps/files_sharing/l10n/gl.json
@@ -30,9 +30,6 @@
     "Add to your ownCloud" : "Engadir ao seu ownCloud",
     "Download" : "Descargar",
     "Download %s" : "Descargar %s",
-    "Direct link" : "Ligazón directa",
-    "Remote Shares" : "Comparticións remotas",
-    "Allow other instances to mount public links shared from this server" : "Permitir que outras instancias monten ligazóns públicas compartidas desde este servidor",
-    "Allow users to mount public link shares" : "Permitirlle aos usuarios montar ligazóns públicas compartidas"
+    "Direct link" : "Ligazón directa"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/hr.js b/apps/files_sharing/l10n/hr.js
index 75d82342e78..3c409ea159c 100644
--- a/apps/files_sharing/l10n/hr.js
+++ b/apps/files_sharing/l10n/hr.js
@@ -32,9 +32,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Dodajte svome ownCloud",
     "Download" : "Preuzmite",
     "Download %s" : "Preuzmite %s",
-    "Direct link" : "Izravna veza",
-    "Remote Shares" : "Udaljeni zajednički resursi (za raspodjelu)",
-    "Allow other instances to mount public links shared from this server" : "Dopustite drugim instancama postavljanje javnih veza koje su podijeljene s ovog poslužitelja.",
-    "Allow users to mount public link shares" : "Dopustite korisnicima postavljanje podijeljenih javnih veza"
+    "Direct link" : "Izravna veza"
 },
 "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/hr.json b/apps/files_sharing/l10n/hr.json
index 79064c575b9..cb37f803501 100644
--- a/apps/files_sharing/l10n/hr.json
+++ b/apps/files_sharing/l10n/hr.json
@@ -30,9 +30,6 @@
     "Add to your ownCloud" : "Dodajte svome ownCloud",
     "Download" : "Preuzmite",
     "Download %s" : "Preuzmite %s",
-    "Direct link" : "Izravna veza",
-    "Remote Shares" : "Udaljeni zajednički resursi (za raspodjelu)",
-    "Allow other instances to mount public links shared from this server" : "Dopustite drugim instancama postavljanje javnih veza koje su podijeljene s ovog poslužitelja.",
-    "Allow users to mount public link shares" : "Dopustite korisnicima postavljanje podijeljenih javnih veza"
+    "Direct link" : "Izravna veza"
 },"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/hu_HU.js b/apps/files_sharing/l10n/hu_HU.js
index 488ad61bab2..9472f88a992 100644
--- a/apps/files_sharing/l10n/hu_HU.js
+++ b/apps/files_sharing/l10n/hu_HU.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Adjuk hozzá a saját ownCloudunkhoz",
     "Download" : "Letöltés",
     "Download %s" : "%s letöltése",
-    "Direct link" : "Közvetlen link",
-    "Remote Shares" : "Távoli megosztások",
-    "Allow other instances to mount public links shared from this server" : "Engedélyezzük más ownCloud telepítéseknek, hogy becsatolják ennek a kiszolgálónak a nyilvános linkkel megadott megosztásait",
-    "Allow users to mount public link shares" : "Engedélyezzük, hogy felhasználóink becsatolják más kiszolgálók nyilvános, linkkel megadott megosztásait"
+    "Direct link" : "Közvetlen link"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/hu_HU.json b/apps/files_sharing/l10n/hu_HU.json
index f267a5a8ae7..735228feaac 100644
--- a/apps/files_sharing/l10n/hu_HU.json
+++ b/apps/files_sharing/l10n/hu_HU.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Adjuk hozzá a saját ownCloudunkhoz",
     "Download" : "Letöltés",
     "Download %s" : "%s letöltése",
-    "Direct link" : "Közvetlen link",
-    "Remote Shares" : "Távoli megosztások",
-    "Allow other instances to mount public links shared from this server" : "Engedélyezzük más ownCloud telepítéseknek, hogy becsatolják ennek a kiszolgálónak a nyilvános linkkel megadott megosztásait",
-    "Allow users to mount public link shares" : "Engedélyezzük, hogy felhasználóink becsatolják más kiszolgálók nyilvános, linkkel megadott megosztásait"
+    "Direct link" : "Közvetlen link"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/id.js b/apps/files_sharing/l10n/id.js
index 0f8d5a1a3eb..bc61073311b 100644
--- a/apps/files_sharing/l10n/id.js
+++ b/apps/files_sharing/l10n/id.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Tambahkan ke ownCloud Anda",
     "Download" : "Unduh",
     "Download %s" : "Unduh %s",
-    "Direct link" : "Tautan langsung",
-    "Remote Shares" : "Berbagi Remote",
-    "Allow other instances to mount public links shared from this server" : "Izinkan instansi lain untuk mengaitkan tautan publik untuk dibagikan dari server ini",
-    "Allow users to mount public link shares" : "Izinkan pengguna untuk mengaitkan tautan berbagi publik"
+    "Direct link" : "Tautan langsung"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/id.json b/apps/files_sharing/l10n/id.json
index beb4f4f34f9..a4b0a984969 100644
--- a/apps/files_sharing/l10n/id.json
+++ b/apps/files_sharing/l10n/id.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Tambahkan ke ownCloud Anda",
     "Download" : "Unduh",
     "Download %s" : "Unduh %s",
-    "Direct link" : "Tautan langsung",
-    "Remote Shares" : "Berbagi Remote",
-    "Allow other instances to mount public links shared from this server" : "Izinkan instansi lain untuk mengaitkan tautan publik untuk dibagikan dari server ini",
-    "Allow users to mount public link shares" : "Izinkan pengguna untuk mengaitkan tautan berbagi publik"
+    "Direct link" : "Tautan langsung"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 5e604ec199d..814e1a35f49 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Aggiungi al tuo ownCloud",
     "Download" : "Scarica",
     "Download %s" : "Scarica %s",
-    "Direct link" : "Collegamento diretto",
-    "Remote Shares" : "Condivisioni remote",
-    "Allow other instances to mount public links shared from this server" : "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server",
-    "Allow users to mount public link shares" : "Permetti agli utenti di montare condivisioni con collegamento pubblico"
+    "Direct link" : "Collegamento diretto"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 3477bb1909a..4b070fe12c0 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Aggiungi al tuo ownCloud",
     "Download" : "Scarica",
     "Download %s" : "Scarica %s",
-    "Direct link" : "Collegamento diretto",
-    "Remote Shares" : "Condivisioni remote",
-    "Allow other instances to mount public links shared from this server" : "Permetti ad altre istanze di montare collegamenti pubblici condivisi da questo server",
-    "Allow users to mount public link shares" : "Permetti agli utenti di montare condivisioni con collegamento pubblico"
+    "Direct link" : "Collegamento diretto"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index ed0ee4fd3a1..c21273c2d79 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "ownCloud に追加",
     "Download" : "ダウンロード",
     "Download %s" : "%s をダウンロード",
-    "Direct link" : "リンク",
-    "Remote Shares" : "リモート共有",
-    "Allow other instances to mount public links shared from this server" : "このサーバーにおけるURLでの共有を他のインスタンスからマウントできるようにする",
-    "Allow users to mount public link shares" : "ユーザーがURLでの共有をマウントできるようにする"
+    "Direct link" : "リンク"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index 8500f6b2f2f..da34e81cf66 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "ownCloud に追加",
     "Download" : "ダウンロード",
     "Download %s" : "%s をダウンロード",
-    "Direct link" : "リンク",
-    "Remote Shares" : "リモート共有",
-    "Allow other instances to mount public links shared from this server" : "このサーバーにおけるURLでの共有を他のインスタンスからマウントできるようにする",
-    "Allow users to mount public link shares" : "ユーザーがURLでの共有をマウントできるようにする"
+    "Direct link" : "リンク"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/nb_NO.js b/apps/files_sharing/l10n/nb_NO.js
index 1038d9e1beb..cd98a9c396d 100644
--- a/apps/files_sharing/l10n/nb_NO.js
+++ b/apps/files_sharing/l10n/nb_NO.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Legg til i din ownCloud",
     "Download" : "Last ned",
     "Download %s" : "Last ned %s",
-    "Direct link" : "Direkte lenke",
-    "Remote Shares" : "Ekstern deling",
-    "Allow other instances to mount public links shared from this server" : "Tillat at andre servere kobler opp offentlige lenker som er delt fra denne serveren",
-    "Allow users to mount public link shares" : "Tillat at brukere kobler opp offentlige lenke-delinger"
+    "Direct link" : "Direkte lenke"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nb_NO.json b/apps/files_sharing/l10n/nb_NO.json
index a511465b997..fe2df9e9307 100644
--- a/apps/files_sharing/l10n/nb_NO.json
+++ b/apps/files_sharing/l10n/nb_NO.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Legg til i din ownCloud",
     "Download" : "Last ned",
     "Download %s" : "Last ned %s",
-    "Direct link" : "Direkte lenke",
-    "Remote Shares" : "Ekstern deling",
-    "Allow other instances to mount public links shared from this server" : "Tillat at andre servere kobler opp offentlige lenker som er delt fra denne serveren",
-    "Allow users to mount public link shares" : "Tillat at brukere kobler opp offentlige lenke-delinger"
+    "Direct link" : "Direkte lenke"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index ae691afda9b..87ddec611a8 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Toevoegen aan uw ownCloud",
     "Download" : "Downloaden",
     "Download %s" : "Download %s",
-    "Direct link" : "Directe link",
-    "Remote Shares" : "Externe shares",
-    "Allow other instances to mount public links shared from this server" : "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server",
-    "Allow users to mount public link shares" : "Toestaan dat gebruikers openbaar gedeelde links mounten"
+    "Direct link" : "Directe link"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index eb53e0da936..2cdbf4eb953 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Toevoegen aan uw ownCloud",
     "Download" : "Downloaden",
     "Download %s" : "Download %s",
-    "Direct link" : "Directe link",
-    "Remote Shares" : "Externe shares",
-    "Allow other instances to mount public links shared from this server" : "Toestaan dat andere oanClouds openbaar gedeelde links mounten vanaf deze server",
-    "Allow users to mount public link shares" : "Toestaan dat gebruikers openbaar gedeelde links mounten"
+    "Direct link" : "Directe link"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pl.js b/apps/files_sharing/l10n/pl.js
index 65a4de92265..9fc08f64bbc 100644
--- a/apps/files_sharing/l10n/pl.js
+++ b/apps/files_sharing/l10n/pl.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Dodaj do twojego ownCloud",
     "Download" : "Pobierz",
     "Download %s" : "Pobierz %s",
-    "Direct link" : "Bezpośredni link",
-    "Remote Shares" : "Udziały zdalne",
-    "Allow other instances to mount public links shared from this server" : "Pozwól innym instancjom montować publiczne linki z tego serwera",
-    "Allow users to mount public link shares" : "Zezwalaj użytkownikom na montowanie publicznych linków"
+    "Direct link" : "Bezpośredni link"
 },
 "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_sharing/l10n/pl.json b/apps/files_sharing/l10n/pl.json
index 89ad199602e..a6c06ef01fc 100644
--- a/apps/files_sharing/l10n/pl.json
+++ b/apps/files_sharing/l10n/pl.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Dodaj do twojego ownCloud",
     "Download" : "Pobierz",
     "Download %s" : "Pobierz %s",
-    "Direct link" : "Bezpośredni link",
-    "Remote Shares" : "Udziały zdalne",
-    "Allow other instances to mount public links shared from this server" : "Pozwól innym instancjom montować publiczne linki z tego serwera",
-    "Allow users to mount public link shares" : "Zezwalaj użytkownikom na montowanie publicznych linków"
+    "Direct link" : "Bezpośredni link"
 },"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_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index 498f423e69a..cb961362f4d 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Adiconar ao seu ownCloud",
     "Download" : "Baixar",
     "Download %s" : "Baixar %s",
-    "Direct link" : "Link direto",
-    "Remote Shares" : "Compartilhamentos Remoto",
-    "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor",
-    "Allow users to mount public link shares" : "Permitir aos usuários montar links públicos de compartilhamentos"
+    "Direct link" : "Link direto"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 4739bc9a24a..3ca7602a171 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Adiconar ao seu ownCloud",
     "Download" : "Baixar",
     "Download %s" : "Baixar %s",
-    "Direct link" : "Link direto",
-    "Remote Shares" : "Compartilhamentos Remoto",
-    "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias montem links de compartilhamentos públicos a partir desde servidor",
-    "Allow users to mount public link shares" : "Permitir aos usuários montar links públicos de compartilhamentos"
+    "Direct link" : "Link direto"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index 218d4608ab6..b85bd00014c 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Adicionar á sua ownCloud",
     "Download" : "Transferir",
     "Download %s" : "Transferir %s",
-    "Direct link" : "Hiperligação direta",
-    "Remote Shares" : "Partilhas Remotas",
-    "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias mapeiem endereços partilhados deste servidor",
-    "Allow users to mount public link shares" : "Permitir mapeamentos de endereços partilhados aos utilizadores"
+    "Direct link" : "Hiperligação direta"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 1de211bebc3..228d59d2b9c 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Adicionar á sua ownCloud",
     "Download" : "Transferir",
     "Download %s" : "Transferir %s",
-    "Direct link" : "Hiperligação direta",
-    "Remote Shares" : "Partilhas Remotas",
-    "Allow other instances to mount public links shared from this server" : "Permitir que outras instâncias mapeiem endereços partilhados deste servidor",
-    "Allow users to mount public link shares" : "Permitir mapeamentos de endereços partilhados aos utilizadores"
+    "Direct link" : "Hiperligação direta"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ro.js b/apps/files_sharing/l10n/ro.js
index a359e6f284c..48957ec9fbc 100644
--- a/apps/files_sharing/l10n/ro.js
+++ b/apps/files_sharing/l10n/ro.js
@@ -17,7 +17,6 @@ OC.L10N.register(
     "sharing is disabled" : "Partajare este oprită",
     "Add to your ownCloud" : "Adaugă propriul tău ownCloud",
     "Download" : "Descarcă",
-    "Download %s" : "Descarcă %s",
-    "Remote Shares" : "Partajări de la distanță"
+    "Download %s" : "Descarcă %s"
 },
 "nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/apps/files_sharing/l10n/ro.json b/apps/files_sharing/l10n/ro.json
index 31b883d8193..c0ab9e366e2 100644
--- a/apps/files_sharing/l10n/ro.json
+++ b/apps/files_sharing/l10n/ro.json
@@ -15,7 +15,6 @@
     "sharing is disabled" : "Partajare este oprită",
     "Add to your ownCloud" : "Adaugă propriul tău ownCloud",
     "Download" : "Descarcă",
-    "Download %s" : "Descarcă %s",
-    "Remote Shares" : "Partajări de la distanță"
+    "Download %s" : "Descarcă %s"
 },"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_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index eb788b1c36f..f6a24253590 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Добавить в свой ownCloud",
     "Download" : "Скачать",
     "Download %s" : "Скачать %s",
-    "Direct link" : "Прямая ссылка",
-    "Remote Shares" : "Удалённые общие папки",
-    "Allow other instances to mount public links shared from this server" : "Разрешить другим экземплярам Owncloud монтировать ссылки, опубликованные на этом сервере",
-    "Allow users to mount public link shares" : "Разрешить пользователям монтировать ссылки на общие папки"
+    "Direct link" : "Прямая ссылка"
 },
 "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/ru.json b/apps/files_sharing/l10n/ru.json
index a31468bf36f..9eaf51586d4 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Добавить в свой ownCloud",
     "Download" : "Скачать",
     "Download %s" : "Скачать %s",
-    "Direct link" : "Прямая ссылка",
-    "Remote Shares" : "Удалённые общие папки",
-    "Allow other instances to mount public links shared from this server" : "Разрешить другим экземплярам Owncloud монтировать ссылки, опубликованные на этом сервере",
-    "Allow users to mount public link shares" : "Разрешить пользователям монтировать ссылки на общие папки"
+    "Direct link" : "Прямая ссылка"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sk_SK.js b/apps/files_sharing/l10n/sk_SK.js
index 42d7259df4f..a68ce01a721 100644
--- a/apps/files_sharing/l10n/sk_SK.js
+++ b/apps/files_sharing/l10n/sk_SK.js
@@ -32,9 +32,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Pridať do svojho ownCloudu",
     "Download" : "Sťahovanie",
     "Download %s" : "Stiahnuť %s",
-    "Direct link" : "Priama linka",
-    "Remote Shares" : "Vzdialené úložiská",
-    "Allow other instances to mount public links shared from this server" : "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera",
-    "Allow users to mount public link shares" : "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy"
+    "Direct link" : "Priama linka"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_sharing/l10n/sk_SK.json b/apps/files_sharing/l10n/sk_SK.json
index 03853efa980..29470388f0f 100644
--- a/apps/files_sharing/l10n/sk_SK.json
+++ b/apps/files_sharing/l10n/sk_SK.json
@@ -30,9 +30,6 @@
     "Add to your ownCloud" : "Pridať do svojho ownCloudu",
     "Download" : "Sťahovanie",
     "Download %s" : "Stiahnuť %s",
-    "Direct link" : "Priama linka",
-    "Remote Shares" : "Vzdialené úložiská",
-    "Allow other instances to mount public links shared from this server" : "Povoliť ďalším inštanciám pripojiť verejné odkazy zdieľané z tohto servera",
-    "Allow users to mount public link shares" : "Povoliť používateľom pripojiť sa na zdieľané verejné odkazy"
+    "Direct link" : "Priama linka"
 },"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/sl.js b/apps/files_sharing/l10n/sl.js
index 9466ea37f89..d685f6cc501 100644
--- a/apps/files_sharing/l10n/sl.js
+++ b/apps/files_sharing/l10n/sl.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud",
     "Download" : "Prejmi",
     "Download %s" : "Prejmi %s",
-    "Direct link" : "Neposredna povezava",
-    "Remote Shares" : "Oddaljena souporaba",
-    "Allow other instances to mount public links shared from this server" : "Dovoli drugim primerkom priklop javnih povezav s tega strežnika",
-    "Allow users to mount public link shares" : "Dovoli uporabnikom priklop javnih povezav med mapami za souporabo"
+    "Direct link" : "Neposredna povezava"
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json
index 2619904b50a..0b45262f95f 100644
--- a/apps/files_sharing/l10n/sl.json
+++ b/apps/files_sharing/l10n/sl.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud",
     "Download" : "Prejmi",
     "Download %s" : "Prejmi %s",
-    "Direct link" : "Neposredna povezava",
-    "Remote Shares" : "Oddaljena souporaba",
-    "Allow other instances to mount public links shared from this server" : "Dovoli drugim primerkom priklop javnih povezav s tega strežnika",
-    "Allow users to mount public link shares" : "Dovoli uporabnikom priklop javnih povezav med mapami za souporabo"
+    "Direct link" : "Neposredna povezava"
 },"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_sharing/l10n/sv.js b/apps/files_sharing/l10n/sv.js
index f9e595f3406..ba1ecda864f 100644
--- a/apps/files_sharing/l10n/sv.js
+++ b/apps/files_sharing/l10n/sv.js
@@ -27,9 +27,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Lägg till i din ownCloud",
     "Download" : "Ladda ner",
     "Download %s" : "Ladda ner %s",
-    "Direct link" : "Direkt länk",
-    "Remote Shares" : "Fjärrutdelningar Server-Server",
-    "Allow other instances to mount public links shared from this server" : "Tillåt andra instanser vidaredelning utav publika länkar delade från denna servern",
-    "Allow users to mount public link shares" : "Tillåt användare att montera publika länkar"
+    "Direct link" : "Direkt länk"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/sv.json b/apps/files_sharing/l10n/sv.json
index c0763d3f384..fecdfd2bed8 100644
--- a/apps/files_sharing/l10n/sv.json
+++ b/apps/files_sharing/l10n/sv.json
@@ -25,9 +25,6 @@
     "Add to your ownCloud" : "Lägg till i din ownCloud",
     "Download" : "Ladda ner",
     "Download %s" : "Ladda ner %s",
-    "Direct link" : "Direkt länk",
-    "Remote Shares" : "Fjärrutdelningar Server-Server",
-    "Allow other instances to mount public links shared from this server" : "Tillåt andra instanser vidaredelning utav publika länkar delade från denna servern",
-    "Allow users to mount public link shares" : "Tillåt användare att montera publika länkar"
+    "Direct link" : "Direkt länk"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index 919b615d239..ae6217cab93 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "ownCloud'ınıza Ekleyin",
     "Download" : "İndir",
     "Download %s" : "İndir: %s",
-    "Direct link" : "Doğrudan bağlantı",
-    "Remote Shares" : "Uzak Paylaşımlar",
-    "Allow other instances to mount public links shared from this server" : "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver",
-    "Allow users to mount public link shares" : "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver"
+    "Direct link" : "Doğrudan bağlantı"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index d7c4b7c7b7c..90d206ac3ed 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "ownCloud'ınıza Ekleyin",
     "Download" : "İndir",
     "Download %s" : "İndir: %s",
-    "Direct link" : "Doğrudan bağlantı",
-    "Remote Shares" : "Uzak Paylaşımlar",
-    "Allow other instances to mount public links shared from this server" : "Diğer örneklerin, bu sunucudan paylaşılmış herkese açık bağlantıları bağlamasına izin ver",
-    "Allow users to mount public link shares" : "Kullanıcıların herkese açık bağlantı paylaşımlarını bağlamasına izin ver"
+    "Direct link" : "Doğrudan bağlantı"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js
index fd5dacb564e..a41afdceb71 100644
--- a/apps/files_sharing/l10n/uk.js
+++ b/apps/files_sharing/l10n/uk.js
@@ -33,9 +33,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "Додати до вашого ownCloud",
     "Download" : "Завантажити",
     "Download %s" : "Завантажити %s",
-    "Direct link" : "Пряме посилання",
-    "Remote Shares" : "Віддалені загальні теки",
-    "Allow other instances to mount public links shared from this server" : "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері",
-    "Allow users to mount public link shares" : "Дозволити користувачам монтувати монтувати посилання на загальні теки"
+    "Direct link" : "Пряме посилання"
 },
 "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 5ec57cdad12..a8d66aae2e9 100644
--- a/apps/files_sharing/l10n/uk.json
+++ b/apps/files_sharing/l10n/uk.json
@@ -31,9 +31,6 @@
     "Add to your ownCloud" : "Додати до вашого ownCloud",
     "Download" : "Завантажити",
     "Download %s" : "Завантажити %s",
-    "Direct link" : "Пряме посилання",
-    "Remote Shares" : "Віддалені загальні теки",
-    "Allow other instances to mount public links shared from this server" : "Дозволити іншим ownCloud монтувати посилання, опублікованих на цьому сервері",
-    "Allow users to mount public link shares" : "Дозволити користувачам монтувати монтувати посилання на загальні теки"
+    "Direct link" : "Пряме посилання"
 },"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/zh_CN.js b/apps/files_sharing/l10n/zh_CN.js
index b5cb43f6ce2..66c400d0cf0 100644
--- a/apps/files_sharing/l10n/zh_CN.js
+++ b/apps/files_sharing/l10n/zh_CN.js
@@ -31,9 +31,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "添加到您的 ownCloud",
     "Download" : "下载",
     "Download %s" : "下载 %s",
-    "Direct link" : "直接链接",
-    "Remote Shares" : "远程分享",
-    "Allow other instances to mount public links shared from this server" : "允许其他实例挂载由此服务器分享的公共链接",
-    "Allow users to mount public link shares" : "允许用户挂载公共链接分享"
+    "Direct link" : "直接链接"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/zh_CN.json b/apps/files_sharing/l10n/zh_CN.json
index 760a2807f5b..9169b33998b 100644
--- a/apps/files_sharing/l10n/zh_CN.json
+++ b/apps/files_sharing/l10n/zh_CN.json
@@ -29,9 +29,6 @@
     "Add to your ownCloud" : "添加到您的 ownCloud",
     "Download" : "下载",
     "Download %s" : "下载 %s",
-    "Direct link" : "直接链接",
-    "Remote Shares" : "远程分享",
-    "Allow other instances to mount public links shared from this server" : "允许其他实例挂载由此服务器分享的公共链接",
-    "Allow users to mount public link shares" : "允许用户挂载公共链接分享"
+    "Direct link" : "直接链接"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/zh_TW.js b/apps/files_sharing/l10n/zh_TW.js
index 1ed3dc6aa47..9512b0ab87e 100644
--- a/apps/files_sharing/l10n/zh_TW.js
+++ b/apps/files_sharing/l10n/zh_TW.js
@@ -31,9 +31,6 @@ OC.L10N.register(
     "Add to your ownCloud" : "加入到你的 ownCloud",
     "Download" : "下載",
     "Download %s" : "下載 %s",
-    "Direct link" : "直接連結",
-    "Remote Shares" : "遠端分享",
-    "Allow other instances to mount public links shared from this server" : "允許其他伺服器掛載本地的公開分享",
-    "Allow users to mount public link shares" : "允許使用者掛載公開分享"
+    "Direct link" : "直接連結"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/zh_TW.json b/apps/files_sharing/l10n/zh_TW.json
index 1dabacfdfd2..2065c00ff6d 100644
--- a/apps/files_sharing/l10n/zh_TW.json
+++ b/apps/files_sharing/l10n/zh_TW.json
@@ -29,9 +29,6 @@
     "Add to your ownCloud" : "加入到你的 ownCloud",
     "Download" : "下載",
     "Download %s" : "下載 %s",
-    "Direct link" : "直接連結",
-    "Remote Shares" : "遠端分享",
-    "Allow other instances to mount public links shared from this server" : "允許其他伺服器掛載本地的公開分享",
-    "Allow users to mount public link shares" : "允許使用者掛載公開分享"
+    "Direct link" : "直接連結"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/et_EE.js b/apps/user_ldap/l10n/et_EE.js
index 7ff4b4564b3..6208c0fa697 100644
--- a/apps/user_ldap/l10n/et_EE.js
+++ b/apps/user_ldap/l10n/et_EE.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Salvestamine",
     "Back" : "Tagasi",
     "Continue" : "Jätka",
+    "LDAP" : "LDAP",
     "Expert" : "Ekspert",
     "Advanced" : "Täpsem",
     "<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>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
diff --git a/apps/user_ldap/l10n/et_EE.json b/apps/user_ldap/l10n/et_EE.json
index 41b5f73f575..81286459007 100644
--- a/apps/user_ldap/l10n/et_EE.json
+++ b/apps/user_ldap/l10n/et_EE.json
@@ -74,6 +74,7 @@
     "Saving" : "Salvestamine",
     "Back" : "Tagasi",
     "Continue" : "Jätka",
+    "LDAP" : "LDAP",
     "Expert" : "Ekspert",
     "Advanced" : "Täpsem",
     "<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>Hoiatus:</b> rakendused user_ldap ja user_webdavauht ei ole ühilduvad. Töös võib esineda ootamatuid tõrkeid.\nPalu oma süsteemihalduril üks neist rakendustest kasutusest eemaldada.",
diff --git a/apps/user_ldap/l10n/sk_SK.js b/apps/user_ldap/l10n/sk_SK.js
index 9a15db6bb81..3c3f9a0cc83 100644
--- a/apps/user_ldap/l10n/sk_SK.js
+++ b/apps/user_ldap/l10n/sk_SK.js
@@ -48,6 +48,7 @@ OC.L10N.register(
     "Edit raw filter instead" : "Miesto pre úpravu raw filtra",
     "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
+    "Test Filter" : "Otestovať filter",
     "groups found" : "nájdené skupiny",
     "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
     "LDAP Username:" : "LDAP používateľské meno:",
@@ -67,11 +68,15 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
     "One Base DN per line" : "Jedno základné DN na riadok",
     "You can specify Base DN for users and groups in the Advanced tab" : "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Bráni automatickým LDAP požiadavkám. Výhodné pre objemné nastavenia ale vyžaduje si dobrú znalosť o LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)",
     "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
     "users found" : "nájdení používatelia",
+    "Saving" : "Ukladá sa",
     "Back" : "Späť",
     "Continue" : "Pokračovať",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Rozšírené",
     "<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>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
diff --git a/apps/user_ldap/l10n/sk_SK.json b/apps/user_ldap/l10n/sk_SK.json
index 2baab6b88b1..ff881a68803 100644
--- a/apps/user_ldap/l10n/sk_SK.json
+++ b/apps/user_ldap/l10n/sk_SK.json
@@ -46,6 +46,7 @@
     "Edit raw filter instead" : "Miesto pre úpravu raw filtra",
     "Raw LDAP filter" : "Raw LDAP filter",
     "The filter specifies which LDAP groups shall have access to the %s instance." : "Tento filter LDAP určuje, ktoré skupiny budú mať prístup k %s inštancii.",
+    "Test Filter" : "Otestovať filter",
     "groups found" : "nájdené skupiny",
     "Users login with this attribute:" : "Používatelia sa budú prihlasovať pomocou tohto atribútu:",
     "LDAP Username:" : "LDAP používateľské meno:",
@@ -65,11 +66,15 @@
     "For anonymous access, leave DN and Password empty." : "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne.",
     "One Base DN per line" : "Jedno základné DN na riadok",
     "You can specify Base DN for users and groups in the Advanced tab" : "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny",
+    "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Bráni automatickým LDAP požiadavkám. Výhodné pre objemné nastavenia ale vyžaduje si dobrú znalosť o LDAP.",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ručné vloženie LDAP filtrov (odporúčané pre rozsiahle adresáre)",
     "Limit %s access to users meeting these criteria:" : "Obmedziť %s prístup na používateľov spĺňajúcich tieto kritériá:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Tento filter LDAP určuje, ktorí používatelia majú prístup k %s inštancii.",
     "users found" : "nájdení používatelia",
+    "Saving" : "Ukladá sa",
     "Back" : "Späť",
     "Continue" : "Pokračovať",
+    "LDAP" : "LDAP",
     "Expert" : "Expert",
     "Advanced" : "Rozšírené",
     "<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>Upozornenie:</b> Aplikácie user_ldap a user_webdavauth sú navzájom nekompatibilné. Môžete zaznamenať neočakávané správanie. Požiadajte prosím vášho systémového administrátora pre zakázanie jedného z nich.",
diff --git a/apps/user_webdavauth/l10n/hy.js b/apps/user_webdavauth/l10n/hy.js
index 97e5a7316c6..5d509b1c664 100644
--- a/apps/user_webdavauth/l10n/hy.js
+++ b/apps/user_webdavauth/l10n/hy.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "user_webdavauth",
     {
+    "Address:" : "Հասցե՝",
     "Save" : "Պահպանել"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/user_webdavauth/l10n/hy.json b/apps/user_webdavauth/l10n/hy.json
index cb94f4404a5..ac0399d5cf8 100644
--- a/apps/user_webdavauth/l10n/hy.json
+++ b/apps/user_webdavauth/l10n/hy.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Address:" : "Հասցե՝",
     "Save" : "Պահպանել"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 79303820ad8..7325c6478d8 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -110,9 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Muuda silte",
     "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
     "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "unknown text" : "tundmatu tekst",
+    "Hello world!" : "Tere maailm!",
     "sunny" : "päikeseline",
     "Hello {name}, the weather is {weather}" : "Tere {name}, ilm on {weather}",
-    "_download %n file_::_download %n files_" : ["",""],
+    "_download %n file_::_download %n files_" : ["laadi alla %n fail","laadi alla %n faili"],
     "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
     "Please reload the page." : "Palun laadi see uuesti.",
     "The update was unsuccessful." : "Uuendus ebaõnnestus.",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 3a438678aee..56ede97196a 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -108,9 +108,11 @@
     "Edit tags" : "Muuda silte",
     "Error loading dialog template: {error}" : "Viga dialoogi malli laadimisel: {error}",
     "No tags selected for deletion." : "Kustutamiseks pole ühtegi silti valitud.",
+    "unknown text" : "tundmatu tekst",
+    "Hello world!" : "Tere maailm!",
     "sunny" : "päikeseline",
     "Hello {name}, the weather is {weather}" : "Tere {name}, ilm on {weather}",
-    "_download %n file_::_download %n files_" : ["",""],
+    "_download %n file_::_download %n files_" : ["laadi alla %n fail","laadi alla %n faili"],
     "Updating {productName} to version {version}, this may take a while." : "Uuendan {productName} versioonile {version}, see võtab veidi aega.",
     "Please reload the page." : "Palun laadi see uuesti.",
     "The update was unsuccessful." : "Uuendus ebaõnnestus.",
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index e4648f78151..2954e513327 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -84,6 +84,7 @@ OC.L10N.register(
     "Send" : "Odoslať",
     "Set expiration date" : "Nastaviť dátum expirácie",
     "Expiration date" : "Dátum expirácie",
+    "Adding user..." : "Pridávam používateľa...",
     "group" : "skupina",
     "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}",
@@ -108,7 +109,10 @@ OC.L10N.register(
     "Edit tags" : "Upraviť štítky",
     "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
     "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
-    "_download %n file_::_download %n files_" : ["","",""],
+    "unknown text" : "neznámy text",
+    "Hello world!" : "Ahoj svet!",
+    "sunny" : "slnečno",
+    "_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
     "Please reload the page." : "Obnovte prosím stránku.",
     "The update was unsuccessful." : "Aktualizácia zlyhala.",
@@ -140,9 +144,20 @@ OC.L10N.register(
     "Error favoriting" : "Chyba pri pridaní do obľúbených",
     "Error unfavoriting" : "Chyba pri odobratí z obľúbených",
     "Access forbidden" : "Prístup odmietnutý",
+    "File not found" : "Súbor nenájdený",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
     "The share will expire on %s." : "Zdieľanie vyprší %s.",
     "Cheers!" : "Pekný deň!",
+    "Internal Server Error" : "Vnútorná chyba servera",
+    "More details can be found in the server log." : "Viac nájdete v logu servera.",
+    "Technical details" : "Technické podrobnosti",
+    "Remote Address: %s" : "Vzdialená adresa: %s",
+    "Request ID: %s" : "ID požiadavky: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Správa: %s",
+    "File: %s" : "Súbor: %s",
+    "Line: %s" : "Riadok: %s",
+    "Trace" : "Trasa",
     "Security Warning" : "Bezpečnostné varovanie",
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index a5c883a0bb3..fa6ed266564 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -82,6 +82,7 @@
     "Send" : "Odoslať",
     "Set expiration date" : "Nastaviť dátum expirácie",
     "Expiration date" : "Dátum expirácie",
+    "Adding user..." : "Pridávam používateľa...",
     "group" : "skupina",
     "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}",
@@ -106,7 +107,10 @@
     "Edit tags" : "Upraviť štítky",
     "Error loading dialog template: {error}" : "Chyba pri načítaní šablóny dialógu: {error}",
     "No tags selected for deletion." : "Nie sú vybraté štítky na zmazanie.",
-    "_download %n file_::_download %n files_" : ["","",""],
+    "unknown text" : "neznámy text",
+    "Hello world!" : "Ahoj svet!",
+    "sunny" : "slnečno",
+    "_download %n file_::_download %n files_" : ["stiahnuť %n súbor","stiahnuť %n súbory","stiahnuť %n súborov"],
     "Updating {productName} to version {version}, this may take a while." : "Aktualizujem {productName} na verziu {version}, chvíľu to môže trvať.",
     "Please reload the page." : "Obnovte prosím stránku.",
     "The update was unsuccessful." : "Aktualizácia zlyhala.",
@@ -138,9 +142,20 @@
     "Error favoriting" : "Chyba pri pridaní do obľúbených",
     "Error unfavoriting" : "Chyba pri odobratí z obľúbených",
     "Access forbidden" : "Prístup odmietnutý",
+    "File not found" : "Súbor nenájdený",
     "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Dobrý deň,\n\nPoužívateľ %s zdieľa s vami súbor, alebo priečinok s názvom %s.\nPre zobrazenie kliknite na túto linku: %s\n",
     "The share will expire on %s." : "Zdieľanie vyprší %s.",
     "Cheers!" : "Pekný deň!",
+    "Internal Server Error" : "Vnútorná chyba servera",
+    "More details can be found in the server log." : "Viac nájdete v logu servera.",
+    "Technical details" : "Technické podrobnosti",
+    "Remote Address: %s" : "Vzdialená adresa: %s",
+    "Request ID: %s" : "ID požiadavky: %s",
+    "Code: %s" : "Kód: %s",
+    "Message: %s" : "Správa: %s",
+    "File: %s" : "Súbor: %s",
+    "Line: %s" : "Riadok: %s",
+    "Trace" : "Trasa",
     "Security Warning" : "Bezpečnostné varovanie",
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Verzia Vášho PHP je napadnuteľná pomocou techniky \"NULL Byte\" (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Aktualizujte prosím vašu inštanciu PHP pre bezpečné používanie %s.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 0f0209f6666..dacc144fc01 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 58995baad8b..c7f9ce54301 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index cb3d40bee8a..a8046e6d05b 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 0e81708e464..6a044f6fb0e 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 4a1bfaf9aba..08ebd45a43b 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -150,14 +150,14 @@ msgstr ""
 msgid "Direct link"
 msgstr ""
 
-#: templates/settings-admin.php:3
-msgid "Remote Shares"
+#: templates/settings-admin.php:7
+msgid "Server-to-Server Sharing"
 msgstr ""
 
-#: templates/settings-admin.php:7
-msgid "Allow other instances to mount public links shared from this server"
+#: templates/settings-admin.php:12
+msgid "Allow users on this server to send shares to other servers"
 msgstr ""
 
-#: templates/settings-admin.php:11
-msgid "Allow users to mount public link shares"
+#: templates/settings-admin.php:18
+msgid "Allow users on this server to receive shares from other servers"
 msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index a90207b6f37..7b7b062bdc3 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,12 +17,12 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ajax/delete.php:59
+#: ajax/delete.php:61
 #, php-format
 msgid "Couldn't delete %s permanently"
 msgstr ""
 
-#: ajax/undelete.php:64
+#: ajax/undelete.php:65
 #, php-format
 msgid "Couldn't restore %s"
 msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index ef55e0242f3..47edc7a17f5 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 88a4a5cb970..74fc434fcc4 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index ac4d63bb437..d44e6ef00e3 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 3f5dcc6931b..2ba8eb33c0c 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -372,19 +372,19 @@ msgstr ""
 msgid "Warning: Home directory for user \"{user}\" already exists"
 msgstr ""
 
-#: personal.php:51 personal.php:52
+#: personal.php:49 personal.php:50
 msgid "__language_name__"
 msgstr ""
 
-#: personal.php:107
+#: personal.php:105
 msgid "Personal Info"
 msgstr ""
 
-#: personal.php:132 templates/personal.php:173
+#: personal.php:130 templates/personal.php:173
 msgid "SSL root certificates"
 msgstr ""
 
-#: personal.php:134 templates/admin.php:382 templates/personal.php:214
+#: personal.php:132 templates/admin.php:382 templates/personal.php:214
 msgid "Encryption"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index bba404e5906..57a1d792ee4 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 472368c45ab..7d7831082f0 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-05 01:54-0500\n"
+"POT-Creation-Date: 2014-11-06 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js
index 97ace297cf6..a2e87c5b631 100644
--- a/lib/l10n/sk_SK.js
+++ b/lib/l10n/sk_SK.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Settings" : "Nastavenia",
     "Users" : "Používatelia",
     "Admin" : "Administrátor",
+    "Recommended" : "Odporúčané",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie je kompatibilná s touto verziou systému ownCloud.",
     "No app name specified" : "Nešpecifikované meno aplikácie",
     "Unknown filetype" : "Neznámy typ súboru",
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json
index 6867222d329..84ab8c4a007 100644
--- a/lib/l10n/sk_SK.json
+++ b/lib/l10n/sk_SK.json
@@ -10,6 +10,7 @@
     "Settings" : "Nastavenia",
     "Users" : "Používatelia",
     "Admin" : "Administrátor",
+    "Recommended" : "Odporúčané",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Aplikáciu \\\"%s\\\" nemožno nainštalovať, pretože nie je kompatibilná s touto verziou systému ownCloud.",
     "No app name specified" : "Nešpecifikované meno aplikácie",
     "Unknown filetype" : "Neznámy typ súboru",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index 0b9a2b8615b..f19283c5736 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Turva- ja paigalduse hoiatused",
     "Cron" : "Cron",
     "Sharing" : "Jagamine",
     "Security" : "Turvalisus",
@@ -119,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
     "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
+    "Connectivity Checks" : "Ühenduse kontrollid",
     "No problems found" : "Ühtegi probleemi ei leitud",
     "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
     "Last cron was executed at %s." : "Cron käivitati viimati %s.",
@@ -228,6 +230,7 @@ OC.L10N.register(
     "Unlimited" : "Piiramatult",
     "Other" : "Muu",
     "Username" : "Kasutajanimi",
+    "Group Admin for" : "Grupi admin",
     "Quota" : "Mahupiir",
     "Storage Location" : "Mahu asukoht",
     "Last Login" : "Viimane sisselogimine",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 26524f33270..b8390b7eac2 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Turva- ja paigalduse hoiatused",
     "Cron" : "Cron",
     "Sharing" : "Jagamine",
     "Security" : "Turvalisus",
@@ -117,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
     "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
+    "Connectivity Checks" : "Ühenduse kontrollid",
     "No problems found" : "Ühtegi probleemi ei leitud",
     "Please double check the <a href='%s'>installation guides</a>." : "Palun tutvu veelkord <a href='%s'>paigalduse juhenditega</a>.",
     "Last cron was executed at %s." : "Cron käivitati viimati %s.",
@@ -226,6 +228,7 @@
     "Unlimited" : "Piiramatult",
     "Other" : "Muu",
     "Username" : "Kasutajanimi",
+    "Group Admin for" : "Grupi admin",
     "Quota" : "Mahupiir",
     "Storage Location" : "Mahu asukoht",
     "Last Login" : "Viimane sisselogimine",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 186d3b9ec5e..2bea7839552 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Bezpečnosť a nastavenia upozornení",
     "Cron" : "Cron",
     "Sharing" : "Zdieľanie",
     "Security" : "Zabezpečenie",
@@ -36,9 +37,12 @@ OC.L10N.register(
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
     "Unable to change password" : "Zmena hesla sa nepodarila",
     "Enabled" : "Povolené",
+    "Not enabled" : "Zakázané",
+    "Recommended" : "Odporúčané",
     "Saved" : "Uložené",
     "test email settings" : "nastavenia testovacieho emailu",
     "If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia.",
     "Email sent" : "Email odoslaný",
     "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
@@ -73,6 +77,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Musíte zadať platný názov skupiny",
     "deleted {groupName}" : "vymazaná {groupName}",
     "undo" : "vrátiť",
+    "no group" : "nie je v skupine",
     "never" : "nikdy",
     "deleted {userName}" : "vymazané {userName}",
     "add group" : "pridať skupinu",
@@ -81,6 +86,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Musíte zadať platné heslo",
     "Warning: Home directory for user \"{user}\" already exists" : "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
     "__language_name__" : "Slovensky",
+    "Personal Info" : "Osobné informácie",
     "SSL root certificates" : "Koreňové SSL certifikáty",
     "Encryption" : "Šifrovanie",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
@@ -114,6 +120,8 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
     "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Connectivity Checks" : "Overovanie pripojenia",
+    "No problems found" : "Nenašli sa žiadne problémy",
     "Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
     "Last cron was executed at %s." : "Posledný cron bol spustený %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
@@ -148,6 +156,7 @@ OC.L10N.register(
     "Credentials" : "Prihlasovanie údaje",
     "SMTP Username" : "SMTP používateľské meno",
     "SMTP Password" : "SMTP heslo",
+    "Store credentials" : "Ukladať prihlasovacie údaje",
     "Test email settings" : "Nastavenia testovacieho emailu",
     "Send email" : "Odoslať email",
     "Log level" : "Úroveň záznamu",
@@ -156,10 +165,13 @@ OC.L10N.register(
     "Version" : "Verzia",
     "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>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Viac aplikácií",
+    "Add your app" : "Pridať vašu aplikáciu",
     "by" : "od",
+    "licensed" : "licencované",
     "Documentation:" : "Dokumentácia:",
     "User Documentation" : "Príručka používateľa",
     "Admin Documentation" : "Príručka administrátora",
+    "Update to %s" : "Aktualizovať na %s",
     "Enable only for specific groups" : "Povoliť len pre vybrané skupiny",
     "Uninstall App" : "Odinštalovanie aplikácie",
     "Administrator Documentation" : "Príručka administrátora",
@@ -218,6 +230,7 @@ OC.L10N.register(
     "Unlimited" : "Nelimitované",
     "Other" : "Iné",
     "Username" : "Používateľské meno",
+    "Group Admin for" : "Administrátor skupiny",
     "Quota" : "Kvóta",
     "Storage Location" : "Umiestnenie úložiska",
     "Last Login" : "Posledné prihlásenie",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index 4e77bcad1f9..15e4d67b4cf 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Bezpečnosť a nastavenia upozornení",
     "Cron" : "Cron",
     "Sharing" : "Zdieľanie",
     "Security" : "Zabezpečenie",
@@ -34,9 +35,12 @@
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.",
     "Unable to change password" : "Zmena hesla sa nepodarila",
     "Enabled" : "Povolené",
+    "Not enabled" : "Zakázané",
+    "Recommended" : "Odporúčané",
     "Saved" : "Uložené",
     "test email settings" : "nastavenia testovacieho emailu",
     "If you received this email, the settings seem to be correct." : "Ak ste dostali tento email, nastavenie je správne.",
+    "A problem occurred while sending the email. Please revise your settings." : "Vyskytol sa problém pri odosielaní emailu. Prosím, znovu skontrolujte svoje nastavenia.",
     "Email sent" : "Email odoslaný",
     "You need to set your user email before being able to send test emails." : "Musíte nastaviť svoj po​​užívateľský email, než budete môcť odoslať testovací email.",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ste si istí, že chcete pridať \"{domain}\" medzi dôveryhodné domény?",
@@ -71,6 +75,7 @@
     "A valid group name must be provided" : "Musíte zadať platný názov skupiny",
     "deleted {groupName}" : "vymazaná {groupName}",
     "undo" : "vrátiť",
+    "no group" : "nie je v skupine",
     "never" : "nikdy",
     "deleted {userName}" : "vymazané {userName}",
     "add group" : "pridať skupinu",
@@ -79,6 +84,7 @@
     "A valid password must be provided" : "Musíte zadať platné heslo",
     "Warning: Home directory for user \"{user}\" already exists" : "Upozornenie: Domovský priečinok používateľa \"{user}\" už existuje",
     "__language_name__" : "Slovensky",
+    "Personal Info" : "Osobné informácie",
     "SSL root certificates" : "Koreňové SSL certifikáty",
     "Encryption" : "Šifrovanie",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Všetko (fatálne problémy, chyby, upozornenia, info, debug)",
@@ -112,6 +118,8 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
     "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
+    "Connectivity Checks" : "Overovanie pripojenia",
+    "No problems found" : "Nenašli sa žiadne problémy",
     "Please double check the <a href='%s'>installation guides</a>." : "Prosím skontrolujte <a href='%s'>inštalačnú príručku</a>.",
     "Last cron was executed at %s." : "Posledný cron bol spustený %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Posledný cron bol spustený %s. To je viac ako pred hodinou. Zdá sa, že niečo nie je vporiadku.",
@@ -146,6 +154,7 @@
     "Credentials" : "Prihlasovanie údaje",
     "SMTP Username" : "SMTP používateľské meno",
     "SMTP Password" : "SMTP heslo",
+    "Store credentials" : "Ukladať prihlasovacie údaje",
     "Test email settings" : "Nastavenia testovacieho emailu",
     "Send email" : "Odoslať email",
     "Log level" : "Úroveň záznamu",
@@ -154,10 +163,13 @@
     "Version" : "Verzia",
     "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>." : "Vyvinuté <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>,<a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencovaný pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Viac aplikácií",
+    "Add your app" : "Pridať vašu aplikáciu",
     "by" : "od",
+    "licensed" : "licencované",
     "Documentation:" : "Dokumentácia:",
     "User Documentation" : "Príručka používateľa",
     "Admin Documentation" : "Príručka administrátora",
+    "Update to %s" : "Aktualizovať na %s",
     "Enable only for specific groups" : "Povoliť len pre vybrané skupiny",
     "Uninstall App" : "Odinštalovanie aplikácie",
     "Administrator Documentation" : "Príručka administrátora",
@@ -216,6 +228,7 @@
     "Unlimited" : "Nelimitované",
     "Other" : "Iné",
     "Username" : "Používateľské meno",
+    "Group Admin for" : "Administrátor skupiny",
     "Quota" : "Kvóta",
     "Storage Location" : "Umiestnenie úložiska",
     "Last Login" : "Posledné prihlásenie",
-- 
GitLab


From 226d43a1cf7f040d75324525aae761679259919b Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 6 Nov 2014 09:27:12 +0100
Subject: [PATCH 335/616] manage select2 via bower

---
 apps/files_external/settings.php              |   4 +-
 bower.json                                    |   1 +
 core/js/select2/README.md                     |  90 ------------------
 core/js/select2/bower.json                    |   8 --
 core/js/select2/component.json                |  66 -------------
 core/js/select2/composer.json                 |  29 ------
 core/js/select2/package.json                  |  20 ----
 core/js/select2/release.sh                    |  79 ---------------
 core/js/select2/select2-bootstrap.css         |  87 -----------------
 core/js/select2/select2.jquery.json           |  36 -------
 core/js/select2/select2_locale_ar.js          |  17 ----
 core/js/select2/select2_locale_bg.js          |  18 ----
 core/js/select2/select2_locale_ca.js          |  17 ----
 core/js/select2/select2_locale_cs.js          |  49 ----------
 core/js/select2/select2_locale_da.js          |  17 ----
 core/js/select2/select2_locale_de.js          |  15 ---
 core/js/select2/select2_locale_el.js          |  17 ----
 core/js/select2/select2_locale_en.js.template |  18 ----
 core/js/select2/select2_locale_es.js          |  15 ---
 core/js/select2/select2_locale_et.js          |  17 ----
 core/js/select2/select2_locale_eu.js          |  43 ---------
 core/js/select2/select2_locale_fa.js          |  19 ----
 core/js/select2/select2_locale_fi.js          |  28 ------
 core/js/select2/select2_locale_fr.js          |  16 ----
 core/js/select2/select2_locale_gl.js          |  43 ---------
 core/js/select2/select2_locale_he.js          |  17 ----
 core/js/select2/select2_locale_hr.js          |  22 -----
 core/js/select2/select2_locale_hu.js          |  15 ---
 core/js/select2/select2_locale_id.js          |  17 ----
 core/js/select2/select2_locale_is.js          |  15 ---
 core/js/select2/select2_locale_it.js          |  15 ---
 core/js/select2/select2_locale_ja.js          |  15 ---
 core/js/select2/select2_locale_ka.js          |  17 ----
 core/js/select2/select2_locale_ko.js          |  17 ----
 core/js/select2/select2_locale_lt.js          |  24 -----
 core/js/select2/select2_locale_lv.js          |  17 ----
 core/js/select2/select2_locale_mk.js          |  17 ----
 core/js/select2/select2_locale_ms.js          |  17 ----
 core/js/select2/select2_locale_nl.js          |  15 ---
 core/js/select2/select2_locale_no.js          |  18 ----
 core/js/select2/select2_locale_pl.js          |  22 -----
 core/js/select2/select2_locale_pt-BR.js       |  15 ---
 core/js/select2/select2_locale_pt-PT.js       |  15 ---
 core/js/select2/select2_locale_ro.js          |  15 ---
 core/js/select2/select2_locale_rs.js          |  17 ----
 core/js/select2/select2_locale_ru.js          |  21 ----
 core/js/select2/select2_locale_sk.js          |  48 ----------
 core/js/select2/select2_locale_sv.js          |  17 ----
 core/js/select2/select2_locale_th.js          |  17 ----
 core/js/select2/select2_locale_tr.js          |  17 ----
 core/js/select2/select2_locale_uk.js          |  23 -----
 core/js/select2/select2_locale_vi.js          |  18 ----
 core/js/select2/select2_locale_zh-CN.js       |  14 ---
 core/js/select2/select2_locale_zh-TW.js       |  14 ---
 core/vendor/.gitignore                        |   9 ++
 core/{js => vendor}/select2/LICENSE           |   0
 .../select2/select2-spinner.gif               | Bin
 core/{css => vendor}/select2/select2.css      |   0
 core/{js => vendor}/select2/select2.js        |   0
 core/{css => vendor}/select2/select2.png      | Bin
 core/{css => vendor}/select2/select2x2.png    | Bin
 settings/apps.php                             |   4 +-
 settings/templates/admin.php                  |   4 +-
 63 files changed, 16 insertions(+), 1301 deletions(-)
 delete mode 100644 core/js/select2/README.md
 delete mode 100644 core/js/select2/bower.json
 delete mode 100644 core/js/select2/component.json
 delete mode 100644 core/js/select2/composer.json
 delete mode 100644 core/js/select2/package.json
 delete mode 100755 core/js/select2/release.sh
 delete mode 100644 core/js/select2/select2-bootstrap.css
 delete mode 100644 core/js/select2/select2.jquery.json
 delete mode 100644 core/js/select2/select2_locale_ar.js
 delete mode 100644 core/js/select2/select2_locale_bg.js
 delete mode 100644 core/js/select2/select2_locale_ca.js
 delete mode 100644 core/js/select2/select2_locale_cs.js
 delete mode 100644 core/js/select2/select2_locale_da.js
 delete mode 100644 core/js/select2/select2_locale_de.js
 delete mode 100644 core/js/select2/select2_locale_el.js
 delete mode 100644 core/js/select2/select2_locale_en.js.template
 delete mode 100644 core/js/select2/select2_locale_es.js
 delete mode 100644 core/js/select2/select2_locale_et.js
 delete mode 100644 core/js/select2/select2_locale_eu.js
 delete mode 100644 core/js/select2/select2_locale_fa.js
 delete mode 100644 core/js/select2/select2_locale_fi.js
 delete mode 100644 core/js/select2/select2_locale_fr.js
 delete mode 100644 core/js/select2/select2_locale_gl.js
 delete mode 100644 core/js/select2/select2_locale_he.js
 delete mode 100644 core/js/select2/select2_locale_hr.js
 delete mode 100644 core/js/select2/select2_locale_hu.js
 delete mode 100644 core/js/select2/select2_locale_id.js
 delete mode 100644 core/js/select2/select2_locale_is.js
 delete mode 100644 core/js/select2/select2_locale_it.js
 delete mode 100644 core/js/select2/select2_locale_ja.js
 delete mode 100644 core/js/select2/select2_locale_ka.js
 delete mode 100644 core/js/select2/select2_locale_ko.js
 delete mode 100644 core/js/select2/select2_locale_lt.js
 delete mode 100644 core/js/select2/select2_locale_lv.js
 delete mode 100644 core/js/select2/select2_locale_mk.js
 delete mode 100644 core/js/select2/select2_locale_ms.js
 delete mode 100644 core/js/select2/select2_locale_nl.js
 delete mode 100644 core/js/select2/select2_locale_no.js
 delete mode 100644 core/js/select2/select2_locale_pl.js
 delete mode 100644 core/js/select2/select2_locale_pt-BR.js
 delete mode 100644 core/js/select2/select2_locale_pt-PT.js
 delete mode 100644 core/js/select2/select2_locale_ro.js
 delete mode 100644 core/js/select2/select2_locale_rs.js
 delete mode 100644 core/js/select2/select2_locale_ru.js
 delete mode 100644 core/js/select2/select2_locale_sk.js
 delete mode 100644 core/js/select2/select2_locale_sv.js
 delete mode 100644 core/js/select2/select2_locale_th.js
 delete mode 100644 core/js/select2/select2_locale_tr.js
 delete mode 100644 core/js/select2/select2_locale_uk.js
 delete mode 100644 core/js/select2/select2_locale_vi.js
 delete mode 100644 core/js/select2/select2_locale_zh-CN.js
 delete mode 100644 core/js/select2/select2_locale_zh-TW.js
 rename core/{js => vendor}/select2/LICENSE (100%)
 rename core/{css => vendor}/select2/select2-spinner.gif (100%)
 rename core/{css => vendor}/select2/select2.css (100%)
 rename core/{js => vendor}/select2/select2.js (100%)
 rename core/{css => vendor}/select2/select2.png (100%)
 rename core/{css => vendor}/select2/select2x2.png (100%)

diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index e49eba06731..dec329e82a2 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -25,8 +25,8 @@ OC_Util::checkAdminUser();
 OCP\Util::addScript('files_external', 'settings');
 OCP\Util::addStyle('files_external', 'settings');
 
-OCP\Util::addScript('core', 'select2/select2');
-OCP\Util::addStyle('core', 'select2/select2');
+\OC_Util::addVendorScript('select2/select2');
+\OC_Util::addVendorStyle('select2/select2');
 
 $backends = OC_Mount_Config::getBackends();
 $personal_backends = array();
diff --git a/bower.json b/bower.json
index 986b88eed47..a62348b743a 100644
--- a/bower.json
+++ b/bower.json
@@ -16,6 +16,7 @@
     "handlebars": "1.3.0",
     "jquery": "~1.10.0",
     "moment": "~2.8.3",
+    "select2": "3.4.8",
     "underscore": "1.6.0"
   }
 }
diff --git a/core/js/select2/README.md b/core/js/select2/README.md
deleted file mode 100644
index 406fe79dc95..00000000000
--- a/core/js/select2/README.md
+++ /dev/null
@@ -1,90 +0,0 @@
-Select2
-=======
-
-Select2 is a jQuery-based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.
-
-To get started, checkout examples and documentation at http://ivaynberg.github.com/select2
-
-Use cases
----------
-
-* Enhancing native selects with search.
-* Enhancing native selects with a better multi-select interface.
-* Loading data from JavaScript: easily load items via ajax and have them searchable.
-* Nesting optgroups: native selects only support one level of nested. Select2 does not have this restriction.
-* Tagging: ability to add new items on the fly.
-* Working with large, remote datasets: ability to partially load a dataset based on the search term.
-* Paging of large datasets: easy support for loading more pages when the results are scrolled to the end.
-* Templating: support for custom rendering of results and selections.
-
-Browser compatibility
----------------------
-* IE 8+
-* Chrome 8+
-* Firefox 10+
-* Safari 3+
-* Opera 10.6+
- 
-Usage
------
-You can source Select2 directly from a [CDN like JSDliver](http://www.jsdelivr.com/#!select2), [download it from this GitHub repo](https://github.com/ivaynberg/select2/tags), or use one of the integrations below.
-
-Integrations
-------------
-
-* [Wicket-Select2](https://github.com/ivaynberg/wicket-select2) (Java / [Apache Wicket](http://wicket.apache.org))
-* [select2-rails](https://github.com/argerim/select2-rails) (Ruby on Rails)
-* [AngularUI](http://angular-ui.github.com/#directives-select2) ([AngularJS](angularjs.org))
-* [Django](https://github.com/applegrew/django-select2)
-* [Symfony](https://github.com/19Gerhard85/sfSelect2WidgetsPlugin)
-* [Symfony2](https://github.com/avocode/FormExtensions)
-* [Bootstrap 2](https://github.com/t0m/select2-bootstrap-css) and [Bootstrap 3](https://github.com/t0m/select2-bootstrap-css/tree/bootstrap3) (CSS skins)
-* [Meteor](https://github.com/nate-strauser/meteor-select2) (modern reactive JavaScript framework; + [Bootstrap 3 skin](https://github.com/esperadomedia/meteor-select2-bootstrap3-css/))
-* [Yii 2.x](http://demos.krajee.com/widgets#select2)
-* [Yii 1.x](https://github.com/tonybolzan/yii-select2)
-
-Internationalization (i18n)
----------------------------
-
-Select2 supports multiple languages by simply including the right
-language JS file (`select2_locale_it.js`, `select2_locale_nl.js`, etc.).
-
-Missing a language? Just copy `select2_locale_en.js.template`, translate
-it, and make a pull request back to Select2 here on GitHub.
-
-Bug tracker
------------
-
-Have a bug? Please create an issue here on GitHub!
-
-https://github.com/ivaynberg/select2/issues
-
-Mailing list
-------------
-
-Have a question? Ask on our mailing list!
-
-select2@googlegroups.com
-
-https://groups.google.com/d/forum/select2
-
-
-Copyright and license
----------------------
-
-Copyright 2012 Igor Vaynberg
-
-This software is licensed under the Apache License, Version 2.0 (the "Apache License") or the GNU
-General Public License version 2 (the "GPL License"). You may choose either license to govern your
-use of this software only upon the condition that you accept all of the terms of either the Apache
-License or the GPL License.
-
-You may obtain a copy of the Apache License and the GPL License in the LICENSE file, or at:
-
-http://www.apache.org/licenses/LICENSE-2.0
-http://www.gnu.org/licenses/gpl-2.0.html
-
-Unless required by applicable law or agreed to in writing, software distributed under the Apache License
-or the GPL License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
-either express or implied. See the Apache License and the GPL License for the specific language governing
-permissions and limitations under the Apache License and the GPL License.
diff --git a/core/js/select2/bower.json b/core/js/select2/bower.json
deleted file mode 100644
index 80e8596e806..00000000000
--- a/core/js/select2/bower.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "name": "select2",
-    "version": "3.4.8",
-    "main": ["select2.js", "select2.css", "select2.png", "select2x2.png", "select2-spinner.gif"],
-    "dependencies": {
-        "jquery": ">= 1.7.1"
-    }
-}
diff --git a/core/js/select2/component.json b/core/js/select2/component.json
deleted file mode 100644
index ad7abf9d9fa..00000000000
--- a/core/js/select2/component.json
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  "name": "select2",
-  "repo": "ivaynberg/select2",
-  "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-  "version": "3.4.8",
-  "demo": "http://ivaynberg.github.io/select2/",
-  "keywords": [
-    "jquery"
-  ],
-  "main": "select2.js",
-  "styles": [
-    "select2.css",
-    "select2-bootstrap.css"
-  ],
-  "scripts": [
-    "select2.js",
-    "select2_locale_ar.js",
-    "select2_locale_bg.js",
-    "select2_locale_ca.js",
-    "select2_locale_cs.js",
-    "select2_locale_da.js",
-    "select2_locale_de.js",
-    "select2_locale_el.js",
-    "select2_locale_es.js",
-    "select2_locale_et.js",
-    "select2_locale_eu.js",
-    "select2_locale_fa.js",
-    "select2_locale_fi.js",
-    "select2_locale_fr.js",
-    "select2_locale_gl.js",
-    "select2_locale_he.js",
-    "select2_locale_hr.js",
-    "select2_locale_hu.js",
-    "select2_locale_id.js",
-    "select2_locale_is.js",
-    "select2_locale_it.js",
-    "select2_locale_ja.js",
-    "select2_locale_ka.js",
-    "select2_locale_ko.js",
-    "select2_locale_lt.js",
-    "select2_locale_lv.js",
-    "select2_locale_mk.js",
-    "select2_locale_ms.js",
-    "select2_locale_nl.js",
-    "select2_locale_no.js",
-    "select2_locale_pl.js",
-    "select2_locale_pt-BR.js",
-    "select2_locale_pt-PT.js",
-    "select2_locale_ro.js",
-    "select2_locale_ru.js",
-    "select2_locale_sk.js",
-    "select2_locale_sv.js",
-    "select2_locale_th.js",
-    "select2_locale_tr.js",
-    "select2_locale_uk.js",
-    "select2_locale_vi.js",
-    "select2_locale_zh-CN.js",
-    "select2_locale_zh-TW.js"
-  ],
-  "images": [
-    "select2-spinner.gif",
-    "select2.png",
-    "select2x2.png"
-  ],
-  "license": "MIT"
-}
diff --git a/core/js/select2/composer.json b/core/js/select2/composer.json
deleted file mode 100644
index c50fadba855..00000000000
--- a/core/js/select2/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "name":
-  "ivaynberg/select2",
-  "description": "Select2 is a jQuery based replacement for select boxes.",
-  "version": "3.4.8",
-  "type": "component",
-  "homepage": "http://ivaynberg.github.io/select2/",
-  "license": "Apache-2.0",
-  "require": {
-    "robloach/component-installer": "*",
-    "components/jquery": ">=1.7.1"
-  },
-  "extra": {
-    "component": {
-      "scripts": [
-        "select2.js"
-      ],
-      "files": [
-        "select2.js",
-        "select2_locale_*.js",
-        "select2.css",
-        "select2-bootstrap.css",
-        "select2-spinner.gif",
-        "select2.png",
-        "select2x2.png"
-      ]
-    }
-  }
-}
diff --git a/core/js/select2/package.json b/core/js/select2/package.json
deleted file mode 100644
index 75ad84acaf8..00000000000
--- a/core/js/select2/package.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "name" : "Select2",
-  "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-  "homepage": "http://ivaynberg.github.io/select2",
-  "author": "Igor Vaynberg",
-  "repository": {"type": "git", "url": "git://github.com/ivaynberg/select2.git"},
-  "main": "select2.js",
-  "version": "3.4.8",
-  "jspm": {
-    "main": "select2",
-    "files": ["select2.js", "select2.png", "select2.css", "select2-spinner.gif"],
-    "shim": {
-        "select2": {
-            "imports": ["jquery", "./select2.css!"],
-            "exports": "$"
-        }
-    },
-    "buildConfig": { "uglify": true }
-  }
-}
diff --git a/core/js/select2/release.sh b/core/js/select2/release.sh
deleted file mode 100755
index 0d2e279ead4..00000000000
--- a/core/js/select2/release.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-set -e
-
-echo -n "Enter the version for this release: "
-
-read ver
-
-if [ ! $ver ]; then
-	echo "Invalid version."
-	exit
-fi
-
-name="select2"
-js="$name.js"
-mini="$name.min.js"
-css="$name.css"
-release="$name-$ver"
-tag="$ver"
-branch="build-$ver"
-curbranch=`git branch | grep "*" | sed "s/* //"`
-timestamp=$(date)
-tokens="s/@@ver@@/$ver/g;s/\@@timestamp@@/$timestamp/g"
-remote="github"
-
-echo "Pulling from origin"
-
-git pull
-
-echo "Updating Version Identifiers"
-
-sed -E -e "s/\"version\": \"([0-9\.]+)\",/\"version\": \"$ver\",/g" -i -- bower.json select2.jquery.json component.json composer.json package.json
-
-git add bower.json
-git add select2.jquery.json
-git add component.json
-git add composer.json
-git add package.json
-
-git commit -m "modified version identifiers in descriptors for release $ver"
-git push
-
-git branch "$branch"
-git checkout "$branch"
-
-echo "Tokenizing..."
-
-find . -name "$js" | xargs -I{} sed -e "$tokens" -i -- {}
-find . -name "$css" | xargs -I{} sed -e "$tokens" -i -- {}
-
-sed -e "s/latest/$ver/g" -i -- bower.json
-
-git add "$js"
-git add "$css"
-
-echo "Minifying..."
-
-echo "/*" > "$mini"
-cat LICENSE | sed "$tokens" >> "$mini"
-echo "*/" >> "$mini"
-
-curl -s \
-	--data-urlencode "js_code@$js" \
-	http://marijnhaverbeke.nl/uglifyjs \
-	>> "$mini"
-
-git add "$mini"
-
-git commit -m "release $ver"
-
-echo "Tagging..."
-git tag -a "$tag" -m "tagged version $ver"
-git push "$remote" --tags
-
-echo "Cleaning Up..."
-
-git checkout "$curbranch"
-git branch -D "$branch"
-
-echo "Done"
diff --git a/core/js/select2/select2-bootstrap.css b/core/js/select2/select2-bootstrap.css
deleted file mode 100644
index 3b83f0a2297..00000000000
--- a/core/js/select2/select2-bootstrap.css
+++ /dev/null
@@ -1,87 +0,0 @@
-.form-control .select2-choice {
-    border: 0;
-    border-radius: 2px;
-}
-
-.form-control .select2-choice .select2-arrow {
-    border-radius: 0 2px 2px 0;   
-}
-
-.form-control.select2-container {
-    height: auto !important;
-    padding: 0;
-}
-
-.form-control.select2-container.select2-dropdown-open {
-    border-color: #5897FB;
-    border-radius: 3px 3px 0 0;
-}
-
-.form-control .select2-container.select2-dropdown-open .select2-choices {
-    border-radius: 3px 3px 0 0;
-}
-
-.form-control.select2-container .select2-choices {
-    border: 0 !important;
-    border-radius: 3px;
-}
-
-.control-group.warning .select2-container .select2-choice,
-.control-group.warning .select2-container .select2-choices,
-.control-group.warning .select2-container-active .select2-choice,
-.control-group.warning .select2-container-active .select2-choices,
-.control-group.warning .select2-dropdown-open.select2-drop-above .select2-choice,
-.control-group.warning .select2-dropdown-open.select2-drop-above .select2-choices,
-.control-group.warning .select2-container-multi.select2-container-active .select2-choices {
-    border: 1px solid #C09853 !important;
-}
-
-.control-group.warning .select2-container .select2-choice div {
-    border-left: 1px solid #C09853 !important;
-    background: #FCF8E3 !important;
-}
-
-.control-group.error .select2-container .select2-choice,
-.control-group.error .select2-container .select2-choices,
-.control-group.error .select2-container-active .select2-choice,
-.control-group.error .select2-container-active .select2-choices,
-.control-group.error .select2-dropdown-open.select2-drop-above .select2-choice,
-.control-group.error .select2-dropdown-open.select2-drop-above .select2-choices,
-.control-group.error .select2-container-multi.select2-container-active .select2-choices {
-    border: 1px solid #B94A48 !important;
-}
-
-.control-group.error .select2-container .select2-choice div {
-    border-left: 1px solid #B94A48 !important;
-    background: #F2DEDE !important;
-}
-
-.control-group.info .select2-container .select2-choice,
-.control-group.info .select2-container .select2-choices,
-.control-group.info .select2-container-active .select2-choice,
-.control-group.info .select2-container-active .select2-choices,
-.control-group.info .select2-dropdown-open.select2-drop-above .select2-choice,
-.control-group.info .select2-dropdown-open.select2-drop-above .select2-choices,
-.control-group.info .select2-container-multi.select2-container-active .select2-choices {
-    border: 1px solid #3A87AD !important;
-}
-
-.control-group.info .select2-container .select2-choice div {
-    border-left: 1px solid #3A87AD !important;
-    background: #D9EDF7 !important;
-}
-
-.control-group.success .select2-container .select2-choice,
-.control-group.success .select2-container .select2-choices,
-.control-group.success .select2-container-active .select2-choice,
-.control-group.success .select2-container-active .select2-choices,
-.control-group.success .select2-dropdown-open.select2-drop-above .select2-choice,
-.control-group.success .select2-dropdown-open.select2-drop-above .select2-choices,
-.control-group.success .select2-container-multi.select2-container-active .select2-choices {
-    border: 1px solid #468847 !important;
-}
-
-.control-group.success .select2-container .select2-choice div {
-    border-left: 1px solid #468847 !important;
-    background: #DFF0D8 !important;
-}
diff --git a/core/js/select2/select2.jquery.json b/core/js/select2/select2.jquery.json
deleted file mode 100644
index e9119279f11..00000000000
--- a/core/js/select2/select2.jquery.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "name": "select2",
-    "title": "Select2",
-    "description": "Select2 is a jQuery based replacement for select boxes. It supports searching, remote data sets, and infinite scrolling of results.",
-    "keywords": [
-        "select",
-        "autocomplete",
-        "typeahead",
-        "dropdown",
-        "multiselect",
-        "tag",
-        "tagging"
-    ],
-    "version": "3.4.8",
-    "author": {
-        "name": "Igor Vaynberg",
-        "url": "https://github.com/ivaynberg"
-    },
-    "licenses": [
-        {
-            "type": "Apache",
-            "url": "http://www.apache.org/licenses/LICENSE-2.0"
-        },
-        {
-            "type": "GPL v2",
-            "url": "http://www.gnu.org/licenses/gpl-2.0.html"
-        }
-    ],
-    "bugs": "https://github.com/ivaynberg/select2/issues",
-    "homepage": "http://ivaynberg.github.com/select2",
-    "docs": "http://ivaynberg.github.com/select2/",
-    "download": "https://github.com/ivaynberg/select2/tags",
-    "dependencies": {
-        "jquery": ">=1.7.1"
-    }
-}
diff --git a/core/js/select2/select2_locale_ar.js b/core/js/select2/select2_locale_ar.js
deleted file mode 100644
index acb33a2f6ad..00000000000
--- a/core/js/select2/select2_locale_ar.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Arabic translation.
- *
- * Author: Adel KEDJOUR <adel@kedjour.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "لم يتم العثور على مطابقات"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; if (n == 1){ return "الرجاء إدخال حرف واحد على الأكثر"; } return n == 2 ? "الرجاء إدخال حرفين على الأكثر" : "الرجاء إدخال " + n + " على الأكثر"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; if (n == 1){ return "الرجاء إدخال حرف واحد على الأقل"; } return n == 2 ? "الرجاء إدخال حرفين على الأقل" : "الرجاء إدخال " + n + " على الأقل "; },
-        formatSelectionTooBig: function (limit) { if (n == 1){ return "يمكنك أن تختار إختيار واحد فقط"; } return n == 2 ? "يمكنك أن تختار إختيارين فقط" : "يمكنك أن تختار " + n + " إختيارات فقط"; },
-        formatLoadMore: function (pageNumber) { return "تحميل المزيد من النتائج…"; },
-        formatSearching: function () { return "البحث…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_bg.js b/core/js/select2/select2_locale_bg.js
deleted file mode 100644
index 585d28a2b0b..00000000000
--- a/core/js/select2/select2_locale_bg.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Select2 Bulgarian translation.
- * 
- * @author  Lubomir Vikev <lubomirvikev@gmail.com>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Няма намерени съвпадения"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Моля въведете още " + n + " символ" + (n > 1 ? "а" : ""); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Моля въведете с " + n + " по-малко символ" + (n > 1 ? "а" : ""); },
-        formatSelectionTooBig: function (limit) { return "Можете да направите до " + limit + (limit > 1 ? " избора" : " избор"); },
-        formatLoadMore: function (pageNumber) { return "Зареждат се още…"; },
-        formatSearching: function () { return "Търсене…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_ca.js b/core/js/select2/select2_locale_ca.js
deleted file mode 100644
index 7e19d3ce966..00000000000
--- a/core/js/select2/select2_locale_ca.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Catalan translation.
- * 
- * Author: David Planella <david.planella@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "No s'ha trobat cap coincidència"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduïu " + n + " caràcter" + (n == 1 ? "" : "s") + " més"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Introduïu " + n + " caràcter" + (n == 1? "" : "s") + "menys"; },
-        formatSelectionTooBig: function (limit) { return "Només podeu seleccionar " + limit + " element" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "S'estan carregant més resultats…"; },
-        formatSearching: function () { return "S'està cercant…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_cs.js b/core/js/select2/select2_locale_cs.js
deleted file mode 100644
index 376b54a1352..00000000000
--- a/core/js/select2/select2_locale_cs.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Select2 Czech translation.
- * 
- * Author: Michal Marek <ahoj@michal-marek.cz>
- * Author - sklonovani: David Vallner <david@vallner.net>
- */
-(function ($) {
-    "use strict";
-    // use text for the numbers 2 through 4
-    var smallNumbers = {
-        2: function(masc) { return (masc ? "dva" : "dvě"); },
-        3: function() { return "tři"; },
-        4: function() { return "čtyři"; }
-    }
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Nenalezeny žádné položky"; },
-        formatInputTooShort: function (input, min) {
-            var n = min - input.length;
-            if (n == 1) {
-                return "Prosím zadejte ještě jeden znak";
-            } else if (n <= 4) {
-                return "Prosím zadejte ještě další "+smallNumbers[n](true)+" znaky";
-            } else {
-                return "Prosím zadejte ještě dalších "+n+" znaků";
-            }
-        },
-        formatInputTooLong: function (input, max) {
-            var n = input.length - max;
-            if (n == 1) {
-                return "Prosím zadejte o jeden znak méně";
-            } else if (n <= 4) {
-                return "Prosím zadejte o "+smallNumbers[n](true)+" znaky méně";
-            } else {
-                return "Prosím zadejte o "+n+" znaků méně";
-            }
-        },
-        formatSelectionTooBig: function (limit) {
-            if (limit == 1) {
-                return "Můžete zvolit jen jednu položku";
-            } else if (limit <= 4) {
-                return "Můžete zvolit maximálně "+smallNumbers[limit](false)+" položky";
-            } else {
-                return "Můžete zvolit maximálně "+limit+" položek";
-            }
-        },
-        formatLoadMore: function (pageNumber) { return "Načítají se další výsledky…"; },
-        formatSearching: function () { return "Vyhledávání…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_da.js b/core/js/select2/select2_locale_da.js
deleted file mode 100644
index dbce3e1748d..00000000000
--- a/core/js/select2/select2_locale_da.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Danish translation.
- *
- * Author: Anders Jenbo <anders@jenbo.dk>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Ingen resultater fundet"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Angiv venligst " + n + " tegn mere"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Angiv venligst " + n + " tegn mindre"; },
-        formatSelectionTooBig: function (limit) { return "Du kan kun vælge " + limit + " emne" + (limit === 1 ? "" : "r"); },
-        formatLoadMore: function (pageNumber) { return "Indlæser flere resultater…"; },
-        formatSearching: function () { return "Søger…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_de.js b/core/js/select2/select2_locale_de.js
deleted file mode 100644
index 93b18e81f85..00000000000
--- a/core/js/select2/select2_locale_de.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 German translation
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Keine Übereinstimmungen gefunden"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Bitte " + n + " Zeichen mehr eingeben"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Bitte " + n + " Zeichen weniger eingeben"; },
-        formatSelectionTooBig: function (limit) { return "Sie können nur " + limit + " Eintr" + (limit === 1 ? "ag" : "äge") + " auswählen"; },
-        formatLoadMore: function (pageNumber) { return "Lade mehr Ergebnisse…"; },
-        formatSearching: function () { return "Suche…"; }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/core/js/select2/select2_locale_el.js b/core/js/select2/select2_locale_el.js
deleted file mode 100644
index e94b02cbc5f..00000000000
--- a/core/js/select2/select2_locale_el.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Greek translation.
- * 
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Δεν βρέθηκαν αποτελέσματα"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Παρακαλούμε εισάγετε " + n + " περισσότερο" + (n > 1 ? "υς" : "") + " χαρακτήρ" + (n > 1 ? "ες" : "α"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Παρακαλούμε διαγράψτε " + n + " χαρακτήρ" + (n > 1 ? "ες" : "α"); },
-        formatSelectionTooBig: function (limit) { return "Μπορείτε να επιλέξετε μόνο " + limit + " αντικείμεν" + (limit > 1 ? "α" : "ο"); },
-        formatLoadMore: function (pageNumber) { return "Φόρτωση περισσότερων…"; },
-        formatSearching: function () { return "Αναζήτηση…"; }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/core/js/select2/select2_locale_en.js.template b/core/js/select2/select2_locale_en.js.template
deleted file mode 100644
index f66bcc844db..00000000000
--- a/core/js/select2/select2_locale_en.js.template
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Select2 <Language> translation.
- * 
- * Author: Your Name <your@email>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatMatches: function (matches) { return matches + " results are available, use up and down arrow keys to navigate."; },
-        formatNoMatches: function () { return "No matches found"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Please enter " + n + " more character" + (n == 1 ? "" : "s"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Please delete " + n + " character" + (n == 1 ? "" : "s"); },
-        formatSelectionTooBig: function (limit) { return "You can only select " + limit + " item" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Loading more results…"; },
-        formatSearching: function () { return "Searching…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_es.js b/core/js/select2/select2_locale_es.js
deleted file mode 100644
index f2b581791eb..00000000000
--- a/core/js/select2/select2_locale_es.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Spanish translation
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "No se encontraron resultados"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Por favor, introduzca " + n + " car" + (n == 1? "ácter" : "acteres"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Por favor, elimine " + n + " car" + (n == 1? "ácter" : "acteres"); },
-        formatSelectionTooBig: function (limit) { return "Sólo puede seleccionar " + limit + " elemento" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Cargando más resultados…"; },
-        formatSearching: function () { return "Buscando…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_et.js b/core/js/select2/select2_locale_et.js
deleted file mode 100644
index a4045d22df7..00000000000
--- a/core/js/select2/select2_locale_et.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Estonian translation.
- *
- * Author: Kuldar Kalvik <kuldar@kalvik.ee>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Tulemused puuduvad"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Sisesta " + n + " täht" + (n == 1 ? "" : "e") + " rohkem"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Sisesta " + n + " täht" + (n == 1? "" : "e") + " vähem"; },
-        formatSelectionTooBig: function (limit) { return "Saad vaid " + limit + " tulemus" + (limit == 1 ? "e" : "t") + " valida"; },
-        formatLoadMore: function (pageNumber) { return "Laen tulemusi.."; },
-        formatSearching: function () { return "Otsin.."; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_eu.js b/core/js/select2/select2_locale_eu.js
deleted file mode 100644
index 1da1a709481..00000000000
--- a/core/js/select2/select2_locale_eu.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Select2 Basque translation.
- *
- * Author: Julen Ruiz Aizpuru <julenx at gmail dot com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () {
-          return "Ez da bat datorrenik aurkitu";
-        },
-        formatInputTooShort: function (input, min) {
-          var n = min - input.length;
-          if (n === 1) {
-            return "Idatzi karaktere bat gehiago";
-          } else {
-            return "Idatzi " + n + " karaktere gehiago";
-          }
-        },
-        formatInputTooLong: function (input, max) {
-          var n = input.length - max;
-          if (n === 1) {
-            return "Idatzi karaktere bat gutxiago";
-          } else {
-            return "Idatzi " + n + " karaktere gutxiago";
-          }
-        },
-        formatSelectionTooBig: function (limit) {
-          if (limit === 1 ) {
-            return "Elementu bakarra hauta dezakezu";
-          } else {
-            return limit + " elementu hauta ditzakezu soilik";
-          }
-        },
-        formatLoadMore: function (pageNumber) {
-          return "Emaitza gehiago kargatzen…";
-        },
-        formatSearching: function () {
-          return "Bilatzen…";
-        }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_fa.js b/core/js/select2/select2_locale_fa.js
deleted file mode 100644
index a9e95af4dba..00000000000
--- a/core/js/select2/select2_locale_fa.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * Select2 Persian translation.
- * 
- * Author: Ali Choopan <choopan@arsh.co>
- * Author: Ebrahim Byagowi <ebrahim@gnu.org>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatMatches: function (matches) { return matches + " نتیجه موجود است، کلیدهای جهت بالا و پایین را برای گشتن استفاده کنید."; },
-        formatNoMatches: function () { return "نتیجه‌ای یافت نشد."; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "لطفاً " + n + " نویسه بیشتر وارد نمایید"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "لطفاً " + n + " نویسه را حذف کنید."; },
-        formatSelectionTooBig: function (limit) { return "شما فقط می‌توانید " + limit + " مورد را انتخاب کنید"; },
-        formatLoadMore: function (pageNumber) { return "در حال بارگیری موارد بیشتر…"; },
-        formatSearching: function () { return "در حال جستجو…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_fi.js b/core/js/select2/select2_locale_fi.js
deleted file mode 100644
index 9bed310f717..00000000000
--- a/core/js/select2/select2_locale_fi.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Select2 Finnish translation
- */
-(function ($) {
-    "use strict";
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () {
-            return "Ei tuloksia";
-        },
-        formatInputTooShort: function (input, min) {
-            var n = min - input.length;
-            return "Ole hyvä ja anna " + n + " merkkiä lisää";
-        },
-        formatInputTooLong: function (input, max) {
-            var n = input.length - max;
-            return "Ole hyvä ja anna " + n + " merkkiä vähemmän";
-        },
-        formatSelectionTooBig: function (limit) {
-            return "Voit valita ainoastaan " + limit + " kpl";
-        },
-        formatLoadMore: function (pageNumber) {
-            return "Ladataan lisää tuloksia…";
-        },
-        formatSearching: function () {
-            return "Etsitään…";
-        }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_fr.js b/core/js/select2/select2_locale_fr.js
deleted file mode 100644
index 9afda2abdcd..00000000000
--- a/core/js/select2/select2_locale_fr.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Select2 French translation
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatMatches: function (matches) { return matches + " résultats sont disponibles, utilisez les flèches haut et bas pour naviguer."; },
-        formatNoMatches: function () { return "Aucun résultat trouvé"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Merci de saisir " + n + " caractère" + (n == 1 ? "" : "s") + " de plus"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Merci de supprimer " + n + " caractère" + (n == 1 ? "" : "s"); },
-        formatSelectionTooBig: function (limit) { return "Vous pouvez seulement sélectionner " + limit + " élément" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Chargement de résultats supplémentaires…"; },
-        formatSearching: function () { return "Recherche en cours…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_gl.js b/core/js/select2/select2_locale_gl.js
deleted file mode 100644
index 80326320bf0..00000000000
--- a/core/js/select2/select2_locale_gl.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Select2 Galician translation
- * 
- * Author: Leandro Regueiro <leandro.regueiro@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () {
-            return "Non se atoparon resultados";
-        },
-        formatInputTooShort: function (input, min) {
-            var n = min - input.length;
-            if (n === 1) {
-                return "Engada un carácter";
-            } else {
-                return "Engada " + n + " caracteres";
-            }
-        },
-        formatInputTooLong: function (input, max) {
-            var n = input.length - max;
-            if (n === 1) {
-                return "Elimine un carácter";
-            } else {
-                return "Elimine " + n + " caracteres";
-            }
-        },
-        formatSelectionTooBig: function (limit) {
-            if (limit === 1 ) {
-                return "Só pode seleccionar un elemento";
-            } else {
-                return "Só pode seleccionar " + limit + " elementos";
-            }
-        },
-        formatLoadMore: function (pageNumber) {
-            return "Cargando máis resultados…";
-        },
-        formatSearching: function () {
-            return "Buscando…";
-        }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_he.js b/core/js/select2/select2_locale_he.js
deleted file mode 100644
index 00385410804..00000000000
--- a/core/js/select2/select2_locale_he.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
-* Select2 Hebrew translation.
-*
-* Author: Yakir Sitbon <http://www.yakirs.net/>
-*/
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "לא נמצאו התאמות"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "נא להזין עוד " + n + " תווים נוספים"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "נא להזין פחות " + n + " תווים"; },
-        formatSelectionTooBig: function (limit) { return "ניתן לבחור " + limit + " פריטים"; },
-        formatLoadMore: function (pageNumber) { return "טוען תוצאות נוספות…"; },
-        formatSearching: function () { return "מחפש…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_hr.js b/core/js/select2/select2_locale_hr.js
deleted file mode 100644
index c29372524b6..00000000000
--- a/core/js/select2/select2_locale_hr.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Select2 Croatian translation.
- *
- * @author  Edi Modrić <edi.modric@gmail.com>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Nema rezultata"; },
-        formatInputTooShort: function (input, min) { return "Unesite još" + character(min - input.length); },
-        formatInputTooLong: function (input, max) { return "Unesite" + character(input.length - max) + " manje"; },
-        formatSelectionTooBig: function (limit) { return "Maksimalan broj odabranih stavki je " + limit; },
-        formatLoadMore: function (pageNumber) { return "Učitavanje rezultata…"; },
-        formatSearching: function () { return "Pretraga…"; }
-    });
-
-    function character (n) {
-        return " " + n + " znak" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "a" : "" : "ova");
-    }
-})(jQuery);
diff --git a/core/js/select2/select2_locale_hu.js b/core/js/select2/select2_locale_hu.js
deleted file mode 100644
index a8c30881928..00000000000
--- a/core/js/select2/select2_locale_hu.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Hungarian translation
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Nincs találat."; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Túl rövid. Még " + n + " karakter hiányzik."; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Túl hosszú. " + n + " karakterrel több, mint kellene."; },
-        formatSelectionTooBig: function (limit) { return "Csak " + limit + " elemet lehet kiválasztani."; },
-        formatLoadMore: function (pageNumber) { return "Töltés…"; },
-        formatSearching: function () { return "Keresés…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_id.js b/core/js/select2/select2_locale_id.js
deleted file mode 100644
index 547454079ba..00000000000
--- a/core/js/select2/select2_locale_id.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Indonesian translation.
- * 
- * Author: Ibrahim Yusuf <ibrahim7usuf@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Tidak ada data yang sesuai"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Masukkan " + n + " huruf lagi" + (n == 1 ? "" : "s"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Hapus " + n + " huruf" + (n == 1 ? "" : "s"); },
-        formatSelectionTooBig: function (limit) { return "Anda hanya dapat memilih " + limit + " pilihan" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Mengambil data…"; },
-        formatSearching: function () { return "Mencari…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_is.js b/core/js/select2/select2_locale_is.js
deleted file mode 100644
index aecc6cd7194..00000000000
--- a/core/js/select2/select2_locale_is.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Icelandic translation.
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Ekkert fannst"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vinsamlegast skrifið " + n + " staf" + (n > 1 ? "i" : "") + " í viðbót"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vinsamlegast styttið texta um " + n + " staf" + (n > 1 ? "i" : ""); },
-        formatSelectionTooBig: function (limit) { return "Þú getur aðeins valið " + limit + " atriði"; },
-        formatLoadMore: function (pageNumber) { return "Sæki fleiri niðurstöður…"; },
-        formatSearching: function () { return "Leita…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_it.js b/core/js/select2/select2_locale_it.js
deleted file mode 100644
index d4e24de7000..00000000000
--- a/core/js/select2/select2_locale_it.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Italian translation
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Nessuna corrispondenza trovata"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Inserisci ancora " + n + " caratter" + (n == 1? "e" : "i"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Inserisci " + n + " caratter" + (n == 1? "e" : "i") + " in meno"; },
-        formatSelectionTooBig: function (limit) { return "Puoi selezionare solo " + limit + " element" + (limit == 1 ? "o" : "i"); },
-        formatLoadMore: function (pageNumber) { return "Caricamento in corso…"; },
-        formatSearching: function () { return "Ricerca…"; }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/core/js/select2/select2_locale_ja.js b/core/js/select2/select2_locale_ja.js
deleted file mode 100644
index 81106e78a80..00000000000
--- a/core/js/select2/select2_locale_ja.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Japanese translation.
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "該当なし"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "後" + n + "文字入れてください"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "検索文字列が" + n + "文字長すぎます"; },
-        formatSelectionTooBig: function (limit) { return "最多で" + limit + "項目までしか選択できません"; },
-        formatLoadMore: function (pageNumber) { return "読込中･･･"; },
-        formatSearching: function () { return "検索中･･･"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_ka.js b/core/js/select2/select2_locale_ka.js
deleted file mode 100644
index 366cc2d9c4d..00000000000
--- a/core/js/select2/select2_locale_ka.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Georgian (Kartuli) translation.
- * 
- * Author: Dimitri Kurashvili dimakura@gmail.com
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "ვერ მოიძებნა"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "გთხოვთ შეიყვანოთ კიდევ " + n + " სიმბოლო"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "გთხოვთ წაშალოთ " + n + " სიმბოლო"; },
-        formatSelectionTooBig: function (limit) { return "თქვენ შეგიძლიათ მხოლოდ " + limit + " ჩანაწერის მონიშვნა"; },
-        formatLoadMore: function (pageNumber) { return "შედეგის ჩატვირთვა…"; },
-        formatSearching: function () { return "ძებნა…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_ko.js b/core/js/select2/select2_locale_ko.js
deleted file mode 100644
index 1a84d21eae6..00000000000
--- a/core/js/select2/select2_locale_ko.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Korean translation.
- * 
- * @author  Swen Mun <longfinfunnel@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "결과 없음"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "너무 짧습니다. "+n+"글자 더 입력해주세요."; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "너무 깁니다. "+n+"글자 지워주세요."; },
-        formatSelectionTooBig: function (limit) { return "최대 "+limit+"개까지만 선택하실 수 있습니다."; },
-        formatLoadMore: function (pageNumber) { return "불러오는 중…"; },
-        formatSearching: function () { return "검색 중…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_lt.js b/core/js/select2/select2_locale_lt.js
deleted file mode 100644
index 2e2f950b00d..00000000000
--- a/core/js/select2/select2_locale_lt.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Select2 Lithuanian translation.
- * 
- * @author  CRONUS Karmalakas <cronus dot karmalakas at gmail dot com>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Atitikmenų nerasta"; },
-        formatInputTooShort: function (input, min) { return "Įrašykite dar" + character(min - input.length); },
-        formatInputTooLong: function (input, max) { return "Pašalinkite" + character(input.length - max); },
-        formatSelectionTooBig: function (limit) {
-        	return "Jūs galite pasirinkti tik " + limit + " element" + ((limit%100 > 9 && limit%100 < 21) || limit%10 == 0 ? "ų" : limit%10 > 1 ? "us" : "ą");
-        },
-        formatLoadMore: function (pageNumber) { return "Kraunama daugiau rezultatų…"; },
-        formatSearching: function () { return "Ieškoma…"; }
-    });
-
-    function character (n) {
-        return " " + n + " simbol" + ((n%100 > 9 && n%100 < 21) || n%10 == 0 ? "ių" : n%10 > 1 ? "ius" : "į");
-    }
-})(jQuery);
diff --git a/core/js/select2/select2_locale_lv.js b/core/js/select2/select2_locale_lv.js
deleted file mode 100644
index b300ec770f4..00000000000
--- a/core/js/select2/select2_locale_lv.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Latvian translation.
- *
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Sakritību nav"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Lūdzu ievadiet vēl " + n + " simbol" + (n == 11 ? "us" : n%10 == 1 ? "u" : "us"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Lūdzu ievadiet par " + n + " simbol" + (n == 11 ? "iem" : n%10 == 1 ? "u" : "iem") + " mazāk"; },
-        formatSelectionTooBig: function (limit) { return "Jūs varat izvēlēties ne vairāk kā " + limit + " element" + (limit == 11 ? "us" : limit%10 == 1 ? "u" : "us"); },
-        formatLoadMore: function (pageNumber) { return "Datu ielāde…"; },
-        formatSearching: function () { return "Meklēšana…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_mk.js b/core/js/select2/select2_locale_mk.js
deleted file mode 100644
index 513562c51bf..00000000000
--- a/core/js/select2/select2_locale_mk.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Macedonian translation.
- * 
- * Author: Marko Aleksic <psybaron@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Нема пронајдено совпаѓања"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Ве молиме внесете уште " + n + " карактер" + (n == 1 ? "" : "и"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Ве молиме внесете " + n + " помалку карактер" + (n == 1? "" : "и"); },
-        formatSelectionTooBig: function (limit) { return "Можете да изберете само " + limit + " ставк" + (limit == 1 ? "а" : "и"); },
-        formatLoadMore: function (pageNumber) { return "Вчитување резултати…"; },
-        formatSearching: function () { return "Пребарување…"; }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/core/js/select2/select2_locale_ms.js b/core/js/select2/select2_locale_ms.js
deleted file mode 100644
index 262042aab15..00000000000
--- a/core/js/select2/select2_locale_ms.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Malay translation.
- * 
- * Author: Kepoweran <kepoweran@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Tiada padanan yang ditemui"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Sila masukkan " + n + " aksara lagi"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Sila hapuskan " + n + " aksara"; },
-        formatSelectionTooBig: function (limit) { return "Anda hanya boleh memilih " + limit + " pilihan"; },
-        formatLoadMore: function (pageNumber) { return "Sedang memuatkan keputusan…"; },
-        formatSearching: function () { return "Mencari…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_nl.js b/core/js/select2/select2_locale_nl.js
deleted file mode 100644
index 5b5c4156ce1..00000000000
--- a/core/js/select2/select2_locale_nl.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Dutch translation
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Geen resultaten gevonden"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vul " + n + " karakter" + (n == 1? "" : "s") + " meer in"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vul " + n + " karakter" + (n == 1? "" : "s") + " minder in"; },
-        formatSelectionTooBig: function (limit) { return "Maximaal " + limit + " item" + (limit == 1 ? "" : "s") + " toegestaan"; },
-        formatLoadMore: function (pageNumber) { return "Meer resultaten laden…"; },
-        formatSearching: function () { return "Zoeken…"; }
-    });
-})(jQuery);
\ No newline at end of file
diff --git a/core/js/select2/select2_locale_no.js b/core/js/select2/select2_locale_no.js
deleted file mode 100644
index ab61c082a02..00000000000
--- a/core/js/select2/select2_locale_no.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Select2 Norwegian translation.
- *
- * Author: Torgeir Veimo <torgeir.veimo@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Ingen treff"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vennligst skriv inn " + n + (n>1 ? " flere tegn" : " tegn til"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vennligst fjern " + n + " tegn"; },
-        formatSelectionTooBig: function (limit) { return "Du kan velge maks " + limit + " elementer"; },
-        formatLoadMore: function (pageNumber) { return "Laster flere resultater…"; },
-        formatSearching: function () { return "Søker…"; }
-    });
-})(jQuery);
-
diff --git a/core/js/select2/select2_locale_pl.js b/core/js/select2/select2_locale_pl.js
deleted file mode 100644
index 75054e76578..00000000000
--- a/core/js/select2/select2_locale_pl.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Select2 Polish translation.
- * 
- * @author  Jan Kondratowicz <jan@kondratowicz.pl>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Brak wyników"; },
-        formatInputTooShort: function (input, min) { return "Wpisz jeszcze" + character(min - input.length, "znak", "i"); },
-        formatInputTooLong: function (input, max) { return "Wpisana fraza jest za długa o" + character(input.length - max, "znak", "i"); },
-        formatSelectionTooBig: function (limit) { return "Możesz zaznaczyć najwyżej" + character(limit, "element", "y"); },
-        formatLoadMore: function (pageNumber) { return "Ładowanie wyników…"; },
-        formatSearching: function () { return "Szukanie…"; }
-    });
-
-    function character (n, word, pluralSuffix) {
-        return " " + n + " " + word + (n == 1 ? "" : n%10 < 5 && n%10 > 1 && (n%100 < 5 || n%100 > 20) ? pluralSuffix : "ów");
-    }
-})(jQuery);
diff --git a/core/js/select2/select2_locale_pt-BR.js b/core/js/select2/select2_locale_pt-BR.js
deleted file mode 100644
index ac4969acfbb..00000000000
--- a/core/js/select2/select2_locale_pt-BR.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Brazilian Portuguese translation
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Nenhum resultado encontrado"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Digite mais " + n + " caracter" + (n == 1? "" : "es"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " caracter" + (n == 1? "" : "es"); },
-        formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Carregando mais resultados…"; },
-        formatSearching: function () { return "Buscando…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_pt-PT.js b/core/js/select2/select2_locale_pt-PT.js
deleted file mode 100644
index cced7cf3ec1..00000000000
--- a/core/js/select2/select2_locale_pt-PT.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Portuguese (Portugal) translation
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Nenhum resultado encontrado"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Introduza " + n + " car" + (n == 1 ? "ácter" : "acteres"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Apague " + n + " car" + (n == 1 ? "ácter" : "acteres"); },
-        formatSelectionTooBig: function (limit) { return "Só é possível selecionar " + limit + " elemento" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "A carregar mais resultados…"; },
-        formatSearching: function () { return "A pesquisar…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_ro.js b/core/js/select2/select2_locale_ro.js
deleted file mode 100644
index 87eca4cf740..00000000000
--- a/core/js/select2/select2_locale_ro.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * Select2 Romanian translation.
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Nu a fost găsit nimic"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vă rugăm să introduceți incă " + n + " caracter" + (n == 1 ? "" : "e"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vă rugăm să introduceți mai puțin de " + n + " caracter" + (n == 1? "" : "e"); },
-        formatSelectionTooBig: function (limit) { return "Aveți voie să selectați cel mult " + limit + " element" + (limit == 1 ? "" : "e"); },
-        formatLoadMore: function (pageNumber) { return "Se încarcă…"; },
-        formatSearching: function () { return "Căutare…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_rs.js b/core/js/select2/select2_locale_rs.js
deleted file mode 100644
index 300c01bc5e5..00000000000
--- a/core/js/select2/select2_locale_rs.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Serbian translation.
- *
- * @author  Limon Monte <limon.monte@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Ništa nije pronađeno"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Ukucajte bar još " + n + " simbol" + (n % 10 == 1 && n % 100 != 11 ? "" : "a"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Obrišite " + n + " simbol" + (n % 10 == 1 && n % 100 != 11	 ? "" : "a"); },
-        formatSelectionTooBig: function (limit) { return "Možete izabrati samo " + limit + " stavk" + (limit % 10 == 1 && limit % 100 != 11	 ? "u" : (limit % 10 >= 2 && limit % 10 <= 4 && (limit % 100 < 12 || limit % 100 > 14)? "e" : "i")); },
-        formatLoadMore: function (pageNumber) { return "Preuzimanje još rezultata…"; },
-        formatSearching: function () { return "Pretraga…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_ru.js b/core/js/select2/select2_locale_ru.js
deleted file mode 100644
index 0f45ce0dddf..00000000000
--- a/core/js/select2/select2_locale_ru.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Select2 Russian translation.
- *
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Совпадений не найдено"; },
-        formatInputTooShort: function (input, min) { return "Пожалуйста, введите еще" + character(min - input.length); },
-        formatInputTooLong: function (input, max) { return "Пожалуйста, введите на" + character(input.length - max) + " меньше"; },
-        formatSelectionTooBig: function (limit) { return "Вы можете выбрать не более " + limit + " элемент" + (limit%10 == 1 && limit%100 != 11 ? "а" : "ов"); },
-        formatLoadMore: function (pageNumber) { return "Загрузка данных…"; },
-        formatSearching: function () { return "Поиск…"; }
-    });
-
-    function character (n) {
-        return " " + n + " символ" + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 20) ? n%10 > 1 ? "a" : "" : "ов");
-    }
-})(jQuery);
diff --git a/core/js/select2/select2_locale_sk.js b/core/js/select2/select2_locale_sk.js
deleted file mode 100644
index 772f304aca9..00000000000
--- a/core/js/select2/select2_locale_sk.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Select2 Slovak translation.
- *
- * Author: David Vallner <david@vallner.net>
- */
-(function ($) {
-    "use strict";
-    // use text for the numbers 2 through 4
-    var smallNumbers = {
-        2: function(masc) { return (masc ? "dva" : "dve"); },
-        3: function() { return "tri"; },
-        4: function() { return "štyri"; }
-    }
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Nenašli sa žiadne položky"; },
-        formatInputTooShort: function (input, min) {
-            var n = min - input.length;
-            if (n == 1) {
-                return "Prosím zadajte ešte jeden znak";
-            } else if (n <= 4) {
-                return "Prosím zadajte ešte ďalšie "+smallNumbers[n](true)+" znaky";
-            } else {
-                return "Prosím zadajte ešte ďalších "+n+" znakov";
-            }
-        },
-        formatInputTooLong: function (input, max) {
-            var n = input.length - max;
-            if (n == 1) {
-                return "Prosím zadajte o jeden znak menej";
-            } else if (n <= 4) {
-                return "Prosím zadajte o "+smallNumbers[n](true)+" znaky menej";
-            } else {
-                return "Prosím zadajte o "+n+" znakov menej";
-            }
-        },
-        formatSelectionTooBig: function (limit) {
-            if (limit == 1) {
-                return "Môžete zvoliť len jednu položku";
-            } else if (limit <= 4) {
-                return "Môžete zvoliť najviac "+smallNumbers[limit](false)+" položky";
-            } else {
-                return "Môžete zvoliť najviac "+limit+" položiek";
-            }
-        },
-        formatLoadMore: function (pageNumber) { return "Načítavajú sa ďalšie výsledky…"; },
-        formatSearching: function () { return "Vyhľadávanie…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_sv.js b/core/js/select2/select2_locale_sv.js
deleted file mode 100644
index d611189a593..00000000000
--- a/core/js/select2/select2_locale_sv.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Swedish translation.
- *
- * Author: Jens Rantil <jens.rantil@telavox.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Inga träffar"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Var god skriv in " + n + (n>1 ? " till tecken" : " tecken till"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Var god sudda ut " + n + " tecken"; },
-        formatSelectionTooBig: function (limit) { return "Du kan max välja " + limit + " element"; },
-        formatLoadMore: function (pageNumber) { return "Laddar fler resultat…"; },
-        formatSearching: function () { return "Söker…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_th.js b/core/js/select2/select2_locale_th.js
deleted file mode 100644
index df59bdac36d..00000000000
--- a/core/js/select2/select2_locale_th.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Thai translation.
- *
- * Author: Atsawin Chaowanakritsanakul <joke@nakhon.net>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "ไม่พบข้อมูล"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "โปรดพิมพ์เพิ่มอีก " + n + " ตัวอักษร"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "โปรดลบออก " + n + " ตัวอักษร"; },
-        formatSelectionTooBig: function (limit) { return "คุณสามารถเลือกได้ไม่เกิน " + limit + " รายการ"; },
-        formatLoadMore: function (pageNumber) { return "กำลังค้นข้อมูลเพิ่ม…"; },
-        formatSearching: function () { return "กำลังค้นข้อมูล…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_tr.js b/core/js/select2/select2_locale_tr.js
deleted file mode 100644
index f834dad2b89..00000000000
--- a/core/js/select2/select2_locale_tr.js
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Select2 Turkish translation.
- * 
- * Author: Salim KAYABAŞI <salim.kayabasi@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Sonuç bulunamadı"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "En az " + n + " karakter daha girmelisiniz"; },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return n + " karakter azaltmalısınız"; },
-        formatSelectionTooBig: function (limit) { return "Sadece " + limit + " seçim yapabilirsiniz"; },
-        formatLoadMore: function (pageNumber) { return "Daha fazla…"; },
-        formatSearching: function () { return "Aranıyor…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_uk.js b/core/js/select2/select2_locale_uk.js
deleted file mode 100644
index 8d31a056080..00000000000
--- a/core/js/select2/select2_locale_uk.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Select2 Ukrainian translation.
- * 
- * @author  bigmihail <bigmihail@bigmir.net>
- * @author  Uriy Efremochkin <efremochkin@uriy.me>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatMatches: function (matches) { return character(matches, "результат") + " знайдено, використовуйте клавіші зі стрілками вверх та вниз для навігації."; },
-        formatNoMatches: function () { return "Нічого не знайдено"; },
-        formatInputTooShort: function (input, min) { return "Введіть буль ласка ще " + character(min - input.length, "символ"); },
-        formatInputTooLong: function (input, max) { return "Введіть буль ласка на " + character(input.length - max, "символ") + " менше"; },
-        formatSelectionTooBig: function (limit) { return "Ви можете вибрати лише " + character(limit, "елемент"); },
-        formatLoadMore: function (pageNumber) { return "Завантаження даних…"; },
-        formatSearching: function () { return "Пошук…"; }
-    });
-
-    function character (n, word) {
-        return n + " " + word + (n%10 < 5 && n%10 > 0 && (n%100 < 5 || n%100 > 19) ? n%10 > 1 ? "и" : "" : "ів");
-    }
-})(jQuery);
diff --git a/core/js/select2/select2_locale_vi.js b/core/js/select2/select2_locale_vi.js
deleted file mode 100644
index 5dbc275361f..00000000000
--- a/core/js/select2/select2_locale_vi.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * Select2 Vietnamese translation.
- * 
- * Author: Long Nguyen <olragon@gmail.com>
- */
-(function ($) {
-    "use strict";
-
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "Không tìm thấy kết quả"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "Vui lòng nhập nhiều hơn " + n + " ký tự" + (n == 1 ? "" : "s"); },
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "Vui lòng nhập ít hơn " + n + " ký tự" + (n == 1? "" : "s"); },
-        formatSelectionTooBig: function (limit) { return "Chỉ có thể chọn được " + limit + " tùy chọn" + (limit == 1 ? "" : "s"); },
-        formatLoadMore: function (pageNumber) { return "Đang lấy thêm kết quả…"; },
-        formatSearching: function () { return "Đang tìm…"; }
-    });
-})(jQuery);
-
diff --git a/core/js/select2/select2_locale_zh-CN.js b/core/js/select2/select2_locale_zh-CN.js
deleted file mode 100644
index 6add3c52518..00000000000
--- a/core/js/select2/select2_locale_zh-CN.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Select2 Chinese translation
- */
-(function ($) {
-    "use strict";
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "没有找到匹配项"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "请再输入" + n + "个字符";},
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "请删掉" + n + "个字符";},
-        formatSelectionTooBig: function (limit) { return "你只能选择最多" + limit + "项"; },
-        formatLoadMore: function (pageNumber) { return "加载结果中…"; },
-        formatSearching: function () { return "搜索中…"; }
-    });
-})(jQuery);
diff --git a/core/js/select2/select2_locale_zh-TW.js b/core/js/select2/select2_locale_zh-TW.js
deleted file mode 100644
index f072381faae..00000000000
--- a/core/js/select2/select2_locale_zh-TW.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * Select2 Traditional Chinese translation
- */
-(function ($) {
-    "use strict";
-    $.extend($.fn.select2.defaults, {
-        formatNoMatches: function () { return "沒有找到相符的項目"; },
-        formatInputTooShort: function (input, min) { var n = min - input.length; return "請再輸入" + n + "個字元";},
-        formatInputTooLong: function (input, max) { var n = input.length - max; return "請刪掉" + n + "個字元";},
-        formatSelectionTooBig: function (limit) { return "你只能選擇最多" + limit + "項"; },
-        formatLoadMore: function (pageNumber) { return "載入中…"; },
-        formatSearching: function () { return "搜尋中…"; }
-    });
-})(jQuery);
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index 0c14c5a59b7..c15b973a80e 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -23,3 +23,12 @@ jquery/**
 # handlebars
 handlebars/**
 !handlebars/handlebars.js
+
+# select2
+select2/**
+!select2/select2.js
+!select2/select2.css
+!select2/select2.png
+!select2/select2x2.png
+!select2/select2-spinner.gif
+!select2/LICENSE
diff --git a/core/js/select2/LICENSE b/core/vendor/select2/LICENSE
similarity index 100%
rename from core/js/select2/LICENSE
rename to core/vendor/select2/LICENSE
diff --git a/core/css/select2/select2-spinner.gif b/core/vendor/select2/select2-spinner.gif
similarity index 100%
rename from core/css/select2/select2-spinner.gif
rename to core/vendor/select2/select2-spinner.gif
diff --git a/core/css/select2/select2.css b/core/vendor/select2/select2.css
similarity index 100%
rename from core/css/select2/select2.css
rename to core/vendor/select2/select2.css
diff --git a/core/js/select2/select2.js b/core/vendor/select2/select2.js
similarity index 100%
rename from core/js/select2/select2.js
rename to core/vendor/select2/select2.js
diff --git a/core/css/select2/select2.png b/core/vendor/select2/select2.png
similarity index 100%
rename from core/css/select2/select2.png
rename to core/vendor/select2/select2.png
diff --git a/core/css/select2/select2x2.png b/core/vendor/select2/select2x2.png
similarity index 100%
rename from core/css/select2/select2x2.png
rename to core/vendor/select2/select2x2.png
diff --git a/settings/apps.php b/settings/apps.php
index c1e3e51bd79..99d4d99975b 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -28,8 +28,8 @@ OC_Util::checkAdminUser();
 \OC_Util::addVendorScript('handlebars/handlebars');
 \OCP\Util::addScript("settings", "settings");
 \OCP\Util::addStyle("settings", "settings");
-\OCP\Util::addScript('core', 'select2/select2');
-\OCP\Util::addStyle('core', 'select2/select2');
+\OC_Util::addVendorScript('select2/select2');
+\OC_Util::addVendorStyle('select2/select2');
 \OCP\Util::addScript("settings", "apps");
 \OC_App::setActiveNavigationEntry( "core_apps" );
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index bcf57e12a89..0033845c74e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -14,8 +14,8 @@ script('settings', 'settings');
 script( "settings", "admin" );
 script( "settings", "log" );
 script( 'core', 'multiselect' );
-script('core', 'select2/select2');
-style('core', 'select2/select2');
+vendor_script('select2/select2');
+vendor_style('select2/select2');
 script('core', 'setupchecks');
 
 $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal');
-- 
GitLab


From 49fbd766c2ad6e5bc7c8401bfab2c20b1f442012 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 21:44:31 +0100
Subject: [PATCH 336/616] bower jcrop

---
 3rdparty                               |    2 +-
 bower.json                             |    1 +
 core/vendor/.gitignore                 |    9 +
 core/vendor/jcrop/MIT-LICENSE.txt      |   22 +
 core/vendor/jcrop/css/Jcrop.gif        |  Bin 0 -> 329 bytes
 core/vendor/jcrop/css/jquery.Jcrop.css |  165 +++
 core/vendor/jcrop/js/jquery.Jcrop.js   | 1694 ++++++++++++++++++++++++
 settings/personal.php                  |    4 +-
 8 files changed, 1894 insertions(+), 3 deletions(-)
 create mode 100644 core/vendor/jcrop/MIT-LICENSE.txt
 create mode 100644 core/vendor/jcrop/css/Jcrop.gif
 create mode 100644 core/vendor/jcrop/css/jquery.Jcrop.css
 create mode 100644 core/vendor/jcrop/js/jquery.Jcrop.js

diff --git a/3rdparty b/3rdparty
index 028a137c719..165fadf4252 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 028a137c7199362e6387e37be8f2fddd3c012aeb
+Subproject commit 165fadf4252843fb3015a1138cdabef66a1988bb
diff --git a/bower.json b/bower.json
index a62348b743a..d167514acd7 100644
--- a/bower.json
+++ b/bower.json
@@ -14,6 +14,7 @@
   ],
   "dependencies": {
     "handlebars": "1.3.0",
+    "jcrop": "~0.9.12",
     "jquery": "~1.10.0",
     "moment": "~2.8.3",
     "select2": "3.4.8",
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index c15b973a80e..5e553652912 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -20,6 +20,15 @@ jquery/**
 !jquery/jquery*
 !jquery/MIT-LICENSE.txt
 
+# jcrop
+jcrop/.bower.json
+jcrop/index.html
+jcrop/README.md
+jcrop/demos
+jcrop/css/jquery.Jcrop.min.css
+jcrop/js/**
+!jcrop/js/jquery.Jcrop.js
+
 # handlebars
 handlebars/**
 !handlebars/handlebars.js
diff --git a/core/vendor/jcrop/MIT-LICENSE.txt b/core/vendor/jcrop/MIT-LICENSE.txt
new file mode 100644
index 00000000000..4f3a0fe43a2
--- /dev/null
+++ b/core/vendor/jcrop/MIT-LICENSE.txt
@@ -0,0 +1,22 @@
+Copyright (c) 2011 Tapmodo Interactive LLC,
+  http://github.com/tapmodo/Jcrop
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/core/vendor/jcrop/css/Jcrop.gif b/core/vendor/jcrop/css/Jcrop.gif
new file mode 100644
index 0000000000000000000000000000000000000000..72ea7ccb5321d5384d70437cfaac73011237901e
GIT binary patch
literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

literal 0
HcmV?d00001

diff --git a/core/vendor/jcrop/css/jquery.Jcrop.css b/core/vendor/jcrop/css/jquery.Jcrop.css
new file mode 100644
index 00000000000..95f8b9cfc23
--- /dev/null
+++ b/core/vendor/jcrop/css/jquery.Jcrop.css
@@ -0,0 +1,165 @@
+/* jquery.Jcrop.css v0.9.12 - MIT License */
+/*
+  The outer-most container in a typical Jcrop instance
+  If you are having difficulty with formatting related to styles
+  on a parent element, place any fixes here or in a like selector
+
+  You can also style this element if you want to add a border, etc
+  A better method for styling can be seen below with .jcrop-light
+  (Add a class to the holder and style elements for that extended class)
+*/
+.jcrop-holder {
+  direction: ltr;
+  text-align: left;
+}
+/* Selection Border */
+.jcrop-vline,
+.jcrop-hline {
+  background: #ffffff url("Jcrop.gif");
+  font-size: 0;
+  position: absolute;
+}
+.jcrop-vline {
+  height: 100%;
+  width: 1px !important;
+}
+.jcrop-vline.right {
+  right: 0;
+}
+.jcrop-hline {
+  height: 1px !important;
+  width: 100%;
+}
+.jcrop-hline.bottom {
+  bottom: 0;
+}
+/* Invisible click targets */
+.jcrop-tracker {
+  height: 100%;
+  width: 100%;
+  /* "turn off" link highlight */
+  -webkit-tap-highlight-color: transparent;
+  /* disable callout, image save panel */
+  -webkit-touch-callout: none;
+  /* disable cut copy paste */
+  -webkit-user-select: none;
+}
+/* Selection Handles */
+.jcrop-handle {
+  background-color: #333333;
+  border: 1px #eeeeee solid;
+  width: 7px;
+  height: 7px;
+  font-size: 1px;
+}
+.jcrop-handle.ord-n {
+  left: 50%;
+  margin-left: -4px;
+  margin-top: -4px;
+  top: 0;
+}
+.jcrop-handle.ord-s {
+  bottom: 0;
+  left: 50%;
+  margin-bottom: -4px;
+  margin-left: -4px;
+}
+.jcrop-handle.ord-e {
+  margin-right: -4px;
+  margin-top: -4px;
+  right: 0;
+  top: 50%;
+}
+.jcrop-handle.ord-w {
+  left: 0;
+  margin-left: -4px;
+  margin-top: -4px;
+  top: 50%;
+}
+.jcrop-handle.ord-nw {
+  left: 0;
+  margin-left: -4px;
+  margin-top: -4px;
+  top: 0;
+}
+.jcrop-handle.ord-ne {
+  margin-right: -4px;
+  margin-top: -4px;
+  right: 0;
+  top: 0;
+}
+.jcrop-handle.ord-se {
+  bottom: 0;
+  margin-bottom: -4px;
+  margin-right: -4px;
+  right: 0;
+}
+.jcrop-handle.ord-sw {
+  bottom: 0;
+  left: 0;
+  margin-bottom: -4px;
+  margin-left: -4px;
+}
+/* Dragbars */
+.jcrop-dragbar.ord-n,
+.jcrop-dragbar.ord-s {
+  height: 7px;
+  width: 100%;
+}
+.jcrop-dragbar.ord-e,
+.jcrop-dragbar.ord-w {
+  height: 100%;
+  width: 7px;
+}
+.jcrop-dragbar.ord-n {
+  margin-top: -4px;
+}
+.jcrop-dragbar.ord-s {
+  bottom: 0;
+  margin-bottom: -4px;
+}
+.jcrop-dragbar.ord-e {
+  margin-right: -4px;
+  right: 0;
+}
+.jcrop-dragbar.ord-w {
+  margin-left: -4px;
+}
+/* The "jcrop-light" class/extension */
+.jcrop-light .jcrop-vline,
+.jcrop-light .jcrop-hline {
+  background: #ffffff;
+  filter: alpha(opacity=70) !important;
+  opacity: .70!important;
+}
+.jcrop-light .jcrop-handle {
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  background-color: #000000;
+  border-color: #ffffff;
+  border-radius: 3px;
+}
+/* The "jcrop-dark" class/extension */
+.jcrop-dark .jcrop-vline,
+.jcrop-dark .jcrop-hline {
+  background: #000000;
+  filter: alpha(opacity=70) !important;
+  opacity: 0.7 !important;
+}
+.jcrop-dark .jcrop-handle {
+  -moz-border-radius: 3px;
+  -webkit-border-radius: 3px;
+  background-color: #ffffff;
+  border-color: #000000;
+  border-radius: 3px;
+}
+/* Simple macro to turn off the antlines */
+.solid-line .jcrop-vline,
+.solid-line .jcrop-hline {
+  background: #ffffff;
+}
+/* Fix for twitter bootstrap et al. */
+.jcrop-holder img,
+img.jcrop-preview {
+  max-width: none;
+}
diff --git a/core/vendor/jcrop/js/jquery.Jcrop.js b/core/vendor/jcrop/js/jquery.Jcrop.js
new file mode 100644
index 00000000000..3e32f04bd92
--- /dev/null
+++ b/core/vendor/jcrop/js/jquery.Jcrop.js
@@ -0,0 +1,1694 @@
+/**
+ * jquery.Jcrop.js v0.9.12
+ * jQuery Image Cropping Plugin - released under MIT License 
+ * Author: Kelly Hallman <khallman@gmail.com>
+ * http://github.com/tapmodo/Jcrop
+ * Copyright (c) 2008-2013 Tapmodo Interactive LLC {{{
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * }}}
+ */
+
+(function ($) {
+
+  $.Jcrop = function (obj, opt) {
+    var options = $.extend({}, $.Jcrop.defaults),
+        docOffset,
+        _ua = navigator.userAgent.toLowerCase(),
+        is_msie = /msie/.test(_ua),
+        ie6mode = /msie [1-6]\./.test(_ua);
+
+    // Internal Methods {{{
+    function px(n) {
+      return Math.round(n) + 'px';
+    }
+    function cssClass(cl) {
+      return options.baseClass + '-' + cl;
+    }
+    function supportsColorFade() {
+      return $.fx.step.hasOwnProperty('backgroundColor');
+    }
+    function getPos(obj) //{{{
+    {
+      var pos = $(obj).offset();
+      return [pos.left, pos.top];
+    }
+    //}}}
+    function mouseAbs(e) //{{{
+    {
+      return [(e.pageX - docOffset[0]), (e.pageY - docOffset[1])];
+    }
+    //}}}
+    function setOptions(opt) //{{{
+    {
+      if (typeof(opt) !== 'object') opt = {};
+      options = $.extend(options, opt);
+
+      $.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e) {
+        if (typeof(options[e]) !== 'function') options[e] = function () {};
+      });
+    }
+    //}}}
+    function startDragMode(mode, pos, touch) //{{{
+    {
+      docOffset = getPos($img);
+      Tracker.setCursor(mode === 'move' ? mode : mode + '-resize');
+
+      if (mode === 'move') {
+        return Tracker.activateHandlers(createMover(pos), doneSelect, touch);
+      }
+
+      var fc = Coords.getFixed();
+      var opp = oppLockCorner(mode);
+      var opc = Coords.getCorner(oppLockCorner(opp));
+
+      Coords.setPressed(Coords.getCorner(opp));
+      Coords.setCurrent(opc);
+
+      Tracker.activateHandlers(dragmodeHandler(mode, fc), doneSelect, touch);
+    }
+    //}}}
+    function dragmodeHandler(mode, f) //{{{
+    {
+      return function (pos) {
+        if (!options.aspectRatio) {
+          switch (mode) {
+          case 'e':
+            pos[1] = f.y2;
+            break;
+          case 'w':
+            pos[1] = f.y2;
+            break;
+          case 'n':
+            pos[0] = f.x2;
+            break;
+          case 's':
+            pos[0] = f.x2;
+            break;
+          }
+        } else {
+          switch (mode) {
+          case 'e':
+            pos[1] = f.y + 1;
+            break;
+          case 'w':
+            pos[1] = f.y + 1;
+            break;
+          case 'n':
+            pos[0] = f.x + 1;
+            break;
+          case 's':
+            pos[0] = f.x + 1;
+            break;
+          }
+        }
+        Coords.setCurrent(pos);
+        Selection.update();
+      };
+    }
+    //}}}
+    function createMover(pos) //{{{
+    {
+      var lloc = pos;
+      KeyManager.watchKeys();
+
+      return function (pos) {
+        Coords.moveOffset([pos[0] - lloc[0], pos[1] - lloc[1]]);
+        lloc = pos;
+
+        Selection.update();
+      };
+    }
+    //}}}
+    function oppLockCorner(ord) //{{{
+    {
+      switch (ord) {
+      case 'n':
+        return 'sw';
+      case 's':
+        return 'nw';
+      case 'e':
+        return 'nw';
+      case 'w':
+        return 'ne';
+      case 'ne':
+        return 'sw';
+      case 'nw':
+        return 'se';
+      case 'se':
+        return 'nw';
+      case 'sw':
+        return 'ne';
+      }
+    }
+    //}}}
+    function createDragger(ord) //{{{
+    {
+      return function (e) {
+        if (options.disabled) {
+          return false;
+        }
+        if ((ord === 'move') && !options.allowMove) {
+          return false;
+        }
+        
+        // Fix position of crop area when dragged the very first time.
+        // Necessary when crop image is in a hidden element when page is loaded.
+        docOffset = getPos($img);
+
+        btndown = true;
+        startDragMode(ord, mouseAbs(e));
+        e.stopPropagation();
+        e.preventDefault();
+        return false;
+      };
+    }
+    //}}}
+    function presize($obj, w, h) //{{{
+    {
+      var nw = $obj.width(),
+          nh = $obj.height();
+      if ((nw > w) && w > 0) {
+        nw = w;
+        nh = (w / $obj.width()) * $obj.height();
+      }
+      if ((nh > h) && h > 0) {
+        nh = h;
+        nw = (h / $obj.height()) * $obj.width();
+      }
+      xscale = $obj.width() / nw;
+      yscale = $obj.height() / nh;
+      $obj.width(nw).height(nh);
+    }
+    //}}}
+    function unscale(c) //{{{
+    {
+      return {
+        x: c.x * xscale,
+        y: c.y * yscale,
+        x2: c.x2 * xscale,
+        y2: c.y2 * yscale,
+        w: c.w * xscale,
+        h: c.h * yscale
+      };
+    }
+    //}}}
+    function doneSelect(pos) //{{{
+    {
+      var c = Coords.getFixed();
+      if ((c.w > options.minSelect[0]) && (c.h > options.minSelect[1])) {
+        Selection.enableHandles();
+        Selection.done();
+      } else {
+        Selection.release();
+      }
+      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
+    }
+    //}}}
+    function newSelection(e) //{{{
+    {
+      if (options.disabled) {
+        return false;
+      }
+      if (!options.allowSelect) {
+        return false;
+      }
+      btndown = true;
+      docOffset = getPos($img);
+      Selection.disableHandles();
+      Tracker.setCursor('crosshair');
+      var pos = mouseAbs(e);
+      Coords.setPressed(pos);
+      Selection.update();
+      Tracker.activateHandlers(selectDrag, doneSelect, e.type.substring(0,5)==='touch');
+      KeyManager.watchKeys();
+
+      e.stopPropagation();
+      e.preventDefault();
+      return false;
+    }
+    //}}}
+    function selectDrag(pos) //{{{
+    {
+      Coords.setCurrent(pos);
+      Selection.update();
+    }
+    //}}}
+    function newTracker() //{{{
+    {
+      var trk = $('<div></div>').addClass(cssClass('tracker'));
+      if (is_msie) {
+        trk.css({
+          opacity: 0,
+          backgroundColor: 'white'
+        });
+      }
+      return trk;
+    }
+    //}}}
+
+    // }}}
+    // Initialization {{{
+    // Sanitize some options {{{
+    if (typeof(obj) !== 'object') {
+      obj = $(obj)[0];
+    }
+    if (typeof(opt) !== 'object') {
+      opt = {};
+    }
+    // }}}
+    setOptions(opt);
+    // Initialize some jQuery objects {{{
+    // The values are SET on the image(s) for the interface
+    // If the original image has any of these set, they will be reset
+    // However, if you destroy() the Jcrop instance the original image's
+    // character in the DOM will be as you left it.
+    var img_css = {
+      border: 'none',
+      visibility: 'visible',
+      margin: 0,
+      padding: 0,
+      position: 'absolute',
+      top: 0,
+      left: 0
+    };
+
+    var $origimg = $(obj),
+      img_mode = true;
+
+    if (obj.tagName == 'IMG') {
+      // Fix size of crop image.
+      // Necessary when crop image is within a hidden element when page is loaded.
+      if ($origimg[0].width != 0 && $origimg[0].height != 0) {
+        // Obtain dimensions from contained img element.
+        $origimg.width($origimg[0].width);
+        $origimg.height($origimg[0].height);
+      } else {
+        // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). 
+        var tempImage = new Image();
+        tempImage.src = $origimg[0].src;
+        $origimg.width(tempImage.width);
+        $origimg.height(tempImage.height);
+      } 
+
+      var $img = $origimg.clone().removeAttr('id').css(img_css).show();
+
+      $img.width($origimg.width());
+      $img.height($origimg.height());
+      $origimg.after($img).hide();
+
+    } else {
+      $img = $origimg.css(img_css).show();
+      img_mode = false;
+      if (options.shade === null) { options.shade = true; }
+    }
+
+    presize($img, options.boxWidth, options.boxHeight);
+
+    var boundx = $img.width(),
+        boundy = $img.height(),
+        
+        
+        $div = $('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({
+        position: 'relative',
+        backgroundColor: options.bgColor
+      }).insertAfter($origimg).append($img);
+
+    if (options.addClass) {
+      $div.addClass(options.addClass);
+    }
+
+    var $img2 = $('<div />'),
+
+        $img_holder = $('<div />') 
+        .width('100%').height('100%').css({
+          zIndex: 310,
+          position: 'absolute',
+          overflow: 'hidden'
+        }),
+
+        $hdl_holder = $('<div />') 
+        .width('100%').height('100%').css('zIndex', 320), 
+
+        $sel = $('<div />') 
+        .css({
+          position: 'absolute',
+          zIndex: 600
+        }).dblclick(function(){
+          var c = Coords.getFixed();
+          options.onDblClick.call(api,c);
+        }).insertBefore($img).append($img_holder, $hdl_holder); 
+
+    if (img_mode) {
+
+      $img2 = $('<img />')
+          .attr('src', $img.attr('src')).css(img_css).width(boundx).height(boundy),
+
+      $img_holder.append($img2);
+
+    }
+
+    if (ie6mode) {
+      $sel.css({
+        overflowY: 'hidden'
+      });
+    }
+
+    var bound = options.boundary;
+    var $trk = newTracker().width(boundx + (bound * 2)).height(boundy + (bound * 2)).css({
+      position: 'absolute',
+      top: px(-bound),
+      left: px(-bound),
+      zIndex: 290
+    }).mousedown(newSelection);
+
+    /* }}} */
+    // Set more variables {{{
+    var bgcolor = options.bgColor,
+        bgopacity = options.bgOpacity,
+        xlimit, ylimit, xmin, ymin, xscale, yscale, enabled = true,
+        btndown, animating, shift_down;
+
+    docOffset = getPos($img);
+    // }}}
+    // }}}
+    // Internal Modules {{{
+    // Touch Module {{{ 
+    var Touch = (function () {
+      // Touch support detection function adapted (under MIT License)
+      // from code by Jeffrey Sambells - http://github.com/iamamused/
+      function hasTouchSupport() {
+        var support = {}, events = ['touchstart', 'touchmove', 'touchend'],
+            el = document.createElement('div'), i;
+
+        try {
+          for(i=0; i<events.length; i++) {
+            var eventName = events[i];
+            eventName = 'on' + eventName;
+            var isSupported = (eventName in el);
+            if (!isSupported) {
+              el.setAttribute(eventName, 'return;');
+              isSupported = typeof el[eventName] == 'function';
+            }
+            support[events[i]] = isSupported;
+          }
+          return support.touchstart && support.touchend && support.touchmove;
+        }
+        catch(err) {
+          return false;
+        }
+      }
+
+      function detectSupport() {
+        if ((options.touchSupport === true) || (options.touchSupport === false)) return options.touchSupport;
+          else return hasTouchSupport();
+      }
+      return {
+        createDragger: function (ord) {
+          return function (e) {
+            if (options.disabled) {
+              return false;
+            }
+            if ((ord === 'move') && !options.allowMove) {
+              return false;
+            }
+            docOffset = getPos($img);
+            btndown = true;
+            startDragMode(ord, mouseAbs(Touch.cfilter(e)), true);
+            e.stopPropagation();
+            e.preventDefault();
+            return false;
+          };
+        },
+        newSelection: function (e) {
+          return newSelection(Touch.cfilter(e));
+        },
+        cfilter: function (e){
+          e.pageX = e.originalEvent.changedTouches[0].pageX;
+          e.pageY = e.originalEvent.changedTouches[0].pageY;
+          return e;
+        },
+        isSupported: hasTouchSupport,
+        support: detectSupport()
+      };
+    }());
+    // }}}
+    // Coords Module {{{
+    var Coords = (function () {
+      var x1 = 0,
+          y1 = 0,
+          x2 = 0,
+          y2 = 0,
+          ox, oy;
+
+      function setPressed(pos) //{{{
+      {
+        pos = rebound(pos);
+        x2 = x1 = pos[0];
+        y2 = y1 = pos[1];
+      }
+      //}}}
+      function setCurrent(pos) //{{{
+      {
+        pos = rebound(pos);
+        ox = pos[0] - x2;
+        oy = pos[1] - y2;
+        x2 = pos[0];
+        y2 = pos[1];
+      }
+      //}}}
+      function getOffset() //{{{
+      {
+        return [ox, oy];
+      }
+      //}}}
+      function moveOffset(offset) //{{{
+      {
+        var ox = offset[0],
+            oy = offset[1];
+
+        if (0 > x1 + ox) {
+          ox -= ox + x1;
+        }
+        if (0 > y1 + oy) {
+          oy -= oy + y1;
+        }
+
+        if (boundy < y2 + oy) {
+          oy += boundy - (y2 + oy);
+        }
+        if (boundx < x2 + ox) {
+          ox += boundx - (x2 + ox);
+        }
+
+        x1 += ox;
+        x2 += ox;
+        y1 += oy;
+        y2 += oy;
+      }
+      //}}}
+      function getCorner(ord) //{{{
+      {
+        var c = getFixed();
+        switch (ord) {
+        case 'ne':
+          return [c.x2, c.y];
+        case 'nw':
+          return [c.x, c.y];
+        case 'se':
+          return [c.x2, c.y2];
+        case 'sw':
+          return [c.x, c.y2];
+        }
+      }
+      //}}}
+      function getFixed() //{{{
+      {
+        if (!options.aspectRatio) {
+          return getRect();
+        }
+        // This function could use some optimization I think...
+        var aspect = options.aspectRatio,
+            min_x = options.minSize[0] / xscale,
+            
+            
+            //min_y = options.minSize[1]/yscale,
+            max_x = options.maxSize[0] / xscale,
+            max_y = options.maxSize[1] / yscale,
+            rw = x2 - x1,
+            rh = y2 - y1,
+            rwa = Math.abs(rw),
+            rha = Math.abs(rh),
+            real_ratio = rwa / rha,
+            xx, yy, w, h;
+
+        if (max_x === 0) {
+          max_x = boundx * 10;
+        }
+        if (max_y === 0) {
+          max_y = boundy * 10;
+        }
+        if (real_ratio < aspect) {
+          yy = y2;
+          w = rha * aspect;
+          xx = rw < 0 ? x1 - w : w + x1;
+
+          if (xx < 0) {
+            xx = 0;
+            h = Math.abs((xx - x1) / aspect);
+            yy = rh < 0 ? y1 - h : h + y1;
+          } else if (xx > boundx) {
+            xx = boundx;
+            h = Math.abs((xx - x1) / aspect);
+            yy = rh < 0 ? y1 - h : h + y1;
+          }
+        } else {
+          xx = x2;
+          h = rwa / aspect;
+          yy = rh < 0 ? y1 - h : y1 + h;
+          if (yy < 0) {
+            yy = 0;
+            w = Math.abs((yy - y1) * aspect);
+            xx = rw < 0 ? x1 - w : w + x1;
+          } else if (yy > boundy) {
+            yy = boundy;
+            w = Math.abs(yy - y1) * aspect;
+            xx = rw < 0 ? x1 - w : w + x1;
+          }
+        }
+
+        // Magic %-)
+        if (xx > x1) { // right side
+          if (xx - x1 < min_x) {
+            xx = x1 + min_x;
+          } else if (xx - x1 > max_x) {
+            xx = x1 + max_x;
+          }
+          if (yy > y1) {
+            yy = y1 + (xx - x1) / aspect;
+          } else {
+            yy = y1 - (xx - x1) / aspect;
+          }
+        } else if (xx < x1) { // left side
+          if (x1 - xx < min_x) {
+            xx = x1 - min_x;
+          } else if (x1 - xx > max_x) {
+            xx = x1 - max_x;
+          }
+          if (yy > y1) {
+            yy = y1 + (x1 - xx) / aspect;
+          } else {
+            yy = y1 - (x1 - xx) / aspect;
+          }
+        }
+
+        if (xx < 0) {
+          x1 -= xx;
+          xx = 0;
+        } else if (xx > boundx) {
+          x1 -= xx - boundx;
+          xx = boundx;
+        }
+
+        if (yy < 0) {
+          y1 -= yy;
+          yy = 0;
+        } else if (yy > boundy) {
+          y1 -= yy - boundy;
+          yy = boundy;
+        }
+
+        return makeObj(flipCoords(x1, y1, xx, yy));
+      }
+      //}}}
+      function rebound(p) //{{{
+      {
+        if (p[0] < 0) p[0] = 0;
+        if (p[1] < 0) p[1] = 0;
+
+        if (p[0] > boundx) p[0] = boundx;
+        if (p[1] > boundy) p[1] = boundy;
+
+        return [Math.round(p[0]), Math.round(p[1])];
+      }
+      //}}}
+      function flipCoords(x1, y1, x2, y2) //{{{
+      {
+        var xa = x1,
+            xb = x2,
+            ya = y1,
+            yb = y2;
+        if (x2 < x1) {
+          xa = x2;
+          xb = x1;
+        }
+        if (y2 < y1) {
+          ya = y2;
+          yb = y1;
+        }
+        return [xa, ya, xb, yb];
+      }
+      //}}}
+      function getRect() //{{{
+      {
+        var xsize = x2 - x1,
+            ysize = y2 - y1,
+            delta;
+
+        if (xlimit && (Math.abs(xsize) > xlimit)) {
+          x2 = (xsize > 0) ? (x1 + xlimit) : (x1 - xlimit);
+        }
+        if (ylimit && (Math.abs(ysize) > ylimit)) {
+          y2 = (ysize > 0) ? (y1 + ylimit) : (y1 - ylimit);
+        }
+
+        if (ymin / yscale && (Math.abs(ysize) < ymin / yscale)) {
+          y2 = (ysize > 0) ? (y1 + ymin / yscale) : (y1 - ymin / yscale);
+        }
+        if (xmin / xscale && (Math.abs(xsize) < xmin / xscale)) {
+          x2 = (xsize > 0) ? (x1 + xmin / xscale) : (x1 - xmin / xscale);
+        }
+
+        if (x1 < 0) {
+          x2 -= x1;
+          x1 -= x1;
+        }
+        if (y1 < 0) {
+          y2 -= y1;
+          y1 -= y1;
+        }
+        if (x2 < 0) {
+          x1 -= x2;
+          x2 -= x2;
+        }
+        if (y2 < 0) {
+          y1 -= y2;
+          y2 -= y2;
+        }
+        if (x2 > boundx) {
+          delta = x2 - boundx;
+          x1 -= delta;
+          x2 -= delta;
+        }
+        if (y2 > boundy) {
+          delta = y2 - boundy;
+          y1 -= delta;
+          y2 -= delta;
+        }
+        if (x1 > boundx) {
+          delta = x1 - boundy;
+          y2 -= delta;
+          y1 -= delta;
+        }
+        if (y1 > boundy) {
+          delta = y1 - boundy;
+          y2 -= delta;
+          y1 -= delta;
+        }
+
+        return makeObj(flipCoords(x1, y1, x2, y2));
+      }
+      //}}}
+      function makeObj(a) //{{{
+      {
+        return {
+          x: a[0],
+          y: a[1],
+          x2: a[2],
+          y2: a[3],
+          w: a[2] - a[0],
+          h: a[3] - a[1]
+        };
+      }
+      //}}}
+
+      return {
+        flipCoords: flipCoords,
+        setPressed: setPressed,
+        setCurrent: setCurrent,
+        getOffset: getOffset,
+        moveOffset: moveOffset,
+        getCorner: getCorner,
+        getFixed: getFixed
+      };
+    }());
+
+    //}}}
+    // Shade Module {{{
+    var Shade = (function() {
+      var enabled = false,
+          holder = $('<div />').css({
+            position: 'absolute',
+            zIndex: 240,
+            opacity: 0
+          }),
+          shades = {
+            top: createShade(),
+            left: createShade().height(boundy),
+            right: createShade().height(boundy),
+            bottom: createShade()
+          };
+
+      function resizeShades(w,h) {
+        shades.left.css({ height: px(h) });
+        shades.right.css({ height: px(h) });
+      }
+      function updateAuto()
+      {
+        return updateShade(Coords.getFixed());
+      }
+      function updateShade(c)
+      {
+        shades.top.css({
+          left: px(c.x),
+          width: px(c.w),
+          height: px(c.y)
+        });
+        shades.bottom.css({
+          top: px(c.y2),
+          left: px(c.x),
+          width: px(c.w),
+          height: px(boundy-c.y2)
+        });
+        shades.right.css({
+          left: px(c.x2),
+          width: px(boundx-c.x2)
+        });
+        shades.left.css({
+          width: px(c.x)
+        });
+      }
+      function createShade() {
+        return $('<div />').css({
+          position: 'absolute',
+          backgroundColor: options.shadeColor||options.bgColor
+        }).appendTo(holder);
+      }
+      function enableShade() {
+        if (!enabled) {
+          enabled = true;
+          holder.insertBefore($img);
+          updateAuto();
+          Selection.setBgOpacity(1,0,1);
+          $img2.hide();
+
+          setBgColor(options.shadeColor||options.bgColor,1);
+          if (Selection.isAwake())
+          {
+            setOpacity(options.bgOpacity,1);
+          }
+            else setOpacity(1,1);
+        }
+      }
+      function setBgColor(color,now) {
+        colorChangeMacro(getShades(),color,now);
+      }
+      function disableShade() {
+        if (enabled) {
+          holder.remove();
+          $img2.show();
+          enabled = false;
+          if (Selection.isAwake()) {
+            Selection.setBgOpacity(options.bgOpacity,1,1);
+          } else {
+            Selection.setBgOpacity(1,1,1);
+            Selection.disableHandles();
+          }
+          colorChangeMacro($div,0,1);
+        }
+      }
+      function setOpacity(opacity,now) {
+        if (enabled) {
+          if (options.bgFade && !now) {
+            holder.animate({
+              opacity: 1-opacity
+            },{
+              queue: false,
+              duration: options.fadeTime
+            });
+          }
+          else holder.css({opacity:1-opacity});
+        }
+      }
+      function refreshAll() {
+        options.shade ? enableShade() : disableShade();
+        if (Selection.isAwake()) setOpacity(options.bgOpacity);
+      }
+      function getShades() {
+        return holder.children();
+      }
+
+      return {
+        update: updateAuto,
+        updateRaw: updateShade,
+        getShades: getShades,
+        setBgColor: setBgColor,
+        enable: enableShade,
+        disable: disableShade,
+        resize: resizeShades,
+        refresh: refreshAll,
+        opacity: setOpacity
+      };
+    }());
+    // }}}
+    // Selection Module {{{
+    var Selection = (function () {
+      var awake,
+          hdep = 370,
+          borders = {},
+          handle = {},
+          dragbar = {},
+          seehandles = false;
+
+      // Private Methods
+      function insertBorder(type) //{{{
+      {
+        var jq = $('<div />').css({
+          position: 'absolute',
+          opacity: options.borderOpacity
+        }).addClass(cssClass(type));
+        $img_holder.append(jq);
+        return jq;
+      }
+      //}}}
+      function dragDiv(ord, zi) //{{{
+      {
+        var jq = $('<div />').mousedown(createDragger(ord)).css({
+          cursor: ord + '-resize',
+          position: 'absolute',
+          zIndex: zi
+        }).addClass('ord-'+ord);
+
+        if (Touch.support) {
+          jq.bind('touchstart.jcrop', Touch.createDragger(ord));
+        }
+
+        $hdl_holder.append(jq);
+        return jq;
+      }
+      //}}}
+      function insertHandle(ord) //{{{
+      {
+        var hs = options.handleSize,
+
+          div = dragDiv(ord, hdep++).css({
+            opacity: options.handleOpacity
+          }).addClass(cssClass('handle'));
+
+        if (hs) { div.width(hs).height(hs); }
+
+        return div;
+      }
+      //}}}
+      function insertDragbar(ord) //{{{
+      {
+        return dragDiv(ord, hdep++).addClass('jcrop-dragbar');
+      }
+      //}}}
+      function createDragbars(li) //{{{
+      {
+        var i;
+        for (i = 0; i < li.length; i++) {
+          dragbar[li[i]] = insertDragbar(li[i]);
+        }
+      }
+      //}}}
+      function createBorders(li) //{{{
+      {
+        var cl,i;
+        for (i = 0; i < li.length; i++) {
+          switch(li[i]){
+            case'n': cl='hline'; break;
+            case's': cl='hline bottom'; break;
+            case'e': cl='vline right'; break;
+            case'w': cl='vline'; break;
+          }
+          borders[li[i]] = insertBorder(cl);
+        }
+      }
+      //}}}
+      function createHandles(li) //{{{
+      {
+        var i;
+        for (i = 0; i < li.length; i++) {
+          handle[li[i]] = insertHandle(li[i]);
+        }
+      }
+      //}}}
+      function moveto(x, y) //{{{
+      {
+        if (!options.shade) {
+          $img2.css({
+            top: px(-y),
+            left: px(-x)
+          });
+        }
+        $sel.css({
+          top: px(y),
+          left: px(x)
+        });
+      }
+      //}}}
+      function resize(w, h) //{{{
+      {
+        $sel.width(Math.round(w)).height(Math.round(h));
+      }
+      //}}}
+      function refresh() //{{{
+      {
+        var c = Coords.getFixed();
+
+        Coords.setPressed([c.x, c.y]);
+        Coords.setCurrent([c.x2, c.y2]);
+
+        updateVisible();
+      }
+      //}}}
+
+      // Internal Methods
+      function updateVisible(select) //{{{
+      {
+        if (awake) {
+          return update(select);
+        }
+      }
+      //}}}
+      function update(select) //{{{
+      {
+        var c = Coords.getFixed();
+
+        resize(c.w, c.h);
+        moveto(c.x, c.y);
+        if (options.shade) Shade.updateRaw(c);
+
+        awake || show();
+
+        if (select) {
+          options.onSelect.call(api, unscale(c));
+        } else {
+          options.onChange.call(api, unscale(c));
+        }
+      }
+      //}}}
+      function setBgOpacity(opacity,force,now) //{{{
+      {
+        if (!awake && !force) return;
+        if (options.bgFade && !now) {
+          $img.animate({
+            opacity: opacity
+          },{
+            queue: false,
+            duration: options.fadeTime
+          });
+        } else {
+          $img.css('opacity', opacity);
+        }
+      }
+      //}}}
+      function show() //{{{
+      {
+        $sel.show();
+
+        if (options.shade) Shade.opacity(bgopacity);
+          else setBgOpacity(bgopacity,true);
+
+        awake = true;
+      }
+      //}}}
+      function release() //{{{
+      {
+        disableHandles();
+        $sel.hide();
+
+        if (options.shade) Shade.opacity(1);
+          else setBgOpacity(1);
+
+        awake = false;
+        options.onRelease.call(api);
+      }
+      //}}}
+      function showHandles() //{{{
+      {
+        if (seehandles) {
+          $hdl_holder.show();
+        }
+      }
+      //}}}
+      function enableHandles() //{{{
+      {
+        seehandles = true;
+        if (options.allowResize) {
+          $hdl_holder.show();
+          return true;
+        }
+      }
+      //}}}
+      function disableHandles() //{{{
+      {
+        seehandles = false;
+        $hdl_holder.hide();
+      } 
+      //}}}
+      function animMode(v) //{{{
+      {
+        if (v) {
+          animating = true;
+          disableHandles();
+        } else {
+          animating = false;
+          enableHandles();
+        }
+      } 
+      //}}}
+      function done() //{{{
+      {
+        animMode(false);
+        refresh();
+      } 
+      //}}}
+      // Insert draggable elements {{{
+      // Insert border divs for outline
+
+      if (options.dragEdges && $.isArray(options.createDragbars))
+        createDragbars(options.createDragbars);
+
+      if ($.isArray(options.createHandles))
+        createHandles(options.createHandles);
+
+      if (options.drawBorders && $.isArray(options.createBorders))
+        createBorders(options.createBorders);
+
+      //}}}
+
+      // This is a hack for iOS5 to support drag/move touch functionality
+      $(document).bind('touchstart.jcrop-ios',function(e) {
+        if ($(e.currentTarget).hasClass('jcrop-tracker')) e.stopPropagation();
+      });
+
+      var $track = newTracker().mousedown(createDragger('move')).css({
+        cursor: 'move',
+        position: 'absolute',
+        zIndex: 360
+      });
+
+      if (Touch.support) {
+        $track.bind('touchstart.jcrop', Touch.createDragger('move'));
+      }
+
+      $img_holder.append($track);
+      disableHandles();
+
+      return {
+        updateVisible: updateVisible,
+        update: update,
+        release: release,
+        refresh: refresh,
+        isAwake: function () {
+          return awake;
+        },
+        setCursor: function (cursor) {
+          $track.css('cursor', cursor);
+        },
+        enableHandles: enableHandles,
+        enableOnly: function () {
+          seehandles = true;
+        },
+        showHandles: showHandles,
+        disableHandles: disableHandles,
+        animMode: animMode,
+        setBgOpacity: setBgOpacity,
+        done: done
+      };
+    }());
+    
+    //}}}
+    // Tracker Module {{{
+    var Tracker = (function () {
+      var onMove = function () {},
+          onDone = function () {},
+          trackDoc = options.trackDocument;
+
+      function toFront(touch) //{{{
+      {
+        $trk.css({
+          zIndex: 450
+        });
+
+        if (touch)
+          $(document)
+            .bind('touchmove.jcrop', trackTouchMove)
+            .bind('touchend.jcrop', trackTouchEnd);
+
+        else if (trackDoc)
+          $(document)
+            .bind('mousemove.jcrop',trackMove)
+            .bind('mouseup.jcrop',trackUp);
+      } 
+      //}}}
+      function toBack() //{{{
+      {
+        $trk.css({
+          zIndex: 290
+        });
+        $(document).unbind('.jcrop');
+      } 
+      //}}}
+      function trackMove(e) //{{{
+      {
+        onMove(mouseAbs(e));
+        return false;
+      } 
+      //}}}
+      function trackUp(e) //{{{
+      {
+        e.preventDefault();
+        e.stopPropagation();
+
+        if (btndown) {
+          btndown = false;
+
+          onDone(mouseAbs(e));
+
+          if (Selection.isAwake()) {
+            options.onSelect.call(api, unscale(Coords.getFixed()));
+          }
+
+          toBack();
+          onMove = function () {};
+          onDone = function () {};
+        }
+
+        return false;
+      }
+      //}}}
+      function activateHandlers(move, done, touch) //{{{
+      {
+        btndown = true;
+        onMove = move;
+        onDone = done;
+        toFront(touch);
+        return false;
+      }
+      //}}}
+      function trackTouchMove(e) //{{{
+      {
+        onMove(mouseAbs(Touch.cfilter(e)));
+        return false;
+      }
+      //}}}
+      function trackTouchEnd(e) //{{{
+      {
+        return trackUp(Touch.cfilter(e));
+      }
+      //}}}
+      function setCursor(t) //{{{
+      {
+        $trk.css('cursor', t);
+      }
+      //}}}
+
+      if (!trackDoc) {
+        $trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);
+      }
+
+      $img.before($trk);
+      return {
+        activateHandlers: activateHandlers,
+        setCursor: setCursor
+      };
+    }());
+    //}}}
+    // KeyManager Module {{{
+    var KeyManager = (function () {
+      var $keymgr = $('<input type="radio" />').css({
+        position: 'fixed',
+        left: '-120px',
+        width: '12px'
+      }).addClass('jcrop-keymgr'),
+
+        $keywrap = $('<div />').css({
+          position: 'absolute',
+          overflow: 'hidden'
+        }).append($keymgr);
+
+      function watchKeys() //{{{
+      {
+        if (options.keySupport) {
+          $keymgr.show();
+          $keymgr.focus();
+        }
+      }
+      //}}}
+      function onBlur(e) //{{{
+      {
+        $keymgr.hide();
+      }
+      //}}}
+      function doNudge(e, x, y) //{{{
+      {
+        if (options.allowMove) {
+          Coords.moveOffset([x, y]);
+          Selection.updateVisible(true);
+        }
+        e.preventDefault();
+        e.stopPropagation();
+      }
+      //}}}
+      function parseKey(e) //{{{
+      {
+        if (e.ctrlKey || e.metaKey) {
+          return true;
+        }
+        shift_down = e.shiftKey ? true : false;
+        var nudge = shift_down ? 10 : 1;
+
+        switch (e.keyCode) {
+        case 37:
+          doNudge(e, -nudge, 0);
+          break;
+        case 39:
+          doNudge(e, nudge, 0);
+          break;
+        case 38:
+          doNudge(e, 0, -nudge);
+          break;
+        case 40:
+          doNudge(e, 0, nudge);
+          break;
+        case 27:
+          if (options.allowSelect) Selection.release();
+          break;
+        case 9:
+          return true;
+        }
+
+        return false;
+      }
+      //}}}
+
+      if (options.keySupport) {
+        $keymgr.keydown(parseKey).blur(onBlur);
+        if (ie6mode || !options.fixedSupport) {
+          $keymgr.css({
+            position: 'absolute',
+            left: '-20px'
+          });
+          $keywrap.append($keymgr).insertBefore($img);
+        } else {
+          $keymgr.insertBefore($img);
+        }
+      }
+
+
+      return {
+        watchKeys: watchKeys
+      };
+    }());
+    //}}}
+    // }}}
+    // API methods {{{
+    function setClass(cname) //{{{
+    {
+      $div.removeClass().addClass(cssClass('holder')).addClass(cname);
+    }
+    //}}}
+    function animateTo(a, callback) //{{{
+    {
+      var x1 = a[0] / xscale,
+          y1 = a[1] / yscale,
+          x2 = a[2] / xscale,
+          y2 = a[3] / yscale;
+
+      if (animating) {
+        return;
+      }
+
+      var animto = Coords.flipCoords(x1, y1, x2, y2),
+          c = Coords.getFixed(),
+          initcr = [c.x, c.y, c.x2, c.y2],
+          animat = initcr,
+          interv = options.animationDelay,
+          ix1 = animto[0] - initcr[0],
+          iy1 = animto[1] - initcr[1],
+          ix2 = animto[2] - initcr[2],
+          iy2 = animto[3] - initcr[3],
+          pcent = 0,
+          velocity = options.swingSpeed;
+
+      x1 = animat[0];
+      y1 = animat[1];
+      x2 = animat[2];
+      y2 = animat[3];
+
+      Selection.animMode(true);
+      var anim_timer;
+
+      function queueAnimator() {
+        window.setTimeout(animator, interv);
+      }
+      var animator = (function () {
+        return function () {
+          pcent += (100 - pcent) / velocity;
+
+          animat[0] = Math.round(x1 + ((pcent / 100) * ix1));
+          animat[1] = Math.round(y1 + ((pcent / 100) * iy1));
+          animat[2] = Math.round(x2 + ((pcent / 100) * ix2));
+          animat[3] = Math.round(y2 + ((pcent / 100) * iy2));
+
+          if (pcent >= 99.8) {
+            pcent = 100;
+          }
+          if (pcent < 100) {
+            setSelectRaw(animat);
+            queueAnimator();
+          } else {
+            Selection.done();
+            Selection.animMode(false);
+            if (typeof(callback) === 'function') {
+              callback.call(api);
+            }
+          }
+        };
+      }());
+      queueAnimator();
+    }
+    //}}}
+    function setSelect(rect) //{{{
+    {
+      setSelectRaw([rect[0] / xscale, rect[1] / yscale, rect[2] / xscale, rect[3] / yscale]);
+      options.onSelect.call(api, unscale(Coords.getFixed()));
+      Selection.enableHandles();
+    }
+    //}}}
+    function setSelectRaw(l) //{{{
+    {
+      Coords.setPressed([l[0], l[1]]);
+      Coords.setCurrent([l[2], l[3]]);
+      Selection.update();
+    }
+    //}}}
+    function tellSelect() //{{{
+    {
+      return unscale(Coords.getFixed());
+    }
+    //}}}
+    function tellScaled() //{{{
+    {
+      return Coords.getFixed();
+    }
+    //}}}
+    function setOptionsNew(opt) //{{{
+    {
+      setOptions(opt);
+      interfaceUpdate();
+    }
+    //}}}
+    function disableCrop() //{{{
+    {
+      options.disabled = true;
+      Selection.disableHandles();
+      Selection.setCursor('default');
+      Tracker.setCursor('default');
+    }
+    //}}}
+    function enableCrop() //{{{
+    {
+      options.disabled = false;
+      interfaceUpdate();
+    }
+    //}}}
+    function cancelCrop() //{{{
+    {
+      Selection.done();
+      Tracker.activateHandlers(null, null);
+    }
+    //}}}
+    function destroy() //{{{
+    {
+      $div.remove();
+      $origimg.show();
+      $origimg.css('visibility','visible');
+      $(obj).removeData('Jcrop');
+    }
+    //}}}
+    function setImage(src, callback) //{{{
+    {
+      Selection.release();
+      disableCrop();
+      var img = new Image();
+      img.onload = function () {
+        var iw = img.width;
+        var ih = img.height;
+        var bw = options.boxWidth;
+        var bh = options.boxHeight;
+        $img.width(iw).height(ih);
+        $img.attr('src', src);
+        $img2.attr('src', src);
+        presize($img, bw, bh);
+        boundx = $img.width();
+        boundy = $img.height();
+        $img2.width(boundx).height(boundy);
+        $trk.width(boundx + (bound * 2)).height(boundy + (bound * 2));
+        $div.width(boundx).height(boundy);
+        Shade.resize(boundx,boundy);
+        enableCrop();
+
+        if (typeof(callback) === 'function') {
+          callback.call(api);
+        }
+      };
+      img.src = src;
+    }
+    //}}}
+    function colorChangeMacro($obj,color,now) {
+      var mycolor = color || options.bgColor;
+      if (options.bgFade && supportsColorFade() && options.fadeTime && !now) {
+        $obj.animate({
+          backgroundColor: mycolor
+        }, {
+          queue: false,
+          duration: options.fadeTime
+        });
+      } else {
+        $obj.css('backgroundColor', mycolor);
+      }
+    }
+    function interfaceUpdate(alt) //{{{
+    // This method tweaks the interface based on options object.
+    // Called when options are changed and at end of initialization.
+    {
+      if (options.allowResize) {
+        if (alt) {
+          Selection.enableOnly();
+        } else {
+          Selection.enableHandles();
+        }
+      } else {
+        Selection.disableHandles();
+      }
+
+      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
+      Selection.setCursor(options.allowMove ? 'move' : 'default');
+
+      if (options.hasOwnProperty('trueSize')) {
+        xscale = options.trueSize[0] / boundx;
+        yscale = options.trueSize[1] / boundy;
+      }
+
+      if (options.hasOwnProperty('setSelect')) {
+        setSelect(options.setSelect);
+        Selection.done();
+        delete(options.setSelect);
+      }
+
+      Shade.refresh();
+
+      if (options.bgColor != bgcolor) {
+        colorChangeMacro(
+          options.shade? Shade.getShades(): $div,
+          options.shade?
+            (options.shadeColor || options.bgColor):
+            options.bgColor
+        );
+        bgcolor = options.bgColor;
+      }
+
+      if (bgopacity != options.bgOpacity) {
+        bgopacity = options.bgOpacity;
+        if (options.shade) Shade.refresh();
+          else Selection.setBgOpacity(bgopacity);
+      }
+
+      xlimit = options.maxSize[0] || 0;
+      ylimit = options.maxSize[1] || 0;
+      xmin = options.minSize[0] || 0;
+      ymin = options.minSize[1] || 0;
+
+      if (options.hasOwnProperty('outerImage')) {
+        $img.attr('src', options.outerImage);
+        delete(options.outerImage);
+      }
+
+      Selection.refresh();
+    }
+    //}}}
+    //}}}
+
+    if (Touch.support) $trk.bind('touchstart.jcrop', Touch.newSelection);
+
+    $hdl_holder.hide();
+    interfaceUpdate(true);
+
+    var api = {
+      setImage: setImage,
+      animateTo: animateTo,
+      setSelect: setSelect,
+      setOptions: setOptionsNew,
+      tellSelect: tellSelect,
+      tellScaled: tellScaled,
+      setClass: setClass,
+
+      disable: disableCrop,
+      enable: enableCrop,
+      cancel: cancelCrop,
+      release: Selection.release,
+      destroy: destroy,
+
+      focus: KeyManager.watchKeys,
+
+      getBounds: function () {
+        return [boundx * xscale, boundy * yscale];
+      },
+      getWidgetSize: function () {
+        return [boundx, boundy];
+      },
+      getScaleFactor: function () {
+        return [xscale, yscale];
+      },
+      getOptions: function() {
+        // careful: internal values are returned
+        return options;
+      },
+
+      ui: {
+        holder: $div,
+        selection: $sel
+      }
+    };
+
+    if (is_msie) $div.bind('selectstart', function () { return false; });
+
+    $origimg.data('Jcrop', api);
+    return api;
+  };
+  $.fn.Jcrop = function (options, callback) //{{{
+  {
+    var api;
+    // Iterate over each object, attach Jcrop
+    this.each(function () {
+      // If we've already attached to this object
+      if ($(this).data('Jcrop')) {
+        // The API can be requested this way (undocumented)
+        if (options === 'api') return $(this).data('Jcrop');
+        // Otherwise, we just reset the options...
+        else $(this).data('Jcrop').setOptions(options);
+      }
+      // If we haven't been attached, preload and attach
+      else {
+        if (this.tagName == 'IMG')
+          $.Jcrop.Loader(this,function(){
+            $(this).css({display:'block',visibility:'hidden'});
+            api = $.Jcrop(this, options);
+            if ($.isFunction(callback)) callback.call(api);
+          });
+        else {
+          $(this).css({display:'block',visibility:'hidden'});
+          api = $.Jcrop(this, options);
+          if ($.isFunction(callback)) callback.call(api);
+        }
+      }
+    });
+
+    // Return "this" so the object is chainable (jQuery-style)
+    return this;
+  };
+  //}}}
+  // $.Jcrop.Loader - basic image loader {{{
+
+  $.Jcrop.Loader = function(imgobj,success,error){
+    var $img = $(imgobj), img = $img[0];
+
+    function completeCheck(){
+      if (img.complete) {
+        $img.unbind('.jcloader');
+        if ($.isFunction(success)) success.call(img);
+      }
+      else window.setTimeout(completeCheck,50);
+    }
+
+    $img
+      .bind('load.jcloader',completeCheck)
+      .bind('error.jcloader',function(e){
+        $img.unbind('.jcloader');
+        if ($.isFunction(error)) error.call(img);
+      });
+
+    if (img.complete && $.isFunction(success)){
+      $img.unbind('.jcloader');
+      success.call(img);
+    }
+  };
+
+  //}}}
+  // Global Defaults {{{
+  $.Jcrop.defaults = {
+
+    // Basic Settings
+    allowSelect: true,
+    allowMove: true,
+    allowResize: true,
+
+    trackDocument: true,
+
+    // Styling Options
+    baseClass: 'jcrop',
+    addClass: null,
+    bgColor: 'black',
+    bgOpacity: 0.6,
+    bgFade: false,
+    borderOpacity: 0.4,
+    handleOpacity: 0.5,
+    handleSize: null,
+
+    aspectRatio: 0,
+    keySupport: true,
+    createHandles: ['n','s','e','w','nw','ne','se','sw'],
+    createDragbars: ['n','s','e','w'],
+    createBorders: ['n','s','e','w'],
+    drawBorders: true,
+    dragEdges: true,
+    fixedSupport: true,
+    touchSupport: null,
+
+    shade: null,
+
+    boxWidth: 0,
+    boxHeight: 0,
+    boundary: 2,
+    fadeTime: 400,
+    animationDelay: 20,
+    swingSpeed: 3,
+
+    minSelect: [0, 0],
+    maxSize: [0, 0],
+    minSize: [0, 0],
+
+    // Callbacks / Event Handlers
+    onChange: function () {},
+    onSelect: function () {},
+    onDblClick: function () {},
+    onRelease: function () {}
+  };
+
+  // }}}
+}(jQuery));
diff --git a/settings/personal.php b/settings/personal.php
index fdac0390d04..4c06eecd223 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -17,8 +17,8 @@ OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' );
 OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' );
 \OC_Util::addScript('files', 'jquery.fileupload');
 if (\OC_Config::getValue('enable_avatars', true) === true) {
-	\OC_Util::addScript('3rdparty/Jcrop', 'jquery.Jcrop.min');
-	\OC_Util::addStyle('3rdparty/Jcrop', 'jquery.Jcrop.min');
+	\OC_Util::addVendorScript('jcrop/js/jquery.Jcrop');
+	\OC_Util::addVendorStyle('jcrop/css/jquery.Jcrop');
 }
 
 // Highlight navigation entry
-- 
GitLab


From 8104a4e24e8aece95e47a2b6d1fdea30420b6dd9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 6 Nov 2014 11:11:46 +0100
Subject: [PATCH 337/616] check if the provided password is really the current
 log-in password

---
 .../ajax/updatePrivateKeyPassword.php            | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
index f88e9c64dfd..0f182e93831 100644
--- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php
+++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
@@ -18,6 +18,7 @@ use OCA\Encryption;
 $l = \OC::$server->getL10N('core');
 
 $return = false;
+$errorMessage = $l->t('Could not update the private key password.');
 
 $oldPassword = $_POST['oldPassword'];
 $newPassword = $_POST['newPassword'];
@@ -26,6 +27,11 @@ $view = new \OC\Files\View('/');
 $session = new \OCA\Encryption\Session($view);
 $user = \OCP\User::getUser();
 
+// check new password
+$passwordCorrect = \OCP\User::checkPassword($user, $newPassword);
+
+if ($passwordCorrect !== false) {
+
 $proxyStatus = \OC_FileProxy::$enabled;
 \OC_FileProxy::$enabled = false;
 
@@ -42,14 +48,22 @@ if ($decryptedKey) {
 		$session->setPrivateKey($decryptedKey);
 		$return = true;
 	}
+} else {
+	$result = false;
+	$errorMessage = $l->t('The old password was not correct, please try again.');
 }
 
 \OC_FileProxy::$enabled = $proxyStatus;
 
+} else {
+	$result = false;
+	$errorMessage = $l->t('The current log-in password was not correct, please try again.');
+}
+
 // success or failure
 if ($return) {
 	$session->setInitialized(\OCA\Encryption\Session::INIT_SUCCESSFUL);
 	\OCP\JSON::success(array('data' => array('message' => $l->t('Private key password successfully updated.'))));
 } else {
-	\OCP\JSON::error(array('data' => array('message' => $l->t('Could not update the private key password. Maybe the old password was not correct.'))));
+	\OCP\JSON::error(array('data' => array('message' => $errorMessage)));
 }
-- 
GitLab


From f816f3df03e43fcbf86d0329c88891c46b26db90 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 6 Nov 2014 10:15:22 +0100
Subject: [PATCH 338/616] bower zxcvbn

---
 3rdparty                       |  2 +-
 bower.json                     |  3 ++-
 core/js/setup.js               |  2 +-
 core/vendor/.gitignore         |  5 ++++
 core/vendor/zxcvbn/LICENSE.txt | 20 ++++++++++++++++
 core/vendor/zxcvbn/zxcvbn.js   | 43 ++++++++++++++++++++++++++++++++++
 settings/js/personal.js        |  2 +-
 7 files changed, 73 insertions(+), 4 deletions(-)
 create mode 100644 core/vendor/zxcvbn/LICENSE.txt
 create mode 100644 core/vendor/zxcvbn/zxcvbn.js

diff --git a/3rdparty b/3rdparty
index 165fadf4252..8e3d65c9d1e 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 165fadf4252843fb3015a1138cdabef66a1988bb
+Subproject commit 8e3d65c9d1e21c04ce62db9d5531764d91b76f94
diff --git a/bower.json b/bower.json
index d167514acd7..cb173d5c63a 100644
--- a/bower.json
+++ b/bower.json
@@ -18,6 +18,7 @@
     "jquery": "~1.10.0",
     "moment": "~2.8.3",
     "select2": "3.4.8",
-    "underscore": "1.6.0"
+    "underscore": "1.6.0",
+    "zxcvbn": "*"
   }
 }
diff --git a/core/js/setup.js b/core/js/setup.js
index 253a12d9e6f..1eceb8ced70 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -94,7 +94,7 @@ $(document).ready(function() {
 	}
 
 	$('#adminpass').strengthify({
-		zxcvbn: OC.linkTo('3rdparty','zxcvbn/js/zxcvbn.js'),
+		zxcvbn: OC.linkTo('core','vendor/zxcvbn/zxcvbn.js'),
 		titles: [
 			t('core', 'Very weak password'),
 			t('core', 'Weak password'),
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index 5e553652912..e355913f030 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -41,3 +41,8 @@ select2/**
 !select2/select2x2.png
 !select2/select2-spinner.gif
 !select2/LICENSE
+
+#zxcvbn
+zxcvbn/**
+!zxcvbn/zxcvbn.js
+!zxcvbn/LICENSE.txt
diff --git a/core/vendor/zxcvbn/LICENSE.txt b/core/vendor/zxcvbn/LICENSE.txt
new file mode 100644
index 00000000000..661302221d8
--- /dev/null
+++ b/core/vendor/zxcvbn/LICENSE.txt
@@ -0,0 +1,20 @@
+Copyright (c) 2012 Dropbox, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/vendor/zxcvbn/zxcvbn.js b/core/vendor/zxcvbn/zxcvbn.js
new file mode 100644
index 00000000000..46411c1df3d
--- /dev/null
+++ b/core/vendor/zxcvbn/zxcvbn.js
@@ -0,0 +1,43 @@
+(function(){var x,r,q,y,I,J,K,L,M,N,O,P,z,p,A,Q,R,S,T,U,V;O=function(b){var a,d;d=[];for(a in b)d.push(a);return 0===d.length};z=function(b,a){return b.push.apply(b,a)};U=function(b,a){var d,c,e,f,g;f=b.split("");g=[];c=0;for(e=f.length;c<e;c++)d=f[c],g.push(a[d]||d);return g.join("")};Q=function(b,a){var d,c,e,f;c=[];e=0;for(f=a.length;e<f;e++)d=a[e],z(c,d(b));return c.sort(function(b,a){return b.i-a.i||b.j-a.j})};M=function(b,a){var d,c,e,f,g,h,i,j,k;h=[];e=b.length;f=b.toLowerCase();for(d=j=0;0<=
+e?j<e:j>e;d=0<=e?++j:--j)for(c=k=d;d<=e?k<e:k>e;c=d<=e?++k:--k)if(f.slice(d,+c+1||9E9)in a)i=f.slice(d,+c+1||9E9),g=a[i],h.push({pattern:"dictionary",i:d,j:c,token:b.slice(d,+c+1||9E9),matched_word:i,rank:g});return h};q=function(b){var a,d,c,e,f;d={};a=1;e=0;for(f=b.length;e<f;e++)c=b[e],d[c]=a,a+=1;return d};r=function(b,a){return function(d){var c,e,f;c=M(d,a);e=0;for(f=c.length;e<f;e++)d=c[e],d.dictionary_name=b;return c}};A={a:["4","@"],b:["8"],c:["(","{","[","<"],e:["3"],g:["6","9"],i:["1",
+"!","|"],l:["1","|","7"],o:["0"],s:["$","5"],t:["+","7"],x:["%"],z:["2"]};R=function(b){var a,d,c,e,f;d={};f=b.split("");c=0;for(e=f.length;c<e;c++)b=f[c],d[b]=!0;b={};for(a in A){e=A[a];var g=f=void 0,h=void 0,h=[];f=0;for(g=e.length;f<g;f++)c=e[f],c in d&&h.push(c);c=h;0<c.length&&(b[a]=c)}return b};P=function(b){var a,d,c,e,f,g,h,i,j,k,l,m,o;f=function(){var a;a=[];for(e in b)a.push(e);return a}();j=[[]];d=function(a){var b,c,d,f,g,i,h,j;c=[];f={};h=0;for(j=a.length;h<j;h++)g=a[h],b=function(){var b,
+a,c;c=[];i=b=0;for(a=g.length;b<a;i=++b)e=g[i],c.push([e,i]);return c}(),b.sort(),d=function(){var a,c,d;d=[];i=a=0;for(c=b.length;a<c;i=++a)e=b[i],d.push(e+","+i);return d}().join("-"),d in f||(f[d]=!0,c.push(g));return c};c=function(a){var e,f,g,i,h,k,l,o,m,n,r,q,p;if(a.length){f=a[0];h=a.slice(1);i=[];q=b[f];l=0;for(n=q.length;l<n;l++){a=q[l];o=0;for(r=j.length;o<r;o++){k=j[o];e=-1;g=m=0;for(p=k.length;0<=p?m<p:m>p;g=0<=p?++m:--m)if(k[g][0]===a){e=g;break}-1===e?(e=k.concat([[a,f]]),i.push(e)):
+(g=k.slice(0),g.splice(e,1),g.push([a,f]),i.push(k),i.push(g))}}j=d(i);return c(h)}};c(f);i=[];k=0;for(m=j.length;k<m;k++){g=j[k];h={};l=0;for(o=g.length;l<o;l++)a=g[l],f=a[0],a=a[1],h[f]=a;i.push(h)}return i};T=function(b,a,d){var c,e,f,g,h,i,j,k,l,m,o,s,n;l=[];for(i=0;i<b.length-1;){j=i+1;k=null;for(m=o=0;;){c=b.charAt(j-1);h=!1;g=-1;e=a[c]||[];if(j<b.length){f=b.charAt(j);s=0;for(n=e.length;s<n;s++)if(c=e[s],g+=1,c&&-1!==c.indexOf(f)){h=!0;1===c.indexOf(f)&&(m+=1);k!==g&&(o+=1,k=g);break}}if(h)j+=
+1;else{2<j-i&&l.push({pattern:"spatial",i:i,j:j-1,token:b.slice(i,j),graph:d,turns:o,shifted_count:m});i=j;break}}}return l};x={lower:"abcdefghijklmnopqrstuvwxyz",upper:"ABCDEFGHIJKLMNOPQRSTUVWXYZ",digits:"01234567890"};S=function(b,a){var d,c;c=[];for(d=1;1<=a?d<=a:d>=a;1<=a?++d:--d)c.push(b);return c.join("")};p=function(b,a){var d,c;for(c=[];;){d=b.match(a);if(!d)break;d.i=d.index;d.j=d.index+d[0].length-1;c.push(d);b=b.replace(d[0],S(" ",d[0].length))}return c};N=/\d{3,}/;V=/19\d\d|200\d|201\d/;
+L=function(b){var a,d,c,e,f,g,h,i,j,k,l,m,o,s;e=[];s=p(b,/\d{4,8}/);k=0;for(m=s.length;k<m;k++){g=s[k];h=[g.i,g.j];g=h[0];h=h[1];c=b.slice(g,+h+1||9E9);a=c.length;d=[];6>=c.length&&(d.push({daymonth:c.slice(2),year:c.slice(0,2),i:g,j:h}),d.push({daymonth:c.slice(0,a-2),year:c.slice(a-2),i:g,j:h}));6<=c.length&&(d.push({daymonth:c.slice(4),year:c.slice(0,4),i:g,j:h}),d.push({daymonth:c.slice(0,a-4),year:c.slice(a-4),i:g,j:h}));c=[];l=0;for(o=d.length;l<o;l++)switch(a=d[l],a.daymonth.length){case 2:c.push({day:a.daymonth[0],
+month:a.daymonth[1],year:a.year,i:a.i,j:a.j});break;case 3:c.push({day:a.daymonth.slice(0,2),month:a.daymonth[2],year:a.year,i:a.i,j:a.j});c.push({day:a.daymonth[0],month:a.daymonth.slice(1,3),year:a.year,i:a.i,j:a.j});break;case 4:c.push({day:a.daymonth.slice(0,2),month:a.daymonth.slice(2,4),year:a.year,i:a.i,j:a.j})}l=0;for(o=c.length;l<o;l++)a=c[l],f=parseInt(a.day),i=parseInt(a.month),j=parseInt(a.year),f=y(f,i,j),d=f[0],j=f[1],f=j[0],i=j[1],j=j[2],d&&e.push({pattern:"date",i:a.i,j:a.j,token:b.slice(g,
++h+1||9E9),separator:"",day:f,month:i,year:j})}return e};J=/(\d{1,2})(\s|-|\/|\\|_|\.)(\d{1,2})\2(19\d{2}|200\d|201\d|\d{2})/;I=/(19\d{2}|200\d|201\d|\d{2})(\s|-|\/|\\|_|\.)(\d{1,2})\2(\d{1,2})/;K=function(b){var a,d,c,e,f,g,h,i,j,k;e=[];j=p(b,J);g=0;for(i=j.length;g<i;g++)c=j[g],k=function(){var a,b,e,f;e=[1,3,4];f=[];a=0;for(b=e.length;a<b;a++)d=e[a],f.push(parseInt(c[d]));return f}(),c.day=k[0],c.month=k[1],c.year=k[2],c.sep=c[2],e.push(c);j=p(b,I);g=0;for(i=j.length;g<i;g++)c=j[g],k=function(){var a,
+b,e,f;e=[4,3,1];f=[];a=0;for(b=e.length;a<b;a++)d=e[a],f.push(parseInt(c[d]));return f}(),c.day=k[0],c.month=k[1],c.year=k[2],c.sep=c[2],e.push(c);k=[];i=0;for(j=e.length;i<j;i++)c=e[i],a=y(c.day,c.month,c.year),g=a[0],h=a[1],a=h[0],f=h[1],h=h[2],g&&k.push({pattern:"date",i:c.i,j:c.j,token:b.slice(c.i,+c.j+1||9E9),separator:c.sep,day:a,month:f,year:h});return k};y=function(b,a,d){12<=a&&31>=a&&12>=b&&(a=[a,b],b=a[0],a=a[1]);return 31<b||12<a||!(1900<=d&&2019>=d)?[!1,[]]:[!0,[b,a,d]]};var W,X,Y,Z,
+C,$,aa,ba,ca,da,ea,fa,ga,ha,n,ia,u,ja,D,ka,la,ma;u=function(b,a){var d,c,e;if(a>b)return 0;if(0===a)return 1;for(d=e=c=1;1<=a?e<=a:e>=a;d=1<=a?++e:--e)c*=b,c/=d,b-=1;return c};n=function(b){return Math.log(b)/Math.log(2)};ia=function(b,a){var d,c,e,f,g,h,i,j,k,l,m;c=C(b);k=[];d=[];f=i=0;for(m=b.length;0<=m?i<m:i>m;f=0<=m?++i:--i){k[f]=(k[f-1]||0)+n(c);d[f]=null;j=0;for(l=a.length;j<l;j++)h=a[j],h.j===f&&(g=[h.i,h.j],e=g[0],g=g[1],e=(k[e-1]||0)+$(h),e<k[g]&&(k[g]=e,d[g]=h))}i=[];for(f=b.length-1;0<=
+f;)(h=d[f])?(i.push(h),f=h.i-1):f-=1;i.reverse();d=function(a,d){return{pattern:"bruteforce",i:a,j:d,token:b.slice(a,+d+1||9E9),entropy:n(Math.pow(c,d-a+1)),cardinality:c}};f=0;j=[];l=0;for(m=i.length;l<m;l++)h=i[l],g=[h.i,h.j],e=g[0],g=g[1],0<e-f&&j.push(d(f,e-1)),f=g+1,j.push(h);f<b.length&&j.push(d(f,b.length-1));i=j;h=k[b.length-1]||0;f=fa(h);return{password:b,entropy:D(h,3),match_sequence:i,crack_time:D(f,3),crack_time_display:ea(f),score:aa(f)}};D=function(b,a){return Math.round(b*Math.pow(10,
+a))/Math.pow(10,a)};fa=function(b){return 5.0E-5*Math.pow(2,b)};aa=function(b){return b<Math.pow(10,2)?0:b<Math.pow(10,4)?1:b<Math.pow(10,6)?2:b<Math.pow(10,8)?3:4};$=function(b){var a;if(null!=b.entropy)return b.entropy;a=function(){switch(b.pattern){case "repeat":return ja;case "sequence":return ka;case "digits":return da;case "year":return ma;case "date":return ba;case "spatial":return la;case "dictionary":return ca}}();return b.entropy=a(b)};ja=function(b){var a;a=C(b.token);return n(a*b.token.length)};
+ka=function(b){var a;a=b.token.charAt(0);a="a"===a||"1"===a?1:a.match(/\d/)?n(10):a.match(/[a-z]/)?n(26):n(26)+1;b.ascending||(a+=1);return a+n(b.token.length)};da=function(b){return n(Math.pow(10,b.token.length))};ma=function(){return n(119)};ba=function(b){var a;a=100>b.year?n(37200):n(44268);b.separator&&(a+=2);return a};la=function(b){var a,d,c,e,f,g,h,i,j,k;"qwerty"===(c=b.graph)||"dvorak"===c?(h=na,d=oa):(h=pa,d=qa);f=0;a=b.token.length;i=b.turns;for(c=j=2;2<=a?j<=a:j>=a;c=2<=a?++j:--j){g=Math.min(i,
+c-1);for(e=k=1;1<=g?k<=g:k>=g;e=1<=g?++k:--k)f+=u(c-1,e-1)*h*Math.pow(d,e)}d=n(f);if(b.shifted_count){a=b.shifted_count;b=b.token.length-b.shifted_count;c=e=f=0;for(g=Math.min(a,b);0<=g?e<=g:e>=g;c=0<=g?++e:--e)f+=u(a+b,c);d+=n(f)}return d};ca=function(b){b.base_entropy=n(b.rank);b.uppercase_entropy=ha(b);b.l33t_entropy=ga(b);return b.base_entropy+b.uppercase_entropy+b.l33t_entropy};Z=/^[A-Z][^A-Z]+$/;Y=/^[^A-Z]+[A-Z]$/;X=/^[^a-z]+$/;W=/^[^A-Z]+$/;ha=function(b){var a,d,c,e,f,g,h;f=b.token;if(f.match(W))return 0;
+e=[Z,Y,X];a=0;for(c=e.length;a<c;a++)if(b=e[a],f.match(b))return 1;a=function(){var a,b,c,e;c=f.split("");e=[];a=0;for(b=c.length;a<b;a++)d=c[a],d.match(/[A-Z]/)&&e.push(d);return e}().length;b=function(){var a,b,c,e;c=f.split("");e=[];a=0;for(b=c.length;a<b;a++)d=c[a],d.match(/[a-z]/)&&e.push(d);return e}().length;c=g=e=0;for(h=Math.min(a,b);0<=h?g<=h:g>=h;c=0<=h?++g:--g)e+=u(a+b,c);return n(e)};ga=function(b){var a,d,c,e,f,g,h,i,j,k;if(!b.l33t)return 0;f=0;j=b.sub;for(g in j){h=j[g];a=function(){var a,
+d,e,f;e=b.token.split("");f=[];a=0;for(d=e.length;a<d;a++)c=e[a],c===g&&f.push(c);return f}().length;d=function(){var a,d,e,f;e=b.token.split("");f=[];a=0;for(d=e.length;a<d;a++)c=e[a],c===h&&f.push(c);return f}().length;e=i=0;for(k=Math.min(d,a);0<=k?i<=k:i>=k;e=0<=k?++i:--i)f+=u(d+a,e)}return n(f)||1};C=function(b){var a,d,c,e,f,g,h,i;f=[!1,!1,!1,!1,!1];c=f[0];g=f[1];d=f[2];e=f[3];f=f[4];i=b.split("");b=0;for(h=i.length;b<h;b++)a=i[b],a=a.charCodeAt(0),48<=a&&57>=a?d=!0:65<=a&&90>=a?g=!0:97<=a&&
+122>=a?c=!0:127>=a?e=!0:f=!0;b=0;d&&(b+=10);g&&(b+=26);c&&(b+=26);e&&(b+=33);f&&(b+=100);return b};ea=function(b){return 60>b?"instant":3600>b?""+(1+Math.ceil(b/60))+" minutes":86400>b?""+(1+Math.ceil(b/3600))+" hours":2678400>b?""+(1+Math.ceil(b/86400))+" days":32140800>b?""+(1+Math.ceil(b/2678400))+" months":321408E4>b?""+(1+Math.ceil(b/32140800))+" years":"centuries"};var E={"!":["`~",null,null,"2@","qQ",null],'"':[";:","[{","]}",null,null,"/?"],"#":["2@",null,null,"4$","eE","wW"],$:["3#",null,
+null,"5%","rR","eE"],"%":["4$",null,null,"6^","tT","rR"],"&":["6^",null,null,"8*","uU","yY"],"'":[";:","[{","]}",null,null,"/?"],"(":["8*",null,null,"0)","oO","iI"],")":["9(",null,null,"-_","pP","oO"],"*":["7&",null,null,"9(","iI","uU"],"+":["-_",null,null,null,"]}","[{"],",":["mM","kK","lL",".>",null,null],"-":["0)",null,null,"=+","[{","pP"],".":[",<","lL",";:","/?",null,null],"/":[".>",";:","'\"",null,null,null],"0":["9(",null,null,"-_","pP","oO"],1:["`~",null,null,"2@","qQ",null],2:["1!",null,
+null,"3#","wW","qQ"],3:["2@",null,null,"4$","eE","wW"],4:["3#",null,null,"5%","rR","eE"],5:["4$",null,null,"6^","tT","rR"],6:["5%",null,null,"7&","yY","tT"],7:["6^",null,null,"8*","uU","yY"],8:["7&",null,null,"9(","iI","uU"],9:["8*",null,null,"0)","oO","iI"],":":"lL,pP,[{,'\",/?,.>".split(","),";":"lL,pP,[{,'\",/?,.>".split(","),"<":["mM","kK","lL",".>",null,null],"=":["-_",null,null,null,"]}","[{"],">":[",<","lL",";:","/?",null,null],"?":[".>",";:","'\"",null,null,null],"@":["1!",null,null,"3#",
+"wW","qQ"],A:[null,"qQ","wW","sS","zZ",null],B:["vV","gG","hH","nN",null,null],C:["xX","dD","fF","vV",null,null],D:"sS,eE,rR,fF,cC,xX".split(","),E:"wW,3#,4$,rR,dD,sS".split(","),F:"dD,rR,tT,gG,vV,cC".split(","),G:"fF,tT,yY,hH,bB,vV".split(","),H:"gG,yY,uU,jJ,nN,bB".split(","),I:"uU,8*,9(,oO,kK,jJ".split(","),J:"hH,uU,iI,kK,mM,nN".split(","),K:"jJ iI oO lL ,< mM".split(" "),L:"kK oO pP ;: .> ,<".split(" "),M:["nN","jJ","kK",",<",null,null],N:["bB","hH","jJ","mM",null,null],O:"iI,9(,0),pP,lL,kK".split(","),
+P:"oO,0),-_,[{,;:,lL".split(","),Q:[null,"1!","2@","wW","aA",null],R:"eE,4$,5%,tT,fF,dD".split(","),S:"aA,wW,eE,dD,xX,zZ".split(","),T:"rR,5%,6^,yY,gG,fF".split(","),U:"yY,7&,8*,iI,jJ,hH".split(","),V:["cC","fF","gG","bB",null,null],W:"qQ,2@,3#,eE,sS,aA".split(","),X:["zZ","sS","dD","cC",null,null],Y:"tT,6^,7&,uU,hH,gG".split(","),Z:[null,"aA","sS","xX",null,null],"[":"pP,-_,=+,]},'\",;:".split(","),"\\":["]}",null,null,null,null,null],"]":["[{","=+",null,"\\|",null,"'\""],"^":["5%",null,null,"7&",
+"yY","tT"],_:["0)",null,null,"=+","[{","pP"],"`":[null,null,null,"1!",null,null],a:[null,"qQ","wW","sS","zZ",null],b:["vV","gG","hH","nN",null,null],c:["xX","dD","fF","vV",null,null],d:"sS,eE,rR,fF,cC,xX".split(","),e:"wW,3#,4$,rR,dD,sS".split(","),f:"dD,rR,tT,gG,vV,cC".split(","),g:"fF,tT,yY,hH,bB,vV".split(","),h:"gG,yY,uU,jJ,nN,bB".split(","),i:"uU,8*,9(,oO,kK,jJ".split(","),j:"hH,uU,iI,kK,mM,nN".split(","),k:"jJ iI oO lL ,< mM".split(" "),l:"kK oO pP ;: .> ,<".split(" "),m:["nN","jJ","kK",",<",
+null,null],n:["bB","hH","jJ","mM",null,null],o:"iI,9(,0),pP,lL,kK".split(","),p:"oO,0),-_,[{,;:,lL".split(","),q:[null,"1!","2@","wW","aA",null],r:"eE,4$,5%,tT,fF,dD".split(","),s:"aA,wW,eE,dD,xX,zZ".split(","),t:"rR,5%,6^,yY,gG,fF".split(","),u:"yY,7&,8*,iI,jJ,hH".split(","),v:["cC","fF","gG","bB",null,null],w:"qQ,2@,3#,eE,sS,aA".split(","),x:["zZ","sS","dD","cC",null,null],y:"tT,6^,7&,uU,hH,gG".split(","),z:[null,"aA","sS","xX",null,null],"{":"pP,-_,=+,]},'\",;:".split(","),"|":["]}",null,null,
+null,null,null],"}":["[{","=+",null,"\\|",null,"'\""],"~":[null,null,null,"1!",null,null]},F={"*":["/",null,null,null,"-","+","9","8"],"+":["9","*","-",null,null,null,null,"6"],"-":["*",null,null,null,null,null,"+","9"],".":["0","2","3",null,null,null,null,null],"/":[null,null,null,null,"*","9","8","7"],"0":[null,"1","2","3",".",null,null,null],1:[null,null,"4","5","2","0",null,null],2:["1","4","5","6","3",".","0",null],3:["2","5","6",null,null,null,".","0"],4:[null,null,"7","8","5","2","1",null],
+5:"4,7,8,9,6,3,2,1".split(","),6:["5","8","9","+",null,null,"3","2"],7:[null,null,null,"/","8","5","4",null],8:["7",null,"/","*","9","6","5","4"],9:["8","/","*","-","+",null,"6","5"]},v,G,oa,na,qa,pa,ra,t,w,H;v=[r("passwords",q("password,123456,12345678,1234,qwerty,12345,dragon,pussy,baseball,football,letmein,monkey,696969,abc123,mustang,shadow,master,111111,2000,jordan,superman,harley,1234567,fuckme,hunter,fuckyou,trustno1,ranger,buster,tigger,soccer,fuck,batman,test,pass,killer,hockey,charlie,love,sunshine,asshole,6969,pepper,access,123456789,654321,maggie,starwars,silver,dallas,yankees,123123,666666,hello,orange,biteme,freedom,computer,sexy,thunder,ginger,hammer,summer,corvette,fucker,austin,1111,merlin,121212,golfer,cheese,princess,chelsea,diamond,yellow,bigdog,secret,asdfgh,sparky,cowboy,camaro,matrix,falcon,iloveyou,guitar,purple,scooter,phoenix,aaaaaa,tigers,porsche,mickey,maverick,cookie,nascar,peanut,131313,money,horny,samantha,panties,steelers,snoopy,boomer,whatever,iceman,smokey,gateway,dakota,cowboys,eagles,chicken,dick,black,zxcvbn,ferrari,knight,hardcore,compaq,coffee,booboo,bitch,bulldog,xxxxxx,welcome,player,ncc1701,wizard,scooby,junior,internet,bigdick,brandy,tennis,blowjob,banana,monster,spider,lakers,rabbit,enter,mercedes,fender,yamaha,diablo,boston,tiger,marine,chicago,rangers,gandalf,winter,bigtits,barney,raiders,porn,badboy,blowme,spanky,bigdaddy,chester,london,midnight,blue,fishing,000000,hannah,slayer,11111111,sexsex,redsox,thx1138,asdf,marlboro,panther,zxcvbnm,arsenal,qazwsx,mother,7777777,jasper,winner,golden,butthead,viking,iwantu,angels,prince,cameron,girls,madison,hooters,startrek,captain,maddog,jasmine,butter,booger,golf,rocket,theman,liverpoo,flower,forever,muffin,turtle,sophie,redskins,toyota,sierra,winston,giants,packers,newyork,casper,bubba,112233,lovers,mountain,united,driver,helpme,fucking,pookie,lucky,maxwell,8675309,bear,suckit,gators,5150,222222,shithead,fuckoff,jaguar,hotdog,tits,gemini,lover,xxxxxxxx,777777,canada,florida,88888888,rosebud,metallic,doctor,trouble,success,stupid,tomcat,warrior,peaches,apples,fish,qwertyui,magic,buddy,dolphins,rainbow,gunner,987654,freddy,alexis,braves,cock,2112,1212,cocacola,xavier,dolphin,testing,bond007,member,voodoo,7777,samson,apollo,fire,tester,beavis,voyager,porno,rush2112,beer,apple,scorpio,skippy,sydney,red123,power,beaver,star,jackass,flyers,boobs,232323,zzzzzz,scorpion,doggie,legend,ou812,yankee,blazer,runner,birdie,bitches,555555,topgun,asdfasdf,heaven,viper,animal,2222,bigboy,4444,private,godzilla,lifehack,phantom,rock,august,sammy,cool,platinum,jake,bronco,heka6w2,copper,cumshot,garfield,willow,cunt,slut,69696969,kitten,super,jordan23,eagle1,shelby,america,11111,free,123321,chevy,bullshit,broncos,horney,surfer,nissan,999999,saturn,airborne,elephant,shit,action,adidas,qwert,1313,explorer,police,christin,december,wolf,sweet,therock,online,dickhead,brooklyn,cricket,racing,penis,0000,teens,redwings,dreams,michigan,hentai,magnum,87654321,donkey,trinity,digital,333333,cartman,guinness,123abc,speedy,buffalo,kitty,pimpin,eagle,einstein,nirvana,vampire,xxxx,playboy,pumpkin,snowball,test123,sucker,mexico,beatles,fantasy,celtic,cherry,cassie,888888,sniper,genesis,hotrod,reddog,alexande,college,jester,passw0rd,bigcock,lasvegas,slipknot,3333,death,1q2w3e,eclipse,1q2w3e4r,drummer,montana,music,aaaa,carolina,colorado,creative,hello1,goober,friday,bollocks,scotty,abcdef,bubbles,hawaii,fluffy,horses,thumper,5555,pussies,darkness,asdfghjk,boobies,buddha,sandman,naughty,honda,azerty,6666,shorty,money1,beach,loveme,4321,simple,poohbear,444444,badass,destiny,vikings,lizard,assman,nintendo,123qwe,november,xxxxx,october,leather,bastard,101010,extreme,password1,pussy1,lacrosse,hotmail,spooky,amateur,alaska,badger,paradise,maryjane,poop,mozart,video,vagina,spitfire,cherokee,cougar,420420,horse,enigma,raider,brazil,blonde,55555,dude,drowssap,lovely,1qaz2wsx,booty,snickers,nipples,diesel,rocks,eminem,westside,suzuki,passion,hummer,ladies,alpha,suckme,147147,pirate,semperfi,jupiter,redrum,freeuser,wanker,stinky,ducati,paris,babygirl,windows,spirit,pantera,monday,patches,brutus,smooth,penguin,marley,forest,cream,212121,flash,maximus,nipple,vision,pokemon,champion,fireman,indian,softball,picard,system,cobra,enjoy,lucky1,boogie,marines,security,dirty,admin,wildcats,pimp,dancer,hardon,fucked,abcd1234,abcdefg,ironman,wolverin,freepass,bigred,squirt,justice,hobbes,pearljam,mercury,domino,9999,rascal,hitman,mistress,bbbbbb,peekaboo,naked,budlight,electric,sluts,stargate,saints,bondage,bigman,zombie,swimming,duke,qwerty1,babes,scotland,disney,rooster,mookie,swordfis,hunting,blink182,8888,samsung,bubba1,whore,general,passport,aaaaaaaa,erotic,liberty,arizona,abcd,newport,skipper,rolltide,balls,happy1,galore,christ,weasel,242424,wombat,digger,classic,bulldogs,poopoo,accord,popcorn,turkey,bunny,mouse,007007,titanic,liverpool,dreamer,everton,chevelle,psycho,nemesis,pontiac,connor,eatme,lickme,cumming,ireland,spiderma,patriots,goblue,devils,empire,asdfg,cardinal,shaggy,froggy,qwer,kawasaki,kodiak,phpbb,54321,chopper,hooker,whynot,lesbian,snake,teen,ncc1701d,qqqqqq,airplane,britney,avalon,sugar,sublime,wildcat,raven,scarface,elizabet,123654,trucks,wolfpack,pervert,redhead,american,bambam,woody,shaved,snowman,tiger1,chicks,raptor,1969,stingray,shooter,france,stars,madmax,sports,789456,simpsons,lights,chronic,hahaha,packard,hendrix,service,spring,srinivas,spike,252525,bigmac,suck,single,popeye,tattoo,texas,bullet,taurus,sailor,wolves,panthers,japan,strike,pussycat,chris1,loverboy,berlin,sticky,tarheels,russia,wolfgang,testtest,mature,catch22,juice,michael1,nigger,159753,alpha1,trooper,hawkeye,freaky,dodgers,pakistan,machine,pyramid,vegeta,katana,moose,tinker,coyote,infinity,pepsi,letmein1,bang,hercules,james1,tickle,outlaw,browns,billybob,pickle,test1,sucks,pavilion,changeme,caesar,prelude,darkside,bowling,wutang,sunset,alabama,danger,zeppelin,pppppp,2001,ping,darkstar,madonna,qwe123,bigone,casino,charlie1,mmmmmm,integra,wrangler,apache,tweety,qwerty12,bobafett,transam,2323,seattle,ssssss,openup,pandora,pussys,trucker,indigo,storm,malibu,weed,review,babydoll,doggy,dilbert,pegasus,joker,catfish,flipper,fuckit,detroit,cheyenne,bruins,smoke,marino,fetish,xfiles,stinger,pizza,babe,stealth,manutd,gundam,cessna,longhorn,presario,mnbvcxz,wicked,mustang1,victory,21122112,awesome,athena,q1w2e3r4,holiday,knicks,redneck,12341234,gizmo,scully,dragon1,devildog,triumph,bluebird,shotgun,peewee,angel1,metallica,madman,impala,lennon,omega,access14,enterpri,search,smitty,blizzard,unicorn,tight,asdf1234,trigger,truck,beauty,thailand,1234567890,cadillac,castle,bobcat,buddy1,sunny,stones,asian,butt,loveyou,hellfire,hotsex,indiana,panzer,lonewolf,trumpet,colors,blaster,12121212,fireball,precious,jungle,atlanta,gold,corona,polaris,timber,theone,baller,chipper,skyline,dragons,dogs,licker,engineer,kong,pencil,basketba,hornet,barbie,wetpussy,indians,redman,foobar,travel,morpheus,target,141414,hotstuff,photos,rocky1,fuck_inside,dollar,turbo,design,hottie,202020,blondes,4128,lestat,avatar,goforit,random,abgrtyu,jjjjjj,cancer,q1w2e3,smiley,express,virgin,zipper,wrinkle1,babylon,consumer,monkey1,serenity,samurai,99999999,bigboobs,skeeter,joejoe,master1,aaaaa,chocolat,christia,stephani,tang,1234qwer,98765432,sexual,maxima,77777777,buckeye,highland,seminole,reaper,bassman,nugget,lucifer,airforce,nasty,warlock,2121,dodge,chrissy,burger,snatch,pink,gang,maddie,huskers,piglet,photo,dodger,paladin,chubby,buckeyes,hamlet,abcdefgh,bigfoot,sunday,manson,goldfish,garden,deftones,icecream,blondie,spartan,charger,stormy,juventus,galaxy,escort,zxcvb,planet,blues,david1,ncc1701e,1966,51505150,cavalier,gambit,ripper,oicu812,nylons,aardvark,whiskey,bing,plastic,anal,babylon5,loser,racecar,insane,yankees1,mememe,hansolo,chiefs,fredfred,freak,frog,salmon,concrete,zxcv,shamrock,atlantis,wordpass,rommel,1010,predator,massive,cats,sammy1,mister,stud,marathon,rubber,ding,trunks,desire,montreal,justme,faster,irish,1999,jessica1,alpine,diamonds,00000,swinger,shan,stallion,pitbull,letmein2,ming,shadow1,clitoris,fuckers,jackoff,bluesky,sundance,renegade,hollywoo,151515,wolfman,soldier,ling,goddess,manager,sweety,titans,fang,ficken,niners,bubble,hello123,ibanez,sweetpea,stocking,323232,tornado,content,aragorn,trojan,christop,rockstar,geronimo,pascal,crimson,google,fatcat,lovelove,cunts,stimpy,finger,wheels,viper1,latin,greenday,987654321,creampie,hiphop,snapper,funtime,duck,trombone,adult,cookies,mulder,westham,latino,jeep,ravens,drizzt,madness,energy,kinky,314159,slick,rocker,55555555,mongoose,speed,dddddd,catdog,cheng,ghost,gogogo,tottenha,curious,butterfl,mission,january,shark,techno,lancer,lalala,chichi,orion,trixie,delta,bobbob,bomber,kang,1968,spunky,liquid,beagle,granny,network,kkkkkk,1973,biggie,beetle,teacher,toronto,anakin,genius,cocks,dang,karate,snakes,bangkok,fuckyou2,pacific,daytona,infantry,skywalke,sailing,raistlin,vanhalen,huang,blackie,tarzan,strider,sherlock,gong,dietcoke,ultimate,shai,sprite,ting,artist,chai,chao,devil,python,ninja,ytrewq,superfly,456789,tian,jing,jesus1,freedom1,drpepper,chou,hobbit,shen,nolimit,mylove,biscuit,yahoo,shasta,sex4me,smoker,pebbles,pics,philly,tong,tintin,lesbians,cactus,frank1,tttttt,chun,danni,emerald,showme,pirates,lian,dogg,xiao,xian,tazman,tanker,toshiba,gotcha,rang,keng,jazz,bigguy,yuan,tomtom,chaos,fossil,racerx,creamy,bobo,musicman,warcraft,blade,shuang,shun,lick,jian,microsoft,rong,feng,getsome,quality,1977,beng,wwwwww,yoyoyo,zhang,seng,harder,qazxsw,qian,cong,chuan,deng,nang,boeing,keeper,western,1963,subaru,sheng,thuglife,teng,jiong,miao,mang,maniac,pussie,a1b2c3,zhou,zhuang,xing,stonecol,spyder,liang,jiang,memphis,ceng,magic1,logitech,chuang,sesame,shao,poison,titty,kuan,kuai,mian,guan,hamster,guai,ferret,geng,duan,pang,maiden,quan,velvet,nong,neng,nookie,buttons,bian,bingo,biao,zhong,zeng,zhun,ying,zong,xuan,zang,0.0.000,suan,shei,shui,sharks,shang,shua,peng,pian,piao,liao,meng,miami,reng,guang,cang,ruan,diao,luan,qing,chui,chuo,cuan,nuan,ning,heng,huan,kansas,muscle,weng,1passwor,bluemoon,zhui,zhua,xiang,zheng,zhen,zhei,zhao,zhan,yomama,zhai,zhuo,zuan,tarheel,shou,shuo,tiao,leng,kuang,jiao,13579,basket,qiao,qiong,qiang,chuai,nian,niao,niang,huai,22222222,zhuan,zhuai,shuan,shuai,stardust,jumper,66666666,charlott,qwertz,bones,waterloo,2002,11223344,oldman,trains,vertigo,246810,black1,swallow,smiles,standard,alexandr,parrot,user,1976,surfing,pioneer,apple1,asdasd,auburn,hannibal,frontier,panama,welcome1,vette,blue22,shemale,111222,baggins,groovy,global,181818,1979,blades,spanking,byteme,lobster,dawg,japanese,1970,1964,2424,polo,coco,deedee,mikey,1972,171717,1701,strip,jersey,green1,capital,putter,vader,seven7,banshee,grendel,dicks,hidden,iloveu,1980,ledzep,147258,female,bugger,buffett,molson,2020,wookie,sprint,jericho,102030,ranger1,trebor,deepthroat,bonehead,molly1,mirage,models,1984,2468,showtime,squirrel,pentium,anime,gator,powder,twister,connect,neptune,engine,eatshit,mustangs,woody1,shogun,septembe,pooh,jimbo,russian,sabine,voyeur,2525,363636,camel,germany,giant,qqqq,nudist,bone,sleepy,tequila,fighter,obiwan,makaveli,vacation,walnut,1974,ladybug,cantona,ccbill,satan,rusty1,passwor1,columbia,kissme,motorola,william1,1967,zzzz,skater,smut,matthew1,valley,coolio,dagger,boner,bull,horndog,jason1,penguins,rescue,griffey,8j4ye3uz,californ,champs,qwertyuiop,portland,colt45,xxxxxxx,xanadu,tacoma,carpet,gggggg,safety,palace,italia,picturs,picasso,thongs,tempest,asd123,hairy,foxtrot,nimrod,hotboy,343434,1111111,asdfghjkl,goose,overlord,stranger,454545,shaolin,sooners,socrates,spiderman,peanuts,13131313,andrew1,filthy,ohyeah,africa,intrepid,pickles,assass,fright,potato,hhhhhh,kingdom,weezer,424242,pepsi1,throat,looker,puppy,butch,sweets,megadeth,analsex,nymets,ddddddd,bigballs,oakland,oooooo,qweasd,chucky,carrot,chargers,discover,dookie,condor,horny1,sunrise,sinner,jojo,megapass,martini,assfuck,ffffff,mushroom,jamaica,7654321,77777,cccccc,gizmodo,tractor,mypass,hongkong,1975,blue123,pissing,thomas1,redred,basketball,satan666,dublin,bollox,kingkong,1971,22222,272727,sexx,bbbb,grizzly,passat,defiant,bowler,knickers,monitor,wisdom,slappy,thor,letsgo,robert1,brownie,098765,playtime,lightnin,atomic,goku,llllll,qwaszx,cosmos,bosco,knights,beast,slapshot,assword,frosty,dumbass,mallard,dddd,159357,titleist,aussie,golfing,doobie,loveit,werewolf,vipers,1965,blabla,surf,sucking,tardis,thegame,legion,rebels,sarah1,onelove,loulou,toto,blackcat,0007,tacobell,soccer1,jedi,method,poopie,boob,breast,kittycat,belly,pikachu,thunder1,thankyou,celtics,frogger,scoobydo,sabbath,coltrane,budman,jackal,zzzzz,licking,gopher,geheim,lonestar,primus,pooper,newpass,brasil,heather1,husker,element,moomoo,beefcake,zzzzzzzz,shitty,smokin,jjjj,anthony1,anubis,backup,gorilla,fuckface,lowrider,punkrock,traffic,delta1,amazon,fatass,dodgeram,dingdong,qqqqqqqq,breasts,boots,honda1,spidey,poker,temp,johnjohn,147852,asshole1,dogdog,tricky,crusader,syracuse,spankme,speaker,meridian,amadeus,harley1,falcons,turkey50,kenwood,keyboard,ilovesex,1978,shazam,shalom,lickit,jimbob,roller,fatman,sandiego,magnus,cooldude,clover,mobile,plumber,texas1,tool,topper,mariners,rebel,caliente,celica,oxford,osiris,orgasm,punkin,porsche9,tuesday,breeze,bossman,kangaroo,latinas,astros,scruffy,qwertyu,hearts,jammer,java,1122,goodtime,chelsea1,freckles,flyboy,doodle,nebraska,bootie,kicker,webmaster,vulcan,191919,blueeyes,321321,farside,rugby,director,pussy69,power1,hershey,hermes,monopoly,birdman,blessed,blackjac,southern,peterpan,thumbs,fuckyou1,rrrrrr,a1b2c3d4,coke,bohica,elvis1,blacky,sentinel,snake1,richard1,1234abcd,guardian,candyman,fisting,scarlet,dildo,pancho,mandingo,lucky7,condom,munchkin,billyboy,summer1,sword,skiing,site,sony,thong,rootbeer,assassin,fffff,fitness,durango,postal,achilles,kisses,warriors,plymouth,topdog,asterix,hallo,cameltoe,fuckfuck,eeeeee,sithlord,theking,avenger,backdoor,chevrole,trance,cosworth,houses,homers,eternity,kingpin,verbatim,incubus,1961,blond,zaphod,shiloh,spurs,mighty,aliens,charly,dogman,omega1,printer,aggies,deadhead,bitch1,stone55,pineappl,thekid,rockets,camels,formula,oracle,pussey,porkchop,abcde,clancy,mystic,inferno,blackdog,steve1,alfa,grumpy,flames,puffy,proxy,valhalla,unreal,herbie,engage,yyyyyy,010101,pistol,celeb,gggg,portugal,a12345,newbie,mmmm,1qazxsw2,zorro,writer,stripper,sebastia,spread,links,metal,1221,565656,funfun,trojans,cyber,hurrican,moneys,1x2zkg8w,zeus,tomato,lion,atlantic,usa123,trans,aaaaaaa,homerun,hyperion,kevin1,blacks,44444444,skittles,fart,gangbang,fubar,sailboat,oilers,buster1,hithere,immortal,sticks,pilot,lexmark,jerkoff,maryland,cheers,possum,cutter,muppet,swordfish,sport,sonic,peter1,jethro,rockon,asdfghj,pass123,pornos,ncc1701a,bootys,buttman,bonjour,1960,bears,362436,spartans,tinman,threesom,maxmax,1414,bbbbb,camelot,chewie,gogo,fusion,saint,dilligaf,nopass,hustler,hunter1,whitey,beast1,yesyes,spank,smudge,pinkfloy,patriot,lespaul,hammers,formula1,sausage,scooter1,orioles,oscar1,colombia,cramps,exotic,iguana,suckers,slave,topcat,lancelot,magelan,racer,crunch,british,steph,456123,skinny,seeking,rockhard,filter,freaks,sakura,pacman,poontang,newlife,homer1,klingon,watcher,walleye,tasty,sinatra,starship,steel,starbuck,poncho,amber1,gonzo,catherin,candle,firefly,goblin,scotch,diver,usmc,huskies,kentucky,kitkat,beckham,bicycle,yourmom,studio,33333333,splash,jimmy1,12344321,sapphire,mailman,raiders1,ddddd,excalibu,illini,imperial,lansing,maxx,gothic,golfball,facial,front242,macdaddy,qwer1234,vectra,cowboys1,crazy1,dannyboy,aquarius,franky,ffff,sassy,pppp,pppppppp,prodigy,noodle,eatpussy,vortex,wanking,billy1,siemens,phillies,groups,chevy1,cccc,gggggggg,doughboy,dracula,nurses,loco,lollipop,utopia,chrono,cooler,nevada,wibble,summit,1225,capone,fugazi,panda,qazwsxed,puppies,triton,9876,nnnnnn,momoney,iforgot,wolfie,studly,hamburg,81fukkc,741852,catman,china,gagging,scott1,oregon,qweqwe,crazybab,daniel1,cutlass,holes,mothers,music1,walrus,1957,bigtime,xtreme,simba,ssss,rookie,bathing,rotten,maestro,turbo1,99999,butthole,hhhh,yoda,shania,phish,thecat,rightnow,baddog,greatone,gateway1,abstr,napster,brian1,bogart,hitler,wildfire,jackson1,1981,beaner,yoyo,0.0.0.000,super1,select,snuggles,slutty,phoenix1,technics,toon,raven1,rayray,123789,1066,albion,greens,gesperrt,brucelee,hehehe,kelly1,mojo,1998,bikini,woofwoof,yyyy,strap,sites,central,f**k,nyjets,punisher,username,vanilla,twisted,bunghole,viagra,veritas,pony,titts,labtec,jenny1,masterbate,mayhem,redbull,govols,gremlin,505050,gmoney,rovers,diamond1,trident,abnormal,deskjet,cuddles,bristol,milano,vh5150,jarhead,1982,bigbird,bizkit,sixers,slider,star69,starfish,penetration,tommy1,john316,caligula,flicks,films,railroad,cosmo,cthulhu,br0d3r,bearbear,swedish,spawn,patrick1,reds,anarchy,groove,fuckher,oooo,airbus,cobra1,clips,delete,duster,kitty1,mouse1,monkeys,jazzman,1919,262626,swinging,stroke,stocks,sting,pippen,labrador,jordan1,justdoit,meatball,females,vector,cooter,defender,nike,bubbas,bonkers,kahuna,wildman,4121,sirius,static,piercing,terror,teenage,leelee,microsof,mechanic,robotech,rated,chaser,salsero,macross,quantum,tsunami,daddy1,cruise,newpass6,nudes,hellyeah,1959,zaq12wsx,striker,spice,spectrum,smegma,thumb,jjjjjjjj,mellow,cancun,cartoon,sabres,samiam,oranges,oklahoma,lust,denali,nude,noodles,brest,hooter,mmmmmmmm,warthog,blueblue,zappa,wolverine,sniffing,jjjjj,calico,freee,rover,pooter,closeup,bonsai,emily1,keystone,iiii,1955,yzerman,theboss,tolkien,megaman,rasta,bbbbbbbb,hal9000,goofy,gringo,gofish,gizmo1,samsam,scuba,onlyme,tttttttt,corrado,clown,clapton,bulls,jayhawk,wwww,sharky,seeker,ssssssss,pillow,thesims,lighter,lkjhgf,melissa1,marcius2,guiness,gymnast,casey1,goalie,godsmack,lolo,rangers1,poppy,clemson,clipper,deeznuts,holly1,eeee,kingston,yosemite,sucked,sex123,sexy69,pic\\'s,tommyboy,masterbating,gretzky,happyday,frisco,orchid,orange1,manchest,aberdeen,ne1469,boxing,korn,intercourse,161616,1985,ziggy,supersta,stoney,amature,babyboy,bcfields,goliath,hack,hardrock,frodo,scout,scrappy,qazqaz,tracker,active,craving,commando,cohiba,cyclone,bubba69,katie1,mpegs,vsegda,irish1,sexy1,smelly,squerting,lions,jokers,jojojo,meathead,ashley1,groucho,cheetah,champ,firefox,gandalf1,packer,love69,tyler1,typhoon,tundra,bobby1,kenworth,village,volley,wolf359,0420,000007,swimmer,skydive,smokes,peugeot,pompey,legolas,redhot,rodman,redalert,grapes,4runner,carrera,floppy,ou8122,quattro,cloud9,davids,nofear,busty,homemade,mmmmm,whisper,vermont,webmaste,wives,insertion,jayjay,philips,topher,temptress,midget,ripken,havefun,canon,celebrity,ghetto,ragnarok,usnavy,conover,cruiser,dalshe,nicole1,buzzard,hottest,kingfish,misfit,milfnew,warlord,wassup,bigsexy,blackhaw,zippy,tights,kungfu,labia,meatloaf,area51,batman1,bananas,636363,ggggg,paradox,queens,adults,aikido,cigars,hoosier,eeyore,moose1,warez,interacial,streaming,313131,pertinant,pool6123,mayday,animated,banker,baddest,gordon24,ccccc,fantasies,aisan,deadman,homepage,ejaculation,whocares,iscool,jamesbon,1956,1pussy,womam,sweden,skidoo,spock,sssss,pepper1,pinhead,micron,allsop,amsterda,gunnar,666999,february,fletch,george1,sapper,sasha1,luckydog,lover1,magick,popopo,ultima,cypress,businessbabe,brandon1,vulva,vvvv,jabroni,bigbear,yummy,010203,searay,secret1,sinbad,sexxxx,soleil,software,piccolo,thirteen,leopard,legacy,memorex,redwing,rasputin,134679,anfield,greenbay,catcat,feather,scanner,pa55word,contortionist,danzig,daisy1,hores,exodus,iiiiii,1001,subway,snapple,sneakers,sonyfuck,picks,poodle,test1234,llll,junebug,marker,mellon,ronaldo,roadkill,amanda1,asdfjkl,beaches,great1,cheerleaers,doitnow,ozzy,boxster,brighton,housewifes,kkkk,mnbvcx,moocow,vides,1717,bigmoney,blonds,1000,storys,stereo,4545,420247,seductive,sexygirl,lesbean,justin1,124578,cabbage,canadian,gangbanged,dodge1,dimas,malaka,puss,probes,coolman,nacked,hotpussy,erotica,kool,implants,intruder,bigass,zenith,woohoo,womans,tango,pisces,laguna,maxell,andyod22,barcelon,chainsaw,chickens,flash1,orgasms,magicman,profit,pusyy,pothead,coconut,chuckie,clevelan,builder,budweise,hotshot,horizon,experienced,mondeo,wifes,1962,stumpy,smiths,slacker,pitchers,passwords,laptop,allmine,alliance,bbbbbbb,asscock,halflife,88888,chacha,saratoga,sandy1,doogie,qwert40,transexual,close-up,ib6ub9,volvo,jacob1,iiiii,beastie,sunnyday,stoned,sonics,starfire,snapon,pictuers,pepe,testing1,tiberius,lisalisa,lesbain,litle,retard,ripple,austin1,badgirl,golfgolf,flounder,royals,dragoon,dickie,passwor,majestic,poppop,trailers,nokia,bobobo,br549,minime,mikemike,whitesox,1954,3232,353535,seamus,solo,sluttey,pictere,titten,lback,1024,goodluck,fingerig,gallaries,goat,passme,oasis,lockerroom,logan1,rainman,treasure,custom,cyclops,nipper,bucket,homepage-,hhhhh,momsuck,indain,2345,beerbeer,bimmer,stunner,456456,tootsie,testerer,reefer,1012,harcore,gollum,545454,chico,caveman,fordf150,fishes,gaymen,saleen,doodoo,pa55w0rd,presto,qqqqq,cigar,bogey,helloo,dutch,kamikaze,wasser,vietnam,visa,japanees,0123,swords,slapper,peach,masterbaiting,redwood,1005,ametuer,chiks,fucing,sadie1,panasoni,mamas,rambo,unknown,absolut,dallas1,housewife,keywest,kipper,18436572,1515,zxczxc,303030,shaman,terrapin,masturbation,mick,redfish,1492,angus,goirish,hardcock,forfun,galary,freeporn,duchess,olivier,lotus,pornographic,ramses,purdue,traveler,crave,brando,enter1,killme,moneyman,welder,windsor,wifey,indon,yyyyy,taylor1,4417,picher,pickup,thumbnils,johnboy,jets,ameteur,amateurs,apollo13,hambone,goldwing,5050,sally1,doghouse,padres,pounding,quest,truelove,underdog,trader,climber,bolitas,hohoho,beanie,beretta,wrestlin,stroker,sexyman,jewels,johannes,mets,rhino,bdsm,balloons,grils,happy123,flamingo,route66,devo,outkast,paintbal,magpie,llllllll,twilight,critter,cupcake,nickel,bullseye,knickerless,videoes,binladen,xerxes,slim,slinky,pinky,thanatos,meister,menace,retired,albatros,balloon,goten,5551212,getsdown,donuts,nwo4life,tttt,comet,deer,dddddddd,deeznutz,nasty1,nonono,enterprise,eeeee,misfit99,milkman,vvvvvv,1818,blueboy,bigbutt,tech,toolman,juggalo,jetski,barefoot,50spanks,gobears,scandinavian,cubbies,nitram,kings,bilbo,yumyum,zzzzzzz,stylus,321654,shannon1,server,squash,starman,steeler,phrases,techniques,laser,135790,athens,cbr600,chemical,fester,gangsta,fucku2,droopy,objects,passwd,lllll,manchester,vedder,clit,chunky,darkman,buckshot,buddah,boobed,henti,winter1,bigmike,beta,zidane,talon,slave1,pissoff,thegreat,lexus,matador,readers,armani,goldstar,5656,fmale,fuking,fucku,ggggggg,sauron,diggler,pacers,looser,pounded,premier,triangle,cosmic,depeche,norway,helmet,mustard,misty1,jagger,3x7pxr,silver1,snowboar,penetrating,photoes,lesbens,lindros,roadking,rockford,1357,143143,asasas,goodboy,898989,chicago1,ferrari1,galeries,godfathe,gawker,gargoyle,gangster,rubble,rrrr,onetime,pussyman,pooppoop,trapper,cinder,newcastl,boricua,bunny1,boxer,hotred,hockey1,edward1,moscow,mortgage,bigtit,snoopdog,joshua1,july,1230,assholes,frisky,sanity,divine,dharma,lucky13,akira,butterfly,hotbox,hootie,howdy,earthlink,kiteboy,westwood,1988,blackbir,biggles,wrench,wrestle,slippery,pheonix,penny1,pianoman,thedude,jenn,jonjon,jones1,roadrunn,arrow,azzer,seahawks,diehard,dotcom,tunafish,chivas,cinnamon,clouds,deluxe,northern,boobie,momomo,modles,volume,23232323,bluedog,wwwwwww,zerocool,yousuck,pluto,limewire,joung,awnyce,gonavy,haha,films+pic+galeries,girsl,fuckthis,girfriend,uncencored,a123456,chrisbln,combat,cygnus,cupoi,netscape,hhhhhhhh,eagles1,elite,knockers,1958,tazmania,shonuf,pharmacy,thedog,midway,arsenal1,anaconda,australi,gromit,gotohell,787878,66666,carmex2,camber,gator1,ginger1,fuzzy,seadoo,lovesex,rancid,uuuuuu,911911,bulldog1,heater,monalisa,mmmmmmm,whiteout,virtual,jamie1,japanes,james007,2727,2469,blam,bitchass,zephyr,stiffy,sweet1,southpar,spectre,tigger1,tekken,lakota,lionking,jjjjjjj,megatron,1369,hawaiian,gymnastic,golfer1,gunners,7779311,515151,sanfran,optimus,panther1,love1,maggie1,pudding,aaron1,delphi,niceass,bounce,house1,killer1,momo,musashi,jammin,2003,234567,wp2003wp,submit,sssssss,spikes,sleeper,passwort,kume,meme,medusa,mantis,reebok,1017,artemis,harry1,cafc91,fettish,oceans,oooooooo,mango,ppppp,trainer,uuuu,909090,death1,bullfrog,hokies,holyshit,eeeeeee,jasmine1,&amp,&amp;,spinner,jockey,babyblue,gooner,474747,cheeks,pass1234,parola,okokok,poseidon,989898,crusher,cubswin,nnnn,kotaku,mittens,whatsup,vvvvv,iomega,insertions,bengals,biit,yellow1,012345,spike1,sowhat,pitures,pecker,theend,hayabusa,hawkeyes,florian,qaz123,usarmy,twinkle,chuckles,hounddog,hover,hothot,europa,kenshin,kojak,mikey1,water1,196969,wraith,zebra,wwwww,33333,simon1,spider1,snuffy,philippe,thunderb,teddy1,marino13,maria1,redline,renault,aloha,handyman,cerberus,gamecock,gobucks,freesex,duffman,ooooo,nuggets,magician,longbow,preacher,porno1,chrysler,contains,dalejr,navy,buffy1,hedgehog,hoosiers,honey1,hott,heyhey,dutchess,everest,wareagle,ihateyou,sunflowe,3434,senators,shag,spoon,sonoma,stalker,poochie,terminal,terefon,maradona,1007,142536,alibaba,america1,bartman,astro,goth,chicken1,cheater,ghost1,passpass,oral,r2d2c3po,civic,cicero,myxworld,kkkkk,missouri,wishbone,infiniti,1a2b3c,1qwerty,wonderboy,shojou,sparky1,smeghead,poiuy,titanium,lantern,jelly,1213,bayern,basset,gsxr750,cattle,fishing1,fullmoon,gilles,dima,obelix,popo,prissy,ramrod,bummer,hotone,dynasty,entry,konyor,missy1,282828,xyz123,426hemi,404040,seinfeld,pingpong,lazarus,marine1,12345a,beamer,babyface,greece,gustav,7007,ccccccc,faggot,foxy,gladiato,duckie,dogfood,packers1,longjohn,radical,tuna,clarinet,danny1,novell,bonbon,kashmir,kiki,mortimer,modelsne,moondog,vladimir,insert,1953,zxc123,supreme,3131,sexxx,softail,poipoi,pong,mars,martin1,rogue,avalanch,audia4,55bgates,cccccccc,came11,figaro,dogboy,dnsadm,dipshit,paradigm,othello,operator,tripod,chopin,coucou,cocksuck,borussia,heritage,hiziad,homerj,mullet,whisky,4242,speedo,starcraf,skylar,spaceman,piggy,tiger2,legos,jezebel,joker1,mazda,727272,chester1,rrrrrrrr,dundee,lumber,ppppppp,tranny,aaliyah,admiral,comics,delight,buttfuck,homeboy,eternal,kilroy,violin,wingman,walmart,bigblue,blaze,beemer,beowulf,bigfish,yyyyyyy,woodie,yeahbaby,0123456,tbone,syzygy,starter,linda1,merlot,mexican,11235813,banner,bangbang,badman,barfly,grease,charles1,ffffffff,doberman,dogshit,overkill,coolguy,claymore,demo,nomore,hhhhhhh,hondas,iamgod,enterme,electron,eastside,minimoni,mybaby,wildbill,wildcard,ipswich,200000,bearcat,zigzag,yyyyyyyy,sweetnes,369369,skyler,skywalker,pigeon,tipper,asdf123,alphabet,asdzxc,babybaby,banane,guyver,graphics,chinook,florida1,flexible,fuckinside,ursitesux,tototo,adam12,christma,chrome,buddie,bombers,hippie,misfits,292929,woofer,wwwwwwww,stubby,sheep,sparta,stang,spud,sporty,pinball,just4fun,maxxxx,rebecca1,fffffff,freeway,garion,rrrrr,sancho,outback,maggot,puddin,987456,hoops,mydick,19691969,bigcat,shiner,silverad,templar,lamer,juicy,mike1,maximum,1223,10101010,arrows,alucard,haggis,cheech,safari,dog123,orion1,paloma,qwerasdf,presiden,vegitto,969696,adonis,cookie1,newyork1,buddyboy,hellos,heineken,eraser,moritz,millwall,visual,jaybird,1983,beautifu,zodiac,steven1,sinister,slammer,smashing,slick1,sponge,teddybea,ticklish,jonny,1211,aptiva,applepie,bailey1,guitar1,canyon,gagged,fuckme1,digital1,dinosaur,98765,90210,clowns,cubs,deejay,nigga,naruto,boxcar,icehouse,hotties,electra,widget,1986,2004,bluefish,bingo1,*****,stratus,sultan,storm1,44444,4200,sentnece,sexyboy,sigma,smokie,spam,pippo,temppass,manman,1022,bacchus,aztnm,axio,bamboo,hakr,gregor,hahahaha,5678,camero1,dolphin1,paddle,magnet,qwert1,pyon,porsche1,tripper,noway,burrito,bozo,highheel,hookem,eddie1,entropy,kkkkkkkk,kkkkkkk,illinois,1945,1951,24680,21212121,100000,stonecold,taco,subzero,sexxxy,skolko,skyhawk,spurs1,sputnik,testpass,jiggaman,1224,hannah1,525252,4ever,carbon,scorpio1,rt6ytere,madison1,loki,coolness,coldbeer,citadel,monarch,morgan1,washingt,1997,bella1,yaya,superb,taxman,studman,3636,pizzas,tiffany1,lassie,larry1,joseph1,mephisto,reptile,razor,1013,hammer1,gypsy,grande,camper,chippy,cat123,chimera,fiesta,glock,domain,dieter,dragonba,onetwo,nygiants,password2,quartz,prowler,prophet,towers,ultra,cocker,corleone,dakota1,cumm,nnnnnnn,boxers,heynow,iceberg,kittykat,wasabi,vikings1,beerman,splinter,snoopy1,pipeline,mickey1,mermaid,micro,meowmeow,redbird,baura,chevys,caravan,frogman,diving,dogger,draven,drifter,oatmeal,paris1,longdong,quant4307s,rachel1,vegitta,cobras,corsair,dadada,mylife,bowwow,hotrats,eastwood,moonligh,modena,illusion,iiiiiii,jayhawks,swingers,shocker,shrimp,sexgod,squall,poiu,tigers1,toejam,tickler,julie1,jimbo1,jefferso,michael2,rodeo,robot,1023,annie1,bball,happy2,charter,flasher,falcon1,fiction,fastball,gadget,scrabble,diaper,dirtbike,oliver1,paco,macman,poopy,popper,postman,ttttttt,acura,cowboy1,conan,daewoo,nemrac58,nnnnn,nextel,bobdylan,eureka,kimmie,kcj9wx5n,killbill,musica,volkswag,wage,windmill,wert,vintage,iloveyou1,itsme,zippo,311311,starligh,smokey1,snappy,soulmate,plasma,krusty,just4me,marius,rebel1,1123,audi,fick,goaway,rusty2,dogbone,doofus,ooooooo,oblivion,mankind,mahler,lllllll,pumper,puck,pulsar,valkyrie,tupac,compass,concorde,cougars,delaware,niceguy,nocturne,bob123,boating,bronze,herewego,hewlett,houhou,earnhard,eeeeeeee,mingus,mobydick,venture,verizon,imation,1950,1948,1949,223344,bigbig,wowwow,sissy,spiker,snooker,sluggo,player1,jsbach,jumbo,medic,reddevil,reckless,123456a,1125,1031,astra,gumby,757575,585858,chillin,fuck1,radiohea,upyours,trek,coolcool,classics,choochoo,nikki1,nitro,boytoy,excite,kirsty,wingnut,wireless,icu812,1master,beatle,bigblock,wolfen,summer99,sugar1,tartar,sexysexy,senna,sexman,soprano,platypus,pixies,telephon,laura1,laurent,rimmer,1020,12qwaszx,hamish,halifax,fishhead,forum,dododo,doit,paramedi,lonesome,mandy1,uuuuu,uranus,ttttt,bruce1,helper,hopeful,eduard,dusty1,kathy1,moonbeam,muscles,monster1,monkeybo,windsurf,vvvvvvv,vivid,install,1947,187187,1941,1952,susan1,31415926,sinned,sexxy,smoothie,snowflak,playstat,playa,playboy1,toaster,jerry1,marie1,mason1,merlin1,roger1,roadster,112358,1121,andrea1,bacardi,hardware,789789,5555555,captain1,fergus,sascha,rrrrrrr,dome,onion,lololo,qqqqqqq,undertak,uuuuuuuu,uuuuuuu,cobain,cindy1,coors,descent,nimbus,nomad,nanook,norwich,bombay,broker,hookup,kiwi,winners,jackpot,1a2b3c4d,1776,beardog,bighead,bird33,0987,spooge,pelican,peepee,titan,thedoors,jeremy1,altima,baba,hardone,5454,catwoman,finance,farmboy,farscape,genesis1,salomon,loser1,r2d2,pumpkins,chriss,cumcum,ninjas,ninja1,killers,miller1,islander,jamesbond,intel,19841984,2626,bizzare,blue12,biker,yoyoma,sushi,shitface,spanker,steffi,sphinx,please1,paulie,pistons,tiburon,maxwell1,mdogg,rockies,armstron,alejandr,arctic,banger,audio,asimov,753951,4you,chilly,care1839,flyfish,fantasia,freefall,sandrine,oreo,ohshit,macbeth,madcat,loveya,qwerqwer,colnago,chocha,cobalt,crystal1,dabears,nevets,nineinch,broncos1,epsilon,kestrel,winston1,warrior1,iiiiiiii,iloveyou2,1616,woowoo,sloppy,specialk,tinkerbe,jellybea,reader,redsox1,1215,1112,arcadia,baggio,555666,cayman,cbr900rr,gabriell,glennwei,sausages,disco,pass1,lovebug,macmac,puffin,vanguard,trinitro,airwolf,aaa111,cocaine,cisco,datsun,bricks,bumper,eldorado,kidrock,wizard1,whiskers,wildwood,istheman,25802580,bigones,woodland,wolfpac,strawber,3030,sheba1,sixpack,peace1,physics,tigger2,toad,megan1,meow,ringo,amsterdam,717171,686868,5424,canuck,football1,footjob,fulham,seagull,orgy,lobo,mancity,vancouve,vauxhall,acidburn,derf,myspace1,boozer,buttercu,hola,minemine,munch,1dragon,biology,bestbuy,bigpoppa,blackout,blowfish,bmw325,bigbob,stream,talisman,tazz,sundevil,3333333,skate,shutup,shanghai,spencer1,slowhand,pinky1,tootie,thecrow,jubilee,jingle,matrix1,manowar,messiah,resident,redbaron,romans,andromed,athlon,beach1,badgers,guitars,harald,harddick,gotribe,6996,7grout,5wr2i7h8,635241,chase1,fallout,fiddle,fenris,francesc,fortuna,fairlane,felix1,gasman,fucks,sahara,sassy1,dogpound,dogbert,divx1,manila,pornporn,quasar,venom,987987,access1,clippers,daman,crusty,nathan1,nnnnnnnn,bruno1,budapest,kittens,kerouac,mother1,waldo1,whistler,whatwhat,wanderer,idontkno,1942,1946,bigdawg,bigpimp,zaqwsx,414141,3000gt,434343,serpent,smurf,pasword,thisisit,john1,robotics,redeye,rebelz,1011,alatam,asians,bama,banzai,harvest,575757,5329,fatty,fender1,flower2,funky,sambo,drummer1,dogcat,oedipus,osama,prozac,private1,rampage,concord,cinema,cornwall,cleaner,ciccio,clutch,corvet07,daemon,bruiser,boiler,hjkl,egghead,mordor,jamess,iverson3,bluesman,zouzou,090909,1002,stone1,4040,sexo,smith1,sperma,sneaky,polska,thewho,terminat,krypton,lekker,johnson1,johann,rockie,aspire,goodie,cheese1,fenway,fishon,fishin,fuckoff1,girls1,doomsday,pornking,ramones,rabbits,transit,aaaaa1,boyz,bookworm,bongo,bunnies,buceta,highbury,henry1,eastern,mischief,mopar,ministry,vienna,wildone,bigbooty,beavis1,xxxxxx1,yogibear,000001,0815,zulu,420000,sigmar,sprout,stalin,lkjhgfds,lagnaf,rolex,redfox,referee,123123123,1231,angus1,ballin,attila,greedy,grunt,747474,carpedie,caramel,foxylady,gatorade,futbol,frosch,saiyan,drums,donner,doggy1,drum,doudou,nutmeg,quebec,valdepen,tosser,tuscl,comein,cola,deadpool,bremen,hotass,hotmail1,eskimo,eggman,koko,kieran,katrin,kordell1,komodo,mone,munich,vvvvvvvv,jackson5,2222222,bergkamp,bigben,zanzibar,xxx123,sunny1,373737,slayer1,snoop,peachy,thecure,little1,jennaj,rasta69,1114,aries,havana,gratis,calgary,checkers,flanker,salope,dirty1,draco,dogface,luv2epus,rainbow6,qwerty123,umpire,turnip,vbnm,tucson,troll,codered,commande,neon,nico,nightwin,boomer1,bushido,hotmail0,enternow,keepout,karen1,mnbv,viewsoni,volcom,wizards,1995,berkeley,woodstoc,tarpon,shinobi,starstar,phat,toolbox,julien,johnny1,joebob,riders,reflex,120676,1235,angelus,anthrax,atlas,grandam,harlem,hawaii50,655321,cabron,challeng,callisto,firewall,firefire,flyer,flower1,gambler,frodo1,sam123,scania,dingo,papito,passmast,ou8123,randy1,twiggy,travis1,treetop,addict,admin1,963852,aceace,cirrus,bobdole,bonjovi,bootsy,boater,elway7,kenny1,moonshin,montag,wayne1,white1,jazzy,jakejake,1994,1991,2828,bluejays,belmont,sensei,southpark,peeper,pharao,pigpen,tomahawk,teensex,leedsutd,jeepster,jimjim,josephin,melons,matthias,robocop,1003,1027,antelope,azsxdc,gordo,hazard,granada,8989,7894,ceasar,cabernet,cheshire,chelle,candy1,fergie,fidelio,giorgio,fuckhead,dominion,qawsed,trucking,chloe1,daddyo,nostromo,boyboy,booster,bucky,honolulu,esquire,dynamite,mollydog,windows1,waffle,wealth,vincent1,jabber,jaguars,javelin,irishman,idefix,bigdog1,blue42,blanked,blue32,biteme1,bearcats,yessir,sylveste,sunfire,tbird,stryker,3ip76k2,sevens,pilgrim,tenchi,titman,leeds,lithium,linkin,marijuan,mariner,markie,midnite,reddwarf,1129,123asd,12312312,allstar,albany,asdf12,aspen,hardball,goldfing,7734,49ers,carnage,callum,carlos1,fitter,fandango,gofast,gamma,fucmy69,scrapper,dogwood,django,magneto,premium,9999999,abc1234,newyear,bookie,bounty,brown1,bologna,elway,killjoy,klondike,mouser,wayer,impreza,insomnia,24682468,2580,24242424,billbill,bellaco,blues1,blunts,teaser,sf49ers,shovel,solitude,spikey,pimpdadd,timeout,toffee,lefty,johndoe,johndeer,mega,manolo,ratman,robin1,1124,1210,1028,1226,babylove,barbados,gramma,646464,carpente,chaos1,fishbone,fireblad,frogs,screamer,scuba1,ducks,doggies,dicky,obsidian,rams,tottenham,aikman,comanche,corolla,cumslut,cyborg,boston1,houdini,helmut,elvisp,keksa12,monty1,wetter,watford,wiseguy,1989,1987,20202020,biatch,beezer,bigguns,blueball,bitchy,wyoming,yankees2,wrestler,stupid1,sealteam,sidekick,simple1,smackdow,sporting,spiral,smeller,plato,tophat,test2,toomuch,jello,junkie,maxim,maxime,meadow,remingto,roofer,124038,1018,1269,1227,123457,arkansas,aramis,beaker,barcelona,baltimor,googoo,goochi,852456,4711,catcher,champ1,fortress,fishfish,firefigh,geezer,rsalinas,samuel1,saigon,scooby1,dick1,doom,dontknow,magpies,manfred,vader1,universa,tulips,mygirl,bowtie,holycow,honeys,enforcer,waterboy,1992,23skidoo,bimbo,blue11,birddog,zildjian,030303,stinker,stoppedby,sexybabe,speakers,slugger,spotty,smoke1,polopolo,perfect1,torpedo,lakeside,jimmys,junior1,masamune,1214,april1,grinch,767676,5252,cherries,chipmunk,cezer121,carnival,capecod,finder,fearless,goats,funstuff,gideon,savior,seabee,sandro,schalke,salasana,disney1,duckman,pancake,pantera1,malice,love123,qwert123,tracer,creation,cwoui,nascar24,hookers,erection,ericsson,edthom,kokoko,kokomo,mooses,inter,1michael,1993,19781978,25252525,shibby,shamus,skibum,sheepdog,sex69,spliff,slipper,spoons,spanner,snowbird,toriamos,temp123,tennesse,lakers1,jomama,mazdarx7,recon,revolver,1025,1101,barney1,babycake,gotham,gravity,hallowee,616161,515000,caca,cannabis,chilli,fdsa,getout,fuck69,gators1,sable,rumble,dolemite,dork,duffer,dodgers1,onions,logger,lookout,magic32,poon,twat,coventry,citroen,civicsi,cocksucker,coochie,compaq1,nancy1,buzzer,boulder,butkus,bungle,hogtied,hotgirls,heidi1,eggplant,mustang6,monkey12,wapapapa,wendy1,volleyba,vibrate,blink,birthday4,xxxxx1,stephen1,suburban,sheeba,start1,soccer10,starcraft,soccer12,peanut1,plastics,penthous,peterbil,tetsuo,torino,tennis1,termite,lemmein,lakewood,jughead,melrose,megane,redone,angela1,goodgirl,gonzo1,golden1,gotyoass,656565,626262,capricor,chains,calvin1,getmoney,gabber,runaway,salami,dungeon,dudedude,opus,paragon,panhead,pasadena,opendoor,odyssey,magellan,printing,prince1,trustme,nono,buffet,hound,kajak,killkill,moto,winner1,vixen,whiteboy,versace,voyager1,indy,jackjack,bigal,beech,biggun,blake1,blue99,big1,synergy,success1,336699,sixty9,shark1,simba1,sebring,spongebo,spunk,springs,sliver,phialpha,password9,pizza1,pookey,tickling,lexingky,lawman,joe123,mike123,romeo1,redheads,apple123,backbone,aviation,green123,carlitos,byebye,cartman1,camden,chewy,camaross,favorite6,forumwp,ginscoot,fruity,sabrina1,devil666,doughnut,pantie,oldone,paintball,lumina,rainbow1,prosper,umbrella,ajax,951753,achtung,abc12345,compact,corndog,deerhunt,darklord,dank,nimitz,brandy1,hetfield,holein1,hillbill,hugetits,evolutio,kenobi,whiplash,wg8e3wjf,istanbul,invis,1996,bigjohn,bluebell,beater,benji,bluejay,xyzzy,suckdick,taichi,stellar,shaker,semper,splurge,squeak,pearls,playball,pooky,titfuck,joemama,johnny5,marcello,maxi,rhubarb,ratboy,reload,1029,1030,1220,bbking,baritone,gryphon,57chevy,494949,celeron,fishy,gladiator,fucker1,roswell,dougie,dicker,diva,donjuan,nympho,racers,truck1,trample,acer,cricket1,climax,denmark,cuervo,notnow,nittany,neutron,bosco1,buffa,breaker,hello2,hydro,kisskiss,kittys,montecar,modem,mississi,20012001,bigdick1,benfica,yahoo1,striper,tabasco,supra,383838,456654,seneca,shuttle,penguin1,pathfind,testibil,thethe,jeter2,marma,mark1,metoo,republic,rollin,redleg,redbone,redskin,1245,anthony7,altoids,barley,asswipe,bauhaus,bbbbbb1,gohome,harrier,golfpro,goldeney,818181,6666666,5000,5rxypn,cameron1,checker,calibra,freefree,faith1,fdm7ed,giraffe,giggles,fringe,scamper,rrpass1,screwyou,dimples,pacino,ontario,passthie,oberon,quest1,postov1000,puppydog,puffer,qwerty7,tribal,adam25,a1234567,collie,cleopatr,davide,namaste,buffalo1,bonovox,bukkake,burner,bordeaux,burly,hun999,enters,mohawk,vgirl,jayden,1812,1943,222333,bigjim,bigd,zoom,wordup,ziggy1,yahooo,workout,young1,xmas,zzzzzz1,surfer1,strife,sunlight,tasha1,skunk,sprinter,peaches1,pinetree,plum,pimping,theforce,thedon,toocool,laddie,lkjh,jupiter1,matty,redrose,1200,102938,antares,austin31,goose1,737373,78945612,789987,6464,calimero,caster,casper1,cement,chevrolet,chessie,caddy,canucks,fellatio,f00tball,gateway2,gamecube,rugby1,scheisse,dshade,dixie1,offshore,lucas1,macaroni,manga,pringles,puff,trouble1,ussy,coolhand,colonial,colt,darthvad,cygnusx1,natalie1,newark,hiking,errors,elcamino,koolaid,knight1,murphy1,volcano,idunno,2005,2233,blueberr,biguns,yamahar1,zapper,zorro1,0911,3006,sixsix,shopper,sextoy,snowboard,speedway,pokey,playboy2,titi,toonarmy,lambda,joecool,juniper,max123,mariposa,met2002,reggae,ricky1,1236,1228,1016,all4one,baberuth,asgard,484848,5683,6669,catnip,charisma,capslock,cashmone,galant,frenchy,gizmodo1,girlies,screwy,doubled,divers,dte4uw,dragonfl,treble,twinkie,tropical,crescent,cococo,dabomb,daffy,dandfa,cyrano,nathanie,boners,helium,hellas,espresso,killa,kikimora,w4g8at,ilikeit,iforget,1944,20002000,birthday1,beatles1,blue1,bigdicks,beethove,blacklab,blazers,benny1,woodwork,0069,0101,taffy,4567,shodan,pavlov,pinnacle,petunia,tito,teenie,lemonade,lalakers,lebowski,lalalala,ladyboy,jeeper,joyjoy,mercury1,mantle,mannn,rocknrol,riversid,123aaa,11112222,121314,1021,1004,1120,allen1,ambers,amstel,alice1,alleycat,allegro,ambrosia,gspot,goodsex,hattrick,harpoon,878787,8inches,4wwvte,cassandr,charlie123,gatsby,generic,gareth,fuckme2,samm,seadog,satchmo,scxakv,santafe,dipper,outoutout,madmad,london1,qbg26i,pussy123,tzpvaw,vamp,comp,cowgirl,coldplay,dawgs,nt5d27,novifarm,notredam,newness,mykids,bryan1,bouncer,hihihi,honeybee,iceman1,hotlips,dynamo,kappa,kahlua,muffy,mizzou,wannabe,wednesda,whatup,waterfal,willy1,bear1,billabon,youknow,yyyyyy1,zachary1,01234567,070462,zurich,superstar,stiletto,strat,427900,sigmachi,shells,sexy123,smile1,sophie1,stayout,somerset,playmate,pinkfloyd,phish1,payday,thebear,telefon,laetitia,kswbdu,jerky,metro,revoluti,1216,1201,1204,1222,1115,archange,barry1,handball,676767,chewbacc,furball,gocubs,fullback,gman,dewalt,dominiqu,diver1,dhip6a,olemiss,mandrake,mangos,pretzel,pusssy,tripleh,vagabond,clovis,dandan,csfbr5yy,deadspin,ninguna,ncc74656,bootsie,bp2002,bourbon,bumble,heyyou,houston1,hemlock,hippo,hornets,horseman,excess,extensa,muffin1,virginie,werdna,idontknow,jack1,1bitch,151nxjmt,bendover,bmwbmw,zaq123,wxcvbn,supernov,tahoe,shakur,sexyone,seviyi,smart1,speed1,pepito,phantom1,playoffs,terry1,terrier,laser1,lite,lancia,johngalt,jenjen,midori,maserati,matteo,miami1,riffraff,ronald1,1218,1026,123987,1015,1103,armada,architec,austria,gotmilk,cambridg,camero,flex,foreplay,getoff,glacier,glotest,froggie,gerbil,rugger,sanity72,donna1,orchard,oyster,palmtree,pajero,m5wkqf,magenta,luckyone,treefrog,vantage,usmarine,tyvugq,uptown,abacab,aaaaaa1,chuck1,darkange,cyclones,navajo,bubba123,iawgk2,hrfzlz,dylan1,enrico,encore,eclipse1,mutant,mizuno,mustang2,video1,viewer,weed420,whales,jaguar1,1990,159159,1love,bears1,bigtruck,bigboss,blitz,xqgann,yeahyeah,zeke,zardoz,stickman,3825,sentra,shiva,skipper1,singapor,southpaw,sonora,squid,slamdunk,slimjim,placid,photon,placebo,pearl1,test12,therock1,tiger123,leinad,legman,jeepers,joeblow,mike23,redcar,rhinos,rjw7x4,1102,13576479,112211,gwju3g,greywolf,7bgiqk,7878,535353,4snz9g,candyass,cccccc1,catfight,cali,fister,fosters,finland,frankie1,gizzmo,royalty,rugrat,dodo,oemdlg,out3xf,paddy,opennow,puppy1,qazwsxedc,ramjet,abraxas,cn42qj,dancer1,death666,nudity,nimda2k,buick,bobb,braves1,henrik,hooligan,everlast,karachi,mortis,monies,motocros,wally1,willie1,inspiron,1test,2929,bigblack,xytfu7,yackwin,zaq1xsw2,yy5rbfsc,100100,0660,tahiti,takehana,332211,3535,sedona,seawolf,skydiver,spleen,slash,spjfet,special1,slimshad,sopranos,spock1,penis1,patches1,thierry,thething,toohot,limpone,mash4077,matchbox,masterp,maxdog,ribbit,rockin,redhat,1113,14789632,1331,allday,aladin,andrey,amethyst,baseball1,athome,goofy1,greenman,goofball,ha8fyp,goodday,778899,charon,chappy,caracas,cardiff,capitals,canada1,cajun,catter,freddy1,favorite2,forme,forsaken,feelgood,gfxqx686,saskia,sanjose,salsa,dilbert1,dukeduke,downhill,longhair,locutus,lockdown,malachi,mamacita,lolipop,rainyday,pumpkin1,punker,prospect,rambo1,rainbows,quake,trinity1,trooper1,citation,coolcat,default,deniro,d9ungl,daddys,nautica,nermal,bukowski,bubbles1,bogota,buds,hulk,hitachi,ender,export,kikiki,kcchiefs,kram,morticia,montrose,mongo,waqw3p,wizzard,whdbtp,whkzyc,154ugeiu,1fuck,binky,bigred1,blubber,becky1,year2005,wonderfu,xrated,0001,tampabay,survey,tammy1,stuffer,3mpz4r,3000,3some,sierra1,shampoo,shyshy,slapnuts,standby,spartan1,sprocket,stanley1,poker1,theshit,lavalamp,light1,laserjet,jediknig,jjjjj1,mazda626,menthol,margaux,medic1,rhino1,1209,1234321,amigos,apricot,asdfgh1,hairball,hatter,grimace,7xm5rq,6789,cartoons,capcom,cashflow,carrots,fanatic,format,girlie,safeway,dogfart,dondon,outsider,odin,opiate,lollol,love12,mallrats,prague,primetime21,pugsley,r29hqq,valleywa,airman,abcdefg1,darkone,cummer,natedogg,nineball,ndeyl5,natchez,newone,normandy,nicetits,buddy123,buddys,homely,husky,iceland,hr3ytm,highlife,holla,earthlin,exeter,eatmenow,kimkim,k2trix,kernel,money123,moonman,miles1,mufasa,mousey,whites,warhamme,jackass1,2277,20spanks,blobby,blinky,bikers,blackjack,becca,blue23,xman,wyvern,085tzzqi,zxzxzx,zsmj2v,suede,t26gn4,sugars,tantra,swoosh,4226,4271,321123,383pdjvl,shane1,shelby1,spades,smother,sparhawk,pisser,photo1,pebble,peavey,pavement,thistle,kronos,lilbit,linux,melanie1,marbles,redlight,1208,1138,1008,alchemy,aolsucks,alexalex,atticus,auditt,b929ezzh,goodyear,gubber,863abgsg,7474,797979,464646,543210,4zqauf,4949,ch5nmk,carlito,chewey,carebear,checkmat,cheddar,chachi,forgetit,forlife,giants1,getit,gerhard,galileo,g3ujwg,ganja,rufus1,rushmore,discus,dudeman,olympus,oscars,osprey,madcow,locust,loyola,mammoth,proton,rabbit1,ptfe3xxp,pwxd5x,purple1,punkass,prophecy,uyxnyd,tyson1,aircraft,access99,abcabc,colts,civilwar,claudia1,contour,dddddd1,cypher,dapzu455,daisydog,noles,hoochie,hoser,eldiablo,kingrich,mudvayne,motown,mp8o6d,vipergts,italiano,2055,2211,bloke,blade1,yamato,zooropa,yqlgr667,050505,zxcvbnm1,zw6syj,suckcock,tango1,swampy,445566,333666,380zliki,sexpot,sexylady,sixtynin,sickboy,spiffy,skylark,sparkles,pintail,phreak,teller,timtim,thighs,latex,letsdoit,lkjhg,landmark,lizzard,marlins,marauder,metal1,manu,righton,1127,alain,alcat,amigo,basebal1,azertyui,azrael,hamper,gotenks,golfgti,hawkwind,h2slca,grace1,6chid8,789654,canine,casio,cazzo,cbr900,cabrio,calypso,capetown,feline,flathead,fisherma,flipmode,fungus,g9zns4,giggle,gabriel1,fuck123,saffron,dogmeat,dreamcas,dirtydog,douche,dresden,dickdick,destiny1,pappy,oaktree,luft4,puta,ramada,trumpet1,vcradq,tulip,tracy71,tycoon,aaaaaaa1,conquest,chitown,creepers,cornhole,danman,dada,density,d9ebk7,darth,nirvana1,nestle,brenda1,bonanza,hotspur,hufmqw,electro,erasure,elisabet,etvww4,ewyuza,eric1,kenken,kismet,klaatu,milamber,willi,isacs155,igor,1million,1letmein,x35v8l,yogi,ywvxpz,xngwoj,zippy1,020202,****,stonewal,sentry,sexsexsex,sonysony,smirnoff,star12,solace,star1,pkxe62,pilot1,pommes,paulpaul,tical,tictac,lighthou,lemans,kubrick,letmein22,letmesee,jys6wz,jonesy,jjjjjj1,jigga,redstorm,riley1,14141414,1126,allison1,badboy1,asthma,auggie,hardwood,gumbo,616913,57np39,56qhxs,4mnveh,fatluvr69,fqkw5m,fidelity,feathers,fresno,godiva,gecko,gibson1,gogators,general1,saxman,rowing,sammys,scotts,scout1,sasasa,samoht,dragon69,ducky,dragonball,driller,p3wqaw,papillon,oneone,openit,optimist,longshot,rapier,pussy2,ralphie,tuxedo,undertow,copenhag,delldell,culinary,deltas,mytime,noname,noles1,bucker,bopper,burnout,ibilltes,hihje863,hitter,ekim,espana,eatme69,elpaso,express1,eeeeee1,eatme1,karaoke,mustang5,wellingt,willem,waterski,webcam,jasons,infinite,iloveyou!,jakarta,belair,bigdad,beerme,yoshi,yinyang,x24ik3,063dyjuy,0000007,ztmfcq,stopit,stooges,symow8,strato,2hot4u,skins,shakes,sex1,snacks,softtail,slimed123,pizzaman,tigercat,tonton,lager,lizzy,juju,john123,jesse1,jingles,martian,mario1,rootedit,rochard,redwine,requiem,riverrat,1117,1014,1205,amor,amiga,alpina,atreides,banana1,bahamut,golfman,happines,7uftyx,5432,5353,5151,4747,foxfire,ffvdj474,foreskin,gayboy,gggggg1,gameover,glitter,funny1,scoobydoo,saxophon,dingbat,digimon,omicron,panda1,loloxx,macintos,lululu,lollypop,racer1,queen1,qwertzui,upnfmc,tyrant,trout1,9skw5g,aceman,acls2h,aaabbb,acapulco,aggie,comcast,cloudy,cq2kph,d6o8pm,cybersex,davecole,darian,crumbs,davedave,dasani,mzepab,myporn,narnia,booger1,bravo1,budgie,btnjey,highlander,hotel6,humbug,ewtosi,kristin1,kobe,knuckles,keith1,katarina,muff,muschi,montana1,wingchun,wiggle,whatthe,vette1,vols,virago,intj3a,ishmael,jachin,illmatic,199999,2010,blender,bigpenis,bengal,blue1234,zaqxsw,xray,xxxxxxx1,zebras,yanks,tadpole,stripes,3737,4343,3728,4444444,368ejhih,solar,sonne,sniffer,sonata,squirts,playstation,pktmxr,pescator,texaco,lesbos,l8v53x,jo9k2jw2,jimbeam,jimi,jupiter2,jurassic,marines1,rocket1,14725836,12345679,1219,123098,1233,alessand,althor,arch,alpha123,basher,barefeet,balboa,bbbbb1,badabing,gopack,golfnut,gsxr1000,gregory1,766rglqy,8520,753159,8dihc6,69camaro,666777,cheeba,chino,cheeky,camel1,fishcake,flubber,gianni,gnasher23,frisbee,fuzzy1,fuzzball,save13tx,russell1,sandra1,scrotum,scumbag,sabre,samdog,dripping,dragon12,dragster,orwell,mainland,maine,qn632o,poophead,rapper,porn4life,rapunzel,velocity,vanessa1,trueblue,vampire1,abacus,902100,crispy,chooch,d6wnro,dabulls,dehpye,navyseal,njqcw4,nownow,nigger1,nightowl,nonenone,nightmar,bustle,buddy2,boingo,bugman,bosshog,hybrid,hillside,hilltop,hotlegs,hzze929b,hhhhh1,hellohel,evilone,edgewise,e5pftu,eded,embalmer,excalibur,elefant,kenzie,killah,kleenex,mouses,mounta1n,motors,mutley,muffdive,vivitron,w00t88,iloveit,jarjar,incest,indycar,17171717,1664,17011701,222777,2663,beelch,benben,yitbos,yyyyy1,zzzzz1,stooge,tangerin,taztaz,stewart1,summer69,system1,surveyor,stirling,3qvqod,3way,456321,sizzle,simhrq,sparty,ssptx452,sphere,persian,ploppy,pn5jvw,poobear,pianos,plaster,testme,tiff,thriller,master12,rockey,1229,1217,1478,1009,anastasi,amonra,argentin,albino,azazel,grinder,6uldv8,83y6pv,8888888,4tlved,515051,carsten,flyers88,ffffff1,firehawk,firedog,flashman,ggggg1,godspeed,galway,giveitup,funtimes,gohan,giveme,geryfe,frenchie,sayang,rudeboy,sandals,dougal,drag0n,dga9la,desktop,onlyone,otter,pandas,mafia,luckys,lovelife,manders,qqh92r,qcmfd454,radar1,punani,ptbdhw,turtles,undertaker,trs8f7,ugejvp,abba,911turbo,acdc,abcd123,crash1,colony,delboy,davinci,notebook,nitrox,borabora,bonzai,brisbane,heeled,hooyah,hotgirl,i62gbq,horse1,hpk2qc,epvjb6,mnbvc,mommy1,munster,wiccan,2369,bettyboo,blondy,bismark,beanbag,bjhgfi,blackice,yvtte545,ynot,yess,zlzfrh,wolvie,007bond,******,tailgate,tanya1,sxhq65,stinky1,3234412,3ki42x,seville,shimmer,sienna,shitshit,skillet,sooners1,solaris,smartass,pedros,pennywis,pfloyd,tobydog,thetruth,letme1n,mario66,micky,rocky2,rewq,reindeer,1128,1207,1104,1432,aprilia,allstate,bagels,baggies,barrage,guru,72d5tn,606060,4wcqjn,chance1,flange,fartman,geil,gbhcf2,fussball,fuaqz4,gameboy,geneviev,rotary,seahawk,saab,samadams,devlt4,ditto,drevil,drinker,deuce,dipstick,octopus,ottawa,losangel,loverman,porky,q9umoz,rapture,pussy4me,triplex,ue8fpw,turbos,aaa340,churchil,crazyman,cutiepie,ddddd1,dejavu,cuxldv,nbvibt,nikon,niko,nascar1,bubba2,boobear,boogers,bullwink,bulldawg,horsemen,escalade,eagle2,dynamic,efyreg,minnesot,mogwai,msnxbi,mwq6qlzo,werder,verygood,voodoo1,iiiiii1,159951,1624,1911a1,2244,bellagio,bedlam,belkin,bill1,xirt2k,??????,susieq,sundown,sukebe,swifty,2fast4u,sexe,shroom,seaweed,skeeter1,snicker,spanky1,spook,phaedrus,pilots,peddler,thumper1,tiger7,tmjxn151,thematri,l2g7k3,letmeinn,jeffjeff,johnmish,mantra,mike69,mazda6,riptide,robots,1107,1130,142857,11001001,1134,armored,allnight,amatuers,bartok,astral,baboon,balls1,bassoon,hcleeb,happyman,granite,graywolf,golf1,gomets,8vjzus,7890,789123,8uiazp,5757,474jdvff,551scasi,50cent,camaro1,cherry1,chemist,firenze,fishtank,freewill,glendale,frogfrog,ganesh,scirocco,devilman,doodles,okinawa,olympic,orpheus,ohmygod,paisley,pallmall,lunchbox,manhatta,mahalo,mandarin,qwqwqw,qguvyt,pxx3eftp,rambler,poppy1,turk182,vdlxuc,tugboat,valiant,uwrl7c,chris123,cmfnpu,decimal,debbie1,dandy,daedalus,natasha1,nissan1,nancy123,nevermin,napalm,newcastle,bonghit,ibxnsm,hhhhhh1,holger,edmonton,equinox,dvader,kimmy,knulla,mustafa,monsoon,mistral,morgana,monica1,mojave,monterey,mrbill,vkaxcs,victor1,violator,vfdhif,wilson1,wavpzt,wildstar,winter99,iqzzt580,imback,1914,19741974,1monkey,1q2w3e4r5t,2500,2255,bigshow,bigbucks,blackcoc,zoomer,wtcacq,wobble,xmen,xjznq5,yesterda,yhwnqc,zzzxxx,393939,2fchbg,skinhead,skilled,shadow12,seaside,sinful,silicon,smk7366,snapshot,sniper1,soccer11,smutty,peepers,plokij,pdiddy,pimpdaddy,thrust,terran,topaz,today1,lionhear,littlema,lauren1,lincoln1,lgnu9d,juneau,methos,rogue1,romulus,redshift,1202,1469,12locked,arizona1,alfarome,al9agd,aol123,altec,apollo1,arse,baker1,bbb747,axeman,astro1,hawthorn,goodfell,hawks1,gstring,hannes,8543852,868686,4ng62t,554uzpad,5401,567890,5232,catfood,fire1,flipflop,fffff1,fozzie,fluff,fzappa,rustydog,scarab,satin,ruger,samsung1,destin,diablo2,dreamer1,detectiv,doqvq3,drywall,paladin1,papabear,offroad,panasonic,nyyankee,luetdi,qcfmtz,pyf8ah,puddles,pussyeat,ralph1,princeto,trivia,trewq,tri5a3,advent,9898,agyvorc,clarkie,coach1,courier,christo,chowder,cyzkhw,davidb,dad2ownu,daredevi,de7mdf,nazgul,booboo1,bonzo,butch1,huskers1,hgfdsa,hornyman,elektra,england1,elodie,kermit1,kaboom,morten,mocha,monday1,morgoth,weewee,weenie,vorlon,wahoo,ilovegod,insider,jayman,1911,1dallas,1900,1ranger,201jedlz,2501,1qaz,bignuts,bigbad,beebee,billows,belize,wvj5np,wu4etd,yamaha1,wrinkle5,zebra1,yankee1,zoomzoom,09876543,0311,?????,stjabn,tainted,3tmnej,skooter,skelter,starlite,spice1,stacey1,smithy,pollux,peternorth,pixie,piston,poets,toons,topspin,kugm7b,legends,jeepjeep,joystick,junkmail,jojojojo,jonboy,midland,mayfair,riches,reznor,rockrock,reboot,renee1,roadway,rasta220,1411,1478963,1019,archery,andyandy,barks,bagpuss,auckland,gooseman,hazmat,gucci,grammy,happydog,7kbe9d,7676,6bjvpe,5lyedn,5858,5291,charlie2,c7lrwu,candys,chateau,ccccc1,cardinals,fihdfv,fortune12,gocats,gaelic,fwsadn,godboy,gldmeo,fx3tuo,fubar1,generals,gforce,rxmtkp,rulz,sairam,dunhill,dogggg,ozlq6qwm,ov3ajy,lockout,makayla,macgyver,mallorca,prima,pvjegu,qhxbij,prelude1,totoro,tusymo,trousers,tulane,turtle1,tracy1,aerosmit,abbey1,clticic,cooper1,comets,delpiero,cyprus,dante1,dave1,nounours,nexus6,nogard,norfolk,brent1,booyah,bootleg,bulls23,bulls1,booper,heretic,icecube,hellno,hounds,honeydew,hooters1,hoes,hevnm4,hugohugo,epson,evangeli,eeeee1,eyphed".split(","))),
+r("english",q("you,i,to,the,a,and,that,it,of,me,what,is,in,this,know,i'm,for,no,have,my,don't,just,not,do,be,on,your,was,we,it's,with,so,but,all,well,are,he,oh,about,right,you're,get,here,out,going,like,yeah,if,her,she,can,up,want,think,that's,now,go,him,at,how,got,there,one,did,why,see,come,good,they,really,as,would,look,when,time,will,okay,back,can't,mean,tell,i'll,from,hey,were,he's,could,didn't,yes,his,been,or,something,who,because,some,had,then,say,ok,take,an,way,us,little,make,need,gonna,never,we're,too,she's,i've,sure,them,more,over,our,sorry,where,what's,let,thing,am,maybe,down,man,has,uh,very,by,there's,should,anything,said,much,any,life,even,off,doing,thank,give,only,thought,help,two,talk,people,god,still,wait,into,find,nothing,again,things,let's,doesn't,call,told,great,before,better,ever,night,than,away,first,believe,other,feel,everything,work,you've,fine,home,after,last,these,day,keep,does,put,around,stop,they're,i'd,guy,isn't,always,listen,wanted,mr,guys,huh,those,big,lot,happened,thanks,won't,trying,kind,wrong,through,talking,made,new,being,guess,hi,care,bad,mom,remember,getting,we'll,together,dad,leave,place,understand,wouldn't,actually,hear,baby,nice,father,else,stay,done,wasn't,their,course,might,mind,every,enough,try,hell,came,someone,you'll,own,family,whole,another,house,yourself,idea,ask,best,must,coming,old,looking,woman,which,years,room,left,knew,tonight,real,son,hope,name,same,went,um,hmm,happy,pretty,saw,girl,sir,show,friend,already,saying,next,three,job,problem,minute,found,world,thinking,haven't,heard,honey,matter,myself,couldn't,exactly,having,ah,probably,happen,we've,hurt,boy,both,while,dead,gotta,alone,since,excuse,start,kill,hard,you'd,today,car,ready,until,without,wants,hold,wanna,yet,seen,deal,took,once,gone,called,morning,supposed,friends,head,stuff,most,used,worry,second,part,live,truth,school,face,forget,true,business,each,cause,soon,knows,few,telling,wife,who's,use,chance,run,move,anyone,person,bye,somebody,dr,heart,such,miss,married,point,later,making,meet,anyway,many,phone,reason,damn,lost,looks,bring,case,turn,wish,tomorrow,kids,trust,check,change,end,late,anymore,five,least,town,aren't,ha,working,year,makes,taking,means,brother,play,hate,ago,says,beautiful,gave,fact,crazy,party,sit,open,afraid,between,important,rest,fun,kid,word,watch,glad,everyone,days,sister,minutes,everybody,bit,couple,whoa,either,mrs,feeling,daughter,wow,gets,asked,under,break,promise,door,set,close,hand,easy,question,tried,far,walk,needs,mine,though,times,different,killed,hospital,anybody,alright,wedding,shut,able,die,perfect,stand,comes,hit,story,ya,mm,waiting,dinner,against,funny,husband,almost,pay,answer,four,office,eyes,news,child,shouldn't,half,side,yours,moment,sleep,read,where's,started,men,sounds,sonny,pick,sometimes,em,bed,also,date,line,plan,hours,lose,hands,serious,behind,inside,high,ahead,week,wonderful,fight,past,cut,quite,number,he'll,sick,it'll,game,eat,nobody,goes,along,save,seems,finally,lives,worried,upset,carly,met,book,brought,seem,sort,safe,living,children,weren't,leaving,front,shot,loved,asking,running,clear,figure,hot,felt,six,parents,drink,absolutely,how's,daddy,alive,sense,meant,happens,special,bet,blood,ain't,kidding,lie,full,meeting,dear,seeing,sound,fault,water,ten,women,buy,months,hour,speak,lady,jen,thinks,christmas,body,order,outside,hang,possible,worse,company,mistake,ooh,handle,spend,totally,giving,control,here's,marriage,realize,president,unless,sex,send,needed,taken,died,scared,picture,talked,ass,hundred,changed,completely,explain,playing,certainly,sign,boys,relationship,loves,hair,lying,choice,anywhere,future,weird,luck,she'll,turned,known,touch,kiss,crane,questions,obviously,wonder,pain,calling,somewhere,throw,straight,cold,fast,words,food,none,drive,feelings,they'll,worked,marry,light,drop,cannot,sent,city,dream,protect,twenty,class,surprise,its,sweetheart,poor,looked,mad,except,gun,y'know,dance,takes,appreciate,especially,situation,besides,pull,himself,hasn't,act,worth,sheridan,amazing,top,given,expect,rather,involved,swear,piece,busy,law,decided,happening,movie,we'd,catch,country,less,perhaps,step,fall,watching,kept,darling,dog,win,air,honor,personal,moving,till,admit,problems,murder,he'd,evil,definitely,feels,information,honest,eye,broke,missed,longer,dollars,tired,evening,human,starting,red,entire,trip,club,niles,suppose,calm,imagine,fair,caught,blame,street,sitting,favor,apartment,court,terrible,clean,learn,works,frasier,relax,million,accident,wake,prove,smart,message,missing,forgot,interested,table,nbsp,become,mouth,pregnant,middle,ring,careful,shall,team,ride,figured,wear,shoot,stick,follow,angry,instead,write,stopped,early,ran,war,standing,forgive,jail,wearing,kinda,lunch,cristian,eight,greenlee,gotten,hoping,phoebe,thousand,ridge,paper,tough,tape,state,count,boyfriend,proud,agree,birthday,seven,they've,history,share,offer,hurry,feet,wondering,decision,building,ones,finish,voice,herself,would've,list,mess,deserve,evidence,cute,dress,interesting,hotel,quiet,concerned,road,staying,beat,sweetie,mention,clothes,finished,fell,neither,mmm,fix,respect,spent,prison,attention,holding,calls,near,surprised,bar,keeping,gift,hadn't,putting,dark,self,owe,using,ice,helping,normal,aunt,lawyer,apart,certain,plans,jax,girlfriend,floor,whether,everything's,present,earth,box,cover,judge,upstairs,sake,mommy,possibly,worst,station,acting,accept,blow,strange,saved,conversation,plane,mama,yesterday,lied,quick,lately,stuck,report,difference,rid,store,she'd,bag,bought,doubt,listening,walking,cops,deep,dangerous,buffy,sleeping,chloe,rafe,shh,record,lord,moved,join,card,crime,gentlemen,willing,window,return,walked,guilty,likes,fighting,difficult,soul,joke,favorite,uncle,promised,public,bother,island,seriously,cell,lead,knowing,broken,advice,somehow,paid,losing,push,helped,killing,usually,earlier,boss,beginning,liked,innocent,doc,rules,cop,learned,thirty,risk,letting,speaking,officer,ridiculous,support,afternoon,born,apologize,seat,nervous,across,song,charge,patient,boat,how'd,hide,detective,planning,nine,huge,breakfast,horrible,age,awful,pleasure,driving,hanging,picked,sell,quit,apparently,dying,notice,congratulations,chief,one's,month,visit,could've,c'mon,letter,decide,double,sad,press,forward,fool,showed,smell,seemed,spell,memory,pictures,slow,seconds,hungry,board,position,hearing,roz,kitchen,ma'am,force,fly,during,space,should've,realized,experience,kick,others,grab,mother's,discuss,third,cat,fifty,responsible,fat,reading,idiot,yep,suddenly,agent,destroy,bucks,track,shoes,scene,peace,arms,demon,low,livvie,consider,papers,medical,incredible,witch,drunk,attorney,tells,knock,ways,gives,department,nose,skye,turns,keeps,jealous,drug,sooner,cares,plenty,extra,tea,won,attack,ground,whose,outta,weekend,matters,wrote,type,father's,gosh,opportunity,impossible,books,waste,pretend,named,jump,eating,proof,complete,slept,career,arrest,breathe,perfectly,warm,pulled,twice,easier,goin,dating,suit,romantic,drugs,comfortable,finds,checked,fit,divorce,begin,ourselves,closer,ruin,although,smile,laugh,treat,god's,fear,what'd,guy's,otherwise,excited,mail,hiding,cost,stole,pacey,noticed,fired,excellent,lived,bringing,pop,bottom,note,sudden,bathroom,flight,honestly,sing,foot,games,remind,bank,charges,witness,finding,places,tree,dare,hardly,that'll,interest,steal,silly,contact,teach,shop,plus,colonel,fresh,trial,invited,roll,radio,reach,heh,choose,emergency,dropped,credit,obvious,cry,locked,loving,positive,nuts,agreed,prue,goodbye,condition,guard,fuckin,grow,cake,mood,dad's,total,crap,crying,belong,lay,partner,trick,pressure,ohh,arm,dressed,cup,lies,bus,taste,neck,south,something's,nurse,raise,lots,carry,group,whoever,drinking,they'd,breaking,file,lock,wine,closed,writing,spot,paying,study,assume,asleep,man's,turning,legal,viki,bedroom,shower,nikolas,camera,fill,reasons,forty,bigger,nope,breath,doctors,pants,level,movies,gee,area,folks,ugh,continue,focus,wild,truly,desk,convince,client,threw,band,hurts,spending,allow,grand,answers,shirt,chair,allowed,rough,doin,sees,government,ought,empty,round,hat,wind,shows,aware,dealing,pack,meaning,hurting,ship,subject,guest,mom's,pal,match,arrested,salem,confused,surgery,expecting,deacon,unfortunately,goddamn,lab,passed,bottle,beyond,whenever,pool,opinion,held,common,starts,jerk,secrets,falling,played,necessary,barely,dancing,health,tests,copy,cousin,planned,dry,ahem,twelve,simply,tess,skin,often,fifteen,speech,names,issue,orders,nah,final,results,code,believed,complicated,umm,research,nowhere,escape,biggest,restaurant,grateful,usual,burn,address,within,someplace,screw,everywhere,train,film,regret,goodness,mistakes,details,responsibility,suspect,corner,hero,dumb,terrific,further,gas,whoo,hole,memories,o'clock,following,ended,nobody's,teeth,ruined,split,airport,bite,stenbeck,older,liar,showing,project,cards,desperate,themselves,pathetic,damage,spoke,quickly,scare,marah,afford,vote,settle,mentioned,due,stayed,rule,checking,tie,hired,upon,heads,concern,blew,natural,alcazar,champagne,connection,tickets,happiness,form,saving,kissing,hated,personally,suggest,prepared,build,leg,onto,leaves,downstairs,ticket,it'd,taught,loose,holy,staff,sea,duty,convinced,throwing,defense,kissed,legs,according,loud,practice,saturday,babies,army,where'd,warning,miracle,carrying,flying,blind,ugly,shopping,hates,someone's,sight,bride,coat,account,states,clearly,celebrate,brilliant,wanting,add,forrester,lips,custody,center,screwed,buying,size,toast,thoughts,student,stories,however,professional,reality,birth,lexie,attitude,advantage,grandfather,sami,sold,opened,grandma,beg,changes,someday,grade,roof,brothers,signed,ahh,marrying,powerful,grown,grandmother,fake,opening,expected,eventually,must've,ideas,exciting,covered,familiar,bomb,bout,television,harmony,color,heavy,schedule,records,capable,practically,including,correct,clue,forgotten,immediately,appointment,social,nature,deserves,threat,bloody,lonely,ordered,shame,local,jacket,hook,destroyed,scary,investigation,above,invite,shooting,port,lesson,criminal,growing,caused,victim,professor,followed,funeral,nothing's,considering,burning,strength,loss,view,gia,sisters,everybody's,several,pushed,written,somebody's,shock,pushing,heat,chocolate,greatest,miserable,corinthos,nightmare,brings,zander,character,became,famous,enemy,crash,chances,sending,recognize,healthy,boring,feed,engaged,percent,headed,lines,treated,purpose,knife,rights,drag,san,fan,badly,hire,paint,pardon,built,behavior,closet,warn,gorgeous,milk,survive,forced,operation,offered,ends,dump,rent,remembered,lieutenant,trade,thanksgiving,rain,revenge,physical,available,program,prefer,baby's,spare,pray,disappeared,aside,statement,sometime,meat,fantastic,breathing,laughing,itself,tip,stood,market,affair,ours,depends,main,protecting,jury,national,brave,large,jack's,interview,fingers,murdered,explanation,process,picking,based,style,pieces,blah,assistant,stronger,aah,pie,handsome,unbelievable,anytime,nearly,shake,everyone's,oakdale,cars,wherever,serve,pulling,points,medicine,facts,waited,lousy,circumstances,stage,disappointed,weak,trusted,license,nothin,community,trash,understanding,slip,cab,sounded,awake,friendship,stomach,weapon,threatened,mystery,official,regular,river,vegas,understood,contract,race,basically,switch,frankly,issues,cheap,lifetime,deny,painting,ear,clock,weight,garbage,why'd,tear,ears,dig,selling,setting,indeed,changing,singing,tiny,particular,draw,decent,avoid,messed,filled,touched,score,people's,disappear,exact,pills,kicked,harm,recently,fortune,pretending,raised,insurance,fancy,drove,cared,belongs,nights,shape,lorelai,base,lift,stock,sonny's,fashion,timing,guarantee,chest,bridge,woke,source,patients,theory,original,burned,watched,heading,selfish,oil,drinks,failed,period,doll,committed,elevator,freeze,noise,exist,science,pair,edge,wasting,sat,ceremony,pig,uncomfortable,peg,guns,staring,files,bike,weather,name's,mostly,stress,permission,arrived,thrown,possibility,example,borrow,release,ate,notes,hoo,library,property,negative,fabulous,event,doors,screaming,xander,term,what're,meal,fellow,apology,anger,honeymoon,wet,bail,parking,non,protection,fixed,families,chinese,campaign,map,wash,stolen,sensitive,stealing,chose,lets,comfort,worrying,whom,pocket,mateo,bleeding,students,shoulder,ignore,fourth,neighborhood,fbi,talent,tied,garage,dies,demons,dumped,witches,training,rude,crack,model,bothering,radar,grew,remain,soft,meantime,gimme,connected,kinds,cast,sky,likely,fate,buried,hug,brother's,concentrate,prom,messages,east,unit,intend,crew,ashamed,somethin,manage,guilt,weapons,terms,interrupt,guts,tongue,distance,conference,treatment,shoe,basement,sentence,purse,glasses,cabin,universe,towards,repeat,mirror,wound,travers,tall,reaction,odd,engagement,therapy,letters,emotional,runs,magazine,jeez,decisions,soup,daughter's,thrilled,society,managed,stake,chef,moves,extremely,entirely,moments,expensive,counting,shots,kidnapped,square,son's,cleaning,shift,plate,impressed,smells,trapped,male,tour,aidan,knocked,charming,attractive,argue,puts,whip,language,embarrassed,settled,package,laid,animals,hitting,disease,bust,stairs,alarm,pure,nail,nerve,incredibly,walks,dirt,stamp,sister's,becoming,terribly,friendly,easily,damned,jobs,suffering,disgusting,stopping,deliver,riding,helps,federal,disaster,bars,dna,crossed,rate,create,trap,claim,california,talks,eggs,effect,chick,threatening,spoken,introduce,confession,embarrassing,bags,impression,gate,year's,reputation,attacked,among,knowledge,presents,inn,europe,chat,suffer,argument,talkin,crowd,homework,fought,coincidence,cancel,accepted,rip,pride,solve,hopefully,pounds,pine,mate,illegal,generous,streets,con,separate,outfit,maid,bath,punch,mayor,freaked,begging,recall,enjoying,bug,woman's,prepare,parts,wheel,signal,direction,defend,signs,painful,yourselves,rat,maris,amount,that'd,suspicious,flat,cooking,button,warned,sixty,pity,parties,crisis,coach,row,yelling,leads,awhile,pen,confidence,offering,falls,image,farm,pleased,panic,hers,gettin,role,refuse,determined,hell's,grandpa,progress,testify,passing,military,choices,uhh,gym,cruel,wings,bodies,mental,gentleman,coma,cutting,proteus,guests,girl's,expert,benefit,faces,cases,led,jumped,toilet,secretary,sneak,mix,firm,halloween,agreement,privacy,dates,anniversary,smoking,reminds,pot,created,twins,swing,successful,season,scream,considered,solid,options,commitment,senior,ill,else's,crush,ambulance,wallet,discovered,officially,til,rise,reached,eleven,option,laundry,former,assure,stays,skip,fail,accused,wide,challenge,popular,learning,discussion,clinic,plant,exchange,betrayed,bro,sticking,university,members,lower,bored,mansion,soda,sheriff,suite,handled,busted,senator,load,happier,younger,studying,romance,procedure,ocean,section,sec,commit,assignment,suicide,minds,swim,ending,bat,yell,llanview,league,chasing,seats,proper,command,believes,humor,hopes,fifth,winning,solution,leader,theresa's,sale,lawyers,nor,material,latest,highly,escaped,audience,parent,tricks,insist,dropping,cheer,medication,higher,flesh,district,routine,century,shared,sandwich,handed,false,beating,appear,warrant,family's,awfully,odds,article,treating,thin,suggesting,fever,sweat,silent,specific,clever,sweater,request,prize,mall,tries,mile,fully,estate,union,sharing,assuming,judgment,goodnight,divorced,despite,surely,steps,jet,confess,math,listened,comin,answered,vulnerable,bless,dreaming,rooms,chip,zero,potential,pissed,nate,kills,tears,knees,chill,carly's,brains,agency,harvard,degree,unusual,wife's,joint,packed,dreamed,cure,covering,newspaper,lookin,coast,grave,egg,direct,cheating,breaks,quarter,mixed,locker,husband's,gifts,awkward,toy,thursday,rare,policy,kid's,joking,competition,classes,assumed,reasonable,dozen,curse,quartermaine,millions,dessert,rolling,detail,alien,served,delicious,closing,vampires,released,ancient,wore,value,tail,secure,salad,murderer,hits,toward,spit,screen,offense,dust,conscience,bread,answering,admitted,lame,invitation,grief,smiling,path,stands,bowl,pregnancy,hollywood,prisoner,delivery,guards,virus,shrink,influence,freezing,concert,wreck,partners,massimo,chain,birds,life's,wire,technically,presence,blown,anxious,cave,version,holidays,cleared,wishes,survived,caring,candles,bound,related,charm,yup,pulse,jumping,jokes,frame,boom,vice,performance,occasion,silence,opera,nonsense,frightened,downtown,americans,slipped,dimera,blowing,world's,session,relationships,kidnapping,actual,spin,civil,roxy,packing,education,blaming,wrap,obsessed,fruit,torture,personality,location,effort,daddy's,commander,trees,there'll,owner,fairy,per,other's,necessarily,county,contest,seventy,print,motel,fallen,directly,underwear,grams,exhausted,believing,particularly,freaking,carefully,trace,touching,messing,committee,recovery,intention,consequences,belt,sacrifice,courage,officers,enjoyed,lack,attracted,appears,bay,yard,returned,remove,nut,carried,today's,testimony,intense,granted,violence,heal,defending,attempt,unfair,relieved,political,loyal,approach,slowly,plays,normally,buzz,alcohol,actor,surprises,psychiatrist,pre,plain,attic,who'd,uniform,terrified,sons,pet,cleaned,zach,threaten,teaching,mum,motion,fella,enemies,desert,collection,incident,failure,satisfied,imagination,hooked,headache,forgetting,counselor,andie,acted,opposite,highest,equipment,badge,italian,visiting,naturally,frozen,commissioner,sakes,labor,appropriate,trunk,armed,thousands,received,dunno,costume,temporary,sixteen,impressive,zone,kicking,junk,hon,grabbed,unlike,understands,describe,clients,owns,affect,witnesses,starving,instincts,happily,discussing,deserved,strangers,leading,intelligence,host,authority,surveillance,cow,commercial,admire,questioning,fund,dragged,barn,object,deeply,amp,wrapped,wasted,tense,route,reports,hoped,fellas,election,roommate,mortal,fascinating,chosen,stops,shown,arranged,abandoned,sides,delivered,becomes,arrangements,agenda,began,theater,series,literally,propose,honesty,underneath,forces,services,sauce,promises,lecture,eighty,torn,shocked,relief,explained,counter,circle,victims,transfer,response,channel,identity,differently,campus,spy,ninety,interests,guide,deck,biological,pheebs,ease,creep,will's,waitress,skills,telephone,ripped,raising,scratch,rings,prints,wave,thee,arguing,figures,ephram,asks,reception,pin,oops,diner,annoying,agents,taggert,goal,mass,ability,sergeant,julian's,international,gig,blast,basic,tradition,towel,earned,rub,president's,habit,customers,creature,bermuda,actions,snap,react,prime,paranoid,wha,handling,eaten,therapist,comment,charged,tax,sink,reporter,beats,priority,interrupting,gain,fed,warehouse,shy,pattern,loyalty,inspector,events,pleasant,media,excuses,threats,permanent,guessing,financial,demand,assault,tend,praying,motive,los,unconscious,trained,museum,tracks,range,nap,mysterious,unhappy,tone,switched,rappaport,award,sookie,neighbor,loaded,gut,childhood,causing,swore,piss,hundreds,balance,background,toss,mob,misery,valentine's,thief,squeeze,lobby,hah,goa'uld,geez,exercise,ego,drama,al's,forth,facing,booked,boo,songs,sandburg,eighteen,d'you,bury,perform,everyday,digging,creepy,compared,wondered,trail,liver,hmmm,drawn,device,magical,journey,fits,discussed,supply,moral,helpful,attached,timmy's,searching,flew,depressed,aisle,underground,pro,daughters,cris,amen,vows,proposal,pit,neighbors,darn,cents,arrange,annulment,uses,useless,squad,represent,product,joined,afterwards,adventure,resist,protected,net,fourteen,celebrating,piano,inch,flag,debt,violent,tag,sand,gum,dammit,teal'c,hip,celebration,below,reminded,claims,tonight's,replace,phones,paperwork,emotions,typical,stubborn,stable,sheridan's,pound,papa,lap,designed,current,bum,tension,tank,suffered,steady,provide,overnight,meanwhile,chips,beef,wins,suits,boxes,salt,cassadine,collect,boy's,tragedy,therefore,spoil,realm,profile,degrees,wipe,surgeon,stretch,stepped,nephew,neat,limo,confident,anti,perspective,designer,climb,title,suggested,punishment,finest,ethan's,springfield,occurred,hint,furniture,blanket,twist,surrounded,surface,proceed,lip,fries,worries,refused,niece,gloves,soap,signature,disappoint,crawl,convicted,zoo,result,pages,lit,flip,counsel,doubts,crimes,accusing,when's,shaking,remembering,phase,hallway,halfway,bothered,useful,makeup,madam,gather,concerns,cia,cameras,blackmail,symptoms,rope,ordinary,imagined,concept,cigarette,supportive,memorial,explosion,yay,woo,trauma,ouch,leo's,furious,cheat,avoiding,whew,thick,oooh,boarding,approve,urgent,shhh,misunderstanding,minister,drawer,sin,phony,joining,jam,interfere,governor,chapter,catching,bargain,tragic,schools,respond,punish,penthouse,hop,thou,remains,rach,ohhh,insult,doctor's,bugs,beside,begged,absolute,strictly,stefano,socks,senses,ups,sneaking,yah,serving,reward,polite,checks,tale,physically,instructions,fooled,blows,tabby,internal,bitter,adorable,y'all,tested,suggestion,string,jewelry,debate,com,alike,pitch,fax,distracted,shelter,lessons,foreign,average,twin,friend's,damnit,constable,circus,audition,tune,shoulders,mud,mask,helpless,feeding,explains,dated,robbery,objection,behave,valuable,shadows,courtroom,confusing,tub,talented,struck,smarter,mistaken,italy,customer,bizarre,scaring,punk,motherfucker,holds,focused,alert,activity,vecchio,reverend,highway,foolish,compliment,bastards,attend,scheme,aid,worker,wheelchair,protective,poetry,gentle,script,reverse,picnic,knee,intended,construction,cage,wednesday,voices,toes,stink,scares,pour,effects,cheated,tower,time's,slide,ruining,recent,jewish,filling,exit,cottage,corporate,upside,supplies,proves,parked,instance,grounds,diary,complaining,basis,wounded,thing's,politics,confessed,pipe,merely,massage,data,chop,budget,brief,spill,prayer,costs,betray,begins,arrangement,waiter,scam,rats,fraud,flu,brush,anyone's,adopted,tables,sympathy,pill,pee,web,seventeen,landed,expression,entrance,employee,drawing,cap,bracelet,principal,pays,jen's,fairly,facility,dru,deeper,arrive,unique,tracking,spite,shed,recommend,oughta,nanny,naive,menu,grades,diet,corn,authorities,separated,roses,patch,dime,devastated,description,tap,subtle,include,citizen,bullets,beans,ric,pile,las,executive,confirm,toe,strings,parade,harbor,charity's,bow,borrowed,toys,straighten,steak,status,remote,premonition,poem,planted,honored,youth,specifically,meetings,exam,convenient,traveling,matches,laying,insisted,apply,units,technology,dish,aitoro,sis,kindly,grandson,donor,temper,teenager,strategy,richard's,proven,iron,denial,couples,backwards,tent,swell,noon,happiest,episode,drives,thinkin,spirits,potion,fence,affairs,acts,whatsoever,rehearsal,proved,overheard,nuclear,lemme,hostage,faced,constant,bench,tryin,taxi,shove,sets,moron,limits,impress,entitled,needle,limit,lad,intelligent,instant,forms,disagree,stinks,rianna,recover,paul's,losers,groom,gesture,developed,constantly,blocks,bartender,tunnel,suspects,sealed,removed,legally,illness,hears,dresses,aye,vehicle,thy,teachers,sheet,receive,psychic,night's,denied,knocking,judging,bible,behalf,accidentally,waking,ton,superior,seek,rumor,natalie's,manners,homeless,hollow,desperately,critical,theme,tapes,referring,personnel,item,genoa,gear,majesty,fans,exposed,cried,tons,spells,producer,launch,instinct,belief,quote,motorcycle,convincing,appeal,advance,greater,fashioned,aids,accomplished,mommy's,grip,bump,upsetting,soldiers,scheduled,production,needing,invisible,forgiveness,feds,complex,compare,bothers,tooth,territory,sacred,mon,jessica's,inviting,inner,earn,compromise,cocktail,tramp,temperature,signing,landing,jabot,intimate,dignity,dealt,souls,informed,gods,entertainment,dressing,cigarettes,blessing,billion,alistair,upper,manner,lightning,leak,heaven's,fond,corky,alternative,seduce,players,operate,modern,liquor,fingerprints,enchantment,butters,stuffed,stavros,rome,filed,emotionally,division,conditions,uhm,transplant,tips,passes,oxygen,nicely,lunatic,hid,drill,designs,complain,announcement,visitors,unfortunate,slap,prayers,plug,organization,opens,oath,o'neill,mutual,graduate,confirmed,broad,yacht,spa,remembers,fried,extraordinary,bait,appearance,abuse,warton,sworn,stare,safely,reunion,plot,burst,aha,might've,experiment,dive,commission,cells,aboard,returning,independent,expose,environment,buddies,trusting,smaller,mountains,booze,sweep,sore,scudder,properly,parole,manhattan,effective,ditch,decides,canceled,bra,antonio's,speaks,spanish,reaching,glow,foundation,women's,wears,thirsty,skull,ringing,dorm,dining,bend,unexpected,systems,sob,pancakes,michael's,harsh,flattered,existence,ahhh,troubles,proposed,fights,favourite,eats,driven,computers,rage,luke's,causes,border,undercover,spoiled,sloane,shine,rug,identify,destroying,deputy,deliberately,conspiracy,clothing,thoughtful,similar,sandwiches,plates,nails,miracles,investment,fridge,drank,contrary,beloved,allergic,washed,stalking,solved,sack,misses,hope's,forgiven,erica's,cuz,bent,approval,practical,organized,maciver,involve,industry,fuel,dragging,cooked,possession,pointing,foul,editor,dull,beneath,ages,horror,heels,grass,faking,deaf,stunt,portrait,painted,jealousy,hopeless,fears,cuts,conclusion,volunteer,scenario,satellite,necklace,men's,crashed,chapel,accuse,restraining,jason's,humans,homicide,helicopter,formal,firing,shortly,safer,devoted,auction,videotape,tore,stores,reservations,pops,appetite,anybody's,wounds,vanquish,symbol,prevent,patrol,ironic,flow,fathers,excitement,anyhow,tearing,sends,sam's,rape,laughed,function,core,charmed,whatever's,sub,lucy's,dealer,cooperate,bachelor,accomplish,wakes,struggle,spotted,sorts,reservation,ashes,yards,votes,tastes,supposedly,loft,intentions,integrity,wished,towels,suspected,slightly,qualified,log,investigating,inappropriate,immediate,companies,backed,pan,owned,lipstick,lawn,compassion,cafeteria,belonged,affected,scarf,precisely,obsession,management,loses,lighten,jake's,infection,granddaughter,explode,chemistry,balcony,this'll,storage,spying,publicity,exists,employees,depend,cue,cracked,conscious,aww,ally,ace,accounts,absurd,vicious,tools,strongly,rap,invented,forbid,directions,defendant,bare,announce,alcazar's,screwing,salesman,robbed,leap,lakeview,insanity,injury,genetic,document,why's,reveal,religious,possibilities,kidnap,gown,entering,chairs,wishing,statue,setup,serial,punished,dramatic,dismissed,criminals,seventh,regrets,raped,quarters,produce,lamp,dentist,anyways,anonymous,added,semester,risks,regarding,owes,magazines,machines,lungs,explaining,delicate,child's,tricked,oldest,liv,eager,doomed,cafe,bureau,adoption,traditional,surrender,stab,sickness,scum,loop,independence,generation,floating,envelope,entered,combination,chamber,worn,vault,sorel,pretended,potatoes,plea,photograph,payback,misunderstood,kiddo,healing,cascade,capeside,application,stabbed,remarkable,cabinet,brat,wrestling,sixth,scale,privilege,passionate,nerves,lawsuit,kidney,disturbed,crossing,cozy,associate,tire,shirts,required,posted,oven,ordering,mill,journal,gallery,delay,clubs,risky,nest,monsters,honorable,grounded,favour,culture,closest,brenda's,breakdown,attempted,tony's,placed,conflict,bald,actress,abandon,steam,scar,pole,duh,collar,worthless,standards,resources,photographs,introduced,injured,graduation,enormous,disturbing,disturb,distract,deals,conclusions,vodka,situations,require,mid,measure,dishes,crawling,congress,children's,briefcase,wiped,whistle,sits,roast,rented,pigs,greek,flirting,existed,deposit,damaged,bottles,vanessa's,types,topic,riot,overreacting,minimum,logical,impact,hostile,embarrass,casual,beacon,amusing,altar,values,recognized,maintain,goods,covers,claus,battery,survival,skirt,shave,prisoners,porch,med,ghosts,favors,drops,dizzy,chili,begun,beaten,advise,transferred,strikes,rehab,raw,photographer,peaceful,leery,heavens,fortunately,fooling,expectations,draft,citizens,weakness,ski,ships,ranch,practicing,musical,movement,individual,homes,executed,examine,documents,cranes,column,bribe,task,species,sail,rum,resort,prescription,operating,hush,fragile,forensics,expense,drugged,differences,cows,conduct,comic,bells,avenue,attacking,assigned,visitor,suitcase,sources,sorta,scan,payment,motor,mini,manticore,inspired,insecure,imagining,hardest,clerk,yea,wrist,what'll,tube,starters,silk,pump,pale,nicer,haul,flies,demands,boot,arts,african,there'd,limited,how're,elders,connections,quietly,pulls,idiots,factor,erase,denying,attacks,ankle,amnesia,accepting,ooo,heartbeat,gal,devane,confront,backing,phrase,operations,minus,meets,legitimate,hurricane,fixing,communication,boats,auto,arrogant,supper,studies,slightest,sins,sayin,recipe,pier,paternity,humiliating,genuine,catholic,snack,rational,pointed,minded,guessed,grace's,display,dip,brooke's,advanced,weddings,unh,tumor,teams,reported,humiliated,destruction,copies,closely,bid,aspirin,academy,wig,throughout,spray,occur,logic,eyed,equal,drowning,contacts,shakespeare,ritual,perfume,kelly's,hiring,hating,generally,error,elected,docks,creatures,visions,thanking,thankful,sock,replaced,nineteen,nick's,fork,comedy,analysis,yale,throws,teenagers,studied,stressed,slice,rolls,requires,plead,ladder,kicks,detectives,assured,alison's,widow,tomorrow's,tissue,tellin,shallow,responsibilities,repay,rejected,permanently,girlfriends,deadly,comforting,ceiling,bonus,verdict,maintenance,jar,insensitive,factory,aim,triple,spilled,respected,recovered,messy,interrupted,halliwell,car's,bleed,benefits,wardrobe,takin,significant,objective,murders,doo,chart,backs,workers,waves,underestimate,ties,registered,multiple,justify,harmless,frustrated,fold,enzo,convention,communicate,bugging,attraction,arson,whack,salary,rumors,residence,party's,obligation,medium,liking,laura's,development,develop,dearest,david's,danny's,congratulate,vengeance,switzerland,severe,rack,puzzle,puerto,guidance,fires,courtesy,caller,blamed,tops,repair,quiz,prep,now's,involves,headquarters,curiosity,codes,circles,barbecue,troops,sunnydale,spinning,scores,pursue,psychotic,cough,claimed,accusations,shares,resent,money's,laughs,gathered,freshman,envy,drown,cristian's,bartlet,asses,sofa,scientist,poster,islands,highness,dock,apologies,welfare,victor's,theirs,stat,stall,spots,somewhat,ryan's,realizes,psych,fools,finishing,album,wee,understandable,unable,treats,theatre,succeed,stir,relaxed,makin,inches,gratitude,faithful,bin,accent,zip,witter,wandering,regardless,que,locate,inevitable,gretel,deed,crushed,controlling,taxes,smelled,settlement,robe,poet,opposed,marked,greenlee's,gossip,gambling,determine,cuba,cosmetics,cent,accidents,surprising,stiff,sincere,shield,rushed,resume,reporting,refrigerator,reference,preparing,nightmares,mijo,ignoring,hunch,fog,fireworks,drowned,crown,cooperation,brass,accurate,whispering,sophisticated,religion,luggage,investigate,hike,explore,emotion,creek,crashing,contacted,complications,ceo,acid,shining,rolled,righteous,reconsider,inspiration,goody,geek,frightening,festival,ethics,creeps,courthouse,camping,assistance,affection,vow,smythe,protest,lodge,haircut,forcing,essay,chairman,baked,apologized,vibe,respects,receipt,mami,includes,hats,exclusive,destructive,define,defeat,adore,adopt,voted,tracked,signals,shorts,rory's,reminding,relative,ninth,floors,dough,creations,continues,cancelled,cabot,barrel,adam's,snuck,slight,reporters,rear,pressing,novel,newspapers,magnificent,madame,lazy,glorious,fiancee,candidate,brick,bits,australia,activities,visitation,scholarship,sane,previous,kindness,ivy's,shoulda,rescued,mattress,maria's,lounge,lifted,label,importantly,glove,enterprises,driver's,disappointment,condo,cemetery,beings,admitting,yelled,waving,screech,satisfaction,requested,reads,plants,nun,nailed,described,dedicated,certificate,centuries,annual,worm,tick,resting,primary,polish,marvelous,fuss,funds,defensive,cortlandt,compete,chased,provided,pockets,luckily,lilith,filing,depression,conversations,consideration,consciousness,worlds,innocence,indicate,grandmother's,forehead,bam,appeared,aggressive,trailer,slam,retirement,quitting,pry,person's,narrow,levels,kay's,inform,encourage,dug,delighted,daylight,danced,currently,confidential,billy's,ben's,aunts,washing,vic,tossed,spectra,rick's,permit,marrow,lined,implying,hatred,grill,efforts,corpse,clues,sober,relatives,promotion,offended,morgue,larger,infected,humanity,eww,emily's,electricity,electrical,distraction,cart,broadcast,wired,violation,suspended,promising,harassment,glue,gathering,d'angelo,cursed,controlled,calendar,brutal,assets,warlocks,wagon,unpleasant,proving,priorities,observation,mustn't,lease,grows,flame,domestic,disappearance,depressing,thrill,sitter,ribs,offers,naw,flush,exception,earrings,deadline,corporal,collapsed,update,snapped,smack,orleans,offices,melt,figuring,delusional,coulda,burnt,actors,trips,tender,sperm,specialist,scientific,realise,pork,popped,planes,kev,interrogation,institution,included,esteem,communications,choosing,choir,undo,pres,prayed,plague,manipulate,lifestyle,insulting,honour,detention,delightful,coffeehouse,chess,betrayal,apologizing,adjust,wrecked,wont,whipped,rides,reminder,psychological,principle,monsieur,injuries,fame,faint,confusion,christ's,bon,bake,nearest,korea,industries,execution,distress,definition,creating,correctly,complaint,blocked,trophy,tortured,structure,rot,risking,pointless,household,heir,handing,eighth,dumping,cups,chloe's,alibi,absence,vital,tokyo,thus,struggling,shiny,risked,refer,mummy,mint,joey's,involvement,hose,hobby,fortunate,fleischman,fitting,curtain,counseling,addition,wit,transport,technical,rode,puppet,opportunities,modeling,memo,irresponsible,humiliation,hiya,freakin,fez,felony,choke,blackmailing,appreciated,tabloid,suspicion,recovering,rally,psychology,pledge,panicked,nursery,louder,jeans,investigator,identified,homecoming,helena's,height,graduated,frustrating,fabric,distant,buys,busting,buff,wax,sleeve,products,philosophy,irony,hospitals,dope,declare,autopsy,workin,torch,substitute,scandal,prick,limb,leaf,lady's,hysterical,growth,goddamnit,fetch,dimension,day's,crowded,clip,climbing,bonding,approved,yeh,woah,ultimately,trusts,returns,negotiate,millennium,majority,lethal,length,iced,deeds,bore,babysitter,questioned,outrageous,medal,kiriakis,insulted,grudge,established,driveway,deserted,definite,capture,beep,wires,suggestions,searched,owed,originally,nickname,lighting,lend,drunken,demanding,costanza,conviction,characters,bumped,weigh,touches,tempted,shout,resolve,relate,poisoned,pip,phoebe's,pete's,occasionally,molly's,meals,maker,invitations,haunted,fur,footage,depending,bogus,autograph,affects,tolerate,stepping,spontaneous,sleeps,probation,presentation,performed,manny,identical,fist,cycle,associates,aaron's,streak,spectacular,sector,lasted,isaac's,increase,hostages,heroin,havin,habits,encouraging,cult,consult,burgers,boyfriends,bailed,baggage,association,wealthy,watches,versus,troubled,torturing,teasing,sweetest,stations,sip,shawn's,rag,qualities,postpone,pad,overwhelmed,malkovich,impulse,hut,follows,classy,charging,barbara's,angel's,amazed,scenes,rising,revealed,representing,policeman,offensive,mug,hypocrite,humiliate,hideous,finals,experiences,d'ya,courts,costumes,captured,bluffing,betting,bein,bedtime,alcoholic,vegetable,tray,suspicions,spreading,splendid,shouting,roots,pressed,nooo,liza's,jew,intent,grieving,gladly,fling,eliminate,disorder,courtney's,cereal,arrives,aaah,yum,technique,statements,sonofabitch,servant,roads,republican,paralyzed,orb,lotta,locks,guaranteed,european,dummy,discipline,despise,dental,corporation,carries,briefing,bluff,batteries,atmosphere,whatta,tux,sounding,servants,rifle,presume,kevin's,handwriting,goals,gin,fainted,elements,dried,cape,allright,allowing,acknowledge,whacked,toxic,skating,reliable,quicker,penalty,panel,overwhelming,nearby,lining,importance,harassing,fatal,endless,elsewhere,dolls,convict,bold,ballet,whatcha,unlikely,spiritual,shutting,separation,recording,positively,overcome,goddam,failing,essence,dose,diagnosis,cured,claiming,bully,airline,ahold,yearbook,various,tempting,shelf,rig,pursuit,prosecution,pouring,possessed,partnership,miguel's,lindsay's,countries,wonders,tsk,thorough,spine,rath,psychiatric,meaningless,latte,jammed,ignored,fiance,exposure,exhibit,evidently,duties,contempt,compromised,capacity,cans,weekends,urge,theft,suing,shipment,scissors,responding,refuses,proposition,noises,matching,located,ink,hormones,hiv,hail,grandchildren,godfather,gently,establish,crane's,contracts,compound,buffy's,worldwide,smashed,sexually,sentimental,senor,scored,patient's,nicest,marketing,manipulated,jaw,intern,handcuffs,framed,errands,entertaining,discovery,crib,carriage,barge,awards,attending,ambassador,videos,tab,spends,slipping,seated,rubbing,rely,reject,recommendation,reckon,ratings,headaches,float,embrace,corners,whining,sweating,sole,skipped,restore,receiving,population,pep,mountie,motives,mama's,listens,korean,heroes,heart's,cristobel,controls,cheerleader,balsom,unnecessary,stunning,shipping,scent,santa's,quartermaines,praise,pose,montega,luxury,loosen,kyle's,keri's,info,hum,haunt,gracious,git,forgiving,fleet,errand,emperor,cakes,blames,abortion,worship,theories,strict,sketch,shifts,plotting,physician,perimeter,passage,pals,mere,mattered,lonigan,longest,jews,interference,eyewitness,enthusiasm,encounter,diapers,craig's,artists,strongest,shaken,serves,punched,projects,portal,outer,nazi,hal's,colleagues,catches,bearing,backyard,academic,winds,terrorists,sabotage,pea,organs,needy,mentor,measures,listed,lex,cuff,civilization,caribbean,articles,writes,woof,who'll,viki's,valid,rarely,rabbi,prank,performing,obnoxious,mates,improve,hereby,gabby,faked,cellar,whitelighter,void,substance,strangle,sour,skill,senate,purchase,native,muffins,interfering,hoh,gina's,demonic,colored,clearing,civilian,buildings,boutique,barrington,trading,terrace,smoked,seed,righty,relations,quack,published,preliminary,petey,pact,outstanding,opinions,knot,ketchup,items,examined,disappearing,cordy,coin,circuit,assist,administration,walt,uptight,ticking,terrifying,tease,tabitha's,syd,swamp,secretly,rejection,reflection,realizing,rays,pennsylvania,partly,mentally,marone,jurisdiction,frasier's,doubted,deception,crucial,congressman,cheesy,arrival,visited,supporting,stalling,scouts,scoop,ribbon,reserve,raid,notion,income,immune,grandma's,expects,edition,destined,constitution,classroom,bets,appreciation,appointed,accomplice,whitney's,wander,shoved,sewer,scroll,retire,paintings,lasts,fugitive,freezer,discount,cranky,crank,clearance,bodyguard,anxiety,accountant,abby's,whoops,volunteered,terrorist,tales,talents,stinking,resolved,remotely,protocol,livvie's,garlic,decency,cord,beds,asa's,areas,altogether,uniforms,tremendous,restaurants,rank,profession,popping,philadelphia,outa,observe,lung,largest,hangs,feelin,experts,enforcement,encouraged,economy,dudes,donation,disguise,diane's,curb,continued,competitive,businessman,bites,antique,advertising,ads,toothbrush,retreat,represents,realistic,profits,predict,nora's,lid,landlord,hourglass,hesitate,frank's,focusing,equally,consolation,boyfriend's,babbling,aged,troy's,tipped,stranded,smartest,sabrina's,rhythm,replacement,repeating,puke,psst,paycheck,overreacted,macho,leadership,kendall's,juvenile,john's,images,grocery,freshen,disposal,cuffs,consent,caffeine,arguments,agrees,abigail's,vanished,unfinished,tobacco,tin,syndrome,ripping,pinch,missiles,isolated,flattering,expenses,dinners,cos,colleague,ciao,buh,belthazor,belle's,attorneys,amber's,woulda,whereabouts,wars,waitin,visits,truce,tripped,tee,tasted,stu,steer,ruling,poisoning,nursing,manipulative,immature,husbands,heel,granddad,delivering,deaths,condoms,automatically,anchor,trashed,tournament,throne,raining,prices,pasta,needles,leaning,leaders,judges,ideal,detector,coolest,casting,batch,approximately,appointments,almighty,achieve,vegetables,sum,spark,ruled,revolution,principles,perfection,pains,momma,mole,interviews,initiative,hairs,getaway,employment,den,cracking,counted,compliments,behold,verge,tougher,timer,tapped,taped,stakes,specialty,snooping,shoots,semi,rendezvous,pentagon,passenger,leverage,jeopardize,janitor,grandparents,forbidden,examination,communist,clueless,cities,bidding,arriving,adding,ungrateful,unacceptable,tutor,soviet,shaped,serum,scuse,savings,pub,pajamas,mouths,modest,methods,lure,irrational,depth,cries,classified,bombs,beautifully,arresting,approaching,vessel,variety,traitor,sympathetic,smug,smash,rental,prostitute,premonitions,mild,jumps,inventory,ing,improved,grandfather's,developing,darlin,committing,caleb's,banging,asap,amendment,worms,violated,vent,traumatic,traced,tow,swiss,sweaty,shaft,recommended,overboard,literature,insight,healed,grasp,fluid,experiencing,crappy,crab,connecticut,chunk,chandler's,awww,applied,witnessed,traveled,stain,shack,reacted,pronounce,presented,poured,occupied,moms,marriages,jabez,invested,handful,gob,gag,flipped,fireplace,expertise,embarrassment,disappears,concussion,bruises,brakes,anything's,week's,twisting,tide,swept,summon,splitting,settling,scientists,reschedule,regard,purposes,ohio,notch,mike's,improvement,hooray,grabbing,extend,exquisite,disrespect,complaints,colin's,armor,voting,thornhart,sustained,straw,slapped,simon's,shipped,shattered,ruthless,reva's,refill,recorded,payroll,numb,mourning,marijuana,manly,jerry's,involving,hunk,entertain,earthquake,drift,dreadful,doorstep,confirmation,chops,bridget's,appreciates,announced,vague,tires,stressful,stem,stashed,stash,sensed,preoccupied,predictable,noticing,madly,halls,gunshot,embassy,dozens,dinner's,confuse,cleaners,charade,chalk,cappuccino,breed,bouquet,amulet,addiction,who've,warming,unlock,transition,satisfy,sacrificed,relaxing,lone,input,hampshire,girlfriend's,elaborate,concerning,completed,channels,category,cal,blocking,blend,blankets,america's,addicted,yuck,voters,professionals,positions,monica's,mode,initial,hunger,hamburger,greeting,greet,gravy,gram,dreamt,dice,declared,collecting,caution,brady's,backpack,agreeing,writers,whale,tribe,taller,supervisor,sacrifices,radiation,poo,phew,outcome,ounce,missile,meter,likewise,irrelevant,gran,felon,feature,favorites,farther,fade,experiments,erased,easiest,disk,convenience,conceived,compassionate,challenged,cane,blair's,backstage,agony,adores,veins,tweek,thieves,surgical,strangely,stetson,recital,proposing,productive,meaningful,marching,immunity,hassle,goddamned,frighten,directors,dearly,comments,closure,cease,ambition,wisconsin,unstable,sweetness,salvage,richer,refusing,raging,pumping,pressuring,petition,mortals,lowlife,jus,intimidated,intentionally,inspire,forgave,eric's,devotion,despicable,deciding,dash,comfy,breach,bo's,bark,alternate,aaaah,switching,swallowed,stove,slot,screamed,scars,russians,relevant,poof,pipes,persons,pawn,losses,legit,invest,generations,farewell,experimental,difficulty,curtains,civilized,championship,caviar,boost,token,tends,temporarily,superstition,supernatural,sunk,sadness,reduced,recorder,psyched,presidential,owners,motivated,microwave,lands,karen's,hallelujah,gap,fraternity,engines,dryer,cocoa,chewing,additional,acceptable,unbelievably,survivor,smiled,smelling,sized,simpler,sentenced,respectable,remarks,registration,premises,passengers,organ,occasional,khasinau,indication,gutter,grabs,goo,fulfill,flashlight,ellenor,courses,blooded,blessings,beware,beth's,bands,advised,water's,uhhh,turf,swings,slips,shocking,resistance,privately,olivia's,mirrors,lyrics,locking,instrument,historical,heartless,fras,decades,comparison,childish,cassie's,cardiac,admission,utterly,tuscany,ticked,suspension,stunned,statesville,sadly,resolution,reserved,purely,opponent,noted,lowest,kiddin,jerks,hitch,flirt,fare,extension,establishment,equals,dismiss,delayed,decade,christening,casket,c'mere,breakup,brad's,biting,antibiotics,accusation,abducted,witchcraft,whoever's,traded,thread,spelling,so's,school's,runnin,remaining,punching,protein,printed,paramedics,newest,murdering,mine's,masks,lawndale,intact,ins,initials,heights,grampa,democracy,deceased,colleen's,choking,charms,careless,bushes,buns,bummed,accounting,travels,taylor's,shred,saves,saddle,rethink,regards,references,precinct,persuade,patterns,meds,manipulating,llanfair,leash,kenny's,housing,hearted,guarantees,flown,feast,extent,educated,disgrace,determination,deposition,coverage,corridor,burial,bookstore,boil,abilities,vitals,veil,trespassing,teaches,sidewalk,sensible,punishing,overtime,optimistic,occasions,obsessing,oak,notify,mornin,jeopardy,jaffa,injection,hilarious,distinct,directed,desires,curve,confide,challenging,cautious,alter,yada,wilderness,where're,vindictive,vial,tomb,teeny,subjects,stroll,sittin,scrub,rebuild,rachel's,posters,parallel,ordeal,orbit,o'brien,nuns,max's,jennifer's,intimacy,inheritance,fails,exploded,donate,distracting,despair,democratic,defended,crackers,commercials,bryant's,ammunition,wildwind,virtue,thoroughly,tails,spicy,sketches,sights,sheer,shaving,seize,scarecrow,refreshing,prosecute,possess,platter,phillip's,napkin,misplaced,merchandise,membership,loony,jinx,heroic,frankenstein,fag,efficient,devil's,corps,clan,boundaries,attract,ambitious,virtually,syrup,solitary,resignation,resemblance,reacting,pursuing,premature,pod,liz's,lavery,journalist,honors,harvey's,genes,flashes,erm,contribution,company's,client's,cheque,charts,cargo,awright,acquainted,wrapping,untie,salute,ruins,resign,realised,priceless,partying,myth,moonlight,lightly,lifting,kasnoff,insisting,glowing,generator,flowing,explosives,employer,cutie,confronted,clause,buts,breakthrough,blouse,ballistic,antidote,analyze,allowance,adjourned,vet,unto,understatement,tucked,touchy,toll,subconscious,sequence,screws,sarge,roommates,reaches,rambaldi,programs,offend,nerd,knives,kin,irresistible,inherited,incapable,hostility,goddammit,fuse,frat,equation,curfew,centered,blackmailed,allows,alleged,walkin,transmission,text,starve,sleigh,sarcastic,recess,rebound,procedures,pinned,parlor,outfits,livin,issued,institute,industrial,heartache,head's,haired,fundraiser,doorman,documentary,discreet,dilucca,detect,cracks,cracker,considerate,climbed,catering,author,apophis,zoey,vacuum,urine,tunnels,todd's,tanks,strung,stitches,sordid,sark,referred,protector,portion,phoned,pets,paths,mat,lengths,kindergarten,hostess,flaw,flavor,discharge,deveraux,consumed,confidentiality,automatic,amongst,viktor,victim's,tactics,straightened,specials,spaghetti,soil,prettier,powerless,por,poems,playin,playground,parker's,paranoia,nsa,mainly,mac's,joe's,instantly,havoc,exaggerating,evaluation,eavesdropping,doughnuts,diversion,deepest,cutest,companion,comb,bela,behaving,avoided,anyplace,agh,accessory,zap,whereas,translate,stuffing,speeding,slime,polls,personalities,payments,musician,marital,lurking,lottery,journalism,interior,imaginary,hog,guinea,greetings,game's,fairwinds,ethical,equipped,environmental,elegant,elbow,customs,cuban,credibility,credentials,consistent,collapse,cloth,claws,chopped,challenges,bridal,boards,bedside,babysitting,authorized,assumption,ant,youngest,witty,vast,unforgivable,underworld,tempt,tabs,succeeded,sophomore,selfless,secrecy,runway,restless,programming,professionally,okey,movin,metaphor,messes,meltdown,lecter,incoming,hence,gasoline,gained,funding,episodes,diefenbaker,contain,comedian,collected,cam,buckle,assembly,ancestors,admired,adjustment,acceptance,weekly,warmth,throats,seduced,ridge's,reform,rebecca's,queer,poll,parenting,noses,luckiest,graveyard,gifted,footsteps,dimeras,cynical,assassination,wedded,voyage,volunteers,verbal,unpredictable,tuned,stoop,slides,sinking,show's,rio,rigged,regulations,region,promoted,plumbing,lingerie,layer,katie's,hankey,greed,everwood,essential,elope,dresser,departure,dat,dances,coup,chauffeur,bulletin,bugged,bouncing,website,tubes,temptation,supported,strangest,sorel's,slammed,selection,sarcasm,rib,primitive,platform,pending,partial,packages,orderly,obsessive,nevertheless,nbc,murderers,motto,meteor,inconvenience,glimpse,froze,fiber,execute,etc,ensure,drivers,dispute,damages,crop,courageous,consulate,closes,bosses,bees,amends,wuss,wolfram,wacky,unemployed,traces,town's,testifying,tendency,syringe,symphony,stew,startled,sorrow,sleazy,shaky,screams,rsquo,remark,poke,phone's,philip's,nutty,nobel,mentioning,mend,mayor's,iowa,inspiring,impulsive,housekeeper,germans,formed,foam,fingernails,economic,divide,conditioning,baking,whine,thug,starved,sedative,rose's,reversed,publishing,programmed,picket,paged,nowadays,newman's,mines,margo's,invasion,homosexual,homo,hips,forgets,flipping,flea,flatter,dwell,dumpster,consultant,choo,banking,assignments,apartments,ants,affecting,advisor,vile,unreasonable,tossing,thanked,steals,souvenir,screening,scratched,rep,psychopath,proportion,outs,operative,obstruction,obey,neutral,lump,lily's,insists,ian's,harass,gloat,flights,filth,extended,electronic,edgy,diseases,didn,coroner,confessing,cologne,cedar,bruise,betraying,bailing,attempting,appealing,adebisi,wrath,wandered,waist,vain,traps,transportation,stepfather,publicly,presidents,poking,obligated,marshal,lexie's,instructed,heavenly,halt,employed,diplomatic,dilemma,crazed,contagious,coaster,cheering,carved,bundle,approached,appearances,vomit,thingy,stadium,speeches,robbing,reflect,raft,qualify,pumped,pillows,peep,pageant,packs,neo,neglected,m'kay,loneliness,liberal,intrude,indicates,helluva,gardener,freely,forresters,err,drooling,continuing,betcha,alan's,addressed,acquired,vase,supermarket,squat,spitting,spaces,slaves,rhyme,relieve,receipts,racket,purchased,preserve,pictured,pause,overdue,officials,nod,motivation,morgendorffer,lucky's,lacking,kidnapper,introduction,insect,hunters,horns,feminine,eyeballs,dumps,disc,disappointing,difficulties,crock,convertible,context,claw,clamp,canned,cambias,bathtub,avanya,artery,weep,warmer,vendetta,tenth,suspense,summoned,stuff's,spiders,sings,reiber,raving,pushy,produced,poverty,postponed,ohhhh,noooo,mold,mice,laughter,incompetent,hugging,groceries,frequency,fastest,drip,differ,daphne's,communicating,body's,beliefs,bats,bases,auntie,adios,wraps,willingly,weirdest,voila,timmih,thinner,swelling,swat,steroids,sensitivity,scrape,rehearse,quarterback,organic,matched,ledge,justified,insults,increased,heavily,hateful,handles,feared,doorway,decorations,colour,chatting,buyer,buckaroo,bedrooms,batting,askin,ammo,tutoring,subpoena,span,scratching,requests,privileges,pager,mart,kel,intriguing,idiotic,hotels,grape,enlighten,dum,door's,dixie's,demonstrate,dairy,corrupt,combined,brunch,bridesmaid,barking,architect,applause,alongside,ale,acquaintance,yuh,wretched,superficial,sufficient,sued,soak,smoothly,sensing,restraint,quo,pow,posing,pleading,pittsburgh,peru,payoff,participate,organize,oprah,nemo,morals,loans,loaf,lists,laboratory,jumpy,intervention,ignorant,herbal,hangin,germs,generosity,flashing,country's,convent,clumsy,chocolates,captive,bianca's,behaved,apologise,vanity,trials,stumbled,republicans,represented,recognition,preview,poisonous,perjury,parental,onboard,mugged,minding,linen,learns,knots,interviewing,inmates,ingredients,humour,grind,greasy,goons,estimate,elementary,edmund's,drastic,database,coop,comparing,cocky,clearer,bruised,brag,bind,axe,asset,apparent,ann's,worthwhile,whoop,wedding's,vanquishing,tabloids,survivors,stenbeck's,sprung,spotlight,shops,sentencing,sentences,revealing,reduce,ram,racist,provoke,piper's,pining,overly,oui,ops,mop,louisiana,locket,king's,jab,imply,impatient,hovering,hotter,fest,endure,dots,doren,dim,diagnosed,debts,cultures,crawled,contained,condemned,chained,brit,breaths,adds,weirdo,warmed,wand,utah,troubling,tok'ra,stripped,strapped,soaked,skipping,sharon's,scrambled,rattle,profound,musta,mocking,mnh,misunderstand,merit,loading,linked,limousine,kacl,investors,interviewed,hustle,forensic,foods,enthusiastic,duct,drawers,devastating,democrats,conquer,concentration,comeback,clarify,chores,cheerleaders,cheaper,charlie's,callin,blushing,barging,abused,yoga,wrecking,wits,waffles,virginity,vibes,uninvited,unfaithful,underwater,tribute,strangled,state's,scheming,ropes,responded,residents,rescuing,rave,priests,postcard,overseas,orientation,ongoing,o'reily,newly,neil's,morphine,lotion,limitations,lesser,lectures,lads,kidneys,judgement,jog,itch,intellectual,installed,infant,indefinitely,grenade,glamorous,genetically,freud,faculty,engineering,doh,discretion,delusions,declaration,crate,competent,commonwealth,catalog,bakery,attempts,asylum,argh,applying,ahhhh,yesterday's,wedge,wager,unfit,tripping,treatments,torment,superhero,stirring,spinal,sorority,seminar,scenery,repairs,rabble,pneumonia,perks,owl,override,ooooh,moo,mija,manslaughter,mailed,love's,lime,lettuce,intimidate,instructor,guarded,grieve,grad,globe,frustration,extensive,exploring,exercises,eve's,doorbell,devices,deal's,dam,cultural,ctu,credits,commerce,chinatown,chemicals,baltimore,authentic,arraignment,annulled,altered,allergies,wanta,verify,vegetarian,tunes,tourist,tighter,telegram,suitable,stalk,specimen,spared,solving,shoo,satisfying,saddam,requesting,publisher,pens,overprotective,obstacles,notified,negro,nasedo,judged,jill's,identification,grandchild,genuinely,founded,flushed,fluids,floss,escaping,ditched,demon's,decorated,criticism,cramp,corny,contribute,connecting,bunk,bombing,bitten,billions,bankrupt,yikes,wrists,ultrasound,ultimatum,thirst,spelled,sniff,scope,ross's,room's,retrieve,releasing,reassuring,pumps,properties,predicted,neurotic,negotiating,needn't,multi,monitors,millionaire,microphone,mechanical,lydecker,limp,incriminating,hatchet,gracias,gordie,fills,feeds,egypt,doubting,dedication,decaf,dawson's,competing,cellular,biopsy,whiz,voluntarily,visible,ventilator,unpack,unload,universal,tomatoes,targets,suggests,strawberry,spooked,snitch,schillinger,sap,reassure,providing,prey,pressure's,persuasive,mystical,mysteries,mri,moment's,mixing,matrimony,mary's,mails,lighthouse,liability,kgb,jock,headline,frankie's,factors,explosive,explanations,dispatch,detailed,curly,cupid,condolences,comrade,cassadines,bulb,brittany's,bragging,awaits,assaulted,ambush,adolescent,adjusted,abort,yank,whit,verse,vaguely,undermine,tying,trim,swamped,stitch,stan's,stabbing,slippers,skye's,sincerely,sigh,setback,secondly,rotting,rev,retail,proceedings,preparation,precaution,pox,pcpd,nonetheless,melting,materials,mar,liaison,hots,hooking,headlines,hag,ganz,fury,felicity,fangs,expelled,encouragement,earring,dreidel,draws,dory,donut,dog's,dis,dictate,dependent,decorating,coordinates,cocktails,bumps,blueberry,believable,backfired,backfire,apron,anticipated,adjusting,activated,vous,vouch,vitamins,vista,urn,uncertain,ummm,tourists,tattoos,surrounding,sponsor,slimy,singles,sibling,shhhh,restored,representative,renting,reign,publish,planets,peculiar,parasite,paddington,noo,marries,mailbox,magically,lovebirds,listeners,knocks,kane's,informant,grain,exits,elf,drazen,distractions,disconnected,dinosaurs,designing,dashwood,crooked,conveniently,contents,argued,wink,warped,underestimated,testified,tacky,substantial,steve's,steering,staged,stability,shoving,seizure,reset,repeatedly,radius,pushes,pitching,pairs,opener,mornings,mississippi,matthew's,mash,investigations,invent,indulge,horribly,hallucinating,festive,eyebrows,expand,enjoys,dictionary,dialogue,desperation,dealers,darkest,daph,critic,consulting,cartman's,canal,boragora,belts,bagel,authorization,auditions,associated,ape,amy's,agitated,adventures,withdraw,wishful,wimp,vehicles,vanish,unbearable,tonic,tom's,tackle,suffice,suction,slaying,singapore,safest,rosanna's,rocking,relive,rates,puttin,prettiest,oval,noisy,newlyweds,nauseous,moi,misguided,mildly,midst,maps,liable,kristina's,judgmental,introducing,individuals,hunted,hen,givin,frequent,fisherman,fascinated,elephants,dislike,diploma,deluded,decorate,crummy,contractions,carve,careers,bottled,bonded,bahamas,unavailable,twenties,trustworthy,translation,traditions,surviving,surgeons,stupidity,skies,secured,salvation,remorse,rafe's,princeton,preferably,pies,photography,operational,nuh,northwest,nausea,napkins,mule,mourn,melted,mechanism,mashed,julia's,inherit,holdings,hel,greatness,golly,excused,edges,dumbo,drifting,delirious,damaging,cubicle,compelled,comm,colleges,cole's,chooses,checkup,chad's,certified,candidates,boredom,bob's,bandages,baldwin's,bah,automobile,athletic,alarms,absorbed,absent,windshield,who're,whaddya,vitamin,transparent,surprisingly,sunglasses,starring,slit,sided,schemes,roar,relatively,reade,quarry,prosecutor,prognosis,probe,potentially,pitiful,persistent,perception,percentage,peas,oww,nosy,neighbourhood,nagging,morons,molecular,meters,masterpiece,martinis,limbo,liars,jax's,irritating,inclined,hump,hoynes,haw,gauge,functions,fiasco,educational,eatin,donated,destination,dense,cubans,continent,concentrating,commanding,colorful,clam,cider,brochure,behaviour,barto,bargaining,awe,artistic,welcoming,weighing,villain,vein,vanquished,striking,stains,sooo,smear,sire,simone's,secondary,roughly,rituals,resentment,psychologist,preferred,pint,pension,passive,overhear,origin,orchestra,negotiations,mounted,morality,landingham,labs,kisser,jackson's,icy,hoot,holling,handshake,grilled,functioning,formality,elevators,edward's,depths,confirms,civilians,bypass,briefly,boathouse,binding,acres,accidental,westbridge,wacko,ulterior,transferring,tis,thugs,tangled,stirred,stefano's,sought,snag,smallest,sling,sleaze,seeds,rumour,ripe,remarried,reluctant,regularly,puddle,promote,precise,popularity,pins,perceptive,miraculous,memorable,maternal,lucinda's,longing,lockup,locals,librarian,job's,inspection,impressions,immoral,hypothetically,guarding,gourmet,gabe,fighters,fees,features,faxed,extortion,expressed,essentially,downright,digest,der,crosses,cranberry,city's,chorus,casualties,bygones,buzzing,burying,bikes,attended,allah,all's,weary,viewing,viewers,transmitter,taping,takeout,sweeping,stepmother,stating,stale,seating,seaborn,resigned,rating,prue's,pros,pepperoni,ownership,occurs,nicole's,newborn,merger,mandatory,malcolm's,ludicrous,jan's,injected,holden's,henry's,heating,geeks,forged,faults,expressing,eddie's,drue,dire,dief,desi,deceiving,centre,celebrities,caterer,calmed,businesses,budge,ashley's,applications,ankles,vending,typing,tribbiani,there're,squared,speculation,snowing,shades,sexist,scudder's,scattered,sanctuary,rewrite,regretted,regain,raises,processing,picky,orphan,mural,misjudged,miscarriage,memorize,marshall's,mark's,licensed,lens,leaking,launched,larry's,languages,judge's,jitters,invade,interruption,implied,illegally,handicapped,glitch,gittes,finer,fewer,engineered,distraught,dispose,dishonest,digs,dahlia's,dads,cruelty,conducting,clinical,circling,champions,canceling,butterflies,belongings,barbrady,amusement,allegations,alias,aging,zombies,where've,unborn,tri,swearing,stables,squeezed,spaulding's,slavery,sew,sensational,revolutionary,resisting,removing,radioactive,races,questionable,privileged,portofino,par,owning,overlook,overhead,orson,oddly,nazis,musicians,interrogate,instruments,imperative,impeccable,icu,hurtful,hors,heap,harley's,graduating,graders,glance,endangered,disgust,devious,destruct,demonstration,creates,crazier,countdown,coffee's,chump,cheeseburger,cat's,burglar,brotherhood,berries,ballroom,assumptions,ark,annoyed,allies,allergy,advantages,admirer,admirable,addresses,activate,accompany,wed,victoria's,valve,underpants,twit,triggered,teacher's,tack,strokes,stool,starr's,sham,seasons,sculpture,scrap,sailed,retarded,resourceful,remarkably,refresh,ranks,pressured,precautions,pointy,obligations,nightclub,mustache,month's,minority,mind's,maui,lace,isabella's,improving,iii,hunh,hubby,flare,fierce,farmers,dont,dokey,divided,demise,demanded,dangerously,crushing,considerable,complained,clinging,choked,chem,cheerleading,checkbook,cashmere,calmly,blush,believer,aspect,amazingly,alas,acute,a's,yak,whores,what've,tuition,trey's,tolerance,toilets,tactical,tacos,stairwell,spur,spirited,slower,sewing,separately,rubbed,restricted,punches,protects,partially,ole,nuisance,niagara,motherfuckers,mingle,mia's,kynaston,knack,kinkle,impose,hosting,harry's,gullible,grid,godmother,funniest,friggin,folding,financially,filming,fashions,eater,dysfunctional,drool,distinguished,defence,defeated,cruising,crude,criticize,corruption,contractor,conceive,clone,circulation,cedars,caliber,brighter,blinded,birthdays,bio,bill's,banquet,artificial,anticipate,annoy,achievement,whim,whichever,volatile,veto,vested,uncle's,supports,successfully,shroud,severely,rests,representation,quarantine,premiere,pleases,parent's,painless,pads,orphans,orphanage,offence,obliged,nip,niggers,negotiation,narcotics,nag,mistletoe,meddling,manifest,lookit,loo,lilah,investigated,intrigued,injustice,homicidal,hayward's,gigantic,exposing,elves,disturbance,disastrous,depended,demented,correction,cooped,colby's,cheerful,buyers,brownies,beverage,basics,attorney's,atm,arvin,arcade,weighs,upsets,unethical,tidy,swollen,sweaters,swap,stupidest,sensation,scalpel,rail,prototype,props,prescribed,pompous,poetic,ploy,paws,operates,objections,mushrooms,mulwray,monitoring,manipulation,lured,lays,lasting,kung,keg,jell,internship,insignificant,inmate,incentive,gandhi,fulfilled,flooded,expedition,evolution,discharged,disagreement,dine,dean's,crypt,coroner's,cornered,copied,confrontation,cds,catalogue,brightest,beethoven,banned,attendant,athlete,amaze,airlines,yogurt,wyndemere,wool,vocabulary,vcr,tulsa,tags,tactic,stuffy,slug,sexuality,seniors,segment,revelation,respirator,pulp,prop,producing,processed,pretends,polygraph,perp,pennies,ordinarily,opposition,olives,necks,morally,martyr,martial,lisa's,leftovers,joints,jimmy's,irs,invaded,imported,hopping,homey,hints,helicopters,heed,heated,heartbroken,gulf,greatly,forge,florist,firsthand,fiend,expanding,emma's,defenses,crippled,cousin's,corrected,conniving,conditioner,clears,chemo,bubbly,bladder,beeper,baptism,apb,answer's,anna's,angles,ache,womb,wiring,wench,weaknesses,volunteering,violating,unlocked,unemployment,tummy,tibet,threshold,surrogate,submarine,subid,stray,stated,startle,specifics,snob,slowing,sled,scoot,robbers,rightful,richest,quid,qfxmjrie,puffs,probable,pitched,pierced,pencils,paralysis,nuke,managing,makeover,luncheon,lords,linksynergy,jury's,jacuzzi,ish,interstate,hitched,historic,hangover,gasp,fracture,flock,firemen,drawings,disgusted,darned,coal,clams,chez,cables,broadcasting,brew,borrowing,banged,achieved,wildest,weirder,unauthorized,stunts,sleeves,sixties,shush,shalt,senora,rises,retro,quits,pupils,politicians,pegged,painfully,paging,outlet,omelet,observed,ned's,memorized,lawfully,jackets,interpretation,intercept,ingredient,grownup,glued,gaining,fulfilling,flee,enchanted,dvd,delusion,daring,conservative,conducted,compelling,charitable,carton,bronx,bridesmaids,bribed,boiling,bathrooms,bandage,awareness,awaiting,assign,arrogance,antiques,ainsley,turkeys,travelling,trashing,tic,takeover,sync,supervision,stockings,stalked,stabilized,spacecraft,slob,skates,sirs,sedated,robes,reviews,respecting,rat's,psyche,prominent,prizes,presumptuous,prejudice,platoon,permitted,paragraph,mush,mum's,movements,mist,missions,mints,mating,mantan,lorne,lord's,loads,listener,legendary,itinerary,hugs,hepatitis,heave,guesses,gender,flags,fading,exams,examining,elizabeth's,egyptian,dumbest,dishwasher,dimera's,describing,deceive,cunning,cripple,cove,convictions,congressional,confided,compulsive,compromising,burglary,bun,bumpy,brainwashed,benes,arnie,alvy,affirmative,adrenaline,adamant,watchin,waitresses,uncommon,treaty,transgenic,toughest,toby's,surround,stormed,spree,spilling,spectacle,soaking,significance,shreds,sewers,severed,scarce,scamming,scalp,sami's,salem's,rewind,rehearsing,pretentious,potions,possessions,planner,placing,periods,overrated,obstacle,notices,nerds,meems,medieval,mcmurphy,maturity,maternity,masses,maneuver,lyin,loathe,lawyer's,irv,investigators,hep,grin,gospel,gals,formation,fertility,facilities,exterior,epidemic,eloping,ecstatic,ecstasy,duly,divorcing,distribution,dignan,debut,costing,coaching,clubhouse,clot,clocks,classical,candid,bursting,breather,braces,bennett's,bending,australian,attendance,arsonist,applies,adored,accepts,absorb,vacant,uuh,uphold,unarmed,turd,topolsky,thrilling,thigh,terminate,tempo,sustain,spaceship,snore,sneeze,smuggling,shrine,sera,scott's,salty,salon,ramp,quaint,prostitution,prof,policies,patronize,patio,nasa,morbid,marlo's,mamma,locations,licence,kettle,joyous,invincible,interpret,insecurities,insects,inquiry,infamous,impulses,illusions,holed,glen's,fragments,forrester's,exploit,economics,drivin,des,defy,defenseless,dedicate,cradle,cpr,coupon,countless,conjure,confined,celebrated,cardboard,booking,blur,bleach,ban,backseat,austin's,alternatives,afterward,accomplishment,wordsworth,wisely,wildlife,valet,vaccine,urges,unnatural,unlucky,truths,traumatized,tit,tennessee,tasting,swears,strawberries,steaks,stats,skank,seducing,secretive,screwdriver,schedules,rooting,rightfully,rattled,qualifies,puppets,provides,prospects,pronto,prevented,powered,posse,poorly,polling,pedestal,palms,muddy,morty,miniature,microscope,merci,margin,lecturing,inject,incriminate,hygiene,hospital's,grapefruit,gazebo,funnier,freight,flooding,equivalent,eliminated,elaine's,dios,deacon's,cuter,continental,container,cons,compensation,clap,cbs,cavity,caves,capricorn,canvas,calculations,bossy,booby,bacteria,aides,zende,winthrop,wider,warrants,valentines,undressed,underage,truthfully,tampered,suffers,stored,statute,speechless,sparkling,sod,socially,sidelines,shrek,sank,roy's,raul's,railing,puberty,practices,pesky,parachute,outrage,outdoors,operated,openly,nominated,motions,moods,lunches,litter,kidnappers,itching,intuition,index,imitation,icky,humility,hassling,gallons,firmly,excessive,evolved,employ,eligible,elections,elderly,drugstore,dosage,disrupt,directing,dipping,deranged,debating,cuckoo,cremated,craziness,cooperating,compatible,circumstantial,chimney,bonnie's,blinking,biscuits,belgium,arise,analyzed,admiring,acquire,accounted,willow's,weeping,volumes,views,triad,trashy,transaction,tilt,soothing,slumber,slayers,skirts,siren,ship's,shindig,sentiment,sally's,rosco,riddance,rewarded,quaid,purity,proceeding,pretzels,practiced,politician,polar,panicking,overall,occupation,naming,minimal,mckechnie,massacre,marah's,lovin,leaked,layers,isolation,intruding,impersonating,ignorance,hoop,hamburgers,gwen's,fruits,footprints,fluke,fleas,festivities,fences,feisty,evacuate,emergencies,diabetes,detained,democrat,deceived,creeping,craziest,corpses,conned,coincidences,charleston,bums,brussels,bounced,bodyguards,blasted,bitterness,baloney,ashtray,apocalypse,advances,zillion,watergate,wallpaper,viable,tory's,tenants,telesave,sympathize,sweeter,swam,sup,startin,stages,spencer's,sodas,snowed,sleepover,signor,seein,reviewing,reunited,retainer,restroom,rested,replacing,repercussions,reliving,reef,reconciliation,reconcile,recognise,prevail,preaching,planting,overreact,oof,omen,o'neil,numerous,noose,moustache,morning's,manicure,maids,mah,lorelei's,landlady,hypothetical,hopped,homesick,hives,hesitation,herbs,hectic,heartbreak,haunting,gangs,frown,fingerprint,extract,expired,exhausting,exchanged,exceptional,everytime,encountered,disregard,daytime,cooperative,constitutional,cling,chevron,chaperone,buenos,blinding,bitty,beads,battling,badgering,anticipation,advocate,zander's,waterfront,upstanding,unprofessional,unity,unhealthy,undead,turmoil,truthful,toothpaste,tippin,thoughtless,tagataya,stretching,strategic,spun,shortage,shooters,sheriff's,shady,senseless,sailors,rewarding,refuge,rapid,rah,pun,propane,pronounced,preposterous,pottery,portable,pigeons,pastry,overhearing,ogre,obscene,novels,negotiable,mtv,morgan's,monthly,loner,leisure,leagues,jogging,jaws,itchy,insinuating,insides,induced,immigration,hospitality,hormone,hilda's,hearst,grandpa's,frequently,forthcoming,fists,fifties,etiquette,endings,elevated,editing,dunk,distinction,disabled,dibs,destroys,despises,desired,designers,deprived,dancers,dah,cuddy,crust,conductor,communists,cloak,circumstance,chewed,casserole,bora,bidder,bearer,assessment,artoo,applaud,appalling,amounts,admissions,withdrawal,weights,vowed,virgins,vigilante,vatican,undone,trench,touchdown,throttle,thaw,tha,testosterone,tailor,symptom,swoop,suited,suitcases,stomp,sticker,stakeout,spoiling,snatched,smoochy,smitten,shameless,restraints,researching,renew,relay,regional,refund,reclaim,rapids,raoul,rags,puzzles,purposely,punks,prosecuted,plaid,pineapple,picturing,pickin,pbs,parasites,offspring,nyah,mysteriously,multiply,mineral,masculine,mascara,laps,kramer's,jukebox,interruptions,hoax,gunfire,gays,furnace,exceptions,engraved,elbows,duplicate,drapes,designated,deliberate,deli,decoy,cub,cryptic,crowds,critics,coupla,convert,conventional,condemn,complicate,combine,colossal,clerks,clarity,cassadine's,byes,brushed,bride's,banished,arrests,argon,andy's,alarmed,worships,versa,uncanny,troop,treasury,transformation,terminated,telescope,technicality,sydney's,sundae,stumble,stripping,shuts,separating,schmuck,saliva,robber,retain,remained,relentless,reconnect,recipes,rearrange,ray's,rainy,psychiatrists,producers,policemen,plunge,plugged,patched,overload,ofc,obtained,obsolete,o'malley,numbered,number's,nay,moth,module,mkay,mindless,menus,lullaby,lotte,leavin,layout,knob,killin,karinsky,irregular,invalid,hides,grownups,griff,flaws,flashy,flaming,fettes,evicted,epic,encoded,dread,dil,degrassi,dealings,dangers,cushion,console,concluded,casey's,bowel,beginnings,barged,apes,announcing,amanda's,admits,abroad,abide,abandoning,workshop,wonderfully,woak,warfare,wait'll,wad,violate,turkish,tim's,ter,targeted,susan's,suicidal,stayin,sorted,slamming,sketchy,shoplifting,shapes,selected,sarah's,retiring,raiser,quizmaster,pursued,pupkin,profitable,prefers,politically,phenomenon,palmer's,olympics,needless,nature's,mutt,motherhood,momentarily,migraine,lizzie's,lilo,lifts,leukemia,leftover,law's,keepin,idol,hinks,hellhole,h'mm,gowns,goodies,gallon,futures,friction,finale,farms,extraction,entertained,electronics,eighties,earth's,dmv,darker,daniel's,cum,conspiring,consequence,cheery,caps,calf,cadet,builds,benign,barney's,aspects,artillery,apiece,allison's,aggression,adjustments,abusive,abduction,wiping,whipping,welles,unspeakable,unlimited,unidentified,trivial,transcripts,threatens,textbook,tenant,supervise,superstitious,stricken,stretched,story's,stimulating,steep,statistics,spielberg,sodium,slices,shelves,scratches,saudi,sabotaged,roxy's,retrieval,repressed,relation,rejecting,quickie,promoting,ponies,peeking,paw,paolo,outraged,observer,o'connell,moping,moaning,mausoleum,males,licked,kovich,klutz,iraq,interrogating,interfered,intensive,insulin,infested,incompetence,hyper,horrified,handedly,hacked,guiding,glamour,geoff,gekko,fraid,fractured,formerly,flour,firearms,fend,executives,examiner,evaluate,eloped,duke's,disoriented,delivers,dashing,crystals,crossroads,crashdown,court's,conclude,coffees,cockroach,climate,chipped,camps,brushing,boulevard,bombed,bolts,begs,baths,baptized,astronaut,assurance,anemia,allegiance,aiming,abuela,abiding,workplace,withholding,weave,wearin,weaker,warnings,usa,tours,thesis,terrorism,suffocating,straws,straightforward,stench,steamed,starboard,sideways,shrinks,shortcut,sean's,scram,roasted,roaming,riviera,respectfully,repulsive,recognizes,receiver,psychiatry,provoked,penitentiary,peed,pas,painkillers,oink,norm,ninotchka,muslim,montgomery's,mitzvah,milligrams,mil,midge,marshmallows,markets,macy's,looky,lapse,kubelik,knit,jeb,investments,intellect,improvise,implant,hometown,hanged,handicap,halo,governor's,goa'ulds,giddy,gia's,geniuses,fruitcake,footing,flop,findings,fightin,fib,editorial,drinkin,doork,discovering,detour,danish,cuddle,crashes,coordinate,combo,colonnade,collector,cheats,cetera,canadians,bip,bailiff,auditioning,assed,amused,alienate,algebra,alexi,aiding,aching,woe,wah,unwanted,typically,tug,topless,tongues,tiniest,them's,symbols,superiors,soy,soften,sheldrake,sensors,seller,seas,ruler,rival,rips,renowned,recruiting,reasoning,rawley,raisins,racial,presses,preservation,portfolio,oversight,organizing,obtain,observing,nessa,narrowed,minions,midwest,meth,merciful,manages,magistrate,lawsuits,labour,invention,intimidating,infirmary,indicated,inconvenient,imposter,hugged,honoring,holdin,hades,godforsaken,fumes,forgery,foremost,foolproof,folder,folded,flattery,fingertips,financing,fifteenth,exterminator,explodes,eccentric,drained,dodging,documented,disguised,developments,currency,crafts,constructive,concealed,compartment,chute,chinpokomon,captains,capitol,calculated,buses,bodily,astronauts,alimony,accustomed,accessories,abdominal,zen,zach's,wrinkle,wallow,viv,vicinity,venue,valued,valium,valerie's,upgrade,upcoming,untrue,uncover,twig,twelfth,trembling,treasures,torched,toenails,timed,termites,telly,taunting,taransky,tar,talker,succubus,statues,smarts,sliding,sizes,sighting,semen,seizures,scarred,savvy,sauna,saddest,sacrificing,rubbish,riled,ricky's,rican,revive,recruit,ratted,rationally,provenance,professors,prestigious,pms,phonse,perky,pedal,overdose,organism,nasal,nanites,mushy,movers,moot,missus,midterm,merits,melodramatic,manure,magnetic,knockout,knitting,jig,invading,interpol,incapacitated,idle,hotline,horse's,highlight,hauling,hair's,gunpoint,greenwich,grail,ganza,framing,formally,fleeing,flap,flannel,fin,fibers,faded,existing,email,eavesdrop,dwelling,dwarf,donations,detected,desserts,dar,corporations,constellation,collision,chic,calories,businessmen,buchanan's,breathtaking,bleak,blacked,batter,balanced,ante,aggravated,agencies,abu,yanked,wuh,withdrawn,wigand,whoah,wham,vocal,unwind,undoubtedly,unattractive,twitch,trimester,torrance,timetable,taxpayers,strained,stationed,stared,slapping,sincerity,signatures,siding,siblings,shit's,shenanigans,shacking,seer,satellites,sappy,samaritan,rune,regained,rebellion,proceeds,privy,power's,poorer,politely,paste,oysters,overruled,olaf,nightcap,networks,necessity,mosquito,millimeter,michelle's,merrier,massachusetts,manuscript,manufacture,manhood,lunar,lug,lucked,loaned,kilos,ignition,hurl,hauled,harmed,goodwill,freshmen,forming,fenmore,fasten,farce,failures,exploding,erratic,elm,drunks,ditching,d'artagnan,crops,cramped,contacting,coalition,closets,clientele,chimp,cavalry,casa,cabs,bled,bargained,arranging,archives,anesthesia,amuse,altering,afternoons,accountable,abetting,wrinkles,wolek,waved,unite,uneasy,unaware,ufo,toot,toddy,tens,tattooed,tad's,sway,stained,spauldings,solely,sliced,sirens,schibetta,scatter,rumours,roger's,robbie's,rinse,remo,remedy,redemption,queen's,progressive,pleasures,picture's,philosopher,pacey's,optimism,oblige,natives,muy,measuring,measured,masked,mascot,malicious,mailing,luca,lifelong,kosher,koji,kiddies,judas,isolate,intercepted,insecurity,initially,inferior,incidentally,ifs,hun,heals,headlights,guided,growl,grilling,glazed,gem,gel,gaps,fundamental,flunk,floats,fiery,fairness,exercising,excellency,evenings,ere,enrolled,disclosure,det,department's,damp,curling,cupboard,counterfeit,cooling,condescending,conclusive,clicked,cleans,cholesterol,chap,cashed,brow,broccoli,brats,blueprints,blindfold,biz,billing,barracks,attach,aquarium,appalled,altitude,alrighty,aimed,yawn,xander's,wynant,winslow's,welcomed,violations,upright,unsolved,unreliable,toots,tighten,symbolic,sweatshirt,steinbrenner,steamy,spouse,sox,sonogram,slowed,slots,sleepless,skeleton,shines,roles,retaliate,representatives,rephrase,repeated,renaissance,redeem,rapidly,rambling,quilt,quarrel,prying,proverbial,priced,presiding,presidency,prescribe,prepped,pranks,possessive,plaintiff,philosophical,pest,persuaded,perk,pediatrics,paige's,overlooked,outcast,oop,odor,notorious,nightgown,mythology,mumbo,monitored,mediocre,master's,mademoiselle,lunchtime,lifesaver,legislation,leaned,lambs,lag,killings,interns,intensity,increasing,identities,hounding,hem,hellmouth,goon,goner,ghoul,germ,gardening,frenzy,foyer,food's,extras,extinct,exhibition,exaggerate,everlasting,enlightened,drilling,doubles,digits,dialed,devote,defined,deceitful,d'oeuvres,csi,cosmetic,contaminated,conspired,conning,colonies,cerebral,cavern,cathedral,carving,butting,boiled,blurry,beams,barf,babysit,assistants,ascension,architecture,approaches,albums,albanian,aaaaah,wildly,whoopee,whiny,weiskopf,walkie,vultures,veteran,vacations,upfront,unresolved,tile,tampering,struggled,stockholders,specially,snaps,sleepwalking,shrunk,sermon,seeks,seduction,scenarios,scams,ridden,revolve,repaired,regulation,reasonably,reactor,quotes,preserved,phenomenal,patrolling,paranormal,ounces,omigod,offs,nonstop,nightfall,nat,militia,meeting's,logs,lineup,libby's,lava,lashing,labels,kilometers,kate's,invites,investigative,innocents,infierno,incision,import,implications,humming,highlights,haunts,greeks,gloss,gloating,general's,frannie,flute,fled,fitted,finishes,fiji,fetal,feeny,entrapment,edit,dyin,download,discomfort,dimensions,detonator,dependable,deke,decree,dax,cot,confiscated,concludes,concede,complication,commotion,commence,chulak,caucasian,casually,canary,brainer,bolie,ballpark,arm's,anwar,anatomy,analyzing,accommodations,yukon,youse,wring,wharf,wallowing,uranium,unclear,treason,transgenics,thrive,think's,thermal,territories,tedious,survives,stylish,strippers,sterile,squeezing,squeaky,sprained,solemn,snoring,sic,shifting,shattering,shabby,seams,scrawny,rotation,risen,revoked,residue,reeks,recite,reap,ranting,quoting,primal,pressures,predicament,precision,plugs,pits,pinpoint,petrified,petite,persona,pathological,passports,oughtta,nods,nighter,navigate,nashville,namely,museums,morale,milwaukee,meditation,mathematics,martin's,malta,logan's,latter,kippie,jackie's,intrigue,intentional,insufferable,incomplete,inability,imprisoned,hup,hunky,how've,horrifying,hearty,headmaster,hath,har,hank's,handbook,hamptons,grazie,goof,george's,funerals,fuck's,fraction,forks,finances,fetched,excruciating,enjoyable,enhanced,enhance,endanger,efficiency,dumber,drying,diabolical,destroyer,desirable,defendants,debris,darts,cuisine,cucumber,cube,crossword,contestant,considers,comprehend,club's,clipped,classmates,choppers,certificates,carmen's,canoe,candlelight,building's,brutally,brutality,boarded,bathrobe,backward,authorize,audrey's,atom,assemble,appeals,airports,aerobics,ado,abbott's,wholesome,whiff,vessels,vermin,varsity,trophies,trait,tragically,toying,titles,tissues,testy,team's,tasteful,surge,sun's,studios,strips,stocked,stephen's,staircase,squares,spinach,sow,southwest,southeast,sookie's,slayer's,sipping,singers,sidetracked,seldom,scrubbing,scraping,sanctity,russell's,ruse,robberies,rink,ridin,retribution,reinstated,refrain,rec,realities,readings,radiant,protesting,projector,posed,plutonium,plaque,pilar's,payin,parting,pans,o'reilly,nooooo,motorcycles,motherfucking,mein,measly,marv,manic,line's,lice,liam,lenses,lama,lalita,juggling,jerking,jamie's,intro,inevitably,imprisonment,hypnosis,huddle,horrendous,hobbies,heavier,heartfelt,harlin,hairdresser,grub,gramps,gonorrhea,gardens,fussing,fragment,fleeting,flawless,flashed,fetus,exclusively,eulogy,equality,enforce,distinctly,disrespectful,denies,crossbow,crest,cregg,crabs,cowardly,countess,contrast,contraction,contingency,consulted,connects,confirming,condone,coffins,cleansing,cheesecake,certainty,captain's,cages,c'est,briefed,brewing,bravest,bosom,boils,binoculars,bachelorette,aunt's,atta,assess,appetizer,ambushed,alerted,woozy,withhold,weighed,vulgar,viral,utmost,unusually,unleashed,unholy,unhappiness,underway,uncovered,unconditional,typewriter,typed,twists,sweeps,supervised,supermodel,suburbs,subpoenaed,stringing,snyder's,snot,skeptical,skateboard,shifted,secret's,scottish,schoolgirl,romantically,rocked,revoir,reviewed,respiratory,reopen,regiment,reflects,refined,puncture,pta,prone,produces,preach,pools,polished,pods,planetarium,penicillin,peacefully,partner's,nurturing,nation's,more'n,monastery,mmhmm,midgets,marklar,machinery,lodged,lifeline,joanna's,jer,jellyfish,infiltrate,implies,illegitimate,hutch,horseback,henri,heist,gents,frickin,freezes,forfeit,followers,flakes,flair,fathered,fascist,eternally,eta,epiphany,enlisted,eleventh,elect,effectively,dos,disgruntled,discrimination,discouraged,delinquent,decipher,danvers,dab,cubes,credible,coping,concession,cnn,clash,chills,cherished,catastrophe,caretaker,bulk,bras,branches,bombshell,birthright,billionaire,awol,ample,alumni,affections,admiration,abbotts,zelda's,whatnot,watering,vinegar,vietnamese,unthinkable,unseen,unprepared,unorthodox,underhanded,uncool,transmitted,traits,timeless,thump,thermometer,theoretically,theoretical,testament,tapping,tagged,tac,synthetic,syndicate,swung,surplus,supplier,stares,spiked,soviets,solves,smuggle,scheduling,scarier,saucer,reinforcements,recruited,rant,quitter,prudent,projection,previously,powdered,poked,pointers,placement,peril,penetrate,penance,patriotic,passions,opium,nudge,nostrils,nevermind,neurological,muslims,mow,momentum,mockery,mobster,mining,medically,magnitude,maggie's,loudly,listing,killer's,kar,jim's,insights,indicted,implicate,hypocritical,humanly,holiness,healthier,hammered,haldeman,gunman,graphic,gloom,geography,gary's,freshly,francs,formidable,flunked,flawed,feminist,faux,ewww,escorted,escapes,emptiness,emerge,drugging,dozer,doc's,directorate,diana's,derevko,deprive,deodorant,cryin,crusade,crocodile,creativity,controversial,commands,coloring,colder,cognac,clocked,clippings,christine's,chit,charades,chanting,certifiable,caterers,brute,brochures,briefs,bran,botched,blinders,bitchin,bauer's,banter,babu,appearing,adequate,accompanied,abrupt,abdomen,zones,wooo,woken,winding,vip,venezuela,unanimous,ulcer,tread,thirteenth,thankfully,tame,tabby's,swine,swimsuit,swans,suv,stressing,steaming,stamped,stabilize,squirm,spokesman,snooze,shuffle,shredded,seoul,seized,seafood,scratchy,savor,sadistic,roster,rica,rhetorical,revlon,realist,reactions,prosecuting,prophecies,prisons,precedent,polyester,petals,persuasion,paddles,o'leary,nuthin,neighbour,negroes,naval,mute,muster,muck,minnesota,meningitis,matron,mastered,markers,maris's,manufactured,lot's,lockers,letterman,legged,launching,lanes,journals,indictment,indicating,hypnotized,housekeeping,hopelessly,hmph,hallucinations,grader,goldilocks,girly,furthermore,frames,flask,expansion,envelopes,engaging,downside,doves,doorknob,distinctive,dissolve,discourage,disapprove,diabetic,departed,deliveries,decorator,deaq,crossfire,criminally,containment,comrades,complimentary,commitments,chum,chatter,chapters,catchy,cashier,cartel,caribou,cardiologist,bull's,buffer,brawl,bowls,booted,boat's,billboard,biblical,barbershop,awakening,aryan,angst,administer,acquitted,acquisition,aces,accommodate,zellie,yield,wreak,witch's,william's,whistles,wart,vandalism,vamps,uterus,upstate,unstoppable,unrelated,understudy,tristin,transporting,transcript,tranquilizer,trails,trafficking,toxins,tonsils,timing's,therapeutic,tex,subscription,submitted,stephanie's,stempel,spotting,spectator,spatula,soho,softer,snotty,slinging,showered,sexiest,sensual,scoring,sadder,roam,rimbaud,rim,rewards,restrain,resilient,remission,reinstate,rehash,recollection,rabies,quinn's,presenting,preference,prairie,popsicle,plausible,plantation,pharmaceutical,pediatric,patronizing,patent,participation,outdoor,ostrich,ortolani,oooooh,omelette,neighbor's,neglect,nachos,movie's,mixture,mistrial,mio,mcginty's,marseilles,mare,mandate,malt,luv,loophole,literary,liberation,laughin,lacey's,kevvy,jah,irritated,intends,initiation,initiated,initiate,influenced,infidelity,indigenous,inc,idaho,hypothermia,horrific,hive,heroine,groupie,grinding,graceful,government's,goodspeed,gestures,gah,frantic,extradition,evil's,engineers,echelon,earning,disks,discussions,demolition,definitive,dawnie,dave's,date's,dared,dan's,damsel,curled,courtyard,constitutes,combustion,collective,collateral,collage,col,chant,cassette,carol's,carl's,calculating,bumping,britain,bribes,boardwalk,blinds,blindly,bleeds,blake's,bickering,beasts,battlefield,bankruptcy,backside,avenge,apprehended,annie's,anguish,afghanistan,acknowledged,abusing,youthful,yells,yanking,whomever,when'd,waterfall,vomiting,vine,vengeful,utility,unpacking,unfamiliar,undying,tumble,trolls,treacherous,todo,tipping,tantrum,tanked,summons,strategies,straps,stomped,stinkin,stings,stance,staked,squirrels,sprinkles,speculate,specialists,sorting,skinned,sicko,sicker,shootin,shep,shatter,seeya,schnapps,s'posed,rows,rounded,ronee,rite,revolves,respectful,resource,reply,rendered,regroup,regretting,reeling,reckoned,rebuilding,randy's,ramifications,qualifications,pulitzer,puddy,projections,preschool,pots,potassium,plissken,platonic,peter's,permalash,performer,peasant,outdone,outburst,ogh,obscure,mutants,mugging,molecules,misfortune,miserably,miraculously,medications,medals,margaritas,manpower,lovemaking,long's,logo,logically,leeches,latrine,lamps,lacks,kneel,johnny's,jenny's,inflict,impostor,icon,hypocrisy,hype,hosts,hippies,heterosexual,heightened,hecuba's,hecuba,healer,habitat,gunned,grooming,groo,groin,gras,gory,gooey,gloomy,frying,friendships,fredo,foil,fishermen,firepower,fess,fathom,exhaustion,evils,epi,endeavor,ehh,eggnog,dreaded,drafted,dimensional,detached,deficit,d'arcy,crotch,coughing,coronary,cookin,contributed,consummate,congrats,concerts,companionship,caved,caspar,bulletproof,bris,brilliance,breakin,brash,blasting,beak,arabia,analyst,aluminum,aloud,alligator,airtight,advising,advertise,adultery,administered,aches,abstract,aahh,wronged,wal,voluntary,ventilation,upbeat,uncertainty,trot,trillion,tricia's,trades,tots,tol,tightly,thingies,tending,technician,tarts,surreal,summer's,strengths,specs,specialize,spat,spade,slogan,sloane's,shrew,shaping,seth's,selves,seemingly,schoolwork,roomie,requirements,redundant,redo,recuperating,recommendations,ratio,rabid,quart,pseudo,provocative,proudly,principal's,pretenses,prenatal,pillar,photographers,photographed,pharmaceuticals,patron,pacing,overworked,originals,nicotine,newsletter,neighbours,murderous,miller's,mileage,mechanics,mayonnaise,massages,maroon,lucrative,losin,lil,lending,legislative,kat,juno,iran,interrogated,instruction,injunction,impartial,homing,heartbreaker,harm's,hacks,glands,giver,fraizh,flows,flips,flaunt,excellence,estimated,espionage,englishman,electrocuted,eisenhower,dusting,ducking,drifted,donna's,donating,dom,distribute,diem,daydream,cylon,curves,crutches,crates,cowards,covenant,converted,contributions,composed,comfortably,cod,cockpit,chummy,chitchat,childbirth,charities,businesswoman,brood,brewery,bp's,blatant,bethy,barring,bagged,awakened,assumes,assembled,asbestos,arty,artwork,arc,anthony's,aka,airplanes,accelerated,worshipped,winnings,why're,whilst,wesley's,volleyball,visualize,unprotected,unleash,unexpectedly,twentieth,turnpike,trays,translated,tones,three's,thicker,therapists,takeoff,sums,stub,streisand,storm's,storeroom,stethoscope,stacked,sponsors,spiteful,solutions,sneaks,snapping,slaughtered,slashed,simplest,silverware,shits,secluded,scruples,scrubs,scraps,scholar,ruptured,rubs,roaring,relying,reflected,refers,receptionist,recap,reborn,raisin,rainforest,rae's,raditch,radiator,pushover,pout,plastered,pharmacist,petroleum,perverse,perpetrator,passages,ornament,ointment,occupy,nineties,napping,nannies,mousse,mort,morocco,moors,momentary,modified,mitch's,misunderstandings,marina's,marcy's,marched,manipulator,malfunction,loot,limbs,latitude,lapd,laced,kivar,kickin,interface,infuriating,impressionable,imposing,holdup,hires,hick,hesitated,hebrew,hearings,headphones,hammering,groundwork,grotesque,greenhouse,gradually,graces,genetics,gauze,garter,gangsters,g's,frivolous,freelance,freeing,fours,forwarding,feud,ferrars,faulty,fantasizing,extracurricular,exhaust,empathy,educate,divorces,detonate,depraved,demeaning,declaring,deadlines,dea,daria's,dalai,cursing,cufflink,crows,coupons,countryside,coo,consultation,composer,comply,comforted,clive,claustrophobic,chef's,casinos,caroline's,capsule,camped,cairo,busboy,bred,bravery,bluth,biography,berserk,bennetts,baskets,attacker,aplastic,angrier,affectionate,zit,zapped,yorker,yarn,wormhole,weaken,vat,unrealistic,unravel,unimportant,unforgettable,twain,tv's,tush,turnout,trio,towed,tofu,textbooks,territorial,suspend,supplied,superbowl,sundays,stutter,stewardess,stepson,standin,sshh,specializes,spandex,souvenirs,sociopath,snails,slope,skeletons,shivering,sexier,sequel,sensory,selfishness,scrapbook,romania,riverside,rites,ritalin,rift,ribbons,reunite,remarry,relaxation,reduction,realization,rattling,rapist,quad,pup,psychosis,promotions,presumed,prepping,posture,poses,pleasing,pisses,piling,photographic,pfft,persecuted,pear,part's,pantyhose,padded,outline,organizations,operatives,oohh,obituary,northeast,nina's,neural,negotiator,nba,natty,nathan's,minimize,merl,menopause,mennihan,marty's,martimmys,makers,loyalties,literal,lest,laynie,lando,justifies,josh's,intimately,interact,integrated,inning,inexperienced,impotent,immortality,imminent,ich,horrors,hooky,holders,hinges,heartbreaking,handcuffed,gypsies,guacamole,grovel,graziella,goggles,gestapo,fussy,functional,filmmaker,ferragamo,feeble,eyesight,explosions,experimenting,enzo's,endorsement,enchanting,eee,ed's,duration,doubtful,dizziness,dismantle,disciplinary,disability,detectors,deserving,depot,defective,decor,decline,dangling,dancin,crumble,criteria,creamed,cramping,cooled,conceal,component,competitors,clockwork,clark's,circuits,chrissakes,chrissake,chopping,cabinets,buttercup,brooding,bonfire,blurt,bluestar,bloated,blackmailer,beforehand,bathed,bathe,barcode,banjo,banish,badges,babble,await,attentive,artifacts,aroused,antibodies,animosity,administrator,accomplishments,ya'll,wrinkled,wonderland,willed,whisk,waltzing,waitressing,vis,vin,vila,vigilant,upbringing,unselfish,unpopular,unmarried,uncles,trendy,trajectory,targeting,surroundings,stun,striped,starbucks,stamina,stalled,staking,stag,spoils,snuff,snooty,snide,shrinking,senorita,securities,secretaries,scrutiny,scoundrel,saline,salads,sails,rundown,roz's,roommate's,riddles,responses,resistant,requirement,relapse,refugees,recommending,raspberry,raced,prosperity,programme,presumably,preparations,posts,pom,plight,pleaded,pilot's,peers,pecan,particles,pantry,overturned,overslept,ornaments,opposing,niner,nfl,negligent,negligence,nailing,mutually,mucho,mouthed,monstrous,monarchy,minsk,matt's,mateo's,marking,manufacturing,manager's,malpractice,maintaining,lowly,loitering,logged,lingering,light's,lettin,lattes,kim's,kamal,justification,juror,junction,julie's,joys,johnson's,jillefsky,jacked,irritate,intrusion,inscription,insatiable,infect,inadequate,impromptu,icing,hmmmm,hefty,grammar,generate,gdc,gasket,frightens,flapping,firstborn,fire's,fig,faucet,exaggerated,estranged,envious,eighteenth,edible,downward,dopey,doesn,disposition,disposable,disasters,disappointments,dipped,diminished,dignified,diaries,deported,deficiency,deceit,dealership,deadbeat,curses,coven,counselors,convey,consume,concierge,clutches,christians,cdc,casbah,carefree,callous,cahoots,caf,brotherly,britches,brides,bop,bona,bethie,beige,barrels,ballot,ave,autographed,attendants,attachment,attaboy,astonishing,ashore,appreciative,antibiotic,aneurysm,afterlife,affidavit,zuko,zoning,work's,whats,whaddaya,weakened,watermelon,vasectomy,unsuspecting,trial's,trailing,toula,topanga,tonio,toasted,tiring,thereby,terrorized,tenderness,tch,tailing,syllable,sweats,suffocated,sucky,subconsciously,starvin,staging,sprouts,spineless,sorrows,snowstorm,smirk,slicery,sledding,slander,simmer,signora,sigmund,siege,siberia,seventies,sedate,scented,sampling,sal's,rowdy,rollers,rodent,revenue,retraction,resurrection,resigning,relocate,releases,refusal,referendum,recuperate,receptive,ranking,racketeering,queasy,proximity,provoking,promptly,probability,priors,princes,prerogative,premed,pornography,porcelain,poles,podium,pinched,pig's,pendant,packet,owner's,outsiders,outpost,orbing,opportunist,olanov,observations,nurse's,nobility,neurologist,nate's,nanobot,muscular,mommies,molested,misread,melon,mediterranean,mea,mastermind,mannered,maintained,mackenzie's,liberated,lesions,lee's,laundromat,landscape,lagoon,labeled,jolt,intercom,inspect,insanely,infrared,infatuation,indulgent,indiscretion,inconsiderate,incidents,impaired,hurrah,hungarian,howling,honorary,herpes,hasta,harassed,hanukkah,guides,groveling,groosalug,geographic,gaze,gander,galactica,futile,fridays,flier,fixes,fide,fer,feedback,exploiting,exorcism,exile,evasive,ensemble,endorse,emptied,dreary,dreamy,downloaded,dodged,doctored,displayed,disobeyed,disneyland,disable,diego's,dehydrated,defect,customary,csc,criticizing,contracted,contemplating,consists,concepts,compensate,commonly,colours,coins,coconuts,cockroaches,clogged,cincinnati,churches,chronicle,chilling,chaperon,ceremonies,catalina's,cant,cameraman,bulbs,bucklands,bribing,brava,bracelets,bowels,bobby's,bmw,bluepoint,baton,barred,balm,audit,astronomy,aruba,appetizers,appendix,antics,anointed,analogy,almonds,albuquerque,abruptly,yore,yammering,winch,white's,weston's,weirdness,wangler,vibrations,vendor,unmarked,unannounced,twerp,trespass,tres,travesty,transported,transfusion,trainee,towelie,topics,tock,tiresome,thru,theatrical,terrain,suspect's,straightening,staggering,spaced,sonar,socializing,sitcom,sinus,sinners,shambles,serene,scraped,scones,scepter,sarris,saberhagen,rouge,rigid,ridiculously,ridicule,reveals,rents,reflecting,reconciled,rate's,radios,quota,quixote,publicist,pubes,prune,prude,provider,propaganda,prolonged,projecting,prestige,precrime,postponing,pluck,perpetual,permits,perish,peppermint,peeled,particle,parliament,overdo,oriented,optional,nutshell,notre,notions,nostalgic,nomination,mulan,mouthing,monkey's,mistook,mis,milhouse,mel's,meddle,maybourne,martimmy,loon,lobotomy,livelihood,litigation,lippman,likeness,laurie's,kindest,kare,kaffee,jocks,jerked,jeopardizing,jazzed,investing,insured,inquisition,inhale,ingenious,inflation,incorrect,igby,ideals,holier,highways,hereditary,helmets,heirloom,heinous,haste,harmsway,hardship,hanky,gutters,gruesome,groping,governments,goofing,godson,glare,garment,founding,fortunes,foe,finesse,figuratively,ferrie,fda,external,examples,evacuation,ethnic,est,endangerment,enclosed,emphasis,dyed,dud,dreading,dozed,dorky,dmitri,divert,dissertation,discredit,director's,dialing,describes,decks,cufflinks,crutch,creator,craps,corrupted,coronation,contemporary,consumption,considerably,comprehensive,cocoon,cleavage,chile,carriers,carcass,cannery,bystander,brushes,bruising,bribery,brainstorm,bolted,binge,bart's,barracuda,baroness,ballistics,b's,astute,arroway,arabian,ambitions,alexandra's,afar,adventurous,adoptive,addicts,addictive,accessible,yadda,wilson's,wigs,whitelighters,wematanye,weeds,wedlock,wallets,walker's,vulnerability,vroom,vibrant,vertical,vents,uuuh,urgh,upped,unsettling,unofficial,unharmed,underlying,trippin,trifle,tracing,tox,tormenting,timothy's,threads,theaters,thats,tavern,taiwan,syphilis,susceptible,summary,suites,subtext,stickin,spices,sores,smacked,slumming,sixteenth,sinks,signore,shitting,shameful,shacked,sergei,septic,seedy,security's,searches,righteousness,removal,relish,relevance,rectify,recruits,recipient,ravishing,quickest,pupil,productions,precedence,potent,pooch,pledged,phoebs,perverted,peeing,pedicure,pastrami,passionately,ozone,overlooking,outnumbered,outlook,oregano,offender,nukes,novelty,nosed,nighty,nifty,mugs,mounties,motivate,moons,misinterpreted,miners,mercenary,mentality,mas,marsellus,mapped,malls,lupus,lumbar,lovesick,longitude,lobsters,likelihood,leaky,laundering,latch,japs,jafar,instinctively,inspires,inflicted,inflammation,indoors,incarcerated,imagery,hundredth,hula,hemisphere,handkerchief,hand's,gynecologist,guittierez,groundhog,grinning,graduates,goodbyes,georgetown,geese,fullest,ftl,floral,flashback,eyelashes,eyelash,excluded,evening's,evacuated,enquirer,endlessly,encounters,elusive,disarm,detest,deluding,dangle,crabby,cotillion,corsage,copenhagen,conjugal,confessional,cones,commandment,coded,coals,chuckle,christmastime,christina's,cheeseburgers,chardonnay,ceremonial,cept,cello,celery,carter's,campfire,calming,burritos,burp,buggy,brundle,broflovski,brighten,bows,borderline,blinked,bling,beauties,bauers,battered,athletes,assisting,articulate,alot,alienated,aleksandr,ahhhhh,agreements,agamemnon,accountants,zat,y'see,wrongful,writer's,wrapper,workaholic,wok,winnebago,whispered,warts,vikki's,verified,vacate,updated,unworthy,unprecedented,unanswered,trend,transformed,transform,trademark,tote,tonane,tolerated,throwin,throbbing,thriving,thrills,thorns,thereof,there've,terminator,tendencies,tarot,tailed,swab,sunscreen,stretcher,stereotype,spike's,soggy,sobbing,slopes,skis,skim,sizable,sightings,shucks,shrapnel,sever,senile,sections,seaboard,scripts,scorned,saver,roxanne's,resemble,red's,rebellious,rained,putty,proposals,prenup,positioned,portuguese,pores,pinching,pilgrims,pertinent,peeping,pamphlet,paints,ovulating,outbreak,oppression,opposites,occult,nutcracker,nutcase,nominee,newt,newsstand,newfound,nepal,mocked,midterms,marshmallow,manufacturer,managers,majesty's,maclaren,luscious,lowered,loops,leans,laurence's,krudski,knowingly,keycard,katherine's,junkies,juilliard,judicial,jolinar,jase,irritable,invaluable,inuit,intoxicating,instruct,insolent,inexcusable,induce,incubator,illustrious,hydrogen,hunsecker,hub,houseguest,honk,homosexuals,homeroom,holly's,hindu,hernia,harming,handgun,hallways,hallucination,gunshots,gums,guineas,groupies,groggy,goiter,gingerbread,giggling,geometry,genre,funded,frontal,frigging,fledged,fedex,feat,fairies,eyeball,extending,exchanging,exaggeration,esteemed,ergo,enlist,enlightenment,encyclopedia,drags,disrupted,dispense,disloyal,disconnect,dimitri,desks,dentists,delhi,delacroix,degenerate,deemed,decay,daydreaming,cushions,cuddly,corroborate,contender,congregation,conflicts,confessions,complexion,completion,compensated,cobbler,closeness,chilled,checkmate,channing,carousel,calms,bylaws,bud's,benefactor,belonging,ballgame,baiting,backstabbing,assassins,artifact,armies,appoint,anthropology,anthropologist,alzheimer's,allegedly,alex's,airspace,adversary,adolf,actin,acre,aced,accuses,accelerant,abundantly,abstinence,abc,zsa,zissou,zandt,yom,yapping,wop,witchy,winter's,willows,whee,whadaya,want's,walter's,waah,viruses,vilandra,veiled,unwilling,undress,undivided,underestimating,ultimatums,twirl,truckload,tremble,traditionally,touring,touche,toasting,tingling,tiles,tents,tempered,sussex,sulking,stunk,stretches,sponges,spills,softly,snipers,slid,sedan,screens,scourge,rooftop,rog,rivalry,rifles,riana,revolting,revisit,resisted,rejects,refreshments,redecorating,recurring,recapture,raysy,randomly,purchases,prostitutes,proportions,proceeded,prevents,pretense,prejudiced,precogs,pouting,poppie,poofs,pimple,piles,pediatrician,patrick's,pathology,padre,packets,paces,orvelle,oblivious,objectivity,nikki's,nighttime,nervosa,navigation,moist,moan,minors,mic,mexicans,meurice,melts,mau,mats,matchmaker,markings,maeby,lugosi,lipnik,leprechaun,kissy,kafka,italians,introductions,intestines,intervene,inspirational,insightful,inseparable,injections,informal,influential,inadvertently,illustrated,hussy,huckabees,hmo,hittin,hiss,hemorrhaging,headin,hazy,haystack,hallowed,haiti,haa,grudges,grenades,granilith,grandkids,grading,gracefully,godsend,gobbles,fyi,future's,fun's,fret,frau,fragrance,fliers,firms,finchley,fbi's,farts,eyewitnesses,expendable,existential,endured,embraced,elk,ekg,dude's,dragonfly,dorms,domination,directory,depart,demonstrated,delaying,degrading,deduction,darlings,dante's,danes,cylons,counsellor,cortex,cop's,coordinator,contraire,consensus,consciously,conjuring,congratulating,compares,commentary,commandant,cokes,centimeters,cc's,caucus,casablanca,buffay,buddy's,brooch,bony,boggle,blood's,bitching,bistro,bijou,bewitched,benevolent,bends,bearings,barren,arr,aptitude,antenna,amish,amazes,alcatraz,acquisitions,abomination,worldly,woodstock,withstand,whispers,whadda,wayward,wayne's,wailing,vinyl,variables,vanishing,upscale,untouchable,unspoken,uncontrollable,unavoidable,unattended,tuning,trite,transvestite,toupee,timid,timers,themes,terrorizing,teamed,taipei,t's,swana,surrendered,suppressed,suppress,stumped,strolling,stripe,storybook,storming,stomachs,stoked,stationery,springtime,spontaneity,sponsored,spits,spins,soiree,sociology,soaps,smarty,shootout,shar,settings,sentiments,senator's,scramble,scouting,scone,runners,rooftops,retract,restrictions,residency,replay,remainder,regime,reflexes,recycling,rcmp,rawdon,ragged,quirky,quantico,psychologically,prodigal,primo,pounce,potty,portraits,pleasantries,plane's,pints,phd,petting,perceive,patrons,parameters,outright,outgoing,onstage,officer's,o'connor,notwithstanding,noah's,nibble,newmans,neutralize,mutilated,mortality,monumental,ministers,millionaires,mentions,mcdonald's,mayflower,masquerade,mangy,macreedy,lunatics,luau,lover's,lovable,louie's,locating,lizards,limping,lasagna,largely,kwang,keepers,juvie,jaded,ironing,intuitive,intensely,insure,installation,increases,incantation,identifying,hysteria,hypnotize,humping,heavyweight,happenin,gung,griet,grasping,glorified,glib,ganging,g'night,fueled,focker,flunking,flimsy,flaunting,fixated,fitzwallace,fictional,fearing,fainting,eyebrow,exonerated,ether,ers,electrician,egotistical,earthly,dusted,dues,donors,divisions,distinguish,displays,dismissal,dignify,detonation,deploy,departments,debrief,dazzling,dawn's,dan'l,damnedest,daisies,crushes,crucify,cordelia's,controversy,contraband,contestants,confronting,communion,collapsing,cocked,clock's,clicks,cliche,circular,circled,chord,characteristics,chandelier,casualty,carburetor,callers,bup,broads,breathes,boca,bobbie's,bloodshed,blindsided,blabbing,binary,bialystock,bashing,ballerina,ball's,aviva,avalanche,arteries,appliances,anthem,anomaly,anglo,airstrip,agonizing,adjourn,abandonment,zack's,you's,yearning,yams,wrecker,word's,witnessing,winged,whence,wept,warsaw,warp,warhead,wagons,visibility,usc,unsure,unions,unheard,unfreeze,unfold,unbalanced,ugliest,troublemaker,tolerant,toddler,tiptoe,threesome,thirties,thermostat,tampa,sycamore,switches,swipe,surgically,supervising,subtlety,stung,stumbling,stubs,struggles,stride,strangling,stamp's,spruce,sprayed,socket,snuggle,smuggled,skulls,simplicity,showering,shhhhh,sensor,sci,sac,sabotaging,rumson,rounding,risotto,riots,revival,responds,reserves,reps,reproduction,repairman,rematch,rehearsed,reelection,redi,recognizing,ratty,ragging,radiology,racquetball,racking,quieter,quicksand,pyramids,pulmonary,puh,publication,prowl,provisions,prompt,premeditated,prematurely,prancing,porcupine,plated,pinocchio,perceived,peeked,peddle,pasture,panting,overweight,oversee,overrun,outing,outgrown,obsess,o'donnell,nyu,nursed,northwestern,norma's,nodding,negativity,negatives,musketeers,mugger,mounting,motorcade,monument,merrily,matured,massimo's,masquerading,marvellous,marlena's,margins,maniacs,mag,lumpy,lovey,louse,linger,lilies,libido,lawful,kudos,knuckle,kitchen's,kennedy's,juices,judgments,joshua's,jars,jams,jamal's,jag,itches,intolerable,intermission,interaction,institutions,infectious,inept,incentives,incarceration,improper,implication,imaginative,ight,hussein,humanitarian,huckleberry,horatio,holster,heiress,heartburn,hayley's,hap,gunna,guitarist,groomed,greta's,granting,graciously,glee,gentleman's,fulfillment,fugitives,fronts,founder,forsaking,forgives,foreseeable,flavors,flares,fixation,figment,fickle,featuring,featured,fantasize,famished,faith's,fades,expiration,exclamation,evolve,euro,erasing,emphasize,elevator's,eiffel,eerie,earful,duped,dulles,distributor,distorted,dissing,dissect,dispenser,dilated,digit,differential,diagnostic,detergent,desdemona,debriefing,dazzle,damper,cylinder,curing,crowbar,crispina,crafty,crackpot,courting,corrections,cordial,copying,consuming,conjunction,conflicted,comprehension,commie,collects,cleanup,chiropractor,charmer,chariot,charcoal,chaplain,challenger,census,cd's,cauldron,catatonic,capabilities,calculate,bullied,buckets,brilliantly,breathed,boss's,booths,bombings,boardroom,blowout,blower,blip,blindness,blazing,birthday's,biologically,bibles,biased,beseech,barbaric,band's,balraj,auditorium,audacity,assisted,appropriations,applicants,anticipating,alcoholics,airhead,agendas,aft,admittedly,adapt,absolution,abbot,zing,youre,yippee,wittlesey,withheld,willingness,willful,whammy,webber's,weakest,washes,virtuous,violently,videotapes,vials,vee,unplugged,unpacked,unfairly,und,turbulence,tumbling,troopers,tricking,trenches,tremendously,travelled,travelers,traitors,torches,tommy's,tinga,thyroid,texture,temperatures,teased,tawdry,tat,taker,sympathies,swiped,swallows,sundaes,suave,strut,structural,stone's,stewie,stepdad,spewing,spasm,socialize,slither,sky's,simulator,sighted,shutters,shrewd,shocks,sherry's,sgc,semantics,scout's,schizophrenic,scans,savages,satisfactory,rya'c,runny,ruckus,royally,roadblocks,riff,rewriting,revoke,reversal,repent,renovation,relating,rehearsals,regal,redecorate,recovers,recourse,reconnaissance,receives,ratched,ramali,racquet,quince,quiche,puppeteer,puking,puffed,prospective,projected,problemo,preventing,praises,pouch,posting,postcards,pooped,poised,piled,phoney,phobia,performances,patty's,patching,participating,parenthood,pardner,oppose,oozing,oils,ohm,ohhhhh,nypd,numbing,novelist,nostril,nosey,nominate,noir,neatly,nato,naps,nappa,nameless,muzzle,muh,mortuary,moronic,modesty,mitz,missionary,mimi's,midwife,mercenaries,mcclane,maxie's,matuka,mano,mam,maitre,lush,lumps,lucid,loosened,loosely,loins,lawnmower,lane's,lamotta,kroehner,kristen's,juggle,jude's,joins,jinxy,jessep,jaya,jamming,jailhouse,jacking,ironically,intruders,inhuman,infections,infatuated,indoor,indigestion,improvements,implore,implanted,id's,hormonal,hoboken,hillbilly,heartwarming,headway,headless,haute,hatched,hartmans,harping,hari,grapevine,graffiti,gps,gon,gogh,gnome,ged,forties,foreigners,fool's,flyin,flirted,fingernail,fdr,exploration,expectation,exhilarating,entrusted,enjoyment,embark,earliest,dumper,duel,dubious,drell,dormant,docking,disqualified,disillusioned,dishonor,disbarred,directive,dicey,denny's,deleted,del's,declined,custodial,crunchy,crises,counterproductive,correspondent,corned,cords,cor,coot,contributing,contemplate,containers,concur,conceivable,commissioned,cobblepot,cliffs,clad,chief's,chickened,chewbacca,checkout,carpe,cap'n,campers,calcium,buyin,buttocks,bullies,brown's,brigade,brain's,braid,boxed,bouncy,blueberries,blubbering,bloodstream,bigamy,bel,beeped,bearable,bank's,awarded,autographs,attracts,attracting,asteroid,arbor,arab,apprentice,announces,andie's,ammonia,alarming,aidan's,ahoy,ahm,zan,wretch,wimps,widows,widower,whirlwind,whirl,weather's,warms,war's,wack,villagers,vie,vandelay,unveiling,uno,undoing,unbecoming,ucla,turnaround,tribunal,togetherness,tickles,ticker,tended,teensy,taunt,system's,sweethearts,superintendent,subcommittee,strengthen,stomach's,stitched,standpoint,staffers,spotless,splits,soothe,sonnet,smothered,sickening,showdown,shouted,shepherds,shelters,shawl,seriousness,separates,sen,schooled,schoolboy,scat,sats,sacramento,s'mores,roped,ritchie's,resembles,reminders,regulars,refinery,raggedy,profiles,preemptive,plucked,pheromones,particulars,pardoned,overpriced,overbearing,outrun,outlets,onward,oho,ohmigod,nosing,norwegian,nightly,nicked,neanderthal,mosquitoes,mortified,moisture,moat,mime,milky,messin,mecha,markinson,marivellas,mannequin,manderley,maid's,madder,macready,maciver's,lookie,locusts,lisbon,lifetimes,leg's,lanna,lakhi,kholi,joke's,invasive,impersonate,impending,immigrants,ick,i's,hyperdrive,horrid,hopin,hombre,hogging,hens,hearsay,haze,harpy,harboring,hairdo,hafta,hacking,gun's,guardians,grasshopper,graded,gobble,gatehouse,fourteenth,foosball,floozy,fitzgerald's,fished,firewood,finalize,fever's,fencing,felons,falsely,fad,exploited,euphemism,entourage,enlarged,ell,elitist,elegance,eldest,duo,drought,drokken,drier,dredge,dramas,dossier,doses,diseased,dictator,diarrhea,diagnose,despised,defuse,defendant's,d'amour,crowned,cooper's,continually,contesting,consistently,conserve,conscientious,conjured,completing,commune,commissioner's,collars,coaches,clogs,chenille,chatty,chartered,chamomile,casing,calculus,calculator,brittle,breached,boycott,blurted,birthing,bikinis,bankers,balancing,astounding,assaulting,aroma,arbitration,appliance,antsy,amnio,alienating,aliases,aires,adolescence,administrative,addressing,achieving,xerox,wrongs,workload,willona,whistling,werewolves,wallaby,veterans,usin,updates,unwelcome,unsuccessful,unseemly,unplug,undermining,ugliness,tyranny,tuesdays,trumpets,transference,traction,ticks,tete,tangible,tagging,swallowing,superheroes,sufficiently,studs,strep,stowed,stow,stomping,steffy,stature,stairway,sssh,sprain,spouting,sponsoring,snug,sneezing,smeared,slop,slink,slew,skid,simultaneously,simulation,sheltered,shakin,sewed,sewage,seatbelt,scariest,scammed,scab,sanctimonious,samir,rushes,rugged,routes,romanov,roasting,rightly,retinal,rethinking,resulted,resented,reruns,replica,renewed,remover,raiding,raided,racks,quantity,purest,progressing,primarily,presidente,prehistoric,preeclampsia,postponement,portals,poppa,pop's,pollution,polka,pliers,playful,pinning,pharaoh,perv,pennant,pelvic,paved,patented,paso,parted,paramedic,panels,pampered,painters,padding,overjoyed,orthodox,organizer,one'll,octavius,occupational,oakdale's,nous,nite,nicknames,neurosurgeon,narrows,mitt,misled,mislead,mishap,milltown,milking,microscopic,meticulous,mediocrity,meatballs,measurements,mandy's,malaria,machete,lydecker's,lurch,lorelai's,linda's,layin,lavish,lard,knockin,khruschev,kelso's,jurors,jumpin,jugular,journalists,jour,jeweler,jabba,intersection,intellectually,integral,installment,inquiries,indulging,indestructible,indebted,implicated,imitate,ignores,hyperventilating,hyenas,hurrying,huron,horizontal,hermano,hellish,heheh,header,hazardous,hart's,harshly,harper's,handout,handbag,grunemann,gots,glum,gland,glances,giveaway,getup,gerome,furthest,funhouse,frosting,franchise,frail,fowl,forwarded,forceful,flavored,flank,flammable,flaky,fingered,finalists,fatherly,famine,fags,facilitate,exempt,exceptionally,ethic,essays,equity,entrepreneur,enduring,empowered,employers,embezzlement,eels,dusk,duffel,downfall,dotted,doth,doke,distressed,disobey,disappearances,disadvantage,dinky,diminish,diaphragm,deuces,deployed,delia's,davidson's,curriculum,curator,creme,courteous,correspondence,conquered,comforts,coerced,coached,clots,clarification,cite,chunks,chickie,chick's,chases,chaperoning,ceramic,ceased,cartons,capri,caper,cannons,cameron's,calves,caged,bustin,bungee,bulging,bringin,brie,boomhauer,blowin,blindfolded,blab,biscotti,bird's,beneficial,bastard's,ballplayer,bagging,automated,auster,assurances,aschen,arraigned,anonymity,annex,animation,andi,anchorage,alters,alistair's,albatross,agreeable,advancement,adoring,accurately,abduct,wolfi,width,weirded,watchers,washroom,warheads,voltage,vincennes,villains,victorian,urgency,upward,understandably,uncomplicated,uhuh,uhhhh,twitching,trig,treadmill,transactions,topped,tiffany's,they's,thermos,termination,tenorman,tater,tangle,talkative,swarm,surrendering,summoning,substances,strive,stilts,stickers,stationary,squish,squashed,spraying,spew,sparring,sorrel's,soaring,snout,snort,sneezed,slaps,skanky,singin,sidle,shreck,shortness,shorthand,shepherd's,sharper,shamed,sculptures,scanning,saga,sadist,rydell,rusik,roulette,rodi's,rockefeller,revised,resumes,restoring,respiration,reiber's,reek,recycle,recount,reacts,rabbit's,purge,purgatory,purchasing,providence,prostate,princesses,presentable,poultry,ponytail,plotted,playwright,pinot,pigtails,pianist,phillippe,philippines,peddling,paroled,owww,orchestrated,orbed,opted,offends,o'hara,noticeable,nominations,nancy's,myrtle's,music's,mope,moonlit,moines,minefield,metaphors,memoirs,mecca,maureen's,manning's,malignant,mainframe,magicks,maggots,maclaine,lobe,loathing,linking,leper,leaps,leaping,lashed,larch,larceny,lapses,ladyship,juncture,jiffy,jane's,jakov,invoke,interpreted,internally,intake,infantile,increasingly,inadmissible,implement,immense,howl,horoscope,hoof,homage,histories,hinting,hideaway,hesitating,hellbent,heddy,heckles,hat's,harmony's,hairline,gunpowder,guidelines,guatemala,gripe,gratifying,grants,governess,gorge,goebbels,gigolo,generated,gears,fuzz,frigid,freddo,freddie's,foresee,filters,filmed,fertile,fellowship,feeling's,fascination,extinction,exemplary,executioner,evident,etcetera,estimates,escorts,entity,endearing,encourages,electoral,eaters,earplugs,draped,distributors,disrupting,disagrees,dimes,devastate,detain,deposits,depositions,delicacy,delays,darklighter,dana's,cynicism,cyanide,cutters,cronus,convoy,continuous,continuance,conquering,confiding,concentrated,compartments,companions,commodity,combing,cofell,clingy,cleanse,christmases,cheered,cheekbones,charismatic,cabaret,buttle,burdened,buddhist,bruenell,broomstick,brin,brained,bozos,bontecou,bluntman,blazes,blameless,bizarro,benny's,bellboy,beaucoup,barry's,barkeep,bali,bala,bacterial,axis,awaken,astray,assailant,aslan,arlington,aria,appease,aphrodisiac,announcements,alleys,albania,aitoro's,activation,acme,yesss,wrecks,woodpecker,wondrous,window's,wimpy,willpower,widowed,wheeling,weepy,waxing,waive,vulture,videotaped,veritable,vascular,variations,untouched,unlisted,unfounded,unforeseen,two's,twinge,truffles,triggers,traipsing,toxin,tombstone,titties,tidal,thumping,thor's,thirds,therein,testicles,tenure,tenor,telephones,technicians,tarmac,talby,tackled,systematically,swirling,suicides,suckered,subtitles,sturdy,strangler,stockbroker,stitching,steered,staple,standup,squeal,sprinkler,spontaneously,splendor,spiking,spender,sovereign,snipe,snip,snagged,slum,skimming,significantly,siddown,showroom,showcase,shovels,shotguns,shoelaces,shitload,shifty,shellfish,sharpest,shadowy,sewn,seizing,seekers,scrounge,scapegoat,sayonara,satan's,saddled,rung,rummaging,roomful,romp,retained,residual,requiring,reproductive,renounce,reggie's,reformed,reconsidered,recharge,realistically,radioed,quirks,quadrant,punctual,public's,presently,practising,pours,possesses,poolhouse,poltergeist,pocketbook,plural,plots,pleasure's,plainly,plagued,pity's,pillars,picnics,pesto,pawing,passageway,partied,para,owing,openings,oneself,oats,numero,nostalgia,nocturnal,nitwit,nile,nexus,neuro,negotiated,muss,moths,mono,molecule,mixer,medicines,meanest,mcbeal,matinee,margate,marce,manipulations,manhunt,manger,magicians,maddie's,loafers,litvack,lightheaded,lifeguard,lawns,laughingstock,kodak,kink,jewellery,jessie's,jacko,itty,inhibitor,ingested,informing,indignation,incorporate,inconceivable,imposition,impersonal,imbecile,ichabod,huddled,housewarming,horizons,homicides,hobo,historically,hiccups,helsinki,hehe,hearse,harmful,hardened,gushing,gushie,greased,goddamit,gigs,freelancer,forging,fonzie,fondue,flustered,flung,flinch,flicker,flak,fixin,finalized,fibre,festivus,fertilizer,fenmore's,farted,faggots,expanded,exonerate,exceeded,evict,establishing,enormously,enforced,encrypted,emdash,embracing,embedded,elliot's,elimination,dynamics,duress,dupres,dowser,doormat,dominant,districts,dissatisfied,disfigured,disciplined,discarded,dibbs,diagram,detailing,descend,depository,defining,decorative,decoration,deathbed,death's,dazzled,da's,cuttin,cures,crowding,crepe,crater,crammed,costly,cosmopolitan,cortlandt's,copycat,coordinated,conversion,contradict,containing,constructed,confidant,condemning,conceited,computer's,commute,comatose,coleman's,coherent,clinics,clapping,circumference,chuppah,chore,choksondik,chestnuts,catastrophic,capitalist,campaigning,cabins,briault,bottomless,boop,bonnet,board's,bloomingdale's,blokes,blob,bids,berluti,beret,behavioral,beggars,bar's,bankroll,bania,athos,assassinate,arsenic,apperantly,ancestor,akron,ahhhhhh,afloat,adjacent,actresses,accordingly,accents,abe's,zipped,zeros,zeroes,zamir,yuppie,youngsters,yorkers,writ,wisest,wipes,wield,whyn't,weirdos,wednesdays,villages,vicksburg,variable,upchuck,untraceable,unsupervised,unpleasantness,unpaid,unhook,unconscionable,uncalled,turks,tumors,trappings,translating,tragedies,townie,timely,tiki,thurgood,things'll,thine,tetanus,terrorize,temptations,teamwork,tanning,tampons,tact,swarming,surfaced,supporter,stuart's,stranger's,straitjacket,stint,stimulation,steroid,statistically,startling,starry,squander,speculating,source's,sollozzo,sobriety,soar,sneaked,smithsonian,slugs,slaw,skit,skedaddle,sinker,similarities,silky,shortcomings,shipments,sheila's,severity,sellin,selective,seattle's,seasoned,scrubbed,scrooge,screwup,scrapes,schooling,scarves,saturdays,satchel,sandburg's,sandbox,salesmen,rooming,romances,revolving,revere,resulting,reptiles,reproach,reprieve,recreational,rearranging,realtor,ravine,rationalize,raffle,quoted,punchy,psychobabble,provocation,profoundly,problematic,prescriptions,preferable,praised,polishing,poached,plow,pledges,planetary,plan's,pirelli,perverts,peaked,pastures,pant,oversized,overdressed,outdid,outdated,oriental,ordinance,orbs,opponents,occurrence,nuptials,nominees,nineteenth,nefarious,mutiny,mouthpiece,motels,mopping,moon's,mongrel,monetary,mommie,missin,metaphorically,merv,mertin,memos,memento,melodrama,melancholy,measles,meaner,marches,mantel,maneuvers,maneuvering,mailroom,machine's,luring,listenin,lion's,lifeless,liege,licks,libraries,liberties,levon,legwork,lanka,lacked,kneecaps,kippur,kiddie,kaput,justifiable,jigsaw,issuing,islamic,insistent,insidious,innuendo,innit,inhabitants,individually,indicator,indecent,imaginable,illicit,hymn,hurling,humane,hospitalized,horseshit,hops,hondo,hemorrhoid,hella,healthiest,haywire,hamsters,halibut,hairbrush,hackers,guam,grouchy,grisly,griffin's,gratuitous,glutton,glimmer,gibberish,ghastly,geologist,gentler,generously,generators,geeky,gaga,furs,fuhrer,fronting,forklift,foolin,fluorescent,flats,flan,financed,filmmaking,fight's,faxes,faceless,extinguisher,expressions,expel,etched,entertainer,engagements,endangering,empress,egos,educator,ducked,dual,dramatically,dodgeball,dives,diverted,dissolved,dislocated,discrepancy,discovers,dink,devour,destroyers,derail,deputies,dementia,decisive,daycare,daft,cynic,crumbling,cowardice,cow's,covet,cornwallis,corkscrew,cookbook,conditioned,commendation,commandments,columns,coincidental,cobwebs,clouded,clogging,clicking,clasp,citizenship,chopsticks,chefs,chaps,catherine's,castles,cashing,carat,calmer,burgundy,bulldog's,brightly,brazen,brainwashing,bradys,bowing,booties,bookcase,boned,bloodsucking,blending,bleachers,bleached,belgian,bedpan,bearded,barrenger,bachelors,awwww,atop,assures,assigning,asparagus,arabs,apprehend,anecdote,amoral,alterations,alli,aladdin,aggravation,afoot,acquaintances,accommodating,accelerate,yakking,wreckage,worshipping,wladek,willya,willies,wigged,whoosh,whisked,wavelength,watered,warpath,warehouses,volts,vitro,violates,viewed,vicar,valuables,users,urging,uphill,unwise,untimely,unsavory,unresponsive,unpunished,unexplained,unconventional,tubby,trolling,treasurer,transfers,toxicology,totaled,tortoise,tormented,toothache,tingly,tina's,timmiihh,tibetan,thursdays,thoreau,terrifies,temperature's,temperamental,telegrams,ted's,technologies,teaming,teal'c's,talkie,takers,table's,symbiote,swirl,suffocate,subsequently,stupider,strapping,store's,steckler,standardized,stampede,stainless,springing,spreads,spokesperson,speeds,someway,snowflake,sleepyhead,sledgehammer,slant,slams,situation's,showgirl,shoveling,shmoopy,sharkbait,shan't,seminars,scrambling,schizophrenia,schematics,schedule's,scenic,sanitary,sandeman,saloon,sabbatical,rural,runt,rummy,rotate,reykjavik,revert,retrieved,responsive,rescheduled,requisition,renovations,remake,relinquish,rejoice,rehabilitation,recreation,reckoning,recant,rebuilt,rebadow,reassurance,reassigned,rattlesnake,ramble,racism,quor,prowess,prob,primed,pricey,predictions,prance,pothole,pocus,plains,pitches,pistols,persist,perpetrated,penal,pekar,peeling,patter,pastime,parmesan,paper's,papa's,panty,pail,pacemaker,overdrive,optic,operas,ominous,offa,observant,nothings,noooooo,nonexistent,nodded,nieces,neia,neglecting,nauseating,mutton,mutated,musket,munson's,mumbling,mowing,mouthful,mooseport,monologue,momma's,moly,mistrust,meetin,maximize,masseuse,martha's,marigold,mantini,mailer,madre,lowlifes,locksmith,livid,liven,limos,licenses,liberating,lhasa,lenin,leniency,leering,learnt,laughable,lashes,lasagne,laceration,korben,katan,kalen,jordan's,jittery,jesse's,jammies,irreplaceable,intubate,intolerant,inhaler,inhaled,indifferent,indifference,impound,imposed,impolite,humbly,holocaust,heroics,heigh,gunk,guillotine,guesthouse,grounding,groundbreaking,groom's,grips,grant's,gossiping,goatee,gnomes,gellar,fusion's,fumble,frutt,frobisher,freudian,frenchman,foolishness,flagged,fixture,femme,feeder,favored,favorable,fatso,fatigue,fatherhood,farmer's,fantasized,fairest,faintest,factories,eyelids,extravagant,extraterrestrial,extraordinarily,explicit,escalator,eros,endurance,encryption,enchantment's,eliminating,elevate,editors,dysfunction,drivel,dribble,dominican,dissed,dispatched,dismal,disarray,dinnertime,devastation,dermatologist,delicately,defrost,debutante,debacle,damone,dainty,cuvee,culpa,crucified,creeped,crayons,courtship,counsel's,convene,continents,conspicuous,congresswoman,confinement,conferences,confederate,concocted,compromises,comprende,composition,communism,comma,collectors,coleslaw,clothed,clinically,chug,chickenshit,checkin,chaotic,cesspool,caskets,cancellation,calzone,brothel,boomerang,bodega,bloods,blasphemy,black's,bitsy,bink,biff,bicentennial,berlini,beatin,beards,barbas,barbarians,backpacking,audiences,artist's,arrhythmia,array,arousing,arbitrator,aqui,appropriately,antagonize,angling,anesthetic,altercation,alice's,aggressor,adversity,adopting,acne,accordance,acathla,aaahhh,wreaking,workup,workings,wonderin,wolf's,wither,wielding,whopper,what'm,what'cha,waxed,vibrating,veterinarian,versions,venting,vasey,valor,validate,urged,upholstery,upgraded,untied,unscathed,unsafe,unlawful,uninterrupted,unforgiving,undies,uncut,twinkies,tucking,tuba,truffle,truck's,triplets,treatable,treasured,transmit,tranquility,townspeople,torso,tomei,tipsy,tinsel,timeline,tidings,thirtieth,tensions,teapot,tasks,tantrums,tamper,talky,swayed,swapping,sven,sulk,suitor,subjected,stylist,stroller,storing,stirs,statistical,standoff,staffed,squadron,sprinklers,springsteen,specimens,sparkly,song's,snowy,snobby,snatcher,smoother,smith's,sleepin,shrug,shortest,shoebox,shel,sheesh,shee,shackles,setbacks,sedatives,screeching,scorched,scanned,satyr,sammy's,sahib,rosemary's,rooted,rods,roadblock,riverbank,rivals,ridiculed,resentful,repellent,relates,registry,regarded,refugee,recreate,reconvene,recalled,rebuttal,realmedia,quizzes,questionnaire,quartet,pusher,punctured,pucker,propulsion,promo,prolong,professionalism,prized,premise,predators,portions,pleasantly,planet's,pigsty,physicist,phil's,penniless,pedestrian,paychecks,patiently,paternal,parading,pa's,overactive,ovaries,orderlies,oracles,omaha,oiled,offending,nudie,neonatal,neighborly,nectar,nautical,naught,moops,moonlighting,mobilize,mite,misleading,milkshake,mickey's,metropolitan,menial,meats,mayan,maxed,marketplace,mangled,magua,lunacy,luckier,llanview's,livestock,liters,liter,licorice,libyan,legislature,lasers,lansbury,kremlin,koreans,kooky,knowin,kilt,junkyard,jiggle,jest,jeopardized,jags,intending,inkling,inhalation,influences,inflated,inflammatory,infecting,incense,inbound,impractical,impenetrable,iffy,idealistic,i'mma,hypocrites,hurtin,humbled,hosted,homosexuality,hologram,hokey,hocus,hitchhiking,hemorrhoids,headhunter,hassled,harts,hardworking,haircuts,hacksaw,guerrilla,genitals,gazillion,gatherings,ganza's,gammy,gamesphere,fugue,fuels,forests,footwear,folly,folds,flexibility,flattened,flashlights,fives,filet,field's,famously,extenuating,explored,exceed,estrogen,envisioned,entails,emerged,embezzled,eloquent,egomaniac,dummies,duds,ducts,drowsy,drones,dragon's,drafts,doree,donovon,donny's,docked,dixon's,distributed,disorders,disguises,disclose,diggin,dickie's,detachment,deserting,depriving,demographic,delegation,defying,deductible,decorum,decked,daylights,daybreak,dashboard,darien,damnation,d'angelo's,cuddling,crunching,crickets,crazies,crayon,councilman,coughed,coordination,conundrum,contractors,contend,considerations,compose,complimented,compliance,cohaagen,clutching,cluster,clued,climbs,clader,chuck's,chromosome,cheques,checkpoint,chats,channeling,ceases,catholics,cassius,carver's,carasco,capped,capisce,cantaloupe,cancelling,campsite,camouflage,cambodia,burglars,bureaucracy,breakfasts,branding,bra'tac,book's,blueprint,bleedin,blaze's,blabbed,bisexual,bile,big's,beverages,beneficiary,battery's,basing,avert,avail,autobiography,atone,army's,arlyn,ares,architectural,approves,apothecary,anus,antiseptic,analytical,amnesty,alphabetical,alignment,aligned,aleikuum,advisory,advisors,advisement,adulthood,acquiring,accessed,zombie's,zadir,wrestled,wobbly,withnail,wheeled,whattaya,whacking,wedged,wanders,walkman,visionary,virtues,vincent's,vega's,vaginal,usage,unnamed,uniquely,unimaginable,undeniable,unconditionally,uncharted,unbridled,tweezers,tvmegasite,trumped,triumphant,trimming,tribes,treading,translates,tranquilizers,towing,tout,toontown,thunk,taps,taboo,suture,suppressing,succeeding,submission,strays,stonewall,stogie,stepdaughter,stalls,stace,squint,spouses,splashed,speakin,sounder,sorrier,sorrel,sorcerer,sombrero,solemnly,softened,socialist,snobs,snippy,snare,smoothing,slump,slimeball,slaving,sips,singular,silently,sicily,shiller,shayne's,shareholders,shakedown,sensations,seagulls,scrying,scrumptious,screamin,saucy,santoses,santos's,sanctions,roundup,roughed,rosary,robechaux,roadside,riley's,retrospect,resurrected,restoration,reside,researched,rescind,reproduce,reprehensible,repel,rendering,remodeling,religions,reconsidering,reciprocate,ratchet,rambaldi's,railroaded,raccoon,quasi,psychics,psat,promos,proclamation,problem's,prob'ly,pristine,printout,priestess,prenuptial,prediction,precedes,pouty,potter's,phoning,petersburg,peppy,pariah,parched,parcel,panes,overloaded,overdoing,operators,oldies,obesity,nymphs,nother,notebooks,nook,nikolai,nearing,nearer,mutation,municipal,monstrosity,minister's,milady,mieke,mephesto,memory's,melissa's,medicated,marshals,manilow,mammogram,mainstream,madhouse,m'lady,luxurious,luck's,lucas's,lotsa,loopy,logging,liquids,lifeboat,lesion,lenient,learner,lateral,laszlo,larva,kross,kinks,jinxed,involuntary,inventor,interim,insubordination,inherent,ingrate,inflatable,independently,incarnate,inane,imaging,hypoglycemia,huntin,humorous,humongous,hoodlum,honoured,honking,hitler's,hemorrhage,helpin,hearing's,hathor,hatching,hangar,halftime,guise,guggenheim,grrr,grotto,grandson's,grandmama,gorillas,godless,girlish,ghouls,gershwin,frosted,friday's,forwards,flutter,flourish,flagpole,finely,finder's,fetching,fatter,fated,faithfully,faction,fabrics,exposition,expo,exploits,exert,exclude,eviction,everwood's,evasion,espn,escorting,escalate,enticing,enroll,enhancement,endowed,enchantress,emerging,elopement,drills,drat,downtime,downloading,dorks,doorways,doctorate,divulge,dissociative,diss,disgraceful,disconcerting,dirtbag,deteriorating,deteriorate,destinies,depressive,dented,denim,defeating,decruz,decidedly,deactivate,daydreams,czar,curls,culprit,cues,crybaby,cruelest,critique,crippling,cretin,cranberries,cous,coupled,corvis,copped,convicts,converts,contingent,contests,complement,commend,commemorate,combinations,coastguard,cloning,cirque,churning,chock,chivalry,chemotherapy,charlotte's,chancellor's,catalogues,cartwheels,carpets,carols,canister,camera's,buttered,bureaucratic,bundt,buljanoff,bubbling,brokers,broaden,brimstone,brainless,borneo,bores,boing,bodied,billie's,biceps,beijing,bead,badmouthing,bad's,avec,autopilot,attractions,attire,atoms,atheist,ascertain,artificially,archbishop,aorta,amps,ampata,amok,alloy,allied,allenby,align,albeit,aired,aint,adjoining,accosted,abyss,absolve,aborted,aaagh,aaaaaah,your's,yonder,yellin,yearly,wyndham,wrongdoing,woodsboro,wigging,whup,wasteland,warranty,waltzed,walnuts,wallace's,vividly,vibration,verses,veggie,variation,validation,unnecessarily,unloaded,unicorns,understated,undefeated,unclean,umbrellas,tyke,twirling,turpentine,turnover,tupperware,tugger,triangles,triage,treehouse,tract,toil,tidbit,tickled,thud,threes,thousandth,thingie,terminally,temporal,teething,tassel,talkies,syndication,syllables,swoon,switchboard,swerved,suspiciously,superiority,successor,subsequentlyne,subsequent,subscribe,strudel,stroking,strictest,steven's,stensland,stefan's,starsky,starin,stannart,squirming,squealing,sorely,solidarity,softie,snookums,sniveling,snail,smidge,smallpox,sloth,slab,skulking,singled,simian,silo,sightseeing,siamese,shudder,shoppers,shax,sharpen,shannen,semtex,sellout,secondhand,season's,seance,screenplay,scowl,scorn,scandals,santiago's,safekeeping,sacked,russe,rummage,rosie's,roshman,roomies,roaches,rinds,retrace,retires,resuscitate,restrained,residential,reservoir,rerun,reputations,rekall,rejoin,refreshment,reenactment,recluse,ravioli,raves,ranked,rampant,rama,rallies,raking,purses,punishable,punchline,puked,provincial,prosky,prompted,processor,previews,prepares,poughkeepsie,poppins,polluted,placenta,pissy,petulant,peterson's,perseverance,persecution,pent,peasants,pears,pawns,patrols,pastries,partake,paramount,panky,palate,overzealous,overthrow,overs,oswald's,oskar,originated,orchids,optical,onset,offenses,obstructing,objectively,obituaries,obedient,obedience,novice,nothingness,nitrate,newer,nets,mwah,musty,mung,motherly,mooning,monique's,momentous,moby,mistaking,mistakenly,minutemen,milos,microchip,meself,merciless,menelaus,mazel,mauser,masturbate,marsh's,manufacturers,mahogany,lysistrata,lillienfield,likable,lightweight,liberate,leveled,letdown,leer,leeloo,larynx,lardass,lainey,lagged,lab's,klorel,klan,kidnappings,keyed,karmic,jive,jiggy,jeebies,isabel's,irate,iraqi,iota,iodine,invulnerable,investor,intrusive,intricate,intimidation,interestingly,inserted,insemination,inquire,innate,injecting,inhabited,informative,informants,incorporation,inclination,impure,impasse,imbalance,illiterate,i'ma,i'ii,hurled,hunts,hispanic,hematoma,help's,helen's,headstrong,harmonica,hark,handmade,handiwork,gymnasium,growling,governors,govern,gorky,gook,girdle,getcha,gesundheit,gazing,gazette,garde,galley,funnel,fred's,fossils,foolishly,fondness,flushing,floris,firearm,ferocious,feathered,fateful,fancies,fakes,faker,expressway,expire,exec,ever'body,estates,essentials,eskimos,equations,eons,enlightening,energetic,enchilada,emmi,emissary,embolism,elsinore,ecklie,drenched,drazi,doped,dogging,documentation,doable,diverse,disposed,dislikes,dishonesty,disengage,discouraging,diplomat,diplomacy,deviant,descended,derailed,depleted,demi,deformed,deflect,defines,defer,defcon,deactivated,crips,creditors,counters,corridors,cordy's,conversation's,constellations,congressmen,congo,complimenting,colombian,clubbing,clog,clint's,clawing,chromium,chimes,chicken's,chews,cheatin,chaste,ceremony's,cellblock,ceilings,cece,caving,catered,catacombs,calamari,cabbie,bursts,bullying,bucking,brulee,brits,brisk,breezes,brandon's,bounces,boudoir,blockbuster,binks,better'n,beluga,bellied,behrani,behaves,bedding,battalion,barriers,banderas,balmy,bakersfield,badmouth,backers,avenging,atat,aspiring,aromatherapy,armpit,armoire,anythin,another's,anonymously,anniversaries,alonzo's,aftershave,affordable,affliction,adrift,admissible,adieu,activist,acquittal,yucky,yearn,wrongly,wino,whitter,whirlpool,wendigo,watchdog,wannabes,walkers,wakey,vomited,voicemail,verb,vans,valedictorian,vacancy,uttered,up's,unwed,unrequited,unnoticed,unnerving,unkind,unjust,uniformed,unconfirmed,unadulterated,unaccounted,uglier,tyler's,twix,turnoff,trough,trolley,trampled,tramell,traci's,tort,toads,titled,timbuktu,thwarted,throwback,thon,thinker,thimble,tasteless,tarantula,tammy's,tamale,takeovers,symposium,symmetry,swish,supposing,supporters,suns,sully,streaking,strands,statutory,starlight,stargher,starch,stanzi,stabs,squeamish,spokane,splattered,spiritually,spilt,sped,speciality,spacious,soundtrack,smacking,slain,slag,slacking,skywire,skips,skeet,skaara,simpatico,shredding,showin,shortcuts,shite,shielding,sheep's,shamelessly,serafine,sentimentality,sect,secretary's,seasick,scientifically,scholars,schemer,scandalous,saturday's,salts,saks,sainted,rustic,rugs,riedenschneider,ric's,rhyming,rhetoric,revolt,reversing,revel,retractor,retards,retaliation,resurrect,remiss,reminiscing,remanded,reluctance,relocating,relied,reiben,regions,regains,refuel,refresher,redoing,redheaded,redeemed,recycled,reassured,rearranged,rapport,qumar,prowling,promotional,promoter,preserving,prejudices,precarious,powwow,pondering,plunger,plunged,pleasantville,playpen,playback,pioneers,physicians,phlegm,perfected,pancreas,pakistani,oxide,ovary,output,outbursts,oppressed,opal's,ooohhh,omoroca,offed,o'toole,nurture,nursemaid,nosebleed,nixon's,necktie,muttering,munchies,mucking,mogul,mitosis,misdemeanor,miscarried,minx,millionth,migraines,midler,methane,metabolism,merchants,medicinal,margaret's,manifestation,manicurist,mandelbaum,manageable,mambo,malfunctioned,mais,magnesium,magnanimous,loudmouth,longed,lifestyles,liddy,lickety,leprechauns,lengthy,komako,koji's,klute,kennel,kathy's,justifying,jerusalem,israelis,isle,irreversible,inventing,invariably,intervals,intergalactic,instrumental,instability,insinuate,inquiring,ingenuity,inconclusive,incessant,improv,impersonation,impeachment,immigrant,id'd,hyena,humperdinck,humm,hubba,housework,homeland,holistic,hoffa,hither,hissy,hippy,hijacked,hero's,heparin,hellooo,heat's,hearth,hassles,handcuff,hairstyle,hadda,gymnastics,guys'll,gutted,gulp,gulls,guard's,gritty,grievous,gravitational,graft,gossamer,gooder,glory's,gere,gash,gaming,gambled,galaxies,gadgets,fundamentals,frustrations,frolicking,frock,frilly,fraser's,francais,foreseen,footloose,fondly,fluent,flirtation,flinched,flight's,flatten,fiscal,fiercely,felicia's,fashionable,farting,farthest,farming,facade,extends,exposer,exercised,evading,escrow,errr,enzymes,energies,empathize,embryos,embodiment,ellsberg,electromagnetic,ebola,earnings,dulcinea,dreamin,drawbacks,drains,doyle's,doubling,doting,doose's,doose,doofy,dominated,dividing,diversity,disturbs,disorderly,disliked,disgusts,devoid,detox,descriptions,denominator,demonstrating,demeanor,deliriously,decode,debauchery,dartmouth,d'oh,croissant,cravings,cranked,coworkers,councilor,council's,convergence,conventions,consistency,consist,conquests,conglomerate,confuses,confiscate,confines,confesses,conduit,compress,committee's,commanded,combed,colonel's,coated,clouding,clamps,circulating,circa,cinch,chinnery,celebratory,catalogs,carpenters,carnal,carla's,captures,capitan,capability,canin,canes,caitlin's,cadets,cadaver,cable's,bundys,bulldozer,buggers,bueller,bruno's,breakers,brazilian,branded,brainy,booming,bookstores,bloodbath,blister,bittersweet,biologist,billed,betty's,bellhop,beeping,beaut,beanstalk,beady,baudelaire,bartenders,bargains,ballad,backgrounds,averted,avatar's,atmospheric,assert,assassinated,armadillo,archive,appreciating,appraised,antlers,anterior,alps,aloof,allowances,alleyway,agriculture,agent's,affleck,acknowledging,achievements,accordion,accelerator,abracadabra,abject,zinc,zilch,yule,yemen,xanax,wrenching,wreath,wouldn,witted,widely,wicca,whorehouse,whooo,whips,westchester,websites,weaponry,wasn,walsh's,vouchers,vigorous,viet,victimized,vicodin,untested,unsolicited,unofficially,unfocused,unfettered,unfeeling,unexplainable,uneven,understaffed,underbelly,tutorial,tuberculosis,tryst,trois,trix,transmitting,trampoline,towering,topeka,tirade,thieving,thang,tentacles,teflon,teachings,tablets,swimmin,swiftly,swayzak,suspecting,supplying,suppliers,superstitions,superhuman,subs,stubbornness,structures,streamers,strattman,stonewalling,stimulate,stiffs,station's,stacking,squishy,spout,splice,spec,sonrisa,smarmy,slows,slicing,sisterly,sierra's,sicilian,shrill,shined,shift's,seniority,seine,seeming,sedley,seatbelts,scour,scold,schoolyard,scarring,sash,sark's,salieri,rustling,roxbury,richly,rexy,rex's,rewire,revved,retriever,respective,reputable,repulsed,repeats,rendition,remodel,relocated,reins,reincarnation,regression,reconstruction,readiness,rationale,rance,rafters,radiohead,radio's,rackets,quarterly,quadruple,pumbaa,prosperous,propeller,proclaim,probing,privates,pried,prewedding,premeditation,posturing,posterity,posh,pleasurable,pizzeria,pish,piranha,pimps,penmanship,penchant,penalties,pelvis,patriotism,pasa,papaya,packaging,overturn,overture,overstepped,overcoat,ovens,outsmart,outed,orient,ordained,ooohh,oncologist,omission,olly,offhand,odour,occurring,nyazian,notarized,nobody'll,nightie,nightclubs,newsweek,nesting,navel,nationwide,nabbed,naah,mystique,musk,mover,mortician,morose,moratorium,monster's,moderate,mockingbird,mobsters,misconduct,mingling,mikey's,methinks,metaphysical,messengered,merge,merde,medallion,mathematical,mater,mason's,masochist,martouf,martians,marinara,manray,manned,mammal,majorly,magnifying,mackerel,mabel's,lyme,lurid,lugging,lonnegan,loathsome,llantano,liszt,listings,limiting,liberace,leprosy,latinos,lanterns,lamest,laferette,ladybird,kraut,kook,kits,kipling,joyride,inward,intestine,innocencia,inhibitions,ineffectual,indisposed,incurable,incumbent,incorporated,inconvenienced,inanimate,improbable,implode,idea's,hypothesis,hydrant,hustling,hustled,huevos,how'm,horseshoe,hooey,hoods,honcho,hinge,hijack,heroism,hermit,heimlich,harvesting,hamunaptra,haladki,haiku,haggle,haaa,gutsy,grunting,grueling,grit,grifter,grievances,gribbs,greevy,greeted,green's,grandstanding,godparents,glows,glistening,glider,gimmick,genocide,gaping,fraiser,formalities,foreigner,forecast,footprint,folders,foggy,flaps,fitty,fiends,femmes,fearful,fe'nos,favours,fabio,eyeing,extort,experimentation,expedite,escalating,erect,epinephrine,entitles,entice,enriched,enable,emissions,eminence,eights,ehhh,educating,eden's,earthquakes,earthlings,eagerly,dunville,dugout,draining,doublemeat,doling,disperse,dispensing,dispatches,dispatcher,discoloration,disapproval,diners,dieu,diddly,dictates,diazepam,descendants,derogatory,deposited,delights,defies,decoder,debates,dealio,danson,cutthroat,crumbles,crud,croissants,crematorium,craftsmanship,crafted,could'a,correctional,cordless,cools,contradiction,constitute,conked,confine,concealing,composite,complicates,communique,columbian,cockamamie,coasters,clusters,clobbered,clipping,clipboard,clergy,clemenza,cleanser,circumcision,cindy's,chisel,character's,chanukah,certainaly,centerpiece,cellmate,cartoonist,cancels,cadmium,buzzed,busiest,bumstead,bucko,browsing,broth,broader,break's,braver,boundary,boggling,bobbing,blurred,birkhead,bethesda,benet,belvedere,bellies,begrudge,beckworth,bebe's,banky,baldness,bagpipes,baggy,babysitters,aversion,auxiliary,attributes,attain,astonished,asta,assorted,aspirations,arnold's,area's,appetites,apparel,apocalyptic,apartment's,announcer,angina,amiss,ambulances,allo,alleviate,alibis,algeria,alaskan,airway,affiliated,aerial,advocating,adrenalin,admires,adhesive,actively,accompanying,zeta,yoyou,yoke,yachts,wreaked,wracking,woooo,wooing,wised,winnie's,wind's,wilshire,wedgie,watson's,warden's,waging,violets,vincey,victorious,victories,velcro,vastly,valves,valley's,uplifting,untrustworthy,unmitigated,universities,uneventful,undressing,underprivileged,unburden,umbilical,twigs,tweet,tweaking,turquoise,trustees,truckers,trimmed,triggering,treachery,trapping,tourism,tosses,torching,toothpick,toga,toasty,toasts,tiamat,thickens,ther,tereza,tenacious,temperament,televised,teldar,taxis,taint,swill,sweatin,sustaining,surgery's,surgeries,succeeds,subtly,subterranean,subject's,subdural,streep,stopwatch,stockholder,stillwater,steamer,stang's,stalkers,squished,squeegee,splinters,spliced,splat,spied,specialized,spaz,spackle,sophistication,snapshots,smoky,smite,sluggish,slithered,skin's,skeeters,sidewalks,sickly,shrugs,shrubbery,shrieking,shitless,shithole,settin,servers,serge,sentinels,selfishly,segments,scarcely,sawdust,sanitation,sangria,sanctum,samantha's,sahjhan,sacrament,saber,rustle,rupture,rump,roving,rousing,rosomorf,rosario's,rodents,robust,rigs,riddled,rhythms,revelations,restart,responsibly,repression,reporter's,replied,repairing,renoir,remoray,remedial,relocation,relies,reinforcement,refundable,redirect,recheck,ravenwood,rationalizing,ramus,ramsey's,ramelle,rails,radish,quivering,pyjamas,puny,psychos,prussian,provocations,prouder,protestors,protesters,prohibited,prohibit,progression,prodded,proctologist,proclaimed,primordial,pricks,prickly,predatory,precedents,praising,pragmatic,powerhouse,posterior,postage,porthos,populated,poly,pointe,pivotal,pinata,persistence,performers,pentangeli,pele,pecs,pathetically,parka,parakeet,panicky,pandora's,pamphlets,paired,overthruster,outsmarted,ottoman,orthopedic,oncoming,oily,offing,nutritious,nuthouse,nourishment,nietzsche,nibbling,newlywed,newcomers,need's,nautilus,narcissist,myths,mythical,mutilation,mundane,mummy's,mummies,mumble,mowed,morvern,mortem,mortal's,mopes,mongolian,molasses,modification,misplace,miscommunication,miney,militant,midlife,mens,menacing,memorizing,memorabilia,membrane,massaging,masking,maritime,mapping,manually,magnets,ma's,luxuries,lows,lowering,lowdown,lounging,lothario,longtime,liposuction,lieutenant's,lidocaine,libbets,lewd,levitate,leslie's,leeway,lectured,lauren's,launcher,launcelot,latent,larek,lagos,lackeys,kumbaya,kryptonite,knapsack,keyhole,kensington,katarangura,kann,junior's,juiced,jugs,joyful,jihad,janitor's,jakey,ironclad,invoice,intertwined,interlude,interferes,insurrection,injure,initiating,infernal,india's,indeedy,incur,incorrigible,incantations,imprint,impediment,immersion,immensely,illustrate,ike's,igloo,idly,ideally,hysterectomy,hyah,house's,hour's,hounded,hooch,honeymoon's,hollering,hogs,hindsight,highs,high's,hiatus,helix,heirs,heebie,havesham,hassan's,hasenfuss,hankering,hangers,hakuna,gutless,gusto,grubbing,grrrr,greg's,grazed,gratification,grandeur,gorak,godammit,gnawing,glanced,gladiators,generating,galahad,gaius,furnished,funeral's,fundamentally,frostbite,frees,frazzled,fraulein,fraternizing,fortuneteller,formaldehyde,followup,foggiest,flunky,flickering,flashbacks,fixtures,firecrackers,fines,filly,figger,fetuses,fella's,feasible,fates,eyeliner,extremities,extradited,expires,experimented,exiting,exhibits,exhibited,exes,excursion,exceedingly,evaporate,erupt,equilibrium,epileptic,ephram's,entrails,entities,emporium,egregious,eggshells,easing,duwayne,drone,droll,dreyfuss,drastically,dovey,doubly,doozy,donkeys,donde,dominate,distrust,distributing,distressing,disintegrate,discreetly,disagreements,diff,dick's,devised,determines,descending,deprivation,delegate,dela,degradation,decision's,decapitated,dealin,deader,dashed,darkroom,dares,daddies,dabble,cycles,cushy,currents,cupcakes,cuffed,croupier,croak,criticized,crapped,coursing,cornerstone,copyright,coolers,continuum,contaminate,cont,consummated,construed,construct,condos,concoction,compulsion,committees,commish,columnist,collapses,coercion,coed,coastal,clemency,clairvoyant,circulate,chords,chesterton,checkered,charlatan,chaperones,categorically,cataracts,carano,capsules,capitalize,cache,butcher's,burdon,bullshitting,bulge,buck's,brewed,brethren,bren,breathless,breasted,brainstorming,bossing,borealis,bonsoir,bobka,boast,blimp,bleu,bleep,bleeder,blackouts,bisque,binford's,billboards,bernie's,beecher's,beatings,bayberry,bashed,bartlet's,bapu,bamboozled,ballon,balding,baklava,baffled,backfires,babak,awkwardness,attributed,attest,attachments,assembling,assaults,asphalt,arthur's,arthritis,armenian,arbitrary,apologizes,anyhoo,antiquated,alcante,agency's,advisable,advertisement,adventurer,abundance,aahhh,aaahh,zatarc,yous,york's,yeti,yellowstone,yearbooks,yakuza,wuddya,wringing,woogie,womanhood,witless,winging,whatsa,wetting,wessex,wendy's,way's,waterproof,wastin,washington's,wary,voom,volition,volcanic,vogelman,vocation,visually,violinist,vindicated,vigilance,viewpoint,vicariously,venza,vasily,validity,vacuuming,utensils,uplink,unveil,unloved,unloading,uninhibited,unattached,ukraine,typo,tweaked,twas,turnips,tunisia,tsch,trinkets,tribune,transmitters,translator,train's,toured,toughen,toting,topside,topical,toothed,tippy,tides,theology,terrors,terrify,tentative,technologically,tarnish,target's,tallest,tailored,tagliati,szpilman,swimmers,swanky,susie's,surly,supple,sunken,summation,suds,suckin,substantially,structured,stockholm,stepmom,squeaking,springfield's,spooks,splashmore,spanked,souffle,solitaire,solicitation,solarium,smooch,smokers,smog,slugged,slobbering,skylight,skimpy,situated,sinuses,simplify,silenced,sideburns,sid's,shutdown,shrinkage,shoddy,shhhhhh,shelling,shelled,shareef,shangri,shakey's,seuss,servicing,serenade,securing,scuffle,scrolls,scoff,scholarships,scanners,sauerkraut,satisfies,satanic,sars,sardines,sarcophagus,santino,sandi's,salvy,rusted,russells,ruby's,rowboat,routines,routed,rotating,rolfsky,ringside,rigging,revered,retreated,respectability,resonance,resembling,reparations,reopened,renewal,renegotiate,reminisce,reluctantly,reimburse,regimen,regaining,rectum,recommends,recognizable,realism,reactive,rawhide,rappaport's,raincoat,quibble,puzzled,pursuits,purposefully,puns,pubic,psychotherapy,prosecution's,proofs,proofing,professor's,prevention,prescribing,prelim,positioning,pore,poisons,poaching,pizza's,pertaining,personalized,personable,peroxide,performs,pentonville,penetrated,peggy's,payphone,payoffs,participated,park's,parisian,palp,paleontology,overhaul,overflowing,organised,oompa,ojai,offenders,oddest,objecting,o'hare,o'daniel,notches,noggin,nobody'd,nitrogen,nightstand,niece's,nicky's,neutralized,nervousness,nerdy,needlessly,navigational,narrative,narc,naquadah,nappy,nantucket,nambla,myriad,mussolini,mulberry,mountaineer,mound,motherfuckin,morrie,monopolizing,mohel,mistreated,misreading,misbehave,miramax,minstrel,minivan,milligram,milkshakes,milestone,middleweight,michelangelo,metamorphosis,mesh,medics,mckinnon's,mattresses,mathesar,matchbook,matata,marys,marco's,malucci,majored,magilla,magic's,lymphoma,lowers,lordy,logistics,linens,lineage,lindenmeyer,limelight,libel,leery's,leased,leapt,laxative,lather,lapel,lamppost,laguardia,labyrinth,kindling,key's,kegs,kegger,kawalsky,juries,judo,jokin,jesminder,janine's,izzy,israeli,interning,insulation,institutionalized,inspected,innings,innermost,injun,infallible,industrious,indulgence,indonesia,incinerator,impossibility,imports,impart,illuminate,iguanas,hypnotic,hyped,huns,housed,hostilities,hospitable,hoses,horton's,homemaker,history's,historian,hirschmuller,highlighted,hideout,helpers,headset,guardianship,guapo,guantanamo,grubby,greyhound,grazing,granola,granddaddy,gotham's,goren,goblet,gluttony,glucose,globes,giorno,gillian's,getter,geritol,gassed,gang's,gaggle,freighter,freebie,frederick's,fractures,foxhole,foundations,fouled,foretold,forcibly,folklore,floorboards,floods,floated,flippers,flavour,flaked,firstly,fireflies,feedings,fashionably,fascism,farragut,fallback,factions,facials,exterminate,exited,existent,exiled,exhibiting,excites,everything'll,evenin,evaluated,ethically,entree,entirety,ensue,enema,empath,embryo,eluded,eloquently,elle,eliminates,eject,edited,edema,echoes,earns,dumpling,drumming,droppings,drazen's,drab,dolled,doll's,doctrine,distasteful,disputing,disputes,displeasure,disdain,disciples,diamond's,develops,deterrent,detection,dehydration,defied,defiance,decomposing,debated,dawned,darken,daredevil,dailies,cyst,custodian,crusts,crucifix,crowning,crier,crept,credited,craze,crawls,coveted,couple's,couldn,corresponding,correcting,corkmaster,copperfield,cooties,coopers,cooperated,controller,contraption,consumes,constituents,conspire,consenting,consented,conquers,congeniality,computerized,compute,completes,complains,communicator,communal,commits,commendable,colonels,collide,coladas,colada,clout,clooney,classmate,classifieds,clammy,claire's,civility,cirrhosis,chink,chemically,characterize,censor,catskills,cath,caterpillar,catalyst,carvers,carts,carpool,carelessness,career's,cardio,carbs,captivity,capeside's,capades,butabi,busmalis,bushel,burping,buren,burdens,bunks,buncha,bulldozers,browse,brockovich,bria,breezy,breeds,breakthroughs,bravado,brandy's,bracket,boogety,bolshevik,blossoms,bloomington,blooming,bloodsucker,blockade,blight,blacksmith,betterton,betrayer,bestseller,bennigan's,belittle,beeps,bawling,barts,bartending,barbed,bankbooks,back's,babs,babish,authors,authenticity,atropine,astronomical,assertive,arterial,armbrust,armageddon,aristotle,arches,anyanka,annoyance,anemic,anck,anago,ali's,algiers,airways,airwaves,air's,aimlessly,ails,ahab,afflicted,adverse,adhere,accuracy,aaargh,aaand,zest,yoghurt,yeast,wyndham's,writings,writhing,woven,workable,winking,winded,widen,whooping,whiter,whip's,whatya,whacko,we's,wazoo,wasp,waived,vlad,virile,vino,vic's,veterinary,vests,vestibule,versed,venetian,vaughn's,vanishes,vacancies,urkel,upwards,uproot,unwarranted,unscheduled,unparalleled,undertaking,undergrad,tweedle,turtleneck,turban,trickery,travolta,transylvania,transponder,toyed,townhouse,tonto,toed,tion,tier,thyself,thunderstorm,thnk,thinning,thinkers,theatres,thawed,tether,tempus,telegraph,technicalities,tau'ri,tarp,tarnished,tara's,taggert's,taffeta,tada,tacked,systolic,symbolize,swerve,sweepstakes,swami,swabs,suspenders,surfers,superwoman,sunsets,sumo,summertime,succulent,successes,subpoenas,stumper,stosh,stomachache,stewed,steppin,stepatech,stateside,starvation,staff's,squads,spicoli,spic,sparing,soulless,soul's,sonnets,sockets,snit,sneaker,snatching,smothering,slush,sloman,slashing,sitters,simpson's,simpleton,signify,signal's,sighs,sidra,sideshow,sickens,shunned,shrunken,showbiz,shopped,shootings,shimmering,shakespeare's,shagging,seventeenth,semblance,segue,sedation,scuzzlebutt,scumbags,scribble,screwin,scoundrels,scarsdale,scamp,scabs,saucers,sanctioned,saintly,saddened,runaways,runaround,rumored,rudimentary,rubies,rsvp,rots,roman's,ripley's,rheya,revived,residing,resenting,researcher,repertoire,rehashing,rehabilitated,regrettable,regimental,refreshed,reese's,redial,reconnecting,rebirth,ravenous,raping,ralph's,railroads,rafting,rache,quandary,pylea,putrid,punitive,puffing,psychopathic,prunes,protests,protestant,prosecutors,proportional,progressed,prod,probate,prince's,primate,predicting,prayin,practitioner,possessing,pomegranate,polgara,plummeting,planners,planing,plaintiffs,plagues,pitt's,pithy,photographer's,philharmonic,petrol,perversion,personals,perpetrators,perm,peripheral,periodic,perfecto,perched,pees,peeps,pedigree,peckish,pavarotti,partnered,palette,pajama,packin,pacifier,oyez,overstepping,outpatient,optimum,okama,obstetrician,nutso,nuance,noun,noting,normalcy,normal's,nonnegotiable,nomak,nobleman,ninny,nines,nicey,newsflash,nevermore,neutered,nether,nephew's,negligee,necrosis,nebula,navigating,narcissistic,namesake,mylie,muses,munitions,motivational,momento,moisturizer,moderation,mmph,misinformed,misconception,minnifield,mikkos,methodical,mechanisms,mebbe,meager,maybes,matchmaking,masry,markovic,manifesto,malakai,madagascar,m'am,luzhin,lusting,lumberjack,louvre,loopholes,loaning,lightening,liberals,lesbo,leotard,leafs,leader's,layman's,launder,lamaze,kubla,kneeling,kilo,kibosh,kelp,keith's,jumpsuit,joy's,jovi,joliet,jogger,janover,jakovasaurs,irreparable,intervened,inspectors,innovation,innocently,inigo,infomercial,inexplicable,indispensable,indicative,incognito,impregnated,impossibly,imperfect,immaculate,imitating,illnesses,icarus,hunches,hummus,humidity,housewives,houmfort,hothead,hostiles,hooves,hoopla,hooligans,homos,homie,hisself,himalayas,hidy,hickory,heyyy,hesitant,hangout,handsomest,handouts,haitian,hairless,gwennie,guzzling,guinevere,grungy,grunge,grenada,gout,gordon's,goading,gliders,glaring,geology,gems,gavel,garments,gardino,gannon's,gangrene,gaff,gabrielle's,fundraising,fruitful,friendlier,frequencies,freckle,freakish,forthright,forearm,footnote,footer,foot's,flops,flamenco,fixer,firm's,firecracker,finito,figgered,fezzik,favourites,fastened,farfetched,fanciful,familiarize,faire,failsafe,fahrenheit,fabrication,extravaganza,extracted,expulsion,exploratory,exploitation,explanatory,exclusion,evolutionary,everglades,evenly,eunuch,estas,escapade,erasers,entries,enforcing,endorsements,enabling,emptying,emperor's,emblem,embarassing,ecosystem,ebby,ebay,dweeb,dutiful,dumplings,drilled,drafty,doug's,dolt,dollhouse,displaced,dismissing,disgraced,discrepancies,disbelief,disagreeing,disagreed,digestion,didnt,deviled,deviated,deterioration,departmental,departing,demoted,demerol,delectable,deco,decaying,decadent,dears,daze,dateless,d'algout,cultured,cultivating,cryto,crusades,crumpled,crumbled,cronies,critters,crew's,crease,craves,cozying,cortland,corduroy,cook's,consumers,congratulated,conflicting,confidante,condensed,concessions,compressor,compressions,compression,complicating,complexity,compadre,communicated,coerce,coding,coating,coarse,clown's,clockwise,clerk's,classier,clandestine,chums,chumash,christopher's,choreography,choirs,chivalrous,chinpoko,chilean,chihuahua,cheerio,charred,chafing,celibacy,casts,caste,cashier's,carted,carryin,carpeting,carp,carotid,cannibals,candor,caen,cab's,butterscotch,busts,busier,bullcrap,buggin,budding,brookside,brodski,bristow's,brig,bridesmaid's,brassiere,brainwash,brainiac,botrelle,boatload,blimey,blaring,blackness,bipolar,bipartisan,bins,bimbos,bigamist,biebe,biding,betrayals,bestow,bellerophon,beefy,bedpans,battleship,bathroom's,bassinet,basking,basin,barzini,barnyard,barfed,barbarian,bandit,balances,baker's,backups,avid,augh,audited,attribute,attitudes,at's,astor,asteroids,assortment,associations,asinine,asalaam,arouse,architects,aqua,applejack,apparatus,antiquities,annoys,angela's,anew,anchovies,anchors,analysts,ampule,alphabetically,aloe,allure,alameida,aisles,airfield,ahah,aggressively,aggravate,aftermath,affiliation,aesthetic,advertised,advancing,adept,adage,accomplices,accessing,academics,aagh,zoned,zoey's,zeal,yokel,y'ever,wynant's,wringer,witwer,withdrew,withdrawing,withdrawals,windward,wimbledon,wily,willfully,whorfin,whimsical,whimpering,welding,weddin,weathered,wealthiest,weakening,warmest,wanton,waif,volant,vivo,vive,visceral,vindication,vikram,vigorously,verification,veggies,urinate,uproar,upload,unwritten,unwrap,unsung,unsubstantiated,unspeakably,unscrupulous,unraveling,unquote,unqualified,unfulfilled,undetectable,underlined,unconstitutional,unattainable,unappreciated,ummmm,ulcers,tylenol,tweak,tutu,turnin,turk's,tucker's,tuatha,tropez,trends,trellis,traffic's,torque,toppings,tootin,toodles,toodle,tivo,tinkering,thursday's,thrives,thorne's,thespis,thereafter,theatrics,thatherton,texts,testicle,terr,tempers,teammates,taxpayer,tavington,tampon,tackling,systematic,syndicated,synagogue,swelled,sweeney's,sutures,sustenance,surfaces,superstars,sunflowers,sumatra,sublet,subjective,stubbins,strutting,strewn,streams,stowaway,stoic,sternin,stereotypes,steadily,star's,stalker's,stabilizing,sprang,spotter,spiraling,spinster,spell's,speedometer,specified,speakeasy,sparked,soooo,songwriter,soiled,sneakin,smithereens,smelt,smacks,sloan's,slaughterhouse,slang,slacks,skids,sketching,skateboards,sizzling,sixes,sirree,simplistic,sift,side's,shouts,shorted,shoelace,sheeit,shaw's,shards,shackled,sequestered,selmak,seduces,seclusion,seasonal,seamstress,seabeas,scry,scripted,scotia,scoops,scooped,schillinger's,scavenger,saturation,satch,salaries,safety's,s'more,s'il,rudeness,rostov,romanian,romancing,robo,robert's,rioja,rifkin,rieper,revise,reunions,repugnant,replicating,replacements,repaid,renewing,remembrance,relic,relaxes,rekindle,regulate,regrettably,registering,regenerate,referenced,reels,reducing,reconstruct,reciting,reared,reappear,readin,ratting,rapes,rancho,rancher,rammed,rainstorm,railroading,queers,punxsutawney,punishes,pssst,prudy,proudest,protectors,prohibits,profiling,productivity,procrastinating,procession,proactive,priss,primaries,potomac,postmortem,pompoms,polio,poise,piping,pickups,pickings,physiology,philanthropist,phenomena,pheasant,perfectionist,peretti,people'll,peninsula,pecking,peaks,pave,patrolman,participant,paralegal,paragraphs,paparazzi,pankot,pampering,pain's,overstep,overpower,ovation,outweigh,outlawed,orion's,openness,omnipotent,oleg,okra,okie,odious,nuwanda,nurtured,niles's,newsroom,netherlands,nephews,neeson,needlepoint,necklaces,neato,nationals,muggers,muffler,mousy,mourned,mosey,morn,mormon,mopey,mongolians,moldy,moderately,modelling,misinterpret,minneapolis,minion,minibar,millenium,microfilm,metals,mendola,mended,melissande,me's,mathematician,masturbating,massacred,masbath,marler's,manipulates,manifold,malp,maimed,mailboxes,magnetism,magna,m'lord,m'honey,lymph,lunge,lull,luka,lt's,lovelier,loser's,lonigan's,lode,locally,literacy,liners,linear,lefferts,leezak,ledgers,larraby,lamborghini,laloosh,kundun,kozinski,knockoff,kissin,kiosk,khasinau's,kennedys,kellman,karlo,kaleidoscope,jumble,juggernaut,joseph's,jiminy,jesuits,jeffy,jaywalking,jailbird,itsy,irregularities,inventive,introduces,interpreter,instructing,installing,inquest,inhabit,infraction,informer,infarction,incidence,impulsively,impressing,importing,impersonated,impeach,idiocy,hyperbole,hydra,hurray,hungary,humped,huhuh,hsing,hotspot,horsepower,hordes,hoodlums,honky,hitchhiker,hind,hideously,henchmen,heaving,heathrow,heather's,heathcliff,healthcare,headgear,headboard,hazing,hawking,harem,handprint,halves,hairspray,gutiurrez,greener,grandstand,goosebumps,good's,gondola,gnaw,gnat,glitches,glide,gees,gasping,gases,garrison's,frolic,fresca,freeways,frayed,fortnight,fortitude,forgetful,forefathers,foley's,foiled,focuses,foaming,flossing,flailing,fitzgeralds,firehouse,finders,filmmakers,fiftieth,fiddler,fellah,feats,fawning,farquaad,faraway,fancied,extremists,extremes,expresses,exorcist,exhale,excel,evaluations,ethros,escalated,epilepsy,entrust,enraged,ennui,energized,endowment,encephalitis,empties,embezzling,elster,ellie's,ellen's,elixir,electrolytes,elective,elastic,edged,econ,eclectic,eagle's,duplex,dryers,drexl,dredging,drawback,drafting,don'ts,docs,dobisch,divorcee,ditches,distinguishing,distances,disrespected,disprove,disobeying,disobedience,disinfectant,discs,discoveries,dips,diplomas,dingy,digress,dignitaries,digestive,dieting,dictatorship,dictating,devoured,devise,devane's,detonators,detecting,desist,deserter,derriere,deron,derive,derivative,delegates,defects,defeats,deceptive,debilitating,deathwok,dat's,darryl's,dago,daffodils,curtsy,cursory,cuppa,cumin,cultivate,cujo,cubic,cronkite,cremation,credence,cranking,coverup,courted,countin,counselling,cornball,converting,contentment,contention,contamination,consortium,consequently,consensual,consecutive,compressed,compounds,compost,components,comparative,comparable,commenting,color's,collections,coleridge,coincidentally,cluett,cleverly,cleansed,cleanliness,clea,clare's,citizen's,chopec,chomp,cholera,chins,chime,cheswick,chessler,cheapest,chatted,cauliflower,catharsis,categories,catchin,caress,cardigan,capitalism,canopy,cana,camcorder,calorie,cackling,cabot's,bystanders,buttoned,buttering,butted,buries,burgel,bullpen,buffoon,brogna,brah,bragged,boutros,boosted,bohemian,bogeyman,boar,blurting,blurb,blowup,bloodhound,blissful,birthmark,biotech,bigot,bestest,benefited,belted,belligerent,bell's,beggin,befall,beeswax,beer's,becky's,beatnik,beaming,bazaar,bashful,barricade,banners,bangers,baja,baggoli,badness,awry,awoke,autonomy,automobiles,attica,astoria,assessing,ashram,artsy,artful,aroun,armpits,arming,arithmetic,annihilate,anise,angiogram,andre's,anaesthetic,amorous,ambiguous,ambiance,alligators,afforded,adoration,admittance,administering,adama,aclu,abydos,absorption,zonked,zhivago,zealand,zazu,youngster,yorkin,wrongfully,writin,wrappers,worrywart,woops,wonderfalls,womanly,wickedness,wichita,whoopie,wholesale,wholeheartedly,whimper,which'll,wherein,wheelchairs,what'ya,west's,wellness,welcomes,wavy,warren's,warranted,wankers,waltham,wallop,wading,wade's,wacked,vogue,virginal,vill,vets,vermouth,vermeil,verger,verbs,verbally,ventriss,veneer,vecchio's,vampira,utero,ushers,urgently,untoward,unshakable,unsettled,unruly,unrest,unmanned,unlocks,unified,ungodly,undue,undermined,undergoing,undergo,uncooperative,uncontrollably,unbeatable,twitchy,tunh,tumbler,tubs,truest,troublesome,triumphs,triplicate,tribbey,trent's,transmissions,tortures,torpedoes,torah,tongaree,tommi,tightening,thunderbolt,thunderbird,thorazine,thinly,theta,theres,testifies,terre,teenaged,technological,tearful,taxing,taldor,takashi,tach,symbolizes,symbolism,syllabus,swoops,swingin,swede,sutra,suspending,supplement,sunday's,sunburn,succumbed,subtitled,substituting,subsidiary,subdued,stuttering,stupor,stumps,strummer,strides,strategize,strangulation,stooped,stipulation,stingy,stigma,stewart's,statistic,startup,starlet,stapled,squeaks,squawking,spoilsport,splicing,spiel,spencers,specifications,spawned,spasms,spaniard,sous,softener,sodding,soapbox,snow's,smoldering,smithbauer,slogans,slicker,slasher,skittish,skepticism,simulated,similarity,silvio,signifies,signaling,sifting,sickest,sicilians,shuffling,shrivel,shortstop,sensibility,sender,seminary,selecting,segretti,seeping,securely,scurrying,scrunch,scrote,screwups,schoolteacher,schibetta's,schenkman,sawing,savin,satine,saps,sapiens,salvaging,salmonella,safeguard,sacrilege,rumpus,ruffle,rube,routing,roughing,rotted,roshman's,rondall,road's,ridding,rickshaw,rialto,rhinestone,reversible,revenues,retina,restrooms,resides,reroute,requisite,repress,replicate,repetition,removes,relationship's,regent,regatta,reflective,rednecks,redeeming,rectory,recordings,reasoned,rayed,ravell,raked,rainstorm's,raincheck,raids,raffi,racked,query,quantities,pushin,prototypes,proprietor,promotes,prometheus,promenade,projectile,progeny,profess,prodding,procure,primetime,presuming,preppy,prednisone,predecessor,potted,posttraumatic,poppies,poorhouse,pool's,polaroid,podiatrist,plucky,plowed,pledging,playroom,playhouse,play's,plait,placate,pitchfork,pissant,pinback,picketing,photographing,pharoah,petrak,petal,persecuting,perchance,penny's,pellets,peeved,peerless,payable,pauses,pathways,pathologist,pat's,parchment,papi,pagliacci,owls,overwrought,overwhelmingly,overreaction,overqualified,overheated,outward,outlines,outcasts,otherworldly,originality,organisms,opinionated,oodles,oftentimes,octane,occured,obstinate,observatory,o'er,nutritionist,nutrition,numbness,nubile,notification,notary,nooooooo,nodes,nobodies,nepotism,neighborhoods,neanderthals,musicals,mushu,murphy's,multimedia,mucus,mothering,mothballs,monogrammed,monk's,molesting,misspoke,misspelled,misconstrued,miscellaneous,miscalculated,minimums,mince,mildew,mighta,middleman,metabolic,messengers,mementos,mellowed,meditate,medicare,mayol,maximilian,mauled,massaged,marmalade,mardi,mannie,mandates,mammals,malaysia,makings,major's,maim,lundegaard,lovingly,lout,louisville,loudest,lotto,loosing,loompa,looming,longs,lodging,loathes,littlest,littering,linebacker,lifelike,li'l,legalities,lavery's,laundered,lapdog,lacerations,kopalski,knobs,knitted,kittridge,kidnaps,kerosene,katya,karras,jungles,juke,joes,jockeys,jeremy's,jefe,janeiro,jacqueline's,ithaca,irrigation,iranoff,invoices,invigorating,intestinal,interactive,integration,insolence,insincere,insectopia,inhumane,inhaling,ingrates,infrastructure,infestation,infants,individuality,indianapolis,indeterminate,indefinite,inconsistent,incomprehensible,inaugural,inadequacy,impropriety,importer,imaginations,illuminating,ignited,ignite,iggy,i'da,hysterics,hypodermic,hyperventilate,hypertension,hyperactive,humoring,hotdogs,honeymooning,honed,hoist,hoarding,hitching,hinted,hill's,hiker,hijo,hightail,highlands,hemoglobin,helo,hell'd,heinie,hanoi,hags,gush,guerrillas,growin,grog,grissom's,gregory's,grasped,grandparent,granddaughters,gouged,goblins,gleam,glades,gigantor,get'em,geriatric,geared,gawk,gawd,gatekeeper,gargoyles,gardenias,garcon,garbo,gallows,gabe's,gabby's,gabbing,futon,fulla,frightful,freshener,freedoms,fountains,fortuitous,formulas,forceps,fogged,fodder,foamy,flogging,flaun,flared,fireplaces,firefighters,fins,filtered,feverish,favell,fattest,fattening,fate's,fallow,faculties,fabricated,extraordinaire,expressly,expressive,explorers,evade,evacuating,euclid,ethanol,errant,envied,enchant,enamored,enact,embarking,election's,egocentric,eeny,dussander,dunwitty,dullest,dru's,dropout,dredged,dorsia,dormitory,doot,doornail,dongs,dogged,dodgy,do's,ditty,dishonorable,discriminating,discontinue,dings,dilly,diffuse,diets,dictation,dialysis,deteriorated,delly,delightfully,definitions,decreased,declining,deadliest,daryll,dandruff,cynthia's,cush,cruddy,croquet,crocodiles,cringe,crimp,credo,cranial,crackling,coyotes,courtside,coupling,counteroffer,counterfeiting,corrupting,corrective,copter,copping,conway's,conveyor,contusions,contusion,conspirator,consoling,connoisseur,conjecture,confetti,composure,competitor,compel,commanders,coloured,collector's,colic,coldest,coincide,coddle,cocksuckers,coax,coattails,cloned,cliff's,clerical,claustrophobia,classrooms,clamoring,civics,churn,chugga,chromosomes,christened,chopper's,chirping,chasin,characterized,chapped,chalkboard,centimeter,caymans,catheter,caspian,casings,cartilage,carlton's,card's,caprica,capelli,cannolis,cannoli,canals,campaigns,camogli,camembert,butchers,butchered,busboys,bureaucrats,bungalow,buildup,budweiser,buckled,bubbe,brownstone,bravely,brackley,bouquets,botox,boozing,boosters,bodhi,blunders,blunder,blockage,blended,blackberry,bitch's,birthplace,biocyte,biking,bike's,betrays,bestowed,bested,beryllium,beheading,beginner's,beggar,begbie,beamed,bayou,bastille,bask,barstool,barricades,baron's,barbecues,barbecued,barb's,bandwagon,bandits,ballots,ballads,backfiring,bacarra,avoidance,avenged,autopsies,austrian,aunties,attache,atrium,associating,artichoke,arrowhead,arrivals,arose,armory,appendage,apostrophe,apostles,apathy,antacid,ansel,anon,annul,annihilation,andrew's,anderson's,anastasia's,amuses,amped,amicable,amendments,amberg,alluring,allotted,alfalfa,alcoholism,airs,ailing,affinity,adversaries,admirers,adlai,adjective,acupuncture,acorn,abnormality,aaaahhhh,zooming,zippity,zipping,zeroed,yuletide,yoyodyne,yengeese,yeahhh,xena,wrinkly,wracked,wording,withered,winks,windmills,widow's,whopping,wholly,wendle,weigart,weekend's,waterworks,waterford,waterbed,watchful,wantin,wally's,wail,wagging,waal,waaah,vying,voter,ville,vertebrae,versatile,ventures,ventricle,varnish,vacuumed,uugh,utilities,uptake,updating,unreachable,unprovoked,unmistakable,unky,unfriendly,unfolding,undesirable,undertake,underpaid,uncuff,unchanged,unappealing,unabomber,ufos,tyres,typhoid,tweek's,tuxedos,tushie,turret,turds,tumnus,tude,truman's,troubadour,tropic,trinium,treaters,treads,transpired,transient,transgression,tournaments,tought,touchdowns,totem,tolstoy,thready,thins,thinners,thas,terrible's,television's,techs,teary,tattaglia,tassels,tarzana,tape's,tanking,tallahassee,tablecloths,synonymous,synchronize,symptomatic,symmetrical,sycophant,swimmingly,sweatshop,surrounds,surfboard,superpowers,sunroom,sunflower,sunblock,sugarplum,sudan,subsidies,stupidly,strumpet,streetcar,strategically,strapless,straits,stooping,stools,stifler,stems,stealthy,stalks,stairmaster,staffer,sshhh,squatting,squatters,spores,spelt,spectacularly,spaniel,soulful,sorbet,socked,society's,sociable,snubbed,snub,snorting,sniffles,snazzy,snakebite,smuggler,smorgasbord,smooching,slurping,sludge,slouch,slingshot,slicer,slaved,skimmed,skier,sisterhood,silliest,sideline,sidarthur,shrink's,shipwreck,shimmy,sheraton,shebang,sharpening,shanghaied,shakers,sendoff,scurvy,scoliosis,scaredy,scaled,scagnetti,saxophone,sawchuk,saviour,saugus,saturated,sasquatch,sandbag,saltines,s'pose,royalties,routinely,roundabout,roston,rostle,riveting,ristle,righ,rifling,revulsion,reverently,retrograde,restriction,restful,resolving,resents,rescinded,reptilian,repository,reorganize,rentals,rent's,renovating,renal,remedies,reiterate,reinvent,reinmar,reibers,reechard,recuse,recorders,record's,reconciling,recognizance,recognised,reclaiming,recitation,recieved,rebate,reacquainted,rations,rascals,raptors,railly,quintuplets,quahog,pygmies,puzzling,punctuality,psychoanalysis,psalm,prosthetic,proposes,proms,proliferation,prohibition,probie,printers,preys,pretext,preserver,preppie,prag,practise,postmaster,portrayed,pollen,polled,poachers,plummet,plumbers,pled,plannin,pitying,pitfalls,piqued,pinecrest,pinches,pillage,pigheaded,pied,physique,pessimistic,persecute,perjure,perch,percentile,pentothal,pensky,penises,peking,peini,peacetime,pazzi,pastels,partisan,parlour,parkway,parallels,paperweight,pamper,palsy,palaces,pained,overwhelm,overview,overalls,ovarian,outrank,outpouring,outhouse,outage,ouija,orbital,old's,offset,offer's,occupying,obstructed,obsessions,objectives,obeying,obese,o'riley,o'neal,o'higgins,nylon,notoriously,nosebleeds,norman's,norad,noooooooo,nononono,nonchalant,nominal,nome,nitrous,nippy,neurosis,nekhorvich,necronomicon,nativity,naquada,nano,nani,n'est,mystik,mystified,mums,mumps,multinational,muddle,mothership,moped,monumentally,monogamous,mondesi,molded,mixes,misogynistic,misinterpreting,miranda's,mindlock,mimic,midtown,microphones,mending,megaphone,meeny,medicating,meanings,meanie,masseur,maru,marshal's,markstrom,marklars,mariachi,margueritas,manifesting,maintains,mail's,maharajah,lurk,lulu's,lukewarm,loveliest,loveable,lordship,looting,lizardo,liquored,lipped,lingers,limey,limestone,lieutenants,lemkin,leisurely,laureate,lathe,latched,lars,lapping,ladle,kuala,krevlorneswath,kosygin,khakis,kenaru,keats,kath,kaitlan,justin's,julliard,juliet's,journeys,jollies,jiff,jaundice,jargon,jackals,jabot's,invoked,invisibility,interacting,instituted,insipid,innovative,inflamed,infinitely,inferiority,inexperience,indirectly,indications,incompatible,incinerated,incinerate,incidental,incendiary,incan,inbred,implicitly,implicating,impersonator,impacted,ida's,ichiro,iago,hypo,hurricanes,hunks,host's,hospice,horsing,hooded,honey's,homestead,hippopotamus,hindus,hiked,hetson,hetero,hessian,henslowe,hendler,hellstrom,hecate,headstone,hayloft,hater,hast,harold's,harbucks,handguns,hallucinate,halliwell's,haldol,hailing,haggling,hadj,gynaecologist,gumball,gulag,guilder,guaranteeing,groundskeeper,ground's,grindstone,grimoir,grievance,griddle,gribbit,greystone,graceland,gooders,goeth,glossy,glam,giddyup,gentlemanly,gels,gelatin,gazelle,gawking,gaulle,gate's,ganged,fused,fukes,fromby,frenchmen,franny,foursome,forsley,foreman's,forbids,footwork,foothold,fonz,fois,foie,floater,flinging,flicking,fittest,fistfight,fireballs,filtration,fillings,fiddling,festivals,fertilization,fennyman,felonious,felonies,feces,favoritism,fatten,fanfare,fanatics,faceman,extensions,executions,executing,excusing,excepted,examiner's,ex's,evaluating,eugh,erroneous,enzyme,envoy,entwined,entrances,ensconced,enrollment,england's,enemy's,emit,emerges,embankment,em's,ellison's,electrons,eladio,ehrlichman,easterland,dylan's,dwellers,dueling,dubbed,dribbling,drape,doze,downtrodden,doused,dosed,dorleen,dopamine,domesticated,dokie,doggone,disturbances,distort,displeased,disown,dismount,disinherited,disarmed,disapproves,disabilities,diperna,dioxide,dined,diligent,dicaprio,diameter,dialect,detonated,destitute,designate,depress,demolish,demographics,degraded,deficient,decoded,debatable,dealey,darsh,dapper,damsels,damning,daisy's,dad'll,d'oeuvre,cutter's,curlers,curie,cubed,cryo,critically,crikey,crepes,crackhead,countrymen,count's,correlation,cornfield,coppers,copilot,copier,coordinating,cooing,converge,contributor,conspiracies,consolidated,consigliere,consecrated,configuration,conducts,condoning,condemnation,communities,commoner,commies,commented,comical,combust,comas,colds,clod,clique,clay's,clawed,clamped,cici,christianity,choosy,chomping,chimps,chigorin,chianti,cheval,chet's,cheep,checkups,check's,cheaters,chase's,charted,celibate,cautiously,cautionary,castell,carpentry,caroling,carjacking,caritas,caregiver,cardiology,carb,capturing,canteen,candlesticks,candies,candidacy,canasta,calendars,cain't,caboose,buster's,burro,burnin,buon,bunking,bumming,bullwinkle,budgets,brummel,brooms,broadcasts,britt's,brews,breech,breathin,braslow,bracing,bouts,botulism,bosnia,boorish,bluenote,bloodless,blayne,blatantly,blankie,birdy,bene,beetles,bedbugs,becuase,becks,bearers,bazooka,baywatch,bavarian,baseman,bartender's,barrister,barmaid,barges,bared,baracus,banal,bambino,baltic,baku,bakes,badminton,bacon's,backpacks,authorizing,aurelius,attentions,atrocious,ativan,athame,asunder,astound,assuring,aspirins,asphyxiation,ashtrays,aryans,artistry,arnon,aren,approximate,apprehension,appraisal,applauding,anya's,anvil,antiquing,antidepressants,annoyingly,amputate,altruistic,alotta,allegation,alienation,algerian,algae,alerting,airport's,aided,agricultural,afterthought,affront,affirm,adapted,actuality,acoustics,acoustic,accumulate,accountability,abysmal,absentee,zimm,yves,yoohoo,ymca,yeller,yakushova,wuzzy,wriggle,worrier,workmen,woogyman,womanizer,windpipe,windex,windbag,willy's,willin,widening,whisking,whimsy,wendall,weeny,weensy,weasels,watery,watcha,wasteful,waski,washcloth,wartime,waaay,vowel,vouched,volkswagen,viznick,visuals,visitor's,veteran's,ventriloquist,venomous,vendors,vendettas,veils,vehicular,vayhue,vary,varies,van's,vamanos,vadimus,uuhh,upstage,uppity,upheaval,unsaid,unlocking,universally,unintentionally,undisputed,undetected,undergraduate,undergone,undecided,uncaring,unbearably,twos,tween,tuscan,turkey's,tumor's,tryout,trotting,tropics,trini,trimmings,trickier,tree's,treatin,treadstone,trashcan,transports,transistor,transcendent,tramps,toxicity,townsfolk,torturous,torrid,toothpicks,tombs,tolerable,toenail,tireless,tiptoeing,tins,tinkerbell,tink,timmay,tillinghouse,tidying,tibia,thumbing,thrusters,thrashing,thompson's,these'll,testicular,terminology,teriyaki,tenors,tenacity,tellers,telemetry,teas,tea's,tarragon,taliban,switchblade,swicker,swells,sweatshirts,swatches,swatch,swapped,suzanne's,surging,supremely,suntan,sump'n,suga,succumb,subsidize,subordinate,stumbles,stuffs,stronghold,stoppin,stipulate,stewie's,stenographer,steamroll,stds,stately,stasis,stagger,squandered,splint,splendidly,splatter,splashy,splashing,spectra's,specter,sorry's,sorcerers,soot,somewheres,somber,solvent,soldier's,soir,snuggled,snowmobile,snowball's,sniffed,snake's,snags,smugglers,smudged,smirking,smearing,slings,sleet,sleepovers,sleek,slackers,skirmish,siree,siphoning,singed,sincerest,signifying,sidney's,sickened,shuffled,shriveled,shorthanded,shittin,shish,shipwrecked,shins,shingle,sheetrock,shawshank,shamu,sha're,servitude,sequins,seinfeld's,seat's,seascape,seam,sculptor,scripture,scrapings,scoured,scoreboard,scorching,sciences,sara's,sandpaper,salvaged,saluting,salud,salamander,rugrats,ruffles,ruffled,rudolph's,router,roughnecks,rougher,rosslyn,rosses,rosco's,roost,roomy,romping,romeo's,robs,roadie,ride's,riddler,rianna's,revolutionize,revisions,reuniting,retake,retaining,restitution,restaurant's,resorts,reputed,reprimanded,replies,renovate,remnants,refute,refrigerated,reforms,reeled,reefs,reed's,redundancies,rectangle,rectal,recklessly,receding,reassignment,rearing,reapers,realms,readout,ration,raring,ramblings,racetrack,raccoons,quoi,quell,quarantined,quaker,pursuant,purr,purging,punters,pulpit,publishers,publications,psychologists,psychically,provinces,proust,protocols,prose,prophets,project's,priesthood,prevailed,premarital,pregnancies,predisposed,precautionary,poppin,pollute,pollo,podunk,plums,plaything,plateau,pixilated,pivot,pitting,piranhas,pieced,piddles,pickled,picker,photogenic,phosphorous,phases,pffft,petey's,pests,pestilence,pessimist,pesos,peruvian,perspiration,perps,penticoff,pedals,payload,passageways,pardons,paprika,paperboy,panics,pancamo,pam's,paleontologist,painting's,pacifist,ozzie,overwhelms,overstating,overseeing,overpaid,overlap,overflow,overdid,outspoken,outlive,outlaws,orthodontist,orin,orgies,oreos,ordover,ordinates,ooooooh,oooohhh,omelettes,officiate,obtuse,obits,oakwood,nymph,nutritional,nuremberg,nozzle,novocaine,notable,noooooooooo,node,nipping,nilly,nikko,nightstick,nicaragua,neurology,nelson's,negate,neatness,natured,narrowly,narcotic,narcissism,napoleon's,nana's,namun,nakatomi,murky,muchacho,mouthwash,motzah,motherfucker's,mortar,morsel,morrison's,morph,morlocks,moreover,mooch,monoxide,moloch,molest,molding,mohra,modus,modicum,mockolate,mobility,missionaries,misdemeanors,miscalculation,minorities,middies,metric,mermaids,meringue,mercilessly,merchandising,ment,meditating,me'n,mayakovsky,maximillian,martinique,marlee,markovski,marissa's,marginal,mansions,manitoba,maniacal,maneuvered,mags,magnificence,maddening,lyrical,lutze,lunged,lovelies,lou's,lorry,loosening,lookee,liver's,liva,littered,lilac,lightened,lighted,licensing,lexington,lettering,legality,launches,larvae,laredo,landings,lancelot's,laker,ladyship's,laces,kurzon,kurtzweil,kobo,knowledgeable,kinship,kind've,kimono,kenji,kembu,keanu,kazuo,kayaking,juniors,jonesing,joad,jilted,jiggling,jewelers,jewbilee,jeffrey's,jamey's,jacqnoud,jacksons,jabs,ivories,isnt,irritation,iraqis,intellectuals,insurmountable,instances,installments,innocuous,innkeeper,inna,influencing,infantery,indulged,indescribable,incorrectly,incoherent,inactive,inaccurate,improperly,impervious,impertinent,imperfections,imhotep,ideology,identifies,i'il,hymns,huts,hurdles,hunnert,humpty,huffy,hourly,horsies,horseradish,hooo,honours,honduras,hollowed,hogwash,hockley,hissing,hiromitsu,hierarchy,hidin,hereafter,helpmann,haughty,happenings,hankie,handsomely,halliwells,haklar,haise,gunsights,gunn's,grossly,grossed,grope,grocer,grits,gripping,greenpeace,granddad's,grabby,glorificus,gizzard,gilardi,gibarian,geminon,gasses,garnish,galloping,galactic,gairwyn,gail's,futterman,futility,fumigated,fruitless,friendless,freon,fraternities,franc,fractions,foxes,foregone,forego,foliage,flux,floored,flighty,fleshy,flapjacks,fizzled,fittings,fisherman's,finalist,ficus,festering,ferragamo's,federation,fatalities,farbman,familial,famed,factual,fabricate,eyghon,extricate,exchanges,exalted,evolving,eventful,esophagus,eruption,envision,entre,enterprising,entail,ensuring,enrolling,endor,emphatically,eminent,embarrasses,electroshock,electronically,electrodes,efficiently,edinburgh,ecstacy,ecological,easel,dwarves,duffle,drumsticks,drake's,downstream,downed,dollface,divas,distortion,dissent,dissection,dissected,disruptive,disposing,disparaging,disorientation,disintegrated,discounts,disarming,dictated,devoting,deviation,detective's,dessaline,deprecating,deplorable,delve,deity,degenerative,deficiencies,deduct,decomposed,deceased's,debbie's,deathly,dearie,daunting,dankova,czechoslovakia,cyclotron,cyberspace,cutbacks,cusp,culpable,cuddled,crypto,crumpets,cruises,cruisers,cruelly,crowns,crouching,cristo,crip,criminology,cranium,cramming,cowering,couric,counties,cosy,corky's,cordesh,conversational,conservatory,conklin's,conducive,conclusively,competitions,compatibility,coeur,clung,cloud's,clotting,cleanest,classify,clambake,civilizations,cited,cipher,cinematic,chlorine,chipping,china's,chimpanzee,chests,checkpoints,cheapen,chainsaws,censure,censorship,cemeteries,celebrates,ceej,cavities,catapult,cassettes,cartridge,caravaggio,carats,captivating,cancers,campuses,campbell's,calrissian,calibre,calcutta,calamity,butt's,butlers,busybody,bussing,bureau's,bunion,bundy's,bulimic,bulgaria,budging,brung,browbeat,brokerage,brokenhearted,brecher,breakdowns,braun's,bracebridge,boyhood,botanical,bonuses,boning,blowhard,bloc,blisters,blackboard,blackbird,births,birdies,bigotry,biggy,bibliography,bialy,bhamra,bethlehem,bet's,bended,belgrade,begat,bayonet,bawl,battering,baste,basquiat,barrymore,barrington's,barricaded,barometer,balsom's,balled,ballast,baited,badenweiler,backhand,aztec,axle,auschwitz,astrophysics,ascenscion,argumentative,arguably,arby's,arboretum,aramaic,appendicitis,apparition,aphrodite,anxiously,antagonistic,anomalies,anne's,angora,anecdotes,anand,anacott,amniotic,amenities,ambience,alonna,aleck,albert's,akashic,airing,ageless,afro,affiliates,advertisers,adobe,adjustable,acrobat,accommodation,accelerating,absorbing,abouts,abortions,abnormalities,aawwww,aaaaarrrrrrggghhh,zuko's,zoloft,zendi,zamboni,yuppies,yodel,y'hear,wyck,wrangle,wounding,worshippers,worker's,worf,wombosi,wittle,withstanding,wisecracks,williamsburg,wilder's,wiggly,wiggling,wierd,whittlesley,whipper,whattya,whatsamatter,whatchamacallit,whassup,whad'ya,weighted,weakling,waxy,waverly,wasps,warhol,warfarin,waponis,wampum,walled,wadn't,waco,vorash,vogler's,vizzini,visas,virtucon,viridiana,veve,vetoed,vertically,veracity,ventricular,ventilated,varicose,varcon,vandalized,vampire's,vamos,vamoose,val's,vaccinated,vacationing,usted,urinal,uppers,upkeep,unwittingly,unsigned,unsealed,unplanned,unhinged,unhand,unfathomable,unequivocally,unearthed,unbreakable,unanimously,unadvisedly,udall,tynacorp,twisty,tuxes,tussle,turati,tunic,tubing,tsavo,trussed,troublemakers,trollop,trip's,trinket,trilogy,tremors,trekkie,transsexual,transitional,transfusions,tractors,toothbrushes,toned,toke,toddlers,titan's,tita,tinted,timon,timeslot,tightened,thundering,thorpey,thoracic,this'd,thespian,therapist's,theorem,thaddius,texan,tenuous,tenths,tenement,telethon,teleprompter,technicolor,teaspoon,teammate,teacup,taunted,tattle,tardiness,taraka,tappy,tapioca,tapeworm,tanith,tandem,talons,talcum,tais,tacks,synchronized,swivel,swig,swaying,swann's,suppression,supplements,superpower,summed,summarize,sumbitch,sultry,sulfur,sues,subversive,suburbia,substantive,styrofoam,stylings,struts,strolls,strobe,streaks,strategist,stockpile,stewardesses,sterilized,sterilize,stealin,starred,stakeouts,stad,squawk,squalor,squabble,sprinkled,sportsmanship,spokes,spiritus,spectators,specialties,sparklers,spareribs,sowing,sororities,sorbonne,sonovabitch,solicit,softy,softness,softening,socialite,snuggling,snatchers,snarling,snarky,snacking,smythe's,smears,slumped,slowest,slithering,sleepers,sleazebag,slayed,slaughtering,skynet,skidded,skated,sivapathasundaram,sitter's,sitcoms,sissies,sinai,silliness,silences,sidecar,sicced,siam,shylock,shtick,shrugged,shriek,shredder,shoves,should'a,shorten,shortcake,shockingly,shirking,shelly's,shedding,shaves,shatner,sharpener,shapely,shafted,sexless,sequencing,septum,semitic,selflessness,sega,sectors,seabea,scuff,screwball,screened,scoping,scooch,scolding,scholarly,schnitzel,schemed,scalper,sayings,saws,sashimi,santy,sankara,sanest,sanatorium,sampled,samoan,salzburg,saltwater,salma,salesperson,sakulos,safehouse,sabers,rwanda,ruth's,runes,rumblings,rumbling,ruijven,roxie's,round's,ringers,rigorous,righto,rhinestones,reviving,retrieving,resorted,reneging,remodelling,reliance,relentlessly,relegated,relativity,reinforced,reigning,regurgitate,regulated,refills,referencing,reeking,reduces,recreated,reclusive,recklessness,recanted,ranges,ranchers,rallied,rafer,racy,quintet,quaking,quacks,pulses,provision,prophesied,propensity,pronunciation,programmer,profusely,procedural,problema,principals,prided,prerequisite,preferences,preceded,preached,prays,postmark,popsicles,poodles,pollyanna,policing,policeman's,polecat,polaroids,polarity,pokes,poignant,poconos,pocketful,plunging,plugging,pleeease,pleaser,platters,pitied,pinetti,piercings,phyllis's,phooey,phonies,pestering,periscope,perennial,perceptions,pentagram,pelts,patronized,parliamentary,paramour,paralyze,paraguay,parachutes,pancreatic,pales,paella,paducci,oxymoron,owatta,overpass,overgrown,overdone,overcrowded,overcompensating,overcoming,ostracized,orphaned,organise,organisation,ordinate,orbiting,optometrist,oprah's,operandi,oncology,on's,omoc,omens,okayed,oedipal,occupants,obscured,oboe,nuys,nuttier,nuptial,nunheim,noxious,nourish,notepad,notation,nordic,nitroglycerin,niki's,nightmare's,nightlife,nibblet,neuroses,neighbour's,navy's,nationally,nassau,nanosecond,nabbit,mythic,murdock's,munchkins,multiplied,multimillion,mulroney,mulch,mucous,muchas,moxie,mouth's,mountaintop,mounds,morlin,mongorians,moneymaker,moneybags,monde,mom'll,molto,mixup,mitchell's,misgivings,misery's,minerals,mindset,milo's,michalchuk,mesquite,mesmerized,merman,mensa,megan's,media's,meaty,mbwun,materialize,materialistic,mastery,masterminded,mastercard,mario's,marginally,mapuhe,manuscripts,manny's,malvern,malfunctioning,mahatma,mahal,magnify,macnamara,macinerney,machinations,macarena,macadamia,lysol,luxembourg,lurks,lumpur,luminous,lube,lovelorn,lopsided,locator,lobbying,litback,litany,linea,limousines,limo's,limes,lighters,liechtenstein,liebkind,lids,libya,levity,levelheaded,letterhead,lester's,lesabre,leron,lepers,legions,lefts,leftenant,learner's,laziness,layaway,laughlan,lascivious,laryngitis,laptops,lapsed,laos,landok,landfill,laminated,laden,ladders,labelled,kyoto,kurten,kobol,koala,knucklehead,knowed,knotted,kit's,kinsa,kiln,kickboxing,karnovsky,karat,kacl's,judiciary,judaism,journalistic,jolla,joked,jimson,jettison,jet's,jeric,jeeves,jay's,jawed,jankis,janitors,janice's,jango,jamaican,jalopy,jailbreak,jackers,jackasses,j'ai,ivig,invalidate,intoxicated,interstellar,internationally,intercepting,intercede,integrate,instructors,insinuations,insignia,inn's,inflicting,infiltrated,infertile,ineffective,indies,indie,impetuous,imperialist,impaled,immerse,immaterial,imbeciles,imam,imagines,idyllic,idolized,icebox,i'd've,hypochondriac,hyphen,hydraulic,hurtling,hurried,hunchback,hums,humid,hullo,hugger,hubby's,howard's,hostel,horsting,horned,hoooo,homies,homeboys,hollywood's,hollandaise,hoity,hijinks,heya,hesitates,herrero,herndorff,hemp,helplessly,heeyy,heathen,hearin,headband,harv,harrassment,harpies,harmonious,harcourt,harbors,hannah's,hamstring,halstrom,hahahahaha,hackett's,hacer,gunmen,guff,grumbling,grimlocks,grift,greets,grandmothers,grander,granddaughter's,gran's,grafts,governing,gordievsky,gondorff,godorsky,goddesses,glscripts,gillman's,geyser,gettysburg,geological,gentlemen's,genome,gauntlet,gaudy,gastric,gardeners,gardener's,gandolf,gale's,gainful,fuses,fukienese,fucker's,frizzy,freshness,freshening,freb,fraught,frantically,fran's,foxbooks,fortieth,forked,forfeited,forbidding,footed,foibles,flunkies,fleur,fleece,flatbed,flagship,fisted,firefight,fingerpaint,fined,filibuster,fiancee's,fhloston,ferrets,fenceline,femur,fellow's,fatigues,farmhouse,fanucci,fantastically,familiars,falafel,fabulously,eyesore,extracting,extermination,expedient,expectancy,exiles,executor,excluding,ewwww,eviscerated,eventual,evac,eucalyptus,ethnicity,erogenous,equestrian,equator,epidural,enrich,endeavors,enchante,embroidered,embarassed,embarass,embalming,emails,elude,elspeth,electrocute,electrified,eigth,eheh,eggshell,eeyy,echinacea,eases,earpiece,earlobe,dwarfs,dumpsters,dumbshit,dumbasses,duloc,duisberg,drummed,drinkers,dressy,drainage,dracula's,dorma,dolittle,doily,divvy,diverting,ditz,dissuade,disrespecting,displacement,displace,disorganized,dismantled,disgustingly,discriminate,discord,disapproving,dinero,dimwit,diligence,digitally,didja,diddy,dickless,diced,devouring,devlin's,detach,destructing,desperado,desolate,designation,derek's,deposed,dependency,dentist's,demonstrates,demerits,delirium,degrade,deevak,deemesa,deductions,deduce,debriefed,deadbeats,dazs,dateline,darndest,damnable,dalliance,daiquiri,d'agosta,cuvee's,cussing,curate,cryss,cripes,cretins,creature's,crapper,crackerjack,cower,coveting,couriers,countermission,cotswolds,cornholio,copa,convinces,convertibles,conversationalist,contributes,conspirators,consorting,consoled,conservation,consarn,confronts,conformity,confides,confidentially,confederacy,concise,competence,commited,commissioners,commiserate,commencing,comme,commandos,comforter,comeuppance,combative,comanches,colosseum,colling,collaboration,coli,coexist,coaxing,cliffside,clayton's,clauses,cia's,chuy,chutes,chucked,christian's,chokes,chinaman,childlike,childhoods,chickening,chicano,chenowith,chassis,charmingly,changin,championships,chameleon,ceos,catsup,carvings,carlotta's,captioning,capsize,cappucino,capiche,cannonball,cannibal,candlewell,cams,call's,calculation,cakewalk,cagey,caesar's,caddie,buxley,bumbling,bulky,bulgarian,bugle,buggered,brussel,brunettes,brumby,brotha,bros,bronck,brisket,bridegroom,breathing's,breakout,braveheart,braided,bowled,bowed,bovary,bordering,bookkeeper,bluster,bluh,blue's,blot,bloodline,blissfully,blarney,binds,billionaires,billiard,bide,bicycles,bicker,berrisford,bereft,berating,berate,bendy,benches,bellevue,belive,believers,belated,beikoku,beens,bedspread,bed's,bear's,bawdy,barrett's,barreling,baptize,banya,balthazar,balmoral,bakshi,bails,badgered,backstreet,backdrop,awkwardly,avoids,avocado,auras,attuned,attends,atheists,astaire,assuredly,art's,arrivederci,armaments,arises,argyle,argument's,argentine,appetit,appendectomy,appealed,apologetic,antihistamine,antigua,anesthesiologist,amulets,algonquin,alexander's,ales,albie,alarmist,aiight,agility,aforementioned,adstream,adolescents,admirably,adjectives,addison's,activists,acquaint,acids,abound,abominable,abolish,abode,abfc,aaaaaaah,zorg,zoltan,zoe's,zekes,zatunica,yama,wussy,wrcw,worded,wooed,woodrell,wiretap,windowsill,windjammer,windfall,whitey's,whitaker's,whisker,whims,whatiya,whadya,westerns,welded,weirdly,weenies,webster's,waunt,washout,wanto,waning,vitality,vineyards,victimless,vicki's,verdad,veranda,vegan,veer,vandaley,vancouver,vancomycin,valise,validated,vaguest,usefulness,upshot,uprising,upgrading,unzip,unwashed,untrained,unsuitable,unstuck,unprincipled,unmentionables,unjustly,unit's,unfolds,unemployable,uneducated,unduly,undercut,uncovering,unconsciousness,unconsciously,unbeknownst,unaffected,ubiquitous,tyndareus,tutors,turncoat,turlock,tulle,tuesday's,tryouts,truth's,trouper,triplette,trepkos,tremor,treeger,treatment's,traveller,traveler's,trapeze,traipse,tradeoff,trach,torin,tommorow,tollan,toity,timpani,tilted,thumbprint,throat's,this's,theater's,thankless,terrestrial,tenney's,tell'em,telepathy,telemarketing,telekinesis,teevee,teeming,tc's,tarred,tankers,tambourine,talentless,taki,takagi,swooped,switcheroo,swirly,sweatpants,surpassed,surgeon's,supermarkets,sunstroke,suitors,suggestive,sugarcoat,succession,subways,subterfuge,subservient,submitting,subletting,stunningly,student's,strongbox,striptease,stravanavitch,stradling,stoolie,stodgy,stocky,stimuli,stigmata,stifle,stealer,statewide,stark's,stardom,stalemate,staggered,squeezes,squatter,squarely,sprouted,spool,spirit's,spindly,spellman's,speedos,specify,specializing,spacey,soups,soundly,soulmates,somethin's,somebody'll,soliciting,solenoid,sobering,snowflakes,snowballs,snores,slung,slimming,slender,skyscrapers,skulk,skivvies,skillful,skewered,skewer,skaters,sizing,sistine,sidebar,sickos,shushing,shunt,shugga,shone,shol'va,shiv,shifter,sharply,sharpened,shareholder,shapeshifter,shadowing,shadoe,serviced,selwyn,selectman,sefelt,seared,seamen,scrounging,scribbling,scotty's,scooping,scintillating,schmoozing,schenectady,scene's,scattering,scampi,scallops,sat's,sapphires,sans,sanitarium,sanded,sanction,safes,sacrificial,rudely,roust,rosebush,rosasharn,rondell,roadhouse,riveted,rile,ricochet,rhinoceros,rewrote,reverence,revamp,retaliatory,rescues,reprimand,reportedly,replicators,replaceable,repeal,reopening,renown,remo's,remedied,rembrandt,relinquishing,relieving,rejoicing,reincarnated,reimbursed,refinement,referral,reevaluate,redundancy,redid,redefine,recreating,reconnected,recession,rebelling,reassign,rearview,reappeared,readily,rayne,ravings,ravage,ratso,rambunctious,rallying,radiologist,quiver,quiero,queef,quark,qualms,pyrotechnics,pyro,puritan,punky,pulsating,publisher's,psychosomatic,provisional,proverb,protested,proprietary,promiscuous,profanity,prisoner's,prioritize,preying,predisposition,precocious,precludes,preceding,prattling,prankster,povich,potting,postpartum,portray,porter's,porridge,polluting,pogo,plowing,plating,plankton,pistachio,pissin,pinecone,pickpocket,physicists,physicals,pesticides,peruse,pertains,personified,personalize,permitting,perjured,perished,pericles,perfecting,percentages,pepys,pepperdine,pembry,peering,peels,pedophile,patties,pathogen,passkey,parrots,paratroopers,paratrooper,paraphernalia,paralyzing,panned,pandering,paltry,palpable,painkiller,pagers,pachyderm,paced,overtaken,overstay,overestimated,overbite,outwit,outskirts,outgrow,outbid,origins,ordnance,ooze,ooops,oomph,oohhh,omni,oldie,olas,oddball,observers,obscurity,obliterate,oblique,objectionable,objected,oars,o'keefe,nygma,nyet,nouveau,notting,nothin's,noches,nnno,nitty,nighters,nigger's,niche,newsstands,newfoundland,newborns,neurosurgery,networking,nellie's,nein,neighboring,negligible,necron,nauseated,nastiest,nasedo's,narrowing,narrator,narcolepsy,napa,nala,nairobi,mutilate,muscled,murmur,mulva,multitude,multiplex,mulling,mules,mukada,muffled,mueller's,motorized,motif,mortgages,morgues,moonbeams,monogamy,mondays,mollusk,molester,molestation,molars,modifications,modeled,moans,misuse,misprint,mismatched,mirth,minnow,mindful,mimosas,millander,mikhail,mescaline,mercutio,menstrual,menage,mellowing,medicaid,mediator,medevac,meddlesome,mcgarry's,matey,massively,massacres,marky,many's,manifests,manifested,manicures,malevolent,malaysian,majoring,madmen,mache,macarthur's,macaroons,lydell,lycra,lunchroom,lunching,lozenges,lorenzo's,looped,look's,lolly,lofty,lobbyist,litigious,liquidate,linoleum,lingk,lincoln's,limitless,limitation,limber,lilacs,ligature,liftoff,lifeboats,lemmiwinks,leggo,learnin,lazarre,lawyered,landmarks,lament,lambchop,lactose,kringle,knocker,knelt,kirk's,kins,kiev,keynote,kenyon's,kenosha,kemosabe,kazi,kayak,kaon,kama,jussy,junky,joyce's,journey's,jordy,jo's,jimmies,jetson,jeriko,jean's,janet's,jakovasaur,jailed,jace,issacs,isotopes,isabela,irresponsibility,ironed,intravenous,intoxication,intermittent,insufficient,insinuated,inhibitors,inherits,inherently,ingest,ingenue,informs,influenza,inflexible,inflame,inevitability,inefficient,inedible,inducement,indignant,indictments,indentured,indefensible,inconsistencies,incomparable,incommunicado,in's,improvising,impounded,illogical,ignoramus,igneous,idlewild,hydrochloric,hydrate,hungover,humorless,humiliations,humanoid,huhh,hugest,hudson's,hoverdrone,hovel,honor's,hoagie,hmmph,hitters,hitchhike,hit's,hindenburg,hibernating,hermione,herds,henchman,helloooo,heirlooms,heaviest,heartsick,headshot,headdress,hatches,hastily,hartsfield's,harrison's,harrisburg,harebrained,hardships,hapless,hanen,handsomer,hallows,habitual,habeas,guten,gus's,gummy,guiltier,guidebook,gstaad,grunts,gruff,griss,grieved,grids,grey's,greenville,grata,granny's,gorignak,goosed,goofed,goat's,gnarly,glowed,glitz,glimpses,glancing,gilmores,gilligan's,gianelli,geraniums,georgie's,genitalia,gaydar,gart,garroway,gardenia,gangbusters,gamblers,gamble's,galls,fuddy,frumpy,frowning,frothy,fro'tak,friars,frere,freddy's,fragrances,founders,forgettin,footsie,follicles,foes,flowery,flophouse,floor's,floatin,flirts,flings,flatfoot,firefighter,fingerprinting,fingerprinted,fingering,finald,film's,fillet,file's,fianc,femoral,fellini,federated,federales,faze,fawkes,fatally,fascists,fascinates,farfel,familiarity,fambly,falsified,fait,fabricating,fables,extremist,exterminators,extensively,expectant,excusez,excrement,excercises,excavation,examinations,evian,evah,etins,esther's,esque,esophageal,equivalency,equate,equalizer,environmentally,entrees,enquire,enough's,engine's,endorsed,endearment,emulate,empathetic,embodies,emailed,eggroll,edna's,economist,ecology,eased,earmuffs,eared,dyslexic,duper,dupe,dungeons,duncan's,duesouth,drunker,drummers,druggie,dreadfully,dramatics,dragnet,dragline,dowry,downplay,downers,doritos,dominatrix,doers,docket,docile,diversify,distracts,disruption,disloyalty,disinterested,disciple,discharging,disagreeable,dirtier,diplomats,dinghy,diner's,dimwitted,dimoxinil,dimmy,dietary,didi,diatribe,dialects,diagrams,diagnostics,devonshire,devising,deviate,detriment,desertion,derp,derm,dept,depressants,depravity,dependence,denounced,deniability,demolished,delinquents,defiled,defends,defamation,deepcore,deductive,decrease,declares,declarations,decimated,decimate,deb's,deadbolt,dauthuille,dastardly,darla's,dans,daiquiris,daggers,dachau,d'ah,cymbals,customized,curved,curiouser,curdled,cupid's,cults,cucamonga,cruller,cruces,crow's,crosswalk,crossover,crinkle,crescendo,cremate,creeper,craftsman,cox's,counteract,counseled,couches,coronet,cornea,cornbread,corday,copernicus,conveyed,contrition,contracting,contested,contemptible,consultants,constructing,constipated,conqueror,connor's,conjoined,congenital,confounded,condescend,concubine,concoct,conch,concerto,conceded,compounded,compensating,comparisons,commoners,committment,commencement,commandeered,comely,coined,cognitive,codex,coddled,cockfight,cluttered,clunky,clownfish,cloaked,cliches,clenched,cleft,cleanin,cleaner's,civilised,circumcised,cimmeria,cilantro,chutzpah,chutney,chucking,chucker,chronicles,chiseled,chicka,chicago's,chattering,charting,characteristic,chaise,chair's,cervix,cereals,cayenne,carrey,carpal,carnations,caricature,cappuccinos,candy's,candied,cancer's,cameo,calluses,calisthenics,cadre,buzzsaw,bushy,burners,bundled,bum's,budington,buchanans,brock's,britons,brimming,breeders,breakaway,braids,bradley's,boycotting,bouncers,botticelli,botherin,boosting,bookkeeping,booga,bogyman,bogged,bluepoint's,bloodthirsty,blintzes,blanky,blak,biosphere,binturong,billable,bigboote,bewildered,betas,bernard's,bequeath,beirut,behoove,beheaded,beginners,beginner,befriend,beet,bedpost,bedded,bay's,baudelaires,barty,barreled,barboni,barbeque,bangin,baltus,bailout,bag's,backstabber,baccarat,awning,awaited,avenues,austen,augie,auditioned,auctions,astrology,assistant's,assassinations,aspiration,armenians,aristocrat,arguillo,archway,archaeologist,arcane,arabic,apricots,applicant,apologising,antennas,annyong,angered,andretti,anchorman,anchored,amritsar,amour,amidst,amid,americana,amenable,ambassadors,ambassador's,amazement,allspice,alannis,airliner,airfare,airbags,ahhhhhhhhh,ahhhhhhhh,ahhhhhhh,agitator,afternoon's,afghan,affirmation,affiliate,aegean,adrenal,actor's,acidosis,achy,achoo,accessorizing,accentuate,academically,abuses,abrasions,abilene,abductor,aaaahhh,zuzu,zoot,zeroing,zelner,zeldy,yo's,yevgeny,yeup,yeska,yellows,yeesh,yeahh,yamuri,yaks,wyatt's,wspr,writing's,wrestlers,wouldn't've,workmanship,woodsman,winnin,winked,wildness,widespread,whoring,whitewash,whiney,when're,wheezer,wheelman,wheelbarrow,whaling,westerburg,wegener's,weekdays,weeding,weaving,watermelons,watcher's,washboard,warmly,wards,waltzes,walt's,walkway,waged,wafting,voulez,voluptuous,vitone,vision's,villa's,vigilantes,videotaping,viciously,vices,veruca,vermeer,verifying,ventured,vaya,vaults,vases,vasculitis,varieties,vapor,valets,upriver,upholstered,upholding,unwavering,unused,untold,unsympathetic,unromantic,unrecognizable,unpredictability,unmask,unleashing,unintentional,unilaterally,unglued,unequivocal,underside,underrated,underfoot,unchecked,unbutton,unbind,unbiased,unagi,uhhhhh,turnovers,tugging,trouble's,triads,trespasses,treehorn,traviata,trappers,transplants,transforming,trannie,tramping,trainers,traders,tracheotomy,tourniquet,tooty,toothless,tomarrow,toasters,tine,tilting,thruster,thoughtfulness,thornwood,therapies,thanksgiving's,tha's,terri's,tengo,tenfold,telltale,telephoto,telephoned,telemarketer,teddy's,tearin,tastic,tastefully,tasking,taser,tamed,tallow,taketh,taillight,tadpoles,tachibana,syringes,sweated,swarthy,swagger,surrey,surges,surf's,supermodels,superhighway,sunup,sun'll,summaries,sumerian,sulu,sulphur,sullivan's,sulfa,suis,sugarless,sufficed,substituted,subside,submerged,subdue,styling,strolled,stringy,strengthens,street's,straightest,straightens,storyteller,storefront,stopper,stockpiling,stimulant,stiffed,steyne,sternum,stereotypical,stepladder,stepbrother,steers,steeple,steelheads,steakhouse,statue's,stathis,stankylecartmankennymr,standoffish,stalwart,stallions,stacy's,squirted,squeaker,squad's,spuds,spritz,sprig,sprawl,spousal,sportsman,sphincter,spenders,spearmint,spatter,sparrows,spangled,southey,soured,sonuvabitch,somethng,societies,snuffed,snowfall,snowboarding,sniffs,snafu,smokescreen,smilin,slurred,slurpee,slums,slobs,sleepwalker,sleds,slays,slayage,skydiving,sketched,skateboarding,skanks,sixed,siri,sired,siphoned,siphon,singer's,simpering,silencer,sigfried,siena,sidearm,siddons,sickie,siberian,shuteye,shuk,shuffleboard,shrubberies,shrouded,showmanship,shower's,shouldn't've,shortwave,shoplift,shooter's,shiatsu,sheriffs,shak,shafts,serendipity,serena's,sentries,sentance,sensuality,semesters,seething,sedition,secular,secretions,searing,scuttlebutt,sculpt,scowling,scouring,scorecard,schwarzenegger,schoolers,schmucks,scepters,scaly,scalps,scaling,scaffolding,sauces,sartorius,santen,sampler,salivating,salinger,sainthood,said's,saget,saddens,rygalski,rusting,rumson's,ruination,rueland,rudabaga,rubles,rowr,rottweiler,rotations,roofies,romantics,rollerblading,roldy,rob's,roadshow,rike,rickets,rible,rheza,revisiting,revisited,reverted,retrospective,retentive,resurface,restores,respite,resounding,resorting,resolutions,resists,repulse,repressing,repaying,reneged,relays,relayed,reinforce,regulator,registers,refunds,reflections,rediscover,redecorated,recruitment,reconstructive,reconstructed,recommitted,recollect,recoil,recited,receptor,receptacle,receivers,reassess,reanimation,realtors,razinin,ravaged,ratios,rationalization,ratified,ratatouille,rashum,rasczak,rarer,rapping,rancheros,rampler,rain's,railway,racehorse,quotient,quizzing,quips,question's,quartered,qualification,purring,pummeling,puede,publicized,psychedelic,proximo,proteins,protege,prospectus,pronouncing,pronoun,prolonging,program's,proficient,procreation,proclamations,prio,principled,prides,pricing,presbyterian,preoccupation,prego,preferential,predicts,precog,prattle,pounced,potshots,potpourri,portsmouth,porque,poppie's,poms,pomeranian,pomegranates,polynesian,polymer,polenta,plying,plume,plumber's,pluie,plough,plesac,playoff,playmates,planter,plantains,plaintiff's,pituitary,pisano's,pillowcase,piddle,pickers,phys,photocopied,philistine,pfeiffer's,peyton's,petitioned,persuading,perpetuate,perpetually,periodically,perilous,pensacola,pawned,pausing,pauper,patterned,pats,patronage,passover,partition,parter,parlez,parlay,parkinson's,parades,paperwork's,pally,pairing,ovulation,overtake,overstate,overpowering,overpowered,overconfident,overbooked,ovaltine,ouzo,outweighs,outings,outfit's,out's,ottos,orrin,originate,orifice,orangutan,optimal,optics,opportunistic,ooww,oopsy,ooooooooh,ooohhhh,onyx,onslaught,oldsmobile,ocular,ocean's,obstruct,obscenely,o'dwyer,o'brien's,nutjob,nunur,notifying,nostrand,nonny,nonfat,noblest,nimble,nikes,nicht,newsworthy,network's,nestled,nessie,necessities,nearsighted,ne'er,nazareth,navidad,nastier,nasa's,narco,nakedness,muted,mummified,multiplying,mudda,mtv's,mozzarella,moxica,motorists,motivator,motility,mothafucka,mortmain,mortgaged,mortally,moroccan,mores,moonshine,mongers,moe's,modify,mobster's,mobilization,mobbed,mitigating,mistah,misrepresented,mishke,misfortunes,misdirection,mischievous,mirrored,mineshaft,mimosa,millers,millaney,miho,midday,microwaves,mick's,metzenbaum,metres,merc,mentoring,medicine's,mccovey,maya's,mau's,masterful,masochistic,martie,marliston,market's,marijawana,marie's,marian's,manya,manuals,mantumbi,mannheim,mania,mane,mami's,malarkey,magnifique,magics,magician's,madrona,madox,madison's,machida,m'mm,m'hm,m'hidi,lyric,luxe,luther's,lusty,lullabies,loveliness,lotions,looka,lompoc,loader,litterbug,litigator,lithe,liquorice,lins,linguistics,linds,limericks,lightbulb,lewises,letch,lemec,lecter's,leavenworth,leasing,leases,layover,layered,lavatory,laurels,launchers,laude,latvian,lateness,lasky's,laparotomy,landlord's,laboring,la's,kumquat,kuato,kroff,krispy,kree,krauts,kona,knuckleheads,knighthood,kiva,kitschy,kippers,kip's,kimbrow,kike,keypad,keepsake,kebab,keane's,kazakhstan,karloff,justices,junket,juicer,judy's,judgemental,jsut,jointed,jogs,jezzie,jetting,jekyll,jehovah's,jeff's,jeeze,jeeter,jeesus,jeebs,janeane,jalapeno,jails,jailbait,jagged,jackin,jackhammer,jacket's,ixnay,ivanovich,issue's,isotope,island's,irritates,irritability,irrevocable,irrefutable,irma's,irked,invoking,intricacies,interferon,intents,inte,insubordinate,instructive,instinctive,inspector's,inserting,inscribed,inquisitive,inlay,injuns,inhibited,infringement,information's,infer,inebriated,indignity,indecisive,incisors,incacha,inauguration,inalienable,impresses,impregnate,impregnable,implosion,immersed,ikea,idolizes,ideological,idealism,icepick,hypothyroidism,hypoglycemic,hyde's,hutz,huseni,humvee,hummingbird,hugely,huddling,housekeeper's,honing,hobnobbing,hobnob,histrionics,histamine,hirohito,hippocratic,hindquarters,hinder,himalayan,hikita,hikes,hightailed,hieroglyphics,heyy,heuh,heretofore,herbalist,her's,henryk,henceforth,hehey,hedriks,heartstrings,headmistress,headlight,harvested,hardheaded,happend,handlers,handlebars,hagitha,habla,gyroscope,guys'd,guy'd,guttersnipe,grump,growed,grovelling,grooves,groan,greenbacks,greats,gravedigger,grating,grasshoppers,grappling,graph,granger's,grandiose,grandest,gram's,grains,grafted,gradual,grabthar's,goop,gooood,goood,gooks,godsakes,goaded,gloria's,glamorama,giveth,gingham,ghostbusters,germane,georgy,geisha,gazzo,gazelles,gargle,garbled,galgenstein,galapagos,gaffe,g'day,fyarl,furnish,furies,fulfills,frowns,frowned,frommer's,frighteningly,fresco,freebies,freakshow,freakishly,fraudulent,fragrant,forewarned,foreclose,forearms,fordson,ford's,fonics,follies,foghorn,fly's,flushes,fluffy's,flitting,flintstone,flemmer,flatline,flamboyant,flabby,fishbowl,firsts,finger's,financier,figs,fidgeting,fictitious,fevers,feur,ferns,feminism,fema,feigning,faxing,fatigued,fathoms,fatherless,fares,fancier,fanatical,fairs,factored,eyelid,eyeglasses,eye's,expresso,exponentially,expletive,expectin,excruciatingly,evidentiary,ever'thing,evelyn's,eurotrash,euphoria,eugene's,eubie,ethiopian,ethiopia,estrangement,espanol,erupted,ernie's,erlich,eres,epitome,epitaph,environments,environmentalists,entrap,enthusiastically,entertainers,entangled,enclose,encased,empowering,empires,emphysema,embers,embargo,emasculating,elizabethan,elephant's,eighths,egyptians,effigy,editions,echoing,eardrum,dyslexia,duplicitous,duplicated,dumpty,dumbledore,dufus,dudley's,duddy,duck's,duchamp,drunkenness,drumlin,drowns,droid,drinky,drifts,drawbridge,dramamine,downey's,douggie,douchebag,dostoyevsky,dorian's,doodling,don'tcha,domo,domineering,doings,dogcatcher,documenting,doctoring,doctoral,dockers,divides,ditzy,dissimilar,dissecting,disparage,disliking,disintegrating,dishwalla,dishonored,dishing,disengaged,discretionary,discard,disavowed,directives,dippy,diorama,dimmed,diminishing,dilate,dijon,digitalis,diggory,dicing,diagnosing,devout,devola,developmental,deter,destiny's,desolation,descendant,derived,derevko's,deployment,dennings,denials,deliverance,deliciously,delicacies,degenerates,degas,deflector,defile,deference,defenders,deduced,decrepit,decreed,decoding,deciphered,dazed,dawdle,dauphine,daresay,dangles,dampen,damndest,customer's,curricular,cucumbers,cucaracha,cryogenically,cruella,crowd's,croaks,croaked,criticise,crit,crisper,creepiest,creep's,credit's,creams,crawford's,crackle,crackin,covertly,cover's,county's,counterintelligence,corrosive,corpsman,cordially,cops'll,convulsions,convoluted,convincingly,conversing,contradictions,conga,confucius,confrontational,confab,condolence,conditional,condition's,condiments,composing,complicit,compiled,compile,compiegne,commuter,commodus,commissions,comings,cometh,combining,colossus,collusion,collared,cockeyed,coastline,clobber,clemonds,clashes,clarithromycin,clarified,cinq,cienega,chronological,christmasy,christmassy,chloroform,chippie,childless,chested,chemistry's,cheerios,cheeco,checklist,chaz,chauvinist,char,chang's,chandlers,chamois,chambermaid,chakras,chak,censored,cemented,cellophane,celestial,celebrations,caveat,catholicism,cataloguing,cartmanland,carples,carny,carded,caramels,captors,caption,cappy,caped,canvassing,cannibalism,canada's,camille's,callback,calibrated,calamine,cal's,cabo,bypassed,buzzy,buttermilk,butterfingers,bushed,burlesque,bunsen,bung,bulimia,bukatari,buildin,budged,bronck's,brom,brobich,bringer,brine,brendell,brawling,bratty,brasi,braking,braised,brackett's,braced,boyish,boundless,botch,borough,boosh,bookies,bonbons,bois,bodes,bobunk,bluntly,blossoming,bloopers,bloomers,bloodstains,bloodhounds,blitzen,blinker,blech,blasts,blanca's,bitterly,biter,biometric,bioethics,bilk,bijan,bigoted,bicep,betrothed,bergdorf's,bereaved,bequeathed,belo,bellowing,belching,beholden,befriended,beached,bawk,battled,batmobile,batman's,baseline,baseball's,barcodes,barch,barbie's,barbecuing,bandanna,baldy,bailey's,baghdad,backwater,backtrack,backdraft,ayuh,awgh,augustino,auctioned,attaching,attaches,atrophy,atrocity,atley,athletics,atchoo,asymmetrical,asthmatic,assoc,assists,ascending,ascend,articulated,arrr,armstrong's,armchair,arisen,archeology,archeological,arachnids,aptly,applesauce,appetizing,antisocial,antagonizing,anorexia,anini,angie's,andersons,anarchist,anagram,amputation,amherst,alleluia,algorithms,albemarle,ajar,airlock,airbag,aims,aimless,ailments,agua,agonized,agitate,aggravating,affirming,aerosol,aerosmith,aeroplane,acing,accumulated,accomplishing,accolades,accidently,academia,abuser,abstain,abso,abnormally,aberration,abandons,aaww,aaaaahh,zlotys,zesty,zerzura,zapruder,zany,zantopia,yugoslavia,youo,yoru,yipe,yeow,yello,yelburton,yeess,yaah,y'knowwhati'msayin,wwhat,wussies,wrenched,would'a,worryin,wormser,wooooo,wookiee,wolfe's,wolchek,woes,wishin,wiseguys,winston's,winky,wine's,windbreaker,wiggy,wieners,wiedersehen,whoopin,whittled,whey,whet,wherefore,wharvey,welts,welt,wellstone,weee,wednesday's,wedges,wavered,watchit,wastebasket,ward's,wank,wango,wallet's,wall's,waken,waiver,waitressed,wacquiem,wabbit,vrykolaka,voula,vote's,volt,volga,volcanoes,vocals,vitally,visualizing,viscous,virgo,virg,violet's,viciousness,vewy,vespers,vertes,verily,vegetarians,vater,vaseline,varied,vaporize,vannacutt,vallens,valenti's,vacated,uterine,usta,ussher,urns,urinating,urchin,upping,upheld,unwitting,untreated,untangle,untamed,unsanitary,unraveled,unopened,unisex,uninvolved,uninteresting,unintelligible,unimaginative,undisclosed,undeserving,undermines,undergarments,unconcerned,unbroken,ukrainian,tyrants,typist,tykes,tybalt,twosome,twits,tutti,turndown,tularemia,tuberculoma,tsimshian,truffaut,truer,truant,trove,triumphed,tripe,trigonometry,trifled,trifecta,tricycle,trickle,tribulations,trevor's,tremont,tremoille,treaties,trawler,translators,transcends,trafficker,touchin,tonnage,tomfoolery,tolls,tokens,tinkered,tinfoil,tightrope,ticket's,thth,thousan,thoracotomy,theses,thesaurus,theologian,themed,thawing,thatta,thar,textiles,testimonies,tessio,terminating,temps,taxidermist,tator,tarkin,tangent,tactile,tachycardia,t'akaya,synthesize,symbolically,swelco,sweetbreads,swedes,swatting,swastika,swamps,suze,supernova,supercollider,sunbathing,summarily,suffocation,sueleen,succinct,subtitle,subsided,submissive,subjecting,subbing,subatomic,stupendous,stunted,stubble,stubbed,striving,streetwalker,strategizing,straining,straightaway,storyline,stoli,stock's,stipulated,stimulus,stiffer,stickup,stens,steamroller,steadwell,steadfast,stave,statutes,stateroom,stans,stacey's,sshhhh,squishing,squinting,squealed,sprouting,sprimp,spreadsheets,sprawled,spotlights,spooning,spoiler,spirals,spinner's,speedboat,spectacles,speakerphone,spar,spaniards,spacing,sovereignty,southglen,souse,soundproof,soothsayer,soon's,sommes,somethings,solidify,soars,snorted,snorkeling,snitches,sniping,sniper's,snifter,sniffin,snickering,sneer,snarl,smila,slinking,sleuth,slater's,slated,slanted,slanderous,slammin,skyscraper,skimp,skilosh,skeletal,skag,siteid,sirloin,singe,simulate,signaled,sighing,sidekicks,sicken,shrubs,shrub,showstopper,shot's,shostakovich,shoreline,shoppin,shoplifter,shop's,shoe's,shoal,shitter,shirt's,shimokawa,sherborne,sheds,shawna's,shavadai,sharpshooters,sharking,shane's,shakespearean,shagged,shaddup,sexism,sexes,sesterces,serotonin,sequences,sentient,sensuous,seminal,selections,seismic,seashell,seaplane,sealing,seahaven,seagrave,scuttled,scullery,scow,scots,scorcher,scorch,schotzie,schnoz,schmooze,schlep,schizo,schindler's,scents,scalping,scalped,scallop,scalding,sayeth,saybrooke,sawed,savoring,sardine,sandy's,sandstorm,sandalwood,samoa,samo,salutations,salad's,saki,sailor's,sagman,s'okay,rudy's,rsvp'd,royale,rousted,rootin,roofs,romper,romanovs,rollercoaster,rolfie,rockers,rock's,robinsons,ritzy,ritualistic,ringwald,rhymed,rheingold,rewrites,revolved,revolutionaries,revoking,reviewer,reverts,retrofit,retort,retinas,resurfaced,respirations,respectively,resolute,resin,reprobate,replaying,repayment,repaint,renquist,renege,renders,rename,remarked,relapsing,rekindled,rejuvenating,rejuvenated,reinstating,reinstatement,reigns,referendums,recriminations,recitals,rechecked,reception's,recaptured,rebounds,reassemble,rears,reamed,realty,reader's,reacquaint,rayanne,ravish,rava,rathole,raspail,rarest,rapists,rants,ramone,ragnar,radiating,radial,racketeer,quotation,quittin,quitters,quintessential,quincy's,queremos,quellek,quelle,quasimodo,quarterbacks,quarter's,pyromaniac,puttanesca,puritanical,purged,purer,puree,punishments,pungent,pummel,puedo,pudge,puce,psychotherapist,psycho's,prosecutorial,prosciutto,propositioning,propellers,pronouns,progresses,procured,procrastination,processes,probationary,primping,primates,priest's,preventative,prevails,presided,preserves,preservatives,prefix,predecessors,preachy,prancer,praetorians,practicality,powders,potus,pot's,postop,positives,poser,portolano,portokalos,poolside,poltergeists,pocketed,poach,plunder,plummeted,plucking,plop,plimpton,plethora,playthings,player's,playboys,plastique,plainclothes,pious,pinpointed,pinkus,pinks,pilgrimage,pigskin,piffle,pictionary,piccata,photocopy,phobias,persia,permissible,perils,perignon,perfumes,peon,penned,penalized,peg's,pecks,pecked,paving,patriarch,patents,patently,passable,participants,parasitic,parasailing,paramus,paramilitary,parabolic,parable,papier,paperback,paintbrush,pacer,paaiint,oxen,owen's,overtures,overthink,overstayed,overrule,overlapping,overestimate,overcooked,outlandish,outgrew,outdoorsy,outdo,outbound,ostensibly,originating,orchestrate,orally,oppress,opposable,opponent's,operation's,oooohh,oomupwah,omitted,okeydokey,okaaay,ohashi,offerings,of'em,od'd,occurrences,occupant,observable,obscenities,obligatory,oakie,o'malley's,o'gar,nyah's,nurection,nun's,nougat,nostradamus,norther,norcom,nooch,nonviolent,nonsensical,nominating,nomadic,noel's,nkay,nipped,nimbala,nigeria,nigel's,nicklaus,newscast,nervously,nell's,nehru,neckline,nebbleman,navigator,nasdaq,narwhal,nametag,n'n't,mycenae,myanmar,muzak,muumuu,murderer's,mumbled,mulvehill,multiplication,multiples,muggings,muffet,mozart's,mouthy,motorbike,motivations,motivates,motaba,mortars,mordred,mops,moocher,moniker,mongi,mondo,monday's,moley,molds,moisturize,mohair,mocky,mmkay,mistuh,missis,mission's,misdeeds,minuscule,minty,mined,mincemeat,milton's,milt,millennia,mikes,miggs,miffed,mieke's,midwestern,methadone,metaphysics,messieur,merging,mergers,menopausal,menagerie,meee,mckenna's,mcgillicuddy,mayflowers,maxim's,matrimonial,matisse,matick,masculinity,mascots,masai,marzipan,marika,maplewood,manzelle,manufactures,manticore's,mannequins,manhole,manhandle,manatee,mallory's,malfunctions,mainline,magua's,madwoman,madeline's,machiavelli,lynley,lynching,lynched,lurconis,lujack,lubricant,looove,loons,loom,loofah,longevity,lonelyhearts,lollipops,loca,llama,liquidation,lineswoman,lindsey's,lindbergh,lilith's,lila's,lifers,lichen,liberty's,lias,lexter,levee,letter's,lessen,lepner,leonard's,lemony,leggy,leafy,leaflets,leadeth,lazerus,lazare,lawford,languishing,langford's,landslide,landlords,lagoda,ladman,lad's,kuwait,kundera,krist's,krinkle,krendler,kreigel,kowolski,kosovo,knockdown,knifed,kneed,kneecap,kids'll,kevlar,kennie,keeled,kazootie,kaufman's,katzenmoyer,kasdan,karl's,karak,kapowski,kakistos,jumpers,julyan,juanito,jockstrap,jobless,jiggly,jesuit,jaunt,jarring,jabbering,israelites,irrigate,irrevocably,irrationally,ironies,ions,invitro,inventions,intrigues,intimated,interview's,intervening,interchangeable,intently,intentioned,intelligently,insulated,institutional,instill,instigator,instigated,instep,inopportune,innuendoes,inheriting,inflate,infiltration,infects,infamy,inducing,indiscretions,indiscreet,indio,indignities,indict,indecision,incurred,incubation,inconspicuous,inappropriately,impunity,impudent,improves,impotence,implicates,implausible,imperfection,impatience,immutable,immobilize,illustration,illumination,idiot's,idealized,idealist,icelandic,iambic,hysterically,hyperspace,hygienist,hydraulics,hydrated,huzzah,husks,hurricane's,hunt's,hunched,huffed,hubris,hubbub,hovercraft,houngan,hotel's,hosed,horoscopes,hoppy,hopelessness,hoodwinked,honourable,honorably,honeysuckle,homeowners,homegirl,holiest,hoisted,hoho,ho's,hippity,hildie,hikers,hieroglyphs,hexton,herein,helicopter's,heckle,heats,heartbeat's,heaping,healthilizer,headmaster's,headfirst,hawk's,haviland's,hatsue,harlot,hardwired,hanno's,hams,hamilton's,halothane,hairstyles,hails,hailed,haagen,haaaaa,gyno,gutting,gurl,gumshoe,gummi,gull,guerilla,gttk,grover's,grouping,groundless,groaning,gristle,grills,graynamore,grassy,graham's,grabbin,governmental,goodes,goggle,godlike,glittering,glint,gliding,gleaming,glassy,girth,gimbal,gilmore's,gibson's,giblets,gert,geometric,geographical,genealogy,gellers,geller's,geezers,geeze,garshaw,gargantuan,garfunkel,gardner's,garcia's,garb,gangway,gandarium,gamut,galoshes,gallivanting,galleries,gainfully,gack,gachnar,fusionlips,fusilli,furiously,fulfil,fugu,frugal,fron,friendship's,fricking,frederika,freckling,frauds,fraternal,fountainhead,forthwith,forgo,forgettable,foresight,foresaw,footnotes,fondling,fondled,fondle,folksy,fluttering,flutie,fluffing,floundering,florin,florentine,flirtatious,flexing,flatterer,flaring,fizz,fixating,five's,fishnet,firs,firestorm,finchy,figurehead,fifths,fiendish,fertilize,ferment,fending,fellahs,feeny's,feelers,feeders,fatality,fascinate,fantabulous,falsify,fallopian,faithless,fairy's,fairer,fair's,fainter,failings,facto,facets,facetious,eyepatch,exxon,extraterrestrials,extradite,extracurriculars,extinguish,expunged,exports,expenditure,expelling,exorbitant,exigent,exhilarated,exertion,exerting,exemption,excursions,excludes,excessively,excercise,exceeds,exceeding,everbody,evaporated,euthanasia,euros,europeans,escargot,escapee,erases,epizootics,epithelials,ephrum,enthusiast,entanglements,enslaved,enslave,engrossed,endeavour,enables,enabled,empowerment,employer's,emphatic,emeralds,embroiled,embraces,ember,embellished,emancipated,ello,elisa's,elevates,ejaculate,ego's,effeminate,economically,eccentricities,easygoing,earshot,durp,dunks,dunes,dullness,dulli,dulled,drumstick,dropper,driftwood,dregs,dreck,dreamboat,draggin,downsizing,dost,doofer,donowitz,dominoes,dominance,doe's,diversions,distinctions,distillery,distended,dissolving,dissipate,disraeli,disqualify,disowned,dishwashing,discusses,discontent,disclosed,disciplining,discerning,disappoints,dinged,diluted,digested,dicking,diablos,deux,detonating,destinations,despising,designer's,deserts,derelict,depressor,depose,deport,dents,demonstrations,deliberations,defused,deflection,deflecting,decryption,decoys,decoupage,decompress,decibel,decadence,dealer's,deafening,deadlock,dawning,dater,darkened,darcy's,dappy,dancing's,damon's,dallying,dagon,d'etat,czechoslovakians,cuticles,cuteness,curacao,cupboards,cumulative,culottes,culmination,culminating,csi's,cruisin,crosshairs,cronyn,croc,criminalistics,crimean,creatively,creaming,crapping,cranny,cowed,countermeasures,corsica,corinne's,corey's,cooker,convened,contradicting,continuity,constitutionally,constipation,consort,consolidate,consisted,connection's,confining,confidences,confessor,confederates,condensation,concluding,conceiving,conceivably,concealment,compulsively,complainin,complacent,compiling,compels,communing,commonplace,commode,commission's,commissary,comming,commensurate,columnists,colonoscopy,colonists,collagen,collaborate,colchicine,coddling,clump,clubbed,clowning,closet's,clones,clinton's,clinic's,cliffhanger,classification,clang,citrus,cissy,circuitry,chronology,christophe,choosers,choker,chloride,chippewa,chip's,chiffon,chesty,chesapeake,chernobyl,chants,channeled,champagne's,chalet,chaka,cervical,cellphone,cellmates,caverns,catwalk,cathartic,catcher's,cassandra's,caseload,carpenter's,carolyn's,carnivorous,carjack,carbohydrates,capt,capitalists,canvass,cantonese,canisters,candlestick,candlelit,canaries,camry,camel's,calzones,calitri,caldy,cabin's,byline,butterball,bustier,burmese,burlap,burgeoning,bureaucrat,buffoons,buenas,bryan's,brookline,bronzed,broiled,broda,briss,brioche,briar,breathable,brea,brays,brassieres,braille,brahms,braddock's,boysenberry,bowman's,bowline,boutiques,botticelli's,boooo,boonies,booklets,bookish,boogeyman,boogey,bomb's,boldly,bogs,bogas,boardinghouse,bluuch,blundering,bluffs,bluer,blowed,blotto,blotchy,blossomed,blooms,bloodwork,bloodied,blithering,blinks,blathering,blasphemous,blacking,bison,birdson,bings,bilateral,bfmid,bfast,berserker,berkshires,bequest,benjamins,benevolence,benched,benatar,belthazor's,bellybutton,belabor,bela's,behooves,beddy,beaujolais,beattle,baxworth,batted,baseless,baring,barfing,barbi,bannish,bankrolled,banek,ballsy,ballpoint,balkans,balconies,bakers,bahama,baffling,badder,badda,bada,bactine,backgammon,baako,aztreonam,aztecs,awed,avon,autobiographical,autistic,authoritah,auspicious,august's,auditing,audible,auctioning,attitude's,atrocities,athlete's,astronomer,assessed,ascot,aristocratic,arid,argues,arachtoids,arachnid,aquaman,apropos,aprons,apprised,apprehensive,apex,anythng,antivenin,antichrist,antennae,anorexic,anoint,annum,annihilated,animal's,anguished,angioplasty,angio,amply,ampicillin,amphetamines,amino,american's,ambiguity,ambient,amarillo,alyssa's,alternator,alcove,albacore,alarm's,alabaster,airlifted,ahta,agrabah,affidavits,advocacy,advises,adversely,admonished,admonish,adler's,addled,addendum,acknowledgement,accuser,accompli,acclaim,acceleration,abut,abundant,absurdity,absolved,abrusso,abreast,abrasive,aboot,abductions,abducting,abbots,aback,ababwa,aand,aaahhhh,zorin,zinthar,zinfandel,zimbabwe,zillions,zephyrs,zatarcs,zacks,youuu,youths,yokels,yech,yardstick,yammer,y'understand,wynette,wrung,wrought,wreaths,wowed,wouldn'ta,worshiped,worming,wormed,workday,wops,woolly,wooh,woodsy,woodshed,woodchuck,wojadubakowski,withering,witching,wiseass,wiretaps,winner's,wining,willoby,wiccaning,whupped,whoopi,whoomp,wholesaler,whiteness,whiner,whatchya,wharves,whah,wetlands,westward,wenus,weirdoes,weds,webs,weaver's,wearer,weaning,watusi,wastes,warlock's,warfield's,waponi,waiting's,waistband,waht,wackos,vouching,votre,voight's,voiced,vivica,viveca,vivant,vivacious,visor,visitin,visage,virgil's,violins,vinny,vinci's,villas,vigor,video's,vicrum,vibrator,vetted,versailles,vernon's,venues,ventriloquism,venison,venerable,varnsen,variant,variance,vaporized,vapid,vanstock,vandals,vader's,vaccination,uuuuh,utilize,ushering,usda,usable,urur,urologist,urination,urinary,upstart,uprooted,unsubtitled,unspoiled,unseat,unseasonably,unseal,unsatisfying,unnerve,unlikable,unleaded,university's,universe's,uninsured,uninspired,uniformity,unicycle,unhooked,ungh,unfunny,unfreezing,unflattering,unfairness,unexpressed,unending,unencumbered,unearth,undiscovered,undisciplined,undertaken,understan,undershirt,underlings,underline,undercurrent,uncontrolled,uncivilized,uncharacteristic,umpteenth,uglies,u're,tut's,turner's,turbine,tunnel's,tuney,trustee,trumps,truckasaurus,trubshaw,trouser,trippy,tringle,trifling,trickster,triangular,trespassers,trespasser,traverse,traumas,trattoria,trashes,transgressions,tranquil,trampling,trainees,tracy's,tp'ed,toxoplasmosis,tounge,tortillas,torrent,torpedoed,topsy,topple,topnotch,top's,tonsil,tippin's,tions,timmuh,timithious,tilney,tighty,tightness,tightens,tidbits,ticketed,thyme,thrones,threepio,thoughtfully,thornhart's,thorkel,thommo,thing'll,theological,thel,theh,thefts,that've,thanksgivings,tetherball,testikov,terraforming,terminus,tepid,tendonitis,tenboom,telex,teleport,telepathic,teenybopper,taxicab,taxed,taut,tattered,tattaglias,tapered,tantric,tanneke,takedown,tailspin,tacs,tacit,tablet,tablecloth,systemic,syria,syphon,synthesis,symbiotic,swooping,swizzle,swiping,swindled,swilling,swerving,sweatshops,swayzak's,swaddling,swackhammer,svetkoff,suzie's,surpass,supossed,superdad,super's,sumptuous,sula,suit's,sugary,sugar's,sugai,suey,subvert,suburb,substantiate,subsidy,submersible,sublimating,subjugation,styx,stymied,stuntman,studded,strychnine,strikingly,strenuous,streetlights,strassmans,stranglehold,strangeness,straddling,straddle,stowaways,stotch,stockbrokers,stifling,stepford,stepdad's,steerage,steena,staunch,statuary,starlets,stanza,stanley's,stagnant,staggeringly,ssshhh,squaw,spurt,spungeon,sprightly,sprays,sportswear,spoonful,splittin,splitsville,spirituality,spiny,spider's,speedily,speculative,specialise,spatial,spastic,spas,sparrin,soybean,souvlaki,southie,southampton,sourpuss,soupy,soup's,soundstage,sophie's,soothes,somebody'd,solicited,softest,sociopathic,socialized,socialism,snyders,snowmobiles,snowballed,snatches,smugness,smoothest,smashes,slurp,slur,sloshed,sleight,skyrocket,skied,skewed,sizeable,sixpence,sipowicz,singling,simulations,simulates,similarly,silvery,silverstone,siesta,siempre,sidewinder,shyness,shuvanis,showoff,shortsighted,shopkeeper,shoehorn,shithouse,shirtless,shipshape,shingles,shifu,shes,sherman's,shelve,shelbyville,sheepskin,shat,sharpens,shaquille,shaq,shanshu,shania's,set's,servings,serpico,sequined,sensibilities,seizes,seesaw,seep,seconded,sebastian's,seashells,scrapped,scrambler,scorpions,scopes,schnauzer,schmo,schizoid,scampered,scag,savagely,saudis,satire,santas,sanskrit,sandovals,sanding,sandal,salient,saleswoman,sagging,s'cuse,rutting,ruthlessly,runoff,runneth,rulers,ruffians,rubes,roughriders,rotates,rotated,roswell's,rosalita,rookies,ron's,rollerblades,rohypnol,rogues,robinson's,roasts,roadies,river's,ritten,rippling,ripples,ring's,rigor,rigoletto,richardo,ribbed,revolutions,revlon's,reverend's,retreating,retractable,rethought,retaliated,retailers,reshoot,reserving,reseda,researchers,rescuer,reread,requisitions,repute,reprogram,representations,report's,replenish,repetitive,repetitious,repentance,reorganizing,renton,renee's,remodeled,religiously,relics,reinventing,reinvented,reheat,rehabilitate,registrar,regeneration,refueling,refrigerators,refining,reenter,redress,recruiter,recliner,reciprocal,reappears,razors,rawdy,rashes,rarity,ranging,rajeski,raison,raisers,rainier,ragtime,rages,radar's,quinine,questscape,queller,quartermaine's,pyre,pygmalion,pushers,pusan,purview,purification,pumpin,puller,pubescent,psychiatrist's,prudes,provolone,protestants,prospero,propriety,propped,prom's,procrastinate,processors,processional,princely,preyed,preventive,pretrial,preside,premiums,preface,preachers,pounder,ports,portrays,portrayal,portent,populations,poorest,pooling,poofy,pontoon,pompeii,polymerization,polloi,policia,poacher,pluses,pleasuring,pleads,playgrounds,platitudes,platforms,plateaued,plate's,plantations,plaguing,pittance,pitcher's,pinky's,pinheads,pincushion,pimply,pimped,piggyback,pierce's,piecing,physiological,physician's,phosphate,phillipe,philipse,philby,phased,pharaohs,petyr,petitioner,peshtigo,pesaram,perspectives,persnickety,perpetrate,percolating,pepto,pensions,penne,penell,pemmican,peeks,pedaling,peacemaker,pawnshop,patting,pathologically,patchouli,pasts,pasties,passin,parlors,panda's,panache,paltrow,palamon,padlock,paddy's,paddling,oversleep,overheating,overdosed,overcharge,overcame,overblown,outset,outrageously,outfitted,orsini's,ornery,origami,orgasmic,orga,order's,opportune,ooow,oooooooooh,oohhhh,olympian,olfactory,okum,ohhhhhh,ogres,odysseus,odorless,occupations,occupancy,obscenity,obliterated,nyong,nymphomaniac,nutsack,numa,ntozake,novocain,nough,noth,nosh,norwegians,northstar,nonnie,nonissue,nodules,nightmarish,nightline,nighthawk,niggas,nicu,nicolae,nicknamed,niceties,newsman,neverland,negatively,needra,nedry,necking,navour,nauseam,nauls,narim,nanda,namath,nagged,nads,naboo,n'sync,mythological,mysticism,myslexia,mutator,mustafi,mussels,muskie,musketeer,murtaugh,murderess,murder's,murals,munching,mumsy,muley,mouseville,mosque,mosh,mortifying,morgendorffers,moola,montel,mongoloid,molten,molestered,moldings,mocarbies,mo'ss,mixers,misrell,misnomer,misheard,mishandled,miscreant,misconceptions,miniscule,minimalist,millie's,millgate,migrate,michelangelo's,mettle,metricconverter,methodology,meter's,meteors,mesozoic,menorah,mengele,mendy's,membranes,melding,meanness,mcneil's,mcgruff,mcarnold,matzoh,matted,mathematically,materialized,mated,masterpieces,mastectomy,massager,masons,marveling,marta's,marquee,marooned,marone's,marmaduke,marick,marcie's,manhandled,mangoes,manatees,managerial,man'll,maltin,maliciously,malfeasance,malahide,maketh,makeshift,makeovers,maiming,magazine's,machismo,maarten,lutheran,lumpectomy,lumbering,luigi's,luge,lubrication,lording,lorca,lookouts,loogie,loners,london's,loin,lodgings,locomotive,lobes,loathed,lissen,linus,lighthearted,ligament,lifetime's,lifer,lier,lido,lickin,lewen,levitation,lestercorp,lessee,lentils,lena's,lemur,lein,legislate,legalizing,lederhosen,lawmen,laundry's,lasskopf,lardner,landscapes,landfall,lambeau,lamagra,lagging,ladonn,lactic,lacquer,laborers,labatier,kwan's,krit,krabappel,kpxy,kooks,knobby,knickknacks,klutzy,kleynach,klendathu,kinross,kinko's,kinkaid,kind'a,kimberly's,kilometer,khruschev's,khaki,keyboards,kewl,ketch,kesher,ken's,karikos,karenina,kanamits,junshi,juno's,jumbled,jujitsu,judith's,jt's,joust,journeyed,jotted,jonathan's,jizz,jingling,jigalong,jerseys,jerries,jellybean,jellies,jeeps,jeannie's,javna,jamestown,james's,jamboree,jail's,islanders,irresistable,irene's,ious,investigation's,investigates,invaders,inundated,introductory,interviewer,interrupts,interpreting,interplanetary,internist,intercranial,inspections,inspecting,inseminated,inquisitor,inland,infused,infuriate,influx,inflating,infidelities,inference,inexpensive,industrialist,incessantly,inception,incensed,incase,incapacitate,inca,inasmuch,inaccuracies,imus,improvised,imploding,impeding,impediments,immaturity,ills,illegible,idols,iditarod,identifiable,id'n,icicles,ibuprofen,i'i'm,hymie,hydrolase,hybrids,hunsecker's,hunker,humps,humons,humidor,humdinger,humbling,humankind,huggin,huffing,households,housecleaning,hothouse,hotcakes,hosty,hootenanny,hootchie,hoosegow,honouring,honks,honeymooners,homophobic,homily,homeopathic,hoffman's,hnnn,hitchhikers,hissed,hispanics,hillnigger,hexavalent,hewwo,heston's,hershe,herodotus,hermey,hergott,heresy,henny,hennigans,henhouse,hemolytic,hells,helipad,heifer,hebrews,hebbing,heaved,heartland,heah,headlock,hatchback,harvard's,harrowing,harnessed,harding's,happy's,hannibal's,hangovers,handi,handbasket,handbags,halloween's,hall's,halfrek,halfback,hagrid,hacene,gyges,guys're,gut's,gundersons,gumption,guardia,gruntmaster,grubs,group's,grouch,grossie,grosser,groped,grins,grime,grigio,griff's,greaseball,gravesite,gratuity,graphite,granma,grandfathers,grandbaby,gradski,gracing,got's,gossips,goonie,gooble,goobers,goners,golitsyn,gofer,godsake,goddaughter,gnats,gluing,glub,global's,glares,gizmos,givers,ginza,gimmie,gimmee,georgia's,gennero,gazpacho,gazed,gato,gated,gassy,gargling,gandhiji,galvanized,gallery's,gallbladder,gabriel's,gaaah,furtive,furthering,fungal,fumigation,fudd,fucka,fronkonsteen,fromby's,frills,fresher,freezin,freewald,freeloader,franklin's,framework,frailty,fortified,forger,forestry,foreclosure,forbade,foray,football's,foolhardy,fondest,fomin,followin,follower,follicle,flue,flowering,flotation,flopping,floodgates,flogged,flog,flicked,flenders,fleabag,flanks,fixings,fixable,fistful,firewater,firestarter,firelight,fingerbang,finalizing,fillin,filipov,fido,fiderer,feminists,felling,feldberg,feign,favorably,fave,faunia,faun,fatale,fasting,farkus,fared,fallible,faithfulness,factoring,facilitated,fable,eyeful,extramarital,extracts,extinguished,exterminated,exposes,exporter,exponential,exhumed,exhume,exasperated,eviscerate,evidenced,evanston,estoy,estimating,esmerelda,esme,escapades,erosion,erie,equitable,epsom,epoxy,enticed,enthused,entendre,ensued,enhances,engulfed,engrossing,engraving,endorphins,enamel,emptive,empirical,emmys,emission,eminently,embody,embezzler,embarressed,embarrassingly,embalmed,emancipation,eludes,eling,elevation,electorate,elated,eirie,egotitis,effecting,eerily,eeew,eecom,editorials,edict,eczema,ecumenical,ecklie's,earthy,earlobes,eally,dyeing,dwells,dvds,duvet,duncans,dulcet,duckling,droves,droppin,drools,drey'auc,dreamers,dowser's,downriver,downgraded,doping,doodie,dominicans,dominating,domesticity,dollop,doesnt,doer,dobler,divulged,divisional,diversionary,distancing,dissolves,dissipated,displaying,dispensers,dispensation,disorienting,disneyworld,dismissive,dismantling,disingenuous,disheveled,disfiguring,discourse,discontinued,disallowed,dinning,dimming,diminutive,diligently,dilettante,dilation,diggity,diggers,dickensian,diaphragms,diagnoses,dewy,developer,devastatingly,determining,destabilize,desecrate,derives,deposing,denzel,denouncing,denominations,denominational,deniece,demony,delving,delt,delicates,deigned,degrassi's,degeneration,defraud,deflower,defibrillator,defiantly,deferred,defenceless,defacing,dedicating,deconstruction,decompose,deciphering,decibels,deceptively,deceptions,decapitation,debutantes,debonair,deadlier,dawdling,davic,databases,darwinism,darnit,darks,danke,danieljackson,dangled,daimler,cytoxan,cylinders,cutout,cutlery,cuss,cushing's,curveball,curiously,curfews,cummerbund,cuckoo's,crunches,crucifixion,crouched,croix,criterion,crisps,cripples,crilly,cribs,crewman,cretaceous,creepin,creeds,credenza,creak,crawly,crawlin,crawlers,crated,crasher,crackheads,coworker,counterpart,councillor,coun,couldn't've,cots,costanza's,cosgrove's,corwins,corset,correspondents,coriander,copiously,convenes,contraceptives,continuously,contingencies,contaminating,consul,constantinople,conniption,connie's,conk,conjugate,condiment,concurrently,concocting,conclave,concert's,con's,comprehending,compliant,complacency,compilation,competitiveness,commendatore,comedies,comedians,comebacks,combines,com'on,colonized,colonization,collided,collectively,collarbone,collaborating,collaborated,colitis,coldly,coiffure,coffers,coeds,codependent,cocksucking,cockney,cockles,clutched,cluett's,cloverleaf,closeted,cloistered,clinched,clicker,cleve,clergyman,cleats,clarifying,clapped,citations,cinnabar,cinco,chunnel,chumps,chucks,christof,cholinesterase,choirboy,chocolatey,chlamydia,chili's,chigliak,cheesie,cheeses,chechnya,chauvinistic,chasm,chartreuse,charnier,chapil,chapel's,chalked,chadway,cerveza,cerulean,certifiably,celsius,cellulite,celled,ceiling's,cavalry's,cavalcade,catty,caters,cataloging,casy,castrated,cassio,cashman's,cashews,carwash,cartouche,carnivore,carcinogens,carasco's,carano's,capulet,captives,captivated,capt'n,capsized,canoes,cannes,candidate's,cancellations,camshaft,campin,callate,callar,calendar's,calculators,cair,caffeinated,cadavers,cacophony,cackle,byproduct,bwana,buzzes,buyout,buttoning,busload,burglaries,burbs,bura,buona,bunions,bungalows,bundles,bunches,bullheaded,buffs,bucyk,buckling,bruschetta,browbeating,broomsticks,broody,bromly,brolin,brigadier,briefings,bridgeport,brewskies,breathalyzer,breakups,breadth,bratwurst,brania,branching,braiding,brags,braggin,bradywood,bozo's,bottomed,bottom's,bottling,botany,boston's,bossa,bordello,booo,bookshelf,boogida,bondsman,bolsheviks,bolder,boggles,boarder,boar's,bludgeoned,blowtorch,blotter,blips,blends,blemish,bleaching,blainetologists,blading,blabbermouth,bismarck,bishops,biscayne,birdseed,birdcage,bionic,biographies,biographical,bimmel,biloxi,biggly,bianchinni,bette's,betadine,berg's,berenson,belus,belt's,belly's,belloq,bella's,belfast,behavior's,begets,befitting,beethoven's,beepers,beelzebub,beefed,bedroom's,bedrock,bedridden,bedevere,beckons,beckett's,beauty's,beaded,baubles,bauble,battlestar,battleground,battle's,bathrobes,basketballs,basements,barroom,barnacle,barkin,barked,barium,baretta,bangles,bangler,banality,bambang,baltar,ballplayers,baio,bahrain,bagman,baffles,backstroke,backroom,bachelor's,babysat,babylonian,baboons,aviv,avez,averse,availability,augmentation,auditory,auditor,audiotape,auctioneer,atten,attained,attackers,atcha,astonishment,asshole's,assembler,arugula,arsonist's,arroz,arigato,arif,ardent,archaic,approximation,approving,appointing,apartheid,antihistamines,antarctica,annoyances,annals,annabelle's,angrily,angelou,angelo's,anesthesiology,android,anatomically,anarchists,analyse,anachronism,amiable,amex,ambivalent,amassed,amaretto,alumnus,alternating,alternates,alteration,aloft,alluding,allen's,allahu,alight,alfred's,alfie,airlift,aimin,ailment,aground,agile,ageing,afterglow,africans,affronte,affectionately,aerobic,adviser,advil,adventist,advancements,adrenals,admiral's,administrators,adjutant,adherence,adequately,additives,additions,adapting,adaptable,actualization,activating,acrost,ached,accursed,accoutrements,absconded,aboveboard,abou,abetted,abbot's,abbey's,aargh,aaaahh,zuzu's,zuwicky,zolda,zits,ziploc,zakamatak,yutz,yumm,youve,yolk,yippie,yields,yiddish,yesterdays,yella,yearns,yearnings,yearned,yawning,yalta,yahtzee,yacht's,y'mean,y'are,xand,wuthering,wreaks,woul,worsened,worrisome,workstation,workiiing,worcestershire,woop,wooooooo,wooded,wonky,womanizing,wolodarsky,wnkw,wnat,wiwith,withdraws,wishy,wisht,wipers,wiper,winos,winery,windthorne,windsurfing,windermere,wiggles,wiggled,wiggen,whys,whwhat,whuh,whos,whore's,whodunit,whoaaa,whittling,whitesnake,whirling,whereof,wheezing,wheeze,whatley's,whatd'ya,whataya,whammo,whackin,wets,westbound,wellll,wellesley,welch's,weirdo's,weightless,weevil,wedgies,webbing,weasly,weapon's,wean,wayside,waxes,wavelengths,waturi,washy,washrooms,warton's,wandell,wakeup,waitaminute,waddya,wabash,waaaah,vornac,voir,voicing,vocational,vocalist,vixens,vishnoor,viscount,virulent,virtuoso,vindictiveness,vinceres,vince's,villier,viii,vigeous,viennese,viceroy,vestigial,vernacular,venza's,ventilate,vented,venereal,vell,vegetative,veering,veered,veddy,vaslova,valosky,vailsburg,vaginas,vagas,vacation's,uuml,urethra,upstaged,uploading,upgrades,unwrapping,unwieldy,untenable,untapped,unsatisfied,unsatisfactory,unquenchable,unnerved,unmentionable,unlovable,unknowns,universes,uninformed,unimpressed,unhappily,unguarded,unexplored,underpass,undergarment,underdeveloped,undeniably,uncompromising,unclench,unclaimed,uncharacteristically,unbuttoned,unblemished,unas,umpa,ululd,uhhhm,tweeze,tutsami,tusk,tushy,tuscarora,turkle,turghan,turbulent,turbinium,tuffy,tubers,tsun,trucoat,troxa,trou,tropicana,triquetra,tripled,trimmers,triceps,tribeca,trespassed,traya,travellers,traumatizing,transvestites,transatlantic,tran's,trainors,tradin,trackers,townies,tourelles,toughness,toucha,totals,totalled,tossin,tortious,topshop,topes,tonics,tongs,tomsk,tomorrows,toiling,toddle,tobs,tizzy,tiramisu,tippers,timmi,timbre,thwap,thusly,ththe,thruway,thrusts,throwers,throwed,throughway,thrice,thomas's,thickening,thia,thermonuclear,therapy's,thelwall,thataway,th's,textile,texans,terry's,terrifically,tenets,tendons,tendon,telescopic,teleportation,telepathically,telekinetic,teetering,teaspoons,teamsters,taunts,tatoo,tarantulas,tapas,tanzania,tanned,tank's,tangling,tangerine,tamales,tallied,tailors,tai's,tahitian,tag's,tactful,tackles,tachy,tablespoon,tableau,syrah,syne,synchronicity,synch,synaptic,synapses,swooning,switchman,swimsuits,swimmer's,sweltering,swelling's,sweetly,sweeper,suvolte,suss,suslov,surname,surfed,supremacy,supposition,suppertime,supervillains,superman's,superfluous,superego,sunspots,sunnydale's,sunny's,sunning,sunless,sundress,sump,suki,suffolk,sue's,suckah,succotash,substation,subscriptions,submarines,sublevel,subbasement,styled,studious,studio's,striping,stresses,strenuously,streamlined,strains,straights,stony,stonewalled,stonehenge,stomper,stipulates,stinging,stimulated,stillness,stilettos,stewards,stevesy,steno,sten,stemmed,steenwyck,statesmen,statehood,stargates,standstill,stammering,staedert,squiggly,squiggle,squashing,squaring,spurred,sprints,spreadsheet,spramp,spotters,sporto,spooking,sponsorship,splendido,spittin,spirulina,spiky,speculations,spectral,spate,spartacus,spans,spacerun,sown,southbound,sorr,sorcery,soonest,sono,sondheim,something'll,someth,somepin,someone'll,solicitor,sofas,sodomy,sobs,soberly,sobered,soared,soapy,snowmen,snowbank,snowballing,snorkel,snivelling,sniffling,snakeskin,snagging,smush,smooter,smidgen,smackers,smackdown,slumlord,slugging,slossum,slimmer,slighted,sleepwalk,sleazeball,skokie,skirmishes,skipper's,skeptic,sitka,sitarides,sistah,sipped,sindell,simpletons,simp,simony,simba's,silkwood,silks,silken,silicone,sightless,sideboard,shuttles,shrugging,shrouds,showy,shoveled,shouldn'ta,shoplifters,shitstorm,shipyard,shielded,sheldon's,sheeny,shaven,shapetype,shankar,shaming,shallows,shale,shading,shackle,shabbily,shabbas,severus,settlements,seppuku,senility,semite,semiautomatic,semester's,selznick,secretarial,sebacio,sear,seamless,scuzzy,scummy,scud,scrutinized,scrunchie,scriptures,scribbled,scouted,scotches,scolded,scissor,schooner,schmidt's,schlub,scavenging,scarin,scarfing,scarecrow's,scant,scallions,scald,scabby,say's,savour,savored,sarcoidosis,sandbar,saluted,salted,salish,saith,sailboats,sagittarius,sagan,safeguards,sacre,saccharine,sacamano,sabe,rushdie,rumpled,rumba,rulebook,rubbers,roughage,rotterdam,roto,rotisserie,rosebuds,rootie,roosters,roosevelt's,rooney's,roofy,roofie,romanticize,roma's,rolodex,rolf's,roland's,rodney's,robotic,robin's,rittle,ristorante,rippin,rioting,rinsing,ringin,rincess,rickety,rewritten,revising,reveling,rety,retreats,retest,retaliating,resumed,restructuring,restrict,restorative,reston,restaurateur,residences,reshoots,resetting,resentments,rescuers,rerouted,reprogramming,reprisals,reprisal,repossess,repartee,renzo,renfield,remore,remitting,remeber,reliability,relaxants,rejuvenate,rejections,rehu,regularity,registrar's,regionals,regimes,regenerated,regency,refocus,referrals,reeno,reelected,redevelopment,recycles,recrimination,recombinant,reclining,recanting,recalling,reattach,reassigning,realises,reactors,reactionary,rbis,razor's,razgul,raved,rattlesnakes,rattles,rashly,raquetball,rappers,rapido,ransack,rankings,rajah,raisinettes,raheem,radisson,radishes,radically,radiance,rabbi's,raban,quoth,qumari,quints,quilts,quilting,quien,queue,quarreled,qualifying,pygmy,purty,puritans,purblind,puppy's,punctuation,punchbowl,puget,publically,psychotics,psychopaths,psychoanalyze,pruning,provasik,protruding,protracted,protons,protections,protectin,prospector,prosecutor's,propping,proportioned,prophylactic,propelled,proofed,prompting,prompter,professed,procreate,proclivities,prioritizing,prinze,princess's,pricked,press'll,presets,prescribes,preocupe,prejudicial,prefex,preconceived,precipice,preamble,pram,pralines,pragmatist,powering,powerbar,pottie,pottersville,potsie,potholes,potency,posses,posner's,posies,portkey,porterhouse,pornographers,poring,poppycock,poppet,poppers,poopsie,pomponi,pokin,poitier,poes,podiatry,plush,pleeze,pleadings,playbook,platelets,plane'arium,placebos,place'll,pj's,pixels,pitted,pistachios,pisa,pirated,pirate's,pinochle,pineapples,pinafore,pimples,piggly,piggies,pie's,piddling,picon,pickpockets,picchu,physiologically,physic,photo's,phobic,philosophies,philosophers,philly's,philandering,phenomenally,pheasants,phasing,phantoms,pewter,petticoat,petronis,petitioning,perturbed,perth,persists,persians,perpetuating,permutat,perishable,periphery,perimeters,perfumed,percocet,per'sus,pepperjack,pensioners,penalize,pelting,pellet,peignoir,pedicures,pedestrians,peckers,pecans,payback's,pay's,pawning,paulsson,pattycake,patrolmen,patrolled,patois,pathos,pasted,passer,partnerships,parp,parishioners,parishioner,parcheesi,parachuting,pappa,paperclip,papayas,paolo's,pantheon,pantaloons,panhandle,pampers,palpitations,paler,palantine,paintballing,pago,owow,overtired,overstress,oversensitive,overnights,overexcited,overanxious,overachiever,outwitted,outvoted,outnumber,outlived,outlined,outlast,outlander,outfield,out've,ortolani's,orphey,ornate,ornamental,orienteering,orchestrating,orator,oppressive,operator's,openers,opec,ooky,oliver's,olde,okies,okee,ohhhhhhhhh,ohhhhhhhh,ogling,offline,offbeat,oceanographic,obsessively,obeyed,oaths,o'leary's,o'hana,o'bannon,o'bannion,numpce,nummy,nuked,nuff,nuances,nourishing,noticeably,notably,nosedive,northeastern,norbu,nomlies,nomine,nomads,noge,nixed,niro,nihilist,nightshift,newmeat,nevis,nemo's,neighborhood's,neglectful,neediness,needin,necromancer,neck's,ncic,nathaniel's,nashua,naphthalene,nanotechnology,nanocytes,nanite,naivete,nacho,n'yeah,mystifying,myhnegon,mutating,muskrat,musing,museum's,muppets,mumbles,mulled,muggy,muerto,muckraker,muchachos,mris,move's,mourners,mountainside,moulin,mould,motherless,motherfuck,mosquitos,morphed,mopped,moodoo,montage,monsignor,moncho,monarchs,mollem,moisturiser,moil,mohicans,moderator,mocks,mobs,mizz,mites,mistresses,misspent,misinterpretation,mishka,miscarry,minuses,minotaur,minoan,mindee,mimicking,millisecond,milked,militants,migration,mightn't,mightier,mierzwiak,midwives,micronesia,microchips,microbes,michele's,mhmm,mezzanine,meyerling,meticulously,meteorite,metaphorical,mesmerizing,mershaw,meir,meg's,meecrob,medicate,medea,meddled,mckinnons,mcgewan,mcdunnough,mcats,mbien,maytag,mayors,matzah,matriarch,matic,mathematicians,masturbated,masselin,marxist,martyrs,martini's,martialed,marten's,marlboros,marksmanship,marishka,marion's,marinate,marge's,marchin,manifestations,manicured,mandela,mamma's,mame,malnourished,malk,malign,majorek,maidens,mahoney's,magnon,magnificently,maestro's,macking,machiavellian,macdougal,macchiato,macaws,macanaw,m'self,lynx,lynn's,lyman's,lydells,lusts,lures,luna's,ludwig's,lucite,lubricants,louise's,lopper,lopped,loneliest,lonelier,lomez,lojack,localized,locale,loath,lloyd's,literate,liquidated,liquefy,lippy,linguistic,limps,lillian's,likin,lightness,liesl,liebchen,licious,libris,libation,lhamo,lewis's,leveraged,leticia's,leotards,leopards,leonid,leonardo's,lemmings,leland's,legitimacy,leanin,laxatives,lavished,latka,later's,larval,lanyard,lans,lanky,landscaping,landmines,lameness,lakeshore,laddies,lackluster,lacerated,labored,laboratories,l'amour,kyrgyzstan,kreskin,krazy,kovitch,kournikova,kootchy,konoss,know's,knknow,knickety,knackety,kmart,klicks,kiwanis,kitty's,kitties,kites,kissable,kirby's,kingdoms,kindergartners,kimota,kimble's,kilter,kidnet,kidman,kid'll,kicky,kickbacks,kickback,kickass,khrushchev,kholokov,kewpie,kent's,keno,kendo,keller's,kcdm,katrina's,katra,kareoke,kaia,kafelnikov,kabob,ka's,junjun,jumba,julep,jordie,jondy,jolson,jinnah,jeweler's,jerkin,jenoff,jefferson's,jaye's,jawbone,janitorial,janiro,janie's,iron's,ipecac,invigorated,inverted,intruded,intros,intravenously,interruptus,interrogations,interracial,interpretive,internment,intermediate,intermediary,interject,interfacing,interestin,insuring,instilled,instantaneous,insistence,insensitivity,inscrutable,inroads,innards,inlaid,injector,initiatives,inhe,ingratitude,infuriates,infra,informational,infliction,infighting,induction,indonesian,indochina,indistinguishable,indicators,indian's,indelicate,incubators,incrimination,increments,inconveniencing,inconsolable,incite,incestuous,incas,incarnation,incarcerate,inbreeding,inaccessible,impudence,impressionists,implemented,impeached,impassioned,impacts,imipenem,idling,idiosyncrasies,icicle,icebreaker,icebergs,i'se,hyundai,hypotensive,hydrochloride,huuh,hushed,humus,humph,hummm,hulking,hubcaps,hubald,http,howya,howbout,how'll,houseguests,housebroken,hotwire,hotspots,hotheaded,horticulture,horrace,horde,horace's,hopsfield,honto,honkin,honeymoons,homophobia,homewrecker,hombres,hollow's,hollers,hollerin,hokkaido,hohh,hogwarts,hoedown,hoboes,hobbling,hobble,hoarse,hinky,himmler,hillcrest,hijacking,highlighters,hiccup,hibernation,hexes,heru'ur,hernias,herding,heppleman,henderson's,hell're,heine's,heighten,heheheheheh,heheheh,hedging,heckling,heckled,heavyset,heatshield,heathens,heartthrob,headpiece,headliner,he'p,hazelnut,hazards,hayseed,haveo,hauls,hattie's,hathor's,hasten,harriers,harridan,harpoons,harlin's,hardens,harcesis,harbouring,hangouts,hangman,handheld,halkein,haleh,halberstam,hairpin,hairnet,hairdressers,hacky,haah,haaaa,h'yah,gyms,gusta,gushy,gusher,gurgling,gunnery,guilted,guilt's,gruel,grudging,grrrrrr,grouse,grossing,grosses,groomsmen,griping,gretchen's,gregorian,gray's,gravest,gratified,grated,graphs,grandad,goulash,goopy,goonies,goona,goodman's,goodly,goldwater,godliness,godawful,godamn,gobs,gob's,glycerin,glutes,glowy,glop,globetrotters,glimpsed,glenville,glaucoma,girlscout,giraffes,gimp,gilbey,gil's,gigglepuss,ghora,gestating,geologists,geographically,gelato,gekko's,geishas,geek's,gearshift,gear's,gayness,gasped,gaslighting,garretts,garba,gams,gags,gablyczyck,g'head,fungi,fumigating,fumbling,fulton's,fudged,fuckwad,fuck're,fuchsia,fruition,freud's,fretting,freshest,frenchies,freezers,fredrica,fraziers,francesca's,fraidy,foxholes,fourty,fossilized,forsake,formulate,forfeits,foreword,foreclosed,foreal,foraging,footsies,focussed,focal,florists,flopped,floorshow,floorboard,flinching,flecks,flavours,flaubert,flatware,flatulence,flatlined,flashdance,flail,flagging,fizzle,fiver,fitzy,fishsticks,finster,finetti,finelli,finagle,filko,filipino,figurines,figurative,fifi,fieldstone,fibber,fiance's,feuds,feta,ferrini,female's,feedin,fedora,fect,feasting,favore,fathering,farrouhk,farmin,far's,fanny's,fajita,fairytale,fairservice,fairgrounds,fads,factoid,facet,facedown,fabled,eyeballin,extortionist,exquisitely,exporting,explicitly,expenditures,expedited,expands,exorcise,existentialist,exhaustive,execs,exculpatory,excommunicated,exacerbate,everthing,eventuality,evander,eustace,euphoric,euphemisms,eton,esto,estimation,estamos,establishes,erred,environmentalist,entrepreneurial,entitle,enquiries,enormity,engages,enfants,enen,endive,end's,encyclopedias,emulating,emts,employee's,emphasized,embossed,embittered,embassies,eliot,elicit,electrolyte,ejection,effortless,effectiveness,edvard,educators,edmonton's,ecuador,ectopic,ecirc,easely,earphones,earmarks,earmarked,earl's,dysentery,dwindling,dwight's,dweller,dusky,durslar,durned,dunois,dunking,dunked,dumdum,dullard,dudleys,duce,druthers,druggist,drug's,drossos,drosophila,drooled,driveways,drippy,dreamless,drawstring,drang,drainpipe,dragoons,dozing,down's,dour,dougie's,dotes,dorsal,dorkface,doorknobs,doohickey,donnell's,donnatella,doncha,don's,dominates,domicile,dokos,dobermans,djez,dizzying,divola,dividends,ditsy,distaste,disservice,disregarded,dispensed,dismay,dislodged,dislodge,disinherit,disinformation,discrete,discounting,disciplines,disapproved,dirtball,dinka,dimly,dilute,dilucca's,digesting,diello,diddling,dictatorships,dictators,diagonal,diagnostician,devours,devilishly,detract,detoxing,detours,detente,destructs,desecrated,descends,derris,deplore,deplete,depicts,depiction,depicted,denver's,denounce,demure,demolitions,demean,deluge,dell's,delish,deliberation,delbruck,delaford,deities,degaulle,deftly,deft,deformity,deflate,definatly,defense's,defector,deducted,decrypted,decontamination,decker's,decapitate,decanter,deadline's,dardis,danger's,dampener,damme,daddy'll,dabbling,dabbled,d'etre,d'argent,d'alene,d'agnasti,czechs,czechoslovakian,cyrillic,cymbal,cyberdyne,cutoffs,cuticle,cut's,curvaceous,curiousity,curfew's,culturally,cued,cubby,cruised,crucible,crowing,crowed,croutons,cropped,croaker,cristobel's,criminy,crested,crescentis,cred,cream's,crashers,crapola,cranwell,coverin,cousteau,courtrooms,counterattack,countenance,counselor's,cottages,cosmically,cosign,cosa,corroboration,corresponds,correspond,coroners,coro,cornflakes,corbett's,copy's,copperpot,copperhead,copacetic,coordsize,convulsing,contradicted,contract's,continuation,consults,consultations,constraints,conjures,congenial,confluence,conferring,confederation,condominium,concourse,concealer,compulsory,complexities,comparatively,compactor,commodities,commercialism,colleague's,collaborator,cokey,coiled,cognizant,cofell's,cobweb,co's,cnbc,clyde's,clunkers,clumsily,clucking,cloves,cloven,cloths,clothe,clop,clods,clocking,clings,climbers,clef,clearances,clavicle,claudia's,classless,clashing,clanking,clanging,clamping,civvies,citywide,citing,circulatory,circuited,circ,chung's,chronisters,chromic,choppy,choos,chongo,chloroformed,chilton's,chillun,chil,chicky,cheetos,cheesed,chatterbox,charlies,chaperoned,channukah,chamberlain's,chairman's,chaim,cessation,cerebellum,centred,centerpieces,centerfold,cellars,ceecee,ccedil,cavorting,cavemen,cavaliers,cauterized,caustic,cauldwell,catting,cathy's,caterine,castor's,cassiopeia,cascade's,carves,cartwheel,cartridges,carpeted,carob,carlsbad,caressing,carelessly,careening,carcinoma,capricious,capitalistic,capillaries,capes,candle's,candidly,canaan,camaraderie,calumet,callously,calligraphy,calfskin,cake's,caddies,cabinet's,buzzers,buttholes,butler's,busywork,busses,burps,burgomeister,buoy,bunny's,bunkhouse,bungchow,bulkhead,builders,bugler,buffets,buffed,buckaroo's,brutish,brusque,browser,bronchitis,bromden,brolly,brody's,broached,brewskis,brewski,brewin,brewers,brean,breadwinner,brana,brackets,bozz,bountiful,bounder,bouncin,bosoms,borgnine,bopping,bootlegs,booing,bons,boneyard,bombosity,bolting,bolivia,boilerplate,boba,bluey,blowback,blouses,bloodsuckers,bloodstained,blonde's,bloat,bleeth,blazed,blaine's,blackhawk,blackface,blackest,blackened,blacken,blackballed,blabs,blabbering,birdbrain,bipartisanship,biodegradable,binghamton,biltmore,billiards,bilked,big'uns,bidwell's,bidet,bessie's,besotted,beset,berth,bernheim,benson's,beni,benegas,bendiga,belushi,beltway,bellboys,belittling,belinda's,behinds,behemoth,begone,beeline,beehive,bedsheets,beckoning,beaute,beaudine,beastly,beachfront,be's,bauk,bathes,batak,bastion,baser,baseballs,barker's,barber's,barbella,bans,bankrolling,bangladesh,bandaged,bamba,bally's,bagpipe,bagger,baerly,backlog,backin,babying,azkaban,ayatollah,axes,awwwww,awakens,aviary,avery's,autonomic,authorizes,austero,aunty,augustine's,attics,atreus,astronomers,astounded,astonish,assertion,asserting,assailants,asha's,artemus,arses,arousal,armin,arintero,argon's,arduous,archers,archdiocese,archaeology,arbitrarily,ararat,appropriated,appraiser,applicable,apathetic,anybody'd,anxieties,anwar's,anticlimactic,antar,ankle's,anima,anglos,angleman,anesthetist,androscoggin,andromeda,andover,andolini,andale,anan,amway,amuck,amphibian,amniocentesis,amnesiac,ammonium,americano,amara,alway,alvah,alum,altruism,alternapalooza,alphabetize,alpaca,almanac,ally's,allus,alluded,allocation,alliances,allergist,alleges,alexandros,alec's,alaikum,alabam,akimbo,airy,ahab's,agoraphobia,agides,aggrhh,agatha's,aftertaste,affiliations,aegis,adoptions,adjuster,addictions,adamantium,acumen,activator,activates,acrylic,accomplishes,acclaimed,absorbs,aberrant,abbu,aarp,aaaaargh,aaaaaaaaaaaaa,a'ight,zucchini,zoos,zookeeper,zirconia,zippers,zequiel,zephyr's,zellary,zeitgeist,zanuck,zambia,zagat,ylang,yielded,yes'm,yenta,yegg,yecchh,yecch,yayo,yawp,yawns,yankin,yahdah,yaaah,y'got,xeroxed,wwooww,wristwatch,wrangled,wouldst,worthiness,wort,worshiping,worsen,wormy,wormtail,wormholes,woosh,woodworking,wonka,womens,wolverines,wollsten,wolfing,woefully,wobbling,witter's,wisp,wiry,wire's,wintry,wingding,windstorm,windowtext,wiluna,wilting,wilted,willick,willenholly,wildflowers,wildebeest,wilco,wiggum,wields,widened,whyyy,whoppers,whoaa,whizzing,whizz,whitest,whitefish,whistled,whist,whinny,whereupon,whereby,wheelies,wheaties,whazzup,whatwhatwhaaat,whato,whatdya,what'dya,whar,whacks,wexler's,wewell,wewe,wetsuit,wetland,westport,welluh,weight's,weeps,webpage,waylander,wavin,watercolors,wassail,wasnt,warships,warns,warneford,warbucks,waltons,wallbanger,waiving,waitwait,vowing,voucher,vornoff,vork,vorhees,voldemort,vivre,vittles,vishnu,vips,vindaloo,videogames,victors,vicky's,vichyssoise,vicarious,vet's,vesuvius,verve,verguenza,venturing,ventura's,venezuelan,ven't,velveteen,velour,velociraptor,vegetation,vaudeville,vastness,vasectomies,vapors,vanderhof,valmont,validates,valiantly,valerian,vacuums,vaccines,uzbekistan,usurp,usernum,us'll,urinals,unyielding,unwillingness,unvarnished,unturned,untouchables,untangled,unsecured,unscramble,unreturned,unremarkable,unregistered,unpublished,unpretentious,unopposed,unnerstand,unmade,unlicensed,unites,union's,uninhabited,unimpeachable,unilateral,unicef,unfolded,unfashionable,undisturbed,underwriting,underwrite,underlining,underling,underestimates,underappreciated,undamaged,uncouth,uncork,uncontested,uncommonly,unclog,uncircumcised,unchallenged,uncas,unbuttoning,unapproved,unamerican,unafraid,umpteen,umhmm,uhwhy,uhmm,ughuh,ughh,ufo's,typewriters,twitches,twitched,twirly,twinkling,twink,twinges,twiddling,twiddle,tutored,tutelage,turners,turnabout,ture,tunisian,tumultuous,tumour,tumblin,tryed,truckin,trubshaw's,trowel,trousseau,trivialize,trifles,tribianni,trib,triangulation,trenchcoat,trembled,traumatize,transplanted,translations,transitory,transients,transfuse,transforms,transcribing,transcend,tranq,trampy,traipsed,trainin,trail's,trafalgar,trachea,traceable,touristy,toughie,totality,totaling,toscanini,tortola,tortilla,tories,toreador,tooo,tonka,tommorrow,tollbooth,tollans,toidy,togs,togas,tofurkey,toddling,toddies,tobruk,toasties,toadstool,to've,tive,tingles,timin,timey,timetables,tightest,tide's,tibetans,thunderstorms,thuggee,thrusting,thrombus,throes,throated,thrifty,thoroughbred,thornharts,thinnest,thicket,thetas,thesulac,tethered,testimonial,testaburger,tersenadine,terrif,teresa's,terdlington,tepui,tenured,tentacle,temping,temperance,temp's,teller's,televisions,telefono,tele,teddies,tector,taxidermy,taxi's,taxation,tastebuds,tasker's,tartlets,tartabull,tard,tar'd,tantamount,tans,tangy,tangles,tamer,talmud,taiwan's,tabula,tabletops,tabithia,tabernacle,szechwan,syrian,synthedyne,synopsis,synonyms,swaps,swahili,svenjolly,svengali,suvs,sush,survivalists,surmise,surfboards,surefire,suprise,supremacists,suppositories,supervisors,superstore,supermen,supercop,supercilious,suntac,sunburned,summercliff,sullied,suite's,sugared,sufficiency,suerte,suckle,sucker's,sucka,succumbing,subtleties,substantiated,subsidiaries,subsides,subliminal,subhuman,stst,strowman,stroked,stroganoff,strikers,strengthening,streetlight,straying,strainer,straighter,straightener,storytelling,stoplight,stockade,stirrups,stink's,sting's,stimulates,stifler's,stewing,stetson's,stereotyping,ster,stepmommy,stephano,steeped,statesman,stashing,starshine,stand's,stamping,stamford,stairwells,stabilization,squatsie,squandering,squalid,squabbling,squab,sprinkling,spring's,spreader,spongy,spongebob,spokeswoman,spokesmen,splintered,spittle,spitter,spiced,spews,spendin,spect,speckled,spearchucker,spatulas,sparse,sparking,spares,spaceboy,soybeans,southtown,southside,southport,southland,soused,sotheby's,soshi,sorter,sorrowful,sorceress,sooth,songwriters,some'in,solstice,soliloquy,sods,sodomized,sode,sociologist,sobriki,soaping,snows,snowcone,snowcat,snitching,snitched,sneering,snausages,snaking,smoothed,smoochies,smolensk,smarten,smallish,slushy,slurring,sluman,slobber,slithers,slippin,sleuthing,sleeveless,slade's,skinner's,skinless,skillfully,sketchbook,skagnetti,sista,sioux,sinning,sinjin,singularly,sinewy,sinclair's,simultaneous,silverlake,silva's,siguto,signorina,signature's,signalling,sieve,sids,sidearms,shyster,shying,shunning,shtud,shrooms,shrieks,shorting,shortbread,shopkeepers,shmuck,shmancy,shizzit,shitheads,shitfaced,shitbag,shipmates,shiftless,sherpa,shelving,shelley's,sheik,shedlow,shecky,sheath,shavings,shatters,sharifa,shampoos,shallots,shafter,sha'nauc,sextant,settlers,setter,seti,serviceable,serrated,serbian,sequentially,sepsis,senores,sendin,semis,semanski,seller's,selflessly,selects,selectively,seinfelds,seers,seer's,seeps,see's,seductress,sedimentary,sediment,second's,secaucus,seater,seashore,sealant,seaborn's,scuttling,scusa,sculpting,scrunched,scrimmage,screenwriter,scotsman,scorer,sclerosis,scissorhands,schreber,scholastic,schmancy,schlong,scathing,scandinavia,scamps,scalloped,savoir,savagery,sasha's,sarong,sarnia,santangel,samool,samba,salons,sallow,salino,safecracker,sadism,saddles,sacrilegious,sabrini,sabath,s'aright,ruttheimer,russia's,rudest,rubbery,rousting,rotarian,roslin,rosey,rosa's,roomed,romari,romanticism,romanica,rolltop,rolfski,rod's,rockland,rockettes,roared,riverfront,rinpoche,ringleader,rims,riker's,riffing,ricans,ribcage,riana's,rhythmic,rhah,rewired,retroactive,retrial,reting,reticulum,resuscitated,resuming,restricting,restorations,restock,resilience,reservoirs,resembled,resale,requisitioned,reprogrammed,reproducing,repressive,replicant,repentant,repellant,repays,repainting,reorganization,renounced,renegotiating,rendez,renamed,reminiscent,remem,remade,relived,relinquishes,reliant,relearn,relaxant,rekindling,rehydrate,regulatory,regiments,regan's,refueled,refrigeration,refreshingly,reflector,refine,refilling,reexamine,reeseman,redness,redirected,redeemable,redder,redcoats,rectangles,recoup,reconstituted,reciprocated,recipients,recessed,recalls,rebounded,reassessing,realy,reality's,realisation,realer,reachin,re'kali,rawlston,ravages,rattlers,rasa,raps,rappaports,ramoray,ramming,ramadan,raindrops,rahesh,radioactivity,radials,racists,racin,rabartu,quotas,quintus,quiches,ques,queries,quench,quel,quarrels,quarreling,quaintly,quagmire,quadrants,pylon,putumayo,put'em,purifier,purified,pureed,punitis,pullout,pukin,pudgy,puddings,puckering,puccini,pterodactyl,psychodrama,pseudonym,psats,proximal,providers,protestations,protectee,prospered,prosaic,propositioned,prolific,progressively,proficiency,professions,prodigious,proclivity,probed,probabilities,pro's,prison's,printouts,principally,prig,prevision,prevailing,presumptive,pressers,preset,presentations,preposition,preparatory,preliminaries,preempt,preemie,predetermined,preconceptions,precipitate,prancan,powerpuff,powerfully,potties,potters,potpie,poseur,portraying,portico,porthole,portfolios,poops,pooping,pone,pomp,pomade,polyps,polymerized,politic,politeness,polisher,polack,pokers,pocketknife,poatia,plebeian,playgroup,platonically,plato's,platitude,platelet,plastering,plasmapheresis,plaques,plaids,placemats,place's,pizzazz,piracy,pipelines,pip's,pintauro,pinstripes,pinpoints,pinkner,pincer,pimento,pillaged,pileup,pilates,pigment,pigmen,pieter,pieeee,picturesque,piano's,phrasing,phrased,photojournalist,photocopies,phosphorus,phonograph,phoebes,phoe,philistines,philippine,philanderer,pheromone,phasers,pharaoh's,pfff,pfeffernuesse,petrov,petitions,peterman's,peso,pervs,perspire,personify,perservere,perplexed,perpetrating,perp's,perkiness,perjurer,periodontist,perfunctory,performa,perdido,percodan,penzance,pentameter,pentagon's,pentacle,pensive,pensione,pennybaker,pennbrooke,penhall,pengin,penetti,penetrates,pegs,pegnoir,peeve,peephole,pectorals,peckin,peaky,peaksville,payout,paxcow,paused,pauline's,patted,pasteur,passe,parochial,parkland,parkishoff,parkers,pardoning,paraplegic,paraphrasing,parapet,paperers,papered,panoramic,pangs,paneling,pander,pandemonium,pamela's,palooza,palmed,palmdale,palisades,palestinian,paleolithic,palatable,pakistanis,pageants,packaged,pacify,pacified,oyes,owwwww,overthrown,overt,oversexed,overriding,overrides,overpaying,overdrawn,overcompensate,overcomes,overcharged,outtakes,outmaneuver,outlying,outlining,outfoxed,ousted,oust,ouse,ould,oughtn't,ough,othe,ostentatious,oshun,oscillation,orthopedist,organizational,organization's,orca,orbits,or'derves,opting,ophthalmologist,operatic,operagirl,oozes,oooooooh,only's,onesie,omnis,omelets,oktoberfest,okeydoke,ofthe,ofher,obstetrics,obstetrical,obeys,obeah,o'rourke,o'reily's,o'henry,nyquil,nyanyanyanyah,nuttin,nutsy,nutrients,nutball,nurhachi,numbskull,nullifies,nullification,nucking,nubbin,ntnt,nourished,notoriety,northland,nonspecific,nonfiction,noing,noinch,nohoho,nobler,nitwits,nitric,nips,nibs,nibbles,newton's,newsprint,newspaperman,newspaper's,newscaster,never's,neuter,neuropathy,netherworld,nests,nerf,neee,neediest,neath,navasky,naturalization,nat's,narcissists,napped,nando,nags,nafta,myocardial,mylie's,mykonos,mutilating,mutherfucker,mutha,mutations,mutates,mutate,musn't,muskets,murray's,murchy,mulwray's,multitasking,muldoon's,mujeeb,muerte,mudslinging,muckraking,mrsa,mown,mousie,mousetrap,mourns,mournful,motivating,motherland,motherf,mostro,mosaic,morphing,morphate,mormons,moralistic,moored,moochy,mooching,monotonous,monorail,monopolize,monogram,monocle,molehill,molar,moland,mofet,modestly,mockup,moca,mobilizing,mitzvahs,mitre,mistreating,misstep,misrepresentation,misjudge,misinformation,miserables,misdirected,miscarriages,minute's,miniskirt,minimizing,mindwarped,minced,milquetoast,millimeters,miguelito,migrating,mightily,midsummer,midstream,midriff,mideast,midas,microbe,metropolis,methuselah,mesdames,mescal,mercury's,menudo,menu's,mentors,men'll,memorial's,memma,melvins,melanie's,megaton,megara,megalomaniac,meeee,medulla,medivac,mediate,meaninglessness,mcnuggets,mccarthyism,maypole,may've,mauve,maturing,matter's,mateys,mate's,mastering,masher,marxism,martimmy's,marshack,marseille,markles,marketed,marketable,mansiere,manservant,manse,manhandling,manco's,manana,maman,malnutrition,mallomars,malkovich's,malcontent,malaise,makeup's,majesties,mainsail,mailmen,mahandra,magnolias,magnified,magev,maelstrom,madcap,mack's,machu,macfarlane's,macado,ma'm,m'boy,m'appelle,lying's,lustrous,lureen,lunges,lumped,lumberyard,lulled,luego,lucks,lubricated,loveseat,loused,lounger,loski,lorre,loora,looong,loonies,lonnegan's,lola's,loire,loincloth,logistical,lofts,lodges,lodgers,lobbing,loaner,livered,lithuania,liqueur,linkage,ling's,lillienfield's,ligourin,lighter's,lifesaving,lifeguards,lifeblood,library's,liberte,liaisons,liabilities,let'em,lesbianism,lenny's,lennart,lence,lemonlyman,legz,legitimize,legalized,legalization,leadin,lazars,lazarro,layoffs,lawyering,lawson's,lawndale's,laugher,laudanum,latte's,latrines,lations,laters,lastly,lapels,lansing's,lan's,lakefront,lait,lahit,lafortunata,lachrymose,laborer,l'italien,l'il,kwaini,kuzmich,kuato's,kruczynski,kramerica,krakatoa,kowtow,kovinsky,koufax,korsekov,kopek,knoxville,knowakowski,knievel,knacks,klux,klein's,kiran,kiowas,kinshasa,kinkle's,kincaid's,killington,kidnapper's,kickoff,kickball,khan's,keyworth,keymaster,kevie,keveral,kenyons,keggers,keepsakes,kechner,keaty,kavorka,katmandu,katan's,karajan,kamerev,kamal's,kaggs,juvi,jurisdictional,jujyfruit,judeo,jostled,joni's,jonestown,jokey,joists,joint's,johnnie's,jocko,jimmied,jiggled,jig's,jests,jessy,jenzen,jensen's,jenko,jellyman,jeet,jedediah,jealitosis,jaya's,jaunty,jarmel,jankle,jagoff,jagielski,jacky,jackrabbits,jabbing,jabberjaw,izzat,iuml,isolating,irreverent,irresponsibly,irrepressible,irregularity,irredeemable,investigator's,inuvik,intuitions,intubated,introspective,intrinsically,intra,intimates,interval,intersections,interred,interned,interminable,interloper,intercostal,interchange,integer,intangible,instyle,instrumentation,instigate,instantaneously,innumerable,inns,injustices,ining,inhabits,ings,ingrown,inglewood,ingestion,ingesting,infusion,infusing,infringing,infringe,inflection,infinitum,infact,inexplicably,inequities,ineligible,industry's,induces,indubitably,indisputable,indirect,indescribably,independents,indentation,indefinable,incursion,incontrovertible,inconsequential,incompletes,incoherently,inclement,inciting,incidentals,inarticulate,inadequacies,imprudent,improvisation,improprieties,imprison,imprinted,impressively,impostors,importante,implicit,imperious,impale,immortalized,immodest,immobile,imbued,imbedded,imbecilic,illustrates,illegals,iliad,idn't,idiom,icons,hysteric,hypotenuse,hygienic,hyeah,hushpuppies,hunhh,hungarians,humpback,humored,hummed,humiliates,humidifier,huggy,huggers,huckster,html,hows,howlin,hoth,hotbed,hosing,hosers,horsehair,homegrown,homebody,homebake,holographic,holing,holies,hoisting,hogwallop,hogan's,hocks,hobbits,hoaxes,hmmmmm,hisses,hippos,hippest,hindrance,hindi,him's,hillbillies,hilarity,highball,hibiscus,heyday,heurh,hershey's,herniated,hermaphrodite,hera,hennifer,hemlines,hemline,hemery,helplessness,helmsley,hellhound,heheheheh,heey,heeey,hedda,heck's,heartbeats,heaped,healers,headstart,headsets,headlong,headlining,hawkland,havta,havana's,haulin,hastened,hasn,harvey'll,harpo,hardass,haps,hanta,hansom,hangnail,handstand,handrail,handoff,hander,han's,hamlet's,hallucinogen,hallor,halitosis,halen,hahah,hado,haberdashery,gypped,guy'll,guni,gumbel,gulch,gues,guerillas,guava,guatemalan,guardrail,guadalajara,grunther,grunick,grunemann's,growers,groppi,groomer,grodin,gris,gripes,grinds,grimaldi's,grifters,griffins,gridlock,gretch,greevey,greasing,graveyards,grandkid,grainy,graced,governed,gouging,gordie's,gooney,googly,golfers,goldmuff,goldenrod,goingo,godly,gobbledygook,gobbledegook,goa'uld's,glues,gloriously,glengarry,glassware,glamor,glaciers,ginseng,gimmicks,gimlet,gilded,giggly,gig's,giambetti,ghoulish,ghettos,ghandi,ghali,gether,get's,gestation,geriatrics,gerbils,gerace's,geosynchronous,georgio,geopolitical,genus,gente,genital,geneticist,generation's,generates,gendarme,gelbman,gazillionth,gayest,gauging,gastro,gaslight,gasbag,garters,garish,garas,garages,gantu,gangy,gangly,gangland,gamer,galling,galilee,galactica's,gaiety,gadda,gacy,futuristic,futs,furrowed,funny's,funnies,funkytown,fundraisers,fundamentalist,fulcrum,fugimotto,fuente,fueling,fudging,fuckup,fuckeen,frutt's,frustrates,froufrou,froot,frontiers,fromberge,frog's,frizzies,fritters,fringes,frightfully,frigate,friendliest,freeloading,freelancing,fredonia,freakazoid,fraternization,frankfurter,francine's,franchises,framers,fostered,fortune's,fornication,fornicating,formulating,formations,forman's,forgeries,forethought,forage,footstool,foisting,focussing,focking,foal,flutes,flurries,fluffed,flourished,florida's,floe,flintstones,fleischman's,fledgling,fledermaus,flayed,flay,flawlessly,flatters,flashbang,flapped,flanking,flamer,fission,fishies,firmer,fireproof,fireman's,firebug,firebird,fingerpainting,finessed,findin,financials,finality,fillets,fighter's,fiercest,fiefdom,fibrosis,fiberglass,fibbing,feudal,festus,fervor,fervent,fentanyl,fenelon,fenders,fedorchuk,feckless,feathering,fearsome,fauna,faucets,farmland,farewells,fantasyland,fanaticism,faltered,fallacy,fairway,faggy,faberge,extremism,extorting,extorted,exterminating,exhumation,exhilaration,exhausts,exfoliate,exemptions,excesses,excels,exasperating,exacting,evoked,evocative,everyman,everybody'd,evasions,evangelical,establishments,espressos,esoteric,esmail,errrr,erratically,eroding,erode,ernswiler,episcopalian,ephemeral,epcot,entrenched,entomology,entomologist,enthralled,ensuing,ensenada,enriching,enrage,enlisting,enhancer,enhancements,endorsing,endear,encrusted,encino,enacted,employing,emperors,empathic,embodied,embezzle,embarked,emanates,elton's,eloquence,eloi,elmwood,elliptical,ellenor's,elemental,electricians,electing,elapsed,eking,egomaniacal,eggo,egging,effected,effacing,eeww,edits,editor's,edging,ectoplasm,economical,ecch,eavesdropped,eastbound,earwig,e'er,durable,dunbar's,dummkopf,dugray,duchaisne,duality,drusilla's,drunkard,drudge,drucilla's,droop,droids,drips,dripped,dribbles,drew's,dressings,drazens,downy,downsize,downpour,dowager,dote,dosages,dorothy's,doppler,doppelganger,dopes,doorman's,doohicky,doof,dontcha,donovon's,doneghy,domi,domes,dojo,documentaries,divinity,divining,divest,diuretics,diuretic,distrustful,distortions,dissident,disrupts,disruptions,disproportionate,dispensary,disparity,dismemberment,dismember,disinfect,disillusionment,disheartening,discriminated,discourteous,discotheque,discolored,disassembled,disabling,dirtiest,diphtheria,dinks,dimpled,digg,diffusion,differs,didya,dickweed,dickwad,dickson's,diatribes,diathesis,diabetics,dewars,deviants,detrimental,detonates,detests,detestable,detaining,despondent,desecration,descriptive,derision,derailing,deputized,depressors,depo,depicting,depict,dependant,dentures,denominators,demur,demonstrators,demonology,delts,dellarte,delinquency,delacour,deflated,definitively,defib,defected,defaced,deeded,decorators,debit,deaqon,davola,datin,dasilva's,darwinian,darling's,darklighters,dandelions,dandelion,dancer's,dampened,dame's,damaskinos,dama,dalrimple,dagobah,dack,d'peshu,d'hoffryn,d'astier,cystic,cynics,cybernetic,cutoff,cutesy,cutaway,customarily,curtain's,cursive,curmudgeon,curdle,cuneiform,cultivated,culpability,culo,cuisinart,cuffing,crypts,cryptid,cryogenic,crux,crunched,crumblers,crudely,crosscheck,croon,crissake,crime's,cribbage,crevasse,creswood,creepo,creases,creased,creaky,cranks,cran,craftsmen,crafting,crabgrass,cowboy's,coveralls,couple'a,councilors,coughs,cotton's,cosmology,coslaw,corresponded,corporeal,corollary,cornucopia,cornering,corks,cordoned,coolly,coolin,cooley's,coolant,cookbooks,converging,contrived,contrite,contributors,contradictory,contra,contours,contented,contenders,contemplated,contact's,constrictor,congressman's,congestion,confrontations,confound,conform,confit,confiscating,conferred,condoned,conditioners,concussions,concentric,conceding,coms,comprised,comprise,comprendo,composers,commuted,commercially,commentator,commentaries,commemorating,commander's,comers,comedic,combustible,combusted,columbo,columbia's,colourful,colonials,collingswood,coliseum,coldness,cojones,coitus,cohesive,cohesion,cohen's,coffey's,codicil,cochran's,coasting,clydesdale,cluttering,clunker,clunk,clumsiness,clumps,clotted,clothesline,clinches,clincher,cleverness,clench,clein,cleave,cleanses,claymores,clarisse,clarissa's,clammed,civilisation,ciudad,circumvent,circulated,circuit's,cinnamon's,cind,church's,chugging,chronically,christsakes,chris's,choque,chompers,choco,chiseling,chirpy,chirp,chinks,chingachgook,chigger,chicklet,chickenpox,chickadee,chewin,chessboard,cherub,chemo's,chauffeur's,chaucer,chariots,chargin,characterizing,chanteuse,chandeliers,chamdo,chalupa,chagrined,chaff,certs,certify,certification,certainties,cerreno,cerebrum,cerebro,century's,centennial,censured,cemetary,cellist,celine's,cedar's,cayo,caterwauling,caterpillars,categorized,catchers,cataclysmic,cassidy's,casitas,casino's,cased,carvel,cartographers,carting,cartels,carriages,carrear,carr's,carolling,carolinas,carolers,carnie,carne,cardiovascular,cardiogram,carbuncle,caramba,capulets,capping,canyons,canines,candaules,canape,canadiens,campaigned,cambodian,camberwell,caldecott,calamitous,caff,cadillacs,cachet,cabeza,cabdriver,byzantium,buzzkill,buzzards,buzz's,buyer's,butai,bustling,businesswomen,bunyan,bungled,bumpkins,bummers,bulletins,bullet's,bulldoze,bulbous,bug's,buffybot,budgeted,budda,bubut,bubbies,brunei,brrrrr,brownout,brouhaha,bronzing,bronchial,broiler,broadening,briskly,briefcases,bricked,breezing,breeher,breckinridge,breakwater,breakable,breadstick,bravenet,braved,brass's,brandies,brandeis,branched,brainwaves,brainiest,braggart,bradlee,boys're,boys'll,boys'd,boyd's,boutonniere,bottle's,bossed,bosomy,bosnian,borans,boosts,boombox,bookshelves,bookmark,booklet,bookends,bontecou's,bongos,boneless,bone's,bond's,bombarding,bombarded,bollo,boinked,boink,boilers,bogart's,bobbo,bobbin,bluest,bluebells,blowjobs,bloodshot,blondie's,blockhead,blockbusters,blithely,blim,bleh,blather,blasters,blankly,bladders,blackhawks,blackbeard,bjorn,bitte,bippy,bios,biohazard,biogenetics,biochemistry,biochemist,bilingual,bilge,bigmouth,bighorn,bigglesworth,bicuspids,beususe,betaseron,besmirch,besieged,bernece,bergman's,bereavement,bentonville,benthic,benjie,benji's,benefactors,benchley,benching,bembe,bellyaching,bellhops,belie,beleaguered,being's,behrle,beginnin,begining,beenie,beefs,beechwood,bee's,bedbug,becau,beaverhausen,beakers,beacon's,bazillion,baudouin,bat's,bartlett's,barrytown,barringtons,baroque,baronet,barneys,barbs,barbers,barbatus,baptists,bankrupted,banker's,bamn,bambi's,ballon's,balinese,bakeries,bailiffs,backslide,baby'd,baaad,b'fore,awwwk,aways,awakes,averages,avengers,avatars,autonomous,automotive,automaton,automatics,autism,authoritative,authenticated,authenticate,aught,audition's,aubyn,attired,attagirl,atrophied,atonement,atherton's,asystole,astroturf,assimilated,assimilate,assertiveness,assemblies,assassin's,artiste,article's,artichokes,arsehole,arrears,arquillians,arnie's,aright,archenemy,arched,arcade's,aquatic,apps,appraise,applauded,appendages,appeased,apostle,apollo's,antwerp,antler,antiquity,antin,antidepressant,antibody,anthropologists,anthology,anthea,antagonism,ant's,anspaugh,annually,anka,angola,anesthetics,anda,ancients,anchoring,anaphylactic,anaheim,ana's,amtrak,amscray,amputated,amounted,americas,amended,ambivalence,amalio,amah,altoid,alriiight,alphabetized,alpena,alouette,allowable,allora,alliteration,allenwood,alleging,allegiances,aligning,algerians,alerts,alchemist,alcerro,alastor,airway's,airmen,ahaha,ah'm,agitators,agitation,aforethought,afis,aesthetics,aerospace,aerodynamics,advertises,advert,advantageous,admonition,administration's,adirondacks,adenoids,adebisi's,acupuncturist,acula,actuarial,activators,actionable,acme's,acknowledges,achmed,achingly,acetate,accusers,accumulation,accorded,acclimated,acclimate,absurdly,absorbent,absolvo,absolutes,absences,abraham's,aboriginal,ablaze,abdomenizer,aaaaaaaaah,aaaaaaaaaa,a'right".split(","))),
+r("male_names",q("james,john,robert,michael,william,david,richard,charles,joseph,thomas,christopher,daniel,paul,mark,donald,george,kenneth,steven,edward,brian,ronald,anthony,kevin,jason,matthew,gary,timothy,jose,larry,jeffrey,frank,scott,eric,stephen,andrew,raymond,gregory,joshua,jerry,dennis,walter,patrick,peter,harold,douglas,henry,carl,arthur,ryan,roger,joe,juan,jack,albert,jonathan,justin,terry,gerald,keith,samuel,willie,ralph,lawrence,nicholas,roy,benjamin,bruce,brandon,adam,harry,fred,wayne,billy,steve,louis,jeremy,aaron,randy,eugene,carlos,russell,bobby,victor,ernest,phillip,todd,jesse,craig,alan,shawn,clarence,sean,philip,chris,johnny,earl,jimmy,antonio,danny,bryan,tony,luis,mike,stanley,leonard,nathan,dale,manuel,rodney,curtis,norman,marvin,vincent,glenn,jeffery,travis,jeff,chad,jacob,melvin,alfred,kyle,francis,bradley,jesus,herbert,frederick,ray,joel,edwin,don,eddie,ricky,troy,randall,barry,bernard,mario,leroy,francisco,marcus,micheal,theodore,clifford,miguel,oscar,jay,jim,tom,calvin,alex,jon,ronnie,bill,lloyd,tommy,leon,derek,darrell,jerome,floyd,leo,alvin,tim,wesley,dean,greg,jorge,dustin,pedro,derrick,dan,zachary,corey,herman,maurice,vernon,roberto,clyde,glen,hector,shane,ricardo,sam,rick,lester,brent,ramon,tyler,gilbert,gene,marc,reginald,ruben,brett,angel,nathaniel,rafael,edgar,milton,raul,ben,cecil,duane,andre,elmer,brad,gabriel,ron,roland,jared,adrian,karl,cory,claude,erik,darryl,neil,christian,javier,fernando,clinton,ted,mathew,tyrone,darren,lonnie,lance,cody,julio,kurt,allan,clayton,hugh,max,dwayne,dwight,armando,felix,jimmie,everett,ian,ken,bob,jaime,casey,alfredo,alberto,dave,ivan,johnnie,sidney,byron,julian,isaac,clifton,willard,daryl,virgil,andy,salvador,kirk,sergio,seth,kent,terrance,rene,eduardo,terrence,enrique,freddie,stuart,fredrick,arturo,alejandro,joey,nick,luther,wendell,jeremiah,evan,julius,donnie,otis,trevor,luke,homer,gerard,doug,kenny,hubert,angelo,shaun,lyle,matt,alfonso,orlando,rex,carlton,ernesto,pablo,lorenzo,omar,wilbur,blake,horace,roderick,kerry,abraham,rickey,ira,andres,cesar,johnathan,malcolm,rudolph,damon,kelvin,rudy,preston,alton,archie,marco,wm,pete,randolph,garry,geoffrey,jonathon,felipe,bennie,gerardo,ed,dominic,loren,delbert,colin,guillermo,earnest,benny,noel,rodolfo,myron,edmund,salvatore,cedric,lowell,gregg,sherman,devin,sylvester,roosevelt,israel,jermaine,forrest,wilbert,leland,simon,irving,owen,rufus,woodrow,kristopher,levi,marcos,gustavo,lionel,marty,gilberto,clint,nicolas,laurence,ismael,orville,drew,ervin,dewey,al,wilfred,josh,hugo,ignacio,caleb,tomas,sheldon,erick,frankie,darrel,rogelio,terence,alonzo,elias,bert,elbert,ramiro,conrad,noah,grady,phil,cornelius,lamar,rolando,clay,percy,dexter,bradford,merle,darin,amos,terrell,moses,irvin,saul,roman,darnell,randal,tommie,timmy,darrin,brendan,toby,van,abel,dominick,emilio,elijah,cary,domingo,aubrey,emmett,marlon,emanuel,jerald,edmond,emil,dewayne,otto,teddy,reynaldo,bret,jess,trent,humberto,emmanuel,stephan,louie,vicente,lamont,garland,micah,efrain,heath,rodger,demetrius,ethan,eldon,rocky,pierre,eli,bryce,antoine,robbie,kendall,royce,sterling,grover,elton,cleveland,dylan,chuck,damian,reuben,stan,leonardo,russel,erwin,benito,hans,monte,blaine,ernie,curt,quentin,agustin,jamal,devon,adolfo,tyson,wilfredo,bart,jarrod,vance,denis,damien,joaquin,harlan,desmond,elliot,darwin,gregorio,kermit,roscoe,esteban,anton,solomon,norbert,elvin,nolan,carey,rod,quinton,hal,brain,rob,elwood,kendrick,darius,moises,marlin,fidel,thaddeus,cliff,marcel,ali,raphael,bryon,armand,alvaro,jeffry,dane,joesph,thurman,ned,sammie,rusty,michel,monty,rory,fabian,reggie,kris,isaiah,gus,avery,loyd,diego,adolph,millard,rocco,gonzalo,derick,rodrigo,gerry,rigoberto,alphonso,ty,rickie,noe,vern,elvis,bernardo,mauricio,hiram,donovan,basil,nickolas,scot,vince,quincy,eddy,sebastian,federico,ulysses,heriberto,donnell,denny,gavin,emery,romeo,jayson,dion,dante,clement,coy,odell,jarvis,bruno,issac,dudley,sanford,colby,carmelo,nestor,hollis,stefan,donny,art,linwood,beau,weldon,galen,isidro,truman,delmar,johnathon,silas,frederic,irwin,merrill,charley,marcelino,carlo,trenton,kurtis,aurelio,winfred,vito,collin,denver,leonel,emory,pasquale,mohammad,mariano,danial,landon,dirk,branden,adan,numbers,clair,buford,german,bernie,wilmer,emerson,zachery,jacques,errol,josue,edwardo,wilford,theron,raymundo,daren,tristan,robby,lincoln,jame,genaro,octavio,cornell,hung,arron,antony,herschel,alva,giovanni,garth,cyrus,cyril,ronny,stevie,lon,kennith,carmine,augustine,erich,chadwick,wilburn,russ,myles,jonas,mitchel,mervin,zane,jamel,lazaro,alphonse,randell,major,johnie,jarrett,ariel,abdul,dusty,luciano,seymour,scottie,eugenio,mohammed,valentin,arnulfo,lucien,ferdinand,thad,ezra,aldo,rubin,royal,mitch,earle,abe,marquis,lanny,kareem,jamar,boris,isiah,emile,elmo,aron,leopoldo,everette,josef,eloy,dorian,rodrick,reinaldo,lucio,jerrod,weston,hershel,lemuel,lavern,burt,jules,gil,eliseo,ahmad,nigel,efren,antwan,alden,margarito,refugio,dino,osvaldo,les,deandre,normand,kieth,ivory,trey,norberto,napoleon,jerold,fritz,rosendo,milford,sang,deon,christoper,alfonzo,lyman,josiah,brant,wilton,rico,jamaal,dewitt,brenton,yong,olin,faustino,claudio,judson,gino,edgardo,alec,jarred,donn,trinidad,tad,porfirio,odis,lenard,chauncey,tod,mel,marcelo,kory,augustus,keven,hilario,bud,sal,orval,mauro,dannie,zachariah,olen,anibal,milo,jed,thanh,amado,lenny,tory,richie,horacio,brice,mohamed,delmer,dario,mac,jonah,jerrold,robt,hank,sung,rupert,rolland,kenton,damion,chi,antone,waldo,fredric,bradly,kip,burl,tyree,jefferey,ahmed,willy,stanford,oren,moshe,mikel,enoch,brendon,quintin,jamison,florencio,darrick,tobias,minh,hassan,giuseppe,demarcus,cletus,tyrell,lyndon,keenan,werner,theo,geraldo,columbus,chet,bertram,markus,huey,hilton,dwain,donte,tyron,omer,isaias,hipolito,fermin,chung,adalberto,jamey,teodoro,mckinley,maximo,sol,raleigh,lawerence,abram,rashad,emmitt,daron,chong,samual,otha,miquel,eusebio,dong,domenic,darron,wilber,renato,hoyt,haywood,ezekiel,chas,florentino,elroy,clemente,arden,neville,edison,deshawn,carrol,shayne,nathanial,jordon,danilo,claud,val,sherwood,raymon,rayford,cristobal,ambrose,titus,hyman,felton,ezequiel,erasmo,lonny,len,ike,milan,lino,jarod,herb,andreas,rhett,jude,douglass,cordell,oswaldo,ellsworth,virgilio,toney,nathanael,del,benedict,mose,hong,isreal,garret,fausto,asa,arlen,zack,modesto,francesco,manual,jae,gaylord,gaston,filiberto,deangelo,michale,granville,wes,malik,zackary,tuan,nicky,cristopher,antione,malcom,korey,jospeh,colton,waylon,von,hosea,shad,santo,rudolf,rolf,rey,renaldo,marcellus,lucius,kristofer,harland,arnoldo,rueben,leandro,kraig,jerrell,jeromy,hobert,cedrick,arlie,winford,wally,luigi,keneth,jacinto,graig,franklyn,edmundo,sid,leif,jeramy,willian,vincenzo,shon,michal,lynwood,jere,hai,elden,darell,broderick,alonso".split(","))),
+r("female_names",q("mary,patricia,linda,barbara,elizabeth,jennifer,maria,susan,margaret,dorothy,lisa,nancy,karen,betty,helen,sandra,donna,carol,ruth,sharon,michelle,laura,sarah,kimberly,deborah,jessica,shirley,cynthia,angela,melissa,brenda,amy,anna,rebecca,virginia,kathleen,pamela,martha,debra,amanda,stephanie,carolyn,christine,marie,janet,catherine,frances,ann,joyce,diane,alice,julie,heather,teresa,doris,gloria,evelyn,jean,cheryl,mildred,katherine,joan,ashley,judith,rose,janice,kelly,nicole,judy,christina,kathy,theresa,beverly,denise,tammy,irene,jane,lori,rachel,marilyn,andrea,kathryn,louise,sara,anne,jacqueline,wanda,bonnie,julia,ruby,lois,tina,phyllis,norma,paula,diana,annie,lillian,emily,robin,peggy,crystal,gladys,rita,dawn,connie,florence,tracy,edna,tiffany,carmen,rosa,cindy,grace,wendy,victoria,edith,kim,sherry,sylvia,josephine,thelma,shannon,sheila,ethel,ellen,elaine,marjorie,carrie,charlotte,monica,esther,pauline,emma,juanita,anita,rhonda,hazel,amber,eva,debbie,april,leslie,clara,lucille,jamie,joanne,eleanor,valerie,danielle,megan,alicia,suzanne,michele,gail,bertha,darlene,veronica,jill,erin,geraldine,lauren,cathy,joann,lorraine,lynn,sally,regina,erica,beatrice,dolores,bernice,audrey,yvonne,annette,june,marion,dana,stacy,ana,renee,ida,vivian,roberta,holly,brittany,melanie,loretta,yolanda,jeanette,laurie,katie,kristen,vanessa,alma,sue,elsie,beth,jeanne,vicki,carla,tara,rosemary,eileen,terri,gertrude,lucy,tonya,ella,stacey,wilma,gina,kristin,jessie,natalie,agnes,vera,charlene,bessie,delores,melinda,pearl,arlene,maureen,colleen,allison,tamara,joy,georgia,constance,lillie,claudia,jackie,marcia,tanya,nellie,minnie,marlene,heidi,glenda,lydia,viola,courtney,marian,stella,caroline,dora,jo,vickie,mattie,maxine,irma,mabel,marsha,myrtle,lena,christy,deanna,patsy,hilda,gwendolyn,jennie,nora,margie,nina,cassandra,leah,penny,kay,priscilla,naomi,carole,olga,billie,dianne,tracey,leona,jenny,felicia,sonia,miriam,velma,becky,bobbie,violet,kristina,toni,misty,mae,shelly,daisy,ramona,sherri,erika,katrina,claire,lindsey,lindsay,geneva,guadalupe,belinda,margarita,sheryl,cora,faye,ada,natasha,sabrina,isabel,marguerite,hattie,harriet,molly,cecilia,kristi,brandi,blanche,sandy,rosie,joanna,iris,eunice,angie,inez,lynda,madeline,amelia,alberta,genevieve,monique,jodi,janie,kayla,sonya,jan,kristine,candace,fannie,maryann,opal,alison,yvette,melody,luz,susie,olivia,flora,shelley,kristy,mamie,lula,lola,verna,beulah,antoinette,candice,juana,jeannette,pam,kelli,whitney,bridget,karla,celia,latoya,patty,shelia,gayle,della,vicky,lynne,sheri,marianne,kara,jacquelyn,erma,blanca,myra,leticia,pat,krista,roxanne,angelica,robyn,adrienne,rosalie,alexandra,brooke,bethany,sadie,bernadette,traci,jody,kendra,nichole,rachael,mable,ernestine,muriel,marcella,elena,krystal,angelina,nadine,kari,estelle,dianna,paulette,lora,mona,doreen,rosemarie,desiree,antonia,janis,betsy,christie,freda,meredith,lynette,teri,cristina,eula,leigh,meghan,sophia,eloise,rochelle,gretchen,cecelia,raquel,henrietta,alyssa,jana,gwen,jenna,tricia,laverne,olive,tasha,silvia,elvira,delia,kate,patti,lorena,kellie,sonja,lila,lana,darla,mindy,essie,mandy,lorene,elsa,josefina,jeannie,miranda,dixie,lucia,marta,faith,lela,johanna,shari,camille,tami,shawna,elisa,ebony,melba,ora,nettie,tabitha,ollie,winifred,kristie,marina,alisha,aimee,rena,myrna,marla,tammie,latasha,bonita,patrice,ronda,sherrie,addie,francine,deloris,stacie,adriana,cheri,abigail,celeste,jewel,cara,adele,rebekah,lucinda,dorthy,effie,trina,reba,sallie,aurora,lenora,etta,lottie,kerri,trisha,nikki,estella,francisca,josie,tracie,marissa,karin,brittney,janelle,lourdes,laurel,helene,fern,elva,corinne,kelsey,ina,bettie,elisabeth,aida,caitlin,ingrid,iva,eugenia,christa,goldie,maude,jenifer,therese,dena,lorna,janette,latonya,candy,consuelo,tamika,rosetta,debora,cherie,polly,dina,jewell,fay,jillian,dorothea,nell,trudy,esperanza,patrica,kimberley,shanna,helena,cleo,stefanie,rosario,ola,janine,mollie,lupe,alisa,lou,maribel,susanne,bette,susana,elise,cecile,isabelle,lesley,jocelyn,paige,joni,rachelle,leola,daphne,alta,ester,petra,graciela,imogene,jolene,keisha,lacey,glenna,gabriela,keri,ursula,lizzie,kirsten,shana,adeline,mayra,jayne,jaclyn,gracie,sondra,carmela,marisa,rosalind,charity,tonia,beatriz,marisol,clarice,jeanine,sheena,angeline,frieda,lily,shauna,millie,claudette,cathleen,angelia,gabrielle,autumn,katharine,jodie,staci,lea,christi,justine,elma,luella,margret,dominique,socorro,martina,margo,mavis,callie,bobbi,maritza,lucile,leanne,jeannine,deana,aileen,lorie,ladonna,willa,manuela,gale,selma,dolly,sybil,abby,ivy,dee,winnie,marcy,luisa,jeri,magdalena,ofelia,meagan,audra,matilda,leila,cornelia,bianca,simone,bettye,randi,virgie,latisha,barbra,georgina,eliza,leann,bridgette,rhoda,haley,adela,nola,bernadine,flossie,ila,greta,ruthie,nelda,minerva,lilly,terrie,letha,hilary,estela,valarie,brianna,rosalyn,earline,catalina,ava,mia,clarissa,lidia,corrine,alexandria,concepcion,tia,sharron,rae,dona,ericka,jami,elnora,chandra,lenore,neva,marylou,melisa,tabatha,serena,avis,allie,sofia,jeanie,odessa,nannie,harriett,loraine,penelope,milagros,emilia,benita,allyson,ashlee,tania,esmeralda,karina,eve,pearlie,zelma,malinda,noreen,tameka,saundra,hillary,amie,althea,rosalinda,lilia,alana,clare,alejandra,elinor,lorrie,jerri,darcy,earnestine,carmella,noemi,marcie,liza,annabelle,louisa,earlene,mallory,carlene,nita,selena,tanisha,katy,julianne,lakisha,edwina,maricela,margery,kenya,dollie,roxie,roslyn,kathrine,nanette,charmaine,lavonne,ilene,tammi,suzette,corine,kaye,chrystal,lina,deanne,lilian,juliana,aline,luann,kasey,maryanne,evangeline,colette,melva,lawanda,yesenia,nadia,madge,kathie,ophelia,valeria,nona,mitzi,mari,georgette,claudine,fran,alissa,roseann,lakeisha,susanna,reva,deidre,chasity,sheree,elvia,alyce,deirdre,gena,briana,araceli,katelyn,rosanne,wendi,tessa,berta,marva,imelda,marietta,marci,leonor,arline,sasha,madelyn,janna,juliette,deena,aurelia,josefa,augusta,liliana,lessie,amalia,savannah,anastasia,vilma,natalia,rosella,lynnette,corina,alfreda,leanna,amparo,coleen,tamra,aisha,wilda,karyn,queen,maura,mai,evangelina,rosanna,hallie,erna,enid,mariana,lacy,juliet,jacklyn,freida,madeleine,mara,cathryn,lelia,casandra,bridgett,angelita,jannie,dionne,annmarie,katina,beryl,millicent,katheryn,diann,carissa,maryellen,liz,lauri,helga,gilda,rhea,marquita,hollie,tisha,tamera,angelique,francesca,kaitlin,lolita,florine,rowena,reyna,twila,fanny,janell,ines,concetta,bertie,alba,brigitte,alyson,vonda,pansy,elba,noelle,letitia,deann,brandie,louella,leta,felecia,sharlene,lesa,beverley,isabella,herminia,terra,celina,tori,octavia,jade,denice,germaine,michell,cortney,nelly,doretha,deidra,monika,lashonda,judi,chelsey,antionette,margot,adelaide,nan,leeann,elisha,dessie,libby,kathi,gayla,latanya,mina,mellisa,kimberlee,jasmin,renae,zelda,elda,justina,gussie,emilie,camilla,abbie,rocio,kaitlyn,edythe,ashleigh,selina,lakesha,geri,allene,pamala,michaela,dayna,caryn,rosalia,sun,jacquline,rebeca,marybeth,krystle,iola,dottie,belle,griselda,ernestina,elida,adrianne,demetria,delma,jaqueline,arleen,virgina,retha,fatima,tillie,eleanore,cari,treva,wilhelmina,rosalee,maurine,latrice,jena,taryn,elia,debby,maudie,jeanna,delilah,catrina,shonda,hortencia,theodora,teresita,robbin,danette,delphine,brianne,nilda,danna,cindi,bess,iona,winona,vida,rosita,marianna,racheal,guillermina,eloisa,celestine,caren,malissa,lona,chantel,shellie,marisela,leora,agatha,soledad,migdalia,ivette,christen,janel,veda,pattie,tessie,tera,marilynn,lucretia,karrie,dinah,daniela,alecia,adelina,vernice,shiela,portia,merry,lashawn,dara,tawana,oma,verda,alene,zella,sandi,rafaela,maya,kira,candida,alvina,suzan,shayla,lyn,lettie,samatha,oralia,matilde,larissa,vesta,renita,india,delois,shanda,phillis,lorri,erlinda,cathrine,barb,zoe,isabell,ione,gisela,roxanna,mayme,kisha,ellie,mellissa,dorris,dalia,bella,annetta,zoila,reta,reina,lauretta,kylie,christal,pilar,charla,elissa,tiffani,tana,paulina,leota,breanna,jayme,carmel,vernell,tomasa,mandi,dominga,santa,melodie,lura,alexa,tamela,mirna,kerrie,venus,felicita,cristy,carmelita,berniece,annemarie,tiara,roseanne,missy,cori,roxana,pricilla,kristal,jung,elyse,haydee,aletha,bettina,marge,gillian,filomena,zenaida,harriette,caridad,vada,una,aretha,pearline,marjory,marcela,flor,evette,elouise,alina,damaris,catharine,belva,nakia,marlena,luanne,lorine,karon,dorene,danita,brenna,tatiana,louann,julianna,andria,philomena,lucila,leonora,dovie,romona,mimi,jacquelin,gaye,tonja,misti,chastity,stacia,roxann,micaela,nikita,mei,velda,marlys,johnna,aura,ivonne,hayley,nicki,majorie,herlinda,yadira,perla,gregoria,antonette,shelli,mozelle,mariah,joelle,cordelia,josette,chiquita,trista,laquita,georgiana,candi,shanon,hildegard,valentina,stephany,magda,karol,gabriella,tiana,roma,richelle,oleta,jacque,idella,alaina,suzanna,jovita,tosha,nereida,marlyn,kyla,delfina,tena,stephenie,sabina,nathalie,marcelle,gertie,darleen,thea,sharonda,shantel,belen,venessa,rosalina,ona,genoveva,clementine,rosalba,renate,renata,georgianna,floy,dorcas,ariana,tyra,theda,mariam,juli,jesica,vikki,verla,roselyn,melvina,jannette,ginny,debrah,corrie,asia,violeta,myrtis,latricia,collette,charleen,anissa,viviana,twyla,nedra,latonia,lan,hellen,fabiola,annamarie,adell,sharyn,chantal,niki,maud,lizette,lindy,kia,kesha,jeana,danelle,charline,chanel,valorie,lia,dortha,cristal,leone,leilani,gerri,debi,andra,keshia,ima,eulalia,easter,dulce,natividad,linnie,kami,georgie,catina,brook,alda,winnifred,sharla,ruthann,meaghan,magdalene,lissette,adelaida,venita,trena,shirlene,shameka,elizebeth,dian,shanta,latosha,carlotta,windy,rosina,mariann,leisa,jonnie,dawna,cathie,astrid,laureen,janeen,holli,fawn,vickey,teressa,shante,rubye,marcelina,chanda,terese,scarlett,marnie,lulu,lisette,jeniffer,elenor,dorinda,donita,carman,bernita,altagracia,aleta,adrianna,zoraida,nicola,lyndsey,janina,ami,starla,phylis,phuong,kyra,charisse,blanch,sanjuanita,rona,nanci,marilee,maranda,brigette,sanjuana,marita,kassandra,joycelyn,felipa,chelsie,bonny,mireya,lorenza,kyong,ileana,candelaria,sherie,lucie,leatrice,lakeshia,gerda,edie,bambi,marylin,lavon,hortense,garnet,evie,tressa,shayna,lavina,kyung,jeanetta,sherrill,shara,phyliss,mittie,anabel,alesia,thuy,tawanda,joanie,tiffanie,lashanda,karissa,enriqueta,daria,daniella,corinna,alanna,abbey,roxane,roseanna,magnolia,lida,joellen,era,coral,carleen,tresa,peggie,novella,nila,maybelle,jenelle,carina,nova,melina,marquerite,margarette,josephina,evonne,cinthia,albina,toya,tawnya,sherita,myriam,lizabeth,lise,keely,jenni,giselle,cheryle,ardith,ardis,alesha,adriane,shaina,linnea,karolyn,felisha,dori,darci,artie,armida,zola,xiomara,vergie,shamika,nena,nannette,maxie,lovie,jeane,jaimie,inge,farrah,elaina,caitlyn,felicitas,cherly,caryl,yolonda,yasmin,teena,prudence,pennie,nydia,mackenzie,orpha,marvel,lizbeth,laurette,jerrie,hermelinda,carolee,tierra,mirian,meta,melony,kori,jennette,jamila,ena,anh,yoshiko,susannah,salina,rhiannon,joleen,cristine,ashton,aracely,tomeka,shalonda,marti,lacie,kala,jada,ilse,hailey,brittani,zona,syble,sherryl,nidia,marlo,kandice,kandi,deb,alycia,ronna,norene,mercy,ingeborg,giovanna,gemma,christel,audry,zora,vita,trish,stephaine,shirlee,shanika,melonie,mazie,jazmin,inga,hoa,hettie,geralyn,fonda,estrella,adella,sarita,rina,milissa,maribeth,golda,evon,ethelyn,enedina,cherise,chana,velva,tawanna,sade,mirta,karie,jacinta,elna,davina,cierra,ashlie,albertha,tanesha,nelle,mindi,lorinda,larue,florene,demetra,dedra,ciara,chantelle,ashly,suzy,rosalva,noelia,lyda,leatha,krystyna,kristan,karri,darline,darcie,cinda,cherrie,awilda,almeda,rolanda,lanette,jerilyn,gisele,evalyn,cyndi,cleta,carin,zina,zena,velia,tanika,charissa,talia,margarete,lavonda,kaylee,kathlene,jonna,irena,ilona,idalia,candis,candance,brandee,anitra,alida,sigrid,nicolette,maryjo,linette,hedwig,christiana,alexia,tressie,modesta,lupita,lita,gladis,evelia,davida,cherri,cecily,ashely,annabel,agustina,wanita,shirly,rosaura,hulda,eun,yetta,verona,thomasina,sibyl,shannan,mechelle,lue,leandra,lani,kylee,kandy,jolynn,ferne,eboni,corene,alysia,zula,nada,moira,lyndsay,lorretta,jammie,hortensia,gaynell,adria,vina,vicenta,tangela,stephine,norine,nella,liana,leslee,kimberely,iliana,glory,felica,emogene,elfriede,eden,eartha,carma,bea,ocie,lennie,kiara,jacalyn,carlota,arielle,otilia,kirstin,kacey,johnetta,joetta,jeraldine,jaunita,elana,dorthea,cami,amada,adelia,vernita,tamar,siobhan,renea,rashida,ouida,nilsa,meryl,kristyn,julieta,danica,breanne,aurea,anglea,sherron,odette,malia,lorelei,leesa,kenna,kathlyn,fiona,charlette,suzie,shantell,sabra,racquel,myong,mira,martine,lucienne,lavada,juliann,elvera,delphia,christiane,charolette,carri,asha,angella,paola,ninfa,leda,lai,eda,stefani,shanell,palma,machelle,lissa,kecia,kathryne,karlene,julissa,jettie,jenniffer,hui,corrina,carolann,alena,rosaria,myrtice,marylee,liane,kenyatta,judie,janey,elmira,eldora,denna,cristi,cathi,zaida,vonnie,viva,vernie,rosaline,mariela,luciana,lesli,karan,felice,deneen,adina,wynona,tarsha,sheron,shanita,shani,shandra,randa,pinkie,nelida,marilou,lyla,laurene,laci,joi,janene,dorotha,daniele,dani,carolynn,carlyn,berenice,ayesha,anneliese,alethea,thersa,tamiko,rufina,oliva,mozell,marylyn,kristian,kathyrn,kasandra,kandace,janae,domenica,debbra,dannielle,arcelia,aja,zenobia,sharen,sharee,lavinia,kum,kacie,jackeline,huong,felisa,emelia,eleanora,cythia,cristin,claribel,anastacia,zulma,zandra,yoko,tenisha,susann,sherilyn,shay,shawanda,romana,mathilda,linsey,keiko,joana,isela,gretta,georgetta,eugenie,desirae,delora,corazon,antonina,anika,willene,tracee,tamatha,nichelle,mickie,maegan,luana,lanita,kelsie,edelmira,bree,afton,teodora,tamie,shena,meg,linh,keli,kaci,danyelle,arlette,albertine,adelle,tiffiny,simona,nicolasa,nichol,nia,nakisha,mee,maira,loreen,kizzy,fallon,christene,bobbye,vincenza,tanja,rubie,roni,queenie,margarett,kimberli,irmgard,idell,hilma,evelina,esta,emilee,dennise,dania,carie,wai,risa,rikki,particia,mui,masako,luvenia,loree,loni,lien,gigi,florencia,denita,billye,tomika,sharita,rana,nikole,neoma,margarite,madalyn,lucina,laila,kali,jenette,gabriele,evelyne,elenora,clementina,alejandrina,zulema,violette,vannessa,thresa,retta,pia,patience,noella,nickie,jonell,chaya,camelia,bethel,anya,suzann,shu,mila,lilla,laverna,keesha,kattie,georgene,eveline,estell,elizbeth,vivienne,vallie,trudie,stephane,magaly,madie,kenyetta,karren,janetta,hermine,drucilla,debbi,celestina,candie,britni,beckie,amina,zita,yun,yolande,vivien,vernetta,trudi,sommer,pearle,patrina,ossie,nicolle,loyce,letty,larisa,katharina,joselyn,jonelle,jenell,iesha,heide,florinda,florentina,flo,elodia,dorine,brunilda,brigid,ashli,ardella,twana,thu,tarah,shavon,serina,rayna,ramonita,nga,margurite,lucrecia,kourtney,kati,jesenia,crista,ayana,alica,alia,vinnie,suellen,romelia,rachell,olympia,michiko,kathaleen,jolie,jessi,janessa,hana,elease,carletta,britany,shona,salome,rosamond,regena,raina,ngoc,nelia,louvenia,lesia,latrina,laticia,larhonda,jina,jacki,emmy,deeann,coretta,arnetta,thalia,shanice,neta,mikki,micki,lonna,leana,lashunda,kiley,joye,jacqulyn,ignacia,hyun,hiroko,henriette,elayne,delinda,dahlia,coreen,consuela,conchita,celine,babette,ayanna,anette,albertina,shawnee,shaneka,quiana,pamelia,min,merri,merlene,margit,kiesha,kiera,kaylene,jodee,jenise,erlene,emmie,dalila,daisey,casie,belia,babara,versie,vanesa,shelba,shawnda,nikia,naoma,marna,margeret,madaline,lawana,kindra,jutta,jazmine,janett,hannelore,glendora,gertrud,garnett,freeda,frederica,florance,flavia,carline,beverlee,anjanette,valda,tamala,shonna,sha,sarina,oneida,merilyn,marleen,lurline,lenna,katherin,jin,jeni,hae,gracia,glady,farah,enola,ema,dominque,devona,delana,cecila,caprice,alysha,alethia,vena,theresia,tawny,shakira,samara,sachiko,rachele,pamella,marni,mariel,maren,malisa,ligia,lera,latoria,larae,kimber,kathern,karey,jennefer,janeth,halina,fredia,delisa,debroah,ciera,angelika,andree,altha,yen,vivan,terresa,tanna,suk,sudie,soo,signe,salena,ronni,rebbecca,myrtie,malika,maida,loan,leonarda,kayleigh,ethyl,ellyn,dayle,cammie,brittni,birgit,avelina,asuncion,arianna,akiko,venice,tyesha,tonie,tiesha,takisha,steffanie,sindy,meghann,manda,macie,kellye,kellee,joslyn,inger,indira,glinda,glennis,fernanda,faustina,eneida,elicia,dot,digna,dell,arletta,willia,tammara,tabetha,sherrell,sari,rebbeca,pauletta,natosha,nakita,mammie,kenisha,kazuko,kassie,earlean,daphine,corliss,clotilde,carolyne,bernetta,augustina,audrea,annis,annabell,yan,tennille,tamica,selene,rosana,regenia,qiana,markita,macy,leeanne,laurine,kym,jessenia,janita,georgine,genie,emiko,elvie,deandra,dagmar,corie,collen,cherish,romaine,porsha,pearlene,micheline,merna,margorie,margaretta,lore,jenine,hermina,fredericka,elke,drusilla,dorathy,dione,celena,brigida,angeles,allegra,tamekia,synthia,sook,slyvia,rosann,reatha,raye,marquetta,margart,layla,kymberly,kiana,kayleen,katlyn,karmen,joella,irina,emelda,eleni,detra,clemmie,cheryll,chantell,cathey,arnita,arla,angle,angelic,alyse,zofia,thomasine,tennie,sherly,sherley,sharyl,remedios,petrina,nickole,myung,myrle,mozella,louanne,lisha,latia,krysta,julienne,jeanene,jacqualine,isaura,gwenda,earleen,cleopatra,carlie,audie,antonietta,alise,verdell,tomoko,thao,talisha,shemika,savanna,santina,rosia,raeann,odilia,nana,minna,magan,lynelle,karma,joeann,ivana,inell,ilana,hye,hee,gudrun,dreama,crissy,chante,carmelina,arvilla,annamae,alvera,aleida,yanira,vanda,tianna,tam,stefania,shira,nicol,nancie,monserrate,melynda,melany,lovella,laure,kacy,jacquelynn,hyon,gertha,eliana,christena,christeen,charise,caterina,carley,candyce,arlena,ammie,willette,vanita,tuyet,syreeta,penney,nyla,maryam,marya,magen,ludie,loma,livia,lanell,kimberlie,julee,donetta,diedra,denisha,deane,dawne,clarine,cherryl,bronwyn,alla,valery,tonda,sueann,soraya,shoshana,shela,sharleen,shanelle,nerissa,meridith,mellie,maye,maple,magaret,lili,leonila,leonie,leeanna,lavonia,lavera,kristel,kathey,kathe,jann,ilda,hildred,hildegarde,genia,fumiko,evelin,ermelinda,elly,dung,doloris,dionna,danae,berneice,annice,alix,verena,verdie,shawnna,shawana,shaunna,rozella,randee,ranae,milagro,lynell,luise,loida,lisbeth,karleen,junita,jona,isis,hyacinth,hedy,gwenn,ethelene,erline,donya,domonique,delicia,dannette,cicely,branda,blythe,bethann,ashlyn,annalee,alline,yuko,vella,trang,towanda,tesha,sherlyn,narcisa,miguelina,meri,maybell,marlana,marguerita,madlyn,lory,loriann,leonore,leighann,laurice,latesha,laronda,katrice,kasie,kaley,jadwiga,glennie,gearldine,francina,epifania,dyan,dorie,diedre,denese,demetrice,delena,cristie,cleora,catarina,carisa,barbera,almeta,trula,tereasa,solange,sheilah,shavonne,sanora,rochell,mathilde,margareta,maia,lynsey,lawanna,launa,kena,keena,katia,glynda,gaylene,elvina,elanor,danuta,danika,cristen,cordie,coletta,clarita,carmon,brynn,azucena,aundrea,angele,verlie,verlene,tamesha,silvana,sebrina,samira,reda,raylene,penni,norah,noma,mireille,melissia,maryalice,laraine,kimbery,karyl,karine,kam,jolanda,johana,jesusa,jaleesa,jacquelyne,iluminada,hilaria,hanh,gennie,francie,floretta,exie,edda,drema,delpha,bev,barbar,assunta,ardell,annalisa,alisia,yukiko,yolando,wonda,wei,waltraud,veta,temeka,tameika,shirleen,shenita,piedad,ozella,mirtha,marilu,kimiko,juliane,jenice,janay,jacquiline,hilde,fae,elois,echo,devorah,chau,brinda,betsey,arminda,aracelis,apryl,annett,alishia,veola,usha,toshiko,theola,tashia,talitha,shery,renetta,reiko,rasheeda,obdulia,mika,melaine,meggan,marlen,marget,marceline,mana,magdalen,librada,lezlie,latashia,lasandra,kelle,isidra,isa,inocencia,gwyn,francoise,erminia,erinn,dimple,devora,criselda,armanda,arie,ariane,angelena,aliza,adriene,adaline,xochitl,twanna,tomiko,tamisha,taisha,susy,siu,rutha,rhona,noriko,natashia,merrie,marinda,mariko,margert,loris,lizzette,leisha,kaila,joannie,jerrica,jene,jannet,janee,jacinda,herta,elenore,doretta,delaine,daniell,claudie,britta,apolonia,amberly,alease,yuri,yuk,wen,waneta,ute,tomi,sharri,sandie,roselle,reynalda,raguel,phylicia,patria,olimpia,odelia,mitzie,minda,mignon,mica,mendy,marivel,maile,lynetta,lavette,lauryn,latrisha,lakiesha,kiersten,kary,josphine,jolyn,jetta,janise,jacquie,ivelisse,glynis,gianna,gaynelle,danyell,danille,dacia,coralee,cher,ceola,arianne,aleshia,yung,williemae,trinh,thora,tai,svetlana,sherika,shemeka,shaunda,roseline,ricki,melda,mallie,lavonna,latina,laquanda,lala,lachelle,klara,kandis,johna,jeanmarie,jaye,grayce,gertude,emerita,ebonie,clorinda,ching,chery,carola,breann,blossom,bernardine,becki,arletha,argelia,ara,alita,yulanda,yon,yessenia,tobi,tasia,sylvie,shirl,shirely,shella,shantelle,sacha,rebecka,providencia,paulene,misha,miki,marline,marica,lorita,latoyia,lasonya,kerstin,kenda,keitha,kathrin,jaymie,gricelda,ginette,eryn,elina,elfrieda,danyel,cheree,chanelle,barrie,aurore,annamaria,alleen,ailene,aide,yasmine,vashti,treasa,tiffaney,sheryll,sharie,shanae,sau,raisa,neda,mitsuko,mirella,milda,maryanna,maragret,mabelle,luetta,lorina,letisha,latarsha,lanelle,lajuana,krissy,karly,karena,jessika,jerica,jeanelle,jalisa,jacelyn,izola,euna,etha,domitila,dominica,daina,creola,carli,camie,brittny,ashanti,anisha,aleen,adah,yasuko,valrie,tona,tinisha,thi,terisa,taneka,simonne,shalanda,serita,ressie,refugia,olene,margherita,mandie,maire,lyndia,luci,lorriane,loreta,leonia,lavona,lashawnda,lakia,kyoko,krystina,krysten,kenia,kelsi,jeanice,isobel,georgiann,genny,felicidad,eilene,deloise,conception,clora,cherilyn,calandra,armandina,anisa,ula,tiera,theressa,stephania,sima,shyla,shonta,shera,shaquita,shala,rossana,nohemi,nery,moriah,melita,melida,melani,marylynn,marisha,mariette,malorie,madelene,ludivina,loria,lorette,loralee,lianne,lavenia,laurinda,lashon,kit,kimi,keila,katelynn,kai,jone,joane,jayna,janella,hue,hertha,francene,elinore,despina,delsie,deedra,clemencia,carolin,bulah,brittanie,bok,blondell,bibi,beaulah,beata,annita,agripina,virgen,valene,twanda,tommye,toi,tarra,tari,tammera,shakia,sadye,ruthanne,rochel,rivka,pura,nenita,natisha,merrilee,melodee,marvis,lucilla,leena,laveta,larita,lanie,keren,ileen,georgeann,genna,frida,ewa,eufemia,emely,ela,edyth,deonna,deadra,darlena,chanell,cathern,cassondra,cassaundra,bernarda,berna,arlinda,anamaria,vertie,valeri,torri,tatyana,stasia,sherise,sherill,sanda,ruthe,rosy,robbi,ranee,quyen,pearly,palmira,onita,nisha,niesha,nida,nam,merlyn,mayola,marylouise,marth,margene,madelaine,londa,leontine,leoma,leia,lauralee,lanora,lakita,kiyoko,keturah,katelin,kareen,jonie,johnette,jenee,jeanett,izetta,hiedi,heike,hassie,giuseppina,georgann,fidela,fernande,elwanda,ellamae,eliz,dusti,dotty,cyndy,coralie,celesta,argentina,alverta,xenia,wava,vanetta,torrie,tashina,tandy,tambra,tama,stepanie,shila,shaunta,sharan,shaniqua,shae,setsuko,serafina,sandee,rosamaria,priscila,olinda,nadene,muoi,michelina,mercedez,maryrose,marcene,mao,magali,mafalda,lannie,kayce,karoline,kamilah,kamala,justa,joline,jennine,jacquetta,iraida,georgeanna,franchesca,emeline,elane,ehtel,earlie,dulcie,dalene,classie,chere,charis,caroyln,carmina,carita,bethanie,ayako,arica,alysa,alessandra,akilah,adrien,zetta,youlanda,yelena,yahaira,wendolyn,tijuana,terina,teresia,suzi,sherell,shavonda,shaunte,sharda,shakita,sena,ryann,rubi,riva,reginia,rachal,parthenia,pamula,monnie,monet,michaele,melia,malka,maisha,lisandra,lekisha,lean,lakendra,krystin,kortney,kizzie,kittie,kera,kendal,kemberly,kanisha,julene,jule,johanne,jamee,halley,gidget,galina,fredricka,fleta,fatimah,eusebia,elza,eleonore,dorthey,doria,donella,dinorah,delorse,claretha,christinia,charlyn,bong,belkis,azzie,andera,aiko,adena,yer,yajaira,wan,vania,ulrike,toshia,tifany,stefany,shizue,shenika,shawanna,sharolyn,sharilyn,shaquana,shantay,rozanne,roselee,remona,reanna,raelene,phung,petronila,natacha,nancey,myrl,miyoko,miesha,merideth,marvella,marquitta,marhta,marchelle,lizeth,libbie,lahoma,ladawn,kina,katheleen,katharyn,karisa,kaleigh,junie,julieann,johnsie,janean,jaimee,jackqueline,hisako,herma,helaine,gwyneth,gita,eustolia,emelina,elin,edris,donnette,donnetta,dierdre,denae,darcel,clarisa,cinderella,chia,charlesetta,charita,celsa,cassy,cassi,carlee,bruna,brittaney,brande,billi,bao,antonetta,angla,angelyn,analisa,alane,wenona,wendie,veronique,vannesa,tobie,tempie,sumiko,sulema,sparkle,somer,sheba,sharice,shanel,shalon,rosio,roselia,renay,rema,reena,ozie,oretha,oralee,oda,ngan,nakesha,milly,marybelle,margrett,maragaret,manie,lurlene,lillia,lieselotte,lavelle,lashaunda,lakeesha,kaycee,kalyn,joya,joette,jenae,janiece,illa,grisel,glayds,genevie,gala,fredda,eleonor,debera,deandrea,corrinne,cordia,contessa,colene,cleotilde,chantay,cecille,beatris,azalee,arlean,ardath,anjelica,anja,alfredia,aleisha,zada,yuonne,willodean,vennie,vanna,tyisha,tova,torie,tonisha,tilda,tien,sirena,sherril,shanti,senaida,samella,robbyn,renda,reita,phebe,paulita,nobuko,nguyet,neomi,mikaela,melania,maximina,marg,maisie,lynna,lilli,lashaun,lakenya,lael,kirstie,kathline,kasha,karlyn,karima,jovan,josefine,jennell,jacqui,jackelyn,hyo,hien,grazyna,florrie,floria,eleonora,dwana,dorla,delmy,deja,dede,dann,crysta,clelia,claris,chieko,cherlyn,cherelle,charmain,chara,cammy,bee,arnette,ardelle,annika,amiee,amee,allena,yvone,yuki,yoshie,yevette,yael,willetta,voncile,venetta,tula,tonette,timika,temika,telma,teisha,taren,stacee,shawnta,saturnina,ricarda,pok,pasty,onie,nubia,marielle,mariella,marianela,mardell,luanna,loise,lisabeth,lindsy,lilliana,lilliam,lelah,leigha,leanora,kristeen,khalilah,keeley,kandra,junko,joaquina,jerlene,jani,jamika,hsiu,hermila,genevive,evia,eugena,emmaline,elfreda,elene,donette,delcie,deeanna,darcey,cuc,clarinda,cira,chae,celinda,catheryn,casimira,carmelia,camellia,breana,bobette,bernardina,bebe,basilia,arlyne,amal,alayna,zonia,zenia,yuriko,yaeko,wynell,willena,vernia,tora,terrilyn,terica,tenesha,tawna,tajuana,taina,stephnie,sona,sina,shondra,shizuko,sherlene,sherice,sharika,rossie,rosena,rima,ria,rheba,renna,natalya,nancee,melodi,meda,matha,marketta,maricruz,marcelene,malvina,luba,louetta,leida,lecia,lauran,lashawna,laine,khadijah,katerine,kasi,kallie,julietta,jesusita,jestine,jessia,jeffie,janyce,isadora,georgianne,fidelia,evita,eura,eulah,estefana,elsy,eladia,dodie,dia,denisse,deloras,delila,daysi,crystle,concha,claretta,charlsie,charlena,carylon,bettyann,asley,ashlea,amira,agueda,agnus,yuette,vinita,victorina,tynisha,treena,toccara,tish,thomasena,tegan,soila,shenna,sharmaine,shantae,shandi,september,saran,sarai,sana,rosette,rolande,regine,otelia,olevia,nicholle,necole,naida,myrta,myesha,mitsue,minta,mertie,margy,mahalia,madalene,loura,lorean,lesha,leonida,lenita,lavone,lashell,lashandra,lamonica,kimbra,katherina,karry,kanesha,jong,jeneva,jaquelyn,hwa,gilma,ghislaine,gertrudis,fransisca,fermina,ettie,etsuko,ellan,elidia,edra,dorethea,doreatha,denyse,deetta,daine,cyrstal,corrin,cayla,carlita,camila,burma,bula,buena,barabara,avril,alaine,zana,wilhemina,wanetta,veronika,verline,vasiliki,tonita,tisa,teofila,tayna,taunya,tandra,takako,sunni,suanne,sixta,sharell,seema,rosenda,robena,raymonde,pei,pamila,ozell,neida,mistie,micha,merissa,maurita,maryln,maryetta,marcell,malena,makeda,lovetta,lourie,lorrine,lorilee,laurena,lashay,larraine,laree,lacresha,kristle,krishna,keva,keira,karole,joie,jinny,jeannetta,jama,heidy,gilberte,gema,faviola,evelynn,enda,elli,ellena,divina,dagny,collene,codi,cindie,chassidy,chasidy,catrice,catherina,cassey,caroll,carlena,candra,calista,bryanna,britteny,beula,bari,audrie,audria,ardelia,annelle,angila,alona,allyn".split(","))),
+r("surnames",q("smith,johnson,williams,jones,brown,davis,miller,wilson,moore,taylor,anderson,jackson,white,harris,martin,thompson,garcia,martinez,robinson,clark,rodriguez,lewis,lee,walker,hall,allen,young,hernandez,king,wright,lopez,hill,green,adams,baker,gonzalez,nelson,carter,mitchell,perez,roberts,turner,phillips,campbell,parker,evans,edwards,collins,stewart,sanchez,morris,rogers,reed,cook,morgan,bell,murphy,bailey,rivera,cooper,richardson,cox,howard,ward,torres,peterson,gray,ramirez,watson,brooks,sanders,price,bennett,wood,barnes,ross,henderson,coleman,jenkins,perry,powell,long,patterson,hughes,flores,washington,butler,simmons,foster,gonzales,bryant,alexander,griffin,diaz,hayes,myers,ford,hamilton,graham,sullivan,wallace,woods,cole,west,owens,reynolds,fisher,ellis,harrison,gibson,mcdonald,cruz,marshall,ortiz,gomez,murray,freeman,wells,webb,simpson,stevens,tucker,porter,hicks,crawford,boyd,mason,morales,kennedy,warren,dixon,ramos,reyes,burns,gordon,shaw,holmes,rice,robertson,hunt,daniels,palmer,mills,nichols,grant,ferguson,stone,hawkins,dunn,perkins,hudson,spencer,gardner,stephens,payne,pierce,berry,matthews,arnold,wagner,willis,watkins,olson,carroll,duncan,snyder,hart,cunningham,lane,andrews,ruiz,harper,fox,riley,armstrong,carpenter,weaver,greene,elliott,chavez,sims,peters,kelley,franklin,lawson,fields,gutierrez,schmidt,carr,vasquez,castillo,wheeler,chapman,oliver,montgomery,richards,williamson,johnston,banks,meyer,bishop,mccoy,howell,alvarez,morrison,hansen,fernandez,garza,burton,nguyen,jacobs,reid,fuller,lynch,garrett,romero,welch,larson,frazier,burke,hanson,mendoza,moreno,bowman,medina,fowler,brewer,hoffman,carlson,silva,pearson,holland,fleming,jensen,vargas,byrd,davidson,hopkins,may,herrera,wade,soto,walters,neal,caldwell,lowe,jennings,barnett,graves,jimenez,horton,shelton,barrett,obrien,castro,sutton,mckinney,lucas,miles,rodriquez,chambers,holt,lambert,fletcher,watts,bates,hale,rhodes,pena,beck,newman,haynes,mcdaniel,mendez,bush,vaughn,parks,dawson,santiago,norris,hardy,steele,curry,powers,schultz,barker,guzman,page,munoz,ball,keller,chandler,weber,walsh,lyons,ramsey,wolfe,schneider,mullins,benson,sharp,bowen,barber,cummings,hines,baldwin,griffith,valdez,hubbard,salazar,reeves,warner,stevenson,burgess,santos,tate,cross,garner,mann,mack,moss,thornton,mcgee,farmer,delgado,aguilar,vega,glover,manning,cohen,harmon,rodgers,robbins,newton,blair,higgins,ingram,reese,cannon,strickland,townsend,potter,goodwin,walton,rowe,hampton,ortega,patton,swanson,goodman,maldonado,yates,becker,erickson,hodges,rios,conner,adkins,webster,malone,hammond,flowers,cobb,moody,quinn,pope,osborne,mccarthy,guerrero,estrada,sandoval,gibbs,gross,fitzgerald,stokes,doyle,saunders,wise,colon,gill,alvarado,greer,padilla,waters,nunez,ballard,schwartz,mcbride,houston,christensen,klein,pratt,briggs,parsons,mclaughlin,zimmerman,french,buchanan,moran,copeland,pittman,brady,mccormick,holloway,brock,poole,logan,bass,marsh,drake,wong,jefferson,park,morton,abbott,sparks,norton,huff,massey,figueroa,carson,bowers,roberson,barton,tran,lamb,harrington,boone,cortez,clarke,mathis,singleton,wilkins,cain,underwood,hogan,mckenzie,collier,luna,phelps,mcguire,bridges,wilkerson,nash,summers,atkins,wilcox,pitts,conley,marquez,burnett,cochran,chase,davenport,hood,gates,ayala,sawyer,vazquez,dickerson,hodge,acosta,flynn,espinoza,nicholson,monroe,morrow,whitaker,oconnor,skinner,ware,molina,kirby,huffman,gilmore,dominguez,oneal,lang,combs,kramer,hancock,gallagher,gaines,shaffer,short,wiggins,mathews,mcclain,fischer,wall,small,melton,hensley,bond,dyer,grimes,contreras,wyatt,baxter,snow,mosley,shepherd,larsen,hoover,beasley,petersen,whitehead,meyers,garrison,shields,horn,savage,olsen,schroeder,hartman,woodard,mueller,kemp,deleon,booth,patel,calhoun,wiley,eaton,cline,navarro,harrell,humphrey,parrish,duran,hutchinson,hess,dorsey,bullock,robles,beard,dalton,avila,rich,blackwell,york,johns,blankenship,trevino,salinas,campos,pruitt,callahan,montoya,hardin,guerra,mcdowell,stafford,gallegos,henson,wilkinson,booker,merritt,atkinson,orr,decker,hobbs,tanner,knox,pacheco,stephenson,glass,rojas,serrano,marks,hickman,english,sweeney,strong,mcclure,conway,roth,maynard,farrell,lowery,hurst,nixon,weiss,trujillo,ellison,sloan,juarez,winters,mclean,boyer,villarreal,mccall,gentry,carrillo,ayers,lara,sexton,pace,hull,leblanc,browning,velasquez,leach,chang,sellers,herring,noble,foley,bartlett,mercado,landry,durham,walls,barr,mckee,bauer,rivers,bradshaw,pugh,velez,rush,estes,dodson,morse,sheppard,weeks,camacho,bean,barron,livingston,middleton,spears,branch,blevins,chen,kerr,mcconnell,hatfield,harding,solis,frost,giles,blackburn,pennington,woodward,finley,mcintosh,koch,mccullough,blanchard,rivas,brennan,mejia,kane,benton,buckley,valentine,maddox,russo,mcknight,buck,moon,mcmillan,crosby,berg,dotson,mays,roach,church,chan,richmond,meadows,faulkner,oneill,knapp,kline,ochoa,jacobson,gay,hendricks,horne,shepard,hebert,cardenas,mcintyre,waller,holman,donaldson,cantu,morin,gillespie,fuentes,tillman,bentley,peck,key,salas,rollins,gamble,dickson,battle,santana,cabrera,cervantes,howe,hinton,hurley,spence,zamora,yang,mcneil,suarez,petty,gould,mcfarland,sampson,carver,bray,macdonald,stout,hester,melendez,dillon,farley,hopper,galloway,potts,joyner,stein,aguirre,osborn,mercer,bender,franco,rowland,sykes,pickett,sears,mayo,dunlap,hayden,wilder,mckay,coffey,mccarty,ewing,cooley,vaughan,bonner,cotton,holder,stark,ferrell,cantrell,fulton,lott,calderon,pollard,hooper,burch,mullen,fry,riddle,levy,odonnell,britt,daugherty,berger,dillard,alston,frye,riggs,chaney,odom,duffy,fitzpatrick,valenzuela,mayer,alford,mcpherson,acevedo,barrera,cote,reilly,compton,mooney,mcgowan,craft,clemons,wynn,nielsen,baird,stanton,snider,rosales,bright,witt,hays,holden,rutledge,kinney,clements,castaneda,slater,hahn,burks,delaney,pate,lancaster,sharpe,whitfield,talley,macias,burris,ratliff,mccray,madden,kaufman,goff,cash,bolton,mcfadden,levine,byers,kirkland,kidd,workman,carney,mcleod,holcomb,england,finch,sosa,haney,franks,sargent,nieves,downs,rasmussen,bird,hewitt,foreman,valencia,oneil,delacruz,vinson,dejesus,hyde,forbes,gilliam,guthrie,wooten,huber,barlow,boyle,mcmahon,buckner,rocha,puckett,langley,knowles,cooke,velazquez,whitley,vang,shea,rouse,hartley,mayfield,elder,rankin,hanna,cowan,lucero,arroyo,slaughter,haas,oconnell,minor,boucher,archer,boggs,dougherty,andersen,newell,crowe,wang,friedman,bland,swain,holley,pearce,childs,yarbrough,galvan,proctor,meeks,lozano,mora,rangel,bacon,villanueva,schaefer,rosado,helms,boyce,goss,stinson,lake,ibarra,hutchins,covington,crowley,hatcher,mackey,bunch,womack,polk,dodd,childress,childers,camp,villa,dye,springer,mahoney,dailey,belcher,lockhart,griggs,costa,brandt,walden,moser,tatum,mccann,akers,lutz,pryor,orozco,mcallister,lugo,davies,shoemaker,rutherford,newsome,magee,chamberlain,blanton,simms,godfrey,flanagan,crum,cordova,escobar,downing,sinclair,donahue,krueger,mcginnis,gore,farris,webber,corbett,andrade,starr,lyon,yoder,hastings,mcgrath,spivey,krause,harden,crabtree,kirkpatrick,arrington,ritter,mcghee,bolden,maloney,gagnon,dunbar,ponce,pike,mayes,beatty,mobley,kimball,butts,montes,eldridge,braun,hamm,gibbons,moyer,manley,herron,plummer,elmore,cramer,rucker,pierson,fontenot,field,rubio,goldstein,elkins,wills,novak,hickey,worley,gorman,katz,dickinson,broussard,woodruff,crow,britton,nance,lehman,bingham,zuniga,whaley,shafer,coffman,steward,delarosa,nix,neely,mata,davila,mccabe,kessler,hinkle,welsh,pagan,goldberg,goins,crouch,cuevas,quinones,mcdermott,hendrickson,samuels,denton,bergeron,lam,ivey,locke,haines,snell,hoskins,byrne,arias,roe,corbin,beltran,chappell,downey,dooley,tuttle,couch,payton,mcelroy,crockett,groves,cartwright,dickey,mcgill,dubois,muniz,tolbert,dempsey,cisneros,sewell,latham,vigil,tapia,rainey,norwood,stroud,meade,tipton,kuhn,hilliard,bonilla,teague,gunn,greenwood,correa,reece,poe,pineda,phipps,frey,kaiser,ames,gunter,schmitt,milligan,espinosa,bowden,vickers,lowry,pritchard,costello,piper,mcclellan,lovell,sheehan,hatch,dobson,singh,jeffries,hollingsworth,sorensen,meza,fink,donnelly,burrell,tomlinson,colbert,billings,ritchie,helton,sutherland,peoples,mcqueen,thomason,givens,crocker,vogel,robison,dunham,coker,swartz,keys,ladner,richter,hargrove,edmonds,brantley,albright,murdock,boswell,muller,quintero,padgett,kenney,daly,connolly,inman,quintana,lund,barnard,villegas,simons,land,huggins,tidwell,sanderson,bullard,mcclendon,duarte,draper,marrero,dwyer,abrams,stover,goode,fraser,crews,bernal,godwin,conklin,mcneal,baca,esparza,crowder,bower,brewster,mcneill,rodrigues,leal,coates,raines,mccain,mccord,miner,holbrook,swift,dukes,carlisle,aldridge,ackerman,starks,ricks,holliday,ferris,hairston,sheffield,lange,fountain,doss,betts,kaplan,carmichael,bloom,ruffin,penn,kern,bowles,sizemore,larkin,dupree,seals,metcalf,hutchison,henley,farr,mccauley,hankins,gustafson,curran,ash,waddell,ramey,cates,pollock,cummins,messer,heller,lin,funk,cornett,palacios,galindo,cano,hathaway,singer,pham,enriquez,salgado,pelletier,painter,wiseman,blount,feliciano,temple,houser,doherty,mead,mcgraw,swan,capps,blanco,blackmon,thomson,mcmanus,burkett,post,gleason,ott,dickens,cormier,voss,rushing,rosenberg,hurd,dumas,benitez,arellano,marin,caudill,bragg,jaramillo,huerta,gipson,colvin,biggs,vela,platt,cassidy,tompkins,mccollum,dolan,daley,crump,sneed,kilgore,grove,grimm,davison,brunson,prater,marcum,devine,stratton,rosas,choi,tripp,ledbetter,hightower,feldman,epps,yeager,posey,scruggs,cope,stubbs,richey,overton,trotter,sprague,cordero,butcher,stiles,burgos,woodson,horner,bassett,purcell,haskins,akins,ziegler,spaulding,hadley,grubbs,sumner,murillo,zavala,shook,lockwood,driscoll,dahl,thorpe,redmond,putnam,mcwilliams,mcrae,romano,joiner,sadler,hedrick,hager,hagen,fitch,coulter,thacker,mansfield,langston,guidry,ferreira,corley,conn,rossi,lackey,baez,saenz,mcnamara,mcmullen,mckenna,mcdonough,link,engel,browne,roper,peacock,eubanks,drummond,stringer,pritchett,parham,mims,landers,ham,grayson,schafer,egan,timmons,ohara,keen,hamlin,finn,cortes,mcnair,nadeau,moseley,michaud,rosen,oakes,kurtz,jeffers,calloway,beal,bautista,winn,suggs,stern,stapleton,lyles,laird,montano,dawkins,hagan,goldman,bryson,barajas,lovett,segura,metz,lockett,langford,hinson,eastman,hooks,smallwood,shapiro,crowell,whalen,triplett,chatman,aldrich,cahill,youngblood,ybarra,stallings,sheets,reeder,connelly,bateman,abernathy,winkler,wilkes,masters,hackett,granger,gillis,schmitz,sapp,napier,souza,lanier,gomes,weir,otero,ledford,burroughs,babcock,ventura,siegel,dugan,bledsoe,atwood,wray,varner,spangler,anaya,staley,kraft,fournier,belanger,wolff,thorne,bynum,burnette,boykin,swenson,purvis,pina,khan,duvall,darby,xiong,kauffman,healy,engle,benoit,valle,steiner,spicer,shaver,randle,lundy,dow,chin,calvert,staton,neff,kearney,darden,oakley,medeiros,mccracken,crenshaw,block,perdue,dill,whittaker,tobin,washburn,hogue,goodrich,easley,bravo,dennison,shipley,kerns,jorgensen,crain,villalobos,maurer,longoria,keene,coon,witherspoon,staples,pettit,kincaid,eason,madrid,echols,lusk,stahl,currie,thayer,shultz,mcnally,seay,north,maher,gagne,barrow,nava,moreland,honeycutt,hearn,diggs,caron,whitten,westbrook,stovall,ragland,munson,meier,looney,kimble,jolly,hobson,goddard,culver,burr,presley,negron,connell,tovar,huddleston,ashby,salter,root,pendleton,oleary,nickerson,myrick,judd,jacobsen,bain,adair,starnes,matos,busby,herndon,hanley,bellamy,doty,bartley,yazzie,rowell,parson,gifford,cullen,christiansen,benavides,barnhart,talbot,mock,crandall,connors,bonds,whitt,gage,bergman,arredondo,addison,lujan,dowdy,jernigan,huynh,bouchard,dutton,rhoades,ouellette,kiser,herrington,hare,blackman,babb,allred,rudd,paulson,ogden,koenig,geiger,begay,parra,lassiter,hawk,esposito,cho,waldron,ransom,prather,chacon,vick,sands,roark,parr,mayberry,greenberg,coley,bruner,whitman,skaggs,shipman,leary,hutton,romo,medrano,ladd,kruse,askew,schulz,alfaro,tabor,mohr,gallo,bermudez,pereira,bliss,reaves,flint,comer,woodall,naquin,guevara,delong,carrier,pickens,brand,tilley,schaffer,lim,knutson,fenton,doran,chu,vogt,vann,prescott,mclain,landis,corcoran,zapata,hyatt,hemphill,faulk,dove,boudreaux,aragon,whitlock,trejo,tackett,shearer,saldana,hanks,mckinnon,koehler,bourgeois,keyes,goodson,foote,lunsford,goldsmith,flood,winslow,sams,reagan,mccloud,hough,esquivel,naylor,loomis,coronado,ludwig,braswell,bearden,fagan,ezell,edmondson,cyr,cronin,nunn,lemon,guillory,grier,dubose,traylor,ryder,dobbins,coyle,aponte,whitmore,smalls,rowan,malloy,cardona,braxton,borden,humphries,carrasco,ruff,metzger,huntley,hinojosa,finney,madsen,hills,ernst,dozier,burkhart,bowser,peralta,daigle,whittington,sorenson,saucedo,roche,redding,fugate,avalos,waite,lind,huston,hay,hawthorne,hamby,boyles,boles,regan,faust,crook,beam,barger,hinds,gallardo,willoughby,willingham,eckert,busch,zepeda,worthington,tinsley,hoff,hawley,carmona,varela,rector,newcomb,kinsey,dube,whatley,ragsdale,bernstein,becerra,yost,mattson,felder,cheek,handy,grossman,gauthier,escobedo,braden,beckman,mott,hillman,flaherty,dykes,doe,stockton,stearns,lofton,coats,cavazos,beavers,barrios,parish,mosher,cardwell,coles,burnham,weller,lemons,beebe,aguilera,parnell,harman,couture,alley,schumacher,redd,dobbs,blum,blalock,merchant,ennis,denson,cottrell,brannon,bagley,aviles,watt,sousa,rosenthal,rooney,dietz,blank,paquette,mcclelland,duff,velasco,lentz,grubb,burrows,barbour,ulrich,shockley,rader,beyer,mixon,layton,altman,weathers,stoner,squires,shipp,priest,lipscomb,cutler,caballero,zimmer,willett,thurston,storey,medley,epperson,shah,mcmillian,baggett,torrez,laws,hirsch,dent,poirier,peachey,farrar,creech,barth,trimble,dupre,albrecht,sample,lawler,crisp,conroy,wetzel,nesbitt,murry,jameson,wilhelm,patten,minton,matson,kimbrough,iverson,guinn,croft,toth,pulliam,nugent,newby,littlejohn,dias,canales,bernier,baron,singletary,renteria,pruett,mchugh,mabry,landrum,brower,stoddard,cagle,stjohn,scales,kohler,kellogg,hopson,gant,tharp,gann,zeigler,pringle,hammons,fairchild,deaton,chavis,carnes,rowley,matlock,kearns,irizarry,carrington,starkey,lopes,jarrell,craven,baum,spain,littlefield,linn,humphreys,etheridge,cuellar,chastain,bundy,speer,skelton,quiroz,pyle,portillo,ponder,moulton,machado,liu,killian,hutson,hitchcock,dowling,cloud,burdick,spann,pedersen,levin,leggett,hayward,hacker,dietrich,beaulieu,barksdale,wakefield,snowden,briscoe,bowie,berman,ogle,mcgregor,laughlin,helm,burden,wheatley,schreiber,pressley,parris,alaniz,agee,urban,swann,snodgrass,schuster,radford,monk,mattingly,harp,girard,cheney,yancey,wagoner,ridley,lombardo,lau,hudgins,gaskins,duckworth,coe,coburn,willey,prado,newberry,magana,hammonds,elam,whipple,slade,serna,ojeda,liles,dorman,diehl,upton,reardon,michaels,goetz,eller,bauman,baer,layne,hummel,brenner,amaya,adamson,ornelas,dowell,cloutier,castellanos,wing,wellman,saylor,orourke,moya,montalvo,kilpatrick,durbin,shell,oldham,garvin,foss,branham,bartholomew,templeton,maguire,holton,rider,monahan,mccormack,beaty,anders,streeter,nieto,nielson,moffett,lankford,keating,heck,gatlin,delatorre,callaway,adcock,worrell,unger,robinette,nowak,jeter,brunner,steen,parrott,overstreet,nobles,montanez,clevenger,brinkley,trahan,quarles,pickering,pederson,jansen,grantham,gilchrist,crespo,aiken,schell,schaeffer,lorenz,leyva,harms,dyson,wallis,pease,leavitt,cavanaugh,batts,warden,seaman,rockwell,quezada,paxton,linder,houck,fontaine,durant,caruso,adler,pimentel,mize,lytle,cleary,cason,acker,switzer,isaacs,higginbotham,han,waterman,vandyke,stamper,sisk,shuler,riddick,mcmahan,levesque,hatton,bronson,bollinger,arnett,okeefe,gerber,gannon,farnsworth,baughman,silverman,satterfield,mccrary,kowalski,grigsby,greco,cabral,trout,rinehart,mahon,linton,gooden,curley,baugh,wyman,weiner,schwab,schuler,morrissey,mahan,bunn,thrasher,spear,waggoner,qualls,purdy,mcwhorter,mauldin,gilman,perryman,newsom,menard,martino,graf,billingsley,artis,simpkins,salisbury,quintanilla,gilliland,fraley,foust,crouse,scarborough,ngo,grissom,fultz,marlow,markham,madrigal,lawton,barfield,whiting,varney,schwarz,gooch,arce,wheat,truong,poulin,hurtado,selby,gaither,fortner,culpepper,coughlin,brinson,boudreau,barkley,bales,stepp,holm,tan,schilling,morrell,kahn,heaton,gamez,causey,turpin,shanks,schrader,meek,isom,hardison,carranza,yanez,scroggins,schofield,runyon,ratcliff,murrell,moeller,irby,currier,butterfield,yee,ralston,pullen,pinson,estep,carbone,hawks,ellington,casillas,spurlock,sikes,motley,mccartney,kruger,isbell,houle,burk,tomlin,quigley,neumann,lovelace,fennell,cheatham,bustamante,skidmore,hidalgo,forman,culp,bowens,betancourt,aquino,robb,rea,milner,martel,gresham,wiles,ricketts,dowd,collazo,bostic,blakely,sherrod,kenyon,gandy,ebert,deloach,allard,sauer,robins,olivares,gillette,chestnut,bourque,paine,hite,hauser,devore,crawley,chapa,talbert,poindexter,meador,mcduffie,mattox,kraus,harkins,choate,wren,sledge,sanborn,kinder,geary,cornwell,barclay,abney,seward,rhoads,howland,fortier,benner,vines,tubbs,troutman,rapp,mccurdy,deluca,westmoreland,havens,guajardo,ely,clary,seal,meehan,herzog,guillen,ashcraft,waugh,renner,milam,elrod,churchill,breaux,bolin,asher,windham,tirado,pemberton,nolen,noland,knott,emmons,cornish,christenson,brownlee,barbee,waldrop,pitt,olvera,lombardi,gruber,gaffney,eggleston,banda,archuleta,slone,prewitt,pfeiffer,nettles,mena,mcadams,henning,gardiner,cromwell,chisholm,burleson,vest,oglesby,mccarter,lumpkin,grey,wofford,vanhorn,thorn,teel,swafford,stclair,stanfield,ocampo,herrmann,hannon,arsenault,roush,mcalister,hiatt,gunderson,forsythe,duggan,delvalle,cintron,wilks,weinstein,uribe,rizzo,noyes,mclendon,gurley,bethea,winstead,maples,guyton,giordano,alderman,valdes,polanco,pappas,lively,grogan,griffiths,arevalo,whitson,sowell,rendon,fernandes,farrow,benavidez,ayres,alicea,stump,smalley,seitz,schulte,gilley,gallant,canfield,wolford,omalley,mcnutt,mcnulty,mcgovern,hardman,harbin,cowart,chavarria,brink,beckett,bagwell,armstead,anglin,abreu,reynoso,krebs,jett,hoffmann,greenfield,forte,burney,broome,sisson,trammell,partridge,mace,lomax,lemieux,gossett,frantz,fogle,cooney,broughton,pence,paulsen,muncy,mcarthur,hollins,beauchamp,withers,osorio,mulligan,hoyle,foy,dockery,cockrell,begley,amador,roby,rains,lindquist,gentile,everhart,bohannon,wylie,sommers,purnell,fortin,dunning,breeden,vail,phelan,phan,marx,cosby,colburn,boling,biddle,ledesma,gaddis,denney,chow,bueno,berrios,wicker,tolliver,thibodeaux,nagle,lavoie,fisk,crist,barbosa,reedy,march,locklear,kolb,himes,behrens,beckwith,weems,wahl,shorter,shackelford,rees,muse,cerda,valadez,thibodeau,saavedra,ridgeway,reiter,mchenry,majors,lachance,keaton,ferrara,clemens,blocker,applegate,paz,needham,mojica,kuykendall,hamel,escamilla,doughty,burchett,ainsworth,vidal,upchurch,thigpen,strauss,spruill,sowers,riggins,ricker,mccombs,harlow,buffington,sotelo,olivas,negrete,morey,macon,logsdon,lapointe,bigelow,bello,westfall,stubblefield,peak,lindley,hein,hawes,farrington,breen,birch,wilde,steed,sepulveda,reinhardt,proffitt,minter,messina,mcnabb,maier,keeler,gamboa,donohue,basham,shinn,crooks,cota,borders,bills,bachman,tisdale,tavares,schmid,pickard,gulley,fonseca,delossantos,condon,batista,wicks,wadsworth,martell,littleton,ison,haag,folsom,brumfield,broyles,brito,mireles,mcdonnell,leclair,hamblin,gough,fanning,binder,winfield,whitworth,soriano,palumbo,newkirk,mangum,hutcherson,comstock,carlin,beall,bair,wendt,watters,walling,putman,otoole,morley,mares,lemus,keener,hundley,dial,damico,billups,strother,mcfarlane,lamm,eaves,crutcher,caraballo,canty,atwell,taft,siler,rust,rawls,rawlings,prieto,mcneely,mcafee,hulsey,hackney,galvez,escalante,delagarza,crider,charlton,bandy,wilbanks,stowe,steinberg,renfro,masterson,massie,lanham,haskell,hamrick,fort,dehart,burdette,branson,bourne,babin,aleman,worthy,tibbs,smoot,slack,paradis,mull,luce,houghton,gantt,furman,danner,christianson,burge,ashford,arndt,almeida,stallworth,shade,searcy,sager,noonan,mclemore,mcintire,maxey,lavigne,jobe,ferrer,falk,coffin,byrnes,aranda,apodaca,stamps,rounds,peek,olmstead,lewandowski,kaminski,dunaway,bruns,brackett,amato,reich,mcclung,lacroix,koontz,herrick,hardesty,flanders,cousins,cato,cade,vickery,shank,nagel,dupuis,croteau,cotter,cable,stuckey,stine,porterfield,pauley,nye,moffitt,knudsen,hardwick,goforth,dupont,blunt,barrows,barnhill,shull,rash,loftis,lemay,kitchens,horvath,grenier,fuchs,fairbanks,culbertson,calkins,burnside,beattie,ashworth,albertson,wertz,vaught,vallejo,turk,tuck,tijerina,sage,peterman,marroquin,marr,lantz,hoang,demarco,daily,cone,berube,barnette,wharton,stinnett,slocum,scanlon,sander,pinto,mancuso,lima,headley,epstein,counts,clarkson,carnahan,boren,arteaga,adame,zook,whittle,whitehurst,wenzel,saxton,reddick,puente,handley,haggerty,earley,devlin,chaffin,cady,acuna,solano,sigler,pollack,pendergrass,ostrander,janes,francois,crutchfield,chamberlin,brubaker,baptiste,willson,reis,neeley,mullin,mercier,lira,layman,keeling,higdon,espinal,chapin,warfield,toledo,pulido,peebles,nagy,montague,mello,lear,jaeger,hogg,graff,furr,soliz,poore,mendenhall,mclaurin,maestas,gable,barraza,tillery,snead,pond,neill,mcculloch,mccorkle,lightfoot,hutchings,holloman,harness,dorn,council,bock,zielinski,turley,treadwell,stpierre,starling,somers,oswald,merrick,easterling,bivens,truitt,poston,parry,ontiveros,olivarez,moreau,medlin,lenz,knowlton,fairley,cobbs,chisolm,bannister,woodworth,toler,ocasio,noriega,neuman,moye,milburn,mcclanahan,lilley,hanes,flannery,dellinger,danielson,conti,blodgett,beers,weatherford,strain,karr,hitt,denham,custer,coble,clough,casteel,bolduc,batchelor,ammons,whitlow,tierney,staten,sibley,seifert,schubert,salcedo,mattison,laney,haggard,grooms,dix,dees,cromer,cooks,colson,caswell,zarate,swisher,shin,ragan,pridgen,mcvey,matheny,lafleur,franz,ferraro,dugger,whiteside,rigsby,mcmurray,lehmann,jacoby,hildebrand,hendrick,headrick,goad,fincher,drury,borges,archibald,albers,woodcock,trapp,soares,seaton,monson,luckett,lindberg,kopp,keeton,hsu,healey,garvey,gaddy,fain,burchfield,wentworth,strand,stack,spooner,saucier,sales,ricci,plunkett,pannell,ness,leger,hoy,freitas,fong,elizondo,duval,beaudoin,urbina,rickard,partin,moe,mcgrew,mcclintock,ledoux,forsyth,faison,devries,bertrand,wasson,tilton,scarbrough,leung,irvine,garber,denning,corral,colley,castleberry,bowlin,bogan,beale,baines,trice,rayburn,parkinson,pak,nunes,mcmillen,leahy,kimmel,higgs,fulmer,carden,bedford,taggart,spearman,register,prichard,morrill,koonce,heinz,hedges,guenther,grice,findley,dover,creighton,boothe,bayer,arreola,vitale,valles,raney,osgood,hanlon,burley,bounds,worden,weatherly,vetter,tanaka,stiltner,nevarez,mosby,montero,melancon,harter,hamer,goble,gladden,gist,ginn,akin,zaragoza,towns,tarver,sammons,royster,oreilly,muir,morehead,luster,kingsley,kelso,grisham,glynn,baumann,alves,yount,tamayo,paterson,oates,menendez,longo,hargis,gillen,desantis,breedlove,sumpter,scherer,rupp,reichert,heredia,creel,cohn,clemmons,casas,bickford,belton,bach,williford,whitcomb,tennant,sutter,stull,sessions,mccallum,langlois,keel,keegan,dangelo,dancy,damron,clapp,clanton,bankston,oliveira,mintz,mcinnis,martens,mabe,laster,jolley,hildreth,hefner,glaser,duckett,demers,brockman,blais,alcorn,agnew,toliver,tice,seeley,najera,musser,mcfall,laplante,galvin,fajardo,doan,coyne,copley,clawson,cheung,barone,wynne,woodley,tremblay,stoll,sparrow,sparkman,schweitzer,sasser,samples,roney,legg,heim,farias,colwell,christman,bratcher,winchester,upshaw,southerland,sorrell,sells,mount,mccloskey,martindale,luttrell,loveless,lovejoy,linares,latimer,embry,coombs,bratton,bostick,venable,tuggle,toro,staggs,sandlin,jefferies,heckman,griffis,crayton,clem,browder,thorton,sturgill,sprouse,royer,rousseau,ridenour,pogue,perales,peeples,metzler,mesa,mccutcheon,mcbee,hornsby,heffner,corrigan,armijo,vue,plante,peyton,paredes,macklin,hussey,hodgson,granados,frias,becnel,batten,almanza,turney,teal,sturgeon,meeker,mcdaniels,limon,keeney,kee,hutto,holguin,gorham,fishman,fierro,blanchette,rodrigue,reddy,osburn,oden,lerma,kirkwood,keefer,haugen,hammett,chalmers,brinkman,baumgartner,valerio,tellez,steffen,shumate,sauls,ripley,kemper,jacks,guffey,evers,craddock,carvalho,blaylock,banuelos,balderas,wooden,wheaton,turnbull,shuman,pointer,mosier,mccue,ligon,kozlowski,johansen,ingle,herr,briones,snipes,rickman,pipkin,pantoja,orosco,moniz,lawless,kunkel,hibbard,galarza,enos,bussey,schott,salcido,perreault,mcdougal,mccool,haight,garris,ferry,easton,conyers,atherton,wimberly,utley,spellman,smithson,slagle,ritchey,rand,petit,osullivan,oaks,nutt,mcvay,mccreary,mayhew,knoll,jewett,harwood,cardoza,ashe,arriaga,zeller,wirth,whitmire,stauffer,rountree,redden,mccaffrey,martz,larose,langdon,humes,gaskin,faber,devito,cass,almond,wingfield,wingate,villareal,tyner,smothers,severson,reno,pennell,maupin,leighton,janssen,hassell,hallman,halcomb,folse,fitzsimmons,fahey,cranford,bolen,battles,battaglia,wooldridge,trask,rosser,regalado,mcewen,keefe,fuqua,echevarria,caro,boynton,andrus,viera,vanmeter,taber,spradlin,seibert,provost,prentice,oliphant,laporte,hwang,hatchett,hass,greiner,freedman,covert,chilton,byars,wiese,venegas,swank,shrader,roberge,mullis,mortensen,mccune,marlowe,kirchner,keck,isaacson,hostetler,halverson,gunther,griswold,fenner,durden,blackwood,ahrens,sawyers,savoy,nabors,mcswain,mackay,loy,lavender,lash,labbe,jessup,fullerton,cruse,crittenden,correia,centeno,caudle,canady,callender,alarcon,ahern,winfrey,tribble,styles,salley,roden,musgrove,minnick,fortenberry,carrion,bunting,batiste,whited,underhill,stillwell,rauch,pippin,perrin,messenger,mancini,lister,kinard,hartmann,fleck,broadway,wilt,treadway,thornhill,spalding,rafferty,pitre,patino,ordonez,linkous,kelleher,homan,galbraith,feeney,curtin,coward,camarillo,buss,bunnell,bolt,beeler,autry,alcala,witte,wentz,stidham,shively,nunley,meacham,martins,lemke,lefebvre,hynes,horowitz,hoppe,holcombe,dunne,derr,cochrane,brittain,bedard,beauregard,torrence,strunk,soria,simonson,shumaker,scoggins,oconner,moriarty,kuntz,ives,hutcheson,horan,hales,garmon,fitts,bohn,atchison,wisniewski,vanwinkle,sturm,sallee,prosser,moen,lundberg,kunz,kohl,keane,jorgenson,jaynes,funderburk,freed,durr,creamer,cosgrove,batson,vanhoose,thomsen,teeter,smyth,redmon,orellana,maness,heflin,goulet,frick,forney,bunker,asbury,aguiar,talbott,southard,mowery,mears,lemmon,krieger,hickson,elston,duong,delgadillo,dayton,dasilva,conaway,catron,bruton,bradbury,bordelon,bivins,bittner,bergstrom,beals,abell,whelan,tejada,pulley,pino,norfleet,nealy,maes,loper,gatewood,frierson,freund,finnegan,cupp,covey,catalano,boehm,bader,yoon,walston,tenney,sipes,rawlins,medlock,mccaskill,mccallister,marcotte,maclean,hughey,henke,harwell,gladney,gilson,dew,chism,caskey,brandenburg,baylor,villasenor,veal,thatcher,stegall,shore,petrie,nowlin,navarrete,muhammad,lombard,loftin,lemaster,kroll,kovach,kimbrell,kidwell,hershberger,fulcher,eng,cantwell,bustos,boland,bobbitt,binkley,wester,weis,verdin,tiller,sisco,sharkey,seymore,rosenbaum,rohr,quinonez,pinkston,nation,malley,logue,lessard,lerner,lebron,krauss,klinger,halstead,haller,getz,burrow,alger,shores,pfeifer,perron,nelms,munn,mcmaster,mckenney,manns,knudson,hutchens,huskey,goebel,flagg,cushman,click,castellano,carder,bumgarner,wampler,spinks,robson,neel,mcreynolds,mathias,maas,loera,kasper,jenson,florez,coons,buckingham,brogan,berryman,wilmoth,wilhite,thrash,shephard,seidel,schulze,roldan,pettis,obryan,maki,mackie,hatley,frazer,fiore,chesser,bui,bottoms,bisson,benefield,allman,wilke,trudeau,timm,shifflett,rau,mundy,milliken,mayers,leake,kohn,huntington,horsley,hermann,guerin,fryer,frizzell,foret,flemming,fife,criswell,carbajal,bozeman,boisvert,angulo,wallen,tapp,silvers,ramsay,oshea,orta,moll,mckeever,mcgehee,linville,kiefer,ketchum,howerton,groce,gass,fusco,corbitt,betz,bartels,amaral,aiello,yoo,weddle,sperry,seiler,runyan,raley,overby,osteen,olds,mckeown,matney,lauer,lattimore,hindman,hartwell,fredrickson,fredericks,espino,clegg,carswell,cambell,burkholder,woodbury,welker,totten,thornburg,theriault,stitt,stamm,stackhouse,scholl,saxon,rife,razo,quinlan,pinkerton,olivo,nesmith,nall,mattos,lafferty,justus,giron,geer,fielder,drayton,dortch,conners,conger,boatwright,billiot,barden,armenta,tibbetts,steadman,slattery,rinaldi,raynor,pinckney,pettigrew,milne,matteson,halsey,gonsalves,fellows,durand,desimone,cowley,cowles,brill,barham,barela,barba,ashmore,withrow,valenti,tejeda,spriggs,sayre,salerno,peltier,peel,merriman,matheson,lowman,lindstrom,hyland,giroux,earls,dugas,dabney,collado,briseno,baxley,whyte,wenger,vanover,vanburen,thiel,schindler,schiller,rigby,pomeroy,passmore,marble,manzo,mahaffey,lindgren,laflamme,greathouse,fite,calabrese,bayne,yamamoto,wick,townes,thames,reinhart,peeler,naranjo,montez,mcdade,mast,markley,marchand,leeper,kellum,hudgens,hennessey,hadden,gainey,coppola,borrego,bolling,beane,ault,slaton,poland,pape,null,mulkey,lightner,langer,hillard,glasgow,ethridge,enright,derosa,baskin,weinberg,turman,somerville,pardo,noll,lashley,ingraham,hiller,hendon,glaze,cothran,cooksey,conte,carrico,abner,wooley,swope,summerlin,sturgis,sturdivant,stott,spurgeon,spillman,speight,roussel,popp,nutter,mckeon,mazza,magnuson,lanning,kozak,jankowski,heyward,forster,corwin,callaghan,bays,wortham,usher,theriot,sayers,sabo,poling,loya,lieberman,laroche,labelle,howes,harr,garay,fogarty,everson,durkin,dominquez,chaves,chambliss,witcher,vieira,vandiver,terrill,stoker,schreiner,moorman,liddell,lew,lawhorn,krug,irons,hylton,hollenbeck,herrin,hembree,goolsby,goodin,gilmer,foltz,dinkins,daughtry,caban,brim,briley,bilodeau,wyant,vergara,tallent,swearingen,stroup,scribner,quillen,pitman,monaco,mccants,maxfield,martinson,holtz,flournoy,brookins,brody,baumgardner,straub,sills,roybal,roundtree,oswalt,mcgriff,mcdougall,mccleary,maggard,gragg,gooding,godinez,doolittle,donato,cowell,cassell,bracken,appel,zambrano,reuter,perea,nakamura,monaghan,mickens,mcclinton,mcclary,marler,kish,judkins,gilbreath,freese,flanigan,felts,erdmann,dodds,chew,brownell,boatright,barreto,slayton,sandberg,saldivar,pettway,odum,narvaez,moultrie,montemayor,merrell,lees,keyser,hoke,hardaway,hannan,gilbertson,fogg,dumont,deberry,coggins,buxton,bucher,broadnax,beeson,araujo,appleton,amundson,aguayo,ackley,yocum,worsham,shivers,sanches,sacco,robey,rhoden,pender,ochs,mccurry,madera,luong,knotts,jackman,heinrich,hargrave,gault,comeaux,chitwood,caraway,boettcher,bernhardt,barrientos,zink,wickham,whiteman,thorp,stillman,settles,schoonover,roque,riddell,pilcher,phifer,novotny,macleod,hardee,haase,grider,doucette,clausen,bevins,beamon,badillo,tolley,tindall,soule,snook,seale,pitcher,pinkney,pellegrino,nowell,nemeth,mondragon,mclane,lundgren,ingalls,hudspeth,hixson,gearhart,furlong,downes,dibble,deyoung,cornejo,camara,brookshire,boyette,wolcott,surratt,sellars,segal,salyer,reeve,rausch,labonte,haro,gower,freeland,fawcett,eads,driggers,donley,collett,bromley,boatman,ballinger,baldridge,volz,trombley,stonge,shanahan,rivard,rhyne,pedroza,matias,jamieson,hedgepeth,hartnett,estevez,eskridge,denman,chiu,chinn,catlett,carmack,buie,bechtel,beardsley,bard,ballou,ulmer,skeen,robledo,rincon,reitz,piazza,munger,moten,mcmichael,loftus,ledet,kersey,groff,fowlkes,folk,crumpton,clouse,bettis,villagomez,timmerman,strom,santoro,roddy,penrod,musselman,macpherson,leboeuf,harless,haddad,guido,golding,fulkerson,fannin,dulaney,dowdell,cottle,ceja,cate,bosley,benge,albritton,voigt,trowbridge,soileau,seely,rohde,pearsall,paulk,orth,nason,mota,mcmullin,marquardt,madigan,hoag,gillum,gabbard,fenwick,eck,danforth,cushing,cress,creed,cazares,casanova,bey,bettencourt,barringer,baber,stansberry,schramm,rutter,rivero,oquendo,necaise,mouton,montenegro,miley,mcgough,marra,macmillan,lamontagne,jasso,horst,hetrick,heilman,gaytan,gall,fortney,dingle,desjardins,dabbs,burbank,brigham,breland,beaman,arriola,yarborough,wallin,toscano,stowers,reiss,pichardo,orton,michels,mcnamee,mccrory,leatherman,kell,keister,horning,hargett,guay,ferro,deboer,dagostino,carper,blanks,beaudry,towle,tafoya,stricklin,strader,soper,sonnier,sigmon,schenk,saddler,pedigo,mendes,lunn,lohr,lahr,kingsbury,jarman,hume,holliman,hofmann,haworth,harrelson,hambrick,flick,edmunds,dacosta,crossman,colston,chaplin,carrell,budd,weiler,waits,valentino,trantham,tarr,solorio,roebuck,powe,plank,pettus,palm,pagano,mink,luker,leathers,joslin,hartzell,gambrell,deutsch,cepeda,carty,caputo,brewington,bedell,ballew,applewhite,warnock,walz,urena,tudor,reel,pigg,parton,mickelson,meagher,mclellan,mcculley,mandel,leech,lavallee,kraemer,kling,kipp,kehoe,hochstetler,harriman,gregoire,grabowski,gosselin,gammon,fancher,edens,desai,brannan,armendariz,woolsey,whitehouse,whetstone,ussery,towne,testa,tallman,studer,strait,steinmetz,sorrells,sauceda,rolfe,paddock,mitchem,mcginn,mccrea,lovato,hazen,gilpin,gaynor,fike,devoe,delrio,curiel,burkhardt,bode,backus,zinn,watanabe,wachter,vanpelt,turnage,shaner,schroder,sato,riordan,quimby,portis,natale,mckoy,mccown,kilmer,hotchkiss,hesse,halbert,gwinn,godsey,delisle,chrisman,canter,arbogast,angell,acree,yancy,woolley,wesson,weatherspoon,trainor,stockman,spiller,sipe,rooks,reavis,propst,porras,neilson,mullens,loucks,llewellyn,kumar,koester,klingensmith,kirsch,kester,honaker,hodson,hennessy,helmick,garrity,garibay,fee,drain,casarez,callis,botello,aycock,avant,wingard,wayman,tully,theisen,szymanski,stansbury,segovia,rainwater,preece,pirtle,padron,mincey,mckelvey,mathes,larrabee,kornegay,klug,ingersoll,hecht,germain,eggers,dykstra,deering,decoteau,deason,dearing,cofield,carrigan,bonham,bahr,aucoin,appleby,almonte,yager,womble,wimmer,weimer,vanderpool,stancil,sprinkle,romine,remington,pfaff,peckham,olivera,meraz,maze,lathrop,koehn,hazelton,halvorson,hallock,haddock,ducharme,dehaven,caruthers,brehm,bosworth,bost,bias,beeman,basile,bane,aikens,wold,walther,tabb,suber,strawn,stocker,shirey,schlosser,riedel,rembert,reimer,pyles,peele,merriweather,letourneau,latta,kidder,hixon,hillis,hight,herbst,henriquez,haygood,hamill,gabel,fritts,eubank,dawes,correll,cha,bushey,buchholz,brotherton,botts,barnwell,auger,atchley,westphal,veilleux,ulloa,stutzman,shriver,ryals,prior,pilkington,moyers,marrs,mangrum,maddux,lockard,laing,kuhl,harney,hammock,hamlett,felker,doerr,depriest,carrasquillo,carothers,bogle,bischoff,bergen,albanese,wyckoff,vermillion,vansickle,thibault,tetreault,stickney,shoemake,ruggiero,rawson,racine,philpot,paschal,mcelhaney,mathison,legrand,lapierre,kwan,kremer,jiles,hilbert,geyer,faircloth,ehlers,egbert,desrosiers,dalrymple,cotten,cashman,cadena,breeding,boardman,alcaraz,ahn,wyrick,therrien,tankersley,strickler,puryear,plourde,pattison,pardue,mcginty,mcevoy,landreth,kuhns,koon,hewett,giddens,emerick,eades,deangelis,cosme,ceballos,birdsong,benham,bemis,armour,anguiano,welborn,tsosie,storms,shoup,sessoms,samaniego,rood,rojo,rhinehart,raby,northcutt,myer,munguia,morehouse,mcdevitt,mallett,lozada,lemoine,kuehn,hallett,grim,gillard,gaylor,garman,gallaher,feaster,faris,darrow,dardar,coney,carreon,braithwaite,boylan,boyett,bixler,bigham,benford,barragan,barnum,zuber,wyche,westcott,vining,stoltzfus,simonds,shupe,sabin,ruble,rittenhouse,richman,perrone,mulholland,millan,lomeli,kite,jemison,hulett,holler,hickerson,herold,hazelwood,griffen,gause,forde,eisenberg,dilworth,charron,chaisson,brodie,bristow,breunig,brace,boutwell,bentz,belk,bayless,batchelder,baran,baeza,zimmermann,weathersby,volk,toole,theis,tedesco,searle,schenck,satterwhite,ruelas,rankins,partida,nesbit,morel,menchaca,levasseur,kaylor,johnstone,hulse,hollar,hersey,harrigan,harbison,guyer,gish,giese,gerlach,geller,geisler,falcone,elwell,doucet,deese,darr,corder,chafin,byler,bussell,burdett,brasher,bowe,bellinger,bastian,barner,alleyne,wilborn,weil,wegner,wales,tatro,spitzer,smithers,schoen,resendez,parisi,overman,obrian,mudd,moy,mclaren,maggio,lindner,lalonde,lacasse,laboy,killion,kahl,jessen,jamerson,houk,henshaw,gustin,graber,durst,duenas,davey,cundiff,conlon,colunga,coakley,chiles,capers,buell,bricker,bissonnette,birmingham,bartz,bagby,zayas,volpe,treece,toombs,thom,terrazas,swinney,skiles,silveira,shouse,senn,ramage,nez,moua,langham,kyles,holston,hoagland,herd,feller,denison,carraway,burford,bickel,ambriz,abercrombie,yamada,weidner,waddle,verduzco,thurmond,swindle,schrock,sanabria,rosenberger,probst,peabody,olinger,nazario,mccafferty,mcbroom,mcabee,mazur,matherne,mapes,leverett,killingsworth,heisler,griego,gosnell,frankel,franke,ferrante,fenn,ehrlich,christopherso,chasse,chancellor,caton,brunelle,bly,bloomfield,babbitt,azevedo,abramson,ables,abeyta,youmans,wozniak,wainwright,stowell,smitherman,samuelson,runge,rothman,rosenfeld,peake,owings,olmos,munro,moreira,leatherwood,larkins,krantz,kovacs,kizer,kindred,karnes,jaffe,hubbell,hosey,hauck,goodell,erdman,dvorak,doane,cureton,cofer,buehler,bierman,berndt,banta,abdullah,warwick,waltz,turcotte,torrey,stith,seger,sachs,quesada,pinder,peppers,pascual,paschall,parkhurst,ozuna,oster,nicholls,lheureux,lavalley,kimura,jablonski,haun,gourley,gilligan,derby,croy,cotto,cargill,burwell,burgett,buckman,booher,adorno,wrenn,whittemore,urias,szabo,sayles,saiz,rutland,rael,pharr,pelkey,ogrady,nickell,musick,moats,mather,massa,kirschner,kieffer,kellar,hendershot,gott,godoy,gadson,furtado,fiedler,erskine,dutcher,dever,daggett,chevalier,brake,ballesteros,amerson,wingo,waldon,trott,silvey,showers,schlegel,rue,ritz,pepin,pelayo,parsley,palermo,moorehead,mchale,lett,kocher,kilburn,iglesias,humble,hulbert,huckaby,hix,haven,hartford,hardiman,gurney,grigg,grasso,goings,fillmore,farber,depew,dandrea,dame,cowen,covarrubias,burrus,bracy,ardoin,thompkins,standley,radcliffe,pohl,persaud,parenteau,pabon,newson,newhouse,napolitano,mulcahy,malave,keim,hooten,hernandes,heffernan,hearne,greenleaf,glick,fuhrman,fetter,faria,dishman,dickenson,crites,criss,clapper,chenault,castor,casto,bugg,bove,bonney,ard,anderton,allgood,alderson,woodman,warrick,toomey,tooley,tarrant,summerville,stebbins,sokol,searles,schutz,schumann,scheer,remillard,raper,proulx,palmore,monroy,messier,melo,melanson,mashburn,manzano,lussier,jenks,huneycutt,hartwig,grimsley,fulk,fielding,fidler,engstrom,eldred,dantzler,crandell,calder,brumley,breton,brann,bramlett,boykins,bianco,bancroft,almaraz,alcantar,whitmer,whitener,welton,vineyard,rahn,paquin,mizell,mcmillin,mckean,marston,maciel,lundquist,liggins,lampkin,kranz,koski,kirkham,jiminez,hazzard,harrod,graziano,grammer,gendron,garrido,fordham,englert,dryden,demoss,deluna,crabb,comeau,brummett,blume,benally,wessel,vanbuskirk,thorson,stumpf,stockwell,reams,radtke,rackley,pelton,niemi,newland,nelsen,morrissette,miramontes,mcginley,mccluskey,marchant,luevano,lampe,lail,jeffcoat,infante,hinman,gaona,erb,eady,desmarais,decosta,dansby,choe,breckenridge,bostwick,borg,bianchi,alberts,wilkie,whorton,vargo,tait,soucy,schuman,ousley,mumford,lum,lippert,leath,lavergne,laliberte,kirksey,kenner,johnsen,izzo,hiles,gullett,greenwell,gaspar,galbreath,gaitan,ericson,delapaz,croom,cottingham,clift,bushnell,bice,beason,arrowood,waring,voorhees,truax,shreve,shockey,schatz,sandifer,rubino,rozier,roseberry,pieper,peden,nester,nave,murphey,malinowski,macgregor,lafrance,kunkle,kirkman,hipp,hasty,haddix,gervais,gerdes,gamache,fouts,fitzwater,dillingham,deming,deanda,cedeno,cannady,burson,bouldin,arceneaux,woodhouse,whitford,wescott,welty,weigel,torgerson,toms,surber,sunderland,sterner,setzer,riojas,pumphrey,puga,metts,mcgarry,mccandless,magill,lupo,loveland,llamas,leclerc,koons,kahler,huss,holbert,heintz,haupt,grimmett,gaskill,ellingson,dorr,dingess,deweese,desilva,crossley,cordeiro,converse,conde,caldera,cairns,burmeister,burkhalter,brawner,bott,youngs,vierra,valladares,shrum,shropshire,sevilla,rusk,rodarte,pedraza,nino,merino,mcminn,markle,mapp,lajoie,koerner,kittrell,kato,hyder,hollifield,heiser,hazlett,greenwald,fant,eldredge,dreher,delafuente,cravens,claypool,beecher,aronson,alanis,worthen,wojcik,winger,whitacre,wellington,valverde,valdivia,troupe,thrower,swindell,suttles,suh,stroman,spires,slate,shealy,sarver,sartin,sadowski,rondeau,rolon,rascon,priddy,paulino,nolte,munroe,molloy,mciver,lykins,loggins,lenoir,klotz,kempf,hupp,hollowell,hollander,haynie,harkness,harker,gottlieb,frith,eddins,driskell,doggett,densmore,charette,cassady,byrum,burcham,buggs,benn,whitted,warrington,vandusen,vaillancourt,steger,siebert,scofield,quirk,purser,plumb,orcutt,nordstrom,mosely,michalski,mcphail,mcdavid,mccraw,marchese,mannino,lefevre,largent,lanza,kress,isham,hunsaker,hoch,hildebrandt,guarino,grijalva,graybill,ewell,ewald,cusick,crumley,coston,cathcart,carruthers,bullington,bowes,blain,blackford,barboza,yingling,weiland,varga,silverstein,sievers,shuster,shumway,runnels,rumsey,renfroe,provencher,polley,mohler,middlebrooks,kutz,koster,groth,glidden,fazio,deen,chipman,chenoweth,champlin,cedillo,carrero,carmody,buckles,brien,boutin,bosch,berkowitz,altamirano,wilfong,wiegand,waites,truesdale,toussaint,tobey,tedder,steelman,sirois,schnell,robichaud,richburg,plumley,pizarro,piercy,ortego,oberg,neace,mertz,mcnew,matta,lapp,lair,kibler,howlett,hollister,hofer,hatten,hagler,falgoust,engelhardt,eberle,dombrowski,dinsmore,daye,casares,braud,balch,autrey,wendel,tyndall,strobel,stoltz,spinelli,serrato,rochester,reber,rathbone,palomino,nickels,mayle,mathers,mach,loeffler,littrell,levinson,leong,lemire,lejeune,lazo,lasley,koller,kennard,hoelscher,hintz,hagerman,greaves,fore,eudy,engler,corrales,cordes,brunet,bidwell,bennet,tyrrell,tharpe,swinton,stribling,southworth,sisneros,savoie,samons,ruvalcaba,ries,ramer,omara,mosqueda,millar,mcpeak,macomber,luckey,litton,lehr,lavin,hubbs,hoard,hibbs,hagans,futrell,exum,evenson,culler,carbaugh,callen,brashear,bloomer,blakeney,bigler,addington,woodford,unruh,tolentino,sumrall,stgermain,smock,sherer,rayner,pooler,oquinn,nero,mcglothlin,linden,kowal,kerrigan,ibrahim,harvell,hanrahan,goodall,geist,fussell,fung,ferebee,eley,eggert,dorsett,dingman,destefano,colucci,clemmer,burnell,brumbaugh,boddie,berryhill,avelar,alcantara,winder,winchell,vandenberg,trotman,thurber,thibeault,stlouis,stilwell,sperling,shattuck,sarmiento,ruppert,rumph,renaud,randazzo,rademacher,quiles,pearman,palomo,mercurio,lowrey,lindeman,lawlor,larosa,lander,labrecque,hovis,holifield,henninger,hawkes,hartfield,hann,hague,genovese,garrick,fudge,frink,eddings,dinh,cribbs,calvillo,bunton,brodeur,bolding,blanding,agosto,zahn,wiener,trussell,tew,tello,teixeira,speck,sharma,shanklin,sealy,scanlan,santamaria,roundy,robichaux,ringer,rigney,prevost,polson,nord,moxley,medford,mccaslin,mcardle,macarthur,lewin,lasher,ketcham,keiser,heine,hackworth,grose,grizzle,gillman,gartner,frazee,fleury,edson,edmonson,derry,cronk,conant,burress,burgin,broom,brockington,bolick,boger,birchfield,billington,baily,bahena,armbruster,anson,yoho,wilcher,tinney,timberlake,thoma,thielen,sutphin,stultz,sikora,serra,schulman,scheffler,santillan,rego,preciado,pinkham,mickle,luu,lomas,lizotte,lent,kellerman,keil,johanson,hernadez,hartsfield,haber,gorski,farkas,eberhardt,duquette,delano,cropper,cozart,cockerham,chamblee,cartagena,cahoon,buzzell,brister,brewton,blackshear,benfield,aston,ashburn,arruda,wetmore,weise,vaccaro,tucci,sudduth,stromberg,stoops,showalter,shears,runion,rowden,rosenblum,riffle,renfrow,peres,obryant,leftwich,lark,landeros,kistler,killough,kerley,kastner,hoggard,hartung,guertin,govan,gatling,gailey,fullmer,fulford,flatt,esquibel,endicott,edmiston,edelstein,dufresne,dressler,dickman,chee,busse,bonnett,berard,arena,yoshida,velarde,veach,vanhouten,vachon,tolson,tolman,tennyson,stites,soler,shutt,ruggles,rhone,pegues,ong,neese,muro,moncrief,mefford,mcphee,mcmorris,mceachern,mcclurg,mansour,mader,leija,lecompte,lafountain,labrie,jaquez,heald,hash,hartle,gainer,frisby,farina,eidson,edgerton,dyke,durrett,duhon,cuomo,cobos,cervantez,bybee,brockway,borowski,binion,beery,arguello,amaro,acton,yuen,winton,wigfall,weekley,vidrine,vannoy,tardiff,shoop,shilling,schick,safford,prendergast,pellerin,osuna,nissen,nalley,moller,messner,messick,merrifield,mcguinness,matherly,marcano,mahone,lemos,lebrun,jara,hoffer,herren,hecker,haws,haug,gwin,gober,gilliard,fredette,favela,echeverria,downer,donofrio,desrochers,crozier,corson,bechtold,argueta,aparicio,zamudio,westover,westerman,utter,troyer,thies,tapley,slavin,shirk,sandler,roop,raymer,radcliff,otten,moorer,millet,mckibben,mccutchen,mcavoy,mcadoo,mayorga,mastin,martineau,marek,madore,leflore,kroeger,kennon,jimerson,hostetter,hornback,hendley,hance,guardado,granado,gowen,goodale,flinn,fleetwood,fitz,durkee,duprey,dipietro,dilley,clyburn,brawley,beckley,arana,weatherby,vollmer,vestal,tunnell,trigg,tingle,takahashi,sweatt,storer,snapp,shiver,rooker,rathbun,poisson,perrine,perri,pastor,parmer,parke,pare,palmieri,nottingham,midkiff,mecham,mccomas,mcalpine,lovelady,lillard,lally,knopp,kile,kiger,haile,gupta,goldsberry,gilreath,fulks,friesen,franzen,flack,findlay,ferland,dreyer,dore,dennard,deckard,debose,crim,coulombe,cork,chancey,cantor,branton,bissell,barns,woolard,witham,wasserman,spiegel,shoffner,scholz,ruch,rossman,petry,palacio,paez,neary,mortenson,millsap,miele,menke,mckim,mcanally,martines,manor,lemley,larochelle,klaus,klatt,kaufmann,kapp,helmer,hedge,halloran,glisson,frechette,fontana,eagan,distefano,danley,creekmore,chartier,chaffee,carillo,burg,bolinger,berkley,benz,basso,bash,barrier,zelaya,woodring,witkowski,wilmot,wilkens,wieland,verdugo,urquhart,tsai,timms,swiger,swaim,sussman,pires,molnar,mcatee,lowder,loos,linker,landes,kingery,hufford,higa,hendren,hammack,hamann,gillam,gerhardt,edelman,eby,delk,deans,curl,constantine,cleaver,claar,casiano,carruth,carlyle,brophy,bolanos,bibbs,bessette,beggs,baugher,bartel,averill,andresen,amin,adames,via,valente,turnbow,tse,swink,sublett,stroh,stringfellow,ridgway,pugliese,poteat,ohare,neubauer,murchison,mingo,lemmons,kwon,kellam,kean,jarmon,hyden,hudak,hollinger,henkel,hemingway,hasson,hansel,halter,haire,ginsberg,gillispie,fogel,flory,etter,elledge,eckman,deas,currin,crafton,coomer,colter,claxton,bulter,braddock,bowyer,binns,bellows,baskerville,barros,ansley,woolf,wight,waldman,wadley,tull,trull,tesch,stouffer,stadler,slay,shubert,sedillo,santacruz,reinke,poynter,neri,neale,mowry,moralez,monger,mitchum,merryman,manion,macdougall,lux,litchfield,ley,levitt,lepage,lasalle,khoury,kavanagh,karns,ivie,huebner,hodgkins,halpin,garica,eversole,dutra,dunagan,duffey,dillman,dillion,deville,dearborn,damato,courson,coulson,burdine,bousquet,bonin,bish,atencio,westbrooks,wages,vaca,tye,toner,tillis,swett,struble,stanfill,solorzano,slusher,sipple,sim,silvas,shults,schexnayder,saez,rodas,rager,pulver,plaza,penton,paniagua,meneses,mcfarlin,mcauley,matz,maloy,magruder,lohman,landa,lacombe,jaimes,hom,holzer,holst,heil,hackler,grundy,gilkey,farnham,durfee,dunton,dunston,duda,dews,craver,corriveau,conwell,colella,chambless,bremer,boutte,bourassa,blaisdell,backman,babineaux,audette,alleman,towner,taveras,tarango,sullins,suiter,stallard,solberg,schlueter,poulos,pimental,owsley,okelley,nations,moffatt,metcalfe,meekins,medellin,mcglynn,mccowan,marriott,marable,lennox,lamoureux,koss,kerby,karp,isenberg,howze,hockenberry,highsmith,harbour,hallmark,gusman,greeley,giddings,gaudet,gallup,fleenor,eicher,edington,dimaggio,dement,demello,decastro,bushman,brundage,brooker,bourg,blackstock,bergmann,beaton,banister,argo,appling,wortman,watterson,villalpando,tillotson,tighe,sundberg,sternberg,stamey,shipe,seeger,scarberry,sattler,sain,rothstein,poteet,plowman,pettiford,penland,partain,pankey,oyler,ogletree,ogburn,moton,merkel,lucier,lakey,kratz,kinser,kershaw,josephson,imhoff,hendry,hammon,frisbie,friedrich,frawley,fraga,forester,eskew,emmert,drennan,doyon,dandridge,cawley,carvajal,bracey,belisle,batey,ahner,wysocki,weiser,veliz,tincher,sansone,sankey,sandstrom,rohrer,risner,pridemore,pfeffer,persinger,peery,oubre,nowicki,musgrave,murdoch,mullinax,mccary,mathieu,livengood,kyser,klink,kimes,kellner,kavanaugh,kasten,imes,hoey,hinshaw,hake,gurule,grube,grillo,geter,gatto,garver,garretson,farwell,eiland,dunford,decarlo,corso,colman,collard,cleghorn,chasteen,cavender,carlile,calvo,byerly,brogdon,broadwater,breault,bono,bergin,behr,ballenger,amick,tamez,stiffler,steinke,simmon,shankle,schaller,salmons,sackett,saad,rideout,ratcliffe,rao,ranson,plascencia,petterson,olszewski,olney,olguin,nilsson,nevels,morelli,montiel,monge,michaelson,mertens,mcchesney,mcalpin,mathewson,loudermilk,lineberry,liggett,kinlaw,kight,jost,hereford,hardeman,halpern,halliday,hafer,gaul,friel,freitag,forsberg,evangelista,doering,dicarlo,dendy,delp,deguzman,dameron,curtiss,cosper,cauthen,cao,bradberry,bouton,bonnell,bixby,bieber,beveridge,bedwell,barhorst,bannon,baltazar,baier,ayotte,attaway,arenas,abrego,turgeon,tunstall,thaxton,thai,tenorio,stotts,sthilaire,shedd,seabolt,scalf,salyers,ruhl,rowlett,robinett,pfister,perlman,parkman,nunnally,norvell,napper,modlin,mckellar,mcclean,mascarenas,leibowitz,ledezma,kuhlman,kobayashi,hunley,holmquist,hinkley,hartsell,gribble,gravely,fifield,eliason,doak,crossland,carleton,bridgeman,bojorquez,boggess,auten,woosley,whiteley,wexler,twomey,tullis,townley,standridge,santoyo,rueda,riendeau,revell,pless,ottinger,nigro,nickles,mulvey,menefee,mcshane,mcloughlin,mckinzie,markey,lockridge,lipsey,knisley,knepper,kitts,kiel,jinks,hathcock,godin,gallego,fikes,fecteau,estabrook,ellinger,dunlop,dudek,countryman,chauvin,chatham,bullins,brownfield,boughton,bloodworth,bibb,baucom,barbieri,aubin,armitage,alessi,absher,abbate,zito,woolery,wiggs,wacker,tynes,tolle,telles,tarter,swarey,strode,stockdale,stalnaker,spina,schiff,saari,risley,rameriz,rakes,pettaway,penner,paulus,palladino,omeara,montelongo,melnick,mehta,mcgary,mccourt,mccollough,marchetti,manzanares,lowther,leiva,lauderdale,lafontaine,kowalczyk,knighton,joubert,jaworski,ide,huth,hurdle,housley,hackman,gulick,gordy,gilstrap,gehrke,gebhart,gaudette,foxworth,essex,endres,dunkle,cimino,caddell,brauer,braley,bodine,blackmore,belden,backer,ayer,andress,wisner,vuong,valliere,twigg,tso,tavarez,strahan,steib,staub,sowder,seiber,schutt,scharf,schade,rodriques,risinger,renshaw,rahman,presnell,piatt,nieman,nevins,mcilwain,mcgaha,mccully,mccomb,massengale,macedo,lesher,kearse,jauregui,husted,hudnall,holmberg,hertel,hardie,glidewell,frausto,fassett,dalessandro,dahlgren,corum,constantino,conlin,colquitt,colombo,claycomb,cardin,buller,boney,bocanegra,biggers,benedetto,araiza,andino,albin,zorn,werth,weisman,walley,vanegas,ulibarri,towe,tedford,teasley,suttle,steffens,stcyr,squire,singley,sifuentes,shuck,schram,sass,rieger,ridenhour,rickert,richerson,rayborn,rabe,raab,pendley,pastore,ordway,moynihan,mellott,mckissick,mcgann,mccready,mauney,marrufo,lenhart,lazar,lafave,keele,kautz,jardine,jahnke,jacobo,hord,hardcastle,hageman,giglio,gehring,fortson,duque,duplessis,dicken,derosier,deitz,dalessio,cram,castleman,candelario,callison,caceres,bozarth,biles,bejarano,bashaw,avina,armentrout,alverez,acord,waterhouse,vereen,vanlandingham,uhl,strawser,shotwell,severance,seltzer,schoonmaker,schock,schaub,schaffner,roeder,rodrigez,riffe,rhine,rasberry,rancourt,railey,quade,pursley,prouty,perdomo,oxley,osterman,nickens,murphree,mounts,merida,maus,mattern,masse,martinelli,mangan,lutes,ludwick,loney,laureano,lasater,knighten,kissinger,kimsey,kessinger,honea,hollingshead,hockett,heyer,heron,gurrola,gove,glasscock,gillett,galan,featherstone,eckhardt,duron,dunson,dasher,culbreth,cowden,cowans,claypoole,churchwell,chabot,caviness,cater,caston,callan,byington,burkey,boden,beckford,atwater,archambault,alvey,alsup,whisenant,weese,voyles,verret,tsang,tessier,sweitzer,sherwin,shaughnessy,revis,remy,prine,philpott,peavy,paynter,parmenter,ovalle,offutt,nightingale,newlin,nakano,myatt,muth,mohan,mcmillon,mccarley,mccaleb,maxson,marinelli,maley,liston,letendre,kain,huntsman,hirst,hagerty,gulledge,greenway,grajeda,gorton,goines,gittens,frederickson,fanelli,embree,eichelberger,dunkin,dixson,dillow,defelice,chumley,burleigh,borkowski,binette,biggerstaff,berglund,beller,audet,arbuckle,allain,alfano,youngman,wittman,weintraub,vanzant,vaden,twitty,stollings,standifer,sines,shope,scalise,saville,posada,pisano,otte,nolasco,napoli,mier,merkle,mendiola,melcher,mejias,mcmurry,mccalla,markowitz,manis,mallette,macfarlane,lough,looper,landin,kittle,kinsella,kinnard,hobart,herald,helman,hellman,hartsock,halford,hage,gordan,glasser,gayton,gattis,gastelum,gaspard,frisch,fitzhugh,eckstein,eberly,dowden,despain,crumpler,crotty,cornelison,chouinard,chamness,catlin,cann,bumgardner,budde,branum,bradfield,braddy,borst,birdwell,bazan,banas,bade,arango,ahearn,addis,zumwalt,wurth,wilk,widener,wagstaff,urrutia,terwilliger,tart,steinman,staats,sloat,rives,riggle,revels,reichard,prickett,poff,pitzer,petro,pell,northrup,nicks,moline,mielke,maynor,mallon,magness,lingle,lindell,lieb,lesko,lebeau,lammers,lafond,kiernan,ketron,jurado,holmgren,hilburn,hayashi,hashimoto,harbaugh,guillot,gard,froehlich,feinberg,falco,dufour,drees,doney,diep,delao,daves,dail,crowson,coss,congdon,carner,camarena,butterworth,burlingame,bouffard,bloch,bilyeu,barta,bakke,baillargeon,avent,aquilar,ake,aho,zeringue,yarber,wolfson,vogler,voelker,truss,troxell,thrift,strouse,spielman,sistrunk,sevigny,schuller,schaaf,ruffner,routh,roseman,ricciardi,peraza,pegram,overturf,olander,odaniel,neu,millner,melchor,maroney,machuca,macaluso,livesay,layfield,laskowski,kwiatkowski,kilby,hovey,heywood,hayman,havard,harville,haigh,hagood,grieco,glassman,gebhardt,fleischer,fann,elson,eccles,cunha,crumb,blakley,bardwell,abshire,woodham,wines,welter,wargo,varnado,tutt,traynor,swaney,svoboda,stricker,stoffel,stambaugh,sickler,shackleford,selman,seaver,sansom,sanmiguel,royston,rourke,rockett,rioux,puleo,pitchford,nardi,mulvaney,middaugh,malek,leos,lathan,kujawa,kimbro,killebrew,houlihan,hinckley,herod,hepler,hamner,hammel,hallowell,gonsalez,gingerich,gambill,funkhouser,fricke,fewell,falkner,endsley,dulin,drennen,deaver,dambrosio,chadwell,castanon,burkes,brune,brisco,brinker,bowker,boldt,berner,beaumont,beaird,bazemore,barrick,albano,younts,wunderlich,weidman,vanness,toland,theobald,stickler,steiger,stanger,spies,spector,sollars,smedley,seibel,scoville,saito,rye,rummel,rowles,rouleau,roos,rogan,roemer,ream,raya,purkey,priester,perreira,penick,paulin,parkins,overcash,oleson,neves,muldrow,minard,midgett,michalak,melgar,mcentire,mcauliffe,marte,lydon,lindholm,leyba,langevin,lagasse,lafayette,kesler,kelton,kao,kaminsky,jaggers,humbert,huck,howarth,hinrichs,higley,gupton,guimond,gravois,giguere,fretwell,fontes,feeley,faucher,eichhorn,ecker,earp,dole,dinger,derryberry,demars,deel,copenhaver,collinsworth,colangelo,cloyd,claiborne,caulfield,carlsen,calzada,caffey,broadus,brenneman,bouie,bodnar,blaney,blanc,beltz,behling,barahona,yockey,winkle,windom,wimer,villatoro,trexler,teran,taliaferro,sydnor,swinson,snelling,smtih,simonton,simoneaux,simoneau,sherrer,seavey,scheel,rushton,rupe,ruano,rippy,reiner,reiff,rabinowitz,quach,penley,odle,nock,minnich,mckown,mccarver,mcandrew,longley,laux,lamothe,lafreniere,kropp,krick,kates,jepson,huie,howse,howie,henriques,haydon,haught,hartzog,harkey,grimaldo,goshorn,gormley,gluck,gilroy,gillenwater,giffin,fluker,feder,eyre,eshelman,eakins,detwiler,delrosario,davisson,catalan,canning,calton,brammer,botelho,blakney,bartell,averett,askins,aker,zak,worcester,witmer,wiser,winkelman,widmer,whittier,weitzel,wardell,wagers,ullman,tupper,tingley,tilghman,talton,simard,seda,scheller,sala,rundell,rost,roa,ribeiro,rabideau,primm,pinon,peart,ostrom,ober,nystrom,nussbaum,naughton,murr,moorhead,monti,monteiro,melson,meissner,mclin,mcgruder,marotta,makowski,majewski,madewell,lunt,lukens,leininger,lebel,lakin,kepler,jaques,hunnicutt,hungerford,hoopes,hertz,heins,halliburton,grosso,gravitt,glasper,gallman,gallaway,funke,fulbright,falgout,eakin,dostie,dorado,dewberry,derose,cutshall,crampton,costanzo,colletti,cloninger,claytor,chiang,canterbury,campagna,burd,brokaw,broaddus,bretz,brainard,binford,bilbrey,alpert,aitken,ahlers,zajac,woolfolk,witten,windle,wayland,tramel,tittle,talavera,suter,straley,specht,sommerville,soloman,skeens,sigman,sibert,shavers,schuck,schmit,sartain,sabol,rosenblatt,rollo,rashid,rabb,province,polston,nyberg,northrop,navarra,muldoon,mikesell,mcdougald,mcburney,mariscal,lui,lozier,lingerfelt,legere,latour,lagunas,lacour,kurth,killen,kiely,kayser,kahle,isley,huertas,hower,hinz,haugh,gumm,galicia,fortunato,flake,dunleavy,duggins,doby,digiovanni,devaney,deltoro,cribb,corpuz,coronel,coen,charbonneau,caine,burchette,blakey,blakemore,bergquist,beene,beaudette,bayles,ballance,bakker,bailes,asberry,arwood,zucker,willman,whitesell,wald,walcott,vancleave,trump,strasser,simas,shick,schleicher,schaal,saleh,rotz,resnick,rainer,partee,ollis,oller,oday,munday,mong,millican,merwin,mazzola,mansell,magallanes,llanes,lewellen,lepore,kisner,keesee,jeanlouis,ingham,hornbeck,hawn,hartz,harber,haffner,gutshall,guth,grays,gowan,finlay,finkelstein,eyler,enloe,dungan,diez,dearman,cull,crosson,chronister,cassity,campion,callihan,butz,breazeale,blumenthal,berkey,batty,batton,arvizu,alderete,aldana,albaugh,abernethy,wolter,wille,tweed,tollefson,thomasson,teter,testerman,sproul,spates,southwick,soukup,skelly,senter,sealey,sawicki,sargeant,rossiter,rosemond,repp,pifer,ormsby,nickelson,naumann,morabito,monzon,millsaps,millen,mcelrath,marcoux,mantooth,madson,macneil,mackinnon,louque,leister,lampley,kushner,krouse,kirwan,jessee,janson,jahn,jacquez,islas,hutt,holladay,hillyer,hepburn,hensel,harrold,gingrich,geis,gales,fults,finnell,ferri,featherston,epley,ebersole,eames,dunigan,drye,dismuke,devaughn,delorenzo,damiano,confer,collum,clower,clow,claussen,clack,caylor,cawthon,casias,carreno,bluhm,bingaman,bewley,belew,beckner,auld,amey,wolfenbarger,wilkey,wicklund,waltman,villalba,valero,valdovinos,ung,ullrich,tyus,twyman,trost,tardif,tanguay,stripling,steinbach,shumpert,sasaki,sappington,sandusky,reinhold,reinert,quijano,pye,placencia,pinkard,phinney,perrotta,pernell,parrett,oxendine,owensby,orman,nuno,mori,mcroberts,mcneese,mckamey,mccullum,markel,mardis,maines,lueck,lubin,lefler,leffler,larios,labarbera,kershner,josey,jeanbaptiste,izaguirre,hermosillo,haviland,hartshorn,hafner,ginter,getty,franck,fiske,dufrene,doody,davie,dangerfield,dahlberg,cuthbertson,crone,coffelt,chidester,chesson,cauley,caudell,cantara,campo,caines,bullis,bucci,brochu,bogard,bickerstaff,benning,arzola,antonelli,adkinson,zellers,wulf,worsley,woolridge,whitton,westerfield,walczak,vassar,truett,trueblood,trawick,townsley,topping,tobar,telford,steverson,stagg,sitton,sill,sergent,schoenfeld,sarabia,rutkowski,rubenstein,rigdon,prentiss,pomerleau,plumlee,philbrick,peer,patnode,oloughlin,obregon,nuss,morell,mikell,mele,mcinerney,mcguigan,mcbrayer,lor,lollar,lakes,kuehl,kinzer,kamp,joplin,jacobi,howells,holstein,hedden,hassler,harty,halle,greig,gouge,goodrum,gerhart,geier,geddes,gast,forehand,ferree,fendley,feltner,esqueda,encarnacion,eichler,egger,edmundson,eatmon,doud,donohoe,donelson,dilorenzo,digiacomo,diggins,delozier,dejong,danford,crippen,coppage,cogswell,clardy,cioffi,cabe,brunette,bresnahan,bramble,blomquist,blackstone,biller,bevis,bevan,bethune,benbow,baty,basinger,balcom,andes,aman,aguero,adkisson,yandell,wilds,whisenhunt,weigand,weeden,voight,villar,trottier,tillett,suazo,setser,scurry,schuh,schreck,schauer,samora,roane,rinker,reimers,ratchford,popovich,parkin,natal,melville,mcbryde,magdaleno,loehr,lockman,lingo,leduc,larocca,lao,lamere,laclair,krall,korte,koger,jalbert,hughs,higbee,henton,heaney,haith,gump,greeson,goodloe,gholston,gasper,gagliardi,fregoso,farthing,fabrizio,ensor,elswick,elgin,eklund,eaddy,drouin,dorton,dizon,derouen,deherrera,davy,dampier,cullum,culley,cowgill,cardoso,cardinale,brodsky,broadbent,brimmer,briceno,branscum,bolyard,boley,bennington,beadle,baur,ballentine,azure,aultman,arciniega,aguila,aceves,yepez,yap,woodrum,wethington,weissman,veloz,trusty,troup,trammel,tarpley,stivers,steck,sprayberry,spraggins,spitler,spiers,sohn,seagraves,schiffman,rudnick,rizo,riccio,rennie,quackenbush,puma,plott,pearcy,parada,paiz,munford,moskowitz,mease,mcnary,mccusker,lozoya,longmire,loesch,lasky,kuhlmann,krieg,koziol,kowalewski,konrad,kindle,jowers,jolin,jaco,hua,horgan,hine,hileman,hepner,heise,heady,hawkinson,hannigan,haberman,guilford,grimaldi,garton,gagliano,fruge,follett,fiscus,ferretti,ebner,easterday,eanes,dirks,dimarco,depalma,deforest,cruce,craighead,christner,candler,cadwell,burchell,buettner,brinton,brazier,brannen,brame,bova,bomar,blakeslee,belknap,bangs,balzer,athey,armes,alvis,alverson,alvardo,yeung,wheelock,westlund,wessels,volkman,threadgill,thelen,tague,symons,swinford,sturtevant,straka,stier,stagner,segarra,seawright,rutan,roux,ringler,riker,ramsdell,quattlebaum,purifoy,poulson,permenter,peloquin,pasley,pagel,osman,obannon,nygaard,newcomer,munos,motta,meadors,mcquiston,mcniel,mcmann,mccrae,mayne,matte,legault,lechner,kucera,krohn,kratzer,koopman,jeske,horrocks,hock,hibbler,hesson,hersh,harvin,halvorsen,griner,grindle,gladstone,garofalo,frampton,forbis,eddington,diorio,dingus,dewar,desalvo,curcio,creasy,cortese,cordoba,connally,cluff,cascio,capuano,canaday,calabro,bussard,brayton,borja,bigley,arnone,arguelles,acuff,zamarripa,wooton,widner,wideman,threatt,thiele,templin,teeters,synder,swint,swick,sturges,stogner,stedman,spratt,siegfried,shetler,scull,savino,sather,rothwell,rook,rone,rhee,quevedo,privett,pouliot,poche,pickel,petrillo,pellegrini,peaslee,partlow,otey,nunnery,morelock,morello,meunier,messinger,mckie,mccubbin,mccarron,lerch,lavine,laverty,lariviere,lamkin,kugler,krol,kissel,keeter,hubble,hickox,hetzel,hayner,hagy,hadlock,groh,gottschalk,goodsell,gassaway,garrard,galligan,fye,firth,fenderson,feinstein,etienne,engleman,emrick,ellender,drews,doiron,degraw,deegan,dart,crissman,corr,cookson,coil,cleaves,charest,chapple,chaparro,castano,carpio,byer,bufford,bridgewater,bridgers,brandes,borrero,bonanno,aube,ancheta,abarca,abad,yim,wooster,wimbush,willhite,willams,wigley,weisberg,wardlaw,vigue,vanhook,unknow,torre,tasker,tarbox,strachan,slover,shamblin,semple,schuyler,schrimsher,sayer,salzman,rubalcava,riles,reneau,reichel,rayfield,rabon,pyatt,prindle,poss,polito,plemmons,pesce,perrault,pereyra,ostrowski,nilsen,niemeyer,munsey,mundell,moncada,miceli,meader,mcmasters,mckeehan,matsumoto,marron,marden,lizarraga,lingenfelter,lewallen,langan,lamanna,kovac,kinsler,kephart,keown,kass,kammerer,jeffreys,hysell,householder,hosmer,hardnett,hanner,guyette,greening,glazer,ginder,fromm,fluellen,finkle,fey,fessler,essary,eisele,duren,dittmer,crochet,cosentino,cogan,coelho,cavin,carrizales,campuzano,brough,bopp,bookman,blouin,beesley,battista,bascom,bakken,badgett,arneson,anselmo,ahumada,woodyard,wolters,wireman,willison,warman,waldrup,vowell,vantassel,vale,twombly,toomer,tennison,teets,tedeschi,swanner,stutz,stelly,sheehy,schermerhorn,scala,sandidge,salters,salo,saechao,roseboro,rolle,ressler,renz,renn,redford,raposa,rainbolt,pelfrey,orndorff,oney,nolin,nimmons,ney,nardone,myhre,morman,menjivar,mcglone,mccammon,maxon,marciano,manus,lowrance,lorenzen,lonergan,lollis,littles,lindahl,lamas,lach,kuster,krawczyk,knuth,knecht,kirkendall,keitt,keever,kantor,jarboe,hoye,houchens,holter,holsinger,hickok,helwig,helgeson,hassett,harner,hamman,hames,hadfield,goree,goldfarb,gaughan,gaudreau,gantz,gallion,frady,foti,flesher,ferrin,faught,engram,donegan,desouza,degroot,cutright,crowl,criner,coan,clinkscales,chewning,chavira,catchings,carlock,bulger,buenrostro,bramblett,brack,boulware,bookout,bitner,birt,baranowski,baisden,augustin,allmon,acklin,yoakum,wilbourn,whisler,weinberger,washer,vasques,vanzandt,vanatta,troxler,tomes,tindle,tims,throckmorton,thach,stpeter,stlaurent,stenson,spry,spitz,songer,snavely,sly,shroyer,shortridge,shenk,sevier,seabrook,scrivner,saltzman,rosenberry,rockwood,robeson,roan,reiser,ramires,raber,posner,popham,piotrowski,pinard,peterkin,pelham,peiffer,peay,nadler,musso,millett,mestas,mcgowen,marques,marasco,manriquez,manos,mair,lipps,leiker,krumm,knorr,kinslow,kessel,kendricks,kelm,ito,irick,ickes,hurlburt,horta,hoekstra,heuer,helmuth,heatherly,hampson,hagar,haga,greenlaw,grau,godbey,gingras,gillies,gibb,gayden,gauvin,garrow,fontanez,florio,finke,fasano,ezzell,ewers,eveland,eckenrode,duclos,drumm,dimmick,delancey,defazio,dashiell,cusack,crowther,crigger,cray,coolidge,coldiron,cleland,chalfant,cassel,camire,cabrales,broomfield,brittingham,brisson,brickey,braziel,brazell,bragdon,boulanger,bos,boman,bohannan,beem,barre,baptist,azar,ashbaugh,armistead,almazan,adamski,zendejas,winburn,willaims,wilhoit,westberry,wentzel,wendling,visser,vanscoy,vankirk,vallee,tweedy,thornberry,sweeny,spradling,spano,smelser,shim,sechrist,schall,scaife,rugg,rothrock,roesler,riehl,ridings,render,ransdell,radke,pinero,petree,pendergast,peluso,pecoraro,pascoe,panek,oshiro,navarrette,murguia,moores,moberg,michaelis,mcwhirter,mcsweeney,mcquade,mccay,mauk,mariani,marceau,mandeville,maeda,lunde,ludlow,loeb,lindo,linderman,leveille,leith,larock,lambrecht,kulp,kinsley,kimberlin,kesterson,hoyos,helfrich,hanke,grisby,goyette,gouveia,glazier,gile,gerena,gelinas,gasaway,funches,fujimoto,flynt,fenske,fellers,fehr,eslinger,escalera,enciso,duley,dittman,dineen,diller,devault,dao,collings,clymer,clowers,chavers,charland,castorena,castello,camargo,bunce,bullen,boyes,borchers,borchardt,birnbaum,birdsall,billman,benites,bankhead,ange,ammerman,adkison,winegar,wickman,warr,warnke,villeneuve,veasey,vassallo,vannatta,vadnais,twilley,towery,tomblin,tippett,theiss,talkington,talamantes,swart,swanger,streit,stines,stabler,spurling,sobel,sine,simmers,shippy,shiflett,shearin,sauter,sanderlin,rusch,runkle,ruckman,rorie,roesch,richert,rehm,randel,ragin,quesenberry,puentes,plyler,plotkin,paugh,oshaughnessy,ohalloran,norsworthy,niemann,nader,moorefield,mooneyham,modica,miyamoto,mickel,mebane,mckinnie,mazurek,mancilla,lukas,lovins,loughlin,lotz,lindsley,liddle,levan,lederman,leclaire,lasseter,lapoint,lamoreaux,lafollette,kubiak,kirtley,keffer,kaczmarek,housman,hiers,hibbert,herrod,hegarty,hathorn,greenhaw,grafton,govea,futch,furst,franko,forcier,foran,flickinger,fairfield,eure,emrich,embrey,edgington,ecklund,eckard,durante,deyo,delvecchio,dade,currey,creswell,cottrill,casavant,cartier,cargile,capel,cammack,calfee,burse,burruss,brust,brousseau,bridwell,braaten,borkholder,bloomquist,bjork,bartelt,arp,amburgey,yeary,yao,whitefield,vinyard,vanvalkenburg,twitchell,timmins,tapper,stringham,starcher,spotts,slaugh,simonsen,sheffer,sequeira,rosati,rhymes,reza,quint,pollak,peirce,patillo,parkerson,paiva,nilson,nevin,narcisse,nair,mitton,merriam,merced,meiners,mckain,mcelveen,mcbeth,marsden,marez,manke,mahurin,mabrey,luper,krull,kees,iles,hunsicker,hornbuckle,holtzclaw,hirt,hinnant,heston,hering,hemenway,hegwood,hearns,halterman,guiterrez,grote,granillo,grainger,glasco,gilder,garren,garlock,garey,fryar,fredricks,fraizer,foxx,foshee,ferrel,felty,everitt,evens,esser,elkin,eberhart,durso,duguay,driskill,doster,dewall,deveau,demps,demaio,delreal,deleo,deem,darrah,cumberbatch,culberson,cranmer,cordle,colgan,chesley,cavallo,castellon,castelli,carreras,carnell,carlucci,bontrager,blumberg,blasingame,becton,ayon,artrip,andujar,alkire,alder,agan,zukowski,zuckerman,zehr,wroblewski,wrigley,woodside,wigginton,westman,westgate,werts,washam,wardlow,walser,waiters,tadlock,stringfield,stimpson,stickley,standish,spurlin,spindler,speller,spaeth,sotomayor,sok,sluder,shryock,shepardson,shatley,scannell,santistevan,rosner,rhode,resto,reinhard,rathburn,prisco,poulsen,pinney,phares,pennock,pastrana,oviedo,ostler,noto,nauman,mulford,moise,moberly,mirabal,metoyer,metheny,mentzer,meldrum,mcinturff,mcelyea,mcdougle,massaro,lumpkins,loveday,lofgren,loe,lirette,lesperance,lefkowitz,ledger,lauzon,lain,lachapelle,kurz,klassen,keough,kempton,kaelin,jeffords,huot,hsieh,hoyer,horwitz,hopp,hoeft,hennig,haskin,gourdine,golightly,girouard,fulgham,fritsch,freer,frasher,foulk,firestone,fiorentino,fedor,ensley,englehart,eells,ebel,dunphy,donahoe,dileo,dibenedetto,dabrowski,crick,coonrod,conder,coddington,chunn,choy,chaput,cerna,carreiro,calahan,braggs,bourdon,bollman,bittle,behm,bauder,batt,barreras,aubuchon,anzalone,adamo,zerbe,wirt,willcox,westberg,weikel,waymire,vroman,vinci,vallejos,truesdell,troutt,trotta,tollison,toles,tichenor,symonds,surles,strayer,stgeorge,sroka,sorrentino,solares,snelson,silvestri,sikorski,shawver,schumaker,schorr,schooley,scates,satterlee,satchell,sacks,rymer,roselli,robitaille,riegel,regis,reames,provenzano,priestley,plaisance,pettey,palomares,oman,nowakowski,nace,monette,minyard,mclamb,mchone,mccarroll,masson,magoon,maddy,lundin,loza,licata,leonhardt,lema,landwehr,kircher,kinch,karpinski,johannsen,hussain,houghtaling,hoskinson,hollaway,holeman,hobgood,hilt,hiebert,gros,goggin,geissler,gadbois,gabaldon,fleshman,flannigan,fairman,epp,eilers,dycus,dunmire,duffield,dowler,deloatch,dehaan,deemer,clayborn,christofferso,chilson,chesney,chatfield,carron,canale,brigman,branstetter,bosse,borton,bonar,blau,biron,barroso,arispe,zacharias,zabel,yaeger,woolford,whetzel,weakley,veatch,vandeusen,tufts,troxel,troche,traver,townsel,tosh,talarico,swilley,sterrett,stenger,speakman,sowards,sours,souders,souder,soles,sobers,snoddy,smither,sias,shute,shoaf,shahan,schuetz,scaggs,santini,rosson,rolen,robidoux,rentas,recio,pixley,pawlowski,pawlak,paull,overbey,orear,oliveri,oldenburg,nutting,naugle,mote,mossman,moor,misner,milazzo,michelson,mcentee,mccullar,mccree,mcaleer,mazzone,mandell,manahan,malott,maisonet,mailloux,lumley,lowrie,louviere,lipinski,lindemann,leppert,leopold,leasure,labarge,kubik,knisely,knepp,kenworthy,kennelly,kelch,karg,kanter,hyer,houchin,hosley,hosler,hollon,holleman,heitman,hebb,haggins,gwaltney,guin,goulding,gorden,geraci,georges,gathers,frison,feagin,falconer,espada,erving,erikson,eisenhauer,eder,ebeling,durgin,dowdle,dinwiddie,delcastillo,dedrick,crimmins,covell,cournoyer,coria,cohan,cataldo,carpentier,canas,campa,brode,brashears,blaser,bicknell,berk,bednar,barwick,ascencio,althoff,almodovar,alamo,zirkle,zabala,wolverton,winebrenner,wetherell,westlake,wegener,weddington,vong,tuten,trosclair,tressler,theroux,teske,swinehart,swensen,sundquist,southall,socha,sizer,silverberg,shortt,shimizu,sherrard,shaeffer,scheid,scheetz,saravia,sanner,rubinstein,rozell,romer,rheaume,reisinger,randles,pullum,petrella,payan,papp,nordin,norcross,nicoletti,nicholes,newbold,nakagawa,mraz,monteith,milstead,milliner,mellen,mccardle,luft,liptak,lipp,leitch,latimore,larrison,landau,laborde,koval,izquierdo,hymel,hoskin,holte,hoefer,hayworth,hausman,harrill,harrel,hardt,gully,groover,grinnell,greenspan,graver,grandberry,gorrell,goldenberg,goguen,gilleland,garr,fuson,foye,feldmann,everly,dyess,dyal,dunnigan,downie,dolby,deatherage,cosey,cheever,celaya,caver,cashion,caplinger,cansler,byrge,bruder,breuer,breslin,brazelton,botkin,bonneau,bondurant,bohanan,bogue,boes,bodner,boatner,blatt,bickley,belliveau,beiler,beier,beckstead,bachmann,atkin,altizer,alloway,allaire,albro,abron,zellmer,yetter,yelverton,wiltshire,wiens,whidden,viramontes,vanwormer,tarantino,tanksley,sumlin,strauch,strang,stice,spahn,sosebee,sigala,shrout,seamon,schrum,schneck,schantz,ruddy,romig,roehl,renninger,reding,pyne,polak,pohlman,pasillas,oldfield,oldaker,ohanlon,ogilvie,norberg,nolette,nies,neufeld,nellis,mummert,mulvihill,mullaney,monteleone,mendonca,meisner,mcmullan,mccluney,mattis,massengill,manfredi,luedtke,lounsbury,liberatore,leek,lamphere,laforge,kuo,koo,jourdan,ismail,iorio,iniguez,ikeda,hubler,hodgdon,hocking,heacock,haslam,haralson,hanshaw,hannum,hallam,haden,garnes,garces,gammage,gambino,finkel,faucett,fahy,ehrhardt,eggen,dusek,durrant,dubay,dones,dey,depasquale,delucia,degraff,decamp,davalos,cullins,conard,clouser,clontz,cifuentes,chappel,chaffins,celis,carwile,byram,bruggeman,bressler,brathwaite,brasfield,bradburn,boose,boon,bodie,blosser,blas,bise,bertsch,bernardi,bernabe,bengtson,barrette,astorga,alday,albee,abrahamson,yarnell,wiltse,wile,wiebe,waguespack,vasser,upham,tyre,turek,traxler,torain,tomaszewski,tinnin,tiner,tindell,teed,styron,stahlman,staab,skiba,shih,sheperd,seidl,secor,schutte,sanfilippo,ruder,rondon,rearick,procter,prochaska,pettengill,pauly,neilsen,nally,mutter,mullenax,morano,meads,mcnaughton,mcmurtry,mcmath,mckinsey,matthes,massenburg,marlar,margolis,malin,magallon,mackin,lovette,loughran,loring,longstreet,loiselle,lenihan,laub,kunze,kull,koepke,kerwin,kalinowski,kagan,innis,innes,holtzman,heinemann,harshman,haider,haack,guss,grondin,grissett,greenawalt,gravel,goudy,goodlett,goldston,gokey,gardea,galaviz,gafford,gabrielson,furlow,fritch,fordyce,folger,elizalde,ehlert,eckhoff,eccleston,ealey,dubin,diemer,deschamps,delapena,decicco,debolt,daum,cullinan,crittendon,crase,cossey,coppock,coots,colyer,cluck,chamberland,burkhead,bumpus,buchan,borman,bork,boe,birkholz,berardi,benda,behnke,barter,auer,amezquita,wotring,wirtz,wingert,wiesner,whitesides,weyant,wainscott,venezia,varnell,tussey,thurlow,tabares,stiver,stell,starke,stanhope,stanek,sisler,sinnott,siciliano,shehan,selph,seager,scurlock,scranton,santucci,santangelo,saltsman,ruel,ropp,rogge,rettig,renwick,reidy,reider,redfield,quam,premo,peet,parente,paolucci,palmquist,orme,ohler,ogg,netherton,mutchler,morita,mistretta,minnis,middendorf,menzel,mendosa,mendelson,meaux,mcspadden,mcquaid,mcnatt,manigault,maney,mager,lukes,lopresti,liriano,lipton,letson,lechuga,lazenby,lauria,larimore,kwok,kwak,krupp,krupa,krum,kopec,kinchen,kifer,kerney,kerner,kennison,kegley,kays,karcher,justis,johson,jellison,janke,huskins,holzman,hinojos,hefley,hatmaker,harte,halloway,hallenbeck,goodwyn,glaspie,geise,fullwood,fryman,frew,frakes,fraire,farrer,enlow,engen,ellzey,eckles,earles,ealy,dunkley,drinkard,dreiling,draeger,dinardo,dills,desroches,desantiago,curlee,crumbley,critchlow,coury,courtright,coffield,cleek,charpentier,cardone,caples,cantin,buntin,bugbee,brinkerhoff,brackin,bourland,bohl,bogdan,blassingame,beacham,banning,auguste,andreasen,amann,almon,alejo,adelman,abston,zeno,yerger,wymer,woodberry,windley,whiteaker,westfield,weibel,wanner,waldrep,villani,vanarsdale,utterback,updike,triggs,topete,tolar,tigner,thoms,tauber,tarvin,tally,swiney,sweatman,studebaker,stennett,starrett,stannard,stalvey,sonnenberg,smithey,sieber,sickles,shinault,segars,sanger,salmeron,rothe,rizzi,rine,ricard,restrepo,ralls,ragusa,quiroga,pero,pegg,pavlik,papenfuss,oropeza,okane,neer,nee,mudge,mozingo,molinaro,mcvicker,mcgarvey,mcfalls,mccraney,matus,magers,llanos,livermore,liss,linehan,leto,leitner,laymon,lawing,lacourse,kwong,kollar,kneeland,keo,kennett,kellett,kangas,janzen,hutter,huse,huling,hoss,hohn,hofmeister,hewes,hern,harjo,habib,gust,guice,grullon,greggs,grayer,granier,grable,gowdy,giannini,getchell,gartman,garnica,ganey,gallimore,fray,fetters,fergerson,farlow,fagundes,exley,esteves,enders,edenfield,easterwood,drakeford,dipasquale,desousa,deshields,deeter,dedmon,debord,daughtery,cutts,courtemanche,coursey,copple,coomes,collis,coll,cogburn,clopton,choquette,chaidez,castrejon,calhoon,burbach,bulloch,buchman,bruhn,bohon,blough,bien,baynes,barstow,zeman,zackery,yardley,yamashita,wulff,wilken,wiliams,wickersham,wible,whipkey,wedgeworth,walmsley,walkup,vreeland,verrill,valera,umana,traub,swingle,summey,stroupe,stockstill,steffey,stefanski,statler,stapp,speights,solari,soderberg,shunk,shorey,shewmaker,sheilds,schiffer,schank,schaff,sagers,rochon,riser,rickett,reale,raglin,polen,plata,pitcock,percival,palen,pahl,orona,oberle,nocera,navas,nault,mullings,moos,montejano,monreal,minick,middlebrook,meece,mcmillion,mccullen,mauck,marshburn,maillet,mahaney,magner,maclin,lucey,litteral,lippincott,leite,leis,leaks,lamarre,kost,jurgens,jerkins,jager,hurwitz,hughley,hotaling,horstman,hohman,hocker,hively,hipps,hile,hessler,hermanson,hepworth,henn,helland,hedlund,harkless,haigler,gutierez,grindstaff,glantz,giardina,gerken,gadsden,finnerty,feld,farnum,encinas,drakes,dennie,cutlip,curtsinger,couto,cortinas,corby,chiasson,carle,carballo,brindle,borum,bober,blagg,birk,berthiaume,beahm,batres,basnight,backes,axtell,aust,atterberry,alvares,alt,alegria,yow,yip,woodell,wojciechowski,winfree,winbush,wiest,wesner,wamsley,wakeman,verner,truex,trafton,toman,thorsen,theus,tellier,tallant,szeto,strope,stills,sorg,simkins,shuey,shaul,servin,serio,serafin,salguero,saba,ryerson,rudder,ruark,rother,rohrbaugh,rohrbach,rohan,rogerson,risher,rigg,reeser,pryce,prokop,prins,priebe,prejean,pinheiro,petrone,petri,penson,pearlman,parikh,natoli,murakami,mullikin,mullane,motes,morningstar,monks,mcveigh,mcgrady,mcgaughey,mccurley,masi,marchan,manske,maez,lusby,linde,lile,likens,licon,leroux,lemaire,legette,lax,laskey,laprade,laplant,kolar,kittredge,kinley,kerber,kanagy,jetton,janik,ippolito,inouye,hunsinger,howley,howery,horrell,holthaus,hiner,hilson,hilderbrand,hasan,hartzler,harnish,harada,hansford,halligan,hagedorn,gwynn,gudino,greenstein,greear,gracey,goudeau,gose,goodner,ginsburg,gerth,gerner,fyfe,fujii,frier,frenette,folmar,fleisher,fleischmann,fetzer,eisenman,earhart,dupuy,dunkelberger,drexler,dillinger,dilbeck,dewald,demby,deford,dake,craine,como,chesnut,casady,carstens,carrick,carino,carignan,canchola,cale,bushong,burman,buono,brownlow,broach,britten,brickhouse,boyden,boulton,borne,borland,bohrer,blubaugh,bever,berggren,benevides,arocho,arends,amezcua,almendarez,zalewski,witzel,winkfield,wilhoite,vara,vangundy,vanfleet,vanetten,vandergriff,urbanski,troiano,thibodaux,straus,stoneking,stjean,stillings,stange,speicher,speegle,sowa,smeltzer,slawson,simmonds,shuttleworth,serpa,senger,seidman,schweiger,schloss,schimmel,schechter,sayler,sabb,sabatini,ronan,rodiguez,riggleman,richins,reep,reamer,prunty,porath,plunk,piland,philbrook,pettitt,perna,peralez,pascale,padula,oboyle,nivens,nickols,murph,mundt,munden,montijo,mcmanis,mcgrane,mccrimmon,manzi,mangold,malick,mahar,maddock,losey,litten,liner,leff,leedy,leavell,ladue,krahn,kluge,junker,iversen,imler,hurtt,huizar,hubbert,howington,hollomon,holdren,hoisington,hise,heiden,hauge,hartigan,gutirrez,griffie,greenhill,gratton,granata,gottfried,gertz,gautreaux,furry,furey,funderburg,flippen,fitzgibbon,dyar,drucker,donoghue,dildy,devers,detweiler,despres,denby,degeorge,cueto,cranston,courville,clukey,cirillo,chon,chivers,caudillo,catt,butera,bulluck,buckmaster,braunstein,bracamonte,bourdeau,bonnette,bobadilla,boaz,blackledge,beshears,bernhard,bergeson,baver,barthel,balsamo,bak,aziz,awad,authement,altom,altieri,abels,zigler,zhu,younker,yeomans,yearwood,wurster,winget,whitsett,wechsler,weatherwax,wathen,warriner,wanamaker,walraven,viens,vandemark,vancamp,uchida,triana,tinoco,terpstra,tellis,tarin,taranto,takacs,studdard,struthers,strout,stiller,spataro,soderquist,sliger,silberman,shurtleff,sheetz,ritch,reif,raybon,ratzlaff,radley,putt,putney,pinette,piner,petrin,parise,osbourne,nyman,northington,noblitt,nishimura,neher,nalls,naccarato,mucha,mounce,miron,millis,meaney,mcnichols,mckinnis,mcjunkin,mcduffy,manrique,mannion,mangual,malveaux,mains,lumsden,lohmann,lipe,lightsey,lemasters,leist,laxton,laverriere,latorre,lamons,kral,kopf,knauer,kitt,kaul,karas,kamps,jusino,islam,hullinger,huges,hornung,hiser,hempel,helsel,hassinger,hargraves,hammes,hallberg,gutman,gumbs,gruver,graddy,gonsales,goncalves,glennon,gilford,geno,freshour,flippo,fifer,fason,farrish,fallin,ewert,estepp,escudero,ensminger,emberton,elms,ellerbe,eide,dysart,dougan,dierking,dicus,detrick,deroche,depue,demartino,delosreyes,dalke,culbreath,crownover,crisler,crass,corsi,chagnon,centers,cavanagh,casson,carollo,cadwallader,burnley,burciaga,burchard,broadhead,bolte,berens,bellman,bellard,baril,antonucci,wolfgram,winsor,wimbish,wier,wallach,viveros,vento,varley,vanslyke,vangorder,touchstone,tomko,tiemann,throop,tamura,talmadge,swayze,sturdevant,strauser,stolz,stenberg,stayton,spohn,spillers,spillane,sluss,slavens,simonetti,shofner,shead,senecal,seales,schueler,schley,schacht,sauve,sarno,salsbury,rothschild,rosier,rines,reveles,rein,redus,redfern,reck,ranney,raggs,prout,prill,preble,prager,plemons,pilon,piccirillo,pewitt,pesina,pecora,otani,orsini,oestreich,odea,ocallaghan,northup,niehaus,newberg,nasser,narron,monarrez,mishler,mcsherry,mcelfresh,mayon,mauer,mattice,marrone,marmolejo,marini,malm,machen,lunceford,loewen,liverman,litwin,linscott,levins,lenox,legaspi,leeman,leavy,lannon,lamson,lambdin,labarre,knouse,klemm,kleinschmidt,kirklin,keels,juliano,howser,hosier,hopwood,holyfield,hodnett,hirsh,heimann,heckel,harger,hamil,hajek,gurganus,gunning,grange,gonzalas,goggins,gerow,gaydos,garduno,ganley,galey,farner,engles,emond,emert,ellenburg,edick,duell,dorazio,dimond,diederich,depuy,dempster,demaria,dehoyos,dearth,dealba,czech,crose,crespin,cogdill,clinard,cipriano,chretien,cerny,ceniceros,celestin,caple,cacho,burrill,buhr,buckland,branam,boysen,bovee,boos,boler,blom,blasko,beyers,belz,belmonte,bednarz,beckmann,beaudin,bazile,barbeau,balentine,abrahams,zielke,yunker,yeates,wrobel,wike,whisnant,wherry,wagnon,vogan,vansant,vannest,vallo,ullery,towles,towell,thill,taormina,tannehill,taing,storrs,stickles,stetler,sparling,solt,silcox,sheard,shadle,seman,selleck,schlemmer,scher,sapien,sainz,roye,romain,rizzuto,resch,rentz,rasch,ranieri,purtell,primmer,portwood,pontius,pons,pletcher,pledger,pirkle,pillsbury,pentecost,paxson,ortez,oles,mullett,muirhead,mouzon,mork,mollett,mohn,mitcham,melillo,medders,mcmiller,mccleery,mccaughey,mak,maciejewski,macaulay,lute,lipman,lewter,larocque,langton,kriner,knipp,killeen,karn,kalish,kaczor,jonson,jerez,jarrard,janda,hymes,hollman,hollandsworth,holl,hobdy,hennen,hemmer,hagins,haddox,guitierrez,guernsey,gorsuch,gholson,genova,gazaway,gauna,gammons,freels,fonville,fetterman,fava,farquhar,farish,fabela,escoto,eisen,dossett,dority,dorfman,demmer,dehn,dawley,darbonne,damore,damm,crosley,cron,crompton,crichton,cotner,cordon,conerly,colvard,clauson,cheeseman,cavallaro,castille,cabello,burgan,buffum,bruss,brassfield,bowerman,bothwell,borgen,bonaparte,bombard,boivin,boissonneault,bogner,bodden,boan,bittinger,bickham,bedolla,bale,bainbridge,aybar,avendano,ashlock,amidon,almanzar,akridge,ackermann,zager,worrall,winans,wilsey,wightman,westrick,wenner,warne,warford,verville,utecht,upson,tuma,tseng,troncoso,trollinger,torbert,taulbee,sutterfield,stough,storch,stonebraker,stolle,stilson,stiefel,steptoe,stepney,stender,stemple,staggers,spurrier,spinney,spengler,smartt,skoog,silvis,sieg,shuford,selfridge,seguin,sedgwick,sease,scotti,schroer,schlenker,schill,savarese,sapienza,sanson,sandefur,salamone,rusnak,rudisill,rothermel,roca,resendiz,reliford,rasco,raiford,quisenberry,quijada,pullins,puccio,postell,poppe,pinter,piche,petrucci,pellegrin,pelaez,paton,pasco,parkes,paden,pabst,olmsted,newlon,mynatt,mower,morrone,moree,moffat,mixson,minner,millette,mederos,mcgahan,mcconville,maughan,massingill,marano,macri,lovern,lichtenstein,leonetti,lehner,lawley,laramie,lappin,lahti,lago,lacayo,kuester,kincade,juhl,jiron,jessop,jarosz,jain,hults,hoge,hodgins,hoban,hinkson,hillyard,herzig,hervey,henriksen,hawker,hause,hankerson,gregson,golliday,gilcrease,gessner,gerace,garwood,garst,gaillard,flinchum,fishel,fishback,filkins,fentress,fabre,ethier,eisner,ehrhart,efird,drennon,dominy,domingue,dipaolo,dinan,dimartino,deskins,dengler,defreitas,defranco,dahlin,cutshaw,cuthbert,croyle,crothers,critchfield,cowie,costner,coppedge,copes,ciccone,caufield,capo,cambron,cambridge,buser,burnes,buhl,buendia,brindley,brecht,bourgoin,blackshire,birge,benninger,bembry,beil,begaye,barrentine,banton,balmer,baity,auerbach,ambler,alexandre,ackerson,zurcher,zell,wynkoop,wallick,waid,vos,vizcaino,vester,veale,vandermark,vanderford,tuthill,trivette,thiessen,tewksbury,tao,tabron,swasey,swanigan,stoughton,stoudt,stimson,stecker,stead,spady,souther,smoak,sklar,simcox,sidwell,seybert,sesco,seeman,schwenk,schmeling,rossignol,robillard,robicheaux,riveria,rippeon,ridgley,remaley,rehkop,reddish,rauscher,quirion,pusey,pruden,pressler,potvin,pospisil,paradiso,pangburn,palmateer,ownby,otwell,osterberg,osmond,olsson,oberlander,nusbaum,novack,nokes,nicastro,nehls,naber,mulhern,motter,moretz,milian,mckeel,mcclay,mccart,matsuda,martucci,marple,marko,marciniak,manes,mancia,macrae,lybarger,lint,lineberger,levingston,lecroy,lattimer,laseter,kulick,krier,knutsen,klem,kinne,kinkade,ketterman,kerstetter,kersten,karam,joshi,jent,jefcoat,hillier,hillhouse,hettinger,henthorn,henline,helzer,heitzman,heineman,heenan,haughton,haris,harbert,haman,grinstead,gremillion,gorby,giraldo,gioia,gerardi,geraghty,gaunt,gatson,gardin,gans,gammill,friedlander,frahm,fossett,fosdick,forbush,fondren,fleckenstein,fitchett,filer,feliz,feist,ewart,esters,elsner,edgin,easterly,dussault,durazo,devereaux,deshotel,deckert,dargan,cornman,conkle,condit,claunch,clabaugh,cheesman,chea,charney,casella,carone,carbonell,canipe,campana,calles,cabezas,cabell,buttram,bustillos,buskirk,boyland,bourke,blakeley,berumen,berrier,belli,behrendt,baumbach,bartsch,baney,arambula,alldredge,allbritton,ziemba,zanders,youngquist,yoshioka,yohe,wunder,woodfin,wojtowicz,winkel,wilmore,willbanks,wesolowski,wendland,walko,votaw,vanek,uriarte,urbano,turnipseed,triche,trautman,towler,tokarz,temples,tefft,teegarden,syed,swigart,stoller,stapler,stansfield,smit,smelley,sicard,shulman,shew,shear,sheahan,sharpton,selvidge,schlesinger,savell,sandford,sabatino,rosenbloom,roepke,rish,rhames,renken,reger,quarterman,puig,prasad,poplar,pizano,pigott,phair,petrick,patt,pascua,paramore,papineau,olivieri,ogren,norden,noga,nisbet,munk,morvant,moro,moloney,merz,meltzer,mellinger,mehl,mcnealy,mckernan,mchaney,mccleskey,mcandrews,mayton,markert,maresca,maner,mandujano,malpass,macintyre,lytton,lyall,lummus,longshore,longfellow,lokey,locher,leverette,lepe,lefever,leeson,lederer,lampert,lagrone,kreider,korth,knopf,kleist,keltner,kelling,kaspar,kappler,josephs,huckins,holub,hofstetter,hoehn,higginson,hennings,heid,havel,hauer,harnden,hargreaves,hanger,guild,guidi,grate,grandy,grandstaff,goza,goodridge,goodfellow,goggans,godley,giusti,gilyard,geoghegan,galyon,gaeta,funes,font,flanary,fales,erlandson,ellett,edinger,dziedzic,duerr,draughn,donoho,dimatteo,devos,dematteo,degnan,darlington,danis,dahlstrom,dahlke,czajkowski,cumbie,culbert,crosier,croley,corry,clinger,chalker,cephas,caywood,capehart,cales,cadiz,bussiere,burriss,burkart,brundidge,bronstein,bradt,boydston,bostrom,borel,bolles,blay,blackwelder,bissett,bevers,bester,bernardino,benefiel,belote,beedle,beckles,baysinger,bassler,bartee,barlett,bargas,barefield,baptista,arterburn,armas,apperson,amoroso,amedee,zullo,zellner,yelton,willems,wilkin,wiggin,widman,welk,weingarten,walla,viers,vess,verdi,veazey,vannote,tullos,trudell,trower,trosper,trimm,trew,tousignant,topp,tocco,thoreson,terhune,tatom,suniga,sumter,steeves,stansell,soltis,sloss,slaven,shisler,shanley,servantes,selders,segrest,seese,seeber,schaible,savala,sartor,rutt,rumbaugh,ruis,roten,roessler,ritenour,riney,restivo,renard,rakestraw,rake,quiros,pullin,prudhomme,primeaux,prestridge,presswood,ponte,polzin,poarch,pittenger,piggott,pickell,phaneuf,parvin,parmley,palmeri,ozment,ormond,ordaz,ono,olea,obanion,oakman,novick,nicklas,nemec,nappi,mund,morfin,mera,melgoza,melby,mcgoldrick,mcelwain,mcchristian,mccaw,marquart,marlatt,markovich,mahr,lupton,lucus,lorusso,lerman,leddy,leaman,leachman,lavalle,laduke,kummer,koury,konopka,koh,koepp,kloss,klock,khalil,kernan,kappel,jakes,inoue,hutsell,howle,honore,hockman,hockaday,hiltz,hetherington,hesser,hershman,heffron,headen,haskett,hartline,harned,guillemette,guglielmo,guercio,greenbaum,goris,glines,gilmour,gardella,gadd,gabler,gabbert,fuselier,freudenburg,fragoso,follis,flemings,feltman,febus,farren,fallis,evert,ekstrom,eastridge,dyck,dufault,dubreuil,drapeau,domingues,dolezal,dinkel,didonato,devitt,demott,daughtrey,daubert,das,creason,crary,costilla,chipps,cheatwood,carmean,canton,caffrey,burgher,buker,brunk,brodbeck,brantner,bolivar,boerner,bodkin,biel,bencomo,bellino,beliveau,beauvais,beaupre,baylis,baskett,barcus,baltz,asay,arney,arcuri,ankney,agostini,addy,zwilling,zubia,zollinger,zeitz,yanes,winship,winningham,wickline,webre,waddington,vosburgh,verrett,varnum,vandeventer,vacca,usry,towry,touchet,tookes,tonkin,timko,tibbitts,thedford,tarleton,talty,talamantez,tafolla,sugg,strecker,steffan,spiva,slape,shatzer,seyler,seamans,schmaltz,schipper,sasso,ruppe,roudebush,riemer,richarson,revilla,reichenbach,ratley,railsback,quayle,poplin,poorman,ponton,pollitt,poitras,piscitelli,piedra,pew,perera,penwell,pelt,parkhill,paladino,ore,oram,olmo,oliveras,olivarria,ogorman,naron,muncie,mowbray,morones,moretti,monn,mitts,minks,minarik,mimms,milliron,millington,millhouse,messersmith,mcnett,mckinstry,mcgeorge,mcdill,mcateer,mazzeo,matchett,mahood,mabery,lundell,louden,losoya,lisk,lezama,leib,lebo,lanoue,lanford,lafortune,kump,krone,kreps,kott,kopecky,kolodziej,kinman,kimmons,kelty,kaster,karlson,kania,joyal,jenner,jasinski,jandreau,isenhour,hunziker,huhn,houde,houchins,holtman,hodo,heyman,hentges,hedberg,hayne,haycraft,harshbarger,harshaw,harriss,haring,hansell,hanford,handler,hamblen,gunnell,groat,gorecki,gochenour,gleeson,genest,geiser,fulghum,friese,fridley,freeborn,frailey,flaugher,fiala,ettinger,etheredge,espitia,eriksen,engelbrecht,engebretson,elie,eickhoff,edney,edelen,eberhard,eastin,eakes,driggs,doner,donaghy,disalvo,deshong,dahms,dahlquist,curren,cripe,cree,creager,corle,conatser,commons,coggin,coder,coaxum,closson,clodfelter,classen,chittenden,castilleja,casale,cartee,carriere,canup,canizales,burgoon,bunger,bugarin,buchanon,bruning,bruck,brookes,broadwell,brier,brekke,breese,bracero,bowley,bowersox,bose,bogar,blauser,blacker,bjorklund,baumer,basler,baize,baden,auman,amundsen,amore,alvarenga,adamczyk,yerkes,yerby,yamaguchi,worthey,wolk,wixom,wiersma,wieczorek,whiddon,weyer,wetherington,wein,watchman,warf,wansley,vesely,velazco,vannorman,valasquez,utz,urso,turco,turbeville,trivett,toothaker,toohey,tondreau,thaler,sylvain,swindler,swigert,swider,stiner,stever,steffes,stampley,stair,smidt,skeete,silvestre,shutts,shealey,seigler,schweizer,schuldt,schlichting,scherr,saulsberry,saner,rosin,rosato,roling,rohn,rix,rister,remley,remick,recinos,ramm,raabe,pursell,poythress,poli,pokorny,pettry,petrey,petitt,penman,payson,paquet,pappalardo,outland,orenstein,nuttall,nuckols,nott,nimmo,murtagh,mousseau,moulder,mooneyhan,moak,minch,miera,mercuri,meighan,mcnelly,mcguffin,mccreery,mcclaskey,mainor,luongo,lundstrom,loughman,lobb,linhart,lever,leu,leiter,lehoux,lehn,lares,lapan,langhorne,lamon,ladwig,ladson,kuzma,kreitzer,knop,keech,kea,kadlec,jhonson,jantz,inglis,husk,hulme,housel,hofman,hillery,heidenreich,heaps,haslett,harting,hartig,hamler,halton,hallum,gutierres,guida,guerrier,grossi,gress,greenhalgh,gravelle,gow,goslin,gonyea,gipe,gerstner,gasser,garceau,gannaway,gama,gallop,gaiser,fullilove,foutz,fossum,flannagan,farrior,faller,ericksen,entrekin,enochs,englund,ellenberger,eastland,earwood,dudash,drozd,desoto,delph,dekker,dejohn,degarmo,defeo,defalco,deblois,dacus,cudd,crossen,crooms,cronan,costin,cordray,comerford,colegrove,coldwell,claassen,chartrand,castiglione,carte,cardella,carberry,capp,capobianco,cangelosi,buch,brunell,brucker,brockett,brizendine,brinegar,brimer,brase,bosque,bonk,bolger,bohanon,bohan,blazek,berning,bergan,bennette,beauchemin,battiste,barra,balogh,avallone,aubry,ashcroft,asencio,arledge,anchondo,alvord,acheson,zaleski,yonker,wyss,wycoff,woodburn,wininger,winders,willmon,wiechmann,westley,weatherholt,warnick,wardle,warburton,volkert,villanveva,veit,vass,vanallen,tung,toribio,toothman,tiggs,thornsberry,thome,tepper,teeple,tebo,tassone,tann,stucker,stotler,stoneman,stehle,stanback,stallcup,spurr,speers,spada,solum,smolen,sinn,silvernail,sholes,shives,shain,secrest,seagle,schuette,schoch,schnieders,schild,schiavone,schiavo,scharff,santee,sandell,salvo,rollings,rivenburg,ritzman,rist,reynosa,retana,regnier,rarick,ransome,rall,propes,prall,poyner,ponds,poitra,pippins,pinion,phu,perillo,penrose,pendergraft,pelchat,patenaude,palko,odoms,oddo,novoa,noone,newburn,negri,nantz,mosser,moshier,molter,molinari,moler,millman,meurer,mendel,mcray,mcnicholas,mcnerney,mckillip,mcilvain,mcadory,marmol,marinez,manzer,mankin,makris,majeski,maffei,luoma,luman,luebke,luby,lomonaco,loar,litchford,lintz,licht,levenson,legge,lanigan,krom,kreger,koop,kober,klima,kitterman,kinkead,kimbell,kilian,kibbe,kendig,kemmer,kash,jenkin,inniss,hurlbut,hunsucker,huckabee,hoxie,hoglund,hockensmith,hoadley,hinkel,higuera,herrman,heiner,hausmann,haubrich,hassen,hanlin,hallinan,haglund,hagberg,gullo,gullion,groner,greenwalt,gobert,glowacki,glessner,gines,gildersleeve,gildea,gerke,gebhard,gatton,gately,galasso,fralick,fouse,fluharty,faucette,fairfax,evanoff,elser,ellard,egerton,ector,ebling,dunkel,duhart,drysdale,dostal,dorey,dolph,doles,dismukes,digregorio,digby,dewees,deramus,denniston,dennett,deloney,delaughter,cuneo,cumberland,crotts,crosswhite,cremeans,creasey,cottman,cothern,costales,cosner,corpus,colligan,cobble,clutter,chupp,chevez,chatmon,chaires,caplan,caffee,cabana,burrough,burditt,buckler,brunswick,brouillard,broady,bowlby,bouley,borgman,boltz,boddy,blackston,birdsell,bedgood,bate,bartos,barriga,barna,barcenas,banach,baccus,auclair,ashman,arter,arendt,ansell,allums,allender,alber,albarran,adelson,zoll,wysong,wimbley,wildes,whitis,whitehill,whicker,weymouth,weldy,wark,wareham,waddy,viveiros,vath,vandoren,vanderhoof,unrein,uecker,tsan,trepanier,tregre,torkelson,tobler,tineo,timmer,swopes,swofford,sweeten,swarts,summerfield,sumler,stucky,strozier,stigall,stickel,stennis,stelzer,steely,slayden,skillern,shurtz,shelor,shellenbarger,shand,shabazz,seo,scroggs,schwandt,schrecengost,schoenrock,schirmer,sandridge,ruzicka,rozek,rowlands,roser,rosendahl,romanowski,rolston,riggio,reichman,redondo,reay,rawlinson,raskin,raine,quandt,purpura,pruneda,prevatte,prettyman,pinedo,pierro,pidgeon,phillippi,pfeil,penix,peasley,paro,ospina,ortegon,ogata,ogara,normandin,nordman,nims,nassar,motz,morlan,mooring,moles,moir,mizrahi,mire,minaya,millwood,mikula,messmer,meikle,mctaggart,mcgonagle,mcewan,mccasland,mccane,mccaffery,mcalexander,mattocks,matranga,martone,markland,maravilla,manno,mancha,mallery,magno,lorentz,locklin,livingstone,lipford,lininger,lepley,leming,lemelin,leadbetter,lawhon,lattin,langworthy,lampman,lambeth,lamarr,lahey,krajewski,klopp,kinnison,kestner,kennell,karim,jozwiak,jakubowski,ivery,iliff,iddings,hudkins,houseman,holz,holderman,hoehne,highfill,hiett,heskett,heldt,hedman,hayslett,hatchell,hasse,hamon,hamada,hakala,haislip,haffey,hackbarth,guo,gullickson,guerrette,greenblatt,goudreau,gongora,godbout,glaude,gills,gillison,gigliotti,gargano,gallucci,galli,galante,frasure,fodor,fizer,fishburn,finkbeiner,finck,fager,estey,espiritu,eppinger,epperly,emig,eckley,dray,dorsch,dille,devita,deslauriers,demery,delorme,delbosque,dauphin,dantonio,curd,crume,cozad,cossette,comacho,climer,chadbourne,cespedes,cayton,castaldo,carpino,carls,capozzi,canela,buzard,busick,burlison,brinkmann,bridgeforth,bourbeau,bornstein,bonfiglio,boice,boese,biondi,bilski,betton,berwick,berlanga,behan,becraft,barrientez,banh,balke,balderrama,bahe,bachand,armer,arceo,aliff,alatorre,zermeno,younce,yeoman,yamasaki,wroten,woodby,winer,willits,wilcoxon,wehmeyer,waterbury,wass,wann,wachtel,vizcarra,veitch,vanderbilt,vallone,vallery,ureno,tyer,tipps,tiedeman,theberge,texeira,taub,tapscott,stutts,stults,stukes,spink,sottile,smithwick,slane,simeone,silvester,siegrist,shiffer,sheedy,sheaffer,severin,sellman,scotto,schupp,schueller,schreier,schoolcraft,schoenberger,schnabel,sangster,samford,saliba,ryles,ryans,rossetti,rodriguz,risch,riel,rezendes,rester,rencher,recker,rathjen,profitt,poteete,polizzi,perrigo,patridge,osby,orvis,opperman,oppenheim,onorato,olaughlin,ohagan,ogles,oehler,obyrne,nuzzo,nickle,nease,neagle,navarette,nagata,musto,morison,montz,mogensen,mizer,miraglia,migliore,menges,mellor,mcnear,mcnab,mcloud,mcelligott,mccollom,maynes,marquette,markowski,marcantonio,maldanado,macey,lundeen,longino,lisle,linthicum,limones,lesure,lesage,lauver,laubach,latshaw,lary,lapham,lacoste,lacher,kutcher,knickerbocker,klos,klingler,kleiman,kittleson,kimbrel,kemmerer,kelson,keese,kallas,jurgensen,junkins,juergens,jolliff,jelks,janicki,jang,ingles,huguley,huggard,howton,hone,holford,hogle,hipple,heimbach,heider,heidel,havener,hattaway,harrah,hanscom,hankinson,hamdan,gridley,goulette,goulart,goodrow,girardi,gent,gautreau,gandara,gamblin,galipeau,fyffe,furrow,fulp,fricks,frase,frandsen,fout,foulks,fouche,foskey,forgey,foor,fobbs,finklea,fincham,figueiredo,festa,ferrier,fellman,eslick,eilerman,eckart,eaglin,dunfee,dumond,drewry,douse,dimick,diener,dickert,deines,declue,daw,dattilo,danko,custodio,cuccia,crunk,crispin,corp,corea,coppin,considine,coniglio,conboy,cockrum,clute,clewis,christiano,channell,cerrato,cecere,catoe,castillon,castile,carstarphen,carmouche,caperton,buteau,bumpers,brey,brazeal,brassard,braga,bradham,bourget,borrelli,borba,boothby,bohr,bohm,boehme,bodin,bloss,blocher,bizzell,bieker,berthelot,bernardini,berends,benard,belser,baze,bartling,barrientes,barras,barcia,banfield,aurand,artman,arnott,arend,amon,almaguer,allee,albarado,alameda,abdo,zuehlke,zoeller,yokoyama,yocom,wyllie,woolum,wint,winland,wilner,wilmes,whitlatch,westervelt,walthall,walkowiak,walburn,viviano,vanderhoff,valez,ugalde,trumbull,todaro,tilford,tidd,tibbits,terranova,templeman,tannenbaum,talmage,tabarez,swearengin,swartwood,svendsen,strum,strack,storie,stockard,steinbeck,starns,stanko,stankiewicz,stacks,stach,sproles,spenser,smotherman,slusser,sinha,silber,siefert,siddiqui,shuff,sherburne,seldon,seddon,schweigert,schroeter,schmucker,saffold,rutz,rundle,rosinski,rosenow,rogalski,ridout,rhymer,replogle,raygoza,ratner,rascoe,rahm,quast,pressnell,predmore,pou,porto,pleasants,pigford,pavone,patnaude,parramore,papadopoulos,palmatier,ouzts,oshields,ortis,olmeda,olden,okamoto,norby,nitz,niebuhr,nevius,neiman,neidig,neece,murawski,mroz,moylan,moultry,mosteller,moring,morganti,mook,moffet,mettler,merlo,mengel,mendelsohn,meli,melchior,mcmeans,mcfaddin,mccullers,mccollister,mccloy,mcclaine,maury,maser,martelli,manthey,malkin,maio,magwood,maginnis,mabon,luton,lusher,lucht,lobato,levis,letellier,legendre,latson,larmon,largo,landreneau,landgraf,lamberson,kurland,kresge,korman,korando,klapper,kitson,kinyon,kincheloe,kawamoto,kawakami,jenney,jeanpierre,ivers,issa,ince,hollier,hollars,hoerner,hodgkinson,hiott,hibbitts,herlihy,henricks,heavner,hayhurst,harvill,harewood,hanselman,hanning,gustavson,grizzard,graybeal,gravley,gorney,goll,goehring,godines,gobeil,glickman,giuliano,gimbel,geib,gayhart,gatti,gains,gadberry,frei,fraise,fouch,forst,forsman,folden,fogleman,fetty,feely,fabry,eury,estill,epling,elamin,echavarria,dutil,duryea,dumais,drago,downard,douthit,doolin,dobos,dison,dinges,diebold,desilets,deshazo,depaz,degennaro,dall,cyphers,cryer,croce,crisman,credle,coriell,copp,compos,colmenero,cogar,carnevale,campanella,caley,calderone,burtch,brouwer,brehmer,brassell,brafford,bourquin,bourn,bohnert,blewett,blass,blakes,bhakta,besser,berge,bellis,balfour,avera,applin,ammon,alsop,aleshire,akbar,zoller,zapien,wymore,wyble,wolken,wix,wickstrom,whobrey,whigham,westerlund,welsch,weisser,weisner,weinstock,wehner,watlington,wakeland,wafer,victorino,veltri,veith,urich,uresti,umberger,twedt,tuohy,tschida,trumble,troia,trimmer,topps,tonn,tiernan,threet,thrall,thetford,teneyck,tartaglia,strohl,streater,strausbaugh,stradley,stonecipher,steadham,stansel,stalcup,stabile,sprenger,spradley,speier,southwood,sorrels,slezak,skow,sirmans,simental,sifford,sievert,shover,sheley,selzer,scriven,schwindt,schwan,schroth,saylors,saragosa,sant,salaam,saephan,routt,rousey,ros,rolfes,rieke,rieder,richeson,redinger,rasnick,rapoza,rambert,quist,pyron,pullman,przybylski,pridmore,pooley,pines,perkinson,perine,perham,pecor,peavler,partington,panton,oliverio,olague,ohman,ohearn,noyola,nicolai,nebel,murtha,mowrey,moroney,morgenstern,morant,monsour,moffit,mijares,meriwether,mendieta,melendrez,mejorado,mckittrick,mckey,mckenny,mckelvy,mcelvain,mccoin,mazzarella,mazon,maurin,matthies,maston,maske,marzano,marmon,marburger,mangus,mangino,mallet,luo,losada,londono,lobdell,lipson,lesniak,leighty,lei,lavallie,lareau,laperle,lape,laforce,laffey,kuehner,kravitz,kowalsky,kohr,kinsman,keppler,kennemer,keiper,kaler,jun,jelinek,jarnagin,isakson,hypes,hutzler,huls,horak,hitz,hice,herrell,henslee,heitz,heiss,heiman,hasting,hartwick,harmer,hammontree,hakes,guse,guillotte,groleau,greve,greenough,golub,golson,goldschmidt,golder,godbolt,gilmartin,gies,gibby,geren,genthner,gendreau,gemmill,gaymon,galyean,galeano,friar,folkerts,fleeman,fitzgibbons,ferranti,felan,farrand,eoff,enger,engels,ducksworth,duby,drumheller,douthitt,donis,dixion,dittrich,dials,descoteaux,depaul,denker,demuth,demelo,delacerda,deforge,danos,dalley,daigneault,cybulski,cothren,corns,corkery,copas,clubb,clore,chitty,chichester,chace,catanzaro,castonguay,cassella,carlberg,cammarata,calle,cajigas,byas,buzbee,busey,burling,bufkin,brzezinski,brun,brickner,brabham,boller,bockman,bleich,blakeman,bisbee,bier,bezanson,bevilacqua,besaw,berrian,bequette,beauford,baumgarten,baudoin,batie,basaldua,bardin,bangert,banes,backlund,avitia,artz,archey,apel,amico,alam,aden,zebrowski,yokota,wormley,wootton,womac,wiltz,wigington,whitehorn,whisman,weisgerber,weigle,weedman,watkin,wasilewski,wadlington,wadkins,viverette,vidaurri,vidales,vezina,vanleer,vanhoy,vanguilder,vanbrunt,updegraff,tylor,trinkle,touchette,tilson,tilman,tengan,tarkington,surrett,summy,streetman,straughter,steere,spruell,spadaro,solley,smathers,silvera,siems,shreffler,sholar,selden,schaper,samayoa,ruggeri,rowen,rosso,rosenbalm,roose,ronquillo,rogowski,rexford,repass,renzi,renick,rehberg,ranck,raffa,rackers,raap,puglisi,prinz,pounders,pon,pompa,plasencia,pipkins,petrosky,pelley,pauls,pauli,parkison,parisien,pangle,pancoast,palazzolo,owenby,overbay,orris,orlowski,nipp,newbern,nedd,nealon,najar,mysliwiec,myres,musson,murrieta,munsell,mumma,muldowney,moyle,mowen,morejon,moodie,monier,mikkelsen,miers,metzinger,melin,mcquay,mcpeek,mcneeley,mcglothin,mcghie,mcdonell,mccumber,mccranie,mcbean,mayhugh,marts,marenco,manges,lynam,lupien,luff,luebbert,loh,loflin,lococo,loch,lis,linke,lightle,lewellyn,leishman,lebow,lebouef,leanos,lanz,landy,landaverde,lacefield,kyler,kuebler,kropf,kroeker,kluesner,klass,kimberling,kilkenny,kiker,ketter,kelemen,keasler,kawamura,karst,kardos,igo,huseman,huseby,hurlbert,huard,hottinger,hornberger,hopps,holdsworth,hensen,heilig,heeter,harpole,haak,gutowski,gunnels,grimmer,gravatt,granderson,gotcher,gleaves,genao,garfinkel,frerichs,foushee,flanery,finnie,feldt,fagin,ewalt,ellefson,eiler,eckhart,eastep,digirolamo,didomenico,devera,delavega,defilippo,debusk,daub,damiani,cupples,crofoot,courter,coto,costigan,corning,corman,corlett,cooperman,collison,coghlan,cobbins,coady,coachman,clothier,cipolla,chmielewski,chiodo,chatterton,chappelle,chairez,ceron,casperson,casler,casados,carrow,carlino,carico,cardillo,caouette,canto,canavan,cambra,byard,buterbaugh,buse,bucy,buckwalter,bubb,bryd,brissette,brault,bradwell,boshears,borchert,blansett,biondo,biehl,bessey,belles,beeks,beekman,beaufort,bayliss,bardsley,avilla,astudillo,ardito,antunez,aderholt,abate,yowell,yin,yearby,wurst,woolverton,woolbright,wildermuth,whittenburg,whitely,wetherbee,wenz,welliver,welling,wason,warlick,voorhies,vivier,villines,verde,veiga,varghese,vanwyk,vanwingerden,vanhorne,umstead,twiggs,tusing,trego,tompson,tinkle,thoman,thole,tatman,tartt,suda,studley,strock,strawbridge,stokely,stec,stalter,speidel,spafford,sontag,sokolowski,skillman,skelley,skalski,sison,sippel,sinquefield,siegle,sher,sharrow,setliff,sellner,selig,seibold,seery,scriber,schull,schrupp,schippers,saulsbury,sao,santillo,sanor,rubalcaba,roosa,ronk,robbs,roache,riebe,reinoso,quin,preuss,pottorff,pontiff,plouffe,picou,picklesimer,pettyjohn,petti,penaloza,parmelee,pardee,palazzo,overholt,ogawa,ofarrell,nolting,noda,nickson,nevitt,neveu,navarre,murrow,munz,mulloy,monzo,milliman,metivier,merlino,mcpeters,mckissack,mckeen,mcgurk,mcfee,mcfarren,mcelwee,mceachin,mcdonagh,mccarville,mayhall,mattoon,martello,marconi,marbury,manzella,maly,malec,maitland,maheu,maclennan,lyke,luera,lowenstein,losh,lopiccolo,longacre,loman,loden,loaiza,lieber,libbey,lenhardt,lefebre,lauterbach,lauritsen,lass,larocco,larimer,lansford,lanclos,lamay,lal,kulikowski,kriebel,kosinski,kleinman,kleiner,kleckner,kistner,kissner,kissell,keisler,keeble,keaney,kale,joly,jimison,ikner,hursey,hruska,hove,hou,hosking,hoose,holle,hoeppner,hittle,hitchens,hirth,hinerman,higby,hertzog,hentz,hensler,heier,hegg,hassel,harpe,hara,hain,hagopian,grimshaw,grado,gowin,gowans,googe,goodlow,goering,gleaton,gidley,giannone,gascon,garneau,gambrel,galaz,fuentez,frisina,fresquez,fraher,feuerstein,felten,everman,ertel,erazo,ensign,endo,ellerman,eichorn,edgell,ebron,eaker,dundas,duncanson,duchene,ducan,dombroski,doman,dickison,dewoody,deloera,delahoussaye,dejean,degroat,decaro,dearmond,dashner,dales,crossett,cressey,cowger,cornette,corbo,coplin,coover,condie,cokley,ceaser,cannaday,callanan,cadle,buscher,bullion,bucklin,bruening,bruckner,brose,branan,bradway,botsford,bortz,borelli,bonetti,bolan,boerger,bloomberg,bingman,bilger,berns,beringer,beres,beets,beede,beaudet,beachum,baughn,bator,bastien,basquez,barreiro,barga,baratta,balser,baillie,axford,attebery,arakaki,annunziata,andrzejewski,ament,amendola,adcox,abril,zenon,zeitler,zambrana,ybanez,yagi,wolak,wilcoxson,whitesel,whitehair,weyand,westendorf,welke,weinmann,weesner,weekes,wedel,weatherall,warthen,vose,villalta,viator,vaz,valtierra,urbanek,tulley,trojanowski,trapani,toups,torpey,tomita,tindal,tieman,tevis,tedrow,taul,tash,tammaro,sylva,swiderski,sweeting,sund,stutler,stich,sterns,stegner,stalder,splawn,speirs,southwell,soltys,smead,slye,skipworth,sipos,simmerman,sidhu,shuffler,shingleton,shadwick,sermons,seefeldt,scipio,schwanke,schreffler,schiro,scheiber,sandoz,samsel,ruddell,royse,rouillard,rotella,rosalez,romriell,rizer,riner,rickards,rhoton,rhem,reppert,rayl,raulston,raposo,rainville,radel,quinney,purdie,pizzo,pincus,petrus,pendelton,pendarvis,peltz,peguero,peete,patricio,patchett,parrino,papke,palafox,ottley,ostby,oritz,ogan,odegaard,oatman,noell,nicoll,newhall,newbill,netzer,nettleton,neblett,murley,mungo,mulhall,mosca,morissette,morford,monsen,mitzel,miskell,minder,mehaffey,mcquillen,mclennan,mcgrail,mccreight,mayville,maysonet,maust,mathieson,mastrangelo,maskell,manz,malmberg,makela,madruga,lotts,longnecker,logston,littell,liska,lindauer,lillibridge,levron,letchworth,lesh,leffel,leday,leamon,kulas,kula,kucharski,kromer,kraatz,konieczny,konen,komar,kivett,kirts,kinnear,kersh,keithley,keifer,judah,jimenes,jeppesen,jansson,huntsberry,hund,huitt,huffine,hosford,holmstrom,hollen,hodgin,hirschman,hiltner,hilliker,hibner,hennis,helt,heidelberg,heger,heer,hartness,hardrick,halladay,gula,guillaume,guerriero,grunewald,grosse,griffeth,grenz,grassi,grandison,ginther,gimenez,gillingham,gillham,gess,gelman,gearheart,gaskell,gariepy,gamino,gallien,galentine,fuquay,froman,froelich,friedel,foos,fomby,focht,flythe,fiqueroa,filson,filip,fierros,fett,fedele,fasching,farney,fargo,everts,etzel,elzey,eichner,eger,eatman,ducker,duchesne,donati,domenech,dollard,dodrill,dinapoli,denn,delfino,delcid,delaune,delatte,deems,daluz,cusson,cullison,cuadrado,crumrine,cruickshank,crosland,croll,criddle,crepeau,coutu,couey,cort,coppinger,collman,cockburn,coca,clayborne,claflin,cissell,chowdhury,chicoine,chenier,causby,caulder,cassano,casner,cardiel,brunton,bruch,broxton,brosius,brooking,branco,bracco,bourgault,bosserman,bonet,bolds,bolander,bohman,boelter,blohm,blea,blaise,bischof,beus,bellew,bastarache,bast,bartolome,barcomb,barco,balk,balas,bakos,avey,atnip,ashbrook,arno,arbour,aquirre,appell,aldaco,alban,ahlstrom,abadie,zylstra,zick,yother,wyse,wunsch,whitty,weist,vrooman,villalon,vidrio,vavra,vasbinder,vanmatre,vandorn,ugarte,turberville,tuel,trogdon,toupin,toone,tolleson,tinkham,tinch,tiano,teston,teer,tawney,taplin,tant,tansey,swayne,sutcliffe,sunderman,strothers,stromain,stork,stoneburner,stolte,stolp,stoehr,stingley,stegman,stangl,spinella,spier,soules,sommerfield,sipp,simek,siders,shufelt,shue,shor,shires,shellenberger,sheely,sepe,seaberg,schwing,scherrer,scalzo,sasse,sarvis,santora,sansbury,salls,saleem,ryland,rybicki,ruggieri,rothenberg,rosenstein,roquemore,rollison,rodden,rivet,ridlon,riche,riccardi,reiley,regner,rech,rayo,raff,radabaugh,quon,quill,privette,prange,pickrell,perino,penning,pankratz,orlandi,nyquist,norrell,noren,naples,nale,nakashima,musselwhite,murrin,murch,mullinix,mullican,mullan,morneau,mondor,molinar,minjares,minix,minchew,milewski,mikkelson,mifflin,merkley,meis,meas,mcroy,mcphearson,mcneel,mcmunn,mcmorrow,mcdorman,mccroskey,mccoll,mcclusky,mcclaran,mccampbell,mazzariello,mauzy,mauch,mastro,martinek,marsala,marcantel,mahle,luciani,lubbers,lobel,linch,liller,legros,layden,lapine,lansberry,lage,laforest,labriola,koga,knupp,klimek,kittinger,kirchoff,kinzel,killinger,kilbourne,ketner,kepley,kemble,kells,kear,kaya,karsten,kaneshiro,kamm,joines,joachim,jacobus,iler,holgate,hoar,hisey,hird,hilyard,heslin,herzberg,hennigan,hegland,hartl,haner,handel,gualtieri,greenly,grasser,goetsch,godbold,gilland,gidney,gibney,giancola,gettinger,garzon,galle,galgano,gaier,gaertner,fuston,freel,fortes,fiorillo,figgs,fenstermacher,fedler,facer,fabiano,evins,euler,esquer,enyeart,elem,eich,edgerly,durocher,durgan,duffin,drolet,drewes,dotts,dossantos,dockins,dirksen,difiore,dierks,dickerman,dery,denault,demaree,delmonte,delcambre,daulton,darst,dahle,curnutt,cully,culligan,cueva,crosslin,croskey,cromartie,crofts,covin,coutee,coppa,coogan,condrey,concannon,coger,cloer,clatterbuck,cieslak,chumbley,choudhury,chiaramonte,charboneau,carneal,cappello,campisi,callicoat,burgoyne,bucholz,brumback,brosnan,brogden,broder,brendle,breece,bown,bou,boser,bondy,bolster,boll,bluford,blandon,biscoe,bevill,bence,battin,basel,bartram,barnaby,barmore,balbuena,badgley,backstrom,auyeung,ater,arrellano,arant,ansari,alling,alejandre,alcock,alaimo,aguinaldo,aarons,zurita,zeiger,zawacki,yutzy,yarger,wygant,wurm,wuest,witherell,wisneski,whitby,whelchel,weisz,weisinger,weishaar,wehr,waxman,waldschmidt,walck,waggener,vosburg,villela,vercher,venters,vanscyoc,vandyne,valenza,utt,urick,ungar,ulm,tumlin,tsao,tryon,trudel,treiber,tober,tipler,tillson,tiedemann,thornley,tetrault,temme,tarrance,tackitt,sykora,sweetman,swatzell,sutliff,suhr,sturtz,strub,strayhorn,stormer,steveson,stengel,steinfeldt,spiro,spieker,speth,spero,soza,souliere,soucie,snedeker,slifer,skillings,situ,siniard,simeon,signorelli,siggers,shultis,shrewsbury,shippee,shimp,shepler,sharpless,shadrick,severt,severs,semon,semmes,seiter,segers,sclafani,sciortino,schroyer,schrack,schoenberg,schober,scheidt,scheele,satter,sartori,sarratt,salvaggio,saladino,sakamoto,saine,ryman,rumley,ruggerio,rucks,roughton,robards,ricca,rexroad,resler,reny,rentschler,redrick,redick,reagle,raymo,raker,racette,pyburn,pritt,presson,pressman,pough,pisani,perz,perras,pelzer,pedrosa,palos,palmisano,paille,orem,orbison,oliveros,nourse,nordquist,newbury,nelligan,nawrocki,myler,mumaw,morphis,moldenhauer,miyashiro,mignone,mickelsen,michalec,mesta,mcree,mcqueary,mcninch,mcneilly,mclelland,mclawhorn,mcgreevy,mcconkey,mattes,maselli,marten,marcucci,manseau,manjarrez,malbrough,machin,mabie,lynde,lykes,lueras,lokken,loken,linzy,lillis,lilienthal,levey,legler,leedom,lebowitz,lazzaro,larabee,lapinski,langner,langenfeld,lampkins,lamotte,lambright,lagarde,ladouceur,labounty,lablanc,laberge,kyte,kroon,kron,kraker,kouba,kirwin,kincer,kimbler,kegler,keach,katzman,katzer,kalman,jimmerson,jenning,janus,iacovelli,hust,huson,husby,humphery,hufnagel,honig,holsey,holoman,hohl,hogge,hinderliter,hildebrant,hemby,helle,heintzelman,heidrick,hearon,hazelip,hauk,hasbrouck,harton,hartin,harpster,hansley,hanchett,haar,guthridge,gulbranson,guill,guerrera,grund,grosvenor,grist,grell,grear,granberry,gonser,giunta,giuliani,gillon,gillmore,gillan,gibbon,gettys,gelb,gano,galliher,fullen,frese,frates,foxwell,fleishman,fleener,fielden,ferrera,fells,feemster,fauntleroy,evatt,espy,eno,emmerich,edler,eastham,dunavant,duca,drinnon,dowe,dorgan,dollinger,dipalma,difranco,dietrick,denzer,demarest,delee,delariva,delany,decesare,debellis,deavers,deardorff,dawe,darosa,darley,dalzell,dahlen,curto,cupps,cunniff,cude,crivello,cripps,cresswell,cousar,cotta,compo,clyne,clayson,cearley,catania,carini,cantero,buttrey,buttler,burpee,bulkley,buitron,buda,bublitz,bryer,bryden,brouillette,brott,brookman,bronk,breshears,brennen,brannum,brandl,braman,bracewell,boyter,bomberger,bogen,boeding,blauvelt,blandford,biermann,bielecki,bibby,berthold,berkman,belvin,bellomy,beland,behne,beecham,becher,bax,bassham,barret,baley,auxier,atkison,ary,arocha,arechiga,anspach,algarin,alcott,alberty,ager,ackman,abdallah,zwick,ziemer,zastrow,zajicek,yokum,yokley,wittrock,winebarger,wilker,wilham,whitham,wetzler,westling,westbury,wendler,wellborn,weitzman,weitz,wallner,waldroup,vrabel,vowels,volker,vitiello,visconti,villicana,vibbert,vesey,vannatter,vangilder,vandervort,vandegrift,vanalstyne,vallecillo,usrey,tynan,turpen,tuller,trisler,townson,tillmon,threlkeld,thornell,terrio,taunton,tarry,tardy,swoboda,swihart,sustaita,suitt,stuber,strine,stookey,stmartin,stiger,stainbrook,solem,smail,sligh,siple,sieben,shumake,shriner,showman,sheen,sheckler,seim,secrist,scoggin,schultheis,schmalz,schendel,schacher,savard,saulter,santillanes,sandiford,sande,salzer,salvato,saltz,sakai,ryckman,ryant,ruck,rittenberry,ristau,richart,rhynes,reyer,reulet,reser,redington,reddington,rebello,reasor,raftery,rabago,raasch,quintanar,pylant,purington,provencal,prioleau,prestwood,pothier,popa,polster,politte,poffenberger,pinner,pietrzak,pettie,penaflor,pellot,pellham,paylor,payeur,papas,paik,oyola,osbourn,orzechowski,oppenheimer,olesen,oja,ohl,nuckolls,nordberg,noonkester,nold,nitta,niblett,neuhaus,nesler,nanney,myrie,mutch,mosquera,morena,montalto,montagna,mizelle,mincy,millikan,millay,miler,milbourn,mikels,migues,miesner,mershon,merrow,meigs,mealey,mcraney,mcmartin,mclachlan,mcgeehan,mcferren,mcdole,mccaulley,mcanulty,maziarz,maul,mateer,martinsen,marson,mariotti,manna,mance,malbon,magnusson,maclachlan,macek,lurie,luc,lown,loranger,lonon,lisenby,linsley,lenk,leavens,lauritzen,lathem,lashbrook,landman,lamarche,lamantia,laguerre,lagrange,kogan,klingbeil,kist,kimpel,kime,kier,kerfoot,kennamer,kellems,kammer,kamen,jepsen,jarnigan,isler,ishee,hux,hungate,hummell,hultgren,huffaker,hruby,hornick,hooser,hooley,hoggan,hirano,hilley,higham,heuser,henrickson,henegar,hellwig,hedley,hasegawa,hartt,hambright,halfacre,hafley,guion,guinan,grunwald,grothe,gries,greaney,granda,grabill,gothard,gossman,gosser,gossard,gosha,goldner,gobin,ginyard,gilkes,gilden,gerson,gephart,gengler,gautier,gassett,garon,galusha,gallager,galdamez,fulmore,fritsche,fowles,foutch,footman,fludd,ferriera,ferrero,ferreri,fenimore,fegley,fegan,fearn,farrier,fansler,fane,falzone,fairweather,etherton,elsberry,dykema,duppstadt,dunnam,dunklin,duet,dudgeon,dubuc,doxey,donmoyer,dodgen,disanto,dingler,dimattia,dilday,digennaro,diedrich,derossett,depp,demasi,degraffenreid,deakins,deady,davin,daigre,daddario,czerwinski,cullens,cubbage,cracraft,combest,coletti,coghill,claybrooks,christofferse,chiesa,chason,chamorro,celentano,cayer,carolan,carnegie,capetillo,callier,cadogan,caba,byrom,byrns,burrowes,burket,burdge,burbage,buchholtz,brunt,brungardt,brunetti,brumbelow,brugger,broadhurst,brigance,brandow,bouknight,bottorff,bottomley,bosarge,borger,bombardier,boggan,blumer,blecha,birney,birkland,betances,beran,belin,belgrave,bealer,bauch,bashir,bartow,baro,barnhouse,barile,ballweg,baisley,bains,baehr,badilla,bachus,bacher,bachelder,auzenne,aten,astle,allis,agarwal,adger,adamek,ziolkowski,zinke,zazueta,zamorano,younkin,wittig,witman,winsett,winkles,wiedman,whitner,whitcher,wetherby,westra,westhoff,wehrle,wagaman,voris,vicknair,veasley,vaugh,vanderburg,valletta,tunney,trumbo,truluck,trueman,truby,trombly,tourville,tostado,titcomb,timpson,tignor,thrush,thresher,thiede,tews,tamplin,taff,tacker,syverson,sylvestre,summerall,stumbaugh,strouth,straker,stradford,stokley,steinhoff,steinberger,spigner,soltero,snively,sletten,sinkler,sinegal,simoes,siller,sigel,shire,shinkle,shellman,sheller,sheats,sharer,selvage,sedlak,schriver,schimke,scheuerman,schanz,savory,saulters,sauers,sais,rusin,rumfelt,ruhland,rozar,rosborough,ronning,rolph,roloff,robie,rimer,riehle,ricco,rhein,retzlaff,reisman,reimann,rayes,raub,raminez,quesinberry,pua,procopio,priolo,printz,prewett,preas,prahl,poovey,ploof,platz,plaisted,pinzon,pineiro,pickney,petrovich,perl,pehrson,peets,pavon,pautz,pascarella,paras,paolini,pafford,oyer,ovellette,outten,outen,orduna,odriscoll,oberlin,nosal,niven,nisbett,nevers,nathanson,mukai,mozee,mowers,motyka,morency,montford,mollica,molden,mitten,miser,millender,midgette,messerly,melendy,meisel,meidinger,meany,mcnitt,mcnemar,mcmakin,mcgaugh,mccaa,mauriello,maudlin,matzke,mattia,matsumura,masuda,mangels,maloof,malizia,mahmoud,maglione,maddix,lucchesi,lochner,linquist,lietz,leventhal,lemanski,leiser,laury,lauber,lamberth,kuss,kulik,kuiper,krout,kotter,kort,kohlmeier,koffler,koeller,knipe,knauss,kleiber,kissee,kirst,kirch,kilgo,kerlin,kellison,kehl,kalb,jorden,jantzen,inabinet,ikard,husman,hunsberger,hundt,hucks,houtz,houseknecht,hoots,hogsett,hogans,hintze,hession,henault,hemming,helsley,heinen,heffington,heberling,heasley,hazley,hazeltine,hayton,hayse,hawke,haston,harward,harrow,hanneman,hafford,hadnot,guerro,grahm,gowins,gordillo,goosby,glatt,gibbens,ghent,gerrard,germann,gebo,gean,garling,gardenhire,garbutt,gagner,furguson,funchess,fujiwara,fujita,friley,frigo,forshee,folkes,filler,fernald,ferber,feingold,faul,farrelly,fairbank,failla,espey,eshleman,ertl,erhart,erhardt,erbe,elsea,ells,ellman,eisenhart,ehmann,earnhardt,duplantis,dulac,ducote,draves,dosch,dolce,divito,dimauro,derringer,demeo,demartini,delima,dehner,degen,defrancisco,defoor,dedeaux,debnam,cypert,cutrer,cusumano,custis,croker,courtois,costantino,cormack,corbeil,copher,conlan,conkling,cogdell,cilley,chapdelaine,cendejas,castiglia,cashin,carstensen,caprio,calcote,calaway,byfield,butner,bushway,burritt,browner,brobst,briner,bridger,brickley,brendel,bratten,bratt,brainerd,brackman,bowne,bouck,borunda,bordner,bonenfant,boer,boehmer,bodiford,bleau,blankinship,blane,blaha,bitting,bissonette,bigby,bibeau,bermudes,berke,bergevin,bergerson,bendel,belville,bechard,bearce,beadles,batz,bartlow,ayoub,avans,aumiller,arviso,arpin,arnwine,armwood,arent,arehart,arcand,antle,ambrosino,alongi,alm,allshouse,ahart,aguon,ziebarth,zeledon,zakrzewski,yuhas,yingst,yedinak,wommack,winnett,wingler,wilcoxen,whitmarsh,wayt,watley,warkentin,voll,vogelsang,voegele,vivanco,vinton,villafane,viles,ver,venne,vanwagoner,vanwagenen,vanleuven,vanauken,uselton,uren,trumbauer,tritt,treadaway,tozier,tope,tomczak,tomberlin,tomasini,tollett,toller,titsworth,tirrell,tilly,tavera,tarnowski,tanouye,swarthout,sutera,surette,styers,styer,stipe,stickland,stembridge,stearn,starkes,stanberry,stahr,spino,spicher,sperber,speece,sonntag,sneller,smalling,slowik,slocumb,sliva,slemp,slama,sitz,sisto,sisemore,sindelar,shipton,shillings,sheeley,sharber,shaddix,severns,severino,sensabaugh,seder,seawell,seamons,schrantz,schooler,scheffer,scheerer,scalia,saum,santibanez,sano,sanjuan,sampley,sailer,sabella,sabbagh,royall,rottman,rivenbark,rikard,ricketson,rickel,rethman,reily,reddin,reasoner,rast,ranallo,quintal,pung,pucci,proto,prosperie,prim,preusser,preslar,powley,postma,pinnix,pilla,pietsch,pickerel,pica,pharris,petway,petillo,perin,pereda,pennypacker,pennebaker,pedrick,patin,patchell,parodi,parman,pantano,padua,padro,osterhout,orner,olivar,ohlson,odonoghue,oceguera,oberry,novello,noguera,newquist,newcombe,neihoff,nehring,nees,nebeker,mundo,mullenix,morrisey,moronta,morillo,morefield,mongillo,molino,minto,midgley,michie,menzies,medved,mechling,mealy,mcshan,mcquaig,mcnees,mcglade,mcgarity,mcgahey,mcduff,mayweather,mastropietro,masten,maranto,maniscalco,maize,mahmood,maddocks,maday,macha,maag,luken,lopp,lolley,llanas,litz,litherland,lindenberg,lieu,letcher,lentini,lemelle,leet,lecuyer,leber,laursen,larrick,lantigua,langlinais,lalli,lafever,labat,labadie,krogman,kohut,knarr,klimas,klar,kittelson,kirschbaum,kintzel,kincannon,kimmell,killgore,kettner,kelsch,karle,kapoor,johansson,jenkinson,janney,iraheta,insley,hyslop,huckstep,holleran,hoerr,hinze,hinnenkamp,hilger,higgin,hicklin,heroux,henkle,helfer,heikkinen,heckstall,heckler,heavener,haydel,haveman,haubert,harrop,harnois,hansard,hanover,hammitt,haliburton,haefner,hadsell,haakenson,guynn,guizar,grout,grosz,gomer,golla,godby,glanz,glancy,givan,giesen,gerst,gayman,garraway,gabor,furness,frisk,fremont,frary,forand,fessenden,ferrigno,fearon,favreau,faulks,falbo,ewen,eurich,etchison,esterly,entwistle,ellingsworth,eisenbarth,edelson,eckel,earnshaw,dunneback,doyal,donnellan,dolin,dibiase,deschenes,dermody,degregorio,darnall,dant,dansereau,danaher,dammann,dames,czarnecki,cuyler,custard,cummingham,cuffie,cuffee,cudney,cuadra,crigler,creger,coughlan,corvin,cortright,corchado,connery,conforti,condron,colosimo,colclough,cohee,ciotti,chien,chacko,cevallos,cavitt,cavins,castagna,cashwell,carrozza,carrara,capra,campas,callas,caison,caggiano,bynoe,buswell,burpo,burnam,burges,buerger,buelow,bueche,bruni,brummitt,brodersen,briese,breit,brakebill,braatz,boyers,boughner,borror,borquez,bonelli,bohner,blaker,blackmer,bissette,bibbins,bhatt,bhatia,bessler,bergh,beresford,bensen,benningfield,bellantoni,behler,beehler,beazley,beauchesne,bargo,bannerman,baltes,balog,ballantyne,axelson,apgar,aoki,anstett,alejos,alcocer,albury,aichele,ackles,zerangue,zehner,zank,zacarias,youngberg,yorke,yarbro,wydra,worthley,wolbert,wittmer,witherington,wishart,winkleman,willilams,willer,wiedeman,whittingham,whitbeck,whetsel,wheless,westerberg,welcher,wegman,waterfield,wasinger,warfel,wannamaker,walborn,wada,vogl,vizcarrondo,vitela,villeda,veras,venuti,veney,ulrey,uhlig,turcios,tremper,torian,torbett,thrailkill,terrones,teitelbaum,teems,swoope,sunseri,stutes,stthomas,strohm,stroble,striegel,streicher,stodola,stinchcomb,steves,steppe,steller,staudt,starner,stamant,stam,stackpole,sprankle,speciale,spahr,sowders,sova,soluri,soderlund,slinkard,sjogren,sirianni,siewert,sickels,sica,shugart,shoults,shive,shimer,shier,shepley,sheeran,sevin,seto,segundo,sedlacek,scuderi,schurman,schuelke,scholten,schlater,schisler,schiefelbein,schalk,sanon,sabala,ruyle,ruybal,rueb,rowsey,rosol,rocheleau,rishel,rippey,ringgold,rieves,ridinger,retherford,rempe,reith,rafter,raffaele,quinto,putz,purdom,puls,pulaski,propp,principato,preiss,prada,polansky,poch,plath,pittard,pinnock,pfarr,pfannenstiel,penniman,pauling,patchen,paschke,parkey,pando,ouimet,ottman,ostlund,ormiston,occhipinti,nowacki,norred,noack,nishida,nilles,nicodemus,neth,nealey,myricks,murff,mungia,motsinger,moscato,morado,monnier,molyneux,modzelewski,miura,minich,militello,milbrandt,michalik,meserve,mendivil,melara,mcnish,mcelhannon,mccroy,mccrady,mazzella,maule,mattera,mathena,matas,mascorro,marinello,marguez,manwaring,manhart,mangano,maggi,lymon,luter,luse,lukasik,luiz,ludlum,luczak,lowenthal,lossett,lorentzen,loredo,longworth,lomanto,lisi,lish,lipsky,linck,liedtke,levering,lessman,lemond,lembo,ledonne,leatham,laufer,lanphear,langlais,lamphear,lamberton,lafon,lade,lacross,kyzer,krok,kring,krell,krehbiel,kratochvil,krach,kovar,kostka,knudtson,knaack,kliebert,klahn,kirkley,kimzey,kerrick,kennerson,keesler,karlin,janousek,imel,icenhour,hyler,hudock,houpt,holquin,holiman,holahan,hodapp,hillen,hickmon,hersom,henrich,helvey,heidt,heideman,hedstrom,hedin,hebron,hayter,harn,hardage,halsted,hahne,hagemann,guzik,guel,groesbeck,gritton,grego,graziani,grasty,graney,gouin,gossage,golston,goheen,godina,glade,giorgi,giambrone,gerrity,gerrish,gero,gerling,gaulke,garlick,galiano,gaiter,gahagan,gagnier,friddle,fredericksen,franqui,follansbee,foerster,flury,fitzmaurice,fiorini,finlayson,fiecke,fickes,fichter,ferron,farrel,fackler,eyman,escarcega,errico,erler,erby,engman,engelmann,elsass,elliston,eddleman,eadie,dummer,drost,dorrough,dorrance,doolan,donalson,domenico,ditullio,dittmar,dishon,dionisio,dike,devinney,desir,deschamp,derrickson,delamora,deitch,dechant,danek,dahmen,curci,cudjoe,croxton,creasman,craney,crader,cowling,coulston,cortina,corlew,corl,copland,convery,cohrs,clune,clausing,cipriani,cianciolo,chubb,chittum,chenard,charlesworth,charlebois,champine,chamlee,chagoya,casselman,cardello,capasso,cannella,calderwood,byford,buttars,bushee,burrage,buentello,brzozowski,bryner,brumit,brookover,bronner,bromberg,brixey,brinn,briganti,bremner,brawn,branscome,brannigan,bradsher,bozek,boulay,bormann,bongiorno,bollin,bohler,bogert,bodenhamer,blose,bivona,billips,bibler,benfer,benedetti,belue,bellanger,belford,behn,barnhardt,baltzell,balling,balducci,bainter,babineau,babich,baade,attwood,asmus,asaro,artiaga,applebaum,anding,amar,amaker,allsup,alligood,alers,agin,agar,achenbach,abramowitz,abbas,aasen,zehnder,yopp,yelle,yeldell,wynter,woodmansee,wooding,woll,winborne,willsey,willeford,widger,whiten,whitchurch,whang,weissinger,weinman,weingartner,weidler,waltrip,wagar,wafford,vitagliano,villalvazo,villacorta,vigna,vickrey,vicini,ventimiglia,vandenbosch,valvo,valazquez,utsey,urbaniak,unzueta,trombetta,trevizo,trembley,tremaine,traverso,tores,tolan,tillison,tietjen,teachout,taube,tatham,tarwater,tarbell,sydow,swims,swader,striplin,stoltenberg,steinhauer,steil,steigerwald,starkweather,stallman,squier,sparacino,spadafora,shiflet,shibata,shevlin,sherrick,sessums,servais,senters,seevers,seelye,searfoss,seabrooks,scoles,schwager,schrom,schmeltzer,scheffel,sawin,saterfiel,sardina,sanroman,sandin,salamanca,saladin,sabia,rustin,rushin,ruley,rueter,rotter,rosenzweig,rohe,roder,riter,rieth,ried,ridder,rennick,remmers,remer,relyea,reilley,reder,rasheed,rakowski,rabin,queener,pursel,prowell,pritts,presler,pouncy,porche,porcaro,pollman,pleas,planas,pinkley,pinegar,pilger,philson,petties,perrodin,pendergrast,patao,pasternak,passarelli,pasko,parshall,panos,panella,palombo,padillo,oyama,overlock,overbeck,otterson,orrell,ornellas,opitz,okelly,obando,noggle,nicosia,netto,negrin,natali,nakayama,nagao,nadel,musial,murrill,murrah,munsch,mucci,mrozek,moyes,mowrer,moris,morais,moorhouse,monico,mondy,moncayo,miltenberger,milsap,milone,millikin,milardo,micheals,micco,meyerson,mericle,mendell,meinhardt,meachum,mcleroy,mcgray,mcgonigal,maultsby,matis,matheney,matamoros,marro,marcil,marcial,mantz,mannings,maltby,malchow,maiorano,mahn,mahlum,maglio,maberry,lustig,luellen,longwell,longenecker,lofland,locascio,linney,linneman,lighty,levell,levay,lenahan,lemen,lehto,lebaron,lanctot,lamy,lainez,laffoon,labombard,kujawski,kroger,kreutzer,korhonen,kondo,kollman,kohan,kogut,knaus,kivi,kittel,kinner,kindig,kindel,kiesel,kibby,khang,kettler,ketterer,kepner,kelliher,keenum,kanode,kail,juhasz,jowett,jolicoeur,jeon,iser,ingrassia,imai,hutchcraft,humiston,hulings,hukill,huizenga,hugley,hornyak,hodder,hisle,hillenbrand,hille,higuchi,hertzler,herdon,heppner,hepp,heitmann,heckart,hazlewood,hayles,hayek,hawkin,haugland,hasler,harbuck,happel,hambly,hambleton,hagaman,guzzi,gullette,guinyard,grogg,grise,griffing,goto,gosney,goley,goldblatt,gledhill,girton,giltner,gillock,gilham,gilfillan,giblin,gentner,gehlert,gehl,garten,garney,garlow,garett,galles,galeana,futral,fuhr,friedland,franson,fransen,foulds,follmer,foland,flax,flavin,firkins,fillion,figueredo,ferrill,fenster,fenley,fauver,farfan,eustice,eppler,engelman,engelke,emmer,elzy,ellwood,ellerbee,elks,ehret,ebbert,durrah,dupras,dubuque,dragoo,donlon,dolloff,dibella,derrico,demko,demar,darrington,czapla,crooker,creagh,cranor,craner,crabill,coyer,cowman,cowherd,cottone,costillo,coster,costas,cosenza,corker,collinson,coello,clingman,clingerman,claborn,chmura,chausse,chaudhry,chapell,chancy,cerrone,caverly,caulkins,carn,campfield,campanelli,callaham,cadorette,butkovich,buske,burrier,burkley,bunyard,buckelew,buchheit,broman,brescia,brasel,boyster,booe,bonomo,bondi,bohnsack,blomberg,blanford,bilderback,biggins,bently,behrends,beegle,bedoya,bechtol,beaubien,bayerl,baumgart,baumeister,barratt,barlowe,barkman,barbagallo,baldree,baine,baggs,bacote,aylward,ashurst,arvidson,arthurs,arrieta,arrey,arreguin,arrant,arner,arizmendi,anker,amis,amend,alphin,allbright,aikin,zupan,zuchowski,zeolla,zanchez,zahradnik,zahler,younan,yeater,yearta,yarrington,yantis,woomer,wollard,wolfinger,woerner,witek,wishon,wisener,wingerter,willet,wilding,wiedemann,weisel,wedeking,waybright,wardwell,walkins,waldorf,voth,voit,virden,viloria,villagran,vasta,vashon,vaquera,vantassell,vanderlinden,vandergrift,vancuren,valenta,underdahl,tygart,twining,twiford,turlington,tullius,tubman,trowell,trieu,transue,tousant,torgersen,tooker,tome,toma,tocci,tippins,tinner,timlin,tillinghast,tidmore,teti,tedrick,tacey,swanberg,sunde,summitt,summerford,summa,stratman,strandberg,storck,stober,steitz,stayer,stauber,staiger,sponaugle,spofford,sparano,spagnola,sokoloski,snay,slough,skowronski,sieck,shimkus,sheth,sherk,shankles,shahid,sevy,senegal,seiden,seidell,searls,searight,schwalm,schug,schilke,schier,scheck,sawtelle,santore,sanks,sandquist,sanden,saling,saathoff,ryberg,rustad,ruffing,rudnicki,ruane,rozzi,rowse,rosenau,rodes,risser,riggin,riess,riese,rhoten,reinecke,reigle,reichling,redner,rebelo,raynes,raimondi,rahe,rada,querry,quellette,pulsifer,prochnow,prato,poulton,poudrier,policastro,polhemus,polasek,poissant,pohlmann,plotner,pitkin,pita,pinkett,piekarski,pichon,pfau,petroff,petermann,peplinski,peller,pecinovsky,pearse,pattillo,patague,parlier,parenti,parchman,pane,paff,ortner,oros,nolley,noakes,nigh,nicolosi,nicolay,newnam,netter,nass,napoles,nakata,nakamoto,morlock,moraga,montilla,mongeau,molitor,mohney,mitchener,meyerhoff,medel,mcniff,mcmonagle,mcglown,mcglinchey,mcgarrity,mccright,mccorvey,mcconnel,mccargo,mazzei,matula,mastroianni,massingale,maring,maricle,mans,mannon,mannix,manney,manalo,malo,malan,mahony,madril,mackowiak,macko,macintosh,lurry,luczynski,lucke,lucarelli,losee,lorence,loiacono,lohse,loder,lipari,linebarger,lindamood,limbaugh,letts,leleux,leep,leeder,leard,laxson,lawry,laverdiere,laughton,lastra,kurek,kriss,krishnan,kretschmer,krebsbach,kontos,knobel,knauf,klick,kleven,klawitter,kitchin,kirkendoll,kinkel,kingrey,kilbourn,kensinger,kennerly,kamin,justiniano,jurek,junkin,judon,jordahl,jeanes,jarrells,iwamoto,ishida,immel,iman,ihle,hyre,hurn,hunn,hultman,huffstetler,huffer,hubner,howey,hooton,holts,holscher,holen,hoggatt,hilaire,herz,henne,helstrom,hellickson,heinlein,heckathorn,heckard,headlee,hauptman,haughey,hatt,harring,harford,hammill,hamed,halperin,haig,hagwood,hagstrom,gunnells,gundlach,guardiola,greeno,greenland,gonce,goldsby,gobel,gisi,gillins,gillie,germano,geibel,gauger,garriott,garbarino,gajewski,funari,fullbright,fuell,fritzler,freshwater,freas,fortino,forbus,flohr,flemister,fisch,finks,fenstermaker,feldstein,farhat,fankhauser,fagg,fader,exline,emigh,eguia,edman,eckler,eastburn,dunmore,dubuisson,dubinsky,drayer,doverspike,doubleday,doten,dorner,dolson,dohrmann,disla,direnzo,dipaola,dines,diblasi,dewolf,desanti,dennehy,demming,delker,decola,davilla,daughtridge,darville,darland,danzy,dagenais,culotta,cruzado,crudup,croswell,coverdale,covelli,couts,corbell,coplan,coolbaugh,conyer,conlee,conigliaro,comiskey,coberly,clendening,clairmont,cienfuegos,chojnacki,chilcote,champney,cassara,casazza,casado,carew,carbin,carabajal,calcagni,cail,busbee,burts,burbridge,bunge,bundick,buhler,bucholtz,bruen,broce,brite,brignac,brierly,bridgman,braham,bradish,boyington,borjas,bonn,bonhomme,bohlen,bogardus,bockelman,blick,blackerby,bizier,biro,binney,bertolini,bertin,berti,bento,beno,belgarde,belding,beckel,becerril,bazaldua,bayes,bayard,barrus,barris,baros,bara,ballow,bakewell,baginski,badalamenti,backhaus,avilez,auvil,atteberry,ardon,anzaldua,anello,amsler,ambrosio,althouse,alles,alberti,alberson,aitchison,aguinaga,ziemann,zickefoose,zerr,zeck,zartman,zahm,zabriskie,yohn,yellowhair,yeaton,yarnall,yaple,wolski,wixon,willner,willms,whitsitt,wheelwright,weyandt,wess,wengerd,weatherholtz,wattenbarger,walrath,walpole,waldrip,voges,vinzant,viars,veres,veneziano,veillon,vawter,vaughns,vanwart,vanostrand,valiente,valderas,uhrig,tunison,tulloch,trostle,treaster,traywick,toye,tomson,tomasello,tomasek,tippit,tinajero,tift,tienda,thorington,thieme,thibeau,thakkar,tewell,telfer,sweetser,stratford,stracener,stoke,stiverson,stelling,spatz,spagnoli,sorge,slevin,slabaugh,simson,shupp,shoultz,shotts,shiroma,shetley,sherrow,sheffey,shawgo,shamburger,sester,segraves,seelig,scioneaux,schwartzkopf,schwabe,scholes,schluter,schlecht,schillaci,schildgen,schieber,schewe,schecter,scarpelli,scaglione,sautter,santelli,salmi,sabado,ryer,rydberg,ryba,rushford,runk,ruddick,rotondo,rote,rosenfield,roesner,rocchio,ritzer,rippel,rimes,riffel,richison,ribble,reynold,resh,rehn,ratti,rasor,rasnake,rappold,rando,radosevich,pulice,prichett,pribble,poynor,plowden,pitzen,pittsley,pitter,philyaw,philipps,pestana,perro,perone,pera,peil,pedone,pawlowicz,pattee,parten,parlin,pariseau,paredez,paek,pacifico,otts,ostrow,osornio,oslund,orso,ooten,onken,oniel,onan,ollison,ohlsen,ohlinger,odowd,niemiec,neubert,nembhard,neaves,neathery,nakasone,myerson,muto,muntz,munez,mumme,mumm,mujica,muise,muench,morriss,molock,mishoe,minier,metzgar,mero,meiser,meese,mcsween,mcquire,mcquinn,mcpheeters,mckeller,mcilrath,mcgown,mcdavis,mccuen,mcclenton,maxham,matsui,marriner,marlette,mansur,mancino,maland,majka,maisch,maheux,madry,madriz,mackley,macke,lydick,lutterman,luppino,lundahl,lovingood,loudon,longmore,liefer,leveque,lescarbeau,lemmer,ledgerwood,lawver,lawrie,lattea,lasko,lahman,kulpa,kukowski,kukla,kubota,kubala,krizan,kriz,krikorian,kravetz,kramp,kowaleski,knobloch,klosterman,kloster,klepper,kirven,kinnaman,kinnaird,killam,kiesling,kesner,keebler,keagle,karls,kapinos,kantner,kaba,junious,jefferys,jacquet,izzi,ishii,irion,ifill,hotard,horman,hoppes,hopkin,hokanson,hoda,hocutt,hoaglin,hites,hirai,hindle,hinch,hilty,hild,hier,hickle,hibler,henrichs,hempstead,helmers,hellard,heims,heidler,hawbaker,harkleroad,harari,hanney,hannaford,hamid,haltom,hallford,guilliams,guerette,gryder,groseclose,groen,grimley,greenidge,graffam,goucher,goodenough,goldsborough,gloster,glanton,gladson,gladding,ghee,gethers,gerstein,geesey,geddie,gayer,gaver,gauntt,gartland,garriga,garoutte,fronk,fritze,frenzel,forgione,fluitt,flinchbaugh,flach,fiorito,finan,finamore,fimbres,fillman,figeroa,ficklin,feher,feddersen,fambro,fairbairn,eves,escalona,elsey,eisenstein,ehrenberg,eargle,drane,dogan,dively,dewolfe,dettman,desiderio,desch,dennen,denk,demaris,delsignore,dejarnette,deere,dedman,daws,dauphinais,danz,dantin,dannenberg,dalby,currence,culwell,cuesta,croston,crossno,cromley,crisci,craw,coryell,condra,colpitts,colas,clink,clevinger,clermont,cistrunk,cirilo,chirico,chiarello,cephus,cecena,cavaliere,caughey,casimir,carwell,carlon,carbonaro,caraveo,cantley,callejas,cagney,cadieux,cabaniss,bushard,burlew,buras,budzinski,bucklew,bruneau,brummer,brueggemann,brotzman,bross,brittian,brimage,briles,brickman,breneman,breitenstein,brandel,brackins,boydstun,botta,bosket,boros,borgmann,bordeau,bonifacio,bolten,boehman,blundell,bloodsaw,bjerke,biffle,bickett,bickers,beville,bergren,bergey,benzing,belfiore,beirne,beckert,bebout,baumert,battey,barrs,barriere,barcelo,barbe,balliet,baham,babst,auton,asper,asbell,arzate,argento,arel,araki,arai,antley,amodeo,ammann,allensworth,aldape,akey,abeita,zweifel,zeiler,zamor,zalenski,yzaguirre,yousef,yetman,wyer,woolwine,wohlgemuth,wohlers,wittenberg,wingrove,wimsatt,willimas,wilkenson,wildey,wilderman,wilczynski,wigton,whorley,wellons,welle,weirich,weideman,weide,weast,wasmund,warshaw,walson,waldner,walch,walberg,wagener,wageman,vrieze,vossen,vorce,voorhis,vonderheide,viruet,vicari,verne,velasques,vautour,vartanian,varona,vankeuren,vandine,vandermeer,ursery,underdown,uhrich,uhlman,tworek,twine,twellman,tweedie,tutino,turmelle,tubb,trivedi,triano,trevathan,treese,treanor,treacy,traina,topham,toenjes,tippetts,tieu,thomure,thatch,tetzlaff,tetterton,teamer,tappan,talcott,tagg,szczepanski,syring,surace,sulzer,sugrue,sugarman,suess,styons,stwart,stupka,strey,straube,strate,stoddart,stockbridge,stjames,steimle,steenberg,stamand,staller,stahly,stager,spurgin,sprow,sponsler,speas,spainhour,sones,smits,smelcer,slovak,slaten,singleterry,simien,sidebottom,sibrian,shellhammer,shelburne,shambo,sepeda,seigel,scogin,scianna,schmoll,schmelzer,scheu,schachter,savant,sauseda,satcher,sandor,sampsell,rugh,rufener,rotenberry,rossow,rossbach,rollman,rodrique,rodreguez,rodkey,roda,rini,riggan,rients,riedl,rhines,ress,reinbold,raschke,rardin,racicot,quillin,pushard,primrose,pries,pressey,precourt,pratts,postel,poppell,plumer,pingree,pieroni,pflug,petre,petrarca,peterka,perkin,pergande,peranio,penna,paulhus,pasquariello,parras,parmentier,pamplin,oviatt,osterhoudt,ostendorf,osmun,ortman,orloff,orban,onofrio,olveda,oltman,okeeffe,ocana,nunemaker,novy,noffsinger,nish,niday,nethery,nemitz,neidert,nadal,nack,muszynski,munsterman,mulherin,mortimore,morter,montesino,montalvan,montalbano,momon,moman,mogan,minns,millward,milling,michelsen,mewborn,metayer,mensch,meloy,meggs,meaders,mcsorley,mcmenamin,mclead,mclauchlin,mcguffey,mcguckin,mcglaughlin,mcferron,mcentyre,mccrum,mccawley,mcbain,mayhue,matzen,matton,marsee,marrin,marland,markum,mantilla,manfre,makuch,madlock,macauley,luzier,luthy,lufkin,lucena,loudin,lothrop,lorch,loll,loadholt,lippold,lichtman,liberto,liakos,lewicki,levett,lentine,leja,legree,lawhead,lauro,lauder,lanman,lank,laning,lalor,krob,kriger,kriegel,krejci,kreisel,kozel,konkel,kolstad,koenen,kocsis,knoblock,knebel,klopfer,klee,kilday,kesten,kerbs,kempker,keathley,kazee,kaur,kamer,kamaka,kallenbach,jehle,jaycox,jardin,jahns,ivester,hyppolite,hyche,huppert,hulin,hubley,horsey,hornak,holzwarth,holmon,hollabaugh,holaway,hodes,hoak,hinesley,hillwig,hillebrand,highfield,heslop,herrada,hendryx,hellums,heit,heishman,heindel,hayslip,hayford,hastie,hartgrove,hanus,hakim,hains,hadnott,gundersen,gulino,guidroz,guebert,gressett,graydon,gramling,grahn,goupil,gorelick,goodreau,goodnough,golay,goers,glatz,gillikin,gieseke,giammarino,getman,gensler,gazda,garibaldi,gahan,funderburke,fukuda,fugitt,fuerst,fortman,forsgren,formica,flink,fitton,feltz,fekete,feit,fehrenbach,farone,farinas,faries,fagen,ewin,esquilin,esch,enderle,ellery,ellers,ekberg,egli,effinger,dymond,dulle,dula,duhe,dudney,dowless,dower,dorminey,dopp,dooling,domer,disher,dillenbeck,difilippo,dibernardo,deyoe,devillier,denley,deland,defibaugh,deeb,debow,dauer,datta,darcangelo,daoust,damelio,dahm,dahlman,curlin,cupit,culton,cuenca,cropp,croke,cremer,crace,cosio,corzine,coombe,coman,colone,coloma,collingwood,coderre,cocke,cobler,claybrook,cincotta,cimmino,christoff,chisum,chillemi,chevere,chachere,cervone,cermak,cefalu,cauble,cather,caso,carns,carcamo,carbo,capoccia,capello,capell,canino,cambareri,calvi,cabiness,bushell,burtt,burstein,burkle,bunner,bundren,buechler,bryand,bruso,brownstein,brouse,brodt,brisbin,brightman,brenes,breitenbach,brazzell,brazee,bramwell,bramhall,bradstreet,boyton,bowland,boulter,bossert,bonura,bonebrake,bonacci,boeck,blystone,birchard,bilal,biddy,bibee,bevans,bethke,bertelsen,berney,bergfeld,benware,bellon,bellah,batterton,barberio,bamber,bagdon,badeaux,averitt,augsburger,ates,arvie,aronowitz,arens,araya,angelos,andrada,amell,amante,almy,almquist,alls,aispuro,aguillon,agudelo,aceto,abalos,zdenek,zaremba,zaccaria,youssef,wrona,wrede,wotton,woolston,wolpert,wollman,wince,wimberley,willmore,willetts,wikoff,wieder,wickert,whitenack,wernick,welte,welden,weisenberger,weich,wallington,walder,vossler,vore,vigo,vierling,victorine,verdun,vencill,vazguez,vassel,vanzile,vanvliet,vantrease,vannostrand,vanderveer,vanderveen,vancil,uyeda,umphrey,uhler,uber,tutson,turrentine,tullier,tugwell,trundy,tripodi,tomer,tomasi,tomaselli,tokarski,tisher,tibbets,thweatt,tharrington,tesar,telesco,teasdale,tatem,taniguchi,suriel,sudler,stutsman,sturman,strite,strelow,streight,strawder,stransky,strahl,stours,stong,stinebaugh,stillson,steyer,stelle,steffensmeier,statham,squillante,spiess,spargo,southward,soller,soden,snuggs,snellgrove,smyers,smiddy,slonaker,skyles,skowron,sivils,siqueiros,siers,siddall,shontz,shingler,shiley,shibley,sherard,shelnutt,shedrick,shasteen,sereno,selke,scovil,scola,schuett,schuessler,schreckengost,schranz,schoepp,schneiderman,schlanger,schiele,scheuermann,schertz,scheidler,scheff,schaner,schamber,scardina,savedra,saulnier,sater,sarro,sambrano,salomone,sabourin,ruud,rutten,ruffino,ruddock,rowser,roussell,rosengarten,rominger,rollinson,rohman,roeser,rodenberg,roberds,ridgell,rhodus,reynaga,rexrode,revelle,rempel,remigio,reising,reiling,reetz,rayos,ravenscroft,ravenell,raulerson,rasmusson,rask,rase,ragon,quesnel,quashie,puzo,puterbaugh,ptak,prost,prisbrey,principe,pricer,pratte,pouncey,portman,pontious,pomerantz,planck,pilkenton,pilarski,phegley,pertuit,penta,pelc,peffer,pech,peagler,pavelka,pavao,patman,paskett,parrilla,pardini,papazian,panter,palin,paley,paetzold,packett,pacheo,ostrem,orsborn,olmedo,okamura,oiler,oglesbee,oatis,nuckles,notter,nordyke,nogueira,niswander,nibert,nesby,neloms,nading,naab,munns,mullarkey,moudy,moret,monnin,molder,modisette,moczygemba,moctezuma,mischke,miro,mings,milot,milledge,milhorn,milera,mieles,mickley,micek,metellus,mersch,merola,mercure,mencer,mellin,mell,meinke,mcquillan,mcmurtrie,mckillop,mckiernan,mckendrick,mckamie,mcilvaine,mcguffie,mcgonigle,mcgarrah,mcfetridge,mcenaney,mcdow,mccutchan,mccallie,mcadam,maycock,maybee,mattei,massi,masser,masiello,marshell,marmo,marksberry,markell,marchal,manross,manganaro,mally,mallow,mailhot,magyar,madero,madding,maddalena,macfarland,lynes,lugar,luckie,lucca,lovitt,loveridge,loux,loth,loso,lorenzana,lorance,lockley,lockamy,littler,litman,litke,liebel,lichtenberger,licea,leverich,letarte,lesesne,leno,legleiter,leffew,laurin,launius,laswell,lassen,lasala,laraway,laramore,landrith,lancon,lanahan,laiche,laford,lachermeier,kunst,kugel,kuck,kuchta,kube,korus,koppes,kolbe,koerber,kochan,knittel,kluck,kleve,kleine,kitch,kirton,kirker,kintz,kinghorn,kindell,kimrey,kilduff,kilcrease,kicklighter,kibble,kervin,keplinger,keogh,kellog,keeth,kealey,kazmierczak,karner,kamel,kalina,kaczynski,juel,jerman,jeppson,jawad,jasik,jaqua,janusz,janco,inskeep,inks,ingold,hyndman,hymer,hunte,hunkins,humber,huffstutler,huffines,hudon,hudec,hovland,houze,hout,hougland,hopf,holsapple,holness,hollenbach,hoffmeister,hitchings,hirata,hieber,hickel,hewey,herriman,hermansen,herandez,henze,heffelfinger,hedgecock,hazlitt,hazelrigg,haycock,harren,harnage,harling,harcrow,hannold,hanline,hanel,hanberry,hammersley,hamernik,hajduk,haithcock,haff,hadaway,haan,gullatt,guilbault,guidotti,gruner,grisson,grieves,granato,grabert,gover,gorka,glueck,girardin,giesler,gersten,gering,geers,gaut,gaulin,gaskamp,garbett,gallivan,galland,gaeth,fullenkamp,fullam,friedrichs,freire,freeney,fredenburg,frappier,fowkes,foree,fleurant,fleig,fleagle,fitzsimons,fischetti,fiorenza,finneran,filippi,figueras,fesler,fertig,fennel,feltmann,felps,felmlee,fannon,familia,fairall,fadden,esslinger,enfinger,elsasser,elmendorf,ellisor,einhorn,ehrman,egner,edmisten,edlund,ebinger,dyment,dykeman,durling,dunstan,dunsmore,dugal,duer,drescher,doyel,dossey,donelan,dockstader,dobyns,divis,dilks,didier,desrosier,desanto,deppe,delosh,delange,defrank,debo,dauber,dartez,daquila,dankert,dahn,cygan,cusic,curfman,croghan,croff,criger,creviston,crays,cravey,crandle,crail,crago,craghead,cousineau,couchman,cothron,corella,conine,coller,colberg,cogley,coatney,coale,clendenin,claywell,clagon,cifaldi,choiniere,chickering,chica,chennault,chavarin,chattin,chaloux,challis,cesario,cazarez,caughman,catledge,casebolt,carrel,carra,carlow,capote,canez,camillo,caliendo,calbert,bylsma,buskey,buschman,burkhard,burghardt,burgard,buonocore,bunkley,bungard,bundrick,bumbrey,buice,buffkin,brundige,brockwell,brion,briant,bredeson,bransford,brannock,brakefield,brackens,brabant,bowdoin,bouyer,bothe,boor,bonavita,bollig,blurton,blunk,blanke,blanck,birden,bierbaum,bevington,beutler,betters,bettcher,bera,benway,bengston,benesh,behar,bedsole,becenti,beachy,battersby,basta,bartmess,bartle,bartkowiak,barsky,barrio,barletta,barfoot,banegas,baldonado,azcona,avants,austell,aungst,aune,aumann,audia,atterbury,asselin,asmussen,ashline,asbill,arvizo,arnot,ariola,ardrey,angstadt,anastasio,amsden,amerman,alred,allington,alewine,alcina,alberico,ahlgren,aguas,agrawal,agosta,adolphsen,acey,aburto,abler,zwiebel,zepp,zentz,ybarbo,yarberry,yamauchi,yamashiro,wurtz,wronski,worster,wootten,wongus,woltz,wolanski,witzke,withey,wisecarver,wingham,wineinger,winegarden,windholz,wilgus,wiesen,wieck,widrick,wickliffe,whittenberg,westby,werley,wengert,wendorf,weimar,weick,weckerly,watrous,wasden,walford,wainright,wahlstrom,wadlow,vrba,voisin,vives,vivas,vitello,villescas,villavicencio,villanova,vialpando,vetrano,vensel,vassell,varano,vanriper,vankleeck,vanduyne,vanderpol,vanantwerp,valenzula,udell,turnquist,tuff,trickett,tramble,tingey,timbers,tietz,thiem,tercero,tenner,tenaglia,teaster,tarlton,taitt,tabon,sward,swaby,suydam,surita,suman,suddeth,stumbo,studivant,strobl,streich,stoodley,stoecker,stillwagon,stickle,stellmacher,stefanik,steedley,starbird,stainback,stacker,speir,spath,sommerfeld,soltani,solie,sojka,sobota,sobieski,sobczak,smullen,sleeth,slaymaker,skolnick,skoglund,sires,singler,silliman,shrock,shott,shirah,shimek,shepperd,sheffler,sheeler,sharrock,sharman,shalash,seyfried,seybold,selander,seip,seifried,sedor,sedlock,sebesta,seago,scutt,scrivens,sciacca,schultze,schoemaker,schleifer,schlagel,schlachter,schempp,scheider,scarboro,santi,sandhu,salim,saia,rylander,ryburn,rutigliano,ruocco,ruland,rudloff,rott,rosenburg,rosenbeck,romberger,romanelli,rohloff,rohlfing,rodda,rodd,ritacco,rielly,rieck,rickles,rickenbacker,respass,reisner,reineck,reighard,rehbein,rega,reddix,rawles,raver,rattler,ratledge,rathman,ramsburg,raisor,radovich,radigan,quail,puskar,purtee,priestly,prestidge,presti,pressly,pozo,pottinger,portier,porta,porcelli,poplawski,polin,poeppelman,pocock,plump,plantz,placek,piro,pinnell,pinkowski,pietz,picone,philbeck,pflum,peveto,perret,pentz,payer,patlan,paterno,papageorge,overmyer,overland,osier,orwig,orum,orosz,oquin,opie,ochsner,oathout,nygard,norville,northway,niver,nicolson,newhart,neitzel,nath,nanez,murnane,mortellaro,morreale,morino,moriarity,morgado,moorehouse,mongiello,molton,mirza,minnix,millspaugh,milby,miland,miguez,mickles,michaux,mento,melugin,melito,meinecke,mehr,meares,mcneece,mckane,mcglasson,mcgirt,mcgilvery,mcculler,mccowen,mccook,mcclintic,mccallon,mazzotta,maza,mayse,mayeda,matousek,matley,martyn,marney,marnell,marling,manuelito,maltos,malson,mahi,maffucci,macken,maass,lyttle,lynd,lyden,lukasiewicz,luebbers,lovering,loveall,longtin,lobue,loberg,lipka,lightbody,lichty,levert,lettieri,letsinger,lepak,lemmond,lembke,leitz,lasso,lasiter,lango,landsman,lamirande,lamey,laber,kuta,kulesza,krenz,kreiner,krein,kreiger,kraushaar,kottke,koser,kornreich,kopczynski,konecny,koff,koehl,kocian,knaub,kmetz,kluender,klenke,kleeman,kitzmiller,kirsh,kilman,kildow,kielbasa,ketelsen,kesinger,kehr,keef,kauzlarich,karter,kahre,jobin,jinkins,jines,jeffress,jaquith,jaillet,jablonowski,ishikawa,irey,ingerson,indelicato,huntzinger,huisman,huett,howson,houge,hosack,hora,hoobler,holtzen,holtsclaw,hollingworth,hollin,hoberg,hobaugh,hilker,hilgefort,higgenbotham,heyen,hetzler,hessel,hennessee,hendrie,hellmann,heft,heesch,haymond,haymon,haye,havlik,havis,haverland,haus,harstad,harriston,harju,hardegree,hammell,hamaker,halbrook,halberg,guptill,guntrum,gunderman,gunder,gularte,guarnieri,groll,grippo,greely,gramlich,goewey,goetzinger,goding,giraud,giefer,giberson,gennaro,gemmell,gearing,gayles,gaudin,gatz,gatts,gasca,garn,gandee,gammel,galindez,galati,gagliardo,fulop,fukushima,friedt,fretz,frenz,freeberg,fravel,fountaine,forry,forck,fonner,flippin,flewelling,flansburg,filippone,fettig,fenlon,felter,felkins,fein,favero,faulcon,farver,farless,fahnestock,facemire,faas,eyer,evett,esses,escareno,ensey,ennals,engelking,empey,ellithorpe,effler,edling,edgley,durrell,dunkerson,draheim,domina,dombrosky,doescher,dobbin,divens,dinatale,dieguez,diede,devivo,devilbiss,devaul,determan,desjardin,deshaies,delpozo,delorey,delman,delapp,delamater,deibert,degroff,debelak,dapolito,dano,dacruz,dacanay,cushenberry,cruze,crosbie,cregan,cousino,corrao,corney,cookingham,conry,collingsworth,coldren,cobian,coate,clauss,christenberry,chmiel,chauez,charters,chait,cesare,cella,caya,castenada,cashen,cantrelle,canova,campione,calixte,caicedo,byerley,buttery,burda,burchill,bulmer,bulman,buesing,buczek,buckholz,buchner,buchler,buban,bryne,brunkhorst,brumsey,brumer,brownson,brodnax,brezinski,brazile,braverman,branning,boye,boulden,bough,bossard,bosak,borth,borgmeyer,borge,blowers,blaschke,blann,blankenbaker,bisceglia,billingslea,bialek,beverlin,besecker,berquist,benigno,benavente,belizaire,beisner,behrman,beausoleil,baylon,bayley,bassi,basnett,basilio,basden,basco,banerjee,balli,bagnell,bady,averette,arzu,archambeault,arboleda,arbaugh,arata,antrim,amrhein,amerine,alpers,alfrey,alcon,albus,albertini,aguiniga,aday,acquaviva,accardi,zygmont,zych,zollner,zobel,zinck,zertuche,zaragosa,zale,zaldivar,yeadon,wykoff,woullard,wolfrum,wohlford,wison,wiseley,wisecup,winchenbach,wiltsie,whittlesey,whitelow,whiteford,wever,westrich,wertman,wensel,wenrich,weisbrod,weglarz,wedderburn,weatherhead,wease,warring,wadleigh,voltz,vise,villano,vicario,vermeulen,vazques,vasko,varughese,vangieson,vanfossen,vanepps,vanderploeg,vancleve,valerius,uyehara,unsworth,twersky,turrell,tuner,tsui,trunzo,trousdale,trentham,traughber,torgrimson,toppin,tokar,tobia,tippens,tigue,thiry,thackston,terhaar,tenny,tassin,tadeo,sweigart,sutherlin,sumrell,suen,stuhr,strzelecki,strosnider,streiff,stottlemyer,storment,storlie,stonesifer,stogsdill,stenzel,stemen,stellhorn,steidl,stecklein,statton,stangle,spratling,spoor,spight,spelman,spece,spanos,spadoni,southers,sola,sobol,smyre,slaybaugh,sizelove,sirmons,simington,silversmith,siguenza,sieren,shelman,sharples,sharif,sessler,serrata,serino,serafini,semien,selvey,seedorf,seckman,seawood,scoby,scicchitano,schorn,schommer,schnitzer,schleusner,schlabach,schiel,schepers,schaber,scally,sautner,sartwell,santerre,sandage,salvia,salvetti,salsman,sallis,salais,saeger,sabat,saar,ruther,russom,ruoff,rumery,rubottom,rozelle,rowton,routon,rotolo,rostad,roseborough,rorick,ronco,roher,roberie,robare,ritts,rison,rippe,rinke,ringwood,righter,rieser,rideaux,rickerson,renfrew,releford,reinsch,reiman,reifsteck,reidhead,redfearn,reddout,reaux,rado,radebaugh,quinby,quigg,provo,provenza,provence,pridgeon,praylow,powel,poulter,portner,pontbriand,poirrier,poirer,platero,pixler,pintor,pigman,piersall,piel,pichette,phou,pharis,phalen,petsche,perrier,penfield,pelosi,pebley,peat,pawloski,pawlik,pavlick,pavel,patz,patout,pascucci,pasch,parrinello,parekh,pantaleo,pannone,pankow,pangborn,pagani,pacelli,orsi,oriley,orduno,oommen,olivero,okada,ocon,ocheltree,oberman,nyland,noss,norling,nolton,nobile,nitti,nishimoto,nghiem,neuner,neuberger,neifert,negus,nagler,mullally,moulden,morra,morquecho,moots,mizzell,mirsky,mirabito,minardi,milholland,mikus,mijangos,michener,michalek,methvin,merrit,menter,meneely,meiers,mehring,mees,mcwhirt,mcwain,mcphatter,mcnichol,mcnaught,mclarty,mcivor,mcginness,mcgaughy,mcferrin,mcfate,mcclenny,mcclard,mccaskey,mccallion,mcamis,mathisen,marton,marsico,marchi,mani,mangione,macaraeg,lupi,lunday,lukowski,lucious,locicero,loach,littlewood,litt,lipham,linley,lindon,lightford,lieser,leyendecker,lewey,lesane,lenzi,lenart,leisinger,lehrman,lefebure,lazard,laycock,laver,launer,lastrapes,lastinger,lasker,larkey,lanser,lanphere,landey,lampton,lamark,kumm,kullman,krzeminski,krasner,koran,koning,kohls,kohen,kobel,kniffen,knick,kneip,knappenberger,klumpp,klausner,kitamura,kisling,kirshner,kinloch,kingman,kimery,kestler,kellen,keleher,keehn,kearley,kasprzak,kampf,kamerer,kalis,kahan,kaestner,kadel,kabel,junge,juckett,joynt,jorstad,jetter,jelley,jefferis,jeansonne,janecek,jaffee,izzard,istre,isherwood,ipock,iannuzzi,hypolite,humfeld,hotz,hosein,honahni,holzworth,holdridge,holdaway,holaday,hodak,hitchman,hippler,hinchey,hillin,hiler,hibdon,hevey,heth,hepfer,henneman,hemsley,hemmings,hemminger,helbert,helberg,heinze,heeren,heber,haver,hauff,haswell,harvison,hartson,harshberger,harryman,harries,hane,hamsher,haggett,hagemeier,haecker,haddon,haberkorn,guttman,guttierrez,guthmiller,guillet,guilbert,gugino,grumbles,griffy,gregerson,grana,goya,goranson,gonsoulin,goettl,goertz,godlewski,glandon,gilsdorf,gillogly,gilkison,giard,giampaolo,gheen,gettings,gesell,gershon,gaumer,gartrell,garside,garrigan,garmany,garlitz,garlington,gamet,furlough,funston,funaro,frix,frasca,francoeur,forshey,foose,flatley,flagler,fils,fillers,fickett,feth,fennelly,fencl,felch,fedrick,febres,fazekas,farnan,fairless,ewan,etsitty,enterline,elsworth,elliff,eleby,eldreth,eidem,edgecomb,edds,ebarb,dworkin,dusenberry,durrance,duropan,durfey,dungy,dundon,dumbleton,dubon,dubberly,droz,drinkwater,dressel,doughtie,doshier,dorrell,dople,doonan,donadio,dollison,doig,ditzler,dishner,discher,dimaio,digman,difalco,devino,devens,derosia,deppen,depaola,deniz,denardo,demos,demay,delgiudice,davi,danielsen,dally,dais,dahmer,cutsforth,cusimano,curington,cumbee,cryan,crusoe,crowden,crete,cressman,crapo,cowens,coupe,councill,coty,cotnoir,correira,copen,consiglio,combes,coffer,cockrill,coad,clogston,clasen,chesnutt,charrier,chadburn,cerniglia,cebula,castruita,castilla,castaldi,casebeer,casagrande,carta,carrales,carnley,cardon,capshaw,capron,cappiello,capito,canney,candela,caminiti,califano,calabria,caiazzo,cahall,buscemi,burtner,burgdorf,burdo,buffaloe,buchwald,brwon,brunke,brummond,brumm,broe,brocious,brocato,briski,brisker,brightwell,bresett,breiner,brazeau,braz,brayman,brandis,bramer,bradeen,boyko,bossi,boshart,bortle,boniello,bomgardner,bolz,bolenbaugh,bohling,bohland,bochenek,blust,bloxham,blowe,blish,blackwater,bjelland,biros,biederman,bickle,bialaszewski,bevil,beumer,bettinger,besse,bernett,bermejo,bement,belfield,beckler,baxendale,batdorf,bastin,bashore,bascombe,bartlebaugh,barsh,ballantine,bahl,badon,autin,astin,askey,ascher,arrigo,arbeiter,antes,angers,amburn,amarante,alvidrez,althaus,allmond,alfieri,aldinger,akerley,akana,aikins,ader,acebedo,accardo,abila,aberle,abele,abboud,zollars,zimmerer,zieman,zerby,zelman,zellars,yoshimura,yonts,yeats,yant,yamanaka,wyland,wuensche,worman,wordlaw,wohl,winslett,winberg,wilmeth,willcutt,wiers,wiemer,wickwire,wichman,whitting,whidbee,westergard,wemmer,wellner,weishaupt,weinert,weedon,waynick,wasielewski,waren,walworth,wallingford,walke,waechter,viviani,vitti,villagrana,vien,vicks,venema,varnes,varnadoe,varden,vanpatten,vanorden,vanderzee,vandenburg,vandehey,valls,vallarta,valderrama,valade,urman,ulery,tusa,tuft,tripoli,trimpe,trickey,tortora,torrens,torchia,toft,tjaden,tison,tindel,thurmon,thode,tardugno,tancredi,taketa,taillon,tagle,sytsma,symes,swindall,swicegood,swartout,sundstrom,sumners,sulton,studstill,stroop,stonerock,stmarie,stlawrence,stemm,steinhauser,steinert,steffensen,stefaniak,starck,stalzer,spidle,spake,sowinski,sosnowski,sorber,somma,soliday,soldner,soja,soderstrom,soder,sockwell,sobus,sloop,sinkfield,simerly,silguero,sigg,siemers,siegmund,shum,sholtis,shkreli,sheikh,shattles,sharlow,shambaugh,shaikh,serrao,serafino,selley,selle,seel,sedberry,secord,schunk,schuch,schor,scholze,schnee,schmieder,schleich,schimpf,scherf,satterthwaite,sasson,sarkisian,sarinana,sanzone,salvas,salone,salido,saiki,sahr,rusher,rusek,ruppel,rubel,rothfuss,rothenberger,rossell,rosenquist,rosebrook,romito,romines,rolan,roker,roehrig,rockhold,rocca,robuck,riss,rinaldo,riggenbach,rezentes,reuther,renolds,rench,remus,remsen,reller,relf,reitzel,reiher,rehder,redeker,ramero,rahaim,radice,quijas,qualey,purgason,prum,proudfoot,prock,probert,printup,primer,primavera,prenatt,pratico,polich,podkowka,podesta,plattner,plasse,plamondon,pittmon,pippenger,pineo,pierpont,petzold,petz,pettiway,petters,petroski,petrik,pesola,pershall,perlmutter,penepent,peevy,pechacek,peaden,pazos,pavia,pascarelli,parm,parillo,parfait,paoletti,palomba,palencia,pagaduan,oxner,overfield,overcast,oullette,ostroff,osei,omarah,olenick,olah,odem,nygren,notaro,northcott,nodine,nilges,neyman,neve,neuendorf,neisler,neault,narciso,naff,muscarella,morrisette,morphew,morein,montville,montufar,montesinos,monterroso,mongold,mojarro,moitoso,mirarchi,mirando,minogue,milici,miga,midyett,michna,meuser,messana,menzie,menz,mendicino,melone,mellish,meller,melle,meints,mechem,mealer,mcwilliam,mcwhite,mcquiggan,mcphillips,mcpartland,mcnellis,mcmackin,mclaughin,mckinny,mckeithan,mcguirk,mcgillivray,mcgarr,mcgahee,mcfaul,mcfadin,mceuen,mccullah,mcconico,mcclaren,mccaul,mccalley,mccalister,mazer,mayson,mayhan,maugeri,mauger,mattix,mattews,maslowski,masek,martir,marsch,marquess,maron,markwell,markow,marinaro,marcinek,mannella,mallen,majeed,mahnke,mahabir,magby,magallan,madere,machnik,lybrand,luque,lundholm,lueders,lucian,lubinski,lowy,loew,lippard,linson,lindblad,lightcap,levitsky,levens,leonardi,lenton,lengyel,leitzel,leicht,leaver,laubscher,lashua,larusso,larrimore,lanterman,lanni,lanasa,lamoureaux,lambros,lamborn,lamberti,lall,lafuente,laferriere,laconte,kyger,kupiec,kunzman,kuehne,kuder,kubat,krogh,kreidler,krawiec,krauth,kratky,kottwitz,korb,kono,kolman,kolesar,koeppel,knapper,klingenberg,kjos,keppel,kennan,keltz,kealoha,kasel,karney,kanne,kamrowski,kagawa,johnosn,jilek,jarvie,jarret,jansky,jacquemin,jacox,jacome,iriarte,ingwersen,imboden,iglesia,huyser,hurston,hursh,huntoon,hudman,hoying,horsman,horrigan,hornbaker,horiuchi,hopewell,hommel,homeyer,holzinger,holmer,hipsher,hinchman,hilts,higginbottom,hieb,heyne,hessling,hesler,hertlein,herford,heras,henricksen,hennemann,henery,hendershott,hemstreet,heiney,heckert,heatley,hazell,hazan,hayashida,hausler,hartsoe,harth,harriott,harriger,harpin,hardisty,hardge,hannaman,hannahs,hamp,hammersmith,hamiton,halsell,halderman,hagge,habel,gusler,gushiken,gurr,gummer,gullick,grunden,grosch,greenburg,greb,greaver,gratz,grajales,gourlay,gotto,gorley,goodpasture,godard,glorioso,gloor,glascock,gizzi,giroir,gibeault,gauldin,gauer,gartin,garrels,gamber,gallogly,gade,fusaro,fripp,freyer,freiberg,franzoni,fragale,foston,forti,forness,folts,followell,foard,flom,flett,fleitas,flamm,fino,finnen,finchum,filippelli,fickel,feucht,feiler,feenstra,feagins,faver,faulkenberry,farabaugh,fandel,faler,faivre,fairey,facey,exner,evensen,erion,erben,epting,epping,ephraim,engberg,elsen,ellingwood,eisenmann,eichman,ehle,edsall,durall,dupler,dunker,dumlao,duford,duffie,dudding,dries,doung,dorantes,donahoo,domenick,dollins,dobles,dipiazza,dimeo,diehm,dicicco,devenport,desormeaux,derrow,depaolo,demas,delpriore,delosantos,degreenia,degenhardt,defrancesco,defenbaugh,deets,debonis,deary,dazey,dargie,dambrosia,dalal,dagen,cuen,crupi,crossan,crichlow,creque,coutts,counce,coram,constante,connon,collelo,coit,cocklin,coblentz,cobey,coard,clutts,clingan,clampitt,claeys,ciulla,cimini,ciampa,christon,choat,chiou,chenail,chavous,catto,catalfamo,casterline,cassinelli,caspers,carroway,carlen,carithers,cappel,calo,callow,cagley,cafferty,byun,byam,buttner,buth,burtenshaw,burget,burfield,buresh,bunt,bultman,bulow,buchta,buchmann,brunett,bruemmer,brueggeman,britto,briney,brimhall,bribiesca,bresler,brazan,brashier,brar,brandstetter,boze,boonstra,bluitt,blomgren,blattner,blasi,bladen,bitterman,bilby,bierce,biello,bettes,bertone,berrey,bernat,berberich,benshoof,bendickson,bellefeuille,bednarski,beddingfield,beckerman,beaston,bavaro,batalla,basye,baskins,bartolotta,bartkowski,barranco,barkett,banaszak,bame,bamberger,balsley,ballas,balicki,badura,aymond,aylor,aylesworth,axley,axelrod,aubert,armond,ariza,apicella,anstine,ankrom,angevine,andreotti,alto,alspaugh,alpaugh,almada,allinder,alequin,aguillard,agron,agena,afanador,ackerley,abrev,abdalla,aaronson,zynda,zucco,zipp,zetina,zenz,zelinski,youngren,yochum,yearsley,yankey,woodfork,wohlwend,woelfel,wiste,wismer,winzer,winker,wilkison,wigger,wierenga,whipps,westray,wesch,weld,weible,wedell,weddell,wawrzyniak,wasko,washinton,wantz,walts,wallander,wain,wahlen,wachowiak,voshell,viteri,vire,villafuerte,vieyra,viau,vescio,verrier,verhey,vause,vandermolen,vanderhorst,valois,valla,valcourt,vacek,uzzle,umland,ulman,ulland,turvey,tuley,trembath,trabert,towsend,totman,toews,tisch,tisby,tierce,thivierge,tenenbaum,teagle,tacy,tabler,szewczyk,swearngin,suire,sturrock,stubbe,stronach,stoute,stoudemire,stoneberg,sterba,stejskal,steier,stehr,steckel,stearman,steakley,stanforth,stancill,srour,sprowl,spevak,sokoloff,soderman,snover,sleeman,slaubaugh,sitzman,simes,siegal,sidoti,sidler,sider,sidener,siddiqi,shireman,shima,sheroan,shadduck,seyal,sentell,sennett,senko,seligman,seipel,seekins,seabaugh,scouten,schweinsberg,schwartzberg,schurr,schult,schrick,schoening,schmitmeyer,schlicher,schlager,schack,schaar,scavuzzo,scarpa,sassano,santigo,sandavol,sampsel,samms,samet,salzano,salyards,salva,saidi,sabir,saam,runions,rundquist,rousselle,rotunno,rosch,romney,rohner,roff,rockhill,rocamora,ringle,riggie,ricklefs,rexroat,reves,reuss,repka,rentfro,reineke,recore,recalde,rease,rawling,ravencraft,ravelo,rappa,randol,ramsier,ramerez,rahimi,rahim,radney,racey,raborn,rabalais,quebedeaux,pujol,puchalski,prothro,proffit,prigge,prideaux,prevo,portales,porco,popovic,popek,popejoy,pompei,plude,platner,pizzuto,pizer,pistone,piller,pierri,piehl,pickert,piasecki,phong,philipp,peugh,pesqueira,perrett,perfetti,percell,penhollow,pelto,pellett,pavlak,paulo,pastorius,parsell,parrales,pareja,parcell,pappan,pajak,owusu,ovitt,orrick,oniell,olliff,olberding,oesterling,odwyer,ocegueda,obermiller,nylander,nulph,nottage,northam,norgard,nodal,niel,nicols,newhard,nellum,neira,nazzaro,nassif,narducci,nalbandian,musil,murga,muraoka,mumper,mulroy,mountjoy,mossey,moreton,morea,montoro,montesdeoca,montealegre,montanye,montandon,moisan,mohl,modeste,mitra,minson,minjarez,milbourne,michaelsen,metheney,mestre,mescher,mervis,mennenga,melgarejo,meisinger,meininger,mcwaters,mckern,mckendree,mchargue,mcglothlen,mcgibbon,mcgavock,mcduffee,mcclurkin,mccausland,mccardell,mccambridge,mazzoni,mayen,maxton,mawson,mauffray,mattinson,mattila,matsunaga,mascia,marse,marotz,marois,markin,markee,marcinko,marcin,manville,mantyla,manser,manry,manderscheid,mallari,malecha,malcomb,majerus,macinnis,mabey,lyford,luth,lupercio,luhman,luedke,lovick,lossing,lookabaugh,longway,loisel,logiudice,loffredo,lobaugh,lizaola,livers,littlepage,linnen,limmer,liebsch,liebman,leyden,levitan,levison,levier,leven,levalley,lettinga,lessley,lessig,lepine,leight,leick,leggio,leffingwell,leffert,lefevers,ledlow,leaton,leander,leaming,lazos,laviolette,lauffer,latz,lasorsa,lasch,larin,laporta,lanter,langstaff,landi,lamica,lambson,lambe,lamarca,laman,lamagna,lajeunesse,lafontant,lafler,labrum,laakso,kush,kuether,kuchar,kruk,kroner,kroh,kridler,kreuzer,kovats,koprowski,kohout,knicely,knell,klutts,kindrick,kiddy,khanna,ketcher,kerschner,kerfien,kensey,kenley,kenan,kemplin,kellerhouse,keesling,keas,kaplin,kanady,kampen,jutras,jungers,jeschke,janowski,janas,iskra,imperato,ikerd,igoe,hyneman,hynek,husain,hurrell,hultquist,hullett,hulen,huberty,hoyte,hossain,hornstein,hori,hopton,holms,hollmann,holdman,holdeman,holben,hoffert,himel,hillsman,herdt,hellyer,heister,heimer,heidecker,hedgpeth,hedgepath,hebel,heatwole,hayer,hausner,haskew,haselden,hartranft,harsch,harres,harps,hardimon,halm,hallee,hallahan,hackley,hackenberg,hachey,haapala,guynes,gunnerson,gunby,gulotta,gudger,groman,grignon,griebel,gregori,greenan,grauer,gourd,gorin,gorgone,gooslin,goold,goltz,goldberger,glotfelty,glassford,gladwin,giuffre,gilpatrick,gerdts,geisel,gayler,gaunce,gaulding,gateley,gassman,garson,garron,garand,gangestad,gallow,galbo,gabrielli,fullington,fucci,frum,frieden,friberg,frasco,francese,fowle,foucher,fothergill,foraker,fonder,foisy,fogal,flurry,flenniken,fitzhenry,fishbein,finton,filmore,filice,feola,felberbaum,fausnaught,fasciano,farquharson,faires,estridge,essman,enriques,emmick,ekker,ekdahl,eisman,eggleton,eddinger,eakle,eagar,durio,dunwoody,duhaime,duenes,duden,dudas,dresher,dresel,doutt,donlan,donathan,domke,dobrowolski,dingee,dimmitt,dimery,dilullo,deveaux,devalle,desper,desnoyers,desautels,derouin,derbyshire,denmon,demski,delucca,delpino,delmont,deller,dejulio,deibler,dehne,deharo,degner,defore,deerman,decuir,deckman,deasy,dease,deaner,dawdy,daughdrill,darrigo,darity,dalbey,dagenhart,daffron,curro,curnutte,curatolo,cruikshank,crosswell,croslin,croney,crofton,criado,crecelius,coscia,conniff,commodore,coltharp,colonna,collyer,collington,cobbley,coache,clonts,cloe,cliett,clemans,chrisp,chiarini,cheatam,cheadle,chand,chadd,cervera,cerulli,cerezo,cedano,cayetano,cawthorne,cavalieri,cattaneo,cartlidge,carrithers,carreira,carranco,cargle,candanoza,camburn,calender,calderin,calcagno,cahn,cadden,byham,buttry,burry,burruel,burkitt,burgio,burgener,buescher,buckalew,brymer,brumett,brugnoli,brugman,brosnahan,bronder,broeckel,broderson,brisbon,brinsfield,brinks,bresee,bregman,branner,brambila,brailsford,bouska,boster,borucki,bortner,boroughs,borgeson,bonier,bomba,bolender,boesch,boeke,bloyd,bley,binger,bilbro,biery,bichrest,bezio,bevel,berrett,bermeo,bergdoll,bercier,benzel,bentler,belnap,bellini,beitz,behrend,bednarczyk,bearse,bartolini,bartol,barretta,barbero,barbaro,banvelos,bankes,ballengee,baldon,ausmus,atilano,atienza,aschenbrenner,arora,armstong,aquilino,appleberry,applebee,apolinar,antos,andrepont,ancona,amesquita,alvino,altschuler,allin,alire,ainslie,agular,aeschliman,accetta,abdulla,abbe,zwart,zufelt,zirbel,zingaro,zilnicki,zenteno,zent,zemke,zayac,zarrella,yoshimoto,yearout,womer,woltman,wolin,wolery,woldt,witts,wittner,witherow,winward,winrow,wiemann,wichmann,whitwell,whitelaw,wheeless,whalley,wessner,wenzl,wene,weatherbee,waye,wattles,wanke,walkes,waldeck,vonruden,voisine,vogus,vittetoe,villalva,villacis,venturini,venturi,venson,vanloan,vanhooser,vanduzer,vandever,vanderwal,vanderheyden,vanbeek,vanbebber,vallance,vales,vahle,urbain,upshur,umfleet,tsuji,trybus,triolo,trimarchi,trezza,trenholm,tovey,tourigny,torry,torrain,torgeson,tomey,tischler,tinkler,tinder,ticknor,tibbles,tibbals,throneberry,thormahlen,thibert,thibeaux,theurer,templet,tegeler,tavernier,taubman,tamashiro,tallon,tallarico,taboada,sypher,sybert,swyers,switalski,swedberg,suther,surprenant,sullen,sulik,sugden,suder,suchan,strube,stroope,strittmatter,streett,straughn,strasburg,stjacques,stimage,stimac,stifter,stgelais,steinhart,stehlik,steffenson,steenbergen,stanbery,stallone,spraggs,spoto,spilman,speno,spanbauer,spalla,spagnolo,soliman,solan,sobolik,snelgrove,snedden,smale,sliter,slankard,sircy,shutter,shurtliff,shur,shirkey,shewmake,shams,shadley,shaddox,sgro,serfass,seppala,segawa,segalla,seaberry,scruton,scism,schwein,schwartzman,schwantes,schomer,schoenborn,schlottmann,schissler,scheurer,schepis,scheidegger,saunier,sauders,sassman,sannicolas,sanderfur,salser,sagar,saffer,saeed,sadberry,saban,ryce,rybak,rumore,rummell,rudasill,rozman,rota,rossin,rosell,rosel,romberg,rojero,rochin,robideau,robarge,roath,risko,ringel,ringdahl,riera,riemann,ribas,revard,renegar,reinwald,rehman,redel,raysor,rathke,rapozo,rampton,ramaker,rakow,raia,radin,raco,rackham,racca,racanelli,rabun,quaranta,purves,pundt,protsman,prezioso,presutti,presgraves,poydras,portnoy,portalatin,pontes,poehler,poblete,poat,plumadore,pleiman,pizana,piscopo,piraino,pinelli,pillai,picken,picha,piccoli,philen,petteway,petros,peskin,perugini,perrella,pernice,peper,pensinger,pembleton,passman,parrent,panetta,pallas,palka,pais,paglia,padmore,ottesen,oser,ortmann,ormand,oriol,orick,oler,okafor,ohair,obert,oberholtzer,nowland,nosek,nordeen,nolf,nogle,nobriga,nicley,niccum,newingham,neumeister,neugebauer,netherland,nerney,neiss,neis,neider,neeld,nailor,mustain,mussman,musante,murton,murden,munyon,muldrew,motton,moscoso,moschella,moroz,morelos,morace,moone,montesano,montemurro,montas,montalbo,molander,mleczko,miyake,mitschke,minger,minelli,minear,millener,mihelich,miedema,miah,metzer,mery,merrigan,merck,mennella,membreno,melecio,melder,mehling,mehler,medcalf,meche,mealing,mcqueeney,mcphaul,mcmickle,mcmeen,mcmains,mclees,mcgowin,mcfarlain,mcdivitt,mccotter,mcconn,mccaster,mcbay,mcbath,mayoral,mayeux,matsuo,masur,massman,marzette,martensen,marlett,markgraf,marcinkowski,marchbanks,mansir,mandez,mancil,malagon,magnani,madonia,madill,madia,mackiewicz,macgillivray,macdowell,mabee,lundblad,lovvorn,lovings,loreto,linz,linnell,linebaugh,lindstedt,lindbloom,limberg,liebig,lickteig,lichtenberg,licari,lewison,levario,levar,lepper,lenzen,lenderman,lemarr,leinen,leider,legrande,lefort,lebleu,leask,leacock,lazano,lawalin,laven,laplaca,lant,langsam,langone,landress,landen,lande,lamorte,lairsey,laidlaw,laffin,lackner,lacaze,labuda,labree,labella,labar,kyer,kuyper,kulinski,kulig,kuhnert,kuchera,kubicek,kruckeberg,kruchten,krider,kotch,kornfeld,koren,koogler,koll,kole,kohnke,kohli,kofoed,koelling,kluth,klump,klopfenstein,klippel,klinge,klett,klemp,kleis,klann,kitzman,kinnan,kingsberry,kilmon,killpack,kilbane,kijowski,kies,kierstead,kettering,kesselman,kennington,keniston,kehrer,kearl,keala,kassa,kasahara,kantz,kalin,kaina,jupin,juntunen,juares,joynes,jovel,joos,jiggetts,jervis,jerabek,jennison,jaso,janz,izatt,ishibashi,iannotti,hymas,huneke,hulet,hougen,horvat,horstmann,hopple,holtkamp,holsten,hohenstein,hoefle,hoback,hiney,hiemstra,herwig,herter,herriott,hermsen,herdman,herder,herbig,helling,helbig,heitkamp,heinrichs,heinecke,heileman,heffley,heavrin,heaston,haymaker,hauenstein,hartlage,harig,hardenbrook,hankin,hamiter,hagens,hagel,grizzell,griest,griese,grennan,graden,gosse,gorder,goldin,goatley,gillespi,gilbride,giel,ghoston,gershman,geisinger,gehringer,gedeon,gebert,gaxiola,gawronski,gathright,gatchell,gargiulo,garg,galang,gadison,fyock,furniss,furby,funnell,frizell,frenkel,freeburg,frankhouser,franchi,foulger,formby,forkey,fonte,folson,follette,flavell,finegan,filippini,ferencz,ference,fennessey,feggins,feehan,fazzino,fazenbaker,faunce,farraj,farnell,farler,farabee,falkowski,facio,etzler,ethington,esterline,esper,esker,erxleben,engh,emling,elridge,ellenwood,elfrink,ekhoff,eisert,eifert,eichenlaub,egnor,eggebrecht,edlin,edberg,eble,eber,easler,duwe,dutta,dutremble,dusseault,durney,dunworth,dumire,dukeman,dufner,duey,duble,dreese,dozal,douville,ditmore,distin,dimuzio,dildine,dieterich,dieckman,didonna,dhillon,dezern,devereux,devall,detty,detamore,derksen,deremer,deras,denslow,deno,denicola,denbow,demma,demille,delira,delawder,delara,delahanty,dejonge,deininger,dedios,dederick,decelles,debus,debruyn,deborde,deak,dauenhauer,darsey,dansie,dalman,dakin,dagley,czaja,cybart,cutchin,currington,curbelo,croucher,crinklaw,cremin,cratty,cranfield,crafford,cowher,couvillion,couturier,corter,coombes,contos,consolini,connaughton,conely,collom,cockett,clepper,cleavenger,claro,clarkin,ciriaco,ciesla,cichon,ciancio,cianci,chynoweth,chrzanowski,christion,cholewa,chipley,chilcott,cheyne,cheslock,chenevert,charlot,chagolla,chabolla,cesena,cerutti,cava,caul,cassone,cassin,cassese,casaus,casali,cartledge,cardamone,carcia,carbonneau,carboni,carabello,capozzoli,capella,cannata,campoverde,campeau,cambre,camberos,calvery,calnan,calmes,calley,callery,calise,cacciotti,cacciatore,butterbaugh,burgo,burgamy,burell,bunde,bumbalough,buel,buechner,buchannon,brunn,brost,broadfoot,brittan,brevard,breda,brazel,brayboy,brasier,boyea,boxx,boso,bosio,boruff,borda,bongiovanni,bolerjack,boedeker,blye,blumstein,blumenfeld,blinn,bleakley,blatter,blan,bjornson,bisignano,billick,bieniek,bhatti,bevacqua,berra,berenbaum,bensinger,bennefield,belvins,belson,bellin,beighley,beecroft,beaudreau,baynard,bautch,bausch,basch,bartleson,barthelemy,barak,balzano,balistreri,bailer,bagnall,bagg,auston,augustyn,aslinger,ashalintubbi,arjona,arebalo,appelbaum,angert,angelucci,andry,andersson,amorim,amavisca,alward,alvelo,alvear,alumbaugh,alsobrook,allgeier,allende,aldrete,akiyama,ahlquist,adolphson,addario,acoff,abelson,abasta,zulauf,zirkind,zeoli,zemlicka,zawislak,zappia,zanella,yelvington,yeatman,yanni,wragg,wissing,wischmeier,wirta,wiren,wilmouth,williard,willert,willaert,wildt,whelpley,weingart,weidenbach,weidemann,weatherman,weakland,watwood,wattley,waterson,wambach,walzer,waldow,waag,vorpahl,volkmann,vitolo,visitacion,vincelette,viggiano,vieth,vidana,vert,verges,verdejo,venzon,velardi,varian,vargus,vandermeulen,vandam,vanasse,vanaman,utzinger,uriostegui,uplinger,twiss,tumlinson,tschanz,trunnell,troung,troublefield,trojacek,treloar,tranmer,touchton,torsiello,torina,tootle,toki,toepfer,tippie,thronson,thomes,tezeno,texada,testani,tessmer,terrel,terlizzi,tempel,temblador,tayler,tawil,tasch,tames,talor,talerico,swinderman,sweetland,swager,sulser,sullens,subia,sturgell,stumpff,stufflebeam,stucki,strohmeyer,strebel,straughan,strackbein,stobaugh,stetz,stelter,steinmann,steinfeld,stecher,stanwood,stanislawski,stander,speziale,soppe,soni,sobotka,smuin,slee,skerrett,sjoberg,sittig,simonelli,simo,silverio,silveria,silsby,sillman,sienkiewicz,shomo,shoff,shoener,shiba,sherfey,shehane,sexson,setton,sergi,selvy,seiders,seegmiller,sebree,seabury,scroggin,sconyers,schwalb,schurg,schulenberg,schuld,schrage,schow,schon,schnur,schneller,schmidtke,schlatter,schieffer,schenkel,scheeler,schauwecker,schartz,schacherer,scafe,sayegh,savidge,saur,sarles,sarkissian,sarkis,sarcone,sagucio,saffell,saenger,sacher,rylee,ruvolo,ruston,ruple,rulison,ruge,ruffo,ruehl,rueckert,rudman,rudie,rubert,rozeboom,roysden,roylance,rothchild,rosse,rosecrans,rodi,rockmore,robnett,roberti,rivett,ritzel,rierson,ricotta,ricken,rezac,rendell,reitman,reindl,reeb,reddic,reddell,rebuck,reali,raso,ramthun,ramsden,rameau,ralphs,rago,racz,quinteros,quinter,quinley,quiggle,purvines,purinton,purdum,pummill,puglia,puett,ptacek,przybyla,prowse,prestwich,pracht,poutre,poucher,portera,polinsky,poage,platts,pineau,pinckard,pilson,pilling,pilkins,pili,pikes,pigram,pietila,pickron,philippi,philhower,pflueger,pfalzgraf,pettibone,pett,petrosino,persing,perrino,perotti,periera,peri,peredo,peralto,pennywell,pennel,pellegren,pella,pedroso,paulos,paulding,pates,pasek,paramo,paolino,panganiban,paneto,paluch,ozaki,ownbey,overfelt,outman,opper,onstad,oland,okuda,oertel,oelke,normandeau,nordby,nordahl,noecker,noblin,niswonger,nishioka,nett,negley,nedeau,natera,nachman,naas,musich,mungin,mourer,mounsey,mottola,mothershed,moskal,mosbey,morini,moreles,montaluo,moneypenny,monda,moench,moates,moad,missildine,misiewicz,mirabella,minott,mincks,milum,milani,mikelson,mestayer,mertes,merrihew,merlos,meritt,melnyk,medlen,meder,mcvea,mcquarrie,mcquain,mclucas,mclester,mckitrick,mckennon,mcinnes,mcgrory,mcgranahan,mcglamery,mcgivney,mcgilvray,mccuiston,mccuin,mccrystal,mccolley,mcclerkin,mcclenon,mccamey,mcaninch,mazariegos,maynez,mattioli,mastronardi,masone,marzett,marsland,margulies,margolin,malatesta,mainer,maietta,magrath,maese,madkins,madeiros,madamba,mackson,maben,lytch,lundgreen,lumb,lukach,luick,luetkemeyer,luechtefeld,ludy,ludden,luckow,lubinsky,lowes,lorenson,loran,lopinto,looby,lones,livsey,liskey,lisby,lintner,lindow,lindblom,liming,liechty,leth,lesniewski,lenig,lemonds,leisy,lehrer,lehnen,lehmkuhl,leeth,leeks,lechler,lebsock,lavere,lautenschlage,laughridge,lauderback,laudenslager,lassonde,laroque,laramee,laracuente,lapeyrouse,lampron,lamers,laino,lague,lafromboise,lafata,lacount,lachowicz,kysar,kwiecien,kuffel,kueter,kronenberg,kristensen,kristek,krings,kriesel,krey,krebbs,kreamer,krabbe,kossman,kosakowski,kosak,kopacz,konkol,koepsell,koening,koen,knerr,knapik,kluttz,klocke,klenk,klemme,klapp,kitchell,kita,kissane,kirkbride,kirchhoff,kinter,kinsel,kingsland,kimmer,kimler,killoran,kieser,khalsa,khalaf,kettel,kerekes,keplin,kentner,kennebrew,kenison,kellough,keatts,keasey,kauppi,katon,kanner,kampa,kall,kaczorowski,kaczmarski,juarbe,jordison,jobst,jezierski,jeanbart,jarquin,jagodzinski,ishak,isett,infantino,imburgia,illingworth,hysmith,hynson,hydrick,hurla,hunton,hunnell,humbertson,housand,hottle,hosch,hoos,honn,hohlt,hodel,hochmuth,hixenbaugh,hislop,hisaw,hintzen,hilgendorf,hilchey,higgens,hersman,herrara,hendrixson,hendriks,hemond,hemmingway,heminger,helgren,heisey,heilmann,hehn,hegna,heffern,hawrylak,haverty,hauger,haslem,harnett,harb,happ,hanzlik,hanway,hanby,hanan,hamric,hammaker,halas,hagenbuch,habeck,gwozdz,gunia,guadarrama,grubaugh,grivas,griffieth,grieb,grewell,gregorich,grazier,graeber,graciano,gowens,goodpaster,gondek,gohr,goffney,godbee,gitlin,gisler,gillyard,gillooly,gilchrest,gilbo,gierlach,giebler,giang,geske,gervasio,gertner,gehling,geeter,gaus,gattison,gatica,gathings,gath,gassner,gassert,garabedian,gamon,gameros,galban,gabourel,gaal,fuoco,fullenwider,fudala,friscia,franceschini,foronda,fontanilla,florey,flore,flegle,flecha,fisler,fischbach,fiorita,figura,figgins,fichera,ferra,fawley,fawbush,fausett,farnes,farago,fairclough,fahie,fabiani,evanson,eutsey,eshbaugh,ertle,eppley,englehardt,engelhard,emswiler,elling,elderkin,eland,efaw,edstrom,edgemon,ecton,echeverri,ebright,earheart,dynes,dygert,dyches,dulmage,duhn,duhamel,dubrey,dubray,dubbs,drey,drewery,dreier,dorval,dorough,dorais,donlin,donatelli,dohm,doetsch,dobek,disbrow,dinardi,dillahunty,dillahunt,diers,dier,diekmann,diangelo,deskin,deschaine,depaoli,denner,demyan,demont,demaray,delillo,deleeuw,deibel,decato,deblasio,debartolo,daubenspeck,darner,dardon,danziger,danials,damewood,dalpiaz,dallman,dallaire,cunniffe,cumpston,cumbo,cubero,cruzan,cronkhite,critelli,crimi,creegan,crean,craycraft,cranfill,coyt,courchesne,coufal,corradino,corprew,colville,cocco,coby,clinch,clickner,clavette,claggett,cirigliano,ciesielski,christain,chesbro,chavera,chard,casteneda,castanedo,casseus,caruana,carnero,cappelli,capellan,canedy,cancro,camilleri,calero,cada,burghart,burbidge,bulfer,buis,budniewski,bruney,brugh,brossard,brodmerkel,brockmann,brigmond,briere,bremmer,breck,breau,brautigam,brasch,brandenberger,bragan,bozell,bowsher,bosh,borgia,borey,boomhower,bonneville,bonam,bolland,boise,boeve,boettger,boersma,boateng,bliven,blazier,blahnik,bjornstad,bitton,biss,birkett,billingsly,biagioni,bettle,bertucci,bertolino,bermea,bergner,berber,bensley,bendixen,beltrami,bellone,belland,behringer,begum,bayona,batiz,bassin,baskette,bartolomeo,bartolo,bartholow,barkan,barish,barett,bardo,bamburg,ballerini,balla,balis,bakley,bailon,bachicha,babiarz,ayars,axton,axel,awong,awalt,auslander,ausherman,aumick,atha,atchinson,aslett,askren,arrowsmith,arras,arnhold,armagost,arey,arcos,archibeque,antunes,antilla,andras,amyx,amison,amero,alzate,alper,aller,alioto,aigner,agtarap,agbayani,adami,achorn,aceuedo,acedo,abundis,aber,abee,zuccaro,ziglar,zier,ziebell,zieba,zamzow,zahl,yurko,yurick,yonkers,yerian,yeaman,yarman,yann,yahn,yadon,yadao,woodbridge,wolske,wollenberg,wojtczak,wnuk,witherite,winther,winick,widell,wickens,whichard,wheelis,wesely,wentzell,wenthold,wemple,weisenburger,wehling,weger,weaks,wassink,walquist,wadman,wacaster,waage,voliva,vlcek,villafana,vigliotti,viger,viernes,viands,veselka,versteeg,vero,verhoeven,vendetti,velardo,vatter,vasconcellos,varn,vanwagner,vanvoorhis,vanhecke,vanduyn,vandervoort,vanderslice,valone,vallier,vails,uvalle,ursua,urenda,uphoff,tustin,turton,turnbough,turck,tullio,tuch,truehart,tropea,troester,trippe,tricarico,trevarthen,trembly,trabue,traber,tosi,toal,tinley,tingler,timoteo,tiffin,ticer,thorman,therriault,theel,tessman,tekulve,tejera,tebbs,tavernia,tarpey,tallmadge,takemoto,szot,sylvest,swindoll,swearinger,swantek,swaner,swainston,susi,surrette,sullenger,sudderth,suddarth,suckow,strege,strassburg,stoval,stotz,stoneham,stilley,stille,stierwalt,stfleur,steuck,stermer,stclaire,stano,staker,stahler,stablein,srinivasan,squillace,sprvill,sproull,sprau,sporer,spore,spittler,speelman,sparr,sparkes,spang,spagnuolo,sosinski,sorto,sorkin,sondag,sollers,socia,snarr,smrekar,smolka,slyter,slovinsky,sliwa,slavik,slatter,skiver,skeem,skala,sitzes,sitsler,sitler,sinko,simser,siegler,sideris,shrewsberry,shoopman,shoaff,shindler,shimmin,shill,shenkel,shemwell,shehorn,severa,semones,selsor,sekulski,segui,sechrest,schwer,schwebach,schur,schmiesing,schlick,schlender,schebler,schear,schapiro,sauro,saunder,sauage,satterly,saraiva,saracino,saperstein,sanmartin,sanluis,sandt,sandrock,sammet,sama,salk,sakata,saini,sackrider,russum,russi,russaw,rozzell,roza,rowlette,rothberg,rossano,rosebrock,romanski,romanik,romani,roiger,roig,roehr,rodenberger,rodela,rochford,ristow,rispoli,rigo,riesgo,riebel,ribera,ribaudo,reys,resendes,repine,reisdorf,reisch,rebman,rasmus,raske,ranum,rames,rambin,raman,rajewski,raffield,rady,radich,raatz,quinnie,pyper,puthoff,prow,proehl,pribyl,pretti,prete,presby,poyer,powelson,porteous,poquette,pooser,pollan,ploss,plewa,placide,pion,pinnick,pinales,pillot,pille,pilato,piggee,pietrowski,piermarini,pickford,piccard,phenix,pevey,petrowski,petrillose,pesek,perrotti,peppler,peppard,penfold,pellitier,pelland,pehowic,pedretti,paules,passero,pasha,panza,pallante,palau,pakele,pacetti,paavola,overy,overson,outler,osegueda,oplinger,oldenkamp,ohern,oetting,odums,nowlen,nowack,nordlund,noblett,nobbe,nierman,nichelson,niblock,newbrough,nemetz,needleman,navin,nastasi,naslund,naramore,nakken,nakanishi,najarro,mushrush,muma,mulero,morganfield,moreman,morain,moquin,monterrosa,monsivais,monroig,monje,monfort,moffa,moeckel,mobbs,misiak,mires,mirelez,mineo,mineau,milnes,mikeska,michelin,michalowski,meszaros,messineo,meshell,merten,meola,menton,mends,mende,memmott,melius,mehan,mcnickle,mcmorran,mclennon,mcleish,mclaine,mckendry,mckell,mckeighan,mcisaac,mcie,mcguinn,mcgillis,mcfatridge,mcfarling,mcelravy,mcdonalds,mcculla,mcconnaughy,mcconnaughey,mcchriston,mcbeath,mayr,matyas,matthiesen,matsuura,matinez,mathys,matarazzo,masker,masden,mascio,martis,marrinan,marinucci,margerum,marengo,manthe,mansker,manoogian,mankey,manigo,manier,mangini,maltese,malsam,mallo,maliszewski,mainolfi,maharaj,maggart,magar,maffett,macmaster,macky,macdonnell,lyvers,luzzi,lutman,lovan,lonzo,longerbeam,lofthouse,loethen,lodi,llorens,lizama,litscher,lisowski,lipski,lipsett,lipkin,linzey,lineman,limerick,limas,lige,lierman,liebold,liberti,leverton,levene,lesueur,lenser,lenker,legnon,lefrancois,ledwell,lavecchia,laurich,lauricella,lannigan,landor,lamprecht,lamountain,lamore,lammert,lamboy,lamarque,lamacchia,lalley,lagace,lacorte,lacomb,kyllonen,kyker,kuschel,kupfer,kunde,kucinski,kubacki,kroenke,krech,koziel,kovacich,kothari,koth,kotek,kostelnik,kosloski,knoles,knabe,kmiecik,klingman,kliethermes,kleffman,klees,klaiber,kittell,kissling,kisinger,kintner,kinoshita,kiener,khouri,kerman,kelii,keirn,keezer,kaup,kathan,kaser,karlsen,kapur,kandoll,kammel,kahele,justesen,jonason,johnsrud,joerling,jochim,jespersen,jeong,jenness,jedlicka,jakob,isaman,inghram,ingenito,iadarola,hynd,huxtable,huwe,hurless,humpal,hughston,hughart,huggett,hugar,huether,howdyshell,houtchens,houseworth,hoskie,holshouser,holmen,holloran,hohler,hoefler,hodsdon,hochman,hjort,hippert,hippe,hinzman,hillock,hilden,heyn,heyden,heyd,hergert,henrikson,henningsen,hendel,helget,helf,helbing,heintzman,heggie,hege,hecox,heatherington,heare,haxton,haverstock,haverly,hatler,haselton,hase,hartzfeld,harten,harken,hargrow,haran,hanton,hammar,hamamoto,halper,halko,hackathorn,haberle,haake,gunnoe,gunkel,gulyas,guiney,guilbeau,guider,guerrant,gudgel,guarisco,grossen,grossberg,gropp,groome,grobe,gremminger,greenley,grauberger,grabenstein,gowers,gostomski,gosier,goodenow,gonzoles,goliday,goettle,goens,goates,glymph,glavin,glassco,gladfelter,glackin,githens,girgis,gimpel,gilbreth,gilbeau,giffen,giannotti,gholar,gervasi,gertsch,gernatt,gephardt,genco,gehr,geddis,gase,garrott,garrette,gapinski,ganter,ganser,gangi,gangemi,gallina,galdi,gailes,gaetano,gadomski,gaccione,fuschetto,furtick,furfaro,fullman,frutos,fruchter,frogge,freytag,freudenthal,fregoe,franzone,frankum,francia,franceschi,forys,forero,folkers,flug,flitter,flemons,fitzer,firpo,finizio,filiault,figg,fichtner,fetterolf,ferringer,feil,fayne,farro,faddis,ezzo,ezelle,eynon,evitt,eutsler,euell,escovedo,erne,eriksson,enriguez,empson,elkington,eisenmenger,eidt,eichenberger,ehrmann,ediger,earlywine,eacret,duzan,dunnington,ducasse,dubiel,drovin,drager,drage,donham,donat,dolinger,dokken,doepke,dodwell,docherty,distasio,disandro,diniz,digangi,didion,dezzutti,detmer,deshon,derrigo,dentler,demoura,demeter,demeritt,demayo,demark,demario,delzell,delnero,delgrosso,dejarnett,debernardi,dearmas,dashnaw,daris,danks,danker,dangler,daignault,dafoe,dace,curet,cumberledge,culkin,crowner,crocket,crawshaw,craun,cranshaw,cragle,courser,costella,cornforth,corkill,coopersmith,conzemius,connett,connely,condict,condello,comley,cohoon,coday,clugston,clowney,clippard,clinkenbeard,clines,clelland,clapham,clancey,clabough,cichy,cicalese,chua,chittick,chisom,chisley,chinchilla,cheramie,cerritos,cercone,cena,cawood,cavness,catanzarite,casada,carvell,carmicheal,carll,cardozo,caplin,candia,canby,cammon,callister,calligan,calkin,caillouet,buzzelli,bute,bustillo,bursey,burgeson,bupp,bulson,buist,buffey,buczkowski,buckbee,bucio,brueckner,broz,brookhart,brong,brockmeyer,broberg,brittenham,brisbois,bridgmon,breyer,brede,breakfield,breakey,brauner,branigan,brandewie,branche,brager,brader,bovell,bouthot,bostock,bosma,boseman,boschee,borthwick,borneman,borer,borek,boomershine,boni,bommarito,bolman,boleware,boisse,boehlke,bodle,blash,blasco,blakesley,blacklock,blackley,bittick,birks,birdin,bircher,bilbao,bick,biby,bertoni,bertino,bertini,berson,bern,berkebile,bergstresser,benne,benevento,belzer,beltre,bellomo,bellerose,beilke,begeman,bebee,beazer,beaven,beamish,baymon,baston,bastidas,basom,basey,bartles,baroni,barocio,barnet,barclift,banville,balthazor,balleza,balkcom,baires,bailie,baik,baggott,bagen,bachner,babington,babel,asmar,arvelo,artega,arrendondo,arreaga,arrambide,arquette,aronoff,arico,argentieri,arevalos,archbold,apuzzo,antczak,ankeny,angelle,angelini,anfinson,amer,amarillas,altier,altenburg,alspach,alosa,allsbrook,alexopoulos,aleem,aldred,albertsen,akerson,agler,adley,addams,acoba,achille,abplanalp,abella,abare,zwolinski,zollicoffer,zins,ziff,zenner,zender,zelnick,zelenka,zeches,zaucha,zauala,zangari,zagorski,youtsey,yasso,yarde,yarbough,woolever,woodsmall,woodfolk,wobig,wixson,wittwer,wirtanen,winson,wingerd,wilkening,wilhelms,wierzbicki,wiechman,weyrick,wessell,wenrick,wenning,weltz,weinrich,weiand,wehunt,wareing,walth,waibel,wahlquist,vona,voelkel,vitek,vinsant,vincente,vilar,viel,vicars,vermette,verma,venner,veazie,vayda,vashaw,varon,vardeman,vandevelde,vanbrocklin,vaccarezza,urquidez,urie,urbach,uram,ungaro,umali,ulsh,tutwiler,turnbaugh,tumminello,tuite,tueller,trulove,troha,trivino,trisdale,trippett,tribbett,treptow,tremain,travelstead,trautwein,trautmann,tram,traeger,tonelli,tomsic,tomich,tomasulo,tomasino,tole,todhunter,toborg,tischer,tirpak,tircuit,tinnon,tinnel,tines,timbs,tilden,tiede,thumm,throgmorton,thorndike,thornburgh,thoren,thomann,therrell,thau,thammavong,tetrick,tessitore,tesreau,teicher,teaford,tauscher,tauer,tanabe,talamo,takeuchi,taite,tadych,sweeton,swecker,swartzentrube,swarner,surrell,surbaugh,suppa,sumbry,suchy,stuteville,studt,stromer,strome,streng,stonestreet,stockley,stmichel,stfort,sternisha,stensrud,steinhardt,steinback,steichen,stauble,stasiak,starzyk,stango,standerfer,stachowiak,springston,spratlin,spracklen,sponseller,spilker,spiegelman,spellacy,speiser,spaziani,spader,spackman,sorum,sopha,sollis,sollenberger,solivan,solheim,sokolsky,sogge,smyser,smitley,sloas,slinker,skora,skiff,skare,siverd,sivels,siska,siordia,simmering,simko,sime,silmon,silano,sieger,siebold,shukla,shreves,shoun,shortle,shonkwiler,shoals,shimmel,shiel,shieh,sherbondy,shenkman,shein,shearon,shean,shatz,shanholtz,shafran,shaff,shackett,sgroi,sewall,severy,sethi,sessa,sequra,sepulvado,seper,senteno,sendejo,semmens,seipp,segler,seegers,sedwick,sedore,sechler,sebastiano,scovel,scotton,scopel,schwend,schwarting,schutter,schrier,schons,scholtes,schnetzer,schnelle,schmutz,schlichter,schelling,schams,schamp,scarber,scallan,scalisi,scaffidi,saxby,sawrey,sauvageau,sauder,sarrett,sanzo,santizo,santella,santander,sandez,sandel,sammon,salsedo,salge,sagun,safi,sader,sacchetti,sablan,saade,runnion,runkel,rumbo,ruesch,ruegg,ruckle,ruchti,rubens,rubano,rozycki,roupe,roufs,rossel,rosmarin,rosero,rosenwald,ronca,romos,rolla,rohling,rohleder,roell,roehm,rochefort,roch,robotham,rivenburgh,riopel,riederer,ridlen,rias,rhudy,reynard,retter,respess,reppond,repko,rengifo,reinking,reichelt,reeh,redenius,rebolledo,rauh,ratajczak,rapley,ranalli,ramie,raitt,radloff,radle,rabbitt,quay,quant,pusateri,puffinberger,puerta,provencio,proano,privitera,prenger,prellwitz,pousson,potier,portz,portlock,porth,portela,portee,porchia,pollick,polinski,polfer,polanski,polachek,pluta,plourd,plauche,pitner,piontkowski,pileggi,pierotti,pico,piacente,phinisee,phaup,pfost,pettinger,pettet,petrich,peto,persley,persad,perlstein,perko,pere,penders,peifer,peco,pawley,pash,parrack,parady,papen,pangilinan,pandolfo,palone,palmertree,padin,ottey,ottem,ostroski,ornstein,ormonde,onstott,oncale,oltremari,olcott,olan,oishi,oien,odonell,odonald,obeso,obeirne,oatley,nusser,novo,novicki,nitschke,nistler,nikkel,niese,nierenberg,nield,niedzwiecki,niebla,niebel,nicklin,neyhart,newsum,nevares,nageotte,nagai,mutz,murata,muralles,munnerlyn,mumpower,muegge,muckle,muchmore,moulthrop,motl,moskos,mortland,morring,mormile,morimoto,morikawa,morgon,mordecai,montour,mont,mongan,monell,miyasato,mish,minshew,mimbs,millin,milliard,mihm,middlemiss,miano,mesick,merlan,mendonsa,mench,melonson,melling,meachem,mctighe,mcnelis,mcmurtrey,mckesson,mckenrick,mckelvie,mcjunkins,mcgory,mcgirr,mcgeever,mcfield,mcelhinney,mccrossen,mccommon,mccannon,mazyck,mawyer,maull,matute,mathies,maschino,marzan,martinie,marrotte,marmion,markarian,marinacci,margolies,margeson,marak,maraia,maracle,manygoats,manker,mank,mandich,manderson,maltz,malmquist,malacara,majette,magnan,magliocca,madina,madara,macwilliams,macqueen,maccallum,lyde,lyday,lutrick,lurz,lurvey,lumbreras,luhrs,luhr,lowrimore,lowndes,lourenco,lougee,lorona,longstreth,loht,lofquist,loewenstein,lobos,lizardi,lionberger,limoli,liljenquist,liguori,liebl,liburd,leukhardt,letizia,lesinski,lepisto,lenzini,leisenring,leipold,leier,leggitt,legare,leaphart,lazor,lazaga,lavey,laue,laudermilk,lauck,lassalle,larsson,larison,lanzo,lantzy,lanners,langtry,landford,lancour,lamour,lambertson,lalone,lairson,lainhart,lagreca,lacina,labranche,labate,kurtenbach,kuipers,kuechle,kubo,krinsky,krauser,kraeger,kracht,kozeliski,kozar,kowalik,kotler,kotecki,koslosky,kosel,koob,kolasinski,koizumi,kohlman,koffman,knutt,knore,knaff,kmiec,klamm,kittler,kitner,kirkeby,kiper,kindler,kilmartin,kilbride,kerchner,kendell,keddy,keaveney,kearsley,karlsson,karalis,kappes,kapadia,kallman,kallio,kalil,kader,jurkiewicz,jitchaku,jillson,jeune,jarratt,jarchow,janak,ivins,ivans,isenhart,inocencio,inoa,imhof,iacono,hynds,hutching,hutchin,hulsman,hulsizer,hueston,huddleson,hrbek,howry,housey,hounshell,hosick,hortman,horky,horine,hootman,honeywell,honeyestewa,holste,holien,holbrooks,hoffmeyer,hoese,hoenig,hirschfeld,hildenbrand,higson,higney,hibert,hibbetts,hewlin,hesley,herrold,hermon,hepker,henwood,helbling,heinzman,heidtbrink,hedger,havey,hatheway,hartshorne,harpel,haning,handelman,hamalainen,hamad,halasz,haigwood,haggans,hackshaw,guzzo,gundrum,guilbeault,gugliuzza,guglielmi,guderian,gruwell,grunow,grundman,gruen,grotzke,grossnickle,groomes,grode,grochowski,grob,grein,greif,greenwall,greenup,grassl,grannis,grandfield,grames,grabski,grabe,gouldsberry,gosch,goodling,goodermote,gonzale,golebiowski,goldson,godlove,glanville,gillin,gilkerson,giessler,giambalvo,giacomini,giacobbe,ghio,gergen,gentz,genrich,gelormino,gelber,geitner,geimer,gauthreaux,gaultney,garvie,gareau,garbacz,ganoe,gangwer,gandarilla,galyen,galt,galluzzo,galardo,gager,gaddie,gaber,gabehart,gaarder,fusilier,furnari,furbee,fugua,fruth,frohman,friske,frilot,fridman,frescas,freier,frayer,franzese,frankenberry,frain,fosse,foresman,forbess,flook,fletes,fleer,fleek,fleegle,fishburne,fiscalini,finnigan,fini,filipiak,figueira,fiero,ficek,fiaschetti,ferren,ferrando,ferman,fergusson,fenech,feiner,feig,faulds,fariss,falor,falke,ewings,eversley,everding,etling,essen,erskin,enstrom,engebretsen,eitel,eichberger,ehler,eekhoff,edrington,edmonston,edgmon,edes,eberlein,dwinell,dupee,dunklee,dungey,dunagin,dumoulin,duggar,duenez,dudzic,dudenhoeffer,ducey,drouillard,dreibelbis,dreger,dreesman,draughon,downen,dorminy,dombeck,dolman,doebler,dittberner,dishaw,disanti,dinicola,dinham,dimino,dilling,difrancesco,dicello,dibert,deshazer,deserio,descoteau,deruyter,dering,depinto,dente,demus,demattos,demarsico,delude,dekok,debrito,debois,deakin,dayley,dawsey,dauria,datson,darty,darsow,darragh,darensbourg,dalleva,dalbec,dadd,cutcher,cung,cuello,cuadros,crute,crutchley,crispino,crislip,crisco,crevier,creekmur,crance,cragg,crager,cozby,coyan,coxon,covalt,couillard,costley,costilow,cossairt,corvino,corigliano,cordaro,corbridge,corban,coor,conkel,conary,coltrain,collopy,colgin,colen,colbath,coiro,coffie,cochrum,cobbett,clopper,cliburn,clendenon,clemon,clementi,clausi,cirino,cina,churchman,chilcutt,cherney,cheetham,cheatom,chatelain,chalifour,cesa,cervenka,cerullo,cerreta,cerbone,cecchini,ceccarelli,cawthorn,cavalero,castner,castlen,castine,casimiro,casdorph,cartmill,cartmell,carro,carriger,carias,caravella,cappas,capen,cantey,canedo,camuso,campanaro,cambria,calzado,callejo,caligiuri,cafaro,cadotte,cacace,byrant,busbey,burtle,burres,burnworth,burggraf,burback,bunte,bunke,bulle,bugos,budlong,buckhalter,buccellato,brummet,bruff,brubeck,brouk,broten,brosky,broner,brislin,brimm,brillhart,bridgham,brideau,brennecke,breer,breeland,bredesen,brackney,brackeen,boza,boyum,bowdry,bowdish,bouwens,bouvier,bougie,bouche,bottenfield,bostian,bossie,bosler,boschert,boroff,borello,bonser,bonfield,bole,boldue,bogacz,boemer,bloxom,blickenstaff,blessinger,bleazard,blatz,blanchet,blacksher,birchler,binning,binkowski,biltz,bilotta,bilagody,bigbee,bieri,biehle,bidlack,betker,bethers,bethell,bero,bernacchi,bermingham,berkshire,benvenuto,bensman,benoff,bencivenga,beman,bellow,bellany,belflower,belch,bekker,bejar,beisel,beichner,beedy,beas,beanblossom,bawek,baus,baugus,battie,battershell,bateson,basque,basford,bartone,barritt,barko,bann,bamford,baltrip,balon,balliew,ballam,baldus,ayling,avelino,ashwell,ashland,arseneau,arroyos,armendarez,arita,argust,archuletta,arcement,antonacci,anthis,antal,annan,anderman,amster,amiri,amadon,alveraz,altomari,altmann,altenhofen,allers,allbee,allaway,aleo,alcoser,alcorta,akhtar,ahuna,agramonte,agard,adkerson,achord,abdi,abair,zurn,zoellner,zirk,zion,zarro,zarco,zambo,zaiser,zaino,zachry,youd,yonan,yniguez,yepes,yellock,yellen,yeatts,yearling,yatsko,yannone,wyler,woodridge,wolfrom,wolaver,wolanin,wojnar,wojciak,wittmann,wittich,wiswell,wisser,wintersteen,wineland,willford,wiginton,wigfield,wierman,wice,wiater,whitsel,whitbread,wheller,wettstein,werling,wente,wenig,wempe,welz,weinhold,weigelt,weichman,wedemeyer,weddel,wayment,waycaster,wauneka,watzka,watton,warnell,warnecke,warmack,warder,wands,waldvogel,waldridge,wahs,wagganer,waddill,vyas,vought,votta,voiles,virga,viner,villella,villaverde,villaneda,viele,vickroy,vicencio,vetere,vermilyea,verley,verburg,ventresca,veno,venard,venancio,velaquez,veenstra,vasil,vanzee,vanwie,vantine,vant,vanschoyck,vannice,vankampen,vanicek,vandersloot,vanderpoel,vanderlinde,vallieres,uzzell,uzelac,uranga,uptain,updyke,uong,untiedt,umbrell,umbaugh,umbarger,ulysse,ullmann,ullah,tutko,turturro,turnmire,turnley,turcott,turbyfill,turano,tuminello,tumbleson,tsou,truscott,trulson,troutner,trone,trinklein,tremmel,tredway,trease,traynham,traw,totty,torti,torregrossa,torok,tomkins,tomaino,tkach,tirey,tinsman,timpe,tiefenauer,tiedt,tidball,thwaites,thulin,throneburg,thorell,thorburn,thiemann,thieman,thesing,tham,terrien,telfair,taybron,tasson,tasso,tarro,tanenbaum,taddeo,taborn,tabios,szekely,szatkowski,sylve,swineford,swartzfager,swanton,swagerty,surrency,sunderlin,sumerlin,suero,suddith,sublette,stumpe,stueve,stuckert,strycker,struve,struss,strubbe,strough,strothmann,strahle,stoutner,stooksbury,stonebarger,stokey,stoffer,stimmel,stief,stephans,stemper,steltenpohl,stellato,steinle,stegeman,steffler,steege,steckman,stapel,stansbery,stanaland,stahley,stagnaro,stachowski,squibb,sprunger,sproule,sprehe,spreen,sprecher,sposato,spivery,souter,sopher,sommerfeldt,soffer,snowberger,snape,smylie,smyer,slaydon,slatton,slaght,skovira,skeans,sjolund,sjodin,siragusa,singelton,silis,siebenaler,shuffield,shobe,shiring,shimabukuro,shilts,sherbert,shelden,sheil,shedlock,shearn,shaub,sharbono,shapley,shands,shaheen,shaffner,servantez,sentz,seney,selin,seitzinger,seider,sehr,sego,segall,sebastien,scimeca,schwenck,schweiss,schwark,schwalbe,schucker,schronce,schrag,schouten,schoppe,schomaker,schnarr,schmied,schmader,schlicht,schlag,schield,schiano,scheve,scherbarth,schaumburg,schauman,scarpino,savinon,sassaman,saporito,sanville,santilli,santaana,salzmann,salman,sagraves,safran,saccone,rutty,russett,rupard,rumbley,ruffins,ruacho,rozema,roxas,routson,rourk,rought,rotunda,rotermund,rosman,rork,rooke,rolin,rohm,rohlman,rohl,roeske,roecker,rober,robenson,riso,rinne,riina,rigsbee,riggles,riester,rials,rhinehardt,reynaud,reyburn,rewis,revermann,reutzel,retz,rende,rendall,reistad,reinders,reichardt,rehrig,rehrer,recendez,reamy,rauls,ratz,rattray,rasband,rapone,ragle,ragins,radican,raczka,rachels,raburn,rabren,raboin,quesnell,quaintance,puccinelli,pruner,prouse,prosise,proffer,prochazka,probasco,previte,portell,porcher,popoca,pomroy,poma,polsky,polsgrove,polidore,podraza,plymale,plescia,pleau,platte,pizzi,pinchon,picot,piccione,picazo,philibert,phebus,pfohl,petell,pesso,pesante,pervis,perrins,perley,perkey,pereida,penate,peloso,pellerito,peffley,peddicord,pecina,peale,payette,paxman,pawlikowski,pavy,patry,patmon,patil,pater,patak,pasqua,pasche,partyka,parody,parmeter,pares,pardi,paonessa,panozzo,panameno,paletta,pait,oyervides,ossman,oshima,ortlieb,orsak,onley,oldroyd,okano,ohora,offley,oestreicher,odonovan,odham,odegard,obst,obriant,obrecht,nuccio,nowling,nowden,novelli,nost,norstrom,nordgren,nopper,noller,nisonger,niskanen,nienhuis,nienaber,neuwirth,neumeyer,neice,naugher,naiman,nagamine,mustin,murrietta,murdaugh,munar,muhlbauer,mroczkowski,mowdy,mouw,mousel,mountcastle,moscowitz,mosco,morro,moresi,morago,moomaw,montroy,montpas,montieth,montanaro,mongelli,mollison,mollette,moldovan,mohar,mitchelle,mishra,misenheimer,minshall,minozzi,minniefield,milhous,migliaccio,migdal,mickell,meyering,methot,mester,mesler,meriweather,mensing,mensah,menge,mendibles,meloche,melnik,mellas,meinert,mehrhoff,medas,meckler,mctague,mcspirit,mcshea,mcquown,mcquiller,mclarney,mckiney,mckearney,mcguyer,mcfarlan,mcfadyen,mcdanial,mcdanel,mccurtis,mccrohan,mccorry,mcclune,mccant,mccanna,mccandlish,mcaloon,mayall,maver,maune,matza,matsuzaki,matott,mathey,mateos,masoner,masino,marzullo,marz,marsolek,marquard,marchetta,marberry,manzione,manthei,manka,mangram,mangle,mangel,mandato,mancillas,mammen,malina,maletta,malecki,majkut,mages,maestre,macphail,maco,macneill,macadam,lysiak,lyne,luxton,luptak,lundmark,luginbill,lovallo,louthan,lousteau,loupe,lotti,lopresto,lonsdale,longsworth,lohnes,loghry,logemann,lofaro,loeber,locastro,livings,litzinger,litts,liotta,lingard,lineback,lindhorst,lill,lide,lickliter,liberman,lewinski,levandowski,leimbach,leifer,leidholt,leiby,leibel,leibee,lehrke,lehnherr,lego,leese,leen,ledo,lech,leblond,leahey,lazzari,lawrance,lawlis,lawhorne,lawes,lavigna,lavell,lauzier,lauter,laumann,latsha,latourette,latona,latney,laska,larner,larmore,larke,larence,lapier,lanzarin,lammey,lamke,laminack,lamastus,lamaster,lacewell,labarr,laabs,kutch,kuper,kuna,kubis,krzemien,krupinski,krepps,kreeger,kraner,krammer,kountz,kothe,korpela,komara,kolenda,kolek,kohnen,koelzer,koelsch,kocurek,knoke,knauff,knaggs,knab,kluver,klose,klien,klahr,kitagawa,kissler,kirstein,kinnon,kinnebrew,kinnamon,kimmins,kilgour,kilcoyne,kiester,kiehm,kesselring,kerestes,kenniston,kennamore,kenebrew,kelderman,keitel,kefauver,katzenberger,katt,kast,kassel,kamara,kalmbach,kaizer,kaiwi,kainz,jurczyk,jumonville,juliar,jourdain,johndrow,johanning,johannesen,joffrion,jobes,jerde,jentzsch,jenkens,jendro,jellerson,jefferds,jaure,jaquish,janeway,jago,iwasaki,ishman,isaza,inmon,inlow,inclan,ildefonso,iezzi,ianni,iacovetto,hyldahl,huxhold,huser,humpherys,humburg,hult,hullender,hulburt,huckabay,howeth,hovermale,hoven,houtman,hourigan,hosek,hopgood,homrich,holstine,holsclaw,hokama,hoffpauir,hoffner,hochstein,hochstatter,hochberg,hjelm,hiscox,hinsley,hineman,hineline,hinck,hilbun,hewins,herzing,hertzberg,hertenstein,herrea,herington,henrie,henman,hengst,hemmen,helmke,helgerson,heinsohn,heigl,hegstad,heggen,hegge,hefti,heathcock,haylett,haupert,haufler,hatala,haslip,hartless,hartje,hartis,harpold,harmsen,harbach,hanten,hanington,hammen,hameister,hallstrom,habersham,habegger,gussman,gundy,guitterez,guisinger,guilfoyle,groulx,grismer,griesbach,grawe,grall,graben,goulden,gornick,gori,gookin,gonzalaz,gonyer,gonder,golphin,goller,goergen,glosson,glor,gladin,girdler,gillim,gillians,gillaspie,gilhooly,gildon,gignac,gibler,gibbins,giardino,giampietro,gettman,gerringer,gerrald,gerlich,georgiou,georgi,geiselman,gehman,gangl,gamage,gallian,gallen,gallatin,galea,gainor,gahr,furbush,fulfer,fuhrmann,fritter,friis,friedly,freudenberger,freemon,fratus,frans,foulke,fosler,forquer,fontan,folwell,foeller,fodge,fobes,florek,fliss,flesner,flegel,fitzloff,fiser,firmin,firestine,finfrock,fineberg,fiegel,fickling,fesperman,fernadez,felber,feimster,feazel,favre,faughn,fatula,fasone,farron,faron,farino,falvey,falkenberg,faley,faletti,faeth,fackrell,espe,eskola,escott,esaw,erps,erker,erath,enfield,emfinger,embury,embleton,emanuele,elvers,ellwanger,ellegood,eichinger,egge,egeland,edgett,echard,eblen,eastmond,duteau,durland,dure,dunlavy,dungee,dukette,dugay,duboise,dubey,dsouza,druck,dralle,doubek,dorta,dorch,dorce,dopson,dolney,dockter,distler,dippel,dichiara,dicerbo,dewindt,dewan,deveney,devargas,deutscher,deuel,detter,dess,derrington,deroberts,dern,deponte,denogean,denardi,denard,demary,demarais,delucas,deloe,delmonico,delisi,delio,delduca,deihl,dehmer,decoste,dechick,decatur,debruce,debold,debell,deats,daunt,daquilante,dambrosi,damas,dalin,dahman,dahlem,daffin,dacquel,cutrell,cusano,curtner,currens,curnow,cuppett,cummiskey,cullers,culhane,crull,crossin,cropsey,cromie,crofford,criscuolo,crisafulli,crego,creeden,covello,covel,corse,correra,cordner,cordier,coplen,copeman,contini,conteras,consalvo,conduff,compher,colliver,colan,cohill,cohenour,cogliano,codd,cockayne,clum,clowdus,clarida,clance,clairday,clagg,citron,citino,ciriello,cicciarelli,chrostowski,christley,chrisco,chrest,chisler,chieffo,cherne,cherico,cherian,cheirs,chauhan,chamblin,cerra,cepero,cellini,celedon,cejka,cavagnaro,cauffman,catanese,castrillo,castrellon,casserly,caseres,carthen,carse,carragher,carpentieri,carmony,carmer,carlozzi,caradine,cappola,capece,capaldi,cantres,cantos,canevari,canete,calcaterra,cadigan,cabbell,byrn,bykowski,butchko,busler,bushaw,buschmann,burow,buri,burgman,bunselmeyer,bunning,buhrman,budnick,buckson,buckhannon,brunjes,brumleve,bruckman,brouhard,brougham,brostrom,broerman,brocks,brison,brining,brindisi,brereton,breon,breitling,breedon,brasseaux,branaman,bramon,brackenridge,boyan,boxley,bouman,bouillion,botting,botti,bosshart,borup,borner,bordonaro,bonsignore,bonsall,bolter,bojko,bohne,bohlmann,bogdon,boen,bodenschatz,bockoven,bobrow,blondin,blissett,bligen,blasini,blankenburg,bjorkman,bistline,bisset,birdow,biondolillo,bielski,biele,biddix,biddinger,bianchini,bevens,bevard,betancur,bernskoetter,bernet,bernardez,berliner,berland,berkheimer,berent,bensch,benesch,belleau,bedingfield,beckstrom,beckim,bechler,beachler,bazzell,basa,bartoszek,barsch,barrell,barnas,barnaba,barillas,barbier,baltodano,baltierra,balle,balint,baldi,balderson,balderama,baldauf,balcazar,balay,baiz,bairos,azim,aversa,avellaneda,ausburn,auila,augusto,atwill,artiles,arterberry,arnow,arnaud,arnall,arenz,arduini,archila,arakawa,appleman,aplin,antonini,anstey,anglen,andros,amweg,amstutz,amari,amadeo,alteri,aloi,allebach,aley,alamillo,airhart,ahrendt,aegerter,adragna,admas,adderly,adderley,addair,abelar,abbamonte,abadi,zurek,zundel,zuidema,zuelke,zuck,zogg,zody,zets,zech,zecca,zavaleta,zarr,yousif,yoes,yoast,yeagley,yaney,yanda,yackel,wyles,wyke,woolman,woollard,woodis,woodin,wonderly,wombles,woloszyn,wollam,wnek,wittie,withee,wissman,wisham,wintle,winokur,wilmarth,willhoite,wildner,wikel,wieser,wien,wicke,wiatrek,whitehall,whetstine,wheelus,weyrauch,weyers,westerling,wendelken,welner,weinreb,weinheimer,weilbacher,weihe,weider,wecker,wead,watler,watkinson,wasmer,waskiewicz,wasik,warneke,wares,wangerin,wamble,walken,waker,wakeley,wahlgren,wahlberg,wagler,wachob,vorhies,vonseggern,vittitow,vink,villarruel,villamil,villamar,villalovos,vidmar,victorero,vespa,vertrees,verissimo,veltman,vecchione,veals,varrone,varma,vanveen,vanterpool,vaneck,vandyck,vancise,vanausdal,vanalphen,valdiviezo,urton,urey,updegrove,unrue,ulbrich,tysinger,twiddy,tunson,trueheart,troyan,trier,traweek,trafford,tozzi,toulouse,tosto,toste,torez,tooke,tonini,tonge,tomerlin,tolmie,tobe,tippen,tierno,tichy,thuss,thran,thornbury,thone,theunissen,thelmon,theall,textor,teters,tesh,tench,tekautz,tehrani,teat,teare,tavenner,tartaglione,tanski,tanis,tanguma,tangeman,taney,tammen,tamburri,tamburello,talsma,tallie,takeda,taira,taheri,tademy,taddei,taaffe,szymczak,szczepaniak,szafranski,swygert,swem,swartzlander,sutley,supernaw,sundell,sullivant,suderman,sudbury,suares,stueber,stromme,streeper,streck,strebe,stonehouse,stoia,stohr,stodghill,stirewalt,sterry,stenstrom,stene,steinbrecher,stear,stdenis,stanphill,staniszewski,stanard,stahlhut,stachowicz,srivastava,spong,spomer,spinosa,spindel,spera,soward,sopp,sooter,sonnek,soland,sojourner,soeder,sobolewski,snellings,smola,smetana,smeal,smarr,sloma,sligar,skenandore,skalsky,sissom,sirko,simkin,silverthorn,silman,sikkink,signorile,siddens,shumsky,shrider,shoulta,shonk,shomaker,shippey,shimada,shillingburg,shifflet,shiels,shepheard,sheerin,shedden,sheckles,sharrieff,sharpley,shappell,shaneyfelt,shampine,shaefer,shaddock,shadd,sforza,severtson,setzler,sepich,senne,senatore,sementilli,selway,selover,sellick,seigworth,sefton,seegars,sebourn,seaquist,sealock,seabreeze,scriver,scinto,schumer,schulke,schryver,schriner,schramek,schoon,schoolfield,schonberger,schnieder,schnider,schlitz,schlather,schirtzinger,scherman,schenker,scheiner,scheible,schaus,schakel,schaad,saxe,savely,savary,sardinas,santarelli,sanschagrin,sanpedro,sandine,sandigo,sandgren,sanderford,sandahl,salzwedel,salzar,salvino,salvatierra,salminen,salierno,salberg,sahagun,saelee,sabel,rynearson,ryker,rupprecht,runquist,rumrill,ruhnke,rovira,rottenberg,rosoff,rosete,rosebrough,roppolo,roope,romas,roley,rohrback,rohlfs,rogriguez,roel,rodriguiz,rodewald,roback,rizor,ritt,rippee,riolo,rinkenberger,riggsby,rigel,rieman,riedesel,rideau,ricke,rhinebolt,rheault,revak,relford,reinsmith,reichmann,regula,redlinger,rayno,raycroft,raus,raupp,rathmann,rastorfer,rasey,raponi,rantz,ranno,ranes,ramnauth,rahal,raddatz,quattrocchi,quang,pullis,pulanco,pryde,prohaska,primiano,prez,prevatt,prechtl,pottle,potenza,portes,porowski,poppleton,pontillo,politz,politi,poggi,plonka,plaskett,placzek,pizzuti,pizzaro,pisciotta,pippens,pinkins,pinilla,pini,pingitore,piercey,piccola,piccioni,picciano,philps,philp,philo,philmon,philbin,pflieger,pezzullo,petruso,petrea,petitti,peth,peshlakai,peschel,persico,persichetti,persechino,perris,perlow,perico,pergola,penniston,pembroke,pellman,pekarek,peirson,pearcey,pealer,pavlicek,passino,pasquarello,pasion,parzych,parziale,parga,papalia,papadakis,paino,pacini,oyen,ownes,owczarzak,outley,ouelette,ottosen,otting,ostwinkle,osment,oshita,osario,orlow,oriordan,orefice,orantes,oran,orahood,opel,olpin,oliveria,okon,okerlund,okazaki,ohta,offerman,nyce,nutall,northey,norcia,noor,niehoff,niederhauser,nickolson,nguy,neylon,newstrom,nevill,netz,nesselrodt,nemes,neally,nauyen,nascimento,nardella,nanni,myren,murchinson,munter,mundschenk,mujalli,muckleroy,moussa,mouret,moulds,mottram,motte,morre,montreuil,monton,montellano,monninger,monhollen,mongeon,monestime,monegro,mondesir,monceaux,mola,moga,moening,moccia,misko,miske,mishaw,minturn,mingione,milstein,milla,milks,michl,micheletti,michals,mesia,merson,meras,menifee,meluso,mella,melick,mehlman,meffert,medoza,mecum,meaker,meahl,mczeal,mcwatters,mcomber,mcmonigle,mckiddy,mcgranor,mcgeary,mcgaw,mcenery,mcelderry,mcduffey,mccuistion,mccrudden,mccrossin,mccosh,mccolgan,mcclish,mcclenahan,mcclam,mccartt,mccarrell,mcbane,maybury,mayben,maulden,mauceri,matko,mathie,matheis,mathai,masucci,massiah,martorano,martnez,martindelcamp,marschke,marovich,markiewicz,marinaccio,marhefka,marcrum,manton,mannarino,manlove,mangham,manasco,malpica,mallernee,malinsky,malhotra,maish,maisel,mainville,maharrey,magid,maertz,mada,maclaughlin,macina,macdermott,macallister,macadangdang,maack,lynk,lydic,luyando,lutke,lupinacci,lunz,lundsten,lujano,luhn,luecke,luebbe,ludolph,luckman,lucker,luckenbill,luckenbach,lucido,lowney,lowitz,lovaglio,louro,louk,loudy,louderback,lorick,lorenzini,lorensen,lorenc,lomuscio,loguidice,lockner,lockart,lochridge,litaker,lisowe,liptrap,linnane,linhares,lindfors,lindenmuth,lincourt,liew,liebowitz,levengood,leskovec,lesch,leoni,lennard,legner,leaser,leas,leadingham,lazarski,layland,laurito,laulu,laughner,laughman,laughery,laube,latiolais,lasserre,lasser,larrow,larrea,lapsley,lantrip,lanthier,langwell,langelier,landaker,lampi,lamond,lamblin,lambie,lakins,laipple,lagrimas,lafrancois,laffitte,laday,lacko,lacava,labianca,kutsch,kuske,kunert,kubly,kuamoo,krummel,krise,krenek,kreiser,krausz,kraska,krakowski,kradel,kozik,koza,kotowski,koslow,korber,kojima,kochel,knabjian,klunder,klugh,klinkhammer,kliewer,klever,kleber,klages,klaas,kizziar,kitchel,kishimoto,kirschenman,kirschenbaum,kinnick,kinn,kiner,kindla,kindall,kincaide,kilson,killins,kightlinger,kienzle,kiah,khim,ketcherside,kerl,kelsoe,kelker,keizer,keir,kawano,kawa,kaveney,kasparek,kaplowitz,kantrowitz,kant,kanoff,kano,kamalii,kalt,kaleta,kalbach,kalauli,kalata,kalas,kaigler,kachel,juran,jubb,jonker,jonke,jolivette,joles,joas,jividen,jeffus,jeanty,jarvi,jardon,janvier,janosko,janoski,janiszewski,janish,janek,iwanski,iuliano,irle,ingmire,imber,ijames,iiams,ihrig,ichikawa,hynum,hutzel,hutts,huskin,husak,hurndon,huntsinger,hulette,huitron,huguenin,hugg,hugee,huelskamp,huch,howen,hovanec,hoston,hostettler,horsfall,horodyski,holzhauer,hollimon,hollender,hogarth,hoffelmeyer,histand,hissem,hisel,hirayama,hinegardner,hinde,hinchcliffe,hiltbrand,hilsinger,hillstrom,hiley,hickenbottom,hickam,hibley,heying,hewson,hetland,hersch,herlong,herda,henzel,henshall,helson,helfen,heinbach,heikkila,heggs,hefferon,hebard,heathcote,hearl,heaberlin,hauth,hauschild,haughney,hauch,hattori,hasley,hartpence,harroun,harelson,hardgrove,hardel,hansbrough,handshoe,handly,haluska,hally,halling,halfhill,halferty,hakanson,haist,hairgrove,hahner,hagg,hafele,haaland,guttierez,gutknecht,gunnarson,gunlock,gummersheimer,gullatte,guity,guilmette,guhl,guenette,guardino,groshong,grober,gripp,grillot,grilli,greulich,gretzinger,greenwaldt,graven,grassman,granberg,graeser,graeff,graef,grabow,grabau,gotchy,goswick,gosa,gordineer,gorczyca,goodchild,golz,gollihue,goldwire,goldbach,goffredo,glassburn,glaeser,gillilan,gigante,giere,gieger,gidcumb,giarrusso,giannelli,gettle,gesualdi,geschke,gerwig,gervase,geoffrion,gentilcore,genther,gemes,gemberling,gelles,geitz,geeslin,gedney,gebauer,gawron,gavia,gautney,gaustad,gasmen,gargus,ganske,ganger,galvis,gallinger,gallichio,galletta,gaede,gadlin,gaby,gabrielsen,gaboriault,furlan,furgerson,fujioka,fugett,fuehrer,frint,frigon,frevert,frautschi,fraker,fradette,foulkes,forslund,forni,fontenette,fones,folz,folmer,follman,folkman,flourney,flickner,flemmings,fleischacker,flander,flament,fithian,fiorello,fiorelli,fioravanti,fieck,ficke,fiallos,fiacco,feuer,ferrington,fernholz,feria,fergurson,feick,febles,favila,faulkingham,fath,farnam,falter,fakhouri,fairhurst,fahs,estrello,essick,espree,esmond,eskelson,escue,escatel,erebia,epperley,epler,enyart,engelbert,enderson,emch,elisondo,elford,ekman,eick,eichmann,ehrich,ehlen,edwardson,edley,edghill,edel,eastes,easterbrooks,eagleson,eagen,eade,dyle,dutkiewicz,dunnagan,duncil,duling,drumgoole,droney,dreyfus,dragan,dowty,doscher,dornan,doremus,doogan,donaho,donahey,dombkowski,dolton,dolen,dobratz,diveley,dittemore,ditsch,disque,dishmon,disch,dirickson,dippolito,dimuccio,dilger,diefenderfer,dicola,diblasio,dibello,devan,dettmer,deschner,desbiens,derusha,denkins,demonbreun,demchak,delucchi,delprete,deloy,deliz,deline,delap,deiter,deignan,degiacomo,degaetano,defusco,deboard,debiase,deaville,deadwyler,davanzo,daughton,darter,danser,dandrade,dando,dampeer,dalziel,dalen,dain,dague,czekanski,cutwright,cutliff,curle,cuozzo,cunnington,cunnigham,cumings,crowston,crittle,crispell,crisostomo,crear,creach,craigue,crabbs,cozzi,cozza,coxe,cowsert,coviello,couse,coull,cottier,costagliola,corra,corpening,cormany,corless,corkern,conteh,conkey,conditt,conaty,colomb,collura,colledge,colins,colgate,coleson,colemon,coffland,coccia,clougherty,clewell,cleckley,cleaveland,clarno,civils,cillo,cifelli,ciesluk,christison,chowning,chouteau,choung,childres,cherrington,chenette,cheeves,cheairs,chaddock,cernoch,cerino,cazier,castel,casselberry,caserta,carvey,carris,carmant,cariello,cardarelli,caras,caracciolo,capitano,cantoni,cantave,cancio,campillo,callens,caldero,calamia,cahee,cahan,cahalan,cabanilla,cabal,bywater,bynes,byassee,busker,bushby,busack,burtis,burrola,buroker,burnias,burlock,burham,burak,bulla,buffin,buening,budney,buchannan,buchalter,brule,brugler,broxson,broun,brosh,brissey,brisby,brinlee,brinkmeyer,brimley,brickell,breth,breger,brees,brank,braker,bozak,bowlds,bowersock,bousman,boushie,botz,bordwell,bonkowski,bonine,bonifay,bonesteel,boldin,bohringer,bohlander,boecker,bocook,bocock,boblett,bobbett,boas,boarman,bleser,blazejewski,blaustein,blausey,blancarte,blaize,blackson,blacketer,blackard,bisch,birchett,billa,bilder,bierner,bienvenu,bielinski,bialas,biagini,beynon,beyl,bettini,betcher,bessent,beshara,besch,bernd,bergemann,bergeaux,berdan,bens,benedicto,bendall,beltron,beltram,bellville,beisch,behney,beechler,beckum,batzer,batte,bastida,bassette,basley,bartosh,bartolone,barraclough,barnick,barket,barkdoll,baringer,barella,barbian,barbati,bannan,balles,baldo,balasubramani,baig,bahn,bachmeier,babyak,baas,baars,ayuso,avinger,avella,ausbrooks,aull,augello,atkeson,atkerson,atherley,athan,assad,asebedo,arrison,armon,armfield,arkin,archambeau,antonellis,angotti,amorose,amini,amborn,amano,aluarez,allgaier,allegood,alen,aldama,aird,ahsing,ahmann,aguado,agostino,agostinelli,adwell,adsit,adelstein,actis,acierno,achee,abbs,abbitt,zwagerman,zuercher,zinno,zettler,zeff,zavalza,zaugg,zarzycki,zappulla,zanotti,zachman,zacher,yundt,yslas,younes,yontz,yglesias,yeske,yeargin,yauger,yamane,xang,wylam,wrobleski,wratchford,woodlee,wolsey,wolfinbarger,wohlenhaus,wittler,wittenmyer,witkop,wishman,wintz,winkelmann,windus,winborn,wims,wiltrout,willmott,williston,wilemon,wilbourne,wiedyk,widmann,wickland,wickes,wichert,whitsell,whisenand,whidby,wetz,westmeyer,wertheim,wernert,werle,werkheiser,weldin,weissenborn,weingard,weinfeld,weihl,weightman,weichel,wehrheim,wegrzyn,wegmann,waszak,wankum,walthour,waltermire,walstad,waldren,walbert,walawender,wahlund,wahlert,wahlers,wach,vuncannon,vredenburgh,vonk,vollmar,voisinet,vlahos,viscardi,vires,vipperman,violante,vidro,vessey,vesper,veron,vergari,verbeck,venturino,velastegui,vegter,varas,vanwey,vanvranken,vanvalkenbur,vanorsdale,vanoli,vanochten,vanier,vanevery,vane,vanduser,vandersteen,vandell,vandall,vallot,vallon,vallez,vallely,vadenais,uthe,usery,unga,ultsch,ullom,tyminski,twogood,tursi,turay,tungate,truxillo,trulock,trovato,troise,tripi,trinks,trimboli,trickel,trezise,trefry,treen,trebilcock,travieso,trachtenberg,touhey,tougas,tortorella,tormey,torelli,torborg,toran,tomek,tomassi,tollerson,tolden,toda,tobon,tjelmeland,titmus,tilbury,tietje,thurner,thum,thrope,thornbrough,thibaudeau,thackeray,tesoro,territo,ternes,teich,tecson,teater,teagarden,tatsch,tarallo,tapanes,tanberg,tamm,sylvis,swenor,swedlund,sutfin,sura,sundt,sundin,summerson,sumatzkuku,sultemeier,sulivan,suggitt,suermann,sturkie,sturgess,stumph,stuemke,struckhoff,strose,stroder,stricklen,strick,streib,strei,strawther,stratis,strahm,stortz,storrer,storino,stohler,stohl,stockel,stinnette,stile,stieber,steffenhagen,stefanowicz,steever,steagall,statum,stapley,stanish,standiford,standen,stamos,stahlecker,stadtler,spratley,spraker,sposito,spickard,spehar,spees,spearing,spangle,spallone,soulard,sora,sopko,sood,sonnen,solly,solesbee,soldano,sobey,sobczyk,snedegar,sneddon,smolinski,smolik,slota,slavick,skorupski,skolnik,skirvin,skeels,skains,skahan,skaar,siwiec,siverly,siver,sivak,sirk,sinton,sinor,sincell,silberstein,sieminski,sidelinger,shurman,shunnarah,shirer,shidler,sherlin,shepperson,shemanski,sharum,shartrand,shapard,shanafelt,shamp,shader,shackelton,seyer,seroka,sernas,seright,serano,sengupta,selinger,seith,seidler,seehusen,seefried,scovell,scorzelli,sconiers,schwind,schwichtenber,schwerin,schwenke,schwaderer,schussler,schuneman,schumpert,schultheiss,schroll,schroepfer,schroeden,schrimpf,schook,schoof,schomburg,schoenfeldt,schoener,schnoor,schmick,schlereth,schindele,schildt,schildknecht,schemmel,scharfenberg,schanno,schane,schaer,schad,scearce,scardino,sawka,sawinski,savoca,savery,saults,sarpy,saris,sardinha,sarafin,sankar,sanjurjo,sanderfer,sanagustin,samudio,sammartino,samas,salz,salmen,salkeld,salamon,sakurai,sakoda,safley,sada,sachse,ryden,ryback,russow,russey,ruprecht,rumple,ruffini,rudzinski,rudel,rudden,rovero,routledge,roussin,rousse,rouser,rougeau,rosica,romey,romaniello,rolfs,rogoff,rogne,rodriquz,rodrequez,rodin,rocray,rocke,riviere,rivette,riske,risenhoover,rindfleisch,rinaudo,rimbey,riha,righi,ridner,ridling,riden,rhue,reyome,reynoldson,reusch,rensing,rensch,rennels,renderos,reininger,reiners,reigel,rehmer,regier,reff,redlin,recchia,reaume,reagor,rawe,rattigan,raska,rashed,ranta,ranft,randlett,ramiez,ramella,rallis,rajan,raisbeck,raimondo,raible,ragone,rackliffe,quirino,quiring,quero,quaife,pyke,purugganan,pursifull,purkett,purdon,pulos,puccia,provance,propper,preis,prehn,prata,prasek,pranger,pradier,portor,portley,porte,popiel,popescu,pomales,polowy,pollett,politis,polit,poley,pohler,poggio,podolak,poag,plymel,ploeger,planty,piskura,pirrone,pirro,piroso,pinsky,pilant,pickerill,piccolomini,picart,piascik,phann,petruzzelli,petosa,persson,perretta,perkowski,perilli,percifield,perault,peppel,pember,pelotte,pelcher,peixoto,pehl,peatross,pearlstein,peacher,payden,paya,pawelek,pavey,pauda,pathak,parrillo,parness,parlee,paoli,pannebaker,palomar,palo,palmberg,paganelli,paffrath,padovano,padden,pachucki,ovando,othman,osowski,osler,osika,orsburn,orlowsky,oregel,oppelt,opfer,opdyke,onell,olivos,okumura,okoro,ogas,oelschlaeger,oder,ocanas,obrion,obarr,oare,nyhus,nyenhuis,nunnelley,nunamaker,nuckels,noyd,nowlan,novakovich,noteboom,norviel,nortz,norment,norland,nolt,nolie,nixson,nitka,nissley,nishiyama,niland,niewiadomski,niemeier,nieland,nickey,nicholsen,neugent,neto,nerren,neikirk,neigh,nedrow,neave,nazaire,navaro,navalta,nasworthy,nasif,nalepa,nakao,nakai,nadolny,myklebust,mussel,murthy,muratore,murat,mundie,mulverhill,muilenburg,muetzel,mudra,mudgett,mrozinski,moura,mottinger,morson,moretto,morentin,mordan,mooreland,mooers,monts,montone,montondo,montiero,monie,monat,monares,mollo,mollet,molacek,mokry,mohrmann,mohabir,mogavero,moes,moceri,miyoshi,mitzner,misra,mirr,minish,minge,minckler,milroy,mille,mileski,milanesi,miko,mihok,mihalik,mieczkowski,messerli,meskill,mesenbrink,merton,merryweather,merkl,menser,menner,menk,menden,menapace,melbourne,mekus,meinzer,meers,mctigue,mcquitty,mcpheron,mcmurdie,mcleary,mclafferty,mckinzy,mckibbin,mckethan,mcintee,mcgurl,mceachran,mcdowall,mcdermitt,mccuaig,mccreedy,mccoskey,mcclosky,mcclintick,mccleese,mccanless,mazzucco,mazzocco,mazurkiewicz,mazariego,mayhorn,maxcy,mavity,mauzey,maulding,matuszewski,mattsson,mattke,matsushita,matsuno,matsko,matkin,mathur,masterman,massett,massart,massari,mashni,martella,marren,margotta,marder,marczak,maran,maradiaga,manwarren,manter,mantelli,manso,mangone,manfredonia,malden,malboeuf,malanga,makara,maison,maisano,mairs,mailhiot,magri,madron,madole,mackall,macduff,macartney,lynds,lusane,luffman,louth,loughmiller,lougheed,lotspeich,lorenzi,loosli,longe,longanecker,lonero,lohmeyer,loeza,lobstein,lobner,lober,littman,litalien,lippe,lints,lijewski,ligas,liebert,liebermann,liberati,lezcano,levinthal,lessor,lesieur,lenning,lengel,lempke,lemp,lemar,leitzke,leinweber,legrone,lege,leder,lawnicki,lauth,laun,laughary,lassley,lashway,larrivee,largen,lare,lanouette,lanno,langille,langen,lamonte,lalin,laible,lafratta,laforte,lacuesta,lacer,labore,laboe,labeau,kwasniewski,kunselman,kuhr,kuchler,krugman,kruckenberg,krotzer,kroemer,krist,krigbaum,kreke,kreisman,kreisler,kreft,krasnow,kras,krag,kouyate,kough,kotz,kostura,korner,kornblum,korczynski,koppa,kopczyk,konz,komorowski,kollen,kolander,koepnick,koehne,kochis,knoch,knippers,knaebel,klipp,klinedinst,klimczyk,klier,klement,klaphake,kisler,kinzie,kines,kindley,kimple,kimm,kimbel,kilker,kilborn,kibbey,khong,ketchie,kerbow,kennemore,kennebeck,kenneally,kenndy,kenmore,kemnitz,kemler,kemery,kelnhofer,kellstrom,kellis,kellams,keiter,keirstead,keeny,keelin,keefauver,keams,kautzman,kaus,katayama,kasson,kassim,kasparian,kase,karwoski,kapuscinski,kaneko,kamerling,kamada,kalka,kalar,kakacek,kaczmarczyk,jurica,junes,journell,jolliffe,johnsey,jindra,jimenz,jette,jesperson,jerido,jenrette,jencks,jech,jayroe,jayo,javens,jaskot,jaros,jaquet,janowiak,jaegers,jackel,izumi,irelan,inzunza,imoto,imme,iglehart,iannone,iannacone,huyler,hussaini,hurlock,hurlbutt,huprich,humphry,hulslander,huelsman,hudelson,hudecek,hsia,hreha,hoyland,howk,housholder,housden,houff,horkey,honan,homme,holtzberg,hollyfield,hollings,hollenbaugh,hokenson,hogrefe,hogland,hoel,hodgkin,hochhalter,hjelle,hittson,hinderman,hinchliffe,hime,hilyer,hilby,hibshman,heydt,hewell,heward,hetu,hestand,heslep,herridge,herner,hernande,hermandez,hermance,herbold,heon,henthorne,henion,henao,heming,helmkamp,hellberg,heidgerken,heichel,hehl,hegedus,heckathorne,hearron,haymer,haycook,havlicek,hausladen,haseman,hartsook,hartog,harns,harne,harmann,haren,hanserd,hanners,hanekamp,hamra,hamley,hamelin,hamblet,hakimi,hagle,hagin,haehn,haeck,hackleman,haacke,gulan,guirand,guiles,guggemos,guerrieri,guerreiro,guereca,gudiel,guccione,gubler,gruenwald,gritz,grieser,grewe,grenon,gregersen,grefe,grech,grecco,gravette,grassia,granholm,graner,grandi,grahan,gradowski,gradney,graczyk,gouthier,gottschall,goracke,gootee,goodknight,goodine,gonzalea,gonterman,gonalez,gomm,goleman,goldtooth,goldstone,goldey,golan,goen,goeller,goel,goecke,godek,goan,glunz,gloyd,glodowski,glinski,glawe,girod,girdley,gindi,gillings,gildner,giger,giesbrecht,gierke,gier,giboney,giaquinto,giannakopoulo,giaimo,giaccio,giacalone,gessel,gerould,gerlt,gerhold,geralds,genson,genereux,gellatly,geigel,gehrig,gehle,geerdes,geagan,gawel,gavina,gauss,gatwood,gathman,gaster,garske,garratt,garms,garis,gansburg,gammell,gambale,gamba,galimore,gadway,gadoury,furrer,furino,fullard,fukui,fryou,friesner,friedli,friedl,friedberg,freyermuth,fremin,fredell,fraze,franken,foth,fote,fortini,fornea,formanek,forker,forgette,folan,foister,foglesong,flinck,flewellen,flaten,flaig,fitgerald,fischels,firman,finstad,finkelman,finister,fina,fetterhoff,ferriter,ferch,fennessy,feltus,feltes,feinman,farve,farry,farrall,farag,falzarano,falck,falanga,fakhoury,fairbrother,fagley,faggins,facteau,ewer,ewbank,evola,evener,eustis,estwick,estel,essa,espinola,escutia,eschmann,erpelding,ernsberger,erling,entz,engelhart,enbody,emick,elsinger,ellinwood,ellingsen,ellicott,elkind,eisinger,eisenbeisz,eischen,eimer,eigner,eichhorst,ehmke,egleston,eggett,efurd,edgeworth,eckels,ebey,eberling,eagleton,dwiggins,dweck,dunnings,dunnavant,dumler,duman,dugue,duerksen,dudeck,dreisbach,drawdy,drawbaugh,draine,draggoo,dowse,dovel,doughton,douds,doubrava,dort,dorshorst,dornier,doolen,donavan,dominik,domingez,dolder,dold,dobies,diskin,disano,dirden,diponio,dipirro,dimock,diltz,dillabough,diley,dikes,digges,digerolamo,diel,dicharry,dicecco,dibartolomeo,diamant,dewire,devone,dessecker,dertinger,derousselle,derk,depauw,depalo,denherder,demeyer,demetro,demastus,delvillar,deloye,delosrios,delgreco,delarge,delangel,dejongh,deitsch,degiorgio,degidio,defreese,defoe,decambra,debenedetto,deaderick,daza,dauzat,daughenbaugh,dato,dass,darwish,dantuono,danton,dammeyer,daloia,daleo,dagg,dacey,curts,cuny,cunneen,culverhouse,cucinella,cubit,crumm,crudo,crowford,crout,crotteau,crossfield,crooke,crom,critz,cristaldi,crickmore,cribbin,cremeens,crayne,cradduck,couvertier,cottam,cossio,correy,cordrey,coplon,copass,coone,coody,contois,consla,connelley,connard,congleton,condry,coltey,colindres,colgrove,colfer,colasurdo,cochell,cobbin,clouthier,closs,cloonan,clizbe,clennon,clayburn,claybourn,clausell,clasby,clagett,ciskowski,cirrincione,cinque,cinelli,cimaglia,ciaburri,christiani,christeson,chladek,chizmar,chinnici,chiarella,chevrier,cheves,chernow,cheong,chelton,chanin,cham,chaligoj,celestino,cayce,cavey,cavaretta,caughron,catmull,catapano,cashaw,carullo,carualho,carthon,cartelli,carruba,carrere,carolus,carlstrom,carfora,carello,carbary,caplette,cannell,cancilla,campell,cammarota,camilo,camejo,camarata,caisse,cacioppo,cabbagestalk,cabatu,cabanas,byles,buxbaum,butland,burrington,burnsed,burningham,burlingham,burgy,buitrago,bueti,buehring,buday,bucknell,buchbinder,bucey,bruster,brunston,brouillet,brosious,broomes,brodin,broddy,brochard,britsch,britcher,brierley,brezina,bressi,bressette,breslow,brenden,breier,brei,braymer,brasuell,branscomb,branin,brandley,brahler,bracht,bracamontes,brabson,boyne,boxell,bowery,bovard,boutelle,boulette,bottini,botkins,bosen,boscia,boscarino,borich,boreman,bordoy,bordley,bordenet,boquet,boocks,bolner,boissy,boilard,bohnen,bohall,boening,boccia,boccella,bobe,blyth,biviano,bitto,bisel,binstock,bines,billiter,bigsby,bighorse,bielawski,bickmore,bettin,bettenhausen,besson,beseau,berton,berroa,berntson,bernas,berisford,berhow,bergsma,benyo,benyard,bente,bennion,benko,belsky,bellavance,belasco,belardo,beidler,behring,begnaud,bega,befort,beek,bedore,beddard,becknell,beardslee,beardall,beagan,bayly,bauza,bautz,bausman,baumler,batterson,battenfield,bassford,basse,basemore,baruch,bartholf,barman,baray,barabas,banghart,banez,balsam,ballester,ballagh,baldock,bagnoli,bagheri,bacus,bacho,baccam,axson,averhart,aver,austill,auberry,athans,atcitty,atay,astarita,ascolese,artzer,arrasmith,argenbright,aresco,aranjo,appleyard,appenzeller,apilado,antonetti,antis,annas,angwin,andris,andries,andreozzi,ando,andis,anderegg,amyot,aminov,amelung,amelio,amason,alviar,allendorf,aldredge,alcivar,alaya,alapai,airington,aina,ailor,ahrns,ahmadi,agresta,affolter,aeschlimann,adney,aderhold,adachi,ackiss,aben,abdelhamid,abar,aase,zorilla,zordan,zollman,zoch,zipfel,zimmerle,zike,ziel,zens,zelada,zaman,zahner,zadora,zachar,zaborowski,zabinski,yzquierdo,yoshizawa,yori,yielding,yerton,yehl,yeargain,yeakley,yamaoka,yagle,yablonski,wynia,wyne,wyers,wrzesinski,wrye,wriston,woolums,woolen,woodlock,woodle,wonser,wombacher,wollschlager,wollen,wolfley,wolfer,wisse,wisell,wirsing,winstanley,winsley,winiecki,winiarski,winge,winesett,windell,winberry,willyard,willemsen,wilkosz,wilensky,wikle,wiford,wienke,wieneke,wiederhold,wiebold,widick,wickenhauser,whitrock,whisner,whinery,wherley,whedbee,wheadon,whary,wessling,wessells,wenninger,wendroth,wende,wellard,weirick,weinkauf,wehrman,weech,weathersbee,warncke,wardrip,walstrom,walkowski,walcutt,waight,wagman,waggett,wadford,vowles,vormwald,vondran,vohs,vitt,vitalo,viser,vinas,villena,villaneuva,villafranca,villaflor,vilain,vicory,viana,vian,verucchi,verra,venzke,venske,veley,veile,veeder,vaske,vasconez,vargason,varble,vanwert,vantol,vanscooter,vanmetre,vanmaanen,vanhise,vaneaton,vandyk,vandriel,vandorp,vandewater,vandervelden,vanderstelt,vanderhoef,vanderbeck,vanbibber,vanalstine,vanacore,valdespino,vaill,vailes,vagliardo,ursini,urrea,urive,uriegas,umphress,ucci,uballe,tynon,twiner,tutton,tudela,tuazon,troisi,tripplett,trias,trescott,treichel,tredo,tranter,tozer,toxey,tortorici,tornow,topolski,topia,topel,topalian,tonne,tondre,tola,toepke,tisdell,tiscareno,thornborrow,thomison,thilges,theuret,therien,thagard,thacher,texter,terzo,tenpenny,tempesta,teetz,teaff,tavella,taussig,tatton,tasler,tarrence,tardie,tarazon,tantillo,tanney,tankson,tangen,tamburo,tabone,szilagyi,syphers,swistak,swiatkowski,sweigert,swayzer,swapp,svehla,sutphen,sutch,susa,surma,surls,sundermeyer,sundeen,sulek,sughrue,sudol,sturms,stupar,stum,stuckman,strole,strohman,streed,strebeck,strausser,strassel,stpaul,storts,storr,stommes,stmary,stjulien,stika,stiggers,sthill,stevick,sterman,stepanek,stemler,stelman,stelmack,steinkamp,steinbock,stcroix,stcharles,staudinger,stanly,stallsworth,stalley,srock,spritzer,spracklin,spinuzzi,spidell,speyrer,sperbeck,spendlove,speckman,spargur,spangenberg,spaid,sowle,soulier,sotolongo,sostre,sorey,sonier,somogyi,somera,soldo,soderholm,snoots,snooks,snoke,snodderly,snee,smithhart,smillie,smay,smallman,sliwinski,slentz,sledd,slager,skogen,skog,skarda,skalicky,siwek,sitterson,sisti,sissel,sinopoli,similton,simila,simenson,silvertooth,silos,siggins,sieler,siburt,sianez,shurley,shular,shuecraft,shreeves,shollenberger,shoen,shishido,shipps,shipes,shinall,sherfield,shawe,sharrett,sharrard,shankman,sessum,serviss,servello,serice,serda,semler,semenza,selmon,sellen,seley,seidner,seib,sehgal,seelbach,sedivy,sebren,sebo,seanez,seagroves,seagren,seabron,schwertner,schwegel,schwarzer,schrunk,schriefer,schreder,schrank,schopp,schonfeld,schoenwetter,schnall,schnackenberg,schnack,schmutzler,schmierer,schmidgall,schlup,schloemer,schlitt,schermann,scherff,schellenberg,schain,schaedler,schabel,scaccia,saye,saurez,sasseen,sasnett,sarti,sarra,sarber,santoy,santeramo,sansoucy,sando,sandles,sandau,samra,samaha,salizar,salam,saindon,sagaser,saeteun,sadusky,sackman,sabater,saas,ruthven,ruszkowski,rusche,rumpf,ruhter,ruhenkamp,rufo,rudge,ruddle,rowlee,rowand,routhier,rougeot,rotramel,rotan,rosten,rosillo,rookard,roode,rongstad,rollie,roider,roffe,roettger,rodick,rochez,rochat,rivkin,rivadeneira,riston,risso,rinderknecht,riis,riggsbee,rieker,riegle,riedy,richwine,richmon,ricciuti,riccardo,ricardson,rhew,revier,remsberg,remiszewski,rembold,rella,reinken,reiland,reidel,reichart,rehak,redway,rednour,redifer,redgate,redenbaugh,redburn,readus,raybuck,rauhuff,rauda,ratte,rathje,rappley,rands,ramseyer,ramseur,ramsdale,ramo,ramariz,raitz,raisch,rainone,rahr,ragasa,rafalski,radunz,quenzer,queja,queenan,pyun,putzier,puskas,purrington,puri,punt,pullar,pruse,pring,primeau,prevette,preuett,prestage,pownell,pownall,potthoff,potratz,poth,poter,posthuma,posen,porritt,popkin,poormon,polidoro,polcyn,pokora,poer,pluviose,plock,pleva,placke,pioli,pingleton,pinchback,pieretti,piccone,piatkowski,philley,phibbs,phay,phagan,pfund,peyer,pettersen,petter,petrucelli,petropoulos,petras,petix,pester,pepperman,pennick,penado,pelot,pelis,peeden,pechon,peal,pazmino,patchin,pasierb,parran,parilla,pardy,parcells,paragas,paradee,papin,panko,pangrazio,pangelinan,pandya,pancheri,panas,palmiter,pallares,palinkas,palek,pagliaro,packham,pacitti,ozier,overbaugh,oursler,ouimette,otteson,otsuka,othon,osmundson,oroz,orgill,ordeneaux,orama,oppy,opheim,onkst,oltmanns,olstad,olofson,ollivier,olejniczak,okura,okuna,ohrt,oharra,oguendo,ogier,offermann,oetzel,oechsle,odoherty,oddi,ockerman,occhiogrosso,obryon,obremski,nyreen,nylund,nylen,nyholm,nuon,nuanes,norrick,noris,nordell,norbury,nooner,nomura,nole,nolden,nofsinger,nocito,niedbala,niebergall,nicolini,nevils,neuburger,nemerofsky,nemecek,nazareno,nastri,nast,nagorski,myre,muzzey,mutschler,muther,musumeci,muranaka,muramoto,murad,murach,muns,munno,muncrief,mugrage,muecke,mozer,moyet,mowles,mottern,mosman,mosconi,morine,morge,moravec,morad,mones,moncur,monarez,molzahn,moglia,moesch,mody,modisett,mitnick,mithcell,mitchiner,mistry,misercola,mirabile,minvielle,mino,minkler,minifield,minichiello,mindell,minasian,milteer,millwee,millstein,millien,mikrut,mihaly,miggins,michard,mezo,metzner,mesquita,merriwether,merk,merfeld,mercik,mercadante,menna,mendizabal,mender,melusky,melquist,mellado,meler,melendes,mekeel,meiggs,megginson,meck,mcwherter,mcwayne,mcsparren,mcrea,mcneff,mcnease,mcmurrin,mckeag,mchughes,mcguiness,mcgilton,mcelreath,mcelhone,mcelhenney,mceldowney,mccurtain,mccure,mccosker,mccory,mccormic,mccline,mccleave,mcclatchey,mccarney,mccanse,mcallen,mazzie,mazin,mazanec,mayette,mautz,maun,mattas,mathurin,mathiesen,massmann,masri,masias,mascolo,mascetti,mascagni,marzolf,maruska,martain,marszalek,marolf,marmas,marlor,markwood,marinero,marier,marich,marcom,marciante,marchman,marchio,marbach,manzone,mantey,mannina,manhardt,manaois,malmgren,mallonee,mallin,mallary,malette,makinson,makins,makarewicz,mainwaring,maiava,magro,magouyrk,magett,maeder,madyun,maduena,maden,madeira,mackins,mackel,macinnes,macia,macgowan,lyssy,lyerly,lyalls,lutter,lunney,luksa,ludeman,lucidi,lucci,lowden,lovier,loughridge,losch,lorson,lorenzano,lorden,lorber,lopardo,loosier,loomer,longsdorf,longchamps,loncar,loker,logwood,loeffelholz,lockmiller,livoti,linford,linenberger,lindloff,lindenbaum,limoges,liley,lighthill,lightbourne,lieske,leza,levandoski,leuck,lepere,leonhart,lenon,lemma,lemler,leising,leinonen,lehtinen,lehan,leetch,leeming,ledyard,ledwith,ledingham,leclere,leck,lebert,leandry,lazzell,layo,laye,laxen,lawther,lawerance,lavoy,lavertu,laverde,latouche,latner,lathen,laskin,lashbaugh,lascala,larroque,larick,laraia,laplume,lanzilotta,lannom,landrigan,landolt,landess,lamkins,lalla,lalk,lakeman,lakatos,laib,lahay,lagrave,lagerquist,lafoy,lafleche,lader,labrada,kwiecinski,kutner,kunshier,kulakowski,kujak,kuehnle,kubisiak,krzyminski,krugh,krois,kritikos,krill,kriener,krewson,kretzschmar,kretz,kresse,kreiter,kreischer,krebel,krans,kraling,krahenbuhl,kouns,kotson,kossow,kopriva,konkle,kolter,kolk,kolich,kohner,koeppen,koenigs,kock,kochanski,kobus,knowling,knouff,knoerzer,knippel,kloberdanz,kleinert,klarich,klaassen,kisamore,kirn,kiraly,kipps,kinson,kinneman,kington,kine,kimbriel,kille,kibodeaux,khamvongsa,keylon,kever,keser,kertz,kercheval,kendrix,kendle,kempt,kemple,keesey,keatley,kazmierski,kazda,kazarian,kawashima,katsch,kasun,kassner,kassem,kasperski,kasinger,kaschak,karels,kantola,kana,kamai,kalthoff,kalla,kalani,kahrs,kahanek,kacher,jurasek,jungels,jukes,juelfs,judice,juda,josselyn,jonsson,jonak,joens,jobson,jegede,jeanjacques,jaworowski,jaspers,jannsen,janner,jankowiak,jank,janiak,jackowski,jacklin,jabbour,iyer,iveson,isner,iniquez,ingwerson,ingber,imbrogno,ille,ikehara,iannelli,hyson,huxford,huseth,hurns,hurney,hurles,hunnings,humbarger,hulan,huisinga,hughett,hughen,hudler,hubiak,hricko,hoversten,hottel,hosaka,horsch,hormann,hordge,honzell,homburg,holten,holme,hollopeter,hollinsworth,hollibaugh,holberg,hohmann,hoenstine,hodell,hodde,hiter,hirko,hinzmann,hinrichsen,hinger,hincks,hilz,hilborn,highley,higashi,hieatt,hicken,heverly,hesch,hervert,hershkowitz,herreras,hermanns,herget,henriguez,hennon,hengel,helmlinger,helmig,heldman,heizer,heinitz,heifner,heidorn,heglin,heffler,hebner,heathman,heaslip,hazlip,haymes,hayase,hawver,havermale,havas,hauber,hashim,hasenauer,harvel,hartney,hartel,harsha,harpine,harkrider,harkin,harer,harclerode,hanzely,hanni,hannagan,hampel,hammerschmidt,hamar,hallums,hallin,hainline,haid,haggart,hafen,haer,hadiaris,hadad,hackford,habeeb,guymon,guttery,gunnett,guillette,guiliano,guilbeaux,guiher,guignard,guerry,gude,gucman,guadian,grzybowski,grzelak,grussendorf,grumet,gruenhagen,grudzinski,grossmann,grof,grisso,grisanti,griffitts,griesbaum,grella,gregston,graveline,grandusky,grandinetti,gramm,goynes,gowing,goudie,gosman,gort,gorsline,goralski,goodstein,goodroe,goodlin,goodheart,goodhart,gonzelez,gonthier,goldsworthy,goldade,goettel,goerlitz,goepfert,goehner,goben,gobeille,gliem,gleich,glasson,glascoe,gladwell,giusto,girdner,gipple,giller,giesing,giammona,ghormley,germon,geringer,gergely,gerberich,gepner,gens,genier,gemme,gelsinger,geigle,gebbia,gayner,gavitt,gatrell,gastineau,gasiewski,gascoigne,garro,garin,ganong,ganga,galpin,gallus,galizia,gajda,gahm,gagen,gaffigan,furno,furnia,furgason,fronczak,frishman,friess,frierdich,freestone,franta,frankovich,fors,forres,forrer,florido,flis,flicek,flens,flegal,finkler,finkenbinder,finefrock,filpo,filion,fierman,fieldman,ferreyra,fernendez,fergeson,fera,fencil,feith,feight,federici,federer,fechtner,feagan,fausnaugh,faubert,fata,farman,farinella,fantauzzi,fanara,falso,falardeau,fagnani,fabro,excell,ewton,evey,everetts,evarts,etherington,estremera,estis,estabrooks,essig,esplin,espenschied,ernzen,eppes,eppard,entwisle,emison,elison,elguezabal,eledge,elbaz,eisler,eiden,eichorst,eichert,egle,eggler,eggimann,edey,eckerman,echelberger,ebbs,ebanks,dziak,dyche,dyce,dusch,duross,durley,durate,dunsworth,dumke,dulek,duhl,duggin,dufford,dudziak,ducrepin,dubree,dubre,dubie,dubas,droste,drisko,drewniak,doxtator,dowtin,downum,doubet,dottle,dosier,doshi,dorst,dorset,dornbusch,donze,donica,domanski,domagala,dohse,doerner,doerfler,doble,dobkins,dilts,digiulio,digaetano,dietzel,diddle,dickel,dezarn,devoy,devoss,devilla,devere,deters,desvergnes,deshay,desena,deross,depedro,densley,demorest,demore,demora,demirjian,demerchant,dematteis,demateo,delgardo,delfavero,delaurentis,delamar,delacy,deitrich,deisher,degracia,degraaf,defries,defilippis,decoursey,debruin,debiasi,debar,dearden,dealy,dayhoff,davino,darvin,darrisaw,darbyshire,daquino,daprile,danh,danahy,dalsanto,dallavalle,dagel,dadamo,dacy,dacunha,dabadie,czyz,cutsinger,curney,cuppernell,cunliffe,cumby,cullop,cullinane,cugini,cudmore,cuda,cucuzza,cuch,crumby,crouser,critton,critchley,cremona,cremar,crehan,creary,crasco,crall,crabbe,cozzolino,cozier,coyner,couvillier,counterman,coulthard,coudriet,cottom,corzo,cornutt,corkran,corda,copelin,coonan,consolo,conrow,conran,connerton,conkwright,condren,comly,comisky,colli,collet,colello,colbeck,colarusso,coiner,cohron,codere,cobia,clure,clowser,clingenpeel,clenney,clendaniel,clemenson,cleere,cleckler,claybaugh,clason,cirullo,ciraulo,ciolek,ciampi,christopherse,chovanec,chopra,chol,chiem,chestnutt,chesterman,chernoff,chermak,chelette,checketts,charpia,charo,chargois,champman,challender,chafins,cerruto,celi,cazenave,cavaluzzi,cauthon,caudy,catino,catano,cassaro,cassarino,carrano,carozza,carow,carmickle,carlyon,carlew,cardena,caputi,capley,capalbo,canseco,candella,campton,camposano,calleros,calleja,callegari,calica,calarco,calais,caillier,cahue,cadenhead,cadenas,cabera,buzzo,busto,bussmann,busenbark,burzynski,bursley,bursell,burle,burkleo,burkette,burczyk,bullett,buikema,buenaventura,buege,buechel,budreau,budhram,bucknam,brye,brushwood,brumbalow,brulotte,bruington,bruderer,brougher,bromfield,broege,brodhead,brocklesby,broadie,brizuela,britz,brisendine,brilla,briggeman,brierton,bridgeford,breyfogle,brevig,breuninger,bresse,bresette,brelsford,breitbach,brayley,braund,branscom,brandner,brahm,braboy,brabble,bozman,boyte,boynes,boyken,bowell,bowan,boutet,bouse,boulet,boule,bottcher,bosquez,borrell,boria,bordes,borchard,bonson,bonino,bonas,bonamico,bolstad,bolser,bollis,bolich,bolf,boker,boileau,bohac,bogucki,bogren,boeger,bodziony,bodo,bodley,boback,blyther,blenker,blazina,blase,blamer,blacknall,blackmond,bitz,biser,biscardi,binz,bilton,billotte,billafuerte,bigford,biegler,bibber,bhandari,beyersdorf,bevelle,bettendorf,bessard,bertsche,berne,berlinger,berish,beranek,bentson,bentsen,benskin,benoy,benoist,benitz,belongia,belmore,belka,beitzel,beiter,beitel,behrns,becka,beaudion,beary,beare,beames,beabout,beaber,bazzano,bazinet,baucum,batrez,baswell,bastos,bascomb,bartha,barstad,barrilleaux,barretto,barresi,barona,barkhurst,barke,bardales,barczak,barca,barash,banfill,balonek,balmes,balko,balestrieri,baldino,baldelli,baken,baiza,bahner,baek,badour,badley,badia,backmon,bacich,bacca,ayscue,aynes,ausiello,auringer,auiles,aspinwall,askwith,artiga,arroliga,arns,arman,arellanes,aracena,antwine,antuna,anselmi,annen,angelino,angeli,angarola,andrae,amodio,ameen,alwine,alverio,altro,altobello,altemus,alquicira,allphin,allemand,allam,alessio,akpan,akerman,aiona,agyeman,agredano,adamik,adamczak,acrey,acevado,abreo,abrahamsen,abild,zwicker,zweig,zuvich,zumpano,zuluaga,zubek,zornes,zoglmann,ziminski,zimbelman,zhanel,zenor,zechman,zauner,zamarron,zaffino,yusuf,ytuarte,yett,yerkovich,yelder,yasuda,yapp,yaden,yackley,yaccarino,wytch,wyre,wussow,worthing,wormwood,wormack,wordell,woodroof,woodington,woodhams,wooddell,wollner,wojtkowski,wojcicki,wogan,wlodarczyk,wixted,withington,withem,wisler,wirick,winterhalter,winski,winne,winemiller,wimett,wiltfong,willibrand,willes,wilkos,wilbon,wiktor,wiggers,wigg,wiegmann,wickliff,wiberg,whittler,whittenton,whitling,whitledge,whitherspoon,whiters,whitecotton,whitebird,wheary,wetherill,westmark,westaby,wertenberger,wentland,wenstrom,wenker,wellen,weier,wegleitner,wedekind,wawers,wassel,warehime,wandersee,waltmon,waltersheid,walbridge,wakely,wakeham,wajda,waithe,waidelich,wahler,wahington,wagster,wadel,vuyovich,vuolo,vulich,vukovich,volmer,vollrath,vollbrecht,vogelgesang,voeller,vlach,vivar,vitullo,vitanza,visker,visalli,viray,vinning,viniard,villapando,villaman,vier,viar,viall,verstraete,vermilya,verdon,venn,velten,velis,vanoven,vanorder,vanlue,vanheel,vanderwoude,vanderheide,vandenheuvel,vandenbos,vandeberg,vandal,vanblarcom,vanaken,vanacker,vallian,valine,valent,vaine,vaile,vadner,uttech,urioste,urbanik,unrath,unnasch,underkofler,uehara,tyrer,tyburski,twaddle,turntine,tunis,tullock,tropp,troilo,tritsch,triola,trigo,tribou,tribley,trethewey,tress,trela,treharne,trefethen,trayler,trax,traut,tranel,trager,traczyk,towsley,torrecillas,tornatore,tork,torivio,toriello,tooles,tomme,tolosa,tolen,toca,titterington,tipsword,tinklenberg,tigney,tigert,thygerson,thurn,thur,thorstad,thornberg,thoresen,thomaston,tholen,thicke,theiler,thebeau,theaux,thaker,tewani,teufel,tetley,terrebonne,terrano,terpening,tela,teig,teichert,tegethoff,teele,tatar,tashjian,tarte,tanton,tanimoto,tamimi,tamas,talman,taal,szydlowski,szostak,swoyer,swerdlow,sweeden,sweda,swanke,swander,suyama,suriano,suri,surdam,suprenant,sundet,summerton,sult,suleiman,suffridge,suby,stych,studeny,strupp,struckman,strief,strictland,stremcha,strehl,stramel,stoy,stoutamire,storozuk,stordahl,stopher,stolley,stolfi,stoeger,stockhausen,stjulian,stivanson,stinton,stinchfield,stigler,stieglitz,stgermaine,steuer,steuber,steuart,stepter,stepnowski,stepanian,steimer,stefanelli,stebner,stears,steans,stayner,staubin,statz,stasik,starn,starmer,stargel,stanzione,stankovich,stamour,staib,stadelman,stadel,stachura,squadrito,springstead,spragg,spigelmyer,spieler,spaur,sovocool,soundara,soulia,souffrant,sorce,sonkin,sodhi,soble,sniffen,smouse,smittle,smithee,smedick,slowinski,slovacek,slominski,skowronek,skokan,skanes,sivertson,sinyard,sinka,sinard,simonin,simonian,simmions,silcott,silberg,siefken,siddon,shuttlesworth,shubin,shubeck,shiro,shiraki,shipper,shina,shilt,shikles,shideler,shenton,shelvey,shellito,shelhorse,shawcroft,shatto,shanholtzer,shamonsky,shadden,seymer,seyfarth,setlock,serratos,serr,sepulueda,senay,semmel,semans,selvig,selkirk,selk,seligson,seldin,seiple,seiersen,seidling,seidensticker,secker,searson,scordo,scollard,scoggan,scobee,sciandra,scialdone,schwimmer,schwieger,schweer,schwanz,schutzenhofer,schuetze,schrodt,schriever,schriber,schremp,schrecongost,schraeder,schonberg,scholtz,scholle,schoettle,schoenemann,schoene,schnitker,schmuhl,schmith,schlotterbeck,schleppenbach,schlee,schickel,schibi,schein,scheide,scheibe,scheib,schaumberg,schardein,schaalma,scantlin,scantlebury,sayle,sausedo,saurer,sassone,sarracino,saric,sanz,santarpia,santano,santaniello,sangha,sandvik,sandoral,sandobal,sandercock,sanantonio,salviejo,salsberry,salois,salazer,sagon,saglibene,sagel,sagal,saetern,saefong,sadiq,sabori,saballos,rygiel,rushlow,runco,rulli,ruller,ruffcorn,ruess,ruebush,rudlong,rudin,rudgers,rudesill,ruderman,rucki,rucinski,rubner,rubinson,rubiano,roznowski,rozanski,rowson,rower,rounsaville,roudabush,rotundo,rothell,rotchford,rosiles,roshak,rosetti,rosenkranz,rorer,rollyson,rokosz,rojek,roitman,rohrs,rogel,roewe,rodriges,rodocker,rodgerson,rodan,rodak,rocque,rochholz,robicheau,robbinson,roady,ritchotte,ripplinger,rippetoe,ringstaff,ringenberg,rinard,rigler,rightmire,riesen,riek,ridges,richner,richberg,riback,rial,rhyner,rhees,resse,renno,rendleman,reisz,reisenauer,reinschmidt,reinholt,reinard,reifsnyder,rehfeld,reha,regester,reffitt,redler,rediske,reckner,reckart,rebolloso,rebollar,reasonover,reasner,reaser,reano,reagh,raval,ratterman,ratigan,rater,rasp,raneses,randolf,ramil,ramdas,ramberg,rajaniemi,raggio,ragel,ragain,rade,radaker,racioppi,rabinovich,quickle,quertermous,queal,quartucci,quander,quain,pynes,putzel,purl,pulizzi,pugliares,prusak,prueter,protano,propps,primack,prieur,presta,preister,prawl,pratley,pozzo,powless,povey,pottorf,pote,postley,porzio,portney,ponzi,pontoriero,ponto,pont,poncedeleon,polimeni,polhamus,polan,poetker,poellnitz,podgurski,plotts,pliego,plaugher,plantenberg,plair,plagmann,pizzitola,pittinger,pitcavage,pischke,piontek,pintar,pinnow,pinneo,pinley,pingel,pinello,pimenta,pillard,piker,pietras,piere,phillps,pfleger,pfahl,pezzuti,petruccelli,petrello,peteet,pescatore,peruzzi,perusse,perotta,perona,perini,perelman,perciful,peppin,pennix,pennino,penalosa,pemble,pelz,peltzer,pelphrey,pelote,pellum,pellecchia,pelikan,peitz,pebworth,peary,pawlicki,pavelich,paster,pasquarella,paskey,paseur,paschel,parslow,parrow,parlow,parlett,parler,pargo,parco,paprocki,panepinto,panebianco,pandy,pandey,pamphile,pamintuan,pamer,paluso,paleo,paker,pagett,paczkowski,ozburn,ovington,overmeyer,ouellet,osterlund,oslin,oseguera,osaki,orrock,ormsbee,orlikowski,organista,oregan,orebaugh,orabuena,openshaw,ontiveroz,ondo,omohundro,ollom,ollivierre,olivencia,oley,olazabal,okino,offenberger,oestmann,ocker,obar,oakeson,nuzum,nurre,nowinski,novosel,norquist,nordlie,noorani,nonnemacher,nolder,njoku,niznik,niwa,niss,ninneman,nimtz,niemczyk,nieder,nicolo,nichlos,niblack,newtown,newill,newcom,neverson,neuhart,neuenschwande,nestler,nenno,nejman,neiffer,neidlinger,neglia,nazarian,navor,nary,narayan,nangle,nakama,naish,naik,nadolski,muscato,murphrey,murdick,murchie,muratalla,munnis,mundwiller,muncey,munce,mullenbach,mulhearn,mulcahey,muhammed,muchow,mountford,moudry,mosko,morvay,morrical,morr,moros,mormann,morgen,moredock,morden,mordarski,moravek,morandi,mooradian,montejo,montegut,montan,monsanto,monford,moncus,molinas,molek,mohd,moehrle,moehring,modzeleski,modafferi,moala,moake,miyahira,mitani,mischel,minges,minella,mimes,milles,milbrett,milanes,mikolajczyk,mikami,meucci,metler,methven,metge,messmore,messerschmidt,mesrobian,meservey,merseal,menor,menon,menear,melott,melley,melfi,meinhart,megivern,megeath,meester,meeler,meegan,medoff,medler,meckley,meath,mearns,mcquigg,mcpadden,mclure,mckellips,mckeithen,mcglathery,mcginnes,mcghan,mcdonel,mccullom,mccraken,mccrackin,mcconathy,mccloe,mcclaughry,mcclaflin,mccarren,mccaig,mcaulay,mcaffee,mazzuca,maytubby,mayner,maymi,mattiello,matthis,matthees,matthai,mathiason,mastrogiovann,masteller,mashack,marucci,martorana,martiniz,marter,martellaro,marsteller,marris,marrara,maroni,marolda,marocco,maritn,maresh,maready,marchione,marbut,maranan,maragno,mapps,manrriquez,mannis,manni,mangina,manganelli,mancera,mamon,maloch,mallozzi,maller,majchrzak,majano,mainella,mahanna,maertens,madon,macumber,macioce,machuga,machlin,machala,mabra,lybbert,luvert,lutts,luttrull,lupez,lukehart,ludewig,luchsinger,lovecchio,louissaint,loughney,lostroh,lorton,lopeman,loparo,londo,lombera,lokietek,loiko,lohrenz,lohan,lofties,locklar,lockaby,lobianco,llano,livesey,litster,liske,linsky,linne,lindbeck,licudine,leyua,levie,leonelli,lenzo,lenze,lents,leitao,leidecker,leibold,lehne,legan,lefave,leehy,ledue,lecount,lecea,leadley,lazzara,lazcano,lazalde,lavi,lavancha,lavan,latu,latty,lato,larranaga,lapidus,lapenta,langridge,langeveld,langel,landowski,landgren,landfried,lamattina,lallier,lairmore,lahaie,lagazo,lagan,lafoe,lafluer,laflame,lafevers,lada,lacoss,lachney,labreck,labreche,labay,kwasnik,kuzyk,kutzner,kushnir,kusek,kurtzman,kurian,kulhanek,kuklinski,kueny,kuczynski,kubitz,kruschke,krous,krompel,kritz,krimple,kriese,krenzer,kreis,kratzke,krane,krage,kraebel,kozub,kozma,kouri,koudelka,kotcher,kotas,kostic,kosh,kosar,kopko,kopka,kooy,konigsberg,konarski,kolmer,kohlmeyer,kobbe,knoop,knoedler,knocke,knipple,knippenberg,knickrehm,kneisel,kluss,klossner,klipfel,klawiter,klasen,kittles,kissack,kirtland,kirschenmann,kirckof,kiphart,kinstler,kinion,kilton,killman,kiehl,kief,kett,kesling,keske,kerstein,kepple,keneipp,kempson,kempel,kehm,kehler,keeran,keedy,kebert,keast,kearbey,kawaguchi,kaupu,kauble,katzenbach,katcher,kartes,karpowicz,karpf,karban,kanzler,kanarek,kamper,kaman,kalsow,kalafut,kaeser,kaercher,kaeo,kaeding,jurewicz,julson,jozwick,jollie,johnigan,johll,jochum,jewkes,jestes,jeska,jereb,jaurez,jarecki,jansma,janosik,jandris,jamin,jahr,jacot,ivens,itson,isenhower,iovino,ionescu,ingrum,ingels,imrie,imlay,ihlenfeld,ihde,igou,ibach,huyett,huppe,hultberg,hullihen,hugi,hueso,huesman,hsiao,hronek,hovde,housewright,houlahan,hougham,houchen,hostler,hoster,hosang,hornik,hornes,horio,honyumptewa,honeyman,honer,hommerding,holsworth,hollobaugh,hollinshead,hollands,hollan,holecek,holdorf,hokes,hogston,hoesly,hodkinson,hodgman,hodgens,hochstedler,hochhauser,hobbie,hoare,hnat,hiskey,hirschy,hinostroza,hink,hing,hillmer,hillian,hillerman,hietala,hierro,hickling,hickingbottom,heye,heubusch,hesselschward,herriot,hernon,hermida,hermans,hentschel,henningson,henneke,henk,heninger,heltsley,helmle,helminiak,helmes,hellner,hellmuth,helke,heitmeyer,heird,heinle,heinicke,heinandez,heimsoth,heibel,hegyi,heggan,hefel,heeralall,hedrington,heacox,hazlegrove,hazelett,haymore,havenhill,hautala,hascall,harvie,hartrick,hartling,harrer,harles,hargenrader,hanshew,hanly,hankla,hanisch,hancox,hammann,hambelton,halseth,hallisey,halleck,hallas,haisley,hairr,hainey,hainer,hailstock,haertel,guzek,guyett,guster,gussler,gurwitz,gurka,gunsolus,guinane,guiden,gugliotti,guevin,guevarra,guerard,gudaitis,guadeloupe,gschwind,grupe,grumbach,gruenes,gruenberg,grom,grodski,groden,grizzel,gritten,griswald,grishaber,grinage,grimwood,grims,griffon,griffies,gribben,gressley,gren,greenstreet,grealish,gravett,grantz,granfield,granade,gowell,gossom,gorsky,goring,goodnow,goodfriend,goodemote,golob,gollnick,golladay,goldwyn,goldsboro,golds,goldrick,gohring,gohn,goettsch,goertzen,goelz,godinho,goans,glumac,gleisner,gleen,glassner,glanzer,gladue,gjelaj,givhan,girty,girone,girgenti,giorgianni,gilpatric,gillihan,gillet,gilbar,gierut,gierhart,gibert,gianotti,giannetto,giambanco,gharing,geurts,gettis,gettel,gest,germani,gerdis,gerbitz,geppert,gennings,gemmer,gelvin,gellert,gehler,geddings,gearon,geach,gazaille,gayheart,gauld,gaukel,gaudio,gathing,gasque,garstka,garsee,garringer,garofano,garo,garnsey,garigen,garcias,garbe,ganoung,ganfield,ganaway,gamero,galuska,galster,gallacher,galinski,galimi,galik,galeazzi,galdo,galdames,galas,galanis,gaglio,gaeddert,gadapee,fussner,furukawa,fuhs,fuerte,fuerstenberg,fryrear,froese,fringer,frieson,friesenhahn,frieler,friede,freymuth,freyman,freudenberg,freman,fredricksen,frech,frasch,frantum,frankin,franca,frago,fragnoli,fouquet,fossen,foskett,forner,formosa,formisano,fooks,fons,folino,flott,flesch,flener,flemmons,flanagin,flamino,flamand,fitzerald,findling,filsinger,fillyaw,fillinger,fiechter,ferre,ferdon,feldkamp,fazzio,favia,faulconer,faughnan,faubel,fassler,faso,farrey,farrare,farnworth,farland,fairrow,faille,faherty,fagnant,fabula,fabbri,eylicio,esteve,estala,espericueta,escajeda,equia,enrriquez,enomoto,enmon,engemann,emmerson,emmel,emler,elstad,ellwein,ellerson,eliott,eliassen,elchert,eisenbeis,eisel,eikenberry,eichholz,ehmer,edgerson,echenique,eberley,eans,dziuk,dykhouse,dworak,dutt,dupas,duntz,dunshee,dunovant,dunnaway,dummermuth,duerson,ducotey,duchon,duchesneau,ducci,dubord,duberry,dubach,drummonds,droege,drish,drexel,dresch,dresbach,drenner,drechsler,dowen,dotter,dosreis,doser,dorward,dorin,dorf,domeier,doler,doleman,dolbow,dolbin,dobrunz,dobransky,dobberstein,dlouhy,diosdado,dingmann,dimmer,dimarino,dimaria,dillenburg,dilaura,dieken,dickhaus,dibbles,dibben,diamante,dewilde,dewaard,devich,devenney,devaux,dettinger,desroberts,dershem,dersch,derita,derickson,depina,deorio,deoliveira,denzler,dentremont,denoble,demshar,demond,demint,demichele,demel,delzer,delval,delorbe,delli,delbridge,delanoy,delancy,delahoya,dekle,deitrick,deis,dehnert,degrate,defrance,deetz,deeg,decoster,decena,dearment,daughety,datt,darrough,danzer,danielovich,dandurand,dancause,dalo,dalgleish,daisley,dadlani,daddona,daddio,dacpano,cyprian,cutillo,curz,curvin,cuna,cumber,cullom,cudworth,cubas,crysler,cryderman,crummey,crumbly,crookshanks,croes,criscione,crespi,cresci,creaser,craton,cowin,cowdrey,coutcher,cotterman,cosselman,cosgriff,cortner,corsini,corporan,corniel,cornick,cordts,copening,connick,conlisk,conelli,comito,colten,colletta,coldivar,colclasure,colantuono,colaizzi,coggeshall,cockman,cockfield,cobourn,cobo,cobarrubias,clyatt,cloney,clonch,climes,cleckner,clearo,claybourne,clavin,claridge,claffey,ciufo,cisnero,cipollone,cieslik,ciejka,cichocki,cicchetti,cianflone,chrusciel,christesen,chmielowiec,chirino,chillis,chhoun,chevas,chehab,chaviano,chavaria,chasten,charbonnet,chanley,champoux,champa,chalifoux,cerio,cedotal,cech,cavett,cavendish,catoire,castronovo,castellucci,castellow,castaner,casso,cassels,cassatt,cassar,cashon,cartright,carros,carrisalez,carrig,carrejo,carnicelli,carnett,carlise,carhart,cardova,cardell,carchi,caram,caquias,capper,capizzi,capano,cannedy,campese,calvello,callon,callins,callies,callicutt,calix,calin,califf,calderaro,caldeira,cadriel,cadmus,cadman,caccamise,buttermore,butay,bustamente,busa,burmester,burkard,burhans,burgert,bure,burdin,bullman,bulin,buelna,buehner,budin,buco,buckhanon,bryars,brutger,brus,brumitt,brum,bruer,brucato,broyhill,broy,brownrigg,brossart,brookings,broden,brocklehurst,brockert,bristo,briskey,bringle,bries,bressman,branyan,brands,bramson,brammell,brallier,bozich,boysel,bowthorpe,bowron,bowin,boutilier,boulos,boullion,boughter,bottiglieri,borruso,borreggine,borns,borkoski,borghese,borenstein,boran,booton,bonvillain,bonini,bonello,bolls,boitnott,boike,bohnet,bohnenkamp,bohmer,boeson,boeneke,bodey,bocchino,bobrowski,bobic,bluestein,bloomingdale,blogg,blewitt,blenman,bleck,blaszak,blankenbeckle,blando,blanchfield,blancato,blalack,blakenship,blackett,bisping,birkner,birckhead,bingle,bineau,billiel,bigness,bies,bierer,bhalla,beyerlein,betesh,besler,berzins,bertalan,berntsen,bergo,berganza,bennis,benney,benkert,benjamen,benincasa,bengochia,bendle,bendana,benchoff,benbrook,belsito,belshaw,belinsky,belak,beigert,beidleman,behen,befus,beel,bedonie,beckstrand,beckerle,beato,bauguess,baughan,bauerle,battis,batis,bastone,bassetti,bashor,bary,bartunek,bartoletti,barro,barno,barnicle,barlage,barkus,barkdull,barcellos,barbarino,baranski,baranick,bankert,banchero,bambrick,bamberg,bambenek,balthrop,balmaceda,ballman,balistrieri,balcomb,balboni,balbi,bagner,bagent,badasci,bacot,bache,babione,babic,babers,babbs,avitabile,avers,avena,avance,ausley,auker,audas,aubut,athearn,atcheson,astorino,asplund,aslanian,askari,ashmead,asby,asai,arterbury,artalejo,arqueta,arquero,arostegui,arnell,armeli,arista,arender,arca,arballo,aprea,applen,applegarth,apfel,antonello,antolin,antkowiak,angis,angione,angerman,angelilli,andujo,andrick,anderberg,amigon,amalfitano,alviso,alvez,altice,altes,almarez,allton,allston,allgeyer,allegretti,aliaga,algood,alberg,albarez,albaladejo,akre,aitkin,ahles,ahlberg,agnello,adinolfi,adamis,abramek,abolt,abitong,zurawski,zufall,zubke,zizzo,zipperer,zinner,zinda,ziller,zill,zevallos,zesati,zenzen,zentner,zellmann,zelinsky,zboral,zarcone,zapalac,zaldana,zakes,zaker,zahniser,zacherl,zabawa,zabaneh,youree,younis,yorty,yonce,yero,yerkey,yeck,yeargan,yauch,yashinski,yambo,wrinn,wrightsman,worton,wortley,worland,woolworth,woolfrey,woodhead,woltjer,wolfenden,wolden,wolchesky,wojick,woessner,witters,witchard,wissler,wisnieski,wisinski,winnike,winkowski,winkels,wingenter,wineman,winegardner,wilridge,wilmont,willians,williamsen,wilhide,wilhelmsen,wilhelmi,wildrick,wilden,wiland,wiker,wigglesworth,wiebusch,widdowson,wiant,wiacek,whittet,whitelock,whiteis,whiley,westrope,westpfahl,westin,wessman,wessinger,wesemann,wesby,wertheimer,weppler,wenke,wengler,wender,welp,weitzner,weissberg,weisenborn,weipert,weiman,weidmann,wehrsig,wehrenberg,weemes,weeman,wayner,waston,wasicek,wascom,wasco,warmath,warbritton,waltner,wallenstein,waldoch,waldal,wala,waide,wadlinger,wadhams,vullo,voorheis,vonbargen,volner,vollstedt,vollman,vold,voge,vittorio,violett,viney,vinciguerra,vinal,villata,villarrvel,vilanova,vigneault,vielma,veyna,vessella,versteegh,verderber,venier,venditti,velotta,vejarano,vecchia,vecchi,vastine,vasguez,varella,vanry,vannah,vanhyning,vanhuss,vanhoff,vanhoesen,vandivort,vandevender,vanderlip,vanderkooi,vandebrink,vancott,vallien,vallas,vallandingham,valiquette,valasek,vahey,vagott,uyematsu,urbani,uran,umbach,tyon,tyma,twyford,twombley,twohig,tutterrow,turnes,turkington,turchi,tunks,tumey,tumbaga,tuinstra,tsukamoto,tschetter,trussel,trubey,trovillion,troth,trostel,tron,trinka,trine,triarsi,treto,trautz,tragesser,tooman,toolson,tonozzi,tomkiewicz,tomasso,tolin,tolfree,toelle,tisor,tiry,tinstman,timmermann,tickner,tiburcio,thunberg,thronton,thompsom,theil,thayne,thaggard,teschner,tensley,tenery,tellman,tellado,telep,teigen,teator,teall,tayag,tavis,tattersall,tassoni,tarshis,tappin,tappe,tansley,talone,talford,tainter,taha,taguchi,tacheny,tabak,szymczyk,szwaja,szopinski,syvertsen,swogger,switcher,swist,swierczek,swiech,swickard,swiatek,swezey,swepson,sweezy,swaringen,swanagan,swailes,swade,sveum,svenningsen,svec,suttie,supry,sunga,summerhill,summars,sulit,stys,stutesman,stupak,stumpo,stuller,stuekerjuerge,stuckett,stuckel,stuchlik,stuard,strutton,strop,stromski,stroebel,strehlow,strause,strano,straney,stoyle,stormo,stopyra,stoots,stonis,stoltenburg,stoiber,stoessel,stitzer,stien,stichter,stezzi,stewert,stepler,steinkraus,stegemann,steeples,steenburg,steeley,staszak,stasko,starkson,stanwick,stanke,stanifer,stangel,stai,squiers,spraglin,spragins,spraberry,spoelstra,spisak,spirko,spille,spidel,speyer,speroni,spenst,spartz,sparlin,sparacio,spaman,spainhower,souers,souchet,sosbee,sorn,sorice,sorbo,soqui,solon,soehl,sodergren,sobie,smucker,smsith,smoley,smolensky,smolenski,smolder,smethers,slusar,slowey,slonski,slemmons,slatkin,slates,slaney,slagter,slacum,skutnik,skrzypek,skibbe,sjostrom,sjoquist,sivret,sitko,sisca,sinnett,sineath,simoni,simar,simao,silvestro,silleman,silha,silfies,silberhorn,silacci,sigrist,sieczkowski,sieczka,shure,shulz,shugrue,shrode,shovlin,shortell,shonka,shiyou,shiraishi,shiplett,sheu,shermer,sherick,sheeks,shantz,shakir,shaheed,shadoan,shadid,shackford,shabot,seung,seufert,setty,setters,servis,serres,serrell,serpas,sensenig,senft,semenec,semas,semaan,selvera,sellmeyer,segar,seever,seeney,seeliger,seehafer,seebach,sebben,seaward,seary,searl,searby,scordino,scolieri,scolaro,schwiebert,schwartze,schwaner,schuur,schupbach,schumacker,schum,schudel,schubbe,schroader,schramel,schollmeyer,schoenherr,schoeffler,schoeder,schnurr,schnorr,schneeman,schnake,schnaible,schmaus,schlotter,schinke,schimming,schimek,schikora,scheulen,scherping,schermer,scherb,schember,schellhase,schedler,schanck,schaffhauser,schaffert,schadler,scarola,scarfo,scarff,scantling,scaff,sayward,sayas,saxbury,savel,savastano,sault,satre,sarkar,santellan,sandmeier,sampica,salvesen,saltis,salloum,salling,salce,salatino,salata,salamy,sadowsky,sadlier,sabbatini,sabatelli,sabal,sabados,rydzewski,rybka,rybczyk,rusconi,rupright,rufino,ruffalo,rudiger,rudig,ruda,rubyor,royea,roxberry,rouzer,roumeliotis,rossmann,rosko,rosene,rosenbluth,roseland,rosasco,rosano,rosal,rorabaugh,romie,romaro,rolstad,rollow,rohrich,roghair,rogala,roets,roen,roemmich,roelfs,roeker,roedl,roedel,rodeheaver,roddenberry,rockstad,rocchi,robirds,robben,robasciotti,robaina,rizzotto,rizzio,ritcher,rissman,riseden,ripa,rion,rintharamy,rinehimer,rinck,riling,rietschlin,riesenberg,riemenschneid,rieland,rickenbaugh,rickenbach,rhody,revells,reutter,respress,resnik,remmel,reitmeyer,reitan,reister,reinstein,reino,reinkemeyer,reifschneider,reierson,reichle,rehmeier,rehl,reeds,rede,recar,rebeiro,raybourn,rawl,rautio,raugust,raudenbush,raudales,rattan,rapuano,rapoport,rantanen,ransbottom,raner,ramkissoon,rambousek,raio,rainford,radakovich,rabenhorst,quivers,quispe,quinoes,quilici,quattrone,quates,quance,quale,purswell,purpora,pulera,pulcher,puckhaber,pryer,pruyne,pruit,prudencio,prows,protzman,prothero,prosperi,prospal,privott,pritchet,priem,prest,prell,preer,pree,preddy,preda,pravata,pradhan,potocki,postier,postema,posadas,poremba,popichak,ponti,pomrenke,pomarico,pollok,polkinghorn,polino,pock,plater,plagman,pipher,pinzone,pinkleton,pillette,pillers,pilapil,pignone,pignatelli,piersol,piepho,picton,pickrel,pichard,picchi,piatek,pharo,phanthanouvon,pettingill,pettinato,petrovits,pethtel,petersheim,pershing,perrez,perra,pergram,peretz,perego,perches,pennello,pennella,pendry,penaz,pellish,pecanty,peare,paysour,pavlovich,pavick,pavelko,paustian,patzer,patete,patadia,paszkiewicz,pase,pasculli,pascascio,parrotte,parajon,paparo,papandrea,paone,pantaleon,panning,paniccia,panarello,palmeter,pallan,palardy,pahmeier,padget,padel,oxborrow,oveson,outwater,ottaway,otake,ostermeyer,osmer,osinski,osiecki,oroak,orndoff,orms,orkin,ordiway,opatz,onsurez,onishi,oliger,okubo,okoye,ohlmann,offord,offner,offerdahl,oesterle,oesch,odonnel,odeh,odebralski,obie,obermeier,oberhausen,obenshain,obenchain,nute,nulty,norrington,norlin,nore,nordling,nordhoff,norder,nordan,norals,nogales,noboa,nitsche,niermann,nienhaus,niedringhaus,niedbalski,nicolella,nicolais,nickleberry,nicewander,newfield,neurohr,neumeier,netterville,nersesian,nern,nerio,nerby,nerbonne,neitz,neidecker,neason,nead,navratil,naves,nastase,nasir,nasca,narine,narimatsu,nard,narayanan,nappo,namm,nalbone,nakonechny,nabarro,myott,muthler,muscatello,murriel,murin,muoio,mundel,munafo,mukherjee,muffoletto,muessig,muckey,mucher,mruk,moyd,mowell,mowatt,moutray,motzer,moster,morgenroth,morga,morataya,montross,montezuma,monterroza,montemarano,montello,montbriand,montavon,montaque,monigold,monforte,molgard,moleski,mohsin,mohead,mofield,moerbe,moeder,mochizuki,miyazaki,miyasaki,mital,miskin,mischler,minniear,minero,milosevic,mildenhall,mielsch,midden,michonski,michniak,michitsch,michelotti,micheli,michelfelder,michand,metelus,merkt,merando,meranda,mentz,meneley,menaker,melino,mehaffy,meehl,meech,meczywor,mcweeney,mcumber,mcredmond,mcneer,mcnay,mcmikle,mcmaken,mclaurine,mclauglin,mclaney,mckune,mckinnies,mckague,mchattie,mcgrapth,mcglothen,mcgath,mcfolley,mcdannell,mccurty,mccort,mcclymonds,mcclimon,mcclamy,mccaughan,mccartan,mccan,mccadden,mcburnie,mcburnett,mcbryar,mcannally,mcalevy,mcaleese,maytorena,mayrant,mayland,mayeaux,mauter,matthewson,mathiew,matern,matera,maslow,mashore,masaki,maruco,martorell,martenez,marrujo,marrison,maroun,markway,markos,markoff,markman,marello,marbry,marban,maphis,manuele,mansel,manganello,mandrell,mandoza,manard,manago,maltba,mallick,mallak,maline,malikowski,majure,majcher,maise,mahl,maffit,maffeo,madueno,madlem,madariaga,macvane,mackler,macconnell,macchi,maccarone,lyng,lynchard,lunning,luneau,lunden,lumbra,lumbert,lueth,ludington,luckado,lucchini,lucatero,luallen,lozeau,lowen,lovera,lovelock,louck,lothian,lorio,lorimer,lorge,loretto,longhenry,lonas,loiseau,lohrman,logel,lockie,llerena,livington,liuzzi,liscomb,lippeatt,liou,linhardt,lindelof,lindbo,limehouse,limage,lillo,lilburn,liggons,lidster,liddick,lich,liberato,leysath,lewelling,lesney,leser,lescano,leonette,lentsch,lenius,lemmo,lemming,lemcke,leggette,legerski,legard,leever,leete,ledin,lecomte,lecocq,leakes,leab,lazarz,layous,lawrey,lawery,lauze,lautz,laughinghouse,latulippe,lattus,lattanzio,lascano,larmer,laris,larcher,laprise,lapin,lapage,lano,langseth,langman,langland,landstrom,landsberg,landsaw,landram,lamphier,lamendola,lamberty,lakhani,lajara,lagrow,lagman,ladewig,laderman,ladden,lacrue,laclaire,lachut,lachner,kwit,kvamme,kvam,kutscher,kushi,kurgan,kunsch,kundert,kulju,kukene,kudo,kubin,kubes,kuberski,krystofiak,kruppa,krul,krukowski,kruegel,kronemeyer,krock,kriston,kretzer,krenn,kralik,krafft,krabill,kozisek,koverman,kovatch,kovarik,kotlowski,kosmala,kosky,kosir,kosa,korpi,kornbluth,koppen,kooistra,kohlhepp,kofahl,koeneman,koebel,koczur,kobrin,kobashigawa,koba,knuteson,knoff,knoble,knipper,knierim,kneisley,klusman,kloc,klitzing,klinko,klinefelter,klemetson,kleinpeter,klauser,klatte,klaren,klare,kissam,kirkhart,kirchmeier,kinzinger,kindt,kincy,kincey,kimoto,killingworth,kilcullen,kilbury,kietzman,kienle,kiedrowski,kidane,khamo,khalili,ketterling,ketchem,kessenich,kessell,kepp,kenon,kenning,kennady,kendzior,kemppainen,kellermann,keirns,keilen,keiffer,kehew,keelan,keawe,keator,kealy,keady,kathman,kastler,kastanes,kassab,karpin,karau,karathanasis,kaps,kaplun,kapaun,kannenberg,kanipe,kander,kandel,kanas,kanan,kamke,kaltenbach,kallenberger,kallam,kafton,kafer,kabler,kaaihue,jundt,jovanovich,jojola,johnstad,jodon,joachin,jinright,jessick,jeronimo,jenne,jelsma,jeannotte,jeangilles,jaworsky,jaubert,jarry,jarrette,jarreau,jarett,janos,janecka,janczak,jalomo,jagoda,jagla,jacquier,jaber,iwata,ivanoff,isola,iserman,isais,isaacks,inverso,infinger,ibsen,hyser,hylan,hybarger,hwee,hutchenson,hutchcroft,husar,hurlebaus,hunsley,humberson,hulst,hulon,huhtala,hugill,hugghins,huffmaster,huckeba,hrabovsky,howden,hoverson,houts,houskeeper,housh,hosten,horras,horchler,hopke,hooke,honie,holtsoi,holsomback,holoway,holmstead,hoistion,hohnstein,hoheisel,hoguet,hoggle,hogenson,hoffstetter,hoffler,hofe,hoefling,hoague,hizer,hirschfield,hironaka,hiraldo,hinote,hingston,hinaman,hillie,hillesheim,hilderman,hiestand,heyser,heys,hews,hertler,herrandez,heppe,henle,henkensiefken,henigan,henandez,henagan,hemberger,heman,helser,helmich,hellinger,helfrick,heldenbrand,heinonen,heineck,heikes,heidkamp,heglar,heffren,heelan,hedgebeth,heckmann,heckaman,hechmer,hazelhurst,hawken,haverkamp,havatone,hausauer,hasch,harwick,hartse,harrower,harle,hargroder,hardway,hardinger,hardemon,harbeck,hant,hamre,hamberg,hallback,haisten,hailstone,hahl,hagner,hagman,hagemeyer,haeussler,hackwell,haby,haataja,gverrero,gustovich,gustave,guske,gushee,gurski,gurnett,gura,gunto,gunselman,gugler,gudmundson,gudinas,guarneri,grumbine,gruis,grotz,grosskopf,grosman,grosbier,grinter,grilley,grieger,grewal,gressler,greaser,graus,grasman,graser,grannan,granath,gramer,graboski,goyne,gowler,gottwald,gottesman,goshay,gorr,gorovitz,gores,goossens,goodier,goodhue,gonzeles,gonzalos,gonnella,golomb,golick,golembiewski,goeke,godzik,goar,glosser,glendenning,glendening,glatter,glas,gittings,gitter,gisin,giscombe,gimlin,gillitzer,gillick,gilliand,gilb,gigler,gidden,gibeau,gibble,gianunzio,giannattasio,gertelman,gerosa,gerold,gerland,gerig,gerecke,gerbino,genz,genovesi,genet,gelrud,geitgey,geiszler,gehrlein,gawrys,gavilanes,gaulden,garthwaite,garmoe,gargis,gara,gannett,galligher,galler,galleher,gallahan,galford,gahn,gacek,gabert,fuster,furuya,furse,fujihara,fuhriman,frueh,fromme,froemming,friskney,frietas,freiler,freelove,freber,frear,frankl,frankenfield,franey,francke,foxworthy,formella,foringer,forgue,fonnesbeck,fonceca,folland,fodera,fode,floresca,fleurent,fleshner,flentge,fleischhacker,fleeger,flecher,flam,flaim,fivecoat,firebaugh,fioretti,finucane,filley,figuroa,figuerda,fiddelke,feurtado,fetterly,fessel,femia,feild,fehling,fegett,fedde,fechter,fawver,faulhaber,fatchett,fassnacht,fashaw,fasel,farrugia,farran,farness,farhart,fama,falwell,falvo,falkenstein,falin,failor,faigin,fagundo,fague,fagnan,fagerstrom,faden,eytchison,eyles,everage,evangelist,estrin,estorga,esponda,espindola,escher,esche,escarsega,escandon,erven,erding,eplin,enix,englade,engdahl,enck,emmette,embery,emberson,eltzroth,elsayed,ellerby,ellens,elhard,elfers,elazegui,eisermann,eilertson,eiben,ehrhard,ehresman,egolf,egnew,eggins,efron,effland,edminster,edgeston,eckstrom,eckhard,eckford,echoles,ebsen,eatherly,eastlick,earnheart,dykhuizen,dyas,duttweiler,dutka,dusenbury,dusenbery,durre,durnil,durnell,durie,durhan,durando,dupriest,dunsmoor,dunseith,dunnum,dunman,dunlevy,duma,dulude,dulong,duignan,dugar,dufek,ducos,duchaine,duch,dubow,drowne,dross,drollinger,droke,driggars,drawhorn,drach,drabek,doyne,doukas,dorvil,dorow,doroski,dornak,dormer,donnelson,donivan,dondero,dompe,dolle,doakes,diza,divirgilio,ditore,distel,disimone,disbro,dipiero,dingson,diluzio,dillehay,digiorgio,diflorio,dietzler,dietsch,dieterle,dierolf,dierker,dicostanzo,dicesare,dexheimer,dewitte,dewing,devoti,devincentis,devary,deutschman,dettloff,detienne,destasio,dest,despard,desmet,deslatte,desfosses,derise,derenzo,deppner,depolo,denoyer,denoon,denno,denne,deniston,denike,denes,demoya,demick,demicco,demetriou,demange,delva,delorge,delley,delisio,delhoyo,delgrande,delgatto,delcour,delair,deinert,degruy,degrave,degeyter,defino,deffenbaugh,deener,decook,decant,deboe,deblanc,deatley,dearmitt,deale,deaguiar,dayan,daus,dauberman,datz,dase,dary,dartt,darocha,dari,danowski,dancel,dami,dallmann,dalere,dalba,dakan,daise,dailing,dahan,dagnan,daggs,dagan,czarkowski,czaplinski,cutten,curtice,curenton,curboy,cura,culliton,culberth,cucchiara,cubbison,csaszar,crytser,crotzer,crossgrove,crosser,croshaw,crocco,critzer,creveling,cressy,creps,creese,cratic,craigo,craigen,craib,cracchiolo,crable,coykendall,cowick,coville,couzens,coutch,cousens,cousain,counselman,coult,cotterell,cott,cotham,corsaut,corriere,corredor,cornet,corkum,coreas,cordoza,corbet,corathers,conwill,contreas,consuegra,constanza,conolly,conedy,comins,combee,colosi,colom,colmenares,collymore,colleran,colina,colaw,colatruglio,colantro,colantonio,cohea,cogill,codner,codding,cockram,cocanougher,cobine,cluckey,clucas,cloward,cloke,clisham,clinebell,cliffe,clendenen,cisowski,cirelli,ciraolo,ciocca,cintora,ciesco,cibrian,chupka,chugg,christmann,choma,chiverton,chirinos,chinen,chimenti,chima,cheuvront,chesla,chesher,chesebro,chern,chehebar,cheatum,chastine,chapnick,chapelle,chambley,cercy,celius,celano,cayea,cavicchi,cattell,catanach,catacutan,castelluccio,castellani,cassmeyer,cassetta,cassada,caspi,cashmore,casebier,casanas,carrothers,carrizal,carriveau,carretero,carradine,carosella,carnine,carloni,carkhuff,cardosi,cardo,carchidi,caravello,caranza,carandang,cantrall,canpos,canoy,cannizzaro,canion,canida,canham,cangemi,cange,cancelliere,canard,camarda,calverley,calogero,callendar,calame,cadrette,cachero,caccavale,cabreros,cabrero,cabrara,cabler,butzer,butte,butrick,butala,bustios,busser,busic,bushorn,busher,burmaster,burkland,burkins,burkert,burgueno,burgraff,burel,burck,burby,bumford,bulock,bujnowski,buggie,budine,bucciero,bubier,brzoska,brydges,brumlow,brosseau,brooksher,brokke,broeker,brittin,bristle,briano,briand,brettschneide,bresnan,brentson,brenneis,brender,brazle,brassil,brasington,branstrom,branon,branker,brandwein,brandau,bralley,brailey,brague,brade,bozzi,bownds,bowmer,bournes,bour,bouchey,botto,boteler,borroel,borra,boroski,boothroyd,boord,bonga,bonato,bonadonna,bolejack,boldman,boiser,boggio,bogacki,boerboom,boehnlein,boehle,bodah,bobst,boak,bluemel,blockmon,blitch,blincoe,bleier,blaydes,blasius,bittel,binsfeld,bindel,bilotti,billiott,bilbrew,bihm,biersner,bielat,bidrowski,bickler,biasi,bhola,bhat,bewick,betzen,bettridge,betti,betsch,besley,beshero,besa,bertoli,berstein,berrien,berrie,berrell,bermel,berenguer,benzer,bensing,benedix,bemo,belile,beilman,behunin,behrmann,bedient,becht,beaule,beaudreault,bealle,beagley,bayuk,bayot,bayliff,baugess,battistoni,batrum,basinski,basgall,bartolomei,bartnik,bartl,bartko,bartholomay,barthlow,bartgis,barsness,barski,barlette,barickman,bargen,bardon,barcliff,barbu,barakat,baracani,baraban,banos,banko,bambach,balok,balogun,bally,baldini,balck,balcer,balash,baim,bailor,bahm,bahar,bagshaw,baggerly,badie,badal,backues,babino,aydelott,awbrey,aversano,avansino,auyon,aukamp,aujla,augenstein,astacio,asplin,asato,asano,aruizu,artale,arrick,arneecher,armelin,armbrester,armacost,arkell,argrave,areizaga,apolo,anzures,anzualda,antwi,antillon,antenor,annand,anhalt,angove,anglemyer,anglada,angiano,angeloni,andaya,ancrum,anagnos,ammirati,amescua,ambrosius,amacker,amacher,amabile,alvizo,alvernaz,alvara,altobelli,altobell,althauser,alterman,altavilla,alsip,almeyda,almeter,alman,allscheid,allaman,aliotta,aliberti,alghamdi,albiston,alberding,alarie,alano,ailes,ahsan,ahrenstorff,ahler,aerni,ackland,achor,acero,acebo,abshier,abruzzo,abrom,abood,abnet,abend,abegg,abbruzzese,aaberg,zysk,zutell,zumstein,zummo,zuhlke,zuehlsdorff,zuch,zucconi,zortman,zohn,zingone,zingg,zingale,zima,zientek,zieg,zervas,zerger,zenk,zeldin,zeiss,zeiders,zediker,zavodny,zarazua,zappone,zappala,zapanta,zaniboni,zanchi,zampedri,zaller,zakrajsek,zagar,zadrozny,zablocki,zable,yust,yunk,youngkin,yosten,yockers,yochim,yerke,yerena,yanos,wysinger,wyner,wrisley,woznicki,wortz,worsell,wooters,woon,woolcock,woodke,wonnacott,wolnik,wittstock,witting,witry,witfield,witcraft,wissmann,wissink,wisehart,wiscount,wironen,wipf,winterrowd,wingett,windon,windish,windisch,windes,wiltbank,willmarth,wiler,wieseler,wiedmaier,wiederstein,wiedenheft,wieberg,wickware,wickkiser,wickell,whittmore,whitker,whitegoat,whitcraft,whisonant,whisby,whetsell,whedon,westry,westcoat,wernimont,wentling,wendlandt,wencl,weisgarber,weininger,weikle,weigold,weigl,weichbrodt,wehrli,wehe,weege,weare,watland,wassmann,warzecha,warrix,warrell,warnack,waples,wantland,wanger,wandrei,wanat,wampole,waltjen,walterscheid,waligora,walding,waldie,walczyk,wakins,waitman,wair,wainio,wahpekeche,wahlman,wagley,wagenknecht,wadle,waddoups,wadding,vuono,vuillemot,vugteveen,vosmus,vorkink,vories,vondra,voelz,vlashi,vitelli,vitali,viscarra,vinet,vimont,villega,villard,vignola,viereck,videtto,vicoy,vessell,vescovi,verros,vernier,vernaglia,vergin,verdone,verdier,verastequi,vejar,vasile,vasi,varnadore,vardaro,vanzanten,vansumeren,vanschuyver,vanleeuwen,vanhowe,vanhoozer,vaness,vandewalker,vandevoorde,vandeveer,vanderzwaag,vanderweide,vanderhyde,vandellen,vanamburg,vanalst,vallin,valk,valentini,valcarcel,valasco,valadao,vacher,urquijo,unterreiner,unsicker,unser,unrau,undercoffler,uffelman,uemura,ueda,tyszko,tyska,tymon,tyce,tyacke,twinam,tutas,tussing,turmel,turkowski,turkel,turchetta,tupick,tukes,tufte,tufo,tuey,tuell,tuckerman,tsutsumi,tsuchiya,trossbach,trivitt,trippi,trippensee,trimbach,trillo,triller,trible,tribby,trevisan,tresch,tramonte,traff,trad,tousey,totaro,torregrosa,torralba,tolly,tofil,tofani,tobiassen,tiogangco,tino,tinnes,tingstrom,tingen,tindol,tifft,tiffee,tiet,thuesen,thruston,throndson,thornsbury,thornes,thiery,thielman,thie,theilen,thede,thate,thane,thalacker,thaden,teuscher,terracina,terell,terada,tepfer,tenneson,temores,temkin,telleria,teaque,tealer,teachey,tavakoli,tauras,taucher,tartaglino,tarpy,tannery,tani,tams,tamlin,tambe,tallis,talamante,takayama,takaki,taibl,taffe,tadesse,tade,tabeling,tabag,szoke,szoc,szala,szady,sysak,sylver,syler,swonger,swiggett,swensson,sweis,sweers,sweene,sweany,sweaney,swartwout,swamy,swales,susman,surman,sundblad,summerset,summerhays,sumerall,sule,sugimoto,subramanian,sturch,stupp,stunkard,stumpp,struiksma,stropes,stromyer,stromquist,strede,strazza,strauf,storniolo,storjohann,stonum,stonier,stonecypher,stoneberger,stollar,stokke,stokan,stoetzel,stoeckel,stockner,stockinger,stockert,stockdill,stobbe,stitzel,stitely,stirgus,stigers,stettner,stettler,sterlin,sterbenz,stemp,stelluti,steinmeyer,steininger,steinauer,steigerwalt,steider,stavrou,staufenberger,stassi,stankus,stanaway,stammer,stakem,staino,stahlnecker,stagnitta,staelens,staal,srsen,sprott,sprigg,sprenkle,sprenkel,spreitzer,spraque,sprandel,sporn,spivak,spira,spiewak,spieth,spiering,sperow,speh,specking,spease,spead,sparger,spanier,spall,sower,southcott,sosna,soran,sookram,sonders,solak,sohr,sohl,sofranko,soderling,sochor,sobon,smutz,smudrick,smithj,smid,slosser,sliker,slenker,sleger,slaby,skousen,skilling,skibinski,skees,skane,skafidas,sivic,sivertsen,sivers,sitra,sito,siracusa,sinicki,simpers,simley,simbeck,silberberg,siever,siegwarth,sidman,siddle,sibbett,shumard,shubrooks,shough,shorb,shoptaw,sholty,shoffstall,shiverdecker,shininger,shimasaki,shifrin,shiffler,sheston,sherr,shere,shepeard,shelquist,sheler,shauf,sharrar,sharpnack,shamsiddeen,shambley,shallenberger,shadler,shaban,sferra,seys,sexauer,sevey,severo,setlak,seta,sesko,sersen,serratore,serdula,senechal,seldomridge,seilhamer,seifer,seidlitz,sehnert,sedam,sebron,seber,sebek,seavers,scullark,scroger,scovill,sciascia,sciarra,schweers,schwarze,schummer,schultes,schuchardt,schuchard,schrieber,schrenk,schreifels,schowalter,schoultz,scholer,schofill,schoff,schnuerer,schnettler,schmitke,schmiege,schloop,schlinger,schlessman,schlesser,schlageter,schiess,schiefer,schiavoni,scherzer,scherich,schechtman,schebel,scharpman,schaich,schaap,scappaticci,scadlock,savocchia,savini,savers,savageau,sauvage,sause,sauerwein,sary,sarwary,sarnicola,santone,santoli,santalucia,santacruce,sansoucie,sankoff,sanes,sandri,sanderman,sammartano,salmonson,salmela,salmans,sallaz,salis,sakuma,sakowski,sajdak,sahm,sagredo,safrit,sackey,sabio,sabino,rybolt,ruzzo,ruthstrom,ruta,russin,russak,rusko,ruskin,rusiecki,ruscher,rupar,rumberger,rullan,ruliffson,ruhlman,rufenacht,ruelle,rudisell,rudi,rucci,rublee,ruberto,rubeck,rowett,rottinghaus,roton,rothgeb,rothgaber,rothermich,rostek,rossini,roskelley,rosing,rosi,rosewell,rosberg,roon,ronin,romesburg,romelus,rolley,rollerson,rollefson,rolins,rolens,rois,rohrig,rohrbacher,rohland,rohen,rogness,roes,roering,roehrick,roebke,rodregez,rodabaugh,rockingham,roblee,robel,roadcap,rizzolo,riviezzo,rivest,riveron,risto,rissler,rippentrop,ripka,rinn,ringuette,ringering,rindone,rindels,rieffer,riedman,riede,riecke,riebow,riddlebarger,rhome,rhodd,rhatigan,rhame,reyers,rewitzer,revalee,retzer,rettinger,reschke,requa,reper,reopell,renzelman,renne,renker,renk,renicker,rendina,rendel,remund,remmele,remiasz,remaklus,remak,reitsma,reitmeier,reiswig,reishus,reining,reim,reidinger,reick,reiche,regans,reffett,reesor,reekie,redpath,redditt,rechtzigel,recht,rearden,raynoso,raxter,ratkowski,rasulo,rassmussen,rassel,raser,rappleye,rappe,randrup,randleman,ramson,rampey,radziewicz,quirarte,quintyne,quickel,quattrini,quakenbush,quaile,pytel,pushaw,pusch,purslow,punzo,pullam,pugmire,puello,przekop,pruss,pruiett,provow,prophete,procaccini,pritz,prillaman,priess,pretlow,prestia,presha,prescod,preast,praytor,prashad,praino,pozzi,pottenger,potash,porada,popplewell,ponzo,ponter,pommier,polland,polidori,polasky,pola,poisso,poire,pofahl,podolsky,podell,plueger,plowe,plotz,plotnik,ploch,pliska,plessner,plaut,platzer,plake,pizzino,pirog,piquette,pipho,pioche,pintos,pinkert,pinet,pilkerton,pilch,pilarz,pignataro,piermatteo,picozzi,pickler,pickette,pichler,philogene,phare,phang,pfrogner,pfisterer,pettinelli,petruzzi,petrovic,petretti,petermeier,pestone,pesterfield,pessin,pesch,persky,perruzza,perrott,perritt,perretti,perrera,peroutka,peroni,peron,peret,perdew,perazzo,peppe,peno,penberthy,penagos,peles,pelech,peiper,peight,pefferman,peddie,peckenpaugh,pean,payen,pavloski,pavlica,paullin,patteson,passon,passey,passalacqua,pasquini,paskel,partch,parriott,parrella,parraz,parmely,parizo,papelian,papasergi,pantojz,panto,panich,panchal,palys,pallone,palinski,pali,palevic,pagels,paciorek,pacho,pacella,paar,ozbun,overweg,overholser,ovalles,outcalt,otterbein,otta,ostergren,osher,osbon,orzech,orwick,orrico,oropesa,ormes,orillion,onorati,onnen,omary,olding,okonski,okimoto,ohlrich,ohayon,oguin,ogley,oftedahl,offen,ofallon,oeltjen,odam,ockmond,ockimey,obermeyer,oberdorf,obanner,oballe,oard,oakden,nyhan,nydam,numan,noyer,notte,nothstein,notestine,noser,nork,nolde,nishihara,nishi,nikolic,nihart,nietupski,niesen,niehus,nidiffer,nicoulin,nicolaysen,nicklow,nickl,nickeson,nichter,nicholl,ngyun,newsham,newmann,neveux,neuzil,neumayer,netland,nessen,nesheim,nelli,nelke,necochea,nazari,navorro,navarez,navan,natter,natt,nater,nasta,narvaiz,nardelli,napp,nakahara,nairn,nagg,nager,nagano,nafziger,naffziger,nadelson,muzzillo,murri,murrey,murgia,murcia,muno,munier,mulqueen,mulliniks,mulkins,mulik,muhs,muffley,moynahan,mounger,mottley,motil,moseman,moseby,mosakowski,mortell,morrisroe,morrero,mormino,morland,morger,morgenthaler,moren,morelle,morawski,morasca,morang,morand,moog,montney,montera,montee,montane,montagne,mons,monohan,monnett,monkhouse,moncure,momphard,molyneaux,molles,mollenkopf,molette,mohs,mohmand,mohlke,moessner,moers,mockus,moccio,mlinar,mizzelle,mittler,mitri,mitchusson,mitchen,mistrot,mistler,misch,miriello,minkin,mininger,minerich,minehart,minderman,minden,minahan,milonas,millon,millholland,milleson,millerbernd,millage,militante,milionis,milhoan,mildenberger,milbury,mikolajczak,miklos,mikkola,migneault,mifsud,mietus,mieszala,mielnicki,midy,michon,michioka,micheau,michaeli,micali,methe,metallo,messler,mesch,merow,meroney,mergenthaler,meres,menuey,menousek,menning,menn,menghini,mendia,memmer,melot,mellenthin,melland,meland,meixner,meisenheimer,meineke,meinders,mehrens,mehlig,meglio,medsker,medero,mederios,meabon,mcwright,mcright,mcreath,mcrary,mcquirter,mcquerry,mcquary,mcphie,mcnurlen,mcnelley,mcnee,mcnairy,mcmanamy,mcmahen,mckowen,mckiver,mckinlay,mckearin,mcirvin,mcintrye,mchorse,mchaffie,mcgroarty,mcgoff,mcgivern,mceniry,mcelhiney,mcdiarmid,mccullars,mccubbins,mccrimon,mccovery,mccommons,mcclour,mccarrick,mccarey,mccallen,mcbrien,mcarthy,mayone,maybin,maxam,maurais,maughn,matzek,matts,matin,mathre,mathia,mateen,matava,masso,massar,massanet,masingale,mascaro,marthaler,martes,marso,marshman,marsalis,marrano,marolt,marold,markins,margulis,mardirosian,marchiano,marchak,marandola,marana,manues,mante,mansukhani,mansi,mannan,maniccia,mangine,manery,mandigo,mancell,mamo,malstrom,malouf,malenfant,maldenado,malandruccolo,malak,malabanan,makino,maisonave,mainord,maino,mainard,maillard,mahmud,mahdi,mahapatra,mahaley,mahaffy,magouirk,maglaras,magat,maga,maffia,madrazo,madrano,maditz,mackert,mackellar,mackell,macht,macchia,maccarthy,maahs,lytal,luzar,luzader,lutjen,lunger,lunan,luma,lukins,luhmann,luers,ludvigsen,ludlam,ludemann,luchini,lucente,lubrano,lubow,luber,lubeck,lowing,loven,loup,louge,losco,lorts,lormand,lorenzetti,longford,longden,longbrake,lokhmatov,loge,loeven,loeser,locey,locatelli,litka,lista,lisonbee,lisenbee,liscano,liranzo,liquori,liptrot,lionetti,linscomb,linkovich,linington,lingefelt,lindler,lindig,lindall,lincks,linander,linan,limburg,limbrick,limbach,likos,lighthall,liford,lietzke,liebe,liddicoat,lickley,lichter,liapis,lezo,lewan,levitz,levesgue,leverson,levander,leuthauser,letbetter,lesuer,lesmeister,lesly,lerer,leppanen,lepinski,lenherr,lembrick,lelonek,leisten,leiss,leins,leingang,leinberger,leinbach,leikam,leidig,lehtonen,lehnert,lehew,legier,lefchik,lecy,leconte,lecher,lebrecht,leaper,lawter,lawrenz,lavy,laur,lauderbaugh,lauden,laudato,latting,latsko,latini,lassere,lasseigne,laspina,laso,laslie,laskowitz,laske,lasenby,lascola,lariosa,larcade,lapete,laperouse,lanuza,lanting,lantagne,lansdale,lanphier,langmaid,langella,lanese,landrus,lampros,lamens,laizure,laitinen,laigle,lahm,lagueux,lagorio,lagomarsino,lagasca,lagana,lafont,laflen,lafavor,lafarge,laducer,ladnier,ladesma,lacognata,lackland,lacerte,labuff,laborin,labine,labauve,kuzio,kusterer,kussman,kusel,kusch,kurutz,kurdyla,kupka,kunzler,kunsman,kuni,kuney,kunc,kulish,kuliga,kulaga,kuilan,kuhre,kuhnke,kuemmerle,kueker,kudla,kudelka,kubinski,kubicki,kubal,krzyzanowski,krupicka,krumwiede,krumme,kropidlowski,krokos,kroell,kritzer,kribs,kreitlow,kreisher,kraynak,krass,kranzler,kramb,kozyra,kozicki,kovalik,kovalchik,kovacevic,kotula,kotrba,koteles,kosowski,koskela,kosiba,koscinski,kosch,korab,kopple,kopper,koppelman,koppel,konwinski,kolosky,koloski,kolinsky,kolinski,kolbeck,kolasa,koepf,koda,kochevar,kochert,kobs,knust,knueppel,knoy,knieriem,knier,kneller,knappert,klitz,klintworth,klinkenberg,klinck,kleindienst,kleeb,klecker,kjellberg,kitsmiller,kisor,kisiel,kise,kirbo,kinzle,kingsford,kingry,kimpton,kimel,killmon,killick,kilgallon,kilcher,kihn,kiggins,kiecker,kher,khaleel,keziah,kettell,ketchen,keshishian,kersting,kersch,kerins,kercher,kenefick,kemph,kempa,kelsheimer,kelln,kellenberger,kekahuna,keisling,keirnan,keimig,kehn,keal,kaupp,kaufhold,kauffmann,katzenberg,katona,kaszynski,kaszuba,kassebaum,kasa,kartye,kartchner,karstens,karpinsky,karmely,karel,karasek,kapral,kaper,kanelos,kanahele,kampmann,kampe,kalp,kallus,kallevig,kallen,kaliszewski,kaleohano,kalchthaler,kalama,kalahiki,kaili,kahawai,kagey,justiss,jurkowski,jurgensmeyer,juilfs,jopling,jondahl,jomes,joice,johannessen,joeckel,jezewski,jezek,jeswald,jervey,jeppsen,jenniges,jennett,jemmott,jeffs,jaurequi,janisch,janick,jacek,jacaruso,iwanicki,ishihara,isenberger,isbister,iruegas,inzer,inyart,inscore,innocenti,inglish,infantolino,indovina,inaba,imondi,imdieke,imbert,illes,iarocci,iannucci,huver,hutley,husser,husmann,hupf,huntsberger,hunnewell,hullum,huit,huish,hughson,huft,hufstetler,hueser,hudnell,hovden,housen,houghtling,hossack,hoshaw,horsford,horry,hornbacher,hoppenstedt,hopkinson,honza,homann,holzmeister,holycross,holverson,holtzlander,holroyd,holmlund,holderness,holderfield,holck,hojnacki,hohlfeld,hohenberger,hoganson,hogancamp,hoffses,hoerauf,hoell,hoefert,hodum,hoder,hockenbury,hoage,hisserich,hislip,hirons,hippensteel,hippen,hinkston,hindes,hinchcliff,himmel,hillberry,hildring,hiester,hiefnar,hibberd,hibben,heyliger,heyl,heyes,hevia,hettrick,hert,hersha,hernandz,herkel,herber,henscheid,hennesy,henly,henegan,henebry,hench,hemsath,hemm,hemken,hemann,heltzel,hellriegel,hejny,heinl,heinke,heidinger,hegeman,hefferan,hedglin,hebdon,hearnen,heape,heagy,headings,headd,hazelbaker,havlick,hauschildt,haury,hassenfritz,hasenbeck,haseltine,hartstein,hartry,hartnell,harston,harpool,harmen,hardister,hardey,harders,harbolt,harbinson,haraway,haque,hansmann,hanser,hansch,hansberry,hankel,hanigan,haneline,hampe,hamons,hammerstone,hammerle,hamme,hammargren,hamelton,hamberger,hamasaki,halprin,halman,hallihan,haldane,haifley,hages,hagadorn,hadwin,habicht,habermehl,gyles,gutzman,gutekunst,gustason,gusewelle,gurnsey,gurnee,gunterman,gumina,gulliver,gulbrandson,guiterez,guerino,guedry,gucwa,guardarrama,guagliano,guadagno,grulke,groote,groody,groft,groeneweg,grochow,grippe,grimstead,griepentrog,greenfeld,greenaway,grebe,graziosi,graw,gravina,grassie,granzow,grandjean,granby,gramacy,gozalez,goyer,gotch,gosden,gorny,gormont,goodgion,gonya,gonnerman,gompert,golish,goligoski,goldmann,goike,goetze,godeaux,glaza,glassel,glaspy,glander,giumarro,gitelman,gisondi,gismondi,girvan,girten,gironda,giovinco,ginkel,gilster,giesy,gierman,giddins,giardini,gianino,ghea,geurin,gett,getson,gerrero,germond,gentsy,genta,gennette,genito,genis,gendler,geltz,geiss,gehret,gegenheimer,geffert,geeting,gebel,gavette,gavenda,gaumond,gaudioso,gatzke,gatza,gattshall,gaton,gatchel,gasperi,gaska,gasiorowski,garritson,garrigus,garnier,garnick,gardinier,gardenas,garcy,garate,gandolfi,gamm,gamel,gambel,gallmon,gallemore,gallati,gainous,gainforth,gahring,gaffey,gaebler,gadzinski,gadbury,gabri,gaba,fyke,furtaw,furnas,furcron,funn,funck,fulwood,fulvio,fullmore,fukumoto,fuest,fuery,frymire,frush,frohlich,froedge,frodge,fritzinger,fricker,frericks,frein,freid,freggiaro,fratto,franzi,franciscus,fralix,fowble,fotheringham,foslien,foshie,fortmann,forsey,forkner,foppiano,fontanetta,fonohema,fogler,fockler,fluty,flusche,flud,flori,flenory,fleharty,fleeks,flaxman,fiumara,fitzmorris,finnicum,finkley,fineran,fillhart,filipi,fijal,fieldson,ficarra,festerman,ferryman,ferner,fergason,ferell,fennern,femmer,feldmeier,feeser,feenan,federick,fedak,febbo,feazell,fazzone,fauth,fauset,faurote,faulker,faubion,fatzinger,fasick,fanguy,fambrough,falks,fahl,faaita,exler,ewens,estrado,esten,esteen,esquivez,espejo,esmiol,esguerra,esco,ertz,erspamer,ernstes,erisman,erhard,ereaux,ercanbrack,erbes,epple,entsminger,entriken,enslow,ennett,engquist,englebert,englander,engesser,engert,engeman,enge,enerson,emhoff,emge,elting,ellner,ellenberg,ellenbecker,elio,elfert,elawar,ekstrand,eison,eismont,eisenbrandt,eiseman,eischens,ehrgott,egley,egert,eddlemon,eckerson,eckersley,eckberg,echeverry,eberts,earthman,earnhart,eapen,eachus,dykas,dusi,durning,durdan,dunomes,duncombe,dume,dullen,dullea,dulay,duffett,dubs,dubard,drook,drenth,drahos,dragone,downin,downham,dowis,dowhower,doward,dovalina,dopazo,donson,donnan,dominski,dollarhide,dolinar,dolecki,dolbee,doege,dockus,dobkin,dobias,divoll,diviney,ditter,ditman,dissinger,dismang,dirlam,dinneen,dini,dingwall,diloreto,dilmore,dillaman,dikeman,diiorio,dighton,diffley,dieudonne,dietel,dieringer,diercks,dienhart,diekrager,diefendorf,dicke,dicamillo,dibrito,dibona,dezeeuw,dewhurst,devins,deviney,deupree,detherage,despino,desmith,desjarlais,deshner,desha,desanctis,derring,derousse,derobertis,deridder,derego,derden,deprospero,deprofio,depping,deperro,denty,denoncourt,dencklau,demler,demirchyan,demichiel,demesa,demere,demaggio,delung,deluise,delmoral,delmastro,delmas,delligatti,delle,delasbour,delarme,delargy,delagrange,delafontaine,deist,deiss,deighan,dehoff,degrazia,degman,defosses,deforrest,deeks,decoux,decarolis,debuhr,deberg,debarr,debari,dearmon,deare,deardurff,daywalt,dayer,davoren,davignon,daviau,dauteuil,dauterive,daul,darnley,darakjy,dapice,dannunzio,danison,daniello,damario,dalonzo,dallis,daleske,dalenberg,daiz,dains,daines,dagnese,dady,dadey,czyzewski,czapor,czaplewski,czajka,cyganiewicz,cuttino,cutrona,cussins,cusanelli,cuperus,cundy,cumiskey,cumins,cuizon,cuffia,cuffe,cuffari,cuccaro,cubie,cryder,cruson,crounse,cromedy,cring,creer,credeur,crea,cozort,cozine,cowee,cowdery,couser,courtway,courington,cotman,costlow,costell,corton,corsaro,corrieri,corrick,corradini,coron,coren,corbi,corado,copus,coppenger,cooperwood,coontz,coonce,contrera,connealy,conell,comtois,compere,commins,commings,comegys,colyar,colo,collister,collick,collella,coler,colborn,cohran,cogbill,coffen,cocuzzo,clynes,closter,clipp,clingingsmith,clemence,clayman,classon,clas,clarey,clague,ciubal,citrino,citarella,cirone,cipponeri,cindrich,cimo,ciliberto,cichowski,ciccarello,cicala,chura,chubbuck,chronis,christlieb,chizek,chittester,chiquito,chimento,childree,chianese,chevrette,checo,chastang,chargualaf,chapmon,chantry,chahal,chafetz,cezar,ceruantes,cerrillo,cerrano,cerecedes,cerami,cegielski,cavallero,catinella,cassata,caslin,casano,casacchia,caruth,cartrette,carten,carodine,carnrike,carnall,carmicle,carlan,carlacci,caris,cariaga,cardine,cardimino,cardani,carbonara,capua,capponi,cappellano,caporale,canupp,cantrel,cantone,canterberry,cannizzo,cannan,canelo,caneer,candill,candee,campbel,caminero,camble,caluya,callicott,calk,caito,caffie,caden,cadavid,cacy,cachu,cachola,cabreja,cabiles,cabada,caamano,byran,byon,buyck,bussman,bussie,bushner,burston,burnison,burkman,burkhammer,bures,burdeshaw,bumpass,bullinger,bullers,bulgrin,bugay,budak,buczynski,buckendorf,buccieri,bubrig,brynteson,brunz,brunmeier,brunkow,brunetto,brunelli,brumwell,bruggman,brucki,brucculeri,brozovich,browing,brotman,brocker,broadstreet,brix,britson,brinck,brimmage,brierre,bridenstine,brezenski,brezee,brevik,brentlinger,brentley,breidenbach,breckel,brech,brazzle,braughton,brauch,brattin,brattain,branhan,branford,braner,brander,braly,braegelmann,brabec,boyt,boyack,bowren,bovian,boughan,botton,botner,bosques,borzea,borre,boron,bornhorst,borgstrom,borella,bontempo,bonniwell,bonnes,bonillo,bonano,bolek,bohol,bohaty,boffa,boetcher,boesen,boepple,boehler,boedecker,boeckx,bodi,boal,bloodsworth,bloodgood,blome,blockett,blixt,blanchett,blackhurst,blackaby,bjornberg,bitzer,bittenbender,bitler,birchall,binnicker,binggeli,billett,bilberry,biglow,bierly,bielby,biegel,berzas,berte,bertagnolli,berreth,bernhart,bergum,berentson,berdy,bercegeay,bentle,bentivegna,bentham,benscoter,benns,bennick,benjamine,beneze,benett,beneke,bendure,bendix,bendick,benauides,belman,bellus,bellott,bellefleur,bellas,beljan,belgard,beith,beinlich,beierle,behme,beevers,beermann,beeching,bedward,bedrosian,bedner,bedeker,bechel,becera,beaubrun,beardmore,bealmear,bazin,bazer,baumhoer,baumgarner,bauknecht,battson,battiest,basulto,baster,basques,basista,basiliere,bashi,barzey,barz,bartus,bartucca,bartek,barrero,barreca,barnoski,barndt,barklow,baribeau,barette,bares,barentine,bareilles,barbre,barberi,barbagelata,baraw,baratto,baranoski,baptise,bankson,bankey,bankard,banik,baltzley,ballen,balkey,balius,balderston,bakula,bakalar,baffuto,baerga,badoni,backous,bachtel,bachrach,baccari,babine,babilonia,baar,azbill,azad,aycox,ayalla,avolio,austerberry,aughtry,aufderheide,auch,attanasio,athayde,atcher,asselta,aslin,aslam,ashwood,ashraf,ashbacher,asbridge,asakura,arzaga,arriaza,arrez,arrequin,arrants,armiger,armenteros,armbrister,arko,argumedo,arguijo,ardolino,arcia,arbizo,aravjo,aper,anzaldo,antu,antrikin,antonetty,antinoro,anthon,antenucci,anstead,annese,ankrum,andreason,andrado,andaverde,anastos,anable,amspoker,amrine,amrein,amorin,amel,ambrosini,alsbrook,alnutt,almasi,allessio,allateef,aldous,alderink,aldaz,akmal,akard,aiton,aites,ainscough,aikey,ahrends,ahlm,aguada,agans,adelmann,addesso,adaway,adamaitis,ackison,abud,abendroth,abdur,abdool,aamodt,zywiec,zwiefelhofer,zwahlen,zunino,zuehl,zmuda,zmolek,zizza,ziska,zinser,zinkievich,zinger,zingarelli,ziesmer,ziegenfuss,ziebol,zettlemoyer,zettel,zervos,zenke,zembower,zelechowski,zelasko,zeise,zeek,zeeb,zarlenga,zarek,zaidi,zahnow,zahnke,zaharis,zacate,zabrocki,zaborac,yurchak,yuengling,younie,youngers,youell,yott,yoshino,yorks,yordy,yochem,yerico,yerdon,yeiser,yearous,yearick,yeaney,ybarro,yasutake,yasin,yanke,yanish,yanik,yamazaki,yamat,yaggi,ximenez,wyzard,wynder,wyly,wykle,wutzke,wuori,wuertz,wuebker,wrightsel,worobel,worlie,worford,worek,woolson,woodrome,woodly,woodling,wontor,wondra,woltemath,wollmer,wolinski,wolfert,wojtanik,wojtak,wohlfarth,woeste,wobbleton,witz,wittmeyer,witchey,wisotzkey,wisnewski,wisman,wirch,wippert,wineberg,wimpee,wilusz,wiltsey,willig,williar,willers,willadsen,wildhaber,wilday,wigham,wiewel,wieting,wietbrock,wiesel,wiesehan,wiersema,wiegert,widney,widmark,wickson,wickings,wichern,whtie,whittie,whitlinger,whitfill,whitebread,whispell,whetten,wheeley,wheeles,wheelen,whatcott,weyland,weter,westrup,westphalen,westly,westland,wessler,wesolick,wesler,wesche,werry,wero,wernecke,werkhoven,wellspeak,wellings,welford,welander,weissgerber,weisheit,weins,weill,weigner,wehrmann,wehrley,wehmeier,wege,weers,weavers,watring,wassum,wassman,wassil,washabaugh,wascher,warth,warbington,wanca,wammack,wamboldt,walterman,walkington,walkenhorst,walinski,wakley,wagg,wadell,vuckovich,voogd,voller,vokes,vogle,vogelsberg,vodicka,vissering,vipond,vincik,villalona,vickerman,vettel,veteto,vesperman,vesco,vertucci,versaw,verba,ventris,venecia,vendela,venanzi,veldhuizen,vehrs,vaughen,vasilopoulos,vascocu,varvel,varno,varlas,varland,vario,vareschi,vanwyhe,vanweelden,vansciver,vannaman,vanluven,vanloo,vanlaningham,vankomen,vanhout,vanhampler,vangorp,vangorden,vanella,vandresar,vandis,vandeyacht,vandewerker,vandevsen,vanderwall,vandercook,vanderberg,vanbergen,valko,valesquez,valeriano,valen,vachula,vacha,uzee,uselman,urizar,urion,urben,upthegrove,unzicker,unsell,unick,umscheid,umin,umanzor,ullo,ulicki,uhlir,uddin,tytler,tymeson,tyger,twisdale,twedell,tweddle,turrey,tures,turell,tupa,tuitt,tuberville,tryner,trumpower,trumbore,troglen,troff,troesch,trivisonno,tritto,tritten,tritle,trippany,tringali,tretheway,treon,trejos,tregoning,treffert,traycheff,travali,trauth,trauernicht,transou,trane,trana,toves,tosta,torp,tornquist,tornes,torchio,toor,tooks,tonks,tomblinson,tomala,tollinchi,tolles,tokich,tofte,todman,titze,timpone,tillema,tienken,tiblier,thyberg,thursby,thurrell,thurm,thruman,thorsted,thorley,thomer,thoen,thissen,theimer,thayn,thanpaeng,thammavongsa,thalman,texiera,texidor,teverbaugh,teska,ternullo,teplica,tepe,teno,tenholder,tenbusch,tenbrink,temby,tejedor,teitsworth,teichmann,tehan,tegtmeyer,tees,teem,tays,taubert,tauares,taschler,tartamella,tarquinio,tarbutton,tappendorf,tapija,tansil,tannahill,tamondong,talahytewa,takashima,taecker,tabora,tabin,tabbert,szymkowski,szymanowski,syversen,syrett,synnott,sydnes,swimm,sweney,swearegene,swartzel,swanstrom,svedin,suryan,supplice,supnet,suoboda,sundby,sumaya,sumabat,sulzen,sukovaty,sukhu,sugerman,sugalski,sudweeks,sudbeck,sucharski,stutheit,stumfoll,stuffle,struyk,strutz,strumpf,strowbridge,strothman,strojny,strohschein,stroffolino,stribble,strevel,strenke,stremming,strehle,stranak,stram,stracke,stoudamire,storks,stopp,stonebreaker,stolt,stoica,stofer,stockham,stockfisch,stjuste,stiteler,stiman,stillions,stillabower,stierle,sterlace,sterk,stepps,stenquist,stenner,stellman,steines,steinbaugh,steinbacher,steiling,steidel,steffee,stavinoha,staver,stastny,stasiuk,starrick,starliper,starlin,staniford,staner,standre,standefer,standafer,stanczyk,stallsmith,stagliano,staehle,staebler,stady,stadtmiller,squyres,spurbeck,sprunk,spranger,spoonamore,spoden,spilde,spezio,speros,sperandio,specchio,spearin,spayer,spallina,spadafino,sovie,sotello,sortor,sortino,soros,sorola,sorbello,sonner,sonday,somes,soloway,soens,soellner,soderblom,sobin,sniezek,sneary,smyly,smutnick,smoots,smoldt,smitz,smitreski,smallen,smades,slunaker,sluka,slown,slovick,slocomb,slinger,slife,sleeter,slanker,skufca,skubis,skrocki,skov,skjei,skilton,skarke,skalka,skalak,skaff,sixkiller,sitze,siter,sisko,sirman,sirls,sinotte,sinon,sincock,sincebaugh,simmoms,similien,silvius,silton,silloway,sikkema,sieracki,sienko,siemon,siemer,siefker,sieberg,siebens,siebe,sicurella,sicola,sickle,shumock,shumiloff,shuffstall,shuemaker,shuart,shroff,shreeve,shostak,shortes,shorr,shivley,shintaku,shindo,shimomura,shiigi,sherow,sherburn,shepps,shenefield,shelvin,shelstad,shelp,sheild,sheaman,shaulis,sharrer,sharps,sharpes,shappy,shapero,shanor,shandy,seyller,severn,sessom,sesley,servidio,serrin,sero,septon,septer,sennott,sengstock,senff,senese,semprini,semone,sembrat,selva,sella,selbig,seiner,seif,seidt,sehrt,seemann,seelbinder,sedlay,sebert,seaholm,seacord,seaburg,scungio,scroggie,scritchfield,scrimpsher,scrabeck,scorca,scobey,scivally,schwulst,schwinn,schwieson,schwery,schweppe,schwartzenbur,schurz,schumm,schulenburg,schuff,schuerholz,schryer,schrager,schorsch,schonhardt,schoenfelder,schoeck,schoeb,schnitzler,schnick,schnautz,schmig,schmelter,schmeichel,schluneger,schlosberg,schlobohm,schlenz,schlembach,schleisman,schleining,schleiff,schleider,schink,schilz,schiffler,schiavi,scheuer,schemonia,scheman,schelb,schaul,schaufelberge,scharer,schardt,scharbach,schabacker,scee,scavone,scarth,scarfone,scalese,sayne,sayed,savitz,satterlund,sattazahn,satow,sastre,sarr,sarjeant,sarff,sardella,santoya,santoni,santai,sankowski,sanft,sandow,sandoe,sandhaus,sandefer,sampey,samperi,sammarco,samia,samek,samay,samaan,salvadore,saltness,salsgiver,saller,salaz,salano,sakal,saka,saintlouis,saile,sahota,saggese,sagastume,sadri,sadak,sachez,saalfrank,saal,saadeh,rynn,ryley,ryle,rygg,rybarczyk,ruzich,ruyter,ruvo,rupel,ruopp,rundlett,runde,rundall,runck,rukavina,ruggiano,rufi,ruef,rubright,rubbo,rowbottom,rotner,rotman,rothweiler,rothlisberger,rosseau,rossean,rossa,roso,rosiek,roshia,rosenkrans,rosener,rosencrantz,rosencrans,rosello,roques,rookstool,rondo,romasanta,romack,rokus,rohweder,roethler,roediger,rodwell,rodrigus,rodenbeck,rodefer,rodarmel,rockman,rockholt,rochow,roches,roblin,roblez,roble,robers,roat,rizza,rizvi,rizk,rixie,riveiro,rius,ritschard,ritrovato,risi,rishe,rippon,rinks,ringley,ringgenberg,ringeisen,rimando,rilley,rijos,rieks,rieken,riechman,riddley,ricord,rickabaugh,richmeier,richesin,reyolds,rexach,requena,reppucci,reposa,renzulli,renter,remondini,reither,reisig,reifsnider,reifer,reibsome,reibert,rehor,rehmann,reedus,redshaw,reczek,recupero,recor,reckard,recher,realbuto,razer,rayman,raycraft,rayas,rawle,raviscioni,ravetto,ravenelle,rauth,raup,rattliff,rattley,rathfon,rataj,rasnic,rappleyea,rapaport,ransford,rann,rampersad,ramis,ramcharan,rainha,rainforth,ragans,ragains,rafidi,raffety,raducha,radsky,radler,radatz,raczkowski,rabenold,quraishi,quinerly,quercia,quarnstrom,pusser,puppo,pullan,pulis,pugel,puca,pruna,prowant,provines,pronk,prinkleton,prindall,primas,priesmeyer,pridgett,prevento,preti,presser,presnall,preseren,presas,presa,prchal,prattis,pratillo,praska,prak,powis,powderly,postlewait,postle,posch,porteus,porraz,popwell,popoff,poplaski,poniatoski,pollina,polle,polhill,poletti,polaski,pokorney,pointdexter,poinsette,ploszaj,plitt,pletz,pletsch,plemel,pleitez,playford,plaxco,platek,plambeck,plagens,placido,pisarski,pinuelas,pinnette,pinick,pinell,pinciaro,pinal,pilz,piltz,pillion,pilkinton,pikul,piepenburg,piening,piehler,piedrahita,piechocki,picknell,pickelsimer,pich,picariello,phoeuk,phillipson,philbert,pherigo,phelka,peverini,petrash,petramale,petraglia,pery,personius,perrington,perrill,perpall,perot,perman,peragine,pentland,pennycuff,penninger,pennachio,pendexter,penalver,pelzel,pelter,pelow,pelo,peli,peinado,pedley,pecue,pecore,pechar,peairs,paynes,payano,pawelk,pavlock,pavlich,pavich,pavek,pautler,paulik,patmore,patella,patee,patalano,passini,passeri,paskell,parrigan,parmar,parayno,paparelli,pantuso,pante,panico,panduro,panagos,pama,palmo,pallotta,paling,palamino,pake,pajtas,pailthorpe,pahler,pagon,paglinawan,pagley,paget,paetz,paet,padley,pacleb,pachelo,paccione,pabey,ozley,ozimek,ozawa,owney,outram,ouillette,oudekerk,ostrosky,ostermiller,ostermann,osterloh,osterfeld,ossenfort,osoria,oshell,orsino,orscheln,orrison,ororke,orellano,orejuela,ordoyne,opsahl,opland,onofre,onaga,omahony,olszowka,olshan,ollig,oliff,olien,olexy,oldridge,oldfather,olalde,okun,okumoto,oktavec,okin,ohme,ohlemacher,ohanesian,odneal,odgers,oderkirk,odden,ocain,obradovich,oakey,nussey,nunziato,nunoz,nunnenkamp,nuncio,noviello,novacek,nothstine,northum,norsen,norlander,norkus,norgaard,norena,nored,nobrega,niziolek,ninnemann,nievas,nieratko,nieng,niedermeyer,niedermaier,nicolls,newham,newcome,newberger,nevills,nevens,nevel,neumiller,netti,nessler,neria,nemet,nelon,nellon,neller,neisen,neilly,neifer,neid,neering,neehouse,neef,needler,nebergall,nealis,naumoff,naufzinger,narum,narro,narramore,naraine,napps,nansteel,namisnak,namanny,nallie,nakhle,naito,naccari,nabb,myracle,myhand,mwakitwile,muzzy,muscolino,musco,muscente,muscat,muscara,musacchia,musa,murrish,murfin,muray,munnelly,munley,munivez,mundine,mundahl,munari,mullennex,mullendore,mulkhey,mulinix,mulders,muhl,muenchow,muellner,mudget,mudger,muckenfuss,muchler,mozena,movius,mouldin,motola,mosseri,mossa,moselle,mory,morsell,morrish,morles,morie,morguson,moresco,morck,moppin,moosman,montuori,montono,montogomery,montis,monterio,monter,monsalve,mongomery,mongar,mondello,moncivais,monard,monagan,molt,mollenhauer,moldrem,moldonado,molano,mokler,moisant,moilanen,mohrman,mohamad,moger,mogel,modine,modin,modic,modha,mlynek,miya,mittiga,mittan,mitcheltree,misfeldt,misener,mirchandani,miralles,miotke,miosky,mintey,mins,minassian,minar,mimis,milon,milloy,millison,milito,milfort,milbradt,mikulich,mikos,miklas,mihelcic,migliorisi,migliori,miesch,midura,miclette,michela,micale,mezey,mews,mewes,mettert,mesker,mesich,mesecher,merthie,mersman,mersereau,merrithew,merriott,merring,merenda,merchen,mercardo,merati,mentzel,mentis,mentel,menotti,meno,mengle,mendolia,mellick,mellett,melichar,melhorn,melendres,melchiorre,meitzler,mehtani,mehrtens,meditz,medeiras,meckes,mcteer,mctee,mcparland,mcniell,mcnealey,mcmanaway,mcleon,mclay,mclavrin,mcklveen,mckinzey,mcken,mckeand,mckale,mcilwraith,mcilroy,mcgreal,mcgougan,mcgettigan,mcgarey,mcfeeters,mcelhany,mcdaris,mccomis,mccomber,mccolm,mccollins,mccollin,mccollam,mccoach,mcclory,mcclennon,mccathern,mccarthey,mccarson,mccarrel,mccargar,mccandles,mccamish,mccally,mccage,mcbrearty,mcaneny,mcanallen,mcalarney,mcaferty,mazzo,mazy,mazurowski,mazique,mayoras,mayden,maxberry,mauller,matusiak,mattsen,matthey,matkins,mathiasen,mathe,mateus,matalka,masullo,massay,mashak,mascroft,martinex,martenson,marsiglia,marsella,maroudas,marotte,marner,markes,maret,mareno,marean,marcinkiewicz,marchel,marasigan,manzueta,manzanilla,manternach,manring,manquero,manoni,manne,mankowski,manjarres,mangen,mangat,mandonado,mandia,mancias,manbeck,mamros,maltez,mallia,mallar,malla,malen,malaspina,malahan,malagisi,malachowski,makowsky,makinen,makepeace,majkowski,majid,majercin,maisey,mainguy,mailliard,maignan,mahlman,maha,magsamen,magpusao,magnano,magley,magedanz,magarelli,magaddino,maenner,madnick,maddrey,madaffari,macnaughton,macmullen,macksey,macknight,macki,macisaac,maciejczyk,maciag,machenry,machamer,macguire,macdaniel,maccormack,maccabe,mabbott,mabb,lynott,lycan,lutwin,luscombe,lusco,lusardi,luria,lunetta,lundsford,lumas,luisi,luevanos,lueckenhoff,ludgate,ludd,lucherini,lubbs,lozado,lourens,lounsberry,loughrey,loughary,lotton,losser,loshbaugh,loseke,loscalzo,lortz,loperena,loots,loosle,looman,longstaff,longobardi,longbottom,lomay,lomasney,lohrmann,lohmiller,logalbo,loetz,loeffel,lodwick,lodrigue,lockrem,llera,llarena,littrel,littmann,lisser,lippa,lipner,linnemann,lingg,lindemuth,lindeen,lillig,likins,lieurance,liesmann,liesman,liendo,lickert,lichliter,leyvas,leyrer,lewy,leubner,lesslie,lesnick,lesmerises,lerno,lequire,lepera,lepard,lenske,leneau,lempka,lemmen,lemm,lemere,leinhart,leichner,leicher,leibman,lehmberg,leggins,lebeda,leavengood,leanard,lazaroff,laventure,lavant,lauster,laumea,latigo,lasota,lashure,lasecki,lascurain,lartigue,larouche,lappe,laplaunt,laplace,lanum,lansdell,lanpher,lanoie,lankard,laniado,langowski,langhorn,langfield,langfeldt,landt,landerman,landavazo,lampo,lampke,lamper,lamery,lambey,lamadrid,lallemand,laisure,laigo,laguer,lagerman,lageman,lagares,lacosse,lachappelle,laborn,labonne,kuzia,kutt,kutil,kurylo,kurowski,kuriger,kupcho,kulzer,kulesa,kules,kuhs,kuhne,krutz,krus,krupka,kronberg,kromka,kroese,krizek,krivanek,kringel,kreiss,kratofil,krapp,krakowsky,kracke,kozlow,kowald,kover,kovaleski,kothakota,kosten,koskinen,kositzke,korff,korbar,kopplin,koplin,koos,konyn,konczak,komp,komo,kolber,kolash,kolakowski,kohm,kogen,koestner,koegler,kodama,kocik,kochheiser,kobler,kobara,knezevich,kneifl,knapchuck,knabb,klugman,klosner,klingel,klimesh,klice,kley,kleppe,klemke,kleinmann,kleinhans,kleinberg,kleffner,kleckley,klase,kisto,kissick,kisselburg,kirschman,kirks,kirkner,kirkey,kirchman,kinville,kinnunen,kimmey,kimmerle,kimbley,kilty,kilts,killmeyer,killilea,killay,kiest,kierce,kiepert,kielman,khalid,kewal,keszler,kesson,kesich,kerwood,kerksiek,kerkhoff,kerbo,keranen,keomuangtai,kenter,kennelley,keniry,kendzierski,kempner,kemmis,kemerling,kelsay,kelchner,kela,keithly,keipe,kegg,keer,keahey,kaywood,kayes,kawahara,kasuboski,kastendieck,kassin,kasprzyk,karraker,karnofski,karman,karger,karge,karella,karbowski,kapphahn,kannel,kamrath,kaminer,kamansky,kalua,kaltz,kalpakoff,kalkbrenner,kaku,kaib,kaehler,kackley,kaber,justo,juris,jurich,jurgenson,jurez,junor,juniel,juncker,jugo,jubert,jowell,jovanovic,joosten,joncas,joma,johnso,johanns,jodoin,jockers,joans,jinwright,jinenez,jimeson,jerrett,jergens,jerden,jerdee,jepperson,jendras,jeanfrancois,jazwa,jaussi,jaster,jarzombek,jarencio,janocha,jakab,jadlowiec,jacobsma,jach,izaquirre,iwaoka,ivaska,iturbe,israelson,isles,isachsen,isaak,irland,inzerillo,insogna,ingegneri,ingalsbe,inciong,inagaki,icenogle,hyett,hyers,huyck,hutti,hutten,hutnak,hussar,hurrle,hurford,hurde,hupper,hunkin,hunkele,hunke,humann,huhtasaari,hugel,hufft,huegel,hrobsky,hren,hoyles,hovsepian,hovenga,hovatter,houdek,hotze,hossler,hossfeld,hosseini,horten,hort,horr,horgen,horen,hoopii,hoon,hoogland,hontz,honnold,homewood,holway,holtgrewe,holtan,holstrom,holstege,hollway,hollingshed,hollenback,hollard,holberton,hoines,hogeland,hofstad,hoetger,hoen,hoaglund,hirota,hintermeister,hinnen,hinders,hinderer,hinchee,himelfarb,himber,hilzer,hilling,hillers,hillegas,hildinger,hignight,highman,hierholzer,heyde,hettich,hesketh,herzfeld,herzer,hershenson,hershberg,hernando,hermenegildo,hereth,hererra,hereda,herbin,heraty,herard,hepa,henschel,henrichsen,hennes,henneberger,heningburg,henig,hendron,hendericks,hemple,hempe,hemmingsen,hemler,helvie,helmly,helmbrecht,heling,helin,helfrey,helble,helaire,heizman,heisser,heiny,heinbaugh,heidemann,heidema,heiberger,hegel,heerdt,heeg,heefner,heckerman,heckendorf,heavin,headman,haynesworth,haylock,hayakawa,hawksley,haverstick,haut,hausen,hauke,haubold,hattan,hattabaugh,hasstedt,hashem,haselhorst,harrist,harpst,haroldsen,harmison,harkema,harison,hariri,harcus,harcum,harcharik,hanzel,hanvey,hantz,hansche,hansberger,hannig,hanken,hanhardt,hanf,hanauer,hamberlin,halward,halsall,hals,hallquist,hallmon,halk,halbach,halat,hajdas,hainsworth,haik,hahm,hagger,haggar,hader,hadel,haddick,hackmann,haasch,haaf,guzzetta,guzy,gutterman,gutmann,gutkowski,gustine,gursky,gurner,gunsolley,gumpert,gulla,guilmain,guiliani,guier,guers,guerero,guerena,guebara,guadiana,grunder,grothoff,grosland,grosh,groos,grohs,grohmann,groepper,grodi,grizzaffi,grissinger,grippi,grinde,griffee,grether,greninger,greigo,gregorski,greger,grega,greenberger,graza,grattan,grasse,grano,gramby,gradilla,govin,goutremout,goulas,gotay,gosling,gorey,gordner,goossen,goodwater,gonzaga,gonyo,gonska,gongalves,gomillion,gombos,golonka,gollman,goldtrap,goldammer,golas,golab,gola,gogan,goffman,goeppinger,godkin,godette,glore,glomb,glauner,glassey,glasner,gividen,giuffrida,gishal,giovanelli,ginoza,ginns,gindlesperger,gindhart,gillem,gilger,giggey,giebner,gibbson,giacomo,giacolone,giaccone,giacchino,ghere,gherardini,gherardi,gfeller,getts,gerwitz,gervin,gerstle,gerfin,geremia,gercak,gener,gencarelli,gehron,gehrmann,geffers,geery,geater,gawlik,gaudino,garsia,garrahan,garrabrant,garofolo,garigliano,garfinkle,garelick,gardocki,garafola,gappa,gantner,ganther,gangelhoff,gamarra,galstad,gally,gallik,gallier,galimba,gali,galassi,gaige,gadsby,gabbin,gabak,fyall,furney,funez,fulwider,fulson,fukunaga,fujikawa,fugere,fuertes,fuda,fryson,frump,frothingham,froning,froncillo,frohling,froberg,froats,fritchman,frische,friedrichsen,friedmann,friddell,frid,fresch,frentzel,freno,frelow,freimuth,freidel,freehan,freeby,freeburn,fredieu,frederiksen,fredeen,frazell,frayser,fratzke,frattini,franze,franich,francescon,framer,fragman,frack,foxe,fowlston,fosberg,fortna,fornataro,forden,foots,foody,fogt,foglia,fogerty,fogelson,flygare,flowe,flinner,flem,flath,flater,flahaven,flad,fjeld,fitanides,fistler,fishbaugh,firsching,finzel,finical,fingar,filosa,filicetti,filby,fierst,fierra,ficklen,ficher,fersner,ferrufino,ferrucci,fero,ferlenda,ferko,fergerstrom,ferge,fenty,fent,fennimore,fendt,femat,felux,felman,feldhaus,feisthamel,feijoo,feiertag,fehrman,fehl,feezell,feeback,fedigan,fedder,fechner,feary,fayson,faylor,fauteux,faustini,faure,fauci,fauber,fattig,farruggio,farrens,faraci,fantini,fantin,fanno,fannings,faniel,fallaw,falker,falkenhagen,fajen,fahrner,fabel,fabacher,eytcheson,eyster,exford,exel,evetts,evenstad,evanko,euresti,euber,etcitty,estler,essner,essinger,esplain,espenshade,espaillat,escribano,escorcia,errington,errett,errera,erlanger,erenrich,erekson,erber,entinger,ensworth,ensell,enno,ennen,englin,engblom,engberson,encinias,enama,emel,elzie,elsbree,elman,ellebracht,elkan,elfstrom,elerson,eleazer,eleam,eldrige,elcock,einspahr,eike,eidschun,eickman,eichele,eiche,ehlke,eguchi,eggink,edouard,edgehill,eckes,eblin,ebberts,eavenson,earvin,eardley,eagon,eader,dzubak,dylla,dyckman,dwire,dutrow,dutile,dusza,dustman,dusing,duryee,durupan,durtschi,durtsche,durell,dunny,dunnegan,dunken,dumm,dulak,duker,dukelow,dufort,dufilho,duffee,duett,dueck,dudzinski,dudasik,duckwall,duchemin,dubrow,dubis,dubicki,duba,drust,druckman,drinnen,drewett,drewel,dreitzler,dreckman,drappo,draffen,drabant,doyen,dowding,doub,dorson,dorschner,dorrington,dorney,dormaier,dorff,dorcy,donges,donelly,donel,domangue,dols,dollahite,dolese,doldo,doiley,dohrman,dohn,doheny,doceti,dobry,dobrinski,dobey,divincenzo,dischinger,dirusso,dirocco,dipiano,diop,dinitto,dinehart,dimsdale,diminich,dimalanta,dillavou,dilello,difusco,diffey,diffenderfer,diffee,difelice,difabio,dietzman,dieteman,diepenbrock,dieckmann,dicampli,dibari,diazdeleon,diallo,dewitz,dewiel,devoll,devol,devincent,devier,devendorf,devalk,detten,detraglia,dethomas,detemple,desler,desharnais,desanty,derocco,dermer,derks,derito,derhammer,deraney,dequattro,depass,depadua,denyes,denyer,dentino,denlinger,deneal,demory,demopoulos,demontigny,demonte,demeza,delsol,delrosso,delpit,delpapa,delouise,delone,delo,delmundo,delmore,dellapaolera,delfin,delfierro,deleonardis,delenick,delcarlo,delcampo,delcamp,delawyer,delaroca,delaluz,delahunt,delaguardia,dekeyser,dekay,dejaeger,dejackome,dehay,dehass,degraffenried,degenhart,degan,deever,deedrick,deckelbaum,dechico,dececco,decasas,debrock,debona,debeaumont,debarros,debaca,dearmore,deangelus,dealmeida,dawood,davney,daudt,datri,dasgupta,darring,darracott,darcus,daoud,dansbury,dannels,danielski,danehy,dancey,damour,dambra,dalcour,dahlheimer,dadisman,dacunto,dacamara,dabe,cyrulik,cyphert,cwik,cussen,curles,curit,curby,curbo,cunas,cunard,cunanan,cumpton,culcasi,cucinotta,cucco,csubak,cruthird,crumwell,crummitt,crumedy,crouthamel,cronce,cromack,crisafi,crimin,cresto,crescenzo,cremonese,creedon,crankshaw,cozzens,coval,courtwright,courcelle,coupland,counihan,coullard,cotrell,cosgrave,cornelio,corish,cordoua,corbit,coppersmith,coonfield,conville,contrell,contento,conser,conrod,connole,congrove,conery,condray,colver,coltman,colflesh,colcord,colavito,colar,coile,coggan,coenen,codling,coda,cockroft,cockrel,cockerill,cocca,coberley,clouden,clos,clish,clinkscale,clester,clammer,cittadino,citrano,ciresi,cillis,ciccarelli,ciborowski,ciarlo,ciardullo,chritton,chopp,chirco,chilcoat,chevarie,cheslak,chernak,chay,chatterjee,chatten,chatagnier,chastin,chappuis,channey,champlain,chalupsky,chalfin,chaffer,chadek,chadderton,cestone,cestero,cestari,cerros,cermeno,centola,cedrone,cayouette,cavan,cavaliero,casuse,castricone,castoreno,casten,castanada,castagnola,casstevens,cassanova,caspari,casher,cashatt,casco,casassa,casad,carville,cartland,cartegena,carsey,carsen,carrino,carrilo,carpinteyro,carmley,carlston,carlsson,cariddi,caricofe,carel,cardy,carducci,carby,carangelo,capriotti,capria,caprario,capelo,canul,cantua,cantlow,canny,cangialosi,canepa,candland,campolo,campi,camors,camino,camfield,camelo,camarero,camaeho,calvano,calliste,caldarella,calcutt,calcano,caissie,cager,caccamo,cabotage,cabble,byman,buzby,butkowski,bussler,busico,bushovisky,busbin,busard,busalacchi,burtman,burrous,burridge,burrer,burno,burin,burgette,burdock,burdier,burckhard,bunten,bungay,bundage,bumby,bultema,bulinski,bulan,bukhari,buganski,buerkle,buen,buehl,budzynski,buckham,bryk,brydon,bruyere,brunsvold,brunnett,brunker,brunfield,brumble,brue,brozina,brossman,brosey,brookens,broersma,brodrick,brockmeier,brockhouse,brisky,brinkly,brincefield,brighenti,brigante,brieno,briede,bridenbaugh,brickett,breske,brener,brenchley,breitkreutz,breitbart,breister,breining,breighner,breidel,brehon,breheny,breard,breakell,brazill,braymiller,braum,brau,brashaw,bransom,brandolino,brancato,branagan,braff,brading,bracker,brackenbury,bracher,braasch,boylen,boyda,boyanton,bowlus,bowditch,boutot,bouthillette,boursiquot,bourjolly,bouret,boulerice,bouer,bouchillon,bouchie,bottin,boteilho,bosko,bosack,borys,bors,borla,borjon,borghi,borah,booten,boore,bonuz,bonne,bongers,boneta,bonawitz,bonanni,bomer,bollen,bollard,bolla,bolio,boisseau,boies,boiani,bohorquez,boghossian,boespflug,boeser,boehl,boegel,bodrick,bodkins,bodenstein,bodell,bockover,bocci,bobbs,boals,boahn,boadway,bluma,bluett,bloor,blomker,blevens,blethen,bleecker,blayney,blaske,blasetti,blancas,blackner,bjorkquist,bjerk,bizub,bisono,bisges,bisaillon,birr,birnie,bires,birdtail,birdine,bina,billock,billinger,billig,billet,bigwood,bigalk,bielicki,biddick,biccum,biafore,bhagat,beza,beyah,bevier,bevell,beute,betzer,betthauser,bethay,bethard,beshaw,bertholf,bertels,berridge,bernot,bernath,bernabei,berkson,berkovitz,berkich,bergsten,berget,berezny,berdin,beougher,benthin,benhaim,benenati,benejan,bemiss,beloate,bellucci,bellotti,belling,bellido,bellaire,bellafiore,bekins,bekele,beish,behnken,beerly,beddo,becket,becke,bebeau,beauchaine,beaucage,beadling,beacher,bazar,baysmore".split(",")))];
+ra=v.concat([function(b){var a,d,c,e,f,g,h,i,j,k,l,m,o,n,p,q;f=[];p=P(R(b));j=0;for(m=p.length;j<m;j++){g=p[j];if(O(g))break;k=0;for(o=v.length;k<o;k++){c=v[k];e=U(b,g);q=c(e);l=0;for(n=q.length;l<n;l++)if(c=q[l],i=b.slice(c.i,+c.j+1||9E9),i.toLowerCase()!==c.matched_word){e={};for(h in g)a=g[h],-1!==i.indexOf(h)&&(e[h]=a);c.l33t=!0;c.token=i;c.sub=e;i=c;var B=void 0,B=[];for(d in e)a=e[d],B.push(""+d+" -> "+a);i.sub_display=B.join(", ");f.push(c)}}}return f},function(b){var a,d,c,e,f,g;f=p(b,N);
+g=[];c=0;for(e=f.length;c<e;c++)a=f[c],d=[a.i,a.j],a=d[0],d=d[1],g.push({pattern:"digits",i:a,j:d,token:b.slice(a,+d+1||9E9)});return g},function(b){var a,d,c,e,f,g;f=p(b,V);g=[];c=0;for(e=f.length;c<e;c++)a=f[c],d=[a.i,a.j],a=d[0],d=d[1],g.push({pattern:"year",i:a,j:d,token:b.slice(a,+d+1||9E9)});return g},function(b){return L(b).concat(K(b))},function(b){var a,d,c;c=[];for(a=0;a<b.length;){for(d=a+1;;)if(b.slice(d-1,+d+1||9E9),b.charAt(d-1)===b.charAt(d))d+=1;else{2<d-a&&c.push({pattern:"repeat",
+i:a,j:d-1,token:b.slice(a,d),repeated_char:b.charAt(a)});break}a=d}return c},function(b){var a,d,c,e,f,g,h,i,j,k,l,m,n;i=[];for(f=0;f<b.length;){g=f+1;m=n=j=null;for(l in x)if(k=x[l],c=function(){var c,d,e,h;e=[b.charAt(f),b.charAt(g)];h=[];c=0;for(d=e.length;c<d;c++)a=e[c],h.push(k.indexOf(a));return h}(),e=c[0],c=c[1],-1<e&&-1<c&&(e=c-e,1===e||-1===e)){j=k;n=l;m=e;break}if(j)for(;;)if(e=b.slice(g-1,+g+1||9E9),h=e[0],d=e[1],c=function(){var b,c,e,f;e=[h,d];f=[];b=0;for(c=e.length;b<c;b++)a=e[b],
+f.push(k.indexOf(a));return f}(),e=c[0],c=c[1],c-e===m)g+=1;else{2<g-f&&i.push({pattern:"sequence",i:f,j:g-1,token:b.slice(f,g),sequence_name:n,sequence_space:j.length,ascending:1===m});break}f=g}return i},function(b){var a,d,c;c=[];for(d in G)a=G[d],z(c,T(b,a,d));return c}]);G={qwerty:E,dvorak:{"!":["`~",null,null,"2@","'\"",null],'"':[null,"1!","2@",",<","aA",null],"#":["2@",null,null,"4$",".>",",<"],$:["3#",null,null,"5%","pP",".>"],"%":["4$",null,null,"6^","yY","pP"],"&":["6^",null,null,"8*",
+"gG","fF"],"'":[null,"1!","2@",",<","aA",null],"(":["8*",null,null,"0)","rR","cC"],")":["9(",null,null,"[{","lL","rR"],"*":["7&",null,null,"9(","cC","gG"],"+":["/?","]}",null,"\\|",null,"-_"],",":"'\",2@,3#,.>,oO,aA".split(","),"-":["sS","/?","=+",null,null,"zZ"],".":",< 3# 4$ pP eE oO".split(" "),"/":"lL,[{,]},=+,-_,sS".split(","),"0":["9(",null,null,"[{","lL","rR"],1:["`~",null,null,"2@","'\"",null],2:["1!",null,null,"3#",",<","'\""],3:["2@",null,null,"4$",".>",",<"],4:["3#",null,null,"5%","pP",
+".>"],5:["4$",null,null,"6^","yY","pP"],6:["5%",null,null,"7&","fF","yY"],7:["6^",null,null,"8*","gG","fF"],8:["7&",null,null,"9(","cC","gG"],9:["8*",null,null,"0)","rR","cC"],":":[null,"aA","oO","qQ",null,null],";":[null,"aA","oO","qQ",null,null],"<":"'\",2@,3#,.>,oO,aA".split(","),"=":["/?","]}",null,"\\|",null,"-_"],">":",< 3# 4$ pP eE oO".split(" "),"?":"lL,[{,]},=+,-_,sS".split(","),"@":["1!",null,null,"3#",",<","'\""],A:[null,"'\"",",<","oO",";:",null],B:["xX","dD","hH","mM",null,null],C:"gG,8*,9(,rR,tT,hH".split(","),
+D:"iI,fF,gG,hH,bB,xX".split(","),E:"oO,.>,pP,uU,jJ,qQ".split(","),F:"yY,6^,7&,gG,dD,iI".split(","),G:"fF,7&,8*,cC,hH,dD".split(","),H:"dD,gG,cC,tT,mM,bB".split(","),I:"uU,yY,fF,dD,xX,kK".split(","),J:["qQ","eE","uU","kK",null,null],K:["jJ","uU","iI","xX",null,null],L:"rR,0),[{,/?,sS,nN".split(","),M:["bB","hH","tT","wW",null,null],N:"tT,rR,lL,sS,vV,wW".split(","),O:"aA ,< .> eE qQ ;:".split(" "),P:".>,4$,5%,yY,uU,eE".split(","),Q:[";:","oO","eE","jJ",null,null],R:"cC,9(,0),lL,nN,tT".split(","),S:"nN,lL,/?,-_,zZ,vV".split(","),
+T:"hH,cC,rR,nN,wW,mM".split(","),U:"eE,pP,yY,iI,kK,jJ".split(","),V:["wW","nN","sS","zZ",null,null],W:["mM","tT","nN","vV",null,null],X:["kK","iI","dD","bB",null,null],Y:"pP,5%,6^,fF,iI,uU".split(","),Z:["vV","sS","-_",null,null,null],"[":["0)",null,null,"]}","/?","lL"],"\\":["=+",null,null,null,null,null],"]":["[{",null,null,null,"=+","/?"],"^":["5%",null,null,"7&","fF","yY"],_:["sS","/?","=+",null,null,"zZ"],"`":[null,null,null,"1!",null,null],a:[null,"'\"",",<","oO",";:",null],b:["xX","dD","hH",
+"mM",null,null],c:"gG,8*,9(,rR,tT,hH".split(","),d:"iI,fF,gG,hH,bB,xX".split(","),e:"oO,.>,pP,uU,jJ,qQ".split(","),f:"yY,6^,7&,gG,dD,iI".split(","),g:"fF,7&,8*,cC,hH,dD".split(","),h:"dD,gG,cC,tT,mM,bB".split(","),i:"uU,yY,fF,dD,xX,kK".split(","),j:["qQ","eE","uU","kK",null,null],k:["jJ","uU","iI","xX",null,null],l:"rR,0),[{,/?,sS,nN".split(","),m:["bB","hH","tT","wW",null,null],n:"tT,rR,lL,sS,vV,wW".split(","),o:"aA ,< .> eE qQ ;:".split(" "),p:".>,4$,5%,yY,uU,eE".split(","),q:[";:","oO","eE","jJ",
+null,null],r:"cC,9(,0),lL,nN,tT".split(","),s:"nN,lL,/?,-_,zZ,vV".split(","),t:"hH,cC,rR,nN,wW,mM".split(","),u:"eE,pP,yY,iI,kK,jJ".split(","),v:["wW","nN","sS","zZ",null,null],w:["mM","tT","nN","vV",null,null],x:["kK","iI","dD","bB",null,null],y:"pP,5%,6^,fF,iI,uU".split(","),z:["vV","sS","-_",null,null,null],"{":["0)",null,null,"]}","/?","lL"],"|":["=+",null,null,null,null,null],"}":["[{",null,null,null,"=+","/?"],"~":[null,null,null,"1!",null,null]},keypad:F,mac_keypad:{"*":["/",null,null,null,
+null,null,"-","9"],"+":["6","9","-",null,null,null,null,"3"],"-":["9","/","*",null,null,null,"+","6"],".":["0","2","3",null,null,null,null,null],"/":["=",null,null,null,"*","-","9","8"],"0":[null,"1","2","3",".",null,null,null],1:[null,null,"4","5","2","0",null,null],2:["1","4","5","6","3",".","0",null],3:["2","5","6","+",null,null,".","0"],4:[null,null,"7","8","5","2","1",null],5:"4,7,8,9,6,3,2,1".split(","),6:["5","8","9","-","+",null,"3","2"],7:[null,null,null,"=","8","5","4",null],8:["7",null,
+"=","/","9","6","5","4"],9:"8,=,/,*,-,+,6,5".split(","),"=":[null,null,null,null,"/","9","8","7"]}};t=function(b){var a,d,c,e,f;a=0;for(c in b)f=b[c],a+=function(){var a,b,c;c=[];a=0;for(b=f.length;a<b;a++)(e=f[a])&&c.push(e);return c}().length;return a/=function(){var a;a=[];for(d in b)a.push(d);return a}().length};oa=t(E);qa=t(F);na=function(){var b;b=[];for(w in E)b.push(w);return b}().length;pa=function(){var b;b=[];for(w in F)b.push(w);return b}().length;H=function(){return(new Date).getTime()};
+t=function(b,a){var d,c;null==a&&(a=[]);c=H();d=Q(b,ra.concat([r("user_inputs",q(a.map(function(a){return a.toLowerCase()})))]));d=ia(b,d);d.calc_time=H()-c;return d};"undefined"!==typeof window&&null!==window?(window.zxcvbn=t,"function"===typeof window.zxcvbn_load_hook&&window.zxcvbn_load_hook()):"undefined"!==typeof exports&&null!==exports&&(exports.zxcvbn=t)})();
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 11e9593d74a..b2efa7c37f9 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -282,7 +282,7 @@ $(document).ready(function () {
 	});
 
 	$('#pass2').strengthify({
-		zxcvbn: OC.linkTo('3rdparty', 'zxcvbn/js/zxcvbn.js'),
+		zxcvbn: OC.linkTo('core','vendor/zxcvbn/zxcvbn.js'),
 		titles: [
 			t('core', 'Very weak password'),
 			t('core', 'Weak password'),
-- 
GitLab


From e49b9022a16d3451b93ee93eef4ffad6505524b7 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 23:19:11 +0100
Subject: [PATCH 339/616] bower snapjs

---
 .scrutinizer.yml                       |   3 +-
 3rdparty                               |   2 +-
 bower.json                             |   5 +-
 core/vendor/.gitignore                 |  15 +
 core/vendor/snapjs/dist/latest/snap.js | 785 +++++++++++++++++++++++++
 lib/base.php                           |   2 +-
 6 files changed, 806 insertions(+), 6 deletions(-)
 create mode 100644 core/vendor/snapjs/dist/latest/snap.js

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 94ed30e18bb..2a555ad28f6 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -6,7 +6,7 @@ filter:
         - 'core/l10n/*'
         - 'apps/*/l10n/*'
         - 'lib/l10n/*'
-         - 'core/vendor/*'
+        - 'core/vendor/*'
         - 'core/js/tests/lib/*.js'
         - 'core/js/tests/specs/*.js'
         - 'core/js/jquery-showpassword.js'
@@ -14,7 +14,6 @@ filter:
         - 'core/js/jquery-ui-1.10.0.custom.js'
         - 'core/js/placeholders.js'
         - 'core/js/jquery.multiselect.js'
-        - 'core/js/snap.js'
 
 
 imports:
diff --git a/3rdparty b/3rdparty
index 8e3d65c9d1e..b81d132702a 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 8e3d65c9d1e21c04ce62db9d5531764d91b76f94
+Subproject commit b81d132702a2f7983919b3465e02ba365fd7b6cb
diff --git a/bower.json b/bower.json
index cb173d5c63a..b55ce84619b 100644
--- a/bower.json
+++ b/bower.json
@@ -18,7 +18,8 @@
     "jquery": "~1.10.0",
     "moment": "~2.8.3",
     "select2": "3.4.8",
-    "underscore": "1.6.0",
-    "zxcvbn": "*"
+    "zxcvbn": "*",
+    "snapjs": "2.0.0-rc1",
+    "underscore": "1.6.0"
   }
 }
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index e355913f030..aba7d5874a9 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -1,5 +1,12 @@
 test/
 src/
+.bower.json
+.gitignore
+.jshintrc
+.travis.yml
+Gemfile
+gruntfile.js
+README.md
 
 # underscore
 underscore/**
@@ -46,3 +53,11 @@ select2/**
 zxcvbn/**
 !zxcvbn/zxcvbn.js
 !zxcvbn/LICENSE.txt
+
+# snapjs
+snapjs/demo
+snapjs/dist/2.0.0-rc1
+snapjs/dist/latest/snap.css
+snapjs/dist/latest/snap.min.js
+snapjs/scripts
+snapjs/*.json
diff --git a/core/vendor/snapjs/dist/latest/snap.js b/core/vendor/snapjs/dist/latest/snap.js
new file mode 100644
index 00000000000..a0274138de0
--- /dev/null
+++ b/core/vendor/snapjs/dist/latest/snap.js
@@ -0,0 +1,785 @@
+/*! Snap.js v2.0.0-rc1 */
+(function(win, doc) {
+
+    'use strict';
+
+    // Our export
+    var Namespace = 'Snap';
+
+    // Our main toolbelt
+    var utils = {
+
+        /**
+         * Deeply extends two objects
+         * @param  {Object} destination The destination object
+         * @param  {Object} source      The custom options to extend destination by
+         * @return {Object}             The desination object
+         */
+        extend: function(destination, source) {
+            var property;
+            for (property in source) {
+                if (source[property] && source[property].constructor && source[property].constructor === Object) {
+                    destination[property] = destination[property] || {};
+                    utils.extend(destination[property], source[property]);
+                } else {
+                    destination[property] = source[property];
+                }
+            }
+            return destination;
+        }
+    };
+
+    /**
+     * Our Snap global that initializes our instance
+     * @param {Object} opts The custom Snap.js options
+     */
+    var Core = function( opts ) {
+
+        var self = this;
+
+        /**
+         * Our default settings for a Snap instance
+         * @type {Object}
+         */
+        var settings = self.settings = {
+            element: null,
+            dragger: null,
+            disable: 'none',
+            addBodyClasses: true,
+            hyperextensible: true,
+            resistance: 0.5,
+            flickThreshold: 50,
+            transitionSpeed: 0.3,
+            easing: 'ease',
+            maxPosition: 266,
+            minPosition: -266,
+            tapToClose: true,
+            touchToDrag: true,
+            clickToDrag: true,
+            slideIntent: 40, // degrees
+            minDragDistance: 5
+        };
+
+        /**
+         * Stores internally global data
+         * @type {Object}
+         */
+        var cache = self.cache = {
+            isDragging: false,
+            simpleStates: {
+                opening: null,
+                towards: null,
+                hyperExtending: null,
+                halfway: null,
+                flick: null,
+                translation: {
+                    absolute: 0,
+                    relative: 0,
+                    sinceDirectionChange: 0,
+                    percentage: 0
+                }
+            }
+        };
+
+        var eventList = self.eventList = {};
+
+        utils.extend(utils, {
+
+            /**
+             * Determines if we are interacting with a touch device
+             * @type {Boolean}
+             */
+            hasTouch: ('ontouchstart' in doc.documentElement || win.navigator.msPointerEnabled),
+
+            /**
+             * Returns the appropriate event type based on whether we are a touch device or not
+             * @param  {String} action The "action" event you're looking for: up, down, move, out
+             * @return {String}        The browsers supported event name
+             */
+            eventType: function(action) {
+                var eventTypes = {
+                    down: (utils.hasTouch ? 'touchstart' : settings.clickToDrag ? 'mousedown' : ''),
+                    move: (utils.hasTouch ? 'touchmove' : settings.clickToDrag ? 'mousemove' : ''),
+                    up: (utils.hasTouch ? 'touchend' : settings.clickToDrag ? 'mouseup': ''),
+                    out: (utils.hasTouch ? 'touchcancel' : settings.clickToDrag ? 'mouseout' : '')
+                };
+                return eventTypes[action];
+            },
+
+            /**
+             * Returns the correct "cursor" position on both browser and mobile
+             * @param  {String} t The coordinate to retrieve, either "X" or "Y"
+             * @param  {Object} e The event object being triggered
+             * @return {Number}   The desired coordiante for the events interaction
+             */
+            page: function(t, e){
+                return (utils.hasTouch && e.touches.length && e.touches[0]) ? e.touches[0]['page'+t] : e['page'+t];
+            },
+
+
+            klass: {
+
+                /**
+                 * Checks if an element has a class name
+                 * @param  {Object}  el   The element to check
+                 * @param  {String}  name The class name to search for
+                 * @return {Boolean}      Returns true if the class exists
+                 */
+                has: function(el, name){
+                    return (el.className).indexOf(name) !== -1;
+                },
+
+                /**
+                 * Adds a class name to an element
+                 * @param  {Object}  el   The element to add to
+                 * @param  {String}  name The class name to add
+                 */
+                add: function(el, name){
+                    if(!utils.klass.has(el, name) && settings.addBodyClasses){
+                        el.className += " "+name;
+                    }
+                },
+
+                /**
+                 * Removes a class name
+                 * @param  {Object} el   The element to remove from
+                 * @param  {String} name The class name to remove
+                 */
+                remove: function(el, name){
+                    if(utils.klass.has(el, name) && settings.addBodyClasses){
+                        el.className = (el.className).replace(name, "").replace(/^\s+|\s+$/g, '');
+                    }
+                }
+            },
+
+            /**
+             * Dispatch a custom Snap.js event
+             * @param  {String} type The event name
+             */
+            dispatchEvent: function(type) {
+                if( typeof eventList[type] === 'function') {
+                    return eventList[type].apply();
+                }
+            },
+
+            /**
+             * Determines the browsers vendor prefix for CSS3
+             * @return {String} The browsers vendor prefix
+             */
+            vendor: function(){
+                var tmp = doc.createElement("div"),
+                    prefixes = 'webkit Moz O ms'.split(' '),
+                    i;
+                for (i in prefixes) {
+                    if (typeof tmp.style[prefixes[i] + 'Transition'] !== 'undefined') {
+                        return prefixes[i];
+                    }
+                }
+            },
+
+            /**
+             * Determines the browsers vendor prefix for transition callback events
+             * @return {String} The event name
+             */
+            transitionCallback: function(){
+                return (cache.vendor==='Moz' || cache.vendor==='ms') ? 'transitionend' : cache.vendor+'TransitionEnd';
+            },
+
+            /**
+             * Determines if the users browser supports CSS3 transformations
+             * @return {[type]} [description]
+             */
+            canTransform: function(){
+                return typeof settings.element.style[cache.vendor+'Transform'] !== 'undefined';
+            },
+
+            /**
+             * Determines an angle between two points
+             * @param  {Number} x The X coordinate
+             * @param  {Number} y The Y coordinate
+             * @return {Number}   The number of degrees between the two points
+             */
+            angleOfDrag: function(x, y) {
+                var degrees, theta;
+                // Calc Theta
+                theta = Math.atan2(-(cache.startDragY - y), (cache.startDragX - x));
+                if (theta < 0) {
+                    theta += 2 * Math.PI;
+                }
+                // Calc Degrees
+                degrees = Math.floor(theta * (180 / Math.PI) - 180);
+                if (degrees < 0 && degrees > -180) {
+                    degrees = 360 - Math.abs(degrees);
+                }
+                return Math.abs(degrees);
+            },
+
+
+            events: {
+
+                /**
+                 * Adds an event to an element
+                 * @param {Object} element   Element to add event to
+                 * @param {String} eventName The event name
+                 * @param {Function} func      Callback function
+                 */
+                addEvent: function addEvent(element, eventName, func) {
+                    if (element.addEventListener) {
+                        return element.addEventListener(eventName, func, false);
+                    } else if (element.attachEvent) {
+                        return element.attachEvent("on" + eventName, func);
+                    }
+                },
+
+                /**
+                 * Removes an event to an element
+                 * @param {Object} element   Element to remove event from
+                 * @param {String} eventName The event name
+                 * @param {Function} func      Callback function
+                 */
+                removeEvent: function addEvent(element, eventName, func) {
+                    if (element.addEventListener) {
+                        return element.removeEventListener(eventName, func, false);
+                    } else if (element.attachEvent) {
+                        return element.detachEvent("on" + eventName, func);
+                    }
+                },
+
+                /**
+                 * Prevents the default event
+                 * @param  {Object} e The event object
+                 */
+                prevent: function(e) {
+                    if (e.preventDefault) {
+                        e.preventDefault();
+                    } else {
+                        e.returnValue = false;
+                    }
+                }
+            },
+
+            /**
+             * Searches the parent element until a specified attribute has been matched
+             * @param  {Object} el   The element to search from
+             * @param  {String} attr The attribute to search for
+             * @return {Object|null}      Returns a matched element if it exists, else, null
+             */
+            parentUntil: function(el, attr) {
+                var isStr = typeof attr === 'string';
+                while (el.parentNode) {
+                    if (isStr && el.getAttribute && el.getAttribute(attr)){
+                        return el;
+                    } else if(!isStr && el === attr){
+                        return el;
+                    }
+                    el = el.parentNode;
+                }
+                return null;
+            }
+        });
+
+
+        var action = self.action = {
+
+            /**
+             * Handles translating the elements position
+             * @type {Object}
+             */
+            translate: {
+                get: {
+
+                    /**
+                     * Returns the amount an element is translated
+                     * @param  {Number} index The index desired from the CSS3 values of translate3d
+                     * @return {Number}       The amount of pixels an element is translated
+                     */
+                    matrix: function(index) {
+
+                        if( !cache.canTransform ){
+                            return parseInt(settings.element.style.left, 10);
+                        } else {
+                            var matrix = win.getComputedStyle(settings.element)[cache.vendor+'Transform'].match(/\((.*)\)/),
+                                ieOffset = 8;
+                            if (matrix) {
+                                matrix = matrix[1].split(',');
+
+                                // Internet Explorer likes to give us 16 fucking values
+                                if(matrix.length===16){
+                                    index+=ieOffset;
+                                }
+                                return parseInt(matrix[index], 10);
+                            }
+                            return 0;
+                        }
+                    }
+                },
+
+                /**
+                 * Called when the element has finished transitioning
+                 */
+                easeCallback: function(fn){
+                    settings.element.style[cache.vendor+'Transition'] = '';
+                    cache.translation = action.translate.get.matrix(4);
+                    cache.easing = false;
+
+                    if(cache.easingTo===0){
+                        utils.klass.remove(doc.body, 'snapjs-right');
+                        utils.klass.remove(doc.body, 'snapjs-left');
+                    }
+
+                    if( cache.once ){
+                        cache.once.call(self, self.state());
+                        delete cache.once;
+                    }
+
+                    utils.dispatchEvent('animated');
+                    utils.events.removeEvent(settings.element, utils.transitionCallback(), action.translate.easeCallback);
+
+                },
+
+                /**
+                 * Animates the pane by the specified amount of pixels
+                 * @param  {Number} n The amount of pixels to move the pane
+                 */
+                easeTo: function(n, cb) {
+
+                    if( !cache.canTransform ){
+                        cache.translation = n;
+                        action.translate.x(n);
+                    } else {
+                        cache.easing = true;
+                        cache.easingTo = n;
+
+                        settings.element.style[cache.vendor+'Transition'] = 'all ' + settings.transitionSpeed + 's ' + settings.easing;
+
+                        cache.once = cb;
+
+                        utils.events.addEvent(settings.element, utils.transitionCallback(), action.translate.easeCallback);
+                        action.translate.x(n);
+                    }
+                    if(n===0){
+                        settings.element.style[cache.vendor+'Transform'] = '';
+                    }
+                },
+
+                /**
+                 * Immediately translates the element on its X axis
+                 * @param  {Number} n Amount of pixels to translate
+                 */
+                x: function(n) {
+                    if( (settings.disable==='left' && n>0) ||
+                        (settings.disable==='right' && n<0)
+                    ){ return; }
+
+                    if( !settings.hyperextensible ){
+                        if( n===settings.maxPosition || n>settings.maxPosition ){
+                            n=settings.maxPosition;
+                        } else if( n===settings.minPosition || n<settings.minPosition ){
+                            n=settings.minPosition;
+                        }
+                    }
+
+                    n = parseInt(n, 10);
+                    if(isNaN(n)){
+                        n = 0;
+                    }
+
+                    if( cache.canTransform ){
+                        var theTranslate = 'translate3d(' + n + 'px, 0,0)';
+                        settings.element.style[cache.vendor+'Transform'] = theTranslate;
+                    } else {
+                        settings.element.style.width = (win.innerWidth || doc.documentElement.clientWidth)+'px';
+
+                        settings.element.style.left = n+'px';
+                        settings.element.style.right = '';
+                    }
+                }
+            },
+
+            /**
+             * Handles all the events that interface with dragging
+             * @type {Object}
+             */
+            drag: {
+
+                /**
+                 * Begins listening for drag events on our element
+                 */
+                listen: function() {
+                    cache.translation = 0;
+                    cache.easing = false;
+                    utils.events.addEvent(self.settings.element, utils.eventType('down'), action.drag.startDrag);
+                    utils.events.addEvent(self.settings.element, utils.eventType('move'), action.drag.dragging);
+                    utils.events.addEvent(self.settings.element, utils.eventType('up'), action.drag.endDrag);
+                },
+
+                /**
+                 * Stops listening for drag events on our element
+                 */
+                stopListening: function() {
+                    utils.events.removeEvent(settings.element, utils.eventType('down'), action.drag.startDrag);
+                    utils.events.removeEvent(settings.element, utils.eventType('move'), action.drag.dragging);
+                    utils.events.removeEvent(settings.element, utils.eventType('up'), action.drag.endDrag);
+                },
+
+                /**
+                 * Fired immediately when the user begins to drag the content pane
+                 * @param  {Object} e Event object
+                 */
+                startDrag: function(e) {
+                    // No drag on ignored elements
+                    var target = e.target ? e.target : e.srcElement,
+                        ignoreParent = utils.parentUntil(target, 'data-snap-ignore');
+
+                    if (ignoreParent) {
+                        utils.dispatchEvent('ignore');
+                        return;
+                    }
+
+
+                    if(settings.dragger){
+                        var dragParent = utils.parentUntil(target, settings.dragger);
+
+                        // Only use dragger if we're in a closed state
+                        if( !dragParent &&
+                            (cache.translation !== settings.minPosition &&
+                            cache.translation !== settings.maxPosition
+                        )){
+                            return;
+                        }
+                    }
+
+                    utils.dispatchEvent('start');
+                    settings.element.style[cache.vendor+'Transition'] = '';
+                    cache.isDragging = true;
+
+                    cache.intentChecked = false;
+                    cache.startDragX = utils.page('X', e);
+                    cache.startDragY = utils.page('Y', e);
+                    cache.dragWatchers = {
+                        current: 0,
+                        last: 0,
+                        hold: 0,
+                        state: ''
+                    };
+                    cache.simpleStates = {
+                        opening: null,
+                        towards: null,
+                        hyperExtending: null,
+                        halfway: null,
+                        flick: null,
+                        translation: {
+                            absolute: 0,
+                            relative: 0,
+                            sinceDirectionChange: 0,
+                            percentage: 0
+                        }
+                    };
+                },
+
+                /**
+                 * Fired while the user is moving the content pane
+                 * @param  {Object} e Event object
+                 */
+                dragging: function(e) {
+
+                    if (cache.isDragging && settings.touchToDrag) {
+
+                        var thePageX = utils.page('X', e),
+                            thePageY = utils.page('Y', e),
+                            translated = cache.translation,
+                            absoluteTranslation = action.translate.get.matrix(4),
+                            whileDragX = thePageX - cache.startDragX,
+                            openingLeft = absoluteTranslation > 0,
+                            translateTo = whileDragX,
+                            diff;
+
+                        // Shown no intent already
+                        if((cache.intentChecked && !cache.hasIntent)){
+                            return;
+                        }
+
+                        if(settings.addBodyClasses){
+                            if((absoluteTranslation)>0){
+                                utils.klass.add(doc.body, 'snapjs-left');
+                                utils.klass.remove(doc.body, 'snapjs-right');
+                            } else if((absoluteTranslation)<0){
+                                utils.klass.add(doc.body, 'snapjs-right');
+                                utils.klass.remove(doc.body, 'snapjs-left');
+                            }
+                        }
+
+                        if (cache.hasIntent === false || cache.hasIntent === null) {
+
+                            var deg = utils.angleOfDrag(thePageX, thePageY),
+                                inRightRange = (deg >= 0 && deg <= settings.slideIntent) || (deg <= 360 && deg > (360 - settings.slideIntent)),
+                                inLeftRange = (deg >= 180 && deg <= (180 + settings.slideIntent)) || (deg <= 180 && deg >= (180 - settings.slideIntent));
+                            if (!inLeftRange && !inRightRange) {
+                                cache.hasIntent = false;
+                            } else {
+                                cache.hasIntent = true;
+                            }
+                            cache.intentChecked = true;
+                        }
+
+                        if (
+                            (settings.minDragDistance>=Math.abs(thePageX-cache.startDragX)) || // Has user met minimum drag distance?
+                            (cache.hasIntent === false)
+                        ) {
+                            return;
+                        }
+
+                        utils.events.prevent(e);
+                        utils.dispatchEvent('drag');
+
+                        cache.dragWatchers.current = thePageX;
+
+                        // Determine which direction we are going
+                        if (cache.dragWatchers.last > thePageX) {
+                            if (cache.dragWatchers.state !== 'left') {
+                                cache.dragWatchers.state = 'left';
+                                cache.dragWatchers.hold = thePageX;
+                            }
+                            cache.dragWatchers.last = thePageX;
+                        } else if (cache.dragWatchers.last < thePageX) {
+                            if (cache.dragWatchers.state !== 'right') {
+                                cache.dragWatchers.state = 'right';
+                                cache.dragWatchers.hold = thePageX;
+                            }
+                            cache.dragWatchers.last = thePageX;
+                        }
+                        if (openingLeft) {
+                            // Pulling too far to the right
+                            if (settings.maxPosition < absoluteTranslation) {
+                                diff = (absoluteTranslation - settings.maxPosition) * settings.resistance;
+                                translateTo = whileDragX - diff;
+                            }
+                            cache.simpleStates = {
+                                opening: 'left',
+                                towards: cache.dragWatchers.state,
+                                hyperExtending: settings.maxPosition < absoluteTranslation,
+                                halfway: absoluteTranslation > (settings.maxPosition / 2),
+                                flick: Math.abs(cache.dragWatchers.current - cache.dragWatchers.hold) > settings.flickThreshold,
+                                translation: {
+                                    absolute: absoluteTranslation,
+                                    relative: whileDragX,
+                                    sinceDirectionChange: (cache.dragWatchers.current - cache.dragWatchers.hold),
+                                    percentage: (absoluteTranslation/settings.maxPosition)*100
+                                }
+                            };
+                        } else {
+                            // Pulling too far to the left
+                            if (settings.minPosition > absoluteTranslation) {
+                                diff = (absoluteTranslation - settings.minPosition) * settings.resistance;
+                                translateTo = whileDragX - diff;
+                            }
+                            cache.simpleStates = {
+                                opening: 'right',
+                                towards: cache.dragWatchers.state,
+                                hyperExtending: settings.minPosition > absoluteTranslation,
+                                halfway: absoluteTranslation < (settings.minPosition / 2),
+                                flick: Math.abs(cache.dragWatchers.current - cache.dragWatchers.hold) > settings.flickThreshold,
+                                translation: {
+                                    absolute: absoluteTranslation,
+                                    relative: whileDragX,
+                                    sinceDirectionChange: (cache.dragWatchers.current - cache.dragWatchers.hold),
+                                    percentage: (absoluteTranslation/settings.minPosition)*100
+                                }
+                            };
+                        }
+                        action.translate.x(translateTo + translated);
+                    }
+                },
+
+                /**
+                 * Fired when the user releases the content pane
+                 * @param  {Object} e Event object
+                 */
+                endDrag: function(e) {
+                    if (cache.isDragging) {
+                        utils.dispatchEvent('end');
+                        var translated = action.translate.get.matrix(4);
+
+                        // Tap Close
+                        if (cache.dragWatchers.current === 0 && translated !== 0 && settings.tapToClose) {
+                            utils.dispatchEvent('close');
+                            utils.events.prevent(e);
+                            action.translate.easeTo(0);
+                            cache.isDragging = false;
+                            cache.startDragX = 0;
+                            return;
+                        }
+
+                        // Revealing Left
+                        if (cache.simpleStates.opening === 'left') {
+                            // Halfway, Flicking, or Too Far Out
+                            if ((cache.simpleStates.halfway || cache.simpleStates.hyperExtending || cache.simpleStates.flick)) {
+                                if (cache.simpleStates.flick && cache.simpleStates.towards === 'left') { // Flicking Closed
+                                    action.translate.easeTo(0);
+                                } else if (
+                                    (cache.simpleStates.flick && cache.simpleStates.towards === 'right') || // Flicking Open OR
+                                    (cache.simpleStates.halfway || cache.simpleStates.hyperExtending) // At least halfway open OR hyperextending
+                                ) {
+                                    action.translate.easeTo(settings.maxPosition); // Open Left
+                                }
+                            } else {
+                                action.translate.easeTo(0); // Close Left
+                            }
+                            // Revealing Right
+                        } else if (cache.simpleStates.opening === 'right') {
+                            // Halfway, Flicking, or Too Far Out
+                            if ((cache.simpleStates.halfway || cache.simpleStates.hyperExtending || cache.simpleStates.flick)) {
+                                if (cache.simpleStates.flick && cache.simpleStates.towards === 'right') { // Flicking Closed
+                                    action.translate.easeTo(0);
+                                } else if (
+                                    (cache.simpleStates.flick && cache.simpleStates.towards === 'left') || // Flicking Open OR
+                                    (cache.simpleStates.halfway || cache.simpleStates.hyperExtending) // At least halfway open OR hyperextending
+                                ) {
+                                    action.translate.easeTo(settings.minPosition); // Open Right
+                                }
+                            } else {
+                                action.translate.easeTo(0); // Close Right
+                            }
+                        }
+                        cache.isDragging = false;
+                        cache.startDragX = utils.page('X', e);
+                    }
+                }
+            }
+        };
+
+
+        // Initialize
+        if (opts.element) {
+            utils.extend(settings, opts);
+            cache.vendor = utils.vendor();
+            cache.canTransform = utils.canTransform();
+            action.drag.listen();
+        }
+    };
+
+
+    utils.extend(Core.prototype, {
+
+        /**
+         * Opens the specified side menu
+         * @param  {String} side Must be "left" or "right"
+         */
+        open: function(side, cb) {
+            utils.dispatchEvent('open');
+            utils.klass.remove(doc.body, 'snapjs-expand-left');
+            utils.klass.remove(doc.body, 'snapjs-expand-right');
+
+            if (side === 'left') {
+                this.cache.simpleStates.opening = 'left';
+                this.cache.simpleStates.towards = 'right';
+                utils.klass.add(doc.body, 'snapjs-left');
+                utils.klass.remove(doc.body, 'snapjs-right');
+                this.action.translate.easeTo(this.settings.maxPosition, cb);
+            } else if (side === 'right') {
+                this.cache.simpleStates.opening = 'right';
+                this.cache.simpleStates.towards = 'left';
+                utils.klass.remove(doc.body, 'snapjs-left');
+                utils.klass.add(doc.body, 'snapjs-right');
+                this.action.translate.easeTo(this.settings.minPosition, cb);
+            }
+        },
+
+        /**
+         * Closes the pane
+         */
+        close: function(cb) {
+            utils.dispatchEvent('close');
+            this.action.translate.easeTo(0, cb);
+        },
+
+        /**
+         * Hides the content pane completely allowing for full menu visibility
+         * @param  {String} side Must be "left" or "right"
+         */
+        expand: function(side){
+            var to = win.innerWidth || doc.documentElement.clientWidth;
+
+            if(side==='left'){
+                utils.dispatchEvent('expandLeft');
+                utils.klass.add(doc.body, 'snapjs-expand-left');
+                utils.klass.remove(doc.body, 'snapjs-expand-right');
+            } else {
+                utils.dispatchEvent('expandRight');
+                utils.klass.add(doc.body, 'snapjs-expand-right');
+                utils.klass.remove(doc.body, 'snapjs-expand-left');
+                to *= -1;
+            }
+            this.action.translate.easeTo(to);
+        },
+
+        /**
+         * Listen in to custom Snap events
+         * @param  {String}   evt The snap event name
+         * @param  {Function} fn  Callback function
+         * @return {Object}       Snap instance
+         */
+        on: function(evt, fn) {
+            this.eventList[evt] = fn;
+            return this;
+        },
+
+        /**
+         * Stops listening to custom Snap events
+         * @param  {String} evt The snap event name
+         */
+        off: function(evt) {
+            if (this.eventList[evt]) {
+                this.eventList[evt] = false;
+            }
+        },
+
+        /**
+         * Enables Snap.js events
+         */
+        enable: function() {
+            utils.dispatchEvent('enable');
+            this.action.drag.listen();
+        },
+
+        /**
+         * Disables Snap.js events
+         */
+        disable: function() {
+            utils.dispatchEvent('disable');
+            this.action.drag.stopListening();
+        },
+
+        /**
+         * Updates the instances settings
+         * @param  {Object} opts The Snap options to set
+         */
+        settings: function(opts){
+            utils.extend(this.settings, opts);
+        },
+
+        /**
+         * Returns information about the state of the content pane
+         * @return {Object} Information regarding the state of the pane
+         */
+        state: function() {
+            var state,
+                fromLeft = this.action.translate.get.matrix(4);
+            if (fromLeft === this.settings.maxPosition) {
+                state = 'left';
+            } else if (fromLeft === this.settings.minPosition) {
+                state = 'right';
+            } else {
+                state = 'closed';
+            }
+            return {
+                state: state,
+                info: this.cache.simpleStates
+            };
+        }
+    });
+
+    // Assign to the global namespace
+    this[Namespace] = Core;
+
+}).call(this, window, document);
diff --git a/lib/base.php b/lib/base.php
index 0943286de93..78452877d19 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -347,7 +347,7 @@ class OC {
 		OC_Util::addScript('search', 'result');
 		OC_Util::addScript("oc-requesttoken");
 		OC_Util::addScript("apps");
-		OC_Util::addScript("snap");
+		OC_Util::addVendorScript('snapjs/dist/latest/snap');
 		OC_Util::addVendorScript('moment/min/moment-with-locales');
 
 		// avatars
-- 
GitLab


From 764f51c9763ee416b5e80a007516931c88ae2a87 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 6 Nov 2014 12:09:48 +0100
Subject: [PATCH 340/616] add missing alt attribute to spinner

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

diff --git a/core/templates/login.php b/core/templates/login.php
index ad9db14bac1..425c3db75c8 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -14,7 +14,8 @@
 			</div>
 		<?php endif; ?>
 		<p id="message" class="hidden">
-			<img class="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
+			<img class="float-spinner" alt=""
+				src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>" />
 			<span id="messageText"></span>
 			<!-- the following div ensures that the spinner is always inside the #message div -->
 			<div style="clear: both;"></div>
-- 
GitLab


From 73569b29bc3984e1e6df102faccb3c02c20573b3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 5 Nov 2014 22:58:48 +0100
Subject: [PATCH 341/616] md5 now handled via bower

---
 3rdparty                          |   2 +-
 bower.json                        |   1 +
 core/vendor/.gitignore            |  11 ++
 core/vendor/blueimp-md5/js/md5.js | 274 ++++++++++++++++++++++++++++++
 lib/base.php                      |   2 +-
 5 files changed, 288 insertions(+), 2 deletions(-)
 create mode 100644 core/vendor/blueimp-md5/js/md5.js

diff --git a/3rdparty b/3rdparty
index b81d132702a..4966ff082e7 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit b81d132702a2f7983919b3465e02ba365fd7b6cb
+Subproject commit 4966ff082e7a51c1109b8a665c18b2d72ba6960a
diff --git a/bower.json b/bower.json
index b55ce84619b..406878ca713 100644
--- a/bower.json
+++ b/bower.json
@@ -13,6 +13,7 @@
     "tests"
   ],
   "dependencies": {
+    "blueimp-md5": "1.0.1",
     "handlebars": "1.3.0",
     "jcrop": "~0.9.12",
     "jquery": "~1.10.0",
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index aba7d5874a9..c2c71a145ba 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -13,6 +13,17 @@ underscore/**
 !underscore/underscore.js
 !underscore/LICENSE
 
+# blueimp-md5
+blueimp-md5/css
+blueimp-md5/js/*
+!blueimp-md5/js/md5.js
+blueimp-md5/.*
+blueimp-md5/*.json
+blueimp-md5/index.html
+blueimp-md5/Makefile
+blueimp-md5/README.md
+blueimp-md5/package.json
+
 # momentjs - ignore all files except the two listed below
 moment/benchmarks
 moment/locale
diff --git a/core/vendor/blueimp-md5/js/md5.js b/core/vendor/blueimp-md5/js/md5.js
new file mode 100644
index 00000000000..f92ba37a4de
--- /dev/null
+++ b/core/vendor/blueimp-md5/js/md5.js
@@ -0,0 +1,274 @@
+/*
+ * JavaScript MD5 1.0.1
+ * https://github.com/blueimp/JavaScript-MD5
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ * 
+ * Based on
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*jslint bitwise: true */
+/*global unescape, define */
+
+(function ($) {
+    'use strict';
+
+    /*
+    * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+    * to work around bugs in some JS interpreters.
+    */
+    function safe_add(x, y) {
+        var lsw = (x & 0xFFFF) + (y & 0xFFFF),
+            msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+        return (msw << 16) | (lsw & 0xFFFF);
+    }
+
+    /*
+    * Bitwise rotate a 32-bit number to the left.
+    */
+    function bit_rol(num, cnt) {
+        return (num << cnt) | (num >>> (32 - cnt));
+    }
+
+    /*
+    * These functions implement the four basic operations the algorithm uses.
+    */
+    function md5_cmn(q, a, b, x, s, t) {
+        return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b);
+    }
+    function md5_ff(a, b, c, d, x, s, t) {
+        return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+    }
+    function md5_gg(a, b, c, d, x, s, t) {
+        return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+    }
+    function md5_hh(a, b, c, d, x, s, t) {
+        return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+    }
+    function md5_ii(a, b, c, d, x, s, t) {
+        return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+    }
+
+    /*
+    * Calculate the MD5 of an array of little-endian words, and a bit length.
+    */
+    function binl_md5(x, len) {
+        /* append padding */
+        x[len >> 5] |= 0x80 << (len % 32);
+        x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+        var i, olda, oldb, oldc, oldd,
+            a =  1732584193,
+            b = -271733879,
+            c = -1732584194,
+            d =  271733878;
+
+        for (i = 0; i < x.length; i += 16) {
+            olda = a;
+            oldb = b;
+            oldc = c;
+            oldd = d;
+
+            a = md5_ff(a, b, c, d, x[i],       7, -680876936);
+            d = md5_ff(d, a, b, c, x[i +  1], 12, -389564586);
+            c = md5_ff(c, d, a, b, x[i +  2], 17,  606105819);
+            b = md5_ff(b, c, d, a, x[i +  3], 22, -1044525330);
+            a = md5_ff(a, b, c, d, x[i +  4],  7, -176418897);
+            d = md5_ff(d, a, b, c, x[i +  5], 12,  1200080426);
+            c = md5_ff(c, d, a, b, x[i +  6], 17, -1473231341);
+            b = md5_ff(b, c, d, a, x[i +  7], 22, -45705983);
+            a = md5_ff(a, b, c, d, x[i +  8],  7,  1770035416);
+            d = md5_ff(d, a, b, c, x[i +  9], 12, -1958414417);
+            c = md5_ff(c, d, a, b, x[i + 10], 17, -42063);
+            b = md5_ff(b, c, d, a, x[i + 11], 22, -1990404162);
+            a = md5_ff(a, b, c, d, x[i + 12],  7,  1804603682);
+            d = md5_ff(d, a, b, c, x[i + 13], 12, -40341101);
+            c = md5_ff(c, d, a, b, x[i + 14], 17, -1502002290);
+            b = md5_ff(b, c, d, a, x[i + 15], 22,  1236535329);
+
+            a = md5_gg(a, b, c, d, x[i +  1],  5, -165796510);
+            d = md5_gg(d, a, b, c, x[i +  6],  9, -1069501632);
+            c = md5_gg(c, d, a, b, x[i + 11], 14,  643717713);
+            b = md5_gg(b, c, d, a, x[i],      20, -373897302);
+            a = md5_gg(a, b, c, d, x[i +  5],  5, -701558691);
+            d = md5_gg(d, a, b, c, x[i + 10],  9,  38016083);
+            c = md5_gg(c, d, a, b, x[i + 15], 14, -660478335);
+            b = md5_gg(b, c, d, a, x[i +  4], 20, -405537848);
+            a = md5_gg(a, b, c, d, x[i +  9],  5,  568446438);
+            d = md5_gg(d, a, b, c, x[i + 14],  9, -1019803690);
+            c = md5_gg(c, d, a, b, x[i +  3], 14, -187363961);
+            b = md5_gg(b, c, d, a, x[i +  8], 20,  1163531501);
+            a = md5_gg(a, b, c, d, x[i + 13],  5, -1444681467);
+            d = md5_gg(d, a, b, c, x[i +  2],  9, -51403784);
+            c = md5_gg(c, d, a, b, x[i +  7], 14,  1735328473);
+            b = md5_gg(b, c, d, a, x[i + 12], 20, -1926607734);
+
+            a = md5_hh(a, b, c, d, x[i +  5],  4, -378558);
+            d = md5_hh(d, a, b, c, x[i +  8], 11, -2022574463);
+            c = md5_hh(c, d, a, b, x[i + 11], 16,  1839030562);
+            b = md5_hh(b, c, d, a, x[i + 14], 23, -35309556);
+            a = md5_hh(a, b, c, d, x[i +  1],  4, -1530992060);
+            d = md5_hh(d, a, b, c, x[i +  4], 11,  1272893353);
+            c = md5_hh(c, d, a, b, x[i +  7], 16, -155497632);
+            b = md5_hh(b, c, d, a, x[i + 10], 23, -1094730640);
+            a = md5_hh(a, b, c, d, x[i + 13],  4,  681279174);
+            d = md5_hh(d, a, b, c, x[i],      11, -358537222);
+            c = md5_hh(c, d, a, b, x[i +  3], 16, -722521979);
+            b = md5_hh(b, c, d, a, x[i +  6], 23,  76029189);
+            a = md5_hh(a, b, c, d, x[i +  9],  4, -640364487);
+            d = md5_hh(d, a, b, c, x[i + 12], 11, -421815835);
+            c = md5_hh(c, d, a, b, x[i + 15], 16,  530742520);
+            b = md5_hh(b, c, d, a, x[i +  2], 23, -995338651);
+
+            a = md5_ii(a, b, c, d, x[i],       6, -198630844);
+            d = md5_ii(d, a, b, c, x[i +  7], 10,  1126891415);
+            c = md5_ii(c, d, a, b, x[i + 14], 15, -1416354905);
+            b = md5_ii(b, c, d, a, x[i +  5], 21, -57434055);
+            a = md5_ii(a, b, c, d, x[i + 12],  6,  1700485571);
+            d = md5_ii(d, a, b, c, x[i +  3], 10, -1894986606);
+            c = md5_ii(c, d, a, b, x[i + 10], 15, -1051523);
+            b = md5_ii(b, c, d, a, x[i +  1], 21, -2054922799);
+            a = md5_ii(a, b, c, d, x[i +  8],  6,  1873313359);
+            d = md5_ii(d, a, b, c, x[i + 15], 10, -30611744);
+            c = md5_ii(c, d, a, b, x[i +  6], 15, -1560198380);
+            b = md5_ii(b, c, d, a, x[i + 13], 21,  1309151649);
+            a = md5_ii(a, b, c, d, x[i +  4],  6, -145523070);
+            d = md5_ii(d, a, b, c, x[i + 11], 10, -1120210379);
+            c = md5_ii(c, d, a, b, x[i +  2], 15,  718787259);
+            b = md5_ii(b, c, d, a, x[i +  9], 21, -343485551);
+
+            a = safe_add(a, olda);
+            b = safe_add(b, oldb);
+            c = safe_add(c, oldc);
+            d = safe_add(d, oldd);
+        }
+        return [a, b, c, d];
+    }
+
+    /*
+    * Convert an array of little-endian words to a string
+    */
+    function binl2rstr(input) {
+        var i,
+            output = '';
+        for (i = 0; i < input.length * 32; i += 8) {
+            output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xFF);
+        }
+        return output;
+    }
+
+    /*
+    * Convert a raw string to an array of little-endian words
+    * Characters >255 have their high-byte silently ignored.
+    */
+    function rstr2binl(input) {
+        var i,
+            output = [];
+        output[(input.length >> 2) - 1] = undefined;
+        for (i = 0; i < output.length; i += 1) {
+            output[i] = 0;
+        }
+        for (i = 0; i < input.length * 8; i += 8) {
+            output[i >> 5] |= (input.charCodeAt(i / 8) & 0xFF) << (i % 32);
+        }
+        return output;
+    }
+
+    /*
+    * Calculate the MD5 of a raw string
+    */
+    function rstr_md5(s) {
+        return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
+    }
+
+    /*
+    * Calculate the HMAC-MD5, of a key and some data (raw strings)
+    */
+    function rstr_hmac_md5(key, data) {
+        var i,
+            bkey = rstr2binl(key),
+            ipad = [],
+            opad = [],
+            hash;
+        ipad[15] = opad[15] = undefined;
+        if (bkey.length > 16) {
+            bkey = binl_md5(bkey, key.length * 8);
+        }
+        for (i = 0; i < 16; i += 1) {
+            ipad[i] = bkey[i] ^ 0x36363636;
+            opad[i] = bkey[i] ^ 0x5C5C5C5C;
+        }
+        hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
+        return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
+    }
+
+    /*
+    * Convert a raw string to a hex string
+    */
+    function rstr2hex(input) {
+        var hex_tab = '0123456789abcdef',
+            output = '',
+            x,
+            i;
+        for (i = 0; i < input.length; i += 1) {
+            x = input.charCodeAt(i);
+            output += hex_tab.charAt((x >>> 4) & 0x0F) +
+                hex_tab.charAt(x & 0x0F);
+        }
+        return output;
+    }
+
+    /*
+    * Encode a string as utf-8
+    */
+    function str2rstr_utf8(input) {
+        return unescape(encodeURIComponent(input));
+    }
+
+    /*
+    * Take string arguments and return either raw or hex encoded strings
+    */
+    function raw_md5(s) {
+        return rstr_md5(str2rstr_utf8(s));
+    }
+    function hex_md5(s) {
+        return rstr2hex(raw_md5(s));
+    }
+    function raw_hmac_md5(k, d) {
+        return rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d));
+    }
+    function hex_hmac_md5(k, d) {
+        return rstr2hex(raw_hmac_md5(k, d));
+    }
+
+    function md5(string, key, raw) {
+        if (!key) {
+            if (!raw) {
+                return hex_md5(string);
+            }
+            return raw_md5(string);
+        }
+        if (!raw) {
+            return hex_hmac_md5(key, string);
+        }
+        return raw_hmac_md5(key, string);
+    }
+
+    if (typeof define === 'function' && define.amd) {
+        define(function () {
+            return md5;
+        });
+    } else {
+        $.md5 = md5;
+    }
+}(this));
diff --git a/lib/base.php b/lib/base.php
index 78452877d19..9ccbc4aeb22 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -353,7 +353,7 @@ class OC {
 		// avatars
 		if (\OC_Config::getValue('enable_avatars', true) === true) {
 			\OC_Util::addScript('placeholder');
-			\OC_Util::addScript('3rdparty', 'md5/md5.min');
+			\OC_Util::addVendorScript('blueimp-md5/js/md5');
 			\OC_Util::addScript('jquery.avatar');
 			\OC_Util::addScript('avatar');
 		}
-- 
GitLab


From 45c6ec85824adcc9b8ede93e2141c3da313254a4 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 6 Nov 2014 13:26:38 +0100
Subject: [PATCH 342/616] introduce h1, use either ownCloud name or current app
 name

---
 core/css/header.css             | 3 +++
 core/templates/layout.guest.php | 4 +++-
 core/templates/layout.user.php  | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/css/header.css b/core/css/header.css
index 33eb7e25cc6..026240ea1b0 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -48,6 +48,9 @@
 	height: 120px;
 	margin: 0 auto;
 }
+#header .logo h1 {
+	display: none;
+}
 
 #header .logo-wide {
 	background-image: url(../img/logo-wide.svg);
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 763af4dc1d2..34d7a210841 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -31,7 +31,9 @@
 				<?php if ($_['bodyid'] === 'body-login' ): ?>
 					<header>
 						<div id="header">
-							<div class="logo svg"></div>
+							<div class="logo svg">
+								<h1><?php p($theme->getName()); ?></h1>
+							</div>
 							<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 						</div>
 					</header>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index f7f2b3dc735..8ccafcbf99c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -44,7 +44,7 @@
 				<div class="logo-icon svg"></div>
 			</a>
 			<a href="#" class="menutoggle">
-				<div class="header-appname">
+				<h1 class="header-appname">
 					<?php
 						if(OC_Util::getEditionString() === '') {
 							p(!empty($_['application'])?$_['application']: $l->t('Apps'));
@@ -52,7 +52,7 @@
 							print_unescaped($theme->getHTMLName());
 						}
 					?>
-				</div>
+				</h1>
 				<div class="icon-caret svg"></div>
 			</a>
 			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
-- 
GitLab


From 0e3e1e35630538de3d4ae0d2ec32940f4f5651ee Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 6 Nov 2014 13:36:36 +0100
Subject: [PATCH 343/616] Add getLogger() to IServerContainer

Makes my IDE complaining less ;-)
---
 lib/public/iservercontainer.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index c1592551978..a52dc2d13dc 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -214,6 +214,13 @@ interface IServerContainer {
 	 */
 	function getJobList();
 
+	/**
+	 * Returns a logger instance
+	 *
+	 * @return \OCP\ILogger
+	 */
+	function getLogger();
+
 	/**
 	 * Returns a router for generating and matching urls
 	 *
-- 
GitLab


From 1d6c7e28e9e5df5a3e9590eb22025e2c59c13338 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 6 Nov 2014 15:02:32 +0100
Subject: [PATCH 344/616] update to 3rdparty master

---
 3rdparty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/3rdparty b/3rdparty
index 4966ff082e7..cb394f1eb0a 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 4966ff082e7a51c1109b8a665c18b2d72ba6960a
+Subproject commit cb394f1eb0a363268325d181b22df69ad91d6e1b
-- 
GitLab


From 24ca2d858f9cc020b2ca7310977cd4272a6809fb Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 4 Nov 2014 16:05:31 +0100
Subject: [PATCH 345/616] Add OCP\Security\IHasher

Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.

Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
---
 3rdparty                        |   2 +-
 config/config.sample.php        |   6 ++
 lib/private/security/hasher.php | 146 ++++++++++++++++++++++++++++++++
 lib/private/server.php          |  13 +++
 lib/public/iservercontainer.php |  13 +++
 lib/public/security/ihasher.php |  48 +++++++++++
 tests/lib/security/hasher.php   | 115 +++++++++++++++++++++++++
 7 files changed, 342 insertions(+), 1 deletion(-)
 create mode 100644 lib/private/security/hasher.php
 create mode 100644 lib/public/security/ihasher.php
 create mode 100644 tests/lib/security/hasher.php

diff --git a/3rdparty b/3rdparty
index cb394f1eb0a..48fdf111dfe 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit cb394f1eb0a363268325d181b22df69ad91d6e1b
+Subproject commit 48fdf111dfe4728a906002afccb97b8ad88b3f61
diff --git a/config/config.sample.php b/config/config.sample.php
index 5d6e3cea273..59f892d133b 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -57,6 +57,12 @@ $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
diff --git a/lib/private/security/hasher.php b/lib/private/security/hasher.php
new file mode 100644
index 00000000000..647e1a307ea
--- /dev/null
+++ b/lib/private/security/hasher.php
@@ -0,0 +1,146 @@
+<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Security;
+
+use OCP\IConfig;
+use OCP\Security\IHasher;
+
+/**
+ * Class Hasher provides some basic hashing functions. Furthermore, it supports legacy hashes
+ * used by previous versions of ownCloud and helps migrating those hashes to newer ones.
+ *
+ * The hashes generated by this class are prefixed (version|hash) with a version parameter to allow possible
+ * updates in the future.
+ * Possible versions:
+ * 	- 1 (Initial version)
+ *
+ * Usage:
+ * // Hashing a message
+ * $hash = \OC::$server->getHasher()->hash('MessageToHash');
+ * // Verifying a message - $newHash will contain the newly calculated hash
+ * $newHash = null;
+ * var_dump(\OC::$server->getHasher()->verify('a', '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', $newHash));
+ * var_dump($newHash);
+ *
+ * @package OC\Security
+ */
+class Hasher implements IHasher {
+	/** @var IConfig */
+	private $config;
+	/** @var array Options passed to password_hash and password_needs_rehash */
+	private $options = array();
+	/** @var string Salt used for legacy passwords */
+	private $legacySalt = null;
+	/** @var int Current version of the generated hash */
+	private $currentVersion = 1;
+
+	/**
+	 * @param IConfig $config
+	 */
+	function __construct(IConfig $config) {
+		$this->config = $config;
+
+		$hashingCost = $this->config->getSystemValue('hashingCost', null);
+		if(!is_null($hashingCost)) {
+			$this->options['cost'] = $hashingCost;
+		}
+	}
+
+	/**
+	 * Hashes a message using PHP's `password_hash` functionality.
+	 * Please note that the size of the returned string is not guaranteed
+	 * and can be up to 255 characters.
+	 *
+	 * @param string $message Message to generate hash from
+	 * @return string Hash of the message with appended version parameter
+	 */
+	public function hash($message) {
+		return $this->currentVersion . '|' . password_hash($message, PASSWORD_DEFAULT, $this->options);
+	}
+
+	/**
+	 * Get the version and hash from a prefixedHash
+	 * @param string $prefixedHash
+	 * @return null|array Null if the hash is not prefixed, otherwise array('version' => 1, 'hash' => 'foo')
+	 */
+	protected function splitHash($prefixedHash) {
+		$explodedString = explode('|', $prefixedHash, 2);
+		if(sizeof($explodedString) === 2) {
+			if((int)$explodedString[0] > 0) {
+				return array('version' => (int)$explodedString[0], 'hash' => $explodedString[1]);
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * Verify legacy hashes
+	 * @param string $message Message to verify
+	 * @param string $hash Assumed hash of the message
+	 * @param null|string &$newHash Reference will contain the updated hash
+	 * @return bool Whether $hash is a valid hash of $message
+	 */
+	protected function legacyHashVerify($message, $hash, &$newHash = null) {
+		if(empty($this->legacySalt)) {
+			$this->legacySalt = $this->config->getSystemValue('passwordsalt', '');
+		}
+
+		// Verify whether it matches a legacy PHPass or SHA1 string
+		$hashLength = strlen($hash);
+		if($hashLength === 60 && password_verify($message.$this->legacySalt, $hash) ||
+			$hashLength === 40 && StringUtils::equals($hash, sha1($message))) {
+			$newHash = $this->hash($message);
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Verify V1 hashes
+	 * @param string $message Message to verify
+	 * @param string $hash Assumed hash of the message
+	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+	 * @return bool Whether $hash is a valid hash of $message
+	 */
+	protected function verifyHashV1($message, $hash, &$newHash = null) {
+		if(password_verify($message, $hash)) {
+			if(password_needs_rehash($hash, PASSWORD_DEFAULT, $this->options)) {
+				$newHash = $this->hash($message);
+			}
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param string $message Message to verify
+	 * @param string $hash Assumed hash of the message
+	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+	 * @return bool Whether $hash is a valid hash of $message
+	 */
+	public function verify($message, $hash, &$newHash = null) {
+		$splittedHash = $this->splitHash($hash);
+
+		if(isset($splittedHash['version'])) {
+			switch ($splittedHash['version']) {
+				case 1:
+					return $this->verifyHashV1($message, $splittedHash['hash'], $newHash);
+			}
+		} else {
+			return $this->legacyHashVerify($message, $hash, $newHash);
+		}
+
+
+		return false;
+	}
+
+}
diff --git a/lib/private/server.php b/lib/private/server.php
index 186714740f7..f43613e8188 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -14,6 +14,7 @@ use OC\DB\ConnectionWrapper;
 use OC\Files\Node\Root;
 use OC\Files\View;
 use OC\Security\Crypto;
+use OC\Security\Hasher;
 use OC\Security\SecureRandom;
 use OC\Diagnostics\NullEventLogger;
 use OCP\IServerContainer;
@@ -197,6 +198,9 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('Crypto', function (Server $c) {
 			return new Crypto($c->getConfig(), $c->getSecureRandom());
 		});
+		$this->registerService('Hasher', function (Server $c) {
+			return new Hasher($c->getConfig());
+		});
 		$this->registerService('DatabaseConnection', function (Server $c) {
 			$factory = new \OC\DB\ConnectionFactory();
 			$type = $c->getConfig()->getSystemValue('dbtype', 'sqlite');
@@ -529,6 +533,15 @@ class Server extends SimpleContainer implements IServerContainer {
 		return $this->query('Crypto');
 	}
 
+	/**
+	 * Returns a Hasher instance
+	 *
+	 * @return \OCP\Security\IHasher
+	 */
+	function getHasher() {
+		return $this->query('Hasher');
+	}
+
 	/**
 	 * Returns an instance of the db facade
 	 *
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index c1592551978..2003f448558 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -128,6 +128,19 @@ interface IServerContainer {
 	 */
 	function getConfig();
 
+	/**
+	 * Returns a Crypto instance
+	 *
+	 * @return \OCP\Security\ICrypto
+	 */
+	function getCrypto();
+
+	/**
+	 * Returns a Hasher instance
+	 *
+	 * @return \OCP\Security\IHasher
+	 */
+	function getHasher();
 
 	/**
 	 * Returns an instance of the db facade
diff --git a/lib/public/security/ihasher.php b/lib/public/security/ihasher.php
new file mode 100644
index 00000000000..75900fb55ac
--- /dev/null
+++ b/lib/public/security/ihasher.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCP\Security;
+
+/**
+ * Class Hasher provides some basic hashing functions. Furthermore, it supports legacy hashes
+ * used by previous versions of ownCloud and helps migrating those hashes to newer ones.
+ *
+ * The hashes generated by this class are prefixed (version|hash) with a version parameter to allow possible
+ * updates in the future.
+ * Possible versions:
+ * 	- 1 (Initial version)
+ *
+ * Usage:
+ * // Hashing a message
+ * $hash = \OC::$server->getHasher()->hash('MessageToHash');
+ * // Verifying a message - $newHash will contain the newly calculated hash
+ * $newHash = null;
+ * var_dump(\OC::$server->getHasher()->verify('a', '86f7e437faa5a7fce15d1ddcb9eaeaea377667b8', $newHash));
+ * var_dump($newHash);
+ *
+ * @package OCP\Security
+ */
+interface IHasher {
+	/**
+	 * Hashes a message using PHP's `password_hash` functionality.
+	 * Please note that the size of the returned string is not guaranteed
+	 * and can be up to 255 characters.
+	 *
+	 * @param string $message Message to generate hash from
+	 * @return string Hash of the message with appended version parameter
+	 */
+	public function hash($message);
+
+	/**
+	 * @param string $message Message to verify
+	 * @param string $hash Assumed hash of the message
+	 * @param null|string &$newHash Reference will contain the updated hash if necessary. Update the existing hash with this one.
+	 * @return bool Whether $hash is a valid hash of $message
+	 */
+	public function verify($message, $hash, &$newHash = null);
+}
diff --git a/tests/lib/security/hasher.php b/tests/lib/security/hasher.php
new file mode 100644
index 00000000000..330789c67a0
--- /dev/null
+++ b/tests/lib/security/hasher.php
@@ -0,0 +1,115 @@
+<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+use OC\Security\Hasher;
+
+/**
+ * Class HasherTest
+ */
+class HasherTest extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @return array
+	 */
+	public function versionHashProvider()
+	{
+		return array(
+			array('asf32äà$$a.|3', null),
+			array('asf32äà$$a.|3|5', null),
+			array('1|2|3|4', array('version' => 1, 'hash' => '2|3|4')),
+			array('1|我看|这本书。 我看這本書', array('version' => 1, 'hash' => '我看|这本书。 我看這本書'))
+		);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function allHashProviders()
+	{
+		return array(
+			// Bogus values
+			array(null, 'asf32äà$$a.|3', false),
+			array(null, false, false),
+
+			// Valid SHA1 strings
+			array('password', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', true),
+			array('owncloud.com', '27a4643e43046c3569e33b68c1a4b15d31306d29', true),
+
+			// Invalid SHA1 strings
+			array('InvalidString', '5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8', false),
+			array('AnotherInvalidOne', '27a4643e43046c3569e33b68c1a4b15d31306d29', false),
+
+			// Valid legacy password string with password salt "6Wow67q1wZQZpUUeI6G2LsWUu4XKx"
+			array('password', '$2a$08$emCpDEl.V.QwPWt5gPrqrOhdpH6ailBmkj2Hd2vD5U8qIy20HBe7.', true),
+			array('password', '$2a$08$yjaLO4ev70SaOsWZ9gRS3eRSEpHVsmSWTdTms1949mylxJ279hzo2', true),
+			array('password', '$2a$08$.jNRG/oB4r7gHJhAyb.mDupNUAqTnBIW/tWBqFobaYflKXiFeG0A6', true),
+			array('owncloud.com', '$2a$08$YbEsyASX/hXVNMv8hXQo7ezreN17T8Jl6PjecGZvpX.Ayz2aUyaZ2', true),
+			array('owncloud.com', '$2a$11$cHdDA2IkUP28oNGBwlL7jO/U3dpr8/0LIjTZmE8dMPA7OCUQsSTqS', true),
+			array('owncloud.com', '$2a$08$GH.UoIfJ1e.qeZ85KPqzQe6NR8XWRgJXWIUeE1o/j1xndvyTA1x96', true),
+
+			// Invalid legacy passwords
+			array('password', '$2a$08$oKAQY5IhnZocP.61MwP7xu7TNeOb7Ostvk3j6UpacvaNMs.xRj7O2', false),
+
+			// Valid passwords "6Wow67q1wZQZpUUeI6G2LsWUu4XKx"
+			array('password', '1|$2a$05$ezAE0dkwk57jlfo6z5Pql.gcIK3ReXT15W7ITNxVS0ksfhO/4E4Kq', true),
+			array('password', '1|$2a$05$4OQmloFW4yTVez2MEWGIleDO9Z5G9tWBXxn1vddogmKBQq/Mq93pe', true),
+			array('password', '1|$2a$11$yj0hlp6qR32G9exGEXktB.yW2rgt2maRBbPgi3EyxcDwKrD14x/WO', true),
+			array('owncloud.com', '1|$2a$10$Yiss2WVOqGakxuuqySv5UeOKpF8d8KmNjuAPcBMiRJGizJXjA2bKm', true),
+			array('owncloud.com', '1|$2a$10$v9mh8/.mF/Ut9jZ7pRnpkuac3bdFCnc4W/gSumheQUi02Sr.xMjPi', true),
+			array('owncloud.com', '1|$2a$05$ST5E.rplNRfDCzRpzq69leRzsTGtY7k88h9Vy2eWj0Ug/iA9w5kGK', true),
+
+			// Invalid passwords
+			array('password', '0|$2a$08$oKAQY5IhnZocP.61MwP7xu7TNeOb7Ostvk3j6UpacvaNMs.xRj7O2', false),
+			array('password', '1|$2a$08$oKAQY5IhnZocP.61MwP7xu7TNeOb7Ostvk3j6UpacvaNMs.xRj7O2', false),
+			array('password', '2|$2a$08$oKAQY5IhnZocP.61MwP7xu7TNeOb7Ostvk3j6UpacvaNMs.xRj7O2', false),
+		);
+	}
+
+
+
+	/** @var Hasher */
+	protected $hasher;
+	/** @var \OCP\IConfig */
+	protected $config;
+
+	protected function setUp() {
+		$this->config = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+
+		$this->hasher = new Hasher($this->config);
+	}
+
+	function testHash() {
+		$hash = $this->hasher->hash('String To Hash');
+		$this->assertNotNull($hash);
+	}
+
+	/**
+	 * @dataProvider versionHashProvider
+	 */
+	function testSplitHash($hash, $expected) {
+		$relativePath = \Test_Helper::invokePrivate($this->hasher, 'splitHash', array($hash));
+		$this->assertSame($expected, $relativePath);
+	}
+
+
+	/**
+	 * @dataProvider allHashProviders
+	 */
+	function testVerify($password, $hash, $expected) {
+		$this->config
+			->expects($this->any())
+			->method('getSystemValue')
+			->with('passwordsalt', null)
+			->will($this->returnValue('6Wow67q1wZQZpUUeI6G2LsWUu4XKx'));
+
+		$result = $this->hasher->verify($password, $hash);
+		$this->assertSame($expected, $result);
+	}
+
+}
-- 
GitLab


From af743efff0411f96d1f719ccdf1553c4eb881cf5 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 6 Nov 2014 15:33:38 +0100
Subject: [PATCH 346/616] add alt text for file actions, but leave empty since
 text is directly next to it

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

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 8ae0d8f1b2e..38ede46beb8 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -261,7 +261,7 @@
 					}
 					var html = '<a href="#" class="action action-' + name.toLowerCase() + '" data-action="' + name + '">';
 					if (img) {
-						html += '<img class ="svg" src="' + img + '" />';
+						html += '<img class ="svg" alt="" src="' + img + '" />';
 					}
 					html += '<span> ' + actionText + '</span></a>';
 
-- 
GitLab


From c4d7483a0a7d1ea75bf06d0a4e726e2b150be81f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 6 Nov 2014 15:42:06 +0100
Subject: [PATCH 347/616] Use new hashing API for OC_User_Database

This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
---
 lib/private/user/database.php | 39 +++++++----------------------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/lib/private/user/database.php b/lib/private/user/database.php
index 3a76adbe763..a6289066f05 100644
--- a/lib/private/user/database.php
+++ b/lib/private/user/database.php
@@ -33,28 +33,12 @@
  *
  */
 
-require_once 'phpass/PasswordHash.php';
-
 /**
  * Class for user management in a SQL Database (e.g. MySQL, SQLite)
  */
 class OC_User_Database extends OC_User_Backend {
-	/**
-	 * @var PasswordHash
-	 */
-	private static $hasher = null;
-
 	private $cache = array();
 
-	private function getHasher() {
-		if (!self::$hasher) {
-			//we don't want to use DES based crypt(), since it doesn't return a hash with a recognisable prefix
-			$forcePortable = (CRYPT_BLOWFISH != 1);
-			self::$hasher = new PasswordHash(8, $forcePortable);
-		}
-		return self::$hasher;
-	}
-
 	/**
 	 * Create a new user
 	 * @param string $uid The username of the user to create
@@ -66,10 +50,8 @@ class OC_User_Database extends OC_User_Backend {
 	 */
 	public function createUser($uid, $password) {
 		if (!$this->userExists($uid)) {
-			$hasher = $this->getHasher();
-			$hash = $hasher->HashPassword($password . OC_Config::getValue('passwordsalt', ''));
 			$query = OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )');
-			$result = $query->execute(array($uid, $hash));
+			$result = $query->execute(array($uid, \OC::$server->getHasher()->hash($password)));
 
 			return $result ? true : false;
 		}
@@ -106,10 +88,8 @@ class OC_User_Database extends OC_User_Backend {
 	 */
 	public function setPassword($uid, $password) {
 		if ($this->userExists($uid)) {
-			$hasher = $this->getHasher();
-			$hash = $hasher->HashPassword($password . OC_Config::getValue('passwordsalt', ''));
 			$query = OC_DB::prepare('UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?');
-			$result = $query->execute(array($hash, $uid));
+			$result = $query->execute(array(\OC::$server->getHasher()->hash($password), $uid));
 
 			return $result ? true : false;
 		}
@@ -159,7 +139,6 @@ class OC_User_Database extends OC_User_Backend {
 			. ' WHERE LOWER(`displayname`) LIKE LOWER(?) OR '
 			. 'LOWER(`uid`) LIKE LOWER(?) ORDER BY `uid` ASC', $limit, $offset);
 		$result = $query->execute(array('%' . $search . '%', '%' . $search . '%'));
-		$users = array();
 		while ($row = $result->fetchRow()) {
 			$displayNames[$row['uid']] = $row['displayname'];
 		}
@@ -183,18 +162,14 @@ class OC_User_Database extends OC_User_Backend {
 		$row = $result->fetchRow();
 		if ($row) {
 			$storedHash = $row['password'];
-			if ($storedHash[0] === '$') { //the new phpass based hashing
-				$hasher = $this->getHasher();
-				if ($hasher->CheckPassword($password . OC_Config::getValue('passwordsalt', ''), $storedHash)) {
-					return $row['uid'];
+			$newHash = '';
+			if(\OC::$server->getHasher()->verify($password, $storedHash, $newHash)) {
+				if(!empty($newHash)) {
+					$this->setPassword($uid, $password);
 				}
-
-			//old sha1 based hashing
-			} elseif (sha1($password) === $storedHash) {
-				//upgrade to new hashing
-				$this->setPassword($row['uid'], $password);
 				return $row['uid'];
 			}
+
 		}
 
 		return false;
-- 
GitLab


From a41005529155ac34e0382f5d32ed948ce71f76d1 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 6 Nov 2014 16:22:57 +0100
Subject: [PATCH 348/616] add relevant focus styles to the existing hover
 styles

---
 apps/files/css/files.css | 47 +++++++++++++++++++++++++++++-----------
 core/css/apps.css        | 13 +++++++----
 core/css/styles.css      | 44 ++++++++++++++++++++++++++++++++-----
 3 files changed, 81 insertions(+), 23 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index fddfd02caa6..60afcf9b579 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -6,7 +6,11 @@
 .actions { padding:5px; height:32px; display: inline-block; float: left; }
 .actions input, .actions button, .actions .button { margin:0; float:left; }
 .actions .button a { color: #555; }
-.actions .button a:hover, .actions .button a:active { color: #333; }
+.actions .button a:hover,
+.actions .button a:focus,
+.actions .button a:active {
+	color: #333;
+}
 .actions.hidden { display: none; }
 
 #new {
@@ -99,7 +103,9 @@
 }
 
 #filestable tbody tr { background-color:#fff; height:40px; }
-#filestable tbody tr:hover, tbody tr:active {
+#filestable tbody tr:hover,
+#filestable tbody tr:focus,
+#filestable tbody tr:active {
 	background-color: rgb(240,240,240);
 }
 #filestable tbody tr.selected {
@@ -123,7 +129,8 @@ span.extension {
 	transition: opacity 300ms;
 	vertical-align: top;
 }
-tr:hover span.extension {
+tr:hover span.extension,
+tr:focus span.extension {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 	opacity: 1;
@@ -166,7 +173,8 @@ table th .sort-indicator {
 .sort-indicator.hidden {
 	visibility: hidden;
 }
-table th:hover .sort-indicator.hidden {
+table th:hover .sort-indicator.hidden,
+table th:focus .sort-indicator.hidden {
 	visibility: visible;
 }
 
@@ -252,8 +260,10 @@ table td.filename .nametext, .uploadtext, .modified, .column-last>span:first-chi
 	width: 90%;
 }
 /* ellipsize long modified dates to make room for showing delete button */
-#fileList tr:hover .modified, #fileList tr:hover .column-last>span:first-child,
-#fileList tr:focus .modified, #fileList tr:focus .column-last>span:first-child {
+#fileList tr:hover .modified,
+#fileList tr:focus .modified,
+#fileList tr:hover .column-last>span:first-child,
+#fileList tr:focus .column-last>span:first-child {
 	width: 75%;
 }
 
@@ -280,7 +290,8 @@ table td.filename .nametext .innernametext {
 		max-width: 760px;
 	}
 
-	table tr:hover td.filename .nametext .innernametext {
+	table tr:hover td.filename .nametext .innernametext,
+	table tr:focus td.filename .nametext .innernametext {
 		max-width: 480px;
 	}
 }
@@ -290,7 +301,8 @@ table td.filename .nametext .innernametext {
 		max-width: 600px;
 	}
 
-	table tr:hover td.filename .nametext .innernametext {
+	table tr:hover td.filename .nametext .innernametext,
+	table tr:focus td.filename .nametext .innernametext {
 		max-width: 320px;
 	}
 }
@@ -300,7 +312,8 @@ table td.filename .nametext .innernametext {
 		max-width: 400px;
 	}
 
-	table tr:hover td.filename .nametext .innernametext {
+	table tr:hover td.filename .nametext .innernametext,
+	table tr:focus td.filename .nametext .innernametext {
 		max-width: 120px;
 	}
 }
@@ -310,7 +323,8 @@ table td.filename .nametext .innernametext {
 		max-width: 320px;
 	}
 
-	table tr:hover td.filename .nametext .innernametext {
+	table tr:hover td.filename .nametext .innernametext,
+	table tr:focus td.filename .nametext .innernametext {
 		max-width: 40px;
 	}
 }
@@ -344,11 +358,13 @@ table td.filename .uploadtext {
 }
 /* Show checkbox when hovering, checked, or selected */
 #fileList tr:hover td.filename>input[type="checkbox"]:first-child,
+#fileList tr:focus td.filename>input[type="checkbox"]:first-child,
 #fileList tr td.filename>input[type="checkbox"]:checked:first-child,
 #fileList tr.selected td.filename>input[type="checkbox"]:first-child {
 	opacity: 1;
 }
 .lte9 #fileList tr:hover td.filename>input[type="checkbox"]:first-child,
+.lte9 #fileList tr:focus td.filename>input[type="checkbox"]:first-child,
 .lte9 #fileList tr td.filename>input[type="checkbox"][checked=checked]:first-child,
 .lte9 #fileList tr.selected td.filename>input[type="checkbox"]:first-child {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
@@ -469,13 +485,15 @@ a.action>img {
 	position: relative;
 	top: -21px;
 }
-#fileList tr:hover a.action, #fileList a.action.permanent {
+#fileList tr:hover a.action, #fileList a.action.permanent
+#fileList tr:focus a.action, #fileList a.action.permanent {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
 	filter: alpha(opacity=50);
 	opacity: .5;
 	display:inline;
 }
-#fileList tr:hover a.action:hover {
+#fileList tr:hover a.action:hover,
+#fileList tr:focus a.action:focus {
 	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
 	filter: alpha(opacity=100);
 	opacity: 1;
@@ -489,7 +507,10 @@ a.action>img {
 	height: 70px;
 }
 
-.summary:hover, .summary, table tr.summary td {
+.summary:hover,
+.summary:focus,
+.summary,
+table tr.summary td {
 	background-color: transparent;
 }
 
diff --git a/core/css/apps.css b/core/css/apps.css
index ce2e15595af..e5cf6201688 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -55,6 +55,7 @@
 }
 
 #app-navigation li:hover > a,
+#app-navigation li:focus > a,
 #app-navigation .selected,
 #app-navigation .selected a {
 	background-color: #ddd;
@@ -96,10 +97,12 @@
 	outline: none !important;
 	box-shadow: none;
 }
-#app-navigation .collapsible:hover > a {
+#app-navigation .collapsible:hover > a,
+#app-navigation .collapsible:focus > a {
 	background-image: none;
 }
-#app-navigation .collapsible:hover > .collapse {
+#app-navigation .collapsible:hover > .collapse,
+#app-navigation .collapsible:focus > .collapse {
 	display: block;
 }
 
@@ -139,7 +142,8 @@
 	background-image: -ms-linear-gradient(top, rgb(238,238,238) 0%, rgb(245,245,245) 100%);
 }
 
-#app-navigation > ul .collapsible.open:hover {
+#app-navigation > ul .collapsible.open:hover,
+#app-navigation > ul .collapsible.open:focus {
 	box-shadow: inset 0 0 3px #ddd;
 }
 
@@ -179,7 +183,8 @@
 		opacity: .5;
 	}
 
-	#app-navigation .app-navigation-entry-deleted-button:hover {
+	#app-navigation .app-navigation-entry-deleted-button:hover,
+	#app-navigation .app-navigation-entry-deleted-button:focus {
 		opacity: 1;
 	}
 
diff --git a/core/css/styles.css b/core/css/styles.css
index 9604cb0fa4a..c45588cece6 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -731,12 +731,44 @@ label.infield {
 	margin-left: 1em;
 }
 
-tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
-tr:hover .action, tr .action.permanent, .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=50)"; filter:alpha(opacity=50); opacity:.5; }
-tr .action { width:16px; height:16px; }
-.header-action { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=80)"; filter:alpha(opacity=80); opacity:.8; }
-tr:hover .action:hover, .selectedActions a:hover, .header-action:hover { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
-tbody tr:hover, tr:active { background-color:#f8f8f8; }
+tr .action:not(.permanent),
+.selectedActions a {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+}
+tr:hover .action,
+tr:focus .action,
+tr .action.permanent,
+.selectedActions a {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
+	filter: alpha(opacity=50);
+	opacity: .5;
+}
+tr .action {
+	width: 16px;
+	height: 16px;
+}
+.header-action {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=80)";
+	filter: alpha(opacity=80);
+	opacity: .8;
+}
+tr:hover .action:hover,
+tr:focus .action:focus,
+.selectedActions a:hover,
+.selectedActions a:focus,
+.header-action:hover,
+.header-action:focus {
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+	filter: alpha(opacity=100);
+	opacity: 1;
+}
+tbody tr:hover,
+tbody tr:focus,
+tbody tr:active {
+	background-color: #f8f8f8;
+}
 
 code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", monospace; }
 
-- 
GitLab


From 7353183d999795b6044ace6084c67eca95de77cd Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 6 Nov 2014 14:47:58 +0100
Subject: [PATCH 349/616] bower strengthify

---
 3rdparty                                      |   2 +-
 bower.json                                    |   1 +
 core/setup/controller.php                     |   4 +-
 core/vendor/.gitignore                        |  18 +--
 core/vendor/strengthify/LICENSE               |  20 +++
 core/vendor/strengthify/jquery.strengthify.js | 133 ++++++++++++++++++
 core/vendor/strengthify/strengthify.css       |  48 +++++++
 settings/personal.php                         |   4 +-
 8 files changed, 213 insertions(+), 17 deletions(-)
 create mode 100644 core/vendor/strengthify/LICENSE
 create mode 100644 core/vendor/strengthify/jquery.strengthify.js
 create mode 100644 core/vendor/strengthify/strengthify.css

diff --git a/3rdparty b/3rdparty
index 48fdf111dfe..912a45c3458 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 48fdf111dfe4728a906002afccb97b8ad88b3f61
+Subproject commit 912a45c3458685a1105fba38a39a3a71c7348ed9
diff --git a/bower.json b/bower.json
index 406878ca713..b18078f6fc4 100644
--- a/bower.json
+++ b/bower.json
@@ -21,6 +21,7 @@
     "select2": "3.4.8",
     "zxcvbn": "*",
     "snapjs": "2.0.0-rc1",
+    "strengthify": "*",
     "underscore": "1.6.0"
   }
 }
diff --git a/core/setup/controller.php b/core/setup/controller.php
index f5f05348fd1..0722a2b13c3 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -57,8 +57,8 @@ class Controller {
 		);
 		$parameters = array_merge($defaults, $post);
 
-		\OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' );
-		\OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' );
+		\OC_Util::addVendorScript('strengthify/jquery.strengthify');
+		\OC_Util::addVendorStyle('strengthify/strengthify');
 		\OC_Util::addScript('setup');
 		\OC_Template::printGuestPage('', 'installation', $parameters);
 	}
diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore
index c2c71a145ba..e76afeb476d 100644
--- a/core/vendor/.gitignore
+++ b/core/vendor/.gitignore
@@ -1,12 +1,16 @@
 test/
 src/
 .bower.json
+bower.json
 .gitignore
 .jshintrc
 .travis.yml
+CHANGELOG*
 Gemfile
 gruntfile.js
-README.md
+Makefile
+package.json
+README*
 
 # underscore
 underscore/**
@@ -17,20 +21,13 @@ underscore/**
 blueimp-md5/css
 blueimp-md5/js/*
 !blueimp-md5/js/md5.js
-blueimp-md5/.*
-blueimp-md5/*.json
 blueimp-md5/index.html
-blueimp-md5/Makefile
-blueimp-md5/README.md
-blueimp-md5/package.json
 
 # momentjs - ignore all files except the two listed below
 moment/benchmarks
 moment/locale
 moment/min/**
-moment/*.js*
-moment/*.md
-!moment/LICENSE
+moment/moment.js
 !moment/min/moment-with-locales.js
 
 # jquery
@@ -39,9 +36,7 @@ jquery/**
 !jquery/MIT-LICENSE.txt
 
 # jcrop
-jcrop/.bower.json
 jcrop/index.html
-jcrop/README.md
 jcrop/demos
 jcrop/css/jquery.Jcrop.min.css
 jcrop/js/**
@@ -71,4 +66,3 @@ snapjs/dist/2.0.0-rc1
 snapjs/dist/latest/snap.css
 snapjs/dist/latest/snap.min.js
 snapjs/scripts
-snapjs/*.json
diff --git a/core/vendor/strengthify/LICENSE b/core/vendor/strengthify/LICENSE
new file mode 100644
index 00000000000..3c04738f789
--- /dev/null
+++ b/core/vendor/strengthify/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Morris Jobke
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/vendor/strengthify/jquery.strengthify.js b/core/vendor/strengthify/jquery.strengthify.js
new file mode 100644
index 00000000000..8b62f6b2fe9
--- /dev/null
+++ b/core/vendor/strengthify/jquery.strengthify.js
@@ -0,0 +1,133 @@
+/**
+ * Strengthify - show the weakness of a password (uses zxcvbn for this)
+ * https://github.com/kabum/strengthify
+ *
+ * Version: 0.3
+ * Author: Morris Jobke (github.com/kabum)
+ *
+ * License:
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2013 Morris Jobke <morris.jobke@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+(function ($) {
+	$.fn.strengthify = function(options) {
+		var me = this
+
+		var defaults = {
+			zxcvbn: 'zxcvbn/zxcvbn.js',
+			titles: [
+				'Weakest',
+				'Weak',
+				'So-so',
+				'Good',
+				'Perfect'
+			]
+		}
+
+		var options = $.extend(defaults, options)
+
+		// add elements
+		$('.strengthify-wrapper')
+			.append('<div class="strengthify-bg" />')
+			.append('<div class="strengthify-container" />')
+			.append('<div class="strengthify-separator" style="left: 25%" />')
+			.append('<div class="strengthify-separator" style="left: 50%" />')
+			.append('<div class="strengthify-separator" style="left: 75%" />')
+
+		var oldDisplayState = $('.strengthify-wrapper').css('display')
+
+		$.ajax({
+			cache: true,
+			dataType: 'script',
+			url: options.zxcvbn
+		}).done(function() {
+			me.bind('keyup input', function() {
+				var password = $(this).val()
+
+				// hide strengthigy if no input is provided
+				var opacity = (password === '') ? 0 : 1
+				$('.strengthify-wrapper').children().css(
+					'opacity',
+					opacity
+				).css(
+					'-ms-filter',
+					'"progid:DXImageTransform.Microsoft.Alpha(Opacity=' + opacity * 100 + ')"'
+				)
+
+				// calculate result
+				var result = zxcvbn(password)
+
+				var css = ''
+				// style strengthify bar
+				// possible scores: 0-4
+				switch(result.score) {
+					case 0:
+					case 1:
+						css = 'password-bad';
+						break;
+					case 2:
+						css = 'password-medium';
+						break;
+					case 3:
+					case 4:
+						css = 'password-good';
+						break;
+				}
+
+				$('.strengthify-container').attr('class', css + ' strengthify-container')
+				// possible scores: 0-4
+				$('.strengthify-container').css(
+					'width',
+					// if score is '0' it will be changed to '1' to
+					// not hide strengthify if the password is extremely weak
+					((result.score == 0 ? 1 : result.score) * 25) + '%'
+				)
+				// set a title for the wrapper
+				$('.strengthify-wrapper').attr(
+					'title',
+					options.titles[result.score]
+				).tipsy({
+					trigger: 'manual',
+					opacity: opacity
+				}).tipsy(
+					'show'
+				)
+
+				if(opacity === 0) {
+					$('.strengthify-wrapper').tipsy(
+						'hide'
+					)
+				}
+
+				// reset state for empty string password
+				if(password === '') {
+					$('.strengthify-container').css('width', 0)
+				}
+
+			})
+		})
+
+		return me
+	};
+
+}(jQuery))
\ No newline at end of file
diff --git a/core/vendor/strengthify/strengthify.css b/core/vendor/strengthify/strengthify.css
new file mode 100644
index 00000000000..9340270ecfb
--- /dev/null
+++ b/core/vendor/strengthify/strengthify.css
@@ -0,0 +1,48 @@
+/**
+ * Strengthify - show the weakness of a password (uses zxcvbn for this)
+ * https://github.com/kabum/strengthify
+ * Version: 0.3
+ * License: The MIT License (MIT)
+ * Copyright (c) 2013 Morris Jobke <morris.jobke@gmail.com>
+ */
+
+.strengthify-wrapper > * {
+	-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	filter: alpha(opacity=0);
+	opacity: 0;
+	-webkit-transition:all .5s ease-in-out;
+	-moz-transition:all .5s ease-in-out;
+	transition:all .5s ease-in-out;
+}
+
+.strengthify-bg, .strengthify-container, .strengthify-wrapper, .strengthify-separator {
+	height: 3px;
+}
+
+.strengthify-bg, .strengthify-container {
+	display: block;
+	position: absolute;
+	width: 100%;
+}
+
+.strengthify-bg {
+	background-color: #BBB;
+}
+
+.strengthify-separator {
+	display: inline-block;
+	position: absolute;
+	background-color: #FFF;
+	width: 1px;
+	z-index: 10;
+}
+
+.password-bad {
+	background-color: #C33;
+}
+.password-medium {
+	background-color: #F80;
+}
+.password-good {
+	background-color: #3C3;
+}
\ No newline at end of file
diff --git a/settings/personal.php b/settings/personal.php
index 4c06eecd223..9c27f77ccd3 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -13,8 +13,8 @@ $certificateManager = \OC::$server->getCertificateManager();
 // Highlight navigation entry
 OC_Util::addScript( 'settings', 'personal' );
 OC_Util::addStyle( 'settings', 'settings' );
-OC_Util::addScript( '3rdparty', 'strengthify/jquery.strengthify' );
-OC_Util::addStyle( '3rdparty', 'strengthify/strengthify' );
+\OC_Util::addVendorScript('strengthify/jquery.strengthify');
+\OC_Util::addVendorStyle('strengthify/strengthify');
 \OC_Util::addScript('files', 'jquery.fileupload');
 if (\OC_Config::getValue('enable_avatars', true) === true) {
 	\OC_Util::addVendorScript('jcrop/js/jquery.Jcrop');
-- 
GitLab


From 5b8a6b66b5fcfa9dbc25b403cb62a504019df644 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 6 Nov 2014 16:32:53 +0100
Subject: [PATCH 350/616] Load PHPAss via autoloader

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

diff --git a/lib/base.php b/lib/base.php
index eecdd961852..3cbab52ed7c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -457,7 +457,8 @@ class OC {
 		// setup 3rdparty autoloader
 		$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
 		if (file_exists($vendorAutoLoad)) {
-			require_once $vendorAutoLoad;
+			$loader = require_once $vendorAutoLoad;
+			$loader->add('PasswordHash', OC::$THIRDPARTYROOT . '/3rdparty/phpass');
 		} else {
 			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
 			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
-- 
GitLab


From 62047f86f5828a5743a476177318bc00ca8e453f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 5 Nov 2014 13:20:43 +0100
Subject: [PATCH 351/616] Testcase base class

---
 tests/lib/testcase.php | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 tests/lib/testcase.php

diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
new file mode 100644
index 00000000000..a4b4b0103f0
--- /dev/null
+++ b/tests/lib/testcase.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Joas Schilling
+ * @copyright 2014 Joas Schilling nickvergessen@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/>.
+ *
+ */
+
+namespace Test;
+
+abstract class TestCase extends \PHPUnit_Framework_TestCase {
+	protected function getUniqueID($prefix = '', $length = 13) {
+		// Do not use dots and slashes as we use the value for file names
+		return $prefix . \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(
+			$length,
+			'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+		);
+	}
+}
-- 
GitLab


From 216ef617db7b0ed6e717fe92867aa11245a4cece Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 5 Nov 2014 12:21:02 +0100
Subject: [PATCH 352/616] Do not use uniqid in Group and User tests as it is
 not unique on windows

---
 tests/lib/group.php          | 58 ++++++++++++++++++------------------
 tests/lib/group/backend.php  |  8 ++---
 tests/lib/group/database.php | 23 +++++---------
 tests/lib/group/dummy.php    |  3 +-
 tests/lib/user/backend.php   | 21 +++++++------
 tests/lib/user/database.php  | 13 +++++---
 tests/lib/user/dummy.php     |  3 +-
 7 files changed, 62 insertions(+), 67 deletions(-)

diff --git a/tests/lib/group.php b/tests/lib/group.php
index 724e723b187..795de695513 100644
--- a/tests/lib/group.php
+++ b/tests/lib/group.php
@@ -22,38 +22,39 @@
  *
  */
 
-class Test_Group extends PHPUnit_Framework_TestCase {
-	function setUp() {
+class Test_Group extends \Test\TestCase {
+	protected function setUp() {
+		parent::setUp();
 		OC_Group::clearBackends();
 		OC_User::clearBackends();
 	}
 
-	function testSingleBackend() {
+	public function testSingleBackend() {
 		$userBackend = new \OC_User_Dummy();
 		\OC_User::getManager()->registerBackend($userBackend);
 		OC_Group::useBackend(new OC_Group_Dummy());
 
-		$group1 = uniqid();
-		$group2 = uniqid();
+		$group1 = $this->getUniqueID();
+		$group2 = $this->getUniqueID();
 		OC_Group::createGroup($group1);
 		OC_Group::createGroup($group2);
 
-		$user1 = uniqid();
-		$user2 = uniqid();
+		$user1 = $this->getUniqueID();
+		$user2 = $this->getUniqueID();
 		$userBackend->createUser($user1, '');
 		$userBackend->createUser($user2, '');
 
-		$this->assertFalse(OC_Group::inGroup($user1, $group1));
-		$this->assertFalse(OC_Group::inGroup($user2, $group1));
-		$this->assertFalse(OC_Group::inGroup($user1, $group2));
-		$this->assertFalse(OC_Group::inGroup($user2, $group2));
+		$this->assertFalse(OC_Group::inGroup($user1, $group1), 'Asserting that user1 is not in group1');
+		$this->assertFalse(OC_Group::inGroup($user2, $group1), 'Asserting that user2 is not in group1');
+		$this->assertFalse(OC_Group::inGroup($user1, $group2), 'Asserting that user1 is not in group2');
+		$this->assertFalse(OC_Group::inGroup($user2, $group2), 'Asserting that user2 is not in group2');
 
 		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
 
-		$this->assertTrue(OC_Group::inGroup($user1, $group1));
-		$this->assertFalse(OC_Group::inGroup($user2, $group1));
-		$this->assertFalse(OC_Group::inGroup($user1, $group2));
-		$this->assertFalse(OC_Group::inGroup($user2, $group2));
+		$this->assertTrue(OC_Group::inGroup($user1, $group1), 'Asserting that user1 is in group1');
+		$this->assertFalse(OC_Group::inGroup($user2, $group1), 'Asserting that user2 is not in group1');
+		$this->assertFalse(OC_Group::inGroup($user1, $group2), 'Asserting that user1 is not in group2');
+		$this->assertFalse(OC_Group::inGroup($user2, $group2), 'Asserting that user2 is not in group2');
 
 		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
 
@@ -80,7 +81,7 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 
 	public function testNoGroupsTwice() {
 		OC_Group::useBackend(new OC_Group_Dummy());
-		$group = uniqid();
+		$group = $this->getUniqueID();
 		OC_Group::createGroup($group);
 
 		$groupCopy = $group;
@@ -103,7 +104,7 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 	public function testDontAddUserToNonexistentGroup() {
 		OC_Group::useBackend(new OC_Group_Dummy());
 		$groupNonExistent = 'notExistent';
-		$user = uniqid();
+		$user = $this->getUniqueID();
 
 		$this->assertEquals(false, OC_Group::addToGroup($user, $groupNonExistent));
 		$this->assertEquals(array(), OC_Group::getGroups());
@@ -114,12 +115,12 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 		$userBackend = new \OC_User_Dummy();
 		\OC_User::getManager()->registerBackend($userBackend);
 
-		$group1 = uniqid();
-		$group2 = uniqid();
-		$group3 = uniqid();
-		$user1 = uniqid();
-		$user2 = uniqid();
-		$user3 = uniqid();
+		$group1 = $this->getUniqueID();
+		$group2 = $this->getUniqueID();
+		$group3 = $this->getUniqueID();
+		$user1 = $this->getUniqueID();
+		$user2 = $this->getUniqueID();
+		$user3 = $this->getUniqueID();
 		OC_Group::createGroup($group1);
 		OC_Group::createGroup($group2);
 		OC_Group::createGroup($group3);
@@ -139,8 +140,7 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 		// FIXME: needs more parameter variation
 	}
 
-
-	function testMultiBackend() {
+	public function testMultiBackend() {
 		$userBackend = new \OC_User_Dummy();
 		\OC_User::getManager()->registerBackend($userBackend);
 		$backend1 = new OC_Group_Dummy();
@@ -148,8 +148,8 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 		OC_Group::useBackend($backend1);
 		OC_Group::useBackend($backend2);
 
-		$group1 = uniqid();
-		$group2 = uniqid();
+		$group1 = $this->getUniqueID();
+		$group2 = $this->getUniqueID();
 		OC_Group::createGroup($group1);
 
 		//groups should be added to the first registered backend
@@ -166,8 +166,8 @@ class Test_Group extends PHPUnit_Framework_TestCase {
 		$this->assertTrue(OC_Group::groupExists($group1));
 		$this->assertTrue(OC_Group::groupExists($group2));
 
-		$user1 = uniqid();
-		$user2 = uniqid();
+		$user1 = $this->getUniqueID();
+		$user2 = $this->getUniqueID();
 
 		$userBackend->createUser($user1, '');
 		$userBackend->createUser($user2, '');
diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php
index 95a5cf5f49c..62c189489d7 100644
--- a/tests/lib/group/backend.php
+++ b/tests/lib/group/backend.php
@@ -20,7 +20,7 @@
 *
 */
 
-abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
+abstract class Test_Group_Backend extends \Test\TestCase {
 	/**
 	 * @var OC_Group_Backend $backend
 	 */
@@ -33,7 +33,7 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
 	 */
 	public function getGroupName($name = null) {
 		if(is_null($name)) {
-			return uniqid('test_');
+			return $this->getUniqueID('test_');
 		} else {
 			return $name;
 		}
@@ -45,7 +45,7 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
 	 * @return string
 	 */
 	public function getUserName() {
-		return uniqid('test_');
+		return $this->getUniqueID('test_');
 	}
 
 	public function testAddRemove() {
@@ -138,6 +138,4 @@ abstract class Test_Group_Backend extends PHPUnit_Framework_TestCase {
 		$result = $this->backend->countUsersInGroup($group, 'bar');
 		$this->assertSame(2, $result);
 	}
-
-
 }
diff --git a/tests/lib/group/database.php b/tests/lib/group/database.php
index 9b39ac00452..10958a6ccdc 100644
--- a/tests/lib/group/database.php
+++ b/tests/lib/group/database.php
@@ -22,36 +22,27 @@
 
 class Test_Group_Database extends Test_Group_Backend {
 	private $groups=array();
-	
+
 	/**
 	 * get a new unique group name
 	 * test cases can override this in order to clean up created groups
 	 * @return string
 	 */
 	public function getGroupName($name = null) {
-		if(is_null($name)) {
-			$name=uniqid('test_');
-		}
-		$this->groups[]=$name;
+		$name = parent::getGroupName($name);
+		$this->groups[] = $name;
 		return $name;
 	}
 
-	/**
-	 * get a new unique user name
-	 * test cases can override this in order to clean up created user
-	 * @return string
-	 */
-	public function getUserName() {
-		return uniqid('test_');
-	}
-	
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->backend=new OC_Group_Database();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		foreach($this->groups as $group) {
 			$this->backend->deleteGroup($group);
 		}
+		parent::tearDown();
 	}
 }
diff --git a/tests/lib/group/dummy.php b/tests/lib/group/dummy.php
index 287d6f1a977..b4456c8f7e1 100644
--- a/tests/lib/group/dummy.php
+++ b/tests/lib/group/dummy.php
@@ -21,7 +21,8 @@
 */
 
 class Test_Group_Dummy extends Test_Group_Backend {
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->backend=new OC_Group_Dummy();
 	}
 }
diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php
index 0d3914c7ca6..c2040f4e3be 100644
--- a/tests/lib/user/backend.php
+++ b/tests/lib/user/backend.php
@@ -30,7 +30,7 @@
  * For an example see /tests/lib/user/dummy.php
  */
 
-abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
+abstract class Test_User_Backend extends \Test\TestCase {
 	/**
 	 * @var OC_User_Backend $backend
 	 */
@@ -42,7 +42,7 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
 	 * @return string
 	 */
 	public function getUser() {
-		return uniqid('test_');
+		return $this->getUniqueID('test_');
 	}
 
 	public function testAddRemove() {
@@ -68,29 +68,29 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
 		$this->assertTrue((array_search($name1, $this->backend->getUsers())!==false));
 		$this->assertFalse((array_search($name2, $this->backend->getUsers())!==false));
 	}
-	
+
 	public function testLogin() {
 		$name1=$this->getUser();
 		$name2=$this->getUser();
-		
+
 		$this->assertFalse($this->backend->userExists($name1));
 		$this->assertFalse($this->backend->userExists($name2));
-		
+
 		$this->backend->createUser($name1, 'pass1');
 		$this->backend->createUser($name2, 'pass2');
-		
+
 		$this->assertTrue($this->backend->userExists($name1));
 		$this->assertTrue($this->backend->userExists($name2));
-		
+
 		$this->assertSame($name1, $this->backend->checkPassword($name1, 'pass1'));
 		$this->assertSame($name2, $this->backend->checkPassword($name2, 'pass2'));
-		
+
 		$this->assertFalse($this->backend->checkPassword($name1, 'pass2'));
 		$this->assertFalse($this->backend->checkPassword($name2, 'pass1'));
-		
+
 		$this->assertFalse($this->backend->checkPassword($name1, 'dummy'));
 		$this->assertFalse($this->backend->checkPassword($name2, 'foobar'));
-		
+
 		$this->backend->setPassword($name1, 'newpass1');
 		$this->assertFalse($this->backend->checkPassword($name1, 'pass1'));
 		$this->assertSame($name1, $this->backend->checkPassword($name1, 'newpass1'));
@@ -112,5 +112,4 @@ abstract class Test_User_Backend extends PHPUnit_Framework_TestCase {
 		$result = $this->backend->getDisplayNames('bar');
 		$this->assertSame(2, count($result));
 	}
-
 }
diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php
index a8e497720c2..3a6be1ceee5 100644
--- a/tests/lib/user/database.php
+++ b/tests/lib/user/database.php
@@ -21,22 +21,27 @@
 */
 
 class Test_User_Database extends Test_User_Backend {
+	/** @var array */
+	private $users;
+
 	public function getUser() {
 		$user = parent::getUser();
 		$this->users[]=$user;
 		return $user;
 	}
-	
-	public function setUp() {
+
+	protected function setUp() {
+		parent::setUp();
 		$this->backend=new OC_User_Database();
 	}
-	
-	public function tearDown() {
+
+	protected function tearDown() {
 		if(!isset($this->users)) {
 			return;
 		}
 		foreach($this->users as $user) {
 			$this->backend->deleteUser($user);
 		}
+		parent::tearDown();
 	}
 }
diff --git a/tests/lib/user/dummy.php b/tests/lib/user/dummy.php
index e417fd97603..fcc921de4b1 100644
--- a/tests/lib/user/dummy.php
+++ b/tests/lib/user/dummy.php
@@ -21,7 +21,8 @@
 */
 
 class Test_User_Dummy extends Test_User_Backend {
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->backend=new OC_User_Dummy();
 	}
 }
-- 
GitLab


From f2282e4251585761500a319c10d697e9a1900444 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 5 Nov 2014 16:42:19 +0100
Subject: [PATCH 353/616] Test LargeFileHelperGetFileSize also with ascii only
 characters

And skip the UTF8 names on Windows as they are not supported
---
 tests/lib/largefilehelpergetfilesize.php | 55 ++++++++++++++++--------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/tests/lib/largefilehelpergetfilesize.php b/tests/lib/largefilehelpergetfilesize.php
index 58571d641e0..90ecc3dde70 100644
--- a/tests/lib/largefilehelpergetfilesize.php
+++ b/tests/lib/largefilehelpergetfilesize.php
@@ -13,58 +13,77 @@ namespace Test;
 * Large files are not considered yet.
 */
 class LargeFileHelperGetFileSize extends \PHPUnit_Framework_TestCase {
-	protected $filename;
-	protected $fileSize;
+	/** @var \OC\LargeFileHelper */
 	protected $helper;
 
 	public function setUp() {
 		parent::setUp();
-		$ds = DIRECTORY_SEPARATOR;
-		$this->filename = dirname(__DIR__) . "{$ds}data{$ds}strängé filename (duplicate #2).txt";
-		$this->fileSize = 446;
-		$this->helper = new \OC\LargeFileHelper;
+		$this->helper = new \OC\LargeFileHelper();
 	}
 
-	public function testGetFileSizeViaCurl() {
+	public function dataFileNameProvider() {
+		$path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'data' . DIRECTORY_SEPARATOR;
+
+		$filePaths = array(array($path . 'lorem.txt', 446));
+		if (!\OC_Util::runningOnWindows()) {
+			$filePaths[] = array($path . 'strängé filename (duplicate #2).txt', 446);
+		}
+
+		return $filePaths;
+	}
+
+	/**
+	 * @dataProvider dataFileNameProvider
+	 */
+	public function testGetFileSizeViaCurl($filename, $fileSize) {
 		if (!extension_loaded('curl')) {
 			$this->markTestSkipped(
 				'The PHP curl extension is required for this test.'
 			);
 		}
 		$this->assertSame(
-			$this->fileSize,
-			$this->helper->getFileSizeViaCurl($this->filename)
+			$fileSize,
+			$this->helper->getFileSizeViaCurl($filename)
 		);
 	}
 
-	public function testGetFileSizeViaCOM() {
+	/**
+	 * @dataProvider dataFileNameProvider
+	 */
+	public function testGetFileSizeViaCOM($filename, $fileSize) {
 		if (!extension_loaded('COM')) {
 			$this->markTestSkipped(
 				'The PHP Windows COM extension is required for this test.'
 			);
 		}
 		$this->assertSame(
-			$this->fileSize,
-			$this->helper->getFileSizeViaCOM($this->filename)
+			$fileSize,
+			$this->helper->getFileSizeViaCOM($filename)
 		);
 	}
 
-	public function testGetFileSizeViaExec() {
+	/**
+	 * @dataProvider dataFileNameProvider
+	 */
+	public function testGetFileSizeViaExec($filename, $fileSize) {
 		if (!\OC_Helper::is_function_enabled('exec')) {
 			$this->markTestSkipped(
 				'The exec() function needs to be enabled for this test.'
 			);
 		}
 		$this->assertSame(
-			$this->fileSize,
-			$this->helper->getFileSizeViaExec($this->filename)
+			$fileSize,
+			$this->helper->getFileSizeViaExec($filename)
 		);
 	}
 
-	public function testGetFileSizeNative() {
+	/**
+	 * @dataProvider dataFileNameProvider
+	 */
+	public function testGetFileSizeNative($filename, $fileSize) {
 		$this->assertSame(
-			$this->fileSize,
-			$this->helper->getFileSizeNative($this->filename)
+			$fileSize,
+			$this->helper->getFileSizeNative($filename)
 		);
 	}
 }
-- 
GitLab


From 20cd9a134f0a8bfedd9b4d72a3ad1ef2821f2477 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 6 Nov 2014 18:17:21 +0100
Subject: [PATCH 354/616] Make second argument optional

Equivalent to addVendorScript und addScript from OC_Util
---
 lib/private/template/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index ca0c27a8078..e9f9f39c191 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -45,7 +45,7 @@ function script($app, $file) {
  * @param string|string[] $file the filename,
  * if an array is given it will add all scripts
  */
-function vendor_script($app, $file) {
+function vendor_script($app, $file = null) {
 	if(is_array($file)) {
 		foreach($file as $f) {
 			OC_Util::addVendorScript($app, $f);
@@ -77,7 +77,7 @@ function style($app, $file) {
  * @param string|string[] $file the filename,
  * if an array is given it will add all styles
  */
-function vendor_style($app, $file) {
+function vendor_style($app, $file = null) {
 	if(is_array($file)) {
 		foreach($file as $f) {
 			OC_Util::addVendorStyle($app, $f);
-- 
GitLab


From 9c79c2fa17be40a6c7b8212c6e7a89c2f6470d04 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 4 Nov 2014 15:15:58 +0100
Subject: [PATCH 355/616] Dont make real users in tests

---
 apps/files_sharing/tests/testcase.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index a098feb550d..70cd45a8185 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -65,9 +65,11 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
 
 		// create users
-		self::loginHelper(self::TEST_FILES_SHARING_API_USER1, true);
-		self::loginHelper(self::TEST_FILES_SHARING_API_USER2, true);
-		self::loginHelper(self::TEST_FILES_SHARING_API_USER3, true);
+		$backend = new \OC_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);
+		$backend->createUser(self::TEST_FILES_SHARING_API_USER3, self::TEST_FILES_SHARING_API_USER3);
 
 		// create group
 		\OC_Group::createGroup(self::TEST_FILES_SHARING_API_GROUP1);
-- 
GitLab


From 7ecd2207157efffabdf5ec8f36c6f4accc348fc4 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 4 Nov 2014 15:16:58 +0100
Subject: [PATCH 356/616] Setup shared mounts for the correct user when setting
 up the filesystem for the non-logged in user

---
 apps/files_sharing/lib/sharedmount.php     |  8 +++----
 apps/files_sharing/lib/sharedstorage.php   |  5 +++--
 apps/files_sharing/tests/sharedstorage.php | 26 ++++++++++++++++++++++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/apps/files_sharing/lib/sharedmount.php b/apps/files_sharing/lib/sharedmount.php
index 4ad2d4e6b3e..a93ecfb3b1b 100644
--- a/apps/files_sharing/lib/sharedmount.php
+++ b/apps/files_sharing/lib/sharedmount.php
@@ -22,15 +22,15 @@ class SharedMount extends Mount implements MoveableMount {
 
 	public function __construct($storage, $mountpoint, $arguments = null, $loader = null) {
 		// first update the mount point before creating the parent
-		$newMountPoint = self::verifyMountPoint($arguments['share']);
-		$absMountPoint = '/' . \OCP\User::getUser() . '/files' . $newMountPoint;
+		$newMountPoint = $this->verifyMountPoint($arguments['share'], $arguments['user']);
+		$absMountPoint = '/' . $arguments['user'] . '/files' . $newMountPoint;
 		parent::__construct($storage, $absMountPoint, $arguments, $loader);
 	}
 
 	/**
 	 * check if the parent folder exists otherwise move the mount point up
 	 */
-	private static function verifyMountPoint(&$share) {
+	private function verifyMountPoint(&$share, $user) {
 
 		$mountPoint = basename($share['file_target']);
 		$parent = dirname($share['file_target']);
@@ -42,7 +42,7 @@ class SharedMount extends Mount implements MoveableMount {
 		$newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget(
 				\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
 				array(),
-				new \OC\Files\View('/' . \OCP\User::getUser() . '/files')
+				new \OC\Files\View('/' . $user . '/files')
 				);
 
 		if($newMountPoint !== $share['file_target']) {
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 5ce15d9a012..19ee6085e47 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -397,7 +397,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	}
 
 	public static function setup($options) {
-		$shares = \OCP\Share::getItemsSharedWith('file');
+		$shares = \OCP\Share::getItemsSharedWithUser('file', $options['user']);
 		$manager = Filesystem::getMountManager();
 		$loader = Filesystem::getLoader();
 		if (!\OCP\User::isLoggedIn() || \OCP\User::getUser() != $options['user']
@@ -411,7 +411,8 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 							$options['user_dir'] . '/' . $share['file_target'],
 							array(
 								'share' => $share,
-								),
+								'user' => $options['user']
+							),
 							$loader
 							);
 					$manager->addMount($mount);
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index b106add1300..ab15e8fe3ba 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -197,4 +197,30 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
 		$this->assertTrue($result);
 	}
 
+	function testMountSharesOtherUser() {
+		$folderInfo = $this->view->getFileInfo($this->folder);
+		$fileInfo = $this->view->getFileInfo($this->filename);
+		$rootView = new \OC\Files\View('');
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+
+		// share 2 different files with 2 different users
+		\OCP\Share::shareItem('folder', $folderInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER2, 31);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
+			self::TEST_FILES_SHARING_API_USER3, 31);
+
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
+		$this->assertTrue($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/' . $this->folder));
+		OC_Hook::emit('OC_Filesystem', 'setup', array('user' => self::TEST_FILES_SHARING_API_USER3, 'user_dir' => \OC_User::getHome(self::TEST_FILES_SHARING_API_USER3)));
+
+		$this->assertTrue($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER3 . '/files/' . $this->filename));
+
+		// make sure we didn't double setup shares for user 2 or mounted the shares for user 3 in user's 2 home
+		$this->assertFalse($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/' . $this->folder .' (2)'));
+		$this->assertFalse($rootView->file_exists('/' . self::TEST_FILES_SHARING_API_USER2 . '/files/' . $this->filename));
+
+		//cleanup
+		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
+		$this->view->unlink($this->folder);
+	}
 }
-- 
GitLab


From c21d1da01a9a5fb81d75b42c4c514743dc827caa Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 6 Nov 2014 17:22:59 +0100
Subject: [PATCH 357/616] Support displaynames for dummy user backend

---
 lib/private/user/dummy.php | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/private/user/dummy.php b/lib/private/user/dummy.php
index dbcbb2a46f7..fd0201734fa 100644
--- a/lib/private/user/dummy.php
+++ b/lib/private/user/dummy.php
@@ -26,9 +26,11 @@
  */
 class OC_User_Dummy extends OC_User_Backend {
 	private $users = array();
+	private $displayNames = array();
 
 	/**
 	 * Create a new user
+	 *
 	 * @param string $uid The username of the user to create
 	 * @param string $password The password of the new user
 	 * @return bool
@@ -47,6 +49,7 @@ class OC_User_Dummy extends OC_User_Backend {
 
 	/**
 	 * delete a user
+	 *
 	 * @param string $uid The username of the user to delete
 	 * @return bool
 	 *
@@ -63,6 +66,7 @@ class OC_User_Dummy extends OC_User_Backend {
 
 	/**
 	 * Set password
+	 *
 	 * @param string $uid The username
 	 * @param string $password The new password
 	 * @return bool
@@ -80,6 +84,7 @@ class OC_User_Dummy extends OC_User_Backend {
 
 	/**
 	 * Check if the password is correct
+	 *
 	 * @param string $uid The username
 	 * @param string $password The password
 	 * @return string
@@ -97,6 +102,7 @@ class OC_User_Dummy extends OC_User_Backend {
 
 	/**
 	 * Get a list of all users
+	 *
 	 * @param string $search
 	 * @param int $limit
 	 * @param int $offset
@@ -105,12 +111,12 @@ class OC_User_Dummy extends OC_User_Backend {
 	 * Get a list of all users.
 	 */
 	public function getUsers($search = '', $limit = null, $offset = null) {
-		if(empty($search)) {
+		if (empty($search)) {
 			return array_keys($this->users);
 		}
 		$result = array();
-		foreach(array_keys($this->users) as $user) {
-			if(stripos($user, $search) !== false) {
+		foreach (array_keys($this->users) as $user) {
+			if (stripos($user, $search) !== false) {
 				$result[] = $user;
 			}
 		}
@@ -119,6 +125,7 @@ class OC_User_Dummy extends OC_User_Backend {
 
 	/**
 	 * check if a user exists
+	 *
 	 * @param string $uid the username
 	 * @return boolean
 	 */
@@ -141,4 +148,12 @@ class OC_User_Dummy extends OC_User_Backend {
 	public function countUsers() {
 		return 0;
 	}
+
+	public function setDisplayName($uid, $displayName) {
+		$this->displayNames[$uid] = $displayName;
+	}
+
+	public function getDisplayName($uid) {
+		return isset($this->displayNames[$uid])? $this->displayNames[$uid]: $uid;
+	}
 }
-- 
GitLab


From 0f3fd89f7db7e636ec3d27da83b5390238165315 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 6 Nov 2014 18:31:33 +0100
Subject: [PATCH 358/616] Fix sharing tests

---
 apps/files_sharing/tests/api.php         |  3 +++
 apps/files_sharing/tests/sharedmount.php |  4 ++++
 apps/files_sharing/tests/testcase.php    | 10 ++++++++--
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 88acbd8e775..453133fee31 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -35,6 +35,9 @@ class Test_Files_Sharing_Api extends TestCase {
 	function setUp() {
 		parent::setUp();
 
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
+		\OC::$server->getAppConfig()->setValue('core', 'shareapi_expire_after_n_days', '7');
+
 		$this->folder = self::TEST_FOLDER_NAME;
 		$this->subfolder  = '/subfolder_share_api_test';
 		$this->subsubfolder = '/subsubfolder_share_api_test';
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index e991d381e14..6d155f174ba 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -226,6 +226,10 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
 }
 
 class DummyTestClassSharedMount extends \OCA\Files_Sharing\SharedMount {
+	public function __construct($storage, $mountpoint, $arguments = null, $loader = null){
+		// noop
+	}
+
 	public function stripUserFilesPathDummy($path) {
 		return $this->stripUserFilesPath($path);
 	}
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index 70cd45a8185..78277dc907f 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -72,8 +72,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		$backend->createUser(self::TEST_FILES_SHARING_API_USER3, self::TEST_FILES_SHARING_API_USER3);
 
 		// create group
-		\OC_Group::createGroup(self::TEST_FILES_SHARING_API_GROUP1);
-		\OC_Group::addToGroup(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_GROUP1);
+		$groupBackend = new \OC_Group_Dummy();
+		$groupBackend->createGroup(self::TEST_FILES_SHARING_API_GROUP1);
+		$groupBackend->createGroup('group');
+		$groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER1, 'group');
+		$groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER2, 'group');
+		$groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER3, 'group');
+		$groupBackend->addToGroup(self::TEST_FILES_SHARING_API_USER2, self::TEST_FILES_SHARING_API_GROUP1);
+		\OC_Group::useBackend($groupBackend);
 
 	}
 
-- 
GitLab


From 81e6329c049e93dcda4b8af2b6cdecdebf8b574d Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 6 Nov 2014 21:26:50 +0100
Subject: [PATCH 359/616] second parameter in template shortcuts script() and
 style() is optional

---
 lib/private/template/functions.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/private/template/functions.php b/lib/private/template/functions.php
index e9f9f39c191..4172d47ba61 100644
--- a/lib/private/template/functions.php
+++ b/lib/private/template/functions.php
@@ -29,7 +29,7 @@ function print_unescaped($string) {
  * @param string|string[] $file the filename,
  * if an array is given it will add all scripts
  */
-function script($app, $file) {
+function script($app, $file = null) {
 	if(is_array($file)) {
 		foreach($file as $f) {
 			OC_Util::addScript($app, $f);
@@ -61,7 +61,7 @@ function vendor_script($app, $file = null) {
  * @param string|string[] $file the filename,
  * if an array is given it will add all styles
  */
-function style($app, $file) {
+function style($app, $file = null) {
 	if(is_array($file)) {
 		foreach($file as $f) {
 			OC_Util::addStyle($app, $f);
-- 
GitLab


From 62b859d66fa93a0954831985c124d5feb5a185fa Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 28 Jan 2014 19:57:07 -0800
Subject: [PATCH 360/616] Migrate Google Drive storage app to v1.0.0 of the
 client library

---
 apps/files_external/ajax/google.php |  2 +-
 apps/files_external/lib/google.php  | 48 ++++++++++++++---------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
index 40c10aa5d07..f967140a6c8 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -1,7 +1,7 @@
 <?php
 set_include_path(get_include_path().PATH_SEPARATOR.
 	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
-require_once 'Google_Client.php';
+require_once 'Google/Client.php';
 
 OCP\JSON::checkAppEnabled('files_external');
 OCP\JSON::checkLoggedIn();
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 62b0f182e98..ab0385ec20b 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -23,8 +23,8 @@ namespace OC\Files\Storage;
 
 set_include_path(get_include_path().PATH_SEPARATOR.
 	\OC_App::getAppPath('files_external').'/3rdparty/google-api-php-client/src');
-require_once 'Google_Client.php';
-require_once 'contrib/Google_DriveService.php';
+require_once 'Google/Client.php';
+require_once 'Google/Service/Drive.php';
 
 class Google extends \OC\Files\Storage\Common {
 
@@ -46,14 +46,13 @@ class Google extends \OC\Files\Storage\Common {
 			&& isset($params['client_id']) && isset($params['client_secret'])
 			&& isset($params['token'])
 		) {
-			$client = new \Google_Client();
-			$client->setClientId($params['client_id']);
-			$client->setClientSecret($params['client_secret']);
-			$client->setScopes(array('https://www.googleapis.com/auth/drive'));
-			$client->setUseObjects(true);
-			$client->setAccessToken($params['token']);
+			$this->client = new \Google_Client();
+			$this->client->setClientId($params['client_id']);
+			$this->client->setClientSecret($params['client_secret']);
+			$this->client->setScopes(array('https://www.googleapis.com/auth/drive'));
+			$this->client->setAccessToken($params['token']);
 			// note: API connection is lazy
-			$this->service = new \Google_DriveService($client);
+			$this->service = new \Google_Service_Drive($this->client);
 			$token = json_decode($params['token'], true);
 			$this->id = 'google::'.substr($params['client_id'], 0, 30).$token['created'];
 		} else {
@@ -66,9 +65,9 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * Get the Google_DriveFile object for the specified path
+	 * Get the Google_Service_Drive_DriveFile object for the specified path
 	 * @param string $path
-	 * @return string
+	 * @return Google_Service_Drive_DriveFile
 	 */
 	private function getDriveFile($path) {
 		// Remove leading and trailing slashes
@@ -115,7 +114,7 @@ class Google extends \OC\Files\Storage\Common {
 							$pathWithoutExt = substr($path, 0, $pos);
 							$file = $this->getDriveFile($pathWithoutExt);
 							if ($file) {
-								// Switch cached Google_DriveFile to the correct index
+								// Switch cached Google_Service_Drive_DriveFile to the correct index
 								unset($this->driveFiles[$pathWithoutExt]);
 								$this->driveFiles[$path] = $file;
 								$parentId = $file->getId();
@@ -133,9 +132,9 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * Set the Google_DriveFile object in the cache
+	 * Set the Google_Service_Drive_DriveFile object in the cache
 	 * @param string $path
-	 * @param Google_DriveFile|false $file
+	 * @param Google_Service_Drive_DriveFile|false $file
 	 */
 	private function setDriveFile($path, $file) {
 		$path = trim($path, '/');
@@ -188,10 +187,10 @@ class Google extends \OC\Files\Storage\Common {
 		if (!$this->is_dir($path)) {
 			$parentFolder = $this->getDriveFile(dirname($path));
 			if ($parentFolder) {
-				$folder = new \Google_DriveFile();
+				$folder = new \Google_Service_Drive_DriveFile();
 				$folder->setTitle(basename($path));
 				$folder->setMimeType(self::FOLDER);
-				$parent = new \Google_ParentReference();
+				$parent = new \Google_Service_Drive_ParentReference();
 				$parent->setId($parentFolder->getId());
 				$folder->setParents(array($parent));
 				$result = $this->service->files->insert($folder);
@@ -266,7 +265,7 @@ class Google extends \OC\Files\Storage\Common {
 							$this->onDuplicateFileDetected($filepath);
 						}
 					} else {
-						// Cache the Google_DriveFile for future use
+						// Cache the Google_Service_Drive_DriveFile for future use
 						$this->setDriveFile($filepath, $child);
 						$files[] = $name;
 					}
@@ -356,7 +355,7 @@ class Google extends \OC\Files\Storage\Common {
 				// Change file parent
 				$parentFolder2 = $this->getDriveFile(dirname($path2));
 				if ($parentFolder2) {
-					$parent = new \Google_ParentReference();
+					$parent = new \Google_Service_Drive_ParentReference();
 					$parent->setId($parentFolder2->getId());
 					$file->setParents(array($parent));
 				} else {
@@ -395,8 +394,8 @@ class Google extends \OC\Files\Storage\Common {
 						$downloadUrl = $file->getDownloadUrl();
 					}
 					if (isset($downloadUrl)) {
-						$request = new \Google_HttpRequest($downloadUrl, 'GET', null, null);
-						$httpRequest = \Google_Client::$io->authenticatedRequest($request);
+						$request = new \Google_Http_Request($downloadUrl, 'GET', null, null);
+						$httpRequest = $this->client->getAuth()->authenticatedRequest($request);
 						if ($httpRequest->getResponseHttpCode() == 200) {
 							$tmpFile = \OC_Helper::tmpFile($ext);
 							$data = $httpRequest->getResponseBody();
@@ -440,16 +439,17 @@ class Google extends \OC\Files\Storage\Common {
 				$params = array(
 					'data' => $data,
 					'mimeType' => $mimetype,
+					'uploadType' => 'media'
 				);
 				$result = false;
 				if ($this->file_exists($path)) {
 					$file = $this->getDriveFile($path);
 					$result = $this->service->files->update($file->getId(), $file, $params);
 				} else {
-					$file = new \Google_DriveFile();
+					$file = new \Google_Service_Drive_DriveFile();
 					$file->setTitle(basename($path));
 					$file->setMimeType($mimetype);
-					$parent = new \Google_ParentReference();
+					$parent = new \Google_Service_Drive_ParentReference();
 					$parent->setId($parentFolder->getId());
 					$file->setParents(array($parent));
 					$result = $this->service->files->insert($file, $params);
@@ -506,9 +506,9 @@ class Google extends \OC\Files\Storage\Common {
 		} else {
 			$parentFolder = $this->getDriveFile(dirname($path));
 			if ($parentFolder) {
-				$file = new \Google_DriveFile();
+				$file = new \Google_Service_Drive_DriveFile();
 				$file->setTitle(basename($path));
-				$parent = new \Google_ParentReference();
+				$parent = new \Google_Service_Drive_ParentReference();
 				$parent->setId($parentFolder->getId());
 				$file->setParents(array($parent));
 				$result = $this->service->files->insert($file);
-- 
GitLab


From d96c06f1a3266a2474c304e45f4c00fe65b44df4 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 28 Jan 2014 22:24:04 -0800
Subject: [PATCH 361/616] files_external/3rdparty: update google-api-php-client
 to 1.0.2-beta

---
 .../3rdparty/google-api-php-client/NOTICE     |    4 -
 .../3rdparty/google-api-php-client/README     |   40 -
 .../3rdparty/google-api-php-client/README.md  |   57 +
 .../Auth/Abstract.php}                        |   23 +-
 .../Auth/AssertionCredentials.php}            |   45 +-
 .../src/Google/Auth/Exception.php             |   22 +
 .../Auth/LoginTicket.php}                     |   20 +-
 .../src/Google/Auth/OAuth2.php                |  579 ++
 .../src/Google/Auth/Simple.php                |   92 +
 .../Cache/Abstract.php}                       |   16 +-
 .../src/Google/Cache/Apc.php                  |   73 +
 .../src/Google/Cache/Exception.php            |   21 +
 .../src/Google/Cache/File.php                 |  145 +
 .../src/Google/Cache/Memcache.php             |  137 +
 .../src/Google/Client.php                     |  596 ++
 .../src/Google/Collection.php                 |   94 +
 .../src/Google/Config.php                     |  301 +
 .../Exception.php}                            |    8 +-
 .../Http/Batch.php}                           |   79 +-
 .../Http/CacheParser.php}                     |   37 +-
 .../src/Google/Http/MediaFileUpload.php       |  270 +
 .../Google_REST.php => Google/Http/REST.php}  |   66 +-
 .../src/Google/Http/Request.php               |  474 ++
 .../src/Google/IO/Abstract.php                |  244 +
 .../src/Google/IO/Exception.php               |   22 +
 .../src/Google/IO/Stream.php                  |  165 +
 .../src/{io => Google/IO}/cacerts.pem         |   24 +
 .../src/Google/Model.php                      |  218 +
 .../src/Google/Service.php                    |   39 +
 .../src/Google/Service/Drive.php              | 5732 +++++++++++++++++
 .../src/Google/Service/Exception.php          |   53 +
 .../src/Google/Service/Resource.php           |  210 +
 .../Signer/Abstract.php}                      |    5 +-
 .../Signer/P12.php}                           |   39 +-
 .../Google_Utils.php => Google/Utils.php}     |   54 +-
 .../src/Google/Utils/URITemplate.php          |  333 +
 .../Verifier/Abstract.php}                    |    5 +-
 .../Verifier/Pem.php}                         |   23 +-
 .../src/Google_Client.php                     |  462 --
 .../src/auth/Google_AuthNone.php              |   48 -
 .../src/auth/Google_OAuth2.php                |  445 --
 .../src/cache/Google_ApcCache.php             |   98 -
 .../src/cache/Google_FileCache.php            |  137 -
 .../src/cache/Google_MemcacheCache.php        |  130 -
 .../google-api-php-client/src/config.php      |   81 -
 .../src/contrib/Google_DriveService.php       | 3143 ---------
 .../src/external/URITemplateParser.php        |  209 -
 .../src/io/Google_CurlIO.php                  |  278 -
 .../src/io/Google_HttpRequest.php             |  304 -
 .../src/io/Google_IO.php                      |   49 -
 .../src/service/Google_MediaFileUpload.php    |  262 -
 .../src/service/Google_Model.php              |  115 -
 .../src/service/Google_ServiceResource.php    |  205 -
 53 files changed, 10171 insertions(+), 6160 deletions(-)
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/NOTICE
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/README
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/README.md
 rename apps/files_external/3rdparty/google-api-php-client/src/{auth/Google_Auth.php => Google/Auth/Abstract.php} (61%)
 rename apps/files_external/3rdparty/google-api-php-client/src/{auth/Google_AssertionCredentials.php => Google/Auth/AssertionCredentials.php} (72%)
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Exception.php
 rename apps/files_external/3rdparty/google-api-php-client/src/{auth/Google_LoginTicket.php => Google/Auth/LoginTicket.php} (82%)
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Simple.php
 rename apps/files_external/3rdparty/google-api-php-client/src/{cache/Google_Cache.php => Google/Cache/Abstract.php} (82%)
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Apc.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Exception.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/File.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Memcache.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Collection.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Config.php
 rename apps/files_external/3rdparty/google-api-php-client/src/{service/Google_Service.php => Google/Exception.php} (83%)
 rename apps/files_external/3rdparty/google-api-php-client/src/{service/Google_BatchRequest.php => Google/Http/Batch.php} (52%)
 rename apps/files_external/3rdparty/google-api-php-client/src/{io/Google_CacheParser.php => Google/Http/CacheParser.php} (87%)
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Http/MediaFileUpload.php
 rename apps/files_external/3rdparty/google-api-php-client/src/{io/Google_REST.php => Google/Http/REST.php} (64%)
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Request.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Abstract.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Exception.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Stream.php
 rename apps/files_external/3rdparty/google-api-php-client/src/{io => Google/IO}/cacerts.pem (96%)
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Service.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Drive.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Exception.php
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Resource.php
 rename apps/files_external/3rdparty/google-api-php-client/src/{auth/Google_Signer.php => Google/Signer/Abstract.php} (91%)
 rename apps/files_external/3rdparty/google-api-php-client/src/{auth/Google_P12Signer.php => Google/Signer/P12.php} (66%)
 rename apps/files_external/3rdparty/google-api-php-client/src/{service/Google_Utils.php => Google/Utils.php} (79%)
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php
 rename apps/files_external/3rdparty/google-api-php-client/src/{auth/Google_Verifier.php => Google/Verifier/Abstract.php} (91%)
 rename apps/files_external/3rdparty/google-api-php-client/src/{auth/Google_PemVerifier.php => Google/Verifier/Pem.php} (75%)
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google_Client.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AuthNone.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/auth/Google_OAuth2.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/cache/Google_ApcCache.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/cache/Google_FileCache.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/cache/Google_MemcacheCache.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/config.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/contrib/Google_DriveService.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/io/Google_CurlIO.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/io/Google_HttpRequest.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/io/Google_IO.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/service/Google_MediaFileUpload.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/service/Google_Model.php
 delete mode 100644 apps/files_external/3rdparty/google-api-php-client/src/service/Google_ServiceResource.php

diff --git a/apps/files_external/3rdparty/google-api-php-client/NOTICE b/apps/files_external/3rdparty/google-api-php-client/NOTICE
deleted file mode 100644
index 22d7cb59867..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/NOTICE
+++ /dev/null
@@ -1,4 +0,0 @@
-This product contains the following libraries:
-
-XRDS-Simple library from http://code.google.com/p/diso/
-Apache License 2.0
diff --git a/apps/files_external/3rdparty/google-api-php-client/README b/apps/files_external/3rdparty/google-api-php-client/README
deleted file mode 100644
index 42c42c0d5c7..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/README
+++ /dev/null
@@ -1,40 +0,0 @@
-Google APIs Client Library for PHP
-=====================================
-
-== Description
-The Google API Client Library enables you to work with Google APIs such as Google+, Drive, Tasks, or Latitude on your server.
-
-Requirements:
-  PHP 5.2.x or higher [http://www.php.net/]
-  PHP Curl extension [http://www.php.net/manual/en/intro.curl.php]
-  PHP JSON extension [http://php.net/manual/en/book.json.php]
-
-Project page:
-  http://code.google.com/p/google-api-php-client
-
-OAuth 2 instructions:
-  http://code.google.com/p/google-api-php-client/wiki/OAuth2
-
-Report a defect or feature request here:
-  http://code.google.com/p/google-api-php-client/issues/entry
-
-Subscribe to project updates in your feed reader:
-  http://code.google.com/feeds/p/google-api-php-client/updates/basic
-
-Supported sample applications:
-  http://code.google.com/p/google-api-php-client/wiki/Samples
-
-== Basic Example
-  <?php
-  require_once 'path/to/src/Google_Client.php';
-  require_once 'path/to/src/contrib/apiBooksService.php';
-
-  $client = new Google_Client();
-  $service = new Google_BooksService($client);
-
-  $optParams = array('filter' => 'free-ebooks');
-  $results = $service->volumes->listVolumes('Henry David Thoreau', $optParams);
-
-  foreach ($results['items'] as $item) {
-    print($item['volumeInfo']['title'] . '<br>');
-  }
diff --git a/apps/files_external/3rdparty/google-api-php-client/README.md b/apps/files_external/3rdparty/google-api-php-client/README.md
new file mode 100644
index 00000000000..9f7949c1794
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/README.md
@@ -0,0 +1,57 @@
+# Google APIs Client Library for PHP #
+
+## Description ##
+The Google API Client Library enables you to work with Google APIs such as Google+, Drive, or YouTube on your server.
+
+## Requirements ##
+* [PHP 5.2.1 or higher](http://www.php.net/)
+* [PHP JSON extension](http://php.net/manual/en/book.json.php)
+
+## Developer Documentation ##
+http://developers.google.com/api-client-library/php
+
+## Basic Example ##
+See the examples/ directory for examples of the key client features.
+```PHP
+<?php
+  require_once 'Google/Client.php';
+  require_once 'Google/Service/Books.php';
+  $client = new Google_Client();
+  $client->setApplicationName("Client_Library_Examples");
+  $client->setDeveloperKey("YOUR_APP_KEY");
+  $service = new Google_Service_Books($client);
+  $optParams = array('filter' => 'free-ebooks');
+  $results = $service->volumes->listVolumes('Henry David Thoreau', $optParams);
+
+  foreach ($results as $item) {
+    echo $item['volumeInfo']['title'], "<br /> \n";
+  }
+```
+
+## Frequently Asked Questions ##
+
+### What do I do if something isn't working? ###
+
+For support with the library the best place to ask is via the  google-api-php-client tag on StackOverflow: http://stackoverflow.com/questions/tagged/google-api-php-client
+
+If there is a specific bug with the library, please file a issue in the Github issues tracker, including a (minimal) example of the failing code and any specific errors retrieved. Feature requests can also be filed, as long as they are core library requests, and not-API specific: for those, refer to the documentation for the individual APIs for the best place to file requests. Please try to provide a clear statement of the problem that the feature would address.
+
+### How do I contribute? ###
+
+We accept contributions via Github Pull Requests, but all contributors need to be covered by the standard Google Contributor License Agreement. You can find links, and more instructions, in the documentation: https://developers.google.com/api-client-library/php/contribute
+
+### Why do you still support 5.2? ###
+
+When we started working on the 1.0.0 branch we knew there were several fundamental issues to fix with the 0.6 releases of the library. At that time we looked at the usage of the library, and other related projects, and determined that there was still a large and active base of PHP 5.2 installs. You can see this in statistics such as the PHP versions chart in the Wordpress stats: http://wordpress.org/about/stats/. We will keep looking at the types of usage we see, and try to take advantage of newer PHP features where possible.
+
+### Why does Google_..._Service have weird names? ###
+
+The _Service classes are generally automatically generated from the API discovery documents: https://developers.google.com/discovery/. Sometimes new features are added to APIs with unusual names, which can cause some unexpected or non-standard style naming in the PHP classes. 
+
+## Code Quality ##
+
+Copy the ruleset.xml in style/ into a new directory named GAPI/ in your
+/usr/share/php/PHP/CodeSniffer/Standards (or appropriate equivalent directory),
+and run code sniffs with:
+
+        phpcs --standard=GAPI src/
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Auth.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Abstract.php
similarity index 61%
rename from apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Auth.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Abstract.php
index 010782d4a60..344aad874f4 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Auth.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Abstract.php
@@ -14,23 +14,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-require_once "Google_AuthNone.php";
-require_once "Google_OAuth2.php";
+require_once "Google/Http/Request.php";
 
 /**
  * Abstract class for the Authentication in the API client
  * @author Chris Chabot <chabotc@google.com>
  *
  */
-abstract class Google_Auth {
-  abstract public function authenticate($service);
-  abstract public function sign(Google_HttpRequest $request);
+abstract class Google_Auth_Abstract
+{
+  /**
+   * An utility function that first calls $this->auth->sign($request) and then
+   * executes makeRequest() on that signed request. Used for when a request
+   * should be authenticated
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request $request
+   */
+  abstract public function authenticatedRequest(Google_Http_Request $request);
+
+  abstract public function authenticate($code);
+  abstract public function sign(Google_Http_Request $request);
   abstract public function createAuthUrl($scope);
 
-  abstract public function getAccessToken();
-  abstract public function setAccessToken($accessToken);
-  abstract public function setDeveloperKey($developerKey);
   abstract public function refreshToken($refreshToken);
   abstract public function revokeToken();
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AssertionCredentials.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/AssertionCredentials.php
similarity index 72%
rename from apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AssertionCredentials.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/AssertionCredentials.php
index d9b4394ba38..be93df33d50 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AssertionCredentials.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/AssertionCredentials.php
@@ -15,12 +15,17 @@
  * limitations under the License.
  */
 
+require_once "Google/Auth/OAuth2.php";
+require_once "Google/Signer/P12.php";
+require_once "Google/Utils.php";
+
 /**
  * Credentials object used for OAuth 2.0 Signed JWT assertion grants.
  *
  * @author Chirag Shah <chirags@google.com>
  */
-class Google_AssertionCredentials {
+class Google_Auth_AssertionCredentials
+{
   const MAX_TOKEN_LIFETIME_SECS = 3600;
 
   public $serviceAccountName;
@@ -34,6 +39,7 @@ class Google_AssertionCredentials {
    * @link http://tools.ietf.org/html/draft-ietf-oauth-json-web-token-06
    */
   public $prn;
+  private $useCache;
 
   /**
    * @param $serviceAccountName
@@ -42,8 +48,9 @@ class Google_AssertionCredentials {
    * @param string $privateKeyPassword
    * @param string $assertionType
    * @param bool|string $sub The email address of the user for which the
-   *               application is requesting delegated access.
-   *
+   *              application is requesting delegated access.
+   * @param bool useCache Whether to generate a cache key and allow
+   *              automatic caching of the generated token.
    */
   public function __construct(
       $serviceAccountName,
@@ -51,7 +58,9 @@ class Google_AssertionCredentials {
       $privateKey,
       $privateKeyPassword = 'notasecret',
       $assertionType = 'http://oauth.net/grant_type/jwt/1.0/bearer',
-      $sub = false) {
+      $sub = false,
+      $useCache = true
+  ) {
     $this->serviceAccountName = $serviceAccountName;
     $this->scopes = is_string($scopes) ? $scopes : implode(' ', $scopes);
     $this->privateKey = $privateKey;
@@ -59,13 +68,32 @@ class Google_AssertionCredentials {
     $this->assertionType = $assertionType;
     $this->sub = $sub;
     $this->prn = $sub;
+    $this->useCache = $useCache;
+  }
+  
+  /**
+   * Generate a unique key to represent this credential.
+   * @return string
+   */
+  public function getCacheKey()
+  {
+    if (!$this->useCache) {
+      return false;
+    }
+    $h = $this->sub;
+    $h .= $this->assertionType;
+    $h .= $this->privateKey;
+    $h .= $this->scopes;
+    $h .= $this->serviceAccountName;
+    return md5($h);
   }
 
-  public function generateAssertion() {
+  public function generateAssertion()
+  {
     $now = time();
 
     $jwtParams = array(
-          'aud' => Google_OAuth2::OAUTH2_TOKEN_URI,
+          'aud' => Google_Auth_OAuth2::OAUTH2_TOKEN_URI,
           'scope' => $this->scopes,
           'iat' => $now,
           'exp' => $now + self::MAX_TOKEN_LIFETIME_SECS,
@@ -86,7 +114,8 @@ class Google_AssertionCredentials {
    * @param array $payload
    * @return string The signed JWT.
    */
-  private function makeSignedJwt($payload) {
+  private function makeSignedJwt($payload)
+  {
     $header = array('typ' => 'JWT', 'alg' => 'RS256');
 
     $segments = array(
@@ -95,7 +124,7 @@ class Google_AssertionCredentials {
     );
 
     $signingInput = implode('.', $segments);
-    $signer = new Google_P12Signer($this->privateKey, $this->privateKeyPassword);
+    $signer = new Google_Signer_P12($this->privateKey, $this->privateKeyPassword);
     $signature = $signer->sign($signingInput);
     $segments[] = Google_Utils::urlSafeB64Encode($signature);
 
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Exception.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Exception.php
new file mode 100644
index 00000000000..65067ee4436
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Exception.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google/Exception.php";
+
+class Google_Auth_Exception extends Google_Exception
+{
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_LoginTicket.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/LoginTicket.php
similarity index 82%
rename from apps/files_external/3rdparty/google-api-php-client/src/auth/Google_LoginTicket.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/LoginTicket.php
index c0ce614232b..bcf798ae5ff 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_LoginTicket.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/LoginTicket.php
@@ -15,13 +15,16 @@
  * limitations under the License.
  */
 
+require_once "Google/Auth/Exception.php";
+
 /**
  * Class to hold information about an authenticated login.
  *
  * @author Brian Eaton <beaton@google.com>
  */
-class Google_LoginTicket {
-  const USER_ATTR = "id";
+class Google_Auth_LoginTicket
+{
+  const USER_ATTR = "sub";
 
   // Information from id token envelope.
   private $envelope;
@@ -35,21 +38,23 @@ class Google_LoginTicket {
    * @param string $envelope Header from a verified authentication token.
    * @param string $payload Information from a verified authentication token.
    */
-  public function __construct($envelope, $payload) {
+  public function __construct($envelope, $payload)
+  {
     $this->envelope = $envelope;
     $this->payload = $payload;
   }
 
   /**
    * Returns the numeric identifier for the user.
-   * @throws Google_AuthException
+   * @throws Google_Auth_Exception
    * @return
    */
-  public function getUserId() {
+  public function getUserId()
+  {
     if (array_key_exists(self::USER_ATTR, $this->payload)) {
       return $this->payload[self::USER_ATTR];
     }
-    throw new Google_AuthException("No user_id in token");
+    throw new Google_Auth_Exception("No user_id in token");
   }
 
   /**
@@ -57,7 +62,8 @@ class Google_LoginTicket {
    * various information about the user session.
    * @return array
    */
-  public function getAttributes() {
+  public function getAttributes()
+  {
     return array("envelope" => $this->envelope, "payload" => $this->payload);
   }
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
new file mode 100644
index 00000000000..e66f34c1efd
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
@@ -0,0 +1,579 @@
+<?php
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google/Auth/Abstract.php";
+require_once "Google/Auth/AssertionCredentials.php";
+require_once "Google/Auth/Exception.php";
+require_once "Google/Auth/LoginTicket.php";
+require_once "Google/Client.php";
+require_once "Google/Http/Request.php";
+require_once "Google/Utils.php";
+require_once "Google/Verifier/Pem.php";
+
+/**
+ * Authentication class that deals with the OAuth 2 web-server authentication flow
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_Auth_OAuth2 extends Google_Auth_Abstract
+{
+  const OAUTH2_REVOKE_URI = 'https://accounts.google.com/o/oauth2/revoke';
+  const OAUTH2_TOKEN_URI = 'https://accounts.google.com/o/oauth2/token';
+  const OAUTH2_AUTH_URL = 'https://accounts.google.com/o/oauth2/auth';
+  const CLOCK_SKEW_SECS = 300; // five minutes in seconds
+  const AUTH_TOKEN_LIFETIME_SECS = 300; // five minutes in seconds
+  const MAX_TOKEN_LIFETIME_SECS = 86400; // one day in seconds
+  const OAUTH2_ISSUER = 'accounts.google.com';
+
+  /** @var Google_Auth_AssertionCredentials $assertionCredentials */
+  private $assertionCredentials;
+
+  /**
+   * @var string The state parameters for CSRF and other forgery protection.
+   */
+  private $state;
+
+  /**
+   * @var string The token bundle.
+   */
+  private $token;
+
+  /**
+   * @var Google_Client the base client
+   */
+  private $client;
+
+  /**
+   * Instantiates the class, but does not initiate the login flow, leaving it
+   * to the discretion of the caller.
+   */
+  public function __construct(Google_Client $client)
+  {
+    $this->client = $client;
+  }
+
+  /**
+   * Perform an authenticated / signed apiHttpRequest.
+   * This function takes the apiHttpRequest, calls apiAuth->sign on it
+   * (which can modify the request in what ever way fits the auth mechanism)
+   * and then calls apiCurlIO::makeRequest on the signed request
+   *
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request The resulting HTTP response including the
+   * responseHttpCode, responseHeaders and responseBody.
+   */
+  public function authenticatedRequest(Google_Http_Request $request)
+  {
+    $request = $this->sign($request);
+    return $this->client->getIo()->makeRequest($request);
+  }
+
+  /**
+   * @param string $code
+   * @throws Google_Auth_Exception
+   * @return string
+   */
+  public function authenticate($code)
+  {
+    if (strlen($code) == 0) {
+      throw new Google_Auth_Exception("Invalid code");
+    }
+
+    // We got here from the redirect from a successful authorization grant,
+    // fetch the access token
+    $request = $this->client->getIo()->makeRequest(
+        new Google_Http_Request(
+            self::OAUTH2_TOKEN_URI,
+            'POST',
+            array(),
+            array(
+              'code' => $code,
+              'grant_type' => 'authorization_code',
+              'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
+              'client_id' => $this->client->getClassConfig($this, 'client_id'),
+              'client_secret' => $this->client->getClassConfig($this, 'client_secret')
+            )
+        )
+    );
+
+    if ($request->getResponseHttpCode() == 200) {
+      $this->setAccessToken($request->getResponseBody());
+      $this->token['created'] = time();
+      return $this->getAccessToken();
+    } else {
+      $response = $request->getResponseBody();
+      $decodedResponse = json_decode($response, true);
+      if ($decodedResponse != null && $decodedResponse['error']) {
+        $response = $decodedResponse['error'];
+      }
+      throw new Google_Auth_Exception(
+          sprintf(
+              "Error fetching OAuth2 access token, message: '%s'",
+              $response
+          ),
+          $request->getResponseHttpCode()
+      );
+    }
+  }
+
+  /**
+   * Create a URL to obtain user authorization.
+   * The authorization endpoint allows the user to first
+   * authenticate, and then grant/deny the access request.
+   * @param string $scope The scope is expressed as a list of space-delimited strings.
+   * @return string
+   */
+  public function createAuthUrl($scope)
+  {
+    $params = array(
+        'response_type' => 'code',
+        'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
+        'client_id' => $this->client->getClassConfig($this, 'client_id'),
+        'scope' => $scope,
+        'access_type' => $this->client->getClassConfig($this, 'access_type'),
+        'approval_prompt' => $this->client->getClassConfig($this, 'approval_prompt'),
+    );
+
+    // If the list of scopes contains plus.login, add request_visible_actions
+    // to auth URL.
+    $rva = $this->client->getClassConfig($this, 'request_visible_actions');
+    if (strpos($scope, 'plus.login') && strlen($rva) > 0) {
+        $params['request_visible_actions'] = $rva;
+    }
+
+    if (isset($this->state)) {
+      $params['state'] = $this->state;
+    }
+
+    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params);
+  }
+
+  /**
+   * @param string $token
+   * @throws Google_Auth_Exception
+   */
+  public function setAccessToken($token)
+  {
+    $token = json_decode($token, true);
+    if ($token == null) {
+      throw new Google_Auth_Exception('Could not json decode the token');
+    }
+    if (! isset($token['access_token'])) {
+      throw new Google_Auth_Exception("Invalid token format");
+    }
+    $this->token = $token;
+  }
+
+  public function getAccessToken()
+  {
+    return json_encode($this->token);
+  }
+
+  public function setState($state)
+  {
+    $this->state = $state;
+  }
+
+  public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
+  {
+    $this->assertionCredentials = $creds;
+  }
+
+  /**
+   * Include an accessToken in a given apiHttpRequest.
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request
+   * @throws Google_Auth_Exception
+   */
+  public function sign(Google_Http_Request $request)
+  {
+    // add the developer key to the request before signing it
+    if ($this->client->getClassConfig($this, 'developer_key')) {
+      $request->setQueryParam('key', $this->client->getClassConfig($this, 'developer_key'));
+    }
+
+    // Cannot sign the request without an OAuth access token.
+    if (null == $this->token && null == $this->assertionCredentials) {
+      return $request;
+    }
+
+    // Check if the token is set to expire in the next 30 seconds
+    // (or has already expired).
+    if ($this->isAccessTokenExpired()) {
+      if ($this->assertionCredentials) {
+        $this->refreshTokenWithAssertion();
+      } else {
+        if (! array_key_exists('refresh_token', $this->token)) {
+            throw new Google_Auth_Exception(
+                "The OAuth 2.0 access token has expired,"
+                ." and a refresh token is not available. Refresh tokens"
+                . "are not returned for responses that were auto-approved."
+            );
+        }
+        $this->refreshToken($this->token['refresh_token']);
+      }
+    }
+
+    // Add the OAuth2 header to the request
+    $request->setRequestHeaders(
+        array('Authorization' => 'Bearer ' . $this->token['access_token'])
+    );
+
+    return $request;
+  }
+
+  /**
+   * Fetches a fresh access token with the given refresh token.
+   * @param string $refreshToken
+   * @return void
+   */
+  public function refreshToken($refreshToken)
+  {
+    $this->refreshTokenRequest(
+        array(
+          'client_id' => $this->client->getClassConfig($this, 'client_id'),
+          'client_secret' => $this->client->getClassConfig($this, 'client_secret'),
+          'refresh_token' => $refreshToken,
+          'grant_type' => 'refresh_token'
+        )
+    );
+  }
+
+  /**
+   * Fetches a fresh access token with a given assertion token.
+   * @param Google_Auth_AssertionCredentials $assertionCredentials optional.
+   * @return void
+   */
+  public function refreshTokenWithAssertion($assertionCredentials = null)
+  {
+    if (!$assertionCredentials) {
+      $assertionCredentials = $this->assertionCredentials;
+    }
+    
+    $cacheKey = $assertionCredentials->getCacheKey();
+
+    if ($cacheKey) {
+      // We can check whether we have a token available in the
+      // cache. If it is expired, we can retrieve a new one from
+      // the assertion.
+      $token = $this->client->getCache()->get($cacheKey);
+      if ($token) {
+        $this->setAccessToken($token);
+      }
+      if (!$this->isAccessTokenExpired()) {
+        return;
+      }
+    }
+    
+    $this->refreshTokenRequest(
+        array(
+          'grant_type' => 'assertion',
+          'assertion_type' => $assertionCredentials->assertionType,
+          'assertion' => $assertionCredentials->generateAssertion(),
+        )
+    );
+    
+    if ($cacheKey) {
+      // Attempt to cache the token.
+      $this->client->getCache()->set(
+          $cacheKey,
+          $this->getAccessToken()
+      );
+    }
+  }
+
+  private function refreshTokenRequest($params)
+  {
+    $http = new Google_Http_Request(
+        self::OAUTH2_TOKEN_URI,
+        'POST',
+        array(),
+        $params
+    );
+    $request = $this->client->getIo()->makeRequest($http);
+
+    $code = $request->getResponseHttpCode();
+    $body = $request->getResponseBody();
+    if (200 == $code) {
+      $token = json_decode($body, true);
+      if ($token == null) {
+        throw new Google_Auth_Exception("Could not json decode the access token");
+      }
+
+      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
+        throw new Google_Auth_Exception("Invalid token format");
+      }
+
+      $this->token['access_token'] = $token['access_token'];
+      $this->token['expires_in'] = $token['expires_in'];
+      $this->token['created'] = time();
+    } else {
+      throw new Google_Auth_Exception("Error refreshing the OAuth2 token, message: '$body'", $code);
+    }
+  }
+
+    /**
+     * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
+     * token, if a token isn't provided.
+     * @throws Google_Auth_Exception
+     * @param string|null $token The token (access token or a refresh token) that should be revoked.
+     * @return boolean Returns True if the revocation was successful, otherwise False.
+     */
+  public function revokeToken($token = null)
+  {
+    if (!$token) {
+      $token = $this->token['access_token'];
+    }
+    $request = new Google_Http_Request(
+        self::OAUTH2_REVOKE_URI,
+        'POST',
+        array(),
+        "token=$token"
+    );
+    $response = $this->client->getIo()->makeRequest($request);
+    $code = $response->getResponseHttpCode();
+    if ($code == 200) {
+      $this->token = null;
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Returns if the access_token is expired.
+   * @return bool Returns True if the access_token is expired.
+   */
+  public function isAccessTokenExpired()
+  {
+    if (!$this->token) {
+      return true;
+    }
+
+    // If the token is set to expire in the next 30 seconds.
+    $expired = ($this->token['created']
+        + ($this->token['expires_in'] - 30)) < time();
+
+    return $expired;
+  }
+
+  // Gets federated sign-on certificates to use for verifying identity tokens.
+  // Returns certs as array structure, where keys are key ids, and values
+  // are PEM encoded certificates.
+  private function getFederatedSignOnCerts()
+  {
+    return $this->retrieveCertsFromLocation(
+        $this->client->getClassConfig($this, 'federated_signon_certs_url')
+    );
+  }
+
+  /**
+   * Retrieve and cache a certificates file.
+   * @param $url location
+   * @return array certificates
+   */
+  public function retrieveCertsFromLocation($url)
+  {
+    // If we're retrieving a local file, just grab it.
+    if ("http" != substr($url, 0, 4)) {
+      $file = file_get_contents($url);
+      if ($file) {
+        return json_decode($file, true);
+      } else {
+        throw new Google_Auth_Exception(
+            "Failed to retrieve verification certificates: '" .
+            $url . "'."
+        );
+      }
+    }
+
+    // This relies on makeRequest caching certificate responses.
+    $request = $this->client->getIo()->makeRequest(
+        new Google_Http_Request(
+            $url
+        )
+    );
+    if ($request->getResponseHttpCode() == 200) {
+      $certs = json_decode($request->getResponseBody(), true);
+      if ($certs) {
+        return $certs;
+      }
+    }
+    throw new Google_Auth_Exception(
+        "Failed to retrieve verification certificates: '" .
+        $request->getResponseBody() . "'.",
+        $request->getResponseHttpCode()
+    );
+  }
+
+  /**
+   * Verifies an id token and returns the authenticated apiLoginTicket.
+   * Throws an exception if the id token is not valid.
+   * The audience parameter can be used to control which id tokens are
+   * accepted.  By default, the id token must have been issued to this OAuth2 client.
+   *
+   * @param $id_token
+   * @param $audience
+   * @return Google_Auth_LoginTicket
+   */
+  public function verifyIdToken($id_token = null, $audience = null)
+  {
+    if (!$id_token) {
+      $id_token = $this->token['id_token'];
+    }
+    $certs = $this->getFederatedSignonCerts();
+    if (!$audience) {
+      $audience = $this->client->getClassConfig($this, 'client_id');
+    }
+
+    return $this->verifySignedJwtWithCerts($id_token, $certs, $audience, self::OAUTH2_ISSUER);
+  }
+
+  /**
+   * Verifies the id token, returns the verified token contents.
+   *
+   * @param $jwt the token
+   * @param $certs array of certificates
+   * @param $required_audience the expected consumer of the token
+   * @param [$issuer] the expected issues, defaults to Google
+   * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
+   * @return token information if valid, false if not
+   */
+  public function verifySignedJwtWithCerts(
+      $jwt,
+      $certs,
+      $required_audience,
+      $issuer = null,
+      $max_expiry = null
+  ) {
+    if (!$max_expiry) {
+      // Set the maximum time we will accept a token for.
+      $max_expiry = self::MAX_TOKEN_LIFETIME_SECS;
+    }
+
+    $segments = explode(".", $jwt);
+    if (count($segments) != 3) {
+      throw new Google_Auth_Exception("Wrong number of segments in token: $jwt");
+    }
+    $signed = $segments[0] . "." . $segments[1];
+    $signature = Google_Utils::urlSafeB64Decode($segments[2]);
+
+    // Parse envelope.
+    $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
+    if (!$envelope) {
+      throw new Google_Auth_Exception("Can't parse token envelope: " . $segments[0]);
+    }
+
+    // Parse token
+    $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
+    $payload = json_decode($json_body, true);
+    if (!$payload) {
+      throw new Google_Auth_Exception("Can't parse token payload: " . $segments[1]);
+    }
+
+    // Check signature
+    $verified = false;
+    foreach ($certs as $keyName => $pem) {
+      $public_key = new Google_Verifier_Pem($pem);
+      if ($public_key->verify($signed, $signature)) {
+        $verified = true;
+        break;
+      }
+    }
+
+    if (!$verified) {
+      throw new Google_Auth_Exception("Invalid token signature: $jwt");
+    }
+
+    // Check issued-at timestamp
+    $iat = 0;
+    if (array_key_exists("iat", $payload)) {
+      $iat = $payload["iat"];
+    }
+    if (!$iat) {
+      throw new Google_Auth_Exception("No issue time in token: $json_body");
+    }
+    $earliest = $iat - self::CLOCK_SKEW_SECS;
+
+    // Check expiration timestamp
+    $now = time();
+    $exp = 0;
+    if (array_key_exists("exp", $payload)) {
+      $exp = $payload["exp"];
+    }
+    if (!$exp) {
+      throw new Google_Auth_Exception("No expiration time in token: $json_body");
+    }
+    if ($exp >= $now + $max_expiry) {
+      throw new Google_Auth_Exception(
+          sprintf("Expiration time too far in future: %s", $json_body)
+      );
+    }
+
+    $latest = $exp + self::CLOCK_SKEW_SECS;
+    if ($now < $earliest) {
+      throw new Google_Auth_Exception(
+          sprintf(
+              "Token used too early, %s < %s: %s",
+              $now,
+              $earliest,
+              $json_body
+          )
+      );
+    }
+    if ($now > $latest) {
+      throw new Google_Auth_Exception(
+          sprintf(
+              "Token used too late, %s > %s: %s",
+              $now,
+              $latest,
+              $json_body
+          )
+      );
+    }
+
+    $iss = $payload['iss'];
+    if ($issuer && $iss != $issuer) {
+      throw new Google_Auth_Exception(
+          sprintf(
+              "Invalid issuer, %s != %s: %s",
+              $iss,
+              $issuer,
+              $json_body
+          )
+      );
+    }
+
+    // Check audience
+    $aud = $payload["aud"];
+    if ($aud != $required_audience) {
+      throw new Google_Auth_Exception(
+          sprintf(
+              "Wrong recipient, %s != %s:",
+              $aud,
+              $required_audience,
+              $json_body
+          )
+      );
+    }
+
+    // All good.
+    return new Google_Auth_LoginTicket($envelope, $payload);
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Simple.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Simple.php
new file mode 100644
index 00000000000..8fcf61e52ea
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Simple.php
@@ -0,0 +1,92 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google/Auth/Abstract.php";
+require_once "Google/Http/Request.php";
+
+/**
+ * Simple API access implementation. Can either be used to make requests
+ * completely unauthenticated, or by using a Simple API Access developer
+ * key.
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_Auth_Simple extends Google_Auth_Abstract
+{
+  private $key = null;
+  private $client;
+
+  public function __construct(Google_Client $client, $config = null)
+  {
+    $this->client = $client;
+  }
+
+  /**
+   * Perform an authenticated / signed apiHttpRequest.
+   * This function takes the apiHttpRequest, calls apiAuth->sign on it
+   * (which can modify the request in what ever way fits the auth mechanism)
+   * and then calls apiCurlIO::makeRequest on the signed request
+   *
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request The resulting HTTP response including the
+   * responseHttpCode, responseHeaders and responseBody.
+   */
+  public function authenticatedRequest(Google_Http_Request $request)
+  {
+    $request = $this->sign($request);
+    return $this->io->makeRequest($request);
+  }
+
+  public function authenticate($code)
+  {
+    throw new Google_Auth_Exception("Simple auth does not exchange tokens.");
+  }
+
+  public function setAccessToken($accessToken)
+  {
+    /* noop*/
+  }
+
+  public function getAccessToken()
+  {
+    return null;
+  }
+
+  public function createAuthUrl($scope)
+  {
+    return null;
+  }
+
+  public function refreshToken($refreshToken)
+  {
+    /* noop*/
+  }
+
+  public function revokeToken()
+  {
+    /* noop*/
+  }
+
+  public function sign(Google_Http_Request $request)
+  {
+    $key = $this->client->getClassConfig($this, 'developer_key');
+    if ($key) {
+      $request->setQueryParam('key', $key);
+    }
+    return $request;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_Cache.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Abstract.php
similarity index 82%
rename from apps/files_external/3rdparty/google-api-php-client/src/cache/Google_Cache.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Abstract.php
index 809c55e2b15..ff19f36ac46 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_Cache.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Abstract.php
@@ -15,15 +15,15 @@
  * limitations under the License.
  */
 
-require_once "Google_FileCache.php";
-require_once "Google_MemcacheCache.php";
-
 /**
  * Abstract storage class
  *
  * @author Chris Chabot <chabotc@google.com>
  */
-abstract class Google_Cache {
+abstract class Google_Cache_Abstract
+{
+  
+  abstract public function __construct(Google_Client $client);
 
   /**
    * Retrieves the data for the given key, or false if they
@@ -33,7 +33,7 @@ abstract class Google_Cache {
    * @param boolean|int $expiration Expiration time in seconds
    *
    */
-  abstract function get($key, $expiration = false);
+  abstract public function get($key, $expiration = false);
 
   /**
    * Store the key => $value set. The $value is serialized
@@ -42,14 +42,12 @@ abstract class Google_Cache {
    * @param string $key Key of the data
    * @param string $value data
    */
-  abstract function set($key, $value);
+  abstract public function set($key, $value);
 
   /**
    * Removes the key/data pair for the given $key
    *
    * @param String $key
    */
-  abstract function delete($key);
+  abstract public function delete($key);
 }
-
-
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Apc.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Apc.php
new file mode 100644
index 00000000000..051b537a4e1
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Apc.php
@@ -0,0 +1,73 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ 
+require_once "Google/Cache/Abstract.php";
+require_once "Google/Cache/Exception.php";
+
+/**
+ * A persistent storage class based on the APC cache, which is not
+ * really very persistent, as soon as you restart your web server
+ * the storage will be wiped, however for debugging and/or speed
+ * it can be useful, and cache is a lot cheaper then storage.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ */
+class Google_Cache_Apc extends Google_Cache_Abstract
+{
+  public function __construct(Google_Client $client)
+  {
+    if (! function_exists('apc_add') ) {
+      throw new Google_Cache_Exception("Apc functions not available");
+    }
+  }
+
+   /**
+   * @inheritDoc
+   */
+  public function get($key, $expiration = false)
+  {
+    $ret = apc_fetch($key);
+    if ($ret === false) {
+      return false;
+    }
+    if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
+      $this->delete($key);
+      return false;
+    }
+    return $ret['data'];
+  }
+
+  /**
+   * @inheritDoc
+   */
+  public function set($key, $value)
+  {
+    $rc = apc_store($key, array('time' => time(), 'data' => $value));
+    if ($rc == false) {
+      throw new Google_Cache_Exception("Couldn't store data");
+    }
+  }
+
+  /**
+   * @inheritDoc
+   * @param String $key
+   */
+  public function delete($key)
+  {
+    apc_delete($key);
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Exception.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Exception.php
new file mode 100644
index 00000000000..23b624608e8
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Exception.php
@@ -0,0 +1,21 @@
+<?php
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+require_once "Google/Exception.php";
+
+class Google_Cache_Exception extends Google_Exception
+{
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/File.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/File.php
new file mode 100644
index 00000000000..530af80ff96
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/File.php
@@ -0,0 +1,145 @@
+<?php
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google/Cache/Abstract.php";
+require_once "Google/Cache/Exception.php";
+
+/*
+ * This class implements a basic on disk storage. While that does
+ * work quite well it's not the most elegant and scalable solution.
+ * It will also get you into a heap of trouble when you try to run
+ * this in a clustered environment.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ */
+class Google_Cache_File extends Google_Cache_Abstract
+{
+  const MAX_LOCK_RETRIES = 10;
+  private $path;
+  private $fh;
+
+  public function __construct(Google_Client $client)
+  {
+    $this->path = $client->getClassConfig($this, 'directory');
+  }
+  
+  public function get($key, $expiration = false)
+  {
+    $storageFile = $this->getCacheFile($key);
+    $data = false;
+    
+    if (!file_exists($storageFile)) {
+      return false;
+    }
+
+    if ($expiration) {
+      $mtime = filemtime($storageFile);
+      if (($now - $mtime) >= $expiration) {
+        $this->delete($key);
+        return false;
+      }
+    }
+
+    if ($this->acquireReadLock($storageFile)) {
+      $data = file_get_contents($storageFile);
+      $data =  unserialize($data);
+      $this->unlock($storageFile);
+    }
+
+    return $data;
+  }
+
+  public function set($key, $value)
+  {
+    $storageFile = $this->getWriteableCacheFile($key);
+    if ($this->acquireWriteLock($storageFile)) {
+      // We serialize the whole request object, since we don't only want the
+      // responseContent but also the postBody used, headers, size, etc.
+      $data = serialize($value);
+      $result = fwrite($this->fh, $data);
+      $this->unlock($storageFile);
+    }
+  }
+
+  public function delete($key)
+  {
+    $file = $this->getCacheFile($key);
+    if (file_exists($file) && !unlink($file)) {
+      throw new Google_Cache_Exception("Cache file could not be deleted");
+    }
+  }
+  
+  private function getWriteableCacheFile($file)
+  {
+    return $this->getCacheFile($file, true);
+  }
+
+  private function getCacheFile($file, $forWrite = false)
+  {
+    return $this->getCacheDir($file, $forWrite) . '/' . md5($file);
+  }
+  
+  private function getCacheDir($file, $forWrite)
+  {
+    // use the first 2 characters of the hash as a directory prefix
+    // this should prevent slowdowns due to huge directory listings
+    // and thus give some basic amount of scalability
+    $storageDir = $this->path . '/' . substr(md5($file), 0, 2);
+    if ($forWrite && ! is_dir($storageDir)) {
+      if (! mkdir($storageDir, 0755, true)) {
+        throw new Google_Cache_Exception("Could not create storage directory: $storageDir");
+      }
+    }
+    return $storageDir;
+  }
+  
+  private function acquireReadLock($storageFile)
+  {
+    return $this->acquireLock(LOCK_SH, $storageFile);
+  }
+  
+  private function acquireWriteLock($storageFile)
+  {
+    $rc = $this->acquireLock(LOCK_EX, $storageFile);
+    if (!$rc) {
+      $this->delete($storageFile);
+    }
+    return $rc;
+  }
+  
+  private function acquireLock($type, $storageFile)
+  {
+    $mode = $type == LOCK_EX ? "w" : "r";
+    $this->fh = fopen($storageFile, $mode);
+    $count = 0;
+    while (!flock($this->fh, $type | LOCK_NB)) {
+      // Sleep for 10ms.
+      usleep(10000);
+      if (++$count < self::MAX_LOCK_RETRIES) {
+        return false;
+      }
+    }
+    return true;
+  }
+  
+  public function unlock($storageFile)
+  {
+    if ($this->fh) {
+      flock($this->fh, LOCK_UN);
+    }
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Memcache.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Memcache.php
new file mode 100644
index 00000000000..56676c24728
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Memcache.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ * Copyright 2008 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once "Google/Cache/Abstract.php";
+require_once "Google/Cache/Exception.php";
+
+/**
+ * A persistent storage class based on the memcache, which is not
+ * really very persistent, as soon as you restart your memcache daemon
+ * the storage will be wiped.
+ *
+ * Will use either the memcache or memcached extensions, preferring
+ * memcached.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ */
+class Google_Cache_Memcache extends Google_Cache_Abstract
+{
+  private $connection = false;
+  private $mc = false;
+  private $host;
+  private $port;
+
+  public function __construct(Google_Client $client)
+  {
+    if (!function_exists('memcache_connect') && !class_exists("Memcached")) {
+      throw new Google_Cache_Exception("Memcache functions not available");
+    }
+    if ($client->isAppEngine()) {
+      // No credentials needed for GAE.
+      $this->mc = new Memcached();
+      $this->connection = true;
+    } else {
+      $this->host = $client->getClassConfig($this, 'host');
+      $this->port = $client->getClassConfig($this, 'port');
+      if (empty($this->host) || empty($this->port)) {
+        throw new Google_Cache_Exception("You need to supply a valid memcache host and port");
+      }
+    }
+  }
+  
+  /**
+   * @inheritDoc
+   */
+  public function get($key, $expiration = false)
+  {
+    $this->connect();
+    $ret = false;
+    if ($this->mc) {
+      $ret = $this->mc->get($key);
+    } else {
+      $ret = memcache_get($this->connection, $key);
+    }
+    if ($ret === false) {
+      return false;
+    }
+    if (is_numeric($expiration) && (time() - $ret['time'] > $expiration)) {
+      $this->delete($key);
+      return false;
+    }
+    return $ret['data'];
+  }
+
+  /**
+   * @inheritDoc
+   * @param string $key
+   * @param string $value
+   * @throws Google_Cache_Exception
+   */
+  public function set($key, $value)
+  {
+    $this->connect();
+    // we store it with the cache_time default expiration so objects will at
+    // least get cleaned eventually.
+    $data = array('time' => time(), 'data' => $value);
+    $rc = false;
+    if ($this->mc) {
+      $rc = $this->mc->set($key, $data);
+    } else {
+      $rc = memcache_set($this->connection, $key, $data, false);
+    }
+    if ($rc == false) {
+      throw new Google_Cache_Exception("Couldn't store data in cache");
+    }
+  }
+
+  /**
+   * @inheritDoc
+   * @param String $key
+   */
+  public function delete($key)
+  {
+    $this->connect();
+    if ($this->mc) {
+      $this->mc->delete($key, 0);
+    } else {
+      memcache_delete($this->connection, $key, 0);
+    }
+  }
+
+  /**
+   * Lazy initialiser for memcache connection. Uses pconnect for to take 
+   * advantage of the persistence pool where possible. 
+   */
+  private function connect()
+  {
+    if ($this->connection) {
+      return;
+    }
+
+    if (class_exists("Memcached")) {
+      $this->mc = new Memcached();
+      $this->mc->addServer($this->host, $this->port);
+       $this->connection = true;
+    } else {
+      $this->connection = memcache_pconnect($this->host, $this->port);
+    }
+    
+    if (! $this->connection) {
+      throw new Google_Cache_Exception("Couldn't connect to memcache server");
+    }
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
new file mode 100644
index 00000000000..daf1cb151c2
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
@@ -0,0 +1,596 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once 'Google/Auth/AssertionCredentials.php';
+require_once 'Google/Cache/File.php';
+require_once 'Google/Cache/Memcache.php';
+require_once 'Google/Config.php';
+require_once 'Google/Collection.php';
+require_once 'Google/Exception.php';
+require_once 'Google/IO/Stream.php';
+require_once 'Google/Model.php';
+require_once 'Google/Service.php';
+require_once 'Google/Service/Resource.php';
+
+/**
+ * The Google API Client
+ * http://code.google.com/p/google-api-php-client/
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ */
+class Google_Client
+{
+  const LIBVER = "1.0.2-beta";
+  const USER_AGENT_SUFFIX = "google-api-php-client/";
+  /**
+   * @var Google_Auth_Abstract $auth
+   */
+  private $auth;
+
+  /**
+   * @var Google_IO_Abstract $io
+   */
+  private $io;
+
+  /**
+   * @var Google_Cache_Abstract $cache
+   */
+  private $cache;
+
+  /**
+   * @var Google_Config $config
+   */
+  private $config;
+
+  /**
+   * @var boolean $deferExecution
+   */
+  private $deferExecution = false;
+
+  /** @var array $scopes */
+  // Scopes requested by the client
+  protected $requestedScopes = array();
+
+  // definitions of services that are discovered.
+  protected $services = array();
+
+  // Used to track authenticated state, can't discover services after doing authenticate()
+  private $authenticated = false;
+
+  /**
+   * Construct the Google Client.
+   *
+   * @param $config Google_Config or string for the ini file to load
+   */
+  public function __construct($config = null)
+  {
+    if (! ini_get('date.timezone') &&
+        function_exists('date_default_timezone_set')) {
+      date_default_timezone_set('UTC');
+    }
+
+    if (is_string($config) && strlen($config)) {
+      $config = new Google_Config($config);
+    } else if ( !($config instanceof Google_Config)) {
+      $config = new Google_Config();
+
+      if ($this->isAppEngine()) {
+        // Automatically use Memcache if we're in AppEngine.
+        $config->setCacheClass('Google_Cache_Memcache');
+        // Automatically disable compress.zlib, as currently unsupported.
+        $config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
+      }
+    }
+
+    $this->config = $config;
+  }
+
+  /**
+   * Get a string containing the version of the library.
+   *
+   * @return string
+   */
+  public function getLibraryVersion()
+  {
+    return self::LIBVER;
+  }
+
+  /**
+   * Attempt to exchange a code for an valid authentication token.
+   * Helper wrapped around the OAuth 2.0 implementation.
+   *
+   * @param $code string code from accounts.google.com
+   * @return string token
+   */
+  public function authenticate($code)
+  {
+    $this->authenticated = true;
+    return $this->getAuth()->authenticate($code);
+  }
+
+  /**
+   * Set the auth config from the JSON string provided.
+   * This structure should match the file downloaded from
+   * the "Download JSON" button on in the Google Developer
+   * Console.
+   * @param string $json the configuration json
+   */
+  public function setAuthConfig($json)
+  {
+    $data = json_decode($json);
+    $key = isset($data->installed) ? 'installed' : 'web';
+    if (!isset($data->$key)) {
+      throw new Google_Exception("Invalid client secret JSON file.");
+    }
+    $this->setClientId($data->$key->client_id);
+    $this->setClientSecret($data->$key->client_secret);
+    if (isset($data->$key->redirect_uris)) {
+      $this->setRedirectUri($data->$key->redirect_uris[0]);
+    }
+  }
+
+  /**
+   * Set the auth config from the JSON file in the path
+   * provided. This should match the file downloaded from
+   * the "Download JSON" button on in the Google Developer
+   * Console.
+   * @param string $file the file location of the client json
+   */
+  public function setAuthConfigFile($file)
+  {
+    $this->setAuthConfig(file_get_contents($file));
+  }
+
+  /**
+   * @return array
+   * @visible For Testing
+   */
+  public function prepareScopes()
+  {
+    if (empty($this->requestedScopes)) {
+      throw new Google_Auth_Exception("No scopes specified");
+    }
+    $scopes = implode(' ', $this->requestedScopes);
+    return $scopes;
+  }
+
+  /**
+   * Set the OAuth 2.0 access token using the string that resulted from calling createAuthUrl()
+   * or Google_Client#getAccessToken().
+   * @param string $accessToken JSON encoded string containing in the following format:
+   * {"access_token":"TOKEN", "refresh_token":"TOKEN", "token_type":"Bearer",
+   *  "expires_in":3600, "id_token":"TOKEN", "created":1320790426}
+   */
+  public function setAccessToken($accessToken)
+  {
+    if ($accessToken == null || 'null' == $accessToken) {
+      $accessToken = null;
+    }
+    $this->getAuth()->setAccessToken($accessToken);
+  }
+
+
+
+  /**
+   * Set the authenticator object
+   * @param Google_Auth_Abstract $auth
+   */
+  public function setAuth(Google_Auth_Abstract $auth)
+  {
+    $this->config->setAuthClass(get_class($auth));
+    $this->auth = $auth;
+  }
+
+  /**
+   * Set the IO object
+   * @param Google_Io_Abstract $auth
+   */
+  public function setIo(Google_Io_Abstract $io)
+  {
+    $this->config->setIoClass(get_class($io));
+    $this->io = $io;
+  }
+
+  /**
+   * Set the Cache object
+   * @param Google_Cache_Abstract $auth
+   */
+  public function setCache(Google_Cache_Abstract $cache)
+  {
+    $this->config->setCacheClass(get_class($cache));
+    $this->cache = $cache;
+  }
+
+  /**
+   * Construct the OAuth 2.0 authorization request URI.
+   * @return string
+   */
+  public function createAuthUrl()
+  {
+    $scopes = $this->prepareScopes();
+    return $this->getAuth()->createAuthUrl($scopes);
+  }
+
+  /**
+   * Get the OAuth 2.0 access token.
+   * @return string $accessToken JSON encoded string in the following format:
+   * {"access_token":"TOKEN", "refresh_token":"TOKEN", "token_type":"Bearer",
+   *  "expires_in":3600,"id_token":"TOKEN", "created":1320790426}
+   */
+  public function getAccessToken()
+  {
+    $token = $this->getAuth()->getAccessToken();
+    // The response is json encoded, so could be the string null.
+    // It is arguable whether this check should be here or lower
+    // in the library.
+    return (null == $token || 'null' == $token) ? null : $token;
+  }
+
+  /**
+   * Returns if the access_token is expired.
+   * @return bool Returns True if the access_token is expired.
+   */
+  public function isAccessTokenExpired()
+  {
+    return $this->getAuth()->isAccessTokenExpired();
+  }
+
+  /**
+   * Set OAuth 2.0 "state" parameter to achieve per-request customization.
+   * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-22#section-3.1.2.2
+   * @param string $state
+   */
+  public function setState($state)
+  {
+    $this->getAuth()->setState($state);
+  }
+
+  /**
+   * @param string $accessType Possible values for access_type include:
+   *  {@code "offline"} to request offline access from the user.
+   *  {@code "online"} to request online access from the user.
+   */
+  public function setAccessType($accessType)
+  {
+    $this->config->setAccessType($accessType);
+  }
+
+  /**
+   * @param string $approvalPrompt Possible values for approval_prompt include:
+   *  {@code "force"} to force the approval UI to appear. (This is the default value)
+   *  {@code "auto"} to request auto-approval when possible.
+   */
+  public function setApprovalPrompt($approvalPrompt)
+  {
+    $this->config->setApprovalPrompt($approvalPrompt);
+  }
+
+  /**
+   * Set the application name, this is included in the User-Agent HTTP header.
+   * @param string $applicationName
+   */
+  public function setApplicationName($applicationName)
+  {
+    $this->config->setApplicationName($applicationName);
+  }
+
+  /**
+   * Set the OAuth 2.0 Client ID.
+   * @param string $clientId
+   */
+  public function setClientId($clientId)
+  {
+    $this->config->setClientId($clientId);
+  }
+
+  /**
+   * Set the OAuth 2.0 Client Secret.
+   * @param string $clientSecret
+   */
+  public function setClientSecret($clientSecret)
+  {
+    $this->config->setClientSecret($clientSecret);
+  }
+
+  /**
+   * Set the OAuth 2.0 Redirect URI.
+   * @param string $redirectUri
+   */
+  public function setRedirectUri($redirectUri)
+  {
+    $this->config->setRedirectUri($redirectUri);
+  }
+
+  /**
+   * If 'plus.login' is included in the list of requested scopes, you can use
+   * this method to define types of app activities that your app will write.
+   * You can find a list of available types here:
+   * @link https://developers.google.com/+/api/moment-types
+   *
+   * @param array $requestVisibleActions Array of app activity types
+   */
+  public function setRequestVisibleActions($requestVisibleActions)
+  {
+    if (is_array($requestVisibleActions)) {
+      $requestVisibleActions = join(" ", $requestVisibleActions);
+    }
+    $this->config->setRequestVisibleActions($requestVisibleActions);
+  }
+
+  /**
+   * Set the developer key to use, these are obtained through the API Console.
+   * @see http://code.google.com/apis/console-help/#generatingdevkeys
+   * @param string $developerKey
+   */
+  public function setDeveloperKey($developerKey)
+  {
+    $this->config->setDeveloperKey($developerKey);
+  }
+
+  /**
+   * Fetches a fresh OAuth 2.0 access token with the given refresh token.
+   * @param string $refreshToken
+   * @return void
+   */
+  public function refreshToken($refreshToken)
+  {
+    return $this->getAuth()->refreshToken($refreshToken);
+  }
+
+  /**
+   * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
+   * token, if a token isn't provided.
+   * @throws Google_Auth_Exception
+   * @param string|null $token The token (access token or a refresh token) that should be revoked.
+   * @return boolean Returns True if the revocation was successful, otherwise False.
+   */
+  public function revokeToken($token = null)
+  {
+    return $this->getAuth()->revokeToken($token);
+  }
+
+  /**
+   * Verify an id_token. This method will verify the current id_token, if one
+   * isn't provided.
+   * @throws Google_Auth_Exception
+   * @param string|null $token The token (id_token) that should be verified.
+   * @return Google_Auth_LoginTicket Returns an apiLoginTicket if the verification was
+   * successful.
+   */
+  public function verifyIdToken($token = null)
+  {
+    return $this->getAuth()->verifyIdToken($token);
+  }
+
+  /**
+   * Verify a JWT that was signed with your own certificates.
+   *
+   * @param $jwt the token
+   * @param $certs array of certificates
+   * @param $required_audience the expected consumer of the token
+   * @param [$issuer] the expected issues, defaults to Google
+   * @param [$max_expiry] the max lifetime of a token, defaults to MAX_TOKEN_LIFETIME_SECS
+   * @return token information if valid, false if not
+   */
+  public function verifySignedJwt($id_token, $cert_location, $audience, $issuer, $max_expiry = null)
+  {
+    $auth = new Google_Auth_OAuth2($this);
+    $certs = $auth->retrieveCertsFromLocation($cert_location);
+    return $auth->verifySignedJwtWithCerts($id_token, $certs, $audience, $issuer, $max_expiry);
+  }
+
+  /**
+   * @param Google_Auth_AssertionCredentials $creds
+   * @return void
+   */
+  public function setAssertionCredentials(Google_Auth_AssertionCredentials $creds)
+  {
+    $this->getAuth()->setAssertionCredentials($creds);
+  }
+
+  /**
+   * Set the scopes to be requested. Must be called before createAuthUrl().
+   * Will remove any previously configured scopes.
+   * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.login',
+   * 'https://www.googleapis.com/auth/moderator')
+   */
+  public function setScopes($scopes)
+  {
+    $this->requestedScopes = array();
+    $this->addScope($scopes);
+  }
+  
+  /**
+   * This functions adds a scope to be requested as part of the OAuth2.0 flow. 
+   * Will append any scopes not previously requested to the scope parameter.
+   * A single string will be treated as a scope to request. An array of strings
+   * will each be appended.
+   * @param $scope_or_scopes string|array e.g. "profile"
+   */
+  public function addScope($scope_or_scopes)
+  {
+    if (is_string($scope_or_scopes) && !in_array($scope_or_scopes, $this->requestedScopes)) {
+      $this->requestedScopes[] = $scope_or_scopes;
+    } else if (is_array($scope_or_scopes)) {
+      foreach ($scope_or_scopes as $scope) {
+        $this->addScope($scope);
+      }
+    }
+  }
+
+  /**
+   * Returns the list of scopes requested by the client
+   * @return array the list of scopes
+   *
+   */
+  public function getScopes()
+  {
+     return $this->requestedScopes;
+  }
+
+  /**
+   * Declare whether batch calls should be used. This may increase throughput
+   * by making multiple requests in one connection.
+   *
+   * @param boolean $useBatch True if the batch support should
+   * be enabled. Defaults to False.
+   */
+  public function setUseBatch($useBatch)
+  {
+    // This is actually an alias for setDefer.
+    $this->setDefer($useBatch);
+  }
+
+  /**
+   * Declare whether making API calls should make the call immediately, or
+   * return a request which can be called with ->execute();
+   *
+   * @param boolean $defer True if calls should not be executed right away.
+   */
+  public function setDefer($defer)
+  {
+    $this->deferExecution = $defer;
+  }
+  
+  /**
+   * Helper method to execute deferred HTTP requests.
+   *
+   * @returns object of the type of the expected class or array.
+   */
+  public function execute($request)
+  {
+    if ($request instanceof Google_Http_Request) {
+      $request->setUserAgent(
+          $this->getApplicationName()
+          . " " . self::USER_AGENT_SUFFIX
+          . $this->getLibraryVersion()
+      );
+      if (!$this->getClassConfig("Google_Http_Request", "disable_gzip")) {
+        $request->enableGzip();
+      }
+      $request->maybeMoveParametersToBody();
+      return Google_Http_REST::execute($this, $request);
+    } else if ($request instanceof Google_Http_Batch) {
+      return $request->execute();
+    } else {
+      throw new Google_Exception("Do not know how to execute this type of object.");
+    }
+  }
+
+  /**
+   * Whether or not to return raw requests
+   * @return boolean
+   */
+  public function shouldDefer()
+  {
+    return $this->deferExecution;
+  }
+
+  /**
+   * @return Google_Auth_Abstract Authentication implementation
+   */
+  public function getAuth()
+  {
+    if (!isset($this->auth)) {
+      $class = $this->config->getAuthClass();
+      $this->auth = new $class($this);
+    }
+    return $this->auth;
+  }
+
+  /**
+   * @return Google_IO_Abstract IO implementation
+   */
+  public function getIo()
+  {
+    if (!isset($this->io)) {
+      $class = $this->config->getIoClass();
+      $this->io = new $class($this);
+    }
+    return $this->io;
+  }
+
+  /**
+   * @return Google_Cache_Abstract Cache implementation
+   */
+  public function getCache()
+  {
+    if (!isset($this->cache)) {
+      $class = $this->config->getCacheClass();
+      $this->cache = new $class($this);
+    }
+    return $this->cache;
+  }
+
+  /**
+   * Retrieve custom configuration for a specific class.
+   * @param $class string|object - class or instance of class to retrieve
+   * @param $key string optional - key to retrieve
+   */
+  public function getClassConfig($class, $key = null)
+  {
+    if (!is_string($class)) {
+      $class = get_class($class);
+    }
+    return $this->config->getClassConfig($class, $key);
+  }
+
+  /**
+   * Set configuration specific to a given class.
+   * $config->setClassConfig('Google_Cache_File',
+   *   array('directory' => '/tmp/cache'));
+   * @param $class The class name for the configuration
+   * @param $config string key or an array of configuration values
+   * @param $value optional - if $config is a key, the value
+   *
+   */
+  public function setClassConfig($class, $config, $value = null)
+  {
+    if (!is_string($class)) {
+      $class = get_class($class);
+    }
+    return $this->config->setClassConfig($class, $config, $value);
+
+  }
+
+  /**
+   * @return string the base URL to use for calls to the APIs
+   */
+  public function getBasePath()
+  {
+    return $this->config->getBasePath();
+  }
+
+  /**
+   * @return string the name of the application
+   */
+  public function getApplicationName()
+  {
+    return $this->config->getApplicationName();
+  }
+
+  /**
+   * Are we running in Google AppEngine?
+   * return bool
+   */
+  public function isAppEngine()
+  {
+    return (isset($_SERVER['SERVER_SOFTWARE']) &&
+        strpos($_SERVER['SERVER_SOFTWARE'], 'Google App Engine') !== false);
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Collection.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Collection.php
new file mode 100644
index 00000000000..60909a967a4
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Collection.php
@@ -0,0 +1,94 @@
+<?php
+
+require_once "Google/Model.php";
+
+/**
+ * Extension to the regular Google_Model that automatically
+ * exposes the items array for iteration, so you can just
+ * iterate over the object rather than a reference inside.
+ */
+class Google_Collection extends Google_Model implements Iterator, Countable
+{
+  protected $collection_key = 'items';
+
+  public function rewind()
+  {
+    if (is_array($this->data[$this->collection_key])) {
+      reset($this->data[$this->collection_key]);
+    }
+  }
+
+  public function current()
+  {
+    $this->coerceType($this->key());
+    if (is_array($this->data[$this->collection_key])) {
+      return current($this->data[$this->collection_key]);
+    }
+  }
+
+  public function key()
+  {
+    if (is_array($this->data[$this->collection_key])) {
+      return key($this->data[$this->collection_key]);
+    }
+  }
+
+  public function next()
+  {
+    return next($this->data[$this->collection_key]);
+  }
+
+  public function valid()
+  {
+    $key = $this->key();
+    return $key !== null && $key !== false;
+  }
+
+  public function count()
+  {
+    return count($this->data[$this->collection_key]);
+  }
+
+  public function offsetExists ($offset)
+  {
+    if (!is_numeric($offset)) {
+      return parent::offsetExists($offset);
+    }
+    return isset($this->data[$this->collection_key][$offset]);
+  }
+
+  public function offsetGet($offset)
+  {
+    if (!is_numeric($offset)) {
+      return parent::offsetGet($offset);
+    }
+    $this->coerceType($offset);
+    return $this->data[$this->collection_key][$offset];
+  }
+
+  public function offsetSet($offset, $value)
+  {
+    if (!is_numeric($offset)) {
+      return parent::offsetSet($offset, $value);
+    }
+    $this->data[$this->collection_key][$offset] = $value;
+  }
+
+  public function offsetUnset($offset)
+  {
+    if (!is_numeric($offset)) {
+      return parent::offsetUnset($offset);
+    }
+    unset($this->data[$this->collection_key][$offset]);
+  }
+
+  private function coerceType($offset)
+  {
+    $typeKey = $this->keyType($this->collection_key);
+    if (isset($this->$typeKey) && !is_object($this->data[$this->collection_key][$offset])) {
+      $type = $this->$typeKey;
+      $this->data[$this->collection_key][$offset] =
+          new $type($this->data[$this->collection_key][$offset]);
+    }
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Config.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Config.php
new file mode 100644
index 00000000000..972c97fedd0
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Config.php
@@ -0,0 +1,301 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * A class to contain the library configuration for the Google API client.
+ */
+class Google_Config
+{
+  private $configuration;
+
+  /**
+   * Create a new Google_Config. Can accept an ini file location with the
+   * local configuration. For example:
+   *     application_name: "My App";
+   *
+   * @param [$ini_file_location] - optional - The location of the ini file to load
+   */
+  public function __construct($ini_file_location = null)
+  {
+    $this->configuration = array(
+      // The application_name is included in the User-Agent HTTP header.
+      'application_name' => '',
+
+      // Which Authentication, Storage and HTTP IO classes to use.
+      'auth_class'    => 'Google_Auth_OAuth2',
+      'io_class'      => 'Google_IO_Stream',
+      'cache_class'   => 'Google_Cache_File',
+
+      // Don't change these unless you're working against a special development
+      // or testing environment.
+      'base_path' => 'https://www.googleapis.com',
+
+      // Definition of class specific values, like file paths and so on.
+      'classes' => array(
+        // If you want to pass in OAuth 2.0 settings, they will need to be
+        // structured like this.
+        'Google_Http_Request' => array(
+          // Disable the use of gzip on calls if set to true.
+          'disable_gzip' => false
+        ),
+        'Google_Auth_OAuth2' => array(
+          // Keys for OAuth 2.0 access, see the API console at
+          // https://developers.google.com/console
+          'client_id' => '',
+          'client_secret' => '',
+          'redirect_uri' => '',
+
+          // Simple API access key, also from the API console. Ensure you get
+          // a Server key, and not a Browser key.
+          'developer_key' => '',
+
+          // Other parameters.
+          'access_type' => 'online',
+          'approval_prompt' => 'auto',
+          'request_visible_actions' => '',
+          'federated_signon_certs_url' =>
+              'https://www.googleapis.com/oauth2/v1/certs',
+        ),
+        // Set a default directory for the file cache.
+        'Google_Cache_File' => array(
+          'directory' => sys_get_temp_dir() . '/Google_Client'
+        )
+      ),
+
+      // Definition of service specific values like scopes, oauth token URLs,
+      // etc. Example:
+      'services' => array(
+      ),
+    );
+    if ($ini_file_location) {
+      $ini = parse_ini_file($ini_file_location, true);
+      if (is_array($ini) && count($ini)) {
+        $this->configuration = array_merge($this->configuration, $ini);
+      }
+    }
+  }
+
+  /**
+   * Set configuration specific to a given class.
+   * $config->setClassConfig('Google_Cache_File',
+   *   array('directory' => '/tmp/cache'));
+   * @param $class The class name for the configuration
+   * @param $config string key or an array of configuration values
+   * @param $value optional - if $config is a key, the value
+   */
+  public function setClassConfig($class, $config, $value = null)
+  {
+    if (!is_array($config)) {
+      if (!isset($this->configuration['classes'][$class])) {
+        $this->configuration['classes'][$class] = array();
+      }
+      $this->configuration['classes'][$class][$config] = $value;
+    } else {
+      $this->configuration['classes'][$class] = $config;
+    }
+  }
+  
+  public function getClassConfig($class, $key = null)
+  {
+    if (!isset($this->configuration['classes'][$class])) {
+      return null;
+    }
+    if ($key === null) {
+      return $this->configuration['classes'][$class];
+    } else {
+      return $this->configuration['classes'][$class][$key];
+    }
+  }
+
+  /**
+   * Return the configured cache class.
+   * @return string
+   */
+  public function getCacheClass()
+  {
+    return $this->configuration['cache_class'];
+  }
+
+  /**
+   * Return the configured Auth class.
+   * @return string
+   */
+  public function getAuthClass()
+  {
+    return $this->configuration['auth_class'];
+  }
+  
+  /**
+   * Set the auth class.
+   *
+   * @param $class the class name to set
+   */
+  public function setAuthClass($class)
+  {
+    $prev = $this->configuration['auth_class'];
+    if (!isset($this->configuration['classes'][$class]) &&
+        isset($this->configuration['classes'][$prev])) {
+      $this->configuration['classes'][$class] =
+          $this->configuration['classes'][$prev];
+    }
+    $this->configuration['auth_class'] = $class;
+  }
+  
+  /**
+   * Set the IO class.
+   *
+   * @param $class the class name to set
+   */
+  public function setIoClass($class)
+  {
+    $prev = $this->configuration['io_class'];
+    if (!isset($this->configuration['classes'][$class]) &&
+        isset($this->configuration['classes'][$prev])) {
+      $this->configuration['classes'][$class] =
+          $this->configuration['classes'][$prev];
+    }
+    $this->configuration['io_class'] = $class;
+  }
+
+  /**
+   * Set the cache class.
+   *
+   * @param $class the class name to set
+   */
+  public function setCacheClass($class)
+  {
+    $prev = $this->configuration['cache_class'];
+    if (!isset($this->configuration['classes'][$class]) &&
+        isset($this->configuration['classes'][$prev])) {
+      $this->configuration['classes'][$class] =
+          $this->configuration['classes'][$prev];
+    }
+    $this->configuration['cache_class'] = $class;
+  }
+
+  /**
+   * Return the configured IO class.
+   * @return string
+   */
+  public function getIoClass()
+  {
+    return $this->configuration['io_class'];
+  }
+
+  /**
+   * Set the application name, this is included in the User-Agent HTTP header.
+   * @param string $name
+   */
+  public function setApplicationName($name)
+  {
+    $this->configuration['application_name'] = $name;
+  }
+
+  /**
+   * @return string the name of the application
+   */
+  public function getApplicationName()
+  {
+    return $this->configuration['application_name'];
+  }
+
+  /**
+   * Set the client ID for the auth class.
+   * @param $key string - the API console client ID
+   */
+  public function setClientId($clientId)
+  {
+    $this->setAuthConfig('client_id', $clientId);
+  }
+
+  /**
+   * Set the client secret for the auth class.
+   * @param $key string - the API console client secret
+   */
+  public function setClientSecret($secret)
+  {
+    $this->setAuthConfig('client_secret', $secret);
+  }
+
+  /**
+   * Set the redirect uri for the auth class. Note that if using the
+   * Javascript based sign in flow, this should be the string 'postmessage'.
+   * @param $key string - the URI that users should be redirected to
+   */
+  public function setRedirectUri($uri)
+  {
+    $this->setAuthConfig('redirect_uri', $uri);
+  }
+
+  /**
+   * Set the app activities for the auth class.
+   * @param $rva string a space separated list of app activity types
+   */
+  public function setRequestVisibleActions($rva)
+  {
+    $this->setAuthConfig('request_visible_actions', $rva);
+  }
+
+  /**
+   * Set the the access type requested (offline or online.)
+   * @param $access string - the access type
+   */
+  public function setAccessType($access)
+  {
+    $this->setAuthConfig('access_type', $access);
+  }
+
+  /**
+   * Set when to show the approval prompt (auto or force)
+   * @param $approval string - the approval request
+   */
+  public function setApprovalPrompt($approval)
+  {
+    $this->setAuthConfig('approval_prompt', $approval);
+  }
+  
+  /**
+   * Set the developer key for the auth class. Note that this is separate value
+   * from the client ID - if it looks like a URL, its a client ID!
+   * @param $key string - the API console developer key
+   */
+  public function setDeveloperKey($key)
+  {
+    $this->setAuthConfig('developer_key', $key);
+  }
+
+  /**
+   * @return string the base URL to use for API calls
+   */
+  public function getBasePath()
+  {
+    return $this->configuration['base_path'];
+  }
+  
+  /**
+   * Set the auth configuration for the current auth class.
+   * @param $key - the key to set
+   * @param $value - the parameter value
+   */
+  private function setAuthConfig($key, $value)
+  {
+    if (!isset($this->configuration['classes'][$this->getAuthClass()])) {
+      $this->configuration['classes'][$this->getAuthClass()] = array();
+    }
+    $this->configuration['classes'][$this->getAuthClass()][$key] = $value;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Service.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Exception.php
similarity index 83%
rename from apps/files_external/3rdparty/google-api-php-client/src/service/Google_Service.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Exception.php
index 1f4731fb2f4..af80269718a 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Service.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Exception.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2010 Google Inc.
+ * Copyright 2013 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  * limitations under the License.
  */
 
-class Google_Service {
-  public $version;
-  public $servicePath;
-  public $resource;
+class Google_Exception extends Exception
+{
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_BatchRequest.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Batch.php
similarity index 52%
rename from apps/files_external/3rdparty/google-api-php-client/src/service/Google_BatchRequest.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Batch.php
index 3916b223a7e..d851da50499 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_BatchRequest.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Batch.php
@@ -15,22 +15,39 @@
  * limitations under the License.
  */
 
+require_once 'Google/Client.php';
+require_once 'Google/Http/Request.php';
+require_once 'Google/Http/REST.php';
+
 /**
  * @author Chirag Shah <chirags@google.com>
  */
-class Google_BatchRequest {
+class Google_Http_Batch
+{
   /** @var string Multipart Boundary. */
   private $boundary;
 
   /** @var array service requests to be executed. */
   private $requests = array();
 
-  public function __construct($boundary = false) {
+  /** @var Google_Client */
+  private $client;
+
+  private $expected_classes = array();
+
+  private $base_path;
+
+  public function __construct(Google_Client $client, $boundary = false)
+  {
+    $this->client = $client;
+    $this->base_path = $this->client->getBasePath();
+    $this->expected_classes = array();
     $boundary = (false == $boundary) ? mt_rand() : $boundary;
     $this->boundary = str_replace('"', '', $boundary);
   }
 
-  public function add(Google_HttpRequest $request, $key = false) {
+  public function add(Google_Http_Request $request, $key = false)
+  {
     if (false == $key) {
       $key = mt_rand();
     }
@@ -38,36 +55,38 @@ class Google_BatchRequest {
     $this->requests[$key] = $request;
   }
 
-  public function execute() {
+  public function execute()
+  {
     $body = '';
 
-    /** @var Google_HttpRequest $req */
-    foreach($this->requests as $key => $req) {
+    /** @var Google_Http_Request $req */
+    foreach ($this->requests as $key => $req) {
       $body .= "--{$this->boundary}\n";
       $body .= $req->toBatchString($key) . "\n";
+      $this->expected_classes["response-" . $key] = $req->getExpectedClass();
     }
 
     $body = rtrim($body);
     $body .= "\n--{$this->boundary}--";
 
-    global $apiConfig;
-    $url = $apiConfig['basePath'] . '/batch';
-    $httpRequest = new Google_HttpRequest($url, 'POST');
-    $httpRequest->setRequestHeaders(array(
-        'Content-Type' => 'multipart/mixed; boundary=' . $this->boundary));
+    $url = $this->base_path . '/batch';
+    $httpRequest = new Google_Http_Request($url, 'POST');
+    $httpRequest->setRequestHeaders(
+        array('Content-Type' => 'multipart/mixed; boundary=' . $this->boundary)
+    );
 
     $httpRequest->setPostBody($body);
-    $response = Google_Client::$io->makeRequest($httpRequest);
+    $response = $this->client->getIo()->makeRequest($httpRequest);
 
-    $response = $this->parseResponse($response);
-    return $response;
+    return $this->parseResponse($response);
   }
 
-  public function parseResponse(Google_HttpRequest $response) {
+  public function parseResponse(Google_Http_Request $response)
+  {
     $contentType = $response->getResponseHeader('content-type');
     $contentType = explode(';', $contentType);
     $boundary = false;
-    foreach($contentType as $part) {
+    foreach ($contentType as $part) {
       $part = (explode('=', $part, 2));
       if (isset($part[0]) && 'boundary' == trim($part[0])) {
         $boundary = $part[1];
@@ -80,25 +99,39 @@ class Google_BatchRequest {
       $parts = explode("--$boundary", $body);
       $responses = array();
 
-      foreach($parts as $part) {
+      foreach ($parts as $part) {
         $part = trim($part);
         if (!empty($part)) {
           list($metaHeaders, $part) = explode("\r\n\r\n", $part, 2);
-          $metaHeaders = Google_CurlIO::parseResponseHeaders($metaHeaders);
+          $metaHeaders = $this->client->getIo()->getHttpResponseHeaders($metaHeaders);
 
           $status = substr($part, 0, strpos($part, "\n"));
           $status = explode(" ", $status);
           $status = $status[1];
 
-          list($partHeaders, $partBody) = Google_CurlIO::parseHttpResponse($part, false);
-          $response = new Google_HttpRequest("");
+          list($partHeaders, $partBody) = $this->client->getIo()->ParseHttpResponse($part, false);
+          $response = new Google_Http_Request("");
           $response->setResponseHttpCode($status);
           $response->setResponseHeaders($partHeaders);
           $response->setResponseBody($partBody);
-          $response = Google_REST::decodeHttpResponse($response);
 
           // Need content id.
-          $responses[$metaHeaders['content-id']] = $response;
+          $key = $metaHeaders['content-id'];
+
+          if (isset($this->expected_classes[$key]) &&
+              strlen($this->expected_classes[$key]) > 0) {
+            $class = $this->expected_classes[$key];
+            $response->setExpectedClass($class);
+          }
+
+          try {
+            $response = Google_Http_REST::decodeHttpResponse($response);
+            $responses[$key] = $response;
+          } catch (Google_Service_Exception $e) {
+            // Store the exception as the response, so succesful responses
+            // can be processed.
+            $responses[$key] = $e;
+          }
         }
       }
 
@@ -107,4 +140,4 @@ class Google_BatchRequest {
 
     return null;
   }
-}
\ No newline at end of file
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CacheParser.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/CacheParser.php
similarity index 87%
rename from apps/files_external/3rdparty/google-api-php-client/src/io/Google_CacheParser.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Http/CacheParser.php
index 7f5accfefe9..83f1c8d2f42 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CacheParser.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/CacheParser.php
@@ -14,26 +14,29 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+require_once 'Google/Http/Request.php';
+
 /**
  * Implement the caching directives specified in rfc2616. This
  * implementation is guided by the guidance offered in rfc2616-sec13.
  * @author Chirag Shah <chirags@google.com>
  */
-class Google_CacheParser {
+class Google_Http_CacheParser
+{
   public static $CACHEABLE_HTTP_METHODS = array('GET', 'HEAD');
   public static $CACHEABLE_STATUS_CODES = array('200', '203', '300', '301');
 
-  private function __construct() {}
-
   /**
    * Check if an HTTP request can be cached by a private local cache.
    *
    * @static
-   * @param Google_HttpRequest $resp
+   * @param Google_Http_Request $resp
    * @return bool True if the request is cacheable.
    * False if the request is uncacheable.
    */
-  public static function isRequestCacheable (Google_HttpRequest $resp) {
+  public static function isRequestCacheable(Google_Http_Request $resp)
+  {
     $method = $resp->getRequestMethod();
     if (! in_array($method, self::$CACHEABLE_HTTP_METHODS)) {
       return false;
@@ -54,11 +57,12 @@ class Google_CacheParser {
    * Check if an HTTP response can be cached by a private local cache.
    *
    * @static
-   * @param Google_HttpRequest $resp
+   * @param Google_Http_Request $resp
    * @return bool True if the response is cacheable.
    * False if the response is un-cacheable.
    */
-  public static function isResponseCacheable (Google_HttpRequest $resp) {
+  public static function isResponseCacheable(Google_Http_Request $resp)
+  {
     // First, check if the HTTP request was cacheable before inspecting the
     // HTTP response.
     if (false == self::isRequestCacheable($resp)) {
@@ -105,15 +109,17 @@ class Google_CacheParser {
 
   /**
    * @static
-   * @param Google_HttpRequest $resp
+   * @param Google_Http_Request $resp
    * @return bool True if the HTTP response is considered to be expired.
    * False if it is considered to be fresh.
    */
-  public static function isExpired(Google_HttpRequest $resp) {
+  public static function isExpired(Google_Http_Request $resp)
+  {
     // HTTP/1.1 clients and caches MUST treat other invalid date formats,
     // especially including the value “0”, as in the past.
     $parsedExpires = false;
     $responseHeaders = $resp->getResponseHeaders();
+
     if (isset($responseHeaders['expires'])) {
       $rawExpires = $responseHeaders['expires'];
       // Check for a malformed expires header first.
@@ -139,8 +145,12 @@ class Google_CacheParser {
     $parsedDate = strtotime($rawDate);
 
     if (empty($rawDate) || false == $parsedDate) {
-      $parsedDate = time();
+      // We can't default this to now, as that means future cache reads
+      // will always pass with the logic below, so we will require a
+      // date be injected if not supplied.
+      throw new Google_Exception("All cacheable requests must have creation dates.");
     }
+
     if (false == $freshnessLifetime && isset($responseHeaders['expires'])) {
       $freshnessLifetime = $parsedExpires - $parsedDate;
     }
@@ -161,13 +171,14 @@ class Google_CacheParser {
   /**
    * Determine if a cache entry should be revalidated with by the origin.
    *
-   * @param Google_HttpRequest $response
+   * @param Google_Http_Request $response
    * @return bool True if the entry is expired, else return false.
    */
-  public static function mustRevalidate(Google_HttpRequest $response) {
+  public static function mustRevalidate(Google_Http_Request $response)
+  {
     // [13.3] When a cache has a stale entry that it would like to use as a
     // response to a client's request, it first has to check with the origin
     // server to see if its cached entry is still usable.
     return self::isExpired($response);
   }
-}
\ No newline at end of file
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/MediaFileUpload.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/MediaFileUpload.php
new file mode 100644
index 00000000000..b96db84b3e7
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/MediaFileUpload.php
@@ -0,0 +1,270 @@
+<?php
+/**
+ * Copyright 2012 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once 'Google/Client.php';
+require_once 'Google/Exception.php';
+require_once 'Google/Http/Request.php';
+require_once 'Google/Http/REST.php';
+require_once 'Google/Utils.php';
+
+/**
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_Http_MediaFileUpload
+{
+  const UPLOAD_MEDIA_TYPE = 'media';
+  const UPLOAD_MULTIPART_TYPE = 'multipart';
+  const UPLOAD_RESUMABLE_TYPE = 'resumable';
+
+  /** @var string $mimeType */
+  private $mimeType;
+
+  /** @var string $data */
+  private $data;
+
+  /** @var bool $resumable */
+  private $resumable;
+
+  /** @var int $chunkSize */
+  private $chunkSize;
+
+  /** @var int $size */
+  private $size;
+
+  /** @var string $resumeUri */
+  private $resumeUri;
+
+  /** @var int $progress */
+  private $progress;
+  
+  /** @var Google_Client */
+  private $client;
+  
+  /** @var Google_Http_Request */
+  private $request;
+  
+  /** @var string */
+  private $boundary;
+
+  /**
+   * @param $mimeType string
+   * @param $data string The bytes you want to upload.
+   * @param $resumable bool
+   * @param bool $chunkSize File will be uploaded in chunks of this many bytes.
+   * only used if resumable=True
+   */
+  public function __construct(
+      Google_Client $client,
+      Google_Http_Request $request,
+      $mimeType,
+      $data,
+      $resumable = false,
+      $chunkSize = false,
+      $boundary = false
+  ) {
+    $this->client = $client;
+    $this->request = $request;
+    $this->mimeType = $mimeType;
+    $this->data = $data;
+    $this->size = strlen($this->data);
+    $this->resumable = $resumable;
+    if (!$chunkSize) {
+      $chunkSize = 256 * 1024;
+    }
+    $this->chunkSize = $chunkSize;
+    $this->progress = 0;
+    $this->boundary = $boundary;
+    
+    // Process Media Request
+    $this->process();
+  }
+
+  /**
+   * Set the size of the file that is being uploaded.
+   * @param $size - int file size in bytes
+   */
+  public function setFileSize($size)
+  {
+    $this->size = $size;
+  }
+  
+  /** 
+   * Return the progress on the upload
+   * @return int progress in bytes uploaded.
+   */
+  public function getProgress()
+  {
+    return $this->progress;
+  }
+  
+  /**
+   * Send the next part of the file to upload.
+   * @param [$chunk] the next set of bytes to send. If false will used $data passed
+   * at construct time.
+   */
+  public function nextChunk($chunk = false)
+  {
+    if (false == $this->resumeUri) {
+      $this->resumeUri = $this->getResumeUri();
+    }
+
+    if (false == $chunk) {
+      $chunk = substr($this->data, $this->progress, $this->chunkSize);
+    }
+
+    $lastBytePos = $this->progress + strlen($chunk) - 1;
+    $headers = array(
+      'content-range' => "bytes $this->progress-$lastBytePos/$this->size",
+      'content-type' => $this->request->getRequestHeader('content-type'),
+      'content-length' => $this->chunkSize,
+      'expect' => '',
+    );
+
+    $httpRequest = new Google_Http_Request(
+        $this->resumeUri,
+        'PUT',
+        $headers,
+        $chunk
+    );
+    $httpRequest->disableGzip(); // Disable gzip for uploads.
+    $response = $this->client->getIo()->makeRequest($httpRequest);
+    $response->setExpectedClass($this->request->getExpectedClass());
+    $code = $response->getResponseHttpCode();
+
+    if (308 == $code) {
+      // Track the amount uploaded.
+      $range = explode('-', $response->getResponseHeader('range'));
+      $this->progress = $range[1] + 1;
+      
+      // Allow for changing upload URLs.
+      $location = $response->getResponseHeader('location');
+      if ($location) {
+        $this->resumeUri = $location;
+      }
+      
+      // No problems, but upload not complete.
+      return false;
+    } else {
+      return Google_Http_REST::decodeHttpResponse($response);
+    }
+  }
+
+  /**
+   * @param $meta
+   * @param $params
+   * @return array|bool
+   * @visible for testing
+   */
+  private function process()
+  {
+    $postBody = false;
+    $contentType = false;
+
+    $meta = $this->request->getPostBody();
+    $meta = is_string($meta) ? json_decode($meta, true) : $meta;
+    
+    $uploadType = $this->getUploadType($meta);
+    $this->request->setQueryParam('uploadType', $uploadType);
+    $this->transformToUploadUrl();
+    $mimeType = $this->mimeType ?
+        $this->mimeType :
+        $this->request->getRequestHeader('content-type');
+
+    if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
+      $contentType = $mimeType;
+      $postBody = is_string($meta) ? $meta : json_encode($meta);
+    } else if (self::UPLOAD_MEDIA_TYPE == $uploadType) {
+      $contentType = $mimeType;
+      $postBody = $this->data;
+    } else if (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
+      // This is a multipart/related upload.
+      $boundary = $this->boundary ? $this->boundary : mt_rand();
+      $boundary = str_replace('"', '', $boundary);
+      $contentType = 'multipart/related; boundary=' . $boundary;
+      $related = "--$boundary\r\n";
+      $related .= "Content-Type: application/json; charset=UTF-8\r\n";
+      $related .= "\r\n" . json_encode($meta) . "\r\n";
+      $related .= "--$boundary\r\n";
+      $related .= "Content-Type: $mimeType\r\n";
+      $related .= "Content-Transfer-Encoding: base64\r\n";
+      $related .= "\r\n" . base64_encode($this->data) . "\r\n";
+      $related .= "--$boundary--";
+      $postBody = $related;
+    }
+
+    $this->request->setPostBody($postBody);
+
+    if (isset($contentType) && $contentType) {
+      $contentTypeHeader['content-type'] = $contentType;
+      $this->request->setRequestHeaders($contentTypeHeader);
+    }
+  }
+  
+  private function transformToUploadUrl()
+  {
+    $base = $this->request->getBaseComponent();
+    $this->request->setBaseComponent($base . '/upload');
+  }
+
+  /**
+   * Valid upload types:
+   * - resumable (UPLOAD_RESUMABLE_TYPE)
+   * - media (UPLOAD_MEDIA_TYPE)
+   * - multipart (UPLOAD_MULTIPART_TYPE)
+   * @param $meta
+   * @return string
+   * @visible for testing
+   */
+  public function getUploadType($meta)
+  {
+    if ($this->resumable) {
+      return self::UPLOAD_RESUMABLE_TYPE;
+    }
+
+    if (false == $meta && $this->data) {
+      return self::UPLOAD_MEDIA_TYPE;
+    }
+
+    return self::UPLOAD_MULTIPART_TYPE;
+  }
+
+  private function getResumeUri()
+  {
+    $result = null;
+    $body = $this->request->getPostBody();
+    if ($body) {
+      $headers = array(
+        'content-type' => 'application/json; charset=UTF-8',
+        'content-length' => Google_Utils::getStrLen($body),
+        'x-upload-content-type' => $this->mimeType,
+        'x-upload-content-length' => $this->size,
+        'expect' => '',
+      );
+      $this->request->setRequestHeaders($headers);
+    }
+
+    $response = $this->client->getIo()->makeRequest($this->request);
+    $location = $response->getResponseHeader('location');
+    $code = $response->getResponseHttpCode();
+
+    if (200 == $code && true == $location) {
+      return $location;
+    }
+    throw new Google_Exception("Failed to start the resumable upload");
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_REST.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
similarity index 64%
rename from apps/files_external/3rdparty/google-api-php-client/src/io/Google_REST.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
index d0f3b3d564c..43d46b1a85e 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_REST.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
@@ -15,39 +15,45 @@
  * limitations under the License.
  */
 
+require_once 'Google/Client.php';
+require_once 'Google/Http/Request.php';
+require_once 'Google/Service/Exception.php';
+require_once 'Google/Utils/URITemplate.php';
+
 /**
  * This class implements the RESTful transport of apiServiceRequest()'s
  *
  * @author Chris Chabot <chabotc@google.com>
  * @author Chirag Shah <chirags@google.com>
  */
-class Google_REST {
+class Google_Http_REST
+{
   /**
-   * Executes a apiServiceRequest using a RESTful call by transforming it into
-   * an apiHttpRequest, and executed via apiIO::authenticatedRequest().
+   * Executes a Google_Http_Request
    *
-   * @param Google_HttpRequest $req
+   * @param Google_Client $client
+   * @param Google_Http_Request $req
    * @return array decoded result
-   * @throws Google_ServiceException on server side error (ie: not authenticated,
+   * @throws Google_Service_Exception on server side error (ie: not authenticated,
    *  invalid or malformed post body, invalid url)
    */
-  static public function execute(Google_HttpRequest $req) {
-    $httpRequest = Google_Client::$io->makeRequest($req);
-    $decodedResponse = self::decodeHttpResponse($httpRequest);
-    $ret = isset($decodedResponse['data'])
-        ? $decodedResponse['data'] : $decodedResponse;
-    return $ret;
+  public static function execute(Google_Client $client, Google_Http_Request $req)
+  {
+    $httpRequest = $client->getIo()->makeRequest($req);
+    $httpRequest->setExpectedClass($req->getExpectedClass());
+    return self::decodeHttpResponse($httpRequest);
   }
 
   
   /**
    * Decode an HTTP Response.
    * @static
-   * @throws Google_ServiceException
-   * @param Google_HttpRequest $response The http response to be decoded.
+   * @throws Google_Service_Exception
+   * @param Google_Http_Request $response The http response to be decoded.
    * @return mixed|null
    */
-  public static function decodeHttpResponse($response) {
+  public static function decodeHttpResponse($response)
+  {
     $code = $response->getResponseHttpCode();
     $body = $response->getResponseBody();
     $decoded = null;
@@ -55,7 +61,9 @@ class Google_REST {
     if ((intVal($code)) >= 300) {
       $decoded = json_decode($body, true);
       $err = 'Error calling ' . $response->getRequestMethod() . ' ' . $response->getUrl();
-      if ($decoded != null && isset($decoded['error']['message'])  && isset($decoded['error']['code'])) {
+      if (isset($decoded['error']) &&
+          isset($decoded['error']['message'])  &&
+          isset($decoded['error']['code'])) {
         // if we're getting a json encoded error definition, use that instead of the raw response
         // body for improved readability
         $err .= ": ({$decoded['error']['code']}) {$decoded['error']['message']}";
@@ -63,14 +71,21 @@ class Google_REST {
         $err .= ": ($code) $body";
       }
 
-      throw new Google_ServiceException($err, $code, null, $decoded['error']['errors']);
+      throw new Google_Service_Exception($err, $code, null, $decoded['error']['errors']);
     }
     
     // Only attempt to decode the response, if the response code wasn't (204) 'no content'
     if ($code != '204') {
       $decoded = json_decode($body, true);
       if ($decoded === null || $decoded === "") {
-        throw new Google_ServiceException("Invalid json in service response: $body");
+        throw new Google_Service_Exception("Invalid json in service response: $body");
+      }
+
+      $decoded = isset($decoded['data']) ? $decoded['data'] : $decoded;
+
+      if ($response->getExpectedClass()) {
+        $class = $response->getExpectedClass();
+        $decoded = new $class($decoded);
       }
     }
     return $decoded;
@@ -85,22 +100,18 @@ class Google_REST {
    * @param array $params
    * @return string $requestUrl
    */
-  static function createRequestUri($servicePath, $restPath, $params) {
+  public static function createRequestUri($servicePath, $restPath, $params)
+  {
     $requestUrl = $servicePath . $restPath;
     $uriTemplateVars = array();
     $queryVars = array();
     foreach ($params as $paramName => $paramSpec) {
-      // Discovery v1.0 puts the canonical location under the 'location' field.
-      if (! isset($paramSpec['location'])) {
-        $paramSpec['location'] = $paramSpec['restParameterType'];
-      }
-
       if ($paramSpec['type'] == 'boolean') {
         $paramSpec['value'] = ($paramSpec['value']) ? 'true' : 'false';
       }
       if ($paramSpec['location'] == 'path') {
         $uriTemplateVars[$paramName] = $paramSpec['value'];
-      } else {
+      } else if ($paramSpec['location'] == 'query') {
         if (isset($paramSpec['repeated']) && is_array($paramSpec['value'])) {
           foreach ($paramSpec['value'] as $value) {
             $queryVars[] = $paramName . '=' . rawurlencode($value);
@@ -112,12 +123,9 @@ class Google_REST {
     }
 
     if (count($uriTemplateVars)) {
-      $uriTemplateParser = new URI_Template_Parser($requestUrl);
-      $requestUrl = $uriTemplateParser->expand($uriTemplateVars);
+      $uriTemplateParser = new Google_Utils_URITemplate();
+      $requestUrl = $uriTemplateParser->parse($requestUrl, $uriTemplateVars);
     }
-    //FIXME work around for the the uri template lib which url encodes
-    // the @'s & confuses our servers.
-    $requestUrl = str_replace('%40', '@', $requestUrl);
 
     if (count($queryVars)) {
       $requestUrl .= '?' . implode($queryVars, '&');
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Request.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Request.php
new file mode 100644
index 00000000000..f1e9a422279
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Request.php
@@ -0,0 +1,474 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once 'Google/Utils.php';
+
+/**
+ * HTTP Request to be executed by IO classes. Upon execution, the
+ * responseHttpCode, responseHeaders and responseBody will be filled in.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_Http_Request
+{
+  const GZIP_UA = " (gzip)";
+
+  private $batchHeaders = array(
+    'Content-Type' => 'application/http',
+    'Content-Transfer-Encoding' => 'binary',
+    'MIME-Version' => '1.0',
+  );
+
+  protected $queryParams;
+  protected $requestMethod;
+  protected $requestHeaders;
+  protected $baseComponent = null;
+  protected $path;
+  protected $postBody;
+  protected $userAgent;
+  protected $canGzip = null;
+
+  protected $responseHttpCode;
+  protected $responseHeaders;
+  protected $responseBody;
+  
+  protected $expectedClass;
+
+  public $accessKey;
+
+  public function __construct(
+      $url,
+      $method = 'GET',
+      $headers = array(),
+      $postBody = null
+  ) {
+    $this->setUrl($url);
+    $this->setRequestMethod($method);
+    $this->setRequestHeaders($headers);
+    $this->setPostBody($postBody);
+  }
+
+  /**
+   * Misc function that returns the base url component of the $url
+   * used by the OAuth signing class to calculate the base string
+   * @return string The base url component of the $url.
+   */
+  public function getBaseComponent()
+  {
+    return $this->baseComponent;
+  }
+  
+  /**
+   * Set the base URL that path and query parameters will be added to.
+   * @param $baseComponent string
+   */
+  public function setBaseComponent($baseComponent)
+  {
+    $this->baseComponent = $baseComponent;
+  }
+  
+  /**
+   * Enable support for gzipped responses with this request.
+   */
+  public function enableGzip()
+  {
+    $this->setRequestHeaders(array("Accept-Encoding" => "gzip"));
+    $this->canGzip = true;
+    $this->setUserAgent($this->userAgent);
+  }
+  
+  /**
+   * Disable support for gzip responses with this request.
+   */
+  public function disableGzip()
+  {
+    if (
+        isset($this->requestHeaders['accept-encoding']) &&
+        $this->requestHeaders['accept-encoding'] == "gzip"
+    ) {
+      unset($this->requestHeaders['accept-encoding']);
+    }
+    $this->canGzip = false;
+    $this->userAgent = str_replace(self::GZIP_UA, "", $this->userAgent);
+  }
+  
+  /**
+   * Can this request accept a gzip response?
+   * @return bool
+   */
+  public function canGzip()
+  {
+    return $this->canGzip;
+  }
+
+  /**
+   * Misc function that returns an array of the query parameters of the current
+   * url used by the OAuth signing class to calculate the signature
+   * @return array Query parameters in the query string.
+   */
+  public function getQueryParams()
+  {
+    return $this->queryParams;
+  }
+
+  /** 
+   * Set a new query parameter.
+   * @param $key - string to set, does not need to be URL encoded
+   * @param $value - string to set, does not need to be URL encoded
+   */
+  public function setQueryParam($key, $value)
+  {
+    $this->queryParams[$key] = $value;
+  }
+
+  /**
+   * @return string HTTP Response Code.
+   */
+  public function getResponseHttpCode()
+  {
+    return (int) $this->responseHttpCode;
+  }
+
+  /**
+   * @param int $responseHttpCode HTTP Response Code.
+   */
+  public function setResponseHttpCode($responseHttpCode)
+  {
+    $this->responseHttpCode = $responseHttpCode;
+  }
+
+  /**
+   * @return $responseHeaders (array) HTTP Response Headers.
+   */
+  public function getResponseHeaders()
+  {
+    return $this->responseHeaders;
+  }
+
+  /**
+   * @return string HTTP Response Body
+   */
+  public function getResponseBody()
+  {
+    return $this->responseBody;
+  }
+  
+  /**
+   * Set the class the response to this request should expect.
+   *
+   * @param $class string the class name
+   */
+  public function setExpectedClass($class)
+  {
+    $this->expectedClass = $class;
+  }
+  
+  /**
+   * Retrieve the expected class the response should expect.
+   * @return string class name
+   */
+  public function getExpectedClass()
+  {
+    return $this->expectedClass;
+  }
+
+  /**
+   * @param array $headers The HTTP response headers
+   * to be normalized.
+   */
+  public function setResponseHeaders($headers)
+  {
+    $headers = Google_Utils::normalize($headers);
+    if ($this->responseHeaders) {
+      $headers = array_merge($this->responseHeaders, $headers);
+    }
+
+    $this->responseHeaders = $headers;
+  }
+
+  /**
+   * @param string $key
+   * @return array|boolean Returns the requested HTTP header or
+   * false if unavailable.
+   */
+  public function getResponseHeader($key)
+  {
+    return isset($this->responseHeaders[$key])
+        ? $this->responseHeaders[$key]
+        : false;
+  }
+
+  /**
+   * @param string $responseBody The HTTP response body.
+   */
+  public function setResponseBody($responseBody)
+  {
+    $this->responseBody = $responseBody;
+  }
+
+  /**
+   * @return string $url The request URL.
+   */
+  public function getUrl()
+  {
+    return $this->baseComponent . $this->path .
+        (count($this->queryParams) ?
+            "?" . $this->buildQuery($this->queryParams) :
+            '');
+  }
+
+  /**
+   * @return string $method HTTP Request Method.
+   */
+  public function getRequestMethod()
+  {
+    return $this->requestMethod;
+  }
+
+  /**
+   * @return array $headers HTTP Request Headers.
+   */
+  public function getRequestHeaders()
+  {
+    return $this->requestHeaders;
+  }
+
+  /**
+   * @param string $key
+   * @return array|boolean Returns the requested HTTP header or
+   * false if unavailable.
+   */
+  public function getRequestHeader($key)
+  {
+    return isset($this->requestHeaders[$key])
+        ? $this->requestHeaders[$key]
+        : false;
+  }
+
+  /**
+   * @return string $postBody HTTP Request Body.
+   */
+  public function getPostBody()
+  {
+    return $this->postBody;
+  }
+
+  /**
+   * @param string $url the url to set
+   */
+  public function setUrl($url)
+  {
+    if (substr($url, 0, 4) != 'http') {
+      // Force the path become relative.
+      if (substr($url, 0, 1) !== '/') {
+        $url = '/' . $url;
+      }
+    }
+    $parts = parse_url($url);
+    if (isset($parts['host'])) {
+      $this->baseComponent = sprintf(
+          "%s%s%s",
+          isset($parts['scheme']) ? $parts['scheme'] . "://" : '',
+          isset($parts['host']) ? $parts['host'] : '',
+          isset($parts['port']) ? ":" . $parts['port'] : ''
+      );
+    }
+    $this->path = isset($parts['path']) ? $parts['path'] : '';
+    $this->queryParams = array();
+    if (isset($parts['query'])) {
+      $this->queryParams = $this->parseQuery($parts['query']);
+    }
+  }
+
+  /**
+   * @param string $method Set he HTTP Method and normalize
+   * it to upper-case, as required by HTTP.
+   *
+   */
+  public function setRequestMethod($method)
+  {
+    $this->requestMethod = strtoupper($method);
+  }
+
+  /**
+   * @param array $headers The HTTP request headers
+   * to be set and normalized.
+   */
+  public function setRequestHeaders($headers)
+  {
+    $headers = Google_Utils::normalize($headers);
+    if ($this->requestHeaders) {
+      $headers = array_merge($this->requestHeaders, $headers);
+    }
+    $this->requestHeaders = $headers;
+  }
+
+  /**
+   * @param string $postBody the postBody to set
+   */
+  public function setPostBody($postBody)
+  {
+    $this->postBody = $postBody;
+  }
+
+  /**
+   * Set the User-Agent Header.
+   * @param string $userAgent The User-Agent.
+   */
+  public function setUserAgent($userAgent)
+  {
+    $this->userAgent = $userAgent;
+    if ($this->canGzip) {
+      $this->userAgent = $userAgent . self::GZIP_UA;
+    }
+  }
+
+  /**
+   * @return string The User-Agent.
+   */
+  public function getUserAgent()
+  {
+    return $this->userAgent;
+  }
+
+  /**
+   * Returns a cache key depending on if this was an OAuth signed request
+   * in which case it will use the non-signed url and access key to make this
+   * cache key unique per authenticated user, else use the plain request url
+   * @return string The md5 hash of the request cache key.
+   */
+  public function getCacheKey()
+  {
+    $key = $this->getUrl();
+
+    if (isset($this->accessKey)) {
+      $key .= $this->accessKey;
+    }
+
+    if (isset($this->requestHeaders['authorization'])) {
+      $key .= $this->requestHeaders['authorization'];
+    }
+
+    return md5($key);
+  }
+
+  public function getParsedCacheControl()
+  {
+    $parsed = array();
+    $rawCacheControl = $this->getResponseHeader('cache-control');
+    if ($rawCacheControl) {
+      $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
+      parse_str($rawCacheControl, $parsed);
+    }
+
+    return $parsed;
+  }
+
+  /**
+   * @param string $id
+   * @return string A string representation of the HTTP Request.
+   */
+  public function toBatchString($id)
+  {
+    $str = '';
+    $path = parse_url($this->getUrl(), PHP_URL_PATH) . "?" .
+        http_build_query($this->queryParams);
+    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
+
+    foreach ($this->getRequestHeaders() as $key => $val) {
+      $str .= $key . ': ' . $val . "\n";
+    }
+
+    if ($this->getPostBody()) {
+      $str .= "\n";
+      $str .= $this->getPostBody();
+    }
+    
+    $headers = '';
+    foreach ($this->batchHeaders as $key => $val) {
+      $headers .= $key . ': ' . $val . "\n";
+    }
+
+    $headers .= "Content-ID: $id\n";
+    $str = $headers . "\n" . $str;
+
+    return $str;
+  }
+  
+  /**
+   * Our own version of parse_str that allows for multiple variables
+   * with the same name. 
+   * @param $string - the query string to parse
+   */
+  private function parseQuery($string)
+  {
+    $return = array();
+    $parts = explode("&", $string);
+    foreach ($parts as $part) {
+      list($key, $value) = explode('=', $part, 2);
+      $value = urldecode($value);
+      if (isset($return[$key])) {
+        $return[$key] = array($return[$key]);
+        $return[$key][] = $value;
+      } else {
+        $return[$key] = $value;
+      }
+    }
+    return $return;
+  }
+  
+  /**
+   * A version of build query that allows for multiple
+   * duplicate keys. 
+   * @param $parts array of key value pairs
+   */
+  private function buildQuery($parts)
+  {
+    $return = array();
+    foreach ($parts as $key => $value) {
+      if (is_array($value)) {
+        foreach ($value as $v) {
+          $return[] = urlencode($key) . "=" . urlencode($v);
+        }
+      } else {
+        $return[] = urlencode($key) . "=" . urlencode($value);
+      }
+    }
+    return implode('&', $return);
+  }
+  
+  /** 
+   * If we're POSTing and have no body to send, we can send the query
+   * parameters in there, which avoids length issues with longer query
+   * params.
+   */
+  public function maybeMoveParametersToBody()
+  {
+    if ($this->getRequestMethod() == "POST" && empty($this->postBody)) {
+      $this->setRequestHeaders(
+          array(
+            "content-type" =>
+                "application/x-www-form-urlencoded; charset=UTF-8"
+          )
+      );
+      $this->setPostBody($this->buildQuery($this->queryParams));
+      $this->queryParams = array();
+    }
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Abstract.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Abstract.php
new file mode 100644
index 00000000000..6367b5da40a
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Abstract.php
@@ -0,0 +1,244 @@
+<?php
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Abstract IO base class
+ */
+
+require_once 'Google/Client.php';
+require_once 'Google/IO/Exception.php';
+require_once 'Google/Http/CacheParser.php';
+require_once 'Google/Http/Request.php';
+
+abstract class Google_IO_Abstract
+{
+  const FORM_URLENCODED = 'application/x-www-form-urlencoded';
+  const CONNECTION_ESTABLISHED = "HTTP/1.0 200 Connection established\r\n\r\n";
+
+  /** @var Google_Client */
+  protected $client;
+
+  public function __construct(Google_Client $client)
+  {
+    $this->client = $client;
+  }
+
+  /**
+   * Executes a Google_Http_Request and returns the resulting populated Google_Http_Request
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request $request
+   */
+  abstract public function makeRequest(Google_Http_Request $request);
+
+  /**
+   * Set options that update the transport implementation's behavior.
+   * @param $options
+   */
+  abstract public function setOptions($options);
+
+  /**
+   * @visible for testing.
+   * Cache the response to an HTTP request if it is cacheable.
+   * @param Google_Http_Request $request
+   * @return bool Returns true if the insertion was successful.
+   * Otherwise, return false.
+   */
+  public function setCachedRequest(Google_Http_Request $request)
+  {
+    // Determine if the request is cacheable.
+    if (Google_Http_CacheParser::isResponseCacheable($request)) {
+      $this->client->getCache()->set($request->getCacheKey(), $request);
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * @visible for testing.
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request|bool Returns the cached object or
+   * false if the operation was unsuccessful.
+   */
+  public function getCachedRequest(Google_Http_Request $request)
+  {
+    if (false === Google_Http_CacheParser::isRequestCacheable($request)) {
+      return false;
+    }
+
+    return $this->client->getCache()->get($request->getCacheKey());
+  }
+
+  /**
+   * @visible for testing
+   * Process an http request that contains an enclosed entity.
+   * @param Google_Http_Request $request
+   * @return Google_Http_Request Processed request with the enclosed entity.
+   */
+  public function processEntityRequest(Google_Http_Request $request)
+  {
+    $postBody = $request->getPostBody();
+    $contentType = $request->getRequestHeader("content-type");
+
+    // Set the default content-type as application/x-www-form-urlencoded.
+    if (false == $contentType) {
+      $contentType = self::FORM_URLENCODED;
+      $request->setRequestHeaders(array('content-type' => $contentType));
+    }
+
+    // Force the payload to match the content-type asserted in the header.
+    if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
+      $postBody = http_build_query($postBody, '', '&');
+      $request->setPostBody($postBody);
+    }
+
+    // Make sure the content-length header is set.
+    if (!$postBody || is_string($postBody)) {
+      $postsLength = strlen($postBody);
+      $request->setRequestHeaders(array('content-length' => $postsLength));
+    }
+
+    return $request;
+  }
+
+  /**
+   * Check if an already cached request must be revalidated, and if so update
+   * the request with the correct ETag headers.
+   * @param Google_Http_Request $cached A previously cached response.
+   * @param Google_Http_Request $request The outbound request.
+   * return bool If the cached object needs to be revalidated, false if it is
+   * still current and can be re-used.
+   */
+  protected function checkMustRevalidateCachedRequest($cached, $request)
+  {
+    if (Google_Http_CacheParser::mustRevalidate($cached)) {
+      $addHeaders = array();
+      if ($cached->getResponseHeader('etag')) {
+        // [13.3.4] If an entity tag has been provided by the origin server,
+        // we must use that entity tag in any cache-conditional request.
+        $addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
+      } elseif ($cached->getResponseHeader('date')) {
+        $addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
+      }
+
+      $request->setRequestHeaders($addHeaders);
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  /**
+   * Update a cached request, using the headers from the last response.
+   * @param Google_HttpRequest $cached A previously cached response.
+   * @param mixed Associative array of response headers from the last request.
+   */
+  protected function updateCachedRequest($cached, $responseHeaders)
+  {
+    if (isset($responseHeaders['connection'])) {
+      $hopByHop = array_merge(
+          self::$HOP_BY_HOP,
+          explode(
+              ',',
+              $responseHeaders['connection']
+          )
+      );
+
+      $endToEnd = array();
+      foreach ($hopByHop as $key) {
+        if (isset($responseHeaders[$key])) {
+          $endToEnd[$key] = $responseHeaders[$key];
+        }
+      }
+      $cached->setResponseHeaders($endToEnd);
+    }
+  }
+
+  /**
+   * Used by the IO lib and also the batch processing.
+   *
+   * @param $respData
+   * @param $headerSize
+   * @return array
+   */
+  public function parseHttpResponse($respData, $headerSize)
+  {
+    if (stripos($respData, self::CONNECTION_ESTABLISHED) !== false) {
+      $respData = str_ireplace(self::CONNECTION_ESTABLISHED, '', $respData);
+    }
+
+    if ($headerSize) {
+      $responseBody = substr($respData, $headerSize);
+      $responseHeaders = substr($respData, 0, $headerSize);
+    } else {
+      list($responseHeaders, $responseBody) = explode("\r\n\r\n", $respData, 2);
+    }
+
+    $responseHeaders = $this->getHttpResponseHeaders($responseHeaders);
+    return array($responseHeaders, $responseBody);
+  }
+
+  /**
+   * Parse out headers from raw headers
+   * @param rawHeaders array or string
+   * @return array
+   */
+  public function getHttpResponseHeaders($rawHeaders)
+  {
+    if (is_array($rawHeaders)) {
+      return $this->parseArrayHeaders($rawHeaders);
+    } else {
+      return $this->parseStringHeaders($rawHeaders);
+    }
+  }
+
+  private function parseStringHeaders($rawHeaders)
+  {
+    $headers = array();
+
+    $responseHeaderLines = explode("\r\n", $rawHeaders);
+    foreach ($responseHeaderLines as $headerLine) {
+      if ($headerLine && strpos($headerLine, ':') !== false) {
+        list($header, $value) = explode(': ', $headerLine, 2);
+        $header = strtolower($header);
+        if (isset($responseHeaders[$header])) {
+          $headers[$header] .= "\n" . $value;
+        } else {
+          $headers[$header] = $value;
+        }
+      }
+    }
+    return $headers;
+  }
+
+  private function parseArrayHeaders($rawHeaders)
+  {
+    $header_count = count($rawHeaders);
+    $headers = array();
+
+    for ($i = 0; $i < $header_count; $i++) {
+      $header = $rawHeaders[$i];
+      // Times will have colons in - so we just want the first match.
+      $header_parts = explode(': ', $header, 2);
+      if (count($header_parts) == 2) {
+        $headers[$header_parts[0]] = $header_parts[1];
+      }
+    }
+
+    return $headers;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Exception.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Exception.php
new file mode 100644
index 00000000000..28c2d8ce645
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Exception.php
@@ -0,0 +1,22 @@
+<?php
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once 'Google/Exception.php';
+
+class Google_IO_Exception extends Google_Exception
+{
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Stream.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Stream.php
new file mode 100644
index 00000000000..d73e0e98356
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Stream.php
@@ -0,0 +1,165 @@
+<?php
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Http Streams based implementation of Google_IO.
+ *
+ * @author Stuart Langley <slangley@google.com>
+ */
+
+require_once 'Google/IO/Abstract.php';
+
+class Google_IO_Stream extends Google_IO_Abstract
+{
+  const ZLIB = "compress.zlib://";
+  private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
+
+  private static $DEFAULT_HTTP_CONTEXT = array(
+    "follow_location" => 0,
+    "ignore_errors" => 1,
+  );
+
+  private static $DEFAULT_SSL_CONTEXT = array(
+    "verify_peer" => true,
+  );
+
+  /**
+   * Execute an HTTP Request
+   *
+   * @param Google_HttpRequest $request the http request to be executed
+   * @return Google_HttpRequest http request with the response http code,
+   * response headers and response body filled in
+   * @throws Google_IO_Exception on curl or IO error
+   */
+  public function makeRequest(Google_Http_Request $request)
+  {
+    // First, check to see if we have a valid cached version.
+    $cached = $this->getCachedRequest($request);
+    if ($cached !== false) {
+      if (!$this->checkMustRevalidateCachedRequest($cached, $request)) {
+        return $cached;
+      }
+    }
+
+    $default_options = stream_context_get_options(stream_context_get_default());
+
+    $requestHttpContext = array_key_exists('http', $default_options) ?
+        $default_options['http'] : array();
+    if (array_key_exists(
+        $request->getRequestMethod(),
+        self::$ENTITY_HTTP_METHODS
+    )) {
+      $request = $this->processEntityRequest($request);
+    }
+
+    if ($request->getPostBody()) {
+      $requestHttpContext["content"] = $request->getPostBody();
+    }
+
+    $requestHeaders = $request->getRequestHeaders();
+    if ($requestHeaders && is_array($requestHeaders)) {
+      $headers = "";
+      foreach ($requestHeaders as $k => $v) {
+        $headers .= "$k: $v\r\n";
+      }
+      $requestHttpContext["header"] = $headers;
+    }
+
+    $requestHttpContext["method"] = $request->getRequestMethod();
+    $requestHttpContext["user_agent"] = $request->getUserAgent();
+
+    $requestSslContext = array_key_exists('ssl', $default_options) ?
+        $default_options['ssl'] : array();
+
+    if (!array_key_exists("cafile", $requestSslContext)) {
+      $requestSslContext["cafile"] = dirname(__FILE__) . '/cacerts.pem';
+    }
+
+    $options = array(
+        "http" => array_merge(
+            self::$DEFAULT_HTTP_CONTEXT,
+            $requestHttpContext
+        ),
+        "ssl" => array_merge(
+            self::$DEFAULT_SSL_CONTEXT,
+            $requestSslContext
+        )
+    );
+
+    $context = stream_context_create($options);
+    
+    $url = $request->getUrl();
+    
+    if ($request->canGzip()) {
+      $url = self::ZLIB . $url;
+    }
+
+    $response_data = file_get_contents(
+        $url,
+        false,
+        $context
+    );
+
+    if (false === $response_data) {
+      throw new Google_IO_Exception("HTTP Error: Unable to connect");
+    }
+
+    $respHttpCode = $this->getHttpResponseCode($http_response_header);
+    $responseHeaders = $this->getHttpResponseHeaders($http_response_header);
+
+    if ($respHttpCode == 304 && $cached) {
+      // If the server responded NOT_MODIFIED, return the cached request.
+      $this->updateCachedRequest($cached, $responseHeaders);
+      return $cached;
+    }
+
+    if (!isset($responseHeaders['Date']) && !isset($responseHeaders['date'])) {
+      $responseHeaders['Date'] = date("r");
+    }
+
+    $request->setResponseHttpCode($respHttpCode);
+    $request->setResponseHeaders($responseHeaders);
+    $request->setResponseBody($response_data);
+    // Store the request in cache (the function checks to see if the request
+    // can actually be cached)
+    $this->setCachedRequest($request);
+    return $request;
+  }
+
+  /**
+   * Set options that update the transport implementation's behavior.
+   * @param $options
+   */
+  public function setOptions($options)
+  {
+    // NO-OP
+  }
+
+  private function getHttpResponseCode($response_headers)
+  {
+    $header_count = count($response_headers);
+
+    for ($i = 0; $i < $header_count; $i++) {
+      $header = $response_headers[$i];
+      if (strncasecmp("HTTP", $header, strlen("HTTP")) == 0) {
+        $response = explode(' ', $header);
+        return $response[1];
+      }
+    }
+    return 'UNKNOWN';
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/cacerts.pem b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/cacerts.pem
similarity index 96%
rename from apps/files_external/3rdparty/google-api-php-client/src/io/cacerts.pem
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/IO/cacerts.pem
index da36ed1ba6d..79a49289cbe 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/io/cacerts.pem
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/cacerts.pem
@@ -712,3 +712,27 @@ IYEZoDJJKPTEjlbVUjP9UNV+mWwD5MlM/Mtsq2azSiGM5bUMMj4QssxsodyamEwC
 W/POuZ6lcg5Ktz885hZo+L7tdEy8W9ViH0Pd
 -----END CERTIFICATE-----
 
+GeoTrust Global CA
+==================
+
+-----BEGIN CERTIFICATE-----
+MIIDfTCCAuagAwIBAgIDErvmMA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVT
+MRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0
+aWZpY2F0ZSBBdXRob3JpdHkwHhcNMDIwNTIxMDQwMDAwWhcNMTgwODIxMDQwMDAw
+WjBCMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEbMBkGA1UE
+AxMSR2VvVHJ1c3QgR2xvYmFsIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2swYYzD99BcjGlZ+W988bDjkcbd4kdS8odhM+KhDtgPpTSEHCIjaWC9m
+OSm9BXiLnTjoBbdqfnGk5sRgprDvgOSJKA+eJdbtg/OtppHHmMlCGDUUna2YRpIu
+T8rxh0PBFpVXLVDviS2Aelet8u5fa9IAjbkU+BQVNdnARqN7csiRv8lVK83Qlz6c
+JmTM386DGXHKTubU1XupGc1V3sjs0l44U+VcT4wt/lAjNvxm5suOpDkZALeVAjmR
+Cw7+OC7RHQWa9k0+bw8HHa8sHo9gOeL6NlMTOdReJivbPagUvTLrGAMoUgRx5asz
+PeE4uwc2hGKceeoWMPRfwCvocWvk+QIDAQABo4HwMIHtMB8GA1UdIwQYMBaAFEjm
+aPkr0rKV10fYIyAQTzOYkJ/UMB0GA1UdDgQWBBTAephojYn7qwVkDBF9qn1luMrM
+TjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLmdlb3RydXN0LmNvbS9jcmxzL3NlY3VyZWNhLmNybDBO
+BgNVHSAERzBFMEMGBFUdIAAwOzA5BggrBgEFBQcCARYtaHR0cHM6Ly93d3cuZ2Vv
+dHJ1c3QuY29tL3Jlc291cmNlcy9yZXBvc2l0b3J5MA0GCSqGSIb3DQEBBQUAA4GB
+AHbhEm5OSxYShjAGsoEIz/AIx8dxfmbuwu3UOx//8PDITtZDOLC5MH0Y0FWDomrL
+NhGc6Ehmo21/uBPUR/6LWlxz/K7ZGzIZOKuXNBSqltLroxwUCEm2u+WR74M26x1W
+b8ravHNjkOR/ez4iyz0H7V84dJzjA1BOoa+Y7mHyhD8S
+-----END CERTIFICATE-----
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
new file mode 100644
index 00000000000..d5d25e3c128
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
@@ -0,0 +1,218 @@
+<?php
+/*
+ * Copyright 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * This class defines attributes, valid values, and usage which is generated         
+ * from a given json schema.
+ * http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5
+ *
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_Model implements ArrayAccess
+{
+  protected $data = array();
+  protected $processed = array();
+
+  /**
+   * Polymorphic - accepts a variable number of arguments dependent
+   * on the type of the model subclass.
+   */
+  public function __construct()
+  {
+    if (func_num_args() ==  1 && is_array(func_get_arg(0))) {
+      // Initialize the model with the array's contents.
+      $array = func_get_arg(0);
+      $this->mapTypes($array);
+    }
+  }
+
+  public function __get($key)
+  {
+    $keyTypeName = $this->keyType($key);
+    $keyDataType = $this->dataType($key);
+    if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
+      if (isset($this->data[$key])) {
+        $val = $this->data[$key];
+      } else {
+        $val = null;
+      }
+      
+      if ($this->isAssociativeArray($val)) {
+        if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
+          foreach ($val as $arrayKey => $arrayItem) {
+              $this->data[$key][$arrayKey] =
+                $this->createObjectFromName($keyTypeName, $arrayItem);
+          }
+        } else {
+          $this->data[$key] = $this->createObjectFromName($keyTypeName, $val);
+        }
+      } else if (is_array($val)) {
+        $arrayObject = array();
+        foreach ($val as $arrayIndex => $arrayItem) {
+          $arrayObject[$arrayIndex] =
+            $this->createObjectFromName($keyTypeName, $arrayItem);
+        }
+        $this->data[$key] = $arrayObject;
+      }
+      $this->processed[$key] = true;
+    }
+
+    return $this->data[$key];
+  }
+
+  /**
+   * Initialize this object's properties from an array.
+   *
+   * @param array $array Used to seed this object's properties.
+   * @return void
+   */
+  protected function mapTypes($array)
+  {
+    // Hard initilise simple types, lazy load more complex ones.
+    foreach ($array as $key => $val) {
+      if ( !property_exists($this, $this->keyType($key)) &&
+        property_exists($this, $key)) {
+          $this->$key = $val;
+          unset($array[$key]);
+      } elseif (property_exists($this, $camelKey = Google_Utils::camelCase($key))) {
+          // This checks if property exists as camelCase, leaving it in array as snake_case
+          // in case of backwards compatibility issues.
+          $this->$camelKey = $val;
+      }
+    }
+    $this->data = $array;
+  }
+  
+  /**
+   * Create a simplified object suitable for straightforward
+   * conversion to JSON. This is relatively expensive
+   * due to the usage of reflection, but shouldn't be called
+   * a whole lot, and is the most straightforward way to filter.
+   */
+  public function toSimpleObject()
+  {
+    $object = new stdClass();
+
+    // Process all public properties.
+    $reflect = new ReflectionObject($this);
+    $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
+    foreach ($props as $member) {
+      $name = $member->getName();
+      if ($this->$name instanceof Google_Model) {
+        $object->$name = $this->$name->toSimpleObject();
+      } else if ($this->$name !== null) {
+        $object->$name = $this->$name;
+      }
+    }
+
+    // Process all other data.
+    foreach ($this->data as $key => $val) {
+      if ($val instanceof Google_Model) {
+        $object->$key = $val->toSimpleObject();
+      } else if ($val !== null) {
+        $object->$key = $val;
+      }
+    }
+    return $object;
+  }
+
+  /**
+   * Returns true only if the array is associative.
+   * @param array $array
+   * @return bool True if the array is associative.
+   */
+  protected function isAssociativeArray($array)
+  {
+    if (!is_array($array)) {
+      return false;
+    }
+    $keys = array_keys($array);
+    foreach ($keys as $key) {
+      if (is_string($key)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Given a variable name, discover its type.
+   *
+   * @param $name
+   * @param $item
+   * @return object The object from the item.
+   */
+  private function createObjectFromName($name, $item)
+  {
+    $type = $this->$name;
+    return new $type($item);
+  }
+
+  /**
+   * Verify if $obj is an array.
+   * @throws Google_Exception Thrown if $obj isn't an array.
+   * @param array $obj Items that should be validated.
+   * @param string $method Method expecting an array as an argument.
+   */
+  public function assertIsArray($obj, $method)
+  {
+    if ($obj && !is_array($obj)) {
+      throw new Google_Exception(
+          "Incorrect parameter type passed to $method(),"
+          . " expected an array."
+      );
+    }
+  }
+
+  public function offsetExists($offset)
+  {
+    return isset($this->$offset) || isset($this->data[$offset]);
+  }
+
+  public function offsetGet($offset)
+  {
+    return isset($this->$offset) ?
+        $this->$offset :
+        $this->__get($offset);
+  }
+
+  public function offsetSet($offset, $value)
+  {
+    if (property_exists($this, $offset)) {
+      $this->$offset = $value;
+    } else {
+      $this->data[$offset] = $value;
+      $this->processed[$offset] = true;
+    }
+  }
+
+  public function offsetUnset($offset)
+  {
+    unset($this->data[$offset]);
+  }
+
+  protected function keyType($key)
+  {
+    return $key . "Type";
+  }
+
+  protected function dataType($key)
+  {
+    return $key . "DataType";
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Service.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service.php
new file mode 100644
index 00000000000..2e0b6c52282
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service.php
@@ -0,0 +1,39 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+class Google_Service
+{
+  public $version;
+  public $servicePath;
+  public $availableScopes;
+  public $resource;
+  private $client;
+
+  public function __construct(Google_Client $client)
+  {
+    $this->client = $client;
+  }
+
+  /**
+   * Return the associated Google_Client class.
+   * @return Google_Client
+   */
+  public function getClient()
+  {
+    return $this->client;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Drive.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Drive.php
new file mode 100644
index 00000000000..a9ce7f2a1cc
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Drive.php
@@ -0,0 +1,5732 @@
+<?php
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * Service definition for Drive (v2).
+ *
+ * <p>
+ * The API to interact with Drive.
+ * </p>
+ *
+ * <p>
+ * For more information about this service, see the API
+ * <a href="https://developers.google.com/drive/" target="_blank">Documentation</a>
+ * </p>
+ *
+ * @author Google, Inc.
+ */
+class Google_Service_Drive extends Google_Service
+{
+  /** View and manage the files and documents in your Google Drive. */
+  const DRIVE = "https://www.googleapis.com/auth/drive";
+  /** View and manage its own configuration data in your Google Drive. */
+  const DRIVE_APPDATA = "https://www.googleapis.com/auth/drive.appdata";
+  /** View your Google Drive apps. */
+  const DRIVE_APPS_READONLY = "https://www.googleapis.com/auth/drive.apps.readonly";
+  /** View and manage Google Drive files that you have opened or created with this app. */
+  const DRIVE_FILE = "https://www.googleapis.com/auth/drive.file";
+  /** View metadata for files and documents in your Google Drive. */
+  const DRIVE_METADATA_READONLY = "https://www.googleapis.com/auth/drive.metadata.readonly";
+  /** View the files and documents in your Google Drive. */
+  const DRIVE_READONLY = "https://www.googleapis.com/auth/drive.readonly";
+  /** Modify your Google Apps Script scripts' behavior. */
+  const DRIVE_SCRIPTS = "https://www.googleapis.com/auth/drive.scripts";
+
+  public $about;
+  public $apps;
+  public $changes;
+  public $channels;
+  public $children;
+  public $comments;
+  public $files;
+  public $parents;
+  public $permissions;
+  public $properties;
+  public $realtime;
+  public $replies;
+  public $revisions;
+  
+
+  /**
+   * Constructs the internal representation of the Drive service.
+   *
+   * @param Google_Client $client
+   */
+  public function __construct(Google_Client $client)
+  {
+    parent::__construct($client);
+    $this->servicePath = 'drive/v2/';
+    $this->version = 'v2';
+    $this->serviceName = 'drive';
+
+    $this->about = new Google_Service_Drive_About_Resource(
+        $this,
+        $this->serviceName,
+        'about',
+        array(
+          'methods' => array(
+            'get' => array(
+              'path' => 'about',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'includeSubscribed' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'maxChangeIdCount' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'startChangeId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->apps = new Google_Service_Drive_Apps_Resource(
+        $this,
+        $this->serviceName,
+        'apps',
+        array(
+          'methods' => array(
+            'get' => array(
+              'path' => 'apps/{appId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'appId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'apps',
+              'httpMethod' => 'GET',
+              'parameters' => array(),
+            ),
+          )
+        )
+    );
+    $this->changes = new Google_Service_Drive_Changes_Resource(
+        $this,
+        $this->serviceName,
+        'changes',
+        array(
+          'methods' => array(
+            'get' => array(
+              'path' => 'changes/{changeId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'changeId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'changes',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'includeSubscribed' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'startChangeId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'includeDeleted' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'watch' => array(
+              'path' => 'changes/watch',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'includeSubscribed' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'startChangeId' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'includeDeleted' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->channels = new Google_Service_Drive_Channels_Resource(
+        $this,
+        $this->serviceName,
+        'channels',
+        array(
+          'methods' => array(
+            'stop' => array(
+              'path' => 'channels/stop',
+              'httpMethod' => 'POST',
+              'parameters' => array(),
+            ),
+          )
+        )
+    );
+    $this->children = new Google_Service_Drive_Children_Resource(
+        $this,
+        $this->serviceName,
+        'children',
+        array(
+          'methods' => array(
+            'delete' => array(
+              'path' => 'files/{folderId}/children/{childId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'folderId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'childId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'files/{folderId}/children/{childId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'folderId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'childId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'insert' => array(
+              'path' => 'files/{folderId}/children',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'folderId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'files/{folderId}/children',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'folderId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'q' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->comments = new Google_Service_Drive_Comments_Resource(
+        $this,
+        $this->serviceName,
+        'comments',
+        array(
+          'methods' => array(
+            'delete' => array(
+              'path' => 'files/{fileId}/comments/{commentId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'files/{fileId}/comments/{commentId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'includeDeleted' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+              ),
+            ),'insert' => array(
+              'path' => 'files/{fileId}/comments',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'files/{fileId}/comments',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'updatedMin' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'includeDeleted' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+              ),
+            ),'patch' => array(
+              'path' => 'files/{fileId}/comments/{commentId}',
+              'httpMethod' => 'PATCH',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'files/{fileId}/comments/{commentId}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->files = new Google_Service_Drive_Files_Resource(
+        $this,
+        $this->serviceName,
+        'files',
+        array(
+          'methods' => array(
+            'copy' => array(
+              'path' => 'files/{fileId}/copy',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'convert' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'ocrLanguage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'visibility' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pinned' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'ocr' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'timedTextTrackName' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'timedTextLanguage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'delete' => array(
+              'path' => 'files/{fileId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'files/{fileId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'updateViewedDate' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'projection' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'insert' => array(
+              'path' => 'files',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'convert' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'useContentAsIndexableText' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'ocrLanguage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'visibility' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pinned' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'ocr' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'timedTextTrackName' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'timedTextLanguage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'files',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'q' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'projection' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+              ),
+            ),'patch' => array(
+              'path' => 'files/{fileId}',
+              'httpMethod' => 'PATCH',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'convert' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'updateViewedDate' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'setModifiedDate' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'useContentAsIndexableText' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'ocrLanguage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pinned' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'newRevision' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'ocr' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'timedTextLanguage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'timedTextTrackName' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'touch' => array(
+              'path' => 'files/{fileId}/touch',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'trash' => array(
+              'path' => 'files/{fileId}/trash',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'untrash' => array(
+              'path' => 'files/{fileId}/untrash',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'files/{fileId}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'convert' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'updateViewedDate' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'setModifiedDate' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'useContentAsIndexableText' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'ocrLanguage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'pinned' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'newRevision' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'ocr' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'timedTextLanguage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'timedTextTrackName' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'watch' => array(
+              'path' => 'files/{fileId}/watch',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'updateViewedDate' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'projection' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->parents = new Google_Service_Drive_Parents_Resource(
+        $this,
+        $this->serviceName,
+        'parents',
+        array(
+          'methods' => array(
+            'delete' => array(
+              'path' => 'files/{fileId}/parents/{parentId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'parentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'files/{fileId}/parents/{parentId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'parentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'insert' => array(
+              'path' => 'files/{fileId}/parents',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'files/{fileId}/parents',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->permissions = new Google_Service_Drive_Permissions_Resource(
+        $this,
+        $this->serviceName,
+        'permissions',
+        array(
+          'methods' => array(
+            'delete' => array(
+              'path' => 'files/{fileId}/permissions/{permissionId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'permissionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'files/{fileId}/permissions/{permissionId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'permissionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'getIdForEmail' => array(
+              'path' => 'permissionIds/{email}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'email' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'insert' => array(
+              'path' => 'files/{fileId}/permissions',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'emailMessage' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'sendNotificationEmails' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'files/{fileId}/permissions',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'patch' => array(
+              'path' => 'files/{fileId}/permissions/{permissionId}',
+              'httpMethod' => 'PATCH',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'permissionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'transferOwnership' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'files/{fileId}/permissions/{permissionId}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'permissionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'transferOwnership' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->properties = new Google_Service_Drive_Properties_Resource(
+        $this,
+        $this->serviceName,
+        'properties',
+        array(
+          'methods' => array(
+            'delete' => array(
+              'path' => 'files/{fileId}/properties/{propertyKey}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'propertyKey' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'visibility' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'files/{fileId}/properties/{propertyKey}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'propertyKey' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'visibility' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'insert' => array(
+              'path' => 'files/{fileId}/properties',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'files/{fileId}/properties',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'patch' => array(
+              'path' => 'files/{fileId}/properties/{propertyKey}',
+              'httpMethod' => 'PATCH',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'propertyKey' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'visibility' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'files/{fileId}/properties/{propertyKey}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'propertyKey' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'visibility' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->realtime = new Google_Service_Drive_Realtime_Resource(
+        $this,
+        $this->serviceName,
+        'realtime',
+        array(
+          'methods' => array(
+            'get' => array(
+              'path' => 'files/{fileId}/realtime',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'files/{fileId}/realtime',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'baseRevision' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->replies = new Google_Service_Drive_Replies_Resource(
+        $this,
+        $this->serviceName,
+        'replies',
+        array(
+          'methods' => array(
+            'delete' => array(
+              'path' => 'files/{fileId}/comments/{commentId}/replies/{replyId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'replyId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'files/{fileId}/comments/{commentId}/replies/{replyId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'replyId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'includeDeleted' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+              ),
+            ),'insert' => array(
+              'path' => 'files/{fileId}/comments/{commentId}/replies',
+              'httpMethod' => 'POST',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'files/{fileId}/comments/{commentId}/replies',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'pageToken' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'includeDeleted' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
+                'maxResults' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
+              ),
+            ),'patch' => array(
+              'path' => 'files/{fileId}/comments/{commentId}/replies/{replyId}',
+              'httpMethod' => 'PATCH',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'replyId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'files/{fileId}/comments/{commentId}/replies/{replyId}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'commentId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'replyId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+    $this->revisions = new Google_Service_Drive_Revisions_Resource(
+        $this,
+        $this->serviceName,
+        'revisions',
+        array(
+          'methods' => array(
+            'delete' => array(
+              'path' => 'files/{fileId}/revisions/{revisionId}',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'revisionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'get' => array(
+              'path' => 'files/{fileId}/revisions/{revisionId}',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'revisionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'list' => array(
+              'path' => 'files/{fileId}/revisions',
+              'httpMethod' => 'GET',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'patch' => array(
+              'path' => 'files/{fileId}/revisions/{revisionId}',
+              'httpMethod' => 'PATCH',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'revisionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),'update' => array(
+              'path' => 'files/{fileId}/revisions/{revisionId}',
+              'httpMethod' => 'PUT',
+              'parameters' => array(
+                'fileId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+                'revisionId' => array(
+                  'location' => 'path',
+                  'type' => 'string',
+                  'required' => true,
+                ),
+              ),
+            ),
+          )
+        )
+    );
+  }
+}
+
+
+/**
+ * The "about" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $about = $driveService->about;
+ *  </code>
+ */
+class Google_Service_Drive_About_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Gets the information about the current user along with Drive API settings
+   * (about.get)
+   *
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool includeSubscribed
+   * When calculating the number of remaining change IDs, whether to include shared files and public
+    * files the user has opened. When set to false, this counts only change IDs for owned files and
+    * any shared or public files that the user has explictly added to a folder in Drive.
+   * @opt_param string maxChangeIdCount
+   * Maximum number of remaining change IDs to count
+   * @opt_param string startChangeId
+   * Change ID to start counting from when calculating number of remaining change IDs
+   * @return Google_Service_Drive_About
+   */
+  public function get($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_About");
+  }
+}
+
+/**
+ * The "apps" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $apps = $driveService->apps;
+ *  </code>
+ */
+class Google_Service_Drive_Apps_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Gets a specific app. (apps.get)
+   *
+   * @param string $appId
+   * The ID of the app.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_App
+   */
+  public function get($appId, $optParams = array())
+  {
+    $params = array('appId' => $appId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_App");
+  }
+  /**
+   * Lists a user's installed apps. (apps.listApps)
+   *
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_AppList
+   */
+  public function listApps($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_AppList");
+  }
+}
+
+/**
+ * The "changes" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $changes = $driveService->changes;
+ *  </code>
+ */
+class Google_Service_Drive_Changes_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Gets a specific change. (changes.get)
+   *
+   * @param string $changeId
+   * The ID of the change.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Change
+   */
+  public function get($changeId, $optParams = array())
+  {
+    $params = array('changeId' => $changeId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_Change");
+  }
+  /**
+   * Lists the changes for a user. (changes.listChanges)
+   *
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool includeSubscribed
+   * Whether to include shared files and public files the user has opened. When set to false, the
+    * list will include owned files plus any shared or public files the user has explictly added to a
+    * folder in Drive.
+   * @opt_param string startChangeId
+   * Change ID to start listing changes from.
+   * @opt_param bool includeDeleted
+   * Whether to include deleted items.
+   * @opt_param int maxResults
+   * Maximum number of changes to return.
+   * @opt_param string pageToken
+   * Page token for changes.
+   * @return Google_Service_Drive_ChangeList
+   */
+  public function listChanges($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_ChangeList");
+  }
+  /**
+   * Subscribe to changes for a user. (changes.watch)
+   *
+   * @param Google_Channel $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool includeSubscribed
+   * Whether to include shared files and public files the user has opened. When set to false, the
+    * list will include owned files plus any shared or public files the user has explictly added to a
+    * folder in Drive.
+   * @opt_param string startChangeId
+   * Change ID to start listing changes from.
+   * @opt_param bool includeDeleted
+   * Whether to include deleted items.
+   * @opt_param int maxResults
+   * Maximum number of changes to return.
+   * @opt_param string pageToken
+   * Page token for changes.
+   * @return Google_Service_Drive_Channel
+   */
+  public function watch(Google_Service_Drive_Channel $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('watch', array($params), "Google_Service_Drive_Channel");
+  }
+}
+
+/**
+ * The "channels" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $channels = $driveService->channels;
+ *  </code>
+ */
+class Google_Service_Drive_Channels_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Stop watching resources through this channel (channels.stop)
+   *
+   * @param Google_Channel $postBody
+   * @param array $optParams Optional parameters.
+   */
+  public function stop(Google_Service_Drive_Channel $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('stop', array($params));
+  }
+}
+
+/**
+ * The "children" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $children = $driveService->children;
+ *  </code>
+ */
+class Google_Service_Drive_Children_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Removes a child from a folder. (children.delete)
+   *
+   * @param string $folderId
+   * The ID of the folder.
+   * @param string $childId
+   * The ID of the child.
+   * @param array $optParams Optional parameters.
+   */
+  public function delete($folderId, $childId, $optParams = array())
+  {
+    $params = array('folderId' => $folderId, 'childId' => $childId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params));
+  }
+  /**
+   * Gets a specific child reference. (children.get)
+   *
+   * @param string $folderId
+   * The ID of the folder.
+   * @param string $childId
+   * The ID of the child.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_ChildReference
+   */
+  public function get($folderId, $childId, $optParams = array())
+  {
+    $params = array('folderId' => $folderId, 'childId' => $childId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_ChildReference");
+  }
+  /**
+   * Inserts a file into a folder. (children.insert)
+   *
+   * @param string $folderId
+   * The ID of the folder.
+   * @param Google_ChildReference $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_ChildReference
+   */
+  public function insert($folderId, Google_Service_Drive_ChildReference $postBody, $optParams = array())
+  {
+    $params = array('folderId' => $folderId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('insert', array($params), "Google_Service_Drive_ChildReference");
+  }
+  /**
+   * Lists a folder's children. (children.listChildren)
+   *
+   * @param string $folderId
+   * The ID of the folder.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string q
+   * Query string for searching children.
+   * @opt_param string pageToken
+   * Page token for children.
+   * @opt_param int maxResults
+   * Maximum number of children to return.
+   * @return Google_Service_Drive_ChildList
+   */
+  public function listChildren($folderId, $optParams = array())
+  {
+    $params = array('folderId' => $folderId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_ChildList");
+  }
+}
+
+/**
+ * The "comments" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $comments = $driveService->comments;
+ *  </code>
+ */
+class Google_Service_Drive_Comments_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Deletes a comment. (comments.delete)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param array $optParams Optional parameters.
+   */
+  public function delete($fileId, $commentId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params));
+  }
+  /**
+   * Gets a comment by ID. (comments.get)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool includeDeleted
+   * If set, this will succeed when retrieving a deleted comment, and will include any deleted
+    * replies.
+   * @return Google_Service_Drive_Comment
+   */
+  public function get($fileId, $commentId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_Comment");
+  }
+  /**
+   * Creates a new comment on the given file. (comments.insert)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param Google_Comment $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Comment
+   */
+  public function insert($fileId, Google_Service_Drive_Comment $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('insert', array($params), "Google_Service_Drive_Comment");
+  }
+  /**
+   * Lists a file's comments. (comments.listComments)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string pageToken
+   * The continuation token, used to page through large result sets. To get the next page of results,
+    * set this parameter to the value of "nextPageToken" from the previous response.
+   * @opt_param string updatedMin
+   * Only discussions that were updated after this timestamp will be returned. Formatted as an RFC
+    * 3339 timestamp.
+   * @opt_param bool includeDeleted
+   * If set, all comments and replies, including deleted comments and replies (with content stripped)
+    * will be returned.
+   * @opt_param int maxResults
+   * The maximum number of discussions to include in the response, used for paging.
+   * @return Google_Service_Drive_CommentList
+   */
+  public function listComments($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_CommentList");
+  }
+  /**
+   * Updates an existing comment. This method supports patch semantics.
+   * (comments.patch)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param Google_Comment $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Comment
+   */
+  public function patch($fileId, $commentId, Google_Service_Drive_Comment $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('patch', array($params), "Google_Service_Drive_Comment");
+  }
+  /**
+   * Updates an existing comment. (comments.update)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param Google_Comment $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Comment
+   */
+  public function update($fileId, $commentId, Google_Service_Drive_Comment $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_Drive_Comment");
+  }
+}
+
+/**
+ * The "files" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $files = $driveService->files;
+ *  </code>
+ */
+class Google_Service_Drive_Files_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Creates a copy of the specified file. (files.copy)
+   *
+   * @param string $fileId
+   * The ID of the file to copy.
+   * @param Google_DriveFile $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool convert
+   * Whether to convert this file to the corresponding Google Docs format.
+   * @opt_param string ocrLanguage
+   * If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
+   * @opt_param string visibility
+   * The visibility of the new file. This parameter is only relevant when the source is not a native
+    * Google Doc and convert=false.
+   * @opt_param bool pinned
+   * Whether to pin the head revision of the new copy.
+   * @opt_param bool ocr
+   * Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
+   * @opt_param string timedTextTrackName
+   * The timed text track name.
+   * @opt_param string timedTextLanguage
+   * The language of the timed text.
+   * @return Google_Service_Drive_DriveFile
+   */
+  public function copy($fileId, Google_Service_Drive_DriveFile $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('copy', array($params), "Google_Service_Drive_DriveFile");
+  }
+  /**
+   * Permanently deletes a file by ID. Skips the trash. (files.delete)
+   *
+   * @param string $fileId
+   * The ID of the file to delete.
+   * @param array $optParams Optional parameters.
+   */
+  public function delete($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params));
+  }
+  /**
+   * Gets a file's metadata by ID. (files.get)
+   *
+   * @param string $fileId
+   * The ID for the file in question.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool updateViewedDate
+   * Whether to update the view date after successfully retrieving the file.
+   * @opt_param string projection
+   * This parameter is deprecated and has no function.
+   * @return Google_Service_Drive_DriveFile
+   */
+  public function get($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_DriveFile");
+  }
+  /**
+   * Insert a new file. (files.insert)
+   *
+   * @param Google_DriveFile $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool convert
+   * Whether to convert this file to the corresponding Google Docs format.
+   * @opt_param bool useContentAsIndexableText
+   * Whether to use the content as indexable text.
+   * @opt_param string ocrLanguage
+   * If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
+   * @opt_param string visibility
+   * The visibility of the new file. This parameter is only relevant when convert=false.
+   * @opt_param bool pinned
+   * Whether to pin the head revision of the uploaded file.
+   * @opt_param bool ocr
+   * Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
+   * @opt_param string timedTextTrackName
+   * The timed text track name.
+   * @opt_param string timedTextLanguage
+   * The language of the timed text.
+   * @return Google_Service_Drive_DriveFile
+   */
+  public function insert(Google_Service_Drive_DriveFile $postBody, $optParams = array())
+  {
+    $params = array('postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('insert', array($params), "Google_Service_Drive_DriveFile");
+  }
+  /**
+   * Lists the user's files. (files.listFiles)
+   *
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string q
+   * Query string for searching files.
+   * @opt_param string pageToken
+   * Page token for files.
+   * @opt_param string projection
+   * This parameter is deprecated and has no function.
+   * @opt_param int maxResults
+   * Maximum number of files to return.
+   * @return Google_Service_Drive_FileList
+   */
+  public function listFiles($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_FileList");
+  }
+  /**
+   * Updates file metadata and/or content. This method supports patch semantics.
+   * (files.patch)
+   *
+   * @param string $fileId
+   * The ID of the file to update.
+   * @param Google_DriveFile $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool convert
+   * Whether to convert this file to the corresponding Google Docs format.
+   * @opt_param bool updateViewedDate
+   * Whether to update the view date after successfully updating the file.
+   * @opt_param bool setModifiedDate
+   * Whether to set the modified date with the supplied modified date.
+   * @opt_param bool useContentAsIndexableText
+   * Whether to use the content as indexable text.
+   * @opt_param string ocrLanguage
+   * If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
+   * @opt_param bool pinned
+   * Whether to pin the new revision.
+   * @opt_param bool newRevision
+   * Whether a blob upload should create a new revision. If false, the blob data in the current head
+    * revision is replaced. If not set or true, a new blob is created as head revision, and previous
+    * revisions are preserved (causing increased use of the user's data storage quota).
+   * @opt_param bool ocr
+   * Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
+   * @opt_param string timedTextLanguage
+   * The language of the timed text.
+   * @opt_param string timedTextTrackName
+   * The timed text track name.
+   * @return Google_Service_Drive_DriveFile
+   */
+  public function patch($fileId, Google_Service_Drive_DriveFile $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('patch', array($params), "Google_Service_Drive_DriveFile");
+  }
+  /**
+   * Set the file's updated time to the current server time. (files.touch)
+   *
+   * @param string $fileId
+   * The ID of the file to update.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_DriveFile
+   */
+  public function touch($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('touch', array($params), "Google_Service_Drive_DriveFile");
+  }
+  /**
+   * Moves a file to the trash. (files.trash)
+   *
+   * @param string $fileId
+   * The ID of the file to trash.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_DriveFile
+   */
+  public function trash($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('trash', array($params), "Google_Service_Drive_DriveFile");
+  }
+  /**
+   * Restores a file from the trash. (files.untrash)
+   *
+   * @param string $fileId
+   * The ID of the file to untrash.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_DriveFile
+   */
+  public function untrash($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('untrash', array($params), "Google_Service_Drive_DriveFile");
+  }
+  /**
+   * Updates file metadata and/or content. (files.update)
+   *
+   * @param string $fileId
+   * The ID of the file to update.
+   * @param Google_DriveFile $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool convert
+   * Whether to convert this file to the corresponding Google Docs format.
+   * @opt_param bool updateViewedDate
+   * Whether to update the view date after successfully updating the file.
+   * @opt_param bool setModifiedDate
+   * Whether to set the modified date with the supplied modified date.
+   * @opt_param bool useContentAsIndexableText
+   * Whether to use the content as indexable text.
+   * @opt_param string ocrLanguage
+   * If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
+   * @opt_param bool pinned
+   * Whether to pin the new revision.
+   * @opt_param bool newRevision
+   * Whether a blob upload should create a new revision. If false, the blob data in the current head
+    * revision is replaced. If not set or true, a new blob is created as head revision, and previous
+    * revisions are preserved (causing increased use of the user's data storage quota).
+   * @opt_param bool ocr
+   * Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
+   * @opt_param string timedTextLanguage
+   * The language of the timed text.
+   * @opt_param string timedTextTrackName
+   * The timed text track name.
+   * @return Google_Service_Drive_DriveFile
+   */
+  public function update($fileId, Google_Service_Drive_DriveFile $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_Drive_DriveFile");
+  }
+  /**
+   * Subscribe to changes on a file (files.watch)
+   *
+   * @param string $fileId
+   * The ID for the file in question.
+   * @param Google_Channel $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool updateViewedDate
+   * Whether to update the view date after successfully retrieving the file.
+   * @opt_param string projection
+   * This parameter is deprecated and has no function.
+   * @return Google_Service_Drive_Channel
+   */
+  public function watch($fileId, Google_Service_Drive_Channel $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('watch', array($params), "Google_Service_Drive_Channel");
+  }
+}
+
+/**
+ * The "parents" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $parents = $driveService->parents;
+ *  </code>
+ */
+class Google_Service_Drive_Parents_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Removes a parent from a file. (parents.delete)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $parentId
+   * The ID of the parent.
+   * @param array $optParams Optional parameters.
+   */
+  public function delete($fileId, $parentId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'parentId' => $parentId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params));
+  }
+  /**
+   * Gets a specific parent reference. (parents.get)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $parentId
+   * The ID of the parent.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_ParentReference
+   */
+  public function get($fileId, $parentId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'parentId' => $parentId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_ParentReference");
+  }
+  /**
+   * Adds a parent folder for a file. (parents.insert)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param Google_ParentReference $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_ParentReference
+   */
+  public function insert($fileId, Google_Service_Drive_ParentReference $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('insert', array($params), "Google_Service_Drive_ParentReference");
+  }
+  /**
+   * Lists a file's parents. (parents.listParents)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_ParentList
+   */
+  public function listParents($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_ParentList");
+  }
+}
+
+/**
+ * The "permissions" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $permissions = $driveService->permissions;
+ *  </code>
+ */
+class Google_Service_Drive_Permissions_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Deletes a permission from a file. (permissions.delete)
+   *
+   * @param string $fileId
+   * The ID for the file.
+   * @param string $permissionId
+   * The ID for the permission.
+   * @param array $optParams Optional parameters.
+   */
+  public function delete($fileId, $permissionId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'permissionId' => $permissionId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params));
+  }
+  /**
+   * Gets a permission by ID. (permissions.get)
+   *
+   * @param string $fileId
+   * The ID for the file.
+   * @param string $permissionId
+   * The ID for the permission.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Permission
+   */
+  public function get($fileId, $permissionId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'permissionId' => $permissionId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_Permission");
+  }
+  /**
+   * Returns the permission ID for an email address. (permissions.getIdForEmail)
+   *
+   * @param string $email
+   * The email address for which to return a permission ID
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_PermissionId
+   */
+  public function getIdForEmail($email, $optParams = array())
+  {
+    $params = array('email' => $email);
+    $params = array_merge($params, $optParams);
+    return $this->call('getIdForEmail', array($params), "Google_Service_Drive_PermissionId");
+  }
+  /**
+   * Inserts a permission for a file. (permissions.insert)
+   *
+   * @param string $fileId
+   * The ID for the file.
+   * @param Google_Permission $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string emailMessage
+   * A custom message to include in notification emails.
+   * @opt_param bool sendNotificationEmails
+   * Whether to send notification emails when sharing to users or groups.
+   * @return Google_Service_Drive_Permission
+   */
+  public function insert($fileId, Google_Service_Drive_Permission $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('insert', array($params), "Google_Service_Drive_Permission");
+  }
+  /**
+   * Lists a file's permissions. (permissions.listPermissions)
+   *
+   * @param string $fileId
+   * The ID for the file.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_PermissionList
+   */
+  public function listPermissions($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_PermissionList");
+  }
+  /**
+   * Updates a permission. This method supports patch semantics.
+   * (permissions.patch)
+   *
+   * @param string $fileId
+   * The ID for the file.
+   * @param string $permissionId
+   * The ID for the permission.
+   * @param Google_Permission $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool transferOwnership
+   * Whether changing a role to 'owner' should also downgrade the current owners to writers.
+   * @return Google_Service_Drive_Permission
+   */
+  public function patch($fileId, $permissionId, Google_Service_Drive_Permission $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'permissionId' => $permissionId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('patch', array($params), "Google_Service_Drive_Permission");
+  }
+  /**
+   * Updates a permission. (permissions.update)
+   *
+   * @param string $fileId
+   * The ID for the file.
+   * @param string $permissionId
+   * The ID for the permission.
+   * @param Google_Permission $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool transferOwnership
+   * Whether changing a role to 'owner' should also downgrade the current owners to writers.
+   * @return Google_Service_Drive_Permission
+   */
+  public function update($fileId, $permissionId, Google_Service_Drive_Permission $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'permissionId' => $permissionId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_Drive_Permission");
+  }
+}
+
+/**
+ * The "properties" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $properties = $driveService->properties;
+ *  </code>
+ */
+class Google_Service_Drive_Properties_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Deletes a property. (properties.delete)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $propertyKey
+   * The key of the property.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string visibility
+   * The visibility of the property.
+   */
+  public function delete($fileId, $propertyKey, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params));
+  }
+  /**
+   * Gets a property by its key. (properties.get)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $propertyKey
+   * The key of the property.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string visibility
+   * The visibility of the property.
+   * @return Google_Service_Drive_Property
+   */
+  public function get($fileId, $propertyKey, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_Property");
+  }
+  /**
+   * Adds a property to a file. (properties.insert)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param Google_Property $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Property
+   */
+  public function insert($fileId, Google_Service_Drive_Property $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('insert', array($params), "Google_Service_Drive_Property");
+  }
+  /**
+   * Lists a file's properties. (properties.listProperties)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_PropertyList
+   */
+  public function listProperties($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_PropertyList");
+  }
+  /**
+   * Updates a property. This method supports patch semantics. (properties.patch)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $propertyKey
+   * The key of the property.
+   * @param Google_Property $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string visibility
+   * The visibility of the property.
+   * @return Google_Service_Drive_Property
+   */
+  public function patch($fileId, $propertyKey, Google_Service_Drive_Property $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('patch', array($params), "Google_Service_Drive_Property");
+  }
+  /**
+   * Updates a property. (properties.update)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $propertyKey
+   * The key of the property.
+   * @param Google_Property $postBody
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string visibility
+   * The visibility of the property.
+   * @return Google_Service_Drive_Property
+   */
+  public function update($fileId, $propertyKey, Google_Service_Drive_Property $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_Drive_Property");
+  }
+}
+
+/**
+ * The "realtime" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $realtime = $driveService->realtime;
+ *  </code>
+ */
+class Google_Service_Drive_Realtime_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Exports the contents of the Realtime API data model associated with this file
+   * as JSON. (realtime.get)
+   *
+   * @param string $fileId
+   * The ID of the file that the Realtime API data model is associated with.
+   * @param array $optParams Optional parameters.
+   */
+  public function get($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params));
+  }
+  /**
+   * Overwrites the Realtime API data model associated with this file with the
+   * provided JSON data model. (realtime.update)
+   *
+   * @param string $fileId
+   * The ID of the file that the Realtime API data model is associated with.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string baseRevision
+   * The revision of the model to diff the uploaded model against. If set, the uploaded model is
+    * diffed against the provided revision and those differences are merged with any changes made to
+    * the model after the provided revision. If not set, the uploaded model replaces the current model
+    * on the server.
+   */
+  public function update($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params));
+  }
+}
+
+/**
+ * The "replies" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $replies = $driveService->replies;
+ *  </code>
+ */
+class Google_Service_Drive_Replies_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Deletes a reply. (replies.delete)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param string $replyId
+   * The ID of the reply.
+   * @param array $optParams Optional parameters.
+   */
+  public function delete($fileId, $commentId, $replyId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params));
+  }
+  /**
+   * Gets a reply. (replies.get)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param string $replyId
+   * The ID of the reply.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param bool includeDeleted
+   * If set, this will succeed when retrieving a deleted reply.
+   * @return Google_Service_Drive_CommentReply
+   */
+  public function get($fileId, $commentId, $replyId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_CommentReply");
+  }
+  /**
+   * Creates a new reply to the given comment. (replies.insert)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param Google_CommentReply $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_CommentReply
+   */
+  public function insert($fileId, $commentId, Google_Service_Drive_CommentReply $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('insert', array($params), "Google_Service_Drive_CommentReply");
+  }
+  /**
+   * Lists all of the replies to a comment. (replies.listReplies)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param array $optParams Optional parameters.
+   *
+   * @opt_param string pageToken
+   * The continuation token, used to page through large result sets. To get the next page of results,
+    * set this parameter to the value of "nextPageToken" from the previous response.
+   * @opt_param bool includeDeleted
+   * If set, all replies, including deleted replies (with content stripped) will be returned.
+   * @opt_param int maxResults
+   * The maximum number of replies to include in the response, used for paging.
+   * @return Google_Service_Drive_CommentReplyList
+   */
+  public function listReplies($fileId, $commentId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_CommentReplyList");
+  }
+  /**
+   * Updates an existing reply. This method supports patch semantics.
+   * (replies.patch)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param string $replyId
+   * The ID of the reply.
+   * @param Google_CommentReply $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_CommentReply
+   */
+  public function patch($fileId, $commentId, $replyId, Google_Service_Drive_CommentReply $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('patch', array($params), "Google_Service_Drive_CommentReply");
+  }
+  /**
+   * Updates an existing reply. (replies.update)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $commentId
+   * The ID of the comment.
+   * @param string $replyId
+   * The ID of the reply.
+   * @param Google_CommentReply $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_CommentReply
+   */
+  public function update($fileId, $commentId, $replyId, Google_Service_Drive_CommentReply $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_Drive_CommentReply");
+  }
+}
+
+/**
+ * The "revisions" collection of methods.
+ * Typical usage is:
+ *  <code>
+ *   $driveService = new Google_Service_Drive(...);
+ *   $revisions = $driveService->revisions;
+ *  </code>
+ */
+class Google_Service_Drive_Revisions_Resource extends Google_Service_Resource
+{
+
+  /**
+   * Removes a revision. (revisions.delete)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $revisionId
+   * The ID of the revision.
+   * @param array $optParams Optional parameters.
+   */
+  public function delete($fileId, $revisionId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'revisionId' => $revisionId);
+    $params = array_merge($params, $optParams);
+    return $this->call('delete', array($params));
+  }
+  /**
+   * Gets a specific revision. (revisions.get)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param string $revisionId
+   * The ID of the revision.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Revision
+   */
+  public function get($fileId, $revisionId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'revisionId' => $revisionId);
+    $params = array_merge($params, $optParams);
+    return $this->call('get', array($params), "Google_Service_Drive_Revision");
+  }
+  /**
+   * Lists a file's revisions. (revisions.listRevisions)
+   *
+   * @param string $fileId
+   * The ID of the file.
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_RevisionList
+   */
+  public function listRevisions($fileId, $optParams = array())
+  {
+    $params = array('fileId' => $fileId);
+    $params = array_merge($params, $optParams);
+    return $this->call('list', array($params), "Google_Service_Drive_RevisionList");
+  }
+  /**
+   * Updates a revision. This method supports patch semantics. (revisions.patch)
+   *
+   * @param string $fileId
+   * The ID for the file.
+   * @param string $revisionId
+   * The ID for the revision.
+   * @param Google_Revision $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Revision
+   */
+  public function patch($fileId, $revisionId, Google_Service_Drive_Revision $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'revisionId' => $revisionId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('patch', array($params), "Google_Service_Drive_Revision");
+  }
+  /**
+   * Updates a revision. (revisions.update)
+   *
+   * @param string $fileId
+   * The ID for the file.
+   * @param string $revisionId
+   * The ID for the revision.
+   * @param Google_Revision $postBody
+   * @param array $optParams Optional parameters.
+   * @return Google_Service_Drive_Revision
+   */
+  public function update($fileId, $revisionId, Google_Service_Drive_Revision $postBody, $optParams = array())
+  {
+    $params = array('fileId' => $fileId, 'revisionId' => $revisionId, 'postBody' => $postBody);
+    $params = array_merge($params, $optParams);
+    return $this->call('update', array($params), "Google_Service_Drive_Revision");
+  }
+}
+
+
+
+
+class Google_Service_Drive_About extends Google_Collection
+{
+  protected $additionalRoleInfoType = 'Google_Service_Drive_AboutAdditionalRoleInfo';
+  protected $additionalRoleInfoDataType = 'array';
+  public $domainSharingPolicy;
+  public $etag;
+  protected $exportFormatsType = 'Google_Service_Drive_AboutExportFormats';
+  protected $exportFormatsDataType = 'array';
+  protected $featuresType = 'Google_Service_Drive_AboutFeatures';
+  protected $featuresDataType = 'array';
+  protected $importFormatsType = 'Google_Service_Drive_AboutImportFormats';
+  protected $importFormatsDataType = 'array';
+  public $isCurrentAppInstalled;
+  public $kind;
+  public $largestChangeId;
+  protected $maxUploadSizesType = 'Google_Service_Drive_AboutMaxUploadSizes';
+  protected $maxUploadSizesDataType = 'array';
+  public $name;
+  public $permissionId;
+  public $quotaBytesTotal;
+  public $quotaBytesUsed;
+  public $quotaBytesUsedAggregate;
+  public $quotaBytesUsedInTrash;
+  public $remainingChangeIds;
+  public $rootFolderId;
+  public $selfLink;
+  protected $userType = 'Google_Service_Drive_User';
+  protected $userDataType = '';
+
+  public function setAdditionalRoleInfo($additionalRoleInfo)
+  {
+    $this->additionalRoleInfo = $additionalRoleInfo;
+  }
+
+  public function getAdditionalRoleInfo()
+  {
+    return $this->additionalRoleInfo;
+  }
+
+  public function setDomainSharingPolicy($domainSharingPolicy)
+  {
+    $this->domainSharingPolicy = $domainSharingPolicy;
+  }
+
+  public function getDomainSharingPolicy()
+  {
+    return $this->domainSharingPolicy;
+  }
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setExportFormats($exportFormats)
+  {
+    $this->exportFormats = $exportFormats;
+  }
+
+  public function getExportFormats()
+  {
+    return $this->exportFormats;
+  }
+
+  public function setFeatures($features)
+  {
+    $this->features = $features;
+  }
+
+  public function getFeatures()
+  {
+    return $this->features;
+  }
+
+  public function setImportFormats($importFormats)
+  {
+    $this->importFormats = $importFormats;
+  }
+
+  public function getImportFormats()
+  {
+    return $this->importFormats;
+  }
+
+  public function setIsCurrentAppInstalled($isCurrentAppInstalled)
+  {
+    $this->isCurrentAppInstalled = $isCurrentAppInstalled;
+  }
+
+  public function getIsCurrentAppInstalled()
+  {
+    return $this->isCurrentAppInstalled;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setLargestChangeId($largestChangeId)
+  {
+    $this->largestChangeId = $largestChangeId;
+  }
+
+  public function getLargestChangeId()
+  {
+    return $this->largestChangeId;
+  }
+
+  public function setMaxUploadSizes($maxUploadSizes)
+  {
+    $this->maxUploadSizes = $maxUploadSizes;
+  }
+
+  public function getMaxUploadSizes()
+  {
+    return $this->maxUploadSizes;
+  }
+
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+
+  public function getName()
+  {
+    return $this->name;
+  }
+
+  public function setPermissionId($permissionId)
+  {
+    $this->permissionId = $permissionId;
+  }
+
+  public function getPermissionId()
+  {
+    return $this->permissionId;
+  }
+
+  public function setQuotaBytesTotal($quotaBytesTotal)
+  {
+    $this->quotaBytesTotal = $quotaBytesTotal;
+  }
+
+  public function getQuotaBytesTotal()
+  {
+    return $this->quotaBytesTotal;
+  }
+
+  public function setQuotaBytesUsed($quotaBytesUsed)
+  {
+    $this->quotaBytesUsed = $quotaBytesUsed;
+  }
+
+  public function getQuotaBytesUsed()
+  {
+    return $this->quotaBytesUsed;
+  }
+
+  public function setQuotaBytesUsedAggregate($quotaBytesUsedAggregate)
+  {
+    $this->quotaBytesUsedAggregate = $quotaBytesUsedAggregate;
+  }
+
+  public function getQuotaBytesUsedAggregate()
+  {
+    return $this->quotaBytesUsedAggregate;
+  }
+
+  public function setQuotaBytesUsedInTrash($quotaBytesUsedInTrash)
+  {
+    $this->quotaBytesUsedInTrash = $quotaBytesUsedInTrash;
+  }
+
+  public function getQuotaBytesUsedInTrash()
+  {
+    return $this->quotaBytesUsedInTrash;
+  }
+
+  public function setRemainingChangeIds($remainingChangeIds)
+  {
+    $this->remainingChangeIds = $remainingChangeIds;
+  }
+
+  public function getRemainingChangeIds()
+  {
+    return $this->remainingChangeIds;
+  }
+
+  public function setRootFolderId($rootFolderId)
+  {
+    $this->rootFolderId = $rootFolderId;
+  }
+
+  public function getRootFolderId()
+  {
+    return $this->rootFolderId;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+
+  public function setUser(Google_Service_Drive_User $user)
+  {
+    $this->user = $user;
+  }
+
+  public function getUser()
+  {
+    return $this->user;
+  }
+}
+
+class Google_Service_Drive_AboutAdditionalRoleInfo extends Google_Collection
+{
+  protected $roleSetsType = 'Google_Service_Drive_AboutAdditionalRoleInfoRoleSets';
+  protected $roleSetsDataType = 'array';
+  public $type;
+
+  public function setRoleSets($roleSets)
+  {
+    $this->roleSets = $roleSets;
+  }
+
+  public function getRoleSets()
+  {
+    return $this->roleSets;
+  }
+
+  public function setType($type)
+  {
+    $this->type = $type;
+  }
+
+  public function getType()
+  {
+    return $this->type;
+  }
+}
+
+class Google_Service_Drive_AboutAdditionalRoleInfoRoleSets extends Google_Collection
+{
+  public $additionalRoles;
+  public $primaryRole;
+
+  public function setAdditionalRoles($additionalRoles)
+  {
+    $this->additionalRoles = $additionalRoles;
+  }
+
+  public function getAdditionalRoles()
+  {
+    return $this->additionalRoles;
+  }
+
+  public function setPrimaryRole($primaryRole)
+  {
+    $this->primaryRole = $primaryRole;
+  }
+
+  public function getPrimaryRole()
+  {
+    return $this->primaryRole;
+  }
+}
+
+class Google_Service_Drive_AboutExportFormats extends Google_Collection
+{
+  public $source;
+  public $targets;
+
+  public function setSource($source)
+  {
+    $this->source = $source;
+  }
+
+  public function getSource()
+  {
+    return $this->source;
+  }
+
+  public function setTargets($targets)
+  {
+    $this->targets = $targets;
+  }
+
+  public function getTargets()
+  {
+    return $this->targets;
+  }
+}
+
+class Google_Service_Drive_AboutFeatures extends Google_Model
+{
+  public $featureName;
+  public $featureRate;
+
+  public function setFeatureName($featureName)
+  {
+    $this->featureName = $featureName;
+  }
+
+  public function getFeatureName()
+  {
+    return $this->featureName;
+  }
+
+  public function setFeatureRate($featureRate)
+  {
+    $this->featureRate = $featureRate;
+  }
+
+  public function getFeatureRate()
+  {
+    return $this->featureRate;
+  }
+}
+
+class Google_Service_Drive_AboutImportFormats extends Google_Collection
+{
+  public $source;
+  public $targets;
+
+  public function setSource($source)
+  {
+    $this->source = $source;
+  }
+
+  public function getSource()
+  {
+    return $this->source;
+  }
+
+  public function setTargets($targets)
+  {
+    $this->targets = $targets;
+  }
+
+  public function getTargets()
+  {
+    return $this->targets;
+  }
+}
+
+class Google_Service_Drive_AboutMaxUploadSizes extends Google_Model
+{
+  public $size;
+  public $type;
+
+  public function setSize($size)
+  {
+    $this->size = $size;
+  }
+
+  public function getSize()
+  {
+    return $this->size;
+  }
+
+  public function setType($type)
+  {
+    $this->type = $type;
+  }
+
+  public function getType()
+  {
+    return $this->type;
+  }
+}
+
+class Google_Service_Drive_App extends Google_Collection
+{
+  public $authorized;
+  public $createInFolderTemplate;
+  public $createUrl;
+  protected $iconsType = 'Google_Service_Drive_AppIcons';
+  protected $iconsDataType = 'array';
+  public $id;
+  public $installed;
+  public $kind;
+  public $longDescription;
+  public $name;
+  public $objectType;
+  public $openUrlTemplate;
+  public $primaryFileExtensions;
+  public $primaryMimeTypes;
+  public $productId;
+  public $productUrl;
+  public $secondaryFileExtensions;
+  public $secondaryMimeTypes;
+  public $shortDescription;
+  public $supportsCreate;
+  public $supportsImport;
+  public $supportsMultiOpen;
+  public $useByDefault;
+
+  public function setAuthorized($authorized)
+  {
+    $this->authorized = $authorized;
+  }
+
+  public function getAuthorized()
+  {
+    return $this->authorized;
+  }
+
+  public function setCreateInFolderTemplate($createInFolderTemplate)
+  {
+    $this->createInFolderTemplate = $createInFolderTemplate;
+  }
+
+  public function getCreateInFolderTemplate()
+  {
+    return $this->createInFolderTemplate;
+  }
+
+  public function setCreateUrl($createUrl)
+  {
+    $this->createUrl = $createUrl;
+  }
+
+  public function getCreateUrl()
+  {
+    return $this->createUrl;
+  }
+
+  public function setIcons($icons)
+  {
+    $this->icons = $icons;
+  }
+
+  public function getIcons()
+  {
+    return $this->icons;
+  }
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setInstalled($installed)
+  {
+    $this->installed = $installed;
+  }
+
+  public function getInstalled()
+  {
+    return $this->installed;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setLongDescription($longDescription)
+  {
+    $this->longDescription = $longDescription;
+  }
+
+  public function getLongDescription()
+  {
+    return $this->longDescription;
+  }
+
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+
+  public function getName()
+  {
+    return $this->name;
+  }
+
+  public function setObjectType($objectType)
+  {
+    $this->objectType = $objectType;
+  }
+
+  public function getObjectType()
+  {
+    return $this->objectType;
+  }
+
+  public function setOpenUrlTemplate($openUrlTemplate)
+  {
+    $this->openUrlTemplate = $openUrlTemplate;
+  }
+
+  public function getOpenUrlTemplate()
+  {
+    return $this->openUrlTemplate;
+  }
+
+  public function setPrimaryFileExtensions($primaryFileExtensions)
+  {
+    $this->primaryFileExtensions = $primaryFileExtensions;
+  }
+
+  public function getPrimaryFileExtensions()
+  {
+    return $this->primaryFileExtensions;
+  }
+
+  public function setPrimaryMimeTypes($primaryMimeTypes)
+  {
+    $this->primaryMimeTypes = $primaryMimeTypes;
+  }
+
+  public function getPrimaryMimeTypes()
+  {
+    return $this->primaryMimeTypes;
+  }
+
+  public function setProductId($productId)
+  {
+    $this->productId = $productId;
+  }
+
+  public function getProductId()
+  {
+    return $this->productId;
+  }
+
+  public function setProductUrl($productUrl)
+  {
+    $this->productUrl = $productUrl;
+  }
+
+  public function getProductUrl()
+  {
+    return $this->productUrl;
+  }
+
+  public function setSecondaryFileExtensions($secondaryFileExtensions)
+  {
+    $this->secondaryFileExtensions = $secondaryFileExtensions;
+  }
+
+  public function getSecondaryFileExtensions()
+  {
+    return $this->secondaryFileExtensions;
+  }
+
+  public function setSecondaryMimeTypes($secondaryMimeTypes)
+  {
+    $this->secondaryMimeTypes = $secondaryMimeTypes;
+  }
+
+  public function getSecondaryMimeTypes()
+  {
+    return $this->secondaryMimeTypes;
+  }
+
+  public function setShortDescription($shortDescription)
+  {
+    $this->shortDescription = $shortDescription;
+  }
+
+  public function getShortDescription()
+  {
+    return $this->shortDescription;
+  }
+
+  public function setSupportsCreate($supportsCreate)
+  {
+    $this->supportsCreate = $supportsCreate;
+  }
+
+  public function getSupportsCreate()
+  {
+    return $this->supportsCreate;
+  }
+
+  public function setSupportsImport($supportsImport)
+  {
+    $this->supportsImport = $supportsImport;
+  }
+
+  public function getSupportsImport()
+  {
+    return $this->supportsImport;
+  }
+
+  public function setSupportsMultiOpen($supportsMultiOpen)
+  {
+    $this->supportsMultiOpen = $supportsMultiOpen;
+  }
+
+  public function getSupportsMultiOpen()
+  {
+    return $this->supportsMultiOpen;
+  }
+
+  public function setUseByDefault($useByDefault)
+  {
+    $this->useByDefault = $useByDefault;
+  }
+
+  public function getUseByDefault()
+  {
+    return $this->useByDefault;
+  }
+}
+
+class Google_Service_Drive_AppIcons extends Google_Model
+{
+  public $category;
+  public $iconUrl;
+  public $size;
+
+  public function setCategory($category)
+  {
+    $this->category = $category;
+  }
+
+  public function getCategory()
+  {
+    return $this->category;
+  }
+
+  public function setIconUrl($iconUrl)
+  {
+    $this->iconUrl = $iconUrl;
+  }
+
+  public function getIconUrl()
+  {
+    return $this->iconUrl;
+  }
+
+  public function setSize($size)
+  {
+    $this->size = $size;
+  }
+
+  public function getSize()
+  {
+    return $this->size;
+  }
+}
+
+class Google_Service_Drive_AppList extends Google_Collection
+{
+  public $etag;
+  protected $itemsType = 'Google_Service_Drive_App';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $selfLink;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_Change extends Google_Model
+{
+  public $deleted;
+  protected $fileType = 'Google_Service_Drive_DriveFile';
+  protected $fileDataType = '';
+  public $fileId;
+  public $id;
+  public $kind;
+  public $modificationDate;
+  public $selfLink;
+
+  public function setDeleted($deleted)
+  {
+    $this->deleted = $deleted;
+  }
+
+  public function getDeleted()
+  {
+    return $this->deleted;
+  }
+
+  public function setFile(Google_Service_Drive_DriveFile $file)
+  {
+    $this->file = $file;
+  }
+
+  public function getFile()
+  {
+    return $this->file;
+  }
+
+  public function setFileId($fileId)
+  {
+    $this->fileId = $fileId;
+  }
+
+  public function getFileId()
+  {
+    return $this->fileId;
+  }
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setModificationDate($modificationDate)
+  {
+    $this->modificationDate = $modificationDate;
+  }
+
+  public function getModificationDate()
+  {
+    return $this->modificationDate;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_ChangeList extends Google_Collection
+{
+  public $etag;
+  protected $itemsType = 'Google_Service_Drive_Change';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $largestChangeId;
+  public $nextLink;
+  public $nextPageToken;
+  public $selfLink;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setLargestChangeId($largestChangeId)
+  {
+    $this->largestChangeId = $largestChangeId;
+  }
+
+  public function getLargestChangeId()
+  {
+    return $this->largestChangeId;
+  }
+
+  public function setNextLink($nextLink)
+  {
+    $this->nextLink = $nextLink;
+  }
+
+  public function getNextLink()
+  {
+    return $this->nextLink;
+  }
+
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_Channel extends Google_Model
+{
+  public $address;
+  public $expiration;
+  public $id;
+  public $kind;
+  public $params;
+  public $payload;
+  public $resourceId;
+  public $resourceUri;
+  public $token;
+  public $type;
+
+  public function setAddress($address)
+  {
+    $this->address = $address;
+  }
+
+  public function getAddress()
+  {
+    return $this->address;
+  }
+
+  public function setExpiration($expiration)
+  {
+    $this->expiration = $expiration;
+  }
+
+  public function getExpiration()
+  {
+    return $this->expiration;
+  }
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setParams($params)
+  {
+    $this->params = $params;
+  }
+
+  public function getParams()
+  {
+    return $this->params;
+  }
+
+  public function setPayload($payload)
+  {
+    $this->payload = $payload;
+  }
+
+  public function getPayload()
+  {
+    return $this->payload;
+  }
+
+  public function setResourceId($resourceId)
+  {
+    $this->resourceId = $resourceId;
+  }
+
+  public function getResourceId()
+  {
+    return $this->resourceId;
+  }
+
+  public function setResourceUri($resourceUri)
+  {
+    $this->resourceUri = $resourceUri;
+  }
+
+  public function getResourceUri()
+  {
+    return $this->resourceUri;
+  }
+
+  public function setToken($token)
+  {
+    $this->token = $token;
+  }
+
+  public function getToken()
+  {
+    return $this->token;
+  }
+
+  public function setType($type)
+  {
+    $this->type = $type;
+  }
+
+  public function getType()
+  {
+    return $this->type;
+  }
+}
+
+class Google_Service_Drive_ChildList extends Google_Collection
+{
+  public $etag;
+  protected $itemsType = 'Google_Service_Drive_ChildReference';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $nextLink;
+  public $nextPageToken;
+  public $selfLink;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setNextLink($nextLink)
+  {
+    $this->nextLink = $nextLink;
+  }
+
+  public function getNextLink()
+  {
+    return $this->nextLink;
+  }
+
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_ChildReference extends Google_Model
+{
+  public $childLink;
+  public $id;
+  public $kind;
+  public $selfLink;
+
+  public function setChildLink($childLink)
+  {
+    $this->childLink = $childLink;
+  }
+
+  public function getChildLink()
+  {
+    return $this->childLink;
+  }
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_Comment extends Google_Collection
+{
+  public $anchor;
+  protected $authorType = 'Google_Service_Drive_User';
+  protected $authorDataType = '';
+  public $commentId;
+  public $content;
+  protected $contextType = 'Google_Service_Drive_CommentContext';
+  protected $contextDataType = '';
+  public $createdDate;
+  public $deleted;
+  public $fileId;
+  public $fileTitle;
+  public $htmlContent;
+  public $kind;
+  public $modifiedDate;
+  protected $repliesType = 'Google_Service_Drive_CommentReply';
+  protected $repliesDataType = 'array';
+  public $selfLink;
+  public $status;
+
+  public function setAnchor($anchor)
+  {
+    $this->anchor = $anchor;
+  }
+
+  public function getAnchor()
+  {
+    return $this->anchor;
+  }
+
+  public function setAuthor(Google_Service_Drive_User $author)
+  {
+    $this->author = $author;
+  }
+
+  public function getAuthor()
+  {
+    return $this->author;
+  }
+
+  public function setCommentId($commentId)
+  {
+    $this->commentId = $commentId;
+  }
+
+  public function getCommentId()
+  {
+    return $this->commentId;
+  }
+
+  public function setContent($content)
+  {
+    $this->content = $content;
+  }
+
+  public function getContent()
+  {
+    return $this->content;
+  }
+
+  public function setContext(Google_Service_Drive_CommentContext $context)
+  {
+    $this->context = $context;
+  }
+
+  public function getContext()
+  {
+    return $this->context;
+  }
+
+  public function setCreatedDate($createdDate)
+  {
+    $this->createdDate = $createdDate;
+  }
+
+  public function getCreatedDate()
+  {
+    return $this->createdDate;
+  }
+
+  public function setDeleted($deleted)
+  {
+    $this->deleted = $deleted;
+  }
+
+  public function getDeleted()
+  {
+    return $this->deleted;
+  }
+
+  public function setFileId($fileId)
+  {
+    $this->fileId = $fileId;
+  }
+
+  public function getFileId()
+  {
+    return $this->fileId;
+  }
+
+  public function setFileTitle($fileTitle)
+  {
+    $this->fileTitle = $fileTitle;
+  }
+
+  public function getFileTitle()
+  {
+    return $this->fileTitle;
+  }
+
+  public function setHtmlContent($htmlContent)
+  {
+    $this->htmlContent = $htmlContent;
+  }
+
+  public function getHtmlContent()
+  {
+    return $this->htmlContent;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setModifiedDate($modifiedDate)
+  {
+    $this->modifiedDate = $modifiedDate;
+  }
+
+  public function getModifiedDate()
+  {
+    return $this->modifiedDate;
+  }
+
+  public function setReplies($replies)
+  {
+    $this->replies = $replies;
+  }
+
+  public function getReplies()
+  {
+    return $this->replies;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+
+  public function setStatus($status)
+  {
+    $this->status = $status;
+  }
+
+  public function getStatus()
+  {
+    return $this->status;
+  }
+}
+
+class Google_Service_Drive_CommentContext extends Google_Model
+{
+  public $type;
+  public $value;
+
+  public function setType($type)
+  {
+    $this->type = $type;
+  }
+
+  public function getType()
+  {
+    return $this->type;
+  }
+
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+
+  public function getValue()
+  {
+    return $this->value;
+  }
+}
+
+class Google_Service_Drive_CommentList extends Google_Collection
+{
+  protected $itemsType = 'Google_Service_Drive_Comment';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $nextLink;
+  public $nextPageToken;
+  public $selfLink;
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setNextLink($nextLink)
+  {
+    $this->nextLink = $nextLink;
+  }
+
+  public function getNextLink()
+  {
+    return $this->nextLink;
+  }
+
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_CommentReply extends Google_Model
+{
+  protected $authorType = 'Google_Service_Drive_User';
+  protected $authorDataType = '';
+  public $content;
+  public $createdDate;
+  public $deleted;
+  public $htmlContent;
+  public $kind;
+  public $modifiedDate;
+  public $replyId;
+  public $verb;
+
+  public function setAuthor(Google_Service_Drive_User $author)
+  {
+    $this->author = $author;
+  }
+
+  public function getAuthor()
+  {
+    return $this->author;
+  }
+
+  public function setContent($content)
+  {
+    $this->content = $content;
+  }
+
+  public function getContent()
+  {
+    return $this->content;
+  }
+
+  public function setCreatedDate($createdDate)
+  {
+    $this->createdDate = $createdDate;
+  }
+
+  public function getCreatedDate()
+  {
+    return $this->createdDate;
+  }
+
+  public function setDeleted($deleted)
+  {
+    $this->deleted = $deleted;
+  }
+
+  public function getDeleted()
+  {
+    return $this->deleted;
+  }
+
+  public function setHtmlContent($htmlContent)
+  {
+    $this->htmlContent = $htmlContent;
+  }
+
+  public function getHtmlContent()
+  {
+    return $this->htmlContent;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setModifiedDate($modifiedDate)
+  {
+    $this->modifiedDate = $modifiedDate;
+  }
+
+  public function getModifiedDate()
+  {
+    return $this->modifiedDate;
+  }
+
+  public function setReplyId($replyId)
+  {
+    $this->replyId = $replyId;
+  }
+
+  public function getReplyId()
+  {
+    return $this->replyId;
+  }
+
+  public function setVerb($verb)
+  {
+    $this->verb = $verb;
+  }
+
+  public function getVerb()
+  {
+    return $this->verb;
+  }
+}
+
+class Google_Service_Drive_CommentReplyList extends Google_Collection
+{
+  protected $itemsType = 'Google_Service_Drive_CommentReply';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $nextLink;
+  public $nextPageToken;
+  public $selfLink;
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setNextLink($nextLink)
+  {
+    $this->nextLink = $nextLink;
+  }
+
+  public function getNextLink()
+  {
+    return $this->nextLink;
+  }
+
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_DriveFile extends Google_Collection
+{
+  public $alternateLink;
+  public $appDataContents;
+  public $copyable;
+  public $createdDate;
+  public $defaultOpenWithLink;
+  public $description;
+  public $downloadUrl;
+  public $editable;
+  public $embedLink;
+  public $etag;
+  public $explicitlyTrashed;
+  public $exportLinks;
+  public $fileExtension;
+  public $fileSize;
+  public $headRevisionId;
+  public $iconLink;
+  public $id;
+  protected $imageMediaMetadataType = 'Google_Service_Drive_DriveFileImageMediaMetadata';
+  protected $imageMediaMetadataDataType = '';
+  protected $indexableTextType = 'Google_Service_Drive_DriveFileIndexableText';
+  protected $indexableTextDataType = '';
+  public $kind;
+  protected $labelsType = 'Google_Service_Drive_DriveFileLabels';
+  protected $labelsDataType = '';
+  protected $lastModifyingUserType = 'Google_Service_Drive_User';
+  protected $lastModifyingUserDataType = '';
+  public $lastModifyingUserName;
+  public $lastViewedByMeDate;
+  public $md5Checksum;
+  public $mimeType;
+  public $modifiedByMeDate;
+  public $modifiedDate;
+  public $openWithLinks;
+  public $originalFilename;
+  public $ownerNames;
+  protected $ownersType = 'Google_Service_Drive_User';
+  protected $ownersDataType = 'array';
+  protected $parentsType = 'Google_Service_Drive_ParentReference';
+  protected $parentsDataType = 'array';
+  protected $propertiesType = 'Google_Service_Drive_Property';
+  protected $propertiesDataType = 'array';
+  public $quotaBytesUsed;
+  public $selfLink;
+  public $shared;
+  public $sharedWithMeDate;
+  protected $thumbnailType = 'Google_Service_Drive_DriveFileThumbnail';
+  protected $thumbnailDataType = '';
+  public $thumbnailLink;
+  public $title;
+  protected $userPermissionType = 'Google_Service_Drive_Permission';
+  protected $userPermissionDataType = '';
+  public $webContentLink;
+  public $webViewLink;
+  public $writersCanShare;
+
+  public function setAlternateLink($alternateLink)
+  {
+    $this->alternateLink = $alternateLink;
+  }
+
+  public function getAlternateLink()
+  {
+    return $this->alternateLink;
+  }
+
+  public function setAppDataContents($appDataContents)
+  {
+    $this->appDataContents = $appDataContents;
+  }
+
+  public function getAppDataContents()
+  {
+    return $this->appDataContents;
+  }
+
+  public function setCopyable($copyable)
+  {
+    $this->copyable = $copyable;
+  }
+
+  public function getCopyable()
+  {
+    return $this->copyable;
+  }
+
+  public function setCreatedDate($createdDate)
+  {
+    $this->createdDate = $createdDate;
+  }
+
+  public function getCreatedDate()
+  {
+    return $this->createdDate;
+  }
+
+  public function setDefaultOpenWithLink($defaultOpenWithLink)
+  {
+    $this->defaultOpenWithLink = $defaultOpenWithLink;
+  }
+
+  public function getDefaultOpenWithLink()
+  {
+    return $this->defaultOpenWithLink;
+  }
+
+  public function setDescription($description)
+  {
+    $this->description = $description;
+  }
+
+  public function getDescription()
+  {
+    return $this->description;
+  }
+
+  public function setDownloadUrl($downloadUrl)
+  {
+    $this->downloadUrl = $downloadUrl;
+  }
+
+  public function getDownloadUrl()
+  {
+    return $this->downloadUrl;
+  }
+
+  public function setEditable($editable)
+  {
+    $this->editable = $editable;
+  }
+
+  public function getEditable()
+  {
+    return $this->editable;
+  }
+
+  public function setEmbedLink($embedLink)
+  {
+    $this->embedLink = $embedLink;
+  }
+
+  public function getEmbedLink()
+  {
+    return $this->embedLink;
+  }
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setExplicitlyTrashed($explicitlyTrashed)
+  {
+    $this->explicitlyTrashed = $explicitlyTrashed;
+  }
+
+  public function getExplicitlyTrashed()
+  {
+    return $this->explicitlyTrashed;
+  }
+
+  public function setExportLinks($exportLinks)
+  {
+    $this->exportLinks = $exportLinks;
+  }
+
+  public function getExportLinks()
+  {
+    return $this->exportLinks;
+  }
+
+  public function setFileExtension($fileExtension)
+  {
+    $this->fileExtension = $fileExtension;
+  }
+
+  public function getFileExtension()
+  {
+    return $this->fileExtension;
+  }
+
+  public function setFileSize($fileSize)
+  {
+    $this->fileSize = $fileSize;
+  }
+
+  public function getFileSize()
+  {
+    return $this->fileSize;
+  }
+
+  public function setHeadRevisionId($headRevisionId)
+  {
+    $this->headRevisionId = $headRevisionId;
+  }
+
+  public function getHeadRevisionId()
+  {
+    return $this->headRevisionId;
+  }
+
+  public function setIconLink($iconLink)
+  {
+    $this->iconLink = $iconLink;
+  }
+
+  public function getIconLink()
+  {
+    return $this->iconLink;
+  }
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setImageMediaMetadata(Google_Service_Drive_DriveFileImageMediaMetadata $imageMediaMetadata)
+  {
+    $this->imageMediaMetadata = $imageMediaMetadata;
+  }
+
+  public function getImageMediaMetadata()
+  {
+    return $this->imageMediaMetadata;
+  }
+
+  public function setIndexableText(Google_Service_Drive_DriveFileIndexableText $indexableText)
+  {
+    $this->indexableText = $indexableText;
+  }
+
+  public function getIndexableText()
+  {
+    return $this->indexableText;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setLabels(Google_Service_Drive_DriveFileLabels $labels)
+  {
+    $this->labels = $labels;
+  }
+
+  public function getLabels()
+  {
+    return $this->labels;
+  }
+
+  public function setLastModifyingUser(Google_Service_Drive_User $lastModifyingUser)
+  {
+    $this->lastModifyingUser = $lastModifyingUser;
+  }
+
+  public function getLastModifyingUser()
+  {
+    return $this->lastModifyingUser;
+  }
+
+  public function setLastModifyingUserName($lastModifyingUserName)
+  {
+    $this->lastModifyingUserName = $lastModifyingUserName;
+  }
+
+  public function getLastModifyingUserName()
+  {
+    return $this->lastModifyingUserName;
+  }
+
+  public function setLastViewedByMeDate($lastViewedByMeDate)
+  {
+    $this->lastViewedByMeDate = $lastViewedByMeDate;
+  }
+
+  public function getLastViewedByMeDate()
+  {
+    return $this->lastViewedByMeDate;
+  }
+
+  public function setMd5Checksum($md5Checksum)
+  {
+    $this->md5Checksum = $md5Checksum;
+  }
+
+  public function getMd5Checksum()
+  {
+    return $this->md5Checksum;
+  }
+
+  public function setMimeType($mimeType)
+  {
+    $this->mimeType = $mimeType;
+  }
+
+  public function getMimeType()
+  {
+    return $this->mimeType;
+  }
+
+  public function setModifiedByMeDate($modifiedByMeDate)
+  {
+    $this->modifiedByMeDate = $modifiedByMeDate;
+  }
+
+  public function getModifiedByMeDate()
+  {
+    return $this->modifiedByMeDate;
+  }
+
+  public function setModifiedDate($modifiedDate)
+  {
+    $this->modifiedDate = $modifiedDate;
+  }
+
+  public function getModifiedDate()
+  {
+    return $this->modifiedDate;
+  }
+
+  public function setOpenWithLinks($openWithLinks)
+  {
+    $this->openWithLinks = $openWithLinks;
+  }
+
+  public function getOpenWithLinks()
+  {
+    return $this->openWithLinks;
+  }
+
+  public function setOriginalFilename($originalFilename)
+  {
+    $this->originalFilename = $originalFilename;
+  }
+
+  public function getOriginalFilename()
+  {
+    return $this->originalFilename;
+  }
+
+  public function setOwnerNames($ownerNames)
+  {
+    $this->ownerNames = $ownerNames;
+  }
+
+  public function getOwnerNames()
+  {
+    return $this->ownerNames;
+  }
+
+  public function setOwners($owners)
+  {
+    $this->owners = $owners;
+  }
+
+  public function getOwners()
+  {
+    return $this->owners;
+  }
+
+  public function setParents($parents)
+  {
+    $this->parents = $parents;
+  }
+
+  public function getParents()
+  {
+    return $this->parents;
+  }
+
+  public function setProperties($properties)
+  {
+    $this->properties = $properties;
+  }
+
+  public function getProperties()
+  {
+    return $this->properties;
+  }
+
+  public function setQuotaBytesUsed($quotaBytesUsed)
+  {
+    $this->quotaBytesUsed = $quotaBytesUsed;
+  }
+
+  public function getQuotaBytesUsed()
+  {
+    return $this->quotaBytesUsed;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+
+  public function setShared($shared)
+  {
+    $this->shared = $shared;
+  }
+
+  public function getShared()
+  {
+    return $this->shared;
+  }
+
+  public function setSharedWithMeDate($sharedWithMeDate)
+  {
+    $this->sharedWithMeDate = $sharedWithMeDate;
+  }
+
+  public function getSharedWithMeDate()
+  {
+    return $this->sharedWithMeDate;
+  }
+
+  public function setThumbnail(Google_Service_Drive_DriveFileThumbnail $thumbnail)
+  {
+    $this->thumbnail = $thumbnail;
+  }
+
+  public function getThumbnail()
+  {
+    return $this->thumbnail;
+  }
+
+  public function setThumbnailLink($thumbnailLink)
+  {
+    $this->thumbnailLink = $thumbnailLink;
+  }
+
+  public function getThumbnailLink()
+  {
+    return $this->thumbnailLink;
+  }
+
+  public function setTitle($title)
+  {
+    $this->title = $title;
+  }
+
+  public function getTitle()
+  {
+    return $this->title;
+  }
+
+  public function setUserPermission(Google_Service_Drive_Permission $userPermission)
+  {
+    $this->userPermission = $userPermission;
+  }
+
+  public function getUserPermission()
+  {
+    return $this->userPermission;
+  }
+
+  public function setWebContentLink($webContentLink)
+  {
+    $this->webContentLink = $webContentLink;
+  }
+
+  public function getWebContentLink()
+  {
+    return $this->webContentLink;
+  }
+
+  public function setWebViewLink($webViewLink)
+  {
+    $this->webViewLink = $webViewLink;
+  }
+
+  public function getWebViewLink()
+  {
+    return $this->webViewLink;
+  }
+
+  public function setWritersCanShare($writersCanShare)
+  {
+    $this->writersCanShare = $writersCanShare;
+  }
+
+  public function getWritersCanShare()
+  {
+    return $this->writersCanShare;
+  }
+}
+
+class Google_Service_Drive_DriveFileImageMediaMetadata extends Google_Model
+{
+  public $aperture;
+  public $cameraMake;
+  public $cameraModel;
+  public $colorSpace;
+  public $date;
+  public $exposureBias;
+  public $exposureMode;
+  public $exposureTime;
+  public $flashUsed;
+  public $focalLength;
+  public $height;
+  public $isoSpeed;
+  public $lens;
+  protected $locationType = 'Google_Service_Drive_DriveFileImageMediaMetadataLocation';
+  protected $locationDataType = '';
+  public $maxApertureValue;
+  public $meteringMode;
+  public $rotation;
+  public $sensor;
+  public $subjectDistance;
+  public $whiteBalance;
+  public $width;
+
+  public function setAperture($aperture)
+  {
+    $this->aperture = $aperture;
+  }
+
+  public function getAperture()
+  {
+    return $this->aperture;
+  }
+
+  public function setCameraMake($cameraMake)
+  {
+    $this->cameraMake = $cameraMake;
+  }
+
+  public function getCameraMake()
+  {
+    return $this->cameraMake;
+  }
+
+  public function setCameraModel($cameraModel)
+  {
+    $this->cameraModel = $cameraModel;
+  }
+
+  public function getCameraModel()
+  {
+    return $this->cameraModel;
+  }
+
+  public function setColorSpace($colorSpace)
+  {
+    $this->colorSpace = $colorSpace;
+  }
+
+  public function getColorSpace()
+  {
+    return $this->colorSpace;
+  }
+
+  public function setDate($date)
+  {
+    $this->date = $date;
+  }
+
+  public function getDate()
+  {
+    return $this->date;
+  }
+
+  public function setExposureBias($exposureBias)
+  {
+    $this->exposureBias = $exposureBias;
+  }
+
+  public function getExposureBias()
+  {
+    return $this->exposureBias;
+  }
+
+  public function setExposureMode($exposureMode)
+  {
+    $this->exposureMode = $exposureMode;
+  }
+
+  public function getExposureMode()
+  {
+    return $this->exposureMode;
+  }
+
+  public function setExposureTime($exposureTime)
+  {
+    $this->exposureTime = $exposureTime;
+  }
+
+  public function getExposureTime()
+  {
+    return $this->exposureTime;
+  }
+
+  public function setFlashUsed($flashUsed)
+  {
+    $this->flashUsed = $flashUsed;
+  }
+
+  public function getFlashUsed()
+  {
+    return $this->flashUsed;
+  }
+
+  public function setFocalLength($focalLength)
+  {
+    $this->focalLength = $focalLength;
+  }
+
+  public function getFocalLength()
+  {
+    return $this->focalLength;
+  }
+
+  public function setHeight($height)
+  {
+    $this->height = $height;
+  }
+
+  public function getHeight()
+  {
+    return $this->height;
+  }
+
+  public function setIsoSpeed($isoSpeed)
+  {
+    $this->isoSpeed = $isoSpeed;
+  }
+
+  public function getIsoSpeed()
+  {
+    return $this->isoSpeed;
+  }
+
+  public function setLens($lens)
+  {
+    $this->lens = $lens;
+  }
+
+  public function getLens()
+  {
+    return $this->lens;
+  }
+
+  public function setLocation(Google_Service_Drive_DriveFileImageMediaMetadataLocation $location)
+  {
+    $this->location = $location;
+  }
+
+  public function getLocation()
+  {
+    return $this->location;
+  }
+
+  public function setMaxApertureValue($maxApertureValue)
+  {
+    $this->maxApertureValue = $maxApertureValue;
+  }
+
+  public function getMaxApertureValue()
+  {
+    return $this->maxApertureValue;
+  }
+
+  public function setMeteringMode($meteringMode)
+  {
+    $this->meteringMode = $meteringMode;
+  }
+
+  public function getMeteringMode()
+  {
+    return $this->meteringMode;
+  }
+
+  public function setRotation($rotation)
+  {
+    $this->rotation = $rotation;
+  }
+
+  public function getRotation()
+  {
+    return $this->rotation;
+  }
+
+  public function setSensor($sensor)
+  {
+    $this->sensor = $sensor;
+  }
+
+  public function getSensor()
+  {
+    return $this->sensor;
+  }
+
+  public function setSubjectDistance($subjectDistance)
+  {
+    $this->subjectDistance = $subjectDistance;
+  }
+
+  public function getSubjectDistance()
+  {
+    return $this->subjectDistance;
+  }
+
+  public function setWhiteBalance($whiteBalance)
+  {
+    $this->whiteBalance = $whiteBalance;
+  }
+
+  public function getWhiteBalance()
+  {
+    return $this->whiteBalance;
+  }
+
+  public function setWidth($width)
+  {
+    $this->width = $width;
+  }
+
+  public function getWidth()
+  {
+    return $this->width;
+  }
+}
+
+class Google_Service_Drive_DriveFileImageMediaMetadataLocation extends Google_Model
+{
+  public $altitude;
+  public $latitude;
+  public $longitude;
+
+  public function setAltitude($altitude)
+  {
+    $this->altitude = $altitude;
+  }
+
+  public function getAltitude()
+  {
+    return $this->altitude;
+  }
+
+  public function setLatitude($latitude)
+  {
+    $this->latitude = $latitude;
+  }
+
+  public function getLatitude()
+  {
+    return $this->latitude;
+  }
+
+  public function setLongitude($longitude)
+  {
+    $this->longitude = $longitude;
+  }
+
+  public function getLongitude()
+  {
+    return $this->longitude;
+  }
+}
+
+class Google_Service_Drive_DriveFileIndexableText extends Google_Model
+{
+  public $text;
+
+  public function setText($text)
+  {
+    $this->text = $text;
+  }
+
+  public function getText()
+  {
+    return $this->text;
+  }
+}
+
+class Google_Service_Drive_DriveFileLabels extends Google_Model
+{
+  public $hidden;
+  public $restricted;
+  public $starred;
+  public $trashed;
+  public $viewed;
+
+  public function setHidden($hidden)
+  {
+    $this->hidden = $hidden;
+  }
+
+  public function getHidden()
+  {
+    return $this->hidden;
+  }
+
+  public function setRestricted($restricted)
+  {
+    $this->restricted = $restricted;
+  }
+
+  public function getRestricted()
+  {
+    return $this->restricted;
+  }
+
+  public function setStarred($starred)
+  {
+    $this->starred = $starred;
+  }
+
+  public function getStarred()
+  {
+    return $this->starred;
+  }
+
+  public function setTrashed($trashed)
+  {
+    $this->trashed = $trashed;
+  }
+
+  public function getTrashed()
+  {
+    return $this->trashed;
+  }
+
+  public function setViewed($viewed)
+  {
+    $this->viewed = $viewed;
+  }
+
+  public function getViewed()
+  {
+    return $this->viewed;
+  }
+}
+
+class Google_Service_Drive_DriveFileThumbnail extends Google_Model
+{
+  public $image;
+  public $mimeType;
+
+  public function setImage($image)
+  {
+    $this->image = $image;
+  }
+
+  public function getImage()
+  {
+    return $this->image;
+  }
+
+  public function setMimeType($mimeType)
+  {
+    $this->mimeType = $mimeType;
+  }
+
+  public function getMimeType()
+  {
+    return $this->mimeType;
+  }
+}
+
+class Google_Service_Drive_FileList extends Google_Collection
+{
+  public $etag;
+  protected $itemsType = 'Google_Service_Drive_DriveFile';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $nextLink;
+  public $nextPageToken;
+  public $selfLink;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setNextLink($nextLink)
+  {
+    $this->nextLink = $nextLink;
+  }
+
+  public function getNextLink()
+  {
+    return $this->nextLink;
+  }
+
+  public function setNextPageToken($nextPageToken)
+  {
+    $this->nextPageToken = $nextPageToken;
+  }
+
+  public function getNextPageToken()
+  {
+    return $this->nextPageToken;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_ParentList extends Google_Collection
+{
+  public $etag;
+  protected $itemsType = 'Google_Service_Drive_ParentReference';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $selfLink;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_ParentReference extends Google_Model
+{
+  public $id;
+  public $isRoot;
+  public $kind;
+  public $parentLink;
+  public $selfLink;
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setIsRoot($isRoot)
+  {
+    $this->isRoot = $isRoot;
+  }
+
+  public function getIsRoot()
+  {
+    return $this->isRoot;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setParentLink($parentLink)
+  {
+    $this->parentLink = $parentLink;
+  }
+
+  public function getParentLink()
+  {
+    return $this->parentLink;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_Permission extends Google_Collection
+{
+  public $additionalRoles;
+  public $authKey;
+  public $domain;
+  public $emailAddress;
+  public $etag;
+  public $id;
+  public $kind;
+  public $name;
+  public $photoLink;
+  public $role;
+  public $selfLink;
+  public $type;
+  public $value;
+  public $withLink;
+
+  public function setAdditionalRoles($additionalRoles)
+  {
+    $this->additionalRoles = $additionalRoles;
+  }
+
+  public function getAdditionalRoles()
+  {
+    return $this->additionalRoles;
+  }
+
+  public function setAuthKey($authKey)
+  {
+    $this->authKey = $authKey;
+  }
+
+  public function getAuthKey()
+  {
+    return $this->authKey;
+  }
+
+  public function setDomain($domain)
+  {
+    $this->domain = $domain;
+  }
+
+  public function getDomain()
+  {
+    return $this->domain;
+  }
+
+  public function setEmailAddress($emailAddress)
+  {
+    $this->emailAddress = $emailAddress;
+  }
+
+  public function getEmailAddress()
+  {
+    return $this->emailAddress;
+  }
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setName($name)
+  {
+    $this->name = $name;
+  }
+
+  public function getName()
+  {
+    return $this->name;
+  }
+
+  public function setPhotoLink($photoLink)
+  {
+    $this->photoLink = $photoLink;
+  }
+
+  public function getPhotoLink()
+  {
+    return $this->photoLink;
+  }
+
+  public function setRole($role)
+  {
+    $this->role = $role;
+  }
+
+  public function getRole()
+  {
+    return $this->role;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+
+  public function setType($type)
+  {
+    $this->type = $type;
+  }
+
+  public function getType()
+  {
+    return $this->type;
+  }
+
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+
+  public function getValue()
+  {
+    return $this->value;
+  }
+
+  public function setWithLink($withLink)
+  {
+    $this->withLink = $withLink;
+  }
+
+  public function getWithLink()
+  {
+    return $this->withLink;
+  }
+}
+
+class Google_Service_Drive_PermissionId extends Google_Model
+{
+  public $id;
+  public $kind;
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+}
+
+class Google_Service_Drive_PermissionList extends Google_Collection
+{
+  public $etag;
+  protected $itemsType = 'Google_Service_Drive_Permission';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $selfLink;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_Property extends Google_Model
+{
+  public $etag;
+  public $key;
+  public $kind;
+  public $selfLink;
+  public $value;
+  public $visibility;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setKey($key)
+  {
+    $this->key = $key;
+  }
+
+  public function getKey()
+  {
+    return $this->key;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+
+  public function setValue($value)
+  {
+    $this->value = $value;
+  }
+
+  public function getValue()
+  {
+    return $this->value;
+  }
+
+  public function setVisibility($visibility)
+  {
+    $this->visibility = $visibility;
+  }
+
+  public function getVisibility()
+  {
+    return $this->visibility;
+  }
+}
+
+class Google_Service_Drive_PropertyList extends Google_Collection
+{
+  public $etag;
+  protected $itemsType = 'Google_Service_Drive_Property';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $selfLink;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_Revision extends Google_Model
+{
+  public $downloadUrl;
+  public $etag;
+  public $exportLinks;
+  public $fileSize;
+  public $id;
+  public $kind;
+  protected $lastModifyingUserType = 'Google_Service_Drive_User';
+  protected $lastModifyingUserDataType = '';
+  public $lastModifyingUserName;
+  public $md5Checksum;
+  public $mimeType;
+  public $modifiedDate;
+  public $originalFilename;
+  public $pinned;
+  public $publishAuto;
+  public $published;
+  public $publishedLink;
+  public $publishedOutsideDomain;
+  public $selfLink;
+
+  public function setDownloadUrl($downloadUrl)
+  {
+    $this->downloadUrl = $downloadUrl;
+  }
+
+  public function getDownloadUrl()
+  {
+    return $this->downloadUrl;
+  }
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setExportLinks($exportLinks)
+  {
+    $this->exportLinks = $exportLinks;
+  }
+
+  public function getExportLinks()
+  {
+    return $this->exportLinks;
+  }
+
+  public function setFileSize($fileSize)
+  {
+    $this->fileSize = $fileSize;
+  }
+
+  public function getFileSize()
+  {
+    return $this->fileSize;
+  }
+
+  public function setId($id)
+  {
+    $this->id = $id;
+  }
+
+  public function getId()
+  {
+    return $this->id;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setLastModifyingUser(Google_Service_Drive_User $lastModifyingUser)
+  {
+    $this->lastModifyingUser = $lastModifyingUser;
+  }
+
+  public function getLastModifyingUser()
+  {
+    return $this->lastModifyingUser;
+  }
+
+  public function setLastModifyingUserName($lastModifyingUserName)
+  {
+    $this->lastModifyingUserName = $lastModifyingUserName;
+  }
+
+  public function getLastModifyingUserName()
+  {
+    return $this->lastModifyingUserName;
+  }
+
+  public function setMd5Checksum($md5Checksum)
+  {
+    $this->md5Checksum = $md5Checksum;
+  }
+
+  public function getMd5Checksum()
+  {
+    return $this->md5Checksum;
+  }
+
+  public function setMimeType($mimeType)
+  {
+    $this->mimeType = $mimeType;
+  }
+
+  public function getMimeType()
+  {
+    return $this->mimeType;
+  }
+
+  public function setModifiedDate($modifiedDate)
+  {
+    $this->modifiedDate = $modifiedDate;
+  }
+
+  public function getModifiedDate()
+  {
+    return $this->modifiedDate;
+  }
+
+  public function setOriginalFilename($originalFilename)
+  {
+    $this->originalFilename = $originalFilename;
+  }
+
+  public function getOriginalFilename()
+  {
+    return $this->originalFilename;
+  }
+
+  public function setPinned($pinned)
+  {
+    $this->pinned = $pinned;
+  }
+
+  public function getPinned()
+  {
+    return $this->pinned;
+  }
+
+  public function setPublishAuto($publishAuto)
+  {
+    $this->publishAuto = $publishAuto;
+  }
+
+  public function getPublishAuto()
+  {
+    return $this->publishAuto;
+  }
+
+  public function setPublished($published)
+  {
+    $this->published = $published;
+  }
+
+  public function getPublished()
+  {
+    return $this->published;
+  }
+
+  public function setPublishedLink($publishedLink)
+  {
+    $this->publishedLink = $publishedLink;
+  }
+
+  public function getPublishedLink()
+  {
+    return $this->publishedLink;
+  }
+
+  public function setPublishedOutsideDomain($publishedOutsideDomain)
+  {
+    $this->publishedOutsideDomain = $publishedOutsideDomain;
+  }
+
+  public function getPublishedOutsideDomain()
+  {
+    return $this->publishedOutsideDomain;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_RevisionList extends Google_Collection
+{
+  public $etag;
+  protected $itemsType = 'Google_Service_Drive_Revision';
+  protected $itemsDataType = 'array';
+  public $kind;
+  public $selfLink;
+
+  public function setEtag($etag)
+  {
+    $this->etag = $etag;
+  }
+
+  public function getEtag()
+  {
+    return $this->etag;
+  }
+
+  public function setItems($items)
+  {
+    $this->items = $items;
+  }
+
+  public function getItems()
+  {
+    return $this->items;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setSelfLink($selfLink)
+  {
+    $this->selfLink = $selfLink;
+  }
+
+  public function getSelfLink()
+  {
+    return $this->selfLink;
+  }
+}
+
+class Google_Service_Drive_User extends Google_Model
+{
+  public $displayName;
+  public $isAuthenticatedUser;
+  public $kind;
+  public $permissionId;
+  protected $pictureType = 'Google_Service_Drive_UserPicture';
+  protected $pictureDataType = '';
+
+  public function setDisplayName($displayName)
+  {
+    $this->displayName = $displayName;
+  }
+
+  public function getDisplayName()
+  {
+    return $this->displayName;
+  }
+
+  public function setIsAuthenticatedUser($isAuthenticatedUser)
+  {
+    $this->isAuthenticatedUser = $isAuthenticatedUser;
+  }
+
+  public function getIsAuthenticatedUser()
+  {
+    return $this->isAuthenticatedUser;
+  }
+
+  public function setKind($kind)
+  {
+    $this->kind = $kind;
+  }
+
+  public function getKind()
+  {
+    return $this->kind;
+  }
+
+  public function setPermissionId($permissionId)
+  {
+    $this->permissionId = $permissionId;
+  }
+
+  public function getPermissionId()
+  {
+    return $this->permissionId;
+  }
+
+  public function setPicture(Google_Service_Drive_UserPicture $picture)
+  {
+    $this->picture = $picture;
+  }
+
+  public function getPicture()
+  {
+    return $this->picture;
+  }
+}
+
+class Google_Service_Drive_UserPicture extends Google_Model
+{
+  public $url;
+
+  public function setUrl($url)
+  {
+    $this->url = $url;
+  }
+
+  public function getUrl()
+  {
+    return $this->url;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Exception.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Exception.php
new file mode 100644
index 00000000000..a780ff7b47c
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Exception.php
@@ -0,0 +1,53 @@
+<?php
+
+require_once 'Google/Exception.php';
+
+class Google_Service_Exception extends Google_Exception
+{
+  /**
+   * Optional list of errors returned in a JSON body of an HTTP error response.
+   */
+  protected $errors = array();
+
+  /**
+   * Override default constructor to add ability to set $errors.
+   *
+   * @param string $message
+   * @param int $code
+   * @param Exception|null $previous
+   * @param [{string, string}] errors List of errors returned in an HTTP
+   * response.  Defaults to [].
+   */
+  public function __construct(
+      $message,
+      $code = 0,
+      Exception $previous = null,
+      $errors = array()
+  ) {
+    if (version_compare(PHP_VERSION, '5.3.0') >= 0) {
+      parent::__construct($message, $code, $previous);
+    } else {
+      parent::__construct($message, $code);
+    }
+
+    $this->errors = $errors;
+  }
+
+  /**
+   * An example of the possible errors returned.
+   *
+   * {
+   *   "domain": "global",
+   *   "reason": "authError",
+   *   "message": "Invalid Credentials",
+   *   "locationType": "header",
+   *   "location": "Authorization",
+   * }
+   *
+   * @return [{string, string}] List of errors return in an HTTP response or [].
+   */
+  public function getErrors()
+  {
+    return $this->errors;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Resource.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Resource.php
new file mode 100644
index 00000000000..d396907e1d0
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Resource.php
@@ -0,0 +1,210 @@
+<?php
+/**
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+require_once 'Google/Client.php';
+require_once 'Google/Exception.php';
+require_once 'Google/Utils.php';
+require_once 'Google/Http/Request.php';
+require_once 'Google/Http/MediaFileUpload.php';
+require_once 'Google/Http/REST.php';
+
+/**
+ * Implements the actual methods/resources of the discovered Google API using magic function
+ * calling overloading (__call()), which on call will see if the method name (plus.activities.list)
+ * is available in this service, and if so construct an apiHttpRequest representing it.
+ *
+ * @author Chris Chabot <chabotc@google.com>
+ * @author Chirag Shah <chirags@google.com>
+ *
+ */
+class Google_Service_Resource
+{
+  // Valid query parameters that work, but don't appear in discovery.
+  private $stackParameters = array(
+      'alt' => array('type' => 'string', 'location' => 'query'),
+      'fields' => array('type' => 'string', 'location' => 'query'),
+      'trace' => array('type' => 'string', 'location' => 'query'),
+      'userIp' => array('type' => 'string', 'location' => 'query'),
+      'userip' => array('type' => 'string', 'location' => 'query'),
+      'quotaUser' => array('type' => 'string', 'location' => 'query'),
+      'data' => array('type' => 'string', 'location' => 'body'),
+      'mimeType' => array('type' => 'string', 'location' => 'header'),
+      'uploadType' => array('type' => 'string', 'location' => 'query'),
+      'mediaUpload' => array('type' => 'complex', 'location' => 'query'),
+  );
+
+  /** @var Google_Service $service */
+  private $service;
+
+  /** @var Google_Client $client */
+  private $client;
+
+  /** @var string $serviceName */
+  private $serviceName;
+
+  /** @var string $resourceName */
+  private $resourceName;
+
+  /** @var array $methods */
+  private $methods;
+
+  public function __construct($service, $serviceName, $resourceName, $resource)
+  {
+    $this->service = $service;
+    $this->client = $service->getClient();
+    $this->serviceName = $serviceName;
+    $this->resourceName = $resourceName;
+    $this->methods = isset($resource['methods']) ?
+        $resource['methods'] :
+        array($resourceName => $resource);
+  }
+
+  /**
+   * TODO(ianbarber): This function needs simplifying.
+   * @param $name
+   * @param $arguments
+   * @param $expected_class - optional, the expected class name
+   * @return Google_Http_Request|expected_class
+   * @throws Google_Exception
+   */
+  public function call($name, $arguments, $expected_class = null)
+  {
+    if (! isset($this->methods[$name])) {
+      throw new Google_Exception(
+          "Unknown function: " .
+          "{$this->serviceName}->{$this->resourceName}->{$name}()"
+      );
+    }
+    $method = $this->methods[$name];
+    $parameters = $arguments[0];
+
+    // postBody is a special case since it's not defined in the discovery
+    // document as parameter, but we abuse the param entry for storing it.
+    $postBody = null;
+    if (isset($parameters['postBody'])) {
+      if ($parameters['postBody'] instanceof Google_Model) {
+        // In the cases the post body is an existing object, we want
+        // to use the smart method to create a simple object for
+        // for JSONification.
+        $parameters['postBody'] = $parameters['postBody']->toSimpleObject();
+      } else if (is_object($parameters['postBody'])) {
+        // If the post body is another kind of object, we will try and
+        // wrangle it into a sensible format.
+        $parameters['postBody'] =
+            $this->convertToArrayAndStripNulls($parameters['postBody']);
+      }
+      $postBody = json_encode($parameters['postBody']);
+      unset($parameters['postBody']);
+    }
+
+    // TODO(ianbarber): optParams here probably should have been
+    // handled already - this may well be redundant code.
+    if (isset($parameters['optParams'])) {
+      $optParams = $parameters['optParams'];
+      unset($parameters['optParams']);
+      $parameters = array_merge($parameters, $optParams);
+    }
+
+    if (!isset($method['parameters'])) {
+      $method['parameters'] = array();
+    }
+
+    $method['parameters'] = array_merge(
+        $method['parameters'],
+        $this->stackParameters
+    );
+    foreach ($parameters as $key => $val) {
+      if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
+        throw new Google_Exception("($name) unknown parameter: '$key'");
+      }
+    }
+
+    foreach ($method['parameters'] as $paramName => $paramSpec) {
+      if (isset($paramSpec['required']) &&
+          $paramSpec['required'] &&
+          ! isset($parameters[$paramName])
+      ) {
+        throw new Google_Exception("($name) missing required param: '$paramName'");
+      }
+      if (isset($parameters[$paramName])) {
+        $value = $parameters[$paramName];
+        $parameters[$paramName] = $paramSpec;
+        $parameters[$paramName]['value'] = $value;
+        unset($parameters[$paramName]['required']);
+      } else {
+        // Ensure we don't pass nulls.
+        unset($parameters[$paramName]);
+      }
+    }
+
+    $servicePath = $this->service->servicePath;
+
+    $url = Google_Http_REST::createRequestUri(
+        $servicePath,
+        $method['path'],
+        $parameters
+    );
+    $httpRequest = new Google_Http_Request(
+        $url,
+        $method['httpMethod'],
+        null,
+        $postBody
+    );
+    $httpRequest->setBaseComponent($this->client->getBasePath());
+
+    if ($postBody) {
+      $contentTypeHeader = array();
+      $contentTypeHeader['content-type'] = 'application/json; charset=UTF-8';
+      $httpRequest->setRequestHeaders($contentTypeHeader);
+      $httpRequest->setPostBody($postBody);
+    }
+
+    $httpRequest = $this->client->getAuth()->sign($httpRequest);
+    $httpRequest->setExpectedClass($expected_class);
+
+    if (isset($parameters['data']) &&
+        ($parameters['uploadType']['value'] == 'media' || $parameters['uploadType']['value'] == 'multipart')) {
+      // If we are doing a simple media upload, trigger that as a convenience.
+      $mfu = new Google_Http_MediaFileUpload(
+          $this->client,
+          $httpRequest,
+          isset($parameters['mimeType']) ? $parameters['mimeType']['value'] : 'application/octet-stream',
+          $parameters['data']['value']
+      );
+    }
+
+    if ($this->client->shouldDefer()) {
+      // If we are in batch or upload mode, return the raw request.
+      return $httpRequest;
+    }
+
+    return $this->client->execute($httpRequest);
+  }
+
+  protected function convertToArrayAndStripNulls($o)
+  {
+    $o = (array) $o;
+    foreach ($o as $k => $v) {
+      if ($v === null) {
+        unset($o[$k]);
+      } elseif (is_object($v) || is_array($v)) {
+        $o[$k] = $this->convertToArrayAndStripNulls($o[$k]);
+      }
+    }
+    return $o;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Signer.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/Abstract.php
similarity index 91%
rename from apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Signer.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/Abstract.php
index 7892baac8df..250180920db 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Signer.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/Abstract.php
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-require_once "Google_P12Signer.php";
-
 /**
  * Signs data.
  *
  * @author Brian Eaton <beaton@google.com>
  */
-abstract class Google_Signer {
+abstract class Google_Signer_Abstract
+{
   /**
    * Signs data, returns the signature as binary data.
    */
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_P12Signer.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/P12.php
similarity index 66%
rename from apps/files_external/3rdparty/google-api-php-client/src/auth/Google_P12Signer.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/P12.php
index 1bed5909913..2c9d17927c8 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_P12Signer.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/P12.php
@@ -15,6 +15,9 @@
  * limitations under the License.
  */
 
+require_once 'Google/Auth/Exception.php';
+require_once 'Google/Signer/Abstract.php';
+
 /**
  * Signs data.
  *
@@ -22,48 +25,56 @@
  *
  * @author Brian Eaton <beaton@google.com>
  */
-class Google_P12Signer extends Google_Signer {
+class Google_Signer_P12 extends Google_Signer_Abstract
+{
   // OpenSSL private key resource
   private $privateKey;
 
   // Creates a new signer from a .p12 file.
-  function __construct($p12, $password) {
+  public function __construct($p12, $password)
+  {
     if (!function_exists('openssl_x509_read')) {
-      throw new Exception(
-          'The Google PHP API library needs the openssl PHP extension');
+      throw new Google_Exception(
+          'The Google PHP API library needs the openssl PHP extension'
+      );
     }
 
     // This throws on error
     $certs = array();
     if (!openssl_pkcs12_read($p12, $certs, $password)) {
-      throw new Google_AuthException("Unable to parse the p12 file.  " .
+      throw new Google_Auth_Exception(
+          "Unable to parse the p12 file.  " .
           "Is this a .p12 file?  Is the password correct?  OpenSSL error: " .
-          openssl_error_string());
+          openssl_error_string()
+      );
     }
     // TODO(beaton): is this part of the contract for the openssl_pkcs12_read
     // method?  What happens if there are multiple private keys?  Do we care?
     if (!array_key_exists("pkey", $certs) || !$certs["pkey"]) {
-      throw new Google_AuthException("No private key found in p12 file.");
+      throw new Google_Auth_Exception("No private key found in p12 file.");
     }
     $this->privateKey = openssl_pkey_get_private($certs["pkey"]);
     if (!$this->privateKey) {
-      throw new Google_AuthException("Unable to load private key in ");
+      throw new Google_Auth_Exception("Unable to load private key in ");
     }
   }
 
-  function __destruct() {
+  public function __destruct()
+  {
     if ($this->privateKey) {
       openssl_pkey_free($this->privateKey);
     }
   }
 
-  function sign($data) {
-    if(version_compare(PHP_VERSION, '5.3.0') < 0) {
-      throw new Google_AuthException(
-        "PHP 5.3.0 or higher is required to use service accounts.");
+  public function sign($data)
+  {
+    if (version_compare(PHP_VERSION, '5.3.0') < 0) {
+      throw new Google_Auth_Exception(
+          "PHP 5.3.0 or higher is required to use service accounts."
+      );
     }
     if (!openssl_sign($data, $signature, $this->privateKey, "sha256")) {
-      throw new Google_AuthException("Unable to sign data");
+      throw new Google_Auth_Exception("Unable to sign data");
     }
     return $signature;
   }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Utils.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils.php
similarity index 79%
rename from apps/files_external/3rdparty/google-api-php-client/src/service/Google_Utils.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Utils.php
index be94902c2ed..a991066f2d9 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Utils.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils.php
@@ -21,25 +21,33 @@
  *
  * @author Chirag Shah <chirags@google.com>
  */
-class Google_Utils {
-  public static function urlSafeB64Encode($data) {
+class Google_Utils
+{
+  public static function urlSafeB64Encode($data)
+  {
     $b64 = base64_encode($data);
-    $b64 = str_replace(array('+', '/', '\r', '\n', '='),
-                       array('-', '_'),
-                       $b64);
+    $b64 = str_replace(
+        array('+', '/', '\r', '\n', '='),
+        array('-', '_'),
+        $b64
+    );
     return $b64;
   }
 
-  public static function urlSafeB64Decode($b64) {
-    $b64 = str_replace(array('-', '_'),
-                       array('+', '/'),
-                       $b64);
+  public static function urlSafeB64Decode($b64)
+  {
+    $b64 = str_replace(
+        array('-', '_'),
+        array('+', '/'),
+        $b64
+    );
     return base64_decode($b64);
   }
 
   /**
-   * Misc function used to count the number of bytes in a post body, in the world of multi-byte chars
-   * and the unpredictability of strlen/mb_strlen/sizeof, this is the only way to do that in a sane
+   * Misc function used to count the number of bytes in a post body, in the
+   * world of multi-byte chars and the unpredictability of 
+   * strlen/mb_strlen/sizeof, this is the only way to do that in a sane
    * manner at the moment.
    *
    * This algorithm was originally developed for the
@@ -51,7 +59,8 @@ class Google_Utils {
    * @param  string $str
    * @return int The number of bytes in a string.
    */
-  static public function getStrLen($str) {
+  public static function getStrLen($str)
+  {
     $strlenVar = strlen($str);
     $d = $ret = 0;
     for ($count = 0; $count < $strlenVar; ++ $count) {
@@ -61,31 +70,26 @@ class Google_Utils {
           // characters U-00000000 - U-0000007F (same as ASCII)
           $ret ++;
           break;
-
         case (($ordinalValue & 0xE0) == 0xC0):
           // characters U-00000080 - U-000007FF, mask 110XXXXX
           // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
           $ret += 2;
           break;
-
         case (($ordinalValue & 0xF0) == 0xE0):
           // characters U-00000800 - U-0000FFFF, mask 1110XXXX
           // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
           $ret += 3;
           break;
-
         case (($ordinalValue & 0xF8) == 0xF0):
           // characters U-00010000 - U-001FFFFF, mask 11110XXX
           // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
           $ret += 4;
           break;
-
         case (($ordinalValue & 0xFC) == 0xF8):
           // characters U-00200000 - U-03FFFFFF, mask 111110XX
           // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
           $ret += 5;
           break;
-
         case (($ordinalValue & 0xFE) == 0xFC):
           // characters U-04000000 - U-7FFFFFFF, mask 1111110X
           // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8
@@ -103,7 +107,8 @@ class Google_Utils {
    * @param array $arr
    * @return array Normalized array.
    */
-  public static function normalize($arr) {
+  public static function normalize($arr)
+  {
     if (!is_array($arr)) {
       return array();
     }
@@ -114,4 +119,15 @@ class Google_Utils {
     }
     return $normalized;
   }
-}
\ No newline at end of file
+
+  /**
+   * Convert a string to camelCase
+   * @param  string $value
+   * @return string
+   */
+  public static function camelCase($value)
+  {
+    $value = ucwords(str_replace(array('-', '_'), ' ', $value));
+    return lcfirst(str_replace(' ', '', $value));
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php
new file mode 100644
index 00000000000..fee56725dab
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php
@@ -0,0 +1,333 @@
+<?php
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Implementation of levels 1-3 of the URI Template spec. 
+ * @see http://tools.ietf.org/html/rfc6570
+ */
+class Google_Utils_URITemplate
+{
+  const TYPE_MAP = "1";
+  const TYPE_LIST = "2";
+  const TYPE_SCALAR = "4";
+
+  /**
+   * @var $operators array 
+   * These are valid at the start of a template block to
+   * modify the way in which the variables inside are
+   * processed.
+   */
+  private $operators = array(
+      "+" => "reserved",
+      "/" => "segments",
+      "." => "dotprefix",
+      "#" => "fragment",
+      ";" => "semicolon",
+      "?" => "form",
+      "&" => "continuation"
+  );
+
+  /**
+   * @var reserved array
+   * These are the characters which should not be URL encoded in reserved
+   * strings.
+   */
+  private $reserved = array(
+      "=", ",", "!", "@", "|", ":", "/", "?", "#",
+      "[", "]","$", "&", "'", "(", ")", "*", "+", ";"
+  );
+  private $reservedEncoded = array(
+    "%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
+    "%23", "%5B", "%5D", "%24", "%26", "%27", "%28", "%29",
+    "%2A", "%2B", "%3B"
+  );
+
+  public function parse($string, array $parameters)
+  {
+    return $this->resolveNextSection($string, $parameters);
+  }
+
+  /**
+   * This function finds the first matching {...} block and
+   * executes the replacement. It then calls itself to find
+   * subsequent blocks, if any. 
+   */
+  private function resolveNextSection($string, $parameters)
+  {
+    $start = strpos($string, "{");
+    if ($start === false) {
+      return $string;
+    }
+    $end = strpos($string, "}");
+    if ($end === false) {
+      return $string;
+    }
+    $string = $this->replace($string, $start, $end, $parameters);
+    return $this->resolveNextSection($string, $parameters);
+  }
+
+  private function replace($string, $start, $end, $parameters)
+  {
+    // We know a data block will have {} round it, so we can strip that.
+    $data = substr($string, $start + 1, $end - $start - 1);
+
+    // If the first character is one of the reserved operators, it effects
+    // the processing of the stream.
+    if (isset($this->operators[$data[0]])) {
+      $op = $this->operators[$data[0]];
+      $data = substr($data, 1);
+      $prefix = "";
+      $prefix_on_missing = false;
+
+      switch ($op) {
+        case "reserved":
+          // Reserved means certain characters should not be URL encoded
+          $data = $this->replaceVars($data, $parameters, ",", null, true);
+          break;
+        case "fragment":
+          // Comma separated with fragment prefix. Bare values only.
+          $prefix = "#";
+          $prefix_on_missing = true;
+          $data = $this->replaceVars($data, $parameters, ",", null, true);
+          break;
+        case "segments":
+          // Slash separated data. Bare values only.
+          $prefix = "/";
+          $data =$this->replaceVars($data, $parameters, "/");
+          break;
+        case "dotprefix":
+          // Dot separated data. Bare values only.
+          $prefix = ".";
+          $prefix_on_missing = true;
+          $data = $this->replaceVars($data, $parameters, ".");
+          break;
+        case "semicolon":
+          // Semicolon prefixed and separated. Uses the key name
+          $prefix = ";";
+          $data = $this->replaceVars($data, $parameters, ";", "=", false, true, false);
+          break;
+        case "form":
+          // Standard URL format. Uses the key name
+          $prefix = "?";
+          $data = $this->replaceVars($data, $parameters, "&", "=");
+          break;
+        case "continuation":
+          // Standard URL, but with leading ampersand. Uses key name.
+          $prefix = "&";
+          $data = $this->replaceVars($data, $parameters, "&", "=");
+          break;
+      }
+
+      // Add the initial prefix character if data is valid.
+      if ($data || ($data !== false && $prefix_on_missing)) {
+        $data = $prefix . $data;
+      }
+
+    } else {
+      // If no operator we replace with the defaults.
+      $data = $this->replaceVars($data, $parameters);
+    }
+    // This is chops out the {...} and replaces with the new section.
+    return substr($string, 0, $start) . $data . substr($string, $end + 1);
+  }
+
+  private function replaceVars(
+      $section,
+      $parameters,
+      $sep = ",",
+      $combine = null,
+      $reserved = false,
+      $tag_empty = false,
+      $combine_on_empty = true
+  ) {
+    if (strpos($section, ",") === false) {
+      // If we only have a single value, we can immediately process.
+      return $this->combine(
+          $section,
+          $parameters,
+          $sep,
+          $combine,
+          $reserved,
+          $tag_empty,
+          $combine_on_empty
+      );
+    } else {
+      // If we have multiple values, we need to split and loop over them.
+      // Each is treated individually, then glued together with the
+      // separator character.
+      $vars = explode(",", $section);
+      return $this->combineList(
+          $vars,
+          $sep,
+          $parameters,
+          $combine,
+          $reserved,
+          false, // Never emit empty strings in multi-param replacements
+          $combine_on_empty
+      );
+    }
+  }
+ 
+  public function combine(
+      $key,
+      $parameters,
+      $sep,
+      $combine,
+      $reserved,
+      $tag_empty,
+      $combine_on_empty
+  ) {
+    $length = false;
+    $explode = false;
+    $skip_final_combine = false;
+    $value = false;
+
+    // Check for length restriction.
+    if (strpos($key, ":") !== false) {
+      list($key, $length) = explode(":", $key);
+    }
+    
+    // Check for explode parameter.
+    if ($key[strlen($key) - 1] == "*") {
+      $explode = true;
+      $key = substr($key, 0, -1);
+      $skip_final_combine = true;
+    }
+    
+    // Define the list separator.
+    $list_sep = $explode ? $sep : ",";
+    
+    if (isset($parameters[$key])) {
+      $data_type = $this->getDataType($parameters[$key]);
+      switch($data_type) {
+        case self::TYPE_SCALAR:
+          $value = $this->getValue($parameters[$key], $length);
+          break;
+        case self::TYPE_LIST:
+          $values = array();
+          foreach ($parameters[$key] as $pkey => $pvalue) {
+            $pvalue = $this->getValue($pvalue, $length);
+            if ($combine && $explode) {
+              $values[$pkey] = $key . $combine . $pvalue;
+            } else {
+              $values[$pkey] = $pvalue;
+            }
+          }
+          $value = implode($list_sep, $values);
+          if ($value == '') {
+            return '';
+          }
+          break;
+        case self::TYPE_MAP:
+          $values = array();
+          foreach ($parameters[$key] as $pkey => $pvalue) {
+            $pvalue = $this->getValue($pvalue, $length);
+            if ($explode) {
+              $pkey = $this->getValue($pkey, $length);
+              $values[] = $pkey . "=" . $pvalue; // Explode triggers = combine.
+            } else {
+              $values[] = $pkey;
+              $values[] = $pvalue;
+            }
+          }
+          $value = implode($list_sep, $values);
+          if ($value == '') {
+            return false;
+          }
+          break;
+      }
+    } else if ($tag_empty) {
+      // If we are just indicating empty values with their key name, return that.
+      return $key;
+    } else {
+      // Otherwise we can skip this variable due to not being defined.
+      return false;
+    }
+
+    if ($reserved) {
+      $value = str_replace($this->reservedEncoded, $this->reserved, $value);
+    }
+
+    // If we do not need to include the key name, we just return the raw
+    // value.
+    if (!$combine || $skip_final_combine) {
+      return $value;
+    }
+        
+    // Else we combine the key name: foo=bar, if value is not the empty string.
+    return $key . ($value != '' || $combine_on_empty ? $combine . $value : '');
+  }
+  
+  /**
+   * Return the type of a passed in value
+   */
+  private function getDataType($data)
+  {
+    if (is_array($data)) {
+      reset($data);
+      if (key($data) !== 0) {
+        return self::TYPE_MAP;
+      }
+      return self::TYPE_LIST;
+    }
+    return self::TYPE_SCALAR;
+  }
+  
+  /**
+   * Utility function that merges multiple combine calls
+   * for multi-key templates.
+   */
+  private function combineList(
+      $vars,
+      $sep,
+      $parameters,
+      $combine,
+      $reserved,
+      $tag_empty,
+      $combine_on_empty
+  ) {
+    $ret = array();
+    foreach ($vars as $var) {
+      $response = $this->combine(
+          $var,
+          $parameters,
+          $sep,
+          $combine,
+          $reserved,
+          $tag_empty,
+          $combine_on_empty
+      );
+      if ($response === false) {
+        continue;
+      }
+      $ret[] = $response;
+    }
+    return implode($sep, $ret);
+  }
+  
+  /**
+   * Utility function to encode and trim values
+   */
+  private function getValue($value, $length)
+  {
+    if ($length) {
+      $value = substr($value, 0, $length);
+    }
+    $value = rawurlencode($value);
+    return $value;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Verifier.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Abstract.php
similarity index 91%
rename from apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Verifier.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Abstract.php
index 2839a371df1..e6c9eeb03cc 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_Verifier.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Abstract.php
@@ -15,14 +15,13 @@
  * limitations under the License.
  */
 
-require_once "Google_PemVerifier.php";
-
 /**
  * Verifies signatures.
  *
  * @author Brian Eaton <beaton@google.com>
  */
-abstract class Google_Verifier {
+abstract class Google_Verifier_Abstract
+{
   /**
    * Checks a signature, returns true if the signature is correct,
    * false otherwise.
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_PemVerifier.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Pem.php
similarity index 75%
rename from apps/files_external/3rdparty/google-api-php-client/src/auth/Google_PemVerifier.php
rename to apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Pem.php
index 6c1c85fa20e..8b4d1ab1640 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_PemVerifier.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Pem.php
@@ -14,13 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+ 
+require_once 'Google/Auth/Exception.php';
+require_once 'Google/Verifier/Abstract.php';
 
 /**
  * Verifies signatures using PEM encoded certificates.
  *
  * @author Brian Eaton <beaton@google.com>
  */
-class Google_PemVerifier extends Google_Verifier {
+class Google_Verifier_Pem extends Google_Verifier_Abstract
+{
   private $publicKey;
 
   /**
@@ -28,20 +32,22 @@ class Google_PemVerifier extends Google_Verifier {
    *
    * $pem: a PEM encoded certificate (not a file).
    * @param $pem
-   * @throws Google_AuthException
+   * @throws Google_Auth_Exception
    * @throws Google_Exception
    */
-  function __construct($pem) {
+  public function __construct($pem)
+  {
     if (!function_exists('openssl_x509_read')) {
       throw new Google_Exception('Google API PHP client needs the openssl PHP extension');
     }
     $this->publicKey = openssl_x509_read($pem);
     if (!$this->publicKey) {
-      throw new Google_AuthException("Unable to parse PEM: $pem");
+      throw new Google_Auth_Exception("Unable to parse PEM: $pem");
     }
   }
 
-  function __destruct() {
+  public function __destruct()
+  {
     if ($this->publicKey) {
       openssl_x509_free($this->publicKey);
     }
@@ -53,13 +59,14 @@ class Google_PemVerifier extends Google_Verifier {
    * Returns true if the signature is valid, false otherwise.
    * @param $data
    * @param $signature
-   * @throws Google_AuthException
+   * @throws Google_Auth_Exception
    * @return bool
    */
-  function verify($data, $signature) {
+  public function verify($data, $signature)
+  {
     $status = openssl_verify($data, $signature, $this->publicKey, "sha256");
     if ($status === -1) {
-      throw new Google_AuthException('Signature verification error: ' . openssl_error_string());
+      throw new Google_Auth_Exception('Signature verification error: ' . openssl_error_string());
     }
     return $status === 1;
   }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google_Client.php b/apps/files_external/3rdparty/google-api-php-client/src/Google_Client.php
deleted file mode 100644
index 498d3a8e9dd..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google_Client.php
+++ /dev/null
@@ -1,462 +0,0 @@
-<?php
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Check for the required json and curl extensions, the Google APIs PHP Client
-// won't function without them.
-if (! function_exists('curl_init')) {
-  throw new Exception('Google PHP API Client requires the CURL PHP extension');
-}
-
-if (! function_exists('json_decode')) {
-  throw new Exception('Google PHP API Client requires the JSON PHP extension');
-}
-
-if (! function_exists('http_build_query')) {
-  throw new Exception('Google PHP API Client requires http_build_query()');
-}
-
-if (! ini_get('date.timezone') && function_exists('date_default_timezone_set')) {
-  date_default_timezone_set('UTC');
-}
-
-// hack around with the include paths a bit so the library 'just works'
-set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
-
-require_once "config.php";
-// If a local configuration file is found, merge it's values with the default configuration
-if (file_exists(dirname(__FILE__)  . '/local_config.php')) {
-  $defaultConfig = $apiConfig;
-  require_once (dirname(__FILE__)  . '/local_config.php');
-  $apiConfig = array_merge($defaultConfig, $apiConfig);
-}
-
-// Include the top level classes, they each include their own dependencies
-require_once 'service/Google_Model.php';
-require_once 'service/Google_Service.php';
-require_once 'service/Google_ServiceResource.php';
-require_once 'auth/Google_AssertionCredentials.php';
-require_once 'auth/Google_Signer.php';
-require_once 'auth/Google_P12Signer.php';
-require_once 'service/Google_BatchRequest.php';
-require_once 'external/URITemplateParser.php';
-require_once 'auth/Google_Auth.php';
-require_once 'cache/Google_Cache.php';
-require_once 'io/Google_IO.php';
-require_once('service/Google_MediaFileUpload.php');
-
-/**
- * The Google API Client
- * http://code.google.com/p/google-api-php-client/
- *
- * @author Chris Chabot <chabotc@google.com>
- * @author Chirag Shah <chirags@google.com>
- */
-class Google_Client {
-  /**
-   * @static
-   * @var Google_Auth $auth
-   */
-  static $auth;
-
-  /**
-   * @static
-   * @var Google_IO $io
-   */
-  static $io;
-
-  /**
-   * @static
-   * @var Google_Cache $cache
-   */
-  static $cache;
-
-  /**
-   * @static
-   * @var boolean $useBatch
-   */
-  static $useBatch = false;
-
-  /** @var array $scopes */
-  protected $scopes = array();
-
-  /** @var bool $useObjects */
-  protected $useObjects = false;
-
-  // definitions of services that are discovered.
-  protected $services = array();
-
-  // Used to track authenticated state, can't discover services after doing authenticate()
-  private $authenticated = false;
-
-  public function __construct($config = array()) {
-    global $apiConfig;
-    $apiConfig = array_merge($apiConfig, $config);
-    self::$cache = new $apiConfig['cacheClass']();
-    self::$auth = new $apiConfig['authClass']();
-    self::$io = new $apiConfig['ioClass']();
-  }
-
-  /**
-   * Add a service
-   */
-  public function addService($service, $version = false) {
-    global $apiConfig;
-    if ($this->authenticated) {
-      throw new Google_Exception('Cant add services after having authenticated');
-    }
-    $this->services[$service] = array();
-    if (isset($apiConfig['services'][$service])) {
-      // Merge the service descriptor with the default values
-      $this->services[$service] = array_merge($this->services[$service], $apiConfig['services'][$service]);
-    }
-  }
-
-  public function authenticate($code = null) {
-    $service = $this->prepareService();
-    $this->authenticated = true;
-    return self::$auth->authenticate($service, $code);
-  }
-
-  /**
-   * @return array
-   * @visible For Testing
-   */
-  public function prepareService() {
-    $service = array();
-    $scopes = array();
-    if ($this->scopes) {
-      $scopes = $this->scopes;
-    } else {
-      foreach ($this->services as $key => $val) {
-        if (isset($val['scope'])) {
-          if (is_array($val['scope'])) {
-            $scopes = array_merge($val['scope'], $scopes);
-          } else {
-            $scopes[] = $val['scope'];
-          }
-        } else {
-          $scopes[] = 'https://www.googleapis.com/auth/' . $key;
-        }
-        unset($val['discoveryURI']);
-        unset($val['scope']);
-        $service = array_merge($service, $val);
-      }
-    }
-    $service['scope'] = implode(' ', $scopes);
-    return $service;
-  }
-
-  /**
-   * Set the OAuth 2.0 access token using the string that resulted from calling authenticate()
-   * or Google_Client#getAccessToken().
-   * @param string $accessToken JSON encoded string containing in the following format:
-   * {"access_token":"TOKEN", "refresh_token":"TOKEN", "token_type":"Bearer",
-   *  "expires_in":3600, "id_token":"TOKEN", "created":1320790426}
-   */
-  public function setAccessToken($accessToken) {
-    if ($accessToken == null || 'null' == $accessToken) {
-      $accessToken = null;
-    }
-    self::$auth->setAccessToken($accessToken);
-  }
-
-  /**
-   * Set the type of Auth class the client should use.
-   * @param string $authClassName
-   */
-  public function setAuthClass($authClassName) {
-    self::$auth = new $authClassName();
-  }
-
-  /**
-   * Construct the OAuth 2.0 authorization request URI.
-   * @return string
-   */
-  public function createAuthUrl() {
-    $service = $this->prepareService();
-    return self::$auth->createAuthUrl($service['scope']);
-  }
-
-  /**
-   * Get the OAuth 2.0 access token.
-   * @return string $accessToken JSON encoded string in the following format:
-   * {"access_token":"TOKEN", "refresh_token":"TOKEN", "token_type":"Bearer",
-   *  "expires_in":3600,"id_token":"TOKEN", "created":1320790426}
-   */
-  public function getAccessToken() {
-    $token = self::$auth->getAccessToken();
-    return (null == $token || 'null' == $token) ? null : $token;
-  }
-
-  /**
-   * Returns if the access_token is expired.
-   * @return bool Returns True if the access_token is expired.
-   */
-  public function isAccessTokenExpired() {
-    return self::$auth->isAccessTokenExpired();
-  }
-
-  /**
-   * Set the developer key to use, these are obtained through the API Console.
-   * @see http://code.google.com/apis/console-help/#generatingdevkeys
-   * @param string $developerKey
-   */
-  public function setDeveloperKey($developerKey) {
-    self::$auth->setDeveloperKey($developerKey);
-  }
-
-  /**
-   * Set OAuth 2.0 "state" parameter to achieve per-request customization.
-   * @see http://tools.ietf.org/html/draft-ietf-oauth-v2-22#section-3.1.2.2
-   * @param string $state
-   */
-  public function setState($state) {
-    self::$auth->setState($state);
-  }
-
-  /**
-   * @param string $accessType Possible values for access_type include:
-   *  {@code "offline"} to request offline access from the user. (This is the default value)
-   *  {@code "online"} to request online access from the user.
-   */
-  public function setAccessType($accessType) {
-    self::$auth->setAccessType($accessType);
-  }
-
-  /**
-   * @param string $approvalPrompt Possible values for approval_prompt include:
-   *  {@code "force"} to force the approval UI to appear. (This is the default value)
-   *  {@code "auto"} to request auto-approval when possible.
-   */
-  public function setApprovalPrompt($approvalPrompt) {
-    self::$auth->setApprovalPrompt($approvalPrompt);
-  }
-
-  /**
-   * Set the application name, this is included in the User-Agent HTTP header.
-   * @param string $applicationName
-   */
-  public function setApplicationName($applicationName) {
-    global $apiConfig;
-    $apiConfig['application_name'] = $applicationName;
-  }
-
-  /**
-   * Set the OAuth 2.0 Client ID.
-   * @param string $clientId
-   */
-  public function setClientId($clientId) {
-    global $apiConfig;
-    $apiConfig['oauth2_client_id'] = $clientId;
-    self::$auth->clientId = $clientId;
-  }
-
-  /**
-   * Get the OAuth 2.0 Client ID.
-   */
-  public function getClientId() {
-    return self::$auth->clientId;
-  }
-
-  /**
-   * Set the OAuth 2.0 Client Secret.
-   * @param string $clientSecret
-   */
-  public function setClientSecret($clientSecret) {
-    global $apiConfig;
-    $apiConfig['oauth2_client_secret'] = $clientSecret;
-    self::$auth->clientSecret = $clientSecret;
-  }
-
-  /**
-   * Get the OAuth 2.0 Client Secret.
-   */
-  public function getClientSecret() {
-    return self::$auth->clientSecret;
-  }
-
-  /**
-   * Set the OAuth 2.0 Redirect URI.
-   * @param string $redirectUri
-   */
-  public function setRedirectUri($redirectUri) {
-    global $apiConfig;
-    $apiConfig['oauth2_redirect_uri'] = $redirectUri;
-    self::$auth->redirectUri = $redirectUri;
-  }
-
-  /**
-   * Get the OAuth 2.0 Redirect URI.
-   */
-  public function getRedirectUri() {
-    return self::$auth->redirectUri;
-  }
-
-  /**
-   * Fetches a fresh OAuth 2.0 access token with the given refresh token.
-   * @param string $refreshToken
-   * @return void
-   */
-  public function refreshToken($refreshToken) {
-    self::$auth->refreshToken($refreshToken);
-  }
-
-  /**
-   * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
-   * token, if a token isn't provided.
-   * @throws Google_AuthException
-   * @param string|null $token The token (access token or a refresh token) that should be revoked.
-   * @return boolean Returns True if the revocation was successful, otherwise False.
-   */
-  public function revokeToken($token = null) {
-    self::$auth->revokeToken($token);
-  }
-
-  /**
-   * Verify an id_token. This method will verify the current id_token, if one
-   * isn't provided.
-   * @throws Google_AuthException
-   * @param string|null $token The token (id_token) that should be verified.
-   * @return Google_LoginTicket Returns an apiLoginTicket if the verification was
-   * successful.
-   */
-  public function verifyIdToken($token = null) {
-    return self::$auth->verifyIdToken($token);
-  }
-
-  /**
-   * @param Google_AssertionCredentials $creds
-   * @return void
-   */
-  public function setAssertionCredentials(Google_AssertionCredentials $creds) {
-    self::$auth->setAssertionCredentials($creds);
-  }
-
-  /**
-   * This function allows you to overrule the automatically generated scopes,
-   * so that you can ask for more or less permission in the auth flow
-   * Set this before you call authenticate() though!
-   * @param array $scopes, ie: array('https://www.googleapis.com/auth/plus.me', 'https://www.googleapis.com/auth/moderator')
-   */
-  public function setScopes($scopes) {
-    $this->scopes = is_string($scopes) ? explode(" ", $scopes) : $scopes;
-  }
-
-  /**
-   * Returns the list of scopes set on the client
-   * @return array the list of scopes
-   *
-   */
-  public function getScopes() {
-     return $this->scopes;
-  }
-
-  /**
-   * Declare if objects should be returned by the api service classes.
-   *
-   * @param boolean $useObjects True if objects should be returned by the service classes.
-   * False if associative arrays should be returned (default behavior).
-   * @experimental
-   */
-  public function setUseObjects($useObjects) {
-    global $apiConfig;
-    $apiConfig['use_objects'] = $useObjects;
-  }
-
-  /**
-   * Declare if objects should be returned by the api service classes.
-   *
-   * @param boolean $useBatch True if the experimental batch support should
-   * be enabled. Defaults to False.
-   * @experimental
-   */
-  public function setUseBatch($useBatch) {
-    self::$useBatch = $useBatch;
-  }
-
-  /**
-   * @static
-   * @return Google_Auth the implementation of apiAuth.
-   */
-  public static function getAuth() {
-    return Google_Client::$auth;
-  }
-
-  /**
-   * @static
-   * @return Google_IO the implementation of apiIo.
-   */
-  public static function getIo() {
-    return Google_Client::$io;
-  }
-
-  /**
-   * @return Google_Cache the implementation of apiCache.
-   */
-  public function getCache() {
-    return Google_Client::$cache;
-  }
-}
-
-// Exceptions that the Google PHP API Library can throw
-class Google_Exception extends Exception {}
-class Google_AuthException extends Google_Exception {}
-class Google_CacheException extends Google_Exception {}
-class Google_IOException extends Google_Exception {}
-class Google_ServiceException extends Google_Exception {
-  /**
-   * Optional list of errors returned in a JSON body of an HTTP error response.
-   */
-  protected $errors = array();
-
-  /**
-   * Override default constructor to add ability to set $errors.
-   *
-   * @param string $message
-   * @param int $code
-   * @param Exception|null $previous
-   * @param [{string, string}] errors List of errors returned in an HTTP
-   * response.  Defaults to [].
-   */
-  public function __construct($message, $code = 0, Exception $previous = null,
-                              $errors = array()) {
-    if(version_compare(PHP_VERSION, '5.3.0') >= 0) {
-      parent::__construct($message, $code, $previous);
-    } else {
-      parent::__construct($message, $code);
-    }
-
-    $this->errors = $errors;
-  }
-
-  /**
-   * An example of the possible errors returned.
-   *
-   * {
-   *   "domain": "global",
-   *   "reason": "authError",
-   *   "message": "Invalid Credentials",
-   *   "locationType": "header",
-   *   "location": "Authorization",
-   * }
-   *
-   * @return [{string, string}] List of errors return in an HTTP response or [].
-   */
-  public function getErrors() {
-    return $this->errors;
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AuthNone.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AuthNone.php
deleted file mode 100644
index 6ca6bc2b0db..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_AuthNone.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Do-nothing authentication implementation, use this if you want to make un-authenticated calls
- * @author Chris Chabot <chabotc@google.com>
- * @author Chirag Shah <chirags@google.com>
- */
-class Google_AuthNone extends Google_Auth {
-  public $key = null;
-
-  public function __construct() {
-    global $apiConfig;
-    if (!empty($apiConfig['developer_key'])) {
-      $this->setDeveloperKey($apiConfig['developer_key']);
-    }
-  }
-
-  public function setDeveloperKey($key) {$this->key = $key;}
-  public function authenticate($service) {/*noop*/}
-  public function setAccessToken($accessToken) {/* noop*/}
-  public function getAccessToken() {return null;}
-  public function createAuthUrl($scope) {return null;}
-  public function refreshToken($refreshToken) {/* noop*/}
-  public function revokeToken() {/* noop*/}
-
-  public function sign(Google_HttpRequest $request) {
-    if ($this->key) {
-      $request->setUrl($request->getUrl() . ((strpos($request->getUrl(), '?') === false) ? '?' : '&')
-          . 'key='.urlencode($this->key));
-    }
-    return $request;
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_OAuth2.php b/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_OAuth2.php
deleted file mode 100644
index a07d4365a7a..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/auth/Google_OAuth2.php
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-require_once "Google_Verifier.php";
-require_once "Google_LoginTicket.php";
-require_once "service/Google_Utils.php";
-
-/**
- * Authentication class that deals with the OAuth 2 web-server authentication flow
- *
- * @author Chris Chabot <chabotc@google.com>
- * @author Chirag Shah <chirags@google.com>
- *
- */
-class Google_OAuth2 extends Google_Auth {
-  public $clientId;
-  public $clientSecret;
-  public $developerKey;
-  public $token;
-  public $redirectUri;
-  public $state;
-  public $accessType = 'offline';
-  public $approvalPrompt = 'force';
-
-  /** @var Google_AssertionCredentials $assertionCredentials */
-  public $assertionCredentials;
-
-  const OAUTH2_REVOKE_URI = 'https://accounts.google.com/o/oauth2/revoke';
-  const OAUTH2_TOKEN_URI = 'https://accounts.google.com/o/oauth2/token';
-  const OAUTH2_AUTH_URL = 'https://accounts.google.com/o/oauth2/auth';
-  const OAUTH2_FEDERATED_SIGNON_CERTS_URL = 'https://www.googleapis.com/oauth2/v1/certs';
-  const CLOCK_SKEW_SECS = 300; // five minutes in seconds
-  const AUTH_TOKEN_LIFETIME_SECS = 300; // five minutes in seconds
-  const MAX_TOKEN_LIFETIME_SECS = 86400; // one day in seconds
-
-  /**
-   * Instantiates the class, but does not initiate the login flow, leaving it
-   * to the discretion of the caller (which is done by calling authenticate()).
-   */
-  public function __construct() {
-    global $apiConfig;
-
-    if (! empty($apiConfig['developer_key'])) {
-      $this->developerKey = $apiConfig['developer_key'];
-    }
-
-    if (! empty($apiConfig['oauth2_client_id'])) {
-      $this->clientId = $apiConfig['oauth2_client_id'];
-    }
-
-    if (! empty($apiConfig['oauth2_client_secret'])) {
-      $this->clientSecret = $apiConfig['oauth2_client_secret'];
-    }
-
-    if (! empty($apiConfig['oauth2_redirect_uri'])) {
-      $this->redirectUri = $apiConfig['oauth2_redirect_uri'];
-    }
-
-    if (! empty($apiConfig['oauth2_access_type'])) {
-      $this->accessType = $apiConfig['oauth2_access_type'];
-    }
-
-    if (! empty($apiConfig['oauth2_approval_prompt'])) {
-      $this->approvalPrompt = $apiConfig['oauth2_approval_prompt'];
-    }
-
-  }
-
-  /**
-   * @param $service
-   * @param string|null $code
-   * @throws Google_AuthException
-   * @return string
-   */
-  public function authenticate($service, $code = null) {
-    if (!$code && isset($_GET['code'])) {
-      $code = $_GET['code'];
-    }
-
-    if ($code) {
-      // We got here from the redirect from a successful authorization grant, fetch the access token
-      $request = Google_Client::$io->makeRequest(new Google_HttpRequest(self::OAUTH2_TOKEN_URI, 'POST', array(), array(
-          'code' => $code,
-          'grant_type' => 'authorization_code',
-          'redirect_uri' => $this->redirectUri,
-          'client_id' => $this->clientId,
-          'client_secret' => $this->clientSecret
-      )));
-
-      if ($request->getResponseHttpCode() == 200) {
-        $this->setAccessToken($request->getResponseBody());
-        $this->token['created'] = time();
-        return $this->getAccessToken();
-      } else {
-        $response = $request->getResponseBody();
-        $decodedResponse = json_decode($response, true);
-        if ($decodedResponse != null && $decodedResponse['error']) {
-          $response = $decodedResponse['error'];
-        }
-        throw new Google_AuthException("Error fetching OAuth2 access token, message: '$response'", $request->getResponseHttpCode());
-      }
-    }
-
-    $authUrl = $this->createAuthUrl($service['scope']);
-    header('Location: ' . $authUrl);
-    return true;
-  }
-
-  /**
-   * Create a URL to obtain user authorization.
-   * The authorization endpoint allows the user to first
-   * authenticate, and then grant/deny the access request.
-   * @param string $scope The scope is expressed as a list of space-delimited strings.
-   * @return string
-   */
-  public function createAuthUrl($scope) {
-    $params = array(
-        'response_type=code',
-        'redirect_uri=' . urlencode($this->redirectUri),
-        'client_id=' . urlencode($this->clientId),
-        'scope=' . urlencode($scope),
-        'access_type=' . urlencode($this->accessType),
-        'approval_prompt=' . urlencode($this->approvalPrompt),
-    );
-
-    if (isset($this->state)) {
-      $params[] = 'state=' . urlencode($this->state);
-    }
-    $params = implode('&', $params);
-    return self::OAUTH2_AUTH_URL . "?$params";
-  }
-
-  /**
-   * @param string $token
-   * @throws Google_AuthException
-   */
-  public function setAccessToken($token) {
-    $token = json_decode($token, true);
-    if ($token == null) {
-      throw new Google_AuthException('Could not json decode the token');
-    }
-    if (! isset($token['access_token'])) {
-      throw new Google_AuthException("Invalid token format");
-    }
-    $this->token = $token;
-  }
-
-  public function getAccessToken() {
-    return json_encode($this->token);
-  }
-
-  public function setDeveloperKey($developerKey) {
-    $this->developerKey = $developerKey;
-  }
-
-  public function setState($state) {
-    $this->state = $state;
-  }
-
-  public function setAccessType($accessType) {
-    $this->accessType = $accessType;
-  }
-
-  public function setApprovalPrompt($approvalPrompt) {
-    $this->approvalPrompt = $approvalPrompt;
-  }
-
-  public function setAssertionCredentials(Google_AssertionCredentials $creds) {
-    $this->assertionCredentials = $creds;
-  }
-
-  /**
-   * Include an accessToken in a given apiHttpRequest.
-   * @param Google_HttpRequest $request
-   * @return Google_HttpRequest
-   * @throws Google_AuthException
-   */
-  public function sign(Google_HttpRequest $request) {
-    // add the developer key to the request before signing it
-    if ($this->developerKey) {
-      $requestUrl = $request->getUrl();
-      $requestUrl .= (strpos($request->getUrl(), '?') === false) ? '?' : '&';
-      $requestUrl .=  'key=' . urlencode($this->developerKey);
-      $request->setUrl($requestUrl);
-    }
-
-    // Cannot sign the request without an OAuth access token.
-    if (null == $this->token && null == $this->assertionCredentials) {
-      return $request;
-    }
-
-    // Check if the token is set to expire in the next 30 seconds
-    // (or has already expired).
-    if ($this->isAccessTokenExpired()) {
-      if ($this->assertionCredentials) {
-        $this->refreshTokenWithAssertion();
-      } else {
-        if (! array_key_exists('refresh_token', $this->token)) {
-            throw new Google_AuthException("The OAuth 2.0 access token has expired, "
-                . "and a refresh token is not available. Refresh tokens are not "
-                . "returned for responses that were auto-approved.");
-        }
-        $this->refreshToken($this->token['refresh_token']);
-      }
-    }
-
-    // Add the OAuth2 header to the request
-    $request->setRequestHeaders(
-        array('Authorization' => 'Bearer ' . $this->token['access_token'])
-    );
-
-    return $request;
-  }
-
-  /**
-   * Fetches a fresh access token with the given refresh token.
-   * @param string $refreshToken
-   * @return void
-   */
-  public function refreshToken($refreshToken) {
-    $this->refreshTokenRequest(array(
-        'client_id' => $this->clientId,
-        'client_secret' => $this->clientSecret,
-        'refresh_token' => $refreshToken,
-        'grant_type' => 'refresh_token'
-    ));
-  }
-
-  /**
-   * Fetches a fresh access token with a given assertion token.
-   * @param Google_AssertionCredentials $assertionCredentials optional.
-   * @return void
-   */
-  public function refreshTokenWithAssertion($assertionCredentials = null) {
-    if (!$assertionCredentials) {
-      $assertionCredentials = $this->assertionCredentials;
-    }
-
-    $this->refreshTokenRequest(array(
-        'grant_type' => 'assertion',
-        'assertion_type' => $assertionCredentials->assertionType,
-        'assertion' => $assertionCredentials->generateAssertion(),
-    ));
-  }
-
-  private function refreshTokenRequest($params) {
-    $http = new Google_HttpRequest(self::OAUTH2_TOKEN_URI, 'POST', array(), $params);
-    $request = Google_Client::$io->makeRequest($http);
-
-    $code = $request->getResponseHttpCode();
-    $body = $request->getResponseBody();
-    if (200 == $code) {
-      $token = json_decode($body, true);
-      if ($token == null) {
-        throw new Google_AuthException("Could not json decode the access token");
-      }
-
-      if (! isset($token['access_token']) || ! isset($token['expires_in'])) {
-        throw new Google_AuthException("Invalid token format");
-      }
-
-      $this->token['access_token'] = $token['access_token'];
-      $this->token['expires_in'] = $token['expires_in'];
-      $this->token['created'] = time();
-    } else {
-      throw new Google_AuthException("Error refreshing the OAuth2 token, message: '$body'", $code);
-    }
-  }
-
-    /**
-     * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
-     * token, if a token isn't provided.
-     * @throws Google_AuthException
-     * @param string|null $token The token (access token or a refresh token) that should be revoked.
-     * @return boolean Returns True if the revocation was successful, otherwise False.
-     */
-  public function revokeToken($token = null) {
-    if (!$token) {
-      $token = $this->token['access_token'];
-    }
-    $request = new Google_HttpRequest(self::OAUTH2_REVOKE_URI, 'POST', array(), "token=$token");
-    $response = Google_Client::$io->makeRequest($request);
-    $code = $response->getResponseHttpCode();
-    if ($code == 200) {
-      $this->token = null;
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * Returns if the access_token is expired.
-   * @return bool Returns True if the access_token is expired.
-   */
-  public function isAccessTokenExpired() {
-    if (null == $this->token) {
-      return true;
-    }
-
-    // If the token is set to expire in the next 30 seconds.
-    $expired = ($this->token['created']
-        + ($this->token['expires_in'] - 30)) < time();
-
-    return $expired;
-  }
-
-  // Gets federated sign-on certificates to use for verifying identity tokens.
-  // Returns certs as array structure, where keys are key ids, and values
-  // are PEM encoded certificates.
-  private function getFederatedSignOnCerts() {
-    // This relies on makeRequest caching certificate responses.
-    $request = Google_Client::$io->makeRequest(new Google_HttpRequest(
-        self::OAUTH2_FEDERATED_SIGNON_CERTS_URL));
-    if ($request->getResponseHttpCode() == 200) {
-      $certs = json_decode($request->getResponseBody(), true);
-      if ($certs) {
-        return $certs;
-      }
-    }
-    throw new Google_AuthException(
-        "Failed to retrieve verification certificates: '" .
-            $request->getResponseBody() . "'.",
-        $request->getResponseHttpCode());
-  }
-
-  /**
-   * Verifies an id token and returns the authenticated apiLoginTicket.
-   * Throws an exception if the id token is not valid.
-   * The audience parameter can be used to control which id tokens are
-   * accepted.  By default, the id token must have been issued to this OAuth2 client.
-   *
-   * @param $id_token
-   * @param $audience
-   * @return Google_LoginTicket
-   */
-  public function verifyIdToken($id_token = null, $audience = null) {
-    if (!$id_token) {
-      $id_token = $this->token['id_token'];
-    }
-
-    $certs = $this->getFederatedSignonCerts();
-    if (!$audience) {
-      $audience = $this->clientId;
-    }
-    return $this->verifySignedJwtWithCerts($id_token, $certs, $audience);
-  }
-
-  // Verifies the id token, returns the verified token contents.
-  // Visible for testing.
-  function verifySignedJwtWithCerts($jwt, $certs, $required_audience) {
-    $segments = explode(".", $jwt);
-    if (count($segments) != 3) {
-      throw new Google_AuthException("Wrong number of segments in token: $jwt");
-    }
-    $signed = $segments[0] . "." . $segments[1];
-    $signature = Google_Utils::urlSafeB64Decode($segments[2]);
-
-    // Parse envelope.
-    $envelope = json_decode(Google_Utils::urlSafeB64Decode($segments[0]), true);
-    if (!$envelope) {
-      throw new Google_AuthException("Can't parse token envelope: " . $segments[0]);
-    }
-
-    // Parse token
-    $json_body = Google_Utils::urlSafeB64Decode($segments[1]);
-    $payload = json_decode($json_body, true);
-    if (!$payload) {
-      throw new Google_AuthException("Can't parse token payload: " . $segments[1]);
-    }
-
-    // Check signature
-    $verified = false;
-    foreach ($certs as $keyName => $pem) {
-      $public_key = new Google_PemVerifier($pem);
-      if ($public_key->verify($signed, $signature)) {
-        $verified = true;
-        break;
-      }
-    }
-
-    if (!$verified) {
-      throw new Google_AuthException("Invalid token signature: $jwt");
-    }
-
-    // Check issued-at timestamp
-    $iat = 0;
-    if (array_key_exists("iat", $payload)) {
-      $iat = $payload["iat"];
-    }
-    if (!$iat) {
-      throw new Google_AuthException("No issue time in token: $json_body");
-    }
-    $earliest = $iat - self::CLOCK_SKEW_SECS;
-
-    // Check expiration timestamp
-    $now = time();
-    $exp = 0;
-    if (array_key_exists("exp", $payload)) {
-      $exp = $payload["exp"];
-    }
-    if (!$exp) {
-      throw new Google_AuthException("No expiration time in token: $json_body");
-    }
-    if ($exp >= $now + self::MAX_TOKEN_LIFETIME_SECS) {
-      throw new Google_AuthException(
-          "Expiration time too far in future: $json_body");
-    }
-
-    $latest = $exp + self::CLOCK_SKEW_SECS;
-    if ($now < $earliest) {
-      throw new Google_AuthException(
-          "Token used too early, $now < $earliest: $json_body");
-    }
-    if ($now > $latest) {
-      throw new Google_AuthException(
-          "Token used too late, $now > $latest: $json_body");
-    }
-
-    // TODO(beaton): check issuer field?
-
-    // Check audience
-    $aud = $payload["aud"];
-    if ($aud != $required_audience) {
-      throw new Google_AuthException("Wrong recipient, $aud != $required_audience: $json_body");
-    }
-
-    // All good.
-    return new Google_LoginTicket($envelope, $payload);
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_ApcCache.php b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_ApcCache.php
deleted file mode 100644
index 3523c98dcca..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_ApcCache.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A persistent storage class based on the APC cache, which is not
- * really very persistent, as soon as you restart your web server
- * the storage will be wiped, however for debugging and/or speed
- * it can be useful, kinda, and cache is a lot cheaper then storage.
- *
- * @author Chris Chabot <chabotc@google.com>
- */
-class googleApcCache extends Google_Cache {
-
-  public function __construct() {
-    if (! function_exists('apc_add')) {
-      throw new Google_CacheException("Apc functions not available");
-    }
-  }
-
-  private function isLocked($key) {
-    if ((@apc_fetch($key . '.lock')) === false) {
-      return false;
-    }
-    return true;
-  }
-
-  private function createLock($key) {
-    // the interesting thing is that this could fail if the lock was created in the meantime..
-    // but we'll ignore that out of convenience
-    @apc_add($key . '.lock', '', 5);
-  }
-
-  private function removeLock($key) {
-    // suppress all warnings, if some other process removed it that's ok too
-    @apc_delete($key . '.lock');
-  }
-
-  private function waitForLock($key) {
-    // 20 x 250 = 5 seconds
-    $tries = 20;
-    $cnt = 0;
-    do {
-      // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
-      usleep(250);
-      $cnt ++;
-    } while ($cnt <= $tries && $this->isLocked($key));
-    if ($this->isLocked($key)) {
-      // 5 seconds passed, assume the owning process died off and remove it
-      $this->removeLock($key);
-    }
-  }
-
-   /**
-   * @inheritDoc
-   */
-  public function get($key, $expiration = false) {
-
-    if (($ret = @apc_fetch($key)) === false) {
-      return false;
-    }
-    if (!$expiration || (time() - $ret['time'] > $expiration)) {
-      $this->delete($key);
-      return false;
-    }
-    return unserialize($ret['data']);
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public function set($key, $value) {
-    if (@apc_store($key, array('time' => time(), 'data' => serialize($value))) == false) {
-      throw new Google_CacheException("Couldn't store data");
-    }
-  }
-
-  /**
-   * @inheritDoc
-   * @param String $key
-   */
-  public function delete($key) {
-    @apc_delete($key);
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_FileCache.php b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_FileCache.php
deleted file mode 100644
index 1e32859a48b..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_FileCache.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/*
- * This class implements a basic on disk storage. While that does
- * work quite well it's not the most elegant and scalable solution.
- * It will also get you into a heap of trouble when you try to run
- * this in a clustered environment. In those cases please use the
- * MySql back-end
- *
- * @author Chris Chabot <chabotc@google.com>
- */
-class Google_FileCache extends Google_Cache {
-  private $path;
-
-  public function __construct() {
-    global $apiConfig;
-    $this->path = $apiConfig['ioFileCache_directory'];
-  }
-
-  private function isLocked($storageFile) {
-    // our lock file convention is simple: /the/file/path.lock
-    return file_exists($storageFile . '.lock');
-  }
-
-  private function createLock($storageFile) {
-    $storageDir = dirname($storageFile);
-    if (! is_dir($storageDir)) {
-      // @codeCoverageIgnoreStart
-      if (! @mkdir($storageDir, 0755, true)) {
-        // make sure the failure isn't because of a concurrency issue
-        if (! is_dir($storageDir)) {
-          throw new Google_CacheException("Could not create storage directory: $storageDir");
-        }
-      }
-      // @codeCoverageIgnoreEnd
-    }
-    @touch($storageFile . '.lock');
-  }
-
-  private function removeLock($storageFile) {
-    // suppress all warnings, if some other process removed it that's ok too
-    @unlink($storageFile . '.lock');
-  }
-
-  private function waitForLock($storageFile) {
-    // 20 x 250 = 5 seconds
-    $tries = 20;
-    $cnt = 0;
-    do {
-      // make sure PHP picks up on file changes. This is an expensive action but really can't be avoided
-      clearstatcache();
-      // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
-      usleep(250);
-      $cnt ++;
-    } while ($cnt <= $tries && $this->isLocked($storageFile));
-    if ($this->isLocked($storageFile)) {
-      // 5 seconds passed, assume the owning process died off and remove it
-      $this->removeLock($storageFile);
-    }
-  }
-
-  private function getCacheDir($hash) {
-    // use the first 2 characters of the hash as a directory prefix
-    // this should prevent slowdowns due to huge directory listings
-    // and thus give some basic amount of scalability
-    return $this->path . '/' . substr($hash, 0, 2);
-  }
-
-  private function getCacheFile($hash) {
-    return $this->getCacheDir($hash) . '/' . $hash;
-  }
-
-  public function get($key, $expiration = false) {
-    $storageFile = $this->getCacheFile(md5($key));
-    // See if this storage file is locked, if so we wait up to 5 seconds for the lock owning process to
-    // complete it's work. If the lock is not released within that time frame, it's cleaned up.
-    // This should give us a fair amount of 'Cache Stampeding' protection
-    if ($this->isLocked($storageFile)) {
-      $this->waitForLock($storageFile);
-    }
-    if (file_exists($storageFile) && is_readable($storageFile)) {
-      $now = time();
-      if (! $expiration || (($mtime = @filemtime($storageFile)) !== false && ($now - $mtime) < $expiration)) {
-        if (($data = @file_get_contents($storageFile)) !== false) {
-          $data = unserialize($data);
-          return $data;
-        }
-      }
-    }
-    return false;
-  }
-
-  public function set($key, $value) {
-    $storageDir = $this->getCacheDir(md5($key));
-    $storageFile = $this->getCacheFile(md5($key));
-    if ($this->isLocked($storageFile)) {
-      // some other process is writing to this file too, wait until it's done to prevent hiccups
-      $this->waitForLock($storageFile);
-    }
-    if (! is_dir($storageDir)) {
-      if (! @mkdir($storageDir, 0755, true)) {
-        throw new Google_CacheException("Could not create storage directory: $storageDir");
-      }
-    }
-    // we serialize the whole request object, since we don't only want the
-    // responseContent but also the postBody used, headers, size, etc
-    $data = serialize($value);
-    $this->createLock($storageFile);
-    if (! @file_put_contents($storageFile, $data)) {
-      $this->removeLock($storageFile);
-      throw new Google_CacheException("Could not store data in the file");
-    }
-    $this->removeLock($storageFile);
-  }
-
-  public function delete($key) {
-    $file = $this->getCacheFile(md5($key));
-    if (! @unlink($file)) {
-      throw new Google_CacheException("Cache file could not be deleted");
-    }
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_MemcacheCache.php b/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_MemcacheCache.php
deleted file mode 100644
index 22493f8b1ec..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/cache/Google_MemcacheCache.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/*
- * Copyright 2008 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * A persistent storage class based on the memcache, which is not
- * really very persistent, as soon as you restart your memcache daemon
- * the storage will be wiped, however for debugging and/or speed
- * it can be useful, kinda, and cache is a lot cheaper then storage.
- *
- * @author Chris Chabot <chabotc@google.com>
- */
-class Google_MemcacheCache extends Google_Cache {
-  private $connection = false;
-
-  public function __construct() {
-    global $apiConfig;
-    if (! function_exists('memcache_connect')) {
-      throw new Google_CacheException("Memcache functions not available");
-    }
-    $this->host = $apiConfig['ioMemCacheCache_host'];
-    $this->port = $apiConfig['ioMemCacheCache_port'];
-    if (empty($this->host) || empty($this->port)) {
-      throw new Google_CacheException("You need to supply a valid memcache host and port");
-    }
-  }
-
-  private function isLocked($key) {
-    $this->check();
-    if ((@memcache_get($this->connection, $key . '.lock')) === false) {
-      return false;
-    }
-    return true;
-  }
-
-  private function createLock($key) {
-    $this->check();
-    // the interesting thing is that this could fail if the lock was created in the meantime..
-    // but we'll ignore that out of convenience
-    @memcache_add($this->connection, $key . '.lock', '', 0, 5);
-  }
-
-  private function removeLock($key) {
-    $this->check();
-    // suppress all warnings, if some other process removed it that's ok too
-    @memcache_delete($this->connection, $key . '.lock');
-  }
-
-  private function waitForLock($key) {
-    $this->check();
-    // 20 x 250 = 5 seconds
-    $tries = 20;
-    $cnt = 0;
-    do {
-      // 250 ms is a long time to sleep, but it does stop the server from burning all resources on polling locks..
-      usleep(250);
-      $cnt ++;
-    } while ($cnt <= $tries && $this->isLocked($key));
-    if ($this->isLocked($key)) {
-      // 5 seconds passed, assume the owning process died off and remove it
-      $this->removeLock($key);
-    }
-  }
-
-  // I prefer lazy initialization since the cache isn't used every request
-  // so this potentially saves a lot of overhead
-  private function connect() {
-    if (! $this->connection = @memcache_pconnect($this->host, $this->port)) {
-      throw new Google_CacheException("Couldn't connect to memcache server");
-    }
-  }
-
-  private function check() {
-    if (! $this->connection) {
-      $this->connect();
-    }
-  }
-
-  /**
-   * @inheritDoc
-   */
-  public function get($key, $expiration = false) {
-    $this->check();
-    if (($ret = @memcache_get($this->connection, $key)) === false) {
-      return false;
-    }
-    if (! $expiration || (time() - $ret['time'] > $expiration)) {
-      $this->delete($key);
-      return false;
-    }
-    return $ret['data'];
-  }
-
-  /**
-   * @inheritDoc
-   * @param string $key
-   * @param string $value
-   * @throws Google_CacheException
-   */
-  public function set($key, $value) {
-    $this->check();
-    // we store it with the cache_time default expiration so objects will at least get cleaned eventually.
-    if (@memcache_set($this->connection, $key, array('time' => time(),
-        'data' => $value), false) == false) {
-      throw new Google_CacheException("Couldn't store data in cache");
-    }
-  }
-
-  /**
-   * @inheritDoc
-   * @param String $key
-   */
-  public function delete($key) {
-    $this->check();
-    @memcache_delete($this->connection, $key);
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/config.php b/apps/files_external/3rdparty/google-api-php-client/src/config.php
deleted file mode 100644
index e3a57138d05..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/config.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-global $apiConfig;
-$apiConfig = array(
-    // True if objects should be returned by the service classes.
-    // False if associative arrays should be returned (default behavior).
-    'use_objects' => false,
-  
-    // The application_name is included in the User-Agent HTTP header.
-    'application_name' => '',
-
-    // OAuth2 Settings, you can get these keys at https://code.google.com/apis/console
-    'oauth2_client_id' => '',
-    'oauth2_client_secret' => '',
-    'oauth2_redirect_uri' => '',
-
-    // The developer key, you get this at https://code.google.com/apis/console
-    'developer_key' => '',
-  
-    // Site name to show in the Google's OAuth 1 authentication screen.
-    'site_name' => 'www.example.org',
-
-    // Which Authentication, Storage and HTTP IO classes to use.
-    'authClass'    => 'Google_OAuth2',
-    'ioClass'      => 'Google_CurlIO',
-    'cacheClass'   => 'Google_FileCache',
-
-    // Don't change these unless you're working against a special development or testing environment.
-    'basePath' => 'https://www.googleapis.com',
-
-    // IO Class dependent configuration, you only have to configure the values
-    // for the class that was configured as the ioClass above
-    'ioFileCache_directory'  =>
-        (function_exists('sys_get_temp_dir') ?
-            sys_get_temp_dir() . '/Google_Client' :
-        '/tmp/Google_Client'),
-
-    // Definition of service specific values like scopes, oauth token URLs, etc
-    'services' => array(
-      'analytics' => array('scope' => 'https://www.googleapis.com/auth/analytics.readonly'),
-      'calendar' => array(
-          'scope' => array(
-              "https://www.googleapis.com/auth/calendar",
-              "https://www.googleapis.com/auth/calendar.readonly",
-          )
-      ),
-      'books' => array('scope' => 'https://www.googleapis.com/auth/books'),
-      'latitude' => array(
-          'scope' => array(
-              'https://www.googleapis.com/auth/latitude.all.best',
-              'https://www.googleapis.com/auth/latitude.all.city',
-          )
-      ),
-      'moderator' => array('scope' => 'https://www.googleapis.com/auth/moderator'),
-      'oauth2' => array(
-          'scope' => array(
-              'https://www.googleapis.com/auth/userinfo.profile',
-              'https://www.googleapis.com/auth/userinfo.email',
-          )
-      ),
-      'plus' => array('scope' => 'https://www.googleapis.com/auth/plus.login'),
-      'siteVerification' => array('scope' => 'https://www.googleapis.com/auth/siteverification'),
-      'tasks' => array('scope' => 'https://www.googleapis.com/auth/tasks'),
-      'urlshortener' => array('scope' => 'https://www.googleapis.com/auth/urlshortener')
-    )
-);
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/contrib/Google_DriveService.php b/apps/files_external/3rdparty/google-api-php-client/src/contrib/Google_DriveService.php
deleted file mode 100644
index 896e8b93826..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/contrib/Google_DriveService.php
+++ /dev/null
@@ -1,3143 +0,0 @@
-<?php
-/*
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-
-  /**
-   * The "about" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $about = $driveService->about;
-   *  </code>
-   */
-  class Google_AboutServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Gets the information about the current user along with Drive API settings (about.get)
-     *
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool includeSubscribed When calculating the number of remaining change IDs, whether to include shared files and public files the user has opened. When set to false, this counts only change IDs for owned files and any shared or public files that the user has explictly added to a folder in Drive.
-     * @opt_param string maxChangeIdCount Maximum number of remaining change IDs to count
-     * @opt_param string startChangeId Change ID to start counting from when calculating number of remaining change IDs
-     * @return Google_About
-     */
-    public function get($optParams = array()) {
-      $params = array();
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_About($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "apps" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $apps = $driveService->apps;
-   *  </code>
-   */
-  class Google_AppsServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Gets a specific app. (apps.get)
-     *
-     * @param string $appId The ID of the app.
-     * @param array $optParams Optional parameters.
-     * @return Google_App
-     */
-    public function get($appId, $optParams = array()) {
-      $params = array('appId' => $appId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_App($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists a user's installed apps. (apps.list)
-     *
-     * @param array $optParams Optional parameters.
-     * @return Google_AppList
-     */
-    public function listApps($optParams = array()) {
-      $params = array();
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_AppList($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "changes" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $changes = $driveService->changes;
-   *  </code>
-   */
-  class Google_ChangesServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Gets a specific change. (changes.get)
-     *
-     * @param string $changeId The ID of the change.
-     * @param array $optParams Optional parameters.
-     * @return Google_Change
-     */
-    public function get($changeId, $optParams = array()) {
-      $params = array('changeId' => $changeId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Change($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists the changes for a user. (changes.list)
-     *
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool includeDeleted Whether to include deleted items.
-     * @opt_param bool includeSubscribed Whether to include shared files and public files the user has opened. When set to false, the list will include owned files plus any shared or public files the user has explictly added to a folder in Drive.
-     * @opt_param int maxResults Maximum number of changes to return.
-     * @opt_param string pageToken Page token for changes.
-     * @opt_param string startChangeId Change ID to start listing changes from.
-     * @return Google_ChangeList
-     */
-    public function listChanges($optParams = array()) {
-      $params = array();
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_ChangeList($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "children" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $children = $driveService->children;
-   *  </code>
-   */
-  class Google_ChildrenServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Removes a child from a folder. (children.delete)
-     *
-     * @param string $folderId The ID of the folder.
-     * @param string $childId The ID of the child.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($folderId, $childId, $optParams = array()) {
-      $params = array('folderId' => $folderId, 'childId' => $childId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a specific child reference. (children.get)
-     *
-     * @param string $folderId The ID of the folder.
-     * @param string $childId The ID of the child.
-     * @param array $optParams Optional parameters.
-     * @return Google_ChildReference
-     */
-    public function get($folderId, $childId, $optParams = array()) {
-      $params = array('folderId' => $folderId, 'childId' => $childId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_ChildReference($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Inserts a file into a folder. (children.insert)
-     *
-     * @param string $folderId The ID of the folder.
-     * @param Google_ChildReference $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_ChildReference
-     */
-    public function insert($folderId, Google_ChildReference $postBody, $optParams = array()) {
-      $params = array('folderId' => $folderId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_ChildReference($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists a folder's children. (children.list)
-     *
-     * @param string $folderId The ID of the folder.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int maxResults Maximum number of children to return.
-     * @opt_param string pageToken Page token for children.
-     * @opt_param string q Query string for searching children.
-     * @return Google_ChildList
-     */
-    public function listChildren($folderId, $optParams = array()) {
-      $params = array('folderId' => $folderId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_ChildList($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "comments" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $comments = $driveService->comments;
-   *  </code>
-   */
-  class Google_CommentsServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Deletes a comment. (comments.delete)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($fileId, $commentId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a comment by ID. (comments.get)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool includeDeleted If set, this will succeed when retrieving a deleted comment, and will include any deleted replies.
-     * @return Google_Comment
-     */
-    public function get($fileId, $commentId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Comment($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Creates a new comment on the given file. (comments.insert)
-     *
-     * @param string $fileId The ID of the file.
-     * @param Google_Comment $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Comment
-     */
-    public function insert($fileId, Google_Comment $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_Comment($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists a file's comments. (comments.list)
-     *
-     * @param string $fileId The ID of the file.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool includeDeleted If set, all comments and replies, including deleted comments and replies (with content stripped) will be returned.
-     * @opt_param int maxResults The maximum number of discussions to include in the response, used for paging.
-     * @opt_param string pageToken The continuation token, used to page through large result sets. To get the next page of results, set this parameter to the value of "nextPageToken" from the previous response.
-     * @opt_param string updatedMin Only discussions that were updated after this timestamp will be returned. Formatted as an RFC 3339 timestamp.
-     * @return Google_CommentList
-     */
-    public function listComments($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_CommentList($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing comment. This method supports patch semantics. (comments.patch)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param Google_Comment $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Comment
-     */
-    public function patch($fileId, $commentId, Google_Comment $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_Comment($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing comment. (comments.update)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param Google_Comment $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Comment
-     */
-    public function update($fileId, $commentId, Google_Comment $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_Comment($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "files" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $files = $driveService->files;
-   *  </code>
-   */
-  class Google_FilesServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Creates a copy of the specified file. (files.copy)
-     *
-     * @param string $fileId The ID of the file to copy.
-     * @param Google_DriveFile $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool convert Whether to convert this file to the corresponding Google Docs format.
-     * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
-     * @opt_param string ocrLanguage If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
-     * @opt_param bool pinned Whether to pin the head revision of the new copy.
-     * @opt_param string timedTextLanguage The language of the timed text.
-     * @opt_param string timedTextTrackName The timed text track name.
-     * @return Google_DriveFile
-     */
-    public function copy($fileId, Google_DriveFile $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('copy', array($params));
-      if ($this->useObjects()) {
-        return new Google_DriveFile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Permanently deletes a file by ID. Skips the trash. (files.delete)
-     *
-     * @param string $fileId The ID of the file to delete.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a file's metadata by ID. (files.get)
-     *
-     * @param string $fileId The ID for the file in question.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string projection This parameter is deprecated and has no function.
-     * @opt_param bool updateViewedDate Whether to update the view date after successfully retrieving the file.
-     * @return Google_DriveFile
-     */
-    public function get($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_DriveFile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Insert a new file. (files.insert)
-     *
-     * @param Google_DriveFile $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool convert Whether to convert this file to the corresponding Google Docs format.
-     * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
-     * @opt_param string ocrLanguage If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
-     * @opt_param bool pinned Whether to pin the head revision of the uploaded file.
-     * @opt_param string timedTextLanguage The language of the timed text.
-     * @opt_param string timedTextTrackName The timed text track name.
-     * @opt_param bool useContentAsIndexableText Whether to use the content as indexable text.
-     * @return Google_DriveFile
-     */
-    public function insert(Google_DriveFile $postBody, $optParams = array()) {
-      $params = array('postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_DriveFile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists the user's files. (files.list)
-     *
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param int maxResults Maximum number of files to return.
-     * @opt_param string pageToken Page token for files.
-     * @opt_param string projection This parameter is deprecated and has no function.
-     * @opt_param string q Query string for searching files.
-     * @return Google_FileList
-     */
-    public function listFiles($optParams = array()) {
-      $params = array();
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_FileList($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates file metadata and/or content. This method supports patch semantics. (files.patch)
-     *
-     * @param string $fileId The ID of the file to update.
-     * @param Google_DriveFile $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool convert Whether to convert this file to the corresponding Google Docs format.
-     * @opt_param bool newRevision Whether a blob upload should create a new revision. If not set or false, the blob data in the current head revision is replaced. If true, a new blob is created as head revision, and previous revisions are preserved (causing increased use of the user's data storage quota).
-     * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
-     * @opt_param string ocrLanguage If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
-     * @opt_param bool pinned Whether to pin the new revision.
-     * @opt_param bool setModifiedDate Whether to set the modified date with the supplied modified date.
-     * @opt_param string timedTextLanguage The language of the timed text.
-     * @opt_param string timedTextTrackName The timed text track name.
-     * @opt_param bool updateViewedDate Whether to update the view date after successfully updating the file.
-     * @opt_param bool useContentAsIndexableText Whether to use the content as indexable text.
-     * @return Google_DriveFile
-     */
-    public function patch($fileId, Google_DriveFile $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_DriveFile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Set the file's updated time to the current server time. (files.touch)
-     *
-     * @param string $fileId The ID of the file to update.
-     * @param array $optParams Optional parameters.
-     * @return Google_DriveFile
-     */
-    public function touch($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('touch', array($params));
-      if ($this->useObjects()) {
-        return new Google_DriveFile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Moves a file to the trash. (files.trash)
-     *
-     * @param string $fileId The ID of the file to trash.
-     * @param array $optParams Optional parameters.
-     * @return Google_DriveFile
-     */
-    public function trash($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('trash', array($params));
-      if ($this->useObjects()) {
-        return new Google_DriveFile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Restores a file from the trash. (files.untrash)
-     *
-     * @param string $fileId The ID of the file to untrash.
-     * @param array $optParams Optional parameters.
-     * @return Google_DriveFile
-     */
-    public function untrash($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('untrash', array($params));
-      if ($this->useObjects()) {
-        return new Google_DriveFile($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates file metadata and/or content. (files.update)
-     *
-     * @param string $fileId The ID of the file to update.
-     * @param Google_DriveFile $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool convert Whether to convert this file to the corresponding Google Docs format.
-     * @opt_param bool newRevision Whether a blob upload should create a new revision. If not set or false, the blob data in the current head revision is replaced. If true, a new blob is created as head revision, and previous revisions are preserved (causing increased use of the user's data storage quota).
-     * @opt_param bool ocr Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
-     * @opt_param string ocrLanguage If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
-     * @opt_param bool pinned Whether to pin the new revision.
-     * @opt_param bool setModifiedDate Whether to set the modified date with the supplied modified date.
-     * @opt_param string timedTextLanguage The language of the timed text.
-     * @opt_param string timedTextTrackName The timed text track name.
-     * @opt_param bool updateViewedDate Whether to update the view date after successfully updating the file.
-     * @opt_param bool useContentAsIndexableText Whether to use the content as indexable text.
-     * @return Google_DriveFile
-     */
-    public function update($fileId, Google_DriveFile $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_DriveFile($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "parents" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $parents = $driveService->parents;
-   *  </code>
-   */
-  class Google_ParentsServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Removes a parent from a file. (parents.delete)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $parentId The ID of the parent.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($fileId, $parentId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'parentId' => $parentId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a specific parent reference. (parents.get)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $parentId The ID of the parent.
-     * @param array $optParams Optional parameters.
-     * @return Google_ParentReference
-     */
-    public function get($fileId, $parentId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'parentId' => $parentId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_ParentReference($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Adds a parent folder for a file. (parents.insert)
-     *
-     * @param string $fileId The ID of the file.
-     * @param Google_ParentReference $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_ParentReference
-     */
-    public function insert($fileId, Google_ParentReference $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_ParentReference($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists a file's parents. (parents.list)
-     *
-     * @param string $fileId The ID of the file.
-     * @param array $optParams Optional parameters.
-     * @return Google_ParentList
-     */
-    public function listParents($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_ParentList($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "permissions" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $permissions = $driveService->permissions;
-   *  </code>
-   */
-  class Google_PermissionsServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Deletes a permission from a file. (permissions.delete)
-     *
-     * @param string $fileId The ID for the file.
-     * @param string $permissionId The ID for the permission.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($fileId, $permissionId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'permissionId' => $permissionId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a permission by ID. (permissions.get)
-     *
-     * @param string $fileId The ID for the file.
-     * @param string $permissionId The ID for the permission.
-     * @param array $optParams Optional parameters.
-     * @return Google_Permission
-     */
-    public function get($fileId, $permissionId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'permissionId' => $permissionId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Permission($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Inserts a permission for a file. (permissions.insert)
-     *
-     * @param string $fileId The ID for the file.
-     * @param Google_Permission $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string emailMessage A custom message to include in notification emails.
-     * @opt_param bool sendNotificationEmails Whether to send notification emails when sharing to users or groups.
-     * @return Google_Permission
-     */
-    public function insert($fileId, Google_Permission $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_Permission($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists a file's permissions. (permissions.list)
-     *
-     * @param string $fileId The ID for the file.
-     * @param array $optParams Optional parameters.
-     * @return Google_PermissionList
-     */
-    public function listPermissions($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_PermissionList($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates a permission. This method supports patch semantics. (permissions.patch)
-     *
-     * @param string $fileId The ID for the file.
-     * @param string $permissionId The ID for the permission.
-     * @param Google_Permission $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool transferOwnership Whether changing a role to 'owner' should also downgrade the current owners to writers.
-     * @return Google_Permission
-     */
-    public function patch($fileId, $permissionId, Google_Permission $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'permissionId' => $permissionId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_Permission($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates a permission. (permissions.update)
-     *
-     * @param string $fileId The ID for the file.
-     * @param string $permissionId The ID for the permission.
-     * @param Google_Permission $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool transferOwnership Whether changing a role to 'owner' should also downgrade the current owners to writers.
-     * @return Google_Permission
-     */
-    public function update($fileId, $permissionId, Google_Permission $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'permissionId' => $permissionId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_Permission($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "properties" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $properties = $driveService->properties;
-   *  </code>
-   */
-  class Google_PropertiesServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Deletes a property. (properties.delete)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $propertyKey The key of the property.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string visibility The visibility of the property.
-     */
-    public function delete($fileId, $propertyKey, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a property by its key. (properties.get)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $propertyKey The key of the property.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string visibility The visibility of the property.
-     * @return Google_Property
-     */
-    public function get($fileId, $propertyKey, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Property($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Adds a property to a file. (properties.insert)
-     *
-     * @param string $fileId The ID of the file.
-     * @param Google_Property $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Property
-     */
-    public function insert($fileId, Google_Property $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_Property($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists a file's properties. (properties.list)
-     *
-     * @param string $fileId The ID of the file.
-     * @param array $optParams Optional parameters.
-     * @return Google_PropertyList
-     */
-    public function listProperties($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_PropertyList($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates a property. This method supports patch semantics. (properties.patch)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $propertyKey The key of the property.
-     * @param Google_Property $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string visibility The visibility of the property.
-     * @return Google_Property
-     */
-    public function patch($fileId, $propertyKey, Google_Property $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_Property($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates a property. (properties.update)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $propertyKey The key of the property.
-     * @param Google_Property $postBody
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param string visibility The visibility of the property.
-     * @return Google_Property
-     */
-    public function update($fileId, $propertyKey, Google_Property $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'propertyKey' => $propertyKey, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_Property($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "replies" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $replies = $driveService->replies;
-   *  </code>
-   */
-  class Google_RepliesServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Deletes a reply. (replies.delete)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param string $replyId The ID of the reply.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($fileId, $commentId, $replyId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a reply. (replies.get)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param string $replyId The ID of the reply.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool includeDeleted If set, this will succeed when retrieving a deleted reply.
-     * @return Google_CommentReply
-     */
-    public function get($fileId, $commentId, $replyId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_CommentReply($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Creates a new reply to the given comment. (replies.insert)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param Google_CommentReply $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_CommentReply
-     */
-    public function insert($fileId, $commentId, Google_CommentReply $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('insert', array($params));
-      if ($this->useObjects()) {
-        return new Google_CommentReply($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists all of the replies to a comment. (replies.list)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param array $optParams Optional parameters.
-     *
-     * @opt_param bool includeDeleted If set, all replies, including deleted replies (with content stripped) will be returned.
-     * @opt_param int maxResults The maximum number of replies to include in the response, used for paging.
-     * @opt_param string pageToken The continuation token, used to page through large result sets. To get the next page of results, set this parameter to the value of "nextPageToken" from the previous response.
-     * @return Google_CommentReplyList
-     */
-    public function listReplies($fileId, $commentId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_CommentReplyList($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing reply. This method supports patch semantics. (replies.patch)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param string $replyId The ID of the reply.
-     * @param Google_CommentReply $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_CommentReply
-     */
-    public function patch($fileId, $commentId, $replyId, Google_CommentReply $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_CommentReply($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates an existing reply. (replies.update)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $commentId The ID of the comment.
-     * @param string $replyId The ID of the reply.
-     * @param Google_CommentReply $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_CommentReply
-     */
-    public function update($fileId, $commentId, $replyId, Google_CommentReply $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'commentId' => $commentId, 'replyId' => $replyId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_CommentReply($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-  /**
-   * The "revisions" collection of methods.
-   * Typical usage is:
-   *  <code>
-   *   $driveService = new Google_DriveService(...);
-   *   $revisions = $driveService->revisions;
-   *  </code>
-   */
-  class Google_RevisionsServiceResource extends Google_ServiceResource {
-
-
-    /**
-     * Removes a revision. (revisions.delete)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $revisionId The ID of the revision.
-     * @param array $optParams Optional parameters.
-     */
-    public function delete($fileId, $revisionId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'revisionId' => $revisionId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('delete', array($params));
-      return $data;
-    }
-    /**
-     * Gets a specific revision. (revisions.get)
-     *
-     * @param string $fileId The ID of the file.
-     * @param string $revisionId The ID of the revision.
-     * @param array $optParams Optional parameters.
-     * @return Google_Revision
-     */
-    public function get($fileId, $revisionId, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'revisionId' => $revisionId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('get', array($params));
-      if ($this->useObjects()) {
-        return new Google_Revision($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Lists a file's revisions. (revisions.list)
-     *
-     * @param string $fileId The ID of the file.
-     * @param array $optParams Optional parameters.
-     * @return Google_RevisionList
-     */
-    public function listRevisions($fileId, $optParams = array()) {
-      $params = array('fileId' => $fileId);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('list', array($params));
-      if ($this->useObjects()) {
-        return new Google_RevisionList($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates a revision. This method supports patch semantics. (revisions.patch)
-     *
-     * @param string $fileId The ID for the file.
-     * @param string $revisionId The ID for the revision.
-     * @param Google_Revision $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Revision
-     */
-    public function patch($fileId, $revisionId, Google_Revision $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'revisionId' => $revisionId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('patch', array($params));
-      if ($this->useObjects()) {
-        return new Google_Revision($data);
-      } else {
-        return $data;
-      }
-    }
-    /**
-     * Updates a revision. (revisions.update)
-     *
-     * @param string $fileId The ID for the file.
-     * @param string $revisionId The ID for the revision.
-     * @param Google_Revision $postBody
-     * @param array $optParams Optional parameters.
-     * @return Google_Revision
-     */
-    public function update($fileId, $revisionId, Google_Revision $postBody, $optParams = array()) {
-      $params = array('fileId' => $fileId, 'revisionId' => $revisionId, 'postBody' => $postBody);
-      $params = array_merge($params, $optParams);
-      $data = $this->__call('update', array($params));
-      if ($this->useObjects()) {
-        return new Google_Revision($data);
-      } else {
-        return $data;
-      }
-    }
-  }
-
-/**
- * Service definition for Google_Drive (v2).
- *
- * <p>
- * The API to interact with Drive.
- * </p>
- *
- * <p>
- * For more information about this service, see the
- * <a href="https://developers.google.com/drive/" target="_blank">API Documentation</a>
- * </p>
- *
- * @author Google, Inc.
- */
-class Google_DriveService extends Google_Service {
-  public $about;
-  public $apps;
-  public $changes;
-  public $children;
-  public $comments;
-  public $files;
-  public $parents;
-  public $permissions;
-  public $properties;
-  public $replies;
-  public $revisions;
-  /**
-   * Constructs the internal representation of the Drive service.
-   *
-   * @param Google_Client $client
-   */
-  public function __construct(Google_Client $client) {
-    $this->servicePath = 'drive/v2/';
-    $this->version = 'v2';
-    $this->serviceName = 'drive';
-
-    $client->addService($this->serviceName, $this->version);
-    $this->about = new Google_AboutServiceResource($this, $this->serviceName, 'about', json_decode('{"methods": {"get": {"id": "drive.about.get", "path": "about", "httpMethod": "GET", "parameters": {"includeSubscribed": {"type": "boolean", "default": "true", "location": "query"}, "maxChangeIdCount": {"type": "string", "default": "1", "format": "int64", "location": "query"}, "startChangeId": {"type": "string", "format": "int64", "location": "query"}}, "response": {"$ref": "About"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}}}', true));
-    $this->apps = new Google_AppsServiceResource($this, $this->serviceName, 'apps', json_decode('{"methods": {"get": {"id": "drive.apps.get", "path": "apps/{appId}", "httpMethod": "GET", "parameters": {"appId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "App"}, "scopes": ["https://www.googleapis.com/auth/drive.apps.readonly"]}, "list": {"id": "drive.apps.list", "path": "apps", "httpMethod": "GET", "response": {"$ref": "AppList"}, "scopes": ["https://www.googleapis.com/auth/drive.apps.readonly"]}}}', true));
-    $this->changes = new Google_ChangesServiceResource($this, $this->serviceName, 'changes', json_decode('{"methods": {"get": {"id": "drive.changes.get", "path": "changes/{changeId}", "httpMethod": "GET", "parameters": {"changeId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Change"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "list": {"id": "drive.changes.list", "path": "changes", "httpMethod": "GET", "parameters": {"includeDeleted": {"type": "boolean", "default": "true", "location": "query"}, "includeSubscribed": {"type": "boolean", "default": "true", "location": "query"}, "maxResults": {"type": "integer", "default": "100", "format": "int32", "minimum": "0", "location": "query"}, "pageToken": {"type": "string", "location": "query"}, "startChangeId": {"type": "string", "format": "int64", "location": "query"}}, "response": {"$ref": "ChangeList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"], "supportsSubscription": true}}}', true));
-    $this->children = new Google_ChildrenServiceResource($this, $this->serviceName, 'children', json_decode('{"methods": {"delete": {"id": "drive.children.delete", "path": "files/{folderId}/children/{childId}", "httpMethod": "DELETE", "parameters": {"childId": {"type": "string", "required": true, "location": "path"}, "folderId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.children.get", "path": "files/{folderId}/children/{childId}", "httpMethod": "GET", "parameters": {"childId": {"type": "string", "required": true, "location": "path"}, "folderId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "ChildReference"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.children.insert", "path": "files/{folderId}/children", "httpMethod": "POST", "parameters": {"folderId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "ChildReference"}, "response": {"$ref": "ChildReference"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.children.list", "path": "files/{folderId}/children", "httpMethod": "GET", "parameters": {"folderId": {"type": "string", "required": true, "location": "path"}, "maxResults": {"type": "integer", "default": "100", "format": "int32", "minimum": "0", "location": "query"}, "pageToken": {"type": "string", "location": "query"}, "q": {"type": "string", "location": "query"}}, "response": {"$ref": "ChildList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}}}', true));
-    $this->comments = new Google_CommentsServiceResource($this, $this->serviceName, 'comments', json_decode('{"methods": {"delete": {"id": "drive.comments.delete", "path": "files/{fileId}/comments/{commentId}", "httpMethod": "DELETE", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "get": {"id": "drive.comments.get", "path": "files/{fileId}/comments/{commentId}", "httpMethod": "GET", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "includeDeleted": {"type": "boolean", "default": "false", "location": "query"}}, "response": {"$ref": "Comment"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.comments.insert", "path": "files/{fileId}/comments", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Comment"}, "response": {"$ref": "Comment"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "list": {"id": "drive.comments.list", "path": "files/{fileId}/comments", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "includeDeleted": {"type": "boolean", "default": "false", "location": "query"}, "maxResults": {"type": "integer", "default": "20", "format": "int32", "minimum": "0", "maximum": "100", "location": "query"}, "pageToken": {"type": "string", "location": "query"}, "updatedMin": {"type": "string", "location": "query"}}, "response": {"$ref": "CommentList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.comments.patch", "path": "files/{fileId}/comments/{commentId}", "httpMethod": "PATCH", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Comment"}, "response": {"$ref": "Comment"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.comments.update", "path": "files/{fileId}/comments/{commentId}", "httpMethod": "PUT", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Comment"}, "response": {"$ref": "Comment"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
-    $this->files = new Google_FilesServiceResource($this, $this->serviceName, 'files', json_decode('{"methods": {"copy": {"id": "drive.files.copy", "path": "files/{fileId}/copy", "httpMethod": "POST", "parameters": {"convert": {"type": "boolean", "default": "false", "location": "query"}, "fileId": {"type": "string", "required": true, "location": "path"}, "ocr": {"type": "boolean", "default": "false", "location": "query"}, "ocrLanguage": {"type": "string", "location": "query"}, "pinned": {"type": "boolean", "default": "false", "location": "query"}, "timedTextLanguage": {"type": "string", "location": "query"}, "timedTextTrackName": {"type": "string", "location": "query"}}, "request": {"$ref": "File"}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "delete": {"id": "drive.files.delete", "path": "files/{fileId}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.files.get", "path": "files/{fileId}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "projection": {"type": "string", "enum": ["BASIC", "FULL"], "location": "query"}, "updateViewedDate": {"type": "boolean", "default": "false", "location": "query"}}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"], "supportsSubscription": true}, "insert": {"id": "drive.files.insert", "path": "files", "httpMethod": "POST", "parameters": {"convert": {"type": "boolean", "default": "false", "location": "query"}, "ocr": {"type": "boolean", "default": "false", "location": "query"}, "ocrLanguage": {"type": "string", "location": "query"}, "pinned": {"type": "boolean", "default": "false", "location": "query"}, "timedTextLanguage": {"type": "string", "location": "query"}, "timedTextTrackName": {"type": "string", "location": "query"}, "useContentAsIndexableText": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "File"}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"], "supportsMediaUpload": true, "mediaUpload": {"accept": ["*/*"], "maxSize": "10GB", "protocols": {"simple": {"multipart": true, "path": "/upload/drive/v2/files"}, "resumable": {"multipart": true, "path": "/resumable/upload/drive/v2/files"}}}, "supportsSubscription": true}, "list": {"id": "drive.files.list", "path": "files", "httpMethod": "GET", "parameters": {"maxResults": {"type": "integer", "default": "100", "format": "int32", "minimum": "0", "location": "query"}, "pageToken": {"type": "string", "location": "query"}, "projection": {"type": "string", "enum": ["BASIC", "FULL"], "location": "query"}, "q": {"type": "string", "location": "query"}}, "response": {"$ref": "FileList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.files.patch", "path": "files/{fileId}", "httpMethod": "PATCH", "parameters": {"convert": {"type": "boolean", "default": "false", "location": "query"}, "fileId": {"type": "string", "required": true, "location": "path"}, "newRevision": {"type": "boolean", "default": "true", "location": "query"}, "ocr": {"type": "boolean", "default": "false", "location": "query"}, "ocrLanguage": {"type": "string", "location": "query"}, "pinned": {"type": "boolean", "default": "false", "location": "query"}, "setModifiedDate": {"type": "boolean", "default": "false", "location": "query"}, "timedTextLanguage": {"type": "string", "location": "query"}, "timedTextTrackName": {"type": "string", "location": "query"}, "updateViewedDate": {"type": "boolean", "default": "true", "location": "query"}, "useContentAsIndexableText": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "File"}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.scripts"]}, "touch": {"id": "drive.files.touch", "path": "files/{fileId}/touch", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "trash": {"id": "drive.files.trash", "path": "files/{fileId}/trash", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "untrash": {"id": "drive.files.untrash", "path": "files/{fileId}/untrash", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.files.update", "path": "files/{fileId}", "httpMethod": "PUT", "parameters": {"convert": {"type": "boolean", "default": "false", "location": "query"}, "fileId": {"type": "string", "required": true, "location": "path"}, "newRevision": {"type": "boolean", "default": "true", "location": "query"}, "ocr": {"type": "boolean", "default": "false", "location": "query"}, "ocrLanguage": {"type": "string", "location": "query"}, "pinned": {"type": "boolean", "default": "false", "location": "query"}, "setModifiedDate": {"type": "boolean", "default": "false", "location": "query"}, "timedTextLanguage": {"type": "string", "location": "query"}, "timedTextTrackName": {"type": "string", "location": "query"}, "updateViewedDate": {"type": "boolean", "default": "true", "location": "query"}, "useContentAsIndexableText": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "File"}, "response": {"$ref": "File"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.scripts"], "supportsMediaUpload": true, "mediaUpload": {"accept": ["*/*"], "maxSize": "10GB", "protocols": {"simple": {"multipart": true, "path": "/upload/drive/v2/files/{fileId}"}, "resumable": {"multipart": true, "path": "/resumable/upload/drive/v2/files/{fileId}"}}}}}}', true));
-    $this->parents = new Google_ParentsServiceResource($this, $this->serviceName, 'parents', json_decode('{"methods": {"delete": {"id": "drive.parents.delete", "path": "files/{fileId}/parents/{parentId}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "parentId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.parents.get", "path": "files/{fileId}/parents/{parentId}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "parentId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "ParentReference"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.parents.insert", "path": "files/{fileId}/parents", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "ParentReference"}, "response": {"$ref": "ParentReference"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.parents.list", "path": "files/{fileId}/parents", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "ParentList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}}}', true));
-    $this->permissions = new Google_PermissionsServiceResource($this, $this->serviceName, 'permissions', json_decode('{"methods": {"delete": {"id": "drive.permissions.delete", "path": "files/{fileId}/permissions/{permissionId}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "permissionId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.permissions.get", "path": "files/{fileId}/permissions/{permissionId}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "permissionId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Permission"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.permissions.insert", "path": "files/{fileId}/permissions", "httpMethod": "POST", "parameters": {"emailMessage": {"type": "string", "location": "query"}, "fileId": {"type": "string", "required": true, "location": "path"}, "sendNotificationEmails": {"type": "boolean", "default": "true", "location": "query"}}, "request": {"$ref": "Permission"}, "response": {"$ref": "Permission"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.permissions.list", "path": "files/{fileId}/permissions", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "PermissionList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.permissions.patch", "path": "files/{fileId}/permissions/{permissionId}", "httpMethod": "PATCH", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "permissionId": {"type": "string", "required": true, "location": "path"}, "transferOwnership": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "Permission"}, "response": {"$ref": "Permission"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.permissions.update", "path": "files/{fileId}/permissions/{permissionId}", "httpMethod": "PUT", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "permissionId": {"type": "string", "required": true, "location": "path"}, "transferOwnership": {"type": "boolean", "default": "false", "location": "query"}}, "request": {"$ref": "Permission"}, "response": {"$ref": "Permission"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
-    $this->properties = new Google_PropertiesServiceResource($this, $this->serviceName, 'properties', json_decode('{"methods": {"delete": {"id": "drive.properties.delete", "path": "files/{fileId}/properties/{propertyKey}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "propertyKey": {"type": "string", "required": true, "location": "path"}, "visibility": {"type": "string", "default": "private", "location": "query"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.properties.get", "path": "files/{fileId}/properties/{propertyKey}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "propertyKey": {"type": "string", "required": true, "location": "path"}, "visibility": {"type": "string", "default": "private", "location": "query"}}, "response": {"$ref": "Property"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.properties.insert", "path": "files/{fileId}/properties", "httpMethod": "POST", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Property"}, "response": {"$ref": "Property"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.properties.list", "path": "files/{fileId}/properties", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "PropertyList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.properties.patch", "path": "files/{fileId}/properties/{propertyKey}", "httpMethod": "PATCH", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "propertyKey": {"type": "string", "required": true, "location": "path"}, "visibility": {"type": "string", "default": "private", "location": "query"}}, "request": {"$ref": "Property"}, "response": {"$ref": "Property"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.properties.update", "path": "files/{fileId}/properties/{propertyKey}", "httpMethod": "PUT", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "propertyKey": {"type": "string", "required": true, "location": "path"}, "visibility": {"type": "string", "default": "private", "location": "query"}}, "request": {"$ref": "Property"}, "response": {"$ref": "Property"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
-    $this->replies = new Google_RepliesServiceResource($this, $this->serviceName, 'replies', json_decode('{"methods": {"delete": {"id": "drive.replies.delete", "path": "files/{fileId}/comments/{commentId}/replies/{replyId}", "httpMethod": "DELETE", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "replyId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.replies.get", "path": "files/{fileId}/comments/{commentId}/replies/{replyId}", "httpMethod": "GET", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "includeDeleted": {"type": "boolean", "default": "false", "location": "query"}, "replyId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "CommentReply"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "insert": {"id": "drive.replies.insert", "path": "files/{fileId}/comments/{commentId}/replies", "httpMethod": "POST", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "CommentReply"}, "response": {"$ref": "CommentReply"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "list": {"id": "drive.replies.list", "path": "files/{fileId}/comments/{commentId}/replies", "httpMethod": "GET", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "includeDeleted": {"type": "boolean", "default": "false", "location": "query"}, "maxResults": {"type": "integer", "default": "20", "format": "int32", "minimum": "0", "maximum": "100", "location": "query"}, "pageToken": {"type": "string", "location": "query"}}, "response": {"$ref": "CommentReplyList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.replies.patch", "path": "files/{fileId}/comments/{commentId}/replies/{replyId}", "httpMethod": "PATCH", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "replyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "CommentReply"}, "response": {"$ref": "CommentReply"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.replies.update", "path": "files/{fileId}/comments/{commentId}/replies/{replyId}", "httpMethod": "PUT", "parameters": {"commentId": {"type": "string", "required": true, "location": "path"}, "fileId": {"type": "string", "required": true, "location": "path"}, "replyId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "CommentReply"}, "response": {"$ref": "CommentReply"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
-    $this->revisions = new Google_RevisionsServiceResource($this, $this->serviceName, 'revisions', json_decode('{"methods": {"delete": {"id": "drive.revisions.delete", "path": "files/{fileId}/revisions/{revisionId}", "httpMethod": "DELETE", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "revisionId": {"type": "string", "required": true, "location": "path"}}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "get": {"id": "drive.revisions.get", "path": "files/{fileId}/revisions/{revisionId}", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "revisionId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "Revision"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "list": {"id": "drive.revisions.list", "path": "files/{fileId}/revisions", "httpMethod": "GET", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}}, "response": {"$ref": "RevisionList"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/drive.metadata.readonly", "https://www.googleapis.com/auth/drive.readonly"]}, "patch": {"id": "drive.revisions.patch", "path": "files/{fileId}/revisions/{revisionId}", "httpMethod": "PATCH", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "revisionId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Revision"}, "response": {"$ref": "Revision"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}, "update": {"id": "drive.revisions.update", "path": "files/{fileId}/revisions/{revisionId}", "httpMethod": "PUT", "parameters": {"fileId": {"type": "string", "required": true, "location": "path"}, "revisionId": {"type": "string", "required": true, "location": "path"}}, "request": {"$ref": "Revision"}, "response": {"$ref": "Revision"}, "scopes": ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file"]}}}', true));
-
-  }
-}
-
-
-
-class Google_About extends Google_Model {
-  protected $__additionalRoleInfoType = 'Google_AboutAdditionalRoleInfo';
-  protected $__additionalRoleInfoDataType = 'array';
-  public $additionalRoleInfo;
-  public $domainSharingPolicy;
-  public $etag;
-  protected $__exportFormatsType = 'Google_AboutExportFormats';
-  protected $__exportFormatsDataType = 'array';
-  public $exportFormats;
-  protected $__featuresType = 'Google_AboutFeatures';
-  protected $__featuresDataType = 'array';
-  public $features;
-  protected $__importFormatsType = 'Google_AboutImportFormats';
-  protected $__importFormatsDataType = 'array';
-  public $importFormats;
-  public $isCurrentAppInstalled;
-  public $kind;
-  public $largestChangeId;
-  protected $__maxUploadSizesType = 'Google_AboutMaxUploadSizes';
-  protected $__maxUploadSizesDataType = 'array';
-  public $maxUploadSizes;
-  public $name;
-  public $permissionId;
-  public $quotaBytesTotal;
-  public $quotaBytesUsed;
-  public $quotaBytesUsedAggregate;
-  public $quotaBytesUsedInTrash;
-  public $remainingChangeIds;
-  public $rootFolderId;
-  public $selfLink;
-  protected $__userType = 'Google_User';
-  protected $__userDataType = '';
-  public $user;
-  public function setAdditionalRoleInfo(/* array(Google_AboutAdditionalRoleInfo) */ $additionalRoleInfo) {
-    $this->assertIsArray($additionalRoleInfo, 'Google_AboutAdditionalRoleInfo', __METHOD__);
-    $this->additionalRoleInfo = $additionalRoleInfo;
-  }
-  public function getAdditionalRoleInfo() {
-    return $this->additionalRoleInfo;
-  }
-  public function setDomainSharingPolicy($domainSharingPolicy) {
-    $this->domainSharingPolicy = $domainSharingPolicy;
-  }
-  public function getDomainSharingPolicy() {
-    return $this->domainSharingPolicy;
-  }
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setExportFormats(/* array(Google_AboutExportFormats) */ $exportFormats) {
-    $this->assertIsArray($exportFormats, 'Google_AboutExportFormats', __METHOD__);
-    $this->exportFormats = $exportFormats;
-  }
-  public function getExportFormats() {
-    return $this->exportFormats;
-  }
-  public function setFeatures(/* array(Google_AboutFeatures) */ $features) {
-    $this->assertIsArray($features, 'Google_AboutFeatures', __METHOD__);
-    $this->features = $features;
-  }
-  public function getFeatures() {
-    return $this->features;
-  }
-  public function setImportFormats(/* array(Google_AboutImportFormats) */ $importFormats) {
-    $this->assertIsArray($importFormats, 'Google_AboutImportFormats', __METHOD__);
-    $this->importFormats = $importFormats;
-  }
-  public function getImportFormats() {
-    return $this->importFormats;
-  }
-  public function setIsCurrentAppInstalled($isCurrentAppInstalled) {
-    $this->isCurrentAppInstalled = $isCurrentAppInstalled;
-  }
-  public function getIsCurrentAppInstalled() {
-    return $this->isCurrentAppInstalled;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setLargestChangeId($largestChangeId) {
-    $this->largestChangeId = $largestChangeId;
-  }
-  public function getLargestChangeId() {
-    return $this->largestChangeId;
-  }
-  public function setMaxUploadSizes(/* array(Google_AboutMaxUploadSizes) */ $maxUploadSizes) {
-    $this->assertIsArray($maxUploadSizes, 'Google_AboutMaxUploadSizes', __METHOD__);
-    $this->maxUploadSizes = $maxUploadSizes;
-  }
-  public function getMaxUploadSizes() {
-    return $this->maxUploadSizes;
-  }
-  public function setName($name) {
-    $this->name = $name;
-  }
-  public function getName() {
-    return $this->name;
-  }
-  public function setPermissionId($permissionId) {
-    $this->permissionId = $permissionId;
-  }
-  public function getPermissionId() {
-    return $this->permissionId;
-  }
-  public function setQuotaBytesTotal($quotaBytesTotal) {
-    $this->quotaBytesTotal = $quotaBytesTotal;
-  }
-  public function getQuotaBytesTotal() {
-    return $this->quotaBytesTotal;
-  }
-  public function setQuotaBytesUsed($quotaBytesUsed) {
-    $this->quotaBytesUsed = $quotaBytesUsed;
-  }
-  public function getQuotaBytesUsed() {
-    return $this->quotaBytesUsed;
-  }
-  public function setQuotaBytesUsedAggregate($quotaBytesUsedAggregate) {
-    $this->quotaBytesUsedAggregate = $quotaBytesUsedAggregate;
-  }
-  public function getQuotaBytesUsedAggregate() {
-    return $this->quotaBytesUsedAggregate;
-  }
-  public function setQuotaBytesUsedInTrash($quotaBytesUsedInTrash) {
-    $this->quotaBytesUsedInTrash = $quotaBytesUsedInTrash;
-  }
-  public function getQuotaBytesUsedInTrash() {
-    return $this->quotaBytesUsedInTrash;
-  }
-  public function setRemainingChangeIds($remainingChangeIds) {
-    $this->remainingChangeIds = $remainingChangeIds;
-  }
-  public function getRemainingChangeIds() {
-    return $this->remainingChangeIds;
-  }
-  public function setRootFolderId($rootFolderId) {
-    $this->rootFolderId = $rootFolderId;
-  }
-  public function getRootFolderId() {
-    return $this->rootFolderId;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-  public function setUser(Google_User $user) {
-    $this->user = $user;
-  }
-  public function getUser() {
-    return $this->user;
-  }
-}
-
-class Google_AboutAdditionalRoleInfo extends Google_Model {
-  protected $__roleSetsType = 'Google_AboutAdditionalRoleInfoRoleSets';
-  protected $__roleSetsDataType = 'array';
-  public $roleSets;
-  public $type;
-  public function setRoleSets(/* array(Google_AboutAdditionalRoleInfoRoleSets) */ $roleSets) {
-    $this->assertIsArray($roleSets, 'Google_AboutAdditionalRoleInfoRoleSets', __METHOD__);
-    $this->roleSets = $roleSets;
-  }
-  public function getRoleSets() {
-    return $this->roleSets;
-  }
-  public function setType($type) {
-    $this->type = $type;
-  }
-  public function getType() {
-    return $this->type;
-  }
-}
-
-class Google_AboutAdditionalRoleInfoRoleSets extends Google_Model {
-  public $additionalRoles;
-  public $primaryRole;
-  public function setAdditionalRoles(/* array(Google_string) */ $additionalRoles) {
-    $this->assertIsArray($additionalRoles, 'Google_string', __METHOD__);
-    $this->additionalRoles = $additionalRoles;
-  }
-  public function getAdditionalRoles() {
-    return $this->additionalRoles;
-  }
-  public function setPrimaryRole($primaryRole) {
-    $this->primaryRole = $primaryRole;
-  }
-  public function getPrimaryRole() {
-    return $this->primaryRole;
-  }
-}
-
-class Google_AboutExportFormats extends Google_Model {
-  public $source;
-  public $targets;
-  public function setSource($source) {
-    $this->source = $source;
-  }
-  public function getSource() {
-    return $this->source;
-  }
-  public function setTargets(/* array(Google_string) */ $targets) {
-    $this->assertIsArray($targets, 'Google_string', __METHOD__);
-    $this->targets = $targets;
-  }
-  public function getTargets() {
-    return $this->targets;
-  }
-}
-
-class Google_AboutFeatures extends Google_Model {
-  public $featureName;
-  public $featureRate;
-  public function setFeatureName($featureName) {
-    $this->featureName = $featureName;
-  }
-  public function getFeatureName() {
-    return $this->featureName;
-  }
-  public function setFeatureRate($featureRate) {
-    $this->featureRate = $featureRate;
-  }
-  public function getFeatureRate() {
-    return $this->featureRate;
-  }
-}
-
-class Google_AboutImportFormats extends Google_Model {
-  public $source;
-  public $targets;
-  public function setSource($source) {
-    $this->source = $source;
-  }
-  public function getSource() {
-    return $this->source;
-  }
-  public function setTargets(/* array(Google_string) */ $targets) {
-    $this->assertIsArray($targets, 'Google_string', __METHOD__);
-    $this->targets = $targets;
-  }
-  public function getTargets() {
-    return $this->targets;
-  }
-}
-
-class Google_AboutMaxUploadSizes extends Google_Model {
-  public $size;
-  public $type;
-  public function setSize($size) {
-    $this->size = $size;
-  }
-  public function getSize() {
-    return $this->size;
-  }
-  public function setType($type) {
-    $this->type = $type;
-  }
-  public function getType() {
-    return $this->type;
-  }
-}
-
-class Google_App extends Google_Model {
-  public $authorized;
-  protected $__iconsType = 'Google_AppIcons';
-  protected $__iconsDataType = 'array';
-  public $icons;
-  public $id;
-  public $installed;
-  public $kind;
-  public $name;
-  public $objectType;
-  public $primaryFileExtensions;
-  public $primaryMimeTypes;
-  public $productUrl;
-  public $secondaryFileExtensions;
-  public $secondaryMimeTypes;
-  public $supportsCreate;
-  public $supportsImport;
-  public $useByDefault;
-  public function setAuthorized($authorized) {
-    $this->authorized = $authorized;
-  }
-  public function getAuthorized() {
-    return $this->authorized;
-  }
-  public function setIcons(/* array(Google_AppIcons) */ $icons) {
-    $this->assertIsArray($icons, 'Google_AppIcons', __METHOD__);
-    $this->icons = $icons;
-  }
-  public function getIcons() {
-    return $this->icons;
-  }
-  public function setId($id) {
-    $this->id = $id;
-  }
-  public function getId() {
-    return $this->id;
-  }
-  public function setInstalled($installed) {
-    $this->installed = $installed;
-  }
-  public function getInstalled() {
-    return $this->installed;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setName($name) {
-    $this->name = $name;
-  }
-  public function getName() {
-    return $this->name;
-  }
-  public function setObjectType($objectType) {
-    $this->objectType = $objectType;
-  }
-  public function getObjectType() {
-    return $this->objectType;
-  }
-  public function setPrimaryFileExtensions(/* array(Google_string) */ $primaryFileExtensions) {
-    $this->assertIsArray($primaryFileExtensions, 'Google_string', __METHOD__);
-    $this->primaryFileExtensions = $primaryFileExtensions;
-  }
-  public function getPrimaryFileExtensions() {
-    return $this->primaryFileExtensions;
-  }
-  public function setPrimaryMimeTypes(/* array(Google_string) */ $primaryMimeTypes) {
-    $this->assertIsArray($primaryMimeTypes, 'Google_string', __METHOD__);
-    $this->primaryMimeTypes = $primaryMimeTypes;
-  }
-  public function getPrimaryMimeTypes() {
-    return $this->primaryMimeTypes;
-  }
-  public function setProductUrl($productUrl) {
-    $this->productUrl = $productUrl;
-  }
-  public function getProductUrl() {
-    return $this->productUrl;
-  }
-  public function setSecondaryFileExtensions(/* array(Google_string) */ $secondaryFileExtensions) {
-    $this->assertIsArray($secondaryFileExtensions, 'Google_string', __METHOD__);
-    $this->secondaryFileExtensions = $secondaryFileExtensions;
-  }
-  public function getSecondaryFileExtensions() {
-    return $this->secondaryFileExtensions;
-  }
-  public function setSecondaryMimeTypes(/* array(Google_string) */ $secondaryMimeTypes) {
-    $this->assertIsArray($secondaryMimeTypes, 'Google_string', __METHOD__);
-    $this->secondaryMimeTypes = $secondaryMimeTypes;
-  }
-  public function getSecondaryMimeTypes() {
-    return $this->secondaryMimeTypes;
-  }
-  public function setSupportsCreate($supportsCreate) {
-    $this->supportsCreate = $supportsCreate;
-  }
-  public function getSupportsCreate() {
-    return $this->supportsCreate;
-  }
-  public function setSupportsImport($supportsImport) {
-    $this->supportsImport = $supportsImport;
-  }
-  public function getSupportsImport() {
-    return $this->supportsImport;
-  }
-  public function setUseByDefault($useByDefault) {
-    $this->useByDefault = $useByDefault;
-  }
-  public function getUseByDefault() {
-    return $this->useByDefault;
-  }
-}
-
-class Google_AppIcons extends Google_Model {
-  public $category;
-  public $iconUrl;
-  public $size;
-  public function setCategory($category) {
-    $this->category = $category;
-  }
-  public function getCategory() {
-    return $this->category;
-  }
-  public function setIconUrl($iconUrl) {
-    $this->iconUrl = $iconUrl;
-  }
-  public function getIconUrl() {
-    return $this->iconUrl;
-  }
-  public function setSize($size) {
-    $this->size = $size;
-  }
-  public function getSize() {
-    return $this->size;
-  }
-}
-
-class Google_AppList extends Google_Model {
-  public $etag;
-  protected $__itemsType = 'Google_App';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $selfLink;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setItems(/* array(Google_App) */ $items) {
-    $this->assertIsArray($items, 'Google_App', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_Change extends Google_Model {
-  public $deleted;
-  protected $__fileType = 'Google_DriveFile';
-  protected $__fileDataType = '';
-  public $file;
-  public $fileId;
-  public $id;
-  public $kind;
-  public $selfLink;
-  public function setDeleted($deleted) {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted() {
-    return $this->deleted;
-  }
-  public function setFile(Google_DriveFile $file) {
-    $this->file = $file;
-  }
-  public function getFile() {
-    return $this->file;
-  }
-  public function setFileId($fileId) {
-    $this->fileId = $fileId;
-  }
-  public function getFileId() {
-    return $this->fileId;
-  }
-  public function setId($id) {
-    $this->id = $id;
-  }
-  public function getId() {
-    return $this->id;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_ChangeList extends Google_Model {
-  public $etag;
-  protected $__itemsType = 'Google_Change';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $largestChangeId;
-  public $nextLink;
-  public $nextPageToken;
-  public $selfLink;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setItems(/* array(Google_Change) */ $items) {
-    $this->assertIsArray($items, 'Google_Change', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setLargestChangeId($largestChangeId) {
-    $this->largestChangeId = $largestChangeId;
-  }
-  public function getLargestChangeId() {
-    return $this->largestChangeId;
-  }
-  public function setNextLink($nextLink) {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink() {
-    return $this->nextLink;
-  }
-  public function setNextPageToken($nextPageToken) {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken() {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_ChildList extends Google_Model {
-  public $etag;
-  protected $__itemsType = 'Google_ChildReference';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $nextLink;
-  public $nextPageToken;
-  public $selfLink;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setItems(/* array(Google_ChildReference) */ $items) {
-    $this->assertIsArray($items, 'Google_ChildReference', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink) {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink() {
-    return $this->nextLink;
-  }
-  public function setNextPageToken($nextPageToken) {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken() {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_ChildReference extends Google_Model {
-  public $childLink;
-  public $id;
-  public $kind;
-  public $selfLink;
-  public function setChildLink($childLink) {
-    $this->childLink = $childLink;
-  }
-  public function getChildLink() {
-    return $this->childLink;
-  }
-  public function setId($id) {
-    $this->id = $id;
-  }
-  public function getId() {
-    return $this->id;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_Comment extends Google_Model {
-  public $anchor;
-  protected $__authorType = 'Google_User';
-  protected $__authorDataType = '';
-  public $author;
-  public $commentId;
-  public $content;
-  protected $__contextType = 'Google_CommentContext';
-  protected $__contextDataType = '';
-  public $context;
-  public $createdDate;
-  public $deleted;
-  public $fileId;
-  public $fileTitle;
-  public $htmlContent;
-  public $kind;
-  public $modifiedDate;
-  protected $__repliesType = 'Google_CommentReply';
-  protected $__repliesDataType = 'array';
-  public $replies;
-  public $selfLink;
-  public $status;
-  public function setAnchor($anchor) {
-    $this->anchor = $anchor;
-  }
-  public function getAnchor() {
-    return $this->anchor;
-  }
-  public function setAuthor(Google_User $author) {
-    $this->author = $author;
-  }
-  public function getAuthor() {
-    return $this->author;
-  }
-  public function setCommentId($commentId) {
-    $this->commentId = $commentId;
-  }
-  public function getCommentId() {
-    return $this->commentId;
-  }
-  public function setContent($content) {
-    $this->content = $content;
-  }
-  public function getContent() {
-    return $this->content;
-  }
-  public function setContext(Google_CommentContext $context) {
-    $this->context = $context;
-  }
-  public function getContext() {
-    return $this->context;
-  }
-  public function setCreatedDate($createdDate) {
-    $this->createdDate = $createdDate;
-  }
-  public function getCreatedDate() {
-    return $this->createdDate;
-  }
-  public function setDeleted($deleted) {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted() {
-    return $this->deleted;
-  }
-  public function setFileId($fileId) {
-    $this->fileId = $fileId;
-  }
-  public function getFileId() {
-    return $this->fileId;
-  }
-  public function setFileTitle($fileTitle) {
-    $this->fileTitle = $fileTitle;
-  }
-  public function getFileTitle() {
-    return $this->fileTitle;
-  }
-  public function setHtmlContent($htmlContent) {
-    $this->htmlContent = $htmlContent;
-  }
-  public function getHtmlContent() {
-    return $this->htmlContent;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setModifiedDate($modifiedDate) {
-    $this->modifiedDate = $modifiedDate;
-  }
-  public function getModifiedDate() {
-    return $this->modifiedDate;
-  }
-  public function setReplies(/* array(Google_CommentReply) */ $replies) {
-    $this->assertIsArray($replies, 'Google_CommentReply', __METHOD__);
-    $this->replies = $replies;
-  }
-  public function getReplies() {
-    return $this->replies;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-  public function setStatus($status) {
-    $this->status = $status;
-  }
-  public function getStatus() {
-    return $this->status;
-  }
-}
-
-class Google_CommentContext extends Google_Model {
-  public $type;
-  public $value;
-  public function setType($type) {
-    $this->type = $type;
-  }
-  public function getType() {
-    return $this->type;
-  }
-  public function setValue($value) {
-    $this->value = $value;
-  }
-  public function getValue() {
-    return $this->value;
-  }
-}
-
-class Google_CommentList extends Google_Model {
-  protected $__itemsType = 'Google_Comment';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $nextPageToken;
-  public function setItems(/* array(Google_Comment) */ $items) {
-    $this->assertIsArray($items, 'Google_Comment', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken) {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken() {
-    return $this->nextPageToken;
-  }
-}
-
-class Google_CommentReply extends Google_Model {
-  protected $__authorType = 'Google_User';
-  protected $__authorDataType = '';
-  public $author;
-  public $content;
-  public $createdDate;
-  public $deleted;
-  public $htmlContent;
-  public $kind;
-  public $modifiedDate;
-  public $replyId;
-  public $verb;
-  public function setAuthor(Google_User $author) {
-    $this->author = $author;
-  }
-  public function getAuthor() {
-    return $this->author;
-  }
-  public function setContent($content) {
-    $this->content = $content;
-  }
-  public function getContent() {
-    return $this->content;
-  }
-  public function setCreatedDate($createdDate) {
-    $this->createdDate = $createdDate;
-  }
-  public function getCreatedDate() {
-    return $this->createdDate;
-  }
-  public function setDeleted($deleted) {
-    $this->deleted = $deleted;
-  }
-  public function getDeleted() {
-    return $this->deleted;
-  }
-  public function setHtmlContent($htmlContent) {
-    $this->htmlContent = $htmlContent;
-  }
-  public function getHtmlContent() {
-    return $this->htmlContent;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setModifiedDate($modifiedDate) {
-    $this->modifiedDate = $modifiedDate;
-  }
-  public function getModifiedDate() {
-    return $this->modifiedDate;
-  }
-  public function setReplyId($replyId) {
-    $this->replyId = $replyId;
-  }
-  public function getReplyId() {
-    return $this->replyId;
-  }
-  public function setVerb($verb) {
-    $this->verb = $verb;
-  }
-  public function getVerb() {
-    return $this->verb;
-  }
-}
-
-class Google_CommentReplyList extends Google_Model {
-  protected $__itemsType = 'Google_CommentReply';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $nextPageToken;
-  public function setItems(/* array(Google_CommentReply) */ $items) {
-    $this->assertIsArray($items, 'Google_CommentReply', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setNextPageToken($nextPageToken) {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken() {
-    return $this->nextPageToken;
-  }
-}
-
-class Google_DriveFile extends Google_Model {
-  public $alternateLink;
-  public $appDataContents;
-  public $createdDate;
-  public $description;
-  public $downloadUrl;
-  public $editable;
-  public $embedLink;
-  public $etag;
-  public $explicitlyTrashed;
-  public $exportLinks;
-  public $fileExtension;
-  public $fileSize;
-  public $iconLink;
-  public $id;
-  protected $__imageMediaMetadataType = 'Google_DriveFileImageMediaMetadata';
-  protected $__imageMediaMetadataDataType = '';
-  public $imageMediaMetadata;
-  protected $__indexableTextType = 'Google_DriveFileIndexableText';
-  protected $__indexableTextDataType = '';
-  public $indexableText;
-  public $kind;
-  protected $__labelsType = 'Google_DriveFileLabels';
-  protected $__labelsDataType = '';
-  public $labels;
-  protected $__lastModifyingUserType = 'Google_User';
-  protected $__lastModifyingUserDataType = '';
-  public $lastModifyingUser;
-  public $lastModifyingUserName;
-  public $lastViewedByMeDate;
-  public $md5Checksum;
-  public $mimeType;
-  public $modifiedByMeDate;
-  public $modifiedDate;
-  public $originalFilename;
-  public $ownerNames;
-  protected $__ownersType = 'Google_User';
-  protected $__ownersDataType = 'array';
-  public $owners;
-  protected $__parentsType = 'Google_ParentReference';
-  protected $__parentsDataType = 'array';
-  public $parents;
-  public $quotaBytesUsed;
-  public $selfLink;
-  public $shared;
-  public $sharedWithMeDate;
-  protected $__thumbnailType = 'Google_DriveFileThumbnail';
-  protected $__thumbnailDataType = '';
-  public $thumbnail;
-  public $thumbnailLink;
-  public $title;
-  protected $__userPermissionType = 'Google_Permission';
-  protected $__userPermissionDataType = '';
-  public $userPermission;
-  public $webContentLink;
-  public $webViewLink;
-  public $writersCanShare;
-  public function setAlternateLink($alternateLink) {
-    $this->alternateLink = $alternateLink;
-  }
-  public function getAlternateLink() {
-    return $this->alternateLink;
-  }
-  public function setAppDataContents($appDataContents) {
-    $this->appDataContents = $appDataContents;
-  }
-  public function getAppDataContents() {
-    return $this->appDataContents;
-  }
-  public function setCreatedDate($createdDate) {
-    $this->createdDate = $createdDate;
-  }
-  public function getCreatedDate() {
-    return $this->createdDate;
-  }
-  public function setDescription($description) {
-    $this->description = $description;
-  }
-  public function getDescription() {
-    return $this->description;
-  }
-  public function setDownloadUrl($downloadUrl) {
-    $this->downloadUrl = $downloadUrl;
-  }
-  public function getDownloadUrl() {
-    return $this->downloadUrl;
-  }
-  public function setEditable($editable) {
-    $this->editable = $editable;
-  }
-  public function getEditable() {
-    return $this->editable;
-  }
-  public function setEmbedLink($embedLink) {
-    $this->embedLink = $embedLink;
-  }
-  public function getEmbedLink() {
-    return $this->embedLink;
-  }
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setExplicitlyTrashed($explicitlyTrashed) {
-    $this->explicitlyTrashed = $explicitlyTrashed;
-  }
-  public function getExplicitlyTrashed() {
-    return $this->explicitlyTrashed;
-  }
-  public function setExportLinks($exportLinks) {
-    $this->exportLinks = $exportLinks;
-  }
-  public function getExportLinks() {
-    return $this->exportLinks;
-  }
-  public function setFileExtension($fileExtension) {
-    $this->fileExtension = $fileExtension;
-  }
-  public function getFileExtension() {
-    return $this->fileExtension;
-  }
-  public function setFileSize($fileSize) {
-    $this->fileSize = $fileSize;
-  }
-  public function getFileSize() {
-    return $this->fileSize;
-  }
-  public function setIconLink($iconLink) {
-    $this->iconLink = $iconLink;
-  }
-  public function getIconLink() {
-    return $this->iconLink;
-  }
-  public function setId($id) {
-    $this->id = $id;
-  }
-  public function getId() {
-    return $this->id;
-  }
-  public function setImageMediaMetadata(Google_DriveFileImageMediaMetadata $imageMediaMetadata) {
-    $this->imageMediaMetadata = $imageMediaMetadata;
-  }
-  public function getImageMediaMetadata() {
-    return $this->imageMediaMetadata;
-  }
-  public function setIndexableText(Google_DriveFileIndexableText $indexableText) {
-    $this->indexableText = $indexableText;
-  }
-  public function getIndexableText() {
-    return $this->indexableText;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setLabels(Google_DriveFileLabels $labels) {
-    $this->labels = $labels;
-  }
-  public function getLabels() {
-    return $this->labels;
-  }
-  public function setLastModifyingUser(Google_User $lastModifyingUser) {
-    $this->lastModifyingUser = $lastModifyingUser;
-  }
-  public function getLastModifyingUser() {
-    return $this->lastModifyingUser;
-  }
-  public function setLastModifyingUserName($lastModifyingUserName) {
-    $this->lastModifyingUserName = $lastModifyingUserName;
-  }
-  public function getLastModifyingUserName() {
-    return $this->lastModifyingUserName;
-  }
-  public function setLastViewedByMeDate($lastViewedByMeDate) {
-    $this->lastViewedByMeDate = $lastViewedByMeDate;
-  }
-  public function getLastViewedByMeDate() {
-    return $this->lastViewedByMeDate;
-  }
-  public function setMd5Checksum($md5Checksum) {
-    $this->md5Checksum = $md5Checksum;
-  }
-  public function getMd5Checksum() {
-    return $this->md5Checksum;
-  }
-  public function setMimeType($mimeType) {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType() {
-    return $this->mimeType;
-  }
-  public function setModifiedByMeDate($modifiedByMeDate) {
-    $this->modifiedByMeDate = $modifiedByMeDate;
-  }
-  public function getModifiedByMeDate() {
-    return $this->modifiedByMeDate;
-  }
-  public function setModifiedDate($modifiedDate) {
-    $this->modifiedDate = $modifiedDate;
-  }
-  public function getModifiedDate() {
-    return $this->modifiedDate;
-  }
-  public function setOriginalFilename($originalFilename) {
-    $this->originalFilename = $originalFilename;
-  }
-  public function getOriginalFilename() {
-    return $this->originalFilename;
-  }
-  public function setOwnerNames(/* array(Google_string) */ $ownerNames) {
-    $this->assertIsArray($ownerNames, 'Google_string', __METHOD__);
-    $this->ownerNames = $ownerNames;
-  }
-  public function getOwnerNames() {
-    return $this->ownerNames;
-  }
-  public function setOwners(/* array(Google_User) */ $owners) {
-    $this->assertIsArray($owners, 'Google_User', __METHOD__);
-    $this->owners = $owners;
-  }
-  public function getOwners() {
-    return $this->owners;
-  }
-  public function setParents(/* array(Google_ParentReference) */ $parents) {
-    $this->assertIsArray($parents, 'Google_ParentReference', __METHOD__);
-    $this->parents = $parents;
-  }
-  public function getParents() {
-    return $this->parents;
-  }
-  public function setQuotaBytesUsed($quotaBytesUsed) {
-    $this->quotaBytesUsed = $quotaBytesUsed;
-  }
-  public function getQuotaBytesUsed() {
-    return $this->quotaBytesUsed;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-  public function setShared($shared) {
-    $this->shared = $shared;
-  }
-  public function getShared() {
-    return $this->shared;
-  }
-  public function setSharedWithMeDate($sharedWithMeDate) {
-    $this->sharedWithMeDate = $sharedWithMeDate;
-  }
-  public function getSharedWithMeDate() {
-    return $this->sharedWithMeDate;
-  }
-  public function setThumbnail(Google_DriveFileThumbnail $thumbnail) {
-    $this->thumbnail = $thumbnail;
-  }
-  public function getThumbnail() {
-    return $this->thumbnail;
-  }
-  public function setThumbnailLink($thumbnailLink) {
-    $this->thumbnailLink = $thumbnailLink;
-  }
-  public function getThumbnailLink() {
-    return $this->thumbnailLink;
-  }
-  public function setTitle($title) {
-    $this->title = $title;
-  }
-  public function getTitle() {
-    return $this->title;
-  }
-  public function setUserPermission(Google_Permission $userPermission) {
-    $this->userPermission = $userPermission;
-  }
-  public function getUserPermission() {
-    return $this->userPermission;
-  }
-  public function setWebContentLink($webContentLink) {
-    $this->webContentLink = $webContentLink;
-  }
-  public function getWebContentLink() {
-    return $this->webContentLink;
-  }
-  public function setWebViewLink($webViewLink) {
-    $this->webViewLink = $webViewLink;
-  }
-  public function getWebViewLink() {
-    return $this->webViewLink;
-  }
-  public function setWritersCanShare($writersCanShare) {
-    $this->writersCanShare = $writersCanShare;
-  }
-  public function getWritersCanShare() {
-    return $this->writersCanShare;
-  }
-}
-
-class Google_DriveFileImageMediaMetadata extends Google_Model {
-  public $aperture;
-  public $cameraMake;
-  public $cameraModel;
-  public $colorSpace;
-  public $date;
-  public $exposureBias;
-  public $exposureMode;
-  public $exposureTime;
-  public $flashUsed;
-  public $focalLength;
-  public $height;
-  public $isoSpeed;
-  public $lens;
-  protected $__locationType = 'Google_DriveFileImageMediaMetadataLocation';
-  protected $__locationDataType = '';
-  public $location;
-  public $maxApertureValue;
-  public $meteringMode;
-  public $rotation;
-  public $sensor;
-  public $subjectDistance;
-  public $whiteBalance;
-  public $width;
-  public function setAperture($aperture) {
-    $this->aperture = $aperture;
-  }
-  public function getAperture() {
-    return $this->aperture;
-  }
-  public function setCameraMake($cameraMake) {
-    $this->cameraMake = $cameraMake;
-  }
-  public function getCameraMake() {
-    return $this->cameraMake;
-  }
-  public function setCameraModel($cameraModel) {
-    $this->cameraModel = $cameraModel;
-  }
-  public function getCameraModel() {
-    return $this->cameraModel;
-  }
-  public function setColorSpace($colorSpace) {
-    $this->colorSpace = $colorSpace;
-  }
-  public function getColorSpace() {
-    return $this->colorSpace;
-  }
-  public function setDate($date) {
-    $this->date = $date;
-  }
-  public function getDate() {
-    return $this->date;
-  }
-  public function setExposureBias($exposureBias) {
-    $this->exposureBias = $exposureBias;
-  }
-  public function getExposureBias() {
-    return $this->exposureBias;
-  }
-  public function setExposureMode($exposureMode) {
-    $this->exposureMode = $exposureMode;
-  }
-  public function getExposureMode() {
-    return $this->exposureMode;
-  }
-  public function setExposureTime($exposureTime) {
-    $this->exposureTime = $exposureTime;
-  }
-  public function getExposureTime() {
-    return $this->exposureTime;
-  }
-  public function setFlashUsed($flashUsed) {
-    $this->flashUsed = $flashUsed;
-  }
-  public function getFlashUsed() {
-    return $this->flashUsed;
-  }
-  public function setFocalLength($focalLength) {
-    $this->focalLength = $focalLength;
-  }
-  public function getFocalLength() {
-    return $this->focalLength;
-  }
-  public function setHeight($height) {
-    $this->height = $height;
-  }
-  public function getHeight() {
-    return $this->height;
-  }
-  public function setIsoSpeed($isoSpeed) {
-    $this->isoSpeed = $isoSpeed;
-  }
-  public function getIsoSpeed() {
-    return $this->isoSpeed;
-  }
-  public function setLens($lens) {
-    $this->lens = $lens;
-  }
-  public function getLens() {
-    return $this->lens;
-  }
-  public function setLocation(Google_DriveFileImageMediaMetadataLocation $location) {
-    $this->location = $location;
-  }
-  public function getLocation() {
-    return $this->location;
-  }
-  public function setMaxApertureValue($maxApertureValue) {
-    $this->maxApertureValue = $maxApertureValue;
-  }
-  public function getMaxApertureValue() {
-    return $this->maxApertureValue;
-  }
-  public function setMeteringMode($meteringMode) {
-    $this->meteringMode = $meteringMode;
-  }
-  public function getMeteringMode() {
-    return $this->meteringMode;
-  }
-  public function setRotation($rotation) {
-    $this->rotation = $rotation;
-  }
-  public function getRotation() {
-    return $this->rotation;
-  }
-  public function setSensor($sensor) {
-    $this->sensor = $sensor;
-  }
-  public function getSensor() {
-    return $this->sensor;
-  }
-  public function setSubjectDistance($subjectDistance) {
-    $this->subjectDistance = $subjectDistance;
-  }
-  public function getSubjectDistance() {
-    return $this->subjectDistance;
-  }
-  public function setWhiteBalance($whiteBalance) {
-    $this->whiteBalance = $whiteBalance;
-  }
-  public function getWhiteBalance() {
-    return $this->whiteBalance;
-  }
-  public function setWidth($width) {
-    $this->width = $width;
-  }
-  public function getWidth() {
-    return $this->width;
-  }
-}
-
-class Google_DriveFileImageMediaMetadataLocation extends Google_Model {
-  public $altitude;
-  public $latitude;
-  public $longitude;
-  public function setAltitude($altitude) {
-    $this->altitude = $altitude;
-  }
-  public function getAltitude() {
-    return $this->altitude;
-  }
-  public function setLatitude($latitude) {
-    $this->latitude = $latitude;
-  }
-  public function getLatitude() {
-    return $this->latitude;
-  }
-  public function setLongitude($longitude) {
-    $this->longitude = $longitude;
-  }
-  public function getLongitude() {
-    return $this->longitude;
-  }
-}
-
-class Google_DriveFileIndexableText extends Google_Model {
-  public $text;
-  public function setText($text) {
-    $this->text = $text;
-  }
-  public function getText() {
-    return $this->text;
-  }
-}
-
-class Google_DriveFileLabels extends Google_Model {
-  public $hidden;
-  public $restricted;
-  public $starred;
-  public $trashed;
-  public $viewed;
-  public function setHidden($hidden) {
-    $this->hidden = $hidden;
-  }
-  public function getHidden() {
-    return $this->hidden;
-  }
-  public function setRestricted($restricted) {
-    $this->restricted = $restricted;
-  }
-  public function getRestricted() {
-    return $this->restricted;
-  }
-  public function setStarred($starred) {
-    $this->starred = $starred;
-  }
-  public function getStarred() {
-    return $this->starred;
-  }
-  public function setTrashed($trashed) {
-    $this->trashed = $trashed;
-  }
-  public function getTrashed() {
-    return $this->trashed;
-  }
-  public function setViewed($viewed) {
-    $this->viewed = $viewed;
-  }
-  public function getViewed() {
-    return $this->viewed;
-  }
-}
-
-class Google_DriveFileThumbnail extends Google_Model {
-  public $image;
-  public $mimeType;
-  public function setImage($image) {
-    $this->image = $image;
-  }
-  public function getImage() {
-    return $this->image;
-  }
-  public function setMimeType($mimeType) {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType() {
-    return $this->mimeType;
-  }
-}
-
-class Google_FileList extends Google_Model {
-  public $etag;
-  protected $__itemsType = 'Google_DriveFile';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $nextLink;
-  public $nextPageToken;
-  public $selfLink;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setItems(/* array(Google_DriveFile) */ $items) {
-    $this->assertIsArray($items, 'Google_DriveFile', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setNextLink($nextLink) {
-    $this->nextLink = $nextLink;
-  }
-  public function getNextLink() {
-    return $this->nextLink;
-  }
-  public function setNextPageToken($nextPageToken) {
-    $this->nextPageToken = $nextPageToken;
-  }
-  public function getNextPageToken() {
-    return $this->nextPageToken;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_ParentList extends Google_Model {
-  public $etag;
-  protected $__itemsType = 'Google_ParentReference';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $selfLink;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setItems(/* array(Google_ParentReference) */ $items) {
-    $this->assertIsArray($items, 'Google_ParentReference', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_ParentReference extends Google_Model {
-  public $id;
-  public $isRoot;
-  public $kind;
-  public $parentLink;
-  public $selfLink;
-  public function setId($id) {
-    $this->id = $id;
-  }
-  public function getId() {
-    return $this->id;
-  }
-  public function setIsRoot($isRoot) {
-    $this->isRoot = $isRoot;
-  }
-  public function getIsRoot() {
-    return $this->isRoot;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setParentLink($parentLink) {
-    $this->parentLink = $parentLink;
-  }
-  public function getParentLink() {
-    return $this->parentLink;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_Permission extends Google_Model {
-  public $additionalRoles;
-  public $authKey;
-  public $etag;
-  public $id;
-  public $kind;
-  public $name;
-  public $photoLink;
-  public $role;
-  public $selfLink;
-  public $type;
-  public $value;
-  public $withLink;
-  public function setAdditionalRoles(/* array(Google_string) */ $additionalRoles) {
-    $this->assertIsArray($additionalRoles, 'Google_string', __METHOD__);
-    $this->additionalRoles = $additionalRoles;
-  }
-  public function getAdditionalRoles() {
-    return $this->additionalRoles;
-  }
-  public function setAuthKey($authKey) {
-    $this->authKey = $authKey;
-  }
-  public function getAuthKey() {
-    return $this->authKey;
-  }
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setId($id) {
-    $this->id = $id;
-  }
-  public function getId() {
-    return $this->id;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setName($name) {
-    $this->name = $name;
-  }
-  public function getName() {
-    return $this->name;
-  }
-  public function setPhotoLink($photoLink) {
-    $this->photoLink = $photoLink;
-  }
-  public function getPhotoLink() {
-    return $this->photoLink;
-  }
-  public function setRole($role) {
-    $this->role = $role;
-  }
-  public function getRole() {
-    return $this->role;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-  public function setType($type) {
-    $this->type = $type;
-  }
-  public function getType() {
-    return $this->type;
-  }
-  public function setValue($value) {
-    $this->value = $value;
-  }
-  public function getValue() {
-    return $this->value;
-  }
-  public function setWithLink($withLink) {
-    $this->withLink = $withLink;
-  }
-  public function getWithLink() {
-    return $this->withLink;
-  }
-}
-
-class Google_PermissionList extends Google_Model {
-  public $etag;
-  protected $__itemsType = 'Google_Permission';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $selfLink;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setItems(/* array(Google_Permission) */ $items) {
-    $this->assertIsArray($items, 'Google_Permission', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_Property extends Google_Model {
-  public $etag;
-  public $key;
-  public $kind;
-  public $selfLink;
-  public $value;
-  public $visibility;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setKey($key) {
-    $this->key = $key;
-  }
-  public function getKey() {
-    return $this->key;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-  public function setValue($value) {
-    $this->value = $value;
-  }
-  public function getValue() {
-    return $this->value;
-  }
-  public function setVisibility($visibility) {
-    $this->visibility = $visibility;
-  }
-  public function getVisibility() {
-    return $this->visibility;
-  }
-}
-
-class Google_PropertyList extends Google_Model {
-  public $etag;
-  protected $__itemsType = 'Google_Property';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $selfLink;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setItems(/* array(Google_Property) */ $items) {
-    $this->assertIsArray($items, 'Google_Property', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_Revision extends Google_Model {
-  public $downloadUrl;
-  public $etag;
-  public $exportLinks;
-  public $fileSize;
-  public $id;
-  public $kind;
-  protected $__lastModifyingUserType = 'Google_User';
-  protected $__lastModifyingUserDataType = '';
-  public $lastModifyingUser;
-  public $lastModifyingUserName;
-  public $md5Checksum;
-  public $mimeType;
-  public $modifiedDate;
-  public $originalFilename;
-  public $pinned;
-  public $publishAuto;
-  public $published;
-  public $publishedLink;
-  public $publishedOutsideDomain;
-  public $selfLink;
-  public function setDownloadUrl($downloadUrl) {
-    $this->downloadUrl = $downloadUrl;
-  }
-  public function getDownloadUrl() {
-    return $this->downloadUrl;
-  }
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setExportLinks($exportLinks) {
-    $this->exportLinks = $exportLinks;
-  }
-  public function getExportLinks() {
-    return $this->exportLinks;
-  }
-  public function setFileSize($fileSize) {
-    $this->fileSize = $fileSize;
-  }
-  public function getFileSize() {
-    return $this->fileSize;
-  }
-  public function setId($id) {
-    $this->id = $id;
-  }
-  public function getId() {
-    return $this->id;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setLastModifyingUser(Google_User $lastModifyingUser) {
-    $this->lastModifyingUser = $lastModifyingUser;
-  }
-  public function getLastModifyingUser() {
-    return $this->lastModifyingUser;
-  }
-  public function setLastModifyingUserName($lastModifyingUserName) {
-    $this->lastModifyingUserName = $lastModifyingUserName;
-  }
-  public function getLastModifyingUserName() {
-    return $this->lastModifyingUserName;
-  }
-  public function setMd5Checksum($md5Checksum) {
-    $this->md5Checksum = $md5Checksum;
-  }
-  public function getMd5Checksum() {
-    return $this->md5Checksum;
-  }
-  public function setMimeType($mimeType) {
-    $this->mimeType = $mimeType;
-  }
-  public function getMimeType() {
-    return $this->mimeType;
-  }
-  public function setModifiedDate($modifiedDate) {
-    $this->modifiedDate = $modifiedDate;
-  }
-  public function getModifiedDate() {
-    return $this->modifiedDate;
-  }
-  public function setOriginalFilename($originalFilename) {
-    $this->originalFilename = $originalFilename;
-  }
-  public function getOriginalFilename() {
-    return $this->originalFilename;
-  }
-  public function setPinned($pinned) {
-    $this->pinned = $pinned;
-  }
-  public function getPinned() {
-    return $this->pinned;
-  }
-  public function setPublishAuto($publishAuto) {
-    $this->publishAuto = $publishAuto;
-  }
-  public function getPublishAuto() {
-    return $this->publishAuto;
-  }
-  public function setPublished($published) {
-    $this->published = $published;
-  }
-  public function getPublished() {
-    return $this->published;
-  }
-  public function setPublishedLink($publishedLink) {
-    $this->publishedLink = $publishedLink;
-  }
-  public function getPublishedLink() {
-    return $this->publishedLink;
-  }
-  public function setPublishedOutsideDomain($publishedOutsideDomain) {
-    $this->publishedOutsideDomain = $publishedOutsideDomain;
-  }
-  public function getPublishedOutsideDomain() {
-    return $this->publishedOutsideDomain;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_RevisionList extends Google_Model {
-  public $etag;
-  protected $__itemsType = 'Google_Revision';
-  protected $__itemsDataType = 'array';
-  public $items;
-  public $kind;
-  public $selfLink;
-  public function setEtag($etag) {
-    $this->etag = $etag;
-  }
-  public function getEtag() {
-    return $this->etag;
-  }
-  public function setItems(/* array(Google_Revision) */ $items) {
-    $this->assertIsArray($items, 'Google_Revision', __METHOD__);
-    $this->items = $items;
-  }
-  public function getItems() {
-    return $this->items;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setSelfLink($selfLink) {
-    $this->selfLink = $selfLink;
-  }
-  public function getSelfLink() {
-    return $this->selfLink;
-  }
-}
-
-class Google_User extends Google_Model {
-  public $displayName;
-  public $isAuthenticatedUser;
-  public $kind;
-  public $permissionId;
-  protected $__pictureType = 'Google_UserPicture';
-  protected $__pictureDataType = '';
-  public $picture;
-  public function setDisplayName($displayName) {
-    $this->displayName = $displayName;
-  }
-  public function getDisplayName() {
-    return $this->displayName;
-  }
-  public function setIsAuthenticatedUser($isAuthenticatedUser) {
-    $this->isAuthenticatedUser = $isAuthenticatedUser;
-  }
-  public function getIsAuthenticatedUser() {
-    return $this->isAuthenticatedUser;
-  }
-  public function setKind($kind) {
-    $this->kind = $kind;
-  }
-  public function getKind() {
-    return $this->kind;
-  }
-  public function setPermissionId($permissionId) {
-    $this->permissionId = $permissionId;
-  }
-  public function getPermissionId() {
-    return $this->permissionId;
-  }
-  public function setPicture(Google_UserPicture $picture) {
-    $this->picture = $picture;
-  }
-  public function getPicture() {
-    return $this->picture;
-  }
-}
-
-class Google_UserPicture extends Google_Model {
-  public $url;
-  public function setUrl($url) {
-    $this->url = $url;
-  }
-  public function getUrl() {
-    return $this->url;
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php b/apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php
deleted file mode 100644
index 594adbb15e2..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/external/URITemplateParser.php
+++ /dev/null
@@ -1,209 +0,0 @@
-<?php
-/*
-Copyright (c) 2010 Kevin M Burns Jr, http://kevburnsjr.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-/**
- * A URI Template Parser which is used by the apiREST class to resolve the REST requests
- * Blogpost: http://lab.kevburnsjr.com/php-uri-template-parser
- * Source: http://github.com/KevBurnsJr/php-uri-template-parser
- */
-class URI_Template_Parser {
-
-  public static $operators = array('+', ';', '?', '/', '.');
-  public static $reserved_operators = array('|', '!', '@');
-  public static $explode_modifiers = array('+', '*');
-  public static $partial_modifiers = array(':', '^');
-
-  public static $gen_delims = array(':', '/', '?', '#', '[', ']', '@');
-  public static $gen_delims_pct = array('%3A', '%2F', '%3F', '%23', '%5B', '%5D', '%40');
-  public static $sub_delims = array('!', '$', '&', '\'', '(', ')', '*', '+', ',', ';', '=');
-  public static $sub_delims_pct = array('%21', '%24', '%26', '%27', '%28', '%29', '%2A', '%2B', '%2C', '%3B', '%3D');
-  public static $reserved;
-  public static $reserved_pct;
-
-  public function __construct($template) {
-    self::$reserved = array_merge(self::$gen_delims, self::$sub_delims);
-    self::$reserved_pct = array_merge(self::$gen_delims_pct, self::$sub_delims_pct);
-    $this->template = $template;
-  }
-
-  public function expand($data) {
-    // Modification to make this a bit more performant (since gettype is very slow)
-    if (! is_array($data)) {
-      $data = (array)$data;
-    }
-    /*
-    // Original code, which uses a slow gettype() statement, kept in place for if the assumption that is_array always works here is incorrect
-    switch (gettype($data)) {
-      case "boolean":
-      case "integer":
-      case "double":
-      case "string":
-      case "object":
-        $data = (array)$data;
-        break;
-    }
-*/
-
-    // Resolve template vars
-    preg_match_all('/\{([^\}]*)\}/', $this->template, $em);
-
-    foreach ($em[1] as $i => $bare_expression) {
-      preg_match('/^([\+\;\?\/\.]{1})?(.*)$/', $bare_expression, $lm);
-      $exp = new StdClass();
-      $exp->expression = $em[0][$i];
-      $exp->operator = $lm[1];
-      $exp->variable_list = $lm[2];
-      $exp->varspecs = explode(',', $exp->variable_list);
-      $exp->vars = array();
-      foreach ($exp->varspecs as $varspec) {
-        preg_match('/^([a-zA-Z0-9_]+)([\*\+]{1})?([\:\^][0-9-]+)?(\=[^,]+)?$/', $varspec, $vm);
-        $var = new StdClass();
-        $var->name = $vm[1];
-        $var->modifier = isset($vm[2]) && $vm[2] ? $vm[2] : null;
-        $var->modifier = isset($vm[3]) && $vm[3] ? $vm[3] : $var->modifier;
-        $var->default = isset($vm[4]) ? substr($vm[4], 1) : null;
-        $exp->vars[] = $var;
-      }
-
-      // Add processing flags
-      $exp->reserved = false;
-      $exp->prefix = '';
-      $exp->delimiter = ',';
-      switch ($exp->operator) {
-        case '+':
-          $exp->reserved = 'true';
-          break;
-        case ';':
-          $exp->prefix = ';';
-          $exp->delimiter = ';';
-          break;
-        case '?':
-          $exp->prefix = '?';
-          $exp->delimiter = '&';
-          break;
-        case '/':
-          $exp->prefix = '/';
-          $exp->delimiter = '/';
-          break;
-        case '.':
-          $exp->prefix = '.';
-          $exp->delimiter = '.';
-          break;
-      }
-      $expressions[] = $exp;
-    }
-
-    // Expansion
-    $this->expansion = $this->template;
-
-    foreach ($expressions as $exp) {
-      $part = $exp->prefix;
-      $exp->one_var_defined = false;
-      foreach ($exp->vars as $var) {
-        $val = '';
-        if ($exp->one_var_defined && isset($data[$var->name])) {
-          $part .= $exp->delimiter;
-        }
-        // Variable present
-        if (isset($data[$var->name])) {
-          $exp->one_var_defined = true;
-          $var->data = $data[$var->name];
-
-          $val = self::val_from_var($var, $exp);
-
-        // Variable missing
-        } else {
-          if ($var->default) {
-            $exp->one_var_defined = true;
-            $val = $var->default;
-          }
-        }
-        $part .= $val;
-      }
-      if (! $exp->one_var_defined) $part = '';
-      $this->expansion = str_replace($exp->expression, $part, $this->expansion);
-    }
-
-    return $this->expansion;
-  }
-
-  private function val_from_var($var, $exp) {
-    $val = '';
-    if (is_array($var->data)) {
-      $i = 0;
-      if ($exp->operator == '?' && ! $var->modifier) {
-        $val .= $var->name . '=';
-      }
-      foreach ($var->data as $k => $v) {
-        $del = $var->modifier ? $exp->delimiter : ',';
-        $ek = rawurlencode($k);
-        $ev = rawurlencode($v);
-
-        // Array
-        if ($k !== $i) {
-          if ($var->modifier == '+') {
-            $val .= $var->name . '.';
-          }
-          if ($exp->operator == '?' && $var->modifier || $exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+') {
-            $val .= $ek . '=';
-          } else {
-            $val .= $ek . $del;
-          }
-
-        // List
-        } else {
-          if ($var->modifier == '+') {
-            if ($exp->operator == ';' && $var->modifier == '*' || $exp->operator == ';' && $var->modifier == '+' || $exp->operator == '?' && $var->modifier == '+') {
-              $val .= $var->name . '=';
-            } else {
-              $val .= $var->name . '.';
-            }
-          }
-        }
-        $val .= $ev . $del;
-        $i ++;
-      }
-      $val = trim($val, $del);
-
-    // Strings, numbers, etc.
-    } else {
-      if ($exp->operator == '?') {
-        $val = $var->name . (isset($var->data) ? '=' : '');
-      } else if ($exp->operator == ';') {
-        $val = $var->name . ($var->data ? '=' : '');
-      }
-      $val .= rawurlencode($var->data);
-      if ($exp->operator == '+') {
-        $val = str_replace(self::$reserved_pct, self::$reserved, $val);
-      }
-    }
-    return $val;
-  }
-
-  public function match($uri) {}
-
-  public function __toString() {
-    return $this->template;
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CurlIO.php b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CurlIO.php
deleted file mode 100644
index 65352f29882..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_CurlIO.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Curl based implementation of apiIO.
- *
- * @author Chris Chabot <chabotc@google.com>
- * @author Chirag Shah <chirags@google.com>
- */
-
-require_once 'Google_CacheParser.php';
-
-class Google_CurlIO implements Google_IO {
-  const CONNECTION_ESTABLISHED = "HTTP/1.0 200 Connection established\r\n\r\n";
-  const FORM_URLENCODED = 'application/x-www-form-urlencoded';
-
-  private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
-  private static $HOP_BY_HOP = array(
-      'connection', 'keep-alive', 'proxy-authenticate', 'proxy-authorization',
-      'te', 'trailers', 'transfer-encoding', 'upgrade');
-
-  private $curlParams = array (
-      CURLOPT_RETURNTRANSFER => true,
-      CURLOPT_FOLLOWLOCATION => 0,
-      CURLOPT_FAILONERROR => false,
-      CURLOPT_SSL_VERIFYPEER => true,
-      CURLOPT_HEADER => true,
-      CURLOPT_VERBOSE => false,
-  );
-
-  /**
-   * Perform an authenticated / signed apiHttpRequest.
-   * This function takes the apiHttpRequest, calls apiAuth->sign on it
-   * (which can modify the request in what ever way fits the auth mechanism)
-   * and then calls apiCurlIO::makeRequest on the signed request
-   *
-   * @param Google_HttpRequest $request
-   * @return Google_HttpRequest The resulting HTTP response including the
-   * responseHttpCode, responseHeaders and responseBody.
-   */
-  public function authenticatedRequest(Google_HttpRequest $request) {
-    $request = Google_Client::$auth->sign($request);
-    return $this->makeRequest($request);
-  }
-
-  /**
-   * Execute a apiHttpRequest
-   *
-   * @param Google_HttpRequest $request the http request to be executed
-   * @return Google_HttpRequest http request with the response http code, response
-   * headers and response body filled in
-   * @throws Google_IOException on curl or IO error
-   */
-  public function makeRequest(Google_HttpRequest $request) {
-    // First, check to see if we have a valid cached version.
-    $cached = $this->getCachedRequest($request);
-    if ($cached !== false) {
-      if (Google_CacheParser::mustRevalidate($cached)) {
-        $addHeaders = array();
-        if ($cached->getResponseHeader('etag')) {
-          // [13.3.4] If an entity tag has been provided by the origin server,
-          // we must use that entity tag in any cache-conditional request.
-          $addHeaders['If-None-Match'] = $cached->getResponseHeader('etag');
-        } elseif ($cached->getResponseHeader('date')) {
-          $addHeaders['If-Modified-Since'] = $cached->getResponseHeader('date');
-        }
-
-        $request->setRequestHeaders($addHeaders);
-      } else {
-        // No need to revalidate the request, return it directly
-        return $cached;
-      }
-    }
-
-    if (array_key_exists($request->getRequestMethod(),
-          self::$ENTITY_HTTP_METHODS)) {
-      $request = $this->processEntityRequest($request);
-    }
-
-    $ch = curl_init();
-    curl_setopt_array($ch, $this->curlParams);
-    curl_setopt($ch, CURLOPT_URL, $request->getUrl());
-    if ($request->getPostBody()) {
-      curl_setopt($ch, CURLOPT_POSTFIELDS, $request->getPostBody());
-    }
-
-    $requestHeaders = $request->getRequestHeaders();
-    if ($requestHeaders && is_array($requestHeaders)) {
-      $parsed = array();
-      foreach ($requestHeaders as $k => $v) {
-        $parsed[] = "$k: $v";
-      }
-      curl_setopt($ch, CURLOPT_HTTPHEADER, $parsed);
-    }
-
-    curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $request->getRequestMethod());
-    curl_setopt($ch, CURLOPT_USERAGENT, $request->getUserAgent());
-    $respData = curl_exec($ch);
-
-    // Retry if certificates are missing.
-    if (curl_errno($ch) == CURLE_SSL_CACERT) {
-      error_log('SSL certificate problem, verify that the CA cert is OK.'
-        . ' Retrying with the CA cert bundle from google-api-php-client.');
-      curl_setopt($ch, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
-      $respData = curl_exec($ch);
-    }
-
-    $respHeaderSize = curl_getinfo($ch, CURLINFO_HEADER_SIZE);
-    $respHttpCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
-    $curlErrorNum = curl_errno($ch);
-    $curlError = curl_error($ch);
-    curl_close($ch);
-    if ($curlErrorNum != CURLE_OK) {
-      throw new Google_IOException("HTTP Error: ($respHttpCode) $curlError");
-    }
-
-    // Parse out the raw response into usable bits
-    list($responseHeaders, $responseBody) =
-          self::parseHttpResponse($respData, $respHeaderSize);
-
-    if ($respHttpCode == 304 && $cached) {
-      // If the server responded NOT_MODIFIED, return the cached request.
-      if (isset($responseHeaders['connection'])) {
-        $hopByHop = array_merge(
-          self::$HOP_BY_HOP,
-          explode(',', $responseHeaders['connection'])
-        );
-
-        $endToEnd = array();
-        foreach($hopByHop as $key) {
-          if (isset($responseHeaders[$key])) {
-            $endToEnd[$key] = $responseHeaders[$key];
-          }
-        }
-        $cached->setResponseHeaders($endToEnd);
-      }
-      return $cached;
-    }
-
-    // Fill in the apiHttpRequest with the response values
-    $request->setResponseHttpCode($respHttpCode);
-    $request->setResponseHeaders($responseHeaders);
-    $request->setResponseBody($responseBody);
-    // Store the request in cache (the function checks to see if the request
-    // can actually be cached)
-    $this->setCachedRequest($request);
-    // And finally return it
-    return $request;
-  }
-
-  /**
-   * @visible for testing.
-   * Cache the response to an HTTP request if it is cacheable.
-   * @param Google_HttpRequest $request
-   * @return bool Returns true if the insertion was successful.
-   * Otherwise, return false.
-   */
-  public function setCachedRequest(Google_HttpRequest $request) {
-    // Determine if the request is cacheable.
-    if (Google_CacheParser::isResponseCacheable($request)) {
-      Google_Client::$cache->set($request->getCacheKey(), $request);
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * @visible for testing.
-   * @param Google_HttpRequest $request
-   * @return Google_HttpRequest|bool Returns the cached object or
-   * false if the operation was unsuccessful.
-   */
-  public function getCachedRequest(Google_HttpRequest $request) {
-    if (false == Google_CacheParser::isRequestCacheable($request)) {
-      false;
-    }
-
-    return Google_Client::$cache->get($request->getCacheKey());
-  }
-
-  /**
-   * @param $respData
-   * @param $headerSize
-   * @return array
-   */
-  public static function parseHttpResponse($respData, $headerSize) {
-    if (stripos($respData, self::CONNECTION_ESTABLISHED) !== false) {
-      $respData = str_ireplace(self::CONNECTION_ESTABLISHED, '', $respData);
-    }
-
-    if ($headerSize) {
-      $responseBody = substr($respData, $headerSize);
-      $responseHeaders = substr($respData, 0, $headerSize);
-    } else {
-      list($responseHeaders, $responseBody) = explode("\r\n\r\n", $respData, 2);
-    }
-
-    $responseHeaders = self::parseResponseHeaders($responseHeaders);
-    return array($responseHeaders, $responseBody);
-  }
-
-  public static function parseResponseHeaders($rawHeaders) {
-    $responseHeaders = array();
-
-    $responseHeaderLines = explode("\r\n", $rawHeaders);
-    foreach ($responseHeaderLines as $headerLine) {
-      if ($headerLine && strpos($headerLine, ':') !== false) {
-        list($header, $value) = explode(': ', $headerLine, 2);
-        $header = strtolower($header);
-        if (isset($responseHeaders[$header])) {
-          $responseHeaders[$header] .= "\n" . $value;
-        } else {
-          $responseHeaders[$header] = $value;
-        }
-      }
-    }
-    return $responseHeaders;
-  }
-
-  /**
-   * @visible for testing
-   * Process an http request that contains an enclosed entity.
-   * @param Google_HttpRequest $request
-   * @return Google_HttpRequest Processed request with the enclosed entity.
-   */
-  public function processEntityRequest(Google_HttpRequest $request) {
-    $postBody = $request->getPostBody();
-    $contentType = $request->getRequestHeader("content-type");
-
-    // Set the default content-type as application/x-www-form-urlencoded.
-    if (false == $contentType) {
-      $contentType = self::FORM_URLENCODED;
-      $request->setRequestHeaders(array('content-type' => $contentType));
-    }
-
-    // Force the payload to match the content-type asserted in the header.
-    if ($contentType == self::FORM_URLENCODED && is_array($postBody)) {
-      $postBody = http_build_query($postBody, '', '&');
-      $request->setPostBody($postBody);
-    }
-
-    // Make sure the content-length header is set.
-    if (!$postBody || is_string($postBody)) {
-      $postsLength = strlen($postBody);
-      $request->setRequestHeaders(array('content-length' => $postsLength));
-    }
-
-    return $request;
-  }
-
-  /**
-   * Set options that update cURL's default behavior.
-   * The list of accepted options are:
-   * {@link http://php.net/manual/en/function.curl-setopt.php]
-   *
-   * @param array $optCurlParams Multiple options used by a cURL session.
-   */
-  public function setOptions($optCurlParams) {
-    foreach ($optCurlParams as $key => $val) {
-      $this->curlParams[$key] = $val;
-    }
-  }
-}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_HttpRequest.php b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_HttpRequest.php
deleted file mode 100644
index b98eae54008..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_HttpRequest.php
+++ /dev/null
@@ -1,304 +0,0 @@
-<?php
-/*
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * HTTP Request to be executed by apiIO classes. Upon execution, the
- * responseHttpCode, responseHeaders and responseBody will be filled in.
- *
- * @author Chris Chabot <chabotc@google.com>
- * @author Chirag Shah <chirags@google.com>
- *
- */
-class Google_HttpRequest {
-  const USER_AGENT_SUFFIX = "google-api-php-client/0.6.0";
-  private $batchHeaders = array(
-    'Content-Type' => 'application/http',
-    'Content-Transfer-Encoding' => 'binary',
-    'MIME-Version' => '1.0',
-    'Content-Length' => ''
-  );
-
-  protected $url;
-  protected $requestMethod;
-  protected $requestHeaders;
-  protected $postBody;
-  protected $userAgent;
-
-  protected $responseHttpCode;
-  protected $responseHeaders;
-  protected $responseBody;
-  
-  public $accessKey;
-
-  public function __construct($url, $method = 'GET', $headers = array(), $postBody = null) {
-    $this->setUrl($url);
-    $this->setRequestMethod($method);
-    $this->setRequestHeaders($headers);
-    $this->setPostBody($postBody);
-
-    global $apiConfig;
-    if (empty($apiConfig['application_name'])) {
-      $this->userAgent = self::USER_AGENT_SUFFIX;
-    } else {
-      $this->userAgent = $apiConfig['application_name'] . " " . self::USER_AGENT_SUFFIX;
-    }
-  }
-
-  /**
-   * Misc function that returns the base url component of the $url
-   * used by the OAuth signing class to calculate the base string
-   * @return string The base url component of the $url.
-   * @see http://oauth.net/core/1.0a/#anchor13
-   */
-  public function getBaseUrl() {
-    if ($pos = strpos($this->url, '?')) {
-      return substr($this->url, 0, $pos);
-    }
-    return $this->url;
-  }
-
-  /**
-   * Misc function that returns an array of the query parameters of the current
-   * url used by the OAuth signing class to calculate the signature
-   * @return array Query parameters in the query string.
-   */
-  public function getQueryParams() {
-    if ($pos = strpos($this->url, '?')) {
-      $queryStr = substr($this->url, $pos + 1);
-      $params = array();
-      parse_str($queryStr, $params);
-      return $params;
-    }
-    return array();
-  }
-
-  /**
-   * @return string HTTP Response Code.
-   */
-  public function getResponseHttpCode() {
-    return (int) $this->responseHttpCode;
-  }
-
-  /**
-   * @param int $responseHttpCode HTTP Response Code.
-   */
-  public function setResponseHttpCode($responseHttpCode) {
-    $this->responseHttpCode = $responseHttpCode;
-  }
-
-  /**
-   * @return $responseHeaders (array) HTTP Response Headers.
-   */
-  public function getResponseHeaders() {
-    return $this->responseHeaders;
-  }
-
-  /**
-   * @return string HTTP Response Body
-   */
-  public function getResponseBody() {
-    return $this->responseBody;
-  }
-
-  /**
-   * @param array $headers The HTTP response headers
-   * to be normalized.
-   */
-  public function setResponseHeaders($headers) {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->responseHeaders) {
-      $headers = array_merge($this->responseHeaders, $headers);
-    }
-
-    $this->responseHeaders = $headers;
-  }
-
-  /**
-   * @param string $key
-   * @return array|boolean Returns the requested HTTP header or
-   * false if unavailable.
-   */
-  public function getResponseHeader($key) {
-    return isset($this->responseHeaders[$key])
-        ? $this->responseHeaders[$key]
-        : false;
-  }
-
-  /**
-   * @param string $responseBody The HTTP response body.
-   */
-  public function setResponseBody($responseBody) {
-    $this->responseBody = $responseBody;
-  }
-
-  /**
-   * @return string $url The request URL.
-   */
-
-  public function getUrl() {
-    return $this->url;
-  }
-
-  /**
-   * @return string $method HTTP Request Method.
-   */
-  public function getRequestMethod() {
-    return $this->requestMethod;
-  }
-
-  /**
-   * @return array $headers HTTP Request Headers.
-   */
-  public function getRequestHeaders() {
-    return $this->requestHeaders;
-  }
-
-  /**
-   * @param string $key
-   * @return array|boolean Returns the requested HTTP header or
-   * false if unavailable.
-   */
-  public function getRequestHeader($key) {
-    return isset($this->requestHeaders[$key])
-        ? $this->requestHeaders[$key]
-        : false;
-  }
-
-  /**
-   * @return string $postBody HTTP Request Body.
-   */
-  public function getPostBody() {
-    return $this->postBody;
-  }
-
-  /**
-   * @param string $url the url to set
-   */
-  public function setUrl($url) {
-    if (substr($url, 0, 4) == 'http') {
-      $this->url = $url;
-    } else {
-      // Force the path become relative.
-      if (substr($url, 0, 1) !== '/') {
-        $url = '/' . $url;
-      }
-      global $apiConfig;
-      $this->url = $apiConfig['basePath'] . $url;
-    }
-  }
-
-  /**
-   * @param string $method Set he HTTP Method and normalize
-   * it to upper-case, as required by HTTP.
-   *
-   */
-  public function setRequestMethod($method) {
-    $this->requestMethod = strtoupper($method);
-  }
-
-  /**
-   * @param array $headers The HTTP request headers
-   * to be set and normalized.
-   */
-  public function setRequestHeaders($headers) {
-    $headers = Google_Utils::normalize($headers);
-    if ($this->requestHeaders) {
-      $headers = array_merge($this->requestHeaders, $headers);
-    }
-    $this->requestHeaders = $headers;
-  }
-
-  /**
-   * @param string $postBody the postBody to set
-   */
-  public function setPostBody($postBody) {
-    $this->postBody = $postBody;
-  }
-
-  /**
-   * Set the User-Agent Header.
-   * @param string $userAgent The User-Agent.
-   */
-  public function setUserAgent($userAgent) {
-    $this->userAgent = $userAgent;
-  }
-
-  /**
-   * @return string The User-Agent.
-   */
-  public function getUserAgent() {
-    return $this->userAgent;
-  }
-
-  /**
-   * Returns a cache key depending on if this was an OAuth signed request
-   * in which case it will use the non-signed url and access key to make this
-   * cache key unique per authenticated user, else use the plain request url
-   * @return string The md5 hash of the request cache key.
-   */
-  public function getCacheKey() {
-    $key = $this->getUrl();
-
-    if (isset($this->accessKey)) {
-      $key .= $this->accessKey;
-    }
-
-    if (isset($this->requestHeaders['authorization'])) {
-      $key .= $this->requestHeaders['authorization'];
-    }
-
-    return md5($key);
-  }
-
-  public function getParsedCacheControl() {
-    $parsed = array();
-    $rawCacheControl = $this->getResponseHeader('cache-control');
-    if ($rawCacheControl) {
-      $rawCacheControl = str_replace(', ', '&', $rawCacheControl);
-      parse_str($rawCacheControl, $parsed);
-    }
-
-    return $parsed;
-  }
-
-  /**
-   * @param string $id
-   * @return string A string representation of the HTTP Request.
-   */
-  public function toBatchString($id) {
-    $str = '';
-    foreach($this->batchHeaders as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
-    }
-
-    $str .= "Content-ID: $id\n";
-    $str .= "\n";
-
-    $path = parse_url($this->getUrl(), PHP_URL_PATH);
-    $str .= $this->getRequestMethod() . ' ' . $path . " HTTP/1.1\n";
-    foreach($this->getRequestHeaders() as $key => $val) {
-      $str .= $key . ': ' . $val . "\n";
-    }
-
-    if ($this->getPostBody()) {
-      $str .= "\n";
-      $str .= $this->getPostBody();
-    }
-
-    return $str;
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_IO.php b/apps/files_external/3rdparty/google-api-php-client/src/io/Google_IO.php
deleted file mode 100644
index 5445e699038..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/io/Google_IO.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-require_once 'io/Google_HttpRequest.php';
-require_once 'io/Google_CurlIO.php';
-require_once 'io/Google_REST.php';
-
-/**
- * Abstract IO class
- *
- * @author Chris Chabot <chabotc@google.com>
- */
-interface Google_IO {
-  /**
-   * An utility function that first calls $this->auth->sign($request) and then executes makeRequest()
-   * on that signed request. Used for when a request should be authenticated
-   * @param Google_HttpRequest $request
-   * @return Google_HttpRequest $request
-   */
-  public function authenticatedRequest(Google_HttpRequest $request);
-
-  /**
-   * Executes a apIHttpRequest and returns the resulting populated httpRequest
-   * @param Google_HttpRequest $request
-   * @return Google_HttpRequest $request
-   */
-  public function makeRequest(Google_HttpRequest $request);
-
-  /**
-   * Set options that update the transport implementation's behavior.
-   * @param $options
-   */
-  public function setOptions($options);
-
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_MediaFileUpload.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_MediaFileUpload.php
deleted file mode 100644
index c64e18851df..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_MediaFileUpload.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-/**
- * Copyright 2012 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Chirag Shah <chirags@google.com>
- *
- */
-class Google_MediaFileUpload {
-  const UPLOAD_MEDIA_TYPE = 'media';
-  const UPLOAD_MULTIPART_TYPE = 'multipart';
-  const UPLOAD_RESUMABLE_TYPE = 'resumable';
-
-  /** @var string $mimeType */
-  public $mimeType;
-
-  /** @var string $data */
-  public $data;
-
-  /** @var bool $resumable */
-  public $resumable;
-
-  /** @var int $chunkSize */
-  public $chunkSize;
-
-  /** @var int $size */
-  public $size;
-
-  /** @var string $resumeUri */
-  public $resumeUri;
-
-  /** @var int $progress */
-  public $progress;
-
-  /**
-   * @param $mimeType string
-   * @param $data string The bytes you want to upload.
-   * @param $resumable bool
-   * @param bool $chunkSize File will be uploaded in chunks of this many bytes.
-   * only used if resumable=True
-   */
-  public function __construct($mimeType, $data, $resumable=false, $chunkSize=false) {
-    $this->mimeType = $mimeType;
-    $this->data = $data;
-    $this->size = strlen($this->data);
-    $this->resumable = $resumable;
-    if(!$chunkSize) {
-      $chunkSize = 256 * 1024;
-    }
-    $this->chunkSize = $chunkSize;
-    $this->progress = 0;
-  }
-
-  public function setFileSize($size) {
-    $this->size = $size;
-  }
-
-  /**
-   * @static
-   * @param $meta
-   * @param $params
-   * @return array|bool
-   */
-  public static function process($meta, &$params) {
-    $payload = array();
-    $meta = is_string($meta) ? json_decode($meta, true) : $meta;
-    $uploadType = self::getUploadType($meta, $payload, $params);
-    if (!$uploadType) {
-      // Process as a normal API request.
-      return false;
-    }
-
-    // Process as a media upload request.
-    $params['uploadType'] = array(
-        'type' => 'string',
-        'location' => 'query',
-        'value' => $uploadType,
-    );
-
-    $mimeType = isset($params['mimeType'])
-        ? $params['mimeType']['value']
-        : false;
-    unset($params['mimeType']);
-
-    if (!$mimeType) {
-      $mimeType = $payload['content-type'];
-    }
-
-    if (isset($params['file'])) {
-      // This is a standard file upload with curl.
-      $file = $params['file']['value'];
-      unset($params['file']);
-      return self::processFileUpload($file, $mimeType);
-    }
-
-    $data = isset($params['data'])
-        ? $params['data']['value']
-        : false;
-    unset($params['data']);
-
-    if (self::UPLOAD_RESUMABLE_TYPE == $uploadType) {
-      $payload['content-type'] = $mimeType;
-      $payload['postBody'] = is_string($meta) ? $meta : json_encode($meta);
-
-    } elseif (self::UPLOAD_MEDIA_TYPE == $uploadType) {
-      // This is a simple media upload.
-      $payload['content-type'] = $mimeType;
-      $payload['postBody'] = $data;
-    }
-
-    elseif (self::UPLOAD_MULTIPART_TYPE == $uploadType) {
-      // This is a multipart/related upload.
-      $boundary = isset($params['boundary']['value']) ? $params['boundary']['value'] : mt_rand();
-      $boundary = str_replace('"', '', $boundary);
-      $payload['content-type'] = 'multipart/related; boundary=' . $boundary;
-      $related = "--$boundary\r\n";
-      $related .= "Content-Type: application/json; charset=UTF-8\r\n";
-      $related .= "\r\n" . json_encode($meta) . "\r\n";
-      $related .= "--$boundary\r\n";
-      $related .= "Content-Type: $mimeType\r\n";
-      $related .= "Content-Transfer-Encoding: base64\r\n";
-      $related .= "\r\n" . base64_encode($data) . "\r\n";
-      $related .= "--$boundary--";
-      $payload['postBody'] = $related;
-    }
-
-    return $payload;
-  }
-
-  /**
-   * Prepares a standard file upload via cURL.
-   * @param $file
-   * @param $mime
-   * @return array Includes the processed file name.
-   * @visible For testing.
-   */
-  public static function processFileUpload($file, $mime) {
-    if (!$file) return array();
-    if (substr($file, 0, 1) != '@') {
-      $file = '@' . $file;
-    }
-
-    // This is a standard file upload with curl.
-    $params = array('postBody' => array('file' => $file));
-    if ($mime) {
-      $params['content-type'] = $mime;
-    }
-
-    return $params;
-  }
-
-  /**
-   * Valid upload types:
-   * - resumable (UPLOAD_RESUMABLE_TYPE)
-   * - media (UPLOAD_MEDIA_TYPE)
-   * - multipart (UPLOAD_MULTIPART_TYPE)
-   * - none (false)
-   * @param $meta
-   * @param $payload
-   * @param $params
-   * @return bool|string
-   */
-  public static function getUploadType($meta, &$payload, &$params) {
-    if (isset($params['mediaUpload'])
-        && get_class($params['mediaUpload']['value']) == 'Google_MediaFileUpload') {
-      $upload = $params['mediaUpload']['value'];
-      unset($params['mediaUpload']);
-      $payload['content-type'] = $upload->mimeType;
-      if (isset($upload->resumable) && $upload->resumable) {
-        return self::UPLOAD_RESUMABLE_TYPE;
-      }
-    }
-
-    // Allow the developer to override the upload type.
-    if (isset($params['uploadType'])) {
-      return $params['uploadType']['value'];
-    }
-
-    $data = isset($params['data']['value'])
-        ? $params['data']['value'] : false;
-
-    if (false == $data && false == isset($params['file'])) {
-      // No upload data available.
-      return false;
-    }
-
-    if (isset($params['file'])) {
-      return self::UPLOAD_MEDIA_TYPE;
-    }
-
-    if (false == $meta) {
-      return self::UPLOAD_MEDIA_TYPE;
-    }
-
-    return self::UPLOAD_MULTIPART_TYPE;
-  }
-
-
-  public function nextChunk(Google_HttpRequest $req, $chunk=false) {
-    if (false == $this->resumeUri) {
-      $this->resumeUri = $this->getResumeUri($req);
-    }
-
-    if (false == $chunk) {
-      $chunk = substr($this->data, $this->progress, $this->chunkSize);
-    }
-
-    $lastBytePos = $this->progress + strlen($chunk) - 1;
-    $headers = array(
-      'content-range' => "bytes $this->progress-$lastBytePos/$this->size",
-      'content-type' => $req->getRequestHeader('content-type'),
-      'content-length' => $this->chunkSize,
-      'expect' => '',
-    );
-
-    $httpRequest = new Google_HttpRequest($this->resumeUri, 'PUT', $headers, $chunk);
-    $response = Google_Client::$io->authenticatedRequest($httpRequest);
-    $code = $response->getResponseHttpCode();
-    if (308 == $code) {
-      $range = explode('-', $response->getResponseHeader('range'));
-      $this->progress = $range[1] + 1;
-      return false;
-    } else {
-      return Google_REST::decodeHttpResponse($response);
-    }
-  }
-
-  private function getResumeUri(Google_HttpRequest $httpRequest) {
-    $result = null;
-    $body = $httpRequest->getPostBody();
-    if ($body) {
-      $httpRequest->setRequestHeaders(array(
-        'content-type' => 'application/json; charset=UTF-8',
-        'content-length' => Google_Utils::getStrLen($body),
-        'x-upload-content-type' => $this->mimeType,
-        'x-upload-content-length' => $this->size,
-        'expect' => '',
-      ));
-    }
-
-    $response = Google_Client::$io->makeRequest($httpRequest);
-    $location = $response->getResponseHeader('location');
-    $code = $response->getResponseHttpCode();
-    if (200 == $code && true == $location) {
-      return $location;
-    }
-    throw new Google_Exception("Failed to start the resumable upload");
-  }
-}
\ No newline at end of file
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Model.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Model.php
deleted file mode 100644
index cb44cb25748..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_Model.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/*
- * Copyright 2011 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This class defines attributes, valid values, and usage which is generated from
- * a given json schema. http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5
- *
- * @author Chirag Shah <chirags@google.com>
- *
- */
-class Google_Model {
-  public function __construct( /* polymorphic */ ) {
-    if (func_num_args() ==  1 && is_array(func_get_arg(0))) {
-      // Initialize the model with the array's contents.
-      $array = func_get_arg(0);
-      $this->mapTypes($array);
-    }
-  }
-
-  /**
-   * Initialize this object's properties from an array.
-   *
-   * @param array $array Used to seed this object's properties.
-   * @return void
-   */
-  protected function mapTypes($array) {
-    foreach ($array as $key => $val) {
-      $this->$key = $val;
-
-      $keyTypeName = "__$key" . 'Type';
-      $keyDataType = "__$key" . 'DataType';
-      if ($this->useObjects() && property_exists($this, $keyTypeName)) {
-        if ($this->isAssociativeArray($val)) {
-          if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
-            foreach($val as $arrayKey => $arrayItem) {
-              $val[$arrayKey] = $this->createObjectFromName($keyTypeName, $arrayItem);
-            }
-            $this->$key = $val;
-          } else {
-            $this->$key = $this->createObjectFromName($keyTypeName, $val);
-          }
-        } else if (is_array($val)) {
-          $arrayObject = array();
-          foreach ($val as $arrayIndex => $arrayItem) {
-            $arrayObject[$arrayIndex] = $this->createObjectFromName($keyTypeName, $arrayItem);
-          }
-          $this->$key = $arrayObject;
-        }
-      }
-    }
-  }
-
-  /**
-   * Returns true only if the array is associative.
-   * @param array $array
-   * @return bool True if the array is associative.
-   */
-  protected function isAssociativeArray($array) {
-    if (!is_array($array)) {
-      return false;
-    }
-    $keys = array_keys($array);
-    foreach($keys as $key) {
-      if (is_string($key)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  /**
-   * Given a variable name, discover its type.
-   *
-   * @param $name
-   * @param $item
-   * @return object The object from the item.
-   */
-  private function createObjectFromName($name, $item) {
-    $type = $this->$name;
-    return new $type($item);
-  }
-
-  protected function useObjects() {
-    global $apiConfig;
-    return (isset($apiConfig['use_objects']) && $apiConfig['use_objects']);
-  }
-
-  /**
-   * Verify if $obj is an array.
-   * @throws Google_Exception Thrown if $obj isn't an array.
-   * @param array $obj Items that should be validated.
-   * @param string $type Array items should be of this type.
-   * @param string $method Method expecting an array as an argument.
-   */
-  public function assertIsArray($obj, $type, $method) {
-    if ($obj && !is_array($obj)) {
-      throw new Google_Exception("Incorrect parameter type passed to $method(), expected an"
-          . " array containing items of type $type.");
-    }
-  }
-}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_ServiceResource.php b/apps/files_external/3rdparty/google-api-php-client/src/service/Google_ServiceResource.php
deleted file mode 100644
index bb3af4db809..00000000000
--- a/apps/files_external/3rdparty/google-api-php-client/src/service/Google_ServiceResource.php
+++ /dev/null
@@ -1,205 +0,0 @@
-<?php
-/**
- * Copyright 2010 Google Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * Implements the actual methods/resources of the discovered Google API using magic function
- * calling overloading (__call()), which on call will see if the method name (plus.activities.list)
- * is available in this service, and if so construct an apiHttpRequest representing it.
- *
- * @author Chris Chabot <chabotc@google.com>
- * @author Chirag Shah <chirags@google.com>
- *
- */
-class Google_ServiceResource {
-  // Valid query parameters that work, but don't appear in discovery.
-  private $stackParameters = array(
-      'alt' => array('type' => 'string', 'location' => 'query'),
-      'boundary' => array('type' => 'string', 'location' => 'query'),
-      'fields' => array('type' => 'string', 'location' => 'query'),
-      'trace' => array('type' => 'string', 'location' => 'query'),
-      'userIp' => array('type' => 'string', 'location' => 'query'),
-      'userip' => array('type' => 'string', 'location' => 'query'),
-      'quotaUser' => array('type' => 'string', 'location' => 'query'),
-      'file' => array('type' => 'complex', 'location' => 'body'),
-      'data' => array('type' => 'string', 'location' => 'body'),
-      'mimeType' => array('type' => 'string', 'location' => 'header'),
-      'uploadType' => array('type' => 'string', 'location' => 'query'),
-      'mediaUpload' => array('type' => 'complex', 'location' => 'query'),
-  );
-
-  /** @var Google_Service $service */
-  private $service;
-
-  /** @var string $serviceName */
-  private $serviceName;
-
-  /** @var string $resourceName */
-  private $resourceName;
-
-  /** @var array $methods */
-  private $methods;
-
-  public function __construct($service, $serviceName, $resourceName, $resource) {
-    $this->service = $service;
-    $this->serviceName = $serviceName;
-    $this->resourceName = $resourceName;
-    $this->methods = isset($resource['methods']) ? $resource['methods'] : array($resourceName => $resource);
-  }
-
-  /**
-   * @param $name
-   * @param $arguments
-   * @return Google_HttpRequest|array
-   * @throws Google_Exception
-   */
-  public function __call($name, $arguments) {
-    if (! isset($this->methods[$name])) {
-      throw new Google_Exception("Unknown function: {$this->serviceName}->{$this->resourceName}->{$name}()");
-    }
-    $method = $this->methods[$name];
-    $parameters = $arguments[0];
-
-    // postBody is a special case since it's not defined in the discovery document as parameter, but we abuse the param entry for storing it
-    $postBody = null;
-    if (isset($parameters['postBody'])) {
-      if (is_object($parameters['postBody'])) {
-        $this->stripNull($parameters['postBody']);
-      }
-
-      // Some APIs require the postBody to be set under the data key.
-      if (is_array($parameters['postBody']) && 'latitude' == $this->serviceName) {
-        if (!isset($parameters['postBody']['data'])) {
-          $rawBody = $parameters['postBody'];
-          unset($parameters['postBody']);
-          $parameters['postBody']['data'] = $rawBody;
-        }
-      }
-
-      $postBody = is_array($parameters['postBody']) || is_object($parameters['postBody'])
-          ? json_encode($parameters['postBody'])
-          : $parameters['postBody'];
-      unset($parameters['postBody']);
-
-      if (isset($parameters['optParams'])) {
-        $optParams = $parameters['optParams'];
-        unset($parameters['optParams']);
-        $parameters = array_merge($parameters, $optParams);
-      }
-    }
-
-    if (!isset($method['parameters'])) {
-      $method['parameters'] = array();
-    }
-    
-    $method['parameters'] = array_merge($method['parameters'], $this->stackParameters);
-    foreach ($parameters as $key => $val) {
-      if ($key != 'postBody' && ! isset($method['parameters'][$key])) {
-        throw new Google_Exception("($name) unknown parameter: '$key'");
-      }
-    }
-    if (isset($method['parameters'])) {
-      foreach ($method['parameters'] as $paramName => $paramSpec) {
-        if (isset($paramSpec['required']) && $paramSpec['required'] && ! isset($parameters[$paramName])) {
-          throw new Google_Exception("($name) missing required param: '$paramName'");
-        }
-        if (isset($parameters[$paramName])) {
-          $value = $parameters[$paramName];
-          $parameters[$paramName] = $paramSpec;
-          $parameters[$paramName]['value'] = $value;
-          unset($parameters[$paramName]['required']);
-        } else {
-          unset($parameters[$paramName]);
-        }
-      }
-    }
-
-    // Discovery v1.0 puts the canonical method id under the 'id' field.
-    if (! isset($method['id'])) {
-      $method['id'] = $method['rpcMethod'];
-    }
-
-    // Discovery v1.0 puts the canonical path under the 'path' field.
-    if (! isset($method['path'])) {
-      $method['path'] = $method['restPath'];
-    }
-
-    $servicePath = $this->service->servicePath;
-
-    // Process Media Request
-    $contentType = false;
-    if (isset($method['mediaUpload'])) {
-      $media = Google_MediaFileUpload::process($postBody, $parameters);
-      if ($media) {
-        $contentType = isset($media['content-type']) ? $media['content-type']: null;
-        $postBody = isset($media['postBody']) ? $media['postBody'] : null;
-        $servicePath = $method['mediaUpload']['protocols']['simple']['path'];
-        $method['path'] = '';
-      }
-    }
-
-    $url = Google_REST::createRequestUri($servicePath, $method['path'], $parameters);
-    $httpRequest = new Google_HttpRequest($url, $method['httpMethod'], null, $postBody);
-    if ($postBody) {
-      $contentTypeHeader = array();
-      if (isset($contentType) && $contentType) {
-        $contentTypeHeader['content-type'] = $contentType;
-      } else {
-        $contentTypeHeader['content-type'] = 'application/json; charset=UTF-8';
-        $contentTypeHeader['content-length'] = Google_Utils::getStrLen($postBody);
-      }
-      $httpRequest->setRequestHeaders($contentTypeHeader);
-    }
-
-    $httpRequest = Google_Client::$auth->sign($httpRequest);
-    if (Google_Client::$useBatch) {
-      return $httpRequest;
-    }
-
-    // Terminate immediately if this is a resumable request.
-    if (isset($parameters['uploadType']['value'])
-        && Google_MediaFileUpload::UPLOAD_RESUMABLE_TYPE == $parameters['uploadType']['value']) {
-      $contentTypeHeader = array();
-      if (isset($contentType) && $contentType) {
-        $contentTypeHeader['content-type'] = $contentType;
-      }
-      $httpRequest->setRequestHeaders($contentTypeHeader);
-      if ($postBody) {
-        $httpRequest->setPostBody($postBody);
-      }
-      return $httpRequest;
-    }
-
-    return Google_REST::execute($httpRequest);
-  }
-
-  public  function useObjects() {
-    global $apiConfig;
-    return (isset($apiConfig['use_objects']) && $apiConfig['use_objects']);
-  }
-
-  protected function stripNull(&$o) {
-    $o = (array) $o;
-    foreach ($o as $k => $v) {
-      if ($v === null || strstr($k, "\0*\0__")) {
-        unset($o[$k]);
-      }
-      elseif (is_object($v) || is_array($v)) {
-        $this->stripNull($o[$k]);
-      }
-    }
-  }
-}
-- 
GitLab


From 18707f5abaea9d1e55109a3847dff7bb1430799e Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 31 Jan 2014 10:59:23 -0800
Subject: [PATCH 362/616] fix a bug in google-api-php-client: generates an auth
 url that doesn't work

Submitted upstream as https://github.com/google/google-api-php-client/issues/76
Google's php lib has a function to generate a URL for OAuth2 authentication.
It uses http_build_query() to generate the query part of the URL, and in PHP
5.3 or later, this uses an encoded ampersand - &amp; - as the query separator,
not a raw one. However, Google's OAuth server apparently can't handle encoded
ampersands as separators and so it fails.

This patch explicitly sets a raw ampersand as the separator. If Google decides
to fix their OAuth server instead of merging this patch into google-api-php-
client, we can drop this patch as soon as that happens.
---
 .../3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
index e66f34c1efd..6cf7c1a190f 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
@@ -161,7 +161,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
       $params['state'] = $this->state;
     }
 
-    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params);
+    return self::OAUTH2_AUTH_URL . "?" . http_build_query($params, '', '&');
   }
 
   /**
-- 
GitLab


From 61d70b17ee622d8b75c0201835321ac8d1137c76 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Tue, 4 Feb 2014 23:19:33 -0800
Subject: [PATCH 363/616] google drive: set access type to 'offline' when
 requesting token

We need to do this in order to be able to refresh the access token without
prompting the user for their credentials every hour. This was the default
in 0.6 of the Google library, but needs to be explicitly specified in 1.0.
---
 apps/files_external/ajax/google.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
index f967140a6c8..b80f24bbd2c 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -14,6 +14,7 @@ if (isset($_POST['client_id']) && isset($_POST['client_secret']) && isset($_POST
 	$client->setClientSecret($_POST['client_secret']);
 	$client->setRedirectUri($_POST['redirect']);
 	$client->setScopes(array('https://www.googleapis.com/auth/drive'));
+	$client->setAccessType('offline');
 	if (isset($_POST['step'])) {
 		$step = $_POST['step'];
 		if ($step == 1) {
-- 
GitLab


From 5935758b3a5d8c50cbc6bf7f31ce9ef7b4ba39f1 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 5 Feb 2014 11:43:04 -0800
Subject: [PATCH 364/616] bump google lib to c6949531d2 (post 1.0.3-beta,
 including query separator fix)

This is the upstream commit that merged my query separator fix. It's slightly
after the 1.0.3-beta tag. I eyeballed the other post 1.0.3-beta changes and
none of them looks like any kind of problem, so we may as well just use this
upstream state.
---
 .../src/Google/Client.php                     |  2 +-
 .../src/Google/Http/REST.php                  |  8 ++++-
 .../src/Google/Http/Request.php               |  4 ++-
 .../src/Google/Model.php                      | 35 ++++++++++++++-----
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
index daf1cb151c2..e61daf7f16e 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
@@ -35,7 +35,7 @@ require_once 'Google/Service/Resource.php';
  */
 class Google_Client
 {
-  const LIBVER = "1.0.2-beta";
+  const LIBVER = "1.0.3-beta";
   const USER_AGENT_SUFFIX = "google-api-php-client/";
   /**
    * @var Google_Auth_Abstract $auth
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
index 43d46b1a85e..5ea4b752808 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
@@ -71,7 +71,13 @@ class Google_Http_REST
         $err .= ": ($code) $body";
       }
 
-      throw new Google_Service_Exception($err, $code, null, $decoded['error']['errors']);
+      $errors = null;
+      // Specific check for APIs which don't return error details, such as Blogger.
+      if (isset($decoded['error']) && isset($decoded['error']['errors'])) {
+        $errors = $decoded['error']['errors'];
+      }
+
+      throw new Google_Service_Exception($err, $code, null, $errors);
     }
     
     // Only attempt to decode the response, if the response code wasn't (204) 'no content'
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Request.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Request.php
index f1e9a422279..8643694da89 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Request.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/Request.php
@@ -424,7 +424,9 @@ class Google_Http_Request
       list($key, $value) = explode('=', $part, 2);
       $value = urldecode($value);
       if (isset($return[$key])) {
-        $return[$key] = array($return[$key]);
+        if (!is_array($return[$key])) {
+          $return[$key] = array($return[$key]);
+        }
         $return[$key][] = $value;
       } else {
         $return[$key] = $value;
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
index d5d25e3c128..2b6e67ad5a0 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
@@ -113,23 +113,42 @@ class Google_Model implements ArrayAccess
     $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
     foreach ($props as $member) {
       $name = $member->getName();
-      if ($this->$name instanceof Google_Model) {
-        $object->$name = $this->$name->toSimpleObject();
-      } else if ($this->$name !== null) {
-        $object->$name = $this->$name;
+      $result = $this->getSimpleValue($this->$name);
+      if ($result != null) {
+        $object->$name = $result;
       }
     }
 
     // Process all other data.
     foreach ($this->data as $key => $val) {
-      if ($val instanceof Google_Model) {
-        $object->$key = $val->toSimpleObject();
-      } else if ($val !== null) {
-        $object->$key = $val;
+      $result = $this->getSimpleValue($val);
+      if ($result != null) {
+        $object->$key = $result;
       }
     }
     return $object;
   }
+  
+  /**
+   * Handle different types of values, primarily
+   * other objects and map and array data types.
+   */
+  private function getSimpleValue($value)
+  {
+    if ($value instanceof Google_Model) {
+      return $value->toSimpleObject();
+    } else if (is_array($value)) {
+      $return = array();
+      foreach ($value as $key => $a_value) {
+        $a_value = $this->getSimpleValue($a_value);
+        if ($a_value != null) {
+          $return[$key] = $a_value;
+        }
+      }
+      return $return;
+    }
+    return $value;
+  }
 
   /**
    * Returns true only if the array is associative.
-- 
GitLab


From f9bd43ff033067b3d58479186f86da79edd32db1 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 6 Nov 2014 21:27:12 -0800
Subject: [PATCH 365/616] scrutinizer fix: correct @return for getDriveFile()

---
 apps/files_external/lib/google.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index ab0385ec20b..0e904dac45c 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -65,9 +65,10 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	/**
-	 * Get the Google_Service_Drive_DriveFile object for the specified path
+	 * Get the Google_Service_Drive_DriveFile object for the specified path.
+	 * Returns false on failure.
 	 * @param string $path
-	 * @return Google_Service_Drive_DriveFile
+	 * @return \Google_Service_Drive_DriveFile|false
 	 */
 	private function getDriveFile($path) {
 		// Remove leading and trailing slashes
-- 
GitLab


From 04369fb9ccb89c2edd4b413e33559f24031392ba Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 6 Nov 2014 21:28:05 -0800
Subject: [PATCH 366/616] scrutinizer fix: explicitly declare Google class
 property $client

---
 apps/files_external/lib/google.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 0e904dac45c..76ad1e4b0f6 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -28,6 +28,7 @@ require_once 'Google/Service/Drive.php';
 
 class Google extends \OC\Files\Storage\Common {
 
+	private $client;
 	private $id;
 	private $service;
 	private $driveFiles;
-- 
GitLab


From 7d47d5072412fa99fb3ed9fa17a5716350215ddc Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 7 Nov 2014 01:55:10 -0500
Subject: [PATCH 367/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/ar.js      |  1 -
 apps/files_encryption/l10n/ar.json    |  1 -
 apps/files_encryption/l10n/ast.js     |  1 -
 apps/files_encryption/l10n/ast.json   |  1 -
 apps/files_encryption/l10n/bg_BG.js   |  1 -
 apps/files_encryption/l10n/bg_BG.json |  1 -
 apps/files_encryption/l10n/ca.js      |  1 -
 apps/files_encryption/l10n/ca.json    |  1 -
 apps/files_encryption/l10n/cs_CZ.js   |  1 -
 apps/files_encryption/l10n/cs_CZ.json |  1 -
 apps/files_encryption/l10n/da.js      |  1 -
 apps/files_encryption/l10n/da.json    |  1 -
 apps/files_encryption/l10n/de.js      |  1 -
 apps/files_encryption/l10n/de.json    |  1 -
 apps/files_encryption/l10n/de_DE.js   |  1 -
 apps/files_encryption/l10n/de_DE.json |  1 -
 apps/files_encryption/l10n/el.js      |  1 -
 apps/files_encryption/l10n/el.json    |  1 -
 apps/files_encryption/l10n/en_GB.js   |  1 -
 apps/files_encryption/l10n/en_GB.json |  1 -
 apps/files_encryption/l10n/es.js      |  1 -
 apps/files_encryption/l10n/es.json    |  1 -
 apps/files_encryption/l10n/es_AR.js   |  1 -
 apps/files_encryption/l10n/es_AR.json |  1 -
 apps/files_encryption/l10n/es_MX.js   |  1 -
 apps/files_encryption/l10n/es_MX.json |  1 -
 apps/files_encryption/l10n/et_EE.js   |  1 -
 apps/files_encryption/l10n/et_EE.json |  1 -
 apps/files_encryption/l10n/eu.js      |  1 -
 apps/files_encryption/l10n/eu.json    |  1 -
 apps/files_encryption/l10n/fa.js      |  1 -
 apps/files_encryption/l10n/fa.json    |  1 -
 apps/files_encryption/l10n/fr.js      |  1 -
 apps/files_encryption/l10n/fr.json    |  1 -
 apps/files_encryption/l10n/gl.js      |  1 -
 apps/files_encryption/l10n/gl.json    |  1 -
 apps/files_encryption/l10n/hr.js      |  1 -
 apps/files_encryption/l10n/hr.json    |  1 -
 apps/files_encryption/l10n/hu_HU.js   |  1 -
 apps/files_encryption/l10n/hu_HU.json |  1 -
 apps/files_encryption/l10n/id.js      |  1 -
 apps/files_encryption/l10n/id.json    |  1 -
 apps/files_encryption/l10n/it.js      |  1 -
 apps/files_encryption/l10n/it.json    |  1 -
 apps/files_encryption/l10n/ja.js      |  1 -
 apps/files_encryption/l10n/ja.json    |  1 -
 apps/files_encryption/l10n/ko.js      |  1 -
 apps/files_encryption/l10n/ko.json    |  1 -
 apps/files_encryption/l10n/lt_LT.js   |  1 -
 apps/files_encryption/l10n/lt_LT.json |  1 -
 apps/files_encryption/l10n/nb_NO.js   |  1 -
 apps/files_encryption/l10n/nb_NO.json |  1 -
 apps/files_encryption/l10n/nl.js      |  1 -
 apps/files_encryption/l10n/nl.json    |  1 -
 apps/files_encryption/l10n/pl.js      |  1 -
 apps/files_encryption/l10n/pl.json    |  1 -
 apps/files_encryption/l10n/pt_BR.js   |  1 -
 apps/files_encryption/l10n/pt_BR.json |  1 -
 apps/files_encryption/l10n/pt_PT.js   |  1 -
 apps/files_encryption/l10n/pt_PT.json |  1 -
 apps/files_encryption/l10n/ro.js      |  1 -
 apps/files_encryption/l10n/ro.json    |  1 -
 apps/files_encryption/l10n/ru.js      |  1 -
 apps/files_encryption/l10n/ru.json    |  1 -
 apps/files_encryption/l10n/sk_SK.js   |  1 -
 apps/files_encryption/l10n/sk_SK.json |  1 -
 apps/files_encryption/l10n/sl.js      |  1 -
 apps/files_encryption/l10n/sl.json    |  1 -
 apps/files_encryption/l10n/sv.js      |  1 -
 apps/files_encryption/l10n/sv.json    |  1 -
 apps/files_encryption/l10n/tr.js      |  1 -
 apps/files_encryption/l10n/tr.json    |  1 -
 apps/files_encryption/l10n/uk.js      |  1 -
 apps/files_encryption/l10n/uk.json    |  1 -
 apps/files_encryption/l10n/vi.js      |  1 -
 apps/files_encryption/l10n/vi.json    |  1 -
 apps/files_encryption/l10n/zh_CN.js   |  1 -
 apps/files_encryption/l10n/zh_CN.json |  1 -
 apps/files_encryption/l10n/zh_TW.js   |  1 -
 apps/files_encryption/l10n/zh_TW.json |  1 -
 apps/files_sharing/l10n/cs_CZ.js      |  5 ++++-
 apps/files_sharing/l10n/cs_CZ.json    |  5 ++++-
 apps/files_sharing/l10n/de.js         |  5 ++++-
 apps/files_sharing/l10n/de.json       |  5 ++++-
 apps/files_sharing/l10n/de_DE.js      |  5 ++++-
 apps/files_sharing/l10n/de_DE.json    |  5 ++++-
 apps/files_sharing/l10n/en_GB.js      |  5 ++++-
 apps/files_sharing/l10n/en_GB.json    |  5 ++++-
 apps/files_sharing/l10n/es.js         |  5 ++++-
 apps/files_sharing/l10n/es.json       |  5 ++++-
 apps/files_sharing/l10n/fi_FI.js      |  5 ++++-
 apps/files_sharing/l10n/fi_FI.json    |  5 ++++-
 apps/files_sharing/l10n/fr.js         |  5 ++++-
 apps/files_sharing/l10n/fr.json       |  5 ++++-
 apps/files_sharing/l10n/ja.js         |  5 ++++-
 apps/files_sharing/l10n/ja.json       |  5 ++++-
 apps/files_sharing/l10n/nl.js         |  5 ++++-
 apps/files_sharing/l10n/nl.json       |  5 ++++-
 apps/files_sharing/l10n/pt_BR.js      |  5 ++++-
 apps/files_sharing/l10n/pt_BR.json    |  5 ++++-
 l10n/templates/core.pot               |  2 +-
 l10n/templates/files.pot              |  2 +-
 l10n/templates/files_encryption.pot   | 20 +++++++++++++-------
 l10n/templates/files_external.pot     |  2 +-
 l10n/templates/files_sharing.pot      |  2 +-
 l10n/templates/files_trashbin.pot     |  2 +-
 l10n/templates/files_versions.pot     |  2 +-
 l10n/templates/lib.pot                | 14 +++++++-------
 l10n/templates/private.pot            | 10 +++++-----
 l10n/templates/settings.pot           |  2 +-
 l10n/templates/user_ldap.pot          |  2 +-
 l10n/templates/user_webdavauth.pot    |  2 +-
 lib/l10n/gl.js                        |  1 +
 lib/l10n/gl.json                      |  1 +
 settings/l10n/gl.js                   | 22 ++++++++++++++++++++++
 settings/l10n/gl.json                 | 22 ++++++++++++++++++++++
 settings/l10n/ja.js                   |  1 +
 settings/l10n/ja.json                 |  1 +
 118 files changed, 162 insertions(+), 128 deletions(-)

diff --git a/apps/files_encryption/l10n/ar.js b/apps/files_encryption/l10n/ar.js
index b1af4358241..9f51322cf92 100644
--- a/apps/files_encryption/l10n/ar.js
+++ b/apps/files_encryption/l10n/ar.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
     "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
     "Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
-    "Could not update the private key password. Maybe the old password was not correct." : "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.",
     "File recovery settings updated" : "اعدادات ملف الاستعادة تم تحديثه",
     "Could not update file recovery" : "تعذر تحديث ملف الاستعادة",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.",
diff --git a/apps/files_encryption/l10n/ar.json b/apps/files_encryption/l10n/ar.json
index f65d0c7b327..d7caa1b31d0 100644
--- a/apps/files_encryption/l10n/ar.json
+++ b/apps/files_encryption/l10n/ar.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "تم تغيير كلمة المرور بنجاح.",
     "Could not change the password. Maybe the old password was not correct." : "تعذر تغيير كلمة المرور. من الممكن ان كلمة المرور القديمة غير صحيحة.",
     "Private key password successfully updated." : "تم تحديث كلمة المرور للمفتاح الخاص بنجاح.",
-    "Could not update the private key password. Maybe the old password was not correct." : "لا يمكن تحديث كلمة مرور المفتاح الخاص. من الممكن ان كلمة المرور القديمة غير صحيحة.",
     "File recovery settings updated" : "اعدادات ملف الاستعادة تم تحديثه",
     "Could not update file recovery" : "تعذر تحديث ملف الاستعادة",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "برنامج التشفير لم يتم تهيئتة ! من الممكن ان برنامج التشفير تم اعادة تفعيلة خلال الجلسة. يرجى تسجيل الخروج ومن ثم تسجيل الدخول مجددا لتهيئة برنامج التشفير.",
diff --git a/apps/files_encryption/l10n/ast.js b/apps/files_encryption/l10n/ast.js
index 2252f302aaa..c909d4ee021 100644
--- a/apps/files_encryption/l10n/ast.js
+++ b/apps/files_encryption/l10n/ast.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Camudóse la contraseña",
     "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
     "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.",
     "File recovery settings updated" : "Opciones de recuperación de ficheros anovada",
     "Could not update file recovery" : "Nun pudo anovase la recuperación de ficheros",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
diff --git a/apps/files_encryption/l10n/ast.json b/apps/files_encryption/l10n/ast.json
index 4c1edefea97..d34a727863d 100644
--- a/apps/files_encryption/l10n/ast.json
+++ b/apps/files_encryption/l10n/ast.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Camudóse la contraseña",
     "Could not change the password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Comprueba que la contraseña actual seya correuta.",
     "Private key password successfully updated." : "Contraseña de clave privada anovada correchamente.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nun pudo camudase la contraseña. Pue que la contraseña antigua nun seya correuta.",
     "File recovery settings updated" : "Opciones de recuperación de ficheros anovada",
     "Could not update file recovery" : "Nun pudo anovase la recuperación de ficheros",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡L'aplicación de cifráu nun s'anició! Seique se restableciera mentanto la sesión. Por favor intenta zarrar la sesión y volver a aniciala p'aniciar l'aplicación de cifráu.",
diff --git a/apps/files_encryption/l10n/bg_BG.js b/apps/files_encryption/l10n/bg_BG.js
index a117818ba84..fa5c78bf89d 100644
--- a/apps/files_encryption/l10n/bg_BG.js
+++ b/apps/files_encryption/l10n/bg_BG.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Паролата е успешно променена.",
     "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
     "Private key password successfully updated." : "Успешно променена тайната парола за ключа.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.",
     "File recovery settings updated" : "Настройките за възстановяване на файлове са променени.",
     "Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
diff --git a/apps/files_encryption/l10n/bg_BG.json b/apps/files_encryption/l10n/bg_BG.json
index 74ac2593091..5f36bb402df 100644
--- a/apps/files_encryption/l10n/bg_BG.json
+++ b/apps/files_encryption/l10n/bg_BG.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Паролата е успешно променена.",
     "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
     "Private key password successfully updated." : "Успешно променена тайната парола за ключа.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Неуспешна промяна на тайната парола за ключа. Може би старата парола е грешно въведена.",
     "File recovery settings updated" : "Настройките за възстановяване на файлове са променени.",
     "Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Неуспешна инициализация на криптиращото приложение! Може би криптиращото приложение бе включено по време на твоята сесия. Отпиши се и се впиши обратно за да инциализираш криптиращото приложение.",
diff --git a/apps/files_encryption/l10n/ca.js b/apps/files_encryption/l10n/ca.js
index e443d384ac2..2cc924a7523 100644
--- a/apps/files_encryption/l10n/ca.js
+++ b/apps/files_encryption/l10n/ca.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "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.",
-    "Could not update the private key password. Maybe the old password was not correct." : "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
     "File recovery settings updated" : "S'han  actualitzat els arranjaments de recuperació de fitxers",
     "Could not update file recovery" : "No s'ha pogut actualitzar la recuperació de fitxers",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'aplicació d'encriptació  no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
diff --git a/apps/files_encryption/l10n/ca.json b/apps/files_encryption/l10n/ca.json
index a65fbf9c88e..378af112cf2 100644
--- a/apps/files_encryption/l10n/ca.json
+++ b/apps/files_encryption/l10n/ca.json
@@ -6,7 +6,6 @@
     "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.",
-    "Could not update the private key password. Maybe the old password was not correct." : "No s'ha pogut actualitzar la contrasenya de la clau privada. Potser la contrasenya anterior no era correcta.",
     "File recovery settings updated" : "S'han  actualitzat els arranjaments de recuperació de fitxers",
     "Could not update file recovery" : "No s'ha pogut actualitzar la recuperació de fitxers",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'aplicació d'encriptació  no està inicialitzada! Potser l'aplicació d'encriptació ha estat reiniciada durant la sessió. Intenteu sortir i acreditar-vos de nou per reinicialitzar l'aplicació d'encriptació.",
diff --git a/apps/files_encryption/l10n/cs_CZ.js b/apps/files_encryption/l10n/cs_CZ.js
index 3c3b54e67f3..27023827dff 100644
--- a/apps/files_encryption/l10n/cs_CZ.js
+++ b/apps/files_encryption/l10n/cs_CZ.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Heslo bylo úspěšně změněno.",
     "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
     "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
     "File recovery settings updated" : "Možnosti záchrany souborů aktualizovány",
     "Could not update file recovery" : "Nelze nastavit záchranu souborů",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
diff --git a/apps/files_encryption/l10n/cs_CZ.json b/apps/files_encryption/l10n/cs_CZ.json
index 5bd5bb54f01..46bc5c82fd0 100644
--- a/apps/files_encryption/l10n/cs_CZ.json
+++ b/apps/files_encryption/l10n/cs_CZ.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Heslo bylo úspěšně změněno.",
     "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
     "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nelze aktualizovat heslo soukromého klíče. Možná nebylo staré heslo správně.",
     "File recovery settings updated" : "Možnosti záchrany souborů aktualizovány",
     "Could not update file recovery" : "Nelze nastavit záchranu souborů",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikace pro šifrování není inicializována! Je možné, že aplikace byla znovu aktivována během vašeho přihlášení. Zkuste se prosím odhlásit a znovu přihlásit pro provedení inicializace šifrovací aplikace.",
diff --git a/apps/files_encryption/l10n/da.js b/apps/files_encryption/l10n/da.js
index 9c12271be0b..11f64c3f691 100644
--- a/apps/files_encryption/l10n/da.js
+++ b/apps/files_encryption/l10n/da.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Kodeordet blev ændret succesfuldt",
     "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
     "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
     "File recovery settings updated" : "Filgendannelsesindstillinger opdateret",
     "Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
diff --git a/apps/files_encryption/l10n/da.json b/apps/files_encryption/l10n/da.json
index 65a64a95d33..d974d85681d 100644
--- a/apps/files_encryption/l10n/da.json
+++ b/apps/files_encryption/l10n/da.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Kodeordet blev ændret succesfuldt",
     "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
     "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Kunne ikke opdatere det private nøgle kodeord-. Måske var det gamle kodeord forkert.",
     "File recovery settings updated" : "Filgendannelsesindstillinger opdateret",
     "Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet er ikke igangsat. Det kan skyldes at krypteringsprogrammet er blevet genaktiveret under din session. Prøv at logge ud og ind igen for at aktivere krypteringsprogrammet. ",
diff --git a/apps/files_encryption/l10n/de.js b/apps/files_encryption/l10n/de.js
index 2c680836cb5..ad52cf3d99d 100644
--- a/apps/files_encryption/l10n/de.js
+++ b/apps/files_encryption/l10n/de.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Dein Passwort wurde geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
     "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
-    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
     "File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
     "Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
diff --git a/apps/files_encryption/l10n/de.json b/apps/files_encryption/l10n/de.json
index ce5b6e81af1..e6410e8b8b7 100644
--- a/apps/files_encryption/l10n/de.json
+++ b/apps/files_encryption/l10n/de.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Dein Passwort wurde geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
     "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
-    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Eventuell war das alte Passwort falsch.",
     "File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
     "Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuche Dich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
diff --git a/apps/files_encryption/l10n/de_DE.js b/apps/files_encryption/l10n/de_DE.js
index f24b4a74358..34035b630a8 100644
--- a/apps/files_encryption/l10n/de_DE.js
+++ b/apps/files_encryption/l10n/de_DE.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
     "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
     "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
     "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
diff --git a/apps/files_encryption/l10n/de_DE.json b/apps/files_encryption/l10n/de_DE.json
index 0bbba2a50df..786ecbd372b 100644
--- a/apps/files_encryption/l10n/de_DE.json
+++ b/apps/files_encryption/l10n/de_DE.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
     "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
     "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
     "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Verschlüsselung-App ist nicht initialisiert! Vielleicht wurde die Verschlüsselung-App in der aktuellen Sitzung reaktiviert. Bitte versuchen Sie sich ab- und wieder anzumelden, um die Verschlüsselung-App zu initialisieren.",
diff --git a/apps/files_encryption/l10n/el.js b/apps/files_encryption/l10n/el.js
index a39a0c867f3..36b30e4bfa5 100644
--- a/apps/files_encryption/l10n/el.js
+++ b/apps/files_encryption/l10n/el.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
     "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
-    "Could not update the private key password. Maybe the old password was not correct." : "Αποτυχία ενημέρωσης του κωδικού για το προσωπικό κλειδί. Ενδεχομένως ο παλιός κωδικός δεν ήταν σωστός.",
     "File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
     "Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.",
diff --git a/apps/files_encryption/l10n/el.json b/apps/files_encryption/l10n/el.json
index 0ebf52e3f88..3d3132c62c6 100644
--- a/apps/files_encryption/l10n/el.json
+++ b/apps/files_encryption/l10n/el.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
     "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
-    "Could not update the private key password. Maybe the old password was not correct." : "Αποτυχία ενημέρωσης του κωδικού για το προσωπικό κλειδί. Ενδεχομένως ο παλιός κωδικός δεν ήταν σωστός.",
     "File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
     "Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Η εφαρμογή κρυπτογράφησης δεν έχει εκκινήσει! Ίσως η εφαρμογή κρυπτογράφησης επανενεργοποιήθηκε κατά τη διάρκεια της τρέχουσας σύνδεσής σας. Παρακαλώ προσπαθήστε να αποσυνδεθείτε και να ξανασυνδεθείτε για να εκκινήσετε την εφαρμογή κρυπτογράφησης.",
diff --git a/apps/files_encryption/l10n/en_GB.js b/apps/files_encryption/l10n/en_GB.js
index 126d901b24f..daf72aae608 100644
--- a/apps/files_encryption/l10n/en_GB.js
+++ b/apps/files_encryption/l10n/en_GB.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Password changed successfully.",
     "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
     "Private key password successfully updated." : "Private key password updated successfully.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Could not update the private key password. Maybe the old password was not correct.",
     "File recovery settings updated" : "File recovery settings updated",
     "Could not update file recovery" : "Could not update file recovery",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
diff --git a/apps/files_encryption/l10n/en_GB.json b/apps/files_encryption/l10n/en_GB.json
index e81b4088055..e6a4ca0eef3 100644
--- a/apps/files_encryption/l10n/en_GB.json
+++ b/apps/files_encryption/l10n/en_GB.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Password changed successfully.",
     "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
     "Private key password successfully updated." : "Private key password updated successfully.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Could not update the private key password. Maybe the old password was not correct.",
     "File recovery settings updated" : "File recovery settings updated",
     "Could not update file recovery" : "Could not update file recovery",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Encryption app not initialised! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialise the encryption app.",
diff --git a/apps/files_encryption/l10n/es.js b/apps/files_encryption/l10n/es.js
index 8101c9f4663..5d5adb6cc2f 100644
--- a/apps/files_encryption/l10n/es.js
+++ b/apps/files_encryption/l10n/es.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Su contraseña ha sido cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
-    "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
     "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
     "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
diff --git a/apps/files_encryption/l10n/es.json b/apps/files_encryption/l10n/es.json
index 16cdc6b40a0..f0158a82824 100644
--- a/apps/files_encryption/l10n/es.json
+++ b/apps/files_encryption/l10n/es.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Su contraseña ha sido cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
-    "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
     "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
     "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
diff --git a/apps/files_encryption/l10n/es_AR.js b/apps/files_encryption/l10n/es_AR.js
index 86ac5977f7f..bde0e920689 100644
--- a/apps/files_encryption/l10n/es_AR.js
+++ b/apps/files_encryption/l10n/es_AR.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Tu contraseña fue cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
-    "Could not update the private key password. Maybe the old password was not correct." : "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
     "File recovery settings updated" : "Las opciones de recuperación de archivos fueron actualizadas",
     "Could not update file recovery" : "No fue posible actualizar la recuperación de archivos",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
diff --git a/apps/files_encryption/l10n/es_AR.json b/apps/files_encryption/l10n/es_AR.json
index 07dab2694bd..6251abd7ec6 100644
--- a/apps/files_encryption/l10n/es_AR.json
+++ b/apps/files_encryption/l10n/es_AR.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Tu contraseña fue cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Comprobá que la contraseña actual sea correcta.",
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
-    "Could not update the private key password. Maybe the old password was not correct." : "No fue posible actualizar la contraseña de clave privada. Tal vez la contraseña anterior no es correcta.",
     "File recovery settings updated" : "Las opciones de recuperación de archivos fueron actualizadas",
     "Could not update file recovery" : "No fue posible actualizar la recuperación de archivos",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de encriptación no está inicializada! Es probable que la aplicación fue re-habilitada durante tu sesión. Intenta salir y iniciar sesión para volverla a iniciar.",
diff --git a/apps/files_encryption/l10n/es_MX.js b/apps/files_encryption/l10n/es_MX.js
index 02af0608ab1..99a633c6e43 100644
--- a/apps/files_encryption/l10n/es_MX.js
+++ b/apps/files_encryption/l10n/es_MX.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Su contraseña ha sido cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
-    "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
     "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
     "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
diff --git a/apps/files_encryption/l10n/es_MX.json b/apps/files_encryption/l10n/es_MX.json
index 1ff89da3d8f..fe257ee670a 100644
--- a/apps/files_encryption/l10n/es_MX.json
+++ b/apps/files_encryption/l10n/es_MX.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Su contraseña ha sido cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
-    "Could not update the private key password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Puede que la contraseña antigua no sea correcta.",
     "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
     "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "¡La aplicación de cifrado no ha sido inicializada! Quizá fue restablecida durante tu sesión. Por favor intenta cerrar la sesión y volver a iniciarla para inicializar la aplicación de cifrado.",
diff --git a/apps/files_encryption/l10n/et_EE.js b/apps/files_encryption/l10n/et_EE.js
index a4edf9950a6..f525eedc1ae 100644
--- a/apps/files_encryption/l10n/et_EE.js
+++ b/apps/files_encryption/l10n/et_EE.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "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.",
     "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
     "File recovery settings updated" : "Faili taaste seaded uuendatud",
     "Could not update file recovery" : "Ei suuda uuendada taastefaili",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
diff --git a/apps/files_encryption/l10n/et_EE.json b/apps/files_encryption/l10n/et_EE.json
index df58c8f11fb..ef47ab1212d 100644
--- a/apps/files_encryption/l10n/et_EE.json
+++ b/apps/files_encryption/l10n/et_EE.json
@@ -12,7 +12,6 @@
     "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.",
     "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Ei suutnud uuendada privaatse võtme parooli. Võib-olla polnud vana parool õige.",
     "File recovery settings updated" : "Faili taaste seaded uuendatud",
     "Could not update file recovery" : "Ei suuda uuendada taastefaili",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krüpteerimise rakend pole käivitatud. Võib-olla krüpteerimise rakend taaskäivitati sinu sessiooni kestel. Palun proovi logida välja ning uuesti sisse käivitamaks krüpteerimise rakendit.",
diff --git a/apps/files_encryption/l10n/eu.js b/apps/files_encryption/l10n/eu.js
index 84d446313a1..d5c23d016f0 100644
--- a/apps/files_encryption/l10n/eu.js
+++ b/apps/files_encryption/l10n/eu.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Pasahitza behar bezala aldatu da.",
     "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
     "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
     "File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
     "Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
diff --git a/apps/files_encryption/l10n/eu.json b/apps/files_encryption/l10n/eu.json
index c18cebad99d..3b932fd769e 100644
--- a/apps/files_encryption/l10n/eu.json
+++ b/apps/files_encryption/l10n/eu.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Pasahitza behar bezala aldatu da.",
     "Could not change the password. Maybe the old password was not correct." : "Ezin izan da pasahitza aldatu. Agian pasahitz zaharra okerrekoa da.",
     "Private key password successfully updated." : "Gako pasahitz pribatu behar bezala eguneratu da.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Ezin izan da gako pribatu pasahitza eguneratu. Agian pasahitz zaharra okerrekoa da.",
     "File recovery settings updated" : "Fitxategi berreskuratze ezarpenak eguneratuak",
     "Could not update file recovery" : "Ezin da fitxategi berreskuratzea eguneratu",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Enkriptazio aplikazioa ez dago hasieratuta! Agian aplikazioa birgaitu egin da zure saioa bitartean. Mesdez atear eta sartu berriz enkriptazio aplikazioa hasierarazteko.",
diff --git a/apps/files_encryption/l10n/fa.js b/apps/files_encryption/l10n/fa.js
index 541b19c695c..037dc26e681 100644
--- a/apps/files_encryption/l10n/fa.js
+++ b/apps/files_encryption/l10n/fa.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
-    "Could not update the private key password. Maybe the old password was not correct." : "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
     "File recovery settings updated" : "تنظیمات بازیابی فایل به روز شده است.",
     "Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.",
     "Missing requirements." : "نیازمندی های گمشده",
diff --git a/apps/files_encryption/l10n/fa.json b/apps/files_encryption/l10n/fa.json
index 30b0faa5ec8..0c89886d412 100644
--- a/apps/files_encryption/l10n/fa.json
+++ b/apps/files_encryption/l10n/fa.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "رمزعبور با موفقیت تغییر یافت.",
     "Could not change the password. Maybe the old password was not correct." : "رمزعبور را نمیتواند تغییر دهد. شاید رمزعبورقدیمی صحیح نمی باشد.",
     "Private key password successfully updated." : "رمزعبور کلید خصوصی با موفقیت به روز شد.",
-    "Could not update the private key password. Maybe the old password was not correct." : "رمزعبور کلید خصوصی را نمی تواند به روز کند. شاید رمزعبور قدیمی صحیح نمی باشد.",
     "File recovery settings updated" : "تنظیمات بازیابی فایل به روز شده است.",
     "Could not update file recovery" : "به روز رسانی بازیابی فایل را نمی تواند انجام دهد.",
     "Missing requirements." : "نیازمندی های گمشده",
diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js
index 68d07143f73..8363fadcf00 100644
--- a/apps/files_encryption/l10n/fr.js
+++ b/apps/files_encryption/l10n/fr.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Mot de passe changé avec succès ",
     "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
     "Private key password successfully updated." : "Mot de passe de la clé privé mis à jour avec succès.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
     "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour",
     "Could not update file recovery" : "Ne peut pas remettre à jour les fichiers de récupération",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
diff --git a/apps/files_encryption/l10n/fr.json b/apps/files_encryption/l10n/fr.json
index 707583f7c80..9d372950d77 100644
--- a/apps/files_encryption/l10n/fr.json
+++ b/apps/files_encryption/l10n/fr.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Mot de passe changé avec succès ",
     "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
     "Private key password successfully updated." : "Mot de passe de la clé privé mis à jour avec succès.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Impossible de mettre à jour le mot de passe de la clé privé. Peut-être que l'ancien mot de passe n'était pas correcte.",
     "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour",
     "Could not update file recovery" : "Ne peut pas remettre à jour les fichiers de récupération",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "L'application de chiffrement n'est pas initialisée ! Peut-être que cette application a été réactivée pendant votre session. Veuillez essayer de vous déconnecter et ensuite de vous reconnecter pour initialiser l'application de chiffrement.",
diff --git a/apps/files_encryption/l10n/gl.js b/apps/files_encryption/l10n/gl.js
index c04a1c1a5ea..d32e9f600fb 100644
--- a/apps/files_encryption/l10n/gl.js
+++ b/apps/files_encryption/l10n/gl.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
     "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
     "Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
     "File recovery settings updated" : "Actualizouse o ficheiro de axustes de recuperación",
     "Could not update file recovery" : "Non foi posíbel actualizar o ficheiro de recuperación",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Non se iniciou a aplicación de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala para que tamén se inicie a aplicación de cifrado.",
diff --git a/apps/files_encryption/l10n/gl.json b/apps/files_encryption/l10n/gl.json
index 4583f25da1a..8ffcafe8e88 100644
--- a/apps/files_encryption/l10n/gl.json
+++ b/apps/files_encryption/l10n/gl.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "O contrasinal foi cambiado satisfactoriamente",
     "Could not change the password. Maybe the old password was not correct." : "Non foi posíbel cambiar o contrasinal. Probabelmente o contrasinal antigo non é o  correcto.",
     "Private key password successfully updated." : "A chave privada foi actualizada correctamente.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Non foi posíbel actualizar o contrasinal da chave privada. É probábel que o contrasinal antigo non sexa correcto.",
     "File recovery settings updated" : "Actualizouse o ficheiro de axustes de recuperación",
     "Could not update file recovery" : "Non foi posíbel actualizar o ficheiro de recuperación",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Non se iniciou a aplicación de cifrado! Quizais volva a activarse durante a sesión. Tente pechar a sesión e volver iniciala para que tamén se inicie a aplicación de cifrado.",
diff --git a/apps/files_encryption/l10n/hr.js b/apps/files_encryption/l10n/hr.js
index 7160e72ac23..f20ce757c05 100644
--- a/apps/files_encryption/l10n/hr.js
+++ b/apps/files_encryption/l10n/hr.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Lozinka uspješno promijenjena.",
     "Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
     "Private key password successfully updated." : "Lozinka privatnog ključa uspješno ažurirana.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Lozinku privatnog ključa nije moguće promijeniti. Možda stara je stara lozinka bila neispravna.",
     "File recovery settings updated" : "Ažurirane postavke za oporavak datoteke",
     "Could not update file recovery" : "Oporavak datoteke nije moguće ažurirati",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.",
diff --git a/apps/files_encryption/l10n/hr.json b/apps/files_encryption/l10n/hr.json
index e375f3f6314..04e664336d3 100644
--- a/apps/files_encryption/l10n/hr.json
+++ b/apps/files_encryption/l10n/hr.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Lozinka uspješno promijenjena.",
     "Could not change the password. Maybe the old password was not correct." : "Lozinku nije moguće promijeniti. Možda je stara lozinka bila neispravna.",
     "Private key password successfully updated." : "Lozinka privatnog ključa uspješno ažurirana.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Lozinku privatnog ključa nije moguće promijeniti. Možda stara je stara lozinka bila neispravna.",
     "File recovery settings updated" : "Ažurirane postavke za oporavak datoteke",
     "Could not update file recovery" : "Oporavak datoteke nije moguće ažurirati",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikacija šifriranja nije inicijalizirana! Možda je aplikacija šifriranja bila reaktivirana tijekom vaše sesije.Da biste inicijalizirali aplikaciju šifriranja, molimo, pokušajte se odjaviti i ponovno prijaviti.",
diff --git a/apps/files_encryption/l10n/hu_HU.js b/apps/files_encryption/l10n/hu_HU.js
index 349d7cf6e3e..f30194e0578 100644
--- a/apps/files_encryption/l10n/hu_HU.js
+++ b/apps/files_encryption/l10n/hu_HU.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "A jelszót sikeresen megváltoztattuk.",
     "Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
     "Private key password successfully updated." : "A személyes kulcsának jelszava frissítésre került.",
-    "Could not update the private key password. Maybe the old password was not correct." : "A személyes kulcsa jelszavát nem lehetett frissíteni. Lehet, hogy hibás volt a régi jelszó.",
     "File recovery settings updated" : "A fájlhelyreállítási beállítások frissültek",
     "Could not update file recovery" : "A fájlhelyreállítás nem frissíthető",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
diff --git a/apps/files_encryption/l10n/hu_HU.json b/apps/files_encryption/l10n/hu_HU.json
index e94c192180a..510bf199284 100644
--- a/apps/files_encryption/l10n/hu_HU.json
+++ b/apps/files_encryption/l10n/hu_HU.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "A jelszót sikeresen megváltoztattuk.",
     "Could not change the password. Maybe the old password was not correct." : "A jelszót nem lehet megváltoztatni! Lehet, hogy hibás volt a régi jelszó.",
     "Private key password successfully updated." : "A személyes kulcsának jelszava frissítésre került.",
-    "Could not update the private key password. Maybe the old password was not correct." : "A személyes kulcsa jelszavát nem lehetett frissíteni. Lehet, hogy hibás volt a régi jelszó.",
     "File recovery settings updated" : "A fájlhelyreállítási beállítások frissültek",
     "Could not update file recovery" : "A fájlhelyreállítás nem frissíthető",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A titkosítási modul nincs elindítva! Talán a munkafolyamat közben került engedélyezésre. Kérjük jelentkezzen ki majd ismét jelentkezzen be, hogy a titkosítási modul megfelelően elinduljon!",
diff --git a/apps/files_encryption/l10n/id.js b/apps/files_encryption/l10n/id.js
index 7137d13cb9f..805d7878436 100644
--- a/apps/files_encryption/l10n/id.js
+++ b/apps/files_encryption/l10n/id.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Sandi berhasil diubah",
     "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
     "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
     "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
     "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
diff --git a/apps/files_encryption/l10n/id.json b/apps/files_encryption/l10n/id.json
index eb5361d4b66..826ebdba373 100644
--- a/apps/files_encryption/l10n/id.json
+++ b/apps/files_encryption/l10n/id.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Sandi berhasil diubah",
     "Could not change the password. Maybe the old password was not correct." : "Tidak dapat mengubah sandi. Kemungkinan sandi lama yang dimasukkan salah.",
     "Private key password successfully updated." : "Sandi kunci privat berhasil diperbarui.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Tidak dapat memperbarui sandi kunci privat. Kemungkinan sandi lama yang Anda masukkan salah.",
     "File recovery settings updated" : "Pengaturan pemulihan berkas diperbarui",
     "Could not update file recovery" : "Tidak dapat memperbarui pemulihan berkas",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplikasi enkripsi tidak dimulai! Kemungkinan aplikasi enkripsi telah diaktifkan ulang saat sesi Anda. Silakan coba untuk keluar dan kembali lagi untuk memulai aplikasi enkripsi.",
diff --git a/apps/files_encryption/l10n/it.js b/apps/files_encryption/l10n/it.js
index e71abc94675..b1e61c6804b 100644
--- a/apps/files_encryption/l10n/it.js
+++ b/apps/files_encryption/l10n/it.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "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.",
     "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
     "File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate",
     "Could not update file recovery" : "Impossibile aggiornare il ripristino dei file",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
diff --git a/apps/files_encryption/l10n/it.json b/apps/files_encryption/l10n/it.json
index d051a2cfc98..b9b61b5250c 100644
--- a/apps/files_encryption/l10n/it.json
+++ b/apps/files_encryption/l10n/it.json
@@ -12,7 +12,6 @@
     "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.",
     "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Impossibile aggiornare la password della chiave privata. Forse la vecchia password non era corretta.",
     "File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate",
     "Could not update file recovery" : "Impossibile aggiornare il ripristino dei file",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Applicazione di cifratura non inizializzata. Forse l'applicazione è stata riabilitata durante la tua sessione. Prova a disconnetterti e ad effettuare nuovamente l'accesso per inizializzarla.",
diff --git a/apps/files_encryption/l10n/ja.js b/apps/files_encryption/l10n/ja.js
index e4ca38f822b..352ffcb1a0a 100644
--- a/apps/files_encryption/l10n/ja.js
+++ b/apps/files_encryption/l10n/ja.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "パスワードを変更できました。",
     "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
     "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
-    "Could not update the private key password. Maybe the old password was not correct." : "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
     "File recovery settings updated" : "ファイルリカバリ設定を更新しました",
     "Could not update file recovery" : "ファイルリカバリを更新できませんでした",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
diff --git a/apps/files_encryption/l10n/ja.json b/apps/files_encryption/l10n/ja.json
index 471bf314442..aef760f5145 100644
--- a/apps/files_encryption/l10n/ja.json
+++ b/apps/files_encryption/l10n/ja.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "パスワードを変更できました。",
     "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
     "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
-    "Could not update the private key password. Maybe the old password was not correct." : "秘密鍵のパスワードを更新できませんでした。古いパスワードが正確でない場合があります。",
     "File recovery settings updated" : "ファイルリカバリ設定を更新しました",
     "Could not update file recovery" : "ファイルリカバリを更新できませんでした",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "セッション中に暗号化アプリを再度有効にされたため、暗号化アプリが初期化されていません。暗号化アプリを初期化するため、ログアウトしてログインしなおしてください。",
diff --git a/apps/files_encryption/l10n/ko.js b/apps/files_encryption/l10n/ko.js
index a994dc7d339..223fe99f990 100644
--- a/apps/files_encryption/l10n/ko.js
+++ b/apps/files_encryption/l10n/ko.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "암호가 성공적으로 변경되었습니다",
     "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
     "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 됨.",
-    "Could not update the private key password. Maybe the old password was not correct." : "개인 키 암호를 업데이트할 수 없습니다. 이전 암호가 올바르지 않은 것 같습니다.",
     "File recovery settings updated" : "파일 복구 설정 업데이트됨",
     "Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.",
diff --git a/apps/files_encryption/l10n/ko.json b/apps/files_encryption/l10n/ko.json
index 3cc8ec06b06..bb5ff7df70c 100644
--- a/apps/files_encryption/l10n/ko.json
+++ b/apps/files_encryption/l10n/ko.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "암호가 성공적으로 변경되었습니다",
     "Could not change the password. Maybe the old password was not correct." : "암호를 변경할 수 없습니다. 예전 암호가 정확하지 않은 것 같습니다.",
     "Private key password successfully updated." : "개인 키 암호가 성공적으로 업데이트 됨.",
-    "Could not update the private key password. Maybe the old password was not correct." : "개인 키 암호를 업데이트할 수 없습니다. 이전 암호가 올바르지 않은 것 같습니다.",
     "File recovery settings updated" : "파일 복구 설정 업데이트됨",
     "Could not update file recovery" : "파일 복구를 업데이트할 수 없습니다",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "암호화 앱이 초기화되지 않았습니다! 암호화 앱이 다시 활성화된 것 같습니다. 암호화 앱을 초기화하려면 로그아웃했다 다시 로그인하십시오.",
diff --git a/apps/files_encryption/l10n/lt_LT.js b/apps/files_encryption/l10n/lt_LT.js
index eebfcedaf0b..afcc478e34c 100644
--- a/apps/files_encryption/l10n/lt_LT.js
+++ b/apps/files_encryption/l10n/lt_LT.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Slaptažodis sėkmingai pakeistas",
     "Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
     "Private key password successfully updated." : "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
     "File recovery settings updated" : "Failų atkūrimo nustatymai pakeisti",
     "Could not update file recovery" : "Neišėjo atnaujinti failų atkūrimo",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
diff --git a/apps/files_encryption/l10n/lt_LT.json b/apps/files_encryption/l10n/lt_LT.json
index c642bfd7528..c2ffc891638 100644
--- a/apps/files_encryption/l10n/lt_LT.json
+++ b/apps/files_encryption/l10n/lt_LT.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Slaptažodis sėkmingai pakeistas",
     "Could not change the password. Maybe the old password was not correct." : "Slaptažodis nebuvo pakeistas. Gali būti, kad buvo neteisingai suvestas senasis.",
     "Private key password successfully updated." : "Privataus rakto slaptažodis buvo sėkmingai atnaujintas.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nepavyko atnaujinti privataus rakto slaptažodžio. Gali būti, kad buvo neteisingai suvestas senasis.",
     "File recovery settings updated" : "Failų atkūrimo nustatymai pakeisti",
     "Could not update file recovery" : "Neišėjo atnaujinti failų atkūrimo",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifravimo programa nepaleista! Galbūt šifravimo programa buvo įjungta dar kartą Jūsų sesijos metu. Prašome atsijungti ir vėl prisijungti, kad paleisti šifravimo programą.",
diff --git a/apps/files_encryption/l10n/nb_NO.js b/apps/files_encryption/l10n/nb_NO.js
index 3e018cd76f2..f690a78e5f8 100644
--- a/apps/files_encryption/l10n/nb_NO.js
+++ b/apps/files_encryption/l10n/nb_NO.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Passordet ble endret.",
     "Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
     "Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.",
     "File recovery settings updated" : "Innstillinger for gjenoppretting av filer ble oppdatert",
     "Could not update file recovery" : "Klarte ikke å oppdatere gjenoppretting av filer",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
diff --git a/apps/files_encryption/l10n/nb_NO.json b/apps/files_encryption/l10n/nb_NO.json
index ba3e2210a96..f525462cd74 100644
--- a/apps/files_encryption/l10n/nb_NO.json
+++ b/apps/files_encryption/l10n/nb_NO.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Passordet ble endret.",
     "Could not change the password. Maybe the old password was not correct." : "Klarte ikke å endre passordet. Kanskje gammelt passord ikke var korrekt.",
     "Private key password successfully updated." : "Passord for privat nøkkel ble oppdatert.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Klarte ikke å oppdatere passord for privat nøkkel. Kanskje gammelt passord ikke var korrekt.",
     "File recovery settings updated" : "Innstillinger for gjenoppretting av filer ble oppdatert",
     "Could not update file recovery" : "Klarte ikke å oppdatere gjenoppretting av filer",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypterings-app ikke initialisert! Kanskje krypterings-appen ble aktivert på nytt i løpet av økten din. Prøv å logge ut og logge inn igjen for å initialisere krypterings-appen.",
diff --git a/apps/files_encryption/l10n/nl.js b/apps/files_encryption/l10n/nl.js
index 04b2c9e8175..8413f01714a 100644
--- a/apps/files_encryption/l10n/nl.js
+++ b/apps/files_encryption/l10n/nl.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Wachtwoord succesvol gewijzigd.",
     "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
     "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
     "File recovery settings updated" : "Bestandsherstel instellingen bijgewerkt",
     "Could not update file recovery" : "Kon bestandsherstel niet bijwerken",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
diff --git a/apps/files_encryption/l10n/nl.json b/apps/files_encryption/l10n/nl.json
index 67f0d2e4c89..65b7cf771d3 100644
--- a/apps/files_encryption/l10n/nl.json
+++ b/apps/files_encryption/l10n/nl.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Wachtwoord succesvol gewijzigd.",
     "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
     "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Kon het wachtwoord van de privésleutel niet wijzigen. Misschien was het oude wachtwoord onjuist.",
     "File recovery settings updated" : "Bestandsherstel instellingen bijgewerkt",
     "Could not update file recovery" : "Kon bestandsherstel niet bijwerken",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Crypto app niet geïnitialiseerd. Misschien werd de crypto app geheractiveerd tijdens de sessie. Log uit en log daarna opnieuw in om de crypto app te initialiseren.",
diff --git a/apps/files_encryption/l10n/pl.js b/apps/files_encryption/l10n/pl.js
index a0bccc8c9f2..e4532cb0604 100644
--- a/apps/files_encryption/l10n/pl.js
+++ b/apps/files_encryption/l10n/pl.js
@@ -9,7 +9,6 @@ OC.L10N.register(
     "Password successfully changed." : "Zmiana hasła udana.",
     "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
     "Private key password successfully updated." : "Pomyślnie zaktualizowano hasło klucza prywatnego.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
     "File recovery settings updated" : "Ustawienia odzyskiwania plików zmienione",
     "Could not update file recovery" : "Nie można zmienić pliku odzyskiwania",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
diff --git a/apps/files_encryption/l10n/pl.json b/apps/files_encryption/l10n/pl.json
index dd817a40542..8ef5297d191 100644
--- a/apps/files_encryption/l10n/pl.json
+++ b/apps/files_encryption/l10n/pl.json
@@ -7,7 +7,6 @@
     "Password successfully changed." : "Zmiana hasła udana.",
     "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
     "Private key password successfully updated." : "Pomyślnie zaktualizowano hasło klucza prywatnego.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nie można zmienić prywatnego hasła. Może stare hasło nie było poprawne.",
     "File recovery settings updated" : "Ustawienia odzyskiwania plików zmienione",
     "Could not update file recovery" : "Nie można zmienić pliku odzyskiwania",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Szyfrowanie aplikacja nie została zainicjowane! Może szyfrowanie aplikacji zostało ponownie włączone podczas tej sesji. Spróbuj się wylogować i zalogować ponownie aby zainicjować szyfrowanie aplikacji.",
diff --git a/apps/files_encryption/l10n/pt_BR.js b/apps/files_encryption/l10n/pt_BR.js
index 3849876d602..b4b549580e3 100644
--- a/apps/files_encryption/l10n/pt_BR.js
+++ b/apps/files_encryption/l10n/pt_BR.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Senha alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
     "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
     "File recovery settings updated" : "Configurações de recuperação de arquivo atualizado",
     "Could not update file recovery" : "Não foi possível atualizar a recuperação de arquivos",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
diff --git a/apps/files_encryption/l10n/pt_BR.json b/apps/files_encryption/l10n/pt_BR.json
index 6627951f8f0..a9d4b147253 100644
--- a/apps/files_encryption/l10n/pt_BR.json
+++ b/apps/files_encryption/l10n/pt_BR.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Senha alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
     "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha de chave privada. Talvez a senha antiga esteja incorreta.",
     "File recovery settings updated" : "Configurações de recuperação de arquivo atualizado",
     "Could not update file recovery" : "Não foi possível atualizar a recuperação de arquivos",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Aplicativo de criptografia não foi inicializado! Talvez o aplicativo de criptografia tenha sido reativado durante essa sessão. Por favor, tente fazer logoff e login novamente para inicializar o aplicativo de criptografia.",
diff --git a/apps/files_encryption/l10n/pt_PT.js b/apps/files_encryption/l10n/pt_PT.js
index 3f785d9d29e..d4655811cff 100644
--- a/apps/files_encryption/l10n/pt_PT.js
+++ b/apps/files_encryption/l10n/pt_PT.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Senha alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
     "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
-    "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha da chave privada. A senha antiga poderia não estar correta.",
     "File recovery settings updated" : "As definições da recuperação de ficheiro foram atualizadas",
     "Could not update file recovery" : "Não foi possível atualizar a recuperação de ficheiro",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A app de encriptação não foi inicializada! A app de encriptação poderá ter sido reativada durante a sua sessão. Por favor, tente terminar a sessão e iniciá-la de seguida para inicializar a app de encriptação.",
diff --git a/apps/files_encryption/l10n/pt_PT.json b/apps/files_encryption/l10n/pt_PT.json
index 40af81afcb4..5ceebbd4e80 100644
--- a/apps/files_encryption/l10n/pt_PT.json
+++ b/apps/files_encryption/l10n/pt_PT.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Senha alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
     "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
-    "Could not update the private key password. Maybe the old password was not correct." : "Não foi possível atualizar a senha da chave privada. A senha antiga poderia não estar correta.",
     "File recovery settings updated" : "As definições da recuperação de ficheiro foram atualizadas",
     "Could not update file recovery" : "Não foi possível atualizar a recuperação de ficheiro",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "A app de encriptação não foi inicializada! A app de encriptação poderá ter sido reativada durante a sua sessão. Por favor, tente terminar a sessão e iniciá-la de seguida para inicializar a app de encriptação.",
diff --git a/apps/files_encryption/l10n/ro.js b/apps/files_encryption/l10n/ro.js
index 822cc4be58d..91f657d18f0 100644
--- a/apps/files_encryption/l10n/ro.js
+++ b/apps/files_encryption/l10n/ro.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Parola a fost modificată cu succes.",
     "Could not change the password. Maybe the old password was not correct." : "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
     "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.",
     "File recovery settings updated" : "Setarile pentru recuperarea fisierelor au fost actualizate",
     "Could not update file recovery" : "Nu am putut actualiza recuperarea de fisiere",
     "Encryption" : "Încriptare",
diff --git a/apps/files_encryption/l10n/ro.json b/apps/files_encryption/l10n/ro.json
index 3ac528a60ce..3c32f040aec 100644
--- a/apps/files_encryption/l10n/ro.json
+++ b/apps/files_encryption/l10n/ro.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Parola a fost modificată cu succes.",
     "Could not change the password. Maybe the old password was not correct." : "Parola nu a putut fi schimbata. Poate ca parola veche este incorecta.",
     "Private key password successfully updated." : "Cheia privata a fost actualizata cu succes",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nu am putut actualiza parola pentru cheia privata. Poate ca parola veche este incorecta.",
     "File recovery settings updated" : "Setarile pentru recuperarea fisierelor au fost actualizate",
     "Could not update file recovery" : "Nu am putut actualiza recuperarea de fisiere",
     "Encryption" : "Încriptare",
diff --git a/apps/files_encryption/l10n/ru.js b/apps/files_encryption/l10n/ru.js
index 2d035d75f5e..6d4cfe371e3 100644
--- a/apps/files_encryption/l10n/ru.js
+++ b/apps/files_encryption/l10n/ru.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Пароль изменен удачно.",
     "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно старый пароль не был верен.",
     "Private key password successfully updated." : "Пароль секретного ключа успешно обновлён.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
     "File recovery settings updated" : "Настройки файла восстановления обновлены",
     "Could not update file recovery" : "Невозможно обновить файл восстановления",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.",
diff --git a/apps/files_encryption/l10n/ru.json b/apps/files_encryption/l10n/ru.json
index ce66622d6be..8de97d847cd 100644
--- a/apps/files_encryption/l10n/ru.json
+++ b/apps/files_encryption/l10n/ru.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Пароль изменен удачно.",
     "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно старый пароль не был верен.",
     "Private key password successfully updated." : "Пароль секретного ключа успешно обновлён.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Невозможно обновить пароль от секретного ключа. Возможно, старый пароль указан неверно.",
     "File recovery settings updated" : "Настройки файла восстановления обновлены",
     "Could not update file recovery" : "Невозможно обновить файл восстановления",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.",
diff --git a/apps/files_encryption/l10n/sk_SK.js b/apps/files_encryption/l10n/sk_SK.js
index ac61753f09d..cf7606bb1ad 100644
--- a/apps/files_encryption/l10n/sk_SK.js
+++ b/apps/files_encryption/l10n/sk_SK.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Heslo úspešne zmenené.",
     "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
     "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
     "File recovery settings updated" : "Nastavenie obnovy súborov aktualizované",
     "Could not update file recovery" : "Nemožno aktualizovať obnovenie súborov",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná počas vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.",
diff --git a/apps/files_encryption/l10n/sk_SK.json b/apps/files_encryption/l10n/sk_SK.json
index e1887527634..6229150b737 100644
--- a/apps/files_encryption/l10n/sk_SK.json
+++ b/apps/files_encryption/l10n/sk_SK.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Heslo úspešne zmenené.",
     "Could not change the password. Maybe the old password was not correct." : "Nemožno zmeniť heslo. Pravdepodobne nebolo staré heslo zadané správne.",
     "Private key password successfully updated." : "Heslo súkromného kľúča je úspešne aktualizované.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Nemožno aktualizovať heslo súkromného kľúča. Možno nebolo staré heslo správne.",
     "File recovery settings updated" : "Nastavenie obnovy súborov aktualizované",
     "Could not update file recovery" : "Nemožno aktualizovať obnovenie súborov",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Šifrovacia aplikácia nie je inicializovaná. Je možné, že aplikácia bola znova aktivovaná počas vášho prihlasovania. Pokúste sa odhlásiť a znova prihlásiť pre inicializáciu šifrovania.",
diff --git a/apps/files_encryption/l10n/sl.js b/apps/files_encryption/l10n/sl.js
index f0623de697f..c144227be78 100644
--- a/apps/files_encryption/l10n/sl.js
+++ b/apps/files_encryption/l10n/sl.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Geslo je uspešno spremenjeno.",
     "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
     "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Zasebnega ključa za geslo ni mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
     "File recovery settings updated" : "Nastavitve obnavljanja dokumentov so posodobljene",
     "Could not update file recovery" : "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Program za šifriranje ni začet. Morda je bil program ponovno omogočen šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.",
diff --git a/apps/files_encryption/l10n/sl.json b/apps/files_encryption/l10n/sl.json
index 4a692bfebae..b4e41f89e22 100644
--- a/apps/files_encryption/l10n/sl.json
+++ b/apps/files_encryption/l10n/sl.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Geslo je uspešno spremenjeno.",
     "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
     "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Zasebnega ključa za geslo ni mogoče posodobiti. Morda vnos starega gesla ni bil pravilen.",
     "File recovery settings updated" : "Nastavitve obnavljanja dokumentov so posodobljene",
     "Could not update file recovery" : "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Program za šifriranje ni začet. Morda je bil program ponovno omogočen šele med zagonom trenutne seje. Odjavite se in se nato prijavite nazaj. S tem morda razrešite napako.",
diff --git a/apps/files_encryption/l10n/sv.js b/apps/files_encryption/l10n/sv.js
index f8ef7040926..44d58564ba7 100644
--- a/apps/files_encryption/l10n/sv.js
+++ b/apps/files_encryption/l10n/sv.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Ändringen av lösenordet lyckades.",
     "Could not change the password. Maybe the old password was not correct." : "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
     "Private key password successfully updated." : "Den privata nyckelns lösenord uppdaterades utan problem.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
     "File recovery settings updated" : "Inställningarna för filåterställning har uppdaterats",
     "Could not update file recovery" : "Kunde inte uppdatera filåterställning",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
diff --git a/apps/files_encryption/l10n/sv.json b/apps/files_encryption/l10n/sv.json
index f94da503843..5ee6606b665 100644
--- a/apps/files_encryption/l10n/sv.json
+++ b/apps/files_encryption/l10n/sv.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Ändringen av lösenordet lyckades.",
     "Could not change the password. Maybe the old password was not correct." : "Kunde inte ändra lösenordet. Kanske det gamla lösenordet inte var rätt.",
     "Private key password successfully updated." : "Den privata nyckelns lösenord uppdaterades utan problem.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Kunde inte uppdatera lösenordet för den privata nyckeln. Kanske var det gamla lösenordet fel.",
     "File recovery settings updated" : "Inställningarna för filåterställning har uppdaterats",
     "Could not update file recovery" : "Kunde inte uppdatera filåterställning",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Krypteringsprogrammet kunde inte initieras! Möjligen blev krypteringsprogrammet återaktiverad under din session. Försök med att logga ut och in igen för att initiera krypteringsprogrammet.",
diff --git a/apps/files_encryption/l10n/tr.js b/apps/files_encryption/l10n/tr.js
index 3a50eeb2081..668ace38e95 100644
--- a/apps/files_encryption/l10n/tr.js
+++ b/apps/files_encryption/l10n/tr.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Parola başarıyla değiştirildi.",
     "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
     "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
     "File recovery settings updated" : "Dosya kurtarma ayarları güncellendi",
     "Could not update file recovery" : "Dosya kurtarma güncellenemedi",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
diff --git a/apps/files_encryption/l10n/tr.json b/apps/files_encryption/l10n/tr.json
index 4998865f3bd..c182524a894 100644
--- a/apps/files_encryption/l10n/tr.json
+++ b/apps/files_encryption/l10n/tr.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Parola başarıyla değiştirildi.",
     "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
     "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Özel anahtar parolası güncellenemedi. Eski parola hatalı olabilir.",
     "File recovery settings updated" : "Dosya kurtarma ayarları güncellendi",
     "Could not update file recovery" : "Dosya kurtarma güncellenemedi",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Şifreleme uygulaması başlatılamadı! Oturumunuz sırasında şifreleme uygulaması tekrar etkinleştirilmiş olabilir. Lütfen şifreleme uygulamasını başlatmak için oturumu kapatıp yeniden oturum açmayı deneyin.",
diff --git a/apps/files_encryption/l10n/uk.js b/apps/files_encryption/l10n/uk.js
index 169f6c3f92e..87433d99fbc 100644
--- a/apps/files_encryption/l10n/uk.js
+++ b/apps/files_encryption/l10n/uk.js
@@ -14,7 +14,6 @@ OC.L10N.register(
     "Password successfully changed." : "Пароль змінено.",
     "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
     "Private key password successfully updated." : "Пароль секретного ключа оновлено.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.",
     "File recovery settings updated" : "Налаштування файла відновлення оновлено",
     "Could not update file recovery" : "Не вдалося оновити файл відновлення ",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.",
diff --git a/apps/files_encryption/l10n/uk.json b/apps/files_encryption/l10n/uk.json
index 454de34d9c0..a981ff225d0 100644
--- a/apps/files_encryption/l10n/uk.json
+++ b/apps/files_encryption/l10n/uk.json
@@ -12,7 +12,6 @@
     "Password successfully changed." : "Пароль змінено.",
     "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
     "Private key password successfully updated." : "Пароль секретного ключа оновлено.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Не вдалося оновити пароль секретного ключа. Можливо ви не правильно ввели старий пароль.",
     "File recovery settings updated" : "Налаштування файла відновлення оновлено",
     "Could not update file recovery" : "Не вдалося оновити файл відновлення ",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Додаток шифрувння не ініціалізовано! Можливо цей додаток редагувався під час вашої сесії. Будь ласка, спробуйте вийти і зайти знову щоб проініціалізувати додаток шифрування.",
diff --git a/apps/files_encryption/l10n/vi.js b/apps/files_encryption/l10n/vi.js
index 8fc542510da..b853fb76162 100644
--- a/apps/files_encryption/l10n/vi.js
+++ b/apps/files_encryption/l10n/vi.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "Đã đổi mật khẩu.",
     "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",
-    "Could not update the private key password. Maybe the old password was not correct." : "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng",
     "File recovery settings updated" : "Đã cập nhật thiết lập khôi phục tập tin ",
     "Could not update file recovery" : "Không thể cập nhật khôi phục tập tin",
     "Encryption" : "Mã hóa",
diff --git a/apps/files_encryption/l10n/vi.json b/apps/files_encryption/l10n/vi.json
index f1a1ff4c6da..4800a4bc21f 100644
--- a/apps/files_encryption/l10n/vi.json
+++ b/apps/files_encryption/l10n/vi.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "Đã đổi mật khẩu.",
     "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",
-    "Could not update the private key password. Maybe the old password was not correct." : "Không thể cập nhật mật khẩu khóa cá nhân. Có thể mật khẩu cũ không đúng",
     "File recovery settings updated" : "Đã cập nhật thiết lập khôi phục tập tin ",
     "Could not update file recovery" : "Không thể cập nhật khôi phục tập tin",
     "Encryption" : "Mã hóa",
diff --git a/apps/files_encryption/l10n/zh_CN.js b/apps/files_encryption/l10n/zh_CN.js
index 82051423baf..17995f4597e 100644
--- a/apps/files_encryption/l10n/zh_CN.js
+++ b/apps/files_encryption/l10n/zh_CN.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "密码修改成功。",
     "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
     "Private key password successfully updated." : "私钥密码成功更新。",
-    "Could not update the private key password. Maybe the old password was not correct." : "无法更新私钥密码。可能旧密码不正确。",
     "File recovery settings updated" : "文件恢复设置已更新",
     "Could not update file recovery" : "不能更新文件恢复",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。",
diff --git a/apps/files_encryption/l10n/zh_CN.json b/apps/files_encryption/l10n/zh_CN.json
index 9c9a6adc7cb..fa6de35d12a 100644
--- a/apps/files_encryption/l10n/zh_CN.json
+++ b/apps/files_encryption/l10n/zh_CN.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "密码修改成功。",
     "Could not change the password. Maybe the old password was not correct." : "不能修改密码。旧密码可能不正确。",
     "Private key password successfully updated." : "私钥密码成功更新。",
-    "Could not update the private key password. Maybe the old password was not correct." : "无法更新私钥密码。可能旧密码不正确。",
     "File recovery settings updated" : "文件恢复设置已更新",
     "Could not update file recovery" : "不能更新文件恢复",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密应用还没有初始化！可能加密应用在你会话期间已被重新启用。请注销并重新登录，以初始化加密应用。",
diff --git a/apps/files_encryption/l10n/zh_TW.js b/apps/files_encryption/l10n/zh_TW.js
index c68028a7aad..e344178a333 100644
--- a/apps/files_encryption/l10n/zh_TW.js
+++ b/apps/files_encryption/l10n/zh_TW.js
@@ -8,7 +8,6 @@ OC.L10N.register(
     "Password successfully changed." : "成功變更密碼。",
     "Could not change the password. Maybe the old password was not correct." : "無法變更密碼，或許是輸入的舊密碼不正確。",
     "Private key password successfully updated." : "私人金鑰密碼已成功更新。",
-    "Could not update the private key password. Maybe the old password was not correct." : "無法更新私人金鑰密碼。可能舊的密碼不正確。",
     "File recovery settings updated" : "檔案還原設定已更新",
     "Could not update file recovery" : "無法更新檔案還原設定",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密功能未初始化!可能加密功能需要重新啟用在現在的連線上。請試著登出再登入來初始化加密功能。",
diff --git a/apps/files_encryption/l10n/zh_TW.json b/apps/files_encryption/l10n/zh_TW.json
index c6560dc3738..44b48c9ccc3 100644
--- a/apps/files_encryption/l10n/zh_TW.json
+++ b/apps/files_encryption/l10n/zh_TW.json
@@ -6,7 +6,6 @@
     "Password successfully changed." : "成功變更密碼。",
     "Could not change the password. Maybe the old password was not correct." : "無法變更密碼，或許是輸入的舊密碼不正確。",
     "Private key password successfully updated." : "私人金鑰密碼已成功更新。",
-    "Could not update the private key password. Maybe the old password was not correct." : "無法更新私人金鑰密碼。可能舊的密碼不正確。",
     "File recovery settings updated" : "檔案還原設定已更新",
     "Could not update file recovery" : "無法更新檔案還原設定",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "加密功能未初始化!可能加密功能需要重新啟用在現在的連線上。請試著登出再登入來初始化加密功能。",
diff --git a/apps/files_sharing/l10n/cs_CZ.js b/apps/files_sharing/l10n/cs_CZ.js
index 1d65d7032ee..6b2c05b4dfb 100644
--- a/apps/files_sharing/l10n/cs_CZ.js
+++ b/apps/files_sharing/l10n/cs_CZ.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Přidat do svého ownCloudu",
     "Download" : "Stáhnout",
     "Download %s" : "Stáhnout %s",
-    "Direct link" : "Přímý odkaz"
+    "Direct link" : "Přímý odkaz",
+    "Server-to-Server Sharing" : "Sdílení mezi servery",
+    "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery",
+    "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů"
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/apps/files_sharing/l10n/cs_CZ.json b/apps/files_sharing/l10n/cs_CZ.json
index a4d4bdf28e2..276887c770f 100644
--- a/apps/files_sharing/l10n/cs_CZ.json
+++ b/apps/files_sharing/l10n/cs_CZ.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Přidat do svého ownCloudu",
     "Download" : "Stáhnout",
     "Download %s" : "Stáhnout %s",
-    "Direct link" : "Přímý odkaz"
+    "Direct link" : "Přímý odkaz",
+    "Server-to-Server Sharing" : "Sdílení mezi servery",
+    "Allow users on this server to send shares to other servers" : "Povolit uživatelům z tohoto serveru zasílat sdílení na jiné servery",
+    "Allow users on this server to receive shares from other servers" : "Povolit uživatelům z tohoto serveru přijímat sdílení z jiných serverů"
 },"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.js b/apps/files_sharing/l10n/de.js
index 69635c8ca4c..c3160792e1c 100644
--- a/apps/files_sharing/l10n/de.js
+++ b/apps/files_sharing/l10n/de.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen",
     "Download" : "Herunterladen",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkter Link"
+    "Direct link" : "Direkter Link",
+    "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch",
+    "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+    "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de.json b/apps/files_sharing/l10n/de.json
index f444c486956..62a74cf445b 100644
--- a/apps/files_sharing/l10n/de.json
+++ b/apps/files_sharing/l10n/de.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Zu Deiner ownCloud hinzufügen",
     "Download" : "Herunterladen",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkter Link"
+    "Direct link" : "Direkter Link",
+    "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch",
+    "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+    "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/de_DE.js b/apps/files_sharing/l10n/de_DE.js
index 23ad9ffb91f..e50a15dd29e 100644
--- a/apps/files_sharing/l10n/de_DE.js
+++ b/apps/files_sharing/l10n/de_DE.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen",
     "Download" : "Herunterladen",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkte Verlinkung"
+    "Direct link" : "Direkte Verlinkung",
+    "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch",
+    "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+    "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/de_DE.json b/apps/files_sharing/l10n/de_DE.json
index a693524d6c1..129769939e5 100644
--- a/apps/files_sharing/l10n/de_DE.json
+++ b/apps/files_sharing/l10n/de_DE.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Zu Ihrer ownCloud hinzufügen",
     "Download" : "Herunterladen",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkte Verlinkung"
+    "Direct link" : "Direkte Verlinkung",
+    "Server-to-Server Sharing" : "Server-zu-Server Datenaustausch",
+    "Allow users on this server to send shares to other servers" : "Nutzern auf diesem Server das Senden von Freigaben an andere Server erlauben",
+    "Allow users on this server to receive shares from other servers" : "Nutzern auf diesem Server das Empfangen von Freigaben von anderen Servern erlauben"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/en_GB.js b/apps/files_sharing/l10n/en_GB.js
index 0a86e564210..07cc91c6621 100644
--- a/apps/files_sharing/l10n/en_GB.js
+++ b/apps/files_sharing/l10n/en_GB.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Add to your ownCloud",
     "Download" : "Download",
     "Download %s" : "Download %s",
-    "Direct link" : "Direct link"
+    "Direct link" : "Direct link",
+    "Server-to-Server Sharing" : "Server-to-Server Sharing",
+    "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers",
+    "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/en_GB.json b/apps/files_sharing/l10n/en_GB.json
index c5445a407af..f0e6f5b5bed 100644
--- a/apps/files_sharing/l10n/en_GB.json
+++ b/apps/files_sharing/l10n/en_GB.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Add to your ownCloud",
     "Download" : "Download",
     "Download %s" : "Download %s",
-    "Direct link" : "Direct link"
+    "Direct link" : "Direct link",
+    "Server-to-Server Sharing" : "Server-to-Server Sharing",
+    "Allow users on this server to send shares to other servers" : "Allow users on this server to send shares to other servers",
+    "Allow users on this server to receive shares from other servers" : "Allow users on this server to receive shares from other servers"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/es.js b/apps/files_sharing/l10n/es.js
index 79e3b6c9811..922c52aeaa0 100644
--- a/apps/files_sharing/l10n/es.js
+++ b/apps/files_sharing/l10n/es.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Agregue su propio ownCloud",
     "Download" : "Descargar",
     "Download %s" : "Descargar %s",
-    "Direct link" : "Enlace directo"
+    "Direct link" : "Enlace directo",
+    "Server-to-Server Sharing" : "Compartir Servidor-a-Servidor",
+    "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores",
+    "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/es.json b/apps/files_sharing/l10n/es.json
index fd552789d63..8339a435be0 100644
--- a/apps/files_sharing/l10n/es.json
+++ b/apps/files_sharing/l10n/es.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Agregue su propio ownCloud",
     "Download" : "Descargar",
     "Download %s" : "Descargar %s",
-    "Direct link" : "Enlace directo"
+    "Direct link" : "Enlace directo",
+    "Server-to-Server Sharing" : "Compartir Servidor-a-Servidor",
+    "Allow users on this server to send shares to other servers" : "Permitir a usuarios de este servidor compartir con usuarios de otros servidores",
+    "Allow users on this server to receive shares from other servers" : "Permitir a usuarios de este servidor recibir archivos de usuarios de otros servidores"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fi_FI.js b/apps/files_sharing/l10n/fi_FI.js
index c4713c2be3f..bb02376e115 100644
--- a/apps/files_sharing/l10n/fi_FI.js
+++ b/apps/files_sharing/l10n/fi_FI.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Lisää ownCloudiisi",
     "Download" : "Lataa",
     "Download %s" : "Lataa %s",
-    "Direct link" : "Suora linkki"
+    "Direct link" : "Suora linkki",
+    "Server-to-Server Sharing" : "Palvelimelta palvelimelle -jakaminen",
+    "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille",
+    "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/fi_FI.json b/apps/files_sharing/l10n/fi_FI.json
index ec29c214b45..84b681252dc 100644
--- a/apps/files_sharing/l10n/fi_FI.json
+++ b/apps/files_sharing/l10n/fi_FI.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Lisää ownCloudiisi",
     "Download" : "Lataa",
     "Download %s" : "Lataa %s",
-    "Direct link" : "Suora linkki"
+    "Direct link" : "Suora linkki",
+    "Server-to-Server Sharing" : "Palvelimelta palvelimelle -jakaminen",
+    "Allow users on this server to send shares to other servers" : "Salli tämän palvelimen käyttäjien lähettää jakoja muille palvelimille",
+    "Allow users on this server to receive shares from other servers" : "Salli tämän palvelimen käyttäjien vastaanottaa jakoja muilta palvelimilta"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/fr.js b/apps/files_sharing/l10n/fr.js
index 1db7a59f3d5..98f1a46627d 100644
--- a/apps/files_sharing/l10n/fr.js
+++ b/apps/files_sharing/l10n/fr.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Ajouter à votre ownCloud",
     "Download" : "Télécharger",
     "Download %s" : "Télécharger %s",
-    "Direct link" : "Lien direct"
+    "Direct link" : "Lien direct",
+    "Server-to-Server Sharing" : "Partage de serveur à serveur",
+    "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs",
+    "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/fr.json b/apps/files_sharing/l10n/fr.json
index 6981cd74937..c7145f92e98 100644
--- a/apps/files_sharing/l10n/fr.json
+++ b/apps/files_sharing/l10n/fr.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Ajouter à votre ownCloud",
     "Download" : "Télécharger",
     "Download %s" : "Télécharger %s",
-    "Direct link" : "Lien direct"
+    "Direct link" : "Lien direct",
+    "Server-to-Server Sharing" : "Partage de serveur à serveur",
+    "Allow users on this server to send shares to other servers" : "Autoriser les utilisateurs de ce serveur à envoyer des partages vers d'autres serveurs",
+    "Allow users on this server to receive shares from other servers" : "Autoriser les utilisateurs de ce serveur à recevoir des partages d'autres serveurs"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/ja.js b/apps/files_sharing/l10n/ja.js
index c21273c2d79..c0626abb222 100644
--- a/apps/files_sharing/l10n/ja.js
+++ b/apps/files_sharing/l10n/ja.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "ownCloud に追加",
     "Download" : "ダウンロード",
     "Download %s" : "%s をダウンロード",
-    "Direct link" : "リンク"
+    "Direct link" : "リンク",
+    "Server-to-Server Sharing" : "サーバー間共有",
+    "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
+    "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/files_sharing/l10n/ja.json b/apps/files_sharing/l10n/ja.json
index da34e81cf66..1a199b9e6dc 100644
--- a/apps/files_sharing/l10n/ja.json
+++ b/apps/files_sharing/l10n/ja.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "ownCloud に追加",
     "Download" : "ダウンロード",
     "Download %s" : "%s をダウンロード",
-    "Direct link" : "リンク"
+    "Direct link" : "リンク",
+    "Server-to-Server Sharing" : "サーバー間共有",
+    "Allow users on this server to send shares to other servers" : "ユーザーがこのサーバーから他のサーバーに共有することを許可する",
+    "Allow users on this server to receive shares from other servers" : "ユーザーが他のサーバーからこのサーバーに共有することを許可する"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/nl.js b/apps/files_sharing/l10n/nl.js
index 87ddec611a8..e997a1167f4 100644
--- a/apps/files_sharing/l10n/nl.js
+++ b/apps/files_sharing/l10n/nl.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Toevoegen aan uw ownCloud",
     "Download" : "Downloaden",
     "Download %s" : "Download %s",
-    "Direct link" : "Directe link"
+    "Direct link" : "Directe link",
+    "Server-to-Server Sharing" : "Server-naar-Server delen",
+    "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers",
+    "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/nl.json b/apps/files_sharing/l10n/nl.json
index 2cdbf4eb953..9d6fd9c37ca 100644
--- a/apps/files_sharing/l10n/nl.json
+++ b/apps/files_sharing/l10n/nl.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Toevoegen aan uw ownCloud",
     "Download" : "Downloaden",
     "Download %s" : "Download %s",
-    "Direct link" : "Directe link"
+    "Direct link" : "Directe link",
+    "Server-to-Server Sharing" : "Server-naar-Server delen",
+    "Allow users on this server to send shares to other servers" : "Toestaan dat gebruikers op deze server shares sturen naar andere servers",
+    "Allow users on this server to receive shares from other servers" : "Toestaan dat gebruikers op deze server shares ontvangen van andere servers"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pt_BR.js b/apps/files_sharing/l10n/pt_BR.js
index cb961362f4d..57d2018282c 100644
--- a/apps/files_sharing/l10n/pt_BR.js
+++ b/apps/files_sharing/l10n/pt_BR.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Adiconar ao seu ownCloud",
     "Download" : "Baixar",
     "Download %s" : "Baixar %s",
-    "Direct link" : "Link direto"
+    "Direct link" : "Link direto",
+    "Server-to-Server Sharing" : "Compartilhamento Servidor-a-servidor",
+    "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores",
+    "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/pt_BR.json b/apps/files_sharing/l10n/pt_BR.json
index 3ca7602a171..1587aca9832 100644
--- a/apps/files_sharing/l10n/pt_BR.json
+++ b/apps/files_sharing/l10n/pt_BR.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Adiconar ao seu ownCloud",
     "Download" : "Baixar",
     "Download %s" : "Baixar %s",
-    "Direct link" : "Link direto"
+    "Direct link" : "Link direto",
+    "Server-to-Server Sharing" : "Compartilhamento Servidor-a-servidor",
+    "Allow users on this server to send shares to other servers" : "Permitir que os usuários deste servidor enviem compartilhamentos para outros servidores",
+    "Allow users on this server to receive shares from other servers" : "Permitir que os usuários nesse servidor recebam compartilhamentos de outros servidores"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index dacc144fc01..2c159cabee9 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index c7f9ce54301..0058fd8b6cd 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index a8046e6d05b..c2f1695b7a7 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -68,14 +68,20 @@ msgstr ""
 msgid "Could not change the password. Maybe the old password was not correct."
 msgstr ""
 
-#: ajax/updatePrivateKeyPassword.php:52
-msgid "Private key password successfully updated."
+#: ajax/updatePrivateKeyPassword.php:21
+msgid "Could not update the private key password."
 msgstr ""
 
-#: ajax/updatePrivateKeyPassword.php:54
-msgid ""
-"Could not update the private key password. Maybe the old password was not "
-"correct."
+#: ajax/updatePrivateKeyPassword.php:53
+msgid "The old password was not correct, please try again."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:60
+msgid "The current log-in password was not correct, please try again."
+msgstr ""
+
+#: ajax/updatePrivateKeyPassword.php:66
+msgid "Private key password successfully updated."
 msgstr ""
 
 #: ajax/userrecovery.php:44
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 6a044f6fb0e..9073425448c 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 08ebd45a43b..62c55c2dfa8 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 7b7b062bdc3..4b477c99ed4 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 47edc7a17f5..0fef8dc6674 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 74fc434fcc4..46f67c72640 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,11 +40,11 @@ msgid ""
 "config directory%s."
 msgstr ""
 
-#: base.php:592
+#: base.php:593
 msgid "Sample configuration detected"
 msgstr ""
 
-#: base.php:593
+#: base.php:594
 msgid ""
 "It has been detected that the sample configuration has been copied. This can "
 "break your installation and is unsupported. Please read the documentation "
@@ -455,21 +455,21 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: private/user/manager.php:244
+#: private/user/manager.php:230
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr ""
 
-#: private/user/manager.php:249
+#: private/user/manager.php:235
 msgid "A valid username must be provided"
 msgstr ""
 
-#: private/user/manager.php:253
+#: private/user/manager.php:239
 msgid "A valid password must be provided"
 msgstr ""
 
-#: private/user/manager.php:258
+#: private/user/manager.php:244
 msgid "The username is already being used"
 msgstr ""
 
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index d44e6ef00e3..8ee5e36abcd 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -414,21 +414,21 @@ msgstr ""
 msgid "years ago"
 msgstr ""
 
-#: user/manager.php:244
+#: user/manager.php:230
 msgid ""
 "Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
 "\"0-9\", and \"_.@-\""
 msgstr ""
 
-#: user/manager.php:249
+#: user/manager.php:235
 msgid "A valid username must be provided"
 msgstr ""
 
-#: user/manager.php:253
+#: user/manager.php:239
 msgid "A valid password must be provided"
 msgstr ""
 
-#: user/manager.php:258
+#: user/manager.php:244
 msgid "The username is already being used"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 2ba8eb33c0c..8fc54a6044d 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 57a1d792ee4..aba0727604f 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 7d7831082f0..3433f0092fe 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-06 01:54-0500\n"
+"POT-Creation-Date: 2014-11-07 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/gl.js b/lib/l10n/gl.js
index 24d4ba9a600..596b302009c 100644
--- a/lib/l10n/gl.js
+++ b/lib/l10n/gl.js
@@ -10,6 +10,7 @@ OC.L10N.register(
     "Settings" : "Axustes",
     "Users" : "Usuarios",
     "Admin" : "Administración",
+    "Recommended" : "Recomendado",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Non é posíbel instalar a aplicación «%s» por non seren compatíbel con esta versión do ownCloud.",
     "No app name specified" : "Non se especificou o nome da aplicación",
     "Unknown filetype" : "Tipo de ficheiro descoñecido",
diff --git a/lib/l10n/gl.json b/lib/l10n/gl.json
index 24815e3a085..2b65b3a8f89 100644
--- a/lib/l10n/gl.json
+++ b/lib/l10n/gl.json
@@ -8,6 +8,7 @@
     "Settings" : "Axustes",
     "Users" : "Usuarios",
     "Admin" : "Administración",
+    "Recommended" : "Recomendado",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "Non é posíbel instalar a aplicación «%s» por non seren compatíbel con esta versión do ownCloud.",
     "No app name specified" : "Non se especificou o nome da aplicación",
     "Unknown filetype" : "Tipo de ficheiro descoñecido",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 6baea02501f..b5a3b96b5c8 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Seguridade & Avisos de configuración",
     "Cron" : "Cron",
     "Sharing" : "Compartindo",
     "Security" : "Seguranza",
@@ -36,11 +37,16 @@ OC.L10N.register(
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
     "Enabled" : "Activado",
+    "Not enabled" : "Non habilitado",
+    "Recommended" : "Recomendado",
     "Saved" : "Gardado",
     "test email settings" : "correo de proba dos axustes",
     "If you received this email, the settings seem to be correct." : "Se recibiu este correo, semella que a configuración é correcta.",
+    "A problem occurred while sending the email. Please revise your settings." : "Produciuse un erro mentras enviaba o correo. Por favor revise a súa configuración.",
     "Email sent" : "Correo enviado",
     "You need to set your user email before being able to send test emails." : "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ten certeza de querer engadir \"{domain}\" como dominio de confianza?",
+    "Add trusted domain" : "Engadir dominio de confianza",
     "Sending..." : "Enviando...",
     "All" : "Todo",
     "Please wait...." : "Agarde...",
@@ -60,6 +66,7 @@ OC.L10N.register(
     "So-so password" : "Contrasinal non moi aló",
     "Good password" : "Bo contrasinal",
     "Strong password" : "Contrasinal forte",
+    "Valid until {date}" : "Válido ate {date}",
     "Delete" : "Eliminar",
     "Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
     "Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
@@ -70,6 +77,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Debe fornecer un nome de grupo",
     "deleted {groupName}" : "{groupName} foi eliminado",
     "undo" : "desfacer",
+    "no group" : "sen grupo",
     "never" : "nunca",
     "deleted {userName}" : "{userName} foi eliminado",
     "add group" : "engadir un grupo",
@@ -78,6 +86,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Debe fornecer un contrasinal",
     "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O directorio persoal para o usuario «{user}» xa existe",
     "__language_name__" : "Galego",
+    "Personal Info" : "Información personal",
     "SSL root certificates" : "Certificados raíz SSL",
     "Encryption" : "Cifrado",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (problemas críticos, erros, avisos, información, depuración)",
@@ -111,6 +120,8 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
     "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
+    "Connectivity Checks" : "Comprobacións de conectividade",
+    "No problems found" : "Non se atoparon problemas",
     "Please double check the <a href='%s'>installation guides</a>." : "Volva comprobar as <a href='%s'>guías de instalación</a>",
     "Last cron was executed at %s." : "O último «cron» executouse ás %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
@@ -145,6 +156,7 @@ OC.L10N.register(
     "Credentials" : "Credenciais",
     "SMTP Username" : "Nome de usuario SMTP",
     "SMTP Password" : "Contrasinal SMTP",
+    "Store credentials" : "Gardar credenciais",
     "Test email settings" : "Correo de proba dos axustes",
     "Send email" : "Enviar o correo",
     "Log level" : "Nivel de rexistro",
@@ -153,10 +165,13 @@ OC.L10N.register(
     "Version" : "Versión",
     "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>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Máis aplicativos",
+    "Add your app" : "Engada o seu aplicativo",
     "by" : "por",
+    "licensed" : "licencidado",
     "Documentation:" : "Documentación:",
     "User Documentation" : "Documentación do usuario",
     "Admin Documentation" : "Documentación do administrador",
+    "Update to %s" : "Actualizar a %s",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar unha aplicación",
     "Administrator Documentation" : "Documentación do administrador",
@@ -188,6 +203,10 @@ OC.L10N.register(
     "Choose as profile image" : "Escolla unha imaxe para o perfil",
     "Language" : "Idioma",
     "Help translate" : "Axude na tradución",
+    "Common Name" : "Nome común",
+    "Valid until" : "Válido ate",
+    "Issued By" : "Proporcionado por",
+    "Valid until %s" : "Válido ate %s",
     "Import Root Certificate" : "Importar o certificado raíz",
     "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros",
     "Log-in password" : "Contrasinal de acceso",
@@ -195,6 +214,8 @@ OC.L10N.register(
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
     "Restore Encryption Keys" : "Restaurar as chaves de cifrado",
     "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
+    "Show storage location" : "Mostrar localización de almacenamento",
+    "Show last log in" : "Mostrar última conexión",
     "Login Name" : "Nome de acceso",
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
@@ -209,6 +230,7 @@ OC.L10N.register(
     "Unlimited" : "Sen límites",
     "Other" : "Outro",
     "Username" : "Nome de usuario",
+    "Group Admin for" : "Grupo de Admin para",
     "Quota" : "Cota",
     "Storage Location" : "Localización do almacenamento",
     "Last Login" : "Último acceso",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index dfc7c123dce..437fb64e3aa 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Seguridade & Avisos de configuración",
     "Cron" : "Cron",
     "Sharing" : "Compartindo",
     "Security" : "Seguranza",
@@ -34,11 +35,16 @@
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "A infraestrutura non admite o cambio de contrasinal, mais a chave de cifrado dos usuarios foi actualizada correctamente.",
     "Unable to change password" : "Non é posíbel cambiar o contrasinal",
     "Enabled" : "Activado",
+    "Not enabled" : "Non habilitado",
+    "Recommended" : "Recomendado",
     "Saved" : "Gardado",
     "test email settings" : "correo de proba dos axustes",
     "If you received this email, the settings seem to be correct." : "Se recibiu este correo, semella que a configuración é correcta.",
+    "A problem occurred while sending the email. Please revise your settings." : "Produciuse un erro mentras enviaba o correo. Por favor revise a súa configuración.",
     "Email sent" : "Correo enviado",
     "You need to set your user email before being able to send test emails." : "É necesario configurar o correo do usuario antes de poder enviar mensaxes de correo de proba.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Ten certeza de querer engadir \"{domain}\" como dominio de confianza?",
+    "Add trusted domain" : "Engadir dominio de confianza",
     "Sending..." : "Enviando...",
     "All" : "Todo",
     "Please wait...." : "Agarde...",
@@ -58,6 +64,7 @@
     "So-so password" : "Contrasinal non moi aló",
     "Good password" : "Bo contrasinal",
     "Strong password" : "Contrasinal forte",
+    "Valid until {date}" : "Válido ate {date}",
     "Delete" : "Eliminar",
     "Decrypting files... Please wait, this can take some time." : "Descifrando ficheiros... isto pode levar un anaco.",
     "Delete encryption keys permanently." : "Eliminar permanentemente as chaves de cifrado.",
@@ -68,6 +75,7 @@
     "A valid group name must be provided" : "Debe fornecer un nome de grupo",
     "deleted {groupName}" : "{groupName} foi eliminado",
     "undo" : "desfacer",
+    "no group" : "sen grupo",
     "never" : "nunca",
     "deleted {userName}" : "{userName} foi eliminado",
     "add group" : "engadir un grupo",
@@ -76,6 +84,7 @@
     "A valid password must be provided" : "Debe fornecer un contrasinal",
     "Warning: Home directory for user \"{user}\" already exists" : "Aviso: O directorio persoal para o usuario «{user}» xa existe",
     "__language_name__" : "Galego",
+    "Personal Info" : "Información personal",
     "SSL root certificates" : "Certificados raíz SSL",
     "Encryption" : "Cifrado",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Todo (problemas críticos, erros, avisos, información, depuración)",
@@ -109,6 +118,8 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
     "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
+    "Connectivity Checks" : "Comprobacións de conectividade",
+    "No problems found" : "Non se atoparon problemas",
     "Please double check the <a href='%s'>installation guides</a>." : "Volva comprobar as <a href='%s'>guías de instalación</a>",
     "Last cron was executed at %s." : "O último «cron» executouse ás %s.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "O último «cron» executouse ás %s. Isto supón que pasou máis dunha hora. polo que semella que algo vai mal.",
@@ -143,6 +154,7 @@
     "Credentials" : "Credenciais",
     "SMTP Username" : "Nome de usuario SMTP",
     "SMTP Password" : "Contrasinal SMTP",
+    "Store credentials" : "Gardar credenciais",
     "Test email settings" : "Correo de proba dos axustes",
     "Send email" : "Enviar o correo",
     "Log level" : "Nivel de rexistro",
@@ -151,10 +163,13 @@
     "Version" : "Versión",
     "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>." : "Desenvolvido pola <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidade ownCloud</a>, o <a href=\"https://github.com/owncloud\" target=\"_blank\">código fonte</a> está baixo a licenza <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Máis aplicativos",
+    "Add your app" : "Engada o seu aplicativo",
     "by" : "por",
+    "licensed" : "licencidado",
     "Documentation:" : "Documentación:",
     "User Documentation" : "Documentación do usuario",
     "Admin Documentation" : "Documentación do administrador",
+    "Update to %s" : "Actualizar a %s",
     "Enable only for specific groups" : "Activar só para grupos específicos",
     "Uninstall App" : "Desinstalar unha aplicación",
     "Administrator Documentation" : "Documentación do administrador",
@@ -186,6 +201,10 @@
     "Choose as profile image" : "Escolla unha imaxe para o perfil",
     "Language" : "Idioma",
     "Help translate" : "Axude na tradución",
+    "Common Name" : "Nome común",
+    "Valid until" : "Válido ate",
+    "Issued By" : "Proporcionado por",
+    "Valid until %s" : "Válido ate %s",
     "Import Root Certificate" : "Importar o certificado raíz",
     "The encryption app is no longer enabled, please decrypt all your files" : "A aplicación de cifrado non está activada, descifre todos os ficheiros",
     "Log-in password" : "Contrasinal de acceso",
@@ -193,6 +212,8 @@
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As chaves de cifrado foron movidas á copia de seguranza. Se ten algún problema pode restaurar as chaves. Elimineas permanentemente só se está seguro de que é posíbel descifrar correctamente todos os ficheiros.",
     "Restore Encryption Keys" : "Restaurar as chaves de cifrado",
     "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
+    "Show storage location" : "Mostrar localización de almacenamento",
+    "Show last log in" : "Mostrar última conexión",
     "Login Name" : "Nome de acceso",
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
@@ -207,6 +228,7 @@
     "Unlimited" : "Sen límites",
     "Other" : "Outro",
     "Username" : "Nome de usuario",
+    "Group Admin for" : "Grupo de Admin para",
     "Quota" : "Cota",
     "Storage Location" : "Localización do almacenamento",
     "Last Login" : "Último acceso",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 1e8e5b35233..02d2d7d7fdd 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
     "URL generation in notification emails" : "通知メールにURLを生成",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
+    "Connectivity Checks" : "接続の確認",
     "No problems found" : "問題は見つかりませんでした",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
     "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index e601e3963d0..84f53077e1f 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
     "URL generation in notification emails" : "通知メールにURLを生成",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
+    "Connectivity Checks" : "接続の確認",
     "No problems found" : "問題は見つかりませんでした",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>インストールガイド</a>をよく確認してください。",
     "Last cron was executed at %s." : "直近では%sにcronが実行されました。",
-- 
GitLab


From d26a427f92259ab067da64803c00e7f1589060b0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 14 Oct 2014 17:15:46 +0200
Subject: [PATCH 368/616] Also propagate etag changes when the watcher finds a
 changed file

---
 lib/private/files/cache/updater.php |  5 +++++
 lib/private/files/view.php          |  2 ++
 tests/lib/files/view.php            | 31 +++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/lib/private/files/cache/updater.php b/lib/private/files/cache/updater.php
index c303ff24b1f..31a4a7c21e7 100644
--- a/lib/private/files/cache/updater.php
+++ b/lib/private/files/cache/updater.php
@@ -30,6 +30,11 @@ class Updater {
 		$this->propagator = new ChangePropagator($view);
 	}
 
+	public function propagate($path, $time = null) {
+		$this->propagator->addChange($path);
+		$this->propagator->propagateChanges($time);
+	}
+
 	/**
 	 * Update the cache for $path
 	 *
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 5f5f29ded4f..e15a3063e94 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -903,6 +903,7 @@ class View {
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 				$data = $cache->get($internalPath);
 			} else if ($watcher->checkUpdate($internalPath, $data)) {
+				$this->updater->propagate($path);
 				$data = $cache->get($internalPath);
 			}
 
@@ -974,6 +975,7 @@ class View {
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 				$data = $cache->get($internalPath);
 			} else if ($watcher->checkUpdate($internalPath, $data)) {
+				$this->updater->propagate($path);
 				$data = $cache->get($internalPath);
 			}
 
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 5f030f29fa7..086ac873bfb 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -8,6 +8,7 @@
 namespace Test\Files;
 
 use OC\Files\Cache\Watcher;
+use OC\Files\Storage\Temporary;
 
 class TemporaryNoTouch extends \OC\Files\Storage\Temporary {
 	public function touch($path, $mtime = null) {
@@ -652,6 +653,36 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->assertSame($info['etag'], $info2['etag']);
 	}
 
+	public function testWatcherEtagCrossStorage() {
+		$storage1 = new Temporary(array());
+		$storage2 = new Temporary(array());
+		$scanner1 = $storage1->getScanner();
+		$scanner2 = $storage2->getScanner();
+		$storage1->mkdir('sub');
+		\OC\Files\Filesystem::mount($storage1, array(), '/test/');
+		\OC\Files\Filesystem::mount($storage2, array(), '/test/sub/storage');
+
+		$past = time() - 100;
+		$storage2->file_put_contents('test.txt', 'foobar');
+		$scanner1->scan('');
+		$scanner2->scan('');
+		$view = new \OC\Files\View('');
+
+		$storage2->getWatcher('')->setPolicy(Watcher::CHECK_ALWAYS);
+
+		$oldFileInfo = $view->getFileInfo('/test/sub/storage/test.txt');
+		$oldFolderInfo = $view->getFileInfo('/test');
+
+		$storage2->getCache()->update($oldFileInfo->getId(), array(
+			'storage_mtime' => $past
+		));
+
+		$view->getFileInfo('/test/sub/storage/test.txt');
+		$newFolderInfo = $view->getFileInfo('/test');
+
+		$this->assertNotEquals($newFolderInfo->getEtag(), $oldFolderInfo->getEtag());
+	}
+
 	/**
 	 * @dataProvider absolutePathProvider
 	 */
-- 
GitLab


From a10ae2816eac4ab9b891972567d20e15dd2cb202 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 5 Nov 2014 14:42:36 +0100
Subject: [PATCH 369/616] clean up encryption exceptions

---
 apps/files_encryption/appinfo/app.php         |  6 +-
 .../exception/encryptionException.php         | 50 +++++++++++++++
 .../exception/multiKeyDecryptException.php    | 34 ++++++++++
 .../exception/multiKeyEncryptException.php    | 34 ++++++++++
 apps/files_encryption/lib/crypt.php           | 37 ++++++-----
 apps/files_encryption/lib/exceptions.php      | 63 -------------------
 apps/files_encryption/lib/stream.php          | 22 ++++---
 apps/files_encryption/lib/util.php            |  2 +-
 lib/private/connector/sabre/file.php          |  4 +-
 9 files changed, 157 insertions(+), 95 deletions(-)
 create mode 100644 apps/files_encryption/exception/encryptionException.php
 create mode 100644 apps/files_encryption/exception/multiKeyDecryptException.php
 create mode 100644 apps/files_encryption/exception/multiKeyEncryptException.php
 delete mode 100644 apps/files_encryption/lib/exceptions.php

diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 4f301f48b39..8bf422a612e 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -11,9 +11,9 @@ OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabiliti
 OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
 
 // Exceptions
-OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyEncryptException'] = 'files_encryption/lib/exceptions.php';
-OC::$CLASSPATH['OCA\Encryption\Exceptions\MultiKeyDecryptException'] = 'files_encryption/lib/exceptions.php';
-OC::$CLASSPATH['OCA\Encryption\Exceptions\EncryptionException'] = 'files_encryption/lib/exceptions.php';
+OC::$CLASSPATH['OCA\Encryption\Exception\MultiKeyEncryptException'] = 'files_encryption/exception/multiKeyEncryptException.php';
+OC::$CLASSPATH['OCA\Encryption\Exception\MultiKeyDecryptException'] = 'files_encryption/exception/multiKeyDecryptException.php';
+OC::$CLASSPATH['OCA\Encryption\Exception\EncryptionException'] = 'files_encryption/exception/encryptionException.php';
 
 \OCP\Util::addTranslations('files_encryption');
 \OCP\Util::addscript('files_encryption', 'encryption');
diff --git a/apps/files_encryption/exception/encryptionException.php b/apps/files_encryption/exception/encryptionException.php
new file mode 100644
index 00000000000..c51a3b3439f
--- /dev/null
+++ b/apps/files_encryption/exception/encryptionException.php
@@ -0,0 +1,50 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@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/>.
+ *
+ */
+
+namespace OCA\Encryption\Exception;
+
+/**
+ * Base class for all encryption exception
+ *
+ * Possible Error Codes:
+ * 10 - unknown error
+ * 20 - unexpected end of encryption header
+ * 30 - unexpected blog size
+ * 40 - encryption header to large
+ * 50 - unknown cipher
+ * 60 - encryption failed
+ * 70 - decryption failed
+ * 80 - empty data
+ * 90 - private key missing
+ */
+class EncryptionException extends \Exception {
+	const UNKNOWN = 10;
+	const UNEXPECTED_END_OF_ENCRYPTION_HEADER = 20;
+	const UNEXPECTED_BLOG_SIZE = 30;
+	const ENCRYPTION_HEADER_TO_LARGE = 40;
+	const UNKNOWN_CIPHER = 50;
+	const ENCRYPTION_FAILED = 60;
+	const DECRYPTION_FAILED = 70;
+	const EMPTY_DATA = 80;
+	const PRIVATE_KEY_MISSING = 90;
+}
diff --git a/apps/files_encryption/exception/multiKeyDecryptException.php b/apps/files_encryption/exception/multiKeyDecryptException.php
new file mode 100644
index 00000000000..c1e40e045e0
--- /dev/null
+++ b/apps/files_encryption/exception/multiKeyDecryptException.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@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/>.
+ *
+ */
+
+namespace OCA\Encryption\Exception;
+
+/**
+ * Throw this encryption if multi key decryption failed
+ *
+ * Possible error codes:
+ * 110 - openssl_open failed
+ */
+class MultiKeyDecryptException extends EncryptionException {
+	const OPENSSL_OPEN_FAILED = 110;
+}
diff --git a/apps/files_encryption/exception/multiKeyEncryptException.php b/apps/files_encryption/exception/multiKeyEncryptException.php
new file mode 100644
index 00000000000..e3aa7de591f
--- /dev/null
+++ b/apps/files_encryption/exception/multiKeyEncryptException.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@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/>.
+ *
+ */
+
+namespace OCA\Encryption\Exception;
+
+/**
+ * Throw this exception if multi key encrytion fails
+ *
+ * Possible error codes:
+ * 110 - openssl_seal failed
+ */
+class MultiKeyEncryptException extends EncryptionException {
+	const OPENSSL_SEAL_FAILED = 110;
+}
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 59b191097af..cf915ae27b2 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -3,10 +3,12 @@
 /**
  * ownCloud
  *
- * @author Sam Tuke, Frank Karlitschek, Robin Appelman
- * @copyright 2012 Sam Tuke samtuke@owncloud.com,
- * Robin Appelman icewind@owncloud.com, Frank Karlitschek
- * frank@owncloud.org
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@owncloud.com>
+ * @author Sam Tuke <samtuke@owncloud.com>
+ * @author Frank Karlitschek <frank@owncloud.com>
+ * @author Robin Appelman <icewind@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
@@ -24,7 +26,6 @@
  */
 
 namespace OCA\Encryption;
-use OCA\Encryption\Exceptions\EncryptionException;
 
 /**
  * Class for common cryptography functionality
@@ -189,7 +190,7 @@ class Crypt {
 	 * @param string $passphrase
 	 * @param string $cypher used for encryption, currently we support AES-128-CFB and AES-256-CFB
 	 * @return string encrypted file content
-	 * @throws \OCA\Encryption\Exceptions\EncryptionException
+	 * @throws \OCA\Encryption\Exception\EncryptionException
 	 */
 	private static function encrypt($plainContent, $iv, $passphrase = '', $cipher = Crypt::DEFAULT_CIPHER) {
 
@@ -198,7 +199,7 @@ class Crypt {
 		if (!$encryptedContent) {
 			$error = "Encryption (symmetric) of content failed: " . openssl_error_string();
 			\OCP\Util::writeLog('Encryption library', $error, \OCP\Util::ERROR);
-			throw new Exceptions\EncryptionException($error, 50);
+			throw new Exception\EncryptionException($error, Exception\EncryptionException::ENCRYPTION_FAILED);
 		}
 
 		return $encryptedContent;
@@ -290,7 +291,7 @@ class Crypt {
 			$padded = self::addPadding($catfile);
 
 			return $padded;
-		} catch (EncryptionException $e) {
+		} catch (Exception\EncryptionException $e) {
 			$message = 'Could not encrypt file content (code: ' . $e->getCode() . '): ';
 			\OCP\Util::writeLog('files_encryption', $message . $e->getMessage(), \OCP\Util::ERROR);
 			return false;
@@ -378,7 +379,7 @@ class Crypt {
 	 * @param string $plainContent content to be encrypted
 	 * @param array $publicKeys array keys must be the userId of corresponding user
 	 * @return array keys: keys (array, key = userId), data
-	 * @throws \OCA\Encryption\Exceptions\\MultiKeyEncryptException if encryption failed
+	 * @throws \OCA\Encryption\Exception\MultiKeyEncryptException if encryption failed
 	 * @note symmetricDecryptFileContent() can decrypt files created using this method
 	 */
 	public static function multiKeyEncrypt($plainContent, array $publicKeys) {
@@ -386,7 +387,7 @@ class Crypt {
 		// openssl_seal returns false without errors if $plainContent
 		// is empty, so trigger our own error
 		if (empty($plainContent)) {
-			throw new Exceptions\MultiKeyEncryptException('Cannot multiKeyEncrypt empty plain content', 10);
+			throw new Exception\MultiKeyEncryptException('Cannot multiKeyEncrypt empty plain content', Exception\MultiKeyEncryptException::EMPTY_DATA);
 		}
 
 		// Set empty vars to be set by openssl by reference
@@ -413,7 +414,8 @@ class Crypt {
 			);
 
 		} else {
-			throw new Exceptions\MultiKeyEncryptException('multi key encryption failed: ' . openssl_error_string(), 20);
+			throw new Exception\MultiKeyEncryptException('multi key encryption failed: ' . openssl_error_string(),
+					Exception\MultiKeyEncryptException::OPENSSL_SEAL_FAILED);
 		}
 
 	}
@@ -423,7 +425,7 @@ class Crypt {
 	 * @param string $encryptedContent
 	 * @param string $shareKey
 	 * @param mixed $privateKey
-	 * @throws \OCA\Encryption\Exceptions\\MultiKeyDecryptException if decryption failed
+	 * @throws \OCA\Encryption\Exception\MultiKeyDecryptException if decryption failed
 	 * @internal param string $plainContent contains decrypted content
 	 * @return string $plainContent decrypted string
 	 * @note symmetricDecryptFileContent() can be used to decrypt files created using this method
@@ -433,7 +435,8 @@ class Crypt {
 	public static function multiKeyDecrypt($encryptedContent, $shareKey, $privateKey) {
 
 		if (!$encryptedContent) {
-			throw new Exceptions\MultiKeyDecryptException('Cannot mutliKeyDecrypt empty plain content', 10);
+			throw new Exception\MultiKeyDecryptException('Cannot mutliKeyDecrypt empty plain content',
+					Exception\MultiKeyDecryptException::EMPTY_DATA);
 		}
 
 		if (openssl_open($encryptedContent, $plainContent, $shareKey, $privateKey)) {
@@ -441,7 +444,8 @@ class Crypt {
 			return $plainContent;
 
 		} else {
-			throw new Exceptions\MultiKeyDecryptException('multiKeyDecrypt with share-key' . $shareKey . 'failed: ' . openssl_error_string(), 20);
+			throw new Exception\MultiKeyDecryptException('multiKeyDecrypt with share-key' . $shareKey . 'failed: ' . openssl_error_string(),
+					Exception\MultiKeyDecryptException::OPENSSL_OPEN_FAILED);
 		}
 
 	}
@@ -550,14 +554,15 @@ class Crypt {
 	 * get chiper from header
 	 *
 	 * @param array $header
-	 * @throws \OCA\Encryption\Exceptions\EncryptionException
+	 * @throws \OCA\Encryption\Exception\EncryptionException
 	 */
 	public static function getCipher($header) {
 		$cipher = isset($header['cipher']) ? $header['cipher'] : 'AES-128-CFB';
 
 		if ($cipher !== 'AES-256-CFB' && $cipher !== 'AES-128-CFB') {
 
-			throw new \OCA\Encryption\Exceptions\EncryptionException('file header broken, no supported cipher defined', 40);
+			throw new Exception\EncryptionException('file header broken, no supported cipher defined',
+					Exception\EncryptionException::UNKNOWN_CIPHER);
 		}
 
 		return $cipher;
diff --git a/apps/files_encryption/lib/exceptions.php b/apps/files_encryption/lib/exceptions.php
deleted file mode 100644
index 5b92f4afe74..00000000000
--- a/apps/files_encryption/lib/exceptions.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Bjoern Schiessle
- * @copyright 2014 Bjoern Schiessle <schiessle@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/>.
- *
- */
-
-namespace OCA\Encryption\Exceptions;
-
-/**
- * General encryption exception
- * Possible Error Codes:
- * 10 - unexpected end of encryption header
- * 20 - unexpected blog size
- * 30 - encryption header to large
- * 40 - unknown cipher
- * 50 - encryption failed
- * 60 - no private key available
- */
-class EncryptionException extends \Exception {
-	const UNEXPECTED_END_OF_ENCRTYPTION_HEADER = 10;
-	const UNEXPECTED_BLOG_SIZE = 20;
-	const ENCRYPTION_HEADER_TO_LARGE = 30;
-	const UNKNOWN_CIPHER = 40;
-	const ENCRYPTION_FAILED = 50;
-	const NO_PRIVATE_KEY_AVAILABLE = 60;
-
-}
-
-/**
- * Throw this exception if multi key encrytion fails
- *
- * Possible error codes:
- * 10 - empty plain content was given
- * 20 - openssl_seal failed
- */
-class MultiKeyEncryptException extends EncryptionException {
-}
-
-/**
- * Throw this encryption if multi key decryption failed
- *
- * Possible error codes:
- * 10 - empty encrypted content was given
- * 20 - openssl_open failed
- */
-class MultiKeyDecryptException extends EncryptionException {
-}
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 046c38152b8..647ac6a88c0 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -2,10 +2,11 @@
 /**
  * ownCloud
  *
- * @author Bjoern Schiessle, Robin Appelman
- * @copyright 2014 Bjoern Schiessle <schiessle@owncloud.com>
- *            2012 Sam Tuke <samtuke@owncloud.com>,
- *            2011 Robin Appelman <icewind1991@gmail.com>
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@owncloud.com>
+ * @author Robin Appelman <icewind@owncloud.com>
+ * @author Sam Tuke <samtuke@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
@@ -30,7 +31,7 @@
  */
 
 namespace OCA\Encryption;
-use OCA\Encryption\Exceptions\EncryptionException;
+use OCA\Encryption\Exception\EncryptionException;
 
 /**
  * Provides 'crypt://' stream wrapper protocol.
@@ -91,6 +92,7 @@ class Stream {
 	 * @param int $options
 	 * @param string $opened_path
 	 * @return bool
+	 * @throw \OCA\Encryption\Exception\EncryptionException
 	 */
 	public function stream_open($path, $mode, $options, &$opened_path) {
 
@@ -109,7 +111,7 @@ class Stream {
 		$this->privateKey = $this->session->getPrivateKey();
 		if ($this->privateKey === false) {
 			throw new EncryptionException('Session does not contain a private key, maybe your login password changed?',
-					EncryptionException::NO_PRIVATE_KEY_AVAILABLE);
+					EncryptionException::PRIVATE_KEY_MISSING);
 		}
 
 		$normalizedPath = \OC\Files\Filesystem::normalizePath(str_replace('crypt://', '', $path));
@@ -249,7 +251,7 @@ class Stream {
 	/**
 	 * @param int $count
 	 * @return bool|string
-	 * @throws \OCA\Encryption\Exceptions\EncryptionException
+	 * @throws \OCA\Encryption\Exception\EncryptionException
 	 */
 	public function stream_read($count) {
 
@@ -257,7 +259,7 @@ class Stream {
 
 		if ($count !== Crypt::BLOCKSIZE) {
 			\OCP\Util::writeLog('Encryption library', 'PHP "bug" 21641 no longer holds, decryption system requires refactoring', \OCP\Util::FATAL);
-			throw new \OCA\Encryption\Exceptions\EncryptionException('expected a blog size of 8192 byte', 20);
+			throw new EncryptionException('expected a blog size of 8192 byte', EncryptionException::UNEXPECTED_BLOG_SIZE);
 		}
 
 		// Get the data from the file handle
@@ -365,14 +367,14 @@ class Stream {
 	/**
 	 * write header at beginning of encrypted file
 	 *
-	 * @throws Exceptions\EncryptionException
+	 * @throws Exception\EncryptionException
 	 */
 	private function writeHeader() {
 
 		$header = Crypt::generateHeader();
 
 		if (strlen($header) > Crypt::BLOCKSIZE) {
-			throw new Exceptions\EncryptionException('max header size exceeded', 30);
+			throw new EncryptionException('max header size exceeded', EncryptionException::ENCRYPTION_HEADER_TO_LARGE);
 		}
 
 		$paddedHeader = str_pad($header, Crypt::BLOCKSIZE, self::PADDING_CHAR, STR_PAD_RIGHT);
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index ce5e8c8b54c..c8697ae7c80 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -960,7 +960,7 @@ class Util {
 			$plainKeyfile = $this->decryptKeyfile($filePath, $privateKey);
 			// Re-enc keyfile to (additional) sharekeys
 			$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
-		} catch (Exceptions\EncryptionException $e) {
+		} catch (Exception\EncryptionException $e) {
 			$msg = 'set shareFileKeyFailed (code: ' . $e->getCode() . '): ' . $e->getMessage();
 			\OCP\Util::writeLog('files_encryption', $msg, \OCP\Util::FATAL);
 			return false;
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index dc036c1adca..db8ce14212c 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -100,7 +100,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 		} catch (\OCP\Files\LockNotAcquiredException $e) {
 			// the file is currently being written to by another process
 			throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
-		} catch (\OCA\Encryption\Exceptions\EncryptionException $e) {
+		} catch (\OCA\Encryption\Exception\EncryptionException $e) {
 			throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
 		}
 
@@ -156,7 +156,7 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 		} else {
 			try {
 				return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
-			} catch (\OCA\Encryption\Exceptions\EncryptionException $e) {
+			} catch (\OCA\Encryption\Exception\EncryptionException $e) {
 				throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
 			}
 		}
-- 
GitLab


From 3d19bb2e51333fed3edb106c52740a8dba4f700c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 23 Oct 2014 14:57:53 +0200
Subject: [PATCH 370/616] also try to get file info from part file

---
 apps/files_encryption/lib/proxy.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 31723ae7647..55f2df783c4 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -345,8 +345,8 @@ class Proxy extends \OC_FileProxy {
 			return $size;
 		}
 
-		// get file info from database/cache if not .part file
-		if (empty($fileInfo) && !Helper::isPartialFilePath($path)) {
+		// get file info from database/cache
+		if (empty($fileInfo)) {
 			$proxyState = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
 			$fileInfo = $view->getFileInfo($path);
-- 
GitLab


From f27b6b0ab87b041229d564bbbabcd86a98dc6325 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 30 Oct 2014 10:51:25 +0100
Subject: [PATCH 371/616] don't scan part files

---
 lib/private/files/cache/cache.php | 8 ++++----
 lib/private/files/view.php        | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 7ea00325a10..2c12f834518 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -71,7 +71,7 @@ class Cache {
 		if (empty(self::$mimetypeIds)) {
 			$this->loadMimetypes();
 		}
-		
+
 		if (!isset(self::$mimetypeIds[$mime])) {
 			try{
 				$result = \OC_DB::executeAudited('INSERT INTO `*PREFIX*mimetypes`(`mimetype`) VALUES(?)', array($mime));
@@ -82,8 +82,8 @@ class Cache {
 				\OC_Log::write('core', 'Exception during mimetype insertion: ' . $e->getmessage(), \OC_Log::DEBUG);
 				return -1;
 			}
-		} 
-				
+		}
+
 		return self::$mimetypeIds[$mime];
 	}
 
@@ -371,7 +371,7 @@ class Cache {
 				$this->remove($child['path']);
 			}
 		}
-		
+
 		$sql = 'DELETE FROM `*PREFIX*filecache` WHERE `fileid` = ?';
 		\OC_DB::executeAudited($sql, array($entry['fileid']));
 	}
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index e15a3063e94..0e4da30f7b9 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -902,7 +902,7 @@ class View {
 				$scanner = $storage->getScanner($internalPath);
 				$scanner->scan($internalPath, Cache\Scanner::SCAN_SHALLOW);
 				$data = $cache->get($internalPath);
-			} else if ($watcher->checkUpdate($internalPath, $data)) {
+			} else if (!Cache\Scanner::isPartialFile($internalPath) && $watcher->checkUpdate($internalPath, $data)) {
 				$this->updater->propagate($path);
 				$data = $cache->get($internalPath);
 			}
-- 
GitLab


From 2af7256267c8b16efcf68fec45c612d8c64c0c1d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 27 Oct 2014 12:51:52 +0100
Subject: [PATCH 372/616] only set the values we need and make sure that we
 write the file info for both the real file and the part file, because some
 information from the part file might be needed later

---
 apps/files_encryption/lib/stream.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 046c38152b8..931aa08cb2c 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -637,13 +637,17 @@ class Stream {
 			$path = Helper::stripPartialFileExtension($this->rawPath);
 
 			$fileInfo = array(
+				'mimetype' => $this->rootView->getMimeType($this->rawPath),
 				'encrypted' => true,
-				'size' => $this->size,
 				'unencrypted_size' => $this->unencryptedSize,
 			);
 
-			// set fileinfo
-			$this->rootView->putFileInfo($path, $fileInfo);
+			// if we write a part file we also store the unencrypted size for
+			// the part file so that it can be re-used later
+			$this->rootView->putFileInfo($this->rawPath, $fileInfo);
+			if ($path !== $this->rawPath) {
+				$this->rootView->putFileInfo($path, $fileInfo);
+			}
 
 		}
 
-- 
GitLab


From 541344d880cff18b64916ee7fb6b5dae5f415372 Mon Sep 17 00:00:00 2001
From: Craig Morrissey <craig@owncloud.com>
Date: Fri, 7 Nov 2014 12:45:42 -0500
Subject: [PATCH 373/616] logging changes

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

diff --git a/lib/private/user.php b/lib/private/user.php
index 2358f4a14e4..b2a235425c4 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -228,6 +228,9 @@ class OC_User {
 	 * Log in a user and regenerate a new session - if the password is ok
 	 */
 	public static function login($loginname, $password) {
+		$loginname = str_replace("\0", '', $loginname);
+		$password = str_replace("\0", '', $password);
+
 		session_regenerate_id(true);
 		$result = self::getUserSession()->login($loginname, $password);
 		if ($result) {
-- 
GitLab


From cc19d05ae731e27a897f4da0e6ccae6755fcad37 Mon Sep 17 00:00:00 2001
From: Sebastian Bolt <sebastian.bolt@gmx.de>
Date: Fri, 7 Nov 2014 21:56:48 +0100
Subject: [PATCH 374/616] changed default dropdown content

to fix issue #11959
---
 settings/js/users/users.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/js/users/users.js b/settings/js/users/users.js
index f7ac5dc752d..5e0c0cac189 100644
--- a/settings/js/users/users.js
+++ b/settings/js/users/users.js
@@ -46,7 +46,7 @@ var UserList = {
 
 		// make them look like the multiselect buttons
 		// until they get time to really get initialized
-		groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'Groups') + '"></select>')
+		groupsSelect = $('<select multiple="multiple" class="groupsselect multiselect button" data-placehoder="Groups" title="' + t('settings', 'no group') + '"></select>')
 			.data('username', username)
 			.data('user-groups', groups);
 		if ($tr.find('td.subadmins').length > 0) {
-- 
GitLab


From 45a877c3a7ed01cf5e1ef9d98f044b78c96cab5c Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Sat, 8 Nov 2014 01:47:46 +0100
Subject: [PATCH 375/616] use proper tabindex order: 1. app menu, 2. search, 3.
 user menu

---
 core/templates/layout.user.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 8ccafcbf99c..d8129ecfc67 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -43,7 +43,7 @@
 			<a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud">
 				<div class="logo-icon svg"></div>
 			</a>
-			<a href="#" class="menutoggle">
+			<a href="#" class="menutoggle" tabindex="1">
 				<h1 class="header-appname">
 					<?php
 						if(OC_Util::getEditionString() === '') {
@@ -57,7 +57,7 @@
 			</a>
 			<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
 			<div id="settings" class="svg">
-				<div id="expand" tabindex="0" role="link">
+				<div id="expand" tabindex="3" role="link">
 					<?php if ($_['enableAvatars']): ?>
 					<div class="avatardiv<?php if ($_['userAvatarSet']) { print_unescaped(' avatardiv-shown"'); } else { print_unescaped('" style="display: none"'); } ?>>
 						<?php if ($_['userAvatarSet']): ?>
@@ -92,7 +92,7 @@
 			<form class="searchbox" action="#" method="post">
 				<input id="searchbox" class="svg" type="search" name="query"
 					value="<?php if(isset($_POST['query'])) {p($_POST['query']);};?>"
-					autocomplete="off" />
+					autocomplete="off" tabindex="2" />
 			</form>
 		</div></header>
 
-- 
GitLab


From b3bccce267a81e15d5ced3a4800aac4bd11b26ee Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 7 Nov 2014 22:33:40 -0800
Subject: [PATCH 376/616] update google-api-php-client to 1.0.6-beta

Latest version with various bugfixes, also implements support
for using curl instead of its own io class when available; this
avoids the bug that causes severe excess bandwidth use due to
some kind of zlib issue.
---
 .../3rdparty/google-api-php-client/README.md  |  26 +-
 .../src/Google/Auth/Abstract.php              |   6 -
 .../src/Google/Auth/AssertionCredentials.php  |   7 +-
 .../src/Google/Auth/OAuth2.php                | 111 +++--
 .../src/Google/Auth/Simple.php                |  30 --
 .../src/Google/Cache/File.php                 |   4 +-
 .../src/Google/Cache/Memcache.php             |   2 +-
 .../src/Google/Client.php                     |  93 +++-
 .../src/Google/Collection.php                 |  32 +-
 .../src/Google/Config.php                     | 106 +++-
 .../src/Google/Http/MediaFileUpload.php       |  57 ++-
 .../src/Google/Http/REST.php                  |   7 +-
 .../src/Google/IO/Abstract.php                | 102 +++-
 .../src/Google/IO/Curl.php                    | 137 ++++++
 .../src/Google/IO/Stream.php                  | 134 ++++--
 .../src/Google/Model.php                      |  82 ++--
 .../src/Google/Service/Drive.php              | 454 +++++++++++++++++-
 .../src/Google/Signer/P12.php                 |  42 +-
 .../src/Google/Utils.php                      |   6 +-
 .../src/Google/Utils/URITemplate.php          |   2 +-
 .../src/Google/Verifier/Pem.php               |   3 +-
 21 files changed, 1179 insertions(+), 264 deletions(-)
 create mode 100644 apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Curl.php

diff --git a/apps/files_external/3rdparty/google-api-php-client/README.md b/apps/files_external/3rdparty/google-api-php-client/README.md
index 9f7949c1794..e799f6725da 100644
--- a/apps/files_external/3rdparty/google-api-php-client/README.md
+++ b/apps/files_external/3rdparty/google-api-php-client/README.md
@@ -1,21 +1,31 @@
+[![Build Status](https://travis-ci.org/google/google-api-php-client.svg)](https://travis-ci.org/google/google-api-php-client)
+
 # Google APIs Client Library for PHP #
 
 ## Description ##
 The Google API Client Library enables you to work with Google APIs such as Google+, Drive, or YouTube on your server.
 
+## Beta ##
+This library is in Beta. We're comfortable enough with the stability and features of the library that we want you to build real production applications on it. We will make an effort to support the public and protected surface of the library and maintain backwards compatibility in the future. While we are still in Beta, we reserve the right to make incompatible changes. If we do remove some functionality (typically because better functionality exists or if the feature proved infeasible), our intention is to deprecate and provide ample time for developers to update their code.
+
 ## Requirements ##
 * [PHP 5.2.1 or higher](http://www.php.net/)
 * [PHP JSON extension](http://php.net/manual/en/book.json.php)
 
+*Note*: some features (service accounts and id token verification) require PHP 5.3.0 and above due to cryptographic algorithm requirements. 
+
 ## Developer Documentation ##
 http://developers.google.com/api-client-library/php
 
+## Installation ##
+
+For the latest installation and setup instructions, see [the documentation](https://developers.google.com/api-client-library/php/start/installation).
+
 ## Basic Example ##
 See the examples/ directory for examples of the key client features.
 ```PHP
 <?php
-  require_once 'Google/Client.php';
-  require_once 'Google/Service/Books.php';
+  require_once 'google-api-php-client/autoload.php'; // or wherever autoload.php is located
   $client = new Google_Client();
   $client->setApplicationName("Client_Library_Examples");
   $client->setDeveloperKey("YOUR_APP_KEY");
@@ -42,12 +52,22 @@ We accept contributions via Github Pull Requests, but all contributors need to b
 
 ### Why do you still support 5.2? ###
 
-When we started working on the 1.0.0 branch we knew there were several fundamental issues to fix with the 0.6 releases of the library. At that time we looked at the usage of the library, and other related projects, and determined that there was still a large and active base of PHP 5.2 installs. You can see this in statistics such as the PHP versions chart in the Wordpress stats: http://wordpress.org/about/stats/. We will keep looking at the types of usage we see, and try to take advantage of newer PHP features where possible.
+When we started working on the 1.0.0 branch we knew there were several fundamental issues to fix with the 0.6 releases of the library. At that time we looked at the usage of the library, and other related projects, and determined that there was still a large and active base of PHP 5.2 installs. You can see this in statistics such as the PHP versions chart in the WordPress stats: http://wordpress.org/about/stats/. We will keep looking at the types of usage we see, and try to take advantage of newer PHP features where possible.
 
 ### Why does Google_..._Service have weird names? ###
 
 The _Service classes are generally automatically generated from the API discovery documents: https://developers.google.com/discovery/. Sometimes new features are added to APIs with unusual names, which can cause some unexpected or non-standard style naming in the PHP classes. 
 
+### How do I deal with non-JSON response types? ###
+
+Some services return XML or similar by default, rather than JSON, which is what the library supports. You can request a JSON response by adding an 'alt' argument to optional params that is normally the last argument to a method call:
+
+```
+$opt_params = array(
+  'alt' => "json"
+);
+```
+
 ## Code Quality ##
 
 Copy the ruleset.xml in style/ into a new directory named GAPI/ in your
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Abstract.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Abstract.php
index 344aad874f4..0832df3a408 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Abstract.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Abstract.php
@@ -31,11 +31,5 @@ abstract class Google_Auth_Abstract
    * @return Google_Http_Request $request
    */
   abstract public function authenticatedRequest(Google_Http_Request $request);
-
-  abstract public function authenticate($code);
   abstract public function sign(Google_Http_Request $request);
-  abstract public function createAuthUrl($scope);
-
-  abstract public function refreshToken($refreshToken);
-  abstract public function revokeToken();
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/AssertionCredentials.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/AssertionCredentials.php
index be93df33d50..3db0a779df3 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/AssertionCredentials.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/AssertionCredentials.php
@@ -118,9 +118,14 @@ class Google_Auth_AssertionCredentials
   {
     $header = array('typ' => 'JWT', 'alg' => 'RS256');
 
+    $payload = json_encode($payload);
+    // Handle some overzealous escaping in PHP json that seemed to cause some errors
+    // with claimsets.
+    $payload = str_replace('\/', '/', $payload);
+
     $segments = array(
       Google_Utils::urlSafeB64Encode(json_encode($header)),
-      Google_Utils::urlSafeB64Encode(json_encode($payload))
+      Google_Utils::urlSafeB64Encode($payload)
     );
 
     $signingInput = implode('.', $segments);
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
index 6cf7c1a190f..5630d755e04 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/OAuth2.php
@@ -50,9 +50,9 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
   private $state;
 
   /**
-   * @var string The token bundle.
+   * @var array The token bundle.
    */
-  private $token;
+  private $token = array();
 
   /**
    * @var Google_Client the base client
@@ -97,37 +97,39 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
 
     // We got here from the redirect from a successful authorization grant,
     // fetch the access token
-    $request = $this->client->getIo()->makeRequest(
-        new Google_Http_Request(
-            self::OAUTH2_TOKEN_URI,
-            'POST',
-            array(),
-            array(
-              'code' => $code,
-              'grant_type' => 'authorization_code',
-              'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
-              'client_id' => $this->client->getClassConfig($this, 'client_id'),
-              'client_secret' => $this->client->getClassConfig($this, 'client_secret')
-            )
+    $request = new Google_Http_Request(
+        self::OAUTH2_TOKEN_URI,
+        'POST',
+        array(),
+        array(
+          'code' => $code,
+          'grant_type' => 'authorization_code',
+          'redirect_uri' => $this->client->getClassConfig($this, 'redirect_uri'),
+          'client_id' => $this->client->getClassConfig($this, 'client_id'),
+          'client_secret' => $this->client->getClassConfig($this, 'client_secret')
         )
     );
+    $request->disableGzip();
+    $response = $this->client->getIo()->makeRequest($request);
 
-    if ($request->getResponseHttpCode() == 200) {
-      $this->setAccessToken($request->getResponseBody());
+    if ($response->getResponseHttpCode() == 200) {
+      $this->setAccessToken($response->getResponseBody());
       $this->token['created'] = time();
       return $this->getAccessToken();
     } else {
-      $response = $request->getResponseBody();
-      $decodedResponse = json_decode($response, true);
+      $decodedResponse = json_decode($response->getResponseBody(), true);
       if ($decodedResponse != null && $decodedResponse['error']) {
-        $response = $decodedResponse['error'];
+        $decodedResponse = $decodedResponse['error'];
+        if (isset($decodedResponse['error_description'])) {
+          $decodedResponse .= ": " . $decodedResponse['error_description'];
+        }
       }
       throw new Google_Auth_Exception(
           sprintf(
               "Error fetching OAuth2 access token, message: '%s'",
-              $response
+              $decodedResponse
           ),
-          $request->getResponseHttpCode()
+          $response->getResponseHttpCode()
       );
     }
   }
@@ -147,9 +149,15 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
         'client_id' => $this->client->getClassConfig($this, 'client_id'),
         'scope' => $scope,
         'access_type' => $this->client->getClassConfig($this, 'access_type'),
-        'approval_prompt' => $this->client->getClassConfig($this, 'approval_prompt'),
     );
 
+    $params = $this->maybeAddParam($params, 'approval_prompt');
+    $params = $this->maybeAddParam($params, 'login_hint');
+    $params = $this->maybeAddParam($params, 'hd');
+    $params = $this->maybeAddParam($params, 'openid.realm');
+    $params = $this->maybeAddParam($params, 'prompt');
+    $params = $this->maybeAddParam($params, 'include_granted_scopes');
+
     // If the list of scopes contains plus.login, add request_visible_actions
     // to auth URL.
     $rva = $this->client->getClassConfig($this, 'request_visible_actions');
@@ -185,6 +193,15 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
     return json_encode($this->token);
   }
 
+  public function getRefreshToken()
+  {
+    if (array_key_exists('refresh_token', $this->token)) {
+      return $this->token['refresh_token'];
+    } else {
+      return null;
+    }
+  }
+
   public function setState($state)
   {
     $this->state = $state;
@@ -223,7 +240,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
             throw new Google_Auth_Exception(
                 "The OAuth 2.0 access token has expired,"
                 ." and a refresh token is not available. Refresh tokens"
-                . "are not returned for responses that were auto-approved."
+                ." are not returned for responses that were auto-approved."
             );
         }
         $this->refreshToken($this->token['refresh_token']);
@@ -265,7 +282,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
     if (!$assertionCredentials) {
       $assertionCredentials = $this->assertionCredentials;
     }
-    
+
     $cacheKey = $assertionCredentials->getCacheKey();
 
     if ($cacheKey) {
@@ -280,7 +297,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
         return;
       }
     }
-    
+
     $this->refreshTokenRequest(
         array(
           'grant_type' => 'assertion',
@@ -288,7 +305,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
           'assertion' => $assertionCredentials->generateAssertion(),
         )
     );
-    
+
     if ($cacheKey) {
       // Attempt to cache the token.
       $this->client->getCache()->set(
@@ -306,6 +323,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
         array(),
         $params
     );
+    $http->disableGzip();
     $request = $this->client->getIo()->makeRequest($http);
 
     $code = $request->getResponseHttpCode();
@@ -320,6 +338,9 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
         throw new Google_Auth_Exception("Invalid token format");
       }
 
+      if (isset($token['id_token'])) {
+        $this->token['id_token'] = $token['id_token'];
+      }
       $this->token['access_token'] = $token['access_token'];
       $this->token['expires_in'] = $token['expires_in'];
       $this->token['created'] = time();
@@ -328,17 +349,24 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
     }
   }
 
-    /**
-     * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
-     * token, if a token isn't provided.
-     * @throws Google_Auth_Exception
-     * @param string|null $token The token (access token or a refresh token) that should be revoked.
-     * @return boolean Returns True if the revocation was successful, otherwise False.
-     */
+  /**
+   * Revoke an OAuth2 access token or refresh token. This method will revoke the current access
+   * token, if a token isn't provided.
+   * @throws Google_Auth_Exception
+   * @param string|null $token The token (access token or a refresh token) that should be revoked.
+   * @return boolean Returns True if the revocation was successful, otherwise False.
+   */
   public function revokeToken($token = null)
   {
     if (!$token) {
-      $token = $this->token['access_token'];
+      if (!$this->token) {
+        // Not initialized, no token to actually revoke
+        return false;
+      } elseif (array_key_exists('refresh_token', $this->token)) {
+        $token = $this->token['refresh_token'];
+      } else {
+        $token = $this->token['access_token'];
+      }
     }
     $request = new Google_Http_Request(
         self::OAUTH2_REVOKE_URI,
@@ -346,6 +374,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
         array(),
         "token=$token"
     );
+    $request->disableGzip();
     $response = $this->client->getIo()->makeRequest($request);
     $code = $response->getResponseHttpCode();
     if ($code == 200) {
@@ -362,7 +391,7 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
    */
   public function isAccessTokenExpired()
   {
-    if (!$this->token) {
+    if (!$this->token || !isset($this->token['created'])) {
       return true;
     }
 
@@ -576,4 +605,16 @@ class Google_Auth_OAuth2 extends Google_Auth_Abstract
     // All good.
     return new Google_Auth_LoginTicket($envelope, $payload);
   }
+
+  /**
+   * Add a parameter to the auth params if not empty string.
+   */
+  private function maybeAddParam($params, $name)
+  {
+    $param = $this->client->getClassConfig($this, $name);
+    if ($param != '') {
+      $params[$name] = $param;
+    }
+    return $params;
+  }
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Simple.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Simple.php
index 8fcf61e52ea..e83900fc26f 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Simple.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Auth/Simple.php
@@ -51,36 +51,6 @@ class Google_Auth_Simple extends Google_Auth_Abstract
     return $this->io->makeRequest($request);
   }
 
-  public function authenticate($code)
-  {
-    throw new Google_Auth_Exception("Simple auth does not exchange tokens.");
-  }
-
-  public function setAccessToken($accessToken)
-  {
-    /* noop*/
-  }
-
-  public function getAccessToken()
-  {
-    return null;
-  }
-
-  public function createAuthUrl($scope)
-  {
-    return null;
-  }
-
-  public function refreshToken($refreshToken)
-  {
-    /* noop*/
-  }
-
-  public function revokeToken()
-  {
-    /* noop*/
-  }
-
   public function sign(Google_Http_Request $request)
   {
     $key = $this->client->getClassConfig($this, 'developer_key');
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/File.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/File.php
index 530af80ff96..8d0d62fe88c 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/File.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/File.php
@@ -48,14 +48,14 @@ class Google_Cache_File extends Google_Cache_Abstract
 
     if ($expiration) {
       $mtime = filemtime($storageFile);
-      if (($now - $mtime) >= $expiration) {
+      if ((time() - $mtime) >= $expiration) {
         $this->delete($key);
         return false;
       }
     }
 
     if ($this->acquireReadLock($storageFile)) {
-      $data = file_get_contents($storageFile);
+      $data = fread($this->fh, filesize($storageFile));
       $data =  unserialize($data);
       $this->unlock($storageFile);
     }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Memcache.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Memcache.php
index 56676c24728..1104afb8aeb 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Memcache.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Cache/Memcache.php
@@ -47,7 +47,7 @@ class Google_Cache_Memcache extends Google_Cache_Abstract
     } else {
       $this->host = $client->getClassConfig($this, 'host');
       $this->port = $client->getClassConfig($this, 'port');
-      if (empty($this->host) || empty($this->port)) {
+      if (empty($this->host) || (empty($this->port) && (string) $this->port != "0")) {
         throw new Google_Cache_Exception("You need to supply a valid memcache host and port");
       }
     }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
index e61daf7f16e..e15b4f4ea3c 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Client.php
@@ -21,6 +21,7 @@ require_once 'Google/Cache/Memcache.php';
 require_once 'Google/Config.php';
 require_once 'Google/Collection.php';
 require_once 'Google/Exception.php';
+require_once 'Google/IO/Curl.php';
 require_once 'Google/IO/Stream.php';
 require_once 'Google/Model.php';
 require_once 'Google/Service.php';
@@ -35,7 +36,7 @@ require_once 'Google/Service/Resource.php';
  */
 class Google_Client
 {
-  const LIBVER = "1.0.3-beta";
+  const LIBVER = "1.0.6-beta";
   const USER_AGENT_SUFFIX = "google-api-php-client/";
   /**
    * @var Google_Auth_Abstract $auth
@@ -79,11 +80,6 @@ class Google_Client
    */
   public function __construct($config = null)
   {
-    if (! ini_get('date.timezone') &&
-        function_exists('date_default_timezone_set')) {
-      date_default_timezone_set('UTC');
-    }
-
     if (is_string($config) && strlen($config)) {
       $config = new Google_Config($config);
     } else if ( !($config instanceof Google_Config)) {
@@ -92,11 +88,22 @@ class Google_Client
       if ($this->isAppEngine()) {
         // Automatically use Memcache if we're in AppEngine.
         $config->setCacheClass('Google_Cache_Memcache');
+      }
+
+      if (version_compare(phpversion(), "5.3.4", "<=") || $this->isAppEngine()) {
         // Automatically disable compress.zlib, as currently unsupported.
         $config->setClassConfig('Google_Http_Request', 'disable_gzip', true);
       }
     }
 
+    if ($config->getIoClass() == Google_Config::USE_AUTO_IO_SELECTION) {
+      if (function_exists('curl_version') && function_exists('curl_exec')) {
+        $config->setIoClass("Google_IO_Curl");
+      } else {
+        $config->setIoClass("Google_IO_Stream");
+      }
+    }
+
     $this->config = $config;
   }
 
@@ -178,7 +185,7 @@ class Google_Client
    */
   public function setAccessToken($accessToken)
   {
-    if ($accessToken == null || 'null' == $accessToken) {
+    if ($accessToken == 'null') {
       $accessToken = null;
     }
     $this->getAuth()->setAccessToken($accessToken);
@@ -238,7 +245,16 @@ class Google_Client
     // The response is json encoded, so could be the string null.
     // It is arguable whether this check should be here or lower
     // in the library.
-    return (null == $token || 'null' == $token) ? null : $token;
+    return (null == $token || 'null' == $token || '[]' == $token) ? null : $token;
+  }
+
+  /**
+   * Get the OAuth 2.0 refresh token.
+   * @return string $refreshToken refresh token or null if not available
+   */
+  public function getRefreshToken()
+  {
+    return $this->getAuth()->getRefreshToken();
   }
 
   /**
@@ -280,6 +296,15 @@ class Google_Client
     $this->config->setApprovalPrompt($approvalPrompt);
   }
 
+  /**
+   * Set the login hint, email address or sub id.
+   * @param string $loginHint
+   */
+  public function setLoginHint($loginHint)
+  {
+      $this->config->setLoginHint($loginHint);
+  }
+
   /**
    * Set the application name, this is included in the User-Agent HTTP header.
    * @param string $applicationName
@@ -342,6 +367,50 @@ class Google_Client
     $this->config->setDeveloperKey($developerKey);
   }
 
+  /**
+   * Set the hd (hosted domain) parameter streamlines the login process for
+   * Google Apps hosted accounts. By including the domain of the user, you
+   * restrict sign-in to accounts at that domain.
+   * @param $hd string - the domain to use.
+   */
+  public function setHostedDomain($hd)
+  {
+    $this->config->setHostedDomain($hd);
+  }
+
+  /**
+   * Set the prompt hint. Valid values are none, consent and select_account.
+   * If no value is specified and the user has not previously authorized
+   * access, then the user is shown a consent screen.
+   * @param $prompt string
+   */
+  public function setPrompt($prompt)
+  {
+    $this->config->setPrompt($prompt);
+  }
+
+  /**
+   * openid.realm is a parameter from the OpenID 2.0 protocol, not from OAuth
+   * 2.0. It is used in OpenID 2.0 requests to signify the URL-space for which
+   * an authentication request is valid.
+   * @param $realm string - the URL-space to use.
+   */
+  public function setOpenidRealm($realm)
+  {
+    $this->config->setOpenidRealm($realm);
+  }
+
+  /**
+   * If this is provided with the value true, and the authorization request is
+   * granted, the authorization will include any previous authorizations
+   * granted to this user/application combination for other scopes.
+   * @param $include boolean - the URL-space to use.
+   */
+  public function setIncludeGrantedScopes($include)
+  {
+    $this->config->setIncludeGrantedScopes($include);
+  }
+
   /**
    * Fetches a fresh OAuth 2.0 access token with the given refresh token.
    * @param string $refreshToken
@@ -414,9 +483,9 @@ class Google_Client
     $this->requestedScopes = array();
     $this->addScope($scopes);
   }
-  
+
   /**
-   * This functions adds a scope to be requested as part of the OAuth2.0 flow. 
+   * This functions adds a scope to be requested as part of the OAuth2.0 flow.
    * Will append any scopes not previously requested to the scope parameter.
    * A single string will be treated as a scope to request. An array of strings
    * will each be appended.
@@ -466,11 +535,11 @@ class Google_Client
   {
     $this->deferExecution = $defer;
   }
-  
+
   /**
    * Helper method to execute deferred HTTP requests.
    *
-   * @returns object of the type of the expected class or array.
+   * @return object of the type of the expected class or array.
    */
   public function execute($request)
   {
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Collection.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Collection.php
index 60909a967a4..6e7bf9b0f1e 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Collection.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Collection.php
@@ -13,29 +13,31 @@ class Google_Collection extends Google_Model implements Iterator, Countable
 
   public function rewind()
   {
-    if (is_array($this->data[$this->collection_key])) {
-      reset($this->data[$this->collection_key]);
+    if (isset($this->modelData[$this->collection_key])
+        && is_array($this->modelData[$this->collection_key])) {
+      reset($this->modelData[$this->collection_key]);
     }
   }
 
   public function current()
   {
     $this->coerceType($this->key());
-    if (is_array($this->data[$this->collection_key])) {
-      return current($this->data[$this->collection_key]);
+    if (is_array($this->modelData[$this->collection_key])) {
+      return current($this->modelData[$this->collection_key]);
     }
   }
 
   public function key()
   {
-    if (is_array($this->data[$this->collection_key])) {
-      return key($this->data[$this->collection_key]);
+    if (isset($this->modelData[$this->collection_key])
+        && is_array($this->modelData[$this->collection_key])) {
+      return key($this->modelData[$this->collection_key]);
     }
   }
 
   public function next()
   {
-    return next($this->data[$this->collection_key]);
+    return next($this->modelData[$this->collection_key]);
   }
 
   public function valid()
@@ -46,7 +48,7 @@ class Google_Collection extends Google_Model implements Iterator, Countable
 
   public function count()
   {
-    return count($this->data[$this->collection_key]);
+    return count($this->modelData[$this->collection_key]);
   }
 
   public function offsetExists ($offset)
@@ -54,7 +56,7 @@ class Google_Collection extends Google_Model implements Iterator, Countable
     if (!is_numeric($offset)) {
       return parent::offsetExists($offset);
     }
-    return isset($this->data[$this->collection_key][$offset]);
+    return isset($this->modelData[$this->collection_key][$offset]);
   }
 
   public function offsetGet($offset)
@@ -63,7 +65,7 @@ class Google_Collection extends Google_Model implements Iterator, Countable
       return parent::offsetGet($offset);
     }
     $this->coerceType($offset);
-    return $this->data[$this->collection_key][$offset];
+    return $this->modelData[$this->collection_key][$offset];
   }
 
   public function offsetSet($offset, $value)
@@ -71,7 +73,7 @@ class Google_Collection extends Google_Model implements Iterator, Countable
     if (!is_numeric($offset)) {
       return parent::offsetSet($offset, $value);
     }
-    $this->data[$this->collection_key][$offset] = $value;
+    $this->modelData[$this->collection_key][$offset] = $value;
   }
 
   public function offsetUnset($offset)
@@ -79,16 +81,16 @@ class Google_Collection extends Google_Model implements Iterator, Countable
     if (!is_numeric($offset)) {
       return parent::offsetUnset($offset);
     }
-    unset($this->data[$this->collection_key][$offset]);
+    unset($this->modelData[$this->collection_key][$offset]);
   }
 
   private function coerceType($offset)
   {
     $typeKey = $this->keyType($this->collection_key);
-    if (isset($this->$typeKey) && !is_object($this->data[$this->collection_key][$offset])) {
+    if (isset($this->$typeKey) && !is_object($this->modelData[$this->collection_key][$offset])) {
       $type = $this->$typeKey;
-      $this->data[$this->collection_key][$offset] =
-          new $type($this->data[$this->collection_key][$offset]);
+      $this->modelData[$this->collection_key][$offset] =
+          new $type($this->modelData[$this->collection_key][$offset]);
     }
   }
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Config.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Config.php
index 972c97fedd0..84083058fe5 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Config.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Config.php
@@ -20,12 +20,17 @@
  */
 class Google_Config
 {
-  private $configuration;
+  const GZIP_DISABLED = true;
+  const GZIP_ENABLED = false;
+  const GZIP_UPLOADS_ENABLED = true;
+  const GZIP_UPLOADS_DISABLED = false;
+  const USE_AUTO_IO_SELECTION = "auto";
+  protected $configuration;
 
   /**
    * Create a new Google_Config. Can accept an ini file location with the
    * local configuration. For example:
-   *     application_name: "My App";
+   *     application_name="My App"
    *
    * @param [$ini_file_location] - optional - The location of the ini file to load
    */
@@ -37,7 +42,7 @@ class Google_Config
 
       // Which Authentication, Storage and HTTP IO classes to use.
       'auth_class'    => 'Google_Auth_OAuth2',
-      'io_class'      => 'Google_IO_Stream',
+      'io_class'      => self::USE_AUTO_IO_SELECTION,
       'cache_class'   => 'Google_Cache_File',
 
       // Don't change these unless you're working against a special development
@@ -46,12 +51,21 @@ class Google_Config
 
       // Definition of class specific values, like file paths and so on.
       'classes' => array(
-        // If you want to pass in OAuth 2.0 settings, they will need to be
-        // structured like this.
+        'Google_IO_Abstract' => array(
+          'request_timeout_seconds' => 100,
+        ),
         'Google_Http_Request' => array(
-          // Disable the use of gzip on calls if set to true.
-          'disable_gzip' => false
+          // Disable the use of gzip on calls if set to true. Defaults to false.
+          'disable_gzip' => self::GZIP_ENABLED,
+
+          // We default gzip to disabled on uploads even if gzip is otherwise
+          // enabled, due to some issues seen with small packet sizes for uploads.
+          // Please test with this option before enabling gzip for uploads in
+          // a production environment.
+          'enable_gzip_for_uploads' => self::GZIP_UPLOADS_DISABLED,
         ),
+        // If you want to pass in OAuth 2.0 settings, they will need to be
+        // structured like this.
         'Google_Auth_OAuth2' => array(
           // Keys for OAuth 2.0 access, see the API console at
           // https://developers.google.com/console
@@ -64,9 +78,14 @@ class Google_Config
           'developer_key' => '',
 
           // Other parameters.
+          'hd' => '',
+          'prompt' => '',
+          'openid.realm' => '',
+          'include_granted_scopes' => '',
+          'login_hint' => '',
+          'request_visible_actions' => '',
           'access_type' => 'online',
           'approval_prompt' => 'auto',
-          'request_visible_actions' => '',
           'federated_signon_certs_url' =>
               'https://www.googleapis.com/oauth2/v1/certs',
         ),
@@ -75,11 +94,6 @@ class Google_Config
           'directory' => sys_get_temp_dir() . '/Google_Client'
         )
       ),
-
-      // Definition of service specific values like scopes, oauth token URLs,
-      // etc. Example:
-      'services' => array(
-      ),
     );
     if ($ini_file_location) {
       $ini = parse_ini_file($ini_file_location, true);
@@ -108,7 +122,7 @@ class Google_Config
       $this->configuration['classes'][$class] = $config;
     }
   }
-  
+
   public function getClassConfig($class, $key = null)
   {
     if (!isset($this->configuration['classes'][$class])) {
@@ -138,7 +152,7 @@ class Google_Config
   {
     return $this->configuration['auth_class'];
   }
-  
+
   /**
    * Set the auth class.
    *
@@ -154,7 +168,7 @@ class Google_Config
     }
     $this->configuration['auth_class'] = $class;
   }
-  
+
   /**
    * Set the IO class.
    *
@@ -267,7 +281,16 @@ class Google_Config
   {
     $this->setAuthConfig('approval_prompt', $approval);
   }
-  
+
+  /**
+   * Set the login hint (email address or sub identifier)
+   * @param $hint string
+   */
+  public function setLoginHint($hint)
+  {
+    $this->setAuthConfig('login_hint', $hint);
+  }
+
   /**
    * Set the developer key for the auth class. Note that this is separate value
    * from the client ID - if it looks like a URL, its a client ID!
@@ -278,6 +301,53 @@ class Google_Config
     $this->setAuthConfig('developer_key', $key);
   }
 
+  /**
+   * Set the hd (hosted domain) parameter streamlines the login process for
+   * Google Apps hosted accounts. By including the domain of the user, you
+   * restrict sign-in to accounts at that domain.
+   * @param $hd string - the domain to use.
+   */
+  public function setHostedDomain($hd)
+  {
+    $this->setAuthConfig('hd', $hd);
+  }
+
+  /**
+   * Set the prompt hint. Valid values are none, consent and select_account.
+   * If no value is specified and the user has not previously authorized
+   * access, then the user is shown a consent screen.
+   * @param $prompt string
+   */
+  public function setPrompt($prompt)
+  {
+    $this->setAuthConfig('prompt', $prompt);
+  }
+
+  /**
+   * openid.realm is a parameter from the OpenID 2.0 protocol, not from OAuth
+   * 2.0. It is used in OpenID 2.0 requests to signify the URL-space for which
+   * an authentication request is valid.
+   * @param $realm string - the URL-space to use.
+   */
+  public function setOpenidRealm($realm)
+  {
+    $this->setAuthConfig('openid.realm', $realm);
+  }
+
+  /**
+   * If this is provided with the value true, and the authorization request is
+   * granted, the authorization will include any previous authorizations
+   * granted to this user/application combination for other scopes.
+   * @param $include boolean - the URL-space to use.
+   */
+  public function setIncludeGrantedScopes($include)
+  {
+    $this->setAuthConfig(
+        'include_granted_scopes',
+        $include ? "true" : "false"
+    );
+  }
+
   /**
    * @return string the base URL to use for API calls
    */
@@ -285,7 +355,7 @@ class Google_Config
   {
     return $this->configuration['base_path'];
   }
-  
+
   /**
    * Set the auth configuration for the current auth class.
    * @param $key - the key to set
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/MediaFileUpload.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/MediaFileUpload.php
index b96db84b3e7..8005db4bb48 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/MediaFileUpload.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/MediaFileUpload.php
@@ -51,16 +51,22 @@ class Google_Http_MediaFileUpload
 
   /** @var int $progress */
   private $progress;
-  
+
   /** @var Google_Client */
   private $client;
-  
+
   /** @var Google_Http_Request */
   private $request;
-  
+
   /** @var string */
   private $boundary;
 
+  /**
+   * Result code from last HTTP call
+   * @var int
+   */
+  private $httpResultCode;
+
   /**
    * @param $mimeType string
    * @param $data string The bytes you want to upload.
@@ -89,7 +95,7 @@ class Google_Http_MediaFileUpload
     $this->chunkSize = $chunkSize;
     $this->progress = 0;
     $this->boundary = $boundary;
-    
+
     // Process Media Request
     $this->process();
   }
@@ -102,8 +108,8 @@ class Google_Http_MediaFileUpload
   {
     $this->size = $size;
   }
-  
-  /** 
+
+  /**
    * Return the progress on the upload
    * @return int progress in bytes uploaded.
    */
@@ -111,7 +117,16 @@ class Google_Http_MediaFileUpload
   {
     return $this->progress;
   }
-  
+
+  /**
+   * Return the HTTP result code from the last call made.
+   * @return int code
+   */
+  public function getHttpResultCode()
+  {
+    return $this->httpResultCode;
+  }
+
   /**
    * Send the next part of the file to upload.
    * @param [$chunk] the next set of bytes to send. If false will used $data passed
@@ -141,22 +156,29 @@ class Google_Http_MediaFileUpload
         $headers,
         $chunk
     );
-    $httpRequest->disableGzip(); // Disable gzip for uploads.
+
+    if ($this->client->getClassConfig("Google_Http_Request", "enable_gzip_for_uploads")) {
+      $httpRequest->enableGzip();
+    } else {
+      $httpRequest->disableGzip();
+    }
+
     $response = $this->client->getIo()->makeRequest($httpRequest);
     $response->setExpectedClass($this->request->getExpectedClass());
     $code = $response->getResponseHttpCode();
+    $this->httpResultCode = $code;
 
     if (308 == $code) {
       // Track the amount uploaded.
       $range = explode('-', $response->getResponseHeader('range'));
       $this->progress = $range[1] + 1;
-      
+
       // Allow for changing upload URLs.
       $location = $response->getResponseHeader('location');
       if ($location) {
         $this->resumeUri = $location;
       }
-      
+
       // No problems, but upload not complete.
       return false;
     } else {
@@ -177,7 +199,7 @@ class Google_Http_MediaFileUpload
 
     $meta = $this->request->getPostBody();
     $meta = is_string($meta) ? json_decode($meta, true) : $meta;
-    
+
     $uploadType = $this->getUploadType($meta);
     $this->request->setQueryParam('uploadType', $uploadType);
     $this->transformToUploadUrl();
@@ -214,7 +236,7 @@ class Google_Http_MediaFileUpload
       $this->request->setRequestHeaders($contentTypeHeader);
     }
   }
-  
+
   private function transformToUploadUrl()
   {
     $base = $this->request->getBaseComponent();
@@ -265,6 +287,15 @@ class Google_Http_MediaFileUpload
     if (200 == $code && true == $location) {
       return $location;
     }
-    throw new Google_Exception("Failed to start the resumable upload");
+    $message = $code;
+    $body = @json_decode($response->getResponseBody());
+    if (!empty( $body->error->errors ) ) {
+      $message .= ': ';
+      foreach ($body->error->errors as $error) {
+        $message .= "{$error->domain}, {$error->message};";
+      }
+      $message = rtrim($message, ';');
+    }
+    throw new Google_Exception("Failed to start the resumable upload (HTTP {$message})");
   }
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
index 5ea4b752808..3c318e44ceb 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Http/REST.php
@@ -44,7 +44,6 @@ class Google_Http_REST
     return self::decodeHttpResponse($httpRequest);
   }
 
-  
   /**
    * Decode an HTTP Response.
    * @static
@@ -57,7 +56,7 @@ class Google_Http_REST
     $code = $response->getResponseHttpCode();
     $body = $response->getResponseBody();
     $decoded = null;
-    
+
     if ((intVal($code)) >= 300) {
       $decoded = json_decode($body, true);
       $err = 'Error calling ' . $response->getRequestMethod() . ' ' . $response->getUrl();
@@ -79,7 +78,7 @@ class Google_Http_REST
 
       throw new Google_Service_Exception($err, $code, null, $errors);
     }
-    
+
     // Only attempt to decode the response, if the response code wasn't (204) 'no content'
     if ($code != '204') {
       $decoded = json_decode($body, true);
@@ -87,8 +86,6 @@ class Google_Http_REST
         throw new Google_Service_Exception("Invalid json in service response: $body");
       }
 
-      $decoded = isset($decoded['data']) ? $decoded['data'] : $decoded;
-
       if ($response->getExpectedClass()) {
         $class = $response->getExpectedClass();
         $decoded = new $class($decoded);
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Abstract.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Abstract.php
index 6367b5da40a..a4025e874ad 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Abstract.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Abstract.php
@@ -26,8 +26,13 @@ require_once 'Google/Http/Request.php';
 
 abstract class Google_IO_Abstract
 {
+  const UNKNOWN_CODE = 0;
   const FORM_URLENCODED = 'application/x-www-form-urlencoded';
-  const CONNECTION_ESTABLISHED = "HTTP/1.0 200 Connection established\r\n\r\n";
+  private static $CONNECTION_ESTABLISHED_HEADERS = array(
+    "HTTP/1.0 200 Connection established\r\n\r\n",
+    "HTTP/1.1 200 Connection established\r\n\r\n",
+  );
+  private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
 
   /** @var Google_Client */
   protected $client;
@@ -35,6 +40,10 @@ abstract class Google_IO_Abstract
   public function __construct(Google_Client $client)
   {
     $this->client = $client;
+    $timeout = $client->getClassConfig('Google_IO_Abstract', 'request_timeout_seconds');
+    if ($timeout > 0) {
+      $this->setTimeout($timeout);
+    }
   }
 
   /**
@@ -42,13 +51,36 @@ abstract class Google_IO_Abstract
    * @param Google_Http_Request $request
    * @return Google_Http_Request $request
    */
-  abstract public function makeRequest(Google_Http_Request $request);
+  abstract public function executeRequest(Google_Http_Request $request);
 
   /**
    * Set options that update the transport implementation's behavior.
    * @param $options
    */
   abstract public function setOptions($options);
+  
+  /**
+   * Set the maximum request time in seconds.
+   * @param $timeout in seconds
+   */
+  abstract public function setTimeout($timeout);
+  
+  /**
+   * Get the maximum request time in seconds.
+   * @return timeout in seconds
+   */
+  abstract public function getTimeout();
+
+  /**
+   * Test for the presence of a cURL header processing bug
+   *
+   * The cURL bug was present in versions prior to 7.30.0 and caused the header
+   * length to be miscalculated when a "Connection established" header added by
+   * some proxies was present.
+   *
+   * @return boolean
+   */
+  abstract protected function needsQuirk();
 
   /**
    * @visible for testing.
@@ -67,6 +99,49 @@ abstract class Google_IO_Abstract
 
     return false;
   }
+  
+  /**
+   * Execute an HTTP Request
+   *
+   * @param Google_HttpRequest $request the http request to be executed
+   * @return Google_HttpRequest http request with the response http code,
+   * response headers and response body filled in
+   * @throws Google_IO_Exception on curl or IO error
+   */
+  public function makeRequest(Google_Http_Request $request)
+  {
+    // First, check to see if we have a valid cached version.
+    $cached = $this->getCachedRequest($request);
+    if ($cached !== false && $cached instanceof Google_Http_Request) {
+      if (!$this->checkMustRevalidateCachedRequest($cached, $request)) {
+        return $cached;
+      }
+    }
+
+    if (array_key_exists($request->getRequestMethod(), self::$ENTITY_HTTP_METHODS)) {
+      $request = $this->processEntityRequest($request);
+    }
+
+    list($responseData, $responseHeaders, $respHttpCode) = $this->executeRequest($request);
+
+    if ($respHttpCode == 304 && $cached) {
+      // If the server responded NOT_MODIFIED, return the cached request.
+      $this->updateCachedRequest($cached, $responseHeaders);
+      return $cached;
+    }
+
+    if (!isset($responseHeaders['Date']) && !isset($responseHeaders['date'])) {
+      $responseHeaders['Date'] = date("r");
+    }
+
+    $request->setResponseHttpCode($respHttpCode);
+    $request->setResponseHeaders($responseHeaders);
+    $request->setResponseBody($responseData);
+    // Store the request in cache (the function checks to see if the request
+    // can actually be cached)
+    $this->setCachedRequest($request);
+    return $request;
+  }
 
   /**
    * @visible for testing.
@@ -177,15 +252,29 @@ abstract class Google_IO_Abstract
    */
   public function parseHttpResponse($respData, $headerSize)
   {
-    if (stripos($respData, self::CONNECTION_ESTABLISHED) !== false) {
-      $respData = str_ireplace(self::CONNECTION_ESTABLISHED, '', $respData);
+    // check proxy header
+    foreach (self::$CONNECTION_ESTABLISHED_HEADERS as $established_header) {
+      if (stripos($respData, $established_header) !== false) {
+        // existed, remove it
+        $respData = str_ireplace($established_header, '', $respData);
+        // Subtract the proxy header size unless the cURL bug prior to 7.30.0
+        // is present which prevented the proxy header size from being taken into
+        // account.
+        if (!$this->needsQuirk()) {
+          $headerSize -= strlen($established_header);
+        }
+        break;
+      }
     }
 
     if ($headerSize) {
       $responseBody = substr($respData, $headerSize);
       $responseHeaders = substr($respData, 0, $headerSize);
     } else {
-      list($responseHeaders, $responseBody) = explode("\r\n\r\n", $respData, 2);
+      $responseSegments = explode("\r\n\r\n", $respData, 2);
+      $responseHeaders = $responseSegments[0];
+      $responseBody = isset($responseSegments[1]) ? $responseSegments[1] :
+                                                    null;
     }
 
     $responseHeaders = $this->getHttpResponseHeaders($responseHeaders);
@@ -209,13 +298,12 @@ abstract class Google_IO_Abstract
   private function parseStringHeaders($rawHeaders)
   {
     $headers = array();
-
     $responseHeaderLines = explode("\r\n", $rawHeaders);
     foreach ($responseHeaderLines as $headerLine) {
       if ($headerLine && strpos($headerLine, ':') !== false) {
         list($header, $value) = explode(': ', $headerLine, 2);
         $header = strtolower($header);
-        if (isset($responseHeaders[$header])) {
+        if (isset($headers[$header])) {
           $headers[$header] .= "\n" . $value;
         } else {
           $headers[$header] = $value;
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Curl.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Curl.php
new file mode 100644
index 00000000000..57a057114cc
--- /dev/null
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Curl.php
@@ -0,0 +1,137 @@
+<?php
+/*
+ * Copyright 2014 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Curl based implementation of Google_IO.
+ *
+ * @author Stuart Langley <slangley@google.com>
+ */
+
+require_once 'Google/IO/Abstract.php';
+
+class Google_IO_Curl extends Google_IO_Abstract
+{
+  // cURL hex representation of version 7.30.0
+  const NO_QUIRK_VERSION = 0x071E00;
+
+  private $options = array();
+  /**
+   * Execute an HTTP Request
+   *
+   * @param Google_HttpRequest $request the http request to be executed
+   * @return Google_HttpRequest http request with the response http code,
+   * response headers and response body filled in
+   * @throws Google_IO_Exception on curl or IO error
+   */
+  public function executeRequest(Google_Http_Request $request)
+  {
+    $curl = curl_init();
+
+    if ($request->getPostBody()) {
+      curl_setopt($curl, CURLOPT_POSTFIELDS, $request->getPostBody());
+    }
+
+    $requestHeaders = $request->getRequestHeaders();
+    if ($requestHeaders && is_array($requestHeaders)) {
+      $curlHeaders = array();
+      foreach ($requestHeaders as $k => $v) {
+        $curlHeaders[] = "$k: $v";
+      }
+      curl_setopt($curl, CURLOPT_HTTPHEADER, $curlHeaders);
+    }
+
+    curl_setopt($curl, CURLOPT_URL, $request->getUrl());
+    
+    curl_setopt($curl, CURLOPT_CUSTOMREQUEST, $request->getRequestMethod());
+    curl_setopt($curl, CURLOPT_USERAGENT, $request->getUserAgent());
+
+    curl_setopt($curl, CURLOPT_FOLLOWLOCATION, false);
+    curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, true);
+    curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
+    curl_setopt($curl, CURLOPT_HEADER, true);
+
+    if ($request->canGzip()) {
+      curl_setopt($curl, CURLOPT_ENCODING, 'gzip,deflate');
+    }
+
+    foreach ($this->options as $key => $var) {
+      curl_setopt($curl, $key, $var);
+    }
+
+    if (!isset($this->options[CURLOPT_CAINFO])) {
+      curl_setopt($curl, CURLOPT_CAINFO, dirname(__FILE__) . '/cacerts.pem');
+    }
+
+    $response = curl_exec($curl);
+    if ($response === false) {
+      throw new Google_IO_Exception(curl_error($curl));
+    }
+    $headerSize = curl_getinfo($curl, CURLINFO_HEADER_SIZE);
+
+    list($responseHeaders, $responseBody) = $this->parseHttpResponse($response, $headerSize);
+
+    $responseCode = curl_getinfo($curl, CURLINFO_HTTP_CODE);
+
+    return array($responseBody, $responseHeaders, $responseCode);
+  }
+
+  /**
+   * Set options that update the transport implementation's behavior.
+   * @param $options
+   */
+  public function setOptions($options)
+  {
+    $this->options = $options + $this->options;
+  }
+
+  /**
+   * Set the maximum request time in seconds.
+   * @param $timeout in seconds
+   */
+  public function setTimeout($timeout)
+  {
+    // Since this timeout is really for putting a bound on the time
+    // we'll set them both to the same. If you need to specify a longer
+    // CURLOPT_TIMEOUT, or a tigher CONNECTTIMEOUT, the best thing to
+    // do is use the setOptions method for the values individually.
+    $this->options[CURLOPT_CONNECTTIMEOUT] = $timeout;
+    $this->options[CURLOPT_TIMEOUT] = $timeout;
+  }
+
+  /**
+   * Get the maximum request time in seconds.
+   * @return timeout in seconds
+   */
+  public function getTimeout()
+  {
+    return $this->options[CURLOPT_TIMEOUT];
+  }
+
+  /**
+   * Test for the presence of a cURL header processing bug
+   *
+   * {@inheritDoc}
+   *
+   * @return boolean
+   */
+  protected function needsQuirk()
+  {
+    $ver = curl_version();
+    $versionNum = $ver['version_number'];
+    return $versionNum < Google_IO_Curl::NO_QUIRK_VERSION;
+  }
+}
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Stream.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Stream.php
index d73e0e98356..917578d87a0 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Stream.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/IO/Stream.php
@@ -25,8 +25,11 @@ require_once 'Google/IO/Abstract.php';
 
 class Google_IO_Stream extends Google_IO_Abstract
 {
+  const TIMEOUT = "timeout";
   const ZLIB = "compress.zlib://";
-  private static $ENTITY_HTTP_METHODS = array("POST" => null, "PUT" => null);
+  private $options = array();
+  private $trappedErrorNumber;
+  private $trappedErrorString;
 
   private static $DEFAULT_HTTP_CONTEXT = array(
     "follow_location" => 0,
@@ -45,26 +48,12 @@ class Google_IO_Stream extends Google_IO_Abstract
    * response headers and response body filled in
    * @throws Google_IO_Exception on curl or IO error
    */
-  public function makeRequest(Google_Http_Request $request)
+  public function executeRequest(Google_Http_Request $request)
   {
-    // First, check to see if we have a valid cached version.
-    $cached = $this->getCachedRequest($request);
-    if ($cached !== false) {
-      if (!$this->checkMustRevalidateCachedRequest($cached, $request)) {
-        return $cached;
-      }
-    }
-
     $default_options = stream_context_get_options(stream_context_get_default());
 
     $requestHttpContext = array_key_exists('http', $default_options) ?
         $default_options['http'] : array();
-    if (array_key_exists(
-        $request->getRequestMethod(),
-        self::$ENTITY_HTTP_METHODS
-    )) {
-      $request = $this->processEntityRequest($request);
-    }
 
     if ($request->getPostBody()) {
       $requestHttpContext["content"] = $request->getPostBody();
@@ -101,43 +90,60 @@ class Google_IO_Stream extends Google_IO_Abstract
     );
 
     $context = stream_context_create($options);
-    
+
     $url = $request->getUrl();
-    
+
     if ($request->canGzip()) {
       $url = self::ZLIB . $url;
     }
 
-    $response_data = file_get_contents(
-        $url,
-        false,
-        $context
-    );
-
-    if (false === $response_data) {
-      throw new Google_IO_Exception("HTTP Error: Unable to connect");
+    // We are trapping any thrown errors in this method only and
+    // throwing an exception.
+    $this->trappedErrorNumber = null;
+    $this->trappedErrorString = null;
+
+    // START - error trap.
+    set_error_handler(array($this, 'trapError'));
+    $fh = fopen($url, 'r', false, $context);
+    restore_error_handler();
+    // END - error trap.
+
+    if ($this->trappedErrorNumber) {
+      throw new Google_IO_Exception(
+          sprintf(
+              "HTTP Error: Unable to connect: '%s'",
+              $this->trappedErrorString
+          ),
+          $this->trappedErrorNumber
+      );
     }
 
-    $respHttpCode = $this->getHttpResponseCode($http_response_header);
-    $responseHeaders = $this->getHttpResponseHeaders($http_response_header);
+    $response_data = false;
+    $respHttpCode = self::UNKNOWN_CODE;
+    if ($fh) {
+      if (isset($this->options[self::TIMEOUT])) {
+        stream_set_timeout($fh, $this->options[self::TIMEOUT]);
+      }
+
+      $response_data = stream_get_contents($fh);
+      fclose($fh);
 
-    if ($respHttpCode == 304 && $cached) {
-      // If the server responded NOT_MODIFIED, return the cached request.
-      $this->updateCachedRequest($cached, $responseHeaders);
-      return $cached;
+      $respHttpCode = $this->getHttpResponseCode($http_response_header);
     }
 
-    if (!isset($responseHeaders['Date']) && !isset($responseHeaders['date'])) {
-      $responseHeaders['Date'] = date("r");
+    if (false === $response_data) {
+      throw new Google_IO_Exception(
+          sprintf(
+              "HTTP Error: Unable to connect: '%s'",
+              $respHttpCode
+          ),
+          $respHttpCode
+      );
     }
 
-    $request->setResponseHttpCode($respHttpCode);
-    $request->setResponseHeaders($responseHeaders);
-    $request->setResponseBody($response_data);
-    // Store the request in cache (the function checks to see if the request
-    // can actually be cached)
-    $this->setCachedRequest($request);
-    return $request;
+    $responseHeaders = $this->getHttpResponseHeaders($http_response_header);
+
+    return array($response_data, $responseHeaders, $respHttpCode);
   }
 
   /**
@@ -146,10 +152,50 @@ class Google_IO_Stream extends Google_IO_Abstract
    */
   public function setOptions($options)
   {
-    // NO-OP
+    $this->options = $options + $this->options;
+  }
+
+  /**
+   * Method to handle errors, used for error handling around
+   * stream connection methods.
+   */
+  public function trapError($errno, $errstr)
+  {
+    $this->trappedErrorNumber = $errno;
+    $this->trappedErrorString = $errstr;
+  }
+
+  /**
+   * Set the maximum request time in seconds.
+   * @param $timeout in seconds
+   */
+  public function setTimeout($timeout)
+  {
+    $this->options[self::TIMEOUT] = $timeout;
+  }
+
+  /**
+   * Get the maximum request time in seconds.
+   * @return timeout in seconds
+   */
+  public function getTimeout()
+  {
+    return $this->options[self::TIMEOUT];
+  }
+
+  /**
+   * Test for the presence of a cURL header processing bug
+   *
+   * {@inheritDoc}
+   *
+   * @return boolean
+   */
+  protected function needsQuirk()
+  {
+    return false;
   }
 
-  private function getHttpResponseCode($response_headers)
+  protected function getHttpResponseCode($response_headers)
   {
     $header_count = count($response_headers);
 
@@ -160,6 +206,6 @@ class Google_IO_Stream extends Google_IO_Abstract
         return $response[1];
       }
     }
-    return 'UNKNOWN';
+    return self::UNKNOWN_CODE;
   }
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
index 2b6e67ad5a0..2bb9a333d66 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Model.php
@@ -16,7 +16,7 @@
  */
 
 /**
- * This class defines attributes, valid values, and usage which is generated         
+ * This class defines attributes, valid values, and usage which is generated
  * from a given json schema.
  * http://tools.ietf.org/html/draft-zyp-json-schema-03#section-5
  *
@@ -25,7 +25,8 @@
  */
 class Google_Model implements ArrayAccess
 {
-  protected $data = array();
+  protected $internal_gapi_mappings = array();
+  protected $modelData = array();
   protected $processed = array();
 
   /**
@@ -34,7 +35,7 @@ class Google_Model implements ArrayAccess
    */
   public function __construct()
   {
-    if (func_num_args() ==  1 && is_array(func_get_arg(0))) {
+    if (func_num_args() == 1 && is_array(func_get_arg(0))) {
       // Initialize the model with the array's contents.
       $array = func_get_arg(0);
       $this->mapTypes($array);
@@ -46,20 +47,23 @@ class Google_Model implements ArrayAccess
     $keyTypeName = $this->keyType($key);
     $keyDataType = $this->dataType($key);
     if (isset($this->$keyTypeName) && !isset($this->processed[$key])) {
-      if (isset($this->data[$key])) {
-        $val = $this->data[$key];
+      if (isset($this->modelData[$key])) {
+        $val = $this->modelData[$key];
+      } else if (isset($this->$keyDataType) &&
+          ($this->$keyDataType == 'array' || $this->$keyDataType == 'map')) {
+        $val = array();
       } else {
         $val = null;
       }
-      
+
       if ($this->isAssociativeArray($val)) {
         if (isset($this->$keyDataType) && 'map' == $this->$keyDataType) {
           foreach ($val as $arrayKey => $arrayItem) {
-              $this->data[$key][$arrayKey] =
+              $this->modelData[$key][$arrayKey] =
                 $this->createObjectFromName($keyTypeName, $arrayItem);
           }
         } else {
-          $this->data[$key] = $this->createObjectFromName($keyTypeName, $val);
+          $this->modelData[$key] = $this->createObjectFromName($keyTypeName, $val);
         }
       } else if (is_array($val)) {
         $arrayObject = array();
@@ -67,12 +71,12 @@ class Google_Model implements ArrayAccess
           $arrayObject[$arrayIndex] =
             $this->createObjectFromName($keyTypeName, $arrayItem);
         }
-        $this->data[$key] = $arrayObject;
+        $this->modelData[$key] = $arrayObject;
       }
       $this->processed[$key] = true;
     }
 
-    return $this->data[$key];
+    return isset($this->modelData[$key]) ? $this->modelData[$key] : null;
   }
 
   /**
@@ -95,9 +99,9 @@ class Google_Model implements ArrayAccess
           $this->$camelKey = $val;
       }
     }
-    $this->data = $array;
+    $this->modelData = $array;
   }
-  
+
   /**
    * Create a simplified object suitable for straightforward
    * conversion to JSON. This is relatively expensive
@@ -108,27 +112,29 @@ class Google_Model implements ArrayAccess
   {
     $object = new stdClass();
 
+    // Process all other data.
+    foreach ($this->modelData as $key => $val) {
+      $result = $this->getSimpleValue($val);
+      if ($result !== null) {
+        $object->$key = $result;
+      }
+    }
+
     // Process all public properties.
     $reflect = new ReflectionObject($this);
     $props = $reflect->getProperties(ReflectionProperty::IS_PUBLIC);
     foreach ($props as $member) {
       $name = $member->getName();
       $result = $this->getSimpleValue($this->$name);
-      if ($result != null) {
+      if ($result !== null) {
+        $name = $this->getMappedName($name);
         $object->$name = $result;
       }
     }
 
-    // Process all other data.
-    foreach ($this->data as $key => $val) {
-      $result = $this->getSimpleValue($val);
-      if ($result != null) {
-        $object->$key = $result;
-      }
-    }
     return $object;
   }
-  
+
   /**
    * Handle different types of values, primarily
    * other objects and map and array data types.
@@ -141,7 +147,8 @@ class Google_Model implements ArrayAccess
       $return = array();
       foreach ($value as $key => $a_value) {
         $a_value = $this->getSimpleValue($a_value);
-        if ($a_value != null) {
+        if ($a_value !== null) {
+          $key = $this->getMappedName($key);
           $return[$key] = $a_value;
         }
       }
@@ -150,6 +157,18 @@ class Google_Model implements ArrayAccess
     return $value;
   }
 
+  /**
+   * If there is an internal name mapping, use that.
+   */
+  private function getMappedName($key)
+  {
+    if (isset($this->internal_gapi_mappings) &&
+        isset($this->internal_gapi_mappings[$key])) {
+      $key = $this->internal_gapi_mappings[$key];
+    }
+    return $key;
+  }
+
   /**
    * Returns true only if the array is associative.
    * @param array $array
@@ -192,15 +211,14 @@ class Google_Model implements ArrayAccess
   {
     if ($obj && !is_array($obj)) {
       throw new Google_Exception(
-          "Incorrect parameter type passed to $method(),"
-          . " expected an array."
+          "Incorrect parameter type passed to $method(). Expected an array."
       );
     }
   }
 
   public function offsetExists($offset)
   {
-    return isset($this->$offset) || isset($this->data[$offset]);
+    return isset($this->$offset) || isset($this->modelData[$offset]);
   }
 
   public function offsetGet($offset)
@@ -215,14 +233,14 @@ class Google_Model implements ArrayAccess
     if (property_exists($this, $offset)) {
       $this->$offset = $value;
     } else {
-      $this->data[$offset] = $value;
+      $this->modelData[$offset] = $value;
       $this->processed[$offset] = true;
     }
   }
 
   public function offsetUnset($offset)
   {
-    unset($this->data[$offset]);
+    unset($this->modelData[$offset]);
   }
 
   protected function keyType($key)
@@ -234,4 +252,14 @@ class Google_Model implements ArrayAccess
   {
     return $key . "DataType";
   }
+
+  public function __isset($key)
+  {
+    return isset($this->modelData[$key]);
+  }
+
+  public function __unset($key)
+  {
+    unset($this->modelData[$key]);
+  }
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Drive.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Drive.php
index a9ce7f2a1cc..291a6091232 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Drive.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Service/Drive.php
@@ -119,7 +119,20 @@ class Google_Service_Drive extends Google_Service
             ),'list' => array(
               'path' => 'apps',
               'httpMethod' => 'GET',
-              'parameters' => array(),
+              'parameters' => array(
+                'languageCode' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'appFilterExtensions' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+                'appFilterMimeTypes' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
+              ),
             ),
           )
         )
@@ -444,6 +457,10 @@ class Google_Service_Drive extends Google_Service
                   'required' => true,
                 ),
               ),
+            ),'emptyTrash' => array(
+              'path' => 'files/trash',
+              'httpMethod' => 'DELETE',
+              'parameters' => array(),
             ),'get' => array(
               'path' => 'files/{fileId}',
               'httpMethod' => 'GET',
@@ -511,6 +528,10 @@ class Google_Service_Drive extends Google_Service
                   'location' => 'query',
                   'type' => 'string',
                 ),
+                'corpus' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'projection' => array(
                   'location' => 'query',
                   'type' => 'string',
@@ -529,18 +550,26 @@ class Google_Service_Drive extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'convert' => array(
+                'addParents' => array(
                   'location' => 'query',
-                  'type' => 'boolean',
+                  'type' => 'string',
                 ),
                 'updateViewedDate' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
+                'removeParents' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'setModifiedDate' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
+                'convert' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'useContentAsIndexableText' => array(
                   'location' => 'query',
                   'type' => 'boolean',
@@ -609,18 +638,26 @@ class Google_Service_Drive extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
-                'convert' => array(
+                'addParents' => array(
                   'location' => 'query',
-                  'type' => 'boolean',
+                  'type' => 'string',
                 ),
                 'updateViewedDate' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
+                'removeParents' => array(
+                  'location' => 'query',
+                  'type' => 'string',
+                ),
                 'setModifiedDate' => array(
                   'location' => 'query',
                   'type' => 'boolean',
                 ),
+                'convert' => array(
+                  'location' => 'query',
+                  'type' => 'boolean',
+                ),
                 'useContentAsIndexableText' => array(
                   'location' => 'query',
                   'type' => 'boolean',
@@ -969,6 +1006,10 @@ class Google_Service_Drive extends Google_Service
                   'type' => 'string',
                   'required' => true,
                 ),
+                'revision' => array(
+                  'location' => 'query',
+                  'type' => 'integer',
+                ),
               ),
             ),'update' => array(
               'path' => 'files/{fileId}/realtime',
@@ -1226,9 +1267,9 @@ class Google_Service_Drive_About_Resource extends Google_Service_Resource
    * @param array $optParams Optional parameters.
    *
    * @opt_param bool includeSubscribed
-   * When calculating the number of remaining change IDs, whether to include shared files and public
-    * files the user has opened. When set to false, this counts only change IDs for owned files and
-    * any shared or public files that the user has explictly added to a folder in Drive.
+   * When calculating the number of remaining change IDs, whether to include public files the user
+    * has opened and shared files. When set to false, this counts only change IDs for owned files and
+    * any shared or public files that the user has explicitly added to a folder they own.
    * @opt_param string maxChangeIdCount
    * Maximum number of remaining change IDs to count
    * @opt_param string startChangeId
@@ -1272,6 +1313,18 @@ class Google_Service_Drive_Apps_Resource extends Google_Service_Resource
    * Lists a user's installed apps. (apps.listApps)
    *
    * @param array $optParams Optional parameters.
+   *
+   * @opt_param string languageCode
+   * A language or locale code, as defined by BCP 47, with some extensions from Unicode's LDML format
+    * (http://www.unicode.org/reports/tr35/).
+   * @opt_param string appFilterExtensions
+   * A comma-separated list of file extensions for open with filtering. All apps within the given app
+    * query scope which can open any of the given file extensions will be included in the response. If
+    * appFilterMimeTypes are provided as well, the result is a union of the two resulting app lists.
+   * @opt_param string appFilterMimeTypes
+   * A comma-separated list of MIME types for open with filtering. All apps within the given app
+    * query scope which can open any of the given MIME types will be included in the response. If
+    * appFilterExtensions are provided as well, the result is a union of the two resulting app lists.
    * @return Google_Service_Drive_AppList
    */
   public function listApps($optParams = array())
@@ -1313,9 +1366,9 @@ class Google_Service_Drive_Changes_Resource extends Google_Service_Resource
    * @param array $optParams Optional parameters.
    *
    * @opt_param bool includeSubscribed
-   * Whether to include shared files and public files the user has opened. When set to false, the
-    * list will include owned files plus any shared or public files the user has explictly added to a
-    * folder in Drive.
+   * Whether to include public files the user has opened and shared files. When set to false, the
+    * list only includes owned files plus any shared or public files the user has explicitly added to
+    * a folder they own.
    * @opt_param string startChangeId
    * Change ID to start listing changes from.
    * @opt_param bool includeDeleted
@@ -1339,9 +1392,9 @@ class Google_Service_Drive_Changes_Resource extends Google_Service_Resource
    * @param array $optParams Optional parameters.
    *
    * @opt_param bool includeSubscribed
-   * Whether to include shared files and public files the user has opened. When set to false, the
-    * list will include owned files plus any shared or public files the user has explictly added to a
-    * folder in Drive.
+   * Whether to include public files the user has opened and shared files. When set to false, the
+    * list only includes owned files plus any shared or public files the user has explicitly added to
+    * a folder they own.
    * @opt_param string startChangeId
    * Change ID to start listing changes from.
    * @opt_param bool includeDeleted
@@ -1616,7 +1669,8 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * The visibility of the new file. This parameter is only relevant when the source is not a native
     * Google Doc and convert=false.
    * @opt_param bool pinned
-   * Whether to pin the head revision of the new copy.
+   * Whether to pin the head revision of the new copy. A file can have a maximum of 200 pinned
+    * revisions.
    * @opt_param bool ocr
    * Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
    * @opt_param string timedTextTrackName
@@ -1644,6 +1698,17 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
     $params = array_merge($params, $optParams);
     return $this->call('delete', array($params));
   }
+  /**
+   * Permanently deletes all of the user's trashed files. (files.emptyTrash)
+   *
+   * @param array $optParams Optional parameters.
+   */
+  public function emptyTrash($optParams = array())
+  {
+    $params = array();
+    $params = array_merge($params, $optParams);
+    return $this->call('emptyTrash', array($params));
+  }
   /**
    * Gets a file's metadata by ID. (files.get)
    *
@@ -1678,7 +1743,8 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * @opt_param string visibility
    * The visibility of the new file. This parameter is only relevant when convert=false.
    * @opt_param bool pinned
-   * Whether to pin the head revision of the uploaded file.
+   * Whether to pin the head revision of the uploaded file. A file can have a maximum of 200 pinned
+    * revisions.
    * @opt_param bool ocr
    * Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
    * @opt_param string timedTextTrackName
@@ -1702,6 +1768,8 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * Query string for searching files.
    * @opt_param string pageToken
    * Page token for files.
+   * @opt_param string corpus
+   * The body of items (files/documents) to which the query applies.
    * @opt_param string projection
    * This parameter is deprecated and has no function.
    * @opt_param int maxResults
@@ -1723,21 +1791,25 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * @param Google_DriveFile $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool convert
-   * Whether to convert this file to the corresponding Google Docs format.
+   * @opt_param string addParents
+   * Comma-separated list of parent IDs to add.
    * @opt_param bool updateViewedDate
    * Whether to update the view date after successfully updating the file.
+   * @opt_param string removeParents
+   * Comma-separated list of parent IDs to remove.
    * @opt_param bool setModifiedDate
    * Whether to set the modified date with the supplied modified date.
+   * @opt_param bool convert
+   * Whether to convert this file to the corresponding Google Docs format.
    * @opt_param bool useContentAsIndexableText
    * Whether to use the content as indexable text.
    * @opt_param string ocrLanguage
    * If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
    * @opt_param bool pinned
-   * Whether to pin the new revision.
+   * Whether to pin the new revision. A file can have a maximum of 200 pinned revisions.
    * @opt_param bool newRevision
    * Whether a blob upload should create a new revision. If false, the blob data in the current head
-    * revision is replaced. If not set or true, a new blob is created as head revision, and previous
+    * revision is replaced. If true or not set, a new blob is created as head revision, and previous
     * revisions are preserved (causing increased use of the user's data storage quota).
    * @opt_param bool ocr
    * Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
@@ -1803,21 +1875,25 @@ class Google_Service_Drive_Files_Resource extends Google_Service_Resource
    * @param Google_DriveFile $postBody
    * @param array $optParams Optional parameters.
    *
-   * @opt_param bool convert
-   * Whether to convert this file to the corresponding Google Docs format.
+   * @opt_param string addParents
+   * Comma-separated list of parent IDs to add.
    * @opt_param bool updateViewedDate
    * Whether to update the view date after successfully updating the file.
+   * @opt_param string removeParents
+   * Comma-separated list of parent IDs to remove.
    * @opt_param bool setModifiedDate
    * Whether to set the modified date with the supplied modified date.
+   * @opt_param bool convert
+   * Whether to convert this file to the corresponding Google Docs format.
    * @opt_param bool useContentAsIndexableText
    * Whether to use the content as indexable text.
    * @opt_param string ocrLanguage
    * If ocr is true, hints at the language to use. Valid values are ISO 639-1 codes.
    * @opt_param bool pinned
-   * Whether to pin the new revision.
+   * Whether to pin the new revision. A file can have a maximum of 200 pinned revisions.
    * @opt_param bool newRevision
    * Whether a blob upload should create a new revision. If false, the blob data in the current head
-    * revision is replaced. If not set or true, a new blob is created as head revision, and previous
+    * revision is replaced. If true or not set, a new blob is created as head revision, and previous
     * revisions are preserved (causing increased use of the user's data storage quota).
    * @opt_param bool ocr
    * Whether to attempt OCR on .jpg, .png, .gif, or .pdf uploads.
@@ -1995,7 +2071,8 @@ class Google_Service_Drive_Permissions_Resource extends Google_Service_Resource
    * @opt_param string emailMessage
    * A custom message to include in notification emails.
    * @opt_param bool sendNotificationEmails
-   * Whether to send notification emails when sharing to users or groups.
+   * Whether to send notification emails when sharing to users or groups. This parameter is ignored
+    * and an email is sent if the role is owner.
    * @return Google_Service_Drive_Permission
    */
   public function insert($fileId, Google_Service_Drive_Permission $postBody, $optParams = array())
@@ -2198,6 +2275,11 @@ class Google_Service_Drive_Realtime_Resource extends Google_Service_Resource
    * @param string $fileId
    * The ID of the file that the Realtime API data model is associated with.
    * @param array $optParams Optional parameters.
+   *
+   * @opt_param int revision
+   * The revision of the Realtime API data model to export. Revisions start at 1 (the initial empty
+    * data model) and are incremented with each change. If this parameter is excluded, the most recent
+    * data model will be returned.
    */
   public function get($fileId, $optParams = array())
   {
@@ -2455,6 +2537,9 @@ class Google_Service_Drive_Revisions_Resource extends Google_Service_Resource
 
 class Google_Service_Drive_About extends Google_Collection
 {
+  protected $collection_key = 'quotaBytesByService';
+  protected $internal_gapi_mappings = array(
+  );
   protected $additionalRoleInfoType = 'Google_Service_Drive_AboutAdditionalRoleInfo';
   protected $additionalRoleInfoDataType = 'array';
   public $domainSharingPolicy;
@@ -2467,15 +2552,19 @@ class Google_Service_Drive_About extends Google_Collection
   protected $importFormatsDataType = 'array';
   public $isCurrentAppInstalled;
   public $kind;
+  public $languageCode;
   public $largestChangeId;
   protected $maxUploadSizesType = 'Google_Service_Drive_AboutMaxUploadSizes';
   protected $maxUploadSizesDataType = 'array';
   public $name;
   public $permissionId;
+  protected $quotaBytesByServiceType = 'Google_Service_Drive_AboutQuotaBytesByService';
+  protected $quotaBytesByServiceDataType = 'array';
   public $quotaBytesTotal;
   public $quotaBytesUsed;
   public $quotaBytesUsedAggregate;
   public $quotaBytesUsedInTrash;
+  public $quotaType;
   public $remainingChangeIds;
   public $rootFolderId;
   public $selfLink;
@@ -2562,6 +2651,16 @@ class Google_Service_Drive_About extends Google_Collection
     return $this->kind;
   }
 
+  public function setLanguageCode($languageCode)
+  {
+    $this->languageCode = $languageCode;
+  }
+
+  public function getLanguageCode()
+  {
+    return $this->languageCode;
+  }
+
   public function setLargestChangeId($largestChangeId)
   {
     $this->largestChangeId = $largestChangeId;
@@ -2602,6 +2701,16 @@ class Google_Service_Drive_About extends Google_Collection
     return $this->permissionId;
   }
 
+  public function setQuotaBytesByService($quotaBytesByService)
+  {
+    $this->quotaBytesByService = $quotaBytesByService;
+  }
+
+  public function getQuotaBytesByService()
+  {
+    return $this->quotaBytesByService;
+  }
+
   public function setQuotaBytesTotal($quotaBytesTotal)
   {
     $this->quotaBytesTotal = $quotaBytesTotal;
@@ -2642,6 +2751,16 @@ class Google_Service_Drive_About extends Google_Collection
     return $this->quotaBytesUsedInTrash;
   }
 
+  public function setQuotaType($quotaType)
+  {
+    $this->quotaType = $quotaType;
+  }
+
+  public function getQuotaType()
+  {
+    return $this->quotaType;
+  }
+
   public function setRemainingChangeIds($remainingChangeIds)
   {
     $this->remainingChangeIds = $remainingChangeIds;
@@ -2685,6 +2804,9 @@ class Google_Service_Drive_About extends Google_Collection
 
 class Google_Service_Drive_AboutAdditionalRoleInfo extends Google_Collection
 {
+  protected $collection_key = 'roleSets';
+  protected $internal_gapi_mappings = array(
+  );
   protected $roleSetsType = 'Google_Service_Drive_AboutAdditionalRoleInfoRoleSets';
   protected $roleSetsDataType = 'array';
   public $type;
@@ -2712,6 +2834,9 @@ class Google_Service_Drive_AboutAdditionalRoleInfo extends Google_Collection
 
 class Google_Service_Drive_AboutAdditionalRoleInfoRoleSets extends Google_Collection
 {
+  protected $collection_key = 'additionalRoles';
+  protected $internal_gapi_mappings = array(
+  );
   public $additionalRoles;
   public $primaryRole;
 
@@ -2738,6 +2863,9 @@ class Google_Service_Drive_AboutAdditionalRoleInfoRoleSets extends Google_Collec
 
 class Google_Service_Drive_AboutExportFormats extends Google_Collection
 {
+  protected $collection_key = 'targets';
+  protected $internal_gapi_mappings = array(
+  );
   public $source;
   public $targets;
 
@@ -2764,6 +2892,8 @@ class Google_Service_Drive_AboutExportFormats extends Google_Collection
 
 class Google_Service_Drive_AboutFeatures extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $featureName;
   public $featureRate;
 
@@ -2790,6 +2920,9 @@ class Google_Service_Drive_AboutFeatures extends Google_Model
 
 class Google_Service_Drive_AboutImportFormats extends Google_Collection
 {
+  protected $collection_key = 'targets';
+  protected $internal_gapi_mappings = array(
+  );
   public $source;
   public $targets;
 
@@ -2816,6 +2949,8 @@ class Google_Service_Drive_AboutImportFormats extends Google_Collection
 
 class Google_Service_Drive_AboutMaxUploadSizes extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $size;
   public $type;
 
@@ -2840,11 +2975,43 @@ class Google_Service_Drive_AboutMaxUploadSizes extends Google_Model
   }
 }
 
+class Google_Service_Drive_AboutQuotaBytesByService extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $bytesUsed;
+  public $serviceName;
+
+  public function setBytesUsed($bytesUsed)
+  {
+    $this->bytesUsed = $bytesUsed;
+  }
+
+  public function getBytesUsed()
+  {
+    return $this->bytesUsed;
+  }
+
+  public function setServiceName($serviceName)
+  {
+    $this->serviceName = $serviceName;
+  }
+
+  public function getServiceName()
+  {
+    return $this->serviceName;
+  }
+}
+
 class Google_Service_Drive_App extends Google_Collection
 {
+  protected $collection_key = 'secondaryMimeTypes';
+  protected $internal_gapi_mappings = array(
+  );
   public $authorized;
   public $createInFolderTemplate;
   public $createUrl;
+  public $hasDriveWideScope;
   protected $iconsType = 'Google_Service_Drive_AppIcons';
   protected $iconsDataType = 'array';
   public $id;
@@ -2864,6 +3031,7 @@ class Google_Service_Drive_App extends Google_Collection
   public $supportsCreate;
   public $supportsImport;
   public $supportsMultiOpen;
+  public $supportsOfflineCreate;
   public $useByDefault;
 
   public function setAuthorized($authorized)
@@ -2896,6 +3064,16 @@ class Google_Service_Drive_App extends Google_Collection
     return $this->createUrl;
   }
 
+  public function setHasDriveWideScope($hasDriveWideScope)
+  {
+    $this->hasDriveWideScope = $hasDriveWideScope;
+  }
+
+  public function getHasDriveWideScope()
+  {
+    return $this->hasDriveWideScope;
+  }
+
   public function setIcons($icons)
   {
     $this->icons = $icons;
@@ -3076,6 +3254,16 @@ class Google_Service_Drive_App extends Google_Collection
     return $this->supportsMultiOpen;
   }
 
+  public function setSupportsOfflineCreate($supportsOfflineCreate)
+  {
+    $this->supportsOfflineCreate = $supportsOfflineCreate;
+  }
+
+  public function getSupportsOfflineCreate()
+  {
+    return $this->supportsOfflineCreate;
+  }
+
   public function setUseByDefault($useByDefault)
   {
     $this->useByDefault = $useByDefault;
@@ -3089,6 +3277,8 @@ class Google_Service_Drive_App extends Google_Collection
 
 class Google_Service_Drive_AppIcons extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $category;
   public $iconUrl;
   public $size;
@@ -3126,12 +3316,26 @@ class Google_Service_Drive_AppIcons extends Google_Model
 
 class Google_Service_Drive_AppList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
+  public $defaultAppIds;
   public $etag;
   protected $itemsType = 'Google_Service_Drive_App';
   protected $itemsDataType = 'array';
   public $kind;
   public $selfLink;
 
+  public function setDefaultAppIds($defaultAppIds)
+  {
+    $this->defaultAppIds = $defaultAppIds;
+  }
+
+  public function getDefaultAppIds()
+  {
+    return $this->defaultAppIds;
+  }
+
   public function setEtag($etag)
   {
     $this->etag = $etag;
@@ -3175,6 +3379,8 @@ class Google_Service_Drive_AppList extends Google_Collection
 
 class Google_Service_Drive_Change extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $deleted;
   protected $fileType = 'Google_Service_Drive_DriveFile';
   protected $fileDataType = '';
@@ -3257,6 +3463,9 @@ class Google_Service_Drive_Change extends Google_Model
 
 class Google_Service_Drive_ChangeList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Drive_Change';
   protected $itemsDataType = 'array';
@@ -3339,6 +3548,8 @@ class Google_Service_Drive_ChangeList extends Google_Collection
 
 class Google_Service_Drive_Channel extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $address;
   public $expiration;
   public $id;
@@ -3451,8 +3662,17 @@ class Google_Service_Drive_Channel extends Google_Model
   }
 }
 
+class Google_Service_Drive_ChannelParams extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+}
+
 class Google_Service_Drive_ChildList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Drive_ChildReference';
   protected $itemsDataType = 'array';
@@ -3524,6 +3744,8 @@ class Google_Service_Drive_ChildList extends Google_Collection
 
 class Google_Service_Drive_ChildReference extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $childLink;
   public $id;
   public $kind;
@@ -3572,6 +3794,9 @@ class Google_Service_Drive_ChildReference extends Google_Model
 
 class Google_Service_Drive_Comment extends Google_Collection
 {
+  protected $collection_key = 'replies';
+  protected $internal_gapi_mappings = array(
+  );
   public $anchor;
   protected $authorType = 'Google_Service_Drive_User';
   protected $authorDataType = '';
@@ -3744,6 +3969,8 @@ class Google_Service_Drive_Comment extends Google_Collection
 
 class Google_Service_Drive_CommentContext extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $type;
   public $value;
 
@@ -3770,6 +3997,9 @@ class Google_Service_Drive_CommentContext extends Google_Model
 
 class Google_Service_Drive_CommentList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   protected $itemsType = 'Google_Service_Drive_Comment';
   protected $itemsDataType = 'array';
   public $kind;
@@ -3830,6 +4060,8 @@ class Google_Service_Drive_CommentList extends Google_Collection
 
 class Google_Service_Drive_CommentReply extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   protected $authorType = 'Google_Service_Drive_User';
   protected $authorDataType = '';
   public $content;
@@ -3934,6 +4166,9 @@ class Google_Service_Drive_CommentReply extends Google_Model
 
 class Google_Service_Drive_CommentReplyList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   protected $itemsType = 'Google_Service_Drive_CommentReply';
   protected $itemsDataType = 'array';
   public $kind;
@@ -3994,6 +4229,9 @@ class Google_Service_Drive_CommentReplyList extends Google_Collection
 
 class Google_Service_Drive_DriveFile extends Google_Collection
 {
+  protected $collection_key = 'properties';
+  protected $internal_gapi_mappings = array(
+  );
   public $alternateLink;
   public $appDataContents;
   public $copyable;
@@ -4022,6 +4260,7 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   protected $lastModifyingUserDataType = '';
   public $lastModifyingUserName;
   public $lastViewedByMeDate;
+  public $markedViewedByMeDate;
   public $md5Checksum;
   public $mimeType;
   public $modifiedByMeDate;
@@ -4033,18 +4272,25 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   protected $ownersDataType = 'array';
   protected $parentsType = 'Google_Service_Drive_ParentReference';
   protected $parentsDataType = 'array';
+  protected $permissionsType = 'Google_Service_Drive_Permission';
+  protected $permissionsDataType = 'array';
   protected $propertiesType = 'Google_Service_Drive_Property';
   protected $propertiesDataType = 'array';
   public $quotaBytesUsed;
   public $selfLink;
   public $shared;
   public $sharedWithMeDate;
+  protected $sharingUserType = 'Google_Service_Drive_User';
+  protected $sharingUserDataType = '';
   protected $thumbnailType = 'Google_Service_Drive_DriveFileThumbnail';
   protected $thumbnailDataType = '';
   public $thumbnailLink;
   public $title;
   protected $userPermissionType = 'Google_Service_Drive_Permission';
   protected $userPermissionDataType = '';
+  public $version;
+  protected $videoMediaMetadataType = 'Google_Service_Drive_DriveFileVideoMediaMetadata';
+  protected $videoMediaMetadataDataType = '';
   public $webContentLink;
   public $webViewLink;
   public $writersCanShare;
@@ -4289,6 +4535,16 @@ class Google_Service_Drive_DriveFile extends Google_Collection
     return $this->lastViewedByMeDate;
   }
 
+  public function setMarkedViewedByMeDate($markedViewedByMeDate)
+  {
+    $this->markedViewedByMeDate = $markedViewedByMeDate;
+  }
+
+  public function getMarkedViewedByMeDate()
+  {
+    return $this->markedViewedByMeDate;
+  }
+
   public function setMd5Checksum($md5Checksum)
   {
     $this->md5Checksum = $md5Checksum;
@@ -4379,6 +4635,16 @@ class Google_Service_Drive_DriveFile extends Google_Collection
     return $this->parents;
   }
 
+  public function setPermissions($permissions)
+  {
+    $this->permissions = $permissions;
+  }
+
+  public function getPermissions()
+  {
+    return $this->permissions;
+  }
+
   public function setProperties($properties)
   {
     $this->properties = $properties;
@@ -4429,6 +4695,16 @@ class Google_Service_Drive_DriveFile extends Google_Collection
     return $this->sharedWithMeDate;
   }
 
+  public function setSharingUser(Google_Service_Drive_User $sharingUser)
+  {
+    $this->sharingUser = $sharingUser;
+  }
+
+  public function getSharingUser()
+  {
+    return $this->sharingUser;
+  }
+
   public function setThumbnail(Google_Service_Drive_DriveFileThumbnail $thumbnail)
   {
     $this->thumbnail = $thumbnail;
@@ -4469,6 +4745,26 @@ class Google_Service_Drive_DriveFile extends Google_Collection
     return $this->userPermission;
   }
 
+  public function setVersion($version)
+  {
+    $this->version = $version;
+  }
+
+  public function getVersion()
+  {
+    return $this->version;
+  }
+
+  public function setVideoMediaMetadata(Google_Service_Drive_DriveFileVideoMediaMetadata $videoMediaMetadata)
+  {
+    $this->videoMediaMetadata = $videoMediaMetadata;
+  }
+
+  public function getVideoMediaMetadata()
+  {
+    return $this->videoMediaMetadata;
+  }
+
   public function setWebContentLink($webContentLink)
   {
     $this->webContentLink = $webContentLink;
@@ -4500,8 +4796,16 @@ class Google_Service_Drive_DriveFile extends Google_Collection
   }
 }
 
+class Google_Service_Drive_DriveFileExportLinks extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+}
+
 class Google_Service_Drive_DriveFileImageMediaMetadata extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $aperture;
   public $cameraMake;
   public $cameraModel;
@@ -4738,6 +5042,8 @@ class Google_Service_Drive_DriveFileImageMediaMetadata extends Google_Model
 
 class Google_Service_Drive_DriveFileImageMediaMetadataLocation extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $altitude;
   public $latitude;
   public $longitude;
@@ -4775,6 +5081,8 @@ class Google_Service_Drive_DriveFileImageMediaMetadataLocation extends Google_Mo
 
 class Google_Service_Drive_DriveFileIndexableText extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $text;
 
   public function setText($text)
@@ -4790,6 +5098,8 @@ class Google_Service_Drive_DriveFileIndexableText extends Google_Model
 
 class Google_Service_Drive_DriveFileLabels extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $hidden;
   public $restricted;
   public $starred;
@@ -4847,8 +5157,16 @@ class Google_Service_Drive_DriveFileLabels extends Google_Model
   }
 }
 
+class Google_Service_Drive_DriveFileOpenWithLinks extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+}
+
 class Google_Service_Drive_DriveFileThumbnail extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $image;
   public $mimeType;
 
@@ -4873,8 +5191,50 @@ class Google_Service_Drive_DriveFileThumbnail extends Google_Model
   }
 }
 
+class Google_Service_Drive_DriveFileVideoMediaMetadata extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+  public $durationMillis;
+  public $height;
+  public $width;
+
+  public function setDurationMillis($durationMillis)
+  {
+    $this->durationMillis = $durationMillis;
+  }
+
+  public function getDurationMillis()
+  {
+    return $this->durationMillis;
+  }
+
+  public function setHeight($height)
+  {
+    $this->height = $height;
+  }
+
+  public function getHeight()
+  {
+    return $this->height;
+  }
+
+  public function setWidth($width)
+  {
+    $this->width = $width;
+  }
+
+  public function getWidth()
+  {
+    return $this->width;
+  }
+}
+
 class Google_Service_Drive_FileList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Drive_DriveFile';
   protected $itemsDataType = 'array';
@@ -4946,6 +5306,9 @@ class Google_Service_Drive_FileList extends Google_Collection
 
 class Google_Service_Drive_ParentList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Drive_ParentReference';
   protected $itemsDataType = 'array';
@@ -4995,6 +5358,8 @@ class Google_Service_Drive_ParentList extends Google_Collection
 
 class Google_Service_Drive_ParentReference extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $id;
   public $isRoot;
   public $kind;
@@ -5054,6 +5419,9 @@ class Google_Service_Drive_ParentReference extends Google_Model
 
 class Google_Service_Drive_Permission extends Google_Collection
 {
+  protected $collection_key = 'additionalRoles';
+  protected $internal_gapi_mappings = array(
+  );
   public $additionalRoles;
   public $authKey;
   public $domain;
@@ -5212,6 +5580,8 @@ class Google_Service_Drive_Permission extends Google_Collection
 
 class Google_Service_Drive_PermissionId extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $id;
   public $kind;
 
@@ -5238,6 +5608,9 @@ class Google_Service_Drive_PermissionId extends Google_Model
 
 class Google_Service_Drive_PermissionList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Drive_Permission';
   protected $itemsDataType = 'array';
@@ -5287,6 +5660,8 @@ class Google_Service_Drive_PermissionList extends Google_Collection
 
 class Google_Service_Drive_Property extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   public $key;
   public $kind;
@@ -5357,6 +5732,9 @@ class Google_Service_Drive_Property extends Google_Model
 
 class Google_Service_Drive_PropertyList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Drive_Property';
   protected $itemsDataType = 'array';
@@ -5406,6 +5784,8 @@ class Google_Service_Drive_PropertyList extends Google_Collection
 
 class Google_Service_Drive_Revision extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $downloadUrl;
   public $etag;
   public $exportLinks;
@@ -5607,8 +5987,17 @@ class Google_Service_Drive_Revision extends Google_Model
   }
 }
 
+class Google_Service_Drive_RevisionExportLinks extends Google_Model
+{
+  protected $internal_gapi_mappings = array(
+  );
+}
+
 class Google_Service_Drive_RevisionList extends Google_Collection
 {
+  protected $collection_key = 'items';
+  protected $internal_gapi_mappings = array(
+  );
   public $etag;
   protected $itemsType = 'Google_Service_Drive_Revision';
   protected $itemsDataType = 'array';
@@ -5658,7 +6047,10 @@ class Google_Service_Drive_RevisionList extends Google_Collection
 
 class Google_Service_Drive_User extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $displayName;
+  public $emailAddress;
   public $isAuthenticatedUser;
   public $kind;
   public $permissionId;
@@ -5675,6 +6067,16 @@ class Google_Service_Drive_User extends Google_Model
     return $this->displayName;
   }
 
+  public function setEmailAddress($emailAddress)
+  {
+    $this->emailAddress = $emailAddress;
+  }
+
+  public function getEmailAddress()
+  {
+    return $this->emailAddress;
+  }
+
   public function setIsAuthenticatedUser($isAuthenticatedUser)
   {
     $this->isAuthenticatedUser = $isAuthenticatedUser;
@@ -5718,6 +6120,8 @@ class Google_Service_Drive_User extends Google_Model
 
 class Google_Service_Drive_UserPicture extends Google_Model
 {
+  protected $internal_gapi_mappings = array(
+  );
   public $url;
 
   public function setUrl($url)
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/P12.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/P12.php
index 2c9d17927c8..7cc6098bb63 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/P12.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Signer/P12.php
@@ -39,23 +39,32 @@ class Google_Signer_P12 extends Google_Signer_Abstract
       );
     }
 
-    // This throws on error
-    $certs = array();
-    if (!openssl_pkcs12_read($p12, $certs, $password)) {
-      throw new Google_Auth_Exception(
-          "Unable to parse the p12 file.  " .
-          "Is this a .p12 file?  Is the password correct?  OpenSSL error: " .
-          openssl_error_string()
-      );
+    // If the private key is provided directly, then this isn't in the p12
+    // format. Different versions of openssl support different p12 formats
+    // and the key from google wasn't being accepted by the version available
+    // at the time.
+    if (!$password && strpos($p12, "-----BEGIN RSA PRIVATE KEY-----") !== false) {
+      $this->privateKey = openssl_pkey_get_private($p12);
+    } else {
+      // This throws on error
+      $certs = array();
+      if (!openssl_pkcs12_read($p12, $certs, $password)) {
+        throw new Google_Auth_Exception(
+            "Unable to parse the p12 file.  " .
+            "Is this a .p12 file?  Is the password correct?  OpenSSL error: " .
+            openssl_error_string()
+        );
+      }
+      // TODO(beaton): is this part of the contract for the openssl_pkcs12_read
+      // method?  What happens if there are multiple private keys?  Do we care?
+      if (!array_key_exists("pkey", $certs) || !$certs["pkey"]) {
+        throw new Google_Auth_Exception("No private key found in p12 file.");
+      }
+      $this->privateKey = openssl_pkey_get_private($certs['pkey']);
     }
-    // TODO(beaton): is this part of the contract for the openssl_pkcs12_read
-    // method?  What happens if there are multiple private keys?  Do we care?
-    if (!array_key_exists("pkey", $certs) || !$certs["pkey"]) {
-      throw new Google_Auth_Exception("No private key found in p12 file.");
-    }
-    $this->privateKey = openssl_pkey_get_private($certs["pkey"]);
+
     if (!$this->privateKey) {
-      throw new Google_Auth_Exception("Unable to load private key in ");
+      throw new Google_Auth_Exception("Unable to load private key");
     }
   }
 
@@ -73,7 +82,8 @@ class Google_Signer_P12 extends Google_Signer_Abstract
           "PHP 5.3.0 or higher is required to use service accounts."
       );
     }
-    if (!openssl_sign($data, $signature, $this->privateKey, "sha256")) {
+    $hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256";
+    if (!openssl_sign($data, $signature, $this->privateKey, $hash)) {
       throw new Google_Auth_Exception("Unable to sign data");
     }
     return $signature;
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils.php
index a991066f2d9..f5ef32cd4d6 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils.php
@@ -46,7 +46,7 @@ class Google_Utils
 
   /**
    * Misc function used to count the number of bytes in a post body, in the
-   * world of multi-byte chars and the unpredictability of 
+   * world of multi-byte chars and the unpredictability of
    * strlen/mb_strlen/sizeof, this is the only way to do that in a sane
    * manner at the moment.
    *
@@ -128,6 +128,8 @@ class Google_Utils
   public static function camelCase($value)
   {
     $value = ucwords(str_replace(array('-', '_'), ' ', $value));
-    return lcfirst(str_replace(' ', '', $value));
+    $value = str_replace(' ', '', $value);
+    $value[0] = strtolower($value[0]);
+    return $value;
   }
 }
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php
index fee56725dab..f5ee38bb333 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Utils/URITemplate.php
@@ -48,7 +48,7 @@ class Google_Utils_URITemplate
    */
   private $reserved = array(
       "=", ",", "!", "@", "|", ":", "/", "?", "#",
-      "[", "]","$", "&", "'", "(", ")", "*", "+", ";"
+      "[", "]",'$', "&", "'", "(", ")", "*", "+", ";"
   );
   private $reservedEncoded = array(
     "%3D", "%2C", "%21", "%40", "%7C", "%3A", "%2F", "%3F",
diff --git a/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Pem.php b/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Pem.php
index 8b4d1ab1640..f281575e172 100644
--- a/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Pem.php
+++ b/apps/files_external/3rdparty/google-api-php-client/src/Google/Verifier/Pem.php
@@ -64,7 +64,8 @@ class Google_Verifier_Pem extends Google_Verifier_Abstract
    */
   public function verify($data, $signature)
   {
-    $status = openssl_verify($data, $signature, $this->publicKey, "sha256");
+    $hash = defined("OPENSSL_ALGO_SHA256") ? OPENSSL_ALGO_SHA256 : "sha256";
+    $status = openssl_verify($data, $signature, $this->publicKey, $hash);
     if ($status === -1) {
       throw new Google_Auth_Exception('Signature verification error: ' . openssl_error_string());
     }
-- 
GitLab


From c237acb3953791f77b52f89efb7229e59606fdc0 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Fri, 7 Nov 2014 22:52:07 -0800
Subject: [PATCH 377/616] google: disable compression when curl is not
 available

This is a slightly hacky workaround for
https://github.com/google/google-api-php-client/issues/59 .
There's a bug in the Google library which makes it go nuts on
file uploads and transfer *way* too much data if compression is
enabled and it's using its own IO handler (not curl). Upstream
'fixed' this (by disabling compression) for one upload
mechanism, but not for the one we use. The bug doesn't seem to
happen if the google lib detects that curl is available and
decides to use it instead of its own handler. So, let's disable
compression, but only if it looks like the Google lib's check
for curl is going to fail.
---
 apps/files_external/lib/google.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 76ad1e4b0f6..27885f356c7 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -52,6 +52,12 @@ class Google extends \OC\Files\Storage\Common {
 			$this->client->setClientSecret($params['client_secret']);
 			$this->client->setScopes(array('https://www.googleapis.com/auth/drive'));
 			$this->client->setAccessToken($params['token']);
+			// if curl isn't available we're likely to run into
+			// https://github.com/google/google-api-php-client/issues/59
+			// - disable gzip to avoid it.
+			if (!function_exists('curl_version') || !function_exists('curl_exec')) {
+				$this->client->setClassConfig("Google_Http_Request", "disable_gzip", true);
+			}
 			// note: API connection is lazy
 			$this->service = new \Google_Service_Drive($this->client);
 			$token = json_decode($params['token'], true);
-- 
GitLab


From da14a605d5a02d68af44e0153b084d94b676bbff Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 8 Nov 2014 01:54:35 -0500
Subject: [PATCH 378/616] [tx-robot] updated from transifex

---
 apps/files/l10n/bg_BG.js              | 2 +-
 apps/files/l10n/bg_BG.json            | 2 +-
 apps/files_encryption/l10n/cs_CZ.js   | 3 +++
 apps/files_encryption/l10n/cs_CZ.json | 3 +++
 apps/files_encryption/l10n/da.js      | 3 +++
 apps/files_encryption/l10n/da.json    | 3 +++
 apps/files_encryption/l10n/de.js      | 3 +++
 apps/files_encryption/l10n/de.json    | 3 +++
 apps/files_encryption/l10n/de_DE.js   | 3 +++
 apps/files_encryption/l10n/de_DE.json | 3 +++
 apps/files_encryption/l10n/fi_FI.js   | 6 ++++--
 apps/files_encryption/l10n/fi_FI.json | 6 ++++--
 apps/files_encryption/l10n/fr.js      | 3 +++
 apps/files_encryption/l10n/fr.json    | 3 +++
 apps/files_encryption/l10n/ja.js      | 3 +++
 apps/files_encryption/l10n/ja.json    | 3 +++
 apps/files_encryption/l10n/sl.js      | 3 +++
 apps/files_encryption/l10n/sl.json    | 3 +++
 apps/files_encryption/l10n/tr.js      | 3 +++
 apps/files_encryption/l10n/tr.json    | 3 +++
 apps/files_sharing/l10n/bg_BG.js      | 3 ++-
 apps/files_sharing/l10n/bg_BG.json    | 3 ++-
 apps/files_sharing/l10n/da.js         | 5 ++++-
 apps/files_sharing/l10n/da.json       | 5 ++++-
 apps/files_sharing/l10n/sl.js         | 5 ++++-
 apps/files_sharing/l10n/sl.json       | 5 ++++-
 apps/files_sharing/l10n/tr.js         | 5 ++++-
 apps/files_sharing/l10n/tr.json       | 5 ++++-
 apps/user_ldap/l10n/sl.js             | 1 +
 apps/user_ldap/l10n/sl.json           | 1 +
 core/l10n/fr.js                       | 4 ++--
 core/l10n/fr.json                     | 4 ++--
 core/l10n/sl.js                       | 6 +++++-
 core/l10n/sl.json                     | 6 +++++-
 l10n/templates/core.pot               | 2 +-
 l10n/templates/files.pot              | 2 +-
 l10n/templates/files_encryption.pot   | 2 +-
 l10n/templates/files_external.pot     | 2 +-
 l10n/templates/files_sharing.pot      | 2 +-
 l10n/templates/files_trashbin.pot     | 2 +-
 l10n/templates/files_versions.pot     | 2 +-
 l10n/templates/lib.pot                | 2 +-
 l10n/templates/private.pot            | 2 +-
 l10n/templates/settings.pot           | 2 +-
 l10n/templates/user_ldap.pot          | 2 +-
 l10n/templates/user_webdavauth.pot    | 2 +-
 settings/l10n/sl.js                   | 2 ++
 settings/l10n/sl.json                 | 2 ++
 settings/l10n/tr.js                   | 3 ++-
 settings/l10n/tr.json                 | 3 ++-
 50 files changed, 122 insertions(+), 34 deletions(-)

diff --git a/apps/files/l10n/bg_BG.js b/apps/files/l10n/bg_BG.js
index 24e148c9c63..1776e769251 100644
--- a/apps/files/l10n/bg_BG.js
+++ b/apps/files/l10n/bg_BG.js
@@ -92,6 +92,6 @@ OC.L10N.register(
     "Upload too large" : "Прекалено голям файл за качване.",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
     "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
-    "Currently scanning" : "В момента се сканирва."
+    "Currently scanning" : "В момента се търси"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/bg_BG.json b/apps/files/l10n/bg_BG.json
index 451cc21ae7b..cd29da596db 100644
--- a/apps/files/l10n/bg_BG.json
+++ b/apps/files/l10n/bg_BG.json
@@ -90,6 +90,6 @@
     "Upload too large" : "Прекалено голям файл за качване.",
     "The files you are trying to upload exceed the maximum size for file uploads on this server." : "Файловете, които се опитваш да качиш са по-големи от позволеното на този сървър.",
     "Files are being scanned, please wait." : "Файловете се сканирват, изчакайте.",
-    "Currently scanning" : "В момента се сканирва."
+    "Currently scanning" : "В момента се търси"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/cs_CZ.js b/apps/files_encryption/l10n/cs_CZ.js
index 27023827dff..0074192ab02 100644
--- a/apps/files_encryption/l10n/cs_CZ.js
+++ b/apps/files_encryption/l10n/cs_CZ.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
     "Password successfully changed." : "Heslo bylo úspěšně změněno.",
     "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
+    "Could not update the private key password." : "Nelze aktualizovat heslo soukromého klíče.",
+    "The old password was not correct, please try again." : "Staré heslo nebylo zadáno správně, zkuste to prosím znovu.",
+    "The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to prosím znovu.",
     "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
     "File recovery settings updated" : "Možnosti záchrany souborů aktualizovány",
     "Could not update file recovery" : "Nelze nastavit záchranu souborů",
diff --git a/apps/files_encryption/l10n/cs_CZ.json b/apps/files_encryption/l10n/cs_CZ.json
index 46bc5c82fd0..4ecc7c2aeec 100644
--- a/apps/files_encryption/l10n/cs_CZ.json
+++ b/apps/files_encryption/l10n/cs_CZ.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
     "Password successfully changed." : "Heslo bylo úspěšně změněno.",
     "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
+    "Could not update the private key password." : "Nelze aktualizovat heslo soukromého klíče.",
+    "The old password was not correct, please try again." : "Staré heslo nebylo zadáno správně, zkuste to prosím znovu.",
+    "The current log-in password was not correct, please try again." : "Současné přihlašovací heslo nebylo zadáno správně, zkuste to prosím znovu.",
     "Private key password successfully updated." : "Heslo soukromého klíče úspěšně aktualizováno.",
     "File recovery settings updated" : "Možnosti záchrany souborů aktualizovány",
     "Could not update file recovery" : "Nelze nastavit záchranu souborů",
diff --git a/apps/files_encryption/l10n/da.js b/apps/files_encryption/l10n/da.js
index 11f64c3f691..95e3a115cd7 100644
--- a/apps/files_encryption/l10n/da.js
+++ b/apps/files_encryption/l10n/da.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse",
     "Password successfully changed." : "Kodeordet blev ændret succesfuldt",
     "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
+    "Could not update the private key password." : "Kunne ikke opdatere kodeordet til den private nøgle.",
+    "The old password was not correct, please try again." : "Det gamle kodeord var ikke korrekt, prøv venligst igen.",
+    "The current log-in password was not correct, please try again." : "Det nuværende kodeord til log-in var ikke korrekt, prøv venligst igen.",
     "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
     "File recovery settings updated" : "Filgendannelsesindstillinger opdateret",
     "Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
diff --git a/apps/files_encryption/l10n/da.json b/apps/files_encryption/l10n/da.json
index d974d85681d..141d6998d47 100644
--- a/apps/files_encryption/l10n/da.json
+++ b/apps/files_encryption/l10n/da.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Gentag venligst det nye kodeord til gendannelse",
     "Password successfully changed." : "Kodeordet blev ændret succesfuldt",
     "Could not change the password. Maybe the old password was not correct." : "Kunne ikke ændre kodeordet. Måske var det gamle kodeord ikke korrekt.",
+    "Could not update the private key password." : "Kunne ikke opdatere kodeordet til den private nøgle.",
+    "The old password was not correct, please try again." : "Det gamle kodeord var ikke korrekt, prøv venligst igen.",
+    "The current log-in password was not correct, please try again." : "Det nuværende kodeord til log-in var ikke korrekt, prøv venligst igen.",
     "Private key password successfully updated." : "Privat nøgle kodeord succesfuldt opdateret.",
     "File recovery settings updated" : "Filgendannelsesindstillinger opdateret",
     "Could not update file recovery" : "Kunne ikke opdatere filgendannelse",
diff --git a/apps/files_encryption/l10n/de.js b/apps/files_encryption/l10n/de.js
index ad52cf3d99d..e02b6cd473c 100644
--- a/apps/files_encryption/l10n/de.js
+++ b/apps/files_encryption/l10n/de.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
     "Password successfully changed." : "Dein Passwort wurde geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
+    "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
+    "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuche es noch einmal.",
+    "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
     "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
     "File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
     "Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden",
diff --git a/apps/files_encryption/l10n/de.json b/apps/files_encryption/l10n/de.json
index e6410e8b8b7..c3077fc61a9 100644
--- a/apps/files_encryption/l10n/de.json
+++ b/apps/files_encryption/l10n/de.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
     "Password successfully changed." : "Dein Passwort wurde geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort falsch.",
+    "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
+    "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuche es noch einmal.",
+    "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuche es noch einmal.",
     "Private key password successfully updated." : "Passwort des privaten Schlüssels erfolgreich aktualisiert",
     "File recovery settings updated" : "Einstellungen zur Wiederherstellung von Dateien wurden aktualisiert",
     "Could not update file recovery" : "Dateiwiederherstellung konnte nicht aktualisiert werden",
diff --git a/apps/files_encryption/l10n/de_DE.js b/apps/files_encryption/l10n/de_DE.js
index 34035b630a8..84dd13df2a9 100644
--- a/apps/files_encryption/l10n/de_DE.js
+++ b/apps/files_encryption/l10n/de_DE.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
     "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
+    "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuchen Sie es noch einmal.",
+    "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
     "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
     "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
     "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
diff --git a/apps/files_encryption/l10n/de_DE.json b/apps/files_encryption/l10n/de_DE.json
index 786ecbd372b..0e9ee5084c4 100644
--- a/apps/files_encryption/l10n/de_DE.json
+++ b/apps/files_encryption/l10n/de_DE.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Bitte das neue Passwort zur Wiederherstellung wiederholen",
     "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
     "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Could not update the private key password." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden.",
+    "The old password was not correct, please try again." : "Das alte Passwort war nicht korrekt, bitte versuchen Sie es noch einmal.",
+    "The current log-in password was not correct, please try again." : "Das aktuelle Anmeldepasswort war nicht korrekt, bitte versuchen Sie es noch einmal.",
     "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
     "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
     "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
diff --git a/apps/files_encryption/l10n/fi_FI.js b/apps/files_encryption/l10n/fi_FI.js
index bf1afbb1129..aff16f1fcdd 100644
--- a/apps/files_encryption/l10n/fi_FI.js
+++ b/apps/files_encryption/l10n/fi_FI.js
@@ -5,9 +5,11 @@ OC.L10N.register(
     "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti",
     "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.",
     "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+    "The old password was not correct, please try again." : "Vanha salasana oli väärin, yritä uudelleen.",
     "Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.",
     "File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty",
     "Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
+    "Missing requirements." : "Puuttuvat vaatimukset.",
     "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
     "Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
     "Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
@@ -25,8 +27,8 @@ OC.L10N.register(
     "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
     "Change Password" : "Vaihda salasana",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
-    "Old log-in password" : "Vanha kirjautumis-salasana",
-    "Current log-in password" : "Nykyinen kirjautumis-salasana",
+    "Old log-in password" : "Vanha kirjautumissalasana",
+    "Current log-in password" : "Nykyinen kirjautumissalasana",
     "Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
     "Enable password recovery:" : "Ota salasanan palautus käyttöön:"
 },
diff --git a/apps/files_encryption/l10n/fi_FI.json b/apps/files_encryption/l10n/fi_FI.json
index 2b91a4388d0..348f8aeb1fe 100644
--- a/apps/files_encryption/l10n/fi_FI.json
+++ b/apps/files_encryption/l10n/fi_FI.json
@@ -3,9 +3,11 @@
     "Recovery key successfully enabled" : "Palautusavain kytketty päälle onnistuneesti",
     "Password successfully changed." : "Salasana vaihdettiin onnistuneesti.",
     "Could not change the password. Maybe the old password was not correct." : "Salasanan vaihto epäonnistui. Kenties vanha salasana oli väärin.",
+    "The old password was not correct, please try again." : "Vanha salasana oli väärin, yritä uudelleen.",
     "Private key password successfully updated." : "Yksityisen avaimen salasana päivitetty onnistuneesti.",
     "File recovery settings updated" : "Tiedostopalautuksen asetukset päivitetty",
     "Unknown error. Please check your system settings or contact your administrator" : "Tuntematon virhe. Tarkista järjestelmän asetukset tai ole yhteydessä ylläpitäjään.",
+    "Missing requirements." : "Puuttuvat vaatimukset.",
     "Following users are not set up for encryption:" : "Seuraavat käyttäjät eivät ole määrittäneet salausta:",
     "Initial encryption started... This can take some time. Please wait." : "Ensimmäinen salauskerta käynnistetty... Tämä saattaa kestää hetken.",
     "Initial encryption running... Please try again later." : "Ensimmäinen salauskerta on meneillään... Yritä myöhemmin uudelleen.",
@@ -23,8 +25,8 @@
     "Repeat New Recovery key password" : "Toista uusi palautusavaimen salasana",
     "Change Password" : "Vaihda salasana",
     " If you don't remember your old password you can ask your administrator to recover your files." : "Jos et muista vanhaa salasanaasi, voit pyytää ylläpitäjää palauttamaan tiedostosi.",
-    "Old log-in password" : "Vanha kirjautumis-salasana",
-    "Current log-in password" : "Nykyinen kirjautumis-salasana",
+    "Old log-in password" : "Vanha kirjautumissalasana",
+    "Current log-in password" : "Nykyinen kirjautumissalasana",
     "Update Private Key Password" : "Päivitä yksityisen avaimen salasana",
     "Enable password recovery:" : "Ota salasanan palautus käyttöön:"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js
index 8363fadcf00..96aaba8bcb0 100644
--- a/apps/files_encryption/l10n/fr.js
+++ b/apps/files_encryption/l10n/fr.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
     "Password successfully changed." : "Mot de passe changé avec succès ",
     "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
+    "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.",
+    "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
+    "The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.",
     "Private key password successfully updated." : "Mot de passe de la clé privé mis à jour avec succès.",
     "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour",
     "Could not update file recovery" : "Ne peut pas remettre à jour les fichiers de récupération",
diff --git a/apps/files_encryption/l10n/fr.json b/apps/files_encryption/l10n/fr.json
index 9d372950d77..5cd3d8dde54 100644
--- a/apps/files_encryption/l10n/fr.json
+++ b/apps/files_encryption/l10n/fr.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
     "Password successfully changed." : "Mot de passe changé avec succès ",
     "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
+    "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.",
+    "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
+    "The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.",
     "Private key password successfully updated." : "Mot de passe de la clé privé mis à jour avec succès.",
     "File recovery settings updated" : "Paramètres de récupération de fichiers mis à jour",
     "Could not update file recovery" : "Ne peut pas remettre à jour les fichiers de récupération",
diff --git a/apps/files_encryption/l10n/ja.js b/apps/files_encryption/l10n/ja.js
index 352ffcb1a0a..a21870de7c2 100644
--- a/apps/files_encryption/l10n/ja.js
+++ b/apps/files_encryption/l10n/ja.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力",
     "Password successfully changed." : "パスワードを変更できました。",
     "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+    "Could not update the private key password." : "秘密鍵のパスワードを更新できませんでした。",
+    "The old password was not correct, please try again." : "古いパスワードが一致しませんでした。もう一度入力してください。",
+    "The current log-in password was not correct, please try again." : "ログインパスワードが一致しませんでした。もう一度入力してください。",
     "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
     "File recovery settings updated" : "ファイルリカバリ設定を更新しました",
     "Could not update file recovery" : "ファイルリカバリを更新できませんでした",
diff --git a/apps/files_encryption/l10n/ja.json b/apps/files_encryption/l10n/ja.json
index aef760f5145..d689ca954d0 100644
--- a/apps/files_encryption/l10n/ja.json
+++ b/apps/files_encryption/l10n/ja.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "新しい復旧キーのパスワードをもう一度入力",
     "Password successfully changed." : "パスワードを変更できました。",
     "Could not change the password. Maybe the old password was not correct." : "パスワードを変更できませんでした。古いパスワードが間違っているかもしれません。",
+    "Could not update the private key password." : "秘密鍵のパスワードを更新できませんでした。",
+    "The old password was not correct, please try again." : "古いパスワードが一致しませんでした。もう一度入力してください。",
+    "The current log-in password was not correct, please try again." : "ログインパスワードが一致しませんでした。もう一度入力してください。",
     "Private key password successfully updated." : "秘密鍵のパスワードが正常に更新されました。",
     "File recovery settings updated" : "ファイルリカバリ設定を更新しました",
     "Could not update file recovery" : "ファイルリカバリを更新できませんでした",
diff --git a/apps/files_encryption/l10n/sl.js b/apps/files_encryption/l10n/sl.js
index c144227be78..3bb41a62f22 100644
--- a/apps/files_encryption/l10n/sl.js
+++ b/apps/files_encryption/l10n/sl.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev",
     "Password successfully changed." : "Geslo je uspešno spremenjeno.",
     "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
+    "Could not update the private key password." : "Ni mogoče posodobiti gesla zasebnega ključa.",
+    "The old password was not correct, please try again." : "Staro geslo ni vpisana pravilno. Poskusite znova.",
+    "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.",
     "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.",
     "File recovery settings updated" : "Nastavitve obnavljanja dokumentov so posodobljene",
     "Could not update file recovery" : "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti",
diff --git a/apps/files_encryption/l10n/sl.json b/apps/files_encryption/l10n/sl.json
index b4e41f89e22..a9909c6551a 100644
--- a/apps/files_encryption/l10n/sl.json
+++ b/apps/files_encryption/l10n/sl.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Ponovno vpišite nov ključ za obnovitev",
     "Password successfully changed." : "Geslo je uspešno spremenjeno.",
     "Could not change the password. Maybe the old password was not correct." : "Gesla ni mogoče spremeniti. Morda vnos starega gesla ni pravilen.",
+    "Could not update the private key password." : "Ni mogoče posodobiti gesla zasebnega ključa.",
+    "The old password was not correct, please try again." : "Staro geslo ni vpisana pravilno. Poskusite znova.",
+    "The current log-in password was not correct, please try again." : "Trenutno geslo za prijavo ni vpisano pravilno. Poskusite znova.",
     "Private key password successfully updated." : "Zasebni ključ za geslo je uspešno posodobljen.",
     "File recovery settings updated" : "Nastavitve obnavljanja dokumentov so posodobljene",
     "Could not update file recovery" : "Nastavitev za obnavljanje dokumentov ni mogoče posodobiti",
diff --git a/apps/files_encryption/l10n/tr.js b/apps/files_encryption/l10n/tr.js
index 668ace38e95..41240bf5ed6 100644
--- a/apps/files_encryption/l10n/tr.js
+++ b/apps/files_encryption/l10n/tr.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yenileyin",
     "Password successfully changed." : "Parola başarıyla değiştirildi.",
     "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
+    "Could not update the private key password." : "Özel anahtar parolası güncellenemedi",
+    "The old password was not correct, please try again." : "Eski parola doğru değil, lütfen yeniden deneyin.",
+    "The current log-in password was not correct, please try again." : "Geçerli oturum parolası doğru değil, lütfen yeniden deneyin.",
     "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.",
     "File recovery settings updated" : "Dosya kurtarma ayarları güncellendi",
     "Could not update file recovery" : "Dosya kurtarma güncellenemedi",
diff --git a/apps/files_encryption/l10n/tr.json b/apps/files_encryption/l10n/tr.json
index c182524a894..d951321dd82 100644
--- a/apps/files_encryption/l10n/tr.json
+++ b/apps/files_encryption/l10n/tr.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Lütfen yeni kurtarma parolasını yenileyin",
     "Password successfully changed." : "Parola başarıyla değiştirildi.",
     "Could not change the password. Maybe the old password was not correct." : "Parola değiştirilemedi. Eski parolanız doğru olmayabilir.",
+    "Could not update the private key password." : "Özel anahtar parolası güncellenemedi",
+    "The old password was not correct, please try again." : "Eski parola doğru değil, lütfen yeniden deneyin.",
+    "The current log-in password was not correct, please try again." : "Geçerli oturum parolası doğru değil, lütfen yeniden deneyin.",
     "Private key password successfully updated." : "Özel anahtar parolası başarıyla güncellendi.",
     "File recovery settings updated" : "Dosya kurtarma ayarları güncellendi",
     "Could not update file recovery" : "Dosya kurtarma güncellenemedi",
diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js
index 15a51e759d7..9a3956d8be7 100644
--- a/apps/files_sharing/l10n/bg_BG.js
+++ b/apps/files_sharing/l10n/bg_BG.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Add to your ownCloud" : "Добави към своя ownCloud",
     "Download" : "Изтегли",
     "Download %s" : "Изтегли %s",
-    "Direct link" : "Директна връзка"
+    "Direct link" : "Директна връзка",
+    "Server-to-Server Sharing" : "Споделяне между Сървъри"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json
index 85b2bcecbe1..54e63eaf0c0 100644
--- a/apps/files_sharing/l10n/bg_BG.json
+++ b/apps/files_sharing/l10n/bg_BG.json
@@ -31,6 +31,7 @@
     "Add to your ownCloud" : "Добави към своя ownCloud",
     "Download" : "Изтегли",
     "Download %s" : "Изтегли %s",
-    "Direct link" : "Директна връзка"
+    "Direct link" : "Директна връзка",
+    "Server-to-Server Sharing" : "Споделяне между Сървъри"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/da.js b/apps/files_sharing/l10n/da.js
index 961252e26c6..de8c6102993 100644
--- a/apps/files_sharing/l10n/da.js
+++ b/apps/files_sharing/l10n/da.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Tilføj til din ownCload",
     "Download" : "Download",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkte link"
+    "Direct link" : "Direkte link",
+    "Server-to-Server Sharing" : "Deling via server-til-server",
+    "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere",
+    "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/da.json b/apps/files_sharing/l10n/da.json
index 19291cdd9bf..996d45436c6 100644
--- a/apps/files_sharing/l10n/da.json
+++ b/apps/files_sharing/l10n/da.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Tilføj til din ownCload",
     "Download" : "Download",
     "Download %s" : "Download %s",
-    "Direct link" : "Direkte link"
+    "Direct link" : "Direkte link",
+    "Server-to-Server Sharing" : "Deling via server-til-server",
+    "Allow users on this server to send shares to other servers" : "Tillad brugere på denne server, at sende delinger til andre servere",
+    "Allow users on this server to receive shares from other servers" : "Tillad brugere på denne server, at modtage delinger fra andre servere"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/sl.js b/apps/files_sharing/l10n/sl.js
index d685f6cc501..b9a3a00585c 100644
--- a/apps/files_sharing/l10n/sl.js
+++ b/apps/files_sharing/l10n/sl.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud",
     "Download" : "Prejmi",
     "Download %s" : "Prejmi %s",
-    "Direct link" : "Neposredna povezava"
+    "Direct link" : "Neposredna povezava",
+    "Server-to-Server Sharing" : "Souporaba strežnik-na-strežnik",
+    "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.",
+    "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov."
 },
 "nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/apps/files_sharing/l10n/sl.json b/apps/files_sharing/l10n/sl.json
index 0b45262f95f..5e9290df487 100644
--- a/apps/files_sharing/l10n/sl.json
+++ b/apps/files_sharing/l10n/sl.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Dodaj v svoj oblak ownCloud",
     "Download" : "Prejmi",
     "Download %s" : "Prejmi %s",
-    "Direct link" : "Neposredna povezava"
+    "Direct link" : "Neposredna povezava",
+    "Server-to-Server Sharing" : "Souporaba strežnik-na-strežnik",
+    "Allow users on this server to send shares to other servers" : "Dovoli uporabnikom tega strežnika pošiljanje map za souporabo na druge strežnike.",
+    "Allow users on this server to receive shares from other servers" : "Dovoli uporabnikom tega strežnika sprejemanje map za souporabo z drugih strežnikov."
 },"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_sharing/l10n/tr.js b/apps/files_sharing/l10n/tr.js
index ae6217cab93..7bbeefc9622 100644
--- a/apps/files_sharing/l10n/tr.js
+++ b/apps/files_sharing/l10n/tr.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "ownCloud'ınıza Ekleyin",
     "Download" : "İndir",
     "Download %s" : "İndir: %s",
-    "Direct link" : "Doğrudan bağlantı"
+    "Direct link" : "Doğrudan bağlantı",
+    "Server-to-Server Sharing" : "Sunucu-Sunucu Paylaşımı",
+    "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver",
+    "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunucularda paylaşım almalarına izin ver"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/apps/files_sharing/l10n/tr.json b/apps/files_sharing/l10n/tr.json
index 90d206ac3ed..f91ab02288b 100644
--- a/apps/files_sharing/l10n/tr.json
+++ b/apps/files_sharing/l10n/tr.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "ownCloud'ınıza Ekleyin",
     "Download" : "İndir",
     "Download %s" : "İndir: %s",
-    "Direct link" : "Doğrudan bağlantı"
+    "Direct link" : "Doğrudan bağlantı",
+    "Server-to-Server Sharing" : "Sunucu-Sunucu Paylaşımı",
+    "Allow users on this server to send shares to other servers" : "Bu sunucudaki kullanıcıların diğer sunuculara paylaşım göndermelerine izin ver",
+    "Allow users on this server to receive shares from other servers" : "Bu sunucudaki kullanıcıların diğer sunucularda paylaşım almalarına izin ver"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/sl.js b/apps/user_ldap/l10n/sl.js
index f7fd2772fe8..1437afcf5ba 100644
--- a/apps/user_ldap/l10n/sl.js
+++ b/apps/user_ldap/l10n/sl.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
+    "LDAP" : "LDAP",
     "Expert" : "Napredno",
     "Advanced" : "Napredne možnosti",
     "<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.",
diff --git a/apps/user_ldap/l10n/sl.json b/apps/user_ldap/l10n/sl.json
index aa1c9444651..56bf65210c3 100644
--- a/apps/user_ldap/l10n/sl.json
+++ b/apps/user_ldap/l10n/sl.json
@@ -74,6 +74,7 @@
     "Saving" : "Poteka shranjevanje ...",
     "Back" : "Nazaj",
     "Continue" : "Nadaljuj",
+    "LDAP" : "LDAP",
     "Expert" : "Napredno",
     "Advanced" : "Napredne možnosti",
     "<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>Opozorilo:</b> določili user_ldap in user_webdavauth sta  neskladni, kar lahko vpliva na delovanje sistema. O napaki pošljite poročilo skrbniku sistema in opozorite, da je treba eno izmed možnosti onemogočiti.",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index bf0c26e1e0e..7be2663e412 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -85,7 +85,7 @@ OC.L10N.register(
     "Send" : "Envoyer",
     "Set expiration date" : "Spécifier une date d'expiration",
     "Expiration date" : "Date d'expiration",
-    "Adding user..." : "Utilisateur en cours d'ajout...",
+    "Adding user..." : "Ajout de l'utilisateur...",
     "group" : "groupe",
     "Resharing is not allowed" : "Le repartage n'est pas autorisé",
     "Shared in {item} with {user}" : "Partagé dans {item} avec {user}",
@@ -100,7 +100,7 @@ OC.L10N.register(
     "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 …",
+    "Sending ..." : "Envoi…",
     "Email sent" : "Courriel envoyé",
     "Warning" : "Attention",
     "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 75f11a37b12..591eabdcecb 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -83,7 +83,7 @@
     "Send" : "Envoyer",
     "Set expiration date" : "Spécifier une date d'expiration",
     "Expiration date" : "Date d'expiration",
-    "Adding user..." : "Utilisateur en cours d'ajout...",
+    "Adding user..." : "Ajout de l'utilisateur...",
     "group" : "groupe",
     "Resharing is not allowed" : "Le repartage n'est pas autorisé",
     "Shared in {item} with {user}" : "Partagé dans {item} avec {user}",
@@ -98,7 +98,7 @@
     "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 …",
+    "Sending ..." : "Envoi…",
     "Email sent" : "Courriel envoyé",
     "Warning" : "Attention",
     "The object type is not specified." : "Le type d'objet n'est pas spécifié.",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index b60e8952b71..a0e815d1618 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Uredi oznake",
     "Error loading dialog template: {error}" : "Napaka nalaganja predloge pogovornega okna: {error}",
     "No tags selected for deletion." : "Ni izbranih oznak za izbris.",
-    "_download %n file_::_download %n files_" : ["","","",""],
+    "unknown text" : "neznano besedilo",
+    "Hello world!" : "Pozdravljen svet!",
+    "sunny" : "sončno",
+    "Hello {name}, the weather is {weather}" : "Pozdravljeni, {name}, vreme je {weather}",
+    "_download %n file_::_download %n files_" : ["prejmi %n datoteko","prejmi %n datoteki","prejmi %n datoteke","prejmi %n datotek"],
     "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
     "Please reload the page." : "Stran je treba ponovno naložiti",
     "The update was unsuccessful." : "Posodobitev je spodletela",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index 5636d2794ec..d5a516d4429 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Uredi oznake",
     "Error loading dialog template: {error}" : "Napaka nalaganja predloge pogovornega okna: {error}",
     "No tags selected for deletion." : "Ni izbranih oznak za izbris.",
-    "_download %n file_::_download %n files_" : ["","","",""],
+    "unknown text" : "neznano besedilo",
+    "Hello world!" : "Pozdravljen svet!",
+    "sunny" : "sončno",
+    "Hello {name}, the weather is {weather}" : "Pozdravljeni, {name}, vreme je {weather}",
+    "_download %n file_::_download %n files_" : ["prejmi %n datoteko","prejmi %n datoteki","prejmi %n datoteke","prejmi %n datotek"],
     "Updating {productName} to version {version}, this may take a while." : "Poteka posodabljanje {productName} na različico {version}. Opravilo je lahko dolgotrajno.",
     "Please reload the page." : "Stran je treba ponovno naložiti",
     "The update was unsuccessful." : "Posodobitev je spodletela",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 2c159cabee9..e483524df52 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 0058fd8b6cd..2001914218a 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index c2f1695b7a7..b4e538a1fdf 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 9073425448c..73a36279b11 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 62c55c2dfa8..67ca5d4d85b 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index 4b477c99ed4..bfb87cde450 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 0fef8dc6674..bae97e3d0cf 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 46f67c72640..ba64ef6926f 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 8ee5e36abcd..fbeae9a8c04 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8fc54a6044d..e9cea0a9ad5 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index aba0727604f..bd80762334a 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 3433f0092fe..a8b4d81f61f 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-07 01:54-0500\n"
+"POT-Creation-Date: 2014-11-08 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index a3b39dce1b2..f7c72064019 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Varnostna in nastavitvena opozorila",
     "Cron" : "Periodično opravilo",
     "Sharing" : "Souporaba",
     "Security" : "Varnost",
@@ -113,6 +114,7 @@ OC.L10N.register(
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
+    "Connectivity Checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
     "Last cron was executed at %s." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 7ec03873132..176348a384b 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Varnostna in nastavitvena opozorila",
     "Cron" : "Periodično opravilo",
     "Sharing" : "Souporaba",
     "Security" : "Varnost",
@@ -111,6 +112,7 @@
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
+    "Connectivity Checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
     "Last cron was executed at %s." : "Zadnje periodično opravilo cron je bilo izvedeno ob %s.",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 05aef6f2889..36e47d20c29 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "settings",
     {
-    "Security & Setup Warnings" : "Güvelik & Kurulum Uyarıları",
+    "Security & Setup Warnings" : "Güvelik ve Kurulum Uyarıları",
     "Cron" : "Cron",
     "Sharing" : "Paylaşım",
     "Security" : "Güvenlik",
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install 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.",
     "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
     "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
+    "Connectivity Checks" : "Bağlantı Kontrolleri",
     "No problems found" : "Sorun bulunamadı",
     "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
     "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 7a84edb5ac9..88fa6e0fe90 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Security & Setup Warnings" : "Güvelik & Kurulum Uyarıları",
+    "Security & Setup Warnings" : "Güvelik ve Kurulum Uyarıları",
     "Cron" : "Cron",
     "Sharing" : "Paylaşım",
     "Security" : "Güvenlik",
@@ -118,6 +118,7 @@
     "We strongly suggest to install 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.",
     "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
     "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
+    "Connectivity Checks" : "Bağlantı Kontrolleri",
     "No problems found" : "Sorun bulunamadı",
     "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
     "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
-- 
GitLab


From b0f57d6ef872319c63f0a360e45b04753dc50ec7 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Sat, 8 Nov 2014 14:27:20 +0100
Subject: [PATCH 379/616] Use proper array key

Fixes https://github.com/owncloud/core/issues/12047
---
 core/setup/controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/setup/controller.php b/core/setup/controller.php
index 0722a2b13c3..39272120106 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -147,7 +147,7 @@ class Controller {
 		return array(
 			'hasSQLite' => isset($databases['sqlite']),
 			'hasMySQL' => isset($databases['mysql']),
-			'hasPostgreSQL' => isset($databases['postgre']),
+			'hasPostgreSQL' => isset($databases['pgsql']),
 			'hasOracle' => isset($databases['oci']),
 			'hasMSSQL' => isset($databases['mssql']),
 			'databases' => $databases,
-- 
GitLab


From 46010655d27484cf9938eb4adf51bc1891ba53cd Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 9 Nov 2014 01:54:30 -0500
Subject: [PATCH 380/616] [tx-robot] updated from transifex

---
 apps/files/l10n/sq.js                 | 37 +++++++++++++++++++-
 apps/files/l10n/sq.json               | 37 +++++++++++++++++++-
 apps/files_encryption/l10n/bg_BG.js   |  3 ++
 apps/files_encryption/l10n/bg_BG.json |  3 ++
 apps/files_encryption/l10n/it.js      |  3 ++
 apps/files_encryption/l10n/it.json    |  3 ++
 apps/files_encryption/l10n/nl.js      |  3 ++
 apps/files_encryption/l10n/nl.json    |  3 ++
 apps/files_encryption/l10n/pt_BR.js   |  3 ++
 apps/files_encryption/l10n/pt_BR.json |  3 ++
 apps/files_encryption/l10n/pt_PT.js   |  9 +++--
 apps/files_encryption/l10n/pt_PT.json |  9 +++--
 apps/files_external/l10n/id.js        | 49 +++++++++++++++++++++++----
 apps/files_external/l10n/id.json      | 49 +++++++++++++++++++++++----
 apps/files_sharing/l10n/bg_BG.js      |  4 ++-
 apps/files_sharing/l10n/bg_BG.json    |  4 ++-
 apps/files_sharing/l10n/it.js         |  5 ++-
 apps/files_sharing/l10n/it.json       |  5 ++-
 apps/files_sharing/l10n/pt_PT.js      | 19 ++++++-----
 apps/files_sharing/l10n/pt_PT.json    | 19 ++++++-----
 apps/user_ldap/l10n/bg_BG.js          |  1 +
 apps/user_ldap/l10n/bg_BG.json        |  1 +
 apps/user_ldap/l10n/id.js             | 10 +++++-
 apps/user_ldap/l10n/id.json           | 10 +++++-
 apps/user_webdavauth/l10n/id.js       |  3 +-
 apps/user_webdavauth/l10n/id.json     |  3 +-
 core/l10n/bg_BG.js                    |  6 +++-
 core/l10n/bg_BG.json                  |  6 +++-
 l10n/templates/core.pot               |  2 +-
 l10n/templates/files.pot              |  2 +-
 l10n/templates/files_encryption.pot   |  2 +-
 l10n/templates/files_external.pot     |  2 +-
 l10n/templates/files_sharing.pot      |  2 +-
 l10n/templates/files_trashbin.pot     |  2 +-
 l10n/templates/files_versions.pot     |  2 +-
 l10n/templates/lib.pot                |  2 +-
 l10n/templates/private.pot            |  2 +-
 l10n/templates/settings.pot           | 10 +++---
 l10n/templates/user_ldap.pot          |  2 +-
 l10n/templates/user_webdavauth.pot    |  2 +-
 settings/l10n/bg_BG.js                |  2 ++
 settings/l10n/bg_BG.json              |  2 ++
 settings/l10n/it.js                   |  1 +
 settings/l10n/it.json                 |  1 +
 44 files changed, 284 insertions(+), 64 deletions(-)

diff --git a/apps/files/l10n/sq.js b/apps/files/l10n/sq.js
index 14caaa15140..d85523ba062 100644
--- a/apps/files/l10n/sq.js
+++ b/apps/files/l10n/sq.js
@@ -1,11 +1,24 @@
 OC.L10N.register(
     "files",
     {
+    "Storage not available" : "Hapësira e memorizimit nuk është e disponueshme",
+    "Storage invalid" : "Hapësirë memorizimi e pavlefshme",
     "Unknown error" : "Gabim panjohur",
     "Could not move %s - File with this name already exists" : "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer",
     "Could not move %s" : "Nuk mund të zhvendoset %s",
+    "Permission denied" : "Nuk ka të drejtë",
     "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
+    "\"%s\" is an invalid file name." : "\"%s\" është i pavlefshëm si emër skedari.",
     "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
+    "The target folder has been moved or deleted." : "Dosja e destinacionit është zhvendosur ose fshirë.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Emri %s është i përdorur në dosjen %s. Ju lutem zgjidhni një emër tjetër.",
+    "Not a valid source" : "Burim i pavlefshëm",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serverit nuk i lejohet të hapë URL, ju lutem kontrolloni konfigurimin e serverit",
+    "The file exceeds your quota by %s" : "Ky skedar tejkalon kuotën tuaj me %s",
+    "Error while downloading %s to %s" : "Gabim gjatë shkarkimit të %s në %s",
+    "Error when creating the file" : "Gabim gjatë krijimit të skedarit",
+    "Folder name cannot be empty." : "Emri i dosjes nuk mund të jetë bosh.",
+    "Error when creating the folder" : "Gabim gjatë krijimit të dosjes",
     "Unable to set upload directory." : "E pa mundur të vendoset dosja e ngarkimit",
     "Invalid Token" : "Shenjë e gabuar",
     "No file was uploaded. Unknown error" : "Asnjë skedar nuk u dërgua. Gabim i pa njohur",
@@ -17,38 +30,59 @@ OC.L10N.register(
     "Missing a temporary folder" : "Mungon dosja e përkohshme",
     "Failed to write to disk" : "Dështoi shkrimi në disk",
     "Not enough storage available" : "Hapsira e arkivimit e pamjaftueshme",
+    "Upload failed. Could not find uploaded file" : "Ngarkimi dështoi. Nuk mund të gjendet skedari i ngarkuar",
+    "Upload failed. Could not get file info." : "Ngarkimi dështoi. Nuk mund të gjej informacion mbi skedarin.",
     "Invalid directory." : "Dosje e pavlefshme",
     "Files" : "Skedarë",
+    "All files" : "Të gjithë",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nuk mund të ngarkohet {filename} sepse është dosje ose ka 0 byte",
+    "Total file size {size1} exceeds upload limit {size2}" : "Përmasa totale {size1} e skedarit tejkalon limitin e ngarkimit {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, ju po ngarkoni {size1} por vetëm {size2} është e lirë",
     "Upload cancelled." : "Ngarkimi u anullua",
+    "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
     "URL cannot be empty" : "URL-i nuk mund të jetë bosh",
     "{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",
+    "Error fetching URL" : "Gabim në ngarkimin e URL",
     "Share" : "Ndaj",
     "Delete" : "Fshi",
+    "Disconnect storage" : "Shkëput hapësirën e memorizimit",
     "Unshare" : "Hiq ndarjen",
     "Delete permanently" : "Fshi përfundimisht",
     "Rename" : "Riemëro",
     "Pending" : "Në vijim",
+    "Error moving file." : "Gabim në lëvizjen e skedarëve.",
     "Error moving file" : "Gabim lëvizjen dokumentave",
     "Error" : "Gabim",
+    "Could not rename file" : "Riemërtimi i skedarit nuk është i mundur",
+    "Error deleting file." : "Gabim gjatë fshirjes së skedarit.",
     "Name" : "Emri",
     "Size" : "Madhësia",
     "Modified" : "Ndryshuar",
     "_%n folder_::_%n folders_" : ["%n dosje","%n dosje"],
     "_%n file_::_%n files_" : ["%n skedar","%n skedarë"],
+    "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ë"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" është emër i pavlefshëm.",
     "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}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacioni i Shifrimit është i aktivizuar por çelësat tuaj nuk janë aktivizuar, ju lutem dilni dhe ri-hyni përseri në sistem",
+    "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.",
     "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
     "{dirs} and {files}" : "{dirs} dhe {files}",
+    "%s could not be renamed as it has been deleted" : "%s nuk mund të riemërtohet sepse është fshirë",
     "%s could not be renamed" : "Nuk është i mundur riemërtimi i %s",
+    "Upload (max. %s)" : "Ngarko (maks. %s)",
     "File handling" : "Trajtimi i Skedarëve",
     "Maximum upload size" : "Madhësia maksimale e nagarkimit",
     "max. possible: " : "maks i mundshëm",
     "Save" : "Ruaj",
     "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",
@@ -57,6 +91,7 @@ OC.L10N.register(
     "Download" : "Shkarko",
     "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."
+    "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni.",
+    "Currently scanning" : "Duke skanuar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files/l10n/sq.json b/apps/files/l10n/sq.json
index ec666c96ee4..f15bc950d03 100644
--- a/apps/files/l10n/sq.json
+++ b/apps/files/l10n/sq.json
@@ -1,9 +1,22 @@
 { "translations": {
+    "Storage not available" : "Hapësira e memorizimit nuk është e disponueshme",
+    "Storage invalid" : "Hapësirë memorizimi e pavlefshme",
     "Unknown error" : "Gabim panjohur",
     "Could not move %s - File with this name already exists" : "E pa mundur zhvendosja e %s - ekziston nje skedar me te njetin emer",
     "Could not move %s" : "Nuk mund të zhvendoset %s",
+    "Permission denied" : "Nuk ka të drejtë",
     "File name cannot be empty." : "Emri i skedarit nuk mund të jetë bosh.",
+    "\"%s\" is an invalid file name." : "\"%s\" është i pavlefshëm si emër skedari.",
     "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "Emër jo i vlefshëm, '\\', '/', '<', '>', ':', '\"', '|', '?' dhe '*' nuk lejohen.",
+    "The target folder has been moved or deleted." : "Dosja e destinacionit është zhvendosur ose fshirë.",
+    "The name %s is already used in the folder %s. Please choose a different name." : "Emri %s është i përdorur në dosjen %s. Ju lutem zgjidhni një emër tjetër.",
+    "Not a valid source" : "Burim i pavlefshëm",
+    "Server is not allowed to open URLs, please check the server configuration" : "Serverit nuk i lejohet të hapë URL, ju lutem kontrolloni konfigurimin e serverit",
+    "The file exceeds your quota by %s" : "Ky skedar tejkalon kuotën tuaj me %s",
+    "Error while downloading %s to %s" : "Gabim gjatë shkarkimit të %s në %s",
+    "Error when creating the file" : "Gabim gjatë krijimit të skedarit",
+    "Folder name cannot be empty." : "Emri i dosjes nuk mund të jetë bosh.",
+    "Error when creating the folder" : "Gabim gjatë krijimit të dosjes",
     "Unable to set upload directory." : "E pa mundur të vendoset dosja e ngarkimit",
     "Invalid Token" : "Shenjë e gabuar",
     "No file was uploaded. Unknown error" : "Asnjë skedar nuk u dërgua. Gabim i pa njohur",
@@ -15,38 +28,59 @@
     "Missing a temporary folder" : "Mungon dosja e përkohshme",
     "Failed to write to disk" : "Dështoi shkrimi në disk",
     "Not enough storage available" : "Hapsira e arkivimit e pamjaftueshme",
+    "Upload failed. Could not find uploaded file" : "Ngarkimi dështoi. Nuk mund të gjendet skedari i ngarkuar",
+    "Upload failed. Could not get file info." : "Ngarkimi dështoi. Nuk mund të gjej informacion mbi skedarin.",
     "Invalid directory." : "Dosje e pavlefshme",
     "Files" : "Skedarë",
+    "All files" : "Të gjithë",
+    "Unable to upload {filename} as it is a directory or has 0 bytes" : "Nuk mund të ngarkohet {filename} sepse është dosje ose ka 0 byte",
+    "Total file size {size1} exceeds upload limit {size2}" : "Përmasa totale {size1} e skedarit tejkalon limitin e ngarkimit {size2}",
+    "Not enough free space, you are uploading {size1} but only {size2} is left" : "Nuk ka hapësirë të mjaftueshme, ju po ngarkoni {size1} por vetëm {size2} është e lirë",
     "Upload cancelled." : "Ngarkimi u anullua",
+    "Could not get result from server." : "Nuk mund të merret ndonjë rezultat nga serveri.",
     "File upload is in progress. Leaving the page now will cancel the upload." : "Skedari duke u ngarkuar. Largimi nga faqja do të anullojë ngarkimin",
     "URL cannot be empty" : "URL-i nuk mund të jetë bosh",
     "{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",
+    "Error fetching URL" : "Gabim në ngarkimin e URL",
     "Share" : "Ndaj",
     "Delete" : "Fshi",
+    "Disconnect storage" : "Shkëput hapësirën e memorizimit",
     "Unshare" : "Hiq ndarjen",
     "Delete permanently" : "Fshi përfundimisht",
     "Rename" : "Riemëro",
     "Pending" : "Në vijim",
+    "Error moving file." : "Gabim në lëvizjen e skedarëve.",
     "Error moving file" : "Gabim lëvizjen dokumentave",
     "Error" : "Gabim",
+    "Could not rename file" : "Riemërtimi i skedarit nuk është i mundur",
+    "Error deleting file." : "Gabim gjatë fshirjes së skedarit.",
     "Name" : "Emri",
     "Size" : "Madhësia",
     "Modified" : "Ndryshuar",
     "_%n folder_::_%n folders_" : ["%n dosje","%n dosje"],
     "_%n file_::_%n files_" : ["%n skedar","%n skedarë"],
+    "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ë"],
+    "\"{name}\" is an invalid file name." : "\"{name}\" është emër i pavlefshëm.",
     "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}%)",
+    "Encryption App is enabled but your keys are not initialized, please log-out and log-in again" : "Aplikacioni i Shifrimit është i aktivizuar por çelësat tuaj nuk janë aktivizuar, ju lutem dilni dhe ri-hyni përseri në sistem",
+    "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.",
     "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Kodifikimi u çaktivizua por skedarët tuaj vazhdojnë të jenë të kodifikuar. Ju lutem shkoni tek parametrat personale për të dekodifikuar skedarët tuaj.",
     "{dirs} and {files}" : "{dirs} dhe {files}",
+    "%s could not be renamed as it has been deleted" : "%s nuk mund të riemërtohet sepse është fshirë",
     "%s could not be renamed" : "Nuk është i mundur riemërtimi i %s",
+    "Upload (max. %s)" : "Ngarko (maks. %s)",
     "File handling" : "Trajtimi i Skedarëve",
     "Maximum upload size" : "Madhësia maksimale e nagarkimit",
     "max. possible: " : "maks i mundshëm",
     "Save" : "Ruaj",
     "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",
@@ -55,6 +89,7 @@
     "Download" : "Shkarko",
     "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."
+    "Files are being scanned, please wait." : "Skanerizimi i skedarit në proces. Ju lutem prisni.",
+    "Currently scanning" : "Duke skanuar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_encryption/l10n/bg_BG.js b/apps/files_encryption/l10n/bg_BG.js
index fa5c78bf89d..87ffacc697d 100644
--- a/apps/files_encryption/l10n/bg_BG.js
+++ b/apps/files_encryption/l10n/bg_BG.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
     "Password successfully changed." : "Паролата е успешно променена.",
     "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+    "Could not update the private key password." : "Неуспешна промяна на паролата на личния ключ",
+    "The old password was not correct, please try again." : "Старата парола е грешна, опитай отново.",
+    "The current log-in password was not correct, please try again." : "Грешна парола за вписване, опитай отново.",
     "Private key password successfully updated." : "Успешно променена тайната парола за ключа.",
     "File recovery settings updated" : "Настройките за възстановяване на файлове са променени.",
     "Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.",
diff --git a/apps/files_encryption/l10n/bg_BG.json b/apps/files_encryption/l10n/bg_BG.json
index 5f36bb402df..6e0ac83b494 100644
--- a/apps/files_encryption/l10n/bg_BG.json
+++ b/apps/files_encryption/l10n/bg_BG.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Моля, въведи повторна новата парола за възстановяване",
     "Password successfully changed." : "Паролата е успешно променена.",
     "Could not change the password. Maybe the old password was not correct." : "Грешка при промяна на паролата. Може би старата ти парола е сгрешена.",
+    "Could not update the private key password." : "Неуспешна промяна на паролата на личния ключ",
+    "The old password was not correct, please try again." : "Старата парола е грешна, опитай отново.",
+    "The current log-in password was not correct, please try again." : "Грешна парола за вписване, опитай отново.",
     "Private key password successfully updated." : "Успешно променена тайната парола за ключа.",
     "File recovery settings updated" : "Настройките за възстановяване на файлове са променени.",
     "Could not update file recovery" : "Неуспешна промяна на настройките за възстановяване на файлове.",
diff --git a/apps/files_encryption/l10n/it.js b/apps/files_encryption/l10n/it.js
index b1e61c6804b..d253dae8f68 100644
--- a/apps/files_encryption/l10n/it.js
+++ b/apps/files_encryption/l10n/it.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Ripeti la nuova password di recupero",
     "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.",
+    "Could not update the private key password." : "Impossibile aggiornare la password della chiave privata.",
+    "The old password was not correct, please try again." : "La vecchia password non era corretta, prova di nuovo.",
+    "The current log-in password was not correct, please try again." : "La password di accesso attuale non era corretta, prova ancora.",
     "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
     "File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate",
     "Could not update file recovery" : "Impossibile aggiornare il ripristino dei file",
diff --git a/apps/files_encryption/l10n/it.json b/apps/files_encryption/l10n/it.json
index b9b61b5250c..d5257715faa 100644
--- a/apps/files_encryption/l10n/it.json
+++ b/apps/files_encryption/l10n/it.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Ripeti la nuova password di recupero",
     "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.",
+    "Could not update the private key password." : "Impossibile aggiornare la password della chiave privata.",
+    "The old password was not correct, please try again." : "La vecchia password non era corretta, prova di nuovo.",
+    "The current log-in password was not correct, please try again." : "La password di accesso attuale non era corretta, prova ancora.",
     "Private key password successfully updated." : "Password della chiave privata aggiornata correttamente.",
     "File recovery settings updated" : "Impostazioni di ripristino dei file aggiornate",
     "Could not update file recovery" : "Impossibile aggiornare il ripristino dei file",
diff --git a/apps/files_encryption/l10n/nl.js b/apps/files_encryption/l10n/nl.js
index 8413f01714a..4587f707f0a 100644
--- a/apps/files_encryption/l10n/nl.js
+++ b/apps/files_encryption/l10n/nl.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Herhaal het nieuwe herstelwachtwoord",
     "Password successfully changed." : "Wachtwoord succesvol gewijzigd.",
     "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+    "Could not update the private key password." : "Kon het wachtwoord van de privésleutel niet bijwerken.",
+    "The old password was not correct, please try again." : "Het oude wachtwoord was onjuist, probeer het opnieuw.",
+    "The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.",
     "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
     "File recovery settings updated" : "Bestandsherstel instellingen bijgewerkt",
     "Could not update file recovery" : "Kon bestandsherstel niet bijwerken",
diff --git a/apps/files_encryption/l10n/nl.json b/apps/files_encryption/l10n/nl.json
index 65b7cf771d3..cd456faa614 100644
--- a/apps/files_encryption/l10n/nl.json
+++ b/apps/files_encryption/l10n/nl.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Herhaal het nieuwe herstelwachtwoord",
     "Password successfully changed." : "Wachtwoord succesvol gewijzigd.",
     "Could not change the password. Maybe the old password was not correct." : "Kon wachtwoord niet wijzigen. Wellicht oude wachtwoord niet juist ingevoerd.",
+    "Could not update the private key password." : "Kon het wachtwoord van de privésleutel niet bijwerken.",
+    "The old password was not correct, please try again." : "Het oude wachtwoord was onjuist, probeer het opnieuw.",
+    "The current log-in password was not correct, please try again." : "Het huidige inlogwachtwoord was niet juist, probeer het opnieuw.",
     "Private key password successfully updated." : "Privésleutel succesvol bijgewerkt.",
     "File recovery settings updated" : "Bestandsherstel instellingen bijgewerkt",
     "Could not update file recovery" : "Kon bestandsherstel niet bijwerken",
diff --git a/apps/files_encryption/l10n/pt_BR.js b/apps/files_encryption/l10n/pt_BR.js
index b4b549580e3..bd0c47ce98e 100644
--- a/apps/files_encryption/l10n/pt_BR.js
+++ b/apps/files_encryption/l10n/pt_BR.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Por favor, repita a nova senha de recuperação",
     "Password successfully changed." : "Senha alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+    "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.",
+    "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente novamente.",
+    "The current log-in password was not correct, please try again." : "A senha atual do log-in não estava correta, por favor, tente novamente.",
     "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
     "File recovery settings updated" : "Configurações de recuperação de arquivo atualizado",
     "Could not update file recovery" : "Não foi possível atualizar a recuperação de arquivos",
diff --git a/apps/files_encryption/l10n/pt_BR.json b/apps/files_encryption/l10n/pt_BR.json
index a9d4b147253..aa9404beb68 100644
--- a/apps/files_encryption/l10n/pt_BR.json
+++ b/apps/files_encryption/l10n/pt_BR.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Por favor, repita a nova senha de recuperação",
     "Password successfully changed." : "Senha alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Talvez a senha antiga não estava correta.",
+    "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.",
+    "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente novamente.",
+    "The current log-in password was not correct, please try again." : "A senha atual do log-in não estava correta, por favor, tente novamente.",
     "Private key password successfully updated." : "Senha de chave privada atualizada com sucesso.",
     "File recovery settings updated" : "Configurações de recuperação de arquivo atualizado",
     "Could not update file recovery" : "Não foi possível atualizar a recuperação de arquivos",
diff --git a/apps/files_encryption/l10n/pt_PT.js b/apps/files_encryption/l10n/pt_PT.js
index d4655811cff..3a642a27cc4 100644
--- a/apps/files_encryption/l10n/pt_PT.js
+++ b/apps/files_encryption/l10n/pt_PT.js
@@ -1,9 +1,9 @@
 OC.L10N.register(
     "files_encryption",
     {
-    "Unknown error" : "Erro Desconhecido",
-    "Missing recovery key password" : "Palavra-passe de recuperação em falta",
-    "Please repeat the recovery key password" : "Repita a palavra-passe de recuperação",
+    "Unknown error" : "Erro desconhecido",
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, insira a contrassenha da chave de recuperação",
     "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
     "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso",
     "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação",
     "Password successfully changed." : "Senha alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
+    "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.",
+    "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente de novo.",
+    "The current log-in password was not correct, please try again." : "A senha de iniciar a sessão atual não estava correta, por favor, tente de novo.",
     "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
     "File recovery settings updated" : "As definições da recuperação de ficheiro foram atualizadas",
     "Could not update file recovery" : "Não foi possível atualizar a recuperação de ficheiro",
diff --git a/apps/files_encryption/l10n/pt_PT.json b/apps/files_encryption/l10n/pt_PT.json
index 5ceebbd4e80..f90e10625cc 100644
--- a/apps/files_encryption/l10n/pt_PT.json
+++ b/apps/files_encryption/l10n/pt_PT.json
@@ -1,7 +1,7 @@
 { "translations": {
-    "Unknown error" : "Erro Desconhecido",
-    "Missing recovery key password" : "Palavra-passe de recuperação em falta",
-    "Please repeat the recovery key password" : "Repita a palavra-passe de recuperação",
+    "Unknown error" : "Erro desconhecido",
+    "Missing recovery key password" : "Senha da chave de recuperação em falta",
+    "Please repeat the recovery key password" : "Por favor, insira a contrassenha da chave de recuperação",
     "Repeated recovery key password does not match the provided recovery key password" : "A palavra-passe de recuperação repetida não corresponde à palavra-passe fornecida",
     "Recovery key successfully enabled" : "A chave de recuperação foi ativada com sucesso",
     "Could not disable recovery key. Please check your recovery key password!" : "Não foi possível desativar a chave de recuperação. Por favor, verifique a senha da chave de recuperação.",
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Escreva de novo a nova palavra-passe de recuperação",
     "Password successfully changed." : "Senha alterada com sucesso.",
     "Could not change the password. Maybe the old password was not correct." : "Não foi possível alterar a senha. Possivelmente a senha antiga não está correta.",
+    "Could not update the private key password." : "Não foi possível atualizar a senha da chave privada.",
+    "The old password was not correct, please try again." : "A senha antiga não estava correta, por favor, tente de novo.",
+    "The current log-in password was not correct, please try again." : "A senha de iniciar a sessão atual não estava correta, por favor, tente de novo.",
     "Private key password successfully updated." : "A senha da chave privada foi atualizada com sucesso. ",
     "File recovery settings updated" : "As definições da recuperação de ficheiro foram atualizadas",
     "Could not update file recovery" : "Não foi possível atualizar a recuperação de ficheiro",
diff --git a/apps/files_external/l10n/id.js b/apps/files_external/l10n/id.js
index 4673da66543..8b0f4f28fbc 100644
--- a/apps/files_external/l10n/id.js
+++ b/apps/files_external/l10n/id.js
@@ -1,32 +1,67 @@
 OC.L10N.register(
     "files_external",
     {
-    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Permintaan untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Akses untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
+    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan rahasia aplikasi Dropbox yang benar.",
+    "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
+    "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
     "Local" : "Lokal",
     "Location" : "lokasi",
     "Amazon S3" : "Amazon S3",
-    "Port" : "port",
-    "Region" : "daerah",
+    "Key" : "Kunci",
+    "Secret" : "Rahasia",
+    "Bucket" : "Keranjang",
+    "Amazon S3 and compliant" : "Amazon S3 dan yang sesuai",
+    "Access Key" : "Kunci Akses",
+    "Secret Key" : "Kunci Rahasia",
+    "Hostname" : "Nama Host",
+    "Port" : "Port",
+    "Region" : "Daerah",
     "Enable SSL" : "Aktifkan SSL",
+    "Enable Path Style" : "Aktifkan Gaya Path",
+    "App key" : "Kunci Apl",
+    "App secret" : "Rahasia Apl",
     "Host" : "Host",
     "Username" : "Nama Pengguna",
     "Password" : "Sandi",
     "Root" : "Root",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "ID Klien",
+    "Client secret" : "Rahasia klien",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik",
     "Share" : "Bagikan",
-    "URL" : "tautan",
+    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
+    "Username as share" : "Nama pengguna berbagi",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Subfolder remote",
     "Access granted" : "Akses diberikan",
     "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
     "Grant access" : "Berikan hak akses",
     "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
     "Personal" : "Pribadi",
+    "System" : "Sistem",
+    "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
+    "(group)" : "(grup)",
     "Saved" : "Disimpan",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
     " and " : "dan",
-    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke 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 tanyakan ke administrator sistem Anda untuk menginstalnya.",
-    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
+    "You don't have any external storages" : "Anda tidak memiliki penyimpanan eksternal",
     "Name" : "Nama",
+    "Storage type" : "Tipe penyimpanan",
+    "Scope" : "Skop",
     "External Storage" : "Penyimpanan Eksternal",
     "Folder name" : "Nama folder",
     "Configuration" : "Konfigurasi",
diff --git a/apps/files_external/l10n/id.json b/apps/files_external/l10n/id.json
index 067f79b2a20..8f8179d7627 100644
--- a/apps/files_external/l10n/id.json
+++ b/apps/files_external/l10n/id.json
@@ -1,30 +1,65 @@
 { "translations": {
-    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan sandi aplikasi Dropbox yang benar.",
+    "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "Permintaan untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
+    "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "Akses untuk mengambil token gagal. Pastikan kunci dan rahasia apl Dropbox Anda sudah benar.",
+    "Please provide a valid Dropbox app key and secret." : "Masukkan kunci dan rahasia aplikasi Dropbox yang benar.",
+    "Step 1 failed. Exception: %s" : "Langkah 1 gagal. Kecuali: %s",
+    "Step 2 failed. Exception: %s" : "Langkah 2 gagal. Kecuali: %s",
     "External storage" : "Penyimpanan eksternal",
     "Local" : "Lokal",
     "Location" : "lokasi",
     "Amazon S3" : "Amazon S3",
-    "Port" : "port",
-    "Region" : "daerah",
+    "Key" : "Kunci",
+    "Secret" : "Rahasia",
+    "Bucket" : "Keranjang",
+    "Amazon S3 and compliant" : "Amazon S3 dan yang sesuai",
+    "Access Key" : "Kunci Akses",
+    "Secret Key" : "Kunci Rahasia",
+    "Hostname" : "Nama Host",
+    "Port" : "Port",
+    "Region" : "Daerah",
     "Enable SSL" : "Aktifkan SSL",
+    "Enable Path Style" : "Aktifkan Gaya Path",
+    "App key" : "Kunci Apl",
+    "App secret" : "Rahasia Apl",
     "Host" : "Host",
     "Username" : "Nama Pengguna",
     "Password" : "Sandi",
     "Root" : "Root",
+    "Secure ftps://" : "Secure ftps://",
+    "Client ID" : "ID Klien",
+    "Client secret" : "Rahasia klien",
+    "OpenStack Object Storage" : "OpenStack Object Storage",
+    "Region (optional for OpenStack Object Storage)" : "Daerah (tambahan untuk OpenStack Object Storage)",
+    "API Key (required for Rackspace Cloud Files)" : "Kunci API (diperlukan untuk Rackspace Cloud Files)",
+    "Tenantname (required for OpenStack Object Storage)" : "Tenantname (diperlukan untuk OpenStack Object Storage)",
+    "Password (required for OpenStack Object Storage)" : "Sandi (diperlukan untuk OpenStack Object Storage)",
+    "Service Name (required for OpenStack Object Storage)" : "Nama Layanan (diperlukan untuk OpenStack Object Storage)",
+    "URL of identity endpoint (required for OpenStack Object Storage)" : "URL of identity endpoint (diperlukan untuk OpenStack Object Storage)",
+    "Timeout of HTTP requests in seconds" : "Batas waktu permintaan HTTP dalam detik",
     "Share" : "Bagikan",
-    "URL" : "tautan",
+    "SMB / CIFS using OC login" : "SMB / CIFS menggunakan OC login",
+    "Username as share" : "Nama pengguna berbagi",
+    "URL" : "URL",
+    "Secure https://" : "Secure https://",
+    "Remote subfolder" : "Subfolder remote",
     "Access granted" : "Akses diberikan",
     "Error configuring Dropbox storage" : "Kesalahan dalam mengonfigurasi penyimpanan Dropbox",
     "Grant access" : "Berikan hak akses",
     "Error configuring Google Drive storage" : "Kesalahan dalam mengkonfigurasi penyimpanan Google Drive",
     "Personal" : "Pribadi",
+    "System" : "Sistem",
+    "All users. Type to select user or group." : "Semua pengguna. Ketik untuk memilih pengguna atau grup.",
+    "(group)" : "(grup)",
     "Saved" : "Disimpan",
     "<b>Note:</b> " : "<b>Catatan:</b> ",
     " and " : "dan",
-    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke 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 tanyakan ke administrator sistem Anda untuk menginstalnya.",
-    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan tanyakan ke administrator sistem Anda untuk menginstalnya.",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan cURL di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> Dukungan FTP di PHP tidak diaktifkan atau belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
+    "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Catatan:</b> \"%s\" belum diinstal. Mengaitkan %s tidak dimungkinkan. Silakan minta administrator sistem Anda untuk menginstalnya.",
+    "You don't have any external storages" : "Anda tidak memiliki penyimpanan eksternal",
     "Name" : "Nama",
+    "Storage type" : "Tipe penyimpanan",
+    "Scope" : "Skop",
     "External Storage" : "Penyimpanan Eksternal",
     "Folder name" : "Nama folder",
     "Configuration" : "Konfigurasi",
diff --git a/apps/files_sharing/l10n/bg_BG.js b/apps/files_sharing/l10n/bg_BG.js
index 9a3956d8be7..3b23a76e0f3 100644
--- a/apps/files_sharing/l10n/bg_BG.js
+++ b/apps/files_sharing/l10n/bg_BG.js
@@ -34,6 +34,8 @@ OC.L10N.register(
     "Download" : "Изтегли",
     "Download %s" : "Изтегли %s",
     "Direct link" : "Директна връзка",
-    "Server-to-Server Sharing" : "Споделяне между Сървъри"
+    "Server-to-Server Sharing" : "Споделяне между Сървъри",
+    "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки  с други сървъри",
+    "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/bg_BG.json b/apps/files_sharing/l10n/bg_BG.json
index 54e63eaf0c0..c116c4c69ca 100644
--- a/apps/files_sharing/l10n/bg_BG.json
+++ b/apps/files_sharing/l10n/bg_BG.json
@@ -32,6 +32,8 @@
     "Download" : "Изтегли",
     "Download %s" : "Изтегли %s",
     "Direct link" : "Директна връзка",
-    "Server-to-Server Sharing" : "Споделяне между Сървъри"
+    "Server-to-Server Sharing" : "Споделяне между Сървъри",
+    "Allow users on this server to send shares to other servers" : "Позволи на потребители от този сървър да споделят папки  с други сървъри",
+    "Allow users on this server to receive shares from other servers" : "Позволи на потребители на този сървър да получават споделени папки от други сървъри"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/it.js b/apps/files_sharing/l10n/it.js
index 814e1a35f49..64ee7b18f6f 100644
--- a/apps/files_sharing/l10n/it.js
+++ b/apps/files_sharing/l10n/it.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Aggiungi al tuo ownCloud",
     "Download" : "Scarica",
     "Download %s" : "Scarica %s",
-    "Direct link" : "Collegamento diretto"
+    "Direct link" : "Collegamento diretto",
+    "Server-to-Server Sharing" : "Condivisione server-a-server",
+    "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server",
+    "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/it.json b/apps/files_sharing/l10n/it.json
index 4b070fe12c0..241c24febed 100644
--- a/apps/files_sharing/l10n/it.json
+++ b/apps/files_sharing/l10n/it.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Aggiungi al tuo ownCloud",
     "Download" : "Scarica",
     "Download %s" : "Scarica %s",
-    "Direct link" : "Collegamento diretto"
+    "Direct link" : "Collegamento diretto",
+    "Server-to-Server Sharing" : "Condivisione server-a-server",
+    "Allow users on this server to send shares to other servers" : "Consenti agli utenti su questo server di inviare condivisioni ad altri server",
+    "Allow users on this server to receive shares from other servers" : "Consenti agli utenti su questo server di ricevere condivisioni da altri server"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index b85bd00014c..5f287489876 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -1,10 +1,10 @@
 OC.L10N.register(
     "files_sharing",
     {
-    "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível",
-    "The mountpoint name contains invalid characters." : "O nome de mountpoint contém caracteres inválidos.",
+    "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",
-    "Couldn't add remote share" : "Ocorreu um erro ao adicionar a partilha remota",
+    "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",
@@ -13,11 +13,11 @@ OC.L10N.register(
     "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros por hiperligação.",
     "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" : "Password da partilha remota",
+    "Remote share password" : "Senha da partilha remota",
     "Cancel" : "Cancelar",
     "Add remote share" : "Adicionar partilha remota",
-    "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação em {remote}",
-    "Invalid ownCloud url" : "Endereço errado",
+    "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação ownCloud em {remote}",
+    "Invalid ownCloud url" : "Url ownCloud inválido",
     "Shared by" : "Partilhado por",
     "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.",
@@ -30,9 +30,12 @@ OC.L10N.register(
     "the link expired" : "A hiperligação expirou",
     "sharing is disabled" : "a partilha está desativada",
     "For more info, please ask the person who sent this link." : "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.",
-    "Add to your ownCloud" : "Adicionar á sua ownCloud",
+    "Add to your ownCloud" : "Adicionar à sua ownCloud",
     "Download" : "Transferir",
     "Download %s" : "Transferir %s",
-    "Direct link" : "Hiperligação direta"
+    "Direct link" : "Hiperligação direta",
+    "Server-to-Server Sharing" : "Servidor-para-Servidor de Partilha",
+    "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"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 228d59d2b9c..5a14b7a3a1b 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -1,8 +1,8 @@
 { "translations": {
-    "Server to server sharing is not enabled on this server" : "A partilha entre servidores não se encontra disponível",
-    "The mountpoint name contains invalid characters." : "O nome de mountpoint contém caracteres inválidos.",
+    "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",
-    "Couldn't add remote share" : "Ocorreu um erro ao adicionar a partilha remota",
+    "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",
@@ -11,11 +11,11 @@
     "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros por hiperligação.",
     "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" : "Password da partilha remota",
+    "Remote share password" : "Senha da partilha remota",
     "Cancel" : "Cancelar",
     "Add remote share" : "Adicionar partilha remota",
-    "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação em {remote}",
-    "Invalid ownCloud url" : "Endereço errado",
+    "No ownCloud installation found at {remote}" : "Não foi encontrada uma instalação ownCloud em {remote}",
+    "Invalid ownCloud url" : "Url ownCloud inválido",
     "Shared by" : "Partilhado por",
     "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.",
@@ -28,9 +28,12 @@
     "the link expired" : "A hiperligação expirou",
     "sharing is disabled" : "a partilha está desativada",
     "For more info, please ask the person who sent this link." : "Para mais informação, por favor, pergunte à pessoa que lhe enviou esta hiperligação.",
-    "Add to your ownCloud" : "Adicionar á sua ownCloud",
+    "Add to your ownCloud" : "Adicionar à sua ownCloud",
     "Download" : "Transferir",
     "Download %s" : "Transferir %s",
-    "Direct link" : "Hiperligação direta"
+    "Direct link" : "Hiperligação direta",
+    "Server-to-Server Sharing" : "Servidor-para-Servidor de Partilha",
+    "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"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/bg_BG.js b/apps/user_ldap/l10n/bg_BG.js
index e6f45803985..91e48905138 100644
--- a/apps/user_ldap/l10n/bg_BG.js
+++ b/apps/user_ldap/l10n/bg_BG.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Записване",
     "Back" : "Назад",
     "Continue" : "Продължи",
+    "LDAP" : "LDAP",
     "Expert" : "Експерт",
     "Advanced" : "Допълнителни",
     "<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Може да изпитате неочквано поведение. Моля, поискайте системния администратор да изключи едното приложение.",
diff --git a/apps/user_ldap/l10n/bg_BG.json b/apps/user_ldap/l10n/bg_BG.json
index f29aff72266..19ee8da4b33 100644
--- a/apps/user_ldap/l10n/bg_BG.json
+++ b/apps/user_ldap/l10n/bg_BG.json
@@ -74,6 +74,7 @@
     "Saving" : "Записване",
     "Back" : "Назад",
     "Continue" : "Продължи",
+    "LDAP" : "LDAP",
     "Expert" : "Експерт",
     "Advanced" : "Допълнителни",
     "<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>Предупреждение:</b> Приложенията user_ldap и user_webdavauth са несъвместими. Може да изпитате неочквано поведение. Моля, поискайте системния администратор да изключи едното приложение.",
diff --git a/apps/user_ldap/l10n/id.js b/apps/user_ldap/l10n/id.js
index cf5f37c5efb..26ca061c71a 100644
--- a/apps/user_ldap/l10n/id.js
+++ b/apps/user_ldap/l10n/id.js
@@ -72,6 +72,7 @@ OC.L10N.register(
     "Saving" : "Menyimpan",
     "Back" : "Kembali",
     "Continue" : "Lanjutkan",
+    "LDAP" : "LDAP",
     "Expert" : "Lanjutan",
     "Advanced" : "Lanjutan",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
@@ -87,11 +88,13 @@ OC.L10N.register(
     "in seconds. A change empties the cache." : "dalam detik. perubahan mengosongkan cache",
     "Directory Settings" : "Pengaturan Direktori",
     "User Display Name Field" : "Bidang Tampilan Nama Pengguna",
+    "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP digunakan untuk menghasilkan nama tampilan pengguna.",
     "Base User Tree" : "Pohon Pengguna Dasar",
     "One User Base DN per line" : "Satu Pengguna Base DN per baris",
     "User Search Attributes" : "Atribut Pencarian Pengguna",
     "Optional; one attribute per line" : "Pilihan; satu atribut per baris",
     "Group Display Name Field" : "Bidang Tampilan Nama Grup",
+    "The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP digunakan untuk menghasilkan nama tampilan grup.",
     "Base Group Tree" : "Pohon Grup Dasar",
     "One Group Base DN per line" : "Satu Grup Base DN per baris",
     "Group Search Attributes" : "Atribut Pencarian Grup",
@@ -102,6 +105,11 @@ OC.L10N.register(
     "in bytes" : "dalam bytes",
     "Email Field" : "Bidang Email",
     "User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
+    "Internal Username" : "Nama Pengguna Internal",
+    "Internal Username Attribute:" : "Atribut Nama Pengguna Internal:",
+    "Override UUID detection" : "Timpa deteksi UUID",
+    "UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:",
+    "UUID Attribute for Groups:" : "Atribut UUID untuk Grup:"
 },
 "nplurals=1; plural=0;");
diff --git a/apps/user_ldap/l10n/id.json b/apps/user_ldap/l10n/id.json
index 2395e7f2a55..ad650fc0fb9 100644
--- a/apps/user_ldap/l10n/id.json
+++ b/apps/user_ldap/l10n/id.json
@@ -70,6 +70,7 @@
     "Saving" : "Menyimpan",
     "Back" : "Kembali",
     "Continue" : "Lanjutkan",
+    "LDAP" : "LDAP",
     "Expert" : "Lanjutan",
     "Advanced" : "Lanjutan",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Peringatan:</b> Modul LDAP PHP tidak terpasang, perangkat tidak akan bekerja. Silakan minta administrator sistem untuk memasangnya.",
@@ -85,11 +86,13 @@
     "in seconds. A change empties the cache." : "dalam detik. perubahan mengosongkan cache",
     "Directory Settings" : "Pengaturan Direktori",
     "User Display Name Field" : "Bidang Tampilan Nama Pengguna",
+    "The LDAP attribute to use to generate the user's display name." : "Atribut LDAP digunakan untuk menghasilkan nama tampilan pengguna.",
     "Base User Tree" : "Pohon Pengguna Dasar",
     "One User Base DN per line" : "Satu Pengguna Base DN per baris",
     "User Search Attributes" : "Atribut Pencarian Pengguna",
     "Optional; one attribute per line" : "Pilihan; satu atribut per baris",
     "Group Display Name Field" : "Bidang Tampilan Nama Grup",
+    "The LDAP attribute to use to generate the groups's display name." : "Atribut LDAP digunakan untuk menghasilkan nama tampilan grup.",
     "Base Group Tree" : "Pohon Grup Dasar",
     "One Group Base DN per line" : "Satu Grup Base DN per baris",
     "Group Search Attributes" : "Atribut Pencarian Grup",
@@ -100,6 +103,11 @@
     "in bytes" : "dalam bytes",
     "Email Field" : "Bidang Email",
     "User Home Folder Naming Rule" : "Aturan Penamaan Folder Home Pengguna",
-    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD."
+    "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Biarkan nama pengguna kosong (default). Atau tetapkan atribut LDAP/AD.",
+    "Internal Username" : "Nama Pengguna Internal",
+    "Internal Username Attribute:" : "Atribut Nama Pengguna Internal:",
+    "Override UUID detection" : "Timpa deteksi UUID",
+    "UUID Attribute for Users:" : "Atribut UUID untuk Pengguna:",
+    "UUID Attribute for Groups:" : "Atribut UUID untuk Grup:"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/apps/user_webdavauth/l10n/id.js b/apps/user_webdavauth/l10n/id.js
index a7902dbf3b2..d71da240e27 100644
--- a/apps/user_webdavauth/l10n/id.js
+++ b/apps/user_webdavauth/l10n/id.js
@@ -2,7 +2,8 @@ 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 menafsirkan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
+    "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
index 88638eb47c6..ba327c72dda 100644
--- a/apps/user_webdavauth/l10n/id.json
+++ b/apps/user_webdavauth/l10n/id.json
@@ -1,6 +1,7 @@
 { "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 menafsirkan kode status HTTP 401 dan 403 sebagai kredensial yang tidak valid, dan semua tanggapan lain akan dianggap sebagai kredensial yang valid."
+    "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/core/l10n/bg_BG.js b/core/l10n/bg_BG.js
index fc93aad24da..b69319c2911 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Промяна на етикетите",
     "Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
     "No tags selected for deletion." : "Не са избрани етикети за изтриване.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "непознат текст",
+    "Hello world!" : "Здравей Свят!",
+    "sunny" : "слънчево",
+    "Hello {name}, the weather is {weather}" : "Здравей {name}, времето е {weather}",
+    "_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"],
     "Updating {productName} to version {version}, this may take a while." : "Обновява се {productName} на версия {version}, това може да отнеме време.",
     "Please reload the page." : "Моля, презареди страницата.",
     "The update was unsuccessful." : "Обновяването неуспешно.",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index 7a74dfd6a2c..51b2ba5fc76 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Промяна на етикетите",
     "Error loading dialog template: {error}" : "Грешка при зареждането на шаблоn за диалог: {error}.",
     "No tags selected for deletion." : "Не са избрани етикети за изтриване.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "непознат текст",
+    "Hello world!" : "Здравей Свят!",
+    "sunny" : "слънчево",
+    "Hello {name}, the weather is {weather}" : "Здравей {name}, времето е {weather}",
+    "_download %n file_::_download %n files_" : ["изтегли %n файл","изтегли %n файла"],
     "Updating {productName} to version {version}, this may take a while." : "Обновява се {productName} на версия {version}, това може да отнеме време.",
     "Please reload the page." : "Моля, презареди страницата.",
     "The update was unsuccessful." : "Обновяването неуспешно.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e483524df52..84fba415254 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 2001914218a..0690a8fc9b3 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index b4e538a1fdf..e6b31962a6b 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 73a36279b11..a134912a0aa 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 67ca5d4d85b..5b75f4173d5 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index bfb87cde450..c0e0ed09433 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index bae97e3d0cf..db3a874ea2d 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index ba64ef6926f..f098d854201 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index fbeae9a8c04..5ad3d7c4910 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index e9cea0a9ad5..1ec8e0e0841 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -314,8 +314,8 @@ msgstr ""
 msgid "Restore encryption keys."
 msgstr ""
 
-#: js/settings.js:27 js/users/users.js:49
-#: templates/users/part.createuser.php:12 templates/users/part.userlist.php:10
+#: js/settings.js:27 templates/users/part.createuser.php:12
+#: templates/users/part.userlist.php:10
 msgid "Groups"
 msgstr ""
 
@@ -339,8 +339,8 @@ msgstr ""
 msgid "undo"
 msgstr ""
 
-#: js/users/users.js:53 templates/users/part.userlist.php:41
-#: templates/users/part.userlist.php:57
+#: js/users/users.js:49 js/users/users.js:53
+#: templates/users/part.userlist.php:41 templates/users/part.userlist.php:57
 msgid "no group"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index bd80762334a..b358500fc5a 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index a8b4d81f61f..41e6a9ec21e 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-08 01:54-0500\n"
+"POT-Creation-Date: 2014-11-09 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 435bf0f43ec..338ae1ff45a 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Предупреждения за сигурност и настройки",
     "Cron" : "Крон",
     "Sharing" : "Споделяне",
     "Security" : "Сигурност",
@@ -119,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
     "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
+    "Connectivity Checks" : "Проверки за свързаност",
     "No problems found" : "Не са открити проблеми",
     "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
     "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index 7925a93bebb..273b5449093 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Предупреждения за сигурност и настройки",
     "Cron" : "Крон",
     "Sharing" : "Споделяне",
     "Security" : "Сигурност",
@@ -117,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
     "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
+    "Connectivity Checks" : "Проверки за свързаност",
     "No problems found" : "Не са открити проблеми",
     "Please double check the <a href='%s'>installation guides</a>." : "Моля, провери <a href='%s'>ръководството за инсталиране</a> отново.",
     "Last cron was executed at %s." : "Последният cron се изпълни в %s.",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 713ed4e686f..420e4dfab7b 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install 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\nlocalizzazioni seguenti: %s.",
     "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
+    "Connectivity Checks" : "Controlli di connettività",
     "No problems found" : "Nessun problema trovato",
     "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
     "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 2e88a90b551..fb7638d827d 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install 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\nlocalizzazioni seguenti: %s.",
     "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
+    "Connectivity Checks" : "Controlli di connettività",
     "No problems found" : "Nessun problema trovato",
     "Please double check the <a href='%s'>installation guides</a>." : "Leggi attentamente le <a href='%s'>guide d'installazione</a>.",
     "Last cron was executed at %s." : "L'ultimo cron è stato eseguito alle %s.",
-- 
GitLab


From c3e34326625e4c811a16bc539031c823eed2f5db Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 10 Nov 2014 01:54:30 -0500
Subject: [PATCH 381/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/el.js    | 1 +
 apps/files_encryption/l10n/el.json  | 1 +
 apps/files_encryption/l10n/es.js    | 3 +++
 apps/files_encryption/l10n/es.json  | 3 +++
 apps/files_sharing/l10n/el.js       | 3 ++-
 apps/files_sharing/l10n/el.json     | 3 ++-
 apps/user_ldap/l10n/el.js           | 1 +
 apps/user_ldap/l10n/el.json         | 1 +
 apps/user_ldap/l10n/nl.js           | 4 ++--
 apps/user_ldap/l10n/nl.json         | 4 ++--
 core/l10n/ast.js                    | 1 +
 core/l10n/ast.json                  | 1 +
 core/l10n/el.js                     | 3 ++-
 core/l10n/el.json                   | 3 ++-
 l10n/templates/core.pot             | 2 +-
 l10n/templates/files.pot            | 2 +-
 l10n/templates/files_encryption.pot | 2 +-
 l10n/templates/files_external.pot   | 2 +-
 l10n/templates/files_sharing.pot    | 2 +-
 l10n/templates/files_trashbin.pot   | 2 +-
 l10n/templates/files_versions.pot   | 2 +-
 l10n/templates/lib.pot              | 2 +-
 l10n/templates/private.pot          | 2 +-
 l10n/templates/settings.pot         | 2 +-
 l10n/templates/user_ldap.pot        | 2 +-
 l10n/templates/user_webdavauth.pot  | 2 +-
 lib/l10n/nl.js                      | 2 +-
 lib/l10n/nl.json                    | 2 +-
 settings/l10n/el.js                 | 1 +
 settings/l10n/el.json               | 1 +
 settings/l10n/es.js                 | 1 +
 settings/l10n/es.json               | 1 +
 32 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/apps/files_encryption/l10n/el.js b/apps/files_encryption/l10n/el.js
index 36b30e4bfa5..03a94c2a85e 100644
--- a/apps/files_encryption/l10n/el.js
+++ b/apps/files_encryption/l10n/el.js
@@ -13,6 +13,7 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
     "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
     "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
+    "The old password was not correct, please try again." : "Το παλαιό συνθηματικό δεν είναι σωστό, παρακαλώ δοκιμάστε ξανά.",
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
     "File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
     "Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
diff --git a/apps/files_encryption/l10n/el.json b/apps/files_encryption/l10n/el.json
index 3d3132c62c6..13ed5ab7755 100644
--- a/apps/files_encryption/l10n/el.json
+++ b/apps/files_encryption/l10n/el.json
@@ -11,6 +11,7 @@
     "Please repeat the new recovery password" : "Παρακαλώ επαναλάβετε το νέο κωδικό επαναφοράς",
     "Password successfully changed." : "Ο κωδικός αλλάχτηκε επιτυχώς.",
     "Could not change the password. Maybe the old password was not correct." : "Αποτυχία αλλαγής κωδικού ίσως ο παλιός κωδικός να μην ήταν σωστός.",
+    "The old password was not correct, please try again." : "Το παλαιό συνθηματικό δεν είναι σωστό, παρακαλώ δοκιμάστε ξανά.",
     "Private key password successfully updated." : "Το Προσωπικό κλειδί πρόσβασης ενημερώθηκε επιτυχώς",
     "File recovery settings updated" : "Οι ρυθμίσεις επαναφοράς αρχείων ανανεώθηκαν",
     "Could not update file recovery" : "Αποτυχία ενημέρωσης ανάκτησης αρχείων",
diff --git a/apps/files_encryption/l10n/es.js b/apps/files_encryption/l10n/es.js
index 5d5adb6cc2f..28f52666d45 100644
--- a/apps/files_encryption/l10n/es.js
+++ b/apps/files_encryption/l10n/es.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Por favor repita su nueva contraseña de recuperacion",
     "Password successfully changed." : "Su contraseña ha sido cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Could not update the private key password." : "No se pudo actualizar la contraseña de clave privada.",
+    "The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor intente de nuevo.",
+    "The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcto, por favor intente de nuevo.",
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
     "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
     "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
diff --git a/apps/files_encryption/l10n/es.json b/apps/files_encryption/l10n/es.json
index f0158a82824..8bed1ad1aba 100644
--- a/apps/files_encryption/l10n/es.json
+++ b/apps/files_encryption/l10n/es.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Por favor repita su nueva contraseña de recuperacion",
     "Password successfully changed." : "Su contraseña ha sido cambiada",
     "Could not change the password. Maybe the old password was not correct." : "No se pudo cambiar la contraseña. Compruebe que la contraseña actual sea correcta.",
+    "Could not update the private key password." : "No se pudo actualizar la contraseña de clave privada.",
+    "The old password was not correct, please try again." : "La antigua contraseña no es correcta, por favor intente de nuevo.",
+    "The current log-in password was not correct, please try again." : "La contraseña de inicio de sesión actual no es correcto, por favor intente de nuevo.",
     "Private key password successfully updated." : "Contraseña de clave privada actualizada con éxito.",
     "File recovery settings updated" : "Opciones de recuperación de archivos actualizada",
     "Could not update file recovery" : "No se pudo actualizar la recuperación de archivos",
diff --git a/apps/files_sharing/l10n/el.js b/apps/files_sharing/l10n/el.js
index e80d74b376c..1acfa0240fe 100644
--- a/apps/files_sharing/l10n/el.js
+++ b/apps/files_sharing/l10n/el.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Add to your ownCloud" : "Προσθήκη στο ownCloud σου",
     "Download" : "Λήψη",
     "Download %s" : "Λήψη %s",
-    "Direct link" : "Άμεσος σύνδεσμος"
+    "Direct link" : "Άμεσος σύνδεσμος",
+    "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/el.json b/apps/files_sharing/l10n/el.json
index affe333420f..27152556e10 100644
--- a/apps/files_sharing/l10n/el.json
+++ b/apps/files_sharing/l10n/el.json
@@ -31,6 +31,7 @@
     "Add to your ownCloud" : "Προσθήκη στο ownCloud σου",
     "Download" : "Λήψη",
     "Download %s" : "Λήψη %s",
-    "Direct link" : "Άμεσος σύνδεσμος"
+    "Direct link" : "Άμεσος σύνδεσμος",
+    "Allow users on this server to receive shares from other servers" : "Να επιτρέπεται στους χρίστες του διακομιστή να λαμβάνουν διαμοιρασμένα αρχεία από άλλους διακομιστές"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/el.js b/apps/user_ldap/l10n/el.js
index 8018ea00766..daa557ac2f2 100644
--- a/apps/user_ldap/l10n/el.js
+++ b/apps/user_ldap/l10n/el.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Αποθήκευση",
     "Back" : "Επιστροφή",
     "Continue" : "Συνέχεια",
+    "LDAP" : "LDAP",
     "Expert" : "Ειδικός",
     "Advanced" : "Για προχωρημένους",
     "<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>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.",
diff --git a/apps/user_ldap/l10n/el.json b/apps/user_ldap/l10n/el.json
index bd8b6aa6170..717e2a686b7 100644
--- a/apps/user_ldap/l10n/el.json
+++ b/apps/user_ldap/l10n/el.json
@@ -74,6 +74,7 @@
     "Saving" : "Αποθήκευση",
     "Back" : "Επιστροφή",
     "Continue" : "Συνέχεια",
+    "LDAP" : "LDAP",
     "Expert" : "Ειδικός",
     "Advanced" : "Για προχωρημένους",
     "<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>Προσοχή:</b> Οι εφαρμογές user_ldap και user_webdavauth είναι ασύμβατες. Μπορεί να αντιμετωπίσετε απρόβλεπτη συμπεριφορά. Παρακαλώ ζητήστε από τον διαχειριστή συστήματος να απενεργοποιήσει μία από αυτές.",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index 77646a90a88..e448b161f00 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -95,7 +95,7 @@ OC.L10N.register(
     "Cache Time-To-Live" : "Cache time-to-live",
     "in seconds. A change empties the cache." : "in seconden. Een verandering maakt de cache leeg.",
     "Directory Settings" : "Mapinstellingen",
-    "User Display Name Field" : "Gebruikers Schermnaam Veld",
+    "User Display Name Field" : "Veld gebruikers weergavenaam",
     "The LDAP attribute to use to generate the user's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker.",
     "Base User Tree" : "Basis Gebruikers Structuur",
     "One User Base DN per line" : "Een User Base DN per regel",
@@ -103,7 +103,7 @@ OC.L10N.register(
     "Optional; one attribute per line" : "Optioneel; één attribuut per regel",
     "Group Display Name Field" : "Groep Schermnaam Veld",
     "The LDAP attribute to use to generate the groups's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen.",
-    "Base Group Tree" : "Basis Groupen Structuur",
+    "Base Group Tree" : "Basis groepsstructuur",
     "One Group Base DN per line" : "Een Group Base DN per regel",
     "Group Search Attributes" : "Attributen voor groepszoekopdrachten",
     "Group-Member association" : "Groepslid associatie",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index 6f0a9ec1c01..eb1eecf8201 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -93,7 +93,7 @@
     "Cache Time-To-Live" : "Cache time-to-live",
     "in seconds. A change empties the cache." : "in seconden. Een verandering maakt de cache leeg.",
     "Directory Settings" : "Mapinstellingen",
-    "User Display Name Field" : "Gebruikers Schermnaam Veld",
+    "User Display Name Field" : "Veld gebruikers weergavenaam",
     "The LDAP attribute to use to generate the user's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de gebruiker.",
     "Base User Tree" : "Basis Gebruikers Structuur",
     "One User Base DN per line" : "Een User Base DN per regel",
@@ -101,7 +101,7 @@
     "Optional; one attribute per line" : "Optioneel; één attribuut per regel",
     "Group Display Name Field" : "Groep Schermnaam Veld",
     "The LDAP attribute to use to generate the groups's display name." : "Het te gebruiken LDAP attribuut voor het genereren van de weergavenaam voor de groepen.",
-    "Base Group Tree" : "Basis Groupen Structuur",
+    "Base Group Tree" : "Basis groepsstructuur",
     "One Group Base DN per line" : "Een Group Base DN per regel",
     "Group Search Attributes" : "Attributen voor groepszoekopdrachten",
     "Group-Member association" : "Groepslid associatie",
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index fbb0ba765b0..be95fb45e5c 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Turned off maintenance mode" : "Apagáu'l mou de caltenimientu",
     "Updated database" : "Base de datos anovada",
     "Checked database schema update" : "Anovamientu del esquema de base de datos revisáu",
+    "Checked database schema update for apps" : "Anovamientu del esquema de base de datos p'aplicaciones revisáu",
     "Updated \"%s\" to %s" : "Anováu \"%s\" a %s",
     "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivaes: %s",
     "No image or file provided" : "Nun s'especificó nenguna imaxe o ficheru",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index e255cad1774..42558bd76ef 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -4,6 +4,7 @@
     "Turned off maintenance mode" : "Apagáu'l mou de caltenimientu",
     "Updated database" : "Base de datos anovada",
     "Checked database schema update" : "Anovamientu del esquema de base de datos revisáu",
+    "Checked database schema update for apps" : "Anovamientu del esquema de base de datos p'aplicaciones revisáu",
     "Updated \"%s\" to %s" : "Anováu \"%s\" a %s",
     "Disabled incompatible apps: %s" : "Aplicaciones incompatibles desactivaes: %s",
     "No image or file provided" : "Nun s'especificó nenguna imaxe o ficheru",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index 9d54904faa6..a73750695a3 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -110,7 +110,8 @@ OC.L10N.register(
     "Edit tags" : "Επεξεργασία ετικετών",
     "Error loading dialog template: {error}" : "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
     "No tags selected for deletion." : "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "άγνωστο κείμενο",
+    "_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"],
     "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
     "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
     "The update was unsuccessful." : "Η ενημέρωση δεν ήταν επιτυχής.",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 259ad682028..010d43cc2c8 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -108,7 +108,8 @@
     "Edit tags" : "Επεξεργασία ετικετών",
     "Error loading dialog template: {error}" : "Σφάλμα φόρτωσης προτύπου διαλόγων: {σφάλμα}",
     "No tags selected for deletion." : "Καμμία ετικέτα δεν επιλέχθηκε για διαγραφή.",
-    "_download %n file_::_download %n files_" : ["",""],
+    "unknown text" : "άγνωστο κείμενο",
+    "_download %n file_::_download %n files_" : ["λήψη %n αρχείου","λήψη %n αρχείων"],
     "Updating {productName} to version {version}, this may take a while." : "Ενημέρωση του {productName} στην έκδοση {version}, αυτό μπορεί να διαρκέσει λίγη ώρα.",
     "Please reload the page." : "Παρακαλώ επαναφορτώστε τη σελίδα.",
     "The update was unsuccessful." : "Η ενημέρωση δεν ήταν επιτυχής.",
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 84fba415254..483df6d17d8 100644
--- a/l10n/templates/core.pot
+++ b/l10n/templates/core.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 0690a8fc9b3..446a9eb1bce 100644
--- a/l10n/templates/files.pot
+++ b/l10n/templates/files.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index e6b31962a6b..e5947afab6f 100644
--- a/l10n/templates/files_encryption.pot
+++ b/l10n/templates/files_encryption.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index a134912a0aa..f4adf8823c5 100644
--- a/l10n/templates/files_external.pot
+++ b/l10n/templates/files_external.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 5b75f4173d5..f5b74df2417 100644
--- a/l10n/templates/files_sharing.pot
+++ b/l10n/templates/files_sharing.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
index c0e0ed09433..1d6e718ed0b 100644
--- a/l10n/templates/files_trashbin.pot
+++ b/l10n/templates/files_trashbin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index db3a874ea2d..02483701a33 100644
--- a/l10n/templates/files_versions.pot
+++ b/l10n/templates/files_versions.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index f098d854201..1603fa853fc 100644
--- a/l10n/templates/lib.pot
+++ b/l10n/templates/lib.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
index 5ad3d7c4910..7f2e3301957 100644
--- a/l10n/templates/private.pot
+++ b/l10n/templates/private.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 1ec8e0e0841..a05cc05eff4 100644
--- a/l10n/templates/settings.pot
+++ b/l10n/templates/settings.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index b358500fc5a..736edf74cd4 100644
--- a/l10n/templates/user_ldap.pot
+++ b/l10n/templates/user_ldap.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 41e6a9ec21e..d39f89a98df 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud Core 8.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-09 01:54-0500\n"
+"POT-Creation-Date: 2014-11-10 01:54-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 9ec355862f3..e8b560b730f 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -14,7 +14,7 @@ OC.L10N.register(
     "Admin" : "Beheerder",
     "Recommended" : "Aanbevolen",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.",
-    "No app name specified" : "De app naam is niet gespecificeerd.",
+    "No app name specified" : "Geen app naam opgegeven.",
     "Unknown filetype" : "Onbekend bestandsformaat",
     "Invalid image" : "Ongeldige afbeelding",
     "web services under your control" : "Webdiensten in eigen beheer",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 43c46b25704..887ad23b35d 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -12,7 +12,7 @@
     "Admin" : "Beheerder",
     "Recommended" : "Aanbevolen",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "App \\\"%s\\\" kan niet worden geïnstalleerd omdat de app niet compatible is met deze versie van ownCloud.",
-    "No app name specified" : "De app naam is niet gespecificeerd.",
+    "No app name specified" : "Geen app naam opgegeven.",
     "Unknown filetype" : "Onbekend bestandsformaat",
     "Invalid image" : "Ongeldige afbeelding",
     "web services under your control" : "Webdiensten in eigen beheer",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 77f9c5fda87..621730066b2 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Προειδοποιήσεις ασφάλειας & ρυθμίσεων",
     "Cron" : "Cron",
     "Sharing" : "Διαμοιρασμός",
     "Security" : "Ασφάλεια",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index ffd24abff2d..ba3fe20446a 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Προειδοποιήσεις ασφάλειας & ρυθμίσεων",
     "Cron" : "Cron",
     "Sharing" : "Διαμοιρασμός",
     "Security" : "Ασφάλεια",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 2a0a03a398d..273dfa11f17 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -120,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
+    "Connectivity Checks" : "Probar la Conectividad",
     "No problems found" : "No se han encontrado problemas",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
     "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 892bb7ab0ba..1dc42194bf6 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -118,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
+    "Connectivity Checks" : "Probar la Conectividad",
     "No problems found" : "No se han encontrado problemas",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
     "Last cron was executed at %s." : "Cron fue ejecutado por última vez a las %s.",
-- 
GitLab


From 311566b96df9e5bdbeede7568a715a2a08344816 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Mon, 10 Nov 2014 10:52:47 +0100
Subject: [PATCH 382/616] Login Name -> Username in user management

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

diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index edec7587eb5..20528964f68 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -1,7 +1,7 @@
 <div id="controls">
 	<form id="newuser" autocomplete="off">
 		<input id="newusername" type="text"
-			placeholder="<?php p($l->t('Login Name'))?>"
+			placeholder="<?php p($l->t('Username'))?>"
 			autocomplete="off" autocapitalize="off" autocorrect="off" />
 		<input
 			type="password" id="newuserpassword"
-- 
GitLab


From a9c2e5a08e4a909a94f441c96a3ea000e9420ca3 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 5 Nov 2014 16:47:27 +0100
Subject: [PATCH 383/616] Windows does not support CHMOD, therefor we can not
 test not writable folders

---
 tests/lib/tempmanager.php     | 8 ++++++++
 tests/lib/utilcheckserver.php | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
index f16fbce2c7c..85b94094393 100644
--- a/tests/lib/tempmanager.php
+++ b/tests/lib/tempmanager.php
@@ -122,6 +122,10 @@ class TempManager extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testLogCantCreateFile() {
+		if (\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('[Windows] chmod() does not work as intended on Windows.');
+		}
+
 		$logger = $this->getMock('\Test\NullLogger');
 		$manager = $this->getManager($logger);
 		chmod($this->baseDir, 0500);
@@ -132,6 +136,10 @@ class TempManager extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testLogCantCreateFolder() {
+		if (\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('[Windows] chmod() does not work as intended on Windows.');
+		}
+
 		$logger = $this->getMock('\Test\NullLogger');
 		$manager = $this->getManager($logger);
 		chmod($this->baseDir, 0500);
diff --git a/tests/lib/utilcheckserver.php b/tests/lib/utilcheckserver.php
index be5596c1900..73a1d0e95a6 100644
--- a/tests/lib/utilcheckserver.php
+++ b/tests/lib/utilcheckserver.php
@@ -138,6 +138,10 @@ class Test_Util_CheckServer extends PHPUnit_Framework_TestCase {
 	 * Tests an error is given when the datadir is not writable
 	 */
 	public function testDataDirNotWritable() {
+		if (\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('[Windows] chmod() does not work as intended on Windows.');
+		}
+
 		chmod($this->datadir, 0300);
 		$result = \OC_Util::checkServer($this->getConfig(array(
 			'installed' => true,
-- 
GitLab


From be212ce91e52fec1889ec5a80369af304f5f117a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Nov 2014 11:33:20 +0100
Subject: [PATCH 384/616] Remove *.pot

---
 l10n/.gitignore                     |    1 +
 l10n/templates/core.pot             |  944 ------------------------
 l10n/templates/files.pot            |  423 -----------
 l10n/templates/files_encryption.pot |  235 ------
 l10n/templates/files_external.pot   |  313 --------
 l10n/templates/files_sharing.pot    |  163 -----
 l10n/templates/files_trashbin.pot   |   60 --
 l10n/templates/files_versions.pot   |   43 --
 l10n/templates/lib.pot              |  621 ----------------
 l10n/templates/private.pot          |  582 ---------------
 l10n/templates/settings.pot         | 1048 ---------------------------
 l10n/templates/user_ldap.pot        |  609 ----------------
 l10n/templates/user_webdavauth.pot  |   37 -
 13 files changed, 1 insertion(+), 5078 deletions(-)
 delete mode 100644 l10n/templates/core.pot
 delete mode 100644 l10n/templates/files.pot
 delete mode 100644 l10n/templates/files_encryption.pot
 delete mode 100644 l10n/templates/files_external.pot
 delete mode 100644 l10n/templates/files_sharing.pot
 delete mode 100644 l10n/templates/files_trashbin.pot
 delete mode 100644 l10n/templates/files_versions.pot
 delete mode 100644 l10n/templates/lib.pot
 delete mode 100644 l10n/templates/private.pot
 delete mode 100644 l10n/templates/settings.pot
 delete mode 100644 l10n/templates/user_ldap.pot
 delete mode 100644 l10n/templates/user_webdavauth.pot

diff --git a/l10n/.gitignore b/l10n/.gitignore
index 6d609cec52b..72ab4b0e236 100644
--- a/l10n/.gitignore
+++ b/l10n/.gitignore
@@ -1 +1,2 @@
 *.po
+*.pot
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
deleted file mode 100644
index 483df6d17d8..00000000000
--- a/l10n/templates/core.pot
+++ /dev/null
@@ -1,944 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: ajax/share.php:118 ajax/share.php:160
-#, php-format
-msgid "Couldn't send mail to following users: %s "
-msgstr ""
-
-#: ajax/update.php:14
-msgid "Turned on maintenance mode"
-msgstr ""
-
-#: ajax/update.php:17
-msgid "Turned off maintenance mode"
-msgstr ""
-
-#: ajax/update.php:20
-msgid "Updated database"
-msgstr ""
-
-#: ajax/update.php:23
-msgid "Checked database schema update"
-msgstr ""
-
-#: ajax/update.php:26
-msgid "Checked database schema update for apps"
-msgstr ""
-
-#: ajax/update.php:29
-#, php-format
-msgid "Updated \"%s\" to %s"
-msgstr ""
-
-#: ajax/update.php:37
-#, php-format
-msgid "Disabled incompatible apps: %s"
-msgstr ""
-
-#: avatar/controller.php:70
-msgid "No image or file provided"
-msgstr ""
-
-#: avatar/controller.php:87
-msgid "Unknown filetype"
-msgstr ""
-
-#: avatar/controller.php:91
-msgid "Invalid image"
-msgstr ""
-
-#: avatar/controller.php:121 avatar/controller.php:148
-msgid "No temporary profile picture available, try again"
-msgstr ""
-
-#: avatar/controller.php:141
-msgid "No crop data provided"
-msgstr ""
-
-#: js/config.php:45
-msgid "Sunday"
-msgstr ""
-
-#: js/config.php:46
-msgid "Monday"
-msgstr ""
-
-#: js/config.php:47
-msgid "Tuesday"
-msgstr ""
-
-#: js/config.php:48
-msgid "Wednesday"
-msgstr ""
-
-#: js/config.php:49
-msgid "Thursday"
-msgstr ""
-
-#: js/config.php:50
-msgid "Friday"
-msgstr ""
-
-#: js/config.php:51
-msgid "Saturday"
-msgstr ""
-
-#: js/config.php:56
-msgid "January"
-msgstr ""
-
-#: js/config.php:57
-msgid "February"
-msgstr ""
-
-#: js/config.php:58
-msgid "March"
-msgstr ""
-
-#: js/config.php:59
-msgid "April"
-msgstr ""
-
-#: js/config.php:60
-msgid "May"
-msgstr ""
-
-#: js/config.php:61
-msgid "June"
-msgstr ""
-
-#: js/config.php:62
-msgid "July"
-msgstr ""
-
-#: js/config.php:63
-msgid "August"
-msgstr ""
-
-#: js/config.php:64
-msgid "September"
-msgstr ""
-
-#: js/config.php:65
-msgid "October"
-msgstr ""
-
-#: js/config.php:66
-msgid "November"
-msgstr ""
-
-#: js/config.php:67
-msgid "December"
-msgstr ""
-
-#: js/js.js:384
-msgid "Settings"
-msgstr ""
-
-#: js/js.js:483
-msgid "Saving..."
-msgstr ""
-
-#: js/lostpassword.js:3 lostpassword/controller/lostcontroller.php:198
-msgid "Couldn't send reset email. Please contact your administrator."
-msgstr ""
-
-#: js/lostpassword.js:5
-msgid ""
-"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."
-msgstr ""
-
-#: js/lostpassword.js:7
-msgid ""
-"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?"
-msgstr ""
-
-#: js/lostpassword.js:10
-msgid "I know what I'm doing"
-msgstr ""
-
-#: js/lostpassword.js:13 lostpassword/templates/resetpassword.php:9
-msgid "Reset password"
-msgstr ""
-
-#: js/lostpassword.js:16
-msgid "Password can not be changed. Please contact your administrator."
-msgstr ""
-
-#: js/oc-dialogs.js:108 js/oc-dialogs.js:255
-msgid "No"
-msgstr ""
-
-#: js/oc-dialogs.js:116 js/oc-dialogs.js:264
-msgid "Yes"
-msgstr ""
-
-#: js/oc-dialogs.js:202
-msgid "Choose"
-msgstr ""
-
-#: js/oc-dialogs.js:229
-msgid "Error loading file picker template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:282
-msgid "Ok"
-msgstr ""
-
-#: js/oc-dialogs.js:302
-msgid "Error loading message template: {error}"
-msgstr ""
-
-#: js/oc-dialogs.js:430
-msgid "{count} file conflict"
-msgid_plural "{count} file conflicts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/oc-dialogs.js:444
-msgid "One file conflict"
-msgstr ""
-
-#: js/oc-dialogs.js:450
-msgid "New Files"
-msgstr ""
-
-#: js/oc-dialogs.js:451
-msgid "Already existing files"
-msgstr ""
-
-#: js/oc-dialogs.js:453
-msgid "Which files do you want to keep?"
-msgstr ""
-
-#: js/oc-dialogs.js:454
-msgid ""
-"If you select both versions, the copied file will have a number added to its "
-"name."
-msgstr ""
-
-#: js/oc-dialogs.js:462
-msgid "Cancel"
-msgstr ""
-
-#: js/oc-dialogs.js:472
-msgid "Continue"
-msgstr ""
-
-#: js/oc-dialogs.js:519 js/oc-dialogs.js:532
-msgid "(all selected)"
-msgstr ""
-
-#: js/oc-dialogs.js:522 js/oc-dialogs.js:536
-msgid "({count} selected)"
-msgstr ""
-
-#: js/oc-dialogs.js:544
-msgid "Error loading file exists template"
-msgstr ""
-
-#: js/setup.js:99
-msgid "Very weak password"
-msgstr ""
-
-#: js/setup.js:100
-msgid "Weak password"
-msgstr ""
-
-#: js/setup.js:101
-msgid "So-so password"
-msgstr ""
-
-#: js/setup.js:102
-msgid "Good password"
-msgstr ""
-
-#: js/setup.js:103
-msgid "Strong password"
-msgstr ""
-
-#: js/setupchecks.js:24
-msgid ""
-"Your web server is not yet properly setup to allow files synchronization "
-"because the WebDAV interface seems to be broken."
-msgstr ""
-
-#: js/setupchecks.js:54
-msgid ""
-"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."
-msgstr ""
-
-#: js/setupchecks.js:58
-msgid "Error occurred while checking server setup"
-msgstr ""
-
-#: js/share.js:129 js/share.js:251
-msgid "Shared"
-msgstr ""
-
-#: js/share.js:257
-msgid "Shared with {recipients}"
-msgstr ""
-
-#: js/share.js:266
-msgid "Share"
-msgstr ""
-
-#: js/share.js:326 js/share.js:340 js/share.js:347 js/share.js:1077
-#: templates/installation.php:10
-msgid "Error"
-msgstr ""
-
-#: js/share.js:328 js/share.js:1140
-msgid "Error while sharing"
-msgstr ""
-
-#: js/share.js:340
-msgid "Error while unsharing"
-msgstr ""
-
-#: js/share.js:347
-msgid "Error while changing permissions"
-msgstr ""
-
-#: js/share.js:357
-msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
-
-#: js/share.js:359
-msgid "Shared with you by {owner}"
-msgstr ""
-
-#: js/share.js:383
-msgid "Share with user or group …"
-msgstr ""
-
-#: js/share.js:391
-msgid "Share link"
-msgstr ""
-
-#: js/share.js:396
-msgid ""
-"The public link will expire no later than {days} days after it is created"
-msgstr ""
-
-#: js/share.js:400
-msgid "Password protect"
-msgstr ""
-
-#: js/share.js:402 js/share.js:1028
-msgid "Choose a password for the public link"
-msgstr ""
-
-#: js/share.js:410
-msgid "Allow Public Upload"
-msgstr ""
-
-#: js/share.js:414
-msgid "Email link to person"
-msgstr ""
-
-#: js/share.js:415
-msgid "Send"
-msgstr ""
-
-#: js/share.js:420
-msgid "Set expiration date"
-msgstr ""
-
-#: js/share.js:421
-msgid "Expiration date"
-msgstr ""
-
-#: js/share.js:496
-msgid "Adding user..."
-msgstr ""
-
-#: js/share.js:513 js/share.js:581
-msgid "group"
-msgstr ""
-
-#: js/share.js:546
-msgid "Resharing is not allowed"
-msgstr ""
-
-#: js/share.js:597
-msgid "Shared in {item} with {user}"
-msgstr ""
-
-#: js/share.js:619
-msgid "Unshare"
-msgstr ""
-
-#: js/share.js:627
-msgid "notify by email"
-msgstr ""
-
-#: js/share.js:630
-msgid "can share"
-msgstr ""
-
-#: js/share.js:633
-msgid "can edit"
-msgstr ""
-
-#: js/share.js:635
-msgid "access control"
-msgstr ""
-
-#: js/share.js:638
-msgid "create"
-msgstr ""
-
-#: js/share.js:641
-msgid "update"
-msgstr ""
-
-#: js/share.js:644
-msgid "delete"
-msgstr ""
-
-#: js/share.js:1058
-msgid "Password protected"
-msgstr ""
-
-#: js/share.js:1077
-msgid "Error unsetting expiration date"
-msgstr ""
-
-#: js/share.js:1098
-msgid "Error setting expiration date"
-msgstr ""
-
-#: js/share.js:1127
-msgid "Sending ..."
-msgstr ""
-
-#: js/share.js:1138
-msgid "Email sent"
-msgstr ""
-
-#: js/share.js:1162
-msgid "Warning"
-msgstr ""
-
-#: js/tags.js:8
-msgid "The object type is not specified."
-msgstr ""
-
-#: js/tags.js:19
-msgid "Enter new"
-msgstr ""
-
-#: js/tags.js:33
-msgid "Delete"
-msgstr ""
-
-#: js/tags.js:43
-msgid "Add"
-msgstr ""
-
-#: js/tags.js:57
-msgid "Edit tags"
-msgstr ""
-
-#: js/tags.js:75
-msgid "Error loading dialog template: {error}"
-msgstr ""
-
-#: js/tags.js:288
-msgid "No tags selected for deletion."
-msgstr ""
-
-#: js/tests/specs/l10nSpec.js:28 js/tests/specs/l10nSpec.js:31
-msgid "unknown text"
-msgstr ""
-
-#: js/tests/specs/l10nSpec.js:34
-msgid "Hello world!"
-msgstr ""
-
-#: js/tests/specs/l10nSpec.js:38
-msgid "sunny"
-msgstr ""
-
-#: js/tests/specs/l10nSpec.js:38
-msgid "Hello {name}, the weather is {weather}"
-msgstr ""
-
-#: js/tests/specs/l10nSpec.js:45 js/tests/specs/l10nSpec.js:48
-#: js/tests/specs/l10nSpec.js:51 js/tests/specs/l10nSpec.js:54
-#: js/tests/specs/l10nSpec.js:62 js/tests/specs/l10nSpec.js:65
-#: js/tests/specs/l10nSpec.js:68 js/tests/specs/l10nSpec.js:71
-msgid "download %n file"
-msgid_plural "download %n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/update.js:30
-msgid "Updating {productName} to version {version}, this may take a while."
-msgstr ""
-
-#: js/update.js:43
-msgid "Please reload the page."
-msgstr ""
-
-#: js/update.js:52
-msgid "The update was unsuccessful."
-msgstr ""
-
-#: js/update.js:61
-msgid "The update was successful. Redirecting you to ownCloud now."
-msgstr ""
-
-#: lostpassword/controller/lostcontroller.php:133
-msgid "Couldn't reset password because the token is invalid"
-msgstr ""
-
-#: lostpassword/controller/lostcontroller.php:159
-msgid "Couldn't send reset email. Please make sure your username is correct."
-msgstr ""
-
-#: lostpassword/controller/lostcontroller.php:174
-msgid ""
-"Couldn't send reset email because there is no email address for this "
-"username. Please contact your administrator."
-msgstr ""
-
-#: lostpassword/controller/lostcontroller.php:191
-#, php-format
-msgid "%s password reset"
-msgstr ""
-
-#: lostpassword/templates/email.php:2
-msgid "Use the following link to reset your password: {link}"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:6
-msgid "You will receive a link to reset your password via Email."
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:8
-#: lostpassword/templates/lostpassword.php:9 templates/installation.php:44
-#: templates/installation.php:47 templates/login.php:24 templates/login.php:28
-msgid "Username"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:13
-msgid ""
-"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?"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:15
-msgid "Yes, I really want to reset my password now"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:18
-msgid "Reset"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:5
-msgid "New password"
-msgstr ""
-
-#: lostpassword/templates/resetpassword.php:6
-msgid "New Password"
-msgstr ""
-
-#: setup/controller.php:139
-#, php-format
-msgid ""
-"Mac OS X is not supported and %s will not work properly on this platform. "
-"Use it at your own risk! "
-msgstr ""
-
-#: setup/controller.php:143
-msgid "For the best results, please consider using a GNU/Linux server instead."
-msgstr ""
-
-#: strings.php:5
-msgid "Personal"
-msgstr ""
-
-#: strings.php:6
-msgid "Users"
-msgstr ""
-
-#: strings.php:7 templates/layout.user.php:50 templates/layout.user.php:123
-msgid "Apps"
-msgstr ""
-
-#: strings.php:8
-msgid "Admin"
-msgstr ""
-
-#: strings.php:9
-msgid "Help"
-msgstr ""
-
-#: tags/controller.php:22
-msgid "Error loading tags"
-msgstr ""
-
-#: tags/controller.php:48
-msgid "Tag already exists"
-msgstr ""
-
-#: tags/controller.php:64
-msgid "Error deleting tag(s)"
-msgstr ""
-
-#: tags/controller.php:75
-msgid "Error tagging"
-msgstr ""
-
-#: tags/controller.php:86
-msgid "Error untagging"
-msgstr ""
-
-#: tags/controller.php:97
-msgid "Error favoriting"
-msgstr ""
-
-#: tags/controller.php:108
-msgid "Error unfavoriting"
-msgstr ""
-
-#: templates/403.php:12
-msgid "Access forbidden"
-msgstr ""
-
-#: templates/404.php:17
-msgid "File not found"
-msgstr ""
-
-#: templates/404.php:18
-msgid "The specified document has not been found on the server."
-msgstr ""
-
-#: templates/404.php:19
-#, php-format
-msgid "You can click here to return to %s."
-msgstr ""
-
-#: templates/altmail.php:2
-#, php-format
-msgid ""
-"Hey there,\n"
-"\n"
-"just letting you know that %s shared %s with you.\n"
-"View it: %s\n"
-"\n"
-msgstr ""
-
-#: templates/altmail.php:4 templates/mail.php:17
-#, php-format
-msgid "The share will expire on %s."
-msgstr ""
-
-#. TRANSLATORS term at the end of a mail
-#: templates/altmail.php:8 templates/mail.php:21
-msgid "Cheers!"
-msgstr ""
-
-#: templates/exception.php:6
-msgid "Internal Server Error"
-msgstr ""
-
-#: templates/exception.php:7
-msgid ""
-"The server encountered an internal error and was unable to complete your "
-"request."
-msgstr ""
-
-#: templates/exception.php:8
-msgid ""
-"Please contact the server administrator if this error reappears multiple "
-"times, please include the technical details below in your report."
-msgstr ""
-
-#: templates/exception.php:9
-msgid "More details can be found in the server log."
-msgstr ""
-
-#: templates/exception.php:12
-msgid "Technical details"
-msgstr ""
-
-#: templates/exception.php:14
-#, php-format
-msgid "Remote Address: %s"
-msgstr ""
-
-#: templates/exception.php:15
-#, php-format
-msgid "Request ID: %s"
-msgstr ""
-
-#: templates/exception.php:17
-#, php-format
-msgid "Code: %s"
-msgstr ""
-
-#: templates/exception.php:18
-#, php-format
-msgid "Message: %s"
-msgstr ""
-
-#: templates/exception.php:19
-#, php-format
-msgid "File: %s"
-msgstr ""
-
-#: templates/exception.php:20
-#, php-format
-msgid "Line: %s"
-msgstr ""
-
-#: templates/exception.php:26
-msgid "Trace"
-msgstr ""
-
-#: templates/installation.php:25 templates/installation.php:32
-msgid "Security Warning"
-msgstr ""
-
-#: templates/installation.php:26
-msgid "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)"
-msgstr ""
-
-#: templates/installation.php:27
-#, php-format
-msgid "Please update your PHP installation to use %s securely."
-msgstr ""
-
-#: templates/installation.php:33
-msgid ""
-"Your data directory and files are probably accessible from the internet "
-"because the .htaccess file does not work."
-msgstr ""
-
-#: templates/installation.php:35
-#, php-format
-msgid ""
-"For information how to properly configure your server, please see the <a "
-"href=\"%s\" target=\"_blank\">documentation</a>."
-msgstr ""
-
-#: templates/installation.php:41
-msgid "Create an <strong>admin account</strong>"
-msgstr ""
-
-#: templates/installation.php:52 templates/installation.php:55
-#: templates/login.php:34 templates/login.php:37
-msgid "Password"
-msgstr ""
-
-#: templates/installation.php:65
-msgid "Storage & database"
-msgstr ""
-
-#: templates/installation.php:72
-msgid "Data folder"
-msgstr ""
-
-#: templates/installation.php:85
-msgid "Configure the database"
-msgstr ""
-
-#: templates/installation.php:89
-#, php-format
-msgid "Only %s is available."
-msgstr ""
-
-#: templates/installation.php:104 templates/installation.php:106
-msgid "Database user"
-msgstr ""
-
-#: templates/installation.php:112 templates/installation.php:115
-msgid "Database password"
-msgstr ""
-
-#: templates/installation.php:120 templates/installation.php:122
-msgid "Database name"
-msgstr ""
-
-#: templates/installation.php:130 templates/installation.php:132
-msgid "Database tablespace"
-msgstr ""
-
-#: templates/installation.php:139 templates/installation.php:141
-msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:151
-msgid ""
-"SQLite will be used as database. For larger installations we recommend to "
-"change this."
-msgstr ""
-
-#: templates/installation.php:154
-msgid "Finish setup"
-msgstr ""
-
-#: templates/installation.php:154
-msgid "Finishing …"
-msgstr ""
-
-#: templates/layout.base.php:27 templates/layout.guest.php:28
-#: templates/layout.user.php:35
-msgid ""
-"This application requires JavaScript for correct operation. Please <a href="
-"\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> "
-"and reload the page."
-msgstr ""
-
-#: templates/layout.user.php:39
-#, php-format
-msgid "%s is available. Get more information on how to update."
-msgstr ""
-
-#: templates/layout.user.php:85 templates/singleuser.user.php:8
-msgid "Log out"
-msgstr ""
-
-#: templates/login.php:12
-msgid "Server side authentication failed!"
-msgstr ""
-
-#: templates/login.php:13
-msgid "Please contact your administrator."
-msgstr ""
-
-#: templates/login.php:43
-msgid "Forgot your password? Reset it!"
-msgstr ""
-
-#: templates/login.php:48
-msgid "remember"
-msgstr ""
-
-#: templates/login.php:53
-msgid "Log in"
-msgstr ""
-
-#: templates/login.php:59
-msgid "Alternative Logins"
-msgstr ""
-
-#: templates/mail.php:15
-#, php-format
-msgid ""
-"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>"
-msgstr ""
-
-#: templates/singleuser.user.php:3
-msgid "This ownCloud instance is currently in single user mode."
-msgstr ""
-
-#: templates/singleuser.user.php:4
-msgid "This means only administrators can use the instance."
-msgstr ""
-
-#: templates/singleuser.user.php:5 templates/update.user.php:5
-msgid ""
-"Contact your system administrator if this message persists or appeared "
-"unexpectedly."
-msgstr ""
-
-#: templates/singleuser.user.php:7 templates/update.user.php:6
-msgid "Thank you for your patience."
-msgstr ""
-
-#: templates/untrustedDomain.php:5
-msgid "You are accessing the server from an untrusted domain."
-msgstr ""
-
-#: templates/untrustedDomain.php:8
-msgid ""
-"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."
-msgstr ""
-
-#: templates/untrustedDomain.php:10
-msgid ""
-"Depending on your configuration, as an administrator you might also be able "
-"to use the button below to trust this domain."
-msgstr ""
-
-#: templates/untrustedDomain.php:14
-#, php-format
-msgid "Add \"%s\" as trusted domain"
-msgstr ""
-
-#: templates/update.admin.php:3
-#, php-format
-msgid "%s will be updated to version %s."
-msgstr ""
-
-#: templates/update.admin.php:7
-msgid "The following apps will be disabled:"
-msgstr ""
-
-#: templates/update.admin.php:17
-#, php-format
-msgid "The theme %s has been disabled."
-msgstr ""
-
-#: templates/update.admin.php:21
-msgid ""
-"Please make sure that the database, the config folder and the data folder "
-"have been backed up before proceeding."
-msgstr ""
-
-#: templates/update.admin.php:23
-msgid "Start update"
-msgstr ""
-
-#: templates/update.admin.php:25
-msgid ""
-"To avoid timeouts with larger installations, you can instead run the "
-"following command from your installation directory:"
-msgstr ""
-
-#: templates/update.user.php:3
-#, php-format
-msgid "This %s instance is currently being updated, which may take a while."
-msgstr ""
-
-#: templates/update.user.php:4
-#, php-format
-msgid "This page will refresh itself when the %s instance is available again."
-msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
deleted file mode 100644
index 446a9eb1bce..00000000000
--- a/l10n/templates/files.pot
+++ /dev/null
@@ -1,423 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: ajax/list.php:39
-msgid "Storage not available"
-msgstr ""
-
-#: ajax/list.php:47
-msgid "Storage invalid"
-msgstr ""
-
-#: ajax/list.php:55
-msgid "Unknown error"
-msgstr ""
-
-#: ajax/move.php:15
-#, php-format
-msgid "Could not move %s - File with this name already exists"
-msgstr ""
-
-#: ajax/move.php:26 ajax/move.php:34
-#, php-format
-msgid "Could not move %s"
-msgstr ""
-
-#: ajax/move.php:29
-msgid "Permission denied"
-msgstr ""
-
-#: ajax/newfile.php:59 js/files.js:103
-msgid "File name cannot be empty."
-msgstr ""
-
-#: ajax/newfile.php:64
-#, php-format
-msgid "\"%s\" is an invalid file name."
-msgstr ""
-
-#: ajax/newfile.php:70 ajax/newfolder.php:28 js/files.js:110
-msgid ""
-"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
-"allowed."
-msgstr ""
-
-#: ajax/newfile.php:77 ajax/newfolder.php:35 ajax/upload.php:161
-#: lib/app.php:87
-msgid "The target folder has been moved or deleted."
-msgstr ""
-
-#: ajax/newfile.php:89 ajax/newfolder.php:47 lib/app.php:96
-#, php-format
-msgid ""
-"The name %s is already used in the folder %s. Please choose a different name."
-msgstr ""
-
-#: ajax/newfile.php:99
-msgid "Not a valid source"
-msgstr ""
-
-#: ajax/newfile.php:104
-msgid ""
-"Server is not allowed to open URLs, please check the server configuration"
-msgstr ""
-
-#: ajax/newfile.php:131
-#, php-format
-msgid "The file exceeds your quota by %s"
-msgstr ""
-
-#: ajax/newfile.php:146
-#, php-format
-msgid "Error while downloading %s to %s"
-msgstr ""
-
-#: ajax/newfile.php:174
-msgid "Error when creating the file"
-msgstr ""
-
-#: ajax/newfolder.php:22
-msgid "Folder name cannot be empty."
-msgstr ""
-
-#: ajax/newfolder.php:66
-msgid "Error when creating the folder"
-msgstr ""
-
-#: ajax/upload.php:19 ajax/upload.php:59
-msgid "Unable to set upload directory."
-msgstr ""
-
-#: ajax/upload.php:35
-msgid "Invalid Token"
-msgstr ""
-
-#: ajax/upload.php:79
-msgid "No file was uploaded. Unknown error"
-msgstr ""
-
-#: ajax/upload.php:86
-msgid "There is no error, the file uploaded with success"
-msgstr ""
-
-#: ajax/upload.php:87
-msgid ""
-"The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
-
-#: ajax/upload.php:89
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr ""
-
-#: ajax/upload.php:90
-msgid "The uploaded file was only partially uploaded"
-msgstr ""
-
-#: ajax/upload.php:91
-msgid "No file was uploaded"
-msgstr ""
-
-#: ajax/upload.php:92
-msgid "Missing a temporary folder"
-msgstr ""
-
-#: ajax/upload.php:93
-msgid "Failed to write to disk"
-msgstr ""
-
-#: ajax/upload.php:113
-msgid "Not enough storage available"
-msgstr ""
-
-#: ajax/upload.php:175
-msgid "Upload failed. Could not find uploaded file"
-msgstr ""
-
-#: ajax/upload.php:185
-msgid "Upload failed. Could not get file info."
-msgstr ""
-
-#: ajax/upload.php:200
-msgid "Invalid directory."
-msgstr ""
-
-#: appinfo/app.php:11 js/filelist.js:25
-msgid "Files"
-msgstr ""
-
-#: appinfo/app.php:27
-msgid "All files"
-msgstr ""
-
-#: js/file-upload.js:269
-msgid "Unable to upload {filename} as it is a directory or has 0 bytes"
-msgstr ""
-
-#: js/file-upload.js:284
-msgid "Total file size {size1} exceeds upload limit {size2}"
-msgstr ""
-
-#: js/file-upload.js:295
-msgid ""
-"Not enough free space, you are uploading {size1} but only {size2} is left"
-msgstr ""
-
-#: js/file-upload.js:372
-msgid "Upload cancelled."
-msgstr ""
-
-#: js/file-upload.js:418
-msgid "Could not get result from server."
-msgstr ""
-
-#: js/file-upload.js:510
-msgid ""
-"File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
-
-#: js/file-upload.js:575
-msgid "URL cannot be empty"
-msgstr ""
-
-#: js/file-upload.js:579 js/filelist.js:1310
-msgid "{new_name} already exists"
-msgstr ""
-
-#: js/file-upload.js:634
-msgid "Could not create file"
-msgstr ""
-
-#: js/file-upload.js:650
-msgid "Could not create folder"
-msgstr ""
-
-#: js/file-upload.js:697
-msgid "Error fetching URL"
-msgstr ""
-
-#: js/fileactions.js:285
-msgid "Share"
-msgstr ""
-
-#: js/fileactions.js:295 templates/list.php:77 templates/list.php:78
-msgid "Delete"
-msgstr ""
-
-#: js/fileactions.js:297
-msgid "Disconnect storage"
-msgstr ""
-
-#: js/fileactions.js:299
-msgid "Unshare"
-msgstr ""
-
-#: js/fileactions.js:301
-msgid "Delete permanently"
-msgstr ""
-
-#: js/fileactions.js:342
-msgid "Rename"
-msgstr ""
-
-#: js/filelist.js:700 js/filelist.js:1856
-msgid "Pending"
-msgstr ""
-
-#: js/filelist.js:1261
-msgid "Error moving file."
-msgstr ""
-
-#: js/filelist.js:1269
-msgid "Error moving file"
-msgstr ""
-
-#: js/filelist.js:1269
-msgid "Error"
-msgstr ""
-
-#: js/filelist.js:1358
-msgid "Could not rename file"
-msgstr ""
-
-#: js/filelist.js:1480
-msgid "Error deleting file."
-msgstr ""
-
-#: js/filelist.js:1582 templates/list.php:61
-msgid "Name"
-msgstr ""
-
-#: js/filelist.js:1583 templates/list.php:72
-msgid "Size"
-msgstr ""
-
-#: js/filelist.js:1584 templates/list.php:75
-msgid "Modified"
-msgstr ""
-
-#: js/filelist.js:1594 js/filesummary.js:141 js/filesummary.js:168
-msgid "%n folder"
-msgid_plural "%n folders"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/filelist.js:1600 js/filesummary.js:142 js/filesummary.js:169
-msgid "%n file"
-msgid_plural "%n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/filelist.js:1657 templates/list.php:47
-msgid "You don’t have permission to upload or create files here"
-msgstr ""
-
-#: js/filelist.js:1749 js/filelist.js:1788
-msgid "Uploading %n file"
-msgid_plural "Uploading %n files"
-msgstr[0] ""
-msgstr[1] ""
-
-#: js/files.js:101
-msgid "\"{name}\" is an invalid file name."
-msgstr ""
-
-#: js/files.js:122
-msgid "Your storage is full, files can not be updated or synced anymore!"
-msgstr ""
-
-#: js/files.js:126
-msgid "Your storage is almost full ({usedSpacePercent}%)"
-msgstr ""
-
-#: js/files.js:140
-msgid ""
-"Encryption App is enabled but your keys are not initialized, please log-out "
-"and log-in again"
-msgstr ""
-
-#: js/files.js:144
-msgid ""
-"Invalid private key for Encryption App. Please update your private key "
-"password in your personal settings to recover access to your encrypted files."
-msgstr ""
-
-#: js/files.js:148
-msgid ""
-"Encryption was disabled but your files are still encrypted. Please go to "
-"your personal settings to decrypt your files."
-msgstr ""
-
-#: js/filesummary.js:182
-msgid "{dirs} and {files}"
-msgstr ""
-
-#: lib/app.php:80
-#, php-format
-msgid "%s could not be renamed as it has been deleted"
-msgstr ""
-
-#: lib/app.php:113
-#, php-format
-msgid "%s could not be renamed"
-msgstr ""
-
-#: lib/helper.php:25 templates/list.php:25
-#, php-format
-msgid "Upload (max. %s)"
-msgstr ""
-
-#: templates/admin.php:6
-msgid "File handling"
-msgstr ""
-
-#: templates/admin.php:7
-msgid "Maximum upload size"
-msgstr ""
-
-#: templates/admin.php:10
-msgid "max. possible: "
-msgstr ""
-
-#: templates/admin.php:15
-msgid "Save"
-msgstr ""
-
-#: templates/appnavigation.php:12
-msgid "WebDAV"
-msgstr ""
-
-#: templates/appnavigation.php:14
-#, php-format
-msgid ""
-"Use this address to <a href=\"%s\" target=\"_blank\">access your Files via "
-"WebDAV</a>"
-msgstr ""
-
-#: templates/list.php:5
-msgid "New"
-msgstr ""
-
-#: templates/list.php:8
-msgid "New text file"
-msgstr ""
-
-#: templates/list.php:9
-msgid "Text file"
-msgstr ""
-
-#: templates/list.php:12
-msgid "New folder"
-msgstr ""
-
-#: templates/list.php:13
-msgid "Folder"
-msgstr ""
-
-#: templates/list.php:16
-msgid "From link"
-msgstr ""
-
-#: templates/list.php:52
-msgid "Nothing in here. Upload something!"
-msgstr ""
-
-#: templates/list.php:66
-msgid "Download"
-msgstr ""
-
-#: templates/list.php:91
-msgid "Upload too large"
-msgstr ""
-
-#: templates/list.php:93
-msgid ""
-"The files you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-#: templates/list.php:98
-msgid "Files are being scanned, please wait."
-msgstr ""
-
-#: templates/list.php:101
-msgid "Currently scanning"
-msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
deleted file mode 100644
index e5947afab6f..00000000000
--- a/l10n/templates/files_encryption.pot
+++ /dev/null
@@ -1,235 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ajax/adminrecovery.php:19
-msgid "Unknown error"
-msgstr ""
-
-#: ajax/adminrecovery.php:23
-msgid "Missing recovery key password"
-msgstr ""
-
-#: ajax/adminrecovery.php:29
-msgid "Please repeat the recovery key password"
-msgstr ""
-
-#: ajax/adminrecovery.php:35 ajax/changeRecoveryPassword.php:46
-msgid ""
-"Repeated recovery key password does not match the provided recovery key "
-"password"
-msgstr ""
-
-#: ajax/adminrecovery.php:49
-msgid "Recovery key successfully enabled"
-msgstr ""
-
-#: ajax/adminrecovery.php:51 ajax/adminrecovery.php:64
-msgid ""
-"Could not disable recovery key. Please check your recovery key password!"
-msgstr ""
-
-#: ajax/adminrecovery.php:62
-msgid "Recovery key successfully disabled"
-msgstr ""
-
-#: ajax/changeRecoveryPassword.php:28
-msgid "Please provide the old recovery password"
-msgstr ""
-
-#: ajax/changeRecoveryPassword.php:34
-msgid "Please provide a new recovery password"
-msgstr ""
-
-#: ajax/changeRecoveryPassword.php:40
-msgid "Please repeat the new recovery password"
-msgstr ""
-
-#: ajax/changeRecoveryPassword.php:76
-msgid "Password successfully changed."
-msgstr ""
-
-#: ajax/changeRecoveryPassword.php:78
-msgid "Could not change the password. Maybe the old password was not correct."
-msgstr ""
-
-#: ajax/updatePrivateKeyPassword.php:21
-msgid "Could not update the private key password."
-msgstr ""
-
-#: ajax/updatePrivateKeyPassword.php:53
-msgid "The old password was not correct, please try again."
-msgstr ""
-
-#: ajax/updatePrivateKeyPassword.php:60
-msgid "The current log-in password was not correct, please try again."
-msgstr ""
-
-#: ajax/updatePrivateKeyPassword.php:66
-msgid "Private key password successfully updated."
-msgstr ""
-
-#: ajax/userrecovery.php:44
-msgid "File recovery settings updated"
-msgstr ""
-
-#: ajax/userrecovery.php:46
-msgid "Could not update file recovery"
-msgstr ""
-
-#: files/error.php:16
-msgid ""
-"Encryption app not initialized! Maybe the encryption app was re-enabled "
-"during your session. Please try to log out and log back in to initialize the "
-"encryption app."
-msgstr ""
-
-#: files/error.php:20
-#, php-format
-msgid ""
-"Your private key is not valid! Likely your password was changed outside of "
-"%s (e.g. your corporate directory). You can update your private key password "
-"in your personal settings to recover access to your encrypted files."
-msgstr ""
-
-#: files/error.php:23
-msgid ""
-"Can not decrypt this file, probably this is a shared file. Please ask the "
-"file owner to reshare the file with you."
-msgstr ""
-
-#: files/error.php:26 files/error.php:31
-msgid ""
-"Unknown error. Please check your system settings or contact your "
-"administrator"
-msgstr ""
-
-#: hooks/hooks.php:66
-msgid "Missing requirements."
-msgstr ""
-
-#: hooks/hooks.php:67
-msgid ""
-"Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL "
-"together with the PHP extension is enabled and configured properly. For now, "
-"the encryption app has been disabled."
-msgstr ""
-
-#: hooks/hooks.php:300
-msgid "Following users are not set up for encryption:"
-msgstr ""
-
-#: js/detect-migration.js:21
-msgid "Initial encryption started... This can take some time. Please wait."
-msgstr ""
-
-#: js/detect-migration.js:25
-msgid "Initial encryption running... Please try again later."
-msgstr ""
-
-#: templates/invalid_private_key.php:8
-#, php-format
-msgid "Go directly to your %spersonal settings%s."
-msgstr ""
-
-#: templates/settings-admin.php:2 templates/settings-personal.php:2
-msgid "Encryption"
-msgstr ""
-
-#: templates/settings-admin.php:5 templates/settings-personal.php:6
-msgid ""
-"Encryption App is enabled but your keys are not initialized, please log-out "
-"and log-in again"
-msgstr ""
-
-#: templates/settings-admin.php:8
-msgid ""
-"Enable recovery key (allow to recover users files in case of password loss):"
-msgstr ""
-
-#: templates/settings-admin.php:13
-msgid "Recovery key password"
-msgstr ""
-
-#: templates/settings-admin.php:16
-msgid "Repeat Recovery key password"
-msgstr ""
-
-#: templates/settings-admin.php:24 templates/settings-personal.php:54
-msgid "Enabled"
-msgstr ""
-
-#: templates/settings-admin.php:33 templates/settings-personal.php:63
-msgid "Disabled"
-msgstr ""
-
-#: templates/settings-admin.php:38
-msgid "Change recovery key password:"
-msgstr ""
-
-#: templates/settings-admin.php:45
-msgid "Old Recovery key password"
-msgstr ""
-
-#: templates/settings-admin.php:52
-msgid "New Recovery key password"
-msgstr ""
-
-#: templates/settings-admin.php:58
-msgid "Repeat New Recovery key password"
-msgstr ""
-
-#: templates/settings-admin.php:63
-msgid "Change Password"
-msgstr ""
-
-#: templates/settings-personal.php:12
-msgid "Your private key password no longer matches your log-in password."
-msgstr ""
-
-#: templates/settings-personal.php:15
-msgid "Set your old private key password to your current log-in password:"
-msgstr ""
-
-#: templates/settings-personal.php:17
-msgid ""
-" If you don't remember your old password you can ask your administrator to "
-"recover your files."
-msgstr ""
-
-#: templates/settings-personal.php:24
-msgid "Old log-in password"
-msgstr ""
-
-#: templates/settings-personal.php:30
-msgid "Current log-in password"
-msgstr ""
-
-#: templates/settings-personal.php:35
-msgid "Update Private Key Password"
-msgstr ""
-
-#: templates/settings-personal.php:43
-msgid "Enable password recovery:"
-msgstr ""
-
-#: templates/settings-personal.php:46
-msgid ""
-"Enabling this option will allow you to reobtain access to your encrypted "
-"files in case of password loss"
-msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
deleted file mode 100644
index f4adf8823c5..00000000000
--- a/l10n/templates/files_external.pot
+++ /dev/null
@@ -1,313 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ajax/dropbox.php:27
-msgid ""
-"Fetching request tokens failed. Verify that your Dropbox app key and secret "
-"are correct."
-msgstr ""
-
-#: ajax/dropbox.php:40
-msgid ""
-"Fetching access tokens failed. Verify that your Dropbox app key and secret "
-"are correct."
-msgstr ""
-
-#: ajax/dropbox.php:48 js/dropbox.js:102
-msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
-
-#: ajax/google.php:27
-#, php-format
-msgid "Step 1 failed. Exception: %s"
-msgstr ""
-
-#: ajax/google.php:38
-#, php-format
-msgid "Step 2 failed. Exception: %s"
-msgstr ""
-
-#: appinfo/app.php:37 js/app.js:32 templates/settings.php:9
-msgid "External storage"
-msgstr ""
-
-#: appinfo/app.php:46
-msgid "Local"
-msgstr ""
-
-#: appinfo/app.php:49
-msgid "Location"
-msgstr ""
-
-#: appinfo/app.php:52
-msgid "Amazon S3"
-msgstr ""
-
-#: appinfo/app.php:55
-msgid "Key"
-msgstr ""
-
-#: appinfo/app.php:56
-msgid "Secret"
-msgstr ""
-
-#: appinfo/app.php:57 appinfo/app.php:66 appinfo/app.php:114
-msgid "Bucket"
-msgstr ""
-
-#: appinfo/app.php:61
-msgid "Amazon S3 and compliant"
-msgstr ""
-
-#: appinfo/app.php:64
-msgid "Access Key"
-msgstr ""
-
-#: appinfo/app.php:65
-msgid "Secret Key"
-msgstr ""
-
-#: appinfo/app.php:67
-msgid "Hostname"
-msgstr ""
-
-#: appinfo/app.php:68
-msgid "Port"
-msgstr ""
-
-#: appinfo/app.php:69
-msgid "Region"
-msgstr ""
-
-#: appinfo/app.php:70
-msgid "Enable SSL"
-msgstr ""
-
-#: appinfo/app.php:71
-msgid "Enable Path Style"
-msgstr ""
-
-#: appinfo/app.php:79
-msgid "App key"
-msgstr ""
-
-#: appinfo/app.php:80
-msgid "App secret"
-msgstr ""
-
-#: appinfo/app.php:90 appinfo/app.php:131 appinfo/app.php:142
-#: appinfo/app.php:175
-msgid "Host"
-msgstr ""
-
-#: appinfo/app.php:91 appinfo/app.php:113 appinfo/app.php:132
-#: appinfo/app.php:154 appinfo/app.php:165 appinfo/app.php:176
-msgid "Username"
-msgstr ""
-
-#: appinfo/app.php:92 appinfo/app.php:133 appinfo/app.php:155
-#: appinfo/app.php:166 appinfo/app.php:177
-msgid "Password"
-msgstr ""
-
-#: appinfo/app.php:93 appinfo/app.php:135 appinfo/app.php:145
-#: appinfo/app.php:156 appinfo/app.php:178
-msgid "Root"
-msgstr ""
-
-#: appinfo/app.php:94
-msgid "Secure ftps://"
-msgstr ""
-
-#: appinfo/app.php:102
-msgid "Client ID"
-msgstr ""
-
-#: appinfo/app.php:103
-msgid "Client secret"
-msgstr ""
-
-#: appinfo/app.php:110
-msgid "OpenStack Object Storage"
-msgstr ""
-
-#: appinfo/app.php:115
-msgid "Region (optional for OpenStack Object Storage)"
-msgstr ""
-
-#: appinfo/app.php:116
-msgid "API Key (required for Rackspace Cloud Files)"
-msgstr ""
-
-#: appinfo/app.php:117
-msgid "Tenantname (required for OpenStack Object Storage)"
-msgstr ""
-
-#: appinfo/app.php:118
-msgid "Password (required for OpenStack Object Storage)"
-msgstr ""
-
-#: appinfo/app.php:119
-msgid "Service Name (required for OpenStack Object Storage)"
-msgstr ""
-
-#: appinfo/app.php:120
-msgid "URL of identity endpoint (required for OpenStack Object Storage)"
-msgstr ""
-
-#: appinfo/app.php:121
-msgid "Timeout of HTTP requests in seconds"
-msgstr ""
-
-#: appinfo/app.php:134 appinfo/app.php:144
-msgid "Share"
-msgstr ""
-
-#: appinfo/app.php:139
-msgid "SMB / CIFS using OC login"
-msgstr ""
-
-#: appinfo/app.php:143
-msgid "Username as share"
-msgstr ""
-
-#: appinfo/app.php:153 appinfo/app.php:164
-msgid "URL"
-msgstr ""
-
-#: appinfo/app.php:157 appinfo/app.php:168
-msgid "Secure https://"
-msgstr ""
-
-#: appinfo/app.php:167
-msgid "Remote subfolder"
-msgstr ""
-
-#: js/dropbox.js:7 js/dropbox.js:29 js/google.js:8 js/google.js:40
-msgid "Access granted"
-msgstr ""
-
-#: js/dropbox.js:33 js/dropbox.js:97 js/dropbox.js:103
-msgid "Error configuring Dropbox storage"
-msgstr ""
-
-#: js/dropbox.js:68 js/google.js:89
-msgid "Grant access"
-msgstr ""
-
-#: js/google.js:45 js/google.js:122
-msgid "Error configuring Google Drive storage"
-msgstr ""
-
-#: js/mountsfilelist.js:34
-msgid "Personal"
-msgstr ""
-
-#: js/mountsfilelist.js:36
-msgid "System"
-msgstr ""
-
-#: js/settings.js:211
-msgid "All users. Type to select user or group."
-msgstr ""
-
-#: js/settings.js:294
-msgid "(group)"
-msgstr ""
-
-#: js/settings.js:471 js/settings.js:478
-msgid "Saved"
-msgstr ""
-
-#: lib/config.php:713
-msgid "<b>Note:</b> "
-msgstr ""
-
-#: lib/config.php:724
-msgid " and "
-msgstr ""
-
-#: lib/config.php:746
-#, php-format
-msgid ""
-"<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."
-msgstr ""
-
-#: lib/config.php:748
-#, php-format
-msgid ""
-"<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."
-msgstr ""
-
-#: lib/config.php:750
-#, php-format
-msgid ""
-"<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please "
-"ask your system administrator to install it."
-msgstr ""
-
-#: templates/list.php:7
-msgid "You don't have any external storages"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Name"
-msgstr ""
-
-#: templates/list.php:20
-msgid "Storage type"
-msgstr ""
-
-#: templates/list.php:23
-msgid "Scope"
-msgstr ""
-
-#: templates/settings.php:2
-msgid "External Storage"
-msgstr ""
-
-#: templates/settings.php:8 templates/settings.php:27
-msgid "Folder name"
-msgstr ""
-
-#: templates/settings.php:10
-msgid "Configuration"
-msgstr ""
-
-#: templates/settings.php:11
-msgid "Available for"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Add storage"
-msgstr ""
-
-#: templates/settings.php:96 templates/settings.php:97
-msgid "Delete"
-msgstr ""
-
-#: templates/settings.php:110
-msgid "Enable User External Storage"
-msgstr ""
-
-#: templates/settings.php:113
-msgid "Allow users to mount the following external storage"
-msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
deleted file mode 100644
index f5b74df2417..00000000000
--- a/l10n/templates/files_sharing.pot
+++ /dev/null
@@ -1,163 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ajax/external.php:17
-msgid "Server to server sharing is not enabled on this server"
-msgstr ""
-
-#: ajax/external.php:29
-msgid "The mountpoint name contains invalid characters."
-msgstr ""
-
-#: ajax/external.php:44
-msgid "Invalid or untrusted SSL certificate"
-msgstr ""
-
-#: ajax/external.php:58
-msgid "Couldn't add remote share"
-msgstr ""
-
-#: appinfo/app.php:40 js/app.js:34
-msgid "Shared with you"
-msgstr ""
-
-#: appinfo/app.php:52 js/app.js:53
-msgid "Shared with others"
-msgstr ""
-
-#: appinfo/app.php:61 js/app.js:72
-msgid "Shared by link"
-msgstr ""
-
-#: js/app.js:35
-msgid "No files have been shared with you yet."
-msgstr ""
-
-#: js/app.js:54
-msgid "You haven't shared any files yet."
-msgstr ""
-
-#: js/app.js:73
-msgid "You haven't shared any files by link yet."
-msgstr ""
-
-#: js/external.js:48 js/external.js:59
-msgid "Do you want to add the remote share {name} from {owner}@{remote}?"
-msgstr ""
-
-#: js/external.js:51 js/external.js:62
-msgid "Remote share"
-msgstr ""
-
-#: js/external.js:65
-msgid "Remote share password"
-msgstr ""
-
-#: js/external.js:76
-msgid "Cancel"
-msgstr ""
-
-#: js/external.js:77
-msgid "Add remote share"
-msgstr ""
-
-#: js/public.js:213
-msgid "No ownCloud installation found at {remote}"
-msgstr ""
-
-#: js/public.js:214
-msgid "Invalid ownCloud url"
-msgstr ""
-
-#: js/sharedfilelist.js:128
-msgid "Shared by"
-msgstr ""
-
-#: templates/authenticate.php:4
-msgid "This share is password-protected"
-msgstr ""
-
-#: templates/authenticate.php:7
-msgid "The password is wrong. Try again."
-msgstr ""
-
-#: templates/authenticate.php:10 templates/authenticate.php:12
-msgid "Password"
-msgstr ""
-
-#: templates/list.php:16
-msgid "Name"
-msgstr ""
-
-#: templates/list.php:20
-msgid "Share time"
-msgstr ""
-
-#: templates/part.404.php:3
-msgid "Sorry, this link doesn’t seem to work anymore."
-msgstr ""
-
-#: templates/part.404.php:4
-msgid "Reasons might be:"
-msgstr ""
-
-#: templates/part.404.php:6
-msgid "the item was removed"
-msgstr ""
-
-#: templates/part.404.php:7
-msgid "the link expired"
-msgstr ""
-
-#: templates/part.404.php:8
-msgid "sharing is disabled"
-msgstr ""
-
-#: templates/part.404.php:10
-msgid "For more info, please ask the person who sent this link."
-msgstr ""
-
-#: templates/public.php:38
-msgid "Add to your ownCloud"
-msgstr ""
-
-#: templates/public.php:47
-msgid "Download"
-msgstr ""
-
-#: templates/public.php:70
-#, php-format
-msgid "Download %s"
-msgstr ""
-
-#: templates/public.php:74
-msgid "Direct link"
-msgstr ""
-
-#: templates/settings-admin.php:7
-msgid "Server-to-Server Sharing"
-msgstr ""
-
-#: templates/settings-admin.php:12
-msgid "Allow users on this server to send shares to other servers"
-msgstr ""
-
-#: templates/settings-admin.php:18
-msgid "Allow users on this server to receive shares from other servers"
-msgstr ""
diff --git a/l10n/templates/files_trashbin.pot b/l10n/templates/files_trashbin.pot
deleted file mode 100644
index 1d6e718ed0b..00000000000
--- a/l10n/templates/files_trashbin.pot
+++ /dev/null
@@ -1,60 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ajax/delete.php:61
-#, php-format
-msgid "Couldn't delete %s permanently"
-msgstr ""
-
-#: ajax/undelete.php:65
-#, php-format
-msgid "Couldn't restore %s"
-msgstr ""
-
-#: appinfo/app.php:17 js/filelist.js:34
-msgid "Deleted files"
-msgstr ""
-
-#: js/app.js:52 templates/index.php:21 templates/index.php:23
-msgid "Restore"
-msgstr ""
-
-#: js/filelist.js:119 js/filelist.js:164 js/filelist.js:214
-msgid "Error"
-msgstr ""
-
-#: lib/trashbin.php:980 lib/trashbin.php:982
-msgid "restored"
-msgstr ""
-
-#: templates/index.php:7
-msgid "Nothing in here. Your trash bin is empty!"
-msgstr ""
-
-#: templates/index.php:18
-msgid "Name"
-msgstr ""
-
-#: templates/index.php:29
-msgid "Deleted"
-msgstr ""
-
-#: templates/index.php:32 templates/index.php:33
-msgid "Delete"
-msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
deleted file mode 100644
index 02483701a33..00000000000
--- a/l10n/templates/files_versions.pot
+++ /dev/null
@@ -1,43 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ajax/rollbackVersion.php:13
-#, php-format
-msgid "Could not revert: %s"
-msgstr ""
-
-#: js/versions.js:48
-msgid "Versions"
-msgstr ""
-
-#: js/versions.js:70
-msgid "Failed to revert {file} to revision {timestamp}."
-msgstr ""
-
-#: js/versions.js:97
-msgid "More versions..."
-msgstr ""
-
-#: js/versions.js:135
-msgid "No other versions available"
-msgstr ""
-
-#: js/versions.js:165
-msgid "Restore"
-msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
deleted file mode 100644
index 1603fa853fc..00000000000
--- a/l10n/templates/lib.pot
+++ /dev/null
@@ -1,621 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: base.php:201 base.php:208
-msgid "Cannot write into \"config\" directory!"
-msgstr ""
-
-#: base.php:202
-msgid ""
-"This can usually be fixed by giving the webserver write access to the config "
-"directory"
-msgstr ""
-
-#: base.php:204
-#, php-format
-msgid "See %s"
-msgstr ""
-
-#: base.php:209 private/util.php:502
-#, php-format
-msgid ""
-"This can usually be fixed by %sgiving the webserver write access to the "
-"config directory%s."
-msgstr ""
-
-#: base.php:593
-msgid "Sample configuration detected"
-msgstr ""
-
-#: base.php:594
-msgid ""
-"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"
-msgstr ""
-
-#: private/app.php:410
-msgid "Help"
-msgstr ""
-
-#: private/app.php:423
-msgid "Personal"
-msgstr ""
-
-#: private/app.php:434
-msgid "Settings"
-msgstr ""
-
-#: private/app.php:446
-msgid "Users"
-msgstr ""
-
-#: private/app.php:459
-msgid "Admin"
-msgstr ""
-
-#: private/app.php:865 private/app.php:976
-msgid "Recommended"
-msgstr ""
-
-#: private/app.php:1158
-#, php-format
-msgid ""
-"App \\\"%s\\\" can't be installed because it is not compatible with this "
-"version of ownCloud."
-msgstr ""
-
-#: private/app.php:1170
-msgid "No app name specified"
-msgstr ""
-
-#: private/avatar.php:66
-msgid "Unknown filetype"
-msgstr ""
-
-#: private/avatar.php:71
-msgid "Invalid image"
-msgstr ""
-
-#: private/defaults.php:44
-msgid "web services under your control"
-msgstr ""
-
-#: private/installer.php:77
-msgid "App directory already exists"
-msgstr ""
-
-#: private/installer.php:90
-#, php-format
-msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
-
-#: private/installer.php:234
-msgid "No source specified when installing app"
-msgstr ""
-
-#: private/installer.php:242
-msgid "No href specified when installing app from http"
-msgstr ""
-
-#: private/installer.php:247
-msgid "No path specified when installing app from local file"
-msgstr ""
-
-#: private/installer.php:255
-#, php-format
-msgid "Archives of type %s are not supported"
-msgstr ""
-
-#: private/installer.php:269
-msgid "Failed to open archive when installing app"
-msgstr ""
-
-#: private/installer.php:307
-msgid "App does not provide an info.xml file"
-msgstr ""
-
-#: private/installer.php:313
-msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
-
-#: private/installer.php:319
-msgid ""
-"App can't be installed because it is not compatible with this version of "
-"ownCloud"
-msgstr ""
-
-#: private/installer.php:325
-msgid ""
-"App can't be installed because it contains the <shipped>true</shipped> tag "
-"which is not allowed for non shipped apps"
-msgstr ""
-
-#: private/installer.php:338
-msgid ""
-"App can't be installed because the version in info.xml/version is not the "
-"same as the version reported from the app store"
-msgstr ""
-
-#: private/json.php:29
-msgid "Application is not enabled"
-msgstr ""
-
-#: private/json.php:40 private/json.php:62 private/json.php:87
-msgid "Authentication error"
-msgstr ""
-
-#: private/json.php:51
-msgid "Token expired. Please reload page."
-msgstr ""
-
-#: private/json.php:74
-msgid "Unknown user"
-msgstr ""
-
-#: private/setup/abstractdatabase.php:26 private/setup/oci.php:26
-#, php-format
-msgid "%s enter the database username."
-msgstr ""
-
-#: private/setup/abstractdatabase.php:29 private/setup/oci.php:29
-#, php-format
-msgid "%s enter the database name."
-msgstr ""
-
-#: private/setup/abstractdatabase.php:32
-#, php-format
-msgid "%s you may not use dots in the database name"
-msgstr ""
-
-#: private/setup/mssql.php:20
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
-
-#: private/setup/mssql.php:21 private/setup/mysql.php:13
-#: private/setup/oci.php:128 private/setup/postgresql.php:31
-#: private/setup/postgresql.php:84
-msgid "You need to enter either an existing account or the administrator."
-msgstr ""
-
-#: private/setup/mysql.php:12
-msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
-
-#: private/setup/mysql.php:81 private/setup/oci.php:68
-#: private/setup/oci.php:135 private/setup/oci.php:158
-#: private/setup/oci.php:165 private/setup/oci.php:176
-#: private/setup/oci.php:183 private/setup/oci.php:192
-#: private/setup/oci.php:200 private/setup/oci.php:209
-#: private/setup/oci.php:215 private/setup/postgresql.php:103
-#: private/setup/postgresql.php:112 private/setup/postgresql.php:129
-#: private/setup/postgresql.php:139 private/setup/postgresql.php:148
-#, php-format
-msgid "DB Error: \"%s\""
-msgstr ""
-
-#: private/setup/mysql.php:82 private/setup/oci.php:69
-#: private/setup/oci.php:136 private/setup/oci.php:159
-#: private/setup/oci.php:166 private/setup/oci.php:177
-#: private/setup/oci.php:193 private/setup/oci.php:201
-#: private/setup/oci.php:210 private/setup/postgresql.php:104
-#: private/setup/postgresql.php:113 private/setup/postgresql.php:130
-#: private/setup/postgresql.php:140 private/setup/postgresql.php:149
-#, php-format
-msgid "Offending command was: \"%s\""
-msgstr ""
-
-#: private/setup/mysql.php:99
-#, php-format
-msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
-
-#: private/setup/mysql.php:100
-msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
-
-#: private/setup/mysql.php:105
-#, php-format
-msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
-
-#: private/setup/mysql.php:106
-msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
-
-#: private/setup/oci.php:48
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: private/setup/oci.php:55 private/setup/oci.php:127
-msgid "Oracle username and/or password not valid"
-msgstr ""
-
-#: private/setup/oci.php:184 private/setup/oci.php:216
-#, php-format
-msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
-
-#: private/setup/postgresql.php:30 private/setup/postgresql.php:83
-msgid "PostgreSQL username and/or password not valid"
-msgstr ""
-
-#: private/setup.php:129
-msgid "Set an admin username."
-msgstr ""
-
-#: private/setup.php:132
-msgid "Set an admin password."
-msgstr ""
-
-#: private/setup.php:156
-#, php-format
-msgid "Can't create or write into the data directory %s"
-msgstr ""
-
-#: private/share/mailnotifications.php:91
-#: private/share/mailnotifications.php:142
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr ""
-
-#: private/share/share.php:509
-#, php-format
-msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
-
-#: private/share/share.php:516
-#, php-format
-msgid "You are not allowed to share %s"
-msgstr ""
-
-#: private/share/share.php:546
-#, php-format
-msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
-
-#: private/share/share.php:552
-#, php-format
-msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
-
-#: private/share/share.php:561
-#, php-format
-msgid ""
-"Sharing %s failed, because the user %s is not a member of any groups that %s "
-"is a member of"
-msgstr ""
-
-#: private/share/share.php:574 private/share/share.php:602
-#, php-format
-msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
-
-#: private/share/share.php:582
-#, php-format
-msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
-
-#: private/share/share.php:589
-#, php-format
-msgid "Sharing %s failed, because %s is not a member of the group %s"
-msgstr ""
-
-#: private/share/share.php:643
-msgid ""
-"You need to provide a password to create a public link, only protected links "
-"are allowed"
-msgstr ""
-
-#: private/share/share.php:672
-#, php-format
-msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
-
-#: private/share/share.php:678
-#, php-format
-msgid "Share type %s is not valid for %s"
-msgstr ""
-
-#: private/share/share.php:902
-#, php-format
-msgid ""
-"Setting permissions for %s failed, because the permissions exceed "
-"permissions granted to %s"
-msgstr ""
-
-#: private/share/share.php:963
-#, php-format
-msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
-
-#: private/share/share.php:1001
-#, php-format
-msgid ""
-"Cannot set expiration date. Shares cannot expire later than %s after they "
-"have been shared"
-msgstr ""
-
-#: private/share/share.php:1009
-msgid "Cannot set expiration date. Expiration date is in the past"
-msgstr ""
-
-#: private/share/share.php:1135
-#, php-format
-msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
-
-#: private/share/share.php:1142
-#, php-format
-msgid "Sharing backend %s not found"
-msgstr ""
-
-#: private/share/share.php:1148
-#, php-format
-msgid "Sharing backend for %s not found"
-msgstr ""
-
-#: private/share/share.php:1891
-#, php-format
-msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
-
-#: private/share/share.php:1901
-#, php-format
-msgid ""
-"Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
-
-#: private/share/share.php:1927
-#, php-format
-msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
-
-#: private/share/share.php:1941
-#, php-format
-msgid ""
-"Sharing %s failed, because the sharing backend for %s could not find its "
-"source"
-msgstr ""
-
-#: private/share/share.php:1955
-#, php-format
-msgid ""
-"Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
-
-#: private/tags.php:226
-#, php-format
-msgid "Could not find category \"%s\""
-msgstr ""
-
-#: private/template/functions.php:225
-msgid "seconds ago"
-msgstr ""
-
-#: private/template/functions.php:226
-msgid "%n minute ago"
-msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: private/template/functions.php:227
-msgid "%n hour ago"
-msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: private/template/functions.php:228
-msgid "today"
-msgstr ""
-
-#: private/template/functions.php:229
-msgid "yesterday"
-msgstr ""
-
-#: private/template/functions.php:231
-msgid "%n day go"
-msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: private/template/functions.php:233
-msgid "last month"
-msgstr ""
-
-#: private/template/functions.php:234
-msgid "%n month ago"
-msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: private/template/functions.php:236
-msgid "last year"
-msgstr ""
-
-#: private/template/functions.php:237
-msgid "years ago"
-msgstr ""
-
-#: private/user/manager.php:230
-msgid ""
-"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
-"\"0-9\", and \"_.@-\""
-msgstr ""
-
-#: private/user/manager.php:235
-msgid "A valid username must be provided"
-msgstr ""
-
-#: private/user/manager.php:239
-msgid "A valid password must be provided"
-msgstr ""
-
-#: private/user/manager.php:244
-msgid "The username is already being used"
-msgstr ""
-
-#: private/util.php:487
-msgid "No database drivers (sqlite, mysql, or postgresql) installed."
-msgstr ""
-
-#: private/util.php:494
-#, php-format
-msgid ""
-"Permissions can usually be fixed by %sgiving the webserver write access to "
-"the root directory%s."
-msgstr ""
-
-#: private/util.php:501
-msgid "Cannot write into \"config\" directory"
-msgstr ""
-
-#: private/util.php:515
-msgid "Cannot write into \"apps\" directory"
-msgstr ""
-
-#: private/util.php:516
-#, php-format
-msgid ""
-"This can usually be fixed by %sgiving the webserver write access to the apps "
-"directory%s or disabling the appstore in the config file."
-msgstr ""
-
-#: private/util.php:531
-#, php-format
-msgid "Cannot create \"data\" directory (%s)"
-msgstr ""
-
-#: private/util.php:532
-#, php-format
-msgid ""
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
-"webserver write access to the root directory</a>."
-msgstr ""
-
-#: private/util.php:549
-#, php-format
-msgid "Setting locale to %s failed"
-msgstr ""
-
-#: private/util.php:552
-msgid ""
-"Please install one of these locales on your system and restart your "
-"webserver."
-msgstr ""
-
-#: private/util.php:581
-msgid "Please ask your server administrator to install the module."
-msgstr ""
-
-#: private/util.php:601
-#, php-format
-msgid "PHP module %s not installed."
-msgstr ""
-
-#: private/util.php:609
-#, php-format
-msgid "PHP %s or higher is required."
-msgstr ""
-
-#: private/util.php:610
-msgid ""
-"Please ask your server administrator to update PHP to the latest version. "
-"Your PHP version is no longer supported by ownCloud and the PHP community."
-msgstr ""
-
-#: private/util.php:621
-msgid ""
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
-"properly."
-msgstr ""
-
-#: private/util.php:622
-msgid ""
-"PHP Safe Mode is a deprecated and mostly useless setting that should be "
-"disabled. Please ask your server administrator to disable it in php.ini or "
-"in your webserver config."
-msgstr ""
-
-#: private/util.php:629
-msgid ""
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work "
-"properly."
-msgstr ""
-
-#: private/util.php:630
-msgid ""
-"Magic Quotes is a deprecated and mostly useless setting that should be "
-"disabled. Please ask your server administrator to disable it in php.ini or "
-"in your webserver config."
-msgstr ""
-
-#: private/util.php:644
-msgid "PHP modules have been installed, but they are still listed as missing?"
-msgstr ""
-
-#: private/util.php:645
-msgid "Please ask your server administrator to restart the web server."
-msgstr ""
-
-#: private/util.php:675
-msgid "PostgreSQL >= 9 required"
-msgstr ""
-
-#: private/util.php:676
-msgid "Please upgrade your database version"
-msgstr ""
-
-#: private/util.php:683
-msgid "Error occurred while checking PostgreSQL version"
-msgstr ""
-
-#: private/util.php:684
-msgid ""
-"Please make sure you have PostgreSQL >= 9 or check the logs for more "
-"information about the error"
-msgstr ""
-
-#: private/util.php:749
-msgid ""
-"Please change the permissions to 0770 so that the directory cannot be listed "
-"by other users."
-msgstr ""
-
-#: private/util.php:758
-#, php-format
-msgid "Data directory (%s) is readable by other users"
-msgstr ""
-
-#: private/util.php:779
-#, php-format
-msgid "Data directory (%s) is invalid"
-msgstr ""
-
-#: private/util.php:780
-msgid ""
-"Please check that the data directory contains a file \".ocdata\" in its root."
-msgstr ""
-
-#: public/files/locknotacquiredexception.php:39
-#, php-format
-msgid "Could not obtain lock type %d on \"%s\"."
-msgstr ""
diff --git a/l10n/templates/private.pot b/l10n/templates/private.pot
deleted file mode 100644
index 7f2e3301957..00000000000
--- a/l10n/templates/private.pot
+++ /dev/null
@@ -1,582 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: app.php:410
-msgid "Help"
-msgstr ""
-
-#: app.php:423
-msgid "Personal"
-msgstr ""
-
-#: app.php:434
-msgid "Settings"
-msgstr ""
-
-#: app.php:446
-msgid "Users"
-msgstr ""
-
-#: app.php:459
-msgid "Admin"
-msgstr ""
-
-#: app.php:865 app.php:976
-msgid "Recommended"
-msgstr ""
-
-#: app.php:1158
-#, php-format
-msgid ""
-"App \\\"%s\\\" can't be installed because it is not compatible with this "
-"version of ownCloud."
-msgstr ""
-
-#: app.php:1170
-msgid "No app name specified"
-msgstr ""
-
-#: avatar.php:66
-msgid "Unknown filetype"
-msgstr ""
-
-#: avatar.php:71
-msgid "Invalid image"
-msgstr ""
-
-#: defaults.php:44
-msgid "web services under your control"
-msgstr ""
-
-#: installer.php:77
-msgid "App directory already exists"
-msgstr ""
-
-#: installer.php:90
-#, php-format
-msgid "Can't create app folder. Please fix permissions. %s"
-msgstr ""
-
-#: installer.php:234
-msgid "No source specified when installing app"
-msgstr ""
-
-#: installer.php:242
-msgid "No href specified when installing app from http"
-msgstr ""
-
-#: installer.php:247
-msgid "No path specified when installing app from local file"
-msgstr ""
-
-#: installer.php:255
-#, php-format
-msgid "Archives of type %s are not supported"
-msgstr ""
-
-#: installer.php:269
-msgid "Failed to open archive when installing app"
-msgstr ""
-
-#: installer.php:307
-msgid "App does not provide an info.xml file"
-msgstr ""
-
-#: installer.php:313
-msgid "App can't be installed because of not allowed code in the App"
-msgstr ""
-
-#: installer.php:319
-msgid ""
-"App can't be installed because it is not compatible with this version of "
-"ownCloud"
-msgstr ""
-
-#: installer.php:325
-msgid ""
-"App can't be installed because it contains the <shipped>true</shipped> tag "
-"which is not allowed for non shipped apps"
-msgstr ""
-
-#: installer.php:338
-msgid ""
-"App can't be installed because the version in info.xml/version is not the "
-"same as the version reported from the app store"
-msgstr ""
-
-#: json.php:29
-msgid "Application is not enabled"
-msgstr ""
-
-#: json.php:40 json.php:62 json.php:87
-msgid "Authentication error"
-msgstr ""
-
-#: json.php:51
-msgid "Token expired. Please reload page."
-msgstr ""
-
-#: json.php:74
-msgid "Unknown user"
-msgstr ""
-
-#: setup/abstractdatabase.php:26 setup/oci.php:26
-#, php-format
-msgid "%s enter the database username."
-msgstr ""
-
-#: setup/abstractdatabase.php:29 setup/oci.php:29
-#, php-format
-msgid "%s enter the database name."
-msgstr ""
-
-#: setup/abstractdatabase.php:32
-#, php-format
-msgid "%s you may not use dots in the database name"
-msgstr ""
-
-#: setup/mssql.php:20
-#, php-format
-msgid "MS SQL username and/or password not valid: %s"
-msgstr ""
-
-#: setup/mssql.php:21 setup/mysql.php:13 setup/oci.php:128
-#: setup/postgresql.php:31 setup/postgresql.php:84
-msgid "You need to enter either an existing account or the administrator."
-msgstr ""
-
-#: setup/mysql.php:12
-msgid "MySQL/MariaDB username and/or password not valid"
-msgstr ""
-
-#: setup/mysql.php:81 setup/oci.php:68 setup/oci.php:135 setup/oci.php:158
-#: setup/oci.php:165 setup/oci.php:176 setup/oci.php:183 setup/oci.php:192
-#: setup/oci.php:200 setup/oci.php:209 setup/oci.php:215
-#: setup/postgresql.php:103 setup/postgresql.php:112 setup/postgresql.php:129
-#: setup/postgresql.php:139 setup/postgresql.php:148
-#, php-format
-msgid "DB Error: \"%s\""
-msgstr ""
-
-#: setup/mysql.php:82 setup/oci.php:69 setup/oci.php:136 setup/oci.php:159
-#: setup/oci.php:166 setup/oci.php:177 setup/oci.php:193 setup/oci.php:201
-#: setup/oci.php:210 setup/postgresql.php:104 setup/postgresql.php:113
-#: setup/postgresql.php:130 setup/postgresql.php:140 setup/postgresql.php:149
-#, php-format
-msgid "Offending command was: \"%s\""
-msgstr ""
-
-#: setup/mysql.php:99
-#, php-format
-msgid "MySQL/MariaDB user '%s'@'localhost' exists already."
-msgstr ""
-
-#: setup/mysql.php:100
-msgid "Drop this user from MySQL/MariaDB"
-msgstr ""
-
-#: setup/mysql.php:105
-#, php-format
-msgid "MySQL/MariaDB user '%s'@'%%' already exists"
-msgstr ""
-
-#: setup/mysql.php:106
-msgid "Drop this user from MySQL/MariaDB."
-msgstr ""
-
-#: setup/oci.php:48
-msgid "Oracle connection could not be established"
-msgstr ""
-
-#: setup/oci.php:55 setup/oci.php:127
-msgid "Oracle username and/or password not valid"
-msgstr ""
-
-#: setup/oci.php:184 setup/oci.php:216
-#, php-format
-msgid "Offending command was: \"%s\", name: %s, password: %s"
-msgstr ""
-
-#: setup/postgresql.php:30 setup/postgresql.php:83
-msgid "PostgreSQL username and/or password not valid"
-msgstr ""
-
-#: setup.php:129
-msgid "Set an admin username."
-msgstr ""
-
-#: setup.php:132
-msgid "Set an admin password."
-msgstr ""
-
-#: setup.php:156
-#, php-format
-msgid "Can't create or write into the data directory %s"
-msgstr ""
-
-#: share/mailnotifications.php:91 share/mailnotifications.php:142
-#, php-format
-msgid "%s shared »%s« with you"
-msgstr ""
-
-#: share/share.php:509
-#, php-format
-msgid "Sharing %s failed, because the file does not exist"
-msgstr ""
-
-#: share/share.php:516
-#, php-format
-msgid "You are not allowed to share %s"
-msgstr ""
-
-#: share/share.php:546
-#, php-format
-msgid "Sharing %s failed, because the user %s is the item owner"
-msgstr ""
-
-#: share/share.php:552
-#, php-format
-msgid "Sharing %s failed, because the user %s does not exist"
-msgstr ""
-
-#: share/share.php:561
-#, php-format
-msgid ""
-"Sharing %s failed, because the user %s is not a member of any groups that %s "
-"is a member of"
-msgstr ""
-
-#: share/share.php:574 share/share.php:602
-#, php-format
-msgid "Sharing %s failed, because this item is already shared with %s"
-msgstr ""
-
-#: share/share.php:582
-#, php-format
-msgid "Sharing %s failed, because the group %s does not exist"
-msgstr ""
-
-#: share/share.php:589
-#, php-format
-msgid "Sharing %s failed, because %s is not a member of the group %s"
-msgstr ""
-
-#: share/share.php:643
-msgid ""
-"You need to provide a password to create a public link, only protected links "
-"are allowed"
-msgstr ""
-
-#: share/share.php:672
-#, php-format
-msgid "Sharing %s failed, because sharing with links is not allowed"
-msgstr ""
-
-#: share/share.php:678
-#, php-format
-msgid "Share type %s is not valid for %s"
-msgstr ""
-
-#: share/share.php:902
-#, php-format
-msgid ""
-"Setting permissions for %s failed, because the permissions exceed "
-"permissions granted to %s"
-msgstr ""
-
-#: share/share.php:963
-#, php-format
-msgid "Setting permissions for %s failed, because the item was not found"
-msgstr ""
-
-#: share/share.php:1001
-#, php-format
-msgid ""
-"Cannot set expiration date. Shares cannot expire later than %s after they "
-"have been shared"
-msgstr ""
-
-#: share/share.php:1009
-msgid "Cannot set expiration date. Expiration date is in the past"
-msgstr ""
-
-#: share/share.php:1135
-#, php-format
-msgid "Sharing backend %s must implement the interface OCP\\Share_Backend"
-msgstr ""
-
-#: share/share.php:1142
-#, php-format
-msgid "Sharing backend %s not found"
-msgstr ""
-
-#: share/share.php:1148
-#, php-format
-msgid "Sharing backend for %s not found"
-msgstr ""
-
-#: share/share.php:1891
-#, php-format
-msgid "Sharing %s failed, because the user %s is the original sharer"
-msgstr ""
-
-#: share/share.php:1901
-#, php-format
-msgid ""
-"Sharing %s failed, because the permissions exceed permissions granted to %s"
-msgstr ""
-
-#: share/share.php:1927
-#, php-format
-msgid "Sharing %s failed, because resharing is not allowed"
-msgstr ""
-
-#: share/share.php:1941
-#, php-format
-msgid ""
-"Sharing %s failed, because the sharing backend for %s could not find its "
-"source"
-msgstr ""
-
-#: share/share.php:1955
-#, php-format
-msgid ""
-"Sharing %s failed, because the file could not be found in the file cache"
-msgstr ""
-
-#: tags.php:226
-#, php-format
-msgid "Could not find category \"%s\""
-msgstr ""
-
-#: template/functions.php:225
-msgid "seconds ago"
-msgstr ""
-
-#: template/functions.php:226
-msgid "%n minute ago"
-msgid_plural "%n minutes ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: template/functions.php:227
-msgid "%n hour ago"
-msgid_plural "%n hours ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: template/functions.php:228
-msgid "today"
-msgstr ""
-
-#: template/functions.php:229
-msgid "yesterday"
-msgstr ""
-
-#: template/functions.php:231
-msgid "%n day go"
-msgid_plural "%n days ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: template/functions.php:233
-msgid "last month"
-msgstr ""
-
-#: template/functions.php:234
-msgid "%n month ago"
-msgid_plural "%n months ago"
-msgstr[0] ""
-msgstr[1] ""
-
-#: template/functions.php:236
-msgid "last year"
-msgstr ""
-
-#: template/functions.php:237
-msgid "years ago"
-msgstr ""
-
-#: user/manager.php:230
-msgid ""
-"Only the following characters are allowed in a username: \"a-z\", \"A-Z\", "
-"\"0-9\", and \"_.@-\""
-msgstr ""
-
-#: user/manager.php:235
-msgid "A valid username must be provided"
-msgstr ""
-
-#: user/manager.php:239
-msgid "A valid password must be provided"
-msgstr ""
-
-#: user/manager.php:244
-msgid "The username is already being used"
-msgstr ""
-
-#: util.php:487
-msgid "No database drivers (sqlite, mysql, or postgresql) installed."
-msgstr ""
-
-#: util.php:494
-#, php-format
-msgid ""
-"Permissions can usually be fixed by %sgiving the webserver write access to "
-"the root directory%s."
-msgstr ""
-
-#: util.php:501
-msgid "Cannot write into \"config\" directory"
-msgstr ""
-
-#: util.php:502
-#, php-format
-msgid ""
-"This can usually be fixed by %sgiving the webserver write access to the "
-"config directory%s."
-msgstr ""
-
-#: util.php:515
-msgid "Cannot write into \"apps\" directory"
-msgstr ""
-
-#: util.php:516
-#, php-format
-msgid ""
-"This can usually be fixed by %sgiving the webserver write access to the apps "
-"directory%s or disabling the appstore in the config file."
-msgstr ""
-
-#: util.php:531
-#, php-format
-msgid "Cannot create \"data\" directory (%s)"
-msgstr ""
-
-#: util.php:532
-#, php-format
-msgid ""
-"This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the "
-"webserver write access to the root directory</a>."
-msgstr ""
-
-#: util.php:549
-#, php-format
-msgid "Setting locale to %s failed"
-msgstr ""
-
-#: util.php:552
-msgid ""
-"Please install one of these locales on your system and restart your "
-"webserver."
-msgstr ""
-
-#: util.php:581
-msgid "Please ask your server administrator to install the module."
-msgstr ""
-
-#: util.php:601
-#, php-format
-msgid "PHP module %s not installed."
-msgstr ""
-
-#: util.php:609
-#, php-format
-msgid "PHP %s or higher is required."
-msgstr ""
-
-#: util.php:610
-msgid ""
-"Please ask your server administrator to update PHP to the latest version. "
-"Your PHP version is no longer supported by ownCloud and the PHP community."
-msgstr ""
-
-#: util.php:621
-msgid ""
-"PHP Safe Mode is enabled. ownCloud requires that it is disabled to work "
-"properly."
-msgstr ""
-
-#: util.php:622
-msgid ""
-"PHP Safe Mode is a deprecated and mostly useless setting that should be "
-"disabled. Please ask your server administrator to disable it in php.ini or "
-"in your webserver config."
-msgstr ""
-
-#: util.php:629
-msgid ""
-"Magic Quotes is enabled. ownCloud requires that it is disabled to work "
-"properly."
-msgstr ""
-
-#: util.php:630
-msgid ""
-"Magic Quotes is a deprecated and mostly useless setting that should be "
-"disabled. Please ask your server administrator to disable it in php.ini or "
-"in your webserver config."
-msgstr ""
-
-#: util.php:644
-msgid "PHP modules have been installed, but they are still listed as missing?"
-msgstr ""
-
-#: util.php:645
-msgid "Please ask your server administrator to restart the web server."
-msgstr ""
-
-#: util.php:675
-msgid "PostgreSQL >= 9 required"
-msgstr ""
-
-#: util.php:676
-msgid "Please upgrade your database version"
-msgstr ""
-
-#: util.php:683
-msgid "Error occurred while checking PostgreSQL version"
-msgstr ""
-
-#: util.php:684
-msgid ""
-"Please make sure you have PostgreSQL >= 9 or check the logs for more "
-"information about the error"
-msgstr ""
-
-#: util.php:749
-msgid ""
-"Please change the permissions to 0770 so that the directory cannot be listed "
-"by other users."
-msgstr ""
-
-#: util.php:758
-#, php-format
-msgid "Data directory (%s) is readable by other users"
-msgstr ""
-
-#: util.php:779
-#, php-format
-msgid "Data directory (%s) is invalid"
-msgstr ""
-
-#: util.php:780
-msgid ""
-"Please check that the data directory contains a file \".ocdata\" in its root."
-msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
deleted file mode 100644
index a05cc05eff4..00000000000
--- a/l10n/templates/settings.pot
+++ /dev/null
@@ -1,1048 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: admin.php:84
-msgid "Security & Setup Warnings"
-msgstr ""
-
-#: admin.php:108 templates/admin.php:227
-msgid "Cron"
-msgstr ""
-
-#: admin.php:109 templates/admin.php:272
-msgid "Sharing"
-msgstr ""
-
-#: admin.php:110 templates/admin.php:334
-msgid "Security"
-msgstr ""
-
-#: admin.php:111 templates/admin.php:364
-msgid "Email Server"
-msgstr ""
-
-#: admin.php:112 templates/admin.php:448
-msgid "Log"
-msgstr ""
-
-#: ajax/changedisplayname.php:25 ajax/removeuser.php:15 ajax/setquota.php:17
-#: ajax/togglegroups.php:20 changepassword/controller.php:49
-msgid "Authentication error"
-msgstr ""
-
-#: ajax/changedisplayname.php:31
-msgid "Your full name has been changed."
-msgstr ""
-
-#: ajax/changedisplayname.php:34
-msgid "Unable to change full name"
-msgstr ""
-
-#: ajax/creategroup.php:11
-msgid "Group already exists"
-msgstr ""
-
-#: ajax/creategroup.php:20
-msgid "Unable to add group"
-msgstr ""
-
-#: ajax/decryptall.php:31
-msgid "Files decrypted successfully"
-msgstr ""
-
-#: ajax/decryptall.php:33
-msgid ""
-"Couldn't decrypt your files, please check your owncloud.log or ask your "
-"administrator"
-msgstr ""
-
-#: ajax/decryptall.php:36
-msgid "Couldn't decrypt your files, check your password and try again"
-msgstr ""
-
-#: ajax/deletekeys.php:14
-msgid "Encryption keys deleted permanently"
-msgstr ""
-
-#: ajax/deletekeys.php:16
-msgid ""
-"Couldn't permanently delete your encryption keys, please check your owncloud."
-"log or ask your administrator"
-msgstr ""
-
-#: ajax/installapp.php:18 ajax/uninstallapp.php:18
-msgid "Couldn't remove app."
-msgstr ""
-
-#: ajax/lostpassword.php:12
-msgid "Email saved"
-msgstr ""
-
-#: ajax/lostpassword.php:14
-msgid "Invalid email"
-msgstr ""
-
-#: ajax/removegroup.php:13
-msgid "Unable to delete group"
-msgstr ""
-
-#: ajax/removeuser.php:25
-msgid "Unable to delete user"
-msgstr ""
-
-#: ajax/restorekeys.php:14
-msgid "Backups restored successfully"
-msgstr ""
-
-#: ajax/restorekeys.php:23
-msgid ""
-"Couldn't restore your encryption keys, please check your owncloud.log or ask "
-"your administrator"
-msgstr ""
-
-#: ajax/setlanguage.php:15
-msgid "Language changed"
-msgstr ""
-
-#: ajax/setlanguage.php:17 ajax/setlanguage.php:20
-msgid "Invalid request"
-msgstr ""
-
-#: ajax/togglegroups.php:12
-msgid "Admins can't remove themself from the admin group"
-msgstr ""
-
-#: ajax/togglegroups.php:30
-#, php-format
-msgid "Unable to add user to group %s"
-msgstr ""
-
-#: ajax/togglegroups.php:36
-#, php-format
-msgid "Unable to remove user from group %s"
-msgstr ""
-
-#: ajax/updateapp.php:47
-msgid "Couldn't update app."
-msgstr ""
-
-#: changepassword/controller.php:17
-msgid "Wrong password"
-msgstr ""
-
-#: changepassword/controller.php:36
-msgid "No user supplied"
-msgstr ""
-
-#: changepassword/controller.php:68
-msgid ""
-"Please provide an admin recovery password, otherwise all user data will be "
-"lost"
-msgstr ""
-
-#: changepassword/controller.php:73
-msgid "Wrong admin recovery password. Please check the password and try again."
-msgstr ""
-
-#: changepassword/controller.php:81
-msgid ""
-"Back-end doesn't support password change, but the users encryption key was "
-"successfully updated."
-msgstr ""
-
-#: changepassword/controller.php:86 changepassword/controller.php:97
-msgid "Unable to change password"
-msgstr ""
-
-#: controller/appsettingscontroller.php:51
-msgid "Enabled"
-msgstr ""
-
-#: controller/appsettingscontroller.php:52
-msgid "Not enabled"
-msgstr ""
-
-#: controller/appsettingscontroller.php:56
-msgid "Recommended"
-msgstr ""
-
-#: controller/mailsettingscontroller.php:103
-#: controller/mailsettingscontroller.php:121
-msgid "Saved"
-msgstr ""
-
-#: controller/mailsettingscontroller.php:136
-msgid "test email settings"
-msgstr ""
-
-#: controller/mailsettingscontroller.php:137
-msgid "If you received this email, the settings seem to be correct."
-msgstr ""
-
-#: controller/mailsettingscontroller.php:144
-msgid ""
-"A problem occurred while sending the email. Please revise your settings."
-msgstr ""
-
-#: controller/mailsettingscontroller.php:152
-msgid "Email sent"
-msgstr ""
-
-#: controller/mailsettingscontroller.php:160
-msgid "You need to set your user email before being able to send test emails."
-msgstr ""
-
-#: js/admin.js:6
-msgid "Are you really sure you want add \"{domain}\" as trusted domain?"
-msgstr ""
-
-#: js/admin.js:8
-msgid "Add trusted domain"
-msgstr ""
-
-#: js/admin.js:124
-msgid "Sending..."
-msgstr ""
-
-#: js/apps.js:17 templates/apps.php:62
-msgid "All"
-msgstr ""
-
-#: js/apps.js:146
-msgid "Please wait...."
-msgstr ""
-
-#: js/apps.js:154 js/apps.js:155 js/apps.js:181
-msgid "Error while disabling app"
-msgstr ""
-
-#: js/apps.js:157 js/apps.js:190 templates/apps.php:58
-msgid "Disable"
-msgstr ""
-
-#: js/apps.js:165 js/apps.js:183 js/apps.js:220 templates/apps.php:64
-msgid "Enable"
-msgstr ""
-
-#: js/apps.js:180 js/apps.js:215 js/apps.js:216
-msgid "Error while enabling app"
-msgstr ""
-
-#: js/apps.js:227
-msgid "Updating...."
-msgstr ""
-
-#: js/apps.js:231
-msgid "Error while updating app"
-msgstr ""
-
-#: js/apps.js:235
-msgid "Updated"
-msgstr ""
-
-#: js/apps.js:243
-msgid "Uninstalling ...."
-msgstr ""
-
-#: js/apps.js:246
-msgid "Error while uninstalling app"
-msgstr ""
-
-#: js/apps.js:247
-msgid "Uninstall"
-msgstr ""
-
-#: js/personal.js:256
-msgid "Select a profile picture"
-msgstr ""
-
-#: js/personal.js:287
-msgid "Very weak password"
-msgstr ""
-
-#: js/personal.js:288
-msgid "Weak password"
-msgstr ""
-
-#: js/personal.js:289
-msgid "So-so password"
-msgstr ""
-
-#: js/personal.js:290
-msgid "Good password"
-msgstr ""
-
-#: js/personal.js:291
-msgid "Strong password"
-msgstr ""
-
-#: js/personal.js:328
-msgid "Valid until {date}"
-msgstr ""
-
-#: js/personal.js:333 js/personal.js:334 js/users/users.js:75
-#: templates/personal.php:195 templates/personal.php:196
-#: templates/users/part.grouplist.php:46 templates/users/part.userlist.php:108
-msgid "Delete"
-msgstr ""
-
-#: js/personal.js:350
-msgid "Decrypting files... Please wait, this can take some time."
-msgstr ""
-
-#: js/personal.js:364
-msgid "Delete encryption keys permanently."
-msgstr ""
-
-#: js/personal.js:378
-msgid "Restore encryption keys."
-msgstr ""
-
-#: js/settings.js:27 templates/users/part.createuser.php:12
-#: templates/users/part.userlist.php:10
-msgid "Groups"
-msgstr ""
-
-#: js/users/deleteHandler.js:205
-msgid "Unable to delete {objName}"
-msgstr ""
-
-#: js/users/groups.js:94 js/users/groups.js:202
-msgid "Error creating group"
-msgstr ""
-
-#: js/users/groups.js:201
-msgid "A valid group name must be provided"
-msgstr ""
-
-#: js/users/groups.js:229
-msgid "deleted {groupName}"
-msgstr ""
-
-#: js/users/groups.js:230 js/users/users.js:301
-msgid "undo"
-msgstr ""
-
-#: js/users/users.js:49 js/users/users.js:53
-#: templates/users/part.userlist.php:41 templates/users/part.userlist.php:57
-msgid "no group"
-msgstr ""
-
-#: js/users/users.js:96 templates/users/part.userlist.php:98
-msgid "never"
-msgstr ""
-
-#: js/users/users.js:300
-msgid "deleted {userName}"
-msgstr ""
-
-#: js/users/users.js:436
-msgid "add group"
-msgstr ""
-
-#: js/users/users.js:657
-msgid "A valid username must be provided"
-msgstr ""
-
-#: js/users/users.js:658 js/users/users.js:664 js/users/users.js:679
-msgid "Error creating user"
-msgstr ""
-
-#: js/users/users.js:663
-msgid "A valid password must be provided"
-msgstr ""
-
-#: js/users/users.js:695
-msgid "Warning: Home directory for user \"{user}\" already exists"
-msgstr ""
-
-#: personal.php:49 personal.php:50
-msgid "__language_name__"
-msgstr ""
-
-#: personal.php:105
-msgid "Personal Info"
-msgstr ""
-
-#: personal.php:130 templates/personal.php:173
-msgid "SSL root certificates"
-msgstr ""
-
-#: personal.php:132 templates/admin.php:382 templates/personal.php:214
-msgid "Encryption"
-msgstr ""
-
-#: templates/admin.php:23
-msgid "Everything (fatal issues, errors, warnings, info, debug)"
-msgstr ""
-
-#: templates/admin.php:24
-msgid "Info, warnings, errors and fatal issues"
-msgstr ""
-
-#: templates/admin.php:25
-msgid "Warnings, errors and fatal issues"
-msgstr ""
-
-#: templates/admin.php:26
-msgid "Errors and fatal issues"
-msgstr ""
-
-#: templates/admin.php:27
-msgid "Fatal issues only"
-msgstr ""
-
-#: templates/admin.php:31 templates/admin.php:38
-msgid "None"
-msgstr ""
-
-#: templates/admin.php:32
-msgid "Login"
-msgstr ""
-
-#: templates/admin.php:33
-msgid "Plain"
-msgstr ""
-
-#: templates/admin.php:34
-msgid "NT LAN Manager"
-msgstr ""
-
-#: templates/admin.php:39
-msgid "SSL"
-msgstr ""
-
-#: templates/admin.php:40
-msgid "TLS"
-msgstr ""
-
-#: templates/admin.php:76 templates/admin.php:90
-msgid "Security Warning"
-msgstr ""
-
-#: templates/admin.php:79
-#, php-format
-msgid ""
-"You are accessing %s via HTTP. We strongly suggest you configure your server "
-"to require using HTTPS instead."
-msgstr ""
-
-#: templates/admin.php:93
-msgid ""
-"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."
-msgstr ""
-
-#: templates/admin.php:103
-msgid "Setup Warning"
-msgstr ""
-
-#: templates/admin.php:106
-msgid ""
-"PHP is apparently setup to strip inline doc blocks. This will make several "
-"core apps inaccessible."
-msgstr ""
-
-#: templates/admin.php:107
-msgid ""
-"This is probably caused by a cache/accelerator such as Zend OPcache or "
-"eAccelerator."
-msgstr ""
-
-#: templates/admin.php:118
-msgid "Database Performance Info"
-msgstr ""
-
-#: templates/admin.php:121
-msgid ""
-"SQLite is used as database. For larger installations we recommend to change "
-"this. To migrate to another database use the command line tool: 'occ db:"
-"convert-type'"
-msgstr ""
-
-#: templates/admin.php:132
-msgid "Module 'fileinfo' missing"
-msgstr ""
-
-#: templates/admin.php:135
-msgid ""
-"The PHP module 'fileinfo' is missing. We strongly recommend to enable this "
-"module to get best results with mime-type detection."
-msgstr ""
-
-#: templates/admin.php:146
-msgid "Your PHP version is outdated"
-msgstr ""
-
-#: templates/admin.php:149
-msgid ""
-"Your PHP version is outdated. We strongly recommend to update to 5.3.8 or "
-"newer because older versions are known to be broken. It is possible that "
-"this installation is not working correctly."
-msgstr ""
-
-#: templates/admin.php:160
-msgid "PHP charset is not set to UTF-8"
-msgstr ""
-
-#: templates/admin.php:163
-msgid ""
-"PHP charset is not set to UTF-8. This can cause major issues with non-ASCII "
-"characters in file names. We highly recommend to change the value of "
-"'default_charset' php.ini to 'UTF-8'."
-msgstr ""
-
-#: templates/admin.php:174
-msgid "Locale not working"
-msgstr ""
-
-#: templates/admin.php:179
-msgid "System locale can not be set to a one which supports UTF-8."
-msgstr ""
-
-#: templates/admin.php:183
-msgid ""
-"This means that there might be problems with certain characters in file "
-"names."
-msgstr ""
-
-#: templates/admin.php:187
-#, php-format
-msgid ""
-"We strongly suggest to install the required packages on your system to "
-"support one of the following locales: %s."
-msgstr ""
-
-#: templates/admin.php:198
-msgid "URL generation in notification emails"
-msgstr ""
-
-#: templates/admin.php:201
-#, php-format
-msgid ""
-"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 \"overwritewebroot\" option in your config.php file "
-"to the webroot path of your installation (Suggested: \"%s\")"
-msgstr ""
-
-#: templates/admin.php:209
-msgid "Connectivity Checks"
-msgstr ""
-
-#: templates/admin.php:211
-msgid "No problems found"
-msgstr ""
-
-#: templates/admin.php:215
-#, php-format
-msgid "Please double check the <a href='%s'>installation guides</a>."
-msgstr ""
-
-#: templates/admin.php:234
-#, php-format
-msgid "Last cron was executed at %s."
-msgstr ""
-
-#: templates/admin.php:237
-#, php-format
-msgid ""
-"Last cron was executed at %s. This is more than an hour ago, something seems "
-"wrong."
-msgstr ""
-
-#: templates/admin.php:241
-msgid "Cron was not executed yet!"
-msgstr ""
-
-#: templates/admin.php:251
-msgid "Execute one task with each page loaded"
-msgstr ""
-
-#: templates/admin.php:259
-msgid ""
-"cron.php is registered at a webcron service to call cron.php every 15 "
-"minutes over http."
-msgstr ""
-
-#: templates/admin.php:267
-msgid "Use system's cron service to call the cron.php file every 15 minutes."
-msgstr ""
-
-#: templates/admin.php:276
-msgid "Allow apps to use the Share API"
-msgstr ""
-
-#: templates/admin.php:281
-msgid "Allow users to share via link"
-msgstr ""
-
-#: templates/admin.php:287
-msgid "Enforce password protection"
-msgstr ""
-
-#: templates/admin.php:290
-msgid "Allow public uploads"
-msgstr ""
-
-#: templates/admin.php:294
-msgid "Set default expiration date"
-msgstr ""
-
-#: templates/admin.php:298
-msgid "Expire after "
-msgstr ""
-
-#: templates/admin.php:301
-msgid "days"
-msgstr ""
-
-#: templates/admin.php:304
-msgid "Enforce expiration date"
-msgstr ""
-
-#: templates/admin.php:309
-msgid "Allow resharing"
-msgstr ""
-
-#: templates/admin.php:314
-msgid "Restrict users to only share with users in their groups"
-msgstr ""
-
-#: templates/admin.php:319
-msgid "Allow users to send mail notification for shared files"
-msgstr ""
-
-#: templates/admin.php:324
-msgid "Exclude groups from sharing"
-msgstr ""
-
-#: templates/admin.php:329
-msgid ""
-"These groups will still be able to receive shares, but not to initiate them."
-msgstr ""
-
-#: templates/admin.php:345
-msgid "Enforce HTTPS"
-msgstr ""
-
-#: templates/admin.php:347
-#, php-format
-msgid "Forces the clients to connect to %s via an encrypted connection."
-msgstr ""
-
-#: templates/admin.php:353
-#, php-format
-msgid ""
-"Please connect to your %s via HTTPS to enable or disable the SSL enforcement."
-msgstr ""
-
-#: templates/admin.php:366
-msgid "This is used for sending out notifications."
-msgstr ""
-
-#: templates/admin.php:369
-msgid "Send mode"
-msgstr ""
-
-#: templates/admin.php:397
-msgid "From address"
-msgstr ""
-
-#: templates/admin.php:398
-msgid "mail"
-msgstr ""
-
-#: templates/admin.php:405
-msgid "Authentication method"
-msgstr ""
-
-#: templates/admin.php:418
-msgid "Authentication required"
-msgstr ""
-
-#: templates/admin.php:422
-msgid "Server address"
-msgstr ""
-
-#: templates/admin.php:426
-msgid "Port"
-msgstr ""
-
-#: templates/admin.php:432
-msgid "Credentials"
-msgstr ""
-
-#: templates/admin.php:433
-msgid "SMTP Username"
-msgstr ""
-
-#: templates/admin.php:436
-msgid "SMTP Password"
-msgstr ""
-
-#: templates/admin.php:437
-msgid "Store credentials"
-msgstr ""
-
-#: templates/admin.php:442
-msgid "Test email settings"
-msgstr ""
-
-#: templates/admin.php:443
-msgid "Send email"
-msgstr ""
-
-#: templates/admin.php:449
-msgid "Log level"
-msgstr ""
-
-#: templates/admin.php:481
-msgid "More"
-msgstr ""
-
-#: templates/admin.php:482
-msgid "Less"
-msgstr ""
-
-#: templates/admin.php:488 templates/personal.php:263
-msgid "Version"
-msgstr ""
-
-#: templates/admin.php:492 templates/personal.php:266
-msgid ""
-"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>."
-msgstr ""
-
-#: templates/apps.php:8
-msgid "More apps"
-msgstr ""
-
-#: templates/apps.php:11
-msgid "Add your app"
-msgstr ""
-
-#: templates/apps.php:24
-msgid "by"
-msgstr ""
-
-#: templates/apps.php:26
-msgid "licensed"
-msgstr ""
-
-#: templates/apps.php:40
-msgid "Documentation:"
-msgstr ""
-
-#: templates/apps.php:43 templates/help.php:7
-msgid "User Documentation"
-msgstr ""
-
-#: templates/apps.php:49
-msgid "Admin Documentation"
-msgstr ""
-
-#: templates/apps.php:55
-#, php-format
-msgid "Update to %s"
-msgstr ""
-
-#: templates/apps.php:60
-msgid "Enable only for specific groups"
-msgstr ""
-
-#: templates/apps.php:67
-msgid "Uninstall App"
-msgstr ""
-
-#: templates/help.php:13
-msgid "Administrator Documentation"
-msgstr ""
-
-#: templates/help.php:20
-msgid "Online Documentation"
-msgstr ""
-
-#: templates/help.php:25
-msgid "Forum"
-msgstr ""
-
-#: templates/help.php:33
-msgid "Bugtracker"
-msgstr ""
-
-#: templates/help.php:40
-msgid "Commercial Support"
-msgstr ""
-
-#: templates/personal.php:25
-msgid "Get the apps to sync your files"
-msgstr ""
-
-#: templates/personal.php:38
-msgid ""
-"If you want to support the project\n"
-"\t\t<a href=\"https://owncloud.org/contribute\"\n"
-"\t\t\ttarget=\"_blank\">join development</a>\n"
-"\t\tor\n"
-"\t\t<a href=\"https://owncloud.org/promote\"\n"
-"\t\t\ttarget=\"_blank\">spread the word</a>!"
-msgstr ""
-
-#: templates/personal.php:48
-msgid "Show First Run Wizard again"
-msgstr ""
-
-#: templates/personal.php:57
-#, php-format
-msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
-
-#: templates/personal.php:68 templates/users/part.createuser.php:8
-#: templates/users/part.userlist.php:9
-msgid "Password"
-msgstr ""
-
-#: templates/personal.php:69
-msgid "Your password was changed"
-msgstr ""
-
-#: templates/personal.php:70
-msgid "Unable to change your password"
-msgstr ""
-
-#: templates/personal.php:72
-msgid "Current password"
-msgstr ""
-
-#: templates/personal.php:75
-msgid "New password"
-msgstr ""
-
-#: templates/personal.php:79
-msgid "Change password"
-msgstr ""
-
-#: templates/personal.php:91 templates/users/part.userlist.php:8
-msgid "Full Name"
-msgstr ""
-
-#: templates/personal.php:106
-msgid "Email"
-msgstr ""
-
-#: templates/personal.php:108
-msgid "Your email address"
-msgstr ""
-
-#: templates/personal.php:111
-msgid ""
-"Fill in an email address to enable password recovery and receive "
-"notifications"
-msgstr ""
-
-#: templates/personal.php:119
-msgid "Profile picture"
-msgstr ""
-
-#: templates/personal.php:124
-msgid "Upload new"
-msgstr ""
-
-#: templates/personal.php:126
-msgid "Select new from Files"
-msgstr ""
-
-#: templates/personal.php:127
-msgid "Remove image"
-msgstr ""
-
-#: templates/personal.php:128
-msgid "Either png or jpg. Ideally square but you will be able to crop it."
-msgstr ""
-
-#: templates/personal.php:130
-msgid "Your avatar is provided by your original account."
-msgstr ""
-
-#: templates/personal.php:134
-msgid "Cancel"
-msgstr ""
-
-#: templates/personal.php:135
-msgid "Choose as profile image"
-msgstr ""
-
-#: templates/personal.php:141 templates/personal.php:142
-msgid "Language"
-msgstr ""
-
-#: templates/personal.php:161
-msgid "Help translate"
-msgstr ""
-
-#: templates/personal.php:176
-msgid "Common Name"
-msgstr ""
-
-#: templates/personal.php:177
-msgid "Valid until"
-msgstr ""
-
-#: templates/personal.php:178
-msgid "Issued By"
-msgstr ""
-
-#: templates/personal.php:187
-#, php-format
-msgid "Valid until %s"
-msgstr ""
-
-#: templates/personal.php:206
-msgid "Import Root Certificate"
-msgstr ""
-
-#: templates/personal.php:220
-msgid "The encryption app is no longer enabled, please decrypt all your files"
-msgstr ""
-
-#: templates/personal.php:226
-msgid "Log-in password"
-msgstr ""
-
-#: templates/personal.php:231
-msgid "Decrypt all Files"
-msgstr ""
-
-#: templates/personal.php:241
-msgid ""
-"Your encryption keys are moved to a backup location. If something went wrong "
-"you can restore the keys. Only delete them permanently if you are sure that "
-"all files are decrypted correctly."
-msgstr ""
-
-#: templates/personal.php:245
-msgid "Restore Encryption Keys"
-msgstr ""
-
-#: templates/personal.php:249
-msgid "Delete Encryption Keys"
-msgstr ""
-
-#: templates/users/main.php:36
-msgid "Show storage location"
-msgstr ""
-
-#: templates/users/main.php:40
-msgid "Show last log in"
-msgstr ""
-
-#: templates/users/part.createuser.php:4
-msgid "Login Name"
-msgstr ""
-
-#: templates/users/part.createuser.php:20
-msgid "Create"
-msgstr ""
-
-#: templates/users/part.createuser.php:26
-msgid "Admin Recovery Password"
-msgstr ""
-
-#: templates/users/part.createuser.php:27
-#: templates/users/part.createuser.php:28
-msgid ""
-"Enter the recovery password in order to recover the users files during "
-"password change"
-msgstr ""
-
-#: templates/users/part.createuser.php:32
-msgid "Search Users and Groups"
-msgstr ""
-
-#: templates/users/part.grouplist.php:5
-msgid "Add Group"
-msgstr ""
-
-#: templates/users/part.grouplist.php:10
-msgid "Group"
-msgstr ""
-
-#: templates/users/part.grouplist.php:18
-msgid "Everyone"
-msgstr ""
-
-#: templates/users/part.grouplist.php:31
-msgid "Admins"
-msgstr ""
-
-#: templates/users/part.setquota.php:3
-msgid "Default Quota"
-msgstr ""
-
-#: templates/users/part.setquota.php:5 templates/users/part.userlist.php:66
-msgid "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")"
-msgstr ""
-
-#: templates/users/part.setquota.php:7 templates/users/part.userlist.php:75
-msgid "Unlimited"
-msgstr ""
-
-#: templates/users/part.setquota.php:22 templates/users/part.userlist.php:90
-msgid "Other"
-msgstr ""
-
-#: templates/users/part.userlist.php:7
-msgid "Username"
-msgstr ""
-
-#: templates/users/part.userlist.php:12
-msgid "Group Admin for"
-msgstr ""
-
-#: templates/users/part.userlist.php:14
-msgid "Quota"
-msgstr ""
-
-#: templates/users/part.userlist.php:15
-msgid "Storage Location"
-msgstr ""
-
-#: templates/users/part.userlist.php:16
-msgid "Last Login"
-msgstr ""
-
-#: templates/users/part.userlist.php:30
-msgid "change full name"
-msgstr ""
-
-#: templates/users/part.userlist.php:34
-msgid "set new password"
-msgstr ""
-
-#: templates/users/part.userlist.php:70
-msgid "Default"
-msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
deleted file mode 100644
index 736edf74cd4..00000000000
--- a/l10n/templates/user_ldap.pot
+++ /dev/null
@@ -1,609 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-
-#: ajax/clearMappings.php:34
-msgid "Failed to clear the mappings."
-msgstr ""
-
-#: ajax/deleteConfiguration.php:34
-msgid "Failed to delete the server configuration"
-msgstr ""
-
-#: ajax/testConfiguration.php:39
-msgid "The configuration is valid and the connection could be established!"
-msgstr ""
-
-#: ajax/testConfiguration.php:42
-msgid ""
-"The configuration is valid, but the Bind failed. Please check the server "
-"settings and credentials."
-msgstr ""
-
-#: ajax/testConfiguration.php:46
-msgid ""
-"The configuration is invalid. Please have a look at the logs for further "
-"details."
-msgstr ""
-
-#: ajax/wizard.php:32
-msgid "No action specified"
-msgstr ""
-
-#: ajax/wizard.php:38
-msgid "No configuration specified"
-msgstr ""
-
-#: ajax/wizard.php:97
-msgid "No data specified"
-msgstr ""
-
-#: ajax/wizard.php:105
-#, php-format
-msgid " Could not set configuration %s"
-msgstr ""
-
-#: js/settings.js:67
-msgid "Deletion failed"
-msgstr ""
-
-#: js/settings.js:83
-msgid "Take over settings from recent server configuration?"
-msgstr ""
-
-#: js/settings.js:84
-msgid "Keep settings?"
-msgstr ""
-
-#: js/settings.js:93
-msgid "{nthServer}. Server"
-msgstr ""
-
-#: js/settings.js:99
-msgid "Cannot add server configuration"
-msgstr ""
-
-#: js/settings.js:127
-msgid "mappings cleared"
-msgstr ""
-
-#: js/settings.js:128
-msgid "Success"
-msgstr ""
-
-#: js/settings.js:133
-msgid "Error"
-msgstr ""
-
-#: js/settings.js:266
-msgid "Please specify a Base DN"
-msgstr ""
-
-#: js/settings.js:267
-msgid "Could not determine Base DN"
-msgstr ""
-
-#: js/settings.js:299
-msgid "Please specify the port"
-msgstr ""
-
-#: js/settings.js:937
-msgid "Configuration OK"
-msgstr ""
-
-#: js/settings.js:946
-msgid "Configuration incorrect"
-msgstr ""
-
-#: js/settings.js:955
-msgid "Configuration incomplete"
-msgstr ""
-
-#: js/settings.js:972 js/settings.js:981
-msgid "Select groups"
-msgstr ""
-
-#: js/settings.js:975 js/settings.js:984
-msgid "Select object classes"
-msgstr ""
-
-#: js/settings.js:978
-msgid "Select attributes"
-msgstr ""
-
-#: js/settings.js:1006
-msgid "Connection test succeeded"
-msgstr ""
-
-#: js/settings.js:1013
-msgid "Connection test failed"
-msgstr ""
-
-#: js/settings.js:1022
-msgid "Do you really want to delete the current Server Configuration?"
-msgstr ""
-
-#: js/settings.js:1023
-msgid "Confirm Deletion"
-msgstr ""
-
-#: lib/wizard.php:98 lib/wizard.php:113
-#, php-format
-msgid "%s group found"
-msgid_plural "%s groups found"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/wizard.php:127
-#, php-format
-msgid "%s user found"
-msgid_plural "%s users found"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/wizard.php:394 lib/wizard.php:1131
-msgid "Could not find the desired feature"
-msgstr ""
-
-#: lib/wizard.php:938 lib/wizard.php:950
-msgid "Invalid Host"
-msgstr ""
-
-#: settings.php:53
-msgid "Server"
-msgstr ""
-
-#: settings.php:54
-msgid "User Filter"
-msgstr ""
-
-#: settings.php:55
-msgid "Login Filter"
-msgstr ""
-
-#: settings.php:56
-msgid "Group Filter"
-msgstr ""
-
-#: templates/part.settingcontrols.php:2
-msgid "Save"
-msgstr ""
-
-#: templates/part.settingcontrols.php:4
-msgid "Test Configuration"
-msgstr ""
-
-#: templates/part.settingcontrols.php:10 templates/part.wizardcontrols.php:15
-msgid "Help"
-msgstr ""
-
-#: templates/part.wizard-groupfilter.php:4
-#, php-format
-msgid "Groups meeting these criteria are available in %s:"
-msgstr ""
-
-#: templates/part.wizard-groupfilter.php:8
-#: templates/part.wizard-userfilter.php:8
-msgid "only those object classes:"
-msgstr ""
-
-#: templates/part.wizard-groupfilter.php:17
-#: templates/part.wizard-userfilter.php:17
-msgid "only from those groups:"
-msgstr ""
-
-#: templates/part.wizard-groupfilter.php:25
-#: templates/part.wizard-loginfilter.php:32
-#: templates/part.wizard-userfilter.php:25
-msgid "Edit raw filter instead"
-msgstr ""
-
-#: templates/part.wizard-groupfilter.php:30
-#: templates/part.wizard-loginfilter.php:37
-#: templates/part.wizard-userfilter.php:30
-msgid "Raw LDAP filter"
-msgstr ""
-
-#: templates/part.wizard-groupfilter.php:31
-#, php-format
-msgid ""
-"The filter specifies which LDAP groups shall have access to the %s instance."
-msgstr ""
-
-#: templates/part.wizard-groupfilter.php:34
-#: templates/part.wizard-userfilter.php:34
-msgid "Test Filter"
-msgstr ""
-
-#: templates/part.wizard-groupfilter.php:41
-msgid "groups found"
-msgstr ""
-
-#: templates/part.wizard-loginfilter.php:4
-msgid "Users login with this attribute:"
-msgstr ""
-
-#: templates/part.wizard-loginfilter.php:8
-msgid "LDAP Username:"
-msgstr ""
-
-#: templates/part.wizard-loginfilter.php:16
-msgid "LDAP Email Address:"
-msgstr ""
-
-#: templates/part.wizard-loginfilter.php:24
-msgid "Other Attributes:"
-msgstr ""
-
-#: templates/part.wizard-loginfilter.php:38
-#, php-format
-msgid ""
-"Defines the filter to apply, when login is attempted. %%uid replaces the "
-"username in the login action. Example: \"uid=%%uid\""
-msgstr ""
-
-#: templates/part.wizard-server.php:13
-msgid "1. Server"
-msgstr ""
-
-#: templates/part.wizard-server.php:20
-#, php-format
-msgid "%s. Server:"
-msgstr ""
-
-#: templates/part.wizard-server.php:25
-msgid "Add Server Configuration"
-msgstr ""
-
-#: templates/part.wizard-server.php:28
-msgid "Delete Configuration"
-msgstr ""
-
-#: templates/part.wizard-server.php:37
-msgid "Host"
-msgstr ""
-
-#: templates/part.wizard-server.php:38
-msgid ""
-"You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
-
-#: templates/part.wizard-server.php:43
-msgid "Port"
-msgstr ""
-
-#: templates/part.wizard-server.php:51
-msgid "User DN"
-msgstr ""
-
-#: templates/part.wizard-server.php:52
-msgid ""
-"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."
-msgstr ""
-
-#: templates/part.wizard-server.php:59
-msgid "Password"
-msgstr ""
-
-#: templates/part.wizard-server.php:60
-msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
-
-#: templates/part.wizard-server.php:67
-msgid "One Base DN per line"
-msgstr ""
-
-#: templates/part.wizard-server.php:68
-msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
-
-#: templates/part.wizard-server.php:75
-msgid ""
-"Avoids automatic LDAP requests. Better for bigger setups, but requires some "
-"LDAP knowledge."
-msgstr ""
-
-#: templates/part.wizard-server.php:78
-msgid "Manually enter LDAP filters (recommended for large directories)"
-msgstr ""
-
-#: templates/part.wizard-userfilter.php:4
-#, php-format
-msgid "Limit %s access to users meeting these criteria:"
-msgstr ""
-
-#: templates/part.wizard-userfilter.php:31
-#, php-format
-msgid ""
-"The filter specifies which LDAP users shall have access to the %s instance."
-msgstr ""
-
-#: templates/part.wizard-userfilter.php:41
-msgid "users found"
-msgstr ""
-
-#: templates/part.wizardcontrols.php:2
-msgid "Saving"
-msgstr ""
-
-#: templates/part.wizardcontrols.php:6
-msgid "Back"
-msgstr ""
-
-#: templates/part.wizardcontrols.php:9
-msgid "Continue"
-msgstr ""
-
-#: templates/settings.php:2
-msgid "LDAP"
-msgstr ""
-
-#: templates/settings.php:9
-msgid "Expert"
-msgstr ""
-
-#: templates/settings.php:10
-msgid "Advanced"
-msgstr ""
-
-#: templates/settings.php:13
-msgid ""
-"<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."
-msgstr ""
-
-#: templates/settings.php:16
-msgid ""
-"<b>Warning:</b> The PHP LDAP module is not installed, the backend will not "
-"work. Please ask your system administrator to install it."
-msgstr ""
-
-#: templates/settings.php:22
-msgid "Connection Settings"
-msgstr ""
-
-#: templates/settings.php:24
-msgid "Configuration Active"
-msgstr ""
-
-#: templates/settings.php:24
-msgid "When unchecked, this configuration will be skipped."
-msgstr ""
-
-#: templates/settings.php:25
-msgid "Backup (Replica) Host"
-msgstr ""
-
-#: templates/settings.php:25
-msgid ""
-"Give an optional backup host. It must be a replica of the main LDAP/AD "
-"server."
-msgstr ""
-
-#: templates/settings.php:26
-msgid "Backup (Replica) Port"
-msgstr ""
-
-#: templates/settings.php:27
-msgid "Disable Main Server"
-msgstr ""
-
-#: templates/settings.php:27
-msgid "Only connect to the replica server."
-msgstr ""
-
-#: templates/settings.php:28
-msgid "Case insensitive LDAP server (Windows)"
-msgstr ""
-
-#: templates/settings.php:29
-msgid "Turn off SSL certificate validation."
-msgstr ""
-
-#: templates/settings.php:29
-#, php-format
-msgid ""
-"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."
-msgstr ""
-
-#: templates/settings.php:30
-msgid "Cache Time-To-Live"
-msgstr ""
-
-#: templates/settings.php:30
-msgid "in seconds. A change empties the cache."
-msgstr ""
-
-#: templates/settings.php:32
-msgid "Directory Settings"
-msgstr ""
-
-#: templates/settings.php:34
-msgid "User Display Name Field"
-msgstr ""
-
-#: templates/settings.php:34
-msgid "The LDAP attribute to use to generate the user's display name."
-msgstr ""
-
-#: templates/settings.php:35
-msgid "Base User Tree"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "One User Base DN per line"
-msgstr ""
-
-#: templates/settings.php:36
-msgid "User Search Attributes"
-msgstr ""
-
-#: templates/settings.php:36 templates/settings.php:39
-msgid "Optional; one attribute per line"
-msgstr ""
-
-#: templates/settings.php:37
-msgid "Group Display Name Field"
-msgstr ""
-
-#: templates/settings.php:37
-msgid "The LDAP attribute to use to generate the groups's display name."
-msgstr ""
-
-#: templates/settings.php:38
-msgid "Base Group Tree"
-msgstr ""
-
-#: templates/settings.php:38
-msgid "One Group Base DN per line"
-msgstr ""
-
-#: templates/settings.php:39
-msgid "Group Search Attributes"
-msgstr ""
-
-#: templates/settings.php:40
-msgid "Group-Member association"
-msgstr ""
-
-#: templates/settings.php:41
-msgid "Nested Groups"
-msgstr ""
-
-#: templates/settings.php:41
-msgid ""
-"When switched on, groups that contain groups are supported. (Only works if "
-"the group member attribute contains DNs.)"
-msgstr ""
-
-#: templates/settings.php:42
-msgid "Paging chunksize"
-msgstr ""
-
-#: templates/settings.php:42
-msgid ""
-"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.)"
-msgstr ""
-
-#: templates/settings.php:44
-msgid "Special Attributes"
-msgstr ""
-
-#: templates/settings.php:46
-msgid "Quota Field"
-msgstr ""
-
-#: templates/settings.php:47
-msgid "Quota Default"
-msgstr ""
-
-#: templates/settings.php:47
-msgid "in bytes"
-msgstr ""
-
-#: templates/settings.php:48
-msgid "Email Field"
-msgstr ""
-
-#: templates/settings.php:49
-msgid "User Home Folder Naming Rule"
-msgstr ""
-
-#: templates/settings.php:49
-msgid ""
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
-msgstr ""
-
-#: templates/settings.php:55
-msgid "Internal Username"
-msgstr ""
-
-#: templates/settings.php:56
-msgid ""
-"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."
-msgstr ""
-
-#: templates/settings.php:57
-msgid "Internal Username Attribute:"
-msgstr ""
-
-#: templates/settings.php:58
-msgid "Override UUID detection"
-msgstr ""
-
-#: templates/settings.php:59
-msgid ""
-"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."
-msgstr ""
-
-#: templates/settings.php:60
-msgid "UUID Attribute for Users:"
-msgstr ""
-
-#: templates/settings.php:61
-msgid "UUID Attribute for Groups:"
-msgstr ""
-
-#: templates/settings.php:62
-msgid "Username-LDAP User Mapping"
-msgstr ""
-
-#: templates/settings.php:63
-msgid ""
-"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."
-msgstr ""
-
-#: templates/settings.php:64
-msgid "Clear Username-LDAP User Mapping"
-msgstr ""
-
-#: templates/settings.php:64
-msgid "Clear Groupname-LDAP Group Mapping"
-msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
deleted file mode 100644
index d39f89a98df..00000000000
--- a/l10n/templates/user_webdavauth.pot
+++ /dev/null
@@ -1,37 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud Core 8.0.0\n"
-"Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-11-10 01:54-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: templates/settings.php:2
-msgid "WebDAV Authentication"
-msgstr ""
-
-#: templates/settings.php:3
-msgid "Address:"
-msgstr ""
-
-#: templates/settings.php:5
-msgid "Save"
-msgstr ""
-
-#: templates/settings.php:6
-msgid ""
-"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."
-msgstr ""
-- 
GitLab


From cccedf6f30b74cc2eafc4b5000fb3dd442b0093f Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 6 Nov 2014 10:59:36 +0100
Subject: [PATCH 385/616] Convert StorageNotAvailableException to SabreDAV
 exception

Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.

This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
---
 lib/private/connector/sabre/directory.php   |  68 +++++-----
 lib/private/connector/sabre/file.php        | 136 +++++++++++---------
 lib/private/connector/sabre/objecttree.php  |  58 +++++----
 lib/private/connector/sabre/quotaplugin.php |   8 +-
 4 files changed, 156 insertions(+), 114 deletions(-)

diff --git a/lib/private/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
index 0d35c7d528e..ec5f82f9daa 100644
--- a/lib/private/connector/sabre/directory.php
+++ b/lib/private/connector/sabre/directory.php
@@ -51,29 +51,33 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
 	 */
 	public function createFile($name, $data = null) {
 
-		// for chunked upload also updating a existing file is a "createFile"
-		// because we create all the chunks before re-assemble them to the existing file.
-		if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
-
-			// exit if we can't create a new file and we don't updatable existing file
-			$info = OC_FileChunking::decodeName($name);
-			if (!$this->fileView->isCreatable($this->path) &&
-					!$this->fileView->isUpdatable($this->path . '/' . $info['name'])) {
-				throw new \Sabre\DAV\Exception\Forbidden();
-			}
+		try {
+			// for chunked upload also updating a existing file is a "createFile"
+			// because we create all the chunks before re-assemble them to the existing file.
+			if (isset($_SERVER['HTTP_OC_CHUNKED'])) {
 
-		} else {
-			// For non-chunked upload it is enough to check if we can create a new file
-			if (!$this->fileView->isCreatable($this->path)) {
-				throw new \Sabre\DAV\Exception\Forbidden();
+				// exit if we can't create a new file and we don't updatable existing file
+				$info = OC_FileChunking::decodeName($name);
+				if (!$this->fileView->isCreatable($this->path) &&
+						!$this->fileView->isUpdatable($this->path . '/' . $info['name'])) {
+					throw new \Sabre\DAV\Exception\Forbidden();
+				}
+
+			} else {
+				// For non-chunked upload it is enough to check if we can create a new file
+				if (!$this->fileView->isCreatable($this->path)) {
+					throw new \Sabre\DAV\Exception\Forbidden();
+				}
 			}
-		}
 
-		$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
-		// 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());
-		$node = new OC_Connector_Sabre_File($this->fileView, $info);
-		return $node->put($data);
+			$path = $this->fileView->getAbsolutePath($this->path) . '/' . $name;
+			// 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());
+			$node = new OC_Connector_Sabre_File($this->fileView, $info);
+			return $node->put($data);
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+		}
 	}
 
 	/**
@@ -84,15 +88,18 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
 	 * @return void
 	 */
 	public function createDirectory($name) {
-		if (!$this->info->isCreatable()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
+		try {
+			if (!$this->info->isCreatable()) {
+				throw new \Sabre\DAV\Exception\Forbidden();
+			}
 
-		$newPath = $this->path . '/' . $name;
-		if(!$this->fileView->mkdir($newPath)) {
-			throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
+			$newPath = $this->path . '/' . $name;
+			if(!$this->fileView->mkdir($newPath)) {
+				throw new \Sabre\DAV\Exception\Forbidden('Could not create directory '.$newPath);
+			}
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
 		}
-
 	}
 
 	/**
@@ -104,10 +111,13 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node
 	 * @return \Sabre\DAV\INode
 	 */
 	public function getChild($name, $info = null) {
-
 		$path = $this->path . '/' . $name;
 		if (is_null($info)) {
-			$info = $this->fileView->getFileInfo($path);
+			try {
+				$info = $this->fileView->getFileInfo($path);
+			} catch (\OCP\Files\StorageNotAvailableException $e) {
+				throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+			}
 		}
 
 		if (!$info) {
diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index dc036c1adca..4a9d491936c 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -50,9 +50,13 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 	 * @return string|null
 	 */
 	public function put($data) {
-		if ($this->info && $this->fileView->file_exists($this->path) &&
-			!$this->info->isUpdateable()) {
-			throw new \Sabre\DAV\Exception\Forbidden();
+		try {
+			if ($this->info && $this->fileView->file_exists($this->path) &&
+				!$this->info->isUpdateable()) {
+				throw new \Sabre\DAV\Exception\Forbidden();
+			}
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
 		}
 
 		// throw an exception if encryption was disabled but the files are still encrypted
@@ -102,43 +106,49 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 			throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
 		} catch (\OCA\Encryption\Exceptions\EncryptionException $e) {
 			throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
 		}
 
-		// if content length is sent by client:
-		// double check if the file was fully received
-		// compare expected and actual size
-		if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] !== 'LOCK') {
-			$expected = $_SERVER['CONTENT_LENGTH'];
-			$actual = $this->fileView->filesize($partFilePath);
-			if ($actual != $expected) {
-				$this->fileView->unlink($partFilePath);
-				throw new \Sabre\DAV\Exception\BadRequest('expected filesize ' . $expected . ' got ' . $actual);
+		try {
+			// if content length is sent by client:
+			// double check if the file was fully received
+			// compare expected and actual size
+			if (isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['REQUEST_METHOD'] !== 'LOCK') {
+				$expected = $_SERVER['CONTENT_LENGTH'];
+				$actual = $this->fileView->filesize($partFilePath);
+				if ($actual != $expected) {
+					$this->fileView->unlink($partFilePath);
+					throw new \Sabre\DAV\Exception\BadRequest('expected filesize ' . $expected . ' got ' . $actual);
+				}
 			}
-		}
 
-		// rename to correct path
-		try {
-			$renameOkay = $this->fileView->rename($partFilePath, $this->path);
-			$fileExists = $this->fileView->file_exists($this->path);
-			if ($renameOkay === false || $fileExists === false) {
-				\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
-				$this->fileView->unlink($partFilePath);
-				throw new \Sabre\DAV\Exception('Could not rename part file to final file');
+			// rename to correct path
+			try {
+				$renameOkay = $this->fileView->rename($partFilePath, $this->path);
+				$fileExists = $this->fileView->file_exists($this->path);
+				if ($renameOkay === false || $fileExists === false) {
+					\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
+					$this->fileView->unlink($partFilePath);
+					throw new \Sabre\DAV\Exception('Could not rename part file to final file');
+				}
+			}
+			catch (\OCP\Files\LockNotAcquiredException $e) {
+				// the file is currently being written to by another process
+				throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
 			}
-		}
-		catch (\OCP\Files\LockNotAcquiredException $e) {
-			// the file is currently being written to by another process
-			throw new OC_Connector_Sabre_Exception_FileLocked($e->getMessage(), $e->getCode(), $e);
-		}
 
-		// allow sync clients to send the mtime along in a header
-		$mtime = OC_Request::hasModificationTime();
-		if ($mtime !== false) {
-			if($this->fileView->touch($this->path, $mtime)) {
-				header('X-OC-MTime: accepted');
+			// allow sync clients to send the mtime along in a header
+			$mtime = OC_Request::hasModificationTime();
+			if ($mtime !== false) {
+				if($this->fileView->touch($this->path, $mtime)) {
+					header('X-OC-MTime: accepted');
+				}
 			}
+			$this->refreshInfo();
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
 		}
-		$this->refreshInfo();
 
 		return '"' . $this->info->getEtag() . '"';
 	}
@@ -158,6 +168,8 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 				return $this->fileView->fopen(ltrim($this->path, '/'), 'rb');
 			} catch (\OCA\Encryption\Exceptions\EncryptionException $e) {
 				throw new \Sabre\DAV\Exception\Forbidden($e->getMessage());
+			} catch (\OCP\Files\StorageNotAvailableException $e) {
+				throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
 			}
 		}
 
@@ -174,9 +186,13 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 			throw new \Sabre\DAV\Exception\Forbidden();
 		}
 
-		if (!$this->fileView->unlink($this->path)) {
-			// assume it wasn't possible to delete due to permissions
-			throw new \Sabre\DAV\Exception\Forbidden();
+		try {
+			if (!$this->fileView->unlink($this->path)) {
+				// assume it wasn't possible to delete due to permissions
+				throw new \Sabre\DAV\Exception\Forbidden();
+			}
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
 		}
 
 		// remove properties
@@ -235,33 +251,37 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 
 		if ($chunk_handler->isComplete()) {
 
-			// we first assembly the target file as a part file
-			$partFile = $path . '/' . $info['name'] . '.ocTransferId' . $info['transferid'] . '.part';
-			$chunk_handler->file_assemble($partFile);
-
-			// here is the final atomic rename
-			$targetPath = $path . '/' . $info['name'];
-			$renameOkay = $this->fileView->rename($partFile, $targetPath);
-			$fileExists = $this->fileView->file_exists($targetPath);
-			if ($renameOkay === false || $fileExists === false) {
-				\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
-				// only delete if an error occurred and the target file was already created
-				if ($fileExists) {
-					$this->fileView->unlink($targetPath);
+			try {
+				// we first assembly the target file as a part file
+				$partFile = $path . '/' . $info['name'] . '.ocTransferId' . $info['transferid'] . '.part';
+				$chunk_handler->file_assemble($partFile);
+
+				// here is the final atomic rename
+				$targetPath = $path . '/' . $info['name'];
+				$renameOkay = $this->fileView->rename($partFile, $targetPath);
+				$fileExists = $this->fileView->file_exists($targetPath);
+				if ($renameOkay === false || $fileExists === false) {
+					\OC_Log::write('webdav', '\OC\Files\Filesystem::rename() failed', \OC_Log::ERROR);
+					// only delete if an error occurred and the target file was already created
+					if ($fileExists) {
+						$this->fileView->unlink($targetPath);
+					}
+					throw new \Sabre\DAV\Exception('Could not rename part file assembled from chunks');
 				}
-				throw new \Sabre\DAV\Exception('Could not rename part file assembled from chunks');
-			}
 
-			// allow sync clients to send the mtime along in a header
-			$mtime = OC_Request::hasModificationTime();
-			if ($mtime !== false) {
-				if($this->fileView->touch($targetPath, $mtime)) {
-					header('X-OC-MTime: accepted');
+				// allow sync clients to send the mtime along in a header
+				$mtime = OC_Request::hasModificationTime();
+				if ($mtime !== false) {
+					if($this->fileView->touch($targetPath, $mtime)) {
+						header('X-OC-MTime: accepted');
+					}
 				}
-			}
 
-			$info = $this->fileView->getFileInfo($targetPath);
-			return $info->getEtag();
+				$info = $this->fileView->getFileInfo($targetPath);
+				return $info->getEtag();
+			} catch (\OCP\Files\StorageNotAvailableException $e) {
+				throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+			}
 		}
 
 		return null;
diff --git a/lib/private/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
index d7a96cfc88e..14a55b5cada 100644
--- a/lib/private/connector/sabre/objecttree.php
+++ b/lib/private/connector/sabre/objecttree.php
@@ -138,27 +138,31 @@ class ObjectTree extends \Sabre\DAV\ObjectTree {
 			$isMovableMount = true;
 		}
 
-		// check update privileges
-		if (!$this->fileView->isUpdatable($sourcePath) && !$isMovableMount) {
-			throw new \Sabre\DAV\Exception\Forbidden();
-		}
-		if ($sourceDir !== $destinationDir) {
-			if (!$this->fileView->isCreatable($destinationDir)) {
+		try {
+			// check update privileges
+			if (!$this->fileView->isUpdatable($sourcePath) && !$isMovableMount) {
 				throw new \Sabre\DAV\Exception\Forbidden();
 			}
-			if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
-				throw new \Sabre\DAV\Exception\Forbidden();
+			if ($sourceDir !== $destinationDir) {
+				if (!$this->fileView->isCreatable($destinationDir)) {
+					throw new \Sabre\DAV\Exception\Forbidden();
+				}
+				if (!$this->fileView->isDeletable($sourcePath) && !$isMovableMount) {
+					throw new \Sabre\DAV\Exception\Forbidden();
+				}
 			}
-		}
 
-		$fileName = basename($destinationPath);
-		if (!\OCP\Util::isValidFileName($fileName)) {
-			throw new \Sabre\DAV\Exception\BadRequest();
-		}
+			$fileName = basename($destinationPath);
+			if (!\OCP\Util::isValidFileName($fileName)) {
+				throw new \Sabre\DAV\Exception\BadRequest();
+			}
 
-		$renameOkay = $this->fileView->rename($sourcePath, $destinationPath);
-		if (!$renameOkay) {
-			throw new \Sabre\DAV\Exception\Forbidden('');
+			$renameOkay = $this->fileView->rename($sourcePath, $destinationPath);
+			if (!$renameOkay) {
+				throw new \Sabre\DAV\Exception\Forbidden('');
+			}
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
 		}
 
 		// update properties
@@ -188,19 +192,23 @@ class ObjectTree extends \Sabre\DAV\ObjectTree {
 			throw new \Sabre\DAV\Exception\ServiceUnavailable('filesystem not setup');
 		}
 
-		if ($this->fileView->is_file($source)) {
-			$this->fileView->copy($source, $destination);
-		} else {
-			$this->fileView->mkdir($destination);
-			$dh = $this->fileView->opendir($source);
-			if (is_resource($dh)) {
-				while (($subNode = readdir($dh)) !== false) {
+		try {
+			if ($this->fileView->is_file($source)) {
+				$this->fileView->copy($source, $destination);
+			} else {
+				$this->fileView->mkdir($destination);
+				$dh = $this->fileView->opendir($source);
+				if (is_resource($dh)) {
+					while (($subNode = readdir($dh)) !== false) {
 
-					if ($subNode == '.' || $subNode == '..') continue;
-					$this->copy($source . '/' . $subNode, $destination . '/' . $subNode);
+						if ($subNode == '.' || $subNode == '..') continue;
+						$this->copy($source . '/' . $subNode, $destination . '/' . $subNode);
 
+					}
 				}
 			}
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
 		}
 
 		list($destinationDir,) = \Sabre\DAV\URLUtil::splitPath($destination);
diff --git a/lib/private/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php
index ebcc894d744..59d0e188f66 100644
--- a/lib/private/connector/sabre/quotaplugin.php
+++ b/lib/private/connector/sabre/quotaplugin.php
@@ -102,7 +102,11 @@ class OC_Connector_Sabre_QuotaPlugin extends \Sabre\DAV\ServerPlugin {
 	 * @return mixed
 	 */
 	public function getFreeSpace($parentUri) {
-		$freeSpace = $this->view->free_space($parentUri);
-		return $freeSpace;
+		try {
+			$freeSpace = $this->view->free_space($parentUri);
+			return $freeSpace;
+		} catch (\OCP\Files\StorageNotAvailableException $e) {
+			throw new \Sabre\DAV\Exception\ServiceUnavailable($e->getMessage());
+		}
 	}
 }
-- 
GitLab


From 43eb375ace5c62201e2323b39a5f400b2bdc97b7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 7 Nov 2014 14:26:12 +0100
Subject: [PATCH 386/616] Add \OC\App\Manager to handle enabling/disabling apps

---
 lib/private/app/appmanager.php  | 138 ++++++++++++++++++++++
 lib/private/server.php          |  15 +++
 lib/public/app/iappmanager.php  |  51 +++++++++
 lib/public/iservercontainer.php |   7 ++
 tests/lib/app/manager.php       | 195 ++++++++++++++++++++++++++++++++
 5 files changed, 406 insertions(+)
 create mode 100644 lib/private/app/appmanager.php
 create mode 100644 lib/public/app/iappmanager.php
 create mode 100644 tests/lib/app/manager.php

diff --git a/lib/private/app/appmanager.php b/lib/private/app/appmanager.php
new file mode 100644
index 00000000000..6d9aa0bfe37
--- /dev/null
+++ b/lib/private/app/appmanager.php
@@ -0,0 +1,138 @@
+<?php
+
+/**
+ * Copyright (c) 2014 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 OC\App;
+
+use OCP\App\IAppManager;
+use OCP\IAppConfig;
+use OCP\IGroupManager;
+use OCP\IUserSession;
+
+class AppManager implements IAppManager {
+	/**
+	 * @var \OCP\IUserSession
+	 */
+	private $userSession;
+
+	/**
+	 * @var \OCP\IAppConfig
+	 */
+	private $appConfig;
+
+	/**
+	 * @var \OCP\IGroupManager
+	 */
+	private $groupManager;
+
+	/**
+	 * @var string[] $appId => $enabled
+	 */
+	private $installedAppsCache;
+
+	/**
+	 * @param \OCP\IUserSession $userSession
+	 * @param \OCP\IAppConfig $appConfig
+	 * @param \OCP\IGroupManager $groupManager
+	 */
+	public function __construct(IUserSession $userSession, IAppConfig $appConfig, IGroupManager $groupManager) {
+		$this->userSession = $userSession;
+		$this->appConfig = $appConfig;
+		$this->groupManager = $groupManager;
+	}
+
+	/**
+	 * @return string[] $appId => $enabled
+	 */
+	private function getInstalledApps() {
+		if (!$this->installedAppsCache) {
+			$values = $this->appConfig->getValues(false, 'enabled');
+			$this->installedAppsCache = array_filter($values, function ($value) {
+				return $value !== 'no';
+			});
+			ksort($this->installedAppsCache);
+		}
+		return $this->installedAppsCache;
+	}
+
+	/**
+	 * Check if an app is enabled for user
+	 *
+	 * @param string $appId
+	 * @param \OCP\IUser $user (optional) if not defined, the currently logged in user will be used
+	 * @return bool
+	 */
+	public function isEnabledForUser($appId, $user = null) {
+		if (is_null($user)) {
+			$user = $this->userSession->getUser();
+		}
+		$installedApps = $this->getInstalledApps();
+		if (isset($installedApps[$appId])) {
+			$enabled = $installedApps[$appId];
+			if ($enabled === 'yes') {
+				return true;
+			} elseif (is_null($user)) {
+				return false;
+			} else {
+				$groupIds = json_decode($enabled);
+				$userGroups = $this->groupManager->getUserGroupIds($user);
+				foreach ($userGroups as $groupId) {
+					if (array_search($groupId, $groupIds) !== false) {
+						return true;
+					}
+				}
+				return false;
+			}
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Check if an app is installed in the instance
+	 *
+	 * @param string $appId
+	 * @return bool
+	 */
+	public function isInstalled($appId) {
+		$installedApps = $this->getInstalledApps();
+		return isset($installedApps[$appId]);
+	}
+
+	/**
+	 * Enable an app for every user
+	 *
+	 * @param string $appId
+	 */
+	public function enableApp($appId) {
+		$this->appConfig->setValue($appId, 'enabled', 'yes');
+	}
+
+	/**
+	 * Enable an app only for specific groups
+	 *
+	 * @param string $appId
+	 * @param \OCP\IGroup[] $groups
+	 */
+	public function enableAppForGroups($appId, $groups) {
+		$groupIds = array_map(function ($group) {
+			/** @var \OCP\IGroup $group */
+			return $group->getGID();
+		}, $groups);
+		$this->appConfig->setValue($appId, 'enabled', json_encode($groupIds));
+	}
+
+	/**
+	 * Disable an app for every user
+	 *
+	 * @param string $appId
+	 */
+	public function disableApp($appId) {
+		$this->appConfig->setValue($appId, 'enabled', 'no');
+	}
+}
diff --git a/lib/private/server.php b/lib/private/server.php
index f43613e8188..c413ee8bf6d 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -237,6 +237,12 @@ class Server extends SimpleContainer implements IServerContainer {
 			/** @var Server $c */
 			return new TempManager(get_temp_dir(), $c->getLogger());
 		});
+		$this->registerService('AppManager', function(Server $c) {
+			$userSession = $c->getUserSession();
+			$appConfig = $c->getAppConfig();
+			$groupManager = $c->getGroupManager();
+			return new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		});
 	}
 
 	/**
@@ -616,4 +622,13 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getTempManager() {
 		return $this->query('TempManager');
 	}
+
+	/**
+	 * Get the app manager
+	 *
+	 * @return \OCP\App\IAppManager
+	 */
+	function getAppManager() {
+		return $this->query('AppManager');
+	}
 }
diff --git a/lib/public/app/iappmanager.php b/lib/public/app/iappmanager.php
new file mode 100644
index 00000000000..ebd84a1ce9d
--- /dev/null
+++ b/lib/public/app/iappmanager.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * Copyright (c) 2014 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 OCP\App;
+
+interface IAppManager {
+	/**
+	 * Check if an app is enabled for user
+	 *
+	 * @param string $appId
+	 * @param \OCP\IUser $user (optional) if not defined, the currently loggedin user will be used
+	 * @return bool
+	 */
+	public function isEnabledForUser($appId, $user = null);
+
+	/**
+	 * Check if an app is installed in the instance
+	 *
+	 * @param string $appId
+	 * @return bool
+	 */
+	public function isInstalled($appId);
+
+	/**
+	 * Enable an app for every user
+	 *
+	 * @param string $appId
+	 */
+	public function enableApp($appId);
+
+	/**
+	 * Enable an app only for specific groups
+	 *
+	 * @param string $appId
+	 * @param \OCP\IGroup[] $groups
+	 */
+	public function enableAppForGroups($appId, $groups);
+
+	/**
+	 * Disable an app for every user
+	 *
+	 * @param string $appId
+	 */
+	public function disableApp($appId);
+}
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index 794bba6bfb6..b734d1b4161 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -291,4 +291,11 @@ interface IServerContainer {
 	 * @return \OCP\ITempManager
 	 */
 	function getTempManager();
+
+	/**
+	 * Get the app manager
+	 *
+	 * @return \OCP\App\IAppManager
+	 */
+	function getAppManager();
 }
diff --git a/tests/lib/app/manager.php b/tests/lib/app/manager.php
new file mode 100644
index 00000000000..4c0555b501f
--- /dev/null
+++ b/tests/lib/app/manager.php
@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * Copyright (c) 2014 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\App;
+
+use OC\Group\Group;
+use OC\User\User;
+
+class Manager extends \PHPUnit_Framework_TestCase {
+	/**
+	 * @return \OCP\IAppConfig | \PHPUnit_Framework_MockObject_MockObject
+	 */
+	protected function getAppConfig() {
+		$appConfig = array();
+		$config = $this->getMockBuilder('\OCP\IAppConfig')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$config->expects($this->any())
+			->method('getValue')
+			->will($this->returnCallback(function ($app, $key, $default) use (&$appConfig) {
+				return (isset($appConfig[$app]) and isset($appConfig[$app][$key])) ? $appConfig[$app][$key] : $default;
+			}));
+		$config->expects($this->any())
+			->method('setValue')
+			->will($this->returnCallback(function ($app, $key, $value) use (&$appConfig) {
+				if (!isset($appConfig[$app])) {
+					$appConfig[$app] = array();
+				}
+				$appConfig[$app][$key] = $value;
+			}));
+		$config->expects($this->any())
+			->method('getValues')
+			->will($this->returnCallback(function ($app, $key) use (&$appConfig) {
+				if ($app) {
+					return $appConfig[$app];
+				} else {
+					$values = array();
+					foreach ($appConfig as $app => $appData) {
+						if (isset($appData[$key])) {
+							$values[$app] = $appData[$key];
+						}
+					}
+					return $values;
+				}
+			}));
+
+		return $config;
+	}
+
+	public function testEnableApp() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$manager->enableApp('test');
+		$this->assertEquals('yes', $appConfig->getValue('test', 'enabled', 'no'));
+	}
+
+	public function testDisableApp() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$manager->disableApp('test');
+		$this->assertEquals('no', $appConfig->getValue('test', 'enabled', 'no'));
+	}
+
+	public function testEnableAppForGroups() {
+		$groups = array(
+			new Group('group1', array(), null),
+			new Group('group2', array(), null)
+		);
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$manager->enableAppForGroups('test', $groups);
+		$this->assertEquals('["group1","group2"]', $appConfig->getValue('test', 'enabled', 'no'));
+	}
+
+	public function testIsInstalledEnabled() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', 'yes');
+		$this->assertTrue($manager->isInstalled('test'));
+	}
+
+	public function testIsInstalledDisabled() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', 'no');
+		$this->assertFalse($manager->isInstalled('test'));
+	}
+
+	public function testIsInstalledEnabledForGroups() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', '["foo"]');
+		$this->assertTrue($manager->isInstalled('test'));
+	}
+
+	public function testIsEnabledForUserEnabled() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', 'yes');
+		$user = new User('user1', null);
+		$this->assertTrue($manager->isEnabledForUser('test', $user));
+	}
+
+	public function testIsEnabledForUserDisabled() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', 'no');
+		$user = new User('user1', null);
+		$this->assertFalse($manager->isEnabledForUser('test', $user));
+	}
+
+	public function testIsEnabledForUserEnabledForGroup() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$user = new User('user1', null);
+
+		$groupManager->expects($this->once())
+			->method('getUserGroupIds')
+			->with($user)
+			->will($this->returnValue(array('foo', 'bar')));
+
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', '["foo"]');
+		$this->assertTrue($manager->isEnabledForUser('test', $user));
+	}
+
+	public function testIsEnabledForUserDisabledForGroup() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$user = new User('user1', null);
+
+		$groupManager->expects($this->once())
+			->method('getUserGroupIds')
+			->with($user)
+			->will($this->returnValue(array('bar')));
+
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', '["foo"]');
+		$this->assertFalse($manager->isEnabledForUser('test', $user));
+	}
+
+	public function testIsEnabledForUserLoggedOut() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', '["foo"]');
+		$this->assertFalse($manager->IsEnabledForUser('test'));
+	}
+
+	public function testIsEnabledForUserLoggedIn() {
+		$userSession = $this->getMock('\OCP\IUserSession');
+		$groupManager = $this->getMock('\OCP\IGroupManager');
+		$user = new User('user1', null);
+
+		$userSession->expects($this->once())
+			->method('getUser')
+			->will($this->returnValue($user));
+		$groupManager->expects($this->once())
+			->method('getUserGroupIds')
+			->with($user)
+			->will($this->returnValue(array('foo', 'bar')));
+
+		$appConfig = $this->getAppConfig();
+		$manager = new \OC\App\AppManager($userSession, $appConfig, $groupManager);
+		$appConfig->setValue('test', 'enabled', '["foo"]');
+		$this->assertTrue($manager->isEnabledForUser('test'));
+	}
+}
-- 
GitLab


From f76419d190ab1557dcd333ebe7a9519340a2b0a7 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Sat, 8 Nov 2014 00:38:00 -0800
Subject: [PATCH 387/616] fix touch() when $mtime is set (Google wants RFC3339)
 #11267

ownCloud passes us a Unix time integer, but the GDrive API wants
an RFC3339-formatted date. Actually it wants a single particular
RFC3339 format, not just anything that complies will do - it
requires the fractions to be specified, though RFC3339 doesn't.

This resolves issue #11267 (and was also noted by PVince81 in
reviewing PR #6989).
---
 apps/files_external/lib/google.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 62b0f182e98..a4337bc937b 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -496,7 +496,10 @@ class Google extends \OC\Files\Storage\Common {
 		$result = false;
 		if ($file) {
 			if (isset($mtime)) {
-				$file->setModifiedDate($mtime);
+				// This is just RFC3339, but frustratingly, GDrive's API *requires*
+				// the fractions portion be present, while no handy PHP constant
+				// for RFC3339 or ISO8601 includes it. So we do it ourselves.
+				$file->setModifiedDate(date('Y-m-d\TH:i:s.uP', $mtime));
 				$result = $this->service->files->patch($file->getId(), $file, array(
 					'setModifiedDate' => true,
 				));
-- 
GitLab


From e0ae87051fb07c7f01b2b5bcf07df49469a30e5d Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Mon, 10 Nov 2014 17:49:35 -0800
Subject: [PATCH 388/616] storage test: use new file for testTouchCreateFile()

this test would never succeed, because the previous test -
testFOpen() - creates the file 'foo', but testTouchCreateFile()
starts out by asserting it doesn't exist. Change the test to
use a file called 'touch' instead (which does not previously
exist).
---
 tests/lib/files/storage/storage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index cf42523a5e2..960eb137ea0 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -340,10 +340,10 @@ abstract class Storage extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testTouchCreateFile() {
-		$this->assertFalse($this->instance->file_exists('foo'));
+		$this->assertFalse($this->instance->file_exists('touch'));
 		// returns true on success
-		$this->assertTrue($this->instance->touch('foo'));
-		$this->assertTrue($this->instance->file_exists('foo'));
+		$this->assertTrue($this->instance->touch('touch'));
+		$this->assertTrue($this->instance->file_exists('touch'));
 	}
 
 	public function testRecursiveRmdir() {
-- 
GitLab


From 664cc4ac0edc1914ddd06d0478e1ee86a0ee9ecf Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 11 Nov 2014 01:55:23 -0500
Subject: [PATCH 389/616] [tx-robot] updated from transifex

---
 apps/files/l10n/fr.js                 |  2 +-
 apps/files/l10n/fr.json               |  2 +-
 apps/files_encryption/l10n/cs_CZ.js   |  4 +-
 apps/files_encryption/l10n/cs_CZ.json |  4 +-
 apps/files_external/l10n/fr.js        |  6 +--
 apps/files_external/l10n/fr.json      |  6 +--
 apps/user_ldap/l10n/cs_CZ.js          |  2 +-
 apps/user_ldap/l10n/cs_CZ.json        |  2 +-
 apps/user_ldap/l10n/fr.js             |  4 +-
 apps/user_ldap/l10n/fr.json           |  4 +-
 settings/l10n/ar.js                   |  3 +-
 settings/l10n/ar.json                 |  3 +-
 settings/l10n/ast.js                  |  3 +-
 settings/l10n/ast.json                |  3 +-
 settings/l10n/bg_BG.js                |  3 +-
 settings/l10n/bg_BG.json              |  3 +-
 settings/l10n/bn_BD.js                |  3 +-
 settings/l10n/bn_BD.json              |  3 +-
 settings/l10n/ca.js                   |  3 +-
 settings/l10n/ca.json                 |  3 +-
 settings/l10n/cs_CZ.js                |  5 +-
 settings/l10n/cs_CZ.json              |  5 +-
 settings/l10n/cy_GB.js                |  5 +-
 settings/l10n/cy_GB.json              |  5 +-
 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                |  3 +-
 settings/l10n/de_DE.json              |  3 +-
 settings/l10n/el.js                   |  3 +-
 settings/l10n/el.json                 |  3 +-
 settings/l10n/en_GB.js                |  3 +-
 settings/l10n/en_GB.json              |  3 +-
 settings/l10n/eo.js                   |  3 +-
 settings/l10n/eo.json                 |  3 +-
 settings/l10n/es.js                   |  3 +-
 settings/l10n/es.json                 |  3 +-
 settings/l10n/es_AR.js                |  3 +-
 settings/l10n/es_AR.json              |  3 +-
 settings/l10n/es_MX.js                |  3 +-
 settings/l10n/es_MX.json              |  3 +-
 settings/l10n/et_EE.js                |  3 +-
 settings/l10n/et_EE.json              |  3 +-
 settings/l10n/eu.js                   |  3 +-
 settings/l10n/eu.json                 |  3 +-
 settings/l10n/fa.js                   |  3 +-
 settings/l10n/fa.json                 |  3 +-
 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/he.js                   |  3 +-
 settings/l10n/he.json                 |  3 +-
 settings/l10n/hr.js                   |  3 +-
 settings/l10n/hr.json                 |  3 +-
 settings/l10n/hu_HU.js                |  3 +-
 settings/l10n/hu_HU.json              |  3 +-
 settings/l10n/ia.js                   |  2 +-
 settings/l10n/ia.json                 |  2 +-
 settings/l10n/id.js                   |  3 +-
 settings/l10n/id.json                 |  3 +-
 settings/l10n/is.js                   |  2 +-
 settings/l10n/is.json                 |  2 +-
 settings/l10n/it.js                   |  3 +-
 settings/l10n/it.json                 |  3 +-
 settings/l10n/ja.js                   |  3 +-
 settings/l10n/ja.json                 |  3 +-
 settings/l10n/ka_GE.js                |  3 +-
 settings/l10n/ka_GE.json              |  3 +-
 settings/l10n/km.js                   |  3 +-
 settings/l10n/km.json                 |  3 +-
 settings/l10n/ko.js                   |  3 +-
 settings/l10n/ko.json                 |  3 +-
 settings/l10n/ku_IQ.js                |  1 -
 settings/l10n/ku_IQ.json              |  1 -
 settings/l10n/lb.js                   |  3 +-
 settings/l10n/lb.json                 |  3 +-
 settings/l10n/lt_LT.js                |  3 +-
 settings/l10n/lt_LT.json              |  3 +-
 settings/l10n/lv.js                   |  3 +-
 settings/l10n/lv.json                 |  3 +-
 settings/l10n/mk.js                   |  3 +-
 settings/l10n/mk.json                 |  3 +-
 settings/l10n/ms_MY.js                |  3 +-
 settings/l10n/ms_MY.json              |  3 +-
 settings/l10n/nb_NO.js                |  3 +-
 settings/l10n/nb_NO.json              |  3 +-
 settings/l10n/nl.js                   |  3 +-
 settings/l10n/nl.json                 |  3 +-
 settings/l10n/nn_NO.js                |  3 +-
 settings/l10n/nn_NO.json              |  3 +-
 settings/l10n/oc.js                   |  3 +-
 settings/l10n/oc.json                 |  3 +-
 settings/l10n/pa.js                   |  1 -
 settings/l10n/pa.json                 |  1 -
 settings/l10n/pl.js                   |  3 +-
 settings/l10n/pl.json                 |  3 +-
 settings/l10n/pt_BR.js                |  3 +-
 settings/l10n/pt_BR.json              |  3 +-
 settings/l10n/pt_PT.js                | 75 +++++++++++++--------------
 settings/l10n/pt_PT.json              | 75 +++++++++++++--------------
 settings/l10n/ro.js                   |  3 +-
 settings/l10n/ro.json                 |  3 +-
 settings/l10n/ru.js                   |  3 +-
 settings/l10n/ru.json                 |  3 +-
 settings/l10n/si_LK.js                |  3 +-
 settings/l10n/si_LK.json              |  3 +-
 settings/l10n/sk_SK.js                |  3 +-
 settings/l10n/sk_SK.json              |  3 +-
 settings/l10n/sl.js                   |  3 +-
 settings/l10n/sl.json                 |  3 +-
 settings/l10n/sq.js                   |  3 +-
 settings/l10n/sq.json                 |  3 +-
 settings/l10n/sr.js                   |  3 +-
 settings/l10n/sr.json                 |  3 +-
 settings/l10n/sr@latin.js             |  4 +-
 settings/l10n/sr@latin.json           |  4 +-
 settings/l10n/sv.js                   |  3 +-
 settings/l10n/sv.json                 |  3 +-
 settings/l10n/ta_LK.js                |  3 +-
 settings/l10n/ta_LK.json              |  3 +-
 settings/l10n/th_TH.js                |  3 +-
 settings/l10n/th_TH.json              |  3 +-
 settings/l10n/tr.js                   |  3 +-
 settings/l10n/tr.json                 |  3 +-
 settings/l10n/ug.js                   |  3 +-
 settings/l10n/ug.json                 |  3 +-
 settings/l10n/uk.js                   |  3 +-
 settings/l10n/uk.json                 |  3 +-
 settings/l10n/ur_PK.js                |  4 +-
 settings/l10n/ur_PK.json              |  4 +-
 settings/l10n/vi.js                   |  3 +-
 settings/l10n/vi.json                 |  3 +-
 settings/l10n/zh_CN.js                |  3 +-
 settings/l10n/zh_CN.json              |  3 +-
 settings/l10n/zh_HK.js                |  4 +-
 settings/l10n/zh_HK.json              |  4 +-
 settings/l10n/zh_TW.js                |  3 +-
 settings/l10n/zh_TW.json              |  3 +-
 142 files changed, 228 insertions(+), 350 deletions(-)

diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 967908eaca0..719d3355bca 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -23,7 +23,7 @@ OC.L10N.register(
     "Invalid Token" : "Jeton non valide",
     "No file was uploaded. Unknown error" : "Aucun fichier n'a été envoyé. Erreur inconnue",
     "There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été envoyé avec succès.",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini :",
     "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
     "The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement envoyé.",
     "No file was uploaded" : "Pas de fichier envoyé.",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 19c9154dc79..8501a8551b7 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -21,7 +21,7 @@
     "Invalid Token" : "Jeton non valide",
     "No file was uploaded. Unknown error" : "Aucun fichier n'a été envoyé. Erreur inconnue",
     "There is no error, the file uploaded with success" : "Aucune erreur, le fichier a été envoyé avec succès.",
-    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini:",
+    "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Le fichier envoyé dépasse l'instruction upload_max_filesize située dans le fichier php.ini :",
     "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Le fichier envoyé dépasse l'instruction MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
     "The uploaded file was only partially uploaded" : "Le fichier n'a été que partiellement envoyé.",
     "No file was uploaded" : "Pas de fichier envoyé.",
diff --git a/apps/files_encryption/l10n/cs_CZ.js b/apps/files_encryption/l10n/cs_CZ.js
index 0074192ab02..5d4d36557b7 100644
--- a/apps/files_encryption/l10n/cs_CZ.js
+++ b/apps/files_encryption/l10n/cs_CZ.js
@@ -8,8 +8,8 @@ OC.L10N.register(
     "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
     "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
     "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
-    "Please provide the old recovery password" : "Zapište prosím staré heslo pro obnovu",
-    "Please provide a new recovery password" : "Zapište prosím nové heslo pro obnovu",
+    "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
+    "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
     "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
     "Password successfully changed." : "Heslo bylo úspěšně změněno.",
     "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
diff --git a/apps/files_encryption/l10n/cs_CZ.json b/apps/files_encryption/l10n/cs_CZ.json
index 4ecc7c2aeec..3f25a78695e 100644
--- a/apps/files_encryption/l10n/cs_CZ.json
+++ b/apps/files_encryption/l10n/cs_CZ.json
@@ -6,8 +6,8 @@
     "Recovery key successfully enabled" : "Záchranný klíč byl úspěšně povolen",
     "Could not disable recovery key. Please check your recovery key password!" : "Nelze zakázat záchranný klíč. Zkontrolujte prosím heslo vašeho záchranného klíče!",
     "Recovery key successfully disabled" : "Záchranný klíč byl úspěšně zakázán",
-    "Please provide the old recovery password" : "Zapište prosím staré heslo pro obnovu",
-    "Please provide a new recovery password" : "Zapište prosím nové heslo pro obnovu",
+    "Please provide the old recovery password" : "Zadejte prosím staré heslo pro obnovu",
+    "Please provide a new recovery password" : "Zadejte prosím nové heslo pro obnovu",
     "Please repeat the new recovery password" : "Zopakujte prosím nové heslo pro obnovu",
     "Password successfully changed." : "Heslo bylo úspěšně změněno.",
     "Could not change the password. Maybe the old password was not correct." : "Změna hesla se nezdařila. Pravděpodobně nebylo stávající heslo zadáno správně.",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index bdaf0a19b01..a5efda84f81 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -4,8 +4,8 @@ OC.L10N.register(
     "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
     "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
     "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
-    "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur: %s",
-    "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur: %s",
+    "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
+    "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
     "Local" : "Local",
     "Location" : "Emplacement",
@@ -27,7 +27,7 @@ OC.L10N.register(
     "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
     "Root" : "Root",
-    "Secure ftps://" : "Sécuriser via ftps://",
+    "Secure ftps://" : "Sécurisation ftps://",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
     "OpenStack Object Storage" : "Object de Stockage OpenStack",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index e9f1c91b30d..fc59b74d3c5 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -2,8 +2,8 @@
     "Fetching request tokens failed. Verify that your Dropbox app key and secret are correct." : "La récupération des jetons d’authentification a échoué. Veuillez vérifier votre clé d'application Dropbox ainsi que le mot de passe.",
     "Fetching access tokens failed. Verify that your Dropbox app key and secret are correct." : "La requête d’accès aux jetons d’authentification a échoué. Veuillez vérifier votre App-Key Dropbox ainsi que le mot de passe.",
     "Please provide a valid Dropbox app key and secret." : "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de passe valides.",
-    "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur: %s",
-    "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur: %s",
+    "Step 1 failed. Exception: %s" : "L’étape 1 a échoué. Erreur : %s",
+    "Step 2 failed. Exception: %s" : "L’étape 2 a échoué. Erreur : %s",
     "External storage" : "Stockage externe",
     "Local" : "Local",
     "Location" : "Emplacement",
@@ -25,7 +25,7 @@
     "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
     "Root" : "Root",
-    "Secure ftps://" : "Sécuriser via ftps://",
+    "Secure ftps://" : "Sécurisation ftps://",
     "Client ID" : "ID Client",
     "Client secret" : "Secret client",
     "OpenStack Object Storage" : "Object de Stockage OpenStack",
diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js
index 793fd61c4b3..017b4f37e39 100644
--- a/apps/user_ldap/l10n/cs_CZ.js
+++ b/apps/user_ldap/l10n/cs_CZ.js
@@ -69,7 +69,7 @@ OC.L10N.register(
     "One Base DN per line" : "Jedna základní DN na řádku",
     "You can specify Base DN for users and groups in the Advanced tab" : "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.",
-    "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)",
     "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
     "users found" : "nalezení uživatelé",
diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json
index fb906cb7d9c..b63a3fb11ff 100644
--- a/apps/user_ldap/l10n/cs_CZ.json
+++ b/apps/user_ldap/l10n/cs_CZ.json
@@ -67,7 +67,7 @@
     "One Base DN per line" : "Jedna základní DN na řádku",
     "You can specify Base DN for users and groups in the Advanced tab" : "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
     "Avoids automatic LDAP requests. Better for bigger setups, but requires some LDAP knowledge." : "Zabraňuje automatickým LDAP požadavkům. Výhodné pro objemná nastavení, ale vyžaduje znalosti o LDAP.",
-    "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučené pro obsáhlé adresáře)",
+    "Manually enter LDAP filters (recommended for large directories)" : "Ručně vložit LDAP filtry (doporučeno pro obsáhlé adresáře)",
     "Limit %s access to users meeting these criteria:" : "Omezit přístup %s uživatelům splňujícím tyto podmínky:",
     "The filter specifies which LDAP users shall have access to the %s instance." : "Filtr určuje, kteří uživatelé LDAP mají mít přístup k instanci %s.",
     "users found" : "nalezení uživatelé",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 74bc9533eb4..f1e8abe46d4 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -56,7 +56,7 @@ OC.L10N.register(
     "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 le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"",
     "1. Server" : "1. Serveur",
-    "%s. Server:" : "%s. Serveur:",
+    "%s. Server:" : "%s. Serveur :",
     "Add Server Configuration" : "Ajouter une configuration du serveur",
     "Delete Configuration" : "Suppression de la configuration",
     "Host" : "Hôte",
@@ -120,7 +120,7 @@ OC.L10N.register(
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
     "Internal Username" : "Nom d'utilisateur 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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
-    "Internal Username Attribute:" : "Nom d'utilisateur interne:",
+    "Internal Username Attribute:" : "Nom d'utilisateur interne :",
     "Override UUID detection" : "Surcharger la détection d'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." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
     "UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 777376eced0..d8ab51ba632 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -54,7 +54,7 @@
     "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 le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion. Exemple : \"uid=%%uid\"",
     "1. Server" : "1. Serveur",
-    "%s. Server:" : "%s. Serveur:",
+    "%s. Server:" : "%s. Serveur :",
     "Add Server Configuration" : "Ajouter une configuration du serveur",
     "Delete Configuration" : "Suppression de la configuration",
     "Host" : "Hôte",
@@ -118,7 +118,7 @@
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
     "Internal Username" : "Nom d'utilisateur 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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
-    "Internal Username Attribute:" : "Nom d'utilisateur interne:",
+    "Internal Username Attribute:" : "Nom d'utilisateur interne :",
     "Override UUID detection" : "Surcharger la détection d'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." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
     "UUID Attribute for Users:" : "Attribut UUID pour les utilisateurs :",
diff --git a/settings/l10n/ar.js b/settings/l10n/ar.js
index 80d19fa2635..f76cd863eef 100644
--- a/settings/l10n/ar.js
+++ b/settings/l10n/ar.js
@@ -138,7 +138,7 @@ OC.L10N.register(
     "The encryption app is no longer enabled, please decrypt all your files" : "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
     "Log-in password" : "كلمه سر الدخول",
     "Decrypt all Files" : "فك تشفير جميع الملفات ",
-    "Login Name" : "اسم الدخول",
+    "Username" : "إسم المستخدم",
     "Create" : "انشئ",
     "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول",
     "Enter the recovery password in order to recover the users files during password change" : "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
@@ -148,7 +148,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
     "Unlimited" : "غير محدود",
     "Other" : "شيء آخر",
-    "Username" : "إسم المستخدم",
     "Quota" : "حصه",
     "Last Login" : "آخر تسجيل دخول",
     "change full name" : "تغيير اسمك الكامل",
diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json
index fe6a18d6857..2c4e2777936 100644
--- a/settings/l10n/ar.json
+++ b/settings/l10n/ar.json
@@ -136,7 +136,7 @@
     "The encryption app is no longer enabled, please decrypt all your files" : "البرنامج المشفر لم يعد مفعل, يرجى فك التشفير عن كل ملفاتك",
     "Log-in password" : "كلمه سر الدخول",
     "Decrypt all Files" : "فك تشفير جميع الملفات ",
-    "Login Name" : "اسم الدخول",
+    "Username" : "إسم المستخدم",
     "Create" : "انشئ",
     "Admin Recovery Password" : "استعادة كلمة المرور للمسؤول",
     "Enter the recovery password in order to recover the users files during password change" : "ادخل كلمة المرور المستعادة من اجل استرداد ملفات المستخدمين اثناء تغيير كلمة المرور",
@@ -146,7 +146,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "يرجى ادخال تخزين quota (مثل:\"512 MB\" او  \"12 GB\")",
     "Unlimited" : "غير محدود",
     "Other" : "شيء آخر",
-    "Username" : "إسم المستخدم",
     "Quota" : "حصه",
     "Last Login" : "آخر تسجيل دخول",
     "change full name" : "تغيير اسمك الكامل",
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index 1689e49d203..c2c64a38fff 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -202,7 +202,7 @@ OC.L10N.register(
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
     "Restore Encryption Keys" : "Restaurar claves de cifráu.",
     "Delete Encryption Keys" : "Desaniciar claves de cifráu",
-    "Login Name" : "Nome d'usuariu",
+    "Username" : "Nome d'usuariu",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
@@ -215,7 +215,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Non llendáu",
     "Other" : "Otru",
-    "Username" : "Nome d'usuariu",
     "Quota" : "Cuota",
     "Storage Location" : "Llocalización d'almacenamientu",
     "Last Login" : "Caberu aniciu de sesión",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index 643ef9cc6ee..c903f1d1203 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -200,7 +200,7 @@
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claves de cifráu van guardase nuna llocalización segura. D'esta miente, en casu de que daqué saliere mal, vas poder recuperar les claves. Desanicia dafechu les claves de cifráu namái si tas seguru de que los ficheros descifráronse correcho.",
     "Restore Encryption Keys" : "Restaurar claves de cifráu.",
     "Delete Encryption Keys" : "Desaniciar claves de cifráu",
-    "Login Name" : "Nome d'usuariu",
+    "Username" : "Nome d'usuariu",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
@@ -213,7 +213,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indica la cuota d'almacenamientu (ex: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Non llendáu",
     "Other" : "Otru",
-    "Username" : "Nome d'usuariu",
     "Quota" : "Cuota",
     "Storage Location" : "Llocalización d'almacenamientu",
     "Last Login" : "Caberu aniciu de sesión",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 338ae1ff45a..a7040874a96 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
     "Show storage location" : "Покажи място за запис",
     "Show last log in" : "Покажи последно вписване",
-    "Login Name" : "Потребителско Име",
+    "Username" : "Потребителско Име",
     "Create" : "Създаване",
     "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
     "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Моля, въведи квота за заделено място (пр. \"512 MB\" или \"12 GB\")",
     "Unlimited" : "Неограничено",
     "Other" : "Друга...",
-    "Username" : "Потребителско Име",
     "Group Admin for" : "Групов администратор за",
     "Quota" : "Квота",
     "Storage Location" : "Място за Запис",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index 273b5449093..cbc1d1352b9 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Изтрий Криптиращи Ключове",
     "Show storage location" : "Покажи място за запис",
     "Show last log in" : "Покажи последно вписване",
-    "Login Name" : "Потребителско Име",
+    "Username" : "Потребителско Име",
     "Create" : "Създаване",
     "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
     "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Моля, въведи квота за заделено място (пр. \"512 MB\" или \"12 GB\")",
     "Unlimited" : "Неограничено",
     "Other" : "Друга...",
-    "Username" : "Потребителско Име",
     "Group Admin for" : "Групов администратор за",
     "Quota" : "Квота",
     "Storage Location" : "Място за Запис",
diff --git a/settings/l10n/bn_BD.js b/settings/l10n/bn_BD.js
index 57136a41b48..8d841f08b89 100644
--- a/settings/l10n/bn_BD.js
+++ b/settings/l10n/bn_BD.js
@@ -87,7 +87,7 @@ OC.L10N.register(
     "Language" : "ভাষা",
     "Help translate" : "অনুবাদ করতে সহায়তা করুন",
     "Import Root Certificate" : "রুট সনদপত্রটি আমদানি করুন",
-    "Login Name" : "প্রবেশ",
+    "Username" : "ব্যবহারকারী",
     "Create" : "তৈরী কর",
     "Admin Recovery Password" : "প্রশাসক পূণরূদ্ধার কুটশব্দ",
     "Add Group" : "গ্রুপ যোগ কর",
@@ -96,7 +96,6 @@ OC.L10N.register(
     "Admins" : "প্রশাসন",
     "Unlimited" : "অসীম",
     "Other" : "অন্যান্য",
-    "Username" : "ব্যবহারকারী",
     "Quota" : "কোটা",
     "Storage Location" : "সংরক্ষণাগার এর অবস্থান",
     "Last Login" : "শেষ লগইন",
diff --git a/settings/l10n/bn_BD.json b/settings/l10n/bn_BD.json
index fbced11ab41..3c73fdcfd00 100644
--- a/settings/l10n/bn_BD.json
+++ b/settings/l10n/bn_BD.json
@@ -85,7 +85,7 @@
     "Language" : "ভাষা",
     "Help translate" : "অনুবাদ করতে সহায়তা করুন",
     "Import Root Certificate" : "রুট সনদপত্রটি আমদানি করুন",
-    "Login Name" : "প্রবেশ",
+    "Username" : "ব্যবহারকারী",
     "Create" : "তৈরী কর",
     "Admin Recovery Password" : "প্রশাসক পূণরূদ্ধার কুটশব্দ",
     "Add Group" : "গ্রুপ যোগ কর",
@@ -94,7 +94,6 @@
     "Admins" : "প্রশাসন",
     "Unlimited" : "অসীম",
     "Other" : "অন্যান্য",
-    "Username" : "ব্যবহারকারী",
     "Quota" : "কোটা",
     "Storage Location" : "সংরক্ষণাগার এর অবস্থান",
     "Last Login" : "শেষ লগইন",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 1c1e5616252..166269d39fd 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -190,7 +190,7 @@ OC.L10N.register(
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
     "Restore Encryption Keys" : "Restableix les claus d'encriptació",
     "Delete Encryption Keys" : "Esborra les claus d'encriptació",
-    "Login Name" : "Nom d'accés",
+    "Username" : "Nom d'usuari",
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
@@ -203,7 +203,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Il·limitat",
     "Other" : "Un altre",
-    "Username" : "Nom d'usuari",
     "Quota" : "Quota",
     "Storage Location" : "Ubicació de l'emmagatzemament",
     "Last Login" : "Últim accés",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index d6928e1259a..42e2f9bc17e 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -188,7 +188,7 @@
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
     "Restore Encryption Keys" : "Restableix les claus d'encriptació",
     "Delete Encryption Keys" : "Esborra les claus d'encriptació",
-    "Login Name" : "Nom d'accés",
+    "Username" : "Nom d'usuari",
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
@@ -201,7 +201,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Il·limitat",
     "Other" : "Un altre",
-    "Username" : "Nom d'usuari",
     "Quota" : "Quota",
     "Storage Location" : "Ubicació de l'emmagatzemament",
     "Last Login" : "Últim accés",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 90e4bd6ec7b..ddec3824154 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "settings",
     {
-    "Security & Setup Warnings" : "Upozornění bezpečnosti a nastavení",
+    "Security & Setup Warnings" : "Upozornění zabezpečení a nastavení",
     "Cron" : "Cron",
     "Sharing" : "Sdílení",
     "Security" : "Zabezpečení",
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Smazat šifrovací klíče",
     "Show storage location" : "Zobrazit umístění úložiště",
     "Show last log in" : "Zobrazit poslední přihlášení",
-    "Login Name" : "Přihlašovací jméno",
+    "Username" : "Uživatelské jméno",
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
     "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
     "Unlimited" : "Neomezeně",
     "Other" : "Jiný",
-    "Username" : "Uživatelské jméno",
     "Group Admin for" : "Administrátor skupiny ",
     "Quota" : "Kvóta",
     "Storage Location" : "Umístění úložiště",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index b763d0efd3e..fe9c860fbdb 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Security & Setup Warnings" : "Upozornění bezpečnosti a nastavení",
+    "Security & Setup Warnings" : "Upozornění zabezpečení a nastavení",
     "Cron" : "Cron",
     "Sharing" : "Sdílení",
     "Security" : "Zabezpečení",
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Smazat šifrovací klíče",
     "Show storage location" : "Zobrazit umístění úložiště",
     "Show last log in" : "Zobrazit poslední přihlášení",
-    "Login Name" : "Přihlašovací jméno",
+    "Username" : "Uživatelské jméno",
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
     "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
     "Unlimited" : "Neomezeně",
     "Other" : "Jiný",
-    "Username" : "Uživatelské jméno",
     "Group Admin for" : "Administrátor skupiny ",
     "Quota" : "Kvóta",
     "Storage Location" : "Umístění úložiště",
diff --git a/settings/l10n/cy_GB.js b/settings/l10n/cy_GB.js
index b51574b8130..41a1b01d085 100644
--- a/settings/l10n/cy_GB.js
+++ b/settings/l10n/cy_GB.js
@@ -18,8 +18,7 @@ OC.L10N.register(
     "New password" : "Cyfrinair newydd",
     "Email" : "E-bost",
     "Cancel" : "Diddymu",
-    "Login Name" : "Mewngofnodi",
-    "Other" : "Arall",
-    "Username" : "Enw defnyddiwr"
+    "Username" : "Enw defnyddiwr",
+    "Other" : "Arall"
 },
 "nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/settings/l10n/cy_GB.json b/settings/l10n/cy_GB.json
index 67709cc704d..5b65f09abaa 100644
--- a/settings/l10n/cy_GB.json
+++ b/settings/l10n/cy_GB.json
@@ -16,8 +16,7 @@
     "New password" : "Cyfrinair newydd",
     "Email" : "E-bost",
     "Cancel" : "Diddymu",
-    "Login Name" : "Mewngofnodi",
-    "Other" : "Arall",
-    "Username" : "Enw defnyddiwr"
+    "Username" : "Enw defnyddiwr",
+    "Other" : "Arall"
 },"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/settings/l10n/da.js b/settings/l10n/da.js
index efc3da5f9df..11df1b2aed2 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Slet Krypteringsnøgler",
     "Show storage location" : "Vis placering af lageret",
     "Show last log in" : "Vis seneste login",
-    "Login Name" : "Loginnavn",
+    "Username" : "Brugernavn",
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
     "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
     "Unlimited" : "Ubegrænset",
     "Other" : "Andet",
-    "Username" : "Brugernavn",
     "Group Admin for" : "Gruppeadministrator for",
     "Quota" : "Kvote",
     "Storage Location" : "Placering af lageret",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 1d58d5c083d..973db1815ed 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Slet Krypteringsnøgler",
     "Show storage location" : "Vis placering af lageret",
     "Show last log in" : "Vis seneste login",
-    "Login Name" : "Loginnavn",
+    "Username" : "Brugernavn",
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
     "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Indtast venligst lagerkvote (f.eks. \"512 MB\" eller \"12 GB\")",
     "Unlimited" : "Ubegrænset",
     "Other" : "Andet",
-    "Username" : "Brugernavn",
     "Group Admin for" : "Gruppeadministrator for",
     "Quota" : "Kvote",
     "Storage Location" : "Placering af lageret",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index c990e8fb86a..52fb6674b2c 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
-    "Login Name" : "Loginname",
+    "Username" : "Benutzername",
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
     "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
     "Unlimited" : "Unbegrenzt",
     "Other" : "Andere",
-    "Username" : "Benutzername",
     "Group Admin for" : "Gruppenadministrator für",
     "Quota" : "Quota",
     "Storage Location" : "Speicherort",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 92f88e307c8..425197676db 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
-    "Login Name" : "Loginname",
+    "Username" : "Benutzername",
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
     "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: \"512 MB\" oder \"12 GB\")",
     "Unlimited" : "Unbegrenzt",
     "Other" : "Andere",
-    "Username" : "Benutzername",
     "Group Admin for" : "Gruppenadministrator für",
     "Quota" : "Quota",
     "Storage Location" : "Speicherort",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 442dae8edce..ddda5017a5f 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
-    "Login Name" : "Loginname",
+    "Username" : "Benutzername",
     "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",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
     "Unlimited" : "Unbegrenzt",
     "Other" : "Andere",
-    "Username" : "Benutzername",
     "Group Admin for" : "Gruppenadministrator für",
     "Quota" : "Kontingent",
     "Storage Location" : "Speicherort",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index b9a4eee7804..03cd7ab8eb5 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Verschlüsselungsschlüssel löschen",
     "Show storage location" : "Speicherort anzeigen",
     "Show last log in" : "Letzte Anmeldung anzeigen",
-    "Login Name" : "Loginname",
+    "Username" : "Benutzername",
     "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",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Bitte Speicherkontingent eingeben (z.B.: „512 MB“ oder „12 GB“)",
     "Unlimited" : "Unbegrenzt",
     "Other" : "Andere",
-    "Username" : "Benutzername",
     "Group Admin for" : "Gruppenadministrator für",
     "Quota" : "Kontingent",
     "Storage Location" : "Speicherort",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index 621730066b2..c10f68207ff 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -214,7 +214,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Διαγραφή κλειδιών κρυπτογράφησης",
     "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
     "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
-    "Login Name" : "Όνομα Σύνδεσης",
+    "Username" : "Όνομα χρήστη",
     "Create" : "Δημιουργία",
     "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
     "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
@@ -227,7 +227,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
     "Unlimited" : "Απεριόριστο",
     "Other" : "Άλλο",
-    "Username" : "Όνομα χρήστη",
     "Quota" : "Σύνολο Χώρου",
     "Storage Location" : "Τοποθεσία αποθηκευτικού χώρου",
     "Last Login" : "Τελευταία Σύνδεση",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index ba3fe20446a..05388c7408f 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -212,7 +212,7 @@
     "Delete Encryption Keys" : "Διαγραφή κλειδιών κρυπτογράφησης",
     "Show storage location" : "Εμφάνιση τοποθεσίας αποθήκευσης",
     "Show last log in" : "Εμφάνιση τελευταίας εισόδου",
-    "Login Name" : "Όνομα Σύνδεσης",
+    "Username" : "Όνομα χρήστη",
     "Create" : "Δημιουργία",
     "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
     "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
@@ -225,7 +225,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Παρακαλώ εισάγετε επιτρεπόμενα μερίδια αποθηκευτικού χώρου (π.χ. \"512 MB\"  ή \"12 GB\")",
     "Unlimited" : "Απεριόριστο",
     "Other" : "Άλλο",
-    "Username" : "Όνομα χρήστη",
     "Quota" : "Σύνολο Χώρου",
     "Storage Location" : "Τοποθεσία αποθηκευτικού χώρου",
     "Last Login" : "Τελευταία Σύνδεση",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index a4a9af22b39..ec446af4288 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Delete Encryption Keys",
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
-    "Login Name" : "Login Name",
+    "Username" : "Username",
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
     "Unlimited" : "Unlimited",
     "Other" : "Other",
-    "Username" : "Username",
     "Group Admin for" : "Group Admin for",
     "Quota" : "Quota",
     "Storage Location" : "Storage Location",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index b7dca2c7b0f..ab9bc6a6bb5 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Delete Encryption Keys",
     "Show storage location" : "Show storage location",
     "Show last log in" : "Show last log in",
-    "Login Name" : "Login Name",
+    "Username" : "Username",
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Please enter storage quota (e.g. \"512 MB\" or \"12 GB\")",
     "Unlimited" : "Unlimited",
     "Other" : "Other",
-    "Username" : "Username",
     "Group Admin for" : "Group Admin for",
     "Quota" : "Quota",
     "Storage Location" : "Storage Location",
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
index 5e6f2168e22..ca5eeb55d71 100644
--- a/settings/l10n/eo.js
+++ b/settings/l10n/eo.js
@@ -135,7 +135,7 @@ OC.L10N.register(
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
     "Restore Encryption Keys" : "Restaŭri ĉifroklavojn",
     "Delete Encryption Keys" : "Forigi ĉifroklavojn",
-    "Login Name" : "Ensaluti",
+    "Username" : "Uzantonomo",
     "Create" : "Krei",
     "Search Users and Groups" : "Serĉi uzantojn kaj grupojn",
     "Add Group" : "Aldoni grupon",
@@ -145,7 +145,6 @@ OC.L10N.register(
     "Default Quota" : "Defaŭlta kvoto",
     "Unlimited" : "Senlima",
     "Other" : "Alia",
-    "Username" : "Uzantonomo",
     "Quota" : "Kvoto",
     "Last Login" : "Lasta ensaluto",
     "change full name" : "ŝanĝi plenan nomon",
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
index 06872e6d1d0..584f1bbe127 100644
--- a/settings/l10n/eo.json
+++ b/settings/l10n/eo.json
@@ -133,7 +133,7 @@
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Viaj ĉifroklavoj moviĝis al savokopia loko. Se io malsukcesas, vi povas restaŭri la klavojn. Nur forigu ilin porĉiame se vi certas, ke ĉiuj dosieroj malĉifriĝis korekte.",
     "Restore Encryption Keys" : "Restaŭri ĉifroklavojn",
     "Delete Encryption Keys" : "Forigi ĉifroklavojn",
-    "Login Name" : "Ensaluti",
+    "Username" : "Uzantonomo",
     "Create" : "Krei",
     "Search Users and Groups" : "Serĉi uzantojn kaj grupojn",
     "Add Group" : "Aldoni grupon",
@@ -143,7 +143,6 @@
     "Default Quota" : "Defaŭlta kvoto",
     "Unlimited" : "Senlima",
     "Other" : "Alia",
-    "Username" : "Uzantonomo",
     "Quota" : "Kvoto",
     "Last Login" : "Lasta ensaluto",
     "change full name" : "ŝanĝi plenan nomon",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 273dfa11f17..5e86d9bbf02 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Eliminar claves de cifrado",
     "Show storage location" : "Mostrar la ubicación del almacenamiento",
     "Show last log in" : "Mostrar el último inicio de sesión",
-    "Login Name" : "Nombre de usuario",
+    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Otro",
-    "Username" : "Nombre de usuario",
     "Group Admin for" : "Grupo administrador para",
     "Quota" : "Cuota",
     "Storage Location" : "Ubicación de almacenamiento",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 1dc42194bf6..3f08f3573cd 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Eliminar claves de cifrado",
     "Show storage location" : "Mostrar la ubicación del almacenamiento",
     "Show last log in" : "Mostrar el último inicio de sesión",
-    "Login Name" : "Nombre de usuario",
+    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Otro",
-    "Username" : "Nombre de usuario",
     "Group Admin for" : "Grupo administrador para",
     "Quota" : "Cuota",
     "Storage Location" : "Ubicación de almacenamiento",
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
index 40b019f5c64..f6a36390253 100644
--- a/settings/l10n/es_AR.js
+++ b/settings/l10n/es_AR.js
@@ -149,7 +149,7 @@ OC.L10N.register(
     "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
     "Log-in password" : "Clave de acceso",
     "Decrypt all Files" : "Desencriptar todos los archivos",
-    "Login Name" : "Nombre de Usuario",
+    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de contraseña de administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
@@ -158,7 +158,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Otros",
-    "Username" : "Nombre de usuario",
     "Quota" : "Cuota",
     "change full name" : "Cambiar nombre completo",
     "set new password" : "Configurar nueva contraseña",
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
index a175d140958..772b62cef52 100644
--- a/settings/l10n/es_AR.json
+++ b/settings/l10n/es_AR.json
@@ -147,7 +147,7 @@
     "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de encriptación ya no está habilidata, por favor desencripte todos sus archivos.",
     "Log-in password" : "Clave de acceso",
     "Decrypt all Files" : "Desencriptar todos los archivos",
-    "Login Name" : "Nombre de Usuario",
+    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de contraseña de administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Ingresá la contraseña de recuperación para recuperar los archivos de usuario al cambiar contraseña",
@@ -156,7 +156,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor ingrese la cuota de almacenamiento (ej.: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Otros",
-    "Username" : "Nombre de usuario",
     "Quota" : "Cuota",
     "change full name" : "Cambiar nombre completo",
     "set new password" : "Configurar nueva contraseña",
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
index 3d117c76eef..02e7e40b96e 100644
--- a/settings/l10n/es_MX.js
+++ b/settings/l10n/es_MX.js
@@ -118,14 +118,13 @@ OC.L10N.register(
     "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
     "Log-in password" : "Contraseña de acceso",
     "Decrypt all Files" : "Descifrar archivos",
-    "Login Name" : "Nombre de usuario",
+    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Otro",
-    "Username" : "Nombre de usuario",
     "change full name" : "cambiar el nombre completo",
     "set new password" : "establecer nueva contraseña",
     "Default" : "Predeterminado"
diff --git a/settings/l10n/es_MX.json b/settings/l10n/es_MX.json
index 6f8de71f433..e3c065f6315 100644
--- a/settings/l10n/es_MX.json
+++ b/settings/l10n/es_MX.json
@@ -116,14 +116,13 @@
     "The encryption app is no longer enabled, please decrypt all your files" : "La aplicación de cifrado ya no está activada, descifre todos sus archivos",
     "Log-in password" : "Contraseña de acceso",
     "Decrypt all Files" : "Descifrar archivos",
-    "Login Name" : "Nombre de usuario",
+    "Username" : "Nombre de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor indique la cúota de almacenamiento (ej: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Otro",
-    "Username" : "Nombre de usuario",
     "change full name" : "cambiar el nombre completo",
     "set new password" : "establecer nueva contraseña",
     "Default" : "Predeterminado"
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index f19283c5736..e5851e5a66a 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Kustuta krüpteerimisvõtmed",
     "Show storage location" : "Näita salvestusruumi asukohta",
     "Show last log in" : "Viimane sisselogimine",
-    "Login Name" : "Kasutajanimi",
+    "Username" : "Kasutajanimi",
     "Create" : "Lisa",
     "Admin Recovery Password" : "Admini parooli taastamine",
     "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
     "Unlimited" : "Piiramatult",
     "Other" : "Muu",
-    "Username" : "Kasutajanimi",
     "Group Admin for" : "Grupi admin",
     "Quota" : "Mahupiir",
     "Storage Location" : "Mahu asukoht",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index b8390b7eac2..93eb7405b76 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Kustuta krüpteerimisvõtmed",
     "Show storage location" : "Näita salvestusruumi asukohta",
     "Show last log in" : "Viimane sisselogimine",
-    "Login Name" : "Kasutajanimi",
+    "Username" : "Kasutajanimi",
     "Create" : "Lisa",
     "Admin Recovery Password" : "Admini parooli taastamine",
     "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Palun sisesta mahupiir (nt: \"512 MB\" või \"12 GB\")",
     "Unlimited" : "Piiramatult",
     "Other" : "Muu",
-    "Username" : "Kasutajanimi",
     "Group Admin for" : "Grupi admin",
     "Quota" : "Mahupiir",
     "Storage Location" : "Mahu asukoht",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index bbf11f15ac8..3a5ba67ed83 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -209,7 +209,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
     "Show storage location" : "Erakutsi biltegiaren kokapena",
     "Show last log in" : "Erakutsi azkeneko saio hasiera",
-    "Login Name" : "Sarrera Izena",
+    "Username" : "Erabiltzaile izena",
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
     "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
     "Unlimited" : "Mugarik gabe",
     "Other" : "Bestelakoa",
-    "Username" : "Erabiltzaile izena",
     "Quota" : "Kuota",
     "Storage Location" : "Biltegiaren kokapena",
     "Last Login" : "Azken saio hasiera",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index 5728074bbe4..0668428251b 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -207,7 +207,7 @@
     "Delete Encryption Keys" : "Ezabatu enkriptatze gakoak",
     "Show storage location" : "Erakutsi biltegiaren kokapena",
     "Show last log in" : "Erakutsi azkeneko saio hasiera",
-    "Login Name" : "Sarrera Izena",
+    "Username" : "Erabiltzaile izena",
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
     "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
@@ -220,7 +220,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Mesedez sartu biltegiratze kouta (adb: \"512 MB\" edo \"12 GB\")",
     "Unlimited" : "Mugarik gabe",
     "Other" : "Bestelakoa",
-    "Username" : "Erabiltzaile izena",
     "Quota" : "Kuota",
     "Storage Location" : "Biltegiaren kokapena",
     "Last Login" : "Azken saio hasiera",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index b74bb77e221..45ece7beff6 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -166,7 +166,7 @@ OC.L10N.register(
     "Decrypt all Files" : "تمام فایلها رمزگشایی شود",
     "Restore Encryption Keys" : "بازیابی کلید های رمزگذاری",
     "Delete Encryption Keys" : "حذف کلید های رمزگذاری",
-    "Login Name" : "نام کاربری",
+    "Username" : "نام کاربری",
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
     "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
@@ -179,7 +179,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "لطفا سهمیه ذخیره سازی را وارد کنید (به عنوان مثال: \" 512MB\" یا \"12GB\")",
     "Unlimited" : "نامحدود",
     "Other" : "دیگر",
-    "Username" : "نام کاربری",
     "Quota" : "سهم",
     "Storage Location" : "محل فضای ذخیره سازی",
     "Last Login" : "اخرین ورود",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index 134d72baaf7..c91afde0fdb 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -164,7 +164,7 @@
     "Decrypt all Files" : "تمام فایلها رمزگشایی شود",
     "Restore Encryption Keys" : "بازیابی کلید های رمزگذاری",
     "Delete Encryption Keys" : "حذف کلید های رمزگذاری",
-    "Login Name" : "نام کاربری",
+    "Username" : "نام کاربری",
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
     "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
@@ -177,7 +177,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "لطفا سهمیه ذخیره سازی را وارد کنید (به عنوان مثال: \" 512MB\" یا \"12GB\")",
     "Unlimited" : "نامحدود",
     "Other" : "دیگر",
-    "Username" : "نام کاربری",
     "Quota" : "سهم",
     "Storage Location" : "محل فضای ذخیره سازی",
     "Last Login" : "اخرین ورود",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index b0cb951265e..46bfe9d8e2c 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -208,7 +208,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Poista salausavaimet",
     "Show storage location" : "Näytä tallennustilan sijainti",
     "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
-    "Login Name" : "Kirjautumisnimi",
+    "Username" : "Käyttäjätunnus",
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
     "Search Users and Groups" : "Etsi käyttäjiä ja ryhmiä",
@@ -220,7 +220,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
     "Unlimited" : "Rajoittamaton",
     "Other" : "Muu",
-    "Username" : "Käyttäjätunnus",
     "Group Admin for" : "Ryhmäylläpitäjä kohteille",
     "Quota" : "Kiintiö",
     "Storage Location" : "Tallennustilan sijainti",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 727e70de42a..a541d5c7b13 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -206,7 +206,7 @@
     "Delete Encryption Keys" : "Poista salausavaimet",
     "Show storage location" : "Näytä tallennustilan sijainti",
     "Show last log in" : "Näytä viimeisin sisäänkirjautuminen",
-    "Login Name" : "Kirjautumisnimi",
+    "Username" : "Käyttäjätunnus",
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
     "Search Users and Groups" : "Etsi käyttäjiä ja ryhmiä",
@@ -218,7 +218,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Määritä tallennustilan kiintiö (esim. \"512 MB\" tai \"12 GB\")",
     "Unlimited" : "Rajoittamaton",
     "Other" : "Muu",
-    "Username" : "Käyttäjätunnus",
     "Group Admin for" : "Ryhmäylläpitäjä kohteille",
     "Quota" : "Kiintiö",
     "Storage Location" : "Tallennustilan sijainti",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index dee21d78e0f..3bd1be6c7a0 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Supprimer les clés de chiffrement",
     "Show storage location" : "Afficher l'emplacement du stockage",
     "Show last log in" : "Montrer la dernière identification",
-    "Login Name" : "Nom d'utilisateur",
+    "Username" : "Nom d'utilisateur",
     "Create" : "Créer",
     "Admin Recovery Password" : "Récupération du mot de passe administrateur",
     "Enter the recovery password in order to recover the users files during password change" : "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
     "Unlimited" : "Illimité",
     "Other" : "Autre",
-    "Username" : "Nom d'utilisateur",
     "Group Admin for" : "Administrateur de groupe pour",
     "Quota" : "Quota",
     "Storage Location" : "Emplacement du Stockage",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 40bc023ea1b..b05ce31285a 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Supprimer les clés de chiffrement",
     "Show storage location" : "Afficher l'emplacement du stockage",
     "Show last log in" : "Montrer la dernière identification",
-    "Login Name" : "Nom d'utilisateur",
+    "Username" : "Nom d'utilisateur",
     "Create" : "Créer",
     "Admin Recovery Password" : "Récupération du mot de passe administrateur",
     "Enter the recovery password in order to recover the users files during password change" : "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Veuillez entrer le quota de stockage (ex. \"512 MB\" ou \"12 GB\")",
     "Unlimited" : "Illimité",
     "Other" : "Autre",
-    "Username" : "Nom d'utilisateur",
     "Group Admin for" : "Administrateur de groupe pour",
     "Quota" : "Quota",
     "Storage Location" : "Emplacement du Stockage",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index b5a3b96b5c8..778020d821e 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
     "Show storage location" : "Mostrar localización de almacenamento",
     "Show last log in" : "Mostrar última conexión",
-    "Login Name" : "Nome de acceso",
+    "Username" : "Nome de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
     "Unlimited" : "Sen límites",
     "Other" : "Outro",
-    "Username" : "Nome de usuario",
     "Group Admin for" : "Grupo de Admin para",
     "Quota" : "Cota",
     "Storage Location" : "Localización do almacenamento",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 437fb64e3aa..3ceb32390dd 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Eliminar as chaves de cifrado",
     "Show storage location" : "Mostrar localización de almacenamento",
     "Show last log in" : "Mostrar última conexión",
-    "Login Name" : "Nome de acceso",
+    "Username" : "Nome de usuario",
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Introduza a cota de almacenamento (p.ex. «512 MB» ou «12 GB»)",
     "Unlimited" : "Sen límites",
     "Other" : "Outro",
-    "Username" : "Nome de usuario",
     "Group Admin for" : "Grupo de Admin para",
     "Quota" : "Cota",
     "Storage Location" : "Localización do almacenamento",
diff --git a/settings/l10n/he.js b/settings/l10n/he.js
index 23c2d6f9d15..72fe1591b13 100644
--- a/settings/l10n/he.js
+++ b/settings/l10n/he.js
@@ -80,14 +80,13 @@ OC.L10N.register(
     "Language" : "פה",
     "Help translate" : "עזרה בתרגום",
     "Import Root Certificate" : "ייבוא אישור אבטחת שורש",
-    "Login Name" : "שם כניסה",
+    "Username" : "שם משתמש",
     "Create" : "יצירה",
     "Admin Recovery Password" : "ססמת השחזור של המנהל",
     "Group" : "קבוצה",
     "Default Quota" : "מכסת בררת המחדל",
     "Unlimited" : "ללא הגבלה",
     "Other" : "אחר",
-    "Username" : "שם משתמש",
     "Quota" : "מכסה",
     "set new password" : "הגדרת ססמה חדשה",
     "Default" : "בררת מחדל"
diff --git a/settings/l10n/he.json b/settings/l10n/he.json
index 3acf0e04f67..7f3ac6506e0 100644
--- a/settings/l10n/he.json
+++ b/settings/l10n/he.json
@@ -78,14 +78,13 @@
     "Language" : "פה",
     "Help translate" : "עזרה בתרגום",
     "Import Root Certificate" : "ייבוא אישור אבטחת שורש",
-    "Login Name" : "שם כניסה",
+    "Username" : "שם משתמש",
     "Create" : "יצירה",
     "Admin Recovery Password" : "ססמת השחזור של המנהל",
     "Group" : "קבוצה",
     "Default Quota" : "מכסת בררת המחדל",
     "Unlimited" : "ללא הגבלה",
     "Other" : "אחר",
-    "Username" : "שם משתמש",
     "Quota" : "מכסה",
     "set new password" : "הגדרת ססמה חדשה",
     "Default" : "בררת מחדל"
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index 6ccc12a97c0..806ec98e984 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -203,7 +203,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
     "Show storage location" : "Prikaži mjesto pohrane",
     "Show last log in" : "Prikaži zadnje spajanje",
-    "Login Name" : "Ime za prijavu",
+    "Username" : "Korisničko ime",
     "Create" : "Kreirajte",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
     "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
@@ -216,7 +216,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
     "Unlimited" : "Neograničeno",
     "Other" : "Ostalo",
-    "Username" : "Korisničko ime",
     "Quota" : "Kvota",
     "Storage Location" : "Mjesto za spremanje",
     "Last Login" : "Zadnja prijava",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index 57075ab7984..258a54c6f64 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -201,7 +201,7 @@
     "Delete Encryption Keys" : "Izbrišite ključeve za šifriranje",
     "Show storage location" : "Prikaži mjesto pohrane",
     "Show last log in" : "Prikaži zadnje spajanje",
-    "Login Name" : "Ime za prijavu",
+    "Username" : "Korisničko ime",
     "Create" : "Kreirajte",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
     "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
@@ -214,7 +214,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Molimo unesite kvotu za spremanje (npr: \"512 MB\" ili \"12 GB\")",
     "Unlimited" : "Neograničeno",
     "Other" : "Ostalo",
-    "Username" : "Korisničko ime",
     "Quota" : "Kvota",
     "Storage Location" : "Mjesto za spremanje",
     "Last Login" : "Zadnja prijava",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index d347ac8846a..5b7c2f97771 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -197,7 +197,7 @@ OC.L10N.register(
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
     "Restore Encryption Keys" : "A titkosító kulcsok visszaállítása",
     "Delete Encryption Keys" : "A titkosító kulcsok törlése",
-    "Login Name" : "Bejelentkezési név",
+    "Username" : "Felhasználónév",
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
     "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
@@ -210,7 +210,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
     "Unlimited" : "Korlátlan",
     "Other" : "Más",
-    "Username" : "Felhasználónév",
     "Quota" : "Kvóta",
     "Storage Location" : "A háttértár helye",
     "Last Login" : "Utolsó bejelentkezés",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 0c8cffbd89a..46616b5291b 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -195,7 +195,7 @@
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "A titkosító kulcsai egy mentési területre kerültek. Ha valami hiba történik, még vissza tudja állítani a titkosító kulcsait. Csak akkor törölje őket véglegesen, ha biztos benne, hogy minden állományt sikerült a visszaállítani a titkosított állapotából.",
     "Restore Encryption Keys" : "A titkosító kulcsok visszaállítása",
     "Delete Encryption Keys" : "A titkosító kulcsok törlése",
-    "Login Name" : "Bejelentkezési név",
+    "Username" : "Felhasználónév",
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
     "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
@@ -208,7 +208,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Kérjük adja meg a tárolási kvótát (pl.  \"512 MB\" vagy \"12 GB\")",
     "Unlimited" : "Korlátlan",
     "Other" : "Más",
-    "Username" : "Felhasználónév",
     "Quota" : "Kvóta",
     "Storage Location" : "A háttértár helye",
     "Last Login" : "Utolsó bejelentkezés",
diff --git a/settings/l10n/ia.js b/settings/l10n/ia.js
index e48d44c9335..79c58303c80 100644
--- a/settings/l10n/ia.js
+++ b/settings/l10n/ia.js
@@ -30,11 +30,11 @@ OC.L10N.register(
     "Cancel" : "Cancellar",
     "Language" : "Linguage",
     "Help translate" : "Adjuta a traducer",
+    "Username" : "Nomine de usator",
     "Create" : "Crear",
     "Group" : "Gruppo",
     "Default Quota" : "Quota predeterminate",
     "Other" : "Altere",
-    "Username" : "Nomine de usator",
     "Quota" : "Quota"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ia.json b/settings/l10n/ia.json
index c1acf295b4a..4978aa977f6 100644
--- a/settings/l10n/ia.json
+++ b/settings/l10n/ia.json
@@ -28,11 +28,11 @@
     "Cancel" : "Cancellar",
     "Language" : "Linguage",
     "Help translate" : "Adjuta a traducer",
+    "Username" : "Nomine de usator",
     "Create" : "Crear",
     "Group" : "Gruppo",
     "Default Quota" : "Quota predeterminate",
     "Other" : "Altere",
-    "Username" : "Nomine de usator",
     "Quota" : "Quota"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 0db6558b0fd..74dfa4c9b0f 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -214,7 +214,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
-    "Login Name" : "Nama Masuk",
+    "Username" : "Nama pengguna",
     "Create" : "Buat",
     "Admin Recovery Password" : "Sandi pemulihan Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
@@ -227,7 +227,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
     "Unlimited" : "Tak terbatas",
     "Other" : "Lainnya",
-    "Username" : "Nama pengguna",
     "Group Admin for" : "Grup Admin untuk",
     "Quota" : "Quota",
     "Storage Location" : "Lokasi Penyimpanan",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index a5aeb52afd0..326ab4c6bca 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -212,7 +212,7 @@
     "Delete Encryption Keys" : "Hapus Kuncu Enkripsi",
     "Show storage location" : "Tampilkan kolasi penyimpanan",
     "Show last log in" : "Tampilkan masuk terakhir",
-    "Login Name" : "Nama Masuk",
+    "Username" : "Nama pengguna",
     "Create" : "Buat",
     "Admin Recovery Password" : "Sandi pemulihan Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
@@ -225,7 +225,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Silakan masukkan jumlah penyimpanan (contoh: \"512 MB\" atau \"12 GB\")",
     "Unlimited" : "Tak terbatas",
     "Other" : "Lainnya",
-    "Username" : "Nama pengguna",
     "Group Admin for" : "Grup Admin untuk",
     "Quota" : "Quota",
     "Storage Location" : "Lokasi Penyimpanan",
diff --git a/settings/l10n/is.js b/settings/l10n/is.js
index b73009b405f..d6d42ad0536 100644
--- a/settings/l10n/is.js
+++ b/settings/l10n/is.js
@@ -53,10 +53,10 @@ OC.L10N.register(
     "Language" : "Tungumál",
     "Help translate" : "Hjálpa við þýðingu",
     "Import Root Certificate" : "Flytja inn rótar skilríki",
+    "Username" : "Notendanafn",
     "Create" : "Búa til",
     "Unlimited" : "Ótakmarkað",
     "Other" : "Annað",
-    "Username" : "Notendanafn",
     "Default" : "Sjálfgefið"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/is.json b/settings/l10n/is.json
index 5a70c190216..d61b3ccfd1c 100644
--- a/settings/l10n/is.json
+++ b/settings/l10n/is.json
@@ -51,10 +51,10 @@
     "Language" : "Tungumál",
     "Help translate" : "Hjálpa við þýðingu",
     "Import Root Certificate" : "Flytja inn rótar skilríki",
+    "Username" : "Notendanafn",
     "Create" : "Búa til",
     "Unlimited" : "Ótakmarkað",
     "Other" : "Annað",
-    "Username" : "Notendanafn",
     "Default" : "Sjálfgefið"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 420e4dfab7b..d5a7a3259df 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Elimina chiavi di cifratura",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
-    "Login Name" : "Nome utente",
+    "Username" : "Nome utente",
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
     "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
     "Unlimited" : "Illimitata",
     "Other" : "Altro",
-    "Username" : "Nome utente",
     "Group Admin for" : "Gruppo di amministrazione per",
     "Quota" : "Quote",
     "Storage Location" : "Posizione di archiviazione",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index fb7638d827d..228c98c6068 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Elimina chiavi di cifratura",
     "Show storage location" : "Mostra posizione di archiviazione",
     "Show last log in" : "Mostra ultimo accesso",
-    "Login Name" : "Nome utente",
+    "Username" : "Nome utente",
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
     "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Digita la quota di archiviazione (ad es.: \"512 MB\" or \"12 GB\")",
     "Unlimited" : "Illimitata",
     "Other" : "Altro",
-    "Username" : "Nome utente",
     "Group Admin for" : "Gruppo di amministrazione per",
     "Quota" : "Quote",
     "Storage Location" : "Posizione di archiviazione",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 02d2d7d7fdd..693cc13039c 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "暗号化キーを削除する",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
-    "Login Name" : "ログイン名",
+    "Username" : "ユーザーID",
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
     "Unlimited" : "無制限",
     "Other" : "その他",
-    "Username" : "ユーザーID",
     "Group Admin for" : "グループ管理者",
     "Quota" : "クオータ",
     "Storage Location" : "データの保存場所",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 84f53077e1f..894a535d445 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "暗号化キーを削除する",
     "Show storage location" : "データの保存場所を表示",
     "Show last log in" : "最終ログインを表示",
-    "Login Name" : "ログイン名",
+    "Username" : "ユーザーID",
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "ストレージのクォータを入力してください (例: \"512MB\" や \"12 GB\")",
     "Unlimited" : "無制限",
     "Other" : "その他",
-    "Username" : "ユーザーID",
     "Group Admin for" : "グループ管理者",
     "Quota" : "クオータ",
     "Storage Location" : "データの保存場所",
diff --git a/settings/l10n/ka_GE.js b/settings/l10n/ka_GE.js
index 09d8c25290b..8851b231382 100644
--- a/settings/l10n/ka_GE.js
+++ b/settings/l10n/ka_GE.js
@@ -79,12 +79,11 @@ OC.L10N.register(
     "Language" : "ენა",
     "Help translate" : "თარგმნის დახმარება",
     "Import Root Certificate" : "Root სერთიფიკატის იმპორტირება",
-    "Login Name" : "მომხმარებლის სახელი",
+    "Username" : "მომხმარებლის სახელი",
     "Create" : "შექმნა",
     "Default Quota" : "საწყისი ქვოტა",
     "Unlimited" : "ულიმიტო",
     "Other" : "სხვა",
-    "Username" : "მომხმარებლის სახელი",
     "Quota" : "ქვოტა",
     "set new password" : "დააყენეთ ახალი პაროლი",
     "Default" : "საწყისი პარამეტრები"
diff --git a/settings/l10n/ka_GE.json b/settings/l10n/ka_GE.json
index e3a1f410e67..0072516dfd8 100644
--- a/settings/l10n/ka_GE.json
+++ b/settings/l10n/ka_GE.json
@@ -77,12 +77,11 @@
     "Language" : "ენა",
     "Help translate" : "თარგმნის დახმარება",
     "Import Root Certificate" : "Root სერთიფიკატის იმპორტირება",
-    "Login Name" : "მომხმარებლის სახელი",
+    "Username" : "მომხმარებლის სახელი",
     "Create" : "შექმნა",
     "Default Quota" : "საწყისი ქვოტა",
     "Unlimited" : "ულიმიტო",
     "Other" : "სხვა",
-    "Username" : "მომხმარებლის სახელი",
     "Quota" : "ქვოტა",
     "set new password" : "დააყენეთ ახალი პაროლი",
     "Default" : "საწყისი პარამეტრები"
diff --git a/settings/l10n/km.js b/settings/l10n/km.js
index 9814b26f128..f19faf4d11b 100644
--- a/settings/l10n/km.js
+++ b/settings/l10n/km.js
@@ -101,12 +101,11 @@ OC.L10N.register(
     "Help translate" : "ជួយ​បក​ប្រែ",
     "Log-in password" : "ពាក្យ​សម្ងាត់​ចូល​គណនី",
     "Decrypt all Files" : "Decrypt ឯកសារ​ទាំង​អស់",
-    "Login Name" : "ចូល",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Create" : "បង្កើត",
     "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
     "Unlimited" : "មិន​កំណត់",
     "Other" : "ផ្សេងៗ",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "set new password" : "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
     "Default" : "លំនាំ​ដើម"
 },
diff --git a/settings/l10n/km.json b/settings/l10n/km.json
index 91e65cac226..b0d0d2a56e4 100644
--- a/settings/l10n/km.json
+++ b/settings/l10n/km.json
@@ -99,12 +99,11 @@
     "Help translate" : "ជួយ​បក​ប្រែ",
     "Log-in password" : "ពាក្យ​សម្ងាត់​ចូល​គណនី",
     "Decrypt all Files" : "Decrypt ឯកសារ​ទាំង​អស់",
-    "Login Name" : "ចូល",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Create" : "បង្កើត",
     "Admin Recovery Password" : "ការ​ស្វែង​រក​ពាក្យ​សម្ងាត់របស់ប្រធាន​វេបសាយ",
     "Unlimited" : "មិន​កំណត់",
     "Other" : "ផ្សេងៗ",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "set new password" : "កំណត់​ពាក្យ​សម្ងាត់​ថ្មី",
     "Default" : "លំនាំ​ដើម"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index 4d8ccf751e2..f669d5d1b25 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -153,7 +153,7 @@ OC.L10N.register(
     "Decrypt all Files" : "모든 파일 복호화",
     "Restore Encryption Keys" : "암호화 키 복원",
     "Delete Encryption Keys" : "암호화 키 삭제",
-    "Login Name" : "로그인 이름",
+    "Username" : "사용자 이름",
     "Create" : "만들기",
     "Admin Recovery Password" : "관리자 복구 암호",
     "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
@@ -165,7 +165,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
     "Unlimited" : "무제한",
     "Other" : "기타",
-    "Username" : "사용자 이름",
     "Quota" : "할당량",
     "Last Login" : "마지막 로그인",
     "change full name" : "전체 이름 변경",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 882b9ef8c83..bde465dddc9 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -151,7 +151,7 @@
     "Decrypt all Files" : "모든 파일 복호화",
     "Restore Encryption Keys" : "암호화 키 복원",
     "Delete Encryption Keys" : "암호화 키 삭제",
-    "Login Name" : "로그인 이름",
+    "Username" : "사용자 이름",
     "Create" : "만들기",
     "Admin Recovery Password" : "관리자 복구 암호",
     "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
@@ -163,7 +163,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "저장소 할당량을 입력하십시오 (예: \"512 MB\", \"12 GB\")",
     "Unlimited" : "무제한",
     "Other" : "기타",
-    "Username" : "사용자 이름",
     "Quota" : "할당량",
     "Last Login" : "마지막 로그인",
     "change full name" : "전체 이름 변경",
diff --git a/settings/l10n/ku_IQ.js b/settings/l10n/ku_IQ.js
index 15cd8c68225..e78805c8cae 100644
--- a/settings/l10n/ku_IQ.js
+++ b/settings/l10n/ku_IQ.js
@@ -12,7 +12,6 @@ OC.L10N.register(
     "New password" : "وشەی نهێنی نوێ",
     "Email" : "ئیمه‌یل",
     "Cancel" : "لابردن",
-    "Login Name" : "چوونەژوورەوە",
     "Username" : "ناوی به‌کارهێنه‌ر"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ku_IQ.json b/settings/l10n/ku_IQ.json
index 1e6fe7a51e9..c3bcd408956 100644
--- a/settings/l10n/ku_IQ.json
+++ b/settings/l10n/ku_IQ.json
@@ -10,7 +10,6 @@
     "New password" : "وشەی نهێنی نوێ",
     "Email" : "ئیمه‌یل",
     "Cancel" : "لابردن",
-    "Login Name" : "چوونەژوورەوە",
     "Username" : "ناوی به‌کارهێنه‌ر"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/lb.js b/settings/l10n/lb.js
index 2a49739460f..9cb363460b3 100644
--- a/settings/l10n/lb.js
+++ b/settings/l10n/lb.js
@@ -41,12 +41,11 @@ OC.L10N.register(
     "Cancel" : "Ofbriechen",
     "Language" : "Sprooch",
     "Help translate" : "Hëllef iwwersetzen",
-    "Login Name" : "Login",
+    "Username" : "Benotzernumm",
     "Create" : "Erstellen",
     "Group" : "Grupp",
     "Default Quota" : "Standard Quota",
     "Other" : "Aner",
-    "Username" : "Benotzernumm",
     "Quota" : "Quota"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/lb.json b/settings/l10n/lb.json
index 6f18a4362e1..0fecc04be68 100644
--- a/settings/l10n/lb.json
+++ b/settings/l10n/lb.json
@@ -39,12 +39,11 @@
     "Cancel" : "Ofbriechen",
     "Language" : "Sprooch",
     "Help translate" : "Hëllef iwwersetzen",
-    "Login Name" : "Login",
+    "Username" : "Benotzernumm",
     "Create" : "Erstellen",
     "Group" : "Grupp",
     "Default Quota" : "Standard Quota",
     "Other" : "Aner",
-    "Username" : "Benotzernumm",
     "Quota" : "Quota"
 },"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 da3c2eb229e..4211d857b86 100644
--- a/settings/l10n/lt_LT.js
+++ b/settings/l10n/lt_LT.js
@@ -106,7 +106,7 @@ OC.L10N.register(
     "Import Root Certificate" : "Įkelti pagrindinį sertifikatą",
     "Log-in password" : "Prisijungimo slaptažodis",
     "Decrypt all Files" : "Iššifruoti visus failus",
-    "Login Name" : "Vartotojo vardas",
+    "Username" : "Prisijungimo vardas",
     "Create" : "Sukurti",
     "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
     "Enter the recovery password in order to recover the users files during password change" : "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
@@ -114,7 +114,6 @@ OC.L10N.register(
     "Default Quota" : "Numatytoji kvota",
     "Unlimited" : "Neribota",
     "Other" : "Kita",
-    "Username" : "Prisijungimo vardas",
     "Quota" : "Limitas",
     "change full name" : "keisti pilną vardą",
     "set new password" : "nustatyti naują slaptažodį",
diff --git a/settings/l10n/lt_LT.json b/settings/l10n/lt_LT.json
index 0118eede4a5..98d570d9420 100644
--- a/settings/l10n/lt_LT.json
+++ b/settings/l10n/lt_LT.json
@@ -104,7 +104,7 @@
     "Import Root Certificate" : "Įkelti pagrindinį sertifikatą",
     "Log-in password" : "Prisijungimo slaptažodis",
     "Decrypt all Files" : "Iššifruoti visus failus",
-    "Login Name" : "Vartotojo vardas",
+    "Username" : "Prisijungimo vardas",
     "Create" : "Sukurti",
     "Admin Recovery Password" : "Administracinis atkūrimo slaptažodis",
     "Enter the recovery password in order to recover the users files during password change" : "Įveskite atkūrimo slaptažodį, kad atkurti naudotojo failus keičiant slaptažodį",
@@ -112,7 +112,6 @@
     "Default Quota" : "Numatytoji kvota",
     "Unlimited" : "Neribota",
     "Other" : "Kita",
-    "Username" : "Prisijungimo vardas",
     "Quota" : "Limitas",
     "change full name" : "keisti pilną vardą",
     "set new password" : "nustatyti naują slaptažodį",
diff --git a/settings/l10n/lv.js b/settings/l10n/lv.js
index 899d29a32c9..e1190cb7953 100644
--- a/settings/l10n/lv.js
+++ b/settings/l10n/lv.js
@@ -87,7 +87,7 @@ OC.L10N.register(
     "Import Root Certificate" : "Importēt saknes sertifikātus",
     "Log-in password" : "Pieslēgšanās parole",
     "Decrypt all Files" : "Atšifrēt visus failus",
-    "Login Name" : "Ierakstīšanās vārds",
+    "Username" : "Lietotājvārds",
     "Create" : "Izveidot",
     "Admin Recovery Password" : "Administratora atgūšanas parole",
     "Enter the recovery password in order to recover the users files during password change" : "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
@@ -95,7 +95,6 @@ OC.L10N.register(
     "Default Quota" : "Apjoms pēc noklusējuma",
     "Unlimited" : "Neierobežota",
     "Other" : "Cits",
-    "Username" : "Lietotājvārds",
     "Quota" : "Apjoms",
     "set new password" : "iestatīt jaunu paroli",
     "Default" : "Noklusējuma"
diff --git a/settings/l10n/lv.json b/settings/l10n/lv.json
index 2cc167d78ae..35da6955cc1 100644
--- a/settings/l10n/lv.json
+++ b/settings/l10n/lv.json
@@ -85,7 +85,7 @@
     "Import Root Certificate" : "Importēt saknes sertifikātus",
     "Log-in password" : "Pieslēgšanās parole",
     "Decrypt all Files" : "Atšifrēt visus failus",
-    "Login Name" : "Ierakstīšanās vārds",
+    "Username" : "Lietotājvārds",
     "Create" : "Izveidot",
     "Admin Recovery Password" : "Administratora atgūšanas parole",
     "Enter the recovery password in order to recover the users files during password change" : "Ievadiet atgūšanas paroli, lai varētu atgūt lietotāja failus paroles maiņas laikā.",
@@ -93,7 +93,6 @@
     "Default Quota" : "Apjoms pēc noklusējuma",
     "Unlimited" : "Neierobežota",
     "Other" : "Cits",
-    "Username" : "Lietotājvārds",
     "Quota" : "Apjoms",
     "set new password" : "iestatīt jaunu paroli",
     "Default" : "Noklusējuma"
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
index 32438b0651b..c331bab6c8d 100644
--- a/settings/l10n/mk.js
+++ b/settings/l10n/mk.js
@@ -145,7 +145,7 @@ OC.L10N.register(
     "Decrypt all Files" : "Дешифрирај ги сите датотеки",
     "Restore Encryption Keys" : "Обнови ги енкрипциските клучеви",
     "Delete Encryption Keys" : "Избриши ги енкрипцисиките клучеви",
-    "Login Name" : "Име за најава",
+    "Username" : "Корисничко име",
     "Create" : "Создај",
     "Admin Recovery Password" : "Обновување на Admin лозинката",
     "Search Users and Groups" : "Барај корисници и групи",
@@ -157,7 +157,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Ве молам внесете квота за просторот (нпр: \"512 MB\" или \"12 GB\")",
     "Unlimited" : "Неограничено",
     "Other" : "Останато",
-    "Username" : "Корисничко име",
     "Quota" : "Квота",
     "Storage Location" : "Локација на сториџот",
     "Last Login" : "Последна најава",
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
index 93cbf16b885..bcc0841a398 100644
--- a/settings/l10n/mk.json
+++ b/settings/l10n/mk.json
@@ -143,7 +143,7 @@
     "Decrypt all Files" : "Дешифрирај ги сите датотеки",
     "Restore Encryption Keys" : "Обнови ги енкрипциските клучеви",
     "Delete Encryption Keys" : "Избриши ги енкрипцисиките клучеви",
-    "Login Name" : "Име за најава",
+    "Username" : "Корисничко име",
     "Create" : "Создај",
     "Admin Recovery Password" : "Обновување на Admin лозинката",
     "Search Users and Groups" : "Барај корисници и групи",
@@ -155,7 +155,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Ве молам внесете квота за просторот (нпр: \"512 MB\" или \"12 GB\")",
     "Unlimited" : "Неограничено",
     "Other" : "Останато",
-    "Username" : "Корисничко име",
     "Quota" : "Квота",
     "Storage Location" : "Локација на сториџот",
     "Last Login" : "Последна најава",
diff --git a/settings/l10n/ms_MY.js b/settings/l10n/ms_MY.js
index 99c41bf6a81..fcd8da46ee6 100644
--- a/settings/l10n/ms_MY.js
+++ b/settings/l10n/ms_MY.js
@@ -30,11 +30,10 @@ OC.L10N.register(
     "Cancel" : "Batal",
     "Language" : "Bahasa",
     "Help translate" : "Bantu terjemah",
-    "Login Name" : "Log masuk",
+    "Username" : "Nama pengguna",
     "Create" : "Buat",
     "Default Quota" : "Kuota Lalai",
     "Other" : "Lain",
-    "Username" : "Nama pengguna",
     "Quota" : "Kuota"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/ms_MY.json b/settings/l10n/ms_MY.json
index 506590d06f9..d84e2c575aa 100644
--- a/settings/l10n/ms_MY.json
+++ b/settings/l10n/ms_MY.json
@@ -28,11 +28,10 @@
     "Cancel" : "Batal",
     "Language" : "Bahasa",
     "Help translate" : "Bantu terjemah",
-    "Login Name" : "Log masuk",
+    "Username" : "Nama pengguna",
     "Create" : "Buat",
     "Default Quota" : "Kuota Lalai",
     "Other" : "Lain",
-    "Username" : "Nama pengguna",
     "Quota" : "Kuota"
 },"pluralForm" :"nplurals=1; plural=0;"
 }
\ No newline at end of file
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 1e68033f940..feb8c9bb372 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -204,7 +204,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Slett krypteringsnøkler",
     "Show storage location" : "Vis lagringssted",
     "Show last log in" : "Vis site innlogging",
-    "Login Name" : "Brukernavn",
+    "Username" : "Brukernavn",
     "Create" : "Opprett",
     "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
     "Enter the recovery password in order to recover the users files during password change" : "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
@@ -217,7 +217,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
     "Unlimited" : "Ubegrenset",
     "Other" : "Annet",
-    "Username" : "Brukernavn",
     "Quota" : "Kvote",
     "Storage Location" : "Lagringsplassering",
     "Last Login" : "Siste innlogging",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index c6ec81f064c..593bc0d2e07 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -202,7 +202,7 @@
     "Delete Encryption Keys" : "Slett krypteringsnøkler",
     "Show storage location" : "Vis lagringssted",
     "Show last log in" : "Vis site innlogging",
-    "Login Name" : "Brukernavn",
+    "Username" : "Brukernavn",
     "Create" : "Opprett",
     "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
     "Enter the recovery password in order to recover the users files during password change" : "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
@@ -215,7 +215,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Legg inn lagringskvote (f.eks. \"512 MB\" eller \"12 GB\")",
     "Unlimited" : "Ubegrenset",
     "Other" : "Annet",
-    "Username" : "Brukernavn",
     "Quota" : "Kvote",
     "Storage Location" : "Lagringsplassering",
     "Last Login" : "Siste innlogging",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index c282e31a975..dd97ce0faf5 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Verwijder cryptosleutels",
     "Show storage location" : "Toon opslaglocatie",
     "Show last log in" : "Toon laatste inlog",
-    "Login Name" : "Inlognaam",
+    "Username" : "Gebruikersnaam",
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
     "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
     "Unlimited" : "Ongelimiteerd",
     "Other" : "Anders",
-    "Username" : "Gebruikersnaam",
     "Group Admin for" : "Groepsbeheerder voor",
     "Quota" : "Limieten",
     "Storage Location" : "Opslaglocatie",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index e4cd7312510..4d9e405c12a 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Verwijder cryptosleutels",
     "Show storage location" : "Toon opslaglocatie",
     "Show last log in" : "Toon laatste inlog",
-    "Login Name" : "Inlognaam",
+    "Username" : "Gebruikersnaam",
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
     "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Geef de opslagquotering op (bijv. \"512 MB\" of \"12 GB\")",
     "Unlimited" : "Ongelimiteerd",
     "Other" : "Anders",
-    "Username" : "Gebruikersnaam",
     "Group Admin for" : "Groepsbeheerder voor",
     "Quota" : "Limieten",
     "Storage Location" : "Opslaglocatie",
diff --git a/settings/l10n/nn_NO.js b/settings/l10n/nn_NO.js
index ec89452b020..74380c67fdd 100644
--- a/settings/l10n/nn_NO.js
+++ b/settings/l10n/nn_NO.js
@@ -98,14 +98,13 @@ OC.L10N.register(
     "Help translate" : "Hjelp oss å omsetja",
     "Log-in password" : "Innloggingspassord",
     "Decrypt all Files" : "Dekrypter alle filene",
-    "Login Name" : "Innloggingsnamn",
+    "Username" : "Brukarnamn",
     "Create" : "Lag",
     "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
     "Enter the recovery password in order to recover the users files during password change" : "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
     "Group" : "Gruppe",
     "Unlimited" : "Ubegrensa",
     "Other" : "Anna",
-    "Username" : "Brukarnamn",
     "Quota" : "Kvote",
     "set new password" : "lag nytt passord",
     "Default" : "Standard"
diff --git a/settings/l10n/nn_NO.json b/settings/l10n/nn_NO.json
index d0ad4d92356..c4a3844829c 100644
--- a/settings/l10n/nn_NO.json
+++ b/settings/l10n/nn_NO.json
@@ -96,14 +96,13 @@
     "Help translate" : "Hjelp oss å omsetja",
     "Log-in password" : "Innloggingspassord",
     "Decrypt all Files" : "Dekrypter alle filene",
-    "Login Name" : "Innloggingsnamn",
+    "Username" : "Brukarnamn",
     "Create" : "Lag",
     "Admin Recovery Password" : "Gjenopprettingspassord for administrator",
     "Enter the recovery password in order to recover the users files during password change" : "Skriv inn gjenopprettingspassordet brukt for å gjenoppretta brukarfilene ved passordendring",
     "Group" : "Gruppe",
     "Unlimited" : "Ubegrensa",
     "Other" : "Anna",
-    "Username" : "Brukarnamn",
     "Quota" : "Kvote",
     "set new password" : "lag nytt passord",
     "Default" : "Standard"
diff --git a/settings/l10n/oc.js b/settings/l10n/oc.js
index 1764b2dbf9f..734e0de7551 100644
--- a/settings/l10n/oc.js
+++ b/settings/l10n/oc.js
@@ -38,11 +38,10 @@ OC.L10N.register(
     "Cancel" : "Annula",
     "Language" : "Lenga",
     "Help translate" : "Ajuda a la revirada",
-    "Login Name" : "Login",
+    "Username" : "Non d'usancièr",
     "Create" : "Crea",
     "Default Quota" : "Quota per defaut",
     "Other" : "Autres",
-    "Username" : "Non d'usancièr",
     "Quota" : "Quota"
 },
 "nplurals=2; plural=(n > 1);");
diff --git a/settings/l10n/oc.json b/settings/l10n/oc.json
index a01af9dea16..dc1827381dc 100644
--- a/settings/l10n/oc.json
+++ b/settings/l10n/oc.json
@@ -36,11 +36,10 @@
     "Cancel" : "Annula",
     "Language" : "Lenga",
     "Help translate" : "Ajuda a la revirada",
-    "Login Name" : "Login",
+    "Username" : "Non d'usancièr",
     "Create" : "Crea",
     "Default Quota" : "Quota per defaut",
     "Other" : "Autres",
-    "Username" : "Non d'usancièr",
     "Quota" : "Quota"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/pa.js b/settings/l10n/pa.js
index ef0c5083b06..e5e000082f3 100644
--- a/settings/l10n/pa.js
+++ b/settings/l10n/pa.js
@@ -19,7 +19,6 @@ OC.L10N.register(
     "Password" : "ਪਾਸਵਰ",
     "Change password" : "ਪਾਸਵਰਡ ਬਦਲੋ",
     "Cancel" : "ਰੱਦ ਕਰੋ",
-    "Login Name" : "ਲਾਗਇਨ",
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/pa.json b/settings/l10n/pa.json
index 4f836b1b384..4bea8e234ea 100644
--- a/settings/l10n/pa.json
+++ b/settings/l10n/pa.json
@@ -17,7 +17,6 @@
     "Password" : "ਪਾਸਵਰ",
     "Change password" : "ਪਾਸਵਰਡ ਬਦਲੋ",
     "Cancel" : "ਰੱਦ ਕਰੋ",
-    "Login Name" : "ਲਾਗਇਨ",
     "Username" : "ਯੂਜ਼ਰ-ਨਾਂ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index 1e72d2c2239..14108c49ae2 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -213,7 +213,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Usuń klucze szyfrujące",
     "Show storage location" : "Pokaż miejsce przechowywania",
     "Show last log in" : "Pokaż ostatni login",
-    "Login Name" : "Login",
+    "Username" : "Nazwa użytkownika",
     "Create" : "Utwórz",
     "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
     "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
@@ -226,7 +226,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
     "Unlimited" : "Bez limitu",
     "Other" : "Inne",
-    "Username" : "Nazwa użytkownika",
     "Group Admin for" : "Grupa Admin dla",
     "Quota" : "Udział",
     "Storage Location" : "Lokalizacja magazynu",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index 6ea3b9aaddc..b30513d8a8a 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -211,7 +211,7 @@
     "Delete Encryption Keys" : "Usuń klucze szyfrujące",
     "Show storage location" : "Pokaż miejsce przechowywania",
     "Show last log in" : "Pokaż ostatni login",
-    "Login Name" : "Login",
+    "Username" : "Nazwa użytkownika",
     "Create" : "Utwórz",
     "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
     "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
@@ -224,7 +224,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Proszę ustawić ograniczenie zasobów (np. \"512 MB\" albo \"12 GB)",
     "Unlimited" : "Bez limitu",
     "Other" : "Inne",
-    "Username" : "Nazwa użytkownika",
     "Group Admin for" : "Grupa Admin dla",
     "Quota" : "Udział",
     "Storage Location" : "Lokalizacja magazynu",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 6103cf7deb1..3d1f3906ed1 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Eliminar Chaves de Criptografia",
     "Show storage location" : "Mostrar localização de armazenamento",
     "Show last log in" : "Mostrar o último acesso",
-    "Login Name" : "Nome de Login",
+    "Username" : "Nome de Usuário",
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Outro",
-    "Username" : "Nome de Usuário",
     "Group Admin for" : "Grupo Admin para",
     "Quota" : "Cota",
     "Storage Location" : "Local de Armazenamento",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 60eb59db740..12684951f9a 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Eliminar Chaves de Criptografia",
     "Show storage location" : "Mostrar localização de armazenamento",
     "Show last log in" : "Mostrar o último acesso",
-    "Login Name" : "Nome de Login",
+    "Username" : "Nome de Usuário",
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Por favor insira cota de armazenamento (ex: \"512\" ou \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Outro",
-    "Username" : "Nome de Usuário",
     "Group Admin for" : "Grupo Admin para",
     "Quota" : "Cota",
     "Storage Location" : "Local de Armazenamento",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 6847eb46393..4161f7f6cae 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -1,36 +1,36 @@
 OC.L10N.register(
     "settings",
     {
-    "Security & Setup Warnings" : "Avisos de Segurança e Configuração",
+    "Security & Setup Warnings" : "Avisos de Configuração e Segurança",
     "Cron" : "Cron",
     "Sharing" : "Partilha",
     "Security" : "Segurança",
-    "Email Server" : "Servidor de email",
+    "Email Server" : "Servidor de e-mail",
     "Log" : "Registo",
     "Authentication error" : "Erro na autenticação",
     "Your full name has been changed." : "O seu nome completo foi alterado.",
     "Unable to change full name" : "Não foi possível alterar o seu nome completo",
     "Group already exists" : "O grupo já existe",
-    "Unable to add group" : "Impossível acrescentar o grupo",
+    "Unable to add group" : "Não é possível acrescentar o grupo",
     "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
     "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
     "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
     "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-    "Couldn't remove app." : "Impossível remover aplicação.",
-    "Email saved" : "Email guardado",
-    "Invalid email" : "Email inválido",
-    "Unable to delete group" : "Impossível apagar grupo",
-    "Unable to delete user" : "Impossível apagar utilizador",
+    "Couldn't remove app." : "Não foi possível remover a aplicação.",
+    "Email saved" : "E-mail guardado",
+    "Invalid email" : "e-mail inválido",
+    "Unable to delete group" : "Não é possível apagar o grupo",
+    "Unable to delete user" : "Não é possível apagar o utilizador",
     "Backups restored successfully" : "Cópias de segurança foram restauradas com sucesso",
     "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido Inválido",
-    "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles mesmos do grupo admin.",
+    "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles próprios do grupo 'admin'.",
     "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
     "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
     "Couldn't update app." : "Não foi possível actualizar a aplicação.",
-    "Wrong password" : "Password errada",
+    "Wrong password" : "Senha errada",
     "No user supplied" : "Nenhum utilizador especificado.",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
     "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
@@ -40,34 +40,34 @@ OC.L10N.register(
     "Not enabled" : "Desactivado",
     "Recommended" : "Recomendado",
     "Saved" : "Guardado",
-    "test email settings" : "testar configurações de email",
+    "test email settings" : "testar as definições de e-mail",
     "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail as configurações parecem estar correctas",
     "A problem occurred while sending the email. Please revise your settings." : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
     "Email sent" : "E-mail enviado",
     "You need to set your user email before being able to send test emails." : "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável ",
-    "Sending..." : "A enviar...",
+    "Sending..." : "A enviar ...",
     "All" : "Todos",
     "Please wait...." : "Por favor aguarde...",
-    "Error while disabling app" : "Erro enquanto desactivava a aplicação",
-    "Disable" : "Desactivar",
-    "Enable" : "Activar",
-    "Error while enabling app" : "Erro enquanto activava a aplicação",
+    "Error while disabling app" : "Ocorreu  um erro enquanto desativava a aplicação",
+    "Disable" : "Desativar",
+    "Enable" : "Ativar",
+    "Error while enabling app" : "Ocorreu um erro enquanto ativava a aplicação",
     "Updating...." : "A Actualizar...",
-    "Error while updating app" : "Erro enquanto actualizava a aplicação",
+    "Error while updating app" : "Ocorreu um erro enquanto atualizava a aplicação",
     "Updated" : "Actualizado",
-    "Uninstalling ...." : "Desinstalando ....",
+    "Uninstalling ...." : "A desinstalar ....",
     "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
     "Uninstall" : "Desinstalar",
     "Select a profile picture" : "Seleccione uma fotografia de perfil",
-    "Very weak password" : "Password muito fraca",
-    "Weak password" : "Password fraca",
-    "So-so password" : "Password aceitável",
-    "Good password" : "Password Forte",
-    "Strong password" : "Password muito forte",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha aceitável",
+    "Good password" : "Senha Forte",
+    "Strong password" : "Senha muito forte",
     "Valid until {date}" : "Válido até {date}",
-    "Delete" : "Eliminar",
+    "Delete" : "Apagar",
     "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
     "Delete encryption keys permanently." : "Excluir as chaves encriptadas de forma permanente.",
     "Restore encryption keys." : "Restaurar chaves encriptadas.",
@@ -75,11 +75,11 @@ OC.L10N.register(
     "Unable to delete {objName}" : "Impossível apagar {objNome}",
     "Error creating group" : "Erro ao criar grupo",
     "A valid group name must be provided" : "Um nome válido do grupo tem de ser fornecido",
-    "deleted {groupName}" : "apagar {Nome do grupo}",
-    "undo" : "desfazer",
+    "deleted {groupName}" : "{groupName} apagado",
+    "undo" : "Anular",
     "no group" : "sem grupo",
     "never" : "nunca",
-    "deleted {userName}" : "apagar{utilizador}",
+    "deleted {userName}" : "{userName} apagado",
     "add group" : "Adicionar grupo",
     "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
     "Error creating user" : "Erro a criar utilizador",
@@ -95,9 +95,9 @@ OC.L10N.register(
     "Errors and fatal issues" : "Erros e problemas fatais",
     "Fatal issues only" : "Apenas problemas fatais",
     "None" : "Nenhum",
-    "Login" : "Login",
+    "Login" : "Iniciar Sessão",
     "Plain" : "Plano",
-    "NT LAN Manager" : "Gestor de NT LAN",
+    "NT LAN Manager" : "Gestor de REDE NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
     "Security Warning" : "Aviso de Segurança",
@@ -120,7 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
-    "Connectivity Checks" : "Verificações de Conectividade",
+    "Connectivity Checks" : "Verificações de Conetividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
@@ -146,18 +146,18 @@ OC.L10N.register(
     "Forces the clients to connect to %s via an encrypted connection." : "Forçar os clientes a ligar a %s através de uma ligação encriptada",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
-    "Send mode" : "Modo de envio",
+    "Send mode" : "Modo de Envio",
     "From address" : "Do endereço",
     "mail" : "Correio",
-    "Authentication method" : "Método de autenticação",
+    "Authentication method" : "Método de Autenticação",
     "Authentication required" : "Autenticação necessária",
-    "Server address" : "Endereço do servidor",
-    "Port" : "Porto",
+    "Server address" : "Endereço do Servidor",
+    "Port" : "Porta",
     "Credentials" : "Credenciais",
     "SMTP Username" : "Nome de utilizador SMTP",
-    "SMTP Password" : "Password SMTP",
+    "SMTP Password" : "Senha SMTP",
     "Store credentials" : "Armazenar credenciais",
-    "Test email settings" : "Testar configurações de email",
+    "Test email settings" : "Testar definições de e-mail",
     "Send email" : "Enviar email",
     "Log level" : "Nível do registo",
     "More" : "Mais",
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Apagar as chaves de encriptação",
     "Show storage location" : "Mostrar a localização do armazenamento",
     "Show last log in" : "Mostrar ultimo acesso de entrada",
-    "Login Name" : "Nome de utilizador",
+    "Username" : "Nome de utilizador",
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperar password de administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Outro",
-    "Username" : "Nome de utilizador",
     "Group Admin for" : "Administrador de Grupo para",
     "Quota" : "Quota",
     "Storage Location" : "Localização do Armazenamento",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 6af97b64a8a..a94848a2c5e 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -1,34 +1,34 @@
 { "translations": {
-    "Security & Setup Warnings" : "Avisos de Segurança e Configuração",
+    "Security & Setup Warnings" : "Avisos de Configuração e Segurança",
     "Cron" : "Cron",
     "Sharing" : "Partilha",
     "Security" : "Segurança",
-    "Email Server" : "Servidor de email",
+    "Email Server" : "Servidor de e-mail",
     "Log" : "Registo",
     "Authentication error" : "Erro na autenticação",
     "Your full name has been changed." : "O seu nome completo foi alterado.",
     "Unable to change full name" : "Não foi possível alterar o seu nome completo",
     "Group already exists" : "O grupo já existe",
-    "Unable to add group" : "Impossível acrescentar o grupo",
+    "Unable to add group" : "Não é possível acrescentar o grupo",
     "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
     "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
     "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
     "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-    "Couldn't remove app." : "Impossível remover aplicação.",
-    "Email saved" : "Email guardado",
-    "Invalid email" : "Email inválido",
-    "Unable to delete group" : "Impossível apagar grupo",
-    "Unable to delete user" : "Impossível apagar utilizador",
+    "Couldn't remove app." : "Não foi possível remover a aplicação.",
+    "Email saved" : "E-mail guardado",
+    "Invalid email" : "e-mail inválido",
+    "Unable to delete group" : "Não é possível apagar o grupo",
+    "Unable to delete user" : "Não é possível apagar o utilizador",
     "Backups restored successfully" : "Cópias de segurança foram restauradas com sucesso",
     "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido Inválido",
-    "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles mesmos do grupo admin.",
+    "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles próprios do grupo 'admin'.",
     "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
     "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
     "Couldn't update app." : "Não foi possível actualizar a aplicação.",
-    "Wrong password" : "Password errada",
+    "Wrong password" : "Senha errada",
     "No user supplied" : "Nenhum utilizador especificado.",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
     "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
@@ -38,34 +38,34 @@
     "Not enabled" : "Desactivado",
     "Recommended" : "Recomendado",
     "Saved" : "Guardado",
-    "test email settings" : "testar configurações de email",
+    "test email settings" : "testar as definições de e-mail",
     "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail as configurações parecem estar correctas",
     "A problem occurred while sending the email. Please revise your settings." : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
     "Email sent" : "E-mail enviado",
     "You need to set your user email before being able to send test emails." : "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável ",
-    "Sending..." : "A enviar...",
+    "Sending..." : "A enviar ...",
     "All" : "Todos",
     "Please wait...." : "Por favor aguarde...",
-    "Error while disabling app" : "Erro enquanto desactivava a aplicação",
-    "Disable" : "Desactivar",
-    "Enable" : "Activar",
-    "Error while enabling app" : "Erro enquanto activava a aplicação",
+    "Error while disabling app" : "Ocorreu  um erro enquanto desativava a aplicação",
+    "Disable" : "Desativar",
+    "Enable" : "Ativar",
+    "Error while enabling app" : "Ocorreu um erro enquanto ativava a aplicação",
     "Updating...." : "A Actualizar...",
-    "Error while updating app" : "Erro enquanto actualizava a aplicação",
+    "Error while updating app" : "Ocorreu um erro enquanto atualizava a aplicação",
     "Updated" : "Actualizado",
-    "Uninstalling ...." : "Desinstalando ....",
+    "Uninstalling ...." : "A desinstalar ....",
     "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
     "Uninstall" : "Desinstalar",
     "Select a profile picture" : "Seleccione uma fotografia de perfil",
-    "Very weak password" : "Password muito fraca",
-    "Weak password" : "Password fraca",
-    "So-so password" : "Password aceitável",
-    "Good password" : "Password Forte",
-    "Strong password" : "Password muito forte",
+    "Very weak password" : "Senha muito fraca",
+    "Weak password" : "Senha fraca",
+    "So-so password" : "Senha aceitável",
+    "Good password" : "Senha Forte",
+    "Strong password" : "Senha muito forte",
     "Valid until {date}" : "Válido até {date}",
-    "Delete" : "Eliminar",
+    "Delete" : "Apagar",
     "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
     "Delete encryption keys permanently." : "Excluir as chaves encriptadas de forma permanente.",
     "Restore encryption keys." : "Restaurar chaves encriptadas.",
@@ -73,11 +73,11 @@
     "Unable to delete {objName}" : "Impossível apagar {objNome}",
     "Error creating group" : "Erro ao criar grupo",
     "A valid group name must be provided" : "Um nome válido do grupo tem de ser fornecido",
-    "deleted {groupName}" : "apagar {Nome do grupo}",
-    "undo" : "desfazer",
+    "deleted {groupName}" : "{groupName} apagado",
+    "undo" : "Anular",
     "no group" : "sem grupo",
     "never" : "nunca",
-    "deleted {userName}" : "apagar{utilizador}",
+    "deleted {userName}" : "{userName} apagado",
     "add group" : "Adicionar grupo",
     "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
     "Error creating user" : "Erro a criar utilizador",
@@ -93,9 +93,9 @@
     "Errors and fatal issues" : "Erros e problemas fatais",
     "Fatal issues only" : "Apenas problemas fatais",
     "None" : "Nenhum",
-    "Login" : "Login",
+    "Login" : "Iniciar Sessão",
     "Plain" : "Plano",
-    "NT LAN Manager" : "Gestor de NT LAN",
+    "NT LAN Manager" : "Gestor de REDE NT",
     "SSL" : "SSL",
     "TLS" : "TLS",
     "Security Warning" : "Aviso de Segurança",
@@ -118,7 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
-    "Connectivity Checks" : "Verificações de Conectividade",
+    "Connectivity Checks" : "Verificações de Conetividade",
     "No problems found" : "Nenhum problema encontrado",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor verifique <a href='%s'>installation guides</a>.",
     "Last cron was executed at %s." : "O ultimo cron foi executado em %s.",
@@ -144,18 +144,18 @@
     "Forces the clients to connect to %s via an encrypted connection." : "Forçar os clientes a ligar a %s através de uma ligação encriptada",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
-    "Send mode" : "Modo de envio",
+    "Send mode" : "Modo de Envio",
     "From address" : "Do endereço",
     "mail" : "Correio",
-    "Authentication method" : "Método de autenticação",
+    "Authentication method" : "Método de Autenticação",
     "Authentication required" : "Autenticação necessária",
-    "Server address" : "Endereço do servidor",
-    "Port" : "Porto",
+    "Server address" : "Endereço do Servidor",
+    "Port" : "Porta",
     "Credentials" : "Credenciais",
     "SMTP Username" : "Nome de utilizador SMTP",
-    "SMTP Password" : "Password SMTP",
+    "SMTP Password" : "Senha SMTP",
     "Store credentials" : "Armazenar credenciais",
-    "Test email settings" : "Testar configurações de email",
+    "Test email settings" : "Testar definições de e-mail",
     "Send email" : "Enviar email",
     "Log level" : "Nível do registo",
     "More" : "Mais",
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Apagar as chaves de encriptação",
     "Show storage location" : "Mostrar a localização do armazenamento",
     "Show last log in" : "Mostrar ultimo acesso de entrada",
-    "Login Name" : "Nome de utilizador",
+    "Username" : "Nome de utilizador",
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperar password de administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Insira a quota de armazenamento (ex: \"512 MB\" ou \"12 GB\")",
     "Unlimited" : "Ilimitado",
     "Other" : "Outro",
-    "Username" : "Nome de utilizador",
     "Group Admin for" : "Administrador de Grupo para",
     "Quota" : "Quota",
     "Storage Location" : "Localização do Armazenamento",
diff --git a/settings/l10n/ro.js b/settings/l10n/ro.js
index f903cbcda9c..122c53f2737 100644
--- a/settings/l10n/ro.js
+++ b/settings/l10n/ro.js
@@ -121,7 +121,7 @@ OC.L10N.register(
     "Import Root Certificate" : "Importă certificat root",
     "Log-in password" : "Parolă",
     "Decrypt all Files" : "Decriptează toate fișierele",
-    "Login Name" : "Autentificare",
+    "Username" : "Nume utilizator",
     "Create" : "Crează",
     "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
     "Enter the recovery password in order to recover the users files during password change" : "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
@@ -129,7 +129,6 @@ OC.L10N.register(
     "Default Quota" : "Cotă implicită",
     "Unlimited" : "Nelimitată",
     "Other" : "Altele",
-    "Username" : "Nume utilizator",
     "Quota" : "Cotă",
     "change full name" : "schimbă numele complet",
     "set new password" : "setează parolă nouă",
diff --git a/settings/l10n/ro.json b/settings/l10n/ro.json
index 39abac22679..68c3b2335fc 100644
--- a/settings/l10n/ro.json
+++ b/settings/l10n/ro.json
@@ -119,7 +119,7 @@
     "Import Root Certificate" : "Importă certificat root",
     "Log-in password" : "Parolă",
     "Decrypt all Files" : "Decriptează toate fișierele",
-    "Login Name" : "Autentificare",
+    "Username" : "Nume utilizator",
     "Create" : "Crează",
     "Admin Recovery Password" : "Parolă de recuperare a Administratorului",
     "Enter the recovery password in order to recover the users files during password change" : "Introdu parola de recuperare pentru a recupera fișierele utilizatorilor în timpul schimbării parolei",
@@ -127,7 +127,6 @@
     "Default Quota" : "Cotă implicită",
     "Unlimited" : "Nelimitată",
     "Other" : "Altele",
-    "Username" : "Nume utilizator",
     "Quota" : "Cotă",
     "change full name" : "schimbă numele complet",
     "set new password" : "setează parolă nouă",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 4e3eea6d1ea..e776aeb220d 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Удалить Ключи Шифрования",
     "Show storage location" : "Показать местонахождение хранилища",
     "Show last log in" : "Показать последний вход в систему",
-    "Login Name" : "Имя пользователя",
+    "Username" : "Имя пользователя",
     "Create" : "Создать",
     "Admin Recovery Password" : "Восстановление пароля администратора",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
     "Unlimited" : "Неограниченно",
     "Other" : "Другое",
-    "Username" : "Имя пользователя",
     "Group Admin for" : "Для группы Администраторов",
     "Quota" : "Квота",
     "Storage Location" : "Место хранилища",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 352dde9bf37..44661eed3e2 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Удалить Ключи Шифрования",
     "Show storage location" : "Показать местонахождение хранилища",
     "Show last log in" : "Показать последний вход в систему",
-    "Login Name" : "Имя пользователя",
+    "Username" : "Имя пользователя",
     "Create" : "Создать",
     "Admin Recovery Password" : "Восстановление пароля администратора",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Пожалуйста, введите квоту на хранилище (например: \"512 MB\" или \"12 GB\")",
     "Unlimited" : "Неограниченно",
     "Other" : "Другое",
-    "Username" : "Имя пользователя",
     "Group Admin for" : "Для группы Администраторов",
     "Quota" : "Квота",
     "Storage Location" : "Место хранилища",
diff --git a/settings/l10n/si_LK.js b/settings/l10n/si_LK.js
index 55acf32e881..26a22fa84b7 100644
--- a/settings/l10n/si_LK.js
+++ b/settings/l10n/si_LK.js
@@ -44,11 +44,10 @@ OC.L10N.register(
     "Language" : "භාෂාව",
     "Help translate" : "පරිවර්ථන සහය",
     "Import Root Certificate" : "මූල සහතිකය ආයාත කරන්න",
-    "Login Name" : "ප්‍රවිශ්ටය",
+    "Username" : "පරිශීලක නම",
     "Create" : "තනන්න",
     "Default Quota" : "සාමාන්‍ය සලාකය",
     "Other" : "වෙනත්",
-    "Username" : "පරිශීලක නම",
     "Quota" : "සලාකය"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/si_LK.json b/settings/l10n/si_LK.json
index 2b763e6387d..c67f65c9b87 100644
--- a/settings/l10n/si_LK.json
+++ b/settings/l10n/si_LK.json
@@ -42,11 +42,10 @@
     "Language" : "භාෂාව",
     "Help translate" : "පරිවර්ථන සහය",
     "Import Root Certificate" : "මූල සහතිකය ආයාත කරන්න",
-    "Login Name" : "ප්‍රවිශ්ටය",
+    "Username" : "පරිශීලක නම",
     "Create" : "තනන්න",
     "Default Quota" : "සාමාන්‍ය සලාකය",
     "Other" : "වෙනත්",
-    "Username" : "පරිශීලක නම",
     "Quota" : "සලාකය"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 2bea7839552..36dc76b6358 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
     "Show storage location" : "Zobraziť umiestnenie úložiska",
     "Show last log in" : "Zobraziť posledné prihlásenie",
-    "Login Name" : "Prihlasovacie meno",
+    "Username" : "Používateľské meno",
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
     "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")",
     "Unlimited" : "Nelimitované",
     "Other" : "Iné",
-    "Username" : "Používateľské meno",
     "Group Admin for" : "Administrátor skupiny",
     "Quota" : "Kvóta",
     "Storage Location" : "Umiestnenie úložiska",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index 15e4d67b4cf..fa42832c52e 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Vymazať šifrovacie kľúče",
     "Show storage location" : "Zobraziť umiestnenie úložiska",
     "Show last log in" : "Zobraziť posledné prihlásenie",
-    "Login Name" : "Prihlasovacie meno",
+    "Username" : "Používateľské meno",
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
     "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Prosím zadajte kvótu úložného priestoru (napr.: \"512 MB​​\" alebo \"12 GB\")",
     "Unlimited" : "Nelimitované",
     "Other" : "Iné",
-    "Username" : "Používateľské meno",
     "Group Admin for" : "Administrátor skupiny",
     "Quota" : "Kvóta",
     "Storage Location" : "Umiestnenie úložiska",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index f7c72064019..fad7b286870 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -206,7 +206,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Izbriši šifrirne ključe",
     "Show storage location" : "Pokaži mesto shrambe",
     "Show last log in" : "Pokaži podatke zadnje prijave",
-    "Login Name" : "Prijavno ime",
+    "Username" : "Uporabniško ime",
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
     "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
@@ -219,7 +219,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
     "Unlimited" : "Neomejeno",
     "Other" : "Drugo",
-    "Username" : "Uporabniško ime",
     "Group Admin for" : "Skrbnik skupine za",
     "Quota" : "Količinska omejitev",
     "Storage Location" : "Mesto shrambe",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 176348a384b..9f148233534 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -204,7 +204,7 @@
     "Delete Encryption Keys" : "Izbriši šifrirne ključe",
     "Show storage location" : "Pokaži mesto shrambe",
     "Show last log in" : "Pokaži podatke zadnje prijave",
-    "Login Name" : "Prijavno ime",
+    "Username" : "Uporabniško ime",
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
     "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
@@ -217,7 +217,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Vnesite količinsko omejitev prostora (na primer: \"512 MB\" ali \"12 GB\")",
     "Unlimited" : "Neomejeno",
     "Other" : "Drugo",
-    "Username" : "Uporabniško ime",
     "Group Admin for" : "Skrbnik skupine za",
     "Quota" : "Količinska omejitev",
     "Storage Location" : "Mesto shrambe",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index 60ad553efea..40697726184 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -97,7 +97,7 @@ OC.L10N.register(
     "Language" : "Gjuha",
     "Help translate" : "Ndihmoni në përkthim",
     "Log-in password" : "Fjalëkalimi i hyrjes",
-    "Login Name" : "Emri i Përdoruesit",
+    "Username" : "Përdoruesi",
     "Create" : "Krijo",
     "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
@@ -107,7 +107,6 @@ OC.L10N.register(
     "Everyone" : "Të gjithë",
     "Unlimited" : "E pakufizuar",
     "Other" : "Tjetër",
-    "Username" : "Përdoruesi",
     "Last Login" : "Hyrja e fundit",
     "change full name" : "ndrysho emrin e plotë",
     "set new password" : "vendos fjalëkalim të ri",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index 852ce5f3004..e3671303a3b 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -95,7 +95,7 @@
     "Language" : "Gjuha",
     "Help translate" : "Ndihmoni në përkthim",
     "Log-in password" : "Fjalëkalimi i hyrjes",
-    "Login Name" : "Emri i Përdoruesit",
+    "Username" : "Përdoruesi",
     "Create" : "Krijo",
     "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
@@ -105,7 +105,6 @@
     "Everyone" : "Të gjithë",
     "Unlimited" : "E pakufizuar",
     "Other" : "Tjetër",
-    "Username" : "Përdoruesi",
     "Last Login" : "Hyrja e fundit",
     "change full name" : "ndrysho emrin e plotë",
     "set new password" : "vendos fjalëkalim të ri",
diff --git a/settings/l10n/sr.js b/settings/l10n/sr.js
index a01d9861750..e8952f96ef1 100644
--- a/settings/l10n/sr.js
+++ b/settings/l10n/sr.js
@@ -74,13 +74,12 @@ OC.L10N.register(
     "Cancel" : "Откажи",
     "Language" : "Језик",
     "Help translate" : " Помозите у превођењу",
-    "Login Name" : "Корисничко име",
+    "Username" : "Корисничко име",
     "Create" : "Направи",
     "Group" : "Група",
     "Default Quota" : "Подразумевано ограничење",
     "Unlimited" : "Неограничено",
     "Other" : "Друго",
-    "Username" : "Корисничко име",
     "Quota" : "Ограничење",
     "set new password" : "постави нову лозинку",
     "Default" : "Подразумевано"
diff --git a/settings/l10n/sr.json b/settings/l10n/sr.json
index 39858457640..492f66dae51 100644
--- a/settings/l10n/sr.json
+++ b/settings/l10n/sr.json
@@ -72,13 +72,12 @@
     "Cancel" : "Откажи",
     "Language" : "Језик",
     "Help translate" : " Помозите у превођењу",
-    "Login Name" : "Корисничко име",
+    "Username" : "Корисничко име",
     "Create" : "Направи",
     "Group" : "Група",
     "Default Quota" : "Подразумевано ограничење",
     "Unlimited" : "Неограничено",
     "Other" : "Друго",
-    "Username" : "Корисничко име",
     "Quota" : "Ограничење",
     "set new password" : "постави нову лозинку",
     "Default" : "Подразумевано"
diff --git a/settings/l10n/sr@latin.js b/settings/l10n/sr@latin.js
index 1a85ab01f37..0542d77592f 100644
--- a/settings/l10n/sr@latin.js
+++ b/settings/l10n/sr@latin.js
@@ -22,9 +22,9 @@ OC.L10N.register(
     "Email" : "E-mail",
     "Cancel" : "Otkaži",
     "Language" : "Jezik",
+    "Username" : "Korisničko ime",
     "Create" : "Napravi",
     "Group" : "Grupa",
-    "Other" : "Drugo",
-    "Username" : "Korisničko ime"
+    "Other" : "Drugo"
 },
 "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/settings/l10n/sr@latin.json b/settings/l10n/sr@latin.json
index 654c8ded122..8a83afea7c4 100644
--- a/settings/l10n/sr@latin.json
+++ b/settings/l10n/sr@latin.json
@@ -20,9 +20,9 @@
     "Email" : "E-mail",
     "Cancel" : "Otkaži",
     "Language" : "Jezik",
+    "Username" : "Korisničko ime",
     "Create" : "Napravi",
     "Group" : "Grupa",
-    "Other" : "Drugo",
-    "Username" : "Korisničko ime"
+    "Other" : "Drugo"
 },"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/settings/l10n/sv.js b/settings/l10n/sv.js
index c87c180bb6e..0487e5efd8b 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -194,7 +194,7 @@ OC.L10N.register(
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
     "Restore Encryption Keys" : "Återställ krypteringsnycklar",
     "Delete Encryption Keys" : "Radera krypteringsnycklar",
-    "Login Name" : "Inloggningsnamn",
+    "Username" : "Användarnamn",
     "Create" : "Skapa",
     "Admin Recovery Password" : "Admin återställningslösenord",
     "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
@@ -207,7 +207,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
     "Unlimited" : "Obegränsad",
     "Other" : "Annat",
-    "Username" : "Användarnamn",
     "Quota" : "Kvot",
     "Storage Location" : "Lagringsplats",
     "Last Login" : "Senaste inloggning",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index d89f0b53b89..03b1899ce1e 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -192,7 +192,7 @@
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Dina krypteringsnycklar flyttas till en backup. Om något gick fel kan du återställa nycklarna. Bara ta bort dem permanent om du är säker på att alla filer dekrypteras korrekt.",
     "Restore Encryption Keys" : "Återställ krypteringsnycklar",
     "Delete Encryption Keys" : "Radera krypteringsnycklar",
-    "Login Name" : "Inloggningsnamn",
+    "Username" : "Användarnamn",
     "Create" : "Skapa",
     "Admin Recovery Password" : "Admin återställningslösenord",
     "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
@@ -205,7 +205,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Var god skriv in lagringskvot (ex: \"512MB\" eller \"12 GB\")",
     "Unlimited" : "Obegränsad",
     "Other" : "Annat",
-    "Username" : "Användarnamn",
     "Quota" : "Kvot",
     "Storage Location" : "Lagringsplats",
     "Last Login" : "Senaste inloggning",
diff --git a/settings/l10n/ta_LK.js b/settings/l10n/ta_LK.js
index 45c3b753b45..5cfa80a5476 100644
--- a/settings/l10n/ta_LK.js
+++ b/settings/l10n/ta_LK.js
@@ -45,11 +45,10 @@ OC.L10N.register(
     "Language" : "மொழி",
     "Help translate" : "மொழிபெயர்க்க உதவி",
     "Import Root Certificate" : "வேர் சான்றிதழை இறக்குமதி செய்க",
-    "Login Name" : "புகுபதிகை",
+    "Username" : "பயனாளர் பெயர்",
     "Create" : "உருவாக்குக",
     "Default Quota" : "பொது இருப்பு பங்கு",
     "Other" : "மற்றவை",
-    "Username" : "பயனாளர் பெயர்",
     "Quota" : "பங்கு"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ta_LK.json b/settings/l10n/ta_LK.json
index ab306822e2c..0486b838403 100644
--- a/settings/l10n/ta_LK.json
+++ b/settings/l10n/ta_LK.json
@@ -43,11 +43,10 @@
     "Language" : "மொழி",
     "Help translate" : "மொழிபெயர்க்க உதவி",
     "Import Root Certificate" : "வேர் சான்றிதழை இறக்குமதி செய்க",
-    "Login Name" : "புகுபதிகை",
+    "Username" : "பயனாளர் பெயர்",
     "Create" : "உருவாக்குக",
     "Default Quota" : "பொது இருப்பு பங்கு",
     "Other" : "மற்றவை",
-    "Username" : "பயனாளர் பெயர்",
     "Quota" : "பங்கு"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/th_TH.js b/settings/l10n/th_TH.js
index c000b4419de..5f331a3c4fd 100644
--- a/settings/l10n/th_TH.js
+++ b/settings/l10n/th_TH.js
@@ -68,12 +68,11 @@ OC.L10N.register(
     "Language" : "ภาษา",
     "Help translate" : "ช่วยกันแปล",
     "Import Root Certificate" : "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
-    "Login Name" : "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Create" : "สร้าง",
     "Default Quota" : "โควต้าที่กำหนดไว้เริ่มต้น",
     "Unlimited" : "ไม่จำกัดจำนวน",
     "Other" : "อื่นๆ",
-    "Username" : "ชื่อผู้ใช้งาน",
     "Quota" : "พื้นที่",
     "set new password" : "ตั้งค่ารหัสผ่านใหม่",
     "Default" : "ค่าเริ่มต้น"
diff --git a/settings/l10n/th_TH.json b/settings/l10n/th_TH.json
index a66be05967b..42eee4fa737 100644
--- a/settings/l10n/th_TH.json
+++ b/settings/l10n/th_TH.json
@@ -66,12 +66,11 @@
     "Language" : "ภาษา",
     "Help translate" : "ช่วยกันแปล",
     "Import Root Certificate" : "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root",
-    "Login Name" : "ชื่อที่ใช้สำหรับเข้าสู่ระบบ",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Create" : "สร้าง",
     "Default Quota" : "โควต้าที่กำหนดไว้เริ่มต้น",
     "Unlimited" : "ไม่จำกัดจำนวน",
     "Other" : "อื่นๆ",
-    "Username" : "ชื่อผู้ใช้งาน",
     "Quota" : "พื้นที่",
     "set new password" : "ตั้งค่ารหัสผ่านใหม่",
     "Default" : "ค่าเริ่มต้น"
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 36e47d20c29..0a33a604e4c 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -216,7 +216,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Şifreleme Anahtarlarını Sil",
     "Show storage location" : "Depolama konumunu göster",
     "Show last log in" : "Son oturum açılma zamanını göster",
-    "Login Name" : "Giriş Adı",
+    "Username" : "Kullanıcı Adı",
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
     "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
@@ -229,7 +229,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
     "Unlimited" : "Sınırsız",
     "Other" : "Diğer",
-    "Username" : "Kullanıcı Adı",
     "Group Admin for" : "Grup Yöneticisi",
     "Quota" : "Kota",
     "Storage Location" : "Depolama Konumu",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 88fa6e0fe90..b281d97834f 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -214,7 +214,7 @@
     "Delete Encryption Keys" : "Şifreleme Anahtarlarını Sil",
     "Show storage location" : "Depolama konumunu göster",
     "Show last log in" : "Son oturum açılma zamanını göster",
-    "Login Name" : "Giriş Adı",
+    "Username" : "Kullanıcı Adı",
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
     "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
@@ -227,7 +227,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Lütfen disk alanı kotasını girin (örnek: \"512MB\" veya \"12GB\")",
     "Unlimited" : "Sınırsız",
     "Other" : "Diğer",
-    "Username" : "Kullanıcı Adı",
     "Group Admin for" : "Grup Yöneticisi",
     "Quota" : "Kota",
     "Storage Location" : "Depolama Konumu",
diff --git a/settings/l10n/ug.js b/settings/l10n/ug.js
index c3ce07cae69..6f49414e6e7 100644
--- a/settings/l10n/ug.js
+++ b/settings/l10n/ug.js
@@ -61,11 +61,10 @@ OC.L10N.register(
     "Cancel" : "ۋاز كەچ",
     "Language" : "تىل",
     "Help translate" : "تەرجىمىگە ياردەم",
-    "Login Name" : "تىزىمغا كىرىش ئاتى",
+    "Username" : "ئىشلەتكۈچى ئاتى",
     "Create" : "قۇر",
     "Unlimited" : "چەكسىز",
     "Other" : "باشقا",
-    "Username" : "ئىشلەتكۈچى ئاتى",
     "set new password" : "يېڭى ئىم تەڭشە",
     "Default" : "كۆڭۈلدىكى"
 },
diff --git a/settings/l10n/ug.json b/settings/l10n/ug.json
index fac830441bd..c9622027cb7 100644
--- a/settings/l10n/ug.json
+++ b/settings/l10n/ug.json
@@ -59,11 +59,10 @@
     "Cancel" : "ۋاز كەچ",
     "Language" : "تىل",
     "Help translate" : "تەرجىمىگە ياردەم",
-    "Login Name" : "تىزىمغا كىرىش ئاتى",
+    "Username" : "ئىشلەتكۈچى ئاتى",
     "Create" : "قۇر",
     "Unlimited" : "چەكسىز",
     "Other" : "باشقا",
-    "Username" : "ئىشلەتكۈچى ئاتى",
     "set new password" : "يېڭى ئىم تەڭشە",
     "Default" : "كۆڭۈلدىكى"
 },"pluralForm" :"nplurals=1; plural=0;"
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 71e5de126cf..76c5cca1490 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -214,7 +214,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Видалити ключі шифрування",
     "Show storage location" : "Показати місцезнаходження сховища",
     "Show last log in" : "Показати останній вхід в систему",
-    "Login Name" : "Ім'я Логіну",
+    "Username" : "Ім'я користувача",
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
     "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
@@ -227,7 +227,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
     "Unlimited" : "Необмежено",
     "Other" : "Інше",
-    "Username" : "Ім'я користувача",
     "Group Admin for" : "Адміністратор групи",
     "Quota" : "Квота",
     "Storage Location" : "Місцезнаходження сховища",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 3a3c79a7253..4d5eb45f51f 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -212,7 +212,7 @@
     "Delete Encryption Keys" : "Видалити ключі шифрування",
     "Show storage location" : "Показати місцезнаходження сховища",
     "Show last log in" : "Показати останній вхід в систему",
-    "Login Name" : "Ім'я Логіну",
+    "Username" : "Ім'я користувача",
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
     "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
@@ -225,7 +225,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Будь ласка, вкажіть розмір сховища (наприклад: \"512 MB\" або \"12 GB\")",
     "Unlimited" : "Необмежено",
     "Other" : "Інше",
-    "Username" : "Ім'я користувача",
     "Group Admin for" : "Адміністратор групи",
     "Quota" : "Квота",
     "Storage Location" : "Місцезнаходження сховища",
diff --git a/settings/l10n/ur_PK.js b/settings/l10n/ur_PK.js
index f9a042bc94f..25a40a20f44 100644
--- a/settings/l10n/ur_PK.js
+++ b/settings/l10n/ur_PK.js
@@ -15,7 +15,7 @@ OC.L10N.register(
     "Password" : "پاسورڈ",
     "New password" : "نیا پاسورڈ",
     "Cancel" : "منسوخ کریں",
-    "Other" : "دیگر",
-    "Username" : "یوزر نیم"
+    "Username" : "یوزر نیم",
+    "Other" : "دیگر"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ur_PK.json b/settings/l10n/ur_PK.json
index 99a7bda9ad7..7974ae49d7a 100644
--- a/settings/l10n/ur_PK.json
+++ b/settings/l10n/ur_PK.json
@@ -13,7 +13,7 @@
     "Password" : "پاسورڈ",
     "New password" : "نیا پاسورڈ",
     "Cancel" : "منسوخ کریں",
-    "Other" : "دیگر",
-    "Username" : "یوزر نیم"
+    "Username" : "یوزر نیم",
+    "Other" : "دیگر"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/settings/l10n/vi.js b/settings/l10n/vi.js
index ef9221683d1..a807bdc9328 100644
--- a/settings/l10n/vi.js
+++ b/settings/l10n/vi.js
@@ -75,13 +75,12 @@ OC.L10N.register(
     "Language" : "Ngôn ngữ",
     "Help translate" : "Hỗ trợ dịch thuật",
     "Import Root Certificate" : "Nhập Root Certificate",
-    "Login Name" : "Tên đăng nhập",
+    "Username" : "Tên đăng nhập",
     "Create" : "Tạo",
     "Group" : "N",
     "Default Quota" : "Hạn ngạch mặt định",
     "Unlimited" : "Không giới hạn",
     "Other" : "Khác",
-    "Username" : "Tên đăng nhập",
     "Quota" : "Hạn ngạch",
     "change full name" : "Đổi họ và t",
     "set new password" : "đặt mật khẩu mới",
diff --git a/settings/l10n/vi.json b/settings/l10n/vi.json
index d927ecf1661..30787bc4f8c 100644
--- a/settings/l10n/vi.json
+++ b/settings/l10n/vi.json
@@ -73,13 +73,12 @@
     "Language" : "Ngôn ngữ",
     "Help translate" : "Hỗ trợ dịch thuật",
     "Import Root Certificate" : "Nhập Root Certificate",
-    "Login Name" : "Tên đăng nhập",
+    "Username" : "Tên đăng nhập",
     "Create" : "Tạo",
     "Group" : "N",
     "Default Quota" : "Hạn ngạch mặt định",
     "Unlimited" : "Không giới hạn",
     "Other" : "Khác",
-    "Username" : "Tên đăng nhập",
     "Quota" : "Hạn ngạch",
     "change full name" : "Đổi họ và t",
     "set new password" : "đặt mật khẩu mới",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index f111d768d95..af5b786c789 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -205,7 +205,7 @@ OC.L10N.register(
     "Delete Encryption Keys" : "删除加密密钥",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
-    "Login Name" : "登录名称",
+    "Username" : "用户名",
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
     "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
@@ -218,7 +218,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
     "Unlimited" : "无限",
     "Other" : "其它",
-    "Username" : "用户名",
     "Quota" : "配额",
     "Storage Location" : "存储空间位置",
     "Last Login" : "最后登录",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index d110874bb69..35d784f8a3f 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -203,7 +203,7 @@
     "Delete Encryption Keys" : "删除加密密钥",
     "Show storage location" : "显示存储位置",
     "Show last log in" : "显示最后登录",
-    "Login Name" : "登录名称",
+    "Username" : "用户名",
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
     "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
@@ -216,7 +216,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "请输入存储限额 (ex: \"512 MB\" or \"12 GB\")",
     "Unlimited" : "无限",
     "Other" : "其它",
-    "Username" : "用户名",
     "Quota" : "配额",
     "Storage Location" : "存储空间位置",
     "Last Login" : "最后登录",
diff --git a/settings/l10n/zh_HK.js b/settings/l10n/zh_HK.js
index 652941492ab..e57291c7474 100644
--- a/settings/l10n/zh_HK.js
+++ b/settings/l10n/zh_HK.js
@@ -24,7 +24,7 @@ OC.L10N.register(
     "Change password" : "更改密碼",
     "Email" : "電郵",
     "Cancel" : "取消",
-    "Create" : "新增",
-    "Username" : "用戶名稱"
+    "Username" : "用戶名稱",
+    "Create" : "新增"
 },
 "nplurals=1; plural=0;");
diff --git a/settings/l10n/zh_HK.json b/settings/l10n/zh_HK.json
index 2d07f517691..7fd1b79909f 100644
--- a/settings/l10n/zh_HK.json
+++ b/settings/l10n/zh_HK.json
@@ -22,7 +22,7 @@
     "Change password" : "更改密碼",
     "Email" : "電郵",
     "Cancel" : "取消",
-    "Create" : "新增",
-    "Username" : "用戶名稱"
+    "Username" : "用戶名稱",
+    "Create" : "新增"
 },"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 9a3f4e60ea5..95e5a44791f 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -155,7 +155,7 @@ OC.L10N.register(
     "The encryption app is no longer enabled, please decrypt all your files" : "加密的軟體不能長時間啟用，請解密所有您的檔案",
     "Log-in password" : "登入密碼",
     "Decrypt all Files" : "解密所有檔案",
-    "Login Name" : "登入名稱",
+    "Username" : "使用者名稱",
     "Create" : "建立",
     "Admin Recovery Password" : "管理者復原密碼",
     "Enter the recovery password in order to recover the users files during password change" : "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
@@ -164,7 +164,6 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
     "Unlimited" : "無限制",
     "Other" : "其他",
-    "Username" : "使用者名稱",
     "Quota" : "容量限制",
     "change full name" : "變更全名",
     "set new password" : "設定新密碼",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index b7ef00d523c..b07a305a422 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -153,7 +153,7 @@
     "The encryption app is no longer enabled, please decrypt all your files" : "加密的軟體不能長時間啟用，請解密所有您的檔案",
     "Log-in password" : "登入密碼",
     "Decrypt all Files" : "解密所有檔案",
-    "Login Name" : "登入名稱",
+    "Username" : "使用者名稱",
     "Create" : "建立",
     "Admin Recovery Password" : "管理者復原密碼",
     "Enter the recovery password in order to recover the users files during password change" : "為了修改密碼時能夠取回使用者資料，請輸入另一組還原用密碼",
@@ -162,7 +162,6 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "請輸入空間配額(例如: \"512 MB\"或是 \"12 GB\")",
     "Unlimited" : "無限制",
     "Other" : "其他",
-    "Username" : "使用者名稱",
     "Quota" : "容量限制",
     "change full name" : "變更全名",
     "set new password" : "設定新密碼",
-- 
GitLab


From 081787d6ae32e743923cae3ec5772431085443cf Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 11 Nov 2014 12:15:30 +0100
Subject: [PATCH 390/616] Fix infinite loop if count and limit is 0

* otherwise it will always think it hits the limit and need another round to fetch additional results
---
 apps/user_ldap/lib/access.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 12c6f8118d3..d89029abf17 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -928,7 +928,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 		foreach($searchResults as $res) {
 			$count = intval($this->ldap->countEntries($cr, $res));
 			$counter += $count;
-			if($count === $limit) {
+			if($count > 0 && $count === $limit) {
 				$hasHitLimit = true;
 			}
 		}
-- 
GitLab


From 4b943a48108045d893b56243a3866b2c02faf55d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 11 Nov 2014 15:20:36 +0100
Subject: [PATCH 391/616] Fix root path handling for WebDAV ext storage

Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".
---
 lib/private/files/storage/dav.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 7f53704e94f..26fa69408a8 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -433,6 +433,7 @@ class DAV extends \OC\Files\Storage\Common {
 
 	public function getPermissions($path) {
 		$this->init();
+		$path = $this->cleanPath($path);
 		$response = $this->client->propfind($this->encodePath($path), array('{http://owncloud.org/ns}permissions'));
 		if (isset($response['{http://owncloud.org/ns}permissions'])) {
 			return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
@@ -477,6 +478,7 @@ class DAV extends \OC\Files\Storage\Common {
 	 */
 	public function hasUpdated($path, $time) {
 		$this->init();
+		$path = $this->cleanPath($path);
 		try {
 			$response = $this->client->propfind($this->encodePath($path), array(
 				'{DAV:}getlastmodified',
-- 
GitLab


From 0b2c24081f3e0963e28bdf5a5d0c81017553753e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 11 Nov 2014 15:42:50 +0100
Subject: [PATCH 392/616] Return real mime type on PROPFIND

Return the real (insecure) mime type on PROPFIND
---
 lib/private/connector/sabre/file.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/private/connector/sabre/file.php b/lib/private/connector/sabre/file.php
index 3705d299bfc..d93b8e68eb6 100644
--- a/lib/private/connector/sabre/file.php
+++ b/lib/private/connector/sabre/file.php
@@ -219,6 +219,10 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements \Sabre\
 	public function getContentType() {
 		$mimeType = $this->info->getMimetype();
 
+		// PROPFIND needs to return the correct mime type, for consistency with the web UI
+		if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'PROPFIND' ) {
+			return $mimeType;
+		}
 		return \OC_Helper::getSecureMimeType($mimeType);
 	}
 
-- 
GitLab


From 6d5a239abf6405e9dc7b24fcb543ba6cfc0e3690 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <Raydiation@users.noreply.github.com>
Date: Tue, 11 Nov 2014 22:04:46 +0100
Subject: [PATCH 393/616] Fix Pimple unset

---
 lib/private/appframework/utility/simplecontainer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
index c6effed5b4b..55b9cf7a977 100644
--- a/lib/private/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -35,7 +35,7 @@ class SimpleContainer extends \Pimple\Container implements \OCP\IContainer {
 	 * @param bool $shared
 	 */
 	function registerService($name, \Closure $closure, $shared = true) {
-		if (!empty($this[$name]))  {
+		if (isset($this[$name]))  {
 			unset($this[$name]);
 		}
 		if ($shared) {
-- 
GitLab


From 1846fb02852b69de31d27c90e02c6a40379ba749 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 12 Nov 2014 01:55:24 -0500
Subject: [PATCH 394/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/en_GB.js   | 3 +++
 apps/files_encryption/l10n/en_GB.json | 3 +++
 apps/files_encryption/l10n/et_EE.js   | 3 +++
 apps/files_encryption/l10n/et_EE.json | 3 +++
 apps/files_encryption/l10n/fr.js      | 2 +-
 apps/files_encryption/l10n/fr.json    | 2 +-
 apps/files_encryption/l10n/uk.js      | 3 +++
 apps/files_encryption/l10n/uk.json    | 3 +++
 apps/files_sharing/l10n/et_EE.js      | 5 ++++-
 apps/files_sharing/l10n/et_EE.json    | 5 ++++-
 apps/user_ldap/l10n/uk.js             | 1 +
 apps/user_ldap/l10n/uk.json           | 1 +
 core/l10n/en_GB.js                    | 2 +-
 core/l10n/en_GB.json                  | 2 +-
 core/l10n/uk.js                       | 6 +++++-
 core/l10n/uk.json                     | 6 +++++-
 lib/l10n/uk.js                        | 7 ++++++-
 lib/l10n/uk.json                      | 7 ++++++-
 lib/l10n/zh_TW.js                     | 1 +
 lib/l10n/zh_TW.json                   | 1 +
 settings/l10n/uk.js                   | 2 ++
 settings/l10n/uk.json                 | 2 ++
 22 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/apps/files_encryption/l10n/en_GB.js b/apps/files_encryption/l10n/en_GB.js
index daf72aae608..cae7d2c9679 100644
--- a/apps/files_encryption/l10n/en_GB.js
+++ b/apps/files_encryption/l10n/en_GB.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Please repeat the new recovery password",
     "Password successfully changed." : "Password changed successfully.",
     "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
+    "Could not update the private key password." : "Could not update the private key password.",
+    "The old password was not correct, please try again." : "The old password was not correct, please try again.",
+    "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.",
     "Private key password successfully updated." : "Private key password updated successfully.",
     "File recovery settings updated" : "File recovery settings updated",
     "Could not update file recovery" : "Could not update file recovery",
diff --git a/apps/files_encryption/l10n/en_GB.json b/apps/files_encryption/l10n/en_GB.json
index e6a4ca0eef3..d0b9ece1781 100644
--- a/apps/files_encryption/l10n/en_GB.json
+++ b/apps/files_encryption/l10n/en_GB.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Please repeat the new recovery password",
     "Password successfully changed." : "Password changed successfully.",
     "Could not change the password. Maybe the old password was not correct." : "Could not change the password. Maybe the old password was incorrect.",
+    "Could not update the private key password." : "Could not update the private key password.",
+    "The old password was not correct, please try again." : "The old password was not correct, please try again.",
+    "The current log-in password was not correct, please try again." : "The current log-in password was not correct, please try again.",
     "Private key password successfully updated." : "Private key password updated successfully.",
     "File recovery settings updated" : "File recovery settings updated",
     "Could not update file recovery" : "Could not update file recovery",
diff --git a/apps/files_encryption/l10n/et_EE.js b/apps/files_encryption/l10n/et_EE.js
index f525eedc1ae..93fa8084ff9 100644
--- a/apps/files_encryption/l10n/et_EE.js
+++ b/apps/files_encryption/l10n/et_EE.js
@@ -13,6 +13,9 @@ 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.",
+    "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.",
     "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
     "File recovery settings updated" : "Faili taaste seaded uuendatud",
     "Could not update file recovery" : "Ei suuda uuendada taastefaili",
diff --git a/apps/files_encryption/l10n/et_EE.json b/apps/files_encryption/l10n/et_EE.json
index ef47ab1212d..873bc8945d7 100644
--- a/apps/files_encryption/l10n/et_EE.json
+++ b/apps/files_encryption/l10n/et_EE.json
@@ -11,6 +11,9 @@
     "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.",
+    "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.",
     "Private key password successfully updated." : "Privaatse võtme parool edukalt uuendatud.",
     "File recovery settings updated" : "Faili taaste seaded uuendatud",
     "Could not update file recovery" : "Ei suuda uuendada taastefaili",
diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js
index 96aaba8bcb0..660157a68c2 100644
--- a/apps/files_encryption/l10n/fr.js
+++ b/apps/files_encryption/l10n/fr.js
@@ -11,7 +11,7 @@ OC.L10N.register(
     "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
     "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
     "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
-    "Password successfully changed." : "Mot de passe changé avec succès ",
+    "Password successfully changed." : "Mot de passe changé avec succès.",
     "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
     "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.",
     "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
diff --git a/apps/files_encryption/l10n/fr.json b/apps/files_encryption/l10n/fr.json
index 5cd3d8dde54..c3fd61441ca 100644
--- a/apps/files_encryption/l10n/fr.json
+++ b/apps/files_encryption/l10n/fr.json
@@ -9,7 +9,7 @@
     "Please provide the old recovery password" : "Veuillez entrer l'ancien mot de passe de récupération",
     "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
     "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
-    "Password successfully changed." : "Mot de passe changé avec succès ",
+    "Password successfully changed." : "Mot de passe changé avec succès.",
     "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
     "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.",
     "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
diff --git a/apps/files_encryption/l10n/uk.js b/apps/files_encryption/l10n/uk.js
index 87433d99fbc..db740bc45e6 100644
--- a/apps/files_encryption/l10n/uk.js
+++ b/apps/files_encryption/l10n/uk.js
@@ -13,6 +13,9 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Будь ласка, введіть новий пароль відновлення ще раз",
     "Password successfully changed." : "Пароль змінено.",
     "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+    "Could not update the private key password." : "Не вдалося оновити пароль секретного ключа.",
+    "The old password was not correct, please try again." : "Старий пароль введено не вірно, спробуйте ще раз.",
+    "The current log-in password was not correct, please try again." : "Невірний пароль входу, будь ласка, спробуйте ще раз.",
     "Private key password successfully updated." : "Пароль секретного ключа оновлено.",
     "File recovery settings updated" : "Налаштування файла відновлення оновлено",
     "Could not update file recovery" : "Не вдалося оновити файл відновлення ",
diff --git a/apps/files_encryption/l10n/uk.json b/apps/files_encryption/l10n/uk.json
index a981ff225d0..b2953e5e53c 100644
--- a/apps/files_encryption/l10n/uk.json
+++ b/apps/files_encryption/l10n/uk.json
@@ -11,6 +11,9 @@
     "Please repeat the new recovery password" : "Будь ласка, введіть новий пароль відновлення ще раз",
     "Password successfully changed." : "Пароль змінено.",
     "Could not change the password. Maybe the old password was not correct." : "Не вдалося змінити пароль. Можливо ви неправильно ввели старий пароль.",
+    "Could not update the private key password." : "Не вдалося оновити пароль секретного ключа.",
+    "The old password was not correct, please try again." : "Старий пароль введено не вірно, спробуйте ще раз.",
+    "The current log-in password was not correct, please try again." : "Невірний пароль входу, будь ласка, спробуйте ще раз.",
     "Private key password successfully updated." : "Пароль секретного ключа оновлено.",
     "File recovery settings updated" : "Налаштування файла відновлення оновлено",
     "Could not update file recovery" : "Не вдалося оновити файл відновлення ",
diff --git a/apps/files_sharing/l10n/et_EE.js b/apps/files_sharing/l10n/et_EE.js
index 93ac6d01000..e8158129527 100644
--- a/apps/files_sharing/l10n/et_EE.js
+++ b/apps/files_sharing/l10n/et_EE.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Lisa oma ownCloudi",
     "Download" : "Lae alla",
     "Download %s" : "Laadi alla %s",
-    "Direct link" : "Otsene link"
+    "Direct link" : "Otsene link",
+    "Server-to-Server Sharing" : "Serverist-serverisse jagamine",
+    "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"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_sharing/l10n/et_EE.json b/apps/files_sharing/l10n/et_EE.json
index d5bf52aa59d..bb17d22b99f 100644
--- a/apps/files_sharing/l10n/et_EE.json
+++ b/apps/files_sharing/l10n/et_EE.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Lisa oma ownCloudi",
     "Download" : "Lae alla",
     "Download %s" : "Laadi alla %s",
-    "Direct link" : "Otsene link"
+    "Direct link" : "Otsene link",
+    "Server-to-Server Sharing" : "Serverist-serverisse jagamine",
+    "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"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/uk.js b/apps/user_ldap/l10n/uk.js
index 538061db520..0b8e8946e0f 100644
--- a/apps/user_ldap/l10n/uk.js
+++ b/apps/user_ldap/l10n/uk.js
@@ -76,6 +76,7 @@ OC.L10N.register(
     "Saving" : "Збереження",
     "Back" : "Назад",
     "Continue" : "Продовжити",
+    "LDAP" : "LDAP",
     "Expert" : "Експерт",
     "Advanced" : "Додатково",
     "<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
diff --git a/apps/user_ldap/l10n/uk.json b/apps/user_ldap/l10n/uk.json
index f0b439ac979..9fb1ce119fb 100644
--- a/apps/user_ldap/l10n/uk.json
+++ b/apps/user_ldap/l10n/uk.json
@@ -74,6 +74,7 @@
     "Saving" : "Збереження",
     "Back" : "Назад",
     "Continue" : "Продовжити",
+    "LDAP" : "LDAP",
     "Expert" : "Експерт",
     "Advanced" : "Додатково",
     "<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>Попередження:</b> Застосунки user_ldap та user_webdavauth не сумісні. Ви можете зіткнутися з несподіваною поведінкою. Будь ласка, зверніться до системного адміністратора, щоб відключити одну з них.",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index dd27b6c114d..0c80072e67d 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -64,7 +64,7 @@ OC.L10N.register(
     "Good password" : "Good password",
     "Strong password" : "Strong password",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
-    "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." : "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.",
+    "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." : "This server has no working internet connection. This means that some of the features such as mounting external storage, notifications about updates, or installation of 3rd party apps won't work. Accessing files remotely and sending notification emails might also not work. We suggest enabling an internet connection for this server if you want to have all the features.",
     "Error occurred while checking server setup" : "Error occurred whilst checking server setup",
     "Shared" : "Shared",
     "Shared with {recipients}" : "Shared with {recipients}",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index b1f6556f900..4a20f00dd6a 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -62,7 +62,7 @@
     "Good password" : "Good password",
     "Strong password" : "Strong password",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Your web server is not yet properly setup to allow files synchronisation because the WebDAV interface seems to be broken.",
-    "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." : "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.",
+    "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." : "This server has no working internet connection. This means that some of the features such as mounting external storage, notifications about updates, or installation of 3rd party apps won't work. Accessing files remotely and sending notification emails might also not work. We suggest enabling an internet connection for this server if you want to have all the features.",
     "Error occurred while checking server setup" : "Error occurred whilst checking server setup",
     "Shared" : "Shared",
     "Shared with {recipients}" : "Shared with {recipients}",
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index a4ce73653df..38f9d17e692 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -110,7 +110,11 @@ OC.L10N.register(
     "Edit tags" : "Редагувати теги",
     "Error loading dialog template: {error}" : "Помилка при завантаженні шаблону діалогу: {error}",
     "No tags selected for deletion." : "Жодних тегів не обрано для видалення.",
-    "_download %n file_::_download %n files_" : ["","",""],
+    "unknown text" : "невідомий текст",
+    "Hello world!" : "Привіт світ!",
+    "sunny" : "сонячно",
+    "Hello {name}, the weather is {weather}" : "Привіт {name}, {weather} погода",
+    "_download %n file_::_download %n files_" : ["завантяження %n файлу","завантаження %n файлів","завантаження %n файлів"],
     "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
     "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
     "The update was unsuccessful." : "Оновлення завершилось невдачею.",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 885a797ee36..8ec13dedae7 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -108,7 +108,11 @@
     "Edit tags" : "Редагувати теги",
     "Error loading dialog template: {error}" : "Помилка при завантаженні шаблону діалогу: {error}",
     "No tags selected for deletion." : "Жодних тегів не обрано для видалення.",
-    "_download %n file_::_download %n files_" : ["","",""],
+    "unknown text" : "невідомий текст",
+    "Hello world!" : "Привіт світ!",
+    "sunny" : "сонячно",
+    "Hello {name}, the weather is {weather}" : "Привіт {name}, {weather} погода",
+    "_download %n file_::_download %n files_" : ["завантяження %n файлу","завантаження %n файлів","завантаження %n файлів"],
     "Updating {productName} to version {version}, this may take a while." : "Оновлення {productName} до версії {version}, це може займати деякий час.",
     "Please reload the page." : "Будь ласка, перезавантажте сторінку.",
     "The update was unsuccessful." : "Оновлення завершилось невдачею.",
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index 6e742fc0b98..28bc758fa35 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -76,6 +76,11 @@ OC.L10N.register(
     "last year" : "минулого року",
     "years ago" : "роки тому",
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
-    "A valid password must be provided" : "Потрібно задати вірний пароль"
+    "A valid password must be provided" : "Потрібно задати вірний пароль",
+    "Cannot write into \"config\" directory" : "Не можу писати у теку \"config\"",
+    "Cannot write into \"apps\" directory" : "Не можу писати у теку \"apps\"",
+    "Please ask your server administrator to install the module." : "Будь ласка, зверніться до адміністратора, щоб встановити модуль.",
+    "PHP module %s not installed." : "%s модуль PHP не встановлено.",
+    "Please ask your server administrator to restart the web server." : "Будь ласка, зверніться до адміністратора, щоб перезавантажити сервер."
 },
 "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/uk.json b/lib/l10n/uk.json
index a08191e745a..3fa7aa4d37c 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -74,6 +74,11 @@
     "last year" : "минулого року",
     "years ago" : "роки тому",
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
-    "A valid password must be provided" : "Потрібно задати вірний пароль"
+    "A valid password must be provided" : "Потрібно задати вірний пароль",
+    "Cannot write into \"config\" directory" : "Не можу писати у теку \"config\"",
+    "Cannot write into \"apps\" directory" : "Не можу писати у теку \"apps\"",
+    "Please ask your server administrator to install the module." : "Будь ласка, зверніться до адміністратора, щоб встановити модуль.",
+    "PHP module %s not installed." : "%s модуль PHP не встановлено.",
+    "Please ask your server administrator to restart the web server." : "Будь ласка, зверніться до адміністратора, щоб перезавантажити сервер."
 },"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/zh_TW.js b/lib/l10n/zh_TW.js
index ffb82213e7d..18fcfe06de9 100644
--- a/lib/l10n/zh_TW.js
+++ b/lib/l10n/zh_TW.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Settings" : "設定",
     "Users" : "使用者",
     "Admin" : "管理",
+    "Recommended" : "建議",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。",
     "No app name specified" : "沒有指定應用程式名稱",
     "Unknown filetype" : "未知的檔案類型",
diff --git a/lib/l10n/zh_TW.json b/lib/l10n/zh_TW.json
index 6c6b572dd50..f6befb07d0a 100644
--- a/lib/l10n/zh_TW.json
+++ b/lib/l10n/zh_TW.json
@@ -10,6 +10,7 @@
     "Settings" : "設定",
     "Users" : "使用者",
     "Admin" : "管理",
+    "Recommended" : "建議",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "無法安裝應用程式 %s 因為它和此版本的 ownCloud 不相容。",
     "No app name specified" : "沒有指定應用程式名稱",
     "Unknown filetype" : "未知的檔案類型",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 76c5cca1490..94a0ac7af01 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Попередження Налаштувань та Безпеки",
     "Cron" : "Cron",
     "Sharing" : "Спільний доступ",
     "Security" : "Безпека",
@@ -119,6 +120,7 @@ OC.L10N.register(
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
     "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
+    "Connectivity Checks" : "Перевірка З'єднання",
     "No problems found" : "Проблем не виявленно",
     "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
     "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 4d5eb45f51f..abe77748e17 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Попередження Налаштувань та Безпеки",
     "Cron" : "Cron",
     "Sharing" : "Спільний доступ",
     "Security" : "Безпека",
@@ -117,6 +118,7 @@
     "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
     "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
+    "Connectivity Checks" : "Перевірка З'єднання",
     "No problems found" : "Проблем не виявленно",
     "Please double check the <a href='%s'>installation guides</a>." : "Будь ласка, перевірте <a href='%s'>інструкції по встановленню</a>.",
     "Last cron was executed at %s." : "Останню cron-задачу було запущено: %s.",
-- 
GitLab


From c5c74792d1314f32d4513841fafbfeea4ed9658c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 11 Nov 2014 18:26:42 +0100
Subject: [PATCH 395/616] add 'namespace' for automatically created navigation
 divs, fixes #12080

---
 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 d58b9a597b9..683c7f61659 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -92,7 +92,7 @@ $formsMap = array_map(function ($form) {
 		$anchor = str_replace(' ', '-', $anchor);
 
 		return array(
-			'anchor' => $anchor,
+			'anchor' => 'goto-' . $anchor,
 			'section-name' => $sectionName,
 			'form' => $form
 		);
diff --git a/settings/personal.php b/settings/personal.php
index 9c27f77ccd3..bef800ae7f1 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -114,7 +114,7 @@ $formsMap = array_map(function($form){
 		$anchor = str_replace(' ', '-', $anchor);
 
 		return array(
-			'anchor' => $anchor,
+			'anchor' => 'goto-' . $anchor,
 			'section-name' => $sectionName,
 			'form' => $form
 		);
-- 
GitLab


From da31177a8f4952520e1793d5242f1197f03913e3 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 12 Nov 2014 11:32:48 +0100
Subject: [PATCH 396/616] Remove debug statement

Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
---
 lib/private/files/view.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 0e4da30f7b9..19676524a0e 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -676,10 +676,6 @@ class View {
 				$this->mkdir($filePath);
 			}
 
-			if (!$tmpFile) {
-				debug_print_backtrace();
-			}
-
 			$source = fopen($tmpFile, 'r');
 			if ($source) {
 				$this->file_put_contents($path, $source);
-- 
GitLab


From 952abdc51ae19e05cf428e911d55de92c6ecc52f Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 12 Nov 2014 12:37:50 +0100
Subject: [PATCH 397/616] Drop form_factor that is appended to JS, CSS and
 template filenames

---
 lib/private/template.php                     | 73 ++------------------
 lib/private/template/cssresourcelocator.php  | 10 +--
 lib/private/template/jsresourcelocator.php   |  9 +--
 lib/private/template/resourcelocator.php     |  8 +--
 lib/private/template/templatefilelocator.php | 12 +---
 lib/private/templatelayout.php               | 10 +--
 tests/lib/template/resourcelocator.php       | 16 ++---
 7 files changed, 20 insertions(+), 118 deletions(-)

diff --git a/lib/private/template.php b/lib/private/template.php
index 9ad9d5466db..bda802fd2e2 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -50,16 +50,13 @@ class OC_Template extends \OC\Template\Base {
 		// Read the selected theme from the config file
 		$theme = OC_Util::getTheme();
 
-		// Read the detected formfactor and use the right file name.
-		$fext = self::getFormFactorExtension();
-
 		$requesttoken = (OC::$server->getSession() and $registerCall) ? OC_Util::callRegister() : '';
 
 		$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
 		$l10n = \OC::$server->getL10N($parts[0]);
 		$themeDefaults = new OC_Defaults();
 
-		list($path, $template) = $this->findTemplate($theme, $app, $name, $fext);
+		list($path, $template) = $this->findTemplate($theme, $app, $name);
 
 		// Set the private data
 		$this->renderas = $renderas;
@@ -69,86 +66,24 @@ class OC_Template extends \OC\Template\Base {
 		parent::__construct($template, $requesttoken, $l10n, $themeDefaults);
 	}
 
-	/**
-	 * autodetect the formfactor of the used device
-	 * default -> the normal desktop browser interface
-	 * mobile -> interface for smartphones
-	 * tablet -> interface for tablets
-	 * standalone -> the default interface but without header, footer and
-	 *	sidebar, just the application. Useful to use just a specific
-	 *	app on the desktop in a standalone window.
-	 */
-	public static function detectFormfactor() {
-		// please add more useragent strings for other devices
-		if(isset($_SERVER['HTTP_USER_AGENT'])) {
-			if(stripos($_SERVER['HTTP_USER_AGENT'], 'ipad')>0) {
-				$mode='tablet';
-			}elseif(stripos($_SERVER['HTTP_USER_AGENT'], 'iphone')>0) {
-				$mode='mobile';
-			}elseif((stripos($_SERVER['HTTP_USER_AGENT'], 'N9')>0)
-				and (stripos($_SERVER['HTTP_USER_AGENT'], 'nokia')>0)) {
-				$mode='mobile';
-			}else{
-				$mode='default';
-			}
-		}else{
-			$mode='default';
-		}
-		return($mode);
-	}
-
-	/**
-	 * Returns the formfactor extension for current formfactor
-	 */
-	static public function getFormFactorExtension()
-	{
-		if (!\OC::$server->getSession()) {
-			return '';
-		}
-		// if the formfactor is not yet autodetected do the
-		// autodetection now. For possible formfactors check the
-		// detectFormfactor documentation
-		if (!\OC::$server->getSession()->exists('formfactor')) {
-			\OC::$server->getSession()->set('formfactor', self::detectFormfactor());
-		}
-		// allow manual override via GET parameter
-		if(isset($_GET['formfactor'])) {
-			\OC::$server->getSession()->set('formfactor', $_GET['formfactor']);
-		}
-		$formfactor = \OC::$server->getSession()->get('formfactor');
-		if($formfactor==='default') {
-			$fext='';
-		}elseif($formfactor==='mobile') {
-			$fext='.mobile';
-		}elseif($formfactor==='tablet') {
-			$fext='.tablet';
-		}elseif($formfactor==='standalone') {
-			$fext='.standalone';
-		}else{
-			$fext='';
-		}
-		return $fext;
-	}
-
 	/**
 	 * find the template with the given name
 	 * @param string $name of the template file (without suffix)
 	 *
-	 * Will select the template file for the selected theme and formfactor.
+	 * Will select the template file for the selected theme.
 	 * Checking all the possible locations.
 	 * @param string $theme
 	 * @param string $app
-	 * @param string $fext
 	 * @return array
 	 */
-	protected function findTemplate($theme, $app, $name, $fext) {
+	protected function findTemplate($theme, $app, $name) {
 		// Check if it is a app template or not.
 		if( $app !== '' ) {
 			$dirs = $this->getAppTemplateDirs($theme, $app, OC::$SERVERROOT, OC_App::getAppPath($app));
 		} else {
 			$dirs = $this->getCoreTemplateDirs($theme, OC::$SERVERROOT);
 		}
-		$locator = new \OC\Template\TemplateFileLocator( $fext, $dirs );
+		$locator = new \OC\Template\TemplateFileLocator( $dirs );
 		$template = $locator->find($name);
 		$path = $locator->getPath();
 		return array($path, $template);
diff --git a/lib/private/template/cssresourcelocator.php b/lib/private/template/cssresourcelocator.php
index e26daa25827..cb129261b51 100644
--- a/lib/private/template/cssresourcelocator.php
+++ b/lib/private/template/cssresourcelocator.php
@@ -12,9 +12,7 @@ class CSSResourceLocator extends ResourceLocator {
 	public function doFind( $style ) {
 		if (strpos($style, '3rdparty') === 0
 			&& $this->appendIfExist($this->thirdpartyroot, $style.'.css')
-			|| $this->appendIfExist($this->serverroot, $style.$this->form_factor.'.css')
 			|| $this->appendIfExist($this->serverroot, $style.'.css')
-			|| $this->appendIfExist($this->serverroot, 'core/'.$style.$this->form_factor.'.css')
 			|| $this->appendIfExist($this->serverroot, 'core/'.$style.'.css')
 		) {
 			return;
@@ -23,8 +21,7 @@ class CSSResourceLocator extends ResourceLocator {
 		$style = substr($style, strpos($style, '/')+1);
 		$app_path = \OC_App::getAppPath($app);
 		$app_url = \OC_App::getAppWebPath($app);
-		if ($this->appendIfExist($app_path, $style.$this->form_factor.'.css', $app_url)
-			|| $this->appendIfExist($app_path, $style.'.css', $app_url)
+		if ($this->appendIfExist($app_path, $style.'.css', $app_url)
 		) {
 			return;
 		}
@@ -33,11 +30,8 @@ class CSSResourceLocator extends ResourceLocator {
 
 	public function doFindTheme( $style ) {
 		$theme_dir = 'themes/'.$this->theme.'/';
-		$this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$style.$this->form_factor.'.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$style.'.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir.$style.$this->form_factor.'.css')
+		$this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$style.'.css')
 			|| $this->appendIfExist($this->serverroot, $theme_dir.$style.'.css')
-			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$style.$this->form_factor.'.css')
 			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$style.'.css');
 	}
 }
diff --git a/lib/private/template/jsresourcelocator.php b/lib/private/template/jsresourcelocator.php
index 507f31327a6..5a6672429cf 100644
--- a/lib/private/template/jsresourcelocator.php
+++ b/lib/private/template/jsresourcelocator.php
@@ -13,15 +13,10 @@ class JSResourceLocator extends ResourceLocator {
 		$theme_dir = 'themes/'.$this->theme.'/';
 		if (strpos($script, '3rdparty') === 0
 			&& $this->appendIfExist($this->thirdpartyroot, $script.'.js')
-			|| $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.$this->form_factor.'.js')
 			|| $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js')
-			|| $this->appendIfExist($this->serverroot, $theme_dir.$script.$this->form_factor.'.js')
 			|| $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js')
-			|| $this->appendIfExist($this->serverroot, $script.$this->form_factor.'.js')
 			|| $this->appendIfExist($this->serverroot, $script.'.js')
-			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.$this->form_factor.'.js')
 			|| $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js')
-			|| $this->appendIfExist($this->serverroot, 'core/'.$script.$this->form_factor.'.js')
 			|| $this->appendIfExist($this->serverroot, 'core/'.$script.'.js')
 		) {
 			return;
@@ -30,9 +25,7 @@ class JSResourceLocator extends ResourceLocator {
 		$script = substr($script, strpos($script, '/')+1);
 		$app_path = \OC_App::getAppPath($app);
 		$app_url = \OC_App::getAppWebPath($app);
-		if ($this->appendIfExist($app_path, $script.$this->form_factor.'.js', $app_url)
-			|| $this->appendIfExist($app_path, $script.'.js', $app_url)
-		) {
+		if ($this->appendIfExist($app_path, $script.'.js', $app_url)) {
 			return;
 		}
 		// missing translations files fill be ignored
diff --git a/lib/private/template/resourcelocator.php b/lib/private/template/resourcelocator.php
index 7976c415922..919665df704 100644
--- a/lib/private/template/resourcelocator.php
+++ b/lib/private/template/resourcelocator.php
@@ -10,7 +10,6 @@ namespace OC\Template;
 
 abstract class ResourceLocator {
 	protected $theme;
-	protected $form_factor;
 
 	protected $mapping;
 	protected $serverroot;
@@ -21,11 +20,9 @@ abstract class ResourceLocator {
 
 	/**
 	 * @param string $theme
-	 * @param string $form_factor
 	 */
-	public function __construct( $theme, $form_factor, $core_map, $party_map ) {
+	public function __construct( $theme, $core_map, $party_map ) {
 		$this->theme = $theme;
-		$this->form_factor = $form_factor;
 		$this->mapping = $core_map + $party_map;
 		$this->serverroot = key($core_map);
 		$this->thirdpartyroot = key($party_map);
@@ -46,8 +43,7 @@ abstract class ResourceLocator {
 				}
 			}
 		} catch (\Exception $e) {
-			throw new \Exception($e->getMessage().' formfactor:'.$this->form_factor
-						.' serverroot:'.$this->serverroot);
+			throw new \Exception($e->getMessage().' serverroot:'.$this->serverroot);
 		}
 	}
 
diff --git a/lib/private/template/templatefilelocator.php b/lib/private/template/templatefilelocator.php
index 8e9f3bd8100..042298389c8 100644
--- a/lib/private/template/templatefilelocator.php
+++ b/lib/private/template/templatefilelocator.php
@@ -9,16 +9,13 @@
 namespace OC\Template;
 
 class TemplateFileLocator {
-	protected $form_factor;
 	protected $dirs;
 	private $path;
 
 	/**
 	 * @param string[] $dirs
-	 * @param string $form_factor
 	 */
-	public function __construct( $form_factor, $dirs ) {
-		$this->form_factor = $form_factor;
+	public function __construct( $dirs ) {
 		$this->dirs = $dirs;
 	}
 
@@ -33,18 +30,13 @@ class TemplateFileLocator {
 		}
 
 		foreach($this->dirs as $dir) {
-			$file = $dir.$template.$this->form_factor.'.php';
-			if (is_file($file)) {
-				$this->path = $dir;
-				return $file;
-			}
 			$file = $dir.$template.'.php';
 			if (is_file($file)) {
 				$this->path = $dir;
 				return $file;
 			}
 		}
-		throw new \Exception('template file not found: template:'.$template.' formfactor:'.$this->form_factor);
+		throw new \Exception('template file not found: template:'.$template);
 	}
 
 	public function getPath() {
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index a93449f202f..a066f90bb23 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -131,10 +131,7 @@ class OC_TemplateLayout extends OC_Template {
 		// Read the selected theme from the config file
 		$theme = OC_Util::getTheme();
 
-		// Read the detected form factor and use the right file name.
-		$formFactorExt = self::getFormFactorExtension();
-
-		$locator = new \OC\Template\CSSResourceLocator( $theme, $formFactorExt,
+		$locator = new \OC\Template\CSSResourceLocator( $theme,
 			array( OC::$SERVERROOT => OC::$WEBROOT ),
 			array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT ));
 		$locator->find($styles);
@@ -149,10 +146,7 @@ class OC_TemplateLayout extends OC_Template {
 		// Read the selected theme from the config file
 		$theme = OC_Util::getTheme();
 
-		// Read the detected form factor and use the right file name.
-		$formFactorExt = self::getFormFactorExtension();
-
-		$locator = new \OC\Template\JSResourceLocator( $theme, $formFactorExt,
+		$locator = new \OC\Template\JSResourceLocator( $theme,
 			array( OC::$SERVERROOT => OC::$WEBROOT ),
 			array( OC::$THIRDPARTYROOT => OC::$THIRDPARTYWEBROOT ));
 		$locator->find($scripts);
diff --git a/tests/lib/template/resourcelocator.php b/tests/lib/template/resourcelocator.php
index 619560643fe..cd354df0036 100644
--- a/tests/lib/template/resourcelocator.php
+++ b/tests/lib/template/resourcelocator.php
@@ -10,19 +10,17 @@ class Test_ResourceLocator extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * @param string $theme
-	 * @param string $form_factor
 	 */
-	public function getResourceLocator( $theme, $form_factor, $core_map, $party_map, $appsroots ) {
+	public function getResourceLocator( $theme, $core_map, $party_map, $appsroots ) {
 		return $this->getMockForAbstractClass('OC\Template\ResourceLocator',
-			array( $theme, $form_factor, $core_map, $party_map, $appsroots ),
+			array( $theme, $core_map, $party_map, $appsroots ),
 			'', true, true, true, array());
 	}
 
 	public function testConstructor() {
-		$locator = $this->getResourceLocator('theme', 'form_factor',
+		$locator = $this->getResourceLocator('theme',
 			array('core'=>'map'), array('3rd'=>'party'), array('foo'=>'bar'));
 		$this->assertAttributeEquals('theme', 'theme', $locator);
-		$this->assertAttributeEquals('form_factor', 'form_factor', $locator);
 		$this->assertAttributeEquals('core', 'serverroot', $locator);
 		$this->assertAttributeEquals(array('core'=>'map','3rd'=>'party'), 'mapping', $locator);
 		$this->assertAttributeEquals('3rd', 'thirdpartyroot', $locator);
@@ -31,7 +29,7 @@ class Test_ResourceLocator extends PHPUnit_Framework_TestCase {
 	}
 
 	public function testFind() {
-		$locator = $this->getResourceLocator('theme', 'form_factor',
+		$locator = $this->getResourceLocator('theme',
 			array('core'=>'map'), array('3rd'=>'party'), array('foo'=>'bar'));
 		$locator->expects($this->once())
 			->method('doFind')
@@ -41,7 +39,7 @@ class Test_ResourceLocator extends PHPUnit_Framework_TestCase {
 			->with('foo');
 		$locator->find(array('foo'));
 
-		$locator = $this->getResourceLocator('theme', 'form_factor',
+		$locator = $this->getResourceLocator('theme',
 			array('core'=>'map'), array('3rd'=>'party'), array('foo'=>'bar'));
 		$locator->expects($this->once())
 			->method('doFind')
@@ -50,12 +48,12 @@ class Test_ResourceLocator extends PHPUnit_Framework_TestCase {
 		try {
 			$locator->find(array('foo'));
 		} catch (\Exception $e) {
-			$this->assertEquals('test formfactor:form_factor serverroot:core', $e->getMessage());
+			$this->assertEquals('test serverroot:core', $e->getMessage());
 		}
 	}
 
 	public function testAppendIfExist() {
-		$locator = $this->getResourceLocator('theme', 'form_factor',
+		$locator = $this->getResourceLocator('theme',
 			array(__DIR__=>'map'), array('3rd'=>'party'), array('foo'=>'bar'));
 		$method = new ReflectionMethod($locator, 'appendIfExist');
 		$method->setAccessible(true);
-- 
GitLab


From 49ddaf9489d3c9ce75f965dcbacf7e8017a84e08 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 12 Nov 2014 15:56:02 +0100
Subject: [PATCH 398/616] Try to read the file only instead of trying to touch

The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.

Fixes https://github.com/owncloud/core/issues/12135
---
 lib/private/config.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/private/config.php b/lib/private/config.php
index f0548442ab5..cc07d6a1ed1 100644
--- a/lib/private/config.php
+++ b/lib/private/config.php
@@ -138,12 +138,12 @@ class Config {
 
 		// Include file and merge config
 		foreach ($configFiles as $file) {
-			if($file === $this->configFilePath && !@touch($file)) {
-				// Writing to the main config might not be possible, e.g. if the wrong
+			$filePointer = @fopen($file, 'r');
+			if($file === $this->configFilePath && $filePointer === false) {
+				// Opening the main config might not be possible, e.g. if the wrong
 				// permissions are set (likely on a new installation)
 				continue;
 			}
-			$filePointer = fopen($file, 'r');
 
 			// Try to acquire a file lock
 			if(!flock($filePointer, LOCK_SH)) {
-- 
GitLab


From fede6b93e51f84b250824e2bb520c582cbaa4627 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 12 Nov 2014 17:07:34 +0100
Subject: [PATCH 399/616] OC_DAVClient is not longer used - no need to carry it
 around anymore

---
 lib/private/davclient.php | 59 ---------------------------------------
 1 file changed, 59 deletions(-)
 delete mode 100644 lib/private/davclient.php

diff --git a/lib/private/davclient.php b/lib/private/davclient.php
deleted file mode 100644
index 6a544d27068..00000000000
--- a/lib/private/davclient.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Vincent Petry
- * @copyright 2013 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/>.
- *
- */
-
-/**
- * This class extends the SabreDAV client with additional functionality
- * like request timeout.
- */
-
-class OC_DAVClient extends \Sabre\DAV\Client {
-
-	protected $requestTimeout;
-
-	protected $verifyHost;
-
-	/**
-	 * Sets the request timeout or 0 to disable timeout.
-	 * @param integer $timeout in seconds or 0 to disable
-	 */
-	public function setRequestTimeout($timeout) {
-		$this->requestTimeout = (int)$timeout;
-	}
-
-	/**
-	 * Sets the CURLOPT_SSL_VERIFYHOST setting
-	 * @param integer $value value to set CURLOPT_SSL_VERIFYHOST to
-	*/
-	public function setVerifyHost($value) {
-		$this->verifyHost = $value;
-	}
-
-	protected function curlRequest($url, $settings) {
-		if ($this->requestTimeout > 0) {
-			$settings[CURLOPT_TIMEOUT] = $this->requestTimeout;
-		}
-		if (!is_null($this->verifyHost)) {
-			$settings[CURLOPT_SSL_VERIFYHOST] = $this->verifyHost;
-		}
-		return parent::curlRequest($url, $settings);
-	}
-}
-- 
GitLab


From 4302a78b27389cb8f4cdb61cc1f4167e4ecd522a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 12 Nov 2014 17:39:25 +0100
Subject: [PATCH 400/616] Deprecate older API wrappers and calls

Those old classes have now non-static pendants and can be deprecated IMHO.
---
 lib/private/appframework/core/api.php | 3 +++
 lib/public/appframework/iapi.php      | 1 +
 lib/public/user.php                   | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/lib/private/appframework/core/api.php b/lib/private/appframework/core/api.php
index 279f4bf97f7..f68c677d106 100644
--- a/lib/private/appframework/core/api.php
+++ b/lib/private/appframework/core/api.php
@@ -49,6 +49,7 @@ class API implements IApi{
 	/**
 	 * Gets the userid of the current user
 	 * @return string the user id of the current user
+	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
 	 */
 	public function getUserId(){
 		return \OCP\User::getUser();
@@ -112,6 +113,7 @@ class API implements IApi{
 	/**
 	 * used to return and open a new event source
 	 * @return \OCP\IEventSource a new open EventSource class
+	 * @deprecated Use \OC::$server->createEventSource();
 	 */
 	public function openEventSource(){
 		return \OC::$server->createEventSource();
@@ -159,6 +161,7 @@ class API implements IApi{
 	 * @param string $className full namespace and class name of the class
 	 * @param string $methodName the name of the static method that should be
 	 * called
+	 * @deprecated Use \OC::$server->getJobList()->add();
 	 */
 	public function addRegularTask($className, $methodName) {
 		\OCP\Backgroundjob::addRegularTask($className, $methodName);
diff --git a/lib/public/appframework/iapi.php b/lib/public/appframework/iapi.php
index 9af251be850..ecbc0fd1900 100644
--- a/lib/public/appframework/iapi.php
+++ b/lib/public/appframework/iapi.php
@@ -37,6 +37,7 @@ interface IApi {
 	/**
 	 * Gets the userid of the current user
 	 * @return string the user id of the current user
+	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
 	 */
 	function getUserId();
 
diff --git a/lib/public/user.php b/lib/public/user.php
index 925410d37d5..e9835620433 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -38,6 +38,7 @@ class User {
 	/**
 	 * Get the user id of the user currently logged in.
 	 * @return string uid or false
+	 * @deprecated Use \OC::$server->getUserSession()->getUser()->getUID()
 	 */
 	public static function getUser() {
 		return \OC_User::getUser();
@@ -94,6 +95,7 @@ class User {
 	/**
 	 * Logs the user out including all the session data
 	 * Logout, destroys session
+	 * @deprecated Use \OC::$server->getUserSession()->logout();
 	 */
 	public static function logout() {
 		\OC_User::logout();
@@ -106,6 +108,7 @@ class User {
 	 * @return string|false username on success, false otherwise
 	 *
 	 * Check if the password is correct without logging in the user
+	 * @deprecated Use \OC::$server->getUserManager()->checkPassword();
 	 */
 	public static function checkPassword( $uid, $password ) {
 		return \OC_User::checkPassword( $uid, $password );
-- 
GitLab


From f39cb3fbc9c8cce13b9cc759b257cb7d4bd9587a Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 6 Nov 2014 15:48:34 +0100
Subject: [PATCH 401/616] Migrate multiselect to user_ldap

---
 .scrutinizer.yml                              |  2 +-
 apps/user_ldap/settings.php                   |  4 ++--
 .../vendor/ui-multiselect/MIT-LICENSE         | 20 +++++++++++++++++++
 .../ui-multiselect}/jquery.multiselect.css    |  0
 .../ui-multiselect/src}/jquery.multiselect.js |  0
 5 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE
 rename {core/css => apps/user_ldap/vendor/ui-multiselect}/jquery.multiselect.css (100%)
 rename {core/js => apps/user_ldap/vendor/ui-multiselect/src}/jquery.multiselect.js (100%)

diff --git a/.scrutinizer.yml b/.scrutinizer.yml
index 2a555ad28f6..f66c1b86eac 100644
--- a/.scrutinizer.yml
+++ b/.scrutinizer.yml
@@ -2,6 +2,7 @@ filter:
     excluded_paths:
         - '3rdparty/*'
         - 'apps/*/3rdparty/*'
+        - 'apps/*/vendor/*'
         - 'l10n/*'
         - 'core/l10n/*'
         - 'apps/*/l10n/*'
@@ -13,7 +14,6 @@ filter:
         - 'core/js/jquery-tipsy.js'
         - 'core/js/jquery-ui-1.10.0.custom.js'
         - 'core/js/placeholders.js'
-        - 'core/js/jquery.multiselect.js'
 
 
 imports:
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index ca61a53b196..3b448aec757 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -28,9 +28,9 @@ OC_Util::checkAdminUser();
 OCP\Util::addScript('user_ldap', 'ldapFilter');
 OCP\Util::addScript('user_ldap', 'experiencedAdmin');
 OCP\Util::addScript('user_ldap', 'settings');
-OCP\Util::addScript('core', 'jquery.multiselect');
+\OC_Util::addVendorScript('user_ldap', 'ui-multiselect/src/jquery.multiselect');
 OCP\Util::addStyle('user_ldap', 'settings');
-OCP\Util::addStyle('core', 'jquery.multiselect');
+\OC_Util::addVendorStyle('user_ldap', 'ui-multiselect/jquery.multiselect');
 OCP\Util::addStyle('core', 'jquery-ui-1.10.0.custom');
 
 // fill template
diff --git a/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE b/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE
new file mode 100644
index 00000000000..2dc8e79e3ad
--- /dev/null
+++ b/apps/user_ldap/vendor/ui-multiselect/MIT-LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2011 Eric Hynds
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/core/css/jquery.multiselect.css b/apps/user_ldap/vendor/ui-multiselect/jquery.multiselect.css
similarity index 100%
rename from core/css/jquery.multiselect.css
rename to apps/user_ldap/vendor/ui-multiselect/jquery.multiselect.css
diff --git a/core/js/jquery.multiselect.js b/apps/user_ldap/vendor/ui-multiselect/src/jquery.multiselect.js
similarity index 100%
rename from core/js/jquery.multiselect.js
rename to apps/user_ldap/vendor/ui-multiselect/src/jquery.multiselect.js
-- 
GitLab


From a069171cda9f1f0ec129018c15e9696ae44c7154 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 13 Nov 2014 01:54:36 -0500
Subject: [PATCH 402/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/fr.js   |  6 +++---
 apps/files_encryption/l10n/fr.json |  6 +++---
 apps/files_external/l10n/fr.js     |  4 ++--
 apps/files_external/l10n/fr.json   |  4 ++--
 apps/user_ldap/l10n/fr.js          |  2 +-
 apps/user_ldap/l10n/fr.json        |  2 +-
 lib/l10n/fr.js                     |  4 ++--
 lib/l10n/fr.json                   |  4 ++--
 settings/l10n/cs_CZ.js             |  2 ++
 settings/l10n/cs_CZ.json           |  2 ++
 settings/l10n/da.js                |  2 ++
 settings/l10n/da.json              |  2 ++
 settings/l10n/de.js                |  2 ++
 settings/l10n/de.json              |  2 ++
 settings/l10n/de_DE.js             |  2 ++
 settings/l10n/de_DE.json           |  2 ++
 settings/l10n/en_GB.js             |  2 ++
 settings/l10n/en_GB.json           |  2 ++
 settings/l10n/et_EE.js             |  2 ++
 settings/l10n/et_EE.json           |  2 ++
 settings/l10n/fi_FI.js             |  3 +++
 settings/l10n/fi_FI.json           |  3 +++
 settings/l10n/fr.js                | 10 ++++++----
 settings/l10n/fr.json              | 10 ++++++----
 settings/l10n/ja.js                |  2 ++
 settings/l10n/ja.json              |  2 ++
 settings/l10n/nl.js                |  2 ++
 settings/l10n/nl.json              |  2 ++
 settings/l10n/pt_BR.js             |  2 ++
 settings/l10n/pt_BR.json           |  2 ++
 settings/l10n/pt_PT.js             |  2 ++
 settings/l10n/pt_PT.json           |  2 ++
 settings/l10n/tr.js                |  2 ++
 settings/l10n/tr.json              |  2 ++
 settings/l10n/zh_TW.js             |  1 +
 settings/l10n/zh_TW.json           |  1 +
 36 files changed, 80 insertions(+), 24 deletions(-)

diff --git a/apps/files_encryption/l10n/fr.js b/apps/files_encryption/l10n/fr.js
index 660157a68c2..b5bcaff19c2 100644
--- a/apps/files_encryption/l10n/fr.js
+++ b/apps/files_encryption/l10n/fr.js
@@ -12,7 +12,7 @@ OC.L10N.register(
     "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
     "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
     "Password successfully changed." : "Mot de passe changé avec succès.",
-    "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
+    "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
     "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.",
     "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
     "The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.",
@@ -34,8 +34,8 @@ OC.L10N.register(
     "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
     "Recovery key password" : "Mot de passe de la clef de récupération",
     "Repeat Recovery key password" : "Répétez le mot de passe de la clé de récupération",
-    "Enabled" : "Activer",
-    "Disabled" : "Désactiver",
+    "Enabled" : "Activé",
+    "Disabled" : "Désactivé",
     "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
     "Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
     "New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
diff --git a/apps/files_encryption/l10n/fr.json b/apps/files_encryption/l10n/fr.json
index c3fd61441ca..24de660bb3c 100644
--- a/apps/files_encryption/l10n/fr.json
+++ b/apps/files_encryption/l10n/fr.json
@@ -10,7 +10,7 @@
     "Please provide a new recovery password" : "Veuillez entrer un nouveau mot de passe de récupération",
     "Please repeat the new recovery password" : "Veuillez répéter le nouveau mot de passe de récupération",
     "Password successfully changed." : "Mot de passe changé avec succès.",
-    "Could not change the password. Maybe the old password was not correct." : "Ne peut pas changer le mot de passe. L'ancien mot de passe est peut-être incorrect.",
+    "Could not change the password. Maybe the old password was not correct." : "Erreur lors du changement de mot de passe. L'ancien mot de passe est peut-être incorrect.",
     "Could not update the private key password." : "Impossible de mettre à jour le mot de passe de la clé privée.",
     "The old password was not correct, please try again." : "L'ancien mot de passe est incorrect. Veuillez réessayer.",
     "The current log-in password was not correct, please try again." : "Le mot de passe actuel n'est pas correct, veuillez réessayer.",
@@ -32,8 +32,8 @@
     "Enable recovery key (allow to recover users files in case of password loss):" : "Activer la clef de récupération (permet de récupérer les fichiers des utilisateurs en cas de perte de mot de passe).",
     "Recovery key password" : "Mot de passe de la clef de récupération",
     "Repeat Recovery key password" : "Répétez le mot de passe de la clé de récupération",
-    "Enabled" : "Activer",
-    "Disabled" : "Désactiver",
+    "Enabled" : "Activé",
+    "Disabled" : "Désactivé",
     "Change recovery key password:" : "Modifier le mot de passe de la clef de récupération :",
     "Old Recovery key password" : "Ancien mot de passe de la clef de récupération",
     "New Recovery key password" : "Nouveau mot de passe de la clef de récupération",
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index a5efda84f81..7f827ec6fd4 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -55,8 +55,8 @@ OC.L10N.register(
     "Saved" : "Sauvegarder",
     "<b>Note:</b> " : "<b>Attention :</b>",
     " and " : "et",
-    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. 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> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "You don't have any external storages" : "Vous n'avez pas de support de stockage externe",
     "Name" : "Nom",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index fc59b74d3c5..e8a9e299c24 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -53,8 +53,8 @@
     "Saved" : "Sauvegarder",
     "<b>Note:</b> " : "<b>Attention :</b>",
     " and " : "et",
-    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> Le support de cURL de PHP n'est pas activé ou installé. 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> Le support FTP de PHP n'est pas activé ou installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+    "<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention :</b> La prise en charge de cURL par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
+    "<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> La prise en charge du FTP par PHP n'est pas activée ou installée. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "<b>Note:</b> \"%s\" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it." : "<b>Attention : </b> \"%s\" n'est pas installé. Le montage de %s n'est pas possible. Contactez votre administrateur système pour l'installer.",
     "You don't have any external storages" : "Vous n'avez pas de support de stockage externe",
     "Name" : "Nom",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index f1e8abe46d4..3736ade73ce 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -108,7 +108,7 @@ OC.L10N.register(
     "Group Search Attributes" : "Recherche des attributs du groupe",
     "Group-Member association" : "Association groupe-membre",
     "Nested Groups" : "Groupes imbriqués",
-    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont pris en charge (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
     "Paging chunksize" : "Dimensionnement des paginations",
     "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.)" : "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)",
     "Special Attributes" : "Attributs spéciaux",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index d8ab51ba632..58ac6f3d248 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -106,7 +106,7 @@
     "Group Search Attributes" : "Recherche des attributs du groupe",
     "Group-Member association" : "Association groupe-membre",
     "Nested Groups" : "Groupes imbriqués",
-    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont supportés (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
+    "When switched on, groups that contain groups are supported. (Only works if the group member attribute contains DNs.)" : "Si activé, les groupes contenant d'autres groupes sont pris en charge (fonctionne uniquement si l'attribut membre du groupe contient des DNs).",
     "Paging chunksize" : "Dimensionnement des paginations",
     "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.)" : "La taille d'une part (chunksize) est utilisée pour les recherches paginées de LDAP qui peuvent retourner des résultats par lots comme une énumération d'utilisateurs ou groupes. (Configurer à 0 pour désactiver les recherches paginées de LDAP.)",
     "Special Attributes" : "Attributs spéciaux",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index becc21ab649..d50e4f52a34 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -23,7 +23,7 @@ OC.L10N.register(
     "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",
-    "Archives of type %s are not supported" : "Les archives de type %s ne sont pas supportées",
+    "Archives of type %s are not supported" : "Les archives de type %s ne sont pas prises en charge",
     "Failed to open archive when installing app" : "Échec de l'ouverture de l'archive lors de l'installation de l'application",
     "App does not provide an info.xml file" : "L'application ne fournit pas de fichier info.xml",
     "App can't be installed because of not allowed code in the App" : "L'application ne peut être installée car elle contient du code non-autorisé",
@@ -104,7 +104,7 @@ OC.L10N.register(
     "Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.",
     "PHP module %s not installed." : "Le module PHP %s n’est pas installé.",
     "PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
-    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus supportée par ownCloud, de même que par la communauté PHP.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus prise en charge par ownCloud ni par la communauté PHP.",
     "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
     "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode est déprécié, inutile la plupart du temps, et doit être désactivé. Veuillez demander à votre administrateur serveur de le désactiver dans le fichier php.ini ou dans votre configuration du serveur web.",
     "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index 51452abce9e..fb054f12b21 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -21,7 +21,7 @@
     "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",
-    "Archives of type %s are not supported" : "Les archives de type %s ne sont pas supportées",
+    "Archives of type %s are not supported" : "Les archives de type %s ne sont pas prises en charge",
     "Failed to open archive when installing app" : "Échec de l'ouverture de l'archive lors de l'installation de l'application",
     "App does not provide an info.xml file" : "L'application ne fournit pas de fichier info.xml",
     "App can't be installed because of not allowed code in the App" : "L'application ne peut être installée car elle contient du code non-autorisé",
@@ -102,7 +102,7 @@
     "Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.",
     "PHP module %s not installed." : "Le module PHP %s n’est pas installé.",
     "PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
-    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus supportée par ownCloud, de même que par la communauté PHP.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Veuillez demander à votre administrateur de mettre à jour PHP vers sa dernière version disponible. La vôtre n’est plus prise en charge par ownCloud ni par la communauté PHP.",
     "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "PHP Safe Mode est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
     "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode est déprécié, inutile la plupart du temps, et doit être désactivé. Veuillez demander à votre administrateur serveur de le désactiver dans le fichier php.ini ou dans votre configuration du serveur web.",
     "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Magic Quotes est activé. ownCloud requiert sa désactivation afin de fonctionner correctement.",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index ddec3824154..c41c1c22555 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "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.",
     "Enforce HTTPS" : "Vynutit HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vynutí připojování klientů k %s šifrovaným spojením.",
+    "Enforce HTTPS for subdomains" : "Vynutit HTTPS pro poddomény",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vynutí připojování klientů k %s a poddoménám šifrovaným spojením.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index fe9c860fbdb..70d6c3f8eae 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -142,6 +142,8 @@
     "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.",
     "Enforce HTTPS" : "Vynutit HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vynutí připojování klientů k %s šifrovaným spojením.",
+    "Enforce HTTPS for subdomains" : "Vynutit HTTPS pro poddomény",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vynutí připojování klientů k %s a poddoménám šifrovaným spojením.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 11df1b2aed2..f0567ba20f5 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, dog ikke skabe dem.",
     "Enforce HTTPS" : "Gennemtving HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
+    "Enforce HTTPS for subdomains" : "Gennemtving HTTPS for subdomæner",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Tving klienterne til at tilslutte til %s og subdomæner via en krypteret forbindelse.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 973db1815ed..9f68b18a743 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Disse grupper vil stadig kunne modtage delefiler, dog ikke skabe dem.",
     "Enforce HTTPS" : "Gennemtving HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Tving klienten til at forbinde til %s via en kryptetet forbindelse.",
+    "Enforce HTTPS for subdomains" : "Gennemtving HTTPS for subdomæner",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Tving klienterne til at tilslutte til %s og subdomæner via en krypteret forbindelse.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Forbind venligst til din %s via HTTPS for at aktivere eller deaktivere SSL tvang.",
     "This is used for sending out notifications." : "Dette anvendes til udsendelse af notifikationer.",
     "Send mode" : "Tilstand for afsendelse",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 52fb6674b2c..bc33e10ac24 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Enforce HTTPS" : "Erzwinge HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
+    "Enforce HTTPS for subdomains" : "HTTPS für Subdomains erzwingen",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s und Subdomains zu verbinden.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sende-Modus",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 425197676db..b345d6b6540 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Enforce HTTPS" : "Erzwinge HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
+    "Enforce HTTPS for subdomains" : "HTTPS für Subdomains erzwingen",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s und Subdomains zu verbinden.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinde dich zu deinem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
     "This is used for sending out notifications." : "Dies wird zum Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sende-Modus",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index ddda5017a5f..ae1249a2c51 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Enforce HTTPS" : "HTTPS erzwingen",
     "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
+    "Enforce HTTPS for subdomains" : "HTTPS für Subdomains erzwingen",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s und Subdomains 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.",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 03cd7ab8eb5..a2ad5a222df 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Diese Gruppen können weiterhin Freigaben empfangen, aber selbst keine mehr initiieren.",
     "Enforce HTTPS" : "HTTPS erzwingen",
     "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die clientseitigen Anwendungen, verschlüsselte Verbindungen zu %s herzustellen.",
+    "Enforce HTTPS for subdomains" : "HTTPS für Subdomains erzwingen",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s und Subdomains 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.",
     "This is used for sending out notifications." : "Dies wird für das Senden von Benachrichtigungen verwendet.",
     "Send mode" : "Sendemodus",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index ec446af4288..9d2358b6cbd 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
     "Enforce HTTPS" : "Enforce HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forces the clients to connect to %s via an encrypted connection.",
+    "Enforce HTTPS for subdomains" : "Enforce HTTPS for subdomains",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Forces the clients to connect to %s and subdomains via an encrypted connection.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
     "This is used for sending out notifications." : "This is used for sending out notifications.",
     "Send mode" : "Send mode",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index ab9bc6a6bb5..1991825e663 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "These groups will still be able to receive shares, but not to initiate them.",
     "Enforce HTTPS" : "Enforce HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forces the clients to connect to %s via an encrypted connection.",
+    "Enforce HTTPS for subdomains" : "Enforce HTTPS for subdomains",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Forces the clients to connect to %s and subdomains via an encrypted connection.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Please connect to your %s via HTTPS to enable or disable the SSL enforcement.",
     "This is used for sending out notifications." : "This is used for sending out notifications.",
     "Send mode" : "Send mode",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index e5851e5a66a..a01c375f15a 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
     "Enforce HTTPS" : "Sunni peale HTTPS-i kasutamine",
     "Forces the clients to connect to %s via an encrypted connection." : "Sunnib kliente %s ühenduma krüpteeritult.",
+    "Enforce HTTPS for subdomains" : "Sunni peale HTTPS-i kasutamine",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Sunnib kliente ühenduma domeeniga %s ja selle alamdomeenidega krüpteeritult.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
     "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
     "Send mode" : "Saatmise viis",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 93eb7405b76..478545ed065 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Need grupid saavad vastu võtta jagamisi, kuid ise jagamisi algatada ei saa.",
     "Enforce HTTPS" : "Sunni peale HTTPS-i kasutamine",
     "Forces the clients to connect to %s via an encrypted connection." : "Sunnib kliente %s ühenduma krüpteeritult.",
+    "Enforce HTTPS for subdomains" : "Sunni peale HTTPS-i kasutamine",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Sunnib kliente ühenduma domeeniga %s ja selle alamdomeenidega krüpteeritult.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.",
     "This is used for sending out notifications." : "Seda kasutatakse teadete välja saatmiseks.",
     "Send mode" : "Saatmise viis",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 46bfe9d8e2c..18037bed46d 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -126,6 +126,7 @@ 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.",
     "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
     "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
+    "Enforce password protection" : "Pakota salasanasuojaus",
     "Allow public uploads" : "Salli julkiset lähetykset",
     "Set default expiration date" : "Aseta oletusvanhenemispäivä",
     "Expire after " : "Vanhenna",
@@ -138,6 +139,8 @@ OC.L10N.register(
     "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.",
     "Enforce HTTPS" : "Pakota HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
+    "Enforce HTTPS for subdomains" : "Pakota HTTPS-suojaus alidomaineille",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Pakottaa asiakkaat yhdistämään kohteeseen %s ja sen alidomaineihin salattua yhteyttä käyttäen.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index a541d5c7b13..b44ff19ad29 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -124,6 +124,7 @@
     "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.",
     "Allow apps to use the Share API" : "Salli sovellusten käyttää jakamisen ohjelmointirajapintaa",
     "Allow users to share via link" : "Salli käyttäjien jakaa linkkien kautta",
+    "Enforce password protection" : "Pakota salasanasuojaus",
     "Allow public uploads" : "Salli julkiset lähetykset",
     "Set default expiration date" : "Aseta oletusvanhenemispäivä",
     "Expire after " : "Vanhenna",
@@ -136,6 +137,8 @@
     "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.",
     "Enforce HTTPS" : "Pakota HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Pakottaa asiakasohjelmistot ottamaan yhteyden %siin salatun yhteyden kautta.",
+    "Enforce HTTPS for subdomains" : "Pakota HTTPS-suojaus alidomaineille",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Pakottaa asiakkaat yhdistämään kohteeseen %s ja sen alidomaineihin salattua yhteyttä käyttäen.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Yhdistä %siin HTTPS-yhteydellä ottaaksesi käyttöön tai poistaaksesi käytöstä SSL-pakotteen.",
     "This is used for sending out notifications." : "Tätä käytetään ilmoitusten lähettämiseen.",
     "Send mode" : "Lähetystila",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 3bd1be6c7a0..8fb3b2270a1 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -34,7 +34,7 @@ OC.L10N.register(
     "No user supplied" : "Aucun utilisateur fourni",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
     "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
-    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne permet pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
     "Unable to change password" : "Impossible de modifier le mot de passe",
     "Enabled" : "Activées",
     "Not enabled" : "Désactivées",
@@ -115,9 +115,9 @@ OC.L10N.register(
     "PHP charset is not set to UTF-8" : "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
     "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
     "Locale not working" : "Localisation non fonctionnelle",
-    "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte UTF-8.",
+    "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas ê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 to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s.",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "Connectivity Checks" : "Vérification de la connectivité",
@@ -144,6 +144,8 @@ OC.L10N.register(
     "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. ",
     "Enforce HTTPS" : "Forcer HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forcer les clients à se connecter à %s via une connexion chiffrée.",
+    "Enforce HTTPS for subdomains" : "Forcer HTTPS pour les sous domaines",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Force les clients à se connecter à %s et aux sous domaines via une connexion chiffrée.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
@@ -219,7 +221,7 @@ OC.L10N.register(
     "Username" : "Nom d'utilisateur",
     "Create" : "Créer",
     "Admin Recovery Password" : "Récupération du mot de passe administrateur",
-    "Enter the recovery password in order to recover the users files during password change" : "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
+    "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe",
     "Search Users and Groups" : "Chercher parmi les utilisateurs et groupes",
     "Add Group" : "Ajouter un groupe",
     "Group" : "Groupe",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index b05ce31285a..2ee4d13454f 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -32,7 +32,7 @@
     "No user supplied" : "Aucun utilisateur fourni",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Veuillez fournir un mot de passe administrateur de récupération de données, sinon toutes les données de l'utilisateur seront perdues",
     "Wrong admin recovery password. Please check the password and try again." : "Mot de passe administrateur de récupération de données non valable. Veuillez vérifier le mot de passe et essayer à nouveau.",
-    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne supporte pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "L'infrastructure d'arrière-plan ne permet pas la modification de mot de passe, mais la clef de chiffrement des utilisateurs a été mise à jour avec succès.",
     "Unable to change password" : "Impossible de modifier le mot de passe",
     "Enabled" : "Activées",
     "Not enabled" : "Désactivées",
@@ -113,9 +113,9 @@
     "PHP charset is not set to UTF-8" : "Le jeu de caractères PHP n'est pas réglé sur UTF-8",
     "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "Le jeu de caractères PHP n'est pas réglé sur UTF-8. Ceci peut entraîner des problèmes majeurs avec les noms de fichiers contenant des caractère non-ASCII. Nous recommandons fortement de changer la valeur de 'default_charset' dans php.ini par 'UTF-8'.",
     "Locale not working" : "Localisation non fonctionnelle",
-    "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas être configurés avec un qui supporte UTF-8.",
+    "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas ê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 to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer les paquets requis sur votre système pour supporter l'un des paramètres régionaux suivants : %s.",
+    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s.",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "Connectivity Checks" : "Vérification de la connectivité",
@@ -142,6 +142,8 @@
     "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. ",
     "Enforce HTTPS" : "Forcer HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forcer les clients à se connecter à %s via une connexion chiffrée.",
+    "Enforce HTTPS for subdomains" : "Forcer HTTPS pour les sous domaines",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Force les clients à se connecter à %s et aux sous domaines via une connexion chiffrée.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Veuillez vous connecter à cette instance %s via HTTPS pour activer ou désactiver SSL.",
     "This is used for sending out notifications." : "Ceci est utilisé pour l'envoi des notifications.",
     "Send mode" : "Mode d'envoi",
@@ -217,7 +219,7 @@
     "Username" : "Nom d'utilisateur",
     "Create" : "Créer",
     "Admin Recovery Password" : "Récupération du mot de passe administrateur",
-    "Enter the recovery password in order to recover the users files during password change" : "Entrer le mot de passe de récupération dans le but de récupérer les fichiers utilisateurs pendant le changement de mot de passe",
+    "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe",
     "Search Users and Groups" : "Chercher parmi les utilisateurs et groupes",
     "Add Group" : "Ajouter un groupe",
     "Group" : "Groupe",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 693cc13039c..4bc56102af4 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
     "Enforce HTTPS" : "常にHTTPSを使用する",
     "Forces the clients to connect to %s via an encrypted connection." : "クライアントから %sへの接続を常に暗号化します。",
+    "Enforce HTTPS for subdomains" : "サブドメインのHTTPSを強制する",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "%s とサブドメインへの暗号化接続をクライアントに強制する。",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 894a535d445..0a01be40311 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "このグループでは、フォルダー共有を開始することはできませんが、共有されたフォルダーを参照することはできます。",
     "Enforce HTTPS" : "常にHTTPSを使用する",
     "Forces the clients to connect to %s via an encrypted connection." : "クライアントから %sへの接続を常に暗号化します。",
+    "Enforce HTTPS for subdomains" : "サブドメインのHTTPSを強制する",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "%s とサブドメインへの暗号化接続をクライアントに強制する。",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "強制的なSSL接続を有効/無効にするには、HTTPS経由で %s へ接続してください。",
     "This is used for sending out notifications." : "通知を送信する際に使用します。",
     "Send mode" : "送信モード",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index dd97ce0faf5..2b4f2c6c4ed 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "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.",
     "Enforce HTTPS" : "Afdwingen HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Dwingt de clients om een versleutelde verbinding te maken met %s",
+    "Enforce HTTPS for subdomains" : "HTTPS afdwingen voor subdomeinen",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Dwingt de clients om een versleutelde verbinding te maken met %s en de subdomeinen.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
     "This is used for sending out notifications." : "Dit wordt gestuurd voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 4d9e405c12a..e27106179ee 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -142,6 +142,8 @@
     "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.",
     "Enforce HTTPS" : "Afdwingen HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Dwingt de clients om een versleutelde verbinding te maken met %s",
+    "Enforce HTTPS for subdomains" : "HTTPS afdwingen voor subdomeinen",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Dwingt de clients om een versleutelde verbinding te maken met %s en de subdomeinen.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Maak verbinding naar uw %s via HTTPS om een geforceerde versleutelde verbinding in- of uit te schakelen.",
     "This is used for sending out notifications." : "Dit wordt gestuurd voor het verzenden van meldingen.",
     "Send mode" : "Verstuurmodus",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 3d1f3906ed1..16c855ea18f 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "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.",
     "Enforce HTTPS" : "Forçar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
+    "Enforce HTTPS for subdomains" : "Forçar HTTPS para subdomínios",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Força os clientes se conectem a %s e subdomínios através de uma conexão criptografada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 12684951f9a..0d9a8cb5a89 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -142,6 +142,8 @@
     "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.",
     "Enforce HTTPS" : "Forçar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Obrigar os clientes que se conectem a %s através de uma conexão criptografada.",
+    "Enforce HTTPS for subdomains" : "Forçar HTTPS para subdomínios",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Força os clientes se conectem a %s e subdomínios através de uma conexão criptografada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, se conectar ao seu %s via HTTPS para forçar ativar ou desativar SSL.",
     "This is used for sending out notifications." : "Isto é usado para o envio de notificações.",
     "Send mode" : "Modo enviar",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 4161f7f6cae..092a8d7c2a2 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
     "Enforce HTTPS" : "Forçar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forçar os clientes a ligar a %s através de uma ligação encriptada",
+    "Enforce HTTPS for subdomains" : "Forçar HTTPS para subdomínios",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Força os clientes a ligar a %s e a subdomínios via uma ligação encriptada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
     "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 a94848a2c5e..6274d83d290 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Estes grupos poderão receber partilhas, mas não poderão iniciá-las.",
     "Enforce HTTPS" : "Forçar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forçar os clientes a ligar a %s através de uma ligação encriptada",
+    "Enforce HTTPS for subdomains" : "Forçar HTTPS para subdomínios",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Força os clientes a ligar a %s e a subdomínios via uma ligação encriptada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor ligue-se a %s através de uma ligação HTTPS para ligar/desligar o uso de ligação por SSL",
     "This is used for sending out notifications." : "Isto é utilizado para enviar notificações",
     "Send mode" : "Modo de Envio",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 0a33a604e4c..cf25a212c27 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
     "Enforce HTTPS" : "HTTPS bağlantısına zorla",
     "Forces the clients to connect to %s via an encrypted connection." : "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
+    "Enforce HTTPS for subdomains" : "Alt alan adları için HTTPS bağlantısına zorla",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "İstemcileri %s ve alt alan adlarına şifreli bir bağlantı ile bağlanmaya zorlar.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.",
     "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
     "Send mode" : "Gönderme kipi",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index b281d97834f..3bb8cce46b6 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Bu gruplar hala paylaşımları alabilecek, ancak başlatamayacaktır.",
     "Enforce HTTPS" : "HTTPS bağlantısına zorla",
     "Forces the clients to connect to %s via an encrypted connection." : "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.",
+    "Enforce HTTPS for subdomains" : "Alt alan adları için HTTPS bağlantısına zorla",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "İstemcileri %s ve alt alan adlarına şifreli bir bağlantı ile bağlanmaya zorlar.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.",
     "This is used for sending out notifications." : "Bu, bildirimler gönderilirken kullanılır.",
     "Send mode" : "Gönderme kipi",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index 95e5a44791f..c32238afb7c 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -31,6 +31,7 @@ OC.L10N.register(
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "後端不支援變更密碼，但成功更新使用者的加密金鑰",
     "Unable to change password" : "無法修改密碼",
     "Enabled" : "已啓用",
+    "Recommended" : "建議",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
     "If you received this email, the settings seem to be correct." : "假如您收到這個郵件，此設定看起來是正確的。",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index b07a305a422..a493cbf7d41 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -29,6 +29,7 @@
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "後端不支援變更密碼，但成功更新使用者的加密金鑰",
     "Unable to change password" : "無法修改密碼",
     "Enabled" : "已啓用",
+    "Recommended" : "建議",
     "Saved" : "已儲存",
     "test email settings" : "測試郵件設定",
     "If you received this email, the settings seem to be correct." : "假如您收到這個郵件，此設定看起來是正確的。",
-- 
GitLab


From 19346f4a276503a1b0094569466df705ecd254d3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 13 Nov 2014 11:58:09 +0100
Subject: [PATCH 403/616] this allows a non-existant config/config.php for
 starting the autotest.sh

---
 autotest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autotest.sh b/autotest.sh
index 8edb5f3915a..83a20699d01 100755
--- a/autotest.sh
+++ b/autotest.sh
@@ -40,7 +40,7 @@ if ! [ $PHPUNIT_MAJOR_VERSION -gt 3 -o \( $PHPUNIT_MAJOR_VERSION -eq 3 -a $PHPUN
 	exit 4
 fi
 
-if ! [ -w config -a -w config/config.php ]; then
+if ! [ \( -w config -a ! -f config/config.php \) -o \( -f config/config.php -a -w config/config.php \) ]; then
 	echo "Please enable write permissions on config and config/config.php" >&2
 	exit 1
 fi
-- 
GitLab


From 5f8fb8d1ee61e069adc7fcad6a3aad63f44bd1a6 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 11 Nov 2014 17:26:08 +0100
Subject: [PATCH 404/616] Run preupdate before an update

The update routine tries to test the database migration before actually performing the update.

However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.

This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
---
 lib/private/app.php     |  4 ----
 lib/private/updater.php | 18 +++++++++++++++++-
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/lib/private/app.php b/lib/private/app.php
index 73576088d15..bc9ca0351ea 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -1180,10 +1180,6 @@ class OC_App {
 	 * @return bool
 	 */
 	public static function updateApp($appId) {
-		if (file_exists(self::getAppPath($appId) . '/appinfo/preupdate.php')) {
-			self::loadApp($appId, false);
-			include self::getAppPath($appId) . '/appinfo/preupdate.php';
-		}
 		if (file_exists(self::getAppPath($appId) . '/appinfo/database.xml')) {
 			OC_DB::updateDbFromStructure(self::getAppPath($appId) . '/appinfo/database.xml');
 		}
diff --git a/lib/private/updater.php b/lib/private/updater.php
index c4c70a3cc4a..e07ff03ffc4 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -245,7 +245,6 @@ class Updater extends BasicEmitter {
 	protected function checkAppUpgrade($version) {
 		$apps = \OC_App::getEnabledApps();
 
-
 		foreach ($apps as $appId) {
 			if ($version) {
 				$info = \OC_App::getAppInfo($appId);
@@ -255,6 +254,15 @@ class Updater extends BasicEmitter {
 			}
 
 			if ($compatible && \OC_App::shouldUpgrade($appId)) {
+				/**
+				 * FIXME: The preupdate check is performed before the database migration, otherwise database changes
+				 * are not possible anymore within it. - Consider this when touching the code.
+				 * @link https://github.com/owncloud/core/issues/10980
+				 * @see \OC_App::updateApp
+				 */
+				if (file_exists(\OC_App::getAppPath($appId) . '/appinfo/preupdate.php')) {
+					$this->includePreUpdate($appId);
+				}
 				if (file_exists(\OC_App::getAppPath($appId) . '/appinfo/database.xml')) {
 					\OC_DB::simulateUpdateDbFromStructure(\OC_App::getAppPath($appId) . '/appinfo/database.xml');
 				}
@@ -264,6 +272,14 @@ class Updater extends BasicEmitter {
 		$this->emit('\OC\Updater', 'appUpgradeCheck');
 	}
 
+	/**
+	 * Includes the pre-update file. Done here to prevent namespace mixups.
+	 * @param string $appId
+	 */
+	private function includePreUpdate($appId) {
+		include \OC_App::getAppPath($appId) . '/appinfo/preupdate.php';
+	}
+
 	protected function doAppUpgrade() {
 		$apps = \OC_App::getEnabledApps();
 
-- 
GitLab


From 7e70c4ee95281d8fb9c38b982f8c2fbc5c59731d Mon Sep 17 00:00:00 2001
From: michag86 <micha_g@arcor.de>
Date: Tue, 4 Nov 2014 21:18:50 +0100
Subject: [PATCH 405/616] removal of wrong/double implemented check

Check already implemented in core/settings/ajax/changedisplayname.php
---
 lib/private/user/user.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index 452261a75ff..729abdc6227 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -115,7 +115,7 @@ class User implements IUser {
 	 */
 	public function setDisplayName($displayName) {
 		$displayName = trim($displayName);
-		if ($this->canChangeDisplayName() && !empty($displayName)) {
+		if ($this->backend->implementsActions(\OC_USER_BACKEND_SET_DISPLAYNAME) && !empty($displayName)) {
 			$this->displayName = $displayName;
 			$result = $this->backend->setDisplayName($this->uid, $displayName);
 			return $result !== false;
-- 
GitLab


From 42793534d4f0afeb4c7104b3474fcd0210fac5e8 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 13 Nov 2014 13:20:37 +0100
Subject: [PATCH 406/616] remove unneeded snap.js - followup to #11985 - ref
 #12156

---
 core/js/snap.js | 785 ------------------------------------------------
 1 file changed, 785 deletions(-)
 delete mode 100644 core/js/snap.js

diff --git a/core/js/snap.js b/core/js/snap.js
deleted file mode 100644
index 19942e866a9..00000000000
--- a/core/js/snap.js
+++ /dev/null
@@ -1,785 +0,0 @@
-/*! Snap.js v2.0.0-rc1 */
-(function(win, doc) {
-
-	'use strict';
-
-	// Our export
-	var Namespace = 'Snap';
-
-	// Our main toolbelt
-	var utils = {
-
-		/**
-		 * Deeply extends two objects
-		 * @param  {Object} destination The destination object
-		 * @param  {Object} source      The custom options to extend destination by
-		 * @return {Object}             The desination object
-		 */
-		extend: function(destination, source) {
-			var property;
-			for (property in source) {
-				if (source[property] && source[property].constructor && source[property].constructor === Object) {
-					destination[property] = destination[property] || {};
-					utils.extend(destination[property], source[property]);
-				} else {
-					destination[property] = source[property];
-				}
-			}
-			return destination;
-		}
-	};
-
-	/**
-	 * Our Snap global that initializes our instance
-	 * @param {Object} opts The custom Snap.js options
-	 */
-	var Core = function( opts ) {
-
-		var self = this;
-
-		/**
-		 * Our default settings for a Snap instance
-		 * @type {Object}
-		 */
-		var settings = self.settings = {
-			element: null,
-			dragger: null,
-			disable: 'none',
-			addBodyClasses: true,
-			hyperextensible: true,
-			resistance: 0.5,
-			flickThreshold: 50,
-			transitionSpeed: 0.3,
-			easing: 'ease',
-			maxPosition: 266,
-			minPosition: -266,
-			tapToClose: true,
-			touchToDrag: true,
-			clickToDrag: true,
-			slideIntent: 40, // degrees
-			minDragDistance: 5
-		};
-
-		/**
-		 * Stores internally global data
-		 * @type {Object}
-		 */
-		var cache = self.cache = {
-			isDragging: false,
-			simpleStates: {
-				opening: null,
-				towards: null,
-				hyperExtending: null,
-				halfway: null,
-				flick: null,
-				translation: {
-					absolute: 0,
-					relative: 0,
-					sinceDirectionChange: 0,
-					percentage: 0
-				}
-			}
-		};
-
-		var eventList = self.eventList = {};
-
-		utils.extend(utils, {
-
-			/**
-			 * Determines if we are interacting with a touch device
-			 * @type {Boolean}
-			 */
-			hasTouch: ('ontouchstart' in doc.documentElement || win.navigator.msPointerEnabled),
-
-			/**
-			 * Returns the appropriate event type based on whether we are a touch device or not
-			 * @param  {String} action The "action" event you're looking for: up, down, move, out
-			 * @return {String}        The browsers supported event name
-			 */
-			eventType: function(action) {
-				var eventTypes = {
-					down: (utils.hasTouch ? 'touchstart' : settings.clickToDrag ? 'mousedown' : ''),
-					move: (utils.hasTouch ? 'touchmove' : settings.clickToDrag ? 'mousemove' : ''),
-					up: (utils.hasTouch ? 'touchend' : settings.clickToDrag ? 'mouseup': ''),
-					out: (utils.hasTouch ? 'touchcancel' : settings.clickToDrag ? 'mouseout' : '')
-				};
-				return eventTypes[action];
-			},
-
-			/**
-			 * Returns the correct "cursor" position on both browser and mobile
-			 * @param  {String} t The coordinate to retrieve, either "X" or "Y"
-			 * @param  {Object} e The event object being triggered
-			 * @return {Number}   The desired coordiante for the events interaction
-			 */
-			page: function(t, e){
-				return (utils.hasTouch && e.touches.length && e.touches[0]) ? e.touches[0]['page'+t] : e['page'+t];
-			},
-
-
-			klass: {
-
-				/**
-				 * Checks if an element has a class name
-				 * @param  {Object}  el   The element to check
-				 * @param  {String}  name The class name to search for
-				 * @return {Boolean}      Returns true if the class exists
-				 */
-				has: function(el, name){
-					return (el.className).indexOf(name) !== -1;
-				},
-
-				/**
-				 * Adds a class name to an element
-				 * @param  {Object}  el   The element to add to
-				 * @param  {String}  name The class name to add
-				 */
-				add: function(el, name){
-					if(!utils.klass.has(el, name) && settings.addBodyClasses){
-						el.className += " "+name;
-					}
-				},
-
-				/**
-				 * Removes a class name
-				 * @param  {Object} el   The element to remove from
-				 * @param  {String} name The class name to remove
-				 */
-				remove: function(el, name){
-					if(utils.klass.has(el, name) && settings.addBodyClasses){
-						el.className = (el.className).replace(name, "").replace(/^\s+|\s+$/g, '');
-					}
-				}
-			},
-
-			/**
-			 * Dispatch a custom Snap.js event
-			 * @param  {String} type The event name
-			 */
-			dispatchEvent: function(type) {
-				if( typeof eventList[type] === 'function') {
-					return eventList[type].apply();
-				}
-			},
-
-			/**
-			 * Determines the browsers vendor prefix for CSS3
-			 * @return {String} The browsers vendor prefix
-			 */
-			vendor: function(){
-				var tmp = doc.createElement("div"),
-					prefixes = 'webkit Moz O ms'.split(' '),
-					i;
-				for (i in prefixes) {
-					if (typeof tmp.style[prefixes[i] + 'Transition'] !== 'undefined') {
-						return prefixes[i];
-					}
-				}
-			},
-
-			/**
-			 * Determines the browsers vendor prefix for transition callback events
-			 * @return {String} The event name
-			 */
-			transitionCallback: function(){
-				return (cache.vendor==='Moz' || cache.vendor==='ms') ? 'transitionend' : cache.vendor+'TransitionEnd';
-			},
-
-			/**
-			 * Determines if the users browser supports CSS3 transformations
-			 * @return {[type]} [description]
-			 */
-			canTransform: function(){
-				return typeof settings.element.style[cache.vendor+'Transform'] !== 'undefined';
-			},
-
-			/**
-			 * Determines an angle between two points
-			 * @param  {Number} x The X coordinate
-			 * @param  {Number} y The Y coordinate
-			 * @return {Number}   The number of degrees between the two points
-			 */
-			angleOfDrag: function(x, y) {
-				var degrees, theta;
-				// Calc Theta
-				theta = Math.atan2(-(cache.startDragY - y), (cache.startDragX - x));
-				if (theta < 0) {
-					theta += 2 * Math.PI;
-				}
-				// Calc Degrees
-				degrees = Math.floor(theta * (180 / Math.PI) - 180);
-				if (degrees < 0 && degrees > -180) {
-					degrees = 360 - Math.abs(degrees);
-				}
-				return Math.abs(degrees);
-			},
-
-
-			events: {
-
-				/**
-				 * Adds an event to an element
-				 * @param {Object} element   Element to add event to
-				 * @param {String} eventName The event name
-				 * @param {Function} func      Callback function
-				 */
-				addEvent: function addEvent(element, eventName, func) {
-					if (element.addEventListener) {
-						return element.addEventListener(eventName, func, false);
-					} else if (element.attachEvent) {
-						return element.attachEvent("on" + eventName, func);
-					}
-				},
-
-				/**
-				 * Removes an event to an element
-				 * @param {Object} element   Element to remove event from
-				 * @param {String} eventName The event name
-				 * @param {Function} func      Callback function
-				 */
-				removeEvent: function addEvent(element, eventName, func) {
-					if (element.addEventListener) {
-						return element.removeEventListener(eventName, func, false);
-					} else if (element.attachEvent) {
-						return element.detachEvent("on" + eventName, func);
-					}
-				},
-
-				/**
-				 * Prevents the default event
-				 * @param  {Object} e The event object
-				 */
-				prevent: function(e) {
-					if (e.preventDefault) {
-						e.preventDefault();
-					} else {
-						e.returnValue = false;
-					}
-				}
-			},
-
-			/**
-			 * Searches the parent element until a specified attribute has been matched
-			 * @param  {Object} el   The element to search from
-			 * @param  {String} attr The attribute to search for
-			 * @return {Object|null}      Returns a matched element if it exists, else, null
-			 */
-			parentUntil: function(el, attr) {
-				var isStr = typeof attr === 'string';
-				while (el.parentNode) {
-					if (isStr && el.getAttribute && el.getAttribute(attr)){
-						return el;
-					} else if(!isStr && el === attr){
-						return el;
-					}
-					el = el.parentNode;
-				}
-				return null;
-			}
-		});
-
-
-		var action = self.action = {
-
-			/**
-			 * Handles translating the elements position
-			 * @type {Object}
-			 */
-			translate: {
-				get: {
-
-					/**
-					 * Returns the amount an element is translated
-					 * @param  {Number} index The index desired from the CSS3 values of translate3d
-					 * @return {Number}       The amount of pixels an element is translated
-					 */
-					matrix: function(index) {
-
-						if( !cache.canTransform ){
-							return parseInt(settings.element.style.left, 10);
-						} else {
-							var matrix = win.getComputedStyle(settings.element)[cache.vendor+'Transform'].match(/\((.*)\)/),
-								ieOffset = 8;
-							if (matrix) {
-								matrix = matrix[1].split(',');
-
-								// Internet Explorer likes to give us 16 fucking values
-								if(matrix.length===16){
-									index+=ieOffset;
-								}
-								return parseInt(matrix[index], 10);
-							}
-							return 0;
-						}
-					}
-				},
-
-				/**
-				 * Called when the element has finished transitioning
-				 */
-				easeCallback: function(fn){
-					settings.element.style[cache.vendor+'Transition'] = '';
-					cache.translation = action.translate.get.matrix(4);
-					cache.easing = false;
-
-					if(cache.easingTo===0){
-						utils.klass.remove(doc.body, 'snapjs-right');
-						utils.klass.remove(doc.body, 'snapjs-left');
-					}
-
-					if( cache.once ){
-						cache.once.call(self, self.state());
-						delete cache.once;
-					}
-
-					utils.dispatchEvent('animated');
-					utils.events.removeEvent(settings.element, utils.transitionCallback(), action.translate.easeCallback);
-
-				},
-
-				/**
-				 * Animates the pane by the specified amount of pixels
-				 * @param  {Number} n The amount of pixels to move the pane
-				 */
-				easeTo: function(n, cb) {
-
-					if( !cache.canTransform ){
-						cache.translation = n;
-						action.translate.x(n);
-					} else {
-						cache.easing = true;
-						cache.easingTo = n;
-
-						settings.element.style[cache.vendor+'Transition'] = 'all ' + settings.transitionSpeed + 's ' + settings.easing;
-
-						cache.once = cb;
-
-						utils.events.addEvent(settings.element, utils.transitionCallback(), action.translate.easeCallback);
-						action.translate.x(n);
-					}
-					if(n===0){
-						settings.element.style[cache.vendor+'Transform'] = '';
-					}
-				},
-
-				/**
-				 * Immediately translates the element on its X axis
-				 * @param  {Number} n Amount of pixels to translate
-				 */
-				x: function(n) {
-					if( (settings.disable==='left' && n>0) ||
-						(settings.disable==='right' && n<0)
-						){ return; }
-
-					if( !settings.hyperextensible ){
-						if( n===settings.maxPosition || n>settings.maxPosition ){
-							n=settings.maxPosition;
-						} else if( n===settings.minPosition || n<settings.minPosition ){
-							n=settings.minPosition;
-						}
-					}
-
-					n = parseInt(n, 10);
-					if(isNaN(n)){
-						n = 0;
-					}
-
-					if( cache.canTransform ){
-						var theTranslate = 'translate3d(' + n + 'px, 0,0)';
-						settings.element.style[cache.vendor+'Transform'] = theTranslate;
-					} else {
-						settings.element.style.width = (win.innerWidth || doc.documentElement.clientWidth)+'px';
-
-						settings.element.style.left = n+'px';
-						settings.element.style.right = '';
-					}
-				}
-			},
-
-			/**
-			 * Handles all the events that interface with dragging
-			 * @type {Object}
-			 */
-			drag: {
-
-				/**
-				 * Begins listening for drag events on our element
-				 */
-				listen: function() {
-					cache.translation = 0;
-					cache.easing = false;
-					utils.events.addEvent(self.settings.element, utils.eventType('down'), action.drag.startDrag);
-					utils.events.addEvent(self.settings.element, utils.eventType('move'), action.drag.dragging);
-					utils.events.addEvent(self.settings.element, utils.eventType('up'), action.drag.endDrag);
-				},
-
-				/**
-				 * Stops listening for drag events on our element
-				 */
-				stopListening: function() {
-					utils.events.removeEvent(settings.element, utils.eventType('down'), action.drag.startDrag);
-					utils.events.removeEvent(settings.element, utils.eventType('move'), action.drag.dragging);
-					utils.events.removeEvent(settings.element, utils.eventType('up'), action.drag.endDrag);
-				},
-
-				/**
-				 * Fired immediately when the user begins to drag the content pane
-				 * @param  {Object} e Event object
-				 */
-				startDrag: function(e) {
-					// No drag on ignored elements
-					var target = e.target ? e.target : e.srcElement,
-						ignoreParent = utils.parentUntil(target, 'data-snap-ignore');
-
-					if (ignoreParent) {
-						utils.dispatchEvent('ignore');
-						return;
-					}
-
-
-					if(settings.dragger){
-						var dragParent = utils.parentUntil(target, settings.dragger);
-
-						// Only use dragger if we're in a closed state
-						if( !dragParent &&
-							(cache.translation !== settings.minPosition &&
-								cache.translation !== settings.maxPosition
-								)){
-							return;
-						}
-					}
-
-					utils.dispatchEvent('start');
-					settings.element.style[cache.vendor+'Transition'] = '';
-					cache.isDragging = true;
-
-					cache.intentChecked = false;
-					cache.startDragX = utils.page('X', e);
-					cache.startDragY = utils.page('Y', e);
-					cache.dragWatchers = {
-						current: 0,
-						last: 0,
-						hold: 0,
-						state: ''
-					};
-					cache.simpleStates = {
-						opening: null,
-						towards: null,
-						hyperExtending: null,
-						halfway: null,
-						flick: null,
-						translation: {
-							absolute: 0,
-							relative: 0,
-							sinceDirectionChange: 0,
-							percentage: 0
-						}
-					};
-				},
-
-				/**
-				 * Fired while the user is moving the content pane
-				 * @param  {Object} e Event object
-				 */
-				dragging: function(e) {
-
-					if (cache.isDragging && settings.touchToDrag) {
-
-						var thePageX = utils.page('X', e),
-							thePageY = utils.page('Y', e),
-							translated = cache.translation,
-							absoluteTranslation = action.translate.get.matrix(4),
-							whileDragX = thePageX - cache.startDragX,
-							openingLeft = absoluteTranslation > 0,
-							translateTo = whileDragX,
-							diff;
-
-						// Shown no intent already
-						if((cache.intentChecked && !cache.hasIntent)){
-							return;
-						}
-
-						if(settings.addBodyClasses){
-							if((absoluteTranslation)>0){
-								utils.klass.add(doc.body, 'snapjs-left');
-								utils.klass.remove(doc.body, 'snapjs-right');
-							} else if((absoluteTranslation)<0){
-								utils.klass.add(doc.body, 'snapjs-right');
-								utils.klass.remove(doc.body, 'snapjs-left');
-							}
-						}
-
-						if (cache.hasIntent === false || cache.hasIntent === null) {
-
-							var deg = utils.angleOfDrag(thePageX, thePageY),
-								inRightRange = (deg >= 0 && deg <= settings.slideIntent) || (deg <= 360 && deg > (360 - settings.slideIntent)),
-								inLeftRange = (deg >= 180 && deg <= (180 + settings.slideIntent)) || (deg <= 180 && deg >= (180 - settings.slideIntent));
-							if (!inLeftRange && !inRightRange) {
-								cache.hasIntent = false;
-							} else {
-								cache.hasIntent = true;
-							}
-							cache.intentChecked = true;
-						}
-
-						if (
-							(settings.minDragDistance>=Math.abs(thePageX-cache.startDragX)) || // Has user met minimum drag distance?
-								(cache.hasIntent === false)
-							) {
-							return;
-						}
-
-						utils.events.prevent(e);
-						utils.dispatchEvent('drag');
-
-						cache.dragWatchers.current = thePageX;
-
-						// Determine which direction we are going
-						if (cache.dragWatchers.last > thePageX) {
-							if (cache.dragWatchers.state !== 'left') {
-								cache.dragWatchers.state = 'left';
-								cache.dragWatchers.hold = thePageX;
-							}
-							cache.dragWatchers.last = thePageX;
-						} else if (cache.dragWatchers.last < thePageX) {
-							if (cache.dragWatchers.state !== 'right') {
-								cache.dragWatchers.state = 'right';
-								cache.dragWatchers.hold = thePageX;
-							}
-							cache.dragWatchers.last = thePageX;
-						}
-						if (openingLeft) {
-							// Pulling too far to the right
-							if (settings.maxPosition < absoluteTranslation) {
-								diff = (absoluteTranslation - settings.maxPosition) * settings.resistance;
-								translateTo = whileDragX - diff;
-							}
-							cache.simpleStates = {
-								opening: 'left',
-								towards: cache.dragWatchers.state,
-								hyperExtending: settings.maxPosition < absoluteTranslation,
-								halfway: absoluteTranslation > (settings.maxPosition / 2),
-								flick: Math.abs(cache.dragWatchers.current - cache.dragWatchers.hold) > settings.flickThreshold,
-								translation: {
-									absolute: absoluteTranslation,
-									relative: whileDragX,
-									sinceDirectionChange: (cache.dragWatchers.current - cache.dragWatchers.hold),
-									percentage: (absoluteTranslation/settings.maxPosition)*100
-								}
-							};
-						} else {
-							// Pulling too far to the left
-							if (settings.minPosition > absoluteTranslation) {
-								diff = (absoluteTranslation - settings.minPosition) * settings.resistance;
-								translateTo = whileDragX - diff;
-							}
-							cache.simpleStates = {
-								opening: 'right',
-								towards: cache.dragWatchers.state,
-								hyperExtending: settings.minPosition > absoluteTranslation,
-								halfway: absoluteTranslation < (settings.minPosition / 2),
-								flick: Math.abs(cache.dragWatchers.current - cache.dragWatchers.hold) > settings.flickThreshold,
-								translation: {
-									absolute: absoluteTranslation,
-									relative: whileDragX,
-									sinceDirectionChange: (cache.dragWatchers.current - cache.dragWatchers.hold),
-									percentage: (absoluteTranslation/settings.minPosition)*100
-								}
-							};
-						}
-						action.translate.x(translateTo + translated);
-					}
-				},
-
-				/**
-				 * Fired when the user releases the content pane
-				 * @param  {Object} e Event object
-				 */
-				endDrag: function(e) {
-					if (cache.isDragging) {
-						utils.dispatchEvent('end');
-						var translated = action.translate.get.matrix(4);
-
-						// Tap Close
-						if (cache.dragWatchers.current === 0 && translated !== 0 && settings.tapToClose) {
-							utils.dispatchEvent('close');
-							utils.events.prevent(e);
-							action.translate.easeTo(0);
-							cache.isDragging = false;
-							cache.startDragX = 0;
-							return;
-						}
-
-						// Revealing Left
-						if (cache.simpleStates.opening === 'left') {
-							// Halfway, Flicking, or Too Far Out
-							if ((cache.simpleStates.halfway || cache.simpleStates.hyperExtending || cache.simpleStates.flick)) {
-								if (cache.simpleStates.flick && cache.simpleStates.towards === 'left') { // Flicking Closed
-									action.translate.easeTo(0);
-								} else if (
-									(cache.simpleStates.flick && cache.simpleStates.towards === 'right') || // Flicking Open OR
-										(cache.simpleStates.halfway || cache.simpleStates.hyperExtending) // At least halfway open OR hyperextending
-									) {
-									action.translate.easeTo(settings.maxPosition); // Open Left
-								}
-							} else {
-								action.translate.easeTo(0); // Close Left
-							}
-							// Revealing Right
-						} else if (cache.simpleStates.opening === 'right') {
-							// Halfway, Flicking, or Too Far Out
-							if ((cache.simpleStates.halfway || cache.simpleStates.hyperExtending || cache.simpleStates.flick)) {
-								if (cache.simpleStates.flick && cache.simpleStates.towards === 'right') { // Flicking Closed
-									action.translate.easeTo(0);
-								} else if (
-									(cache.simpleStates.flick && cache.simpleStates.towards === 'left') || // Flicking Open OR
-										(cache.simpleStates.halfway || cache.simpleStates.hyperExtending) // At least halfway open OR hyperextending
-									) {
-									action.translate.easeTo(settings.minPosition); // Open Right
-								}
-							} else {
-								action.translate.easeTo(0); // Close Right
-							}
-						}
-						cache.isDragging = false;
-						cache.startDragX = utils.page('X', e);
-					}
-				}
-			}
-		};
-
-
-		// Initialize
-		if (opts.element) {
-			utils.extend(settings, opts);
-			cache.vendor = utils.vendor();
-			cache.canTransform = utils.canTransform();
-			action.drag.listen();
-		}
-	};
-
-
-	utils.extend(Core.prototype, {
-
-		/**
-		 * Opens the specified side menu
-		 * @param  {String} side Must be "left" or "right"
-		 */
-		open: function(side, cb) {
-			utils.dispatchEvent('open');
-			utils.klass.remove(doc.body, 'snapjs-expand-left');
-			utils.klass.remove(doc.body, 'snapjs-expand-right');
-
-			if (side === 'left') {
-				this.cache.simpleStates.opening = 'left';
-				this.cache.simpleStates.towards = 'right';
-				utils.klass.add(doc.body, 'snapjs-left');
-				utils.klass.remove(doc.body, 'snapjs-right');
-				this.action.translate.easeTo(this.settings.maxPosition, cb);
-			} else if (side === 'right') {
-				this.cache.simpleStates.opening = 'right';
-				this.cache.simpleStates.towards = 'left';
-				utils.klass.remove(doc.body, 'snapjs-left');
-				utils.klass.add(doc.body, 'snapjs-right');
-				this.action.translate.easeTo(this.settings.minPosition, cb);
-			}
-		},
-
-		/**
-		 * Closes the pane
-		 */
-		close: function(cb) {
-			utils.dispatchEvent('close');
-			this.action.translate.easeTo(0, cb);
-		},
-
-		/**
-		 * Hides the content pane completely allowing for full menu visibility
-		 * @param  {String} side Must be "left" or "right"
-		 */
-		expand: function(side){
-			var to = win.innerWidth || doc.documentElement.clientWidth;
-
-			if(side==='left'){
-				utils.dispatchEvent('expandLeft');
-				utils.klass.add(doc.body, 'snapjs-expand-left');
-				utils.klass.remove(doc.body, 'snapjs-expand-right');
-			} else {
-				utils.dispatchEvent('expandRight');
-				utils.klass.add(doc.body, 'snapjs-expand-right');
-				utils.klass.remove(doc.body, 'snapjs-expand-left');
-				to *= -1;
-			}
-			this.action.translate.easeTo(to);
-		},
-
-		/**
-		 * Listen in to custom Snap events
-		 * @param  {String}   evt The snap event name
-		 * @param  {Function} fn  Callback function
-		 * @return {Object}       Snap instance
-		 */
-		on: function(evt, fn) {
-			this.eventList[evt] = fn;
-			return this;
-		},
-
-		/**
-		 * Stops listening to custom Snap events
-		 * @param  {String} evt The snap event name
-		 */
-		off: function(evt) {
-			if (this.eventList[evt]) {
-				this.eventList[evt] = false;
-			}
-		},
-
-		/**
-		 * Enables Snap.js events
-		 */
-		enable: function() {
-			utils.dispatchEvent('enable');
-			this.action.drag.listen();
-		},
-
-		/**
-		 * Disables Snap.js events
-		 */
-		disable: function() {
-			utils.dispatchEvent('disable');
-			this.action.drag.stopListening();
-		},
-
-		/**
-		 * Updates the instances settings
-		 * @param  {Object} opts The Snap options to set
-		 */
-		settings: function(opts){
-			utils.extend(this.settings, opts);
-		},
-
-		/**
-		 * Returns information about the state of the content pane
-		 * @return {Object} Information regarding the state of the pane
-		 */
-		state: function() {
-			var state,
-				fromLeft = this.action.translate.get.matrix(4);
-			if (fromLeft === this.settings.maxPosition) {
-				state = 'left';
-			} else if (fromLeft === this.settings.minPosition) {
-				state = 'right';
-			} else {
-				state = 'closed';
-			}
-			return {
-				state: state,
-				info: this.cache.simpleStates
-			};
-		}
-	});
-
-	// Assign to the global namespace
-	this[Namespace] = Core;
-
-}).call(this, window, document);
-- 
GitLab


From 914f4cb6f2755b1856bc3d169292aa5eaddff59d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Thu, 13 Nov 2014 17:37:56 +0100
Subject: [PATCH 407/616] Do not remove dir entry if it has the same name as
 the parent

This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
---
 apps/files_external/lib/amazons3.php | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 53adb929e29..4d94e3561f8 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -267,10 +267,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 				$file = basename(
 					isset($object['Key']) ? $object['Key'] : $object['Prefix']
 				);
-
-				if ($file != basename($path)) {
-					$files[] = $file;
-				}
+				$files[] = $file;
 			}
 
 			\OC\Files\Stream\Dir::register('amazons3' . $path, $files);
-- 
GitLab


From 0811b39e5f53249075b347a279b3089c839f9859 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 14 Nov 2014 01:54:47 -0500
Subject: [PATCH 408/616] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/uk.js   | 5 ++++-
 apps/files_sharing/l10n/uk.json | 5 ++++-
 lib/l10n/af_ZA.js               | 1 +
 lib/l10n/af_ZA.json             | 1 +
 lib/l10n/uk.js                  | 1 +
 lib/l10n/uk.json                | 1 +
 settings/l10n/es.js             | 2 ++
 settings/l10n/es.json           | 2 ++
 8 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/l10n/uk.js b/apps/files_sharing/l10n/uk.js
index a41afdceb71..e4506d34c62 100644
--- a/apps/files_sharing/l10n/uk.js
+++ b/apps/files_sharing/l10n/uk.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Додати до вашого ownCloud",
     "Download" : "Завантажити",
     "Download %s" : "Завантажити %s",
-    "Direct link" : "Пряме посилання"
+    "Direct link" : "Пряме посилання",
+    "Server-to-Server Sharing" : "Публікація між серверами",
+    "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах",
+    "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів"
 },
 "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 a8d66aae2e9..4e85a0a459c 100644
--- a/apps/files_sharing/l10n/uk.json
+++ b/apps/files_sharing/l10n/uk.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Додати до вашого ownCloud",
     "Download" : "Завантажити",
     "Download %s" : "Завантажити %s",
-    "Direct link" : "Пряме посилання"
+    "Direct link" : "Пряме посилання",
+    "Server-to-Server Sharing" : "Публікація між серверами",
+    "Allow users on this server to send shares to other servers" : "Дозволити користувачам цього сервера публікувати на інших серверах",
+    "Allow users on this server to receive shares from other servers" : "Дозволити користувачам на цьому сервері отримувати публікації з інших серверів"
 },"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/af_ZA.js b/lib/l10n/af_ZA.js
index fd0ff979e2c..af812fe1e97 100644
--- a/lib/l10n/af_ZA.js
+++ b/lib/l10n/af_ZA.js
@@ -9,6 +9,7 @@ OC.L10N.register(
     "Unknown filetype" : "Onbekende leertipe",
     "Invalid image" : "Ongeldige prent",
     "web services under your control" : "webdienste onder jou beheer",
+    "seconds ago" : "sekondes gelede",
     "_%n minute ago_::_%n minutes ago_" : ["",""],
     "_%n hour ago_::_%n hours ago_" : ["","%n ure gelede"],
     "today" : "vandag",
diff --git a/lib/l10n/af_ZA.json b/lib/l10n/af_ZA.json
index 0a2bd668866..b3dedd54188 100644
--- a/lib/l10n/af_ZA.json
+++ b/lib/l10n/af_ZA.json
@@ -7,6 +7,7 @@
     "Unknown filetype" : "Onbekende leertipe",
     "Invalid image" : "Ongeldige prent",
     "web services under your control" : "webdienste onder jou beheer",
+    "seconds ago" : "sekondes gelede",
     "_%n minute ago_::_%n minutes ago_" : ["",""],
     "_%n hour ago_::_%n hours ago_" : ["","%n ure gelede"],
     "today" : "vandag",
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index 28bc758fa35..5afce6b2ced 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -77,6 +77,7 @@ OC.L10N.register(
     "years ago" : "роки тому",
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
     "A valid password must be provided" : "Потрібно задати вірний пароль",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Не встановлено драйвер бази даних (sqlite, mysql, or postgresql).",
     "Cannot write into \"config\" directory" : "Не можу писати у теку \"config\"",
     "Cannot write into \"apps\" directory" : "Не можу писати у теку \"apps\"",
     "Please ask your server administrator to install the module." : "Будь ласка, зверніться до адміністратора, щоб встановити модуль.",
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index 3fa7aa4d37c..9c632437ac2 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -75,6 +75,7 @@
     "years ago" : "роки тому",
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
     "A valid password must be provided" : "Потрібно задати вірний пароль",
+    "No database drivers (sqlite, mysql, or postgresql) installed." : "Не встановлено драйвер бази даних (sqlite, mysql, or postgresql).",
     "Cannot write into \"config\" directory" : "Не можу писати у теку \"config\"",
     "Cannot write into \"apps\" directory" : "Не можу писати у теку \"apps\"",
     "Please ask your server administrator to install the module." : "Будь ласка, зверніться до адміністратора, щоб встановити модуль.",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 5e86d9bbf02..b43606884df 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "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.",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
+    "Enforce HTTPS for subdomains" : "Forzar HTTPS para subdominios",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Obliga a los clientes a conectara %s y subdominios mediante una conexión cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
     "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
     "Send mode" : "Modo de envío",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 3f08f3573cd..3532c2f1ff3 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -142,6 +142,8 @@
     "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.",
     "Enforce HTTPS" : "Forzar HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forzar a los clientes a conectarse a %s por medio de una conexión cifrada.",
+    "Enforce HTTPS for subdomains" : "Forzar HTTPS para subdominios",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Obliga a los clientes a conectara %s y subdominios mediante una conexión cifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Por favor, conéctese a su %s a través de HTTPS para habilitar o deshabilitar la aplicación de SSL.",
     "This is used for sending out notifications." : "Esto se usa para enviar notificaciones.",
     "Send mode" : "Modo de envío",
-- 
GitLab


From 1358f3f17b004cfb6f7fe394c1137fbcb049e3bf Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 14 Nov 2014 13:19:02 +0100
Subject: [PATCH 409/616] Mark skipped until #12085 is merged

See https://github.com/owncloud/core/pull/12175#issuecomment-63054620
---
 tests/settings/controller/mailsettingscontrollertest.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index ff3d1d93a1b..b4177613f38 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -147,6 +147,12 @@ class MailSettingscontrollerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testSendTestMail() {
+		/**
+		 * FIXME: Disabled due to missing DI on mail class. 
+		 * TODO: Re-enable when https://github.com/owncloud/core/pull/12085 is merged.
+		 */
+		$this->markSkipped();
+		
 		$user = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()
 			->getMock();
-- 
GitLab


From 3fa892aecce983ca31d5e43caa2c380b13980f49 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 14 Nov 2014 13:42:13 +0100
Subject: [PATCH 410/616] Fail...

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

diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index b4177613f38..6d3485d28e4 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -151,7 +151,7 @@ class MailSettingscontrollerTest extends \PHPUnit_Framework_TestCase {
 		 * FIXME: Disabled due to missing DI on mail class. 
 		 * TODO: Re-enable when https://github.com/owncloud/core/pull/12085 is merged.
 		 */
-		$this->markSkipped();
+		$this->markTestSkipped('Disable test until OC_Mail is rewritten.');
 		
 		$user = $this->getMockBuilder('\OC\User\User')
 			->disableOriginalConstructor()
-- 
GitLab


From 7ed678b04db6dde338f90fbd00d828acee4c9c99 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Nov 2014 15:48:55 +0100
Subject: [PATCH 411/616] eliminate OC_Template::printErrorPage in database
 classes, fixes #12182

---
 lib/private/db/adapter.php          | 3 ++-
 lib/private/db/adaptersqlite.php    | 4 ++--
 lib/private/db/statementwrapper.php | 7 +++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 972008776f6..93d69cf4183 100644
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -43,6 +43,7 @@ class Adapter {
 	 * insert the @input values when they do not exist yet
 	 * @param string $table name
 	 * @param array $input key->value pair, key has to be sanitized properly
+	 * @throws \OC\HintException
 	 * @return int count of inserted rows
 	 */
 	public function insertIfNotExist($table, $input) {
@@ -71,7 +72,7 @@ class Adapter {
 			$entry .= 'Offending command was: ' . $query.'<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
 			error_log('DB error: ' . $entry);
-			\OC_Template::printErrorPage( $entry );
+			throw new \OC\HintException($entry);
 		}
 	}
 }
diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php
index 3471fcf4042..fa0e7eb6237 100644
--- a/lib/private/db/adaptersqlite.php
+++ b/lib/private/db/adaptersqlite.php
@@ -42,7 +42,7 @@ class AdapterSqlite extends Adapter {
 			$entry .= 'Offending command was: ' . $query . '<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
 			error_log('DB error: '.$entry);
-			\OC_Template::printErrorPage( $entry );
+			throw new \OC\HintException($entry);
 		}
 
 		if ($stmt->fetchColumn() === '0') {
@@ -61,7 +61,7 @@ class AdapterSqlite extends Adapter {
 			$entry .= 'Offending command was: ' . $query.'<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
 			error_log('DB error: ' . $entry);
-			\OC_Template::printErrorPage( $entry );
+			throw new \OC\HintException($entry);
 		}
 
 		return $result;
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index ad63de98e93..8d972411fe4 100644
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -64,7 +64,7 @@ class OC_DB_StatementWrapper {
 		} else {
 			$result = $this->statement->execute();
 		}
-		
+
 		if ($result === false) {
 			return false;
 		}
@@ -161,11 +161,10 @@ class OC_DB_StatementWrapper {
 			// send http status 503
 			header('HTTP/1.1 503 Service Temporarily Unavailable');
 			header('Status: 503 Service Temporarily Unavailable');
-			OC_Template::printErrorPage('Failed to connect to database');
-			die ($entry);
+			throw new \OC\HintException($entry);
 		}
 	}
-    
+
 	/**
 	 * provide an alias for fetch
 	 *
-- 
GitLab


From 988c85d2922a03346389e3656dc71dfee514e645 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 15 Oct 2014 11:58:44 +0200
Subject: [PATCH 412/616] Refactor file sharing public link handling

fixes download issue introduced by #10755

Conflicts:
	apps/files_sharing/public.php
---
 apps/files_sharing/appinfo/routes.php         |   1 +
 apps/files_sharing/application.php            |  73 +++++
 apps/files_sharing/js/public.js               |  15 +-
 .../lib/controllers/sharecontroller.php       | 271 ++++++++++++++++++
 apps/files_sharing/lib/helper.php             |   2 +-
 .../lib/middleware/sharingcheckmiddleware.php |  84 ++++++
 apps/files_sharing/public.php                 | 220 ++------------
 apps/files_sharing/templates/authenticate.php |   8 +-
 apps/files_sharing/templates/public.php       |  26 +-
 .../tests/controller/sharecontroller.php      | 170 +++++++++++
 .../middleware/sharingcheckmiddleware.php     |  76 +++++
 apps/files_sharing/tests/testcase.php         |   5 +
 core/routes.php                               |  19 +-
 core/share/controller.php                     |  23 --
 14 files changed, 748 insertions(+), 245 deletions(-)
 create mode 100644 apps/files_sharing/application.php
 create mode 100644 apps/files_sharing/lib/controllers/sharecontroller.php
 create mode 100644 apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
 create mode 100644 apps/files_sharing/tests/controller/sharecontroller.php
 create mode 100644 apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
 delete mode 100644 core/share/controller.php

diff --git a/apps/files_sharing/appinfo/routes.php b/apps/files_sharing/appinfo/routes.php
index d58a97e2956..68f33d94995 100644
--- a/apps/files_sharing/appinfo/routes.php
+++ b/apps/files_sharing/appinfo/routes.php
@@ -1,4 +1,5 @@
 <?php
+
 /** @var $this \OCP\Route\IRouter */
 $this->create('core_ajax_public_preview', '/publicpreview')->action(
 	function() {
diff --git a/apps/files_sharing/application.php b/apps/files_sharing/application.php
new file mode 100644
index 00000000000..089ed6afbda
--- /dev/null
+++ b/apps/files_sharing/application.php
@@ -0,0 +1,73 @@
+<?php
+/**
+ * @author Lukas Reschke
+ * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_Sharing;
+
+use OC\AppFramework\Utility\SimpleContainer;
+use OCA\Files_Sharing\Controllers\ShareController;
+use OCA\Files_Sharing\Middleware\SharingCheckMiddleware;
+use \OCP\AppFramework\App;
+
+/**
+ * @package OCA\Files_Sharing
+ */
+class Application extends App {
+
+
+	/**
+	 * @param array $urlParams
+	 */
+	public function __construct(array $urlParams=array()){
+		parent::__construct('files_sharing', $urlParams);
+
+		$container = $this->getContainer();
+
+		/**
+		 * Controllers
+		 */
+		$container->registerService('ShareController', function(SimpleContainer $c) {
+			return new ShareController(
+				$c->query('AppName'),
+				$c->query('Request'),
+				$c->query('UserSession'),
+				$c->query('ServerContainer')->getAppConfig(),
+				$c->query('ServerContainer')->getConfig(),
+				$c->query('URLGenerator'),
+				$c->query('ServerContainer')->getUserManager(),
+				$c->query('ServerContainer')->getLogger()
+			);
+		});
+
+		/**
+		 * Core class wrappers
+		 */
+		$container->registerService('UserSession', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getUserSession();
+		});
+		$container->registerService('URLGenerator', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getUrlGenerator();
+		});
+
+		/**
+		 * Middleware
+		 */
+		$container->registerService('SharingCheckMiddleware', function(SimpleContainer $c){
+			return new SharingCheckMiddleware(
+				$c->query('AppName'),
+				$c->query('ServerContainer')->getAppConfig(),
+				$c->getCoreApi()
+			);
+		});
+
+		// Execute middlewares
+		$container->registerMiddleware('SharingCheckMiddleware');
+	}
+
+}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 52679a7158d..0627ed6ab54 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -109,14 +109,12 @@ OCA.Sharing.PublicApp = {
 					filename = JSON.stringify(filename);
 				}
 				var path = dir || FileList.getCurrentDirectory();
+				var token = $('#sharingToken').val();
 				var params = {
-					service: 'files',
-					t: $('#sharingToken').val(),
 					path: path,
-					files: filename,
-					download: null
+					files: filename
 				};
-				return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+				return OC.generateUrl('/s/'+token+'/download') + '?' + OC.buildQueryString(params);
 			};
 
 			this.fileList.getAjaxUrl = function (action, params) {
@@ -126,12 +124,11 @@ OCA.Sharing.PublicApp = {
 			};
 
 			this.fileList.linkTo = function (dir) {
+				var token = $('#sharingToken').val();
 				var params = {
-					service: 'files',
-					t: $('#sharingToken').val(),
 					dir: dir
 				};
-				return OC.filePath('', '', 'public.php') + '?' + OC.buildQueryString(params);
+				return OC.generateUrl('/s/'+token+'') + '?' + OC.buildQueryString(params);
 			};
 
 			this.fileList.generatePreviewUrl = function (urlSpec) {
@@ -193,8 +190,6 @@ OCA.Sharing.PublicApp = {
 
 	_onDirectoryChanged: function (e) {
 		OC.Util.History.pushState({
-			service: 'files',
-			t: $('#sharingToken').val(),
 			// arghhhh, why is this not called "dir" !?
 			path: e.dir
 		});
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
new file mode 100644
index 00000000000..ec99b93826f
--- /dev/null
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -0,0 +1,271 @@
+<?php
+/**
+ * @author Clark Tomlinson <clark@owncloud.com>
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @copyright 2014 Clark Tomlinson & Lukas Reschke
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_Sharing\Controllers;
+
+use OC;
+use OC\Files\Filesystem;
+use OC_Files;
+use OC_Util;
+use OCP;
+use OCP\Template;
+use OCP\JSON;
+use OCP\Share;
+use OCP\AppFramework\Controller;
+use OCP\IRequest;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\IApi;
+use OC\URLGenerator;
+use OC\AppConfig;
+use OCP\ILogger;
+use OCA\Files_Sharing\Helper;
+use OCP\User;
+use OCP\Util;
+
+/**
+ * Class ShareController
+ *
+ * @package OCA\Files_Sharing\Controllers
+ */
+class ShareController extends Controller {
+
+	/** @var \OC\User\Session */
+	protected $userSession;
+	/** @var \OC\AppConfig */
+	protected $appConfig;
+	/** @var \OCP\IConfig */
+	protected $config;
+	/** @var \OC\URLGenerator */
+	protected $urlGenerator;
+	/** @var \OC\User\Manager */
+	protected $userManager;
+	/** @var \OCP\ILogger */
+	protected $logger;
+
+	/**
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param OC\User\Session $userSession
+	 * @param AppConfig $appConfig
+	 * @param OCP\IConfig $config
+	 * @param URLGenerator $urlGenerator
+	 * @param OC\User\Manager $userManager
+	 * @param ILogger $logger
+	 */
+	public function __construct($appName,
+								IRequest $request,
+								OC\User\Session $userSession,
+								AppConfig $appConfig,
+								OCP\IConfig $config,
+								URLGenerator $urlGenerator,
+								OC\User\Manager $userManager,
+								ILogger $logger) {
+		parent::__construct($appName, $request);
+
+		$this->userSession = $userSession;
+		$this->appConfig = $appConfig;
+		$this->config = $config;
+		$this->urlGenerator = $urlGenerator;
+		$this->userManager = $userManager;
+		$this->logger = $logger;
+	}
+
+	/**
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $token
+	 *
+	 * @return TemplateResponse|RedirectResponse
+	 */
+	public function showAuthenticate($token) {
+		$linkItem = Share::getShareByToken($token, false);
+
+		if(Helper::authenticate($linkItem)) {
+			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
+		}
+
+		return new TemplateResponse($this->appName, 'authenticate', array(), 'guest');
+	}
+
+	/**
+	 * @PublicPage
+	 *
+	 * Authenticates against password-protected shares
+	 * @param $token
+	 * @param string $password
+	 * @return RedirectResponse|TemplateResponse
+	 */
+	public function authenticate($token, $password = '') {
+		$linkItem = Share::getShareByToken($token, false);
+		if($linkItem === false) {
+			return new TemplateResponse('core', '404', array(), 'guest');
+		}
+
+		$authenticate = Helper::authenticate($linkItem, $password);
+
+		if($authenticate === true) {
+			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $token)));
+		}
+
+		return new TemplateResponse($this->appName, 'authenticate', array('wrongpw' => true), 'guest');
+	}
+
+	/**
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 *
+	 * @param string $token
+	 * @param string $path
+	 *
+	 * @return TemplateResponse
+	 */
+	public function showShare($token, $path = '') {
+		\OC_User::setIncognitoMode(true);
+
+		// Check whether share exists
+		$linkItem = Share::getShareByToken($token, false);
+		if($linkItem === false) {
+			return new TemplateResponse('core', '404', array(), 'guest');
+		}
+
+		$linkItem = OCP\Share::getShareByToken($token, false);
+		$shareOwner = $linkItem['uid_owner'];
+		$originalSharePath = null;
+		$rootLinkItem = OCP\Share::resolveReShare($linkItem);
+		if (isset($rootLinkItem['uid_owner'])) {
+			OCP\JSON::checkUserExists($rootLinkItem['uid_owner']);
+			OC_Util::tearDownFS();
+			OC_Util::setupFS($rootLinkItem['uid_owner']);
+			$originalSharePath = Filesystem::getPath($linkItem['file_source']);
+		}
+
+		// Share is password protected - check whether the user is permitted to access the share
+		if (isset($linkItem['share_with']) && !Helper::authenticate($linkItem)) {
+			return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.authenticate',
+				array('token' => $token)));
+		}
+
+		if (Filesystem::isReadable($originalSharePath . $path)) {
+			$getPath = Filesystem::normalizePath($path);
+			$originalSharePath .= $path;
+		}
+
+		$dir = dirname($originalSharePath);
+		$file = basename($originalSharePath);
+
+		$shareTmpl = array();
+		$shareTmpl['displayName'] = User::getDisplayName($shareOwner);
+		$shareTmpl['filename'] = $file;
+		$shareTmpl['directory_path'] = $linkItem['file_target'];
+		$shareTmpl['mimetype'] = Filesystem::getMimeType($originalSharePath);
+		$shareTmpl['dirToken'] = $linkItem['token'];
+		$shareTmpl['sharingToken'] = $token;
+		$shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled();
+		$shareTmpl['protected'] = isset($linkItem['share_with']) ? 'true' : 'false';
+		$shareTmpl['dir'] = $dir;
+
+		// Show file list
+		if (Filesystem::is_dir($originalSharePath)) {
+			$shareTmpl['dir'] = $getPath;
+			$files = array();
+			$maxUploadFilesize = Util::maxUploadFilesize($originalSharePath);
+			$freeSpace = Util::freeSpace($originalSharePath);
+			$uploadLimit = Util::uploadLimit();
+			$folder = new Template('files', 'list', '');
+			$folder->assign('dir', $getPath);
+			$folder->assign('dirToken', $linkItem['token']);
+			$folder->assign('permissions', OCP\PERMISSION_READ);
+			$folder->assign('isPublic', true);
+			$folder->assign('publicUploadEnabled', 'no');
+			$folder->assign('files', $files);
+			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
+			$folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
+			$folder->assign('freeSpace', $freeSpace);
+			$folder->assign('uploadLimit', $uploadLimit); // PHP upload limit
+			$folder->assign('usedSpacePercent', 0);
+			$folder->assign('trash', false);
+			$shareTmpl['folder'] = $folder->fetchPage();
+		}
+
+		$shareTmpl['downloadURL'] = $this->urlGenerator->linkToRouteAbsolute('files_sharing.sharecontroller.downloadShare', array('token' => $token));
+
+		return new TemplateResponse($this->appName, 'public', $shareTmpl, 'base');
+	}
+
+	/**
+	 * @PublicPage
+	 * @NoCSRFRequired
+	 * @param string $token
+	 * @param string $files
+	 * @param string $path
+	 * @return void|RedirectResponse
+	 */
+	public function downloadShare($token, $files = null, $path = '') {
+		\OC_User::setIncognitoMode(true);
+
+		$linkItem = OCP\Share::getShareByToken($token, false);
+
+		// Share is password protected - check whether the user is permitted to access the share
+		if (isset($linkItem['share_with'])) {
+			if(!Helper::authenticate($linkItem)) {
+				return new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.authenticate',
+					array('token' => $token)));
+			}
+		}
+
+		$originalSharePath = self::getPath($token);
+
+		if (isset($originalSharePath) && Filesystem::isReadable($originalSharePath . $path)) {
+				$getPath = Filesystem::normalizePath($path);
+				$originalSharePath .= $getPath;
+		}
+
+		if (!is_null($files)) { // download selected files
+			$files_list = json_decode($files);
+			// in case we get only a single file
+			if ($files_list === NULL ) {
+				$files_list = array($files);
+			}
+
+			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
+			// after dispatching the request which results in a "Cannot modify header information" notice. 
+			OC_Files::get($originalSharePath, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
+			exit();
+		} else {
+			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
+			// after dispatching the request which results in a "Cannot modify header information" notice.
+			OC_Files::get(dirname($originalSharePath), basename($originalSharePath), $_SERVER['REQUEST_METHOD'] == 'HEAD');
+			exit();
+		}
+	}
+
+	/**
+	 * @param $token
+	 * @return null|string
+	 */
+	private function getPath($token) {
+		$linkItem = Share::getShareByToken($token, false);
+		$path = null;
+		if (is_array($linkItem) && isset($linkItem['uid_owner'])) {
+			// seems to be a valid share
+			$rootLinkItem = Share::resolveReShare($linkItem);
+			if (isset($rootLinkItem['uid_owner'])) {
+				JSON::checkUserExists($rootLinkItem['uid_owner']);
+				OC_Util::tearDownFS();
+				OC_Util::setupFS($rootLinkItem['uid_owner']);
+				$path = Filesystem::getPath($linkItem['file_source']);
+			}
+		}
+		return $path;
+	}
+}
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index e7ca4fcccd4..3a2d51cddb7 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -95,7 +95,7 @@ class Helper {
 	 *
 	 * @return boolean true if authorized, false otherwise
 	 */
-	public static function authenticate($linkItem, $password) {
+	public static function authenticate($linkItem, $password = null) {
 		if ($password !== null) {
 			if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_LINK) {
 				// Check Password
diff --git a/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
new file mode 100644
index 00000000000..af79cd9e94a
--- /dev/null
+++ b/apps/files_sharing/lib/middleware/sharingcheckmiddleware.php
@@ -0,0 +1,84 @@
+<?php
+/**
+ * @author Lukas Reschke
+ * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_Sharing\Middleware;
+
+use OCP\AppFramework\IApi;
+use \OCP\AppFramework\Middleware;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IAppConfig;
+
+/**
+ * Checks whether the "sharing check" is enabled
+ *
+ * @package OCA\Files_Sharing\Middleware
+ */
+class SharingCheckMiddleware extends Middleware {
+
+	/** @var string */
+	protected $appName;
+	/** @var IAppConfig */
+	protected $appConfig;
+	/** @var IApi */
+	protected $api;
+
+	/***
+	 * @param string $appName
+	 * @param IAppConfig $appConfig
+	 * @param IApi $api
+	 */
+	public function __construct($appName,
+								IAppConfig $appConfig,
+								IApi $api) {
+		$this->appName = $appName;
+		$this->appConfig = $appConfig;
+		$this->api = $api;
+	}
+
+	/**
+	 * Check if sharing is enabled before the controllers is executed
+	 */
+	public function beforeController($controller, $methodName) {
+		if(!$this->isSharingEnabled()) {
+			throw new \Exception('Sharing is disabled.');
+		}
+	}
+
+	/**
+	 * Return 404 page in case of an exception
+	 * @param \OCP\AppFramework\Controller $controller
+	 * @param string $methodName
+	 * @param \Exception $exception
+	 * @return TemplateResponse
+	 */
+	public function afterException($controller, $methodName, \Exception $exception){
+		return new TemplateResponse('core', '404', array(), 'guest');
+	}
+
+	/**
+	 * Check whether sharing is enabled
+	 * @return bool
+	 */
+	private function isSharingEnabled() {
+		// FIXME: This check is done here since the route is globally defined and not inside the files_sharing app
+		// Check whether the sharing application is enabled
+		if(!$this->api->isAppEnabled($this->appName)) {
+			return false;
+		}
+
+		// Check whether public sharing is enabled
+		if($this->appConfig->getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
+			return false;
+		}
+
+		return true;
+	}
+
+}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 4320c105103..d9b8f0f4f30 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -1,205 +1,17 @@
 <?php
-// Load other apps for file previews
-use OCA\Files_Sharing\Helper;
-
-OC_App::loadApps();
-
-$appConfig = \OC::$server->getAppConfig();
-
-if ($appConfig->getValue('core', 'shareapi_allow_links', 'yes') !== 'yes') {
-	header('HTTP/1.0 404 Not Found');
-	$tmpl = new OCP\Template('', '404', 'guest');
-	$tmpl->printPage();
-	exit();
-}
-
-// Legacy sharing links via public.php have the token in $GET['t']
-if (isset($_GET['t'])) {
-	$token = $_GET['t'];
-}
-
-if (isset($token)) {
-	$linkItem = OCP\Share::getShareByToken($token, false);
-	if (is_array($linkItem) && isset($linkItem['uid_owner'])) {
-		// seems to be a valid share
-		$type = $linkItem['item_type'];
-		$fileSource = $linkItem['file_source'];
-		$shareOwner = $linkItem['uid_owner'];
-		$path = null;
-		$rootLinkItem = OCP\Share::resolveReShare($linkItem);
-		if (isset($rootLinkItem['uid_owner'])) {
-			OCP\JSON::checkUserExists($rootLinkItem['uid_owner']);
-			OC_Util::tearDownFS();
-			OC_Util::setupFS($rootLinkItem['uid_owner']);
-			$path = \OC\Files\Filesystem::getPath($linkItem['file_source']);
-		}
-	}
-}
-if (isset($path)) {
-	if (!isset($linkItem['item_type'])) {
-		OCP\Util::writeLog('share', 'No item type set for share id: ' . $linkItem['id'], \OCP\Util::ERROR);
-		header('HTTP/1.0 404 Not Found');
-		$tmpl = new OCP\Template('', '404', 'guest');
-		$tmpl->printPage();
-		exit();
-	}
-	if (isset($linkItem['share_with'])) {
-		// Authenticate share_with
-		$url = OCP\Util::linkToPublic('files') . '&t=' . $token;
-		if (isset($_GET['file'])) {
-			$url .= '&file=' . urlencode($_GET['file']);
-		} else {
-			if (isset($_GET['dir'])) {
-				$url .= '&dir=' . urlencode($_GET['dir']);
-			}
-		}
-		if (isset($_POST['password'])) {
-			$password = $_POST['password'];
-			if ($linkItem['share_type'] == OCP\Share::SHARE_TYPE_LINK) {
-				// Check Password
-				$forcePortable = (CRYPT_BLOWFISH != 1);
-				$hasher = new PasswordHash(8, $forcePortable);
-				if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''),
-											 $linkItem['share_with']))) {
-					OCP\Util::addStyle('files_sharing', 'authenticate');
-					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
-					$tmpl->assign('URL', $url);
-					$tmpl->assign('wrongpw', true);
-					$tmpl->printPage();
-					exit();
-				} else {
-					// Save item id in session for future requests
-					\OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']);
-				}
-			} else {
-				OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
-										   .' for share id '.$linkItem['id'], \OCP\Util::ERROR);
-				header('HTTP/1.0 404 Not Found');
-				$tmpl = new OCP\Template('', '404', 'guest');
-				$tmpl->printPage();
-				exit();
-			}
-
-		} else {
-			// Check if item id is set in session
-			if ( ! \OC::$server->getSession()->exists('public_link_authenticated')
-				|| \OC::$server->getSession()->get('public_link_authenticated') !== $linkItem['id']
-			) {
-				// Prompt for password
-				OCP\Util::addStyle('files_sharing', 'authenticate');
-				$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
-				$tmpl->assign('URL', $url);
-				$tmpl->printPage();
-				exit();
-			}
-		}
-	}
-	$basePath = $path;
-	$rootName = \OC_Util::basename($path);
-	if (isset($_GET['path']) && \OC\Files\Filesystem::isReadable($basePath . $_GET['path'])) {
-		$getPath = \OC\Files\Filesystem::normalizePath($_GET['path']);
-		$path .= $getPath;
-	} else {
-		$getPath = '';
-	}
-	$dir = dirname($path);
-	$file = basename($path);
-	// Download the file
-	if (isset($_GET['download'])) {
-		if (!\OCP\App::isEnabled('files_encryption')) {
-			// encryption app requires the session to store the keys in
-			\OC::$server->getSession()->close();
-		}
-		if (isset($_GET['files'])) { // download selected files
-			$files = $_GET['files'];
-			$files_list = json_decode($files);
-			// in case we get only a single file
-			if (!is_array($files_list)) {
-				$files_list = array($files);
-			}
-			OC_Files::get($path, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
-		} else {
-			OC_Files::get($dir, $file, $_SERVER['REQUEST_METHOD'] == 'HEAD');
-		}
-		exit();
-	} else {
-		OCP\Util::addScript('files', 'file-upload');
-		OCP\Util::addStyle('files_sharing', 'public');
-		OCP\Util::addStyle('files_sharing', 'mobile');
-		OCP\Util::addScript('files_sharing', 'public');
-		OCP\Util::addScript('files', 'fileactions');
-		OCP\Util::addScript('files', 'jquery.iframe-transport');
-		OCP\Util::addScript('files', 'jquery.fileupload');
-		$maxUploadFilesize=OCP\Util::maxUploadFilesize($path);
-		$tmpl = new OCP\Template('files_sharing', 'public', 'base');
-		$tmpl->assign('displayName', \OCP\User::getDisplayName($shareOwner));
-		$tmpl->assign('filename', $file);
-		$tmpl->assign('directory_path', $linkItem['file_target']);
-		$tmpl->assign('mimetype', \OC\Files\Filesystem::getMimeType($path));
-		$tmpl->assign('dirToken', $linkItem['token']);
-		$tmpl->assign('sharingToken', $token);
-		$tmpl->assign('server2serversharing', Helper::isOutgoingServer2serverShareEnabled());
-		$tmpl->assign('protected', isset($linkItem['share_with']) ? 'true' : 'false');
-
-		$urlLinkIdentifiers= (isset($token)?'&t='.$token:'')
-							.(isset($_GET['dir'])?'&dir='.$_GET['dir']:'')
-							.(isset($_GET['file'])?'&file='.$_GET['file']:'');
-		// Show file list
-		if (\OC\Files\Filesystem::is_dir($path)) {
-			$tmpl->assign('dir', $getPath);
-
-			OCP\Util::addStyle('files', 'files');
-			OCP\Util::addStyle('files', 'upload');
-			OCP\Util::addScript('files', 'filesummary');
-			OCP\Util::addScript('files', 'breadcrumb');
-			OCP\Util::addScript('files', 'files');
-			OCP\Util::addScript('files', 'filelist');
-			OCP\Util::addscript('files', 'keyboardshortcuts');
-			$files = array();
-			$rootLength = strlen($basePath) + 1;
-			$maxUploadFilesize=OCP\Util::maxUploadFilesize($path);
-
-			$freeSpace=OCP\Util::freeSpace($path);
-			$uploadLimit=OCP\Util::uploadLimit();
-			$folder = new OCP\Template('files', 'list', '');
-			$folder->assign('dir', $getPath);
-			$folder->assign('dirToken', $linkItem['token']);
-			$folder->assign('permissions', OCP\PERMISSION_READ);
-			$folder->assign('isPublic', true);
-			$folder->assign('publicUploadEnabled', 'no');
-			$folder->assign('files', $files);
-			$folder->assign('uploadMaxFilesize', $maxUploadFilesize);
-			$folder->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
-			$folder->assign('freeSpace', $freeSpace);
-			$folder->assign('uploadLimit', $uploadLimit); // PHP upload limit
-			$folder->assign('usedSpacePercent', 0);
-			$folder->assign('trash', false);
-			$tmpl->assign('folder', $folder->fetchPage());
-			$tmpl->assign('downloadURL',
-				OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download&path=' . urlencode($getPath));
-		} else {
-			$tmpl->assign('dir', $dir);
-
-			// Show file preview if viewer is available
-			if ($type == 'file') {
-				$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files') . $urlLinkIdentifiers . '&download');
-			} else {
-				$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files')
-										.$urlLinkIdentifiers.'&download&path='.urlencode($getPath));
-			}
-		}
-		$tmpl->printPage();
-	}
-	exit();
-} else {
-	OCP\Util::writeLog('share', 'could not resolve linkItem', \OCP\Util::DEBUG);
-}
-
-$errorTemplate = new OCP\Template('files_sharing', 'part.404', '');
-$errorContent = $errorTemplate->fetchPage();
-
-header('HTTP/1.0 404 Not Found');
-OCP\Util::addStyle('files_sharing', '404');
-$tmpl = new OCP\Template('', '404', 'guest');
-$tmpl->assign('content', $errorContent);
-$tmpl->printPage();
+/**
+ * @author Lukas Reschke
+ * @copyright 2014 Lukas Reschke lukas@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// This file is just used to redirect the legacy sharing URLs (< ownCloud 8) to the new ones
+
+$urlGenerator = new \OC\URLGenerator(\OC::$server->getConfig());
+$token = isset($_GET['t']) ? $_GET['t'] : '';
+$route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadshare' : 'files_sharing.sharecontroller.showshare';
+
+OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 0c4ac6ca445..e3aa62b9ece 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,4 +1,9 @@
-<form action="<?php p($_['URL']); ?>" method="post">
+<?php
+	/** @var $_ array */
+	/** @var $l OC_L10N */
+	style('files_sharing', 'authenticate');
+?>
+<form method="post">
 	<fieldset>
 		<?php if (!isset($_['wrongpw'])): ?>
 			<div class="warning-info"><?php p($l->t('This share is password-protected')); ?></div>
@@ -8,6 +13,7 @@
 		<?php endif; ?>
 		<p>
 			<label for="password" class="infield"><?php p($l->t('Password')); ?></label>
+			<input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" />
 			<input type="password" name="password" id="password"
 				placeholder="<?php p($l->t('Password')); ?>" value=""
 				autocomplete="off" autocapitalize="off" autocorrect="off"
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 46bf90b1b41..6b875d3c2b7 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -1,8 +1,28 @@
-<?php /** @var $l OC_L10N */ ?>
 <?php
+/** @var $l OC_L10N */
+/** @var $_ array */
+
+OCP\Util::addScript('files', 'file-upload');
+OCP\Util::addStyle('files_sharing', 'public');
+OCP\Util::addStyle('files_sharing', 'mobile');
+OCP\Util::addScript('files_sharing', 'public');
+OCP\Util::addScript('files', 'fileactions');
+OCP\Util::addScript('files', 'jquery.iframe-transport');
+OCP\Util::addScript('files', 'jquery.fileupload');
+
+// JS required for folders
+OCP\Util::addStyle('files', 'files');
+OCP\Util::addStyle('files', 'upload');
+OCP\Util::addScript('files', 'filesummary');
+OCP\Util::addScript('files', 'breadcrumb');
+OCP\Util::addScript('files', 'files');
+OCP\Util::addScript('files', 'filelist');
+OCP\Util::addscript('files', 'keyboardshortcuts');
+
 $thumbSize=1024;
 $previewSupported = OC\Preview::isMimeSupported($_['mimetype']) ? 'true' : 'false';
 ?>
+
 <?php if ( \OC\Preview::isMimeSupported($_['mimetype'])): /* This enables preview images for links (e.g. on Facebook, Google+, ...)*/?>
 	<link rel="image_src" href="<?php p(OCP\Util::linkToRoute( 'core_ajax_public_preview', array('x' => $thumbSize, 'y' => $thumbSize, 'file' => $_['directory_path'], 't' => $_['dirToken']))); ?>" />
 <?php endif; ?>
@@ -24,7 +44,7 @@ $previewSupported = OC\Preview::isMimeSupported($_['mimetype']) ? 'true' : 'fals
 
 <header><div id="header" class="<?php p((isset($_['folder']) ? 'share-folder' : 'share-file')) ?>">
 		<a href="<?php print_unescaped(link_to('', 'index.php')); ?>"
-			title="" id="owncloud">
+		   title="" id="owncloud">
 			<div class="logo-wide svg"></div>
 		</a>
 		<div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
@@ -48,7 +68,7 @@ $previewSupported = OC\Preview::isMimeSupported($_['mimetype']) ? 'true' : 'fals
 				</a>
 			</span>
 		</div>
-</div></header>
+	</div></header>
 <div id="content">
 	<div id="preview">
 		<?php if (isset($_['folder'])): ?>
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
new file mode 100644
index 00000000000..357184ba692
--- /dev/null
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -0,0 +1,170 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @copyright 2014 Lukas Reschke
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_Sharing\Controllers;
+
+use OC\Files\Filesystem;
+use OCA\Files_Sharing\Application;
+use OCP\AppFramework\IAppContainer;
+use OCP\Files;
+use OCP\AppFramework\Http\RedirectResponse;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\Security\ISecureRandom;
+use OC\Files\View;
+use OCP\Share;
+use OC\URLGenerator;
+
+/**
+ * @package OCA\Files_Sharing\Controllers
+ */
+class ShareControllerTest extends \PHPUnit_Framework_TestCase {
+
+	/** @var IAppContainer */
+	private $container;
+	/** @var string */
+	private $user;
+	/** @var string */
+	private $token;
+	/** @var string */
+	private $oldUser;
+	/** @var ShareController */
+	private $shareController;
+	/** @var URLGenerator */
+	private $urlGenerator;
+
+	protected function setUp() {
+		$app = new Application();
+		$this->container = $app->getContainer();
+		$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->container['AppName'] = 'files_sharing';
+		$this->container['UserSession'] = $this->getMockBuilder('\OC\User\Session')
+			->disableOriginalConstructor()->getMock();
+		$this->container['URLGenerator'] = $this->getMockBuilder('\OC\URLGenerator')
+			->disableOriginalConstructor()->getMock();
+		$this->urlGenerator = $this->container['URLGenerator'];
+		$this->shareController = $this->container['ShareController'];
+
+		// Store current user
+		$this->oldUser = \OC_User::getUser();
+
+		// Create a dummy user
+		$this->user = \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(12, ISecureRandom::CHAR_LOWER);
+
+		\OC_User::createUser($this->user, $this->user);
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		Filesystem::tearDown();
+		\OC_User::setUserId($this->user);
+		\OC_Util::setupFS($this->user);
+
+		// Create a dummy shared file
+		$view = new View('/'. $this->user . '/files');
+		$view->file_put_contents('file1.txt', 'I am such an awesome shared file!');
+		$this->token = \OCP\Share::shareItem(
+			Filesystem::getFileInfo('file1.txt')->getType(),
+			Filesystem::getFileInfo('file1.txt')->getId(),
+			\OCP\Share::SHARE_TYPE_LINK,
+			'IAmPasswordProtected!',
+			1
+		);
+	}
+
+	protected function tearDown() {
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		Filesystem::tearDown();
+		\OC_User::deleteUser($this->user);
+		\OC_User::setIncognitoMode(false);
+
+		\OC::$server->getSession()->set('public_link_authenticated', '');
+
+		// Set old user
+		\OC_User::setUserId($this->oldUser);
+		\OC_Util::setupFS($this->oldUser);
+	}
+
+	public function testShowAuthenticate() {
+		$linkItem = \OCP\Share::getShareByToken($this->token, false);
+
+		// Test without being authenticated
+		$response = $this->shareController->showAuthenticate($this->token);
+		$expectedResponse =  new TemplateResponse($this->container['AppName'], 'authenticate', array(), 'guest');
+		$this->assertEquals($expectedResponse, $response);
+
+		// Test with being authenticated for another file
+		\OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']-1);
+		$response = $this->shareController->showAuthenticate($this->token);
+		$expectedResponse =  new TemplateResponse($this->container['AppName'], 'authenticate', array(), 'guest');
+		$this->assertEquals($expectedResponse, $response);
+
+		// Test with being authenticated for the correct file
+		\OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']);
+		$response = $this->shareController->showAuthenticate($this->token);
+		$expectedResponse =  new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $this->token)));
+		$this->assertEquals($expectedResponse, $response);
+	}
+
+	public function testAuthenticate() {
+		// Test without a not existing token
+		$response = $this->shareController->authenticate('ThisTokenShouldHopefullyNeverExistSoThatTheUnitTestWillAlwaysPass :)');
+		$expectedResponse =  new TemplateResponse('core', '404', array(), 'guest');
+		$this->assertEquals($expectedResponse, $response);
+
+		// Test with a valid password
+		$response = $this->shareController->authenticate($this->token, 'IAmPasswordProtected!');
+		$expectedResponse =  new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.showShare', array('token' => $this->token)));
+		$this->assertEquals($expectedResponse, $response);
+
+		// Test with a invalid password
+		$response = $this->shareController->authenticate($this->token, 'WrongPw!');
+		$expectedResponse =  new TemplateResponse($this->container['AppName'], 'authenticate', array('wrongpw' => true), 'guest');
+		$this->assertEquals($expectedResponse, $response);
+	}
+
+	public function testShowShare() {
+		// Test without a not existing token
+		$response = $this->shareController->showShare('ThisTokenShouldHopefullyNeverExistSoThatTheUnitTestWillAlwaysPass :)');
+		$expectedResponse =  new TemplateResponse('core', '404', array(), 'guest');
+		$this->assertEquals($expectedResponse, $response);
+
+		// Test with a password protected share and no authentication
+		$response = $this->shareController->showShare($this->token);
+		$expectedResponse = new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.authenticate', array('token' => $this->token)));
+		$this->assertEquals($expectedResponse, $response);
+
+		// Test with password protected share and authentication
+		$linkItem = Share::getShareByToken($this->token, false);
+		\OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']);
+		$response = $this->shareController->showShare($this->token);
+		$sharedTmplParams = array(
+			'displayName' => $this->user,
+			'filename' => 'file1.txt',
+			'directory_path' => '/file1.txt',
+			'mimetype' => 'text/plain',
+			'dirToken' => $this->token,
+			'sharingToken' => $this->token,
+			'server2serversharing' => true,
+			'protected' => 'true',
+			'dir' => '/',
+			'downloadURL' => null
+		);
+		$expectedResponse = new TemplateResponse($this->container['AppName'], 'public', $sharedTmplParams, 'base');
+		$this->assertEquals($expectedResponse, $response);
+	}
+
+	public function testDownloadShare() {
+		// Test with a password protected share and no authentication
+		$response = $this->shareController->downloadShare($this->token);
+		$expectedResponse = new RedirectResponse($this->urlGenerator->linkToRoute('files_sharing.sharecontroller.authenticate',
+			array('token' => $this->token)));
+		$this->assertEquals($expectedResponse, $response);
+	}
+}
diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
new file mode 100644
index 00000000000..90c9a7bba10
--- /dev/null
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * @author Lukas Reschke <lukas@owncloud.com>
+ * @copyright 2014 Lukas Reschke
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_Sharing\Middleware;
+
+
+/**
+ * @package OCA\Files_Sharing\Middleware\SharingCheckMiddleware
+ */
+class SharingCheckMiddlewareTest extends \PHPUnit_Framework_TestCase {
+
+	/** @var \OCP\IAppConfig */
+	private $appConfig;
+	/** @var \OCP\AppFramework\IApi */
+	private $api;
+	/** @var SharingCheckMiddleware */
+	private $sharingCheckMiddleware;
+
+	protected function setUp() {
+		$this->appConfig = $this->getMockBuilder('\OCP\IAppConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->api = $this->getMockBuilder('\OCP\AppFramework\IApi')
+			->disableOriginalConstructor()->getMock();
+
+		$this->sharingCheckMiddleware = new SharingCheckMiddleware('files_sharing', $this->appConfig, $this->api);
+	}
+
+	public function testIsSharingEnabledWithEverythingEnabled() {
+		$this->api
+			->expects($this->once())
+			->method('isAppEnabled')
+			->with('files_sharing')
+			->will($this->returnValue(true));
+
+		$this->appConfig
+			->expects($this->once())
+			->method('getValue')
+			->with('core', 'shareapi_allow_links', 'yes')
+			->will($this->returnValue('yes'));
+
+		$this->assertTrue(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+	}
+
+	public function testIsSharingEnabledWithAppDisabled() {
+		$this->api
+			->expects($this->once())
+			->method('isAppEnabled')
+			->with('files_sharing')
+			->will($this->returnValue(false));
+
+		$this->assertFalse(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+	}
+
+	public function testIsSharingEnabledWithSharingDisabled() {
+		$this->api
+			->expects($this->once())
+			->method('isAppEnabled')
+			->with('files_sharing')
+			->will($this->returnValue(true));
+
+		$this->appConfig
+			->expects($this->once())
+			->method('getValue')
+			->with('core', 'shareapi_allow_links', 'yes')
+			->will($this->returnValue('no'));
+
+		$this->assertFalse(\Test_Helper::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+	}
+}
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index 78277dc907f..034baa785da 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -22,6 +22,7 @@
 
 namespace OCA\Files_Sharing\Tests;
 
+use OC\Files\Filesystem;
 use OCA\Files\Share;
 
 /**
@@ -115,6 +116,10 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		} else {
 			\OC_App::disable('files_encryption');
 		}
+
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		Filesystem::tearDown();
 	}
 
 	/**
diff --git a/core/routes.php b/core/routes.php
index 92545d0322e..ced70898f50 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -95,9 +95,22 @@ $this->create('core_avatar_post_cropped', '/avatar/cropped')
 	->action('OC\Core\Avatar\Controller', 'postCroppedAvatar');
 
 // Sharing routes
-$this->create('core_share_show_share', '/s/{token}')
-	->get()
-	->action('OC\Core\Share\Controller', 'showShare');
+$this->create('files_sharing.sharecontroller.showShare', '/s/{token}')->action(function($urlParams) {
+	$app = new \OCA\Files_Sharing\Application($urlParams);
+	$app->dispatch('ShareController', 'showShare');
+});
+$this->create('files_sharing.sharecontroller.authenticate', '/s/{token}/authenticate')->post()->action(function($urlParams) {
+	$app = new \OCA\Files_Sharing\Application($urlParams);
+	$app->dispatch('ShareController', 'authenticate');
+});
+$this->create('files_sharing.sharecontroller.showAuthenticate', '/s/{token}/authenticate')->get()->action(function($urlParams) {
+	$app = new \OCA\Files_Sharing\Application($urlParams);
+	$app->dispatch('ShareController', 'showAuthenticate');
+});
+$this->create('files_sharing.sharecontroller.downloadShare', '/s/{token}/download')->get()->action(function($urlParams) {
+	$app = new \OCA\Files_Sharing\Application($urlParams);
+	$app->dispatch('ShareController', 'downloadShare');
+});
 
 // used for heartbeat
 $this->create('heartbeat', '/heartbeat')->action(function(){
diff --git a/core/share/controller.php b/core/share/controller.php
deleted file mode 100644
index c1741af0d98..00000000000
--- a/core/share/controller.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Christopher Schäpers <christopher@schaepers.it>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Core\Share;
-
-class Controller {
-	public static function showShare($args) {
-		\OC_Util::checkAppEnabled('files_sharing');
-
-		$token = $args['token'];
-
-		\OC_App::loadApp('files_sharing');
-		\OC_User::setIncognitoMode(true);
-
-		require_once \OC_App::getAppPath('files_sharing') .'/public.php';
-	}
-}
-?>
-- 
GitLab


From fad621140b3fd94c12ddd3b13b37d4c56c5276ff Mon Sep 17 00:00:00 2001
From: Vincent Cloutier <vincent1cloutier@gmail.com>
Date: Wed, 15 Oct 2014 20:59:07 -0400
Subject: [PATCH 413/616] Added download size on public sharing

---
 apps/files_sharing/lib/controllers/sharecontroller.php  | 1 +
 apps/files_sharing/templates/public.php                 | 2 +-
 apps/files_sharing/tests/controller/sharecontroller.php | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index ec99b93826f..a3d5b6d44a0 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -173,6 +173,7 @@ class ShareController extends Controller {
 		$shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled();
 		$shareTmpl['protected'] = isset($linkItem['share_with']) ? 'true' : 'false';
 		$shareTmpl['dir'] = $dir;
+		$shareTmpl['fileSize'] = \OCP\Util::humanFileSize(\OC\Files\Filesystem::filesize($file));
 
 		// Show file list
 		if (Filesystem::is_dir($originalSharePath)) {
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 6b875d3c2b7..57c8707e962 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -87,7 +87,7 @@ $previewSupported = OC\Preview::isMimeSupported($_['mimetype']) ? 'true' : 'fals
 			<div class="directDownload">
 				<a href="<?php p($_['downloadURL']); ?>" id="download" 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($l->t('Download %s', array($_['filename'])))?> (<?php p($_['fileSize']) ?>)
 				</a>
 			</div>
 			<div class="directLink">
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index 357184ba692..8dcb2475564 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -154,7 +154,8 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase {
 			'server2serversharing' => true,
 			'protected' => 'true',
 			'dir' => '/',
-			'downloadURL' => null
+			'downloadURL' => null,
+			'fileSize' => '33 B'
 		);
 		$expectedResponse = new TemplateResponse($this->container['AppName'], 'public', $sharedTmplParams, 'base');
 		$this->assertEquals($expectedResponse, $response);
-- 
GitLab


From c941c3fa5139ba4f122d4f40d9c9db5e50f8bcb7 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Fri, 14 Nov 2014 12:45:36 +0100
Subject: [PATCH 414/616] Show warning when invalid user was passed

Sometimes there are bugs that cause setupFS() to be called for
non-existing users. Instead of failing hard and breaking the instance,
this fix simply logs a warning.
---
 apps/files_external/lib/config.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index fa44e446d96..9400bbdedc0 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -121,6 +121,14 @@ class OC_Mount_Config {
 
 		if ($data['user']) {
 			$user = \OC::$server->getUserManager()->get($data['user']);
+			if (!$user) {
+				\OC_Log::write(
+					'files_external',
+					'Cannot init external mount points for non-existant user "' . $data['user'] . '".',
+					\OC_Log::WARN
+				);
+				return;
+			}
 			$userView = new \OC\Files\View('/' . $user->getUID() . '/files');
 			$changePropagator = new \OC\Files\Cache\ChangePropagator($userView);
 			$etagPropagator = new \OCA\Files_External\EtagPropagator($user, $changePropagator, \OC::$server->getConfig());
-- 
GitLab


From 08205c63f9324d2697e2ac1a2cb322bc96b197e5 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Nov 2014 16:59:54 +0100
Subject: [PATCH 415/616] errors are already logged

---
 lib/private/db/adapter.php       | 1 -
 lib/private/db/adaptersqlite.php | 2 --
 2 files changed, 3 deletions(-)

diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 93d69cf4183..86f867d099f 100644
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -71,7 +71,6 @@ class Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query.'<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			error_log('DB error: ' . $entry);
 			throw new \OC\HintException($entry);
 		}
 	}
diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php
index fa0e7eb6237..39e2491ed08 100644
--- a/lib/private/db/adaptersqlite.php
+++ b/lib/private/db/adaptersqlite.php
@@ -41,7 +41,6 @@ class AdapterSqlite extends Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query . '<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			error_log('DB error: '.$entry);
 			throw new \OC\HintException($entry);
 		}
 
@@ -60,7 +59,6 @@ class AdapterSqlite extends Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query.'<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			error_log('DB error: ' . $entry);
 			throw new \OC\HintException($entry);
 		}
 
-- 
GitLab


From 74ffda8261d4cbe763e9fb610881e36edf5f9b4d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Nov 2014 17:13:51 +0100
Subject: [PATCH 416/616] do not output DB information, and do not set header

---
 lib/private/db/adapter.php          |  8 +++++++-
 lib/private/db/adaptersqlite.php    | 16 ++++++++++++++--
 lib/private/db/statementwrapper.php | 11 +++++++----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/lib/private/db/adapter.php b/lib/private/db/adapter.php
index 86f867d099f..58b3514b922 100644
--- a/lib/private/db/adapter.php
+++ b/lib/private/db/adapter.php
@@ -71,7 +71,13 @@ class Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query.'<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			throw new \OC\HintException($entry);
+			$l = \OC::$server->getL10N('lib');
+			throw new \OC\HintException(
+				$l->t('Database Error'),
+				$l->t('Please contact your system administrator.'),
+				0,
+				$e
+			);
 		}
 	}
 }
diff --git a/lib/private/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php
index 39e2491ed08..c5dfa85aaac 100644
--- a/lib/private/db/adaptersqlite.php
+++ b/lib/private/db/adaptersqlite.php
@@ -41,7 +41,13 @@ class AdapterSqlite extends Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query . '<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			throw new \OC\HintException($entry);
+			$l = \OC::$server->getL10N('lib');
+			throw new \OC\HintException(
+				$l->t('Database Error'),
+				$l->t('Please contact your system administrator.'),
+				0,
+				$e
+			);
 		}
 
 		if ($stmt->fetchColumn() === '0') {
@@ -59,7 +65,13 @@ class AdapterSqlite extends Adapter {
 			$entry = 'DB Error: "'.$e->getMessage() . '"<br />';
 			$entry .= 'Offending command was: ' . $query.'<br />';
 			\OC_Log::write('core', $entry, \OC_Log::FATAL);
-			throw new \OC\HintException($entry);
+			$l = \OC::$server->getL10N('lib');
+			throw new \OC\HintException(
+				$l->t('Database Error'),
+				$l->t('Please contact your system administrator.'),
+				0,
+				$e
+			);
 		}
 
 		return $result;
diff --git a/lib/private/db/statementwrapper.php b/lib/private/db/statementwrapper.php
index 8d972411fe4..a85c0167e0b 100644
--- a/lib/private/db/statementwrapper.php
+++ b/lib/private/db/statementwrapper.php
@@ -158,10 +158,13 @@ class OC_DB_StatementWrapper {
 			OC_Log::write('core', $entry, OC_Log::FATAL);
 			OC_User::setUserId(null);
 
-			// send http status 503
-			header('HTTP/1.1 503 Service Temporarily Unavailable');
-			header('Status: 503 Service Temporarily Unavailable');
-			throw new \OC\HintException($entry);
+			$l = \OC::$server->getL10N('lib');
+			throw new \OC\HintException(
+				$l->t('Database Error'),
+				$l->t('Please contact your system administrator.'),
+				0,
+				$e
+			);
 		}
 	}
 
-- 
GitLab


From 580d27eed25ab92ef276cfedaef1ffebc4bd4225 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 15 Nov 2014 01:54:28 -0500
Subject: [PATCH 417/616] [tx-robot] updated from transifex

---
 apps/files/l10n/it.js   | 8 ++++----
 apps/files/l10n/it.json | 8 ++++----
 core/l10n/cs_CZ.js      | 6 +++---
 core/l10n/cs_CZ.json    | 6 +++---
 settings/l10n/it.js     | 2 ++
 settings/l10n/it.json   | 2 ++
 settings/l10n/sl.js     | 2 ++
 settings/l10n/sl.json   | 2 ++
 8 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps/files/l10n/it.js b/apps/files/l10n/it.js
index 939f5e55dac..693888bb7c8 100644
--- a/apps/files/l10n/it.js
+++ b/apps/files/l10n/it.js
@@ -21,10 +21,10 @@ OC.L10N.register(
     "Error when creating the folder" : "Errore durante la creazione della cartella",
     "Unable to set upload directory." : "Impossibile impostare una cartella di caricamento.",
     "Invalid Token" : "Token non valido",
-    "No file was uploaded. Unknown error" : "Nessun file è stato inviato. Errore sconosciuto",
+    "No file was uploaded. Unknown error" : "Nessun file è stato caricato. Errore sconosciuto",
     "There is no error, the file uploaded with success" : "Non ci sono errori, il file è stato caricato correttamente",
     "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Il file caricato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
     "The uploaded file was only partially uploaded" : "Il file è stato caricato solo parzialmente",
     "No file was uploaded" : "Nessun file è stato caricato",
     "Missing a temporary folder" : "Manca una cartella temporanea",
@@ -38,7 +38,7 @@ OC.L10N.register(
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
     "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
-    "Upload cancelled." : "Invio annullato",
+    "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.",
     "URL cannot be empty" : "L'URL non può essere vuoto.",
@@ -76,7 +76,7 @@ OC.L10N.register(
     "%s could not be renamed" : "%s non può essere rinominato",
     "Upload (max. %s)" : "Carica (massimo %s)",
     "File handling" : "Gestione file",
-    "Maximum upload size" : "Dimensione massima upload",
+    "Maximum upload size" : "Dimensione massima caricamento",
     "max. possible: " : "numero mass.: ",
     "Save" : "Salva",
     "WebDAV" : "WebDAV",
diff --git a/apps/files/l10n/it.json b/apps/files/l10n/it.json
index 8686051f461..4efbf6f64b4 100644
--- a/apps/files/l10n/it.json
+++ b/apps/files/l10n/it.json
@@ -19,10 +19,10 @@
     "Error when creating the folder" : "Errore durante la creazione della cartella",
     "Unable to set upload directory." : "Impossibile impostare una cartella di caricamento.",
     "Invalid Token" : "Token non valido",
-    "No file was uploaded. Unknown error" : "Nessun file è stato inviato. Errore sconosciuto",
+    "No file was uploaded. Unknown error" : "Nessun file è stato caricato. Errore sconosciuto",
     "There is no error, the file uploaded with success" : "Non ci sono errori, il file è stato caricato correttamente",
     "The uploaded file exceeds the upload_max_filesize directive in php.ini: " : "Il file caricato supera la direttiva upload_max_filesize in php.ini:",
-    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
+    "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" : "Il file caricato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
     "The uploaded file was only partially uploaded" : "Il file è stato caricato solo parzialmente",
     "No file was uploaded" : "Nessun file è stato caricato",
     "Missing a temporary folder" : "Manca una cartella temporanea",
@@ -36,7 +36,7 @@
     "Unable to upload {filename} as it is a directory or has 0 bytes" : "Impossibile caricare {filename} poiché è una cartella oppure ha una dimensione di 0 byte.",
     "Total file size {size1} exceeds upload limit {size2}" : "La dimensione totale del file {size1} supera il limite di caricamento {size2}",
     "Not enough free space, you are uploading {size1} but only {size2} is left" : "Spazio insufficiente, stai caricando {size1}, ma è rimasto solo {size2}",
-    "Upload cancelled." : "Invio annullato",
+    "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.",
     "URL cannot be empty" : "L'URL non può essere vuoto.",
@@ -74,7 +74,7 @@
     "%s could not be renamed" : "%s non può essere rinominato",
     "Upload (max. %s)" : "Carica (massimo %s)",
     "File handling" : "Gestione file",
-    "Maximum upload size" : "Dimensione massima upload",
+    "Maximum upload size" : "Dimensione massima caricamento",
     "max. possible: " : "numero mass.: ",
     "Save" : "Salva",
     "WebDAV" : "WebDAV",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index c9aed4a7c45..1446ee93139 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -195,8 +195,8 @@ OC.L10N.register(
     "Hey there,<br><br>just letting you know that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View it!</a><br><br>" : "Hej ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
     "This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
-    "Thank you for your patience." : "Děkuji za trpělivost.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
+    "Thank you for your patience." : "Děkujeme za vaši trpělivost.",
     "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
@@ -207,7 +207,7 @@ OC.L10N.register(
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
     "Start update" : "Spustit aktualizaci",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:",
-    "This %s instance is currently being updated, which may take a while." : "Tato instalace %s je právě aktualizována a to může chvíli trvat.",
+    "This %s instance is currently being updated, which may take a while." : "Tato instalace %s je právě aktualizována. Mějte chvíli strpení.",
     "This page will refresh itself when the %s instance is available again." : "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s."
 },
 "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 67250ae52e7..94dc32af8f0 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -193,8 +193,8 @@
     "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 ty,<br><br>jen ti dávám vědět, že %s sdílí <strong>%s</strong> s tebou.<br><a href=\"%s\">Zobrazit!</a><br><br>",
     "This ownCloud instance is currently in single user mode." : "Tato instalace ownCloudu je momentálně v jednouživatelském módu.",
     "This means only administrators can use the instance." : "To znamená, že pouze správci systému mohou aplikaci používat.",
-    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte, prosím, správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
-    "Thank you for your patience." : "Děkuji za trpělivost.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktujte prosím správce systému, pokud se tato zpráva objevuje opakovaně nebo nečekaně.",
+    "Thank you for your patience." : "Děkujeme za vaši trpělivost.",
     "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
     "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
@@ -205,7 +205,7 @@
     "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Před provedením dalšího kroku se prosím ujistěte, že databáze a konfigurační a datový adresář byly zazálohovány.  ",
     "Start update" : "Spustit aktualizaci",
     "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Abyste zabránili vypršení časového limitu u větších instalací, můžete namísto toho spustit následující příkaz v hlavním adresáři:",
-    "This %s instance is currently being updated, which may take a while." : "Tato instalace %s je právě aktualizována a to může chvíli trvat.",
+    "This %s instance is currently being updated, which may take a while." : "Tato instalace %s je právě aktualizována. Mějte chvíli strpení.",
     "This page will refresh itself when the %s instance is available again." : "Tato stránka se automaticky načte poté, co bude opět dostupná instance %s."
 },"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
 }
\ No newline at end of file
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index d5a7a3259df..82387034738 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "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.",
     "Enforce HTTPS" : "Forza HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forza i client a connettersi a %s tramite una connessione cifrata.",
+    "Enforce HTTPS for subdomains" : "Forza HTTPS per i sottodomini",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Forza i client a connettersi a %s e ai sottodomini tramite una connessione cifrata.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 228c98c6068..8c75c4ca091 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -142,6 +142,8 @@
     "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.",
     "Enforce HTTPS" : "Forza HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Forza i client a connettersi a %s tramite una connessione cifrata.",
+    "Enforce HTTPS for subdomains" : "Forza HTTPS per i sottodomini",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Forza i client a connettersi a %s e ai sottodomini tramite una connessione cifrata.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connettiti al tuo %s tramite HTTPS per abilitare o disabilitare l'applicazione di SSL.",
     "This is used for sending out notifications." : "Viene utilizzato per inviare le notifiche.",
     "Send mode" : "Modalità di invio",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index fad7b286870..4abfb13d7fb 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -138,6 +138,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
     "Enforce HTTPS" : "Zahtevaj uporabo HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
+    "Enforce HTTPS for subdomains" : "Vsili protokol HTTPS za podrejene domene",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vsili povezavo odjemalcev na naslovu %s in na vseh podrejenih domenah preko šifrirane povezave. ",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 9f148233534..5a6e38c9439 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -136,6 +136,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Te skupine lahko sprejemajo mape v souporabo, ne morejo pa souporabe dovoliti",
     "Enforce HTTPS" : "Zahtevaj uporabo HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vsili povezavo odjemalca z %s preko šifrirane povezave.",
+    "Enforce HTTPS for subdomains" : "Vsili protokol HTTPS za podrejene domene",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vsili povezavo odjemalcev na naslovu %s in na vseh podrejenih domenah preko šifrirane povezave. ",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Za nastavljanje šifriranja SSL je treba vzpostaviti povezavo z mestom %s preko protokola HTTPS.",
     "This is used for sending out notifications." : "Možnost je uporabljena za omogočanje pošiljanja obvestil.",
     "Send mode" : "Način pošiljanja",
-- 
GitLab


From cd5925036a6cfb1f3f4e27a5d1893cbf7a10be47 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 14 Nov 2014 17:20:51 +0100
Subject: [PATCH 418/616] Check if app is enabled for user

Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
---
 .../middleware/security/securitymiddleware.php        | 11 +++++++++++
 .../middleware/security/SecurityMiddlewareTest.php    |  4 ++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index 948a43ce0f4..0a694318634 100644
--- a/lib/private/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
@@ -34,6 +34,7 @@ use OCP\INavigationManager;
 use OCP\IURLGenerator;
 use OCP\IRequest;
 use OCP\ILogger;
+use OCP\AppFramework\Controller;
 
 
 /**
@@ -116,6 +117,16 @@ class SecurityMiddleware extends Middleware {
 			}
 		}
 
+		/**
+		 * FIXME: Use DI once available
+		 * Checks if app is enabled (also inclues a check whether user is allowed to access the resource)
+		 * The getAppPath() check is here since components such as settings also use the AppFramework and
+		 * therefore won't pass this check.
+		 */
+		if(\OC_App::getAppPath($this->appName) !== false && !\OC_App::isEnabled($this->appName)) {
+			throw new SecurityException('App is not enabled', Http::STATUS_PRECONDITION_FAILED);
+		}
+
 	}
 
 
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index 74fc7907fb5..cc7704f4d1a 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -77,7 +77,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 			$this->navigationManager,
 			$this->urlGenerator,
 			$this->logger,
-			'test',
+			'files',
 			$isLoggedIn,
 			$isAdminUser
 		);
@@ -91,7 +91,7 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	public function testSetNavigationEntry(){
 		$this->navigationManager->expects($this->once())
 			->method('setActiveEntry')
-			->with($this->equalTo('test'));
+			->with($this->equalTo('files'));
 
 		$this->reader->reflect(__CLASS__, __FUNCTION__);
 		$this->middleware->beforeController(__CLASS__, __FUNCTION__);
-- 
GitLab


From 55889d7eb4962d8d0df2bcca9ab017181f5402a0 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 16 Nov 2014 01:55:00 -0500
Subject: [PATCH 419/616] [tx-robot] updated from transifex

---
 apps/user_ldap/l10n/it.js   |  2 +-
 apps/user_ldap/l10n/it.json |  2 +-
 core/l10n/pt_PT.js          | 62 ++++++++++++++++++-------------------
 core/l10n/pt_PT.json        | 62 ++++++++++++++++++-------------------
 4 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js
index 92bab544984..d7a4e192ec6 100644
--- a/apps/user_ldap/l10n/it.js
+++ b/apps/user_ldap/l10n/it.js
@@ -63,7 +63,7 @@ OC.L10N.register(
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
     "Port" : "Porta",
     "User DN" : "DN utente",
-    "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." : "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+    "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." : "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agente,dc=esempio,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
     "Password" : "Password",
     "For anonymous access, leave DN and Password empty." : "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
     "One Base DN per line" : "Un DN base per riga",
diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json
index 31a694a4b1c..44a529bc0c5 100644
--- a/apps/user_ldap/l10n/it.json
+++ b/apps/user_ldap/l10n/it.json
@@ -61,7 +61,7 @@
     "You can omit the protocol, except you require SSL. Then start with ldaps://" : "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://",
     "Port" : "Porta",
     "User DN" : "DN utente",
-    "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." : "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agent,dc=example,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
+    "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." : "Il DN per il client dell'utente con cui deve essere associato, ad esempio uid=agente,dc=esempio,dc=com. Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
     "Password" : "Password",
     "For anonymous access, leave DN and Password empty." : "Per l'accesso anonimo, lasciare vuoti i campi DN e Password",
     "One Base DN per line" : "Un DN base per riga",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index bc84fc7bbd9..f304226c321 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -1,19 +1,19 @@
 OC.L10N.register(
     "core",
     {
-    "Couldn't send mail to following users: %s " : "Não conseguiu enviar correio aos seguintes utilizadores: %s",
-    "Turned on maintenance mode" : "Activado o modo de manutenção",
-    "Turned off maintenance mode" : "Desactivado o modo de manutenção",
-    "Updated database" : "Base de dados actualizada",
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar o correio para os seguintes utilizadores: %s",
+    "Turned on maintenance mode" : "Ativado o modo de manutenção",
+    "Turned off maintenance mode" : "Desativado o modo de manutenção",
+    "Updated database" : "Base de dados atualizada",
     "Checked database schema update" : "Atualização do esquema da base de dados verificada.",
     "Checked database schema update for apps" : "Atualização do esquema da base de dados verificada.",
-    "Updated \"%s\" to %s" : "Actualizado \"%s\" para %s",
+    "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
     "Disabled incompatible apps: %s" : "Apps incompatíveis desativadas: %s",
-    "No image or file provided" : "Não foi selecionado nenhum ficheiro para importar",
-    "Unknown filetype" : "Ficheiro desconhecido",
+    "No image or file provided" : "Não foi fornecido nenhum ficheiro ou imagem",
+    "Unknown filetype" : "Tipo de ficheiro desconhecido",
     "Invalid image" : "Imagem inválida",
-    "No temporary profile picture available, try again" : "Foto temporária de perfil indisponível, tente novamente",
-    "No crop data provided" : "Sem dados de corte fornecidos",
+    "No temporary profile picture available, try again" : "Fotografia temporária do perfil indisponível, tente novamente",
+    "No crop data provided" : "Não foram fornecidos dados de recorte",
     "Sunday" : "Domingo",
     "Monday" : "Segunda",
     "Tuesday" : "Terça",
@@ -34,13 +34,13 @@ OC.L10N.register(
     "November" : "Novembro",
     "December" : "Dezembro",
     "Settings" : "Configurações",
-    "Saving..." : "A guardar...",
-    "Couldn't send reset email. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
+    "Saving..." : "A guardar ...",
+    "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "I know what I'm doing" : "Tenho a certeza",
-    "Reset password" : "Repor password",
-    "Password can not be changed. Please contact your administrator." : "A password não pode ser alterada. Contacte o seu administrador.",
+    "I know what I'm doing" : "Eu sei o que Eu estou a fazer",
+    "Reset password" : "Repor palavra-passe",
+    "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.",
     "No" : "Não",
     "Yes" : "Sim",
     "Choose" : "Escolha",
@@ -58,11 +58,11 @@ OC.L10N.register(
     "(all selected)" : "(todos seleccionados)",
     "({count} selected)" : "({count} seleccionados)",
     "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
-    "Very weak password" : "Password muito fraca",
-    "Weak password" : "Password fraca",
-    "So-so password" : "Password aceitável",
-    "Good password" : "Password Forte",
-    "Strong password" : "Password muito forte",
+    "Very weak password" : "Palavra-passe muito fraca",
+    "Weak password" : "Palavra-passe fraca",
+    "So-so password" : "Palavra-passe aceitável",
+    "Good password" : "Palavra-passe boa",
+    "Strong password" : "Palavra-passe forte",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
     "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." : "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
     "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
@@ -78,8 +78,8 @@ OC.L10N.register(
     "Share with user or group …" : "Partilhar com utilizador ou grupo...",
     "Share link" : "Partilhar o link",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
-    "Password protect" : "Proteger com palavra-passe",
-    "Choose a password for the public link" : "Defina a palavra-passe para o link público",
+    "Password protect" : "Proteger com Palavra-passe",
+    "Choose a password for the public link" : "Defina a palavra-passe para a hiperligação pública",
     "Allow Public Upload" : "Permitir Envios Públicos",
     "Email link to person" : "Enviar o link por e-mail",
     "Send" : "Enviar",
@@ -97,7 +97,7 @@ OC.L10N.register(
     "create" : "criar",
     "update" : "actualizar",
     "delete" : "apagar",
-    "Password protected" : "Protegido com palavra-passe",
+    "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...",
@@ -119,18 +119,18 @@ OC.L10N.register(
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
     "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" : "É impossível efetuar reset à password. ",
+    "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 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 password",
-    "Use the following link to reset your password: {link}" : "Use o seguinte endereço para repor a sua password: {link}",
-    "You will receive a link to reset your password via Email." : "Vai receber um endereço para repor a sua password",
+    "%s password reset" : "%s reposição da palavra-passe",
+    "Use the following link to reset your password: {link}" : "Utilize a seguinte hiperligação para repor a sua palavra-passe: {link}",
+    "You will receive a link to reset your password via Email." : "Vai receber uma hiperligação via e-mail para repor a sua palavra-passe",
     "Username" : "Nome de utilizador",
     "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?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
+    "Yes, I really want to reset my password now" : "Sim, eu tenho a certeza que pretendo redefinir agora a minha palavra-passe.",
     "Reset" : "Repor",
     "New password" : "Nova palavra-chave",
-    "New Password" : "Nova password",
+    "New Password" : "Nova palavra-passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
     "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
     "Personal" : "Pessoal",
@@ -170,13 +170,13 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
-    "Password" : "Password",
+    "Password" : "Palavra-passe",
     "Storage & database" : "Armazenamento e base de dados",
     "Data folder" : "Pasta de dados",
     "Configure the database" : "Configure a base de dados",
     "Only %s is available." : "Apenas %s está disponível.",
     "Database user" : "Utilizador da base de dados",
-    "Database password" : "Password da base de dados",
+    "Database password" : "Palavra-passe da base de dados",
     "Database name" : "Nome da base de dados",
     "Database tablespace" : "Tablespace da base de dados",
     "Database host" : "Anfitrião da base de dados",
@@ -188,7 +188,7 @@ OC.L10N.register(
     "Log out" : "Sair",
     "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
     "Please contact your administrator." : "Por favor contacte o administrador.",
-    "Forgot your password? Reset it!" : "Esqueceu-se da password? Recupere-a!",
+    "Forgot your password? Reset it!" : "Esqueceu-se da sua palavra-passe? Recupere-a!",
     "remember" : "lembrar",
     "Log in" : "Entrar",
     "Alternative Logins" : "Contas de acesso alternativas",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index f61e3c076d0..70586658f8a 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -1,17 +1,17 @@
 { "translations": {
-    "Couldn't send mail to following users: %s " : "Não conseguiu enviar correio aos seguintes utilizadores: %s",
-    "Turned on maintenance mode" : "Activado o modo de manutenção",
-    "Turned off maintenance mode" : "Desactivado o modo de manutenção",
-    "Updated database" : "Base de dados actualizada",
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar o correio para os seguintes utilizadores: %s",
+    "Turned on maintenance mode" : "Ativado o modo de manutenção",
+    "Turned off maintenance mode" : "Desativado o modo de manutenção",
+    "Updated database" : "Base de dados atualizada",
     "Checked database schema update" : "Atualização do esquema da base de dados verificada.",
     "Checked database schema update for apps" : "Atualização do esquema da base de dados verificada.",
-    "Updated \"%s\" to %s" : "Actualizado \"%s\" para %s",
+    "Updated \"%s\" to %s" : "Atualizado \"%s\" para %s",
     "Disabled incompatible apps: %s" : "Apps incompatíveis desativadas: %s",
-    "No image or file provided" : "Não foi selecionado nenhum ficheiro para importar",
-    "Unknown filetype" : "Ficheiro desconhecido",
+    "No image or file provided" : "Não foi fornecido nenhum ficheiro ou imagem",
+    "Unknown filetype" : "Tipo de ficheiro desconhecido",
     "Invalid image" : "Imagem inválida",
-    "No temporary profile picture available, try again" : "Foto temporária de perfil indisponível, tente novamente",
-    "No crop data provided" : "Sem dados de corte fornecidos",
+    "No temporary profile picture available, try again" : "Fotografia temporária do perfil indisponível, tente novamente",
+    "No crop data provided" : "Não foram fornecidos dados de recorte",
     "Sunday" : "Domingo",
     "Monday" : "Segunda",
     "Tuesday" : "Terça",
@@ -32,13 +32,13 @@
     "November" : "Novembro",
     "December" : "Dezembro",
     "Settings" : "Configurações",
-    "Saving..." : "A guardar...",
-    "Couldn't send reset email. Please contact your administrator." : "Ocorreu um problema com o envio do e-mail, por favor contactar o administrador.",
+    "Saving..." : "A guardar ...",
+    "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "I know what I'm doing" : "Tenho a certeza",
-    "Reset password" : "Repor password",
-    "Password can not be changed. Please contact your administrator." : "A password não pode ser alterada. Contacte o seu administrador.",
+    "I know what I'm doing" : "Eu sei o que Eu estou a fazer",
+    "Reset password" : "Repor palavra-passe",
+    "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.",
     "No" : "Não",
     "Yes" : "Sim",
     "Choose" : "Escolha",
@@ -56,11 +56,11 @@
     "(all selected)" : "(todos seleccionados)",
     "({count} selected)" : "({count} seleccionados)",
     "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
-    "Very weak password" : "Password muito fraca",
-    "Weak password" : "Password fraca",
-    "So-so password" : "Password aceitável",
-    "Good password" : "Password Forte",
-    "Strong password" : "Password muito forte",
+    "Very weak password" : "Palavra-passe muito fraca",
+    "Weak password" : "Palavra-passe fraca",
+    "So-so password" : "Palavra-passe aceitável",
+    "Good password" : "Palavra-passe boa",
+    "Strong password" : "Palavra-passe forte",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "O seu servidor web não está configurado correctamente para autorizar sincronização de ficheiros, pois o interface WebDAV parece estar com problemas.",
     "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." : "Este servidor ownCloud não tem uma ligação de internet a funcionar. Isto significa que algumas funcionalidades como o acesso a locais externos (dropbox, gdrive, etc), notificações sobre actualizções, ou a instalação de aplicações não irá funcionar. Sugerimos que active uma ligação à internet se pretender obter todas as funcionalidades do ownCloud.",
     "Error occurred while checking server setup" : "Ocorreu um erro durante a verificação da configuração do servidor",
@@ -76,8 +76,8 @@
     "Share with user or group …" : "Partilhar com utilizador ou grupo...",
     "Share link" : "Partilhar o link",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
-    "Password protect" : "Proteger com palavra-passe",
-    "Choose a password for the public link" : "Defina a palavra-passe para o link público",
+    "Password protect" : "Proteger com Palavra-passe",
+    "Choose a password for the public link" : "Defina a palavra-passe para a hiperligação pública",
     "Allow Public Upload" : "Permitir Envios Públicos",
     "Email link to person" : "Enviar o link por e-mail",
     "Send" : "Enviar",
@@ -95,7 +95,7 @@
     "create" : "criar",
     "update" : "actualizar",
     "delete" : "apagar",
-    "Password protected" : "Protegido com palavra-passe",
+    "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...",
@@ -117,18 +117,18 @@
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
     "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" : "É impossível efetuar reset à password. ",
+    "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 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 password",
-    "Use the following link to reset your password: {link}" : "Use o seguinte endereço para repor a sua password: {link}",
-    "You will receive a link to reset your password via Email." : "Vai receber um endereço para repor a sua password",
+    "%s password reset" : "%s reposição da palavra-passe",
+    "Use the following link to reset your password: {link}" : "Utilize a seguinte hiperligação para repor a sua palavra-passe: {link}",
+    "You will receive a link to reset your password via Email." : "Vai receber uma hiperligação via e-mail para repor a sua palavra-passe",
     "Username" : "Nome de utilizador",
     "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?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, tenho a certeza que pretendo redefinir a minha palavra-passe agora.",
+    "Yes, I really want to reset my password now" : "Sim, eu tenho a certeza que pretendo redefinir agora a minha palavra-passe.",
     "Reset" : "Repor",
     "New password" : "Nova palavra-chave",
-    "New Password" : "Nova password",
+    "New Password" : "Nova palavra-passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
     "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
     "Personal" : "Pessoal",
@@ -168,13 +168,13 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
-    "Password" : "Password",
+    "Password" : "Palavra-passe",
     "Storage & database" : "Armazenamento e base de dados",
     "Data folder" : "Pasta de dados",
     "Configure the database" : "Configure a base de dados",
     "Only %s is available." : "Apenas %s está disponível.",
     "Database user" : "Utilizador da base de dados",
-    "Database password" : "Password da base de dados",
+    "Database password" : "Palavra-passe da base de dados",
     "Database name" : "Nome da base de dados",
     "Database tablespace" : "Tablespace da base de dados",
     "Database host" : "Anfitrião da base de dados",
@@ -186,7 +186,7 @@
     "Log out" : "Sair",
     "Server side authentication failed!" : "Autenticação do lado do servidor falhou!",
     "Please contact your administrator." : "Por favor contacte o administrador.",
-    "Forgot your password? Reset it!" : "Esqueceu-se da password? Recupere-a!",
+    "Forgot your password? Reset it!" : "Esqueceu-se da sua palavra-passe? Recupere-a!",
     "remember" : "lembrar",
     "Log in" : "Entrar",
     "Alternative Logins" : "Contas de acesso alternativas",
-- 
GitLab


From 9df50c7be6ee47620af83c52ac340ac00d92042c Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 17 Nov 2014 01:54:33 -0500
Subject: [PATCH 420/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/ru.js   | 17 ++++++++++-------
 apps/files_encryption/l10n/ru.json | 17 ++++++++++-------
 apps/user_ldap/l10n/cs_CZ.js       |  2 +-
 apps/user_ldap/l10n/cs_CZ.json     |  2 +-
 core/l10n/cs_CZ.js                 | 14 +++++++-------
 core/l10n/cs_CZ.json               | 14 +++++++-------
 lib/l10n/bg_BG.js                  |  2 ++
 lib/l10n/bg_BG.json                |  2 ++
 lib/l10n/cs_CZ.js                  | 12 +++++++-----
 lib/l10n/cs_CZ.json                | 12 +++++++-----
 lib/l10n/da.js                     |  2 ++
 lib/l10n/da.json                   |  2 ++
 lib/l10n/de.js                     |  2 ++
 lib/l10n/de.json                   |  2 ++
 lib/l10n/de_DE.js                  |  2 ++
 lib/l10n/de_DE.json                |  2 ++
 lib/l10n/es.js                     |  2 ++
 lib/l10n/es.json                   |  2 ++
 lib/l10n/fi_FI.js                  |  2 ++
 lib/l10n/fi_FI.json                |  2 ++
 lib/l10n/it.js                     |  2 ++
 lib/l10n/it.json                   |  2 ++
 lib/l10n/ja.js                     |  2 ++
 lib/l10n/ja.json                   |  2 ++
 lib/l10n/nl.js                     |  2 ++
 lib/l10n/nl.json                   |  2 ++
 lib/l10n/pt_BR.js                  |  2 ++
 lib/l10n/pt_BR.json                |  2 ++
 lib/l10n/ru.js                     |  2 ++
 lib/l10n/ru.json                   |  2 ++
 lib/l10n/tr.js                     |  2 ++
 lib/l10n/tr.json                   |  2 ++
 settings/l10n/bg_BG.js             |  2 ++
 settings/l10n/bg_BG.json           |  2 ++
 settings/l10n/cs_CZ.js             |  8 ++++----
 settings/l10n/cs_CZ.json           |  8 ++++----
 settings/l10n/fr.js                |  4 ++--
 settings/l10n/fr.json              |  4 ++--
 settings/l10n/ru.js                | 10 ++++++----
 settings/l10n/ru.json              | 10 ++++++----
 40 files changed, 126 insertions(+), 60 deletions(-)

diff --git a/apps/files_encryption/l10n/ru.js b/apps/files_encryption/l10n/ru.js
index 6d4cfe371e3..965f383691f 100644
--- a/apps/files_encryption/l10n/ru.js
+++ b/apps/files_encryption/l10n/ru.js
@@ -13,11 +13,14 @@ OC.L10N.register(
     "Please repeat the new recovery password" : "Пожалуйста, повторите новый пароль для восстановления",
     "Password successfully changed." : "Пароль изменен удачно.",
     "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно старый пароль не был верен.",
-    "Private key password successfully updated." : "Пароль секретного ключа успешно обновлён.",
+    "Could not update the private key password." : "Невозможно обновить пароль для закрытого ключа.",
+    "The old password was not correct, please try again." : "Старый пароль введён неверно. Пожалуйста повторите попытку.",
+    "The current log-in password was not correct, please try again." : "Текущий пароль для учётной записи введён неверно, пожалуйста повторите попытку.",
+    "Private key password successfully updated." : "Пароль закрытого ключа успешно обновлён.",
     "File recovery settings updated" : "Настройки файла восстановления обновлены",
     "Could not update file recovery" : "Невозможно обновить файл восстановления",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.",
-    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ваш закрытый ключ недействителен! Вероятно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить закрытый ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу расшифровать файл, возможно это опубликованный файл. Пожалуйста, попросите владельца файла поделиться им  с вами еще раз.",
     "Unknown error. Please check your system settings or contact your administrator" : "Неизвестная ошибка. Пожалуйста, проверьте системные настройки или свяжитесь с администратором",
     "Missing requirements." : "Требования отсутствуют.",
@@ -38,12 +41,12 @@ OC.L10N.register(
     "New Recovery key password" : "Новый пароль для ключа восстановления",
     "Repeat New Recovery key password" : "Повторите новый пароль восстановления ключа",
     "Change Password" : "Изменить пароль",
-    "Your private key password no longer matches your log-in password." : "Пароль от Вашего закрытого ключа больше не соответствует паролю от вашей учетной записи.",
-    "Set your old private key password to your current log-in password:" : "Замените старый пароль от закрытого ключа на новый пароль входа.",
+    "Your private key password no longer matches your log-in password." : "Пароль для Вашего закрытого ключа больше не соответствует паролю вашей учетной записи.",
+    "Set your old private key password to your current log-in password:" : "Замените старый пароль для закрытого ключа на текущий пароль учётной записи.",
     " 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" : "Текущйи пароль для входа",
-    "Update Private Key Password" : "Обновить пароль от секретного ключа",
+    "Old log-in password" : "Старый пароль для учётной записи",
+    "Current log-in password" : "Текущий пароль для учётной записи",
+    "Update Private Key Password" : "Обновить пароль для закрытого ключа",
     "Enable password recovery:" : "Включить восстановление пароля:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
 },
diff --git a/apps/files_encryption/l10n/ru.json b/apps/files_encryption/l10n/ru.json
index 8de97d847cd..7548e510c43 100644
--- a/apps/files_encryption/l10n/ru.json
+++ b/apps/files_encryption/l10n/ru.json
@@ -11,11 +11,14 @@
     "Please repeat the new recovery password" : "Пожалуйста, повторите новый пароль для восстановления",
     "Password successfully changed." : "Пароль изменен удачно.",
     "Could not change the password. Maybe the old password was not correct." : "Невозможно изменить пароль. Возможно старый пароль не был верен.",
-    "Private key password successfully updated." : "Пароль секретного ключа успешно обновлён.",
+    "Could not update the private key password." : "Невозможно обновить пароль для закрытого ключа.",
+    "The old password was not correct, please try again." : "Старый пароль введён неверно. Пожалуйста повторите попытку.",
+    "The current log-in password was not correct, please try again." : "Текущий пароль для учётной записи введён неверно, пожалуйста повторите попытку.",
+    "Private key password successfully updated." : "Пароль закрытого ключа успешно обновлён.",
     "File recovery settings updated" : "Настройки файла восстановления обновлены",
     "Could not update file recovery" : "Невозможно обновить файл восстановления",
     "Encryption app not initialized! Maybe the encryption app was re-enabled during your session. Please try to log out and log back in to initialize the encryption app." : "Приложение шифрации не инициализированно! Возможно приложение шифрации было реактивировано во время вашей сессии. Пожалуйста, попробуйте выйти и войти снова чтобы проинициализировать приложение шифрации.",
-    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ваш секретный ключ не действителен! Вероятно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить секретный ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
+    "Your private key is not valid! Likely your password was changed outside of %s (e.g. your corporate directory). You can update your private key password in your personal settings to recover access to your encrypted files." : "Ваш закрытый ключ недействителен! Вероятно, ваш пароль был изменен вне %s (например, корпоративный каталог). Вы можете обновить закрытый ключ в личных настройках на странице восстановления доступа к зашифрованным файлам. ",
     "Can not decrypt this file, probably this is a shared file. Please ask the file owner to reshare the file with you." : "Не могу расшифровать файл, возможно это опубликованный файл. Пожалуйста, попросите владельца файла поделиться им  с вами еще раз.",
     "Unknown error. Please check your system settings or contact your administrator" : "Неизвестная ошибка. Пожалуйста, проверьте системные настройки или свяжитесь с администратором",
     "Missing requirements." : "Требования отсутствуют.",
@@ -36,12 +39,12 @@
     "New Recovery key password" : "Новый пароль для ключа восстановления",
     "Repeat New Recovery key password" : "Повторите новый пароль восстановления ключа",
     "Change Password" : "Изменить пароль",
-    "Your private key password no longer matches your log-in password." : "Пароль от Вашего закрытого ключа больше не соответствует паролю от вашей учетной записи.",
-    "Set your old private key password to your current log-in password:" : "Замените старый пароль от закрытого ключа на новый пароль входа.",
+    "Your private key password no longer matches your log-in password." : "Пароль для Вашего закрытого ключа больше не соответствует паролю вашей учетной записи.",
+    "Set your old private key password to your current log-in password:" : "Замените старый пароль для закрытого ключа на текущий пароль учётной записи.",
     " 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" : "Текущйи пароль для входа",
-    "Update Private Key Password" : "Обновить пароль от секретного ключа",
+    "Old log-in password" : "Старый пароль для учётной записи",
+    "Current log-in password" : "Текущий пароль для учётной записи",
+    "Update Private Key Password" : "Обновить пароль для закрытого ключа",
     "Enable password recovery:" : "Включить восстановление пароля:",
     "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Включение этой опции позволит вам получить доступ к своим зашифрованным файлам в случае утери пароля"
 },"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/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js
index 017b4f37e39..2b8142bced6 100644
--- a/apps/user_ldap/l10n/cs_CZ.js
+++ b/apps/user_ldap/l10n/cs_CZ.js
@@ -79,7 +79,7 @@ OC.L10N.register(
     "LDAP" : "LDAP",
     "Expert" : "Expertní",
     "Advanced" : "Pokročilé",
-    "<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
+    "<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím svého správce systému o zakázání jedné z nich.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval.",
     "Connection Settings" : "Nastavení spojení",
     "Configuration Active" : "Nastavení aktivní",
diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json
index b63a3fb11ff..819f4e6d534 100644
--- a/apps/user_ldap/l10n/cs_CZ.json
+++ b/apps/user_ldap/l10n/cs_CZ.json
@@ -77,7 +77,7 @@
     "LDAP" : "LDAP",
     "Expert" : "Expertní",
     "Advanced" : "Pokročilé",
-    "<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím vašeho systémového administrátora o zakázání jednoho z nich.",
+    "<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>Varování:</b> Aplikace user_ldap a user_webdavauth jsou vzájemně nekompatibilní. Můžete zaznamenat neočekávané chování. Požádejte prosím svého správce systému o zakázání jedné z nich.",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Varování:</b> není nainstalován LDAP modul pro PHP, podpůrná vrstva nebude fungovat. Požádejte, prosím, správce systému, aby jej nainstaloval.",
     "Connection Settings" : "Nastavení spojení",
     "Configuration Active" : "Nastavení aktivní",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index 1446ee93139..e858dede737 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -35,12 +35,12 @@ OC.L10N.register(
     "December" : "Prosinec",
     "Settings" : "Nastavení",
     "Saving..." : "Ukládám...",
-    "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho 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 obnovení hesla byl odeslán na vaši e-mailovou 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 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?" : "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.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého administrátora než budete pokračovat. <br />Opravdu si přejete pokračovat?",
+    "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 e-mailovou 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?",
     "I know what I'm doing" : "Vím co dělám",
     "Reset password" : "Obnovit heslo",
-    "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého administrátora.",
+    "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.",
     "No" : "Ne",
     "Yes" : "Ano",
     "Choose" : "Vybrat",
@@ -121,7 +121,7 @@ OC.L10N.register(
     "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 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 e-mailová adresa. Kontaktujte prosím svého administrátora.",
+    "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 e-mailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}",
     "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
@@ -154,7 +154,7 @@ OC.L10N.register(
     "Cheers!" : "Ať slouží!",
     "Internal Server Error" : "Vnitřní chyba serveru",
     "The server encountered an internal error and was unable to complete your request." : "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
-    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontaktujte prosím správce serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
     "More details can be found in the server log." : "Více podrobností k nalezení v serverovém logu.",
     "Technical details" : "Technické detaily",
     "Remote Address: %s" : "Vzdálená adresa: %s",
@@ -199,7 +199,7 @@ OC.L10N.register(
     "Thank you for your patience." : "Děkujeme za vaši trpělivost.",
     "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
-    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako správci, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
     "Add \"%s\" as trusted domain" : "Přidat \"%s\" jako důvěryhodnou doménu",
     "%s will be updated to version %s." : "%s bude aktualizován na verzi %s.",
     "The following apps will be disabled:" : "Následující aplikace budou zakázány:",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 94dc32af8f0..7d0b3ada708 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -33,12 +33,12 @@
     "December" : "Prosinec",
     "Settings" : "Nastavení",
     "Saving..." : "Ukládám...",
-    "Couldn't send reset email. Please contact your administrator." : "Nepodařilo se odeslat email pro změnu hesla. Kontaktujte vašeho 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 obnovení hesla byl odeslán na vaši e-mailovou 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 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?" : "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.<br />Pokud si nejste jisti co dělat, kontaktujte nejprve svého administrátora než budete pokračovat. <br />Opravdu si přejete pokračovat?",
+    "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 e-mailovou 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?",
     "I know what I'm doing" : "Vím co dělám",
     "Reset password" : "Obnovit heslo",
-    "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého administrátora.",
+    "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.",
     "No" : "Ne",
     "Yes" : "Ano",
     "Choose" : "Vybrat",
@@ -119,7 +119,7 @@
     "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 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 e-mailová adresa. Kontaktujte prosím svého administrátora.",
+    "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 e-mailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}",
     "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
@@ -152,7 +152,7 @@
     "Cheers!" : "Ať slouží!",
     "Internal Server Error" : "Vnitřní chyba serveru",
     "The server encountered an internal error and was unable to complete your request." : "Server zaznamenal interní chybu a nebyl schopen dokončit váš požadavek.",
-    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontaktujte prosím administrátora serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Kontaktujte prosím správce serveru, pokud se bude tato chyba opakovat. Připojte do svého hlášení níže zobrazené technické detaily.",
     "More details can be found in the server log." : "Více podrobností k nalezení v serverovém logu.",
     "Technical details" : "Technické detaily",
     "Remote Address: %s" : "Vzdálená adresa: %s",
@@ -197,7 +197,7 @@
     "Thank you for your patience." : "Děkujeme za vaši trpělivost.",
     "You are accessing the server from an untrusted domain." : "Přistupujete na server z nedůvěryhodné domény.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Kontaktujte prosím správce. Pokud jste správce této instalace, nastavte \"trusted_domain\" v souboru config/config.php. Příklad konfigurace najdete v souboru config/config.sample.php.",
-    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako administrátorovi, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "V závislosti na vaší konfiguraci vám může být, jako správci, umožněno použití tlačítka níže k označení této domény jako důvěryhodné.",
     "Add \"%s\" as trusted domain" : "Přidat \"%s\" jako důvěryhodnou doménu",
     "%s will be updated to version %s." : "%s bude aktualizován na verzi %s.",
     "The following apps will be disabled:" : "Následující aplikace budou zakázány:",
diff --git a/lib/l10n/bg_BG.js b/lib/l10n/bg_BG.js
index 82f0f3e51fc..a0c0dc3b8e7 100644
--- a/lib/l10n/bg_BG.js
+++ b/lib/l10n/bg_BG.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Не е зададено име на преложението",
     "Unknown filetype" : "Непознат тип файл.",
     "Invalid image" : "Невалидно изображение.",
+    "Database Error" : "Грешка в базата данни",
+    "Please contact your system administrator." : "Моля, свържи се с админстратора.",
     "web services under your control" : "уеб услуги под твой контрол",
     "App directory already exists" : "Папката на приложението вече съществува.",
     "Can't create app folder. Please fix permissions. %s" : "Неуспешно създаване на папката за приложението. Моля, оправете разрешенията. %s",
diff --git a/lib/l10n/bg_BG.json b/lib/l10n/bg_BG.json
index 62c0ea60f07..aedb28be19e 100644
--- a/lib/l10n/bg_BG.json
+++ b/lib/l10n/bg_BG.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Не е зададено име на преложението",
     "Unknown filetype" : "Непознат тип файл.",
     "Invalid image" : "Невалидно изображение.",
+    "Database Error" : "Грешка в базата данни",
+    "Please contact your system administrator." : "Моля, свържи се с админстратора.",
     "web services under your control" : "уеб услуги под твой контрол",
     "App directory already exists" : "Папката на приложението вече съществува.",
     "Can't create app folder. Please fix permissions. %s" : "Неуспешно създаване на папката за приложението. Моля, оправете разрешенията. %s",
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index 113f32d40c5..24acd5af63d 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Nebyl zadan název aplikace",
     "Unknown filetype" : "Neznámý typ souboru",
     "Invalid image" : "Chybný obrázek",
+    "Database Error" : "Chyba databáze",
+    "Please contact your system administrator." : "Kontaktujte prosím svého správce systému.",
     "web services under your control" : "webové služby pod Vaší kontrolou",
     "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",
@@ -101,16 +103,16 @@ OC.L10N.register(
     "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "To lze obvykle vyřešit <a href=\"%s\" target=\"_blank\">povolením zápisu webovému serveru do kořenového adresáře</a>.",
     "Setting locale to %s failed" : "Nastavení jazyka na %s selhalo",
     "Please install one of these locales on your system and restart your webserver." : "Prosím nainstalujte alespoň jeden z těchto jazyků do svého systému a restartujte webový server.",
-    "Please ask your server administrator to install the module." : "Požádejte svého administrátora o instalaci tohoto modulu.",
+    "Please ask your server administrator to install the module." : "Požádejte svého správce systému o instalaci tohoto modulu.",
     "PHP module %s not installed." : "PHP modul %s není nainstalován.",
     "PHP %s or higher is required." : "Je vyžadováno PHP %s nebo vyšší.",
-    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Požádejte svého administrátora o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Požádejte svého správce systému o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
     "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Je zapnut PHP Safe Mode. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
-    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím správce systému o jeho zákaz v php.ini nebo v konfiguraci webového serveru.",
     "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Je povoleno nastavení Magic Quotes. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
-    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím správce systému o jeho zákaz v php.ini nebo v konfiguraci webového serveru.",
     "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?",
-    "Please ask your server administrator to restart the web server." : "Požádejte svého administrátora o restart webového serveru.",
+    "Please ask your server administrator to restart the web server." : "Požádejte svého správce systému o restart webového serveru.",
     "PostgreSQL >= 9 required" : "Je vyžadováno PostgreSQL >= 9",
     "Please upgrade your database version" : "Aktualizujte prosím verzi své databáze",
     "Error occurred while checking PostgreSQL version" : "Při zjišťování verze PostgreSQL došlo k chybě",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index e8806f406ae..14505994239 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Nebyl zadan název aplikace",
     "Unknown filetype" : "Neznámý typ souboru",
     "Invalid image" : "Chybný obrázek",
+    "Database Error" : "Chyba databáze",
+    "Please contact your system administrator." : "Kontaktujte prosím svého správce systému.",
     "web services under your control" : "webové služby pod Vaší kontrolou",
     "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",
@@ -99,16 +101,16 @@
     "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "To lze obvykle vyřešit <a href=\"%s\" target=\"_blank\">povolením zápisu webovému serveru do kořenového adresáře</a>.",
     "Setting locale to %s failed" : "Nastavení jazyka na %s selhalo",
     "Please install one of these locales on your system and restart your webserver." : "Prosím nainstalujte alespoň jeden z těchto jazyků do svého systému a restartujte webový server.",
-    "Please ask your server administrator to install the module." : "Požádejte svého administrátora o instalaci tohoto modulu.",
+    "Please ask your server administrator to install the module." : "Požádejte svého správce systému o instalaci tohoto modulu.",
     "PHP module %s not installed." : "PHP modul %s není nainstalován.",
     "PHP %s or higher is required." : "Je vyžadováno PHP %s nebo vyšší.",
-    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Požádejte svého administrátora o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
+    "Please ask your server administrator to update PHP to the latest version. Your PHP version is no longer supported by ownCloud and the PHP community." : "Požádejte svého správce systému o aktualizaci PHP na nejnovější verzi. Vaše verze PHP již není podporována komunitami ownCloud a PHP.",
     "PHP Safe Mode is enabled. ownCloud requires that it is disabled to work properly." : "Je zapnut PHP Safe Mode. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
-    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
+    "PHP Safe Mode is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "PHP Safe Mode je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím správce systému o jeho zákaz v php.ini nebo v konfiguraci webového serveru.",
     "Magic Quotes is enabled. ownCloud requires that it is disabled to work properly." : "Je povoleno nastavení Magic Quotes. Pro správnou funkčnost ownCloud je třeba toto vypnout.",
-    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím svého administrátora o zakázání v php.ini nebo v konfiguraci webového serveru.",
+    "Magic Quotes is a deprecated and mostly useless setting that should be disabled. Please ask your server administrator to disable it in php.ini or in your webserver config." : "Magic Quotes je zastaralé a většinou zbytečné nastavení, které je třeba vypnout. Požádejte prosím správce systému o jeho zákaz v php.ini nebo v konfiguraci webového serveru.",
     "PHP modules have been installed, but they are still listed as missing?" : "PHP moduly jsou nainstalovány, ale stále se tváří jako chybějící?",
-    "Please ask your server administrator to restart the web server." : "Požádejte svého administrátora o restart webového serveru.",
+    "Please ask your server administrator to restart the web server." : "Požádejte svého správce systému o restart webového serveru.",
     "PostgreSQL >= 9 required" : "Je vyžadováno PostgreSQL >= 9",
     "Please upgrade your database version" : "Aktualizujte prosím verzi své databáze",
     "Error occurred while checking PostgreSQL version" : "Při zjišťování verze PostgreSQL došlo k chybě",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index 6c49ba9b038..af85c3e93d1 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Intet app-navn angivet",
     "Unknown filetype" : "Ukendt filtype",
     "Invalid image" : "Ugyldigt billede",
+    "Database Error" : "Databasefejl",
+    "Please contact your system administrator." : "Kontakt venligst din systemadministrator.",
     "web services under your control" : "Webtjenester under din kontrol",
     "App directory already exists" : "App-mappe findes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke oprette app-mappe. Ret tilladelser. %s",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index fe2858f182d..59ff0e87b98 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Intet app-navn angivet",
     "Unknown filetype" : "Ukendt filtype",
     "Invalid image" : "Ugyldigt billede",
+    "Database Error" : "Databasefejl",
+    "Please contact your system administrator." : "Kontakt venligst din systemadministrator.",
     "web services under your control" : "Webtjenester under din kontrol",
     "App directory already exists" : "App-mappe findes allerede",
     "Can't create app folder. Please fix permissions. %s" : "Kan ikke oprette app-mappe. Ret tilladelser. %s",
diff --git a/lib/l10n/de.js b/lib/l10n/de.js
index e512c9d1d4c..215052da7f9 100644
--- a/lib/l10n/de.js
+++ b/lib/l10n/de.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Es wurde kein Applikation-Name angegeben",
     "Unknown filetype" : "Unbekannter Dateityp",
     "Invalid image" : "Ungültiges Bild",
+    "Database Error" : "Datenbankfehler",
+    "Please contact your system administrator." : "Bitte kontaktiere Deinen Systemadministrator.",
     "web services under your control" : "Web-Services unter Deiner Kontrolle",
     "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",
diff --git a/lib/l10n/de.json b/lib/l10n/de.json
index 27dd6781ae7..086fc888986 100644
--- a/lib/l10n/de.json
+++ b/lib/l10n/de.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Es wurde kein Applikation-Name angegeben",
     "Unknown filetype" : "Unbekannter Dateityp",
     "Invalid image" : "Ungültiges Bild",
+    "Database Error" : "Datenbankfehler",
+    "Please contact your system administrator." : "Bitte kontaktiere Deinen Systemadministrator.",
     "web services under your control" : "Web-Services unter Deiner Kontrolle",
     "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",
diff --git a/lib/l10n/de_DE.js b/lib/l10n/de_DE.js
index 48f236f3e04..6d99b090604 100644
--- a/lib/l10n/de_DE.js
+++ b/lib/l10n/de_DE.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Es wurde kein Applikation-Name angegeben",
     "Unknown filetype" : "Unbekannter Dateityp",
     "Invalid image" : "Ungültiges Bild",
+    "Database Error" : "Datenbankfehler",
+    "Please contact your system administrator." : "Bitte kontaktieren Sie Ihren Systemadministrator.",
     "web services under your control" : "Web-Services unter Ihrer Kontrolle",
     "App directory already exists" : "Der Ordner für die Anwendung ist bereits vorhanden.",
     "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s",
diff --git a/lib/l10n/de_DE.json b/lib/l10n/de_DE.json
index e67d2ccc57c..fd16f063b78 100644
--- a/lib/l10n/de_DE.json
+++ b/lib/l10n/de_DE.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Es wurde kein Applikation-Name angegeben",
     "Unknown filetype" : "Unbekannter Dateityp",
     "Invalid image" : "Ungültiges Bild",
+    "Database Error" : "Datenbankfehler",
+    "Please contact your system administrator." : "Bitte kontaktieren Sie Ihren Systemadministrator.",
     "web services under your control" : "Web-Services unter Ihrer Kontrolle",
     "App directory already exists" : "Der Ordner für die Anwendung ist bereits vorhanden.",
     "Can't create app folder. Please fix permissions. %s" : "Der Ordner für die Anwendung konnte nicht angelegt werden. Bitte überprüfen Sie die Ordner- und Dateirechte und passen Sie diese entsprechend an. %s",
diff --git a/lib/l10n/es.js b/lib/l10n/es.js
index 76a44a4bed7..9cdd328e974 100644
--- a/lib/l10n/es.js
+++ b/lib/l10n/es.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "No se ha especificado nombre de la aplicación",
     "Unknown filetype" : "Tipo de archivo desconocido",
     "Invalid image" : "Imagen inválida",
+    "Database Error" : "Error en la base de datos",
+    "Please contact your system administrator." : "Por favor contacte al administrador del sistema.",
     "web services under your control" : "Servicios web bajo su control",
     "App directory already exists" : "El directorio de la aplicación ya existe",
     "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
diff --git a/lib/l10n/es.json b/lib/l10n/es.json
index a6bee7f24db..c14b03c15df 100644
--- a/lib/l10n/es.json
+++ b/lib/l10n/es.json
@@ -15,6 +15,8 @@
     "No app name specified" : "No se ha especificado nombre de la aplicación",
     "Unknown filetype" : "Tipo de archivo desconocido",
     "Invalid image" : "Imagen inválida",
+    "Database Error" : "Error en la base de datos",
+    "Please contact your system administrator." : "Por favor contacte al administrador del sistema.",
     "web services under your control" : "Servicios web bajo su control",
     "App directory already exists" : "El directorio de la aplicación ya existe",
     "Can't create app folder. Please fix permissions. %s" : "No se puede crear la carpeta de la aplicación. Corrija los permisos. %s",
diff --git a/lib/l10n/fi_FI.js b/lib/l10n/fi_FI.js
index f387090da60..1097dd20850 100644
--- a/lib/l10n/fi_FI.js
+++ b/lib/l10n/fi_FI.js
@@ -16,6 +16,8 @@ OC.L10N.register(
     "No app name specified" : "Sovelluksen nimeä ei määritelty",
     "Unknown filetype" : "Tuntematon tiedostotyyppi",
     "Invalid image" : "Virheellinen kuva",
+    "Database Error" : "Tietokantavirhe",
+    "Please contact your system administrator." : "Ole yhteydessä järjestelmän ylläpitäjään.",
     "web services under your control" : "verkkopalvelut hallinnassasi",
     "App directory already exists" : "Sovelluskansio on jo olemassa",
     "Can't create app folder. Please fix permissions. %s" : "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
diff --git a/lib/l10n/fi_FI.json b/lib/l10n/fi_FI.json
index 7c26af25f66..2bd73df0379 100644
--- a/lib/l10n/fi_FI.json
+++ b/lib/l10n/fi_FI.json
@@ -14,6 +14,8 @@
     "No app name specified" : "Sovelluksen nimeä ei määritelty",
     "Unknown filetype" : "Tuntematon tiedostotyyppi",
     "Invalid image" : "Virheellinen kuva",
+    "Database Error" : "Tietokantavirhe",
+    "Please contact your system administrator." : "Ole yhteydessä järjestelmän ylläpitäjään.",
     "web services under your control" : "verkkopalvelut hallinnassasi",
     "App directory already exists" : "Sovelluskansio on jo olemassa",
     "Can't create app folder. Please fix permissions. %s" : "Sovelluskansion luominen ei onnistu. Korjaa käyttöoikeudet. %s",
diff --git a/lib/l10n/it.js b/lib/l10n/it.js
index 2874653823b..eb25f2fc086 100644
--- a/lib/l10n/it.js
+++ b/lib/l10n/it.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Il nome dell'applicazione non è specificato",
     "Unknown filetype" : "Tipo di file sconosciuto",
     "Invalid image" : "Immagine non valida",
+    "Database Error" : "Errore del database",
+    "Please contact your system administrator." : "Contatta il tuo amministratore di sistema.",
     "web services under your control" : "servizi web nelle tue mani",
     "App directory already exists" : "La cartella dell'applicazione esiste già",
     "Can't create app folder. Please fix permissions. %s" : "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
diff --git a/lib/l10n/it.json b/lib/l10n/it.json
index ca5beb1b802..ef4ae9ab370 100644
--- a/lib/l10n/it.json
+++ b/lib/l10n/it.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Il nome dell'applicazione non è specificato",
     "Unknown filetype" : "Tipo di file sconosciuto",
     "Invalid image" : "Immagine non valida",
+    "Database Error" : "Errore del database",
+    "Please contact your system administrator." : "Contatta il tuo amministratore di sistema.",
     "web services under your control" : "servizi web nelle tue mani",
     "App directory already exists" : "La cartella dell'applicazione esiste già",
     "Can't create app folder. Please fix permissions. %s" : "Impossibile creare la cartella dell'applicazione. Correggi i permessi. %s",
diff --git a/lib/l10n/ja.js b/lib/l10n/ja.js
index 38aa3de36d6..e6b0b3240f1 100644
--- a/lib/l10n/ja.js
+++ b/lib/l10n/ja.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "アプリ名が未指定",
     "Unknown filetype" : "不明なファイルタイプ",
     "Invalid image" : "無効な画像",
+    "Database Error" : "データベースエラー",
+    "Please contact your system administrator." : "システム管理者に問い合わせてください。",
     "web services under your control" : "あなたの管理下のウェブサービス",
     "App directory already exists" : "アプリディレクトリはすでに存在します",
     "Can't create app folder. Please fix permissions. %s" : "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
diff --git a/lib/l10n/ja.json b/lib/l10n/ja.json
index 8a0db934683..722f5235c6f 100644
--- a/lib/l10n/ja.json
+++ b/lib/l10n/ja.json
@@ -15,6 +15,8 @@
     "No app name specified" : "アプリ名が未指定",
     "Unknown filetype" : "不明なファイルタイプ",
     "Invalid image" : "無効な画像",
+    "Database Error" : "データベースエラー",
+    "Please contact your system administrator." : "システム管理者に問い合わせてください。",
     "web services under your control" : "あなたの管理下のウェブサービス",
     "App directory already exists" : "アプリディレクトリはすでに存在します",
     "Can't create app folder. Please fix permissions. %s" : "アプリフォルダーを作成できませんでした。%s のパーミッションを修正してください。",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index e8b560b730f..1a5b51de2b5 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Geen app naam opgegeven.",
     "Unknown filetype" : "Onbekend bestandsformaat",
     "Invalid image" : "Ongeldige afbeelding",
+    "Database Error" : "Database fout",
+    "Please contact your system administrator." : "Neem contact op met uw systeembeheerder.",
     "web services under your control" : "Webdiensten in eigen beheer",
     "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",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 887ad23b35d..432915aa2f2 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Geen app naam opgegeven.",
     "Unknown filetype" : "Onbekend bestandsformaat",
     "Invalid image" : "Ongeldige afbeelding",
+    "Database Error" : "Database fout",
+    "Please contact your system administrator." : "Neem contact op met uw systeembeheerder.",
     "web services under your control" : "Webdiensten in eigen beheer",
     "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",
diff --git a/lib/l10n/pt_BR.js b/lib/l10n/pt_BR.js
index 8537b31d543..370bff17480 100644
--- a/lib/l10n/pt_BR.js
+++ b/lib/l10n/pt_BR.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "O nome do aplicativo não foi especificado.",
     "Unknown filetype" : "Tipo de arquivo desconhecido",
     "Invalid image" : "Imagem inválida",
+    "Database Error" : "Erro no Banco de Dados",
+    "Please contact your system administrator." : "Por favor cotactar seu administrador do sistema.",
     "web services under your control" : "serviços web sob seu controle",
     "App directory already exists" : "Diretório App  já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não é possível criar pasta app. Corrija as permissões. %s",
diff --git a/lib/l10n/pt_BR.json b/lib/l10n/pt_BR.json
index a9e272afc18..465d0d2bf29 100644
--- a/lib/l10n/pt_BR.json
+++ b/lib/l10n/pt_BR.json
@@ -15,6 +15,8 @@
     "No app name specified" : "O nome do aplicativo não foi especificado.",
     "Unknown filetype" : "Tipo de arquivo desconhecido",
     "Invalid image" : "Imagem inválida",
+    "Database Error" : "Erro no Banco de Dados",
+    "Please contact your system administrator." : "Por favor cotactar seu administrador do sistema.",
     "web services under your control" : "serviços web sob seu controle",
     "App directory already exists" : "Diretório App  já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não é possível criar pasta app. Corrija as permissões. %s",
diff --git a/lib/l10n/ru.js b/lib/l10n/ru.js
index 20ed5013853..490a3f6a1e2 100644
--- a/lib/l10n/ru.js
+++ b/lib/l10n/ru.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Не указано имя приложения",
     "Unknown filetype" : "Неизвестный тип файла",
     "Invalid image" : "Изображение повреждено",
+    "Database Error" : "Ошибка базы данных",
+    "Please contact your system administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
     "web services under your control" : "веб-сервисы под вашим управлением",
     "App directory already exists" : "Папка приложения уже существует",
     "Can't create app folder. Please fix permissions. %s" : "Не удалось создать директорию. Исправьте права доступа. %s",
diff --git a/lib/l10n/ru.json b/lib/l10n/ru.json
index a8636cf4c35..103121a374a 100644
--- a/lib/l10n/ru.json
+++ b/lib/l10n/ru.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Не указано имя приложения",
     "Unknown filetype" : "Неизвестный тип файла",
     "Invalid image" : "Изображение повреждено",
+    "Database Error" : "Ошибка базы данных",
+    "Please contact your system administrator." : "Пожалуйста, свяжитесь с вашим администратором.",
     "web services under your control" : "веб-сервисы под вашим управлением",
     "App directory already exists" : "Папка приложения уже существует",
     "Can't create app folder. Please fix permissions. %s" : "Не удалось создать директорию. Исправьте права доступа. %s",
diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js
index 0f6a40a7ef2..17a97c31e8a 100644
--- a/lib/l10n/tr.js
+++ b/lib/l10n/tr.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Uygulama adı belirtilmedi",
     "Unknown filetype" : "Bilinmeyen dosya türü",
     "Invalid image" : "Geçersiz resim",
+    "Database Error" : "Veritabanı Hatası",
+    "Please contact your system administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "web services under your control" : "denetiminizdeki web hizmetleri",
     "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",
diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json
index 52bad09e9cf..b6023ba4e08 100644
--- a/lib/l10n/tr.json
+++ b/lib/l10n/tr.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Uygulama adı belirtilmedi",
     "Unknown filetype" : "Bilinmeyen dosya türü",
     "Invalid image" : "Geçersiz resim",
+    "Database Error" : "Veritabanı Hatası",
+    "Please contact your system administrator." : "Lütfen sistem yöneticiniz ile iletişime geçin.",
     "web services under your control" : "denetiminizdeki web hizmetleri",
     "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",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index a7040874a96..374f4e418ad 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -144,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
     "Enforce HTTPS" : "Изисквай HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Задължава клиента да се свързва с %s през криптирана връзка.",
+    "Enforce HTTPS for subdomains" : "Изисквай HTTPS за под домейни",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Задължава клиента да се свързва с %s и негови под домейни през криптирана връзка.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Моля свържи се с твоя %s през HTTPS, за да включиш или изключиш SSL задължаването.",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index cbc1d1352b9..60228bd7617 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -142,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Тези групи ще могат да получават споделения, но няма да могат самите те да споделят.",
     "Enforce HTTPS" : "Изисквай HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Задължава клиента да се свързва с %s през криптирана връзка.",
+    "Enforce HTTPS for subdomains" : "Изисквай HTTPS за под домейни",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Задължава клиента да се свързва с %s и негови под домейни през криптирана връзка.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Моля свържи се с твоя %s през HTTPS, за да включиш или изключиш SSL задължаването.",
     "This is used for sending out notifications." : "Това се използва за изпращане на уведомления.",
     "Send mode" : "Режим на изпращане",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index c41c1c22555..740c0e9442b 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -13,17 +13,17 @@ OC.L10N.register(
     "Group already exists" : "Skupina již existuje",
     "Unable to add group" : "Nelze přidat skupinu",
     "Files decrypted successfully" : "Soubory úspěšně dešifrovány",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého správce systému",
     "Couldn't decrypt your files, check your password and try again" : "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
     "Encryption keys deleted permanently" : "Šifrovací klíče trvale smazány",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého správce systému",
     "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
     "Email saved" : "E-mail uložen",
     "Invalid email" : "Neplatný e-mail",
     "Unable to delete group" : "Nelze smazat skupinu",
     "Unable to delete user" : "Nelze smazat uživatele",
     "Backups restored successfully" : "Zálohy úspěšně obnoveny",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého správce systému",
     "Language changed" : "Jazyk byl změněn",
     "Invalid request" : "Neplatný požadavek",
     "Admins can't remove themself from the admin group" : "Správci se nemohou odebrat sami ze skupiny správců",
@@ -231,7 +231,7 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
     "Unlimited" : "Neomezeně",
     "Other" : "Jiný",
-    "Group Admin for" : "Administrátor skupiny ",
+    "Group Admin for" : "Správce skupiny ",
     "Quota" : "Kvóta",
     "Storage Location" : "Umístění úložiště",
     "Last Login" : "Poslední přihlášení",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 70d6c3f8eae..533de97044e 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -11,17 +11,17 @@
     "Group already exists" : "Skupina již existuje",
     "Unable to add group" : "Nelze přidat skupinu",
     "Files decrypted successfully" : "Soubory úspěšně dešifrovány",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nebylo možno dešifrovat soubory, zkontroluje prosím owncloud.log nebo kontaktujte svého správce systému",
     "Couldn't decrypt your files, check your password and try again" : "Nebylo možno dešifrovat soubory, zkontrolujte své heslo a zkuste znovu",
     "Encryption keys deleted permanently" : "Šifrovací klíče trvale smazány",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno trvale smazat vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého správce systému",
     "Couldn't remove app." : "Nepodařilo se odebrat aplikaci.",
     "Email saved" : "E-mail uložen",
     "Invalid email" : "Neplatný e-mail",
     "Unable to delete group" : "Nelze smazat skupinu",
     "Unable to delete user" : "Nelze smazat uživatele",
     "Backups restored successfully" : "Zálohy úspěšně obnoveny",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého administrátora",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nebylo možno obnovit vaše šifrovací klíče, zkontrolujte prosím owncloud.log nebo kontaktujte svého správce systému",
     "Language changed" : "Jazyk byl změněn",
     "Invalid request" : "Neplatný požadavek",
     "Admins can't remove themself from the admin group" : "Správci se nemohou odebrat sami ze skupiny správců",
@@ -229,7 +229,7 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Zvolte prosím kvótu pro úložiště (např. \"512 MB\" nebo \"12 GB\")",
     "Unlimited" : "Neomezeně",
     "Other" : "Jiný",
-    "Group Admin for" : "Administrátor skupiny ",
+    "Group Admin for" : "Správce skupiny ",
     "Quota" : "Kvóta",
     "Storage Location" : "Umístění úložiště",
     "Last Login" : "Poslední přihlášení",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 8fb3b2270a1..5485f9a94f8 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -123,8 +123,8 @@ OC.L10N.register(
     "Connectivity Checks" : "Vérification de la connectivité",
     "No problems found" : "Aucun problème trouvé",
     "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
-    "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
-    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
+    "Last cron was executed at %s." : "Le dernier cron s'est exécuté à la date suivante : %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à la date suivante : %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
     "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http.",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 2ee4d13454f..22b2a86f154 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -121,8 +121,8 @@
     "Connectivity Checks" : "Vérification de la connectivité",
     "No problems found" : "Aucun problème trouvé",
     "Please double check the <a href='%s'>installation guides</a>." : "Veuillez vous référer au <a href='%s'>guide d'installation</a>.",
-    "Last cron was executed at %s." : "Le dernier cron s'est exécuté à %s.",
-    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
+    "Last cron was executed at %s." : "Le dernier cron s'est exécuté à la date suivante : %s.",
+    "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Le dernier cron s'est exécuté à la date suivante : %s. Cela fait plus d'une heure, quelque chose a du mal se passer.",
     "Cron was not executed yet!" : "Le cron n'a pas encore été exécuté !",
     "Execute one task with each page loaded" : "Exécute une tâche à chaque chargement de page",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php est enregistré en tant que service webcron pour appeler cron.php toutes les 15 minutes via http.",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index e776aeb220d..013831e6823 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -144,9 +144,11 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
     "Enforce HTTPS" : "HTTPS соединение обязательно",
     "Forces the clients to connect to %s via an encrypted connection." : "Принудить клиентов подключаться к %s через шифрованное соединение.",
+    "Enforce HTTPS for subdomains" : "HTTPS соединение обязательно для субдоменов",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Принудить клиентов подключаться к %s и субдоменам через шифрованное соединение.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить обязательные SSL подключения.",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
-    "Send mode" : "Отправить сообщение",
+    "Send mode" : "Способ отправки",
     "From address" : "Адрес отправителя",
     "mail" : "почта",
     "Authentication method" : "Метод проверки подлинности",
@@ -156,9 +158,9 @@ OC.L10N.register(
     "Credentials" : "Учётные данные",
     "SMTP Username" : "Пользователь SMTP",
     "SMTP Password" : "Пароль SMTP",
-    "Store credentials" : "Хранить учётные данные",
+    "Store credentials" : "Сохранить учётные данные",
     "Test email settings" : "Проверить настройки почты",
-    "Send email" : "Отправить сообщение",
+    "Send email" : "Отправить email",
     "Log level" : "Уровень детализации журнала",
     "More" : "Больше",
     "Less" : "Меньше",
@@ -166,7 +168,7 @@ OC.L10N.register(
     "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>." : "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Ещё приложения",
     "Add your app" : "Добавить своё приложение",
-    "by" : ":",
+    "by" : "автор",
     "licensed" : "Лицензировано",
     "Documentation:" : "Документация:",
     "User Documentation" : "Пользовательская документация",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 44661eed3e2..7ecf1ed26d5 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -142,9 +142,11 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Эти группы смогут получать общие файлы, но не смогут отправлять их.",
     "Enforce HTTPS" : "HTTPS соединение обязательно",
     "Forces the clients to connect to %s via an encrypted connection." : "Принудить клиентов подключаться к %s через шифрованное соединение.",
+    "Enforce HTTPS for subdomains" : "HTTPS соединение обязательно для субдоменов",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Принудить клиентов подключаться к %s и субдоменам через шифрованное соединение.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Пожалуйста, подключитесь к %s используя HTTPS чтобы включить или отключить обязательные SSL подключения.",
     "This is used for sending out notifications." : "Используется для отправки уведомлений.",
-    "Send mode" : "Отправить сообщение",
+    "Send mode" : "Способ отправки",
     "From address" : "Адрес отправителя",
     "mail" : "почта",
     "Authentication method" : "Метод проверки подлинности",
@@ -154,9 +156,9 @@
     "Credentials" : "Учётные данные",
     "SMTP Username" : "Пользователь SMTP",
     "SMTP Password" : "Пароль SMTP",
-    "Store credentials" : "Хранить учётные данные",
+    "Store credentials" : "Сохранить учётные данные",
     "Test email settings" : "Проверить настройки почты",
-    "Send email" : "Отправить сообщение",
+    "Send email" : "Отправить email",
     "Log level" : "Уровень детализации журнала",
     "More" : "Больше",
     "Less" : "Меньше",
@@ -164,7 +166,7 @@
     "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>." : "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Ещё приложения",
     "Add your app" : "Добавить своё приложение",
-    "by" : ":",
+    "by" : "автор",
     "licensed" : "Лицензировано",
     "Documentation:" : "Документация:",
     "User Documentation" : "Пользовательская документация",
-- 
GitLab


From a3a064fe967865fe2df37944ecb3447cf91bfb7a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Nov 2014 11:01:43 +0100
Subject: [PATCH 421/616] Skip some more tests on Windows which just can not
 work at all

---
 apps/files_encryption/tests/stream.php |  7 +++++++
 apps/files_sharing/tests/cache.php     | 18 +++++++++++++++---
 tests/lib/archive/tar.php              |  2 +-
 tests/lib/files/storage/local.php      |  4 ++--
 tests/lib/files/view.php               |  2 +-
 tests/lib/helper.php                   |  4 ++++
 tests/lib/image.php                    | 10 +++++++---
 7 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 2b57f11c680..c3f777df859 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -134,6 +134,13 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 
 		$handle = $view->fopen($filename, 'r');
 
+
+		if (\OC_Util::runningOnWindows()) {
+			fclose($handle);
+			$view->unlink($filename);
+			$this->markTestSkipped('[Windows] stream_set_blocking() does not work as expected on Windows.');
+		}
+
 		// set stream options
 		$this->assertTrue(stream_set_blocking($handle, 1));
 
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 2c9790ce66d..0e96f5a4e09 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -30,6 +30,18 @@ class Test_Files_Sharing_Cache extends TestCase {
 	 */
 	public $user2View;
 
+	/** @var \OC\Files\Cache\Cache */
+	protected $ownerCache;
+
+	/** @var \OC\Files\Cache\Cache */
+	protected $sharedCache;
+
+	/** @var \OC\Files\Storage\Storage */
+	protected $ownerStorage;
+
+	/** @var \OC\Files\Storage\Storage */
+	protected $sharedStorage;
+
 	function setUp() {
 		parent::setUp();
 
@@ -54,7 +66,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 		$this->view->file_put_contents('container/shareddir/subdir/another too.txt', $textData);
 		$this->view->file_put_contents('container/shareddir/subdir/not a text file.xml', '<xml></xml>');
 
-		list($this->ownerStorage, $internalPath) = $this->view->resolvePath('');
+		list($this->ownerStorage,) = $this->view->resolvePath('');
 		$this->ownerCache = $this->ownerStorage->getCache();
 		$this->ownerStorage->getScanner()->scan('');
 
@@ -72,7 +84,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 
 		// retrieve the shared storage
 		$secondView = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER2);
-		list($this->sharedStorage, $internalPath) = $secondView->resolvePath('files/shareddir');
+		list($this->sharedStorage,) = $secondView->resolvePath('files/shareddir');
 		$this->sharedCache = $this->sharedStorage->getCache();
 	}
 
@@ -354,7 +366,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 		\OC\Files\Filesystem::mkdir('foo');
 		\OC\Files\Filesystem::mkdir('foo/bar');
-		\OC\Files\Filesystem::touch('foo/bar/test.txt', 'bar');
+		\OC\Files\Filesystem::touch('foo/bar/test.txt');
 		$folderInfo = \OC\Files\Filesystem::getFileInfo('foo');
 		$fileInfo = \OC\Files\Filesystem::getFileInfo('foo/bar/test.txt');
 		\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index 5b9089b32e1..99f7fb30e2b 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -9,7 +9,7 @@
 class Test_Archive_TAR extends Test_Archive {
 	public function setUp() {
 		if (OC_Util::runningOnWindows()) {
-			$this->markTestSkipped('tar archives are not supported on windows');
+			$this->markTestSkipped('[Windows] tar archives are not supported on Windows');
 		}
 		parent::setUp();
 	}
diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php
index 37462941d0c..490086c62f2 100644
--- a/tests/lib/files/storage/local.php
+++ b/tests/lib/files/storage/local.php
@@ -39,7 +39,7 @@ class Local extends Storage {
 
 	public function testStableEtag() {
 		if (\OC_Util::runningOnWindows()) {
-			$this->markTestSkipped('On Windows platform we have no stable etag generation - yet');
+			$this->markTestSkipped('[Windows] On Windows platform we have no stable etag generation - yet');
 		}
 
 		$this->instance->file_put_contents('test.txt', 'foobar');
@@ -50,7 +50,7 @@ class Local extends Storage {
 
 	public function testEtagChange() {
 		if (\OC_Util::runningOnWindows()) {
-			$this->markTestSkipped('On Windows platform we have no stable etag generation - yet');
+			$this->markTestSkipped('[Windows] On Windows platform we have no stable etag generation - yet');
 		}
 
 		$this->instance->file_put_contents('test.txt', 'foo');
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 5f030f29fa7..931f5acd95a 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -598,7 +598,7 @@ class View extends \PHPUnit_Framework_TestCase {
 		$folderName = 'abcdefghijklmnopqrstuvwxyz012345678901234567890123456789';
 		$tmpdirLength = strlen(\OC_Helper::tmpFolder());
 		if (\OC_Util::runningOnWindows()) {
-			$this->markTestSkipped();
+			$this->markTestSkipped('[Windows] ');
 			$depth = ((260 - $tmpdirLength) / 57);
 		}elseif(\OC_Util::runningOnMac()){
 			$depth = ((1024 - $tmpdirLength) / 57);
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 520a3e0e669..57c72c11987 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -115,6 +115,10 @@ class Test_Helper extends PHPUnit_Framework_TestCase {
 	}
 
 	function testGetStringMimeType() {
+		if (\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('[Windows] Strings have mimetype application/octet-stream on Windows');
+		}
+
 		$result = OC_Helper::getStringMimeType("/data/data.tar.gz");
 		$expected = 'text/plain; charset=us-ascii';
 		$this->assertEquals($result, $expected);
diff --git a/tests/lib/image.php b/tests/lib/image.php
index 795bc464159..a683c3d2c8b 100644
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -62,14 +62,18 @@ class Test_Image extends PHPUnit_Framework_TestCase {
 		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
 		$this->assertEquals('image/png', $img->mimeType());
 
+		$img = new \OC_Image(null);
+		$this->assertEquals('', $img->mimeType());
+
+		if (\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('[Windows] Images created with imagecreate() are pngs on windows');
+		}
+
 		$img = new \OC_Image(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.jpg'));
 		$this->assertEquals('image/jpeg', $img->mimeType());
 
 		$img = new \OC_Image(base64_encode(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.gif')));
 		$this->assertEquals('image/gif', $img->mimeType());
-
-		$img = new \OC_Image(null);
-		$this->assertEquals('', $img->mimeType());
 	}
 
 	public function testWidth() {
-- 
GitLab


From b228226700965c696f6fc7196ef7f8f067885958 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 6 Nov 2014 16:53:35 +0100
Subject: [PATCH 422/616] Fix single run of encryption tests and usages of
 uniqid() and fopen()

---
 apps/files_encryption/lib/stream.php       |   1 +
 apps/files_encryption/tests/crypt.php      |  93 ++++++++-------
 apps/files_encryption/tests/helper.php     |  43 ++++---
 apps/files_encryption/tests/hooks.php      |  46 ++++----
 apps/files_encryption/tests/keymanager.php |  19 +--
 apps/files_encryption/tests/proxy.php      |  16 ++-
 apps/files_encryption/tests/share.php      | 122 ++++++++++---------
 apps/files_encryption/tests/stream.php     |  34 ++++--
 apps/files_encryption/tests/testcase.php   |  53 +++++++++
 apps/files_encryption/tests/trashbin.php   | 131 +++++++++++----------
 apps/files_encryption/tests/util.php       |  55 +++++----
 apps/files_encryption/tests/webdav.php     |  22 ++--
 12 files changed, 376 insertions(+), 259 deletions(-)
 create mode 100644 apps/files_encryption/tests/testcase.php

diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index f74812a7253..8aa1daaa797 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -573,6 +573,7 @@ class Stream {
 				\OC_FileProxy::$enabled = false;
 
 				if ($this->rootView->file_exists($this->rawPath) && $this->size === 0) {
+					fclose($this->handle);
 					$this->rootView->unlink($this->rawPath);
 				}
 
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 1b8291fea28..7369be8ff05 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -12,7 +12,7 @@ use OCA\Encryption;
 /**
  * Class Test_Encryption_Crypt
  */
-class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Crypt extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_CRYPT_USER1 = "test-crypt-user1";
 
@@ -31,6 +31,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	public $genPublicKey;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -46,12 +48,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1, true);
+		self::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1, true);
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		// set user id
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
+		self::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
 		$this->userId = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
 		$this->pass = \Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1;
 
@@ -77,7 +81,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		\OC_App::disable('files_trashbin');
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
@@ -87,6 +91,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 		$this->assertTrue(\OC_FileProxy::$enabled);
 		\OCP\Config::deleteSystemValue('cipher');
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
@@ -100,12 +106,14 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	/**
 	 * @medium
 	 */
-	function testGenerateKey() {
+	public function testGenerateKey() {
 
 		# TODO: use more accurate (larger) string length for test confirmation
 
@@ -115,7 +123,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 	}
 
-	function testDecryptPrivateKey() {
+	public function testDecryptPrivateKey() {
 
 		// test successful decrypt
 		$crypted = Encryption\Crypt::symmetricEncryptFileContent($this->genPrivateKey, 'hat');
@@ -137,7 +145,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testSymmetricEncryptFileContent() {
+	public function testSymmetricEncryptFileContent() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
 
@@ -155,7 +163,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testSymmetricEncryptFileContentAes128() {
+	public function testSymmetricEncryptFileContentAes128() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
 
@@ -173,9 +181,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testSymmetricStreamEncryptShortFileContent() {
+	public function testSymmetricStreamEncryptShortFileContent() {
 
-		$filename = 'tmp-' . uniqid() . '.test';
+		$filename = 'tmp-' . $this->getUniqueID() . '.test';
 
 		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/'. $filename, $this->dataShort);
 
@@ -210,9 +218,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testSymmetricStreamEncryptShortFileContentAes128() {
+	public function testSymmetricStreamEncryptShortFileContentAes128() {
 
-		$filename = 'tmp-' . uniqid() . '.test';
+		$filename = 'tmp-' . $this->getUniqueID() . '.test';
 
 		\OCP\Config::setSystemValue('cipher', 'AES-128-CFB');
 
@@ -255,10 +263,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
 	 * reassembly of its data
 	 */
-	function testSymmetricStreamEncryptLongFileContent() {
+	public function testSymmetricStreamEncryptLongFileContent() {
 
 		// Generate a a random filename
-		$filename = 'tmp-' . uniqid() . '.test';
+		$filename = 'tmp-' . $this->getUniqueID() . '.test';
 
 		// Save long data as encrypted file using stream wrapper
 		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong . $this->dataLong);
@@ -299,10 +307,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
 	 * reassembly of its data
 	 */
-	function testSymmetricStreamEncryptLongFileContentAes128() {
+	public function testSymmetricStreamEncryptLongFileContentAes128() {
 
 		// Generate a a random filename
-		$filename = 'tmp-' . uniqid() . '.test';
+		$filename = 'tmp-' . $this->getUniqueID() . '.test';
 
 		\OCP\Config::setSystemValue('cipher', 'AES-128-CFB');
 
@@ -347,10 +355,10 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	 * @note If this test fails with truncate content, check that enough array slices are being rejoined to form $e, as the crypt.php file may have gotten longer and broken the manual
 	 * reassembly of its data
 	 */
-	function testStreamDecryptLongFileContentWithoutHeader() {
+	public function testStreamDecryptLongFileContentWithoutHeader() {
 
 		// Generate a a random filename
-		$filename = 'tmp-' . uniqid() . '.test';
+		$filename = 'tmp-' . $this->getUniqueID() . '.test';
 
 		\OCP\Config::setSystemValue('cipher', 'AES-128-CFB');
 
@@ -395,7 +403,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testIsEncryptedContent() {
+	public function testIsEncryptedContent() {
 
 		$this->assertFalse(Encryption\Crypt::isCatfileContent($this->dataUrl));
 
@@ -410,7 +418,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @large
 	 */
-	function testMultiKeyEncrypt() {
+	public function testMultiKeyEncrypt() {
 
 		# TODO: search in keyfile for actual content as IV will ensure this test always passes
 
@@ -437,9 +445,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testRenameFile() {
+	public function testRenameFile() {
 
-		$filename = 'tmp-' . uniqid();
+		$filename = 'tmp-' . $this->getUniqueID();
 
 		// Save long data as encrypted file using stream wrapper
 		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
@@ -452,7 +460,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 		$this->assertEquals($this->dataLong, $decrypt);
 
-		$newFilename = 'tmp-new-' . uniqid();
+		$newFilename = 'tmp-new-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 		$view->rename($filename, $newFilename);
 
@@ -468,9 +476,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testMoveFileIntoFolder() {
+	public function testMoveFileIntoFolder() {
 
-		$filename = 'tmp-' . uniqid();
+		$filename = 'tmp-' . $this->getUniqueID();
 
 		// Save long data as encrypted file using stream wrapper
 		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
@@ -483,8 +491,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 		$this->assertEquals($this->dataLong, $decrypt);
 
-		$newFolder = '/newfolder' . uniqid();
-		$newFilename = 'tmp-new-' . uniqid();
+		$newFolder = '/newfolder' . $this->getUniqueID();
+		$newFilename = 'tmp-new-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 		$view->mkdir($newFolder);
 		$view->rename($filename, $newFolder . '/' . $newFilename);
@@ -501,12 +509,12 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testMoveFolder() {
+	public function testMoveFolder() {
 
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
-		$filename = '/tmp-' . uniqid();
-		$folder = '/folder' . uniqid();
+		$filename = '/tmp-' . $this->getUniqueID();
+		$folder = '/folder' . $this->getUniqueID();
 
 		$view->mkdir($folder);
 
@@ -521,7 +529,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 
 		$this->assertEquals($this->dataLong, $decrypt);
 
-		$newFolder = '/newfolder/subfolder' . uniqid();
+		$newFolder = '/newfolder/subfolder' . $this->getUniqueID();
 		$view->mkdir('/newfolder');
 
 		$view->rename($folder, $newFolder);
@@ -539,8 +547,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testChangePassphrase() {
-		$filename = 'tmp-' . uniqid();
+	public function testChangePassphrase() {
+		$filename = 'tmp-' . $this->getUniqueID();
 
 		// Save long data as encrypted file using stream wrapper
 		$cryptedFile = file_put_contents('crypt:///' . $this->userId . '/files/' . $filename, $this->dataLong);
@@ -576,9 +584,9 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testViewFilePutAndGetContents() {
+	public function testViewFilePutAndGetContents() {
 
-		$filename = '/tmp-' . uniqid();
+		$filename = '/tmp-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
 		// Save short data as encrypted file using stream wrapper
@@ -610,8 +618,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @large
 	 */
-	function testTouchExistingFile() {
-		$filename = '/tmp-' . uniqid();
+	public function testTouchExistingFile() {
+		$filename = '/tmp-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
 		// Save short data as encrypted file using stream wrapper
@@ -634,8 +642,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testTouchFile() {
-		$filename = '/tmp-' . uniqid();
+	public function testTouchFile() {
+		$filename = '/tmp-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
 		$view->touch($filename);
@@ -658,8 +666,8 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 	/**
 	 * @medium
 	 */
-	function testFopenFile() {
-		$filename = '/tmp-' . uniqid();
+	public function testFopenFile() {
+		$filename = '/tmp-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
 		// Save short data as encrypted file using stream wrapper
@@ -676,6 +684,7 @@ class Test_Encryption_Crypt extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals($this->dataShort, $decrypt);
 
 		// tear down
+		fclose($handle);
 		$view->unlink($filename);
 	}
 
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
index ed543bf89f6..fcde7dc5df3 100644
--- a/apps/files_encryption/tests/helper.php
+++ b/apps/files_encryption/tests/helper.php
@@ -6,32 +6,38 @@
  * See the COPYING-README file.
  */
 
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Helper
  */
-class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Helper extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_HELPER_USER1 = "test-helper-user1";
 	const TEST_ENCRYPTION_HELPER_USER2 = "test-helper-user2";
 
-	public function setUp() {
+	protected function setUpUsers() {
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2, true);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1, true);
+		self::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2, true);
+		self::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1, true);
 	}
 
-	public function tearDown() {
+	protected  function cleanUpUsers() {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1);
 		\OC_User::deleteUser(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER2);
 	}
 
-	public static function tearDownAfterClass() {
+	public static function setupHooks() {
+		// Filesystem related hooks
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new OCA\Encryption\Proxy());
+	}
 
+	public static function tearDownAfterClass() {
 		\OC_Hook::clear();
 		\OC_FileProxy::clearProxies();
 
@@ -39,6 +45,8 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	/**
@@ -90,19 +98,20 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
 	}
 
 	function testGetUser() {
+		self::setUpUsers();
 
 		$path1 = "/" . self::TEST_ENCRYPTION_HELPER_USER1 . "/files/foo/bar.txt";
 		$path2 = "/" . self::TEST_ENCRYPTION_HELPER_USER1 . "/cache/foo/bar.txt";
 		$path3 = "/" . self::TEST_ENCRYPTION_HELPER_USER2 . "/thumbnails/foo";
 		$path4 ="/" . "/" . self::TEST_ENCRYPTION_HELPER_USER1;
 
-		\Test_Encryption_Util::loginHelper(self::TEST_ENCRYPTION_HELPER_USER1);
+		self::loginHelper(self::TEST_ENCRYPTION_HELPER_USER1);
 
 		// if we are logged-in every path should return the currently logged-in user
 		$this->assertEquals(self::TEST_ENCRYPTION_HELPER_USER1, Encryption\Helper::getUser($path3));
 
 		// now log out
-		\Test_Encryption_Util::logoutHelper();
+		self::logoutHelper();
 
 		// now we should only get the user from /user/files and user/cache paths
 		$this->assertEquals(self::TEST_ENCRYPTION_HELPER_USER1, Encryption\Helper::getUser($path1));
@@ -112,12 +121,13 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
 		$this->assertFalse(Encryption\Helper::getUser($path4));
 
 		// Log-in again
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1);
+		self::loginHelper(\Test_Encryption_Helper::TEST_ENCRYPTION_HELPER_USER1);
+		self::cleanUpUsers();
 	}
 
 	function userNamesProvider() {
 		return array(
-			array('testuser' . uniqid()),
+			array('testuser' . $this->getUniqueID()),
 			array('user.name.with.dots'),
 		);
 	}
@@ -128,12 +138,13 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
 	 * @dataProvider userNamesProvider
 	 */
 	function testFindShareKeys($userName) {
+		self::setUpUsers();
 		// note: not using dataProvider as we want to make
 		// sure that the correct keys are match and not any
 		// other ones that might happen to have similar names
-		\Test_Encryption_Util::setupHooks();
-		\Test_Encryption_Util::loginHelper($userName, true);
-		$testDir = 'testFindShareKeys' . uniqid() . '/';
+		self::setupHooks();
+		self::loginHelper($userName, true);
+		$testDir = 'testFindShareKeys' . $this->getUniqueID() . '/';
 		$baseDir = $userName . '/files/' . $testDir;
 		$fileList = array(
 			't est.txt',
@@ -164,6 +175,6 @@ class Test_Encryption_Helper extends \PHPUnit_Framework_TestCase {
 				$result
 			);
 		}
+		self::cleanUpUsers();
 	}
-
 }
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index c2434c0f5f6..9ea84cc94c2 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -20,24 +20,22 @@
  *
  */
 
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Hooks
  * this class provide basic hook app tests
  */
-class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_HOOKS_USER1 = "test-encryption-hooks-user1.dot";
 	const TEST_ENCRYPTION_HOOKS_USER2 = "test-encryption-hooks-user2.dot";
 
-	/**
-	 * @var \OC\Files\View
-	 */
+	/** @var \OC\Files\View */
 	public $user1View;     // view on /data/user1/files
+	/** @var \OC\Files\View */
 	public $user2View;     // view on /data/user2/files
+	/** @var \OC\Files\View */
 	public $rootView; // view on /data/user
 	public $data;
 	public $filename;
@@ -46,6 +44,8 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 	private static $testFiles;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// note: not using a data provider because these
 		// files all need to coexist to make sure the
 		// share keys are found properly (pattern matching)
@@ -86,13 +86,15 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1, true);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2, true);
+		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1, true);
+		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2, true);
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		// set user id
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
+		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 		\OC_User::setUserId(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 
 		// init filesystem view
@@ -102,8 +104,8 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 
 		// init short data
 		$this->data = 'hats';
-		$this->filename = 'enc_hooks_tests-' . uniqid() . '.txt';
-		$this->folder = 'enc_hooks_tests_folder-' . uniqid();
+		$this->filename = 'enc_hooks_tests-' . $this->getUniqueID() . '.txt';
+		$this->folder = 'enc_hooks_tests_folder-' . $this->getUniqueID();
 
 	}
 
@@ -119,6 +121,8 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	function testDisableHook() {
@@ -140,7 +144,7 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 
 		// relogin user to initialize the encryption again
 		$user =  \OCP\User::getUser();
-		\Test_Encryption_Util::loginHelper($user);
+		self::loginHelper($user);
 
 	}
 
@@ -165,8 +169,8 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
 
 
-		\Test_Encryption_Util::logoutHelper();
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
+		self::logoutHelper();
+		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
 		\OC_User::setUserId(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
 
 
@@ -223,8 +227,8 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 
 	function testDeleteHooksForSharedFiles() {
 
-		\Test_Encryption_Util::logoutHelper();
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
+		self::logoutHelper();
+		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 		\OC_User::setUserId(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 
 		// remember files_trashbin state
@@ -259,8 +263,8 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
 			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
 
-		\Test_Encryption_Util::logoutHelper();
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
+		self::logoutHelper();
+		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
 		\OC_User::setUserId(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
 
 		// user2 update the shared file
@@ -290,8 +294,8 @@ class Test_Encryption_Hooks extends \PHPUnit_Framework_TestCase {
 
 		// cleanup
 
-		\Test_Encryption_Util::logoutHelper();
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
+		self::logoutHelper();
+		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 		\OC_User::setUserId(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 
 		if ($stateFilesTrashbin) {
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index e2486ee93eb..b4dc6ddeb56 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -6,14 +6,12 @@
  * See the COPYING-README file.
  */
 
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Keymanager
  */
-class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_USER = "test-keymanager-user.dot";
 
@@ -28,6 +26,8 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 	public $dataShort;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -50,10 +50,11 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
 		// create test user
 		\OC_User::deleteUser(\Test_Encryption_Keymanager::TEST_USER);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Keymanager::TEST_USER, true);
+		parent::loginHelper(\Test_Encryption_Keymanager::TEST_USER, true);
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		// set content for encrypting / decrypting in tests
 		$this->dataLong = file_get_contents(__DIR__ . '/../lib/crypt.php');
 		$this->dataShort = 'hats';
@@ -68,7 +69,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
 		$this->view = new \OC\Files\View('/');
 
-		\Test_Encryption_Util::loginHelper(Test_Encryption_Keymanager::TEST_USER);
+		self::loginHelper(Test_Encryption_Keymanager::TEST_USER);
 		$this->userId = \Test_Encryption_Keymanager::TEST_USER;
 		$this->pass = \Test_Encryption_Keymanager::TEST_USER;
 
@@ -79,6 +80,8 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 	function tearDown() {
 		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys');
 		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles');
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
@@ -98,6 +101,8 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	/**
@@ -163,7 +168,7 @@ class Test_Encryption_Keymanager extends \PHPUnit_Framework_TestCase {
 
 		$key = $this->randomKey;
 
-		$file = 'unittest-' . uniqid() . '.txt';
+		$file = 'unittest-' . $this->getUniqueID() . '.txt';
 
 		$util = new Encryption\Util($this->view, $this->userId);
 
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index d3e568f8914..a91222327f1 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -20,15 +20,13 @@
  *
  */
 
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Proxy
  * this class provide basic proxy app tests
  */
-class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Proxy extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_PROXY_USER1 = "test-proxy-user1";
 
@@ -44,6 +42,8 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 	public $filename;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -59,10 +59,12 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1, true);
+		self::loginHelper(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1, true);
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		// set user id
 		\OC_User::setUserId(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1);
 		$this->userId = \Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1;
@@ -75,7 +77,7 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 		// init short data
 		$this->data = 'hats';
 		$this->dataLong = file_get_contents(__DIR__ . '/../lib/crypt.php');
-		$this->filename = 'enc_proxy_tests-' . uniqid() . '.txt';
+		$this->filename = 'enc_proxy_tests-' . $this->getUniqueID() . '.txt';
 
 	}
 
@@ -90,6 +92,8 @@ class Test_Encryption_Proxy extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	/**
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index d7efe21a8fd..20ee2cc7064 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -20,14 +20,12 @@
  *
  */
 
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Share
  */
-class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_SHARE_USER1 = "test-share-user1";
 	const TEST_ENCRYPTION_SHARE_USER2 = "test-share-user2";
@@ -47,6 +45,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	public $subsubfolder;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -73,10 +73,10 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create users
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1, true);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, true);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, true);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, true);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1, true);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, true);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, true);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, true);
 
 		// create group and assign users
 		\OC_Group::createGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
@@ -84,7 +84,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OC_Group::addToGroup(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->dataShort = 'hats';
 		$this->view = new \OC\Files\View('/');
 
@@ -101,16 +103,18 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OC_App::disable('files_trashbin');
 
 		// login as first user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
 		} else {
 			OC_App::disable('files_trashbin');
 		}
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
@@ -130,6 +134,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 
@@ -139,7 +145,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	 */
 	function testShareFile($withTeardown = true) {
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
@@ -168,7 +174,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user1 exists
 		$this->assertTrue($this->view->file_exists(
@@ -176,7 +182,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// login as user1
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// get file contents
 		$retrievedCryptedFile = $this->view->file_get_contents(
@@ -189,7 +195,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		if ($withTeardown) {
 
 			// login as admin
-			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 			// unshare the file
 			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
@@ -219,7 +225,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$this->testShareFile(false);
 
 		// login as user2
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// get the file info
 		$fileInfo = $this->view->getFileInfo(
@@ -229,7 +235,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user2 exists
 		$this->assertTrue($this->view->file_exists(
@@ -237,7 +243,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// login as user2
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 		// get file contents
 		$retrievedCryptedFile = $this->view->file_get_contents(
@@ -250,13 +256,13 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		if ($withTeardown) {
 
 			// login as user1
-			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// unshare the file with user2
 			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 			// login as admin
-			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
@@ -290,7 +296,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	 */
 	function testShareFolder($withTeardown = true) {
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// create folder structure
 		$this->view->mkdir('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files' . $this->folder1);
@@ -325,7 +331,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user1 exists
 		$this->assertTrue($this->view->file_exists(
@@ -334,7 +340,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// login as user1
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// get file contents
 		$retrievedCryptedFile = $this->view->file_get_contents(
@@ -348,7 +354,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		if ($withTeardown) {
 
 			// login as admin
-			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 			// unshare the folder with user1
 			\OCP\Share::unshare('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
@@ -382,7 +388,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$fileInfoFolder1 = $this->testShareFolder(false);
 
 		// login as user2
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		// disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -403,7 +409,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user3 exists
 		$this->assertTrue($this->view->file_exists(
@@ -412,7 +418,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// login as user3
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 		// get file contents
 		$retrievedCryptedFile = $this->view->file_get_contents(
@@ -434,7 +440,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, OCP\PERMISSION_ALL);
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user3 exists
 		$this->assertTrue($this->view->file_exists(
@@ -443,7 +449,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 		// login as user3
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
 
 		// get file contents
 		$retrievedCryptedFile = $this->view->file_get_contents(
@@ -456,7 +462,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		if ($withTeardown) {
 
 			// login as user2
-			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 			// unshare the file with user3
 			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
@@ -468,7 +474,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 			// login as user1
-			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// unshare the folder with user2
 			\OCP\Share::unshare('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
@@ -480,7 +486,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 			// login as admin
-			\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 			// unshare the folder1 with user1
 			\OCP\Share::unshare('folder', $fileInfoFolder1['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
@@ -507,7 +513,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 	function testPublicShareFile() {
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/'  . $this->filename, $this->dataShort);
@@ -536,7 +542,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		$publicShareKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'publicShareKeyId');
 
@@ -548,7 +554,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		// some hacking to simulate public link
 		//$GLOBALS['app'] = 'files_sharing';
 		//$GLOBALS['fileOwner'] = \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1;
-		\Test_Encryption_Util::logoutHelper();
+		self::logoutHelper();
 
 		// get file contents
 		$retrievedCryptedFile = file_get_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/'  . $this->filename);
@@ -559,7 +565,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		// tear down
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// unshare the file
 		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, null);
@@ -585,7 +591,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	 */
 	function testShareFileWithGroup() {
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
@@ -614,7 +620,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user2 and user3 exists
 		$this->assertTrue($this->view->file_exists(
@@ -625,7 +631,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 		// login as user1
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 
 		// get file contents
 		$retrievedCryptedFile = $this->view->file_get_contents(
@@ -635,7 +641,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals($this->dataShort, $retrievedCryptedFile);
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// unshare the file
 		\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1);
@@ -666,13 +672,13 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	function testRecoveryFile() {
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
 		$recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId');
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
@@ -772,7 +778,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	function testRecoveryForUser() {
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		$result = \OCA\Encryption\Helper::adminEnableRecovery(null, 'test123');
 		$this->assertTrue($result);
@@ -780,7 +786,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$recoveryKeyId = \OC::$server->getAppConfig()->getValue('files_encryption', 'recoveryKeyId');
 
 		// login as user2
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
@@ -824,7 +830,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// change password
 		\OC_User::setPassword(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, 'test', 'test123');
@@ -834,7 +840,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		\OCA\Encryption\Hooks::setPassphrase($params);
 
 		// login as user2
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, false, 'test');
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, false, 'test');
 
 		// get file contents
 		$retrievedCryptedFile1 = file_get_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->filename);
@@ -886,7 +892,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	 */
 	function testFailShareFile() {
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
@@ -924,7 +930,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// check if share key for user1 not exists
 		$this->assertFalse($this->view->file_exists(
@@ -969,7 +975,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	function testRename() {
 
 		// login as admin
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt:///' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename, $this->dataShort);
@@ -994,7 +1000,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 
 		// login as user2
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 		$this->assertTrue($this->view->file_exists('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->filename));
 
@@ -1017,7 +1023,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals($this->dataShort, $retrievedRenamedFile);
 
 		// cleanup
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/' . $this->filename);
 	}
 
@@ -1029,8 +1035,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 		$view = new \OC\Files\View('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
-		$filename = '/tmp-' . uniqid();
-		$folder = '/folder' . uniqid();
+		$filename = '/tmp-' . $this->getUniqueID();
+		$folder = '/folder' . $this->getUniqueID();
 
 		\OC\Files\Filesystem::mkdir($folder);
 
@@ -1045,7 +1051,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 		$this->assertEquals($this->dataShort, $decrypt);
 
-		$newFolder = '/newfolder/subfolder' . uniqid();
+		$newFolder = '/newfolder/subfolder' . $this->getUniqueID();
 		\OC\Files\Filesystem::mkdir('/newfolder');
 
 		// get the file info from previous created file
@@ -1087,8 +1093,8 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 	function testMoveFileToFolder($userId) {
 		$view = new \OC\Files\View('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
-		$filename = '/tmp-' . uniqid();
-		$folder = '/folder' . uniqid();
+		$filename = '/tmp-' . $this->getUniqueID();
+		$folder = '/folder' . $this->getUniqueID();
 
 		\OC\Files\Filesystem::mkdir($folder);
 
@@ -1103,7 +1109,7 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 
 		$this->assertEquals($this->dataShort, $decrypt);
 
-		$subFolder = $folder . '/subfolder' . uniqid();
+		$subFolder = $folder . '/subfolder' . $this->getUniqueID();
 		\OC\Files\Filesystem::mkdir($subFolder);
 
 		// get the file info from previous created file
@@ -1118,9 +1124,9 @@ class Test_Encryption_Share extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// move the file into the subfolder as the test user
-		\Test_Encryption_Util::loginHelper($userId);
+		self::loginHelper($userId);
 		\OC\Files\Filesystem::rename($folder . $filename, $subFolder . $filename);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
+		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
 
 		// Get file decrypted contents
 		$newDecrypt = \OC\Files\Filesystem::file_get_contents($subFolder . $filename);
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index c3f777df859..b1404ca282a 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -20,15 +20,13 @@
  *
  */
 
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Stream
  * this class provide basic stream tests
  */
-class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Stream extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_STREAM_USER1 = "test-stream-user1";
 
@@ -42,6 +40,8 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 	public $stateFilesTrashbin;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -54,10 +54,12 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1, true);
+		self::loginHelper(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1, true);
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		// set user id
 		\OC_User::setUserId(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
 		$this->userId = \Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1;
@@ -76,7 +78,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 		\OC_App::disable('files_trashbin');
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
@@ -84,6 +86,8 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 		else {
 			OC_App::disable('files_trashbin');
 		}
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
@@ -97,10 +101,12 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	function testStreamOptions() {
-		$filename = '/tmp-' . uniqid();
+		$filename = '/tmp-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
 		// Save short data as encrypted file using stream wrapper
@@ -118,12 +124,14 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 		$this->assertTrue(flock($handle, LOCK_SH));
 		$this->assertTrue(flock($handle, LOCK_UN));
 
+		fclose($handle);
+
 		// tear down
 		$view->unlink($filename);
 	}
 
 	function testStreamSetBlocking() {
-		$filename = '/tmp-' . uniqid();
+		$filename = '/tmp-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
 		// Save short data as encrypted file using stream wrapper
@@ -154,7 +162,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 	 * @medium
 	 */
 	function testStreamSetTimeout() {
-		$filename = '/tmp-' . uniqid();
+		$filename = '/tmp-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
 		// Save short data as encrypted file using stream wrapper
@@ -175,7 +183,7 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 	}
 
 	function testStreamSetWriteBuffer() {
-		$filename = '/tmp-' . uniqid();
+		$filename = '/tmp-' . $this->getUniqueID();
 		$view = new \OC\Files\View('/' . $this->userId . '/files');
 
 		// Save short data as encrypted file using stream wrapper
@@ -201,9 +209,9 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 	 */
 	function testStreamFromLocalFile() {
 
-		$filename = '/' . $this->userId . '/files/' . 'tmp-' . uniqid().'.txt';
+		$filename = '/' . $this->userId . '/files/' . 'tmp-' . $this->getUniqueID().'.txt';
 
-		$tmpFilename = "/tmp/" . uniqid() . ".txt";
+		$tmpFilename = "/tmp/" . $this->getUniqueID() . ".txt";
 
 		// write an encrypted file
 		$cryptedFile = $this->view->file_put_contents($filename, $this->dataShort);
@@ -228,6 +236,8 @@ class Test_Encryption_Stream extends \PHPUnit_Framework_TestCase {
 		// check if it was successful
 		$this->assertEquals($this->dataShort, $contentFromTmpFile);
 
+		fclose($handle);
+
 		// clean up
 		unlink($tmpFilename);
 		$this->view->unlink($filename);
diff --git a/apps/files_encryption/tests/testcase.php b/apps/files_encryption/tests/testcase.php
new file mode 100644
index 00000000000..3106aeda8ea
--- /dev/null
+++ b/apps/files_encryption/tests/testcase.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright (c) 2012 Sam Tuke <samtuke@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OCA\Files_Encryption\Tests;
+
+use OCA\Encryption;
+
+/**
+ * Class Test_Encryption_TestCase
+ */
+abstract class TestCase extends \Test\TestCase {
+	/**
+	 * @param string $user
+	 * @param bool $create
+	 * @param bool $password
+	 */
+	public static function loginHelper($user, $create = false, $password = false, $loadEncryption = true) {
+		if ($create) {
+			try {
+				\OC_User::createUser($user, $user);
+			} catch (\Exception $e) {
+				// catch username is already being used from previous aborted runs
+			}
+		}
+
+		if ($password === false) {
+			$password = $user;
+		}
+
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId('');
+		\OC\Files\Filesystem::tearDown();
+		\OC_User::setUserId($user);
+		\OC_Util::setupFS($user);
+
+		if ($loadEncryption) {
+			$params['uid'] = $user;
+			$params['password'] = $password;
+			\OCA\Encryption\Hooks::login($params);
+		}
+	}
+
+	public static function logoutHelper() {
+		\OC_Util::tearDownFS();
+		\OC_User::setUserId(false);
+		\OC\Files\Filesystem::tearDown();
+	}
+}
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index d795240399c..a43e8f964a2 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -20,15 +20,13 @@
  *
  */
 
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
  * Class Test_Encryption_Trashbin
  * this class provide basic trashbin app tests
  */
-class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_TRASHBIN_USER1 = "test-trashbin-user1";
 
@@ -45,6 +43,8 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	public $subsubfolder;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -63,14 +63,16 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1, true);
+		self::loginHelper(self::TEST_ENCRYPTION_TRASHBIN_USER1, true);
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		// set user id
-		\OC_User::setUserId(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
-		$this->userId = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
-		$this->pass = \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1;
+		\OC_User::setUserId(self::TEST_ENCRYPTION_TRASHBIN_USER1);
+		$this->userId = self::TEST_ENCRYPTION_TRASHBIN_USER1;
+		$this->pass = self::TEST_ENCRYPTION_TRASHBIN_USER1;
 
 		// init filesystem view
 		$this->view = new \OC\Files\View('/');
@@ -89,7 +91,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 		\OC_App::enable('files_trashbin');
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
@@ -97,11 +99,13 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 		else {
 			OC_App::disable('files_trashbin');
 		}
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
 		// cleanup test user
-		\OC_User::deleteUser(\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1);
+		\OC_User::deleteUser(self::TEST_ENCRYPTION_TRASHBIN_USER1);
 
 		\OC_Hook::clear();
 		\OC_FileProxy::clearProxies();
@@ -110,6 +114,8 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	/**
@@ -119,12 +125,12 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	function testDeleteFile() {
 
 		// generate filename
-		$filename = 'tmp-' . uniqid() . '.txt';
+		$filename = 'tmp-' . $this->getUniqueID() . '.txt';
 		$filename2 = $filename . '.backup'; // a second file with similar name
 
 		// save file with content
-		$cryptedFile = file_put_contents('crypt:///' .\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort);
-		$cryptedFile2 = file_put_contents('crypt:///' .\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename2, $this->dataShort);
+		$cryptedFile = file_put_contents('crypt:///' .self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort);
+		$cryptedFile2 = file_put_contents('crypt:///' .self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename2, $this->dataShort);
 
 		// test that data was successfully written
 		$this->assertTrue(is_int($cryptedFile));
@@ -132,59 +138,59 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 		// check if key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
 			. '.key'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename2
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename2
 			. '.key'));
 
 		// check if share key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename2 . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename2 . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// delete first file
 		\OC\FIles\Filesystem::unlink($filename);
 
 		// check if file not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
 
 		// check if key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
 			. '.key'));
 
 		// check if share key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// check that second file still exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename2));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename2));
 
 		// check that key for second file still exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename2
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename2
 			. '.key'));
 
 		// check that share key for second file still exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename2 . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename2 . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// get files
 		$trashFiles = $this->view->getDirectoryContent(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
 
 		$trashFileSuffix = null;
 		// find created file with timestamp
 		foreach ($trashFiles as $file) {
-			if (strncmp($file['path'], $filename, strlen($filename))) {
+			if (strpos($file['path'], $filename . '.d') !== false) {
 				$path_parts = pathinfo($file['name']);
 				$trashFileSuffix = $path_parts['extension'];
 			}
@@ -195,13 +201,13 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 		// check if key for admin not exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
 			. '.key.' . $trashFileSuffix));
 
 		// check if share key for admin not exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
-			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
 	}
 
 	/**
@@ -210,32 +216,27 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	 */
 	function testRestoreFile() {
 		// generate filename
-		$filename = 'tmp-' . uniqid() . '.txt';
+		$filename = 'tmp-' . $this->getUniqueID() . '.txt';
 		$filename2 = $filename . '.backup'; // a second file with similar name
 
 		// save file with content
-		$cryptedFile = file_put_contents('crypt:///' .\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort);
-		$cryptedFile2 = file_put_contents('crypt:///' .\Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename2, $this->dataShort);
+		$cryptedFile = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename, $this->dataShort);
+		$cryptedFile2 = file_put_contents('crypt:///' . self::TEST_ENCRYPTION_TRASHBIN_USER1. '/files/'. $filename2, $this->dataShort);
 
 		// delete both files
 		\OC\Files\Filesystem::unlink($filename);
 		\OC\Files\Filesystem::unlink($filename2);
 
-		$trashFiles = $this->view->getDirectoryContent(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
+		$trashFiles = $this->view->getDirectoryContent('/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/');
 
 		$trashFileSuffix = null;
 		$trashFileSuffix2 = null;
 		// find created file with timestamp
 		foreach ($trashFiles as $file) {
-			if (strncmp($file['path'], $filename, strlen($filename))) {
+			if (strpos($file['path'], $filename . '.d') !== false) {
 				$path_parts = pathinfo($file['name']);
 				$trashFileSuffix = $path_parts['extension'];
 			}
-			if (strncmp($file['path'], $filename2, strlen($filename2))) {
-				$path_parts = pathinfo($file['name']);
-				$trashFileSuffix2 = $path_parts['extension'];
-			}
 		}
 
 		// prepare file information
@@ -246,31 +247,31 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 		// check if file exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
 
 		// check if key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
 			. $filename . '.key'));
 
 		// check if share key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// check that second file was NOT restored
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename2));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename2));
 
 		// check if key for admin exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
 			. $filename2 . '.key'));
 
 		// check if share key for admin exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename2 . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename2 . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 	}
 
 	/**
@@ -280,7 +281,7 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 	function testPermanentDeleteFile() {
 
 		// generate filename
-		$filename = 'tmp-' . uniqid() . '.txt';
+		$filename = 'tmp-' . $this->getUniqueID() . '.txt';
 
 		// save file with content
 		$cryptedFile = file_put_contents('crypt:///' .$this->userId. '/files/' . $filename, $this->dataShort);
@@ -290,30 +291,30 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 		// check if key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
 			. '.key'));
 
 		// check if share key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// delete file
 		\OC\Files\Filesystem::unlink($filename);
 
 		// check if file not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files/' . $filename));
 
 		// check if key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
 			. '.key'));
 
 		// check if share key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
+			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// find created file with timestamp
 		$query = \OC_DB::prepare('SELECT `timestamp`,`type` FROM `*PREFIX*files_trash`'
@@ -327,13 +328,13 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 		// check if key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
 			. '.key.' . $trashFileSuffix));
 
 		// check if share key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
-			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
 
 		// get timestamp from file
 		$timestamp = str_replace('d', '', $trashFileSuffix);
@@ -343,18 +344,18 @@ class Test_Encryption_Trashbin extends \PHPUnit_Framework_TestCase {
 
 		// check if key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/' . $filename . '.'
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/files/' . $filename . '.'
 			. $trashFileSuffix));
 
 		// check if key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
 			. '.key.' . $trashFileSuffix));
 
 		// check if share key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
-			. '.' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
+			. '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
 	}
 
 }
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 210ffcc5410..bbf6efae5b9 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -11,7 +11,7 @@ use OCA\Encryption;
 /**
  * Class Test_Encryption_Util
  */
-class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_UTIL_USER1 = "test-util-user1";
 	const TEST_ENCRYPTION_UTIL_USER2 = "test-util-user2";
@@ -41,6 +41,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	public $stateFilesTrashbin;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -48,9 +50,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		self::setupHooks();
 
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, true);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER2, true);
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER, true);
+		self::loginHelper(self::TEST_ENCRYPTION_UTIL_USER1, true);
+		self::loginHelper(self::TEST_ENCRYPTION_UTIL_USER2, true);
+		self::loginHelper(self::TEST_ENCRYPTION_UTIL_LEGACY_USER, true);
 
 		// create groups
 		\OC_Group::createGroup(self::TEST_ENCRYPTION_UTIL_GROUP1);
@@ -60,13 +62,14 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		\OC_Group::addToGroup(self::TEST_ENCRYPTION_UTIL_USER1, self::TEST_ENCRYPTION_UTIL_GROUP1);
 	}
 
+	protected function setUp() {
+		parent::setUp();
 
-	function setUp() {
 		// login user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
-		\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
-		$this->userId = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
-		$this->pass = \Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1;
+		self::loginHelper(self::TEST_ENCRYPTION_UTIL_USER1);
+		\OC_User::setUserId(self::TEST_ENCRYPTION_UTIL_USER1);
+		$this->userId = self::TEST_ENCRYPTION_UTIL_USER1;
+		$this->pass = self::TEST_ENCRYPTION_UTIL_USER1;
 
 		// set content for encrypting / decrypting in tests
 		$this->dataUrl = __DIR__ . '/../lib/crypt.php';
@@ -101,7 +104,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		\OC_App::disable('files_trashbin');
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
@@ -109,13 +112,15 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		else {
 			OC_App::disable('files_trashbin');
 		}
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
 		// cleanup test user
-		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
-		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER2);
-		\OC_User::deleteUser(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_LEGACY_USER);
+		\OC_User::deleteUser(self::TEST_ENCRYPTION_UTIL_USER1);
+		\OC_User::deleteUser(self::TEST_ENCRYPTION_UTIL_USER2);
+		\OC_User::deleteUser(self::TEST_ENCRYPTION_UTIL_LEGACY_USER);
 
 		//cleanup groups
 		\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP1);
@@ -128,6 +133,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	public static function setupHooks() {
@@ -164,8 +171,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 		self::loginHelper($this->userId);
 
-		$unencryptedFile = '/tmpUnencrypted-' . uniqid() . '.txt';
-		$encryptedFile =  '/tmpEncrypted-' . uniqid() . '.txt';
+		$unencryptedFile = '/tmpUnencrypted-' . $this->getUniqueID() . '.txt';
+		$encryptedFile =  '/tmpEncrypted-' . $this->getUniqueID() . '.txt';
 
 		// Disable encryption proxy to write a unencrypted file
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -244,9 +251,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	 */
 	function testGetUidAndFilename() {
 
-		\OC_User::setUserId(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+		\OC_User::setUserId(self::TEST_ENCRYPTION_UTIL_USER1);
 
-		$filename = '/tmp-' . uniqid() . '.test';
+		$filename = '/tmp-' . $this->getUniqueID() . '.test';
 
 		// Disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -261,7 +268,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 		list($fileOwnerUid, $file) = $util->getUidAndFilename($filename);
 
-		$this->assertEquals(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1, $fileOwnerUid);
+		$this->assertEquals(self::TEST_ENCRYPTION_UTIL_USER1, $fileOwnerUid);
 
 		$this->assertEquals($file, $filename);
 
@@ -272,9 +279,9 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 	 * Test that data that is read by the crypto stream wrapper
 	 */
 	function testGetFileSize() {
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+		self::loginHelper(self::TEST_ENCRYPTION_UTIL_USER1);
 
-		$filename = 'tmp-' . uniqid();
+		$filename = 'tmp-' . $this->getUniqueID();
 		$externalFilename = '/' . $this->userId . '/files/' . $filename;
 
 		// Test for 0 byte files
@@ -298,7 +305,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	function testEncryptAll() {
 
-		$filename = "/encryptAll" . uniqid() . ".txt";
+		$filename = "/encryptAll" . $this->getUniqueID() . ".txt";
 		$util = new Encryption\Util($this->view, $this->userId);
 
 		// disable encryption to upload a unencrypted file
@@ -329,7 +336,7 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	function testDecryptAll() {
 
-		$filename = "/decryptAll" . uniqid() . ".txt";
+		$filename = "/decryptAll" . $this->getUniqueID() . ".txt";
 		$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data/');
 		$userdir = $datadir . '/' . $this->userId . '/files/';
 
@@ -448,8 +455,8 @@ class Test_Encryption_Util extends \PHPUnit_Framework_TestCase {
 
 	function testDescryptAllWithBrokenFiles() {
 
-		$file1 = "/decryptAll1" . uniqid() . ".txt";
-		$file2 = "/decryptAll2" . uniqid() . ".txt";
+		$file1 = "/decryptAll1" . $this->getUniqueID() . ".txt";
+		$file2 = "/decryptAll2" . $this->getUniqueID() . ".txt";
 
 		$util = new Encryption\Util($this->view, $this->userId);
 
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index c838ddd29d1..7cadeaf0ba9 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -20,8 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/util.php';
-
 use OCA\Encryption;
 
 /**
@@ -29,7 +27,7 @@ use OCA\Encryption;
  *
  * this class provide basic webdav tests for PUT,GET and DELETE
  */
-class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
+class Test_Encryption_Webdav extends \OCA\Files_Encryption\Tests\TestCase {
 
 	const TEST_ENCRYPTION_WEBDAV_USER1 = "test-webdav-user1";
 
@@ -45,6 +43,8 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	private $storage;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -60,11 +60,13 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
+		self::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
 
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		// reset backend
 		\OC_User::useBackend('database');
 
@@ -86,16 +88,18 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		\OC_App::disable('files_trashbin');
 
 		// create test user
-		\Test_Encryption_Util::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
+		self::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		// reset app files_trashbin
 		if ($this->stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
 		} else {
 			OC_App::disable('files_trashbin');
 		}
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
@@ -109,6 +113,8 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 		$view = new \OC\Files\View('/');
 		$view->rmdir('public-keys');
 		$view->rmdir('owncloud_private_key');
+
+		parent::tearDownAfterClass();
 	}
 
 	/**
@@ -117,7 +123,7 @@ class Test_Encryption_Webdav extends \PHPUnit_Framework_TestCase {
 	function testWebdavPUT() {
 
 		// generate filename
-		$filename = '/tmp-' . uniqid() . '.txt';
+		$filename = '/tmp-' . $this->getUniqueID() . '.txt';
 
 		// set server vars
 		$_SERVER['REQUEST_METHOD'] = 'OPTIONS';
-- 
GitLab


From 39ae569c5cafda5e15865699ff17b9734020329e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Nov 2014 09:46:37 +0100
Subject: [PATCH 423/616] Correctly close handle of directory when listing
 certificates

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

diff --git a/lib/private/security/certificatemanager.php b/lib/private/security/certificatemanager.php
index cae9730eb26..a2a4c8b83d2 100644
--- a/lib/private/security/certificatemanager.php
+++ b/lib/private/security/certificatemanager.php
@@ -49,6 +49,7 @@ class CertificateManager implements ICertificateManager {
 				} catch(\Exception $e) {}
 			}
 		}
+		closedir($handle);
 		return $result;
 	}
 
diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php
index 5baf9e16e81..01b3afb03ee 100644
--- a/tests/lib/security/certificatemanager.php
+++ b/tests/lib/security/certificatemanager.php
@@ -8,7 +8,7 @@
 
 use \OC\Security\CertificateManager;
 
-class CertificateManagerTest extends \PHPUnit_Framework_TestCase {
+class CertificateManagerTest extends \Test\TestCase {
 
 	/** @var CertificateManager */
 	private $certificateManager;
@@ -18,8 +18,8 @@ class CertificateManagerTest extends \PHPUnit_Framework_TestCase {
 	private $user;
 
 	function setUp() {
-		$this->username = OC_Util::generateRandomBytes(20);
-		OC_User::createUser($this->username, OC_Util::generateRandomBytes(20));
+		$this->username = $this->getUniqueID('', 20);
+		OC_User::createUser($this->username, $this->getUniqueID('', 20));
 
 		\OC_Util::tearDownFS();
 		\OC_User::setUserId('');
-- 
GitLab


From 0ab973a3a6ba9c0c98f7414fa620c72bc356e286 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Nov 2014 10:52:37 +0100
Subject: [PATCH 424/616] Make it possible to cleanPath() absolute Windows
 paths

---
 lib/private/files/filesystem.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/private/files/filesystem.php b/lib/private/files/filesystem.php
index c7dc99c55cb..6c8fa8c90ba 100644
--- a/lib/private/files/filesystem.php
+++ b/lib/private/files/filesystem.php
@@ -698,13 +698,22 @@ class Filesystem {
 	 * @param bool $stripTrailingSlash
 	 * @return string
 	 */
-	public static function normalizePath($path, $stripTrailingSlash = true) {
+	public static function normalizePath($path, $stripTrailingSlash = true, $isAbsolutePath = false) {
 		if ($path == '') {
 			return '/';
 		}
+
 		//no windows style slashes
 		$path = str_replace('\\', '/', $path);
 
+		// When normalizing an absolute path, we need to ensure that the drive-letter
+		// is still at the beginning on windows
+		$windows_drive_letter = '';
+		if ($isAbsolutePath && \OC_Util::runningOnWindows() && preg_match('#^([a-zA-Z])$#', $path[0]) && $path[1] == ':' && $path[2] == '/') {
+			$windows_drive_letter = substr($path, 0, 2);
+			$path = substr($path, 2);
+		}
+
 		//add leading slash
 		if ($path[0] !== '/') {
 			$path = '/' . $path;
@@ -733,7 +742,7 @@ class Filesystem {
 		//normalize unicode if possible
 		$path = \OC_Util::normalizeUnicode($path);
 
-		return $path;
+		return $windows_drive_letter . $path;
 	}
 
 	/**
-- 
GitLab


From 53318c4bb5910ee27daa3e8ffe8f6b253d40a042 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Nov 2014 11:38:14 +0100
Subject: [PATCH 425/616] Fix Files\Storage\Home::testRoot()

---
 tests/lib/files/storage/home.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/lib/files/storage/home.php b/tests/lib/files/storage/home.php
index 953fcfc8a6a..d085efe9c1c 100644
--- a/tests/lib/files/storage/home.php
+++ b/tests/lib/files/storage/home.php
@@ -75,7 +75,12 @@ class Home extends Storage {
 	 * Tests that the root path matches the data dir
 	 */
 	public function testRoot() {
-		$this->assertEquals($this->tmpDir, $this->instance->getLocalFolder(''));
+		if (\OC_Util::runningOnWindows()) {
+			// Windows removes trailing slashes when returning paths
+			$this->assertEquals(rtrim($this->tmpDir, '/'), $this->instance->getLocalFolder(''));
+		} else {
+			$this->assertEquals($this->tmpDir, $this->instance->getLocalFolder(''));
+		}
 	}
 
 	/**
-- 
GitLab


From 289a27778e78bb69830b5b05f4084627a781157b Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 14 Nov 2014 12:51:59 +0100
Subject: [PATCH 426/616] Correctly refresh the apps list after removing the
 mock

---
 tests/lib/app.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/lib/app.php b/tests/lib/app.php
index e538ebec8a0..e8289f58a26 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -460,6 +460,9 @@ class Test_App extends PHPUnit_Framework_TestCase {
 		\OC::$server->registerService('AppConfig', function ($c) use ($oldService){
 			return $oldService;
 		});
+
+		// Remove the cache of the mocked apps list with a forceRefresh
+		\OC_App::getEnabledApps(true);
 	}
 }
 
-- 
GitLab


From 6625d5c88f74edade459ec7e2ee0bfb79f21fedd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 12 Nov 2014 15:54:41 +0100
Subject: [PATCH 427/616] Correctly restore previous root mount point after
 testing

---
 apps/files/tests/ajax_rename.php        | 14 +++++++--
 tests/lib/cache/file.php                | 11 +++++++
 tests/lib/cache/usercache.php           | 12 ++++++++
 tests/lib/files/cache/updater.php       | 15 +++++++++-
 tests/lib/files/cache/updaterlegacy.php |  9 ++++--
 tests/lib/files/cache/watcher.php       | 15 ++++++++--
 tests/lib/files/etagtest.php            | 15 ++++++++--
 tests/lib/files/filesystem.php          | 21 +++++++++-----
 tests/lib/files/node/integration.php    | 14 +++++++--
 tests/lib/files/utils/scanner.php       | 18 +++++++++++-
 tests/lib/files/view.php                | 16 +++++++++--
 tests/lib/helperstorage.php             | 19 ++++++++++---
 tests/lib/migrate.php                   | 36 ++++++++++++++---------
 tests/lib/preview.php                   | 38 +++++++++++++++----------
 tests/lib/streamwrappers.php            |  5 ++++
 15 files changed, 203 insertions(+), 55 deletions(-)

diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 5ed8b1931f4..3bccaca1231 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -34,7 +34,14 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 	 */
 	private $files;
 
-	function setUp() {
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
+
 		// mock OC_L10n
 		if (!self::$user) {
 			self::$user = uniqid();
@@ -59,10 +66,13 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 		$this->files = new \OCA\Files\App($viewMock, $l10nMock);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$result = \OC_User::deleteUser(self::$user);
 		$this->assertTrue($result);
 		\OC\Files\Filesystem::tearDown();
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 0e19c105cd1..8cc45c85405 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -23,8 +23,12 @@
 namespace Test\Cache;
 
 class FileCache extends \Test_Cache {
+	/** @var string */
 	private $user;
+	/** @var string */
 	private $datadir;
+	/** @var \OC\Files\Storage\Storage */
+	private $storage;
 
 	function skip() {
 		//$this->skipUnless(OC_User::isLoggedIn());
@@ -42,6 +46,7 @@ class FileCache extends \Test_Cache {
 		//}
 
 		//set up temporary storage
+		$this->storage = \OC\Files\Filesystem::getStorage('/');
 		\OC\Files\Filesystem::clearMounts();
 		$storage = new \OC\Files\Storage\Temporary(array());
 		\OC\Files\Filesystem::mount($storage,array(),'/');
@@ -68,5 +73,11 @@ class FileCache extends \Test_Cache {
 	public function tearDown() {
 		\OC_User::setUserId($this->user);
 		\OC_Config::setValue('cachedirectory', $this->datadir);
+
+		// Restore the original mount point
+		\OC\Files\Filesystem::clearMounts();
+		\OC\Files\Filesystem::mount($this->storage, array(), '/');
+
+		parent::tearDown();
 	}
 }
diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php
index a1b6af1c55d..8a23a805ebe 100644
--- a/tests/lib/cache/usercache.php
+++ b/tests/lib/cache/usercache.php
@@ -23,8 +23,12 @@
 namespace Test\Cache;
 
 class UserCache extends \Test_Cache {
+	/** @var string */
 	private $user;
+	/** @var string */
 	private $datadir;
+	/** @var \OC\Files\Storage\Storage */
+	private $storage;
 
 	public function setUp() {
 		//clear all proxies and hooks so we can do clean testing
@@ -38,6 +42,7 @@ class UserCache extends \Test_Cache {
 		//}
 
 		//set up temporary storage
+		$this->storage = \OC\Files\Filesystem::getStorage('/');
 		\OC\Files\Filesystem::clearMounts();
 		$storage = new \OC\Files\Storage\Temporary(array());
 		\OC\Files\Filesystem::mount($storage,array(),'/');
@@ -63,5 +68,12 @@ class UserCache extends \Test_Cache {
 
 	public function tearDown() {
 		\OC_User::setUserId($this->user);
+		\OC_Config::setValue('cachedirectory', $this->datadir);
+
+		// Restore the original mount point
+		\OC\Files\Filesystem::clearMounts();
+		\OC\Files\Filesystem::mount($this->storage, array(), '/');
+
+		parent::tearDown();
 	}
 }
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index 96b4207ad43..9e7330db20c 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -33,7 +33,13 @@ class Updater extends \PHPUnit_Framework_TestCase {
 	 */
 	protected $updater;
 
-	public function setUp() {
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->originalStorage = Filesystem::getStorage('/');
 		$this->storage = new Temporary(array());
 		Filesystem::clearMounts();
 		Filesystem::mount($this->storage, array(), '/');
@@ -42,6 +48,13 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		$this->cache = $this->storage->getCache();
 	}
 
+	protected function tearDown() {
+		Filesystem::clearMounts();
+		Filesystem::mount($this->originalStorage, array(), '/');
+
+		parent::tearDown();
+	}
+
 	public function testNewFile() {
 		$this->storage->file_put_contents('foo.txt', 'bar');
 		$this->assertFalse($this->cache->inCache('foo.txt'));
diff --git a/tests/lib/files/cache/updaterlegacy.php b/tests/lib/files/cache/updaterlegacy.php
index c80c3168ad6..d16a062fcca 100644
--- a/tests/lib/files/cache/updaterlegacy.php
+++ b/tests/lib/files/cache/updaterlegacy.php
@@ -29,6 +29,9 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
 	 */
 	private $cache;
 
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
 	private static $user;
 
 	public function setUp() {
@@ -51,7 +54,8 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
 		$this->scanner->scan('');
 		$this->cache = $this->storage->getCache();
 
-		\OC\Files\Filesystem::tearDown();
+		$this->originalStorage = Filesystem::getStorage('/');
+		Filesystem::tearDown();
 		if (!self::$user) {
 			self::$user = uniqid();
 		}
@@ -59,7 +63,7 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
 		\OC_User::createUser(self::$user, 'password');
 		\OC_User::setUserId(self::$user);
 
-		\OC\Files\Filesystem::init(self::$user, '/' . self::$user . '/files');
+		Filesystem::init(self::$user, '/' . self::$user . '/files');
 
 		Filesystem::clearMounts();
 		Filesystem::mount($this->storage, array(), '/' . self::$user . '/files');
@@ -74,6 +78,7 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
 		$result = \OC_User::deleteUser(self::$user);
 		$this->assertTrue($result);
 		Filesystem::tearDown();
+		Filesystem::mount($this->originalStorage, array(), '/');
 		// reset app files_encryption
 		if ($this->stateFilesEncryption) {
 			\OC_App::enable('files_encryption');
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index 22c11b9a4e0..0b04b9e7058 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -15,16 +15,27 @@ class Watcher extends \PHPUnit_Framework_TestCase {
 	 */
 	private $storages = array();
 
-	public function setUp() {
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
 		\OC\Files\Filesystem::clearMounts();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		foreach ($this->storages as $storage) {
 			$cache = $storage->getCache();
 			$ids = $cache->getAll();
 			$cache->clear();
 		}
+
+		\OC\Files\Filesystem::clearMounts();
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php
index b5dec107e79..8f29ed0bc63 100644
--- a/tests/lib/files/etagtest.php
+++ b/tests/lib/files/etagtest.php
@@ -11,7 +11,7 @@ namespace Test\Files;
 use OC\Files\Filesystem;
 use OCP\Share;
 
-class EtagTest extends \PHPUnit_Framework_TestCase {
+class EtagTest extends \Test\TestCase {
 	private $datadir;
 
 	private $tmpDir;
@@ -23,7 +23,12 @@ class EtagTest extends \PHPUnit_Framework_TestCase {
 	 */
 	private $userBackend;
 
-	public function setUp() {
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
+	protected function setUp() {
+		parent::setUp();
+
 		\OC_Hook::clear('OC_Filesystem', 'setup');
 		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
 		\OCP\Share::registerBackend('file', 'OC_Share_Backend_File');
@@ -37,13 +42,17 @@ class EtagTest extends \PHPUnit_Framework_TestCase {
 
 		$this->userBackend = new \OC_User_Dummy();
 		\OC_User::useBackend($this->userBackend);
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
 		\OC_Util::tearDownFS();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Config::setValue('datadirectory', $this->datadir);
 		\OC_User::setUserId($this->uid);
 		\OC_Util::setupFS($this->uid);
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+
+		parent::tearDown();
 	}
 
 	public function testNewUser() {
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 930a252bcb2..88e98fbb8c6 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -22,12 +22,15 @@
 
 namespace Test\Files;
 
-class Filesystem extends \PHPUnit_Framework_TestCase {
+class Filesystem extends \Test\TestCase {
 	/**
 	 * @var array tmpDirs
 	 */
 	private $tmpDirs = array();
 
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
 	/**
 	 * @return array
 	 */
@@ -37,19 +40,23 @@ class Filesystem extends \PHPUnit_Framework_TestCase {
 		return array('datadir' => $dir);
 	}
 
-	public function tearDown() {
+	protected function setUp() {
+		parent::setUp();
+
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
+		\OC_User::setUserId('');
+		\OC\Files\Filesystem::clearMounts();
+	}
+
+	protected function tearDown() {
 		foreach ($this->tmpDirs as $dir) {
 			\OC_Helper::rmdirr($dir);
 		}
 		\OC\Files\Filesystem::clearMounts();
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
 		\OC_User::setUserId('');
 	}
 
-	public function setUp() {
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::clearMounts();
-	}
-
 	public function testMount() {
 		\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', self::getStorageData(), '/');
 		$this->assertEquals('/', \OC\Files\Filesystem::getMountPoint('/'));
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
index 319f2f9f5f7..cde2eb22b7b 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/integration.php
@@ -20,6 +20,9 @@ class IntegrationTests extends \PHPUnit_Framework_TestCase {
 	 */
 	private $root;
 
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
 	/**
 	 * @var \OC\Files\Storage\Storage[]
 	 */
@@ -30,7 +33,10 @@ class IntegrationTests extends \PHPUnit_Framework_TestCase {
 	 */
 	private $view;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
 		\OC\Files\Filesystem::init('', '');
 		\OC\Files\Filesystem::clearMounts();
 		$manager = \OC\Files\Filesystem::getMountManager();
@@ -54,11 +60,15 @@ class IntegrationTests extends \PHPUnit_Framework_TestCase {
 		$this->root->mount($subStorage, '/substorage/');
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		foreach ($this->storages as $storage) {
 			$storage->getCache()->clear();
 		}
 		\OC\Files\Filesystem::clearMounts();
+
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+
+		parent::tearDown();
 	}
 
 	public function testBasicFile() {
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index 27b9b8dd4f4..db6a3fa7842 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -38,7 +38,23 @@ class TestScanner extends \OC\Files\Utils\Scanner {
 	}
 }
 
-class Scanner extends \PHPUnit_Framework_TestCase {
+
+class Scanner extends \Test\TestCase {
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
+	}
+
+	protected function tearDown() {
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+
+		parent::tearDown();
+	}
+
 	public function testReuseExistingRoot() {
 		$storage = new Temporary(array());
 		$mount = new Mount($storage, '');
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 931f5acd95a..f42308318d5 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -22,9 +22,15 @@ class View extends \PHPUnit_Framework_TestCase {
 	private $storages = array();
 	private $user;
 
+	/** @var \OC\Files\Storage\Storage */
 	private $tempStorage;
 
-	public function setUp() {
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
+	protected function setUp() {
+		parent::setUp();
+
 		\OC_User::clearBackends();
 		\OC_User::useBackend(new \OC_User_Dummy());
 
@@ -33,12 +39,13 @@ class View extends \PHPUnit_Framework_TestCase {
 		$this->user = \OC_User::getUser();
 		\OC_User::setUserId('test');
 
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
 		\OC\Files\Filesystem::clearMounts();
 
 		$this->tempStorage = null;
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_User::setUserId($this->user);
 		foreach ($this->storages as $storage) {
 			$cache = $storage->getCache();
@@ -49,6 +56,11 @@ class View extends \PHPUnit_Framework_TestCase {
 		if ($this->tempStorage && !\OC_Util::runningOnWindows()) {
 			system('rm -rf ' . escapeshellarg($this->tempStorage->getDataDir()));
 		}
+
+		\OC\Files\Filesystem::clearMounts();
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/helperstorage.php b/tests/lib/helperstorage.php
index 4fdd9dd6b9b..9f3bd8824f7 100644
--- a/tests/lib/helperstorage.php
+++ b/tests/lib/helperstorage.php
@@ -9,14 +9,22 @@
 /**
  * Test the storage functions of OC_Helper
  */
-class Test_Helper_Storage extends PHPUnit_Framework_TestCase {
+
+class Test_Helper_Storage extends \Test\TestCase {
+	/** @var string */
 	private $user;
+	/** @var \OC\Files\Storage\Storage */
 	private $storageMock;
+	/** @var \OC\Files\Storage\Storage */
+	private $storage;
+
+	protected function setUp() {
+		parent::setUp();
 
-	public function setUp() {
-		$this->user = 'user_' . uniqid();
+		$this->user = $this->getUniqueID('user_');
 		\OC_User::createUser($this->user, $this->user);
 
+		$this->storage = \OC\Files\Filesystem::getStorage('/');
 		\OC\Files\Filesystem::tearDown();
 		\OC_User::setUserId($this->user);
 		\OC\Files\Filesystem::init($this->user, '/' . $this->user . '/files');
@@ -25,7 +33,7 @@ class Test_Helper_Storage extends PHPUnit_Framework_TestCase {
 		$this->storageMock = null;
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->user = null;
 
 		if ($this->storageMock) {
@@ -33,10 +41,13 @@ class Test_Helper_Storage extends PHPUnit_Framework_TestCase {
 			$this->storageMock = null;
 		}
 		\OC\Files\Filesystem::tearDown();
+		\OC\Files\Filesystem::mount($this->storage, array(), '/');
 
 		\OC_User::setUserId('');
 		\OC_User::deleteUser($this->user);
 		\OC_Preferences::deleteUser($this->user);
+
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/migrate.php b/tests/lib/migrate.php
index c4442511e1f..3f87bbc1ac8 100644
--- a/tests/lib/migrate.php
+++ b/tests/lib/migrate.php
@@ -11,6 +11,28 @@ class Test_Migrate extends PHPUnit_Framework_TestCase {
 	public $users;
 	public $tmpfiles = array();
 
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
+	}
+
+	protected function tearDown() {
+		$u = new OC_User();
+		foreach($this->users as $user) {
+			$u->deleteUser($user);
+		}
+		foreach($this->tmpfiles as $file) {
+			\OC_Helper::rmdirr($file);
+		}
+
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+		parent::tearDown();
+	}
+
 	/**
 	 * Generates a test user and sets up their file system
 	 * @return string the test users id
@@ -73,18 +95,4 @@ class Test_Migrate extends PHPUnit_Framework_TestCase {
 		// Validate the export
 		$this->validateUserExport($user2, $user, json_decode($export)->data);
 	}
-
-	public function tearDown() {
-		$u = new OC_User();
-		foreach($this->users as $user) {
-			$u->deleteUser($user);
-		}
-		foreach($this->tmpfiles as $file) {
-			\OC_Helper::rmdirr($file);
-		}
-	}
-
-
-
-
 }
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 2febe524cba..288dd2aa417 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -8,7 +8,7 @@
 
 namespace Test;
 
-class Preview extends \PHPUnit_Framework_TestCase {
+class Preview extends \Test\TestCase {
 
 	/**
 	 * @var string
@@ -20,14 +20,34 @@ class Preview extends \PHPUnit_Framework_TestCase {
 	 */
 	private $rootView;
 
-	public function setUp() {
-		$this->user = $this->initFS();
+	/** @var \OC\Files\Storage\Storage */
+	private $originalStorage;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
+
+		// create a new user with his own filesystem view
+		// this gets called by each test in this test class
+		$this->user = $this->getUniqueID();
+		\OC_User::setUserId($this->user);
+		\OC\Files\Filesystem::init($this->user, '/' . $this->user . '/files');
+
+		\OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/');
 
 		$this->rootView = new \OC\Files\View('');
 		$this->rootView->mkdir('/'.$this->user);
 		$this->rootView->mkdir('/'.$this->user.'/files');
 	}
 
+	protected function tearDown() {
+		\OC\Files\Filesystem::clearMounts();
+		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
+
+		parent::tearDown();
+	}
+
 	public function testIsPreviewDeleted() {
 
 		$sampleFile = '/'.$this->user.'/files/test.txt';
@@ -184,16 +204,4 @@ class Preview extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals($this->user . '/' . \OC\Preview::THUMBNAILS_FOLDER . '/' . $fileId . '/150-150.png', $isCached);
 	}
 	*/
-
-	private function initFS() {
-		// create a new user with his own filesystem view
-		// this gets called by each test in this test class
-		$user=uniqid();
-		\OC_User::setUserId($user);
-		\OC\Files\Filesystem::init($user, '/'.$user.'/files');
-
-		\OC\Files\Filesystem::mount('OC\Files\Storage\Temporary', array(), '/');
-		
-		return $user;
-	}
 }
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 1b61446f4dc..6f92f487037 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -65,7 +65,9 @@ class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
 	}
 
 	public function testOC() {
+		$originalStorage = \OC\Files\Filesystem::getStorage('/');
 		\OC\Files\Filesystem::clearMounts();
+
 		$storage = new \OC\Files\Storage\Temporary(array());
 		$storage->file_put_contents('foo.txt', 'asd');
 		\OC\Files\Filesystem::mount($storage, array(), '/');
@@ -91,5 +93,8 @@ class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
 
 		unlink('oc:///foo.txt');
 		$this->assertEquals(array('.', '..', 'bar.txt'), scandir('oc:///'));
+
+		\OC\Files\Filesystem::clearMounts();
+		\OC\Files\Filesystem::mount($originalStorage, array(), '/');
 	}
 }
-- 
GitLab


From 8595b76df2fa5c0e536dd37456943162a154d4da Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 17 Nov 2014 13:10:15 +0100
Subject: [PATCH 428/616] Remove phpass and migrate to new Hasher interface

This PR removes phpass and migrates to the new Hasher interface.

Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
---
 3rdparty                                      |  2 +-
 .../lib/connector/publicauth.php              | 24 +++++++++++++----
 .../lib/controllers/sharecontroller.php       |  1 +
 apps/files_sharing/lib/helper.php             | 27 ++++++++++++++-----
 lib/base.php                                  |  3 +--
 lib/private/share/share.php                   |  4 +--
 6 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/3rdparty b/3rdparty
index 912a45c3458..dd0e7b6dcec 160000
--- a/3rdparty
+++ b/3rdparty
@@ -1 +1 @@
-Subproject commit 912a45c3458685a1105fba38a39a3a71c7348ed9
+Subproject commit dd0e7b6dcec142c790a6325b74a7c4fd3c6d7233
diff --git a/apps/files_sharing/lib/connector/publicauth.php b/apps/files_sharing/lib/connector/publicauth.php
index c9d545180b3..4144dafa379 100644
--- a/apps/files_sharing/lib/connector/publicauth.php
+++ b/apps/files_sharing/lib/connector/publicauth.php
@@ -48,12 +48,26 @@ class PublicAuth extends \Sabre\DAV\Auth\Backend\AbstractBasic {
 		if (isset($linkItem['share_with'])) {
 			if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_LINK) {
 				// Check Password
-				$forcePortable = (CRYPT_BLOWFISH != 1);
-				$hasher = new \PasswordHash(8, $forcePortable);
-				if (!$hasher->CheckPassword($password . $this->config->getSystemValue('passwordsalt', ''), $linkItem['share_with'])) {
-					return false;
-				} else {
+				$newHash = '';
+				if(\OC::$server->getHasher()->verify($password, $linkItem['share_with'], $newHash)) {
+					/**
+					 * FIXME: Migrate old hashes to new hash format
+					 * Due to the fact that there is no reasonable functionality to update the password
+					 * of an existing share no migration is yet performed there.
+					 * The only possibility is to update the existing share which will result in a new
+					 * share ID and is a major hack.
+					 *
+					 * In the future the migration should be performed once there is a proper method
+					 * to update the share's password. (for example `$share->updatePassword($password)`
+					 *
+					 * @link https://github.com/owncloud/core/issues/10671
+					 */
+					if(!empty($newHash)) {
+
+					}
 					return true;
+				} else {
+					return false;
 				}
 			} else {
 				return false;
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index a3d5b6d44a0..4c63d7d30ee 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -99,6 +99,7 @@ class ShareController extends Controller {
 
 	/**
 	 * @PublicPage
+	 * @UseSession
 	 *
 	 * Authenticates against password-protected shares
 	 * @param $token
diff --git a/apps/files_sharing/lib/helper.php b/apps/files_sharing/lib/helper.php
index 3a2d51cddb7..f7204a8db8f 100644
--- a/apps/files_sharing/lib/helper.php
+++ b/apps/files_sharing/lib/helper.php
@@ -3,7 +3,6 @@
 namespace OCA\Files_Sharing;
 
 use OC_Config;
-use PasswordHash;
 
 class Helper {
 
@@ -99,14 +98,28 @@ class Helper {
 		if ($password !== null) {
 			if ($linkItem['share_type'] == \OCP\Share::SHARE_TYPE_LINK) {
 				// Check Password
-				$forcePortable = (CRYPT_BLOWFISH != 1);
-				$hasher = new PasswordHash(8, $forcePortable);
-				if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''),
-											 $linkItem['share_with']))) {
-					return false;
-				} else {
+				$newHash = '';
+				if(\OC::$server->getHasher()->verify($password, $linkItem['share_with'], $newHash)) {
 					// Save item id in session for future requests
 					\OC::$server->getSession()->set('public_link_authenticated', $linkItem['id']);
+
+					/**
+					 * FIXME: Migrate old hashes to new hash format
+					 * Due to the fact that there is no reasonable functionality to update the password
+					 * of an existing share no migration is yet performed there.
+					 * The only possibility is to update the existing share which will result in a new
+					 * share ID and is a major hack.
+					 *
+					 * In the future the migration should be performed once there is a proper method
+					 * to update the share's password. (for example `$share->updatePassword($password)`
+					 *
+					 * @link https://github.com/owncloud/core/issues/10671
+					 */
+					if(!empty($newHash)) {
+
+					}
+				} else {
+					return false;
 				}
 			} else {
 				\OCP\Util::writeLog('share', 'Unknown share type '.$linkItem['share_type']
diff --git a/lib/base.php b/lib/base.php
index d365a4a306f..d7e4c379dbd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -464,8 +464,7 @@ class OC {
 		// setup 3rdparty autoloader
 		$vendorAutoLoad = OC::$THIRDPARTYROOT . '/3rdparty/autoload.php';
 		if (file_exists($vendorAutoLoad)) {
-			$loader = require_once $vendorAutoLoad;
-			$loader->add('PasswordHash', OC::$THIRDPARTYROOT . '/3rdparty/phpass');
+			require_once $vendorAutoLoad;
 		} else {
 			OC_Response::setStatus(OC_Response::STATUS_SERVICE_UNAVAILABLE);
 			OC_Template::printErrorPage('Composer autoloader not found, unable to continue.');
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b7b05dab8ef..0cd715c6dd1 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -627,9 +627,7 @@ class Share extends \OC\Share\Constants {
 
 				// Generate hash of password - same method as user passwords
 				if (!empty($shareWith)) {
-					$forcePortable = (CRYPT_BLOWFISH != 1);
-					$hasher = new \PasswordHash(8, $forcePortable);
-					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
+					$shareWith = \OC::$server->getHasher()->hash($shareWith);
 				} else {
 					// reuse the already set password, but only if we change permissions
 					// otherwise the user disabled the password protection
-- 
GitLab


From 8dbedbb8492f788154b0569ee630a3406d665a45 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 17 Nov 2014 11:11:19 +0100
Subject: [PATCH 429/616] Remove unused code

We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
---
 apps/files_sharing/appinfo/update.php | 120 ------------
 apps/files_sharing/tests/update.php   | 252 --------------------------
 apps/files_sharing/tests/updater.php  |   1 -
 3 files changed, 373 deletions(-)
 delete mode 100644 apps/files_sharing/appinfo/update.php
 delete mode 100644 apps/files_sharing/tests/update.php

diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
deleted file mode 100644
index e393b1575af..00000000000
--- a/apps/files_sharing/appinfo/update.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-
-$installedVersion = OCP\Config::getAppValue('files_sharing', 'installed_version');
-
-if (version_compare($installedVersion, '0.5', '<')) {
-	updateFilePermissions();
-}
-
-if (version_compare($installedVersion, '0.4', '<')) {
-	removeSharedFolder();
-}
-
-// clean up oc_share table from files which are no longer exists
-if (version_compare($installedVersion, '0.3.5.6', '<')) {
-	\OC\Files\Cache\Shared_Updater::fixBrokenSharesOnAppUpdate();
-}
-
-
-/**
- * it is no longer possible to share single files with delete permissions. User
- * should only be able to unshare single files but never to delete them.
- */
-function updateFilePermissions($chunkSize = 99) {
-	$query = OCP\DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `item_type` = ?');
-	$result = $query->execute(array('file'));
-
-	$updatedRows = array();
-
-	while ($row = $result->fetchRow()) {
-		if ($row['permissions'] & \OCP\PERMISSION_DELETE) {
-			$updatedRows[$row['id']] = (int)$row['permissions'] & ~\OCP\PERMISSION_DELETE;
-		}
-	}
-
-	$connection = \OC_DB::getConnection();
-	$chunkedPermissionList = array_chunk($updatedRows, $chunkSize, true);
-
-	foreach ($chunkedPermissionList as $subList) {
-		$statement = "UPDATE `*PREFIX*share` SET `permissions` = CASE `id` ";
-		//update share table
-		$ids = implode(',', array_keys($subList));
-		foreach ($subList as $id => $permission) {
-			$statement .= "WHEN " . $connection->quote($id, \PDO::PARAM_INT) . " THEN " . $permission . " ";
-		}
-		$statement .= ' END WHERE `id` IN (' . $ids . ')';
-
-		$query = OCP\DB::prepare($statement);
-		$query->execute();
-	}
-
-}
-
-/**
- * update script for the removal of the logical "Shared" folder, we create physical "Shared" folder and
- * update the users file_target so that it doesn't make any difference for the user
- * @note parameters are just for testing, please ignore them
- */
-function removeSharedFolder($mkdirs = true, $chunkSize = 99) {
-	$query = OCP\DB::prepare('SELECT * FROM `*PREFIX*share`');
-	$result = $query->execute();
-	$view = new \OC\Files\View('/');
-	$users = array();
-	$shares = array();
-	//we need to set up user backends
-	OC_User::useBackend(new OC_User_Database());
-	OC_Group::useBackend(new OC_Group_Database());
-	OC_App::loadApps(array('authentication'));
-	//we need to set up user backends, otherwise creating the shares will fail with "because user does not exist"
-	while ($row = $result->fetchRow()) {
-		//collect all user shares
-		if ((int)$row['share_type'] === 0 && ($row['item_type'] === 'file' || $row['item_type'] === 'folder')) {
-			$users[] = $row['share_with'];
-			$shares[$row['id']] = $row['file_target'];
-		} else if ((int)$row['share_type'] === 1 && ($row['item_type'] === 'file' || $row['item_type'] === 'folder')) {
-			//collect all group shares
-			$users = array_merge($users, \OC_group::usersInGroup($row['share_with']));
-			$shares[$row['id']] = $row['file_target'];
-		} else if ((int)$row['share_type'] === 2) {
-			$shares[$row['id']] = $row['file_target'];
-		}
-	}
-
-	$unique_users = array_unique($users);
-
-	if (!empty($unique_users) && !empty($shares)) {
-
-		// create folder Shared for each user
-
-		if ($mkdirs) {
-			foreach ($unique_users as $user) {
-				\OC\Files\Filesystem::initMountPoints($user);
-				if (!$view->file_exists('/' . $user . '/files/Shared')) {
-					$view->mkdir('/' . $user . '/files/Shared');
-				}
-			}
-		}
-
-		$chunkedShareList = array_chunk($shares, $chunkSize, true);
-		$connection = \OC_DB::getConnection();
-
-		foreach ($chunkedShareList as $subList) {
-
-			$statement = "UPDATE `*PREFIX*share` SET `file_target` = CASE `id` ";
-			//update share table
-			$ids = implode(',', array_keys($subList));
-			foreach ($subList as $id => $target) {
-				$statement .= "WHEN " . $connection->quote($id, \PDO::PARAM_INT) . " THEN " . $connection->quote('/Shared' . $target, \PDO::PARAM_STR);
-			}
-			$statement .= ' END WHERE `id` IN (' . $ids . ')';
-
-			$query = OCP\DB::prepare($statement);
-
-			$query->execute(array());
-		}
-
-		// set config to keep the Shared folder as the default location for new shares
-		\OCA\Files_Sharing\Helper::setShareFolder('/Shared');
-
-	}
-}
diff --git a/apps/files_sharing/tests/update.php b/apps/files_sharing/tests/update.php
deleted file mode 100644
index 583f607d9cb..00000000000
--- a/apps/files_sharing/tests/update.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Morris Jobke, Bjoern Schiessle
- * @copyright 2014 Morris Jobke <morris.jobke@gmail.com>
- *            2014 Bjoern Schiessle <schiessle@ownlcoud.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/>.
- *
- */
-
-require_once __DIR__ . '/../appinfo/update.php';
-
-/**
- * Class Test_Files_Sharing_Update
- */
-class Test_Files_Sharing_Update_Routine extends OCA\Files_Sharing\Tests\TestCase {
-
-	const TEST_FOLDER_NAME = '/folder_share_api_test';
-
-	function setUp() {
-		parent::setUp();
-
-		$this->folder = self::TEST_FOLDER_NAME;
-
-		$this->filename = '/share-api-test.txt';
-
-		// save file with content
-		$this->view->file_put_contents($this->filename, $this->data);
-		$this->view->mkdir($this->folder);
-		$this->view->file_put_contents($this->folder . '/' . $this->filename, $this->data);
-	}
-
-	function tearDown() {
-		$this->view->unlink($this->filename);
-		$this->view->deleteAll($this->folder);
-
-		$removeShares = \OC_DB::prepare('DELETE FROM `*PREFIX*share`');
-		$removeShares->execute();
-		$removeItems = \OC_DB::prepare('DELETE FROM `*PREFIX*filecache`');
-		$removeItems->execute();
-
-		parent::tearDown();
-	}
-
-	/**
-	 * test update of file permission. The update should remove from all shared
-	 * files the delete permission
-	 */
-	function testUpdateFilePermissions() {
-
-		self::prepareDBUpdateFilePermissions();
-		// run the update routine to update the share permission
-		updateFilePermissions(2);
-
-		// verify results
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`');
-		$result = $query->execute(array());
-
-		while ($row = $result->fetchRow()) {
-			if ($row['item_type'] === 'file') {
-				// for all files the delete permission should be removed
-				$this->assertSame(0, (int)$row['permissions'] & \OCP\PERMISSION_DELETE);
-			} else {
-				// for all other the permission shouldn't change
-				$this->assertSame(31, (int)$row['permissions'] & \OCP\PERMISSION_ALL);
-			}
-		}
-
-		// cleanup
-		$this->cleanupSharedTable();
-	}
-
-	/**
-	 * @medium
-	 */
-	function testRemoveBrokenFileShares() {
-
-		$this->prepareFileCache();
-
-		// check if there are just 4 shares (see setUp - precondition: empty table)
-		$countAllShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share`');
-		$result = $countAllShares->execute()->fetchOne();
-		$this->assertEquals(4, $result);
-
-		// check if there are just 3 file shares (see setUp - precondition: empty table)
-		$countFileShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share` WHERE `item_type` IN (\'file\', \'folder\')');
-		$result = $countFileShares->execute()->fetchOne();
-		$this->assertEquals(3, $result);
-
-		// check if there are just 2 items (see setUp - precondition: empty table)
-		$countItems = \OC_DB::prepare('SELECT COUNT(`fileid`) FROM `*PREFIX*filecache`');
-		$result = $countItems->execute()->fetchOne();
-		$this->assertEquals(2, $result);
-
-		// execute actual code which should be tested
-		\OC\Files\Cache\Shared_Updater::fixBrokenSharesOnAppUpdate();
-
-		// check if there are just 2 shares (one gets killed by the code as there is no filecache entry for this)
-		$result = $countFileShares->execute()->fetchOne();
-		$this->assertEquals(2, $result);
-
-		// check if the share of file '200' is removed as there is no entry for this in filecache table
-		$countFileShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share` WHERE `file_source` = 200');
-		$result = $countFileShares->execute()->fetchOne();
-		$this->assertEquals(0, $result);
-
-		// check if there are just 2 items
-		$countItems = \OC_DB::prepare('SELECT COUNT(`fileid`) FROM `*PREFIX*filecache`');
-		$result = $countItems->execute()->fetchOne();
-		$this->assertEquals(2, $result);
-
-		// the calendar share survived
-		$countOtherShares = \OC_DB::prepare('SELECT COUNT(`id`) FROM `*PREFIX*share` WHERE `item_source` = \'999\'');
-		$result = $countOtherShares->execute()->fetchOne();
-		$this->assertEquals(1, $result);
-	}
-
-	/**
-	 * test update for the removal of the logical "Shared" folder. It should update
-	 * the file_target for every share and create a physical "Shared" folder for each user
-	 */
-	function testRemoveSharedFolder() {
-		self::prepareDB();
-		// run the update routine to remove the shared folder and replace it with a real folder
-		removeSharedFolder(false, 2);
-
-		// verify results
-		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share`');
-		$result = $query->execute(array());
-
-		$newDBContent = $result->fetchAll();
-
-		foreach ($newDBContent as $row) {
-			if ((int)$row['share_type'] === \OCP\Share::SHARE_TYPE_USER) {
-				$this->assertSame('/Shared', substr($row['file_target'], 0, strlen('/Shared')));
-			} else {
-				$this->assertSame('/ShouldNotChange', $row['file_target']);
-			}
-		}
-
-		$shareFolder = \OCP\Config::getSystemValue('share_folder', '/');
-
-		$this->assertSame('/Shared', $shareFolder);
-
-		// cleanup
-		$this->cleanupSharedTable();
-		\OCP\Config::deleteSystemValue('share_folder');
-
-	}
-
-	private function cleanupSharedTable() {
-		$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share`');
-		$query->execute();
-	}
-
-	/**
-	 * prepare sharing table for testRemoveSharedFolder()
-	 */
-	private function prepareDB() {
-		$this->cleanupSharedTable();
-		// add items except one - because this is the test case for the broken share table
-		$addItems = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`share_type`, `item_type`, ' .
-			'`share_with`, `uid_owner` , `file_target`) ' .
-			'VALUES (?, ?, ?, ?, ?)');
-		$items = array(
-			array(\OCP\Share::SHARE_TYPE_USER, 'file', 'user1', 'admin' , '/foo'),
-			array(\OCP\Share::SHARE_TYPE_USER, 'folder', 'user2', 'admin', '/foo2'),
-			array(\OCP\Share::SHARE_TYPE_USER, 'file', 'user3', 'admin', '/foo3'),
-			array(\OCP\Share::SHARE_TYPE_USER, 'folder', 'user4', 'admin', '/foo4'),
-			array(\OCP\Share::SHARE_TYPE_USER, 'folder', 'user4', 'admin', "/foo'4"),
-			array(\OCP\Share::SHARE_TYPE_LINK, 'file', 'user1', 'admin', '/ShouldNotChange'),
-			array(\OCP\Share::SHARE_TYPE_CONTACT, 'contact', 'admin', 'user1', '/ShouldNotChange'),
-
-			);
-		foreach($items as $item) {
-			// the number is used as path_hash
-			$addItems->execute($item);
-		}
-	}
-
-	/**
-	 * prepare sharing table for testUpdateFilePermissions()
-	 */
-	private function prepareDBUpdateFilePermissions() {
-		$this->cleanupSharedTable();
-		// add items except one - because this is the test case for the broken share table
-		$addItems = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`share_type`, `item_type`, ' .
-			'`share_with`, `uid_owner` , `file_target`, `permissions`) ' .
-			'VALUES (?, ?, ?, ?, ?, ?)');
-		$items = array(
-			array(\OCP\Share::SHARE_TYPE_LINK, 'file', 'user1', 'admin', '/foo', \OCP\PERMISSION_ALL),
-			array(\OCP\Share::SHARE_TYPE_CONTACT, 'contact', 'admin', 'user1', '/foo', \OCP\PERMISSION_ALL),
-			array(\OCP\Share::SHARE_TYPE_USER, 'folder', 'user4', 'admin', '/foo', \OCP\PERMISSION_ALL),
-			array(\OCP\Share::SHARE_TYPE_USER, 'file', 'user3', 'admin', '/foo3', \OCP\PERMISSION_ALL),
-			array(\OCP\Share::SHARE_TYPE_USER, 'file', 'user1', 'admin' , '/foo', \OCP\PERMISSION_DELETE),
-			array(\OCP\Share::SHARE_TYPE_USER, 'file', 'user1', 'admin' , '/foo', \OCP\PERMISSION_READ & \OCP\PERMISSION_DELETE),
-			array(\OCP\Share::SHARE_TYPE_USER, 'file', 'user1', 'admin' , '/foo', \OCP\PERMISSION_SHARE & \OCP\PERMISSION_UPDATE),
-			array(\OCP\Share::SHARE_TYPE_USER, 'file', 'user1', 'admin' , '/foo', \OCP\PERMISSION_ALL),
-			array(\OCP\Share::SHARE_TYPE_USER, 'file', 'user1', 'admin' , '/foo', \OCP\PERMISSION_SHARE & \OCP\PERMISSION_READ & \OCP\PERMISSION_DELETE),
-			);
-		foreach($items as $item) {
-			// the number is used as path_hash
-			$addItems->execute($item);
-		}
-	}
-
-	/**
-	 * prepare file cache for testRemoveBrokenShares()
-	 */
-	private function prepareFileCache() {
-		// some previous tests didn't clean up and therefore this has to be done here
-		// FIXME: DIRTY HACK - TODO: find tests, that don't clean up and fix it there
-		$this->tearDown();
-
-		// add items except one - because this is the test case for the broken share table
-		$addItems = \OC_DB::prepare('INSERT INTO `*PREFIX*filecache` (`storage`, `path_hash`, ' .
-			'`parent`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`) ' .
-			'VALUES (1, ?, 1, 1, 1, 1, 1, 1)');
-		$items = array(1, 3);
-		$fileIds = array();
-		foreach($items as $item) {
-			// the number is used as path_hash
-			$addItems->execute(array($item));
-			$fileIds[] = \OC_DB::insertId('*PREFIX*filecache');
-		}
-
-		$addShares = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`file_source`, `item_type`, `uid_owner`) VALUES (?, \'file\', 1)');
-		// the number is used as item_source
-		$addShares->execute(array($fileIds[0]));
-		$addShares->execute(array(200)); // id of "deleted" file
-		$addShares->execute(array($fileIds[1]));
-
-		// add a few unrelated shares, calendar share that must be left untouched
-		$addShares = \OC_DB::prepare('INSERT INTO `*PREFIX*share` (`item_source`, `item_type`, `uid_owner`) VALUES (?, \'calendar\', 1)');
-		// the number is used as item_source
-		$addShares->execute(array(999));
-	}
-
-}
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 07349c1334d..861516dff7f 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -20,7 +20,6 @@
  *
  */
 
-require_once __DIR__ . '/../appinfo/update.php';
 
 /**
  * Class Test_Files_Sharing_Updater
-- 
GitLab


From 07f0d76fc6a384e953b03770535246bac4fce849 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 17 Nov 2014 15:10:47 +0100
Subject: [PATCH 430/616] Move CSRF check Because we're closing the session now
 before controllers are executed there are cases where we cannot write the
 session.

---
 .../appframework/middleware/security/securitymiddleware.php    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/private/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
index 0a694318634..8c5ca5891ad 100644
--- a/lib/private/appframework/middleware/security/securitymiddleware.php
+++ b/lib/private/appframework/middleware/security/securitymiddleware.php
@@ -35,6 +35,7 @@ use OCP\IURLGenerator;
 use OCP\IRequest;
 use OCP\ILogger;
 use OCP\AppFramework\Controller;
+use OCP\Util;
 
 
 /**
@@ -111,6 +112,8 @@ class SecurityMiddleware extends Middleware {
 			}
 		}
 
+		// CSRF check - also registers the CSRF token since the session may be closed later
+		Util::callRegister();
 		if(!$this->reflector->hasAnnotation('NoCSRFRequired')) {
 			if(!$this->request->passesCSRFCheck()) {
 				throw new SecurityException('CSRF check failed', Http::STATUS_PRECONDITION_FAILED);
-- 
GitLab


From 7cb12d4bff80e91cb844b9ed0021c290455279ee Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 4 Sep 2014 15:23:55 +0200
Subject: [PATCH 431/616] Add sabredav plugin to check if a user has access to
 an app

---
 .../connector/sabre/appenabledplugin.php      | 75 +++++++++++++++++++
 public.php                                    |  4 +-
 remote.php                                    |  4 +-
 3 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 lib/private/connector/sabre/appenabledplugin.php

diff --git a/lib/private/connector/sabre/appenabledplugin.php b/lib/private/connector/sabre/appenabledplugin.php
new file mode 100644
index 00000000000..73fed948f9b
--- /dev/null
+++ b/lib/private/connector/sabre/appenabledplugin.php
@@ -0,0 +1,75 @@
+<?php
+
+/**
+ * Copyright (c) 2014 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 OC\Connector\Sabre;
+
+use OCP\App\IManager;
+use Sabre\DAV\Exception\Forbidden;
+use Sabre\DAV\ServerPlugin;
+
+/**
+ * Plugin to check if an app is enabled for the current user
+ */
+class AppEnabledPlugin extends ServerPlugin {
+
+	/**
+	 * Reference to main server object
+	 *
+	 * @var \Sabre\DAV\Server
+	 */
+	private $server;
+
+	/**
+	 * @var string
+	 */
+	private $app;
+
+	/**
+	 * @var \OCP\App\IManager
+	 */
+	private $appManager;
+
+	/**
+	 * @param string $app
+	 * @param \OCP\App\IManager $appManager
+	 */
+	public function __construct($app, IManager $appManager) {
+		$this->app = $app;
+		$this->appManager = $appManager;
+	}
+
+	/**
+	 * This initializes the plugin.
+	 *
+	 * This function is called by \Sabre\DAV\Server, after
+	 * addPlugin is called.
+	 *
+	 * This method should set up the required event subscriptions.
+	 *
+	 * @param \Sabre\DAV\Server $server
+	 * @return void
+	 */
+	public function initialize(\Sabre\DAV\Server $server) {
+
+		$this->server = $server;
+		$this->server->subscribeEvent('beforeMethod', array($this, 'checkAppEnabled'), 30);
+	}
+
+	/**
+	 * This method is called before any HTTP after auth and checks if the user has access to the app
+	 *
+	 * @throws \Sabre\DAV\Exception\Forbidden
+	 * @return bool
+	 */
+	public function checkAppEnabled() {
+		if (!$this->appManager->isEnabledForUser($this->app)) {
+			throw new Forbidden();
+		}
+	}
+}
diff --git a/public.php b/public.php
index 0e04db66da7..c5c227ef460 100644
--- a/public.php
+++ b/public.php
@@ -37,7 +37,9 @@ try {
 	OC_App::loadApps(array('authentication'));
 	OC_App::loadApps(array('filesystem', 'logging'));
 
-	OC_Util::checkAppEnabled($app);
+	if (!\OC::$server->getAppManager()->isInstalled($app)) {
+		throw new Exception('App not installed: ' . $app);
+	}
 	OC_App::loadApp($app);
 	OC_User::setIncognitoMode(true);
 
diff --git a/remote.php b/remote.php
index d854b1d65a6..7993566afec 100644
--- a/remote.php
+++ b/remote.php
@@ -43,7 +43,9 @@ try {
 			$file =  OC::$SERVERROOT .'/'. $file;
 			break;
 		default:
-			OC_Util::checkAppEnabled($app);
+			if (!\OC::$server->getAppManager()->isInstalled($app)) {
+				throw new Exception('App not installed: ' . $app);
+			}
 			OC_App::loadApp($app);
 			$file = OC_App::getAppPath($app) .'/'. $parts[1];
 			break;
-- 
GitLab


From 806284f06c9689449fc6b118bc9478843a9472ec Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 17 Nov 2014 16:52:45 +0100
Subject: [PATCH 432/616] Refactor tests to use a dataProvider method

---
 tests/lib/files/filesystem.php | 135 ++++++++++++++++++---------------
 1 file changed, 73 insertions(+), 62 deletions(-)

diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 88e98fbb8c6..447c2717dbb 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -75,71 +75,82 @@ class Filesystem extends \Test\TestCase {
 		$this->assertEquals('folder', $internalPath);
 	}
 
-	public function testNormalize() {
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath(''));
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath('/'));
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath('/', false));
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath('//'));
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath('//', false));
-		$this->assertEquals('/path', \OC\Files\Filesystem::normalizePath('/path/'));
-		$this->assertEquals('/path/', \OC\Files\Filesystem::normalizePath('/path/', false));
-		$this->assertEquals('/path', \OC\Files\Filesystem::normalizePath('path'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo//bar/'));
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::normalizePath('/foo//bar/', false));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo////bar'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo/////bar'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo/bar/.'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo/bar/./'));
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::normalizePath('/foo/bar/./', false));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo/bar/./.'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo/bar/././'));
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::normalizePath('/foo/bar/././', false));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('/foo/./bar/'));
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::normalizePath('/foo/./bar/', false));
-		$this->assertEquals('/foo/.bar', \OC\Files\Filesystem::normalizePath('/foo/.bar/'));
-		$this->assertEquals('/foo/.bar/', \OC\Files\Filesystem::normalizePath('/foo/.bar/', false));
-		$this->assertEquals('/foo/.bar/tee', \OC\Files\Filesystem::normalizePath('/foo/.bar/tee'));
-
-		// normalize does not resolve '..' (by design)
-		$this->assertEquals('/foo/..', \OC\Files\Filesystem::normalizePath('/foo/../'));
-
-		if (class_exists('Patchwork\PHP\Shim\Normalizer')) {
-			$this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("/foo/baru\xCC\x88"));
-		}
+	public function normalizePathData() {
+		return array(
+			array('/', ''),
+			array('/', '/'),
+			array('/', '//'),
+			array('/', '/', false),
+			array('/', '//', false),
+
+			array('/path', '/path/'),
+			array('/path/', '/path/', false),
+			array('/path', 'path'),
+
+			array('/foo/bar', '/foo//bar/'),
+			array('/foo/bar/', '/foo//bar/', false),
+			array('/foo/bar', '/foo////bar'),
+			array('/foo/bar', '/foo/////bar'),
+			array('/foo/bar', '/foo/bar/.'),
+			array('/foo/bar', '/foo/bar/./'),
+			array('/foo/bar/', '/foo/bar/./', false),
+			array('/foo/bar', '/foo/bar/./.'),
+			array('/foo/bar', '/foo/bar/././'),
+			array('/foo/bar/', '/foo/bar/././', false),
+			array('/foo/bar', '/foo/./bar/'),
+			array('/foo/bar/', '/foo/./bar/', false),
+			array('/foo/.bar', '/foo/.bar/'),
+			array('/foo/.bar/', '/foo/.bar/', false),
+			array('/foo/.bar/tee', '/foo/.bar/tee'),
+
+			// Windows paths
+			array('/', ''),
+			array('/', '\\'),
+			array('/', '\\', false),
+			array('/', '\\\\'),
+			array('/', '\\\\', false),
+
+			array('/path', '\\path'),
+			array('/path', '\\path', false),
+			array('/path', '\\path\\'),
+			array('/path/', '\\path\\', false),
+
+			array('/foo/bar', '\\foo\\\\bar\\'),
+			array('/foo/bar/', '\\foo\\\\bar\\', false),
+			array('/foo/bar', '\\foo\\\\\\\\bar'),
+			array('/foo/bar', '\\foo\\\\\\\\\\bar'),
+			array('/foo/bar', '\\foo\\bar\\.'),
+			array('/foo/bar', '\\foo\\bar\\.\\'),
+			array('/foo/bar/', '\\foo\\bar\\.\\', false),
+			array('/foo/bar', '\\foo\\bar\\.\\.'),
+			array('/foo/bar', '\\foo\\bar\\.\\.\\'),
+			array('/foo/bar/', '\\foo\\bar\\.\\.\\', false),
+			array('/foo/bar', '\\foo\\.\\bar\\'),
+			array('/foo/bar/', '\\foo\\.\\bar\\', false),
+			array('/foo/.bar', '\\foo\\.bar\\'),
+			array('/foo/.bar/', '\\foo\\.bar\\', false),
+			array('/foo/.bar/tee', '\\foo\\.bar\\tee'),
+
+			// normalize does not resolve '..' (by design)
+			array('/foo/..', '/foo/../'),
+			array('/foo/..', '\\foo\\..\\'),
+		);
 	}
 
-	public function testNormalizeWindowsPaths() {
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath(''));
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath('\\'));
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath('\\', false));
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath('\\\\'));
-		$this->assertEquals('/', \OC\Files\Filesystem::normalizePath('\\\\', false));
-		$this->assertEquals('/path', \OC\Files\Filesystem::normalizePath('\\path'));
-		$this->assertEquals('/path', \OC\Files\Filesystem::normalizePath('\\path', false));
-		$this->assertEquals('/path', \OC\Files\Filesystem::normalizePath('\\path\\'));
-		$this->assertEquals('/path/', \OC\Files\Filesystem::normalizePath('\\path\\', false));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('\\foo\\\\bar\\'));
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::normalizePath('\\foo\\\\bar\\', false));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('\\foo\\\\\\\\bar'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('\\foo\\\\\\\\\\bar'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('\\foo\\bar\\.'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('\\foo\\bar\\.\\'));
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::normalizePath('\\foo\\bar\\.\\', false));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('\\foo\\bar\\.\\.'));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('\\foo\\bar\\.\\.\\'));
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::normalizePath('\\foo\\bar\\.\\.\\', false));
-		$this->assertEquals('/foo/bar', \OC\Files\Filesystem::normalizePath('\\foo\\.\\bar\\'));
-		$this->assertEquals('/foo/bar/', \OC\Files\Filesystem::normalizePath('\\foo\\.\\bar\\', false));
-		$this->assertEquals('/foo/.bar', \OC\Files\Filesystem::normalizePath('\\foo\\.bar\\'));
-		$this->assertEquals('/foo/.bar/', \OC\Files\Filesystem::normalizePath('\\foo\\.bar\\', false));
-		$this->assertEquals('/foo/.bar/tee', \OC\Files\Filesystem::normalizePath('\\foo\\.bar\\tee'));
-
-		// normalize does not resolve '..' (by design)
-		$this->assertEquals('/foo/..', \OC\Files\Filesystem::normalizePath('\\foo\\..\\'));
-
-		if (class_exists('Patchwork\PHP\Shim\Normalizer')) {
-			$this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("\\foo\\baru\xCC\x88"));
+	/**
+	 * @dataProvider normalizePathData
+	 */
+	public function testNormalizePath($expected, $path, $stripTrailingSlash = true, $isAbsolutePath = false) {
+		$this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash, $isAbsolutePath));
+	}
+
+	public function testNormalizePathUTF8() {
+		if (!class_exists('Patchwork\PHP\Shim\Normalizer')) {
+			$this->markTestSkipped('UTF8 normalizer Patchwork was not found');
 		}
+
+		$this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("/foo/baru\xCC\x88"));
+		$this->assertEquals("/foo/bar\xC3\xBC", \OC\Files\Filesystem::normalizePath("\\foo\\baru\xCC\x88"));
 	}
 
 	public function testHooks() {
-- 
GitLab


From ccc100113803ec82fc2eab7c62620e2b3a4c7df6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 17 Nov 2014 16:57:15 +0100
Subject: [PATCH 433/616] Add tests for absolute paths on windows

---
 tests/lib/files/filesystem.php | 34 ++++++++++++++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 447c2717dbb..f24d86b212d 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -131,6 +131,14 @@ class Filesystem extends \Test\TestCase {
 			array('/foo/.bar/', '\\foo\\.bar\\', false),
 			array('/foo/.bar/tee', '\\foo\\.bar\\tee'),
 
+			// Absolute windows paths NOT marked as absolute
+			array('/C:', 'C:\\'),
+			array('/C:/', 'C:\\', false),
+			array('/C:/tests', 'C:\\tests'),
+			array('/C:/tests', 'C:\\tests', false),
+			array('/C:/tests', 'C:\\tests\\'),
+			array('/C:/tests/', 'C:\\tests\\', false),
+
 			// normalize does not resolve '..' (by design)
 			array('/foo/..', '/foo/../'),
 			array('/foo/..', '\\foo\\..\\'),
@@ -140,8 +148,30 @@ class Filesystem extends \Test\TestCase {
 	/**
 	 * @dataProvider normalizePathData
 	 */
-	public function testNormalizePath($expected, $path, $stripTrailingSlash = true, $isAbsolutePath = false) {
-		$this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash, $isAbsolutePath));
+	public function testNormalizePath($expected, $path, $stripTrailingSlash = true) {
+		$this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash));
+	}
+
+	public function normalizePathWindowsAbsolutePathData() {
+		return array(
+			array('C:/', 'C:\\'),
+			array('C:/', 'C:\\', false),
+			array('C:/tests', 'C:\\tests'),
+			array('C:/tests', 'C:\\tests', false),
+			array('C:/tests', 'C:\\tests\\'),
+			array('C:/tests/', 'C:\\tests\\', false),
+		);
+	}
+
+	/**
+	 * @dataProvider normalizePathWindowsAbsolutePathData
+	 */
+	public function testNormalizePathWindowsAbsolutePath($expected, $path, $stripTrailingSlash = true) {
+		if (!\OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('This test is Windows only');
+		}
+
+		$this->assertEquals($expected, \OC\Files\Filesystem::normalizePath($path, $stripTrailingSlash, true));
 	}
 
 	public function testNormalizePathUTF8() {
-- 
GitLab


From 1b50d4f7ceb92fffe0d38f823f175cf7e419c69e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 20 Oct 2014 19:05:48 +0200
Subject: [PATCH 434/616] Warn for password reset when files_encryption is
 enabled

This patch wil warn the user of the consequences when resetting the password and requires checking a checkbox (as we had in the past) to reset a password.

Furthermore I updated the code to use our new classes and added some unit tests for it :dancers:

Fixes https://github.com/owncloud/core/issues/11438
---
 core/application.php                          |  64 ++++--
 core/js/lostpassword.js                       |  19 +-
 .../controller/lostcontroller.php             | 164 +++++++--------
 core/lostpassword/encrypteddataexception.php  |  14 --
 core/lostpassword/templates/lostpassword.php  |  20 --
 core/lostpassword/templates/resetpassword.php |   9 +-
 .../controller/lostcontrollertest.php         | 195 ++++++++++++++++++
 tests/phpunit-autotest.xml                    |   1 +
 tests/phpunit.xml.dist                        |   2 +
 .../controller/mailsettingscontrollertest.php |   2 +-
 10 files changed, 341 insertions(+), 149 deletions(-)
 delete mode 100644 core/lostpassword/encrypteddataexception.php
 delete mode 100644 core/lostpassword/templates/lostpassword.php
 create mode 100644 tests/core/lostpassword/controller/lostcontrollertest.php

diff --git a/core/application.php b/core/application.php
index 33801847758..c36ab559c27 100644
--- a/core/application.php
+++ b/core/application.php
@@ -10,13 +10,22 @@
 
 namespace OC\Core;
 
+use OC\AppFramework\Utility\SimpleContainer;
 use \OCP\AppFramework\App;
 use OC\Core\LostPassword\Controller\LostController;
 use OC\Core\User\UserController;
+use \OCP\Util;
 
+/**
+ * Class Application
+ *
+ * @package OC\Core
+ */
 class Application extends App {
 
-
+	/**
+	 * @param array $urlParams
+	 */
 	public function __construct(array $urlParams=array()){
 		parent::__construct('core', $urlParams);
 
@@ -25,29 +34,56 @@ class Application extends App {
 		/**
 		 * Controllers
 		 */
-		$container->registerService('LostController', function($c) {
+		$container->registerService('LostController', function(SimpleContainer $c) {
 			return new LostController(
 				$c->query('AppName'),
 				$c->query('Request'),
-				$c->query('ServerContainer')->getURLGenerator(),
-				$c->query('ServerContainer')->getUserManager(),
-				new \OC_Defaults(),
-				$c->query('ServerContainer')->getL10N('core'),
-				$c->query('ServerContainer')->getConfig(),
-				$c->query('ServerContainer')->getUserSession(),
-				\OCP\Util::getDefaultEmailAddress('lostpassword-noreply'),
-				\OC_App::isEnabled('files_encryption')
+				$c->query('URLGenerator'),
+				$c->query('UserManager'),
+				$c->query('Defaults'),
+				$c->query('L10N'),
+				$c->query('Config'),
+				$c->query('SecureRandom'),
+				$c->query('DefaultEmailAddress'),
+				$c->query('IsEncryptionEnabled')
 			);
 		});
-		$container->registerService('UserController', function($c) {
+		$container->registerService('UserController', function(SimpleContainer $c) {
 			return new UserController(
 				$c->query('AppName'),
 				$c->query('Request'),
-				$c->query('ServerContainer')->getUserManager(),
-				new \OC_Defaults()
+				$c->query('UserManager'),
+				$c->query('Defaults')
 			);
 		});
-	}
 
+		/**
+		 * Core class wrappers
+		 */
+		$container->registerService('IsEncryptionEnabled', function() {
+			return \OC_App::isEnabled('files_encryption');
+		});
+		$container->registerService('URLGenerator', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getURLGenerator();
+		});
+		$container->registerService('UserManager', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getUserManager();
+		});
+		$container->registerService('Config', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getConfig();
+		});
+		$container->registerService('L10N', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getL10N('core');
+		});
+		$container->registerService('SecureRandom', function(SimpleContainer $c) {
+			return $c->query('ServerContainer')->getSecureRandom();
+		});
+		$container->registerService('Defaults', function() {
+			return new \OC_Defaults;
+		});
+		$container->registerService('DefaultEmailAddress', function() {
+			return Util::getDefaultEmailAddress('lostpassword-noreply');
+		});
+	}
 
 }
diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index ad221cb30fc..aa1a864ffed 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -8,19 +8,12 @@ OC.Lostpassword = {
 			+ ('<br /><input type="checkbox" id="encrypted-continue" value="Yes" />')
 			+ '<label for="encrypted-continue">'
 			+ t('core', 'I know what I\'m doing')
-			+ '</label><br />'
-			+ '<a id="lost-password-encryption" href>'
-			+ t('core', 'Reset password')
-			+ '</a>',
+			+ '</label><br />',
 
 	resetErrorMsg : t('core', 'Password can not be changed. Please contact your administrator.'),
 
 	init : function() {
-		if ($('#lost-password-encryption').length){
-			$('#lost-password-encryption').click(OC.Lostpassword.sendLink);
-		} else {
-			$('#lost-password').click(OC.Lostpassword.sendLink);
-		}
+		$('#lost-password').click(OC.Lostpassword.sendLink);
 		$('#reset-password #submit').click(OC.Lostpassword.resetPassword);
 	},
 
@@ -32,8 +25,7 @@ OC.Lostpassword = {
 			$.post(
 					OC.generateUrl('/lostpassword/email'),
 					{
-						user : $('#user').val(),
-						proceed: $('#encrypted-continue').attr('checked') ? 'Yes' : 'No'
+						user : $('#user').val()
 					},
 					OC.Lostpassword.sendLinkDone
 			);
@@ -84,7 +76,8 @@ OC.Lostpassword = {
 			$.post(
 					$('#password').parents('form').attr('action'),
 					{
-						password : $('#password').val()
+						password : $('#password').val(),
+						proceed: $('#encrypted-continue').attr('checked') ? 'true' : 'false'
 					},
 					OC.Lostpassword.resetDone
 			);
@@ -126,7 +119,7 @@ OC.Lostpassword = {
 
 	getResetStatusNode : function (){
 		if (!$('#lost-password').length){
-			$('<p id="lost-password"></p>').insertAfter($('#submit'));
+			$('<p id="lost-password"></p>').insertBefore($('#reset-password fieldset'));
 		} else {
 			$('#lost-password').replaceWith($('<p id="lost-password"></p>'));
 		}
diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index e4d51fde077..a1a683baa70 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -9,68 +9,72 @@
 namespace OC\Core\LostPassword\Controller;
 
 use \OCP\AppFramework\Controller;
-use \OCP\AppFramework\Http\JSONResponse;
 use \OCP\AppFramework\Http\TemplateResponse;
 use \OCP\IURLGenerator;
 use \OCP\IRequest;
 use \OCP\IL10N;
 use \OCP\IConfig;
-use \OCP\IUserSession;
+use OCP\IUserManager;
 use \OC\Core\LostPassword\EncryptedDataException;
+use OCP\Security\ISecureRandom;
+use \OC_Defaults;
+use OCP\Security\StringUtils;
 
+/**
+ * Class LostController
+ *
+ * @package OC\Core\LostPassword\Controller
+ */
 class LostController extends Controller {
 
-	/**
-	 * @var \OCP\IURLGenerator
-	 */
+	/** @var IURLGenerator */
 	protected $urlGenerator;
-
-	/**
-	 * @var \OCP\IUserManager
-	 */
+	/** @var IUserManager */
 	protected $userManager;
-
-	/**
-	 * @var \OC_Defaults
-	 */
+	/** @var OC_Defaults */
 	protected $defaults;
-
-	/**
-	 * @var IL10N
-	 */
+	/** @var IL10N */
 	protected $l10n;
+	/** @var string */
 	protected $from;
+	/** @var bool */
 	protected $isDataEncrypted;
-
-	/**
-	 * @var IConfig
-	 */
+	/** @var IConfig */
 	protected $config;
+	/** @var ISecureRandom */
+	protected $secureRandom;
 
 	/**
-	 * @var IUserSession
+	 * @param string $appName
+	 * @param IRequest $request
+	 * @param IURLGenerator $urlGenerator
+	 * @param $userManager
+	 * @param $defaults
+	 * @param IL10N $l10n
+	 * @param IConfig $config
+	 * @param ISecureRandom $secureRandom
+	 * @param $from
+	 * @param $isDataEncrypted
 	 */
-	protected $userSession;
-
 	public function __construct($appName,
-	                            IRequest $request,
-	                            IURLGenerator $urlGenerator,
-	                            $userManager,
-	                            $defaults,
-	                            IL10N $l10n,
-	                            IConfig $config,
-	                            IUserSession $userSession,
-	                            $from,
-	                            $isDataEncrypted) {
+								IRequest $request,
+								IURLGenerator $urlGenerator,
+								IUserManager $userManager,
+								OC_Defaults $defaults,
+								IL10N $l10n,
+								IConfig $config,
+								ISecureRandom $secureRandom,
+								$from,
+								$isDataEncrypted) {
 		parent::__construct($appName, $request);
 		$this->urlGenerator = $urlGenerator;
 		$this->userManager = $userManager;
 		$this->defaults = $defaults;
 		$this->l10n = $l10n;
+		$this->secureRandom = $secureRandom;
 		$this->from = $from;
 		$this->isDataEncrypted = $isDataEncrypted;
 		$this->config = $config;
-		$this->userSession = $userSession;
 	}
 
 	/**
@@ -81,23 +85,31 @@ class LostController extends Controller {
 	 *
 	 * @param string $token
 	 * @param string $userId
+	 * @return TemplateResponse
 	 */
 	public function resetform($token, $userId) {
 		return new TemplateResponse(
 			'core/lostpassword',
 			'resetpassword',
 			array(
-				'isEncrypted' => $this->isDataEncrypted,
-				'link' => $this->getLink('core.lost.setPassword', $userId, $token),
+				'link' => $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $userId, 'token' => $token)),
 			),
 			'guest'
 		);
 	}
 
+	/**
+	 * @param $message
+	 * @param array $additional
+	 * @return array
+	 */
 	private function error($message, array $additional=array()) {
 		return array_merge(array('status' => 'error', 'msg' => $message), $additional);
 	}
 
+	/**
+	 * @return array
+	 */
 	private function success() {
 		return array('status'=>'success');
 	}
@@ -106,14 +118,12 @@ class LostController extends Controller {
 	 * @PublicPage
 	 *
 	 * @param string $user
-	 * @param bool $proceed
+	 * @return array
 	 */
-	public function email($user, $proceed){
+	public function email($user){
 		// FIXME: use HTTP error codes
 		try {
-			$this->sendEmail($user, $proceed);
-		} catch (EncryptedDataException $e){
-			return $this->error('', array('encryption' => '1'));
+			$this->sendEmail($user);
 		} catch (\Exception $e){
 			return $this->error($e->getMessage());
 		}
@@ -121,15 +131,23 @@ class LostController extends Controller {
 		return $this->success();
 	}
 
-
 	/**
 	 * @PublicPage
+	 * @param string $token
+	 * @param string $userId
+	 * @param string $password
+	 * @param boolean $proceed
+	 * @return array
 	 */
-	public function setPassword($token, $userId, $password) {
+	public function setPassword($token, $userId, $password, $proceed) {
+		if ($this->isDataEncrypted && !$proceed){
+			return $this->error('', array('encryption' => true));
+		}
+
 		try {
 			$user = $this->userManager->get($userId);
 
-			if (!$this->checkToken($userId, $token)) {
+			if (!StringUtils::equals($this->config->getUserValue($userId, 'owncloud', 'lostpassword'), $token)) {
 				throw new \Exception($this->l10n->t('Couldn\'t reset password because the token is invalid'));
 			}
 
@@ -137,9 +155,8 @@ class LostController extends Controller {
 				throw new \Exception();
 			}
 
-			// FIXME: should be added to the all config at some point
-			\OC_Preferences::deleteKey($userId, 'owncloud', 'lostpassword');
-			$this->userSession->unsetMagicInCookie();
+			$this->config->deleteUserValue($userId, 'owncloud', 'lostpassword');
+			@\OC_User::unsetMagicInCookie();
 
 		} catch (\Exception $e){
 			return $this->error($e->getMessage());
@@ -148,36 +165,32 @@ class LostController extends Controller {
 		return $this->success();
 	}
 
-
-	protected function sendEmail($user, $proceed) {
-		if ($this->isDataEncrypted && !$proceed){
-			throw new EncryptedDataException();
-		}
-
+	/**
+	 * @param string $user
+	 * @throws \Exception
+	 */
+	protected function sendEmail($user) {
 		if (!$this->userManager->userExists($user)) {
-			throw new \Exception(
-				$this->l10n->t('Couldn\'t send reset email. Please make sure '.
-				               'your username is correct.'));
+			throw new \Exception($this->l10n->t('Couldn\'t send reset email. Please make sure your username is correct.'));
 		}
 
-		$token = hash('sha256', \OC_Util::generateRandomBytes(30));
-
-		// Hash the token again to prevent timing attacks
-		$this->config->setUserValue(
-			$user, 'owncloud', 'lostpassword', hash('sha256', $token)
-		);
-
 		$email = $this->config->getUserValue($user, 'settings', 'email');
 
 		if (empty($email)) {
 			throw new \Exception(
 				$this->l10n->t('Couldn\'t send reset email because there is no '.
-				               'email address for this username. Please ' .
-				               'contact your administrator.')
+					'email address for this username. Please ' .
+					'contact your administrator.')
 			);
 		}
 
-		$link = $this->getLink('core.lost.resetform', $user, $token);
+		$token = $this->secureRandom->getMediumStrengthGenerator()->generate(21,
+			ISecureRandom::CHAR_DIGITS.
+			ISecureRandom::CHAR_LOWER.
+			ISecureRandom::CHAR_UPPER);
+		$this->config->setUserValue($user, 'owncloud', 'lostpassword', $token);
+
+		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $user, 'token' => $token));
 
 		$tmpl = new \OC_Template('core/lostpassword', 'email');
 		$tmpl->assign('link', $link, false);
@@ -200,23 +213,4 @@ class LostController extends Controller {
 		}
 	}
 
-
-	protected function getLink($route, $user, $token){
-		$parameters = array(
-			'token' => $token,
-			'userId' => $user
-		);
-		$link = $this->urlGenerator->linkToRoute($route, $parameters);
-
-		return $this->urlGenerator->getAbsoluteUrl($link);
-	}
-
-
-	protected function checkToken($user, $token) {
-		return $this->config->getUserValue(
-			$user, 'owncloud', 'lostpassword'
-		) === hash('sha256', $token);
-	}
-
-
 }
diff --git a/core/lostpassword/encrypteddataexception.php b/core/lostpassword/encrypteddataexception.php
deleted file mode 100644
index 99d19445b6c..00000000000
--- a/core/lostpassword/encrypteddataexception.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * @author Victor Dubiniuk
- * @copyright 2013 Victor Dubiniuk victor.dubiniuk@gmail.com
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Core\LostPassword;
- 
-class EncryptedDataException extends \Exception{
-}
diff --git a/core/lostpassword/templates/lostpassword.php b/core/lostpassword/templates/lostpassword.php
deleted file mode 100644
index 00dd139e71f..00000000000
--- a/core/lostpassword/templates/lostpassword.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-//load the file we need
-OCP\Util::addStyle('lostpassword', 'lostpassword'); ?>
-<form action="<?php print_unescaped($_['link']) ?>" method="post">
-	<fieldset>
-		<div class="update"><?php p($l->t('You will receive a link to reset your password via Email.')); ?></div>
-		<p>
-			<input type="text" name="user" id="user" placeholder="<?php p($l->t( 'Username' )); ?>" value="" autocomplete="off" required autofocus />
-			<label for="user" class="infield"><?php p($l->t( 'Username' )); ?></label>
-			<img class="svg" src="<?php print_unescaped(image_path('', 'actions/user.svg')); ?>" alt=""/>
-			<?php if ($_['isEncrypted']): ?>
-				<br />
-				<p class="warning"><?php p($l->t("Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?")); ?><br />
-				<input type="checkbox" name="continue" value="Yes" />
-				<?php p($l->t('Yes, I really want to reset my password now')); ?></p>
-			<?php endif; ?>
-		</p>
-		<input type="submit" id="submit" value="<?php p($l->t('Reset')); ?>" />
-	</fieldset>
-</form>
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index 118fe787116..ebd7bff2668 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -1,4 +1,10 @@
-<?php OCP\Util::addStyle('lostpassword', 'resetpassword'); ?>
+<?php
+/** @var array $_ */
+/** @var $l OC_L10N */
+style('lostpassword', 'resetpassword');
+script('core', 'lostpassword');
+?>
+
 <form action="<?php print_unescaped($_['link']) ?>" id="reset-password" method="post">
 	<fieldset>
 		<p>
@@ -9,4 +15,3 @@
 		<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
 	</fieldset>
 </form>
-<?php OCP\Util::addScript('core', 'lostpassword'); ?>
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php
new file mode 100644
index 00000000000..0a598d1f191
--- /dev/null
+++ b/tests/core/lostpassword/controller/lostcontrollertest.php
@@ -0,0 +1,195 @@
+<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Core\LostPassword\Controller;
+use OC\Core\Application;
+use OCP\AppFramework\Http\TemplateResponse;
+
+/**
+ * Class LostControllerTest
+ *
+ * @package OC\Core\LostPassword\Controller
+ */
+class LostControllerTest extends \PHPUnit_Framework_TestCase {
+
+	private $container;
+	/** @var LostController */
+	private $lostController;
+
+	protected function setUp() {
+		$app = new Application();
+		$this->container = $app->getContainer();
+		$this->container['AppName'] = 'core';
+		$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->container['L10N'] = $this->getMockBuilder('\OCP\IL10N')
+			->disableOriginalConstructor()->getMock();
+		$this->container['Defaults'] = $this->getMockBuilder('\OC_Defaults')
+			->disableOriginalConstructor()->getMock();
+		$this->container['UserManager'] = $this->getMockBuilder('\OCP\IUserManager')
+			->disableOriginalConstructor()->getMock();
+		$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
+			->disableOriginalConstructor()->getMock();
+		$this->container['URLGenerator'] = $this->getMockBuilder('\OCP\IURLGenerator')
+			->disableOriginalConstructor()->getMock();
+		$this->container['SecureRandom'] = $this->getMockBuilder('\OCP\Security\ISecureRandom')
+			->disableOriginalConstructor()->getMock();
+		$this->container['IsEncryptionEnabled'] = true;
+		$this->lostController = $this->container['LostController'];
+	}
+
+	public function testResetFormUnsuccessful() {
+		$userId = 'admin';
+		$token = 'MySecretToken';
+
+		$this->container['URLGenerator']
+			->expects($this->once())
+			->method('linkToRouteAbsolute')
+			->with('core.lost.setPassword', array('userId' => 'admin', 'token' => 'MySecretToken'))
+			->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/'));
+
+		$response = $this->lostController->resetform($token, $userId);
+		$expectedResponse = new TemplateResponse('core/lostpassword',
+			'resetpassword',
+			array(
+				'link' => 'https://ownCloud.com/index.php/lostpassword/',
+			),
+			'guest');
+		$this->assertEquals($expectedResponse, $response);
+	}
+
+	public function testEmailUnsucessful() {
+		$existingUser = 'ExistingUser';
+		$nonExistingUser = 'NonExistingUser';
+		$this->container['UserManager']
+			->expects($this->any())
+			->method('userExists')
+			->will($this->returnValueMap(array(
+				array(true, $existingUser),
+				array(false, $nonExistingUser)
+			)));
+		$this->container['L10N']
+			->expects($this->any())
+			->method('t')
+			->will(
+				$this->returnValueMap(
+					array(
+						array('Couldn\'t send reset email. Please make sure your username is correct.', array(),
+							'Couldn\'t send reset email. Please make sure your username is correct.'),
+
+					)
+				));
+
+		// With a non existing user
+		$response = $this->lostController->email($nonExistingUser);
+		$expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.');
+		$this->assertSame($expectedResponse, $response);
+
+		// With no mail address
+		$this->container['Config']
+			->expects($this->any())
+			->method('getUserValue')
+			->with($existingUser, 'settings', 'email')
+			->will($this->returnValue(null));
+		$response = $this->lostController->email($existingUser);
+		$expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t send reset email. Please make sure your username is correct.');
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testEmailSuccessful() {
+		$randomToken = $this->container['SecureRandom'];
+		$this->container['SecureRandom']
+			->expects($this->once())
+			->method('generate')
+			->with('21')
+			->will($this->returnValue('ThisIsMaybeANotSoSecretToken!'));
+		$this->container['UserManager']
+			->expects($this->once())
+			->method('userExists')
+			->with('ExistingUser')
+			->will($this->returnValue(true));
+		$this->container['Config']
+			->expects($this->once())
+			->method('getUserValue')
+			->with('ExistingUser', 'settings', 'email')
+			->will($this->returnValue('test@example.com'));
+		$this->container['SecureRandom']
+			->expects($this->once())
+			->method('getMediumStrengthGenerator')
+			->will($this->returnValue($randomToken));
+		$this->container['Config']
+			->expects($this->once())
+			->method('setUserValue')
+			->with('ExistingUser', 'owncloud', 'lostpassword', 'ThisIsMaybeANotSoSecretToken!');
+		$this->container['URLGenerator']
+			->expects($this->once())
+			->method('linkToRouteAbsolute')
+			->with('core.lost.setPassword', array('userId' => 'ExistingUser', 'token' => 'ThisIsMaybeANotSoSecretToken!'))
+			->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/'));
+
+		$response = $this->lostController->email('ExistingUser', true);
+		$expectedResponse = array('status' => 'success');
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testSetPasswordUnsuccessful() {
+		$this->container['L10N']
+			->expects($this->any())
+			->method('t')
+			->will(
+				$this->returnValueMap(
+					array(
+						array('Couldn\'t reset password because the token is invalid', array(),
+							'Couldn\'t reset password because the token is invalid'),
+					)
+				));
+		$this->container['Config']
+			->expects($this->once())
+			->method('getUserValue')
+			->with('InvalidTokenUser', 'owncloud', 'lostpassword')
+			->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword'));
+
+		// With an invalid token
+		$userName = 'InvalidTokenUser';
+		$response = $this->lostController->setPassword('wrongToken', $userName, 'NewPassword', true);
+		$expectedResponse = array('status' => 'error', 'msg' => 'Couldn\'t reset password because the token is invalid');
+		$this->assertSame($expectedResponse, $response);
+
+		// With a valid token and no proceed
+		$response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword!', $userName, 'NewPassword', false);
+		$expectedResponse = array('status' => 'error', 'msg' => '', 'encryption' => true);
+		$this->assertSame($expectedResponse, $response);
+	}
+
+	public function testSetPasswordSuccessful() {
+		$this->container['Config']
+			->expects($this->once())
+			->method('getUserValue')
+			->with('ValidTokenUser', 'owncloud', 'lostpassword')
+			->will($this->returnValue('TheOnlyAndOnlyOneTokenToResetThePassword'));
+		$user = $this->getMockBuilder('\OCP\IUser')
+			->disableOriginalConstructor()->getMock();
+		$user->expects($this->once())
+			->method('setPassword')
+			->with('NewPassword')
+			->will($this->returnValue(true));
+		$this->container['UserManager']
+			->expects($this->once())
+			->method('get')
+			->with('ValidTokenUser')
+			->will($this->returnValue($user));
+		$this->container['Config']
+			->expects($this->once())
+			->method('deleteUserValue')
+			->with('ValidTokenUser', 'owncloud', 'lostpassword');
+
+		$response = $this->lostController->setPassword('TheOnlyAndOnlyOneTokenToResetThePassword', 'ValidTokenUser', 'NewPassword', true);
+		$expectedResponse = array('status' => 'success');
+		$this->assertSame($expectedResponse, $response);
+	}
+}
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 3805bb1ac79..282f5477c30 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -9,6 +9,7 @@
 	<testsuite name='ownCloud'>
 		<directory suffix='.php'>lib/</directory>
 		<directory suffix='.php'>settings/</directory>
+		<directory suffix='.php'>core/</directory>
 		<file>apps.php</file>
 	</testsuite>
 	<!-- filters for code coverage -->
diff --git a/tests/phpunit.xml.dist b/tests/phpunit.xml.dist
index 21c63ea0469..95abe473965 100644
--- a/tests/phpunit.xml.dist
+++ b/tests/phpunit.xml.dist
@@ -2,6 +2,8 @@
 <phpunit bootstrap="bootstrap.php">
 	<testsuite name='ownCloud'>
 		<directory suffix='.php'>lib/</directory>
+		<directory suffix='.php'>settings/</directory>
+		<directory suffix='.php'>core/</directory>
 		<file>apps.php</file>
 	</testsuite>
 	<!-- filters for code coverage -->
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index 6d3485d28e4..789b6ce8fb0 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -14,7 +14,7 @@ use \OC\Settings\Application;
 /**
  * @package OC\Settings\Controller
  */
-class MailSettingscontrollerTest extends \PHPUnit_Framework_TestCase {
+class MailSettingsControllerTest extends \PHPUnit_Framework_TestCase {
 
 	private $container;
 
-- 
GitLab


From 60ae2894aa298cc2ee5bb2a59312303746bbd633 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 21 Oct 2014 18:31:41 +0200
Subject: [PATCH 435/616] Fix scrutinizer issues

---
 tests/core/lostpassword/controller/lostcontrollertest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php
index 0a598d1f191..c513ce17c7e 100644
--- a/tests/core/lostpassword/controller/lostcontrollertest.php
+++ b/tests/core/lostpassword/controller/lostcontrollertest.php
@@ -132,7 +132,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 			->with('core.lost.setPassword', array('userId' => 'ExistingUser', 'token' => 'ThisIsMaybeANotSoSecretToken!'))
 			->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/'));
 
-		$response = $this->lostController->email('ExistingUser', true);
+		$response = $this->lostController->email('ExistingUser');
 		$expectedResponse = array('status' => 'success');
 		$this->assertSame($expectedResponse, $response);
 	}
-- 
GitLab


From 57b5c82eb74a0f6f6f8fe785d0fd05892a12ba57 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 22 Oct 2014 10:29:26 +0200
Subject: [PATCH 436/616] Remove uneeded import

---
 core/lostpassword/controller/lostcontroller.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index a1a683baa70..eff7a1f5728 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -15,7 +15,6 @@ use \OCP\IRequest;
 use \OCP\IL10N;
 use \OCP\IConfig;
 use OCP\IUserManager;
-use \OC\Core\LostPassword\EncryptedDataException;
 use OCP\Security\ISecureRandom;
 use \OC_Defaults;
 use OCP\Security\StringUtils;
-- 
GitLab


From 767b08c6699e88a669b97246497d5315c6a6c063 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 24 Oct 2014 11:45:30 +0200
Subject: [PATCH 437/616] Use correct route instead

THX @schiesbn
(I should setup a mail server on my local system...)
---
 core/lostpassword/controller/lostcontroller.php           | 2 +-
 tests/core/lostpassword/controller/lostcontrollertest.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index eff7a1f5728..ec52108ad49 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -189,7 +189,7 @@ class LostController extends Controller {
 			ISecureRandom::CHAR_UPPER);
 		$this->config->setUserValue($user, 'owncloud', 'lostpassword', $token);
 
-		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.setPassword', array('userId' => $user, 'token' => $token));
+		$link = $this->urlGenerator->linkToRouteAbsolute('core.lost.resetform', array('userId' => $user, 'token' => $token));
 
 		$tmpl = new \OC_Template('core/lostpassword', 'email');
 		$tmpl->assign('link', $link, false);
diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php
index c513ce17c7e..5da9e5ce48d 100644
--- a/tests/core/lostpassword/controller/lostcontrollertest.php
+++ b/tests/core/lostpassword/controller/lostcontrollertest.php
@@ -129,7 +129,7 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 		$this->container['URLGenerator']
 			->expects($this->once())
 			->method('linkToRouteAbsolute')
-			->with('core.lost.setPassword', array('userId' => 'ExistingUser', 'token' => 'ThisIsMaybeANotSoSecretToken!'))
+			->with('core.lost.resetform', array('userId' => 'ExistingUser', 'token' => 'ThisIsMaybeANotSoSecretToken!'))
 			->will($this->returnValue('https://ownCloud.com/index.php/lostpassword/'));
 
 		$response = $this->lostController->email('ExistingUser');
-- 
GitLab


From 357465eac9733530c8e78ff0d5e1abca04ac93db Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 24 Oct 2014 13:41:44 +0200
Subject: [PATCH 438/616] Add "postPasswordReset" hook

---
 core/lostpassword/controller/lostcontroller.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index ec52108ad49..0a78063cc34 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -22,6 +22,8 @@ use OCP\Security\StringUtils;
 /**
  * Class LostController
  *
+ * Successfully changing a password will emit the post_passwordReset hook.
+ *
  * @package OC\Core\LostPassword\Controller
  */
 class LostController extends Controller {
@@ -47,13 +49,13 @@ class LostController extends Controller {
 	 * @param string $appName
 	 * @param IRequest $request
 	 * @param IURLGenerator $urlGenerator
-	 * @param $userManager
-	 * @param $defaults
+	 * @param IUserManager $userManager
+	 * @param OC_Defaults $defaults
 	 * @param IL10N $l10n
 	 * @param IConfig $config
 	 * @param ISecureRandom $secureRandom
-	 * @param $from
-	 * @param $isDataEncrypted
+	 * @param string $from
+	 * @param string $isDataEncrypted
 	 */
 	public function __construct($appName,
 								IRequest $request,
@@ -154,6 +156,8 @@ class LostController extends Controller {
 				throw new \Exception();
 			}
 
+			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array($userId));
+
 			$this->config->deleteUserValue($userId, 'owncloud', 'lostpassword');
 			@\OC_User::unsetMagicInCookie();
 
-- 
GitLab


From 11ab457b7204b68d41337794ab16b71031dd592f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 29 Oct 2014 12:44:15 +0100
Subject: [PATCH 439/616] add password as parameter to the signal so that the
 encryption can create a new key-pair

---
 core/lostpassword/controller/lostcontroller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/controller/lostcontroller.php b/core/lostpassword/controller/lostcontroller.php
index 0a78063cc34..aee4001ed37 100644
--- a/core/lostpassword/controller/lostcontroller.php
+++ b/core/lostpassword/controller/lostcontroller.php
@@ -156,7 +156,7 @@ class LostController extends Controller {
 				throw new \Exception();
 			}
 
-			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array($userId));
+			\OC_Hook::emit('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', array('uid' => $userId, 'password' => $password));
 
 			$this->config->deleteUserValue($userId, 'owncloud', 'lostpassword');
 			@\OC_User::unsetMagicInCookie();
-- 
GitLab


From f6efbfcf0bb76e16347748666d0c967ad839c5b2 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 29 Oct 2014 12:45:13 +0100
Subject: [PATCH 440/616] listen to the post_passwordReset hook, backup the old
 keys and create a new key pair for the user

---
 apps/files_encryption/hooks/hooks.php | 13 +++++++++++++
 apps/files_encryption/lib/helper.php  |  1 +
 apps/files_encryption/lib/util.php    | 12 ++++++++++++
 3 files changed, 26 insertions(+)

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 3a0a37c0a59..eadd2b64b80 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -263,6 +263,19 @@ class Hooks {
 		}
 	}
 
+	/**
+	 * after password reset we create a new key pair for the user
+	 *
+	 * @param array $params
+	 */
+	public static function postPasswordReset($params) {
+		$uid = $params['uid'];
+		$password = $params['password'];
+
+		$util = new Util(new \OC\Files\View(), $uid);
+		$util->replaceUserKeys($password);
+	}
+
 	/*
 	 * check if files can be encrypted to every user.
 	 */
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 53c380ab2b3..7a50ade82f3 100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -70,6 +70,7 @@ class Helper {
 		\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Encryption\Hooks', 'preDelete');
 		\OCP\Util::connectHook('OC_Filesystem', 'post_umount', 'OCA\Encryption\Hooks', 'postUmount');
 		\OCP\Util::connectHook('OC_Filesystem', 'umount', 'OCA\Encryption\Hooks', 'preUmount');
+		\OCP\Util::connectHook('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', 'OCA\Encryption\Hooks', 'postPasswordReset');
 	}
 
 	/**
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index c8697ae7c80..d12b003b227 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -124,6 +124,18 @@ class Util {
 		}
 	}
 
+	/**
+	 * create a new public/private key pair for the user
+	 *
+	 * @param string $password password for the private key
+	 */
+	public function replaceUserKeys($password) {
+		$this->backupAllKeys('password_reset');
+		$this->view->unlink($this->publicKeyPath);
+		$this->view->unlink($this->privateKeyPath);
+		$this->setupServerSide($password);
+	}
+
 	/**
 	 * Sets up user folders and keys for serverside encryption
 	 *
-- 
GitLab


From f530865b3d952e10c5c295f6dbe1138a667fa659 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 29 Oct 2014 13:26:24 +0100
Subject: [PATCH 441/616] Hide submit button after password change

Creating a new key pair can take 1-2 seconds. So it could happen that the user click the "Reset password" button again which can lead to many nasty things, e.g. we could create two new key pairs in parallel.
---
 core/js/lostpassword.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index aa1a864ffed..7145e219654 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -82,6 +82,9 @@ OC.Lostpassword = {
 					OC.Lostpassword.resetDone
 			);
 		}
+		if($('#encrypted-continue').attr('checked')) {
+			$('#reset-password #submit').hide();
+		}
 	},
 
 	resetDone : function(result){
-- 
GitLab


From 68e77f46598429e1d8a96f668e5065e5fce362ce Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 11 Nov 2014 15:14:04 +0100
Subject: [PATCH 442/616] fix unreadable label in warning box

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

diff --git a/core/css/styles.css b/core/css/styles.css
index c45588cece6..2859399b59e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -353,6 +353,12 @@ input[type="submit"].enabled {
 	filter: alpha(opacity=60);
 	opacity: .6;
 }
+/* overrides another !important statement that sets this to unreadable black */
+#body-login form .warning input[type="checkbox"]:hover+label,
+#body-login form .warning input[type="checkbox"]:focus+label,
+#body-login form .warning input[type="checkbox"]+label {
+	color: #fff !important;
+}
 
 #body-login .update h2 {
 	font-size: 20px;
-- 
GitLab


From 9eeea57e3abc4a1cfb1d303eae5f454f3d382b3f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 17 Nov 2014 17:49:58 +0100
Subject: [PATCH 443/616] Show spinner

---
 core/js/lostpassword.js                       | 1 +
 core/lostpassword/templates/resetpassword.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index 7145e219654..35173fd3d33 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -84,6 +84,7 @@ OC.Lostpassword = {
 		}
 		if($('#encrypted-continue').attr('checked')) {
 			$('#reset-password #submit').hide();
+			$('#reset-password #float-spinner').removeClass('hidden');
 		}
 	},
 
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index ebd7bff2668..bac8b5c75c9 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -13,5 +13,6 @@ script('core', 'lostpassword');
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
 		<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
+		<img class="hidden" id="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
 	</fieldset>
 </form>
-- 
GitLab


From 0b9dffa8288d37292b60a56162893ca23c840340 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 17 Nov 2014 18:30:17 +0100
Subject: [PATCH 444/616] Make declaration compatible

Fixes #12236
---
 lib/private/db/oracleconnection.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/private/db/oracleconnection.php b/lib/private/db/oracleconnection.php
index e2fc4644f47..4cec7bc4ae4 100644
--- a/lib/private/db/oracleconnection.php
+++ b/lib/private/db/oracleconnection.php
@@ -20,7 +20,7 @@ class OracleConnection extends Connection {
 		return $return;
 	}
 
-	/*
+	/**
 	 * {@inheritDoc}
 	 */
 	public function insert($tableName, array $data, array $types = array()) {
@@ -29,7 +29,7 @@ class OracleConnection extends Connection {
 		return parent::insert($tableName, $data, $types);
 	}
 
-	/*
+	/**
 	 * {@inheritDoc}
 	 */
 	public function update($tableName, array $data, array $identifier, array $types = array()) {
@@ -39,11 +39,11 @@ class OracleConnection extends Connection {
 		return parent::update($tableName, $data, $identifier, $types);
 	}
 
-	/*
+	/**
 	 * {@inheritDoc}
 	 */
-	public function delete($tableName, array $identifier) {
-		$tableName = $this->quoteIdentifier($tableName);
+	public function delete($tableExpression, array $identifier, array $types = array()) {
+		$tableName = $this->quoteIdentifier($tableExpression);
 		$identifier = $this->quoteKeys($identifier);
 		return parent::delete($tableName, $identifier);
 	}
-- 
GitLab


From 6535540dcda9d6d82d59c3c8523790a477d033b6 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 17 Nov 2014 22:39:40 +0100
Subject: [PATCH 445/616] Check if the size field is available

In some cases the 'size' field is not available resulting in some PHP errors such as:

```json
{"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"}
```

This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
---
 lib/private/files/fileinfo.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index 8457a2d160f..d6d6a245e44 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -122,7 +122,7 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	 * @return int
 	 */
 	public function getSize() {
-		return $this->data['size'];
+		return isset($this->data['size']) ? $this->data['size'] : 0;
 	}
 
 	/**
-- 
GitLab


From 91f7c0af6e627532efa2161e9ca7838d28dc42a9 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Tue, 18 Nov 2014 01:54:31 -0500
Subject: [PATCH 446/616] [tx-robot] updated from transifex

---
 apps/files_encryption/l10n/pl.js   | 8 ++++++++
 apps/files_encryption/l10n/pl.json | 8 ++++++++
 lib/l10n/en_GB.js                  | 2 ++
 lib/l10n/en_GB.json                | 2 ++
 lib/l10n/fr.js                     | 2 ++
 lib/l10n/fr.json                   | 2 ++
 6 files changed, 24 insertions(+)

diff --git a/apps/files_encryption/l10n/pl.js b/apps/files_encryption/l10n/pl.js
index e4532cb0604..29b67619139 100644
--- a/apps/files_encryption/l10n/pl.js
+++ b/apps/files_encryption/l10n/pl.js
@@ -2,12 +2,20 @@ OC.L10N.register(
     "files_encryption",
     {
     "Unknown error" : "Nieznany błąd",
+    "Missing recovery key password" : "Brakujące hasło klucza odzyskiwania",
     "Please repeat the recovery key password" : "Proszę powtórz nowe hasło klucza odzyskiwania",
+    "Repeated recovery key password does not match the provided recovery key password" : "Hasła klucza odzyskiwania nie zgadzają się",
     "Recovery key successfully enabled" : "Klucz odzyskiwania włączony",
     "Could not disable recovery key. Please check your recovery key password!" : "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
     "Recovery key successfully disabled" : "Klucz odzyskiwania wyłączony",
+    "Please provide the old recovery password" : "Podaj stare hasło odzyskiwania",
+    "Please provide a new recovery password" : "Podaj nowe hasło odzyskiwania",
+    "Please repeat the new recovery password" : "Proszę powtórz nowe hasło odzyskiwania",
     "Password successfully changed." : "Zmiana hasła udana.",
     "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+    "Could not update the private key password." : "Nie można zmienić hasła klucza prywatnego.",
+    "The old password was not correct, please try again." : "Stare hasło nie było poprawne. Spróbuj jeszcze raz.",
+    "The current log-in password was not correct, please try again." : "Obecne hasło logowania nie było poprawne. Spróbuj ponownie.",
     "Private key password successfully updated." : "Pomyślnie zaktualizowano hasło klucza prywatnego.",
     "File recovery settings updated" : "Ustawienia odzyskiwania plików zmienione",
     "Could not update file recovery" : "Nie można zmienić pliku odzyskiwania",
diff --git a/apps/files_encryption/l10n/pl.json b/apps/files_encryption/l10n/pl.json
index 8ef5297d191..8d70e50340e 100644
--- a/apps/files_encryption/l10n/pl.json
+++ b/apps/files_encryption/l10n/pl.json
@@ -1,11 +1,19 @@
 { "translations": {
     "Unknown error" : "Nieznany błąd",
+    "Missing recovery key password" : "Brakujące hasło klucza odzyskiwania",
     "Please repeat the recovery key password" : "Proszę powtórz nowe hasło klucza odzyskiwania",
+    "Repeated recovery key password does not match the provided recovery key password" : "Hasła klucza odzyskiwania nie zgadzają się",
     "Recovery key successfully enabled" : "Klucz odzyskiwania włączony",
     "Could not disable recovery key. Please check your recovery key password!" : "Nie można wyłączyć klucza odzyskiwania. Proszę sprawdzić swoje hasło odzyskiwania!",
     "Recovery key successfully disabled" : "Klucz odzyskiwania wyłączony",
+    "Please provide the old recovery password" : "Podaj stare hasło odzyskiwania",
+    "Please provide a new recovery password" : "Podaj nowe hasło odzyskiwania",
+    "Please repeat the new recovery password" : "Proszę powtórz nowe hasło odzyskiwania",
     "Password successfully changed." : "Zmiana hasła udana.",
     "Could not change the password. Maybe the old password was not correct." : "Nie można zmienić hasła. Może stare hasło nie było poprawne.",
+    "Could not update the private key password." : "Nie można zmienić hasła klucza prywatnego.",
+    "The old password was not correct, please try again." : "Stare hasło nie było poprawne. Spróbuj jeszcze raz.",
+    "The current log-in password was not correct, please try again." : "Obecne hasło logowania nie było poprawne. Spróbuj ponownie.",
     "Private key password successfully updated." : "Pomyślnie zaktualizowano hasło klucza prywatnego.",
     "File recovery settings updated" : "Ustawienia odzyskiwania plików zmienione",
     "Could not update file recovery" : "Nie można zmienić pliku odzyskiwania",
diff --git a/lib/l10n/en_GB.js b/lib/l10n/en_GB.js
index 43f7edb5258..9e5400deb2d 100644
--- a/lib/l10n/en_GB.js
+++ b/lib/l10n/en_GB.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "No app name specified",
     "Unknown filetype" : "Unknown filetype",
     "Invalid image" : "Invalid image",
+    "Database Error" : "Database Error",
+    "Please contact your system administrator." : "Please contact your system administrator.",
     "web services under your control" : "web services under your control",
     "App directory already exists" : "App directory already exists",
     "Can't create app folder. Please fix permissions. %s" : "Can't create app folder. Please fix permissions. %s",
diff --git a/lib/l10n/en_GB.json b/lib/l10n/en_GB.json
index 7e7756cec9c..e3a44ec8e9b 100644
--- a/lib/l10n/en_GB.json
+++ b/lib/l10n/en_GB.json
@@ -15,6 +15,8 @@
     "No app name specified" : "No app name specified",
     "Unknown filetype" : "Unknown filetype",
     "Invalid image" : "Invalid image",
+    "Database Error" : "Database Error",
+    "Please contact your system administrator." : "Please contact your system administrator.",
     "web services under your control" : "web services under your control",
     "App directory already exists" : "App directory already exists",
     "Can't create app folder. Please fix permissions. %s" : "Can't create app folder. Please fix permissions. %s",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index d50e4f52a34..ec7e949abcc 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Aucun nom d'application spécifié",
     "Unknown filetype" : "Type de fichier inconnu",
     "Invalid image" : "Image non valable",
+    "Database Error" : "Erreur dans la base de données",
+    "Please contact your system administrator." : "Veuillez contacter votre administrateur système.",
     "web services under your control" : "services web sous votre contrôle",
     "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",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index fb054f12b21..ecba239d076 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Aucun nom d'application spécifié",
     "Unknown filetype" : "Type de fichier inconnu",
     "Invalid image" : "Image non valable",
+    "Database Error" : "Erreur dans la base de données",
+    "Please contact your system administrator." : "Veuillez contacter votre administrateur système.",
     "web services under your control" : "services web sous votre contrôle",
     "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",
-- 
GitLab


From 345eb62ffaa969707fc1901d55c0674aceecea3e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 18 Nov 2014 10:25:16 +0100
Subject: [PATCH 447/616] center spinner

---
 core/lostpassword/css/resetpassword.css       | 4 ++++
 core/lostpassword/templates/resetpassword.php | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/lostpassword/css/resetpassword.css b/core/lostpassword/css/resetpassword.css
index 012af672d97..29a7e875537 100644
--- a/core/lostpassword/css/resetpassword.css
+++ b/core/lostpassword/css/resetpassword.css
@@ -2,6 +2,10 @@
 	position: relative;
 }
 
+.text-center {
+	text-align: center;
+}
+
 #password-icon {
 	top: 20px;
 }
diff --git a/core/lostpassword/templates/resetpassword.php b/core/lostpassword/templates/resetpassword.php
index bac8b5c75c9..498c692f12e 100644
--- a/core/lostpassword/templates/resetpassword.php
+++ b/core/lostpassword/templates/resetpassword.php
@@ -13,6 +13,8 @@ script('core', 'lostpassword');
 			<img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/>
 		</p>
 		<input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" />
-		<img class="hidden" id="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
+		<p class="text-center">
+			<img class="hidden" id="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/>
+		</p>
 	</fieldset>
 </form>
-- 
GitLab


From 5192641447e0961111fe361666685f4d0dacbbb4 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 17 Nov 2014 13:09:13 +0100
Subject: [PATCH 448/616] make sure that we don't find the wrong shares if a
 user and a group have the same ID

---
 lib/private/share/share.php | 16 +++++++++------
 tests/lib/share/share.php   | 41 +++++++++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index b7b05dab8ef..f9d1de1febf 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1308,14 +1308,18 @@ class Share extends \OC\Share\Constants {
 		if (isset($shareType)) {
 			// Include all user and group items
 			if ($shareType == self::$shareTypeUserAndGroups && isset($shareWith)) {
-				$where .= ' AND `share_type` IN (?,?,?)';
+				$where .= ' AND ((`share_type` in (?, ?) AND `share_with` = ?) ';
 				$queryArgs[] = self::SHARE_TYPE_USER;
-				$queryArgs[] = self::SHARE_TYPE_GROUP;
 				$queryArgs[] = self::$shareTypeGroupUserUnique;
-				$userAndGroups = array_merge(array($shareWith), \OC_Group::getUserGroups($shareWith));
-				$placeholders = join(',', array_fill(0, count($userAndGroups), '?'));
-				$where .= ' AND `share_with` IN ('.$placeholders.')';
-				$queryArgs = array_merge($queryArgs, $userAndGroups);
+				$queryArgs[] = $shareWith;
+				$groups = \OC_Group::getUserGroups($shareWith);
+				if (!empty($groups)) {
+					$placeholders = join(',', array_fill(0, count($groups), '?'));
+					$where .= ' OR (`share_type` = ? AND `share_with` IN ('.$placeholders.')) ';
+					$queryArgs[] = self::SHARE_TYPE_GROUP;
+					$queryArgs = array_merge($queryArgs, $groups);
+				}
+				$where .= ')';
 				// Don't include own group shares
 				$where .= ' AND `uid_owner` != ?';
 				$queryArgs[] = $shareWith;
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 3d99883f2de..fb243a41ddb 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -27,6 +27,7 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 	protected $user2;
 	protected $user3;
 	protected $user4;
+	protected $groupAndUser;
 	protected $groupBackend;
 	protected $group1;
 	protected $group2;
@@ -41,10 +42,12 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		$this->user2 = uniqid('user2_');
 		$this->user3 = uniqid('user3_');
 		$this->user4 = uniqid('user4_');
+		$this->groupAndUser = uniqid('groupAndUser_');
 		OC_User::createUser($this->user1, 'pass');
 		OC_User::createUser($this->user2, 'pass');
 		OC_User::createUser($this->user3, 'pass');
 		OC_User::createUser($this->user4, 'pass');
+		OC_User::createUser($this->groupAndUser, 'pass');
 		OC_User::setUserId($this->user1);
 		OC_Group::clearBackends();
 		OC_Group::useBackend(new OC_Group_Dummy);
@@ -52,11 +55,14 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		$this->group2 = uniqid('group2_');
 		OC_Group::createGroup($this->group1);
 		OC_Group::createGroup($this->group2);
+		OC_Group::createGroup($this->groupAndUser);
 		OC_Group::addToGroup($this->user1, $this->group1);
 		OC_Group::addToGroup($this->user2, $this->group1);
 		OC_Group::addToGroup($this->user3, $this->group1);
 		OC_Group::addToGroup($this->user2, $this->group2);
 		OC_Group::addToGroup($this->user4, $this->group2);
+		OC_Group::addToGroup($this->user2, $this->groupAndUser);
+		OC_Group::addToGroup($this->user3, $this->groupAndUser);
 		OCP\Share::registerBackend('test', 'Test_Share_Backend');
 		OC_Hook::clear('OCP\\Share');
 		OC::registerShareHooks();
@@ -600,6 +606,41 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(array(), OCP\Share::getItemsShared('test'));
 	}
 
+
+	public function testShareWithGroupAndUserBothHaveTheSameId() {
+
+		$this->shareUserTestFileWithUser($this->user1, $this->groupAndUser);
+
+		OC_User::setUserId($this->groupAndUser);
+
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+				'"groupAndUser"-User does not see the file but it was shared with him');
+
+		OC_User::setUserId($this->user2);
+		$this->assertEquals(array(), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+				'User2 sees test.txt but it was only shared with the user "groupAndUser" and not with group');
+
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::unshareAll('test', 'test.txt'));
+
+		$this->assertTrue(
+				OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->groupAndUser, OCP\PERMISSION_READ),
+				'Failed asserting that user 1 successfully shared text.txt with group 1.'
+		);
+
+		OC_User::setUserId($this->groupAndUser);
+		$this->assertEquals(array(), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+				'"groupAndUser"-User sees test.txt but it was only shared with the group "groupAndUser" and not with the user');
+
+		OC_User::setUserId($this->user2);
+		$this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE),
+				'User2 does not see test.txt but it was shared with the group "groupAndUser"');
+
+		OC_User::setUserId($this->user1);
+		$this->assertTrue(OCP\Share::unshareAll('test', 'test.txt'));
+
+	}
+
 	/**
 	 * @param boolean|string $token
 	 */
-- 
GitLab


From 367468ff1f7cedf213e9a82a988026e3d4c53966 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 17 Nov 2014 18:05:12 +0100
Subject: [PATCH 449/616] make sure that we only find the shares from the
 correct share type if users and groups with the same ID exists

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

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index f9d1de1febf..ddacac098c1 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -288,9 +288,10 @@ class Share extends \OC\Share\Constants {
 	 * @param string $itemType
 	 * @param string $itemSource
 	 * @param string $user User user to whom the item was shared
+	 * @param int $shareType only look for a specific share type
 	 * @return array Return list of items with file_target, permissions and expiration
 	 */
-	public static function getItemSharedWithUser($itemType, $itemSource, $user) {
+	public static function getItemSharedWithUser($itemType, $itemSource, $user, $shareType = null) {
 
 		$shares = array();
 		$fileDependend = false;
@@ -314,6 +315,11 @@ class Share extends \OC\Share\Constants {
 			$arguments[] = $user;
 		}
 
+		if ($shareType !== null) {
+			$where .= ' AND `share_type` = ? ';
+			$arguments[] = $shareType;
+		}
+
 		$query = \OC_DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` '. $where);
 
 		$result = \OC_DB::executeAudited($query, $arguments);
@@ -697,7 +703,7 @@ class Share extends \OC\Share\Constants {
 		// check if it is a valid itemType
 		self::getBackend($itemType);
 
-		$items = self::getItemSharedWithUser($itemType, $itemSource, $shareWith);
+		$items = self::getItemSharedWithUser($itemType, $itemSource, $shareWith, $shareType);
 
 		$toDelete = array();
 		$newParent = null;
-- 
GitLab


From 01c50d242bf0002ff14edc8aa8bee38d32111f43 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 18 Nov 2014 11:08:01 +0100
Subject: [PATCH 450/616] use the new base class for unit tests

---
 tests/lib/share/share.php | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index fb243a41ddb..7644dadadc7 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class Test_Share extends PHPUnit_Framework_TestCase {
+class Test_Share extends Test\TestCase {
 
 	protected $itemType;
 	protected $userBackend;
@@ -35,14 +35,15 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 	protected $dateInFuture;
 	protected $dateInPast;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		OC_User::clearBackends();
 		OC_User::useBackend('dummy');
-		$this->user1 = uniqid('user1_');
-		$this->user2 = uniqid('user2_');
-		$this->user3 = uniqid('user3_');
-		$this->user4 = uniqid('user4_');
-		$this->groupAndUser = uniqid('groupAndUser_');
+		$this->user1 = $this->getUniqueID('user1_');
+		$this->user2 = $this->getUniqueID('user2_');
+		$this->user3 = $this->getUniqueID('user3_');
+		$this->user4 = $this->getUniqueID('user4_');
+		$this->groupAndUser = $this->getUniqueID('groupAndUser_');
 		OC_User::createUser($this->user1, 'pass');
 		OC_User::createUser($this->user2, 'pass');
 		OC_User::createUser($this->user3, 'pass');
@@ -51,8 +52,8 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		OC_User::setUserId($this->user1);
 		OC_Group::clearBackends();
 		OC_Group::useBackend(new OC_Group_Dummy);
-		$this->group1 = uniqid('group1_');
-		$this->group2 = uniqid('group2_');
+		$this->group1 = $this->getUniqueID('group1_');
+		$this->group2 = $this->getUniqueID('group2_');
 		OC_Group::createGroup($this->group1);
 		OC_Group::createGroup($this->group2);
 		OC_Group::createGroup($this->groupAndUser);
@@ -76,10 +77,11 @@ class Test_Share extends PHPUnit_Framework_TestCase {
 		$this->dateInFuture = date($dateFormat, $now + 20 * 60);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$query = OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?');
 		$query->execute(array('test'));
 		OC_Appconfig::setValue('core', 'shareapi_allow_resharing', $this->resharing);
+		parent::tearDown();
 	}
 
 	public function testShareInvalidShareType() {
-- 
GitLab


From ea4eedd35a267ff64af0a9b1502ef92026467d3e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 18 Nov 2014 11:41:45 +0100
Subject: [PATCH 451/616] only users can have a display name different from the
 id

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

diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index ddacac098c1..cd5decf6f71 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -1516,8 +1516,11 @@ class Share extends \OC\Share\Constants {
 				$row['permissions'] &= ~\OCP\PERMISSION_SHARE;
 			}
 			// Add display names to result
-			if ( isset($row['share_with']) && $row['share_with'] != '') {
+			if ( isset($row['share_with']) && $row['share_with'] != '' &&
+					isset($row['share_with']) && $row['share_type'] === self::SHARE_TYPE_USER) {
 				$row['share_with_displayname'] = \OCP\User::getDisplayName($row['share_with']);
+			} else {
+				$row['share_with_displayname'] = $row['share_with'];
 			}
 			if ( isset($row['uid_owner']) && $row['uid_owner'] != '') {
 				$row['displayname_owner'] = \OCP\User::getDisplayName($row['uid_owner']);
-- 
GitLab


From 152da9796b0268069a10b73d65781301a307fcdd Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Tue, 18 Nov 2014 12:13:44 +0100
Subject: [PATCH 452/616] Added function to load translations from JS

For apps that support async translation loading, a new function
OC.L10N.load() can be used to asynchronously load the translations
for a given app.
---
 core/js/js.js                   | 24 +++++++++++++++--
 core/js/l10n.js                 | 41 ++++++++++++++++++++++++++++
 core/js/tests/specs/l10nSpec.js | 48 +++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 39e382b544b..eb2f10b51f0 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -252,6 +252,17 @@ var OC={
 		}
 	},
 
+	/**
+	 * Loads translations for the given app asynchronously.
+	 *
+	 * @param {String} app app name
+	 * @param {Function} callback callback to call after loading
+	 * @return {Promise}
+	 */
+	addTranslations: function(app, callback) {
+		return OC.L10N.load(app, callback);
+	},
+
 	/**
 	 * Returns the base name of the given path.
 	 * For example for "/abc/somefile.txt" it will return "somefile.txt"
@@ -475,6 +486,15 @@ var OC={
 			return window.matchMedia(media);
 		}
 		return false;
+	},
+
+	/**
+	 * Returns the user's locale
+	 *
+	 * @return {String} locale string
+	 */
+	getLocale: function() {
+		return $('html').prop('lang');
 	}
 };
 
@@ -869,9 +889,9 @@ function object(o) {
 function initCore() {
 
 	/**
-	 * Set users local to moment.js as soon as possible
+	 * Set users locale to moment.js as soon as possible
 	 */
-	moment.locale($('html').prop('lang'));
+	moment.locale(OC.getLocale());
 
 
 	/**
diff --git a/core/js/l10n.js b/core/js/l10n.js
index e375b7eca80..d091acea049 100644
--- a/core/js/l10n.js
+++ b/core/js/l10n.js
@@ -26,6 +26,47 @@ OC.L10N = {
 	 */
 	_pluralFunctions: {},
 
+	/**
+	 * Load an app's translation bundle if not loaded already.
+	 *
+	 * @param {String} appName name of the app
+	 * @param {Function} callback callback to be called when
+	 * the translations are loaded
+	 * @return {Promise} promise
+	 */
+	load: function(appName, callback) {
+		// already available ?
+		if (this._bundles[appName] || OC.getLocale() === 'en') {
+			if (callback) {
+				callback();
+			}
+			return;
+		}
+
+		var self = this;
+		var deferred = $.Deferred();
+		var url = OC.generateUrl(
+			'apps/{app}/l10n/{locale}.json',
+			{app: appName, locale: OC.getLocale()}
+		);
+
+		var url = OC.filePath(appName, 'l10n', OC.getLocale() + '.json');
+
+		// load JSON translation bundle per AJAX
+		$.get(url,
+			function(result) {
+				if (result.translations) {
+					self.register(appName, result.translations, result.pluralForm);
+				}
+				if (callback) {
+					callback();
+					deferred.resolve();
+				}
+			}
+		);
+		return deferred.promise();
+	},
+
 	/**
 	 * Register an app's translation bundle.
 	 *
diff --git a/core/js/tests/specs/l10nSpec.js b/core/js/tests/specs/l10nSpec.js
index d5b0363ea38..dc021a0baaf 100644
--- a/core/js/tests/specs/l10nSpec.js
+++ b/core/js/tests/specs/l10nSpec.js
@@ -11,8 +11,12 @@
 describe('OC.L10N tests', function() {
 	var TEST_APP = 'jsunittestapp';
 
+	beforeEach(function() {
+		OC.appswebroots[TEST_APP] = OC.webroot + '/apps3/jsunittestapp';
+	});
 	afterEach(function() {
 		delete OC.L10N._bundles[TEST_APP];
+		delete OC.appswebroots[TEST_APP];
 	});
 
 	describe('text translation', function() {
@@ -98,4 +102,48 @@ describe('OC.L10N tests', function() {
 			checkPlurals();
 		});
 	});
+	describe('async loading of translations', function() {
+		it('loads bundle for given app and calls callback', function() {
+			var localeStub = sinon.stub(OC, 'getLocale').returns('zh_CN');
+			var callbackStub = sinon.stub();
+			var promiseStub = sinon.stub();
+			OC.L10N.load(TEST_APP, callbackStub).then(promiseStub);
+			expect(callbackStub.notCalled).toEqual(true);
+			expect(promiseStub.notCalled).toEqual(true);
+			expect(fakeServer.requests.length).toEqual(1);
+			var req = fakeServer.requests[0];
+			expect(req.url).toEqual(
+				OC.webroot + '/apps3/' + TEST_APP + '/l10n/zh_CN.json'
+			);
+			req.respond(
+				200,
+				{ 'Content-Type': 'application/json' },
+				JSON.stringify({
+					translations: {'Hello world!': '你好世界!'},
+					pluralForm: 'nplurals=2; plural=(n != 1);'
+				})
+			);
+
+			expect(callbackStub.calledOnce).toEqual(true);
+			expect(promiseStub.calledOnce).toEqual(true);
+			expect(t(TEST_APP, 'Hello world!')).toEqual('你好世界!');
+			localeStub.restore();
+		});
+		it('calls callback if translation already available', function() {
+			var callbackStub = sinon.stub();
+			OC.L10N.register(TEST_APP, {
+				'Hello world!': 'Hallo Welt!'
+			});
+			OC.L10N.load(TEST_APP, callbackStub);
+			expect(callbackStub.calledOnce).toEqual(true);
+			expect(fakeServer.requests.length).toEqual(0);
+		});
+		it('calls callback if locale is en', function() {
+			var localeStub = sinon.stub(OC, 'getLocale').returns('en');
+			var callbackStub = sinon.stub();
+			OC.L10N.load(TEST_APP, callbackStub);
+			expect(callbackStub.calledOnce).toEqual(true);
+			expect(fakeServer.requests.length).toEqual(0);
+		});
+	});
 });
-- 
GitLab


From 0b630a37ab264454f99ff5a32b497e1c414ef688 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 18 Nov 2014 12:22:13 +0100
Subject: [PATCH 453/616] Fix type hinting for app manager

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

diff --git a/lib/private/connector/sabre/appenabledplugin.php b/lib/private/connector/sabre/appenabledplugin.php
index 73fed948f9b..61f5170658d 100644
--- a/lib/private/connector/sabre/appenabledplugin.php
+++ b/lib/private/connector/sabre/appenabledplugin.php
@@ -9,7 +9,7 @@
 
 namespace OC\Connector\Sabre;
 
-use OCP\App\IManager;
+use OCP\App\IAppManager;
 use Sabre\DAV\Exception\Forbidden;
 use Sabre\DAV\ServerPlugin;
 
@@ -31,15 +31,15 @@ class AppEnabledPlugin extends ServerPlugin {
 	private $app;
 
 	/**
-	 * @var \OCP\App\IManager
+	 * @var \OCP\App\IAppManager
 	 */
 	private $appManager;
 
 	/**
 	 * @param string $app
-	 * @param \OCP\App\IManager $appManager
+	 * @param \OCP\App\IAppManager $appManager
 	 */
-	public function __construct($app, IManager $appManager) {
+	public function __construct($app, IAppManager $appManager) {
 		$this->app = $app;
 		$this->appManager = $appManager;
 	}
-- 
GitLab


From d0a30b0e55799e8f5348ee558346d6ebf32cedda Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 13 Nov 2014 11:15:47 +0100
Subject: [PATCH 454/616] Ignore port for trusted domains

This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.

Conflicts:
	lib/private/request.php
---
 config/config.sample.php |  2 +-
 lib/base.php             |  8 +-------
 lib/private/request.php  | 18 +++++++++++++++---
 tests/lib/request.php    |  8 ++++++--
 4 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index daca5aed362..2287b7af7dd 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -71,7 +71,7 @@ $CONFIG = array(
 'trusted_domains' =>
   array (
     'demo.example.org',
-    'otherdomain.example.org:8080',
+    'otherdomain.example.org',
   ),
 
 
diff --git a/lib/base.php b/lib/base.php
index d365a4a306f..c97c158a1fb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -613,14 +613,8 @@ class OC {
 			header('HTTP/1.1 400 Bad Request');
 			header('Status: 400 Bad Request');
 
-			$domain = $_SERVER['SERVER_NAME'];
-			// Append port to domain in case it is not
-			if($_SERVER['SERVER_PORT'] !== '80' && $_SERVER['SERVER_PORT'] !== '443') {
-				$domain .= ':'.$_SERVER['SERVER_PORT'];
-			}
-
 			$tmpl = new OCP\Template('core', 'untrustedDomain', 'guest');
-			$tmpl->assign('domain', $domain);
+			$tmpl->assign('domain', $_SERVER['SERVER_NAME']);
 			$tmpl->printPage();
 
 			exit();
diff --git a/lib/private/request.php b/lib/private/request.php
index 1cfa4a150c5..d079dc110d1 100644
--- a/lib/private/request.php
+++ b/lib/private/request.php
@@ -12,8 +12,7 @@ class OC_Request {
 	// 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$#';
-
-	const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)(:[0-9]+|)$/';
+	const REGEX_LOCALHOST = '/^(127\.0\.0\.1|localhost)$/';
 	static protected $reqId;
 
 	/**
@@ -76,13 +75,26 @@ class OC_Request {
 	 * have been configured
 	 */
 	public static function isTrustedDomain($domain) {
-		$trustedList = \OC_Config::getValue('trusted_domains', array());
+		// Extract port from domain if needed
+		$pos = strrpos($domain, ':');
+		if ($pos !== false) {
+			$port = substr($domain, $pos + 1);
+			if (is_numeric($port)) {
+				$domain = substr($domain, 0, $pos);
+			}
+		}
+
+		// FIXME: Empty config array defaults to true for now. - Deprecate this behaviour with ownCloud 8.
+		$trustedList = \OC::$server->getConfig()->getSystemValue('trusted_domains', array());
 		if (empty($trustedList)) {
 			return true;
 		}
+
+		// Always allow access from localhost
 		if (preg_match(self::REGEX_LOCALHOST, $domain) === 1) {
 			return true;
 		}
+
 		return in_array($domain, $trustedList);
 	}
 
diff --git a/tests/lib/request.php b/tests/lib/request.php
index b89bf92ece7..2760377fa48 100644
--- a/tests/lib/request.php
+++ b/tests/lib/request.php
@@ -240,7 +240,7 @@ class Test_Request extends PHPUnit_Framework_TestCase {
 	}
 
 	public function trustedDomainDataProvider() {
-		$trustedHostTestList = array('host.one.test:8080', 'host.two.test:8080');
+		$trustedHostTestList = array('host.one.test', 'host.two.test', '[1fff:0:a88:85a3::ac1f]');
 		return array(
 			// empty defaults to true
 			array(null, 'host.one.test:8080', true),
@@ -249,8 +249,12 @@ class Test_Request extends PHPUnit_Framework_TestCase {
 
 			// trust list when defined
 			array($trustedHostTestList, 'host.two.test:8080', true),
-			array($trustedHostTestList, 'host.two.test:9999', false),
+			array($trustedHostTestList, 'host.two.test:9999', true),
 			array($trustedHostTestList, 'host.three.test:8080', false),
+			array($trustedHostTestList, 'host.two.test:8080:aa:222', false),
+			array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]', true),
+			array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801', true),
+			array($trustedHostTestList, '[1fff:0:a88:85a3::ac1f]:801:34', false),
 
 			// trust localhost regardless of trust list
 			array($trustedHostTestList, 'localhost', true),
-- 
GitLab


From 260a084d27a0015053f7d1c68652d1c573da950d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 13 Nov 2014 13:34:11 +0100
Subject: [PATCH 455/616] Add repair steps for legacy config files

Remove all ports from the trusted domains

Conflicts:
	lib/private/repair.php
	lib/repair/repairconfig.php
---
 lib/private/repair.php      |  3 ++-
 lib/repair/repairconfig.php | 29 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/lib/private/repair.php b/lib/private/repair.php
index 081aeb32c66..b5c1e9db58e 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -93,7 +93,8 @@ class Repair extends BasicEmitter {
 		$steps = array(
 			new InnoDB(),
 			new Collation(\OC::$server->getConfig(), \OC_DB::getConnection()),
-			new SearchLuceneTables()
+			new SearchLuceneTables(),
+			new RepairConfig()
 		);
 
 		//There is no need to delete all previews on every single update
diff --git a/lib/repair/repairconfig.php b/lib/repair/repairconfig.php
index e09d8e8fe7a..e9b322da826 100644
--- a/lib/repair/repairconfig.php
+++ b/lib/repair/repairconfig.php
@@ -12,8 +12,16 @@ use OC\Hooks\BasicEmitter;
 use OC\RepairStep;
 use Sabre\DAV\Exception;
 
+/**
+ * Class RepairConfig
+ *
+ * @package OC\Repair
+ */
 class RepairConfig extends BasicEmitter implements RepairStep {
 
+	/**
+	 * @return string
+	 */
 	public function getName() {
 		return 'Repair config';
 	}
@@ -23,6 +31,7 @@ class RepairConfig extends BasicEmitter implements RepairStep {
 	 */
 	public function run() {
 		$this->addSecret();
+		$this->removePortsFromTrustedDomains();
 	}
 
 	/**
@@ -34,4 +43,24 @@ class RepairConfig extends BasicEmitter implements RepairStep {
 			\OC::$server->getConfig()->setSystemValue('secret', $secret);
 		}
 	}
+
+
+	/**
+	 * Remove ports from existing trusted domains in config.php
+	 */
+	private function removePortsFromTrustedDomains() {
+		$trustedDomains = \OC::$server->getConfig()->getSystemValue('trusted_domains', array());
+		$newTrustedDomains = array();
+		foreach($trustedDomains as $domain) {
+			$pos = strrpos($domain, ':');
+			if ($pos !== false) {
+				$port = substr($domain, $pos + 1);
+				if (is_numeric($port)) {
+					$domain = substr($domain, 0, $pos);
+				}
+			}
+			$newTrustedDomains[] = $domain;
+		}
+		\OC::$server->getConfig()->setSystemValue('trusted_domains', $newTrustedDomains);
+	}
 }
-- 
GitLab


From cb118ce3710676fa95b02d8f5057e3842d723f53 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <oparoz@users.noreply.github.com>
Date: Tue, 18 Nov 2014 15:04:01 +0100
Subject: [PATCH 456/616] Replace deprecated switches

Warning: -convert-to is deprecated.  Use --convert-to instead.
Warning: -outdir is deprecated.  Use --outdir instead.
---
 lib/private/preview/office-cl.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php
index 42d2cbf34fc..f5c791e37f2 100644
--- a/lib/private/preview/office-cl.php
+++ b/lib/private/preview/office-cl.php
@@ -29,7 +29,7 @@ if (!\OC_Util::runningOnWindows()) {
 
 			$tmpDir = get_temp_dir();
 
-			$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId().'/') . ' --headless --nologo --nofirststartwizard --invisible --norestore -convert-to pdf -outdir ';
+			$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);
 
 			$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
-- 
GitLab


From 1b85f40cbeb339fb198fd7a7a1203d614fcb77cd Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 18 Nov 2014 17:14:26 +0100
Subject: [PATCH 457/616] $file only contains the filename and not the absolute
 path, that means that files in a subdirectory will not get properly resolved
 and an empty filesize is returned.

This feature only exists on master.
---
 apps/files_sharing/lib/controllers/sharecontroller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index a3d5b6d44a0..e5fd0f401c2 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -173,7 +173,7 @@ class ShareController extends Controller {
 		$shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled();
 		$shareTmpl['protected'] = isset($linkItem['share_with']) ? 'true' : 'false';
 		$shareTmpl['dir'] = $dir;
-		$shareTmpl['fileSize'] = \OCP\Util::humanFileSize(\OC\Files\Filesystem::filesize($file));
+		$shareTmpl['fileSize'] = \OCP\Util::humanFileSize(\OC\Files\Filesystem::filesize($originalSharePath));
 
 		// Show file list
 		if (Filesystem::is_dir($originalSharePath)) {
-- 
GitLab


From 5f07fb15dccb40339c326c0294f4d73a1d6e77b6 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 18 Nov 2014 14:47:48 +0100
Subject: [PATCH 458/616] Fix case-sensitivity

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

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index d9b8f0f4f30..d9d14f67c33 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -12,6 +12,6 @@
 
 $urlGenerator = new \OC\URLGenerator(\OC::$server->getConfig());
 $token = isset($_GET['t']) ? $_GET['t'] : '';
-$route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadshare' : 'files_sharing.sharecontroller.showshare';
+$route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare';
 
 OC_Response::redirect($urlGenerator->linkToRoute($route, array('token' => $token)));
-- 
GitLab


From f3ab4f3faf9c6f07c14cba406188d56a1e81b676 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 18 Nov 2014 14:54:08 +0100
Subject: [PATCH 459/616] Don't disclose relative directory path for single
 shared files of user

The "dir" key is used within the public sharing template to indicate in which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts.

However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path.
(For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template)

This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key.
---
 apps/files_sharing/lib/controllers/sharecontroller.php  | 2 +-
 apps/files_sharing/tests/controller/sharecontroller.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index e5fd0f401c2..da0761837d8 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -172,7 +172,7 @@ class ShareController extends Controller {
 		$shareTmpl['sharingToken'] = $token;
 		$shareTmpl['server2serversharing'] = Helper::isOutgoingServer2serverShareEnabled();
 		$shareTmpl['protected'] = isset($linkItem['share_with']) ? 'true' : 'false';
-		$shareTmpl['dir'] = $dir;
+		$shareTmpl['dir'] = '';
 		$shareTmpl['fileSize'] = \OCP\Util::humanFileSize(\OC\Files\Filesystem::filesize($originalSharePath));
 
 		// Show file list
diff --git a/apps/files_sharing/tests/controller/sharecontroller.php b/apps/files_sharing/tests/controller/sharecontroller.php
index 8dcb2475564..f13e5b2e497 100644
--- a/apps/files_sharing/tests/controller/sharecontroller.php
+++ b/apps/files_sharing/tests/controller/sharecontroller.php
@@ -153,7 +153,7 @@ class ShareControllerTest extends \PHPUnit_Framework_TestCase {
 			'sharingToken' => $this->token,
 			'server2serversharing' => true,
 			'protected' => 'true',
-			'dir' => '/',
+			'dir' => '',
 			'downloadURL' => null,
 			'fileSize' => '33 B'
 		);
-- 
GitLab


From a6ebb176102fcb157c529685cbaeb358950a054a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 18 Nov 2014 16:45:55 +0100
Subject: [PATCH 460/616] Remove unused variable and make Scrutinizer happy.

---
 apps/files_sharing/lib/controllers/sharecontroller.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index da0761837d8..8a192691942 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -23,7 +23,6 @@ use OCP\AppFramework\Controller;
 use OCP\IRequest;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http\RedirectResponse;
-use OCP\AppFramework\IApi;
 use OC\URLGenerator;
 use OC\AppConfig;
 use OCP\ILogger;
@@ -160,7 +159,6 @@ class ShareController extends Controller {
 			$originalSharePath .= $path;
 		}
 
-		$dir = dirname($originalSharePath);
 		$file = basename($originalSharePath);
 
 		$shareTmpl = array();
-- 
GitLab


From 256eff6eacb56e8252d6a67ac69058ab7c915eda Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 18 Nov 2014 22:12:14 +0100
Subject: [PATCH 461/616] User management search just searches users - adjust
 label of input field - fixes #10229

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

diff --git a/settings/templates/users/part.createuser.php b/settings/templates/users/part.createuser.php
index 20528964f68..d3ebbfb987a 100644
--- a/settings/templates/users/part.createuser.php
+++ b/settings/templates/users/part.createuser.php
@@ -29,6 +29,6 @@
 	</div>
 	<?php endif; ?>
 	<form autocomplete="off" id="usersearchform">
-		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users and Groups')); ?>" />
+		<input type="text" class="input userFilter" placeholder="<?php p($l->t('Search Users')); ?>" />
 	</form>
 </div>
-- 
GitLab


From d40bdfb35ea713c62f2306ad930777a7d60c2af1 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 18 Nov 2014 22:36:42 +0100
Subject: [PATCH 462/616] drop unneeded var_dump - fixes #9997

---
 lib/private/route/router.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/private/route/router.php b/lib/private/route/router.php
index 645d6141964..5d6f621dc38 100644
--- a/lib/private/route/router.php
+++ b/lib/private/route/router.php
@@ -243,7 +243,6 @@ class Router implements IRouter {
 		if (isset($parameters['action'])) {
 			$action = $parameters['action'];
 			if (!is_callable($action)) {
-				var_dump($action);
 				throw new \Exception('not a callable action');
 			}
 			unset($parameters['action']);
-- 
GitLab


From 61641293f47914413179b60c8124e5e966c772bb Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 18 Nov 2014 23:06:39 +0100
Subject: [PATCH 463/616] Only show undelete capability if files_trashbin is
 enabled

Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
---
 apps/files/lib/capabilities.php          |  1 -
 apps/files_trashbin/appinfo/routes.php   |  4 +++
 apps/files_trashbin/lib/capabilities.php | 32 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 apps/files_trashbin/lib/capabilities.php

diff --git a/apps/files/lib/capabilities.php b/apps/files/lib/capabilities.php
index d4820e931ba..690cc314ccd 100644
--- a/apps/files/lib/capabilities.php
+++ b/apps/files/lib/capabilities.php
@@ -15,7 +15,6 @@ class Capabilities {
 			'capabilities' => array(
 				'files' => array(
 					'bigfilechunking' => true,
-					'undelete' => true,
 					),
 				),
 			));
diff --git a/apps/files_trashbin/appinfo/routes.php b/apps/files_trashbin/appinfo/routes.php
index da268f4fdfd..56dbf382735 100644
--- a/apps/files_trashbin/appinfo/routes.php
+++ b/apps/files_trashbin/appinfo/routes.php
@@ -13,3 +13,7 @@ $this->create('files_trashbin_ajax_list', 'ajax/list.php')
 	->actionInclude('files_trashbin/ajax/list.php');
 $this->create('files_trashbin_ajax_undelete', 'ajax/undelete.php')
 	->actionInclude('files_trashbin/ajax/undelete.php');
+
+
+// Register with the capabilities API
+\OC_API::register('get', '/cloud/capabilities', array('OCA\Files_Trashbin\Capabilities', 'getCapabilities'), 'files_trashbin', \OC_API::USER_AUTH);
diff --git a/apps/files_trashbin/lib/capabilities.php b/apps/files_trashbin/lib/capabilities.php
new file mode 100644
index 00000000000..3f137d22b6f
--- /dev/null
+++ b/apps/files_trashbin/lib/capabilities.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+ 
+namespace OCA\Files_Trashbin;
+
+
+/**
+ * Class Capabilities
+ *
+ * @package OCA\Files_Trashbin
+ */
+class Capabilities {
+
+	/**
+	 * @return \OC_OCS_Result
+	 */
+	public static function getCapabilities() {
+		return new \OC_OCS_Result(array(
+			'capabilities' => array(
+				'files' => array(
+					'undelete' => true,
+					),
+				),
+			));
+	}
+	
+}
-- 
GitLab


From 705976ba0aada1f60b968119d3807611acdd6c0b Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 19 Nov 2014 01:54:59 -0500
Subject: [PATCH 464/616] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/pt_PT.js    | 4 ++--
 apps/files_sharing/l10n/pt_PT.json  | 4 ++--
 apps/files_trashbin/l10n/pt_PT.js   | 4 ++--
 apps/files_trashbin/l10n/pt_PT.json | 4 ++--
 core/l10n/fr.js                     | 2 +-
 core/l10n/fr.json                   | 2 +-
 lib/l10n/cs_CZ.js                   | 2 +-
 lib/l10n/cs_CZ.json                 | 2 +-
 lib/l10n/pt_PT.js                   | 2 ++
 lib/l10n/pt_PT.json                 | 2 ++
 settings/l10n/ast.js                | 1 -
 settings/l10n/ast.json              | 1 -
 settings/l10n/bg_BG.js              | 1 -
 settings/l10n/bg_BG.json            | 1 -
 settings/l10n/ca.js                 | 1 -
 settings/l10n/ca.json               | 1 -
 settings/l10n/cs_CZ.js              | 5 ++---
 settings/l10n/cs_CZ.json            | 5 ++---
 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/eo.js                 | 1 -
 settings/l10n/eo.json               | 1 -
 settings/l10n/es.js                 | 1 -
 settings/l10n/es.json               | 1 -
 settings/l10n/et_EE.js              | 1 -
 settings/l10n/et_EE.json            | 1 -
 settings/l10n/eu.js                 | 1 -
 settings/l10n/eu.json               | 1 -
 settings/l10n/fa.js                 | 1 -
 settings/l10n/fa.json               | 1 -
 settings/l10n/fi_FI.js              | 1 -
 settings/l10n/fi_FI.json            | 1 -
 settings/l10n/fr.js                 | 1 -
 settings/l10n/fr.json               | 1 -
 settings/l10n/gl.js                 | 1 -
 settings/l10n/gl.json               | 1 -
 settings/l10n/hr.js                 | 1 -
 settings/l10n/hr.json               | 1 -
 settings/l10n/hu_HU.js              | 1 -
 settings/l10n/hu_HU.json            | 1 -
 settings/l10n/id.js                 | 1 -
 settings/l10n/id.json               | 1 -
 settings/l10n/it.js                 | 1 -
 settings/l10n/it.json               | 1 -
 settings/l10n/ja.js                 | 1 -
 settings/l10n/ja.json               | 1 -
 settings/l10n/ko.js                 | 1 -
 settings/l10n/ko.json               | 1 -
 settings/l10n/mk.js                 | 1 -
 settings/l10n/mk.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/pl.js                 | 1 -
 settings/l10n/pl.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/sk_SK.js              | 1 -
 settings/l10n/sk_SK.json            | 1 -
 settings/l10n/sl.js                 | 1 -
 settings/l10n/sl.json               | 1 -
 settings/l10n/sq.js                 | 1 -
 settings/l10n/sq.json               | 1 -
 settings/l10n/sv.js                 | 1 -
 settings/l10n/sv.json               | 1 -
 settings/l10n/tr.js                 | 1 -
 settings/l10n/tr.json               | 1 -
 settings/l10n/uk.js                 | 1 -
 settings/l10n/uk.json               | 1 -
 settings/l10n/zh_CN.js              | 1 -
 settings/l10n/zh_CN.json            | 1 -
 84 files changed, 20 insertions(+), 90 deletions(-)

diff --git a/apps/files_sharing/l10n/pt_PT.js b/apps/files_sharing/l10n/pt_PT.js
index 5f287489876..9df977ef41d 100644
--- a/apps/files_sharing/l10n/pt_PT.js
+++ b/apps/files_sharing/l10n/pt_PT.js
@@ -8,9 +8,9 @@ OC.L10N.register(
     "Shared with you" : "Partilhado consigo ",
     "Shared with others" : "Partilhado com outros",
     "Shared by link" : "Partilhado pela hiperligação",
-    "No files have been shared with you yet." : "Ainda não partilhados quaisquer ficheuiros consigo.",
+    "No files have been shared with you yet." : "Ainda não foram partilhados quaisquer ficheiros consigo.",
     "You haven't shared any files yet." : "Ainda não partilhou quaisquer ficheiros.",
-    "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros por hiperligação.",
+    "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros através de hiperligação.",
     "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",
diff --git a/apps/files_sharing/l10n/pt_PT.json b/apps/files_sharing/l10n/pt_PT.json
index 5a14b7a3a1b..a1500f4d827 100644
--- a/apps/files_sharing/l10n/pt_PT.json
+++ b/apps/files_sharing/l10n/pt_PT.json
@@ -6,9 +6,9 @@
     "Shared with you" : "Partilhado consigo ",
     "Shared with others" : "Partilhado com outros",
     "Shared by link" : "Partilhado pela hiperligação",
-    "No files have been shared with you yet." : "Ainda não partilhados quaisquer ficheuiros consigo.",
+    "No files have been shared with you yet." : "Ainda não foram partilhados quaisquer ficheiros consigo.",
     "You haven't shared any files yet." : "Ainda não partilhou quaisquer ficheiros.",
-    "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros por hiperligação.",
+    "You haven't shared any files by link yet." : "Ainda não partilhou quaisquer ficheiros através de hiperligação.",
     "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",
diff --git a/apps/files_trashbin/l10n/pt_PT.js b/apps/files_trashbin/l10n/pt_PT.js
index 5d22e3bca21..303c8ad8c37 100644
--- a/apps/files_trashbin/l10n/pt_PT.js
+++ b/apps/files_trashbin/l10n/pt_PT.js
@@ -7,9 +7,9 @@ OC.L10N.register(
     "Restore" : "Restaurar",
     "Error" : "Erro",
     "restored" : "Restaurado",
-    "Nothing in here. Your trash bin is empty!" : "Não hà ficheiros. O lixo está vazio!",
+    "Nothing in here. Your trash bin is empty!" : "Não existe nada aqui. O seu caixote de lixo está vazio!",
     "Name" : "Nome",
-    "Deleted" : "Apagado",
+    "Deleted" : "Eliminado",
     "Delete" : "Eliminar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/pt_PT.json b/apps/files_trashbin/l10n/pt_PT.json
index 4feb75abd9a..431c381074a 100644
--- a/apps/files_trashbin/l10n/pt_PT.json
+++ b/apps/files_trashbin/l10n/pt_PT.json
@@ -5,9 +5,9 @@
     "Restore" : "Restaurar",
     "Error" : "Erro",
     "restored" : "Restaurado",
-    "Nothing in here. Your trash bin is empty!" : "Não hà ficheiros. O lixo está vazio!",
+    "Nothing in here. Your trash bin is empty!" : "Não existe nada aqui. O seu caixote de lixo está vazio!",
     "Name" : "Nome",
-    "Deleted" : "Apagado",
+    "Deleted" : "Eliminado",
     "Delete" : "Eliminar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 7be2663e412..0ff630f70ba 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -6,7 +6,7 @@ OC.L10N.register(
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Updated database" : "Base de données mise à jour",
     "Checked database schema update" : "Mise à jour du schéma de la base de données vérifiée",
-    "Checked database schema update for apps" : "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
+    "Checked database schema update for apps" : "Mise à jour du schéma de la base de données pour les applications vérifiée",
     "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
     "Disabled incompatible apps: %s" : "Applications incompatibles désactivées : %s",
     "No image or file provided" : "Aucun fichier fourni",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 591eabdcecb..0fed5b79ab7 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -4,7 +4,7 @@
     "Turned off maintenance mode" : "Mode de maintenance désactivé",
     "Updated database" : "Base de données mise à jour",
     "Checked database schema update" : "Mise à jour du schéma de la base de données vérifiée",
-    "Checked database schema update for apps" : "La mise à jour du schéma de la base de données pour les applications a été vérifiée",
+    "Checked database schema update for apps" : "Mise à jour du schéma de la base de données pour les applications vérifiée",
     "Updated \"%s\" to %s" : "Mise à jour de « %s » vers %s",
     "Disabled incompatible apps: %s" : "Applications incompatibles désactivées : %s",
     "No image or file provided" : "Aucun fichier fourni",
diff --git a/lib/l10n/cs_CZ.js b/lib/l10n/cs_CZ.js
index 24acd5af63d..b4419c8ef99 100644
--- a/lib/l10n/cs_CZ.js
+++ b/lib/l10n/cs_CZ.js
@@ -85,7 +85,7 @@ OC.L10N.register(
     "_%n hour ago_::_%n hours ago_" : ["před %n hodinou","před %n hodinami","před %n hodinami"],
     "today" : "dnes",
     "yesterday" : "včera",
-    "_%n day go_::_%n days ago_" : ["před %n dnem","před %n dny","před %n dny"],
+    "_%n day go_::_%n days ago_" : ["včera","před %n dny","před %n dny"],
     "last month" : "minulý měsíc",
     "_%n month ago_::_%n months ago_" : ["před %n měsícem","před %n měsíci","před %n měsíci"],
     "last year" : "minulý rok",
diff --git a/lib/l10n/cs_CZ.json b/lib/l10n/cs_CZ.json
index 14505994239..a487b849291 100644
--- a/lib/l10n/cs_CZ.json
+++ b/lib/l10n/cs_CZ.json
@@ -83,7 +83,7 @@
     "_%n hour ago_::_%n hours ago_" : ["před %n hodinou","před %n hodinami","před %n hodinami"],
     "today" : "dnes",
     "yesterday" : "včera",
-    "_%n day go_::_%n days ago_" : ["před %n dnem","před %n dny","před %n dny"],
+    "_%n day go_::_%n days ago_" : ["včera","před %n dny","před %n dny"],
     "last month" : "minulý měsíc",
     "_%n month ago_::_%n months ago_" : ["před %n měsícem","před %n měsíci","před %n měsíci"],
     "last year" : "minulý rok",
diff --git a/lib/l10n/pt_PT.js b/lib/l10n/pt_PT.js
index c70e373a11c..0bbac09c9b1 100644
--- a/lib/l10n/pt_PT.js
+++ b/lib/l10n/pt_PT.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "O nome da aplicação não foi especificado",
     "Unknown filetype" : "Ficheiro desconhecido",
     "Invalid image" : "Imagem inválida",
+    "Database Error" : "Erro da Base de Dados",
+    "Please contact your system administrator." : "Por favor contacte o administrador do sistema.",
     "web services under your control" : "serviços web sob o seu controlo",
     "App directory already exists" : "A directoria da aplicação já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
diff --git a/lib/l10n/pt_PT.json b/lib/l10n/pt_PT.json
index 85461b0fae6..067dc4b9751 100644
--- a/lib/l10n/pt_PT.json
+++ b/lib/l10n/pt_PT.json
@@ -15,6 +15,8 @@
     "No app name specified" : "O nome da aplicação não foi especificado",
     "Unknown filetype" : "Ficheiro desconhecido",
     "Invalid image" : "Imagem inválida",
+    "Database Error" : "Erro da Base de Dados",
+    "Please contact your system administrator." : "Por favor contacte o administrador do sistema.",
     "web services under your control" : "serviços web sob o seu controlo",
     "App directory already exists" : "A directoria da aplicação já existe",
     "Can't create app folder. Please fix permissions. %s" : "Não foi possível criar a pasta da aplicação. Por favor verifique as permissões. %s",
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index c2c64a38fff..d3e52d6c8f8 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -206,7 +206,6 @@ OC.L10N.register(
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
-    "Search Users and Groups" : "Guetar Usuarios y Grupos",
     "Add Group" : "Amestar grupu",
     "Group" : "Grupu",
     "Everyone" : "Toos",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index c903f1d1203..268ca485abe 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -204,7 +204,6 @@
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña d'alministración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduz la contraseña de recuperación col envís de recuperar los ficheros de los usuarios mientres el cambéu de contraseña.",
-    "Search Users and Groups" : "Guetar Usuarios y Grupos",
     "Add Group" : "Amestar grupu",
     "Group" : "Grupu",
     "Everyone" : "Toos",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 374f4e418ad..238dd8cc6bf 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Създаване",
     "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
     "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
-    "Search Users and Groups" : "Търси Потребители и Групи",
     "Add Group" : "Добави Група",
     "Group" : "Група",
     "Everyone" : "Всички",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index 60228bd7617..b31ce6717f1 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -220,7 +220,6 @@
     "Create" : "Създаване",
     "Admin Recovery Password" : "Възстановяване на Администраторска Парола",
     "Enter the recovery password in order to recover the users files during password change" : "Въведи паролата за възстановяване, за да възстановиш файловете на потребителите при промяна на паролата.",
-    "Search Users and Groups" : "Търси Потребители и Групи",
     "Add Group" : "Добави Група",
     "Group" : "Група",
     "Everyone" : "Всички",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 166269d39fd..dd481f1379b 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -194,7 +194,6 @@ OC.L10N.register(
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
-    "Search Users and Groups" : "Cerca usuaris i grups",
     "Add Group" : "Afegeix grup",
     "Group" : "Grup",
     "Everyone" : "Tothom",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 42e2f9bc17e..3212069cbea 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -192,7 +192,6 @@
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
-    "Search Users and Groups" : "Cerca usuaris i grups",
     "Add Group" : "Afegeix grup",
     "Group" : "Grup",
     "Everyone" : "Tothom",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 740c0e9442b..18406a70e24 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -144,8 +144,8 @@ OC.L10N.register(
     "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.",
     "Enforce HTTPS" : "Vynutit HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vynutí připojování klientů k %s šifrovaným spojením.",
-    "Enforce HTTPS for subdomains" : "Vynutit HTTPS pro poddomény",
-    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vynutí připojování klientů k %s a poddoménám šifrovaným spojením.",
+    "Enforce HTTPS for subdomains" : "Vynutit HTTPS pro subdomény",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vynutí připojování klientů k %s a subdoménám šifrovaným spojením.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
     "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-    "Search Users and Groups" : "Prohledat uživatele a skupiny",
     "Add Group" : "Přidat skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všichni",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 533de97044e..376d1007771 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -142,8 +142,8 @@
     "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.",
     "Enforce HTTPS" : "Vynutit HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Vynutí připojování klientů k %s šifrovaným spojením.",
-    "Enforce HTTPS for subdomains" : "Vynutit HTTPS pro poddomény",
-    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vynutí připojování klientů k %s a poddoménám šifrovaným spojením.",
+    "Enforce HTTPS for subdomains" : "Vynutit HTTPS pro subdomény",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Vynutí připojování klientů k %s a subdoménám šifrovaným spojením.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Připojte se k %s přes HTTPS pro povolení nebo zakázání vynucení SSL.",
     "This is used for sending out notifications." : "Toto se používá pro odesílání upozornění.",
     "Send mode" : "Mód odesílání",
@@ -220,7 +220,6 @@
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
     "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
-    "Search Users and Groups" : "Prohledat uživatele a skupiny",
     "Add Group" : "Přidat skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všichni",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index f0567ba20f5..fa39a3a4657 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
     "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
-    "Search Users and Groups" : "Søg efter brugere og grupper",
     "Add Group" : "Tilføj Gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 9f68b18a743..f2b0c136368 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -220,7 +220,6 @@
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
     "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
-    "Search Users and Groups" : "Søg efter brugere og grupper",
     "Add Group" : "Tilføj Gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index bc33e10ac24..01c1495a535 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
     "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-    "Search Users and Groups" : "Nutzer und Gruppen suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index b345d6b6540..9a01aa2dbd7 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -220,7 +220,6 @@
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
     "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-    "Search Users and Groups" : "Nutzer und Gruppen suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index ae1249a2c51..08726f1afc9 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Erstellen",
     "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
     "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-    "Search Users and Groups" : "Benutzer und Gruppen suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index a2ad5a222df..700d8c03a42 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -220,7 +220,6 @@
     "Create" : "Erstellen",
     "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
     "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
-    "Search Users and Groups" : "Benutzer und Gruppen suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index c10f68207ff..f6669e1bfcd 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -218,7 +218,6 @@ OC.L10N.register(
     "Create" : "Δημιουργία",
     "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
     "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
-    "Search Users and Groups" : "Αναζήτηση Χρηστών και Ομάδων",
     "Add Group" : "Προσθήκη Ομάδας",
     "Group" : "Ομάδα",
     "Everyone" : "Όλοι",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 05388c7408f..8b0fdce6501 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -216,7 +216,6 @@
     "Create" : "Δημιουργία",
     "Admin Recovery Password" : "Κωδικός Επαναφοράς Διαχειριστή ",
     "Enter the recovery password in order to recover the users files during password change" : "Εισάγετε το συνθηματικό ανάκτησης ώστε να ανακτήσετε τα αρχεία χρηστών κατά την αλλαγή συνθηματικού",
-    "Search Users and Groups" : "Αναζήτηση Χρηστών και Ομάδων",
     "Add Group" : "Προσθήκη Ομάδας",
     "Group" : "Ομάδα",
     "Everyone" : "Όλοι",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 9d2358b6cbd..2847fcd65a0 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
-    "Search Users and Groups" : "Search Users and Groups",
     "Add Group" : "Add Group",
     "Group" : "Group",
     "Everyone" : "Everyone",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 1991825e663..989044bafdb 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -220,7 +220,6 @@
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
-    "Search Users and Groups" : "Search Users and Groups",
     "Add Group" : "Add Group",
     "Group" : "Group",
     "Everyone" : "Everyone",
diff --git a/settings/l10n/eo.js b/settings/l10n/eo.js
index ca5eeb55d71..ff757ce143c 100644
--- a/settings/l10n/eo.js
+++ b/settings/l10n/eo.js
@@ -137,7 +137,6 @@ OC.L10N.register(
     "Delete Encryption Keys" : "Forigi ĉifroklavojn",
     "Username" : "Uzantonomo",
     "Create" : "Krei",
-    "Search Users and Groups" : "Serĉi uzantojn kaj grupojn",
     "Add Group" : "Aldoni grupon",
     "Group" : "Grupo",
     "Everyone" : "Ĉiuj",
diff --git a/settings/l10n/eo.json b/settings/l10n/eo.json
index 584f1bbe127..35af2f7f22f 100644
--- a/settings/l10n/eo.json
+++ b/settings/l10n/eo.json
@@ -135,7 +135,6 @@
     "Delete Encryption Keys" : "Forigi ĉifroklavojn",
     "Username" : "Uzantonomo",
     "Create" : "Krei",
-    "Search Users and Groups" : "Serĉi uzantojn kaj grupojn",
     "Add Group" : "Aldoni grupon",
     "Group" : "Grupo",
     "Everyone" : "Ĉiuj",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index b43606884df..eeae90c5e80 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-    "Search Users and Groups" : "Buscar usuarios y grupos",
     "Add Group" : "Agregar grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 3532c2f1ff3..2a80ccdde83 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -220,7 +220,6 @@
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
-    "Search Users and Groups" : "Buscar usuarios y grupos",
     "Add Group" : "Agregar grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/et_EE.js b/settings/l10n/et_EE.js
index a01c375f15a..0fac182b7cd 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Lisa",
     "Admin Recovery Password" : "Admini parooli taastamine",
     "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
-    "Search Users and Groups" : "Otsi kasutajaid ja gruppe",
     "Add Group" : "Lisa grupp",
     "Group" : "Grupp",
     "Everyone" : "Igaüks",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index 478545ed065..a7fe59781dd 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -220,7 +220,6 @@
     "Create" : "Lisa",
     "Admin Recovery Password" : "Admini parooli taastamine",
     "Enter the recovery password in order to recover the users files during password change" : "Sisesta taasteparool kasutaja failide taastamiseks paroolivahetuse käigus",
-    "Search Users and Groups" : "Otsi kasutajaid ja gruppe",
     "Add Group" : "Lisa grupp",
     "Group" : "Grupp",
     "Everyone" : "Igaüks",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index 3a5ba67ed83..36e01cae8c1 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -213,7 +213,6 @@ OC.L10N.register(
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
     "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
-    "Search Users and Groups" : "Bilatu erabiltzaileak eta taldeak",
     "Add Group" : "Gehitu taldea",
     "Group" : "Taldea",
     "Everyone" : "Edonor",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index 0668428251b..d5ea5f74dbc 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -211,7 +211,6 @@
     "Create" : "Sortu",
     "Admin Recovery Password" : "Administratzailearen pasahitza berreskuratzea",
     "Enter the recovery password in order to recover the users files during password change" : "Berreskuratze pasahitza idatzi pasahitz aldaketan erabiltzaileen fitxategiak berreskuratzeko",
-    "Search Users and Groups" : "Bilatu erabiltzaileak eta taldeak",
     "Add Group" : "Gehitu taldea",
     "Group" : "Taldea",
     "Everyone" : "Edonor",
diff --git a/settings/l10n/fa.js b/settings/l10n/fa.js
index 45ece7beff6..624c124888b 100644
--- a/settings/l10n/fa.js
+++ b/settings/l10n/fa.js
@@ -170,7 +170,6 @@ OC.L10N.register(
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
     "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
-    "Search Users and Groups" : "جستجوی کاربران و گروه ها",
     "Add Group" : "افزودن گروه",
     "Group" : "گروه",
     "Everyone" : "همه",
diff --git a/settings/l10n/fa.json b/settings/l10n/fa.json
index c91afde0fdb..793551cfe56 100644
--- a/settings/l10n/fa.json
+++ b/settings/l10n/fa.json
@@ -168,7 +168,6 @@
     "Create" : "ایجاد کردن",
     "Admin Recovery Password" : "مدیریت بازیابی رمز عبور",
     "Enter the recovery password in order to recover the users files during password change" : "در حین تغییر رمز عبور به منظور بازیابی فایل های کاربران، رمز عبور بازیابی را وارد کنید",
-    "Search Users and Groups" : "جستجوی کاربران و گروه ها",
     "Add Group" : "افزودن گروه",
     "Group" : "گروه",
     "Everyone" : "همه",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 18037bed46d..c031dcb043e 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -214,7 +214,6 @@ OC.L10N.register(
     "Username" : "Käyttäjätunnus",
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
-    "Search Users and Groups" : "Etsi käyttäjiä ja ryhmiä",
     "Add Group" : "Lisää ryhmä",
     "Group" : "Ryhmä",
     "Everyone" : "Kaikki",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index b44ff19ad29..17bb06c2f4c 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -212,7 +212,6 @@
     "Username" : "Käyttäjätunnus",
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
-    "Search Users and Groups" : "Etsi käyttäjiä ja ryhmiä",
     "Add Group" : "Lisää ryhmä",
     "Group" : "Ryhmä",
     "Everyone" : "Kaikki",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 5485f9a94f8..cf18809aa7d 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Créer",
     "Admin Recovery Password" : "Récupération du mot de passe administrateur",
     "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe",
-    "Search Users and Groups" : "Chercher parmi les utilisateurs et groupes",
     "Add Group" : "Ajouter un groupe",
     "Group" : "Groupe",
     "Everyone" : "Tout le monde",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 22b2a86f154..d9e128e4d9e 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -220,7 +220,6 @@
     "Create" : "Créer",
     "Admin Recovery Password" : "Récupération du mot de passe administrateur",
     "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe",
-    "Search Users and Groups" : "Chercher parmi les utilisateurs et groupes",
     "Add Group" : "Ajouter un groupe",
     "Group" : "Groupe",
     "Everyone" : "Tout le monde",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 778020d821e..2dc00590d69 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -220,7 +220,6 @@ OC.L10N.register(
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
-    "Search Users and Groups" : "Buscar usuarios e grupos",
     "Add Group" : "Engadir un grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 3ceb32390dd..18d57342f8f 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -218,7 +218,6 @@
     "Create" : "Crear",
     "Admin Recovery Password" : "Contrasinal de recuperación do administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Introduza o contrasinal de recuperación para recuperar os ficheiros dos usuarios durante o cambio de contrasinal",
-    "Search Users and Groups" : "Buscar usuarios e grupos",
     "Add Group" : "Engadir un grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index 806ec98e984..618d757078e 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -207,7 +207,6 @@ OC.L10N.register(
     "Create" : "Kreirajte",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
     "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
-    "Search Users and Groups" : "Pretražite korisnike i grupe",
     "Add Group" : "Dodajte grupu",
     "Group" : "Grupa",
     "Everyone" : "Svi",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index 258a54c6f64..3ebd6ae2d1a 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -205,7 +205,6 @@
     "Create" : "Kreirajte",
     "Admin Recovery Password" : "Admin lozinka za oporavak",
     "Enter the recovery password in order to recover the users files during password change" : "Unesite lozinku za oporavak da biste oporavili korisničke datoteke tijekom promjene lozinke",
-    "Search Users and Groups" : "Pretražite korisnike i grupe",
     "Add Group" : "Dodajte grupu",
     "Group" : "Grupa",
     "Everyone" : "Svi",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 5b7c2f97771..828922fbebc 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -201,7 +201,6 @@ OC.L10N.register(
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
     "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
-    "Search Users and Groups" : "Keresés a felhasználók és a csoportok között",
     "Add Group" : "Csoport létrehozása",
     "Group" : "Csoport",
     "Everyone" : "Mindenki",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index 46616b5291b..d4db40c1d61 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -199,7 +199,6 @@
     "Create" : "Létrehozás",
     "Admin Recovery Password" : "Adminisztrátori jelszó az állományok visszanyerésére",
     "Enter the recovery password in order to recover the users files during password change" : "Adja meg az adatok visszanyeréséhez szükséges jelszót arra az esetre, ha a felhasználók megváltoztatják a jelszavukat",
-    "Search Users and Groups" : "Keresés a felhasználók és a csoportok között",
     "Add Group" : "Csoport létrehozása",
     "Group" : "Csoport",
     "Everyone" : "Mindenki",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 74dfa4c9b0f..261734b9997 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -218,7 +218,6 @@ OC.L10N.register(
     "Create" : "Buat",
     "Admin Recovery Password" : "Sandi pemulihan Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
-    "Search Users and Groups" : "Telusuri Pengguna dan Grup",
     "Add Group" : "Tambah Grup",
     "Group" : "Grup",
     "Everyone" : "Semua orang",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index 326ab4c6bca..e64d574f932 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -216,7 +216,6 @@
     "Create" : "Buat",
     "Admin Recovery Password" : "Sandi pemulihan Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Masukkan sandi pemulihan untuk memulihkan berkas pengguna saat penggantian sandi",
-    "Search Users and Groups" : "Telusuri Pengguna dan Grup",
     "Add Group" : "Tambah Grup",
     "Group" : "Grup",
     "Everyone" : "Semua orang",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 82387034738..522b2f2fb96 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
     "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
-    "Search Users and Groups" : "Cerca utenti e gruppi",
     "Add Group" : "Aggiungi gruppo",
     "Group" : "Gruppo",
     "Everyone" : "Chiunque",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 8c75c4ca091..2ac61e1cb90 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -220,7 +220,6 @@
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
     "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
-    "Search Users and Groups" : "Cerca utenti e gruppi",
     "Add Group" : "Aggiungi gruppo",
     "Group" : "Gruppo",
     "Everyone" : "Chiunque",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index 4bc56102af4..b50eb561ebc 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
-    "Search Users and Groups" : "ユーザーとグループを検索",
     "Add Group" : "グループを追加",
     "Group" : "グループ",
     "Everyone" : "すべてのユーザー",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 0a01be40311..0668e178753 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -220,7 +220,6 @@
     "Create" : "作成",
     "Admin Recovery Password" : "管理者リカバリパスワード",
     "Enter the recovery password in order to recover the users files during password change" : "パスワード変更時のユーザーのファイルを回復するため、リカバリパスワードを入力してください",
-    "Search Users and Groups" : "ユーザーとグループを検索",
     "Add Group" : "グループを追加",
     "Group" : "グループ",
     "Everyone" : "すべてのユーザー",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index f669d5d1b25..b8239d32215 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -157,7 +157,6 @@ OC.L10N.register(
     "Create" : "만들기",
     "Admin Recovery Password" : "관리자 복구 암호",
     "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
-    "Search Users and Groups" : "사용자와 그룹 검색",
     "Add Group" : "그룹 추가",
     "Group" : "그룹",
     "Admins" : "관리자",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index bde465dddc9..095ac5adedd 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -155,7 +155,6 @@
     "Create" : "만들기",
     "Admin Recovery Password" : "관리자 복구 암호",
     "Enter the recovery password in order to recover the users files during password change" : "암호 변경 시 변경된 사용자 파일을 복구하려면 복구 암호를 입력하십시오",
-    "Search Users and Groups" : "사용자와 그룹 검색",
     "Add Group" : "그룹 추가",
     "Group" : "그룹",
     "Admins" : "관리자",
diff --git a/settings/l10n/mk.js b/settings/l10n/mk.js
index c331bab6c8d..57245605ae0 100644
--- a/settings/l10n/mk.js
+++ b/settings/l10n/mk.js
@@ -148,7 +148,6 @@ OC.L10N.register(
     "Username" : "Корисничко име",
     "Create" : "Создај",
     "Admin Recovery Password" : "Обновување на Admin лозинката",
-    "Search Users and Groups" : "Барај корисници и групи",
     "Add Group" : "Додади група",
     "Group" : "Група",
     "Everyone" : "Секој",
diff --git a/settings/l10n/mk.json b/settings/l10n/mk.json
index bcc0841a398..4445c65d6ec 100644
--- a/settings/l10n/mk.json
+++ b/settings/l10n/mk.json
@@ -146,7 +146,6 @@
     "Username" : "Корисничко име",
     "Create" : "Создај",
     "Admin Recovery Password" : "Обновување на Admin лозинката",
-    "Search Users and Groups" : "Барај корисници и групи",
     "Add Group" : "Додади група",
     "Group" : "Група",
     "Everyone" : "Секој",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index feb8c9bb372..03c8b3f53f6 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -208,7 +208,6 @@ OC.L10N.register(
     "Create" : "Opprett",
     "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
     "Enter the recovery password in order to recover the users files during password change" : "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
-    "Search Users and Groups" : "Søk i brukere og grupper",
     "Add Group" : "Legg til gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index 593bc0d2e07..a422cd25590 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -206,7 +206,6 @@
     "Create" : "Opprett",
     "Admin Recovery Password" : "Administrativt gjenopprettingspassord",
     "Enter the recovery password in order to recover the users files during password change" : "Legg inn gjenopprettingspassordet for å gjenopprette brukerfilene når passordet endres",
-    "Search Users and Groups" : "Søk i brukere og grupper",
     "Add Group" : "Legg til gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 2b4f2c6c4ed..8bc46cc45ae 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
     "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
-    "Search Users and Groups" : "Zoeken naar gebruikers en groepen",
     "Add Group" : "Toevoegen groep",
     "Group" : "Groep",
     "Everyone" : "Iedereen",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index e27106179ee..72bece28415 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -220,7 +220,6 @@
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
     "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
-    "Search Users and Groups" : "Zoeken naar gebruikers en groepen",
     "Add Group" : "Toevoegen groep",
     "Group" : "Groep",
     "Everyone" : "Iedereen",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index 14108c49ae2..ec78dbd3d45 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -217,7 +217,6 @@ OC.L10N.register(
     "Create" : "Utwórz",
     "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
     "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
-    "Search Users and Groups" : "Przeszukuj użytkowników i grupy",
     "Add Group" : "Dodaj grupę",
     "Group" : "Grupa",
     "Everyone" : "Wszyscy",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index b30513d8a8a..e3eeee75e16 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -215,7 +215,6 @@
     "Create" : "Utwórz",
     "Admin Recovery Password" : "Odzyskiwanie hasła administratora",
     "Enter the recovery password in order to recover the users files during password change" : "Wpisz hasło odzyskiwania, aby odzyskać pliki użytkowników podczas zmiany hasła",
-    "Search Users and Groups" : "Przeszukuj użytkowników i grupy",
     "Add Group" : "Dodaj grupę",
     "Group" : "Grupa",
     "Everyone" : "Wszyscy",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 16c855ea18f..30346ed6e58 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
-    "Search Users and Groups" : "Pesquisar Usuários e Grupos",
     "Add Group" : "Adicionar Grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 0d9a8cb5a89..0d89f75f1d1 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -220,7 +220,6 @@
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
-    "Search Users and Groups" : "Pesquisar Usuários e Grupos",
     "Add Group" : "Adicionar Grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 092a8d7c2a2..8a5b941d8c7 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperar password de administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
-    "Search Users and Groups" : "Pesquisa Utilizadores e Grupos",
     "Add Group" : "Adicionar grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 6274d83d290..8a3882cd7b1 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -220,7 +220,6 @@
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperar password de administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
-    "Search Users and Groups" : "Pesquisa Utilizadores e Grupos",
     "Add Group" : "Adicionar grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 013831e6823..d792a7e1094 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Создать",
     "Admin Recovery Password" : "Восстановление пароля администратора",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
-    "Search Users and Groups" : "Искать пользователей и групп",
     "Add Group" : "Добавить группу",
     "Group" : "Группа",
     "Everyone" : "Все",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 7ecf1ed26d5..56dfc80cffd 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -220,7 +220,6 @@
     "Create" : "Создать",
     "Admin Recovery Password" : "Восстановление пароля администратора",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
-    "Search Users and Groups" : "Искать пользователей и групп",
     "Add Group" : "Добавить группу",
     "Group" : "Группа",
     "Everyone" : "Все",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 36dc76b6358..b94ada408f8 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -220,7 +220,6 @@ OC.L10N.register(
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
     "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
-    "Search Users and Groups" : "Prehľadať používateľov a skupiny",
     "Add Group" : "Pridať skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všetci",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index fa42832c52e..3af85642551 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -218,7 +218,6 @@
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
     "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
-    "Search Users and Groups" : "Prehľadať používateľov a skupiny",
     "Add Group" : "Pridať skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všetci",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index 4abfb13d7fb..2a8cab07011 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -212,7 +212,6 @@ OC.L10N.register(
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
     "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
-    "Search Users and Groups" : "Iskanje uporabnikov in skupin",
     "Add Group" : "Dodaj skupino",
     "Group" : "Skupina",
     "Everyone" : "Vsi",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 5a6e38c9439..9d9090e0571 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -210,7 +210,6 @@
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
     "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
-    "Search Users and Groups" : "Iskanje uporabnikov in skupin",
     "Add Group" : "Dodaj skupino",
     "Group" : "Skupina",
     "Everyone" : "Vsi",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index 40697726184..ec4d9667170 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -101,7 +101,6 @@ OC.L10N.register(
     "Create" : "Krijo",
     "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
-    "Search Users and Groups" : "Kërko Përdorues apo Grupe",
     "Add Group" : "Shto Grup",
     "Group" : "Grup",
     "Everyone" : "Të gjithë",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index e3671303a3b..4c8a590d48c 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -99,7 +99,6 @@
     "Create" : "Krijo",
     "Admin Recovery Password" : "Rigjetja e fjalëkalimit të Admin",
     "Enter the recovery password in order to recover the users files during password change" : "Jepni fjalëkalimin e rigjetjes për të rigjetur skedarët e përdoruesit gjatë ndryshimit të fjalëkalimit",
-    "Search Users and Groups" : "Kërko Përdorues apo Grupe",
     "Add Group" : "Shto Grup",
     "Group" : "Grup",
     "Everyone" : "Të gjithë",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 0487e5efd8b..842e47beebe 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -198,7 +198,6 @@ OC.L10N.register(
     "Create" : "Skapa",
     "Admin Recovery Password" : "Admin återställningslösenord",
     "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
-    "Search Users and Groups" : "Sök Användare och Grupper",
     "Add Group" : "Lägg till Grupp",
     "Group" : "Grupp",
     "Everyone" : "Alla",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index 03b1899ce1e..d1f02536e4e 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -196,7 +196,6 @@
     "Create" : "Skapa",
     "Admin Recovery Password" : "Admin återställningslösenord",
     "Enter the recovery password in order to recover the users files during password change" : "Ange återställningslösenordet för att återställa användarnas filer vid lösenordsbyte",
-    "Search Users and Groups" : "Sök Användare och Grupper",
     "Add Group" : "Lägg till Grupp",
     "Group" : "Grupp",
     "Everyone" : "Alla",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index cf25a212c27..0a493f28e86 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -222,7 +222,6 @@ OC.L10N.register(
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
     "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
-    "Search Users and Groups" : "Kullanıcı ve Grupları Ara",
     "Add Group" : "Grup Ekle",
     "Group" : "Grup",
     "Everyone" : "Herkes",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 3bb8cce46b6..255c271496e 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -220,7 +220,6 @@
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
     "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
-    "Search Users and Groups" : "Kullanıcı ve Grupları Ara",
     "Add Group" : "Grup Ekle",
     "Group" : "Grup",
     "Everyone" : "Herkes",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 94a0ac7af01..b51ffda2258 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -220,7 +220,6 @@ OC.L10N.register(
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
     "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
-    "Search Users and Groups" : "Шукати користувачів та групи",
     "Add Group" : "Додати групу",
     "Group" : "Група",
     "Everyone" : "Всі",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index abe77748e17..08cbdcdd3a5 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -218,7 +218,6 @@
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
     "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
-    "Search Users and Groups" : "Шукати користувачів та групи",
     "Add Group" : "Додати групу",
     "Group" : "Група",
     "Everyone" : "Всі",
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index af5b786c789..ddb0bea6a4d 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -209,7 +209,6 @@ OC.L10N.register(
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
     "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
-    "Search Users and Groups" : "搜索用户和组",
     "Add Group" : "增加组",
     "Group" : "分组",
     "Everyone" : "所有人",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 35d784f8a3f..847d4293791 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -207,7 +207,6 @@
     "Create" : "创建",
     "Admin Recovery Password" : "管理恢复密码",
     "Enter the recovery password in order to recover the users files during password change" : "输入恢复密码来在更改密码的时候恢复用户文件",
-    "Search Users and Groups" : "搜索用户和组",
     "Add Group" : "增加组",
     "Group" : "分组",
     "Everyone" : "所有人",
-- 
GitLab


From cd60a27ad671b0e2c5dc117436836da012e0d13e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 19 Nov 2014 10:59:38 +0100
Subject: [PATCH 465/616] Remove stray generateUrl

---
 core/js/l10n.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/core/js/l10n.js b/core/js/l10n.js
index d091acea049..2db4609ded2 100644
--- a/core/js/l10n.js
+++ b/core/js/l10n.js
@@ -45,11 +45,6 @@ OC.L10N = {
 
 		var self = this;
 		var deferred = $.Deferred();
-		var url = OC.generateUrl(
-			'apps/{app}/l10n/{locale}.json',
-			{app: appName, locale: OC.getLocale()}
-		);
-
 		var url = OC.filePath(appName, 'l10n', OC.getLocale() + '.json');
 
 		// load JSON translation bundle per AJAX
-- 
GitLab


From 4e90c44301cdacc85f31259bff887b035a1b9716 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Wed, 19 Nov 2014 12:00:41 +0100
Subject: [PATCH 466/616] add postfix

add postfix
---
 lib/private/appframework/routing/routeconfig.php |  8 +++++++-
 tests/lib/appframework/routing/RoutingTest.php   | 15 ++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/lib/private/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php
index 91687b9c83c..9816b062b8d 100644
--- a/lib/private/appframework/routing/routeconfig.php
+++ b/lib/private/appframework/routing/routeconfig.php
@@ -69,6 +69,12 @@ class RouteConfig {
 		$simpleRoutes = isset($routes['routes']) ? $routes['routes'] : array();
 		foreach ($simpleRoutes as $simpleRoute) {
 			$name = $simpleRoute['name'];
+			$postfix = '';
+
+			if (isset($simpleRoute['postfix'])) {
+				$postfix = $simpleRoute['postfix'];
+			}
+
 			$url = $simpleRoute['url'];
 			$verb = isset($simpleRoute['verb']) ? strtoupper($simpleRoute['verb']) : 'GET';
 
@@ -84,7 +90,7 @@ class RouteConfig {
 
 			// register the route
 			$handler = new RouteActionHandler($this->container, $controllerName, $actionName);
-			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action, $url)
+			$router = $this->router->create($this->appName.'.'.$controller.'.'.$action . $postfix, $url)
 							->method($verb)
 							->action($handler);
 
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php
index a1d9a51a3c8..503bad837c2 100644
--- a/tests/lib/appframework/routing/RoutingTest.php
+++ b/tests/lib/appframework/routing/RoutingTest.php
@@ -54,6 +54,15 @@ class RoutingTest extends \PHPUnit_Framework_TestCase
 		$this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', array(), array('param' => 'foobar'));
 	}
 
+	public function testSimpleRouteWithPostfix()
+	{
+		$routes = array('routes' => array(
+			array('name' => 'folders#open', 'url' => '/folders/{folderId}/open', 'verb' => 'delete', 'postfix' => '_something')
+		));
+
+		$this->assertSimpleRoute($routes, 'folders.open', 'DELETE', '/folders/{folderId}/open', 'FoldersController', 'open', array(), array(), '_something');
+	}
+
 
 	/**
 	 * @expectedException \UnexpectedValueException
@@ -104,8 +113,12 @@ class RoutingTest extends \PHPUnit_Framework_TestCase
 	 * @param string $controllerName
 	 * @param string $actionName
 	 */
-	private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName, array $requirements=array(), array $defaults=array())
+	private function assertSimpleRoute($routes, $name, $verb, $url, $controllerName, $actionName, array $requirements=array(), array $defaults=array(), $postfix='')
 	{
+		if ($postfix) {
+			$name .= $postfix;
+		}
+
 		// route mocks
 		$route = $this->mockRoute($verb, $controllerName, $actionName, $requirements, $defaults);
 
-- 
GitLab


From fef9d4218c5012db4538f7ca3e4ffd267e351c80 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 19 Nov 2014 13:06:22 +0100
Subject: [PATCH 467/616] replace all static calls to OC_Config and
 OC_Preferences to calls to OCP\IConfig

---
 lib/base.php | 52 +++++++++++++++++++++++++++++-----------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index d365a4a306f..3e60b37934a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -216,7 +216,7 @@ class OC {
 
 	public static function checkInstalled() {
 		// Redirect to installer if not installed
-		if (!OC_Config::getValue('installed', false) && OC::$SUBURI != '/index.php') {
+		if (!\OC::$server->getConfig()->getSystemValue('installed', false) && OC::$SUBURI != '/index.php') {
 			if (OC::$CLI) {
 				throw new Exception('Not installed');
 			} else {
@@ -254,7 +254,7 @@ class OC {
 
 	public static function checkMaintenanceMode() {
 		// Allow ajax update script to execute without being stopped
-		if (OC_Config::getValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
+		if (\OC::$server->getConfig()->getSystemValue('maintenance', false) && OC::$SUBURI != '/core/ajax/update.php') {
 			// send http status 503
 			header('HTTP/1.1 503 Service Temporarily Unavailable');
 			header('Status: 503 Service Temporarily Unavailable');
@@ -271,7 +271,7 @@ class OC {
 	public static function checkSingleUserMode() {
 		$user = OC_User::getUserSession()->getUser();
 		$group = OC_Group::getManager()->get('admin');
-		if ($user && OC_Config::getValue('singleuser', false) && !$group->inGroup($user)) {
+		if ($user && \OC::$server->getConfig()->getSystemValue('singleuser', false) && !$group->inGroup($user)) {
 			// send http status 503
 			header('HTTP/1.1 503 Service Temporarily Unavailable');
 			header('Status: 503 Service Temporarily Unavailable');
@@ -301,10 +301,11 @@ class OC {
 	 */
 	public static function checkUpgrade($showTemplate = true) {
 		if (\OCP\Util::needUpgrade()) {
-			if ($showTemplate && !OC_Config::getValue('maintenance', false)) {
+			$config = \OC::$server->getConfig();
+			if ($showTemplate && !$config->getSystemValue('maintenance', false)) {
 				$version = OC_Util::getVersion();
-				$oldTheme = OC_Config::getValue('theme');
-				OC_Config::setValue('theme', '');
+				$oldTheme = $config->getSystemValue('theme');
+				$config->setSystemValue('theme', '');
 				OC_Util::addScript('config'); // needed for web root
 				OC_Util::addScript('update');
 				$tmpl = new OC_Template('', 'update.admin', 'guest');
@@ -358,7 +359,7 @@ class OC {
 		OC_Util::addVendorScript('moment/min/moment-with-locales');
 
 		// avatars
-		if (\OC_Config::getValue('enable_avatars', true) === true) {
+		if (\OC::$server->getConfig()->getSystemValue('enable_avatars', true) === true) {
 			\OC_Util::addScript('placeholder');
 			\OC_Util::addVendorScript('blueimp-md5/js/md5');
 			\OC_Util::addScript('jquery.avatar');
@@ -438,7 +439,7 @@ class OC {
 	 * @return string
 	 */
 	private static function getSessionLifeTime() {
-		return OC_Config::getValue('session_lifetime', 60 * 60 * 24);
+		return \OC::$server->getConfig()->getSystemValue('session_lifetime', 60 * 60 * 24);
 	}
 
 	public static function loadAppClassPaths() {
@@ -561,8 +562,10 @@ class OC {
 		$sessionLifeTime = self::getSessionLifeTime();
 		@ini_set('gc_maxlifetime', (string)$sessionLifeTime);
 
+		$config = \OC::$server->getConfig();
+
 		// User and Groups
-		if (!OC_Config::getValue("installed", false)) {
+		if (!$config->getSystemValue("installed", false)) {
 			self::$server->getSession()->set('user_id', '');
 		}
 
@@ -585,14 +588,14 @@ class OC {
 		$tmpManager = \OC::$server->getTempManager();
 		register_shutdown_function(array($tmpManager, 'clean'));
 
-		if (OC_Config::getValue('installed', false) && !self::checkUpgrade(false)) {
+		if ($config->getSystemValue('installed', false) && !self::checkUpgrade(false)) {
 			if (\OC::$server->getAppConfig()->getValue('core', 'backgroundjobs_mode', 'ajax') == 'ajax') {
 				OC_Util::addScript('backgroundjobs');
 			}
 		}
 
 		// Check whether the sample configuration has been copied
-		if(OC_Config::getValue('copied_sample_config', false)) {
+		if($config->getSystemValue('copied_sample_config', false)) {
 			$l = \OC::$server->getL10N('lib');
 			header('HTTP/1.1 503 Service Temporarily Unavailable');
 			header('Status: 503 Service Temporarily Unavailable');
@@ -640,7 +643,7 @@ class OC {
 	 * register hooks for the cache
 	 */
 	public static function registerCacheHooks() {
-		if (OC_Config::getValue('installed', false) && !\OCP\Util::needUpgrade()) { //don't try to do this before we are properly setup
+		if (\OC::$server->getConfig()->getSystemValue('installed', false) && !\OCP\Util::needUpgrade()) { //don't try to do this before we are properly setup
 			\OCP\BackgroundJob::registerJob('OC\Cache\FileGlobalGC');
 
 			// NOTE: This will be replaced to use OCP
@@ -653,10 +656,11 @@ class OC {
 	 * register hooks for the cache
 	 */
 	public static function registerLogRotate() {
-		if (OC_Config::getValue('installed', false) && OC_Config::getValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
+		$config = \OC::$server->getConfig();
+		if ($config->getSystemValue('installed', false) && $config->getSystemValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
 			//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', OC_Config::getValue('logfile', OC_Config::getValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
+			\OCP\BackgroundJob::registerJob('OC\Log\Rotate', $config->getSystemValue('logfile', $config->getSystemValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
 		}
 	}
 
@@ -686,7 +690,7 @@ class OC {
 	 * register hooks for sharing
 	 */
 	public static function registerShareHooks() {
-		if (\OC_Config::getValue('installed')) {
+		if (\OC::$server->getConfig()->getSystemValue('installed')) {
 			OC_Hook::connect('OC_User', 'post_deleteUser', 'OC\Share\Hooks', 'post_deleteUser');
 			OC_Hook::connect('OC_User', 'post_addToGroup', 'OC\Share\Hooks', 'post_addToGroup');
 			OC_Hook::connect('OC_User', 'post_removeFromGroup', 'OC\Share\Hooks', 'post_removeFromGroup');
@@ -701,7 +705,7 @@ class OC {
 		// generate an instanceid via \OC_Util::getInstanceId() because the
 		// config file may not be writable. As such, we only register a class
 		// loader cache if instanceid is available without trying to create one.
-		$instanceId = OC_Config::getValue('instanceid', null);
+		$instanceId = \OC::$server->getConfig()->getSystemValue('instanceid', null);
 		if ($instanceId) {
 			try {
 				$memcacheFactory = new \OC\Memcache\Factory($instanceId);
@@ -716,12 +720,13 @@ class OC {
 	 */
 	public static function handleRequest() {
 		\OC::$server->getEventLogger()->start('handle_request', 'Handle request');
+		$config = \OC::$server->getConfig();
 		// load all the classpaths from the enabled apps so they are available
 		// in the routing files of each app
 		OC::loadAppClassPaths();
 
 		// Check if ownCloud is installed or in maintenance (update) mode
-		if (!\OC::$server->getConfig()->getSystemValue('installed', false)) {
+		if (!$config->getSystemValue('installed', false)) {
 			\OC::$server->getSession()->clear();
 			$controller = new OC\Core\Setup\Controller(\OC::$server->getConfig());
 			$controller->run($_POST);
@@ -736,7 +741,7 @@ class OC {
 
 		if (!self::$CLI and (!isset($_GET["logout"]) or ($_GET["logout"] !== 'true'))) {
 			try {
-				if (!OC_Config::getValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
+				if (!$config->getSystemValue('maintenance', false) && !\OCP\Util::needUpgrade()) {
 					OC_App::loadApps(array('authentication'));
 					OC_App::loadApps(array('filesystem', 'logging'));
 					OC_App::loadApps();
@@ -802,7 +807,7 @@ class OC {
 			if (isset($_GET["logout"]) and ($_GET["logout"])) {
 				OC_JSON::callCheck();
 				if (isset($_COOKIE['oc_token'])) {
-					OC_Preferences::deleteKey(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
+					$config->deleteUserValue(OC_User::getUser(), 'login_token', $_COOKIE['oc_token']);
 				}
 				OC_User::logout();
 				// redirect to webroot and add slash if webroot is empty
@@ -861,12 +866,13 @@ class OC {
 	 * @param string $user
 	 */
 	protected static function cleanupLoginTokens($user) {
-		$cutoff = time() - OC_Config::getValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
-		$tokens = OC_Preferences::getKeys($user, 'login_token');
+		$config = \OC::$server->getConfig();
+		$cutoff = time() - $config->getSystemValue('remember_login_cookie_lifetime', 60 * 60 * 24 * 15);
+		$tokens = $config->getUserKeys($user, 'login_token');
 		foreach ($tokens as $token) {
-			$time = OC_Preferences::getValue($user, 'login_token', $token);
+			$time = $config->getUserValue($user, 'login_token', $token);
 			if ($time < $cutoff) {
-				OC_Preferences::deleteKey($user, 'login_token', $token);
+				$config->deleteUserValue($user, 'login_token', $token);
 			}
 		}
 	}
-- 
GitLab


From 980dd4d22a567fd4de270730c66524a31ddfb5af Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 19 Nov 2014 13:15:04 +0100
Subject: [PATCH 468/616] replace double quotes with single quotes

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

diff --git a/lib/base.php b/lib/base.php
index 3e60b37934a..1c9f25006dd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -660,7 +660,7 @@ class OC {
 		if ($config->getSystemValue('installed', false) && $config->getSystemValue('log_rotate_size', false) && !\OCP\Util::needUpgrade()) {
 			//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', $config->getSystemValue('logfile', $config->getSystemValue("datadirectory", OC::$SERVERROOT . '/data') . '/owncloud.log'));
+			\OCP\BackgroundJob::registerJob('OC\Log\Rotate', $config->getSystemValue('logfile', $config->getSystemValue('datadirectory', OC::$SERVERROOT . '/data') . '/owncloud.log'));
 		}
 	}
 
-- 
GitLab


From 1c5933c96cd68f353165a02a76dd47760e8d493e Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 19 Nov 2014 14:49:15 +0100
Subject: [PATCH 469/616] Better use of promise in OC.L10N.load()

---
 core/js/l10n.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/core/js/l10n.js b/core/js/l10n.js
index 2db4609ded2..3e37da01369 100644
--- a/core/js/l10n.js
+++ b/core/js/l10n.js
@@ -44,22 +44,17 @@ OC.L10N = {
 		}
 
 		var self = this;
-		var deferred = $.Deferred();
 		var url = OC.filePath(appName, 'l10n', OC.getLocale() + '.json');
 
 		// load JSON translation bundle per AJAX
-		$.get(url,
-			function(result) {
-				if (result.translations) {
-					self.register(appName, result.translations, result.pluralForm);
-				}
-				if (callback) {
-					callback();
-					deferred.resolve();
-				}
-			}
-		);
-		return deferred.promise();
+		return $.get(url)
+			.then(
+				function(result) {
+					if (result.translations) {
+						self.register(appName, result.translations, result.pluralForm);
+					}
+				})
+			.then(callback);
 	},
 
 	/**
-- 
GitLab


From bb540722cd4e197bd608d9a87e4b10cf66dec5a9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 7 Nov 2014 15:23:15 +0100
Subject: [PATCH 470/616] Use base class to reset the file mapper

---
 apps/files/tests/helper.php                   |  4 ++--
 apps/files_versions/tests/versions.php        | 21 ++++++++++++-------
 lib/private/files/storage/mappedlocal.php     |  3 ---
 tests/lib/files/cache/cache.php               | 10 ++++++---
 tests/lib/files/cache/changepropagator.php    |  8 ++++---
 tests/lib/files/cache/homecache.php           |  6 ++++--
 tests/lib/files/cache/scanner.php             | 10 ++++++---
 tests/lib/files/cache/updater.php             |  3 ++-
 tests/lib/files/cache/updaterlegacy.php       |  9 +++++---
 tests/lib/files/cache/watcher.php             |  2 +-
 tests/lib/files/etagtest.php                  |  2 +-
 tests/lib/files/filesystem.php                |  2 ++
 tests/lib/files/mapper.php                    |  5 +++--
 tests/lib/files/mount/manager.php             |  5 +++--
 tests/lib/files/mount/mount.php               |  2 +-
 tests/lib/files/node/file.php                 |  5 +++--
 tests/lib/files/node/folder.php               |  5 +++--
 tests/lib/files/node/integration.php          |  3 +--
 tests/lib/files/node/node.php                 |  5 +++--
 tests/lib/files/node/root.php                 |  5 +++--
 tests/lib/files/objectstore/swift.php         |  8 +++++--
 tests/lib/files/storage/commontest.php        |  7 +++++--
 tests/lib/files/storage/home.php              |  9 +++++---
 tests/lib/files/storage/local.php             |  7 +++++--
 tests/lib/files/storage/mappedlocal.php       |  7 +++++--
 .../storage/mappedlocalwithdotteddatadir.php  |  7 +++++--
 tests/lib/files/storage/wrapper/quota.php     |  7 +++++--
 tests/lib/files/storage/wrapper/wrapper.php   |  7 +++++--
 tests/lib/files/stream/quota.php              |  5 +++--
 tests/lib/files/stream/staticstream.php       |  8 ++++---
 tests/lib/files/utils/scanner.php             |  1 -
 tests/lib/files/view.php                      |  2 +-
 tests/lib/testcase.php                        | 10 +++++++++
 33 files changed, 132 insertions(+), 68 deletions(-)

diff --git a/apps/files/tests/helper.php b/apps/files/tests/helper.php
index 17be1770c33..da902f4f78a 100644
--- a/apps/files/tests/helper.php
+++ b/apps/files/tests/helper.php
@@ -11,7 +11,7 @@ use OCA\Files;
 /**
  * Class Test_Files_Helper
  */
-class Test_Files_Helper extends \PHPUnit_Framework_TestCase {
+class Test_Files_Helper extends \Test\TestCase {
 
 	private function makeFileInfo($name, $size, $mtime, $isDir = false) {
 		return new \OC\Files\FileInfo(
@@ -90,7 +90,7 @@ class Test_Files_Helper extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(
 			$expectedOrder,
 			$fileNames
-		);	
+		);
 	}
 
 }
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index a3b8595a34b..adcbb686c61 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -39,6 +39,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 	private $rootView;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
 
 		// clear share hooks
 		\OC_Hook::clear('OCP\\Share');
@@ -55,9 +56,13 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		// cleanup test user
 		\OC_User::deleteUser(self::TEST_VERSIONS_USER);
 		\OC_User::deleteUser(self::TEST_VERSIONS_USER2);
+
+		parent::tearDownAfterClass();
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		self::loginHelper(self::TEST_VERSIONS_USER);
 		$this->rootView = new \OC\Files\View();
 		if (!$this->rootView->file_exists(self::USERS_VERSIONS_ROOT)) {
@@ -65,8 +70,10 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		}
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->rootView->deleteAll(self::USERS_VERSIONS_ROOT);
+
+		parent::tearDown();
 	}
 
 	/**
@@ -74,7 +81,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 	 * test expire logic
 	 * @dataProvider versionsProvider
 	 */
-	function testGetExpireList($versions, $sizeOfAllDeletedFiles) {
+	public function testGetExpireList($versions, $sizeOfAllDeletedFiles) {
 
 		// last interval end at 2592000
 		$startTime = 5000000;
@@ -216,7 +223,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		);
 	}
 
-	function testRename() {
+	public function testRename() {
 
 		\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
 
@@ -247,7 +254,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		\OC\Files\Filesystem::unlink('test2.txt');
 	}
 
-	function testRenameInSharedFolder() {
+	public function testRenameInSharedFolder() {
 
 		\OC\Files\Filesystem::mkdir('folder1');
 		\OC\Files\Filesystem::mkdir('folder1/folder2');
@@ -291,7 +298,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		\OC\Files\Filesystem::unlink('/folder1/folder2/test.txt');
 	}
 
-	function testRenameSharedFile() {
+	public function testRenameSharedFile() {
 
 		\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
 
@@ -334,7 +341,7 @@ class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
 		\OC\Files\Filesystem::unlink('/test.txt');
 	}
 
-	function testCopy() {
+	public function testCopy() {
 
 		\OC\Files\Filesystem::file_put_contents("test.txt", "test file");
 
diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 0a21d2938b7..c232c0298b1 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -24,9 +24,6 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function __destruct() {
-		if (defined('PHPUNIT_RUN')) {
-			$this->mapper->removePath($this->datadir, true, true);
-		}
 	}
 
 	public function getId() {
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 969740419c6..02c45a16571 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -16,7 +16,7 @@ class LongId extends \OC\Files\Storage\Temporary {
 	}
 }
 
-class Cache extends \PHPUnit_Framework_TestCase {
+class Cache extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Temporary $storage ;
 	 */
@@ -452,13 +452,17 @@ class Cache extends \PHPUnit_Framework_TestCase {
 		$this->assertEquals(1, count($this->cache->getFolderContents('folder')));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->cache) {
 			$this->cache->clear();
 		}
+
+		parent::tearDown();
 	}
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->storage = new \OC\Files\Storage\Temporary(array());
 		$this->storage2 = new \OC\Files\Storage\Temporary(array());
 		$this->cache = new \OC\Files\Cache\Cache($this->storage);
diff --git a/tests/lib/files/cache/changepropagator.php b/tests/lib/files/cache/changepropagator.php
index a52682cd086..89bd9dfe80a 100644
--- a/tests/lib/files/cache/changepropagator.php
+++ b/tests/lib/files/cache/changepropagator.php
@@ -12,7 +12,7 @@ use OC\Files\Filesystem;
 use OC\Files\Storage\Temporary;
 use OC\Files\View;
 
-class ChangePropagator extends \PHPUnit_Framework_TestCase {
+class ChangePropagator extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Cache\ChangePropagator
 	 */
@@ -23,9 +23,11 @@ class ChangePropagator extends \PHPUnit_Framework_TestCase {
 	 */
 	private $view;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$storage = new Temporary(array());
-		$root = '/' . uniqid();
+		$root = $this->getUniqueID('/');
 		Filesystem::mount($storage, array(), $root);
 		$this->view = new View($root);
 		$this->propagator = new \OC\Files\Cache\ChangePropagator($this->view);
diff --git a/tests/lib/files/cache/homecache.php b/tests/lib/files/cache/homecache.php
index 80dc54c9d19..7ebb053bcfa 100644
--- a/tests/lib/files/cache/homecache.php
+++ b/tests/lib/files/cache/homecache.php
@@ -43,7 +43,7 @@ class DummyUser extends \OC\User\User {
 	}
 }
 
-class HomeCache extends \PHPUnit_Framework_TestCase {
+class HomeCache extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Home $storage
 	 */
@@ -59,7 +59,9 @@ class HomeCache extends \PHPUnit_Framework_TestCase {
 	 */
 	private $user;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->user = new DummyUser('foo', \OC_Helper::tmpFolder());
 		$this->storage = new \OC\Files\Storage\Home(array('user' => $this->user));
 		$this->cache = $this->storage->getCache();
diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index 0a274631d1c..b44cf0a49df 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -8,7 +8,7 @@
 
 namespace Test\Files\Cache;
 
-class Scanner extends \PHPUnit_Framework_TestCase {
+class Scanner extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
 	 */
@@ -24,16 +24,20 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 	 */
 	private $cache;
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->storage = new \OC\Files\Storage\Temporary(array());
 		$this->scanner = new \OC\Files\Cache\Scanner($this->storage);
 		$this->cache = new \OC\Files\Cache\Cache($this->storage);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		if ($this->cache) {
 			$this->cache->clear();
 		}
+
+		parent::tearDown();
 	}
 
 	function testFile() {
diff --git a/tests/lib/files/cache/updater.php b/tests/lib/files/cache/updater.php
index 9e7330db20c..01b036de5d8 100644
--- a/tests/lib/files/cache/updater.php
+++ b/tests/lib/files/cache/updater.php
@@ -12,7 +12,7 @@ use OC\Files\Filesystem;
 use OC\Files\Storage\Temporary;
 use OC\Files\View;
 
-class Updater extends \PHPUnit_Framework_TestCase {
+class Updater extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage
 	 */
@@ -40,6 +40,7 @@ class Updater extends \PHPUnit_Framework_TestCase {
 		parent::setUp();
 
 		$this->originalStorage = Filesystem::getStorage('/');
+
 		$this->storage = new Temporary(array());
 		Filesystem::clearMounts();
 		Filesystem::mount($this->storage, array(), '/');
diff --git a/tests/lib/files/cache/updaterlegacy.php b/tests/lib/files/cache/updaterlegacy.php
index d16a062fcca..7c05800cd6b 100644
--- a/tests/lib/files/cache/updaterlegacy.php
+++ b/tests/lib/files/cache/updaterlegacy.php
@@ -11,7 +11,7 @@ namespace Test\Files\Cache;
 use \OC\Files\Filesystem as Filesystem;
 use OC\Files\Storage\Temporary;
 
-class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
+class UpdaterLegacy extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage $storage
 	 */
@@ -34,7 +34,8 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
 
 	private static $user;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 
 		// remember files_encryption state
 		$this->stateFilesEncryption = \OC_App::isEnabled('files_encryption');
@@ -71,7 +72,7 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
 		\OC_Hook::clear('OC_Filesystem');
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->cache) {
 			$this->cache->clear();
 		}
@@ -83,6 +84,8 @@ class UpdaterLegacy extends \PHPUnit_Framework_TestCase {
 		if ($this->stateFilesEncryption) {
 			\OC_App::enable('files_encryption');
 		}
+
+		parent::tearDown();
 	}
 
 	public function testWrite() {
diff --git a/tests/lib/files/cache/watcher.php b/tests/lib/files/cache/watcher.php
index 0b04b9e7058..ee605c64e01 100644
--- a/tests/lib/files/cache/watcher.php
+++ b/tests/lib/files/cache/watcher.php
@@ -8,7 +8,7 @@
 
 namespace Test\Files\Cache;
 
-class Watcher extends \PHPUnit_Framework_TestCase {
+class Watcher extends \Test\TestCase {
 
 	/**
 	 * @var \OC\Files\Storage\Storage[] $storages
diff --git a/tests/lib/files/etagtest.php b/tests/lib/files/etagtest.php
index 8f29ed0bc63..eec24d9f4c6 100644
--- a/tests/lib/files/etagtest.php
+++ b/tests/lib/files/etagtest.php
@@ -56,7 +56,7 @@ class EtagTest extends \Test\TestCase {
 	}
 
 	public function testNewUser() {
-		$user1 = uniqid('user_');
+		$user1 = $this->getUniqueID('user_');
 		$this->userBackend->createUser($user1, '');
 
 		\OC_Util::tearDownFS();
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index f24d86b212d..746600c7d15 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -55,6 +55,8 @@ class Filesystem extends \Test\TestCase {
 		\OC\Files\Filesystem::clearMounts();
 		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
 		\OC_User::setUserId('');
+
+		parent::tearDown();
 	}
 
 	public function testMount() {
diff --git a/tests/lib/files/mapper.php b/tests/lib/files/mapper.php
index d513f3ce4b3..18161734b60 100644
--- a/tests/lib/files/mapper.php
+++ b/tests/lib/files/mapper.php
@@ -22,14 +22,15 @@
 
 namespace Test\Files;
 
-class Mapper extends \PHPUnit_Framework_TestCase {
+class Mapper extends \Test\TestCase {
 
 	/**
 	 * @var \OC\Files\Mapper
 	 */
 	private $mapper = null;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->mapper = new \OC\Files\Mapper('D:/');
 	}
 
diff --git a/tests/lib/files/mount/manager.php b/tests/lib/files/mount/manager.php
index 154c35ccead..051b76ccf2e 100644
--- a/tests/lib/files/mount/manager.php
+++ b/tests/lib/files/mount/manager.php
@@ -16,13 +16,14 @@ class LongId extends Temporary {
 	}
 }
 
-class Manager extends \PHPUnit_Framework_TestCase {
+class Manager extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Mount\Manager
 	 */
 	private $manager;
 
-	public function setup() {
+	protected function setup() {
+		parent::setUp();
 		$this->manager = new \OC\Files\Mount\Manager();
 	}
 
diff --git a/tests/lib/files/mount/mount.php b/tests/lib/files/mount/mount.php
index c3d33e0870b..5ee3d934e97 100644
--- a/tests/lib/files/mount/mount.php
+++ b/tests/lib/files/mount/mount.php
@@ -12,7 +12,7 @@ namespace Test\Files\Mount;
 use OC\Files\Storage\Loader;
 use OC\Files\Storage\Wrapper\Wrapper;
 
-class Mount extends \PHPUnit_Framework_TestCase {
+class Mount extends \Test\TestCase {
 	public function testFromStorageObject() {
 		$storage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
 			->disableOriginalConstructor()
diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php
index 76938a0dcc8..34ec7dee213 100644
--- a/tests/lib/files/node/file.php
+++ b/tests/lib/files/node/file.php
@@ -12,10 +12,11 @@ use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OC\Files\View;
 
-class File extends \PHPUnit_Framework_TestCase {
+class File extends \Test\TestCase {
 	private $user;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->user = new \OC\User\User('', new \OC_User_Dummy);
 	}
 
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index 436161aba72..e348e452f6f 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -15,10 +15,11 @@ use OCP\Files\NotFoundException;
 use OCP\Files\NotPermittedException;
 use OC\Files\View;
 
-class Folder extends \PHPUnit_Framework_TestCase {
+class Folder extends \Test\TestCase {
 	private $user;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->user = new \OC\User\User('', new \OC_User_Dummy);
 	}
 
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
index cde2eb22b7b..fd777460ec6 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/integration.php
@@ -14,7 +14,7 @@ use OC\Files\Storage\Temporary;
 use OC\Files\View;
 use OC\User\User;
 
-class IntegrationTests extends \PHPUnit_Framework_TestCase {
+class IntegrationTests extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Node\Root $root
 	 */
@@ -65,7 +65,6 @@ class IntegrationTests extends \PHPUnit_Framework_TestCase {
 			$storage->getCache()->clear();
 		}
 		\OC\Files\Filesystem::clearMounts();
-
 		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
 
 		parent::tearDown();
diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php
index cf5fec30522..80e3ac6f80a 100644
--- a/tests/lib/files/node/node.php
+++ b/tests/lib/files/node/node.php
@@ -8,10 +8,11 @@
 
 namespace Test\Files\Node;
 
-class Node extends \PHPUnit_Framework_TestCase {
+class Node extends \Test\TestCase {
 	private $user;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->user = new \OC\User\User('', new \OC_User_Dummy);
 	}
 
diff --git a/tests/lib/files/node/root.php b/tests/lib/files/node/root.php
index 27f1a937826..fcce7070f5d 100644
--- a/tests/lib/files/node/root.php
+++ b/tests/lib/files/node/root.php
@@ -11,10 +11,11 @@ namespace Test\Files\Node;
 use OCP\Files\NotPermittedException;
 use OC\Files\Mount\Manager;
 
-class Root extends \PHPUnit_Framework_TestCase {
+class Root extends \Test\TestCase {
 	private $user;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->user = new \OC\User\User('', new \OC_User_Dummy);
 	}
 
diff --git a/tests/lib/files/objectstore/swift.php b/tests/lib/files/objectstore/swift.php
index 37d6cc74de6..f2c4a983cf2 100644
--- a/tests/lib/files/objectstore/swift.php
+++ b/tests/lib/files/objectstore/swift.php
@@ -30,7 +30,9 @@ class Swift extends \Test\Files\Storage\Storage {
 
 	private $objectStorage;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		if (!getenv('RUN_OBJECTSTORE_TESTS')) {
 			$this->markTestSkipped('objectstore tests are unreliable on travis');
 		}
@@ -74,12 +76,14 @@ class Swift extends \Test\Files\Storage\Storage {
 		$this->instance = new ObjectStoreStorage($params);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if (is_null($this->instance)) {
 			return;
 		}
 		$this->objectStorage->deleteContainer(true);
 		$this->instance->getCache()->clear();
+
+		parent::tearDown();
 	}
 
 	public function testStat() {
diff --git a/tests/lib/files/storage/commontest.php b/tests/lib/files/storage/commontest.php
index ce53c884f32..2b70dc8713e 100644
--- a/tests/lib/files/storage/commontest.php
+++ b/tests/lib/files/storage/commontest.php
@@ -27,12 +27,15 @@ class CommonTest extends Storage {
 	 * @var string tmpDir
 	 */
 	private $tmpDir;
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->tmpDir=\OC_Helper::tmpFolder();
 		$this->instance=new \OC\Files\Storage\CommonTest(array('datadir'=>$this->tmpDir));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
+		parent::tearDown();
 	}
 }
diff --git a/tests/lib/files/storage/home.php b/tests/lib/files/storage/home.php
index d085efe9c1c..b0670a22892 100644
--- a/tests/lib/files/storage/home.php
+++ b/tests/lib/files/storage/home.php
@@ -60,15 +60,18 @@ class Home extends Storage {
 	 */
 	private $user;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->tmpDir = \OC_Helper::tmpFolder();
-		$this->userId = uniqid('user_');
+		$this->userId = $this->getUniqueID('user_');
 		$this->user = new DummyUser($this->userId, $this->tmpDir);
 		$this->instance = new \OC\Files\Storage\Home(array('user' => $this->user));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/files/storage/local.php b/tests/lib/files/storage/local.php
index 490086c62f2..d2b27117c3b 100644
--- a/tests/lib/files/storage/local.php
+++ b/tests/lib/files/storage/local.php
@@ -28,13 +28,16 @@ class Local extends Storage {
 	 */
 	private $tmpDir;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->tmpDir = \OC_Helper::tmpFolder();
 		$this->instance = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
+		parent::tearDown();
 	}
 
 	public function testStableEtag() {
diff --git a/tests/lib/files/storage/mappedlocal.php b/tests/lib/files/storage/mappedlocal.php
index b483f3a1954..1e87b53d00a 100644
--- a/tests/lib/files/storage/mappedlocal.php
+++ b/tests/lib/files/storage/mappedlocal.php
@@ -27,14 +27,17 @@ class MappedLocal extends Storage {
 	 * @var string tmpDir
 	 */
 	private $tmpDir;
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->tmpDir=\OC_Helper::tmpFolder();
 		$this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
 		unset($this->instance);
+		parent::tearDown();
 	}
 }
 
diff --git a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php
index d2e5e2e97af..3a733b7b469 100644
--- a/tests/lib/files/storage/mappedlocalwithdotteddatadir.php
+++ b/tests/lib/files/storage/mappedlocalwithdotteddatadir.php
@@ -28,15 +28,18 @@ class MappedLocalWithDottedDataDir extends Storage {
 	 */
 	private $tmpDir;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->tmpDir = \OC_Helper::tmpFolder().'dir.123'.DIRECTORY_SEPARATOR;
 		mkdir($this->tmpDir);
 		$this->instance=new \OC\Files\Storage\MappedLocal(array('datadir'=>$this->tmpDir));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
 		unset($this->instance);
+		parent::tearDown();
 	}
 }
 
diff --git a/tests/lib/files/storage/wrapper/quota.php b/tests/lib/files/storage/wrapper/quota.php
index 954fe199cc8..9e6b1c85a95 100644
--- a/tests/lib/files/storage/wrapper/quota.php
+++ b/tests/lib/files/storage/wrapper/quota.php
@@ -17,14 +17,17 @@ class Quota extends \Test\Files\Storage\Storage {
 	 */
 	private $tmpDir;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->tmpDir = \OC_Helper::tmpFolder();
 		$storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
 		$this->instance = new \OC\Files\Storage\Wrapper\Quota(array('storage' => $storage, 'quota' => 10000000));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/files/storage/wrapper/wrapper.php b/tests/lib/files/storage/wrapper/wrapper.php
index 8bcf42035d4..486cd0495c1 100644
--- a/tests/lib/files/storage/wrapper/wrapper.php
+++ b/tests/lib/files/storage/wrapper/wrapper.php
@@ -14,14 +14,17 @@ class Wrapper extends \Test\Files\Storage\Storage {
 	 */
 	private $tmpDir;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->tmpDir = \OC_Helper::tmpFolder();
 		$storage = new \OC\Files\Storage\Local(array('datadir' => $this->tmpDir));
 		$this->instance = new \OC\Files\Storage\Wrapper\Wrapper(array('storage' => $storage));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Helper::rmdirr($this->tmpDir);
+		parent::tearDown();
 	}
 
 	public function testInstanceOfStorageWrapper() {
diff --git a/tests/lib/files/stream/quota.php b/tests/lib/files/stream/quota.php
index d5edace544d..28584cf82db 100644
--- a/tests/lib/files/stream/quota.php
+++ b/tests/lib/files/stream/quota.php
@@ -8,9 +8,10 @@
 
 namespace Test\Files\Stream;
 
-class Quota extends \PHPUnit_Framework_TestCase {
-	public function tearDown() {
+class Quota extends \Test\TestCase {
+	protected function tearDown() {
 		\OC\Files\Stream\Quota::clear();
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/files/stream/staticstream.php b/tests/lib/files/stream/staticstream.php
index d55086196a0..416a4670efd 100644
--- a/tests/lib/files/stream/staticstream.php
+++ b/tests/lib/files/stream/staticstream.php
@@ -8,18 +8,20 @@
 
 namespace Test\Files\Stream;
 
-class StaticStream extends \PHPUnit_Framework_TestCase {
+class StaticStream extends \Test\TestCase {
 
 	private $sourceFile;
 	private $sourceText;
 
-	public function __construct() {
+	protected function setUp() {
+		parent::setUp();
 		$this->sourceFile = \OC::$SERVERROOT . '/tests/data/lorem.txt';
 		$this->sourceText = file_get_contents($this->sourceFile);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC\Files\Stream\StaticStream::clear();
+		parent::tearDown();
 	}
 
 	public function testContent() {
diff --git a/tests/lib/files/utils/scanner.php b/tests/lib/files/utils/scanner.php
index db6a3fa7842..f729be81bd7 100644
--- a/tests/lib/files/utils/scanner.php
+++ b/tests/lib/files/utils/scanner.php
@@ -38,7 +38,6 @@ class TestScanner extends \OC\Files\Utils\Scanner {
 	}
 }
 
-
 class Scanner extends \Test\TestCase {
 	/** @var \OC\Files\Storage\Storage */
 	private $originalStorage;
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index 44fea65e64e..d6dd176bba9 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -16,7 +16,7 @@ class TemporaryNoTouch extends \OC\Files\Storage\Temporary {
 	}
 }
 
-class View extends \PHPUnit_Framework_TestCase {
+class View extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage[] $storages
 	 */
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index a4b4b0103f0..315cd6858ed 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -30,4 +30,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 			'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
 		);
 	}
+
+	public static function tearDownAfterClass() {
+		if (\OC_Util::runningOnWindows()) {
+			$rootDirectory = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data-autotest');
+			$mapper = new \OC\Files\Mapper($rootDirectory);
+			$mapper->removePath($rootDirectory, true, true);
+		}
+
+		parent::tearDownAfterClass();
+	}
 }
-- 
GitLab


From 76ebd3a050cb3c84b958f071ec559e6bc9cbc847 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Nov 2014 22:28:12 +0100
Subject: [PATCH 471/616] Make apps/ extend the \Test\TestCase and fix
 overwritten methods

---
 apps/files/tests/ajax_rename.php              |  3 +--
 apps/files_encryption/tests/migration.php     | 10 ++++++---
 apps/files_external/tests/amazons3.php        |  8 +++++--
 .../tests/amazons3migration.php               | 21 +++++++++++++++----
 apps/files_external/tests/dropbox.php         | 20 +++++++++++-------
 .../tests/dynamicmountconfig.php              |  4 +++-
 apps/files_external/tests/etagpropagator.php  |  4 ++--
 apps/files_external/tests/ftp.php             | 10 ++++++---
 apps/files_external/tests/google.php          |  4 ++++
 apps/files_external/tests/mountconfig.php     | 10 ++++++---
 apps/files_external/tests/owncloud.php        | 10 ++++++---
 .../tests/owncloudfunctions.php               |  2 +-
 apps/files_external/tests/sftp.php            | 10 ++++++---
 apps/files_external/tests/smb.php             | 10 ++++++---
 apps/files_external/tests/smbfunctions.php    | 10 ++++-----
 apps/files_external/tests/swift.php           |  8 +++++--
 apps/files_external/tests/webdav.php          | 10 ++++++---
 apps/files_sharing/tests/api.php              |  4 ++--
 apps/files_sharing/tests/backend.php          |  4 ++--
 apps/files_sharing/tests/cache.php            |  4 ++--
 apps/files_sharing/tests/externalstorage.php  |  2 +-
 apps/files_sharing/tests/permissions.php      |  4 ++--
 apps/files_sharing/tests/proxy.php            |  4 ++--
 apps/files_sharing/tests/share.php            |  4 ++--
 apps/files_sharing/tests/sharedmount.php      |  4 ++--
 apps/files_sharing/tests/sharedstorage.php    |  4 ++--
 apps/files_sharing/tests/testcase.php         | 13 ++++++++----
 apps/files_sharing/tests/updater.php          |  4 ++--
 apps/files_sharing/tests/watcher.php          |  4 ++--
 apps/files_trashbin/tests/trashbin.php        | 14 ++++++++++---
 apps/files_versions/tests/versions.php        |  2 +-
 apps/user_ldap/tests/access.php               |  2 +-
 apps/user_ldap/tests/connection.php           |  2 +-
 apps/user_ldap/tests/group_ldap.php           |  4 +---
 apps/user_ldap/tests/helper.php               |  2 +-
 apps/user_ldap/tests/user/manager.php         |  2 +-
 apps/user_ldap/tests/user/user.php            |  2 +-
 apps/user_ldap/tests/user_ldap.php            |  6 ++++--
 apps/user_ldap/tests/wizard.php               |  5 +++--
 tests/lib/files/storage/storage.php           |  2 +-
 40 files changed, 161 insertions(+), 91 deletions(-)

diff --git a/apps/files/tests/ajax_rename.php b/apps/files/tests/ajax_rename.php
index 3bccaca1231..48aed05823b 100644
--- a/apps/files/tests/ajax_rename.php
+++ b/apps/files/tests/ajax_rename.php
@@ -21,7 +21,7 @@
  *
  */
 
-class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
+class Test_OC_Files_App_Rename extends \Test\TestCase {
 	private static $user;
 
 	/**
@@ -34,7 +34,6 @@ class Test_OC_Files_App_Rename extends \PHPUnit_Framework_TestCase {
 	 */
 	private $files;
 
-	/** @var \OC\Files\Storage\Storage */
 	private $originalStorage;
 
 	protected function setUp() {
diff --git a/apps/files_encryption/tests/migration.php b/apps/files_encryption/tests/migration.php
index 80f30d4e793..8ca2e94c90a 100644
--- a/apps/files_encryption/tests/migration.php
+++ b/apps/files_encryption/tests/migration.php
@@ -23,16 +23,20 @@
 use OCA\Encryption;
 use OCA\Files_Encryption\Migration;
 
-class Test_Migration extends PHPUnit_Framework_TestCase {
+class Test_Migration extends \Test\TestCase {
 
-	public function tearDown() {
+	protected function tearDown() {
 		if (OC_DB::tableExists('encryption_test')) {
 			OC_DB::dropTable('encryption_test');
 		}
 		$this->assertTableNotExist('encryption_test');
+
+		parent::tearDown();
 	}
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		if (OC_DB::tableExists('encryption_test')) {
 			OC_DB::dropTable('encryption_test');
 		}
diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
index 8eaece6dad9..fbb8744bd8d 100644
--- a/apps/files_external/tests/amazons3.php
+++ b/apps/files_external/tests/amazons3.php
@@ -28,7 +28,9 @@ class AmazonS3 extends Storage {
 
 	private $config;
 
-	public function setUp() {
+	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->markTestSkipped('AmazonS3 backend not configured');
@@ -36,10 +38,12 @@ class AmazonS3 extends Storage {
 		$this->instance = new \OC\Files\Storage\AmazonS3($this->config['amazons3']);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			$this->instance->rmdir('');
 		}
+
+		parent::tearDown();
 	}
 
 	public function testStat() {
diff --git a/apps/files_external/tests/amazons3migration.php b/apps/files_external/tests/amazons3migration.php
index 629cf5cfa3c..145213f5293 100644
--- a/apps/files_external/tests/amazons3migration.php
+++ b/apps/files_external/tests/amazons3migration.php
@@ -23,15 +23,26 @@
 
 namespace Test\Files\Storage;
 
-class AmazonS3Migration extends \PHPUnit_Framework_TestCase {
+class AmazonS3Migration extends \Test\TestCase {
 
 	/**
 	 * @var \OC\Files\Storage\Storage instance
 	 */
 	protected $instance;
 
-	public function setUp () {
-		$uuid = uniqid();
+	/** @var array */
+	protected $params;
+
+	/** @var string */
+	protected $oldId;
+
+	/** @var string */
+	protected $newId;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$uuid = $this->getUniqueID();
 
 		$this->params['key'] = 'key'.$uuid;
 		$this->params['secret'] = 'secret'.$uuid;
@@ -41,9 +52,11 @@ class AmazonS3Migration extends \PHPUnit_Framework_TestCase {
 		$this->newId = 'amazon::' . $this->params['bucket'];
 	}
 
-	public function tearDown () {
+	protected function tearDown() {
 		$this->deleteStorage($this->oldId);
 		$this->deleteStorage($this->newId);
+
+		parent::tearDown();
 	}
 
 	public function testUpdateLegacyOnlyId () {
diff --git a/apps/files_external/tests/dropbox.php b/apps/files_external/tests/dropbox.php
index 4b052282019..3f25d5a31e8 100644
--- a/apps/files_external/tests/dropbox.php
+++ b/apps/files_external/tests/dropbox.php
@@ -11,8 +11,10 @@ namespace Test\Files\Storage;
 class Dropbox extends Storage {
 	private $config;
 
-	public function setUp() {
-		$id = uniqid();
+	protected function setUp() {
+		parent::setUp();
+
+		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
 		if ( ! is_array($this->config) or ! isset($this->config['dropbox']) or ! $this->config['dropbox']['run']) {
 			$this->markTestSkipped('Dropbox backend not configured');
@@ -21,6 +23,14 @@ class Dropbox extends Storage {
 		$this->instance = new \OC\Files\Storage\Dropbox($this->config['dropbox']);
 	}
 
+	protected function tearDown() {
+		if ($this->instance) {
+			$this->instance->unlink('/');
+		}
+
+		parent::tearDown();
+	}
+
 	public function directoryProvider() {
 		// doesn't support leading/trailing spaces
 		return array(array('folder'));
@@ -36,10 +46,4 @@ class Dropbox extends Storage {
 		// false because not supported
 		$this->assertFalse($this->instance->touch('foo'));
 	}
-
-	public function tearDown() {
-		if ($this->instance) {
-			$this->instance->unlink('/');
-		}
-	}
 }
diff --git a/apps/files_external/tests/dynamicmountconfig.php b/apps/files_external/tests/dynamicmountconfig.php
index 650299075e6..eef2a896b3a 100644
--- a/apps/files_external/tests/dynamicmountconfig.php
+++ b/apps/files_external/tests/dynamicmountconfig.php
@@ -36,7 +36,7 @@ class Test_Mount_Config_Dummy_Backend {
 /**
  * Class Test_Dynamic_Mount_Config
  */
-class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase {
+class Test_Dynamic_Mount_Config extends \Test\TestCase {
 
 	private $backup;
 
@@ -82,6 +82,7 @@ class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase {
 	}
 
 	protected function setUp() {
+		parent::setUp();
 
 		$this->backup = OC_Mount_Config::setUp();
 
@@ -97,5 +98,6 @@ class Test_Dynamic_Mount_Config extends \PHPUnit_Framework_TestCase {
 	protected function tearDown()
 	{
 		OC_Mount_Config::setUp($this->backup);
+		parent::tearDown();
 	}
 }
diff --git a/apps/files_external/tests/etagpropagator.php b/apps/files_external/tests/etagpropagator.php
index 7fa1863f962..84b687d18e4 100644
--- a/apps/files_external/tests/etagpropagator.php
+++ b/apps/files_external/tests/etagpropagator.php
@@ -11,9 +11,9 @@ namespace Tests\Files_External;
 use OC\Files\Filesystem;
 use OC\User\User;
 
-class EtagPropagator extends \PHPUnit_Framework_TestCase {
+class EtagPropagator extends \Test\TestCase {
 	protected function getUser() {
-		return new User(uniqid(), null);
+		return new User($this->getUniqueID(), null);
 	}
 
 	/**
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 3037793120a..842b7f43fa8 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -11,8 +11,10 @@ namespace Test\Files\Storage;
 class FTP extends Storage {
 	private $config;
 
-	public function setUp() {
-		$id = uniqid();
+	protected function setUp() {
+		parent::setUp();
+
+		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
 		if ( ! is_array($this->config) or ! isset($this->config['ftp']) or ! $this->config['ftp']['run']) {
 			$this->markTestSkipped('FTP backend not configured');
@@ -22,10 +24,12 @@ class FTP extends Storage {
 		$this->instance->mkdir('/');
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			\OCP\Files::rmdirr($this->instance->constructUrl(''));
 		}
+
+		parent::tearDown();
 	}
 
 	public function testConstructUrl(){
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index d5495d49c5e..79023fac9e1 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -28,6 +28,8 @@ class Google extends Storage {
 	private $config;
 
 	protected function setUp() {
+		parent::setUp();
+
 		$this->config = include('files_external/tests/config.php');
 		if (!is_array($this->config) || !isset($this->config['google'])
 			|| !$this->config['google']['run']
@@ -41,5 +43,7 @@ class Google extends Storage {
 		if ($this->instance) {
 			$this->instance->rmdir('/');
 		}
+
+		parent::tearDown();
 	}
 }
diff --git a/apps/files_external/tests/mountconfig.php b/apps/files_external/tests/mountconfig.php
index c11e48b82f3..ab65e648643 100644
--- a/apps/files_external/tests/mountconfig.php
+++ b/apps/files_external/tests/mountconfig.php
@@ -65,7 +65,7 @@ class Test_Mount_Config_Hook_Test {
 /**
  * Class Test_Mount_Config
  */
-class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
+class Test_Mount_Config extends \Test\TestCase {
 
 	private $dataDir;
 	private $userHome;
@@ -79,7 +79,9 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 	const TEST_GROUP2 = 'group2';
 	const TEST_GROUP2B = 'group2b';
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		\OC_User::createUser(self::TEST_USER1, self::TEST_USER1);
 		\OC_User::createUser(self::TEST_USER2, self::TEST_USER2);
 
@@ -116,7 +118,7 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 		Test_Mount_Config_Hook_Test::setupHooks();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		Test_Mount_Config_Hook_Test::clear();
 		OC_Mount_Config::$skipTest = false;
 
@@ -134,6 +136,8 @@ class Test_Mount_Config extends \PHPUnit_Framework_TestCase {
 			'user_mounting_backends',
 			$this->oldAllowedBackends
 		);
+
+		parent::tearDown();
 	}
 
 	/**
diff --git a/apps/files_external/tests/owncloud.php b/apps/files_external/tests/owncloud.php
index 408a55864f2..ab9101cfe5f 100644
--- a/apps/files_external/tests/owncloud.php
+++ b/apps/files_external/tests/owncloud.php
@@ -12,8 +12,10 @@ class OwnCloud extends Storage {
 
 	private $config;
 
-	public function setUp() {
-		$id = uniqid();
+	protected function setUp() {
+		parent::setUp();
+
+		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
 		if ( ! is_array($this->config) or ! isset($this->config['owncloud']) or ! $this->config['owncloud']['run']) {
 			$this->markTestSkipped('ownCloud backend not configured');
@@ -23,9 +25,11 @@ class OwnCloud extends Storage {
 		$this->instance->mkdir('/');
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			$this->instance->rmdir('/');
 		}
+
+		parent::tearDown();
 	}
 }
diff --git a/apps/files_external/tests/owncloudfunctions.php b/apps/files_external/tests/owncloudfunctions.php
index 57608fff0cf..8232f30a5e2 100644
--- a/apps/files_external/tests/owncloudfunctions.php
+++ b/apps/files_external/tests/owncloudfunctions.php
@@ -8,7 +8,7 @@
 
 namespace Test\Files\Storage;
 
-class OwnCloudFunctions extends \PHPUnit_Framework_TestCase {
+class OwnCloudFunctions extends \Test\TestCase {
 
 	function configUrlProvider() {
 		return array(
diff --git a/apps/files_external/tests/sftp.php b/apps/files_external/tests/sftp.php
index efea7f075ff..703b37d93f1 100644
--- a/apps/files_external/tests/sftp.php
+++ b/apps/files_external/tests/sftp.php
@@ -25,8 +25,10 @@ namespace Test\Files\Storage;
 class SFTP extends Storage {
 	private $config;
 
-	public function setUp() {
-		$id = uniqid();
+	protected function setUp() {
+		parent::setUp();
+
+		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
 		if ( ! is_array($this->config) or ! isset($this->config['sftp']) or ! $this->config['sftp']['run']) {
 			$this->markTestSkipped('SFTP backend not configured');
@@ -36,9 +38,11 @@ class SFTP extends Storage {
 		$this->instance->mkdir('/');
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			$this->instance->rmdir('/');
 		}
+
+		parent::tearDown();
 	}
 }
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
index 199e35af676..9e5ab2b331f 100644
--- a/apps/files_external/tests/smb.php
+++ b/apps/files_external/tests/smb.php
@@ -12,8 +12,10 @@ class SMB extends Storage {
 
 	private $config;
 
-	public function setUp() {
-		$id = uniqid();
+	protected function setUp() {
+		parent::setUp();
+
+		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
 		if (!is_array($this->config) or !isset($this->config['smb']) or !$this->config['smb']['run']) {
 			$this->markTestSkipped('Samba backend not configured');
@@ -23,10 +25,12 @@ class SMB extends Storage {
 		$this->instance->mkdir('/');
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			\OCP\Files::rmdirr($this->instance->constructUrl(''));
 		}
+
+		parent::tearDown();
 	}
 
 	public function directoryProvider() {
diff --git a/apps/files_external/tests/smbfunctions.php b/apps/files_external/tests/smbfunctions.php
index 749906d0136..cf9f7cb20fe 100644
--- a/apps/files_external/tests/smbfunctions.php
+++ b/apps/files_external/tests/smbfunctions.php
@@ -8,10 +8,11 @@
 
 namespace Test\Files\Storage;
 
-class SMBFunctions extends \PHPUnit_Framework_TestCase {
+class SMBFunctions extends \Test\TestCase {
+
+	protected function setUp() {
+		parent::setUp();
 
-	public function setUp() {
-		$id = uniqid();
 		// dummy config
 		$this->config = array(
 			'run'=>false,
@@ -25,9 +26,6 @@ class SMBFunctions extends \PHPUnit_Framework_TestCase {
 		$this->instance = new \OC\Files\Storage\SMB($this->config);
 	}
 
-	public function tearDown() {
-	}
-
 	public function testGetId() {
 		$this->assertEquals('smb::test@smbhost//sharename//rootdir/', $this->instance->getId());
 	}
diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index 3918497ebfa..d2c884a8b4c 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -26,7 +26,9 @@ class Swift extends Storage {
 
 	private $config;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->config = include('files_external/tests/config.php');
 		if (!is_array($this->config) or !isset($this->config['swift'])
                     or !$this->config['swift']['run']) {
@@ -35,7 +37,7 @@ class Swift extends Storage {
 		$this->instance = new \OC\Files\Storage\Swift($this->config['swift']);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			$connection = $this->instance->getConnection();
 			$container = $connection->getContainer($this->config['swift']['bucket']);
@@ -48,5 +50,7 @@ class Swift extends Storage {
 
 			$container->delete();
 		}
+
+		parent::tearDown();
 	}
 }
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 74e905ccc89..5f53568b91a 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -12,8 +12,10 @@ class DAV extends Storage {
 
 	private $config;
 
-	public function setUp() {
-		$id = uniqid();
+	protected function setUp() {
+		parent::setUp();
+
+		$id = $this->getUniqueID();
 		$this->config = include('files_external/tests/config.php');
 		if ( ! is_array($this->config) or ! isset($this->config['webdav']) or ! $this->config['webdav']['run']) {
 			$this->markTestSkipped('WebDAV backend not configured');
@@ -26,9 +28,11 @@ class DAV extends Storage {
 		$this->instance->mkdir('/');
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			$this->instance->rmdir('/');
 		}
+
+		parent::tearDown();
 	}
 }
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index 453133fee31..e550dcc27db 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -32,7 +32,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 	private static $tempStorage;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		\OC::$server->getAppConfig()->setValue('core', 'shareapi_exclude_groups', 'no');
@@ -53,7 +53,7 @@ class Test_Files_Sharing_Api extends TestCase {
 		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		if($this->view instanceof \OC\Files\View) {
 			$this->view->unlink($this->filename);
 			$this->view->deleteAll($this->folder);
diff --git a/apps/files_sharing/tests/backend.php b/apps/files_sharing/tests/backend.php
index e113c940678..5cf2a22c792 100644
--- a/apps/files_sharing/tests/backend.php
+++ b/apps/files_sharing/tests/backend.php
@@ -34,7 +34,7 @@ class Test_Files_Sharing_Backend extends TestCase {
 	public $subfolder;
 	public $subsubfolder;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = self::TEST_FOLDER_NAME;
@@ -53,7 +53,7 @@ class Test_Files_Sharing_Backend extends TestCase {
 		$this->view->file_put_contents($this->folder . $this->subfolder . $this->subsubfolder . $this->filename, $this->data);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->filename);
 		$this->view->deleteAll($this->folder);
 
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index 0e96f5a4e09..b6a44f464f9 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -42,7 +42,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 	/** @var \OC\Files\Storage\Storage */
 	protected $sharedStorage;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		\OC_User::setDisplayName(self::TEST_FILES_SHARING_API_USER1, 'User One');
@@ -88,7 +88,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 		$this->sharedCache = $this->sharedStorage->getCache();
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->sharedCache->clear();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
diff --git a/apps/files_sharing/tests/externalstorage.php b/apps/files_sharing/tests/externalstorage.php
index 0c741bb8199..cf82fcfc555 100644
--- a/apps/files_sharing/tests/externalstorage.php
+++ b/apps/files_sharing/tests/externalstorage.php
@@ -23,7 +23,7 @@
 /**
  * Tests for the external Storage class for remote shares.
  */
-class Test_Files_Sharing_External_Storage extends \PHPUnit_Framework_TestCase {
+class Test_Files_Sharing_External_Storage extends \Test\TestCase {
 
 	function optionsProvider() {
 		return array(
diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php
index 639ebfb5936..f72d724c6fe 100644
--- a/apps/files_sharing/tests/permissions.php
+++ b/apps/files_sharing/tests/permissions.php
@@ -61,7 +61,7 @@ class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase {
 	 */
 	private $ownerCache;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
@@ -99,7 +99,7 @@ class Test_Files_Sharing_Permissions extends OCA\Files_sharing\Tests\TestCase {
 		$this->sharedCacheRestrictedShare = $this->sharedStorageRestrictedShare->getCache();
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->sharedCache->clear();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
diff --git a/apps/files_sharing/tests/proxy.php b/apps/files_sharing/tests/proxy.php
index 68cd81f963a..31acf9b27de 100644
--- a/apps/files_sharing/tests/proxy.php
+++ b/apps/files_sharing/tests/proxy.php
@@ -32,7 +32,7 @@ class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase {
 
 	private static $tempStorage;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		// load proxies
@@ -53,7 +53,7 @@ class Test_Files_Sharing_Proxy extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->deleteAll($this->folder);
 
 		self::$tempStorage = null;
diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php
index 2b5978f8e57..4318d3c510e 100644
--- a/apps/files_sharing/tests/share.php
+++ b/apps/files_sharing/tests/share.php
@@ -31,7 +31,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 
 	private static $tempStorage;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = self::TEST_FOLDER_NAME;
@@ -49,7 +49,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . $this->subfolder . $this->filename, $this->data);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->filename);
 		$this->view->deleteAll($this->folder);
 
diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php
index 6d155f174ba..dd66ca05d38 100644
--- a/apps/files_sharing/tests/sharedmount.php
+++ b/apps/files_sharing/tests/sharedmount.php
@@ -25,7 +25,7 @@
  */
 class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = '/folder_share_storage_test';
@@ -40,7 +40,7 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . $this->filename, "file in subfolder");
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->folder);
 		$this->view->unlink($this->filename);
 
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index ab15e8fe3ba..75373244508 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -27,7 +27,7 @@ use OCA\Files\Share;
  */
 class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = '/folder_share_storage_test';
@@ -42,7 +42,7 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . $this->filename, "file in subfolder");
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->folder);
 		$this->view->unlink($this->filename);
 
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index 034baa785da..65fbfac7d1d 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -30,7 +30,7 @@ use OCA\Files\Share;
  *
  * Base class for sharing tests.
  */
-abstract class TestCase extends \PHPUnit_Framework_TestCase {
+abstract class TestCase extends \Test\TestCase {
 
 	const TEST_FILES_SHARING_API_USER1 = "test-share-user1";
 	const TEST_FILES_SHARING_API_USER2 = "test-share-user2";
@@ -49,6 +49,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 	public $subfolder;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
 
 		// remember files_encryption state
 		self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption');
@@ -84,7 +85,8 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 
 	}
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
 
 		$this->assertFalse(\OC_App::isEnabled('files_encryption'));
 
@@ -95,13 +97,14 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		$this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$query = \OCP\DB::prepare('DELETE FROM `*PREFIX*share`');
 		$query->execute();
+
+		parent::tearDown();
 	}
 
 	public static function tearDownAfterClass() {
-
 		// cleanup users
 		\OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER1);
 		\OC_User::deleteUser(self::TEST_FILES_SHARING_API_USER2);
@@ -120,6 +123,8 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 		\OC_Util::tearDownFS();
 		\OC_User::setUserId('');
 		Filesystem::tearDown();
+
+		parent::tearDownAfterClass();
 	}
 
 	/**
diff --git a/apps/files_sharing/tests/updater.php b/apps/files_sharing/tests/updater.php
index 861516dff7f..bc8deaf19b0 100644
--- a/apps/files_sharing/tests/updater.php
+++ b/apps/files_sharing/tests/updater.php
@@ -33,7 +33,7 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase {
 		\OCA\Files_Sharing\Helper::registerHooks();
 	}
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		$this->folder = self::TEST_FOLDER_NAME;
@@ -46,7 +46,7 @@ class Test_Files_Sharing_Updater extends OCA\Files_sharing\Tests\TestCase {
 		$this->view->file_put_contents($this->folder . '/' . $this->filename, $this->data);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->view->unlink($this->filename);
 		$this->view->deleteAll($this->folder);
 
diff --git a/apps/files_sharing/tests/watcher.php b/apps/files_sharing/tests/watcher.php
index 67f55394ae8..254b30c6470 100644
--- a/apps/files_sharing/tests/watcher.php
+++ b/apps/files_sharing/tests/watcher.php
@@ -42,7 +42,7 @@ class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase {
 	 */
 	private $sharedCache;
 
-	function setUp() {
+	protected function setUp() {
 		parent::setUp();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
@@ -71,7 +71,7 @@ class Test_Files_Sharing_Watcher extends OCA\Files_sharing\Tests\TestCase {
 		$this->sharedCache = $this->sharedStorage->getCache();
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		$this->sharedCache->clear();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 6fdb53f7271..f572e22623e 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -25,7 +25,7 @@ use OCA\Files_Trashbin;
 /**
  * Class Test_Encryption_Crypt
  */
-class Test_Trashbin extends \PHPUnit_Framework_TestCase {
+class Test_Trashbin extends \Test\TestCase {
 
 	const TEST_TRASHBIN_USER1 = "test-trashbin-user1";
 	const TEST_TRASHBIN_USER2 = "test-trashbin-user2";
@@ -43,6 +43,8 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase {
 	private $rootView;
 
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_User::useBackend('database');
@@ -85,18 +87,24 @@ class Test_Trashbin extends \PHPUnit_Framework_TestCase {
 		\OC_Config::setValue('trashbin_auto_expire', self::$rememberAutoExpire);
 
 		\OC_Hook::clear();
+
+		parent::tearDownAfterClass();
 	}
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->trashRoot1 = '/' . self::TEST_TRASHBIN_USER1 . '/files_trashbin';
 		$this->trashRoot2 = '/' . self::TEST_TRASHBIN_USER2 . '/files_trashbin';
 		$this->rootView = new \OC\Files\View();
 		self::loginHelper(self::TEST_TRASHBIN_USER1);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->rootView->deleteAll($this->trashRoot1);
 		$this->rootView->deleteAll($this->trashRoot2);
+
+		parent::tearDown();
 	}
 
 	/**
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index adcbb686c61..436863b28dc 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -27,7 +27,7 @@ require_once __DIR__ . '/../lib/versions.php';
  * Class Test_Files_versions
  * this class provide basic files versions test
  */
-class Test_Files_Versioning extends \PHPUnit_Framework_TestCase {
+class Test_Files_Versioning extends \Test\TestCase {
 
 	const TEST_VERSIONS_USER = 'test-versions-user';
 	const TEST_VERSIONS_USER2 = 'test-versions-user2';
diff --git a/apps/user_ldap/tests/access.php b/apps/user_ldap/tests/access.php
index 8ff39800808..85849229152 100644
--- a/apps/user_ldap/tests/access.php
+++ b/apps/user_ldap/tests/access.php
@@ -26,7 +26,7 @@ use \OCA\user_ldap\lib\Access;
 use \OCA\user_ldap\lib\Connection;
 use \OCA\user_ldap\lib\ILDAPWrapper;
 
-class Test_Access extends \PHPUnit_Framework_TestCase {
+class Test_Access extends \Test\TestCase {
 	private function getConnecterAndLdapMock() {
 		static $conMethods;
 		static $accMethods;
diff --git a/apps/user_ldap/tests/connection.php b/apps/user_ldap/tests/connection.php
index f51b0c83017..e3f29cec982 100644
--- a/apps/user_ldap/tests/connection.php
+++ b/apps/user_ldap/tests/connection.php
@@ -22,7 +22,7 @@
 
 namespace OCA\user_ldap\tests;
 
-class Test_Connection extends \PHPUnit_Framework_TestCase {
+class Test_Connection extends \Test\TestCase {
 
 	public function testOriginalAgentUnchangedOnClone() {
 		//background: upon login a bind is done with the user credentials
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index d1262e4f5b8..0e01eb3ba6f 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -22,14 +22,12 @@
 
 namespace OCA\user_ldap\tests;
 
-namespace OCA\user_ldap\tests;
-
 use \OCA\user_ldap\GROUP_LDAP as GroupLDAP;
 use \OCA\user_ldap\lib\Access;
 use \OCA\user_ldap\lib\Connection;
 use \OCA\user_ldap\lib\ILDAPWrapper;
 
-class Test_Group_Ldap extends \PHPUnit_Framework_TestCase {
+class Test_Group_Ldap extends \Test\TestCase {
 	private function getAccessMock() {
 		static $conMethods;
 		static $accMethods;
diff --git a/apps/user_ldap/tests/helper.php b/apps/user_ldap/tests/helper.php
index 07c24d64499..a70a57051c8 100644
--- a/apps/user_ldap/tests/helper.php
+++ b/apps/user_ldap/tests/helper.php
@@ -11,7 +11,7 @@ namespace OCA\user_ldap\tests;
 
 use OCA\user_ldap\lib\Helper;
 
-class Test_Helper extends \PHPUnit_Framework_TestCase {
+class Test_Helper extends \Test\TestCase {
 
 	public function testTableTruncate() {
 
diff --git a/apps/user_ldap/tests/user/manager.php b/apps/user_ldap/tests/user/manager.php
index 7d687867213..b3e52084dba 100644
--- a/apps/user_ldap/tests/user/manager.php
+++ b/apps/user_ldap/tests/user/manager.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests;
 
 use OCA\user_ldap\lib\user\Manager;
 
-class Test_User_Manager extends \PHPUnit_Framework_TestCase {
+class Test_User_Manager extends \Test\TestCase {
 
     private function getTestInstances() {
         $access  = $this->getMock('\OCA\user_ldap\lib\user\IUserTools');
diff --git a/apps/user_ldap/tests/user/user.php b/apps/user_ldap/tests/user/user.php
index b66a9237266..e110921d2d3 100644
--- a/apps/user_ldap/tests/user/user.php
+++ b/apps/user_ldap/tests/user/user.php
@@ -24,7 +24,7 @@ namespace OCA\user_ldap\tests;
 
 use OCA\user_ldap\lib\user\User;
 
-class Test_User_User extends \PHPUnit_Framework_TestCase {
+class Test_User_User extends \Test\TestCase {
 
 	private function getTestInstances() {
 		$access  = $this->getMock('\OCA\user_ldap\lib\user\IUserTools');
diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index c89edc33fa9..e91404d47f2 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -27,11 +27,13 @@ use \OCA\user_ldap\lib\Access;
 use \OCA\user_ldap\lib\Connection;
 use \OCA\user_ldap\lib\ILDAPWrapper;
 
-class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
+class Test_User_Ldap_Direct extends \Test\TestCase {
 	protected $backend;
 	protected $access;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		\OC_User::clearBackends();
 		\OC_Group::clearBackends();
 	}
diff --git a/apps/user_ldap/tests/wizard.php b/apps/user_ldap/tests/wizard.php
index 1f420f9ee8a..7284e466536 100644
--- a/apps/user_ldap/tests/wizard.php
+++ b/apps/user_ldap/tests/wizard.php
@@ -29,8 +29,9 @@ use \OCA\user_ldap\lib\Wizard;
 // use \OCA\user_ldap\lib\Configuration;
 // use \OCA\user_ldap\lib\ILDAPWrapper;
 
-class Test_Wizard extends \PHPUnit_Framework_TestCase {
-	public function setUp() {
+class Test_Wizard extends \Test\TestCase {
+	protected function setUp() {
+		parent::setUp();
 		//we need to make sure the consts are defined, otherwise tests will fail
 		//on systems without php5_ldap
 		$ldapConsts = array('LDAP_OPT_PROTOCOL_VERSION',
diff --git a/tests/lib/files/storage/storage.php b/tests/lib/files/storage/storage.php
index 960eb137ea0..30f403d60df 100644
--- a/tests/lib/files/storage/storage.php
+++ b/tests/lib/files/storage/storage.php
@@ -22,7 +22,7 @@
 
 namespace Test\Files\Storage;
 
-abstract class Storage extends \PHPUnit_Framework_TestCase {
+abstract class Storage extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Storage instance
 	 */
-- 
GitLab


From cb3a598cdb238f9ce74dce80ef9e59cdfc531a4f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Nov 2014 22:59:50 +0100
Subject: [PATCH 472/616] Make root tests extend the \Test\TestCase

---
 tests/lib/activitymanager.php                        |  6 ++++--
 tests/lib/api.php                                    |  2 +-
 tests/lib/app.php                                    |  2 +-
 tests/lib/appconfig.php                              |  6 +++++-
 tests/lib/archive.php                                |  2 +-
 tests/lib/archive/tar.php                            |  5 +++--
 tests/lib/archive/zip.php                            | 10 ++++++++--
 tests/lib/autoloader.php                             |  5 +++--
 tests/lib/avatar.php                                 |  8 +++++---
 tests/lib/cache.php                                  |  5 +++--
 tests/lib/cache/file.php                             |  8 +++++---
 tests/lib/cache/usercache.php                        |  6 ++++--
 tests/lib/config.php                                 |  9 ++++++---
 tests/lib/db.php                                     | 10 +++++++---
 tests/lib/dbschema.php                               | 10 +++++++---
 tests/lib/errorHandler.php                           |  2 +-
 tests/lib/geo.php                                    |  2 +-
 tests/lib/helper.php                                 |  2 +-
 tests/lib/httphelper.php                             |  6 ++++--
 tests/lib/image.php                                  |  4 +++-
 tests/lib/installer.php                              | 10 +++++++---
 tests/lib/l10n.php                                   |  2 +-
 tests/lib/largefilehelper.php                        |  4 ++--
 tests/lib/largefilehelpergetfilesize.php             |  4 ++--
 tests/lib/logger.php                                 |  6 ++++--
 tests/lib/mail.php                                   |  4 +++-
 tests/lib/migrate.php                                |  4 ++--
 tests/lib/naturalsort.php                            |  4 +++-
 tests/lib/preferences-singleton.php                  |  6 +++++-
 tests/lib/preferences.php                            |  2 +-
 tests/lib/preview.php                                |  2 +-
 tests/lib/repair.php                                 |  2 +-
 tests/lib/request.php                                | 10 +++++++---
 tests/lib/setup.php                                  |  6 ++++--
 tests/lib/streamwrappers.php                         |  2 +-
 tests/lib/tags.php                                   |  9 ++++++---
 tests/lib/template.php                               |  6 ++++--
 tests/lib/templatelayout.php                         | 12 ++++++++----
 tests/lib/tempmanager.php                            |  9 ++++++---
 tests/lib/updater.php                                |  2 +-
 tests/lib/urlgenerator.php                           |  2 +-
 tests/lib/user.php                                   |  4 +++-
 tests/lib/util.php                                   |  2 +-
 tests/lib/utilcheckserver.php                        |  9 ++++++---
 tests/lib/vobject.php                                |  6 ++++--
 .../controller/mailsettingscontrollertest.php        |  4 +++-
 46 files changed, 160 insertions(+), 83 deletions(-)

diff --git a/tests/lib/activitymanager.php b/tests/lib/activitymanager.php
index f21b82c52c3..85f8320de09 100644
--- a/tests/lib/activitymanager.php
+++ b/tests/lib/activitymanager.php
@@ -8,12 +8,14 @@
  *
 */
 
-class Test_ActivityManager extends PHPUnit_Framework_TestCase {
+class Test_ActivityManager extends \Test\TestCase {
 
 	/** @var \OC\ActivityManager */
 	private $activityManager;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->activityManager = new \OC\ActivityManager();
 		$this->activityManager->registerExtension(function() {
 			return new NoOpExtension();
diff --git a/tests/lib/api.php b/tests/lib/api.php
index 0f7d08543ea..bf9748a6040 100644
--- a/tests/lib/api.php
+++ b/tests/lib/api.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_API extends PHPUnit_Framework_TestCase {
+class Test_API extends \Test\TestCase {
 
 	// Helps build a response variable
 
diff --git a/tests/lib/app.php b/tests/lib/app.php
index 6ae548759ed..23c1a340e03 100644
--- a/tests/lib/app.php
+++ b/tests/lib/app.php
@@ -7,7 +7,7 @@
  * See the COPYING-README file.
  */
 
-class Test_App extends PHPUnit_Framework_TestCase {
+class Test_App extends \Test\TestCase {
 
 	private $oldAppConfigService;
 
diff --git a/tests/lib/appconfig.php b/tests/lib/appconfig.php
index 9257ae45b0e..188721ff92d 100644
--- a/tests/lib/appconfig.php
+++ b/tests/lib/appconfig.php
@@ -7,8 +7,10 @@
  * See the COPYING-README file.
  */
 
-class Test_Appconfig extends PHPUnit_Framework_TestCase {
+class Test_Appconfig extends \Test\TestCase {
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*appconfig` VALUES (?, ?, ?)');
 
 		$query->execute(array('testapp', 'enabled', 'true'));
@@ -33,6 +35,8 @@ class Test_Appconfig extends PHPUnit_Framework_TestCase {
 		$query->execute(array('someapp'));
 		$query->execute(array('123456'));
 		$query->execute(array('anotherapp'));
+
+		parent::tearDownAfterClass();
 	}
 
 	public function testGetApps() {
diff --git a/tests/lib/archive.php b/tests/lib/archive.php
index be5cc897a67..690b4378b88 100644
--- a/tests/lib/archive.php
+++ b/tests/lib/archive.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-abstract class Test_Archive extends PHPUnit_Framework_TestCase {
+abstract class Test_Archive extends \Test\TestCase {
 	/**
 	 * @var OC_Archive
 	 */
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index 99f7fb30e2b..43157e2054d 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -7,11 +7,12 @@
  */
 
 class Test_Archive_TAR extends Test_Archive {
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		if (OC_Util::runningOnWindows()) {
 			$this->markTestSkipped('[Windows] tar archives are not supported on Windows');
 		}
-		parent::setUp();
 	}
 
 	protected function getExisting() {
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index 90958baf380..09ea5d7d27c 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -6,8 +6,15 @@
  * See the COPYING-README file.
  */
 
-if (!OC_Util::runningOnWindows()) {
 class Test_Archive_ZIP extends Test_Archive {
+	protected function setUp() {
+		parent::setUp();
+
+		if (OC_Util::runningOnWindows()) {
+			$this->markTestSkipped('[Windows] ');
+		}
+	}
+
 	protected function getExisting() {
 		$dir = OC::$SERVERROOT . '/tests/data';
 		return new OC_Archive_ZIP($dir . '/data.zip');
@@ -17,4 +24,3 @@ class Test_Archive_ZIP extends Test_Archive {
 		return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip'));
 	}
 }
-}
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index 46172647249..bf63094a9ef 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -8,13 +8,14 @@
 
 namespace Test;
 
-class AutoLoader extends \PHPUnit_Framework_TestCase {
+class AutoLoader extends TestCase {
 	/**
 	 * @var \OC\Autoloader $loader
 	 */
 	private $loader;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->loader = new \OC\AutoLoader();
 	}
 
diff --git a/tests/lib/avatar.php b/tests/lib/avatar.php
index 0334639afa8..421be155d17 100644
--- a/tests/lib/avatar.php
+++ b/tests/lib/avatar.php
@@ -6,12 +6,14 @@
  * later.
  * See the COPYING-README file.
  */
-class Test_Avatar extends PHPUnit_Framework_TestCase {
+class Test_Avatar extends \Test\TestCase {
 
 	private $user;
 
-	public function setUp() {
-		$this->user = uniqid();
+	protected function setUp() {
+		parent::setUp();
+
+		$this->user = $this->getUniqueID();
 		$storage = new \OC\Files\Storage\Temporary(array());
 		\OC\Files\Filesystem::mount($storage, array(), '/' . $this->user . '/');
 	}
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 8fefa25f65d..bdee0348e50 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -6,16 +6,17 @@
  * See the COPYING-README file.
  */
 
-abstract class Test_Cache extends PHPUnit_Framework_TestCase {
+abstract class Test_Cache extends \Test\TestCase {
 	/**
 	 * @var \OC\Cache cache;
 	 */
 	protected $instance;
 
-	public function tearDown() {
+	protected function tearDown() {
 		if($this->instance) {
 			$this->instance->clear();
 		}
+		parent::tearDown();
 	}
 
 	function testSimple() {
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 8cc45c85405..d51322036c8 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -33,8 +33,10 @@ class FileCache extends \Test_Cache {
 	function skip() {
 		//$this->skipUnless(OC_User::isLoggedIn());
 	}
-	
-	public function setUp() {
+
+	protected function setUp() {
+		parent::setUp();
+
 		//clear all proxies and hooks so we can do clean testing
 		\OC_FileProxy::clearProxies();
 		\OC_Hook::clear('OC_Filesystem');
@@ -70,7 +72,7 @@ class FileCache extends \Test_Cache {
 		$this->instance=new \OC\Cache\File();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_User::setUserId($this->user);
 		\OC_Config::setValue('cachedirectory', $this->datadir);
 
diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php
index 8a23a805ebe..3822a714d5a 100644
--- a/tests/lib/cache/usercache.php
+++ b/tests/lib/cache/usercache.php
@@ -30,7 +30,9 @@ class UserCache extends \Test_Cache {
 	/** @var \OC\Files\Storage\Storage */
 	private $storage;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		//clear all proxies and hooks so we can do clean testing
 		\OC_FileProxy::clearProxies();
 		\OC_Hook::clear('OC_Filesystem');
@@ -66,7 +68,7 @@ class UserCache extends \Test_Cache {
 		$this->instance=new \OC\Cache\UserCache();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_User::setUserId($this->user);
 		\OC_Config::setValue('cachedirectory', $this->datadir);
 
diff --git a/tests/lib/config.php b/tests/lib/config.php
index 180f6b1649b..9dff3aab84f 100644
--- a/tests/lib/config.php
+++ b/tests/lib/config.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Config extends PHPUnit_Framework_TestCase {
+class Test_Config extends \Test\TestCase {
 	const TESTCONTENT = '<?php $CONFIG=array("foo"=>"bar", "beers" => array("Appenzeller", "Guinness", "Kölsch"), "alcohol_free" => false);';
 
 	/** @var array */
@@ -18,15 +18,18 @@ class Test_Config extends PHPUnit_Framework_TestCase {
 	/** @var string */
 	private $randomTmpDir;
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$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');
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		unlink($this->configFile);
+		parent::tearDown();
 	}
 
 	public function testGetKeys() {
diff --git a/tests/lib/db.php b/tests/lib/db.php
index fb673b8092b..a401aded62a 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_DB extends PHPUnit_Framework_TestCase {
+class Test_DB extends \Test\TestCase {
 	protected $backupGlobals = FALSE;
 
 	protected static $schema_file = 'static://test_db_scheme';
@@ -32,7 +32,9 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 	 */
 	private $table4;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
 
 		$r = '_'.OC_Util::generateRandomBytes(4).'_';
@@ -48,9 +50,11 @@ class Test_DB extends PHPUnit_Framework_TestCase {
 		$this->table4 = $this->test_prefix.'decimal';
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		OC_DB::removeDBStructure(self::$schema_file);
 		unlink(self::$schema_file);
+
+		parent::tearDown();
 	}
 
 	public function testQuotes() {
diff --git a/tests/lib/dbschema.php b/tests/lib/dbschema.php
index d31bd34124e..cfaebec079e 100644
--- a/tests/lib/dbschema.php
+++ b/tests/lib/dbschema.php
@@ -9,13 +9,15 @@
 
 use OCP\Security\ISecureRandom;
 
-class Test_DBSchema extends PHPUnit_Framework_TestCase {
+class Test_DBSchema extends \Test\TestCase {
 	protected $schema_file = 'static://test_db_scheme';
 	protected $schema_file2 = 'static://test_db_scheme2';
 	protected $table1;
 	protected $table2;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$dbfile = OC::$SERVERROOT.'/tests/data/db_structure.xml';
 		$dbfile2 = OC::$SERVERROOT.'/tests/data/db_structure2.xml';
 
@@ -32,9 +34,11 @@ class Test_DBSchema extends PHPUnit_Framework_TestCase {
 		$this->table2 = $r.'cntcts_cards';
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		unlink($this->schema_file);
 		unlink($this->schema_file2);
+
+		parent::tearDown();
 	}
 
 	// everything in one test, they depend on each other
diff --git a/tests/lib/errorHandler.php b/tests/lib/errorHandler.php
index 58db80b3c6e..726529e83f4 100644
--- a/tests/lib/errorHandler.php
+++ b/tests/lib/errorHandler.php
@@ -20,7 +20,7 @@
  *
  */
 
-class Test_ErrorHandler extends \PHPUnit_Framework_TestCase {
+class Test_ErrorHandler extends \Test\TestCase {
 
 	/**
 	 * provide username, password combinations for testRemovePassword
diff --git a/tests/lib/geo.php b/tests/lib/geo.php
index 1c56a976129..0678297b55a 100644
--- a/tests/lib/geo.php
+++ b/tests/lib/geo.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Geo extends PHPUnit_Framework_TestCase {
+class Test_Geo extends \Test\TestCase {
 	
 	/**
 	 * @medium
diff --git a/tests/lib/helper.php b/tests/lib/helper.php
index 57c72c11987..53a3e1a0ec8 100644
--- a/tests/lib/helper.php
+++ b/tests/lib/helper.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Helper extends PHPUnit_Framework_TestCase {
+class Test_Helper extends \Test\TestCase {
 
 	/**
 	 * @dataProvider humanFileSizeProvider
diff --git a/tests/lib/httphelper.php b/tests/lib/httphelper.php
index 191200aee3d..34dee35fe02 100644
--- a/tests/lib/httphelper.php
+++ b/tests/lib/httphelper.php
@@ -6,14 +6,16 @@
  * See the COPYING-README file.
  */
 
-class TestHTTPHelper extends \PHPUnit_Framework_TestCase {
+class TestHTTPHelper extends \Test\TestCase {
 
 	/** @var \OC\AllConfig*/
 	private $config;
 	/** @var \OC\HTTPHelper */
 	private $httpHelperMock;
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->config = $this->getMockBuilder('\OC\AllConfig')
 			->disableOriginalConstructor()->getMock();
 		$this->httpHelperMock = $this->getMockBuilder('\OC\HTTPHelper')
diff --git a/tests/lib/image.php b/tests/lib/image.php
index a683c3d2c8b..e0009b9710e 100644
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -6,10 +6,12 @@
  * See the COPYING-README file.
  */
 
-class Test_Image extends PHPUnit_Framework_TestCase {
+class Test_Image extends \Test\TestCase {
 	public static function tearDownAfterClass() {
 		@unlink(OC::$SERVERROOT.'/tests/data/testimage2.png');
 		@unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg');
+
+		parent::tearDownAfterClass();
 	}
 
 	public function testGetMimeTypeForFile() {
diff --git a/tests/lib/installer.php b/tests/lib/installer.php
index 5e267245200..b58a71b5a08 100644
--- a/tests/lib/installer.php
+++ b/tests/lib/installer.php
@@ -6,20 +6,24 @@
  * See the COPYING-README file.
  */
 
-class Test_Installer extends PHPUnit_Framework_TestCase {
+class Test_Installer extends \Test\TestCase {
 
 	private static $appid = 'testapp';
 	private $appstore;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->appstore = OC_Config::getValue('appstoreenabled', true);
 		OC_Config::setValue('appstoreenabled', true);
 		OC_Installer::removeApp(self::$appid);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		OC_Installer::removeApp(self::$appid);
 		OC_Config::setValue('appstoreenabled', $this->appstore);
+
+		parent::tearDown();
 	}
 
 	public function testInstallApp() {
diff --git a/tests/lib/l10n.php b/tests/lib/l10n.php
index df86fcfda81..68f43b76f51 100644
--- a/tests/lib/l10n.php
+++ b/tests/lib/l10n.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_L10n extends PHPUnit_Framework_TestCase {
+class Test_L10n extends \Test\TestCase {
 
 	public function testGermanPluralTranslations() {
 		$l = new OC_L10N('test');
diff --git a/tests/lib/largefilehelper.php b/tests/lib/largefilehelper.php
index 5db1f9c5a74..1267a8c5833 100644
--- a/tests/lib/largefilehelper.php
+++ b/tests/lib/largefilehelper.php
@@ -8,10 +8,10 @@
 
 namespace Test;
 
-class LargeFileHelper extends \PHPUnit_Framework_TestCase {
+class LargeFileHelper extends TestCase {
 	protected $helper;
 
-	public function setUp() {
+	protected function setUp() {
 		parent::setUp();
 		$this->helper = new \OC\LargeFileHelper;
 	}
diff --git a/tests/lib/largefilehelpergetfilesize.php b/tests/lib/largefilehelpergetfilesize.php
index 90ecc3dde70..c97b7b32b0f 100644
--- a/tests/lib/largefilehelpergetfilesize.php
+++ b/tests/lib/largefilehelpergetfilesize.php
@@ -12,11 +12,11 @@ namespace Test;
 * Tests whether LargeFileHelper is able to determine file size at all.
 * Large files are not considered yet.
 */
-class LargeFileHelperGetFileSize extends \PHPUnit_Framework_TestCase {
+class LargeFileHelperGetFileSize extends TestCase {
 	/** @var \OC\LargeFileHelper */
 	protected $helper;
 
-	public function setUp() {
+	protected function setUp() {
 		parent::setUp();
 		$this->helper = new \OC\LargeFileHelper();
 	}
diff --git a/tests/lib/logger.php b/tests/lib/logger.php
index fcdf5b58670..700a847917b 100644
--- a/tests/lib/logger.php
+++ b/tests/lib/logger.php
@@ -10,14 +10,16 @@ namespace Test;
 
 use OC\Log;
 
-class Logger extends \PHPUnit_Framework_TestCase {
+class Logger extends TestCase {
 	/**
 	 * @var \OCP\ILogger
 	 */
 	private $logger;
 	static private $logs = array();
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		self::$logs = array();
 		$this->logger = new Log('Test\Logger');
 	}
diff --git a/tests/lib/mail.php b/tests/lib/mail.php
index 3cc9868e25e..568ecff52b0 100644
--- a/tests/lib/mail.php
+++ b/tests/lib/mail.php
@@ -6,10 +6,12 @@
  * See the COPYING-README file.
  */
 
-class Test_Mail extends PHPUnit_Framework_TestCase {
+class Test_Mail extends \Test\TestCase {
 
 	protected function setUp()
 	{
+		parent::setUp();
+
 		if (!function_exists('idn_to_ascii')) {
 			$this->markTestSkipped(
 				'The intl extension is not available.'
diff --git a/tests/lib/migrate.php b/tests/lib/migrate.php
index 3f87bbc1ac8..9c1e980c445 100644
--- a/tests/lib/migrate.php
+++ b/tests/lib/migrate.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Migrate extends PHPUnit_Framework_TestCase {
+class Test_Migrate extends \Test\TestCase {
 
 	public $users;
 	public $tmpfiles = array();
@@ -38,7 +38,7 @@ class Test_Migrate extends PHPUnit_Framework_TestCase {
 	 * @return string the test users id
 	 */
 	public function generateUser() {
-		$username = uniqid();
+		$username = $this->getUniqueID();
 		\OC_User::createUser($username, 'password');
 		\OC_Util::tearDownFS();
 		\OC_User::setUserId('');
diff --git a/tests/lib/naturalsort.php b/tests/lib/naturalsort.php
index 09a0e6a5f9d..e022a855309 100644
--- a/tests/lib/naturalsort.php
+++ b/tests/lib/naturalsort.php
@@ -6,9 +6,11 @@
  * See the COPYING-README file.
  */
 
-class Test_NaturalSort extends PHPUnit_Framework_TestCase {
+class Test_NaturalSort extends \Test\TestCase {
 
 	public function setUp() {
+		parent::setUp();
+
 		if(!class_exists('Collator')) {
 			$this->markTestSkipped('The intl module is not available, natural sorting will not work as expected.');
 			return;
diff --git a/tests/lib/preferences-singleton.php b/tests/lib/preferences-singleton.php
index 7abf5a6be36..01e15acdfe1 100644
--- a/tests/lib/preferences-singleton.php
+++ b/tests/lib/preferences-singleton.php
@@ -7,8 +7,10 @@
  * See the COPYING-README file.
  */
 
-class Test_Preferences extends PHPUnit_Framework_TestCase {
+class Test_Preferences extends \Test\TestCase {
 	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*preferences` VALUES(?, ?, ?, ?)');
 		$query->execute(array("Someuser", "someapp", "somekey", "somevalue"));
 
@@ -34,6 +36,8 @@ class Test_Preferences extends PHPUnit_Framework_TestCase {
 		$query->execute(array('Someuser'));
 		$query->execute(array('Anotheruser'));
 		$query->execute(array('Anuser'));
+
+		parent::tearDownAfterClass();
 	}
 
 	public function testGetUsers() {
diff --git a/tests/lib/preferences.php b/tests/lib/preferences.php
index fe8e3e8b48c..193b1f80280 100644
--- a/tests/lib/preferences.php
+++ b/tests/lib/preferences.php
@@ -7,7 +7,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Preferences_Object extends PHPUnit_Framework_TestCase {
+class Test_Preferences_Object extends \Test\TestCase {
 	public function testGetUsers()
 	{
 		$statementMock = $this->getMock('\Doctrine\DBAL\Statement', array(), array(), '', false);
diff --git a/tests/lib/preview.php b/tests/lib/preview.php
index 288dd2aa417..2a6761403f4 100644
--- a/tests/lib/preview.php
+++ b/tests/lib/preview.php
@@ -8,7 +8,7 @@
 
 namespace Test;
 
-class Preview extends \Test\TestCase {
+class Preview extends TestCase {
 
 	/**
 	 * @var string
diff --git a/tests/lib/repair.php b/tests/lib/repair.php
index 121f41dedd9..248db382140 100644
--- a/tests/lib/repair.php
+++ b/tests/lib/repair.php
@@ -29,7 +29,7 @@ class TestRepairStep extends BasicEmitter implements \OC\RepairStep{
 	}
 }
 
-class Test_Repair extends PHPUnit_Framework_TestCase {
+class Test_Repair extends \Test\TestCase {
 	public function testRunRepairStep() {
 		$output = array();
 
diff --git a/tests/lib/request.php b/tests/lib/request.php
index b89bf92ece7..fbab8645d72 100644
--- a/tests/lib/request.php
+++ b/tests/lib/request.php
@@ -6,19 +6,23 @@
  * See the COPYING-README file.
  */
 
-class Test_Request extends PHPUnit_Framework_TestCase {
+class Test_Request extends \Test\TestCase {
+
+	protected function setUp() {
+		parent::setUp();
 
-	public function setUp() {
 		OC::$server->getConfig()->setSystemValue('overwritewebroot', '/domain.tld/ownCloud');
 
 		OC::$server->getConfig()->setSystemValue('trusted_proxies', array());
 		OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array());
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		OC::$server->getConfig()->setSystemValue('overwritewebroot', '');
 		OC::$server->getConfig()->setSystemValue('trusted_proxies', array());
 		OC::$server->getConfig()->setSystemValue('forwarded_for_headers', array());
+
+		parent::tearDown();
 	}
 
 	public function testScriptNameOverWrite() {
diff --git a/tests/lib/setup.php b/tests/lib/setup.php
index 2c1569dd800..8373ba316d6 100644
--- a/tests/lib/setup.php
+++ b/tests/lib/setup.php
@@ -8,14 +8,16 @@
 
 use OCP\IConfig;
 
-class Test_OC_Setup extends PHPUnit_Framework_TestCase {
+class Test_OC_Setup extends \Test\TestCase {
 
 	/** @var IConfig */
 	protected $config;
 	/** @var \OC_Setup */
 	protected $setupClass;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->config = $this->getMock('\OCP\IConfig');
 		$this->setupClass = $this->getMock('\OC_Setup', array('class_exists', 'is_callable'), array($this->config));
 	}
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 6f92f487037..9a3b6bc9266 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -20,7 +20,7 @@
  *
  */
 
-class Test_StreamWrappers extends PHPUnit_Framework_TestCase {
+class Test_StreamWrappers extends \Test\TestCase {
 	public function testFakeDir() {
 		$items = array('foo', 'bar');
 		\OC\Files\Stream\Dir::register('test', $items);
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 57b64f1cd36..ab714bde3df 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -20,13 +20,14 @@
 *
 */
 
-class Test_Tags extends PHPUnit_Framework_TestCase {
+class Test_Tags extends \Test\TestCase {
 
 	protected $objectType;
 	protected $user;
 	protected $backupGlobals = FALSE;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 
 		OC_User::clearBackends();
 		OC_User::useBackend('dummy');
@@ -39,9 +40,11 @@ class Test_Tags extends PHPUnit_Framework_TestCase {
 
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		//$query = OC_DB::prepare('DELETE FROM `*PREFIX*vcategories` WHERE `item_type` = ?');
 		//$query->execute(array('test'));
+
+		parent::tearDown();
 	}
 
 	public function testInstantiateWithDefaults() {
diff --git a/tests/lib/template.php b/tests/lib/template.php
index 819d592aacf..d77284a5bf2 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -20,9 +20,11 @@
 *
 */
 
-class Test_TemplateFunctions extends PHPUnit_Framework_TestCase {
+class Test_TemplateFunctions extends \Test\TestCase {
+
+	protected function setUp() {
+		parent::setUp();
 
-	public function setUp() {
 		$loader = new \OC\Autoloader();
 		$loader->load('OC_Template');
 	}
diff --git a/tests/lib/templatelayout.php b/tests/lib/templatelayout.php
index 0335c7c88ee..1035dae122d 100644
--- a/tests/lib/templatelayout.php
+++ b/tests/lib/templatelayout.php
@@ -11,23 +11,27 @@ namespace OC\Test;
 /**
  * @package OC\Test
  */
-class OC_TemplateLayout extends \PHPUnit_Framework_TestCase {
+class OC_TemplateLayout extends \Test\TestCase {
 
-	private $oldServerUri;
+	private $oldServerURI;
 	private $oldScriptName;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->oldServerURI = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : null;
 		$this->oldScriptName = $_SERVER['SCRIPT_NAME'];
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->oldServerURI === null) {
 			unset($_SERVER['REQUEST_URI']);
 		} else {
 			$_SERVER['REQUEST_URI'] = $this->oldServerURI;
 		}
 		$_SERVER['SCRIPT_NAME'] = $this->oldScriptName;
+
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
index 85b94094393..05311e820a7 100644
--- a/tests/lib/tempmanager.php
+++ b/tests/lib/tempmanager.php
@@ -21,18 +21,21 @@ class NullLogger extends Log {
 	}
 }
 
-class TempManager extends \PHPUnit_Framework_TestCase {
+class TempManager extends \Test\TestCase {
 	protected $baseDir;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->baseDir = get_temp_dir() . '/oc_tmp_test';
 		if (!is_dir($this->baseDir)) {
 			mkdir($this->baseDir);
 		}
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_Helper::rmdirr($this->baseDir);
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/updater.php b/tests/lib/updater.php
index 4488744fa1d..cc82450cfb6 100644
--- a/tests/lib/updater.php
+++ b/tests/lib/updater.php
@@ -8,7 +8,7 @@
 
 namespace OC;
 
-class UpdaterTest extends \PHPUnit_Framework_TestCase {
+class UpdaterTest extends \Test\TestCase {
 
 	public function testVersionCompatbility() {
 		return array(
diff --git a/tests/lib/urlgenerator.php b/tests/lib/urlgenerator.php
index 066272731ee..a92aaddeb4c 100644
--- a/tests/lib/urlgenerator.php
+++ b/tests/lib/urlgenerator.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Urlgenerator extends PHPUnit_Framework_TestCase {
+class Test_Urlgenerator extends \Test\TestCase {
 
 	/**
 	 * @small
diff --git a/tests/lib/user.php b/tests/lib/user.php
index e2c3282a19f..cb0c661b2a4 100644
--- a/tests/lib/user.php
+++ b/tests/lib/user.php
@@ -9,13 +9,15 @@
 
 namespace Test;
 
-class User extends \PHPUnit_Framework_TestCase {
+class User extends TestCase {
 	/**
 	 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
 	 */
 	private $backend;
 	
 	protected function setUp(){
+		parent::setUp();
+
 		$this->backend = $this->getMock('\OC_User_Dummy');
 		$manager = \OC_User::getManager();
 		$manager->registerBackend($this->backend);
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 9a3185b3f79..6de599b070e 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_Util extends PHPUnit_Framework_TestCase {
+class Test_Util extends \Test\TestCase {
 	public function testGetVersion() {
 		$version = \OC_Util::getVersion();
 		$this->assertTrue(is_array($version));
diff --git a/tests/lib/utilcheckserver.php b/tests/lib/utilcheckserver.php
index 73a1d0e95a6..bb9b7a24452 100644
--- a/tests/lib/utilcheckserver.php
+++ b/tests/lib/utilcheckserver.php
@@ -9,7 +9,7 @@
 /**
  * Tests for server check functions
  */
-class Test_Util_CheckServer extends PHPUnit_Framework_TestCase {
+class Test_Util_CheckServer extends \Test\TestCase {
 
 	private $datadir;
 
@@ -32,16 +32,19 @@ class Test_Util_CheckServer extends PHPUnit_Framework_TestCase {
 		return $config;
 	}
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->datadir = \OC_Helper::tmpFolder();
 
 		file_put_contents($this->datadir . '/.ocdata', '');
 		\OC::$server->getSession()->set('checkServer_succeeded', false);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		// clean up
 		@unlink($this->datadir . '/.ocdata');
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/vobject.php b/tests/lib/vobject.php
index db5b0f99f06..6fabf30e48f 100644
--- a/tests/lib/vobject.php
+++ b/tests/lib/vobject.php
@@ -6,9 +6,11 @@
  * See the COPYING-README file.
  */
 
-class Test_VObject extends PHPUnit_Framework_TestCase {
+class Test_VObject extends \Test\TestCase {
+
+	protected function setUp() {
+		parent::setUp();
 
-	public function setUp() {
 		Sabre\VObject\Property::$classMap['SUMMARY'] = 'OC\VObject\StringProperty';
 		Sabre\VObject\Property::$classMap['ORG'] = 'OC\VObject\CompoundProperty';
 	}
diff --git a/tests/settings/controller/mailsettingscontrollertest.php b/tests/settings/controller/mailsettingscontrollertest.php
index 789b6ce8fb0..f6ebade7b17 100644
--- a/tests/settings/controller/mailsettingscontrollertest.php
+++ b/tests/settings/controller/mailsettingscontrollertest.php
@@ -14,11 +14,13 @@ use \OC\Settings\Application;
 /**
  * @package OC\Settings\Controller
  */
-class MailSettingsControllerTest extends \PHPUnit_Framework_TestCase {
+class MailSettingsControllerTest extends \Test\TestCase {
 
 	private $container;
 
 	protected function setUp() {
+		parent::setUp();
+
 		$app = new Application();
 		$this->container = $app->getContainer();
 		$this->container['Config'] = $this->getMockBuilder('\OCP\IConfig')
-- 
GitLab


From 6202ca33ba76a38b4aea8774018d661f919fa464 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Mon, 10 Nov 2014 23:30:38 +0100
Subject: [PATCH 473/616] Make remaining files extend the test base

---
 tests/lib/appframework/AppTest.php                    |  4 +++-
 .../lib/appframework/controller/ApiControllerTest.php |  2 +-
 tests/lib/appframework/controller/ControllerTest.php  |  4 +++-
 tests/lib/appframework/db/EntityTest.php              |  3 ++-
 tests/lib/appframework/db/mappertest.php              |  2 +-
 tests/lib/appframework/db/mappertestutility.php       |  6 +++---
 .../dependencyinjection/DIContainerTest.php           |  3 ++-
 tests/lib/appframework/http/DataResponseTest.php      |  3 ++-
 tests/lib/appframework/http/DispatcherTest.php        |  5 ++---
 tests/lib/appframework/http/DownloadResponseTest.php  |  3 ++-
 tests/lib/appframework/http/HttpTest.php              |  4 +++-
 tests/lib/appframework/http/JSONResponseTest.php      |  3 ++-
 tests/lib/appframework/http/RedirectResponseTest.php  |  3 ++-
 tests/lib/appframework/http/RequestTest.php           |  9 ++++++---
 tests/lib/appframework/http/ResponseTest.php          |  3 ++-
 tests/lib/appframework/http/TemplateResponseTest.php  |  4 +++-
 .../middleware/MiddlewareDispatcherTest.php           |  5 +++--
 tests/lib/appframework/middleware/MiddlewareTest.php  |  4 +++-
 .../middleware/security/CORSMiddlewareTest.php        |  3 ++-
 .../middleware/security/SecurityMiddlewareTest.php    |  6 ++++--
 .../appframework/middleware/sessionmiddlewaretest.php |  4 +++-
 tests/lib/appframework/routing/RoutingTest.php        |  2 +-
 .../utility/ControllerMethodReflectorTest.php         |  2 +-
 tests/lib/backgroundjob/job.php                       |  5 +++--
 tests/lib/backgroundjob/joblist.php                   |  6 ++++--
 tests/lib/backgroundjob/queuedjob.php                 |  6 ++++--
 tests/lib/backgroundjob/timedjob.php                  |  6 ++++--
 tests/lib/cache.php                                   |  1 +
 tests/lib/connector/sabre/directory.php               |  6 ++++--
 tests/lib/connector/sabre/file.php                    |  2 +-
 tests/lib/connector/sabre/node.php                    |  2 +-
 tests/lib/connector/sabre/objecttree.php              |  4 ++--
 tests/lib/connector/sabre/quotaplugin.php             |  2 +-
 tests/lib/contacts/localadressbook.php                |  2 +-
 tests/lib/db/mdb2schemamanager.php                    |  6 ++++--
 tests/lib/db/mdb2schemareader.php                     |  2 +-
 tests/lib/db/migrator.php                             |  9 ++++++---
 tests/lib/db/mysqlmigration.php                       |  9 ++++++---
 tests/lib/db/sqlitemigration.php                      |  9 ++++++---
 tests/lib/group/group.php                             |  2 +-
 tests/lib/group/manager.php                           |  2 +-
 tests/lib/group/metadata.php                          |  2 +-
 tests/lib/hooks/basicemitter.php                      |  5 +++--
 tests/lib/hooks/legacyemitter.php                     |  4 +++-
 tests/lib/memcache/apc.php                            |  4 +++-
 tests/lib/memcache/apcu.php                           |  4 +++-
 tests/lib/memcache/cache.php                          |  4 +++-
 tests/lib/memcache/memcached.php                      |  5 ++++-
 tests/lib/memcache/xcache.php                         |  4 +++-
 tests/lib/ocs/privatedata.php                         | 10 +++-------
 tests/lib/public/contacts.php                         | 11 +++--------
 tests/lib/public/ocpconfig.php                        |  5 ++---
 tests/lib/repair/repaircollation.php                  |  9 ++++++---
 tests/lib/repair/repairinnodb.php                     |  9 ++++++---
 tests/lib/repair/repairlegacystorage.php              | 10 +++++++---
 tests/lib/repair/repairmimetypes.php                  |  9 ++++++---
 tests/lib/security/certificate.php                    |  6 ++++--
 tests/lib/security/certificatemanager.php             |  7 +++++--
 tests/lib/security/crypto.php                         |  3 ++-
 tests/lib/security/securerandom.php                   |  3 ++-
 tests/lib/security/stringutils.php                    |  2 +-
 tests/lib/session/memory.php                          |  3 ++-
 tests/lib/session/session.php                         |  5 +++--
 tests/lib/share/helper.php                            |  2 +-
 tests/lib/share/searchresultsorter.php                |  2 +-
 tests/lib/share/share.php                             |  4 +++-
 tests/lib/template/resourcelocator.php                |  2 +-
 tests/lib/user/manager.php                            |  2 +-
 tests/lib/user/session.php                            |  2 +-
 tests/lib/user/user.php                               |  2 +-
 70 files changed, 191 insertions(+), 117 deletions(-)

diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index 92fa4838341..bd565e9765e 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -25,7 +25,7 @@
 namespace OC\AppFramework;
 
 
-class AppTest extends \PHPUnit_Framework_TestCase {
+class AppTest extends \Test\TestCase {
 
 	private $container;
 	private $api;
@@ -38,6 +38,8 @@ class AppTest extends \PHPUnit_Framework_TestCase {
 	private $controllerMethod;
 
 	protected function setUp() {
+		parent::setUp();
+
 		$this->container = new \OC\AppFramework\DependencyInjection\DIContainer('test', array());
 		$this->controller = $this->getMockBuilder(
 			'OCP\AppFramework\Controller')
diff --git a/tests/lib/appframework/controller/ApiControllerTest.php b/tests/lib/appframework/controller/ApiControllerTest.php
index b772f540ce8..3055fbe0da8 100644
--- a/tests/lib/appframework/controller/ApiControllerTest.php
+++ b/tests/lib/appframework/controller/ApiControllerTest.php
@@ -31,7 +31,7 @@ use OCP\AppFramework\Http\TemplateResponse;
 class ChildApiController extends ApiController {};
 
 
-class ApiControllerTest extends \PHPUnit_Framework_TestCase {
+class ApiControllerTest extends \Test\TestCase {
 
 
     public function testCors() {
diff --git a/tests/lib/appframework/controller/ControllerTest.php b/tests/lib/appframework/controller/ControllerTest.php
index 0de94ff5b70..d186651dc23 100644
--- a/tests/lib/appframework/controller/ControllerTest.php
+++ b/tests/lib/appframework/controller/ControllerTest.php
@@ -54,7 +54,7 @@ class ChildController extends Controller {
 	}
 };
 
-class ControllerTest extends \PHPUnit_Framework_TestCase {
+class ControllerTest extends \Test\TestCase {
 
 	/**
 	 * @var Controller
@@ -63,6 +63,8 @@ class ControllerTest extends \PHPUnit_Framework_TestCase {
 	private $app;
 
 	protected function setUp(){
+		parent::setUp();
+
 		$request = new Request(
 			array(
 				'get' => array('name' => 'John Q. Public', 'nickname' => 'Joey'),
diff --git a/tests/lib/appframework/db/EntityTest.php b/tests/lib/appframework/db/EntityTest.php
index d98cb549422..161e11d8030 100644
--- a/tests/lib/appframework/db/EntityTest.php
+++ b/tests/lib/appframework/db/EntityTest.php
@@ -49,11 +49,12 @@ class TestEntity extends Entity {
 };
 
 
-class EntityTest extends \PHPUnit_Framework_TestCase {
+class EntityTest extends \Test\TestCase {
 
 	private $entity;
 
 	protected function setUp(){
+		parent::setUp();
 		$this->entity = new TestEntity();
 	}
 
diff --git a/tests/lib/appframework/db/mappertest.php b/tests/lib/appframework/db/mappertest.php
index fd1acd0367e..6ad8cd86bff 100644
--- a/tests/lib/appframework/db/mappertest.php
+++ b/tests/lib/appframework/db/mappertest.php
@@ -57,7 +57,7 @@ class MapperTest extends MapperTestUtility {
 	 */
 	private $mapper;
 
-	public function setUp(){
+	protected function setUp(){
 		parent::setUp();
 		$this->mapper = new ExampleMapper($this->db);
 	}
diff --git a/tests/lib/appframework/db/mappertestutility.php b/tests/lib/appframework/db/mappertestutility.php
index 0430eef2c21..ad7a67a96b1 100644
--- a/tests/lib/appframework/db/mappertestutility.php
+++ b/tests/lib/appframework/db/mappertestutility.php
@@ -28,9 +28,7 @@ namespace Test\AppFramework\Db;
 /**
  * Simple utility class for testing mappers
  */
-abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
-
-
+abstract class MapperTestUtility extends \Test\TestCase {
 	protected $db;
 	private $query;
 	private $pdoResult;
@@ -45,6 +43,8 @@ abstract class MapperTestUtility extends \PHPUnit_Framework_TestCase {
 	 * db. After this the db can be accessed by using $this->db
 	 */
 	protected function setUp(){
+		parent::setUp();
+
 		$this->db = $this->getMockBuilder(
 			'\OCP\IDb')
 			->disableOriginalConstructor()
diff --git a/tests/lib/appframework/dependencyinjection/DIContainerTest.php b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
index acc5c2e66d8..08e72aff984 100644
--- a/tests/lib/appframework/dependencyinjection/DIContainerTest.php
+++ b/tests/lib/appframework/dependencyinjection/DIContainerTest.php
@@ -29,12 +29,13 @@ namespace OC\AppFramework\DependencyInjection;
 use \OC\AppFramework\Http\Request;
 
 
-class DIContainerTest extends \PHPUnit_Framework_TestCase {
+class DIContainerTest extends \Test\TestCase {
 
 	private $container;
 	private $api;
 
 	protected function setUp(){
+		parent::setUp();
 		$this->container = new DIContainer('name');
 		$this->api = $this->getMock('OC\AppFramework\Core\API', array(), array('hi'));
 	}
diff --git a/tests/lib/appframework/http/DataResponseTest.php b/tests/lib/appframework/http/DataResponseTest.php
index 961327c978c..e91d3cefea9 100644
--- a/tests/lib/appframework/http/DataResponseTest.php
+++ b/tests/lib/appframework/http/DataResponseTest.php
@@ -29,7 +29,7 @@ use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http;
 
 
-class DataResponseTest extends \PHPUnit_Framework_TestCase {
+class DataResponseTest extends \Test\TestCase {
 
 	/**
 	 * @var DataResponse
@@ -37,6 +37,7 @@ class DataResponseTest extends \PHPUnit_Framework_TestCase {
 	private $response;
 
 	protected function setUp() {
+		parent::setUp();
 		$this->response = new DataResponse();
 	}
 
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index f082ddc8b3a..f92e7161e6b 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -62,9 +62,7 @@ class TestController extends Controller {
 }
 
 
-class DispatcherTest extends \PHPUnit_Framework_TestCase {
-
-
+class DispatcherTest extends \Test\TestCase {
 	private $middlewareDispatcher;
 	private $dispatcher;
 	private $controllerMethod;
@@ -75,6 +73,7 @@ class DispatcherTest extends \PHPUnit_Framework_TestCase {
 	private $reflector;
 
 	protected function setUp() {
+		parent::setUp();
 		$this->controllerMethod = 'test';
 
 		$app = $this->getMockBuilder(
diff --git a/tests/lib/appframework/http/DownloadResponseTest.php b/tests/lib/appframework/http/DownloadResponseTest.php
index ab381e5c298..5e5db2c55ec 100644
--- a/tests/lib/appframework/http/DownloadResponseTest.php
+++ b/tests/lib/appframework/http/DownloadResponseTest.php
@@ -30,7 +30,7 @@ class ChildDownloadResponse extends DownloadResponse {
 };
 
 
-class DownloadResponseTest extends \PHPUnit_Framework_TestCase {
+class DownloadResponseTest extends \Test\TestCase {
 
 	/**
 	 * @var ChildDownloadResponse
@@ -38,6 +38,7 @@ class DownloadResponseTest extends \PHPUnit_Framework_TestCase {
 	protected $response;
 
 	protected function setUp(){
+		parent::setUp();
 		$this->response = new ChildDownloadResponse('file', 'content');
 	}
 
diff --git a/tests/lib/appframework/http/HttpTest.php b/tests/lib/appframework/http/HttpTest.php
index a7a189c98e5..e9be3e73904 100644
--- a/tests/lib/appframework/http/HttpTest.php
+++ b/tests/lib/appframework/http/HttpTest.php
@@ -27,7 +27,7 @@ namespace OC\AppFramework\Http;
 use OC\AppFramework\Http;
 
 
-class HttpTest extends \PHPUnit_Framework_TestCase {
+class HttpTest extends \Test\TestCase {
 
 	private $server;
 
@@ -37,6 +37,8 @@ class HttpTest extends \PHPUnit_Framework_TestCase {
 	private $http;
 
 	protected function setUp(){
+		parent::setUp();
+
 		$this->server = array();
 		$this->http = new Http($this->server);
 	}
diff --git a/tests/lib/appframework/http/JSONResponseTest.php b/tests/lib/appframework/http/JSONResponseTest.php
index 06cd3410a69..cdd8d269b41 100644
--- a/tests/lib/appframework/http/JSONResponseTest.php
+++ b/tests/lib/appframework/http/JSONResponseTest.php
@@ -30,7 +30,7 @@ namespace OC\AppFramework\Http;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http;
 
-class JSONResponseTest extends \PHPUnit_Framework_TestCase {
+class JSONResponseTest extends \Test\TestCase {
 
 	/**
 	 * @var JSONResponse
@@ -38,6 +38,7 @@ class JSONResponseTest extends \PHPUnit_Framework_TestCase {
 	private $json;
 
 	protected function setUp() {
+		parent::setUp();
 		$this->json = new JSONResponse();
 	}
 
diff --git a/tests/lib/appframework/http/RedirectResponseTest.php b/tests/lib/appframework/http/RedirectResponseTest.php
index e5d452f7f91..17db0c0be6c 100644
--- a/tests/lib/appframework/http/RedirectResponseTest.php
+++ b/tests/lib/appframework/http/RedirectResponseTest.php
@@ -27,7 +27,7 @@ namespace OCP\AppFramework\Http;
 use OCP\AppFramework\Http;
 
 
-class RedirectResponseTest extends \PHPUnit_Framework_TestCase {
+class RedirectResponseTest extends \Test\TestCase {
 
 	/**
 	 * @var RedirectResponse
@@ -35,6 +35,7 @@ class RedirectResponseTest extends \PHPUnit_Framework_TestCase {
 	protected $response;
 
 	protected function setUp(){
+		parent::setUp();
 		$this->response = new RedirectResponse('/url');
 	}
 
diff --git a/tests/lib/appframework/http/RequestTest.php b/tests/lib/appframework/http/RequestTest.php
index 58828d17bb2..caa22c84415 100644
--- a/tests/lib/appframework/http/RequestTest.php
+++ b/tests/lib/appframework/http/RequestTest.php
@@ -10,9 +10,11 @@ namespace OC\AppFramework\Http;
 
 global $data;
 
-class RequestTest extends \PHPUnit_Framework_TestCase {
+class RequestTest extends \Test\TestCase {
+
+	protected function setUp() {
+		parent::setUp();
 
-	public function setUp() {
 		require_once __DIR__ . '/requeststream.php';
 		if (in_array('fakeinput', stream_get_wrappers())) {
 			stream_wrapper_unregister('fakeinput');
@@ -21,8 +23,9 @@ class RequestTest extends \PHPUnit_Framework_TestCase {
 		$this->stream = 'fakeinput://data';
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		stream_wrapper_unregister('fakeinput');
+		parent::tearDown();
 	}
 
 	public function testRequestAccessors() {
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index b1dddd9ebc7..04e19fdaf71 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -29,7 +29,7 @@ use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http;
 
 
-class ResponseTest extends \PHPUnit_Framework_TestCase {
+class ResponseTest extends \Test\TestCase {
 
 	/**
 	 * @var \OCP\AppFramework\Http\Response
@@ -37,6 +37,7 @@ class ResponseTest extends \PHPUnit_Framework_TestCase {
 	private $childResponse;
 
 	protected function setUp(){
+		parent::setUp();
 		$this->childResponse = new Response();
 	}
 
diff --git a/tests/lib/appframework/http/TemplateResponseTest.php b/tests/lib/appframework/http/TemplateResponseTest.php
index afdcf322b85..2ec57f8979a 100644
--- a/tests/lib/appframework/http/TemplateResponseTest.php
+++ b/tests/lib/appframework/http/TemplateResponseTest.php
@@ -28,7 +28,7 @@ use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Http;
 
 
-class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
+class TemplateResponseTest extends \Test\TestCase {
 
 	/**
 	 * @var \OCP\AppFramework\Http\TemplateResponse
@@ -41,6 +41,8 @@ class TemplateResponseTest extends \PHPUnit_Framework_TestCase {
 	private $api;
 
 	protected function setUp() {
+		parent::setUp();
+
 		$this->api = $this->getMock('OC\AppFramework\Core\API',
 								array('getAppName'), array('test'));
 		$this->api->expects($this->any())
diff --git a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
index b1e221aab99..be8765afd39 100644
--- a/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareDispatcherTest.php
@@ -100,7 +100,7 @@ class TestMiddleware extends Middleware {
 }
 
 
-class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
+class MiddlewareDispatcherTest extends \Test\TestCase {
 
 	public $exception;
 	public $response;
@@ -113,8 +113,9 @@ class MiddlewareDispatcherTest extends \PHPUnit_Framework_TestCase {
 	 */
 	private $dispatcher;
 
+	protected function setUp() {
+		parent::setUp();
 
-	public function setUp() {
 		$this->dispatcher = new MiddlewareDispatcher();
 		$this->controller = $this->getControllerMock();
 		$this->method = 'method';
diff --git a/tests/lib/appframework/middleware/MiddlewareTest.php b/tests/lib/appframework/middleware/MiddlewareTest.php
index 9d952f61573..b41ec33eb15 100644
--- a/tests/lib/appframework/middleware/MiddlewareTest.php
+++ b/tests/lib/appframework/middleware/MiddlewareTest.php
@@ -31,7 +31,7 @@ use OCP\AppFramework\Middleware;
 class ChildMiddleware extends Middleware {};
 
 
-class MiddlewareTest extends \PHPUnit_Framework_TestCase {
+class MiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @var Middleware
@@ -42,6 +42,8 @@ class MiddlewareTest extends \PHPUnit_Framework_TestCase {
 	private $api;
 
 	protected function setUp(){
+		parent::setUp();
+
 		$this->middleware = new ChildMiddleware();
 
 		$this->api = $this->getMockBuilder(
diff --git a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
index 79cd3b278af..b4bbcce5ad7 100644
--- a/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/CORSMiddlewareTest.php
@@ -18,11 +18,12 @@ use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\Http\Response;
 
 
-class CORSMiddlewareTest extends \PHPUnit_Framework_TestCase {
+class CORSMiddlewareTest extends \Test\TestCase {
 
 	private $reflector;
 
 	protected function setUp() {
+		parent::setUp();
 		$this->reflector = new ControllerMethodReflector();
 	}
 
diff --git a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
index cc7704f4d1a..a8925403a95 100644
--- a/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
+++ b/tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
@@ -31,7 +31,7 @@ use OCP\AppFramework\Http\RedirectResponse;
 use OCP\AppFramework\Http\JSONResponse;
 
 
-class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
+class SecurityMiddlewareTest extends \Test\TestCase {
 
 	private $middleware;
 	private $controller;
@@ -43,7 +43,9 @@ class SecurityMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	private $navigationManager;
 	private $urlGenerator;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->controller = $this->getMockBuilder('OCP\AppFramework\Controller')
 			->disableOriginalConstructor()
 				->getMock();
diff --git a/tests/lib/appframework/middleware/sessionmiddlewaretest.php b/tests/lib/appframework/middleware/sessionmiddlewaretest.php
index 13e558bf21a..344b555ec3c 100644
--- a/tests/lib/appframework/middleware/sessionmiddlewaretest.php
+++ b/tests/lib/appframework/middleware/sessionmiddlewaretest.php
@@ -18,7 +18,7 @@ use OC\AppFramework\Utility\ControllerMethodReflector;
 use OCP\AppFramework\Http\Response;
 
 
-class SessionMiddlewareTest extends \PHPUnit_Framework_TestCase {
+class SessionMiddlewareTest extends \Test\TestCase {
 
 	/**
 	 * @var ControllerMethodReflector
@@ -31,6 +31,8 @@ class SessionMiddlewareTest extends \PHPUnit_Framework_TestCase {
 	private $request;
 
 	protected function setUp() {
+		parent::setUp();
+
 		$this->request = new Request();
 		$this->reflector = new ControllerMethodReflector();
 	}
diff --git a/tests/lib/appframework/routing/RoutingTest.php b/tests/lib/appframework/routing/RoutingTest.php
index a1d9a51a3c8..276307680af 100644
--- a/tests/lib/appframework/routing/RoutingTest.php
+++ b/tests/lib/appframework/routing/RoutingTest.php
@@ -6,7 +6,7 @@ use OC\AppFramework\DependencyInjection\DIContainer;
 use OC\AppFramework\routing\RouteConfig;
 
 
-class RoutingTest extends \PHPUnit_Framework_TestCase
+class RoutingTest extends \Test\TestCase
 {
 
 	public function testSimpleRoute()
diff --git a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php
index 8939a203edb..cd6bd57da4c 100644
--- a/tests/lib/appframework/utility/ControllerMethodReflectorTest.php
+++ b/tests/lib/appframework/utility/ControllerMethodReflectorTest.php
@@ -25,7 +25,7 @@
 namespace OC\AppFramework\Utility;
 
 
-class ControllerMethodReflectorTest extends \PHPUnit_Framework_TestCase {
+class ControllerMethodReflectorTest extends \Test\TestCase {
 
 
 	/**
diff --git a/tests/lib/backgroundjob/job.php b/tests/lib/backgroundjob/job.php
index 10a8f46462e..fec9b0a792d 100644
--- a/tests/lib/backgroundjob/job.php
+++ b/tests/lib/backgroundjob/job.php
@@ -8,10 +8,11 @@
 
 namespace Test\BackgroundJob;
 
-class Job extends \PHPUnit_Framework_TestCase {
+class Job extends \Test\TestCase {
 	private $run = false;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->run = false;
 	}
 
diff --git a/tests/lib/backgroundjob/joblist.php b/tests/lib/backgroundjob/joblist.php
index c3318f80cb2..13bee12479e 100644
--- a/tests/lib/backgroundjob/joblist.php
+++ b/tests/lib/backgroundjob/joblist.php
@@ -8,7 +8,7 @@
 
 namespace Test\BackgroundJob;
 
-class JobList extends \PHPUnit_Framework_TestCase {
+class JobList extends \Test\TestCase {
 	/**
 	 * @var \OC\BackgroundJob\JobList
 	 */
@@ -19,7 +19,9 @@ class JobList extends \PHPUnit_Framework_TestCase {
 	 */
 	protected $config;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$conn = \OC::$server->getDatabaseConnection();
 		$this->config = $this->getMock('\OCP\IConfig');
 		$this->instance = new \OC\BackgroundJob\JobList($conn, $this->config);
diff --git a/tests/lib/backgroundjob/queuedjob.php b/tests/lib/backgroundjob/queuedjob.php
index 19c1b28a507..8d3cd6f907b 100644
--- a/tests/lib/backgroundjob/queuedjob.php
+++ b/tests/lib/backgroundjob/queuedjob.php
@@ -23,7 +23,7 @@ class TestQueuedJob extends \OC\BackgroundJob\QueuedJob {
 	}
 }
 
-class QueuedJob extends \PHPUnit_Framework_TestCase {
+class QueuedJob extends \Test\TestCase {
 	/**
 	 * @var DummyJobList $jobList
 	 */
@@ -39,7 +39,9 @@ class QueuedJob extends \PHPUnit_Framework_TestCase {
 		$this->jobRun = true;
 	}
 
-	public function setup() {
+	protected function setup() {
+		parent::setUp();
+
 		$this->jobList = new DummyJobList();
 		$this->job = new TestQueuedJob($this);
 		$this->jobList->add($this->job);
diff --git a/tests/lib/backgroundjob/timedjob.php b/tests/lib/backgroundjob/timedjob.php
index 646a2607ef3..7d9bfe979af 100644
--- a/tests/lib/backgroundjob/timedjob.php
+++ b/tests/lib/backgroundjob/timedjob.php
@@ -24,7 +24,7 @@ class TestTimedJob extends \OC\BackgroundJob\TimedJob {
 	}
 }
 
-class TimedJob extends \PHPUnit_Framework_TestCase {
+class TimedJob extends \Test\TestCase {
 	/**
 	 * @var DummyJobList $jobList
 	 */
@@ -40,7 +40,9 @@ class TimedJob extends \PHPUnit_Framework_TestCase {
 		$this->jobRun = true;
 	}
 
-	public function setup() {
+	protected function setup() {
+		parent::setUp();
+
 		$this->jobList = new DummyJobList();
 		$this->job = new TestTimedJob($this);
 		$this->jobList->add($this->job);
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index bdee0348e50..894d8c57662 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -16,6 +16,7 @@ abstract class Test_Cache extends \Test\TestCase {
 		if($this->instance) {
 			$this->instance->clear();
 		}
+
 		parent::tearDown();
 	}
 
diff --git a/tests/lib/connector/sabre/directory.php b/tests/lib/connector/sabre/directory.php
index 453d8e8d42a..d8dca35cd71 100644
--- a/tests/lib/connector/sabre/directory.php
+++ b/tests/lib/connector/sabre/directory.php
@@ -6,12 +6,14 @@
  * later.
  * See the COPYING-README file.
  */
-class Test_OC_Connector_Sabre_Directory extends PHPUnit_Framework_TestCase {
+class Test_OC_Connector_Sabre_Directory extends \Test\TestCase {
 
 	private $view;
 	private $info;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->view = $this->getMock('OC\Files\View', array(), array(), '', false);
 		$this->info = $this->getMock('OC\Files\FileInfo', array(), array(), '', false);
 	}
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index 0993a27f372..cfc6e29ae74 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_OC_Connector_Sabre_File extends PHPUnit_Framework_TestCase {
+class Test_OC_Connector_Sabre_File extends \Test\TestCase {
 
 	/**
 	 * @expectedException \Sabre\DAV\Exception
diff --git a/tests/lib/connector/sabre/node.php b/tests/lib/connector/sabre/node.php
index 0f303457248..9a2bf41bd19 100644
--- a/tests/lib/connector/sabre/node.php
+++ b/tests/lib/connector/sabre/node.php
@@ -12,7 +12,7 @@ namespace Test\Connector\Sabre;
 use OC\Files\FileInfo;
 use OC\Files\View;
 
-class Node extends \PHPUnit_Framework_TestCase {
+class Node extends \Test\TestCase {
 	public function davPermissionsProvider() {
 		return array(
 			array(\OCP\PERMISSION_ALL, 'file', false, false, 'RDNVW'),
diff --git a/tests/lib/connector/sabre/objecttree.php b/tests/lib/connector/sabre/objecttree.php
index fc9f802066f..d1de46d2ee7 100644
--- a/tests/lib/connector/sabre/objecttree.php
+++ b/tests/lib/connector/sabre/objecttree.php
@@ -13,7 +13,7 @@ use OC\Files\FileInfo;
 use OC_Connector_Sabre_Directory;
 use PHPUnit_Framework_TestCase;
 
-class TestDoubleFileView extends \OC\Files\View{
+class TestDoubleFileView extends \OC\Files\View {
 
 	public function __construct($updatables, $deletables, $canRename = true) {
 		$this->updatables = $updatables;
@@ -42,7 +42,7 @@ class TestDoubleFileView extends \OC\Files\View{
 	}
 }
 
-class ObjectTree extends PHPUnit_Framework_TestCase {
+class ObjectTree extends \Test\TestCase {
 
 	/**
 	 * @dataProvider moveFailedProvider
diff --git a/tests/lib/connector/sabre/quotaplugin.php b/tests/lib/connector/sabre/quotaplugin.php
index 3b144cf56b5..f08637854ce 100644
--- a/tests/lib/connector/sabre/quotaplugin.php
+++ b/tests/lib/connector/sabre/quotaplugin.php
@@ -6,7 +6,7 @@
  * later.
  * See the COPYING-README file.
  */
-class Test_OC_Connector_Sabre_QuotaPlugin extends PHPUnit_Framework_TestCase {
+class Test_OC_Connector_Sabre_QuotaPlugin extends \Test\TestCase {
 
 	/**
 	 * @var \Sabre\DAV\Server
diff --git a/tests/lib/contacts/localadressbook.php b/tests/lib/contacts/localadressbook.php
index bb69910820f..5fa260ffc3b 100644
--- a/tests/lib/contacts/localadressbook.php
+++ b/tests/lib/contacts/localadressbook.php
@@ -11,7 +11,7 @@ use OC\Contacts\LocalAddressBook;
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class Test_LocalAddressBook extends PHPUnit_Framework_TestCase
+class Test_LocalAddressBook extends \Test\TestCase
 {
 
 	public function testSearchFN() {
diff --git a/tests/lib/db/mdb2schemamanager.php b/tests/lib/db/mdb2schemamanager.php
index 527b2cba648..3e6abab70b4 100644
--- a/tests/lib/db/mdb2schemamanager.php
+++ b/tests/lib/db/mdb2schemamanager.php
@@ -12,15 +12,17 @@ namespace Test\DB;
 use Doctrine\DBAL\Platforms\OraclePlatform;
 use Doctrine\DBAL\Platforms\SQLServerPlatform;
 
-class MDB2SchemaManager extends \PHPUnit_Framework_TestCase {
+class MDB2SchemaManager extends \Test\TestCase {
 
-	public function tearDown() {
+	protected function tearDown() {
 		// do not drop the table for Oracle as it will create a bogus transaction
 		// that will break the following test suites requiring transactions
 		if (\OC::$server->getConfig()->getSystemValue('dbtype', 'sqlite') === 'oci') {
 			return;
 		}
 		\OC_DB::dropTable('table');
+
+		parent::tearDown();
 	}
 
 	public function testAutoIncrement() {
diff --git a/tests/lib/db/mdb2schemareader.php b/tests/lib/db/mdb2schemareader.php
index f08996cbeaf..b2ff55e1632 100644
--- a/tests/lib/db/mdb2schemareader.php
+++ b/tests/lib/db/mdb2schemareader.php
@@ -11,7 +11,7 @@ namespace Test\DB;
 
 use Doctrine\DBAL\Platforms\MySqlPlatform;
 
-class MDB2SchemaReader extends \PHPUnit_Framework_TestCase {
+class MDB2SchemaReader extends \Test\TestCase {
 	/**
 	 * @var \OC\DB\MDB2SchemaReader $reader
 	 */
diff --git a/tests/lib/db/migrator.php b/tests/lib/db/migrator.php
index 09742a53eb4..7acd3382fe2 100644
--- a/tests/lib/db/migrator.php
+++ b/tests/lib/db/migrator.php
@@ -15,7 +15,7 @@ use Doctrine\DBAL\Platforms\SQLServerPlatform;
 use \Doctrine\DBAL\Schema\Schema;
 use \Doctrine\DBAL\Schema\SchemaConfig;
 
-class Migrator extends \PHPUnit_Framework_TestCase {
+class Migrator extends \Test\TestCase {
 	/**
 	 * @var \Doctrine\DBAL\Connection $connection
 	 */
@@ -28,7 +28,9 @@ class Migrator extends \PHPUnit_Framework_TestCase {
 
 	private $tableName;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->connection = \OC_DB::getConnection();
 		if ($this->connection->getDatabasePlatform() instanceof OraclePlatform) {
 			$this->markTestSkipped('DB migration tests are not supported on OCI');
@@ -40,8 +42,9 @@ class Migrator extends \PHPUnit_Framework_TestCase {
 		$this->tableName = 'test_' . uniqid();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->connection->exec('DROP TABLE ' . $this->tableName);
+		parent::tearDown();
 	}
 
 	/**
diff --git a/tests/lib/db/mysqlmigration.php b/tests/lib/db/mysqlmigration.php
index 584df1d4465..70199147760 100644
--- a/tests/lib/db/mysqlmigration.php
+++ b/tests/lib/db/mysqlmigration.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class TestMySqlMigration extends \PHPUnit_Framework_TestCase {
+class TestMySqlMigration extends \Test\TestCase {
 
 	/** @var \Doctrine\DBAL\Connection */
 	private $connection;
@@ -14,7 +14,9 @@ class TestMySqlMigration extends \PHPUnit_Framework_TestCase {
 	/** @var string */
 	private $tableName;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->connection = \OC_DB::getConnection();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
 			$this->markTestSkipped("Test only relevant on MySql");
@@ -25,8 +27,9 @@ class TestMySqlMigration extends \PHPUnit_Framework_TestCase {
 		$this->connection->exec("CREATE TABLE $this->tableName(b BIT,  e ENUM('1','2','3','4'))");
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->connection->getSchemaManager()->dropTable($this->tableName);
+		parent::tearDown();
 	}
 
 	public function testNonOCTables() {
diff --git a/tests/lib/db/sqlitemigration.php b/tests/lib/db/sqlitemigration.php
index adfc03a2ca7..e3d0e386ab5 100644
--- a/tests/lib/db/sqlitemigration.php
+++ b/tests/lib/db/sqlitemigration.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class TestSqliteMigration extends \PHPUnit_Framework_TestCase {
+class TestSqliteMigration extends \Test\TestCase {
 
 	/** @var \Doctrine\DBAL\Connection */
 	private $connection;
@@ -14,7 +14,9 @@ class TestSqliteMigration extends \PHPUnit_Framework_TestCase {
 	/** @var string */
 	private $tableName;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->connection = \OC_DB::getConnection();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
 			$this->markTestSkipped("Test only relevant on Sqlite");
@@ -25,8 +27,9 @@ class TestSqliteMigration extends \PHPUnit_Framework_TestCase {
 		$this->connection->exec("CREATE TABLE $this->tableName(t0 tinyint unsigned, t1 tinyint)");
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->connection->getSchemaManager()->dropTable($this->tableName);
+		parent::tearDown();
 	}
 
 	public function testNonOCTables() {
diff --git a/tests/lib/group/group.php b/tests/lib/group/group.php
index 4d15999a826..d758e5959d0 100644
--- a/tests/lib/group/group.php
+++ b/tests/lib/group/group.php
@@ -11,7 +11,7 @@ namespace Test\Group;
 
 use OC\User\User;
 
-class Group extends \PHPUnit_Framework_TestCase {
+class Group extends \Test\TestCase {
 	/**
 	 * @return \OC\User\Manager | \OC\User\Manager
 	 */
diff --git a/tests/lib/group/manager.php b/tests/lib/group/manager.php
index 8fd19513c0a..f72ea8e912f 100644
--- a/tests/lib/group/manager.php
+++ b/tests/lib/group/manager.php
@@ -11,7 +11,7 @@ namespace Test\Group;
 
 use OC\User\User;
 
-class Manager extends \PHPUnit_Framework_TestCase {
+class Manager extends \Test\TestCase {
 	public function testGet() {
 		/**
 		 * @var \PHPUnit_Framework_MockObject_MockObject | \OC_Group_Backend $backend
diff --git a/tests/lib/group/metadata.php b/tests/lib/group/metadata.php
index 7ef2d6b35ff..94944189cad 100644
--- a/tests/lib/group/metadata.php
+++ b/tests/lib/group/metadata.php
@@ -9,7 +9,7 @@
 
 namespace Test\Group;
 
-class Test_MetaData extends \PHPUnit_Framework_TestCase {
+class Test_MetaData extends \Test\TestCase {
 	private function getGroupManagerMock() {
 		return $this->getMockBuilder('\OC\Group\Manager')
 			->disableOriginalConstructor()
diff --git a/tests/lib/hooks/basicemitter.php b/tests/lib/hooks/basicemitter.php
index 0eae730d030..899d3ecd3b3 100644
--- a/tests/lib/hooks/basicemitter.php
+++ b/tests/lib/hooks/basicemitter.php
@@ -31,13 +31,14 @@ class DummyEmitter extends \OC\Hooks\BasicEmitter {
 class EmittedException extends \Exception {
 }
 
-class BasicEmitter extends \PHPUnit_Framework_TestCase {
+class BasicEmitter extends \Test\TestCase {
 	/**
 	 * @var \OC\Hooks\Emitter $emitter
 	 */
 	protected $emitter;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->emitter = new DummyEmitter();
 	}
 
diff --git a/tests/lib/hooks/legacyemitter.php b/tests/lib/hooks/legacyemitter.php
index a7bed879a72..f030afbc090 100644
--- a/tests/lib/hooks/legacyemitter.php
+++ b/tests/lib/hooks/legacyemitter.php
@@ -26,7 +26,9 @@ class LegacyEmitter extends BasicEmitter {
 	//we can't use exceptions here since OC_Hooks catches all exceptions
 	private static $emitted = false;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->emitter = new DummyLegacyEmitter();
 		self::$emitted = false;
 		\OC_Hook::clear('Test','test');
diff --git a/tests/lib/memcache/apc.php b/tests/lib/memcache/apc.php
index e5d753a4fa5..550d5068dc1 100644
--- a/tests/lib/memcache/apc.php
+++ b/tests/lib/memcache/apc.php
@@ -10,7 +10,9 @@
 namespace Test\Memcache;
 
 class APC extends Cache {
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		if(!\OC\Memcache\APC::isAvailable()) {
 			$this->markTestSkipped('The apc extension is not available.');
 			return;
diff --git a/tests/lib/memcache/apcu.php b/tests/lib/memcache/apcu.php
index 7b99e7cd5e0..1b849e1c54d 100644
--- a/tests/lib/memcache/apcu.php
+++ b/tests/lib/memcache/apcu.php
@@ -10,7 +10,9 @@
 namespace Test\Memcache;
 
 class APCu extends Cache {
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		if(!\OC\Memcache\APCu::isAvailable()) {
 			$this->markTestSkipped('The APCu extension is not available.');
 			return;
diff --git a/tests/lib/memcache/cache.php b/tests/lib/memcache/cache.php
index d07c492cef0..8a4a708e4b7 100644
--- a/tests/lib/memcache/cache.php
+++ b/tests/lib/memcache/cache.php
@@ -50,9 +50,11 @@ abstract class Cache extends \Test_Cache {
 		$this->assertFalse($this->instance->hasKey('foo'));
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		if ($this->instance) {
 			$this->instance->clear();
 		}
+
+		parent::tearDown();
 	}
 }
diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php
index fdab32693ff..a94b809a7b5 100644
--- a/tests/lib/memcache/memcached.php
+++ b/tests/lib/memcache/memcached.php
@@ -11,6 +11,8 @@ namespace Test\Memcache;
 
 class Memcached extends Cache {
 	static public function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
 		if (!\OC\Memcache\Memcached::isAvailable()) {
 			self::markTestSkipped('The memcached extension is not available.');
 		}
@@ -20,7 +22,8 @@ class Memcached extends Cache {
 		}
 	}
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->instance = new \OC\Memcache\Memcached(uniqid());
 	}
 }
diff --git a/tests/lib/memcache/xcache.php b/tests/lib/memcache/xcache.php
index f59afda3966..b97d5545c6e 100644
--- a/tests/lib/memcache/xcache.php
+++ b/tests/lib/memcache/xcache.php
@@ -10,7 +10,9 @@
 namespace Test\Memcache;
 
 class XCache extends Cache {
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		if (!\OC\Memcache\XCache::isAvailable()) {
 			$this->markTestSkipped('The xcache extension is not available.');
 			return;
diff --git a/tests/lib/ocs/privatedata.php b/tests/lib/ocs/privatedata.php
index 534fc21b07a..20f1dd38362 100644
--- a/tests/lib/ocs/privatedata.php
+++ b/tests/lib/ocs/privatedata.php
@@ -20,19 +20,15 @@
  *
  */
 
-class Test_OC_OCS_Privatedata extends PHPUnit_Framework_TestCase
-{
-
+class Test_OC_OCS_Privatedata extends \Test\TestCase {
 	private $appKey;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		\OC::$server->getSession()->set('user_id', 'user1');
 		$this->appKey = uniqid('app');
 	}
 
-	public function tearDown() {
-	}
-
 	public function testGetEmptyOne() {
 		$params = array('app' => $this->appKey, 'key' => '123');
 		$result = OC_OCS_Privatedata::get($params);
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index d6008876a00..151e98d3905 100644
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -19,17 +19,12 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class Test_Contacts extends PHPUnit_Framework_TestCase
-{
-
-	public function setUp() {
-
+class Test_Contacts extends \Test\TestCase {
+	protected function setUp() {
+		parent::setUp();
 		OCP\Contacts::clear();
 	}
 
-	public function tearDown() {
-	}
-
 	public function testDisabledIfEmpty() {
 		// pretty simple
 		$this->assertFalse(OCP\Contacts::isEnabled());
diff --git a/tests/lib/public/ocpconfig.php b/tests/lib/public/ocpconfig.php
index 43a9ca625ee..947d2b3c9ef 100644
--- a/tests/lib/public/ocpconfig.php
+++ b/tests/lib/public/ocpconfig.php
@@ -19,12 +19,11 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-class Test_OCPConfig extends PHPUnit_Framework_TestCase
-{
+class Test_OCPConfig extends \Test\TestCase {
 
 	public function testSetAppValueIfSetToNull() {
 
-		$key = uniqid("key-");
+		$key = $this->getUniqueID('key-');
 
 		$result = \OCP\Config::setAppValue('unit-test', $key, null);
 		$this->assertTrue($result);
diff --git a/tests/lib/repair/repaircollation.php b/tests/lib/repair/repaircollation.php
index 362feb8463f..e711fcd9d83 100644
--- a/tests/lib/repair/repaircollation.php
+++ b/tests/lib/repair/repaircollation.php
@@ -21,7 +21,7 @@ class TestCollationRepair extends \OC\Repair\Collation {
  *
  * @see \OC\Repair\RepairMimeTypes
  */
-class TestRepairCollation extends PHPUnit_Framework_TestCase {
+class TestRepairCollation extends \Test\TestCase {
 
 	/**
 	 * @var TestCollationRepair
@@ -43,7 +43,9 @@ class TestRepairCollation extends PHPUnit_Framework_TestCase {
 	 */
 	private $config;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->connection = \OC_DB::getConnection();
 		$this->config = \OC::$server->getConfig();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
@@ -57,8 +59,9 @@ class TestRepairCollation extends PHPUnit_Framework_TestCase {
 		$this->repair = new TestCollationRepair($this->config, $this->connection);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->connection->getSchemaManager()->dropTable($this->tableName);
+		parent::tearDown();
 	}
 
 	public function testCollationConvert() {
diff --git a/tests/lib/repair/repairinnodb.php b/tests/lib/repair/repairinnodb.php
index e7d2442f127..21d7d978821 100644
--- a/tests/lib/repair/repairinnodb.php
+++ b/tests/lib/repair/repairinnodb.php
@@ -11,7 +11,7 @@
  *
  * @see \OC\Repair\RepairMimeTypes
  */
-class TestRepairInnoDB extends PHPUnit_Framework_TestCase {
+class TestRepairInnoDB extends \Test\TestCase {
 
 	/** @var \OC\RepairStep */
 	private $repair;
@@ -22,7 +22,9 @@ class TestRepairInnoDB extends PHPUnit_Framework_TestCase {
 	/** @var string */
 	private $tableName;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->connection = \OC_DB::getConnection();
 		if (!$this->connection->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) {
 			$this->markTestSkipped("Test only relevant on MySql");
@@ -35,8 +37,9 @@ class TestRepairInnoDB extends PHPUnit_Framework_TestCase {
 		$this->repair = new \OC\Repair\InnoDB();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->connection->getSchemaManager()->dropTable($this->tableName);
+		parent::tearDown();
 	}
 
 	public function testInnoDBConvert() {
diff --git a/tests/lib/repair/repairlegacystorage.php b/tests/lib/repair/repairlegacystorage.php
index 4528c5288df..ac845657cd9 100644
--- a/tests/lib/repair/repairlegacystorage.php
+++ b/tests/lib/repair/repairlegacystorage.php
@@ -11,7 +11,7 @@
  *
  * @see \OC\Repair\RepairLegacyStorages
  */
-class TestRepairLegacyStorages extends PHPUnit_Framework_TestCase {
+class TestRepairLegacyStorages extends \Test\TestCase {
 
 	private $user;
 	private $repair;
@@ -22,7 +22,9 @@ class TestRepairLegacyStorages extends PHPUnit_Framework_TestCase {
 	private $legacyStorageId;
 	private $newStorageId;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->config = \OC::$server->getConfig();
 		$this->connection = \OC_DB::getConnection();
 		$this->oldDataDir = $this->config->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data/');
@@ -30,7 +32,7 @@ class TestRepairLegacyStorages extends PHPUnit_Framework_TestCase {
 		$this->repair = new \OC\Repair\RepairLegacyStorages($this->config, $this->connection);
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		\OC_User::deleteUser($this->user);
 
 		$sql = 'DELETE FROM `*PREFIX*storages`';
@@ -39,6 +41,8 @@ class TestRepairLegacyStorages extends PHPUnit_Framework_TestCase {
 		$this->connection->executeQuery($sql);
 		\OCP\Config::setSystemValue('datadirectory', $this->oldDataDir);
 		$this->config->setAppValue('core', 'repairlegacystoragesdone', 'no');
+
+		parent::tearDown();
 	}
 
 	function prepareSettings($dataDir, $userId) {
diff --git a/tests/lib/repair/repairmimetypes.php b/tests/lib/repair/repairmimetypes.php
index 7754864a69e..6eaf68d8a44 100644
--- a/tests/lib/repair/repairmimetypes.php
+++ b/tests/lib/repair/repairmimetypes.php
@@ -11,26 +11,29 @@
  *
  * @see \OC\Repair\RepairMimeTypes
  */
-class TestRepairMimeTypes extends PHPUnit_Framework_TestCase {
+class TestRepairMimeTypes extends \Test\TestCase {
 
 	/** @var \OC\RepairStep */
 	private $repair;
 
 	private $storage;
 
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->storage = new \OC\Files\Storage\Temporary(array());
 
 		$this->repair = new \OC\Repair\RepairMimeTypes();
 	}
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->storage->getCache()->clear();
 		$sql = 'DELETE FROM `*PREFIX*storages` WHERE `id` = ?';
 		\OC_DB::executeAudited($sql, array($this->storage->getId()));
 		$this->clearMimeTypes();
 
 		DummyFileCache::clearCachedMimeTypes();
+
+		parent::tearDown();
 	}
 
 	private function clearMimeTypes() {
diff --git a/tests/lib/security/certificate.php b/tests/lib/security/certificate.php
index 898f583a43c..361f2f8c38d 100644
--- a/tests/lib/security/certificate.php
+++ b/tests/lib/security/certificate.php
@@ -8,7 +8,7 @@
 
 use \OC\Security\Certificate;
 
-class CertificateTest extends \PHPUnit_Framework_TestCase {
+class CertificateTest extends \Test\TestCase {
 
 	/** @var Certificate That contains a valid certificate */
 	protected $goodCertificate;
@@ -17,7 +17,9 @@ class CertificateTest extends \PHPUnit_Framework_TestCase {
 	/** @var Certificate That contains an expired certificate */
 	protected $expiredCertificate;
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$goodCertificate = file_get_contents(__DIR__ . '/../../data/certificates/goodCertificate.crt');
 		$this->goodCertificate = new Certificate($goodCertificate, 'GoodCertificate');
 		$badCertificate = file_get_contents(__DIR__ . '/../../data/certificates/badCertificate.crt');
diff --git a/tests/lib/security/certificatemanager.php b/tests/lib/security/certificatemanager.php
index 01b3afb03ee..cff6932b670 100644
--- a/tests/lib/security/certificatemanager.php
+++ b/tests/lib/security/certificatemanager.php
@@ -17,7 +17,9 @@ class CertificateManagerTest extends \Test\TestCase {
 	/** @var  \OC\User\User */
 	private $user;
 
-	function setUp() {
+	protected function setUp() {
+		parent::setUp();
+
 		$this->username = $this->getUniqueID('', 20);
 		OC_User::createUser($this->username, $this->getUniqueID('', 20));
 
@@ -31,8 +33,9 @@ class CertificateManagerTest extends \Test\TestCase {
 		$this->certificateManager = new CertificateManager($this->user);
 	}
 
-	function tearDown() {
+	protected function tearDown() {
 		\OC_User::deleteUser($this->username);
+		parent::tearDown();
 	}
 
 	protected function assertEqualsArrays($expected, $actual) {
diff --git a/tests/lib/security/crypto.php b/tests/lib/security/crypto.php
index 0f89253839e..1571cf89248 100644
--- a/tests/lib/security/crypto.php
+++ b/tests/lib/security/crypto.php
@@ -8,7 +8,7 @@
 
 use \OC\Security\Crypto;
 
-class CryptoTest extends \PHPUnit_Framework_TestCase {
+class CryptoTest extends \Test\TestCase {
 
 	public function defaultEncryptionProvider()
 	{
@@ -23,6 +23,7 @@ class CryptoTest extends \PHPUnit_Framework_TestCase {
 	protected $crypto;
 
 	protected function setUp() {
+		parent::setUp();
 		$this->crypto = new Crypto(\OC::$server->getConfig(), \OC::$server->getSecureRandom());
 	}
 
diff --git a/tests/lib/security/securerandom.php b/tests/lib/security/securerandom.php
index 2920077fa1d..d9bbd0e71e5 100644
--- a/tests/lib/security/securerandom.php
+++ b/tests/lib/security/securerandom.php
@@ -8,7 +8,7 @@
 
 use \OC\Security\SecureRandom;
 
-class SecureRandomTest extends \PHPUnit_Framework_TestCase {
+class SecureRandomTest extends \Test\TestCase {
 
 	public function stringGenerationProvider() {
 		return array(
@@ -34,6 +34,7 @@ class SecureRandomTest extends \PHPUnit_Framework_TestCase {
 	protected $rng;
 
 	protected function setUp() {
+		parent::setUp();
 		$this->rng = new \OC\Security\SecureRandom();
 	}
 
diff --git a/tests/lib/security/stringutils.php b/tests/lib/security/stringutils.php
index 039f3d3756a..060315debb4 100644
--- a/tests/lib/security/stringutils.php
+++ b/tests/lib/security/stringutils.php
@@ -8,7 +8,7 @@
 
 use \OC\Security\StringUtils;
 
-class StringUtilsTest extends \PHPUnit_Framework_TestCase {
+class StringUtilsTest extends \Test\TestCase {
 
 	public function dataProvider()
 	{
diff --git a/tests/lib/session/memory.php b/tests/lib/session/memory.php
index 2dc236b73bf..84dee548a1e 100644
--- a/tests/lib/session/memory.php
+++ b/tests/lib/session/memory.php
@@ -10,7 +10,8 @@
 namespace Test\Session;
 
 class Memory extends Session {
-	public function setUp() {
+	protected function setUp() {
+		parent::setUp();
 		$this->instance = new \OC\Session\Memory(uniqid());
 	}
 }
diff --git a/tests/lib/session/session.php b/tests/lib/session/session.php
index 9ce11274c84..a1ed01b2ec8 100644
--- a/tests/lib/session/session.php
+++ b/tests/lib/session/session.php
@@ -9,14 +9,15 @@
 
 namespace Test\Session;
 
-abstract class Session extends \PHPUnit_Framework_TestCase {
+abstract class Session extends \Test\TestCase {
 	/**
 	 * @var \OC\Session\Session
 	 */
 	protected $instance;
 
-	public function tearDown() {
+	protected function tearDown() {
 		$this->instance->clear();
+		parent::tearDown();
 	}
 
 	public function testNotExistsEmpty() {
diff --git a/tests/lib/share/helper.php b/tests/lib/share/helper.php
index 367507417a0..76046d360bc 100644
--- a/tests/lib/share/helper.php
+++ b/tests/lib/share/helper.php
@@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class Test_Share_Helper extends PHPUnit_Framework_TestCase {
+class Test_Share_Helper extends \Test\TestCase {
 
 	public function expireDateProvider() {
 		return array(
diff --git a/tests/lib/share/searchresultsorter.php b/tests/lib/share/searchresultsorter.php
index eaf93400a7d..97ef0f9478a 100644
--- a/tests/lib/share/searchresultsorter.php
+++ b/tests/lib/share/searchresultsorter.php
@@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class Test_Share_Search extends \PHPUnit_Framework_TestCase {
+class Test_Share_Search extends \Test\TestCase {
 	public function testSort() {
 		$search = 'lin';
 		$sorter = new \OC\Share\SearchResultSorter($search, 'foobar');
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 7644dadadc7..7ae458a797d 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class Test_Share extends Test\TestCase {
+class Test_Share extends \Test\TestCase {
 
 	protected $itemType;
 	protected $userBackend;
@@ -37,6 +37,7 @@ class Test_Share extends Test\TestCase {
 
 	protected function setUp() {
 		parent::setUp();
+
 		OC_User::clearBackends();
 		OC_User::useBackend('dummy');
 		$this->user1 = $this->getUniqueID('user1_');
@@ -81,6 +82,7 @@ class Test_Share extends Test\TestCase {
 		$query = OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?');
 		$query->execute(array('test'));
 		OC_Appconfig::setValue('core', 'shareapi_allow_resharing', $this->resharing);
+
 		parent::tearDown();
 	}
 
diff --git a/tests/lib/template/resourcelocator.php b/tests/lib/template/resourcelocator.php
index cd354df0036..f350fd144e1 100644
--- a/tests/lib/template/resourcelocator.php
+++ b/tests/lib/template/resourcelocator.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-class Test_ResourceLocator extends PHPUnit_Framework_TestCase {
+class Test_ResourceLocator extends \Test\TestCase {
 
 	/**
 	 * @param string $theme
diff --git a/tests/lib/user/manager.php b/tests/lib/user/manager.php
index 15b28e61bd5..c825ec05775 100644
--- a/tests/lib/user/manager.php
+++ b/tests/lib/user/manager.php
@@ -9,7 +9,7 @@
 
 namespace Test\User;
 
-class Manager extends \PHPUnit_Framework_TestCase {
+class Manager extends \Test\TestCase {
 	public function testUserExistsSingleBackendExists() {
 		/**
 		 * @var \OC_User_Dummy | \PHPUnit_Framework_MockObject_MockObject $backend
diff --git a/tests/lib/user/session.php b/tests/lib/user/session.php
index 5126049d77f..8d9d024197c 100644
--- a/tests/lib/user/session.php
+++ b/tests/lib/user/session.php
@@ -12,7 +12,7 @@ namespace Test\User;
 use OC\Session\Memory;
 use OC\User\User;
 
-class Session extends \PHPUnit_Framework_TestCase {
+class Session extends \Test\TestCase {
 	public function testGetUser() {
 		$session = $this->getMock('\OC\Session\Memory', array(), array(''));
 		$session->expects($this->once())
diff --git a/tests/lib/user/user.php b/tests/lib/user/user.php
index 7a1db861c98..6aa7243a75a 100644
--- a/tests/lib/user/user.php
+++ b/tests/lib/user/user.php
@@ -12,7 +12,7 @@ namespace Test\User;
 use OC\AllConfig;
 use OC\Hooks\PublicEmitter;
 
-class User extends \PHPUnit_Framework_TestCase {
+class User extends \Test\TestCase {
 	public function testDisplayName() {
 		/**
 		 * @var \OC_User_Backend | \PHPUnit_Framework_MockObject_MockObject $backend
-- 
GitLab


From ffe57d89e425771a5c027a3484d772319919d15d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 19 Nov 2014 17:02:17 +0100
Subject: [PATCH 474/616] Fix l10n promises

---
 core/js/l10n.js                 | 9 +++++----
 core/js/tests/specs/l10nSpec.js | 8 ++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core/js/l10n.js b/core/js/l10n.js
index 3e37da01369..0c660584322 100644
--- a/core/js/l10n.js
+++ b/core/js/l10n.js
@@ -37,10 +37,11 @@ OC.L10N = {
 	load: function(appName, callback) {
 		// already available ?
 		if (this._bundles[appName] || OC.getLocale() === 'en') {
-			if (callback) {
-				callback();
-			}
-			return;
+			var deferred = $.Deferred();
+			var promise = deferred.promise();
+			promise.then(callback);
+			deferred.resolve();
+			return promise;
 		}
 
 		var self = this;
diff --git a/core/js/tests/specs/l10nSpec.js b/core/js/tests/specs/l10nSpec.js
index dc021a0baaf..cf7c8b11b1c 100644
--- a/core/js/tests/specs/l10nSpec.js
+++ b/core/js/tests/specs/l10nSpec.js
@@ -130,19 +130,23 @@ describe('OC.L10N tests', function() {
 			localeStub.restore();
 		});
 		it('calls callback if translation already available', function() {
+			var promiseStub = sinon.stub();
 			var callbackStub = sinon.stub();
 			OC.L10N.register(TEST_APP, {
 				'Hello world!': 'Hallo Welt!'
 			});
-			OC.L10N.load(TEST_APP, callbackStub);
+			OC.L10N.load(TEST_APP, callbackStub).then(promiseStub);
 			expect(callbackStub.calledOnce).toEqual(true);
+			expect(promiseStub.calledOnce).toEqual(true);
 			expect(fakeServer.requests.length).toEqual(0);
 		});
 		it('calls callback if locale is en', function() {
 			var localeStub = sinon.stub(OC, 'getLocale').returns('en');
+			var promiseStub = sinon.stub();
 			var callbackStub = sinon.stub();
-			OC.L10N.load(TEST_APP, callbackStub);
+			OC.L10N.load(TEST_APP, callbackStub).then(promiseStub);
 			expect(callbackStub.calledOnce).toEqual(true);
+			expect(promiseStub.calledOnce).toEqual(true);
 			expect(fakeServer.requests.length).toEqual(0);
 		});
 	});
-- 
GitLab


From e32968cfcea295f21336c1cda0bbe8d7a107b1eb Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 19 Nov 2014 17:04:55 +0100
Subject: [PATCH 475/616] Remove exec() call with invalid name on windows

Currently running unit tests prints the following message 3 times:
The command "command" is misspelt or could not be found.
Instead of trying this, we just skip this now.
---
 settings/admin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/admin.php b/settings/admin.php
index d1ed6e75f50..2b964613096 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -123,7 +123,7 @@ $template->printPage();
  * @return null|string
  */
 function findBinaryPath($program) {
-	if (OC_Helper::is_function_enabled('exec')) {
+	if (!\OC_Util::runningOnWindows() && \OC_Helper::is_function_enabled('exec')) {
 		exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
 		if ($returnCode === 0 && count($output) > 0) {
 			return escapeshellcmd($output[0]);
-- 
GitLab


From 68a93768585eb9b1f8dfe5d1d064d61809b603d6 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <oparoz@users.noreply.github.com>
Date: Wed, 19 Nov 2014 17:34:03 +0100
Subject: [PATCH 476/616] Use a more universal shebang

On FreeBSD, php is usually in /usr/local and I'm sure there are many more exceptions.
---
 occ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/occ b/occ
index e2b71fe4abc..7e47585b01e 100755
--- a/occ
+++ b/occ
@@ -1,4 +1,4 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
 /**
  * Copyright (c) 2013 Thomas Müller <thomas.mueller@tmit.eu>
-- 
GitLab


From 98ec0451be1d1ddd76b53195c96a545239e24da1 Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 19 Nov 2014 17:42:57 +0100
Subject: [PATCH 477/616] Remove delete button in shared with others list

Whenever a file is shared with others or with link, a delete button used
to be visible that triggered a direct deletion.

This button has been removed to avoid accidental deletion from people
who might believe it was an unshare button. Unsharing is still possible
inside the share dropdown.
---
 apps/files_sharing/js/sharedfilelist.js       | 12 +++++++--
 .../tests/js/sharedfilelistSpec.js            | 26 ++++++++++++-------
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index 5869d7f77f7..7a7c24993c0 100644
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -103,7 +103,11 @@
 		},
 
 		getDirectoryPermissions: function() {
-			return OC.PERMISSION_READ | OC.PERMISSION_DELETE;
+			var perms = OC.PERMISSION_READ;
+			if (this._sharedWithUser) {
+				perms |= OC.PERMISSION_DELETE;
+			}
+			return perms;
 		},
 
 		updateStorageStatistics: function() {
@@ -203,7 +207,11 @@
 						}
 						file.name = OC.basename(share.path);
 						file.path = OC.dirname(share.path);
-						file.permissions = OC.PERMISSION_ALL;
+						if (this._sharedWithUser) {
+							file.permissions = OC.PERMISSION_ALL;
+						} else {
+							file.permissions = OC.PERMISSION_ALL - OC.PERMISSION_DELETE;
+						}
 						if (file.path) {
 							file.extraData = share.path;
 						}
diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index 812f30d75db..61302ae2c1d 100644
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -91,7 +91,7 @@ describe('OCA.Sharing.FileList tests', function() {
 						file_source: 49,
 						file_target: '/local path/local name.txt',
 						path: 'files/something shared.txt',
-						permissions: 31,
+						permissions: OC.PERMISSION_ALL,
 						stime: 11111,
 						share_type: OC.Share.SHARE_TYPE_USER,
 						share_with: 'user1',
@@ -127,7 +127,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.attr('data-file')).toEqual('local name.txt');
 			expect($tr.attr('data-path')).toEqual('/local path');
 			expect($tr.attr('data-size')).not.toBeDefined();
-			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			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('11111000');
 			expect($tr.attr('data-share-owner')).toEqual('User Two');
@@ -169,7 +170,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.attr('data-file')).toEqual('local name');
 			expect($tr.attr('data-path')).toEqual('/local path');
 			expect($tr.attr('data-size')).not.toBeDefined();
-			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			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('11111000');
 			expect($tr.attr('data-share-owner')).toEqual('User Two');
@@ -244,7 +246,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.attr('data-file')).toEqual('local name.txt');
 			expect($tr.attr('data-path')).toEqual('/local path');
 			expect($tr.attr('data-size')).not.toBeDefined();
-			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect(parseInt($tr.attr('data-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read
 			expect($tr.attr('data-mime')).toEqual('text/plain');
 			expect($tr.attr('data-mtime')).toEqual('11111000');
 			expect($tr.attr('data-share-owner')).not.toBeDefined();
@@ -285,7 +288,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.attr('data-file')).toEqual('local name');
 			expect($tr.attr('data-path')).toEqual('/local path');
 			expect($tr.attr('data-size')).not.toBeDefined();
-			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect(parseInt($tr.attr('data-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read
 			expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
 			expect($tr.attr('data-mtime')).toEqual('11111000');
 			expect($tr.attr('data-share-owner')).not.toBeDefined();
@@ -336,7 +340,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.attr('data-file')).toEqual('local name.txt');
 			expect($tr.attr('data-path')).toEqual('/local path');
 			expect($tr.attr('data-size')).not.toBeDefined();
-			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect(parseInt($tr.attr('data-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read
 			expect($tr.attr('data-mime')).toEqual('text/plain');
 			expect($tr.attr('data-mtime')).toEqual('11111000');
 			expect($tr.attr('data-share-owner')).not.toBeDefined();
@@ -404,7 +409,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.attr('data-file')).toEqual('local name.txt');
 			expect($tr.attr('data-path')).toEqual('/local path');
 			expect($tr.attr('data-size')).not.toBeDefined();
-			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect(parseInt($tr.attr('data-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read
 			expect($tr.attr('data-mime')).toEqual('text/plain');
 			// always use the most recent stime
 			expect($tr.attr('data-mtime')).toEqual('22222000');
@@ -496,7 +502,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.attr('data-file')).toEqual('local name.txt');
 			expect($tr.attr('data-path')).toEqual('/local path');
 			expect($tr.attr('data-size')).not.toBeDefined();
-			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect(parseInt($tr.attr('data-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read
 			expect($tr.attr('data-mime')).toEqual('text/plain');
 			expect($tr.attr('data-mtime')).toEqual('11111000');
 			expect($tr.attr('data-share-recipients')).not.toBeDefined();
@@ -537,7 +544,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			expect($tr.attr('data-file')).toEqual('local name.txt');
 			expect($tr.attr('data-path')).toEqual('/local path');
 			expect($tr.attr('data-size')).not.toBeDefined();
-			expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
+			expect(parseInt($tr.attr('data-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL - OC.PERMISSION_DELETE); // read
 			expect($tr.attr('data-mime')).toEqual('text/plain');
 			expect($tr.attr('data-mtime')).toEqual('11111000');
 			expect($tr.attr('data-share-recipients')).not.toBeDefined();
-- 
GitLab


From 63fa8ec69abd9d0ae4435728023257f2685acb5d Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 19 Nov 2014 17:44:05 +0100
Subject: [PATCH 478/616] JSHint fixes in sharedfilelistSpec unit test file

---
 apps/files_sharing/tests/js/sharedfilelistSpec.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index 61302ae2c1d..dc6931af6e8 100644
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -436,6 +436,7 @@ describe('OCA.Sharing.FileList tests', function() {
 
 			fileList.reload();
 
+			/* jshint camelcase: false */
 			ocsResponse = {
 				ocs: {
 					meta: {
@@ -641,7 +642,8 @@ describe('OCA.Sharing.FileList tests', function() {
 			}]);
 			$tr = fileList.$el.find('tr:first');
 
-			expect(parseInt($tr.attr('data-share-permissions'), 10)).toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE - OC.PERMISSION_DELETE);
+			expect(parseInt($tr.attr('data-share-permissions'), 10))
+				.toEqual(OC.PERMISSION_ALL - OC.PERMISSION_SHARE - OC.PERMISSION_DELETE);
 		});
 	});
 });
-- 
GitLab


From fffc5bc002133d6b3ee9c2dbe50a5044db83ede0 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 20 Nov 2014 01:55:06 -0500
Subject: [PATCH 479/616] [tx-robot] updated from transifex

---
 core/l10n/af_ZA.js       |  6 ++---
 core/l10n/af_ZA.json     |  6 ++---
 core/l10n/ar.js          |  6 ++---
 core/l10n/ar.json        |  6 ++---
 core/l10n/ast.js         |  8 ++-----
 core/l10n/ast.json       |  8 ++-----
 core/l10n/az.js          |  3 +--
 core/l10n/az.json        |  3 +--
 core/l10n/bg_BG.js       |  8 ++-----
 core/l10n/bg_BG.json     |  8 ++-----
 core/l10n/bn_BD.js       |  6 ++---
 core/l10n/bn_BD.json     |  6 ++---
 core/l10n/bn_IN.js       |  3 +--
 core/l10n/bn_IN.json     |  3 +--
 core/l10n/ca.js          |  8 ++-----
 core/l10n/ca.json        |  8 ++-----
 core/l10n/cs_CZ.js       |  8 ++-----
 core/l10n/cs_CZ.json     |  8 ++-----
 core/l10n/cy_GB.js       |  5 ++--
 core/l10n/cy_GB.json     |  5 ++--
 core/l10n/da.js          |  8 ++-----
 core/l10n/da.json        |  8 ++-----
 core/l10n/de.js          |  8 ++-----
 core/l10n/de.json        |  8 ++-----
 core/l10n/de_DE.js       |  8 ++-----
 core/l10n/de_DE.json     |  8 ++-----
 core/l10n/el.js          |  8 ++-----
 core/l10n/el.json        |  8 ++-----
 core/l10n/en_GB.js       |  8 ++-----
 core/l10n/en_GB.json     |  8 ++-----
 core/l10n/eo.js          |  6 ++---
 core/l10n/eo.json        |  6 ++---
 core/l10n/es.js          |  8 ++-----
 core/l10n/es.json        |  8 ++-----
 core/l10n/es_AR.js       |  8 ++-----
 core/l10n/es_AR.json     |  8 ++-----
 core/l10n/es_CL.js       |  2 +-
 core/l10n/es_CL.json     |  2 +-
 core/l10n/es_MX.js       |  8 ++-----
 core/l10n/es_MX.json     |  8 ++-----
 core/l10n/et_EE.js       |  8 ++-----
 core/l10n/et_EE.json     |  8 ++-----
 core/l10n/eu.js          |  8 ++-----
 core/l10n/eu.json        |  8 ++-----
 core/l10n/fa.js          |  8 ++-----
 core/l10n/fa.json        |  8 ++-----
 core/l10n/fi_FI.js       |  8 ++-----
 core/l10n/fi_FI.json     |  8 ++-----
 core/l10n/fr.js          |  8 ++-----
 core/l10n/fr.json        |  8 ++-----
 core/l10n/gl.js          |  8 ++-----
 core/l10n/gl.json        |  8 ++-----
 core/l10n/he.js          |  6 ++---
 core/l10n/he.json        |  6 ++---
 core/l10n/hi.js          |  3 +--
 core/l10n/hi.json        |  3 +--
 core/l10n/hr.js          |  8 ++-----
 core/l10n/hr.json        |  8 ++-----
 core/l10n/hu_HU.js       |  8 ++-----
 core/l10n/hu_HU.json     |  8 ++-----
 core/l10n/ia.js          |  7 ++----
 core/l10n/ia.json        |  7 ++----
 core/l10n/id.js          |  8 ++-----
 core/l10n/id.json        |  8 ++-----
 core/l10n/is.js          |  5 ++--
 core/l10n/is.json        |  5 ++--
 core/l10n/it.js          |  8 ++-----
 core/l10n/it.json        |  8 ++-----
 core/l10n/ja.js          |  8 ++-----
 core/l10n/ja.json        |  8 ++-----
 core/l10n/ka_GE.js       |  5 ++--
 core/l10n/ka_GE.json     |  5 ++--
 core/l10n/km.js          |  4 ++--
 core/l10n/km.json        |  4 ++--
 core/l10n/ko.js          |  8 ++-----
 core/l10n/ko.json        |  8 ++-----
 core/l10n/ku_IQ.js       |  4 ++--
 core/l10n/ku_IQ.json     |  4 ++--
 core/l10n/lb.js          |  8 ++-----
 core/l10n/lb.json        |  8 ++-----
 core/l10n/lt_LT.js       |  8 ++-----
 core/l10n/lt_LT.json     |  8 ++-----
 core/l10n/lv.js          |  7 ++----
 core/l10n/lv.json        |  7 ++----
 core/l10n/mk.js          |  7 ++----
 core/l10n/mk.json        |  7 ++----
 core/l10n/ms_MY.js       |  5 ++--
 core/l10n/ms_MY.json     |  5 ++--
 core/l10n/my_MM.js       |  3 +--
 core/l10n/my_MM.json     |  3 +--
 core/l10n/nb_NO.js       |  8 ++-----
 core/l10n/nb_NO.json     |  8 ++-----
 core/l10n/nl.js          |  8 ++-----
 core/l10n/nl.json        |  8 ++-----
 core/l10n/nn_NO.js       |  7 ++----
 core/l10n/nn_NO.json     |  7 ++----
 core/l10n/oc.js          |  5 ++--
 core/l10n/oc.json        |  5 ++--
 core/l10n/pa.js          |  2 +-
 core/l10n/pa.json        |  2 +-
 core/l10n/pl.js          |  8 ++-----
 core/l10n/pl.json        |  8 ++-----
 core/l10n/pt_BR.js       |  8 ++-----
 core/l10n/pt_BR.json     |  8 ++-----
 core/l10n/pt_PT.js       | 40 +++++++++++++++-----------------
 core/l10n/pt_PT.json     | 40 +++++++++++++++-----------------
 core/l10n/ro.js          |  8 ++-----
 core/l10n/ro.json        |  8 ++-----
 core/l10n/ru.js          |  8 ++-----
 core/l10n/ru.json        |  8 ++-----
 core/l10n/si_LK.js       |  5 ++--
 core/l10n/si_LK.json     |  5 ++--
 core/l10n/sk_SK.js       |  8 ++-----
 core/l10n/sk_SK.json     |  8 ++-----
 core/l10n/sl.js          |  8 ++-----
 core/l10n/sl.json        |  8 ++-----
 core/l10n/sq.js          | 17 ++++++++++----
 core/l10n/sq.json        | 17 ++++++++++----
 core/l10n/sr.js          |  5 ++--
 core/l10n/sr.json        |  5 ++--
 core/l10n/sr@latin.js    |  5 ++--
 core/l10n/sr@latin.json  |  5 ++--
 core/l10n/sv.js          |  8 ++-----
 core/l10n/sv.json        |  8 ++-----
 core/l10n/ta_LK.js       |  5 ++--
 core/l10n/ta_LK.json     |  5 ++--
 core/l10n/te.js          |  2 +-
 core/l10n/te.json        |  2 +-
 core/l10n/th_TH.js       |  5 ++--
 core/l10n/th_TH.json     |  5 ++--
 core/l10n/tr.js          |  8 ++-----
 core/l10n/tr.json        |  8 ++-----
 core/l10n/ug.js          |  2 +-
 core/l10n/ug.json        |  2 +-
 core/l10n/uk.js          |  8 ++-----
 core/l10n/uk.json        |  8 ++-----
 core/l10n/ur_PK.js       |  7 ++----
 core/l10n/ur_PK.json     |  7 ++----
 core/l10n/vi.js          |  8 ++-----
 core/l10n/vi.json        |  8 ++-----
 core/l10n/zh_CN.js       |  8 ++-----
 core/l10n/zh_CN.json     |  8 ++-----
 core/l10n/zh_HK.js       |  6 ++---
 core/l10n/zh_HK.json     |  6 ++---
 core/l10n/zh_TW.js       |  8 ++-----
 core/l10n/zh_TW.json     |  8 ++-----
 lib/l10n/nl.js           |  2 +-
 lib/l10n/nl.json         |  2 +-
 lib/l10n/sq.js           |  2 ++
 lib/l10n/sq.json         |  2 ++
 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/en_GB.js   |  1 +
 settings/l10n/en_GB.json |  1 +
 settings/l10n/es.js      |  1 +
 settings/l10n/es.json    |  1 +
 settings/l10n/fi_FI.js   |  1 +
 settings/l10n/fi_FI.json |  1 +
 settings/l10n/fr.js      |  1 +
 settings/l10n/fr.json    |  1 +
 settings/l10n/nl.js      |  1 +
 settings/l10n/nl.json    |  1 +
 settings/l10n/pt_BR.js   |  1 +
 settings/l10n/pt_BR.json |  1 +
 settings/l10n/pt_PT.js   | 49 ++++++++++++++++++++--------------------
 settings/l10n/pt_PT.json | 49 ++++++++++++++++++++--------------------
 settings/l10n/tr.js      |  1 +
 settings/l10n/tr.json    |  1 +
 174 files changed, 406 insertions(+), 774 deletions(-)

diff --git a/core/l10n/af_ZA.js b/core/l10n/af_ZA.js
index bb9b876ae73..8250b9c9d7f 100644
--- a/core/l10n/af_ZA.js
+++ b/core/l10n/af_ZA.js
@@ -38,7 +38,6 @@ OC.L10N.register(
     "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",
-    "Reset password" : "Herstel wagwoord",
     "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
     "No" : "Nee",
     "Yes" : "Ja",
@@ -90,10 +89,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
     "%s password reset" : "%s wagwoord herstel",
     "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
-    "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
-    "Username" : "Gebruikersnaam",
-    "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel",
     "New password" : "Nuwe wagwoord",
+    "Reset password" : "Herstel wagwoord",
     "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
     "Personal" : "Persoonlik",
     "Users" : "Gebruikers",
@@ -107,6 +104,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
     "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wagwoord",
     "Data folder" : "Data omslag",
     "Configure the database" : "Stel databasis op",
diff --git a/core/l10n/af_ZA.json b/core/l10n/af_ZA.json
index 373d3dff8b4..f95495870e8 100644
--- a/core/l10n/af_ZA.json
+++ b/core/l10n/af_ZA.json
@@ -36,7 +36,6 @@
     "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",
-    "Reset password" : "Herstel wagwoord",
     "Password can not be changed. Please contact your administrator." : "Wagwoord kan nie verander word nie. Kontak asseblief jou stelsel administrateur.",
     "No" : "Nee",
     "Yes" : "Ja",
@@ -88,10 +87,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Die opdatering was suksesvol. Jy word nou aan ownCloud terug gelei.",
     "%s password reset" : "%s wagwoord herstel",
     "Use the following link to reset your password: {link}" : "Gebruik die volgende skakel om jou wagwoord te herstel: {link}",
-    "You will receive a link to reset your password via Email." : "Jy sal `n skakel via e-pos ontvang om jou wagwoord te herstel.",
-    "Username" : "Gebruikersnaam",
-    "Yes, I really want to reset my password now" : "Ja, Ek wil regtig my wagwoord herstel",
     "New password" : "Nuwe wagwoord",
+    "Reset password" : "Herstel wagwoord",
     "For the best results, please consider using a GNU/Linux server instead." : "Oorweeg die gebruik van 'n GNU/Linux bediener vir die beste resultate.",
     "Personal" : "Persoonlik",
     "Users" : "Gebruikers",
@@ -105,6 +102,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jou data gids en lêers is moontlik toeganklik vanaf die internet omdat die .htaccess lêer nie werk nie.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vir inligting oor hoe om jou bediener behoorlik op te stel, sien asseblief die<a href=\"%s\" target=\"_blank\">dokumentasie</a>.",
     "Create an <strong>admin account</strong>" : "Skep `n <strong>admin-rekening</strong>",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wagwoord",
     "Data folder" : "Data omslag",
     "Configure the database" : "Stel databasis op",
diff --git a/core/l10n/ar.js b/core/l10n/ar.js
index 2d7bcda9398..c48414bfdfe 100644
--- a/core/l10n/ar.js
+++ b/core/l10n/ar.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "December" : "كانون الاول",
     "Settings" : "إعدادات",
     "Saving..." : "جاري الحفظ...",
-    "Reset password" : "تعديل كلمة السر",
     "No" : "لا",
     "Yes" : "نعم",
     "Choose" : "اختيار",
@@ -76,10 +75,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
     "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
     "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
-    "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-    "Username" : "إسم المستخدم",
-    "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري",
     "New password" : "كلمات سر جديدة",
+    "Reset password" : "تعديل كلمة السر",
     "Personal" : "شخصي",
     "Users" : "المستخدمين",
     "Apps" : "التطبيقات",
@@ -92,6 +89,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
     "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
+    "Username" : "إسم المستخدم",
     "Password" : "كلمة المرور",
     "Data folder" : "مجلد المعلومات",
     "Configure the database" : "أسس قاعدة البيانات",
diff --git a/core/l10n/ar.json b/core/l10n/ar.json
index fd5c1275e41..439a60aec2a 100644
--- a/core/l10n/ar.json
+++ b/core/l10n/ar.json
@@ -23,7 +23,6 @@
     "December" : "كانون الاول",
     "Settings" : "إعدادات",
     "Saving..." : "جاري الحفظ...",
-    "Reset password" : "تعديل كلمة السر",
     "No" : "لا",
     "Yes" : "نعم",
     "Choose" : "اختيار",
@@ -74,10 +73,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "تم التحديث بنجاح , يتم اعادة توجيهك الان الى Owncloud",
     "%s password reset" : "تمت إعادة ضبط كلمة مرور %s",
     "Use the following link to reset your password: {link}" : "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}",
-    "You will receive a link to reset your password via Email." : "سوف نرسل لك بريد يحتوي على وصلة لتجديد كلمة السر.",
-    "Username" : "إسم المستخدم",
-    "Yes, I really want to reset my password now" : "نعم، أريد إعادة ضبظ كلمة مروري",
     "New password" : "كلمات سر جديدة",
+    "Reset password" : "تعديل كلمة السر",
     "Personal" : "شخصي",
     "Users" : "المستخدمين",
     "Apps" : "التطبيقات",
@@ -90,6 +87,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "مجلدات البيانات والملفات الخاصة قد تكون قابلة للوصول اليها عن طريق شبكة الانترنت وذلك بسبب ان ملف .htaccess  لا يعمل بشكل صحيح.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "لمزيد من المعلومات عن كيفية إعداد خادمك، يرجى الاطلاع على <a href=\"%s\" target=\"_blank\">صفحة المساعدة</a>.",
     "Create an <strong>admin account</strong>" : "أضف </strong>مستخدم رئيسي <strong>",
+    "Username" : "إسم المستخدم",
     "Password" : "كلمة المرور",
     "Data folder" : "مجلد المعلومات",
     "Configure the database" : "أسس قاعدة البيانات",
diff --git a/core/l10n/ast.js b/core/l10n/ast.js
index be95fb45e5c..9bf258b0f60 100644
--- a/core/l10n/ast.js
+++ b/core/l10n/ast.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Sé lo que toi faciendo",
-    "Reset password" : "Restablecer contraseña",
     "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
     "No" : "Non",
     "Yes" : "Sí",
@@ -118,13 +117,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
-    "Username" : "Nome d'usuariu",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
-    "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora",
-    "Reset" : "Reaniciar",
     "New password" : "Contraseña nueva",
     "New Password" : "Contraseña nueva",
+    "Reset password" : "Restablecer contraseña",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
     "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
     "Personal" : "Personal",
@@ -149,6 +144,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
+    "Username" : "Nome d'usuariu",
     "Password" : "Contraseña",
     "Storage & database" : "Almacenamientu y Base de datos",
     "Data folder" : "Carpeta de datos",
diff --git a/core/l10n/ast.json b/core/l10n/ast.json
index 42558bd76ef..8422c2948ee 100644
--- a/core/l10n/ast.json
+++ b/core/l10n/ast.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Sé lo que toi faciendo",
-    "Reset password" : "Restablecer contraseña",
     "Password can not be changed. Please contact your administrator." : "Nun pue camudase la contraseña. Por favor, contauta col alministrador.",
     "No" : "Non",
     "Yes" : "Sí",
@@ -116,13 +115,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nun pudo unviase'l corréu porque nun hai direición de corréu pa esti nome d'usuariu. Por favor, contauta col alministrador",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usa'l siguiente enllaz pa restablecer la to contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Vas recibir un enllaz vía Corréu-e pa restablecer la to contraseña",
-    "Username" : "Nome d'usuariu",
-    "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset. If you are not sure what to do, please contact your administrator before you continue. Do you really want to continue?" : "Los ficheros tán cifraos. Si nun habilitesti la clave de recuperación, nun habrá forma de recuperar los tos datos dempués de que la contraseña se reanicie. Si nun tas seguru de qué facer, por favor contauta col alministrador enantes de siguir. ¿De xuru quies continuar?",
-    "Yes, I really want to reset my password now" : "Sí, quiero reaniciar daveres la mio contraseña agora",
-    "Reset" : "Reaniciar",
     "New password" : "Contraseña nueva",
     "New Password" : "Contraseña nueva",
+    "Reset password" : "Restablecer contraseña",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nun ta sofitáu y %s nun furrulará afayadizamente nesta plataforma. ¡Úsalu baxo'l to riesgu!",
     "For the best results, please consider using a GNU/Linux server instead." : "Pa los meyores resultaos, por favor considera l'usu d'un sirvidor GNU/Linux nel so llugar.",
     "Personal" : "Personal",
@@ -147,6 +142,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "El to direutoriu de datos y ficheros seique ye accesible dende internet por mor qu'el ficheru .htaccess nun furrula.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pa informase de cómo configurar el so sirvidor, por favor güeya la  <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crea una <strong>cuenta d'alministrador</strong>",
+    "Username" : "Nome d'usuariu",
     "Password" : "Contraseña",
     "Storage & database" : "Almacenamientu y Base de datos",
     "Data folder" : "Carpeta de datos",
diff --git a/core/l10n/az.js b/core/l10n/az.js
index f3a5b138641..10316b67f2a 100644
--- a/core/l10n/az.js
+++ b/core/l10n/az.js
@@ -35,13 +35,12 @@ OC.L10N.register(
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "İstifadəçi adı",
-    "Reset" : "Sıfırla",
     "Personal" : "Şəxsi",
     "Users" : "İstifadəçilər",
     "Admin" : "İnzibatçı",
     "Help" : "Kömək",
     "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Username" : "İstifadəçi adı",
     "Password" : "Şifrə",
     "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 7f4f7d8bb95..7a0c92543f3 100644
--- a/core/l10n/az.json
+++ b/core/l10n/az.json
@@ -33,13 +33,12 @@
     "Delete" : "Sil",
     "Add" : "Əlavə etmək",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "İstifadəçi adı",
-    "Reset" : "Sıfırla",
     "Personal" : "Şəxsi",
     "Users" : "İstifadəçilər",
     "Admin" : "İnzibatçı",
     "Help" : "Kömək",
     "Security Warning" : "Təhlükəsizlik xəbərdarlığı",
+    "Username" : "İstifadəçi adı",
     "Password" : "Şifrə",
     "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/bg_BG.js b/core/l10n/bg_BG.js
index b69319c2911..cf7369129ba 100644
--- a/core/l10n/bg_BG.js
+++ b/core/l10n/bg_BG.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Връзката за възстановяване на паролата е изпратена на твоя имейл. Ако не я получиш в разумен период от време, провери папката си за спам.<br>Ако не е там се свържи с администратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?",
     "I know what I'm doing" : "Знам какво правя!",
-    "Reset password" : "Възстановяване на парола",
     "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
     "No" : "Не",
     "Yes" : "Да",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.",
     "%s password reset" : "Паролата на %s е променена.",
     "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
-    "You will receive a link to reset your password via Email." : "Ще получиш връзка за възстановяване на паролата посредством емейл.",
-    "Username" : "Потребител",
-    "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?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?",
-    "Yes, I really want to reset my password now" : "Да, наистина желая да възстановя паролата си сега.",
-    "Reset" : "Възстанови",
     "New password" : "Нова парола",
     "New Password" : "Нова Парола",
+    "Reset password" : "Възстановяване на парола",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
     "Personal" : "Лични",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
     "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
+    "Username" : "Потребител",
     "Password" : "Парола",
     "Storage & database" : "Дисково пространство и база данни",
     "Data folder" : "Директория за данни",
diff --git a/core/l10n/bg_BG.json b/core/l10n/bg_BG.json
index 51b2ba5fc76..8b6b7e057d2 100644
--- a/core/l10n/bg_BG.json
+++ b/core/l10n/bg_BG.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Връзката за възстановяване на паролата е изпратена на твоя имейл. Ако не я получиш в разумен период от време, провери папката си за спам.<br>Ако не е там се свържи с администратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата.<br /> Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш.<br/>Наистина ли си сигурен, че искаш да продължиш?",
     "I know what I'm doing" : "Знам какво правя!",
-    "Reset password" : "Възстановяване на парола",
     "Password can not be changed. Please contact your administrator." : "Паролата не може да бъде промена. Моля, свържи се с администратора.",
     "No" : "Не",
     "Yes" : "Да",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Неуспешно изпращане на имейл за възстановяване на паролата, защото липсва имейл свързан с това потребителско име. Моля свържи се с админстратора.",
     "%s password reset" : "Паролата на %s е променена.",
     "Use the following link to reset your password: {link}" : "Използвай следната връзка, за да възстановиш паролата си: {link}",
-    "You will receive a link to reset your password via Email." : "Ще получиш връзка за възстановяване на паролата посредством емейл.",
-    "Username" : "Потребител",
-    "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?" : "Файловете ти са криптирани. Ако не си насторил ключ за възстановяване, няма да има възможност да възстановиш информацията си след като промениш паролата. Ако не си сигурен какво да направиш, моля свържи се с администратора преди да продължиш. Наистина ли си сигурен, че искаш да продължиш?",
-    "Yes, I really want to reset my password now" : "Да, наистина желая да възстановя паролата си сега.",
-    "Reset" : "Възстанови",
     "New password" : "Нова парола",
     "New Password" : "Нова Парола",
+    "Reset password" : "Възстановяване на парола",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не се подържа и %s няма да работи правилно на тази платформа. Използвай го на свой риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "За най-добри резултати, моля помисли дали не би желал да използваш GNU/Linux сървър.",
     "Personal" : "Лични",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Твоята директория за данни и файлове вероятно са достъпни от интернет поради това, че .htaccess файла не функционира.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "За информация как правилно да настроиш сървъра си, моля прегледай <a href=\"%s\" target=\"_blank\">документацията</a>.",
     "Create an <strong>admin account</strong>" : "Създаване на <strong>админ профил</strong>.",
+    "Username" : "Потребител",
     "Password" : "Парола",
     "Storage & database" : "Дисково пространство и база данни",
     "Data folder" : "Директория за данни",
diff --git a/core/l10n/bn_BD.js b/core/l10n/bn_BD.js
index ac4ba299468..422175f9e81 100644
--- a/core/l10n/bn_BD.js
+++ b/core/l10n/bn_BD.js
@@ -29,7 +29,6 @@ OC.L10N.register(
     "December" : "ডিসেম্বর",
     "Settings" : "নিয়ামকসমূহ",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
-    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "No" : "না",
     "Yes" : "হ্যাঁ",
     "Choose" : "বেছে নিন",
@@ -80,11 +79,9 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
     "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
-    "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
-    "Username" : "ব্যবহারকারী",
-    "Reset" : "পূণঃনির্ধানণ",
     "New password" : "নতুন কূটশব্দ",
     "New Password" : "নতুন কূটশব্দ",
+    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "Personal" : "ব্যক্তিগত",
     "Users" : "ব্যবহারকারী",
     "Apps" : "অ্যাপ",
@@ -99,6 +96,7 @@ OC.L10N.register(
     "Cheers!" : "শুভেচ্ছা!",
     "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
     "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+    "Username" : "ব্যবহারকারী",
     "Password" : "কূটশব্দ",
     "Data folder" : "ডাটা ফোল্ডার ",
     "Configure the database" : "ডাটাবেচ কনফিগার করুন",
diff --git a/core/l10n/bn_BD.json b/core/l10n/bn_BD.json
index 9eee32ba3c2..811c1087002 100644
--- a/core/l10n/bn_BD.json
+++ b/core/l10n/bn_BD.json
@@ -27,7 +27,6 @@
     "December" : "ডিসেম্বর",
     "Settings" : "নিয়ামকসমূহ",
     "Saving..." : "সংরক্ষণ করা হচ্ছে..",
-    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "No" : "না",
     "Yes" : "হ্যাঁ",
     "Choose" : "বেছে নিন",
@@ -78,11 +77,9 @@
     "_download %n file_::_download %n files_" : ["",""],
     "Please reload the page." : "দয়া করে পৃষ্ঠাটি পূনরায় লোড করুন।",
     "Use the following link to reset your password: {link}" : "আপনার কূটশব্দটি পূনঃনির্ধারণ  করার জন্য নিম্নোক্ত লিংকটি ব্যবহার করুনঃ {link}",
-    "You will receive a link to reset your password via Email." : "কূটশব্দ পূনঃনির্ধারণের জন্য একটি টূনঃনির্ধারণ লিংকটি আপনাকে ই-মেইলে পাঠানো হয়েছে ।",
-    "Username" : "ব্যবহারকারী",
-    "Reset" : "পূণঃনির্ধানণ",
     "New password" : "নতুন কূটশব্দ",
     "New Password" : "নতুন কূটশব্দ",
+    "Reset password" : "কূটশব্দ পূনঃনির্ধারণ কর",
     "Personal" : "ব্যক্তিগত",
     "Users" : "ব্যবহারকারী",
     "Apps" : "অ্যাপ",
@@ -97,6 +94,7 @@
     "Cheers!" : "শুভেচ্ছা!",
     "Security Warning" : "নিরাপত্তাজনিত সতর্কতা",
     "Create an <strong>admin account</strong>" : "<strong>প্রশাসক একাউন্ট</strong> তৈরী করুন",
+    "Username" : "ব্যবহারকারী",
     "Password" : "কূটশব্দ",
     "Data folder" : "ডাটা ফোল্ডার ",
     "Configure the database" : "ডাটাবেচ কনফিগার করুন",
diff --git a/core/l10n/bn_IN.js b/core/l10n/bn_IN.js
index a72a91078ae..0cd405630cb 100644
--- a/core/l10n/bn_IN.js
+++ b/core/l10n/bn_IN.js
@@ -11,7 +11,6 @@ OC.L10N.register(
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ইউজারনেম",
-    "Reset" : "রিসেট করুন"
+    "Username" : "ইউজারনেম"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/bn_IN.json b/core/l10n/bn_IN.json
index 4e29d0774f6..5c7ce4ef0d7 100644
--- a/core/l10n/bn_IN.json
+++ b/core/l10n/bn_IN.json
@@ -9,7 +9,6 @@
     "Delete" : "মুছে ফেলা",
     "Add" : "যোগ করা",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ইউজারনেম",
-    "Reset" : "রিসেট করুন"
+    "Username" : "ইউজারনেম"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index afa434d3570..ee837ea7b7f 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Sé el que faig",
-    "Reset password" : "Reinicialitza la contrasenya",
     "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
     "No" : "No",
     "Yes" : "Sí",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "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",
     "Use the following link to reset your password: {link}" : "Useu l'enllaç següent per restablir la contrasenya: {link}",
-    "You will receive a link to reset your password via Email." : "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
-    "Username" : "Nom d'usuari",
-    "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?" : "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. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
-    "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya",
-    "Reset" : "Estableix de nou",
     "New password" : "Contrasenya nova",
     "New Password" : "Contrasenya nova",
+    "Reset password" : "Reinicialitza la contrasenya",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
     "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
     "Personal" : "Personal",
@@ -161,6 +156,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
+    "Username" : "Nom d'usuari",
     "Password" : "Contrasenya",
     "Storage & database" : "Emmagatzematge i base de dades",
     "Data folder" : "Carpeta de dades",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index c1ea86b4223..374e9a51440 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Sé el que faig",
-    "Reset password" : "Reinicialitza la contrasenya",
     "Password can not be changed. Please contact your administrator." : "La contrasenya no es pot canviar. Contacteu amb l'administrador.",
     "No" : "No",
     "Yes" : "Sí",
@@ -118,13 +117,9 @@
     "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",
     "Use the following link to reset your password: {link}" : "Useu l'enllaç següent per restablir la contrasenya: {link}",
-    "You will receive a link to reset your password via Email." : "Rebreu un enllaç al correu electrònic per reiniciar la contrasenya.",
-    "Username" : "Nom d'usuari",
-    "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?" : "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. Si sabeu què fer, contacteu amb l'administrador abans de continuar. Voleu continuar?",
-    "Yes, I really want to reset my password now" : "Sí, vull restablir ara la contrasenya",
-    "Reset" : "Estableix de nou",
     "New password" : "Contrasenya nova",
     "New Password" : "Contrasenya nova",
+    "Reset password" : "Reinicialitza la contrasenya",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no té suport i %s no funcionarà correctament en aquesta plataforma. Useu-ho al vostre risc!",
     "For the best results, please consider using a GNU/Linux server instead." : "Per millors resultats, millor considereu utilitzar un servidor GNU/Linux.",
     "Personal" : "Personal",
@@ -159,6 +154,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La carpeta de dades i els seus fitxers probablement són accessibles des d'internet perquè el fitxer .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informació de com configurar el servidor, comproveu la <a href=\"%s\" target=\"_blank\">documentació</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte d'administrador</strong>",
+    "Username" : "Nom d'usuari",
     "Password" : "Contrasenya",
     "Storage & database" : "Emmagatzematge i base de dades",
     "Data folder" : "Carpeta de dades",
diff --git a/core/l10n/cs_CZ.js b/core/l10n/cs_CZ.js
index e858dede737..787b0b10e4a 100644
--- a/core/l10n/cs_CZ.js
+++ b/core/l10n/cs_CZ.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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 e-mailovou 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?",
     "I know what I'm doing" : "Vím co dělám",
-    "Reset password" : "Obnovit heslo",
     "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.",
     "No" : "Ne",
     "Yes" : "Ano",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "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 e-mailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}",
-    "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
-    "Username" : "Uživatelské jméno",
-    "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?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
-    "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo",
-    "Reset" : "Restartovat složku",
     "New password" : "Nové heslo",
     "New Password" : "Nové heslo",
+    "Reset password" : "Obnovit heslo",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
     "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
     "Personal" : "Osobní",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
     "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
+    "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
     "Storage & database" : "Úložiště & databáze",
     "Data folder" : "Složka s daty",
diff --git a/core/l10n/cs_CZ.json b/core/l10n/cs_CZ.json
index 7d0b3ada708..8de2fd338c1 100644
--- a/core/l10n/cs_CZ.json
+++ b/core/l10n/cs_CZ.json
@@ -37,7 +37,6 @@
     "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 e-mailovou 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?",
     "I know what I'm doing" : "Vím co dělám",
-    "Reset password" : "Obnovit heslo",
     "Password can not be changed. Please contact your administrator." : "Heslo nelze změnit. Kontaktujte prosím svého správce systému.",
     "No" : "Ne",
     "Yes" : "Ano",
@@ -122,13 +121,9 @@
     "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 e-mailová adresa. Kontaktujte prosím svého správce systému.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Heslo obnovíte použitím následujícího odkazu: {link}",
-    "You will receive a link to reset your password via Email." : "E-mailem Vám bude zaslán odkaz pro obnovu hesla.",
-    "Username" : "Uživatelské jméno",
-    "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?" : "Vaše soubory jsou šifrovány. Pokud nemáte povolen klíč pro obnovu, neexistuje způsob jak získat, po změně hesla, vaše data. Pokud si nejste jisti co dělat, kontaktujte nejprve svého správce. Opravdu si přejete pokračovat?",
-    "Yes, I really want to reset my password now" : "Ano, opravdu si nyní přeji obnovit mé heslo",
-    "Reset" : "Restartovat složku",
     "New password" : "Nové heslo",
     "New Password" : "Nové heslo",
+    "Reset password" : "Obnovit heslo",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X není podporován a %s nebude na této platformě správně fungovat. Používejte pouze na vlastní nebezpečí!",
     "For the best results, please consider using a GNU/Linux server instead." : "Místo toho zvažte pro nejlepší funkčnost použití GNU/Linux serveru.",
     "Personal" : "Osobní",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš adresář s daty a soubory jsou dostupné z internetu, protože soubor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pro informace, jak správně nastavit váš server, se podívejte do <a href=\"%s\" target=\"_blank\">dokumentace</a>.",
     "Create an <strong>admin account</strong>" : "Vytvořit <strong>účet správce</strong>",
+    "Username" : "Uživatelské jméno",
     "Password" : "Heslo",
     "Storage & database" : "Úložiště & databáze",
     "Data folder" : "Složka s daty",
diff --git a/core/l10n/cy_GB.js b/core/l10n/cy_GB.js
index b5fbab1efb6..06d8b6a1817 100644
--- a/core/l10n/cy_GB.js
+++ b/core/l10n/cy_GB.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Rhagfyr",
     "Settings" : "Gosodiadau",
     "Saving..." : "Yn cadw...",
-    "Reset password" : "Ailosod cyfrinair",
     "No" : "Na",
     "Yes" : "Ie",
     "Choose" : "Dewisiwch",
@@ -64,9 +63,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
     "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
-    "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
-    "Username" : "Enw defnyddiwr",
     "New password" : "Cyfrinair newydd",
+    "Reset password" : "Ailosod cyfrinair",
     "Personal" : "Personol",
     "Users" : "Defnyddwyr",
     "Apps" : "Pecynnau",
@@ -77,6 +75,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
     "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
+    "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
     "Data folder" : "Plygell data",
     "Configure the database" : "Cyflunio'r gronfa ddata",
diff --git a/core/l10n/cy_GB.json b/core/l10n/cy_GB.json
index c3749e52468..a2df02a5e75 100644
--- a/core/l10n/cy_GB.json
+++ b/core/l10n/cy_GB.json
@@ -20,7 +20,6 @@
     "December" : "Rhagfyr",
     "Settings" : "Gosodiadau",
     "Saving..." : "Yn cadw...",
-    "Reset password" : "Ailosod cyfrinair",
     "No" : "Na",
     "Yes" : "Ie",
     "Choose" : "Dewisiwch",
@@ -62,9 +61,8 @@
     "_download %n file_::_download %n files_" : ["","","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Roedd y diweddariad yn llwyddiannus. Cewch eich ailgyfeirio i ownCloud nawr.",
     "Use the following link to reset your password: {link}" : "Defnyddiwch y ddolen hon i ailosod eich cyfrinair: {link}",
-    "You will receive a link to reset your password via Email." : "Byddwch yn derbyn dolen drwy e-bost i ailosod eich cyfrinair.",
-    "Username" : "Enw defnyddiwr",
     "New password" : "Cyfrinair newydd",
+    "Reset password" : "Ailosod cyfrinair",
     "Personal" : "Personol",
     "Users" : "Defnyddwyr",
     "Apps" : "Pecynnau",
@@ -75,6 +73,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Mae eich fersiwn PHP yn agored i ymosodiad NULL Byte (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Mwy na thebyg fod modd cyrraedd eich cyfeiriadur data a ffeilau o'r rhyngrwyd oherwydd nid yw'r ffeil .htaccess yn gweithio. ",
     "Create an <strong>admin account</strong>" : "Crewch <strong>gyfrif gweinyddol</strong>",
+    "Username" : "Enw defnyddiwr",
     "Password" : "Cyfrinair",
     "Data folder" : "Plygell data",
     "Configure the database" : "Cyflunio'r gronfa ddata",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index 64bd64582a7..a1222792fc5 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
     "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
-    "Reset password" : "Nulstil kodeord",
     "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
     "No" : "Nej",
     "Yes" : "Ja",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
     "%s password reset" : "%s adgangskode nulstillet",
     "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}",
-    "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
-    "Username" : "Brugernavn",
-    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
-    "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
-    "Reset" : "Nulstil",
     "New password" : "Nyt kodeord",
     "New Password" : "Ny adgangskode",
+    "Reset password" : "Nulstil kodeord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
     "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
     "Personal" : "Personligt",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
+    "Username" : "Brugernavn",
     "Password" : "Adgangskode",
     "Storage & database" : "Lager & database",
     "Data folder" : "Datamappe",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index ed40172a698..5111e5d3e05 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linket til at nulstille dit kodeord er blevet sendt til din e-post: hvis du ikke modtager den inden for en rimelig tid, så tjek dine spam/junk-mapper.<br> Hvis det ikke er der, så spørg din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode.<br />Hvis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter.<br />Vil du fortsætte?",
     "I know what I'm doing" : "Jeg ved, hvad jeg har gang i",
-    "Reset password" : "Nulstil kodeord",
     "Password can not be changed. Please contact your administrator." : "Adgangskoden kunne ikke ændres. Kontakt venligst din administrator.",
     "No" : "Nej",
     "Yes" : "Ja",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Der opstod et problem under afsendelse af nulstillings-e-mailen. Der ikke er nogen email adresse tilknyttet denne bruger konto. Kontakt venligst systemadministratoren",
     "%s password reset" : "%s adgangskode nulstillet",
     "Use the following link to reset your password: {link}" : "Anvend følgende link til at nulstille din adgangskode: {link}",
-    "You will receive a link to reset your password via Email." : "Du vil modtage et link til at nulstille dit kodeord via e-mail.",
-    "Username" : "Brugernavn",
-    "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?" : "Dine filer er krypterede. Hvis du ikke har aktiveret gendannelsesnøglen kan du ikke få dine data tilbage efter at du har ændret adgangskode. HVis du ikke er sikker på, hvad du skal gøre så kontakt din administrator før du fortsætter. Vil du fortsætte?",
-    "Yes, I really want to reset my password now" : "Ja, Jeg ønsker virkelig at nulstille mit kodeord",
-    "Reset" : "Nulstil",
     "New password" : "Nyt kodeord",
     "New Password" : "Ny adgangskode",
+    "Reset password" : "Nulstil kodeord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X understøttes ikke og %s vil ikke virke optimalt på denne platform. Anvend på eget ansvar!",
     "For the best results, please consider using a GNU/Linux server instead." : "For de bedste resultater, overvej venligst at bruge en GNU/Linux-server i stedet.",
     "Personal" : "Personligt",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dine data mappe og filer er sandsynligvis tilgængelige fra internettet fordi .htaccess filen ikke virker.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information om, hvordan du konfigurerer din server korrekt se <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Opret en <strong>administratorkonto</strong>",
+    "Username" : "Brugernavn",
     "Password" : "Adgangskode",
     "Storage & database" : "Lager & database",
     "Data folder" : "Datamappe",
diff --git a/core/l10n/de.js b/core/l10n/de.js
index 1258cf40251..6b603f3b68a 100644
--- a/core/l10n/de.js
+++ b/core/l10n/de.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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 Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage 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?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
-    "Reset password" : "Passwort zurücksetzen",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
     "No" : "Nein",
     "Yes" : "Ja",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
     "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein 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?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen",
-    "Reset" : "Zurücksetzen",
     "New password" : "Neues Passwort",
     "New Password" : "Neues Passwort",
+    "Reset password" : "Passwort zurücksetzen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
     "Personal" : "Persönlich",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
diff --git a/core/l10n/de.json b/core/l10n/de.json
index 09a77d2ee9a..c1260e70618 100644
--- a/core/l10n/de.json
+++ b/core/l10n/de.json
@@ -37,7 +37,6 @@
     "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 Passwort ist an Deine E-Mail-Adresse geschickt worden. Wenn Du ihn nicht innerhalb einer vernünftigen Zeit empfängst, prüfe Deine Spam-Verzeichnisse.<br>Wenn er nicht dort ist, frage 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?" : "Ihre Dateien sind verschlüsselt. Sollten Sie keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Ihre Daten zu kommen, wenn das Passwort zurückgesetzt wird.<br />Falls Sie sich nicht sicher sind, was Sie tun sollen, kontaktieren Sie bitte Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
-    "Reset password" : "Passwort zurücksetzen",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktiere Deinen Administrator.",
     "No" : "Nein",
     "Yes" : "Ja",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "E-Mail zum Zurücksetzen kann Aufgrund einer nicht vorhandenen E-Mail Adresse für diesen Nutzernamen nicht versendet werden. Bitte kontaktiere Deinen Administrator.",
     "%s password reset" : "%s-Passwort zurücksetzen",
     "Use the following link to reset your password: {link}" : "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Du erhältst einen Link per E-Mail, um Dein 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?" : "Deine Dateien sind verschlüsselt. Solltest Du keinen Wiederherstellungschlüssel aktiviert haben, gibt es keine Möglichkeit an Deine Daten zu kommen, wenn das Passwort zurückgesetzt wird. Falls Du Dir nicht sicher bist, was Du tun sollst, kontaktiere bitte Deinen Administrator, bevor Du fortfährst. Willst Du wirklich fortfahren?",
-    "Yes, I really want to reset my password now" : "Ja, ich will mein Passwort jetzt zurücksetzen",
-    "Reset" : "Zurücksetzen",
     "New password" : "Neues Passwort",
     "New Password" : "Neues Passwort",
+    "Reset password" : "Passwort zurücksetzen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht korrekt funktionieren. Benutzung auf eigenes Risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
     "Personal" : "Persönlich",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dein Datenverzeichnis und Deine Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Für Informationen, wie Du Deinen Server richtig konfigurierst, lies bitte die <a href=\"%s\" target=\"_blank\">Dokumentation</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
diff --git a/core/l10n/de_DE.js b/core/l10n/de_DE.js
index 017ecd1c4fa..aaf21aaf95e 100644
--- a/core/l10n/de_DE.js
+++ b/core/l10n/de_DE.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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 Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
-    "Reset password" : "Passwort zurücksetzen",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
     "No" : "Nein",
     "Yes" : "Ja",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
     "%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",
     "New Password" : "Neues Passwort",
+    "Reset password" : "Passwort zurücksetzen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
     "Personal" : "Persönlich",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
diff --git a/core/l10n/de_DE.json b/core/l10n/de_DE.json
index d6d0c73a777..39e3fd53719 100644
--- a/core/l10n/de_DE.json
+++ b/core/l10n/de_DE.json
@@ -37,7 +37,6 @@
     "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 Ihres Passwortes, ist an Ihre E-Mail-Adresse geschickt worden. Wenn Sie ihn nicht innerhalb einer vernünftigen Zeit empfangen, überprüfen Sie bitte Ihre Spam-Ordner.<br>Wenn sie nicht dort ist, fragen Sie bitte Ihren lokalen Administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ihre Dateien sind verschlüsselt. Wenn Sie den Wiederherstellungsschlüssel nicht aktiviert haben, wird es keine Möglichkeit geben, um Ihre Daten wieder zu erhalten, nachdem Ihr Passwort zurückgesetzt wurde.<br />Wenn Sie sich nicht sicher sind, was Sie tun sollen, wenden Sie sich bitte an Ihren Administrator, bevor Sie fortfahren.<br />Wollen Sie wirklich fortfahren?",
     "I know what I'm doing" : "Ich weiß, was ich mache",
-    "Reset password" : "Passwort zurücksetzen",
     "Password can not be changed. Please contact your administrator." : "Passwort kann nicht geändert werden. Bitte kontaktieren Sie Ihren Administrator.",
     "No" : "Nein",
     "Yes" : "Ja",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Die E-Mail, zum Zurücksetzen, kann Aufgrund einer nicht vorhandenen E-Mail-Adresse, für diesen Benutzernamen, nicht versendet werden. Bitte kontaktieren Sie Ihren Administrator.",
     "%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",
     "New Password" : "Neues Passwort",
+    "Reset password" : "Passwort zurücksetzen",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wird nicht unterstützt und %s wird auf dieser Platform nicht richtig funktionieren. Benutzung auf eigenes Risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Für die besten Resultate sollte stattdessen ein GNU/Linux Server verwendet werden.",
     "Personal" : "Persönlich",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich vom Internet aus erreichbar, weil die .htaccess-Datei nicht funktioniert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bitte lesen Sie die <a href=\"%s\" target=\"_blank\">Dokumentation</a>, um zu erfahren, wie Sie Ihren Server richtig konfigurieren können.",
     "Create an <strong>admin account</strong>" : "<strong>Administrator-Konto</strong> anlegen",
+    "Username" : "Benutzername",
     "Password" : "Passwort",
     "Storage & database" : "Speicher & Datenbank",
     "Data folder" : "Datenverzeichnis",
diff --git a/core/l10n/el.js b/core/l10n/el.js
index a73750695a3..c41928116ba 100644
--- a/core/l10n/el.js
+++ b/core/l10n/el.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
     "I know what I'm doing" : "Γνωρίζω τι κάνω",
-    "Reset password" : "Επαναφορά συνθηματικού",
     "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "No" : "Όχι",
     "Yes" : "Ναι",
@@ -121,13 +120,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "%s password reset" : "%s επαναφορά κωδικού πρόσβασης",
     "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
-    "You will receive a link to reset your password via Email." : "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
-    "Username" : "Όνομα χρήστη",
-    "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?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
-    "Yes, I really want to reset my password now" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
-    "Reset" : "Επαναφορά",
     "New password" : "Νέο συνθηματικό",
     "New Password" : "Νέος Κωδικός",
+    "Reset password" : "Επαναφορά συνθηματικού",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
     "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
     "Personal" : "Προσωπικά",
@@ -167,6 +162,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
     "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+    "Username" : "Όνομα χρήστη",
     "Password" : "Συνθηματικό",
     "Storage & database" : "Αποθήκευση & βάση δεδομένων",
     "Data folder" : "Φάκελος δεδομένων",
diff --git a/core/l10n/el.json b/core/l10n/el.json
index 010d43cc2c8..6b08b8262c8 100644
--- a/core/l10n/el.json
+++ b/core/l10n/el.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ο σύνδεσμος για την επαναφορά του κωδικού πρόσβασής σας απεστάλη στο ηλ. ταχυδρομείο σας. Εάν δεν το παραλάβετε μέσα σε ένα εύλογο χρονικό διάστημα, ελέγξτε το φάκελο ανεπιθύμητων μηνυμάτων σας. <br>Εάν δεν βρίσκεται εκεί ρωτήστε τον τοπικό διαχειριστή σας.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί επαναφοράς, δεν θα υπάρχει τρόπος να ανακτήσετε τα δεδομένα σας μετά την επαναφορά του κωδικού πρόσβασής σας.<br />Εάν δεν είστε σίγουροι για το τι θα θέλατε να κάνετε, παρακαλώ επικοινωνήστε με το διαχειριστή σας πριν συνεχίσετε. <br />Θέλετε στ' αλήθεια να συνεχίσετε;",
     "I know what I'm doing" : "Γνωρίζω τι κάνω",
-    "Reset password" : "Επαναφορά συνθηματικού",
     "Password can not be changed. Please contact your administrator." : "Ο κωδικός πρόσβασης δεν μπορεί να αλλάξει. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "No" : "Όχι",
     "Yes" : "Ναι",
@@ -119,13 +118,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Αδυναμία αποστολής ηλ. μηνύματος επαναφοράς καθώς δεν αντιστοιχεί καμμία διεύθυνση ηλ. ταχυδρομείου σε αυτό το όνομα χρήστη. Παρακαλώ επικοινωνήστε με το διαχειριστή σας.",
     "%s password reset" : "%s επαναφορά κωδικού πρόσβασης",
     "Use the following link to reset your password: {link}" : "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}",
-    "You will receive a link to reset your password via Email." : "Θα λάβετε ένα σύνδεσμο για να επαναφέρετε τον κωδικό πρόσβασής σας μέσω ηλεκτρονικού ταχυδρομείου.",
-    "Username" : "Όνομα χρήστη",
-    "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?" : "Τα αρχεία σας είναι κρυπτογραφημένα. Εάν δεν έχετε ενεργοποιήσει το κλειδί ανάκτησης, δεν υπάρχει περίπτωση να έχετε πρόσβαση στα δεδομένα σας μετά την επαναφορά του συνθηματικού. Εάν δεν είστε σίγουροι τι να κάνετε, παρακαλώ επικοινωνήστε με τον διαχειριστή πριν συνεχίσετε. Θέλετε να συνεχίσετε;",
-    "Yes, I really want to reset my password now" : "Ναι, θέλω να επαναφέρω το συνθηματικό μου τώρα.",
-    "Reset" : "Επαναφορά",
     "New password" : "Νέο συνθηματικό",
     "New Password" : "Νέος Κωδικός",
+    "Reset password" : "Επαναφορά συνθηματικού",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Το Mac OS X δεν υποστηρίζεται και το %s δεν θα λειτουργήσει σωστά σε αυτή την πλατφόρμα. Χρησιμοποιείτε με δική σας ευθύνη!",
     "For the best results, please consider using a GNU/Linux server instead." : "Για καλύτερα αποτελέσματα, παρακαλούμε εξετάστε την μετατροπή σε έναν διακομιστή GNU/Linux.",
     "Personal" : "Προσωπικά",
@@ -165,6 +160,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ο κατάλογος δεδομένων και τα αρχεία σας είναι πιθανό προσβάσιμα από το internet γιατί δεν δουλεύει το αρχείο .htaccess.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Για πληροφορίες πως να ρυθμίσετε ορθά τον διακομιστή σας, παρακαλώ δείτε την <a href=\"%s\" target=\"_blank\">τεκμηρίωση</a>.",
     "Create an <strong>admin account</strong>" : "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>",
+    "Username" : "Όνομα χρήστη",
     "Password" : "Συνθηματικό",
     "Storage & database" : "Αποθήκευση & βάση δεδομένων",
     "Data folder" : "Φάκελος δεδομένων",
diff --git a/core/l10n/en_GB.js b/core/l10n/en_GB.js
index 0c80072e67d..27f28c84908 100644
--- a/core/l10n/en_GB.js
+++ b/core/l10n/en_GB.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
     "I know what I'm doing" : "I know what I'm doing",
-    "Reset password" : "Reset password",
     "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
     "No" : "No",
     "Yes" : "Yes",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
     "%s password reset" : "%s password reset",
     "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
-    "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.",
-    "Username" : "Username",
-    "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?" : "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?",
-    "Yes, I really want to reset my password now" : "Yes, I really want to reset my password now",
-    "Reset" : "Reset",
     "New password" : "New password",
     "New Password" : "New Password",
+    "Reset password" : "Reset password",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
     "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
     "Personal" : "Personal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Username" : "Username",
     "Password" : "Password",
     "Storage & database" : "Storage & database",
     "Data folder" : "Data folder",
diff --git a/core/l10n/en_GB.json b/core/l10n/en_GB.json
index 4a20f00dd6a..c4daf4bbb97 100644
--- a/core/l10n/en_GB.json
+++ b/core/l10n/en_GB.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?",
     "I know what I'm doing" : "I know what I'm doing",
-    "Reset password" : "Reset password",
     "Password can not be changed. Please contact your administrator." : "Password can not be changed. Please contact your administrator.",
     "No" : "No",
     "Yes" : "Yes",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Couldn't send reset email because there is no email address for this username. Please contact your administrator.",
     "%s password reset" : "%s password reset",
     "Use the following link to reset your password: {link}" : "Use the following link to reset your password: {link}",
-    "You will receive a link to reset your password via Email." : "You will receive a link to reset your password via email.",
-    "Username" : "Username",
-    "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?" : "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?",
-    "Yes, I really want to reset my password now" : "Yes, I really want to reset my password now",
-    "Reset" : "Reset",
     "New password" : "New password",
     "New Password" : "New Password",
+    "Reset password" : "Reset password",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! ",
     "For the best results, please consider using a GNU/Linux server instead." : "For the best results, please consider using a GNU/Linux server instead.",
     "Personal" : "Personal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Your data directory and files are probably accessible from the internet because the .htaccess file does not work.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Create an <strong>admin account</strong>",
+    "Username" : "Username",
     "Password" : "Password",
     "Storage & database" : "Storage & database",
     "Data folder" : "Data folder",
diff --git a/core/l10n/eo.js b/core/l10n/eo.js
index cc814c41e35..813d872a640 100644
--- a/core/l10n/eo.js
+++ b/core/l10n/eo.js
@@ -25,7 +25,6 @@ OC.L10N.register(
     "December" : "Decembro",
     "Settings" : "Agordo",
     "Saving..." : "Konservante...",
-    "Reset password" : "Rekomenci la pasvorton",
     "No" : "Ne",
     "Yes" : "Jes",
     "Choose" : "Elekti",
@@ -86,10 +85,8 @@ OC.L10N.register(
     "Please reload the page." : "Bonvolu reŝargi la paĝon.",
     "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
     "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
-    "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-    "Username" : "Uzantonomo",
-    "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun",
     "New password" : "Nova pasvorto",
+    "Reset password" : "Rekomenci la pasvorton",
     "Personal" : "Persona",
     "Users" : "Uzantoj",
     "Apps" : "Aplikaĵoj",
@@ -105,6 +102,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
     "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
+    "Username" : "Uzantonomo",
     "Password" : "Pasvorto",
     "Data folder" : "Datuma dosierujo",
     "Configure the database" : "Agordi la datumbazon",
diff --git a/core/l10n/eo.json b/core/l10n/eo.json
index dc4d9d6eefc..64e2da42ecb 100644
--- a/core/l10n/eo.json
+++ b/core/l10n/eo.json
@@ -23,7 +23,6 @@
     "December" : "Decembro",
     "Settings" : "Agordo",
     "Saving..." : "Konservante...",
-    "Reset password" : "Rekomenci la pasvorton",
     "No" : "Ne",
     "Yes" : "Jes",
     "Choose" : "Elekti",
@@ -84,10 +83,8 @@
     "Please reload the page." : "Bonvolu reŝargi la paĝon.",
     "The update was successful. Redirecting you to ownCloud now." : "La ĝisdatigo estis sukcesa. Alidirektante nun al ownCloud.",
     "Use the following link to reset your password: {link}" : "Uzu la jenan ligilon por restarigi vian pasvorton: {link}",
-    "You will receive a link to reset your password via Email." : "Vi ricevos ligilon retpoŝte por rekomencigi vian pasvorton.",
-    "Username" : "Uzantonomo",
-    "Yes, I really want to reset my password now" : "Jes, mi vere volas restarigi mian pasvorton nun",
     "New password" : "Nova pasvorto",
+    "Reset password" : "Rekomenci la pasvorton",
     "Personal" : "Persona",
     "Users" : "Uzantoj",
     "Apps" : "Aplikaĵoj",
@@ -103,6 +100,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Via PHP versio estas sendefenda je la NULL bajto atako (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Bonvolu ĝisdatigi vian PHP-instalon por uzi %s sekure.",
     "Create an <strong>admin account</strong>" : "Krei <strong>administran konton</strong>",
+    "Username" : "Uzantonomo",
     "Password" : "Pasvorto",
     "Data folder" : "Datuma dosierujo",
     "Configure the database" : "Agordi la datumbazon",
diff --git a/core/l10n/es.js b/core/l10n/es.js
index b963b9d3f01..be1bb9ffe72 100644
--- a/core/l10n/es.js
+++ b/core/l10n/es.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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 enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte 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 has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
     "I know what I'm doing" : "Yo se lo que estoy haciendo",
-    "Reset password" : "Restablecer contraseña",
     "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
     "No" : "No",
     "Yes" : "Sí",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, 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",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-    "Username" : "Nombre de usuario",
-    "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?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
-    "Reset" : "Reiniciar",
     "New password" : "Nueva contraseña",
     "New Password" : "Nueva contraseña",
+    "Reset password" : "Restablecer contraseña",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
     "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
     "Personal" : "Personal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Storage & database" : "Almacenamiento y base de datos",
     "Data folder" : "Directorio de datos",
diff --git a/core/l10n/es.json b/core/l10n/es.json
index 008891d5c98..742703e87c9 100644
--- a/core/l10n/es.json
+++ b/core/l10n/es.json
@@ -37,7 +37,6 @@
     "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 enlace para reiniciar su contraseña ha sido enviado a su correo electrónico. Si usted no lo recibe en un tiempo razonable, revise su carpeta para spam/chatarra.<br>Si no lo encuentra, pregunte 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 has activado la clave de recuperación, no habrá manera de recuperar los datos despues de que tu contraseña seá restablecida.<br /> Si no está seguro de lo que debe hacer, por favor contacte a su administrador antes de continuar.<br />¿Realmente desea continuar?",
     "I know what I'm doing" : "Yo se lo que estoy haciendo",
-    "Reset password" : "Restablecer contraseña",
     "Password can not be changed. Please contact your administrator." : "La contraseña no se puede cambiar. Por favor, contacte a su administrador.",
     "No" : "No",
     "Yes" : "Sí",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "No se pudo enviar la reiniciación del correo electrónico, 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",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-    "Username" : "Nombre de usuario",
-    "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?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
-    "Reset" : "Reiniciar",
     "New password" : "Nueva contraseña",
     "New Password" : "Nueva contraseña",
+    "Reset password" : "Restablecer contraseña",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X no está soportado y %s no funcionará bien en esta plataforma. ¡Úsela a su propio riesgo! ",
     "For the best results, please consider using a GNU/Linux server instead." : "Para óptimos resultados, considere utilizar un servidor GNU/Linux.",
     "Personal" : "Personal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Storage & database" : "Almacenamiento y base de datos",
     "Data folder" : "Directorio de datos",
diff --git a/core/l10n/es_AR.js b/core/l10n/es_AR.js
index f37377f465c..fae6284acf7 100644
--- a/core/l10n/es_AR.js
+++ b/core/l10n/es_AR.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "December" : "diciembre",
     "Settings" : "Configuración",
     "Saving..." : "Guardando...",
-    "Reset password" : "Restablecer contraseña",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Elegir",
@@ -100,12 +99,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
-    "Username" : "Nombre de usuario",
-    "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?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
-    "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora",
-    "Reset" : "Resetear",
     "New password" : "Nueva contraseña:",
+    "Reset password" : "Restablecer contraseña",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Apps",
@@ -128,6 +123,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Data folder" : "Directorio de almacenamiento",
     "Configure the database" : "Configurar la base de datos",
diff --git a/core/l10n/es_AR.json b/core/l10n/es_AR.json
index 219139245a3..c5649a1630a 100644
--- a/core/l10n/es_AR.json
+++ b/core/l10n/es_AR.json
@@ -29,7 +29,6 @@
     "December" : "diciembre",
     "Settings" : "Configuración",
     "Saving..." : "Guardando...",
-    "Reset password" : "Restablecer contraseña",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Elegir",
@@ -98,12 +97,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "La actualización fue exitosa. Estás siendo redirigido a ownCloud.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Usá este enlace para restablecer tu contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Vas a recibir un enlace por e-mail para restablecer tu contraseña.",
-    "Username" : "Nombre de usuario",
-    "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?" : "Tus archivos están encriptados. Si no habilitaste la clave de recuperación, no vas a tener manera de obtener nuevamente tus datos después que se restablezca tu contraseña. Si no estás seguro sobre qué hacer, ponete en contacto con el administrador antes de seguir. ¿Estás seguro/a que querés continuar?",
-    "Yes, I really want to reset my password now" : "Sí, definitivamente quiero restablecer mi contraseña ahora",
-    "Reset" : "Resetear",
     "New password" : "Nueva contraseña:",
+    "Reset password" : "Restablecer contraseña",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Apps",
@@ -126,6 +121,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Tu directorio de datos y tus archivos probablemente son accesibles a través de internet, ya que el archivo .htaccess no está funcionando.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información sobre cómo configurar apropiadamente tu servidor, por favor mirá la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Data folder" : "Directorio de almacenamiento",
     "Configure the database" : "Configurar la base de datos",
diff --git a/core/l10n/es_CL.js b/core/l10n/es_CL.js
index 3808c2cb7c4..98115643cd7 100644
--- a/core/l10n/es_CL.js
+++ b/core/l10n/es_CL.js
@@ -37,11 +37,11 @@ OC.L10N.register(
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "Usuario",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Admin" : "Administración",
     "Help" : "Ayuda",
+    "Username" : "Usuario",
     "Password" : "Clave",
     "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
diff --git a/core/l10n/es_CL.json b/core/l10n/es_CL.json
index 1760e39c6c6..e54689d44b2 100644
--- a/core/l10n/es_CL.json
+++ b/core/l10n/es_CL.json
@@ -35,11 +35,11 @@
     "Error while changing permissions" : "Ocurrió un error mientras se cambiaban los permisos",
     "The object type is not specified." : "El tipo de objeto no está especificado.",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "Usuario",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Admin" : "Administración",
     "Help" : "Ayuda",
+    "Username" : "Usuario",
     "Password" : "Clave",
     "You are accessing the server from an untrusted domain." : "Usted está accediendo al servidor desde un dominio no confiable.",
     "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Por favor contacte con su administrador. Si usted es el administrador de esta instancia, configure la opción \"trusted_domain\" en \"config/config.php\". Un ejemplo de la configuración está disponible en config/config.sample.php"
diff --git a/core/l10n/es_MX.js b/core/l10n/es_MX.js
index d830538bed3..66fc3efb9a6 100644
--- a/core/l10n/es_MX.js
+++ b/core/l10n/es_MX.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "December" : "Diciembre",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
-    "Reset password" : "Restablecer contraseña",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Seleccionar",
@@ -94,12 +93,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-    "Username" : "Nombre de usuario",
-    "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?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
-    "Reset" : "Reiniciar",
     "New password" : "Nueva contraseña",
+    "Reset password" : "Restablecer contraseña",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
@@ -122,6 +117,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Data folder" : "Directorio de datos",
     "Configure the database" : "Configurar la base de datos",
diff --git a/core/l10n/es_MX.json b/core/l10n/es_MX.json
index 99da53b91fe..df3f3aa655a 100644
--- a/core/l10n/es_MX.json
+++ b/core/l10n/es_MX.json
@@ -29,7 +29,6 @@
     "December" : "Diciembre",
     "Settings" : "Ajustes",
     "Saving..." : "Guardando...",
-    "Reset password" : "Restablecer contraseña",
     "No" : "No",
     "Yes" : "Sí",
     "Choose" : "Seleccionar",
@@ -92,12 +91,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "La actualización se ha realizado con éxito. Redireccionando a ownCloud ahora.",
     "%s password reset" : "%s restablecer contraseña",
     "Use the following link to reset your password: {link}" : "Utilice el siguiente enlace para restablecer su contraseña: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá un enlace por correo electrónico para restablecer su contraseña",
-    "Username" : "Nombre de usuario",
-    "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?" : "Sus archivos están cifrados. Si no ha habilitado la clave de recurperación, no habrá forma de recuperar sus datos luego de que la contraseña sea reseteada. Si no está seguro de qué hacer, contacte a su administrador antes de continuar. ¿Realmente desea continuar?",
-    "Yes, I really want to reset my password now" : "Sí. Realmente deseo resetear mi contraseña ahora",
-    "Reset" : "Reiniciar",
     "New password" : "Nueva contraseña",
+    "Reset password" : "Restablecer contraseña",
     "Personal" : "Personal",
     "Users" : "Usuarios",
     "Apps" : "Aplicaciones",
@@ -120,6 +115,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su directorio de datos y sus archivos probablemente sean accesibles a través de internet ya que el archivo .htaccess no funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para información de cómo configurar apropiadamente su servidor, por favor vea la <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear una <strong>cuenta de administrador</strong>",
+    "Username" : "Nombre de usuario",
     "Password" : "Contraseña",
     "Data folder" : "Directorio de datos",
     "Configure the database" : "Configurar la base de datos",
diff --git a/core/l10n/et_EE.js b/core/l10n/et_EE.js
index 7325c6478d8..25681f3486b 100644
--- a/core/l10n/et_EE.js
+++ b/core/l10n/et_EE.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Ma tean mida teen",
-    "Reset password" : "Nulli parool",
     "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
     "No" : "Ei",
     "Yes" : "Jah",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
     "%s password reset" : "%s parooli lähtestus",
     "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
-    "You will receive a link to reset your password via Email." : "Sinu parooli taastamise link saadetakse sulle e-postile.",
-    "Username" : "Kasutajanimi",
-    "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?" : "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. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
-    "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada",
-    "Reset" : "Algseaded",
     "New password" : "Uus parool",
     "New Password" : "Uus parool",
+    "Reset password" : "Nulli parool",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
     "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
     "Personal" : "Isiklik",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
     "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
+    "Username" : "Kasutajanimi",
     "Password" : "Parool",
     "Storage & database" : "Andmehoidla ja andmebaas",
     "Data folder" : "Andmete kaust",
diff --git a/core/l10n/et_EE.json b/core/l10n/et_EE.json
index 56ede97196a..eeb51ed5f85 100644
--- a/core/l10n/et_EE.json
+++ b/core/l10n/et_EE.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Ma tean mida teen",
-    "Reset password" : "Nulli parool",
     "Password can not be changed. Please contact your administrator." : "Parooli ei saa muuta. Palun kontakteeru oma süsteemihalduriga.",
     "No" : "Ei",
     "Yes" : "Jah",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ei suutnud lähtestada e-maili, kuna sellel kasutajal pole e-posti määratud. Palun kontakteeru süsteemihalduriga.",
     "%s password reset" : "%s parooli lähtestus",
     "Use the following link to reset your password: {link}" : "Kasuta järgnevat linki oma parooli taastamiseks: {link}",
-    "You will receive a link to reset your password via Email." : "Sinu parooli taastamise link saadetakse sulle e-postile.",
-    "Username" : "Kasutajanimi",
-    "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?" : "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. Kui sa pole kindel, mida teha, siis palun väta enne jätkamist ühendust oma administaatoriga. Oled sa kindel, et sa soovid jätkata?",
-    "Yes, I really want to reset my password now" : "Jah, ma tõesti soovin oma parooli praegu taastada",
-    "Reset" : "Algseaded",
     "New password" : "Uus parool",
     "New Password" : "Uus parool",
+    "Reset password" : "Nulli parool",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole toetatud ja %s ei pruugi korralikult toimida sellel platvormil. Kasuta seda omal vastutusel!",
     "For the best results, please consider using a GNU/Linux server instead." : "Parema tulemuse saavitamiseks palun kaalu serveris GNU/Linux kasutamist.",
     "Personal" : "Isiklik",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Su andmete kataloog ja failid on tõenäoliselt internetist vabalt saadaval kuna .htaccess fail ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Serveri korrektseks seadistuseks palun tutvu <a href=\"%s\" target=\"_blank\">dokumentatsiooniga</a>.",
     "Create an <strong>admin account</strong>" : "Loo <strong>admini konto</strong>",
+    "Username" : "Kasutajanimi",
     "Password" : "Parool",
     "Storage & database" : "Andmehoidla ja andmebaas",
     "Data folder" : "Andmete kaust",
diff --git a/core/l10n/eu.js b/core/l10n/eu.js
index e90e458a193..7186216bf15 100644
--- a/core/l10n/eu.js
+++ b/core/l10n/eu.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Badakit zer ari naizen egiten",
-    "Reset password" : "Berrezarri pasahitza",
     "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
     "No" : "Ez",
     "Yes" : "Bai",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
     "%s password reset" : "%s pasahitza berrezarri",
     "Use the following link to reset your password: {link}" : "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
-    "You will receive a link to reset your password via Email." : "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
-    "Username" : "Erabiltzaile izena",
-    "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?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
-    "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut",
-    "Reset" : "Berrezarri",
     "New password" : "Pasahitz berria",
     "New Password" : "Pasahitz Berria",
+    "Reset password" : "Berrezarri pasahitza",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
     "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
     "Personal" : "Pertsonala",
@@ -166,6 +161,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
     "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
+    "Username" : "Erabiltzaile izena",
     "Password" : "Pasahitza",
     "Storage & database" : "Biltegia & datubasea",
     "Data folder" : "Datuen karpeta",
diff --git a/core/l10n/eu.json b/core/l10n/eu.json
index d851c6e942d..0579dd2dbad 100644
--- a/core/l10n/eu.json
+++ b/core/l10n/eu.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Badakit zer ari naizen egiten",
-    "Reset password" : "Berrezarri pasahitza",
     "Password can not be changed. Please contact your administrator." : "Ezin da pasahitza aldatu. Mesedez jarri harremetan zure administradorearekin.",
     "No" : "Ez",
     "Yes" : "Bai",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ezin izan da berrezartzeko eposta bidali erabiltzaile izen honetarako eposta helbiderik ez dagoelako. Mesedez harremanetan jarri kudeatzailearekin.",
     "%s password reset" : "%s pasahitza berrezarri",
     "Use the following link to reset your password: {link}" : "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}",
-    "You will receive a link to reset your password via Email." : "Zure pashitza berrezartzeko lotura bat jasoko duzu Epostaren bidez.",
-    "Username" : "Erabiltzaile izena",
-    "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?" : "Zure fitxategiak enkriptaturik daude. Ez baduzu berreskuratze gakoa gaitzen pasahitza berrabiaraztean ez da zure fitxategiak berreskuratzeko modurik egongo. Zer egin ziur ez bazaude kudeatzailearekin harremanetan ipini jarraitu aurretik. Ziur zaude aurrera jarraitu nahi duzula?",
-    "Yes, I really want to reset my password now" : "Bai, nire pasahitza orain berrabiarazi nahi dut",
-    "Reset" : "Berrezarri",
     "New password" : "Pasahitz berria",
     "New Password" : "Pasahitz Berria",
+    "Reset password" : "Berrezarri pasahitza",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X-ek ez du sostengurik eta %s gaizki ibili daiteke plataforma honetan. Erabiltzekotan, zure ardurapean.",
     "For the best results, please consider using a GNU/Linux server instead." : "Emaitza hobeak izateko, mesedez gogoan hartu GNU/Linux zerbitzari bat erabiltzea.",
     "Personal" : "Pertsonala",
@@ -164,6 +159,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Zure data karpeta eta fitxategiak interneten bidez eskuragarri egon daitezke .htaccess fitxategia ez delako funtzionatzen ari.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Zure zerbitrzaria ongi konfiguratzeko, mezedez <a href=\"%s\" target=\"_blank\">dokumentazioa</a> ikusi.",
     "Create an <strong>admin account</strong>" : "Sortu <strong>kudeatzaile kontu<strong> bat",
+    "Username" : "Erabiltzaile izena",
     "Password" : "Pasahitza",
     "Storage & database" : "Biltegia & datubasea",
     "Data folder" : "Datuen karpeta",
diff --git a/core/l10n/fa.js b/core/l10n/fa.js
index e280bae0f58..9b93ede5f05 100644
--- a/core/l10n/fa.js
+++ b/core/l10n/fa.js
@@ -35,7 +35,6 @@ OC.L10N.register(
     "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?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
     "I know what I'm doing" : "اطلاع از انجام این کار دارم",
-    "Reset password" : "تنظیم مجدد رمز عبور",
     "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
     "No" : "نه",
     "Yes" : "بله",
@@ -102,12 +101,8 @@ OC.L10N.register(
     "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
-    "You will receive a link to reset your password via Email." : "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
-    "Username" : "نام کاربری",
-    "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?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
-    "Yes, I really want to reset my password now" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
-    "Reset" : "تنظیم مجدد",
     "New password" : "گذرواژه جدید",
+    "Reset password" : "تنظیم مجدد رمز عبور",
     "Personal" : "شخصی",
     "Users" : "کاربران",
     "Apps" : "  برنامه ها",
@@ -126,6 +121,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
     "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" : "نام کاربری",
     "Password" : "گذرواژه",
     "Storage & database" : "انبارش و پایگاه داده",
     "Data folder" : "پوشه اطلاعاتی",
diff --git a/core/l10n/fa.json b/core/l10n/fa.json
index e7687a02b4c..7914b15ce20 100644
--- a/core/l10n/fa.json
+++ b/core/l10n/fa.json
@@ -33,7 +33,6 @@
     "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?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
     "I know what I'm doing" : "اطلاع از انجام این کار دارم",
-    "Reset password" : "تنظیم مجدد رمز عبور",
     "Password can not be changed. Please contact your administrator." : "رمز عبور نمی تواند تغییر بکند . لطفا با مدیر سیستم تماس بگیرید .",
     "No" : "نه",
     "Yes" : "بله",
@@ -100,12 +99,8 @@
     "The update was unsuccessful." : "بروزرسانی موفقیت آمیز نبود.",
     "The update was successful. Redirecting you to ownCloud now." : "به روزرسانی موفقیت آمیز بود. در حال انتقال شما به OwnCloud.",
     "Use the following link to reset your password: {link}" : "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}",
-    "You will receive a link to reset your password via Email." : "شما یک نامه الکترونیکی حاوی یک لینک جهت بازسازی گذرواژه دریافت خواهید کرد.",
-    "Username" : "نام کاربری",
-    "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?" : "فایل های شما رمزگذاری شده اند. اگر شما کلید بازیابی را فعال نکرده اید، پس از راه اندازی مجدد رمزعبور هیچ راهی برای بازگشت اطلاعاتتان وجود نخواهد داشت.در صورت عدم اطمینان به انجام کار، لطفا ابتدا با مدیر خود تماس بگیرید. آیا واقعا میخواهید ادامه دهید ؟",
-    "Yes, I really want to reset my password now" : "بله، من اکنون میخواهم رمز عبور خود را مجددا راه اندازی کنم.",
-    "Reset" : "تنظیم مجدد",
     "New password" : "گذرواژه جدید",
+    "Reset password" : "تنظیم مجدد رمز عبور",
     "Personal" : "شخصی",
     "Users" : "کاربران",
     "Apps" : "  برنامه ها",
@@ -124,6 +119,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "نسخه ی PHP شما در برابر حملات NULL Byte آسیب پذیر است.(CVE-2006-7243)",
     "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" : "نام کاربری",
     "Password" : "گذرواژه",
     "Storage & database" : "انبارش و پایگاه داده",
     "Data folder" : "پوشه اطلاعاتی",
diff --git a/core/l10n/fi_FI.js b/core/l10n/fi_FI.js
index cc9fad66f8b..3d635a8b866 100644
--- a/core/l10n/fi_FI.js
+++ b/core/l10n/fi_FI.js
@@ -38,7 +38,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
     "I know what I'm doing" : "Tiedän mitä teen",
-    "Reset password" : "Palauta salasana",
     "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "No" : "Ei",
     "Yes" : "Kyllä",
@@ -123,13 +122,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
     "%s password reset" : "%s salasanan palautus",
     "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
-    "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.",
-    "Username" : "Käyttäjätunnus",
-    "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?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
-    "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt",
-    "Reset" : "Palauta salasana",
     "New password" : "Uusi salasana",
     "New Password" : "Uusi salasana",
+    "Reset password" : "Palauta salasana",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
     "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
     "Personal" : "Henkilökohtainen",
@@ -169,6 +164,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
     "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
+    "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
     "Storage & database" : "Tallennus ja tietokanta",
     "Data folder" : "Datakansio",
diff --git a/core/l10n/fi_FI.json b/core/l10n/fi_FI.json
index 32ad46587e2..d1554c2a356 100644
--- a/core/l10n/fi_FI.json
+++ b/core/l10n/fi_FI.json
@@ -36,7 +36,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Linkki salasanan palauttamista varten on lähetetty sähköpostitse. Jos et saa sähköpostiviestiä kohtuullisessa ajassa, tarkista roskapostikansiot.<br>Jos et saa sähköpostiviestiä, ota yhteys paikalliseen ylläpitäjään.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Tiedostosi on salattu. Jos et ole ottanut käyttöön palautusavainta, tietojasi ei ole mahdollista palauttaa salasanan nollaamisen jälkeen.<br />Jos et ole varma mitä tehdä, ota yhteys ylläpitäjään.<br />Haluatko varmasti jatkaa?",
     "I know what I'm doing" : "Tiedän mitä teen",
-    "Reset password" : "Palauta salasana",
     "Password can not be changed. Please contact your administrator." : "Salasanan vaihtaminen ei onnistunut. Ota yhteys ylläpitäjään.",
     "No" : "Ei",
     "Yes" : "Kyllä",
@@ -121,13 +120,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Palautussähköpostin lähettäminen ei onnistunut, koska tälle käyttäjätunnukselle ei ole määritelty sähköpostiosoitetta. Ota yhteys ylläpitäjään.",
     "%s password reset" : "%s salasanan palautus",
     "Use the following link to reset your password: {link}" : "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}",
-    "You will receive a link to reset your password via Email." : "Saat sähköpostitse linkin palauttaaksesi salasanan.",
-    "Username" : "Käyttäjätunnus",
-    "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?" : "Tiedostosi on salattu. Jos et ole ottanut palautusavainta käyttöön, et voi käyttää tiedostojasi enää salasanan nollauksen jälkeen. Jos et ole varma mitä tehdä, ota yhteys ylläpitoon ennen kuin jatkat. Haluatko varmasti jatkaa?",
-    "Yes, I really want to reset my password now" : "Kyllä, haluan palauttaa salasanani nyt",
-    "Reset" : "Palauta salasana",
     "New password" : "Uusi salasana",
     "New Password" : "Uusi salasana",
+    "Reset password" : "Palauta salasana",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X ei ole tuettu, joten %s ei toimi kunnolla tällä alustalla. Käytä omalla vastuulla!",
     "For the best results, please consider using a GNU/Linux server instead." : "Käytä parhaan lopputuloksen saamiseksi GNU/Linux-palvelinta.",
     "Personal" : "Henkilökohtainen",
@@ -167,6 +162,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datakansiosi ja tiedostosi ovat mitä luultavimmin muiden saavutettavissa internetistä, koska .htaccess-tiedosto ei toimi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Lisätietoja palvelimen asetuksien määrittämisestä on saatavilla <a href=\"%s\" target=\"_blank\">dokumentaatiosta</a>.",
     "Create an <strong>admin account</strong>" : "Luo <strong>ylläpitäjän tunnus</strong>",
+    "Username" : "Käyttäjätunnus",
     "Password" : "Salasana",
     "Storage & database" : "Tallennus ja tietokanta",
     "Data folder" : "Datakansio",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 0ff630f70ba..87e8b017832 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
     "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(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
     "I know what I'm doing" : "Je sais ce que je fais",
-    "Reset password" : "Réinitialiser le mot de passe",
     "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
     "No" : "Non",
     "Yes" : "Oui",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "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",
     "Use the following link to reset your password: {link}" : "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
-    "You will receive a link to reset your password via Email." : "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.",
-    "Username" : "Nom d'utilisateur",
-    "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?" : "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é. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
-    "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
-    "Reset" : "Réinitialiser",
     "New password" : "Nouveau mot de passe",
     "New Password" : "Nouveau mot de passe",
+    "Reset password" : "Réinitialiser le mot de passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
     "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
     "Personal" : "Personnel",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
+    "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
     "Storage & database" : "Stockage & base de données",
     "Data folder" : "Répertoire des données",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 0fed5b79ab7..5b57d86f532 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -37,7 +37,6 @@
     "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." : "Le lien permettant de réinitialiser votre mot de passe vient d'être envoyé à votre adresse de courriel.<br>Si vous ne le recevez pas dans un délai raisonnable, vérifiez votre dossier de pourriels/spams.<br>Si besoin, contactez votre administrateur.",
     "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(e) de ce que vous faites, veuillez contacter votre administrateur avant de continuer. <br />Voulez-vous vraiment continuer ?",
     "I know what I'm doing" : "Je sais ce que je fais",
-    "Reset password" : "Réinitialiser le mot de passe",
     "Password can not be changed. Please contact your administrator." : "Le mot de passe ne peut être modifié. Veuillez contacter votre administrateur.",
     "No" : "Non",
     "Yes" : "Oui",
@@ -122,13 +121,9 @@
     "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",
     "Use the following link to reset your password: {link}" : "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
-    "You will receive a link to reset your password via Email." : "Vous allez recevoir un courriel contenant un lien pour réinitialiser votre mot de passe.",
-    "Username" : "Nom d'utilisateur",
-    "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?" : "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é. Si vous n'êtes pas sûr(e) de ce que vous faites, veuillez contacter votre administrateur avant de poursuivre. Voulez-vous vraiment continuer ?",
-    "Yes, I really want to reset my password now" : "Oui, je veux vraiment réinitialiser mon mot de passe maintenant",
-    "Reset" : "Réinitialiser",
     "New password" : "Nouveau mot de passe",
     "New Password" : "Nouveau mot de passe",
+    "Reset password" : "Réinitialiser le mot de passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X n'est pas pris en charge et %s ne fonctionnera pas correctement sur cette plate-forme. Son utilisation est à vos risques et périls !",
     "For the best results, please consider using a GNU/Linux server instead." : "Pour obtenir les meilleurs résultats, vous devriez utiliser un serveur GNU/Linux.",
     "Personal" : "Personnel",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Votre répertoire de données est certainement accessible depuis l'internet car le fichier .htaccess ne fonctionne pas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pour les informations de configuration de votre serveur, veuillez lire la <a href=\"%s\" target=\"_blank\">documentation</a>.",
     "Create an <strong>admin account</strong>" : "Créer un <strong>compte administrateur</strong>",
+    "Username" : "Nom d'utilisateur",
     "Password" : "Mot de passe",
     "Storage & database" : "Stockage & base de données",
     "Data folder" : "Répertoire des données",
diff --git a/core/l10n/gl.js b/core/l10n/gl.js
index 724775644dc..b7a43addec9 100644
--- a/core/l10n/gl.js
+++ b/core/l10n/gl.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Sei o estou a facer",
-    "Reset password" : "Restabelecer o contrasinal",
     "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
     "No" : "Non",
     "Yes" : "Si",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
     "%s password reset" : "Restabelecer o contrasinal %s",
     "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal",
-    "Username" : "Nome de usuario",
-    "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?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
-    "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal",
-    "Reset" : "Restabelecer",
     "New password" : "Novo contrasinal",
     "New Password" : "Novo contrasinal",
+    "Reset password" : "Restabelecer o contrasinal",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
     "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
     "Personal" : "Persoal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
+    "Username" : "Nome de usuario",
     "Password" : "Contrasinal",
     "Storage & database" : "Almacenamento e base de datos",
     "Data folder" : "Cartafol de datos",
diff --git a/core/l10n/gl.json b/core/l10n/gl.json
index 7715f3bebbf..82157285cd3 100644
--- a/core/l10n/gl.json
+++ b/core/l10n/gl.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Sei o estou a facer",
-    "Reset password" : "Restabelecer o contrasinal",
     "Password can not be changed. Please contact your administrator." : "Non é posíbel cambiar o contrasinal. Póñase en contacto co administrador.",
     "No" : "Non",
     "Yes" : "Si",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Non foi posíbel enviar o coreo do restablecemento. Semella que este correo non corresponde con este nome de usuario. Póñase en contacto co administrador.",
     "%s password reset" : "Restabelecer o contrasinal %s",
     "Use the following link to reset your password: {link}" : "Usa a seguinte ligazón para restabelecer o contrasinal: {link}",
-    "You will receive a link to reset your password via Email." : "Recibirá unha ligazón por correo para restabelecer o contrasinal",
-    "Username" : "Nome de usuario",
-    "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?" : "Os ficheiros están cifrados. Se aínda non activou a chave de recuperación non haberá xeito de recuperar os datos unha vez que se teña restabelecido o contrasinal. Se non ten certeza do que ten que facer, póñase en contacto co administrador antes de continuar. Confirma que quere continuar?",
-    "Yes, I really want to reset my password now" : "Si, confirmo que quero restabelecer agora o meu contrasinal",
-    "Reset" : "Restabelecer",
     "New password" : "Novo contrasinal",
     "New Password" : "Novo contrasinal",
+    "Reset password" : "Restabelecer o contrasinal",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non é compatíbel e %s non funcionará correctamente nesta plataforma. Úseo baixo o seu risco!",
     "For the best results, please consider using a GNU/Linux server instead." : "Para obter mellores resultados, considere o emprego dun servidor GNU/Linux no seu canto.",
     "Personal" : "Persoal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "O seu directorio de datos e os ficheiros probabelmente sexan accesíbeis desde a Internet xa que o ficheiro .htaccess non está a traballar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter información sobre como como configurar axeitadamente o seu servidor, vexa a <a href=\"%s\" target=\"_blank\">documentación</a>.",
     "Create an <strong>admin account</strong>" : "Crear unha <strong>contra de administrador</strong>",
+    "Username" : "Nome de usuario",
     "Password" : "Contrasinal",
     "Storage & database" : "Almacenamento e base de datos",
     "Data folder" : "Cartafol de datos",
diff --git a/core/l10n/he.js b/core/l10n/he.js
index 206e0c0de01..015f5843ac9 100644
--- a/core/l10n/he.js
+++ b/core/l10n/he.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "דצמבר",
     "Settings" : "הגדרות",
     "Saving..." : "שמירה…",
-    "Reset password" : "איפוס ססמה",
     "No" : "לא",
     "Yes" : "כן",
     "Choose" : "בחירה",
@@ -67,10 +66,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
     "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
-    "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-    "Username" : "שם משתמש",
-    "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
     "New password" : "ססמה חדשה",
+    "Reset password" : "איפוס ססמה",
     "Personal" : "אישי",
     "Users" : "משתמשים",
     "Apps" : "יישומים",
@@ -82,6 +79,7 @@ OC.L10N.register(
     "Please update your PHP installation to use %s securely." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
     "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
+    "Username" : "שם משתמש",
     "Password" : "סיסמא",
     "Data folder" : "תיקיית נתונים",
     "Configure the database" : "הגדרת מסד הנתונים",
diff --git a/core/l10n/he.json b/core/l10n/he.json
index 437098c104f..47d5d82ad99 100644
--- a/core/l10n/he.json
+++ b/core/l10n/he.json
@@ -20,7 +20,6 @@
     "December" : "דצמבר",
     "Settings" : "הגדרות",
     "Saving..." : "שמירה…",
-    "Reset password" : "איפוס ססמה",
     "No" : "לא",
     "Yes" : "כן",
     "Choose" : "בחירה",
@@ -65,10 +64,8 @@
     "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "תהליך העדכון הסתיים בהצלחה. עכשיו מנתב אותך אל ownCloud.",
     "Use the following link to reset your password: {link}" : "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}",
-    "You will receive a link to reset your password via Email." : "יישלח לתיבת הדוא״ל שלך קישור לאיפוס הססמה.",
-    "Username" : "שם משתמש",
-    "Yes, I really want to reset my password now" : "כן, אני רוצה לאפס את הסיסמה שלי עכשיו.",
     "New password" : "ססמה חדשה",
+    "Reset password" : "איפוס ססמה",
     "Personal" : "אישי",
     "Users" : "משתמשים",
     "Apps" : "יישומים",
@@ -80,6 +77,7 @@
     "Please update your PHP installation to use %s securely." : "נא לעדכן את התקנת ה-PHP שלך כדי להשתמש ב-%s בצורה מאובטחת.",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "תיקיית וקבצי המידע שלך כנראה נגישים מהאינטרנט מכיוון שקובץ ה.htaccess לא עובד.",
     "Create an <strong>admin account</strong>" : "יצירת <strong>חשבון מנהל</strong>",
+    "Username" : "שם משתמש",
     "Password" : "סיסמא",
     "Data folder" : "תיקיית נתונים",
     "Configure the database" : "הגדרת מסד הנתונים",
diff --git a/core/l10n/hi.js b/core/l10n/hi.js
index bd74076a739..787b2031f4e 100644
--- a/core/l10n/hi.js
+++ b/core/l10n/hi.js
@@ -32,8 +32,6 @@ OC.L10N.register(
     "Add" : "डाले",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
-    "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
-    "Username" : "प्रयोक्ता का नाम",
     "New password" : "नया पासवर्ड",
     "Personal" : "यक्तिगत",
     "Users" : "उपयोगकर्ता",
@@ -41,6 +39,7 @@ OC.L10N.register(
     "Help" : "सहयोग",
     "Security Warning" : "सुरक्षा चेतावनी ",
     "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
+    "Username" : "प्रयोक्ता का नाम",
     "Password" : "पासवर्ड",
     "Data folder" : "डाटा फोल्डर",
     "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ",
diff --git a/core/l10n/hi.json b/core/l10n/hi.json
index 82f27644e93..d2b5fefbf4e 100644
--- a/core/l10n/hi.json
+++ b/core/l10n/hi.json
@@ -30,8 +30,6 @@
     "Add" : "डाले",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "आगे दिये गये लिंक का उपयोग पासवर्ड बदलने के लिये किजीये: {link}",
-    "You will receive a link to reset your password via Email." : "पासवर्ड बदलने कि लिंक आपको ई-मेल द्वारा भेजी जायेगी|",
-    "Username" : "प्रयोक्ता का नाम",
     "New password" : "नया पासवर्ड",
     "Personal" : "यक्तिगत",
     "Users" : "उपयोगकर्ता",
@@ -39,6 +37,7 @@
     "Help" : "सहयोग",
     "Security Warning" : "सुरक्षा चेतावनी ",
     "Create an <strong>admin account</strong>" : "व्यवस्थापक खाता बनाएँ",
+    "Username" : "प्रयोक्ता का नाम",
     "Password" : "पासवर्ड",
     "Data folder" : "डाटा फोल्डर",
     "Configure the database" : "डेटाबेस कॉन्फ़िगर करें ",
diff --git a/core/l10n/hr.js b/core/l10n/hr.js
index 38de4e13cd3..449c9b248a8 100644
--- a/core/l10n/hr.js
+++ b/core/l10n/hr.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Znam što radim",
-    "Reset password" : "Resetirajte lozinku",
     "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
     "No" : "Ne",
     "Yes" : "Da",
@@ -118,13 +117,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
     "%s password reset" : "%s lozinka resetirana",
     "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
-    "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
-    "Username" : "Korisničko ime",
-    "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?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
-    "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.",
-    "Reset" : "Resetirajte",
     "New password" : "Nova lozinka",
     "New Password" : "Nova lozinka",
+    "Reset password" : "Resetirajte lozinku",
     "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.",
     "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
     "Personal" : "Osobno",
@@ -149,6 +144,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Storage & database" : "Pohrana & baza podataka",
     "Data folder" : "Mapa za podatke",
diff --git a/core/l10n/hr.json b/core/l10n/hr.json
index fbcc57054e3..21141abc30e 100644
--- a/core/l10n/hr.json
+++ b/core/l10n/hr.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Znam što radim",
-    "Reset password" : "Resetirajte lozinku",
     "Password can not be changed. Please contact your administrator." : "Lozinku nije moguće promijeniti. Molimo kontaktirajte svog administratora.",
     "No" : "Ne",
     "Yes" : "Da",
@@ -116,13 +115,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Resetiranu e-poštu nije moguće poslati jer za ovo korisničko ime ne postoji adresa.Molimo, kontaktirajte svog administratora.",
     "%s password reset" : "%s lozinka resetirana",
     "Use the following link to reset your password: {link}" : "Za resetiranje svoje lozinke koristite sljedeću vezu: {link}",
-    "You will receive a link to reset your password via Email." : "Vezu za resetiranje svoje lozinke primit ćete e-poštom.",
-    "Username" : "Korisničko ime",
-    "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?" : "Vaše datoteke su šifrirane. Ako niste aktivirali ključ oporavka, svoje podatke nećetemoći dohvatiti nakon što vaša lozinka bude resetirana. Ako niste sigurni što učiniti, molimokontaktirajte svog administratora prije nego li nastavite. Želite li doista nastaviti?",
-    "Yes, I really want to reset my password now" : "Da, ja doista želim sada resetirati svojju lozinku.",
-    "Reset" : "Resetirajte",
     "New password" : "Nova lozinka",
     "New Password" : "Nova lozinka",
+    "Reset password" : "Resetirajte lozinku",
     "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.",
     "For the best results, please consider using a GNU/Linux server instead." : "Za najbolje rezultate, molimo razmotrite mogućnost korištenje poslužitelja GNU/Linux.",
     "Personal" : "Osobno",
@@ -147,6 +142,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vašem podatkovnom direktoriju i datotekama vjerojatno se može pristupiti s interneta jer .htaccess datoteka ne radi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za informaciju kako ispravno konfigurirati vaš poslužitelj, molimo vidite <a href=\"%s\" target=\"_blank\">dokumentaciju</a>.",
     "Create an <strong>admin account</strong>" : "Kreirajte <strong>admin račun</strong>",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Storage & database" : "Pohrana & baza podataka",
     "Data folder" : "Mapa za podatke",
diff --git a/core/l10n/hu_HU.js b/core/l10n/hu_HU.js
index 867d47cda68..c19ecc457df 100644
--- a/core/l10n/hu_HU.js
+++ b/core/l10n/hu_HU.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Tudom mit csinálok.",
-    "Reset password" : "Jelszó-visszaállítás",
     "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
     "No" : "Nem",
     "Yes" : "Igen",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "%s password reset" : "%s jelszó visszaállítás",
     "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}",
-    "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
-    "Username" : "Felhasználónév",
-    "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?" : "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?",
-    "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam",
-    "Reset" : "Visszaállítás",
     "New password" : "Az új jelszó",
     "New Password" : "Új jelszó",
+    "Reset password" : "Jelszó-visszaállítás",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
     "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
     "Personal" : "Személyes",
@@ -162,6 +157,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
+    "Username" : "Felhasználónév",
     "Password" : "Jelszó",
     "Storage & database" : "Tárolás és adatbázis",
     "Data folder" : "Adatkönyvtár",
diff --git a/core/l10n/hu_HU.json b/core/l10n/hu_HU.json
index 3ab7d5d2e97..fd4a2e66680 100644
--- a/core/l10n/hu_HU.json
+++ b/core/l10n/hu_HU.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Tudom mit csinálok.",
-    "Reset password" : "Jelszó-visszaállítás",
     "Password can not be changed. Please contact your administrator." : "A jelszót nem lehet visszaállítani. Kérjük, lépjen kapcsolatba a redszergazdával.",
     "No" : "Nem",
     "Yes" : "Igen",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Visszaállítási e-mail nem küldhető, mert nem tartozik e-mail cím ehhez a felhasználóhoz. Kérjük, lépjen kapcsolatba a rendszergazdával.",
     "%s password reset" : "%s jelszó visszaállítás",
     "Use the following link to reset your password: {link}" : "Használja ezt a linket a jelszó ismételt beállításához: {link}",
-    "You will receive a link to reset your password via Email." : "Egy e-mailben fog értesítést kapni a jelszóbeállítás módjáról.",
-    "Username" : "Felhasználónév",
-    "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?" : "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?",
-    "Yes, I really want to reset my password now" : "Igen, tényleg meg akarom változtatni a jelszavam",
-    "Reset" : "Visszaállítás",
     "New password" : "Az új jelszó",
     "New Password" : "Új jelszó",
+    "Reset password" : "Jelszó-visszaállítás",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "A Mac OS X nem támogatott és %s nem lesz teljesen működőképes. Csak saját felelősségre használja!",
     "For the best results, please consider using a GNU/Linux server instead." : "A legjobb eredmény érdekében érdemes GNU/Linux-alapú kiszolgálót használni.",
     "Personal" : "Személyes",
@@ -160,6 +155,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Az adatkönyvtár és a benne levő állományok valószínűleg közvetlenül is elérhetők az internetről, mert a .htaccess állomány nem érvényesül.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "A kiszolgáló megfelelő beállításához kérjük olvassa el a <a href=\"%sl\" target=\"_blank\">dokumentációt</a>.",
     "Create an <strong>admin account</strong>" : "<strong>Rendszergazdai belépés</strong> létrehozása",
+    "Username" : "Felhasználónév",
     "Password" : "Jelszó",
     "Storage & database" : "Tárolás és adatbázis",
     "Data folder" : "Adatkönyvtár",
diff --git a/core/l10n/ia.js b/core/l10n/ia.js
index 8bac55ebfab..791e6910b37 100644
--- a/core/l10n/ia.js
+++ b/core/l10n/ia.js
@@ -36,7 +36,6 @@ OC.L10N.register(
     "Saving..." : "Salveguardante...",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
     "I know what I'm doing" : "Io sape lo que io es facente",
-    "Reset password" : "Reinitialisar contrasigno",
     "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
     "No" : "No",
     "Yes" : "Si",
@@ -103,12 +102,9 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
     "%s password reset" : "%s contrasigno re-fixate",
     "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
-    "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
-    "Username" : "Nomine de usator",
-    "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc",
-    "Reset" : "Re-fixar",
     "New password" : "Nove contrasigno",
     "New Password" : "Nove contrasigno",
+    "Reset password" : "Reinitialisar contrasigno",
     "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.",
     "Personal" : "Personal",
     "Users" : "Usatores",
@@ -133,6 +129,7 @@ OC.L10N.register(
     "Security Warning" : "Aviso de securitate",
     "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
     "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
+    "Username" : "Nomine de usator",
     "Password" : "Contrasigno",
     "Storage & database" : "Immagazinage & base de datos",
     "Data folder" : "Dossier de datos",
diff --git a/core/l10n/ia.json b/core/l10n/ia.json
index 60ece2f9425..80a9b47c0ea 100644
--- a/core/l10n/ia.json
+++ b/core/l10n/ia.json
@@ -34,7 +34,6 @@
     "Saving..." : "Salveguardante...",
     "Couldn't send reset email. Please contact your administrator." : "On non pote inviar message de configurar ex novo. Pro favor continge tu administrator.",
     "I know what I'm doing" : "Io sape lo que io es facente",
-    "Reset password" : "Reinitialisar contrasigno",
     "Password can not be changed. Please contact your administrator." : "Contrasigno non pote esser modificate. Pro favor continge tu administrator.",
     "No" : "No",
     "Yes" : "Si",
@@ -101,12 +100,9 @@
     "The update was successful. Redirecting you to ownCloud now." : "Le actualisation terminava con successo. On redirige nunc a tu ownCloud.",
     "%s password reset" : "%s contrasigno re-fixate",
     "Use the following link to reset your password: {link}" : "Usa le ligamine sequente pro re-fixar tu contrasigno: {link}",
-    "You will receive a link to reset your password via Email." : "Tu recipera un ligamine pro re-configurar tu contrasigno via e-posta.",
-    "Username" : "Nomine de usator",
-    "Yes, I really want to reset my password now" : "Si, io vermente vole re-configurar mi contrasigno nunc",
-    "Reset" : "Re-fixar",
     "New password" : "Nove contrasigno",
     "New Password" : "Nove contrasigno",
+    "Reset password" : "Reinitialisar contrasigno",
     "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.",
     "Personal" : "Personal",
     "Users" : "Usatores",
@@ -131,6 +127,7 @@
     "Security Warning" : "Aviso de securitate",
     "Please update your PHP installation to use %s securely." : "Pro favor actualisa tu installation de PHP pro usar %s con securitate.",
     "Create an <strong>admin account</strong>" : "Crear un <strong>conto de administration</strong>",
+    "Username" : "Nomine de usator",
     "Password" : "Contrasigno",
     "Storage & database" : "Immagazinage & base de datos",
     "Data folder" : "Dossier de datos",
diff --git a/core/l10n/id.js b/core/l10n/id.js
index 7182162297e..47566bb627b 100644
--- a/core/l10n/id.js
+++ b/core/l10n/id.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
     "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
-    "Reset password" : "Setel ulang sandi",
     "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
     "No" : "Tidak",
     "Yes" : "Ya",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "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",
     "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
-    "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-    "Username" : "Nama pengguna",
-    "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?" : "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?",
-    "Yes, I really want to reset my password now" : "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
-    "Reset" : "Atur Ulang",
     "New password" : "Sandi baru",
     "New Password" : "Sandi Baru",
+    "Reset password" : "Setel ulang sandi",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
     "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
     "Personal" : "Pribadi",
@@ -166,6 +161,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
     "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
+    "Username" : "Nama pengguna",
     "Password" : "Sandi",
     "Storage & database" : "Penyimpanan & Basis data",
     "Data folder" : "Folder data",
diff --git a/core/l10n/id.json b/core/l10n/id.json
index 79e90900d0f..d3327460f31 100644
--- a/core/l10n/id.json
+++ b/core/l10n/id.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Sebuah tautan untuk setel ulang sandi Anda telah dikirim ke email Anda. Jika Anda tidak menerima dalam jangka waktu yang wajar, periksa folder spam/sampah Anda.<br>Jika tidak ada, tanyakan pada administrator Anda.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Berkas-berkas Anda terenkripsi. Jika Anda tidak mengaktifkan kunci pemulihan, tidak ada cara lain untuk mendapatkan data Anda kembali setelah sandi di setel ulang.<br />Jika Anda tidak yakin dengan apa yang akan Anda dilakukan, mohon hubungi administrator Anda sebelum melanjutkan. <br />Apakah Anda yakin ingin melanjutkan?",
     "I know what I'm doing" : "Saya tahu apa yang saya lakukan",
-    "Reset password" : "Setel ulang sandi",
     "Password can not be changed. Please contact your administrator." : "Sandi tidak dapat diubah. Silakan hubungi administrator Anda",
     "No" : "Tidak",
     "Yes" : "Ya",
@@ -118,13 +117,9 @@
     "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",
     "Use the following link to reset your password: {link}" : "Gunakan tautan berikut untuk menyetel ulang sandi Anda: {link}",
-    "You will receive a link to reset your password via Email." : "Anda akan menerima tautan penyetelan ulang sandi lewat Email.",
-    "Username" : "Nama pengguna",
-    "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?" : "Berkas anda terenkripsi. Jika sebelumnya anda belum mengaktifkan kunci pemulihan, tidak akan ada cara lagi untuk mendapatkan data anda kembali setelah sandi anda diatur ulang. Jika anda tidak yakin dengan apa yang harus dilakukan, silakan hubungi administrator anda sebelum melanjutkan. Apakah anda benar-benar ingin melanjutkan?",
-    "Yes, I really want to reset my password now" : "Ya, Saya sungguh ingin mengatur ulang sandi saya sekarang",
-    "Reset" : "Atur Ulang",
     "New password" : "Sandi baru",
     "New Password" : "Sandi Baru",
+    "Reset password" : "Setel ulang sandi",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X tidak didukung dan %s tidak akan bekerja dengan baik pada platform ini. Gunakan dengan resiko Anda sendiri!",
     "For the best results, please consider using a GNU/Linux server instead." : "Untuk hasil terbaik, pertimbangkan untuk menggunakan server GNU/Linux sebagai gantinya. ",
     "Personal" : "Pribadi",
@@ -164,6 +159,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Kemungkinan direktori data dan berkas anda dapat diakses dari internet karena berkas .htaccess tidak berfungsi.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Untuk informasi cara mengkonfigurasi server anda dengan benar, silakan lihat <a href=\"%s\" target=\"_blank\">dokumentasi</a>.",
     "Create an <strong>admin account</strong>" : "Buat sebuah <strong>akun admin</strong>",
+    "Username" : "Nama pengguna",
     "Password" : "Sandi",
     "Storage & database" : "Penyimpanan & Basis data",
     "Data folder" : "Folder data",
diff --git a/core/l10n/is.js b/core/l10n/is.js
index 8f1f7d09eec..0ac56e51181 100644
--- a/core/l10n/is.js
+++ b/core/l10n/is.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Desember",
     "Settings" : "Stillingar",
     "Saving..." : "Er að vista ...",
-    "Reset password" : "Endursetja lykilorð",
     "No" : "Nei",
     "Yes" : "Já",
     "Choose" : "Veldu",
@@ -62,9 +61,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
-    "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
-    "Username" : "Notendanafn",
     "New password" : "Nýtt lykilorð",
+    "Reset password" : "Endursetja lykilorð",
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
@@ -73,6 +71,7 @@ OC.L10N.register(
     "Access forbidden" : "Aðgangur bannaður",
     "Security Warning" : "Öryggis aðvörun",
     "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
+    "Username" : "Notendanafn",
     "Password" : "Lykilorð",
     "Data folder" : "Gagnamappa",
     "Configure the database" : "Stilla gagnagrunn",
diff --git a/core/l10n/is.json b/core/l10n/is.json
index ff69c133fa6..d56e4bbd3d7 100644
--- a/core/l10n/is.json
+++ b/core/l10n/is.json
@@ -20,7 +20,6 @@
     "December" : "Desember",
     "Settings" : "Stillingar",
     "Saving..." : "Er að vista ...",
-    "Reset password" : "Endursetja lykilorð",
     "No" : "Nei",
     "Yes" : "Já",
     "Choose" : "Veldu",
@@ -60,9 +59,8 @@
     "_download %n file_::_download %n files_" : ["",""],
     "The update was successful. Redirecting you to ownCloud now." : "Uppfærslan heppnaðist. Beini þér til ownCloud nú.",
     "Use the following link to reset your password: {link}" : "Notað eftirfarandi veftengil til að endursetja lykilorðið þitt: {link}",
-    "You will receive a link to reset your password via Email." : "Þú munt fá veftengil í tölvupósti til að endursetja lykilorðið.",
-    "Username" : "Notendanafn",
     "New password" : "Nýtt lykilorð",
+    "Reset password" : "Endursetja lykilorð",
     "Personal" : "Um mig",
     "Users" : "Notendur",
     "Apps" : "Forrit",
@@ -71,6 +69,7 @@
     "Access forbidden" : "Aðgangur bannaður",
     "Security Warning" : "Öryggis aðvörun",
     "Create an <strong>admin account</strong>" : "Útbúa <strong>vefstjóra aðgang</strong>",
+    "Username" : "Notendanafn",
     "Password" : "Lykilorð",
     "Data folder" : "Gagnamappa",
     "Configure the database" : "Stilla gagnagrunn",
diff --git a/core/l10n/it.js b/core/l10n/it.js
index dcc221bf885..ed23ad7df28 100644
--- a/core/l10n/it.js
+++ b/core/l10n/it.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "So cosa sto facendo",
-    "Reset password" : "Ripristina la password",
     "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
     "No" : "No",
     "Yes" : "Sì",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
     "%s password reset" : "Ripristino password di %s",
     "Use the following link to reset your password: {link}" : "Usa il collegamento seguente per ripristinare la password: {link}",
-    "You will receive a link to reset your password via Email." : "Riceverai un collegamento per ripristinare la tua password via email",
-    "Username" : "Nome utente",
-    "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?" : "I 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à ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
-    "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso",
-    "Reset" : "Ripristina",
     "New password" : "Nuova password",
     "New Password" : "Nuova password",
+    "Reset password" : "Ripristina la password",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
     "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
     "Personal" : "Personale",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
+    "Username" : "Nome utente",
     "Password" : "Password",
     "Storage & database" : "Archiviazione e database",
     "Data folder" : "Cartella dati",
diff --git a/core/l10n/it.json b/core/l10n/it.json
index 599c613828b..59073aafaf2 100644
--- a/core/l10n/it.json
+++ b/core/l10n/it.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "So cosa sto facendo",
-    "Reset password" : "Ripristina la password",
     "Password can not be changed. Please contact your administrator." : "La password non può essere cambiata. Contatta il tuo amministratore.",
     "No" : "No",
     "Yes" : "Sì",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Impossibile inviare l'email di reimpostazione poiché non è presente un indirizzo email per questo nome utente. Contatta il tuo amministratore.",
     "%s password reset" : "Ripristino password di %s",
     "Use the following link to reset your password: {link}" : "Usa il collegamento seguente per ripristinare la password: {link}",
-    "You will receive a link to reset your password via Email." : "Riceverai un collegamento per ripristinare la tua password via email",
-    "Username" : "Nome utente",
-    "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?" : "I 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à ripristinata. Se non sei sicuro, per favore contatta l'amministratore prima di proseguire. Vuoi davvero continuare?",
-    "Yes, I really want to reset my password now" : "Sì, voglio davvero ripristinare la mia password adesso",
-    "Reset" : "Ripristina",
     "New password" : "Nuova password",
     "New Password" : "Nuova password",
+    "Reset password" : "Ripristina la password",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X non è supportato e %s non funzionerà correttamente su questa piattaforma. Usalo a tuo rischio!",
     "For the best results, please consider using a GNU/Linux server instead." : "Per avere il risultato migliore, prendi in considerazione l'utilizzo di un server GNU/Linux.",
     "Personal" : "Personale",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "La cartella dei dati e i file sono probabilmente accessibili da Internet poiché il file .htaccess non funziona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Per informazioni su come configurare correttamente il tuo server, vedi la <a href=\"%s\" target=\"_blank\">documentazione</a>.",
     "Create an <strong>admin account</strong>" : "Crea un <strong>account amministratore</strong>",
+    "Username" : "Nome utente",
     "Password" : "Password",
     "Storage & database" : "Archiviazione e database",
     "Data folder" : "Cartella dati",
diff --git a/core/l10n/ja.js b/core/l10n/ja.js
index bba306dafc6..f6a7aa1f846 100644
--- a/core/l10n/ja.js
+++ b/core/l10n/ja.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
     "I know what I'm doing" : "どういう操作をしているか理解しています",
-    "Reset password" : "パスワードをリセット",
     "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
     "No" : "いいえ",
     "Yes" : "はい",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
     "%s password reset" : "%s パスワードリセット",
     "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
-    "You will receive a link to reset your password via Email." : "メールでパスワードをリセットするリンクが届きます。",
-    "Username" : "ユーザー名",
-    "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?" : "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
-    "Yes, I really want to reset my password now" : "はい、今すぐパスワードをリセットします。",
-    "Reset" : "リセット",
     "New password" : "新しいパスワードを入力",
     "New Password" : "新しいパスワード",
+    "Reset password" : "パスワードをリセット",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
     "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
     "Personal" : "個人",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
     "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
+    "Username" : "ユーザー名",
     "Password" : "パスワード",
     "Storage & database" : "ストレージとデータベース",
     "Data folder" : "データフォルダー",
diff --git a/core/l10n/ja.json b/core/l10n/ja.json
index 706d6bcfc29..c5f1ba49368 100644
--- a/core/l10n/ja.json
+++ b/core/l10n/ja.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "パスワードをリセットする、このリンクをクリックするとメールを送信します。しばらく経ってもメールが届かなかった場合は、スパム/ジャンクフォルダを確認してください。<br>それでも見つからなかった場合は、管理者に問合せてください。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "ファイルが暗号化されています。リカバリーキーが有効でない場合は、パスワードをリセットした後にあなたのデータを元に戻す方法はありません。<br />どういうことか分からない場合は、操作を継続する前に管理者に連絡してください。<br />続けてよろしいでしょうか?",
     "I know what I'm doing" : "どういう操作をしているか理解しています",
-    "Reset password" : "パスワードをリセット",
     "Password can not be changed. Please contact your administrator." : "パスワードは変更できません。管理者に問い合わせてください。",
     "No" : "いいえ",
     "Yes" : "はい",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "このユーザー名に紐付けられたメールアドレスがないため、リセットメールを送信できませんでした。管理者に問い合わせてください。",
     "%s password reset" : "%s パスワードリセット",
     "Use the following link to reset your password: {link}" : "パスワードをリセットするには次のリンクをクリックしてください: {link}",
-    "You will receive a link to reset your password via Email." : "メールでパスワードをリセットするリンクが届きます。",
-    "Username" : "ユーザー名",
-    "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?" : "ファイルが暗号化されています。リカバリキーを有効にしていなかった場合、パスワードをリセットしてからデータを復旧する方法はありません。何をすべきかよくわからないなら、続ける前にまず管理者に連絡しましょう。本当に続けますか？",
-    "Yes, I really want to reset my password now" : "はい、今すぐパスワードをリセットします。",
-    "Reset" : "リセット",
     "New password" : "新しいパスワードを入力",
     "New Password" : "新しいパスワード",
+    "Reset password" : "パスワードをリセット",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X では、サポートされていません。このOSでは、%sは正常に動作しないかもしれません。ご自身の責任においてご利用ください。",
     "For the best results, please consider using a GNU/Linux server instead." : "最も良い方法としては、代わりにGNU/Linuxサーバーを利用することをご検討ください。",
     "Personal" : "個人",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccessファイルが動作していないため、おそらくあなたのデータディレクトリまたはファイルはインターネットからアクセス可能になっています。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "サーバーを適正に設定する情報は、こちらの<a href=\"%s\" target=\"_blank\">ドキュメント</a>を参照してください。",
     "Create an <strong>admin account</strong>" : "<strong>管理者アカウント</strong>を作成してください",
+    "Username" : "ユーザー名",
     "Password" : "パスワード",
     "Storage & database" : "ストレージとデータベース",
     "Data folder" : "データフォルダー",
diff --git a/core/l10n/ka_GE.js b/core/l10n/ka_GE.js
index 699065f6c50..782cd54cf33 100644
--- a/core/l10n/ka_GE.js
+++ b/core/l10n/ka_GE.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "დეკემბერი",
     "Settings" : "პარამეტრები",
     "Saving..." : "შენახვა...",
-    "Reset password" : "პაროლის შეცვლა",
     "No" : "არა",
     "Yes" : "კი",
     "Choose" : "არჩევა",
@@ -65,9 +64,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
     "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
-    "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-    "Username" : "მომხმარებლის სახელი",
     "New password" : "ახალი პაროლი",
+    "Reset password" : "პაროლის შეცვლა",
     "Personal" : "პირადი",
     "Users" : "მომხმარებელი",
     "Apps" : "აპლიკაციები",
@@ -78,6 +76,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
     "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
+    "Username" : "მომხმარებლის სახელი",
     "Password" : "პაროლი",
     "Data folder" : "მონაცემთა საქაღალდე",
     "Configure the database" : "მონაცემთა ბაზის კონფიგურირება",
diff --git a/core/l10n/ka_GE.json b/core/l10n/ka_GE.json
index c7d8d774620..648f71af987 100644
--- a/core/l10n/ka_GE.json
+++ b/core/l10n/ka_GE.json
@@ -20,7 +20,6 @@
     "December" : "დეკემბერი",
     "Settings" : "პარამეტრები",
     "Saving..." : "შენახვა...",
-    "Reset password" : "პაროლის შეცვლა",
     "No" : "არა",
     "Yes" : "კი",
     "Choose" : "არჩევა",
@@ -63,9 +62,8 @@
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "განახლება ვერ განხორციელდა. გადამისამართება თქვენს ownCloud–ზე.",
     "Use the following link to reset your password: {link}" : "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
-    "You will receive a link to reset your password via Email." : "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
-    "Username" : "მომხმარებლის სახელი",
     "New password" : "ახალი პაროლი",
+    "Reset password" : "პაროლის შეცვლა",
     "Personal" : "პირადი",
     "Users" : "მომხმარებელი",
     "Apps" : "აპლიკაციები",
@@ -76,6 +74,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "თქვენი PHP ვერსია შეიცავს საფრთხეს  NULL Byte შეტევებისთვის (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "თქვენი data დირექტორია და ფაილები დაშვებადია ინტერნეტში რადგან  .htaccess ფაილი არ მუშაობს.",
     "Create an <strong>admin account</strong>" : "შექმენი <strong>ადმინ ექაუნტი</strong>",
+    "Username" : "მომხმარებლის სახელი",
     "Password" : "პაროლი",
     "Data folder" : "მონაცემთა საქაღალდე",
     "Configure the database" : "მონაცემთა ბაზის კონფიგურირება",
diff --git a/core/l10n/km.js b/core/l10n/km.js
index 80b25cbe34c..4b23b1f8a2a 100644
--- a/core/l10n/km.js
+++ b/core/l10n/km.js
@@ -24,7 +24,6 @@ OC.L10N.register(
     "December" : "ខែធ្នូ",
     "Settings" : "ការកំណត់",
     "Saving..." : "កំពុង​រក្សាទុក",
-    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "No" : "ទេ",
     "Yes" : "ព្រម",
     "Choose" : "ជ្រើស",
@@ -74,8 +73,8 @@ OC.L10N.register(
     "Add" : "បញ្ចូល",
     "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "Personal" : "ផ្ទាល់​ខ្លួន",
     "Users" : "អ្នកប្រើ",
     "Apps" : "កម្មវិធី",
@@ -84,6 +83,7 @@ OC.L10N.register(
     "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
     "Security Warning" : "បម្រាម​សុវត្ថិភាព",
     "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
     "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
     "Data folder" : "ថត​ទិន្នន័យ",
diff --git a/core/l10n/km.json b/core/l10n/km.json
index 50f693d3620..ccaf0576f2c 100644
--- a/core/l10n/km.json
+++ b/core/l10n/km.json
@@ -22,7 +22,6 @@
     "December" : "ខែធ្នូ",
     "Settings" : "ការកំណត់",
     "Saving..." : "កំពុង​រក្សាទុក",
-    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "No" : "ទេ",
     "Yes" : "ព្រម",
     "Choose" : "ជ្រើស",
@@ -72,8 +71,8 @@
     "Add" : "បញ្ចូល",
     "_download %n file_::_download %n files_" : [""],
     "Please reload the page." : "សូម​ផ្ទុក​ទំព័រ​នេះ​ឡើង​វិញ។",
-    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "New password" : "ពាក្យ​សម្ងាត់​ថ្មី",
+    "Reset password" : "កំណត់​ពាក្យ​សម្ងាត់​ម្ដង​ទៀត",
     "Personal" : "ផ្ទាល់​ខ្លួន",
     "Users" : "អ្នកប្រើ",
     "Apps" : "កម្មវិធី",
@@ -82,6 +81,7 @@
     "Access forbidden" : "បាន​ហាមឃាត់​ការ​ចូល",
     "Security Warning" : "បម្រាម​សុវត្ថិភាព",
     "Create an <strong>admin account</strong>" : "បង្កើត​<strong>គណនី​អភិបាល</strong>",
+    "Username" : "ឈ្មោះ​អ្នកប្រើ",
     "Password" : "ពាក្យសម្ងាត់",
     "Storage & database" : "ឃ្លាំង​ផ្ទុក & មូលដ្ឋាន​ទិន្នន័យ",
     "Data folder" : "ថត​ទិន្នន័យ",
diff --git a/core/l10n/ko.js b/core/l10n/ko.js
index a4c637cec83..91ed8a0fde6 100644
--- a/core/l10n/ko.js
+++ b/core/l10n/ko.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Settings" : "설정",
     "Saving..." : "저장 중...",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
-    "Reset password" : "암호 재설정",
     "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
     "No" : "아니요",
     "Yes" : "예",
@@ -103,13 +102,9 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "%s password reset" : "%s 암호 재설정",
     "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
-    "You will receive a link to reset your password via Email." : "이메일로 암호 재설정 링크를 보냈습니다.",
-    "Username" : "사용자 이름",
-    "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?" : "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?",
-    "Yes, I really want to reset my password now" : "예, 지금 내 암호를 재설정합니다",
-    "Reset" : "재설정",
     "New password" : "새 암호",
     "New Password" : "새 암호",
+    "Reset password" : "암호 재설정",
     "Personal" : "개인",
     "Users" : "사용자",
     "Apps" : "앱",
@@ -132,6 +127,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
     "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
+    "Username" : "사용자 이름",
     "Password" : "암호",
     "Storage & database" : "스토리지 & 데이터베이스",
     "Data folder" : "데이터 폴더",
diff --git a/core/l10n/ko.json b/core/l10n/ko.json
index b068150f590..769bc98315b 100644
--- a/core/l10n/ko.json
+++ b/core/l10n/ko.json
@@ -30,7 +30,6 @@
     "Settings" : "설정",
     "Saving..." : "저장 중...",
     "Couldn't send reset email. Please contact your administrator." : "재설정 메일을 보낼수 없습니다. 관리자에게 문의하십시오.",
-    "Reset password" : "암호 재설정",
     "Password can not be changed. Please contact your administrator." : "비밀번호를 변경할수 없습니다. 관리자에게 문의하십시오.",
     "No" : "아니요",
     "Yes" : "예",
@@ -101,13 +100,9 @@
     "The update was successful. Redirecting you to ownCloud now." : "업데이트가 성공하였습니다. ownCloud로 돌아갑니다.",
     "%s password reset" : "%s 암호 재설정",
     "Use the following link to reset your password: {link}" : "다음 링크를 사용하여 암호를 재설정할 수 있습니다: {link}",
-    "You will receive a link to reset your password via Email." : "이메일로 암호 재설정 링크를 보냈습니다.",
-    "Username" : "사용자 이름",
-    "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?" : "저장된 파일은 암호화되어 있습니다. 복구 키를 활성화하지 않았다면 암호를 초기화한 후 데이터를 복구할 수 없습니다. 무엇을 해야 할 지 모르겠으면 진행하기 전에 시스템 관리자에게 연락하십시오. 계속 진행하시겠습니까?",
-    "Yes, I really want to reset my password now" : "예, 지금 내 암호를 재설정합니다",
-    "Reset" : "재설정",
     "New password" : "새 암호",
     "New Password" : "새 암호",
+    "Reset password" : "암호 재설정",
     "Personal" : "개인",
     "Users" : "사용자",
     "Apps" : "앱",
@@ -130,6 +125,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : ".htaccess 파일이 처리되지 않아서 데이터 디렉터리와 파일을 인터넷에서 접근할 수 없을 수도 있습니다.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "올바른 서버 설정을 위한 정보는 <a href=\"%s\" target=\"_blank\">문서</a>를 참조하십시오.",
     "Create an <strong>admin account</strong>" : "<strong>관리자 계정</strong> 만들기",
+    "Username" : "사용자 이름",
     "Password" : "암호",
     "Storage & database" : "스토리지 & 데이터베이스",
     "Data folder" : "데이터 폴더",
diff --git a/core/l10n/ku_IQ.js b/core/l10n/ku_IQ.js
index 7f249580986..1c780a6a019 100644
--- a/core/l10n/ku_IQ.js
+++ b/core/l10n/ku_IQ.js
@@ -3,7 +3,6 @@ OC.L10N.register(
     {
     "Settings" : "ده‌ستكاری",
     "Saving..." : "پاشکه‌وتده‌کات...",
-    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "No" : "نەخێر",
     "Yes" : "بەڵێ",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
@@ -13,12 +12,13 @@ OC.L10N.register(
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ناوی به‌کارهێنه‌ر",
     "New password" : "وشەی نهێنی نوێ",
+    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "Users" : "به‌كارهێنه‌ر",
     "Apps" : "به‌رنامه‌كان",
     "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
     "Help" : "یارمەتی",
+    "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
     "Data folder" : "زانیاری فۆڵده‌ر",
     "Database user" : "به‌كارهێنه‌ری داتابه‌یس",
diff --git a/core/l10n/ku_IQ.json b/core/l10n/ku_IQ.json
index 2772a2895a2..3dcea4b4fa2 100644
--- a/core/l10n/ku_IQ.json
+++ b/core/l10n/ku_IQ.json
@@ -1,7 +1,6 @@
 { "translations": {
     "Settings" : "ده‌ستكاری",
     "Saving..." : "پاشکه‌وتده‌کات...",
-    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "No" : "نەخێر",
     "Yes" : "بەڵێ",
     "_{count} file conflict_::_{count} file conflicts_" : ["",""],
@@ -11,12 +10,13 @@
     "Warning" : "ئاگاداری",
     "Add" : "زیادکردن",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ناوی به‌کارهێنه‌ر",
     "New password" : "وشەی نهێنی نوێ",
+    "Reset password" : "دووباره‌ كردنه‌وه‌ی وشه‌ی نهێنی",
     "Users" : "به‌كارهێنه‌ر",
     "Apps" : "به‌رنامه‌كان",
     "Admin" : "به‌ڕێوه‌به‌ری سه‌ره‌كی",
     "Help" : "یارمەتی",
+    "Username" : "ناوی به‌کارهێنه‌ر",
     "Password" : "وشەی تێپەربو",
     "Data folder" : "زانیاری فۆڵده‌ر",
     "Database user" : "به‌كارهێنه‌ری داتابه‌یس",
diff --git a/core/l10n/lb.js b/core/l10n/lb.js
index 90ceb4cd8b8..cb918f1e87e 100644
--- a/core/l10n/lb.js
+++ b/core/l10n/lb.js
@@ -28,7 +28,6 @@ OC.L10N.register(
     "December" : "Dezember",
     "Settings" : "Astellungen",
     "Saving..." : "Speicheren...",
-    "Reset password" : "Passwuert zréck setzen",
     "No" : "Nee",
     "Yes" : "Jo",
     "Choose" : "Auswielen",
@@ -80,12 +79,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
     "%s password reset" : "%s Passwuert ass nei gesat",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
-    "Username" : "Benotzernumm",
-    "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?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
-    "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen",
-    "Reset" : "Zeréck setzen",
     "New password" : "Neit Passwuert",
+    "Reset password" : "Passwuert zréck setzen",
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
     "Apps" : "Applikatiounen",
@@ -100,6 +95,7 @@ OC.L10N.register(
     "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
     "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
+    "Username" : "Benotzernumm",
     "Password" : "Passwuert",
     "Data folder" : "Daten-Dossier",
     "Configure the database" : "D'Datebank konfiguréieren",
diff --git a/core/l10n/lb.json b/core/l10n/lb.json
index 9a1be1e4dd9..f20d81a44cf 100644
--- a/core/l10n/lb.json
+++ b/core/l10n/lb.json
@@ -26,7 +26,6 @@
     "December" : "Dezember",
     "Settings" : "Astellungen",
     "Saving..." : "Speicheren...",
-    "Reset password" : "Passwuert zréck setzen",
     "No" : "Nee",
     "Yes" : "Jo",
     "Choose" : "Auswielen",
@@ -78,12 +77,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Den Update war erfollegräich.  Du gëss elo bei d'ownCloud ëmgeleet.",
     "%s password reset" : "%s Passwuert ass nei gesat",
     "Use the following link to reset your password: {link}" : "Benotz folgende Link fir däi Passwuert zréckzesetzen: {link}",
-    "You will receive a link to reset your password via Email." : "Du kriss e Link fir däi Passwuert zréckzesetze via Email geschéckt.",
-    "Username" : "Benotzernumm",
-    "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?" : "Deng Fichiere si verschlësselt. Falls du de Recuperatiouns-Schlëssel net aktivéiert hues, gëtt et keng Méiglechkeet nees un deng Daten ze komme wann däi Passwuert muss zréckgesat ginn. Falls du net sécher bass wat s de maache soll, kontaktéier w.e.gl däin Administrateur bevir s de weidermëss. Wëlls de wierklech weidermaachen?",
-    "Yes, I really want to reset my password now" : "Jo, ech wëll mäi Passwuert elo zrécksetzen",
-    "Reset" : "Zeréck setzen",
     "New password" : "Neit Passwuert",
+    "Reset password" : "Passwuert zréck setzen",
     "Personal" : "Perséinlech",
     "Users" : "Benotzer",
     "Apps" : "Applikatiounen",
@@ -98,6 +93,7 @@
     "Please update your PHP installation to use %s securely." : "Aktualiséier w.e.gl deng PHP-Installatioun fir %s sécher kennen ze benotzen.",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Däin Daten-Dossier an deng Fichieren si wahrscheinlech iwwert den Internet accessibel well den .htaccess-Fichier net funktionnéiert.",
     "Create an <strong>admin account</strong>" : "En <strong>Admin-Account</strong> uleeën",
+    "Username" : "Benotzernumm",
     "Password" : "Passwuert",
     "Data folder" : "Daten-Dossier",
     "Configure the database" : "D'Datebank konfiguréieren",
diff --git a/core/l10n/lt_LT.js b/core/l10n/lt_LT.js
index e3796940fbe..5f7f1e3e4e1 100644
--- a/core/l10n/lt_LT.js
+++ b/core/l10n/lt_LT.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "December" : "Gruodis",
     "Settings" : "Nustatymai",
     "Saving..." : "Saugoma...",
-    "Reset password" : "Atkurti slaptažodį",
     "No" : "Ne",
     "Yes" : "Taip",
     "Choose" : "Pasirinkite",
@@ -94,12 +93,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
     "%s password reset" : "%s slaptažodžio atnaujinimas",
     "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
-    "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
-    "Username" : "Prisijungimo vardas",
-    "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?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
-    "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį",
-    "Reset" : "Atstatyti",
     "New password" : "Naujas slaptažodis",
+    "Reset password" : "Atkurti slaptažodį",
     "Personal" : "Asmeniniai",
     "Users" : "Vartotojai",
     "Apps" : "Programos",
@@ -122,6 +117,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
     "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
+    "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
     "Data folder" : "Duomenų katalogas",
     "Configure the database" : "Nustatyti duomenų bazę",
diff --git a/core/l10n/lt_LT.json b/core/l10n/lt_LT.json
index a70b966aae2..781373ec76e 100644
--- a/core/l10n/lt_LT.json
+++ b/core/l10n/lt_LT.json
@@ -29,7 +29,6 @@
     "December" : "Gruodis",
     "Settings" : "Nustatymai",
     "Saving..." : "Saugoma...",
-    "Reset password" : "Atkurti slaptažodį",
     "No" : "Ne",
     "Yes" : "Taip",
     "Choose" : "Pasirinkite",
@@ -92,12 +91,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Atnaujinimas buvo sėkmingas. Nukreipiame į jūsų ownCloud.",
     "%s password reset" : "%s slaptažodžio atnaujinimas",
     "Use the following link to reset your password: {link}" : "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
-    "You will receive a link to reset your password via Email." : "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
-    "Username" : "Prisijungimo vardas",
-    "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?" : "Jūsų failai yra užšifruoti. Jei neįjungėte atstatymo rakto, nebus galimybės atstatyti duomenų po slaptažodžio atstatymo. Jei nesate tikri ką daryti, prašome susisiekti su administratoriumi prie tęsiant. Ar tikrai tęsti?",
-    "Yes, I really want to reset my password now" : "Taip, aš tikrai noriu atnaujinti slaptažodį",
-    "Reset" : "Atstatyti",
     "New password" : "Naujas slaptažodis",
+    "Reset password" : "Atkurti slaptažodį",
     "Personal" : "Asmeniniai",
     "Users" : "Vartotojai",
     "Apps" : "Programos",
@@ -120,6 +115,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Jūsų failai yra tikriausiai prieinami per internetą nes .htaccess failas neveikia.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Kad gauti informaciją apie tai kaip tinkamai sukonfigūruoti savo serverį, prašome skaityti <a href=\"%s\" target=\"_blank\">dokumentaciją</a>.",
     "Create an <strong>admin account</strong>" : "Sukurti <strong>administratoriaus paskyrą</strong>",
+    "Username" : "Prisijungimo vardas",
     "Password" : "Slaptažodis",
     "Data folder" : "Duomenų katalogas",
     "Configure the database" : "Nustatyti duomenų bazę",
diff --git a/core/l10n/lv.js b/core/l10n/lv.js
index 16bb3007e4c..e71b24a060e 100644
--- a/core/l10n/lv.js
+++ b/core/l10n/lv.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Decembris",
     "Settings" : "Iestatījumi",
     "Saving..." : "Saglabā...",
-    "Reset password" : "Mainīt paroli",
     "No" : "Nē",
     "Yes" : "Jā",
     "Choose" : "Izvēlieties",
@@ -68,11 +67,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
     "%s password reset" : "%s paroles maiņa",
     "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
-    "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-    "Username" : "Lietotājvārds",
-    "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?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
-    "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli",
     "New password" : "Jauna parole",
+    "Reset password" : "Mainīt paroli",
     "Personal" : "Personīgi",
     "Users" : "Lietotāji",
     "Apps" : "Lietotnes",
@@ -85,6 +81,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
     "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Username" : "Lietotājvārds",
     "Password" : "Parole",
     "Data folder" : "Datu mape",
     "Configure the database" : "Konfigurēt datubāzi",
diff --git a/core/l10n/lv.json b/core/l10n/lv.json
index afeb3f82a17..684c659d844 100644
--- a/core/l10n/lv.json
+++ b/core/l10n/lv.json
@@ -20,7 +20,6 @@
     "December" : "Decembris",
     "Settings" : "Iestatījumi",
     "Saving..." : "Saglabā...",
-    "Reset password" : "Mainīt paroli",
     "No" : "Nē",
     "Yes" : "Jā",
     "Choose" : "Izvēlieties",
@@ -66,11 +65,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Atjaunināšana beidzās sekmīgi. Tagad pārsūta jūs uz ownCloud.",
     "%s password reset" : "%s paroles maiņa",
     "Use the following link to reset your password: {link}" : "Izmantojiet šo saiti, lai mainītu paroli: {link}",
-    "You will receive a link to reset your password via Email." : "Jūs savā epastā saņemsiet interneta saiti, caur kuru varēsiet atjaunot paroli.",
-    "Username" : "Lietotājvārds",
-    "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?" : "Jūsu faili ir šifrēti. Ja nav iespējota atgūšanas kods, tad nebūs iespēja atjaunot jūsu failus pēc tam kad tiks mainīta parole. ja neesat pārliecināts kā rīkoties, jautājiet administratoram. Vai tiešam vēlaties turpināt?",
-    "Yes, I really want to reset my password now" : "Jā, Es tiešām vēlos mainīt savu paroli",
     "New password" : "Jauna parole",
+    "Reset password" : "Mainīt paroli",
     "Personal" : "Personīgi",
     "Users" : "Lietotāji",
     "Apps" : "Lietotnes",
@@ -83,6 +79,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Visticamāk, jūsu datu direktorija un datnes ir pieejamas no interneta, jo .htaccess datne nedarbojas.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Vairāk informācijai kā konfigurēt serveri, lūdzu skatiet <a href=\"%s\" target=\"_blank\">dokumentāciju</a>.",
     "Create an <strong>admin account</strong>" : "Izveidot <strong>administratora kontu</strong>",
+    "Username" : "Lietotājvārds",
     "Password" : "Parole",
     "Data folder" : "Datu mape",
     "Configure the database" : "Konfigurēt datubāzi",
diff --git a/core/l10n/mk.js b/core/l10n/mk.js
index 0b1e993a8f4..20ad24d1e38 100644
--- a/core/l10n/mk.js
+++ b/core/l10n/mk.js
@@ -28,7 +28,6 @@ OC.L10N.register(
     "December" : "Декември",
     "Settings" : "Подесувања",
     "Saving..." : "Снимам...",
-    "Reset password" : "Ресетирај лозинка",
     "No" : "Не",
     "Yes" : "Да",
     "Choose" : "Избери",
@@ -86,11 +85,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
     "%s password reset" : "%s ресетирање на лозинката",
     "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
-    "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-    "Username" : "Корисничко име",
-    "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка",
-    "Reset" : "Поништи",
     "New password" : "Нова лозинка",
+    "Reset password" : "Ресетирај лозинка",
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Аппликации",
@@ -109,6 +105,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
     "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
     "Data folder" : "Фолдер со податоци",
     "Configure the database" : "Конфигурирај ја базата",
diff --git a/core/l10n/mk.json b/core/l10n/mk.json
index 2da6b74e601..19fbf344532 100644
--- a/core/l10n/mk.json
+++ b/core/l10n/mk.json
@@ -26,7 +26,6 @@
     "December" : "Декември",
     "Settings" : "Подесувања",
     "Saving..." : "Снимам...",
-    "Reset password" : "Ресетирај лозинка",
     "No" : "Не",
     "Yes" : "Да",
     "Choose" : "Избери",
@@ -84,11 +83,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Надградбата беше успешна. Веднаш ве префрлам на вашиот ownCloud.",
     "%s password reset" : "%s ресетирање на лозинката",
     "Use the following link to reset your password: {link}" : "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}",
-    "You will receive a link to reset your password via Email." : "Ќе добиете врска по е-пошта за да може да ја ресетирате Вашата лозинка.",
-    "Username" : "Корисничко име",
-    "Yes, I really want to reset my password now" : "Да, јас сега навистина сакам да ја поништам својата лозинка",
-    "Reset" : "Поништи",
     "New password" : "Нова лозинка",
+    "Reset password" : "Ресетирај лозинка",
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Аппликации",
@@ -107,6 +103,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Вашата верзија на PHP е ранлива на NULL Byte attack (CVE-2006-7243)",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Вашиот директориум со податоци и датотеки се веројатно достапни преку интенернт поради што .htaccess датотеката не функционира.",
     "Create an <strong>admin account</strong>" : "Направете <strong>администраторска сметка</strong>",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
     "Data folder" : "Фолдер со податоци",
     "Configure the database" : "Конфигурирај ја базата",
diff --git a/core/l10n/ms_MY.js b/core/l10n/ms_MY.js
index 612641fe748..7bf41489825 100644
--- a/core/l10n/ms_MY.js
+++ b/core/l10n/ms_MY.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Disember",
     "Settings" : "Tetapan",
     "Saving..." : "Simpan...",
-    "Reset password" : "Penetapan semula kata laluan",
     "No" : "Tidak",
     "Yes" : "Ya",
     "Ok" : "Ok",
@@ -38,9 +37,8 @@ OC.L10N.register(
     "Add" : "Tambah",
     "_download %n file_::_download %n files_" : [""],
     "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
-    "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
-    "Username" : "Nama pengguna",
     "New password" : "Kata laluan baru",
+    "Reset password" : "Penetapan semula kata laluan",
     "Personal" : "Peribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
@@ -49,6 +47,7 @@ OC.L10N.register(
     "Access forbidden" : "Larangan akses",
     "Security Warning" : "Amaran keselamatan",
     "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
+    "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
     "Data folder" : "Fail data",
     "Configure the database" : "Konfigurasi pangkalan data",
diff --git a/core/l10n/ms_MY.json b/core/l10n/ms_MY.json
index c1323607c8c..3f23b40e847 100644
--- a/core/l10n/ms_MY.json
+++ b/core/l10n/ms_MY.json
@@ -20,7 +20,6 @@
     "December" : "Disember",
     "Settings" : "Tetapan",
     "Saving..." : "Simpan...",
-    "Reset password" : "Penetapan semula kata laluan",
     "No" : "Tidak",
     "Yes" : "Ya",
     "Ok" : "Ok",
@@ -36,9 +35,8 @@
     "Add" : "Tambah",
     "_download %n file_::_download %n files_" : [""],
     "Use the following link to reset your password: {link}" : "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}",
-    "You will receive a link to reset your password via Email." : "Anda akan menerima pautan untuk menetapkan semula kata laluan anda melalui emel",
-    "Username" : "Nama pengguna",
     "New password" : "Kata laluan baru",
+    "Reset password" : "Penetapan semula kata laluan",
     "Personal" : "Peribadi",
     "Users" : "Pengguna",
     "Apps" : "Aplikasi",
@@ -47,6 +45,7 @@
     "Access forbidden" : "Larangan akses",
     "Security Warning" : "Amaran keselamatan",
     "Create an <strong>admin account</strong>" : "buat <strong>akaun admin</strong>",
+    "Username" : "Nama pengguna",
     "Password" : "Kata laluan",
     "Data folder" : "Fail data",
     "Configure the database" : "Konfigurasi pangkalan data",
diff --git a/core/l10n/my_MM.js b/core/l10n/my_MM.js
index ff87f52a5e2..4865ebd319e 100644
--- a/core/l10n/my_MM.js
+++ b/core/l10n/my_MM.js
@@ -28,8 +28,6 @@ OC.L10N.register(
     "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
     "_download %n file_::_download %n files_" : [""],
-    "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
-    "Username" : "သုံးစွဲသူအမည်",
     "New password" : "စကားဝှက်အသစ်",
     "Users" : "သုံးစွဲသူ",
     "Apps" : "Apps",
@@ -37,6 +35,7 @@ OC.L10N.register(
     "Help" : "အကူအညီ",
     "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
     "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+    "Username" : "သုံးစွဲသူအမည်",
     "Password" : "စကားဝှက်",
     "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
     "Database user" : "Database သုံးစွဲသူ",
diff --git a/core/l10n/my_MM.json b/core/l10n/my_MM.json
index 086e14cdad0..fd30a3df74b 100644
--- a/core/l10n/my_MM.json
+++ b/core/l10n/my_MM.json
@@ -26,8 +26,6 @@
     "Password protected" : "စကားဝှက်ဖြင့်ကာကွယ်ထားသည်",
     "Add" : "ပေါင်းထည့်",
     "_download %n file_::_download %n files_" : [""],
-    "You will receive a link to reset your password via Email." : "အီးမေးလ်မှတစ်ဆင့် သင်၏စကားဝှက်ကို ပြန်ဖော်ရန်အတွက် Link တစ်ခုလက်ခံရရှိပါလိမ့်မယ်။",
-    "Username" : "သုံးစွဲသူအမည်",
     "New password" : "စကားဝှက်အသစ်",
     "Users" : "သုံးစွဲသူ",
     "Apps" : "Apps",
@@ -35,6 +33,7 @@
     "Help" : "အကူအညီ",
     "Security Warning" : "လုံခြုံရေးသတိပေးချက်",
     "Create an <strong>admin account</strong>" : "<strong>အက်ဒမင်အကောင့်</strong>တစ်ခုဖန်တီးမည်",
+    "Username" : "သုံးစွဲသူအမည်",
     "Password" : "စကားဝှက်",
     "Data folder" : "အချက်အလက်ဖိုလ်ဒါလ်",
     "Database user" : "Database သုံးစွဲသူ",
diff --git a/core/l10n/nb_NO.js b/core/l10n/nb_NO.js
index a033c38aa77..5bb81e3f7a1 100644
--- a/core/l10n/nb_NO.js
+++ b/core/l10n/nb_NO.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
     "I know what I'm doing" : "Jeg vet hva jeg gjør",
-    "Reset password" : "Tilbakestill passord",
     "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
     "No" : "Nei",
     "Yes" : "Ja",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "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",
     "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
-    "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
-    "Username" : "Brukernavn",
-    "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?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
-    "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
-    "Reset" : "Tilbakestill",
     "New password" : "Nytt passord",
     "New Password" : "Nytt passord",
+    "Reset password" : "Tilbakestill passord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
     "Personal" : "Personlig",
@@ -165,6 +160,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
     "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
+    "Username" : "Brukernavn",
     "Password" : "Passord",
     "Storage & database" : "Lagring og database",
     "Data folder" : "Datamappe",
diff --git a/core/l10n/nb_NO.json b/core/l10n/nb_NO.json
index 9ad2c468000..14c4ce0de01 100644
--- a/core/l10n/nb_NO.json
+++ b/core/l10n/nb_NO.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Lenken for tilbakestilling av passordet ditt er sendt til din e-postadresse. Hvis du ikke mottar den innen rimelig tid, sjekk mappen for søppelpost.<br>Hvis du ikke finner den der, kontakt din lokale administrator.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at pasordet ditt er tilbakestilt.<br />Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. <br />Vil du virkelig fortsette?",
     "I know what I'm doing" : "Jeg vet hva jeg gjør",
-    "Reset password" : "Tilbakestill passord",
     "Password can not be changed. Please contact your administrator." : "Passordet kan ikke endres. Kontakt administratoren din.",
     "No" : "Nei",
     "Yes" : "Ja",
@@ -118,13 +117,9 @@
     "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",
     "Use the following link to reset your password: {link}" : "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
-    "You will receive a link to reset your password via Email." : "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
-    "Username" : "Brukernavn",
-    "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?" : "Filene dine er kryptert. Hvis du ikke har aktivert gjenopprettingsnøkkelen, vil det være helt umulig å få tilbake dataene dine etter at passordet ditt er tilbakestilt. Hvis du er usikker på hva du skal gjøre, kontakt administratoren din før du fortsetter. Vil du virkelig fortsette?",
-    "Yes, I really want to reset my password now" : "Ja, jeg vil virkelig tilbakestille passordet mitt nå",
-    "Reset" : "Tilbakestill",
     "New password" : "Nytt passord",
     "New Password" : "Nytt passord",
+    "Reset password" : "Tilbakestill passord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X støttes ikke og %s vil ikke fungere korrekt på denne plattformen. Bruk på egen risiko!",
     "For the best results, please consider using a GNU/Linux server instead." : "For beste resultat, vurder å bruke en GNU/Linux-server i stedet.",
     "Personal" : "Personlig",
@@ -163,6 +158,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappen og filene dine er sannsynligvis tilgjengelig fra Internett fordi .htaccess-filen ikke fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "For informasjon om hvordan du setter opp serveren din riktig, se <a href=\"%s\" target=\"_blank\">dokumentasjonen</a>.",
     "Create an <strong>admin account</strong>" : "Opprett en <strong>administrator-konto</strong>",
+    "Username" : "Brukernavn",
     "Password" : "Passord",
     "Storage & database" : "Lagring og database",
     "Data folder" : "Datamappe",
diff --git a/core/l10n/nl.js b/core/l10n/nl.js
index 011b04fd790..a3def91c894 100644
--- a/core/l10n/nl.js
+++ b/core/l10n/nl.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Ik weet wat ik doe",
-    "Reset password" : "Reset wachtwoord",
     "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
     "No" : "Nee",
     "Yes" : "Ja",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "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",
     "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
-    "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
-    "Username" : "Gebruikersnaam",
-    "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?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
-    "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten",
-    "Reset" : "Reset",
     "New password" : "Nieuw wachtwoord",
     "New Password" : "Nieuw wachtwoord",
+    "Reset password" : "Reset wachtwoord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
     "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
     "Personal" : "Persoonlijk",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
     "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wachtwoord",
     "Storage & database" : "Opslag & database",
     "Data folder" : "Gegevensmap",
diff --git a/core/l10n/nl.json b/core/l10n/nl.json
index b59c04e73ff..6a5e2dccab3 100644
--- a/core/l10n/nl.json
+++ b/core/l10n/nl.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Ik weet wat ik doe",
-    "Reset password" : "Reset wachtwoord",
     "Password can not be changed. Please contact your administrator." : "Het wachtwoord kan niet worden gewijzigd. Neem contact op met uw beheerder.",
     "No" : "Nee",
     "Yes" : "Ja",
@@ -122,13 +121,9 @@
     "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",
     "Use the following link to reset your password: {link}" : "Gebruik de volgende link om uw wachtwoord te resetten: {link}",
-    "You will receive a link to reset your password via Email." : "U ontvangt een link om uw wachtwoord opnieuw in te stellen via e-mail.",
-    "Username" : "Gebruikersnaam",
-    "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?" : "Uw bestanden zijn versleuteld. Als u geen recoverykey hebt ingeschakeld is er geen manier om uw data terug te krijgen na het resetten van uw wachtwoord.\nAls u niet weet wat u moet doen, neem dan alstublieft contact op met uw systeembeheerder voordat u doorgaat.\nWil u echt doorgaan?",
-    "Yes, I really want to reset my password now" : "Ja, ik wil mijn wachtwoord nu echt resetten",
-    "Reset" : "Reset",
     "New password" : "Nieuw wachtwoord",
     "New Password" : "Nieuw wachtwoord",
+    "Reset password" : "Reset wachtwoord",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OSX wordt niet ondersteund en %s zal niet goed werken op dit platform. Gebruik het op uw eigen risico!",
     "For the best results, please consider using a GNU/Linux server instead." : "Voor het beste resultaat adviseren wij het gebruik van een GNU/Linux server.",
     "Personal" : "Persoonlijk",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Uw gegevensdirectory en bestanden zijn vermoedelijk bereikbaar vanaf het internet omdat het .htaccess-bestand niet functioneert.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Bekijk de <a href=\"%s\" target=\"_blank\">documentatie</a> voor Informatie over het correct configureren van uw server.",
     "Create an <strong>admin account</strong>" : "Maak een <strong>beheerdersaccount</strong> aan",
+    "Username" : "Gebruikersnaam",
     "Password" : "Wachtwoord",
     "Storage & database" : "Opslag & database",
     "Data folder" : "Gegevensmap",
diff --git a/core/l10n/nn_NO.js b/core/l10n/nn_NO.js
index d6ba6612f0e..2dccb25d657 100644
--- a/core/l10n/nn_NO.js
+++ b/core/l10n/nn_NO.js
@@ -32,7 +32,6 @@ OC.L10N.register(
     "Settings" : "Innstillingar",
     "Saving..." : "Lagrar …",
     "I know what I'm doing" : "Eg veit kva eg gjer",
-    "Reset password" : "Nullstill passord",
     "No" : "Nei",
     "Yes" : "Ja",
     "Choose" : "Vel",
@@ -91,11 +90,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
     "%s password reset" : "%s passordnullstilling",
     "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
-    "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
-    "Username" : "Brukarnamn",
-    "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?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
-    "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no",
     "New password" : "Nytt passord",
+    "Reset password" : "Nullstill passord",
     "Personal" : "Personleg",
     "Users" : "Brukarar",
     "Apps" : "Program",
@@ -108,6 +104,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
     "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
+    "Username" : "Brukarnamn",
     "Password" : "Passord",
     "Data folder" : "Datamappe",
     "Configure the database" : "Set opp databasen",
diff --git a/core/l10n/nn_NO.json b/core/l10n/nn_NO.json
index 7c1bbc858f4..25151b7f68e 100644
--- a/core/l10n/nn_NO.json
+++ b/core/l10n/nn_NO.json
@@ -30,7 +30,6 @@
     "Settings" : "Innstillingar",
     "Saving..." : "Lagrar …",
     "I know what I'm doing" : "Eg veit kva eg gjer",
-    "Reset password" : "Nullstill passord",
     "No" : "Nei",
     "Yes" : "Ja",
     "Choose" : "Vel",
@@ -89,11 +88,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Oppdateringa er fullført. Sender deg vidare til ownCloud no.",
     "%s password reset" : "%s passordnullstilling",
     "Use the following link to reset your password: {link}" : "Klikk følgjande lenkje til å nullstilla passordet ditt: {link}",
-    "You will receive a link to reset your password via Email." : "Du vil få ein e-post med ei lenkje for å nullstilla passordet.",
-    "Username" : "Brukarnamn",
-    "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?" : "Filene dine er krypterte. Viss du ikkje har skrudd på gjenopprettingsnøkkelen, finst det ingen måte å få tilbake dataa dine når passordet ditt er nullstilt. Viss du ikkje er sikker på kva du skal gjera bør du spørja administratoren din før du går vidare. Vil du verkeleg fortsetja?",
-    "Yes, I really want to reset my password now" : "Ja, eg vil nullstilla passordet mitt no",
     "New password" : "Nytt passord",
+    "Reset password" : "Nullstill passord",
     "Personal" : "Personleg",
     "Users" : "Brukarar",
     "Apps" : "Program",
@@ -106,6 +102,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Datamappa og filene dine er sannsynlegvis tilgjengelege frå Internett sidan .htaccess-fila ikkje fungerer.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Ver venleg og les <a href=\"%s\" target=\"_blank\">dokumentasjonen</a> for meir informasjon om korleis du konfigurerer tenaren din.",
     "Create an <strong>admin account</strong>" : "Lag ein <strong>admin-konto</strong>",
+    "Username" : "Brukarnamn",
     "Password" : "Passord",
     "Data folder" : "Datamappe",
     "Configure the database" : "Set opp databasen",
diff --git a/core/l10n/oc.js b/core/l10n/oc.js
index 43fee792602..eae84339932 100644
--- a/core/l10n/oc.js
+++ b/core/l10n/oc.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Decembre",
     "Settings" : "Configuracion",
     "Saving..." : "Enregistra...",
-    "Reset password" : "Senhal tornat botar",
     "No" : "Non",
     "Yes" : "Òc",
     "Choose" : "Causís",
@@ -52,9 +51,8 @@ OC.L10N.register(
     "Add" : "Ajusta",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
-    "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-    "Username" : "Non d'usancièr",
     "New password" : "Senhal novèl",
+    "Reset password" : "Senhal tornat botar",
     "Personal" : "Personal",
     "Users" : "Usancièrs",
     "Apps" : "Apps",
@@ -63,6 +61,7 @@ OC.L10N.register(
     "Access forbidden" : "Acces enebit",
     "Security Warning" : "Avertiment de securitat",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
+    "Username" : "Non d'usancièr",
     "Password" : "Senhal",
     "Data folder" : "Dorsièr de donadas",
     "Configure the database" : "Configura la basa de donadas",
diff --git a/core/l10n/oc.json b/core/l10n/oc.json
index c2068151419..3b26135470a 100644
--- a/core/l10n/oc.json
+++ b/core/l10n/oc.json
@@ -20,7 +20,6 @@
     "December" : "Decembre",
     "Settings" : "Configuracion",
     "Saving..." : "Enregistra...",
-    "Reset password" : "Senhal tornat botar",
     "No" : "Non",
     "Yes" : "Òc",
     "Choose" : "Causís",
@@ -50,9 +49,8 @@
     "Add" : "Ajusta",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "Utiliza lo ligam seguent per tornar botar lo senhal : {link}",
-    "You will receive a link to reset your password via Email." : "Reçaupràs un ligam per tornar botar ton senhal via corrièl.",
-    "Username" : "Non d'usancièr",
     "New password" : "Senhal novèl",
+    "Reset password" : "Senhal tornat botar",
     "Personal" : "Personal",
     "Users" : "Usancièrs",
     "Apps" : "Apps",
@@ -61,6 +59,7 @@
     "Access forbidden" : "Acces enebit",
     "Security Warning" : "Avertiment de securitat",
     "Create an <strong>admin account</strong>" : "Crea un <strong>compte admin</strong>",
+    "Username" : "Non d'usancièr",
     "Password" : "Senhal",
     "Data folder" : "Dorsièr de donadas",
     "Configure the database" : "Configura la basa de donadas",
diff --git a/core/l10n/pa.js b/core/l10n/pa.js
index 63933496c0c..c4cc7222434 100644
--- a/core/l10n/pa.js
+++ b/core/l10n/pa.js
@@ -34,8 +34,8 @@ OC.L10N.register(
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Password" : "ਪਾਸਵਰ"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/pa.json b/core/l10n/pa.json
index 6b1259ba9cc..c46d4a37b42 100644
--- a/core/l10n/pa.json
+++ b/core/l10n/pa.json
@@ -32,8 +32,8 @@
     "Warning" : "ਚੇਤਾਵਨੀ",
     "Delete" : "ਹਟਾਓ",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Security Warning" : "ਸੁਰੱਖਿਆ ਚੇਤਾਵਨੀ",
+    "Username" : "ਯੂਜ਼ਰ-ਨਾਂ",
     "Password" : "ਪਾਸਵਰ"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/core/l10n/pl.js b/core/l10n/pl.js
index 57b18d457c3..35d7faeabf4 100644
--- a/core/l10n/pl.js
+++ b/core/l10n/pl.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
     "I know what I'm doing" : "Wiem co robię",
-    "Reset password" : "Zresetuj hasło",
     "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
     "No" : "Nie",
     "Yes" : "Tak",
@@ -119,13 +118,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
     "%s password reset" : "%s reset hasła",
     "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}",
-    "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
-    "Username" : "Nazwa użytkownika",
-    "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?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
-    "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz",
-    "Reset" : "Resetuj",
     "New password" : "Nowe hasło",
     "New Password" : "Nowe hasło",
+    "Reset password" : "Zresetuj hasło",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
     "Personal" : "Osobiste",
@@ -164,6 +159,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
     "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
+    "Username" : "Nazwa użytkownika",
     "Password" : "Hasło",
     "Storage & database" : "Zasoby dysku & baza danych",
     "Data folder" : "Katalog danych",
diff --git a/core/l10n/pl.json b/core/l10n/pl.json
index f6c0615fc4e..7ee07cc66af 100644
--- a/core/l10n/pl.json
+++ b/core/l10n/pl.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Link do zresetowanego hasła, został wysłany na twój adres e-mail. Jeśli nie dostałeś wiadomości w rozsądnym czasie, sprawdź folder ze spamem.<br> Jeśli nie ma wiadomości w tym folderze, skontaktuj się ze swoim administratorem.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Twoje pliki są zaszyfrowane. Jeśli nie włączyłeś klucza odzyskiwania, nie będzie możliwości odszyfrowania tych plików po zresetowaniu hasła.<br>Jeśli nie jesteś pewien co zrobić, skontaktuj się ze swoim administratorem, zanim bedziesz kontynuował. <br/> Czy chcesz kontynuować?\n ",
     "I know what I'm doing" : "Wiem co robię",
-    "Reset password" : "Zresetuj hasło",
     "Password can not be changed. Please contact your administrator." : "Hasło nie może zostać zmienione. Skontaktuj się z administratorem.",
     "No" : "Nie",
     "Yes" : "Tak",
@@ -117,13 +116,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nie mogę wysłać maila resetującego. Sprawdź czy nazwa użytkownika  lub adres email jest poprawny. Skontaktuj się z administratorem.",
     "%s password reset" : "%s reset hasła",
     "Use the following link to reset your password: {link}" : "Użyj tego odnośnika by zresetować hasło: {link}",
-    "You will receive a link to reset your password via Email." : "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
-    "Username" : "Nazwa użytkownika",
-    "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?" : "Pliki są szyfrowane. Jeśli nie włączono klucza odzyskiwania, nie będzie możliwe odzyskać dane z powrotem po zresetowaniu hasła. Jeśli nie masz pewności, co zrobić, prosimy o kontakt z administratorem, przed kontynuowaniem. Czy chcesz kontynuować?",
-    "Yes, I really want to reset my password now" : "Tak, naprawdę chcę zresetować hasło teraz",
-    "Reset" : "Resetuj",
     "New password" : "Nowe hasło",
     "New Password" : "Nowe hasło",
+    "Reset password" : "Zresetuj hasło",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie jest wspierany i %s nie będzie działać poprawnie na tej platformie. Używasz na własne ryzyko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Aby uzyskać najlepsze rezultaty, rozważ w to miejsce użycie serwera GNU/Linux.",
     "Personal" : "Osobiste",
@@ -162,6 +157,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Twój katalog danych i pliki są prawdopodobnie dostępne z poziomu internetu, ponieważ plik .htaccess nie działa.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Aby uzyskać informacje jak poprawnie skonfigurować swój serwer, zapoznaj się z <a href=\"%s\" target=\"_blank\">dokumentacją</a>.",
     "Create an <strong>admin account</strong>" : "Utwórz <strong>konta administratora</strong>",
+    "Username" : "Nazwa użytkownika",
     "Password" : "Hasło",
     "Storage & database" : "Zasoby dysku & baza danych",
     "Data folder" : "Katalog danych",
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 041159ce172..918d3d7adea 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Eu sei o que estou fazendo",
-    "Reset password" : "Redefinir senha",
     "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
     "No" : "Não",
     "Yes" : "Sim",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
     "%s password reset" : "%s redefinir senha",
     "Use the following link to reset your password: {link}" : "Use o seguinte link para redefinir sua senha: {link}",
-    "You will receive a link to reset your password via Email." : "Você receberá um link para redefinir sua senha por e-mail.",
-    "Username" : "Nome de usuário",
-    "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?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.",
-    "Reset" : "Resetar",
     "New password" : "Nova senha",
     "New Password" : "Nova Senha",
+    "Reset password" : "Redefinir senha",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
     "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
     "Personal" : "Pessoal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
+    "Username" : "Nome de usuário",
     "Password" : "Senha",
     "Storage & database" : "Armazenamento & banco de dados",
     "Data folder" : "Pasta de dados",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 05be1f4cb1c..75f4b8eff1d 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -37,7 +37,6 @@
     "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?",
     "I know what I'm doing" : "Eu sei o que estou fazendo",
-    "Reset password" : "Redefinir senha",
     "Password can not be changed. Please contact your administrator." : "A senha não pode ser alterada. Por favor, contate o administrador.",
     "No" : "Não",
     "Yes" : "Sim",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Não foi possível enviar e-mail de redefinição, porque não há nenhum endereço de e-mail para este nome de usuário. Por favor, contate o administrador.",
     "%s password reset" : "%s redefinir senha",
     "Use the following link to reset your password: {link}" : "Use o seguinte link para redefinir sua senha: {link}",
-    "You will receive a link to reset your password via Email." : "Você receberá um link para redefinir sua senha por e-mail.",
-    "Username" : "Nome de usuário",
-    "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?" : "Seus arquivos estão encriptados. Se você não habilitou a chave de recuperação, não haverá maneira de recuperar seus dados após criar uma nova senha. Se você não tem certeza do que fazer,  por favor entre em contato com o administrador antes de continuar. Tem certeza que realmente quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, realmente quero criar uma nova senha.",
-    "Reset" : "Resetar",
     "New password" : "Nova senha",
     "New Password" : "Nova Senha",
+    "Reset password" : "Redefinir senha",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X não é suportado e %s não funcionará corretamente nesta plataforma. Use-o por sua conta e risco!",
     "For the best results, please consider using a GNU/Linux server instead." : "Para obter os melhores resultados, por favor, considere o uso de um servidor GNU/Linux em seu lugar.",
     "Personal" : "Pessoal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Seu diretório de dados e arquivos são provavelmente acessíveis pela internet, porque o .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações sobre como configurar corretamente o seu servidor, consulte a <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta de administrador</strong>",
+    "Username" : "Nome de usuário",
     "Password" : "Senha",
     "Storage & database" : "Armazenamento & banco de dados",
     "Data folder" : "Pasta de dados",
diff --git a/core/l10n/pt_PT.js b/core/l10n/pt_PT.js
index f304226c321..09e688a0eb8 100644
--- a/core/l10n/pt_PT.js
+++ b/core/l10n/pt_PT.js
@@ -1,7 +1,7 @@
 OC.L10N.register(
     "core",
     {
-    "Couldn't send mail to following users: %s " : "Não foi possível enviar o correio para os seguintes utilizadores: %s",
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s",
     "Turned on maintenance mode" : "Ativado o modo de manutenção",
     "Turned off maintenance mode" : "Desativado o modo de manutenção",
     "Updated database" : "Base de dados atualizada",
@@ -33,31 +33,30 @@ OC.L10N.register(
     "October" : "Outubro",
     "November" : "Novembro",
     "December" : "Dezembro",
-    "Settings" : "Configurações",
+    "Settings" : "Definições",
     "Saving..." : "A guardar ...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "I know what I'm doing" : "Eu sei o que Eu estou a fazer",
-    "Reset password" : "Repor palavra-passe",
+    "I know what I'm doing" : "Eu sei o que eu estou a fazer",
     "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.",
     "No" : "Não",
     "Yes" : "Sim",
-    "Choose" : "Escolha",
-    "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
+    "Choose" : "Escolher",
+    "Error loading file picker template: {error}" : "Ocorreu um erro ao carregar o modelo do selecionador de ficheiro: {error}",
     "Ok" : "Ok",
-    "Error loading message template: {error}" : "Erro ao carregar o template: {error}",
+    "Error loading message template: {error}" : "Ocorreu um erro ao carregar o modelo: {error}",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"],
     "One file conflict" : "Um conflito no ficheiro",
     "New Files" : "Ficheiros Novos",
-    "Already existing files" : "Ficheiro já existente",
+    "Already existing files" : "Ficheiros já existentes",
     "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
     "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
     "Cancel" : "Cancelar",
     "Continue" : "Continuar",
     "(all selected)" : "(todos seleccionados)",
     "({count} selected)" : "({count} seleccionados)",
-    "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
+    "Error loading file exists template" : "Ocorreu um erro ao carregar o ficheiro do modelo existente",
     "Very weak password" : "Palavra-passe muito fraca",
     "Weak password" : "Palavra-passe fraca",
     "So-so password" : "Palavra-passe aceitável",
@@ -76,7 +75,7 @@ OC.L10N.register(
     "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 user or group …" : "Partilhar com utilizador ou grupo...",
-    "Share link" : "Partilhar o link",
+    "Share link" : "Compartilhar hiperligação",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
     "Password protect" : "Proteger com Palavra-passe",
     "Choose a password for the public link" : "Defina a palavra-passe para a hiperligação pública",
@@ -85,17 +84,17 @@ OC.L10N.register(
     "Send" : "Enviar",
     "Set expiration date" : "Especificar data de expiração",
     "Expiration date" : "Data de expiração",
-    "Adding user..." : "A adicionar utilizador...",
+    "Adding user..." : "A adicionar o utilizador ...",
     "group" : "grupo",
     "Resharing is not allowed" : "Não é permitido partilhar de novo",
     "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
-    "Unshare" : "Deixar de partilhar",
-    "notify by email" : "Notificar por email",
+    "Unshare" : "Cancelar partilha",
+    "notify by email" : "Notificar por correio eletrónico",
     "can share" : "pode partilhar",
     "can edit" : "pode editar",
-    "access control" : "Controlo de acesso",
+    "access control" : "controlo de acesso",
     "create" : "criar",
-    "update" : "actualizar",
+    "update" : "atualizar",
     "delete" : "apagar",
     "Password protected" : "Protegido com Palavra-passe",
     "Error unsetting expiration date" : "Erro ao retirar a data de expiração",
@@ -112,9 +111,9 @@ OC.L10N.register(
     "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
     "unknown text" : "texto desconhecido",
     "Hello world!" : "Olá mundo!",
-    "sunny" : "solarengo",
+    "sunny" : "soalheiro",
     "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}",
-    "_download %n file_::_download %n files_" : ["download %n ficheiro","download %n ficheiros"],
+    "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "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",
     "Use the following link to reset your password: {link}" : "Utilize a seguinte hiperligação para repor a sua palavra-passe: {link}",
-    "You will receive a link to reset your password via Email." : "Vai receber uma hiperligação via e-mail para repor a sua palavra-passe",
-    "Username" : "Nome de utilizador",
-    "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?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, eu tenho a certeza que pretendo redefinir agora a minha palavra-passe.",
-    "Reset" : "Repor",
     "New password" : "Nova palavra-chave",
     "New Password" : "Nova palavra-passe",
+    "Reset password" : "Repor palavra-passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
     "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
     "Personal" : "Pessoal",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
+    "Username" : "Nome de utilizador",
     "Password" : "Palavra-passe",
     "Storage & database" : "Armazenamento e base de dados",
     "Data folder" : "Pasta de dados",
diff --git a/core/l10n/pt_PT.json b/core/l10n/pt_PT.json
index 70586658f8a..8789b6e13d8 100644
--- a/core/l10n/pt_PT.json
+++ b/core/l10n/pt_PT.json
@@ -1,5 +1,5 @@
 { "translations": {
-    "Couldn't send mail to following users: %s " : "Não foi possível enviar o correio para os seguintes utilizadores: %s",
+    "Couldn't send mail to following users: %s " : "Não foi possível enviar a mensagem para os seguintes utilizadores: %s",
     "Turned on maintenance mode" : "Ativado o modo de manutenção",
     "Turned off maintenance mode" : "Desativado o modo de manutenção",
     "Updated database" : "Base de dados atualizada",
@@ -31,31 +31,30 @@
     "October" : "Outubro",
     "November" : "Novembro",
     "December" : "Dezembro",
-    "Settings" : "Configurações",
+    "Settings" : "Definições",
     "Saving..." : "A guardar ...",
     "Couldn't send reset email. Please contact your administrator." : "Não foi possível enviar o e-mail de reposição. Por favor, contacte o administrador.",
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "O link para fazer reset à sua password foi enviado para o seu e-mail. <br> Se não o recebeu dentro um espaço de tempo aceitável, por favor verifique a sua pasta de SPAM.<br> Se não o encontrar, por favor contacte o seu administrador.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "I know what I'm doing" : "Eu sei o que Eu estou a fazer",
-    "Reset password" : "Repor palavra-passe",
+    "I know what I'm doing" : "Eu sei o que eu estou a fazer",
     "Password can not be changed. Please contact your administrator." : "A palavra-passe não pode ser alterada. Por favor, contacte o seu administrador.",
     "No" : "Não",
     "Yes" : "Sim",
-    "Choose" : "Escolha",
-    "Error loading file picker template: {error}" : "Erro ao carregar o modelo de selecionador de ficheiro: {error}",
+    "Choose" : "Escolher",
+    "Error loading file picker template: {error}" : "Ocorreu um erro ao carregar o modelo do selecionador de ficheiro: {error}",
     "Ok" : "Ok",
-    "Error loading message template: {error}" : "Erro ao carregar o template: {error}",
+    "Error loading message template: {error}" : "Ocorreu um erro ao carregar o modelo: {error}",
     "_{count} file conflict_::_{count} file conflicts_" : ["{count} conflicto de ficheiro","{count} conflitos de ficheiro"],
     "One file conflict" : "Um conflito no ficheiro",
     "New Files" : "Ficheiros Novos",
-    "Already existing files" : "Ficheiro já existente",
+    "Already existing files" : "Ficheiros já existentes",
     "Which files do you want to keep?" : "Quais os ficheiros que pretende manter?",
     "If you select both versions, the copied file will have a number added to its name." : "Se escolher ambas as versões, o ficheiro copiado irá ter um número adicionado ao seu nome.",
     "Cancel" : "Cancelar",
     "Continue" : "Continuar",
     "(all selected)" : "(todos seleccionados)",
     "({count} selected)" : "({count} seleccionados)",
-    "Error loading file exists template" : "Erro ao carregar o modelo de existências do ficheiro",
+    "Error loading file exists template" : "Ocorreu um erro ao carregar o ficheiro do modelo existente",
     "Very weak password" : "Palavra-passe muito fraca",
     "Weak password" : "Palavra-passe fraca",
     "So-so password" : "Palavra-passe aceitável",
@@ -74,7 +73,7 @@
     "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 user or group …" : "Partilhar com utilizador ou grupo...",
-    "Share link" : "Partilhar o link",
+    "Share link" : "Compartilhar hiperligação",
     "The public link will expire no later than {days} days after it is created" : "O link público expira, o mais tardar {days} dias após sua criação",
     "Password protect" : "Proteger com Palavra-passe",
     "Choose a password for the public link" : "Defina a palavra-passe para a hiperligação pública",
@@ -83,17 +82,17 @@
     "Send" : "Enviar",
     "Set expiration date" : "Especificar data de expiração",
     "Expiration date" : "Data de expiração",
-    "Adding user..." : "A adicionar utilizador...",
+    "Adding user..." : "A adicionar o utilizador ...",
     "group" : "grupo",
     "Resharing is not allowed" : "Não é permitido partilhar de novo",
     "Shared in {item} with {user}" : "Partilhado em {item} com {user}",
-    "Unshare" : "Deixar de partilhar",
-    "notify by email" : "Notificar por email",
+    "Unshare" : "Cancelar partilha",
+    "notify by email" : "Notificar por correio eletrónico",
     "can share" : "pode partilhar",
     "can edit" : "pode editar",
-    "access control" : "Controlo de acesso",
+    "access control" : "controlo de acesso",
     "create" : "criar",
-    "update" : "actualizar",
+    "update" : "atualizar",
     "delete" : "apagar",
     "Password protected" : "Protegido com Palavra-passe",
     "Error unsetting expiration date" : "Erro ao retirar a data de expiração",
@@ -110,9 +109,9 @@
     "No tags selected for deletion." : "Não foram escolhidas etiquetas para apagar.",
     "unknown text" : "texto desconhecido",
     "Hello world!" : "Olá mundo!",
-    "sunny" : "solarengo",
+    "sunny" : "soalheiro",
     "Hello {name}, the weather is {weather}" : "Olá {name}, o tempo está {weather}",
-    "_download %n file_::_download %n files_" : ["download %n ficheiro","download %n ficheiros"],
+    "_download %n file_::_download %n files_" : ["transferir %n ficheiro","transferir %n ficheiros"],
     "Updating {productName} to version {version}, this may take a while." : "A atualizar {productName} para a versão {version}, isto poderá demorar algum tempo.",
     "Please reload the page." : "Por favor recarregue a página.",
     "The update was unsuccessful." : "Não foi possível atualizar.",
@@ -122,13 +121,9 @@
     "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",
     "Use the following link to reset your password: {link}" : "Utilize a seguinte hiperligação para repor a sua palavra-passe: {link}",
-    "You will receive a link to reset your password via Email." : "Vai receber uma hiperligação via e-mail para repor a sua palavra-passe",
-    "Username" : "Nome de utilizador",
-    "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?" : "Os seus ficheiros estão encriptados. Se não activou a chave de recuperação, não vai ser possível recuperar os seus dados no caso da sua password ser reinicializada. Se não tem a certeza do que precisa de fazer, por favor contacte o seu administrador antes de continuar. Tem a certeza que quer continuar?",
-    "Yes, I really want to reset my password now" : "Sim, eu tenho a certeza que pretendo redefinir agora a minha palavra-passe.",
-    "Reset" : "Repor",
     "New password" : "Nova palavra-chave",
     "New Password" : "Nova palavra-passe",
+    "Reset password" : "Repor palavra-passe",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Esta plataforma não suporta o sistema operativo Mac OS X e o %s poderá não funcionar correctamente. Utilize por sua conta e risco.",
     "For the best results, please consider using a GNU/Linux server instead." : "Para um melhor resultado, utilize antes o servidor GNU/Linux.",
     "Personal" : "Pessoal",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "A pasta de dados do ownCloud e os respectivos ficheiros, estarão provavelmente acessíveis a partir da internet, pois o ficheiros .htaccess não funciona.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Para obter informações de como configurar correctamente o servidor, veja em: <a href=\"%s\" target=\"_blank\">documentação</a>.",
     "Create an <strong>admin account</strong>" : "Criar uma <strong>conta administrativa</strong>",
+    "Username" : "Nome de utilizador",
     "Password" : "Palavra-passe",
     "Storage & database" : "Armazenamento e base de dados",
     "Data folder" : "Pasta de dados",
diff --git a/core/l10n/ro.js b/core/l10n/ro.js
index 8c48c440460..7970ecf18ae 100644
--- a/core/l10n/ro.js
+++ b/core/l10n/ro.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "Settings" : "Setări",
     "Saving..." : "Se salvează...",
     "I know what I'm doing" : "Eu știu ce fac",
-    "Reset password" : "Resetează parola",
     "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
     "No" : "Nu",
     "Yes" : "Da",
@@ -94,13 +93,9 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
     "%s password reset" : "%s resetare parola",
     "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}",
-    "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.",
-    "Username" : "Nume utilizator",
-    "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?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
-    "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum",
-    "Reset" : "Resetare",
     "New password" : "Noua parolă",
     "New Password" : "Noua parolă",
+    "Reset password" : "Resetează parola",
     "Personal" : "Personal",
     "Users" : "Utilizatori",
     "Apps" : "Aplicații",
@@ -114,6 +109,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
     "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
+    "Username" : "Nume utilizator",
     "Password" : "Parolă",
     "Storage & database" : "Stocare și baza de date",
     "Data folder" : "Director date",
diff --git a/core/l10n/ro.json b/core/l10n/ro.json
index 137a0bc7a52..037574515eb 100644
--- a/core/l10n/ro.json
+++ b/core/l10n/ro.json
@@ -29,7 +29,6 @@
     "Settings" : "Setări",
     "Saving..." : "Se salvează...",
     "I know what I'm doing" : "Eu știu ce fac",
-    "Reset password" : "Resetează parola",
     "Password can not be changed. Please contact your administrator." : "Parola nu poate fi modificata. Vă rugăm să contactați administratorul dvs.",
     "No" : "Nu",
     "Yes" : "Da",
@@ -92,13 +91,9 @@
     "The update was successful. Redirecting you to ownCloud now." : "Actualizare reușită. Ești redirecționat către ownCloud.",
     "%s password reset" : "%s resetare parola",
     "Use the following link to reset your password: {link}" : "Folosește următorul link pentru a reseta parola: {link}",
-    "You will receive a link to reset your password via Email." : "Vei primi un mesaj prin care vei putea reseta parola via email.",
-    "Username" : "Nume utilizator",
-    "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?" : "Fișierele tale sunt criptate. Dacă nu ai activat o cheie de recuperare, nu va mai exista nici o metodă prin care să îți recuperezi datele după resetarea parole. Dacă nu ești sigur în privința la ce ai de făcut, contactează un administrator înainte să continuii. Chiar vrei să continui?",
-    "Yes, I really want to reset my password now" : "Da, eu chiar doresc să îmi resetez parola acum",
-    "Reset" : "Resetare",
     "New password" : "Noua parolă",
     "New Password" : "Noua parolă",
+    "Reset password" : "Resetează parola",
     "Personal" : "Personal",
     "Users" : "Utilizatori",
     "Apps" : "Aplicații",
@@ -112,6 +107,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Directorul tău de date și fișiere sunt probabil accesibile de pe Internet, deoarece fișierul .htaccess nu funcționează.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pentru informații despre cum să configurezi serverul, vezi <a href=\"%s\" target=\"_blank\">documentația</a>.",
     "Create an <strong>admin account</strong>" : "Crează un <strong>cont de administrator</strong>",
+    "Username" : "Nume utilizator",
     "Password" : "Parolă",
     "Storage & database" : "Stocare și baza de date",
     "Data folder" : "Director date",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index 066be34d07a..f3e11f7abda 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для восстановления пароля была отправлена на вашу почту. Если вы не получили её, проверьте папку спама.<br>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?",
     "I know what I'm doing" : "Я понимаю, что делаю",
-    "Reset password" : "Сбросить пароль",
     "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
     "No" : "Нет",
     "Yes" : "Да",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.",
     "%s password reset" : "%s сброс пароля",
     "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}",
-    "You will receive a link to reset your password via Email." : "На ваш адрес Email выслана ссылка для сброса пароля.",
-    "Username" : "Имя пользователя",
-    "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?" : "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
-    "Yes, I really want to reset my password now" : "Да, я действительно хочу сбросить свой пароль",
-    "Reset" : "Сброс",
     "New password" : "Новый пароль",
     "New Password" : "Новый пароль",
+    "Reset password" : "Сбросить пароль",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
     "Personal" : "Личное",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
     "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
+    "Username" : "Имя пользователя",
     "Password" : "Пароль",
     "Storage & database" : "Система хранения данных & база данных",
     "Data folder" : "Директория с данными",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index a65f9b502b0..a77cf869064 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Ссылка для восстановления пароля была отправлена на вашу почту. Если вы не получили её, проверьте папку спама.<br>Если там письма со ссылкой нет, то обратитесь к локальному администратору.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваши файлы зашифрованы. Если вы не включили ключ восстановления, то ваши данные будут недоступны после сброса пароля.<br />Если вы не уверены что делать дальше - обратитесь к локальному администратору.<br />Вытдействительно хотите продолжить?",
     "I know what I'm doing" : "Я понимаю, что делаю",
-    "Reset password" : "Сбросить пароль",
     "Password can not be changed. Please contact your administrator." : "Пароль не может быть изменён. Пожалуйста, свяжитесь с вашим администратором.",
     "No" : "Нет",
     "Yes" : "Да",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Невозможно отправить письмо для сброса пароля, т.к. у вашего аккаунта не прописан адрес почты. Пожалуйста, свяжитесь с администратором.",
     "%s password reset" : "%s сброс пароля",
     "Use the following link to reset your password: {link}" : "Используйте следующую ссылку чтобы сбросить пароль: {link}",
-    "You will receive a link to reset your password via Email." : "На ваш адрес Email выслана ссылка для сброса пароля.",
-    "Username" : "Имя пользователя",
-    "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?" : "Ваши файлы зашифрованы. Если вы не активировали ключ восстановления, то после сброса пароля все ваши данные будут потеряны навсегда. Если вы не знаете что делать, свяжитесь со своим администратором до того как продолжить. Вы действительно хотите продолжить?",
-    "Yes, I really want to reset my password now" : "Да, я действительно хочу сбросить свой пароль",
-    "Reset" : "Сброс",
     "New password" : "Новый пароль",
     "New Password" : "Новый пароль",
+    "Reset password" : "Сбросить пароль",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не поддерживается и %s не будет работать правильно на этой платформе. Используйте ее на свой страх и риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "Для достижения наилучших результатов, пожалуйста, рассмотрите возможность использовать взамен GNU/Linux сервер.",
     "Personal" : "Личное",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваша папка с данными и файлы возможно доступны из интернета потому что файл .htaccess не работает.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для информации, как правильно настроить Ваш сервер, пожалуйста загляните в <a hrev=\"%s\"target=\"blank\">документацию</a>.",
     "Create an <strong>admin account</strong>" : "Создать <strong>учётную запись администратора</strong>",
+    "Username" : "Имя пользователя",
     "Password" : "Пароль",
     "Storage & database" : "Система хранения данных & база данных",
     "Data folder" : "Директория с данными",
diff --git a/core/l10n/si_LK.js b/core/l10n/si_LK.js
index 3a9978aea85..65184265ad6 100644
--- a/core/l10n/si_LK.js
+++ b/core/l10n/si_LK.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "දෙසැම්බර්",
     "Settings" : "සිටුවම්",
     "Saving..." : "සුරැකෙමින් පවතී...",
-    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "No" : "එපා",
     "Yes" : "ඔව්",
     "Choose" : "තෝරන්න",
@@ -48,9 +47,8 @@ OC.L10N.register(
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
     "_download %n file_::_download %n files_" : ["",""],
-    "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
-    "Username" : "පරිශීලක නම",
     "New password" : "නව මුරපදය",
+    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "Personal" : "පෞද්ගලික",
     "Users" : "පරිශීලකයන්",
     "Apps" : "යෙදුම්",
@@ -58,6 +56,7 @@ OC.L10N.register(
     "Help" : "උදව්",
     "Access forbidden" : "ඇතුල් වීම තහනම්",
     "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Username" : "පරිශීලක නම",
     "Password" : "මුර පදය",
     "Data folder" : "දත්ත ෆෝල්ඩරය",
     "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
diff --git a/core/l10n/si_LK.json b/core/l10n/si_LK.json
index 112e6eb5014..db383dc6ae7 100644
--- a/core/l10n/si_LK.json
+++ b/core/l10n/si_LK.json
@@ -20,7 +20,6 @@
     "December" : "දෙසැම්බර්",
     "Settings" : "සිටුවම්",
     "Saving..." : "සුරැකෙමින් පවතී...",
-    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "No" : "එපා",
     "Yes" : "ඔව්",
     "Choose" : "තෝරන්න",
@@ -46,9 +45,8 @@
     "Delete" : "මකා දමන්න",
     "Add" : "එකතු කරන්න",
     "_download %n file_::_download %n files_" : ["",""],
-    "You will receive a link to reset your password via Email." : "ඔබගේ මුරපදය ප්‍රත්‍යාරම්භ කිරීම සඳහා යොමුව විද්‍යුත් තැපෑලෙන් ලැබෙනු ඇත",
-    "Username" : "පරිශීලක නම",
     "New password" : "නව මුරපදය",
+    "Reset password" : "මුරපදය ප්‍රත්‍යාරම්භ කරන්න",
     "Personal" : "පෞද්ගලික",
     "Users" : "පරිශීලකයන්",
     "Apps" : "යෙදුම්",
@@ -56,6 +54,7 @@
     "Help" : "උදව්",
     "Access forbidden" : "ඇතුල් වීම තහනම්",
     "Security Warning" : "ආරක්ෂක නිවේදනයක්",
+    "Username" : "පරිශීලක නම",
     "Password" : "මුර පදය",
     "Data folder" : "දත්ත ෆෝල්ඩරය",
     "Configure the database" : "දත්ත සමුදාය හැඩගැසීම",
diff --git a/core/l10n/sk_SK.js b/core/l10n/sk_SK.js
index 2954e513327..28e3a3b4a4d 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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ť?",
     "I know what I'm doing" : "Viem, čo robím",
-    "Reset password" : "Obnovenie hesla",
     "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
     "No" : "Nie",
     "Yes" : "Áno",
@@ -122,13 +121,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
-    "You will receive a link to reset your password via Email." : "Odkaz pre obnovenie hesla obdržíte emailom.",
-    "Username" : "Meno používateľa",
-    "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?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
-    "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo",
-    "Reset" : "Resetovať",
     "New password" : "Nové heslo",
     "New Password" : "Nové heslo",
+    "Reset password" : "Obnovenie hesla",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
     "Personal" : "Osobné",
@@ -164,6 +159,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
     "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Username" : "Meno používateľa",
     "Password" : "Heslo",
     "Storage & database" : "Úložislo & databáza",
     "Data folder" : "Priečinok dát",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index fa6ed266564..17daa232693 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -37,7 +37,6 @@
     "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ť?",
     "I know what I'm doing" : "Viem, čo robím",
-    "Reset password" : "Obnovenie hesla",
     "Password can not be changed. Please contact your administrator." : "Heslo nemožno zmeniť. Kontaktujte prosím vášho administrátora.",
     "No" : "Nie",
     "Yes" : "Áno",
@@ -120,13 +119,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Nemožno poslať email pre obnovu hesla, pretože pre tohoto používateľa nie je uvedená žiadna emailová adresa. Prosím, obráťte sa na administrátora.",
     "%s password reset" : "reset hesla %s",
     "Use the following link to reset your password: {link}" : "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}",
-    "You will receive a link to reset your password via Email." : "Odkaz pre obnovenie hesla obdržíte emailom.",
-    "Username" : "Meno používateľa",
-    "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?" : "Vaše súbory sú šifrované. Ak nemáte povolený kľúč obnovy, nie je spôsob, ako získať po obnove hesla vaše dáta. Ak nie ste si istí tým, čo robíte, obráťte sa najskôr na administrátora. Naozaj chcete pokračovať?",
-    "Yes, I really want to reset my password now" : "Áno, želám si teraz obnoviť svoje heslo",
-    "Reset" : "Resetovať",
     "New password" : "Nové heslo",
     "New Password" : "Nové heslo",
+    "Reset password" : "Obnovenie hesla",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nie je podporovaný a %s nebude správne fungovať na tejto platforme. Použite ho na vlastné riziko!",
     "For the best results, please consider using a GNU/Linux server instead." : "Pre dosiahnutie najlepších výsledkov, prosím zvážte použitie GNU/Linux servera.",
     "Personal" : "Osobné",
@@ -162,6 +157,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Váš priečinok s dátami a súbormi je dostupný z internetu, lebo súbor .htaccess nefunguje.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Pre informácie, ako správne nastaviť váš server, sa pozrite do <a href=\"%s\" target=\"_blank\">dokumentácie</a>.",
     "Create an <strong>admin account</strong>" : "Vytvoriť <strong>administrátorský účet</strong>",
+    "Username" : "Meno používateľa",
     "Password" : "Heslo",
     "Storage & database" : "Úložislo & databáza",
     "Data folder" : "Priečinok dát",
diff --git a/core/l10n/sl.js b/core/l10n/sl.js
index a0e815d1618..59a9e8bd72a 100644
--- a/core/l10n/sl.js
+++ b/core/l10n/sl.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
     "I know what I'm doing" : "Vem, kaj delam!",
-    "Reset password" : "Ponastavi geslo",
     "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
     "No" : "Ne",
     "Yes" : "Da",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
     "%s password reset" : "Ponastavitev gesla %s",
     "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}",
-    "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-    "Username" : "Uporabniško ime",
-    "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?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
-    "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla",
-    "Reset" : "Ponastavi",
     "New password" : "Novo geslo",
     "New Password" : "Novo geslo",
+    "Reset password" : "Ponastavi geslo",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
     "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
     "Personal" : "Osebno",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
     "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
+    "Username" : "Uporabniško ime",
     "Password" : "Geslo",
     "Storage & database" : "Shramba in podatkovna zbirka",
     "Data folder" : "Podatkovna mapa",
diff --git a/core/l10n/sl.json b/core/l10n/sl.json
index d5a516d4429..abea92d1325 100644
--- a/core/l10n/sl.json
+++ b/core/l10n/sl.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Povezava za ponastavitev gesla je bila poslana na naveden elektronski naslov. V kolikor sporočila ne dobite v kratkem, preverite tudi mapo neželene pošte.<br> Če sporočila ni niti v tej mapi, stopite v stik s skrbnikom.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Datoteke so šifrirane. Če niste omogočili obnovitvenega ključa, po ponastavitvi gesla ne bo mogoč dostop do datotek.<br />V primeru, da niste prepričani, kaj storiti, stopite v stik s skrbnikom sistema.<br />Ali ste prepričani, da želite nadaljevati?",
     "I know what I'm doing" : "Vem, kaj delam!",
-    "Reset password" : "Ponastavi geslo",
     "Password can not be changed. Please contact your administrator." : "Gesla ni mogoče spremeniti. Stopite v stik s skrbnikom.",
     "No" : "Ne",
     "Yes" : "Da",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Ni mogoče poslati elektronskega sporočila za ponastavitev gesla, ker ni navedenega elektronskega naslova. Stopite v stik s skrbnikom sistema.",
     "%s password reset" : "Ponastavitev gesla %s",
     "Use the following link to reset your password: {link}" : "Za ponastavitev gesla uporabite povezavo: {link}",
-    "You will receive a link to reset your password via Email." : "Na elektronski naslov boste prejeli povezavo za ponovno nastavitev gesla.",
-    "Username" : "Uporabniško ime",
-    "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?" : "Datoteke so šifrirane. Če niste omogočili ključa za obnovitev, žal podatkov ne bo mogoče pridobiti nazaj, ko boste geslo enkrat spremenili. Če niste prepričani, kaj storiti, se obrnite na skrbnika storitve. Ali ste prepričani, da želite nadaljevati?",
-    "Yes, I really want to reset my password now" : "Da, potrjujem ponastavitev gesla",
-    "Reset" : "Ponastavi",
     "New password" : "Novo geslo",
     "New Password" : "Novo geslo",
+    "Reset password" : "Ponastavi geslo",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Sistem Mac OS X ni podprt, zato %s ne bo deloval zanesljivo v tem okolju. Program uporabljate na lastno odgovornost! ",
     "For the best results, please consider using a GNU/Linux server instead." : "Za najbolj še rezultate je priporočljivo uporabljati strežnik GNU/Linux.",
     "Personal" : "Osebno",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Podatkovna mapa in datoteke so najverjetneje javno dostopni preko interneta, saj datoteka .htaccess ni ustrezno nastavljena.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Za več informacij o pravilnem nastavljanju strežnika, kliknite na povezavo do <a href=\"%s\" target=\"_blank\">dokumentacije</a>.",
     "Create an <strong>admin account</strong>" : "Ustvari <strong>skrbniški račun</strong>",
+    "Username" : "Uporabniško ime",
     "Password" : "Geslo",
     "Storage & database" : "Shramba in podatkovna zbirka",
     "Data folder" : "Podatkovna mapa",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index 9dd27342905..246c12bd9ec 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -1,9 +1,19 @@
 OC.L10N.register(
     "core",
     {
+    "Couldn't send mail to following users: %s " : "Nuk mund ti dërgoj e-mail këtyre përdoruesve: %s",
     "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua",
     "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua",
     "Updated database" : "Database-i u azhurnua",
+    "Checked database schema update" : "Përditësim i skemës së kontrolluar të bazës së të dhënave",
+    "Checked database schema update for apps" : "Përditësim i skemës së kontrolluar të bazës së të dhënave për aplikacionet",
+    "Updated \"%s\" to %s" : "U përditësua \"%s\" në %s",
+    "Disabled incompatible apps: %s" : "Aplikacione të papajtueshme të bllokuara: %s",
+    "No image or file provided" : "Nuk është dhënë asnjë imazh apo skedar",
+    "Unknown filetype" : "Tip i panjohur skedari",
+    "Invalid image" : "Imazh i pavlefshëm",
+    "No temporary profile picture available, try again" : "Nuk është i mundur asnjë imazh profili i përkohshëm, provoni përsëri",
+    "No crop data provided" : "Nuk është dhënë asnjë parametër prerjeje",
     "Sunday" : "E djelë",
     "Monday" : "E hënë",
     "Tuesday" : "E martë",
@@ -25,7 +35,6 @@ OC.L10N.register(
     "December" : "Dhjetor",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
-    "Reset password" : "Rivendos kodin",
     "No" : "Jo",
     "Yes" : "Po",
     "Choose" : "Zgjidh",
@@ -69,11 +78,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
     "%s password reset" : "Kodi i %s -it u rivendos",
     "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
-    "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
-    "Username" : "Përdoruesi",
-    "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?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
-    "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani",
     "New password" : "Kodi i ri",
+    "Reset password" : "Rivendos kodin",
     "Personal" : "Personale",
     "Users" : "Përdoruesit",
     "Apps" : "App",
@@ -86,6 +92,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
     "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
+    "Username" : "Përdoruesi",
     "Password" : "Kodi",
     "Data folder" : "Emri i dosjes",
     "Configure the database" : "Konfiguro database-in",
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index 72230681a4e..e183fafb33c 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -1,7 +1,17 @@
 { "translations": {
+    "Couldn't send mail to following users: %s " : "Nuk mund ti dërgoj e-mail këtyre përdoruesve: %s",
     "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua",
     "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua",
     "Updated database" : "Database-i u azhurnua",
+    "Checked database schema update" : "Përditësim i skemës së kontrolluar të bazës së të dhënave",
+    "Checked database schema update for apps" : "Përditësim i skemës së kontrolluar të bazës së të dhënave për aplikacionet",
+    "Updated \"%s\" to %s" : "U përditësua \"%s\" në %s",
+    "Disabled incompatible apps: %s" : "Aplikacione të papajtueshme të bllokuara: %s",
+    "No image or file provided" : "Nuk është dhënë asnjë imazh apo skedar",
+    "Unknown filetype" : "Tip i panjohur skedari",
+    "Invalid image" : "Imazh i pavlefshëm",
+    "No temporary profile picture available, try again" : "Nuk është i mundur asnjë imazh profili i përkohshëm, provoni përsëri",
+    "No crop data provided" : "Nuk është dhënë asnjë parametër prerjeje",
     "Sunday" : "E djelë",
     "Monday" : "E hënë",
     "Tuesday" : "E martë",
@@ -23,7 +33,6 @@
     "December" : "Dhjetor",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
-    "Reset password" : "Rivendos kodin",
     "No" : "Jo",
     "Yes" : "Po",
     "Choose" : "Zgjidh",
@@ -67,11 +76,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
     "%s password reset" : "Kodi i %s -it u rivendos",
     "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
-    "You will receive a link to reset your password via Email." : "Do t'iu vijë një email që përmban një lidhje për ta rivendosur kodin.",
-    "Username" : "Përdoruesi",
-    "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?" : "Skedarët tuaj janë të kodifikuar. Nëqoftëse nuk keni aktivizuar çelësin e restaurimit, të dhënat tuaja nuk do të jenë të arritshme pasi të keni rivendosur kodin. Nëqoftëse nuk jeni i sigurt, ju lutemi kontaktoni administratorin tuaj para se të vazhdoni. Jeni i sigurt që dëshironi të vazhdoni?",
-    "Yes, I really want to reset my password now" : "Po, dua ta rivendos kodin tani",
     "New password" : "Kodi i ri",
+    "Reset password" : "Rivendos kodin",
     "Personal" : "Personale",
     "Users" : "Përdoruesit",
     "Apps" : "App",
@@ -84,6 +90,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Dosja dhe skedarët e të dhënave tuaja mbase janë të arritshme nga interneti sepse skedari .htaccess nuk po punon.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Për më shumë informacion mbi konfigurimin e duhur të serverit tuaj, ju lutem shikoni <a href=\"%s\" target=\"_blank\">dokumentacionin</a>.",
     "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
+    "Username" : "Përdoruesi",
     "Password" : "Kodi",
     "Data folder" : "Emri i dosjes",
     "Configure the database" : "Konfiguro database-in",
diff --git a/core/l10n/sr.js b/core/l10n/sr.js
index 5e2c8354261..39ca7b1fda4 100644
--- a/core/l10n/sr.js
+++ b/core/l10n/sr.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Децембар",
     "Settings" : "Поставке",
     "Saving..." : "Чување у току...",
-    "Reset password" : "Ресетуј лозинку",
     "No" : "Не",
     "Yes" : "Да",
     "Choose" : "Одабери",
@@ -61,9 +60,8 @@ OC.L10N.register(
     "Add" : "Додај",
     "_download %n file_::_download %n files_" : ["","",""],
     "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
-    "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
-    "Username" : "Корисничко име",
     "New password" : "Нова лозинка",
+    "Reset password" : "Ресетуј лозинку",
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Апликације",
@@ -72,6 +70,7 @@ OC.L10N.register(
     "Access forbidden" : "Забрањен приступ",
     "Security Warning" : "Сигурносно упозорење",
     "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
     "Data folder" : "Фацикла података",
     "Configure the database" : "Подешавање базе",
diff --git a/core/l10n/sr.json b/core/l10n/sr.json
index bfd13040906..ab3e8e04495 100644
--- a/core/l10n/sr.json
+++ b/core/l10n/sr.json
@@ -20,7 +20,6 @@
     "December" : "Децембар",
     "Settings" : "Поставке",
     "Saving..." : "Чување у току...",
-    "Reset password" : "Ресетуј лозинку",
     "No" : "Не",
     "Yes" : "Да",
     "Choose" : "Одабери",
@@ -59,9 +58,8 @@
     "Add" : "Додај",
     "_download %n file_::_download %n files_" : ["","",""],
     "Use the following link to reset your password: {link}" : "Овом везом ресетујте своју лозинку: {link}",
-    "You will receive a link to reset your password via Email." : "Добићете везу за ресетовање лозинке путем е-поште.",
-    "Username" : "Корисничко име",
     "New password" : "Нова лозинка",
+    "Reset password" : "Ресетуј лозинку",
     "Personal" : "Лично",
     "Users" : "Корисници",
     "Apps" : "Апликације",
@@ -70,6 +68,7 @@
     "Access forbidden" : "Забрањен приступ",
     "Security Warning" : "Сигурносно упозорење",
     "Create an <strong>admin account</strong>" : "Направи <strong>административни налог</strong>",
+    "Username" : "Корисничко име",
     "Password" : "Лозинка",
     "Data folder" : "Фацикла података",
     "Configure the database" : "Подешавање базе",
diff --git a/core/l10n/sr@latin.js b/core/l10n/sr@latin.js
index 11c3d2e40a7..a327c2ee55a 100644
--- a/core/l10n/sr@latin.js
+++ b/core/l10n/sr@latin.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "Decembar",
     "Settings" : "Podešavanja",
     "I know what I'm doing" : "Znam šta radim",
-    "Reset password" : "Resetuj lozinku",
     "No" : "Ne",
     "Yes" : "Da",
     "Choose" : "Izaberi",
@@ -69,9 +68,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
     "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
-    "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
-    "Username" : "Korisničko ime",
     "New password" : "Nova lozinka",
+    "Reset password" : "Resetuj lozinku",
     "Personal" : "Lično",
     "Users" : "Korisnici",
     "Apps" : "Programi",
@@ -82,6 +80,7 @@ OC.L10N.register(
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
     "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Data folder" : "Fascikla podataka",
     "Configure the database" : "Podešavanje baze",
diff --git a/core/l10n/sr@latin.json b/core/l10n/sr@latin.json
index a358f57d028..219141ff1df 100644
--- a/core/l10n/sr@latin.json
+++ b/core/l10n/sr@latin.json
@@ -20,7 +20,6 @@
     "December" : "Decembar",
     "Settings" : "Podešavanja",
     "I know what I'm doing" : "Znam šta radim",
-    "Reset password" : "Resetuj lozinku",
     "No" : "Ne",
     "Yes" : "Da",
     "Choose" : "Izaberi",
@@ -67,9 +66,8 @@
     "_download %n file_::_download %n files_" : ["","",""],
     "The update was successful. Redirecting you to ownCloud now." : "Ažuriranje je uspelo. Prosleđivanje na ownCloud.",
     "Use the following link to reset your password: {link}" : "Koristite sledeći link za reset lozinke: {link}",
-    "You will receive a link to reset your password via Email." : "Dobićete vezu za resetovanje lozinke putem e-pošte.",
-    "Username" : "Korisničko ime",
     "New password" : "Nova lozinka",
+    "Reset password" : "Resetuj lozinku",
     "Personal" : "Lično",
     "Users" : "Korisnici",
     "Apps" : "Programi",
@@ -80,6 +78,7 @@
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Vaša PHP verzija je ranjiva na ",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Vaši podaci i direktorijumi su verovatno dostupni sa interneta jer .htaccess fajl ne funkcioniše.",
     "Create an <strong>admin account</strong>" : "Napravi <strong>administrativni nalog</strong>",
+    "Username" : "Korisničko ime",
     "Password" : "Lozinka",
     "Data folder" : "Fascikla podataka",
     "Configure the database" : "Podešavanje baze",
diff --git a/core/l10n/sv.js b/core/l10n/sv.js
index c0066471dc0..dc427b46dba 100644
--- a/core/l10n/sv.js
+++ b/core/l10n/sv.js
@@ -37,7 +37,6 @@ OC.L10N.register(
     "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?",
     "I know what I'm doing" : "Jag är säker på vad jag gör",
-    "Reset password" : "Återställ lösenordet",
     "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
     "No" : "Nej",
     "Yes" : "Ja",
@@ -118,13 +117,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
     "%s password reset" : "%s återställ lösenord",
     "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
-    "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.",
-    "Username" : "Användarnamn",
-    "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?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
-    "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu",
-    "Reset" : "Återställ",
     "New password" : "Nytt lösenord",
     "New Password" : "Nytt lösenord",
+    "Reset password" : "Återställ lösenordet",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
     "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
     "Personal" : "Personligt",
@@ -150,6 +145,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
+    "Username" : "Användarnamn",
     "Password" : "Lösenord",
     "Storage & database" : "Lagring & databas",
     "Data folder" : "Datamapp",
diff --git a/core/l10n/sv.json b/core/l10n/sv.json
index 82a228565e3..c69d5001b5f 100644
--- a/core/l10n/sv.json
+++ b/core/l10n/sv.json
@@ -35,7 +35,6 @@
     "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?",
     "I know what I'm doing" : "Jag är säker på vad jag gör",
-    "Reset password" : "Återställ lösenordet",
     "Password can not be changed. Please contact your administrator." : "Lösenordet kan inte ändras. Vänligen kontakta din administratör.",
     "No" : "Nej",
     "Yes" : "Ja",
@@ -116,13 +115,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Kunde inte skicka något återställningsmail därför att det inte finns någon e-mailadress kopplad till detta användarnamn. Vänligen kontakta din administratör.",
     "%s password reset" : "%s återställ lösenord",
     "Use the following link to reset your password: {link}" : "Använd följande länk för att återställa lösenordet: {link}",
-    "You will receive a link to reset your password via Email." : "Du får en länk att återställa ditt lösenord via e-post.",
-    "Username" : "Användarnamn",
-    "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?" : "Dina filer är krypterade. Om du inte har aktiverat återställningsnyckeln kommer det inte att finnas någon möjlighet att få tillbaka dina filer efter att ditt lösenord har återställts. Om du är osäker, kontakta din systemadministratör innan du fortsätter. Är du verkligen säker på att fortsätta?",
-    "Yes, I really want to reset my password now" : "Ja, jag vill verkligen återställa mitt lösenord nu",
-    "Reset" : "Återställ",
     "New password" : "Nytt lösenord",
     "New Password" : "Nytt lösenord",
+    "Reset password" : "Återställ lösenordet",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X stöds inte och %s kommer inte att fungera korrekt på denna plattform. Använd på egen risk!",
     "For the best results, please consider using a GNU/Linux server instead." : "För bästa resultat, överväg att använda en GNU/Linux server istället.",
     "Personal" : "Personligt",
@@ -148,6 +143,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Din datakatalog och filer är förmodligen tillgängliga från Internet, eftersom .htaccess-filen inte fungerar.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "För information hur du korrekt konfigurerar din servern, se ownCloud <a href=\"%s\" target=\"_blank\">dokumentationen</a>.",
     "Create an <strong>admin account</strong>" : "Skapa ett <strong>administratörskonto</strong>",
+    "Username" : "Användarnamn",
     "Password" : "Lösenord",
     "Storage & database" : "Lagring & databas",
     "Data folder" : "Datamapp",
diff --git a/core/l10n/ta_LK.js b/core/l10n/ta_LK.js
index 520feac8871..831729238b1 100644
--- a/core/l10n/ta_LK.js
+++ b/core/l10n/ta_LK.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "மார்கழி",
     "Settings" : "அமைப்புகள்",
     "Saving..." : "சேமிக்கப்படுகிறது...",
-    "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "No" : "இல்லை",
     "Yes" : "ஆம்",
     "Choose" : "தெரிவுசெய்க ",
@@ -57,9 +56,8 @@ OC.L10N.register(
     "Add" : "சேர்க்க",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
-    "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-    "Username" : "பயனாளர் பெயர்",
     "New password" : "புதிய கடவுச்சொல்",
+    "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "Personal" : "தனிப்பட்ட",
     "Users" : "பயனாளர்",
     "Apps" : "செயலிகள்",
@@ -68,6 +66,7 @@ OC.L10N.register(
     "Access forbidden" : "அணுக தடை",
     "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
     "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+    "Username" : "பயனாளர் பெயர்",
     "Password" : "கடவுச்சொல்",
     "Data folder" : "தரவு கோப்புறை",
     "Configure the database" : "தரவுத்தளத்தை தகவமைக்க",
diff --git a/core/l10n/ta_LK.json b/core/l10n/ta_LK.json
index 41cdfe8281a..d88f8f42ae5 100644
--- a/core/l10n/ta_LK.json
+++ b/core/l10n/ta_LK.json
@@ -20,7 +20,6 @@
     "December" : "மார்கழி",
     "Settings" : "அமைப்புகள்",
     "Saving..." : "சேமிக்கப்படுகிறது...",
-    "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "No" : "இல்லை",
     "Yes" : "ஆம்",
     "Choose" : "தெரிவுசெய்க ",
@@ -55,9 +54,8 @@
     "Add" : "சேர்க்க",
     "_download %n file_::_download %n files_" : ["",""],
     "Use the following link to reset your password: {link}" : "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
-    "You will receive a link to reset your password via Email." : "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
-    "Username" : "பயனாளர் பெயர்",
     "New password" : "புதிய கடவுச்சொல்",
+    "Reset password" : "மீளமைத்த கடவுச்சொல்",
     "Personal" : "தனிப்பட்ட",
     "Users" : "பயனாளர்",
     "Apps" : "செயலிகள்",
@@ -66,6 +64,7 @@
     "Access forbidden" : "அணுக தடை",
     "Security Warning" : "பாதுகாப்பு எச்சரிக்கை",
     "Create an <strong>admin account</strong>" : "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
+    "Username" : "பயனாளர் பெயர்",
     "Password" : "கடவுச்சொல்",
     "Data folder" : "தரவு கோப்புறை",
     "Configure the database" : "தரவுத்தளத்தை தகவமைக்க",
diff --git a/core/l10n/te.js b/core/l10n/te.js
index 37dfe005efe..e4febdac9ca 100644
--- a/core/l10n/te.js
+++ b/core/l10n/te.js
@@ -35,11 +35,11 @@ OC.L10N.register(
     "Delete" : "తొలగించు",
     "Add" : "చేర్చు",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "వాడుకరి పేరు",
     "New password" : "కొత్త సంకేతపదం",
     "Personal" : "వ్యక్తిగతం",
     "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
+    "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
     "Log out" : "నిష్క్రమించు"
 },
diff --git a/core/l10n/te.json b/core/l10n/te.json
index d8224f5ffa1..1f749883e2c 100644
--- a/core/l10n/te.json
+++ b/core/l10n/te.json
@@ -33,11 +33,11 @@
     "Delete" : "తొలగించు",
     "Add" : "చేర్చు",
     "_download %n file_::_download %n files_" : ["",""],
-    "Username" : "వాడుకరి పేరు",
     "New password" : "కొత్త సంకేతపదం",
     "Personal" : "వ్యక్తిగతం",
     "Users" : "వాడుకరులు",
     "Help" : "సహాయం",
+    "Username" : "వాడుకరి పేరు",
     "Password" : "సంకేతపదం",
     "Log out" : "నిష్క్రమించు"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
diff --git a/core/l10n/th_TH.js b/core/l10n/th_TH.js
index 7b65977d950..7cf97df4823 100644
--- a/core/l10n/th_TH.js
+++ b/core/l10n/th_TH.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "ธันวาคม",
     "Settings" : "ตั้งค่า",
     "Saving..." : "กำลังบันทึกข้อมูล...",
-    "Reset password" : "เปลี่ยนรหัสผ่าน",
     "No" : "ไม่ตกลง",
     "Yes" : "ตกลง",
     "Choose" : "เลือก",
@@ -65,9 +64,8 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
-    "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-    "Username" : "ชื่อผู้ใช้งาน",
     "New password" : "รหัสผ่านใหม่",
+    "Reset password" : "เปลี่ยนรหัสผ่าน",
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
     "Apps" : "แอปฯ",
@@ -76,6 +74,7 @@ OC.L10N.register(
     "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
     "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
     "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",
     "Data folder" : "โฟลเดอร์เก็บข้อมูล",
     "Configure the database" : "กำหนดค่าฐานข้อมูล",
diff --git a/core/l10n/th_TH.json b/core/l10n/th_TH.json
index 12457e67752..4237deb738a 100644
--- a/core/l10n/th_TH.json
+++ b/core/l10n/th_TH.json
@@ -20,7 +20,6 @@
     "December" : "ธันวาคม",
     "Settings" : "ตั้งค่า",
     "Saving..." : "กำลังบันทึกข้อมูล...",
-    "Reset password" : "เปลี่ยนรหัสผ่าน",
     "No" : "ไม่ตกลง",
     "Yes" : "ตกลง",
     "Choose" : "เลือก",
@@ -63,9 +62,8 @@
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "การอัพเดทเสร็จเรียบร้อยแล้ว กำลังเปลี่ยนเส้นทางไปที่ ownCloud อยู่ในขณะนี้",
     "Use the following link to reset your password: {link}" : "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}",
-    "You will receive a link to reset your password via Email." : "คุณจะได้รับลิงค์เพื่อกำหนดรหัสผ่านใหม่ทางอีเมล์",
-    "Username" : "ชื่อผู้ใช้งาน",
     "New password" : "รหัสผ่านใหม่",
+    "Reset password" : "เปลี่ยนรหัสผ่าน",
     "Personal" : "ส่วนตัว",
     "Users" : "ผู้ใช้งาน",
     "Apps" : "แอปฯ",
@@ -74,6 +72,7 @@
     "Access forbidden" : "การเข้าถึงถูกหวงห้าม",
     "Security Warning" : "คำเตือนเกี่ยวกับความปลอดภัย",
     "Create an <strong>admin account</strong>" : "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>",
+    "Username" : "ชื่อผู้ใช้งาน",
     "Password" : "รหัสผ่าน",
     "Data folder" : "โฟลเดอร์เก็บข้อมูล",
     "Configure the database" : "กำหนดค่าฐานข้อมูล",
diff --git a/core/l10n/tr.js b/core/l10n/tr.js
index 32144b5441c..37eab400dd4 100644
--- a/core/l10n/tr.js
+++ b/core/l10n/tr.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
     "I know what I'm doing" : "Ne yaptığımı biliyorum",
-    "Reset password" : "Parolayı sıfırla",
     "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "No" : "Hayır",
     "Yes" : "Evet",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "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",
     "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
-    "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
-    "Username" : "Kullanıcı Adı",
-    "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?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
-    "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
-    "Reset" : "Sıfırla",
     "New password" : "Yeni parola",
     "New Password" : "Yeni Parola",
+    "Reset password" : "Parolayı sıfırla",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
     "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
     "Personal" : "Kişisel",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
     "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
+    "Username" : "Kullanıcı Adı",
     "Password" : "Parola",
     "Storage & database" : "Depolama ve veritabanı",
     "Data folder" : "Veri klasörü",
diff --git a/core/l10n/tr.json b/core/l10n/tr.json
index c22d47c9e37..a34a07bd0e8 100644
--- a/core/l10n/tr.json
+++ b/core/l10n/tr.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Parolanızı değiştirme bağlantısı e-posta adresinize gönderildi. Makul bir süre içerisinde almadıysanız spam/gereksiz klasörlerini kontrol ediniz.<br>Bu konumlarda da yoksa yerel sistem yöneticinize sorunuz.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Dosyalarınız şifrelenmiş. Kurtarma anahtarını etkinleştirmemişseniz, parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak.<br />Ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin.<br />Gerçekten devam etmek istiyor musunuz?",
     "I know what I'm doing" : "Ne yaptığımı biliyorum",
-    "Reset password" : "Parolayı sıfırla",
     "Password can not be changed. Please contact your administrator." : "Parola değiştirilemedi. Lütfen yöneticiniz ile iletişime geçin.",
     "No" : "Hayır",
     "Yes" : "Evet",
@@ -122,13 +121,9 @@
     "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",
     "Use the following link to reset your password: {link}" : "Parolanızı sıfırlamak için bu bağlantıyı kullanın: {link}",
-    "You will receive a link to reset your password via Email." : "Parolanızı sıfırlamak için e-posta ile bir bağlantı alacaksınız.",
-    "Username" : "Kullanıcı Adı",
-    "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?" : "Dosyalarınız şifrelenmiş. Eğer kurtarma anahtarını etkinleştirmediyseniz parola sıfırlama işleminden sonra verilerinize erişmeniz imkansız olacak. Eğer ne yaptığınızdan emin değilseniz, devam etmeden önce sistem yöneticiniz ile iletişime geçin. Gerçekten devam etmek istiyor musunuz?",
-    "Yes, I really want to reset my password now" : "Evet, gerçekten parolamı şimdi sıfırlamak istiyorum",
-    "Reset" : "Sıfırla",
     "New password" : "Yeni parola",
     "New Password" : "Yeni Parola",
+    "Reset password" : "Parolayı sıfırla",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X desteklenmiyor ve %s bu platformda düzgün çalışmayacak. Kendi riskinizle kullanın!",
     "For the best results, please consider using a GNU/Linux server instead." : "En iyi sonuçlar için GNU/Linux sunucusu kullanın.",
     "Personal" : "Kişisel",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Veri klasörünüz ve dosyalarınız .htaccess dosyası çalışmadığı için İnternet'ten erişime açık.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Sunucunuzu nasıl ayarlayacağınıza dair bilgi için, lütfen <a href=\"%s\" target=\"_blank\">belgelendirme sayfasını</a> ziyaret edin.",
     "Create an <strong>admin account</strong>" : "Bir <strong>yönetici hesabı</strong> oluşturun",
+    "Username" : "Kullanıcı Adı",
     "Password" : "Parola",
     "Storage & database" : "Depolama ve veritabanı",
     "Data folder" : "Veri klasörü",
diff --git a/core/l10n/ug.js b/core/l10n/ug.js
index d6a74751c7a..c71c67807c7 100644
--- a/core/l10n/ug.js
+++ b/core/l10n/ug.js
@@ -38,13 +38,13 @@ OC.L10N.register(
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
     "_download %n file_::_download %n files_" : [""],
-    "Username" : "ئىشلەتكۈچى ئاتى",
     "New password" : "يېڭى ئىم",
     "Personal" : "شەخسىي",
     "Users" : "ئىشلەتكۈچىلەر",
     "Apps" : "ئەپلەر",
     "Help" : "ياردەم",
     "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
     "Finish setup" : "تەڭشەك تامام",
     "Log out" : "تىزىمدىن چىق"
diff --git a/core/l10n/ug.json b/core/l10n/ug.json
index bd061a85025..aadc8c1cf8b 100644
--- a/core/l10n/ug.json
+++ b/core/l10n/ug.json
@@ -36,13 +36,13 @@
     "Delete" : "ئۆچۈر",
     "Add" : "قوش",
     "_download %n file_::_download %n files_" : [""],
-    "Username" : "ئىشلەتكۈچى ئاتى",
     "New password" : "يېڭى ئىم",
     "Personal" : "شەخسىي",
     "Users" : "ئىشلەتكۈچىلەر",
     "Apps" : "ئەپلەر",
     "Help" : "ياردەم",
     "Security Warning" : "بىخەتەرلىك ئاگاھلاندۇرۇش",
+    "Username" : "ئىشلەتكۈچى ئاتى",
     "Password" : "ئىم",
     "Finish setup" : "تەڭشەك تامام",
     "Log out" : "تىزىمدىن چىق"
diff --git a/core/l10n/uk.js b/core/l10n/uk.js
index 38f9d17e692..cd444036896 100644
--- a/core/l10n/uk.js
+++ b/core/l10n/uk.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Посилання для скидання вашого пароль було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
     "I know what I'm doing" : "Я знаю що роблю",
-    "Reset password" : "Скинути пароль",
     "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
     "No" : "Ні",
     "Yes" : "Так",
@@ -124,13 +123,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
     "%s password reset" : "%s пароль скинуто",
     "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}",
-    "You will receive a link to reset your password via Email." : "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
-    "Username" : "Ім'я користувача",
-    "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?" : "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?",
-    "Yes, I really want to reset my password now" : "Так, я справді бажаю скинути мій пароль зараз",
-    "Reset" : "Перевстановити",
     "New password" : "Новий пароль",
     "New Password" : "Новий пароль",
+    "Reset password" : "Скинути пароль",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
     "Personal" : "Особисте",
@@ -170,6 +165,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
     "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
+    "Username" : "Ім'я користувача",
     "Password" : "Пароль",
     "Storage & database" : "Сховище і база даних",
     "Data folder" : "Каталог даних",
diff --git a/core/l10n/uk.json b/core/l10n/uk.json
index 8ec13dedae7..4e649b34ff4 100644
--- a/core/l10n/uk.json
+++ b/core/l10n/uk.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "Посилання для скидання вашого пароль було надіслано на ваш email. Якщо ви не отримали його найближчим часом, перевірте теку зі спамом.<br>Якщо і там немає, спитайте вашого місцевого адміністратора.",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "Ваші файли зашифровані. Якщо ви не зробили ключ відновлення, після скидання паролю відновити ваші дані буде неможливо.<br /> Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора перед продовженням.<br /> Ви дійсно хочете продовжити?",
     "I know what I'm doing" : "Я знаю що роблю",
-    "Reset password" : "Скинути пароль",
     "Password can not be changed. Please contact your administrator." : "Пароль не може бути змінено. Будь ласка, зверніться до вашого адміністратора",
     "No" : "Ні",
     "Yes" : "Так",
@@ -122,13 +121,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Не вдалося відправити скидання паролю, тому що немає адреси електронної пошти для цього користувача. Будь ласка, зверніться до адміністратора.",
     "%s password reset" : "%s пароль скинуто",
     "Use the following link to reset your password: {link}" : "Використовуйте наступне посилання для скидання пароля: {link}",
-    "You will receive a link to reset your password via Email." : "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
-    "Username" : "Ім'я користувача",
-    "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?" : "Ваші файли зашифровані. Якщо ви не зробили придатний ключ відновлення, не буде ніякої можливості отримати дані назад після того, як ваш пароль буде скинутий. Якщо ви не знаєте, що робити, будь ласка, зверніться до адміністратора, щоб продовжити. Ви дійсно хочете продовжити?",
-    "Yes, I really want to reset my password now" : "Так, я справді бажаю скинути мій пароль зараз",
-    "Reset" : "Перевстановити",
     "New password" : "Новий пароль",
     "New Password" : "Новий пароль",
+    "Reset password" : "Скинути пароль",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X не підтримується і %s не буде коректно працювати на цій платформі. Випробовуєте на свій риск!",
     "For the best results, please consider using a GNU/Linux server instead." : "Для кращих результатів розгляньте можливість використання GNU/Linux серверу",
     "Personal" : "Особисте",
@@ -168,6 +163,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Ваші дані каталогів і файлів, ймовірно, доступні з інтернету, тому що  .htaccess файл не працює.",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Для отримання інформації, як правильно налаштувати сервер, див. <a href=\"%s\" target=\"_blank\">документацію</a>.",
     "Create an <strong>admin account</strong>" : "Створити <strong>обліковий запис адміністратора</strong>",
+    "Username" : "Ім'я користувача",
     "Password" : "Пароль",
     "Storage & database" : "Сховище і база даних",
     "Data folder" : "Каталог даних",
diff --git a/core/l10n/ur_PK.js b/core/l10n/ur_PK.js
index ce5c57e5fdf..491309f60a9 100644
--- a/core/l10n/ur_PK.js
+++ b/core/l10n/ur_PK.js
@@ -29,7 +29,6 @@ OC.L10N.register(
     "December" : "دسمبر",
     "Settings" : "ترتیبات",
     "Saving..." : "محفوظ ھو رہا ہے ...",
-    "Reset password" : "ری سیٹ پاسورڈ",
     "No" : "نہیں",
     "Yes" : "ہاں",
     "Choose" : "منتخب کریں",
@@ -90,11 +89,8 @@ OC.L10N.register(
     "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
     "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
     "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
-    "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
-    "Username" : "یوزر نیم",
-    "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
-    "Reset" : "ری سیٹ",
     "New password" : "نیا پاسورڈ",
+    "Reset password" : "ری سیٹ پاسورڈ",
     "Personal" : "شخصی",
     "Users" : "صارفین",
     "Apps" : "ایپز",
@@ -107,6 +103,7 @@ OC.L10N.register(
     "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
     "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+    "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
     "Storage & database" : "ذخیرہ اور ڈیٹا بیس",
     "Data folder" : "ڈیٹا فولڈر",
diff --git a/core/l10n/ur_PK.json b/core/l10n/ur_PK.json
index 6f3a5993a9f..138c67824f2 100644
--- a/core/l10n/ur_PK.json
+++ b/core/l10n/ur_PK.json
@@ -27,7 +27,6 @@
     "December" : "دسمبر",
     "Settings" : "ترتیبات",
     "Saving..." : "محفوظ ھو رہا ہے ...",
-    "Reset password" : "ری سیٹ پاسورڈ",
     "No" : "نہیں",
     "Yes" : "ہاں",
     "Choose" : "منتخب کریں",
@@ -88,11 +87,8 @@
     "Please reload the page." : "براہ مہربانی صفحہ دوبارہ لوڈ کریں.",
     "The update was successful. Redirecting you to ownCloud now." : "اپ ڈیٹ کامیاب تھی۔ اپ کو اون کلوڈ سے منسلک کیا جا رہا ہے",
     "Use the following link to reset your password: {link}" : "اپنا پاسورڈ ری سیٹ کرنے کے لیے اس لنک پر کلک کریں۔  {link}",
-    "You will receive a link to reset your password via Email." : "آپ ای میل کے ذریعے اپنے پاسورڈ ری سیٹ کا لنک موصول کریں گے",
-    "Username" : "یوزر نیم",
-    "Yes, I really want to reset my password now" : "جی ہاں، میں واقعی ابھی اپنا پاس ورڈ ری سیٹ کرنا چاہتا ہوں",
-    "Reset" : "ری سیٹ",
     "New password" : "نیا پاسورڈ",
+    "Reset password" : "ری سیٹ پاسورڈ",
     "Personal" : "شخصی",
     "Users" : "صارفین",
     "Apps" : "ایپز",
@@ -105,6 +101,7 @@
     "Please update your PHP installation to use %s securely." : " براہ مہربانی %s کو بحفاظت استعمال کرنے کے پی ایچ پی کی تنصیب اپڈیٹ کریں",
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "آپ کی ڈیٹا ڈائریکٹری اور فائلیں امکان ہےانٹرنیٹ سے قابل رسائی ہیں کیونکہ htaccess. فائل کام نہیں کرتا ہے",
     "Create an <strong>admin account</strong>" : "ایک<strong> ایڈمن اکاؤنٹ</strong> بنائیں",
+    "Username" : "یوزر نیم",
     "Password" : "پاسورڈ",
     "Storage & database" : "ذخیرہ اور ڈیٹا بیس",
     "Data folder" : "ڈیٹا فولڈر",
diff --git a/core/l10n/vi.js b/core/l10n/vi.js
index 5e48c7802d9..6c53239cdf4 100644
--- a/core/l10n/vi.js
+++ b/core/l10n/vi.js
@@ -31,7 +31,6 @@ OC.L10N.register(
     "December" : "Tháng 12",
     "Settings" : "Cài đặt",
     "Saving..." : "Đang lưu...",
-    "Reset password" : "Khôi phục mật khẩu",
     "No" : "Không",
     "Yes" : "Có",
     "Choose" : "Chọn",
@@ -93,12 +92,8 @@ OC.L10N.register(
     "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
     "%s password reset" : "%s thiết lập lại mật khẩu",
     "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
-    "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-    "Username" : "Tên đăng nhập",
-    "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?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
-    "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
-    "Reset" : "Khởi động lại",
     "New password" : "Mật khẩu mới",
+    "Reset password" : "Khôi phục mật khẩu",
     "Personal" : "Cá nhân",
     "Users" : "Người dùng",
     "Apps" : "Ứng dụng",
@@ -119,6 +114,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
     "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
+    "Username" : "Tên đăng nhập",
     "Password" : "Mật khẩu",
     "Data folder" : "Thư mục dữ liệu",
     "Configure the database" : "Cấu hình cơ sở dữ liệu",
diff --git a/core/l10n/vi.json b/core/l10n/vi.json
index 7567c0a65bb..1670cad7777 100644
--- a/core/l10n/vi.json
+++ b/core/l10n/vi.json
@@ -29,7 +29,6 @@
     "December" : "Tháng 12",
     "Settings" : "Cài đặt",
     "Saving..." : "Đang lưu...",
-    "Reset password" : "Khôi phục mật khẩu",
     "No" : "Không",
     "Yes" : "Có",
     "Choose" : "Chọn",
@@ -91,12 +90,8 @@
     "The update was successful. Redirecting you to ownCloud now." : "Cập nhật thành công .Hệ thống sẽ đưa bạn tới ownCloud.",
     "%s password reset" : "%s thiết lập lại mật khẩu",
     "Use the following link to reset your password: {link}" : "Dùng đường dẫn sau để khôi phục lại mật khẩu : {link}",
-    "You will receive a link to reset your password via Email." : "Vui lòng kiểm tra Email để khôi phục lại mật khẩu.",
-    "Username" : "Tên đăng nhập",
-    "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?" : "Tập tin của bạn được mã hóa. Nếu bạn chưa kích hoạt khoá phục hồi, sẽ không có cách nào để lấy lại được dữ liệu sau khi thiết lập lại mật khẩu. Nếu bạn không biết phải làm gì, xin vui lòng liên hệ với quản trị viên trước khi tiếp tục. Bạn có muốn tiếp tục?",
-    "Yes, I really want to reset my password now" : "Vâng, tôi muốn thiết lập lại mật khẩu ngay.",
-    "Reset" : "Khởi động lại",
     "New password" : "Mật khẩu mới",
+    "Reset password" : "Khôi phục mật khẩu",
     "Personal" : "Cá nhân",
     "Users" : "Người dùng",
     "Apps" : "Ứng dụng",
@@ -117,6 +112,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "Thư mục và file dữ liệu của bạn có thể được truy cập từ internet bởi vì file .htaccess không hoạt động",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "Để biết thêm thông tin và cách cấu hình đúng vui lòng xem thêm <a href=\"%s\" target=\"_blank\">tài l</a>.",
     "Create an <strong>admin account</strong>" : "Tạo một <strong>tài khoản quản trị</strong>",
+    "Username" : "Tên đăng nhập",
     "Password" : "Mật khẩu",
     "Data folder" : "Thư mục dữ liệu",
     "Configure the database" : "Cấu hình cơ sở dữ liệu",
diff --git a/core/l10n/zh_CN.js b/core/l10n/zh_CN.js
index da5521925ea..8a432e857ff 100644
--- a/core/l10n/zh_CN.js
+++ b/core/l10n/zh_CN.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
     "I know what I'm doing" : "我知道我在做什么",
-    "Reset password" : "重置密码",
     "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
     "No" : "否",
     "Yes" : "是",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
     "%s password reset" : "重置 %s 的密码",
     "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
-    "You will receive a link to reset your password via Email." : "您将会收到包含可以重置密码链接的邮件。",
-    "Username" : "用户名",
-    "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?" : "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
-    "Yes, I really want to reset my password now" : "使得，我真的要现在重设密码",
-    "Reset" : "重置",
     "New password" : "新密码",
     "New Password" : "新密码",
+    "Reset password" : "重置密码",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
     "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
     "Personal" : "个人",
@@ -165,6 +160,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
     "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Username" : "用户名",
     "Password" : "密码",
     "Storage & database" : "存储 & 数据库",
     "Data folder" : "数据目录",
diff --git a/core/l10n/zh_CN.json b/core/l10n/zh_CN.json
index ff67feacad0..7f2aa70e0cd 100644
--- a/core/l10n/zh_CN.json
+++ b/core/l10n/zh_CN.json
@@ -37,7 +37,6 @@
     "The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator." : "密码重置邮件已经发送到您的电子邮箱中。如果您长时间没能收到邮件，请检查您的垃圾/广告邮件箱。<br>如果未能收到邮件请联系管理员。",
     "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?" : "您的文件已被加密。如果您没有启用恢复密钥，密码重置后您将无法取回您的文件。<br />在继续之前，如果有疑问请联系您的管理员。<br />确认继续？",
     "I know what I'm doing" : "我知道我在做什么",
-    "Reset password" : "重置密码",
     "Password can not be changed. Please contact your administrator." : "无法修改密码，请联系管理员。",
     "No" : "否",
     "Yes" : "是",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "此用户名的电子邮件地址不存在导致无法发送重置邮件，请联系管理员。",
     "%s password reset" : "重置 %s 的密码",
     "Use the following link to reset your password: {link}" : "使用以下链接重置您的密码：{link}",
-    "You will receive a link to reset your password via Email." : "您将会收到包含可以重置密码链接的邮件。",
-    "Username" : "用户名",
-    "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?" : "您的文件已加密。如果您不启用恢复密钥，您将无法在重设密码后取回文件。如果您不太确定，请在继续前联系您的管理员。您真的要继续吗？",
-    "Yes, I really want to reset my password now" : "使得，我真的要现在重设密码",
-    "Reset" : "重置",
     "New password" : "新密码",
     "New Password" : "新密码",
+    "Reset password" : "重置密码",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X 不被支持并且 %s 在这个平台上无法正常工作。请自行承担风险！",
     "For the best results, please consider using a GNU/Linux server instead." : "为了达到最好的效果，请考虑使用 GNU/Linux 服务器。",
     "Personal" : "个人",
@@ -163,6 +158,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的数据目录和文件可能可以直接被互联网访问，因为 .htaccess 并未正常工作。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "关于如何配置服务器，请参见 <a href=\"%s\" target=\"_blank\">此文档</a>。",
     "Create an <strong>admin account</strong>" : "创建<strong>管理员账号</strong>",
+    "Username" : "用户名",
     "Password" : "密码",
     "Storage & database" : "存储 & 数据库",
     "Data folder" : "数据目录",
diff --git a/core/l10n/zh_HK.js b/core/l10n/zh_HK.js
index c36746e12fc..9e4ef8969d8 100644
--- a/core/l10n/zh_HK.js
+++ b/core/l10n/zh_HK.js
@@ -22,7 +22,6 @@ OC.L10N.register(
     "December" : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
-    "Reset password" : "重設密碼",
     "No" : "否",
     "Yes" : "是",
     "Ok" : "確認",
@@ -54,17 +53,16 @@ OC.L10N.register(
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
     "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
-    "You will receive a link to reset your password via Email." : "你將收到一封電郵",
-    "Username" : "用戶名稱",
-    "Reset" : "重設",
     "New password" : "新密碼",
     "New Password" : "新密碼",
+    "Reset password" : "重設密碼",
     "Personal" : "個人",
     "Users" : "用戶",
     "Apps" : "軟件",
     "Admin" : "管理",
     "Help" : "幫助",
     "Create an <strong>admin account</strong>" : "建立管理員帳戶",
+    "Username" : "用戶名稱",
     "Password" : "密碼",
     "Configure the database" : "設定資料庫",
     "Database user" : "資料庫帳戶",
diff --git a/core/l10n/zh_HK.json b/core/l10n/zh_HK.json
index 294bdce33b6..83806390d1f 100644
--- a/core/l10n/zh_HK.json
+++ b/core/l10n/zh_HK.json
@@ -20,7 +20,6 @@
     "December" : "十二月",
     "Settings" : "設定",
     "Saving..." : "儲存中...",
-    "Reset password" : "重設密碼",
     "No" : "否",
     "Yes" : "是",
     "Ok" : "確認",
@@ -52,17 +51,16 @@
     "_download %n file_::_download %n files_" : [""],
     "The update was successful. Redirecting you to ownCloud now." : "更新成功, 正",
     "Use the following link to reset your password: {link}" : "請用以下連結重設你的密碼: {link}",
-    "You will receive a link to reset your password via Email." : "你將收到一封電郵",
-    "Username" : "用戶名稱",
-    "Reset" : "重設",
     "New password" : "新密碼",
     "New Password" : "新密碼",
+    "Reset password" : "重設密碼",
     "Personal" : "個人",
     "Users" : "用戶",
     "Apps" : "軟件",
     "Admin" : "管理",
     "Help" : "幫助",
     "Create an <strong>admin account</strong>" : "建立管理員帳戶",
+    "Username" : "用戶名稱",
     "Password" : "密碼",
     "Configure the database" : "設定資料庫",
     "Database user" : "資料庫帳戶",
diff --git a/core/l10n/zh_TW.js b/core/l10n/zh_TW.js
index 47a9f738ed0..2a3e38d6ff8 100644
--- a/core/l10n/zh_TW.js
+++ b/core/l10n/zh_TW.js
@@ -39,7 +39,6 @@ OC.L10N.register(
     "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/>您確定要繼續嗎？",
     "I know what I'm doing" : "我知道我在幹嘛",
-    "Reset password" : "重設密碼",
     "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
     "No" : "否",
     "Yes" : "是",
@@ -120,13 +119,9 @@ OC.L10N.register(
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
     "%s password reset" : "%s 密碼重設",
     "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}",
-    "You will receive a link to reset your password via Email." : "重設密碼的連結將會寄到您的電子郵件信箱。",
-    "Username" : "使用者名稱",
-    "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?" : "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？",
-    "Yes, I really want to reset my password now" : "對，我現在想要重設我的密碼。",
-    "Reset" : "重設",
     "New password" : "新密碼",
     "New Password" : "新密碼",
+    "Reset password" : "重設密碼",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
     "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
     "Personal" : "個人",
@@ -165,6 +160,7 @@ OC.L10N.register(
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
     "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
+    "Username" : "使用者名稱",
     "Password" : "密碼",
     "Storage & database" : "儲存空間和資料庫",
     "Data folder" : "資料儲存位置",
diff --git a/core/l10n/zh_TW.json b/core/l10n/zh_TW.json
index 875b5b5af4a..c8db6e348c7 100644
--- a/core/l10n/zh_TW.json
+++ b/core/l10n/zh_TW.json
@@ -37,7 +37,6 @@
     "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/>您確定要繼續嗎？",
     "I know what I'm doing" : "我知道我在幹嘛",
-    "Reset password" : "重設密碼",
     "Password can not be changed. Please contact your administrator." : "無法變更密碼，請聯絡您的系統管理員",
     "No" : "否",
     "Yes" : "是",
@@ -118,13 +117,9 @@
     "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "無法寄送重設 email ，因為這個帳號沒有設定 email 地址，請聯絡您的系統管理員",
     "%s password reset" : "%s 密碼重設",
     "Use the following link to reset your password: {link}" : "請至以下連結重設您的密碼： {link}",
-    "You will receive a link to reset your password via Email." : "重設密碼的連結將會寄到您的電子郵件信箱。",
-    "Username" : "使用者名稱",
-    "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?" : "您的檔案已加密，如果您沒有設定還原金鑰，未來重設密碼後將無法取回您的資料。如果您不確定該怎麼做，請洽詢系統管理員後再繼續。您確定要現在繼續嗎？",
-    "Yes, I really want to reset my password now" : "對，我現在想要重設我的密碼。",
-    "Reset" : "重設",
     "New password" : "新密碼",
     "New Password" : "新密碼",
+    "Reset password" : "重設密碼",
     "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "不支援 Mac OS X 而且 %s 在這個平台上面無法正常運作，請自行衡量風險！",
     "For the best results, please consider using a GNU/Linux server instead." : "請考慮使用 GNU/Linux 伺服器以取得最好的效果",
     "Personal" : "個人",
@@ -163,6 +158,7 @@
     "Your data directory and files are probably accessible from the internet because the .htaccess file does not work." : "您的資料目錄看起來可以被 Internet 公開存取，因為 .htaccess 設定並未生效。",
     "For information how to properly configure your server, please see the <a href=\"%s\" target=\"_blank\">documentation</a>." : "請參考<a href=\"%s\" target=\"_blank\">說明文件</a>以瞭解如何正確設定您的伺服器。",
     "Create an <strong>admin account</strong>" : "建立一個<strong>管理者帳號</strong>",
+    "Username" : "使用者名稱",
     "Password" : "密碼",
     "Storage & database" : "儲存空間和資料庫",
     "Data folder" : "資料儲存位置",
diff --git a/lib/l10n/nl.js b/lib/l10n/nl.js
index 1a5b51de2b5..4fdff3c67ef 100644
--- a/lib/l10n/nl.js
+++ b/lib/l10n/nl.js
@@ -4,7 +4,7 @@ OC.L10N.register(
     "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory!",
     "This can usually be fixed by giving the webserver write access to the config directory" : "Dit kan hersteld worden door de webserver schrijfrechten te geven op de de config directory",
     "See %s" : "Zie %s",
-    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %sgeven op de de config directory%s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver %sschrijfrechten te geven op de de config directory%s",
     "Sample configuration detected" : "Voorbeeldconfiguratie gevonden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert",
     "Help" : "Help",
diff --git a/lib/l10n/nl.json b/lib/l10n/nl.json
index 432915aa2f2..be980d330d6 100644
--- a/lib/l10n/nl.json
+++ b/lib/l10n/nl.json
@@ -2,7 +2,7 @@
     "Cannot write into \"config\" directory!" : "Kan niet schrijven naar de \"config\" directory!",
     "This can usually be fixed by giving the webserver write access to the config directory" : "Dit kan hersteld worden door de webserver schrijfrechten te geven op de de config directory",
     "See %s" : "Zie %s",
-    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver schrijfrechten te %sgeven op de de config directory%s",
+    "This can usually be fixed by %sgiving the webserver write access to the config directory%s." : "Dit kan hersteld worden door de webserver %sschrijfrechten te geven op de de config directory%s",
     "Sample configuration detected" : "Voorbeeldconfiguratie gevonden",
     "It has been detected that the sample configuration has been copied. This can break your installation and is unsupported. Please read the documentation before performing changes on config.php" : "Blijkbaar is de voorbeeldconfiguratie gekopieerd. Dit kan uw installatie beschadigen en wordt niet dan ook ondersteund. Lees de documentatie voordat u wijzigingen aan config.php doorvoert",
     "Help" : "Help",
diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js
index 6328972ac8a..f547c7b9104 100644
--- a/lib/l10n/sq.js
+++ b/lib/l10n/sq.js
@@ -6,6 +6,8 @@ OC.L10N.register(
     "Settings" : "Parametra",
     "Users" : "Përdoruesit",
     "Admin" : "Admin",
+    "Unknown filetype" : "Tip i panjohur skedari",
+    "Invalid image" : "Imazh i pavlefshëm",
     "web services under your control" : "shërbime web nën kontrollin tënd",
     "Application is not enabled" : "Programi nuk është i aktivizuar.",
     "Authentication error" : "Veprim i gabuar gjatë vërtetimit të identitetit",
diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json
index 7df63e8ff84..8f2d062b91b 100644
--- a/lib/l10n/sq.json
+++ b/lib/l10n/sq.json
@@ -4,6 +4,8 @@
     "Settings" : "Parametra",
     "Users" : "Përdoruesit",
     "Admin" : "Admin",
+    "Unknown filetype" : "Tip i panjohur skedari",
+    "Invalid image" : "Imazh i pavlefshëm",
     "web services under your control" : "shërbime web nën kontrollin tënd",
     "Application is not enabled" : "Programi nuk është i aktivizuar.",
     "Authentication error" : "Veprim i gabuar gjatë vërtetimit të identitetit",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 18406a70e24..09ff12946e7 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
     "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
+    "Search Users" : "Hledat uživatele",
     "Add Group" : "Přidat skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všichni",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 376d1007771..6b95da48bd7 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -220,6 +220,7 @@
     "Create" : "Vytvořit",
     "Admin Recovery Password" : "Heslo obnovy správce",
     "Enter the recovery password in order to recover the users files during password change" : "Zadejte heslo obnovy pro obnovení souborů uživatele při změně hesla",
+    "Search Users" : "Hledat uživatele",
     "Add Group" : "Přidat skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všichni",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index fa39a3a4657..6a45f20375f 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
     "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
+    "Search Users" : "Søg efter brugere",
     "Add Group" : "Tilføj Gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index f2b0c136368..d7c8caaa5b1 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -220,6 +220,7 @@
     "Create" : "Ny",
     "Admin Recovery Password" : "Administrator gendannelse kodeord",
     "Enter the recovery password in order to recover the users files during password change" : "Indtast et gendannelse kodeord for, at kunne gendanne brugerens filer ved ændring af kodeord",
+    "Search Users" : "Søg efter brugere",
     "Add Group" : "Tilføj Gruppe",
     "Group" : "Gruppe",
     "Everyone" : "Alle",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 01c1495a535..0270c5ea014 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
     "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users" : "Nutzer suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 9a01aa2dbd7..9f8c0ebb043 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -220,6 +220,7 @@
     "Create" : "Anlegen",
     "Admin Recovery Password" : "Admin-Wiederherstellungspasswort",
     "Enter the recovery password in order to recover the users files during password change" : "Gib das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users" : "Nutzer suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 08726f1afc9..9ac0e0af61d 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Erstellen",
     "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
     "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Search Users" : "Nutzer suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 700d8c03a42..c0cd88181f6 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -220,6 +220,7 @@
     "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",
+    "Search Users" : "Nutzer suchen",
     "Add Group" : "Gruppe hinzufügen",
     "Group" : "Gruppe",
     "Everyone" : "Jeder",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 2847fcd65a0..ed90998d2b4 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
+    "Search Users" : "Search Users",
     "Add Group" : "Add Group",
     "Group" : "Group",
     "Everyone" : "Everyone",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 989044bafdb..3890cbd8079 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -220,6 +220,7 @@
     "Create" : "Create",
     "Admin Recovery Password" : "Admin Recovery Password",
     "Enter the recovery password in order to recover the users files during password change" : "Enter the recovery password in order to recover the user's files during password change",
+    "Search Users" : "Search Users",
     "Add Group" : "Add Group",
     "Group" : "Group",
     "Everyone" : "Everyone",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index eeae90c5e80..93ba9b53b56 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Search Users" : "Buscar usuarios",
     "Add Group" : "Agregar grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 2a80ccdde83..1e3ce46d274 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -220,6 +220,7 @@
     "Create" : "Crear",
     "Admin Recovery Password" : "Recuperación de la contraseña de administración",
     "Enter the recovery password in order to recover the users files during password change" : "Introduzca la contraseña de recuperación a fin de recuperar los archivos de los usuarios durante el cambio de contraseña.",
+    "Search Users" : "Buscar usuarios",
     "Add Group" : "Agregar grupo",
     "Group" : "Grupo",
     "Everyone" : "Todos",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index c031dcb043e..eed62e818c6 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -214,6 +214,7 @@ OC.L10N.register(
     "Username" : "Käyttäjätunnus",
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
+    "Search Users" : "Etsi käyttäjiä",
     "Add Group" : "Lisää ryhmä",
     "Group" : "Ryhmä",
     "Everyone" : "Kaikki",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 17bb06c2f4c..54b334704ad 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -212,6 +212,7 @@
     "Username" : "Käyttäjätunnus",
     "Create" : "Luo",
     "Admin Recovery Password" : "Ylläpitäjän palautussalasana",
+    "Search Users" : "Etsi käyttäjiä",
     "Add Group" : "Lisää ryhmä",
     "Group" : "Ryhmä",
     "Everyone" : "Kaikki",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index cf18809aa7d..e1f128e248d 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Créer",
     "Admin Recovery Password" : "Récupération du mot de passe administrateur",
     "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe",
+    "Search Users" : "Recherche des utilisateurs",
     "Add Group" : "Ajouter un groupe",
     "Group" : "Groupe",
     "Everyone" : "Tout le monde",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index d9e128e4d9e..f10cdd96008 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -220,6 +220,7 @@
     "Create" : "Créer",
     "Admin Recovery Password" : "Récupération du mot de passe administrateur",
     "Enter the recovery password in order to recover the users files during password change" : "Entrez le mot de passe de récupération pour récupérer les fichiers utilisateurs pendant le changement de mot de passe",
+    "Search Users" : "Recherche des utilisateurs",
     "Add Group" : "Ajouter un groupe",
     "Group" : "Groupe",
     "Everyone" : "Tout le monde",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 8bc46cc45ae..f4bf7d07bbf 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
     "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
+    "Search Users" : "Zoek gebruikers",
     "Add Group" : "Toevoegen groep",
     "Group" : "Groep",
     "Everyone" : "Iedereen",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 72bece28415..ce931dbfcca 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -220,6 +220,7 @@
     "Create" : "Aanmaken",
     "Admin Recovery Password" : "Beheer herstel wachtwoord",
     "Enter the recovery password in order to recover the users files during password change" : "Voer het herstel wachtwoord in om de gebruikersbestanden terug te halen bij wachtwoordwijziging",
+    "Search Users" : "Zoek gebruikers",
     "Add Group" : "Toevoegen groep",
     "Group" : "Groep",
     "Everyone" : "Iedereen",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 30346ed6e58..66f9617dc2f 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
+    "Search Users" : "Pesquisar Usuários",
     "Add Group" : "Adicionar Grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 0d89f75f1d1..05bb0a60eec 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -220,6 +220,7 @@
     "Create" : "Criar",
     "Admin Recovery Password" : "Recuperação da Senha do Administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação para recuperar os arquivos dos usuários durante a mudança de senha.",
+    "Search Users" : "Pesquisar Usuários",
     "Add Group" : "Adicionar Grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index 8a5b941d8c7..c5741c32ee9 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -13,8 +13,8 @@ OC.L10N.register(
     "Group already exists" : "O grupo já existe",
     "Unable to add group" : "Não é possível acrescentar o grupo",
     "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-    "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua palavra-passe e tente novamente",
     "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
     "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't remove app." : "Não foi possível remover a aplicação.",
@@ -30,12 +30,12 @@ OC.L10N.register(
     "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
     "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
     "Couldn't update app." : "Não foi possível actualizar a aplicação.",
-    "Wrong password" : "Senha errada",
+    "Wrong password" : "Palavra-passe errada",
     "No user supplied" : "Nenhum utilizador especificado.",
-    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
-    "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
-    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
-    "Unable to change password" : "Não foi possível alterar a sua password",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário seráo perdidos todos os dados",
+    "Wrong admin recovery password. Please check the password and try again." : "Palavra-passe de recuperação de administrador errada. Por favor, verifique a palavra-passe e tente novamente.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de codificação foi atualizada com sucesso.",
+    "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
     "Not enabled" : "Desactivado",
     "Recommended" : "Recomendado",
@@ -61,11 +61,11 @@ OC.L10N.register(
     "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
     "Uninstall" : "Desinstalar",
     "Select a profile picture" : "Seleccione uma fotografia de perfil",
-    "Very weak password" : "Senha muito fraca",
-    "Weak password" : "Senha fraca",
-    "So-so password" : "Senha aceitável",
-    "Good password" : "Senha Forte",
-    "Strong password" : "Senha muito forte",
+    "Very weak password" : "Palavra-passe muito fraca",
+    "Weak password" : "Palavra-passe fraca",
+    "So-so password" : "Palavra-passe aceitável",
+    "Good password" : "Palavra-passe boa",
+    "Strong password" : "Palavra-passe forte",
     "Valid until {date}" : "Válido até {date}",
     "Delete" : "Apagar",
     "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
@@ -83,7 +83,7 @@ OC.L10N.register(
     "add group" : "Adicionar grupo",
     "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
     "Error creating user" : "Erro a criar utilizador",
-    "A valid password must be provided" : "Uma password válida deve ser fornecida",
+    "A valid password must be provided" : "Deve ser fornecida uma palavra-passe válida",
     "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
     "__language_name__" : "__language_name__",
     "Personal Info" : "Informação Pessoal",
@@ -131,7 +131,7 @@ OC.L10N.register(
     "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.",
     "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
     "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
-    "Enforce password protection" : "Forçar protecção da palavra passe",
+    "Enforce password protection" : "Forçar proteção por palavra-passe",
     "Allow public uploads" : "Permitir Envios Públicos",
     "Set default expiration date" : "Especificar a data padrão de expiração",
     "Expire after " : "Expira após",
@@ -157,7 +157,7 @@ OC.L10N.register(
     "Port" : "Porta",
     "Credentials" : "Credenciais",
     "SMTP Username" : "Nome de utilizador SMTP",
-    "SMTP Password" : "Senha SMTP",
+    "SMTP Password" : "Palavra-passe SMTP",
     "Store credentials" : "Armazenar credenciais",
     "Test email settings" : "Testar definições de e-mail",
     "Send email" : "Enviar email",
@@ -185,16 +185,16 @@ OC.L10N.register(
     "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
     "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
-    "Password" : "Password",
+    "Password" : "Palavra-passe",
     "Your password was changed" : "A sua palavra-passe foi alterada",
-    "Unable to change your password" : "Não foi possivel alterar a sua palavra-chave",
-    "Current password" : "Palavra-chave actual",
-    "New password" : "Nova palavra-chave",
-    "Change password" : "Alterar palavra-chave",
+    "Unable to change your password" : "Não foi possível alterar a sua palavra-passe",
+    "Current password" : "Palavra-passe atual",
+    "New password" : "Nova palavra-passe",
+    "Change password" : "Alterar palavra-passe",
     "Full Name" : "Nome completo",
     "Email" : "Email",
     "Your email address" : "O seu endereço de email",
-    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
+    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação da palavra-passe e receber notificações",
     "Profile picture" : "Foto do perfil",
     "Upload new" : "Carregar novo",
     "Select new from Files" : "Seleccionar novo a partir dos ficheiros",
@@ -211,7 +211,7 @@ OC.L10N.register(
     "Valid until %s" : "Válido até %s",
     "Import Root Certificate" : "Importar Certificado Root",
     "The encryption app is no longer enabled, please decrypt all your files" : "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
-    "Log-in password" : "Password de entrada",
+    "Log-in password" : "Palavra-passe de Iniciar a Sessão",
     "Decrypt all Files" : "Desencriptar todos os ficheiros",
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
     "Restore Encryption Keys" : "Restaurar as chaves de encriptação",
@@ -220,8 +220,9 @@ OC.L10N.register(
     "Show last log in" : "Mostrar ultimo acesso de entrada",
     "Username" : "Nome de utilizador",
     "Create" : "Criar",
-    "Admin Recovery Password" : "Recuperar password de administrador",
-    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
+    "Admin Recovery Password" : "Recuperação da Palavra-passe de Administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os ficheiros dos utilizadores durante a mudança da palavra-passe",
+    "Search Users" : "Procurar Utilizadores",
     "Add Group" : "Adicionar grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index 8a3882cd7b1..ae4a72170c3 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -11,8 +11,8 @@
     "Group already exists" : "O grupo já existe",
     "Unable to add group" : "Não é possível acrescentar o grupo",
     "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
-    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível desencriptar os seus arquivos. Verifique a sua owncloud.log ou pergunte ao seu administrador",
-    "Couldn't decrypt your files, check your password and try again" : "Não foi possível desencriptar os seus arquivos.  Verifique a sua senha e tente novamente",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Couldn't decrypt your files, check your password and try again" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua palavra-passe e tente novamente",
     "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
     "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't remove app." : "Não foi possível remover a aplicação.",
@@ -28,12 +28,12 @@
     "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
     "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
     "Couldn't update app." : "Não foi possível actualizar a aplicação.",
-    "Wrong password" : "Senha errada",
+    "Wrong password" : "Palavra-passe errada",
     "No user supplied" : "Nenhum utilizador especificado.",
-    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor forneça uma palavra chave de recuperação de administrador, caso contrário todos os dados de utilizador serão perdidos",
-    "Wrong admin recovery password. Please check the password and try again." : "Palavra chave de recuperação de administrador errada. Por favor verifique a palavra chave e tente de novo.",
-    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de encriptação foi atualizada.",
-    "Unable to change password" : "Não foi possível alterar a sua password",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário seráo perdidos todos os dados",
+    "Wrong admin recovery password. Please check the password and try again." : "Palavra-passe de recuperação de administrador errada. Por favor, verifique a palavra-passe e tente novamente.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de codificação foi atualizada com sucesso.",
+    "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
     "Not enabled" : "Desactivado",
     "Recommended" : "Recomendado",
@@ -59,11 +59,11 @@
     "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
     "Uninstall" : "Desinstalar",
     "Select a profile picture" : "Seleccione uma fotografia de perfil",
-    "Very weak password" : "Senha muito fraca",
-    "Weak password" : "Senha fraca",
-    "So-so password" : "Senha aceitável",
-    "Good password" : "Senha Forte",
-    "Strong password" : "Senha muito forte",
+    "Very weak password" : "Palavra-passe muito fraca",
+    "Weak password" : "Palavra-passe fraca",
+    "So-so password" : "Palavra-passe aceitável",
+    "Good password" : "Palavra-passe boa",
+    "Strong password" : "Palavra-passe forte",
     "Valid until {date}" : "Válido até {date}",
     "Delete" : "Apagar",
     "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
@@ -81,7 +81,7 @@
     "add group" : "Adicionar grupo",
     "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
     "Error creating user" : "Erro a criar utilizador",
-    "A valid password must be provided" : "Uma password válida deve ser fornecida",
+    "A valid password must be provided" : "Deve ser fornecida uma palavra-passe válida",
     "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
     "__language_name__" : "__language_name__",
     "Personal Info" : "Informação Pessoal",
@@ -129,7 +129,7 @@
     "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.",
     "Allow apps to use the Share API" : "Permitir que os utilizadores usem a API de partilha",
     "Allow users to share via link" : "Permitir que os utilizadores partilhem através do link",
-    "Enforce password protection" : "Forçar protecção da palavra passe",
+    "Enforce password protection" : "Forçar proteção por palavra-passe",
     "Allow public uploads" : "Permitir Envios Públicos",
     "Set default expiration date" : "Especificar a data padrão de expiração",
     "Expire after " : "Expira após",
@@ -155,7 +155,7 @@
     "Port" : "Porta",
     "Credentials" : "Credenciais",
     "SMTP Username" : "Nome de utilizador SMTP",
-    "SMTP Password" : "Senha SMTP",
+    "SMTP Password" : "Palavra-passe SMTP",
     "Store credentials" : "Armazenar credenciais",
     "Test email settings" : "Testar definições de e-mail",
     "Send email" : "Enviar email",
@@ -183,16 +183,16 @@
     "If you want to support the project\n\t\t<a href=\"https://owncloud.org/contribute\"\n\t\t\ttarget=\"_blank\">join development</a>\n\t\tor\n\t\t<a href=\"https://owncloud.org/promote\"\n\t\t\ttarget=\"_blank\">spread the word</a>!" : "Se quer ajudar no projecto\n⇥⇥<a href=\"https://owncloud.org/contribute\"\n⇥⇥⇥target=\"_blank\">aderir desenvolvimento</a>\n⇥⇥ou\n⇥⇥<a href=\"https://owncloud.org/promote\"\n⇥⇥⇥target=\"_blank\">espalhe a palavra</a>!",
     "Show First Run Wizard again" : "Mostrar novamente Wizard de Arranque Inicial",
     "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Usou <strong>%s</strong> do disponivel <strong>%s</strong>",
-    "Password" : "Password",
+    "Password" : "Palavra-passe",
     "Your password was changed" : "A sua palavra-passe foi alterada",
-    "Unable to change your password" : "Não foi possivel alterar a sua palavra-chave",
-    "Current password" : "Palavra-chave actual",
-    "New password" : "Nova palavra-chave",
-    "Change password" : "Alterar palavra-chave",
+    "Unable to change your password" : "Não foi possível alterar a sua palavra-passe",
+    "Current password" : "Palavra-passe atual",
+    "New password" : "Nova palavra-passe",
+    "Change password" : "Alterar palavra-passe",
     "Full Name" : "Nome completo",
     "Email" : "Email",
     "Your email address" : "O seu endereço de email",
-    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação de senha e receber notificações",
+    "Fill in an email address to enable password recovery and receive notifications" : "Preencha com um endereço e-mail para permitir a recuperação da palavra-passe e receber notificações",
     "Profile picture" : "Foto do perfil",
     "Upload new" : "Carregar novo",
     "Select new from Files" : "Seleccionar novo a partir dos ficheiros",
@@ -209,7 +209,7 @@
     "Valid until %s" : "Válido até %s",
     "Import Root Certificate" : "Importar Certificado Root",
     "The encryption app is no longer enabled, please decrypt all your files" : "A aplicação de encriptação já não está ativa, por favor desincripte todos os seus ficheiros",
-    "Log-in password" : "Password de entrada",
+    "Log-in password" : "Palavra-passe de Iniciar a Sessão",
     "Decrypt all Files" : "Desencriptar todos os ficheiros",
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "As suas chaves de encriptação foram movidas para um local de segurança. Em caso de algo correr mal você pode restaurar as chaves.  Só deve eliminar as chaves permanentemente se tiver certeza absoluta que os ficheiros são decrepitados correctamente.",
     "Restore Encryption Keys" : "Restaurar as chaves de encriptação",
@@ -218,8 +218,9 @@
     "Show last log in" : "Mostrar ultimo acesso de entrada",
     "Username" : "Nome de utilizador",
     "Create" : "Criar",
-    "Admin Recovery Password" : "Recuperar password de administrador",
-    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os arquivos de usuários durante a mudança de senha",
+    "Admin Recovery Password" : "Recuperação da Palavra-passe de Administrador",
+    "Enter the recovery password in order to recover the users files during password change" : "Digite a senha de recuperação, a fim de recuperar os ficheiros dos utilizadores durante a mudança da palavra-passe",
+    "Search Users" : "Procurar Utilizadores",
     "Add Group" : "Adicionar grupo",
     "Group" : "Grupo",
     "Everyone" : "Para todos",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 0a493f28e86..d30661a1ee4 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -222,6 +222,7 @@ OC.L10N.register(
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
     "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
+    "Search Users" : "Kullanıcı Ara",
     "Add Group" : "Grup Ekle",
     "Group" : "Grup",
     "Everyone" : "Herkes",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 255c271496e..b38ac57719b 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -220,6 +220,7 @@
     "Create" : "Oluştur",
     "Admin Recovery Password" : "Yönetici Kurtarma Parolası",
     "Enter the recovery password in order to recover the users files during password change" : "Parola değiştirme sırasında kullanıcı dosyalarını kurtarmak için kurtarma parolasını girin",
+    "Search Users" : "Kullanıcı Ara",
     "Add Group" : "Grup Ekle",
     "Group" : "Grup",
     "Everyone" : "Herkes",
-- 
GitLab


From 64421d76fdd8b718c3f0fccf94ba0028adc593b4 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 20 Nov 2014 12:37:59 +0100
Subject: [PATCH 480/616] Deduplicate function by moving it to the OC_Helper

---
 lib/private/helper.php         | 17 +++++++++++++++++
 lib/private/preview/movies.php | 12 ++----------
 settings/admin.php             | 18 +-----------------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/lib/private/helper.php b/lib/private/helper.php
index 5b1d31bfc59..be448b8ff9b 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -872,6 +872,23 @@ class OC_Helper {
 		return true;
 	}
 
+	/**
+	 * Try to find a program
+	 * Note: currently windows is not supported
+	 *
+	 * @param string $program
+	 * @return null|string
+	 */
+	public static function findBinaryPath($program) {
+		if (!\OC_Util::runningOnWindows() && self::is_function_enabled('exec')) {
+			exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
+			if ($returnCode === 0 && count($output) > 0) {
+				return escapeshellcmd($output[0]);
+			}
+		}
+		return null;
+	}
+
 	/**
 	 * Calculate the disc space for the given path
 	 *
diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index 2a23c2141c1..8217ad24409 100644
--- a/lib/private/preview/movies.php
+++ b/lib/private/preview/movies.php
@@ -8,14 +8,6 @@
  */
 namespace OC\Preview;
 
-function findBinaryPath($program) {
-	exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
-	if ($returnCode === 0 && count($output) > 0) {
-		return escapeshellcmd($output[0]);
-	}
-	return null;
-}
-
 // movie preview is currently not supported on Windows
 if (!\OC_Util::runningOnWindows()) {
 	$isExecEnabled = \OC_Helper::is_function_enabled('exec');
@@ -23,9 +15,9 @@ if (!\OC_Util::runningOnWindows()) {
 	$avconvBinary = null;
 
 	if ($isExecEnabled) {
-		$avconvBinary = findBinaryPath('avconv');
+		$avconvBinary = \OC_Helper::findBinaryPath('avconv');
 		if (!$avconvBinary) {
-			$ffmpegBinary = findBinaryPath('ffmpeg');
+			$ffmpegBinary = \OC_Helper::findBinaryPath('ffmpeg');
 		}
 	}
 
diff --git a/settings/admin.php b/settings/admin.php
index 2b964613096..a669974891c 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -17,7 +17,7 @@ $config = \OC::$server->getConfig();
 $appConfig = \OC::$server->getAppConfig();
 
 // Should we display sendmail as an option?
-$template->assign('sendmail_is_available', (bool)findBinaryPath('sendmail'));
+$template->assign('sendmail_is_available', (bool) \OC_Helper::findBinaryPath('sendmail'));
 
 $template->assign('loglevel', $config->getSystemValue("loglevel", 2));
 $template->assign('mail_domain', $config->getSystemValue("mail_domain", ''));
@@ -115,19 +115,3 @@ $formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log'
 $template->assign('forms', $formsAndMore);
 
 $template->printPage();
-
-/**
- * Try to find a program
- *
- * @param string $program
- * @return null|string
- */
-function findBinaryPath($program) {
-	if (!\OC_Util::runningOnWindows() && \OC_Helper::is_function_enabled('exec')) {
-		exec('command -v ' . escapeshellarg($program) . ' 2> /dev/null', $output, $returnCode);
-		if ($returnCode === 0 && count($output) > 0) {
-			return escapeshellcmd($output[0]);
-		}
-	}
-	return null;
-}
-- 
GitLab


From d15f1882f91c4ab71c8a41f62f5277bff5fa4ea6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 20 Nov 2014 12:41:55 +0100
Subject: [PATCH 481/616] Simplify the binary finding code in the movie preview
 class

---
 lib/private/preview/movies.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/lib/private/preview/movies.php b/lib/private/preview/movies.php
index 8217ad24409..d69266ceb33 100644
--- a/lib/private/preview/movies.php
+++ b/lib/private/preview/movies.php
@@ -10,18 +10,10 @@ namespace OC\Preview;
 
 // movie preview is currently not supported on Windows
 if (!\OC_Util::runningOnWindows()) {
-	$isExecEnabled = \OC_Helper::is_function_enabled('exec');
-	$ffmpegBinary = null;
-	$avconvBinary = null;
-
-	if ($isExecEnabled) {
-		$avconvBinary = \OC_Helper::findBinaryPath('avconv');
-		if (!$avconvBinary) {
-			$ffmpegBinary = \OC_Helper::findBinaryPath('ffmpeg');
-		}
-	}
+	$avconvBinary = \OC_Helper::findBinaryPath('avconv');
+	$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
 
-	if($isExecEnabled && ( $avconvBinary || $ffmpegBinary )) {
+	if ($avconvBinary || $ffmpegBinary) {
 
 		class Movie extends Provider {
 			public static $avconvBinary;
-- 
GitLab


From 9a1673c79d7f57c76d1e85acc0cd0e05a57f4467 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 20 Nov 2014 13:13:14 +0100
Subject: [PATCH 482/616] Check for XMLWriter class

This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507
---
 lib/private/util.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/util.php b/lib/private/util.php
index bee0a579192..4190f0aa3d8 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -562,6 +562,7 @@ class OC_Util {
 			'classes' => array(
 				'ZipArchive' => 'zip',
 				'DOMDocument' => 'dom',
+				'XMLWriter' => 'XMLWriter'
 			),
 			'functions' => array(
 				'xml_parser_create' => 'libxml',
-- 
GitLab


From 995fe4a176e45e57cf49e9c47802c23764c4f064 Mon Sep 17 00:00:00 2001
From: Volkan Gezer <volkangezer@gmail.com>
Date: Thu, 20 Nov 2014 14:46:17 +0100
Subject: [PATCH 483/616] cleanup languages. closes #11274

---
 apps/files/l10n/de_CH.js              |  58 --------------
 apps/files/l10n/de_CH.json            |  56 --------------
 apps/files/l10n/hi_IN.js              |   8 --
 apps/files/l10n/hi_IN.json            |   6 --
 apps/files/l10n/sk.js                 |  12 ---
 apps/files/l10n/sk.json               |  10 ---
 apps/files/l10n/ur.js                 |   9 ---
 apps/files/l10n/ur.json               |   7 --
 apps/files_encryption/l10n/de_CH.js   |  33 --------
 apps/files_encryption/l10n/de_CH.json |  31 --------
 apps/files_external/l10n/de_CH.js     |  28 -------
 apps/files_external/l10n/de_CH.json   |  26 -------
 apps/files_external/l10n/sk.js        |   9 ---
 apps/files_external/l10n/sk.json      |   7 --
 apps/files_external/l10n/sk.php       |   8 --
 apps/files_sharing/l10n/de_CH.js      |  17 ----
 apps/files_sharing/l10n/de_CH.json    |  15 ----
 apps/files_sharing/l10n/sk.js         |   7 --
 apps/files_sharing/l10n/sk.json       |   5 --
 apps/files_sharing/l10n/sk.php        |   6 --
 apps/files_trashbin/l10n/de_CH.js     |  15 ----
 apps/files_trashbin/l10n/de_CH.json   |  13 ----
 apps/files_trashbin/l10n/sk.js        |   6 --
 apps/files_trashbin/l10n/sk.json      |   4 -
 apps/files_trashbin/l10n/sk.php       |   5 --
 apps/files_trashbin/l10n/ur.js        |   6 --
 apps/files_trashbin/l10n/ur.json      |   4 -
 apps/files_trashbin/l10n/ur.php       |   5 --
 apps/files_versions/l10n/de_CH.js     |  11 ---
 apps/files_versions/l10n/de_CH.json   |   9 ---
 apps/user_ldap/l10n/de_CH.js          |  82 --------------------
 apps/user_ldap/l10n/de_CH.json        |  80 -------------------
 apps/user_ldap/l10n/hi_IN.js          |   7 --
 apps/user_ldap/l10n/hi_IN.json        |   5 --
 apps/user_ldap/l10n/hi_IN.php         |   6 --
 apps/user_ldap/l10n/sk.js             |   9 ---
 apps/user_ldap/l10n/sk.json           |   7 --
 apps/user_ldap/l10n/sk.php            |   8 --
 apps/user_ldap/l10n/ur.js             |   8 --
 apps/user_ldap/l10n/ur.json           |   6 --
 apps/user_ldap/l10n/ur.php            |   7 --
 apps/user_webdavauth/l10n/de_CH.js    |   8 --
 apps/user_webdavauth/l10n/de_CH.json  |   6 --
 apps/user_webdavauth/l10n/sk.js       |   6 --
 apps/user_webdavauth/l10n/sk.json     |   4 -
 apps/user_webdavauth/l10n/sk.php      |   5 --
 core/l10n/de_CH.js                    | 107 --------------------------
 core/l10n/de_CH.json                  | 105 -------------------------
 core/l10n/hi_IN.js                    |   6 --
 core/l10n/hi_IN.json                  |   4 -
 core/l10n/hi_IN.php                   |   5 --
 core/l10n/sk.js                       |  31 --------
 core/l10n/sk.json                     |  29 -------
 core/l10n/sk.php                      |  30 --------
 core/l10n/ur.js                       |   7 --
 core/l10n/ur.json                     |   5 --
 core/l10n/ur.php                      |   6 --
 lib/l10n/de_CH.js                     |  44 -----------
 lib/l10n/de_CH.json                   |  42 ----------
 lib/l10n/hi_IN.js                     |   9 ---
 lib/l10n/hi_IN.json                   |   7 --
 lib/l10n/hi_IN.php                    |   8 --
 lib/l10n/sk.js                        |  11 ---
 lib/l10n/sk.json                      |   9 ---
 lib/l10n/sk.php                       |  10 ---
 lib/l10n/ur.js                        |   9 ---
 lib/l10n/ur.json                      |   7 --
 lib/l10n/ur.php                       |   8 --
 settings/l10n/de_CH.js                | 102 ------------------------
 settings/l10n/de_CH.json              | 100 ------------------------
 settings/l10n/sk.js                   |   9 ---
 settings/l10n/sk.json                 |   7 --
 settings/l10n/ur.js                   |   6 --
 settings/l10n/ur.json                 |   4 -
 74 files changed, 1417 deletions(-)
 delete mode 100644 apps/files/l10n/de_CH.js
 delete mode 100644 apps/files/l10n/de_CH.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_encryption/l10n/de_CH.js
 delete mode 100644 apps/files_encryption/l10n/de_CH.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/sk.js
 delete mode 100644 apps/files_external/l10n/sk.json
 delete mode 100644 apps/files_external/l10n/sk.php
 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/sk.js
 delete mode 100644 apps/files_sharing/l10n/sk.json
 delete mode 100644 apps/files_sharing/l10n/sk.php
 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/sk.js
 delete mode 100644 apps/files_trashbin/l10n/sk.json
 delete mode 100644 apps/files_trashbin/l10n/sk.php
 delete mode 100644 apps/files_trashbin/l10n/ur.js
 delete mode 100644 apps/files_trashbin/l10n/ur.json
 delete mode 100644 apps/files_trashbin/l10n/ur.php
 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/de_CH.js
 delete mode 100644 apps/user_ldap/l10n/de_CH.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/hi_IN.php
 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/sk.php
 delete mode 100644 apps/user_ldap/l10n/ur.js
 delete mode 100644 apps/user_ldap/l10n/ur.json
 delete mode 100644 apps/user_ldap/l10n/ur.php
 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/sk.js
 delete mode 100644 apps/user_webdavauth/l10n/sk.json
 delete mode 100644 apps/user_webdavauth/l10n/sk.php
 delete mode 100644 core/l10n/de_CH.js
 delete mode 100644 core/l10n/de_CH.json
 delete mode 100644 core/l10n/hi_IN.js
 delete mode 100644 core/l10n/hi_IN.json
 delete mode 100644 core/l10n/hi_IN.php
 delete mode 100644 core/l10n/sk.js
 delete mode 100644 core/l10n/sk.json
 delete mode 100644 core/l10n/sk.php
 delete mode 100644 core/l10n/ur.js
 delete mode 100644 core/l10n/ur.json
 delete mode 100644 core/l10n/ur.php
 delete mode 100644 lib/l10n/de_CH.js
 delete mode 100644 lib/l10n/de_CH.json
 delete mode 100644 lib/l10n/hi_IN.js
 delete mode 100644 lib/l10n/hi_IN.json
 delete mode 100644 lib/l10n/hi_IN.php
 delete mode 100644 lib/l10n/sk.js
 delete mode 100644 lib/l10n/sk.json
 delete mode 100644 lib/l10n/sk.php
 delete mode 100644 lib/l10n/ur.js
 delete mode 100644 lib/l10n/ur.json
 delete mode 100644 lib/l10n/ur.php
 delete mode 100644 settings/l10n/de_CH.js
 delete mode 100644 settings/l10n/de_CH.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/de_CH.js b/apps/files/l10n/de_CH.js
deleted file mode 100644
index 05cec407e0b..00000000000
--- a/apps/files/l10n/de_CH.js
+++ /dev/null
@@ -1,58 +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",
-    "_%n folder_::_%n folders_" : ["","%n Ordner"],
-    "_%n file_::_%n files_" : ["","%n Dateien"],
-    "_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 9ef3585f722..00000000000
--- a/apps/files/l10n/de_CH.json
+++ /dev/null
@@ -1,56 +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",
-    "_%n folder_::_%n folders_" : ["","%n Ordner"],
-    "_%n file_::_%n files_" : ["","%n Dateien"],
-    "_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/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 13c12b94967..00000000000
--- a/apps/files/l10n/sk.js
+++ /dev/null
@@ -1,12 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Share" : "Zdieľať",
-    "Delete" : "Odstrániť",
-    "_%n folder_::_%n folders_" : ["","",""],
-    "_%n file_::_%n files_" : ["","",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
-    "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 982ae3759b2..00000000000
--- a/apps/files/l10n/sk.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{ "translations": {
-    "Share" : "Zdieľať",
-    "Delete" : "Odstrániť",
-    "_%n folder_::_%n folders_" : ["","",""],
-    "_%n file_::_%n files_" : ["","",""],
-    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
-    "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 0700689b60d..00000000000
--- a/apps/files/l10n/ur.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "files",
-    {
-    "Error" : "خرابی",
-    "_%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/ur.json b/apps/files/l10n/ur.json
deleted file mode 100644
index c5fe11055db..00000000000
--- a/apps/files/l10n/ur.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی",
-    "_%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_encryption/l10n/de_CH.js b/apps/files_encryption/l10n/de_CH.js
deleted file mode 100644
index 1f5a01e6798..00000000000
--- a/apps/files_encryption/l10n/de_CH.js
+++ /dev/null
@@ -1,33 +0,0 @@
-OC.L10N.register(
-    "files_encryption",
-    {
-    "Unknown error" : "Unbekannter Fehler",
-    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
-    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
-    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
-    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
-    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
-    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
-    "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
-    "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
-    "Missing requirements." : "Fehlende Voraussetzungen",
-    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
-    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
-    "Encryption" : "Verschlüsselung",
-    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
-    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
-    "Enabled" : "Aktiviert",
-    "Disabled" : "Deaktiviert",
-    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
-    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
-    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
-    "Change Password" : "Passwort ändern",
-    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
-    "Old log-in password" : "Altes Login-Passwort",
-    "Current log-in password" : "Momentanes Login-Passwort",
-    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
-    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
-    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/de_CH.json b/apps/files_encryption/l10n/de_CH.json
deleted file mode 100644
index 244d0946bfe..00000000000
--- a/apps/files_encryption/l10n/de_CH.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{ "translations": {
-    "Unknown error" : "Unbekannter Fehler",
-    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
-    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
-    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
-    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
-    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
-    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
-    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
-    "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
-    "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
-    "Missing requirements." : "Fehlende Voraussetzungen",
-    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
-    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
-    "Encryption" : "Verschlüsselung",
-    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
-    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
-    "Enabled" : "Aktiviert",
-    "Disabled" : "Deaktiviert",
-    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
-    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
-    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
-    "Change Password" : "Passwort ändern",
-    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
-    "Old log-in password" : "Altes Login-Passwort",
-    "Current log-in password" : "Momentanes Login-Passwort",
-    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
-    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
-    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
-},"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/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_external/l10n/sk.php b/apps/files_external/l10n/sk.php
deleted file mode 100644
index 9418c949228..00000000000
--- a/apps/files_external/l10n/sk.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Location" => "Poloha",
-"Share" => "Zdieľať",
-"Personal" => "Osobné",
-"Delete" => "Odstrániť"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
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/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_sharing/l10n/sk.php b/apps/files_sharing/l10n/sk.php
deleted file mode 100644
index bc251c7fd59..00000000000
--- a/apps/files_sharing/l10n/sk.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Cancel" => "Zrušiť",
-"Download" => "Stiahnuť"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
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/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/sk.php b/apps/files_trashbin/l10n/sk.php
deleted file mode 100644
index 3129cf5c411..00000000000
--- a/apps/files_trashbin/l10n/sk.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Delete" => "Odstrániť"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
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_trashbin/l10n/ur.php b/apps/files_trashbin/l10n/ur.php
deleted file mode 100644
index 1b41db1d679..00000000000
--- a/apps/files_trashbin/l10n/ur.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "خرابی"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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/de_CH.js b/apps/user_ldap/l10n/de_CH.js
deleted file mode 100644
index a1028b1678a..00000000000
--- a/apps/user_ldap/l10n/de_CH.js
+++ /dev/null
@@ -1,82 +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",
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""],
-    "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 3560581d270..00000000000
--- a/apps/user_ldap/l10n/de_CH.json
+++ /dev/null
@@ -1,80 +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",
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""],
-    "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/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/hi_IN.php b/apps/user_ldap/l10n/hi_IN.php
deleted file mode 100644
index 3a1e002311c..00000000000
--- a/apps/user_ldap/l10n/hi_IN.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/apps/user_ldap/l10n/sk.js b/apps/user_ldap/l10n/sk.js
deleted file mode 100644
index 5060d7d4168..00000000000
--- a/apps/user_ldap/l10n/sk.js
+++ /dev/null
@@ -1,9 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "_%s group found_::_%s groups found_" : ["","",""],
-    "_%s user found_::_%s users found_" : ["","",""],
-    "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 4b98da63fc2..00000000000
--- a/apps/user_ldap/l10n/sk.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{ "translations": {
-    "_%s group found_::_%s groups found_" : ["","",""],
-    "_%s user found_::_%s users found_" : ["","",""],
-    "Save" : "Uložiť",
-    "Advanced" : "Pokročilé"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/sk.php b/apps/user_ldap/l10n/sk.php
deleted file mode 100644
index e258ffac223..00000000000
--- a/apps/user_ldap/l10n/sk.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%s group found_::_%s groups found_" => array("","",""),
-"_%s user found_::_%s users found_" => array("","",""),
-"Save" => "Uložiť",
-"Advanced" => "Pokročilé"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/apps/user_ldap/l10n/ur.js b/apps/user_ldap/l10n/ur.js
deleted file mode 100644
index 60c3f87f855..00000000000
--- a/apps/user_ldap/l10n/ur.js
+++ /dev/null
@@ -1,8 +0,0 @@
-OC.L10N.register(
-    "user_ldap",
-    {
-    "Error" : "خرابی",
-    "_%s group found_::_%s groups found_" : ["",""],
-    "_%s user found_::_%s users found_" : ["",""]
-},
-"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 8e1b732acc9..00000000000
--- a/apps/user_ldap/l10n/ur.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "translations": {
-    "Error" : "خرابی",
-    "_%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/ur.php b/apps/user_ldap/l10n/ur.php
deleted file mode 100644
index c29e4dba209..00000000000
--- a/apps/user_ldap/l10n/ur.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Error" => "خرابی",
-"_%s group found_::_%s groups found_" => array("",""),
-"_%s user found_::_%s users found_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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/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/apps/user_webdavauth/l10n/sk.php b/apps/user_webdavauth/l10n/sk.php
deleted file mode 100644
index 9efe9fe6549..00000000000
--- a/apps/user_webdavauth/l10n/sk.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Save" => "Uložiť"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/de_CH.js b/core/l10n/de_CH.js
deleted file mode 100644
index 5a383c104cb..00000000000
--- a/core/l10n/de_CH.js
+++ /dev/null
@@ -1,107 +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",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "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",
-    "_download %n file_::_download %n files_" : ["",""],
-    "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 aa69c7355e0..00000000000
--- a/core/l10n/de_CH.json
+++ /dev/null
@@ -1,105 +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",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "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",
-    "_download %n file_::_download %n files_" : ["",""],
-    "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/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/hi_IN.php b/core/l10n/hi_IN.php
deleted file mode 100644
index aff098dff1f..00000000000
--- a/core/l10n/hi_IN.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/core/l10n/sk.js b/core/l10n/sk.js
deleted file mode 100644
index 6a57266201e..00000000000
--- a/core/l10n/sk.js
+++ /dev/null
@@ -1,31 +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",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
-    "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 3eb33e886af..00000000000
--- a/core/l10n/sk.json
+++ /dev/null
@@ -1,29 +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",
-    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
-    "Cancel" : "Zrušiť",
-    "Share" : "Zdieľať",
-    "group" : "skupina",
-    "Delete" : "Odstrániť",
-    "Personal" : "Osobné"
-},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/core/l10n/sk.php b/core/l10n/sk.php
deleted file mode 100644
index 74d6a570c09..00000000000
--- a/core/l10n/sk.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"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",
-"_{count} file conflict_::_{count} file conflicts_" => array("","",""),
-"Cancel" => "Zrušiť",
-"Share" => "Zdieľať",
-"group" => "skupina",
-"Delete" => "Odstrániť",
-"Personal" => "Osobné"
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
diff --git a/core/l10n/ur.js b/core/l10n/ur.js
deleted file mode 100644
index 6f4050f5fd6..00000000000
--- a/core/l10n/ur.js
+++ /dev/null
@@ -1,7 +0,0 @@
-OC.L10N.register(
-    "core",
-    {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Error" : "خرابی"
-},
-"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ur.json b/core/l10n/ur.json
deleted file mode 100644
index a99dca571f3..00000000000
--- a/core/l10n/ur.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{ "translations": {
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
-    "Error" : "خرابی"
-},"pluralForm" :"nplurals=2; plural=(n != 1);"
-}
\ No newline at end of file
diff --git a/core/l10n/ur.php b/core/l10n/ur.php
deleted file mode 100644
index fdc6c81bd88..00000000000
--- a/core/l10n/ur.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_{count} file conflict_::_{count} file conflicts_" => array("",""),
-"Error" => "خرابی"
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/de_CH.js b/lib/l10n/de_CH.js
deleted file mode 100644
index c8b1181dc9b..00000000000
--- a/lib/l10n/de_CH.js
+++ /dev/null
@@ -1,44 +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",
-    "_%n minute ago_::_%n minutes ago_" : ["","Vor %n Minuten"],
-    "_%n hour ago_::_%n hours ago_" : ["","Vor %n Stunden"],
-    "today" : "Heute",
-    "yesterday" : "Gestern",
-    "_%n day go_::_%n days ago_" : ["","Vor %n Tagen"],
-    "last month" : "Letzten Monat",
-    "_%n month ago_::_%n months ago_" : ["","Vor %n Monaten"],
-    "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 468f2a175b9..00000000000
--- a/lib/l10n/de_CH.json
+++ /dev/null
@@ -1,42 +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",
-    "_%n minute ago_::_%n minutes ago_" : ["","Vor %n Minuten"],
-    "_%n hour ago_::_%n hours ago_" : ["","Vor %n Stunden"],
-    "today" : "Heute",
-    "yesterday" : "Gestern",
-    "_%n day go_::_%n days ago_" : ["","Vor %n Tagen"],
-    "last month" : "Letzten Monat",
-    "_%n month ago_::_%n months ago_" : ["","Vor %n Monaten"],
-    "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/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/hi_IN.php b/lib/l10n/hi_IN.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/hi_IN.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
diff --git a/lib/l10n/sk.js b/lib/l10n/sk.js
deleted file mode 100644
index 55da1e782f6..00000000000
--- a/lib/l10n/sk.js
+++ /dev/null
@@ -1,11 +0,0 @@
-OC.L10N.register(
-    "lib",
-    {
-    "Personal" : "Osobné",
-    "Settings" : "Nastavenia",
-    "_%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=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 6c4da5395ec..00000000000
--- a/lib/l10n/sk.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{ "translations": {
-    "Personal" : "Osobné",
-    "Settings" : "Nastavenia",
-    "_%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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
-}
\ No newline at end of file
diff --git a/lib/l10n/sk.php b/lib/l10n/sk.php
deleted file mode 100644
index 5cfafe6ca0c..00000000000
--- a/lib/l10n/sk.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"Personal" => "Osobné",
-"Settings" => "Nastavenia",
-"_%n minute ago_::_%n minutes ago_" => array("","",""),
-"_%n hour ago_::_%n hours ago_" => array("","",""),
-"_%n day go_::_%n days ago_" => array("","",""),
-"_%n month ago_::_%n months ago_" => array("","","")
-);
-$PLURAL_FORMS = "nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;";
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/lib/l10n/ur.php b/lib/l10n/ur.php
deleted file mode 100644
index 15f78e0bce6..00000000000
--- a/lib/l10n/ur.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-$TRANSLATIONS = array(
-"_%n minute ago_::_%n minutes ago_" => array("",""),
-"_%n hour ago_::_%n hours ago_" => array("",""),
-"_%n day go_::_%n days ago_" => array("",""),
-"_%n month ago_::_%n months ago_" => array("","")
-);
-$PLURAL_FORMS = "nplurals=2; plural=(n != 1);";
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/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 8ae8eb47349f2510976637c6a1e8fa91e8d9f8d3 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 19 Nov 2014 00:25:26 +0100
Subject: [PATCH 484/616] drop dependency of some commands on old config object

---
 core/command/db/converttype.php      | 28 ++++++++++++++--------------
 core/command/maintenance/mode.php    | 11 ++++++-----
 core/command/maintenance/repair.php  | 12 +++++++-----
 core/register_command.php            |  6 +++---
 lib/private/db/mdb2schemamanager.php |  6 +++---
 lib/private/db/mdb2schemareader.php  | 11 +++++++----
 lib/private/legacy/config.php        |  8 --------
 7 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/core/command/db/converttype.php b/core/command/db/converttype.php
index 2188b1135bb..617910b3a90 100644
--- a/core/command/db/converttype.php
+++ b/core/command/db/converttype.php
@@ -10,7 +10,7 @@
 
 namespace OC\Core\Command\Db;
 
-use OC\Config;
+use \OCP\IConfig;
 use OC\DB\Connection;
 use OC\DB\ConnectionFactory;
 
@@ -22,7 +22,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class ConvertType extends Command {
 	/**
-	 * @var \OC\Config
+	 * @var \OCP\IConfig
 	 */
 	protected $config;
 
@@ -32,10 +32,10 @@ class ConvertType extends Command {
 	protected $connectionFactory;
 
 	/**
-	 * @param \OC\Config $config
+	 * @param \OCP\IConfig $config
 	 * @param \OC\DB\ConnectionFactory $connectionFactory
 	 */
-	public function __construct(Config $config, ConnectionFactory $connectionFactory) {
+	public function __construct(IConfig $config, ConnectionFactory $connectionFactory) {
 		$this->config = $config;
 		$this->connectionFactory = $connectionFactory;
 		parent::__construct();
@@ -104,7 +104,7 @@ class ConvertType extends Command {
 				'Converting to Microsoft SQL Server (mssql) is currently not supported.'
 			);
 		}
-		if ($type === $this->config->getValue('dbtype', '')) {
+		if ($type === $this->config->getSystemValue('dbtype', '')) {
 			throw new \InvalidArgumentException(sprintf(
 				'Can not convert from %1$s to %1$s.',
 				$type
@@ -209,7 +209,7 @@ class ConvertType extends Command {
 			'user' => $input->getArgument('username'),
 			'password' => $input->getOption('password'),
 			'dbname' => $input->getArgument('database'),
-			'tablePrefix' => $this->config->getValue('dbtableprefix', 'oc_'),
+			'tablePrefix' => $this->config->getSystemValue('dbtableprefix', 'oc_'),
 		);
 		if ($input->getOption('port')) {
 			$connectionParams['port'] = $input->getOption('port');
@@ -256,7 +256,7 @@ class ConvertType extends Command {
 	}
 
 	protected function convertDB(Connection $fromDB, Connection $toDB, array $tables, InputInterface $input, OutputInterface $output) {
-		$this->config->setValue('maintenance', true);
+		$this->config->setSystemValue('maintenance', true);
 		try {
 			// copy table rows
 			foreach($tables as $table) {
@@ -270,10 +270,10 @@ class ConvertType extends Command {
 			// save new database config
 			$this->saveDBInfo($input);
 		} catch(\Exception $e) {
-			$this->config->setValue('maintenance', false);
+			$this->config->setSystemValue('maintenance', false);
 			throw $e;
 		}
-		$this->config->setValue('maintenance', false);
+		$this->config->setSystemValue('maintenance', false);
 	}
 
 	protected function saveDBInfo(InputInterface $input) {
@@ -286,10 +286,10 @@ class ConvertType extends Command {
 			$dbhost .= ':'.$input->getOption('port');
 		}
 
-		$this->config->setValue('dbtype', $type);
-		$this->config->setValue('dbname', $dbname);
-		$this->config->setValue('dbhost', $dbhost);
-		$this->config->setValue('dbuser', $username);
-		$this->config->setValue('dbpassword', $password);
+		$this->config->setSystemValue('dbtype', $type);
+		$this->config->setSystemValue('dbname', $dbname);
+		$this->config->setSystemValue('dbhost', $dbhost);
+		$this->config->setSystemValue('dbuser', $username);
+		$this->config->setSystemValue('dbpassword', $password);
 	}
 }
diff --git a/core/command/maintenance/mode.php b/core/command/maintenance/mode.php
index f26a11384a8..f48a9d012c4 100644
--- a/core/command/maintenance/mode.php
+++ b/core/command/maintenance/mode.php
@@ -9,7 +9,7 @@
 
 namespace OC\Core\Command\Maintenance;
 
-use OC\Config;
+use \OCP\IConfig;
 
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
@@ -18,9 +18,10 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 class Mode extends Command {
 
+	/** @var IConfig */
 	protected $config;
 
-	public function __construct(Config $config) {
+	public function __construct(IConfig $config) {
 		$this->config = $config;
 		parent::__construct();
 	}
@@ -45,13 +46,13 @@ class Mode extends Command {
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		if ($input->getOption('on')) {
-			$this->config->setValue('maintenance', true);
+			$this->config->setSystemValue('maintenance', true);
 			$output->writeln('Maintenance mode enabled');
 		} elseif ($input->getOption('off')) {
-			$this->config->setValue('maintenance', false);
+			$this->config->setSystemValue('maintenance', false);
 			$output->writeln('Maintenance mode disabled');
 		} else {
-			if ($this->config->getValue('maintenance', false)) {
+			if ($this->config->getSystemValue('maintenance', false)) {
 				$output->writeln('Maintenance mode is currently enabled');
 			} else {
 				$output->writeln('Maintenance mode is currently disabled');
diff --git a/core/command/maintenance/repair.php b/core/command/maintenance/repair.php
index 7c0cf71d3b6..bf94b2647ce 100644
--- a/core/command/maintenance/repair.php
+++ b/core/command/maintenance/repair.php
@@ -17,12 +17,14 @@ class Repair extends Command {
 	 * @var \OC\Repair $repair
 	 */
 	protected $repair;
+	/** @var \OCP\IConfig */
+	protected $config;
 
 	/**
 	 * @param \OC\Repair $repair
-	 * @param \OC\Config $config
+	 * @param \OCP\IConfig $config
 	 */
-	public function __construct(\OC\Repair $repair, \OC\Config $config) {
+	public function __construct(\OC\Repair $repair, \OCP\IConfig $config) {
 		$this->repair = $repair;
 		$this->config = $config;
 		parent::__construct();
@@ -35,8 +37,8 @@ class Repair extends Command {
 	}
 
 	protected function execute(InputInterface $input, OutputInterface $output) {
-		$maintenanceMode = $this->config->getValue('maintenance', false);
-		$this->config->setValue('maintenance', true);
+		$maintenanceMode = $this->config->getSystemValue('maintenance', false);
+		$this->config->setSystemValue('maintenance', true);
 
 		$this->repair->listen('\OC\Repair', 'step', function ($description) use ($output) {
 			$output->writeln(' - ' . $description);
@@ -50,6 +52,6 @@ class Repair extends Command {
 
 		$this->repair->run();
 
-		$this->config->setValue('maintenance', $maintenanceMode);
+		$this->config->setSystemValue('maintenance', $maintenanceMode);
 	}
 }
diff --git a/core/register_command.php b/core/register_command.php
index c5d9b6e342d..8f79473ced8 100644
--- a/core/register_command.php
+++ b/core/register_command.php
@@ -11,14 +11,14 @@ $repair = new \OC\Repair(\OC\Repair::getRepairSteps());
 /** @var $application Symfony\Component\Console\Application */
 $application->add(new OC\Core\Command\Status);
 $application->add(new OC\Core\Command\Db\GenerateChangeScript());
-$application->add(new OC\Core\Command\Db\ConvertType(OC_Config::getObject(), new \OC\DB\ConnectionFactory()));
+$application->add(new OC\Core\Command\Db\ConvertType(\OC::$server->getConfig(), new \OC\DB\ConnectionFactory()));
 $application->add(new OC\Core\Command\Upgrade(\OC::$server->getConfig()));
 $application->add(new OC\Core\Command\Maintenance\SingleUser());
-$application->add(new OC\Core\Command\Maintenance\Mode(OC_Config::getObject()));
+$application->add(new OC\Core\Command\Maintenance\Mode(\OC::$server->getConfig()));
 $application->add(new OC\Core\Command\App\Disable());
 $application->add(new OC\Core\Command\App\Enable());
 $application->add(new OC\Core\Command\App\ListApps());
-$application->add(new OC\Core\Command\Maintenance\Repair($repair, OC_Config::getObject()));
+$application->add(new OC\Core\Command\Maintenance\Repair($repair, \OC::$server->getConfig()));
 $application->add(new OC\Core\Command\User\Report());
 $application->add(new OC\Core\Command\User\ResetPassword(\OC::$server->getUserManager()));
 $application->add(new OC\Core\Command\User\LastSeen());
diff --git a/lib/private/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
index 632e320576c..78267094d0e 100644
--- a/lib/private/db/mdb2schemamanager.php
+++ b/lib/private/db/mdb2schemamanager.php
@@ -49,7 +49,7 @@ class MDB2SchemaManager {
 	 * TODO: write more documentation
 	 */
 	public function createDbFromStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
+		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
 		$toSchema = $schemaReader->loadSchemaFromFile($file);
 		return $this->executeSchemaChange($toSchema);
 	}
@@ -83,7 +83,7 @@ class MDB2SchemaManager {
 	 */
 	private function readSchemaFromFile($file) {
 		$platform = $this->conn->getDatabasePlatform();
-		$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $platform);
+		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $platform);
 		return $schemaReader->loadSchemaFromFile($file);
 	}
 
@@ -131,7 +131,7 @@ class MDB2SchemaManager {
 	 * @param string $file the xml file describing the tables
 	 */
 	public function removeDBStructure($file) {
-		$schemaReader = new MDB2SchemaReader(\OC_Config::getObject(), $this->conn->getDatabasePlatform());
+		$schemaReader = new MDB2SchemaReader(\OC::$server->getConfig(), $this->conn->getDatabasePlatform());
 		$fromSchema = $schemaReader->loadSchemaFromFile($file);
 		$toSchema = clone $fromSchema;
 		/** @var $table \Doctrine\DBAL\Schema\Table */
diff --git a/lib/private/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
index 288eef5cda0..7dd4168fb6e 100644
--- a/lib/private/db/mdb2schemareader.php
+++ b/lib/private/db/mdb2schemareader.php
@@ -8,6 +8,9 @@
 
 namespace OC\DB;
 
+use Doctrine\DBAL\Platforms\AbstractPlatform;
+use OCP\IConfig;
+
 class MDB2SchemaReader {
 	/**
 	 * @var string $DBNAME
@@ -25,13 +28,13 @@ class MDB2SchemaReader {
 	protected $platform;
 
 	/**
-	 * @param \OC\Config $config
+	 * @param \OCP\IConfig $config
 	 * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
 	 */
-	public function __construct($config, $platform) {
+	public function __construct(IConfig $config, AbstractPlatform $platform) {
 		$this->platform = $platform;
-		$this->DBNAME = $config->getValue('dbname', 'owncloud');
-		$this->DBTABLEPREFIX = $config->getValue('dbtableprefix', 'oc_');
+		$this->DBNAME = $config->getSystemValue('dbname', 'owncloud');
+		$this->DBTABLEPREFIX = $config->getSystemValue('dbtableprefix', 'oc_');
 	}
 
 	/**
diff --git a/lib/private/legacy/config.php b/lib/private/legacy/config.php
index 13ff0dbe040..7b711204256 100644
--- a/lib/private/legacy/config.php
+++ b/lib/private/legacy/config.php
@@ -22,14 +22,6 @@ class OC_Config {
 	/** @var \OC\Config */
 	public static $object;
 
-	/**
-	 * Returns the config instance
-	 * @return \OC\Config
-	 */
-	public static function getObject() {
-		return self::$object;
-	}
-
 	/**
 	 * Lists all available config keys
 	 * @return array an array of key names
-- 
GitLab


From 84d358a7615f70944706d7e3095f372b8a4a29c8 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 19 Nov 2014 14:40:15 +0100
Subject: [PATCH 485/616] Clean up the test data in tearDownAfterClass()

The result of the listener should then be empty and can be removed
---
 tests/lib/testcase.php | 116 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 111 insertions(+), 5 deletions(-)

diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index 315cd6858ed..e6f5ca71dac 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -23,21 +23,127 @@
 namespace Test;
 
 abstract class TestCase extends \PHPUnit_Framework_TestCase {
+	/**
+	 * Returns a unique identifier as uniqid() is not reliable sometimes
+	 *
+	 * @param string $prefix
+	 * @param int $length
+	 * @return string
+	 */
 	protected function getUniqueID($prefix = '', $length = 13) {
-		// Do not use dots and slashes as we use the value for file names
 		return $prefix . \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(
 			$length,
+			// Do not use dots and slashes as we use the value for file names
 			'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
 		);
 	}
 
 	public static function tearDownAfterClass() {
+		$dataDir = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data-autotest');
+
+		self::tearDownAfterClassCleanFileMapper($dataDir);
+		self::tearDownAfterClassCleanStorages();
+		self::tearDownAfterClassCleanFileCache();
+		self::tearDownAfterClassCleanStrayDataFiles($dataDir);
+		self::tearDownAfterClassCleanStrayHooks();
+		self::tearDownAfterClassCleanProxies();
+
+		parent::tearDownAfterClass();
+	}
+
+	/**
+	 * Remove all entries from the files map table
+	 * @param string $dataDir
+	 */
+	static protected function tearDownAfterClassCleanFileMapper($dataDir) {
 		if (\OC_Util::runningOnWindows()) {
-			$rootDirectory = \OC::$server->getConfig()->getSystemValue('datadirectory', \OC::$SERVERROOT . '/data-autotest');
-			$mapper = new \OC\Files\Mapper($rootDirectory);
-			$mapper->removePath($rootDirectory, true, true);
+			$mapper = new \OC\Files\Mapper($dataDir);
+			$mapper->removePath($dataDir, true, true);
 		}
+	}
 
-		parent::tearDownAfterClass();
+	/**
+	 * Remove all entries from the storages table
+	 * @throws \DatabaseException
+	 */
+	static protected function tearDownAfterClassCleanStorages() {
+		$sql = 'DELETE FROM `*PREFIX*storages`';
+		$query = \OC_DB::prepare($sql);
+		$query->execute();
+	}
+
+	/**
+	 * Remove all entries from the filecache table
+	 * @throws \DatabaseException
+	 */
+	static protected function tearDownAfterClassCleanFileCache() {
+		$sql = 'DELETE FROM `*PREFIX*filecache`';
+		$query = \OC_DB::prepare($sql);
+		$query->execute();
+	}
+
+	/**
+	 * Remove all unused files from the data dir
+	 *
+	 * @param string $dataDir
+	 */
+	static protected function tearDownAfterClassCleanStrayDataFiles($dataDir) {
+		$knownEntries = array(
+			'owncloud.log'	=> true,
+			'owncloud.db'	=> true,
+			'.ocdata'		=> true,
+			'..'			=> true,
+			'.'				=> true,
+		);
+
+		if ($dh = opendir($dataDir)) {
+			while (($file = readdir($dh)) !== false) {
+				if (!isset($knownEntries[$file])) {
+					self::tearDownAfterClassCleanStrayDataUnlinkDir($dataDir . '/' . $file);
+				}
+			}
+			closedir($dh);
+		}
+	}
+
+	/**
+	 * Recursive delete files and folders from a given directory
+	 *
+	 * @param string $dir
+	 */
+	static protected function tearDownAfterClassCleanStrayDataUnlinkDir($dir) {
+		if ($dh = @opendir($dir)) {
+			while (($file = readdir($dh)) !== false) {
+				if ($file === '..' || $file === '.') {
+					continue;
+				}
+				$path = $dir . '/' . $file;
+				if (is_dir($path)) {
+					self::tearDownAfterClassCleanStrayDataUnlinkDir($path);
+				}
+				else {
+					@unlink($path);
+				}
+			}
+			closedir($dh);
+		}
+		@rmdir($dir);
+	}
+
+	/**
+	 * Clean up the list of hooks
+	 */
+	static protected function tearDownAfterClassCleanStrayHooks() {
+		\OC_Hook::clear();
+	}
+
+	/**
+	 * Clean up the list of file proxies
+	 *
+	 * Also reenables file proxies, in case a test disabled them
+	 */
+	static protected function tearDownAfterClassCleanProxies() {
+		\OC_FileProxy::$enabled = true;
+		\OC_FileProxy::clearProxies();
 	}
 }
-- 
GitLab


From b8420592853717d3d637e3ec6c3ab3a1cfb850a5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 19 Nov 2014 14:42:24 +0100
Subject: [PATCH 486/616] Remove testcleanuplistener.php

---
 tests/phpunit-autotest.xml    |   5 -
 tests/testcleanuplistener.php | 176 ----------------------------------
 2 files changed, 181 deletions(-)
 delete mode 100644 tests/testcleanuplistener.php

diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 282f5477c30..9fba824bc7d 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -39,11 +39,6 @@
 	</filter>
 	<listeners>
 		<listener class="StartSessionListener" file="startsessionlistener.php" />
-	  <listener class="TestCleanupListener" file="testcleanuplistener.php">
-		<arguments>
-			<string>detail</string>
-		</arguments>
-	  </listener>
 	</listeners>
 </phpunit>
 
diff --git a/tests/testcleanuplistener.php b/tests/testcleanuplistener.php
deleted file mode 100644
index 7b442bbd4f7..00000000000
--- a/tests/testcleanuplistener.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Vincent Petry <pvince81@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * Detects tests that didn't clean up properly, show a warning, then clean up after them.
- */
-class TestCleanupListener implements PHPUnit_Framework_TestListener {
-	private $verbosity;
-
-	public function __construct($verbosity = 'verbose') {
-		$this->verbosity = $verbosity;
-	}
-
-	public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {
-	}
-
-	public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {
-	}
-
-	public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
-	}
-
-	public function addRiskyTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
-	}
-
-	public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {
-	}
-
-	public function startTest(PHPUnit_Framework_Test $test) {
-	}
-
-	public function endTest(PHPUnit_Framework_Test $test, $time) {
-	}
-
-	public function startTestSuite(PHPUnit_Framework_TestSuite $suite) {
-	}
-
-	public function endTestSuite(PHPUnit_Framework_TestSuite $suite) {
-		// don't clean up the test environment if a data provider finished
-		if (!($suite instanceof PHPUnit_Framework_TestSuite_DataProvider)) {
-			if ($this->cleanStorages() && $this->isShowSuiteWarning()) {
-				printf("TestSuite '%s': Did not clean up storages\n", $suite->getName());
-			}
-			if ($this->cleanFileCache() && $this->isShowSuiteWarning()) {
-				printf("TestSuite '%s': Did not clean up file cache\n", $suite->getName());
-			}
-			if ($this->cleanStrayDataFiles() && $this->isShowSuiteWarning()) {
-				printf("TestSuite '%s': Did not clean up data dir\n", $suite->getName());
-			}
-			if ($this->cleanStrayHooks() && $this->isShowSuiteWarning()) {
-				printf("TestSuite '%s': Did not clean up hooks\n", $suite->getName());
-			}
-			if ($this->cleanProxies() && $this->isShowSuiteWarning()) {
-				printf("TestSuite '%s': Did not clean up proxies\n", $suite->getName());
-			}
-		}
-	}
-
-	private function isShowSuiteWarning() {
-		return $this->verbosity === 'suite' || $this->verbosity === 'detail';
-	}
-
-	private function isShowDetail() {
-		return $this->verbosity === 'detail';
-	}
-
-	/**
-	 * @param string $dir
-	 */
-	private function unlinkDir($dir) {
-		if ($dh = @opendir($dir)) {
-			while (($file = readdir($dh)) !== false) {
-				if ($file === '..' || $file === '.') {
-					continue;
-				}
-				$path = $dir . '/' . $file;
-				if (is_dir($path)) {
-					$this->unlinkDir($path);
-				}
-				else {
-					@unlink($path);
-				}
-			}
-			closedir($dh);
-		}
-		@rmdir($dir);
-	}
-
-	private function cleanStrayDataFiles() {
-		$knownEntries = array(
-			'owncloud.log' => true,
-			'owncloud.db' => true,
-			'.ocdata' => true,
-			'..' => true,
-			'.' => true
-		);
-		$datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT . '/data');
-		$entries = array();
-		if ($dh = opendir($datadir)) {
-			while (($file = readdir($dh)) !== false) {
-				if (!isset($knownEntries[$file])) {
-					$entries[] = $file;
-				}
-			}
-			closedir($dh);
-		}
-
-		if (count($entries) > 0) {
-			foreach ($entries as $entry) {
-				$this->unlinkDir($datadir . '/' . $entry);
-				if ($this->isShowDetail()) {
-					printf("Stray datadir entry: %s\n", $entry);
-				}
-			}
-			return true;
-		}
-
-		return false;
-	}
-
-	private function cleanStorages() {
-		$sql = 'DELETE FROM `*PREFIX*storages`';
-		$query = \OC_DB::prepare( $sql );
-		$result = $query->execute();
-		if ($result > 0) {
-			return true;
-		}
-		return false;
-	}
-
-	private function cleanFileCache() {
-		$sql = 'DELETE FROM `*PREFIX*filecache`';
-		$query = \OC_DB::prepare( $sql );
-		$result = $query->execute();
-		if ($result > 0) {
-			return true;
-		}
-		return false;
-	}
-
-	private function cleanStrayHooks() {
-		$hasHooks = false;
-		$hooks = OC_Hook::getHooks();
-		if (!$hooks || sizeof($hooks) === 0) {
-			return false;
-		}
-
-		foreach ($hooks as $signalClass => $signals) {
-			if (sizeof($signals)) {
-				foreach ($signals as $signalName => $handlers ) {
-					if (sizeof($handlers) > 0) {
-						$hasHooks = true;
-						OC_Hook::clear($signalClass, $signalName);
-						if ($this->isShowDetail()) {
-							printf("Stray hook: \"%s\" \"%s\"\n", $signalClass, $signalName);
-						}
-					}
-				}
-			}
-		}
-		return $hasHooks;
-	}
-
-	private function cleanProxies() {
-		$proxies = OC_FileProxy::getProxies();
-		OC_FileProxy::clearProxies();
-		// reenable in case some test failed to reenable them
-		OC_FileProxy::$enabled = true;
-		return count($proxies) > 0;
-	}
-}
-- 
GitLab


From 391ece46e3c92f0e1e0cc25ce110943a25df3b0c Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Wed, 12 Nov 2014 13:33:41 +0100
Subject: [PATCH 487/616] Fix file upload to ext storage when recovery key is
 enabled

Fixes an issue when uploading files to external storage when recovery
keys are enabled

The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
---
 apps/files_encryption/lib/util.php   | 30 +++++++++++++++-------
 apps/files_encryption/tests/util.php | 37 ++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+), 9 deletions(-)

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index d12b003b227..d214d13de69 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -868,6 +868,25 @@ class Util {
 
 	}
 
+	/**
+	 * Returns whether the given user is ready for encryption.
+	 * Also returns true if the given user is the public user
+	 * or the recovery key user.
+	 *
+	 * @param string $user user to check
+	 *
+	 * @return boolean true if the user is ready, false otherwise
+	 */
+	private function isUserReady($user) {
+		if ($user === $this->publicShareKeyId
+			|| $user === $this->recoveryKeyId
+		) {
+			return true;
+		}
+		$util = new Util($this->view, $user);
+		return $util->ready();
+	}
+
 	/**
 	 * Filter an array of UIDs to return only ones ready for sharing
 	 * @param array $unfilteredUsers users to be checked for sharing readiness
@@ -880,16 +899,9 @@ class Util {
 
 		// Loop through users and create array of UIDs that need new keyfiles
 		foreach ($unfilteredUsers as $user) {
-
-			$util = new Util($this->view, $user);
-
 			// Check that the user is encryption capable, or is the
-			// public system user 'ownCloud' (for public shares)
-			if (
-				$user === $this->publicShareKeyId
-				or $user === $this->recoveryKeyId
-				or $util->ready()
-			) {
+			// public system user (for public shares)
+			if ($this->isUserReady($user)) {
 
 				// Construct array of ready UIDs for Keymanager{}
 				$readyIds[] = $user;
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index bbf6efae5b9..b8057202a07 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -549,6 +549,43 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		);
 	}
 
+	/**
+	 * Tests that filterShareReadyUsers() returns the correct list of
+	 * users that are ready or not ready for encryption
+	 */
+	public function testFilterShareReadyUsers() {
+		$appConfig = \OC::$server->getAppConfig();
+
+		$publicShareKeyId = $appConfig->getValue('files_encryption', 'publicShareKeyId');
+		$recoveryKeyId = $appConfig->getValue('files_encryption', 'recoveryKeyId');
+
+		$usersToTest = array(
+			'readyUser',
+			'notReadyUser',
+			'nonExistingUser',
+			$publicShareKeyId,
+			$recoveryKeyId,
+		);
+		\Test_Encryption_Util::loginHelper('readyUser', true);
+		\Test_Encryption_Util::loginHelper('notReadyUser', true);
+		// delete encryption dir to make it not ready
+		$this->view->unlink('notReadyUser/files_encryption/');
+
+		// login as user1
+		\Test_Encryption_Util::loginHelper(\Test_Encryption_Util::TEST_ENCRYPTION_UTIL_USER1);
+
+		$result = $this->util->filterShareReadyUsers($usersToTest);
+		$this->assertEquals(
+			array('readyUser', $publicShareKeyId, $recoveryKeyId),
+			$result['ready']
+		);
+		$this->assertEquals(
+			array('notReadyUser', 'nonExistingUser'),
+			$result['unready']
+		);
+		\OC_User::deleteUser('readyUser');
+	}
+
 	/**
 	 * @param string $user
 	 * @param bool $create
-- 
GitLab


From 09fd34eed908203674721af86ce889bfd0a0ef8d Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 19 Nov 2014 12:18:32 +0100
Subject: [PATCH 488/616] drop OC_Preferences::getUsers and getApps

---
 lib/private/legacy/preferences.php  | 22 --------------------
 lib/private/preferences.php         | 32 -----------------------------
 tests/lib/preferences-singleton.php | 28 -------------------------
 3 files changed, 82 deletions(-)

diff --git a/lib/private/legacy/preferences.php b/lib/private/legacy/preferences.php
index 4b68b0e69aa..4f88b60f245 100644
--- a/lib/private/legacy/preferences.php
+++ b/lib/private/legacy/preferences.php
@@ -28,28 +28,6 @@ OC_Preferences::$object = new \OC\Preferences(OC_DB::getConnection());
  */
 class OC_Preferences{
 	public static $object;
-	/**
-	 * Get all users using the preferences
-	 * @return array an array of user ids
-	 *
-	 * This function returns a list of all users that have at least one entry
-	 * in the preferences table.
-	 */
-	public static function getUsers() {
-		return self::$object->getUsers();
-	}
-
-	/**
-	 * Get all apps of a user
-	 * @param string $user user
-	 * @return integer[] with app ids
-	 *
-	 * This function returns a list of all apps of the user that have at least
-	 * one entry in the preferences table.
-	 */
-	public static function getApps( $user ) {
-		return self::$object->getApps( $user );
-	}
 
 	/**
 	 * Get the available keys for an app
diff --git a/lib/private/preferences.php b/lib/private/preferences.php
index cdaa207449d..58f75419497 100644
--- a/lib/private/preferences.php
+++ b/lib/private/preferences.php
@@ -67,25 +67,6 @@ class Preferences {
 		$this->conn = $conn;
 	}
 
-	/**
-	 * Get all users using the preferences
-	 * @return array an array of user ids
-	 *
-	 * This function returns a list of all users that have at least one entry
-	 * in the preferences table.
-	 */
-	public function getUsers() {
-		$query = 'SELECT DISTINCT `userid` FROM `*PREFIX*preferences`';
-		$result = $this->conn->executeQuery($query);
-
-		$users = array();
-		while ($userid = $result->fetchColumn()) {
-			$users[] = $userid;
-		}
-
-		return $users;
-	}
-
 	/**
 	 * @param string $user
 	 * @return array[]
@@ -108,19 +89,6 @@ class Preferences {
 		return $data;
 	}
 
-	/**
-	 * Get all apps of an user
-	 * @param string $user user
-	 * @return integer[] with app ids
-	 *
-	 * This function returns a list of all apps of the user that have at least
-	 * one entry in the preferences table.
-	 */
-	public function getApps($user) {
-		$data = $this->getUserValues($user);
-		return array_keys($data);
-	}
-
 	/**
 	 * Get the available keys for an app
 	 * @param string $user user
diff --git a/tests/lib/preferences-singleton.php b/tests/lib/preferences-singleton.php
index 01e15acdfe1..2bea889da9b 100644
--- a/tests/lib/preferences-singleton.php
+++ b/tests/lib/preferences-singleton.php
@@ -40,34 +40,6 @@ class Test_Preferences extends \Test\TestCase {
 		parent::tearDownAfterClass();
 	}
 
-	public function testGetUsers() {
-		$query = \OC_DB::prepare('SELECT DISTINCT `userid` FROM `*PREFIX*preferences`');
-		$result = $query->execute();
-		$expected = array();
-		while ($row = $result->fetchRow()) {
-			$expected[] = $row['userid'];
-		}
-
-		sort($expected);
-		$users = \OC_Preferences::getUsers();
-		sort($users);
-		$this->assertEquals($expected, $users);
-	}
-
-	public function testGetApps() {
-		$query = \OC_DB::prepare('SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?');
-		$result = $query->execute(array('Someuser'));
-		$expected = array();
-		while ($row = $result->fetchRow()) {
-			$expected[] = $row['appid'];
-		}
-
-		sort($expected);
-		$apps = \OC_Preferences::getApps('Someuser');
-		sort($apps);
-		$this->assertEquals($expected, $apps);
-	}
-
 	public function testGetKeys() {
 		$query = \OC_DB::prepare('SELECT DISTINCT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?');
 		$result = $query->execute(array('Someuser', 'getkeysapp'));
-- 
GitLab


From cb3af1dce294ab058162b3c4d1a0feb84465dd0b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 24 Oct 2014 18:26:48 +0200
Subject: [PATCH 489/616] detect user display name attribute and return user
 count depending on its presence

---
 apps/user_ldap/ajax/wizard.php |  2 +-
 apps/user_ldap/js/settings.js  | 15 ++++++++---
 apps/user_ldap/lib/wizard.php  | 49 ++++++++++++++++++++++++++++++++--
 3 files changed, 59 insertions(+), 7 deletions(-)

diff --git a/apps/user_ldap/ajax/wizard.php b/apps/user_ldap/ajax/wizard.php
index ef1241b9147..6d7d70c8c5a 100644
--- a/apps/user_ldap/ajax/wizard.php
+++ b/apps/user_ldap/ajax/wizard.php
@@ -62,6 +62,7 @@ switch($action) {
 	case 'guessPortAndTLS':
 	case 'guessBaseDN':
 	case 'detectEmailAttribute':
+	case 'detectUserDisplayNameAttribute':
 	case 'determineGroupMemberAssoc':
 	case 'determineUserObjectClasses':
 	case 'determineGroupObjectClasses':
@@ -115,4 +116,3 @@ switch($action) {
 		//TODO: return 4xx error
 		break;
 }
-
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index fa40aba73b4..93fd97c1e73 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -151,8 +151,10 @@ var LdapWizard = {
 	ajaxRequests: {},
 
 	ajax: function(param, fnOnSuccess, fnOnError, reqID) {
-		if(reqID !== undefined) {
+		if(typeof reqID !== 'undefined') {
 			if(LdapWizard.ajaxRequests.hasOwnProperty(reqID)) {
+				console.log('aborting ' + reqID);
+				console.log(param);
 				LdapWizard.ajaxRequests[reqID].abort();
 			}
 		}
@@ -167,7 +169,7 @@ var LdapWizard = {
 				}
 			}
 		);
-		if(reqID !== undefined) {
+		if(typeof reqID !== 'undefined') {
 			LdapWizard.ajaxRequests[reqID] = request;
 		}
 	},
@@ -342,7 +344,7 @@ var LdapWizard = {
 	},
 
 	_countThings: function(method, spinnerID, doneCallback) {
-		param = 'action='+method+
+		var param = 'action='+method+
 				'&ldap_serverconfig_chooser='+
 				encodeURIComponent($('#ldap_serverconfig_chooser').val());
 
@@ -371,7 +373,12 @@ var LdapWizard = {
 	},
 
 	countUsers: function(doneCallback) {
-		LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
+		//we make user counting depending on having a display name attribute
+		var param = 'action=detectUserDisplayNameAttribute' +
+			'&ldap_serverconfig_chooser='+
+			encodeURIComponent($('#ldap_serverconfig_chooser').val());
+
+			LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
 	},
 
 	detectEmailAttribute: function() {
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 1d7701440e9..c5db4c66cc0 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -56,7 +56,7 @@ class Wizard extends LDAPUtility {
 			Wizard::$l = \OC::$server->getL10N('user_ldap');
 		}
 		$this->access = $access;
-		$this->result = new WizardResult;
+		$this->result = new WizardResult();
 	}
 
 	public function  __destruct() {
@@ -120,7 +120,11 @@ class Wizard extends LDAPUtility {
 	 * @throws \Exception
 	 */
 	public function countUsers() {
-		$filter = $this->configuration->ldapUserFilter;
+		$this->detectUserDisplayNameAttribute();
+		$filter = $this->access->combineFilterWithAnd(array(
+			$this->configuration->ldapUserFilter,
+			$this->configuration->ldapUserDisplayName . '=*'
+		));
 
 		$usersTotal = $this->countEntries($filter, 'users');
 		$usersTotal = ($usersTotal !== false) ? $usersTotal : 0;
@@ -151,6 +155,47 @@ class Wizard extends LDAPUtility {
 		return $this->access->countUsers($filter);
 	}
 
+	/**
+	 * detects the display name attribute. If a setting is already present that
+	 * returns at least one hit, the detection will be canceled.
+	 * @return WizardResult|bool
+	 */
+	public function detectUserDisplayNameAttribute() {
+		if(!$this->checkRequirements(array('ldapHost',
+										'ldapPort',
+										'ldapBase',
+										'ldapUserFilter',
+										))) {
+			return  false;
+		}
+
+		$attr = $this->configuration->ldapUserDisplayName;
+		if($attr !== 'displayName' && !empty($attr)) {
+			// most likely not the default value with upper case N,
+			// verify it still produces a result
+			$count = intval($this->countUsersWithAttribute($attr));
+			if($count > 0) {
+				//no change, but we sent it back to make sure the user interface
+				//is still correct, even if the ajax call was cancelled inbetween
+				$this->result->addChange('ldap_display_name', $attr);
+				return $this->result;
+			}
+		}
+
+		// first attribute that has at least one result wins
+		$displayNameAttrs = array('displayname', 'cn');
+		foreach ($displayNameAttrs as $attr) {
+			$count = intval($this->countUsersWithAttribute($attr));
+
+			if($count > 0) {
+				$this->applyFind('ldap_display_name', $attr);
+				return $this->result;
+			}
+		};
+
+		throw new \Exception(self::$t->l('Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.'));
+	}
+
 	/**
 	 * detects the most often used email attribute for users applying to the
 	 * user list filter. If a setting is already present that returns at least
-- 
GitLab


From f725cc66a385311d9995ec4215f57448b59f124e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 27 Oct 2014 23:39:30 +0100
Subject: [PATCH 490/616] consolidate user count filter in wizard and user back
 end

---
 apps/user_ldap/lib/access.php      | 12 +++++++++++
 apps/user_ldap/lib/wizard.php      |  5 +----
 apps/user_ldap/tests/user_ldap.php | 32 ++----------------------------
 apps/user_ldap/user_ldap.php       |  3 +--
 4 files changed, 16 insertions(+), 36 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index d89029abf17..0d51fc51143 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1167,6 +1167,18 @@ class Access extends LDAPUtility implements user\IUserTools {
 		return $this->combineFilterWithOr($filter);
 	}
 
+	/**
+	 * returns the filter used for counting users
+	 */
+	public function getFilterForUserCount() {
+		$filter = $this->combineFilterWithAnd(array(
+			$this->connection->ldapUserFilter,
+			$this->connection->ldapUserDisplayName . '=*'
+		));
+
+		return $filter;
+	}
+
 	/**
 	 * @param string $name
 	 * @param string $password
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index c5db4c66cc0..f373fabb69c 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -121,10 +121,7 @@ class Wizard extends LDAPUtility {
 	 */
 	public function countUsers() {
 		$this->detectUserDisplayNameAttribute();
-		$filter = $this->access->combineFilterWithAnd(array(
-			$this->configuration->ldapUserFilter,
-			$this->configuration->ldapUserDisplayName . '=*'
-		));
+		$filter = $this->access->getFilterForUserCount();
 
 		$usersTotal = $this->countEntries($filter, 'users');
 		$usersTotal = ($usersTotal !== false) ? $usersTotal : 0;
diff --git a/apps/user_ldap/tests/user_ldap.php b/apps/user_ldap/tests/user_ldap.php
index c89edc33fa9..d975fd56c51 100644
--- a/apps/user_ldap/tests/user_ldap.php
+++ b/apps/user_ldap/tests/user_ldap.php
@@ -550,23 +550,9 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
 	public function testCountUsers() {
 		$access = $this->getAccessMock();
 
-		$access->connection->expects($this->once())
-			   ->method('__get')
-			   ->will($this->returnCallback(function($name) {
-					if($name === 'ldapLoginFilter') {
-						return 'uid=%uid';
-					}
-					return null;
-			   }));
-
 		$access->expects($this->once())
 			   ->method('countUsers')
-			   ->will($this->returnCallback(function($filter, $a, $b, $c) {
-				   if($filter !== 'uid=*') {
-					   return false;
-				   }
-				   return 5;
-			   }));
+			   ->will($this->returnValue(5));
 
 		$backend = new UserLDAP($access);
 
@@ -577,23 +563,9 @@ class Test_User_Ldap_Direct extends \PHPUnit_Framework_TestCase {
 	public function testCountUsersFailing() {
 		$access = $this->getAccessMock();
 
-		$access->connection->expects($this->once())
-			   ->method('__get')
-			   ->will($this->returnCallback(function($name) {
-					if($name === 'ldapLoginFilter') {
-						return 'invalidFilter';
-					}
-					return null;
-			   }));
-
 		$access->expects($this->once())
 			   ->method('countUsers')
-			   ->will($this->returnCallback(function($filter, $a, $b, $c) {
-				   if($filter !== 'uid=*') {
-					   return false;
-				   }
-				   return 5;
-			   }));
+			   ->will($this->returnValue(false));
 
 		$backend = new UserLDAP($access);
 
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 6e244311d4a..c2f87ebeb22 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -290,8 +290,7 @@ class USER_LDAP extends BackendUtility implements \OCP\UserInterface {
 	 * @return int|bool
 	 */
 	public function countUsers() {
-		$filter = \OCP\Util::mb_str_replace(
-			'%uid', '*', $this->access->connection->ldapLoginFilter, 'UTF-8');
+		$filter = $this->access->getFilterForUserCount();
 		$entries = $this->access->countUsers($filter);
 		return $entries;
 	}
-- 
GitLab


From 71944a59a5279b34b57aa68c5b7ad0173e4a6793 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 28 Oct 2014 23:04:03 +0100
Subject: [PATCH 491/616] detectors (email, displayname..) are now started in
 one place, triggered from only 2 places. more reliable structure and flow,
 saves requests

---
 apps/user_ldap/js/ldapFilter.js | 41 +++++++++++-------
 apps/user_ldap/js/settings.js   | 73 ++++++++++++++++++++++++---------
 apps/user_ldap/lib/wizard.php   |  1 -
 3 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index bb66c1df2ee..2bb62ad1a9a 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -25,7 +25,7 @@ LdapFilter.prototype.activate = function() {
 	this.determineMode();
 };
 
-LdapFilter.prototype.compose = function(callback) {
+LdapFilter.prototype.compose = function() {
 	var action;
 
 	if(this.locked) {
@@ -54,14 +54,7 @@ LdapFilter.prototype.compose = function(callback) {
 
 	LdapWizard.ajax(param,
 		function(result) {
-			LdapWizard.applyChanges(result);
-			filter.updateCount();
-			if(filter.target === 'Group') {
-				LdapWizard.detectGroupMemberAssoc();
-			}
-			if(typeof callback !== 'undefined') {
-				callback();
-			}
+			filter.afterComposeSuccess(result);
 		},
 		function () {
 			console.log('LDAP Wizard: could not compose filter. '+
@@ -70,6 +63,15 @@ LdapFilter.prototype.compose = function(callback) {
 	);
 };
 
+LdapFilter.prototype.afterDetectorsRan = function() {
+	this.updateCount();
+};
+
+LdapFilter.prototype.afterComposeSuccess = function(result) {
+	LdapWizard.applyChanges(result);
+	LdapWizard.runDetectors(this.target, this.afterDetectorsRan);
+};
+
 LdapFilter.prototype.determineMode = function() {
 	var param = 'action=get'+encodeURIComponent(this.target)+'FilterMode'+
 		'&ldap_serverconfig_chooser='+
@@ -145,10 +147,21 @@ LdapFilter.prototype.findFeatures = function() {
 	}
 };
 
+LdapFilter.prototype.beforeUpdateCount = function(status) {
+	return LdapWizard.runDetectors(this.target, function() {
+		status.resolve();
+	});
+};
+
 LdapFilter.prototype.updateCount = function(doneCallback) {
-	if(this.target === 'User') {
-		LdapWizard.countUsers(doneCallback);
-	} else if (this.target === 'Group') {
-		LdapWizard.countGroups(doneCallback);
-	}
+	var beforeUpdateCountDone = $.Deferred();
+	this.beforeUpdateCount(beforeUpdateCountDone);
+	var filter = this;
+	$.when(beforeUpdateCountDone).done(function() {
+		if(filter.target === 'User') {
+			LdapWizard.countUsers(doneCallback);
+		} else if (filter.target === 'Group') {
+			LdapWizard.countGroups(doneCallback);
+		}
+	});
 };
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 93fd97c1e73..f8cb3d84cea 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -172,6 +172,7 @@ var LdapWizard = {
 		if(typeof reqID !== 'undefined') {
 			LdapWizard.ajaxRequests[reqID] = request;
 		}
+		return request;
 	},
 
 	applyChanges: function (result) {
@@ -373,20 +374,44 @@ var LdapWizard = {
 	},
 
 	countUsers: function(doneCallback) {
-		//we make user counting depending on having a display name attribute
+		LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
+	},
+
+	runDetectors: function(type, callback) {
+		if(type === 'Group') {
+			$.when(LdapWizard.detectGroupMemberAssoc())
+				.then(callback, callback);
+			if(   LdapWizard.admin.isExperienced
+			   && !(LdapWizard.detectorsRunInXPMode & LdapWizard.groupDetectors)) {
+				LdapWizard.detectorsRunInXPMode += LdapWizard.groupDetectors;
+			}
+		} else if(type === 'User') {
+			var req1 = LdapWizard.detectUserDisplayNameAttribute();
+			var req2 = LdapWizard.detectEmailAttribute();
+			$.when(req1, req2)
+				.then(callback, callback);
+			if(   LdapWizard.admin.isExperienced
+			   && !(LdapWizard.detectorsRunInXPMode & LdapWizard.userDetectors)) {
+				LdapWizard.detectorsRunInXPMode += LdapWizard.userDetectors;
+			}
+		}
+	},
+
+	detectUserDisplayNameAttribute: function() {
 		var param = 'action=detectUserDisplayNameAttribute' +
 			'&ldap_serverconfig_chooser='+
 			encodeURIComponent($('#ldap_serverconfig_chooser').val());
 
-			LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
+		//runs in the background, no callbacks necessary
+		return LdapWizard.ajax(param, LdapWizard.applyChanges, function(){}, 'detectUserDisplayNameAttribute');
 	},
 
 	detectEmailAttribute: function() {
-		param = 'action=detectEmailAttribute'+
+		var param = 'action=detectEmailAttribute'+
 				'&ldap_serverconfig_chooser='+
 				encodeURIComponent($('#ldap_serverconfig_chooser').val());
 		//runs in the background, no callbacks necessary
-		LdapWizard.ajax(param, LdapWizard.applyChanges, function(){}, 'detectEmailAttribute');
+		return LdapWizard.ajax(param, LdapWizard.applyChanges, function(){}, 'detectEmailAttribute');
 	},
 
 	detectGroupMemberAssoc: function() {
@@ -394,7 +419,7 @@ var LdapWizard = {
 				'&ldap_serverconfig_chooser='+
 				encodeURIComponent($('#ldap_serverconfig_chooser').val());
 
-		LdapWizard.ajax(param,
+		return LdapWizard.ajax(param,
 			function(result) {
 				//pure background story
 			},
@@ -416,7 +441,7 @@ var LdapWizard = {
 				$('#ldap_loginfilter_attributes').find('option').remove();
 				for (var i in result.options['ldap_loginfilter_attributes']) {
 					//FIXME: move HTML into template
-					attr = result.options['ldap_loginfilter_attributes'][i];
+					var attr = result.options['ldap_loginfilter_attributes'][i];
 					$('#ldap_loginfilter_attributes').append(
 								"<option value='"+attr+"'>"+attr+"</option>");
 				}
@@ -573,8 +598,12 @@ var LdapWizard = {
 	},
 
 	isConfigurationActiveControlLocked: true,
+	detectorsRunInXPMode: 0,
+	userDetectors: 1,
+	groupDetectors: 2,
 
 	init: function() {
+		LdapWizard.detectorsRunInXPMode = 0;
 		LdapWizard.instantiateFilters();
 		LdapWizard.admin.setExperienced($('#ldap_experienced_admin').is(':checked'));
 		LdapWizard.basicStatusCheck();
@@ -637,7 +666,6 @@ var LdapWizard = {
 			$('#ldap_user_count').text('');
 			LdapWizard.showSpinner('#rawUserFilterContainer .ldapGetEntryCount');
 			LdapWizard.userFilter.updateCount(LdapWizard.hideTestSpinner);
-			LdapWizard.detectEmailAttribute();
 			$('#ldap_user_count').removeClass('hidden');
 		});
 
@@ -658,7 +686,6 @@ var LdapWizard = {
 			$('#ldap_group_count').text('');
 			LdapWizard.showSpinner('#rawGroupFilterContainer .ldapGetEntryCount');
 			LdapWizard.groupFilter.updateCount(LdapWizard.hideTestSpinner);
-			LdapWizard.detectGroupMemberAssoc();
 			$('#ldap_group_count').removeClass('hidden');
 		});
 	},
@@ -675,7 +702,7 @@ var LdapWizard = {
 	postInitUserFilter: function() {
 		if(LdapWizard.userFilterObjectClassesHasRun &&
 			LdapWizard.userFilterAvailableGroupsHasRun) {
-			LdapWizard.userFilter.compose(LdapWizard.detectEmailAttribute);
+			LdapWizard.userFilter.compose();
 		}
 	},
 
@@ -686,7 +713,7 @@ var LdapWizard = {
 			//do not allow to switch tabs as long as a save process is active
 			return false;
 		}
-		newTabIndex = 0;
+		var newTabIndex = 0;
 		if(ui.newTab[0].id === '#ldapWizard2') {
 			LdapWizard.initUserFilter();
 			newTabIndex = 1;
@@ -698,9 +725,23 @@ var LdapWizard = {
 			newTabIndex = 3;
 		}
 
-		curTabIndex = $('#ldapSettings').tabs('option', 'active');
+		var curTabIndex = $('#ldapSettings').tabs('option', 'active');
 		if(curTabIndex >= 0 && curTabIndex <= 3) {
 			LdapWizard.controlUpdate(newTabIndex);
+			//run detectors in XP mode, when "Test Filter" button has not been
+			//clicked in order to make sure that email, displayname, member-
+			//group association attributes are properly set.
+			if(   curTabIndex === 1
+			   && LdapWizard.admin.isExperienced
+			   && !(LdapWizard.detecorsRunInXPMode & LdapWizard.userDetectors)
+			) {
+				LdapWizard.runDetectors('User', function(){});
+			} else if(   curTabIndex === 3
+			          && LdapWizard.admin.isExperienced
+			          && !(LdapWizard.detecorsRunInXPMode & LdapWizard.groupDetectors)
+			) {
+				LdapWizard.runDetectors('Group', function(){});
+			}
 		}
 	},
 
@@ -718,12 +759,6 @@ var LdapWizard = {
 			}
 		}
 
-		if(triggerObj.id === 'ldap_userlist_filter' && !LdapWizard.admin.isExperienced()) {
-			LdapWizard.detectEmailAttribute();
-		} else if(triggerObj.id === 'ldap_group_filter' && !LdapWizard.admin.isExperienced()) {
-			LdapWizard.detectGroupMemberAssoc();
-		}
-
 		if(triggerObj.id === 'ldap_loginfilter_username'
 		   || triggerObj.id === 'ldap_loginfilter_email') {
 			LdapWizard.loginFilter.compose();
@@ -756,7 +791,7 @@ var LdapWizard = {
 		LdapWizard._save($('#'+originalObj)[0], $.trim(values));
 		if(originalObj === 'ldap_userfilter_objectclass'
 		   || originalObj === 'ldap_userfilter_groups') {
-			LdapWizard.userFilter.compose(LdapWizard.detectEmailAttribute);
+			LdapWizard.userFilter.compose();
 			//when user filter is changed afterwards, login filter needs to
 			//be adjusted, too
 			if(!LdapWizard.loginFilter) {
@@ -837,7 +872,7 @@ var LdapWizard = {
 			LdapWizard._save({ id: modeKey }, LdapWizard.filterModeAssisted);
 			if(isUser) {
 				LdapWizard.blacklistRemove('ldap_userlist_filter');
-				LdapWizard.userFilter.compose(LdapWizard.detectEmailAttribute);
+				LdapWizard.userFilter.compose();
 			} else {
 				LdapWizard.blacklistRemove('ldap_group_filter');
 				LdapWizard.groupFilter.compose();
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index f373fabb69c..59911fe77d1 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -120,7 +120,6 @@ class Wizard extends LDAPUtility {
 	 * @throws \Exception
 	 */
 	public function countUsers() {
-		$this->detectUserDisplayNameAttribute();
 		$filter = $this->access->getFilterForUserCount();
 
 		$usersTotal = $this->countEntries($filter, 'users');
-- 
GitLab


From f9b4f5f4e548715b06feec14236d68d330e865b2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Oct 2014 10:24:48 +0100
Subject: [PATCH 492/616] to reassure that selected attributes still work, do
 not count all matching entries but limit it to 1 in order to make it faster

---
 apps/user_ldap/lib/access.php | 14 ++++++++------
 apps/user_ldap/lib/wizard.php | 13 ++++++++-----
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 0d51fc51143..3a118891f40 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -887,8 +887,10 @@ class Access extends LDAPUtility implements user\IUserTools {
 	private function count($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) {
 		\OCP\Util::writeLog('user_ldap', 'Count filter:  '.print_r($filter, true), \OCP\Util::DEBUG);
 
+		$limitPerPage = (intval($limit) < intval($this->connection->ldapPagingSize)) ?
+			intval($limit) : intval($this->connection->ldapPagingSize);
 		if(is_null($limit) || $limit <= 0) {
-			$limit = intval($this->connection->ldapPagingSize);
+			$limitPerPage = intval($this->connection->ldapPagingSize);
 		}
 
 		$counter = 0;
@@ -898,19 +900,19 @@ class Access extends LDAPUtility implements user\IUserTools {
 		do {
 			$continue = false;
 			$search = $this->executeSearch($filter, $base, $attr,
-										   $limit, $offset);
+										   $limitPerPage, $offset);
 			if($search === false) {
 				return $counter > 0 ? $counter : false;
 			}
 			list($sr, $pagedSearchOK) = $search;
 
-			$count = $this->countEntriesInSearchResults($sr, $limit, $continue);
+			$count = $this->countEntriesInSearchResults($sr, $limitPerPage, $continue);
 			$counter += $count;
 
-			$this->processPagedSearchStatus($sr, $filter, $base, $count, $limit,
+			$this->processPagedSearchStatus($sr, $filter, $base, $count, $limitPerPage,
 										$offset, $pagedSearchOK, $skipHandling);
-			$offset += $limit;
-		} while($continue);
+			$offset += $limitPerPage;
+		} while($continue && (is_null($limit) || $limit <= 0 || $limit > $counter));
 
 		return $counter;
 	}
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 59911fe77d1..63b7e22ce8c 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -132,9 +132,10 @@ class Wizard extends LDAPUtility {
 	/**
 	 * counts users with a specified attribute
 	 * @param string $attr
+	 * @param bool $existsCheck
 	 * @return int|bool
 	 */
-	public function countUsersWithAttribute($attr) {
+	public function countUsersWithAttribute($attr, $existsCheck = false) {
 		if(!$this->checkRequirements(array('ldapHost',
 										   'ldapPort',
 										   'ldapBase',
@@ -148,7 +149,9 @@ class Wizard extends LDAPUtility {
 			$attr . '=*'
 		));
 
-		return $this->access->countUsers($filter);
+		$limit = ($existsCheck === false) ? null : 1;
+
+		return $this->access->countUsers($filter, array('dn'), $limit);
 	}
 
 	/**
@@ -169,7 +172,7 @@ class Wizard extends LDAPUtility {
 		if($attr !== 'displayName' && !empty($attr)) {
 			// most likely not the default value with upper case N,
 			// verify it still produces a result
-			$count = intval($this->countUsersWithAttribute($attr));
+			$count = intval($this->countUsersWithAttribute($attr, true));
 			if($count > 0) {
 				//no change, but we sent it back to make sure the user interface
 				//is still correct, even if the ajax call was cancelled inbetween
@@ -181,7 +184,7 @@ class Wizard extends LDAPUtility {
 		// first attribute that has at least one result wins
 		$displayNameAttrs = array('displayname', 'cn');
 		foreach ($displayNameAttrs as $attr) {
-			$count = intval($this->countUsersWithAttribute($attr));
+			$count = intval($this->countUsersWithAttribute($attr, true));
 
 			if($count > 0) {
 				$this->applyFind('ldap_display_name', $attr);
@@ -209,7 +212,7 @@ class Wizard extends LDAPUtility {
 
 		$attr = $this->configuration->ldapEmailAttribute;
 		if(!empty($attr)) {
-			$count = intval($this->countUsersWithAttribute($attr));
+			$count = intval($this->countUsersWithAttribute($attr, true));
 			if($count > 0) {
 				return false;
 			}
-- 
GitLab


From 4a3fe42b1672f5110076c75582edb5a43b7ea577 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Oct 2014 10:27:17 +0100
Subject: [PATCH 493/616] a corrected email attribute needs to be saved, not
 only returned

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

diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 63b7e22ce8c..2f8d97c89da 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -233,7 +233,7 @@ class Wizard extends LDAPUtility {
 		}
 
 		if($winner !== '') {
-			$this->result->addChange('ldap_email_attr', $winner);
+			$this->applyFind('ldap_email_attr', $winner);
 			if($writeLog) {
 				\OCP\Util::writeLog('user_ldap', 'The mail attribute has ' .
 					'automatically been reset, because the original value ' .
-- 
GitLab


From c9e865629ebb1e83626ff049244318b8769b4502 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Oct 2014 11:05:02 +0100
Subject: [PATCH 494/616] JS doc

---
 apps/user_ldap/js/ldapFilter.js | 14 ++++++++++++++
 apps/user_ldap/js/settings.js   | 13 +++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 2bb62ad1a9a..780aa10fe3f 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -63,12 +63,21 @@ LdapFilter.prototype.compose = function() {
 	);
 };
 
+/**
+ * this function is triggered after attribute detectors have completed in
+ * LdapWizard
+ */
 LdapFilter.prototype.afterDetectorsRan = function() {
 	this.updateCount();
 };
 
+/**
+ * this function is triggered after LDAP filters have been composed successfully
+ * @param {object} result returned by the ajax call
+ */
 LdapFilter.prototype.afterComposeSuccess = function(result) {
 	LdapWizard.applyChanges(result);
+	//best time to run attribute detectors
 	LdapWizard.runDetectors(this.target, this.afterDetectorsRan);
 };
 
@@ -147,6 +156,11 @@ LdapFilter.prototype.findFeatures = function() {
 	}
 };
 
+/**
+ * this function is triggered before user and group counts are executed
+ * resolving the passed status variable will fire up counting
+ * @param {object} status an instance of $.Deferred
+ */
 LdapFilter.prototype.beforeUpdateCount = function(status) {
 	return LdapWizard.runDetectors(this.target, function() {
 		status.resolve();
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index f8cb3d84cea..be1db28648f 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -377,6 +377,16 @@ var LdapWizard = {
 		LdapWizard._countThings('countUsers', '#ldap_user_count', doneCallback);
 	},
 
+	/**
+	 * called after detectors have run
+	 * @callback runDetectorsCallback
+	 */
+
+	/**
+	 * runs detectors to determine appropriate attributes, e.g. displayName
+	 * @param {string} type either "User" or "Group"
+	 * @param {runDetectorsCallback} triggered after all detectors have completed
+	 */
 	runDetectors: function(type, callback) {
 		if(type === 'Group') {
 			$.when(LdapWizard.detectGroupMemberAssoc())
@@ -397,6 +407,9 @@ var LdapWizard = {
 		}
 	},
 
+	/**
+	 * runs detector to find out a fitting user display name attribute
+	 */
 	detectUserDisplayNameAttribute: function() {
 		var param = 'action=detectUserDisplayNameAttribute' +
 			'&ldap_serverconfig_chooser='+
-- 
GitLab


From d8bb8afee33d96943fedbe619bfb2d7668cb6bb6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Oct 2014 11:08:20 +0100
Subject: [PATCH 495/616] this happens already before counting, no need anymore

---
 apps/user_ldap/js/ldapFilter.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 780aa10fe3f..4db8555f639 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -77,8 +77,6 @@ LdapFilter.prototype.afterDetectorsRan = function() {
  */
 LdapFilter.prototype.afterComposeSuccess = function(result) {
 	LdapWizard.applyChanges(result);
-	//best time to run attribute detectors
-	LdapWizard.runDetectors(this.target, this.afterDetectorsRan);
 };
 
 LdapFilter.prototype.determineMode = function() {
-- 
GitLab


From 0e6d47123a9b47b977b821bd8fbeb92b3c8893a1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Oct 2014 19:20:32 +0100
Subject: [PATCH 496/616] use underscore.js for undefined checks

---
 apps/user_ldap/js/settings.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index be1db28648f..f6fcaa2849e 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -151,7 +151,7 @@ var LdapWizard = {
 	ajaxRequests: {},
 
 	ajax: function(param, fnOnSuccess, fnOnError, reqID) {
-		if(typeof reqID !== 'undefined') {
+		if(!_.isUndefined(reqID)) {
 			if(LdapWizard.ajaxRequests.hasOwnProperty(reqID)) {
 				console.log('aborting ' + reqID);
 				console.log(param);
@@ -169,7 +169,7 @@ var LdapWizard = {
 				}
 			}
 		);
-		if(typeof reqID !== 'undefined') {
+		if(!_.isUndefined(reqID)) {
 			LdapWizard.ajaxRequests[reqID] = request;
 		}
 		return request;
@@ -354,14 +354,14 @@ var LdapWizard = {
 			function(result) {
 				LdapWizard.applyChanges(result);
 				LdapWizard.hideSpinner(spinnerID);
-				if(doneCallback !== undefined) {
+				if(!_.isUndefined(doneCallback)) {
 					doneCallback(method);
 				}
 			},
 			function (result) {
 				OC.Notification.show('Counting the entries failed with, ' + result.message);
 				LdapWizard.hideSpinner(spinnerID);
-				if(doneCallback !== undefined) {
+				if(!_.isUndefined(doneCallback)) {
 					doneCallback(method);
 				}
 			},
-- 
GitLab


From 031d6c179f289140888ac4fb5fae698ee5bc37f3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Oct 2014 19:30:49 +0100
Subject: [PATCH 497/616] better readbility, no effective changes

---
 apps/user_ldap/js/ldapFilter.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 4db8555f639..63baec24ecc 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -159,17 +159,17 @@ LdapFilter.prototype.findFeatures = function() {
  * resolving the passed status variable will fire up counting
  * @param {object} status an instance of $.Deferred
  */
-LdapFilter.prototype.beforeUpdateCount = function(status) {
-	return LdapWizard.runDetectors(this.target, function() {
+LdapFilter.prototype.beforeUpdateCount = function() {
+	var status = $.Deferred();
+	LdapWizard.runDetectors(this.target, function() {
 		status.resolve();
 	});
+	return status;
 };
 
 LdapFilter.prototype.updateCount = function(doneCallback) {
-	var beforeUpdateCountDone = $.Deferred();
-	this.beforeUpdateCount(beforeUpdateCountDone);
 	var filter = this;
-	$.when(beforeUpdateCountDone).done(function() {
+	$.when(this.beforeUpdateCount()).done(function() {
 		if(filter.target === 'User') {
 			LdapWizard.countUsers(doneCallback);
 		} else if (filter.target === 'Group') {
-- 
GitLab


From 6b6147dafd19965856b650cafe321c7347831992 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 20 Nov 2014 18:03:47 +0100
Subject: [PATCH 498/616] phpdoc and mixed up letters

---
 apps/user_ldap/lib/access.php | 1 +
 apps/user_ldap/lib/wizard.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 3a118891f40..a0ec64b3f60 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -1171,6 +1171,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 
 	/**
 	 * returns the filter used for counting users
+	 * @return string
 	 */
 	public function getFilterForUserCount() {
 		$filter = $this->combineFilterWithAnd(array(
diff --git a/apps/user_ldap/lib/wizard.php b/apps/user_ldap/lib/wizard.php
index 2f8d97c89da..578a920f00e 100644
--- a/apps/user_ldap/lib/wizard.php
+++ b/apps/user_ldap/lib/wizard.php
@@ -158,6 +158,7 @@ class Wizard extends LDAPUtility {
 	 * detects the display name attribute. If a setting is already present that
 	 * returns at least one hit, the detection will be canceled.
 	 * @return WizardResult|bool
+	 * @throws \Exception
 	 */
 	public function detectUserDisplayNameAttribute() {
 		if(!$this->checkRequirements(array('ldapHost',
@@ -192,7 +193,7 @@ class Wizard extends LDAPUtility {
 			}
 		};
 
-		throw new \Exception(self::$t->l('Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.'));
+		throw new \Exception(self::$l->t('Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.'));
 	}
 
 	/**
-- 
GitLab


From b5e707b1bfbe9cddafe2edb0232bc032cb892a2e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 20 Nov 2014 18:31:24 +0100
Subject: [PATCH 499/616] trigger count on the correct filter

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

diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index f6fcaa2849e..15c63614f50 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -670,7 +670,7 @@ var LdapWizard = {
 		delete LdapWizard.userFilter;
 		LdapWizard.userFilter = new LdapFilter('User', function(mode) {
 			if(mode === LdapWizard.filterModeAssisted) {
-				LdapWizard.groupFilter.updateCount();
+				LdapWizard.userFilter.updateCount();
 			}
 			LdapWizard.userFilter.findFeatures();
 		});
-- 
GitLab


From 593ef76e36a0167e87e30072730f8b6d91bb228e Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 20 Nov 2014 22:02:26 +0100
Subject: [PATCH 500/616] Revert "drop OC_Preferences::getUsers and getApps"

This reverts commit 09fd34eed908203674721af86ce889bfd0a0ef8d.
---
 lib/private/legacy/preferences.php  | 22 ++++++++++++++++++++
 lib/private/preferences.php         | 32 +++++++++++++++++++++++++++++
 tests/lib/preferences-singleton.php | 28 +++++++++++++++++++++++++
 3 files changed, 82 insertions(+)

diff --git a/lib/private/legacy/preferences.php b/lib/private/legacy/preferences.php
index 4f88b60f245..4b68b0e69aa 100644
--- a/lib/private/legacy/preferences.php
+++ b/lib/private/legacy/preferences.php
@@ -28,6 +28,28 @@ OC_Preferences::$object = new \OC\Preferences(OC_DB::getConnection());
  */
 class OC_Preferences{
 	public static $object;
+	/**
+	 * Get all users using the preferences
+	 * @return array an array of user ids
+	 *
+	 * This function returns a list of all users that have at least one entry
+	 * in the preferences table.
+	 */
+	public static function getUsers() {
+		return self::$object->getUsers();
+	}
+
+	/**
+	 * Get all apps of a user
+	 * @param string $user user
+	 * @return integer[] with app ids
+	 *
+	 * This function returns a list of all apps of the user that have at least
+	 * one entry in the preferences table.
+	 */
+	public static function getApps( $user ) {
+		return self::$object->getApps( $user );
+	}
 
 	/**
 	 * Get the available keys for an app
diff --git a/lib/private/preferences.php b/lib/private/preferences.php
index 58f75419497..cdaa207449d 100644
--- a/lib/private/preferences.php
+++ b/lib/private/preferences.php
@@ -67,6 +67,25 @@ class Preferences {
 		$this->conn = $conn;
 	}
 
+	/**
+	 * Get all users using the preferences
+	 * @return array an array of user ids
+	 *
+	 * This function returns a list of all users that have at least one entry
+	 * in the preferences table.
+	 */
+	public function getUsers() {
+		$query = 'SELECT DISTINCT `userid` FROM `*PREFIX*preferences`';
+		$result = $this->conn->executeQuery($query);
+
+		$users = array();
+		while ($userid = $result->fetchColumn()) {
+			$users[] = $userid;
+		}
+
+		return $users;
+	}
+
 	/**
 	 * @param string $user
 	 * @return array[]
@@ -89,6 +108,19 @@ class Preferences {
 		return $data;
 	}
 
+	/**
+	 * Get all apps of an user
+	 * @param string $user user
+	 * @return integer[] with app ids
+	 *
+	 * This function returns a list of all apps of the user that have at least
+	 * one entry in the preferences table.
+	 */
+	public function getApps($user) {
+		$data = $this->getUserValues($user);
+		return array_keys($data);
+	}
+
 	/**
 	 * Get the available keys for an app
 	 * @param string $user user
diff --git a/tests/lib/preferences-singleton.php b/tests/lib/preferences-singleton.php
index 2bea889da9b..01e15acdfe1 100644
--- a/tests/lib/preferences-singleton.php
+++ b/tests/lib/preferences-singleton.php
@@ -40,6 +40,34 @@ class Test_Preferences extends \Test\TestCase {
 		parent::tearDownAfterClass();
 	}
 
+	public function testGetUsers() {
+		$query = \OC_DB::prepare('SELECT DISTINCT `userid` FROM `*PREFIX*preferences`');
+		$result = $query->execute();
+		$expected = array();
+		while ($row = $result->fetchRow()) {
+			$expected[] = $row['userid'];
+		}
+
+		sort($expected);
+		$users = \OC_Preferences::getUsers();
+		sort($users);
+		$this->assertEquals($expected, $users);
+	}
+
+	public function testGetApps() {
+		$query = \OC_DB::prepare('SELECT DISTINCT `appid` FROM `*PREFIX*preferences` WHERE `userid` = ?');
+		$result = $query->execute(array('Someuser'));
+		$expected = array();
+		while ($row = $result->fetchRow()) {
+			$expected[] = $row['appid'];
+		}
+
+		sort($expected);
+		$apps = \OC_Preferences::getApps('Someuser');
+		sort($apps);
+		$this->assertEquals($expected, $apps);
+	}
+
 	public function testGetKeys() {
 		$query = \OC_DB::prepare('SELECT DISTINCT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?');
 		$result = $query->execute(array('Someuser', 'getkeysapp'));
-- 
GitLab


From 75d37b69f6aedb6eb97b39d14cf2f5f8bc87bc49 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Thu, 20 Nov 2014 22:35:37 +0100
Subject: [PATCH 501/616] fix unit tests of mdb2scheamreader

---
 tests/lib/db/mdb2schemareader.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/lib/db/mdb2schemareader.php b/tests/lib/db/mdb2schemareader.php
index b2ff55e1632..7939c782e80 100644
--- a/tests/lib/db/mdb2schemareader.php
+++ b/tests/lib/db/mdb2schemareader.php
@@ -21,11 +21,11 @@ class MDB2SchemaReader extends \Test\TestCase {
 	 * @return \OC\Config
 	 */
 	protected function getConfig() {
-		$config = $this->getMockBuilder('\OC\Config')
+		$config = $this->getMockBuilder('\OCP\IConfig')
 			->disableOriginalConstructor()
 			->getMock();
 		$config->expects($this->any())
-			->method('getValue')
+			->method('getSystemValue')
 			->will($this->returnValueMap(array(
 				array('dbname', 'owncloud', 'testDB'),
 				array('dbtableprefix', 'oc_', 'test_')
-- 
GitLab


From 388ef07c2058916664d04cfe82f84ed2f15754cb Mon Sep 17 00:00:00 2001
From: Volkan Gezer <wakeup@users.noreply.github.com>
Date: Fri, 21 Nov 2014 02:17:02 +0100
Subject: [PATCH 502/616] update grammar

Suggested by mnestis on Transifex.
---
 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 ddac77508c7..166e36a3605 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -184,7 +184,7 @@ if (!$_['isLocaleWorking']) {
 		?>
 			<br>
 			<?php
-			p($l->t('We strongly suggest to install the required packages on your system to support one of the following locales: %s.', array($locales)));
+			p($l->t('We strongly suggest installing the required packages on your system to support one of the following locales: %s.', array($locales)));
 			?>
 	</span>
 
-- 
GitLab


From f8421958b3d06379c9dbfec49a16cf072dff7591 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 21 Nov 2014 02:54:26 -0500
Subject: [PATCH 503/616] [tx-robot] updated from transifex

---
 apps/files/l10n/de_CH.js              |  58 ++++++++++++++
 apps/files/l10n/de_CH.json            |  56 ++++++++++++++
 apps/files/l10n/hi_IN.js              |   8 ++
 apps/files/l10n/hi_IN.json            |   6 ++
 apps/files/l10n/sk.js                 |  12 +++
 apps/files/l10n/sk.json               |  10 +++
 apps/files/l10n/ur.js                 |   9 +++
 apps/files/l10n/ur.json               |   7 ++
 apps/files_encryption/l10n/de_CH.js   |  33 ++++++++
 apps/files_encryption/l10n/de_CH.json |  31 ++++++++
 apps/files_external/l10n/de_CH.js     |  28 +++++++
 apps/files_external/l10n/de_CH.json   |  26 +++++++
 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/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/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/de_CH.js          |  82 ++++++++++++++++++++
 apps/user_ldap/l10n/de_CH.json        |  80 +++++++++++++++++++
 apps/user_ldap/l10n/hi_IN.js          |   7 ++
 apps/user_ldap/l10n/hi_IN.json        |   5 ++
 apps/user_ldap/l10n/sk.js             |   9 +++
 apps/user_ldap/l10n/sk.json           |   7 ++
 apps/user_ldap/l10n/ur.js             |   8 ++
 apps/user_ldap/l10n/ur.json           |   6 ++
 apps/user_webdavauth/l10n/de_CH.js    |   8 ++
 apps/user_webdavauth/l10n/de_CH.json  |   6 ++
 apps/user_webdavauth/l10n/sk.js       |   6 ++
 apps/user_webdavauth/l10n/sk.json     |   4 +
 core/l10n/de_CH.js                    | 107 ++++++++++++++++++++++++++
 core/l10n/de_CH.json                  | 105 +++++++++++++++++++++++++
 core/l10n/hi_IN.js                    |   6 ++
 core/l10n/hi_IN.json                  |   4 +
 core/l10n/pt_BR.js                    |   2 +-
 core/l10n/pt_BR.json                  |   2 +-
 core/l10n/sk.js                       |  31 ++++++++
 core/l10n/sk.json                     |  29 +++++++
 core/l10n/ur.js                       |   7 ++
 core/l10n/ur.json                     |   5 ++
 lib/l10n/de_CH.js                     |  44 +++++++++++
 lib/l10n/de_CH.json                   |  42 ++++++++++
 lib/l10n/hi_IN.js                     |   9 +++
 lib/l10n/hi_IN.json                   |   7 ++
 lib/l10n/sk.js                        |  11 +++
 lib/l10n/sk.json                      |   9 +++
 lib/l10n/ur.js                        |   9 +++
 lib/l10n/ur.json                      |   7 ++
 settings/l10n/ar.js                   |   1 -
 settings/l10n/ar.json                 |   1 -
 settings/l10n/ast.js                  |   1 -
 settings/l10n/ast.json                |   1 -
 settings/l10n/bg_BG.js                |   1 -
 settings/l10n/bg_BG.json              |   1 -
 settings/l10n/ca.js                   |   1 -
 settings/l10n/ca.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_CH.js                | 102 ++++++++++++++++++++++++
 settings/l10n/de_CH.json              | 100 ++++++++++++++++++++++++
 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/es_AR.js                |   1 -
 settings/l10n/es_AR.json              |   1 -
 settings/l10n/es_MX.js                |   1 -
 settings/l10n/es_MX.json              |   1 -
 settings/l10n/et_EE.js                |   1 -
 settings/l10n/et_EE.json              |   1 -
 settings/l10n/eu.js                   |   1 -
 settings/l10n/eu.json                 |   1 -
 settings/l10n/fi_FI.js                |   1 -
 settings/l10n/fi_FI.json              |   1 -
 settings/l10n/fr.js                   |   1 -
 settings/l10n/fr.json                 |   1 -
 settings/l10n/gl.js                   |   1 -
 settings/l10n/gl.json                 |   1 -
 settings/l10n/hr.js                   |   1 -
 settings/l10n/hr.json                 |   1 -
 settings/l10n/hu_HU.js                |   1 -
 settings/l10n/hu_HU.json              |   1 -
 settings/l10n/id.js                   |   1 -
 settings/l10n/id.json                 |   1 -
 settings/l10n/it.js                   |   2 +-
 settings/l10n/it.json                 |   2 +-
 settings/l10n/ja.js                   |   1 -
 settings/l10n/ja.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/pl.js                   |   1 -
 settings/l10n/pl.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/sk.js                   |   9 +++
 settings/l10n/sk.json                 |   7 ++
 settings/l10n/sk_SK.js                |   1 -
 settings/l10n/sk_SK.json              |   1 -
 settings/l10n/sl.js                   |   1 -
 settings/l10n/sl.json                 |   1 -
 settings/l10n/sv.js                   |   1 -
 settings/l10n/sv.json                 |   1 -
 settings/l10n/tr.js                   |   3 +-
 settings/l10n/tr.json                 |   3 +-
 settings/l10n/uk.js                   |   1 -
 settings/l10n/uk.json                 |   1 -
 settings/l10n/ur.js                   |   6 ++
 settings/l10n/ur.json                 |   4 +
 settings/l10n/zh_CN.js                |   1 -
 settings/l10n/zh_CN.json              |   1 -
 settings/l10n/zh_TW.js                |   1 -
 settings/l10n/zh_TW.json              |   1 -
 136 files changed, 1306 insertions(+), 78 deletions(-)
 create mode 100644 apps/files/l10n/de_CH.js
 create mode 100644 apps/files/l10n/de_CH.json
 create mode 100644 apps/files/l10n/hi_IN.js
 create mode 100644 apps/files/l10n/hi_IN.json
 create mode 100644 apps/files/l10n/sk.js
 create mode 100644 apps/files/l10n/sk.json
 create mode 100644 apps/files/l10n/ur.js
 create mode 100644 apps/files/l10n/ur.json
 create mode 100644 apps/files_encryption/l10n/de_CH.js
 create mode 100644 apps/files_encryption/l10n/de_CH.json
 create mode 100644 apps/files_external/l10n/de_CH.js
 create mode 100644 apps/files_external/l10n/de_CH.json
 create mode 100644 apps/files_external/l10n/sk.js
 create mode 100644 apps/files_external/l10n/sk.json
 create mode 100644 apps/files_sharing/l10n/de_CH.js
 create mode 100644 apps/files_sharing/l10n/de_CH.json
 create mode 100644 apps/files_sharing/l10n/sk.js
 create mode 100644 apps/files_sharing/l10n/sk.json
 create mode 100644 apps/files_trashbin/l10n/de_CH.js
 create mode 100644 apps/files_trashbin/l10n/de_CH.json
 create mode 100644 apps/files_trashbin/l10n/sk.js
 create mode 100644 apps/files_trashbin/l10n/sk.json
 create mode 100644 apps/files_trashbin/l10n/ur.js
 create mode 100644 apps/files_trashbin/l10n/ur.json
 create mode 100644 apps/files_versions/l10n/de_CH.js
 create mode 100644 apps/files_versions/l10n/de_CH.json
 create mode 100644 apps/user_ldap/l10n/de_CH.js
 create mode 100644 apps/user_ldap/l10n/de_CH.json
 create mode 100644 apps/user_ldap/l10n/hi_IN.js
 create mode 100644 apps/user_ldap/l10n/hi_IN.json
 create mode 100644 apps/user_ldap/l10n/sk.js
 create mode 100644 apps/user_ldap/l10n/sk.json
 create mode 100644 apps/user_ldap/l10n/ur.js
 create mode 100644 apps/user_ldap/l10n/ur.json
 create mode 100644 apps/user_webdavauth/l10n/de_CH.js
 create mode 100644 apps/user_webdavauth/l10n/de_CH.json
 create mode 100644 apps/user_webdavauth/l10n/sk.js
 create mode 100644 apps/user_webdavauth/l10n/sk.json
 create mode 100644 core/l10n/de_CH.js
 create mode 100644 core/l10n/de_CH.json
 create mode 100644 core/l10n/hi_IN.js
 create mode 100644 core/l10n/hi_IN.json
 create mode 100644 core/l10n/sk.js
 create mode 100644 core/l10n/sk.json
 create mode 100644 core/l10n/ur.js
 create mode 100644 core/l10n/ur.json
 create mode 100644 lib/l10n/de_CH.js
 create mode 100644 lib/l10n/de_CH.json
 create mode 100644 lib/l10n/hi_IN.js
 create mode 100644 lib/l10n/hi_IN.json
 create mode 100644 lib/l10n/sk.js
 create mode 100644 lib/l10n/sk.json
 create mode 100644 lib/l10n/ur.js
 create mode 100644 lib/l10n/ur.json
 create mode 100644 settings/l10n/de_CH.js
 create mode 100644 settings/l10n/de_CH.json
 create mode 100644 settings/l10n/sk.js
 create mode 100644 settings/l10n/sk.json
 create mode 100644 settings/l10n/ur.js
 create mode 100644 settings/l10n/ur.json

diff --git a/apps/files/l10n/de_CH.js b/apps/files/l10n/de_CH.js
new file mode 100644
index 00000000000..05cec407e0b
--- /dev/null
+++ b/apps/files/l10n/de_CH.js
@@ -0,0 +1,58 @@
+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",
+    "_%n folder_::_%n folders_" : ["","%n Ordner"],
+    "_%n file_::_%n files_" : ["","%n Dateien"],
+    "_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
new file mode 100644
index 00000000000..9ef3585f722
--- /dev/null
+++ b/apps/files/l10n/de_CH.json
@@ -0,0 +1,56 @@
+{ "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",
+    "_%n folder_::_%n folders_" : ["","%n Ordner"],
+    "_%n file_::_%n files_" : ["","%n Dateien"],
+    "_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/hi_IN.js b/apps/files/l10n/hi_IN.js
new file mode 100644
index 00000000000..329844854f1
--- /dev/null
+++ b/apps/files/l10n/hi_IN.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..37156658a86
--- /dev/null
+++ b/apps/files/l10n/hi_IN.json
@@ -0,0 +1,6 @@
+{ "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
new file mode 100644
index 00000000000..13c12b94967
--- /dev/null
+++ b/apps/files/l10n/sk.js
@@ -0,0 +1,12 @@
+OC.L10N.register(
+    "files",
+    {
+    "Share" : "Zdieľať",
+    "Delete" : "Odstrániť",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "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
new file mode 100644
index 00000000000..982ae3759b2
--- /dev/null
+++ b/apps/files/l10n/sk.json
@@ -0,0 +1,10 @@
+{ "translations": {
+    "Share" : "Zdieľať",
+    "Delete" : "Odstrániť",
+    "_%n folder_::_%n folders_" : ["","",""],
+    "_%n file_::_%n files_" : ["","",""],
+    "_Uploading %n file_::_Uploading %n files_" : ["","",""],
+    "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
new file mode 100644
index 00000000000..0700689b60d
--- /dev/null
+++ b/apps/files/l10n/ur.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "files",
+    {
+    "Error" : "خرابی",
+    "_%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/ur.json b/apps/files/l10n/ur.json
new file mode 100644
index 00000000000..c5fe11055db
--- /dev/null
+++ b/apps/files/l10n/ur.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Error" : "خرابی",
+    "_%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_encryption/l10n/de_CH.js b/apps/files_encryption/l10n/de_CH.js
new file mode 100644
index 00000000000..1f5a01e6798
--- /dev/null
+++ b/apps/files_encryption/l10n/de_CH.js
@@ -0,0 +1,33 @@
+OC.L10N.register(
+    "files_encryption",
+    {
+    "Unknown error" : "Unbekannter Fehler",
+    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+    "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
+    "Missing requirements." : "Fehlende Voraussetzungen",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+    "Encryption" : "Verschlüsselung",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
+    "Change Password" : "Passwort ändern",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Login-Passwort",
+    "Current log-in password" : "Momentanes Login-Passwort",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/de_CH.json b/apps/files_encryption/l10n/de_CH.json
new file mode 100644
index 00000000000..244d0946bfe
--- /dev/null
+++ b/apps/files_encryption/l10n/de_CH.json
@@ -0,0 +1,31 @@
+{ "translations": {
+    "Unknown error" : "Unbekannter Fehler",
+    "Recovery key successfully enabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich aktiviert.",
+    "Could not disable recovery key. Please check your recovery key password!" : "Der Wiederherstellungsschlüssel konnte nicht deaktiviert werden. Bitte überprüfen Sie das Passwort für den Wiederherstellungsschlüssel!",
+    "Recovery key successfully disabled" : "Der Wiederherstellungsschlüssel wurde erfolgreich deaktiviert.",
+    "Password successfully changed." : "Das Passwort wurde erfolgreich geändert.",
+    "Could not change the password. Maybe the old password was not correct." : "Das Passwort konnte nicht geändert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "Private key password successfully updated." : "Das Passwort des privaten Schlüssels wurde erfolgreich aktualisiert.",
+    "Could not update the private key password. Maybe the old password was not correct." : "Das Passwort des privaten Schlüssels konnte nicht aktualisiert werden. Vielleicht war das alte Passwort nicht richtig.",
+    "File recovery settings updated" : "Die Einstellungen für die Dateiwiederherstellung wurden aktualisiert.",
+    "Could not update file recovery" : "Die Dateiwiederherstellung konnte nicht aktualisiert werden.",
+    "Missing requirements." : "Fehlende Voraussetzungen",
+    "Please make sure that PHP 5.3.3 or newer is installed and that OpenSSL together with the PHP extension is enabled and configured properly. For now, the encryption app has been disabled." : "Bitte stellen Sie sicher, dass PHP 5.3.3 oder neuer installiert und das OpenSSL zusammen mit der PHP-Erweiterung aktiviert und richtig konfiguriert ist. Zur Zeit ist die Verschlüsselungs-App deaktiviert.",
+    "Following users are not set up for encryption:" : "Für folgende Nutzer ist keine Verschlüsselung eingerichtet:",
+    "Encryption" : "Verschlüsselung",
+    "Enable recovery key (allow to recover users files in case of password loss):" : "Aktivieren Sie den Wiederherstellungsschlüssel (erlaubt die Wiederherstellung des Zugangs zu den Benutzerdateien, wenn das Passwort verloren geht).",
+    "Recovery key password" : "Wiederherstellungschlüsselpasswort",
+    "Enabled" : "Aktiviert",
+    "Disabled" : "Deaktiviert",
+    "Change recovery key password:" : "Wiederherstellungsschlüsselpasswort ändern",
+    "Old Recovery key password" : "Altes Wiederherstellungsschlüsselpasswort",
+    "New Recovery key password" : "Neues Wiederherstellungsschlüsselpasswort ",
+    "Change Password" : "Passwort ändern",
+    " If you don't remember your old password you can ask your administrator to recover your files." : "Falls Sie sich nicht an Ihr altes Passwort erinnern können, fragen Sie bitte Ihren Administrator, um Ihre Dateien wiederherzustellen.",
+    "Old log-in password" : "Altes Login-Passwort",
+    "Current log-in password" : "Momentanes Login-Passwort",
+    "Update Private Key Password" : "Das Passwort des privaten Schlüssels aktualisieren",
+    "Enable password recovery:" : "Die Passwort-Wiederherstellung aktivieren:",
+    "Enabling this option will allow you to reobtain access to your encrypted files in case of password loss" : "Durch die Aktivierung dieser Option haben Sie die Möglichkeit, wieder auf Ihre verschlüsselten Dateien zugreifen zu können, wenn Sie Ihr Passwort verloren haben."
+},"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
new file mode 100644
index 00000000000..b0039573097
--- /dev/null
+++ b/apps/files_external/l10n/de_CH.js
@@ -0,0 +1,28 @@
+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
new file mode 100644
index 00000000000..955fae07f5b
--- /dev/null
+++ b/apps/files_external/l10n/de_CH.json
@@ -0,0 +1,26 @@
+{ "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/sk.js b/apps/files_external/l10n/sk.js
new file mode 100644
index 00000000000..edae863703d
--- /dev/null
+++ b/apps/files_external/l10n/sk.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..4d6a95caf3c
--- /dev/null
+++ b/apps/files_external/l10n/sk.json
@@ -0,0 +1,7 @@
+{ "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
new file mode 100644
index 00000000000..2cdb3d47c69
--- /dev/null
+++ b/apps/files_sharing/l10n/de_CH.js
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 00000000000..a161e06bae8
--- /dev/null
+++ b/apps/files_sharing/l10n/de_CH.json
@@ -0,0 +1,15 @@
+{ "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/sk.js b/apps/files_sharing/l10n/sk.js
new file mode 100644
index 00000000000..aa385851497
--- /dev/null
+++ b/apps/files_sharing/l10n/sk.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..65bbffa4191
--- /dev/null
+++ b/apps/files_sharing/l10n/sk.json
@@ -0,0 +1,5 @@
+{ "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
new file mode 100644
index 00000000000..70a428d4c93
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_CH.js
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 00000000000..497b6c35d55
--- /dev/null
+++ b/apps/files_trashbin/l10n/de_CH.json
@@ -0,0 +1,13 @@
+{ "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/sk.js b/apps/files_trashbin/l10n/sk.js
new file mode 100644
index 00000000000..1b73b5f3afa
--- /dev/null
+++ b/apps/files_trashbin/l10n/sk.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..418f8874a6f
--- /dev/null
+++ b/apps/files_trashbin/l10n/sk.json
@@ -0,0 +1,4 @@
+{ "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
new file mode 100644
index 00000000000..cfdfd802748
--- /dev/null
+++ b/apps/files_trashbin/l10n/ur.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..1c1fc3d16c1
--- /dev/null
+++ b/apps/files_trashbin/l10n/ur.json
@@ -0,0 +1,4 @@
+{ "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
new file mode 100644
index 00000000000..9e970501fb7
--- /dev/null
+++ b/apps/files_versions/l10n/de_CH.js
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 00000000000..8d4b76f8c2c
--- /dev/null
+++ b/apps/files_versions/l10n/de_CH.json
@@ -0,0 +1,9 @@
+{ "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/de_CH.js b/apps/user_ldap/l10n/de_CH.js
new file mode 100644
index 00000000000..a1028b1678a
--- /dev/null
+++ b/apps/user_ldap/l10n/de_CH.js
@@ -0,0 +1,82 @@
+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",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "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
new file mode 100644
index 00000000000..3560581d270
--- /dev/null
+++ b/apps/user_ldap/l10n/de_CH.json
@@ -0,0 +1,80 @@
+{ "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",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""],
+    "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/hi_IN.js b/apps/user_ldap/l10n/hi_IN.js
new file mode 100644
index 00000000000..37042a4f412
--- /dev/null
+++ b/apps/user_ldap/l10n/hi_IN.js
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 00000000000..521de7ba1a8
--- /dev/null
+++ b/apps/user_ldap/l10n/hi_IN.json
@@ -0,0 +1,5 @@
+{ "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
new file mode 100644
index 00000000000..5060d7d4168
--- /dev/null
+++ b/apps/user_ldap/l10n/sk.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "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
new file mode 100644
index 00000000000..4b98da63fc2
--- /dev/null
+++ b/apps/user_ldap/l10n/sk.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "_%s group found_::_%s groups found_" : ["","",""],
+    "_%s user found_::_%s users found_" : ["","",""],
+    "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
new file mode 100644
index 00000000000..60c3f87f855
--- /dev/null
+++ b/apps/user_ldap/l10n/ur.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "user_ldap",
+    {
+    "Error" : "خرابی",
+    "_%s group found_::_%s groups found_" : ["",""],
+    "_%s user found_::_%s users found_" : ["",""]
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/user_ldap/l10n/ur.json b/apps/user_ldap/l10n/ur.json
new file mode 100644
index 00000000000..8e1b732acc9
--- /dev/null
+++ b/apps/user_ldap/l10n/ur.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "خرابی",
+    "_%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_webdavauth/l10n/de_CH.js b/apps/user_webdavauth/l10n/de_CH.js
new file mode 100644
index 00000000000..84bcb9d4efb
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_CH.js
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 00000000000..1c47d57a349
--- /dev/null
+++ b/apps/user_webdavauth/l10n/de_CH.json
@@ -0,0 +1,6 @@
+{ "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/sk.js b/apps/user_webdavauth/l10n/sk.js
new file mode 100644
index 00000000000..299b57be670
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sk.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..48cd128194e
--- /dev/null
+++ b/apps/user_webdavauth/l10n/sk.json
@@ -0,0 +1,4 @@
+{ "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/de_CH.js b/core/l10n/de_CH.js
new file mode 100644
index 00000000000..5a383c104cb
--- /dev/null
+++ b/core/l10n/de_CH.js
@@ -0,0 +1,107 @@
+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",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "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",
+    "_download %n file_::_download %n files_" : ["",""],
+    "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
new file mode 100644
index 00000000000..aa69c7355e0
--- /dev/null
+++ b/core/l10n/de_CH.json
@@ -0,0 +1,105 @@
+{ "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",
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "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",
+    "_download %n file_::_download %n files_" : ["",""],
+    "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/hi_IN.js b/core/l10n/hi_IN.js
new file mode 100644
index 00000000000..c483b4ab65d
--- /dev/null
+++ b/core/l10n/hi_IN.js
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 00000000000..52ecaf565a9
--- /dev/null
+++ b/core/l10n/hi_IN.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""]
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/core/l10n/pt_BR.js b/core/l10n/pt_BR.js
index 918d3d7adea..e8f95ffb885 100644
--- a/core/l10n/pt_BR.js
+++ b/core/l10n/pt_BR.js
@@ -113,7 +113,7 @@ OC.L10N.register(
     "Hello world!" : "Alô mundo!",
     "sunny" : "ensolarado",
     "Hello {name}, the weather is {weather}" : "Olá {name}, o clima está {weather}",
-    "_download %n file_::_download %n files_" : ["",""],
+    "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"],
     "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
     "Please reload the page." : "Por favor recarregue a página",
     "The update was unsuccessful." : "A atualização não foi bem sucedida.",
diff --git a/core/l10n/pt_BR.json b/core/l10n/pt_BR.json
index 75f4b8eff1d..d3082d8c06d 100644
--- a/core/l10n/pt_BR.json
+++ b/core/l10n/pt_BR.json
@@ -111,7 +111,7 @@
     "Hello world!" : "Alô mundo!",
     "sunny" : "ensolarado",
     "Hello {name}, the weather is {weather}" : "Olá {name}, o clima está {weather}",
-    "_download %n file_::_download %n files_" : ["",""],
+    "_download %n file_::_download %n files_" : ["baixar %n arquivo","baixar %n arquivos"],
     "Updating {productName} to version {version}, this may take a while." : "Atualizando {productName} para a versão {version}, isso pode demorar um pouco.",
     "Please reload the page." : "Por favor recarregue a página",
     "The update was unsuccessful." : "A atualização não foi bem sucedida.",
diff --git a/core/l10n/sk.js b/core/l10n/sk.js
new file mode 100644
index 00000000000..6a57266201e
--- /dev/null
+++ b/core/l10n/sk.js
@@ -0,0 +1,31 @@
+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",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "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
new file mode 100644
index 00000000000..3eb33e886af
--- /dev/null
+++ b/core/l10n/sk.json
@@ -0,0 +1,29 @@
+{ "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",
+    "_{count} file conflict_::_{count} file conflicts_" : ["","",""],
+    "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
new file mode 100644
index 00000000000..6f4050f5fd6
--- /dev/null
+++ b/core/l10n/ur.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "core",
+    {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Error" : "خرابی"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/ur.json b/core/l10n/ur.json
new file mode 100644
index 00000000000..a99dca571f3
--- /dev/null
+++ b/core/l10n/ur.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Error" : "خرابی"
+},"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
new file mode 100644
index 00000000000..c8b1181dc9b
--- /dev/null
+++ b/lib/l10n/de_CH.js
@@ -0,0 +1,44 @@
+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",
+    "_%n minute ago_::_%n minutes ago_" : ["","Vor %n Minuten"],
+    "_%n hour ago_::_%n hours ago_" : ["","Vor %n Stunden"],
+    "today" : "Heute",
+    "yesterday" : "Gestern",
+    "_%n day go_::_%n days ago_" : ["","Vor %n Tagen"],
+    "last month" : "Letzten Monat",
+    "_%n month ago_::_%n months ago_" : ["","Vor %n Monaten"],
+    "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
new file mode 100644
index 00000000000..468f2a175b9
--- /dev/null
+++ b/lib/l10n/de_CH.json
@@ -0,0 +1,42 @@
+{ "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",
+    "_%n minute ago_::_%n minutes ago_" : ["","Vor %n Minuten"],
+    "_%n hour ago_::_%n hours ago_" : ["","Vor %n Stunden"],
+    "today" : "Heute",
+    "yesterday" : "Gestern",
+    "_%n day go_::_%n days ago_" : ["","Vor %n Tagen"],
+    "last month" : "Letzten Monat",
+    "_%n month ago_::_%n months ago_" : ["","Vor %n Monaten"],
+    "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/hi_IN.js b/lib/l10n/hi_IN.js
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/hi_IN.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/hi_IN.json
@@ -0,0 +1,7 @@
+{ "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
new file mode 100644
index 00000000000..55da1e782f6
--- /dev/null
+++ b/lib/l10n/sk.js
@@ -0,0 +1,11 @@
+OC.L10N.register(
+    "lib",
+    {
+    "Personal" : "Osobné",
+    "Settings" : "Nastavenia",
+    "_%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=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;");
diff --git a/lib/l10n/sk.json b/lib/l10n/sk.json
new file mode 100644
index 00000000000..6c4da5395ec
--- /dev/null
+++ b/lib/l10n/sk.json
@@ -0,0 +1,9 @@
+{ "translations": {
+    "Personal" : "Osobné",
+    "Settings" : "Nastavenia",
+    "_%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=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
new file mode 100644
index 00000000000..da0dcc6bdde
--- /dev/null
+++ b/lib/l10n/ur.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..4286553dd0c
--- /dev/null
+++ b/lib/l10n/ur.json
@@ -0,0 +1,7 @@
+{ "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/ar.js b/settings/l10n/ar.js
index f76cd863eef..7f3695a1df6 100644
--- a/settings/l10n/ar.js
+++ b/settings/l10n/ar.js
@@ -81,7 +81,6 @@ OC.L10N.register(
     "Locale not working" : "اللغه لا تعمل",
     "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 to install the required packages on your system to support one of the following locales: %s." : "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
     "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  لاستدعاء الملف cron.php كل  15 دقيقه",
diff --git a/settings/l10n/ar.json b/settings/l10n/ar.json
index 2c4e2777936..5e2fc16b24e 100644
--- a/settings/l10n/ar.json
+++ b/settings/l10n/ar.json
@@ -79,7 +79,6 @@
     "Locale not working" : "اللغه لا تعمل",
     "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 to install the required packages on your system to support one of the following locales: %s." : "نحن باصرار نقترح ان تثبت الحزم المطلوبة في نظامك لدعم احد هذة اللغات: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "الرجاء التحقق من <a href='%s'>دليل التنصيب</a>.",
     "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  لاستدعاء الملف cron.php كل  15 دقيقه",
diff --git a/settings/l10n/ast.js b/settings/l10n/ast.js
index d3e52d6c8f8..12482c4ddb5 100644
--- a/settings/l10n/ast.js
+++ b/settings/l10n/ast.js
@@ -116,7 +116,6 @@ OC.L10N.register(
     "Locale not working" : "La configuración rexonal nun ta funcionando",
     "System locale can not be set to a one which supports UTF-8." : "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
     "URL generation in notification emails" : "Xeneración d'URL en mensaxes de notificación",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si la so instalación nun ta asitiada nel raigañu del dominiu y uses el cron del sistema, pues atopar problemas cola xeneración d'URL. Pa evitar estos problemes, afita la opción \"overwritewebroot\" nel tu ficheru config.php pa qu'use'l camín del raigañu la so instalación  (Suxerencia: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
diff --git a/settings/l10n/ast.json b/settings/l10n/ast.json
index 268ca485abe..8ab5e2e448a 100644
--- a/settings/l10n/ast.json
+++ b/settings/l10n/ast.json
@@ -114,7 +114,6 @@
     "Locale not working" : "La configuración rexonal nun ta funcionando",
     "System locale can not be set to a one which supports UTF-8." : "Nun se pue escoyer una configuración rexonal que sofite UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Esto significa que pue haber problemes con ciertos caráuteres nos nomes de los ficheros.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Ye enforma recomendable instalar los paquetes necesarios pa poder soportar una de les siguientes configuraciones rexonales: %s. ",
     "URL generation in notification emails" : "Xeneración d'URL en mensaxes de notificación",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Si la so instalación nun ta asitiada nel raigañu del dominiu y uses el cron del sistema, pues atopar problemas cola xeneración d'URL. Pa evitar estos problemes, afita la opción \"overwritewebroot\" nel tu ficheru config.php pa qu'use'l camín del raigañu la so instalación  (Suxerencia: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprueba les <a href='%s'>guíes d'instalación</a>.",
diff --git a/settings/l10n/bg_BG.js b/settings/l10n/bg_BG.js
index 238dd8cc6bf..e072dd080f8 100644
--- a/settings/l10n/bg_BG.js
+++ b/settings/l10n/bg_BG.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Местоположението не работи",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
     "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
     "Connectivity Checks" : "Проверки за свързаност",
diff --git a/settings/l10n/bg_BG.json b/settings/l10n/bg_BG.json
index b31ce6717f1..a4eee134950 100644
--- a/settings/l10n/bg_BG.json
+++ b/settings/l10n/bg_BG.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Местоположението не работи",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Силно препоръчваме да инсталираш на сървъра пакетите,  които подържат следните местоположения: %s.",
     "URL generation in notification emails" : "Генериране на URL в имейлите за известяване",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ако инсталацията не e инсталиранa в root на домейна и използва cron, може да има проблеми с генерирането на URL. За да избегнеш тези проблеми, моля, промени \"overwritewebroot\" в config.php с webroot пътя (Препоръчително: \"%s\")",
     "Connectivity Checks" : "Проверки за свързаност",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index dd481f1379b..7a3e95c7cbd 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -106,7 +106,6 @@ OC.L10N.register(
     "Locale not working" : "Locale no funciona",
     "System locale can not be set to a one which supports UTF-8." : "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
     "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 3212069cbea..9298c84ae75 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -104,7 +104,6 @@
     "Locale not working" : "Locale no funciona",
     "System locale can not be set to a one which supports UTF-8." : "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Us recomanem que instal·leu els paquets necessaris en el sistema per donar suport a alguna de les localitzacions següents: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
     "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index 09ff12946e7..b16dbe013b8 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Lokalizace nefunguje",
     "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
     "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
     "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
     "Connectivity Checks" : "Ověřování připojení",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index 6b95da48bd7..c6059695c26 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Lokalizace nefunguje",
     "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Důrazně doporučujeme nainstalovat do vašeho systém balíčky nutné pro podporu některé z následujících znakových sad: %s.",
     "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
     "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
     "Connectivity Checks" : "Ověřování připojení",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 6a45f20375f..6f5112cad1f 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Landestandard fungerer ikke",
     "System locale can not be set to a one which supports UTF-8." : "Systemets locale 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 to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
     "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
     "Connectivity Checks" : "Forbindelsestjek",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index d7c8caaa5b1..33deff944cb 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Landestandard fungerer ikke",
     "System locale can not be set to a one which supports UTF-8." : "Systemets locale 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 to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler at du installerer den krævede pakke på dit system, for at understøtte følgende locales: %s.",
     "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
     "Connectivity Checks" : "Forbindelsestjek",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 0270c5ea014..01068350307 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Ländereinstellung funktioniert nicht",
     "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
     "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
     "Connectivity Checks" : "Verbindungsüberprüfungen",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 9f8c0ebb043..b63775263e7 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Ländereinstellung funktioniert nicht",
     "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
     "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
     "Connectivity Checks" : "Verbindungsüberprüfungen",
diff --git a/settings/l10n/de_CH.js b/settings/l10n/de_CH.js
new file mode 100644
index 00000000000..af913b8d81e
--- /dev/null
+++ b/settings/l10n/de_CH.js
@@ -0,0 +1,102 @@
+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
new file mode 100644
index 00000000000..ad7338d33b1
--- /dev/null
+++ b/settings/l10n/de_CH.json
@@ -0,0 +1,100 @@
+{ "translations": {
+    "Enabled" : "Aktiviert",
+    "Authentication error" : "Authentifizierungs-Fehler",
+    "Group already exists" : "Die Gruppe existiert bereits",
+    "Unable to add group" : "Die Gruppe konnte nicht angelegt werden",
+    "Email saved" : "E-Mail-Adresse gespeichert",
+    "Invalid email" : "Ungültige E-Mail-Adresse",
+    "Unable to delete group" : "Die Gruppe konnte nicht gelöscht werden",
+    "Unable to delete user" : "Der Benutzer konnte nicht gelöscht werden",
+    "Language changed" : "Sprache geändert",
+    "Invalid request" : "Ungültige Anforderung",
+    "Admins can't remove themself from the admin group" : "Administratoren können sich nicht selbst aus der admin-Gruppe löschen",
+    "Unable to add user to group %s" : "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
+    "Unable to remove user from group %s" : "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
+    "Couldn't update app." : "Die App konnte nicht aktualisiert werden.",
+    "Saved" : "Gespeichert",
+    "Email sent" : "Email gesendet",
+    "All" : "Alle",
+    "Please wait...." : "Bitte warten....",
+    "Error while disabling app" : "Fehler während der Deaktivierung der Anwendung",
+    "Disable" : "Deaktivieren",
+    "Enable" : "Aktivieren",
+    "Error while enabling app" : "Fehler während der Aktivierung der Anwendung",
+    "Updating...." : "Update...",
+    "Error while updating app" : "Es ist ein Fehler während des Updates aufgetreten",
+    "Updated" : "Aktualisiert",
+    "Delete" : "Löschen",
+    "Decrypting files... Please wait, this can take some time." : "Entschlüssel Dateien ... Bitte warten Sie, denn dieser Vorgang kann einige Zeit beanspruchen.",
+    "Groups" : "Gruppen",
+    "undo" : "rückgängig machen",
+    "never" : "niemals",
+    "add group" : "Gruppe hinzufügen",
+    "A valid username must be provided" : "Es muss ein gültiger Benutzername angegeben werden",
+    "Error creating user" : "Beim Erstellen des Benutzers ist ein Fehler aufgetreten",
+    "A valid password must be provided" : "Es muss ein gültiges Passwort angegeben werden",
+    "__language_name__" : "Deutsch (Schweiz)",
+    "SSL root certificates" : "SSL-Root-Zertifikate",
+    "Encryption" : "Verschlüsselung",
+    "Login" : "Anmelden",
+    "Security Warning" : "Sicherheitshinweis",
+    "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." : "Ihr Datenverzeichnis und Ihre Dateien sind möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
+    "Setup Warning" : "Einrichtungswarnung",
+    "Module 'fileinfo' missing" : "Das Modul 'fileinfo' fehlt",
+    "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "Das PHP-Modul 'fileinfo' fehlt. Wir empfehlen Ihnen dieses Modul zu aktivieren, um die besten Resultate bei der Bestimmung der Dateitypen zu erzielen.",
+    "Locale not working" : "Die Lokalisierung funktioniert nicht",
+    "Please double check the <a href='%s'>installation guides</a>." : "Bitte prüfen Sie die <a href='%s'>Installationsanleitungen</a>.",
+    "Cron" : "Cron",
+    "Execute one task with each page loaded" : "Eine Aufgabe bei jedem Laden der Seite ausführen",
+    "Sharing" : "Teilen",
+    "Allow apps to use the Share API" : "Anwendungen erlauben, die Share-API zu benutzen",
+    "Allow public uploads" : "Erlaube öffentliches hochladen",
+    "Allow resharing" : "Erlaube Weiterverteilen",
+    "Security" : "Sicherheit",
+    "Enforce HTTPS" : "HTTPS erzwingen",
+    "Forces the clients to connect to %s via an encrypted connection." : "Zwingt die Clients, sich über eine verschlüsselte Verbindung zu %s zu verbinden.",
+    "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Bitte verbinden Sie sich zu Ihrem %s über HTTPS um die SSL-Erzwingung zu aktivieren oder zu deaktivieren.",
+    "Server address" : "Adresse des Servers",
+    "Port" : "Port",
+    "Log" : "Log",
+    "Log level" : "Log-Level",
+    "More" : "Mehr",
+    "Less" : "Weniger",
+    "Version" : "Version",
+    "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." : "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>. Der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
+    "More apps" : "Mehr Apps",
+    "by" : "von",
+    "User Documentation" : "Dokumentation für Benutzer",
+    "Administrator Documentation" : "Dokumentation für Administratoren",
+    "Online Documentation" : "Online-Dokumentation",
+    "Forum" : "Forum",
+    "Bugtracker" : "Bugtracker",
+    "Commercial Support" : "Kommerzieller Support",
+    "Get the apps to sync your files" : "Installieren Sie die Anwendungen, um Ihre Dateien zu synchronisieren",
+    "Show First Run Wizard again" : "Den Einrichtungsassistenten erneut anzeigen",
+    "You have used <strong>%s</strong> of the available <strong>%s</strong>" : "Sie verwenden <strong>%s</strong> der verfügbaren <strong>%s</strong>",
+    "Password" : "Passwort",
+    "Your password was changed" : "Ihr Passwort wurde geändert.",
+    "Unable to change your password" : "Das Passwort konnte nicht geändert werden",
+    "Current password" : "Aktuelles Passwort",
+    "New password" : "Neues Passwort",
+    "Change password" : "Passwort ändern",
+    "Email" : "E-Mail",
+    "Your email address" : "Ihre E-Mail-Adresse",
+    "Cancel" : "Abbrechen",
+    "Language" : "Sprache",
+    "Help translate" : "Helfen Sie bei der Übersetzung",
+    "Import Root Certificate" : "Root-Zertifikate importieren",
+    "Log-in password" : "Login-Passwort",
+    "Decrypt all Files" : "Alle Dateien entschlüsseln",
+    "Login Name" : "Loginname",
+    "Create" : "Erstellen",
+    "Admin Recovery Password" : "Admin-Passwort-Wiederherstellung",
+    "Enter the recovery password in order to recover the users files during password change" : "Geben Sie das Wiederherstellungspasswort ein, um die Benutzerdateien während Passwortänderung wiederherzustellen",
+    "Unlimited" : "Unbegrenzt",
+    "Other" : "Andere",
+    "Username" : "Benutzername",
+    "set new password" : "Neues Passwort setzen",
+    "Default" : "Standard"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 9ac0e0af61d..7869e5583e9 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Die Lokalisierung funktioniert nicht",
     "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
     "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
     "Connectivity Checks" : "Verbindungsüberprüfungen",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index c0cd88181f6..9466f295c4a 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Die Lokalisierung funktioniert nicht",
     "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
     "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
     "Connectivity Checks" : "Verbindungsüberprüfungen",
diff --git a/settings/l10n/el.js b/settings/l10n/el.js
index f6669e1bfcd..149d7ffef0b 100644
--- a/settings/l10n/el.js
+++ b/settings/l10n/el.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Η μετάφραση δεν δουλεύει",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Συνιστούμε σοβαρά να εγκαταστήσετε τα απαιτούμενα πακέτα στο σύστημά σας ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
     "URL generation in notification emails" : "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
     "No problems found" : "Δεν βρέθηκαν προβλήματα",
diff --git a/settings/l10n/el.json b/settings/l10n/el.json
index 8b0fdce6501..258846d9be3 100644
--- a/settings/l10n/el.json
+++ b/settings/l10n/el.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Η μετάφραση δεν δουλεύει",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Συνιστούμε σοβαρά να εγκαταστήσετε τα απαιτούμενα πακέτα στο σύστημά σας ώστε να υποστηρίζεται μια από τις ακόλουθες ρυθμίσεις τοποθεσίας: %s.",
     "URL generation in notification emails" : "Δημιουργία URL στις ειδοποιήσεις ηλεκτρονικού ταχυδρομείου",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Αν η εγκατάστασή σας δεν είναι εγκατεστημένη στη ρίζα της περιοχής και χρησιμοποιεί το cron του συστήματος, μπορεί να υπάρξουν ζητήματα με τη δημιουργία URL. Για να αποφύγετε αυτά τα προβλήματα, παρακαλώ ρυθμίστε την επιλογή \"overwritewebroot\" στον config.php φάκελό σας στη διαδρομή webroot της εγκατάστασής σας (Suggested: \"%s\")",
     "No problems found" : "Δεν βρέθηκαν προβλήματα",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index ed90998d2b4..07f565291be 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Locale not working",
     "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
     "This means that there might be problems with certain characters in file names." : "This means that there might be problems with certain characters in file names.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "URL generation in notification emails" : "URL generation in notification emails",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
     "Connectivity Checks" : "Connectivity Checks",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index 3890cbd8079..ca307c39c23 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Locale not working",
     "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
     "This means that there might be problems with certain characters in file names." : "This means that there might be problems with certain characters in file names.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "URL generation in notification emails" : "URL generation in notification emails",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
     "Connectivity Checks" : "Connectivity Checks",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index 93ba9b53b56..feb83325f3e 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "La configuración regional no está funcionando",
     "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.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
     "Connectivity Checks" : "Probar la Conectividad",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 1e3ce46d274..21b02b3797e 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -115,7 +115,6 @@
     "Locale not working" : "La configuración regional no está funcionando",
     "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.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
     "Connectivity Checks" : "Probar la Conectividad",
diff --git a/settings/l10n/es_AR.js b/settings/l10n/es_AR.js
index f6a36390253..058acf4e9ad 100644
--- a/settings/l10n/es_AR.js
+++ b/settings/l10n/es_AR.js
@@ -85,7 +85,6 @@ OC.L10N.register(
     "Locale not working" : "\"Locale\" no está funcionando",
     "System locale can not be set to a one which supports UTF-8." : "La localización del sistema no puede cambiarse a una que soporta 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 archivos.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
     "Execute one task with each page loaded" : "Ejecutá una tarea con cada pagina cargada.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
diff --git a/settings/l10n/es_AR.json b/settings/l10n/es_AR.json
index 772b62cef52..3ac7316db00 100644
--- a/settings/l10n/es_AR.json
+++ b/settings/l10n/es_AR.json
@@ -83,7 +83,6 @@
     "Locale not working" : "\"Locale\" no está funcionando",
     "System locale can not be set to a one which supports UTF-8." : "La localización del sistema no puede cambiarse a una que soporta 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 archivos.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Se sugiere fuertemente instalar los paquetes requeridos en su sistema para soportar uno de las siguientes localizaciones: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, comprobá nuevamente la <a href='%s'>guía de instalación</a>.",
     "Execute one task with each page loaded" : "Ejecutá una tarea con cada pagina cargada.",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php está registrado en el servicio webcron para llamarlo cada 15 minutos usando http.",
diff --git a/settings/l10n/es_MX.js b/settings/l10n/es_MX.js
index 02e7e40b96e..c91d1cf742e 100644
--- a/settings/l10n/es_MX.js
+++ b/settings/l10n/es_MX.js
@@ -68,7 +68,6 @@ OC.L10N.register(
     "Locale not working" : "La configuración regional no está funcionando",
     "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.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
     "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 e3c065f6315..0d7969e3a5a 100644
--- a/settings/l10n/es_MX.json
+++ b/settings/l10n/es_MX.json
@@ -66,7 +66,6 @@
     "Locale not working" : "La configuración regional no está funcionando",
     "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.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "Please double check the <a href='%s'>installation guides</a>." : "Por favor, vuelva a comprobar las <a href='%s'>guías de instalación</a>.",
     "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/et_EE.js b/settings/l10n/et_EE.js
index 0fac182b7cd..a294c7c5ab5 100644
--- a/settings/l10n/et_EE.js
+++ b/settings/l10n/et_EE.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Lokalisatsioon ei toimi",
     "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.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
     "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
     "Connectivity Checks" : "Ühenduse kontrollid",
diff --git a/settings/l10n/et_EE.json b/settings/l10n/et_EE.json
index a7fe59781dd..8582084d420 100644
--- a/settings/l10n/et_EE.json
+++ b/settings/l10n/et_EE.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Lokalisatsioon ei toimi",
     "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.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Soovitame tungivalt paigaldada vajalikud paketid oma süsteemi tagamaks tuge järgmistele lokaliseeringutele: %s.",
     "URL generation in notification emails" : "URL-ide loomine teavituskirjades",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Kui sinu sait pole paigaldatud domeeni juurkausta ja see kasutab ajastatud tegevusi, siis võib tekkide probleeme URL-ide loomisega. Nende probleemide vältimiseks sisesta palun failis config.php valikusse \"overwritewebroot\" oma veebiserveri juurkaust (Soovituslik: \"%s\")",
     "Connectivity Checks" : "Ühenduse kontrollid",
diff --git a/settings/l10n/eu.js b/settings/l10n/eu.js
index 36e01cae8c1..b56cdeaef72 100644
--- a/settings/l10n/eu.js
+++ b/settings/l10n/eu.js
@@ -115,7 +115,6 @@ OC.L10N.register(
     "Locale not working" : "Lokala ez dabil",
     "System locale can not be set to a one which supports UTF-8." : "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
     "This means that there might be problems with certain characters in file names." : "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
     "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
     "No problems found" : "Ez da problemarik aurkitu",
diff --git a/settings/l10n/eu.json b/settings/l10n/eu.json
index d5ea5f74dbc..8d27d47188b 100644
--- a/settings/l10n/eu.json
+++ b/settings/l10n/eu.json
@@ -113,7 +113,6 @@
     "Locale not working" : "Lokala ez dabil",
     "System locale can not be set to a one which supports UTF-8." : "Eskualdeko ezarpena ezin da UTF-8 onartzen duen batera ezarri.",
     "This means that there might be problems with certain characters in file names." : "Honek esan nahi du fitxategien izenetako karaktere batzuekin arazoak egon daitezkeela.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Biziki gomendatzen dizugu beharrezkoak diren paketea zure sisteman instalatzea honi euskarria eman ahal izateko: %s.",
     "URL generation in notification emails" : "URL sorrera jakinarazpen mezuetan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Zure instalazioa ez badago domeinuaren sustraian egina eta erabiltzen badu sistemaren cron-a, arazoak izan daitezke URL sorreran. Arazo horiek saihesteko ezarri  \"overwritewebroot\" opzioa zure config.php fitxategian zure instalazioaren webroot bidera (Proposatua: \"%s\")",
     "No problems found" : "Ez da problemarik aurkitu",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index eed62e818c6..762eda8c7b4 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -114,7 +114,6 @@ OC.L10N.register(
     "Locale not working" : "Maa-asetus ei toimi",
     "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
     "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
     "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
     "No problems found" : "Ongelmia ei löytynyt",
     "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 54b334704ad..fea5b3b00ae 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -112,7 +112,6 @@
     "Locale not working" : "Maa-asetus ei toimi",
     "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
     "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Suosittelemme vahvasti asentamaan vaaditut paketit järjestelmään, jotta jotain seuraavista maa-asetuksista on mahdollista tukea: %s.",
     "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
     "No problems found" : "Ongelmia ei löytynyt",
     "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index e1f128e248d..5a99912aeed 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Localisation non fonctionnelle",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas ê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 to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s.",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "Connectivity Checks" : "Vérification de la connectivité",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index f10cdd96008..433816d2316 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Localisation non fonctionnelle",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas ê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 to install the required packages on your system to support one of the following locales: %s." : "Nous conseillons vivement d'installer sur votre système les paquets nécessaires à la prise en charge de l'un des paramètres régionaux suivants : %s.",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "Connectivity Checks" : "Vérification de la connectivité",
diff --git a/settings/l10n/gl.js b/settings/l10n/gl.js
index 2dc00590d69..9aa4d527e77 100644
--- a/settings/l10n/gl.js
+++ b/settings/l10n/gl.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "A configuración rexional non funciona",
     "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
     "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
     "Connectivity Checks" : "Comprobacións de conectividade",
diff --git a/settings/l10n/gl.json b/settings/l10n/gl.json
index 18d57342f8f..d1d3265b170 100644
--- a/settings/l10n/gl.json
+++ b/settings/l10n/gl.json
@@ -115,7 +115,6 @@
     "Locale not working" : "A configuración rexional non funciona",
     "System locale can not be set to a one which supports UTF-8." : "Non é posíbel estabelecer a configuración rexional do sistema a unha que admita UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isto significa que pode haber problemas con certos caracteres en nomes de ficheiro.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamoslle que instale no sistema os paquetes necesarios para admitir unha das seguintes configuracións rexionais: %s.",
     "URL generation in notification emails" : "Xeración dos URL nos correos de notificación",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a instalación non foi feita na raíz do dominio e usa o sistema de cron, poden xurdir problemas coa xeración dos URL. Para evitar estes problemas, axuste a opción «overwritewebroot» no ficheiro config.php ás ruta de webroot da súa instalación (suxírese: «%s»)",
     "Connectivity Checks" : "Comprobacións de conectividade",
diff --git a/settings/l10n/hr.js b/settings/l10n/hr.js
index 618d757078e..e0f07974723 100644
--- a/settings/l10n/hr.js
+++ b/settings/l10n/hr.js
@@ -111,7 +111,6 @@ OC.L10N.register(
     "Locale not working" : "Regionalna shema ne radi",
     "System locale can not be set to a one which supports UTF-8." : "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
     "URL generation in notification emails" : "Generiranje URL-a u notifikacijskoj e-pošti",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
     "Please double check the <a href='%s'>installation guides</a>." : "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
diff --git a/settings/l10n/hr.json b/settings/l10n/hr.json
index 3ebd6ae2d1a..78af9502520 100644
--- a/settings/l10n/hr.json
+++ b/settings/l10n/hr.json
@@ -109,7 +109,6 @@
     "Locale not working" : "Regionalna shema ne radi",
     "System locale can not be set to a one which supports UTF-8." : "Regionalnu shemu sustava nemoguće je postaviti na neku koja podržava UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To znači da se mogu javiti problemi s određenim znakovima u datoteci.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Toplo preporučpujemo da u svoj sustav instalirate potrebne pakete koji će podržatijednu od sljedećih regionalnih shema: %s.",
     "URL generation in notification emails" : "Generiranje URL-a u notifikacijskoj e-pošti",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Ako vaša instalacija nije instalirana u korijenu domene i koristi sustav cron,mogu se javiti problemi s generiranjem URL. Da biste takve probleme izbjegli,molimo postavite opciju \"overwritewebroot\" u vašoj datoteci config.php.na webroot path vaše instalacije (Predlažemo: \"%s\").",
     "Please double check the <a href='%s'>installation guides</a>." : "Molimo provjerite <a href='%s'> instalacijske vodiče </a>.",
diff --git a/settings/l10n/hu_HU.js b/settings/l10n/hu_HU.js
index 828922fbebc..e7cd62bf80f 100644
--- a/settings/l10n/hu_HU.js
+++ b/settings/l10n/hu_HU.js
@@ -111,7 +111,6 @@ OC.L10N.register(
     "Locale not working" : "A nyelvi lokalizáció nem működik",
     "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 to install 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",
     "URL generation in notification emails" : "URL-képzés az értesítő e-mailekben",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
diff --git a/settings/l10n/hu_HU.json b/settings/l10n/hu_HU.json
index d4db40c1d61..6e209dc8f81 100644
--- a/settings/l10n/hu_HU.json
+++ b/settings/l10n/hu_HU.json
@@ -109,7 +109,6 @@
     "Locale not working" : "A nyelvi lokalizáció nem működik",
     "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 to install 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",
     "URL generation in notification emails" : "URL-képzés az értesítő e-mailekben",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" paramétert a telepítés által használt webútvonalra. (Javasolt beállítás: \"%s\")",
     "Please double check the <a href='%s'>installation guides</a>." : "Kérjük tüzetesen tanulmányozza át a <a href='%s'>telepítési útmutatót</a>.",
diff --git a/settings/l10n/id.js b/settings/l10n/id.js
index 261734b9997..3240c893669 100644
--- a/settings/l10n/id.js
+++ b/settings/l10n/id.js
@@ -116,7 +116,6 @@ OC.L10N.register(
     "Locale not working" : "Kode pelokalan tidak berfungsi",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
     "URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
     "No problems found" : "Masalah tidak ditemukan",
diff --git a/settings/l10n/id.json b/settings/l10n/id.json
index e64d574f932..eadfcf6c2db 100644
--- a/settings/l10n/id.json
+++ b/settings/l10n/id.json
@@ -114,7 +114,6 @@
     "Locale not working" : "Kode pelokalan tidak berfungsi",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Kami sangat menyarankan untuk menginstal paket yang dibutuhkan pada sistem agar mendukung salah satu bahasa berikut: %s.",
     "URL generation in notification emails" : "URL dibuat dalam email pemberitahuan",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jika instalasi Anda tidak terinstal didalam root domain dan menggunakan cron sistem, ini dapat menyebabkan masalah dengan pembuatan URL. Untuk mencegah masalah ini, mohon atur opsi  \"overwritewebroot\" didalam berkas config.php ke jalur lokasi webroot instalasi Anda (Disarankan: \"%s\")",
     "No problems found" : "Masalah tidak ditemukan",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 522b2f2fb96..91d79356a1e 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Locale non funzionante",
     "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 to install 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\nlocalizzazioni seguenti: %s.",
     "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
     "Connectivity Checks" : "Controlli di connettività",
@@ -222,6 +221,7 @@ OC.L10N.register(
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
     "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
+    "Search Users" : "Cerca utenti",
     "Add Group" : "Aggiungi gruppo",
     "Group" : "Gruppo",
     "Everyone" : "Chiunque",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index 2ac61e1cb90..d34110e6162 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Locale non funzionante",
     "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 to install 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\nlocalizzazioni seguenti: %s.",
     "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
     "Connectivity Checks" : "Controlli di connettività",
@@ -220,6 +219,7 @@
     "Create" : "Crea",
     "Admin Recovery Password" : "Password di ripristino amministrativa",
     "Enter the recovery password in order to recover the users files during password change" : "Digita la password di ripristino per recuperare i file degli utenti durante la modifica della password.",
+    "Search Users" : "Cerca utenti",
     "Add Group" : "Aggiungi gruppo",
     "Group" : "Gruppo",
     "Everyone" : "Chiunque",
diff --git a/settings/l10n/ja.js b/settings/l10n/ja.js
index b50eb561ebc..a6328f23586 100644
--- a/settings/l10n/ja.js
+++ b/settings/l10n/ja.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "ロケールが動作していません",
     "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 to install the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
     "URL generation in notification emails" : "通知メールにURLを生成",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
     "Connectivity Checks" : "接続の確認",
diff --git a/settings/l10n/ja.json b/settings/l10n/ja.json
index 0668e178753..c628fdc6ff4 100644
--- a/settings/l10n/ja.json
+++ b/settings/l10n/ja.json
@@ -115,7 +115,6 @@
     "Locale not working" : "ロケールが動作していません",
     "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 to install the required packages on your system to support one of the following locales: %s." : "次のロケールをサポートするために、システムに必要なパッケージをインストールすることを強くおすすめします: %s。",
     "URL generation in notification emails" : "通知メールにURLを生成",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "もし、URLがドメインのルート(/)で終わっていない場合で、システムのcronを利用している場合、URLの生成に問題が発生します。その場合は、config.php ファイルの中の \"overwritewebroot\" オプションをインストールしたパスに設定してください。(推奨: \"%s\")",
     "Connectivity Checks" : "接続の確認",
diff --git a/settings/l10n/ko.js b/settings/l10n/ko.js
index b8239d32215..6d828ee47ec 100644
--- a/settings/l10n/ko.js
+++ b/settings/l10n/ko.js
@@ -89,7 +89,6 @@ OC.L10N.register(
     "Locale not working" : "로캘이 작동하지 않음",
     "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 to install the required packages on your system to support one of the following locales: %s." : "다음 로캘을 지원하도록 시스템 설정을 변경하는 것을 추천합니다: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
     "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에 접근합니다.",
diff --git a/settings/l10n/ko.json b/settings/l10n/ko.json
index 095ac5adedd..121627253e2 100644
--- a/settings/l10n/ko.json
+++ b/settings/l10n/ko.json
@@ -87,7 +87,6 @@
     "Locale not working" : "로캘이 작동하지 않음",
     "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 to install the required packages on your system to support one of the following locales: %s." : "다음 로캘을 지원하도록 시스템 설정을 변경하는 것을 추천합니다: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "<a href='%s'>설치 가이드</a>를 다시 한 번 확인하십시오.",
     "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에 접근합니다.",
diff --git a/settings/l10n/nb_NO.js b/settings/l10n/nb_NO.js
index 03c8b3f53f6..1f27d37d7f9 100644
--- a/settings/l10n/nb_NO.js
+++ b/settings/l10n/nb_NO.js
@@ -111,7 +111,6 @@ OC.L10N.register(
     "Locale not working" : "Nasjonale innstillinger virker ikke",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
     "URL generation in notification emails" : "URL-generering i varsel-eposter",
     "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 \"overwritewebroot\" 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 system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
     "No problems found" : "Ingen problemer funnet",
diff --git a/settings/l10n/nb_NO.json b/settings/l10n/nb_NO.json
index a422cd25590..bd43183da4a 100644
--- a/settings/l10n/nb_NO.json
+++ b/settings/l10n/nb_NO.json
@@ -109,7 +109,6 @@
     "Locale not working" : "Nasjonale innstillinger virker ikke",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Vi anbefaler på det sterkeste å installere pakkene som er nødvendig for at systemet skal støtte en av følgende nasjonale innstillinger: %s.",
     "URL generation in notification emails" : "URL-generering i varsel-eposter",
     "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 \"overwritewebroot\" 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 system cron, kan det bli problemer med URL-generering. For å forhindre disse problemene, sett \"overwritewebroot\" i filen config.php til webroot-stien for installasjonen din (Forslag: \"%s\")",
     "No problems found" : "Ingen problemer funnet",
diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index f4bf7d07bbf..21bd2f1ec7a 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Taalbestand werkt niet",
     "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 to install 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.",
     "URL generation in notification emails" : "URL genereren in notificatie e-mails",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "Connectivity Checks" : "Verbindingscontroles",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index ce931dbfcca..75870735391 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Taalbestand werkt niet",
     "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 to install 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.",
     "URL generation in notification emails" : "URL genereren in notificatie e-mails",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "Connectivity Checks" : "Verbindingscontroles",
diff --git a/settings/l10n/pl.js b/settings/l10n/pl.js
index ec78dbd3d45..4206c0eb587 100644
--- a/settings/l10n/pl.js
+++ b/settings/l10n/pl.js
@@ -116,7 +116,6 @@ OC.L10N.register(
     "Locale not working" : "Lokalizacja nie działa",
     "System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
     "URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
     "No problems found" : "Nie ma żadnych problemów",
diff --git a/settings/l10n/pl.json b/settings/l10n/pl.json
index e3eeee75e16..e4761e4ba47 100644
--- a/settings/l10n/pl.json
+++ b/settings/l10n/pl.json
@@ -114,7 +114,6 @@
     "Locale not working" : "Lokalizacja nie działa",
     "System locale can not be set to a one which supports UTF-8." : "Ustawienia regionalne systemu nie można ustawić na jeden, który obsługuje UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Oznacza to, że mogą być problemy z niektórymi znakami w nazwach plików.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Zalecamy, aby zainstalować wymagane pakiety w systemie, jeden z następujących języków: %s.",
     "URL generation in notification emails" : "Generowanie URL w powiadomieniach email",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Jeśli Twoja instalacja nie jest zainstalowana w katalogu głównym serwera www, a system używa cron-a, mogą występować problemy z generowaniem URL-i. Aby uniknąć tych problemów, proszę  ustawić opcję \"overwritewebroot\" w pliku config.php na ścieżkę z adresu www Twojej instalacji (Sugerowane: \"%s\")",
     "No problems found" : "Nie ma żadnych problemów",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 66f9617dc2f..81be17f00cb 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Localização não funcionando",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
     "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
     "Connectivity Checks" : "Verificações de Conectividade",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 05bb0a60eec..440cb24b158 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Localização não funcionando",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Nós fortemente sugerimos instalar os pacotes necessários no seu sistema para suportar uma das seguintes localidades: %s.",
     "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
     "Connectivity Checks" : "Verificações de Conectividade",
diff --git a/settings/l10n/pt_PT.js b/settings/l10n/pt_PT.js
index c5741c32ee9..cf82312e466 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Internacionalização não está a funcionar",
     "System locale can not be set to a one which supports UTF-8." : "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
     "Connectivity Checks" : "Verificações de Conetividade",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index ae4a72170c3..b0b3984a956 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Internacionalização não está a funcionar",
     "System locale can not be set to a one which supports UTF-8." : "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Recomendamos fortemente que instale no seu sistema todos os pacotes necessários para suportar os seguintes locales: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
     "Connectivity Checks" : "Verificações de Conetividade",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index d792a7e1094..0ea525bf955 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Локализация не работает",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
     "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
     "Connectivity Checks" : "Проверка соединения",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 56dfc80cffd..0c9ae6e5b27 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Локализация не работает",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Мы настоятельно рекомендуем установить требуемые пакеты в систему, для поддержки одной из следующих локалей: %s.",
     "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
     "Connectivity Checks" : "Проверка соединения",
diff --git a/settings/l10n/sk.js b/settings/l10n/sk.js
new file mode 100644
index 00000000000..e48cc9d9ed9
--- /dev/null
+++ b/settings/l10n/sk.js
@@ -0,0 +1,9 @@
+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
new file mode 100644
index 00000000000..609a62d21fd
--- /dev/null
+++ b/settings/l10n/sk.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Delete" : "Odstrániť",
+    "never" : "nikdy",
+    "Cancel" : "Zrušiť",
+    "Other" : "Ostatné"
+},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index b94ada408f8..3e44cd259e4 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Lokalizácia nefunguje",
     "System locale can not be set to a one which supports UTF-8." : "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
     "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
     "Connectivity Checks" : "Overovanie pripojenia",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index 3af85642551..f5fd698cd2a 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Lokalizácia nefunguje",
     "System locale can not be set to a one which supports UTF-8." : "Nie je možné nastaviť znakovú sadu, ktorá podporuje UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To znamená, že sa môžu vyskytnúť problémy s niektorými znakmi v názvoch súborov.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Dôrazne doporučujeme nainštalovať na váš systém požadované balíčky podporujúce jednu z nasledovných znakových sád: %s.",
     "URL generation in notification emails" : "Generovanie adresy URL v oznamovacích emailoch",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Inštalácia mimo koreňový priečinok domény a používanie systémového príkazu cron môže spôsobiť problém s generovaním správnej URL. Pre zabránenie týmto chybám nastavte prosím správnu cestu v svojom config.php súbore pre hodnotu \"overwritewebroot\" (Doporučujeme: \"%s\")",
     "Connectivity Checks" : "Overovanie pripojenia",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index 2a8cab07011..74f41f79bc3 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -113,7 +113,6 @@ OC.L10N.register(
     "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
     "Connectivity Checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 9d9090e0571..0a539fcde4f 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -111,7 +111,6 @@
     "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Priporočljivo je namestiti zahtevane pakete v sistem za podporo ene izmed navedenih jezikovnih možnosti: %s",
     "Connectivity Checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
diff --git a/settings/l10n/sv.js b/settings/l10n/sv.js
index 842e47beebe..afd8122c7f3 100644
--- a/settings/l10n/sv.js
+++ b/settings/l10n/sv.js
@@ -109,7 +109,6 @@ OC.L10N.register(
     "Locale not working" : "Locale fungerar inte",
     "System locale can not be set to a one which supports UTF-8." : "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "Var god kontrollera <a href='%s'>installationsguiden</a>.",
     "Last cron was executed at %s." : "Sista cron kördes vid %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
diff --git a/settings/l10n/sv.json b/settings/l10n/sv.json
index d1f02536e4e..0a0ba0bcf72 100644
--- a/settings/l10n/sv.json
+++ b/settings/l10n/sv.json
@@ -107,7 +107,6 @@
     "Locale not working" : "Locale fungerar inte",
     "System locale can not be set to a one which supports UTF-8." : "Systemspråk kan inte ställas in till ett som stödjer UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Detta betyder att där kan komma att uppstå problem med vissa tecken i filnamn.",
-    "We strongly suggest to install the required packages on your system to support one of the following locales: %s." : "Vi rekommenderar starkt att installera de paket som krävs på ditt system för att stödja en av följande systemspråk: %s.",
     "Please double check the <a href='%s'>installation guides</a>." : "Var god kontrollera <a href='%s'>installationsguiden</a>.",
     "Last cron was executed at %s." : "Sista cron kördes vid %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Sista cron kördes vid %s. Detta är mer än en timme sedan, något verkar fel.",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index d30661a1ee4..273874bdfe3 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -117,11 +117,10 @@ OC.L10N.register(
     "Locale not working" : "Yerel çalışmıyor",
     "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 to install 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.",
     "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
     "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "Connectivity Checks" : "Bağlantı Kontrolleri",
-    "No problems found" : "Sorun bulunamadı",
+    "No problems found" : "Hiç sorun yok",
     "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
     "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index b38ac57719b..9aec853988f 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -115,11 +115,10 @@
     "Locale not working" : "Yerel çalışmıyor",
     "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 to install 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.",
     "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
     "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "Connectivity Checks" : "Bağlantı Kontrolleri",
-    "No problems found" : "Sorun bulunamadı",
+    "No problems found" : "Hiç sorun yok",
     "Please double check the <a href='%s'>installation guides</a>." : "Lütfen <a href='%s'>kurulum rehberlerini</a> iki kez kontrol edin.",
     "Last cron was executed at %s." : "Son cron %s zamanında çalıştırıldı.",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "Son cron %s zamanında çalıştırıldı. Bu bir saatten daha uzun bir süre, bir şeyler yanlış gibi görünüyor.",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index b51ffda2258..6cdef63b2ec 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -117,7 +117,6 @@ OC.L10N.register(
     "Locale not working" : "Локалізація не працює",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
     "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
     "Connectivity Checks" : "Перевірка З'єднання",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index 08cbdcdd3a5..b05f4e95e32 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -115,7 +115,6 @@
     "Locale not working" : "Локалізація не працює",
     "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 to install the required packages on your system to support one of the following locales: %s." : "Ми наполегливо рекомендуємо встановити необхідні пакети в систему, для підтримки наступних локалей: %s.",
     "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
     "Connectivity Checks" : "Перевірка З'єднання",
diff --git a/settings/l10n/ur.js b/settings/l10n/ur.js
new file mode 100644
index 00000000000..78fcf358b75
--- /dev/null
+++ b/settings/l10n/ur.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "settings",
+    {
+    "Error" : "خرابی"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/settings/l10n/ur.json b/settings/l10n/ur.json
new file mode 100644
index 00000000000..1c1fc3d16c1
--- /dev/null
+++ b/settings/l10n/ur.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Error" : "خرابی"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js
index ddb0bea6a4d..f68a3366103 100644
--- a/settings/l10n/zh_CN.js
+++ b/settings/l10n/zh_CN.js
@@ -111,7 +111,6 @@ OC.L10N.register(
     "Locale not working" : "本地化无法工作",
     "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 to install the required packages on your system to support one of the following locales: %s." : "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
     "URL generation in notification emails" : "在通知邮件里生成URL",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
     "No problems found" : "未发现问题",
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 847d4293791..1b81ca42119 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -109,7 +109,6 @@
     "Locale not working" : "本地化无法工作",
     "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 to install the required packages on your system to support one of the following locales: %s." : "强烈建议在您的系统上安装需要的软件包来支持以下语系之一：%s。",
     "URL generation in notification emails" : "在通知邮件里生成URL",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "如果你没有安装ownCloud在域名的根目录里，并使用系统的crom，这会导致URL的生成出错。要避免这个问题，请设置 config.php 文件中的\"overwritewebroot\" 参数值为你的实际安装web路径。(建议为: \"%s\")",
     "No problems found" : "未发现问题",
diff --git a/settings/l10n/zh_TW.js b/settings/l10n/zh_TW.js
index c32238afb7c..cc668b41086 100644
--- a/settings/l10n/zh_TW.js
+++ b/settings/l10n/zh_TW.js
@@ -88,7 +88,6 @@ OC.L10N.register(
     "Locale not working" : "語系無法運作",
     "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 to install the required packages on your system to support one of the following locales: %s." : "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "請參考<a href='%s'>安裝指南</a>。",
     "Last cron was executed at %s." : "最後的排程已執行於 %s。",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "最後的排程已執行於 %s。現在過了好幾個小時，看起來是有錯誤。",
diff --git a/settings/l10n/zh_TW.json b/settings/l10n/zh_TW.json
index a493cbf7d41..0a5baf7639f 100644
--- a/settings/l10n/zh_TW.json
+++ b/settings/l10n/zh_TW.json
@@ -86,7 +86,6 @@
     "Locale not working" : "語系無法運作",
     "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 to install the required packages on your system to support one of the following locales: %s." : "我們強烈建議在您的系統上安裝必要的套件來支援以下的語系: %s",
     "Please double check the <a href='%s'>installation guides</a>." : "請參考<a href='%s'>安裝指南</a>。",
     "Last cron was executed at %s." : "最後的排程已執行於 %s。",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "最後的排程已執行於 %s。現在過了好幾個小時，看起來是有錯誤。",
-- 
GitLab


From 5f6f54e785a76b27ff8c3514a45c34d633f4cc65 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 21 Nov 2014 10:48:05 +0100
Subject: [PATCH 504/616] Rename providers to not begin with test

Fixes https://github.com/owncloud/core/issues/12347
---
 tests/lib/httphelper.php | 4 ++--
 tests/lib/updater.php    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/lib/httphelper.php b/tests/lib/httphelper.php
index 34dee35fe02..eb58508f158 100644
--- a/tests/lib/httphelper.php
+++ b/tests/lib/httphelper.php
@@ -24,7 +24,7 @@ class TestHTTPHelper extends \Test\TestCase {
 			->getMock();
 	}
 
-	public function testIsHTTPProvider() {
+	public function isHttpTestData() {
 		return array(
 			array('http://wwww.owncloud.org/enterprise/', true),
 			array('https://wwww.owncloud.org/enterprise/', true),
@@ -81,7 +81,7 @@ class TestHTTPHelper extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider testIsHTTPProvider
+	 * @dataProvider isHttpTestData
 	 */
 	public function testIsHTTP($url, $expected) {
 			$this->assertSame($expected, $this->httpHelperMock->isHTTPURL($url));
diff --git a/tests/lib/updater.php b/tests/lib/updater.php
index cc82450cfb6..155dccf78a7 100644
--- a/tests/lib/updater.php
+++ b/tests/lib/updater.php
@@ -10,7 +10,7 @@ namespace OC;
 
 class UpdaterTest extends \Test\TestCase {
 
-	public function testVersionCompatbility() {
+	public function versionCompatibilityTestData() {
 		return array(
 			array('1.0.0.0', '2.2.0', true),
 			array('1.1.1.1', '2.0.0', true),
@@ -24,7 +24,7 @@ class UpdaterTest extends \Test\TestCase {
 	}
 
 	/**
-	 * @dataProvider testVersionCompatbility
+	 * @dataProvider versionCompatibilityTestData
 	 */
 	function testIsUpgradePossible($oldVersion, $newVersion, $result) {
 		$updater = new Updater();
-- 
GitLab


From 1d4d308a6c0bb5b13d0dd172cf1eb3622f3e1ee6 Mon Sep 17 00:00:00 2001
From: Miguel Prokop <miguel.prokop@vtu.com>
Date: Fri, 21 Nov 2014 11:01:39 +0100
Subject: [PATCH 505/616] fix calculation of expiration date if there is a
 default expiration date set (but not forced) and the user does not want the
 link to expire.

---
 lib/private/share/helper.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 2418535c9d5..1ebcdb563a5 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -189,20 +189,25 @@ class Helper extends \OC\Share\Constants {
 	public static function calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate = null) {
 
 		$expires = false;
+		$defaultExpires = null;
 
 		if (!empty($defaultExpireSettings['defaultExpireDateSet'])) {
-			$expires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
+			$defaultExpires = $creationTime + $defaultExpireSettings['expireAfterDays'] * 86400;
 		}
 
 
 		if (isset($userExpireDate)) {
 			// if the admin decided to enforce the default expire date then we only take
 			// the user defined expire date of it is before the default expire date
-			if ($expires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-				$expires = min($userExpireDate, $expires);
+			if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+				$expires = min($userExpireDate, $defaultExpires);
 			} else {
 				$expires = $userExpireDate;
 			}
+		} else {
+			if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+				$expires = $defaultExpires;
+			}
 		}
 
 		return $expires;
-- 
GitLab


From 397f14ed86ce675b11f35f06ffac30af6c17ade0 Mon Sep 17 00:00:00 2001
From: Miguel Prokop <miguel.prokop@vtu.com>
Date: Fri, 21 Nov 2014 13:31:56 +0100
Subject: [PATCH 506/616] Consolidate if statement, and update unit test

---
 lib/private/share/helper.php | 6 ++----
 tests/lib/share/helper.php   | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 1ebcdb563a5..6bbb101db3a 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -204,10 +204,8 @@ class Helper extends \OC\Share\Constants {
 			} else {
 				$expires = $userExpireDate;
 			}
-		} else {
-			if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
-				$expires = $defaultExpires;
-			}
+		} else if ($defaultExpires && !empty($defaultExpireSettings['enforceExpireDate'])) {
+			$expires = $defaultExpires;
 		}
 
 		return $expires;
diff --git a/tests/lib/share/helper.php b/tests/lib/share/helper.php
index 76046d360bc..7a546410aea 100644
--- a/tests/lib/share/helper.php
+++ b/tests/lib/share/helper.php
@@ -27,8 +27,8 @@ class Test_Share_Helper extends \Test\TestCase {
 			array(array('defaultExpireDateSet' => false), 2000000000, 2000010000, 2000010000),
 			// no default expire date and no user defined expire date, return false
 			array(array('defaultExpireDateSet' => false), 2000000000, null, false),
-			// unenforced expire data and no user defined expire date, take default expire date
-			array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => false), 2000000000, null, 2000086400),
+			// unenforced expire data and no user defined expire date, return false (because the default is not enforced)
+			array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => false), 2000000000, null, false),
 			// enforced expire date and no user defined expire date, take default expire date
 			array(array('defaultExpireDateSet' => true, 'expireAfterDays' => 1, 'enforceExpireDate' => true), 2000000000, null, 2000086400),
 			// unenforced expire date and user defined date > default expire date, take users expire date
@@ -49,6 +49,4 @@ class Test_Share_Helper extends \Test\TestCase {
 		$result = \OC\Share\Helper::calculateExpireDate($defaultExpireSettings, $creationTime, $userExpireDate);
 		$this->assertSame($expected, $result);
 	}
-
-
 }
-- 
GitLab


From c07c338c908653d694df4457dc1739122a1f594c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Nov 2014 14:51:20 +0100
Subject: [PATCH 507/616] fix counting when ldapPagingSize is 0

---
 apps/user_ldap/lib/access.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index a0ec64b3f60..6f28a87d30c 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -813,7 +813,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 		}
 
 		//check whether paged search should be attempted
-		$pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, $limit, $offset);
+		$pagedSearchOK = $this->initPagedSearch($filter, $base, $attr, intval($limit), $offset);
 
 		$linkResources = array_pad(array(), count($base), $cr);
 		$sr = $this->ldap->search($linkResources, $base, $filter, $attr);
@@ -887,10 +887,9 @@ class Access extends LDAPUtility implements user\IUserTools {
 	private function count($filter, $base, $attr = null, $limit = null, $offset = null, $skipHandling = false) {
 		\OCP\Util::writeLog('user_ldap', 'Count filter:  '.print_r($filter, true), \OCP\Util::DEBUG);
 
-		$limitPerPage = (intval($limit) < intval($this->connection->ldapPagingSize)) ?
-			intval($limit) : intval($this->connection->ldapPagingSize);
-		if(is_null($limit) || $limit <= 0) {
-			$limitPerPage = intval($this->connection->ldapPagingSize);
+		$limitPerPage = intval($this->connection->ldapPagingSize);
+		if(!is_null($limit) && $limit < $limitPerPage && $limit > 0) {
+			$limitPerPage = $limit;
 		}
 
 		$counter = 0;
@@ -1472,7 +1471,7 @@ class Access extends LDAPUtility implements user\IUserTools {
 	 */
 	private function initPagedSearch($filter, $bases, $attr, $limit, $offset) {
 		$pagedSearchOK = false;
-		if($this->connection->hasPagedResultSupport && !is_null($limit)) {
+		if($this->connection->hasPagedResultSupport && ($limit !== 0)) {
 			$offset = intval($offset); //can be null
 			\OCP\Util::writeLog('user_ldap',
 				'initializing paged search for  Filter '.$filter.' base '.print_r($bases, true)
-- 
GitLab


From 0fa8b449b21d2e2d5875c8300b86e8f7740f7598 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 21 Nov 2014 15:35:14 +0100
Subject: [PATCH 508/616] Use `/` as redirect location if webroot is set to an
 empty value

If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all.

This means that while the password is getting resetted the user is not redirected to the login page.

I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff.

Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy)

Reported by @cdamken
---
 core/js/lostpassword.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index 35173fd3d33..294a9d8c1cf 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -112,7 +112,11 @@ OC.Lostpassword = {
 	},
 
 	redirect : function(msg){
-		window.location = OC.webroot;
+		if(OC.webroot !== '') {
+			window.location = OC.webroot;
+		} else {
+			window.location = '/';
+		}
 	},
 
 	resetError : function(msg){
-- 
GitLab


From a7ebfe87c9ef16c698c16c4f72eaf3865825c540 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 10 Nov 2014 13:08:45 +0100
Subject: [PATCH 509/616] also check for the correct owner if it was submitted

---
 apps/files_sharing/lib/share/folder.php |  5 +--
 lib/private/share/share.php             | 15 ++++++---
 lib/public/share.php                    |  7 ++--
 tests/lib/share/share.php               | 44 +++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 10 deletions(-)

diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 2671f5738b7..f86e9624432 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -26,13 +26,14 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share
 	 *
 	 * @param int $itemSource item source ID
 	 * @param string $shareWith with whom should the item be shared
+	 * @param string $owner owner of the item
 	 * @return array with shares
 	 */
-	public function getParents($itemSource, $shareWith = null) {
+	public function getParents($itemSource, $shareWith = null, $owner = null) {
 		$result = array();
 		$parent = $this->getParentId($itemSource);
 		while ($parent) {
-			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith);
+			$shares = \OCP\Share::getItemSharedWithUser('folder', $parent, $shareWith, $owner);
 			if ($shares) {
 				foreach ($shares as $share) {
 					$name = substr($share['path'], strrpos($share['path'], '/') + 1);
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index a8febc9aca7..10fff9aeacf 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -287,12 +287,12 @@ class Share extends \OC\Share\Constants {
 	 * Get the item of item type shared with a given user by source
 	 * @param string $itemType
 	 * @param string $itemSource
-	 * @param string $user User user to whom the item was shared
+	 * @param string $user User to whom the item was shared
+	 * @param string $owner Owner of the share
 	 * @param int $shareType only look for a specific share type
 	 * @return array Return list of items with file_target, permissions and expiration
 	 */
-	public static function getItemSharedWithUser($itemType, $itemSource, $user, $shareType = null) {
-
+	public static function getItemSharedWithUser($itemType, $itemSource, $user, $owner = null, $shareType = null) {
 		$shares = array();
 		$fileDependend = false;
 
@@ -320,6 +320,11 @@ class Share extends \OC\Share\Constants {
 			$arguments[] = $shareType;
 		}
 
+		if ($owner !== null) {
+			$where .= ' AND `uid_owner` = ? ';
+			$arguments[] = $owner;
+		}
+
 		$query = \OC_DB::prepare('SELECT ' . $select . ' FROM `*PREFIX*share` '. $where);
 
 		$result = \OC_DB::executeAudited($query, $arguments);
@@ -701,7 +706,7 @@ class Share extends \OC\Share\Constants {
 		// check if it is a valid itemType
 		self::getBackend($itemType);
 
-		$items = self::getItemSharedWithUser($itemType, $itemSource, $shareWith, $shareType);
+		$items = self::getItemSharedWithUser($itemType, $itemSource, $shareWith, null, $shareType);
 
 		$toDelete = array();
 		$newParent = null;
@@ -1629,7 +1634,7 @@ class Share extends \OC\Share\Constants {
 			// Need to find a solution which works for all back-ends
 			$collectionItems = array();
 			$collectionBackend = self::getBackend('folder');
-			$sharedParents = $collectionBackend->getParents($item, $shareWith);
+			$sharedParents = $collectionBackend->getParents($item, $shareWith, $uidOwner);
 			foreach ($sharedParents as $parent) {
 				$collectionItems[] = $parent;
 			}
diff --git a/lib/public/share.php b/lib/public/share.php
index 449d1fa211e..333e0a26970 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -125,11 +125,12 @@ class Share extends \OC\Share\Constants {
 	 * Get the item of item type shared with a given user by source
 	 * @param string $itemType
 	 * @param string $itemSource
-	 * @param string $user User user to whom the item was shared
+	 * @param string $user User to whom the item was shared
+	 * @param string $owner Owner of the share
 	 * @return array Return list of items with file_target, permissions and expiration
 	 */
-	public static function getItemSharedWithUser($itemType, $itemSource, $user) {
-		return \OC\Share\Share::getItemSharedWithUser($itemType, $itemSource, $user);
+	public static function getItemSharedWithUser($itemType, $itemSource, $user, $owner = null) {
+		return \OC\Share\Share::getItemSharedWithUser($itemType, $itemSource, $user, $owner);
 	}
 
 	/**
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 7ae458a797d..b5cdab0025b 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -658,6 +658,50 @@ class Test_Share extends \Test\TestCase {
 		return $row;
 	}
 
+	public function testGetItemSharedWithUser() {
+		OC_User::setUserId($this->user1);
+
+		//add dummy values to the share table
+		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` ('
+			.' `item_type`, `item_source`, `item_target`, `share_type`,'
+			.' `share_with`, `uid_owner`) VALUES (?,?,?,?,?,?)');
+		$args = array('test', 99, 'target1', OCP\Share::SHARE_TYPE_USER, $this->user2, $this->user1);
+		$query->execute($args);
+		$args = array('test', 99, 'target2', OCP\Share::SHARE_TYPE_USER, $this->user4, $this->user1);
+		$query->execute($args);
+		$args = array('test', 99, 'target3', OCP\Share::SHARE_TYPE_USER, $this->user3, $this->user2);
+		$query->execute($args);
+		$args = array('test', 99, 'target4', OCP\Share::SHARE_TYPE_USER, $this->user3, $this->user4);
+		$query->execute($args);
+
+
+		$result1 = \OCP\Share::getItemSharedWithUser('test', 99, $this->user2, $this->user1);
+		$this->assertSame(1, count($result1));
+		$this->verifyResult($result1, array('target1'));
+
+		$result2 = \OCP\Share::getItemSharedWithUser('test', 99, null, $this->user1);
+		$this->assertSame(2, count($result2));
+		$this->verifyResult($result2, array('target1', 'target2'));
+
+		$result3 = \OCP\Share::getItemSharedWithUser('test', 99, $this->user3);
+		$this->assertSame(2, count($result3));
+		$this->verifyResult($result3, array('target3', 'target4'));
+
+		$result4 = \OCP\Share::getItemSharedWithUser('test', 99, null, null);
+		$this->assertSame(4, count($result4));
+		$this->verifyResult($result4, array('target1', 'target2', 'target3', 'target4'));
+	}
+
+	public function verifyResult($result, $expected) {
+		foreach ($result as $r) {
+			if (in_array($r['item_target'], $expected)) {
+				$key = array_search($r['item_target'], $expected);
+				unset($expected[$key]);
+			}
+		}
+		$this->assertEmpty($expected, 'did not found all expected values');
+	}
+
 	public function testShareItemWithLink() {
 		OC_User::setUserId($this->user1);
 		$token = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, OCP\PERMISSION_READ);
-- 
GitLab


From 503de94392c0863e29cc8f1a46637f78ce8523ce Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 21 Nov 2014 16:23:56 +0100
Subject: [PATCH 510/616] make updateCount work properly with new xp'd mode as
 well as without

---
 apps/user_ldap/js/ldapFilter.js | 12 +++++++++++-
 apps/user_ldap/js/settings.js   | 20 ++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 63baec24ecc..4fe8e4aebdf 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -8,6 +8,7 @@ function LdapFilter(target, determineModeCallback) {
 	this.determineModeCallback = determineModeCallback;
 	this.foundFeatures = false;
 	this.activated = false;
+	this.countPending = false;
 
 	if( target === 'User' ||
 		target === 'Login' ||
@@ -25,9 +26,13 @@ LdapFilter.prototype.activate = function() {
 	this.determineMode();
 };
 
-LdapFilter.prototype.compose = function() {
+LdapFilter.prototype.compose = function(updateCount = false) {
 	var action;
 
+	if(updateCount) {
+		this.countPending = updateCount;
+	}
+
 	if(this.locked) {
 		this.lazyRunCompose = true;
 		return false;
@@ -57,6 +62,7 @@ LdapFilter.prototype.compose = function() {
 			filter.afterComposeSuccess(result);
 		},
 		function () {
+			filter.countPending = false;
 			console.log('LDAP Wizard: could not compose filter. '+
 				'Please check owncloud.log');
 		}
@@ -77,6 +83,10 @@ LdapFilter.prototype.afterDetectorsRan = function() {
  */
 LdapFilter.prototype.afterComposeSuccess = function(result) {
 	LdapWizard.applyChanges(result);
+	if(this.countPending) {
+		this.countPending = false;
+		this.updateCount();
+	}
 };
 
 LdapFilter.prototype.determineMode = function() {
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 15c63614f50..9987f6fd015 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -669,7 +669,8 @@ var LdapWizard = {
 	instantiateFilters: function() {
 		delete LdapWizard.userFilter;
 		LdapWizard.userFilter = new LdapFilter('User', function(mode) {
-			if(mode === LdapWizard.filterModeAssisted) {
+			if( !LdapWizard.admin.isExperienced()
+			   || mode === LdapWizard.filterModeAssisted) {
 				LdapWizard.userFilter.updateCount();
 			}
 			LdapWizard.userFilter.findFeatures();
@@ -689,7 +690,8 @@ var LdapWizard = {
 
 		delete LdapWizard.groupFilter;
 		LdapWizard.groupFilter = new LdapFilter('Group', function(mode) {
-			if(mode === LdapWizard.filterModeAssisted) {
+			if( !LdapWizard.admin.isExperienced()
+			   || mode === LdapWizard.filterModeAssisted) {
 				LdapWizard.groupFilter.updateCount();
 			}
 			LdapWizard.groupFilter.findFeatures();
@@ -775,6 +777,12 @@ var LdapWizard = {
 		if(triggerObj.id === 'ldap_loginfilter_username'
 		   || triggerObj.id === 'ldap_loginfilter_email') {
 			LdapWizard.loginFilter.compose();
+		} else if (!LdapWizard.admin.isExperienced()) {
+			if(triggerObj.id === 'ldap_userlist_filter') {
+				LdapWizard.userFilter.updateCount();
+			} else if (triggerObj.id === 'ldap_group_filter') {
+				LdapWizard.groupFilter.updateCount();
+			}
 		}
 
 		if($('#ldapSettings').tabs('option', 'active') == 0) {
@@ -804,7 +812,7 @@ var LdapWizard = {
 		LdapWizard._save($('#'+originalObj)[0], $.trim(values));
 		if(originalObj === 'ldap_userfilter_objectclass'
 		   || originalObj === 'ldap_userfilter_groups') {
-			LdapWizard.userFilter.compose();
+			LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced());
 			//when user filter is changed afterwards, login filter needs to
 			//be adjusted, too
 			if(!LdapWizard.loginFilter) {
@@ -815,7 +823,7 @@ var LdapWizard = {
 			LdapWizard.loginFilter.compose();
 		} else if(originalObj === 'ldap_groupfilter_objectclass'
 		   || originalObj === 'ldap_groupfilter_groups') {
-			LdapWizard.groupFilter.compose();
+			LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced());
 		}
 	},
 
@@ -885,10 +893,10 @@ var LdapWizard = {
 			LdapWizard._save({ id: modeKey }, LdapWizard.filterModeAssisted);
 			if(isUser) {
 				LdapWizard.blacklistRemove('ldap_userlist_filter');
-				LdapWizard.userFilter.compose();
+				LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced());
 			} else {
 				LdapWizard.blacklistRemove('ldap_group_filter');
-				LdapWizard.groupFilter.compose();
+				LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced());
 			}
 		}
 	},
-- 
GitLab


From 8c2aeb9b2143c30b4ad066dd3558161815c37312 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 21 Nov 2014 19:54:19 +0100
Subject: [PATCH 511/616] Add OCS API header per default

Relieve @PVince from having to write it all the time ;-)
---
 core/js/oc-requesttoken.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/js/oc-requesttoken.js b/core/js/oc-requesttoken.js
index 02175a3d674..2f7548ecb77 100644
--- a/core/js/oc-requesttoken.js
+++ b/core/js/oc-requesttoken.js
@@ -1,3 +1,4 @@
 $(document).on('ajaxSend',function(elm, xhr) {
 	xhr.setRequestHeader('requesttoken', oc_requesttoken);
-});
\ No newline at end of file
+	xhr.setRequestHeader('OCS-APIREQUEST', 'true');
+});
-- 
GitLab


From 9aef83b5798733d718e03a4ef0edc7279db43e59 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 22 Nov 2014 00:51:41 +0100
Subject: [PATCH 512/616] make scrutinizer happier and always count users on
 assisted mode, even with xp'ed mode (would be a regression otherwise)

---
 apps/user_ldap/js/ldapFilter.js | 4 ++--
 apps/user_ldap/js/settings.js   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/user_ldap/js/ldapFilter.js b/apps/user_ldap/js/ldapFilter.js
index 4fe8e4aebdf..0f7d240adac 100644
--- a/apps/user_ldap/js/ldapFilter.js
+++ b/apps/user_ldap/js/ldapFilter.js
@@ -26,10 +26,10 @@ LdapFilter.prototype.activate = function() {
 	this.determineMode();
 };
 
-LdapFilter.prototype.compose = function(updateCount = false) {
+LdapFilter.prototype.compose = function(updateCount) {
 	var action;
 
-	if(updateCount) {
+	if(updateCount === true) {
 		this.countPending = updateCount;
 	}
 
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index 9987f6fd015..6db210fe435 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -812,7 +812,7 @@ var LdapWizard = {
 		LdapWizard._save($('#'+originalObj)[0], $.trim(values));
 		if(originalObj === 'ldap_userfilter_objectclass'
 		   || originalObj === 'ldap_userfilter_groups') {
-			LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced());
+			LdapWizard.userFilter.compose(true);
 			//when user filter is changed afterwards, login filter needs to
 			//be adjusted, too
 			if(!LdapWizard.loginFilter) {
@@ -823,7 +823,7 @@ var LdapWizard = {
 			LdapWizard.loginFilter.compose();
 		} else if(originalObj === 'ldap_groupfilter_objectclass'
 		   || originalObj === 'ldap_groupfilter_groups') {
-			LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced());
+			LdapWizard.groupFilter.compose(true);
 		}
 	},
 
@@ -893,10 +893,10 @@ var LdapWizard = {
 			LdapWizard._save({ id: modeKey }, LdapWizard.filterModeAssisted);
 			if(isUser) {
 				LdapWizard.blacklistRemove('ldap_userlist_filter');
-				LdapWizard.userFilter.compose(!LdapWizard.admin.isExperienced());
+				LdapWizard.userFilter.compose(true);
 			} else {
 				LdapWizard.blacklistRemove('ldap_group_filter');
-				LdapWizard.groupFilter.compose(!LdapWizard.admin.isExperienced());
+				LdapWizard.groupFilter.compose(true);
 			}
 		}
 	},
-- 
GitLab


From fa3f7ad9e9bf92974b1115a2bae03075b97c1367 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 22 Nov 2014 01:55:21 -0500
Subject: [PATCH 513/616] [tx-robot] updated from transifex

---
 apps/files/l10n/ca.js              |   1 +
 apps/files/l10n/ca.json            |   1 +
 apps/files_encryption/l10n/sq.js   |   3 +-
 apps/files_encryption/l10n/sq.json |   3 +-
 apps/files_external/l10n/fr.js     |   2 +-
 apps/files_external/l10n/fr.json   |   2 +-
 apps/user_ldap/l10n/sq.js          |   1 +
 apps/user_ldap/l10n/sq.json        |   1 +
 core/l10n/ru.js                    |   2 +-
 core/l10n/ru.json                  |   2 +-
 core/l10n/sq.js                    | 104 ++++++++++++++++++++++++++++-
 core/l10n/sq.json                  | 104 ++++++++++++++++++++++++++++-
 lib/l10n/sl.js                     |   2 +
 lib/l10n/sl.json                   |   2 +
 lib/l10n/sq.js                     |   1 +
 lib/l10n/sq.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/en_GB.js             |   1 +
 settings/l10n/en_GB.json           |   1 +
 settings/l10n/es.js                |   1 +
 settings/l10n/es.json              |   1 +
 settings/l10n/fi_FI.js             |   1 +
 settings/l10n/fi_FI.json           |   1 +
 settings/l10n/it.js                |   1 +
 settings/l10n/it.json              |   1 +
 settings/l10n/pt_BR.js             |   1 +
 settings/l10n/pt_BR.json           |   1 +
 settings/l10n/ru.js                |   2 +
 settings/l10n/ru.json              |   2 +
 settings/l10n/sl.js                |   2 +
 settings/l10n/sl.json              |   2 +
 settings/l10n/sq.js                |  25 +++++++
 settings/l10n/sq.json              |  25 +++++++
 settings/l10n/tr.js                |   1 +
 settings/l10n/tr.json              |   1 +
 42 files changed, 298 insertions(+), 12 deletions(-)

diff --git a/apps/files/l10n/ca.js b/apps/files/l10n/ca.js
index 8a4b5c42d24..0885794ea43 100644
--- a/apps/files/l10n/ca.js
+++ b/apps/files/l10n/ca.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Unknown error" : "Error desconegut",
     "Could not move %s - File with this name already exists" : "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
     "Could not move %s" : " No s'ha pogut moure %s",
+    "Permission denied" : "Permís denegat",
     "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
     "\"%s\" is an invalid file name." : "\"%s\" no es un fitxer vàlid.",
     "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
diff --git a/apps/files/l10n/ca.json b/apps/files/l10n/ca.json
index 91e96f5742d..2b767a9aaed 100644
--- a/apps/files/l10n/ca.json
+++ b/apps/files/l10n/ca.json
@@ -4,6 +4,7 @@
     "Unknown error" : "Error desconegut",
     "Could not move %s - File with this name already exists" : "No s'ha pogut moure %s - Ja hi ha un fitxer amb aquest nom",
     "Could not move %s" : " No s'ha pogut moure %s",
+    "Permission denied" : "Permís denegat",
     "File name cannot be empty." : "El nom del fitxer no pot ser buit.",
     "\"%s\" is an invalid file name." : "\"%s\" no es un fitxer vàlid.",
     "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." : "El nóm no és vàlid, '\\', '/', '<', '>', ':', '\"', '|', '?' i '*' no estan permesos.",
diff --git a/apps/files_encryption/l10n/sq.js b/apps/files_encryption/l10n/sq.js
index f3c5d10cf0a..ffab720cfda 100644
--- a/apps/files_encryption/l10n/sq.js
+++ b/apps/files_encryption/l10n/sq.js
@@ -2,6 +2,7 @@ OC.L10N.register(
     "files_encryption",
     {
     "Unknown error" : "Gabim panjohur",
-    "Encryption" : "Kodifikimi"
+    "Encryption" : "Kodifikimi",
+    "Enabled" : "Aktivizuar"
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/apps/files_encryption/l10n/sq.json b/apps/files_encryption/l10n/sq.json
index b4fe571e7e0..dee4c42e547 100644
--- a/apps/files_encryption/l10n/sq.json
+++ b/apps/files_encryption/l10n/sq.json
@@ -1,5 +1,6 @@
 { "translations": {
     "Unknown error" : "Gabim panjohur",
-    "Encryption" : "Kodifikimi"
+    "Encryption" : "Kodifikimi",
+    "Enabled" : "Aktivizuar"
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/apps/files_external/l10n/fr.js b/apps/files_external/l10n/fr.js
index 7f827ec6fd4..5885af24199 100644
--- a/apps/files_external/l10n/fr.js
+++ b/apps/files_external/l10n/fr.js
@@ -50,7 +50,7 @@ OC.L10N.register(
     "Error configuring Google Drive storage" : "Erreur lors de la configuration du support de stockage Google Drive",
     "Personal" : "Personnel",
     "System" : "Système",
-    "All users. Type to select user or group." : "Tous les utilisateurs. Commencez à saisir pour sélectionner un utilisateur ou un groupe.",
+    "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.",
     "(group)" : "(groupe)",
     "Saved" : "Sauvegarder",
     "<b>Note:</b> " : "<b>Attention :</b>",
diff --git a/apps/files_external/l10n/fr.json b/apps/files_external/l10n/fr.json
index e8a9e299c24..e1e2b2eccc4 100644
--- a/apps/files_external/l10n/fr.json
+++ b/apps/files_external/l10n/fr.json
@@ -48,7 +48,7 @@
     "Error configuring Google Drive storage" : "Erreur lors de la configuration du support de stockage Google Drive",
     "Personal" : "Personnel",
     "System" : "Système",
-    "All users. Type to select user or group." : "Tous les utilisateurs. Commencez à saisir pour sélectionner un utilisateur ou un groupe.",
+    "All users. Type to select user or group." : "Tous les utilisateurs. Cliquez ici pour restreindre.",
     "(group)" : "(groupe)",
     "Saved" : "Sauvegarder",
     "<b>Note:</b> " : "<b>Attention :</b>",
diff --git a/apps/user_ldap/l10n/sq.js b/apps/user_ldap/l10n/sq.js
index 056458c24b6..b436bef7bf2 100644
--- a/apps/user_ldap/l10n/sq.js
+++ b/apps/user_ldap/l10n/sq.js
@@ -32,6 +32,7 @@ OC.L10N.register(
     "For anonymous access, leave DN and Password empty." : "Për tu lidhur në mënyre anonime, lini bosh hapsirat e DN dhe fjalëkalim",
     "One Base DN per line" : "Një baze DN për rrjesht",
     "You can specify Base DN for users and groups in the Advanced tab" : "Ju mund të specifikoni Bazen DN për përdorues dhe grupe në butonin 'Të Përparuara'",
+    "Continue" : "Vazhdo",
     "Advanced" : "E përparuar",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Njoftim:</b> moduli PHP LDAP nuk është instaluar, motori nuk do të funksionojë.Kontaktoni me administratorin e sistemit.",
     "Connection Settings" : "Të dhënat e lidhjes",
diff --git a/apps/user_ldap/l10n/sq.json b/apps/user_ldap/l10n/sq.json
index a3e87869355..5b81af7100d 100644
--- a/apps/user_ldap/l10n/sq.json
+++ b/apps/user_ldap/l10n/sq.json
@@ -30,6 +30,7 @@
     "For anonymous access, leave DN and Password empty." : "Për tu lidhur në mënyre anonime, lini bosh hapsirat e DN dhe fjalëkalim",
     "One Base DN per line" : "Një baze DN për rrjesht",
     "You can specify Base DN for users and groups in the Advanced tab" : "Ju mund të specifikoni Bazen DN për përdorues dhe grupe në butonin 'Të Përparuara'",
+    "Continue" : "Vazhdo",
     "Advanced" : "E përparuar",
     "<b>Warning:</b> The PHP LDAP module is not installed, the backend will not work. Please ask your system administrator to install it." : "<b>Njoftim:</b> moduli PHP LDAP nuk është instaluar, motori nuk do të funksionojë.Kontaktoni me administratorin e sistemit.",
     "Connection Settings" : "Të dhënat e lidhjes",
diff --git a/core/l10n/ru.js b/core/l10n/ru.js
index f3e11f7abda..858595bab64 100644
--- a/core/l10n/ru.js
+++ b/core/l10n/ru.js
@@ -113,7 +113,7 @@ OC.L10N.register(
     "Hello world!" : "Привет мир!",
     "sunny" : "солнечно",
     "Hello {name}, the weather is {weather}" : "Здравствуйте {name}, погода {weather}",
-    "_download %n file_::_download %n files_" : ["","",""],
+    "_download %n file_::_download %n files_" : ["загрузить %n файл","загрузить %n файла","загрузить %n файлов"],
     "Updating {productName} to version {version}, this may take a while." : "Обновление {productName} до версии {version}, пожалуйста, подождите.",
     "Please reload the page." : "Пожалуйста, перезагрузите страницу.",
     "The update was unsuccessful." : "Обновление не удалось.",
diff --git a/core/l10n/ru.json b/core/l10n/ru.json
index a77cf869064..990a6e9bf9c 100644
--- a/core/l10n/ru.json
+++ b/core/l10n/ru.json
@@ -111,7 +111,7 @@
     "Hello world!" : "Привет мир!",
     "sunny" : "солнечно",
     "Hello {name}, the weather is {weather}" : "Здравствуйте {name}, погода {weather}",
-    "_download %n file_::_download %n files_" : ["","",""],
+    "_download %n file_::_download %n files_" : ["загрузить %n файл","загрузить %n файла","загрузить %n файлов"],
     "Updating {productName} to version {version}, this may take a while." : "Обновление {productName} до версии {version}, пожалуйста, подождите.",
     "Please reload the page." : "Пожалуйста, перезагрузите страницу.",
     "The update was unsuccessful." : "Обновление не удалось.",
diff --git a/core/l10n/sq.js b/core/l10n/sq.js
index 246c12bd9ec..d0692b8a63e 100644
--- a/core/l10n/sq.js
+++ b/core/l10n/sq.js
@@ -35,14 +35,38 @@ OC.L10N.register(
     "December" : "Dhjetor",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
+    "Couldn't send reset email. Please contact your administrator." : "Emaili i rivendosjes nuk mund të dërgohet. Ju lutem kontaktoni me administratorin.",
+    "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?",
+    "I know what I'm doing" : "Unë e di se çfarë po bëj",
+    "Password can not be changed. Please contact your administrator." : "Fjalëkalimi nuk mund të ndryshohet. Ju lutem kontaktoni me administratorin.",
     "No" : "Jo",
     "Yes" : "Po",
     "Choose" : "Zgjidh",
+    "Error loading file picker template: {error}" : "Gabim gjatë ngarkimit të shabllonit të zgjedhësit të skedarëve: {error}",
     "Ok" : "Në rregull",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Error loading message template: {error}" : "Gabim gjatë ngarkimit të shabllonit të mesazheve: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konflikt skedari","{count} konflikte skedarësh"],
+    "One file conflict" : "Një konflikt skedari",
+    "New Files" : "Skedarë të rinj",
+    "Already existing files" : "Skedarë ekzistues",
+    "Which files do you want to keep?" : "Cilët skedarë dëshironi të mbani?",
+    "If you select both versions, the copied file will have a number added to its name." : "Nëse i zgjidhni të dyja versionet, skedarit të kopjuar do ti shtohet një numër në emrin e tij.",
     "Cancel" : "Anulo",
+    "Continue" : "Vazhdo",
+    "(all selected)" : "(të gjitha të zgjedhura)",
+    "({count} selected)" : "({count} të zgjedhur)",
+    "Error loading file exists template" : "Gabim gjatë ngarkimit të shabllonit të skedarit ekzistues",
+    "Very weak password" : "Fjalëkalim shumë i dobët",
+    "Weak password" : "Fjalëkalim i dobët",
+    "So-so password" : "Fjalëkalim i pranueshëm",
+    "Good password" : "Fjalëkalim i mirë",
+    "Strong password" : "Fjalëkalim shumë i mirë",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar.",
+    "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." : "Ky server nuk ka lidhje në internet. Kjo dmth qe disa nga funksionalitetet si të montohet ruajtje e jashtme, njoftime mbi versione të reja apo instalimi i aplikacioneve nga palë të 3ta nuk do të funksionojnë. Qasja në distancë e skedarëve dhe dërgimi i emaileve njoftues gjithashtu mund të mos funksionojnë. Ju sugjerojmë që të aktivizoni lidhjen në internet për këtë server nëse dëshironi ti keni të gjitha funksionalitetet.",
+    "Error occurred while checking server setup" : "Gabim gjatë kontrollit të konfigurimit të serverit",
     "Shared" : "Ndarë",
+    "Shared with {recipients}" : "Ndarë me {recipients}",
     "Share" : "Nda",
     "Error" : "Veprim i gabuar",
     "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
@@ -50,16 +74,22 @@ OC.L10N.register(
     "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 with user or group …" : "Ndajeni me përdorues ose grup ...",
+    "Share link" : "Ndaje lidhjen",
+    "The public link will expire no later than {days} days after it is created" : "Lidhja publike do të skadojë jo më vonë se {days} ditë pas krijimit",
     "Password protect" : "Mbro me kod",
+    "Choose a password for the public link" : "Zgjidhni një fjalëkalim për lidhjen publike",
     "Allow Public Upload" : "Lejo Ngarkimin Publik",
     "Email link to person" : "Dërgo email me lidhjen",
     "Send" : "Dërgo",
     "Set expiration date" : "Cakto datën e përfundimit",
     "Expiration date" : "Data e përfundimit",
+    "Adding user..." : "Duke shtuar përdoruesin ...",
     "group" : "grupi",
     "Resharing is not allowed" : "Rindarja nuk lejohet",
     "Shared in {item} with {user}" : "Ndarë në {item} me {user}",
     "Unshare" : "Hiq ndarjen",
+    "notify by email" : "njofto me email",
     "can share" : "mund të ndajnë",
     "can edit" : "mund të ndryshosh",
     "access control" : "kontrollimi i hyrjeve",
@@ -71,21 +101,64 @@ OC.L10N.register(
     "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",
+    "Warning" : "Kujdes",
     "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
+    "Enter new" : "Jep të re",
     "Delete" : "Elimino",
     "Add" : "Shto",
-    "_download %n file_::_download %n files_" : ["",""],
+    "Edit tags" : "Modifiko tag",
+    "Error loading dialog template: {error}" : "Gabim gjatë ngarkimit të shabllonit: {error}",
+    "No tags selected for deletion." : "Nuk është zgjedhur asnjë tag për fshirje.",
+    "unknown text" : "tekst i panjohur",
+    "Hello world!" : "Përshendetje të gjithëve!",
+    "sunny" : "diell",
+    "Hello {name}, the weather is {weather}" : "Përshëndetje {name}, koha është {weather}",
+    "_download %n file_::_download %n files_" : ["shkarko %n skedar","shkarko %n skedarë"],
+    "Updating {productName} to version {version}, this may take a while." : "Po përditësoj {productName} në versionin {version}, kjo mund të zgjasë pak.",
+    "Please reload the page." : "Ju lutem ringarkoni faqen.",
+    "The update was unsuccessful." : "Përditësimi nuk rezultoi me sukses.",
     "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+    "Couldn't reset password because the token is invalid" : "Nuk mund të rivendos fjalëkalimin sepse shenja është e pavlefshme.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Emaili i rivendosjes nuk mund të dërgohet. Ju lutem sigurohuni që përdoruesi juaj është i saktë.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Emaili i rivendosjes nuk mund të dërgohet sepse nuk ekziston asnjë adresë email për këtë përdorues. Ju lutem kontaktoni me administratorin.",
     "%s password reset" : "Kodi i %s -it u rivendos",
     "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
     "New password" : "Kodi i ri",
+    "New Password" : "Fjalëkalim i ri",
     "Reset password" : "Rivendos kodin",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nuk është i mbështetur dhe %s nuk do të funksionojë si duhet në këtë platformë. Përdoreni nën përgjegjësinë tuaj!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Për të arritur rezultatet më të mira të mundshme, ju lutem më mirë konsideroni përdorimin e një serveri GNU/Linux.",
     "Personal" : "Personale",
     "Users" : "Përdoruesit",
     "Apps" : "App",
     "Admin" : "Admin",
     "Help" : "Ndihmë",
+    "Error loading tags" : "Gabim gjatë ngarkimit të etiketave.",
+    "Tag already exists" : "Etiketa ekziston",
+    "Error deleting tag(s)" : "Gabim gjatë fshirjes së etiketës(ave)",
+    "Error tagging" : "Gabim etiketimi",
+    "Error untagging" : "Gabim në heqjen e etiketës",
+    "Error favoriting" : "Gabim në ruajtjen si të preferuar",
+    "Error unfavoriting" : "Gabim në heqjen nga të preferuarat",
     "Access forbidden" : "Ndalohet hyrja",
+    "File not found" : "Skedari nuk mund të gjendet",
+    "The specified document has not been found on the server." : "Dokumenti i përcaktuar nuk mund të gjendet në server.",
+    "You can click here to return to %s." : "Ju mund të klikoni këtu për tu kthyer në %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Tungjatjeta,\n\nju njoftojmë se %s ka ndarë %s me ju.\nShikojeni në: %s\n\n",
+    "The share will expire on %s." : "Ndarja do të skadojë në %s.",
+    "Cheers!" : "Gjithë të mirat",
+    "Internal Server Error" : "Gabim i brendshëm në server",
+    "The server encountered an internal error and was unable to complete your request." : "Serveri u përball me një gabim të brendshem dhe nuk mundet të mbarojë detyrën që i keni ngarkuar.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Ju lutem kontaktoni me administratorin e serverit nëse ky gabim shfaqet herë të tjera, ju lutem përfshini dhe detajet e mëposhtme teknike në raportin tuaj.",
+    "More details can be found in the server log." : "Detaje të mëtejshme mund të gjenden në listën e veprimeve të serverit.",
+    "Technical details" : "Detaje teknike",
+    "Remote Address: %s" : "Adresa tjetër: %s",
+    "Request ID: %s" : "ID e kërkesës: %s",
+    "Code: %s" : "Kodi: %s",
+    "Message: %s" : "Mesazhi: %s",
+    "File: %s" : "Skedari: %s",
+    "Line: %s" : "Rreshti: %s",
+    "Trace" : "Gjurmim",
     "Security Warning" : "Paralajmërim sigurie",
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
@@ -94,18 +167,43 @@ OC.L10N.register(
     "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
     "Username" : "Përdoruesi",
     "Password" : "Kodi",
+    "Storage & database" : "Ruajtja dhe baza e të dhënave",
     "Data folder" : "Emri i dosjes",
     "Configure the database" : "Konfiguro database-in",
+    "Only %s is available." : "Vetëm %s është e disponueshme.",
     "Database user" : "Përdoruesi i database-it",
     "Database password" : "Kodi i database-it",
     "Database name" : "Emri i database-it",
     "Database tablespace" : "Tablespace-i i database-it",
     "Database host" : "Pozicioni (host) i database-it",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite do të përdoret si bazë të dhënash. Për instalime më të mëdha ju rekomandojmë që ta ndryshoni këtë.",
     "Finish setup" : "Mbaro setup-in",
+    "Finishing …" : "Duke përfunduar ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Këtij aplikacioni i nevojitet JavaScript për funksionim të rregullt. Ju lutem <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivizoni JavaScript</a> dhe ringarkoni faqen.",
     "%s is available. Get more information on how to update." : "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
     "Log out" : "Dalje",
+    "Server side authentication failed!" : "Verifikimi në krahun e serverit dështoi!",
+    "Please contact your administrator." : "Ju lutem kontaktoni administratorin.",
+    "Forgot your password? Reset it!" : "Keni harruar fjalëkalimin tuaj? Rivendoseni!",
     "remember" : "kujto",
     "Log in" : "Hyrje",
-    "Alternative Logins" : "Hyrje alternative"
+    "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.",
+    "This means only administrators can use the instance." : "Kjo dmth që vetëm administratorët mund të shfrytëzojnë instancën.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktoni administratorin e sistemit nëse ky mesazh vazhdon ose është shfaqur papritmas.",
+    "Thank you for your patience." : "Ju faleminderit për durimin tuaj.",
+    "You are accessing the server from an untrusted domain." : "Ju po qaseni në server nga një domain jo i besuar.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ju lutem kontaktoni me administratorin. Nëse jeni administrator i kësaj instance, konfiguroni parametrin \"domain i besuar\" në config/config.php . Një konfigurim shembull është dhënë në config/config.sample.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Në varësi të konfigurimit tuaj, ju si administrator mundet gjithashtu të jeni i aftë të përdorni butonin e mëposhtëm për ti dhënë besim këtij domain.",
+    "Add \"%s\" as trusted domain" : "Shtoni \"%s\" si domain të besuar",
+    "%s will be updated to version %s." : "%s to të përditësohet në versionin %s.",
+    "The following apps will be disabled:" : "Keto aplikacione do të bllokohen:",
+    "The theme %s has been disabled." : "Tema %s u bllokua.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ju lutem sigurohuni që bazës së të dhënave, dosjes së konfigurimit dhe dosjes së të dhënave ti jetë bërë një kopje rezervë përpara se të vazhdoni më tutje.",
+    "Start update" : "Fillo përditësimin.",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Për të shmangur momente bllokimi gjatë punës me instalime të mëdha, në vend të kësaj ju mund të kryeni komandën e mëposhtme nga dosja juaj e instalimit:",
+    "This %s instance is currently being updated, which may take a while." : "Kjo instancë %s është në proces përditësimi, i cili mund të zgjasë pak kohë.",
+    "This page will refresh itself when the %s instance is available again." : "Kjo faqe do të ringarkohet automatikisht kur instanca %s të jetë sërish e disponueshme."
 },
 "nplurals=2; plural=(n != 1);");
diff --git a/core/l10n/sq.json b/core/l10n/sq.json
index e183fafb33c..3cf8cae21d3 100644
--- a/core/l10n/sq.json
+++ b/core/l10n/sq.json
@@ -33,14 +33,38 @@
     "December" : "Dhjetor",
     "Settings" : "Parametra",
     "Saving..." : "Duke ruajtur...",
+    "Couldn't send reset email. Please contact your administrator." : "Emaili i rivendosjes nuk mund të dërgohet. Ju lutem kontaktoni me administratorin.",
+    "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?",
+    "I know what I'm doing" : "Unë e di se çfarë po bëj",
+    "Password can not be changed. Please contact your administrator." : "Fjalëkalimi nuk mund të ndryshohet. Ju lutem kontaktoni me administratorin.",
     "No" : "Jo",
     "Yes" : "Po",
     "Choose" : "Zgjidh",
+    "Error loading file picker template: {error}" : "Gabim gjatë ngarkimit të shabllonit të zgjedhësit të skedarëve: {error}",
     "Ok" : "Në rregull",
-    "_{count} file conflict_::_{count} file conflicts_" : ["",""],
+    "Error loading message template: {error}" : "Gabim gjatë ngarkimit të shabllonit të mesazheve: {error}",
+    "_{count} file conflict_::_{count} file conflicts_" : ["{count} konflikt skedari","{count} konflikte skedarësh"],
+    "One file conflict" : "Një konflikt skedari",
+    "New Files" : "Skedarë të rinj",
+    "Already existing files" : "Skedarë ekzistues",
+    "Which files do you want to keep?" : "Cilët skedarë dëshironi të mbani?",
+    "If you select both versions, the copied file will have a number added to its name." : "Nëse i zgjidhni të dyja versionet, skedarit të kopjuar do ti shtohet një numër në emrin e tij.",
     "Cancel" : "Anulo",
+    "Continue" : "Vazhdo",
+    "(all selected)" : "(të gjitha të zgjedhura)",
+    "({count} selected)" : "({count} të zgjedhur)",
+    "Error loading file exists template" : "Gabim gjatë ngarkimit të shabllonit të skedarit ekzistues",
+    "Very weak password" : "Fjalëkalim shumë i dobët",
+    "Weak password" : "Fjalëkalim i dobët",
+    "So-so password" : "Fjalëkalim i pranueshëm",
+    "Good password" : "Fjalëkalim i mirë",
+    "Strong password" : "Fjalëkalim shumë i mirë",
     "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Web Serveri juaj nuk është konfigurar sic duhet në mënyre që të lejojë sinkronizimin e skedare pasi ndërfaqja WevDAV duket të jetë e demtuar.",
+    "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." : "Ky server nuk ka lidhje në internet. Kjo dmth qe disa nga funksionalitetet si të montohet ruajtje e jashtme, njoftime mbi versione të reja apo instalimi i aplikacioneve nga palë të 3ta nuk do të funksionojnë. Qasja në distancë e skedarëve dhe dërgimi i emaileve njoftues gjithashtu mund të mos funksionojnë. Ju sugjerojmë që të aktivizoni lidhjen në internet për këtë server nëse dëshironi ti keni të gjitha funksionalitetet.",
+    "Error occurred while checking server setup" : "Gabim gjatë kontrollit të konfigurimit të serverit",
     "Shared" : "Ndarë",
+    "Shared with {recipients}" : "Ndarë me {recipients}",
     "Share" : "Nda",
     "Error" : "Veprim i gabuar",
     "Error while sharing" : "Veprim i gabuar gjatë ndarjes",
@@ -48,16 +72,22 @@
     "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 with user or group …" : "Ndajeni me përdorues ose grup ...",
+    "Share link" : "Ndaje lidhjen",
+    "The public link will expire no later than {days} days after it is created" : "Lidhja publike do të skadojë jo më vonë se {days} ditë pas krijimit",
     "Password protect" : "Mbro me kod",
+    "Choose a password for the public link" : "Zgjidhni një fjalëkalim për lidhjen publike",
     "Allow Public Upload" : "Lejo Ngarkimin Publik",
     "Email link to person" : "Dërgo email me lidhjen",
     "Send" : "Dërgo",
     "Set expiration date" : "Cakto datën e përfundimit",
     "Expiration date" : "Data e përfundimit",
+    "Adding user..." : "Duke shtuar përdoruesin ...",
     "group" : "grupi",
     "Resharing is not allowed" : "Rindarja nuk lejohet",
     "Shared in {item} with {user}" : "Ndarë në {item} me {user}",
     "Unshare" : "Hiq ndarjen",
+    "notify by email" : "njofto me email",
     "can share" : "mund të ndajnë",
     "can edit" : "mund të ndryshosh",
     "access control" : "kontrollimi i hyrjeve",
@@ -69,21 +99,64 @@
     "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",
+    "Warning" : "Kujdes",
     "The object type is not specified." : "Nuk është specifikuar tipi i objektit.",
+    "Enter new" : "Jep të re",
     "Delete" : "Elimino",
     "Add" : "Shto",
-    "_download %n file_::_download %n files_" : ["",""],
+    "Edit tags" : "Modifiko tag",
+    "Error loading dialog template: {error}" : "Gabim gjatë ngarkimit të shabllonit: {error}",
+    "No tags selected for deletion." : "Nuk është zgjedhur asnjë tag për fshirje.",
+    "unknown text" : "tekst i panjohur",
+    "Hello world!" : "Përshendetje të gjithëve!",
+    "sunny" : "diell",
+    "Hello {name}, the weather is {weather}" : "Përshëndetje {name}, koha është {weather}",
+    "_download %n file_::_download %n files_" : ["shkarko %n skedar","shkarko %n skedarë"],
+    "Updating {productName} to version {version}, this may take a while." : "Po përditësoj {productName} në versionin {version}, kjo mund të zgjasë pak.",
+    "Please reload the page." : "Ju lutem ringarkoni faqen.",
+    "The update was unsuccessful." : "Përditësimi nuk rezultoi me sukses.",
     "The update was successful. Redirecting you to ownCloud now." : "Azhurnimi u krye. Tani do t'ju kaloj tek ownCloud-i.",
+    "Couldn't reset password because the token is invalid" : "Nuk mund të rivendos fjalëkalimin sepse shenja është e pavlefshme.",
+    "Couldn't send reset email. Please make sure your username is correct." : "Emaili i rivendosjes nuk mund të dërgohet. Ju lutem sigurohuni që përdoruesi juaj është i saktë.",
+    "Couldn't send reset email because there is no email address for this username. Please contact your administrator." : "Emaili i rivendosjes nuk mund të dërgohet sepse nuk ekziston asnjë adresë email për këtë përdorues. Ju lutem kontaktoni me administratorin.",
     "%s password reset" : "Kodi i %s -it u rivendos",
     "Use the following link to reset your password: {link}" : "Përdorni lidhjen në vijim për të rivendosur kodin: {link}",
     "New password" : "Kodi i ri",
+    "New Password" : "Fjalëkalim i ri",
     "Reset password" : "Rivendos kodin",
+    "Mac OS X is not supported and %s will not work properly on this platform. Use it at your own risk! " : "Mac OS X nuk është i mbështetur dhe %s nuk do të funksionojë si duhet në këtë platformë. Përdoreni nën përgjegjësinë tuaj!",
+    "For the best results, please consider using a GNU/Linux server instead." : "Për të arritur rezultatet më të mira të mundshme, ju lutem më mirë konsideroni përdorimin e një serveri GNU/Linux.",
     "Personal" : "Personale",
     "Users" : "Përdoruesit",
     "Apps" : "App",
     "Admin" : "Admin",
     "Help" : "Ndihmë",
+    "Error loading tags" : "Gabim gjatë ngarkimit të etiketave.",
+    "Tag already exists" : "Etiketa ekziston",
+    "Error deleting tag(s)" : "Gabim gjatë fshirjes së etiketës(ave)",
+    "Error tagging" : "Gabim etiketimi",
+    "Error untagging" : "Gabim në heqjen e etiketës",
+    "Error favoriting" : "Gabim në ruajtjen si të preferuar",
+    "Error unfavoriting" : "Gabim në heqjen nga të preferuarat",
     "Access forbidden" : "Ndalohet hyrja",
+    "File not found" : "Skedari nuk mund të gjendet",
+    "The specified document has not been found on the server." : "Dokumenti i përcaktuar nuk mund të gjendet në server.",
+    "You can click here to return to %s." : "Ju mund të klikoni këtu për tu kthyer në %s.",
+    "Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\n" : "Tungjatjeta,\n\nju njoftojmë se %s ka ndarë %s me ju.\nShikojeni në: %s\n\n",
+    "The share will expire on %s." : "Ndarja do të skadojë në %s.",
+    "Cheers!" : "Gjithë të mirat",
+    "Internal Server Error" : "Gabim i brendshëm në server",
+    "The server encountered an internal error and was unable to complete your request." : "Serveri u përball me një gabim të brendshem dhe nuk mundet të mbarojë detyrën që i keni ngarkuar.",
+    "Please contact the server administrator if this error reappears multiple times, please include the technical details below in your report." : "Ju lutem kontaktoni me administratorin e serverit nëse ky gabim shfaqet herë të tjera, ju lutem përfshini dhe detajet e mëposhtme teknike në raportin tuaj.",
+    "More details can be found in the server log." : "Detaje të mëtejshme mund të gjenden në listën e veprimeve të serverit.",
+    "Technical details" : "Detaje teknike",
+    "Remote Address: %s" : "Adresa tjetër: %s",
+    "Request ID: %s" : "ID e kërkesës: %s",
+    "Code: %s" : "Kodi: %s",
+    "Message: %s" : "Mesazhi: %s",
+    "File: %s" : "Skedari: %s",
+    "Line: %s" : "Rreshti: %s",
+    "Trace" : "Gjurmim",
     "Security Warning" : "Paralajmërim sigurie",
     "Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)" : "Versioni juaj i PHP-së është i cënueshëm nga sulmi NULL Byte (CVE-2006-7243)",
     "Please update your PHP installation to use %s securely." : "Ju lutem azhurnoni instalimin tuaj të PHP-së që të përdorni %s -in në mënyrë të sigurt.",
@@ -92,18 +165,43 @@
     "Create an <strong>admin account</strong>" : "Krijo një <strong>llogari administruesi</strong>",
     "Username" : "Përdoruesi",
     "Password" : "Kodi",
+    "Storage & database" : "Ruajtja dhe baza e të dhënave",
     "Data folder" : "Emri i dosjes",
     "Configure the database" : "Konfiguro database-in",
+    "Only %s is available." : "Vetëm %s është e disponueshme.",
     "Database user" : "Përdoruesi i database-it",
     "Database password" : "Kodi i database-it",
     "Database name" : "Emri i database-it",
     "Database tablespace" : "Tablespace-i i database-it",
     "Database host" : "Pozicioni (host) i database-it",
+    "SQLite will be used as database. For larger installations we recommend to change this." : "SQLite do të përdoret si bazë të dhënash. Për instalime më të mëdha ju rekomandojmë që ta ndryshoni këtë.",
     "Finish setup" : "Mbaro setup-in",
+    "Finishing …" : "Duke përfunduar ...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Këtij aplikacioni i nevojitet JavaScript për funksionim të rregullt. Ju lutem <a href=\"http://enable-javascript.com/\" target=\"_blank\">aktivizoni JavaScript</a> dhe ringarkoni faqen.",
     "%s is available. Get more information on how to update." : "%s është i disponueshëm. Merrni më shumë informacione mbi azhurnimin.",
     "Log out" : "Dalje",
+    "Server side authentication failed!" : "Verifikimi në krahun e serverit dështoi!",
+    "Please contact your administrator." : "Ju lutem kontaktoni administratorin.",
+    "Forgot your password? Reset it!" : "Keni harruar fjalëkalimin tuaj? Rivendoseni!",
     "remember" : "kujto",
     "Log in" : "Hyrje",
-    "Alternative Logins" : "Hyrje alternative"
+    "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.",
+    "This means only administrators can use the instance." : "Kjo dmth që vetëm administratorët mund të shfrytëzojnë instancën.",
+    "Contact your system administrator if this message persists or appeared unexpectedly." : "Kontaktoni administratorin e sistemit nëse ky mesazh vazhdon ose është shfaqur papritmas.",
+    "Thank you for your patience." : "Ju faleminderit për durimin tuaj.",
+    "You are accessing the server from an untrusted domain." : "Ju po qaseni në server nga një domain jo i besuar.",
+    "Please contact your administrator. If you are an administrator of this instance, configure the \"trusted_domain\" setting in config/config.php. An example configuration is provided in config/config.sample.php." : "Ju lutem kontaktoni me administratorin. Nëse jeni administrator i kësaj instance, konfiguroni parametrin \"domain i besuar\" në config/config.php . Një konfigurim shembull është dhënë në config/config.sample.php",
+    "Depending on your configuration, as an administrator you might also be able to use the button below to trust this domain." : "Në varësi të konfigurimit tuaj, ju si administrator mundet gjithashtu të jeni i aftë të përdorni butonin e mëposhtëm për ti dhënë besim këtij domain.",
+    "Add \"%s\" as trusted domain" : "Shtoni \"%s\" si domain të besuar",
+    "%s will be updated to version %s." : "%s to të përditësohet në versionin %s.",
+    "The following apps will be disabled:" : "Keto aplikacione do të bllokohen:",
+    "The theme %s has been disabled." : "Tema %s u bllokua.",
+    "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ju lutem sigurohuni që bazës së të dhënave, dosjes së konfigurimit dhe dosjes së të dhënave ti jetë bërë një kopje rezervë përpara se të vazhdoni më tutje.",
+    "Start update" : "Fillo përditësimin.",
+    "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Për të shmangur momente bllokimi gjatë punës me instalime të mëdha, në vend të kësaj ju mund të kryeni komandën e mëposhtme nga dosja juaj e instalimit:",
+    "This %s instance is currently being updated, which may take a while." : "Kjo instancë %s është në proces përditësimi, i cili mund të zgjasë pak kohë.",
+    "This page will refresh itself when the %s instance is available again." : "Kjo faqe do të ringarkohet automatikisht kur instanca %s të jetë sërish e disponueshme."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }
\ No newline at end of file
diff --git a/lib/l10n/sl.js b/lib/l10n/sl.js
index aa783fbd69e..8277186b0b3 100644
--- a/lib/l10n/sl.js
+++ b/lib/l10n/sl.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Ni podanega imena programa",
     "Unknown filetype" : "Neznana vrsta datoteke",
     "Invalid image" : "Neveljavna slika",
+    "Database Error" : "Napaka podatkovne zbirke",
+    "Please contact your system administrator." : "Stopite v stik s skrbnikom sistema.",
     "web services under your control" : "spletne storitve pod vašim nadzorom",
     "App directory already exists" : "Programska mapa že obstaja",
     "Can't create app folder. Please fix permissions. %s" : "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s",
diff --git a/lib/l10n/sl.json b/lib/l10n/sl.json
index c0cbf41f719..a5d22213f1d 100644
--- a/lib/l10n/sl.json
+++ b/lib/l10n/sl.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Ni podanega imena programa",
     "Unknown filetype" : "Neznana vrsta datoteke",
     "Invalid image" : "Neveljavna slika",
+    "Database Error" : "Napaka podatkovne zbirke",
+    "Please contact your system administrator." : "Stopite v stik s skrbnikom sistema.",
     "web services under your control" : "spletne storitve pod vašim nadzorom",
     "App directory already exists" : "Programska mapa že obstaja",
     "Can't create app folder. Please fix permissions. %s" : "Programske mape ni mogoče ustvariti. Ni ustreznih dovoljenj. %s",
diff --git a/lib/l10n/sq.js b/lib/l10n/sq.js
index f547c7b9104..c3be28ef1c6 100644
--- a/lib/l10n/sq.js
+++ b/lib/l10n/sq.js
@@ -6,6 +6,7 @@ OC.L10N.register(
     "Settings" : "Parametra",
     "Users" : "Përdoruesit",
     "Admin" : "Admin",
+    "Recommended" : "E rekomanduar",
     "Unknown filetype" : "Tip i panjohur skedari",
     "Invalid image" : "Imazh i pavlefshëm",
     "web services under your control" : "shërbime web nën kontrollin tënd",
diff --git a/lib/l10n/sq.json b/lib/l10n/sq.json
index 8f2d062b91b..cd10a590bd1 100644
--- a/lib/l10n/sq.json
+++ b/lib/l10n/sq.json
@@ -4,6 +4,7 @@
     "Settings" : "Parametra",
     "Users" : "Përdoruesit",
     "Admin" : "Admin",
+    "Recommended" : "E rekomanduar",
     "Unknown filetype" : "Tip i panjohur skedari",
     "Invalid image" : "Imazh i pavlefshëm",
     "web services under your control" : "shërbime web nën kontrollin tënd",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index b16dbe013b8..d4871378c04 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Lokalizace nefunguje",
     "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Velmi doporučujeme nainstalovat požadované balíčky do systému, pro podporu jednoho z následujících národních prostředí: %s.",
     "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
     "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
     "Connectivity Checks" : "Ověřování připojení",
diff --git a/settings/l10n/cs_CZ.json b/settings/l10n/cs_CZ.json
index c6059695c26..572dd26dfe3 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Lokalizace nefunguje",
     "System locale can not be set to a one which supports UTF-8." : "Není možné nastavit znakovou sadu, která podporuje UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To znamená, že se mohou vyskytnout problémy s určitými znaky v názvech souborů.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Velmi doporučujeme nainstalovat požadované balíčky do systému, pro podporu jednoho z následujících národních prostředí: %s.",
     "URL generation in notification emails" : "Generování adresy URL v oznamovacích e-mailech",
     "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 \"overwritewebroot\" 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ě \"overwritewebroot\" (Doporučujeme: \"%s\")",
     "Connectivity Checks" : "Ověřování připojení",
diff --git a/settings/l10n/da.js b/settings/l10n/da.js
index 6f5112cad1f..67022dd176e 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Landestandard fungerer ikke",
     "System locale can not be set to a one which supports UTF-8." : "Systemets locale 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.",
     "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
     "Connectivity Checks" : "Forbindelsestjek",
diff --git a/settings/l10n/da.json b/settings/l10n/da.json
index 33deff944cb..48ee293e1ec 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Landestandard fungerer ikke",
     "System locale can not be set to a one which supports UTF-8." : "Systemets locale 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.",
     "URL generation in notification emails" : "URL-oprettelse i e-mailnotifikationer.",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" i din fil config.php til webrodens sti for din installation (foreslået værdi: \"%s\")",
     "Connectivity Checks" : "Forbindelsestjek",
diff --git a/settings/l10n/de.js b/settings/l10n/de.js
index 01068350307..e11aa7c23d7 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Ländereinstellung funktioniert nicht",
     "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
     "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
     "Connectivity Checks" : "Verbindungsüberprüfungen",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index b63775263e7..74c3f7cf970 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Ländereinstellung funktioniert nicht",
     "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
     "This means that there might be problems with certain characters in file names." : "Dies bedeutet, dass Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "URL-Generierung in Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Deine Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der URL-Generierung kommen. Um dies zu verhindern, setze bitte die \"overwritewebroot\"-Option in Deiner config.php auf das Web-Wurzelverzeichnis Deiner Installation (Vorschlag: \"%s\").",
     "Connectivity Checks" : "Verbindungsüberprüfungen",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index 7869e5583e9..a802c80f719 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Die Lokalisierung funktioniert nicht",
     "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
     "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
     "Connectivity Checks" : "Verbindungsüberprüfungen",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 9466f295c4a..0f1e8d07932 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Die Lokalisierung funktioniert nicht",
     "System locale can not be set to a one which supports UTF-8." : "Systemgebietsschema kann nicht auf eine UTF-8 unterstützende eingestellt werden.",
     "This means that there might be problems with certain characters in file names." : "Dieses bedeutet, dass es Probleme mit bestimmten Zeichen in den Dateinamen geben kann.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Wir empfehlen dringend, die erforderlichen Pakete auf Ihrem System zu installieren, damit eine der folgenden Gebietsschemas unterstützt wird: %s.",
     "URL generation in notification emails" : "Adresserstellung in E-Mail-Benachrichtungen",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Wenn sich Ihre Installation nicht im Wurzelverzeichnis der Domain befindet und Cron aus dem System genutzt wird, kann es zu Fehlern bei der Adresserstellung kommen. Um dieses zu verhindern, stellen Sie bitte die »overwritewebroot«-Option in Ihrer config.php auf das Internetwurzelverzeichnis Ihrer Installation (Vorschlag: »%s«).",
     "Connectivity Checks" : "Verbindungsüberprüfungen",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index 07f565291be..f33ccbcfdce 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Locale not working",
     "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
     "This means that there might be problems with certain characters in file names." : "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." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "URL generation in notification emails" : "URL generation in notification emails",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
     "Connectivity Checks" : "Connectivity Checks",
diff --git a/settings/l10n/en_GB.json b/settings/l10n/en_GB.json
index ca307c39c23..5ad52ed5b56 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Locale not working",
     "System locale can not be set to a one which supports UTF-8." : "System locale can not be set to a one which supports UTF-8.",
     "This means that there might be problems with certain characters in file names." : "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." : "We strongly suggest installing the required packages on your system to support one of the following locales: %s.",
     "URL generation in notification emails" : "URL generation in notification emails",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")",
     "Connectivity Checks" : "Connectivity Checks",
diff --git a/settings/l10n/es.js b/settings/l10n/es.js
index feb83325f3e..d49f8116bb7 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "La configuración regional no está funcionando",
     "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.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
     "Connectivity Checks" : "Probar la Conectividad",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 21b02b3797e..256e9fa7beb 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -115,6 +115,7 @@
     "Locale not working" : "La configuración regional no está funcionando",
     "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.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Es muy recomendable instalar los paquetes necesarios para poder soportar una de las siguientes configuraciones regionales: %s. ",
     "URL generation in notification emails" : "Generación de URL en mensajes de notificación",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" en su archivo config.php para que use la ruta de la raíz del sitio web de su instalación (sugerencia: \"%s\")",
     "Connectivity Checks" : "Probar la Conectividad",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 762eda8c7b4..3965f7e9159 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -114,6 +114,7 @@ OC.L10N.register(
     "Locale not working" : "Maa-asetus ei toimi",
     "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
     "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Suosittelemme asentamaan vaaditut paketit järjestelmään, jotta järjestelmässä on tuki yhdelle seuraavista maa-asetuksista: %s.",
     "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
     "No problems found" : "Ongelmia ei löytynyt",
     "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index fea5b3b00ae..4fc99b5fdf3 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -112,6 +112,7 @@
     "Locale not working" : "Maa-asetus ei toimi",
     "System locale can not be set to a one which supports UTF-8." : "Järjestelmän maa-asetusta ei voi asettaa UTF-8:aa tukevaksi.",
     "This means that there might be problems with certain characters in file names." : "Tämä tarkoittaa, että tiettyjen merkkien kanssa tiedostojen nimissä saattaa olla ongelmia.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Suosittelemme asentamaan vaaditut paketit järjestelmään, jotta järjestelmässä on tuki yhdelle seuraavista maa-asetuksista: %s.",
     "URL generation in notification emails" : "Verkko-osoitteiden luominen sähköposti-ilmoituksissa",
     "No problems found" : "Ongelmia ei löytynyt",
     "Please double check the <a href='%s'>installation guides</a>." : "Lue tarkasti <a href='%s'>asennusohjeet</a>.",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 91d79356a1e..2748c43298d 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Locale non funzionante",
     "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.",
     "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
     "Connectivity Checks" : "Controlli di connettività",
diff --git a/settings/l10n/it.json b/settings/l10n/it.json
index d34110e6162..f8e94b7288e 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Locale non funzionante",
     "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.",
     "URL generation in notification emails" : "Generazione di URL nelle email di notifica",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\"  nel file config.php al percorso della radice del sito della tua installazione (Suggerito: \"%s\")",
     "Connectivity Checks" : "Controlli di connettività",
diff --git a/settings/l10n/pt_BR.js b/settings/l10n/pt_BR.js
index 81be17f00cb..1d280fa1439 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Localização não funcionando",
     "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.",
     "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
     "Connectivity Checks" : "Verificações de Conectividade",
diff --git a/settings/l10n/pt_BR.json b/settings/l10n/pt_BR.json
index 440cb24b158..3746bb162dc 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Localização não funcionando",
     "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.",
     "URL generation in notification emails" : "Geração de URL em e-mails de notificação",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" em seu arquivo config.php para o caminho webroot de sua instalação (Sugestão: \"%s\")",
     "Connectivity Checks" : "Verificações de Conectividade",
diff --git a/settings/l10n/ru.js b/settings/l10n/ru.js
index 0ea525bf955..1ad8c854126 100644
--- a/settings/l10n/ru.js
+++ b/settings/l10n/ru.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Локализация не работает",
     "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.",
     "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
     "Connectivity Checks" : "Проверка соединения",
@@ -221,6 +222,7 @@ OC.L10N.register(
     "Create" : "Создать",
     "Admin Recovery Password" : "Восстановление пароля администратора",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+    "Search Users" : "Искать пользователей",
     "Add Group" : "Добавить группу",
     "Group" : "Группа",
     "Everyone" : "Все",
diff --git a/settings/l10n/ru.json b/settings/l10n/ru.json
index 0c9ae6e5b27..c1703281413 100644
--- a/settings/l10n/ru.json
+++ b/settings/l10n/ru.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Локализация не работает",
     "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.",
     "URL generation in notification emails" : "Генерирование URL в уведомляющих электронных письмах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Если ваша копия ownCloud установлена не в корне домена и использует планировщик cron системы, возможны проблемы с правильной генерацией URL. Чтобы избежать этого, установите опцию verwritewebroot файла config.php равной пути папки установки. (Вероятно, это \"%s\".)",
     "Connectivity Checks" : "Проверка соединения",
@@ -219,6 +220,7 @@
     "Create" : "Создать",
     "Admin Recovery Password" : "Восстановление пароля администратора",
     "Enter the recovery password in order to recover the users files during password change" : "Введите пароль для того, чтобы восстановить файлы пользователей при смене пароля",
+    "Search Users" : "Искать пользователей",
     "Add Group" : "Добавить группу",
     "Group" : "Группа",
     "Everyone" : "Все",
diff --git a/settings/l10n/sl.js b/settings/l10n/sl.js
index 74f41f79bc3..4e1ebd512ed 100644
--- a/settings/l10n/sl.js
+++ b/settings/l10n/sl.js
@@ -113,6 +113,7 @@ OC.L10N.register(
     "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+    "URL generation in notification emails" : "Ustvarjanje naslova URL v elektronskih sporočilih",
     "Connectivity Checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
@@ -211,6 +212,7 @@ OC.L10N.register(
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
     "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+    "Search Users" : "Poišči med uporabniki",
     "Add Group" : "Dodaj skupino",
     "Group" : "Skupina",
     "Everyone" : "Vsi",
diff --git a/settings/l10n/sl.json b/settings/l10n/sl.json
index 0a539fcde4f..417ef5f6a1f 100644
--- a/settings/l10n/sl.json
+++ b/settings/l10n/sl.json
@@ -111,6 +111,7 @@
     "Locale not working" : "Jezikovne prilagoditve ne delujejo.",
     "System locale can not be set to a one which supports UTF-8." : "Sistemskih jezikovnih nastavitev ni mogoče nastaviti na možnost, ki podpira nabor UTF-8.",
     "This means that there might be problems with certain characters in file names." : "To pomeni, da se lahko pojavijo napake pri nekaterih znakih v imenih datotek.",
+    "URL generation in notification emails" : "Ustvarjanje naslova URL v elektronskih sporočilih",
     "Connectivity Checks" : "Preverjanje povezav",
     "No problems found" : "Ni zaznanih težav",
     "Please double check the <a href='%s'>installation guides</a>." : "Preverite <a href='%s'>navodila namestitve</a>.",
@@ -209,6 +210,7 @@
     "Create" : "Ustvari",
     "Admin Recovery Password" : "Obnovitev skrbniškega gesla",
     "Enter the recovery password in order to recover the users files during password change" : "Vnesite geslo, ki omogoča obnovitev uporabniških datotek med spreminjanjem gesla",
+    "Search Users" : "Poišči med uporabniki",
     "Add Group" : "Dodaj skupino",
     "Group" : "Skupina",
     "Everyone" : "Vsi",
diff --git a/settings/l10n/sq.js b/settings/l10n/sq.js
index ec4d9667170..fbb926feeb7 100644
--- a/settings/l10n/sq.js
+++ b/settings/l10n/sq.js
@@ -1,17 +1,29 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Paralajmërimet e Sigurisë dhe Konfigurimit",
     "Cron" : "Cron",
     "Sharing" : "Ndarje",
     "Security" : "Siguria",
+    "Email Server" : "Serveri Email",
     "Log" : "Historik aktiviteti",
     "Authentication error" : "Gabim autentifikimi",
+    "Your full name has been changed." : "Emri juaj i plotë ka ndryshuar.",
+    "Unable to change full name" : "Nuk mund të ndryshohet emri i plotë",
     "Group already exists" : "Grupi ekziston",
     "Unable to add group" : "E pamundur të shtohet grupi",
+    "Files decrypted successfully" : "Skedarët janë dëshifruar me sukses",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nuk mund të dëshifrohen skedarët tuaj, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
+    "Couldn't decrypt your files, check your password and try again" : "Nuk mund të dëshifrohen skedarët tuaj, ju lutem kontrolloni fjalëkalimin tuaj dhe provoni përsëri.",
+    "Encryption keys deleted permanently" : "Çelësat e shifrimit u fshinë përfundimisht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nuk mund të fshihen përfundimisht çelësat tuaj të shifrimit, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
+    "Couldn't remove app." : "Nuk mund të hiqet aplikacioni.",
     "Email saved" : "Email u ruajt",
     "Invalid email" : "Email jo i vlefshëm",
     "Unable to delete group" : "E pamundur të fshihet grupi",
     "Unable to delete user" : "E pamundur të fshihet përdoruesi",
+    "Backups restored successfully" : "Kopjet rezervë u restauruan me sukses",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nuk mund të restaurohen çelësat tuaj të shifrimit, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
     "Language changed" : "Gjuha u ndryshua",
     "Invalid request" : "Kërkesë e pavlefshme",
     "Admins can't remove themself from the admin group" : "Administratorët nuk mund të heqin vehten prej grupit admin",
@@ -19,8 +31,16 @@ OC.L10N.register(
     "Unable to remove user from group %s" : "E pamundur të hiqet përdoruesi nga grupi %s",
     "Couldn't update app." : "E pamundur të përditësohet app.",
     "Wrong password" : "Fjalëkalim i gabuar",
+    "No user supplied" : "Nuk është dhënë asnjë përdorues",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ju lutem jepni një fjalëkalim restaurimi administrativ, në të kundërt të gjitha të dhënat do humbasin",
+    "Wrong admin recovery password. Please check the password and try again." : "Fjalëkalim i gabuar restaurimi administrativ. Ju lutem kontrolloni fjalëkalimin dhe provoni përsëri.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Paneli i kontrollit nuk mbështet ndryshimin e fjalëkalimit, por çelësi i shifrimit të përdoruesit u modifikua me sukses.",
     "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet",
+    "Enabled" : "Aktivizuar",
+    "Not enabled" : "Jo aktive",
+    "Recommended" : "E rekomanduar",
     "Saved" : "U ruajt",
+    "test email settings" : "parametra test për email",
     "Email sent" : "Email-i u dërgua",
     "Sending..." : "Duke dërguar",
     "All" : "Të gjitha",
@@ -31,6 +51,11 @@ OC.L10N.register(
     "Error while updating app" : "Gabim gjatë përditësimit të app",
     "Updated" : "I përditësuar",
     "Select a profile picture" : "Zgjidh një foto profili",
+    "Very weak password" : "Fjalëkalim shumë i dobët",
+    "Weak password" : "Fjalëkalim i dobët",
+    "So-so password" : "Fjalëkalim i pranueshëm",
+    "Good password" : "Fjalëkalim i mirë",
+    "Strong password" : "Fjalëkalim shumë i mirë",
     "Delete" : "Fshi",
     "Groups" : "Grupet",
     "deleted {groupName}" : "u fshi {groupName}",
diff --git a/settings/l10n/sq.json b/settings/l10n/sq.json
index 4c8a590d48c..2fa9c2f6d17 100644
--- a/settings/l10n/sq.json
+++ b/settings/l10n/sq.json
@@ -1,15 +1,27 @@
 { "translations": {
+    "Security & Setup Warnings" : "Paralajmërimet e Sigurisë dhe Konfigurimit",
     "Cron" : "Cron",
     "Sharing" : "Ndarje",
     "Security" : "Siguria",
+    "Email Server" : "Serveri Email",
     "Log" : "Historik aktiviteti",
     "Authentication error" : "Gabim autentifikimi",
+    "Your full name has been changed." : "Emri juaj i plotë ka ndryshuar.",
+    "Unable to change full name" : "Nuk mund të ndryshohet emri i plotë",
     "Group already exists" : "Grupi ekziston",
     "Unable to add group" : "E pamundur të shtohet grupi",
+    "Files decrypted successfully" : "Skedarët janë dëshifruar me sukses",
+    "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Nuk mund të dëshifrohen skedarët tuaj, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
+    "Couldn't decrypt your files, check your password and try again" : "Nuk mund të dëshifrohen skedarët tuaj, ju lutem kontrolloni fjalëkalimin tuaj dhe provoni përsëri.",
+    "Encryption keys deleted permanently" : "Çelësat e shifrimit u fshinë përfundimisht",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Nuk mund të fshihen përfundimisht çelësat tuaj të shifrimit, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
+    "Couldn't remove app." : "Nuk mund të hiqet aplikacioni.",
     "Email saved" : "Email u ruajt",
     "Invalid email" : "Email jo i vlefshëm",
     "Unable to delete group" : "E pamundur të fshihet grupi",
     "Unable to delete user" : "E pamundur të fshihet përdoruesi",
+    "Backups restored successfully" : "Kopjet rezervë u restauruan me sukses",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nuk mund të restaurohen çelësat tuaj të shifrimit, ju lutem kontrolloni owncloud.log ose pyesni administratorin tuaj.",
     "Language changed" : "Gjuha u ndryshua",
     "Invalid request" : "Kërkesë e pavlefshme",
     "Admins can't remove themself from the admin group" : "Administratorët nuk mund të heqin vehten prej grupit admin",
@@ -17,8 +29,16 @@
     "Unable to remove user from group %s" : "E pamundur të hiqet përdoruesi nga grupi %s",
     "Couldn't update app." : "E pamundur të përditësohet app.",
     "Wrong password" : "Fjalëkalim i gabuar",
+    "No user supplied" : "Nuk është dhënë asnjë përdorues",
+    "Please provide an admin recovery password, otherwise all user data will be lost" : "Ju lutem jepni një fjalëkalim restaurimi administrativ, në të kundërt të gjitha të dhënat do humbasin",
+    "Wrong admin recovery password. Please check the password and try again." : "Fjalëkalim i gabuar restaurimi administrativ. Ju lutem kontrolloni fjalëkalimin dhe provoni përsëri.",
+    "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Paneli i kontrollit nuk mbështet ndryshimin e fjalëkalimit, por çelësi i shifrimit të përdoruesit u modifikua me sukses.",
     "Unable to change password" : "Fjalëkalimi nuk mund të ndryshohet",
+    "Enabled" : "Aktivizuar",
+    "Not enabled" : "Jo aktive",
+    "Recommended" : "E rekomanduar",
     "Saved" : "U ruajt",
+    "test email settings" : "parametra test për email",
     "Email sent" : "Email-i u dërgua",
     "Sending..." : "Duke dërguar",
     "All" : "Të gjitha",
@@ -29,6 +49,11 @@
     "Error while updating app" : "Gabim gjatë përditësimit të app",
     "Updated" : "I përditësuar",
     "Select a profile picture" : "Zgjidh një foto profili",
+    "Very weak password" : "Fjalëkalim shumë i dobët",
+    "Weak password" : "Fjalëkalim i dobët",
+    "So-so password" : "Fjalëkalim i pranueshëm",
+    "Good password" : "Fjalëkalim i mirë",
+    "Strong password" : "Fjalëkalim shumë i mirë",
     "Delete" : "Fshi",
     "Groups" : "Grupet",
     "deleted {groupName}" : "u fshi {groupName}",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 273874bdfe3..0b6660fd076 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Yerel çalışmıyor",
     "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.",
     "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
     "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "Connectivity Checks" : "Bağlantı Kontrolleri",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 9aec853988f..26f39922609 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Yerel çalışmıyor",
     "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.",
     "URL generation in notification emails" : "Bildirim e-postalarında URL oluşturulması",
     "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 \"overwritewebroot\" 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 olabilir. Bu sorunların önüne geçmek için, kurulumunuzun web kök yolundaki config.php dosyasında \"overwritewebroot\" seçeneğini ayarlayın (Önerilen: \"%s\")",
     "Connectivity Checks" : "Bağlantı Kontrolleri",
-- 
GitLab


From a3496cf7fab6f4e9d4ce804e3b3ce0fc83a863dc Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 23 Nov 2014 01:54:39 -0500
Subject: [PATCH 514/616] [tx-robot] updated from transifex

---
 settings/l10n/nl.js   | 1 +
 settings/l10n/nl.json | 1 +
 2 files changed, 2 insertions(+)

diff --git a/settings/l10n/nl.js b/settings/l10n/nl.js
index 21bd2f1ec7a..8e38125bb43 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Taalbestand werkt niet",
     "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.",
     "URL generation in notification emails" : "URL genereren in notificatie e-mails",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "Connectivity Checks" : "Verbindingscontroles",
diff --git a/settings/l10n/nl.json b/settings/l10n/nl.json
index 75870735391..8d5ef3d25e3 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Taalbestand werkt niet",
     "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.",
     "URL generation in notification emails" : "URL genereren in notificatie e-mails",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" optie in config.php moeten instellen op het webroot pad van uw ownCloud (aanbevolen: \"%s\") ",
     "Connectivity Checks" : "Verbindingscontroles",
-- 
GitLab


From 45d985f2d8f3df26960b36e7cb6d75513e5e7dfc Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Sun, 23 Nov 2014 19:11:03 +0100
Subject: [PATCH 515/616] remove ugly hack and don't use OC\Preview\Image for
 tiffs and svgs

---
 lib/private/preview.php       | 10 ----------
 lib/private/preview/image.php |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index f50bdcb4c9e..778007b21fd 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -892,16 +892,6 @@ class Preview {
 			self::initProviders();
 		}
 
-		// FIXME: Ugly hack to prevent SVG of being returned if the SVG
-		// provider is not enabled.
-		// This is required because the preview system is designed in a
-		// bad way and relies on opt-in with asterisks (i.e. image/*)
-		// which will lead to the fact that a SVG will also match the image
-		// provider.
-		if($mimeType === 'image/svg+xml' && !array_key_exists('/image\/svg\+xml/', self::$providers)) {
-			return false;
-		}
-
 		foreach(self::$providers as $supportedMimetype => $provider) {
 			if(preg_match($supportedMimetype, $mimeType)) {
 				return true;
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index ec5b87befea..7bcbddc649e 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -11,7 +11,7 @@ namespace OC\Preview;
 class Image extends Provider {
 
 	public function getMimeType() {
-		return '/image\/.*/';
+		return '/image\/(?!tiff$)(?!svg.*).*/';
 	}
 
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-- 
GitLab


From 03a975a080722d600a15f594a55630d2f0e51bb5 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Sun, 23 Nov 2014 22:00:33 +0100
Subject: [PATCH 516/616] add puphpet and vagrant to gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index c0d44301d57..93bacf9b07e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -92,6 +92,12 @@ nbproject
 /build/jsdocs/
 /npm-debug.log
 
+# puphpet
+puphpet
+
+# vagrant
+.vagrant
+Vagrantfile
 
 # Tests - auto-generated files
 /data-autotest
-- 
GitLab


From 0edcfc1dc119a401cd88f5909e0952b31418b00f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 24 Nov 2014 01:54:35 -0500
Subject: [PATCH 517/616] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/ru.js   | 5 ++++-
 apps/files_sharing/l10n/ru.json | 5 ++++-
 core/l10n/sk_SK.js              | 1 +
 core/l10n/sk_SK.json            | 1 +
 lib/l10n/fr.js                  | 2 +-
 lib/l10n/fr.json                | 2 +-
 lib/l10n/sk_SK.js               | 2 ++
 lib/l10n/sk_SK.json             | 2 ++
 settings/l10n/fr.js             | 1 +
 settings/l10n/fr.json           | 1 +
 10 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/apps/files_sharing/l10n/ru.js b/apps/files_sharing/l10n/ru.js
index f6a24253590..f8a73755cd1 100644
--- a/apps/files_sharing/l10n/ru.js
+++ b/apps/files_sharing/l10n/ru.js
@@ -33,6 +33,9 @@ OC.L10N.register(
     "Add to your ownCloud" : "Добавить в свой ownCloud",
     "Download" : "Скачать",
     "Download %s" : "Скачать %s",
-    "Direct link" : "Прямая ссылка"
+    "Direct link" : "Прямая ссылка",
+    "Server-to-Server Sharing" : "Общий доступ Сервер-Сервер",
+    "Allow users on this server to send shares to other servers" : "Разрешить пользователям на этом сервере отправлять файлы на другие сервера",
+    "Allow users on this server to receive shares from other servers" : "Разрешить пользователям на том сервере получать файлы с других серверов"
 },
 "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/ru.json b/apps/files_sharing/l10n/ru.json
index 9eaf51586d4..ab20e0c3e92 100644
--- a/apps/files_sharing/l10n/ru.json
+++ b/apps/files_sharing/l10n/ru.json
@@ -31,6 +31,9 @@
     "Add to your ownCloud" : "Добавить в свой ownCloud",
     "Download" : "Скачать",
     "Download %s" : "Скачать %s",
-    "Direct link" : "Прямая ссылка"
+    "Direct link" : "Прямая ссылка",
+    "Server-to-Server Sharing" : "Общий доступ Сервер-Сервер",
+    "Allow users on this server to send shares to other servers" : "Разрешить пользователям на этом сервере отправлять файлы на другие сервера",
+    "Allow users on this server to receive shares from other servers" : "Разрешить пользователям на том сервере получать файлы с других серверов"
 },"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/sk_SK.js b/core/l10n/sk_SK.js
index 28e3a3b4a4d..791863c0e48 100644
--- a/core/l10n/sk_SK.js
+++ b/core/l10n/sk_SK.js
@@ -173,6 +173,7 @@ OC.L10N.register(
     "SQLite will be used as database. For larger installations we recommend to change this." : "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
     "Finish setup" : "Dokončiť inštaláciu",
     "Finishing …" : "Dokončujem...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Táto aplikácia potrebuje JavaScript pre správne fungovanie. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">zapnite si JavaScript</a> a obnovte stránku",
     "%s is available. Get more information on how to update." : "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
     "Log out" : "Odhlásiť",
     "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!",
diff --git a/core/l10n/sk_SK.json b/core/l10n/sk_SK.json
index 17daa232693..6a539ccd773 100644
--- a/core/l10n/sk_SK.json
+++ b/core/l10n/sk_SK.json
@@ -171,6 +171,7 @@
     "SQLite will be used as database. For larger installations we recommend to change this." : "Ako databáza bude použitá SQLite. Pri väčších inštaláciách odporúčame zmeniť na inú.",
     "Finish setup" : "Dokončiť inštaláciu",
     "Finishing …" : "Dokončujem...",
+    "This application requires JavaScript for correct operation. Please <a href=\"http://enable-javascript.com/\" target=\"_blank\">enable JavaScript</a> and reload the page." : "Táto aplikácia potrebuje JavaScript pre správne fungovanie. Prosím <a href=\"http://enable-javascript.com/\" target=\"_blank\">zapnite si JavaScript</a> a obnovte stránku",
     "%s is available. Get more information on how to update." : "%s je dostupná. Získajte viac informácií o postupe aktualizácie.",
     "Log out" : "Odhlásiť",
     "Server side authentication failed!" : "Autentifikácia na serveri zlyhala!",
diff --git a/lib/l10n/fr.js b/lib/l10n/fr.js
index ec7e949abcc..18a20a37148 100644
--- a/lib/l10n/fr.js
+++ b/lib/l10n/fr.js
@@ -102,7 +102,7 @@ OC.L10N.register(
     "Cannot create \"data\" directory (%s)" : "Impossible de créer le répertoire \"data\" (%s)",
     "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ce problème est généralement résolu <a href=\"%s\" target=\"_blank\">en donnant au serveur web un accès en écriture au répertoire racine</a>.",
     "Setting locale to %s failed" : "Le choix de la langue pour %s a échoué",
-    "Please install one of these locales on your system and restart your webserver." : "Veuillez installer l'une de ces langues sur votre système et redémarrer votre serveur web.",
+    "Please install one of these locales on your system and restart your webserver." : "Veuillez installer l'un de ces paramètres régionaux sur votre système et redémarrer votre serveur web.",
     "Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.",
     "PHP module %s not installed." : "Le module PHP %s n’est pas installé.",
     "PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
diff --git a/lib/l10n/fr.json b/lib/l10n/fr.json
index ecba239d076..b8cecae6c5d 100644
--- a/lib/l10n/fr.json
+++ b/lib/l10n/fr.json
@@ -100,7 +100,7 @@
     "Cannot create \"data\" directory (%s)" : "Impossible de créer le répertoire \"data\" (%s)",
     "This can usually be fixed by <a href=\"%s\" target=\"_blank\">giving the webserver write access to the root directory</a>." : "Ce problème est généralement résolu <a href=\"%s\" target=\"_blank\">en donnant au serveur web un accès en écriture au répertoire racine</a>.",
     "Setting locale to %s failed" : "Le choix de la langue pour %s a échoué",
-    "Please install one of these locales on your system and restart your webserver." : "Veuillez installer l'une de ces langues sur votre système et redémarrer votre serveur web.",
+    "Please install one of these locales on your system and restart your webserver." : "Veuillez installer l'un de ces paramètres régionaux sur votre système et redémarrer votre serveur web.",
     "Please ask your server administrator to install the module." : "Veuillez demander à votre administrateur d’installer le module.",
     "PHP module %s not installed." : "Le module PHP %s n’est pas installé.",
     "PHP %s or higher is required." : "PHP %s ou supérieur est requis.",
diff --git a/lib/l10n/sk_SK.js b/lib/l10n/sk_SK.js
index a2e87c5b631..ec902af2641 100644
--- a/lib/l10n/sk_SK.js
+++ b/lib/l10n/sk_SK.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Nešpecifikované meno aplikácie",
     "Unknown filetype" : "Neznámy typ súboru",
     "Invalid image" : "Chybný obrázok",
+    "Database Error" : "Error databázy",
+    "Please contact your system administrator." : "Prosím kontaktujte administrátora.",
     "web services under your control" : "webové služby pod Vašou kontrolou",
     "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",
diff --git a/lib/l10n/sk_SK.json b/lib/l10n/sk_SK.json
index 84ab8c4a007..e2c219d5a1c 100644
--- a/lib/l10n/sk_SK.json
+++ b/lib/l10n/sk_SK.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Nešpecifikované meno aplikácie",
     "Unknown filetype" : "Neznámy typ súboru",
     "Invalid image" : "Chybný obrázok",
+    "Database Error" : "Error databázy",
+    "Please contact your system administrator." : "Prosím kontaktujte administrátora.",
     "web services under your control" : "webové služby pod Vašou kontrolou",
     "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",
diff --git a/settings/l10n/fr.js b/settings/l10n/fr.js
index 5a99912aeed..816b9e88565 100644
--- a/settings/l10n/fr.js
+++ b/settings/l10n/fr.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Localisation non fonctionnelle",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas ê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 requis à la prise en charge de l'un des paramètres régionaux suivants : %s",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "Connectivity Checks" : "Vérification de la connectivité",
diff --git a/settings/l10n/fr.json b/settings/l10n/fr.json
index 433816d2316..1bc80fc4d01 100644
--- a/settings/l10n/fr.json
+++ b/settings/l10n/fr.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Localisation non fonctionnelle",
     "System locale can not be set to a one which supports UTF-8." : "Les paramètres régionaux ne peuvent pas ê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 requis à la prise en charge de l'un des paramètres régionaux suivants : %s",
     "URL generation in notification emails" : "Génération d'URL dans les mails de notification",
     "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 \"overwritewebroot\" 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 \"overwritewebroot\" de votre fichier config.php avec le chemin de la racine de votre installation (suggéré : \"%s\")",
     "Connectivity Checks" : "Vérification de la connectivité",
-- 
GitLab


From 216d617938705d27c84939935030dd12e4886438 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 24 Nov 2014 10:53:45 +0100
Subject: [PATCH 518/616] Remove OC_Migrate

This is unused legacy code. Let it die with ~~~honor~~ fire.

Fixes https://github.com/owncloud/core/issues/12346
---
 lib/private/migrate.php            | 626 -----------------------------
 lib/private/migration/content.php  | 246 ------------
 lib/private/migration/provider.php |  52 ---
 tests/lib/migrate.php              |  98 -----
 4 files changed, 1022 deletions(-)
 delete mode 100644 lib/private/migrate.php
 delete mode 100644 lib/private/migration/content.php
 delete mode 100644 lib/private/migration/provider.php
 delete mode 100644 tests/lib/migrate.php

diff --git a/lib/private/migrate.php b/lib/private/migrate.php
deleted file mode 100644
index 8351155aa55..00000000000
--- a/lib/private/migrate.php
+++ /dev/null
@@ -1,626 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Tom Needham
- * @copyright 2012 Tom Needham tom@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/>.
- *
- */
-
-
-/**
- * provides an interface to migrate users and whole ownclouds
- */
-class OC_Migrate{
-
-
-	// Array of OC_Migration_Provider objects
-	static private $providers=array();
-	// User id of the user to import/export
-	static private $uid=false;
-	// Holds the ZipArchive object
-	static private $zip=false;
-	// Stores the type of export
-	static private $exporttype=false;
-	// Holds the db object
-	static private $migration_database=false;
-	// Path to the sqlite db
-	static private $dbpath=false;
-	// Holds the path to the zip file
-	static private $zippath=false;
-	// Holds the OC_Migration_Content object
-	static private $content=false;
-
-	/**
-	 * register a new migration provider
-	 * @param OC_Migration_Provider $provider
-	 */
-	public static function registerProvider($provider) {
-		self::$providers[]=$provider;
-	}
-
-	/**
-	* finds and loads the providers
-	*/
-	static private function findProviders() {
-		// Find the providers
-		$apps = OC_App::getAllApps();
-
-		foreach($apps as $app) {
-			$path = OC_App::getAppPath($app) . '/appinfo/migrate.php';
-			if( file_exists( $path ) ) {
-				include_once $path;
-			}
-		}
-	}
-
-	/**
-	 * exports a user, or owncloud instance
-	 * @param string $uid user id of user to export if export type is user, defaults to current
-	 * @param string $type type of export, defualts to user
-	 * @param string $path path to zip output folder
-	 * @return string on error, path to zip on success
-	 */
-	public static function export( $uid=null, $type='user', $path=null ) {
-		$datadir = OC_Config::getValue( 'datadirectory' );
-		// Validate export type
-		$types = array( 'user', 'instance', 'system', 'userfiles' );
-		if( !in_array( $type, $types ) ) {
-			OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR );
-			return json_encode( array( 'success' => false )  );
-		}
-		self::$exporttype = $type;
-		// Userid?
-		if( self::$exporttype == 'user' ) {
-			// Check user exists
-			self::$uid = is_null($uid) ? OC_User::getUser() : $uid;
-			if(!OC_User::userExists(self::$uid)) {
-				return json_encode( array( 'success' => false) );
-			}
-		}
-		// Calculate zipname
-		if( self::$exporttype == 'user' ) {
-			$zipname = 'oc_export_' . self::$uid . '_' . date("y-m-d_H-i-s") . '.zip';
-		} else {
-			$zipname = 'oc_export_' . self::$exporttype . '_' . date("y-m-d_H-i-s") . '.zip';
-		}
-		// Calculate path
-		if( self::$exporttype == 'user' ) {
-			self::$zippath = $datadir . '/' . self::$uid . '/' . $zipname;
-		} else {
-			if( !is_null( $path ) ) {
-				// Validate custom path
-				if( !file_exists( $path ) || !is_writeable( $path ) ) {
-					OC_Log::write( 'migration', 'Path supplied is invalid.', OC_Log::ERROR );
-					return json_encode( array( 'success' => false ) );
-				}
-				self::$zippath = $path . $zipname;
-			} else {
-				// Default path
-				self::$zippath = get_temp_dir() . '/' . $zipname;
-			}
-		}
-		// Create the zip object
-		if( !self::createZip() ) {
-			return json_encode( array( 'success' => false ) );
-		}
-		// Do the export
-		self::findProviders();
-		$exportdata = array();
-		switch( self::$exporttype ) {
-			case 'user':
-				// Connect to the db
-				self::$dbpath = $datadir . '/' . self::$uid . '/migration.db';
-				if( !self::connectDB() ) {
-					return json_encode( array( 'success' => false ) );
-				}
-				self::$content = new OC_Migration_Content( self::$zip, self::$migration_database );
-				// Export the app info
-				$exportdata = self::exportAppData();
-				// Add the data dir to the zip
-				self::$content->addDir(OC_User::getHome(self::$uid), true, '/' );
-				break;
-			case 'instance':
-				self::$content = new OC_Migration_Content( self::$zip );
-				// Creates a zip that is compatable with the import function
-				$dbfile = tempnam( get_temp_dir(), "owncloud_export_data_" );
-				OC_DB::getDbStructure( $dbfile, 'MDB2_SCHEMA_DUMP_ALL');
-
-				// Now add in *dbname* and *dbprefix*
-				$dbexport = file_get_contents( $dbfile );
-				$dbnamestring = "<database>\n\n <name>" . OC_Config::getValue( "dbname", "owncloud" );
-				$dbtableprefixstring = "<table>\n\n  <name>" . OC_Config::getValue( "dbtableprefix", "oc_" );
-				$dbexport = str_replace( $dbnamestring, "<database>\n\n <name>*dbname*", $dbexport );
-				$dbexport = str_replace( $dbtableprefixstring, "<table>\n\n  <name>*dbprefix*", $dbexport );
-				// Add the export to the zip
-				self::$content->addFromString( $dbexport, "dbexport.xml" );
-				// Add user data
-				foreach(OC_User::getUsers() as $user) {
-					self::$content->addDir(OC_User::getHome($user), true, "/userdata/" );
-				}
-				break;
-			case 'userfiles':
-				self::$content = new OC_Migration_Content( self::$zip );
-				// Creates a zip with all of the users files
-				foreach(OC_User::getUsers() as $user) {
-					self::$content->addDir(OC_User::getHome($user), true, "/" );
-				}
-				break;
-			case 'system':
-				self::$content = new OC_Migration_Content( self::$zip );
-				// Creates a zip with the owncloud system files
-				self::$content->addDir( OC::$SERVERROOT . '/', false, '/');
-				foreach (array(
-					".git",
-					"3rdparty",
-					"apps",
-					"core",
-					"files",
-					"l10n",
-					"lib",
-					"ocs",
-					"search",
-					"settings",
-					"tests"
-				) as $dir) {
-					self::$content->addDir( OC::$SERVERROOT . '/' . $dir, true, "/");
-				}
-				break;
-		}
-		if( !$info = self::getExportInfo( $exportdata ) ) {
-			return json_encode( array( 'success' => false ) );
-		}
-		// Add the export info json to the export zip
-		self::$content->addFromString( $info, 'export_info.json' );
-		if( !self::$content->finish() ) {
-			return json_encode( array( 'success' => false ) );
-		}
-		return json_encode( array( 'success' => true, 'data' => self::$zippath ) );
-	}
-
-	/**
-	 * imports a user, or owncloud instance
-	 * @param string $path path to zip
-	 * @param string $type type of import (user or instance)
-	 * @param string|null|int $uid userid of new user
-	 * @return string
-	 */
-	public static function import( $path, $type='user', $uid=null ) {
-
-		$datadir = OC_Config::getValue( 'datadirectory' );
-		// Extract the zip
-		if( !$extractpath = self::extractZip( $path ) ) {
-			return json_encode( array( 'success' => false ) );
-		}
-		// Get export_info.json
-		$scan = scandir( $extractpath );
-		// Check for export_info.json
-		if( !in_array( 'export_info.json', $scan ) ) {
-			OC_Log::write( 'migration', 'Invalid import file, export_info.json not found', OC_Log::ERROR );
-			return json_encode( array( 'success' => false ) );
-		}
-		$json = json_decode( file_get_contents( $extractpath . 'export_info.json' ) );
-		if( $json->exporttype != $type ) {
-			OC_Log::write( 'migration', 'Invalid import file', OC_Log::ERROR );
-			return json_encode( array( 'success' => false ) );
-		}
-		self::$exporttype = $type;
-
-		$currentuser = OC_User::getUser();
-
-		// Have we got a user if type is user
-		if( self::$exporttype == 'user' ) {
-			self::$uid = !is_null($uid) ? $uid : $currentuser;
-		}
-
-		// We need to be an admin if we are not importing our own data
-		if(($type == 'user' && self::$uid != $currentuser) || $type != 'user' ) {
-			if( !OC_User::isAdminUser($currentuser)) {
-				// Naughty.
-				OC_Log::write( 'migration', 'Import not permitted.', OC_Log::ERROR );
-				return json_encode( array( 'success' => false ) );
-			}
-		}
-
-		// Handle export types
-		switch( self::$exporttype ) {
-			case 'user':
-				// Check user availability
-				if( !OC_User::userExists( self::$uid ) ) {
-					OC_Log::write( 'migration', 'User doesn\'t exist', OC_Log::ERROR );
-					return json_encode( array( 'success' => false ) );
-				}
-
-				// Check if the username is valid
-				if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $json->exporteduser )) {
-					OC_Log::write( 'migration', 'Username is not valid', OC_Log::ERROR );
-					return json_encode( array( 'success' => false ) );
-				}
-
-				// Copy data
-				$userfolder = $extractpath . $json->exporteduser;
-				$newuserfolder = $datadir . '/' . self::$uid;
-				foreach(scandir($userfolder) as $file){
-					if($file !== '.' && $file !== '..' && is_dir($userfolder.'/'.$file)) {
-						$file = str_replace(array('/', '\\'), '',  $file);
-
-						// Then copy the folder over
-						OC_Helper::copyr($userfolder.'/'.$file, $newuserfolder.'/'.$file);
-					}
-				}
-				// Import user app data
-				if(file_exists($extractpath . $json->exporteduser . '/migration.db')) {
-					if( !$appsimported = self::importAppData( $extractpath . $json->exporteduser . '/migration.db',
-						$json,
-						self::$uid ) ) {
-						return json_encode( array( 'success' => false ) );
-					}
-				}
-				// All done!
-				if( !self::unlink_r( $extractpath ) ) {
-					OC_Log::write( 'migration', 'Failed to delete the extracted zip', OC_Log::ERROR );
-				}
-				return json_encode( array( 'success' => true, 'data' => $appsimported ) );
-				break;
-			case 'instance':
-					/*
-					 * EXPERIMENTAL
-					// Check for new data dir and dbexport before doing anything
-					// TODO
-
-					// Delete current data folder.
-					OC_Log::write( 'migration', "Deleting current data dir", OC_Log::INFO );
-					if( !self::unlink_r( $datadir, false ) ) {
-						OC_Log::write( 'migration', 'Failed to delete the current data dir', OC_Log::ERROR );
-						return json_encode( array( 'success' => false ) );
-					}
-
-					// Copy over data
-					if( !self::copy_r( $extractpath . 'userdata', $datadir ) ) {
-						OC_Log::write( 'migration', 'Failed to copy over data directory', OC_Log::ERROR );
-						return json_encode( array( 'success' => false ) );
-					}
-
-					// Import the db
-					if( !OC_DB::replaceDB( $extractpath . 'dbexport.xml' ) ) {
-						return json_encode( array( 'success' => false ) );
-					}
-					// Done
-					return json_encode( array( 'success' => true ) );
-					*/
-				break;
-		}
-
-	}
-
-	/**
-	* recursively deletes a directory
-	* @param string $dir path of dir to delete
-	* @param bool $deleteRootToo delete the root directory
-	* @return bool
-	*/
-	private static function unlink_r( $dir, $deleteRootToo=true ) {
-		if( !$dh = @opendir( $dir ) ) {
-			return false;
-		}
-		while (false !== ($obj = readdir($dh))) {
-			if($obj == '.' || $obj == '..') {
-				continue;
-			}
-			if (!@unlink($dir . '/' . $obj)) {
-				self::unlink_r($dir.'/'.$obj, true);
-			}
-		}
-		closedir($dh);
-		if ( $deleteRootToo ) {
-			@rmdir($dir);
-		}
-		return true;
-	}
-
-	/**
-	* tries to extract the import zip
-	* @param string $path path to the zip
-	* @return string path to extract location (with a trailing slash) or false on failure
-	*/
-	static private function extractZip( $path ) {
-		self::$zip = new ZipArchive;
-		// Validate path
-		if( !file_exists( $path ) ) {
-			OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR );
-			return false;
-		}
-		if ( self::$zip->open( $path ) != true ) {
-			OC_Log::write( 'migration', "Failed to open zip file", OC_Log::ERROR );
-			return false;
-		}
-		$to = get_temp_dir() . '/oc_import_' . self::$exporttype . '_' . date("y-m-d_H-i-s") . '/';
-		if( !self::$zip->extractTo( $to ) ) {
-			return false;
-		}
-		self::$zip->close();
-		return $to;
-	}
-
-	/**
-	 * creates a migration.db in the users data dir with their app data in
-	 * @return bool whether operation was successfull
-	 */
-	private static function exportAppData( ) {
-
-		$success = true;
-		$return = array();
-
-		// Foreach provider
-		foreach( self::$providers as $provider ) {
-			// Check if the app is enabled
-			if( OC_App::isEnabled( $provider->getID() ) ) {
-				$success = true;
-				// Does this app use the database?
-				if( file_exists( OC_App::getAppPath($provider->getID()).'/appinfo/database.xml' ) ) {
-					// Create some app tables
-					$tables = self::createAppTables( $provider->getID() );
-					if( is_array( $tables ) ) {
-						// Save the table names
-						foreach($tables as $table) {
-							$return['apps'][$provider->getID()]['tables'][] = $table;
-						}
-					} else {
-						// It failed to create the tables
-						$success = false;
-					}
-				}
-
-				// Run the export function?
-				if( $success ) {
-					// Set the provider properties
-					$provider->setData( self::$uid, self::$content );
-					$return['apps'][$provider->getID()]['success'] = $provider->export();
-				} else {
-					$return['apps'][$provider->getID()]['success'] = false;
-					$return['apps'][$provider->getID()]['message'] = 'failed to create the app tables';
-				}
-
-				// Now add some app info the the return array
-				$appinfo = OC_App::getAppInfo( $provider->getID() );
-				$return['apps'][$provider->getID()]['version'] = OC_App::getAppVersion($provider->getID());
-			}
-		}
-
-		return $return;
-
-	}
-
-
-	/**
-	 * generates json containing export info, and merges any data supplied
-	 * @param array $array of data to include in the returned json
-	 * @return string
-	 */
-	static private function getExportInfo( $array=array() ) {
-		$info = array(
-						'ocversion' => OC_Util::getVersion(),
-						'exporttime' => time(),
-						'exportedby' => OC_User::getUser(),
-						'exporttype' => self::$exporttype,
-						'exporteduser' => self::$uid
-					);
-
-		if( !is_array( $array ) ) {
-			OC_Log::write( 'migration', 'Supplied $array was not an array in getExportInfo()', OC_Log::ERROR );
-		}
-		// Merge in other data
-		$info = array_merge( $info, (array)$array );
-		// Create json
-		$json = json_encode( $info );
-		return $json;
-	}
-
-	/**
-	 * connects to migration.db, or creates if not found
-	 * @param string $path to migration.db, defaults to user data dir
-	 * @return bool whether the operation was successful
-	 */
-	static private function connectDB( $path=null ) {
-		// Has the dbpath been set?
-		self::$dbpath = !is_null( $path ) ? $path : self::$dbpath;
-		if( !self::$dbpath ) {
-			OC_Log::write( 'migration', 'connectDB() was called without dbpath being set', OC_Log::ERROR );
-			return false;
-		}
-		// Already connected
-		if(!self::$migration_database) {
-			$datadir = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
-			$connectionParams = array(
-					'path' => self::$dbpath,
-					'driver' => 'pdo_sqlite',
-			);
-			$connectionParams['adapter'] = '\OC\DB\AdapterSqlite';
-			$connectionParams['wrapperClass'] = 'OC\DB\Connection';
-			$connectionParams['tablePrefix'] = '';
-
-			// Try to establish connection
-			self::$migration_database = \Doctrine\DBAL\DriverManager::getConnection($connectionParams);
-		}
-		return true;
-
-	}
-
-	/**
-	 * creates the tables in migration.db from an apps database.xml
-	 * @param string $appid id of the app
-	 * @return bool whether the operation was successful
-	 */
-	static private function createAppTables( $appid ) {
-		$schema_manager = new OC\DB\MDB2SchemaManager(self::$migration_database);
-
-		// There is a database.xml file
-		$content = file_get_contents(OC_App::getAppPath($appid) . '/appinfo/database.xml' );
-
-		$file2 = 'static://db_scheme';
-		// TODO get the relative path to migration.db from the data dir
-		// For now just cheat
-		$path = pathinfo( self::$dbpath );
-		$content = str_replace( '*dbname*', self::$uid.'/migration', $content );
-		$content = str_replace( '*dbprefix*', '', $content );
-
-		$xml = new SimpleXMLElement($content);
-		foreach($xml->table as $table) {
-			$tables[] = (string)$table->name;
-		}
-
-		file_put_contents( $file2, $content );
-
-		// Try to create tables
-		try {
-			$schema_manager->createDbFromStructure($file2);
-		} catch(Exception $e) {
-			unlink( $file2 );
-			OC_Log::write( 'migration', 'Failed to create tables for: '.$appid, OC_Log::FATAL );
-			OC_Log::write( 'migration', $e->getMessage(), OC_Log::FATAL );
-			return false;
-		}
-
-		return $tables;
-	}
-
-	/**
-	* tries to create the zip
-	* @return bool
-	*/
-	static private function createZip() {
-		self::$zip = new ZipArchive;
-		// Check if properties are set
-		if( !self::$zippath ) {
-			OC_Log::write('migration', 'createZip() called but $zip and/or $zippath have not been set', OC_Log::ERROR);
-			return false;
-		}
-		if ( self::$zip->open( self::$zippath, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE ) !== true ) {
-			OC_Log::write('migration',
-				'Failed to create the zip with error: '.self::$zip->getStatusString(),
-				OC_Log::ERROR);
-			return false;
-		} else {
-			return true;
-		}
-	}
-
-	/**
-	* returns an array of apps that support migration
-	* @return array
-	*/
-	static public function getApps() {
-		$allapps = OC_App::getAllApps();
-		foreach($allapps as $app) {
-			$path = self::getAppPath($app) . '/lib/migrate.php';
-			if( file_exists( $path ) ) {
-				$supportsmigration[] = $app;
-			}
-		}
-		return $supportsmigration;
-	}
-
-	/**
-	* imports a new user
-	* @param string $db string path to migration.db
-	* @param object $info object of migration info
-	* @param string|null|int $uid uid to use
-	* @return array an array of apps with import statuses, or false on failure.
-	*/
-	public static function importAppData( $db, $info, $uid=null ) {
-		// Check if the db exists
-		if( file_exists( $db ) ) {
-			// Connect to the db
-			if(!self::connectDB( $db )) {
-				OC_Log::write('migration', 'Failed to connect to migration.db', OC_Log::ERROR);
-				return false;
-			}
-		} else {
-			OC_Log::write('migration', 'Migration.db not found at: '.$db, OC_Log::FATAL );
-			return false;
-		}
-
-		// Find providers
-		self::findProviders();
-
-		// Generate importinfo array
-		$importinfo = array(
-							'olduid' => $info->exporteduser,
-							'newuid' => self::$uid
-							);
-
-		foreach( self::$providers as $provider) {
-			// Is the app in the export?
-			$id = $provider->getID();
-			if( isset( $info->apps->$id ) ) {
-				// Is the app installed
-				if( !OC_App::isEnabled( $id ) ) {
-					OC_Log::write( 'migration',
-					'App: ' . $id . ' is not installed, can\'t import data.',
-					OC_Log::INFO );
-					$appsstatus[$id] = 'notsupported';
-				} else {
-					// Did it succeed on export?
-					if( $info->apps->$id->success ) {
-						// Give the provider the content object
-						if( !self::connectDB( $db ) ) {
-							return false;
-						}
-						$content = new OC_Migration_Content( self::$zip, self::$migration_database );
-						$provider->setData( self::$uid, $content, $info );
-						// Then do the import
-						if( !$appsstatus[$id] = $provider->import( $info->apps->$id, $importinfo ) ) {
-							// Failed to import app
-							OC_Log::write( 'migration',
-								'Failed to import app data for user: ' . self::$uid . ' for app: ' . $id,
-								OC_Log::ERROR );
-						}
-					} else {
-						// Add to failed list
-						$appsstatus[$id] = false;
-					}
-				}
-			}
-		}
-
-		return $appsstatus;
-
-	}
-
-	/**
-	* creates a new user in the database
-	* @param string $uid user_id of the user to be created
-	* @param string $hash hash of the user to be created
-	* @return bool result of user creation
-	*/
-	public static function createUser( $uid, $hash ) {
-
-		// Check if userid exists
-		if(OC_User::userExists( $uid )) {
-			return false;
-		}
-
-		// Create the user
-		$query = OC_DB::prepare( "INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )" );
-		$result = $query->execute( array( $uid, $hash));
-		if( !$result ) {
-			OC_Log::write('migration', 'Failed to create the new user "'.$uid."", OC_Log::ERROR);
-		}
-		return $result ? true : false;
-
-	}
-
-}
diff --git a/lib/private/migration/content.php b/lib/private/migration/content.php
deleted file mode 100644
index cb5d9ad1472..00000000000
--- a/lib/private/migration/content.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Tom Needham
- * @copyright 2012 Tom Needham tom@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/>.
- *
- */
-
-
-/**
- * provides methods to add and access data from the migration
- */
-class OC_Migration_Content{
-
-	private $zip=false;
-	// Holds the database object
-	private $db=null;
-	// Holds an array of tmpfiles to delete after zip creation
-	private $tmpfiles=array();
-
-	/**
-	* sets up the
-	* @param ZipArchive $zip ZipArchive object
-	* @param object $db a database object (required for exporttype user)
-	* @return bool|null
-	*/
-	public function __construct( $zip, $db=null ) {
-
-		$this->zip = $zip;
-		$this->db = $db;
-
-	}
-
-	/**
-	 * prepares the db
-	 * @param string $query the sql query to prepare
-	 */
-	public function prepare( $query ) {
-
-		// Only add database to tmpfiles if actually used
-		if( !is_null( $this->db ) ) {
-			// Get db path
-			$db = $this->db->getDatabase();
-			if(!in_array($db, $this->tmpfiles)) {
-				$this->tmpfiles[] = $db;
-			}
-		}
-
-		// Optimize the query
-		$query = $this->processQuery( $query );
-
-		// Optimize the query
-		$query = $this->db->prepare( $query );
-		$query = new OC_DB_StatementWrapper($query, false);
-
-		return $query;
-	}
-
-	/**
-	* processes the db query
-	* @param string $query the query to process
-	* @return string of processed query
-	*/
-	private function processQuery( $query ) {
-		$query = str_replace( '`', '\'', $query );
-		$query = str_replace( 'NOW()', 'datetime(\'now\')', $query );
-		$query = str_replace( 'now()', 'datetime(\'now\')', $query );
-		// remove table prefixes
-		$query = str_replace( '*PREFIX*', '', $query );
-		return $query;
-	}
-
-	/**
-	* copys rows to migration.db from the main database
-	* @param array $options array of options.
-	* @return bool
-	*/
-	public function copyRows( $options ) {
-		if( !array_key_exists( 'table', $options ) ) {
-			return false;
-		}
-
-		$return = array();
-
-		// Need to include 'where' in the query?
-		if( array_key_exists( 'matchval', $options ) && array_key_exists( 'matchcol', $options ) ) {
-
-			// If only one matchval, create an array
-			if(!is_array($options['matchval'])) {
-				$options['matchval'] = array( $options['matchval'] );
-			}
-
-			foreach( $options['matchval'] as $matchval ) {
-				// Run the query for this match value (where x = y value)
-				$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '` WHERE `' . $options['matchcol'] . '` = ?';
-				$query = OC_DB::prepare( $sql );
-				$results = $query->execute( array( $matchval ) );
-				$newreturns = $this->insertData( $results, $options );
-				$return = array_merge( $return, $newreturns );
-			}
-
-		} else {
-			// Just get everything
-			$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '`';
-			$query = OC_DB::prepare( $sql );
-			$results = $query->execute();
-			$return = $this->insertData( $results, $options );
-
-		}
-
-		return $return;
-
-	}
-
-	/**
-	* saves a sql data set into migration.db
-	* @param OC_DB_StatementWrapper $data a sql data set returned from self::prepare()->query()
-	* @param array $options array of copyRows options
-	* @return void
-	*/
-	private function insertData( $data, $options ) {
-		$return = array();
-		// Foreach row of data to insert
-		while( $row = $data->fetchRow() ) {
-			// Now save all this to the migration.db
-			foreach($row as $field=>$value) {
-				$fields[] = $field;
-				$values[] = $value;
-			}
-
-			// Generate some sql
-			$sql = "INSERT INTO `" . $options['table'] . '` ( `';
-			$fieldssql = implode( '`, `', $fields );
-			$sql .= $fieldssql . "` ) VALUES( ";
-			$valuessql = substr( str_repeat( '?, ', count( $fields ) ), 0, -2 );
-			$sql .= $valuessql . " )";
-			// Make the query
-			$query = $this->prepare( $sql );
-			$query->execute( $values );
-			// Do we need to return some values?
-			if( array_key_exists( 'idcol', $options ) ) {
-				// Yes we do
-				$return[] = $row[$options['idcol']];
-			} else {
-				// Take a guess and return the first field :)
-				$return[] = reset($row);
-			}
-			$fields = '';
-			$values = '';
-		}
-		return $return;
-	}
-
-	/**
-	* adds a directory to the zip object
-	* @param boolean|string $dir string path of the directory to add
-	* @param bool $recursive
-	* @param string $internaldir path of folder to add dir to in zip
-	* @return bool
-	*/
-	public function addDir( $dir, $recursive=true, $internaldir='' ) {
-		$dirname = basename($dir);
-		$this->zip->addEmptyDir($internaldir . $dirname);
-		$internaldir.=$dirname.='/';
-		if( !file_exists( $dir ) ) {
-			return false;
-		}
-		$dirhandle = opendir($dir);
-		if(is_resource($dirhandle)) {
-			while (false !== ( $file = readdir($dirhandle))) {
-
-				if (( $file != '.' ) && ( $file != '..' )) {
-
-					if (is_dir($dir . '/' . $file) && $recursive) {
-						$this->addDir($dir . '/' . $file, $recursive, $internaldir);
-					} elseif (is_file($dir . '/' . $file)) {
-						$this->zip->addFile($dir . '/' . $file, $internaldir . $file);
-					}
-				}
-			}
-			closedir($dirhandle);
-		} else {
-			OC_Log::write('admin_export', "Was not able to open directory: " . $dir, OC_Log::ERROR);
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	* adds a file to the zip from a given string
-	* @param string $data string of data to add
-	* @param string $path the relative path inside of the zip to save the file to
-	* @return bool
-	*/
-	public function addFromString( $data, $path ) {
-		// Create a temp file
-		$file = tempnam( get_temp_dir(). '/', 'oc_export_tmp_' );
-		$this->tmpfiles[] = $file;
-		if( !file_put_contents( $file, $data ) ) {
-			OC_Log::write( 'migation', 'Failed to save data to a temporary file', OC_Log::ERROR );
-			return false;
-		}
-		// Add file to the zip
-		$this->zip->addFile( $file, $path );
-		return true;
-	}
-
-	/**
-	* closes the zip, removes temp files
-	* @return bool
-	*/
-	public function finish() {
-		if( !$this->zip->close() ) {
-			OC_Log::write( 'migration',
-				'Failed to write the zip file with error: '.$this->zip->getStatusString(),
-				OC_Log::ERROR );
-			return false;
-		}
-		$this->cleanup();
-		return true;
-	}
-
-		/**
-	* cleans up after the zip
-	*/
-	private function cleanup() {
-		// Delete tmp files
-		foreach($this->tmpfiles as $i) {
-			unlink( $i );
-		}
-	}
-}
diff --git a/lib/private/migration/provider.php b/lib/private/migration/provider.php
deleted file mode 100644
index a7c611dcdd4..00000000000
--- a/lib/private/migration/provider.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * provides search functionalty
- */
-abstract class OC_Migration_Provider{
-
-	protected $id=false;
-	protected $content=false;
-	protected $uid=false;
-	protected $olduid=false;
-	protected $appinfo=false;
-
-	public function __construct( $appid ) {
-		// Set the id
-		$this->id = $appid;
-		OC_Migrate::registerProvider( $this );
-	}
-
-	/**
-	 * exports data for apps
-	 * @return array appdata to be exported
-	 */
-	abstract function export( );
-
-	/**
-	 * imports data for the app
-	 * @return void
-	 */
-	abstract function import( );
-
-	/**
-	* sets the OC_Migration_Content object to $this->content
-	* @param OC_Migration_Content $content a OC_Migration_Content object
-	*/
-	public function setData( $uid, $content, $info=null ) {
-		$this->content = $content;
-		$this->uid = $uid;
-		$id = $this->id;
-		if( !is_null( $info ) ) {
-			$this->olduid = $info->exporteduser;
-			$this->appinfo = $info->apps->$id;
-		}
-	}
-
-	/**
-	* returns the appid of the provider
-	* @return string
-	*/
-	public function getID() {
-		return $this->id;
-	}
-}
diff --git a/tests/lib/migrate.php b/tests/lib/migrate.php
deleted file mode 100644
index 9c1e980c445..00000000000
--- a/tests/lib/migrate.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014 Tom Needham <tom@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-class Test_Migrate extends \Test\TestCase {
-
-	public $users;
-	public $tmpfiles = array();
-
-	/** @var \OC\Files\Storage\Storage */
-	private $originalStorage;
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->originalStorage = \OC\Files\Filesystem::getStorage('/');
-	}
-
-	protected function tearDown() {
-		$u = new OC_User();
-		foreach($this->users as $user) {
-			$u->deleteUser($user);
-		}
-		foreach($this->tmpfiles as $file) {
-			\OC_Helper::rmdirr($file);
-		}
-
-		\OC\Files\Filesystem::mount($this->originalStorage, array(), '/');
-		parent::tearDown();
-	}
-
-	/**
-	 * Generates a test user and sets up their file system
-	 * @return string the test users id
-	 */
-	public function generateUser() {
-		$username = $this->getUniqueID();
-		\OC_User::createUser($username, 'password');
-		\OC_Util::tearDownFS();
-		\OC_User::setUserId('');
-		\OC\Files\Filesystem::tearDown();
-		\OC_Util::setupFS($username);
-		$this->users[] = $username;
-		return $username;
-	}
-
-	/**
-	 * validates an export for a user
-	 * checks for existence of export_info.json and file folder
-	 * @param string $exportedUser the user that was exported
-	 * @param string $path the path to the .zip export
-	 * @param string $exportedBy
-	 */
-	public function validateUserExport($exportedBy, $exportedUser, $path) {
-		$this->assertTrue(file_exists($path));
-		// Extract
-		$extract = get_temp_dir() . '/oc_import_' . uniqid();
-		//mkdir($extract);
-		$this->tmpfiles[] = $extract;
-		$zip = new ZipArchive;
-		$zip->open($path);
-		$zip->extractTo($extract);
-		$zip->close();
-		$this->assertTrue(file_exists($extract.'/export_info.json'));
-		$exportInfo = file_get_contents($extract.'/export_info.json');
-		$exportInfo = json_decode($exportInfo);
-		$this->assertNotNull($exportInfo);
-		$this->assertEquals($exportedUser, $exportInfo->exporteduser);
-		$this->assertEquals($exportedBy, $exportInfo->exportedby);
-		$this->assertTrue(file_exists($extract.'/'.$exportedUser.'/files'));
-	}
-
-	public function testUserSelfExport() {
-		// Create a user
-		$user = $this->generateUser();
-		\OC_User::setUserId($user);
-		$export = \OC_Migrate::export($user);
-		// Check it succeeded and exists
-		$this->assertTrue(json_decode($export)->success);
-		// Validate the export
-		$this->validateUserExport($user, $user, json_decode($export)->data);
-	}
-
-	public function testUserOtherExport() {
-		$user = $this->generateUser();
-		$user2 = $this->generateUser();
-		\OC_User::setUserId($user2);
-		$export = \OC_Migrate::export($user);
-		// Check it succeeded and exists
-		$this->assertTrue(json_decode($export)->success);
-		// Validate the export
-		$this->validateUserExport($user2, $user, json_decode($export)->data);
-	}
-}
-- 
GitLab


From 858907959043e34cefd6f43759fed1919f86ee94 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 24 Nov 2014 15:02:49 +0100
Subject: [PATCH 519/616] Close session only if encryption app is not enabled

Fixes https://github.com/owncloud/core/issues/12389
---
 apps/files_sharing/lib/controllers/sharecontroller.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 552d9164344..71b5ab7f8c8 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -84,7 +84,6 @@ class ShareController extends Controller {
 	 * @NoCSRFRequired
 	 *
 	 * @param string $token
-	 *
 	 * @return TemplateResponse|RedirectResponse
 	 */
 	public function showAuthenticate($token) {
@@ -127,7 +126,6 @@ class ShareController extends Controller {
 	 *
 	 * @param string $token
 	 * @param string $path
-	 *
 	 * @return TemplateResponse
 	 */
 	public function showShare($token, $path = '') {
@@ -207,6 +205,8 @@ class ShareController extends Controller {
 	/**
 	 * @PublicPage
 	 * @NoCSRFRequired
+	 * @UseSession
+	 *
 	 * @param string $token
 	 * @param string $files
 	 * @param string $path
@@ -215,6 +215,12 @@ class ShareController extends Controller {
 	public function downloadShare($token, $files = null, $path = '') {
 		\OC_User::setIncognitoMode(true);
 
+		// FIXME: Use DI once there is a suitable class
+		if (!\OCP\App::isEnabled('files_encryption')) {
+			// encryption app requires the session to store the keys in
+			\OC::$server->getSession()->close();
+		}
+
 		$linkItem = OCP\Share::getShareByToken($token, false);
 
 		// Share is password protected - check whether the user is permitted to access the share
-- 
GitLab


From 1645c8f81954c6a5ada8a178b6acd6d50da318f0 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 24 Nov 2014 15:44:43 +0100
Subject: [PATCH 520/616] use login name to verify password

---
 apps/files_encryption/ajax/updatePrivateKeyPassword.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
index 0f182e93831..fa5e279b21b 100644
--- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php
+++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
@@ -26,9 +26,10 @@ $newPassword = $_POST['newPassword'];
 $view = new \OC\Files\View('/');
 $session = new \OCA\Encryption\Session($view);
 $user = \OCP\User::getUser();
+$loginName = \OC::$server->getUserSession()->getLoginName();
 
 // check new password
-$passwordCorrect = \OCP\User::checkPassword($user, $newPassword);
+$passwordCorrect = \OCP\User::checkPassword($loginName, $newPassword);
 
 if ($passwordCorrect !== false) {
 
-- 
GitLab


From e2a9bd78385aa4f30c99f622d4a53aa7accfe04c Mon Sep 17 00:00:00 2001
From: Olivier Paroz <oparoz@users.noreply.github.com>
Date: Mon, 24 Nov 2014 17:32:53 +0100
Subject: [PATCH 521/616] You can only change the oritentation of a JPEG

TIFFs also have EXIF headers, but they're not supported by the Image class

PHP doc
http://php.net/manual/en/function.exif-read-data.php
---
 lib/private/image.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/private/image.php b/lib/private/image.php
index bab91745c05..ecdad084c02 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -311,6 +311,10 @@ class OC_Image {
 	* @return int The orientation or -1 if no EXIF data is available.
 	*/
 	public function getOrientation() {
+		if ($this->imageType !== IMAGETYPE_JPEG) {
+			OC_Log::write('core', 'OC_Image->fixOrientation() Image is not a JPEG.', OC_Log::DEBUG);
+			return -1;
+		}
 		if(!is_callable('exif_read_data')) {
 			OC_Log::write('core', 'OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
 			return -1;
-- 
GitLab


From b947b65e5ba45086d39119a032d5b9c0ff54d012 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 24 Nov 2014 23:09:49 +0100
Subject: [PATCH 522/616] Fix PHPDoc and deprecated code

Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
---
 lib/private/l10n.php | 42 +++++++++++++++++-------------------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index 6ec4e967c7f..afa066c30ef 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -7,19 +7,9 @@
  * @copyright 2012 Frank Karlitschek frank@owncloud.org
  * @copyright 2013 Jakob Sack
  *
- * 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/>.
- *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
  */
 
 /**
@@ -89,7 +79,8 @@ class OC_L10N implements \OCP\IL10N {
 	}
 
 	/**
-	 * @param string $transFile
+	 * @param $transFile
+	 * @param bool $mergeTranslations
 	 * @return bool
 	 */
 	public function load($transFile, $mergeTranslations = false) {
@@ -141,8 +132,8 @@ class OC_L10N implements \OCP\IL10N {
 				// load the translations file
 				if($this->load($transFile)) {
 					//merge with translations from theme
-					$theme = OC_Config::getValue( "theme" );
-					if (!is_null($theme)) {
+					$theme = \OC::$server->getConfig()->getSystemValue('theme');
+					if (!empty($theme)) {
 						$transFile = OC::$SERVERROOT.'/themes/'.$theme.substr($transFile, strlen(OC::$SERVERROOT));
 						if (file_exists($transFile)) {
 							$this->load($transFile, true);
@@ -285,7 +276,8 @@ class OC_L10N implements \OCP\IL10N {
 	 * Localization
 	 * @param string $type Type of localization
 	 * @param array|int|string $data parameters for this localization
-	 * @return String or false
+	 * @param array $options
+	 * @return string|false
 	 *
 	 * Returns the localized data.
 	 *
@@ -393,8 +385,8 @@ class OC_L10N implements \OCP\IL10N {
 			return self::$language;
 		}
 
-		if(OC_User::getUser() && OC_Preferences::getValue(OC_User::getUser(), 'core', 'lang')) {
-			$lang = OC_Preferences::getValue(OC_User::getUser(), 'core', 'lang');
+		if(OC_User::getUser() && \OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'core', 'lang')) {
+			$lang = \OC::$server->getConfig()->getUserValue(OC_User::getUser(), 'core', 'lang');
 			self::$language = $lang;
 			if(is_array($app)) {
 				$available = $app;
@@ -407,7 +399,7 @@ class OC_L10N implements \OCP\IL10N {
 			}
 		}
 
-		$default_language = OC_Config::getValue('default_language', false);
+		$default_language = \OC::$server->getConfig()->getSystemValue('default_language', false);
 
 		if($default_language !== false) {
 			return $default_language;
@@ -457,17 +449,17 @@ class OC_L10N implements \OCP\IL10N {
 	 */
 	protected static function findI18nDir($app) {
 		// find the i18n dir
-		$i18ndir = OC::$SERVERROOT.'/core/l10n/';
+		$i18nDir = OC::$SERVERROOT.'/core/l10n/';
 		if($app != '') {
 			// Check if the app is in the app folder
 			if(file_exists(OC_App::getAppPath($app).'/l10n/')) {
-				$i18ndir = OC_App::getAppPath($app).'/l10n/';
+				$i18nDir = OC_App::getAppPath($app).'/l10n/';
 			}
 			else{
-				$i18ndir = OC::$SERVERROOT.'/'.$app.'/l10n/';
+				$i18nDir = OC::$SERVERROOT.'/'.$app.'/l10n/';
 			}
 		}
-		return $i18ndir;
+		return $i18nDir;
 	}
 
 	/**
@@ -496,7 +488,7 @@ class OC_L10N implements \OCP\IL10N {
 	 * @return bool
 	 */
 	public static function languageExists($app, $lang) {
-		if ($lang == 'en') {//english is always available
+		if ($lang === 'en') {//english is always available
 			return true;
 		}
 		$dir = self::findI18nDir($app);
-- 
GitLab


From f274833403f1b35ddbf8e6cdf13851ae813ed121 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 25 Nov 2014 10:12:10 +0100
Subject: [PATCH 523/616] remove unused variable

---
 apps/files_encryption/lib/proxy.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 55f2df783c4..a358a46a6e7 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -91,7 +91,6 @@ class Proxy extends \OC_FileProxy {
 	private function shouldEncrypt($path, $mode = 'w') {
 
 		$userId = Helper::getUser($path);
-		$session = new Session(new \OC\Files\View());
 
 		// don't call the crypt stream wrapper, if...
 		if (
-- 
GitLab


From b68c07d68781b22bd15b655929d4e0b2d90bc7e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 18 Nov 2014 23:47:00 +0100
Subject: [PATCH 524/616] autoconfig.php only to be deleted on successful
 installation

---
 core/setup/controller.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/core/setup/controller.php b/core/setup/controller.php
index 39272120106..5a52b18f73b 100644
--- a/core/setup/controller.php
+++ b/core/setup/controller.php
@@ -12,13 +12,21 @@ namespace OC\Core\Setup;
 use OCP\IConfig;
 
 class Controller {
-	/** @var \OCP\IConfig */
+	/**
+	 * @var \OCP\IConfig
+	 */
 	protected $config;
 
+	/**
+	 * @var string
+	 */
+	private $autoConfigFile;
+
 	/**
 	 * @param IConfig $config
 	 */
 	function __construct(IConfig $config) {
+		$this->autoConfigFile = \OC::$SERVERROOT.'/config/autoconfig.php';
 		$this->config = $config;
 	}
 
@@ -64,15 +72,17 @@ class Controller {
 	}
 
 	public function finishSetup() {
+		if( file_exists( $this->autoConfigFile )) {
+			unlink($this->autoConfigFile);
+		}
 		\OC_Util::redirectToDefaultPage();
 	}
 
 	public function loadAutoConfig($post) {
-		$autosetup_file = \OC::$SERVERROOT.'/config/autoconfig.php';
-		if( file_exists( $autosetup_file )) {
+		if( file_exists($this->autoConfigFile)) {
 			\OC_Log::write('core', 'Autoconfig file found, setting up owncloud...', \OC_Log::INFO);
 			$AUTOCONFIG = array();
-			include $autosetup_file;
+			include $this->autoConfigFile;
 			$post = array_merge ($post, $AUTOCONFIG);
 		}
 
@@ -82,9 +92,6 @@ class Controller {
 
 		if ($dbIsSet AND $directoryIsSet AND $adminAccountIsSet) {
 			$post['install'] = 'true';
-			if( file_exists( $autosetup_file )) {
-				unlink($autosetup_file);
-			}
 		}
 		$post['dbIsSet'] = $dbIsSet;
 		$post['directoryIsSet'] = $directoryIsSet;
-- 
GitLab


From 93a6cc17a57987909defb5687d8aa955517709a2 Mon Sep 17 00:00:00 2001
From: Olivier Paroz <github@oparoz.com>
Date: Fri, 21 Nov 2014 17:12:11 +0100
Subject: [PATCH 525/616] The class name is Movie NOT Movies

---
 config/config.sample.php                      | 2 +-
 lib/private/preview.php                       | 4 ++--
 lib/private/preview/{movies.php => movie.php} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/private/preview/{movies.php => movie.php} (100%)

diff --git a/config/config.sample.php b/config/config.sample.php
index 2287b7af7dd..bf26172c494 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -617,7 +617,7 @@ $CONFIG = array(
  * concerns:
  *
  *  - OC\Preview\Illustrator
- *  - OC\Preview\Movies
+ *  - OC\Preview\Movie
  *  - OC\Preview\MSOffice2003
  *  - OC\Preview\MSOffice2007
  *  - OC\Preview\MSOfficeDoc
diff --git a/lib/private/preview.php b/lib/private/preview.php
index 778007b21fd..c9d8810be6f 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -17,7 +17,7 @@ use OC\Preview\Provider;
 use OCP\Files\NotFoundException;
 
 require_once 'preview/image.php';
-require_once 'preview/movies.php';
+require_once 'preview/movie.php';
 require_once 'preview/mp3.php';
 require_once 'preview/svg.php';
 require_once 'preview/txt.php';
@@ -713,7 +713,7 @@ class Preview {
 		 *  - OC\Preview\OpenDocument
 		 *  - OC\Preview\StarOffice
  		 *  - OC\Preview\SVG
-		 *  - OC\Preview\Movies
+		 *  - OC\Preview\Movie
 		 *  - OC\Preview\PDF
 		 *  - OC\Preview\TIFF
 		 *  - OC\Preview\Illustrator
diff --git a/lib/private/preview/movies.php b/lib/private/preview/movie.php
similarity index 100%
rename from lib/private/preview/movies.php
rename to lib/private/preview/movie.php
-- 
GitLab


From c503ecd54495167f97b6602e5b41c1cf95467395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 24 Nov 2014 16:24:26 +0100
Subject: [PATCH 526/616] Introduce app info xml parser including basic unit
 test - necessary for #10777

---
 lib/private/app.php            | 59 ++--------------------
 lib/private/app/infoparser.php | 92 ++++++++++++++++++++++++++++++++++
 lib/private/helper.php         |  5 +-
 lib/private/urlgenerator.php   | 12 ++++-
 lib/public/iurlgenerator.php   |  8 ++-
 tests/data/app/valid-info.xml  | 22 ++++++++
 tests/lib/app/infoparser.php   | 57 +++++++++++++++++++++
 7 files changed, 194 insertions(+), 61 deletions(-)
 create mode 100644 lib/private/app/infoparser.php
 create mode 100644 tests/data/app/valid-info.xml
 create mode 100644 tests/lib/app/infoparser.php

diff --git a/lib/private/app.php b/lib/private/app.php
index bc9ca0351ea..8e36d43bfb1 100644
--- a/lib/private/app.php
+++ b/lib/private/app.php
@@ -635,63 +635,10 @@ class OC_App {
 			}
 			$file = self::getAppPath($appId) . '/appinfo/info.xml';
 		}
-		$data = array();
-		if (!file_exists($file)) {
-			return null;
-		}
-		$content = @file_get_contents($file);
-		if (!$content) {
-			return null;
-		}
-		$xml = new SimpleXMLElement($content);
-		$data['info'] = array();
-		$data['remote'] = array();
-		$data['public'] = array();
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var $child SimpleXMLElement
-			 */
-			if ($child->getName() == 'remote') {
-				foreach ($child->children() as $remote) {
-					/**
-					 * @var $remote SimpleXMLElement
-					 */
-					$data['remote'][$remote->getName()] = (string)$remote;
-				}
-			} elseif ($child->getName() == 'public') {
-				foreach ($child->children() as $public) {
-					/**
-					 * @var $public SimpleXMLElement
-					 */
-					$data['public'][$public->getName()] = (string)$public;
-				}
-			} elseif ($child->getName() == 'types') {
-				$data['types'] = array();
-				foreach ($child->children() as $type) {
-					/**
-					 * @var $type SimpleXMLElement
-					 */
-					$data['types'][] = $type->getName();
-				}
-			} elseif ($child->getName() == 'description') {
-				$xml = (string)$child->asXML();
-				$data[$child->getName()] = substr($xml, 13, -14); //script <description> tags
-			} elseif ($child->getName() == 'documentation') {
-				foreach ($child as $subChild) {
-					$url = (string) $subChild;
-
-					// If it is not an absolute URL we assume it is a key
-					// i.e. admin-ldap will get converted to go.php?to=admin-ldap
-					if(!\OC::$server->getHTTPHelper()->isHTTPURL($url)) {
-						$url = OC_Helper::linkToDocs($url);
-					}
 
-					$data["documentation"][$subChild->getName()] = $url;
-				}
-			} else {
-				$data[$child->getName()] = (string)$child;
-			}
-		}
+		$parser = new \OC\App\InfoParser(\OC::$server->getHTTPHelper(), \OC::$server->getURLGenerator());
+		$data = $parser->parse($file);
+
 		self::$appInfo[$appId] = $data;
 
 		return $data;
diff --git a/lib/private/app/infoparser.php b/lib/private/app/infoparser.php
new file mode 100644
index 00000000000..908fcd82636
--- /dev/null
+++ b/lib/private/app/infoparser.php
@@ -0,0 +1,92 @@
+<?php
+ /**
+ * @author Thomas Müller
+ * @copyright 2014 Thomas Müller deepdiver@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\App;
+
+use OCP\IURLGenerator;
+use SimpleXMLElement;
+
+class InfoParser {
+
+	/**
+	 * @param \OC\HTTPHelper $httpHelper
+	 * @param IURLGenerator $urlGenerator
+	 */
+	public function __construct(\OC\HTTPHelper $httpHelper, IURLGenerator $urlGenerator) {
+		$this->httpHelper = $httpHelper;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	/**
+	 * @param string $file
+	 * @return null|string
+	 */
+	public function parse($file) {
+		if (!file_exists($file)) {
+			return null;
+		}
+
+		$content = @file_get_contents($file);
+		if (!$content) {
+			return null;
+		}
+		$xml = new SimpleXMLElement($content);
+		$data['info'] = array();
+		$data['remote'] = array();
+		$data['public'] = array();
+		foreach ($xml->children() as $child) {
+			/**
+			 * @var $child SimpleXMLElement
+			 */
+			if ($child->getName() == 'remote') {
+				foreach ($child->children() as $remote) {
+					/**
+					 * @var $remote SimpleXMLElement
+					 */
+					$data['remote'][$remote->getName()] = (string)$remote;
+				}
+			} elseif ($child->getName() == 'public') {
+				foreach ($child->children() as $public) {
+					/**
+					 * @var $public SimpleXMLElement
+					 */
+					$data['public'][$public->getName()] = (string)$public;
+				}
+			} elseif ($child->getName() == 'types') {
+				$data['types'] = array();
+				foreach ($child->children() as $type) {
+					/**
+					 * @var $type SimpleXMLElement
+					 */
+					$data['types'][] = $type->getName();
+				}
+			} elseif ($child->getName() == 'description') {
+				$xml = (string)$child->asXML();
+				$data[$child->getName()] = substr($xml, 13, -14); //script <description> tags
+			} elseif ($child->getName() == 'documentation') {
+				foreach ($child as $subChild) {
+					$url = (string)$subChild;
+
+					// If it is not an absolute URL we assume it is a key
+					// i.e. admin-ldap will get converted to go.php?to=admin-ldap
+					if (!$this->httpHelper->isHTTPURL($url)) {
+						$url = $this->urlGenerator->linkToDocs($url);
+					}
+
+					$data["documentation"][$subChild->getName()] = $url;
+				}
+			} else {
+				$data[$child->getName()] = (string)$child;
+			}
+		}
+
+		return $data;
+	}
+}
diff --git a/lib/private/helper.php b/lib/private/helper.php
index be448b8ff9b..d43eefcdc52 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -58,12 +58,11 @@ class OC_Helper {
 	}
 
 	/**
-	 * @param $key
+	 * @param string $key
 	 * @return string url to the online documentation
 	 */
 	public static function linkToDocs($key) {
-		$theme = new OC_Defaults();
-		return $theme->buildDocLinkToKey($key);
+		return OC::$server->getURLGenerator()->linkToDocs($key);
 	}
 
 	/**
diff --git a/lib/private/urlgenerator.php b/lib/private/urlgenerator.php
index e50e9eed6af..d263d25aeef 100644
--- a/lib/private/urlgenerator.php
+++ b/lib/private/urlgenerator.php
@@ -8,6 +8,7 @@
  */
 
 namespace OC;
+use OC_Defaults;
 use OCP\IURLGenerator;
 use RuntimeException;
 
@@ -156,7 +157,7 @@ class URLGenerator implements IURLGenerator {
 
 	/**
 	 * Makes an URL absolute
-	 * @param string $url the url in the owncloud host
+	 * @param string $url the url in the ownCloud host
 	 * @return string the absolute version of the url
 	 */
 	public function getAbsoluteURL($url) {
@@ -173,4 +174,13 @@ class URLGenerator implements IURLGenerator {
 
 		return \OC_Request::serverProtocol() . '://' . \OC_Request::serverHost(). $webRoot . $separator . $url;
 	}
+
+	/**
+	 * @param string $key
+	 * @return string url to the online documentation
+	 */
+	public function linkToDocs($key) {
+		$theme = new OC_Defaults();
+		return $theme->buildDocLinkToKey($key);
+	}
 }
diff --git a/lib/public/iurlgenerator.php b/lib/public/iurlgenerator.php
index dbbd8a3bb63..fa817c10ea5 100644
--- a/lib/public/iurlgenerator.php
+++ b/lib/public/iurlgenerator.php
@@ -69,8 +69,14 @@ interface IURLGenerator {
 
 	/**
 	 * Makes an URL absolute
-	 * @param string $url the url in the owncloud host
+	 * @param string $url the url in the ownCloud host
 	 * @return string the absolute version of the url
 	 */
 	public function getAbsoluteURL($url);
+
+	/**
+	 * @param string $key
+	 * @return string url to the online documentation
+	 */
+	public function linkToDocs($key);
 }
diff --git a/tests/data/app/valid-info.xml b/tests/data/app/valid-info.xml
new file mode 100644
index 00000000000..6fcef693bed
--- /dev/null
+++ b/tests/data/app/valid-info.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<info>
+	<id>files_encryption</id>
+	<name>Server-side Encryption</name>
+	<description>
+	This application encrypts all files accessed by ownCloud at rest, wherever they are stored. As an example, with this application enabled, external cloud based Amazon S3 storage will be encrypted, protecting this data on storage outside of the control of the Admin. When this application is enabled for the first time, all files are encrypted as users log in and are prompted for their password. The recommended recovery key option enables recovery of files in case the key is lost. 
+	Note that this app encrypts all files that are touched by ownCloud, so external storage providers and applications such as SharePoint will see new files encrypted when they are accessed. Encryption is based on AES 128 or 256 bit keys. More information is available in the Encryption documentation 
+	</description>
+	<licence>AGPL</licence>
+	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
+	<requiremin>4</requiremin>
+	<shipped>true</shipped>
+	<documentation>
+		<user>user-encryption</user>
+		<admin>admin-encryption</admin>
+	</documentation>
+	<rememberlogin>false</rememberlogin>
+	<types>
+		<filesystem/>
+	</types>
+	<ocsid>166047</ocsid>
+</info>
diff --git a/tests/lib/app/infoparser.php b/tests/lib/app/infoparser.php
new file mode 100644
index 00000000000..d1b2313e881
--- /dev/null
+++ b/tests/lib/app/infoparser.php
@@ -0,0 +1,57 @@
+<?php
+
+/**
+ * @author Thomas Müller
+ * @copyright 2014 Thomas Müller deepdiver@owncloud.com
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace Test\App;
+
+use OC;
+
+class InfoParser extends \PHPUnit_Framework_TestCase {
+
+	/**
+	 * @var \OC\App\InfoParser
+	 */
+	private $parser;
+
+	public function setUp() {
+		$httpHelper = $this->getMockBuilder('\OC\HTTPHelper')
+			->disableOriginalConstructor()
+			->getMock();
+
+		$httpHelper->expects($this->any())
+			->method('isHTTPURL')
+			->will($this->returnCallback(function ($url) {
+				return stripos($url, 'https://') === 0 || stripos($url, 'http://') === 0;
+			}));
+
+		$urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')
+			->disableOriginalConstructor()
+			->getMock();
+
+		//linkToDocs
+		$httpHelper->expects($this->any())
+			->method('linkToDocs')
+			->will($this->returnCallback(function ($url) {
+				return $url;
+			}));
+
+		$this->parser = new \OC\App\InfoParser($httpHelper, $urlGenerator);
+	}
+
+	public function testParsingValidXml() {
+		$data = $this->parser->parse(OC::$SERVERROOT.'/tests/data/app/valid-info.xml');
+
+		$expectedKeys = array(
+			'id', 'info', 'remote', 'public', 'name', 'description', 'licence', 'author', 'requiremin', 'shipped',
+			'documentation', 'rememberlogin', 'types', 'ocsid'
+		);
+		foreach($expectedKeys as $expectedKey) {
+			$this->assertArrayHasKey($expectedKey, $data, "ExpectedKey($expectedKey) was missing.");
+		}
+	}
+}
-- 
GitLab


From d4f107d4dd11d11c52f419d2f33abc5dc4a93573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 24 Nov 2014 17:26:07 +0100
Subject: [PATCH 527/616] simplify xml parser code

---
 lib/private/app/infoparser.php    | 75 ++++++++++++-------------------
 tests/data/app/expected-info.json | 19 ++++++++
 tests/lib/app/infoparser.php      | 25 ++++-------
 3 files changed, 55 insertions(+), 64 deletions(-)
 create mode 100644 tests/data/app/expected-info.json

diff --git a/lib/private/app/infoparser.php b/lib/private/app/infoparser.php
index 908fcd82636..f7c3f8213a7 100644
--- a/lib/private/app/infoparser.php
+++ b/lib/private/app/infoparser.php
@@ -33,60 +33,41 @@ class InfoParser {
 			return null;
 		}
 
-		$content = @file_get_contents($file);
-		if (!$content) {
+		$xml = simplexml_load_file($file);
+		$array = json_decode(json_encode((array)$xml), TRUE);
+		if (is_null($array)) {
 			return null;
 		}
-		$xml = new SimpleXMLElement($content);
-		$data['info'] = array();
-		$data['remote'] = array();
-		$data['public'] = array();
-		foreach ($xml->children() as $child) {
-			/**
-			 * @var $child SimpleXMLElement
-			 */
-			if ($child->getName() == 'remote') {
-				foreach ($child->children() as $remote) {
-					/**
-					 * @var $remote SimpleXMLElement
-					 */
-					$data['remote'][$remote->getName()] = (string)$remote;
-				}
-			} elseif ($child->getName() == 'public') {
-				foreach ($child->children() as $public) {
-					/**
-					 * @var $public SimpleXMLElement
-					 */
-					$data['public'][$public->getName()] = (string)$public;
-				}
-			} elseif ($child->getName() == 'types') {
-				$data['types'] = array();
-				foreach ($child->children() as $type) {
-					/**
-					 * @var $type SimpleXMLElement
-					 */
-					$data['types'][] = $type->getName();
+		if (!array_key_exists('info', $array)) {
+			$array['info'] = array();
+		}
+		if (!array_key_exists('remote', $array)) {
+			$array['remote'] = array();
+		}
+		if (!array_key_exists('public', $array)) {
+			$array['public'] = array();
+		}
+
+		if (array_key_exists('documentation', $array)) {
+			foreach ($array['documentation'] as $key => $url) {
+				// If it is not an absolute URL we assume it is a key
+				// i.e. admin-ldap will get converted to go.php?to=admin-ldap
+				if (!$this->httpHelper->isHTTPURL($url)) {
+					$url = $this->urlGenerator->linkToDocs($url);
 				}
-			} elseif ($child->getName() == 'description') {
-				$xml = (string)$child->asXML();
-				$data[$child->getName()] = substr($xml, 13, -14); //script <description> tags
-			} elseif ($child->getName() == 'documentation') {
-				foreach ($child as $subChild) {
-					$url = (string)$subChild;
 
-					// If it is not an absolute URL we assume it is a key
-					// i.e. admin-ldap will get converted to go.php?to=admin-ldap
-					if (!$this->httpHelper->isHTTPURL($url)) {
-						$url = $this->urlGenerator->linkToDocs($url);
-					}
+				$array["documentation"][$key] = $url;
+
+			}
+		}
+		if (array_key_exists('types', $array)) {
+			foreach ($array['types'] as $type => $v) {
+				unset($array['types'][$type]);
+				$array['types'][] = $type;
 
-					$data["documentation"][$subChild->getName()] = $url;
-				}
-			} else {
-				$data[$child->getName()] = (string)$child;
 			}
 		}
 
-		return $data;
+		return $array;
 	}
 }
diff --git a/tests/data/app/expected-info.json b/tests/data/app/expected-info.json
new file mode 100644
index 00000000000..c67d6d657d2
--- /dev/null
+++ b/tests/data/app/expected-info.json
@@ -0,0 +1,19 @@
+{
+	"info": [],
+	"remote": [],
+	"public": [],
+	"id": "files_encryption",
+	"name": "Server-side Encryption",
+	"description": "\n\tThis application encrypts all files accessed by ownCloud at rest, wherever they are stored. As an example, with this application enabled, external cloud based Amazon S3 storage will be encrypted, protecting this data on storage outside of the control of the Admin. When this application is enabled for the first time, all files are encrypted as users log in and are prompted for their password. The recommended recovery key option enables recovery of files in case the key is lost. \n\tNote that this app encrypts all files that are touched by ownCloud, so external storage providers and applications such as SharePoint will see new files encrypted when they are accessed. Encryption is based on AES 128 or 256 bit keys. More information is available in the Encryption documentation \n\t",
+	"licence": "AGPL",
+	"author": "Sam Tuke, Bjoern Schiessle, Florin Peter",
+	"requiremin": "4",
+	"shipped": "true",
+	"documentation": {
+		"user": "https://docs.example.com/server/go.php?to=user-encryption",
+		"admin": "https://docs.example.com/server/go.php?to=admin-encryption"
+	},
+	"rememberlogin": "false",
+	"types": ["filesystem"],
+	"ocsid": "166047"
+}
diff --git a/tests/lib/app/infoparser.php b/tests/lib/app/infoparser.php
index d1b2313e881..e416202a308 100644
--- a/tests/lib/app/infoparser.php
+++ b/tests/lib/app/infoparser.php
@@ -19,39 +19,30 @@ class InfoParser extends \PHPUnit_Framework_TestCase {
 	private $parser;
 
 	public function setUp() {
+		$config = $this->getMockBuilder('\OC\AllConfig')
+			->disableOriginalConstructor()->getMock();
 		$httpHelper = $this->getMockBuilder('\OC\HTTPHelper')
-			->disableOriginalConstructor()
+			->setConstructorArgs(array($config))
+			->setMethods(array('getHeaders'))
 			->getMock();
-
-		$httpHelper->expects($this->any())
-			->method('isHTTPURL')
-			->will($this->returnCallback(function ($url) {
-				return stripos($url, 'https://') === 0 || stripos($url, 'http://') === 0;
-			}));
-
 		$urlGenerator = $this->getMockBuilder('\OCP\IURLGenerator')
 			->disableOriginalConstructor()
 			->getMock();
 
 		//linkToDocs
-		$httpHelper->expects($this->any())
+		$urlGenerator->expects($this->any())
 			->method('linkToDocs')
 			->will($this->returnCallback(function ($url) {
-				return $url;
+				return "https://docs.example.com/server/go.php?to=$url";
 			}));
 
 		$this->parser = new \OC\App\InfoParser($httpHelper, $urlGenerator);
 	}
 
 	public function testParsingValidXml() {
+		$expectedData = json_decode(file_get_contents(OC::$SERVERROOT.'/tests/data/app/expected-info.json'), true);
 		$data = $this->parser->parse(OC::$SERVERROOT.'/tests/data/app/valid-info.xml');
 
-		$expectedKeys = array(
-			'id', 'info', 'remote', 'public', 'name', 'description', 'licence', 'author', 'requiremin', 'shipped',
-			'documentation', 'rememberlogin', 'types', 'ocsid'
-		);
-		foreach($expectedKeys as $expectedKey) {
-			$this->assertArrayHasKey($expectedKey, $data, "ExpectedKey($expectedKey) was missing.");
-		}
+		$this->assertEquals($expectedData, $data);
 	}
 }
-- 
GitLab


From 5ce34fbaf69538ad3338beebdfb015e94f8b6a3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 25 Nov 2014 10:22:06 +0100
Subject: [PATCH 528/616] handle invalid xml file

---
 lib/private/app/infoparser.php  | 25 ++++++++++++++++++-------
 tests/data/app/invalid-info.xml | 22 ++++++++++++++++++++++
 tests/lib/app/infoparser.php    |  5 +++++
 3 files changed, 45 insertions(+), 7 deletions(-)
 create mode 100644 tests/data/app/invalid-info.xml

diff --git a/lib/private/app/infoparser.php b/lib/private/app/infoparser.php
index f7c3f8213a7..b4bdbea5c04 100644
--- a/lib/private/app/infoparser.php
+++ b/lib/private/app/infoparser.php
@@ -11,9 +11,17 @@
 namespace OC\App;
 
 use OCP\IURLGenerator;
-use SimpleXMLElement;
 
 class InfoParser {
+	/**
+	 * @var \OC\HTTPHelper
+	 */
+	private $httpHelper;
+
+	/**
+	 * @var IURLGenerator
+	 */
+	private $urlGenerator;
 
 	/**
 	 * @param \OC\HTTPHelper $httpHelper
@@ -25,15 +33,20 @@ class InfoParser {
 	}
 
 	/**
-	 * @param string $file
-	 * @return null|string
+	 * @param string $file the xml file to be loaded
+	 * @return null|array where null is an indicator for an error
 	 */
 	public function parse($file) {
 		if (!file_exists($file)) {
 			return null;
 		}
 
-		$xml = simplexml_load_file($file);
+		$loadEntities = libxml_disable_entity_loader(false);
+		$xml = @simplexml_load_file($file);
+		libxml_disable_entity_loader($loadEntities);
+		if ($xml == false) {
+			return null;
+		}
 		$array = json_decode(json_encode((array)$xml), TRUE);
 		if (is_null($array)) {
 			return null;
@@ -56,15 +69,13 @@ class InfoParser {
 					$url = $this->urlGenerator->linkToDocs($url);
 				}
 
-				$array["documentation"][$key] = $url;
-
+				$array['documentation'][$key] = $url;
 			}
 		}
 		if (array_key_exists('types', $array)) {
 			foreach ($array['types'] as $type => $v) {
 				unset($array['types'][$type]);
 				$array['types'][] = $type;
-
 			}
 		}
 
diff --git a/tests/data/app/invalid-info.xml b/tests/data/app/invalid-info.xml
new file mode 100644
index 00000000000..3947f5420c2
--- /dev/null
+++ b/tests/data/app/invalid-info.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<info
+	<id>files_encryption</id>
+	<name>Server-side Encryption</name>
+	<description>
+	This application encrypts all files accessed by ownCloud at rest, wherever they are stored. As an example, with this application enabled, external cloud based Amazon S3 storage will be encrypted, protecting this data on storage outside of the control of the Admin. When this application is enabled for the first time, all files are encrypted as users log in and are prompted for their password. The recommended recovery key option enables recovery of files in case the key is lost. 
+	Note that this app encrypts all files that are touched by ownCloud, so external storage providers and applications such as SharePoint will see new files encrypted when they are accessed. Encryption is based on AES 128 or 256 bit keys. More information is available in the Encryption documentation 
+	</description>
+	<licence>AGPL</licence>
+	<author>Sam Tuke, Bjoern Schiessle, Florin Peter</author>
+	<requiremin>4</requiremin>
+	<shipped>true</shipped>
+	<documentation>
+		<user>user-encryption</user>
+		<admin>admin-encryption</admin>
+	</documentation>
+	<rememberlogin>false</rememberlogin>
+	<types>
+		<filesystem/>
+	</types>
+	<ocsid>166047</ocsid>
+</info>
diff --git a/tests/lib/app/infoparser.php b/tests/lib/app/infoparser.php
index e416202a308..277e1582e45 100644
--- a/tests/lib/app/infoparser.php
+++ b/tests/lib/app/infoparser.php
@@ -45,4 +45,9 @@ class InfoParser extends \PHPUnit_Framework_TestCase {
 
 		$this->assertEquals($expectedData, $data);
 	}
+
+	public function testParsingInvalidXml() {
+		$data = $this->parser->parse(OC::$SERVERROOT.'/tests/data/app/invalid-info.xml');
+		$this->assertNull($data);
+	}
 }
-- 
GitLab


From 917bef39b7f1c0ca495ef102b7878ed5b15830c6 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 25 Nov 2014 10:12:30 +0100
Subject: [PATCH 529/616] don't store private public-share-key in session

---
 apps/files_encryption/lib/session.php | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 7bd4fd02421..3cb02704188 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -29,6 +29,7 @@ namespace OCA\Encryption;
 class Session {
 
 	private $view;
+	private static $publicShareKey = false;
 
 	const NOT_INITIALIZED = '0';
 	const INIT_EXECUTED = '1';
@@ -92,7 +93,7 @@ class Session {
 
 		}
 
-		if (\OCA\Encryption\Helper::isPublicAccess()) {
+		if (\OCA\Encryption\Helper::isPublicAccess() && !self::getPublicSharePrivateKey()) {
 			// Disable encryption proxy to prevent recursive calls
 			$proxyStatus = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
@@ -100,9 +101,7 @@ class Session {
 			$encryptedKey = $this->view->file_get_contents(
 				'/owncloud_private_key/' . $publicShareKeyId . '.private.key');
 			$privateKey = Crypt::decryptPrivateKey($encryptedKey, '');
-			$this->setPublicSharePrivateKey($privateKey);
-
-			$this->setInitialized(\OCA\Encryption\Session::INIT_SUCCESSFUL);
+			self::setPublicSharePrivateKey($privateKey);
 
 			\OC_FileProxy::$enabled = $proxyStatus;
 		}
@@ -164,6 +163,8 @@ class Session {
 	public function getInitialized() {
 		if (!is_null(\OC::$server->getSession()->get('encryptionInitialized'))) {
 			return \OC::$server->getSession()->get('encryptionInitialized');
+		} else if (\OCA\Encryption\Helper::isPublicAccess() && self::getPublicSharePrivateKey()) {
+			return self::INIT_SUCCESSFUL;
 		} else {
 			return self::NOT_INITIALIZED;
 		}
@@ -177,7 +178,7 @@ class Session {
 	public function getPrivateKey() {
 		// return the public share private key if this is a public access
 		if (\OCA\Encryption\Helper::isPublicAccess()) {
-			return $this->getPublicSharePrivateKey();
+			return self::getPublicSharePrivateKey();
 		} else {
 			if (!is_null(\OC::$server->getSession()->get('privateKey'))) {
 				return \OC::$server->getSession()->get('privateKey');
@@ -192,12 +193,9 @@ class Session {
 	 * @param string $privateKey
 	 * @return bool
 	 */
-	public function setPublicSharePrivateKey($privateKey) {
-
-		\OC::$server->getSession()->set('publicSharePrivateKey', $privateKey);
-
+	private static function setPublicSharePrivateKey($privateKey) {
+		self::$publicShareKey = $privateKey;
 		return true;
-
 	}
 
 	/**
@@ -205,13 +203,8 @@ class Session {
 	 * @return string $privateKey
 	 *
 	 */
-	public function getPublicSharePrivateKey() {
-
-		if (!is_null(\OC::$server->getSession()->get('publicSharePrivateKey'))) {
-			return \OC::$server->getSession()->get('publicSharePrivateKey');
-		} else {
-			return false;
-		}
+	private static function getPublicSharePrivateKey() {
+		return self::$publicShareKey;
 	}
 
 }
-- 
GitLab


From 1d3350348797deeead5b02028c4ade7c874a7021 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 25 Nov 2014 10:17:31 +0100
Subject: [PATCH 530/616] we no longer need to keep the session open for
 encryption

---
 apps/files/ajax/upload.php                             | 8 ++------
 apps/files_sharing/lib/controllers/sharecontroller.php | 9 +--------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index b960e02ced7..aeb0008a7b9 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -1,5 +1,7 @@
 <?php
 
+\OC::$server->getSession()->close();
+
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
@@ -64,13 +66,7 @@ if (empty($_POST['dirToken'])) {
 	}
 }
 
-
 OCP\JSON::callCheck();
-if (!\OCP\App::isEnabled('files_encryption')) {
-	// encryption app need to create keys later, so can't close too early
-	\OC::$server->getSession()->close();
-}
-
 
 // get array with current storage stats (e.g. max file size)
 $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 71b5ab7f8c8..5f653e5c227 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -205,7 +205,6 @@ class ShareController extends Controller {
 	/**
 	 * @PublicPage
 	 * @NoCSRFRequired
-	 * @UseSession
 	 *
 	 * @param string $token
 	 * @param string $files
@@ -215,12 +214,6 @@ class ShareController extends Controller {
 	public function downloadShare($token, $files = null, $path = '') {
 		\OC_User::setIncognitoMode(true);
 
-		// FIXME: Use DI once there is a suitable class
-		if (!\OCP\App::isEnabled('files_encryption')) {
-			// encryption app requires the session to store the keys in
-			\OC::$server->getSession()->close();
-		}
-
 		$linkItem = OCP\Share::getShareByToken($token, false);
 
 		// Share is password protected - check whether the user is permitted to access the share
@@ -246,7 +239,7 @@ class ShareController extends Controller {
 			}
 
 			// FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-			// after dispatching the request which results in a "Cannot modify header information" notice. 
+			// after dispatching the request which results in a "Cannot modify header information" notice.
 			OC_Files::get($originalSharePath, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
 			exit();
 		} else {
-- 
GitLab


From 1a1b459ae86f222e74ccaef237fe1da4512257a7 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <developer@georgehrke.com>
Date: Tue, 25 Nov 2014 15:42:02 +0100
Subject: [PATCH 531/616] delete old previews

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

diff --git a/lib/private/repair.php b/lib/private/repair.php
index b5c1e9db58e..be607b44ed8 100644
--- a/lib/private/repair.php
+++ b/lib/private/repair.php
@@ -101,7 +101,7 @@ class Repair extends BasicEmitter {
 		//only 7.0.0 through 7.0.2 generated broken previews
 		$currentVersion = \OC::$server->getConfig()->getSystemValue('version');
 		if (version_compare($currentVersion, '7.0.0.0', '>=') &&
-			version_compare($currentVersion, '7.0.2.2', '<=')) {
+			version_compare($currentVersion, '7.0.3.4', '<=')) {
 			$steps[] = new \OC\Repair\Preview();
 		}
 
-- 
GitLab


From 4643a5d2389fa5d7432dd319e9ad12d686aecfef Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 25 Nov 2014 16:15:32 +0100
Subject: [PATCH 532/616] replace \OC:: with \OC::->getSession()

---
 apps/files_encryption/lib/session.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 3cb02704188..132748b6ea5 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -126,8 +126,8 @@ class Session {
 	 * remove keys from session
 	 */
 	public function removeKeys() {
-		\OC::$session->remove('publicSharePrivateKey');
-		\OC::$session->remove('privateKey');
+		\OC::$server->getSession()->remove('publicSharePrivateKey');
+		\OC::$server->getSession()->remove('privateKey');
 	}
 
 	/**
-- 
GitLab


From fc116f563fec20447e7300605d940cada975154c Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 25 Nov 2014 16:12:12 +0100
Subject: [PATCH 533/616] Allow read-only configuration

Workaround required for IIS setups running ownCloud to prevent dataloss.

Long-term solution would be to move some configuration settings to the database
---
 config/config.sample.php     |  9 +++++++++
 lib/base.php                 |  6 +++---
 lib/private/helper.php       |  8 ++++++++
 settings/admin.php           |  1 +
 settings/templates/admin.php | 20 +++++++++++++++++---
 5 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index bf26172c494..b5e62d0366c 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -434,6 +434,15 @@ $CONFIG = array(
  */
 'check_for_working_htaccess' => true,
 
+/**
+ * In certain environments it is desired to have a read-only config file.
+ * When this switch is set to ``true`` ownCloud will not verify whether the
+ * configuration is writable. However, it will not be possible to configure
+ * all options via the web-interface. Furthermore, when updating ownCloud
+ * it is required to make the config file writable again for the update
+ * process.
+ */
+'config_is_read_only' => false,
 
 /**
  * Logging
diff --git a/lib/base.php b/lib/base.php
index 82c0c7aa6d0..0c9dbb30a73 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -194,9 +194,9 @@ class OC {
 
 	public static function checkConfig() {
 		$l = \OC::$server->getL10N('lib');
-		if (file_exists(self::$configDir . "/config.php")
-			and !is_writable(self::$configDir . "/config.php")
-		) {
+		$configFileWritable = file_exists(self::$configDir . "/config.php") && is_writable(self::$configDir . "/config.php");
+		if (!$configFileWritable && !OC_Helper::isReadOnlyConfigEnabled()
+			|| !$configFileWritable && \OCP\Util::needUpgrade()) {
 			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";
diff --git a/lib/private/helper.php b/lib/private/helper.php
index be448b8ff9b..5f46c1311cc 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -974,4 +974,12 @@ class OC_Helper {
 		return array('free' => $free, 'used' => $used, 'total' => $total, 'relative' => $relative);
 
 	}
+
+	/**
+	 * Returns whether the config file is set manually to read-only
+	 * @return bool
+	 */
+	public static function isReadOnlyConfigEnabled() {
+		return \OC::$server->getConfig()->getSystemValue('config_is_read_only', false);
+	}
 }
diff --git a/settings/admin.php b/settings/admin.php
index a669974891c..50a4ac4f1c8 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -33,6 +33,7 @@ $template->assign('mail_smtppassword', $config->getSystemValue("mail_smtppasswor
 $template->assign('entries', $entries);
 $template->assign('entriesremain', $entriesRemaining);
 $template->assign('htaccessworking', $htAccessWorking);
+$template->assign('readOnlyConfigEnabled', OC_Helper::isReadOnlyConfigEnabled());
 $template->assign('isLocaleWorking', OC_Util::isSetLocaleWorking());
 $template->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8());
 $template->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking());
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 166e36a3605..d29ea4c7f7f 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -86,14 +86,28 @@ if (!$_['isConnectedViaHTTPS']) {
 // is htaccess working ?
 if (!$_['htaccessworking']) {
 	?>
-<div class="section">
-	<h2><?php p($l->t('Security Warning'));?></h2>
+	<div class="section">
+		<h2><?php p($l->t('Security Warning')); ?></h2>
 
 	<span class="securitywarning">
 		<?php p($l->t('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.')); ?>
 	</span>
 
-</div>
+	</div>
+<?php
+}
+
+// is read only config enabled
+if ($_['readOnlyConfigEnabled']) {
+?>
+<div class="section">
+	<h2><?php p($l->t('Read-Only config enabled'));?></h2>
+
+	<span class="securitywarning">
+		<?php p($l->t('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.')); ?>
+	</span>
+
+	</div>
 <?php
 }
 // Are doc blocks accessible?
-- 
GitLab


From 711912a7b3f48065b220a909e8889aba5a93d105 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 25 Nov 2014 16:27:27 +0100
Subject: [PATCH 534/616] Move namespaced constants to namespaced class

---
 lib/public/constants.php | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/public/constants.php b/lib/public/constants.php
index 350646a0ac0..78cafd11847 100644
--- a/lib/public/constants.php
+++ b/lib/public/constants.php
@@ -26,15 +26,37 @@
 
 namespace OCP;
 
-/**
- * CRUDS permissions.
- */
+/** @deprecated Use \OCP\Constants::PERMISSION_CREATE instead */
 const PERMISSION_CREATE = 4;
+
+/** @deprecated Use \OCP\Constants::PERMISSION_READ instead */
 const PERMISSION_READ = 1;
+
+/** @deprecated Use \OCP\Constants::PERMISSION_UPDATE instead */
 const PERMISSION_UPDATE = 2;
+
+/** @deprecated Use \OCP\Constants::PERMISSION_DELETE instead */
 const PERMISSION_DELETE = 8;
+
+/** @deprecated Use \OCP\Constants::PERMISSION_SHARE instead */
 const PERMISSION_SHARE = 16;
+
+/** @deprecated Use \OCP\Constants::PERMISSION_ALL instead */
 const PERMISSION_ALL = 31;
 
+/** @deprecated Use \OCP\Constants::FILENAME_INVALID_CHARS instead */
 const FILENAME_INVALID_CHARS = "\\/<>:\"|?*\n";
 
+class Constants {
+	/**
+	 * CRUDS permissions.
+	 */
+	const PERMISSION_CREATE = 4;
+	const PERMISSION_READ = 1;
+	const PERMISSION_UPDATE = 2;
+	const PERMISSION_DELETE = 8;
+	const PERMISSION_SHARE = 16;
+	const PERMISSION_ALL = 31;
+
+	const FILENAME_INVALID_CHARS = "\\/<>:\"|?*\n";
+}
-- 
GitLab


From a6c088a1ef1ff8f1e1161ab9a61d8f1e57231b15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 29 Oct 2014 17:23:27 +0100
Subject: [PATCH 535/616] adding new config parameter for sqlite to specify the
 journal mode

---
 config/config.sample.php             |  6 +++++
 lib/private/db/connectionfactory.php |  4 +++-
 lib/private/db/sqlitesessioninit.php | 10 ++++++++-
 tests/preseed-config.php             | 33 ++++++++++++++--------------
 4 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 2287b7af7dd..bacde038b91 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -133,6 +133,12 @@ $CONFIG = 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
diff --git a/lib/private/db/connectionfactory.php b/lib/private/db/connectionfactory.php
index f6253e09b95..58043b30440 100644
--- a/lib/private/db/connectionfactory.php
+++ b/lib/private/db/connectionfactory.php
@@ -90,7 +90,8 @@ class ConnectionFactory {
 				$eventManager->addEventSubscriber(new \Doctrine\DBAL\Event\Listeners\OracleSessionInit);
 				break;
 			case 'sqlite3':
-				$eventManager->addEventSubscriber(new SQLiteSessionInit);
+				$journalMode = $additionalConnectionParams['sqlite.journal_mode'];
+				$eventManager->addEventSubscriber(new SQLiteSessionInit(true, $journalMode));
 				break;
 		}
 		$connection = \Doctrine\DBAL\DriverManager::getConnection(
@@ -153,6 +154,7 @@ class ConnectionFactory {
 		}
 
 		$connectionParams['tablePrefix'] = $config->getSystemValue('dbtableprefix', 'oc_');
+		$connectionParams['sqlite.journal_mode'] = $config->getSystemValue('sqlite.journal_mode', 'WAL');
 
 		//additional driver options, eg. for mysql ssl
 		$driverOptions = $config->getSystemValue('dbdriveroptions', null);
diff --git a/lib/private/db/sqlitesessioninit.php b/lib/private/db/sqlitesessioninit.php
index 7e1166be95b..1fff22b883a 100644
--- a/lib/private/db/sqlitesessioninit.php
+++ b/lib/private/db/sqlitesessioninit.php
@@ -18,13 +18,20 @@ class SQLiteSessionInit implements EventSubscriber {
 	 */
 	private $caseSensitiveLike;
 
+	/**
+	 * @var string
+	 */
+	private $journalMode;
+
 	/**
 	 * Configure case sensitive like for each connection
 	 *
 	 * @param bool $caseSensitiveLike
+	 * @param string $journalMode
 	 */
-	public function __construct($caseSensitiveLike = true) {
+	public function __construct($caseSensitiveLike, $journalMode) {
 		$this->caseSensitiveLike = $caseSensitiveLike;
+		$this->journalMode = $journalMode;
 	}
 
 	/**
@@ -34,6 +41,7 @@ class SQLiteSessionInit implements EventSubscriber {
 	public function postConnect(ConnectionEventArgs $args) {
 		$sensitive = ($this->caseSensitiveLike) ? 'true' : 'false';
 		$args->getConnection()->executeUpdate('PRAGMA case_sensitive_like = ' . $sensitive);
+		$args->getConnection()->executeUpdate('PRAGMA journal_mode = ' . $this->journalMode);
 	}
 
 	public function getSubscribedEvents() {
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 3fd5b3cb7fc..3f41573bf29 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -1,22 +1,21 @@
 <?php
 $CONFIG = array (
-  "appstoreenabled" => false,
-  'apps_paths' =>
-  array (
-    0 =>
-    array (
-      'path' => OC::$SERVERROOT.'/apps',
-      'url' => '/apps',
-      'writable' => true,
-    ),
-    1 =>
-    array (
-      'path' => OC::$SERVERROOT.'/apps2',
-      'url' => '/apps2',
-      'writable' => false,
-    )
-    ),
-
+	"appstoreenabled" => false,
+	'apps_paths' =>
+		array (
+			0 =>
+				array (
+					'path' => OC::$SERVERROOT.'/apps',
+					'url' => '/apps',
+					'writable' => true,
+				),
+			1 =>
+				array (
+					'path' => OC::$SERVERROOT.'/apps2',
+					'url' => '/apps2',
+					'writable' => false,
+				)
+		),
 );
 
 if(substr(strtolower(PHP_OS), 0, 3) == "win") {
-- 
GitLab


From 2c39aec8cb8ce7f74c8edd1111e7f7b6a70cf7c5 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 25 Nov 2014 16:28:41 +0100
Subject: [PATCH 536/616] Replace deprecated constant with new class constant

---
 apps/files/ajax/upload.php                    |   6 +-
 apps/files_encryption/tests/hooks.php         |   2 +-
 apps/files_encryption/tests/share.php         |  22 +--
 apps/files_external/lib/api.php               |   4 +-
 apps/files_sharing/ajax/list.php              |   4 +-
 apps/files_sharing/ajax/shareinfo.php         |   2 +-
 .../lib/controllers/sharecontroller.php       |   2 +-
 apps/files_sharing/lib/readonlycache.php      |   4 +-
 apps/files_sharing/lib/readonlywrapper.php    |   2 +-
 apps/files_sharing/lib/sharedstorage.php      |  14 +-
 apps/files_sharing/publicwebdav.php           |   2 +-
 apps/files_sharing/tests/api.php              |   6 +-
 apps/files_sharing/tests/cache.php            |   4 +-
 apps/files_sharing/tests/share.php            |  28 ++--
 apps/files_trashbin/lib/helper.php            |   2 +-
 apps/files_versions/tests/versions.php        |   4 +-
 lib/private/contacts/localaddressbook.php     |   2 +-
 lib/private/contactsmanager.php               |   4 +-
 lib/private/files/fileinfo.php                |  10 +-
 lib/private/files/node/file.php               |  10 +-
 lib/private/files/node/folder.php             |   8 +-
 lib/private/files/node/node.php               |  10 +-
 lib/private/files/node/root.php               |   2 +-
 .../files/objectstore/objectstorestorage.php  |   6 +-
 lib/private/files/storage/common.php          |  10 +-
 lib/private/files/storage/dav.php             |  24 +--
 lib/private/files/view.php                    |  10 +-
 lib/private/share/share.php                   |  12 +-
 lib/private/util.php                          |   2 +-
 lib/public/files/fileinfo.php                 |  12 +-
 lib/public/files/node.php                     |  10 +-
 lib/public/iavatar.php                        |   6 +-
 lib/public/template.php                       |   2 +-
 lib/public/util.php                           |   4 +-
 tests/lib/connector/sabre/file.php            |  14 +-
 tests/lib/connector/sabre/node.php            |  18 +--
 tests/lib/files/node/file.php                 |  28 ++--
 tests/lib/files/node/folder.php               |  14 +-
 tests/lib/files/node/node.php                 |   6 +-
 tests/lib/share/share.php                     | 140 +++++++++---------
 tests/lib/tags.php                            |   2 +-
 41 files changed, 237 insertions(+), 237 deletions(-)

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index b960e02ced7..5c9c93b5646 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -7,7 +7,7 @@ OCP\JSON::setContentTypeHeader('text/plain');
 // If not, check the login.
 // If no token is sent along, rely on login only
 
-$allowedPermissions = OCP\PERMISSION_ALL;
+$allowedPermissions = \OCP\Constants::PERMISSION_ALL;
 $errorCode = null;
 
 $l = \OC::$server->getL10N('files');
@@ -27,7 +27,7 @@ if (empty($_POST['dirToken'])) {
 	\OC_User::setIncognitoMode(true);
 
 	// return only read permissions for public upload
-	$allowedPermissions = OCP\PERMISSION_READ;
+	$allowedPermissions = \OCP\Constants::PERMISSION_READ;
 	$publicDirectory = !empty($_POST['subdir']) ? $_POST['subdir'] : '/';
 
 	$linkItem = OCP\Share::getShareByToken($_POST['dirToken']);
@@ -36,7 +36,7 @@ if (empty($_POST['dirToken'])) {
 		die();
 	}
 
-	if (!($linkItem['permissions'] & OCP\PERMISSION_CREATE)) {
+	if (!($linkItem['permissions'] & \OCP\Constants::PERMISSION_CREATE)) {
 		OCP\JSON::checkLoggedIn();
 	} else {
 		// resolve reshares
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index 9ea84cc94c2..4b8be0c7c1c 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -256,7 +256,7 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
 
 		// share the file with user2
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_HOOKS_USER2, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_ENCRYPTION_HOOKS_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// check if new share key exists
 		$this->assertTrue($this->rootView->file_exists(
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 20ee2cc7064..24b828433d0 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -171,7 +171,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// login as admin
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -232,7 +232,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files/' . $this->filename);
 
 		// share the file with user3
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, \OCP\Constants::PERMISSION_ALL);
 
 		// login as admin
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -328,7 +328,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the folder with user1
-		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// login as admin
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -406,7 +406,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file with user3
-		\OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('folder', $fileInfoSubFolder['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3, \OCP\Constants::PERMISSION_ALL);
 
 		// login as admin
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -437,7 +437,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
 
 		// share the file with user3
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4, \OCP\Constants::PERMISSION_ALL);
 
 		// login as admin
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -539,7 +539,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_LINK, false, \OCP\Constants::PERMISSION_ALL);
 
 		// login as admin
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -617,7 +617,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		\OC_FileProxy::$enabled = $proxyStatus;
 
 		// share the file
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, \OCP\Constants::PERMISSION_ALL);
 
 		// login as admin
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -923,7 +923,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// share the file
 		try {
-			\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, OCP\PERMISSION_ALL);
+			\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_GROUP1, \OCP\Constants::PERMISSION_ALL);
 		} catch (Exception $e) {
 			$this->assertEquals(0, strpos($e->getMessage(), "Following users are not set up for encryption"));
 		}
@@ -991,7 +991,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
 
 		// share the file
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// check if share key for user2 exists
 		$this->assertTrue($this->view->file_exists(
@@ -1059,7 +1059,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
 
 		// share the folder
-		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		\OC\Files\Filesystem::rename($folder, $newFolder);
 
@@ -1117,7 +1117,7 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertTrue($fileInfo instanceof \OC\Files\FileInfo);
 
 		// share the folder
-		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// check that the share keys exist
 		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
diff --git a/apps/files_external/lib/api.php b/apps/files_external/lib/api.php
index 81ebd4e886a..3b5e0e1759a 100644
--- a/apps/files_external/lib/api.php
+++ b/apps/files_external/lib/api.php
@@ -45,10 +45,10 @@ class Api {
 
 		$isSystemMount = !$mountConfig['personal'];
 
-		$permissions = \OCP\PERMISSION_READ;
+		$permissions = \OCP\Constants::PERMISSION_READ;
 		// personal mounts can be deleted
 		if (!$isSystemMount) {
-			$permissions |= \OCP\PERMISSION_DELETE;
+			$permissions |= \OCP\Constants::PERMISSION_DELETE;
 		}
 
 		$entry = array(
diff --git a/apps/files_sharing/ajax/list.php b/apps/files_sharing/ajax/list.php
index 7e2e54a1bd9..073c86365be 100644
--- a/apps/files_sharing/ajax/list.php
+++ b/apps/files_sharing/ajax/list.php
@@ -65,7 +65,7 @@ $formattedFiles = array();
 foreach ($files as $file) {
 	$entry = \OCA\Files\Helper::formatFileInfo($file);
 	unset($entry['directory']); // for now
-	$entry['permissions'] = \OCP\PERMISSION_READ;
+	$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
 	$formattedFiles[] = $entry;
 }
 
@@ -78,7 +78,7 @@ $permissions = $linkItem['permissions'];
 // if globally disabled
 if (\OC::$server->getAppConfig()->getValue('core', 'shareapi_allow_public_upload', 'yes') === 'no') {
 	// only allow reading
-	$permissions = \OCP\PERMISSION_READ;
+	$permissions = \OCP\Constants::PERMISSION_READ;
 }
 
 $data['permissions'] = $permissions;
diff --git a/apps/files_sharing/ajax/shareinfo.php b/apps/files_sharing/ajax/shareinfo.php
index e87b0779e8d..f196a67a9dd 100644
--- a/apps/files_sharing/ajax/shareinfo.php
+++ b/apps/files_sharing/ajax/shareinfo.php
@@ -31,7 +31,7 @@ $linkItem = $data['linkItem'];
 // Load the files
 $path = $data['realPath'];
 
-$isWritable = $linkItem['permissions'] & (\OCP\PERMISSION_UPDATE | \OCP\PERMISSION_CREATE);
+$isWritable = $linkItem['permissions'] & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 if (!$isWritable) {
 	\OC\Files\Filesystem::addStorageWrapper('readonly', function ($mountPoint, $storage) {
 		return new \OCA\Files_Sharing\ReadOnlyWrapper(array('storage' => $storage));
diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 076df3c46f6..ac92b5a3c13 100644
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -182,7 +182,7 @@ class ShareController extends Controller {
 			$folder = new Template('files', 'list', '');
 			$folder->assign('dir', $getPath);
 			$folder->assign('dirToken', $linkItem['token']);
-			$folder->assign('permissions', OCP\PERMISSION_READ);
+			$folder->assign('permissions', \OCP\Constants::PERMISSION_READ);
 			$folder->assign('isPublic', true);
 			$folder->assign('publicUploadEnabled', 'no');
 			$folder->assign('files', $files);
diff --git a/apps/files_sharing/lib/readonlycache.php b/apps/files_sharing/lib/readonlycache.php
index f129ca49433..6dd3b9cf61d 100644
--- a/apps/files_sharing/lib/readonlycache.php
+++ b/apps/files_sharing/lib/readonlycache.php
@@ -13,14 +13,14 @@ use OC\Files\Cache\Cache;
 class ReadOnlyCache extends Cache {
 	public function get($path) {
 		$data = parent::get($path);
-		$data['permissions'] &= (\OCP\PERMISSION_READ | \OCP\PERMISSION_SHARE);
+		$data['permissions'] &= (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE);
 		return $data;
 	}
 
 	public function getFolderContents($path) {
 		$content = parent::getFolderContents($path);
 		foreach ($content as &$data) {
-			$data['permissions'] &= (\OCP\PERMISSION_READ | \OCP\PERMISSION_SHARE);
+			$data['permissions'] &= (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE);
 		}
 		return $content;
 	}
diff --git a/apps/files_sharing/lib/readonlywrapper.php b/apps/files_sharing/lib/readonlywrapper.php
index 45ed3fd68bb..58a5695aff8 100644
--- a/apps/files_sharing/lib/readonlywrapper.php
+++ b/apps/files_sharing/lib/readonlywrapper.php
@@ -24,7 +24,7 @@ class ReadOnlyWrapper extends Wrapper {
 	}
 
 	public function getPermissions($path) {
-		return $this->storage->getPermissions($path) & (\OCP\PERMISSION_READ | \OCP\PERMISSION_SHARE);
+		return $this->storage->getPermissions($path) & (\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE);
 	}
 
 	public function rename($path1, $path2) {
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 19ee6085e47..1ac57053e25 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -67,7 +67,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 				if ($source) {
 					$source['path'] .= '.part';
 					// All partial files have delete permission
-					$source['permissions'] |= \OCP\PERMISSION_DELETE;
+					$source['permissions'] |= \OCP\Constants::PERMISSION_DELETE;
 				}
 			} else {
 				$source = \OC_Share_Backend_File::getSource($target, $this->getMountPoint(), $this->getItemType());
@@ -109,11 +109,11 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 		$permissions = $this->share['permissions'];
 		// part files and the mount point always have delete permissions
 		if ($target === '' || pathinfo($target, PATHINFO_EXTENSION) === 'part') {
-			$permissions |= \OCP\PERMISSION_DELETE;
+			$permissions |= \OCP\Constants::PERMISSION_DELETE;
 		}
 
 		if (\OC_Util::isSharingDisabledForUser()) {
-			$permissions &= ~\OCP\PERMISSION_SHARE;
+			$permissions &= ~\OCP\Constants::PERMISSION_SHARE;
 		}
 
 		return $permissions;
@@ -197,7 +197,7 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	}
 
 	public function isCreatable($path) {
-		return ($this->getPermissions($path) & \OCP\PERMISSION_CREATE);
+		return ($this->getPermissions($path) & \OCP\Constants::PERMISSION_CREATE);
 	}
 
 	public function isReadable($path) {
@@ -205,18 +205,18 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	}
 
 	public function isUpdatable($path) {
-		return ($this->getPermissions($path) & \OCP\PERMISSION_UPDATE);
+		return ($this->getPermissions($path) & \OCP\Constants::PERMISSION_UPDATE);
 	}
 
 	public function isDeletable($path) {
-		return ($this->getPermissions($path) & \OCP\PERMISSION_DELETE);
+		return ($this->getPermissions($path) & \OCP\Constants::PERMISSION_DELETE);
 	}
 
 	public function isSharable($path) {
 		if (\OCP\Util::isSharingDisabledForUser()) {
 			return false;
 		}
-		return ($this->getPermissions($path) & \OCP\PERMISSION_SHARE);
+		return ($this->getPermissions($path) & \OCP\Constants::PERMISSION_SHARE);
 	}
 
 	public function file_exists($path) {
diff --git a/apps/files_sharing/publicwebdav.php b/apps/files_sharing/publicwebdav.php
index 03e43967a40..2c7ccf8d92c 100644
--- a/apps/files_sharing/publicwebdav.php
+++ b/apps/files_sharing/publicwebdav.php
@@ -41,7 +41,7 @@ $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav'));
 $server->subscribeEvent('beforeMethod', function () use ($server, $objectTree, $authBackend) {
 	$share = $authBackend->getShare();
 	$owner = $share['uid_owner'];
-	$isWritable = $share['permissions'] & (\OCP\PERMISSION_UPDATE | \OCP\PERMISSION_CREATE);
+	$isWritable = $share['permissions'] & (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_CREATE);
 	$fileId = $share['file_source'];
 
 	if (!$isWritable) {
diff --git a/apps/files_sharing/tests/api.php b/apps/files_sharing/tests/api.php
index e550dcc27db..1259197423b 100644
--- a/apps/files_sharing/tests/api.php
+++ b/apps/files_sharing/tests/api.php
@@ -788,7 +788,7 @@ class Test_Files_Sharing_Api extends TestCase {
 		$fileInfo = $this->view->getFileInfo($this->filename);
 
 		$result = \OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
-				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
+				\Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// share was successful?
 		$this->assertTrue($result);
@@ -822,7 +822,7 @@ class Test_Files_Sharing_Api extends TestCase {
 
 		// check if share have expected permissions, single shared files never have
 		// delete permissions
-		$this->assertEquals(\OCP\PERMISSION_ALL & ~\OCP\PERMISSION_DELETE, $userShare['permissions']);
+		$this->assertEquals(\OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_DELETE, $userShare['permissions']);
 
 		// update permissions
 
@@ -1228,7 +1228,7 @@ class Test_Files_Sharing_Api extends TestCase {
 		$info = OC\Files\Filesystem::getFileInfo($this->filename);
 		$this->assertTrue($info instanceof \OC\Files\FileInfo);
 
-		$result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, null, \OCP\PERMISSION_READ);
+		$result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ);
 		$this->assertTrue(is_string($result));
 
 		$result = \OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, \Test_Files_Sharing_Api::TEST_FILES_SHARING_API_USER2, 31);
diff --git a/apps/files_sharing/tests/cache.php b/apps/files_sharing/tests/cache.php
index b6a44f464f9..aec1983bad3 100644
--- a/apps/files_sharing/tests/cache.php
+++ b/apps/files_sharing/tests/cache.php
@@ -348,7 +348,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
 		\OC\Files\Filesystem::file_put_contents('test.txt', 'foo');
 		$info = \OC\Files\Filesystem::getFileInfo('test.txt');
-		\OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $info->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_ALL);
 		\OC_Util::tearDownFS();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
@@ -369,7 +369,7 @@ class Test_Files_Sharing_Cache extends TestCase {
 		\OC\Files\Filesystem::touch('foo/bar/test.txt');
 		$folderInfo = \OC\Files\Filesystem::getFileInfo('foo');
 		$fileInfo = \OC\Files\Filesystem::getFileInfo('foo/bar/test.txt');
-		\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('folder', $folderInfo->getId(), \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_ALL);
 		\OC_Util::tearDownFS();
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER2);
diff --git a/apps/files_sharing/tests/share.php b/apps/files_sharing/tests/share.php
index 4318d3c510e..f76f92734d0 100644
--- a/apps/files_sharing/tests/share.php
+++ b/apps/files_sharing/tests/share.php
@@ -105,12 +105,12 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 		$fileinfo = $this->view->getFileInfo($this->filename);
 
 		$result = \OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP,
-				\Test_Files_Sharing::TEST_FILES_SHARING_API_GROUP1, \OCP\PERMISSION_READ);
+				\Test_Files_Sharing::TEST_FILES_SHARING_API_GROUP1, \OCP\Constants::PERMISSION_READ);
 
 		$this->assertTrue($result);
 
 		$result = \OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER,
-				\Test_Files_Sharing::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_UPDATE);
+				\Test_Files_Sharing::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_UPDATE);
 
 		$this->assertTrue($result);
 
@@ -124,7 +124,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 		$this->assertSame(1, count($result));
 
 		$share = reset($result);
-		$this->assertSame(\OCP\PERMISSION_READ | \OCP\PERMISSION_UPDATE, $share['permissions']);
+		$this->assertSame(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE, $share['permissions']);
 
 		\OC\Files\Filesystem::rename($this->filename, $this->filename . '-renamed');
 
@@ -136,7 +136,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 		$this->assertSame(1, count($result));
 
 		$share = reset($result);
-		$this->assertSame(\OCP\PERMISSION_READ | \OCP\PERMISSION_UPDATE, $share['permissions']);
+		$this->assertSame(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE, $share['permissions']);
 		$this->assertSame($this->filename . '-renamed', $share['file_target']);
 
 		self::loginHelper(self::TEST_FILES_SHARING_API_USER1);
@@ -157,7 +157,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 
 		$share = reset($result);
 		// only the group share permissions should be available now
-		$this->assertSame(\OCP\PERMISSION_READ, $share['permissions']);
+		$this->assertSame(\OCP\Constants::PERMISSION_READ, $share['permissions']);
 		$this->assertSame($this->filename . '-renamed', $share['file_target']);
 
 	}
@@ -172,8 +172,8 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 		$fileinfo = $this->view->getFileInfo($this->filename);
 
 		// share the file to group1 (user2 is a member of this group) and explicitely to user2
-		\OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, self::TEST_FILES_SHARING_API_GROUP1, \OCP\PERMISSION_ALL);
-		\OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_GROUP, self::TEST_FILES_SHARING_API_GROUP1, \OCP\Constants::PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// user1 should have to shared files
 		$shares = \OCP\Share::getItemsShared('file');
@@ -203,7 +203,7 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 		$this->assertSame(1, count($shares));
 
 		// user1 shares a gain the file directly to user2
-		\OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileinfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_FILES_SHARING_API_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// user2 should see again welcome.txt and the shared file
 		\Test_Files_Sharing::loginHelper(self::TEST_FILES_SHARING_API_USER2);
@@ -271,14 +271,14 @@ class Test_Files_Sharing extends OCA\Files_sharing\Tests\TestCase {
 	}
 
 	function DataProviderTestFileSharePermissions() {
-		$permission1 = \OCP\PERMISSION_ALL;
-		$permission3 = \OCP\PERMISSION_READ;
-		$permission4 = \OCP\PERMISSION_READ | \OCP\PERMISSION_UPDATE;
-		$permission5 = \OCP\PERMISSION_READ | \OCP\PERMISSION_DELETE;
-		$permission6 = \OCP\PERMISSION_READ | \OCP\PERMISSION_UPDATE | \OCP\PERMISSION_DELETE;
+		$permission1 = \OCP\Constants::PERMISSION_ALL;
+		$permission3 = \OCP\Constants::PERMISSION_READ;
+		$permission4 = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE;
+		$permission5 = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_DELETE;
+		$permission6 = \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
 
 		return array(
-			array($permission1, \OCP\PERMISSION_ALL & ~\OCP\PERMISSION_DELETE),
+			array($permission1, \OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_DELETE),
 			array($permission3, $permission3),
 			array($permission4, $permission4),
 			array($permission5, $permission3),
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index c2b81e3dbc8..c99662480df 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -88,7 +88,7 @@ class Helper
 			$entry = \OCA\Files\Helper::formatFileInfo($i);
 			$entry['id'] = $id++;
 			$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
-			$entry['permissions'] = \OCP\PERMISSION_READ;
+			$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
 			if (\OCP\App::isEnabled('files_encryption')) {
 				$entry['isPreviewAvailable'] = false;
 			}
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 436863b28dc..6205a6881f0 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -277,7 +277,7 @@ class Test_Files_Versioning extends \Test\TestCase {
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
 
-		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_VERSIONS_USER2, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_VERSIONS_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
 
@@ -320,7 +320,7 @@ class Test_Files_Versioning extends \Test\TestCase {
 		$this->rootView->file_put_contents($v1, 'version1');
 		$this->rootView->file_put_contents($v2, 'version2');
 
-		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_VERSIONS_USER2, OCP\PERMISSION_ALL);
+		\OCP\Share::shareItem('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, self::TEST_VERSIONS_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		self::loginHelper(self::TEST_VERSIONS_USER2);
 
diff --git a/lib/private/contacts/localaddressbook.php b/lib/private/contacts/localaddressbook.php
index 483bbee83f8..91ddb5798f2 100644
--- a/lib/private/contacts/localaddressbook.php
+++ b/lib/private/contacts/localaddressbook.php
@@ -91,7 +91,7 @@ class LocalAddressBook implements \OCP\IAddressBook {
 	 * @return int
 	 */
 	public function getPermissions() {
-		return \OCP\PERMISSION_READ;
+		return \OCP\Constants::PERMISSION_READ;
 	}
 
 	/**
diff --git a/lib/private/contactsmanager.php b/lib/private/contactsmanager.php
index 338cc048651..737fc4f0e3a 100644
--- a/lib/private/contactsmanager.php
+++ b/lib/private/contactsmanager.php
@@ -62,7 +62,7 @@ namespace OC {
 				return null;
 			}
 
-			if ($addressBook->getPermissions() & \OCP\PERMISSION_DELETE) {
+			if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_DELETE) {
 				return null;
 			}
 
@@ -83,7 +83,7 @@ namespace OC {
 				return null;
 			}
 
-			if ($addressBook->getPermissions() & \OCP\PERMISSION_CREATE) {
+			if ($addressBook->getPermissions() & \OCP\Constants::PERMISSION_CREATE) {
 				return null;
 			}
 
diff --git a/lib/private/files/fileinfo.php b/lib/private/files/fileinfo.php
index d6d6a245e44..8bab51f0737 100644
--- a/lib/private/files/fileinfo.php
+++ b/lib/private/files/fileinfo.php
@@ -173,14 +173,14 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	 * @return bool
 	 */
 	public function isReadable() {
-		return $this->checkPermissions(\OCP\PERMISSION_READ);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_READ);
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function isUpdateable() {
-		return $this->checkPermissions(\OCP\PERMISSION_UPDATE);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE);
 	}
 
 	/**
@@ -189,21 +189,21 @@ class FileInfo implements \OCP\Files\FileInfo, \ArrayAccess {
 	 * @return bool
 	 */
 	public function isCreatable() {
-		return $this->checkPermissions(\OCP\PERMISSION_CREATE);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_CREATE);
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function isDeletable() {
-		return $this->checkPermissions(\OCP\PERMISSION_DELETE);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_DELETE);
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function isShareable() {
-		return $this->checkPermissions(\OCP\PERMISSION_SHARE);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_SHARE);
 	}
 
 	/**
diff --git a/lib/private/files/node/file.php b/lib/private/files/node/file.php
index 75d5e0166b6..81e251c20b8 100644
--- a/lib/private/files/node/file.php
+++ b/lib/private/files/node/file.php
@@ -16,7 +16,7 @@ class File extends Node implements \OCP\Files\File {
 	 * @throws \OCP\Files\NotPermittedException
 	 */
 	public function getContent() {
-		if ($this->checkPermissions(\OCP\PERMISSION_READ)) {
+		if ($this->checkPermissions(\OCP\Constants::PERMISSION_READ)) {
 			/**
 			 * @var \OC\Files\Storage\Storage $storage;
 			 */
@@ -31,7 +31,7 @@ class File extends Node implements \OCP\Files\File {
 	 * @throws \OCP\Files\NotPermittedException
 	 */
 	public function putContent($data) {
-		if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) {
+		if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) {
 			$this->sendHooks(array('preWrite'));
 			$this->view->file_put_contents($this->path, $data);
 			$this->sendHooks(array('postWrite'));
@@ -55,7 +55,7 @@ class File extends Node implements \OCP\Files\File {
 	public function fopen($mode) {
 		$preHooks = array();
 		$postHooks = array();
-		$requiredPermissions = \OCP\PERMISSION_READ;
+		$requiredPermissions = \OCP\Constants::PERMISSION_READ;
 		switch ($mode) {
 			case 'r+':
 			case 'rb+':
@@ -73,7 +73,7 @@ class File extends Node implements \OCP\Files\File {
 			case 'ab':
 				$preHooks[] = 'preWrite';
 				$postHooks[] = 'postWrite';
-				$requiredPermissions |= \OCP\PERMISSION_UPDATE;
+				$requiredPermissions |= \OCP\Constants::PERMISSION_UPDATE;
 				break;
 		}
 
@@ -88,7 +88,7 @@ class File extends Node implements \OCP\Files\File {
 	}
 
 	public function delete() {
-		if ($this->checkPermissions(\OCP\PERMISSION_DELETE)) {
+		if ($this->checkPermissions(\OCP\Constants::PERMISSION_DELETE)) {
 			$this->sendHooks(array('preDelete'));
 			$this->view->unlink($this->path);
 			$nonExisting = new NonExistingFile($this->root, $this->view, $this->path);
diff --git a/lib/private/files/node/folder.php b/lib/private/files/node/folder.php
index 8c7acc339ae..83e20871528 100644
--- a/lib/private/files/node/folder.php
+++ b/lib/private/files/node/folder.php
@@ -180,7 +180,7 @@ class Folder extends Node implements \OCP\Files\Folder {
 	 * @throws \OCP\Files\NotPermittedException
 	 */
 	public function newFolder($path) {
-		if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) {
+		if ($this->checkPermissions(\OCP\Constants::PERMISSION_CREATE)) {
 			$fullPath = $this->getFullPath($path);
 			$nonExisting = new NonExistingFolder($this->root, $this->view, $fullPath);
 			$this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
@@ -201,7 +201,7 @@ class Folder extends Node implements \OCP\Files\Folder {
 	 * @throws \OCP\Files\NotPermittedException
 	 */
 	public function newFile($path) {
-		if ($this->checkPermissions(\OCP\PERMISSION_CREATE)) {
+		if ($this->checkPermissions(\OCP\Constants::PERMISSION_CREATE)) {
 			$fullPath = $this->getFullPath($path);
 			$nonExisting = new NonExistingFile($this->root, $this->view, $fullPath);
 			$this->root->emit('\OC\Files', 'preWrite', array($nonExisting));
@@ -325,11 +325,11 @@ class Folder extends Node implements \OCP\Files\Folder {
 	 * @return bool
 	 */
 	public function isCreatable() {
-		return $this->checkPermissions(\OCP\PERMISSION_CREATE);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_CREATE);
 	}
 
 	public function delete() {
-		if ($this->checkPermissions(\OCP\PERMISSION_DELETE)) {
+		if ($this->checkPermissions(\OCP\Constants::PERMISSION_DELETE)) {
 			$this->sendHooks(array('preDelete'));
 			$this->view->rmdir($this->path);
 			$nonExisting = new NonExistingFolder($this->root, $this->view, $this->path);
diff --git a/lib/private/files/node/node.php b/lib/private/files/node/node.php
index bc075911749..c52f5bbd54f 100644
--- a/lib/private/files/node/node.php
+++ b/lib/private/files/node/node.php
@@ -81,7 +81,7 @@ class Node implements \OCP\Files\Node {
 	 * @throws \OCP\Files\NotPermittedException
 	 */
 	public function touch($mtime = null) {
-		if ($this->checkPermissions(\OCP\PERMISSION_UPDATE)) {
+		if ($this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE)) {
 			$this->sendHooks(array('preTouch'));
 			$this->view->touch($this->path, $mtime);
 			$this->sendHooks(array('postTouch'));
@@ -163,28 +163,28 @@ class Node implements \OCP\Files\Node {
 	 * @return bool
 	 */
 	public function isReadable() {
-		return $this->checkPermissions(\OCP\PERMISSION_READ);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_READ);
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function isUpdateable() {
-		return $this->checkPermissions(\OCP\PERMISSION_UPDATE);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_UPDATE);
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function isDeletable() {
-		return $this->checkPermissions(\OCP\PERMISSION_DELETE);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_DELETE);
 	}
 
 	/**
 	 * @return bool
 	 */
 	public function isShareable() {
-		return $this->checkPermissions(\OCP\PERMISSION_SHARE);
+		return $this->checkPermissions(\OCP\Constants::PERMISSION_SHARE);
 	}
 
 	/**
diff --git a/lib/private/files/node/root.php b/lib/private/files/node/root.php
index 18e7a6b681a..1e8387dc5cb 100644
--- a/lib/private/files/node/root.php
+++ b/lib/private/files/node/root.php
@@ -262,7 +262,7 @@ class Root extends Folder implements Emitter {
 	 * @return int
 	 */
 	public function getPermissions() {
-		return \OCP\PERMISSION_CREATE;
+		return \OCP\Constants::PERMISSION_CREATE;
 	}
 
 	/**
diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php
index ae8bff52896..b0095ad94bb 100644
--- a/lib/private/files/objectstore/objectstorestorage.php
+++ b/lib/private/files/objectstore/objectstorestorage.php
@@ -72,7 +72,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 			'size' => 0,
 			'mtime' => $mTime,
 			'storage_mtime' => $mTime,
-			'permissions' => \OCP\PERMISSION_ALL,
+			'permissions' => \OCP\Constants::PERMISSION_ALL,
 		);
 
 		if ($dirName === '' && !$parentExists) {
@@ -332,7 +332,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 				'size' => 0,
 				'mtime' => $mtime,
 				'storage_mtime' => $mtime,
-				'permissions' => \OCP\PERMISSION_ALL,
+				'permissions' => \OCP\Constants::PERMISSION_ALL,
 			);
 			$fileId = $this->getCache()->put($path, $stat);
 			try {
@@ -357,7 +357,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
 		if (empty($stat)) {
 			// create new file
 			$stat = array(
-				'permissions' => \OCP\PERMISSION_ALL,
+				'permissions' => \OCP\Constants::PERMISSION_ALL,
 			);
 		}
 		// update stat with new data
diff --git a/lib/private/files/storage/common.php b/lib/private/files/storage/common.php
index 518d3ec400c..d76c6aa031b 100644
--- a/lib/private/files/storage/common.php
+++ b/lib/private/files/storage/common.php
@@ -113,19 +113,19 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function getPermissions($path) {
 		$permissions = 0;
 		if ($this->isCreatable($path)) {
-			$permissions |= \OCP\PERMISSION_CREATE;
+			$permissions |= \OCP\Constants::PERMISSION_CREATE;
 		}
 		if ($this->isReadable($path)) {
-			$permissions |= \OCP\PERMISSION_READ;
+			$permissions |= \OCP\Constants::PERMISSION_READ;
 		}
 		if ($this->isUpdatable($path)) {
-			$permissions |= \OCP\PERMISSION_UPDATE;
+			$permissions |= \OCP\Constants::PERMISSION_UPDATE;
 		}
 		if ($this->isDeletable($path)) {
-			$permissions |= \OCP\PERMISSION_DELETE;
+			$permissions |= \OCP\Constants::PERMISSION_DELETE;
 		}
 		if ($this->isSharable($path)) {
-			$permissions |= \OCP\PERMISSION_SHARE;
+			$permissions |= \OCP\Constants::PERMISSION_SHARE;
 		}
 		return $permissions;
 	}
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index 26fa69408a8..a2832bce009 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -416,19 +416,19 @@ class DAV extends \OC\Files\Storage\Common {
 	}
 
 	public function isUpdatable($path) {
-		return (bool)($this->getPermissions($path) & \OCP\PERMISSION_UPDATE);
+		return (bool)($this->getPermissions($path) & \OCP\Constants::PERMISSION_UPDATE);
 	}
 
 	public function isCreatable($path) {
-		return (bool)($this->getPermissions($path) & \OCP\PERMISSION_CREATE);
+		return (bool)($this->getPermissions($path) & \OCP\Constants::PERMISSION_CREATE);
 	}
 
 	public function isSharable($path) {
-		return (bool)($this->getPermissions($path) & \OCP\PERMISSION_SHARE);
+		return (bool)($this->getPermissions($path) & \OCP\Constants::PERMISSION_SHARE);
 	}
 
 	public function isDeletable($path) {
-		return (bool)($this->getPermissions($path) & \OCP\PERMISSION_DELETE);
+		return (bool)($this->getPermissions($path) & \OCP\Constants::PERMISSION_DELETE);
 	}
 
 	public function getPermissions($path) {
@@ -438,9 +438,9 @@ class DAV extends \OC\Files\Storage\Common {
 		if (isset($response['{http://owncloud.org/ns}permissions'])) {
 			return $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
 		} else if ($this->is_dir($path)) {
-			return \OCP\PERMISSION_ALL;
+			return \OCP\Constants::PERMISSION_ALL;
 		} else if ($this->file_exists($path)) {
-			return \OCP\PERMISSION_ALL - \OCP\PERMISSION_CREATE;
+			return \OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE;
 		} else {
 			return 0;
 		}
@@ -451,19 +451,19 @@ class DAV extends \OC\Files\Storage\Common {
 	 * @return int
 	 */
 	protected function parsePermissions($permissionsString) {
-		$permissions = \OCP\PERMISSION_READ;
+		$permissions = \OCP\Constants::PERMISSION_READ;
 		if (strpos($permissionsString, 'R') !== false) {
-			$permissions |= \OCP\PERMISSION_SHARE;
+			$permissions |= \OCP\Constants::PERMISSION_SHARE;
 		}
 		if (strpos($permissionsString, 'D') !== false) {
-			$permissions |= \OCP\PERMISSION_DELETE;
+			$permissions |= \OCP\Constants::PERMISSION_DELETE;
 		}
 		if (strpos($permissionsString, 'W') !== false) {
-			$permissions |= \OCP\PERMISSION_UPDATE;
+			$permissions |= \OCP\Constants::PERMISSION_UPDATE;
 		}
 		if (strpos($permissionsString, 'CK') !== false) {
-			$permissions |= \OCP\PERMISSION_CREATE;
-			$permissions |= \OCP\PERMISSION_UPDATE;
+			$permissions |= \OCP\Constants::PERMISSION_CREATE;
+			$permissions |= \OCP\Constants::PERMISSION_UPDATE;
 		}
 		return $permissions;
 	}
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 19676524a0e..331ab9ba6cd 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -933,7 +933,7 @@ class View {
 		}
 
 		if ($mount instanceof MoveableMount && $internalPath === '') {
-			$data['permissions'] |= \OCP\PERMISSION_DELETE | \OCP\PERMISSION_UPDATE;
+			$data['permissions'] |= \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_UPDATE;
 		}
 
 		$data = \OC_FileProxy::runPostProxies('getFileInfo', $path, $data);
@@ -988,7 +988,7 @@ class View {
 				}
 				// if sharing was disabled for the user we remove the share permissions
 				if (\OCP\Util::isSharingDisabledForUser()) {
-					$content['permissions'] = $content['permissions'] & ~\OCP\PERMISSION_SHARE;
+					$content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
 				}
 				$files[] = new FileInfo($path . '/' . $content['name'], $storage, $content['path'], $content);
 			}
@@ -1025,9 +1025,9 @@ class View {
 							// do not allow renaming/deleting the mount point if they are not shared files/folders
 							// for shared files/folders we use the permissions given by the owner
 							if ($mount instanceof MoveableMount) {
-								$rootEntry['permissions'] = $permissions | \OCP\PERMISSION_UPDATE | \OCP\PERMISSION_DELETE;
+								$rootEntry['permissions'] = $permissions | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE;
 							} else {
-								$rootEntry['permissions'] = $permissions & (\OCP\PERMISSION_ALL - (\OCP\PERMISSION_UPDATE | \OCP\PERMISSION_DELETE));
+								$rootEntry['permissions'] = $permissions & (\OCP\Constants::PERMISSION_ALL - (\OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE));
 							}
 
 							//remove any existing entry with the same name
@@ -1041,7 +1041,7 @@ class View {
 
 							// if sharing was disabled for the user we remove the share permissions
 							if (\OCP\Util::isSharingDisabledForUser()) {
-								$content['permissions'] = $content['permissions'] & ~\OCP\PERMISSION_SHARE;
+								$content['permissions'] = $content['permissions'] & ~\OCP\Constants::PERMISSION_SHARE;
 							}
 
 							$files[] = new FileInfo($path . '/' . $rootEntry['name'], $subStorage, '', $rootEntry);
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 10fff9aeacf..c6fd1604ac7 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -547,7 +547,7 @@ class Share extends \OC\Share\Constants {
 
 		// single file shares should never have delete permissions
 		if ($itemType === 'file') {
-			$permissions = (int)$permissions & ~\OCP\PERMISSION_DELETE;
+			$permissions = (int)$permissions & ~\OCP\Constants::PERMISSION_DELETE;
 		}
 
 		// Verify share type and sharing conditions are met
@@ -929,7 +929,7 @@ class Share extends \OC\Share\Constants {
 			// Check if permissions were removed
 			if ($item['permissions'] & ~$permissions) {
 				// If share permission is removed all reshares must be deleted
-				if (($item['permissions'] & \OCP\PERMISSION_SHARE) && (~$permissions & \OCP\PERMISSION_SHARE)) {
+				if (($item['permissions'] & \OCP\Constants::PERMISSION_SHARE) && (~$permissions & \OCP\Constants::PERMISSION_SHARE)) {
 					Helper::delete($item['id'], true);
 				} else {
 					$ids = array();
@@ -1458,8 +1458,8 @@ class Share extends \OC\Share\Constants {
 						}
 						// Switch ids if sharing permission is granted on only
 						// one share to ensure correct parent is used if resharing
-						if (~(int)$items[$id]['permissions'] & \OCP\PERMISSION_SHARE
-							&& (int)$row['permissions'] & \OCP\PERMISSION_SHARE) {
+						if (~(int)$items[$id]['permissions'] & \OCP\Constants::PERMISSION_SHARE
+							&& (int)$row['permissions'] & \OCP\Constants::PERMISSION_SHARE) {
 							$items[$row['id']] = $items[$id];
 							$switchedItems[$id] = $row['id'];
 							unset($items[$id]);
@@ -1516,7 +1516,7 @@ class Share extends \OC\Share\Constants {
 			}
 			// Check if resharing is allowed, if not remove share permission
 			if (isset($row['permissions']) && (!self::isResharingAllowed() | \OC_Util::isSharingDisabledForUser())) {
-				$row['permissions'] &= ~\OCP\PERMISSION_SHARE;
+				$row['permissions'] &= ~\OCP\Constants::PERMISSION_SHARE;
 			}
 			// Add display names to result
 			if ( isset($row['share_with']) && $row['share_with'] != '' &&
@@ -1911,7 +1911,7 @@ class Share extends \OC\Share\Constants {
 			}
 
 			// Check if share permissions is granted
-			if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & \OCP\PERMISSION_SHARE) {
+			if (self::isResharingAllowed() && (int)$checkReshare['permissions'] & \OCP\Constants::PERMISSION_SHARE) {
 				if (~(int)$checkReshare['permissions'] & $permissions) {
 					$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));
diff --git a/lib/private/util.php b/lib/private/util.php
index 4190f0aa3d8..a18a4e44232 100644
--- a/lib/private/util.php
+++ b/lib/private/util.php
@@ -1336,7 +1336,7 @@ class OC_Util {
 			return false;
 		}
 		foreach (str_split($trimmed) as $char) {
-			if (strpos(\OCP\FILENAME_INVALID_CHARS, $char) !== false) {
+			if (strpos(\OCP\Constants::FILENAME_INVALID_CHARS, $char) !== false) {
 				return false;
 			}
 		}
diff --git a/lib/public/files/fileinfo.php b/lib/public/files/fileinfo.php
index ec81a541564..3a407ed67ca 100644
--- a/lib/public/files/fileinfo.php
+++ b/lib/public/files/fileinfo.php
@@ -103,12 +103,12 @@ interface FileInfo {
 
 	/**
 	 * Get the permissions of the file or folder as bitmasked combination of the following constants
-	 * \OCP\PERMISSION_CREATE
-	 * \OCP\PERMISSION_READ
-	 * \OCP\PERMISSION_UPDATE
-	 * \OCP\PERMISSION_DELETE
-	 * \OCP\PERMISSION_SHARE
-	 * \OCP\PERMISSION_ALL
+	 * \OCP\Constants::PERMISSION_CREATE
+	 * \OCP\Constants::PERMISSION_READ
+	 * \OCP\Constants::PERMISSION_UPDATE
+	 * \OCP\Constants::PERMISSION_DELETE
+	 * \OCP\Constants::PERMISSION_SHARE
+	 * \OCP\Constants::PERMISSION_ALL
 	 *
 	 * @return int
 	 */
diff --git a/lib/public/files/node.php b/lib/public/files/node.php
index a380394095b..35c20b487c9 100644
--- a/lib/public/files/node.php
+++ b/lib/public/files/node.php
@@ -128,11 +128,11 @@ interface Node {
 
 	/**
 	 * Get the permissions of the file or folder as a combination of one or more of the following constants:
-	 *  - \OCP\PERMISSION_READ
-	 *  - \OCP\PERMISSION_UPDATE
-	 *  - \OCP\PERMISSION_CREATE
-	 *  - \OCP\PERMISSION_DELETE
-	 *  - \OCP\PERMISSION_SHARE
+	 *  - \OCP\Constants::PERMISSION_READ
+	 *  - \OCP\Constants::PERMISSION_UPDATE
+	 *  - \OCP\Constants::PERMISSION_CREATE
+	 *  - \OCP\Constants::PERMISSION_DELETE
+	 *  - \OCP\Constants::PERMISSION_SHARE
 	 *
 	 * @return int
 	 */
diff --git a/lib/public/iavatar.php b/lib/public/iavatar.php
index 1e80682c4f7..213d2e6cef5 100644
--- a/lib/public/iavatar.php
+++ b/lib/public/iavatar.php
@@ -23,9 +23,9 @@ interface IAvatar {
 	/**
 	 * sets the users avatar
 	 * @param Image $data mixed imagedata or path to set a new avatar
-	 * @throws Exception if the provided file is not a jpg or png image
-	 * @throws Exception if the provided image is not valid
-	 * @throws \OCP\NotSquareException if the image is not square
+	 * @throws \Exception if the provided file is not a jpg or png image
+	 * @throws \Exception if the provided image is not valid
+	 * @throws \OC\NotSquareException if the image is not square
 	 * @return void
 	 */
 	function set($data);
diff --git a/lib/public/template.php b/lib/public/template.php
index 2e265bb5e8e..a1b650649ff 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -88,7 +88,7 @@ function human_file_size( $bytes ) {
  * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
  * @param int $timestamp unix timestamp
  * @param boolean $dateOnly
- * @return OC_L10N_String human readable interpretation of the timestamp
+ * @return \OC_L10N_String human readable interpretation of the timestamp
  */
 function relative_modified_date( $timestamp, $dateOnly = false ) {
 	return(\relative_modified_date($timestamp, null, $dateOnly));
diff --git a/lib/public/util.php b/lib/public/util.php
index a87d26a4004..793a16c4d84 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -508,8 +508,8 @@ class Util {
 
 	/**
 	 * Compare two strings to provide a natural sort
-	 * @param $a first string to compare
-	 * @param $b second string to compare
+	 * @param string $a first string to compare
+	 * @param string $b second string to compare
 	 * @return -1 if $b comes before $a, 1 if $a comes before $b
 	 * or 0 if the strings are identical
 	 */
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index cfc6e29ae74..b4fdd91f512 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -23,7 +23,7 @@ class Test_OC_Connector_Sabre_File extends \Test\TestCase {
 			->will($this->returnValue('/test.txt'));
 
 		$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
-			'permissions'=>\OCP\PERMISSION_ALL
+			'permissions'=>\OCP\Constants::PERMISSION_ALL
 		));
 
 		$file = new OC_Connector_Sabre_File($view, $info);
@@ -58,7 +58,7 @@ class Test_OC_Connector_Sabre_File extends \Test\TestCase {
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
 
 		$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
-			'permissions' => \OCP\PERMISSION_ALL
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		));
 
 		$file = new OC_Connector_Sabre_File($view, $info);
@@ -82,7 +82,7 @@ class Test_OC_Connector_Sabre_File extends \Test\TestCase {
 			->will($this->returnValue('/super*star.txt'));
 
 		$info = new \OC\Files\FileInfo('/super*star.txt', null, null, array(
-			'permissions' => \OCP\PERMISSION_ALL
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		));
 		$file = new OC_Connector_Sabre_File($view, $info);
 
@@ -103,7 +103,7 @@ class Test_OC_Connector_Sabre_File extends \Test\TestCase {
 			->will($this->returnValue('/super*star.txt'));
 
 		$info = new \OC\Files\FileInfo('/super*star.txt', null, null, array(
-			'permissions' => \OCP\PERMISSION_ALL
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		));
 		$file = new OC_Connector_Sabre_File($view, $info);
 		$file->setName('/super*star.txt');
@@ -135,7 +135,7 @@ class Test_OC_Connector_Sabre_File extends \Test\TestCase {
 		$_SERVER['REQUEST_METHOD'] = 'PUT';
 
 		$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
-			'permissions' => \OCP\PERMISSION_ALL
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		));
 
 		$file = new OC_Connector_Sabre_File($view, $info);
@@ -157,7 +157,7 @@ class Test_OC_Connector_Sabre_File extends \Test\TestCase {
 			->will($this->returnValue(true));
 
 		$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
-			'permissions' => \OCP\PERMISSION_ALL
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		));
 
 		$file = new OC_Connector_Sabre_File($view, $info);
@@ -198,7 +198,7 @@ class Test_OC_Connector_Sabre_File extends \Test\TestCase {
 			->will($this->returnValue(false));
 
 		$info = new \OC\Files\FileInfo('/test.txt', null, null, array(
-			'permissions' => \OCP\PERMISSION_ALL
+			'permissions' => \OCP\Constants::PERMISSION_ALL
 		));
 
 		$file = new OC_Connector_Sabre_File($view, $info);
diff --git a/tests/lib/connector/sabre/node.php b/tests/lib/connector/sabre/node.php
index 9a2bf41bd19..1e927deed44 100644
--- a/tests/lib/connector/sabre/node.php
+++ b/tests/lib/connector/sabre/node.php
@@ -15,15 +15,15 @@ use OC\Files\View;
 class Node extends \Test\TestCase {
 	public function davPermissionsProvider() {
 		return array(
-			array(\OCP\PERMISSION_ALL, 'file', false, false, 'RDNVW'),
-			array(\OCP\PERMISSION_ALL, 'dir', false, false, 'RDNVCK'),
-			array(\OCP\PERMISSION_ALL, 'file', true, false, 'SRDNVW'),
-			array(\OCP\PERMISSION_ALL, 'file', true, true, 'SRMDNVW'),
-			array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_SHARE, 'file', true, false, 'SDNVW'),
-			array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_UPDATE, 'file', false, false, 'RDNV'),
-			array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_DELETE, 'file', false, false, 'RW'),
-			array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_CREATE, 'file', false, false, 'RDNVW'),
-			array(\OCP\PERMISSION_ALL - \OCP\PERMISSION_CREATE, 'dir', false, false, 'RDNV'),
+			array(\OCP\Constants::PERMISSION_ALL, 'file', false, false, 'RDNVW'),
+			array(\OCP\Constants::PERMISSION_ALL, 'dir', false, false, 'RDNVCK'),
+			array(\OCP\Constants::PERMISSION_ALL, 'file', true, false, 'SRDNVW'),
+			array(\OCP\Constants::PERMISSION_ALL, 'file', true, true, 'SRMDNVW'),
+			array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_SHARE, 'file', true, false, 'SDNVW'),
+			array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_UPDATE, 'file', false, false, 'RDNV'),
+			array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_DELETE, 'file', false, false, 'RW'),
+			array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'file', false, false, 'RDNVW'),
+			array(\OCP\Constants::PERMISSION_ALL - \OCP\Constants::PERMISSION_CREATE, 'dir', false, false, 'RDNV'),
 		);
 	}
 
diff --git a/tests/lib/files/node/file.php b/tests/lib/files/node/file.php
index 34ec7dee213..1ae312ab5a8 100644
--- a/tests/lib/files/node/file.php
+++ b/tests/lib/files/node/file.php
@@ -39,7 +39,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$view->expects($this->once())
 			->method('unlink')
@@ -89,7 +89,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->any())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL, 'fileid' => 1)));
 
 		$view->expects($this->once())
 			->method('unlink')
@@ -124,7 +124,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$node->delete();
@@ -156,7 +156,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$this->assertEquals('bar', $node->getContent());
@@ -201,7 +201,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$view->expects($this->once())
 			->method('file_put_contents')
@@ -226,7 +226,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$node->putContent('bar');
@@ -279,7 +279,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$fh = $node->fopen('r');
@@ -316,7 +316,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$fh = $node->fopen('w');
@@ -375,7 +375,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_UPDATE)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_UPDATE)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$node->fopen('w');
@@ -402,7 +402,7 @@ class File extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$node->fopen('w');
@@ -425,7 +425,7 @@ class File extends \Test\TestCase {
 
 		$view->expects($this->any())
 			->method('getFileInfo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 3)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL, 'fileid' => 3)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
@@ -469,7 +469,7 @@ class File extends \Test\TestCase {
 
 		$view->expects($this->any())
 			->method('getFileInfo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ, 'fileid' => 3)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ, 'fileid' => 3)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
@@ -556,7 +556,7 @@ class File extends \Test\TestCase {
 
 		$view->expects($this->any())
 			->method('getFileInfo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL, 'fileid' => 1)));
 
 		$node = new \OC\Files\Node\File($root, $view, '/bar/foo');
 		$parentNode = new \OC\Files\Node\Folder($root, $view, '/bar');
@@ -587,7 +587,7 @@ class File extends \Test\TestCase {
 
 		$view->expects($this->any())
 			->method('getFileInfo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$view->expects($this->never())
 			->method('rename');
diff --git a/tests/lib/files/node/folder.php b/tests/lib/files/node/folder.php
index e348e452f6f..91aa3b82db2 100644
--- a/tests/lib/files/node/folder.php
+++ b/tests/lib/files/node/folder.php
@@ -39,7 +39,7 @@ class Folder extends \Test\TestCase {
 
 		$view->expects($this->any())
 			->method('getFileInfo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$view->expects($this->once())
 			->method('rmdir')
@@ -87,7 +87,7 @@ class Folder extends \Test\TestCase {
 
 		$view->expects($this->any())
 			->method('getFileInfo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL, 'fileid' => 1)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL, 'fileid' => 1)));
 
 		$view->expects($this->once())
 			->method('rmdir')
@@ -121,7 +121,7 @@ class Folder extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
 		$node->delete();
@@ -255,7 +255,7 @@ class Folder extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$view->expects($this->once())
 			->method('mkdir')
@@ -285,7 +285,7 @@ class Folder extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
 		$node->newFolder('asd');
@@ -305,7 +305,7 @@ class Folder extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$view->expects($this->once())
 			->method('touch')
@@ -335,7 +335,7 @@ class Folder extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$node = new \OC\Files\Node\Folder($root, $view, '/bar/foo');
 		$node->newFile('asd');
diff --git a/tests/lib/files/node/node.php b/tests/lib/files/node/node.php
index 80e3ac6f80a..8820be5b0b2 100644
--- a/tests/lib/files/node/node.php
+++ b/tests/lib/files/node/node.php
@@ -246,7 +246,7 @@ class Node extends \Test\TestCase {
 		$view->expects($this->once())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
 		$node->touch(100);
@@ -299,7 +299,7 @@ class Node extends \Test\TestCase {
 		$view->expects($this->any())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_ALL)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_ALL)));
 
 		$node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
 		$node->touch(100);
@@ -323,7 +323,7 @@ class Node extends \Test\TestCase {
 		$view->expects($this->any())
 			->method('getFileInfo')
 			->with('/bar/foo')
-			->will($this->returnValue(array('permissions' => \OCP\PERMISSION_READ)));
+			->will($this->returnValue(array('permissions' => \OCP\Constants::PERMISSION_READ)));
 
 		$node = new \OC\Files\Node\Node($root, $view, '/bar/foo');
 		$node->touch(100);
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index b5cdab0025b..1f95502919d 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -89,7 +89,7 @@ class Test_Share extends \Test\TestCase {
 	public function testShareInvalidShareType() {
 		$message = 'Share type foobar is not valid for test.txt';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', 'foobar', $this->user2, \OCP\Constants::PERMISSION_READ);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
 		}
@@ -98,7 +98,7 @@ class Test_Share extends \Test\TestCase {
 	public function testInvalidItemType() {
 		$message = 'Sharing backend for foobar not found';
 		try {
-			OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -134,7 +134,7 @@ class Test_Share extends \Test\TestCase {
 			$this->assertEquals($message, $exception->getMessage());
 		}
 		try {
-			OCP\Share::setPermissions('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_UPDATE);
+			OCP\Share::setPermissions('foobar', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_UPDATE);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -144,7 +144,7 @@ class Test_Share extends \Test\TestCase {
 	protected function shareUserOneTestFileWithUserTwo() {
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ),
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ),
 			'Failed asserting that user 1 successfully shared text.txt with user 2.'
 		);
 		$this->assertContains(
@@ -163,7 +163,7 @@ class Test_Share extends \Test\TestCase {
 
 	protected function shareUserTestFileAsLink() {
 		OC_User::setUserId($this->user1);
-		$result = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, OCP\PERMISSION_READ);
+		$result = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ);
 		$this->assertTrue(is_string($result));
 	}
 
@@ -174,7 +174,7 @@ class Test_Share extends \Test\TestCase {
 	protected function shareUserTestFileWithUser($sharer, $receiver) {
 		OC_User::setUserId($sharer);
 		$this->assertTrue(
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $receiver, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE),
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $receiver, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE),
 			'Failed asserting that ' . $sharer . ' successfully shared text.txt with ' . $receiver . '.'
 		);
 		$this->assertContains(
@@ -195,21 +195,21 @@ class Test_Share extends \Test\TestCase {
 		// Invalid shares
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the item owner';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
 		}
 		$message = 'Sharing test.txt failed, because the user foobar does not exist';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, 'foobar', \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
 		}
 		$message = 'Sharing foobar failed, because the sharing backend for test could not find its source';
 		try {
-			OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'foobar', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -222,7 +222,7 @@ class Test_Share extends \Test\TestCase {
 		OC_User::setUserId($this->user1);
 		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->user2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -232,7 +232,7 @@ class Test_Share extends \Test\TestCase {
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -243,11 +243,11 @@ class Test_Share extends \Test\TestCase {
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 
 		// Attempt reshare without share permission
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because resharing is not allowed';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -255,30 +255,30 @@ class Test_Share extends \Test\TestCase {
 
 		// Owner grants share and update permission
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_SHARE));
 
 		// Attempt reshare with escalated permissions
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the permissions exceed permissions granted to '.$this->user2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ | OCP\PERMISSION_DELETE);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_DELETE);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
 		}
 
 		// Valid reshare
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE));
 		$this->assertEquals(array('test.txt'), OCP\Share::getItemShared('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
 		OC_User::setUserId($this->user3);
 		$this->assertEquals(array('test.txt'), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_SOURCE));
-		$this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 
 		// Attempt to escalate permissions
 		OC_User::setUserId($this->user2);
 		$message = 'Setting permissions for test.txt failed, because the permissions exceed permissions granted to '.$this->user2;
 		try {
-			OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ | OCP\PERMISSION_DELETE);
+			OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_DELETE);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -286,25 +286,25 @@ class Test_Share extends \Test\TestCase {
 
 		// Remove update permission
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
-		$this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user3);
-		$this->assertEquals(array(OCP\PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 
 		// Remove share permission
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
+		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ));
 		OC_User::setUserId($this->user2);
-		$this->assertEquals(array(OCP\PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user3);
 		$this->assertSame(array(), OCP\Share::getItemSharedWith('test', 'test.txt'));
 
 		// Reshare again, and then have owner unshare
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::setPermissions('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, \OCP\Constants::PERMISSION_READ));
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		OC_User::setUserId($this->user2);
@@ -314,9 +314,9 @@ class Test_Share extends \Test\TestCase {
 
 		// Attempt target conflict
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ));
 		OC_User::setUserId($this->user3);
-		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ));
 
 		OC_User::setUserId($this->user2);
 		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
@@ -333,9 +333,9 @@ class Test_Share extends \Test\TestCase {
 		$this->assertEquals(array(), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ));
 		OC_User::setUserId($this->user3);
-		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ));
 
 		OC_User::setUserId($this->user2);
 		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
@@ -412,7 +412,7 @@ class Test_Share extends \Test\TestCase {
 
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\PERMISSION_ALL),
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, \OCP\Constants::PERMISSION_ALL),
 			'Failed asserting that user 1 successfully shared text.txt with user 4.'
 		);
 		$this->assertContains(
@@ -429,7 +429,7 @@ class Test_Share extends \Test\TestCase {
 
 		$share = OCP\Share::getItemSharedWith('test', 'test.txt');
 
-		$this->assertSame(\OCP\PERMISSION_ALL & ~OCP\PERMISSION_SHARE, $share['permissions'],
+		$this->assertSame(\OCP\Constants::PERMISSION_ALL & ~\OCP\Constants::PERMISSION_SHARE, $share['permissions'],
 				'Failed asserting that user 4 is excluded from re-sharing');
 
 		\OC_Appconfig::deleteKey('core', 'shareapi_exclude_groups_list');
@@ -440,7 +440,7 @@ class Test_Share extends \Test\TestCase {
 	protected function shareUserOneTestFileWithGroupOne() {
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ),
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, \OCP\Constants::PERMISSION_READ),
 			'Failed asserting that user 1 successfully shared text.txt with group 1.'
 		);
 		$this->assertContains(
@@ -468,7 +468,7 @@ class Test_Share extends \Test\TestCase {
 		// Invalid shares
 		$message = 'Sharing test.txt failed, because the group foobar does not exist';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, 'foobar', \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -477,7 +477,7 @@ class Test_Share extends \Test\TestCase {
 		OC_Appconfig::setValue('core', 'shareapi_only_share_with_group_members', 'yes');
 		$message = 'Sharing test.txt failed, because '.$this->user1.' is not a member of the group '.$this->group2;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group2, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -491,7 +491,7 @@ class Test_Share extends \Test\TestCase {
 		OC_User::setUserId($this->user1);
 		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->group1;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -501,7 +501,7 @@ class Test_Share extends \Test\TestCase {
 		OC_User::setUserId($this->user2);
 		$message = 'Sharing test.txt failed, because the user '.$this->user1.' is the original sharer';
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user1, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -510,7 +510,7 @@ class Test_Share extends \Test\TestCase {
 		// Attempt to share back to group
 		$message = 'Sharing test.txt failed, because this item is already shared with '.$this->group1;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -519,7 +519,7 @@ class Test_Share extends \Test\TestCase {
 		// Attempt to share back to member of group
 		$message ='Sharing test.txt failed, because this item is already shared with '.$this->user3;
 		try {
-			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, OCP\PERMISSION_READ);
+			OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user3, \OCP\Constants::PERMISSION_READ);
 			$this->fail('Exception was expected: '.$message);
 		} catch (Exception $exception) {
 			$this->assertEquals($message, $exception->getMessage());
@@ -530,18 +530,18 @@ class Test_Share extends \Test\TestCase {
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
 
 		// Valid share with same person - user then group
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_DELETE | OCP\PERMISSION_SHARE));
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE));
 		OC_User::setUserId($this->user2);
 		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-		$this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_DELETE | OCP\PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE | \OCP\Constants::PERMISSION_SHARE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user3);
 		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-		$this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 
 		// Valid reshare
 		OC_User::setUserId($this->user2);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\PERMISSION_READ));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, \OCP\Constants::PERMISSION_READ));
 		OC_User::setUserId($this->user4);
 		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 
@@ -549,26 +549,26 @@ class Test_Share extends \Test\TestCase {
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2));
 		OC_User::setUserId($this->user2);
-		$this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 		OC_User::setUserId($this->user4);
 		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 
 		// Valid share with same person - group then user
 		OC_User::setUserId($this->user1);
-		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, OCP\PERMISSION_READ | OCP\PERMISSION_DELETE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user2, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_DELETE));
 		OC_User::setUserId($this->user2);
 		$this->assertEquals(array('test.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
-		$this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE | OCP\PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE | \OCP\Constants::PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 
 		// Unshare from group only
 		OC_User::setUserId($this->user1);
 		$this->assertTrue(OCP\Share::unshare('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1));
 		OC_User::setUserId($this->user2);
-		$this->assertEquals(array(OCP\PERMISSION_READ | OCP\PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
+		$this->assertEquals(array(\OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_DELETE), OCP\Share::getItemSharedWith('test', 'test.txt', Test_Share_Backend::FORMAT_PERMISSIONS));
 
 		// Attempt user specific target conflict
 		OC_User::setUserId($this->user3);
-		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
 		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
 		$this->assertEquals(2, count($to_test));
@@ -576,7 +576,7 @@ class Test_Share extends \Test\TestCase {
 		$this->assertTrue(in_array('test1.txt', $to_test));
 
 		// Valid reshare
-		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\PERMISSION_READ | OCP\PERMISSION_SHARE));
+		$this->assertTrue(OCP\Share::shareItem('test', 'share.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_SHARE));
 		OC_User::setUserId($this->user4);
 		$this->assertEquals(array('test1.txt'), OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET));
 
@@ -628,7 +628,7 @@ class Test_Share extends \Test\TestCase {
 		$this->assertTrue(OCP\Share::unshareAll('test', 'test.txt'));
 
 		$this->assertTrue(
-				OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->groupAndUser, OCP\PERMISSION_READ),
+				OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_GROUP, $this->groupAndUser, \OCP\Constants::PERMISSION_READ),
 				'Failed asserting that user 1 successfully shared text.txt with group 1.'
 		);
 
@@ -704,7 +704,7 @@ class Test_Share extends \Test\TestCase {
 
 	public function testShareItemWithLink() {
 		OC_User::setUserId($this->user1);
-		$token = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, OCP\PERMISSION_READ);
+		$token = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ);
 		$this->assertInternalType(
 			'string',
 			$token,
@@ -750,7 +750,7 @@ class Test_Share extends \Test\TestCase {
 		\OC_Appconfig::setValue('core', 'shareapi_default_expire_date', 'yes');
 		\OC_Appconfig::setValue('core', 'shareapi_expire_after_n_days', '2');
 
-		$token = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, OCP\PERMISSION_READ);
+		$token = OCP\Share::shareItem('test', 'test.txt', OCP\Share::SHARE_TYPE_LINK, null, \OCP\Constants::PERMISSION_READ);
 		$this->assertInternalType(
 			'string',
 			$token,
@@ -876,20 +876,20 @@ class Test_Share extends \Test\TestCase {
 			// one array with one share
 			array(
 				array( // input
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_ALL, 'item_target' => 't1')),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_ALL, 'item_target' => 't1')),
 				array( // expected result
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_ALL, 'item_target' => 't1'))),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_ALL, 'item_target' => 't1'))),
 			// two shares both point to the same source
 			array(
 				array( // input
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_READ, 'item_target' => 't1'),
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_UPDATE, 'item_target' => 't1'),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_READ, 'item_target' => 't1'),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_UPDATE, 'item_target' => 't1'),
 					),
 				array( // expected result
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_READ | \OCP\PERMISSION_UPDATE, 'item_target' => 't1',
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE, 'item_target' => 't1',
 						'grouped' => array(
-							array('item_source' => 1, 'permissions' => \OCP\PERMISSION_READ, 'item_target' => 't1'),
-							array('item_source' => 1, 'permissions' => \OCP\PERMISSION_UPDATE, 'item_target' => 't1'),
+							array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_READ, 'item_target' => 't1'),
+							array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_UPDATE, 'item_target' => 't1'),
 							)
 						),
 					)
@@ -897,29 +897,29 @@ class Test_Share extends \Test\TestCase {
 			// two shares both point to the same source but with different targets
 			array(
 				array( // input
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_READ, 'item_target' => 't1'),
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_UPDATE, 'item_target' => 't2'),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_READ, 'item_target' => 't1'),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_UPDATE, 'item_target' => 't2'),
 					),
 				array( // expected result
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_READ, 'item_target' => 't1'),
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_UPDATE, 'item_target' => 't2'),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_READ, 'item_target' => 't1'),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_UPDATE, 'item_target' => 't2'),
 					)
 				),
 			// three shares two point to the same source
 			array(
 				array( // input
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_READ, 'item_target' => 't1'),
-					array('item_source' => 2, 'permissions' => \OCP\PERMISSION_CREATE, 'item_target' => 't2'),
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_UPDATE, 'item_target' => 't1'),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_READ, 'item_target' => 't1'),
+					array('item_source' => 2, 'permissions' => \OCP\Constants::PERMISSION_CREATE, 'item_target' => 't2'),
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_UPDATE, 'item_target' => 't1'),
 					),
 				array( // expected result
-					array('item_source' => 1, 'permissions' => \OCP\PERMISSION_READ | \OCP\PERMISSION_UPDATE, 'item_target' => 't1',
+					array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_READ | \OCP\Constants::PERMISSION_UPDATE, 'item_target' => 't1',
 						'grouped' => array(
-							array('item_source' => 1, 'permissions' => \OCP\PERMISSION_READ, 'item_target' => 't1'),
-							array('item_source' => 1, 'permissions' => \OCP\PERMISSION_UPDATE, 'item_target' => 't1'),
+							array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_READ, 'item_target' => 't1'),
+							array('item_source' => 1, 'permissions' => \OCP\Constants::PERMISSION_UPDATE, 'item_target' => 't1'),
 							)
 						),
-					array('item_source' => 2, 'permissions' => \OCP\PERMISSION_CREATE, 'item_target' => 't2'),
+					array('item_source' => 2, 'permissions' => \OCP\Constants::PERMISSION_CREATE, 'item_target' => 't2'),
 					)
 				),
 		);
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index ab714bde3df..3f0c52d19ea 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -214,7 +214,7 @@ class Test_Tags extends \Test\TestCase {
 		$this->assertFalse($other_tagger->hasTag($test_tag));
 
 		OC_User::setUserId($this->user);
-		OCP\Share::shareItem('test', 1, OCP\Share::SHARE_TYPE_USER, $other_user, OCP\PERMISSION_READ);
+		OCP\Share::shareItem('test', 1, OCP\Share::SHARE_TYPE_USER, $other_user, \OCP\Constants::PERMISSION_READ);
 
 		OC_User::setUserId($other_user);
 		$other_tagger = $other_tagMgr->load('test', array(), true); // Update tags, load shared ones.
-- 
GitLab


From 0274dcba575272585a6f0b16bc777301f9458537 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 25 Nov 2014 11:06:26 +0100
Subject: [PATCH 537/616] Replace some more "command -v" calls with the Helper
 method

---
 apps/files_external/lib/smb.php | 9 ++-------
 lib/private/installer.php       | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 6e53c4a9931..3f0b0f45bfb 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -139,13 +139,8 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 	 * check if smbclient is installed
 	 */
 	public static function checkDependencies() {
-		if (function_exists('shell_exec')) {
-			$output=shell_exec('command -v smbclient 2> /dev/null');
-			if (!empty($output)) {
-				return true;
-			}
-		}
-		return array('smbclient');
+		$smbClientExists = (bool) \OC_Helper::findBinaryPath('smbclient');
+		return $smbClientExists ? true : array('smbclient');
 	}
 
 }
diff --git a/lib/private/installer.php b/lib/private/installer.php
index cd1d8ce392f..f43969691c7 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -558,8 +558,8 @@ class OC_Installer{
 		// is the code checker enabled?
 		if(OC_Config::getValue('appcodechecker', true)) {
 			// check if grep is installed
-			$grep = exec('command -v grep');
-			if($grep=='') {
+			$grep = \OC_Helper::findBinaryPath('grep');
+			if (!$grep) {
 				OC_Log::write('core',
 					'grep not installed. So checking the code of the app "'.$appname.'" was not possible',
 					OC_Log::ERROR);
-- 
GitLab


From 5d4b7e0e2b789e47a51dd7d047599dd9f8701e60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 25 Nov 2014 22:16:48 +0100
Subject: [PATCH 538/616] fix failing unit test for the temp manager -
 concurrently executed unit tests influence each other

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

diff --git a/tests/lib/tempmanager.php b/tests/lib/tempmanager.php
index 05311e820a7..c030eef2c9e 100644
--- a/tests/lib/tempmanager.php
+++ b/tests/lib/tempmanager.php
@@ -27,7 +27,7 @@ class TempManager extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		$this->baseDir = get_temp_dir() . '/oc_tmp_test';
+		$this->baseDir = get_temp_dir() . $this->getUniqueID('/oc_tmp_test');
 		if (!is_dir($this->baseDir)) {
 			mkdir($this->baseDir);
 		}
@@ -39,7 +39,7 @@ class TempManager extends \Test\TestCase {
 	}
 
 	/**
-	 * @param \Psr\Log\LoggerInterface $logger
+	 * @param  \OCP\ILogger $logger
 	 * @return \OC\TempManager
 	 */
 	protected function getManager($logger = null) {
-- 
GitLab


From a9ad77fc296ab2e49321b8e53f8bfe5279b9316c Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Tue, 25 Nov 2014 14:57:17 -0800
Subject: [PATCH 539/616] Add notes that SQLite is CE only

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

diff --git a/config/config.sample.php b/config/config.sample.php
index bf26172c494..864247b3735 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -77,7 +77,9 @@ $CONFIG = array(
 
 /**
  * Where user files are stored; this defaults to ``data/`` in the ownCloud
- * directory. The SQLite database is also stored here, when you use SQLite.
+ * directory. The SQLite database is also stored here, when you use SQLite. (SQLite is 
+available only in ownCloud Community Edition)
+
  */
 'datadirectory' => '/var/www/owncloud/data',
 
@@ -822,7 +824,8 @@ $CONFIG = array(
 ),
 
 /**
- * Database types that are supported for installation.
+ * Database types that are supported for installation. (SQLite is available only in 
+   ownCloud Community Edition)
  *
  * Available:
  * 	- sqlite (SQLite3)
-- 
GitLab


From 770eea7b56013b63cbdfa17fd0705cd44a920e2f Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Tue, 25 Nov 2014 15:01:05 -0800
Subject: [PATCH 540/616] Markup corrections

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

diff --git a/config/config.sample.php b/config/config.sample.php
index 864247b3735..d1526d77528 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -78,8 +78,7 @@ $CONFIG = array(
 /**
  * Where user files are stored; this defaults to ``data/`` in the ownCloud
  * directory. The SQLite database is also stored here, when you use SQLite. (SQLite is 
-available only in ownCloud Community Edition)
-
+ * available only in ownCloud Community Edition)
  */
 'datadirectory' => '/var/www/owncloud/data',
 
@@ -825,7 +824,7 @@ available only in ownCloud Community Edition)
 
 /**
  * Database types that are supported for installation. (SQLite is available only in 
-   ownCloud Community Edition)
+ * ownCloud Community Edition)
  *
  * Available:
  * 	- sqlite (SQLite3)
-- 
GitLab


From 06041e3323114f352d5e849d3c439672aae94118 Mon Sep 17 00:00:00 2001
From: Carla Schroder <carla@owncloud.com>
Date: Tue, 25 Nov 2014 16:31:02 -0800
Subject: [PATCH 541/616] added comment that App Store is disabled for EE

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

diff --git a/config/config.sample.php b/config/config.sample.php
index 2a9b43d5690..c0e653c7c46 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -533,6 +533,7 @@ $CONFIG = array(
 
 /**
  * When enabled, admins may install apps from the ownCloud app store.
+ * The app store is disabled by default for ownCloud Enterprise Edition
  */
 'appstoreenabled' => true,
 
-- 
GitLab


From 3766d98df6845397d810d583575c1fcedb51df90 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 26 Nov 2014 01:54:31 -0500
Subject: [PATCH 542/616] [tx-robot] updated from transifex

---
 apps/user_ldap/l10n/cs_CZ.js   | 1 +
 apps/user_ldap/l10n/cs_CZ.json | 1 +
 apps/user_ldap/l10n/fr.js      | 1 +
 apps/user_ldap/l10n/fr.json    | 1 +
 apps/user_ldap/l10n/nl.js      | 1 +
 apps/user_ldap/l10n/nl.json    | 1 +
 apps/user_ldap/l10n/pt_BR.js   | 1 +
 apps/user_ldap/l10n/pt_BR.json | 1 +
 core/l10n/fr.js                | 2 +-
 core/l10n/fr.json              | 2 +-
 settings/l10n/tr.js            | 2 +-
 settings/l10n/tr.json          | 2 +-
 12 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/apps/user_ldap/l10n/cs_CZ.js b/apps/user_ldap/l10n/cs_CZ.js
index 2b8142bced6..f4782d57d66 100644
--- a/apps/user_ldap/l10n/cs_CZ.js
+++ b/apps/user_ldap/l10n/cs_CZ.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Potvrdit smazání",
     "_%s group found_::_%s groups found_" : ["nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"],
     "_%s user found_::_%s users found_" : ["nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nelze detekovat atribut pro zobrazení jména uživatele. Upřesněte ho prosím sami v rozšířeném nastavení LDAP.",
     "Could not find the desired feature" : "Nelze nalézt požadovanou vlastnost",
     "Invalid Host" : "Neplatný hostitel",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/cs_CZ.json b/apps/user_ldap/l10n/cs_CZ.json
index 819f4e6d534..e3e51560987 100644
--- a/apps/user_ldap/l10n/cs_CZ.json
+++ b/apps/user_ldap/l10n/cs_CZ.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Potvrdit smazání",
     "_%s group found_::_%s groups found_" : ["nalezena %s skupina","nalezeny %s skupiny","nalezeno %s skupin"],
     "_%s user found_::_%s users found_" : ["nalezen %s uživatel","nalezeni %s uživatelé","nalezeno %s uživatelů"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Nelze detekovat atribut pro zobrazení jména uživatele. Upřesněte ho prosím sami v rozšířeném nastavení LDAP.",
     "Could not find the desired feature" : "Nelze nalézt požadovanou vlastnost",
     "Invalid Host" : "Neplatný hostitel",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index 3736ade73ce..d363530f5c5 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Confirmer la suppression",
     "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
     "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.",
     "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée",
     "Invalid Host" : "Hôte invalide",
     "Server" : "Serveur",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 58ac6f3d248..9879534bac7 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Confirmer la suppression",
     "_%s group found_::_%s groups found_" : ["%s groupe trouvé","%s groupes trouvés"],
     "_%s user found_::_%s users found_" : ["%s utilisateur trouvé","%s utilisateurs trouvés"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossible de détecter l'attribut contenant le nom d'affichage des utilisateurs. Veuillez l'indiquer vous-même dans les paramètres ldap avancés.",
     "Could not find the desired feature" : "Impossible de trouver la fonction souhaitée",
     "Invalid Host" : "Hôte invalide",
     "Server" : "Serveur",
diff --git a/apps/user_ldap/l10n/nl.js b/apps/user_ldap/l10n/nl.js
index e448b161f00..ae280e1a05e 100644
--- a/apps/user_ldap/l10n/nl.js
+++ b/apps/user_ldap/l10n/nl.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Bevestig verwijderen",
     "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"],
     "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kon het weergavenaam attribuut van de gebruiker niet vinden. Geef het zelf op in de geavanceerde ldap instellingen.",
     "Could not find the desired feature" : "Kon de gewenste functie niet vinden",
     "Invalid Host" : "Ongeldige server",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/nl.json b/apps/user_ldap/l10n/nl.json
index eb1eecf8201..ed0ce08501a 100644
--- a/apps/user_ldap/l10n/nl.json
+++ b/apps/user_ldap/l10n/nl.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Bevestig verwijderen",
     "_%s group found_::_%s groups found_" : ["%s groep gevonden","%s groepen gevonden"],
     "_%s user found_::_%s users found_" : ["%s gebruiker gevonden","%s gebruikers gevonden"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kon het weergavenaam attribuut van de gebruiker niet vinden. Geef het zelf op in de geavanceerde ldap instellingen.",
     "Could not find the desired feature" : "Kon de gewenste functie niet vinden",
     "Invalid Host" : "Ongeldige server",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/pt_BR.js b/apps/user_ldap/l10n/pt_BR.js
index 32b7697df3e..a4a481524ba 100644
--- a/apps/user_ldap/l10n/pt_BR.js
+++ b/apps/user_ldap/l10n/pt_BR.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Confirmar Exclusão",
     "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"],
     "_%s user found_::_%s users found_" : ["usuário %s encontrado","usuários %s encontrados"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detectar o nome de exibição do atributo do usuário. Por favor, indique-o você mesmo em configurações avançadas do LDAP.",
     "Could not find the desired feature" : "Não foi possível encontrar a função desejada",
     "Invalid Host" : "Host Inválido",
     "Server" : "Servidor",
diff --git a/apps/user_ldap/l10n/pt_BR.json b/apps/user_ldap/l10n/pt_BR.json
index ea59ed7b4d8..4dd9088b727 100644
--- a/apps/user_ldap/l10n/pt_BR.json
+++ b/apps/user_ldap/l10n/pt_BR.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Confirmar Exclusão",
     "_%s group found_::_%s groups found_" : ["grupo% s encontrado","grupos% s encontrado"],
     "_%s user found_::_%s users found_" : ["usuário %s encontrado","usuários %s encontrados"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Não foi possível detectar o nome de exibição do atributo do usuário. Por favor, indique-o você mesmo em configurações avançadas do LDAP.",
     "Could not find the desired feature" : "Não foi possível encontrar a função desejada",
     "Invalid Host" : "Host Inválido",
     "Server" : "Servidor",
diff --git a/core/l10n/fr.js b/core/l10n/fr.js
index 87e8b017832..0155b0c90c4 100644
--- a/core/l10n/fr.js
+++ b/core/l10n/fr.js
@@ -62,7 +62,7 @@ OC.L10N.register(
     "So-so password" : "Mot de passe tout juste acceptable",
     "Good password" : "Mot de passe de sécurité suffisante",
     "Strong password" : "Mot de passe fort",
-    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav semble ne pas fonctionner.",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers car l'interface WebDav semble ne pas fonctionner.",
     "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." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel ne fonctionneront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "Shared" : "Partagé",
diff --git a/core/l10n/fr.json b/core/l10n/fr.json
index 5b57d86f532..2ddd7d91a39 100644
--- a/core/l10n/fr.json
+++ b/core/l10n/fr.json
@@ -60,7 +60,7 @@
     "So-so password" : "Mot de passe tout juste acceptable",
     "Good password" : "Mot de passe de sécurité suffisante",
     "Strong password" : "Mot de passe fort",
-    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers, car l'interface WebDav semble ne pas fonctionner.",
+    "Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." : "Votre serveur web n'est pas correctement configuré pour permettre la synchronisation des fichiers car l'interface WebDav semble ne pas fonctionner.",
     "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." : "Ce serveur ne peut se connecter à internet. Cela signifie que certaines fonctionnalités, telles que le montage de supports de stockage distants, les notifications de mises à jour ou l'installation d'applications tierces ne fonctionneront pas. L'accès aux fichiers à distance, ainsi que les notifications par courriel ne fonctionneront pas non plus. Il est recommandé d'activer la connexion internet pour ce serveur si vous souhaitez disposer de l'ensemble des fonctionnalités offertes.",
     "Error occurred while checking server setup" : "Une erreur s'est produite lors de la vérification de la configuration du serveur",
     "Shared" : "Partagé",
diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index 0b6660fd076..e97674bf0fc 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -138,7 +138,7 @@ OC.L10N.register(
     "days" : "gün sonra dolsun",
     "Enforce expiration date" : "Son kullanma tarihini zorla",
     "Allow resharing" : "Yeniden paylaşıma izin ver",
-    "Restrict users to only share with users in their groups" : "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına sınırla",
+    "Restrict users to only share with users in their groups" : "Kullanıcıların, dosyaları sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver",
     "Allow users to send mail notification for shared files" : "Paylaşılmış dosyalar için kullanıcıların 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.",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index 26f39922609..f1c869101a9 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -136,7 +136,7 @@
     "days" : "gün sonra dolsun",
     "Enforce expiration date" : "Son kullanma tarihini zorla",
     "Allow resharing" : "Yeniden paylaşıma izin ver",
-    "Restrict users to only share with users in their groups" : "Kullanıcıların sadece kendi gruplarındaki kullanıcılarla paylaşmasına sınırla",
+    "Restrict users to only share with users in their groups" : "Kullanıcıların, dosyaları sadece kendi gruplarındaki kullanıcılarla paylaşmasına izin ver",
     "Allow users to send mail notification for shared files" : "Paylaşılmış dosyalar için kullanıcıların 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.",
-- 
GitLab


From 320a3c3784057711f38841550c12c1d6177e9588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Fri, 28 Mar 2014 11:25:55 +0100
Subject: [PATCH 543/616] because OC_User::login will create a new session we
 shall only try to login if user and pass are set

ensure to never destroy an existing session
---
 lib/private/api.php | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/lib/private/api.php b/lib/private/api.php
index f5576af2ad8..66b763fdc3e 100644
--- a/lib/private/api.php
+++ b/lib/private/api.php
@@ -132,7 +132,7 @@ class OC_API {
 	 * @return array|\OC_OCS_Result
 	 */
 	public static function mergeResponses($responses) {
-		// Sort into shipped and thirdparty
+		// Sort into shipped and third-party
 		$shipped = array(
 			'succeeded' => array(),
 			'failed' => array(),
@@ -162,7 +162,7 @@ class OC_API {
 		if(!empty($shipped['failed'])) {
 			// Which shipped response do we use if they all failed?
 			// They may have failed for different reasons (different status codes)
-			// Which reponse code should we return?
+			// Which response code should we return?
 			// Maybe any that are not OC_API::RESPOND_SERVER_ERROR
 			// Merge failed responses if more than one
 			$data = array();
@@ -273,26 +273,32 @@ class OC_API {
 
 		// reuse existing login
 		$loggedIn = OC_User::isLoggedIn();
-		$ocsApiRequest = isset($_SERVER['HTTP_OCS_APIREQUEST']) ? $_SERVER['HTTP_OCS_APIREQUEST'] === 'true' : false;
-		if ($loggedIn === true && $ocsApiRequest) {
+		if ($loggedIn === true) {
+			$ocsApiRequest = isset($_SERVER['HTTP_OCS_APIREQUEST']) ? $_SERVER['HTTP_OCS_APIREQUEST'] === 'true' : false;
+			if ($ocsApiRequest) {
 
-			// initialize the user's filesystem
-			\OC_Util::setUpFS(\OC_User::getUser());
+				// initialize the user's filesystem
+				\OC_Util::setUpFS(\OC_User::getUser());
 
-			return OC_User::getUser();
+				return OC_User::getUser();
+			}
+			return false;
 		}
 
-		// basic auth
-		$authUser = isset($_SERVER['PHP_AUTH_USER']) ? $_SERVER['PHP_AUTH_USER'] : '';
-		$authPw = isset($_SERVER['PHP_AUTH_PW']) ? $_SERVER['PHP_AUTH_PW'] : '';
-		$return = OC_User::login($authUser, $authPw);
-		if ($return === true) {
-			self::$logoutRequired = true;
+		// basic auth - because OC_User::login will create a new session we shall only try to login
+		// if user and pass are set
+		if(isset($_SERVER['PHP_AUTH_USER']) && isset($_SERVER['PHP_AUTH_PW']) ) {
+			$authUser = $_SERVER['PHP_AUTH_USER'];
+			$authPw = $_SERVER['PHP_AUTH_PW'];
+			$return = OC_User::login($authUser, $authPw);
+			if ($return === true) {
+				self::$logoutRequired = true;
 
-			// initialize the user's filesystem
-			\OC_Util::setUpFS(\OC_User::getUser());
+				// initialize the user's filesystem
+				\OC_Util::setUpFS(\OC_User::getUser());
 
-			return $authUser;
+				return $authUser;
+			}
 		}
 
 		return false;
-- 
GitLab


From fd86d76f98f58ef232de58cc55401d85de262d0a Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 10 Nov 2014 12:40:24 +0100
Subject: [PATCH 544/616] new folder structure for keys all keys are now in
 files_encryption/key/path_to_file/filename/ share keys are named:
 user.shareKey file key is named: fileKey

---
 .../exception/encryptionException.php         |   4 +-
 apps/files_encryption/hooks/hooks.php         | 191 +++------
 apps/files_encryption/lib/helper.php          |  45 +--
 apps/files_encryption/lib/keymanager.php      | 372 +++++-------------
 apps/files_encryption/lib/proxy.php           |   2 +-
 apps/files_encryption/lib/util.php            |  74 ++--
 apps/files_encryption/tests/crypt.php         |  16 -
 apps/files_encryption/tests/helper.php        |  52 ---
 apps/files_encryption/tests/hooks.php         | 104 ++---
 apps/files_encryption/tests/keymanager.php    | 262 +++---------
 apps/files_encryption/tests/share.php         | 200 +++++-----
 apps/files_encryption/tests/trashbin.php      |  91 ++---
 apps/files_encryption/tests/util.php          |  86 ++--
 apps/files_encryption/tests/webdav.php        |   8 +-
 apps/files_trashbin/lib/trashbin.php          | 181 ++-------
 15 files changed, 526 insertions(+), 1162 deletions(-)

diff --git a/apps/files_encryption/exception/encryptionException.php b/apps/files_encryption/exception/encryptionException.php
index c51a3b3439f..de1f16b4f4b 100644
--- a/apps/files_encryption/exception/encryptionException.php
+++ b/apps/files_encryption/exception/encryptionException.php
@@ -27,7 +27,7 @@ namespace OCA\Encryption\Exception;
  * Base class for all encryption exception
  *
  * Possible Error Codes:
- * 10 - unknown error
+ * 10 - generic error
  * 20 - unexpected end of encryption header
  * 30 - unexpected blog size
  * 40 - encryption header to large
@@ -38,7 +38,7 @@ namespace OCA\Encryption\Exception;
  * 90 - private key missing
  */
 class EncryptionException extends \Exception {
-	const UNKNOWN = 10;
+	const GENERIC = 10;
 	const UNEXPECTED_END_OF_ENCRYPTION_HEADER = 20;
 	const UNEXPECTED_BLOG_SIZE = 30;
 	const ENCRYPTION_HEADER_TO_LARGE = 40;
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index eadd2b64b80..4867ca3e481 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -35,7 +35,7 @@ class Hooks {
 	// file for which we want to delete the keys after the delete operation was successful
 	private static $deleteFiles = array();
 	// file for which we want to delete the keys after the delete operation was successful
-	private static $umountedFiles = array();
+	private static $unmountedFiles = array();
 
 	/**
 	 * Startup encryption backend upon user login
@@ -328,7 +328,7 @@ class Hooks {
 
 			$path = \OC\Files\Filesystem::getPath($params['fileSource']);
 
-			self::updateKeyfiles($path, $params['itemType']);
+			self::updateKeyfiles($path);
 		}
 	}
 
@@ -336,9 +336,8 @@ class Hooks {
 	 * update keyfiles and share keys recursively
 	 *
 	 * @param string $path to the file/folder
-	 * @param string $type 'file' or 'folder'
 	 */
-	private static function updateKeyfiles($path, $type) {
+	private static function updateKeyfiles($path) {
 		$view = new \OC\Files\View('/');
 		$userId = \OCP\User::getUser();
 		$session = new \OCA\Encryption\Session($view);
@@ -350,7 +349,7 @@ class Hooks {
 		$mountPoint = $mount->getMountPoint();
 
 		// if a folder was shared, get a list of all (sub-)folders
-		if ($type === 'folder') {
+		if ($view->is_dir('/' . $userId . '/files' . $path)) {
 			$allFiles = $util->getAllFiles($path, $mountPoint);
 		} else {
 			$allFiles = array($path);
@@ -407,11 +406,10 @@ class Hooks {
 
 				// Unshare every user who no longer has access to the file
 				$delUsers = array_diff($userIds, $sharingUsers);
-
-				list($owner, $ownerPath) = $util->getUidAndFilename($path);
+				$keyPath = Keymanager::getKeyPath($view, $util, $path);
 
 				// delete share key
-				Keymanager::delShareKey($view, $delUsers, $ownerPath, $owner);
+				Keymanager::delShareKey($view, $delUsers, $keyPath, $userId, $path);
 			}
 
 		}
@@ -437,35 +435,19 @@ class Hooks {
 		$user = \OCP\User::getUser();
 		$view = new \OC\Files\View('/');
 		$util = new Util($view, $user);
-		list($ownerOld, $pathOld) = $util->getUidAndFilename($params['oldpath']);
 
 		// we only need to rename the keys if the rename happens on the same mountpoint
 		// otherwise we perform a stream copy, so we get a new set of keys
 		$mp1 = $view->getMountPoint('/' . $user . '/files/' . $params['oldpath']);
 		$mp2 = $view->getMountPoint('/' . $user . '/files/' . $params['newpath']);
 
-		$type = $view->is_dir('/' . $user . '/files/' . $params['oldpath']) ? 'folder' : 'file';
-
 		if ($mp1 === $mp2) {
-			if ($util->isSystemWideMountPoint($pathOld)) {
-				$oldShareKeyPath = 'files_encryption/share-keys/' . $pathOld;
-			} else {
-				$oldShareKeyPath = $ownerOld . '/' . 'files_encryption/share-keys/' . $pathOld;
-			}
-			// gather share keys here because in postRename() the file will be moved already
-			$oldShareKeys = Helper::findShareKeys($pathOld, $oldShareKeyPath, $view);
-			if (count($oldShareKeys) === 0) {
-				\OC_Log::write(
-					'Encryption library', 'No share keys found for "' . $pathOld . '"',
-					\OC_Log::WARN
-				);
-			}
+
+			$oldKeysPath = Keymanager::getKeyPath($view, $util, $params['oldpath']);
+
 			self::$renamedFiles[$params['oldpath']] = array(
-				'uid' => $ownerOld,
-				'path' => $pathOld,
-				'type' => $type,
 				'operation' => $operation,
-				'sharekeys' => $oldShareKeys
+				'oldKeysPath' => $oldKeysPath,
 				);
 
 		}
@@ -482,81 +464,37 @@ class Hooks {
 			return true;
 		}
 
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
 		$view = new \OC\Files\View('/');
 		$userId = \OCP\User::getUser();
 		$util = new Util($view, $userId);
-		$oldShareKeys = null;
 
-		if (isset(self::$renamedFiles[$params['oldpath']]['uid']) &&
-				isset(self::$renamedFiles[$params['oldpath']]['path'])) {
-			$ownerOld = self::$renamedFiles[$params['oldpath']]['uid'];
-			$pathOld = self::$renamedFiles[$params['oldpath']]['path'];
-			$type =  self::$renamedFiles[$params['oldpath']]['type'];
+		if (isset(self::$renamedFiles[$params['oldpath']]['operation']) &&
+				isset(self::$renamedFiles[$params['oldpath']]['oldKeysPath'])) {
 			$operation = self::$renamedFiles[$params['oldpath']]['operation'];
-			$oldShareKeys = self::$renamedFiles[$params['oldpath']]['sharekeys'];
+			$oldKeysPath = self::$renamedFiles[$params['oldpath']]['oldKeysPath'];
 			unset(self::$renamedFiles[$params['oldpath']]);
 		} else {
 			\OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::DEBUG);
-			\OC_FileProxy::$enabled = $proxyStatus;
 			return false;
 		}
 
 		list($ownerNew, $pathNew) = $util->getUidAndFilename($params['newpath']);
 
-		// Format paths to be relative to user files dir
-		if ($util->isSystemWideMountPoint($pathOld)) {
-			$oldKeyfilePath = 'files_encryption/keyfiles/' . $pathOld;
-			$oldShareKeyPath = 'files_encryption/share-keys/' . $pathOld;
-		} else {
-			$oldKeyfilePath = $ownerOld . '/' . 'files_encryption/keyfiles/' . $pathOld;
-			$oldShareKeyPath = $ownerOld . '/' . 'files_encryption/share-keys/' . $pathOld;
-		}
-
 		if ($util->isSystemWideMountPoint($pathNew)) {
-			$newKeyfilePath =  'files_encryption/keyfiles/' . $pathNew;
-			$newShareKeyPath =  'files_encryption/share-keys/' . $pathNew;
-		} else {
-			$newKeyfilePath = $ownerNew . '/files_encryption/keyfiles/' . $pathNew;
-			$newShareKeyPath = $ownerNew . '/files_encryption/share-keys/' . $pathNew;
-		}
-
-		// create new key folders if it doesn't exists
-		if (!$view->file_exists(dirname($newShareKeyPath))) {
-				$view->mkdir(dirname($newShareKeyPath));
-		}
-		if (!$view->file_exists(dirname($newKeyfilePath))) {
-			$view->mkdir(dirname($newKeyfilePath));
-		}
-
-		// handle share keys
-		if ($type === 'file') {
-			$oldKeyfilePath .= '.key';
-			$newKeyfilePath .= '.key';
-
-			foreach ($oldShareKeys as $src) {
-				$dst = \OC\Files\Filesystem::normalizePath(str_replace($pathOld, $pathNew, $src));
-				$view->$operation($src, $dst);
-			}
-
+			$newKeysPath =  'files_encryption/keys/' . $pathNew;
 		} else {
-			// handle share-keys folders
-			$view->$operation($oldShareKeyPath, $newShareKeyPath);
+			$newKeysPath = $ownerNew . '/files_encryption/keys/' . $pathNew;
 		}
 
-		// Rename keyfile so it isn't orphaned
-		if ($view->file_exists($oldKeyfilePath)) {
-			$view->$operation($oldKeyfilePath, $newKeyfilePath);
+		// create  key folders if it doesn't exists
+		if (!$view->file_exists(dirname($newKeysPath))) {
+				$view->mkdir(dirname($newKeysPath));
 		}
 
+		$view->$operation($oldKeysPath, $newKeysPath);
 
 		// update sharing-keys
-		self::updateKeyfiles($params['newpath'], $type);
-
-		\OC_FileProxy::$enabled = $proxyStatus;
+		self::updateKeyfiles($params['newpath']);
 	}
 
 	/**
@@ -592,37 +530,28 @@ class Hooks {
 	 */
 	public static function postDelete($params) {
 
-		if (!isset(self::$deleteFiles[$params[\OC\Files\Filesystem::signal_param_path]])) {
+		$path = $params[\OC\Files\Filesystem::signal_param_path];
+
+		if (!isset(self::$deleteFiles[$path])) {
 			return true;
 		}
 
-		$deletedFile = self::$deleteFiles[$params[\OC\Files\Filesystem::signal_param_path]];
-		$path = $deletedFile['path'];
-		$user = $deletedFile['uid'];
+		$deletedFile = self::$deleteFiles[$path];
+		$keyPath = $deletedFile['keyPath'];
 
 		// we don't need to remember the file any longer
-		unset(self::$deleteFiles[$params[\OC\Files\Filesystem::signal_param_path]]);
+		unset(self::$deleteFiles[$path]);
 
 		$view = new \OC\Files\View('/');
 
 		// return if the file still exists and wasn't deleted correctly
-		if ($view->file_exists('/' . $user . '/files/' . $path)) {
+		if ($view->file_exists('/' . \OCP\User::getUser() . '/files/' . $path)) {
 			return true;
 		}
 
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
 		// Delete keyfile & shareKey so it isn't orphaned
-		if (!Keymanager::deleteFileKey($view, $path, $user)) {
-			\OCP\Util::writeLog('Encryption library',
-				'Keyfile or shareKey could not be deleted for file "' . $user.'/files/'.$path . '"', \OCP\Util::ERROR);
-		}
-
-		Keymanager::delAllShareKeys($view, $user, $path);
+		$view->unlink($keyPath);
 
-		\OC_FileProxy::$enabled = $proxyStatus;
 	}
 
 	/**
@@ -631,6 +560,7 @@ class Hooks {
 	 * @return boolean|null
 	 */
 	public static function preDelete($params) {
+		$view = new \OC\Files\View('/');
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
 
 		// skip this method if the trash bin is enabled or if we delete a file
@@ -640,67 +570,60 @@ class Hooks {
 		}
 
 		$util = new Util(new \OC\Files\View('/'), \OCP\USER::getUser());
-		list($owner, $ownerPath) = $util->getUidAndFilename($path);
 
-		self::$deleteFiles[$params[\OC\Files\Filesystem::signal_param_path]] = array(
-			'uid' => $owner,
-			'path' => $ownerPath);
+		$keysPath = Keymanager::getKeyPath($view, $util, $path);
+
+		self::$deleteFiles[$path] = array(
+			'keyPath' => $keysPath);
 	}
 
 	/**
 	 * unmount file from yourself
 	 * remember files/folders which get unmounted
 	 */
-	public static function preUmount($params) {
+	public static function preUnmount($params) {
+		$view = new \OC\Files\View('/');
+		$user = \OCP\User::getUser();
 		$path = $params[\OC\Files\Filesystem::signal_param_path];
-		$user = \OCP\USER::getUser();
-
-		$view = new \OC\Files\View();
-		$itemType = $view->is_dir('/' . $user . '/files' . $path) ? 'folder' : 'file';
 
 		$util = new Util($view, $user);
 		list($owner, $ownerPath) = $util->getUidAndFilename($path);
 
-		self::$umountedFiles[$params[\OC\Files\Filesystem::signal_param_path]] = array(
-			'uid' => $owner,
-			'path' => $ownerPath,
-			'itemType' => $itemType);
+		$keysPath = Keymanager::getKeyPath($view, $util, $path);
+
+		self::$unmountedFiles[$path] = array(
+			'keyPath' => $keysPath,
+			'owner' => $owner,
+			'ownerPath' => $ownerPath
+		);
 	}
 
 	/**
 	 * unmount file from yourself
 	 */
-	public static function postUmount($params) {
+	public static function postUnmount($params) {
+
+		$path = $params[\OC\Files\Filesystem::signal_param_path];
+		$user = \OCP\User::getUser();
 
-		if (!isset(self::$umountedFiles[$params[\OC\Files\Filesystem::signal_param_path]])) {
+		if (!isset(self::$unmountedFiles[$path])) {
 			return true;
 		}
 
-		$umountedFile = self::$umountedFiles[$params[\OC\Files\Filesystem::signal_param_path]];
-		$path = $umountedFile['path'];
-		$user = $umountedFile['uid'];
-		$itemType = $umountedFile['itemType'];
+		$umountedFile = self::$unmountedFiles[$path];
+		$keyPath = $umountedFile['keyPath'];
+		$owner = $umountedFile['owner'];
+		$ownerPath = $umountedFile['ownerPath'];
 
 		$view = new \OC\Files\View();
-		$util = new Util($view, $user);
 
 		// we don't need to remember the file any longer
-		unset(self::$umountedFiles[$params[\OC\Files\Filesystem::signal_param_path]]);
-
-		// if we unshare a folder we need a list of all (sub-)files
-		if ($itemType === 'folder') {
-			$allFiles = $util->getAllFiles($path);
-		} else {
-			$allFiles = array($path);
-		}
+		unset(self::$unmountedFiles[$path]);
 
-		foreach ($allFiles as $path) {
-
-			// check if the user still has access to the file, otherwise delete share key
-			$sharingUsers = \OCP\Share::getUsersSharingFile($path, $user);
-			if (!in_array(\OCP\User::getUser(), $sharingUsers['users'])) {
-				Keymanager::delShareKey($view, array(\OCP\User::getUser()), $path, $user);
-			}
+		// check if the user still has access to the file, otherwise delete share key
+		$sharingUsers = \OCP\Share::getUsersSharingFile($path, $user);
+		if (!in_array(\OCP\User::getUser(), $sharingUsers['users'])) {
+			Keymanager::delShareKey($view, array(\OCP\User::getUser()), $keyPath, $owner, $ownerPath);
 		}
 	}
 
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 7a50ade82f3..c512185522d 100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -68,9 +68,9 @@ class Helper {
 		\OCP\Util::connectHook('OC_Filesystem', 'post_copy', 'OCA\Encryption\Hooks', 'postRenameOrCopy');
 		\OCP\Util::connectHook('OC_Filesystem', 'post_delete', 'OCA\Encryption\Hooks', 'postDelete');
 		\OCP\Util::connectHook('OC_Filesystem', 'delete', 'OCA\Encryption\Hooks', 'preDelete');
-		\OCP\Util::connectHook('OC_Filesystem', 'post_umount', 'OCA\Encryption\Hooks', 'postUmount');
-		\OCP\Util::connectHook('OC_Filesystem', 'umount', 'OCA\Encryption\Hooks', 'preUmount');
 		\OCP\Util::connectHook('\OC\Core\LostPassword\Controller\LostController', 'post_passwordReset', 'OCA\Encryption\Hooks', 'postPasswordReset');
+		\OCP\Util::connectHook('OC_Filesystem', 'post_umount', 'OCA\Encryption\Hooks', 'postUnmount');
+		\OCP\Util::connectHook('OC_Filesystem', 'umount', 'OCA\Encryption\Hooks', 'preUnmount');
 	}
 
 	/**
@@ -432,47 +432,6 @@ class Helper {
 		return $config;
 	}
 
-	/**
-	 * find all share keys for a given file
-	 *
-	 * @param string $filePath path to the file name relative to the user's files dir
-	 * for example "subdir/filename.txt"
-	 * @param string $shareKeyPath share key prefix path relative to the user's data dir
-	 * for example "user1/files_encryption/share-keys/subdir/filename.txt"
-	 * @param \OC\Files\View $rootView root view, relative to data/
-	 * @return array list of share key files, path relative to data/$user
-	 */
-	public static function findShareKeys($filePath, $shareKeyPath,  \OC\Files\View $rootView) {
-		$result = array();
-
-		$user = \OCP\User::getUser();
-		$util = new Util($rootView, $user);
-		// get current sharing state
-		$sharingEnabled = \OCP\Share::isEnabled();
-
-		// get users sharing this file
-		$usersSharing = $util->getSharingUsersArray($sharingEnabled, $filePath);
-
-		$pathinfo = pathinfo($shareKeyPath);
-
-		$baseDir = $pathinfo['dirname'] . '/';
-		$fileName = $pathinfo['basename'];
-		foreach ($usersSharing as $user) {
-			$keyName = $fileName . '.' . $user . '.shareKey';
-			if ($rootView->file_exists($baseDir . $keyName)) {
-				$result[] = $baseDir . $keyName;
-			} else {
-				\OC_Log::write(
-					'Encryption library',
-					'No share key found for user "' . $user . '" for file "' . $fileName . '"',
-					\OC_Log::WARN
-				);
-			}
-		}
-
-		return $result;
-	}
-
 	/**
 	 * remember from which file the tmp file (getLocalFile() call) was created
 	 * @param string $tmpFile path of tmp file
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 9560126ef33..53aaf435da8 100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -29,6 +29,9 @@ namespace OCA\Encryption;
  */
 class Keymanager {
 
+	// base dir where all the file related keys are stored
+	const KEYS_BASE_DIR = '/files_encryption/keys/';
+
 	/**
 	 * retrieve the ENCRYPTED private key from a user
 	 *
@@ -42,15 +45,10 @@ class Keymanager {
 		$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
 		$key = false;
 
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
 		if ($view->file_exists($path)) {
 			$key = $view->file_get_contents($path);
 		}
 
-		\OC_FileProxy::$enabled = $proxyStatus;
-
 		return $key;
 	}
 
@@ -62,13 +60,8 @@ class Keymanager {
 	 */
 	public static function getPublicKey(\OC\Files\View $view, $userId) {
 
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
 		$result = $view->file_get_contents('/public-keys/' . $userId . '.public.key');
 
-		\OC_FileProxy::$enabled = $proxyStatus;
-
 		return $result;
 
 	}
@@ -99,9 +92,7 @@ class Keymanager {
 		$keys = array();
 
 		foreach ($userIds as $userId) {
-
 			$keys[$userId] = self::getPublicKey($view, $userId);
-
 		}
 
 		return $keys;
@@ -121,130 +112,121 @@ class Keymanager {
 	 */
 	public static function setFileKey(\OC\Files\View $view, $util, $path, $catfile) {
 
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		list($owner, $filename) = $util->getUidAndFilename($path);
-
-		// in case of system wide mount points the keys are stored directly in the data directory
-		if ($util->isSystemWideMountPoint($filename)) {
-			$basePath = '/files_encryption/keyfiles';
-		} else {
-			$basePath = '/' . $owner . '/files_encryption/keyfiles';
-		}
+		$basePath = self::getKeyPath($view, $util, $path);
 
-		$targetPath = self::keySetPreparation($view, $filename, $basePath);
+		self::keySetPreparation($view, $basePath);
 
-		// try reusing key file if part file
-		if (Helper::isPartialFilePath($targetPath)) {
-
-			$result = $view->file_put_contents(
-				$basePath . '/' . Helper::stripPartialFileExtension($targetPath) . '.key', $catfile);
-
-		} else {
-
-			$result = $view->file_put_contents($basePath . '/' . $targetPath . '.key', $catfile);
-
-		}
-
-		\OC_FileProxy::$enabled = $proxyStatus;
+		$result = $view->file_put_contents(
+				$basePath . '/fileKey', $catfile);
 
 		return $result;
 
 	}
 
 	/**
-	 * retrieve keyfile for an encrypted file
-	 * @param \OC\Files\View $view
+	 * get path to key folder for a given file
+	 *
+	 * @param \OC\Files\View $view relative to data directory
 	 * @param \OCA\Encryption\Util $util
-	 * @param string|false $filePath
-	 * @internal param \OCA\Encryption\file $string name
-	 * @return string file key or false
-	 * @note The keyfile returned is asymmetrically encrypted. Decryption
-	 * of the keyfile must be performed by client code
+	 * @param string $path path to the file, relative to the users file directory
+	 * @return string
 	 */
-	public static function getFileKey($view, $util, $filePath) {
+	public static function getKeyPath($view, $util, $path) {
 
+		if ($view->is_dir('/' . \OCP\User::getUser() . '/' . $path)) {
+			throw new Exception\EncryptionException('file was expected but directoy was given', Exception\EncryptionException::GENERIC);
+		}
 
-		list($owner, $filename) = $util->getUidAndFilename($filePath);
+		list($owner, $filename) = $util->getUidAndFilename($path);
 		$filename = Helper::stripPartialFileExtension($filename);
 		$filePath_f = ltrim($filename, '/');
 
 		// in case of system wide mount points the keys are stored directly in the data directory
 		if ($util->isSystemWideMountPoint($filename)) {
-			$keyfilePath = '/files_encryption/keyfiles/' . $filePath_f . '.key';
+			$keyPath = self::KEYS_BASE_DIR . $filePath_f . '/';
 		} else {
-			$keyfilePath = '/' . $owner . '/files_encryption/keyfiles/' . $filePath_f . '.key';
+			$keyPath = '/' . $owner . self::KEYS_BASE_DIR . $filePath_f . '/';
 		}
 
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		if ($view->file_exists($keyfilePath)) {
-
-			$result = $view->file_get_contents($keyfilePath);
-
-		} else {
+		return $keyPath;
+	}
 
-			$result = false;
+	/**
+	 * get path to file key for a given file
+	 *
+	 * @param \OC\Files\View $view relative to data directory
+	 * @param \OCA\Encryption\Util $util
+	 * @param string $path path to the file, relative to the users file directory
+	 * @return string
+	 */
+	public static function getFileKeyPath($view, $util, $path) {
 
+		if ($view->is_dir('/' . \OCP\User::getUser() . '/' . $path)) {
+			throw new Exception\EncryptionException('file was expected but directoy was given', Exception\EncryptionException::GENERIC);
 		}
 
-		\OC_FileProxy::$enabled = $proxyStatus;
+		list($owner, $filename) = $util->getUidAndFilename($path);
+		$filename = Helper::stripPartialFileExtension($filename);
+		$filePath_f = ltrim($filename, '/');
 
-		return $result;
+		// in case of system wide mount points the keys are stored directly in the data directory
+		if ($util->isSystemWideMountPoint($filename)) {
+			$keyfilePath = self::KEYS_BASE_DIR . $filePath_f . '/fileKey';
+		} else {
+			$keyfilePath = '/' . $owner . self::KEYS_BASE_DIR . $filePath_f . '/fileKey';
+		}
 
+		return $keyfilePath;
 	}
 
 	/**
-	 * Delete a keyfile
+	 * get path to share key for a given user
 	 *
-	 * @param \OC\Files\View $view
-	 * @param string $path path of the file the key belongs to
-	 * @param string $userId the user to whom the file belongs
-	 * @return bool Outcome of unlink operation
-	 * @note $path must be relative to data/user/files. e.g. mydoc.txt NOT
-	 *       /data/admin/files/mydoc.txt
+	 * @param \OC\Files\View $view relateive to data directory
+	 * @param \OCA\Encryption\Util $util
+	 * @param string $path path to file relative to the users files directoy
+	 * @param string $uid user for whom we want the share-key path
+	 * @retrun string
 	 */
-	public static function deleteFileKey($view, $path, $userId=null) {
-
-		$trimmed = ltrim($path, '/');
+	public static function getShareKeyPath($view, $util, $path, $uid) {
 
-		if ($trimmed === '') {
-			\OCP\Util::writeLog('Encryption library',
-				'Can\'t delete file-key empty path given!', \OCP\Util::ERROR);
-			return false;
+		if ($view->is_dir('/' . \OCP\User::getUser() . '/' . $path)) {
+			throw new Exception\EncryptionException('file was expected but directoy was given', Exception\EncryptionException::GENERIC);
 		}
 
-		if ($userId === null) {
-			$userId = Helper::getUser($path);
-		}
-		$util = new Util($view, $userId);
+		list($owner, $filename) = $util->getUidAndFilename($path);
+		$filename = Helper::stripPartialFileExtension($filename);
 
-		if($util->isSystemWideMountPoint($path)) {
-			$keyPath = '/files_encryption/keyfiles/' . $trimmed;
+		// in case of system wide mount points the keys are stored directly in the data directory
+		if ($util->isSystemWideMountPoint($filename)) {
+			$shareKeyPath = self::KEYS_BASE_DIR . $filename . '/'. $uid . '.shareKey';
 		} else {
-			$keyPath = '/' . $userId . '/files_encryption/keyfiles/' . $trimmed;
+			$shareKeyPath = '/' . $owner . self::KEYS_BASE_DIR . $filename . '/' . $uid . '.shareKey';
 		}
 
-		$result = false;
-		$fileExists = $view->file_exists('/' . $userId . '/files/' . $trimmed);
+		return $shareKeyPath;
+	}
 
-		if ($view->is_dir($keyPath) && !$fileExists) {
-			\OCP\Util::writeLog('files_encryption', 'deleteFileKey: delete file key: ' . $keyPath, \OCP\Util::DEBUG);
-			$result = $view->unlink($keyPath);
-		} elseif ($view->file_exists($keyPath . '.key') && !$fileExists) {
-			\OCP\Util::writeLog('files_encryption', 'deleteFileKey: delete file key: ' . $keyPath, \OCP\Util::DEBUG);
-			$result = $view->unlink($keyPath . '.key');
 
-		}
 
-		if ($fileExists) {
-			\OCP\Util::writeLog('Encryption library',
-					'Did not delete the file key, file still exists: ' . '/' . $userId . '/files/' . $trimmed, \OCP\Util::ERROR);
-		} elseif (!$result) {
-			\OCP\Util::writeLog('Encryption library',
-					'Could not delete keyfile; does not exist: "' . $keyPath, \OCP\Util::ERROR);
+	/**
+	 * retrieve keyfile for an encrypted file
+	 * @param \OC\Files\View $view
+	 * @param \OCA\Encryption\Util $util
+	 * @param string|false $filePath
+	 * @internal param \OCA\Encryption\file $string name
+	 * @return string file key or false
+	 * @note The keyfile returned is asymmetrically encrypted. Decryption
+	 * of the keyfile must be performed by client code
+	 */
+	public static function getFileKey($view, $util, $filePath) {
+
+		$keyfilePath = self::getFileKeyPath($view, $util, $filePath);
+
+		if ($view->file_exists($keyfilePath)) {
+			$result = $view->file_get_contents($keyfilePath);
+		} else {
+			$result = false;
 		}
 
 		return $result;
@@ -344,32 +326,18 @@ class Keymanager {
 	 * @param array $shareKeys
 	 * @return bool
 	 */
-	public static function setShareKeys(\OC\Files\View $view, $util, $path, array $shareKeys) {
-
-		// $shareKeys must be  an array with the following format:
-		// [userId] => [encrypted key]
-
-		list($owner, $filename) = $util->getUidAndFilename($path);
+	public static function setShareKeys($view, $util, $path, array $shareKeys) {
 
 		// in case of system wide mount points the keys are stored directly in the data directory
-		if ($util->isSystemWideMountPoint($filename)) {
-			$basePath = '/files_encryption/share-keys';
-		} else {
-			$basePath = '/' . $owner . '/files_encryption/share-keys';
-		}
+		$basePath = Keymanager::getKeyPath($view, $util, $path);
 
-		$shareKeyPath = self::keySetPreparation($view, $filename, $basePath);
+		self::keySetPreparation($view, $basePath);
 
 		$result = true;
 
 		foreach ($shareKeys as $userId => $shareKey) {
 
-			// try reusing key file if part file
-			if (Helper::isPartialFilePath($shareKeyPath)) {
-				$writePath = $basePath . '/' . Helper::stripPartialFileExtension($shareKeyPath) . '.' . $userId . '.shareKey';
-			} else {
-				$writePath = $basePath . '/' . $shareKeyPath . '.' . $userId . '.shareKey';
-			}
+			$writePath = $basePath . '/' . $userId . '.shareKey';
 
 			if (!self::setShareKey($view, $writePath, $shareKey)) {
 
@@ -392,89 +360,17 @@ class Keymanager {
 	 * @note The sharekey returned is encrypted. Decryption
 	 * of the keyfile must be performed by client code
 	 */
-	public static function getShareKey(\OC\Files\View $view, $userId, $util, $filePath) {
+	public static function getShareKey($view, $userId, $util, $filePath) {
 
-		// try reusing key file if part file
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		list($owner, $filename) = $util->getUidAndFilename($filePath);
-		$filename = Helper::stripPartialFileExtension($filename);
-		// in case of system wide mount points the keys are stored directly in the data directory
-		if ($util->isSystemWideMountPoint($filename)) {
-			$shareKeyPath = '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
-		} else {
-			$shareKeyPath = '/' . $owner . '/files_encryption/share-keys/' . $filename . '.' . $userId . '.shareKey';
-		}
+		$shareKeyPath = self::getShareKeyPath($view, $util, $filePath, $userId);
 
 		if ($view->file_exists($shareKeyPath)) {
-
 			$result = $view->file_get_contents($shareKeyPath);
-
 		} else {
-
 			$result = false;
-
 		}
 
-		\OC_FileProxy::$enabled = $proxyStatus;
-
 		return $result;
-
-	}
-
-	/**
-	 * delete all share keys of a given file
-	 * @param \OC\Files\View $view
-	 * @param string $userId owner of the file
-	 * @param string $filePath path to the file, relative to the owners file dir
-	 */
-	public static function delAllShareKeys($view, $userId, $filePath) {
-
-		$filePath = ltrim($filePath, '/');
-
-		if ($view->file_exists('/' . $userId . '/files/' . $filePath)) {
-			\OCP\Util::writeLog('Encryption library',
-					'File still exists, stop deleting share keys!', \OCP\Util::ERROR);
-			return false;
-		}
-
-		if ($filePath === '') {
-			\OCP\Util::writeLog('Encryption library',
-					'Can\'t delete share-keys empty path given!', \OCP\Util::ERROR);
-			return false;
-		}
-
-		$util = new util($view, $userId);
-
-		if ($util->isSystemWideMountPoint($filePath)) {
-			$baseDir = '/files_encryption/share-keys/';
-		} else {
-			$baseDir = $userId . '/files_encryption/share-keys/';
-		}
-
-		$result = true;
-
-		if ($view->is_dir($baseDir . $filePath)) {
-			\OCP\Util::writeLog('files_encryption', 'delAllShareKeys: delete share keys: ' . $baseDir . $filePath, \OCP\Util::DEBUG);
-			$result = $view->unlink($baseDir . $filePath);
-		} else {
-			$sharingEnabled = \OCP\Share::isEnabled();
-			$users = $util->getSharingUsersArray($sharingEnabled, $filePath);
-			foreach($users as $user) {
-				$keyName = $baseDir . $filePath . '.' . $user . '.shareKey';
-				if ($view->file_exists($keyName)) {
-					\OCP\Util::writeLog(
-						'files_encryption',
-						'dellAllShareKeys: delete share keys: "' . $keyName . '"',
-						\OCP\Util::DEBUG
-					);
-					$result &= $view->unlink($keyName);
-				}
-			}
-		}
-
-		return (bool)$result;
 	}
 
 	/**
@@ -482,45 +378,19 @@ class Keymanager {
 	 *
 	 * @param \OC\Files\View $view relative to data/
 	 * @param array $userIds list of users we want to remove
-	 * @param string $filename the owners name of the file for which we want to remove the users relative to data/user/files
-	 * @param string $owner owner of the file
+	 * @param string $keyPath
+	 * @param string $owner the owner of the file
+	 * @param string $ownerPath the owners name of the file for which we want to remove the users relative to data/user/files
 	 */
-	public static function delShareKey($view, $userIds, $filename, $owner) {
+	public static function delShareKey($view, $userIds, $keysPath, $owner, $ownerPath) {
 
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		$util = new Util($view, $owner);
-
-		if ($util->isSystemWideMountPoint($filename)) {
-			$shareKeyPath = \OC\Files\Filesystem::normalizePath('/files_encryption/share-keys/' . $filename);
-		} else {
-			$shareKeyPath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files_encryption/share-keys/' . $filename);
+		$key = array_search($owner, $userIds, true);
+		if ($key !== false && $view->file_exists('/' . $owner . '/files/' . $ownerPath)) {
+			unset($userIds[$key]);
 		}
 
-		if ($view->is_dir($shareKeyPath)) {
-
-			self::recursiveDelShareKeys($shareKeyPath, $userIds, $owner, $view);
-
-		} else {
-
-			foreach ($userIds as $userId) {
-
-				if ($userId === $owner && $view->file_exists('/' . $owner . '/files/' . $filename)) {
-					\OCP\Util::writeLog('files_encryption', 'Tried to delete owner key, but the file still exists!', \OCP\Util::FATAL);
-					continue;
-				}
-				$result = $view->unlink($shareKeyPath . '.' . $userId . '.shareKey');
-				\OCP\Util::writeLog('files_encryption', 'delShareKey: delete share key: ' . $shareKeyPath . '.' . $userId . '.shareKey' , \OCP\Util::DEBUG);
-				if (!$result) {
-					\OCP\Util::writeLog('Encryption library',
-						'Could not delete shareKey; does not exist: "' . $shareKeyPath . '.' . $userId
-						. '.shareKey"', \OCP\Util::ERROR);
-				}
-			}
-		}
+		self::recursiveDelShareKeys($keysPath, $userIds, $view);
 
-		\OC_FileProxy::$enabled = $proxyStatus;
 	}
 
 	/**
@@ -528,35 +398,23 @@ class Keymanager {
 	 *
 	 * @param string $dir directory
 	 * @param array $userIds user ids for which the share keys should be deleted
-	 * @param string $owner owner of the file
 	 * @param \OC\Files\View $view view relative to data/
 	 */
-	private static function recursiveDelShareKeys($dir, $userIds, $owner, $view) {
+	private static function recursiveDelShareKeys($dir, $userIds, $view) {
 
 		$dirContent = $view->opendir($dir);
-		$dirSlices = explode('/', ltrim($dir, '/'));
-		$realFileDir = '/' . $owner . '/files/' . implode('/', array_slice($dirSlices, 3)) . '/';
 
 		if (is_resource($dirContent)) {
 			while (($file = readdir($dirContent)) !== false) {
 				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
 					if ($view->is_dir($dir . '/' . $file)) {
-						self::recursiveDelShareKeys($dir . '/' . $file, $userIds, $owner, $view);
+						self::recursiveDelShareKeys($dir . '/' . $file, $userIds, $view);
 					} else {
 						foreach ($userIds as $userId) {
-							$fileNameFromShareKey = self::getFilenameFromShareKey($file, $userId);
-							if (!$fileNameFromShareKey) {
-								continue;
-							}
-							$realFile = $realFileDir . $fileNameFromShareKey;
-
-							if ($userId === $owner &&
-									$view->file_exists($realFile)) {
-								\OCP\Util::writeLog('files_encryption', 'original file still exists, keep owners share key!', \OCP\Util::ERROR);
-								continue;
+							if ($userId . '.shareKey' === $file) {
+								\OCP\Util::writeLog('files_encryption', 'recursiveDelShareKey: delete share key: ' . $file, \OCP\Util::DEBUG);
+								$view->unlink($dir . '/' . $file);
 							}
-							\OCP\Util::writeLog('files_encryption', 'recursiveDelShareKey: delete share key: ' . $file, \OCP\Util::DEBUG);
-							$view->unlink($dir . '/' . $file);
 						}
 					}
 				}
@@ -567,21 +425,16 @@ class Keymanager {
 
 	/**
 	 * Make preparations to vars and filesystem for saving a keyfile
-	 * @param string|boolean $path
+	 *
+	 * @param \OC\Files\View $view
+	 * @param string $path relatvie to the views root
 	 * @param string $basePath
 	 */
-	protected static function keySetPreparation(\OC\Files\View $view, $path, $basePath) {
-
-		$targetPath = ltrim($path, '/');
-
-		$path_parts = pathinfo($targetPath);
+	protected static function keySetPreparation($view, $path) {
 
 		// If the file resides within a subdirectory, create it
-		if (
-			isset($path_parts['dirname'])
-			&& !$view->file_exists($basePath . '/' . $path_parts['dirname'])
-		) {
-			$sub_dirs = explode('/', $basePath . '/' . $path_parts['dirname']);
+		if (!$view->file_exists($path)) {
+			$sub_dirs = explode('/', $path);
 			$dir = '';
 			foreach ($sub_dirs as $sub_dir) {
 				$dir .= '/' . $sub_dir;
@@ -590,27 +443,6 @@ class Keymanager {
 				}
 			}
 		}
-
-		return $targetPath;
-
 	}
 
-	/**
-	 * extract filename from share key name
-	 * @param string $shareKey (filename.userid.sharekey)
-	 * @param string $userId
-	 * @return string|false filename or false
-	 */
-	protected static function getFilenameFromShareKey($shareKey, $userId) {
-		$expectedSuffix = '.' . $userId . '.' . 'shareKey';
-		$suffixLen = strlen($expectedSuffix);
-
-		$suffix = substr($shareKey, -$suffixLen);
-
-		if ($suffix !== $expectedSuffix) {
-			return false;
-		}
-
-		return substr($shareKey, 0, -$suffixLen);
-	}
 }
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index a358a46a6e7..8c8ffd61207 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -204,11 +204,11 @@ class Proxy extends \OC_FileProxy {
 	public function postFile_get_contents($path, $data) {
 
 		$plainData = null;
-		$view = new \OC\Files\View('/');
 
 		// If data is a catfile
 		if (
 			Crypt::mode() === 'server'
+			&& $this->shouldEncrypt($path)
 			&& Crypt::isCatfileContent($data)
 		) {
 
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index d214d13de69..a1baecfb2f3 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -44,10 +44,10 @@ class Util {
 	private $client; // Client side encryption mode flag
 	private $publicKeyDir; // Dir containing all public user keys
 	private $encryptionDir; // Dir containing user's files_encryption
-	private $keyfilesPath; // Dir containing user's keyfiles
-	private $shareKeysPath; // Dir containing env keys for shared files
+	private $keysPath; // Dir containing all file related encryption keys
 	private $publicKeyPath; // Path to user's public key
 	private $privateKeyPath; // Path to user's private key
+	private $userFilesDir;
 	private $publicShareKeyId;
 	private $recoveryKeyId;
 	private $isPublic;
@@ -74,8 +74,7 @@ class Util {
 				'/' . $userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
 		$this->publicKeyDir = '/' . 'public-keys';
 		$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
-		$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
-		$this->shareKeysPath = $this->encryptionDir . '/' . 'share-keys';
+		$this->keysPath = $this->encryptionDir . '/' . 'keys';
 		$this->publicKeyPath =
 				$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
 		$this->privateKeyPath =
@@ -99,8 +98,7 @@ class Util {
 
 		if (
 			!$this->view->file_exists($this->encryptionDir)
-			or !$this->view->file_exists($this->keyfilesPath)
-			or !$this->view->file_exists($this->shareKeysPath)
+			or !$this->view->file_exists($this->keysPath)
 			or !$this->view->file_exists($this->publicKeyPath)
 			or !$this->view->file_exists($this->privateKeyPath)
 		) {
@@ -149,8 +147,7 @@ class Util {
 			$this->userDir,
 			$this->publicKeyDir,
 			$this->encryptionDir,
-			$this->keyfilesPath,
-			$this->shareKeysPath
+			$this->keysPath
 		);
 
 		// Check / create all necessary dirs
@@ -727,8 +724,8 @@ class Util {
 			}
 
 			if ($successful) {
-				$this->view->rename($this->keyfilesPath, $this->keyfilesPath . '.backup');
-				$this->view->rename($this->shareKeysPath, $this->shareKeysPath . '.backup');
+				$this->backupAllKeys('decryptAll');
+				$this->view->deleteAll($this->keysPath);
 			}
 
 			\OC_FileProxy::$enabled = true;
@@ -845,9 +842,9 @@ class Util {
 
 				break;
 
-			case 'keyfilesPath':
+			case 'keysPath':
 
-				return $this->keyfilesPath;
+				return $this->keysPath;
 
 				break;
 
@@ -1395,19 +1392,17 @@ class Util {
 	 * add recovery key to all encrypted files
 	 */
 	public function addRecoveryKeys($path = '/') {
-		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		$dirContent = $this->view->getDirectoryContent($this->keysPath . '/' . $path);
 		foreach ($dirContent as $item) {
 			// get relative path from files_encryption/keyfiles/
-			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
-			if ($item['type'] === 'dir') {
+			$filePath = substr($item['path'], strlen('files_encryption/keys'));
+			if ($this->view->is_dir($this->userFilesDir . '/' . $filePath)) {
 				$this->addRecoveryKeys($filePath . '/');
 			} else {
 				$session = new \OCA\Encryption\Session(new \OC\Files\View('/'));
 				$sharingEnabled = \OCP\Share::isEnabled();
-				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
-				$file = substr($filePath, 0, -4);
-				$usersSharing = $this->getSharingUsersArray($sharingEnabled, $file);
-				$this->setSharedFileKeyfiles($session, $usersSharing, $file);
+				$usersSharing = $this->getSharingUsersArray($sharingEnabled, $filePath);
+				$this->setSharedFileKeyfiles($session, $usersSharing, $filePath);
 			}
 		}
 	}
@@ -1416,16 +1411,14 @@ class Util {
 	 * remove recovery key to all encrypted files
 	 */
 	public function removeRecoveryKeys($path = '/') {
-		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		$dirContent = $this->view->getDirectoryContent($this->keysPath . '/' . $path);
 		foreach ($dirContent as $item) {
 			// get relative path from files_encryption/keyfiles
-			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
-			if ($item['type'] === 'dir') {
+			$filePath = substr($item['path'], strlen('files_encryption/keys'));
+			if ($this->view->is_dir($this->userFilesDir . '/' . $filePath)) {
 				$this->removeRecoveryKeys($filePath . '/');
 			} else {
-				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
-				$file = substr($filePath, 0, -4);
-				$this->view->unlink($this->shareKeysPath . '/' . $file . '.' . $this->recoveryKeyId . '.shareKey');
+				$this->view->unlink($this->keysPath . '/' . $filePath . '/' . $this->recoveryKeyId . '.shareKey');
 			}
 		}
 	}
@@ -1455,27 +1448,17 @@ class Util {
 		}
 		$filteredUids = $this->filterShareReadyUsers($userIds);
 
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
 		//decrypt file key
-		$encKeyfile = $this->view->file_get_contents($this->keyfilesPath . $file . ".key");
-		$shareKey = $this->view->file_get_contents(
-			$this->shareKeysPath . $file . "." . $this->recoveryKeyId . ".shareKey");
+		$encKeyfile = Keymanager::getFileKey($this->view, $this, $file);
+		$shareKey = Keymanager::getShareKey($this->view, $this->recoveryKeyId, $this, $file);
 		$plainKeyfile = Crypt::multiKeyDecrypt($encKeyfile, $shareKey, $privateKey);
 		// encrypt file key again to all users, this time with the new public key for the recovered use
 		$userPubKeys = Keymanager::getPublicKeys($this->view, $filteredUids['ready']);
 		$multiEncKey = Crypt::multiKeyEncrypt($plainKeyfile, $userPubKeys);
 
-		// write new keys to filesystem TDOO!
-		$this->view->file_put_contents($this->keyfilesPath . $file . '.key', $multiEncKey['data']);
-		foreach ($multiEncKey['keys'] as $userId => $shareKey) {
-			$shareKeyPath = $this->shareKeysPath . $file . '.' . $userId . '.shareKey';
-			$this->view->file_put_contents($shareKeyPath, $shareKey);
-		}
+		Keymanager::setFileKey($this->view, $this, $file, $multiEncKey['data']);
+		Keymanager::setShareKeys($this->view, $this, $file, $multiEncKey['keys']);
 
-		// Return proxy to original status
-		\OC_FileProxy::$enabled = $proxyStatus;
 	}
 
 	/**
@@ -1484,16 +1467,14 @@ class Util {
 	 * @param string $privateKey private recovery key which is used to decrypt the files
 	 */
 	private function recoverAllFiles($path, $privateKey) {
-		$dirContent = $this->view->getDirectoryContent($this->keyfilesPath . $path);
+		$dirContent = $this->view->getDirectoryContent($this->keysPath . '/' . $path);
 		foreach ($dirContent as $item) {
 			// get relative path from files_encryption/keyfiles
-			$filePath = substr($item['path'], strlen('files_encryption/keyfiles'));
-			if ($item['type'] === 'dir') {
+			$filePath = substr($item['path'], strlen('files_encryption/keys'));
+			if ($this->view->is_dir($this->userFilesDir . '/' . $filePath)) {
 				$this->recoverAllFiles($filePath . '/', $privateKey);
 			} else {
-				// remove '.key' extension from path e.g. 'file.txt.key' to 'file.txt'
-				$file = substr($filePath, 0, -4);
-				$this->recoverFile($file, $privateKey);
+				$this->recoverFile($filePath, $privateKey);
 			}
 		}
 	}
@@ -1527,8 +1508,7 @@ class Util {
 		$backupDir = $this->encryptionDir . '/backup.';
 		$backupDir .= ($purpose === '') ? date("Y-m-d_H-i-s") . '/' : $purpose . '.' . date("Y-m-d_H-i-s") . '/';
 		$this->view->mkdir($backupDir);
-		$this->view->copy($this->shareKeysPath, $backupDir . 'share-keys/');
-		$this->view->copy($this->keyfilesPath, $backupDir . 'keyfiles/');
+		$this->view->copy($this->keysPath, $backupDir . 'keys/');
 		$this->view->copy($this->privateKeyPath, $backupDir . $this->userId . '.private.key');
 		$this->view->copy($this->publicKeyPath, $backupDir . $this->userId . '.public.key');
 	}
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 7369be8ff05..46a717f851e 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -211,8 +211,6 @@ class Test_Encryption_Crypt extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// Teardown
 		$this->view->unlink($this->userId . '/files/' . $filename);
-
-		Encryption\Keymanager::deleteFileKey($this->view, $filename);
 	}
 
 	/**
@@ -252,8 +250,6 @@ class Test_Encryption_Crypt extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// Teardown
 		$this->view->unlink($this->userId . '/files/' . $filename);
-
-		Encryption\Keymanager::deleteFileKey($this->view, $filename);
 	}
 
 	/**
@@ -293,11 +289,7 @@ class Test_Encryption_Crypt extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertEquals($this->dataLong . $this->dataLong, $decrypted);
 
 		// Teardown
-
 		$this->view->unlink($this->userId . '/files/' . $filename);
-
-		Encryption\Keymanager::deleteFileKey($this->view, $filename);
-
 	}
 
 	/**
@@ -341,11 +333,7 @@ class Test_Encryption_Crypt extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertEquals($this->dataLong . $this->dataLong, $decrypted);
 
 		// Teardown
-
 		$this->view->unlink($this->userId . '/files/' . $filename);
-
-		Encryption\Keymanager::deleteFileKey($this->view, $filename);
-
 	}
 
 	/**
@@ -393,11 +381,7 @@ class Test_Encryption_Crypt extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertEquals($this->dataLong . $this->dataLong, $decrypted);
 
 		// Teardown
-
 		$this->view->unlink($this->userId . '/files/' . $filename);
-
-		Encryption\Keymanager::deleteFileKey($this->view, $filename);
-
 	}
 
 	/**
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
index fcde7dc5df3..f0e3408b2e0 100644
--- a/apps/files_encryption/tests/helper.php
+++ b/apps/files_encryption/tests/helper.php
@@ -125,56 +125,4 @@ class Test_Encryption_Helper extends \OCA\Files_Encryption\Tests\TestCase {
 		self::cleanUpUsers();
 	}
 
-	function userNamesProvider() {
-		return array(
-			array('testuser' . $this->getUniqueID()),
-			array('user.name.with.dots'),
-		);
-	}
-
-	/**
-	 * Tests whether share keys can be found
-	 *
-	 * @dataProvider userNamesProvider
-	 */
-	function testFindShareKeys($userName) {
-		self::setUpUsers();
-		// note: not using dataProvider as we want to make
-		// sure that the correct keys are match and not any
-		// other ones that might happen to have similar names
-		self::setupHooks();
-		self::loginHelper($userName, true);
-		$testDir = 'testFindShareKeys' . $this->getUniqueID() . '/';
-		$baseDir = $userName . '/files/' . $testDir;
-		$fileList = array(
-			't est.txt',
-			't est_.txt',
-			't est.doc.txt',
-			't est(.*).txt', // make sure the regexp is escaped
-			'multiple.dots.can.happen.too.txt',
-			't est.' . $userName . '.txt',
-			't est_.' . $userName . '.shareKey.txt',
-			'who would upload their.shareKey',
-			'user ones file.txt',
-			'user ones file.txt.backup',
-			'.t est.txt'
-		);
-
-		$rootView = new \OC\Files\View('/');
-		$rootView->mkdir($baseDir);
-		foreach ($fileList as $fileName) {
-			$rootView->file_put_contents($baseDir . $fileName, 'dummy');
-		}
-
-		$shareKeysDir = $userName . '/files_encryption/share-keys/' . $testDir;
-		foreach ($fileList as $fileName) {
-			// make sure that every file only gets its correct respective keys
-			$result = Encryption\Helper::findShareKeys($baseDir . $fileName, $shareKeysDir . $fileName, $rootView);
-			$this->assertEquals(
-				array($shareKeysDir . $fileName . '.' . $userName . '.shareKey'),
-				$result
-			);
-		}
-		self::cleanUpUsers();
-	}
 }
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index 4b8be0c7c1c..944d8a38870 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -163,10 +163,10 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if all keys are generated
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
+			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/' . $this->filename . '/fileKey'));
 
 
 		self::logoutHelper();
@@ -178,10 +178,10 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if all keys are generated
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
+			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
+			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keys/' . $this->filename . '/fileKey'));
 
 
 		// create a dummy file that we can delete something outside of data/user/files
@@ -193,10 +193,10 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// all keys should still exist
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
+			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
+			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keys/' . $this->filename . '/fileKey'));
 
 
 		// delete the file in data/user/files
@@ -205,17 +205,17 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if keys from user2 are really deleted
 		$this->assertFalse($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
+			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
 		$this->assertFalse($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
+			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keys/' . $this->filename . '/fileKey'));
 
 		// but user1 keys should still exist
 		$this->assertTrue($this->rootView->file_exists(
-				self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-				. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+				self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+				. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-				self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
+				self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/' . $this->filename . '/fileKey'));
 
 		if ($stateFilesTrashbin) {
 			OC_App::enable('files_trashbin');
@@ -244,10 +244,10 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if all keys are generated
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
+			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/' . $this->filename . '/fileKey'));
 
 		// get the file info from previous created file
 		$fileInfo = $this->user1View->getFileInfo($this->filename);
@@ -260,8 +260,8 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if new share key exists
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
+			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
 
 		self::logoutHelper();
 		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
@@ -272,10 +272,10 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// keys should be stored at user1s dir, not in user2s
 		$this->assertFalse($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
+			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
 		$this->assertFalse($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
+			self::TEST_ENCRYPTION_HOOKS_USER2 . '/files_encryption/keys/' . $this->filename . '/fileKey'));
 
 		// delete the Shared file from user1 in data/user2/files/Shared
 		$result = $this->user2View->unlink($this->filename);
@@ -284,13 +284,13 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// share key for user2 from user1s home should be gone, all other keys should still exists
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 		$this->assertFalse($this->rootView->file_exists(
-				self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-				. $this->filename . '.' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
+				self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+				. $this->filename . '/' . \Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/' . $this->filename . '.key'));
+			self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/' . $this->filename . '/fileKey'));
 
 		// cleanup
 
@@ -327,12 +327,12 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 	function doTestRenameHook($filename) {
 		// check if keys exists
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/'
-			. $filename . '.key'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $filename . '/fileKey'));
 
 		// make subfolder and sub-subfolder
 		$this->rootView->mkdir('/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files/' . $this->folder);
@@ -351,18 +351,18 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// keys should be renamed too
 		$this->assertFalse($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 		$this->assertFalse($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/'
-			. $filename . '.key'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $filename . '/fileKey'));
 
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/' . $this->folder . '/' . $this->folder . '/'
-			. $filename . '.' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/' . $this->folder . '/' . $this->folder . '/'
+			. $filename . '/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/' . $this->folder . '/' . $this->folder . '/'
-			. $filename . '.key'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/' . $this->folder . '/' . $this->folder . '/'
+			. $filename . '/fileKey'));
 
 		// cleanup
 		$this->rootView->unlink('/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files/' . $this->folder);
@@ -389,12 +389,12 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 	function doTestCopyHook($filename) {
 		// check if keys exists
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/'
-			. $filename . '.key'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $filename . '/fileKey'));
 
 		// make subfolder and sub-subfolder
 		$this->rootView->mkdir('/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files/' . $this->folder);
@@ -410,18 +410,18 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// keys should be copied too
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/'
-			. $filename . '.key'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/'
+			. $filename . '/fileKey'));
 
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/share-keys/' . $this->folder . '/' . $this->folder . '/'
-			. $filename . '.' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/' . $this->folder . '/' . $this->folder . '/'
+			. $filename . '/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '.shareKey'));
 		$this->assertTrue($this->rootView->file_exists(
-			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keyfiles/' . $this->folder . '/' . $this->folder . '/'
-			. $filename . '.key'));
+			'/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files_encryption/keys/' . $this->folder . '/' . $this->folder . '/'
+			. $filename . '/fileKey'));
 
 		// cleanup
 		$this->rootView->unlink('/' . self::TEST_ENCRYPTION_HOOKS_USER1 . '/files/' . $this->folder);
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index b4dc6ddeb56..d4a3f85ed48 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -78,9 +78,7 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 	}
 
 	function tearDown() {
-		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys');
-		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles');
-
+		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys');
 		parent::tearDown();
 	}
 
@@ -140,27 +138,6 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertArrayHasKey('key', $sslInfo);
 	}
 
-	function fileNameFromShareKeyProvider() {
-		return array(
-			array('file.user.shareKey', 'user', 'file'),
-			array('file.name.with.dots.user.shareKey', 'user', 'file.name.with.dots'),
-			array('file.name.user.with.dots.shareKey', 'user.with.dots', 'file.name'),
-			array('file.txt', 'user', false),
-			array('user.shareKey', 'user', false),
-		);
-	}
-
-	/**
-	 * @small
-	 *
-	 * @dataProvider fileNameFromShareKeyProvider
-	 */
-	function testGetFilenameFromShareKey($fileName, $user, $expectedFileName) {
-		$this->assertEquals($expectedFileName,
-			\TestProtectedKeymanagerMethods::testGetFilenameFromShareKey($fileName, $user)
-		);
-	}
-
 	/**
 	 * @medium
 	 */
@@ -180,7 +157,7 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 
 		Encryption\Keymanager::setFileKey($this->view, $util, $file, $key);
 
-		$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keyfiles/' . $file . '.key'));
+		$this->assertTrue($this->view->file_exists('/' . $this->userId . '/files_encryption/keys/' . $file . '/fileKey'));
 
 		// cleanup
 		$this->view->unlink('/' . $this->userId . '/files/' . $file);
@@ -256,70 +233,78 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/existingFile.txt', 'data');
 
 		// create folder structure for some dummy share key files
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1');
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder');
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/existingFile.txt');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file2');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/file2');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/subsubfolder');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/subsubfolder/file1');
+		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/subsubfolder/file2');
 
 		// create some dummy share keys
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.user1.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.user1.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.user1.test.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.test-keymanager-userxdot.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.userx.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.' . Test_Encryption_Keymanager::TEST_USER . '.userx.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.user1.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.' . Test_Encryption_Keymanager::TEST_USER . '.user1.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2.user2.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2.user3.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/file2.user3.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file1.user1.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2.user2.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2.user3.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/existingFile.txt/user1.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/existingFile.txt/' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/user1.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/user1.test.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/test-keymanager-userxdot.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/userx.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/' . Test_Encryption_Keymanager::TEST_USER . '.userx.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/user1.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/' . Test_Encryption_Keymanager::TEST_USER . '.user1.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file2/user2.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file2/user3.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/file2/user3.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/subsubfolder/file1/user1.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/subsubfolder/file2/user2.shareKey', 'data');
+		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/subsubfolder/file2/user3.shareKey', 'data');
 
 		// recursive delete share keys from user1 and user2
-		Encryption\Keymanager::delShareKey($this->view, array('user1', 'user2', Test_Encryption_Keymanager::TEST_USER), '/folder1/', Test_Encryption_Keymanager::TEST_USER);
+		Encryption\Keymanager::delShareKey($this->view,
+				array('user1', 'user2', Test_Encryption_Keymanager::TEST_USER),
+				Encryption\Keymanager::getKeyPath($this->view, new Encryption\Util($this->view, Test_Encryption_Keymanager::TEST_USER), '/folder1'),
+				Test_Encryption_Keymanager::TEST_USER,
+				'/folder1');
 
 		// check if share keys from user1 and user2 are deleted
 		$this->assertFalse($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.user1.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/existingFile.txt/user1.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.user1.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1/user1.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2.user2.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2/user2.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file1.user1.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file1/user1.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2.user2.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2/user2.shareKey'));
 
 		// check if share keys from user3 still exists
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file2.user3.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file2/user3.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/subsubfolder/file2.user3.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/subsubfolder/file2/user3.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/subfolder/file2.user3.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/subfolder/file2/user3.shareKey'));
 
-		// check if share keys for user or file with similar name 
+		// check if share keys for user or file with similar name
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.user1.test.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/user1.test.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.test-keymanager-userxdot.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/test-keymanager-userxdot.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.' . Test_Encryption_Keymanager::TEST_USER . '.userx.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/' . Test_Encryption_Keymanager::TEST_USER . '.userx.shareKey'));
 		// FIXME: this case currently cannot be distinguished, needs further fixing
-		/*
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.userx.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/userx.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.user1.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/user1.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/file1.' . Test_Encryption_Keymanager::TEST_USER . '.user1.shareKey'));
-		 */
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/file1/' . Test_Encryption_Keymanager::TEST_USER . '.user1.shareKey'));
 
 		// owner key from existing file should still exists because the file is still there
 		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey'));
+			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keys/folder1/existingFile.txt/' . Test_Encryption_Keymanager::TEST_USER . '.shareKey'));
 
 		// cleanup
 		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
@@ -344,7 +329,12 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
 
 		// recursive delete share keys from user1 and user2
-		Encryption\Keymanager::delShareKey($this->view, array('user1', 'user2', Test_Encryption_Keymanager::TEST_USER), '/folder1/existingFile.txt', Test_Encryption_Keymanager::TEST_USER);
+		Encryption\Keymanager::delShareKey($this->view,
+				array('user1', 'user2', Test_Encryption_Keymanager::TEST_USER),
+				Encryption\Keymanager::getKeyPath($this->view, new Encryption\Util($this->view, Test_Encryption_Keymanager::TEST_USER), '/folder1/existingFile.txt'),
+				Test_Encryption_Keymanager::TEST_USER,
+				'/folder1/existingFile.txt');
+
 
 		// check if share keys from user1 and user2 are deleted
 		$this->assertFalse($this->view->file_exists(
@@ -362,147 +352,16 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 
 	}
 
-	/**
-	 * @medium
-	 */
-	function testDeleteFileKey() {
-
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/existingFile.txt', 'data');
-
-		// create folder structure for some dummy file key files
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1');
-
-		// create dummy keyfile
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1/dummyFile.txt.key', 'data');
-
-		// recursive delete share keys from user1 and user2
-		$result = Encryption\Keymanager::deleteFileKey($this->view, '/folder1/existingFile.txt');
-		$this->assertFalse($result);
-
-		$result2 = Encryption\Keymanager::deleteFileKey($this->view, '/folder1/dummyFile.txt');
-		$this->assertTrue($result2);
-
-		// check if file key from dummyFile was deleted
-		$this->assertFalse($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1/dummyFile.txt.key'));
-
-		// check if file key from existing file still exists
-		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1/existingFile.txt.key'));
-
-		// cleanup
-		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
-
-	}
-
-	/**
-	 * @medium
-	 */
-	function testDeleteFileKeyFolder() {
-
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/existingFile.txt', 'data');
-
-		// create folder structure for some dummy file key files
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1');
-
-		// create dummy keyfile
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1/dummyFile.txt.key', 'data');
-
-		// recursive delete share keys from user1 and user2
-		$result = Encryption\Keymanager::deleteFileKey($this->view, '/folder1');
-		$this->assertFalse($result);
-
-		// all file keys should still exists if we try to delete a folder with keys for which some files still exists
-		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1/dummyFile.txt.key'));
-		$this->assertTrue($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1/existingFile.txt.key'));
-
-		// delete folder
-		$this->view->unlink('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
-		// create dummy keyfile
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1/dummyFile.txt.key', 'data');
-
-		// now file keys should be deleted since the folder no longer exists
-		$result = Encryption\Keymanager::deleteFileKey($this->view, '/folder1');
-		$this->assertTrue($result);
-
-		$this->assertFalse($this->view->file_exists(
-			'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/keyfiles/folder1'));
-
-		// cleanup
-		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
-
-	}
-
-	function testDelAllShareKeysFile() {
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1/existingFile.txt', 'data');
-
-		// create folder structure for some dummy share key files
-		$this->view->mkdir('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1');
-
-		// create some dummy share keys for the existing file
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.user1.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.user2.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.user3.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
-
-		// create some dummy share keys for a non-existing file
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/nonexistingFile.txt.user1.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/nonexistingFile.txt.user2.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/nonexistingFile.txt.user3.shareKey', 'data');
-		$this->view->file_put_contents('/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/nonexistingFile.txt.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey', 'data');
-
-		// try to del all share keys from a existing file, should fail because the file still exists
-		$result = Encryption\Keymanager::delAllShareKeys($this->view, Test_Encryption_Keymanager::TEST_USER, 'folder1/existingFile.txt');
-		$this->assertFalse($result);
-
-		// check if share keys still exists
-		$this->assertTrue($this->view->file_exists(
-				'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey'));
-		$this->assertTrue($this->view->file_exists(
-				'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.user1.shareKey'));
-		$this->assertTrue($this->view->file_exists(
-				'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.user2.shareKey'));
-		$this->assertTrue($this->view->file_exists(
-				'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/existingFile.txt.user3.shareKey'));
-
-		// try to del all share keys from file, should succeed because the does not exist any more
-		$result2 = Encryption\Keymanager::delAllShareKeys($this->view, Test_Encryption_Keymanager::TEST_USER, 'folder1/nonexistingFile.txt');
-		$this->assertTrue($result2);
-
-		// check if share keys are really gone
-		$this->assertFalse($this->view->file_exists(
-				'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/nonexistingFile.txt.' . Test_Encryption_Keymanager::TEST_USER . '.shareKey'));
-		// check that it only deleted keys or users who had access, others remain
-		$this->assertTrue($this->view->file_exists(
-				'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/nonexistingFile.txt.user1.shareKey'));
-		$this->assertTrue($this->view->file_exists(
-				'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/nonexistingFile.txt.user2.shareKey'));
-		$this->assertTrue($this->view->file_exists(
-				'/'.Test_Encryption_Keymanager::TEST_USER.'/files_encryption/share-keys/folder1/nonexistingFile.txt.user3.shareKey'));
-
-		// cleanup
-		$this->view->deleteAll('/'.Test_Encryption_Keymanager::TEST_USER.'/files/folder1');
-
-	}
-
 	function testKeySetPreperation() {
 		$basePath = '/'.Test_Encryption_Keymanager::TEST_USER.'/files';
 		$path = '/folder1/subfolder/subsubfolder/file.txt';
 
 		$this->assertFalse($this->view->is_dir($basePath . '/testKeySetPreperation'));
 
-		$result = TestProtectedKeymanagerMethods::testKeySetPreperation($this->view, $path, $basePath);
-
-		// return path without leading slash
-		$this->assertSame('folder1/subfolder/subsubfolder/file.txt', $result);
+		TestProtectedKeymanagerMethods::testKeySetPreperation($this->view, $basePath . $path);
 
 		// check if directory structure was created
-		$this->assertTrue($this->view->is_dir($basePath . '/folder1/subfolder/subsubfolder'));
+		$this->assertTrue($this->view->is_dir($basePath . $path));
 
 		// cleanup
 		$this->view->deleteAll($basePath . '/folder1');
@@ -515,19 +374,12 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
  */
 class TestProtectedKeymanagerMethods extends \OCA\Encryption\Keymanager {
 
-	/**
-	 * @param string $sharekey
-	 */
-	public static function testGetFilenameFromShareKey($sharekey, $user) {
-		return self::getFilenameFromShareKey($sharekey, $user);
-	}
-
 	/**
 	 * @param \OC\Files\View $view relative to data/
 	 * @param string $path
 	 * @param string $basePath
 	 */
-	public static function testKeySetPreperation($view, $path, $basePath) {
-		return self::keySetPreparation($view, $path, $basePath);
+	public static function testKeySetPreperation($view, $path) {
+		return self::keySetPreparation($view, $path);
 	}
 }
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 24b828433d0..48aaec5c196 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -178,8 +178,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user1 exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// login as user1
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
@@ -202,8 +202,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 			// cleanup
 			$this->view->chroot('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/');
@@ -212,8 +212,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		}
 	}
 
@@ -239,8 +239,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user2 exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// login as user2
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
@@ -266,16 +266,16 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 			// unshare the file with user1
 			\OCP\Share::unshare('file', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 			// cleanup
 			$this->view->chroot('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/');
@@ -284,8 +284,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		}
 	}
 
@@ -335,9 +335,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user1 exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// login as user1
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
@@ -361,9 +361,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys'
 				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 			// cleanup
 			$this->view->chroot('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files');
@@ -372,9 +372,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys'
 				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		}
 
 		return $fileInfo;
@@ -413,9 +413,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user3 exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// login as user3
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
@@ -444,9 +444,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user3 exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 		// login as user3
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
@@ -469,9 +469,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys'
 				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 			// login as user1
 			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2);
@@ -481,9 +481,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys'
 				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 			// login as admin
 			self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -493,9 +493,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys'
 				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 			// cleanup
 			$this->view->chroot('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files');
@@ -504,9 +504,9 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 			// check if share key not exists
 			$this->assertFalse($this->view->file_exists(
-				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys'
+				'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys'
 				. $this->folder1 . $this->subfolder . $this->subsubfolder . '/'
-				. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+				. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		}
 	}
 
@@ -548,8 +548,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for public exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . $publicShareKeyId . '.shareKey'));
 
 		// some hacking to simulate public link
 		//$GLOBALS['app'] = 'files_sharing';
@@ -572,8 +572,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . $publicShareKeyId . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . $publicShareKeyId . '.shareKey'));
 
 		// cleanup
 		$this->view->chroot('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/');
@@ -582,8 +582,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 	}
 
 	/**
@@ -624,11 +624,11 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user2 and user3 exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 		// login as user1
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
@@ -648,11 +648,11 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4 . '.shareKey'));
 
 		// cleanup
 		$this->view->chroot('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/');
@@ -661,8 +661,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 
 	}
 
@@ -708,19 +708,19 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for admin and recovery exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 
 		// disable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(0));
@@ -730,12 +730,12 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for recovery not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 
 		// enable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(1));
@@ -745,12 +745,12 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for admin and recovery exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 
 		// cleanup
 		$this->view->chroot('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/');
@@ -760,12 +760,12 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for recovery not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 
 		$this->assertTrue(\OCA\Encryption\Helper::adminEnableRecovery(null, 'test123'));
 		$this->assertTrue(\OCA\Encryption\Helper::adminDisableRecovery('test123'));
@@ -815,19 +815,19 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user and recovery exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/keys/'
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 
 		// login as admin
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1);
@@ -859,19 +859,19 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user and recovery exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/keys/'
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/share-keys/' . $this->folder1
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '/files_encryption/keys/' . $this->folder1
 			. $this->subfolder . $this->subsubfolder . '/'
-			. $this->filename . '.' . $recoveryKeyId . '.shareKey'));
+			. $this->filename . '/' . $recoveryKeyId . '.shareKey'));
 
 		// enable recovery for admin
 		$this->assertTrue($util->setRecoveryForUser(0));
@@ -934,8 +934,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user1 not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -947,8 +947,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key');
 
 		// remove share file
-		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-							. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3
+		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+							. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3
 							. '.shareKey');
 
 		// re-enable the file proxy
@@ -959,8 +959,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.shareKey'));
 
 		// cleanup
 		$this->view->chroot('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files/');
@@ -995,8 +995,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if share key for user2 exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/share-keys/'
-			. $this->filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+			'/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
+			. $this->filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 
 		// login as user2
@@ -1068,10 +1068,10 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertEquals($this->dataShort, $newDecrypt);
 
 		// check if additional share key for user2 exists
-		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $newFolder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertTrue($view->file_exists('files_encryption/keys' . $newFolder . '/' . $filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// check that old keys were removed/moved properly
-		$this->assertFalse($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertFalse($view->file_exists('files_encryption/keys' . $folder . '/' . $filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// tear down
 		\OC\Files\Filesystem::unlink($newFolder);
@@ -1120,8 +1120,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		\OCP\Share::shareItem('folder', $fileInfo['fileid'], \OCP\Share::SHARE_TYPE_USER, \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2, \OCP\Constants::PERMISSION_ALL);
 
 		// check that the share keys exist
-		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
-		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertTrue($view->file_exists('files_encryption/keys' . $folder . '/' . $filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		$this->assertTrue($view->file_exists('files_encryption/keys' . $folder . '/' . $filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// move the file into the subfolder as the test user
 		self::loginHelper($userId);
@@ -1133,12 +1133,12 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertEquals($this->dataShort, $newDecrypt);
 
 		// check if additional share key for user2 exists
-		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $subFolder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
-		$this->assertTrue($view->file_exists('files_encryption/share-keys' . $subFolder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertTrue($view->file_exists('files_encryption/keys' . $subFolder . '/' . $filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		$this->assertTrue($view->file_exists('files_encryption/keys' . $subFolder . '/' . $filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// check that old keys were removed/moved properly
-		$this->assertFalse($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
-		$this->assertFalse($view->file_exists('files_encryption/share-keys' . $folder . '/' . $filename . '.' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
+		$this->assertFalse($view->file_exists('files_encryption/keys' . $folder . '/' . $filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '.shareKey'));
+		$this->assertFalse($view->file_exists('files_encryption/keys' . $folder . '/' . $filename . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER2 . '.shareKey'));
 
 		// tear down
 		\OC\Files\Filesystem::unlink($subFolder);
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index a43e8f964a2..229fd084807 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -138,22 +138,20 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
-			. '.key'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename2
-			. '.key'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename2 . '/fileKey'));
 
 		// check if share key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename2 . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename2 . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// delete first file
-		\OC\FIles\Filesystem::unlink($filename);
+		\OC\Files\Filesystem::unlink($filename);
 
 		// check if file not exists
 		$this->assertFalse($this->view->file_exists(
@@ -161,13 +159,12 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
-			. '.key'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
 
 		// check if share key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// check that second file still exists
 		$this->assertTrue($this->view->file_exists(
@@ -175,13 +172,12 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check that key for second file still exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename2
-			. '.key'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename2 . '/fileKey'));
 
 		// check that share key for second file still exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename2 . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename2 . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// get files
 		$trashFiles = $this->view->getDirectoryContent(
@@ -199,15 +195,16 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 		// check if we found the file we created
 		$this->assertNotNull($trashFileSuffix);
 
+		$this->assertTrue($this->view->is_dir('/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename . '.' . $trashFileSuffix));
+
 		// check if key for admin not exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
-			. '.key.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename . '.' . $trashFileSuffix . '/fileKey'));
 
 		// check if share key for admin not exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
-			. '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename
+			.  '.' . $trashFileSuffix . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 	}
 
 	/**
@@ -242,6 +239,13 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 		// prepare file information
 		$timestamp = str_replace('d', '', $trashFileSuffix);
 
+		// before calling the restore operation the keys shouldn't be there
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
+		$this->assertFalse($this->view->file_exists(
+			'/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . \Test_Encryption_Trashbin::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+
 		// restore first file
 		$this->assertTrue(\OCA\Files_Trashbin\Trashbin::restore($filename . '.' . $trashFileSuffix, $filename, $timestamp));
 
@@ -251,13 +255,12 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
-			. $filename . '.key'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
 
 		// check if share key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// check that second file was NOT restored
 		$this->assertFalse($this->view->file_exists(
@@ -265,13 +268,12 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key for admin exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/'
-			. $filename2 . '.key'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename2 . '/fileKey'));
 
 		// check if share key for admin exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename2 . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename2 . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 	}
 
 	/**
@@ -291,13 +293,12 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
-			. '.key'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/fileKey'));
 
 		// check if share key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// delete file
 		\OC\Files\Filesystem::unlink($filename);
@@ -308,13 +309,13 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keyfiles/' . $filename
-			. '.key'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/' . $filename . '/'
+				. $filename . '.key'));
 
 		// check if share key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/share-keys/'
-			. $filename . '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_encryption/keys/'
+			. $filename . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// find created file with timestamp
 		$query = \OC_DB::prepare('SELECT `timestamp`,`type` FROM `*PREFIX*files_trash`'
@@ -328,13 +329,13 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
-			. '.key.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename
+				. '.' . $trashFileSuffix . '/fileKey'));
 
 		// check if share key for admin exists
 		$this->assertTrue($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
-			. '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/'
+				. $filename . '.' . $trashFileSuffix . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 
 		// get timestamp from file
 		$timestamp = str_replace('d', '', $trashFileSuffix);
@@ -349,13 +350,13 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keyfiles/' . $filename
-			. '.key.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename
+				. '.' . $trashFileSuffix . '/fileKey'));
 
 		// check if share key for admin not exists
 		$this->assertFalse($this->view->file_exists(
-			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/share-keys/' . $filename
-			. '.' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey.' . $trashFileSuffix));
+			'/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '/files_trashbin/keys/' . $filename
+				. '.' . $trashFileSuffix . '/' . self::TEST_ENCRYPTION_TRASHBIN_USER1 . '.shareKey'));
 	}
 
 }
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index b8057202a07..fc6145a8cb5 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -87,7 +87,7 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 
 		$this->publicKeyDir = '/' . 'public-keys';
 		$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
-		$this->keyfilesPath = $this->encryptionDir . '/' . 'keyfiles';
+		$this->keysPath = $this->encryptionDir . '/' . 'keys';
 		$this->publicKeyPath =
 			$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
 		$this->privateKeyPath =
@@ -155,7 +155,7 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 
 		$this->assertEquals($this->publicKeyDir, $util->getPath('publicKeyDir'));
 		$this->assertEquals($this->encryptionDir, $util->getPath('encryptionDir'));
-		$this->assertEquals($this->keyfilesPath, $util->getPath('keyfilesPath'));
+		$this->assertEquals($this->keysPath, $util->getPath('keysPath'));
 		$this->assertEquals($this->publicKeyPath, $util->getPath('publicKeyPath'));
 		$this->assertEquals($this->privateKeyPath, $util->getPath('privateKeyPath'));
 
@@ -396,16 +396,18 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		// file should no longer be encrypted
 		$this->assertEquals(0, $fileInfoUnencrypted['encrypted']);
 
+		$backupPath = $this->getBackupPath('decryptAll');
+
 		// check if the keys where moved to the backup location
-		$this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/keyfiles.backup'));
-		$this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/keyfiles.backup/' . $filename . '.key'));
-		$this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/share-keys.backup'));
-		$this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/share-keys.backup/' . $filename . '.' . $user . '.shareKey'));
+		$this->assertTrue($this->view->is_dir($backupPath . '/keys'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/keys/' . $filename . '/fileKey'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/keys/' . $filename . '/' . $user . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/' . $user . '.private.key'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/' . $user . '.public.key'));
 
 		// cleanup
 		$this->view->unlink($this->userId . '/files/' . $filename);
-		$this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup');
-		$this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup');
+		$this->view->deleteAll($backupPath);
 		OC_App::enable('files_encryption');
 
 	}
@@ -418,38 +420,28 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// create some dummy key files
 		$encPath = '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '/files_encryption';
-		$this->view->file_put_contents($encPath . '/keyfiles/foo.key', 'key');
-		$this->view->file_put_contents($encPath . '/share-keys/foo.user1.shareKey', 'share key');
+		$this->view->mkdir($encPath . '/keys/foo');
+		$this->view->file_put_contents($encPath . '/keys/foo/fileKey', 'key');
+		$this->view->file_put_contents($encPath . '/keys/foo/user1.shareKey', 'share key');
 
 		$util = new \OCA\Encryption\Util($this->view, self::TEST_ENCRYPTION_UTIL_USER1);
 
-		$util->backupAllKeys('testing');
+		$util->backupAllKeys('testBackupAllKeys');
 
-		$encFolderContent = $this->view->getDirectoryContent($encPath);
-
-		$backupPath = '';
-		foreach ($encFolderContent as $c) {
-			$name = $c['name'];
-			if (substr($name, 0, strlen('backup'))  === 'backup') {
-				$backupPath = $encPath . '/'. $c['name'];
-				break;
-			}
-		}
-
-		$this->assertTrue($backupPath !== '');
+		$backupPath = $this->getBackupPath('testBackupAllKeys');
 
 		// check backupDir Content
-		$this->assertTrue($this->view->is_dir($backupPath . '/keyfiles'));
-		$this->assertTrue($this->view->is_dir($backupPath . '/share-keys'));
-		$this->assertTrue($this->view->file_exists($backupPath . '/keyfiles/foo.key'));
-		$this->assertTrue($this->view->file_exists($backupPath . '/share-keys/foo.user1.shareKey'));
+		$this->assertTrue($this->view->is_dir($backupPath . '/keys'));
+		$this->assertTrue($this->view->is_dir($backupPath . '/keys/foo'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/keys/foo/fileKey'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/keys/foo/user1.shareKey'));
 		$this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.private.key'));
 		$this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.public.key'));
 
 		//cleanup
 		$this->view->deleteAll($backupPath);
-		$this->view->unlink($encPath . '/keyfiles/foo.key', 'key');
-		$this->view->unlink($encPath . '/share-keys/foo.user1.shareKey', 'share key');
+		$this->view->unlink($encPath . '/keys/foo/fileKey');
+		$this->view->unlink($encPath . '/keys/foo/user1.shareKey');
 	}
 
 
@@ -473,8 +465,8 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// rename keyfile for file1 so that the decryption for file1 fails
 		// Expected behaviour: decryptAll() returns false, file2 gets decrypted anyway
-		$this->view->rename($this->userId . '/files_encryption/keyfiles/' . $file1 . '.key',
-				$this->userId . '/files_encryption/keyfiles/' . $file1 . '.key.moved');
+		$this->view->rename($this->userId . '/files_encryption/keys/' . $file1 . '/fileKey',
+				$this->userId . '/files_encryption/keys/' . $file1 . '/fileKey.moved');
 
 		// decrypt all encrypted files
 		$result = $util->decryptAll();
@@ -492,12 +484,13 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertEquals(0, $fileInfoUnencrypted2['encrypted']);
 
 		// keyfiles and share keys should still exist
-		$this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/keyfiles/'));
-		$this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/share-keys/'));
+		$this->assertTrue($this->view->is_dir($this->userId . '/files_encryption/keys/'));
+		$this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/keys/' . $file1 . '/fileKey.moved'));
+		$this->assertTrue($this->view->file_exists($this->userId . '/files_encryption/keys/' . $file1 . '/' . $this->userId . '.shareKey'));
 
 		// rename the keyfile for file1 back
-		$this->view->rename($this->userId . '/files_encryption/keyfiles/' . $file1 . '.key.moved',
-				$this->userId . '/files_encryption/keyfiles/' . $file1 . '.key');
+		$this->view->rename($this->userId . '/files_encryption/keys/' . $file1 . '/fileKey.moved',
+				$this->userId . '/files_encryption/keys/' . $file1 . '/fileKey');
 
 		// try again to decrypt all encrypted files
 		$result = $util->decryptAll();
@@ -515,15 +508,30 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertEquals(0, $fileInfoUnencrypted2['encrypted']);
 
 		// keyfiles and share keys should be deleted
-		$this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/keyfiles/'));
-		$this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/share-keys/'));
+		$this->assertFalse($this->view->is_dir($this->userId . '/files_encryption/keys/'));
 
 		//cleanup
+		$backupPath = $this->getBackupPath('decryptAll');
 		$this->view->unlink($this->userId . '/files/' . $file1);
 		$this->view->unlink($this->userId . '/files/' . $file2);
-		$this->view->deleteAll($this->userId . '/files_encryption/keyfiles.backup');
-		$this->view->deleteAll($this->userId . '/files_encryption/share-keys.backup');
+		$this->view->deleteAll($backupPath);
+
+	}
+
+	function getBackupPath($extension) {
+		$encPath = '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '/files_encryption';
+		$encFolderContent = $this->view->getDirectoryContent($encPath);
+
+		$backupPath = '';
+		foreach ($encFolderContent as $c) {
+			$name = $c['name'];
+			if (substr($name, 0, strlen('backup.' . $extension))  === 'backup.' . $extension) {
+				$backupPath = $encPath . '/'. $c['name'];
+				break;
+			}
+		}
 
+		return $backupPath;
 	}
 
 	/**
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index 7cadeaf0ba9..d0caf08b2df 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -143,11 +143,11 @@ class Test_Encryption_Webdav extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key-file was created
 		$this->assertTrue($this->view->file_exists(
-			'/' . $this->userId . '/files_encryption/keyfiles/' . $filename . '.key'));
+			'/' . $this->userId . '/files_encryption/keys/' . $filename . '/fileKey'));
 
 		// check if shareKey-file was created
 		$this->assertTrue($this->view->file_exists(
-			'/' . $this->userId . '/files_encryption/share-keys/' . $filename . '.' . $this->userId . '.shareKey'));
+			'/' . $this->userId . '/files_encryption/keys/' . $filename . '/' . $this->userId . '.shareKey'));
 
 		// disable encryption proxy to prevent recursive calls
 		$proxyStatus = \OC_FileProxy::$enabled;
@@ -217,11 +217,11 @@ class Test_Encryption_Webdav extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// check if key-file was removed
 		$this->assertFalse($this->view->file_exists(
-			'/' . $this->userId . '/files_encryption/keyfiles' . $filename . '.key'));
+			'/' . $this->userId . '/files_encryption/keys/' . $filename . '/fileKey'));
 
 		// check if shareKey-file was removed
 		$this->assertFalse($this->view->file_exists(
-			'/' . $this->userId . '/files_encryption/share-keys' . $filename . '.' . $this->userId . '.shareKey'));
+			'/' . $this->userId . '/files_encryption/keys/' . $filename . '/' . $this->userId . '.shareKey'));
 	}
 
 	/**
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 52d24143902..661fc271dfc 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -92,11 +92,8 @@ class Trashbin {
 		if (!$view->is_dir('files_trashbin/versions')) {
 			$view->mkdir('files_trashbin/versions');
 		}
-		if (!$view->is_dir('files_trashbin/keyfiles')) {
-			$view->mkdir('files_trashbin/keyfiles');
-		}
-		if (!$view->is_dir('files_trashbin/share-keys')) {
-			$view->mkdir('files_trashbin/share-keys');
+		if (!$view->is_dir('files_trashbin/keys')) {
+			$view->mkdir('files_trashbin/keys');
 		}
 	}
 
@@ -277,78 +274,23 @@ class Trashbin {
 				return 0;
 			}
 
-			$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user);
+			$util = new \OCA\Encryption\Util($rootView, $user);
 
-			// disable proxy to prevent recursive calls
-			$proxyStatus = \OC_FileProxy::$enabled;
-			\OC_FileProxy::$enabled = false;
-
-			if ($util->isSystemWideMountPoint($ownerPath)) {
-				$baseDir = '/files_encryption/';
-			} else {
-				$baseDir = $owner . '/files_encryption/';
-			}
-
-			$keyfile = \OC\Files\Filesystem::normalizePath($baseDir . '/keyfiles/' . $ownerPath);
-
-			if ($rootView->is_dir($keyfile) || $rootView->file_exists($keyfile . '.key')) {
-				// move keyfiles
-				if ($rootView->is_dir($keyfile)) {
-					$size += self::calculateSize(new \OC\Files\View($keyfile));
-					if ($owner !== $user) {
-						self::copy_recursive($keyfile, $owner . '/files_trashbin/keyfiles/' . basename($ownerPath) . '.d' . $timestamp, $rootView);
-					}
-					$rootView->rename($keyfile, $user . '/files_trashbin/keyfiles/' . $filename . '.d' . $timestamp);
-				} else {
-					$size += $rootView->filesize($keyfile . '.key');
-					if ($owner !== $user) {
-						$rootView->copy($keyfile . '.key', $owner . '/files_trashbin/keyfiles/' . basename($ownerPath) . '.key.d' . $timestamp);
-					}
-					$rootView->rename($keyfile . '.key', $user . '/files_trashbin/keyfiles/' . $filename . '.key.d' . $timestamp);
-				}
+			$baseDir = '/files_encryption/';
+			if (!$util->isSystemWideMountPoint($ownerPath)) {
+				$baseDir = $owner . $baseDir;
 			}
 
-			// retain share keys
-			$sharekeys = \OC\Files\Filesystem::normalizePath($baseDir . '/share-keys/' . $ownerPath);
+			$keyfiles = \OC\Files\Filesystem::normalizePath($baseDir . '/keys/' . $ownerPath);
 
-			if ($rootView->is_dir($sharekeys)) {
-				$size += self::calculateSize(new \OC\Files\View($sharekeys));
+			if ($rootView->is_dir($keyfiles)) {
+				$size += self::calculateSize(new \OC\Files\View($keyfiles));
 				if ($owner !== $user) {
-					self::copy_recursive($sharekeys, $owner . '/files_trashbin/share-keys/' . basename($ownerPath) . '.d' . $timestamp, $rootView);
-				}
-				$rootView->rename($sharekeys, $user . '/files_trashbin/share-keys/' . $filename . '.d' . $timestamp);
-			} else {
-				// handle share-keys
-				$matches = \OCA\Encryption\Helper::findShareKeys($ownerPath, $sharekeys, $rootView);
-				foreach ($matches as $src) {
-					// get source file parts
-					$pathinfo = pathinfo($src);
-
-					// we only want to keep the users key so we can access the private key
-					$userShareKey = $filename . '.' . $user . '.shareKey';
-
-					// if we found the share-key for the owner, we need to move it to files_trashbin
-					if ($pathinfo['basename'] == $userShareKey) {
-
-						// calculate size
-						$size += $rootView->filesize($sharekeys . '.' . $user . '.shareKey');
-
-						// move file
-						$rootView->rename($sharekeys . '.' . $user . '.shareKey', $user . '/files_trashbin/share-keys/' . $userShareKey . '.d' . $timestamp);
-					} elseif ($owner !== $user) {
-						$ownerShareKey = basename($ownerPath) . '.' . $owner . '.shareKey';
-						if ($pathinfo['basename'] == $ownerShareKey) {
-							$rootView->rename($sharekeys . '.' . $owner . '.shareKey', $owner . '/files_trashbin/share-keys/' . $ownerShareKey . '.d' . $timestamp);
-						}
-					} else {
-						// don't keep other share-keys
-						unlink($src);
-					}
+					self::copy_recursive($keyfiles, $owner . '/files_trashbin/keys/' . basename($ownerPath) . '.d' . $timestamp, $rootView);
 				}
+				$rootView->rename($keyfiles, $user . '/files_trashbin/keys/' . $filename . '.d' . $timestamp);
 			}
 
-			// enable proxy
-			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 		return $size;
 	}
@@ -492,7 +434,7 @@ class Trashbin {
 	 * @return bool
 	 */
 	private static function restoreEncryptionKeys(\OC\Files\View $view, $file, $filename, $uniqueFilename, $location, $timestamp) {
-		// Take care of encryption keys TODO! Get '.key' in file between file name and delete date (also for permanent delete!)
+
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$user = \OCP\User::getUser();
 			$rootView = new \OC\Files\View('/');
@@ -506,84 +448,31 @@ class Trashbin {
 				return false;
 			}
 
-			$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), $user);
+			$util = new \OCA\Encryption\Util($rootView, $user);
 
-			if ($util->isSystemWideMountPoint($ownerPath)) {
-				$baseDir = '/files_encryption/';
-			} else {
-				$baseDir = $owner . '/files_encryption/';
+			$baseDir = '/files_encryption/';
+			if (!$util->isSystemWideMountPoint($ownerPath)) {
+				$baseDir = $owner . $baseDir;
 			}
 
-			$path_parts = pathinfo($file);
-			$source_location = $path_parts['dirname'];
+			$source_location = dirname($file);
 
-			if ($view->is_dir('/files_trashbin/keyfiles/' . $file)) {
+			if ($view->is_dir('/files_trashbin/keys/' . $file)) {
 				if ($source_location != '.') {
-					$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $source_location . '/' . $filename);
-					$sharekey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $source_location . '/' . $filename);
+					$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keys/' . $source_location . '/' . $filename);
 				} else {
-					$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $filename);
-					$sharekey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $filename);
+					$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keys/' . $filename);
 				}
-			} else {
-				$keyfile = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/keyfiles/' . $source_location . '/' . $filename . '.key');
 			}
 
 			if ($timestamp) {
 				$keyfile .= '.d' . $timestamp;
 			}
 
-			// disable proxy to prevent recursive calls
-			$proxyStatus = \OC_FileProxy::$enabled;
-			\OC_FileProxy::$enabled = false;
-
-			if ($rootView->file_exists($keyfile)) {
-				// handle directory
-				if ($rootView->is_dir($keyfile)) {
-
-					// handle keyfiles
-					$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath);
-
-					// handle share-keys
-					if ($timestamp) {
-						$sharekey .= '.d' . $timestamp;
-					}
-					$rootView->rename($sharekey, $baseDir . '/share-keys/' . $ownerPath);
-				} else {
-					// handle keyfiles
-					$rootView->rename($keyfile, $baseDir . '/keyfiles/' . $ownerPath . '.key');
-
-					// handle share-keys
-					$ownerShareKey = \OC\Files\Filesystem::normalizePath($user . '/files_trashbin/share-keys/' . $source_location . '/' . $filename . '.' . $user . '.shareKey');
-					if ($timestamp) {
-						$ownerShareKey .= '.d' . $timestamp;
-					}
-
-					// move only owners key
-					$rootView->rename($ownerShareKey, $baseDir . '/share-keys/' . $ownerPath . '.' . $user . '.shareKey');
-
-					// try to re-share if file is shared
-					$filesystemView = new \OC\Files\View('/');
-					$session = new \OCA\Encryption\Session($filesystemView);
-					$util = new \OCA\Encryption\Util($filesystemView, $user);
-
-					// fix the file size
-					$absolutePath = \OC\Files\Filesystem::normalizePath('/' . $owner . '/files/' . $ownerPath);
-					$util->fixFileSize($absolutePath);
-
-					// get current sharing state
-					$sharingEnabled = \OCP\Share::isEnabled();
-
-					// get users sharing this file
-					$usersSharing = $util->getSharingUsersArray($sharingEnabled, $target);
-
-					// Attempt to set shareKey
-					$util->setSharedFileKeyfiles($session, $usersSharing, $target);
-				}
+			if ($rootView->is_dir($keyfile)) {
+				$rootView->rename($keyfile, $baseDir . '/keys/' . $ownerPath);
 			}
 
-			// enable proxy
-			\OC_FileProxy::$enabled = $proxyStatus;
 		}
 	}
 
@@ -678,27 +567,15 @@ class Trashbin {
 		if (\OCP\App::isEnabled('files_encryption')) {
 			$user = \OCP\User::getUser();
 
-			if ($view->is_dir('/files_trashbin/files/' . $file)) {
-				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename);
-				$sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename);
-			} else {
-				$keyfile = \OC\Files\Filesystem::normalizePath('files_trashbin/keyfiles/' . $filename . '.key');
-				$sharekeys = \OC\Files\Filesystem::normalizePath('files_trashbin/share-keys/' . $filename . '.' . $user . '.shareKey');
-			}
+			$keyfiles = \OC\Files\Filesystem::normalizePath('files_trashbin/keys/' . $filename);
+
 			if ($timestamp) {
-				$keyfile .= '.d' . $timestamp;
-				$sharekeys .= '.d' . $timestamp;
+				$keyfiles .= '.d' . $timestamp;
 			}
-			if ($view->file_exists($keyfile)) {
-				if ($view->is_dir($keyfile)) {
-					$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfile));
-					$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $sharekeys));
-				} else {
-					$size += $view->filesize($keyfile);
-					$size += $view->filesize($sharekeys);
-				}
-				$view->unlink($keyfile);
-				$view->unlink($sharekeys);
+			if ($view->is_dir($keyfiles)) {
+				$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfiles));
+				$view->deleteAll($keyfiles);
+
 			}
 		}
 		return $size;
-- 
GitLab


From 266f1a2afa890a7e2750a51fa3d6da98240751fe Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 14 Nov 2014 12:20:59 +0100
Subject: [PATCH 545/616] harmonize copyright notice

---
 apps/files_encryption/hooks/hooks.php    | 6 ++++--
 apps/files_encryption/lib/helper.php     | 6 ++++--
 apps/files_encryption/lib/keymanager.php | 5 +++--
 apps/files_encryption/lib/migration.php  | 5 +++--
 apps/files_encryption/lib/proxy.php      | 9 +++++----
 apps/files_encryption/lib/session.php    | 6 ++++--
 apps/files_encryption/lib/util.php       | 9 +++++----
 7 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 4867ca3e481..1413a0580a1 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -3,8 +3,10 @@
 /**
  * ownCloud
  *
- * @author Sam Tuke
- * @copyright 2012 Sam Tuke samtuke@owncloud.org
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Sam Tuke <samtuke@owncloud.org>
+ * @author Bjoern Schiessle <schiessle@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
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index c512185522d..3f4d2c99e19 100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -3,8 +3,10 @@
 /**
  * ownCloud
  *
- * @author Florin Peter
- * @copyright 2013 Florin Peter <owncloud@florin-peter.de>
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Florin Peter <owncloud@florin-peter.de>
+ * @author Bjoern Schiessle <schiessle@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
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 53aaf435da8..0885267ece0 100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -3,8 +3,9 @@
 /**
  * ownCloud
  *
- * @author Bjoern Schiessle
- * @copyright 2012 Bjoern Schiessle <schiessle@owncloud.com>
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@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
diff --git a/apps/files_encryption/lib/migration.php b/apps/files_encryption/lib/migration.php
index 59389911b5b..62a765d21f4 100644
--- a/apps/files_encryption/lib/migration.php
+++ b/apps/files_encryption/lib/migration.php
@@ -2,8 +2,9 @@
  /**
  * ownCloud
  *
- * @author Thomas Müller
- * @copyright 2014 Thomas Müller deepdiver@owncloud.com
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Thomas Müller <deepdiver@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
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 8c8ffd61207..0e8ca7319f0 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -3,10 +3,11 @@
 /**
  * ownCloud
  *
- * @author Bjoern Schiessle, Sam Tuke, Robin Appelman
- * @copyright 2012 Sam Tuke <samtuke@owncloud.com>
- *            2012 Robin Appelman <icewind1991@gmail.com>
- *            2014 Bjoern Schiessle <schiessle@owncloud.com>
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@owncloud.com>
+ * @author Sam Tuke <samtuke@owncloud.com>
+ * @author Robin Appelman <icewind1991@gmail.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 132748b6ea5..e4fef536235 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -2,8 +2,10 @@
 /**
  * ownCloud
  *
- * @author Sam Tuke
- * @copyright 2012 Sam Tuke samtuke@owncloud.com
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Sam Tuke <samtuke@owncloud.com>
+ * @author Bjoern Schiessle <schiessle@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
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a1baecfb2f3..8299ed5fe6e 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -2,10 +2,11 @@
 /**
  * ownCloud
  *
- * @author Sam Tuke, Frank Karlitschek, Bjoern Schiessle
- * @copyright 2012 Sam Tuke <samtuke@owncloud.com>,
- * Frank Karlitschek <frank@owncloud.org>,
- * Bjoern Schiessle <schiessle@owncloud.com>
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Sam Tuke <samtuke@owncloud.com>,
+ * @author Frank Karlitschek <frank@owncloud.org>,
+ * @author Bjoern Schiessle <schiessle@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
-- 
GitLab


From a90606fb14adc0aa149a87528d4f1ce61d0250e9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 14 Nov 2014 17:30:38 +0100
Subject: [PATCH 546/616] change private/public key names for consistency
 reasons

---
 .../ajax/changeRecoveryPassword.php           |   7 +-
 .../ajax/updatePrivateKeyPassword.php         |   6 +-
 apps/files_encryption/hooks/hooks.php         |  19 +-
 apps/files_encryption/lib/helper.php          |  43 +--
 apps/files_encryption/lib/keymanager.php      | 258 +++++++++---------
 apps/files_encryption/lib/session.php         |  26 +-
 apps/files_encryption/lib/util.php            |  32 +--
 apps/files_encryption/tests/hooks.php         |   4 +-
 apps/files_encryption/tests/keymanager.php    |  13 +-
 apps/files_encryption/tests/share.php         |   8 +-
 apps/files_encryption/tests/util.php          |  12 +-
 11 files changed, 202 insertions(+), 226 deletions(-)

diff --git a/apps/files_encryption/ajax/changeRecoveryPassword.php b/apps/files_encryption/ajax/changeRecoveryPassword.php
index bf647f2c8fa..01b76a969b6 100644
--- a/apps/files_encryption/ajax/changeRecoveryPassword.php
+++ b/apps/files_encryption/ajax/changeRecoveryPassword.php
@@ -55,16 +55,15 @@ $proxyStatus = \OC_FileProxy::$enabled;
 \OC_FileProxy::$enabled = false;
 
 $keyId = $util->getRecoveryKeyId();
-$keyPath = '/owncloud_private_key/' . $keyId . '.private.key';
 
-$encryptedRecoveryKey = $view->file_get_contents($keyPath);
-$decryptedRecoveryKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedRecoveryKey, $oldPassword);
+$encryptedRecoveryKey = Encryption\Keymanager::getPrivateSystemKey($keyId);
+$decryptedRecoveryKey = $encryptedRecoveryKey ? \OCA\Encryption\Crypt::decryptPrivateKey($encryptedRecoveryKey, $oldPassword) : false;
 
 if ($decryptedRecoveryKey) {
 	$cipher = \OCA\Encryption\Helper::getCipher();
 	$encryptedKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($decryptedRecoveryKey, $newPassword, $cipher);
 	if ($encryptedKey) {
-		\OCA\Encryption\Keymanager::setPrivateSystemKey($encryptedKey, $keyId . '.private.key');
+		\OCA\Encryption\Keymanager::setPrivateSystemKey($encryptedKey, $keyId);
 		$return = true;
 	}
 }
diff --git a/apps/files_encryption/ajax/updatePrivateKeyPassword.php b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
index fa5e279b21b..97da3811a0f 100644
--- a/apps/files_encryption/ajax/updatePrivateKeyPassword.php
+++ b/apps/files_encryption/ajax/updatePrivateKeyPassword.php
@@ -36,10 +36,8 @@ if ($passwordCorrect !== false) {
 $proxyStatus = \OC_FileProxy::$enabled;
 \OC_FileProxy::$enabled = false;
 
-$keyPath = '/' . $user . '/files_encryption/' . $user . '.private.key';
-
-$encryptedKey = $view->file_get_contents($keyPath);
-$decryptedKey = \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, $oldPassword);
+$encryptedKey = Encryption\Keymanager::getPrivateKey($view, $user);
+$decryptedKey = $encryptedKey ? \OCA\Encryption\Crypt::decryptPrivateKey($encryptedKey, $oldPassword) : false;
 
 if ($decryptedKey) {
 	$cipher = \OCA\Encryption\Helper::getCipher();
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 1413a0580a1..e9d0235d167 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -152,18 +152,7 @@ class Hooks {
 	public static function postDeleteUser($params) {
 
 		if (\OCP\App::isEnabled('files_encryption')) {
-			$view = new \OC\Files\View('/');
-
-			// cleanup public key
-			$publicKey = '/public-keys/' . $params['uid'] . '.public.key';
-
-			// Disable encryption proxy to prevent recursive calls
-			$proxyStatus = \OC_FileProxy::$enabled;
-			\OC_FileProxy::$enabled = false;
-
-			$view->unlink($publicKey);
-
-			\OC_FileProxy::$enabled = $proxyStatus;
+			Keymanager::deletePublicKey(new \OC\Files\View(), $params['uid']);
 		}
 	}
 
@@ -244,7 +233,7 @@ class Hooks {
 					\OC_FileProxy::$enabled = false;
 
 					// Save public key
-					$view->file_put_contents('/public-keys/' . $user . '.public.key', $keypair['publicKey']);
+					Keymanager::setPublicKey($keypair['publicKey'], $user);
 
 					// Encrypt private key with new password
 					$encryptedKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $newUserPassword, Helper::getCipher());
@@ -292,7 +281,7 @@ class Hooks {
 
 		$l = new \OC_L10N('files_encryption');
 		$users = array();
-		$view = new \OC\Files\View('/public-keys/');
+		$view = new \OC\Files\View('/');
 
 		switch ($params['shareType']) {
 			case \OCP\Share::SHARE_TYPE_USER:
@@ -305,7 +294,7 @@ class Hooks {
 
 		$notConfigured = array();
 		foreach ($users as $user) {
-			if (!$view->file_exists($user . '.public.key')) {
+			if (!Keymanager::publicKeyExists($view, $user)) {
 				$notConfigured[] = $user;
 			}
 		}
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 3f4d2c99e19..24e1494fc00 100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -19,7 +19,7 @@
  * 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/>.
+ * License alon with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
@@ -107,6 +107,25 @@ class Helper {
 		return true;
 	}
 
+	/**
+	 * get recovery key id
+	 *
+	 * @return string|bool recovery key ID or false
+	 */
+	public static function getRecoveryKeyId() {
+		$appConfig = \OC::$server->getAppConfig();
+		$key = $appConfig->getValue('files_encryption', 'recoveryKeyId');
+
+		return ($key === null) ? false : $key;
+	}
+
+	public static function getPublicShareKeyId() {
+		$appConfig = \OC::$server->getAppConfig();
+		$key = $appConfig->getValue('files_encryption', 'publicShareKeyId');
+
+		return ($key === null) ? false : $key;
+	}
+
 	/**
 	 * enable recovery
 	 *
@@ -126,38 +145,22 @@ class Helper {
 			$appConfig->setValue('files_encryption', 'recoveryKeyId', $recoveryKeyId);
 		}
 
-		if (!$view->is_dir('/owncloud_private_key')) {
-			$view->mkdir('/owncloud_private_key');
-		}
-
-		if (
-			(!$view->file_exists("/public-keys/" . $recoveryKeyId . ".public.key")
-			 || !$view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".private.key"))
-		) {
+		if (!Keymanager::recoveryKeyExists($view)) {
 
 			$keypair = \OCA\Encryption\Crypt::createKeypair();
 
-			\OC_FileProxy::$enabled = false;
-
 			// Save public key
-
-			if (!$view->is_dir('/public-keys')) {
-				$view->mkdir('/public-keys');
-			}
-
-			$view->file_put_contents('/public-keys/' . $recoveryKeyId . '.public.key', $keypair['publicKey']);
+			Keymanager::setPublicKey($keypair['publicKey'], $recoveryKeyId);
 
 			$cipher = \OCA\Encryption\Helper::getCipher();
 			$encryptedKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], $recoveryPassword, $cipher);
 			if ($encryptedKey) {
-				Keymanager::setPrivateSystemKey($encryptedKey, $recoveryKeyId . '.private.key');
+				Keymanager::setPrivateSystemKey($encryptedKey, $recoveryKeyId);
 				// Set recoveryAdmin as enabled
 				$appConfig->setValue('files_encryption', 'recoveryAdminEnabled', 1);
 				$return = true;
 			}
 
-			\OC_FileProxy::$enabled = true;
-
 		} else { // get recovery key and check the password
 			$util = new \OCA\Encryption\Util(new \OC\Files\View('/'), \OCP\User::getUser());
 			$return = $util->checkRecoveryPassword($recoveryPassword);
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 0885267ece0..2c340bcb23f 100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -34,25 +34,60 @@ class Keymanager {
 	const KEYS_BASE_DIR = '/files_encryption/keys/';
 
 	/**
-	 * retrieve the ENCRYPTED private key from a user
+	 * read key from hard disk
 	 *
-	 * @param \OC\Files\View $view
-	 * @param string $user
-	 * @return string private key or false (hopefully)
-	 * @note the key returned by this method must be decrypted before use
+	 * @param string $path to key
+	 * @return string|bool either the key or false
 	 */
-	public static function getPrivateKey(\OC\Files\View $view, $user) {
+	private static function getKey($path, $view) {
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
 
-		$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.private.key';
 		$key = false;
-
 		if ($view->file_exists($path)) {
 			$key = $view->file_get_contents($path);
 		}
 
+		\OC_FileProxy::$enabled = $proxyStatus;
+
 		return $key;
 	}
 
+	/**
+	 * write key to disk
+	 *
+	 *
+	 * @param string $path path to key directory
+	 * @param string $name key name
+	 * @param string $key key
+	 * @param \OC\Files\View $view
+	 * @return bool
+	 */
+	private static function setKey($path, $name, $key, $view) {
+		$proxyStatus = \OC_FileProxy::$enabled;
+		\OC_FileProxy::$enabled = false;
+
+		self::keySetPreparation($view, $path);
+		$result = $view->file_put_contents($path . '/' . $name, $key);
+
+		\OC_FileProxy::$enabled = $proxyStatus;
+
+		return (is_int($result) && $result > 0) ? true : false;
+	}
+
+	/**
+	 * retrieve the ENCRYPTED private key from a user
+	 *
+	 * @param \OC\Files\View $view
+	 * @param string $user
+	 * @return string private key or false (hopefully)
+	 * @note the key returned by this method must be decrypted before use
+	 */
+	public static function getPrivateKey(\OC\Files\View $view, $user) {
+		$path = '/' . $user . '/' . 'files_encryption' . '/' . $user . '.privateKey';
+		return self::getKey($path, $view);
+	}
+
 	/**
 	 * retrieve public key for a specified user
 	 * @param \OC\Files\View $view
@@ -60,11 +95,8 @@ class Keymanager {
 	 * @return string public key or false
 	 */
 	public static function getPublicKey(\OC\Files\View $view, $userId) {
-
-		$result = $view->file_get_contents('/public-keys/' . $userId . '.public.key');
-
-		return $result;
-
+		$path = '/public-keys/' . $userId . '.publicKey';
+		return self::getKey($path, $view);
 	}
 
 	/**
@@ -91,7 +123,6 @@ class Keymanager {
 	public static function getPublicKeys(\OC\Files\View $view, array $userIds) {
 
 		$keys = array();
-
 		foreach ($userIds as $userId) {
 			$keys[$userId] = self::getPublicKey($view, $userId);
 		}
@@ -112,15 +143,8 @@ class Keymanager {
 	 * asymmetrically encrypt the keyfile before passing it to this method
 	 */
 	public static function setFileKey(\OC\Files\View $view, $util, $path, $catfile) {
-
-		$basePath = self::getKeyPath($view, $util, $path);
-
-		self::keySetPreparation($view, $basePath);
-
-		$result = $view->file_put_contents(
-				$basePath . '/fileKey', $catfile);
-
-		return $result;
+		$path = self::getKeyPath($view, $util, $path);
+		return self::setKey($path, 'fileKey', $catfile, $view);
 
 	}
 
@@ -161,23 +185,8 @@ class Keymanager {
 	 * @return string
 	 */
 	public static function getFileKeyPath($view, $util, $path) {
-
-		if ($view->is_dir('/' . \OCP\User::getUser() . '/' . $path)) {
-			throw new Exception\EncryptionException('file was expected but directoy was given', Exception\EncryptionException::GENERIC);
-		}
-
-		list($owner, $filename) = $util->getUidAndFilename($path);
-		$filename = Helper::stripPartialFileExtension($filename);
-		$filePath_f = ltrim($filename, '/');
-
-		// in case of system wide mount points the keys are stored directly in the data directory
-		if ($util->isSystemWideMountPoint($filename)) {
-			$keyfilePath = self::KEYS_BASE_DIR . $filePath_f . '/fileKey';
-		} else {
-			$keyfilePath = '/' . $owner . self::KEYS_BASE_DIR . $filePath_f . '/fileKey';
-		}
-
-		return $keyfilePath;
+		$keyDir = self::getKeyPath($view, $util, $path);
+		return $keyDir . 'fileKey';
 	}
 
 	/**
@@ -190,22 +199,37 @@ class Keymanager {
 	 * @retrun string
 	 */
 	public static function getShareKeyPath($view, $util, $path, $uid) {
+		$keyDir = self::getKeyPath($view, $util, $path);
+		return $keyDir . $uid . '.shareKey';
+	}
 
-		if ($view->is_dir('/' . \OCP\User::getUser() . '/' . $path)) {
-			throw new Exception\EncryptionException('file was expected but directoy was given', Exception\EncryptionException::GENERIC);
-		}
+	/**
+	 * delete public key from a given user
+	 *
+	 * @param \OC\Files\View $view
+	 * @param string $uid user
+	 * @return bool
+	 */
+	public static function deletePublicKey($view, $uid) {
 
-		list($owner, $filename) = $util->getUidAndFilename($path);
-		$filename = Helper::stripPartialFileExtension($filename);
+		$result = false;
 
-		// in case of system wide mount points the keys are stored directly in the data directory
-		if ($util->isSystemWideMountPoint($filename)) {
-			$shareKeyPath = self::KEYS_BASE_DIR . $filename . '/'. $uid . '.shareKey';
-		} else {
-			$shareKeyPath = '/' . $owner . self::KEYS_BASE_DIR . $filename . '/' . $uid . '.shareKey';
+		if (!\OCP\User::userExists($uid)) {
+			$publicKey = '/public-keys/' . $uid . '.publicKey';
+			$result = $view->unlink($publicKey);
 		}
 
-		return $shareKeyPath;
+		return $result;
+	}
+
+	/**
+	 * check if public key for user exists
+	 *
+	 * @param \OC\Files\View $view
+	 * @param string $uid
+	 */
+	public static function publicKeyExists($view, $uid) {
+		return $view->file_exists('/public-keys/'. $uid . '.publicKey');
 	}
 
 
@@ -221,17 +245,8 @@ class Keymanager {
 	 * of the keyfile must be performed by client code
 	 */
 	public static function getFileKey($view, $util, $filePath) {
-
-		$keyfilePath = self::getFileKeyPath($view, $util, $filePath);
-
-		if ($view->file_exists($keyfilePath)) {
-			$result = $view->file_get_contents($keyfilePath);
-		} else {
-			$result = false;
-		}
-
-		return $result;
-
+		$path = self::getFileKeyPath($view, $util, $filePath);
+		return self::getKey($path, $view);
 	}
 
 	/**
@@ -243,80 +258,86 @@ class Keymanager {
 	 */
 	public static function setPrivateKey($key, $user = '') {
 
-		if ($user === '') {
-			$user = \OCP\User::getUser();
-		}
-
+		$user = $user === '' ? \OCP\User::getUser() : $user;
+		$path = '/' . $user . '/files_encryption';
 		$header = Crypt::generateHeader();
 
-		$view = new \OC\Files\View('/' . $user . '/files_encryption');
+		return self::setKey($path, $user . '.privateKey', $header . $key, new \OC\Files\View());
 
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
+	}
 
-		if (!$view->file_exists('')) {
-			$view->mkdir('');
+	/**
+	 * check if recovery key exists
+	 *
+	 * @param \OC\Files\View $view
+	 * @return bool
+	 */
+	public static function recoveryKeyExists($view) {
+
+		$result = false;
+
+		$recoveryKeyId = Helper::getRecoveryKeyId();
+		if ($recoveryKeyId) {
+			$result = ($view->file_exists("/public-keys/" . $recoveryKeyId . ".publicKey")
+					&& $view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".privateKey"));
 		}
 
-		$result = $view->file_put_contents($user . '.private.key', $header . $key);
+		return $result;
+	}
+
+	public static function publicShareKeyExists($view) {
+		$result = false;
 
-		\OC_FileProxy::$enabled = $proxyStatus;
+		$publicShareKeyId = Helper::getPublicShareKeyId();
+		if ($publicShareKeyId) {
+			$result = ($view->file_exists("/public-keys/" . $publicShareKeyId . ".publicKey")
+					&& $view->file_exists("/owncloud_private_key/" . $publicShareKeyId . ".privateKey"));
+
+		}
 
 		return $result;
+	}
+
+	/**
+	 * store public key from the user
+	 * @param string $key
+	 * @param string $user
+	 *
+	 * @return bool
+	 */
+	public static function setPublicKey($key, $user = '') {
 
+		$user = $user === '' ? \OCP\User::getUser() : $user;
+		$path = '/public-keys';
+
+		return self::setKey($path, $user . '.publicKey', $key, new \OC\Files\View('/'));
 	}
 
 	/**
 	 * write private system key (recovery and public share key) to disk
 	 *
 	 * @param string $key encrypted key
-	 * @param string $keyName name of the key file
+	 * @param string $keyName name of the key
 	 * @return boolean
 	 */
 	public static function setPrivateSystemKey($key, $keyName) {
 
+		$keyName = $keyName . '.privateKey';
+		$path = '/owncloud_private_key';
 		$header = Crypt::generateHeader();
 
-		$view = new \OC\Files\View('/owncloud_private_key');
-
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		if (!$view->file_exists('')) {
-			$view->mkdir('');
-		}
-
-		$result = $view->file_put_contents($keyName, $header . $key);
-
-		\OC_FileProxy::$enabled = $proxyStatus;
-
-		return $result;
+		return self::setKey($path, $keyName,$header . $key, new \OC\Files\View());
 	}
 
 	/**
-	 * store share key
+	 * read private system key (recovery and public share key) from disk
 	 *
-	 * @param \OC\Files\View $view
-	 * @param string $path where the share key is stored
-	 * @param string $shareKey
-	 * @return bool true/false
-	 * @note The keyfile is not encrypted here. Client code must
-	 * asymmetrically encrypt the keyfile before passing it to this method
+	 * @param string $keyName name of the key
+	 * @return string|boolean private system key or false
 	 */
-	private static function setShareKey(\OC\Files\View $view, $path, $shareKey) {
-
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		$result = $view->file_put_contents($path, $shareKey);
-
-		\OC_FileProxy::$enabled = $proxyStatus;
-
-		if (is_int($result) && $result > 0) {
-			return true;
-		} else {
-			return false;
-		}
+	public static function getPrivateSystemKey($keyName) {
+		$path = $keyName . '.privateKey';
+		return self::getKey($path, new \OC\Files\View('/owncloud_private_key'));
 	}
 
 	/**
@@ -337,11 +358,7 @@ class Keymanager {
 		$result = true;
 
 		foreach ($shareKeys as $userId => $shareKey) {
-
-			$writePath = $basePath . '/' . $userId . '.shareKey';
-
-			if (!self::setShareKey($view, $writePath, $shareKey)) {
-
+			if (!self::setKey($basePath, $userId . '.shareKey', $shareKey, $view)) {
 				// If any of the keys are not set, flag false
 				$result = false;
 			}
@@ -362,16 +379,8 @@ class Keymanager {
 	 * of the keyfile must be performed by client code
 	 */
 	public static function getShareKey($view, $userId, $util, $filePath) {
-
-		$shareKeyPath = self::getShareKeyPath($view, $util, $filePath, $userId);
-
-		if ($view->file_exists($shareKeyPath)) {
-			$result = $view->file_get_contents($shareKeyPath);
-		} else {
-			$result = false;
-		}
-
-		return $result;
+		$path = self::getShareKeyPath($view, $util, $filePath, $userId);
+		return self::getKey($path, $view);
 	}
 
 	/**
@@ -432,7 +441,6 @@ class Keymanager {
 	 * @param string $basePath
 	 */
 	protected static function keySetPreparation($view, $path) {
-
 		// If the file resides within a subdirectory, create it
 		if (!$view->file_exists($path)) {
 			$sub_dirs = explode('/', $path);
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index e4fef536235..355264a5070 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -56,43 +56,30 @@ class Session {
 
 		$appConfig = \OC::$server->getAppConfig();
 
-		$publicShareKeyId = $appConfig->getValue('files_encryption', 'publicShareKeyId');
+		$publicShareKeyId = Helper::getPublicShareKeyId();
 
-		if ($publicShareKeyId === null) {
+		if ($publicShareKeyId === false) {
 			$publicShareKeyId = 'pubShare_' . substr(md5(time()), 0, 8);
 			$appConfig->setValue('files_encryption', 'publicShareKeyId', $publicShareKeyId);
 		}
 
-		if (
-			!$this->view->file_exists("/public-keys/" . $publicShareKeyId . ".public.key")
-			|| !$this->view->file_exists("/owncloud_private_key/" . $publicShareKeyId . ".private.key")
-		) {
+		if (!Keymanager::publicShareKeyExists($view)) {
 
 			$keypair = Crypt::createKeypair();
 
-			// Disable encryption proxy to prevent recursive calls
-			$proxyStatus = \OC_FileProxy::$enabled;
-			\OC_FileProxy::$enabled = false;
 
 			// Save public key
-
-			if (!$view->is_dir('/public-keys')) {
-				$view->mkdir('/public-keys');
-			}
-
-			$this->view->file_put_contents('/public-keys/' . $publicShareKeyId . '.public.key', $keypair['publicKey']);
+			Keymanager::setPublicKey($keypair['publicKey'], $publicShareKeyId);
 
 			// Encrypt private key empty passphrase
 			$cipher = \OCA\Encryption\Helper::getCipher();
 			$encryptedKey = \OCA\Encryption\Crypt::symmetricEncryptFileContent($keypair['privateKey'], '', $cipher);
 			if ($encryptedKey) {
-				Keymanager::setPrivateSystemKey($encryptedKey, $publicShareKeyId . '.private.key');
+				Keymanager::setPrivateSystemKey($encryptedKey, $publicShareKeyId);
 			} else {
 				\OCP\Util::writeLog('files_encryption', 'Could not create public share keys', \OCP\Util::ERROR);
 			}
 
-			\OC_FileProxy::$enabled = $proxyStatus;
-
 		}
 
 		if (\OCA\Encryption\Helper::isPublicAccess() && !self::getPublicSharePrivateKey()) {
@@ -100,8 +87,7 @@ class Session {
 			$proxyStatus = \OC_FileProxy::$enabled;
 			\OC_FileProxy::$enabled = false;
 
-			$encryptedKey = $this->view->file_get_contents(
-				'/owncloud_private_key/' . $publicShareKeyId . '.private.key');
+			$encryptedKey = Keymanager::getPrivateSystemKey($publicShareKeyId);
 			$privateKey = Crypt::decryptPrivateKey($encryptedKey, '');
 			self::setPublicSharePrivateKey($privateKey);
 
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 8299ed5fe6e..6c1b2f60d7e 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -77,9 +77,9 @@ class Util {
 		$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
 		$this->keysPath = $this->encryptionDir . '/' . 'keys';
 		$this->publicKeyPath =
-				$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+				$this->publicKeyDir . '/' . $this->userId . '.publicKey'; // e.g. data/public-keys/admin.publicKey
 		$this->privateKeyPath =
-				$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+				$this->encryptionDir . '/' . $this->userId . '.privateKey'; // e.g. data/admin/admin.privateKey
 		// make sure that the owners home is mounted
 		\OC\Files\Filesystem::initMountPoints($userId);
 
@@ -1363,22 +1363,14 @@ class Util {
 	public function checkRecoveryPassword($password) {
 
 		$result = false;
-		$pathKey = '/owncloud_private_key/' . $this->recoveryKeyId . ".private.key";
-
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		$recoveryKey = $this->view->file_get_contents($pathKey);
 
+		$recoveryKey = Keymanager::getPrivateSystemKey($this->recoveryKeyId);
 		$decryptedRecoveryKey = Crypt::decryptPrivateKey($recoveryKey, $password);
 
 		if ($decryptedRecoveryKey) {
 			$result = true;
 		}
 
-		\OC_FileProxy::$enabled = $proxyStatus;
-
-
 		return $result;
 	}
 
@@ -1486,16 +1478,9 @@ class Util {
 	 */
 	public function recoverUsersFiles($recoveryPassword) {
 
-		// Disable encryption proxy to prevent recursive calls
-		$proxyStatus = \OC_FileProxy::$enabled;
-		\OC_FileProxy::$enabled = false;
-
-		$encryptedKey = $this->view->file_get_contents(
-			'/owncloud_private_key/' . $this->recoveryKeyId . '.private.key');
+		$encryptedKey = Keymanager::getPrivateSystemKey( $this->recoveryKeyId);
 		$privateKey = Crypt::decryptPrivateKey($encryptedKey, $recoveryPassword);
 
-		\OC_FileProxy::$enabled = $proxyStatus;
-
 		$this->recoverAllFiles('/', $privateKey);
 	}
 
@@ -1510,8 +1495,8 @@ class Util {
 		$backupDir .= ($purpose === '') ? date("Y-m-d_H-i-s") . '/' : $purpose . '.' . date("Y-m-d_H-i-s") . '/';
 		$this->view->mkdir($backupDir);
 		$this->view->copy($this->keysPath, $backupDir . 'keys/');
-		$this->view->copy($this->privateKeyPath, $backupDir . $this->userId . '.private.key');
-		$this->view->copy($this->publicKeyPath, $backupDir . $this->userId . '.public.key');
+		$this->view->copy($this->privateKeyPath, $backupDir . $this->userId . '.privateKey');
+		$this->view->copy($this->publicKeyPath, $backupDir . $this->userId . '.publicKey');
 	}
 
 	/**
@@ -1571,7 +1556,10 @@ class Util {
 
 		$encryptedKey = Keymanager::getPrivateKey($this->view, $params['uid']);
 
-		$privateKey = Crypt::decryptPrivateKey($encryptedKey, $params['password']);
+		$privateKey = false;
+		if ($encryptedKey) {
+			$privateKey = Crypt::decryptPrivateKey($encryptedKey, $params['password']);
+		}
 
 		if ($privateKey === false) {
 			\OCP\Util::writeLog('Encryption library', 'Private key for user "' . $params['uid']
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index 944d8a38870..fc40d4cd61f 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -439,8 +439,8 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 		// set user password for the first time
 		\OCA\Encryption\Hooks::postCreateUser(array('uid' => 'newUser', 'password' => 'newUserPassword'));
 
-		$this->assertTrue($view->file_exists('public-keys/newUser.public.key'));
-		$this->assertTrue($view->file_exists('newUser/files_encryption/newUser.private.key'));
+		$this->assertTrue($view->file_exists('public-keys/newUser.publicKey'));
+		$this->assertTrue($view->file_exists('newUser/files_encryption/newUser.privateKey'));
 
 		// check if we are able to decrypt the private key
 		$encryptedKey = \OCA\Encryption\Keymanager::getPrivateKey($view, 'newUser');
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index d4a3f85ed48..f86f7d894ce 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -175,7 +175,7 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 
 		Encryption\Keymanager::setPrivateKey($key, 'dummyUser');
 
-		$this->assertTrue($this->view->file_exists('/dummyUser/files_encryption/dummyUser.private.key'));
+		$this->assertTrue($this->view->file_exists('/dummyUser/files_encryption/dummyUser.privateKey'));
 
 		//clean up
 		$this->view->deleteAll('/dummyUser');
@@ -187,14 +187,19 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 	function testSetPrivateSystemKey() {
 
 		$key = "dummy key";
-		$keyName = "myDummyKey.private.key";
+		$keyName = "myDummyKey";
+		$encHeader = Encryption\Crypt::generateHeader();
 
 		Encryption\Keymanager::setPrivateSystemKey($key, $keyName);
 
-		$this->assertTrue($this->view->file_exists('/owncloud_private_key/' . $keyName));
+		$this->assertTrue($this->view->file_exists('/owncloud_private_key/' . $keyName . '.privateKey'));
+
+		$result = Encryption\Keymanager::getPrivateSystemKey($keyName);
+
+		$this->assertSame($encHeader . $key, $result);
 
 		// clean up
-		$this->view->unlink('/owncloud_private_key/' . $keyName);
+		$this->view->unlink('/owncloud_private_key/' . $keyName.'.privateKey');
 	}
 
 
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index 48aaec5c196..d7afc9e2da7 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -915,8 +915,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
 
 		// break users public key
-		$this->view->rename('/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key',
-			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key_backup');
+		$this->view->rename('/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey',
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey_backup');
 
 		// re-enable the file proxy
 		\OC_FileProxy::$enabled = $proxyStatus;
@@ -943,8 +943,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// break user1 public key
 		$this->view->rename(
-			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key_backup',
-			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.public.key');
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey_backup',
+			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey');
 
 		// remove share file
 		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index fc6145a8cb5..96e8fcd81fe 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -89,9 +89,9 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
 		$this->keysPath = $this->encryptionDir . '/' . 'keys';
 		$this->publicKeyPath =
-			$this->publicKeyDir . '/' . $this->userId . '.public.key'; // e.g. data/public-keys/admin.public.key
+			$this->publicKeyDir . '/' . $this->userId . '.publicKey'; // e.g. data/public-keys/admin.publicKey
 		$this->privateKeyPath =
-			$this->encryptionDir . '/' . $this->userId . '.private.key'; // e.g. data/admin/admin.private.key
+			$this->encryptionDir . '/' . $this->userId . '.privateKey'; // e.g. data/admin/admin.privateKey
 
 		$this->view = new \OC\Files\View('/');
 
@@ -402,8 +402,8 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertTrue($this->view->is_dir($backupPath . '/keys'));
 		$this->assertTrue($this->view->file_exists($backupPath . '/keys/' . $filename . '/fileKey'));
 		$this->assertTrue($this->view->file_exists($backupPath . '/keys/' . $filename . '/' . $user . '.shareKey'));
-		$this->assertTrue($this->view->file_exists($backupPath . '/' . $user . '.private.key'));
-		$this->assertTrue($this->view->file_exists($backupPath . '/' . $user . '.public.key'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/' . $user . '.privateKey'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/' . $user . '.publicKey'));
 
 		// cleanup
 		$this->view->unlink($this->userId . '/files/' . $filename);
@@ -435,8 +435,8 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertTrue($this->view->is_dir($backupPath . '/keys/foo'));
 		$this->assertTrue($this->view->file_exists($backupPath . '/keys/foo/fileKey'));
 		$this->assertTrue($this->view->file_exists($backupPath . '/keys/foo/user1.shareKey'));
-		$this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.private.key'));
-		$this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.public.key'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.privateKey'));
+		$this->assertTrue($this->view->file_exists($backupPath . '/' . self::TEST_ENCRYPTION_UTIL_USER1 . '.publicKey'));
 
 		//cleanup
 		$this->view->deleteAll($backupPath);
-- 
GitLab


From a109f94feec821cad92b25a63c767b0a21f140c0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 25 Nov 2014 18:30:25 +0100
Subject: [PATCH 547/616] Depcrate namespaced functions, since they can not be
 autoloaded

---
 lib/public/template.php | 91 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 88 insertions(+), 3 deletions(-)

diff --git a/lib/public/template.php b/lib/public/template.php
index a1b650649ff..93af794ba62 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -38,6 +38,7 @@ namespace OCP;
  * @return string to the image
  *
  * @see OC_Helper::imagePath
+ * @deprecated Use \OCP\Template::image_path() instead
  */
 function image_path( $app, $image ) {
 	return(\image_path( $app, $image ));
@@ -48,6 +49,7 @@ function image_path( $app, $image ) {
  * Make OC_Helper::mimetypeIcon available as a simple function
  * @param string $mimetype
  * @return string to the image of this file type.
+ * @deprecated Use \OCP\Template::mimetype_icon() instead
  */
 function mimetype_icon( $mimetype ) {
 	return(\mimetype_icon( $mimetype ));
@@ -57,6 +59,7 @@ function mimetype_icon( $mimetype ) {
  * Make preview_icon available as a simple function
  * @param string $path path to file
  * @return string to the preview of the image
+ * @deprecated Use \OCP\Template::preview_icon() instead
  */
 function preview_icon( $path ) {
 	return(\preview_icon( $path ));
@@ -68,6 +71,7 @@ function preview_icon( $path ) {
  * @param string $path of file
  * @param string $token
  * @return string link to the preview
+ * @deprecated Use \OCP\Template::publicPreview_icon() instead
  */
 function publicPreview_icon ( $path, $token ) {
 	return(\publicPreview_icon( $path, $token ));
@@ -76,8 +80,9 @@ function publicPreview_icon ( $path, $token ) {
 /**
  * Make OC_Helper::humanFileSize available as a simple function
  * Example: 2048 to 2 kB.
- * @param int $size in bytes
+ * @param int $bytes in bytes
  * @return string size as string
+ * @deprecated Use \OCP\Template::human_file_size() instead
  */
 function human_file_size( $bytes ) {
 	return(\human_file_size( $bytes ));
@@ -89,6 +94,7 @@ function human_file_size( $bytes ) {
  * @param int $timestamp unix timestamp
  * @param boolean $dateOnly
  * @return \OC_L10N_String human readable interpretation of the timestamp
+ * @deprecated Use \OCP\Template::relative_modified_date() instead
  */
 function relative_modified_date( $timestamp, $dateOnly = false ) {
 	return(\relative_modified_date($timestamp, null, $dateOnly));
@@ -97,9 +103,9 @@ function relative_modified_date( $timestamp, $dateOnly = false ) {
 
 /**
  * Return a human readable outout for a file size.
- * @deprecated use human_file_size() instead
  * @param integer $bytes size of a file in byte
  * @return string human readable interpretation of a file size
+ * @deprecated Use \OCP\Template::human_file_size() instead
  */
 function simple_file_size($bytes) {
 	return(\human_file_size($bytes));
@@ -112,6 +118,7 @@ function simple_file_size($bytes) {
  * @param mixed $selected which one is selected?
  * @param array $params the parameters
  * @return string html options
+ * @deprecated Use \OCP\Template::html_select_options() instead
  */
 function html_select_options($options, $selected, $params=array()) {
 	return(\html_select_options($options, $selected, $params));
@@ -123,5 +130,83 @@ function html_select_options($options, $selected, $params=array()) {
  * specific templates, add data and generate the html code
  */
 class Template extends \OC_Template {
-
+	/**
+	 * Make OC_Helper::imagePath available as a simple function
+	 *
+	 * @see OC_Helper::imagePath
+	 *
+	 * @param string $app
+	 * @param string $image
+	 * @return string to the image
+	 */
+	public static function image_path($app, $image) {
+		return \image_path($app, $image);
+	}
+
+
+	/**
+	 * Make OC_Helper::mimetypeIcon available as a simple function
+	 *
+	 * @param string $mimetype
+	 * @return string to the image of this file type.
+	 */
+	public static function mimetype_icon($mimetype) {
+		return \mimetype_icon($mimetype);
+	}
+
+	/**
+	 * Make preview_icon available as a simple function
+	 *
+	 * @param string $path path to file
+	 * @return string to the preview of the image
+	 */
+	public static function preview_icon($path) {
+		return \preview_icon($path);
+	}
+
+	/**
+	 * Make publicpreview_icon available as a simple function
+	 * Returns the path to the preview of the image.
+	 *
+	 * @param string $path of file
+	 * @param string $token
+	 * @return string link to the preview
+	 */
+	public static function publicPreview_icon($path, $token) {
+		return \publicPreview_icon($path, $token);
+	}
+
+	/**
+	 * Make OC_Helper::humanFileSize available as a simple function
+	 * Example: 2048 to 2 kB.
+	 *
+	 * @param int $bytes in bytes
+	 * @return string size as string
+	 */
+	public static function human_file_size($bytes) {
+		return \human_file_size($bytes);
+	}
+
+	/**
+	 * Return the relative date in relation to today. Returns something like "last hour" or "two month ago"
+	 *
+	 * @param int $timestamp unix timestamp
+	 * @param boolean $dateOnly
+	 * @return \OC_L10N_String human readable interpretation of the timestamp
+	 */
+	public static function relative_modified_date($timestamp, $dateOnly = false) {
+		return \relative_modified_date($timestamp, null, $dateOnly);
+	}
+
+	/**
+	 * Generate html code for an options block.
+	 *
+	 * @param array $options the options
+	 * @param mixed $selected which one is selected?
+	 * @param array $params the parameters
+	 * @return string html options
+	 */
+	public static function html_select_options($options, $selected, $params=array()) {
+		return \html_select_options($options, $selected, $params);
+	}
 }
-- 
GitLab


From 4321d7522e66f387351f6721a1380081ef2c78df Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 20 Nov 2014 16:34:33 +0100
Subject: [PATCH 548/616] Check if files are deletable before trying to delete
 them

---
 apps/files/ajax/delete.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 323b70706ce..4d4232e872e 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -27,7 +27,9 @@ $success = true;
 //Now delete
 foreach ($files as $file) {
 	if (\OC\Files\Filesystem::file_exists($dir . '/' . $file) &&
-			!\OC\Files\Filesystem::unlink($dir . '/' . $file)) {
+		!(\OC\Files\Filesystem::isDeletable($dir . '/' . $file) &&
+			\OC\Files\Filesystem::unlink($dir . '/' . $file))
+	) {
 		$filesWithError .= $file . "\n";
 		$success = false;
 	}
-- 
GitLab


From 9c86665ef400b82487f48374bf11bbe6628cbe28 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 20 Nov 2014 16:53:32 +0100
Subject: [PATCH 549/616] Dont show the delete button for selected files if one
 of the selected files is not deletable

---
 apps/files/js/filelist.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index bec0155e90e..6ffc10cdcbd 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -526,7 +526,8 @@
 				mimetype: $el.attr('data-mime'),
 				type: $el.attr('data-type'),
 				size: parseInt($el.attr('data-size'), 10),
-				etag: $el.attr('data-etag')
+				etag: $el.attr('data-etag'),
+				permissions: parseInt($el.attr('data-permissions'), 10)
 			};
 		},
 
@@ -1636,7 +1637,7 @@
 				this.$el.find('.selectedActions').addClass('hidden');
 			}
 			else {
-				canDelete = (this.getDirectoryPermissions() & OC.PERMISSION_DELETE);
+				canDelete = (this.getDirectoryPermissions() & OC.PERMISSION_DELETE) && this.isSelectedDeletable();
 				this.$el.find('.selectedActions').removeClass('hidden');
 				this.$el.find('#headerSize a>span:first').text(OC.Util.humanFileSize(summary.totalSize));
 				var selection = '';
@@ -1656,6 +1657,15 @@
 			}
 		},
 
+		/**
+		 * Check whether all selected files are deletable
+		 */
+		isSelectedDeletable: function() {
+			return _.reduce(this.getSelectedFiles(), function(deletable, file) {
+				return deletable && (file.permissions & OC.PERMISSION_DELETE);
+			}, true);
+		},
+
 		/**
 		 * Returns whether all files are selected
 		 * @return true if all files are selected, false otherwise
-- 
GitLab


From e8cbb8e2d8dfe9e6ddc1cb151b860719d983805b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 25 Nov 2014 17:16:23 +0100
Subject: [PATCH 550/616] Add js unit test

---
 apps/files/tests/js/filelistSpec.js | 34 +++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/apps/files/tests/js/filelistSpec.js b/apps/files/tests/js/filelistSpec.js
index a7fa14eb14a..21f8a12f4b5 100644
--- a/apps/files/tests/js/filelistSpec.js
+++ b/apps/files/tests/js/filelistSpec.js
@@ -97,7 +97,8 @@ describe('OCA.Files.FileList tests', function() {
 			name: 'One.txt',
 			mimetype: 'text/plain',
 			size: 12,
-			etag: 'abc'
+			etag: 'abc',
+			permissions: OC.PERMISSION_ALL
 		}, {
 			id: 2,
 			type: 'file',
@@ -105,6 +106,7 @@ describe('OCA.Files.FileList tests', function() {
 			mimetype: 'image/jpeg',
 			size: 12049,
 			etag: 'def',
+			permissions: OC.PERMISSION_ALL
 		}, {
 			id: 3,
 			type: 'file',
@@ -112,13 +114,15 @@ describe('OCA.Files.FileList tests', function() {
 			mimetype: 'application/pdf',
 			size: 58009,
 			etag: '123',
+			permissions: OC.PERMISSION_ALL
 		}, {
 			id: 4,
 			type: 'dir',
 			name: 'somedir',
 			mimetype: 'httpd/unix-directory',
 			size: 250,
-			etag: '456'
+			etag: '456',
+			permissions: OC.PERMISSION_ALL
 		}];
 		pageSizeStub = sinon.stub(OCA.Files.FileList.prototype, 'pageSize').returns(20);
 		fileList = new OCA.Files.FileList($('#app-content-files'));
@@ -1479,6 +1483,17 @@ describe('OCA.Files.FileList tests', function() {
 				$('.select-all').click();
 				expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(true);
 			});
+			it('show doesnt show the delete action if one or more files are not deletable', function () {
+				fileList.setFiles(testFiles);
+				$('#permissions').val(OC.PERMISSION_READ | OC.PERMISSION_DELETE);
+				$('.select-all').click();
+				expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(false);
+				testFiles[0].permissions = OC.PERMISSION_READ;
+				$('.select-all').click();
+				fileList.setFiles(testFiles);
+				$('.select-all').click();
+				expect(fileList.$el.find('.delete-selected').hasClass('hidden')).toEqual(true);
+			});
 		});
 		describe('Actions', function() {
 			beforeEach(function() {
@@ -1495,7 +1510,8 @@ describe('OCA.Files.FileList tests', function() {
 					mimetype: 'text/plain',
 					type: 'file',
 					size: 12,
-					etag: 'abc'
+					etag: 'abc',
+					permissions: OC.PERMISSION_ALL
 				});
 				expect(files[1]).toEqual({
 					id: 3,
@@ -1503,7 +1519,8 @@ describe('OCA.Files.FileList tests', function() {
 					name: 'Three.pdf',
 					mimetype: 'application/pdf',
 					size: 58009,
-					etag: '123'
+					etag: '123',
+					permissions: OC.PERMISSION_ALL
 				});
 				expect(files[2]).toEqual({
 					id: 4,
@@ -1511,7 +1528,8 @@ describe('OCA.Files.FileList tests', function() {
 					name: 'somedir',
 					mimetype: 'httpd/unix-directory',
 					size: 250,
-					etag: '456'
+					etag: '456',
+					permissions: OC.PERMISSION_ALL
 				});
 			});
 			it('Removing a file removes it from the selection', function() {
@@ -1524,7 +1542,8 @@ describe('OCA.Files.FileList tests', function() {
 					mimetype: 'text/plain',
 					type: 'file',
 					size: 12,
-					etag: 'abc'
+					etag: 'abc',
+					permissions: OC.PERMISSION_ALL
 				});
 				expect(files[1]).toEqual({
 					id: 4,
@@ -1532,7 +1551,8 @@ describe('OCA.Files.FileList tests', function() {
 					name: 'somedir',
 					mimetype: 'httpd/unix-directory',
 					size: 250,
-					etag: '456'
+					etag: '456',
+					permissions: OC.PERMISSION_ALL
 				});
 			});
 			describe('Download', function() {
-- 
GitLab


From 3338eede3ccb2ead223a46fd537b7504bb4786e0 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 12:30:07 +0100
Subject: [PATCH 551/616] Correctly namespace DatabaseSetupException

---
 lib/private/databasesetupexception.php | 12 ++++++++++++
 lib/private/setup.php                  |  5 +----
 lib/private/setup/mssql.php            |  2 +-
 lib/private/setup/mysql.php            |  6 +++---
 lib/private/setup/oci.php              |  6 +++---
 lib/private/setup/postgresql.php       |  4 ++--
 6 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 lib/private/databasesetupexception.php

diff --git a/lib/private/databasesetupexception.php b/lib/private/databasesetupexception.php
new file mode 100644
index 00000000000..9235cda8c0e
--- /dev/null
+++ b/lib/private/databasesetupexception.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class DatabaseSetupException extends HintException {
+}
diff --git a/lib/private/setup.php b/lib/private/setup.php
index 1125933c8e9..45c97bbd225 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -8,9 +8,6 @@
 
 use OCP\IConfig;
 
-class DatabaseSetupException extends \OC\HintException {
-}
-
 class OC_Setup {
 	/** @var IConfig */
 	protected $config;
@@ -195,7 +192,7 @@ class OC_Setup {
 		try {
 			$dbSetup->initialize($options);
 			$dbSetup->setupDatabase($username);
-		} catch (DatabaseSetupException $e) {
+		} catch (\OC\DatabaseSetupException $e) {
 			$error[] = array(
 				'error' => $e->getMessage(),
 				'hint' => $e->getHint()
diff --git a/lib/private/setup/mssql.php b/lib/private/setup/mssql.php
index b8329f99079..5143545b76f 100644
--- a/lib/private/setup/mssql.php
+++ b/lib/private/setup/mssql.php
@@ -17,7 +17,7 @@ class MSSQL extends AbstractDatabase {
 			} else {
 				$entry = '';
 			}
-			throw new \DatabaseSetupException($this->trans->t('MS SQL username and/or password not valid: %s', array($entry)),
+			throw new \OC\DatabaseSetupException($this->trans->t('MS SQL username and/or password not valid: %s', array($entry)),
 					$this->trans->t('You need to enter either an existing account or the administrator.'));
 		}
 
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index 5558a2d1e51..8f8d86d388c 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -9,7 +9,7 @@ class MySQL extends AbstractDatabase {
 		//check if the database user has admin right
 		$connection = @mysql_connect($this->dbhost, $this->dbuser, $this->dbpassword);
 		if(!$connection) {
-			throw new \DatabaseSetupException($this->trans->t('MySQL/MariaDB username and/or password not valid'),
+			throw new \OC\DatabaseSetupException($this->trans->t('MySQL/MariaDB username and/or password not valid'),
 				$this->trans->t('You need to enter either an existing account or the administrator.'));
 		}
 		//user already specified in config
@@ -96,13 +96,13 @@ class MySQL extends AbstractDatabase {
 		$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
 		$result = mysql_query($query, $connection);
 		if (!$result) {
-			throw new \DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'localhost' exists already.", array($name)),
+			throw new \OC\DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'localhost' exists already.", array($name)),
 				$this->trans->t("Drop this user from MySQL/MariaDB", array($name)));
 		}
 		$query = "CREATE USER '$name'@'%' IDENTIFIED BY '$password'";
 		$result = mysql_query($query, $connection);
 		if (!$result) {
-			throw new \DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'%%' already exists", array($name)),
+			throw new \OC\DatabaseSetupException($this->trans->t("MySQL/MariaDB user '%s'@'%%' already exists", array($name)),
 				$this->trans->t("Drop this user from MySQL/MariaDB."));
 		}
 	}
diff --git a/lib/private/setup/oci.php b/lib/private/setup/oci.php
index 23b5232438a..b75b658bae2 100644
--- a/lib/private/setup/oci.php
+++ b/lib/private/setup/oci.php
@@ -45,14 +45,14 @@ class OCI extends AbstractDatabase {
 		if(!$connection) {
 			$errorMessage = $this->getLastError();
 			if ($errorMessage) {
-				throw new \DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
+				throw new \OC\DatabaseSetupException($this->trans->t('Oracle connection could not be established'),
 				$errorMessage.' Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
 							.' NLS_LANG='.getenv('NLS_LANG')
 							.' tnsnames.ora is '.(is_readable(getenv('ORACLE_HOME').'/network/admin/tnsnames.ora')?'':'not ').'readable');
 			}
-			throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					'Check environment: ORACLE_HOME='.getenv('ORACLE_HOME')
 							.' ORACLE_SID='.getenv('ORACLE_SID')
 							.' LD_LIBRARY_PATH='.getenv('LD_LIBRARY_PATH')
@@ -124,7 +124,7 @@ class OCI extends AbstractDatabase {
 		}
 		$connection = @oci_connect($this->dbuser, $this->dbpassword, $easy_connect_string);
 		if(!$connection) {
-			throw new \DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
+			throw new \OC\DatabaseSetupException($this->trans->t('Oracle username and/or password not valid'),
 					$this->trans->t('You need to enter either an existing account or the administrator.'));
 		}
 		$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
diff --git a/lib/private/setup/postgresql.php b/lib/private/setup/postgresql.php
index 4d0c9b52a4d..3777d1620bc 100644
--- a/lib/private/setup/postgresql.php
+++ b/lib/private/setup/postgresql.php
@@ -27,7 +27,7 @@ class PostgreSQL extends AbstractDatabase {
 			$connection = @pg_connect($connection_string);
 
 			if(!$connection)
-				throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+				throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
 						$this->trans->t('You need to enter either an existing account or the administrator.'));
 		}
 		$e_user = pg_escape_string($this->dbuser);
@@ -80,7 +80,7 @@ class PostgreSQL extends AbstractDatabase {
 		$connection_string = "host='$e_host' dbname='$e_dbname' user='$e_user' port='$port' password='$e_password'";
 		$connection = @pg_connect($connection_string);
 		if(!$connection) {
-			throw new \DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
+			throw new \OC\DatabaseSetupException($this->trans->t('PostgreSQL username and/or password not valid'),
 					$this->trans->t('You need to enter either an existing account or the administrator.'));
 		}
 		$query = "select count(*) FROM pg_class WHERE relname='".$this->tableprefix."users' limit 1";
-- 
GitLab


From 8af346a84dfdca35fbac32f097f7dd425f2901cb Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Wed, 26 Nov 2014 12:38:26 +0100
Subject: [PATCH 552/616] Don't show favicon to prevent iteration through
 subfolders

The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
---
 apps/files/appinfo/remote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 3ba25085bad..26bef966f79 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -38,7 +38,7 @@ $server->setBaseUri($baseuri);
 $defaults = new OC_Defaults();
 $server->addPlugin(new \Sabre\DAV\Auth\Plugin($authBackend, $defaults->getName()));
 $server->addPlugin(new \Sabre\DAV\Locks\Plugin($lockBackend));
-$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new \Sabre\DAV\Browser\Plugin(false, false)); // Show something in the Browser, but no upload
 $server->addPlugin(new OC_Connector_Sabre_FilesPlugin());
 $server->addPlugin(new OC_Connector_Sabre_MaintenancePlugin());
 $server->addPlugin(new OC_Connector_Sabre_ExceptionLoggerPlugin('webdav'));
-- 
GitLab


From 8e28bf012cf1aca75cc1d48fe5f5e3c121fe5b7c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 12:56:54 +0100
Subject: [PATCH 553/616] Move constants from GET_TYPE to OC\Files so they can
 be autoloaded

---
 lib/private/files.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/lib/private/files.php b/lib/private/files.php
index 571d3215caa..98f3c52d6c6 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -24,17 +24,14 @@
 // TODO: get rid of this using proper composer packages
 require_once 'mcnetic/phpzipstreamer/ZipStreamer.php';
 
-class GET_TYPE {
-	const FILE = 1;
-	const ZIP_FILES = 2;
-	const ZIP_DIR = 3;
-}
-
 /**
  * Class for file server access
  *
  */
 class OC_Files {
+	const FILE = 1;
+	const ZIP_FILES = 2;
+	const ZIP_DIR = 3;
 
 	/**
 	 * @param string $filename
@@ -76,7 +73,7 @@ class OC_Files {
 		}
 
 		if (is_array($files)) {
-			$get_type = GET_TYPE::ZIP_FILES;
+			$get_type = self::ZIP_FILES;
 			$basename = basename($dir);
 			if ($basename) {
 				$name = $basename . '.zip';
@@ -88,7 +85,7 @@ class OC_Files {
 		} else {
 			$filename = $dir . '/' . $files;
 			if (\OC\Files\Filesystem::is_dir($dir . '/' . $files)) {
-				$get_type = GET_TYPE::ZIP_DIR;
+				$get_type = self::ZIP_DIR;
 				// downloading root ?
 				if ($files === '') {
 					$name = 'download.zip';
@@ -97,12 +94,12 @@ class OC_Files {
 				}
 
 			} else {
-				$get_type = GET_TYPE::FILE;
+				$get_type = self::FILE;
 				$name = $files;
 			}
 		}
 
-		if ($get_type === GET_TYPE::FILE) {
+		if ($get_type === self::FILE) {
 			$zip = false;
 			if ($xsendfile && OC_App::isEnabled('files_encryption')) {
 				$xsendfile = false;
@@ -127,7 +124,7 @@ class OC_Files {
 		if ($zip) {
 			$executionTime = intval(ini_get('max_execution_time'));
 			set_time_limit(0);
-			if ($get_type === GET_TYPE::ZIP_FILES) {
+			if ($get_type === self::ZIP_FILES) {
 				foreach ($files as $file) {
 					$file = $dir . '/' . $file;
 					if (\OC\Files\Filesystem::is_file($file)) {
@@ -138,7 +135,7 @@ class OC_Files {
 						self::zipAddDir($file, $zip);
 					}
 				}
-			} elseif ($get_type === GET_TYPE::ZIP_DIR) {
+			} elseif ($get_type === self::ZIP_DIR) {
 				$file = $dir . '/' . $files;
 				self::zipAddDir($file, $zip);
 			}
-- 
GitLab


From 5097d4dc05b6591f656b17e769a78ddaa7fc0c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 26 Nov 2014 13:16:22 +0100
Subject: [PATCH 554/616] remove deprecated \OC:$session

---
 lib/base.php                 | 12 ++----------
 lib/private/user/session.php | 17 -----------------
 2 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 82c0c7aa6d0..5c33be351a4 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -66,16 +66,10 @@ class OC {
 	public static $REQUESTEDAPP = '';
 
 	/**
-	 * check if owncloud runs in cli mode
+	 * check if ownCloud runs in cli mode
 	 */
 	public static $CLI = false;
 
-	/**
-	 * @deprecated use \OC::$server->getSession() instead
-	 * @var \OC\Session\Session
-	 */
-	public static $session = null;
-
 	/**
 	 * @var \OC\Autoloader $loader
 	 */
@@ -531,9 +525,7 @@ class OC {
 
 		\OC::$server->getEventLogger()->start('init_session', 'Initialize session');
 		OC_App::loadApps(array('session'));
-		if (self::$CLI) {
-			self::$session = new \OC\Session\Memory('');
-		} else {
+		if (!self::$CLI) {
 			self::initSession();
 		}
 		\OC::$server->getEventLogger()->end('init_session');
diff --git a/lib/private/user/session.php b/lib/private/user/session.php
index ca0265dfb23..94abaca3e76 100644
--- a/lib/private/user/session.php
+++ b/lib/private/user/session.php
@@ -88,15 +88,6 @@ class Session implements IUserSession, Emitter {
 	 * @return \OCP\ISession
 	 */
 	public function getSession() {
-		// fetch the deprecated \OC::$session if it changed for backwards compatibility
-		if (isset(\OC::$session) && \OC::$session !== $this->session) {
-			\OC::$server->getLogger()->warning(
-				'One of your installed apps still seems to use the deprecated ' .
-				'\OC::$session and has replaced it with a new instance. Please file a bug against it.' .
-				'Closing and replacing session in UserSession instance.'
-			);
-			$this->setSession(\OC::$session);
-		}
 		return $this->session;
 	}
 
@@ -111,14 +102,6 @@ class Session implements IUserSession, Emitter {
 		}
 		$this->session = $session;
 		$this->activeUser = null;
-
-		// maintain deprecated \OC::$session
-		if (\OC::$session !== $this->session) {
-			if (\OC::$session instanceof \OCP\ISession) {
-				\OC::$session->close();
-			}
-			\OC::$session = $session;
-		}
 	}
 
 	/**
-- 
GitLab


From b20d698ebd630a5d8030c42d3b88f6ef54224e36 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 27 Nov 2014 00:01:55 +0100
Subject: [PATCH 555/616] Cache results of available languages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof

Surely, this is no gigantic gain but if we would do that for every function out there...
---
 lib/private/l10n.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/private/l10n.php b/lib/private/l10n.php
index afa066c30ef..bc4e53e975c 100644
--- a/lib/private/l10n.php
+++ b/lib/private/l10n.php
@@ -20,6 +20,7 @@ class OC_L10N implements \OCP\IL10N {
 	 * cache
 	 */
 	protected static $cache = array();
+	protected static $availableLanguages = array();
 
 	/**
 	 * The best language
@@ -468,6 +469,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;
+		}
 		$available=array('en');//english is always available
 		$dir = self::findI18nDir($app);
 		if(is_dir($dir)) {
@@ -479,6 +483,8 @@ class OC_L10N implements \OCP\IL10N {
 				}
 			}
 		}
+
+		self::$availableLanguages = $available;
 		return $available;
 	}
 
-- 
GitLab


From 87a2aabb9830eb3e016c68feca89b37ac60f3120 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Thu, 27 Nov 2014 01:54:46 -0500
Subject: [PATCH 556/616] [tx-robot] updated from transifex

---
 apps/user_ldap/l10n/da.js      | 1 +
 apps/user_ldap/l10n/da.json    | 1 +
 apps/user_ldap/l10n/de.js      | 1 +
 apps/user_ldap/l10n/de.json    | 1 +
 apps/user_ldap/l10n/de_DE.js   | 1 +
 apps/user_ldap/l10n/de_DE.json | 1 +
 settings/l10n/sk_SK.js         | 1 +
 settings/l10n/sk_SK.json       | 1 +
 8 files changed, 8 insertions(+)

diff --git a/apps/user_ldap/l10n/da.js b/apps/user_ldap/l10n/da.js
index 91bce8c777e..fb6feccc4b6 100644
--- a/apps/user_ldap/l10n/da.js
+++ b/apps/user_ldap/l10n/da.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Bekræft Sletning",
     "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
     "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke registrere navneattributten for visning af bruger. Angiv den venligst selv i de avancerede ldap-indstillinger.",
     "Could not find the desired feature" : "Fandt ikke den ønskede funktion",
     "Invalid Host" : "Ugyldig vært",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/da.json b/apps/user_ldap/l10n/da.json
index 97d0c0ca403..0332afc101d 100644
--- a/apps/user_ldap/l10n/da.json
+++ b/apps/user_ldap/l10n/da.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Bekræft Sletning",
     "_%s group found_::_%s groups found_" : ["Der blev fundet %s gruppe","Der blev fundet %s grupper"],
     "_%s user found_::_%s users found_" : ["Der blev fundet %s bruger","Der blev fundet %s brugere"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Kunne ikke registrere navneattributten for visning af bruger. Angiv den venligst selv i de avancerede ldap-indstillinger.",
     "Could not find the desired feature" : "Fandt ikke den ønskede funktion",
     "Invalid Host" : "Ugyldig vært",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/de.js b/apps/user_ldap/l10n/de.js
index 94f388b0df4..545fb9c194f 100644
--- a/apps/user_ldap/l10n/de.js
+++ b/apps/user_ldap/l10n/de.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Löschung bestätigen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Benutzeranzeigename-Attribut konnte nicht gefunden werden. Bitte gib es selber in den erweiterten LDAP-Einstellungen an.",
     "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/de.json b/apps/user_ldap/l10n/de.json
index f3524664fc1..df0f777536a 100644
--- a/apps/user_ldap/l10n/de.json
+++ b/apps/user_ldap/l10n/de.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Löschung bestätigen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Benutzeranzeigename-Attribut konnte nicht gefunden werden. Bitte gib es selber in den erweiterten LDAP-Einstellungen an.",
     "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/de_DE.js b/apps/user_ldap/l10n/de_DE.js
index 3cefc2ec625..c89d7793a4a 100644
--- a/apps/user_ldap/l10n/de_DE.js
+++ b/apps/user_ldap/l10n/de_DE.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Löschung bestätigen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Benutzeranzeigename-Attribut konnte nicht gefunden werden. Bitte geben Sie es selber in den erweiterten LDAP-Einstellungen an.",
     "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/de_DE.json b/apps/user_ldap/l10n/de_DE.json
index cf823ca29d4..7b047cbcd2f 100644
--- a/apps/user_ldap/l10n/de_DE.json
+++ b/apps/user_ldap/l10n/de_DE.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Löschung bestätigen",
     "_%s group found_::_%s groups found_" : ["%s Gruppe gefunden","%s Gruppen gefunden"],
     "_%s user found_::_%s users found_" : ["%s Benutzer gefunden","%s Benutzer gefunden"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Das Benutzeranzeigename-Attribut konnte nicht gefunden werden. Bitte geben Sie es selber in den erweiterten LDAP-Einstellungen an.",
     "Could not find the desired feature" : "Konnte die gewünschte Funktion nicht finden",
     "Invalid Host" : "Ungültiger Host",
     "Server" : "Server",
diff --git a/settings/l10n/sk_SK.js b/settings/l10n/sk_SK.js
index 3e44cd259e4..755ecd8f8ed 100644
--- a/settings/l10n/sk_SK.js
+++ b/settings/l10n/sk_SK.js
@@ -219,6 +219,7 @@ OC.L10N.register(
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
     "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
+    "Search Users" : "Hľadať používateľov",
     "Add Group" : "Pridať skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všetci",
diff --git a/settings/l10n/sk_SK.json b/settings/l10n/sk_SK.json
index f5fd698cd2a..35c54da58b0 100644
--- a/settings/l10n/sk_SK.json
+++ b/settings/l10n/sk_SK.json
@@ -217,6 +217,7 @@
     "Create" : "Vytvoriť",
     "Admin Recovery Password" : "Obnovenie hesla administrátora",
     "Enter the recovery password in order to recover the users files during password change" : "Zadajte heslo pre obnovenie súborov používateľa pri zmene hesla",
+    "Search Users" : "Hľadať používateľov",
     "Add Group" : "Pridať skupinu",
     "Group" : "Skupina",
     "Everyone" : "Všetci",
-- 
GitLab


From e1f3abf7a583669ba1fed703365de9e12a76e22c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 12:38:24 +0100
Subject: [PATCH 557/616] Correctly namespace and autoload DatabaseException

---
 lib/private/databaseexception.php | 23 ++++++++++++++++++++
 lib/private/db.php                | 36 ++++++++++---------------------
 lib/private/group/database.php    |  2 +-
 lib/private/server.php            |  2 +-
 tests/lib/testcase.php            |  4 ++--
 5 files changed, 38 insertions(+), 29 deletions(-)
 create mode 100644 lib/private/databaseexception.php

diff --git a/lib/private/databaseexception.php b/lib/private/databaseexception.php
new file mode 100644
index 00000000000..1135621ead2
--- /dev/null
+++ b/lib/private/databaseexception.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Copyright (c) 2012 Frank Karlitschek <frank@owncloud.com>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC;
+
+class DatabaseException extends \Exception {
+	private $query;
+
+	//FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
+	public function __construct($message, $query = null){
+		parent::__construct($message);
+		$this->query = $query;
+	}
+
+	public function getQuery() {
+		return $this->query;
+	}
+}
diff --git a/lib/private/db.php b/lib/private/db.php
index b820281b8a3..f8015133682 100644
--- a/lib/private/db.php
+++ b/lib/private/db.php
@@ -22,20 +22,6 @@
 
 define('MDB2_SCHEMA_DUMP_STRUCTURE', '1');
 
-class DatabaseException extends Exception {
-	private $query;
-
-	//FIXME getQuery seems to be unused, maybe use parent constructor with $message, $code and $previous
-	public function __construct($message, $query = null){
-		parent::__construct($message);
-		$this->query = $query;
-	}
-
-	public function getQuery() {
-		return $this->query;
-	}
-}
-
 /**
  * This class manages the access to the database. It basically is a wrapper for
  * Doctrine with some adaptions.
@@ -65,7 +51,7 @@ class OC_DB {
 	 * @param int $limit
 	 * @param int $offset
 	 * @param bool $isManipulation
-	 * @throws DatabaseException
+	 * @throws \OC\DatabaseException
 	 * @return OC_DB_StatementWrapper prepared SQL query
 	 *
 	 * SQL query via Doctrine prepare(), needs to be execute()'d!
@@ -82,7 +68,7 @@ class OC_DB {
 		try {
 			$result =$connection->prepare($query, $limit, $offset);
 		} catch (\Doctrine\DBAL\DBALException $e) {
-			throw new \DatabaseException($e->getMessage(), $query);
+			throw new \OC\DatabaseException($e->getMessage(), $query);
 		}
 		// differentiate between query and manipulation
 		$result = new OC_DB_StatementWrapper($result, $isManipulation);
@@ -123,7 +109,7 @@ class OC_DB {
 	 *					.. or a simple sql query string
 	 * @param array $parameters
 	 * @return OC_DB_StatementWrapper
-	 * @throws DatabaseException
+	 * @throws \OC\DatabaseException
 	 */
 	static public function executeAudited( $stmt, array $parameters = null) {
 		if (is_string($stmt)) {
@@ -132,7 +118,7 @@ class OC_DB {
 				// TODO try to convert LIMIT OFFSET notation to parameters, see fixLimitClauseForMSSQL
 				$message = 'LIMIT and OFFSET are forbidden for portability reasons,'
 						 . ' pass an array with \'limit\' and \'offset\' instead';
-				throw new DatabaseException($message);
+				throw new \OC\DatabaseException($message);
 			}
 			$stmt = array('sql' => $stmt, 'limit' => null, 'offset' => null);
 		}
@@ -140,7 +126,7 @@ class OC_DB {
 			// convert to prepared statement
 			if ( ! array_key_exists('sql', $stmt) ) {
 				$message = 'statement array must at least contain key \'sql\'';
-				throw new DatabaseException($message);
+				throw new \OC\DatabaseException($message);
 			}
 			if ( ! array_key_exists('limit', $stmt) ) {
 				$stmt['limit'] = null;
@@ -160,7 +146,7 @@ class OC_DB {
 			} else {
 				$message = 'Expected a prepared statement or array got ' . gettype($stmt);
 			}
-			throw new DatabaseException($message);
+			throw new \OC\DatabaseException($message);
 		}
 		return $result;
 	}
@@ -169,7 +155,7 @@ class OC_DB {
 	 * gets last value of autoincrement
 	 * @param string $table The optional table name (will replace *PREFIX*) and add sequence suffix
 	 * @return string id
-	 * @throws DatabaseException
+	 * @throws \OC\DatabaseException
 	 *
 	 * \Doctrine\DBAL\Connection lastInsertId
 	 *
@@ -312,7 +298,7 @@ class OC_DB {
 	 * @param mixed $result
 	 * @param string $message
 	 * @return void
-	 * @throws DatabaseException
+	 * @throws \OC\DatabaseException
 	 */
 	public static function raiseExceptionOnError($result, $message = null) {
 		if(self::isError($result)) {
@@ -321,7 +307,7 @@ class OC_DB {
 			} else {
 				$message .= ', Root cause:' . self::getErrorMessage($result);
 			}
-			throw new DatabaseException($message, self::getErrorCode($result));
+			throw new \OC\DatabaseException($message, self::getErrorCode($result));
 		}
 	}
 
@@ -345,7 +331,7 @@ class OC_DB {
 	 *
 	 * @param string $table
 	 * @return bool
-	 * @throws DatabaseException
+	 * @throws \OC\DatabaseException
 	 */
 	public static function tableExists($table) {
 
@@ -381,7 +367,7 @@ class OC_DB {
 				$result = \OC_DB::executeAudited($sql, array($table));
 				break;
 			default:
-				throw new DatabaseException("Unknown database type: $dbType");
+				throw new \OC\DatabaseException("Unknown database type: $dbType");
 		}
 
 		return $result->fetchOne() === $table;
diff --git a/lib/private/group/database.php b/lib/private/group/database.php
index 6bad55c8d5e..2069e99599f 100644
--- a/lib/private/group/database.php
+++ b/lib/private/group/database.php
@@ -220,7 +220,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * @param string $gid
 	 * @param string $search
 	 * @return int|false
-	 * @throws DatabaseException
+	 * @throws \OC\DatabaseException
 	 */
 	public function countUsersInGroup($gid, $search = '') {
 		$stmt = OC_DB::prepare('SELECT COUNT(`uid`) AS `count` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` LIKE ?');
diff --git a/lib/private/server.php b/lib/private/server.php
index c413ee8bf6d..cd57d41ce58 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -205,7 +205,7 @@ class Server extends SimpleContainer implements IServerContainer {
 			$factory = new \OC\DB\ConnectionFactory();
 			$type = $c->getConfig()->getSystemValue('dbtype', 'sqlite');
 			if (!$factory->isValidType($type)) {
-				throw new \DatabaseException('Invalid database type');
+				throw new \OC\DatabaseException('Invalid database type');
 			}
 			$connectionParams = $factory->createConnectionParams($c->getConfig());
 			$connection = $factory->getConnection($type, $connectionParams);
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index e6f5ca71dac..934bc5fa8f3 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -64,7 +64,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * Remove all entries from the storages table
-	 * @throws \DatabaseException
+	 * @throws \OC\DatabaseException
 	 */
 	static protected function tearDownAfterClassCleanStorages() {
 		$sql = 'DELETE FROM `*PREFIX*storages`';
@@ -74,7 +74,7 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 
 	/**
 	 * Remove all entries from the filecache table
-	 * @throws \DatabaseException
+	 * @throws \OC\DatabaseException
 	 */
 	static protected function tearDownAfterClassCleanFileCache() {
 		$sql = 'DELETE FROM `*PREFIX*filecache`';
-- 
GitLab


From ea3780f91156f9028ba61624e8f940b0d09c0f0f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 12:42:43 +0100
Subject: [PATCH 558/616] Replace exception with standard exception

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

diff --git a/lib/private/arrayparser.php b/lib/private/arrayparser.php
index dab1817c2ed..1cf3355d6fa 100644
--- a/lib/private/arrayparser.php
+++ b/lib/private/arrayparser.php
@@ -21,9 +21,6 @@
 
 namespace OC;
 
-class SyntaxException extends \Exception {
-}
-
 class ArrayParser {
 	const TYPE_NUM = 1;
 	const TYPE_BOOL = 2;
@@ -209,7 +206,7 @@ class ArrayParser {
 						$bracketDepth++;
 					} elseif ($char === ')') {
 						if ($bracketDepth <= 0) {
-							throw new SyntaxException;
+							throw new UnexpectedValueException();
 						} else {
 							$bracketDepth--;
 						}
-- 
GitLab


From 20237fba4789f4964e7a7d6559820977c4e85bad Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 16:58:25 +0100
Subject: [PATCH 559/616] Introduce getSourcePath() in Storage\Local to reduce
 the difference to MappedLocal

---
 lib/private/files/storage/local.php | 77 +++++++++++++++++------------
 1 file changed, 46 insertions(+), 31 deletions(-)

diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 1c5fafc12fa..7b4abf08f44 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -35,7 +35,7 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function mkdir($path) {
-			return @mkdir($this->datadir . $path, 0777, true);
+			return @mkdir($this->getSourcePath($path), 0777, true);
 		}
 
 		public function rmdir($path) {
@@ -44,7 +44,7 @@ if (\OC_Util::runningOnWindows()) {
 			}
 			try {
 				$it = new \RecursiveIteratorIterator(
-					new \RecursiveDirectoryIterator($this->datadir . $path),
+					new \RecursiveDirectoryIterator($this->getSourcePath($path)),
 					\RecursiveIteratorIterator::CHILD_FIRST
 				);
 				/**
@@ -68,30 +68,30 @@ if (\OC_Util::runningOnWindows()) {
 					}
 					$it->next();
 				}
-				return rmdir($this->datadir . $path);
+				return rmdir($this->getSourcePath($path));
 			} catch (\UnexpectedValueException $e) {
 				return false;
 			}
 		}
 
 		public function opendir($path) {
-			return opendir($this->datadir . $path);
+			return opendir($this->getSourcePath($path));
 		}
 
 		public function is_dir($path) {
 			if (substr($path, -1) == '/') {
 				$path = substr($path, 0, -1);
 			}
-			return is_dir($this->datadir . $path);
+			return is_dir($this->getSourcePath($path));
 		}
 
 		public function is_file($path) {
-			return is_file($this->datadir . $path);
+			return is_file($this->getSourcePath($path));
 		}
 
 		public function stat($path) {
 			clearstatcache();
-			$fullPath = $this->datadir . $path;
+			$fullPath = $this->getSourcePath($path);
 			$statResult = stat($fullPath);
 			if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
 				$filesize = $this->filesize($path);
@@ -102,9 +102,9 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function filetype($path) {
-			$filetype = filetype($this->datadir . $path);
+			$filetype = filetype($this->getSourcePath($path));
 			if ($filetype == 'link') {
-				$filetype = filetype(realpath($this->datadir . $path));
+				$filetype = filetype(realpath($this->getSourcePath($path)));
 			}
 			return $filetype;
 		}
@@ -113,7 +113,7 @@ if (\OC_Util::runningOnWindows()) {
 			if ($this->is_dir($path)) {
 				return 0;
 			}
-			$fullPath = $this->datadir . $path;
+			$fullPath = $this->getSourcePath($path);
 			if (PHP_INT_SIZE === 4) {
 				$helper = new \OC\LargeFileHelper;
 				return $helper->getFilesize($fullPath);
@@ -122,19 +122,19 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function isReadable($path) {
-			return is_readable($this->datadir . $path);
+			return is_readable($this->getSourcePath($path));
 		}
 
 		public function isUpdatable($path) {
-			return is_writable($this->datadir . $path);
+			return is_writable($this->getSourcePath($path));
 		}
 
 		public function file_exists($path) {
-			return file_exists($this->datadir . $path);
+			return file_exists($this->getSourcePath($path));
 		}
 
 		public function filemtime($path) {
-			return filemtime($this->datadir . $path);
+			return filemtime($this->getSourcePath($path));
 		}
 
 		public function touch($path, $mtime = null) {
@@ -145,30 +145,30 @@ if (\OC_Util::runningOnWindows()) {
 				return false;
 			}
 			if (!is_null($mtime)) {
-				$result = touch($this->datadir . $path, $mtime);
+				$result = touch($this->getSourcePath($path), $mtime);
 			} else {
-				$result = touch($this->datadir . $path);
+				$result = touch($this->getSourcePath($path));
 			}
 			if ($result) {
-				clearstatcache(true, $this->datadir . $path);
+				clearstatcache(true, $this->getSourcePath($path));
 			}
 
 			return $result;
 		}
 
 		public function file_get_contents($path) {
-			return file_get_contents($this->datadir . $path);
+			return file_get_contents($this->getSourcePath($path));
 		}
 
-		public function file_put_contents($path, $data) { //trigger_error("$path = ".var_export($path, 1));
-			return file_put_contents($this->datadir . $path, $data);
+		public function file_put_contents($path, $data) {
+			return file_put_contents($this->getSourcePath($path), $data);
 		}
 
 		public function unlink($path) {
 			if ($this->is_dir($path)) {
 				return $this->rmdir($path);
 			} else if ($this->is_file($path)) {
-				return unlink($this->datadir . $path);
+				return unlink($this->getSourcePath($path));
 			} else {
 				return false;
 			}
@@ -200,27 +200,27 @@ if (\OC_Util::runningOnWindows()) {
 				$this->unlink($path2);
 			}
 
-			return rename($this->datadir . $path1, $this->datadir . $path2);
+			return rename($this->getSourcePath($path1), $this->getSourcePath($path2));
 		}
 
 		public function copy($path1, $path2) {
 			if ($this->is_dir($path1)) {
 				return parent::copy($path1, $path2);
 			} else {
-				return copy($this->datadir . $path1, $this->datadir . $path2);
+				return copy($this->getSourcePath($path1), $this->getSourcePath($path2));
 			}
 		}
 
 		public function fopen($path, $mode) {
-			return fopen($this->datadir . $path, $mode);
+			return fopen($this->getSourcePath($path), $mode);
 		}
 
 		public function hash($type, $path, $raw = false) {
-			return hash_file($type, $this->datadir . $path, $raw);
+			return hash_file($type, $this->getSourcePath($path), $raw);
 		}
 
 		public function free_space($path) {
-			$space = @disk_free_space($this->datadir . $path);
+			$space = @disk_free_space($this->getSourcePath($path));
 			if ($space === false || is_null($space)) {
 				return \OCP\Files\FileInfo::SPACE_UNKNOWN;
 			}
@@ -232,11 +232,11 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function getLocalFile($path) {
-			return $this->datadir . $path;
+			return $this->getSourcePath($path);
 		}
 
 		public function getLocalFolder($path) {
-			return $this->datadir . $path;
+			return $this->getSourcePath($path);
 		}
 
 		/**
@@ -244,12 +244,16 @@ if (\OC_Util::runningOnWindows()) {
 		 */
 		protected function searchInDir($query, $dir = '') {
 			$files = array();
-			foreach (scandir($this->datadir . $dir) as $item) {
-				if ($item == '.' || $item == '..') continue;
+			$physicalDir = $this->getSourcePath($dir);
+			foreach (scandir($physicalDir) as $item) {
+				if ($item == '.' || $item == '..')
+					continue;
+				$physicalItem = $physicalDir . '/' . $item;
+
 				if (strstr(strtolower($item), strtolower($query)) !== false) {
 					$files[] = $dir . '/' . $item;
 				}
-				if (is_dir($this->datadir . $dir . '/' . $item)) {
+				if (is_dir($physicalItem)) {
 					$files = array_merge($files, $this->searchInDir($query, $dir . '/' . $item));
 				}
 			}
@@ -271,6 +275,17 @@ if (\OC_Util::runningOnWindows()) {
 			}
 		}
 
+		/**
+		 * Get the source path (on disk) of a given path
+		 *
+		 * @param string $path
+		 * @return string
+		 */
+		protected function getSourcePath($path) {
+			$fullPath = $this->datadir . $path;
+			return $fullPath;
+		}
+
 		/**
 		 * {@inheritdoc}
 		 */
-- 
GitLab


From 4f1bbc4fd5fa761553f864da4dbcfde26d2bfccd Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Nov 2014 10:55:39 +0100
Subject: [PATCH 560/616] Remove unused 2nd parameter of buildPath() and rename
 to getSourcePath()

---
 lib/private/files/storage/mappedlocal.php | 65 ++++++++++++-----------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index c232c0298b1..1b26e3ac0f9 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -31,7 +31,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function mkdir($path) {
-		return @mkdir($this->buildPath($path), 0777, true);
+		return @mkdir($this->getSourcePath($path), 0777, true);
 	}
 
 	public function rmdir($path) {
@@ -40,7 +40,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 		}
 		try {
 			$it = new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator($this->buildPath($path)),
+				new \RecursiveDirectoryIterator($this->getSourcePath($path)),
 				\RecursiveIteratorIterator::CHILD_FIRST
 			);
 			/**
@@ -64,7 +64,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 				}
 				$it->next();
 			}
-			if ($result = @rmdir($this->buildPath($path))) {
+			if ($result = @rmdir($this->getSourcePath($path))) {
 				$this->cleanMapper($path);
 			}
 			return $result;
@@ -75,7 +75,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 
 	public function opendir($path) {
 		$files = array('.', '..');
-		$physicalPath = $this->buildPath($path);
+		$physicalPath = $this->getSourcePath($path);
 
 		$logicalPath = $this->mapper->physicalToLogic($physicalPath);
 		$dh = opendir($physicalPath);
@@ -101,15 +101,15 @@ class MappedLocal extends \OC\Files\Storage\Common {
 		if (substr($path, -1) == '/') {
 			$path = substr($path, 0, -1);
 		}
-		return is_dir($this->buildPath($path));
+		return is_dir($this->getSourcePath($path));
 	}
 
 	public function is_file($path) {
-		return is_file($this->buildPath($path));
+		return is_file($this->getSourcePath($path));
 	}
 
 	public function stat($path) {
-		$fullPath = $this->buildPath($path);
+		$fullPath = $this->getSourcePath($path);
 		$statResult = stat($fullPath);
 		if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
 			$filesize = $this->filesize($path);
@@ -120,9 +120,9 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function filetype($path) {
-		$filetype = filetype($this->buildPath($path));
+		$filetype = filetype($this->getSourcePath($path));
 		if ($filetype == 'link') {
-			$filetype = filetype(realpath($this->buildPath($path)));
+			$filetype = filetype(realpath($this->getSourcePath($path)));
 		}
 		return $filetype;
 	}
@@ -131,7 +131,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 		if ($this->is_dir($path)) {
 			return 0;
 		}
-		$fullPath = $this->buildPath($path);
+		$fullPath = $this->getSourcePath($path);
 		if (PHP_INT_SIZE === 4) {
 			$helper = new \OC\LargeFileHelper;
 			return $helper->getFilesize($fullPath);
@@ -140,19 +140,19 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function isReadable($path) {
-		return is_readable($this->buildPath($path));
+		return is_readable($this->getSourcePath($path));
 	}
 
 	public function isUpdatable($path) {
-		return is_writable($this->buildPath($path));
+		return is_writable($this->getSourcePath($path));
 	}
 
 	public function file_exists($path) {
-		return file_exists($this->buildPath($path));
+		return file_exists($this->getSourcePath($path));
 	}
 
 	public function filemtime($path) {
-		return filemtime($this->buildPath($path));
+		return filemtime($this->getSourcePath($path));
 	}
 
 	public function touch($path, $mtime = null) {
@@ -160,23 +160,23 @@ class MappedLocal extends \OC\Files\Storage\Common {
 		// If mtime is nil the current time is set.
 		// note that the access time of the file always changes to the current time.
 		if (!is_null($mtime)) {
-			$result = touch($this->buildPath($path), $mtime);
+			$result = touch($this->getSourcePath($path), $mtime);
 		} else {
-			$result = touch($this->buildPath($path));
+			$result = touch($this->getSourcePath($path));
 		}
 		if ($result) {
-			clearstatcache(true, $this->buildPath($path));
+			clearstatcache(true, $this->getSourcePath($path));
 		}
 
 		return $result;
 	}
 
 	public function file_get_contents($path) {
-		return file_get_contents($this->buildPath($path));
+		return file_get_contents($this->getSourcePath($path));
 	}
 
 	public function file_put_contents($path, $data) {
-		return file_put_contents($this->buildPath($path), $data);
+		return file_put_contents($this->getSourcePath($path), $data);
 	}
 
 	public function unlink($path) {
@@ -208,8 +208,8 @@ class MappedLocal extends \OC\Files\Storage\Common {
 			$this->unlink($path2);
 		}
 
-		$physicPath1 = $this->buildPath($path1);
-		$physicPath2 = $this->buildPath($path2);
+		$physicPath1 = $this->getSourcePath($path1);
+		$physicPath2 = $this->getSourcePath($path2);
 		if ($return = rename($physicPath1, $physicPath2)) {
 			// mapper needs to create copies or all children
 			$this->copyMapping($path1, $path2);
@@ -237,7 +237,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 			closedir($dir);
 			return true;
 		} else {
-			if ($return = copy($this->buildPath($path1), $this->buildPath($path2))) {
+			if ($return = copy($this->getSourcePath($path1), $this->getSourcePath($path2))) {
 				$this->copyMapping($path1, $path2);
 			}
 			return $return;
@@ -245,7 +245,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function fopen($path, $mode) {
-		return fopen($this->buildPath($path), $mode);
+		return fopen($this->getSourcePath($path), $mode);
 	}
 
 	/**
@@ -256,7 +256,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	private function delTree($dir, $isLogicPath = true) {
 		$dirRelative = $dir;
 		if ($isLogicPath) {
-			$dir = $this->buildPath($dir);
+			$dir = $this->getSourcePath($dir);
 		}
 		if (!file_exists($dir)) {
 			return true;
@@ -288,11 +288,11 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function hash($type, $path, $raw = false) {
-		return hash_file($type, $this->buildPath($path), $raw);
+		return hash_file($type, $this->getSourcePath($path), $raw);
 	}
 
 	public function free_space($path) {
-		return @disk_free_space($this->buildPath($path));
+		return @disk_free_space($this->getSourcePath($path));
 	}
 
 	public function search($query) {
@@ -300,11 +300,11 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function getLocalFile($path) {
-		return $this->buildPath($path);
+		return $this->getSourcePath($path);
 	}
 
 	public function getLocalFolder($path) {
-		return $this->buildPath($path);
+		return $this->getSourcePath($path);
 	}
 
 	/**
@@ -312,7 +312,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	 */
 	protected function searchInDir($query, $dir = '') {
 		$files = array();
-		$physicalDir = $this->buildPath($dir);
+		$physicalDir = $this->getSourcePath($dir);
 		foreach (scandir($physicalDir) as $item) {
 			if ($item == '.' || $item == '..')
 				continue;
@@ -341,14 +341,15 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	/**
+	 * Get the source path (on disk) of a given path
+	 *
 	 * @param string $path
-	 * @param bool $create
 	 * @return string
 	 */
-	private function buildPath($path, $create = true) {
+	protected function getSourcePath($path) {
 		$path = $this->stripLeading($path);
 		$fullPath = $this->datadir . $path;
-		return $this->mapper->logicToPhysical($fullPath, $create);
+		return $this->mapper->logicToPhysical($fullPath, true);
 	}
 
 	/**
-- 
GitLab


From 24511c6f00a9cf7fe86a13d1d006537c1f8410ca Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 12:04:59 +0100
Subject: [PATCH 561/616] Move OC_GROUP_BACKEND_* constants to OC_Group_Backend
 class

---
 lib/private/group/backend.php   | 32 +++++++++++++++++++++++++++-----
 lib/private/group/group.php     |  8 ++++----
 lib/private/group/interface.php |  2 +-
 lib/private/group/manager.php   |  2 +-
 4 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/lib/private/group/backend.php b/lib/private/group/backend.php
index ab694268bb3..9348463a53c 100644
--- a/lib/private/group/backend.php
+++ b/lib/private/group/backend.php
@@ -23,29 +23,51 @@
 
 /**
  * error code for functions not provided by the group backend
+ * @deprecated Use \OC_Group_Backend::NOT_IMPLEMENTED instead
  */
 define('OC_GROUP_BACKEND_NOT_IMPLEMENTED',   -501);
 
 /**
  * actions that user backends can define
  */
+/** @deprecated Use \OC_Group_Backend::CREATE_GROUP instead */
 define('OC_GROUP_BACKEND_CREATE_GROUP',      0x00000001);
+/** @deprecated Use \OC_Group_Backend::DELETE_GROUP instead */
 define('OC_GROUP_BACKEND_DELETE_GROUP',      0x00000010);
+/** @deprecated Use \OC_Group_Backend::ADD_TO_GROUP instead */
 define('OC_GROUP_BACKEND_ADD_TO_GROUP',      0x00000100);
+/** @deprecated Use \OC_Group_Backend::REMOVE_FROM_GOUP instead */
 define('OC_GROUP_BACKEND_REMOVE_FROM_GOUP',  0x00001000);
+/** @deprecated Obsolete */
 define('OC_GROUP_BACKEND_GET_DISPLAYNAME',   0x00010000); //OBSOLETE
+/** @deprecated Use \OC_Group_Backend::COUNT_USERS instead */
 define('OC_GROUP_BACKEND_COUNT_USERS',       0x00100000);
 
 /**
  * Abstract base class for user management
  */
 abstract class OC_Group_Backend implements OC_Group_Interface {
+	/**
+	 * error code for functions not provided by the group backend
+	 */
+	const NOT_IMPLEMENTED = -501;
+
+	/**
+	 * actions that user backends can define
+	 */
+	const CREATE_GROUP		= 0x00000001;
+	const DELETE_GROUP		= 0x00000010;
+	const ADD_TO_GROUP		= 0x00000100;
+	const REMOVE_FROM_GOUP	= 0x00001000;
+	//OBSOLETE const GET_DISPLAYNAME	= 0x00010000;
+	const COUNT_USERS		= 0x00100000;
+
 	protected $possibleActions = array(
-		OC_GROUP_BACKEND_CREATE_GROUP => 'createGroup',
-		OC_GROUP_BACKEND_DELETE_GROUP => 'deleteGroup',
-		OC_GROUP_BACKEND_ADD_TO_GROUP => 'addToGroup',
-		OC_GROUP_BACKEND_REMOVE_FROM_GOUP => 'removeFromGroup',
-		OC_GROUP_BACKEND_COUNT_USERS => 'countUsersInGroup',
+		self::CREATE_GROUP => 'createGroup',
+		self::DELETE_GROUP => 'deleteGroup',
+		self::ADD_TO_GROUP => 'addToGroup',
+		self::REMOVE_FROM_GOUP => 'removeFromGroup',
+		self::COUNT_USERS => 'countUsersInGroup',
 	);
 
 	/**
diff --git a/lib/private/group/group.php b/lib/private/group/group.php
index 6f8b84dff1a..6111051ea09 100644
--- a/lib/private/group/group.php
+++ b/lib/private/group/group.php
@@ -118,7 +118,7 @@ class Group implements IGroup {
 			$this->emitter->emit('\OC\Group', 'preAddUser', array($this, $user));
 		}
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(OC_GROUP_BACKEND_ADD_TO_GROUP)) {
+			if ($backend->implementsActions(\OC_Group_Backend::ADD_TO_GROUP)) {
 				$backend->addToGroup($user->getUID(), $this->gid);
 				if ($this->users) {
 					$this->users[$user->getUID()] = $user;
@@ -142,7 +142,7 @@ class Group implements IGroup {
 			$this->emitter->emit('\OC\Group', 'preRemoveUser', array($this, $user));
 		}
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(OC_GROUP_BACKEND_REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) {
+			if ($backend->implementsActions(\OC_Group_Backend::REMOVE_FROM_GOUP) and $backend->inGroup($user->getUID(), $this->gid)) {
 				$backend->removeFromGroup($user->getUID(), $this->gid);
 				$result = true;
 			}
@@ -191,7 +191,7 @@ class Group implements IGroup {
 	public function count($search = '') {
 		$users = false;
 		foreach ($this->backends as $backend) {
-			if($backend->implementsActions(OC_GROUP_BACKEND_COUNT_USERS)) {
+			if($backend->implementsActions(\OC_Group_Backend::COUNT_USERS)) {
 				if($users === false) {
 					//we could directly add to a bool variable, but this would
 					//be ugly
@@ -234,7 +234,7 @@ class Group implements IGroup {
 			$this->emitter->emit('\OC\Group', 'preDelete', array($this));
 		}
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(OC_GROUP_BACKEND_DELETE_GROUP)) {
+			if ($backend->implementsActions(\OC_Group_Backend::DELETE_GROUP)) {
 				$result = true;
 				$backend->deleteGroup($this->gid);
 			}
diff --git a/lib/private/group/interface.php b/lib/private/group/interface.php
index ee5c2d635d6..ee2d718e5dd 100644
--- a/lib/private/group/interface.php
+++ b/lib/private/group/interface.php
@@ -28,7 +28,7 @@ interface OC_Group_Interface {
 	* @return boolean
 	*
 	* Returns the supported actions as int to be
-	* compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
+	* compared with \OC_Group_Backend::CREATE_GROUP etc.
 	*/
 	public function implementsActions($actions);
 
diff --git a/lib/private/group/manager.php b/lib/private/group/manager.php
index 417be79ab30..be7bf972693 100644
--- a/lib/private/group/manager.php
+++ b/lib/private/group/manager.php
@@ -134,7 +134,7 @@ class Manager extends PublicEmitter implements IGroupManager {
 		} else {
 			$this->emit('\OC\Group', 'preCreate', array($gid));
 			foreach ($this->backends as $backend) {
-				if ($backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP)) {
+				if ($backend->implementsActions(\OC_Group_Backend::CREATE_GROUP)) {
 					$backend->createGroup($gid);
 					$group = $this->getGroupObject($gid);
 					$this->emit('\OC\Group', 'postCreate', array($group));
-- 
GitLab


From 0ed86c099319f856569ed19697685c43a456ee52 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 12:17:28 +0100
Subject: [PATCH 562/616] Move OC_USER_BACKEND_* constants to OC_User_Backend
 class

---
 lib/private/user/backend.php   | 45 ++++++++++++++++++++++++++--------
 lib/private/user/interface.php |  4 +--
 lib/private/user/manager.php   |  6 ++---
 lib/private/user/user.php      | 14 +++++------
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/lib/private/user/backend.php b/lib/private/user/backend.php
index 1f0a524117d..5e0eef4771a 100644
--- a/lib/private/user/backend.php
+++ b/lib/private/user/backend.php
@@ -25,19 +25,28 @@
 
 /**
  * error code for functions not provided by the user backend
+ * @deprecated Use \OC_User_Backend::NOT_IMPLEMENTED instead
  */
 define('OC_USER_BACKEND_NOT_IMPLEMENTED',   -501);
 
 /**
  * actions that user backends can define
  */
+/** @deprecated Use \OC_User_Backend::CREATE_USER instead */
 define('OC_USER_BACKEND_CREATE_USER',       1 << 0);
+/** @deprecated Use \OC_User_Backend::SET_PASSWORD instead */
 define('OC_USER_BACKEND_SET_PASSWORD',      1 << 4);
+/** @deprecated Use \OC_User_Backend::CHECK_PASSWORD instead */
 define('OC_USER_BACKEND_CHECK_PASSWORD',    1 << 8);
+/** @deprecated Use \OC_User_Backend::GET_HOME instead */
 define('OC_USER_BACKEND_GET_HOME',          1 << 12);
+/** @deprecated Use \OC_User_Backend::GET_DISPLAYNAME instead */
 define('OC_USER_BACKEND_GET_DISPLAYNAME',   1 << 16);
+/** @deprecated Use \OC_User_Backend::SET_DISPLAYNAME instead */
 define('OC_USER_BACKEND_SET_DISPLAYNAME',   1 << 20);
+/** @deprecated Use \OC_User_Backend::PROVIDE_AVATAR instead */
 define('OC_USER_BACKEND_PROVIDE_AVATAR',    1 << 24);
+/** @deprecated Use \OC_User_Backend::COUNT_USERS instead */
 define('OC_USER_BACKEND_COUNT_USERS',       1 << 28);
 
 /**
@@ -47,16 +56,32 @@ define('OC_USER_BACKEND_COUNT_USERS',       1 << 28);
  * Subclass this for your own backends, and see OC_User_Example for descriptions
  */
 abstract class OC_User_Backend implements OC_User_Interface {
+	/**
+	 * error code for functions not provided by the user backend
+	 */
+	const NOT_IMPLEMENTED = -501;
+
+	/**
+	 * actions that user backends can define
+	 */
+	const CREATE_USER		= 1;			// 1 << 0
+	const SET_PASSWORD		= 16;			// 1 << 4
+	const CHECK_PASSWORD	= 256;			// 1 << 8
+	const GET_HOME			= 4096;			// 1 << 12
+	const GET_DISPLAYNAME	= 65536;		// 1 << 16
+	const SET_DISPLAYNAME	= 1048576;		// 1 << 20
+	const PROVIDE_AVATAR	= 16777216;		// 1 << 24
+	const COUNT_USERS		= 268435456;	// 1 << 28
 
 	protected $possibleActions = array(
-		OC_USER_BACKEND_CREATE_USER => 'createUser',
-		OC_USER_BACKEND_SET_PASSWORD => 'setPassword',
-		OC_USER_BACKEND_CHECK_PASSWORD => 'checkPassword',
-		OC_USER_BACKEND_GET_HOME => 'getHome',
-		OC_USER_BACKEND_GET_DISPLAYNAME => 'getDisplayName',
-		OC_USER_BACKEND_SET_DISPLAYNAME => 'setDisplayName',
-		OC_USER_BACKEND_PROVIDE_AVATAR => 'canChangeAvatar',
-		OC_USER_BACKEND_COUNT_USERS => 'countUsers',
+		self::CREATE_USER => 'createUser',
+		self::SET_PASSWORD => 'setPassword',
+		self::CHECK_PASSWORD => 'checkPassword',
+		self::GET_HOME => 'getHome',
+		self::GET_DISPLAYNAME => 'getDisplayName',
+		self::SET_DISPLAYNAME => 'setDisplayName',
+		self::PROVIDE_AVATAR => 'canChangeAvatar',
+		self::COUNT_USERS => 'countUsers',
 	);
 
 	/**
@@ -64,7 +89,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	* @return int bitwise-or'ed actions
 	*
 	* Returns the supported actions as int to be
-	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	* compared with self::CREATE_USER etc.
 	*/
 	public function getSupportedActions() {
 		$actions = 0;
@@ -83,7 +108,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	* @return boolean
 	*
 	* Returns the supported actions as int to be
-	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	* compared with self::CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
 		return (bool)($this->getSupportedActions() & $actions);
diff --git a/lib/private/user/interface.php b/lib/private/user/interface.php
index 4cdc47479a3..624d36e6fe5 100644
--- a/lib/private/user/interface.php
+++ b/lib/private/user/interface.php
@@ -25,11 +25,11 @@ interface OC_User_Interface {
 
 	/**
 	* Check if backend implements actions
-	* @param $actions bitwise-or'ed actions
+	* @param int $actions bitwise-or'ed actions
 	* @return boolean
 	*
 	* Returns the supported actions as int to be
-	* compared with OC_USER_BACKEND_CREATE_USER etc.
+	* compared with \OC_User_Backend::CREATE_USER etc.
 	*/
 	public function implementsActions($actions);
 
diff --git a/lib/private/user/manager.php b/lib/private/user/manager.php
index 4d1612a35ce..0c01f957bd3 100644
--- a/lib/private/user/manager.php
+++ b/lib/private/user/manager.php
@@ -143,7 +143,7 @@ class Manager extends PublicEmitter implements IUserManager {
 	 */
 	public function checkPassword($loginname, $password) {
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC_USER_BACKEND_CHECK_PASSWORD)) {
+			if ($backend->implementsActions(\OC_User_Backend::CHECK_PASSWORD)) {
 				$uid = $backend->checkPassword($loginname, $password);
 				if ($uid !== false) {
 					return $this->getUserObject($uid, $backend);
@@ -246,7 +246,7 @@ class Manager extends PublicEmitter implements IUserManager {
 
 		$this->emit('\OC\User', 'preCreateUser', array($uid, $password));
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC_USER_BACKEND_CREATE_USER)) {
+			if ($backend->implementsActions(\OC_User_Backend::CREATE_USER)) {
 				$backend->createUser($uid, $password);
 				$user = $this->getUserObject($uid, $backend);
 				$this->emit('\OC\User', 'postCreateUser', array($user, $password));
@@ -264,7 +264,7 @@ class Manager extends PublicEmitter implements IUserManager {
 	public function countUsers() {
 		$userCountStatistics = array();
 		foreach ($this->backends as $backend) {
-			if ($backend->implementsActions(\OC_USER_BACKEND_COUNT_USERS)) {
+			if ($backend->implementsActions(\OC_User_Backend::COUNT_USERS)) {
 				$backendusers = $backend->countUsers();
 				if($backendusers !== false) {
 					if(isset($userCountStatistics[get_class($backend)])) {
diff --git a/lib/private/user/user.php b/lib/private/user/user.php
index 729abdc6227..9ad2f5f0d3a 100644
--- a/lib/private/user/user.php
+++ b/lib/private/user/user.php
@@ -90,7 +90,7 @@ class User implements IUser {
 	public function getDisplayName() {
 		if (!isset($this->displayName)) {
 			$displayName = '';
-			if ($this->backend and $this->backend->implementsActions(OC_USER_BACKEND_GET_DISPLAYNAME)) {
+			if ($this->backend and $this->backend->implementsActions(\OC_User_Backend::GET_DISPLAYNAME)) {
 				// get display name and strip whitespace from the beginning and end of it
 				$backendDisplayName = $this->backend->getDisplayName($this->uid);
 				if (is_string($backendDisplayName)) {
@@ -115,7 +115,7 @@ class User implements IUser {
 	 */
 	public function setDisplayName($displayName) {
 		$displayName = trim($displayName);
-		if ($this->backend->implementsActions(\OC_USER_BACKEND_SET_DISPLAYNAME) && !empty($displayName)) {
+		if ($this->backend->implementsActions(\OC_User_Backend::SET_DISPLAYNAME) && !empty($displayName)) {
 			$this->displayName = $displayName;
 			$result = $this->backend->setDisplayName($this->uid, $displayName);
 			return $result !== false;
@@ -170,7 +170,7 @@ class User implements IUser {
 		if ($this->emitter) {
 			$this->emitter->emit('\OC\User', 'preSetPassword', array($this, $password, $recoveryPassword));
 		}
-		if ($this->backend->implementsActions(\OC_USER_BACKEND_SET_PASSWORD)) {
+		if ($this->backend->implementsActions(\OC_User_Backend::SET_PASSWORD)) {
 			$result = $this->backend->setPassword($this->uid, $password);
 			if ($this->emitter) {
 				$this->emitter->emit('\OC\User', 'postSetPassword', array($this, $password, $recoveryPassword));
@@ -188,7 +188,7 @@ class User implements IUser {
 	 */
 	public function getHome() {
 		if (!$this->home) {
-			if ($this->backend->implementsActions(\OC_USER_BACKEND_GET_HOME) and $home = $this->backend->getHome($this->uid)) {
+			if ($this->backend->implementsActions(\OC_User_Backend::GET_HOME) and $home = $this->backend->getHome($this->uid)) {
 				$this->home = $home;
 			} elseif ($this->config) {
 				$this->home = $this->config->getSystemValue('datadirectory') . '/' . $this->uid;
@@ -205,7 +205,7 @@ class User implements IUser {
 	 * @return bool
 	 */
 	public function canChangeAvatar() {
-		if ($this->backend->implementsActions(\OC_USER_BACKEND_PROVIDE_AVATAR)) {
+		if ($this->backend->implementsActions(\OC_User_Backend::PROVIDE_AVATAR)) {
 			return $this->backend->canChangeAvatar($this->uid);
 		}
 		return true;
@@ -217,7 +217,7 @@ class User implements IUser {
 	 * @return bool
 	 */
 	public function canChangePassword() {
-		return $this->backend->implementsActions(\OC_USER_BACKEND_SET_PASSWORD);
+		return $this->backend->implementsActions(\OC_User_Backend::SET_PASSWORD);
 	}
 
 	/**
@@ -229,7 +229,7 @@ class User implements IUser {
 		if ($this->config and $this->config->getSystemValue('allow_user_to_change_display_name') === false) {
 			return false;
 		} else {
-			return $this->backend->implementsActions(\OC_USER_BACKEND_SET_DISPLAYNAME);
+			return $this->backend->implementsActions(\OC_User_Backend::SET_DISPLAYNAME);
 		}
 	}
 
-- 
GitLab


From 048139074df674d0ac82da12357d3934af3abc2e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 27 Nov 2014 14:19:00 +0100
Subject: [PATCH 563/616] Add functions to modify cookies to response class

Currently there is no AppFramework way to modify cookies, which makes it unusable for quite some use-cases or results in untestable code.

This PR adds some basic functionalities to add and invalidate cookies.

Usage:
```php
$response = new TemplateResponse(...);
$response->addCookie('foo', 'bar');
$response->invalidateCookie('foo');
$response->addCookie('bar', 'foo', new \DateTime('2015-01-01 00:00'));
```

Existing cookies can be accessed with the AppFramework using `$this->request->getCookie($name)`.
---
 lib/private/appframework/app.php              | 10 ++-
 lib/private/appframework/http/dispatcher.php  |  8 +-
 lib/public/appframework/http/response.php     | 73 ++++++++++++++--
 tests/lib/appframework/AppTest.php            |  2 +-
 .../lib/appframework/http/DispatcherTest.php  | 16 ++--
 tests/lib/appframework/http/ResponseTest.php  | 86 +++++++++++++++++++
 6 files changed, 177 insertions(+), 18 deletions(-)

diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index baf52d02054..074b6cc3fd2 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -53,7 +53,7 @@ class App {
 		// initialize the dispatcher and run all the middleware before the controller
 		$dispatcher = $container['Dispatcher'];
 
-		list($httpHeaders, $responseHeaders, $output) =
+		list($httpHeaders, $responseHeaders, $responseCookies, $output) =
 			$dispatcher->dispatch($controller, $methodName);
 
 		if(!is_null($httpHeaders)) {
@@ -64,6 +64,14 @@ class App {
 			header($name . ': ' . $value);
 		}
 
+		foreach($responseCookies as $name => $value) {
+			$expireDate = null;
+			if($value['expireDate'] instanceof \DateTime) {
+				$expireDate = $value['expireDate']->getTimestamp();
+			}
+			setcookie($name, $value['value'], $expireDate, \OC::$WEBROOT, null, \OC::$server->getConfig()->getSystemValue('forcessl', false), true);
+		}
+
 		if(!is_null($output)) {
 			header('Content-Length: ' . strlen($output));
 			print($output);
diff --git a/lib/private/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
index 29a661d5743..24540ef3c94 100644
--- a/lib/private/appframework/http/dispatcher.php
+++ b/lib/private/appframework/http/dispatcher.php
@@ -48,7 +48,7 @@ class Dispatcher {
 	 * @param Http $protocol the http protocol with contains all status headers
 	 * @param MiddlewareDispatcher $middlewareDispatcher the dispatcher which
 	 * runs the middleware
-	 * @param ControllerMethodReflector the reflector that is used to inject
+	 * @param ControllerMethodReflector $reflector the reflector that is used to inject
 	 * the arguments for the controller
 	 * @param IRequest $request the incoming request
 	 */
@@ -71,6 +71,7 @@ class Dispatcher {
 	 * @return array $array[0] contains a string with the http main header,
 	 * $array[1] contains headers in the form: $key => value, $array[2] contains
 	 * the response output
+	 * @throws \Exception
 	 */
 	public function dispatch(Controller $controller, $methodName) {
 		$out = array(null, array(), null);
@@ -102,13 +103,14 @@ class Dispatcher {
 		// get the output which should be printed and run the after output
 		// middleware to modify the response
 		$output = $response->render();
-		$out[2] = $this->middlewareDispatcher->beforeOutput(
+		$out[3] = $this->middlewareDispatcher->beforeOutput(
 			$controller, $methodName, $output);
 
 		// depending on the cache object the headers need to be changed
 		$out[0] = $this->protocol->getStatusHeader($response->getStatus(),
 			$response->getLastModified(), $response->getETag());
-		$out[1] = $response->getHeaders();
+		$out[1] = array_merge($response->getHeaders());
+		$out[2] = $response->getCookies();
 
 		return $out;
 	}
diff --git a/lib/public/appframework/http/response.php b/lib/public/appframework/http/response.php
index 354911fee21..67e72cff6d9 100644
--- a/lib/public/appframework/http/response.php
+++ b/lib/public/appframework/http/response.php
@@ -45,9 +45,16 @@ class Response {
 	);
 
 
+	/**
+	 * Cookies that will be need to be constructed as header
+	 * @var array
+	 */
+	private $cookies = array();
+
+
 	/**
 	 * HTTP status code - defaults to STATUS OK
-	 * @var string
+	 * @var int
 	 */
 	private $status = Http::STATUS_OK;
 
@@ -70,6 +77,7 @@ class Response {
 	 * Caches the response
 	 * @param int $cacheSeconds the amount of seconds that should be cached
 	 * if 0 then caching will be disabled
+	 * @return $this
 	 */
 	public function cacheFor($cacheSeconds) {
 
@@ -83,13 +91,68 @@ class Response {
 		return $this;
 	}
 
+	/**
+	 * Adds a new cookie to the response
+	 * @param string $name The name of the cookie
+	 * @param string $value The value of the cookie
+	 * @param \DateTime|null $expireDate Date on that the cookie should expire, if set
+	 * 									to null cookie will be considered as session
+	 * 									cookie.
+	 * @return $this
+	 */
+	public function addCookie($name, $value, \DateTime $expireDate = null) {
+		$this->cookies[$name] = array('value' => $value, 'expireDate' => $expireDate);
+		return $this;
+	}
+
+
+	/**
+	 * Set the specified cookies
+	 * @param array $cookies array('foo' => array('value' => 'bar', 'expire' => null))
+	 * @return $this
+	 */
+	public function setCookies(array $cookies) {
+		$this->cookies = $cookies;
+		return $this;
+	}
+
+
+	/**
+	 * Invalidates the specified cookie
+	 * @param string $name
+	 * @return $this
+	 */
+	public function invalidateCookie($name) {
+		$this->addCookie($name, 'expired', new \DateTime('1971-01-01 00:00'));
+		return $this;
+	}
+
+	/**
+	 * Invalidates the specified cookies
+	 * @param array $cookieNames array('foo', 'bar')
+	 * @return $this
+	 */
+	public function invalidateCookies(array $cookieNames) {
+		foreach($cookieNames as $cookieName) {
+			$this->invalidateCookie($cookieName);
+		}
+		return $this;
+	}
+
+	/**
+	 * Returns the cookies
+	 * @return array
+	 */
+	public function getCookies() {
+		return $this->cookies;
+	}
 
 	/**
 	 * Adds a new header to the response that will be called before the render
 	 * function
 	 * @param string $name The name of the HTTP header
 	 * @param string $value The value, null will delete it
-	 * @return Response Reference to this object
+	 * @return $this
 	 */
 	public function addHeader($name, $value) {
 		$name = trim($name);  // always remove leading and trailing whitespace
@@ -108,10 +171,10 @@ class Response {
 
 	/**
 	 * Set the headers
-	 * @param array key value header pairs
-	 * @return Response Reference to this object
+	 * @param array $headers value header pairs
+	 * @return $this
 	 */
-	public function setHeaders($headers) {
+	public function setHeaders(array $headers) {
 		$this->headers = $headers;
 
 		return $this;
diff --git a/tests/lib/appframework/AppTest.php b/tests/lib/appframework/AppTest.php
index bd565e9765e..86128db118f 100644
--- a/tests/lib/appframework/AppTest.php
+++ b/tests/lib/appframework/AppTest.php
@@ -63,7 +63,7 @@ class AppTest extends \Test\TestCase {
 
 
 	public function testControllerNameAndMethodAreBeingPassed(){
-		$return = array(null, array(), null);
+		$return = array(null, array(), array(), null);
 		$this->dispatcher->expects($this->once())
 			->method('dispatch')
 			->with($this->equalTo($this->controller),
diff --git a/tests/lib/appframework/http/DispatcherTest.php b/tests/lib/appframework/http/DispatcherTest.php
index f92e7161e6b..45ebd6fce96 100644
--- a/tests/lib/appframework/http/DispatcherTest.php
+++ b/tests/lib/appframework/http/DispatcherTest.php
@@ -227,7 +227,7 @@ class DispatcherTest extends \Test\TestCase {
 
 		$this->assertEquals($httpHeaders, $response[0]);
 		$this->assertEquals($responseHeaders, $response[1]);
-		$this->assertEquals($out, $response[2]);
+		$this->assertEquals($out, $response[3]);
 	}
 
 
@@ -246,7 +246,7 @@ class DispatcherTest extends \Test\TestCase {
 
 		$this->assertEquals($httpHeaders, $response[0]);
 		$this->assertEquals($responseHeaders, $response[1]);
-		$this->assertEquals($out, $response[2]);
+		$this->assertEquals($out, $response[3]);
 	}
 
 
@@ -301,7 +301,7 @@ class DispatcherTest extends \Test\TestCase {
 		$this->dispatcherPassthrough();
 		$response = $this->dispatcher->dispatch($controller, 'exec');
 
-		$this->assertEquals('[3,true,4,1]', $response[2]);
+		$this->assertEquals('[3,true,4,1]', $response[3]);
 	}
 
 
@@ -324,7 +324,7 @@ class DispatcherTest extends \Test\TestCase {
 		$this->dispatcherPassthrough();
 		$response = $this->dispatcher->dispatch($controller, 'exec');
 
-		$this->assertEquals('[3,true,4,7]', $response[2]);
+		$this->assertEquals('[3,true,4,7]', $response[3]);
 	}
 
 
@@ -350,7 +350,7 @@ class DispatcherTest extends \Test\TestCase {
 		$this->dispatcherPassthrough();
 		$response = $this->dispatcher->dispatch($controller, 'exec');
 
-		$this->assertEquals('{"text":[3,false,4,1]}', $response[2]);
+		$this->assertEquals('{"text":[3,false,4,1]}', $response[3]);
 	}
 
 
@@ -375,7 +375,7 @@ class DispatcherTest extends \Test\TestCase {
 		$this->dispatcherPassthrough();
 		$response = $this->dispatcher->dispatch($controller, 'execDataResponse');
 
-		$this->assertEquals('{"text":[3,false,4,1]}', $response[2]);
+		$this->assertEquals('{"text":[3,false,4,1]}', $response[3]);
 	}
 
 
@@ -401,7 +401,7 @@ class DispatcherTest extends \Test\TestCase {
 		$this->dispatcherPassthrough();
 		$response = $this->dispatcher->dispatch($controller, 'exec');
 
-		$this->assertEquals('{"text":[3,false,4,1]}', $response[2]);
+		$this->assertEquals('{"text":[3,false,4,1]}', $response[3]);
 	}
 
 
@@ -429,7 +429,7 @@ class DispatcherTest extends \Test\TestCase {
 		$this->dispatcherPassthrough();
 		$response = $this->dispatcher->dispatch($controller, 'exec');
 
-		$this->assertEquals('{"text":[3,true,4,1]}', $response[2]);
+		$this->assertEquals('{"text":[3,true,4,1]}', $response[3]);
 	}
 
 
diff --git a/tests/lib/appframework/http/ResponseTest.php b/tests/lib/appframework/http/ResponseTest.php
index 04e19fdaf71..b4352348bae 100644
--- a/tests/lib/appframework/http/ResponseTest.php
+++ b/tests/lib/appframework/http/ResponseTest.php
@@ -76,6 +76,92 @@ class ResponseTest extends \Test\TestCase {
 	}
 
 
+	public function testAddCookie() {
+		$this->childResponse->addCookie('foo', 'bar');
+		$this->childResponse->addCookie('bar', 'foo', new \DateTime('1970-01-01'));
+
+		$expectedResponse = array(
+			'foo' => array(
+				'value' => 'bar',
+				'expireDate' => null,
+			),
+			'bar' => array(
+				'value' => 'foo',
+				'expireDate' => new \DateTime('1970-01-01')
+			)
+		);
+		$this->assertEquals($expectedResponse, $this->childResponse->getCookies());
+	}
+
+
+	function testSetCookies() {
+		$expected = array(
+			'foo' => array(
+				'value' => 'bar',
+				'expireDate' => null,
+			),
+			'bar' => array(
+				'value' => 'foo',
+				'expireDate' => new \DateTime('1970-01-01')
+			)
+		);
+
+		$this->childResponse->setCookies($expected);
+		$cookies = $this->childResponse->getCookies();
+
+		$this->assertEquals($expected, $cookies);
+	}
+
+
+	function testInvalidateCookie() {
+		$this->childResponse->addCookie('foo', 'bar');
+		$this->childResponse->invalidateCookie('foo');
+		$expected = array(
+			'foo' => array(
+				'value' => 'expired',
+				'expireDate' => new \DateTime('1971-01-01')
+			)
+		);
+
+		$cookies = $this->childResponse->getCookies();
+
+		$this->assertEquals($expected, $cookies);
+	}
+
+
+	function testInvalidateCookies() {
+		$this->childResponse->addCookie('foo', 'bar');
+		$this->childResponse->addCookie('bar', 'foo');
+		$expected = array(
+			'foo' => array(
+				'value' => 'bar',
+				'expireDate' => null
+			),
+			'bar' => array(
+				'value' => 'foo',
+				'expireDate' => null
+			)
+		);
+		$cookies = $this->childResponse->getCookies();
+		$this->assertEquals($expected, $cookies);
+
+		$this->childResponse->invalidateCookies(array('foo', 'bar'));
+		$expected = array(
+			'foo' => array(
+				'value' => 'expired',
+				'expireDate' => new \DateTime('1971-01-01')
+			),
+			'bar' => array(
+				'value' => 'expired',
+				'expireDate' => new \DateTime('1971-01-01')
+			)
+		);
+
+		$cookies = $this->childResponse->getCookies();
+		$this->assertEquals($expected, $cookies);
+	}
+
+
 	public function testRenderReturnNullByDefault(){
 		$this->assertEquals(null, $this->childResponse->render());
 	}
-- 
GitLab


From d197f434757c9c21d813584122329b774487f15e Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 27 Nov 2014 14:36:11 +0100
Subject: [PATCH 564/616] Use server container

---
 lib/private/appframework/app.php | 2 +-
 lib/private/server.php           | 9 +++++++++
 lib/public/iservercontainer.php  | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/private/appframework/app.php b/lib/private/appframework/app.php
index 074b6cc3fd2..f56ba4af870 100644
--- a/lib/private/appframework/app.php
+++ b/lib/private/appframework/app.php
@@ -69,7 +69,7 @@ class App {
 			if($value['expireDate'] instanceof \DateTime) {
 				$expireDate = $value['expireDate']->getTimestamp();
 			}
-			setcookie($name, $value['value'], $expireDate, \OC::$WEBROOT, null, \OC::$server->getConfig()->getSystemValue('forcessl', false), true);
+			setcookie($name, $value['value'], $expireDate, $container->getServer()->getWebRoot(), null, $container->getServer()->getConfig()->getSystemValue('forcessl', false), true);
 		}
 
 		if(!is_null($output)) {
diff --git a/lib/private/server.php b/lib/private/server.php
index c413ee8bf6d..e28e8362796 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -631,4 +631,13 @@ class Server extends SimpleContainer implements IServerContainer {
 	function getAppManager() {
 		return $this->query('AppManager');
 	}
+
+	/**
+	 * Get the webroot
+	 *
+	 * @return string
+	 */
+	function getWebRoot() {
+		return \OC::$WEBROOT;
+	}
 }
diff --git a/lib/public/iservercontainer.php b/lib/public/iservercontainer.php
index b734d1b4161..301f47c68fa 100644
--- a/lib/public/iservercontainer.php
+++ b/lib/public/iservercontainer.php
@@ -298,4 +298,11 @@ interface IServerContainer {
 	 * @return \OCP\App\IAppManager
 	 */
 	function getAppManager();
+
+	/**
+	 * Get the webroot
+	 *
+	 * @return string
+	 */
+	function getWebRoot();
 }
-- 
GitLab


From fef32e63ddd706a13c48111dd5b0792703becc78 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 27 Nov 2014 14:38:38 +0100
Subject: [PATCH 565/616] Remove redundant code

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

diff --git a/lib/private/server.php b/lib/private/server.php
index e28e8362796..328a2e05cae 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -33,15 +33,15 @@ class Server extends SimpleContainer implements IServerContainer {
 		$this->registerService('ContactsManager', function ($c) {
 			return new ContactsManager();
 		});
-		$this->registerService('Request', function ($c) {
+		$this->registerService('Request', function (Server $c) {
 			if (isset($c['urlParams'])) {
 				$urlParams = $c['urlParams'];
 			} else {
 				$urlParams = array();
 			}
 
-			if (\OC::$server->getSession()->exists('requesttoken')) {
-				$requestToken = \OC::$server->getSession()->get('requesttoken');
+			if ($c->getSession()->exists('requesttoken')) {
+				$requestToken = $c->getSession()->get('requesttoken');
 			} else {
 				$requestToken = false;
 			}
-- 
GitLab


From e35feadac2ed68f0aad911713cb3d5f8725707e6 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Thu, 27 Nov 2014 14:50:14 +0100
Subject: [PATCH 566/616] Pass \OC::$WEBROOT to the ctr

---
 lib/base.php           |  2 +-
 lib/private/server.php | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 5c33be351a4..cd5d8feb1f6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -466,7 +466,7 @@ class OC {
 		}
 
 		// setup the basic server
-		self::$server = new \OC\Server();
+		self::$server = new \OC\Server(\OC::$WEBROOT);
 		\OC::$server->getEventLogger()->log('autoloader', 'Autoloader', $loaderStart, $loaderEnd);
 		\OC::$server->getEventLogger()->start('boot', 'Initialize');
 
diff --git a/lib/private/server.php b/lib/private/server.php
index 328a2e05cae..59ca2a244d6 100644
--- a/lib/private/server.php
+++ b/lib/private/server.php
@@ -29,7 +29,15 @@ use OC\Tagging\TagMapper;
  * TODO: hookup all manager classes
  */
 class Server extends SimpleContainer implements IServerContainer {
-	function __construct() {
+	/** @var string */
+	private $webRoot;
+
+	/**
+	 * @param string $webRoot
+	 */
+	function __construct($webRoot) {
+		$this->webRoot = $webRoot;
+
 		$this->registerService('ContactsManager', function ($c) {
 			return new ContactsManager();
 		});
@@ -233,8 +241,7 @@ class Server extends SimpleContainer implements IServerContainer {
 				return new NullQueryLogger();
 			}
 		});
-		$this->registerService('TempManager', function ($c) {
-			/** @var Server $c */
+		$this->registerService('TempManager', function (Server $c) {
 			return new TempManager(get_temp_dir(), $c->getLogger());
 		});
 		$this->registerService('AppManager', function(Server $c) {
@@ -638,6 +645,6 @@ class Server extends SimpleContainer implements IServerContainer {
 	 * @return string
 	 */
 	function getWebRoot() {
-		return \OC::$WEBROOT;
+		return $this->webRoot;
 	}
 }
-- 
GitLab


From b886d3d645eef8f40c38daebd250b56ae035f37a Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Nov 2014 11:39:58 +0100
Subject: [PATCH 567/616] Make MappedLocal::isLocal() true like for Local

Missed in 788c8540aa6aac50795c37b088eeaa561d44b86c
---
 lib/private/files/storage/mappedlocal.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 1b26e3ac0f9..d749e0e9d54 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -352,6 +352,13 @@ class MappedLocal extends \OC\Files\Storage\Common {
 		return $this->mapper->logicToPhysical($fullPath, true);
 	}
 
+	/**
+	 * {@inheritdoc}
+	 */
+	public function isLocal() {
+		return true;
+	}
+
 	/**
 	 * @param string $path
 	 * @return string
-- 
GitLab


From 1062f4fe44229ad186df35729487d3d0f6785682 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Nov 2014 11:41:11 +0100
Subject: [PATCH 568/616] Check file existance in MappedLocal in hasUpdated()

Only fixed in Local by eeee9eacea333035e22ef3ed938e36f56bc762cd
---
 lib/private/files/storage/mappedlocal.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index d749e0e9d54..6745dad77f2 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -337,7 +337,11 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	 * @return bool
 	 */
 	public function hasUpdated($path, $time) {
-		return $this->filemtime($path) > $time;
+		if ($this->file_exists($path)) {
+			return $this->filemtime($path) > $time;
+		} else {
+			return true;
+		}
 	}
 
 	/**
-- 
GitLab


From c5427da76d6d01fe9967204d3c019b493ceae6b9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Nov 2014 11:42:49 +0100
Subject: [PATCH 569/616] Check return of disk_free_space before returning it

Local changes copied from ed8359737199a8a6640986e00df80d971aa6e1d7
and 25370fcb8235d2129cab0f8a5843c4784b3673d0
---
 lib/private/files/storage/mappedlocal.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index 6745dad77f2..e1d234dda13 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -292,7 +292,11 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function free_space($path) {
-		return @disk_free_space($this->getSourcePath($path));
+		$space = @disk_free_space($this->getSourcePath($path));
+		if ($space === false || is_null($space)) {
+			return \OCP\Files\FileInfo::SPACE_UNKNOWN;
+		}
+		return $space;
 	}
 
 	public function search($query) {
-- 
GitLab


From 50f85bfd1f0856cd8a3446570d6de4c234685bf6 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Nov 2014 11:45:03 +0100
Subject: [PATCH 570/616] Check whether file exists before trying to touch() it

Local changes from d069ee8a8bce6a08d8b7921ad378c60af2a0439e
and 258ad38fd3c1e3cdc4ec20238b166e78c334b814
---
 lib/private/files/storage/mappedlocal.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index e1d234dda13..f7d448d14a1 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -159,6 +159,9 @@ class MappedLocal extends \OC\Files\Storage\Common {
 		// sets the modification time of the file to the given value.
 		// If mtime is nil the current time is set.
 		// note that the access time of the file always changes to the current time.
+		if ($this->file_exists($path) and !$this->isUpdatable($path)) {
+			return false;
+		}
 		if (!is_null($mtime)) {
 			$result = touch($this->getSourcePath($path), $mtime);
 		} else {
-- 
GitLab


From 7761f0288e39c5af1815d783e0f98eeb94759889 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Nov 2014 11:53:12 +0100
Subject: [PATCH 571/616] Also clearstatcache() in MappedLocal before using the
 stats

Local change 283c10f010f5da4ca0b6b7658ac1fa730b8858bf
---
 lib/private/files/storage/mappedlocal.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index f7d448d14a1..fe6fff4ebdb 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -109,6 +109,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function stat($path) {
+		clearstatcache();
 		$fullPath = $this->getSourcePath($path);
 		$statResult = stat($fullPath);
 		if (PHP_INT_SIZE === 4 && !$this->is_dir($path)) {
-- 
GitLab


From abb6e89c5d83102c2838bd6a48b5bf6e73e9660d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 10 Nov 2014 16:00:08 +0100
Subject: [PATCH 572/616] Add storage and cache wrappers to jail a storage to a
 subfolder

---
 lib/private/files/cache/cache.php             |   2 +-
 lib/private/files/cache/wrapper/cachejail.php | 255 +++++++++++
 .../files/cache/wrapper/cachewrapper.php      | 247 +++++++++++
 lib/private/files/storage/wrapper/jail.php    | 413 ++++++++++++++++++
 .../files/storage/wrapper/permissionsmask.php | 102 +++++
 tests/lib/files/cache/cache.php               |   8 +-
 tests/lib/files/cache/wrapper/cachejail.php   |  67 +++
 tests/lib/files/storage/wrapper/jail.php      |  55 +++
 8 files changed, 1144 insertions(+), 5 deletions(-)
 create mode 100644 lib/private/files/cache/wrapper/cachejail.php
 create mode 100644 lib/private/files/cache/wrapper/cachewrapper.php
 create mode 100644 lib/private/files/storage/wrapper/jail.php
 create mode 100644 lib/private/files/storage/wrapper/permissionsmask.php
 create mode 100644 tests/lib/files/cache/wrapper/cachejail.php
 create mode 100644 tests/lib/files/storage/wrapper/jail.php

diff --git a/lib/private/files/cache/cache.php b/lib/private/files/cache/cache.php
index 2c12f834518..4157da2281c 100644
--- a/lib/private/files/cache/cache.php
+++ b/lib/private/files/cache/cache.php
@@ -585,7 +585,7 @@ class Cache {
 	/**
 	 * find a folder in the cache which has not been fully scanned
 	 *
-	 * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
+	 * If multiple incomplete folders are in the cache, the one with the highest id will be returned,
 	 * use the one with the highest id gives the best result with the background scanner, since that is most
 	 * likely the folder where we stopped scanning previously
 	 *
diff --git a/lib/private/files/cache/wrapper/cachejail.php b/lib/private/files/cache/wrapper/cachejail.php
new file mode 100644
index 00000000000..7982293f5ed
--- /dev/null
+++ b/lib/private/files/cache/wrapper/cachejail.php
@@ -0,0 +1,255 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Files\Cache\Wrapper;
+
+/**
+ * Jail to a subdirectory of the wrapped cache
+ */
+class CacheJail extends CacheWrapper {
+	/**
+	 * @var string
+	 */
+	protected $root;
+
+	/**
+	 * @param \OC\Files\Cache\Cache $cache
+	 * @param string $root
+	 */
+	public function __construct($cache, $root) {
+		parent::__construct($cache);
+		$this->root = $root;
+	}
+
+	protected function getSourcePath($path) {
+		if ($path === '') {
+			return $this->root;
+		} else {
+			return $this->root . '/' . $path;
+		}
+	}
+
+	/**
+	 * @param string $path
+	 * @return null|string the jailed path or null if the path is outside the jail
+	 */
+	protected function getJailedPath($path) {
+		$rootLength = strlen($this->root) + 1;
+		if ($path === $this->root) {
+			return '';
+		} else if (substr($path, 0, $rootLength) === $this->root . '/') {
+			return substr($path, $rootLength);
+		} else {
+			return null;
+		}
+	}
+
+	/**
+	 * @param array $entry
+	 * @return array
+	 */
+	protected function formatCacheEntry($entry) {
+		if (isset($entry['path'])) {
+			$entry['path'] = $this->getJailedPath($entry['path']);
+		}
+		return $entry;
+	}
+
+	protected function filterCacheEntry($entry) {
+		$rootLength = strlen($this->root) + 1;
+		return ($entry['path'] === $this->root) or (substr($entry['path'], 0, $rootLength) === $this->root . '/');
+	}
+
+	/**
+	 * get the stored metadata of a file or folder
+	 *
+	 * @param string /int $file
+	 * @return array|false
+	 */
+	public function get($file) {
+		if (is_string($file) or $file == '') {
+			$file = $this->getSourcePath($file);
+		}
+		return parent::get($file);
+	}
+
+	/**
+	 * store meta data for a file or folder
+	 *
+	 * @param string $file
+	 * @param array $data
+	 *
+	 * @return int file id
+	 */
+	public function put($file, array $data) {
+		return $this->cache->put($this->getSourcePath($file), $data);
+	}
+
+	/**
+	 * update the metadata in the cache
+	 *
+	 * @param int $id
+	 * @param array $data
+	 */
+	public function update($id, array $data) {
+		$this->cache->update($this->getSourcePath($id), $data);
+	}
+
+	/**
+	 * get the file id for a file
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function getId($file) {
+		return $this->cache->getId($this->getSourcePath($file));
+	}
+
+	/**
+	 * get the id of the parent folder of a file
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function getParentId($file) {
+		if ($file === '') {
+			return -1;
+		} else {
+			return $this->cache->getParentId($this->getSourcePath($file));
+		}
+	}
+
+	/**
+	 * check if a file is available in the cache
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function inCache($file) {
+		return $this->cache->inCache($this->getSourcePath($file));
+	}
+
+	/**
+	 * remove a file or folder from the cache
+	 *
+	 * @param string $file
+	 */
+	public function remove($file) {
+		$this->cache->remove($this->getSourcePath($file));
+	}
+
+	/**
+	 * Move a file or folder in the cache
+	 *
+	 * @param string $source
+	 * @param string $target
+	 */
+	public function move($source, $target) {
+		$this->cache->move($this->getSourcePath($source), $this->getSourcePath($target));
+	}
+
+	/**
+	 * remove all entries for files that are stored on the storage from the cache
+	 */
+	public function clear() {
+		$this->cache->remove($this->root);
+	}
+
+	/**
+	 * @param string $file
+	 *
+	 * @return int, Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
+	 */
+	public function getStatus($file) {
+		return $this->cache->getStatus($this->getSourcePath($file));
+	}
+
+	private function formatSearchResults($results) {
+		$results = array_filter($results, array($this, 'filterCacheEntry'));
+		$results = array_values($results);
+		return array_map(array($this, 'formatCacheEntry'), $results);
+	}
+
+	/**
+	 * search for files matching $pattern
+	 *
+	 * @param string $pattern
+	 * @return array an array of file data
+	 */
+	public function search($pattern) {
+		$results = $this->cache->search($pattern);
+		return $this->formatSearchResults($results);
+	}
+
+	/**
+	 * search for files by mimetype
+	 *
+	 * @param string $mimetype
+	 * @return array
+	 */
+	public function searchByMime($mimetype) {
+		$results = $this->cache->searchByMime($mimetype);
+		return $this->formatSearchResults($results);
+	}
+
+	/**
+	 * update the folder size and the size of all parent folders
+	 *
+	 * @param string|boolean $path
+	 * @param array $data (optional) meta data of the folder
+	 */
+	public function correctFolderSize($path, $data = null) {
+		$this->cache->correctFolderSize($this->getSourcePath($path), $data);
+	}
+
+	/**
+	 * get the size of a folder and set it in the cache
+	 *
+	 * @param string $path
+	 * @param array $entry (optional) meta data of the folder
+	 * @return int
+	 */
+	public function calculateFolderSize($path, $entry = null) {
+		return $this->cache->calculateFolderSize($this->getSourcePath($path), $entry);
+	}
+
+	/**
+	 * get all file ids on the files on the storage
+	 *
+	 * @return int[]
+	 */
+	public function getAll() {
+		// not supported
+		return array();
+	}
+
+	/**
+	 * find a folder in the cache which has not been fully scanned
+	 *
+	 * If multiply incomplete folders are in the cache, the one with the highest id will be returned,
+	 * use the one with the highest id gives the best result with the background scanner, since that is most
+	 * likely the folder where we stopped scanning previously
+	 *
+	 * @return string|bool the path of the folder or false when no folder matched
+	 */
+	public function getIncomplete() {
+		// not supported
+		return false;
+	}
+
+	/**
+	 * get the path of a file on this storage by it's id
+	 *
+	 * @param int $id
+	 * @return string|null
+	 */
+	public function getPathById($id) {
+		$path = $this->cache->getPathById($id);
+		return $this->getJailedPath($path);
+	}
+}
diff --git a/lib/private/files/cache/wrapper/cachewrapper.php b/lib/private/files/cache/wrapper/cachewrapper.php
new file mode 100644
index 00000000000..040358ec657
--- /dev/null
+++ b/lib/private/files/cache/wrapper/cachewrapper.php
@@ -0,0 +1,247 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Files\Cache\Wrapper;
+
+use OC\Files\Cache\Cache;
+
+class CacheWrapper extends Cache {
+	/**
+	 * @var \OC\Files\Cache\Cache
+	 */
+	protected $cache;
+
+	/**
+	 * @param \OC\Files\Cache\Cache $cache
+	 */
+	public function __construct($cache) {
+		$this->cache = $cache;
+	}
+
+	/**
+	 * Make it easy for wrappers to modify every returned cache entry
+	 *
+	 * @param array $entry
+	 * @return array
+	 */
+	protected function formatCacheEntry($entry) {
+		return $entry;
+	}
+
+	/**
+	 * get the stored metadata of a file or folder
+	 *
+	 * @param string /int $file
+	 * @return array|false
+	 */
+	public function get($file) {
+		$result = $this->cache->get($file);
+		if ($result) {
+			$result = $this->formatCacheEntry($result);
+		}
+		return $result;
+	}
+
+	/**
+	 * get the metadata of all files stored in $folder
+	 *
+	 * @param string $folder
+	 * @return array
+	 */
+	public function getFolderContents($folder) {
+		// cant do a simple $this->cache->.... call here since getFolderContentsById needs to be called on this
+		// and not the wrapped cache
+		$fileId = $this->getId($folder);
+		return $this->getFolderContentsById($fileId);
+	}
+
+	/**
+	 * get the metadata of all files stored in $folder
+	 *
+	 * @param int $fileId the file id of the folder
+	 * @return array
+	 */
+	public function getFolderContentsById($fileId) {
+		$results = $this->cache->getFolderContentsById($fileId);
+		return array_map(array($this, 'formatCacheEntry'), $results);
+	}
+
+	/**
+	 * store meta data for a file or folder
+	 *
+	 * @param string $file
+	 * @param array $data
+	 *
+	 * @return int file id
+	 */
+	public function put($file, array $data) {
+		return $this->cache->put($file, $data);
+	}
+
+	/**
+	 * update the metadata in the cache
+	 *
+	 * @param int $id
+	 * @param array $data
+	 */
+	public function update($id, array $data) {
+		$this->cache->update($id, $data);
+	}
+
+	/**
+	 * get the file id for a file
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function getId($file) {
+		return $this->cache->getId($file);
+	}
+
+	/**
+	 * get the id of the parent folder of a file
+	 *
+	 * @param string $file
+	 * @return int
+	 */
+	public function getParentId($file) {
+		return $this->cache->getParentId($file);
+	}
+
+	/**
+	 * check if a file is available in the cache
+	 *
+	 * @param string $file
+	 * @return bool
+	 */
+	public function inCache($file) {
+		return $this->cache->inCache($file);
+	}
+
+	/**
+	 * remove a file or folder from the cache
+	 *
+	 * @param string $file
+	 */
+	public function remove($file) {
+		$this->cache->remove($file);
+	}
+
+	/**
+	 * Move a file or folder in the cache
+	 *
+	 * @param string $source
+	 * @param string $target
+	 */
+	public function move($source, $target) {
+		$this->cache->move($source, $target);
+	}
+
+	/**
+	 * remove all entries for files that are stored on the storage from the cache
+	 */
+	public function clear() {
+		$this->cache->clear();
+	}
+
+	/**
+	 * @param string $file
+	 *
+	 * @return int, Cache::NOT_FOUND, Cache::PARTIAL, Cache::SHALLOW or Cache::COMPLETE
+	 */
+	public function getStatus($file) {
+		return $this->cache->getStatus($file);
+	}
+
+	/**
+	 * search for files matching $pattern
+	 *
+	 * @param string $pattern
+	 * @return array an array of file data
+	 */
+	public function search($pattern) {
+		$results = $this->cache->search($pattern);
+		return array_map(array($this, 'formatCacheEntry'), $results);
+	}
+
+	/**
+	 * search for files by mimetype
+	 *
+	 * @param string $mimetype
+	 * @return array
+	 */
+	public function searchByMime($mimetype) {
+		$results = $this->cache->searchByMime($mimetype);
+		return array_map(array($this, 'formatCacheEntry'), $results);
+	}
+
+	/**
+	 * update the folder size and the size of all parent folders
+	 *
+	 * @param string|boolean $path
+	 * @param array $data (optional) meta data of the folder
+	 */
+	public function correctFolderSize($path, $data = null) {
+		$this->cache->correctFolderSize($path, $data);
+	}
+
+	/**
+	 * get the size of a folder and set it in the cache
+	 *
+	 * @param string $path
+	 * @param array $entry (optional) meta data of the folder
+	 * @return int
+	 */
+	public function calculateFolderSize($path, $entry = null) {
+		return $this->cache->calculateFolderSize($path, $entry);
+	}
+
+	/**
+	 * get all file ids on the files on the storage
+	 *
+	 * @return int[]
+	 */
+	public function getAll() {
+		return $this->cache->getAll();
+	}
+
+	/**
+	 * find a folder in the cache which has not been fully scanned
+	 *
+	 * If multiple incomplete folders are in the cache, the one with the highest id will be returned,
+	 * use the one with the highest id gives the best result with the background scanner, since that is most
+	 * likely the folder where we stopped scanning previously
+	 *
+	 * @return string|bool the path of the folder or false when no folder matched
+	 */
+	public function getIncomplete() {
+		return $this->cache->getIncomplete();
+	}
+
+	/**
+	 * get the path of a file on this storage by it's id
+	 *
+	 * @param int $id
+	 * @return string|null
+	 */
+	public function getPathById($id) {
+		return $this->cache->getPathById($id);
+	}
+
+	/**
+	 * get the storage id of the storage for a file and the internal path of the file
+	 * unlike getPathById this does not limit the search to files on this storage and
+	 * instead does a global search in the cache table
+	 *
+	 * @param int $id
+	 * @return array, first element holding the storage id, second the path
+	 */
+	static public function getById($id) {
+		return parent::getById($id);
+	}
+}
diff --git a/lib/private/files/storage/wrapper/jail.php b/lib/private/files/storage/wrapper/jail.php
new file mode 100644
index 00000000000..22b96765757
--- /dev/null
+++ b/lib/private/files/storage/wrapper/jail.php
@@ -0,0 +1,413 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Files\Storage\Wrapper;
+
+use OC\Files\Cache\Wrapper\CacheJail;
+
+/**
+ * Jail to a subdirectory of the wrapped storage
+ *
+ * This restricts access to a subfolder of the wrapped storage with the subfolder becoming the root folder new storage
+ */
+class Jail extends Wrapper {
+	/**
+	 * @var string
+	 */
+	protected $rootPath;
+
+	/**
+	 * @param array $arguments ['storage' => $storage, 'mask' => $root]
+	 *
+	 * $storage: The storage that will be wrapper
+	 * $root: The folder in the wrapped storage that will become the root folder of the wrapped storage
+	 */
+	public function __construct($arguments) {
+		parent::__construct($arguments);
+		$this->rootPath = $arguments['root'];
+	}
+
+	protected function getSourcePath($path) {
+		if ($path === '') {
+			return $this->rootPath;
+		} else {
+			return $this->rootPath . '/' . $path;
+		}
+	}
+
+	public function getId() {
+		return 'link:' . parent::getId() . ':' . $this->rootPath;
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.mkdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function mkdir($path) {
+		return $this->storage->mkdir($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rmdir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function rmdir($path) {
+		return $this->storage->rmdir($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.opendir.php
+	 *
+	 * @param string $path
+	 * @return resource
+	 */
+	public function opendir($path) {
+		return $this->storage->opendir($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.is_dir.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_dir($path) {
+		return $this->storage->is_dir($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.is_file.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function is_file($path) {
+		return $this->storage->is_file($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.stat.php
+	 * only the following keys are required in the result: size and mtime
+	 *
+	 * @param string $path
+	 * @return array
+	 */
+	public function stat($path) {
+		return $this->storage->stat($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filetype.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function filetype($path) {
+		return $this->storage->filetype($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filesize.php
+	 * The result for filesize when called on a folder is required to be 0
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function filesize($path) {
+		return $this->storage->filesize($this->getSourcePath($path));
+	}
+
+	/**
+	 * check if a file can be created in $path
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isCreatable($path) {
+		return $this->storage->isCreatable($this->getSourcePath($path));
+	}
+
+	/**
+	 * check if a file can be read
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isReadable($path) {
+		return $this->storage->isReadable($this->getSourcePath($path));
+	}
+
+	/**
+	 * check if a file can be written to
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isUpdatable($path) {
+		return $this->storage->isUpdatable($this->getSourcePath($path));
+	}
+
+	/**
+	 * check if a file can be deleted
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isDeletable($path) {
+		return $this->storage->isDeletable($this->getSourcePath($path));
+	}
+
+	/**
+	 * check if a file can be shared
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function isSharable($path) {
+		return $this->storage->isSharable($this->getSourcePath($path));
+	}
+
+	/**
+	 * get the full permissions of a path.
+	 * Should return a combination of the PERMISSION_ constants defined in lib/public/constants.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function getPermissions($path) {
+		return $this->storage->getPermissions($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_exists.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function file_exists($path) {
+		return $this->storage->file_exists($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.filemtime.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function filemtime($path) {
+		return $this->storage->filemtime($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_get_contents.php
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function file_get_contents($path) {
+		return $this->storage->file_get_contents($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.file_put_contents.php
+	 *
+	 * @param string $path
+	 * @param string $data
+	 * @return bool
+	 */
+	public function file_put_contents($path, $data) {
+		return $this->storage->file_put_contents($this->getSourcePath($path), $data);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.unlink.php
+	 *
+	 * @param string $path
+	 * @return bool
+	 */
+	public function unlink($path) {
+		return $this->storage->unlink($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.rename.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 */
+	public function rename($path1, $path2) {
+		return $this->storage->rename($this->getSourcePath($path1), $this->getSourcePath($path2));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.copy.php
+	 *
+	 * @param string $path1
+	 * @param string $path2
+	 * @return bool
+	 */
+	public function copy($path1, $path2) {
+		return $this->storage->copy($this->getSourcePath($path1), $this->getSourcePath($path2));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.fopen.php
+	 *
+	 * @param string $path
+	 * @param string $mode
+	 * @return resource
+	 */
+	public function fopen($path, $mode) {
+		return $this->storage->fopen($this->getSourcePath($path), $mode);
+	}
+
+	/**
+	 * get the mimetype for a file or folder
+	 * The mimetype for a folder is required to be "httpd/unix-directory"
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getMimeType($path) {
+		return $this->storage->getMimeType($this->getSourcePath($path));
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.hash.php
+	 *
+	 * @param string $type
+	 * @param string $path
+	 * @param bool $raw
+	 * @return string
+	 */
+	public function hash($type, $path, $raw = false) {
+		return $this->storage->hash($type, $this->getSourcePath($path), $raw);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.free_space.php
+	 *
+	 * @param string $path
+	 * @return int
+	 */
+	public function free_space($path) {
+		return $this->storage->free_space($this->getSourcePath($path));
+	}
+
+	/**
+	 * search for occurrences of $query in file names
+	 *
+	 * @param string $query
+	 * @return array
+	 */
+	public function search($query) {
+		return $this->storage->search($query);
+	}
+
+	/**
+	 * see http://php.net/manual/en/function.touch.php
+	 * If the backend does not support the operation, false should be returned
+	 *
+	 * @param string $path
+	 * @param int $mtime
+	 * @return bool
+	 */
+	public function touch($path, $mtime = null) {
+		return $this->storage->touch($this->getSourcePath($path), $mtime);
+	}
+
+	/**
+	 * get the path to a local version of the file.
+	 * The local version of the file can be temporary and doesn't have to be persistent across requests
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getLocalFile($path) {
+		return $this->storage->getLocalFile($this->getSourcePath($path));
+	}
+
+	/**
+	 * get the path to a local version of the folder.
+	 * The local version of the folder can be temporary and doesn't have to be persistent across requests
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getLocalFolder($path) {
+		return $this->storage->getLocalFolder($this->getSourcePath($path));
+	}
+
+	/**
+	 * check if a file or folder has been updated since $time
+	 *
+	 * @param string $path
+	 * @param int $time
+	 * @return bool
+	 *
+	 * hasUpdated for folders should return at least true if a file inside the folder is add, removed or renamed.
+	 * returning true for other changes in the folder is optional
+	 */
+	public function hasUpdated($path, $time) {
+		return $this->storage->hasUpdated($this->getSourcePath($path), $time);
+	}
+
+	/**
+	 * get a cache instance for the storage
+	 *
+	 * @param string $path
+	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+	 * @return \OC\Files\Cache\Cache
+	 */
+	public function getCache($path = '', $storage = null) {
+		if (!$storage) {
+			$storage = $this;
+		}
+		$sourceCache = $this->storage->getCache($this->getSourcePath($path), $storage);
+		return new CacheJail($sourceCache, $this->rootPath);
+	}
+
+	/**
+	 * get the user id of the owner of a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getOwner($path) {
+		return $this->storage->getOwner($this->getSourcePath($path));
+	}
+
+	/**
+	 * get a watcher instance for the cache
+	 *
+	 * @param string $path
+	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the watcher
+	 * @return \OC\Files\Cache\Watcher
+	 */
+	public function getWatcher($path = '', $storage = null) {
+		if (!$storage) {
+			$storage = $this;
+		}
+		return $this->storage->getWatcher($this->getSourcePath($path), $storage);
+	}
+
+	/**
+	 * get the ETag for a file or folder
+	 *
+	 * @param string $path
+	 * @return string
+	 */
+	public function getETag($path) {
+		return $this->storage->getETag($this->getSourcePath($path));
+	}
+}
diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/files/storage/wrapper/permissionsmask.php
new file mode 100644
index 00000000000..be5cb6bbaa3
--- /dev/null
+++ b/lib/private/files/storage/wrapper/permissionsmask.php
@@ -0,0 +1,102 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Files\Storage\Wrapper;
+
+use OC\Files\Cache\Wrapper\CachePermissionsMask;
+
+/**
+ * Mask the permissions of a storage
+ *
+ * Note that the read permissions cant be masked
+ */
+class PermissionsMask extends Wrapper {
+	/**
+	 * @var int
+	 */
+	private $mask;
+
+	public function __construct($arguments) {
+		parent::__construct($arguments);
+		$this->mask = $arguments['mask'];
+	}
+
+	private function checkMask($permissions) {
+		return ($this->mask & $permissions) === $permissions;
+	}
+
+	public function isUpdatable($path) {
+		return $this->checkMask(\OCP\PERMISSION_UPDATE) and parent::isUpdatable($path);
+	}
+
+	public function isCreatable($path) {
+		return $this->checkMask(\OCP\PERMISSION_CREATE) and parent::isCreatable($path);
+	}
+
+	public function isDeletable($path) {
+		return $this->checkMask(\OCP\PERMISSION_DELETE) and parent::isDeletable($path);
+	}
+
+	public function getPermissions($path) {
+		return $this->storage->getPermissions($path) & $this->mask;
+	}
+
+	public function rename($path1, $path2) {
+		return $this->checkMask(\OCP\PERMISSION_UPDATE) and parent::rename($path1, $path2);
+	}
+
+	public function copy($path1, $path2) {
+		return $this->checkMask(\OCP\PERMISSION_CREATE) and parent::copy($path1, $path2);
+	}
+
+	public function touch($path, $mtime = null) {
+		$permissions = $this->file_exists($path) ? \OCP\PERMISSION_UPDATE : \OCP\PERMISSION_CREATE;
+		return $this->checkMask($permissions) and parent::touch($path, $mtime);
+	}
+
+	public function mkdir($path) {
+		return $this->checkMask(\OCP\PERMISSION_CREATE) and parent::mkdir($path);
+	}
+
+	public function rmdir($path) {
+		return $this->checkMask(\OCP\PERMISSION_DELETE) and parent::rmdir($path);
+	}
+
+	public function unlink($path) {
+		return $this->checkMask(\OCP\PERMISSION_DELETE) and parent::unlink($path);
+	}
+
+	public function file_put_contents($path, $data) {
+		$permissions = $this->file_exists($path) ? \OCP\PERMISSION_UPDATE : \OCP\PERMISSION_CREATE;
+		return $this->checkMask($permissions) and parent::file_put_contents($path, $data);
+	}
+
+	public function fopen($path, $mode) {
+		if ($mode === 'r' or $mode === 'rb') {
+			return parent::fopen($path, $mode);
+		} else {
+			$permissions = $this->file_exists($path) ? \OCP\PERMISSION_UPDATE : \OCP\PERMISSION_CREATE;
+			return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
+		}
+	}
+
+	/**
+	 * get a cache instance for the storage
+	 *
+	 * @param string $path
+	 * @param \OC\Files\Storage\Storage (optional) the storage to pass to the cache
+	 * @return \OC\Files\Cache\Cache
+	 */
+	public function getCache($path = '', $storage = null) {
+		if (!$storage) {
+			$storage = $this;
+		}
+		$sourceCache = parent::getCache($path, $storage);
+		return new CachePermissionsMask($sourceCache, $this->mask);
+	}
+}
diff --git a/tests/lib/files/cache/cache.php b/tests/lib/files/cache/cache.php
index 02c45a16571..7360e9885c1 100644
--- a/tests/lib/files/cache/cache.php
+++ b/tests/lib/files/cache/cache.php
@@ -20,20 +20,20 @@ class Cache extends \Test\TestCase {
 	/**
 	 * @var \OC\Files\Storage\Temporary $storage ;
 	 */
-	private $storage;
+	protected $storage;
 	/**
 	 * @var \OC\Files\Storage\Temporary $storage2 ;
 	 */
-	private $storage2;
+	protected $storage2;
 
 	/**
 	 * @var \OC\Files\Cache\Cache $cache
 	 */
-	private $cache;
+	protected $cache;
 	/**
 	 * @var \OC\Files\Cache\Cache $cache2
 	 */
-	private $cache2;
+	protected $cache2;
 
 	public function testSimple() {
 		$file1 = 'foo';
diff --git a/tests/lib/files/cache/wrapper/cachejail.php b/tests/lib/files/cache/wrapper/cachejail.php
new file mode 100644
index 00000000000..13f3dc8858e
--- /dev/null
+++ b/tests/lib/files/cache/wrapper/cachejail.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * Copyright (c) 2014 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\Cache\Wrapper;
+
+use Test\Files\Cache\Cache;
+
+class CacheJail extends Cache {
+	/**
+	 * @var \OC\Files\Cache\Cache $sourceCache
+	 */
+	protected $sourceCache;
+
+	public function setUp() {
+		parent::setUp();
+		$this->storage->mkdir('foo');
+		$this->sourceCache = $this->cache;
+		$this->cache = new \OC\Files\Cache\Wrapper\CacheJail($this->sourceCache, 'foo');
+	}
+
+	function testSearchOutsideJail() {
+		$file1 = 'foo/foobar';
+		$file2 = 'folder/foobar';
+		$data1 = array('size' => 100, 'mtime' => 50, 'mimetype' => 'foo/folder');
+
+		$this->sourceCache->put($file1, $data1);
+		$this->sourceCache->put($file2, $data1);
+
+		$this->assertCount(2, $this->sourceCache->search('%foobar'));
+
+		$result = $this->cache->search('%foobar%');
+		$this->assertCount(1, $result);
+		$this->assertEquals('foobar', $result[0]['path']);
+	}
+
+	function testClearKeepEntriesOutsideJail() {
+		$file1 = 'foo/foobar';
+		$file2 = 'foo/foobar/asd';
+		$file3 = 'folder/foobar';
+		$data1 = array('size' => 100, 'mtime' => 50, 'mimetype' => 'httpd/unix-directory');
+
+		$this->sourceCache->put('foo', $data1);
+		$this->sourceCache->put($file1, $data1);
+		$this->sourceCache->put($file2, $data1);
+		$this->sourceCache->put($file3, $data1);
+
+		$this->cache->clear();
+
+		$this->assertFalse($this->cache->inCache('foobar'));
+		$this->assertTrue($this->sourceCache->inCache('folder/foobar'));
+	}
+
+	function testGetById() {
+		//not supported
+		$this->assertTrue(true);
+	}
+
+	function testGetIncomplete() {
+		//not supported
+		$this->assertTrue(true);
+	}
+}
diff --git a/tests/lib/files/storage/wrapper/jail.php b/tests/lib/files/storage/wrapper/jail.php
new file mode 100644
index 00000000000..270ce750ecf
--- /dev/null
+++ b/tests/lib/files/storage/wrapper/jail.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright (c) 2014 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\Storage\Wrapper;
+
+class Jail extends \Test\Files\Storage\Storage {
+	/**
+	 * @var string tmpDir
+	 */
+	private $tmpDir;
+
+	/**
+	 * @var \OC\Files\Storage\Temporary
+	 */
+	private $sourceStorage;
+
+	public function setUp() {
+		parent::setUp();
+		$this->sourceStorage = new \OC\Files\Storage\Temporary(array());
+		$this->sourceStorage->mkdir('foo');
+		$this->instance = new \OC\Files\Storage\Wrapper\Jail(array(
+			'storage' => $this->sourceStorage,
+			'root' => 'foo'
+		));
+	}
+
+	public function tearDown() {
+		// test that nothing outside our jail is touched
+		$contents = array();
+		$dh = $this->sourceStorage->opendir('');
+		while ($file = readdir($dh)) {
+			if ($file !== '.' and $file !== '..') {
+				$contents[] = $file;
+			}
+		}
+		$this->assertEquals(array('foo'), $contents);
+		$this->sourceStorage->cleanUp();
+		parent::tearDown();
+	}
+
+	public function testMkDirRooted() {
+		$this->instance->mkdir('bar');
+		$this->assertTrue($this->sourceStorage->is_dir('foo/bar'));
+	}
+
+	public function testFilePutContentsRooted() {
+		$this->instance->file_put_contents('bar', 'asd');
+		$this->assertEquals('asd', $this->sourceStorage->file_get_contents('foo/bar'));
+	}
+}
-- 
GitLab


From 33b64868d7b65e751bd8d729ce69d6f46e6c3d8d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 10 Nov 2014 16:00:25 +0100
Subject: [PATCH 573/616] Add storage and cache wrappers to apply a permissions
 mask to a storage

---
 .../cache/wrapper/cachepermissionsmask.php    |  32 ++++++
 .../files/storage/wrapper/permissionsmask.php |  33 ++++--
 .../cache/wrapper/cachepermissionsmask.php    |  94 ++++++++++++++++
 .../files/storage/wrapper/permissionsmask.php | 105 ++++++++++++++++++
 4 files changed, 252 insertions(+), 12 deletions(-)
 create mode 100644 lib/private/files/cache/wrapper/cachepermissionsmask.php
 create mode 100644 tests/lib/files/cache/wrapper/cachepermissionsmask.php
 create mode 100644 tests/lib/files/storage/wrapper/permissionsmask.php

diff --git a/lib/private/files/cache/wrapper/cachepermissionsmask.php b/lib/private/files/cache/wrapper/cachepermissionsmask.php
new file mode 100644
index 00000000000..6ce6a4ebc44
--- /dev/null
+++ b/lib/private/files/cache/wrapper/cachepermissionsmask.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC\Files\Cache\Wrapper;
+
+class CachePermissionsMask extends CacheWrapper {
+	/**
+	 * @var int
+	 */
+	protected $mask;
+
+	/**
+	 * @param \OC\Files\Cache\Cache $cache
+	 * @param int $mask
+	 */
+	public function __construct($cache, $mask) {
+		parent::__construct($cache);
+		$this->mask = $mask;
+	}
+
+	protected function formatCacheEntry($entry) {
+		if (isset($entry['permissions'])) {
+			$entry['permissions'] &= $this->mask;
+		}
+		return $entry;
+	}
+}
diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/files/storage/wrapper/permissionsmask.php
index be5cb6bbaa3..955cb54591b 100644
--- a/lib/private/files/storage/wrapper/permissionsmask.php
+++ b/lib/private/files/storage/wrapper/permissionsmask.php
@@ -9,18 +9,27 @@
 namespace OC\Files\Storage\Wrapper;
 
 use OC\Files\Cache\Wrapper\CachePermissionsMask;
+use OCP\Constants;
 
 /**
  * Mask the permissions of a storage
  *
+ * This can be used to restrict update, create, delete and/or share permissions of a storage
+ *
  * Note that the read permissions cant be masked
  */
 class PermissionsMask extends Wrapper {
 	/**
-	 * @var int
+	 * @var int the permissions bits we want to keep
 	 */
 	private $mask;
 
+	/**
+	 * @param array $arguments ['storage' => $storage, 'mask' => $mask]
+	 *
+	 * $storage: The storage the permissions mask should be applied on
+	 * $mask: The permission bits that should be kept, a combination of the \OCP\Constant::PERMISSION_ constants
+	 */
 	public function __construct($arguments) {
 		parent::__construct($arguments);
 		$this->mask = $arguments['mask'];
@@ -31,15 +40,15 @@ class PermissionsMask extends Wrapper {
 	}
 
 	public function isUpdatable($path) {
-		return $this->checkMask(\OCP\PERMISSION_UPDATE) and parent::isUpdatable($path);
+		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::isUpdatable($path);
 	}
 
 	public function isCreatable($path) {
-		return $this->checkMask(\OCP\PERMISSION_CREATE) and parent::isCreatable($path);
+		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::isCreatable($path);
 	}
 
 	public function isDeletable($path) {
-		return $this->checkMask(\OCP\PERMISSION_DELETE) and parent::isDeletable($path);
+		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::isDeletable($path);
 	}
 
 	public function getPermissions($path) {
@@ -47,32 +56,32 @@ class PermissionsMask extends Wrapper {
 	}
 
 	public function rename($path1, $path2) {
-		return $this->checkMask(\OCP\PERMISSION_UPDATE) and parent::rename($path1, $path2);
+		return $this->checkMask(Constants::PERMISSION_UPDATE) and parent::rename($path1, $path2);
 	}
 
 	public function copy($path1, $path2) {
-		return $this->checkMask(\OCP\PERMISSION_CREATE) and parent::copy($path1, $path2);
+		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::copy($path1, $path2);
 	}
 
 	public function touch($path, $mtime = null) {
-		$permissions = $this->file_exists($path) ? \OCP\PERMISSION_UPDATE : \OCP\PERMISSION_CREATE;
+		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
 		return $this->checkMask($permissions) and parent::touch($path, $mtime);
 	}
 
 	public function mkdir($path) {
-		return $this->checkMask(\OCP\PERMISSION_CREATE) and parent::mkdir($path);
+		return $this->checkMask(Constants::PERMISSION_CREATE) and parent::mkdir($path);
 	}
 
 	public function rmdir($path) {
-		return $this->checkMask(\OCP\PERMISSION_DELETE) and parent::rmdir($path);
+		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::rmdir($path);
 	}
 
 	public function unlink($path) {
-		return $this->checkMask(\OCP\PERMISSION_DELETE) and parent::unlink($path);
+		return $this->checkMask(Constants::PERMISSION_DELETE) and parent::unlink($path);
 	}
 
 	public function file_put_contents($path, $data) {
-		$permissions = $this->file_exists($path) ? \OCP\PERMISSION_UPDATE : \OCP\PERMISSION_CREATE;
+		$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
 		return $this->checkMask($permissions) and parent::file_put_contents($path, $data);
 	}
 
@@ -80,7 +89,7 @@ class PermissionsMask extends Wrapper {
 		if ($mode === 'r' or $mode === 'rb') {
 			return parent::fopen($path, $mode);
 		} else {
-			$permissions = $this->file_exists($path) ? \OCP\PERMISSION_UPDATE : \OCP\PERMISSION_CREATE;
+			$permissions = $this->file_exists($path) ? Constants::PERMISSION_UPDATE : Constants::PERMISSION_CREATE;
 			return $this->checkMask($permissions) ? parent::fopen($path, $mode) : false;
 		}
 	}
diff --git a/tests/lib/files/cache/wrapper/cachepermissionsmask.php b/tests/lib/files/cache/wrapper/cachepermissionsmask.php
new file mode 100644
index 00000000000..72fd22741d3
--- /dev/null
+++ b/tests/lib/files/cache/wrapper/cachepermissionsmask.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * Copyright (c) 2014 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\Cache\Wrapper;
+
+use OCP\Constants;
+use Test\Files\Cache\Cache;
+
+class CachePermissionsMask extends Cache {
+	/**
+	 * @var \OC\Files\Cache\Cache $sourceCache
+	 */
+	protected $sourceCache;
+
+	public function setUp() {
+		parent::setUp();
+		$this->storage->mkdir('foo');
+		$this->sourceCache = $this->cache;
+		$this->cache = $this->getMaskedCached(Constants::PERMISSION_ALL);
+	}
+
+	protected function getMaskedCached($mask) {
+		return new \OC\Files\Cache\Wrapper\CachePermissionsMask($this->sourceCache, $mask);
+	}
+
+	public function maskProvider() {
+		return array(
+			array(Constants::PERMISSION_ALL),
+			array(Constants::PERMISSION_ALL - Constants::PERMISSION_SHARE),
+			array(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE),
+			array(Constants::PERMISSION_READ)
+		);
+	}
+
+	/**
+	 * @dataProvider maskProvider
+	 * @param int $mask
+	 */
+	public function testGetMasked($mask) {
+		$cache = $this->getMaskedCached($mask);
+		$data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain', 'permissions' => Constants::PERMISSION_ALL);
+		$this->sourceCache->put('foo', $data);
+		$result = $cache->get('foo');
+		$this->assertEquals($mask, $result['permissions']);
+
+		$data = array('size' => 100, 'mtime' => 50, 'mimetype' => 'text/plain', 'permissions' => Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE);
+		$this->sourceCache->put('bar', $data);
+		$result = $cache->get('bar');
+		$this->assertEquals($mask & ~Constants::PERMISSION_DELETE, $result['permissions']);
+	}
+
+	/**
+	 * @dataProvider maskProvider
+	 * @param int $mask
+	 */
+	public function testGetFolderContentMasked($mask) {
+		$this->storage->mkdir('foo');
+		$this->storage->file_put_contents('foo/bar', 'asd');
+		$this->storage->file_put_contents('foo/asd', 'bar');
+		$this->storage->getScanner()->scan('');
+
+		$cache = $this->getMaskedCached($mask);
+		$files = $cache->getFolderContents('foo');
+		$this->assertCount(2, $files);
+
+		foreach ($files as $file) {
+			$this->assertEquals($mask & ~Constants::PERMISSION_CREATE, $file['permissions']);
+		}
+	}
+
+	/**
+	 * @dataProvider maskProvider
+	 * @param int $mask
+	 */
+	public function testSearchMasked($mask) {
+		$this->storage->mkdir('foo');
+		$this->storage->file_put_contents('foo/bar', 'asd');
+		$this->storage->file_put_contents('foo/foobar', 'bar');
+		$this->storage->getScanner()->scan('');
+
+		$cache = $this->getMaskedCached($mask);
+		$files = $cache->search('%bar');
+		$this->assertCount(2, $files);
+
+		foreach ($files as $file) {
+			$this->assertEquals($mask & ~Constants::PERMISSION_CREATE, $file['permissions']);
+		}
+	}
+}
diff --git a/tests/lib/files/storage/wrapper/permissionsmask.php b/tests/lib/files/storage/wrapper/permissionsmask.php
new file mode 100644
index 00000000000..7e8c387677c
--- /dev/null
+++ b/tests/lib/files/storage/wrapper/permissionsmask.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * Copyright (c) 2014 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\Storage\Wrapper;
+
+use OCP\Constants;
+
+class PermissionsMask extends \Test\Files\Storage\Storage {
+
+	/**
+	 * @var \OC\Files\Storage\Temporary
+	 */
+	private $sourceStorage;
+
+	public function setUp() {
+		parent::setUp();
+		$this->sourceStorage = new \OC\Files\Storage\Temporary(array());
+		$this->instance = $this->getMaskedStorage(Constants::PERMISSION_ALL);
+	}
+
+	public function tearDown() {
+		$this->sourceStorage->cleanUp();
+		parent::tearDown();
+	}
+
+	protected function getMaskedStorage($mask) {
+		return new \OC\Files\Storage\Wrapper\PermissionsMask(array(
+			'storage' => $this->sourceStorage,
+			'mask' => $mask
+		));
+	}
+
+	public function testMkdirNoCreate() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE);
+		$this->assertFalse($storage->mkdir('foo'));
+		$this->assertFalse($storage->file_exists('foo'));
+	}
+
+	public function testRmdirNoDelete() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE);
+		$this->assertTrue($storage->mkdir('foo'));
+		$this->assertTrue($storage->file_exists('foo'));
+		$this->assertFalse($storage->rmdir('foo'));
+		$this->assertTrue($storage->file_exists('foo'));
+	}
+
+	public function testTouchNewFileNoCreate() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE);
+		$this->assertFalse($storage->touch('foo'));
+		$this->assertFalse($storage->file_exists('foo'));
+	}
+
+	public function testTouchNewFileNoUpdate() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE);
+		$this->assertTrue($storage->touch('foo'));
+		$this->assertTrue($storage->file_exists('foo'));
+	}
+
+	public function testTouchExistingFileNoUpdate() {
+		$this->sourceStorage->touch('foo');
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE);
+		$this->assertFalse($storage->touch('foo'));
+	}
+
+	public function testUnlinkNoDelete() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_DELETE);
+		$this->assertTrue($storage->touch('foo'));
+		$this->assertTrue($storage->file_exists('foo'));
+		$this->assertFalse($storage->unlink('foo'));
+		$this->assertTrue($storage->file_exists('foo'));
+	}
+
+	public function testPutContentsNewFileNoUpdate() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE);
+		$this->assertTrue($storage->file_put_contents('foo', 'bar'));
+		$this->assertEquals('bar', $storage->file_get_contents('foo'));
+	}
+
+	public function testPutContentsNewFileNoCreate() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE);
+		$this->assertFalse($storage->file_put_contents('foo', 'bar'));
+	}
+
+	public function testPutContentsExistingFileNoUpdate() {
+		$this->sourceStorage->touch('foo');
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE);
+		$this->assertFalse($storage->file_put_contents('foo', 'bar'));
+	}
+
+	public function testFopenExistingFileNoUpdate() {
+		$this->sourceStorage->touch('foo');
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_UPDATE);
+		$this->assertFalse($storage->fopen('foo', 'w'));
+	}
+
+	public function testFopenNewFileNoCreate() {
+		$storage = $this->getMaskedStorage(Constants::PERMISSION_ALL - Constants::PERMISSION_CREATE);
+		$this->assertFalse($storage->fopen('foo', 'w'));
+	}
+}
-- 
GitLab


From dfde04291eae31765b2cb858e1d1260b60d75329 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 11:14:17 +0100
Subject: [PATCH 574/616] Move share interfaces to own files so they can be
 autoloaded

---
 lib/public/share.php                        | 83 ---------------------
 lib/public/share_backend.php                | 68 +++++++++++++++++
 lib/public/share_backend_collection.php     | 29 +++++++
 lib/public/share_backend_file_dependent.php | 31 ++++++++
 tests/lib/share/backend.php                 |  2 -
 5 files changed, 128 insertions(+), 85 deletions(-)
 create mode 100644 lib/public/share_backend.php
 create mode 100644 lib/public/share_backend_collection.php
 create mode 100644 lib/public/share_backend_file_dependent.php

diff --git a/lib/public/share.php b/lib/public/share.php
index 333e0a26970..b3ece8fab94 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -342,86 +342,3 @@ class Share extends \OC\Share\Constants {
 		return \OC\Share\Share::isResharingAllowed();
 	}
 }
-
-/**
- * Interface that apps must implement to share content.
- */
-interface Share_Backend {
-
-	/**
-	 * Check if this $itemSource exist for the user
-	 * @param string $itemSource
-	 * @param string $uidOwner Owner of the item
-	 * @return boolean|null Source
-	 *
-	 * Return false if the item does not exist for the user
-	 */
-	public function isValidSource($itemSource, $uidOwner);
-
-	/**
-	 * Get a unique name of the item for the specified user
-	 * @param string $itemSource
-	 * @param string|false $shareWith User the item is being shared with
-	 * @param array|null $exclude List of similar item names already existing as shared items @deprecated since version OC7
-	 * @return string Target name
-	 *
-	 * This function needs to verify that the user does not already have an item with this name.
-	 * If it does generate a new name e.g. name_#
-	 */
-	public function generateTarget($itemSource, $shareWith, $exclude = null);
-
-	/**
-	 * Converts the shared item sources back into the item in the specified format
-	 * @param array $items Shared items
-	 * @param int $format
-	 * @return TODO
-	 *
-	 * The items array is a 3-dimensional array with the item_source as the
-	 * first key and the share id as the second key to an array with the share
-	 * info.
-	 *
-	 * The key/value pairs included in the share info depend on the function originally called:
-	 * If called by getItem(s)Shared: id, item_type, item, item_source,
-	 * share_type, share_with, permissions, stime, file_source
-	 *
-	 * If called by getItem(s)SharedWith: id, item_type, item, item_source,
-	 * item_target, share_type, share_with, permissions, stime, file_source,
-	 * file_target
-	 *
-	 * This function allows the backend to control the output of shared items with custom formats.
-	 * It is only called through calls to the public getItem(s)Shared(With) functions.
-	 */
-	public function formatItems($items, $format, $parameters = null);
-
-}
-
-/**
- * Interface for share backends that share content that is dependent on files.
- * Extends the Share_Backend interface.
- */
-interface Share_Backend_File_Dependent extends Share_Backend {
-
-	/**
-	 * Get the file path of the item
-	 * @param string $itemSource
-	 * @param string $uidOwner User that is the owner of shared item
-	 * @return string|false
-	 */
-	public function getFilePath($itemSource, $uidOwner);
-
-}
-
-/**
- * Interface for collections of of items implemented by another share backend.
- * Extends the Share_Backend interface.
- */
-interface Share_Backend_Collection extends Share_Backend {
-
-	/**
-	 * Get the sources of the children of the item
-	 * @param string $itemSource
-	 * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
-	 */
-	public function getChildren($itemSource);
-
-}
diff --git a/lib/public/share_backend.php b/lib/public/share_backend.php
new file mode 100644
index 00000000000..6ab234aecf0
--- /dev/null
+++ b/lib/public/share_backend.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle, Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski <mtgap@owncloud.com>
+ *            2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// use OCP namespace for all classes that are considered public.
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP;
+
+/**
+ * Interface that apps must implement to share content.
+ */
+interface Share_Backend {
+
+	/**
+	 * Check if this $itemSource exist for the user
+	 * @param string $itemSource
+	 * @param string $uidOwner Owner of the item
+	 * @return boolean|null Source
+	 *
+	 * Return false if the item does not exist for the user
+	 */
+	public function isValidSource($itemSource, $uidOwner);
+
+	/**
+	 * Get a unique name of the item for the specified user
+	 * @param string $itemSource
+	 * @param string|false $shareWith User the item is being shared with
+	 * @param array|null $exclude List of similar item names already existing as shared items @deprecated since version OC7
+	 * @return string Target name
+	 *
+	 * This function needs to verify that the user does not already have an item with this name.
+	 * If it does generate a new name e.g. name_#
+	 */
+	public function generateTarget($itemSource, $shareWith, $exclude = null);
+
+	/**
+	 * Converts the shared item sources back into the item in the specified format
+	 * @param array $items Shared items
+	 * @param int $format
+	 * @return TODO
+	 *
+	 * The items array is a 3-dimensional array with the item_source as the
+	 * first key and the share id as the second key to an array with the share
+	 * info.
+	 *
+	 * The key/value pairs included in the share info depend on the function originally called:
+	 * If called by getItem(s)Shared: id, item_type, item, item_source,
+	 * share_type, share_with, permissions, stime, file_source
+	 *
+	 * If called by getItem(s)SharedWith: id, item_type, item, item_source,
+	 * item_target, share_type, share_with, permissions, stime, file_source,
+	 * file_target
+	 *
+	 * This function allows the backend to control the output of shared items with custom formats.
+	 * It is only called through calls to the public getItem(s)Shared(With) functions.
+	 */
+	public function formatItems($items, $format, $parameters = null);
+
+}
diff --git a/lib/public/share_backend_collection.php b/lib/public/share_backend_collection.php
new file mode 100644
index 00000000000..0292222c74f
--- /dev/null
+++ b/lib/public/share_backend_collection.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle, Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski <mtgap@owncloud.com>
+ *            2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// use OCP namespace for all classes that are considered public.
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP;
+
+/**
+ * Interface for collections of of items implemented by another share backend.
+ * Extends the Share_Backend interface.
+ */
+interface Share_Backend_Collection extends Share_Backend {
+	/**
+	 * Get the sources of the children of the item
+	 * @param string $itemSource
+	 * @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
+	 */
+	public function getChildren($itemSource);
+}
diff --git a/lib/public/share_backend_file_dependent.php b/lib/public/share_backend_file_dependent.php
new file mode 100644
index 00000000000..b666e504008
--- /dev/null
+++ b/lib/public/share_backend_file_dependent.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Bjoern Schiessle, Michael Gapczynski
+ * @copyright 2012 Michael Gapczynski <mtgap@owncloud.com>
+ *            2014 Bjoern Schiessle <schiessle@owncloud.com>
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+// use OCP namespace for all classes that are considered public.
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP;
+
+/**
+ * Interface for share backends that share content that is dependent on files.
+ * Extends the Share_Backend interface.
+ */
+interface Share_Backend_File_Dependent extends Share_Backend {
+	/**
+	 * Get the file path of the item
+	 * @param string $itemSource
+	 * @param string $uidOwner User that is the owner of shared item
+	 * @return string|false
+	 */
+	public function getFilePath($itemSource, $uidOwner);
+
+}
diff --git a/tests/lib/share/backend.php b/tests/lib/share/backend.php
index 61b8f262a42..07958266947 100644
--- a/tests/lib/share/backend.php
+++ b/tests/lib/share/backend.php
@@ -19,8 +19,6 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-OC::$CLASSPATH['OCP\Share_Backend']='lib/public/share.php';
-
 class Test_Share_Backend implements OCP\Share_Backend {
 
 	const FORMAT_SOURCE = 0;
-- 
GitLab


From 7b8824a4e3b7e0c1484540991ab7b3f5d99afe98 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 11:18:27 +0100
Subject: [PATCH 575/616] Move iHomeStorage to own file

---
 lib/public/files/ihomestorage.php | 24 ++++++++++++++++++++++++
 lib/public/files/storage.php      |  4 ----
 2 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 lib/public/files/ihomestorage.php

diff --git a/lib/public/files/ihomestorage.php b/lib/public/files/ihomestorage.php
new file mode 100644
index 00000000000..717ef946750
--- /dev/null
+++ b/lib/public/files/ihomestorage.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Robin Appelman
+ * @copyright 2012 Robin Appelman icewind@owncloud.com
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+/**
+ * Public interface of ownCloud for apps to use.
+ * Files/Storage interface
+ */
+
+// use OCP namespace for all classes that are considered public.
+// This means that they should be used by apps instead of the internal ownCloud classes
+namespace OCP\Files;
+
+interface IHomeStorage {
+
+}
diff --git a/lib/public/files/storage.php b/lib/public/files/storage.php
index 8f8d7852ee4..323d20db564 100644
--- a/lib/public/files/storage.php
+++ b/lib/public/files/storage.php
@@ -336,7 +336,3 @@ interface Storage {
 	 */
 	public function instanceOfStorage($class);
 }
-
-interface IHomeStorage {
-
-}
-- 
GitLab


From 7bbc27708a38cdb56b842bea897c5654054d9e72 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 26 Nov 2014 11:36:06 +0100
Subject: [PATCH 576/616] Move NaturalSort_DefaultCollator to its own file

---
 lib/private/naturalsort.php                 | 11 -----------
 lib/private/naturalsort_defaultcollator.php | 19 +++++++++++++++++++
 2 files changed, 19 insertions(+), 11 deletions(-)
 create mode 100644 lib/private/naturalsort_defaultcollator.php

diff --git a/lib/private/naturalsort.php b/lib/private/naturalsort.php
index eb00f99a672..6e259630f79 100644
--- a/lib/private/naturalsort.php
+++ b/lib/private/naturalsort.php
@@ -9,16 +9,6 @@
 
 namespace OC;
 
-class NaturalSort_DefaultCollator {
-
-	public function compare($a, $b) {
-		if ($a === $b) {
-			return 0;
-		}
-		return ($a < $b) ? -1 : 1;
-	}
-}
-
 class NaturalSort {
 	private static $instance;
 	private $collator;
@@ -114,4 +104,3 @@ class NaturalSort {
 		return self::$instance;
 	}
 }
-
diff --git a/lib/private/naturalsort_defaultcollator.php b/lib/private/naturalsort_defaultcollator.php
new file mode 100644
index 00000000000..e1007f8d7b4
--- /dev/null
+++ b/lib/private/naturalsort_defaultcollator.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2014 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 OC;
+
+class NaturalSort_DefaultCollator {
+	public function compare($a, $b) {
+		if ($a === $b) {
+			return 0;
+		}
+		return ($a < $b) ? -1 : 1;
+	}
+}
-- 
GitLab


From fca9d32545c933d3a262c1d49b44a805589de882 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Thu, 27 Nov 2014 19:40:23 +0100
Subject: [PATCH 577/616] Move registration of core preview providers to
 preview

So the class files only have class code and don't execute code
---
 lib/private/preview.php           | 72 ++++++++++++++++++++++++++++++-
 lib/private/preview/bitmap.php    | 42 +++---------------
 lib/private/preview/image.php     |  2 -
 lib/private/preview/movie.php     | 16 -------
 lib/private/preview/mp3.php       |  2 -
 lib/private/preview/office-cl.php | 14 ------
 lib/private/preview/office.php    | 28 ------------
 lib/private/preview/provider.php  | 10 +++--
 lib/private/preview/svg.php       | 11 -----
 lib/private/preview/txt.php       | 21 +++------
 10 files changed, 86 insertions(+), 132 deletions(-)
 delete mode 100644 lib/private/preview/office.php

diff --git a/lib/private/preview.php b/lib/private/preview.php
index c9d8810be6f..6547d5b3258 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -21,7 +21,7 @@ require_once 'preview/movie.php';
 require_once 'preview/mp3.php';
 require_once 'preview/svg.php';
 require_once 'preview/txt.php';
-require_once 'preview/office.php';
+require_once 'preview/office-cl.php';
 require_once 'preview/bitmap.php';
 
 class Preview {
@@ -744,10 +744,11 @@ class Preview {
 			return;
 		}
 
-		if (count(self::$providers) > 0) {
+		if (!empty(self::$providers)) {
 			return;
 		}
 
+		self::registerCoreProviders();
 		foreach (self::$registeredProviders as $provider) {
 			$class = $provider['class'];
 			$options = $provider['options'];
@@ -759,7 +760,74 @@ class Preview {
 
 		$keys = array_map('strlen', array_keys(self::$providers));
 		array_multisort($keys, SORT_DESC, self::$providers);
+	}
+
+	protected static function registerCoreProviders() {
+		self::registerProvider('OC\Preview\TXT');
+		self::registerProvider('OC\Preview\MarkDown');
+		self::registerProvider('OC\Preview\Image');
+		self::registerProvider('OC\Preview\MP3');
+
+		// SVG, Office and Bitmap require imagick
+		if (extension_loaded('imagick')) {
+			$checkImagick = new \Imagick();
+
+			$imagickProviders = array(
+				'SVG'	=> 'OC\Preview\SVG',
+				'TIFF'	=> 'OC\Preview\TIFF',
+				'PDF'	=> 'OC\Preview\PDF',
+				'AI'	=> 'OC\Preview\Illustrator',
+				'PSD'	=> 'OC\Preview\Photoshop',
+				// Requires adding 'eps' => array('application/postscript', null), to lib/private/mimetypes.list.php
+				'EPS'	=> 'OC\Preview\Postscript',
+			);
+
+			foreach ($imagickProviders as $queryFormat => $provider) {
+				if (count($checkImagick->queryFormats($queryFormat)) === 1) {
+					self::registerProvider($provider);
+				}
+			}
+
+			if (count($checkImagick->queryFormats('PDF')) === 1) {
+				// Office previews are currently not supported on Windows
+				if (!\OC_Util::runningOnWindows() && \OC_Helper::is_function_enabled('shell_exec')) {
+					$officeFound = is_string(\OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null));
+
+					if (!$officeFound) {
+						//let's see if there is libreoffice or openoffice on this machine
+						$whichLibreOffice = shell_exec('command -v libreoffice');
+						$officeFound = !empty($whichLibreOffice);
+						if (!$officeFound) {
+							$whichOpenOffice = shell_exec('command -v openoffice');
+							$officeFound = !empty($whichOpenOffice);
+						}
+					}
+
+					if ($officeFound) {
+						self::registerProvider('OC\Preview\MSOfficeDoc');
+						self::registerProvider('OC\Preview\MSOffice2003');
+						self::registerProvider('OC\Preview\MSOffice2007');
+						self::registerProvider('OC\Preview\OpenDocument');
+						self::registerProvider('OC\Preview\StarOffice');
+					}
+				}
+			}
+		}
+
+		// Video requires avconv or ffmpeg and is therefor
+		// currently not supported on Windows.
+		if (!\OC_Util::runningOnWindows()) {
+			$avconvBinary = \OC_Helper::findBinaryPath('avconv');
+			$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
 
+			if ($avconvBinary || $ffmpegBinary) {
+				// FIXME // a bit hacky but didn't want to use subclasses
+				\OC\Preview\Movie::$avconvBinary = $avconvBinary;
+				\OC\Preview\Movie::$ffmpegBinary = $ffmpegBinary;
+
+				self::registerProvider('OC\Preview\Movie');
+			}
+		}
 	}
 
 	/**
diff --git a/lib/private/preview/bitmap.php b/lib/private/preview/bitmap.php
index 748a63a6afa..46322853486 100644
--- a/lib/private/preview/bitmap.php
+++ b/lib/private/preview/bitmap.php
@@ -9,10 +9,6 @@ namespace OC\Preview;
 
 use Imagick;
 
-if (extension_loaded('imagick')) {
-
-	$checkImagick = new Imagick();
-
 	class Bitmap extends Provider {
 
 		public function getMimeType() {
@@ -23,11 +19,11 @@ if (extension_loaded('imagick')) {
 			$tmpPath = $fileview->toTmpFile($path);
 
 			//create imagick object from bitmap or vector file
-			try{
+			try {
 				// Layer 0 contains either the bitmap or
 				// a flat representation of all vector layers
 				$bp = new Imagick($tmpPath . '[0]');
-				
+
 				$bp->setImageFormat('png');
 			} catch (\Exception $e) {
 				\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
@@ -35,17 +31,14 @@ if (extension_loaded('imagick')) {
 			}
 
 			unlink($tmpPath);
-			
+
 			//new bitmap image object
 			$image = new \OC_Image($bp);
 			//check if image object is valid
 			return $image->valid() ? $image : false;
 		}
-
 	}
-	
-	if(count($checkImagick->queryFormats('PDF')) === 1) {
-	
+
 		//.pdf
 		class PDF extends Bitmap {
 
@@ -54,12 +47,7 @@ if (extension_loaded('imagick')) {
 			}
 
 		}
-		
-		\OC\Preview::registerProvider('OC\Preview\PDF');
-	}
-	
-	if(count($checkImagick->queryFormats('TIFF')) === 1) {
-	
+
 		//.tiff
 		class TIFF extends Bitmap {
 
@@ -68,12 +56,7 @@ if (extension_loaded('imagick')) {
 			}
 
 		}
-		
-		\OC\Preview::registerProvider('OC\Preview\TIFF');
-	}
 
-	if(count($checkImagick->queryFormats('AI')) === 1) {
-	
 		//.ai
 		class Illustrator extends Bitmap {
 
@@ -82,12 +65,6 @@ if (extension_loaded('imagick')) {
 			}
 
 		}
-		
-		\OC\Preview::registerProvider('OC\Preview\Illustrator');
-	}
-	
-	// Requires adding 'eps' => array('application/postscript', null), to lib/private/mimetypes.list.php
-	if(count($checkImagick->queryFormats('EPS')) === 1) {
 
 		//.eps
 		class Postscript extends Bitmap {
@@ -98,11 +75,6 @@ if (extension_loaded('imagick')) {
 
 		}
 
-		\OC\Preview::registerProvider('OC\Preview\Postscript');
-	}
-	
-	if(count($checkImagick->queryFormats('PSD')) === 1) {
-	
 		//.psd
 		class Photoshop extends Bitmap {
 
@@ -111,7 +83,3 @@ if (extension_loaded('imagick')) {
 			}
 
 		}
-		
-		\OC\Preview::registerProvider('OC\Preview\Photoshop');
-	}
-}
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index 7bcbddc649e..511052caf2b 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -35,5 +35,3 @@ class Image extends Provider {
 	}
 
 }
-
-\OC\Preview::registerProvider('OC\Preview\Image');
diff --git a/lib/private/preview/movie.php b/lib/private/preview/movie.php
index d69266ceb33..850027c1a64 100644
--- a/lib/private/preview/movie.php
+++ b/lib/private/preview/movie.php
@@ -8,13 +8,6 @@
  */
 namespace OC\Preview;
 
-// movie preview is currently not supported on Windows
-if (!\OC_Util::runningOnWindows()) {
-	$avconvBinary = \OC_Helper::findBinaryPath('avconv');
-	$ffmpegBinary = ($avconvBinary) ? null : \OC_Helper::findBinaryPath('ffmpeg');
-
-	if ($avconvBinary || $ffmpegBinary) {
-
 		class Movie extends Provider {
 			public static $avconvBinary;
 			public static $ffmpegBinary;
@@ -95,12 +88,3 @@ if (!\OC_Util::runningOnWindows()) {
 				return false;
 			}
 		}
-
-		// a bit hacky but didn't want to use subclasses
-		Movie::$avconvBinary = $avconvBinary;
-		Movie::$ffmpegBinary = $ffmpegBinary;
-
-		\OC\Preview::registerProvider('OC\Preview\Movie');
-	}
-}
-
diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php
index bb4d3dfce86..661cb92bf62 100644
--- a/lib/private/preview/mp3.php
+++ b/lib/private/preview/mp3.php
@@ -44,5 +44,3 @@ class MP3 extends Provider {
 	}
 
 }
-
-\OC\Preview::registerProvider('OC\Preview\MP3');
diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php
index f5c791e37f2..0f175e811d1 100644
--- a/lib/private/preview/office-cl.php
+++ b/lib/private/preview/office-cl.php
@@ -7,9 +7,6 @@
  */
 namespace OC\Preview;
 
-// office preview is currently not supported on Windows
-if (!\OC_Util::runningOnWindows()) {
-
 	//we need imagick to convert
 	class Office extends Provider {
 
@@ -90,8 +87,6 @@ if (!\OC_Util::runningOnWindows()) {
 
 	}
 
-	\OC\Preview::registerProvider('OC\Preview\MSOfficeDoc');
-
 	//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
 	class MSOffice2003 extends Office {
 
@@ -101,8 +96,6 @@ if (!\OC_Util::runningOnWindows()) {
 
 	}
 
-	\OC\Preview::registerProvider('OC\Preview\MSOffice2003');
-
 	//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx
 	class MSOffice2007 extends Office {
 
@@ -112,8 +105,6 @@ if (!\OC_Util::runningOnWindows()) {
 
 	}
 
-	\OC\Preview::registerProvider('OC\Preview\MSOffice2007');
-
 	//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
 	class OpenDocument extends Office {
 
@@ -123,8 +114,6 @@ if (!\OC_Util::runningOnWindows()) {
 
 	}
 
-	\OC\Preview::registerProvider('OC\Preview\OpenDocument');
-
 	//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm
 	class StarOffice extends Office {
 
@@ -133,6 +122,3 @@ if (!\OC_Util::runningOnWindows()) {
 		}
 
 	}
-
-	\OC\Preview::registerProvider('OC\Preview\StarOffice');
-}
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
deleted file mode 100644
index b47cbc6e08f..00000000000
--- a/lib/private/preview/office.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-//both, libreoffice backend and php fallback, need imagick
-if (extension_loaded('imagick')) {
-
-	$checkImagick = new Imagick();
-
-	if(count($checkImagick->queryFormats('PDF')) === 1) {
-		$isShellExecEnabled = \OC_Helper::is_function_enabled('shell_exec');
-
-		// LibreOffice preview is currently not supported on Windows
-		if (!\OC_Util::runningOnWindows()) {
-			$whichLibreOffice = ($isShellExecEnabled ? shell_exec('command -v libreoffice') : '');
-			$isLibreOfficeAvailable = !empty($whichLibreOffice);
-			$whichOpenOffice = ($isShellExecEnabled ? shell_exec('command -v openoffice') : '');
-			$isOpenOfficeAvailable = !empty($whichOpenOffice);
-			//let's see if there is libreoffice or openoffice on this machine
-			if($isShellExecEnabled && ($isLibreOfficeAvailable || $isOpenOfficeAvailable || is_string(\OC_Config::getValue('preview_libreoffice_path', null)))) {
-				require_once('office-cl.php');
-			}
-		}
-	}
-}
diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php
index f544c2c4b13..10e23efa20a 100644
--- a/lib/private/preview/provider.php
+++ b/lib/private/preview/provider.php
@@ -5,18 +5,21 @@ abstract class Provider {
 	private $options;
 
 	public function __construct($options) {
-		$this->options=$options;
+		$this->options = $options;
 	}
 
+	/**
+	 * @return string Regex with the mimetypes that are supported by this provider
+	 */
 	abstract public function getMimeType();
 
 	/**
 	 * Check if a preview can be generated for $path
 	 *
-	 * @param string $path
+	 * @param \OC\Files\FileInfo $file
 	 * @return bool
 	 */
-	public function isAvailable($path) {
+	public function isAvailable($file) {
 		return true;
 	}
 
@@ -32,5 +35,4 @@ abstract class Provider {
 	 *		OC_Image object of the preview
 	 */
 	abstract public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview);
-
 }
diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php
index 0b5dbc9716f..6ddf8939669 100644
--- a/lib/private/preview/svg.php
+++ b/lib/private/preview/svg.php
@@ -9,12 +9,6 @@ namespace OC\Preview;
 
 use Imagick;
 
-if (extension_loaded('imagick')) {
-
-	$checkImagick = new Imagick();
-
-	if(count($checkImagick->queryFormats('SVG')) === 1) {
-
 		class SVG extends Provider {
 
 			public function getMimeType() {
@@ -50,9 +44,4 @@ if (extension_loaded('imagick')) {
 				//check if image object is valid
 				return $image->valid() ? $image : false;
 			}
-
 		}
-
-		\OC\Preview::registerProvider('OC\Preview\SVG');
-	}
-}
diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php
index 7f01b980c0e..ff612e2509a 100644
--- a/lib/private/preview/txt.php
+++ b/lib/private/preview/txt.php
@@ -8,28 +8,22 @@
 namespace OC\Preview;
 
 class TXT extends Provider {
-
+	/**
+	 * {@inheritDoc}
+	 */
 	public function getMimeType() {
 		return '/text\/plain/';
 	}
 
 	/**
-	 * Check if a preview can be generated for $path
-	 *
-	 * @param \OC\Files\FileInfo $file
-	 * @return bool
+	 * {@inheritDoc}
 	 */
 	public function isAvailable($file) {
 		return $file->getSize() > 5;
 	}
 
 	/**
-	 * @param string $path
-	 * @param int $maxX
-	 * @param int $maxY
-	 * @param boolean $scalingup
-	 * @param \OC\Files\View $fileview
-	 * @return bool|\OC_Image
+	 * {@inheritDoc}
 	 */
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
 
@@ -80,14 +74,9 @@ class TXT extends Provider {
 	}
 }
 
-\OC\Preview::registerProvider('OC\Preview\TXT');
-
 class MarkDown extends TXT {
-
 	public function getMimeType() {
 		return '/text\/(x-)?markdown/';
 	}
 
 }
-
-\OC\Preview::registerProvider('OC\Preview\MarkDown');
-- 
GitLab


From 0d98329cacc52b34d31d77eda6a0cf85fb4e534e Mon Sep 17 00:00:00 2001
From: Richard Clarkson <robert@trash-mail.com>
Date: Thu, 27 Nov 2014 20:26:45 +0100
Subject: [PATCH 578/616] Limit blacklist to php files

During performance optimization I have discovered that the installer scans all files for the blacklisted words. This greatly impacts speed on lower end devices such as the raspberry pie. This commit limits it to PHP files which seems to achieve the desired effect.

I have used the --include option to achieve this, see http://stackoverflow.com/questions/1987926/how-do-i-grep-recursively

This contribution is MIT licensed
---
 lib/private/installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/installer.php b/lib/private/installer.php
index f43969691c7..60ed06ae352 100644
--- a/lib/private/installer.php
+++ b/lib/private/installer.php
@@ -568,7 +568,7 @@ class OC_Installer{
 
 			// iterate the bad patterns
 			foreach($blacklist as $bl) {
-				$cmd = 'grep -ri '.escapeshellarg($bl).' '.$folder.'';
+				$cmd = 'grep --include \\*.php -ri '.escapeshellarg($bl).' '.$folder.'';
 				$result = exec($cmd);
 				// bad pattern found
 				if($result<>'') {
-- 
GitLab


From 96b0328d39f857683b601946c2108ce5b71e5012 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Fri, 28 Nov 2014 01:55:29 -0500
Subject: [PATCH 579/616] [tx-robot] updated from transifex

---
 apps/files/l10n/af_ZA.js            |  1 +
 apps/files/l10n/af_ZA.json          |  1 +
 apps/files_trashbin/l10n/af_ZA.js   |  6 ++++++
 apps/files_trashbin/l10n/af_ZA.json |  4 ++++
 apps/user_ldap/l10n/af_ZA.js        |  1 +
 apps/user_ldap/l10n/af_ZA.json      |  1 +
 apps/user_ldap/l10n/fr.js           |  6 +++---
 apps/user_ldap/l10n/fr.json         |  6 +++---
 core/l10n/da.js                     | 14 +++++++-------
 core/l10n/da.json                   | 14 +++++++-------
 lib/l10n/ca.js                      |  1 +
 lib/l10n/ca.json                    |  1 +
 lib/l10n/da.js                      |  2 +-
 lib/l10n/da.json                    |  2 +-
 settings/l10n/ca.js                 | 30 +++++++++++++++++++++++++++++
 settings/l10n/ca.json               | 30 +++++++++++++++++++++++++++++
 16 files changed, 98 insertions(+), 22 deletions(-)
 create mode 100644 apps/files_trashbin/l10n/af_ZA.js
 create mode 100644 apps/files_trashbin/l10n/af_ZA.json

diff --git a/apps/files/l10n/af_ZA.js b/apps/files/l10n/af_ZA.js
index 1a4639183ed..8671027db6e 100644
--- a/apps/files/l10n/af_ZA.js
+++ b/apps/files/l10n/af_ZA.js
@@ -3,6 +3,7 @@ OC.L10N.register(
     {
     "Share" : "Deel",
     "Unshare" : "Deel terug neem",
+    "Error" : "Fout",
     "_%n folder_::_%n folders_" : ["",""],
     "_%n file_::_%n files_" : ["",""],
     "_Uploading %n file_::_Uploading %n files_" : ["",""],
diff --git a/apps/files/l10n/af_ZA.json b/apps/files/l10n/af_ZA.json
index 0e7116887f0..cd3182e3f69 100644
--- a/apps/files/l10n/af_ZA.json
+++ b/apps/files/l10n/af_ZA.json
@@ -1,6 +1,7 @@
 { "translations": {
     "Share" : "Deel",
     "Unshare" : "Deel terug neem",
+    "Error" : "Fout",
     "_%n folder_::_%n folders_" : ["",""],
     "_%n file_::_%n files_" : ["",""],
     "_Uploading %n file_::_Uploading %n files_" : ["",""],
diff --git a/apps/files_trashbin/l10n/af_ZA.js b/apps/files_trashbin/l10n/af_ZA.js
new file mode 100644
index 00000000000..bde70775250
--- /dev/null
+++ b/apps/files_trashbin/l10n/af_ZA.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "files_trashbin",
+    {
+    "Error" : "Fout"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/apps/files_trashbin/l10n/af_ZA.json b/apps/files_trashbin/l10n/af_ZA.json
new file mode 100644
index 00000000000..0ed511058ba
--- /dev/null
+++ b/apps/files_trashbin/l10n/af_ZA.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Error" : "Fout"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/apps/user_ldap/l10n/af_ZA.js b/apps/user_ldap/l10n/af_ZA.js
index fc00b542daa..610359a094c 100644
--- a/apps/user_ldap/l10n/af_ZA.js
+++ b/apps/user_ldap/l10n/af_ZA.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "user_ldap",
     {
+    "Error" : "Fout",
     "_%s group found_::_%s groups found_" : ["",""],
     "_%s user found_::_%s users found_" : ["",""],
     "Help" : "Hulp",
diff --git a/apps/user_ldap/l10n/af_ZA.json b/apps/user_ldap/l10n/af_ZA.json
index ec83ea0849a..05463be095e 100644
--- a/apps/user_ldap/l10n/af_ZA.json
+++ b/apps/user_ldap/l10n/af_ZA.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Error" : "Fout",
     "_%s group found_::_%s groups found_" : ["",""],
     "_%s user found_::_%s users found_" : ["",""],
     "Help" : "Hulp",
diff --git a/apps/user_ldap/l10n/fr.js b/apps/user_ldap/l10n/fr.js
index d363530f5c5..3aeaaf0bb5c 100644
--- a/apps/user_ldap/l10n/fr.js
+++ b/apps/user_ldap/l10n/fr.js
@@ -97,13 +97,13 @@ OC.L10N.register(
     "in seconds. A change empties the cache." : "en secondes. Tout changement vide le cache.",
     "Directory Settings" : "Paramètres du répertoire",
     "User Display Name Field" : "Champ \"nom d'affichage\" de l'utilisateur",
-    "The LDAP attribute to use to generate the user's display name." : "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.",
+    "The LDAP attribute to use to generate the user's display name." : "L'attribut LDAP utilisé pour générer le nom d'affichage de l'utilisateur.",
     "Base User Tree" : "DN racine de l'arbre utilisateurs",
     "One User Base DN per line" : "Un DN racine utilisateur par ligne",
     "User Search Attributes" : "Recherche des attributs utilisateur",
     "Optional; one attribute per line" : "Optionnel, un attribut par ligne",
     "Group Display Name Field" : "Champ \"nom d'affichage\" du groupe",
-    "The LDAP attribute to use to generate the groups's display name." : "L'attribut LDAP utilisé pour générer le nom de groupe affiché.",
+    "The LDAP attribute to use to generate the groups's display name." : "L'attribut LDAP utilisé pour générer le nom d'affichage du groupe.",
     "Base Group Tree" : "DN racine de l'arbre groupes",
     "One Group Base DN per line" : "Un DN racine groupe par ligne",
     "Group Search Attributes" : "Recherche des attributs du groupe",
@@ -120,7 +120,7 @@ OC.L10N.register(
     "User Home Folder Naming Rule" : "Convention de nommage du répertoire utilisateur",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
     "Internal Username" : "Nom d'utilisateur 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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
+    "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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est ajouté/incrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. Il fait aussi partie de certains URL de services, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
     "Internal Username Attribute:" : "Nom d'utilisateur interne :",
     "Override UUID detection" : "Surcharger la détection d'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." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
diff --git a/apps/user_ldap/l10n/fr.json b/apps/user_ldap/l10n/fr.json
index 9879534bac7..31d56f28b40 100644
--- a/apps/user_ldap/l10n/fr.json
+++ b/apps/user_ldap/l10n/fr.json
@@ -95,13 +95,13 @@
     "in seconds. A change empties the cache." : "en secondes. Tout changement vide le cache.",
     "Directory Settings" : "Paramètres du répertoire",
     "User Display Name Field" : "Champ \"nom d'affichage\" de l'utilisateur",
-    "The LDAP attribute to use to generate the user's display name." : "L'attribut LDAP utilisé pour générer le nom d'utilisateur affiché.",
+    "The LDAP attribute to use to generate the user's display name." : "L'attribut LDAP utilisé pour générer le nom d'affichage de l'utilisateur.",
     "Base User Tree" : "DN racine de l'arbre utilisateurs",
     "One User Base DN per line" : "Un DN racine utilisateur par ligne",
     "User Search Attributes" : "Recherche des attributs utilisateur",
     "Optional; one attribute per line" : "Optionnel, un attribut par ligne",
     "Group Display Name Field" : "Champ \"nom d'affichage\" du groupe",
-    "The LDAP attribute to use to generate the groups's display name." : "L'attribut LDAP utilisé pour générer le nom de groupe affiché.",
+    "The LDAP attribute to use to generate the groups's display name." : "L'attribut LDAP utilisé pour générer le nom d'affichage du groupe.",
     "Base Group Tree" : "DN racine de l'arbre groupes",
     "One Group Base DN per line" : "Un DN racine groupe par ligne",
     "Group Search Attributes" : "Recherche des attributs du groupe",
@@ -118,7 +118,7 @@
     "User Home Folder Naming Rule" : "Convention de nommage du répertoire utilisateur",
     "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." : "Laisser vide ",
     "Internal Username" : "Nom d'utilisateur 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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est incrémenté/décrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. C'est aussi le port d'URLs distants, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
+    "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." : "Par défaut le nom d'utilisateur interne sera créé à partir de l'attribut UUID. Ceci permet d'assurer que le nom d'utilisateur est unique et que les caractères ne nécessitent pas de conversion. Le nom d'utilisateur interne doit contenir uniquement les caractères suivants : [ a-zA-Z0-9_.@- ]. Les autres caractères sont remplacés par leur correspondance ASCII ou simplement omis. En cas de collision, un nombre est ajouté/incrémenté. Le nom d'utilisateur interne est utilisé pour identifier l'utilisateur au sein du système. C'est aussi le nom par défaut du répertoire utilisateur dans ownCloud. Il fait aussi partie de certains URL de services, par exemple pour tous les services *DAV. Le comportement par défaut peut être modifié à l'aide de ce paramètre. Pour obtenir un comportement similaire aux versions précédentes à ownCloud 5, saisir le nom d'utilisateur à afficher dans le champ suivant. Laissez à blanc pour le comportement par défaut. Les modifications prendront effet seulement pour les nouveaux (ajoutés) utilisateurs LDAP.",
     "Internal Username Attribute:" : "Nom d'utilisateur interne :",
     "Override UUID detection" : "Surcharger la détection d'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." : "Par défaut, l'attribut UUID est automatiquement  détecté. Cet attribut est utilisé pour identifier les utilisateurs et groupes de façon fiable. Un nom d'utilisateur interne basé sur l'UUID sera automatiquement créé, sauf s'il est spécifié autrement ci-dessus. Vous pouvez modifier ce comportement et définir l'attribut de votre choix. Vous devez alors vous assurer que l'attribut de votre choix peut être récupéré pour les utilisateurs ainsi que pour les groupes et qu'il soit unique. Laisser à blanc pour le comportement par défaut. Les modifications seront effectives uniquement pour les nouveaux (ajoutés) utilisateurs et groupes LDAP.",
diff --git a/core/l10n/da.js b/core/l10n/da.js
index a1222792fc5..ea228ee8b81 100644
--- a/core/l10n/da.js
+++ b/core/l10n/da.js
@@ -106,9 +106,9 @@ OC.L10N.register(
     "Enter new" : "Indtast nyt",
     "Delete" : "Slet",
     "Add" : "Tilføj",
-    "Edit tags" : "Rediger tags",
+    "Edit tags" : "Redigér mærker",
     "Error loading dialog template: {error}" : "Fejl ved indlæsning dialog skabelon: {error}",
-    "No tags selected for deletion." : "Ingen tags markeret til sletning.",
+    "No tags selected for deletion." : "Ingen mærker markeret til sletning.",
     "unknown text" : "ukendt tekst",
     "Hello world!" : "Hej verden!",
     "sunny" : "solrigt",
@@ -133,11 +133,11 @@ OC.L10N.register(
     "Apps" : "Apps",
     "Admin" : "Admin",
     "Help" : "Hjælp",
-    "Error loading tags" : "Fejl ved indlæsning af tags",
-    "Tag already exists" : "Tag eksistere allerede",
-    "Error deleting tag(s)" : "Fejl ved sletning af tag(s)",
-    "Error tagging" : "Fejl ved tagging",
-    "Error untagging" : "Fejl ved fjernelse af tag",
+    "Error loading tags" : "Fejl ved indlæsning af mærker",
+    "Tag already exists" : "Mærket eksisterer allerede",
+    "Error deleting tag(s)" : "Fejl ved sletning af mærke(r)",
+    "Error tagging" : "Fejl ved opmærkning",
+    "Error untagging" : "Fejl ved fjernelse af opmærkning",
     "Error favoriting" : "Fejl ved favoritering",
     "Error unfavoriting" : "Fejl ved fjernelse af favorisering.",
     "Access forbidden" : "Adgang forbudt",
diff --git a/core/l10n/da.json b/core/l10n/da.json
index 5111e5d3e05..021d43e8c7b 100644
--- a/core/l10n/da.json
+++ b/core/l10n/da.json
@@ -104,9 +104,9 @@
     "Enter new" : "Indtast nyt",
     "Delete" : "Slet",
     "Add" : "Tilføj",
-    "Edit tags" : "Rediger tags",
+    "Edit tags" : "Redigér mærker",
     "Error loading dialog template: {error}" : "Fejl ved indlæsning dialog skabelon: {error}",
-    "No tags selected for deletion." : "Ingen tags markeret til sletning.",
+    "No tags selected for deletion." : "Ingen mærker markeret til sletning.",
     "unknown text" : "ukendt tekst",
     "Hello world!" : "Hej verden!",
     "sunny" : "solrigt",
@@ -131,11 +131,11 @@
     "Apps" : "Apps",
     "Admin" : "Admin",
     "Help" : "Hjælp",
-    "Error loading tags" : "Fejl ved indlæsning af tags",
-    "Tag already exists" : "Tag eksistere allerede",
-    "Error deleting tag(s)" : "Fejl ved sletning af tag(s)",
-    "Error tagging" : "Fejl ved tagging",
-    "Error untagging" : "Fejl ved fjernelse af tag",
+    "Error loading tags" : "Fejl ved indlæsning af mærker",
+    "Tag already exists" : "Mærket eksisterer allerede",
+    "Error deleting tag(s)" : "Fejl ved sletning af mærke(r)",
+    "Error tagging" : "Fejl ved opmærkning",
+    "Error untagging" : "Fejl ved fjernelse af opmærkning",
     "Error favoriting" : "Fejl ved favoritering",
     "Error unfavoriting" : "Fejl ved fjernelse af favorisering.",
     "Access forbidden" : "Adgang forbudt",
diff --git a/lib/l10n/ca.js b/lib/l10n/ca.js
index d416b93503a..3137785d39f 100644
--- a/lib/l10n/ca.js
+++ b/lib/l10n/ca.js
@@ -12,6 +12,7 @@ OC.L10N.register(
     "Settings" : "Configuració",
     "Users" : "Usuaris",
     "Admin" : "Administració",
+    "Recommended" : "Recomanat",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'aplicació \\\"%s\\\" no es pot instal·lar perquè no es compatible amb aquesta versió de ownCloud.",
     "No app name specified" : "No heu especificat cap nom d'aplicació",
     "Unknown filetype" : "Tipus de fitxer desconegut",
diff --git a/lib/l10n/ca.json b/lib/l10n/ca.json
index 2698ed1846f..5efd4f5dad7 100644
--- a/lib/l10n/ca.json
+++ b/lib/l10n/ca.json
@@ -10,6 +10,7 @@
     "Settings" : "Configuració",
     "Users" : "Usuaris",
     "Admin" : "Administració",
+    "Recommended" : "Recomanat",
     "App \\\"%s\\\" can't be installed because it is not compatible with this version of ownCloud." : "L'aplicació \\\"%s\\\" no es pot instal·lar perquè no es compatible amb aquesta versió de ownCloud.",
     "No app name specified" : "No heu especificat cap nom d'aplicació",
     "Unknown filetype" : "Tipus de fitxer desconegut",
diff --git a/lib/l10n/da.js b/lib/l10n/da.js
index af85c3e93d1..09422654c6d 100644
--- a/lib/l10n/da.js
+++ b/lib/l10n/da.js
@@ -30,7 +30,7 @@ OC.L10N.register(
     "App does not provide an info.xml file" : "Der følger ingen info.xml-fil med appen",
     "App can't be installed because of not allowed code in the App" : "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
     "App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
-    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan ikke installeres, da den indeholder mærket <shipped>true</shipped>, hvilket ikke er tilladt for ikke-medfølgende apps",
     "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
     "Application is not enabled" : "Programmet er ikke aktiveret",
     "Authentication error" : "Adgangsfejl",
diff --git a/lib/l10n/da.json b/lib/l10n/da.json
index 59ff0e87b98..19a080fdf4a 100644
--- a/lib/l10n/da.json
+++ b/lib/l10n/da.json
@@ -28,7 +28,7 @@
     "App does not provide an info.xml file" : "Der følger ingen info.xml-fil med appen",
     "App can't be installed because of not allowed code in the App" : "Appen kan ikke installeres, da den indeholder ikke-tilladt kode",
     "App can't be installed because it is not compatible with this version of ownCloud" : "Appen kan ikke installeres, da den ikke er kompatibel med denne version af ownCloud.",
-    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan ikke installeres, da den indeholder taget\n<shipped>\n\ntrue\n</shipped>\n\nhvilket ikke er tilladt for ikke-medfølgende apps",
+    "App can't be installed because it contains the <shipped>true</shipped> tag which is not allowed for non shipped apps" : "Appen kan ikke installeres, da den indeholder mærket <shipped>true</shipped>, hvilket ikke er tilladt for ikke-medfølgende apps",
     "App can't be installed because the version in info.xml/version is not the same as the version reported from the app store" : "App kan ikke installeres, da versionen i info.xml/version ikke er den samme som versionen rapporteret fra app-storen",
     "Application is not enabled" : "Programmet er ikke aktiveret",
     "Authentication error" : "Adgangsfejl",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 7a3e95c7cbd..7ed156f10cd 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -1,6 +1,7 @@
 OC.L10N.register(
     "settings",
     {
+    "Security & Setup Warnings" : "Avisos de seguretat i configuració",
     "Cron" : "Cron",
     "Sharing" : "Compartir",
     "Security" : "Seguretat",
@@ -36,11 +37,16 @@ OC.L10N.register(
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
     "Unable to change password" : "No es pot canviar la contrasenya",
     "Enabled" : "Activat",
+    "Not enabled" : "Desactivat",
+    "Recommended" : "Recomanat",
     "Saved" : "Desat",
     "test email settings" : "prova l'arranjament del correu",
     "If you received this email, the settings seem to be correct." : "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
+    "A problem occurred while sending the email. Please revise your settings." : "Hi ha hagut un problema enviant el correu. Reviseu la configuració.",
     "Email sent" : "El correu electrónic s'ha enviat",
     "You need to set your user email before being able to send test emails." : "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Esteu seguir que voleu afegir \"{domain}\" com a un domini de confiança?",
+    "Add trusted domain" : "Afegir domini de confiança",
     "Sending..." : "Enviant...",
     "All" : "Tots",
     "Please wait...." : "Espereu...",
@@ -60,6 +66,7 @@ OC.L10N.register(
     "So-so password" : "Contrasenya passable",
     "Good password" : "Contrasenya bona",
     "Strong password" : "Contrasenya forta",
+    "Valid until {date}" : "Vàlid fins {date}",
     "Delete" : "Esborra",
     "Decrypting files... Please wait, this can take some time." : "Desencriptant fitxers... Espereu, això pot trigar una estona.",
     "Delete encryption keys permanently." : "Esborra les claus d'encriptació permanentment.",
@@ -70,6 +77,7 @@ OC.L10N.register(
     "A valid group name must be provided" : "Heu de facilitar un nom de grup vàlid",
     "deleted {groupName}" : "eliminat {groupName}",
     "undo" : "desfés",
+    "no group" : "sense grup",
     "never" : "mai",
     "deleted {userName}" : "eliminat {userName}",
     "add group" : "afegeix grup",
@@ -78,6 +86,7 @@ OC.L10N.register(
     "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida",
     "Warning: Home directory for user \"{user}\" already exists" : "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
     "__language_name__" : "Català",
+    "Personal Info" : "Informació personal",
     "SSL root certificates" : "Certificats SSL root",
     "Encryption" : "Xifrat",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)",
@@ -103,15 +112,22 @@ OC.L10N.register(
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
     "Your PHP version is outdated" : "La versió de PHP és obsoleta",
     "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament.",
+    "PHP charset is not set to UTF-8" : "El codi de caràcters del php no és UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "El codi de caràcters del php no és UTF-8. Això pot provocar greus problemes amb caràcter no-ASCII. Recomanem fermament canviar el valor del 'default_charset' del php.ini a 'UTF-8'",
     "Locale not working" : "Locale no funciona",
     "System locale can not be set to a one which supports UTF-8." : "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Recomanem fermament que instal·leu els paquets requerits en el vostre sistema per suportar un dels següents idiomes: %s",
+    "URL generation in notification emails" : "Generar URL en els correus de notificació",
+    "Connectivity Checks" : "Verificacions de connectivitat",
+    "No problems found" : "No hem trovat problemes",
     "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
     "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
     "Cron was not executed yet!" : "El cron encara no s'ha executat!",
     "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Fer servir el cron del sistema per cridar el cron.php cada 15 minuts.",
     "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
     "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
     "Enforce password protection" : "Reforça la protecció amb contrasenya",
@@ -127,6 +143,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
     "Enforce HTTPS" : "Força HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Força la connexió dels clients a %s a través d'una connexió encriptada.",
+    "Enforce HTTPS for subdomains" : "Forçar HTTPS per subdominis",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Força els clients a connectar-se a %s i els subdominis amb una connexió xifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
     "This is used for sending out notifications." : "S'usa per enviar notificacions.",
     "Send mode" : "Mode d'enviament",
@@ -139,6 +157,7 @@ OC.L10N.register(
     "Credentials" : "Credencials",
     "SMTP Username" : "Nom d'usuari SMTP",
     "SMTP Password" : "Contrasenya SMTP",
+    "Store credentials" : "Emmagatzemar credencials",
     "Test email settings" : "Prova l'arranjament del correu",
     "Send email" : "Envia correu",
     "Log level" : "Nivell de registre",
@@ -147,10 +166,13 @@ OC.L10N.register(
     "Version" : "Versió",
     "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>." : "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Més aplicacions",
+    "Add your app" : "Afegiu la vostra app",
     "by" : "per",
+    "licensed" : "llicenciat/da",
     "Documentation:" : "Documentació:",
     "User Documentation" : "Documentació d'usuari",
     "Admin Documentation" : "Documentació d'administrador",
+    "Update to %s" : "Actualitzar a %s",
     "Enable only for specific groups" : "Activa només per grups específics",
     "Uninstall App" : "Desinstal·la l'aplicació",
     "Administrator Documentation" : "Documentació d'administrador",
@@ -182,6 +204,10 @@ OC.L10N.register(
     "Choose as profile image" : "Selecciona com a imatge de perfil",
     "Language" : "Idioma",
     "Help translate" : "Ajudeu-nos amb la traducció",
+    "Common Name" : "Nom comú",
+    "Valid until" : "Valid fins",
+    "Issued By" : "Emès Per",
+    "Valid until %s" : "Vàlid fins %s",
     "Import Root Certificate" : "Importa certificat root",
     "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
     "Log-in password" : "Contrasenya d'accés",
@@ -189,10 +215,13 @@ OC.L10N.register(
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
     "Restore Encryption Keys" : "Restableix les claus d'encriptació",
     "Delete Encryption Keys" : "Esborra les claus d'encriptació",
+    "Show storage location" : "Mostra la ubicació del magatzem",
+    "Show last log in" : "Mostrar l'últim accés",
     "Username" : "Nom d'usuari",
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
+    "Search Users" : "Buscar usuaris",
     "Add Group" : "Afegeix grup",
     "Group" : "Grup",
     "Everyone" : "Tothom",
@@ -201,6 +230,7 @@ OC.L10N.register(
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Il·limitat",
     "Other" : "Un altre",
+    "Group Admin for" : "Grup Admin per",
     "Quota" : "Quota",
     "Storage Location" : "Ubicació de l'emmagatzemament",
     "Last Login" : "Últim accés",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 9298c84ae75..52e397cd1fe 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -1,4 +1,5 @@
 { "translations": {
+    "Security & Setup Warnings" : "Avisos de seguretat i configuració",
     "Cron" : "Cron",
     "Sharing" : "Compartir",
     "Security" : "Seguretat",
@@ -34,11 +35,16 @@
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "El dorsal no permet canviar la contrasenya, però la clau d'encripació d'usuaris s'ha actualitzat correctament.",
     "Unable to change password" : "No es pot canviar la contrasenya",
     "Enabled" : "Activat",
+    "Not enabled" : "Desactivat",
+    "Recommended" : "Recomanat",
     "Saved" : "Desat",
     "test email settings" : "prova l'arranjament del correu",
     "If you received this email, the settings seem to be correct." : "Si rebeu aquest correu sembla que l'arranjament del correu és correcte.",
+    "A problem occurred while sending the email. Please revise your settings." : "Hi ha hagut un problema enviant el correu. Reviseu la configuració.",
     "Email sent" : "El correu electrónic s'ha enviat",
     "You need to set your user email before being able to send test emails." : "Heu d'establir un nom d'usuari abans de poder enviar correus de prova.",
+    "Are you really sure you want add \"{domain}\" as trusted domain?" : "Esteu seguir que voleu afegir \"{domain}\" com a un domini de confiança?",
+    "Add trusted domain" : "Afegir domini de confiança",
     "Sending..." : "Enviant...",
     "All" : "Tots",
     "Please wait...." : "Espereu...",
@@ -58,6 +64,7 @@
     "So-so password" : "Contrasenya passable",
     "Good password" : "Contrasenya bona",
     "Strong password" : "Contrasenya forta",
+    "Valid until {date}" : "Vàlid fins {date}",
     "Delete" : "Esborra",
     "Decrypting files... Please wait, this can take some time." : "Desencriptant fitxers... Espereu, això pot trigar una estona.",
     "Delete encryption keys permanently." : "Esborra les claus d'encriptació permanentment.",
@@ -68,6 +75,7 @@
     "A valid group name must be provided" : "Heu de facilitar un nom de grup vàlid",
     "deleted {groupName}" : "eliminat {groupName}",
     "undo" : "desfés",
+    "no group" : "sense grup",
     "never" : "mai",
     "deleted {userName}" : "eliminat {userName}",
     "add group" : "afegeix grup",
@@ -76,6 +84,7 @@
     "A valid password must be provided" : "Heu de facilitar una contrasenya vàlida",
     "Warning: Home directory for user \"{user}\" already exists" : "Avís: la carpeta Home per l'usuari \"{user}\" ja existeix",
     "__language_name__" : "Català",
+    "Personal Info" : "Informació personal",
     "SSL root certificates" : "Certificats SSL root",
     "Encryption" : "Xifrat",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tot (problemes fatals, errors, avisos, informació, depuració)",
@@ -101,15 +110,22 @@
     "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." : "El mòdul de PHP 'fileinfo' no s'ha trobat. Us recomanem que habiliteu aquest mòdul per obtenir millors resultats amb la detecció mime-type.",
     "Your PHP version is outdated" : "La versió de PHP és obsoleta",
     "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "La versió de PHP és obsoleta. Us recomanem fermament que actualitzeu a la versió 5.3.8 o superior perquè les versions anteriors no funcionen. La instal·lació podria no funcionar correctament.",
+    "PHP charset is not set to UTF-8" : "El codi de caràcters del php no és UTF-8",
+    "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "El codi de caràcters del php no és UTF-8. Això pot provocar greus problemes amb caràcter no-ASCII. Recomanem fermament canviar el valor del 'default_charset' del php.ini a 'UTF-8'",
     "Locale not working" : "Locale no funciona",
     "System locale can not be set to a one which supports UTF-8." : "No s'ha pogut establir cap localització del sistema amb suport per UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Això podria comportar problemes amb alguns caràcters en els noms dels fitxer.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Recomanem fermament que instal·leu els paquets requerits en el vostre sistema per suportar un dels següents idiomes: %s",
+    "URL generation in notification emails" : "Generar URL en els correus de notificació",
+    "Connectivity Checks" : "Verificacions de connectivitat",
+    "No problems found" : "No hem trovat problemes",
     "Please double check the <a href='%s'>installation guides</a>." : "Comproveu les <a href='%s'>guies d'instal·lació</a>.",
     "Last cron was executed at %s." : "L'últim cron s'ha executat el %s",
     "Last cron was executed at %s. This is more than an hour ago, something seems wrong." : "L'últim cron es va executar a %s. Fa més d'una hora, alguna cosa sembla que va malament.",
     "Cron was not executed yet!" : "El cron encara no s'ha executat!",
     "Execute one task with each page loaded" : "Executa una tasca per cada paquet carregat",
     "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." : "cron.php està registrat en un servei webcron que fa una crida a cron.php cada 15 minuts a través de http.",
+    "Use system's cron service to call the cron.php file every 15 minutes." : "Fer servir el cron del sistema per cridar el cron.php cada 15 minuts.",
     "Allow apps to use the Share API" : "Permet que les aplicacions utilitzin l'API de compartir",
     "Allow users to share via link" : "Permet als usuaris compartir a través d'enllaços",
     "Enforce password protection" : "Reforça la protecció amb contrasenya",
@@ -125,6 +141,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Aquests fitxers encara podran rebre compartits, però no podran iniciar-los.",
     "Enforce HTTPS" : "Força HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Força la connexió dels clients a %s a través d'una connexió encriptada.",
+    "Enforce HTTPS for subdomains" : "Forçar HTTPS per subdominis",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Força els clients a connectar-se a %s i els subdominis amb una connexió xifrada.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Connecteu a %s a través de HTTPS per habilitar o inhabilitar l'accés SSL.",
     "This is used for sending out notifications." : "S'usa per enviar notificacions.",
     "Send mode" : "Mode d'enviament",
@@ -137,6 +155,7 @@
     "Credentials" : "Credencials",
     "SMTP Username" : "Nom d'usuari SMTP",
     "SMTP Password" : "Contrasenya SMTP",
+    "Store credentials" : "Emmagatzemar credencials",
     "Test email settings" : "Prova l'arranjament del correu",
     "Send email" : "Envia correu",
     "Log level" : "Nivell de registre",
@@ -145,10 +164,13 @@
     "Version" : "Versió",
     "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>." : "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
     "More apps" : "Més aplicacions",
+    "Add your app" : "Afegiu la vostra app",
     "by" : "per",
+    "licensed" : "llicenciat/da",
     "Documentation:" : "Documentació:",
     "User Documentation" : "Documentació d'usuari",
     "Admin Documentation" : "Documentació d'administrador",
+    "Update to %s" : "Actualitzar a %s",
     "Enable only for specific groups" : "Activa només per grups específics",
     "Uninstall App" : "Desinstal·la l'aplicació",
     "Administrator Documentation" : "Documentació d'administrador",
@@ -180,6 +202,10 @@
     "Choose as profile image" : "Selecciona com a imatge de perfil",
     "Language" : "Idioma",
     "Help translate" : "Ajudeu-nos amb la traducció",
+    "Common Name" : "Nom comú",
+    "Valid until" : "Valid fins",
+    "Issued By" : "Emès Per",
+    "Valid until %s" : "Vàlid fins %s",
     "Import Root Certificate" : "Importa certificat root",
     "The encryption app is no longer enabled, please decrypt all your files" : "L'aplicació d'encriptació ja no està activada, desencripteu tots els vostres fitxers",
     "Log-in password" : "Contrasenya d'accés",
@@ -187,10 +213,13 @@
     "Your encryption keys are moved to a backup location. If something went wrong you can restore the keys. Only delete them permanently if you are sure that all files are decrypted correctly." : "Les claus d'encriptació s'han mogut a una còpia de seguretat. Si alguna cosa va malament les podreu restablir. Esborreu-les permanentment només si esteu segur que tots els fitxers es desencripten correctament.",
     "Restore Encryption Keys" : "Restableix les claus d'encriptació",
     "Delete Encryption Keys" : "Esborra les claus d'encriptació",
+    "Show storage location" : "Mostra la ubicació del magatzem",
+    "Show last log in" : "Mostrar l'últim accés",
     "Username" : "Nom d'usuari",
     "Create" : "Crea",
     "Admin Recovery Password" : "Recuperació de contrasenya d'administrador",
     "Enter the recovery password in order to recover the users files during password change" : "Escriviu la contrasenya de recuperació per a poder recuperar els fitxers dels usuaris en canviar la contrasenya",
+    "Search Users" : "Buscar usuaris",
     "Add Group" : "Afegeix grup",
     "Group" : "Grup",
     "Everyone" : "Tothom",
@@ -199,6 +228,7 @@
     "Please enter storage quota (ex: \"512 MB\" or \"12 GB\")" : "Escriviu la quota d'emmagatzemament (per ex.: \"512 MB\" o \"12 GB\")",
     "Unlimited" : "Il·limitat",
     "Other" : "Un altre",
+    "Group Admin for" : "Grup Admin per",
     "Quota" : "Quota",
     "Storage Location" : "Ubicació de l'emmagatzemament",
     "Last Login" : "Últim accés",
-- 
GitLab


From 9cb54e380907f23af4a59e25a7bfdb816844b76c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Nov 2014 09:16:35 +0100
Subject: [PATCH 580/616] Fix intendation and doc blocks of preview providers

---
 lib/private/preview.php          |   5 --
 lib/private/preview/image.php    |   7 +-
 lib/private/preview/markdown.php |  18 ++++
 lib/private/preview/movie.php    | 136 ++++++++++++++++---------------
 lib/private/preview/mp3.php      |  13 ++-
 lib/private/preview/provider.php |   2 +-
 lib/private/preview/svg.php      |  70 ++++++++--------
 lib/private/preview/txt.php      |   8 --
 8 files changed, 143 insertions(+), 116 deletions(-)
 create mode 100644 lib/private/preview/markdown.php

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 6547d5b3258..f08a0ce2c27 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -16,11 +16,6 @@ namespace OC;
 use OC\Preview\Provider;
 use OCP\Files\NotFoundException;
 
-require_once 'preview/image.php';
-require_once 'preview/movie.php';
-require_once 'preview/mp3.php';
-require_once 'preview/svg.php';
-require_once 'preview/txt.php';
 require_once 'preview/office-cl.php';
 require_once 'preview/bitmap.php';
 
diff --git a/lib/private/preview/image.php b/lib/private/preview/image.php
index 511052caf2b..986a44b48fd 100644
--- a/lib/private/preview/image.php
+++ b/lib/private/preview/image.php
@@ -9,11 +9,16 @@
 namespace OC\Preview;
 
 class Image extends Provider {
-
+	/**
+	 * {@inheritDoc}
+	 */
 	public function getMimeType() {
 		return '/image\/(?!tiff$)(?!svg.*).*/';
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
 		//get fileinfo
 		$fileInfo = $fileview->getFileInfo($path);
diff --git a/lib/private/preview/markdown.php b/lib/private/preview/markdown.php
new file mode 100644
index 00000000000..1be01fcdd4c
--- /dev/null
+++ b/lib/private/preview/markdown.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+class MarkDown extends TXT {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/text\/(x-)?markdown/';
+	}
+
+}
diff --git a/lib/private/preview/movie.php b/lib/private/preview/movie.php
index 850027c1a64..06353ddebb7 100644
--- a/lib/private/preview/movie.php
+++ b/lib/private/preview/movie.php
@@ -8,83 +8,87 @@
  */
 namespace OC\Preview;
 
-		class Movie extends Provider {
-			public static $avconvBinary;
-			public static $ffmpegBinary;
+class Movie extends Provider {
+	public static $avconvBinary;
+	public static $ffmpegBinary;
 
-			public function getMimeType() {
-				return '/video\/.*/';
-			}
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/video\/.*/';
+	}
 
-			public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-				// TODO: use proc_open() and stream the source file ?
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+		// TODO: use proc_open() and stream the source file ?
 
-				$fileInfo = $fileview->getFileInfo($path);
-				$useFileDirectly = (!$fileInfo->isEncrypted() && !$fileInfo->isMounted());
+		$fileInfo = $fileview->getFileInfo($path);
+		$useFileDirectly = (!$fileInfo->isEncrypted() && !$fileInfo->isMounted());
 
-				if ($useFileDirectly) {
-					$absPath = $fileview->getLocalFile($path);
-				} else {
-					$absPath = \OC_Helper::tmpFile();
+		if ($useFileDirectly) {
+			$absPath = $fileview->getLocalFile($path);
+		} else {
+			$absPath = \OC_Helper::tmpFile();
 
-					$handle = $fileview->fopen($path, 'rb');
+			$handle = $fileview->fopen($path, 'rb');
 
-					// we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
-					// in some cases 1MB was no enough to generate thumbnail
-					$firstmb = stream_get_contents($handle, 5242880);
-					file_put_contents($absPath, $firstmb);
-				}
+			// we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
+			// in some cases 1MB was no enough to generate thumbnail
+			$firstmb = stream_get_contents($handle, 5242880);
+			file_put_contents($absPath, $firstmb);
+		}
 
-				$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
-				if ($result === false) {
-					$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
-					if ($result === false) {
-						$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
-					}
-				}
+		$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
+		if ($result === false) {
+			$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
+			if ($result === false) {
+				$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
+			}
+		}
 
-				if (!$useFileDirectly) {
-					unlink($absPath);
-				}
+		if (!$useFileDirectly) {
+			unlink($absPath);
+		}
 
-				return $result;
-			}
+		return $result;
+	}
 
-			/**
-			 * @param int $maxX
-			 * @param int $maxY
-			 * @param string $absPath
-			 * @param string $tmpPath
-			 * @param int $second
-			 * @return bool|\OC_Image
-			 */
-			private function generateThumbNail($maxX, $maxY, $absPath, $second)
-			{
-				$tmpPath = \OC_Helper::tmpFile();
+	/**
+	 * @param int $maxX
+	 * @param int $maxY
+	 * @param string $absPath
+	 * @param int $second
+	 * @return bool|\OC_Image
+	 */
+	private function generateThumbNail($maxX, $maxY, $absPath, $second) {
+		$tmpPath = \OC_Helper::tmpFile();
 
-				if (self::$avconvBinary) {
-					$cmd = self::$avconvBinary . ' -an -y -ss ' . escapeshellarg($second) .
-						' -i ' . escapeshellarg($absPath) .
-						' -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
-						' > /dev/null 2>&1';
-				} else {
-					$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
-						' -i ' . escapeshellarg($absPath) .
-						' -f mjpeg -vframes 1' .
-						' -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) .
-						' ' . escapeshellarg($tmpPath) .
-						' > /dev/null 2>&1';
-				}
+		if (self::$avconvBinary) {
+			$cmd = self::$avconvBinary . ' -an -y -ss ' . escapeshellarg($second) .
+				' -i ' . escapeshellarg($absPath) .
+				' -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
+				' > /dev/null 2>&1';
+		} else {
+			$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
+				' -i ' . escapeshellarg($absPath) .
+				' -f mjpeg -vframes 1' .
+				' -s ' . escapeshellarg($maxX) . 'x' . escapeshellarg($maxY) .
+				' ' . escapeshellarg($tmpPath) .
+				' > /dev/null 2>&1';
+		}
 
-				exec($cmd, $output, $returnCode);
+		exec($cmd, $output, $returnCode);
 
-				if ($returnCode === 0) {
-					$image = new \OC_Image();
-					$image->loadFromFile($tmpPath);
-					unlink($tmpPath);
-					return $image->valid() ? $image : false;
-				}
-				unlink($tmpPath);
-				return false;
-			}
+		if ($returnCode === 0) {
+			$image = new \OC_Image();
+			$image->loadFromFile($tmpPath);
+			unlink($tmpPath);
+			return $image->valid() ? $image : false;
 		}
+		unlink($tmpPath);
+		return false;
+	}
+}
diff --git a/lib/private/preview/mp3.php b/lib/private/preview/mp3.php
index 661cb92bf62..f1a50d99e13 100644
--- a/lib/private/preview/mp3.php
+++ b/lib/private/preview/mp3.php
@@ -8,11 +8,16 @@
 namespace OC\Preview;
 
 class MP3 extends Provider {
-
+	/**
+	 * {@inheritDoc}
+	 */
 	public function getMimeType() {
 		return '/audio\/mpeg/';
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
 		$getID3 = new \getID3();
 
@@ -31,6 +36,12 @@ class MP3 extends Provider {
 		return $this->getNoCoverThumbnail();
 	}
 
+	/**
+	 * Generates a default image when the file has no cover
+	 *
+	 * @return false|\OC_Image	False if the default image is missing or invalid,
+	 *							otherwise the image is returned as \OC_Image
+	 */
 	private function getNoCoverThumbnail() {
 		$icon = \OC::$SERVERROOT . '/core/img/filetypes/audio.png';
 
diff --git a/lib/private/preview/provider.php b/lib/private/preview/provider.php
index 10e23efa20a..ead67eaeef7 100644
--- a/lib/private/preview/provider.php
+++ b/lib/private/preview/provider.php
@@ -29,7 +29,7 @@ abstract class Provider {
 	 * @param int $maxX The maximum X size of the thumbnail. It can be smaller depending on the shape of the image
 	 * @param int $maxY The maximum Y size of the thumbnail. It can be smaller depending on the shape of the image
 	 * @param bool $scalingup Disable/Enable upscaling of previews
-	 * @param object $fileview fileview object of user folder
+	 * @param \OC\Files\View $fileview fileview object of user folder
 	 * @return mixed
 	 * 		false if no preview was generated
 	 *		OC_Image object of the preview
diff --git a/lib/private/preview/svg.php b/lib/private/preview/svg.php
index 6ddf8939669..561e87a6500 100644
--- a/lib/private/preview/svg.php
+++ b/lib/private/preview/svg.php
@@ -7,41 +7,43 @@
  */
 namespace OC\Preview;
 
-use Imagick;
-
-		class SVG extends Provider {
-
-			public function getMimeType() {
-				return '/image\/svg\+xml/';
+class SVG extends Provider {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/image\/svg\+xml/';
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+		try{
+			$svg = new \Imagick();
+			$svg->setBackgroundColor(new \ImagickPixel('transparent'));
+
+			$content = stream_get_contents($fileview->fopen($path, 'r'));
+			if(substr($content, 0, 5) !== '<?xml') {
+				$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
 			}
 
-			public function getThumbnail($path,$maxX,$maxY,$scalingup,$fileview) {
-				try{
-					$svg = new Imagick();
-					$svg->setBackgroundColor(new \ImagickPixel('transparent'));
-
-					$content = stream_get_contents($fileview->fopen($path, 'r'));
-					if(substr($content, 0, 5) !== '<?xml') {
-						$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
-					}
-
-					// Do not parse SVG files with references
-					if(stripos($content, 'xlink:href') !== false) {
-						return false;
-					}
-
-					$svg->readImageBlob($content);
-					$svg->setImageFormat('png32');
-				} catch (\Exception $e) {
-					\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-					return false;
-				}
-
-
-				//new image object
-				$image = new \OC_Image();
-				$image->loadFromData($svg);
-				//check if image object is valid
-				return $image->valid() ? $image : false;
+			// Do not parse SVG files with references
+			if(stripos($content, 'xlink:href') !== false) {
+				return false;
 			}
+
+			$svg->readImageBlob($content);
+			$svg->setImageFormat('png32');
+		} catch (\Exception $e) {
+			\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+			return false;
 		}
+
+		//new image object
+		$image = new \OC_Image();
+		$image->loadFromData($svg);
+		//check if image object is valid
+		return $image->valid() ? $image : false;
+	}
+}
diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php
index ff612e2509a..8b414dc5726 100644
--- a/lib/private/preview/txt.php
+++ b/lib/private/preview/txt.php
@@ -26,7 +26,6 @@ class TXT extends Provider {
 	 * {@inheritDoc}
 	 */
 	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-
 		$content = $fileview->fopen($path, 'r');
 		$content = stream_get_contents($content,3000);
 
@@ -73,10 +72,3 @@ class TXT extends Provider {
 		return $image->valid() ? $image : false;
 	}
 }
-
-class MarkDown extends TXT {
-	public function getMimeType() {
-		return '/text\/(x-)?markdown/';
-	}
-
-}
-- 
GitLab


From 3ec42ad59887deafd8705a687d3dd0885d4e2bbe Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Nov 2014 09:20:58 +0100
Subject: [PATCH 581/616] Split office providers into one class per file

---
 lib/private/preview.php              |   1 -
 lib/private/preview/msoffice2003.php |  18 ++++
 lib/private/preview/msoffice2007.php |  18 ++++
 lib/private/preview/msofficedoc.php  |  18 ++++
 lib/private/preview/office-cl.php    | 124 ---------------------------
 lib/private/preview/office.php       |  76 ++++++++++++++++
 lib/private/preview/opendocument.php |  18 ++++
 lib/private/preview/staroffice.php   |  18 ++++
 8 files changed, 166 insertions(+), 125 deletions(-)
 create mode 100644 lib/private/preview/msoffice2003.php
 create mode 100644 lib/private/preview/msoffice2007.php
 create mode 100644 lib/private/preview/msofficedoc.php
 delete mode 100644 lib/private/preview/office-cl.php
 create mode 100644 lib/private/preview/office.php
 create mode 100644 lib/private/preview/opendocument.php
 create mode 100644 lib/private/preview/staroffice.php

diff --git a/lib/private/preview.php b/lib/private/preview.php
index f08a0ce2c27..696895cd3ad 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -16,7 +16,6 @@ namespace OC;
 use OC\Preview\Provider;
 use OCP\Files\NotFoundException;
 
-require_once 'preview/office-cl.php';
 require_once 'preview/bitmap.php';
 
 class Preview {
diff --git a/lib/private/preview/msoffice2003.php b/lib/private/preview/msoffice2003.php
new file mode 100644
index 00000000000..55fbe708435
--- /dev/null
+++ b/lib/private/preview/msoffice2003.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
+class MSOffice2003 extends Office {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/vnd.ms-.*/';
+	}
+}
diff --git a/lib/private/preview/msoffice2007.php b/lib/private/preview/msoffice2007.php
new file mode 100644
index 00000000000..ace246eb6d9
--- /dev/null
+++ b/lib/private/preview/msoffice2007.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx
+class MSOffice2007 extends Office {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/vnd.openxmlformats-officedocument.*/';
+	}
+}
diff --git a/lib/private/preview/msofficedoc.php b/lib/private/preview/msofficedoc.php
new file mode 100644
index 00000000000..42507af2233
--- /dev/null
+++ b/lib/private/preview/msofficedoc.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+//.doc, .dot
+class MSOfficeDoc extends Office {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/msword/';
+	}
+}
diff --git a/lib/private/preview/office-cl.php b/lib/private/preview/office-cl.php
deleted file mode 100644
index 0f175e811d1..00000000000
--- a/lib/private/preview/office-cl.php
+++ /dev/null
@@ -1,124 +0,0 @@
-<?php
-/**
- * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-namespace OC\Preview;
-
-	//we need imagick to convert
-	class Office extends Provider {
-
-		private $cmd;
-
-		public function getMimeType() {
-			return null;
-		}
-
-		public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-			$this->initCmd();
-			if(is_null($this->cmd)) {
-				return false;
-			}
-
-			$absPath = $fileview->toTmpFile($path);
-
-			$tmpDir = get_temp_dir();
-
-			$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);
-
-			$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
-
-			shell_exec($exec);
-
-			//create imagick object from pdf
-			try{
-				$pdf = new \imagick($absPath . '.pdf' . '[0]');
-				$pdf->setImageFormat('jpg');
-			} catch (\Exception $e) {
-				unlink($absPath);
-				unlink($absPath . '.pdf');
-				\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-				return false;
-			}
-
-			$image = new \OC_Image();
-			$image->loadFromData($pdf);
-
-			unlink($absPath);
-			unlink($absPath . '.pdf');
-
-			return $image->valid() ? $image : false;
-		}
-
-		private function initCmd() {
-			$cmd = '';
-
-			if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) {
-				$cmd = \OC_Config::getValue('preview_libreoffice_path', null);
-			}
-
-			$whichLibreOffice = shell_exec('command -v libreoffice');
-			if($cmd === '' && !empty($whichLibreOffice)) {
-				$cmd = 'libreoffice';
-			}
-
-			$whichOpenOffice = shell_exec('command -v openoffice');
-			if($cmd === '' && !empty($whichOpenOffice)) {
-				$cmd = 'openoffice';
-			}
-
-			if($cmd === '') {
-				$cmd = null;
-			}
-
-			$this->cmd = $cmd;
-		}
-	}
-
-	//.doc, .dot
-	class MSOfficeDoc extends Office {
-
-		public function getMimeType() {
-			return '/application\/msword/';
-		}
-
-	}
-
-	//.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
-	class MSOffice2003 extends Office {
-
-		public function getMimeType() {
-			return '/application\/vnd.ms-.*/';
-		}
-
-	}
-
-	//.docx, .dotx, .xlsx, .xltx, .pptx, .potx, .ppsx
-	class MSOffice2007 extends Office {
-
-		public function getMimeType() {
-			return '/application\/vnd.openxmlformats-officedocument.*/';
-		}
-
-	}
-
-	//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
-	class OpenDocument extends Office {
-
-		public function getMimeType() {
-			return '/application\/vnd.oasis.opendocument.*/';
-		}
-
-	}
-
-	//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm
-	class StarOffice extends Office {
-
-		public function getMimeType() {
-			return '/application\/vnd.sun.xml.*/';
-		}
-
-	}
diff --git a/lib/private/preview/office.php b/lib/private/preview/office.php
new file mode 100644
index 00000000000..5bd61bde3be
--- /dev/null
+++ b/lib/private/preview/office.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+abstract class Office extends Provider {
+	private $cmd;
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+		$this->initCmd();
+		if(is_null($this->cmd)) {
+			return false;
+		}
+
+		$absPath = $fileview->toTmpFile($path);
+
+		$tmpDir = get_temp_dir();
+
+		$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);
+
+		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+
+		shell_exec($exec);
+
+		//create imagick object from pdf
+		try{
+			$pdf = new \imagick($absPath . '.pdf' . '[0]');
+			$pdf->setImageFormat('jpg');
+		} catch (\Exception $e) {
+			unlink($absPath);
+			unlink($absPath . '.pdf');
+			\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+			return false;
+		}
+
+		$image = new \OC_Image();
+		$image->loadFromData($pdf);
+
+		unlink($absPath);
+		unlink($absPath . '.pdf');
+
+		return $image->valid() ? $image : false;
+	}
+
+	private function initCmd() {
+		$cmd = '';
+
+		if(is_string(\OC_Config::getValue('preview_libreoffice_path', null))) {
+			$cmd = \OC_Config::getValue('preview_libreoffice_path', null);
+		}
+
+		$whichLibreOffice = shell_exec('command -v libreoffice');
+		if($cmd === '' && !empty($whichLibreOffice)) {
+			$cmd = 'libreoffice';
+		}
+
+		$whichOpenOffice = shell_exec('command -v openoffice');
+		if($cmd === '' && !empty($whichOpenOffice)) {
+			$cmd = 'openoffice';
+		}
+
+		if($cmd === '') {
+			$cmd = null;
+		}
+
+		$this->cmd = $cmd;
+	}
+}
diff --git a/lib/private/preview/opendocument.php b/lib/private/preview/opendocument.php
new file mode 100644
index 00000000000..fe1468ee941
--- /dev/null
+++ b/lib/private/preview/opendocument.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+//.odt, .ott, .oth, .odm, .odg, .otg, .odp, .otp, .ods, .ots, .odc, .odf, .odb, .odi, .oxt
+class OpenDocument extends Office {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/vnd.oasis.opendocument.*/';
+	}
+}
diff --git a/lib/private/preview/staroffice.php b/lib/private/preview/staroffice.php
new file mode 100644
index 00000000000..73ad368b341
--- /dev/null
+++ b/lib/private/preview/staroffice.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * Copyright (c) 2013 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+namespace OC\Preview;
+
+//.sxw, .stw, .sxc, .stc, .sxd, .std, .sxi, .sti, .sxg, .sxm
+class StarOffice extends Office {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/vnd.sun.xml.*/';
+	}
+}
-- 
GitLab


From ec7b55f5be67583e4b52c2a8d8c600f476a50e03 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Nov 2014 09:25:40 +0100
Subject: [PATCH 582/616] Split bitmap providers into one per file

---
 lib/private/preview.php             |  2 -
 lib/private/preview/bitmap.php      | 96 ++++++++---------------------
 lib/private/preview/illustrator.php | 19 ++++++
 lib/private/preview/pdf.php         | 19 ++++++
 lib/private/preview/photoshop.php   | 19 ++++++
 lib/private/preview/postscript.php  | 19 ++++++
 lib/private/preview/tiff.php        | 19 ++++++
 7 files changed, 119 insertions(+), 74 deletions(-)
 create mode 100644 lib/private/preview/illustrator.php
 create mode 100644 lib/private/preview/pdf.php
 create mode 100644 lib/private/preview/photoshop.php
 create mode 100644 lib/private/preview/postscript.php
 create mode 100644 lib/private/preview/tiff.php

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 696895cd3ad..f6c8c485d03 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -16,8 +16,6 @@ namespace OC;
 use OC\Preview\Provider;
 use OCP\Files\NotFoundException;
 
-require_once 'preview/bitmap.php';
-
 class Preview {
 	//the thumbnail folder
 	const THUMBNAILS_FOLDER = 'thumbnails';
diff --git a/lib/private/preview/bitmap.php b/lib/private/preview/bitmap.php
index 46322853486..25f65cf7fc9 100644
--- a/lib/private/preview/bitmap.php
+++ b/lib/private/preview/bitmap.php
@@ -5,81 +5,33 @@
  * later.
  * See the COPYING-README file.
  */
-namespace OC\Preview;
-
-use Imagick;
 
-	class Bitmap extends Provider {
+namespace OC\Preview;
 
-		public function getMimeType() {
-			return null;
+abstract class Bitmap extends Provider {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+		$tmpPath = $fileview->toTmpFile($path);
+
+		//create imagick object from bitmap or vector file
+		try {
+			// Layer 0 contains either the bitmap or
+			// a flat representation of all vector layers
+			$bp = new \Imagick($tmpPath . '[0]');
+
+			$bp->setImageFormat('png');
+		} catch (\Exception $e) {
+			\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
+			return false;
 		}
 
-		public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-			$tmpPath = $fileview->toTmpFile($path);
-
-			//create imagick object from bitmap or vector file
-			try {
-				// Layer 0 contains either the bitmap or
-				// a flat representation of all vector layers
-				$bp = new Imagick($tmpPath . '[0]');
+		unlink($tmpPath);
 
-				$bp->setImageFormat('png');
-			} catch (\Exception $e) {
-				\OC_Log::write('core', $e->getmessage(), \OC_Log::ERROR);
-				return false;
-			}
-
-			unlink($tmpPath);
-
-			//new bitmap image object
-			$image = new \OC_Image($bp);
-			//check if image object is valid
-			return $image->valid() ? $image : false;
-		}
+		//new bitmap image object
+		$image = new \OC_Image($bp);
+		//check if image object is valid
+		return $image->valid() ? $image : false;
 	}
-
-		//.pdf
-		class PDF extends Bitmap {
-
-			public function getMimeType() {
-				return '/application\/pdf/';
-			}
-
-		}
-
-		//.tiff
-		class TIFF extends Bitmap {
-
-			public function getMimeType() {
-				return '/image\/tiff/';
-			}
-
-		}
-
-		//.ai
-		class Illustrator extends Bitmap {
-
-			public function getMimeType() {
-				return '/application\/illustrator/';
-			}
-
-		}
-
-		//.eps
-		class Postscript extends Bitmap {
-
-			public function getMimeType() {
-				return '/application\/postscript/';
-			}
-
-		}
-
-		//.psd
-		class Photoshop extends Bitmap {
-
-			public function getMimeType() {
-				return '/application\/x-photoshop/';
-			}
-
-		}
+}
diff --git a/lib/private/preview/illustrator.php b/lib/private/preview/illustrator.php
new file mode 100644
index 00000000000..e88c305f708
--- /dev/null
+++ b/lib/private/preview/illustrator.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Preview;
+
+//.ai
+class Illustrator extends Bitmap {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/illustrator/';
+	}
+}
diff --git a/lib/private/preview/pdf.php b/lib/private/preview/pdf.php
new file mode 100644
index 00000000000..cb13074ff60
--- /dev/null
+++ b/lib/private/preview/pdf.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Preview;
+
+//.pdf
+class PDF extends Bitmap {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/pdf/';
+	}
+}
diff --git a/lib/private/preview/photoshop.php b/lib/private/preview/photoshop.php
new file mode 100644
index 00000000000..f5f60ce4de8
--- /dev/null
+++ b/lib/private/preview/photoshop.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Preview;
+
+//.psd
+class Photoshop extends Bitmap {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/x-photoshop/';
+	}
+}
diff --git a/lib/private/preview/postscript.php b/lib/private/preview/postscript.php
new file mode 100644
index 00000000000..7c8b089d92e
--- /dev/null
+++ b/lib/private/preview/postscript.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Preview;
+
+//.eps
+class Postscript extends Bitmap {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/application\/postscript/';
+	}
+}
diff --git a/lib/private/preview/tiff.php b/lib/private/preview/tiff.php
new file mode 100644
index 00000000000..0a1e8e8ecec
--- /dev/null
+++ b/lib/private/preview/tiff.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Copyright (c) 2013-2014 Georg Ehrke georg@ownCloud.com
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+
+namespace OC\Preview;
+
+//.tiff
+class TIFF extends Bitmap {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType() {
+		return '/image\/tiff/';
+	}
+}
-- 
GitLab


From e7ed62b2c88ccebb304381ada472be541dd172e2 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Fri, 28 Nov 2014 09:35:50 +0100
Subject: [PATCH 583/616] remove border from user menu, adjust to apps menu

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

diff --git a/core/css/header.css b/core/css/header.css
index 026240ea1b0..02e47ad0966 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -273,8 +273,8 @@
 	z-index: 2000;
 	display: none;
 	background-color: #383c43;
-	border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
-	box-shadow:0 0 7px rgb(29,45,68);
+	border-bottom-left-radius: 7px;
+	box-shadow: 0 0 7px rgb(29,45,68);
 	-moz-box-sizing: border-box; box-sizing: border-box;
 }
 	#expanddiv a {
-- 
GitLab


From 00ad7d48c7ac88ace70c83e2d0841be667c47fa7 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 28 Nov 2014 10:37:16 +0100
Subject: [PATCH 584/616] add activity priorities to core so that other apps
 can reuse it

---
 lib/public/activity/iextension.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/public/activity/iextension.php b/lib/public/activity/iextension.php
index 6bb403a8896..e78ae0043a6 100644
--- a/lib/public/activity/iextension.php
+++ b/lib/public/activity/iextension.php
@@ -30,6 +30,13 @@
 namespace OCP\Activity;
 
 interface IExtension {
+
+	const PRIORITY_VERYLOW 	= 10;
+	const PRIORITY_LOW	= 20;
+	const PRIORITY_MEDIUM	= 30;
+	const PRIORITY_HIGH	= 40;
+	const PRIORITY_VERYHIGH	= 50;
+
 	/**
 	 * The extension can return an array of additional notification types.
 	 * If no additional types are to be added false is to be returned
-- 
GitLab


From 9cfae2ed448dd3367a5e630b95feb5f53d46553c Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Fri, 28 Nov 2014 11:38:22 +0100
Subject: [PATCH 585/616] Skip lostcontroller sending email test on windows

---
 tests/core/lostpassword/controller/lostcontrollertest.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/core/lostpassword/controller/lostcontrollertest.php b/tests/core/lostpassword/controller/lostcontrollertest.php
index 5da9e5ce48d..2f2105b85e8 100644
--- a/tests/core/lostpassword/controller/lostcontrollertest.php
+++ b/tests/core/lostpassword/controller/lostcontrollertest.php
@@ -102,6 +102,11 @@ class LostControllerTest extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testEmailSuccessful() {
+		if (\OC_Util::runningOnWindows()) {
+			// FIXME after OC_Mail refactor
+			$this->markTestSkipped('[Windows] sendmail is not supported on windows');
+		}
+
 		$randomToken = $this->container['SecureRandom'];
 		$this->container['SecureRandom']
 			->expects($this->once())
-- 
GitLab


From bf2c9be06640c1ce1fff6da893ddb55297069af9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 28 Nov 2014 11:18:15 +0100
Subject: [PATCH 586/616] concatenate queries with 'or'

---
 lib/private/activitymanager.php | 16 ++++++++++++++--
 tests/lib/activitymanager.php   |  7 +++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/private/activitymanager.php b/lib/private/activitymanager.php
index f31b121c8e8..e0ee7c1b055 100644
--- a/lib/private/activitymanager.php
+++ b/lib/private/activitymanager.php
@@ -247,16 +247,28 @@ class ActivityManager implements IManager {
 	 * @return array
 	 */
 	function getQueryForFilter($filter) {
+
+		$conditions = array();
+		$parameters = array();
+
 		foreach($this->extensions as $extension) {
 			$c = $extension();
 			if ($c instanceof IExtension) {
 				$result = $c->getQueryForFilter($filter);
 				if (is_array($result)) {
-					return $result;
+					list($condition, $parameter) = $result;
+					if ($condition && is_array($parameter)) {
+						$conditions[] = $condition;
+						$parameters = array_merge($parameters, $parameter);
+					}
 				}
 			}
 		}
 
-		return array(null, null);
+		if (empty($conditions)) {
+			return array(null, null);
+		}
+
+		return array(' and ((' . implode(') or (', $conditions) . '))', $parameters);
 	}
 }
diff --git a/tests/lib/activitymanager.php b/tests/lib/activitymanager.php
index 85f8320de09..0683eb68193 100644
--- a/tests/lib/activitymanager.php
+++ b/tests/lib/activitymanager.php
@@ -87,11 +87,14 @@ class Test_ActivityManager extends \Test\TestCase {
 	}
 
 	public function testQueryForFilter() {
+		$this->activityManager->registerExtension(function() {
+			return new SimpleExtension();
+		});
 		$result = $this->activityManager->getQueryForFilter('filter1');
 		$this->assertEquals(
 			array(
-				'`app` = ? and `message` like ?',
-				array('mail', 'ownCloud%')
+				' and ((`app` = ? and `message` like ?) or (`app` = ? and `message` like ?))',
+				array('mail', 'ownCloud%', 'mail', 'ownCloud%')
 			), $result
 		);
 
-- 
GitLab


From f3e75c085c55640f0e9f6642c41a81ead20e0a69 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 28 Nov 2014 16:08:38 +0100
Subject: [PATCH 587/616] Disable MSSQL for new CE installations

Since automatic schema migrations are not yet possible let's disable this for now.
---
 lib/private/setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/setup.php b/lib/private/setup.php
index 45c97bbd225..f9edf9be679 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -88,7 +88,7 @@ class OC_Setup {
 			)
 		);
 		$configuredDatabases = $this->config->getSystemValue('supportedDatabases',
-			array('sqlite', 'mysql', 'pgsql', 'oci', 'mssql'));
+			array('sqlite', 'mysql', 'pgsql', 'oci'));
 		if(!is_array($configuredDatabases)) {
 			throw new Exception('Supported databases are not properly configured.');
 		}
-- 
GitLab


From 9a8dc4a832fad9264ea3a09d33b441bf0fb1717d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 28 Nov 2014 16:23:03 +0100
Subject: [PATCH 588/616] Disable OCI as it is unsupported by most CE apps

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

diff --git a/lib/private/setup.php b/lib/private/setup.php
index f9edf9be679..1443de18546 100644
--- a/lib/private/setup.php
+++ b/lib/private/setup.php
@@ -88,7 +88,7 @@ class OC_Setup {
 			)
 		);
 		$configuredDatabases = $this->config->getSystemValue('supportedDatabases',
-			array('sqlite', 'mysql', 'pgsql', 'oci'));
+			array('sqlite', 'mysql', 'pgsql'));
 		if(!is_array($configuredDatabases)) {
 			throw new Exception('Supported databases are not properly configured.');
 		}
-- 
GitLab


From 18b6fc93329a31fc5578ab359878079a900387d5 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 28 Nov 2014 16:58:09 +0100
Subject: [PATCH 589/616] Adjust sample config

---
 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 433ff9af0fb..26cc356fd04 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -831,7 +831,7 @@ $CONFIG = array(
 
 /**
  * Database types that are supported for installation. (SQLite is available only in 
- * ownCloud Community Edition)
+ * ownCloud Community Edition, oci and mssql only for the Enterprise Edition)
  *
  * Available:
  * 	- sqlite (SQLite3)
-- 
GitLab


From 83d097c5240599349d93b2c4f0c3c9aaedc886cb Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sat, 29 Nov 2014 01:54:28 -0500
Subject: [PATCH 590/616] [tx-robot] updated from transifex

---
 apps/files_sharing/l10n/ca.js   | 6 +++---
 apps/files_sharing/l10n/ca.json | 6 +++---
 apps/user_ldap/l10n/en_GB.js    | 1 +
 apps/user_ldap/l10n/en_GB.json  | 1 +
 core/l10n/ca.js                 | 2 +-
 core/l10n/ca.json               | 2 +-
 lib/l10n/uk.js                  | 3 +++
 lib/l10n/uk.json                | 3 +++
 settings/l10n/ca.js             | 2 +-
 settings/l10n/ca.json           | 2 +-
 settings/l10n/uk.js             | 4 ++++
 settings/l10n/uk.json           | 4 ++++
 12 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/apps/files_sharing/l10n/ca.js b/apps/files_sharing/l10n/ca.js
index 51153252cba..4a22d71fb59 100644
--- a/apps/files_sharing/l10n/ca.js
+++ b/apps/files_sharing/l10n/ca.js
@@ -4,10 +4,10 @@ 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",
     "Couldn't add remote share" : "No s'ha pogut afegir una compartició remota",
-    "Shared with you" : "Compartit amb vós",
-    "Shared with others" : "Compartit amb altres",
+    "Shared with you" : "Us han compartit",
+    "Shared with others" : "Heu compartit",
     "Shared by link" : "Compartit amb enllaç",
-    "No files have been shared with you yet." : "Encara no hi ha fitxers compartits amb vós.",
+    "No files have been shared with you yet." : "Encara no us han compartit fitxters.",
     "You haven't shared any files yet." : "Encara no heu compartit cap fitxer.",
     "You haven't shared any files by link yet." : "Encara no heu compartit cap fitxer amb enllaç.",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voleu afegir la compartició remota {nom} des de {owner}@{remote}?",
diff --git a/apps/files_sharing/l10n/ca.json b/apps/files_sharing/l10n/ca.json
index 88d2fa70811..83668750494 100644
--- a/apps/files_sharing/l10n/ca.json
+++ b/apps/files_sharing/l10n/ca.json
@@ -2,10 +2,10 @@
     "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",
     "Couldn't add remote share" : "No s'ha pogut afegir una compartició remota",
-    "Shared with you" : "Compartit amb vós",
-    "Shared with others" : "Compartit amb altres",
+    "Shared with you" : "Us han compartit",
+    "Shared with others" : "Heu compartit",
     "Shared by link" : "Compartit amb enllaç",
-    "No files have been shared with you yet." : "Encara no hi ha fitxers compartits amb vós.",
+    "No files have been shared with you yet." : "Encara no us han compartit fitxters.",
     "You haven't shared any files yet." : "Encara no heu compartit cap fitxer.",
     "You haven't shared any files by link yet." : "Encara no heu compartit cap fitxer amb enllaç.",
     "Do you want to add the remote share {name} from {owner}@{remote}?" : "Voleu afegir la compartició remota {nom} des de {owner}@{remote}?",
diff --git a/apps/user_ldap/l10n/en_GB.js b/apps/user_ldap/l10n/en_GB.js
index d87ce836807..9476b44dde0 100644
--- a/apps/user_ldap/l10n/en_GB.js
+++ b/apps/user_ldap/l10n/en_GB.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Confirm Deletion",
     "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
     "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.",
     "Could not find the desired feature" : "Could not find the desired feature",
     "Invalid Host" : "Invalid Host",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/en_GB.json b/apps/user_ldap/l10n/en_GB.json
index 8fd6ed30d4f..fd6861a5184 100644
--- a/apps/user_ldap/l10n/en_GB.json
+++ b/apps/user_ldap/l10n/en_GB.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Confirm Deletion",
     "_%s group found_::_%s groups found_" : ["%s group found","%s groups found"],
     "_%s user found_::_%s users found_" : ["%s user found","%s users found"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings.",
     "Could not find the desired feature" : "Could not find the desired feature",
     "Invalid Host" : "Invalid Host",
     "Server" : "Server",
diff --git a/core/l10n/ca.js b/core/l10n/ca.js
index ee837ea7b7f..edec2f989f6 100644
--- a/core/l10n/ca.js
+++ b/core/l10n/ca.js
@@ -184,7 +184,7 @@ OC.L10N.register(
     "This means only administrators can use the instance." : "Això significa que només els administradors poden usar la instància.",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
     "Thank you for your patience." : "Gràcies per la paciència.",
-    "You are accessing the server from an untrusted domain." : "Esteu accedint el servidor des d'un domini no fiable",
+    "You are accessing the server from an untrusted domain." : "Esteu accedint al servidor des d'un domini no fiable",
     "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",
diff --git a/core/l10n/ca.json b/core/l10n/ca.json
index 374e9a51440..fea3cdefec2 100644
--- a/core/l10n/ca.json
+++ b/core/l10n/ca.json
@@ -182,7 +182,7 @@
     "This means only administrators can use the instance." : "Això significa que només els administradors poden usar la instància.",
     "Contact your system administrator if this message persists or appeared unexpectedly." : "Contacteu amb l'administrador del sistema si aquest missatge persisteix o apareix inesperadament.",
     "Thank you for your patience." : "Gràcies per la paciència.",
-    "You are accessing the server from an untrusted domain." : "Esteu accedint el servidor des d'un domini no fiable",
+    "You are accessing the server from an untrusted domain." : "Esteu accedint al servidor des d'un domini no fiable",
     "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",
diff --git a/lib/l10n/uk.js b/lib/l10n/uk.js
index 5afce6b2ced..4512cb25227 100644
--- a/lib/l10n/uk.js
+++ b/lib/l10n/uk.js
@@ -17,6 +17,8 @@ OC.L10N.register(
     "No app name specified" : "Не вказано ім'я додатку",
     "Unknown filetype" : "Невідомий тип файлу",
     "Invalid image" : "Невірне зображення",
+    "Database Error" : "Помилка бази даних",
+    "Please contact your system administrator." : "Будь ласка, зверніться до системного адміністратора.",
     "web services under your control" : "підконтрольні Вам веб-сервіси",
     "App directory already exists" : "Тека додатку вже існує",
     "Can't create app folder. Please fix permissions. %s" : "Неможливо створити теку додатку. Будь ласка, виправте права доступу. %s",
@@ -77,6 +79,7 @@ OC.L10N.register(
     "years ago" : "роки тому",
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
     "A valid password must be provided" : "Потрібно задати вірний пароль",
+    "The username is already being used" : "Ім'я користувача вже використовується",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Не встановлено драйвер бази даних (sqlite, mysql, or postgresql).",
     "Cannot write into \"config\" directory" : "Не можу писати у теку \"config\"",
     "Cannot write into \"apps\" directory" : "Не можу писати у теку \"apps\"",
diff --git a/lib/l10n/uk.json b/lib/l10n/uk.json
index 9c632437ac2..87f34e15657 100644
--- a/lib/l10n/uk.json
+++ b/lib/l10n/uk.json
@@ -15,6 +15,8 @@
     "No app name specified" : "Не вказано ім'я додатку",
     "Unknown filetype" : "Невідомий тип файлу",
     "Invalid image" : "Невірне зображення",
+    "Database Error" : "Помилка бази даних",
+    "Please contact your system administrator." : "Будь ласка, зверніться до системного адміністратора.",
     "web services under your control" : "підконтрольні Вам веб-сервіси",
     "App directory already exists" : "Тека додатку вже існує",
     "Can't create app folder. Please fix permissions. %s" : "Неможливо створити теку додатку. Будь ласка, виправте права доступу. %s",
@@ -75,6 +77,7 @@
     "years ago" : "роки тому",
     "A valid username must be provided" : "Потрібно задати вірне ім'я користувача",
     "A valid password must be provided" : "Потрібно задати вірний пароль",
+    "The username is already being used" : "Ім'я користувача вже використовується",
     "No database drivers (sqlite, mysql, or postgresql) installed." : "Не встановлено драйвер бази даних (sqlite, mysql, or postgresql).",
     "Cannot write into \"config\" directory" : "Не можу писати у теку \"config\"",
     "Cannot write into \"apps\" directory" : "Не можу писати у теку \"apps\"",
diff --git a/settings/l10n/ca.js b/settings/l10n/ca.js
index 7ed156f10cd..8c85f381dd7 100644
--- a/settings/l10n/ca.js
+++ b/settings/l10n/ca.js
@@ -101,7 +101,7 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "Security Warning" : "Avís de seguretat",
-    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Esteu accedint %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Esteu accedint a %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
     "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." : "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La 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.",
     "Setup Warning" : "Avís de configuració",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
diff --git a/settings/l10n/ca.json b/settings/l10n/ca.json
index 52e397cd1fe..44a1ce6251e 100644
--- a/settings/l10n/ca.json
+++ b/settings/l10n/ca.json
@@ -99,7 +99,7 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "Security Warning" : "Avís de seguretat",
-    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Esteu accedint %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Esteu accedint a %s a través de HTTP. Us recomanem fermament que configureu el servidor perquè requereixi HTTPS.",
     "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." : "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La 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.",
     "Setup Warning" : "Avís de configuració",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "Aparentment PHP està configurat per mostrar blocs en línia de documentació. Això farà que algunes aplicacions core siguin inaccessibles.",
diff --git a/settings/l10n/uk.js b/settings/l10n/uk.js
index 6cdef63b2ec..3350edeeb5e 100644
--- a/settings/l10n/uk.js
+++ b/settings/l10n/uk.js
@@ -117,6 +117,7 @@ OC.L10N.register(
     "Locale not working" : "Локалізація не працює",
     "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.",
     "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
     "Connectivity Checks" : "Перевірка З'єднання",
@@ -143,6 +144,8 @@ OC.L10N.register(
     "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
     "Enforce HTTPS" : "Примусове застосування HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Зобов'язати клієнтів під'єднуватись до %s через шифроване з'єднання.",
+    "Enforce HTTPS for subdomains" : "Примусове застосувати HTTPS для піддоменів",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Змушувати клієнтів під'єднуватися до %s та піддоменів за допомогою зашифрованого з'єднання.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Будь ласка, під'єднайтесь до цього %s за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
     "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
     "Send mode" : "Надіслати повідомлення",
@@ -219,6 +222,7 @@ OC.L10N.register(
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
     "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
+    "Search Users" : "Шукати користувачів",
     "Add Group" : "Додати групу",
     "Group" : "Група",
     "Everyone" : "Всі",
diff --git a/settings/l10n/uk.json b/settings/l10n/uk.json
index b05f4e95e32..27d26dd1321 100644
--- a/settings/l10n/uk.json
+++ b/settings/l10n/uk.json
@@ -115,6 +115,7 @@
     "Locale not working" : "Локалізація не працює",
     "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.",
     "URL generation in notification emails" : "Генерування URL для повідомлень в електроних листах",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Якщо ваша копія ownCloud встановлена не в корені домену та використовує систему планування CRON, можливі проблеми з генерацією правильних URL. Щоб уникнути цього, встановіть опцію overwritewebroot файла config.php відповідно до теки розташування установки (Ймовірніше за все, це \"%s\")",
     "Connectivity Checks" : "Перевірка З'єднання",
@@ -141,6 +142,8 @@
     "These groups will still be able to receive shares, but not to initiate them." : "Ці групи зможуть отримувати спільні файли, але не зможуть відправляти їх.",
     "Enforce HTTPS" : "Примусове застосування HTTPS",
     "Forces the clients to connect to %s via an encrypted connection." : "Зобов'язати клієнтів під'єднуватись до %s через шифроване з'єднання.",
+    "Enforce HTTPS for subdomains" : "Примусове застосувати HTTPS для піддоменів",
+    "Forces the clients to connect to %s and subdomains via an encrypted connection." : "Змушувати клієнтів під'єднуватися до %s та піддоменів за допомогою зашифрованого з'єднання.",
     "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." : "Будь ласка, під'єднайтесь до цього %s за допомогою HTTPS, щоб увімкнути або вимкнути використання SSL.",
     "This is used for sending out notifications." : "Використовується для відсилання повідомлень.",
     "Send mode" : "Надіслати повідомлення",
@@ -217,6 +220,7 @@
     "Create" : "Створити",
     "Admin Recovery Password" : "Пароль адміністратора для відновлення",
     "Enter the recovery password in order to recover the users files during password change" : "Введіть пароль для того, щоб відновити файли користувачів при зміні паролю",
+    "Search Users" : "Шукати користувачів",
     "Add Group" : "Додати групу",
     "Group" : "Група",
     "Everyone" : "Всі",
-- 
GitLab


From 40badba7034077b565853c3a823d892ece1d224a Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Sun, 30 Nov 2014 01:54:25 -0500
Subject: [PATCH 591/616] [tx-robot] updated from transifex

---
 apps/user_ldap/l10n/it.js   | 1 +
 apps/user_ldap/l10n/it.json | 1 +
 apps/user_ldap/l10n/tr.js   | 1 +
 apps/user_ldap/l10n/tr.json | 1 +
 4 files changed, 4 insertions(+)

diff --git a/apps/user_ldap/l10n/it.js b/apps/user_ldap/l10n/it.js
index d7a4e192ec6..30b9a39f0ea 100644
--- a/apps/user_ldap/l10n/it.js
+++ b/apps/user_ldap/l10n/it.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Conferma l'eliminazione",
     "_%s group found_::_%s groups found_" : ["%s gruppo trovato","%s gruppi trovati"],
     "_%s user found_::_%s users found_" : ["%s utente trovato","%s utenti trovati"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossibile rilevare l'attributo nome visualizzato dell'utente. Specificalo nelle impostazioni avanzate di ldap.",
     "Could not find the desired feature" : "Impossibile trovare la funzionalità desiderata",
     "Invalid Host" : "Host non valido",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/it.json b/apps/user_ldap/l10n/it.json
index 44a529bc0c5..58b405730a4 100644
--- a/apps/user_ldap/l10n/it.json
+++ b/apps/user_ldap/l10n/it.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Conferma l'eliminazione",
     "_%s group found_::_%s groups found_" : ["%s gruppo trovato","%s gruppi trovati"],
     "_%s user found_::_%s users found_" : ["%s utente trovato","%s utenti trovati"],
+    "Could not detect user display name attribute. Please specify it yourself in advanced ldap settings." : "Impossibile rilevare l'attributo nome visualizzato dell'utente. Specificalo nelle impostazioni avanzate di ldap.",
     "Could not find the desired feature" : "Impossibile trovare la funzionalità desiderata",
     "Invalid Host" : "Host non valido",
     "Server" : "Server",
diff --git a/apps/user_ldap/l10n/tr.js b/apps/user_ldap/l10n/tr.js
index 75f3678fdd9..a4c308e5354 100644
--- a/apps/user_ldap/l10n/tr.js
+++ b/apps/user_ldap/l10n/tr.js
@@ -33,6 +33,7 @@ OC.L10N.register(
     "Confirm Deletion" : "Silmeyi onayla",
     "_%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.",
     "Could not find the desired feature" : "İstenen özellik bulunamadı",
     "Invalid Host" : "Geçersiz Makine",
     "Server" : "Sunucu",
diff --git a/apps/user_ldap/l10n/tr.json b/apps/user_ldap/l10n/tr.json
index 9b6f3a37ade..dbd4a9b7406 100644
--- a/apps/user_ldap/l10n/tr.json
+++ b/apps/user_ldap/l10n/tr.json
@@ -31,6 +31,7 @@
     "Confirm Deletion" : "Silmeyi onayla",
     "_%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.",
     "Could not find the desired feature" : "İstenen özellik bulunamadı",
     "Invalid Host" : "Geçersiz Makine",
     "Server" : "Sunucu",
-- 
GitLab


From 5275daff4e940086396f83c3cddbaf9a0d19e417 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Mon, 1 Dec 2014 01:54:26 -0500
Subject: [PATCH 592/616] [tx-robot] updated from transifex

---
 settings/l10n/tr.js   | 2 +-
 settings/l10n/tr.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js
index e97674bf0fc..9e5a62bb058 100644
--- a/settings/l10n/tr.js
+++ b/settings/l10n/tr.js
@@ -166,7 +166,7 @@ OC.L10N.register(
     "Less" : "Daha az",
     "Version" : "Sürüm",
     "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
-    "More apps" : "Daha fazla Uygulama",
+    "More apps" : "Daha fazla uygulama",
     "Add your app" : "Uygulamanızı ekleyin",
     "by" : "oluşturan",
     "licensed" : "lisanslı",
diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json
index f1c869101a9..ab9fe756f66 100644
--- a/settings/l10n/tr.json
+++ b/settings/l10n/tr.json
@@ -164,7 +164,7 @@
     "Less" : "Daha az",
     "Version" : "Sürüm",
     "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>." : "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud topluluğu</a> tarafından geliştirilmiş olup, <a href=\"https://github.com/owncloud\" target=\"_blank\">kaynak kodu</a>, <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> altında lisanslanmıştır.",
-    "More apps" : "Daha fazla Uygulama",
+    "More apps" : "Daha fazla uygulama",
     "Add your app" : "Uygulamanızı ekleyin",
     "by" : "oluşturan",
     "licensed" : "lisanslı",
-- 
GitLab


From fa9b36b726e7b8b35e0fee36124d52ed8fd5a9dc Mon Sep 17 00:00:00 2001
From: Byron Marohn <combustible@live.com>
Date: Mon, 15 Sep 2014 16:12:07 -0700
Subject: [PATCH 593/616] Added error check to lib/private/image.php

This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE.
Without this check, subsequent loop might create billions of ERROR-level log messages.

Signed-off-by: Byron Marohn <combustible@live.com>
---
 lib/private/image.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/private/image.php b/lib/private/image.php
index ecdad084c02..01bca8267e9 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -658,6 +658,12 @@ class OC_Image {
 		}
 		// create gd image
 		$im = imagecreatetruecolor($meta['width'], $meta['height']);
+		if ($im == FALSE) {
+			fclose($fh);
+			trigger_error('imagecreatefrombmp(): imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'], E_USER_WARNING);
+			return FALSE;
+		}
+
 		$data = fread($fh, $meta['imagesize']);
 		$p = 0;
 		$vide = chr(0);
-- 
GitLab


From b2175f0e25a238157aeda33c43ff4cd1db488494 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 5 Nov 2014 16:44:19 +0100
Subject: [PATCH 594/616] Use \OCP\ILogger

---
 lib/private/image.php | 521 +++++++++++++++++++++---------------------
 1 file changed, 264 insertions(+), 257 deletions(-)

diff --git a/lib/private/image.php b/lib/private/image.php
index 01bca8267e9..78cacc84452 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -1,25 +1,17 @@
 <?php
 
 /**
-* ownCloud
-*
-* @author Thomas Tanghus
-* @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
-*
-* 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 Thomas Tanghus
+ * @copyright 2011 Thomas Tanghus <thomas@tanghus.net>
+ *
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ *
+ */
+
 /**
  * Class for basic image manipulation
  */
@@ -33,10 +25,16 @@ class OC_Image {
 	private $fileInfo;
 
 	/**
-	* Get mime type for an image file.
-	* @param string|null $filePath The path to a local image file.
-	* @return string The mime type if the it could be determined, otherwise an empty string.
-	*/
+	 * @var \OCP\ILogger
+	 */
+	private $logger;
+
+	/**
+	 * Get mime type for an image file.
+	 *
+	 * @param string|null $filePath The path to a local image file.
+	 * @return string The mime type if the it could be determined, otherwise an empty string.
+	 */
 	static public function getMimeTypeForFile($filePath) {
 		// exif_imagetype throws "read error!" if file is less than 12 byte
 		if (filesize($filePath) > 11) {
@@ -49,14 +47,19 @@ class OC_Image {
 
 	/**
 	 * Constructor.
+	 *
 	 * @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by
 	 * an imagecreate* function.
-	 * @return \OC_Image False on error
+	 * @param \OCP\ILogger $logger
 	 */
-	public function __construct($imageRef = null) {
-		//OC_Log::write('core',__METHOD__.'(): start', OC_Log::DEBUG);
-		if(!extension_loaded('gd') || !function_exists('gd_info')) {
-			OC_Log::write('core', __METHOD__.'(): GD module not installed', OC_Log::ERROR);
+	public function __construct($imageRef = null, $logger = null) {
+		$this->logger = $logger;
+		if (is_null($logger)) {
+			$this->logger = \OC::$server->getLogger();
+		}
+
+		if (!extension_loaded('gd') || !function_exists('gd_info')) {
+			$this->logger->error(__METHOD__ . '(): GD module not installed', array('app' => 'core'));
 			return false;
 		}
 
@@ -64,51 +67,56 @@ class OC_Image {
 			$this->fileInfo = new finfo(FILEINFO_MIME_TYPE);
 		}
 
-		if(!is_null($imageRef)) {
+		if (!is_null($imageRef)) {
 			$this->load($imageRef);
 		}
 	}
 
 	/**
-	* Determine whether the object contains an image resource.
-	* @return bool
-	*/
+	 * Determine whether the object contains an image resource.
+	 *
+	 * @return bool
+	 */
 	public function valid() { // apparently you can't name a method 'empty'...
 		return is_resource($this->resource);
 	}
 
 	/**
-	* Returns the MIME type of the image or an empty string if no image is loaded.
-	* @return string
-	*/
+	 * Returns the MIME type of the image or an empty string if no image is loaded.
+	 *
+	 * @return string
+	 */
 	public function mimeType() {
 		return $this->valid() ? $this->mimeType : '';
 	}
 
 	/**
-	* Returns the width of the image or -1 if no image is loaded.
-	* @return int
-	*/
+	 * Returns the width of the image or -1 if no image is loaded.
+	 *
+	 * @return int
+	 */
 	public function width() {
 		return $this->valid() ? imagesx($this->resource) : -1;
 	}
 
 	/**
-	* Returns the height of the image or -1 if no image is loaded.
-	* @return int
-	*/
+	 * Returns the height of the image or -1 if no image is loaded.
+	 *
+	 * @return int
+	 */
 	public function height() {
 		return $this->valid() ? imagesy($this->resource) : -1;
 	}
 
 	/**
-	* Returns the width when the image orientation is top-left.
-	* @return int
-	*/
+	 * Returns the width when the image orientation is top-left.
+	 *
+	 * @return int
+	 */
 	public function widthTopLeft() {
 		$o = $this->getOrientation();
-		OC_Log::write('core', 'OC_Image->widthTopLeft() Orientation: '.$o, OC_Log::DEBUG);
-		switch($o) {
+		$this->logger->debug('OC_Image->widthTopLeft() Orientation: ' . $o, array('app' => 'core'));
+		switch ($o) {
 			case -1:
 			case 1:
 			case 2: // Not tested
@@ -125,13 +133,14 @@ class OC_Image {
 	}
 
 	/**
-	* Returns the height when the image orientation is top-left.
-	* @return int
-	*/
+	 * Returns the height when the image orientation is top-left.
+	 *
+	 * @return int
+	 */
 	public function heightTopLeft() {
 		$o = $this->getOrientation();
-		OC_Log::write('core', 'OC_Image->heightTopLeft() Orientation: '.$o, OC_Log::DEBUG);
-		switch($o) {
+		$this->logger->debug('OC_Image->heightTopLeft() Orientation: ' . $o, array('app' => 'core'));
+		switch ($o) {
 			case -1:
 			case 1:
 			case 2: // Not tested
@@ -149,32 +158,34 @@ class OC_Image {
 
 	/**
 	 * Outputs the image.
+	 *
 	 * @param string $mimeType
 	 * @return bool
 	 */
-	public function show($mimeType=null) {
-		if($mimeType === null) {
+	public function show($mimeType = null) {
+		if ($mimeType === null) {
 			$mimeType = $this->mimeType();
 		}
-		header('Content-Type: '.$mimeType);
+		header('Content-Type: ' . $mimeType);
 		return $this->_output(null, $mimeType);
 	}
 
 	/**
 	 * Saves the image.
+	 *
 	 * @param string $filePath
 	 * @param string $mimeType
 	 * @return bool
 	 */
 
-	public function save($filePath=null, $mimeType=null) {
-		if($mimeType === null) {
+	public function save($filePath = null, $mimeType = null) {
+		if ($mimeType === null) {
 			$mimeType = $this->mimeType();
 		}
-		if($filePath === null && $this->filePath === null) {
-			OC_Log::write('core', __METHOD__.'(): called with no path.', OC_Log::ERROR);
+		if ($filePath === null && $this->filePath === null) {
+			$this->logger->error(__METHOD__ . '(): called with no path.', array('app' => 'core'));
 			return false;
-		} elseif($filePath === null && $this->filePath !== null) {
+		} elseif ($filePath === null && $this->filePath !== null) {
 			$filePath = $this->filePath;
 		}
 		return $this->_output($filePath, $mimeType);
@@ -182,22 +193,21 @@ class OC_Image {
 
 	/**
 	 * Outputs/saves the image.
+	 *
 	 * @param string $filePath
 	 * @param string $mimeType
 	 * @return bool
 	 * @throws Exception
 	 */
-	private function _output($filePath=null, $mimeType=null) {
-		if($filePath) {
+	private function _output($filePath = null, $mimeType = null) {
+		if ($filePath) {
 			if (!file_exists(dirname($filePath)))
 				mkdir(dirname($filePath), 0777, true);
-			if(!is_writable(dirname($filePath))) {
-				OC_Log::write('core',
-					__METHOD__.'(): Directory \''.dirname($filePath).'\' is not writable.',
-					OC_Log::ERROR);
+			if (!is_writable(dirname($filePath))) {
+				$this->logger->error(__METHOD__ . '(): Directory \'' . dirname($filePath) . '\' is not writable.', array('app' => 'core'));
 				return false;
-			} elseif(is_writable(dirname($filePath)) && file_exists($filePath) && !is_writable($filePath)) {
-				OC_Log::write('core', __METHOD__.'(): File \''.$filePath.'\' is not writable.', OC_Log::ERROR);
+			} elseif (is_writable(dirname($filePath)) && file_exists($filePath) && !is_writable($filePath)) {
+				$this->logger->error(__METHOD__ . '(): File \'' . $filePath . '\' is not writable.', array('app' => 'core'));
 				return false;
 			}
 		}
@@ -206,8 +216,8 @@ class OC_Image {
 		}
 
 		$imageType = $this->imageType;
-		if($mimeType !== null) {
-			switch($mimeType) {
+		if ($mimeType !== null) {
+			switch ($mimeType) {
 				case 'image/gif':
 					$imageType = IMAGETYPE_GIF;
 					break;
@@ -228,7 +238,7 @@ class OC_Image {
 			}
 		}
 
-		switch($imageType) {
+		switch ($imageType) {
 			case IMAGETYPE_GIF:
 				$retVal = imagegif($this->resource, $filePath);
 				break;
@@ -259,22 +269,22 @@ class OC_Image {
 	}
 
 	/**
-	* Prints the image when called as $image().
-	*/
+	 * Prints the image when called as $image().
+	 */
 	public function __invoke() {
 		return $this->show();
 	}
 
 	/**
-	* @return resource Returns the image resource in any.
-	*/
+	 * @return resource Returns the image resource in any.
+	 */
 	public function resource() {
 		return $this->resource;
 	}
 
 	/**
-	* @return string Returns the raw image data.
-	*/
+	 * @return string Returns the raw image data.
+	 */
 	function data() {
 		ob_start();
 		switch ($this->mimeType) {
@@ -289,11 +299,11 @@ class OC_Image {
 				break;
 			default:
 				$res = imagepng($this->resource);
-				OC_Log::write('core', 'OC_Image->data. Couldn\'t guess mimetype, defaulting to png', OC_Log::INFO);
+				$this->logger->info('OC_Image->data. Could not guess mime-type, defaulting to png', array('app' => 'core'));
 				break;
 		}
 		if (!$res) {
-			OC_Log::write('core', 'OC_Image->data. Error getting image data.', OC_Log::ERROR);
+			$this->logger->error('OC_Image->data. Error getting image data.', array('app' => 'core'));
 		}
 		return ob_get_clean();
 	}
@@ -306,47 +316,49 @@ class OC_Image {
 	}
 
 	/**
-	* (I'm open for suggestions on better method name ;)
-	* Get the orientation based on EXIF data.
-	* @return int The orientation or -1 if no EXIF data is available.
-	*/
+	 * (I'm open for suggestions on better method name ;)
+	 * Get the orientation based on EXIF data.
+	 *
+	 * @return int The orientation or -1 if no EXIF data is available.
+	 */
 	public function getOrientation() {
 		if ($this->imageType !== IMAGETYPE_JPEG) {
-			OC_Log::write('core', 'OC_Image->fixOrientation() Image is not a JPEG.', OC_Log::DEBUG);
+			$this->logger->debug('OC_Image->fixOrientation() Image is not a JPEG.', array('app' => 'core'));
 			return -1;
 		}
-		if(!is_callable('exif_read_data')) {
-			OC_Log::write('core', 'OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
+		if (!is_callable('exif_read_data')) {
+			$this->logger->debug('OC_Image->fixOrientation() Exif module not enabled.', array('app' => 'core'));
 			return -1;
 		}
-		if(!$this->valid()) {
-			OC_Log::write('core', 'OC_Image->fixOrientation() No image loaded.', OC_Log::DEBUG);
+		if (!$this->valid()) {
+			$this->logger->debug('OC_Image->fixOrientation() No image loaded.', array('app' => 'core'));
 			return -1;
 		}
-		if(is_null($this->filePath) || !is_readable($this->filePath)) {
-			OC_Log::write('core', 'OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG);
+		if (is_null($this->filePath) || !is_readable($this->filePath)) {
+			$this->logger->debug('OC_Image->fixOrientation() No readable file path set.', array('app' => 'core'));
 			return -1;
 		}
 		$exif = @exif_read_data($this->filePath, 'IFD0');
-		if(!$exif) {
+		if (!$exif) {
 			return -1;
 		}
-		if(!isset($exif['Orientation'])) {
+		if (!isset($exif['Orientation'])) {
 			return -1;
 		}
 		return $exif['Orientation'];
 	}
 
 	/**
-	* (I'm open for suggestions on better method name ;)
-	* Fixes orientation based on EXIF data.
-	* @return bool.
-	*/
+	 * (I'm open for suggestions on better method name ;)
+	 * Fixes orientation based on EXIF data.
+	 *
+	 * @return bool.
+	 */
 	public function fixOrientation() {
 		$o = $this->getOrientation();
-		OC_Log::write('core', 'OC_Image->fixOrientation() Orientation: '.$o, OC_Log::DEBUG);
+		$this->logger->debug('OC_Image->fixOrientation() Orientation: ' . $o, array('app' => 'core'));
 		$rotate = 0;
-		switch($o) {
+		switch ($o) {
 			case -1:
 				return false; //Nothing to fix
 			case 1:
@@ -375,24 +387,24 @@ class OC_Image {
 				$rotate = 90;
 				break;
 		}
-		if($rotate) {
+		if ($rotate) {
 			$res = imagerotate($this->resource, $rotate, 0);
-			if($res) {
-				if(imagealphablending($res, true)) {
-					if(imagesavealpha($res, true)) {
+			if ($res) {
+				if (imagealphablending($res, true)) {
+					if (imagesavealpha($res, true)) {
 						imagedestroy($this->resource);
 						$this->resource = $res;
 						return true;
 					} else {
-						OC_Log::write('core', 'OC_Image->fixOrientation() Error during alphasaving.', OC_Log::DEBUG);
+						$this->logger->debug('OC_Image->fixOrientation() Error during alpha-saving', array('app' => 'core'));
 						return false;
 					}
 				} else {
-					OC_Log::write('core', 'OC_Image->fixOrientation() Error during alphablending.', OC_Log::DEBUG);
+					$this->logger->debug('OC_Image->fixOrientation() Error during alpha-blending', array('app' => 'core'));
 					return false;
 				}
 			} else {
-				OC_Log::write('core', 'OC_Image->fixOrientation() Error during oriention fixing.', OC_Log::DEBUG);
+				$this->logger->debug('OC_Image->fixOrientation() Error during orientation fixing', array('app' => 'core'));
 				return false;
 			}
 		}
@@ -401,52 +413,54 @@ class OC_Image {
 
 	/**
 	 * Loads an image from a local file, a base64 encoded string or a resource created by an imagecreate* function.
+	 *
 	 * @param resource|string $imageRef The path to a local file, a base64 encoded string or a resource created by an imagecreate* function or a file resource (file handle    ).
 	 * @return resource|false An image resource or false on error
 	 */
 	public function load($imageRef) {
-		if(is_resource($imageRef)) {
-			if(get_resource_type($imageRef) == 'gd') {
+		if (is_resource($imageRef)) {
+			if (get_resource_type($imageRef) == 'gd') {
 				$this->resource = $imageRef;
 				return $this->resource;
-			} elseif(in_array(get_resource_type($imageRef), array('file', 'stream'))) {
+			} elseif (in_array(get_resource_type($imageRef), array('file', 'stream'))) {
 				return $this->loadFromFileHandle($imageRef);
 			}
-		} elseif($this->loadFromBase64($imageRef) !== false) {
+		} elseif ($this->loadFromBase64($imageRef) !== false) {
 			return $this->resource;
-		} elseif($this->loadFromFile($imageRef) !== false) {
+		} elseif ($this->loadFromFile($imageRef) !== false) {
 			return $this->resource;
-		} elseif($this->loadFromData($imageRef) !== false) {
+		} elseif ($this->loadFromData($imageRef) !== false) {
 			return $this->resource;
-		} else {
-			OC_Log::write('core', __METHOD__.'(): couldn\'t load anything. Giving up!', OC_Log::DEBUG);
-			return false;
 		}
+		$this->logger->debug(__METHOD__ . '(): could not load anything. Giving up!', array('app' => 'core'));
+		return false;
 	}
 
 	/**
-	* Loads an image from an open file handle.
-	* It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
-	* @param resource $handle
-	* @return resource|false An image resource or false on error
-	*/
+	 * Loads an image from an open file handle.
+	 * It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
+	 *
+	 * @param resource $handle
+	 * @return resource|false An image resource or false on error
+	 */
 	public function loadFromFileHandle($handle) {
-		OC_Log::write('core', __METHOD__.'(): Trying', OC_Log::DEBUG);
 		$contents = stream_get_contents($handle);
-		if($this->loadFromData($contents)) {
+		if ($this->loadFromData($contents)) {
 			return $this->resource;
 		}
+		return false;
 	}
 
 	/**
-	* Loads an image from a local file.
-	* @param bool|string $imagePath The path to a local file.
-	* @return bool|resource An image resource or false on error
-	*/
-	public function loadFromFile($imagePath=false) {
+	 * Loads an image from a local file.
+	 *
+	 * @param bool|string $imagePath The path to a local file.
+	 * @return bool|resource An image resource or false on error
+	 */
+	public function loadFromFile($imagePath = false) {
 		// exif_imagetype throws "read error!" if file is less than 12 byte
-		if(!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) {
-			OC_Log::write('core', 'OC_Image->loadFromFile, couldn\'t load: ' . (string) urlencode($imagePath), OC_Log::DEBUG);
+		if (!@is_file($imagePath) || !file_exists($imagePath) || filesize($imagePath) < 12 || !is_readable($imagePath)) {
+			$this->logger->debug('OC_Image->loadFromFile, could not load: ' . (string)urlencode($imagePath), array('app' => 'core'));
 			return false;
 		}
 		$iType = exif_imagetype($imagePath);
@@ -458,18 +472,14 @@ class OC_Image {
 					imagealphablending($this->resource, true);
 					imagesavealpha($this->resource, true);
 				} else {
-					OC_Log::write('core',
-						'OC_Image->loadFromFile, GIF images not supported: '.$imagePath,
-						OC_Log::DEBUG);
+					$this->logger->debug('OC_Image->loadFromFile, GIF images not supported: ' . $imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_JPEG:
 				if (imagetypes() & IMG_JPG) {
 					$this->resource = imagecreatefromjpeg($imagePath);
 				} else {
-					OC_Log::write('core',
-						'OC_Image->loadFromFile, JPG images not supported: '.$imagePath,
-						OC_Log::DEBUG);
+					$this->logger->debug('OC_Image->loadFromFile, JPG images not supported: ' . $imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_PNG:
@@ -479,31 +489,25 @@ class OC_Image {
 					imagealphablending($this->resource, true);
 					imagesavealpha($this->resource, true);
 				} else {
-					OC_Log::write('core',
-						'OC_Image->loadFromFile, PNG images not supported: '.$imagePath,
-						OC_Log::DEBUG);
+					$this->logger->debug('OC_Image->loadFromFile, PNG images not supported: ' . $imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_XBM:
 				if (imagetypes() & IMG_XPM) {
 					$this->resource = imagecreatefromxbm($imagePath);
 				} else {
-					OC_Log::write('core',
-						'OC_Image->loadFromFile, XBM/XPM images not supported: '.$imagePath,
-						OC_Log::DEBUG);
+					$this->logger->debug('OC_Image->loadFromFile, XBM/XPM images not supported: ' . $imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_WBMP:
 				if (imagetypes() & IMG_WBMP) {
 					$this->resource = imagecreatefromwbmp($imagePath);
 				} else {
-					OC_Log::write('core',
-						'OC_Image->loadFromFile, WBMP images not supported: '.$imagePath,
-						OC_Log::DEBUG);
+					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, array('app' => 'core'));
 				}
 				break;
 			case IMAGETYPE_BMP:
-					$this->resource = $this->imagecreatefrombmp($imagePath);
+				$this->resource = $this->imagecreatefrombmp($imagePath);
 				break;
 			/*
 			case IMAGETYPE_TIFF_II: // (intel byte order)
@@ -534,10 +538,10 @@ class OC_Image {
 				// this is mostly file created from encrypted file
 				$this->resource = imagecreatefromstring(\OC\Files\Filesystem::file_get_contents(\OC\Files\Filesystem::getLocalPath($imagePath)));
 				$iType = IMAGETYPE_PNG;
-				OC_Log::write('core', 'OC_Image->loadFromFile, Default', OC_Log::DEBUG);
+				$this->logger->debug('OC_Image->loadFromFile, Default', array('app' => 'core'));
 				break;
 		}
-		if($this->valid()) {
+		if ($this->valid()) {
 			$this->imageType = $iType;
 			$this->mimeType = image_type_to_mime_type($iType);
 			$this->filePath = $imagePath;
@@ -546,47 +550,49 @@ class OC_Image {
 	}
 
 	/**
-	* Loads an image from a string of data.
-	* @param string $str A string of image data as read from a file.
-	* @return bool|resource An image resource or false on error
-	*/
+	 * Loads an image from a string of data.
+	 *
+	 * @param string $str A string of image data as read from a file.
+	 * @return bool|resource An image resource or false on error
+	 */
 	public function loadFromData($str) {
-		if(is_resource($str)) {
+		if (is_resource($str)) {
 			return false;
 		}
 		$this->resource = @imagecreatefromstring($str);
 		if ($this->fileInfo) {
 			$this->mimeType = $this->fileInfo->buffer($str);
 		}
-		if(is_resource($this->resource)) {
+		if (is_resource($this->resource)) {
 			imagealphablending($this->resource, false);
 			imagesavealpha($this->resource, true);
 		}
 
-		if(!$this->resource) {
-			OC_Log::write('core', 'OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG);
+		if (!$this->resource) {
+			$this->logger->debug('OC_Image->loadFromFile, could not load', array('app' => 'core'));
 			return false;
 		}
 		return $this->resource;
 	}
 
 	/**
-	* Loads an image from a base64 encoded string.
-	* @param string $str A string base64 encoded string of image data.
-	* @return bool|resource An image resource or false on error
-	*/
+	 * Loads an image from a base64 encoded string.
+	 *
+	 * @param string $str A string base64 encoded string of image data.
+	 * @return bool|resource An image resource or false on error
+	 */
 	public function loadFromBase64($str) {
-		if(!is_string($str)) {
+		if (!is_string($str)) {
 			return false;
 		}
 		$data = base64_decode($str);
-		if($data) { // try to load from string data
+		if ($data) { // try to load from string data
 			$this->resource = @imagecreatefromstring($data);
 			if ($this->fileInfo) {
 				$this->mimeType = $this->fileInfo->buffer($data);
 			}
-			if(!$this->resource) {
-				OC_Log::write('core', 'OC_Image->loadFromBase64, couldn\'t load', OC_Log::DEBUG);
+			if (!$this->resource) {
+				$this->logger->debug('OC_Image->loadFromBase64, could not load', array('app' => 'core'));
 				return false;
 			}
 			return $this->resource;
@@ -597,6 +603,7 @@ class OC_Image {
 
 	/**
 	 * Create a new image from file or URL
+	 *
 	 * @link http://www.programmierer-forum.de/function-imagecreatefrombmp-laeuft-mit-allen-bitraten-t143137.htm
 	 * @version 1.00
 	 * @param string $fileName <p>
@@ -606,7 +613,7 @@ class OC_Image {
 	 */
 	private function imagecreatefrombmp($fileName) {
 		if (!($fh = fopen($fileName, 'rb'))) {
-			trigger_error('imagecreatefrombmp: Can not open ' . $fileName, E_USER_WARNING);
+			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName, array('app' => 'core'));
 			return false;
 		}
 		// read file header
@@ -614,7 +621,7 @@ class OC_Image {
 		// check for bitmap
 		if ($meta['type'] != 19778) {
 			fclose($fh);
-			trigger_error('imagecreatefrombmp: ' . $fileName . ' is not a bitmap!', E_USER_WARNING);
+			$this->logger->warning('imagecreatefrombmp: Can not open ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
 			return false;
 		}
 		// read image header
@@ -626,7 +633,7 @@ class OC_Image {
 		// set bytes and padding
 		$meta['bytes'] = $meta['bits'] / 8;
 		$this->bitDepth = $meta['bits']; //remember the bit depth for the imagebmp call
-		$meta['decal'] = 4 - (4 * (($meta['width'] * $meta['bytes'] / 4)- floor($meta['width'] * $meta['bytes'] / 4)));
+		$meta['decal'] = 4 - (4 * (($meta['width'] * $meta['bytes'] / 4) - floor($meta['width'] * $meta['bytes'] / 4)));
 		if ($meta['decal'] == 4) {
 			$meta['decal'] = 0;
 		}
@@ -638,7 +645,7 @@ class OC_Image {
 				$meta['imagesize'] = @filesize($fileName) - $meta['offset'];
 				if ($meta['imagesize'] < 1) {
 					fclose($fh);
-					trigger_error('imagecreatefrombmp: Can not obtain filesize of ' . $fileName . '!', E_USER_WARNING);
+					$this->logger->warning('imagecreatefrombmp: Can not obtain file size of ' . $fileName . ' is not a bitmap!', array('app' => 'core'));
 					return false;
 				}
 			}
@@ -658,10 +665,12 @@ class OC_Image {
 		}
 		// create gd image
 		$im = imagecreatetruecolor($meta['width'], $meta['height']);
-		if ($im == FALSE) {
+		if ($im == false) {
 			fclose($fh);
-			trigger_error('imagecreatefrombmp(): imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'], E_USER_WARNING);
-			return FALSE;
+			$this->logger->warning(
+				'imagecreatefrombmp: imagecreatetruecolor failed for file "' . $fileName . '" with dimensions ' . $meta['width'] . 'x' . $meta['height'],
+				array('app' => 'core'));
+			return false;
 		}
 
 		$data = fread($fh, $meta['imagesize']);
@@ -677,7 +686,7 @@ class OC_Image {
 					case 32:
 					case 24:
 						if (!($part = substr($data, $p, 3))) {
-							trigger_error($error, E_USER_WARNING);
+							$this->logger->warning($error, array('app' => 'core'));
 							return $im;
 						}
 						$color = unpack('V', $part . $vide);
@@ -685,7 +694,7 @@ class OC_Image {
 					case 16:
 						if (!($part = substr($data, $p, 2))) {
 							fclose($fh);
-							trigger_error($error, E_USER_WARNING);
+							$this->logger->warning($error, array('app' => 'core'));
 							return $im;
 						}
 						$color = unpack('v', $part);
@@ -693,12 +702,12 @@ class OC_Image {
 						break;
 					case 8:
 						$color = unpack('n', $vide . substr($data, $p, 1));
-						$color[1] = $palette[ $color[1] + 1 ];
+						$color[1] = $palette[$color[1] + 1];
 						break;
 					case 4:
 						$color = unpack('n', $vide . substr($data, floor($p), 1));
 						$color[1] = ($p * 2) % 2 == 0 ? $color[1] >> 4 : $color[1] & 0x0F;
-						$color[1] = $palette[ $color[1] + 1 ];
+						$color[1] = $palette[$color[1] + 1];
 						break;
 					case 1:
 						$color = unpack('n', $vide . substr($data, floor($p), 1));
@@ -728,13 +737,11 @@ class OC_Image {
 								$color[1] = ($color[1] & 0x1);
 								break;
 						}
-						$color[1] = $palette[ $color[1] + 1 ];
+						$color[1] = $palette[$color[1] + 1];
 						break;
 					default:
 						fclose($fh);
-						trigger_error('imagecreatefrombmp: '
-							. $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!',
-							E_USER_WARNING);
+						$this->logger->warning('imagecreatefrombmp: ' . $fileName . ' has ' . $meta['bits'] . ' bits and this is not supported!', array('app' => 'core'));
 						return false;
 				}
 				imagesetpixel($im, $x, $y, $color[1]);
@@ -749,24 +756,25 @@ class OC_Image {
 	}
 
 	/**
-	* Resizes the image preserving ratio.
-	* @param integer $maxSize The maximum size of either the width or height.
-	* @return bool
-	*/
+	 * Resizes the image preserving ratio.
+	 *
+	 * @param integer $maxSize The maximum size of either the width or height.
+	 * @return bool
+	 */
 	public function resize($maxSize) {
-		if(!$this->valid()) {
-			OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR);
+		if (!$this->valid()) {
+			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
 			return false;
 		}
-		$widthOrig=imageSX($this->resource);
-		$heightOrig=imageSY($this->resource);
-		$ratioOrig = $widthOrig/$heightOrig;
+		$widthOrig = imageSX($this->resource);
+		$heightOrig = imageSY($this->resource);
+		$ratioOrig = $widthOrig / $heightOrig;
 
 		if ($ratioOrig > 1) {
-			$newHeight = round($maxSize/$ratioOrig);
+			$newHeight = round($maxSize / $ratioOrig);
 			$newWidth = $maxSize;
 		} else {
-			$newWidth = round($maxSize*$ratioOrig);
+			$newWidth = round($maxSize * $ratioOrig);
 			$newHeight = $maxSize;
 		}
 
@@ -781,21 +789,21 @@ class OC_Image {
 	 */
 	public function preciseResize($width, $height) {
 		if (!$this->valid()) {
-			OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR);
+			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
 			return false;
 		}
-		$widthOrig=imageSX($this->resource);
-		$heightOrig=imageSY($this->resource);
+		$widthOrig = imageSX($this->resource);
+		$heightOrig = imageSY($this->resource);
 		$process = imagecreatetruecolor($width, $height);
 
 		if ($process == false) {
-			OC_Log::write('core', __METHOD__.'(): Error creating true color image', OC_Log::ERROR);
+			$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
 
 		// preserve transparency
-		if($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
+		if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
 			imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
 			imagealphablending($process, false);
 			imagesavealpha($process, true);
@@ -803,7 +811,7 @@ class OC_Image {
 
 		imagecopyresampled($process, $this->resource, 0, 0, 0, 0, $width, $height, $widthOrig, $heightOrig);
 		if ($process == false) {
-			OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$width.'x'.$height, OC_Log::ERROR);
+			$this->logger->error(__METHOD__ . '(): Error re-sampling process image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -813,46 +821,47 @@ class OC_Image {
 	}
 
 	/**
-	* Crops the image to the middle square. If the image is already square it just returns.
-	* @param int $size maximum size for the result (optional)
-	* @return bool for success or failure
-	*/
-	public function centerCrop($size=0) {
-		if(!$this->valid()) {
-			OC_Log::write('core', 'OC_Image->centerCrop, No image loaded', OC_Log::ERROR);
+	 * Crops the image to the middle square. If the image is already square it just returns.
+	 *
+	 * @param int $size maximum size for the result (optional)
+	 * @return bool for success or failure
+	 */
+	public function centerCrop($size = 0) {
+		if (!$this->valid()) {
+			$this->logger->error('OC_Image->centerCrop, No image loaded', array('app' => 'core'));
 			return false;
 		}
-		$widthOrig=imageSX($this->resource);
-		$heightOrig=imageSY($this->resource);
-		if($widthOrig === $heightOrig and $size==0) {
+		$widthOrig = imageSX($this->resource);
+		$heightOrig = imageSY($this->resource);
+		if ($widthOrig === $heightOrig and $size == 0) {
 			return true;
 		}
-		$ratioOrig = $widthOrig/$heightOrig;
+		$ratioOrig = $widthOrig / $heightOrig;
 		$width = $height = min($widthOrig, $heightOrig);
 
 		if ($ratioOrig > 1) {
-			$x = ($widthOrig/2) - ($width/2);
+			$x = ($widthOrig / 2) - ($width / 2);
 			$y = 0;
 		} else {
-			$y = ($heightOrig/2) - ($height/2);
+			$y = ($heightOrig / 2) - ($height / 2);
 			$x = 0;
 		}
-		if($size>0) {
-			$targetWidth=$size;
-			$targetHeight=$size;
-		}else{
-			$targetWidth=$width;
-			$targetHeight=$height;
+		if ($size > 0) {
+			$targetWidth = $size;
+			$targetHeight = $size;
+		} else {
+			$targetWidth = $width;
+			$targetHeight = $height;
 		}
 		$process = imagecreatetruecolor($targetWidth, $targetHeight);
 		if ($process == false) {
-			OC_Log::write('core', 'OC_Image->centerCrop. Error creating true color image', OC_Log::ERROR);
+			$this->logger->error('OC_Image->centerCrop, Error creating true color image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
 
 		// preserve transparency
-		if($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
+		if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
 			imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
 			imagealphablending($process, false);
 			imagesavealpha($process, true);
@@ -860,9 +869,7 @@ class OC_Image {
 
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $targetWidth, $targetHeight, $width, $height);
 		if ($process == false) {
-			OC_Log::write('core',
-				'OC_Image->centerCrop. Error resampling process image '.$width.'x'.$height,
-				OC_Log::ERROR);
+			$this->logger->error('OC_Image->centerCrop, Error re-sampling process image ' . $width . 'x' . $height, array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -872,27 +879,28 @@ class OC_Image {
 	}
 
 	/**
-	* Crops the image from point $x$y with dimension $wx$h.
-	* @param int $x Horizontal position
-	* @param int $y Vertical position
-	* @param int $w Width
-	* @param int $h Height
-	* @return bool for success or failure
-	*/
+	 * Crops the image from point $x$y with dimension $wx$h.
+	 *
+	 * @param int $x Horizontal position
+	 * @param int $y Vertical position
+	 * @param int $w Width
+	 * @param int $h Height
+	 * @return bool for success or failure
+	 */
 	public function crop($x, $y, $w, $h) {
-		if(!$this->valid()) {
-			OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR);
+		if (!$this->valid()) {
+			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
 			return false;
 		}
 		$process = imagecreatetruecolor($w, $h);
 		if ($process == false) {
-			OC_Log::write('core', __METHOD__.'(): Error creating true color image', OC_Log::ERROR);
+			$this->logger->error(__METHOD__ . '(): Error creating true color image', array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
 
 		// preserve transparency
-		if($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
+		if ($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
 			imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
 			imagealphablending($process, false);
 			imagesavealpha($process, true);
@@ -900,7 +908,7 @@ class OC_Image {
 
 		imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
 		if ($process == false) {
-			OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$w.'x'.$h, OC_Log::ERROR);
+			$this->logger->error(__METHOD__ . '(): Error re-sampling process image ' . $w . 'x' . $h, array('app' => 'core'));
 			imagedestroy($process);
 			return false;
 		}
@@ -910,41 +918,44 @@ class OC_Image {
 	}
 
 	/**
-	 * Resizes the image to fit within a boundry while preserving ratio.
+	 * Resizes the image to fit within a boundary while preserving ratio.
+	 *
 	 * @param integer $maxWidth
 	 * @param integer $maxHeight
 	 * @return bool
 	 */
 	public function fitIn($maxWidth, $maxHeight) {
-		if(!$this->valid()) {
-			OC_Log::write('core', __METHOD__.'(): No image loaded', OC_Log::ERROR);
+		if (!$this->valid()) {
+			$this->logger->error(__METHOD__ . '(): No image loaded', array('app' => 'core'));
 			return false;
 		}
-		$widthOrig=imageSX($this->resource);
-		$heightOrig=imageSY($this->resource);
-		$ratio = $widthOrig/$heightOrig;
+		$widthOrig = imageSX($this->resource);
+		$heightOrig = imageSY($this->resource);
+		$ratio = $widthOrig / $heightOrig;
 
-		$newWidth = min($maxWidth, $ratio*$maxHeight);
-		$newHeight = min($maxHeight, $maxWidth/$ratio);
+		$newWidth = min($maxWidth, $ratio * $maxHeight);
+		$newHeight = min($maxHeight, $maxWidth / $ratio);
 
 		$this->preciseResize(round($newWidth), round($newHeight));
 		return true;
 	}
 
 	public function destroy() {
-		if($this->valid()) {
+		if ($this->valid()) {
 			imagedestroy($this->resource);
 		}
-		$this->resource=null;
+		$this->resource = null;
 	}
 
 	public function __destruct() {
 		$this->destroy();
 	}
 }
-if ( ! function_exists( 'imagebmp') ) {
+
+if (!function_exists('imagebmp')) {
 	/**
 	 * Output a BMP image to either the browser or a file
+	 *
 	 * @link http://www.ugia.cn/wp-data/imagebmp.php
 	 * @author legend <legendsky@hotmail.com>
 	 * @link http://www.programmierer-forum.de/imagebmp-gute-funktion-gefunden-t143716.htm
@@ -955,11 +966,10 @@ if ( ! function_exists( 'imagebmp') ) {
 	 * @param int $compression [optional]
 	 * @return bool <b>TRUE</b> on success or <b>FALSE</b> on failure.
 	 */
-	function imagebmp($im, $fileName='', $bit=24, $compression=0) {
+	function imagebmp($im, $fileName = '', $bit = 24, $compression = 0) {
 		if (!in_array($bit, array(1, 4, 8, 16, 24, 32))) {
 			$bit = 24;
-		}
-		else if ($bit == 32) {
+		} else if ($bit == 32) {
 			$bit = 24;
 		}
 		$bits = pow(2, $bit);
@@ -981,7 +991,7 @@ if ( ! function_exists( 'imagebmp') ) {
 				if ($padding % 4 != 0) {
 					$extra = str_repeat("\0", $padding);
 				}
-				for ($j = $height - 1; $j >= 0; $j --) {
+				for ($j = $height - 1; $j >= 0; $j--) {
 					$i = 0;
 					while ($i < $width) {
 						$bin = 0;
@@ -995,8 +1005,7 @@ if ( ! function_exists( 'imagebmp') ) {
 					}
 					$bmpData .= $extra;
 				}
-			}
-			// RLE8
+			} // RLE8
 			else if ($compression == 1 && $bit == 8) {
 				for ($j = $height - 1; $j >= 0; $j--) {
 					$lastIndex = "\0";
@@ -1009,8 +1018,7 @@ if ( ! function_exists( 'imagebmp') ) {
 							}
 							$lastIndex = $index;
 							$sameNum = 1;
-						}
-						else {
+						} else {
 							$sameNum++;
 						}
 					}
@@ -1020,8 +1028,7 @@ if ( ! function_exists( 'imagebmp') ) {
 			}
 			$sizeQuad = strlen($rgbQuad);
 			$sizeData = strlen($bmpData);
-		}
-		else {
+		} else {
 			$extra = '';
 			$padding = 4 - ($width * ($bit / 8)) % 4;
 			if ($padding % 4 != 0) {
@@ -1030,7 +1037,7 @@ if ( ! function_exists( 'imagebmp') ) {
 			$bmpData = '';
 			for ($j = $height - 1; $j >= 0; $j--) {
 				for ($i = 0; $i < $width; $i++) {
-					$index  = imagecolorat($im, $i, $j);
+					$index = imagecolorat($im, $i, $j);
 					$colors = imagecolorsforindex($im, $index);
 					if ($bit == 16) {
 						$bin = 0 << $bit;
@@ -1038,8 +1045,7 @@ if ( ! function_exists( 'imagebmp') ) {
 						$bin |= ($colors['green'] >> 3) << 5;
 						$bin |= $colors['blue'] >> 3;
 						$bmpData .= pack("v", $bin);
-					}
-					else {
+					} else {
 						$bmpData .= pack("c*", $colors['blue'], $colors['green'], $colors['red']);
 					}
 				}
@@ -1057,20 +1063,21 @@ if ( ! function_exists( 'imagebmp') ) {
 			fclose($fp);
 			return true;
 		}
-		echo $fileHeader . $infoHeader. $rgbQuad . $bmpData;
+		echo $fileHeader . $infoHeader . $rgbQuad . $bmpData;
 		return true;
 	}
 }
 
-if ( ! function_exists( 'exif_imagetype' ) ) {
+if (!function_exists('exif_imagetype')) {
 	/**
 	 * Workaround if exif_imagetype does not exist
+	 *
 	 * @link http://www.php.net/manual/en/function.exif-imagetype.php#80383
 	 * @param string $fileName
 	 * @return string|boolean
 	 */
-	function exif_imagetype ( $fileName ) {
-		if ( ( $info = getimagesize( $fileName ) ) !== false ) {
+	function exif_imagetype($fileName) {
+		if (($info = getimagesize($fileName)) !== false) {
 			return $info[2];
 		}
 		return false;
-- 
GitLab


From 553ce946d3c999823c5b1f6cfde071ea41a80341 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Wed, 19 Nov 2014 20:10:48 +0100
Subject: [PATCH 595/616] Implement a logger to log to error_log

---
 config/config.sample.php     |  6 +++--
 lib/private/log/errorlog.php | 48 ++++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 lib/private/log/errorlog.php

diff --git a/config/config.sample.php b/config/config.sample.php
index daca5aed362..231a34f825b 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -441,8 +441,10 @@ $CONFIG = array(
 
 /**
  * By default the ownCloud logs are sent to the ``owncloud.log`` file in the
- * default ownCloud data directory. If syslogging is desired, set this parameter
- * to ``syslog``.
+ * default ownCloud data directory.
+ * If syslogging is desired, set this parameter to ``syslog``.
+ * Setting this parameter to ``errorlog`` will use the PHP error_log function
+ * for logging.
  */
 'log_type' => 'owncloud',
 
diff --git a/lib/private/log/errorlog.php b/lib/private/log/errorlog.php
new file mode 100644
index 00000000000..007ab307722
--- /dev/null
+++ b/lib/private/log/errorlog.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ *  The MIT License (MIT)
+ *
+ * Copyright (c) 2014 Christian Kampka <christian@kampka.net>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+class OC_Log_Errorlog {
+
+
+	/**
+	 * Init class data
+	 */
+	public static function init() {
+	}
+
+	/**
+	 * write a message in the log
+	 * @param string $app
+	 * @param string $message
+	 * @param int $level
+	 */
+	public static function write($app, $message, $level) {
+		$minLevel = min(OC_Config::getValue("loglevel", OC_Log::WARN), OC_Log::ERROR);
+		if ($level >= $minLevel) {
+			error_log('[owncloud]['.$app.'] '.$message);
+		}
+	}
+}
+
-- 
GitLab


From 7e47a363ff7255af36cb0c00461889985d84bb3f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Dec 2014 12:19:17 +0100
Subject: [PATCH 596/616] Better manage the output when running autotest.cmd

---
 autotest.cmd | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/autotest.cmd b/autotest.cmd
index 5f1b1ae3a1d..1b33596ba37 100644
--- a/autotest.cmd
+++ b/autotest.cmd
@@ -7,8 +7,10 @@
 :: @copyright 2012, 2013 Thomas Müller thomas.mueller@tmit.eu
 ::
 
-set DATADIR=data-autotest
+@echo off
+
 set BASEDIR=%~dp0
+set DATADIR=data-autotest
 
 :: create autoconfig for sqlite, mysql, postgresql and mssql
 echo ^<?php                                      > .\tests\autoconfig-sqlite.php
@@ -82,7 +84,9 @@ if [%1] == [] (
 goto:eof
 
 :execute_tests
-	echo "Setup environment for %~1 testing ..."
+	@echo on
+
+	@echo "Setup environment for %~1 testing ..."
 	:: back to root folder
 	cd %BASEDIR%
 
@@ -109,14 +113,17 @@ goto:eof
 	copy /y %BASEDIR%\tests\autoconfig-%~1.php %BASEDIR%\config\autoconfig.php
 
 	:: trigger installation
-	php -f index.php
+	@echo INDEX
+	call php -f index.php
+	@echo END INDEX
 
 	::test execution
-	echo "Testing with %~1 ..."
+	@echo "Testing with %~1 ..."
 	cd tests
 	rmdir /s /q coverage-html-%~1
 	md coverage-html-%~1
 	php -f enable_all.php
+
         :: no external files on windows for now
         cd ..
         php occ app:disable files_external
@@ -124,7 +131,7 @@ goto:eof
 
 	call phpunit --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
 
-	echo "Done with testing %~1 ..."
+	@echo "Done with testing %~1 ..."
 	cd %BASEDIR%
 goto:eof
 
-- 
GitLab


From a73023fe05664b4c5a45a18d2ecbc886a2a33704 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Dec 2014 12:20:07 +0100
Subject: [PATCH 597/616] Allow passing a test file just like in autotest.sh

---
 autotest.cmd | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/autotest.cmd b/autotest.cmd
index 1b33596ba37..a6119f5afd4 100644
--- a/autotest.cmd
+++ b/autotest.cmd
@@ -72,13 +72,13 @@ echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf
 ::
 if [%1] == [] (
 	echo "Running on all database backends"
-	call:execute_tests "sqlite"
-	call:execute_tests "mysql"
-	call:execute_tests "mssql"
-	::call:execute_tests "ora"
-	call:execute_tests "pgsql"
+	call:execute_tests "sqlite" "%2"
+	call:execute_tests "mysql" "%2"
+	call:execute_tests "mssql" "%2"
+	::call:execute_tests "ora" "%2"
+	call:execute_tests "pgsql" "%2"
 ) else (
-	call:execute_tests "%1"
+	call:execute_tests "%1" "%2"
 )
 
 goto:eof
@@ -129,7 +129,7 @@ goto:eof
         php occ app:disable files_external
         cd tests
 
-	call phpunit --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1
+	call phpunit --bootstrap bootstrap.php --configuration phpunit-autotest.xml --log-junit autotest-results-%~1.xml --coverage-clover autotest-clover-%~1.xml --coverage-html coverage-html-%~1 %~2
 
 	@echo "Done with testing %~1 ..."
 	cd %BASEDIR%
-- 
GitLab


From a0fea16d56682976b64a1c96e583542e12e1763e Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Dec 2014 12:21:37 +0100
Subject: [PATCH 598/616] Allow overwriting DATADIR completly so ramdisk can be
 used

---
 autotest.cmd | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/autotest.cmd b/autotest.cmd
index a6119f5afd4..0bff45ef379 100644
--- a/autotest.cmd
+++ b/autotest.cmd
@@ -10,7 +10,7 @@
 @echo off
 
 set BASEDIR=%~dp0
-set DATADIR=data-autotest
+set DATADIR=%BASEDIR%data-autotest
 
 :: create autoconfig for sqlite, mysql, postgresql and mssql
 echo ^<?php                                      > .\tests\autoconfig-sqlite.php
@@ -20,7 +20,7 @@ echo  'dbtype' ^=^> 'sqlite'^,                   >> .\tests\autoconfig-sqlite.ph
 echo  'dbtableprefix' ^=^> 'oc_'^,               >> .\tests\autoconfig-sqlite.php
 echo  'adminlogin' ^=^> 'admin'^,                >> .\tests\autoconfig-sqlite.php
 echo  'adminpass' ^=^> 'admin'^,                 >> .\tests\autoconfig-sqlite.php
-echo  'directory' ^=^> '%BASEDIR%%DATADIR%'^,    >> .\tests\autoconfig-sqlite.php
+echo  'directory' ^=^> '%DATADIR%'^,             >> .\tests\autoconfig-sqlite.php
 echo ^)^;                                        >> .\tests\autoconfig-sqlite.php
 
 echo ^<?php                                      > .\tests\autoconfig-mysql.php
@@ -30,7 +30,7 @@ echo   'dbtype' ^=^> 'mysql'^,                   >> .\tests\autoconfig-mysql.php
 echo   'dbtableprefix' ^=^> 'oc_'^,              >> .\tests\autoconfig-mysql.php
 echo   'adminlogin' ^=^> 'admin'^,               >> .\tests\autoconfig-mysql.php
 echo   'adminpass' ^=^> 'admin'^,                >> .\tests\autoconfig-mysql.php
-echo   'directory' ^=^> '%BASEDIR%%DATADIR%'^,   >> .\tests\autoconfig-mysql.php
+echo   'directory' ^=^> '%DATADIR%'^,            >> .\tests\autoconfig-mysql.php
 echo   'dbuser' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-mysql.php
 echo   'dbname' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-mysql.php
 echo   'dbhost' ^=^> 'localhost'^,               >> .\tests\autoconfig-mysql.php
@@ -44,7 +44,7 @@ echo   'dbtype' ^=^> 'pgsql'^,                   >> .\tests\autoconfig-pgsql.php
 echo   'dbtableprefix' ^=^> 'oc_'^,              >> .\tests\autoconfig-pgsql.php
 echo   'adminlogin' ^=^> 'admin'^,               >> .\tests\autoconfig-pgsql.php
 echo   'adminpass' ^=^> 'admin'^,                >> .\tests\autoconfig-pgsql.php
-echo   'directory' ^=^> '%BASEDIR%%DATADIR%'^,   >> .\tests\autoconfig-pgsql.php
+echo   'directory' ^=^> '%DATADIR%'^,            >> .\tests\autoconfig-pgsql.php
 echo   'dbuser' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-pgsql.php
 echo   'dbname' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-pgsql.php
 echo   'dbhost' ^=^> 'localhost'^,               >> .\tests\autoconfig-pgsql.php
@@ -58,7 +58,7 @@ echo   'dbtype' ^=^> 'mssql'^,                   >> .\tests\autoconfig-mssql.php
 echo   'dbtableprefix' ^=^> 'oc_'^,              >> .\tests\autoconfig-mssql.php
 echo   'adminlogin' ^=^> 'admin'^,               >> .\tests\autoconfig-mssql.php
 echo   'adminpass' ^=^> 'admin'^,                >> .\tests\autoconfig-mssql.php
-echo   'directory' ^=^> '%BASEDIR%%DATADIR%'^,   >> .\tests\autoconfig-mssql.php
+echo   'directory' ^=^> '%DATADIR%'^,            >> .\tests\autoconfig-mssql.php
 echo   'dbuser' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-mssql.php
 echo   'dbname' ^=^> 'oc_autotest'^,             >> .\tests\autoconfig-mssql.php
 echo   'dbhost' ^=^> 'localhost\sqlexpress'^,    >> .\tests\autoconfig-mssql.php
-- 
GitLab


From 9da4a6323dbfc7f67be56a8c0f30a9a39645553d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Dec 2014 12:41:33 +0100
Subject: [PATCH 599/616] Restore the development config after running the
 tests

---
 autotest.cmd | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/autotest.cmd b/autotest.cmd
index 0bff45ef379..2129e2d30d6 100644
--- a/autotest.cmd
+++ b/autotest.cmd
@@ -67,11 +67,18 @@ echo ^)^;                                        >> .\tests\autoconfig-mssql.php
 
 echo localhost:5432:*:oc_autotest:owncloud > %APPDATA%\postgresql\pgpass.conf
 
+@echo on
+
+:: Back up existing (dev) config if one exists
+if exist config\config.php (
+	copy /y config\config.php config\config-autotest-backup.php
+)
+
 ::
 :: start test execution
 ::
 if [%1] == [] (
-	echo "Running on all database backends"
+	@echo "Running on all database backends"
 	call:execute_tests "sqlite" "%2"
 	call:execute_tests "mysql" "%2"
 	call:execute_tests "mssql" "%2"
@@ -81,11 +88,18 @@ if [%1] == [] (
 	call:execute_tests "%1" "%2"
 )
 
+goto:restore_config
+
 goto:eof
 
-:execute_tests
-	@echo on
+:restore_config
+	:: Restore existing config
+	if exist config\config-autotest-backup.php (
+		copy /y config\config-autotest-backup.php config\config.php
+	)
+goto:eof
 
+:execute_tests
 	@echo "Setup environment for %~1 testing ..."
 	:: back to root folder
 	cd %BASEDIR%
-- 
GitLab


From db3f7238dd1d10c826c2e484d1d8c2a720bbec47 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 5 Sep 2014 12:05:04 +0200
Subject: [PATCH 600/616] Clear statcache before getting the mtime from local
 storage backends

---
 lib/private/files/storage/local.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/files/storage/local.php b/lib/private/files/storage/local.php
index 7b4abf08f44..e8be7daba7e 100644
--- a/lib/private/files/storage/local.php
+++ b/lib/private/files/storage/local.php
@@ -134,6 +134,7 @@ if (\OC_Util::runningOnWindows()) {
 		}
 
 		public function filemtime($path) {
+			clearstatcache($this->getSourcePath($path));
 			return filemtime($this->getSourcePath($path));
 		}
 
-- 
GitLab


From 49cfc3035944956269e7264df9fbfb202b7e096d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 18 Nov 2014 17:25:36 +0100
Subject: [PATCH 601/616] upgrade to new folder structure

---
 apps/files_encryption/appinfo/update.php   |   5 +-
 apps/files_encryption/appinfo/version      |   2 +-
 apps/files_encryption/lib/keymanager.php   |  34 +--
 apps/files_encryption/lib/migration.php    | 261 +++++++++++++++++++--
 apps/files_encryption/lib/session.php      |   4 +-
 apps/files_encryption/lib/util.php         |   2 +-
 apps/files_encryption/tests/crypt.php      |  22 --
 apps/files_encryption/tests/helper.php     |   8 -
 apps/files_encryption/tests/hooks.php      |  32 +--
 apps/files_encryption/tests/keymanager.php |  23 +-
 apps/files_encryption/tests/migration.php  | 259 +++++++++++++-------
 apps/files_encryption/tests/proxy.php      |  22 --
 apps/files_encryption/tests/share.php      |  31 +--
 apps/files_encryption/tests/stream.php     |  19 --
 apps/files_encryption/tests/testcase.php   |  31 +++
 apps/files_encryption/tests/trashbin.php   |  22 --
 apps/files_encryption/tests/util.php       |  25 +-
 apps/files_encryption/tests/webdav.php     |  22 --
 18 files changed, 483 insertions(+), 341 deletions(-)

diff --git a/apps/files_encryption/appinfo/update.php b/apps/files_encryption/appinfo/update.php
index a29667ec6b6..957cf746974 100644
--- a/apps/files_encryption/appinfo/update.php
+++ b/apps/files_encryption/appinfo/update.php
@@ -4,7 +4,8 @@ use OCA\Files_Encryption\Migration;
 
 $installedVersion=OCP\Config::getAppValue('files_encryption', 'installed_version');
 
-if (version_compare($installedVersion, '0.6', '<')) {
+// Migration OC7 -> OC8
+if (version_compare($installedVersion, '0.7', '<')) {
 	$m = new Migration();
-	$m->dropTableEncryption();
+	$m->reorganizeFolderStructure();
 }
diff --git a/apps/files_encryption/appinfo/version b/apps/files_encryption/appinfo/version
index ee6cdce3c29..faef31a4357 100644
--- a/apps/files_encryption/appinfo/version
+++ b/apps/files_encryption/appinfo/version
@@ -1 +1 @@
-0.6.1
+0.7.0
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index 2c340bcb23f..c8de1a73d27 100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -31,7 +31,9 @@ namespace OCA\Encryption;
 class Keymanager {
 
 	// base dir where all the file related keys are stored
-	const KEYS_BASE_DIR = '/files_encryption/keys/';
+	private static $keys_base_dir = '/files_encryption/keys/';
+	private static $encryption_base_dir = '/files_encryption';
+	private static $public_key_dir = '/files_encryption/public_keys';
 
 	/**
 	 * read key from hard disk
@@ -95,10 +97,14 @@ class Keymanager {
 	 * @return string public key or false
 	 */
 	public static function getPublicKey(\OC\Files\View $view, $userId) {
-		$path = '/public-keys/' . $userId . '.publicKey';
+		$path = self::$public_key_dir . '/' . $userId . '.publicKey';
 		return self::getKey($path, $view);
 	}
 
+	public static function getPublicKeyPath() {
+		return self::$public_key_dir;
+	}
+
 	/**
 	 * Retrieve a user's public and private key
 	 * @param \OC\Files\View $view
@@ -168,9 +174,9 @@ class Keymanager {
 
 		// in case of system wide mount points the keys are stored directly in the data directory
 		if ($util->isSystemWideMountPoint($filename)) {
-			$keyPath = self::KEYS_BASE_DIR . $filePath_f . '/';
+			$keyPath = self::$keys_base_dir . $filePath_f . '/';
 		} else {
-			$keyPath = '/' . $owner . self::KEYS_BASE_DIR . $filePath_f . '/';
+			$keyPath = '/' . $owner . self::$keys_base_dir . $filePath_f . '/';
 		}
 
 		return $keyPath;
@@ -215,7 +221,7 @@ class Keymanager {
 		$result = false;
 
 		if (!\OCP\User::userExists($uid)) {
-			$publicKey = '/public-keys/' . $uid . '.publicKey';
+			$publicKey = self::$public_key_dir . '/' . $uid . '.publicKey';
 			$result = $view->unlink($publicKey);
 		}
 
@@ -229,7 +235,7 @@ class Keymanager {
 	 * @param string $uid
 	 */
 	public static function publicKeyExists($view, $uid) {
-		return $view->file_exists('/public-keys/'. $uid . '.publicKey');
+		return $view->file_exists(self::$public_key_dir . '/'. $uid . '.publicKey');
 	}
 
 
@@ -278,8 +284,8 @@ class Keymanager {
 
 		$recoveryKeyId = Helper::getRecoveryKeyId();
 		if ($recoveryKeyId) {
-			$result = ($view->file_exists("/public-keys/" . $recoveryKeyId . ".publicKey")
-					&& $view->file_exists("/owncloud_private_key/" . $recoveryKeyId . ".privateKey"));
+			$result = ($view->file_exists(self::$public_key_dir . '/' . $recoveryKeyId . ".publicKey")
+					&& $view->file_exists(self::$encryption_base_dir . '/' . $recoveryKeyId . ".privateKey"));
 		}
 
 		return $result;
@@ -290,8 +296,8 @@ class Keymanager {
 
 		$publicShareKeyId = Helper::getPublicShareKeyId();
 		if ($publicShareKeyId) {
-			$result = ($view->file_exists("/public-keys/" . $publicShareKeyId . ".publicKey")
-					&& $view->file_exists("/owncloud_private_key/" . $publicShareKeyId . ".privateKey"));
+			$result = ($view->file_exists(self::$public_key_dir . '/' . $publicShareKeyId . ".publicKey")
+					&& $view->file_exists(self::$encryption_base_dir . '/' . $publicShareKeyId . ".privateKey"));
 
 		}
 
@@ -308,9 +314,8 @@ class Keymanager {
 	public static function setPublicKey($key, $user = '') {
 
 		$user = $user === '' ? \OCP\User::getUser() : $user;
-		$path = '/public-keys';
 
-		return self::setKey($path, $user . '.publicKey', $key, new \OC\Files\View('/'));
+		return self::setKey(self::$public_key_dir, $user . '.publicKey', $key, new \OC\Files\View('/'));
 	}
 
 	/**
@@ -323,10 +328,9 @@ class Keymanager {
 	public static function setPrivateSystemKey($key, $keyName) {
 
 		$keyName = $keyName . '.privateKey';
-		$path = '/owncloud_private_key';
 		$header = Crypt::generateHeader();
 
-		return self::setKey($path, $keyName,$header . $key, new \OC\Files\View());
+		return self::setKey(self::$encryption_base_dir, $keyName,$header . $key, new \OC\Files\View());
 	}
 
 	/**
@@ -337,7 +341,7 @@ class Keymanager {
 	 */
 	public static function getPrivateSystemKey($keyName) {
 		$path = $keyName . '.privateKey';
-		return self::getKey($path, new \OC\Files\View('/owncloud_private_key'));
+		return self::getKey($path, new \OC\Files\View(self::$encryption_base_dir));
 	}
 
 	/**
diff --git a/apps/files_encryption/lib/migration.php b/apps/files_encryption/lib/migration.php
index 62a765d21f4..ee2e52114cf 100644
--- a/apps/files_encryption/lib/migration.php
+++ b/apps/files_encryption/lib/migration.php
@@ -4,7 +4,7 @@
  *
  * @copyright (C) 2014 ownCloud, Inc.
  *
- * @author Thomas Müller <deepdiver@owncloud.com>
+ * @author Bjoern Schiessle <schiessle@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
@@ -26,26 +26,257 @@ namespace OCA\Files_Encryption;
 
 class Migration {
 
-	public function __construct($tableName = 'encryption') {
-		$this->tableName = $tableName;
+	/**
+	 * @var \OC\Files\View
+	 */
+	private $view;
+	private $public_share_key_id;
+	private $recovery_key_id;
+
+	public function __construct() {
+		$this->view = new \OC\Files\View();
+		$this->public_share_key_id = \OCA\Encryption\Helper::getPublicShareKeyId();
+		$this->recovery_key_id = \OCA\Encryption\Helper::getRecoveryKeyId();
+	}
+
+	public function reorganizeFolderStructure() {
+
+		$this->createPathForKeys('/files_encryption');
+
+		// backup system wide folders
+		$this->backupSystemWideKeys();
+
+		// rename public keys
+		$this->renamePublicKeys();
+
+		// rename system wide mount point
+		$this->renameFileKeys('', '/files_encryption/keyfiles');
+
+		// rename system private keys
+		$this->renameSystemPrivateKeys();
+
+		// delete old system wide folders
+		$this->view->deleteAll('/public-keys');
+		$this->view->deleteAll('/owncloud_private_key');
+		$this->view->deleteAll('/files_encryption/share-keys');
+		$this->view->deleteAll('/files_encryption/keyfiles');
+
+		$users = \OCP\User::getUsers();
+		foreach ($users as $user) {
+			// backup all keys
+			if ($this->backupUserKeys($user)) {
+				// create new 'key' folder
+				$this->view->mkdir($user . '/files_encryption/keys');
+				// rename users private key
+				$this->renameUsersPrivateKey($user);
+				// rename file keys
+				$path = $user . '/files_encryption/keyfiles';
+				$this->renameFileKeys($user, $path);
+				$trashPath = $user . '/files_trashbin/keyfiles';
+				if (\OC_App::isEnabled('files_trashbin') && $this->view->is_dir($trashPath)) {
+					$this->renameFileKeys($user, $trashPath, true);
+					$this->view->deleteAll($trashPath);
+					$this->view->deleteAll($user . '/files_trashbin/share-keys');
+				}
+				// delete old folders
+				$this->deleteOldKeys($user);
+			}
+		}
+	}
+
+	private function backupSystemWideKeys() {
+		$backupDir = 'encryption_migration_backup_' . date("Y-m-d_H-i-s");
+		$this->view->mkdir($backupDir);
+		$this->view->copy('owncloud_private_key', $backupDir . '/owncloud_private_key');
+		$this->view->copy('public-keys', $backupDir . '/public-keys');
+		$this->view->copy('files_encryption', $backupDir . '/files_encryption');
+	}
+
+	private function backupUserKeys($user) {
+		$encryptionDir = $user . '/files_encryption';
+		if ($this->view->is_dir($encryptionDir)) {
+			$backupDir = $user . '/encryption_migration_backup_' . date("Y-m-d_H-i-s");
+			$this->view->mkdir($backupDir);
+			$this->view->copy($encryptionDir, $backupDir);
+			return true;
+		}
+		return false;
+	}
+
+	private function renamePublicKeys() {
+		$dh = $this->view->opendir('public-keys');
+
+		$this->createPathForKeys('files_encryption/public_keys');
+
+		if (is_resource($dh)) {
+			while (($oldPublicKey = readdir($dh)) !== false) {
+				if (!\OC\Files\Filesystem::isIgnoredDir($oldPublicKey)) {
+					$newPublicKey = substr($oldPublicKey, 0, strlen($oldPublicKey) - strlen('.public.key')) . '.publicKey';
+					$this->view->rename('public-keys/' . $oldPublicKey , 'files_encryption/public_keys/' . $newPublicKey);
+				}
+			}
+			closedir($dh);
+		}
 	}
 
-	// migrate settings from oc_encryption to oc_preferences
-	public function dropTableEncryption() {
-		$tableName = $this->tableName;
-		if (!\OC_DB::tableExists($tableName)) {
-			return;
+	private function renameSystemPrivateKeys() {
+		$dh = $this->view->opendir('owncloud_private_key');
+
+		if (is_resource($dh)) {
+			while (($oldPrivateKey = readdir($dh)) !== false) {
+				if (!\OC\Files\Filesystem::isIgnoredDir($oldPrivateKey)) {
+					$newPrivateKey = substr($oldPrivateKey, 0, strlen($oldPrivateKey) - strlen('.private.key')) . '.privateKey';
+					$this->view->rename('owncloud_private_key/' . $oldPrivateKey , 'files_encryption/' . $newPrivateKey);
+				}
+			}
+			closedir($dh);
 		}
-		$sql = "select `uid`, max(`recovery_enabled`) as `recovery_enabled`, min(`migration_status`) as `migration_status` from `*PREFIX*$tableName` group by `uid`";
-		$query = \OCP\DB::prepare($sql);
-		$result = $query->execute(array())->fetchAll();
+	}
+
+	private function renameUsersPrivateKey($user) {
+		 $oldPrivateKey = $user . '/files_encryption/' . $user . '.private.key';
+		 $newPrivateKey = substr($oldPrivateKey, 0, strlen($oldPrivateKey) - strlen('.private.key')) . '.privateKey';
+
+		 $this->view->rename($oldPrivateKey, $newPrivateKey);
+	}
 
-		foreach ($result as $row) {
-			\OC_Preferences::setValue($row['uid'], 'files_encryption', 'recovery_enabled', $row['recovery_enabled']);
-			\OC_Preferences::setValue($row['uid'], 'files_encryption', 'migration_status', $row['migration_status']);
+	private function getFileName($file, $trash) {
+
+		$extLength = strlen('.key');
+
+		if ($trash) {
+			$parts = explode('.', $file);
+			if ($parts[count($parts) - 1] !== 'key') {
+				$extLength = $extLength + strlen('.' . $parts[count($parts) - 1]);
+			}
 		}
 
-		\OC_DB::dropTable($tableName);
+		$filename = substr($file, 0, strlen($file) - $extLength);
+
+		return $filename;
 	}
 
+	private function getExtension($file, $trash) {
+
+		$extension = '';
+
+		if ($trash) {
+			$parts = explode('.', $file);
+			if ($parts[count($parts) - 1] !== 'key') {
+				$extension = '.' . $parts[count($parts) - 1];
+			}
+		}
+
+		return $extension;
+	}
+
+	private function getFilePath($path, $user, $trash) {
+		$offset = $trash ? strlen($user . '/files_trashbin/keyfiles') :  strlen($user . '/files_encryption/keyfiles');
+		return substr($path, $offset);
+	}
+
+	private function getTargetDir($user, $filePath, $filename, $extension, $trash) {
+		if ($trash) {
+			$targetDir = $user . '/files_trashbin/keys/' . $filePath . '/' . $filename . $extension;
+		} else {
+			$targetDir = $user . '/files_encryption/keys/' . $filePath . '/' . $filename . $extension;
+		}
+
+		return $targetDir;
+	}
+
+	private function renameFileKeys($user, $path, $trash = false) {
+
+		$dh = $this->view->opendir($path);
+
+		if (is_resource($dh)) {
+			while (($file = readdir($dh)) !== false) {
+				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+					if ($this->view->is_dir($path . '/' . $file)) {
+						$this->renameFileKeys($user, $path . '/' . $file, $trash);
+					} else {
+						$filename = $this->getFileName($file, $trash);
+						$filePath = $this->getFilePath($path, $user, $trash);
+						$extension = $this->getExtension($file, $trash);
+						$targetDir = $this->getTargetDir($user, $filePath, $filename, $extension, $trash);
+						$this->createPathForKeys($targetDir);
+						$this->view->copy($path . '/' . $file, $targetDir . '/fileKey');
+						$this->renameShareKeys($user, $filePath, $filename, $targetDir, $trash);
+					}
+				}
+			}
+			closedir($dh);
+		}
+	}
+
+	private function getOldShareKeyPath($user, $filePath, $trash) {
+		if ($trash) {
+			$oldShareKeyPath = $user . '/files_trashbin/share-keys/' . $filePath;
+		} else {
+			$oldShareKeyPath = $user . '/files_encryption/share-keys/' . $filePath;
+		}
+
+		return $oldShareKeyPath;
+	}
+
+	private function getUidFromShareKey($file, $filename, $trash) {
+		$extLength = strlen('.shareKey');
+		if ($trash) {
+			$parts = explode('.', $file);
+			if ($parts[count($parts) - 1] !== 'shareKey') {
+				$extLength = $extLength + strlen('.' . $parts[count($parts) - 1]);
+			}
+		}
+
+		$uid = substr($file, strlen($filename) + 1, $extLength * -1);
+
+		return $uid;
+	}
+
+	private function renameShareKeys($user, $filePath, $filename, $target, $trash) {
+		$oldShareKeyPath = $this->getOldShareKeyPath($user, $filePath, $trash);
+		$dh = $this->view->opendir($oldShareKeyPath);
+
+		if (is_resource($dh)) {
+			while (($file = readdir($dh)) !== false) {
+				if (!\OC\Files\Filesystem::isIgnoredDir($file)) {
+					if ($this->view->is_dir($oldShareKeyPath . '/' . $file)) {
+						continue;
+					} else {
+						if (substr($file, 0, strlen($filename) +1) === $filename . '.') {
+
+							$uid = $this->getUidFromShareKey($file, $filename, $trash);
+							if ($uid === $this->public_share_key_id ||
+									$uid === $this->recovery_key_id ||
+									\OCP\User::userExists($uid)) {
+								$this->view->copy($oldShareKeyPath . '/' . $file, $target . '/' . $uid . '.shareKey');
+							}
+						}
+					}
+
+				}
+			}
+			closedir($dh);
+		}
+	}
+
+	private function deleteOldKeys($user) {
+		$this->view->deleteAll($user . '/files_encryption/keyfiles');
+		$this->view->deleteAll($user . '/files_encryption/share-keys');
+	}
+
+	private function createPathForKeys($path) {
+		if (!$this->view->file_exists($path)) {
+			$sub_dirs = explode('/', $path);
+			$dir = '';
+			foreach ($sub_dirs as $sub_dir) {
+				$dir .= '/' . $sub_dir;
+				if (!$this->view->is_dir($dir)) {
+					$this->view->mkdir($dir);
+				}
+			}
+		}
+	}
+
+
 }
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 355264a5070..7f1e0664cdc 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -48,9 +48,9 @@ class Session {
 
 		$this->view = $view;
 
-		if (!$this->view->is_dir('owncloud_private_key')) {
+		if (!$this->view->is_dir('files_encryption')) {
 
-			$this->view->mkdir('owncloud_private_key');
+			$this->view->mkdir('files_encryption');
 
 		}
 
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 6c1b2f60d7e..42a7e20c87f 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -73,7 +73,7 @@ class Util {
 		$this->fileFolderName = 'files';
 		$this->userFilesDir =
 				'/' . $userId . '/' . $this->fileFolderName; // TODO: Does this need to be user configurable?
-		$this->publicKeyDir = '/' . 'public-keys';
+		$this->publicKeyDir = Keymanager::getPublicKeyPath();
 		$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
 		$this->keysPath = $this->encryptionDir . '/' . 'keys';
 		$this->publicKeyPath =
diff --git a/apps/files_encryption/tests/crypt.php b/apps/files_encryption/tests/crypt.php
index 46a717f851e..ab2ce066cdb 100755
--- a/apps/files_encryption/tests/crypt.php
+++ b/apps/files_encryption/tests/crypt.php
@@ -33,20 +33,6 @@ class Test_Encryption_Crypt extends \OCA\Files_Encryption\Tests\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerUserHooks();
-
-		// clear and register hooks
-		\OC_FileProxy::clearProxies();
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// create test user
 		self::loginHelper(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1, true);
 	}
@@ -99,14 +85,6 @@ class Test_Encryption_Crypt extends \OCA\Files_Encryption\Tests\TestCase {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Crypt::TEST_ENCRYPTION_CRYPT_USER1);
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
diff --git a/apps/files_encryption/tests/helper.php b/apps/files_encryption/tests/helper.php
index f0e3408b2e0..88ba9f20d53 100644
--- a/apps/files_encryption/tests/helper.php
+++ b/apps/files_encryption/tests/helper.php
@@ -38,14 +38,6 @@ class Test_Encryption_Helper extends \OCA\Files_Encryption\Tests\TestCase {
 	}
 
 	public static function tearDownAfterClass() {
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
diff --git a/apps/files_encryption/tests/hooks.php b/apps/files_encryption/tests/hooks.php
index fc40d4cd61f..d5a30f5074a 100644
--- a/apps/files_encryption/tests/hooks.php
+++ b/apps/files_encryption/tests/hooks.php
@@ -63,28 +63,6 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 			'.t est.txt'
 		);
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
-		\OC_Hook::clear('OC_Filesystem');
-		\OC_Hook::clear('OC_User');
-
-		// clear share hooks
-		\OC_Hook::clear('OCP\\Share');
-		\OC::registerShareHooks();
-		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// Sharing related hooks
-		\OCA\Encryption\Helper::registerShareHooks();
-
-		// clear and register proxies
-		\OC_FileProxy::clearProxies();
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// create test user
 		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1, true);
 		self::loginHelper(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2, true);
@@ -114,14 +92,6 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 		\OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER1);
 		\OC_User::deleteUser(\Test_Encryption_Hooks::TEST_ENCRYPTION_HOOKS_USER2);
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
@@ -439,7 +409,7 @@ class Test_Encryption_Hooks extends \OCA\Files_Encryption\Tests\TestCase {
 		// set user password for the first time
 		\OCA\Encryption\Hooks::postCreateUser(array('uid' => 'newUser', 'password' => 'newUserPassword'));
 
-		$this->assertTrue($view->file_exists('public-keys/newUser.publicKey'));
+		$this->assertTrue($view->file_exists(\OCA\Encryption\Keymanager::getPublicKeyPath() . '/newUser.publicKey'));
 		$this->assertTrue($view->file_exists('newUser/files_encryption/newUser.privateKey'));
 
 		// check if we are able to decrypt the private key
diff --git a/apps/files_encryption/tests/keymanager.php b/apps/files_encryption/tests/keymanager.php
index f86f7d894ce..21f03839430 100644
--- a/apps/files_encryption/tests/keymanager.php
+++ b/apps/files_encryption/tests/keymanager.php
@@ -28,17 +28,6 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// clear and register hooks
-		\OC_FileProxy::clearProxies();
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// disable file proxy by default
 		\OC_FileProxy::$enabled = false;
 
@@ -92,14 +81,6 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 			OC_App::enable('files_trashbin');
 		}
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
@@ -192,14 +173,14 @@ class Test_Encryption_Keymanager extends \OCA\Files_Encryption\Tests\TestCase {
 
 		Encryption\Keymanager::setPrivateSystemKey($key, $keyName);
 
-		$this->assertTrue($this->view->file_exists('/owncloud_private_key/' . $keyName . '.privateKey'));
+		$this->assertTrue($this->view->file_exists('/files_encryption/' . $keyName . '.privateKey'));
 
 		$result = Encryption\Keymanager::getPrivateSystemKey($keyName);
 
 		$this->assertSame($encHeader . $key, $result);
 
 		// clean up
-		$this->view->unlink('/owncloud_private_key/' . $keyName.'.privateKey');
+		$this->view->unlink('/files_encryption/' . $keyName.'.privateKey');
 	}
 
 
diff --git a/apps/files_encryption/tests/migration.php b/apps/files_encryption/tests/migration.php
index 8ca2e94c90a..21c4e354c29 100644
--- a/apps/files_encryption/tests/migration.php
+++ b/apps/files_encryption/tests/migration.php
@@ -2,8 +2,9 @@
  /**
  * ownCloud
  *
- * @author Thomas Müller
- * @copyright 2014 Thomas Müller deepdiver@owncloud.com
+ * @copyright (C) 2014 ownCloud, Inc.
+ *
+ * @author Bjoern Schiessle <schiessle@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
@@ -23,7 +24,29 @@
 use OCA\Encryption;
 use OCA\Files_Encryption\Migration;
 
-class Test_Migration extends \Test\TestCase {
+class Test_Migration extends \OCA\Files_Encryption\Tests\TestCase {
+
+	const TEST_ENCRYPTION_MIGRATION_USER1='test_encryption_user1';
+	const TEST_ENCRYPTION_MIGRATION_USER2='test_encryption_user2';
+	const TEST_ENCRYPTION_MIGRATION_USER3='test_encryption_user3';
+
+	private $view;
+	private $public_share_key_id;
+	private $recovery_key_id;
+
+	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+		self::loginHelper(self::TEST_ENCRYPTION_MIGRATION_USER1, true);
+		self::loginHelper(self::TEST_ENCRYPTION_MIGRATION_USER2, true);
+		self::loginHelper(self::TEST_ENCRYPTION_MIGRATION_USER3, true);
+	}
+
+	public static function tearDownAfterClass() {
+		\OC_User::deleteUser(self::TEST_ENCRYPTION_MIGRATION_USER1);
+		\OC_User::deleteUser(self::TEST_ENCRYPTION_MIGRATION_USER2);
+		\OC_User::deleteUser(self::TEST_ENCRYPTION_MIGRATION_USER3);
+		parent::tearDownAfterClass();
+	}
 
 	protected function tearDown() {
 		if (OC_DB::tableExists('encryption_test')) {
@@ -34,26 +57,17 @@ class Test_Migration extends \Test\TestCase {
 		parent::tearDown();
 	}
 
-	protected function setUp() {
-		parent::setUp();
-
+	public function setUp() {
+		$this->loginHelper(self::TEST_ENCRYPTION_MIGRATION_USER1);
+		$this->view = new \OC\Files\View();
+		$this->public_share_key_id = Encryption\Helper::getPublicShareKeyId();
+		$this->recovery_key_id = Encryption\Helper::getRecoveryKeyId();
 		if (OC_DB::tableExists('encryption_test')) {
 			OC_DB::dropTable('encryption_test');
 		}
 		$this->assertTableNotExist('encryption_test');
 	}
 
-	public function testEncryptionTableDoesNotExist() {
-
-		$this->assertTableNotExist('encryption_test');
-
-		$migration = new Migration('encryption_test');
-		$migration->dropTableEncryption();
-
-		$this->assertTableNotExist('encryption_test');
-
-	}
-
 	public function checkLastIndexId() {
 		$query = \OC_DB::prepare('INSERT INTO `*PREFIX*share` ('
 			.' `item_type`, `item_source`, `item_target`, `share_type`,'
@@ -91,89 +105,160 @@ class Test_Migration extends \Test\TestCase {
 		$this->checkLastIndexId();
 	}
 
-	public function testDataMigration() {
-		// TODO travis
-		if (getenv('TRAVIS')) {
-			$this->markTestSkipped('Fails on travis');
+	/**
+	 * @param string $table
+	 */
+	public function assertTableNotExist($table) {
+		$type=OC_Config::getValue( "dbtype", "sqlite" );
+		if( $type == 'sqlite' || $type == 'sqlite3' ) {
+			// sqlite removes the tables after closing the DB
+			$this->assertTrue(true);
+		} else {
+			$this->assertFalse(OC_DB::tableExists($table), 'Table ' . $table . ' exists.');
 		}
-
-		$this->assertTableNotExist('encryption_test');
-
-		// create test table
-		OC_DB::createDbFromStructure(__DIR__ . '/encryption_table.xml');
-		$this->assertTableExist('encryption_test');
-
-		OC_DB::executeAudited('INSERT INTO `*PREFIX*encryption_test` values(?, ?, ?, ?)',
-		array('user1', 'server-side', 1, 1));
-
-		// preform migration
-		$migration = new Migration('encryption_test');
-		$migration->dropTableEncryption();
-
-		// assert
-		$this->assertTableNotExist('encryption_test');
-
-		$rec = \OC_Preferences::getValue('user1', 'files_encryption', 'recovery_enabled');
-		$mig = \OC_Preferences::getValue('user1', 'files_encryption', 'migration_status');
-
-		$this->assertEquals(1, $rec);
-		$this->assertEquals(1, $mig);
 	}
 
-	public function testDuplicateDataMigration() {
-		// TODO travis
-		if (getenv('TRAVIS')) {
-			$this->markTestSkipped('Fails on travis');
+	protected function createDummyShareKeys($uid) {
+		$this->view->mkdir($uid . '/files_encryption/share-keys/folder1/folder2/folder3');
+		$this->view->mkdir($uid . '/files_encryption/share-keys/folder2/');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/folder2/folder3/file3.' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/folder2/folder3/file3.' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/folder2/folder3/file3.' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/folder2/file2.' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/folder2/file2.' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/folder2/file2.' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/file.1.' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/file.1.' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder1/file.1.' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder2/file.2.1.' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder2/file.2.1.' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.shareKey'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder2/file.2.1.' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.shareKey'  , 'data');
+		if ($this->public_share_key_id) {
+			$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder2/file.2.1.' . $this->public_share_key_id . '.shareKey'  , 'data');
 		}
-
-		// create test table
-		OC_DB::createDbFromStructure(__DIR__ . '/encryption_table.xml');
-
-		// in case of duplicate entries we want to preserve 0 on migration status and 1 on recovery
-		$data = array(
-			array('user1', 'server-side', 1, 1),
-			array('user1', 'server-side', 1, 0),
-			array('user1', 'server-side', 0, 1),
-			array('user1', 'server-side', 0, 0),
-		);
-		foreach ($data as $d) {
-			OC_DB::executeAudited(
-				'INSERT INTO `*PREFIX*encryption_test` values(?, ?, ?, ?)',
-				$d);
+		if ($this->recovery_key_id) {
+			$this->view->file_put_contents($uid . '/files_encryption/share-keys/folder2/file.2.1.' . $this->recovery_key_id . '.shareKey'  , 'data');
 		}
+	}
 
-		// preform migration
-		$migration = new Migration('encryption_test');
-		$migration->dropTableEncryption();
+	protected function createDummyFileKeys($uid) {
+		$this->view->mkdir($uid . '/files_encryption/keyfiles/folder1/folder2/folder3');
+		$this->view->mkdir($uid . '/files_encryption/keyfiles/folder2/');
+		$this->view->file_put_contents($uid . '/files_encryption/keyfiles/folder1/folder2/folder3/file3.key'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/keyfiles/folder1/folder2/file2.key'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/keyfiles/folder1/file.1.key'  , 'data');
+		$this->view->file_put_contents($uid . '/files_encryption/keyfiles/folder2/file.2.1.key'  , 'data');
+	}
 
-		// assert
-		$this->assertTableNotExist('encryption_test');
+	protected function createDummyFilesInTrash($uid) {
+		$this->view->mkdir($uid . '/files_trashbin/share-keys');
+		$this->view->mkdir($uid . '/files_trashbin/share-keys/folder1.d7437648723');
+		$this->view->file_put_contents($uid . '/files_trashbin/share-keys/file1.' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey.d5457864' , 'data');
+		$this->view->file_put_contents($uid . '/files_trashbin/share-keys/file1.' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey.d5457864' , 'data');
+		$this->view->file_put_contents($uid . '/files_trashbin/share-keys/folder1.d7437648723/file2.' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey' , 'data');
+
+		$this->view->mkdir($uid . '/files_trashbin/keyfiles');
+		$this->view->mkdir($uid . '/files_trashbin/keyfiles/folder1.d7437648723');
+		$this->view->file_put_contents($uid . '/files_trashbin/keyfiles/file1.key.d5457864' , 'data');
+		$this->view->file_put_contents($uid . '/files_trashbin/keyfiles/folder1.d7437648723/file2.key' , 'data');
+	}
+
+	protected function createDummySystemWideKeys() {
+		$this->view->mkdir('owncloud_private_key');
+		$this->view->file_put_contents('owncloud_private_key/systemwide_1.private.key', 'data');
+		$this->view->file_put_contents('owncloud_private_key/systemwide_2.private.key', 'data');
+	}
 
-		$rec = \OC_Preferences::getValue('user1', 'files_encryption', 'recovery_enabled');
-		$mig = \OC_Preferences::getValue('user1', 'files_encryption', 'migration_status');
+	public function testMigrateToNewFolderStructure() {
+
+		// go back to the state before migration
+		$this->view->rename('/files_encryption/public_keys', '/public-keys');
+		$this->view->rename('/public-keys/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.publicKey', '/public-keys/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.public.key');
+		$this->view->rename('/public-keys/' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.publicKey', '/public-keys/' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.public.key');
+		$this->view->rename('/public-keys/' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.publicKey', '/public-keys/' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.public.key');
+		$this->view->deleteAll(self::TEST_ENCRYPTION_MIGRATION_USER1 . '/files_encryption/keys');
+		$this->view->deleteAll(self::TEST_ENCRYPTION_MIGRATION_USER2 . '/files_encryption/keys');
+		$this->view->deleteAll(self::TEST_ENCRYPTION_MIGRATION_USER3 . '/files_encryption/keys');
+		$this->view->rename(self::TEST_ENCRYPTION_MIGRATION_USER1 . '/files_encryption/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.privateKey',
+				self::TEST_ENCRYPTION_MIGRATION_USER1 . '/files_encryption/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.private.key');
+		$this->view->rename(self::TEST_ENCRYPTION_MIGRATION_USER2 . '/files_encryption/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.privateKey',
+				self::TEST_ENCRYPTION_MIGRATION_USER2 . '/files_encryption/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.private.key');
+		$this->view->rename(self::TEST_ENCRYPTION_MIGRATION_USER3 . '/files_encryption/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.privateKey',
+				self::TEST_ENCRYPTION_MIGRATION_USER3 . '/files_encryption/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.private.key');
+
+		$this->createDummyShareKeys(self::TEST_ENCRYPTION_MIGRATION_USER1);
+		$this->createDummyShareKeys(self::TEST_ENCRYPTION_MIGRATION_USER2);
+		$this->createDummyShareKeys(self::TEST_ENCRYPTION_MIGRATION_USER3);
+
+		$this->createDummyFileKeys(self::TEST_ENCRYPTION_MIGRATION_USER1);
+		$this->createDummyFileKeys(self::TEST_ENCRYPTION_MIGRATION_USER2);
+		$this->createDummyFileKeys(self::TEST_ENCRYPTION_MIGRATION_USER3);
+
+		$this->createDummyFilesInTrash(self::TEST_ENCRYPTION_MIGRATION_USER2);
+
+		// no user for system wide mount points
+		$this->createDummyFileKeys('');
+		$this->createDummyShareKeys('');
+
+		$this->createDummySystemWideKeys();
+
+		$m = new \OCA\Files_Encryption\Migration();
+		$m->reorganizeFolderStructure();
+
+		// TODO Verify that all files at the right place
+		$this->assertTrue($this->view->file_exists('/files_encryption/public_keys/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.publicKey'));
+		$this->assertTrue($this->view->file_exists('/files_encryption/public_keys/' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.publicKey'));
+		$this->assertTrue($this->view->file_exists('/files_encryption/public_keys/' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.publicKey'));
+		$this->verifyNewKeyPath(self::TEST_ENCRYPTION_MIGRATION_USER1);
+		$this->verifyNewKeyPath(self::TEST_ENCRYPTION_MIGRATION_USER2);
+		$this->verifyNewKeyPath(self::TEST_ENCRYPTION_MIGRATION_USER3);
+		// system wide keys
+		$this->verifyNewKeyPath('');
+		// trash
+		$this->verifyFilesInTrash(self::TEST_ENCRYPTION_MIGRATION_USER2);
 
-		$this->assertEquals(1, $rec);
-		$this->assertEquals(0, $mig);
 	}
 
-	/**
-	 * @param string $table
-	 */
-	public function assertTableExist($table) {
-		$this->assertTrue(OC_DB::tableExists($table), 'Table ' . $table . ' does not exist');
+	protected function verifyFilesInTrash($uid) {
+		// share keys
+		$this->view->file_exists($uid . '/files_trashbin/keys/file1.d5457864/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey.d5457864' , 'data');
+		$this->view->file_exists($uid . '/files_trashbin/keys/file1.d5457864/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey.d5457864' , 'data');
+		$this->view->file_exists($uid . '/files_trashbin/keys/folder1.d7437648723/file2/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey' , 'data');
+
+		// file keys
+		$this->view->file_exists($uid . '/files_trashbin/keys/file1.d5457864/fileKey.d5457864' , 'data');
+		$this->view->file_exists($uid . '/files_trashbin/keyfiles/file1.d5457864/fileKey.d5457864' , 'data');
+		$this->view->file_exists($uid . '/files_trashbin/keyfiles/folder1.d7437648723/file2/fileKey' , 'data');
 	}
 
-	/**
-	 * @param string $table
-	 */
-	public function assertTableNotExist($table) {
-		$type=OC_Config::getValue( "dbtype", "sqlite" );
-		if( $type == 'sqlite' || $type == 'sqlite3' ) {
-			// sqlite removes the tables after closing the DB
-			$this->assertTrue(true);
-		} else {
-			$this->assertFalse(OC_DB::tableExists($table), 'Table ' . $table . ' exists.');
+	protected function verifyNewKeyPath($uid) {
+		// private key
+		if ($uid !== '') {
+			$this->assertTrue($this->view->file_exists($uid . '/files_encryption/' . $uid . '.privateKey'));
+		}
+		// file keys
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/folder2/folder3/file3/fileKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/folder2/file2/fileKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/file.1/fileKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder2/file.2.1/fileKey'));
+		// share keys
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/folder2/folder3/file3/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/folder2/folder3/file3/' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/folder2/folder3/file3/' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/folder2/file2/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/folder2/file2/' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/folder2/file2/' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/file.1/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/file.1/' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder1/file.1/' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder2/file.2.1/' . self::TEST_ENCRYPTION_MIGRATION_USER1 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder2/file.2.1/' . self::TEST_ENCRYPTION_MIGRATION_USER2 . '.shareKey'));
+		$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder2/file.2.1/' . self::TEST_ENCRYPTION_MIGRATION_USER3 . '.shareKey'));
+		if ($this->public_share_key_id) {
+			$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder2/file.2.1/' . $this->public_share_key_id . '.shareKey'));
+		}
+		if ($this->recovery_key_id) {
+			$this->assertTrue($this->view->file_exists($uid . '/files_encryption/keys/folder2/file.2.1/' . $this->recovery_key_id . '.shareKey'));
 		}
 	}
-
 }
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index a91222327f1..72a9a9a5551 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -44,20 +44,6 @@ class Test_Encryption_Proxy extends \OCA\Files_Encryption\Tests\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
-		\OC_Hook::clear('OC_Filesystem');
-		\OC_Hook::clear('OC_User');
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// clear and register hooks
-		\OC_FileProxy::clearProxies();
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// create test user
 		self::loginHelper(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1, true);
 	}
@@ -85,14 +71,6 @@ class Test_Encryption_Proxy extends \OCA\Files_Encryption\Tests\TestCase {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Proxy::TEST_ENCRYPTION_PROXY_USER1);
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
diff --git a/apps/files_encryption/tests/share.php b/apps/files_encryption/tests/share.php
index d7afc9e2da7..f827017569f 100755
--- a/apps/files_encryption/tests/share.php
+++ b/apps/files_encryption/tests/share.php
@@ -47,30 +47,15 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
 		// enable resharing
 		\OC::$server->getAppConfig()->setValue('core', 'shareapi_allow_resharing', 'yes');
 
-		// clear share hooks
-		\OC_Hook::clear('OCP\\Share');
-
 		// register share hooks
 		\OC::registerShareHooks();
 		\OCA\Files_Sharing\Helper::registerHooks();
 
-		// Sharing related hooks
-		\OCA\Encryption\Helper::registerShareHooks();
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
 		// clear and register hooks
-		\OC_FileProxy::clearProxies();
 		\OC_FileProxy::register(new OCA\Files\Share\Proxy());
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
 
 		// create users
 		self::loginHelper(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1, true);
@@ -127,14 +112,6 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3);
 		\OC_User::deleteUser(\Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER4);
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
@@ -915,8 +892,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->assertGreaterThan(0, $fileInfo['unencrypted_size']);
 
 		// break users public key
-		$this->view->rename('/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey',
-			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey_backup');
+		$this->view->rename(\OCA\Encryption\Keymanager::getPublicKeyPath() . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey',
+			\OCA\Encryption\Keymanager::getPublicKeyPath() . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey_backup');
 
 		// re-enable the file proxy
 		\OC_FileProxy::$enabled = $proxyStatus;
@@ -943,8 +920,8 @@ class Test_Encryption_Share extends \OCA\Files_Encryption\Tests\TestCase {
 
 		// break user1 public key
 		$this->view->rename(
-			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey_backup',
-			'/public-keys/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey');
+			\OCA\Encryption\Keymanager::getPublicKeyPath() . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey_backup',
+			\OCA\Encryption\Keymanager::getPublicKeyPath() . '/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER3 . '.publicKey');
 
 		// remove share file
 		$this->view->unlink('/' . \Test_Encryption_Share::TEST_ENCRYPTION_SHARE_USER1 . '/files_encryption/keys/'
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index b1404ca282a..f4824935ca0 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -42,17 +42,6 @@ class Test_Encryption_Stream extends \OCA\Files_Encryption\Tests\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// clear and register hooks
-		\OC_FileProxy::clearProxies();
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// create test user
 		self::loginHelper(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1, true);
 	}
@@ -94,14 +83,6 @@ class Test_Encryption_Stream extends \OCA\Files_Encryption\Tests\TestCase {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Stream::TEST_ENCRYPTION_STREAM_USER1);
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
diff --git a/apps/files_encryption/tests/testcase.php b/apps/files_encryption/tests/testcase.php
index 3106aeda8ea..743a876ab45 100644
--- a/apps/files_encryption/tests/testcase.php
+++ b/apps/files_encryption/tests/testcase.php
@@ -14,6 +14,7 @@ use OCA\Encryption;
  * Class Test_Encryption_TestCase
  */
 abstract class TestCase extends \Test\TestCase {
+
 	/**
 	 * @param string $user
 	 * @param bool $create
@@ -50,4 +51,34 @@ abstract class TestCase extends \Test\TestCase {
 		\OC_User::setUserId(false);
 		\OC\Files\Filesystem::tearDown();
 	}
+
+	public static function setUpBeforeClass() {
+		parent::setUpBeforeClass();
+
+		// reset backend
+		\OC_User::clearBackends();
+		\OC_User::useBackend('database');
+
+		\OCA\Encryption\Helper::registerFilesystemHooks();
+		\OCA\Encryption\Helper::registerUserHooks();
+		\OCA\Encryption\Helper::registerShareHooks();
+
+		\OC::registerShareHooks();
+		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
+
+		// clear and register hooks
+		\OC_FileProxy::clearProxies();
+		\OC_FileProxy::register(new \OCA\Encryption\Proxy());
+	}
+
+	public static function tearDownAfterClass() {
+		\OC_Hook::clear();
+		\OC_FileProxy::clearProxies();
+
+		// Delete keys in /data/
+		$view = new \OC\Files\View('/');
+		$view->deleteAll('files_encryption');
+
+		parent::tearDownAfterClass();
+	}
 }
diff --git a/apps/files_encryption/tests/trashbin.php b/apps/files_encryption/tests/trashbin.php
index 229fd084807..de5b8bd6edb 100755
--- a/apps/files_encryption/tests/trashbin.php
+++ b/apps/files_encryption/tests/trashbin.php
@@ -45,23 +45,9 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
-		\OC_Hook::clear('OC_Filesystem');
-		\OC_Hook::clear('OC_User');
-
 		// trashbin hooks
 		\OCA\Files_Trashbin\Trashbin::registerHooks();
 
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// clear and register hooks
-		\OC_FileProxy::clearProxies();
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// create test user
 		self::loginHelper(self::TEST_ENCRYPTION_TRASHBIN_USER1, true);
 	}
@@ -107,14 +93,6 @@ class Test_Encryption_Trashbin extends \OCA\Files_Encryption\Tests\TestCase {
 		// cleanup test user
 		\OC_User::deleteUser(self::TEST_ENCRYPTION_TRASHBIN_USER1);
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
diff --git a/apps/files_encryption/tests/util.php b/apps/files_encryption/tests/util.php
index 96e8fcd81fe..8d9aba423cd 100755
--- a/apps/files_encryption/tests/util.php
+++ b/apps/files_encryption/tests/util.php
@@ -43,12 +43,6 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
-		self::setupHooks();
-
 		// create test user
 		self::loginHelper(self::TEST_ENCRYPTION_UTIL_USER1, true);
 		self::loginHelper(self::TEST_ENCRYPTION_UTIL_USER2, true);
@@ -85,7 +79,7 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		$this->genPublicKey = $keypair['publicKey'];
 		$this->genPrivateKey = $keypair['privateKey'];
 
-		$this->publicKeyDir = '/' . 'public-keys';
+		$this->publicKeyDir = \OCA\Encryption\Keymanager::getPublicKeyPath();
 		$this->encryptionDir = '/' . $this->userId . '/' . 'files_encryption';
 		$this->keysPath = $this->encryptionDir . '/' . 'keys';
 		$this->publicKeyPath =
@@ -126,26 +120,9 @@ class Test_Encryption_Util extends \OCA\Files_Encryption\Tests\TestCase {
 		\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP1);
 		\OC_Group::deleteGroup(self::TEST_ENCRYPTION_UTIL_GROUP2);
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
-	public static function setupHooks() {
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// clear and register hooks
-		\OC_FileProxy::clearProxies();
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-	}
-
 	/**
 	 * @medium
 	 * test that paths set during User construction are correct
diff --git a/apps/files_encryption/tests/webdav.php b/apps/files_encryption/tests/webdav.php
index d0caf08b2df..a04a7621291 100755
--- a/apps/files_encryption/tests/webdav.php
+++ b/apps/files_encryption/tests/webdav.php
@@ -45,20 +45,6 @@ class Test_Encryption_Webdav extends \OCA\Files_Encryption\Tests\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// reset backend
-		\OC_User::clearBackends();
-		\OC_User::useBackend('database');
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerFilesystemHooks();
-
-		// Filesystem related hooks
-		\OCA\Encryption\Helper::registerUserHooks();
-
-		// clear and register hooks
-		\OC_FileProxy::clearProxies();
-		\OC_FileProxy::register(new OCA\Encryption\Proxy());
-
 		// create test user
 		self::loginHelper(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1, true);
 
@@ -106,14 +92,6 @@ class Test_Encryption_Webdav extends \OCA\Files_Encryption\Tests\TestCase {
 		// cleanup test user
 		\OC_User::deleteUser(\Test_Encryption_Webdav::TEST_ENCRYPTION_WEBDAV_USER1);
 
-		\OC_Hook::clear();
-		\OC_FileProxy::clearProxies();
-
-		// Delete keys in /data/
-		$view = new \OC\Files\View('/');
-		$view->rmdir('public-keys');
-		$view->rmdir('owncloud_private_key');
-
 		parent::tearDownAfterClass();
 	}
 
-- 
GitLab


From 2e78217f17fb0c387baeda737b4206130dc00130 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 28 Nov 2014 17:53:21 +0100
Subject: [PATCH 602/616] delete old keys if file was moved to a different
 mount point

---
 apps/files_encryption/hooks/hooks.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index e9d0235d167..53fec11009d 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -432,15 +432,18 @@ class Hooks {
 		$mp1 = $view->getMountPoint('/' . $user . '/files/' . $params['oldpath']);
 		$mp2 = $view->getMountPoint('/' . $user . '/files/' . $params['newpath']);
 
-		if ($mp1 === $mp2) {
-
-			$oldKeysPath = Keymanager::getKeyPath($view, $util, $params['oldpath']);
+		$oldKeysPath = Keymanager::getKeyPath($view, $util, $params['oldpath']);
 
+		if ($mp1 === $mp2) {
 			self::$renamedFiles[$params['oldpath']] = array(
 				'operation' => $operation,
 				'oldKeysPath' => $oldKeysPath,
 				);
-
+		} else {
+			self::$renamedFiles[$params['oldpath']] = array(
+				'operation' => 'cleanup',
+				'oldKeysPath' => $oldKeysPath,
+				);
 		}
 	}
 
@@ -464,6 +467,9 @@ class Hooks {
 			$operation = self::$renamedFiles[$params['oldpath']]['operation'];
 			$oldKeysPath = self::$renamedFiles[$params['oldpath']]['oldKeysPath'];
 			unset(self::$renamedFiles[$params['oldpath']]);
+			if ($operation === 'cleanup') {
+				return $view->unlink($oldKeysPath);
+			}
 		} else {
 			\OCP\Util::writeLog('Encryption library', "can't get path and owner from the file before it was renamed", \OCP\Util::DEBUG);
 			return false;
-- 
GitLab


From 6d04ca18d9de001197d49d09407a92276cb35b09 Mon Sep 17 00:00:00 2001
From: Simon Whittaker <simon@swbh.net>
Date: Tue, 2 Dec 2014 15:06:40 +0000
Subject: [PATCH 603/616] adding @ sign between email address and domain name
 to make the syntax clearer

---
 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 d29ea4c7f7f..15ec9535f6a 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -426,7 +426,7 @@ if ($_['suggestedOverwriteWebroot']) {
 		<p>
 			<label for="mail_from_address"><?php p($l->t( 'From address' )); ?></label>
 			<input type="text" name='mail_from_address' id="mail_from_address" placeholder="<?php p($l->t('mail'))?>"
-				   value='<?php p($_['mail_from_address']) ?>' />
+				   value='<?php p($_['mail_from_address']) ?>' />@
 			<input type="text" name='mail_domain' id="mail_domain" placeholder="example.com"
 				   value='<?php p($_['mail_domain']) ?>' />
 		</p>
-- 
GitLab


From 9ca9acf3f89a08b160d443b0e68e1d72c621e116 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 2 Dec 2014 16:08:06 +0100
Subject: [PATCH 604/616] small fixes

---
 apps/files_encryption/hooks/hooks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 53fec11009d..d40e6b3d124 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -485,7 +485,7 @@ class Hooks {
 
 		// create  key folders if it doesn't exists
 		if (!$view->file_exists(dirname($newKeysPath))) {
-				$view->mkdir(dirname($newKeysPath));
+			$view->mkdir(dirname($newKeysPath));
 		}
 
 		$view->$operation($oldKeysPath, $newKeysPath);
@@ -566,7 +566,7 @@ class Hooks {
 			return true;
 		}
 
-		$util = new Util(new \OC\Files\View('/'), \OCP\USER::getUser());
+		$util = new Util($view, \OCP\USER::getUser());
 
 		$keysPath = Keymanager::getKeyPath($view, $util, $path);
 
-- 
GitLab


From 5b3dbb4ef8bc3dc8e74d14b3970f38678f3f0ace Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Tue, 2 Dec 2014 16:10:07 +0100
Subject: [PATCH 605/616] add missing public interface for iOS client app id

---
 lib/public/defaults.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/public/defaults.php b/lib/public/defaults.php
index 662071a29a9..315cf547385 100644
--- a/lib/public/defaults.php
+++ b/lib/public/defaults.php
@@ -144,4 +144,12 @@ class Defaults {
 	public function getLongFooter() {
 		return $this->defaults->getLongFooter();
 	}
+
+	/**
+	 * Returns the AppId for the App Store for the iOS Client
+	 * @return string AppId
+	 */
+	public function getiTunesAppId() {
+		return $this->defaults->getiTunesAppId();
+	}
 }
-- 
GitLab


From 1bbb18fe87aaea991b73b00dbe7d7fd2a2ec82a5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 2 Dec 2014 16:39:03 +0100
Subject: [PATCH 606/616] also clear statcache in mapped local

---
 lib/private/files/storage/mappedlocal.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/private/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
index fe6fff4ebdb..8f813f973b9 100644
--- a/lib/private/files/storage/mappedlocal.php
+++ b/lib/private/files/storage/mappedlocal.php
@@ -153,6 +153,7 @@ class MappedLocal extends \OC\Files\Storage\Common {
 	}
 
 	public function filemtime($path) {
+		clearstatcache($this->getSourcePath($path));
 		return filemtime($this->getSourcePath($path));
 	}
 
-- 
GitLab


From 694003d1478468128e53c0e682c4d808210aab1f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Dec 2014 17:21:19 +0100
Subject: [PATCH 607/616] Autoload lib files of versions app

---
 apps/files_versions/appinfo/app.php                   | 5 -----
 apps/files_versions/lib/{versions.php => storage.php} | 0
 apps/files_versions/tests/versions.php                | 1 -
 3 files changed, 6 deletions(-)
 rename apps/files_versions/lib/{versions.php => storage.php} (100%)

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 78de1528f32..ae29bceb37c 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -1,10 +1,5 @@
 <?php
 
-//require_once 'files_versions/versions.php';
-OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'files_versions/lib/versions.php';
-OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'files_versions/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Versions\Capabilities'] = 'files_versions/lib/capabilities.php';
-
 OCP\Util::addTranslations('files_versions');
 OCP\Util::addscript('files_versions', 'versions');
 OCP\Util::addStyle('files_versions', 'versions');
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/storage.php
similarity index 100%
rename from apps/files_versions/lib/versions.php
rename to apps/files_versions/lib/storage.php
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/versions.php
index 6205a6881f0..cf0ffb320e2 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/versions.php
@@ -21,7 +21,6 @@
  */
 
 require_once __DIR__ . '/../appinfo/app.php';
-require_once __DIR__ . '/../lib/versions.php';
 
 /**
  * Class Test_Files_versions
-- 
GitLab


From 1bd018a70ceb968f43c3d91e7ccde4386b550185 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Dec 2014 17:26:42 +0100
Subject: [PATCH 608/616] Autoload exception from files_trashbin

---
 apps/files_trashbin/appinfo/app.php                             | 2 --
 .../{exceptions.php => exceptions/copyrecursiveexception.php}   | 0
 2 files changed, 2 deletions(-)
 rename apps/files_trashbin/lib/{exceptions.php => exceptions/copyrecursiveexception.php} (100%)

diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 7df52da6314..0e2cbaa529f 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -3,8 +3,6 @@ $l = \OC::$server->getL10N('files_trashbin');
 
 OCP\Util::addTranslations('files_trashbin');
 
-OC::$CLASSPATH['OCA\Files_Trashbin\Exceptions\CopyRecursiveException'] = 'files_trashbin/lib/exceptions.php';
-
 // register hooks
 \OCA\Files_Trashbin\Trashbin::registerHooks();
 
diff --git a/apps/files_trashbin/lib/exceptions.php b/apps/files_trashbin/lib/exceptions/copyrecursiveexception.php
similarity index 100%
rename from apps/files_trashbin/lib/exceptions.php
rename to apps/files_trashbin/lib/exceptions/copyrecursiveexception.php
-- 
GitLab


From c4e0c025267a2d65fd134dc256d50a764e5c9267 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Tue, 2 Dec 2014 17:52:31 +0100
Subject: [PATCH 609/616] Add route for download of versions

Otherwise on master it was not possible anymore to download older versions.

Fixes itself.
---
 apps/files_versions/appinfo/routes.php | 2 ++
 apps/files_versions/download.php       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/files_versions/appinfo/routes.php b/apps/files_versions/appinfo/routes.php
index 057834213e4..83c7746d1e7 100644
--- a/apps/files_versions/appinfo/routes.php
+++ b/apps/files_versions/appinfo/routes.php
@@ -11,6 +11,8 @@ function() {
 	require_once __DIR__ . '/../ajax/preview.php';
 });
 
+$this->create('files_versions_download', 'download.php')
+	->actionInclude('files_versions/download.php');
 $this->create('files_versions_ajax_getVersions', 'ajax/getVersions.php')
 	->actionInclude('files_versions/ajax/getVersions.php');
 $this->create('files_versions_ajax_rollbackVersion', 'ajax/rollbackVersion.php')
diff --git a/apps/files_versions/download.php b/apps/files_versions/download.php
index 2fe56d2e638..e5139450f5e 100644
--- a/apps/files_versions/download.php
+++ b/apps/files_versions/download.php
@@ -22,7 +22,7 @@
 */
 
 OCP\JSON::checkAppEnabled('files_versions');
-//OCP\JSON::callCheck();
+OCP\JSON::checkLoggedIn();
 
 $file = $_GET['file'];
 $revision=(int)$_GET['revision'];
-- 
GitLab


From af50df89120343e09f2ed54b2a516dbbae79eb47 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <owncloud-bot@tmit.eu>
Date: Wed, 3 Dec 2014 01:54:32 -0500
Subject: [PATCH 610/616] [tx-robot] updated from transifex

---
 apps/files/l10n/fr.js    |  2 +-
 apps/files/l10n/fr.json  |  2 +-
 settings/l10n/cs_CZ.js   |  2 +
 settings/l10n/cs_CZ.json |  2 +
 settings/l10n/da.js      |  2 +
 settings/l10n/da.json    |  2 +
 settings/l10n/de.js      |  2 +
 settings/l10n/de.json    |  2 +
 settings/l10n/de_DE.js   |  2 +
 settings/l10n/de_DE.json |  2 +
 settings/l10n/en_GB.js   |  2 +
 settings/l10n/en_GB.json |  2 +
 settings/l10n/es.js      |  1 +
 settings/l10n/es.json    |  1 +
 settings/l10n/fi_FI.js   |  1 +
 settings/l10n/fi_FI.json |  1 +
 settings/l10n/it.js      |  1 +
 settings/l10n/it.json    |  1 +
 settings/l10n/nl.js      |  2 +
 settings/l10n/nl.json    |  2 +
 settings/l10n/pt_BR.js   |  2 +
 settings/l10n/pt_BR.json |  2 +
 settings/l10n/pt_PT.js   | 89 +++++++++++++++++++++-------------------
 settings/l10n/pt_PT.json | 89 +++++++++++++++++++++-------------------
 24 files changed, 128 insertions(+), 88 deletions(-)

diff --git a/apps/files/l10n/fr.js b/apps/files/l10n/fr.js
index 719d3355bca..a5a4f25bf1d 100644
--- a/apps/files/l10n/fr.js
+++ b/apps/files/l10n/fr.js
@@ -70,7 +70,7 @@ OC.L10N.register(
     "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
     "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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
     "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 pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Le chiffrement a été désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos paramètres personnels pour déchiffrer vos fichiers.",
     "{dirs} and {files}" : "{dirs} et {files}",
     "%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é",
diff --git a/apps/files/l10n/fr.json b/apps/files/l10n/fr.json
index 8501a8551b7..26707810a75 100644
--- a/apps/files/l10n/fr.json
+++ b/apps/files/l10n/fr.json
@@ -68,7 +68,7 @@
     "Your storage is almost full ({usedSpacePercent}%)" : "Votre espace de stockage est presque plein ({usedSpacePercent}%)",
     "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 clés ne sont pas initialisées, veuillez vous déconnecter et ensuite vous reconnecter.",
     "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 pour l'application de chiffrement est invalide ! Veuillez mettre à jour le mot de passe de votre clef privée dans vos paramètres personnels pour récupérer l'accès à vos fichiers chiffrés.",
-    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Le chiffrement était désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos Paramètres personnels pour déchiffrer vos fichiers.",
+    "Encryption was disabled but your files are still encrypted. Please go to your personal settings to decrypt your files." : "Le chiffrement a été désactivé mais vos fichiers sont toujours chiffrés. Veuillez vous rendre sur vos paramètres personnels pour déchiffrer vos fichiers.",
     "{dirs} and {files}" : "{dirs} et {files}",
     "%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é",
diff --git a/settings/l10n/cs_CZ.js b/settings/l10n/cs_CZ.js
index d4871378c04..67e97e62e55 100644
--- a/settings/l10n/cs_CZ.js
+++ b/settings/l10n/cs_CZ.js
@@ -103,6 +103,8 @@ OC.L10N.register(
     "Security Warning" : "Bezpečnostní upozornění",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Přistupujete na %s protokolem HTTP. Důrazně doporučujeme nakonfigurovat server pro použití HTTPS.",
     "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." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
+    "Read-Only config enabled" : "Konfigurační soubor pouze pro čtení",
+    "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." : "Konfigurační soubor je pouze pro čtení. Toto omezuje možnost nastavení přes webové rozhraní. Dále musí být pro každou změnu povolen zápis do souboru ručně.",
     "Setup Warning" : "Upozornění nastavení",
     "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 572dd26dfe3..84960c3fc7c 100644
--- a/settings/l10n/cs_CZ.json
+++ b/settings/l10n/cs_CZ.json
@@ -101,6 +101,8 @@
     "Security Warning" : "Bezpečnostní upozornění",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Přistupujete na %s protokolem HTTP. Důrazně doporučujeme nakonfigurovat server pro použití HTTPS.",
     "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." : "Váš datový adresář i vaše soubory jsou pravděpodobně přístupné z internetu. Soubor .htaccess nefunguje. Důrazně doporučujeme nakonfigurovat webový server tak, aby datový adresář nebyl nadále přístupný, nebo přesunout datový adresář mimo prostor zpřístupňovaný webovým serverem.",
+    "Read-Only config enabled" : "Konfigurační soubor pouze pro čtení",
+    "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." : "Konfigurační soubor je pouze pro čtení. Toto omezuje možnost nastavení přes webové rozhraní. Dále musí být pro každou změnu povolen zápis do souboru ručně.",
     "Setup Warning" : "Upozornění nastavení",
     "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 67022dd176e..4866e824a47 100644
--- a/settings/l10n/da.js
+++ b/settings/l10n/da.js
@@ -103,6 +103,8 @@ OC.L10N.register(
     "Security Warning" : "Sikkerhedsadvarsel",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS.",
     "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." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
+    "Read-Only config enabled" : "Skrivebeskyttet konfig. slået til",
+    "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.",
     "Setup Warning" : "Opsætnings Advarsel",
     "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 48ee293e1ec..6ad39cf6a2f 100644
--- a/settings/l10n/da.json
+++ b/settings/l10n/da.json
@@ -101,6 +101,8 @@
     "Security Warning" : "Sikkerhedsadvarsel",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du tilgår %s via HTTP. Vi anbefaler at du konfigurerer din server til i stedet at kræve HTTPS.",
     "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." : "Din data mappe og dine filer er muligvis tilgængelige fra internettet. .htaccess filen virker ikke. Vi anbefaler på det kraftigste at du konfigurerer din webserver så data mappen ikke længere er tilgængelig, eller at du flytter data mappen uden for webserverens dokument rod.  ",
+    "Read-Only config enabled" : "Skrivebeskyttet konfig. slået til",
+    "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.",
     "Setup Warning" : "Opsætnings Advarsel",
     "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 e11aa7c23d7..759c9e6bbb2 100644
--- a/settings/l10n/de.js
+++ b/settings/l10n/de.js
@@ -103,6 +103,8 @@ OC.L10N.register(
     "Security Warning" : "Sicherheitswarnung",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
     "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." : "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
+    "Read-Only config enabled" : "Schreibgeschützte Konfiguration aktiviert",
+    "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 schützt die Änderung einiger Konfigurationen über die Web-Schnittstelle. Weiterhin muss für die Datei der Schreibzugriff bei jedem Update händisch aktiviert werden.",
     "Setup Warning" : "Einrichtungswarnung",
     "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 z.B. OPcache oder eAccelerator verursacht.",
diff --git a/settings/l10n/de.json b/settings/l10n/de.json
index 74c3f7cf970..10474ed6463 100644
--- a/settings/l10n/de.json
+++ b/settings/l10n/de.json
@@ -101,6 +101,8 @@
     "Security Warning" : "Sicherheitswarnung",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Du greifst auf %s via HTTP zu. Wir empfehlen Dir dringend, Deinen Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
     "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." : "Dein Datenverzeichnis und deine Dateien sind möglicherweise aus dem Internet erreichbar. Die .htaccess-Datei funktioniert nicht. Wir raten dir dringend, dass du deinen Webserver dahingehend konfigurierst, dass dein Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder du verschiebst das Datenverzeichnis ausserhalb des Wurzelverzeichnisses des Webservers.",
+    "Read-Only config enabled" : "Schreibgeschützte Konfiguration aktiviert",
+    "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 schützt die Änderung einiger Konfigurationen über die Web-Schnittstelle. Weiterhin muss für die Datei der Schreibzugriff bei jedem Update händisch aktiviert werden.",
     "Setup Warning" : "Einrichtungswarnung",
     "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 z.B. OPcache oder eAccelerator verursacht.",
diff --git a/settings/l10n/de_DE.js b/settings/l10n/de_DE.js
index a802c80f719..8edd91d4c5e 100644
--- a/settings/l10n/de_DE.js
+++ b/settings/l10n/de_DE.js
@@ -103,6 +103,8 @@ OC.L10N.register(
     "Security Warning" : "Sicherheitshinweis",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
     "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öglicherweise 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 außerhalb des Wurzelverzeichnisses des Webservers.",
+    "Read-Only config enabled" : "Schreibgeschützte Konfiguration aktiviert",
+    "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 schützt die Änderung einiger Konfigurationen über die Web-Schnittstelle. Weiterhin muss für die Datei der Schreibzugriff bei jedem Update händisch aktiviert werden.",
     "Setup Warning" : "Einrichtungswarnung",
     "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 z.B. OPcache oder eAccelerator verursacht.",
diff --git a/settings/l10n/de_DE.json b/settings/l10n/de_DE.json
index 0f1e8d07932..0259fc2394e 100644
--- a/settings/l10n/de_DE.json
+++ b/settings/l10n/de_DE.json
@@ -101,6 +101,8 @@
     "Security Warning" : "Sicherheitshinweis",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sie greifen auf %s via HTTP zu. Wir empfehlen Ihnen dringend, Ihren Server so konfigurieren, dass stattdessen HTTPS verlangt wird.",
     "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öglicherweise 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 außerhalb des Wurzelverzeichnisses des Webservers.",
+    "Read-Only config enabled" : "Schreibgeschützte Konfiguration aktiviert",
+    "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 schützt die Änderung einiger Konfigurationen über die Web-Schnittstelle. Weiterhin muss für die Datei der Schreibzugriff bei jedem Update händisch aktiviert werden.",
     "Setup Warning" : "Einrichtungswarnung",
     "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 z.B. OPcache oder eAccelerator verursacht.",
diff --git a/settings/l10n/en_GB.js b/settings/l10n/en_GB.js
index f33ccbcfdce..f92c4e951a7 100644
--- a/settings/l10n/en_GB.js
+++ b/settings/l10n/en_GB.js
@@ -103,6 +103,8 @@ OC.L10N.register(
     "Security Warning" : "Security Warning",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.",
     "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." : "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.",
+    "Read-Only config enabled" : "Read-Only config enabled",
+    "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.",
     "Setup Warning" : "Setup Warning",
     "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 5ad52ed5b56..844c145e694 100644
--- a/settings/l10n/en_GB.json
+++ b/settings/l10n/en_GB.json
@@ -101,6 +101,8 @@
     "Security Warning" : "Security Warning",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.",
     "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." : "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.",
+    "Read-Only config enabled" : "Read-Only config enabled",
+    "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.",
     "Setup Warning" : "Setup Warning",
     "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 d49f8116bb7..ba12cb68f6e 100644
--- a/settings/l10n/es.js
+++ b/settings/l10n/es.js
@@ -103,6 +103,7 @@ OC.L10N.register(
     "Security Warning" : "Advertencia de seguridad",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
     "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." : "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
+    "Read-Only config enabled" : "Configuración de solo lectura activada",
     "Setup Warning" : "Advertencia de configuració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 del principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/es.json b/settings/l10n/es.json
index 256e9fa7beb..397bb9c4e12 100644
--- a/settings/l10n/es.json
+++ b/settings/l10n/es.json
@@ -101,6 +101,7 @@
     "Security Warning" : "Advertencia de seguridad",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está ingresando a %s vía HTTP. Le recomendamos encarecidamente que configure su servidor para que requiera HTTPS.",
     "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." : "Su directorio de datos y archivos es probablemente accesible desde Internet pues el archivo .htaccess no está funcionando. Le sugerimos encarecidamente que configure su servidor web de modo que el directorio de datos no sea accesible o que mueva dicho directorio fuera de la raíz de documentos del servidor web.",
+    "Read-Only config enabled" : "Configuración de solo lectura activada",
     "Setup Warning" : "Advertencia de configuració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 del principales no estén accesibles.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Probablemente esto sea causado por un cache o acelerador, como por ejemplo Zend OPcache o eAccelerator.",
diff --git a/settings/l10n/fi_FI.js b/settings/l10n/fi_FI.js
index 3965f7e9159..b5c1625f044 100644
--- a/settings/l10n/fi_FI.js
+++ b/settings/l10n/fi_FI.js
@@ -102,6 +102,7 @@ OC.L10N.register(
     "Security Warning" : "Turvallisuusvaroitus",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Käytät %sia HTTP-yhteydellä. Suosittelemme määrittämään palvelimen vaatimaan salattua HTTPS-yhteyttä.",
     "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." : "Datahakemistosi ja kaikki tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi tällä hetkellä. Määritä verkkopalvelimen asetukset siten, ettei datahakemistosi ole suoraan käytettävissä tai siirrä kyseinen hakemisto pois verkkopalvelimen dokumenttijuuresta.",
+    "Read-Only config enabled" : "Vain luku -määritykset otettu käyttöön",
     "Setup Warning" : "Asetusvaroitus",
     "Database Performance Info" : "Tietokannan suorituskyvyn tiedot",
     "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
diff --git a/settings/l10n/fi_FI.json b/settings/l10n/fi_FI.json
index 4fc99b5fdf3..aa90db529bc 100644
--- a/settings/l10n/fi_FI.json
+++ b/settings/l10n/fi_FI.json
@@ -100,6 +100,7 @@
     "Security Warning" : "Turvallisuusvaroitus",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Käytät %sia HTTP-yhteydellä. Suosittelemme määrittämään palvelimen vaatimaan salattua HTTPS-yhteyttä.",
     "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." : "Datahakemistosi ja kaikki tiedostosi ovat luultavasti käytettävissä suoraan internetistä. .htaccess-tiedosto ei toimi tällä hetkellä. Määritä verkkopalvelimen asetukset siten, ettei datahakemistosi ole suoraan käytettävissä tai siirrä kyseinen hakemisto pois verkkopalvelimen dokumenttijuuresta.",
+    "Read-Only config enabled" : "Vain luku -määritykset otettu käyttöön",
     "Setup Warning" : "Asetusvaroitus",
     "Database Performance Info" : "Tietokannan suorituskyvyn tiedot",
     "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLitea käytetään tietokantana. Laajoja asennuksia varten tämä asetus kannattaa muuttaa. Käytä komentorivityökalua 'occ db:convert-type' siirtyäksesi toiseen tietokantaan.",
diff --git a/settings/l10n/it.js b/settings/l10n/it.js
index 2748c43298d..8ea5c83aa9d 100644
--- a/settings/l10n/it.js
+++ b/settings/l10n/it.js
@@ -103,6 +103,7 @@ OC.L10N.register(
     "Security Warning" : "Avviso di sicurezza",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sei connesso a %s tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere l'utilizzo del protocollo HTTPS al posto di HTTP.",
     "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." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web.",
+    "Read-Only config enabled" : "Config di sola lettura abilitata",
     "Setup Warning" : "Avviso di configurazione",
     "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 f8e94b7288e..de574332eb3 100644
--- a/settings/l10n/it.json
+++ b/settings/l10n/it.json
@@ -101,6 +101,7 @@
     "Security Warning" : "Avviso di sicurezza",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Sei connesso a %s tramite HTTP. Ti suggeriamo vivamente di configurare il tuo server per richiedere l'utilizzo del protocollo HTTPS al posto di HTTP.",
     "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." : "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile o spostare la cartella fuori dalla radice del server web.",
+    "Read-Only config enabled" : "Config di sola lettura abilitata",
     "Setup Warning" : "Avviso di configurazione",
     "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/nl.js b/settings/l10n/nl.js
index 8e38125bb43..276f5f676f9 100644
--- a/settings/l10n/nl.js
+++ b/settings/l10n/nl.js
@@ -103,6 +103,8 @@ OC.L10N.register(
     "Security Warning" : "Beveiligingswaarschuwing",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "U bent met %s verbonden over HTTP. We adviseren met klem uw server zo te configureren dat alleen HTTPS kan worden gebruikt.",
     "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." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
+    "Read-Only config enabled" : "Alleen-lezen config geactiveerd",
+    "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.",
     "Setup Warning" : "Instellingswaarschuwing",
     "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 8d5ef3d25e3..f29679c3d9d 100644
--- a/settings/l10n/nl.json
+++ b/settings/l10n/nl.json
@@ -101,6 +101,8 @@
     "Security Warning" : "Beveiligingswaarschuwing",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "U bent met %s verbonden over HTTP. We adviseren met klem uw server zo te configureren dat alleen HTTPS kan worden gebruikt.",
     "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." : "Uw data folder en uw bestanden zijn waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess-bestand werkt niet.  We raden ten zeerste aan aan om uw webserver zodanig te configureren, dat de datamap niet bereikbaar is vanaf het internet of om uw datamap te verplaatsen naar een locatie buiten de document root van de webserver.",
+    "Read-Only config enabled" : "Alleen-lezen config geactiveerd",
+    "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.",
     "Setup Warning" : "Instellingswaarschuwing",
     "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 1d280fa1439..1d53791fdf2 100644
--- a/settings/l10n/pt_BR.js
+++ b/settings/l10n/pt_BR.js
@@ -103,6 +103,8 @@ OC.L10N.register(
     "Security Warning" : "Aviso de Segurança",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Você está acessando %s via HTTP. Sugerimos você configurar o servidor para exigir o uso de HTTPS em seu lugar.",
     "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." : "Seu diretório de dados e seus arquivos são, provavelmente, acessíveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessível ou mova o diretório de dados para fora do raiz do servidor.",
+    "Read-Only config enabled" : "Somente-Leitura configuração ativada",
+    "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.",
     "Setup Warning" : "Aviso de Configuraçã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 3746bb162dc..48c9c807440 100644
--- a/settings/l10n/pt_BR.json
+++ b/settings/l10n/pt_BR.json
@@ -101,6 +101,8 @@
     "Security Warning" : "Aviso de Segurança",
     "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Você está acessando %s via HTTP. Sugerimos você configurar o servidor para exigir o uso de HTTPS em seu lugar.",
     "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." : "Seu diretório de dados e seus arquivos são, provavelmente, acessíveis a partir da internet. O arquivo htaccess. não está funcionando. Nós sugerimos fortemente que você configure o seu servidor web de uma forma que o diretório de dados não esteja mais acessível ou mova o diretório de dados para fora do raiz do servidor.",
+    "Read-Only config enabled" : "Somente-Leitura configuração ativada",
+    "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.",
     "Setup Warning" : "Aviso de Configuraçã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 cf82312e466..da133e0eacb 100644
--- a/settings/l10n/pt_PT.js
+++ b/settings/l10n/pt_PT.js
@@ -15,79 +15,79 @@ OC.L10N.register(
     "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
     "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't decrypt your files, check your password and try again" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua palavra-passe e tente novamente",
-    "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Encryption keys deleted permanently" : "As chaves de encriptação foram eliminadas para sempre",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível apagar as suas chaves de encriptação. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't remove app." : "Não foi possível remover a aplicação.",
     "Email saved" : "E-mail guardado",
     "Invalid email" : "e-mail inválido",
     "Unable to delete group" : "Não é possível apagar o grupo",
     "Unable to delete user" : "Não é possível apagar o utilizador",
-    "Backups restored successfully" : "Cópias de segurança foram restauradas com sucesso",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Backups restored successfully" : "Cópias de segurança restauradas com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possivel restaurar as suas chaves de encriptacao. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido Inválido",
     "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles próprios do grupo 'admin'.",
-    "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
-    "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
-    "Couldn't update app." : "Não foi possível actualizar a aplicação.",
+    "Unable to add user to group %s" : "Não é possível adicionar o utilizador ao grupo %s",
+    "Unable to remove user from group %s" : "Não é possível remover o utilizador do grupo %s",
+    "Couldn't update app." : "Não foi possível atualizar a app.",
     "Wrong password" : "Palavra-passe errada",
-    "No user supplied" : "Nenhum utilizador especificado.",
+    "No user supplied" : "Nenhum utilizador especificado",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário seráo perdidos todos os dados",
     "Wrong admin recovery password. Please check the password and try again." : "Palavra-passe de recuperação de administrador errada. Por favor, verifique a palavra-passe e tente novamente.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de codificação foi atualizada com sucesso.",
     "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
-    "Not enabled" : "Desactivado",
+    "Not enabled" : "Desativada",
     "Recommended" : "Recomendado",
     "Saved" : "Guardado",
     "test email settings" : "testar as definições de e-mail",
-    "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail as configurações parecem estar correctas",
-    "A problem occurred while sending the email. Please revise your settings." : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
-    "Email sent" : "E-mail enviado",
+    "If you received this email, the settings seem to be correct." : "Se recebeu este e-mail, as configurações parecem estar corretas",
+    "A problem occurred while sending the email. Please revise your settings." : "Ocorreu um problema durante o envio do e-mail. Por favor, verifique as suas configurações..",
+    "Email sent" : "Mensagem enviada",
     "You need to set your user email before being able to send test emails." : "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável ",
-    "Sending..." : "A enviar ...",
+    "Sending..." : "A enviar...",
     "All" : "Todos",
-    "Please wait...." : "Por favor aguarde...",
-    "Error while disabling app" : "Ocorreu  um erro enquanto desativava a aplicação",
+    "Please wait...." : "Por favor, aguarde...",
+    "Error while disabling app" : "Ocorreu  um erro enquanto desativava a app",
     "Disable" : "Desativar",
     "Enable" : "Ativar",
-    "Error while enabling app" : "Ocorreu um erro enquanto ativava a aplicação",
-    "Updating...." : "A Actualizar...",
-    "Error while updating app" : "Ocorreu um erro enquanto atualizava a aplicação",
-    "Updated" : "Actualizado",
-    "Uninstalling ...." : "A desinstalar ....",
-    "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
+    "Error while enabling app" : "Ocorreu um erro enquanto ativava a app",
+    "Updating...." : "A atualizar...",
+    "Error while updating app" : "Ocorreu um erro enquanto atualizava a app",
+    "Updated" : "Atualizada",
+    "Uninstalling ...." : "A desinstalar....",
+    "Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app",
     "Uninstall" : "Desinstalar",
-    "Select a profile picture" : "Seleccione uma fotografia de perfil",
+    "Select a profile picture" : "Selecione uma fotografia de perfil",
     "Very weak password" : "Palavra-passe muito fraca",
     "Weak password" : "Palavra-passe fraca",
     "So-so password" : "Palavra-passe aceitável",
     "Good password" : "Palavra-passe boa",
     "Strong password" : "Palavra-passe forte",
-    "Valid until {date}" : "Válido até {date}",
+    "Valid until {date}" : "Válida até {date}",
     "Delete" : "Apagar",
-    "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
-    "Delete encryption keys permanently." : "Excluir as chaves encriptadas de forma permanente.",
-    "Restore encryption keys." : "Restaurar chaves encriptadas.",
+    "Decrypting files... Please wait, this can take some time." : "A descodificar os ficheiros... Por favor, aguarde, esta operação pode demorar algum tempo.",
+    "Delete encryption keys permanently." : "Apagar as chaves encriptadas para sempre.",
+    "Restore encryption keys." : "Restaurar as chaves encriptadas.",
     "Groups" : "Grupos",
-    "Unable to delete {objName}" : "Impossível apagar {objNome}",
-    "Error creating group" : "Erro ao criar grupo",
-    "A valid group name must be provided" : "Um nome válido do grupo tem de ser fornecido",
+    "Unable to delete {objName}" : "Não é possível apagar {objNome}",
+    "Error creating group" : "Ocorreu um erro ao criar o grupo",
+    "A valid group name must be provided" : "Deve ser indicado um nome de grupo válido",
     "deleted {groupName}" : "{groupName} apagado",
     "undo" : "Anular",
     "no group" : "sem grupo",
     "never" : "nunca",
     "deleted {userName}" : "{userName} apagado",
     "add group" : "Adicionar grupo",
-    "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
-    "Error creating user" : "Erro a criar utilizador",
-    "A valid password must be provided" : "Deve ser fornecida uma palavra-passe válida",
-    "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
+    "A valid username must be provided" : "Deve ser indicado um nome de utilizador válido",
+    "Error creating user" : "Ocorreu um erro ao criar o utilizador",
+    "A valid password must be provided" : "Deve ser indicada uma palavra-passe válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atenção: A pasta pessoal do utilizador \"{user}\" já existe",
     "__language_name__" : "__language_name__",
     "Personal Info" : "Informação Pessoal",
-    "SSL root certificates" : "Certificados SSL de raiz",
+    "SSL root certificates" : "Certificados de raiz SSL",
     "Encryption" : "Encriptação",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
     "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
@@ -101,22 +101,25 @@ OC.L10N.register(
     "SSL" : "SSL",
     "TLS" : "TLS",
     "Security Warning" : "Aviso de Segurança",
-    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está a aceder %s via HTTP. Recomendamos vivamente que configure o servidor para forçar o uso de HTTPS.",
-    "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." : "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.",
-    "Setup Warning" : "Aviso de setup",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está a aceder a %s via HTTP. Nós recomendamos vivamente que configure o seu servidor para requerer a utilização de HTTPS.",
+    "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." : "A sua pasta dos dados e os seus ficheiros estão provavelmente acessíveis a partir da Internet. O ficheiro .htaccess não está a funcionar corretamente. Nós sugerimos fortemente que configure o seu servidor da Web de maneira a que a pasta dos dados deixe de ficar acessível, ou mova-a para fora da diretoria raiz dos documentos do servidor da Web.",
+    "Read-Only config enabled" : "Configuração Só-de-Leitura ativada",
+    "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 Só-de-Leitura foi ativada. Isto evita definir algumas configurações através da interface da Web. Além disso, o ficheiro precisa de ser definido gravável manualmente para cada atualização.",
+    "Setup Warning" : "Aviso de Configuração",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
-    "Database Performance Info" : "Informação sobre desempenho da Base de Dados",
+    "Database Performance Info" : "Informação do Desempenho da Base de Dados",
     "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
-    "Module 'fileinfo' missing" : "Falta o módulo 'fileinfo'",
+    "Module 'fileinfo' missing" : "Módulo 'fileinfo' em falta",
     "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' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
-    "Your PHP version is outdated" : "A sua versão do PHP está ultrapassada",
+    "Your PHP version is outdated" : "A sua versão do PHP está desatualizada",
     "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
-    "PHP charset is not set to UTF-8" : "PHP charset não está definido para UTF-8",
+    "PHP charset is not set to UTF-8" : "O conjunto de carateres PHP não está definido para UTF-8",
     "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
-    "Locale not working" : "Internacionalização não está a funcionar",
-    "System locale can not be set to a one which supports UTF-8." : "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
+    "Locale not working" : "A internacionalização não está a funcionar",
+    "System locale can not be set to a one which supports UTF-8." : "Não é possível definir a internacionalização do sistema para um que suporte o UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nós recomendamos fortemente que instale no seu sistema os pacotes necessários para suportar uma das seguintes locallidades: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
     "Connectivity Checks" : "Verificações de Conetividade",
diff --git a/settings/l10n/pt_PT.json b/settings/l10n/pt_PT.json
index b0b3984a956..d1e2fe265bf 100644
--- a/settings/l10n/pt_PT.json
+++ b/settings/l10n/pt_PT.json
@@ -13,79 +13,79 @@
     "Files decrypted successfully" : "Ficheiros desencriptados com sucesso",
     "Couldn't decrypt your files, please check your owncloud.log or ask your administrator" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't decrypt your files, check your password and try again" : "Não foi possível descodificar os seus ficheiros. Por favor, verifique a sua palavra-passe e tente novamente",
-    "Encryption keys deleted permanently" : "A chave de encriptação foi eliminada permanentemente",
-    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível excluir permanentemente a sua chave de encriptação. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Encryption keys deleted permanently" : "As chaves de encriptação foram eliminadas para sempre",
+    "Couldn't permanently delete your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possível apagar as suas chaves de encriptação. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Couldn't remove app." : "Não foi possível remover a aplicação.",
     "Email saved" : "E-mail guardado",
     "Invalid email" : "e-mail inválido",
     "Unable to delete group" : "Não é possível apagar o grupo",
     "Unable to delete user" : "Não é possível apagar o utilizador",
-    "Backups restored successfully" : "Cópias de segurança foram restauradas com sucesso",
-    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Nao foi possivel restaurar as suas chaves de encriptacao. Verifique a sua owncloud.log ou pergunte ao seu administrador",
+    "Backups restored successfully" : "Cópias de segurança restauradas com sucesso",
+    "Couldn't restore your encryption keys, please check your owncloud.log or ask your administrator" : "Não foi possivel restaurar as suas chaves de encriptacao. Por favor, verifique a sua owncloud.log ou pergunte ao seu administrador",
     "Language changed" : "Idioma alterado",
     "Invalid request" : "Pedido Inválido",
     "Admins can't remove themself from the admin group" : "Os administradores não se podem remover a eles próprios do grupo 'admin'.",
-    "Unable to add user to group %s" : "Impossível acrescentar utilizador ao grupo %s",
-    "Unable to remove user from group %s" : "Impossível apagar utilizador do grupo %s",
-    "Couldn't update app." : "Não foi possível actualizar a aplicação.",
+    "Unable to add user to group %s" : "Não é possível adicionar o utilizador ao grupo %s",
+    "Unable to remove user from group %s" : "Não é possível remover o utilizador do grupo %s",
+    "Couldn't update app." : "Não foi possível atualizar a app.",
     "Wrong password" : "Palavra-passe errada",
-    "No user supplied" : "Nenhum utilizador especificado.",
+    "No user supplied" : "Nenhum utilizador especificado",
     "Please provide an admin recovery password, otherwise all user data will be lost" : "Por favor, forneça uma palavra-passe de recuperação de administrador, caso contrário seráo perdidos todos os dados",
     "Wrong admin recovery password. Please check the password and try again." : "Palavra-passe de recuperação de administrador errada. Por favor, verifique a palavra-passe e tente novamente.",
     "Back-end doesn't support password change, but the users encryption key was successfully updated." : "Não foi possível alterar a sua palavra-passe, mas a chave de codificação foi atualizada com sucesso.",
     "Unable to change password" : "Não foi possível alterar a sua palavra-passe ",
     "Enabled" : "Ativada",
-    "Not enabled" : "Desactivado",
+    "Not enabled" : "Desativada",
     "Recommended" : "Recomendado",
     "Saved" : "Guardado",
     "test email settings" : "testar as definições de e-mail",
-    "If you received this email, the settings seem to be correct." : "Se você recebeu este e-mail as configurações parecem estar correctas",
-    "A problem occurred while sending the email. Please revise your settings." : "Um problema ocorreu ao enviar o email. Por favor verifique as suas definições.",
-    "Email sent" : "E-mail enviado",
+    "If you received this email, the settings seem to be correct." : "Se recebeu este e-mail, as configurações parecem estar corretas",
+    "A problem occurred while sending the email. Please revise your settings." : "Ocorreu um problema durante o envio do e-mail. Por favor, verifique as suas configurações..",
+    "Email sent" : "Mensagem enviada",
     "You need to set your user email before being able to send test emails." : "Você precisa de configurar o seu e-mail de usuário antes de ser capaz de enviar e-mails de teste",
     "Are you really sure you want add \"{domain}\" as trusted domain?" : "Você tem certeza que quer adicionar \"{domain}\" como domínio confiável?",
     "Add trusted domain" : "Adicionar domínio confiável ",
-    "Sending..." : "A enviar ...",
+    "Sending..." : "A enviar...",
     "All" : "Todos",
-    "Please wait...." : "Por favor aguarde...",
-    "Error while disabling app" : "Ocorreu  um erro enquanto desativava a aplicação",
+    "Please wait...." : "Por favor, aguarde...",
+    "Error while disabling app" : "Ocorreu  um erro enquanto desativava a app",
     "Disable" : "Desativar",
     "Enable" : "Ativar",
-    "Error while enabling app" : "Ocorreu um erro enquanto ativava a aplicação",
-    "Updating...." : "A Actualizar...",
-    "Error while updating app" : "Ocorreu um erro enquanto atualizava a aplicação",
-    "Updated" : "Actualizado",
-    "Uninstalling ...." : "A desinstalar ....",
-    "Error while uninstalling app" : "Erro durante a desinstalação da aplicação",
+    "Error while enabling app" : "Ocorreu um erro enquanto ativava a app",
+    "Updating...." : "A atualizar...",
+    "Error while updating app" : "Ocorreu um erro enquanto atualizava a app",
+    "Updated" : "Atualizada",
+    "Uninstalling ...." : "A desinstalar....",
+    "Error while uninstalling app" : "Ocorreu um erro durante a desinstalação da app",
     "Uninstall" : "Desinstalar",
-    "Select a profile picture" : "Seleccione uma fotografia de perfil",
+    "Select a profile picture" : "Selecione uma fotografia de perfil",
     "Very weak password" : "Palavra-passe muito fraca",
     "Weak password" : "Palavra-passe fraca",
     "So-so password" : "Palavra-passe aceitável",
     "Good password" : "Palavra-passe boa",
     "Strong password" : "Palavra-passe forte",
-    "Valid until {date}" : "Válido até {date}",
+    "Valid until {date}" : "Válida até {date}",
     "Delete" : "Apagar",
-    "Decrypting files... Please wait, this can take some time." : "A desencriptar os ficheiros... Por favor aguarde, esta operação pode demorar algum tempo.",
-    "Delete encryption keys permanently." : "Excluir as chaves encriptadas de forma permanente.",
-    "Restore encryption keys." : "Restaurar chaves encriptadas.",
+    "Decrypting files... Please wait, this can take some time." : "A descodificar os ficheiros... Por favor, aguarde, esta operação pode demorar algum tempo.",
+    "Delete encryption keys permanently." : "Apagar as chaves encriptadas para sempre.",
+    "Restore encryption keys." : "Restaurar as chaves encriptadas.",
     "Groups" : "Grupos",
-    "Unable to delete {objName}" : "Impossível apagar {objNome}",
-    "Error creating group" : "Erro ao criar grupo",
-    "A valid group name must be provided" : "Um nome válido do grupo tem de ser fornecido",
+    "Unable to delete {objName}" : "Não é possível apagar {objNome}",
+    "Error creating group" : "Ocorreu um erro ao criar o grupo",
+    "A valid group name must be provided" : "Deve ser indicado um nome de grupo válido",
     "deleted {groupName}" : "{groupName} apagado",
     "undo" : "Anular",
     "no group" : "sem grupo",
     "never" : "nunca",
     "deleted {userName}" : "{userName} apagado",
     "add group" : "Adicionar grupo",
-    "A valid username must be provided" : "Um nome de utilizador válido deve ser fornecido",
-    "Error creating user" : "Erro a criar utilizador",
-    "A valid password must be provided" : "Deve ser fornecida uma palavra-passe válida",
-    "Warning: Home directory for user \"{user}\" already exists" : "Atenção: a pasta pessoal do utilizador \"{user}\" já existe",
+    "A valid username must be provided" : "Deve ser indicado um nome de utilizador válido",
+    "Error creating user" : "Ocorreu um erro ao criar o utilizador",
+    "A valid password must be provided" : "Deve ser indicada uma palavra-passe válida",
+    "Warning: Home directory for user \"{user}\" already exists" : "Atenção: A pasta pessoal do utilizador \"{user}\" já existe",
     "__language_name__" : "__language_name__",
     "Personal Info" : "Informação Pessoal",
-    "SSL root certificates" : "Certificados SSL de raiz",
+    "SSL root certificates" : "Certificados de raiz SSL",
     "Encryption" : "Encriptação",
     "Everything (fatal issues, errors, warnings, info, debug)" : "Tudo (problemas fatais, erros, avisos, informação, depuração)",
     "Info, warnings, errors and fatal issues" : "Informação, avisos, erros e problemas fatais",
@@ -99,22 +99,25 @@
     "SSL" : "SSL",
     "TLS" : "TLS",
     "Security Warning" : "Aviso de Segurança",
-    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está a aceder %s via HTTP. Recomendamos vivamente que configure o servidor para forçar o uso de HTTPS.",
-    "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." : "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.",
-    "Setup Warning" : "Aviso de setup",
+    "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." : "Está a aceder a %s via HTTP. Nós recomendamos vivamente que configure o seu servidor para requerer a utilização de HTTPS.",
+    "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." : "A sua pasta dos dados e os seus ficheiros estão provavelmente acessíveis a partir da Internet. O ficheiro .htaccess não está a funcionar corretamente. Nós sugerimos fortemente que configure o seu servidor da Web de maneira a que a pasta dos dados deixe de ficar acessível, ou mova-a para fora da diretoria raiz dos documentos do servidor da Web.",
+    "Read-Only config enabled" : "Configuração Só-de-Leitura ativada",
+    "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 Só-de-Leitura foi ativada. Isto evita definir algumas configurações através da interface da Web. Além disso, o ficheiro precisa de ser definido gravável manualmente para cada atualização.",
+    "Setup Warning" : "Aviso de Configuração",
     "PHP is apparently setup to strip inline doc blocks. This will make several core apps inaccessible." : "PHP está aparentemente configurado a remover blocos doc em linha. Isto vai fazer algumas aplicações basicas inacessíveis.",
     "This is probably caused by a cache/accelerator such as Zend OPcache or eAccelerator." : "Isto é provavelmente causado por uma cache/acelerador como o Zend OPcache or eAcelerador.",
-    "Database Performance Info" : "Informação sobre desempenho da Base de Dados",
+    "Database Performance Info" : "Informação do Desempenho da Base de Dados",
     "SQLite is used as database. For larger installations we recommend to change this. To migrate to another database use the command line tool: 'occ db:convert-type'" : "SQLite é usado como base de dados. Para grandes instalações nós recomendamos a alterar isso. Para mudar para outra base de dados use o comando de linha: 'occ db:convert-type'",
-    "Module 'fileinfo' missing" : "Falta o módulo 'fileinfo'",
+    "Module 'fileinfo' missing" : "Módulo 'fileinfo' em falta",
     "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' não se encontra instalado/activado. É fortemente recomendado que active este módulo para obter os melhores resultado com a detecção dos tipos de mime.",
-    "Your PHP version is outdated" : "A sua versão do PHP está ultrapassada",
+    "Your PHP version is outdated" : "A sua versão do PHP está desatualizada",
     "Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly." : "A sua versão do PHP está ultrapassada. Recomendamos que actualize para a versão 5.3.8 ou mais recente, devido às versões anteriores conterem problemas. É também possível que esta instalação não esteja a funcionar correctamente.",
-    "PHP charset is not set to UTF-8" : "PHP charset não está definido para UTF-8",
+    "PHP charset is not set to UTF-8" : "O conjunto de carateres PHP não está definido para UTF-8",
     "PHP charset is not set to UTF-8. This can cause major issues with non-ASCII characters in file names. We highly recommend to change the value of 'default_charset' php.ini to 'UTF-8'." : "PHP charset não está definido como UTF-8. Isso pode causar grandes problemas com caracteres não-ASCII em nomes de arquivo. Recomendamos para alterar o valor de php.ini 'default_charset' para 'UTF-8'.",
-    "Locale not working" : "Internacionalização não está a funcionar",
-    "System locale can not be set to a one which supports UTF-8." : "Não é possível pôr as definições de sistema compatíveis com UTF-8.",
+    "Locale not working" : "A internacionalização não está a funcionar",
+    "System locale can not be set to a one which supports UTF-8." : "Não é possível definir a internacionalização do sistema para um que suporte o UTF-8.",
     "This means that there might be problems with certain characters in file names." : "Isto significa que podem haver problemas com alguns caracteres nos nomes dos ficheiros.",
+    "We strongly suggest installing the required packages on your system to support one of the following locales: %s." : "Nós recomendamos fortemente que instale no seu sistema os pacotes necessários para suportar uma das seguintes locallidades: %s.",
     "URL generation in notification emails" : "Geração URL em e-mails de notificação",
     "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 \"overwritewebroot\" option in your config.php file to the webroot path of your installation (Suggested: \"%s\")" : "Se a sua instalação não está instalada na raiz do domínio e usa o sistema cron, pode haver problemas com a geração de URL. Para evitar esses problemas, por favor, defina a opção \"overwritewebroot\" no ficheiro config.php para o caminho webroot da sua instalação (sugestão: \"%s\")",
     "Connectivity Checks" : "Verificações de Conetividade",
-- 
GitLab


From 98b28c68a3a21d524382bd00b45ec33e3faadd67 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 3 Dec 2014 08:52:59 +0100
Subject: [PATCH 611/616] add proper description what database is supported by
 CE and EE

---
 config/config.sample.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 4de3371ea4b..65f473584d0 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -89,8 +89,15 @@ $CONFIG = array(
 'version' => '',
 
 /**
- * Identifies the database used with this installation: ``sqlite``, ``mysql``,
- * ``pgsql``, ``oci``, or ``mssql``.
+ * Identifies the database used with this installation. See also config option
+ * ``supportedDatabases``
+ *
+ * Available:
+ * 	- sqlite (SQLite3 - Community Edition Only)
+ * 	- mysql (MySQL)
+ * 	- pgsql (PostgreSQL)
+ * 	- oci (Oracle - Enterprise Edition Only)
+ * 	- mssql (Microsoft SQL Server - Enterprise Edition Only)
  */
 'dbtype' => 'sqlite',
 
@@ -841,15 +848,14 @@ $CONFIG = array(
 ),
 
 /**
- * Database types that are supported for installation. (SQLite is available only in 
- * ownCloud Community Edition, oci and mssql only for the Enterprise Edition)
+ * Database types that are supported for installation.
  *
  * Available:
- * 	- sqlite (SQLite3)
+ * 	- sqlite (SQLite3 - Community Edition Only)
  * 	- mysql (MySQL)
  * 	- pgsql (PostgreSQL)
- * 	- oci (Oracle)
- * 	- mssql (Microsoft SQL Server)
+ * 	- oci (Oracle - Enterprise Edition Only)
+ * 	- mssql (Microsoft SQL Server - Enterprise Edition Only)
  */
 'supportedDatabases' => array(
 	'sqlite',
-- 
GitLab


From ea4c25609dd23345fa1f639479421ff318e6f6c9 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Tue, 2 Dec 2014 13:51:36 +0100
Subject: [PATCH 612/616] Replace uniqid calls with $this->getUniqueID so tests
 pass again on windows

---
 tests/lib/api.php                        |  2 +-
 tests/lib/db.php                         |  2 +-
 tests/lib/db/migrator.php                |  2 +-
 tests/lib/db/mysqlmigration.php          |  2 +-
 tests/lib/db/sqlitemigration.php         |  2 +-
 tests/lib/files/cache/updaterlegacy.php  |  2 +-
 tests/lib/files/filesystem.php           | 12 ++++++------
 tests/lib/files/node/integration.php     |  2 +-
 tests/lib/files/view.php                 |  2 +-
 tests/lib/memcache/apc.php               |  2 +-
 tests/lib/memcache/apcu.php              |  2 +-
 tests/lib/memcache/memcached.php         |  6 +++---
 tests/lib/memcache/xcache.php            |  2 +-
 tests/lib/ocs/privatedata.php            |  2 +-
 tests/lib/repair/repaircollation.php     |  2 +-
 tests/lib/repair/repairinnodb.php        |  2 +-
 tests/lib/repair/repairlegacystorage.php |  8 +++++---
 tests/lib/session/memory.php             |  2 +-
 tests/lib/tags.php                       | 10 +++++++---
 tests/lib/testcase.php                   |  6 ++++--
 tests/lib/util.php                       |  6 +++---
 21 files changed, 43 insertions(+), 35 deletions(-)

diff --git a/tests/lib/api.php b/tests/lib/api.php
index bf9748a6040..3b925a63960 100644
--- a/tests/lib/api.php
+++ b/tests/lib/api.php
@@ -17,7 +17,7 @@ class Test_API extends \Test\TestCase {
 		return array(
 			'shipped' => $shipped,
 			'response' => new OC_OCS_Result($data, $code, $message),
-			'app' => uniqid('testapp_', true),
+			'app' => $this->getUniqueID('testapp_'),
 			);
 	}
 
diff --git a/tests/lib/db.php b/tests/lib/db.php
index a401aded62a..aefbb3624ed 100644
--- a/tests/lib/db.php
+++ b/tests/lib/db.php
@@ -265,7 +265,7 @@ class Test_DB extends \Test\TestCase {
 
 	protected function insertCardData($fullname, $uri) {
 		$query = OC_DB::prepare("INSERT INTO `*PREFIX*{$this->table2}` (`fullname`, `uri`, `carddata`) VALUES (?, ?, ?)");
-		$this->assertSame(1, $query->execute(array($fullname, $uri, uniqid())));
+		$this->assertSame(1, $query->execute(array($fullname, $uri, $this->getUniqueID())));
 	}
 
 	protected function updateCardData($fullname, $uri) {
diff --git a/tests/lib/db/migrator.php b/tests/lib/db/migrator.php
index 7acd3382fe2..1a1d530f1d2 100644
--- a/tests/lib/db/migrator.php
+++ b/tests/lib/db/migrator.php
@@ -39,7 +39,7 @@ class Migrator extends \Test\TestCase {
 			$this->markTestSkipped('DB migration tests are not supported on MSSQL');
 		}
 		$this->manager = new \OC\DB\MDB2SchemaManager($this->connection);
-		$this->tableName = 'test_' . uniqid();
+		$this->tableName = strtolower($this->getUniqueID('test_'));
 	}
 
 	protected function tearDown() {
diff --git a/tests/lib/db/mysqlmigration.php b/tests/lib/db/mysqlmigration.php
index 70199147760..6c283e6c59c 100644
--- a/tests/lib/db/mysqlmigration.php
+++ b/tests/lib/db/mysqlmigration.php
@@ -23,7 +23,7 @@ class TestMySqlMigration extends \Test\TestCase {
 		}
 
 		$dbPrefix = \OC::$server->getConfig()->getSystemValue("dbtableprefix");
-		$this->tableName = uniqid($dbPrefix . "_enum_bit_test");
+		$this->tableName = $this->getUniqueID($dbPrefix . '_enum_bit_test');
 		$this->connection->exec("CREATE TABLE $this->tableName(b BIT,  e ENUM('1','2','3','4'))");
 	}
 
diff --git a/tests/lib/db/sqlitemigration.php b/tests/lib/db/sqlitemigration.php
index e3d0e386ab5..9206381ff71 100644
--- a/tests/lib/db/sqlitemigration.php
+++ b/tests/lib/db/sqlitemigration.php
@@ -23,7 +23,7 @@ class TestSqliteMigration extends \Test\TestCase {
 		}
 
 		$dbPrefix = \OC::$server->getConfig()->getSystemValue("dbtableprefix");
-		$this->tableName = uniqid($dbPrefix . "_enum_bit_test");
+		$this->tableName = $this->getUniqueID($dbPrefix . '_enum_bit_test');
 		$this->connection->exec("CREATE TABLE $this->tableName(t0 tinyint unsigned, t1 tinyint)");
 	}
 
diff --git a/tests/lib/files/cache/updaterlegacy.php b/tests/lib/files/cache/updaterlegacy.php
index 7c05800cd6b..7cf4dc6df5f 100644
--- a/tests/lib/files/cache/updaterlegacy.php
+++ b/tests/lib/files/cache/updaterlegacy.php
@@ -58,7 +58,7 @@ class UpdaterLegacy extends \Test\TestCase {
 		$this->originalStorage = Filesystem::getStorage('/');
 		Filesystem::tearDown();
 		if (!self::$user) {
-			self::$user = uniqid();
+			self::$user = $this->getUniqueID();
 		}
 
 		\OC_User::createUser(self::$user, 'password');
diff --git a/tests/lib/files/filesystem.php b/tests/lib/files/filesystem.php
index 746600c7d15..1b84db0fc0d 100644
--- a/tests/lib/files/filesystem.php
+++ b/tests/lib/files/filesystem.php
@@ -189,7 +189,7 @@ class Filesystem extends \Test\TestCase {
 		if (\OC\Files\Filesystem::getView()) {
 			$user = \OC_User::getUser();
 		} else {
-			$user = uniqid();
+			$user = $this->getUniqueID();
 			\OC\Files\Filesystem::init($user, '/' . $user . '/files');
 		}
 		\OC_Hook::clear('OC_Filesystem');
@@ -217,7 +217,7 @@ class Filesystem extends \Test\TestCase {
 	 */
 	public function testLocalMountWhenUserDoesNotExist() {
 		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
-		$userId = uniqid('user_');
+		$userId = $this->getUniqueID('user_');
 
 		\OC\Files\Filesystem::initMountPoints($userId);
 
@@ -231,7 +231,7 @@ class Filesystem extends \Test\TestCase {
 	 * Tests that the home storage is used for the user's mount point
 	 */
 	public function testHomeMount() {
-		$userId = uniqid('user_');
+		$userId = $this->getUniqueID('user_');
 
 		\OC_User::createUser($userId, $userId);
 
@@ -251,7 +251,7 @@ class Filesystem extends \Test\TestCase {
 	 */
 	public function testLegacyHomeMount() {
 		$datadir = \OC_Config::getValue("datadirectory", \OC::$SERVERROOT . "/data");
-		$userId = uniqid('user_');
+		$userId = $this->getUniqueID('user_');
 
 		// insert storage into DB by constructing it
 		// to make initMountsPoint find its existence
@@ -281,7 +281,7 @@ class Filesystem extends \Test\TestCase {
 	 * Test that the default cache dir is part of the user's home
 	 */
 	public function testMountDefaultCacheDir() {
-		$userId = uniqid('user_');
+		$userId = $this->getUniqueID('user_');
 		$oldCachePath = \OC_Config::getValue('cache_path', '');
 		// no cache path configured
 		\OC_Config::setValue('cache_path', '');
@@ -306,7 +306,7 @@ class Filesystem extends \Test\TestCase {
 	 * the user's home
 	 */
 	public function testMountExternalCacheDir() {
-		$userId = uniqid('user_');
+		$userId = $this->getUniqueID('user_');
 
 		$oldCachePath = \OC_Config::getValue('cache_path', '');
 		// set cache path to temp dir
diff --git a/tests/lib/files/node/integration.php b/tests/lib/files/node/integration.php
index fd777460ec6..d8c180cc844 100644
--- a/tests/lib/files/node/integration.php
+++ b/tests/lib/files/node/integration.php
@@ -48,7 +48,7 @@ class IntegrationTests extends \Test\TestCase {
 		\OC_Hook::connect('OC_Filesystem', 'post_rename', '\OC\Files\Cache\Updater', 'renameHook');
 		\OC_Hook::connect('OC_Filesystem', 'post_touch', '\OC\Files\Cache\Updater', 'touchHook');
 
-		$user = new User(uniqid('user'), new \OC_User_Dummy);
+		$user = new User($this->getUniqueID('user'), new \OC_User_Dummy);
 		\OC_User::setUserId($user->getUID());
 		$this->view = new View();
 		$this->root = new Root($manager, $this->view, $user);
diff --git a/tests/lib/files/view.php b/tests/lib/files/view.php
index d6dd176bba9..8bb4e0ac2cc 100644
--- a/tests/lib/files/view.php
+++ b/tests/lib/files/view.php
@@ -71,7 +71,7 @@ class View extends \Test\TestCase {
 		$storage1 = $this->getTestStorage();
 		$storage2 = $this->getTestStorage();
 		$storage3 = $this->getTestStorage();
-		$root = '/' . uniqid();
+		$root = $this->getUniqueID('/');
 		\OC\Files\Filesystem::mount($storage1, array(), $root . '/');
 		\OC\Files\Filesystem::mount($storage2, array(), $root . '/substorage');
 		\OC\Files\Filesystem::mount($storage3, array(), $root . '/folder/anotherstorage');
diff --git a/tests/lib/memcache/apc.php b/tests/lib/memcache/apc.php
index 550d5068dc1..fdb785b9dc5 100644
--- a/tests/lib/memcache/apc.php
+++ b/tests/lib/memcache/apc.php
@@ -21,6 +21,6 @@ class APC extends Cache {
 			$this->markTestSkipped('The apc extension is emulated by ACPu.');
 			return;
 		}
-		$this->instance=new \OC\Memcache\APC(uniqid());
+		$this->instance=new \OC\Memcache\APC($this->getUniqueID());
 	}
 }
diff --git a/tests/lib/memcache/apcu.php b/tests/lib/memcache/apcu.php
index 1b849e1c54d..afcaa99bfbe 100644
--- a/tests/lib/memcache/apcu.php
+++ b/tests/lib/memcache/apcu.php
@@ -17,6 +17,6 @@ class APCu extends Cache {
 			$this->markTestSkipped('The APCu extension is not available.');
 			return;
 		}
-		$this->instance=new \OC\Memcache\APCu(uniqid());
+		$this->instance=new \OC\Memcache\APCu($this->getUniqueID());
 	}
 }
diff --git a/tests/lib/memcache/memcached.php b/tests/lib/memcache/memcached.php
index a94b809a7b5..51a78996dd4 100644
--- a/tests/lib/memcache/memcached.php
+++ b/tests/lib/memcache/memcached.php
@@ -16,14 +16,14 @@ class Memcached extends Cache {
 		if (!\OC\Memcache\Memcached::isAvailable()) {
 			self::markTestSkipped('The memcached extension is not available.');
 		}
-		$instance = new \OC\Memcache\Memcached(uniqid());
-		if ($instance->set(uniqid(), uniqid()) === false) {
+		$instance = new \OC\Memcache\Memcached(self::getUniqueID());
+		if ($instance->set(self::getUniqueID(), self::getUniqueID()) === false) {
 			self::markTestSkipped('memcached server seems to be down.');
 		}
 	}
 
 	protected function setUp() {
 		parent::setUp();
-		$this->instance = new \OC\Memcache\Memcached(uniqid());
+		$this->instance = new \OC\Memcache\Memcached($this->getUniqueID());
 	}
 }
diff --git a/tests/lib/memcache/xcache.php b/tests/lib/memcache/xcache.php
index b97d5545c6e..36efe0b220a 100644
--- a/tests/lib/memcache/xcache.php
+++ b/tests/lib/memcache/xcache.php
@@ -17,6 +17,6 @@ class XCache extends Cache {
 			$this->markTestSkipped('The xcache extension is not available.');
 			return;
 		}
-		$this->instance = new \OC\Memcache\XCache(uniqid());
+		$this->instance = new \OC\Memcache\XCache($this->getUniqueID());
 	}
 }
diff --git a/tests/lib/ocs/privatedata.php b/tests/lib/ocs/privatedata.php
index 20f1dd38362..a9300f5beac 100644
--- a/tests/lib/ocs/privatedata.php
+++ b/tests/lib/ocs/privatedata.php
@@ -26,7 +26,7 @@ class Test_OC_OCS_Privatedata extends \Test\TestCase {
 	protected function setUp() {
 		parent::setUp();
 		\OC::$server->getSession()->set('user_id', 'user1');
-		$this->appKey = uniqid('app');
+		$this->appKey = $this->getUniqueID('app');
 	}
 
 	public function testGetEmptyOne() {
diff --git a/tests/lib/repair/repaircollation.php b/tests/lib/repair/repaircollation.php
index e711fcd9d83..29dad190008 100644
--- a/tests/lib/repair/repaircollation.php
+++ b/tests/lib/repair/repaircollation.php
@@ -53,7 +53,7 @@ class TestRepairCollation extends \Test\TestCase {
 		}
 
 		$dbPrefix = $this->config->getSystemValue("dbtableprefix");
-		$this->tableName = uniqid($dbPrefix . "_collation_test");
+		$this->tableName = $this->getUniqueID($dbPrefix . "_collation_test");
 		$this->connection->exec("CREATE TABLE $this->tableName(text VARCHAR(16)) COLLATE utf8_unicode_ci");
 
 		$this->repair = new TestCollationRepair($this->config, $this->connection);
diff --git a/tests/lib/repair/repairinnodb.php b/tests/lib/repair/repairinnodb.php
index 21d7d978821..d4039472a6b 100644
--- a/tests/lib/repair/repairinnodb.php
+++ b/tests/lib/repair/repairinnodb.php
@@ -31,7 +31,7 @@ class TestRepairInnoDB extends \Test\TestCase {
 		}
 
 		$dbPrefix = \OC::$server->getConfig()->getSystemValue("dbtableprefix");
-		$this->tableName = uniqid($dbPrefix . "_innodb_test");
+		$this->tableName = $this->getUniqueID($dbPrefix . "_innodb_test");
 		$this->connection->exec("CREATE TABLE $this->tableName(id INT) ENGINE MyISAM");
 
 		$this->repair = new \OC\Repair\InnoDB();
diff --git a/tests/lib/repair/repairlegacystorage.php b/tests/lib/repair/repairlegacystorage.php
index ac845657cd9..f08393300e1 100644
--- a/tests/lib/repair/repairlegacystorage.php
+++ b/tests/lib/repair/repairlegacystorage.php
@@ -13,6 +13,8 @@
  */
 class TestRepairLegacyStorages extends \Test\TestCase {
 
+	private $connection;
+	private $config;
 	private $user;
 	private $repair;
 
@@ -247,12 +249,12 @@ class TestRepairLegacyStorages extends \Test\TestCase {
 			// regular data dir
 			array(
 				'/tmp/oc-autotest/datadir/',
-				uniqid('user_'),
+				$this->getUniqueID('user_'),
 			),
 			// long datadir / short user
 			array(
 				'/tmp/oc-autotest/datadir01234567890123456789012345678901234567890123456789END/',
-				uniqid('user_'),
+				$this->getUniqueID('user_'),
 			),
 			// short datadir / long user
 			array(
@@ -271,7 +273,7 @@ class TestRepairLegacyStorages extends \Test\TestCase {
 			$output[] = 'info: ' . $description;
 		});
 
-		$this->prepareSettings('/tmp/oc-autotest/datadir', uniqid('user_'));
+		$this->prepareSettings('/tmp/oc-autotest/datadir', $this->getUniqueID('user_'));
 		$this->assertNotEquals('yes', $this->config->getAppValue('core', 'repairlegacystoragesdone'));
 		$this->repair->run();
 		$this->assertEquals(1, count($output));
diff --git a/tests/lib/session/memory.php b/tests/lib/session/memory.php
index 84dee548a1e..1ca4956c6ea 100644
--- a/tests/lib/session/memory.php
+++ b/tests/lib/session/memory.php
@@ -12,6 +12,6 @@ namespace Test\Session;
 class Memory extends Session {
 	protected function setUp() {
 		parent::setUp();
-		$this->instance = new \OC\Session\Memory(uniqid());
+		$this->instance = new \OC\Session\Memory($this->getUniqueID());
 	}
 }
diff --git a/tests/lib/tags.php b/tests/lib/tags.php
index 3f0c52d19ea..533e6a19add 100644
--- a/tests/lib/tags.php
+++ b/tests/lib/tags.php
@@ -25,14 +25,18 @@ class Test_Tags extends \Test\TestCase {
 	protected $objectType;
 	protected $user;
 	protected $backupGlobals = FALSE;
+	/** @var \OC\Tagging\TagMapper */
+	protected $tagMapper;
+	/** @var \OC\TagManager */
+	protected $tagMgr;
 
 	protected function setUp() {
 		parent::setUp();
 
 		OC_User::clearBackends();
 		OC_User::useBackend('dummy');
-		$this->user = uniqid('user_');
-		$this->objectType = uniqid('type_');
+		$this->user = $this->getUniqueID('user_');
+		$this->objectType = $this->getUniqueID('type_');
 		OC_User::createUser($this->user, 'pass');
 		OC_User::setUserId($this->user);
 		$this->tagMapper = new OC\Tagging\TagMapper(\OC::$server->getDb());
@@ -205,7 +209,7 @@ class Test_Tags extends \Test\TestCase {
 		$tagger = $this->tagMgr->load('test');
 		$tagger->tagAs(1, $test_tag);
 
-		$other_user = uniqid('user2_');
+		$other_user = $this->getUniqueID('user2_');
 		OC_User::createUser($other_user, 'pass');
 
 		OC_User::setUserId($other_user);
diff --git a/tests/lib/testcase.php b/tests/lib/testcase.php
index 934bc5fa8f3..27c28329535 100644
--- a/tests/lib/testcase.php
+++ b/tests/lib/testcase.php
@@ -22,6 +22,8 @@
 
 namespace Test;
 
+use OCP\Security\ISecureRandom;
+
 abstract class TestCase extends \PHPUnit_Framework_TestCase {
 	/**
 	 * Returns a unique identifier as uniqid() is not reliable sometimes
@@ -30,11 +32,11 @@ abstract class TestCase extends \PHPUnit_Framework_TestCase {
 	 * @param int $length
 	 * @return string
 	 */
-	protected function getUniqueID($prefix = '', $length = 13) {
+	protected static function getUniqueID($prefix = '', $length = 13) {
 		return $prefix . \OC::$server->getSecureRandom()->getLowStrengthGenerator()->generate(
 			$length,
 			// Do not use dots and slashes as we use the value for file names
-			'0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'
+			ISecureRandom::CHAR_DIGITS . ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER
 		);
 	}
 
diff --git a/tests/lib/util.php b/tests/lib/util.php
index 6de599b070e..1ddbd2aba2b 100644
--- a/tests/lib/util.php
+++ b/tests/lib/util.php
@@ -150,7 +150,7 @@ class Test_Util extends \Test\TestCase {
 	 * Tests that the home storage is not wrapped when no quota exists.
 	 */
 	function testHomeStorageWrapperWithoutQuota() {
-		$user1 = uniqid();
+		$user1 = $this->getUniqueID();
 		\OC_User::createUser($user1, 'test');
 		OC_Preferences::setValue($user1, 'files', 'quota', 'none');
 		\OC_User::setUserId($user1);
@@ -172,7 +172,7 @@ class Test_Util extends \Test\TestCase {
 	 * Tests that the home storage is not wrapped when no quota exists.
 	 */
 	function testHomeStorageWrapperWithQuota() {
-		$user1 = uniqid();
+		$user1 = $this->getUniqueID();
 		\OC_User::createUser($user1, 'test');
 		OC_Preferences::setValue($user1, 'files', 'quota', '1024');
 		\OC_User::setUserId($user1);
@@ -331,7 +331,7 @@ class Test_Util extends \Test\TestCase {
 
 		Dummy_OC_App::setEnabledApps($enabledApps);
 		// need to set a user id to make sure enabled apps are read from cache
-		\OC_User::setUserId(uniqid());
+		\OC_User::setUserId($this->getUniqueID());
 		\OCP\Config::setSystemValue('defaultapp', $defaultAppConfig);
 		$this->assertEquals('http://localhost/' . $expectedPath, \OC_Util::getDefaultPageUrl());
 
-- 
GitLab


From 69a5a0c1a0d6ef8e99248df58e56bdee0214056d Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Wed, 3 Dec 2014 12:52:42 +0100
Subject: [PATCH 613/616] Stop flooding the log, when previews are disabled

---
 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 f6c8c485d03..7305bf1cc0e 100644
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -98,7 +98,7 @@ class Preview {
 			self::initProviders();
 		}
 
-		if (empty(self::$providers)) {
+		if (empty(self::$providers) && \OC::$server->getConfig()->getSystemValue('enable_previews', true)) {
 			\OC_Log::write('core', 'No preview providers exist', \OC_Log::ERROR);
 			throw new \Exception('No preview providers');
 		}
-- 
GitLab


From 726626b439d7b2e33f50604c702cd7c614906022 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@owncloud.com>
Date: Fri, 28 Nov 2014 13:51:57 +0100
Subject: [PATCH 614/616] Officially deprecated passwordsalt

Hopefully this prevents people from using it in the future.
---
 config/config.sample.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/config.sample.php b/config/config.sample.php
index 65f473584d0..791ffa3df90 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -53,6 +53,9 @@ $CONFIG = array(
  * all your passwords. This example is for documentation only,
  * and you should never use it.
  *
+ * @deprecated This salt is deprecated and only used for legacy-compatibility, developers
+ * should *NOT* use this value for anything nowadays.
+ * 
  *'passwordsalt' => 'd3c944a9af095aa08f',
  */
 'passwordsalt' => '',
-- 
GitLab


From e014a18b4a8960cf8ddfc706e729545711c97ee4 Mon Sep 17 00:00:00 2001
From: Morris Jobke <hey@morrisjobke.de>
Date: Wed, 3 Dec 2014 16:38:25 +0100
Subject: [PATCH 615/616] drop files_external tests from autotest - they will
 be executed with autotest-external.sh which is coming

---
 tests/enable_all.php       | 1 -
 tests/phpunit-autotest.xml | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/enable_all.php b/tests/enable_all.php
index 2368a194944..d6c3184edd6 100644
--- a/tests/enable_all.php
+++ b/tests/enable_all.php
@@ -19,7 +19,6 @@ function enableApp($app) {
 enableApp('files_sharing');
 enableApp('files_trashbin');
 enableApp('files_encryption');
-enableApp('files_external');
 enableApp('user_ldap');
 enableApp('files_versions');
 
diff --git a/tests/phpunit-autotest.xml b/tests/phpunit-autotest.xml
index 9fba824bc7d..15e0e3dd408 100644
--- a/tests/phpunit-autotest.xml
+++ b/tests/phpunit-autotest.xml
@@ -20,8 +20,7 @@
 			<exclude>
 				<directory suffix=".php">../3rdparty</directory>
 				<directory suffix=".php">../apps/files/l10n</directory>
-				<directory suffix=".php">../apps/files_external/l10n</directory>
-				<directory suffix=".php">../apps/files_external/3rdparty</directory>
+				<directory suffix=".php">../apps/files_external</directory>
 				<directory suffix=".php">../apps/files_versions/l10n</directory>
 				<directory suffix=".php">../apps/files_encryption/l10n</directory>
 				<directory suffix=".php">../apps/files_encryption/3rdparty</directory>
-- 
GitLab


From 0a173e2b5808ba4cfc39bc565f29aa7806b09f05 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 3 Dec 2014 19:46:32 +0100
Subject: [PATCH 616/616] fix typo

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

diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 24e1494fc00..5ea2d0fc072 100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -19,7 +19,7 @@
  * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
  * You should have received a copy of the GNU Affero General Public
- * License alon with this library.  If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-- 
GitLab